From 7d8c3e6050a16e125578441f49cafeba8d426d46 Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Fri, 26 Apr 2019 11:43:48 -0400
Subject: [PATCH 0001/1405] Make hasListeners public

Allow for determining whether listeners exist on an object before calling removeListeners.
Method already exists, just making it public.
---
 packages/@ember/-internals/metal/lib/events.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index 0dd230bc06e..636242616e8 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -156,7 +156,7 @@ export function sendEvent(
 }
 
 /**
-  @private
+  @public
   @method hasListeners
   @static
   @for @ember/object/events

From 5360550e9117f78a70bb2d5db5af30c879863d70 Mon Sep 17 00:00:00 2001
From: Eric White <ewhite@ciena.com>
Date: Wed, 14 Aug 2019 16:49:59 -0400
Subject: [PATCH 0002/1405] Fix #18268

---
 packages/@ember/-internals/routing/lib/system/route.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index fd15750a08d..bed3f7370ef 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -307,7 +307,8 @@ class Route extends EmberObject implements IRoute {
     @property _optionsForQueryParam
   */
   _optionsForQueryParam(qp: QueryParam) {
-    return get(this, `queryParams.${qp.urlKey}`) || get(this, `queryParams.${qp.prop}`) || {};
+    const queryParams = get(this, 'queryParams')
+    return get(queryParams, qp.urlKey) || get(queryParams, qp.prop) || queryParams[qp.urlKey] || queryParams[qp.prop] || {}  
   }
 
   /**

From 786ad9b6f5387a6e818244110b8c8e2377040cb9 Mon Sep 17 00:00:00 2001
From: Eric White <ewhite@ciena.com>
Date: Wed, 14 Aug 2019 17:17:30 -0400
Subject: [PATCH 0003/1405] Write test for _optionsForQueryParam

---
 .../routing/tests/system/route_test.js        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 870db3fbfea..5aa26d8ad12 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -163,6 +163,34 @@ moduleFor(
       runDestroy(owner);
     }
 
+    ["@test _optionsForQueryParam should work with nested properties"](assert) {
+      let route = EmberRoute.extend({
+        queryParams: {
+          'nested.foo': {
+            // By default, controller query param properties don't
+            // cause a full transition when they are changed, but
+            // rather only cause the URL to update. Setting
+            // `refreshModel` to true will cause an "in-place"
+            // transition to occur, whereby the model hooks for
+            // this route (and any child routes) will re-fire, allowing
+            // you to reload models (e.g., from the server) using the
+            // updated query param values.
+            refreshModel: true,
+
+            // By default, the query param URL key is the same name as
+            // the controller property name. Use `as` to specify a
+            // different URL key.
+            as: 'foobar'
+          }
+        }
+      }).create();
+
+      assert.strictEqual(route._optionsForQueryParam({
+        prop: 'nested.foo',
+        urlKey: 'foobar'
+      }), route.queryParams['nested.foo']);
+    }
+
     ["@test modelFor doesn't require the routerMicrolib"](assert) {
       let route = EmberRoute.create({
         _router: { _routerMicrolib: null },

From 7f8bc8f248d1cfa07bd472ac1a9a5a1945486086 Mon Sep 17 00:00:00 2001
From: Eric White <ewhite@ciena.com>
Date: Thu, 15 Aug 2019 10:08:12 -0400
Subject: [PATCH 0004/1405] fix linting

---
 packages/@ember/-internals/routing/lib/system/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index bed3f7370ef..fb5e6fc5926 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -308,7 +308,7 @@ class Route extends EmberObject implements IRoute {
   */
   _optionsForQueryParam(qp: QueryParam) {
     const queryParams = get(this, 'queryParams')
-    return get(queryParams, qp.urlKey) || get(queryParams, qp.prop) || queryParams[qp.urlKey] || queryParams[qp.prop] || {}  
+    return get(queryParams, qp.urlKey) || get(queryParams, qp.prop) || queryParams[qp.urlKey] || queryParams[qp.prop] || {}
   }
 
   /**

From f1303e2fb0ca4f4bb259fff26b1096f143def38a Mon Sep 17 00:00:00 2001
From: Eric White <ewhite@ciena.com>
Date: Thu, 15 Aug 2019 10:31:20 -0400
Subject: [PATCH 0005/1405] Actually fix linting

---
 .../-internals/routing/lib/system/route.ts    | 10 ++++++++--
 .../routing/tests/system/route_test.js        | 19 +++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index fb5e6fc5926..404e435d2aa 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -307,8 +307,14 @@ class Route extends EmberObject implements IRoute {
     @property _optionsForQueryParam
   */
   _optionsForQueryParam(qp: QueryParam) {
-    const queryParams = get(this, 'queryParams')
-    return get(queryParams, qp.urlKey) || get(queryParams, qp.prop) || queryParams[qp.urlKey] || queryParams[qp.prop] || {}
+    const queryParams = get(this, 'queryParams');
+    return (
+      get(queryParams, qp.urlKey) ||
+      get(queryParams, qp.prop) ||
+      queryParams[qp.urlKey] ||
+      queryParams[qp.prop] ||
+      {}
+    );
   }
 
   /**
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 5aa26d8ad12..d0b828a923b 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -163,7 +163,7 @@ moduleFor(
       runDestroy(owner);
     }
 
-    ["@test _optionsForQueryParam should work with nested properties"](assert) {
+    ['@test _optionsForQueryParam should work with nested properties'](assert) {
       let route = EmberRoute.extend({
         queryParams: {
           'nested.foo': {
@@ -180,15 +180,18 @@ moduleFor(
             // By default, the query param URL key is the same name as
             // the controller property name. Use `as` to specify a
             // different URL key.
-            as: 'foobar'
-          }
-        }
+            as: 'foobar',
+          },
+        },
       }).create();
 
-      assert.strictEqual(route._optionsForQueryParam({
-        prop: 'nested.foo',
-        urlKey: 'foobar'
-      }), route.queryParams['nested.foo']);
+      assert.strictEqual(
+        route._optionsForQueryParam({
+          prop: 'nested.foo',
+          urlKey: 'foobar',
+        }),
+        route.queryParams['nested.foo']
+      );
     }
 
     ["@test modelFor doesn't require the routerMicrolib"](assert) {

From 512e2b0a34f3f2be1edaed20bdf37067ace01f0f Mon Sep 17 00:00:00 2001
From: bekzod <bekzod@me.com>
Date: Wed, 6 Feb 2019 20:36:07 +0500
Subject: [PATCH 0006/1405] [BUGFIX] avoid tampering `queryParam` argument in
 RouterService#isActive

---
 .../-internals/routing/lib/services/router.ts |  3 +++
 .../router_service_test/isActive_test.js      | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 60b23bd4430..4079bb1f484 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,6 +1,7 @@
 import { Evented } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
+import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { Transition } from 'router_js';
@@ -319,6 +320,7 @@ export default class RouterService extends Service {
     let hasQueryParams = Object.keys(queryParams).length > 0;
 
     if (hasQueryParams) {
+      queryParams = assign({}, queryParams);
       this._router._prepareQueryParams(
         // UNSAFE: casting `routeName as string` here encodes the existing
         // assumption but may be wrong: `extractRouteArgs` correctly returns it
@@ -334,6 +336,7 @@ export default class RouterService extends Service {
         queryParams as QueryParam,
         true /* fromRouterService */
       );
+
       return shallowEqual(queryParams, routerMicrolib.state!.queryParams);
     }
 
diff --git a/packages/ember/tests/routing/router_service_test/isActive_test.js b/packages/ember/tests/routing/router_service_test/isActive_test.js
index 0fec62fcaa2..d638ea1d1c4 100644
--- a/packages/ember/tests/routing/router_service_test/isActive_test.js
+++ b/packages/ember/tests/routing/router_service_test/isActive_test.js
@@ -105,5 +105,30 @@ moduleFor(
           );
         });
     }
+
+    ['@test RouterService#isActive does not alter query params hash'](assert) {
+      assert.expect(3);
+
+      this.add(
+        'controller:parent.child',
+        Controller.extend({
+          queryParams: ['sort', 'page'],
+          sort: 'ASC',
+          page: 1,
+        })
+      );
+
+      let qp = this.buildQueryParams({ sort: 'ascending' });
+
+      return this.visit('/')
+        .then(() => {
+          return this.routerService.transitionTo('parent.child', qp);
+        })
+        .then(() => {
+          assert.ok(this.routerService.isActive('parent.child', qp));
+          assert.ok(this.routerService.isActive('parent.child', qp)); // using same qp second time should not fail
+          assert.deepEqual(qp.queryParams, { sort: 'ascending' });
+        });
+    }
   }
 );

From 77c03bedb91e9934e7e8c069737e3899293dd46b Mon Sep 17 00:00:00 2001
From: Chris Ng <chrisrcng@gmail.com>
Date: Thu, 28 May 2020 17:38:34 -0400
Subject: [PATCH 0007/1405] [FEATURE deprecate-get-with-default] Deprecate
 getWithDefault based on RFC 0554

---
 .../-internals/metal/lib/property_get.ts      |  12 +-
 .../metal/tests/accessors/get_test.js         | 120 +++++++++---------
 2 files changed, 74 insertions(+), 58 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index feb503394f9..b4413397525 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -2,7 +2,7 @@
 @module @ember/object
 */
 import { HAS_NATIVE_PROXY, isEmberArray, isProxy, symbol } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
   consumeTag,
@@ -181,12 +181,22 @@ export function _getPath<T extends object>(root: T, path: string | string[]): an
   @param {Object} defaultValue The value to return if the property value is undefined
   @return {Object} The property value or the defaultValue.
   @public
+  @deprecated
 */
 export function getWithDefault<T extends object, K extends Extract<keyof T, string>>(
   root: T,
   key: K,
   defaultValue: T[K]
 ): T[K] {
+  deprecate(
+    'Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined.',
+    false,
+    {
+      id: 'ember-metal.get-with-default',
+      until: '4.0.0',
+    }
+  );
+
   let value = get(root, key);
 
   if (value === undefined) {
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index 9765be3872a..30596be0db0 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -207,35 +207,37 @@ moduleFor(
   'getWithDefault',
   class extends AbstractTestCase {
     ['@test should get arbitrary properties on an object'](assert) {
-      let obj = {
-        string: 'string',
-        number: 23,
-        boolTrue: true,
-        boolFalse: false,
-        nullValue: null,
-      };
+      expectDeprecation(() => {
+        let obj = {
+          string: 'string',
+          number: 23,
+          boolTrue: true,
+          boolFalse: false,
+          nullValue: null,
+        };
 
-      for (let key in obj) {
-        if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-          continue;
+        for (let key in obj) {
+          if (!Object.prototype.hasOwnProperty.call(obj, key)) {
+            continue;
+          }
+          assert.equal(getWithDefault(obj, key, 'fail'), obj[key], key);
         }
-        assert.equal(getWithDefault(obj, key, 'fail'), obj[key], key);
-      }
 
-      obj = {
-        undef: undefined,
-      };
+        obj = {
+          undef: undefined,
+        };
 
-      assert.equal(
-        getWithDefault(obj, 'undef', 'default'),
-        'default',
-        'explicit undefined retrieves the default'
-      );
-      assert.equal(
-        getWithDefault(obj, 'not-present', 'default'),
-        'default',
-        'non-present key retrieves the default'
-      );
+        assert.equal(
+          getWithDefault(obj, 'undef', 'default'),
+          'default',
+          'explicit undefined retrieves the default'
+        );
+        assert.equal(
+          getWithDefault(obj, 'not-present', 'default'),
+          'default',
+          'non-present key retrieves the default'
+        );
+      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
     }
 
     ['@test should call unknownProperty if defined and value is undefined'](assert) {
@@ -253,24 +255,26 @@ moduleFor(
     }
 
     ['@test if unknownProperty is present, it is called using getFromEmberMetal()/set()'](assert) {
-      let obj = {
-        unknownProperty(key) {
-          if (key === 'foo') {
-            assert.equal(key, 'foo', 'should pass key');
-            return 'FOO';
-          }
-        },
-      };
-      assert.equal(
-        getWithDefault(obj, 'foo', 'fail'),
-        'FOO',
-        'should return value from unknownProperty'
-      );
-      assert.equal(
-        getWithDefault(obj, 'bar', 'default'),
-        'default',
-        'should convert undefined from unknownProperty into default'
-      );
+      expectDeprecation(() => {
+        let obj = {
+          unknownProperty(key) {
+            if (key === 'foo') {
+              assert.equal(key, 'foo', 'should pass key');
+              return 'FOO';
+            }
+          },
+        };
+        assert.equal(
+          getWithDefault(obj, 'foo', 'fail'),
+          'FOO',
+          'should return value from unknownProperty'
+        );
+        assert.equal(
+          getWithDefault(obj, 'bar', 'default'),
+          'default',
+          'should convert undefined from unknownProperty into default'
+        );
+      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
     }
 
     ['@test if unknownProperty is present, it is called using accessors'](assert) {
@@ -320,23 +324,25 @@ moduleFor(
     ['@test (regression) watched properties on unmodified inherited objects should still return their original value'](
       assert
     ) {
-      let MyMixin = Mixin.create({
-        someProperty: 'foo',
-        propertyDidChange: observer('someProperty', () => {
-          /* nothing to do */
-        }),
-      });
+      expectDeprecation(() => {
+        let MyMixin = Mixin.create({
+          someProperty: 'foo',
+          propertyDidChange: observer('someProperty', () => {
+            /* nothing to do */
+          }),
+        });
 
-      let baseObject = MyMixin.apply({});
-      let theRealObject = Object.create(baseObject);
+        let baseObject = MyMixin.apply({});
+        let theRealObject = Object.create(baseObject);
 
-      assert.equal(
-        getWithDefault(theRealObject, 'someProperty', 'fail'),
-        'foo',
-        'should return the set value, not false'
-      );
+        assert.equal(
+          getWithDefault(theRealObject, 'someProperty', 'fail'),
+          'foo',
+          'should return the set value, not false'
+        );
 
-      run(() => destroy(baseObject));
+        run(() => destroy(baseObject));
+      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
     }
 
     ['@test should respect prototypical inheritance when subclasses override CPs'](assert) {

From f2d836404616a942bdbd2a5c3818009f094fbd34 Mon Sep 17 00:00:00 2001
From: Chris Ng <chrisrcng@gmail.com>
Date: Thu, 28 May 2020 18:54:31 -0400
Subject: [PATCH 0008/1405] Add url for deprecate getWithDefault, Add
 expectDeprecation for get_test and computed_test, Add docs for getWithDefault
 in observable

---
 .../-internals/metal/lib/property_get.ts      |  1 +
 .../metal/tests/tracked/get_test.js           | 38 ++++++++++---------
 .../runtime/lib/mixins/observable.js          |  1 +
 .../tests/system/object/computed_test.js      |  6 ++-
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index b4413397525..4f891b6c3c2 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -194,6 +194,7 @@ export function getWithDefault<T extends object, K extends Extract<keyof T, stri
     {
       id: 'ember-metal.get-with-default',
       until: '4.0.0',
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-metal-get-with-default',
     }
   );
 
diff --git a/packages/@ember/-internals/metal/tests/tracked/get_test.js b/packages/@ember/-internals/metal/tests/tracked/get_test.js
index d5578efafba..5a8dda09523 100644
--- a/packages/@ember/-internals/metal/tests/tracked/get_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/get_test.js
@@ -44,28 +44,30 @@ moduleFor(
     }
 
     ['@test should get arbitrary properties on an object']() {
-      let obj = createObj();
+      expectDeprecation(() => {
+        let obj = createObj();
 
-      for (let key in obj) {
-        this.assert.equal(getWithDefault(obj, key, 'fail'), obj[key], key);
-      }
+        for (let key in obj) {
+          this.assert.equal(getWithDefault(obj, key, 'fail'), obj[key], key);
+        }
 
-      class Obj {
-        @tracked undef = undefined;
-      }
+        class Obj {
+          @tracked undef = undefined;
+        }
 
-      let obj2 = new Obj();
+        let obj2 = new Obj();
 
-      this.assert.equal(
-        getWithDefault(obj2, 'undef', 'default'),
-        'default',
-        'explicit undefined retrieves the default'
-      );
-      this.assert.equal(
-        getWithDefault(obj2, 'not-present', 'default'),
-        'default',
-        'non-present key retrieves the default'
-      );
+        this.assert.equal(
+          getWithDefault(obj2, 'undef', 'default'),
+          'default',
+          'explicit undefined retrieves the default'
+        );
+        this.assert.equal(
+          getWithDefault(obj2, 'not-present', 'default'),
+          'default',
+          'non-present key retrieves the default'
+        );
+      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
     }
   }
 );
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.js b/packages/@ember/-internals/runtime/lib/mixins/observable.js
index 06c8e59cf5b..840bda8f4ca 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.js
@@ -417,6 +417,7 @@ export default Mixin.create({
     @param {Object} defaultValue The value to return if the property value is undefined
     @return {Object} The property value or the defaultValue.
     @public
+    @deprecated
   */
   getWithDefault(keyName, defaultValue) {
     return getWithDefault(this, keyName, defaultValue);
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
index 03ed6291321..9eeecd27211 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
@@ -18,8 +18,10 @@ function K() {
 
 function testWithDefault(assert, expect, x, y, z) {
   assert.equal(get(x, y), expect);
-  assert.equal(getWithDefault(x, y, z), expect);
-  assert.equal(x.getWithDefault(y, z), expect);
+  expectDeprecation(() => {
+    assert.equal(getWithDefault(x, y, z), expect);
+    assert.equal(x.getWithDefault(y, z), expect);
+  }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
 }
 
 moduleFor(

From bb8cd68ee0f0a893faea1e010c3ec384f039ad73 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 26 May 2020 16:54:53 -0400
Subject: [PATCH 0009/1405] Add v3.20.0-beta.1 to CHANGELOG [ci skip]

(cherry picked from commit 3a9206aeb4147232e3e659007af5fb2868d8a842)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2b830f141..b0c15ff3e40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Ember Changelog
 
+### v3.20.0-beta.1 (May 26, 2020)
+
+- [#18926](https://github.com/emberjs/ember.js/pull/18926) / [#18852](https://github.com/emberjs/ember.js/pull/18852) [FEATURE] Implement the [Yieldable Named Blocks](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md) RFC.
+- [#18867](https://github.com/emberjs/ember.js/pull/18867) / [#18927](https://github.com/emberjs/ember.js/pull/18927) / [#18928](https://github.com/emberjs/ember.js/pull/18928) [FEATURE] [Promote `{{in-element}}` to public API](https://github.com/emberjs/rfcs/blob/master/text/0287-promote-in-element-to-public-api.md) RFC.
+- [#18859](https://github.com/emberjs/ember.js/pull/18859) Fix transitionTo with scoped aliased queryParam.
+- [#18961](https://github.com/emberjs/ember.js/pull/18961) [BUGFIX] Remove assertions for updating auto-tracked state without Ember.set / this.set
+
 ### v3.19.0 (May 26, 2020)
 
 - [#18982](https://github.com/emberjs/ember.js/pull/18982) / [#18913](https://github.com/emberjs/ember.js/pull/18913) [BUGFIX] Update rendering engine to latest version.

From c0606a44eeb522ed4e533945836a29d3a8da1e66 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 26 May 2020 17:03:30 -0400
Subject: [PATCH 0010/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fb2bf5c70f5..7d0d5646c01 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.20.0",
+  "version": "3.21.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From f16d174763be6641b0ff50a256feac5e1fa4e2c3 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 29 May 2020 14:01:49 -0600
Subject: [PATCH 0011/1405] [BUGFIX LTS] invoke methods correctly in
 TextSupport sendAction

The introduction of the `attrs` API in Ember 3.13 included wrapping
items passed to components with `MutableCell`, to support two-way
binding. Although two-way binding is gone from much of Ember, the text
input components (`Input` and `Textarea`) continue to support it, via
the `TextSupport` mixins. The `sendAction` function used by the mixin
previously assumed that the only options were for an action to be a
string or a function -- not a function wrapped in a `MutableCell`.

The result was that this code, which would be expected to work, did not:
it would simply never be invoked.

    <Textarea @focus-in={{this.didFocusIn}} />

Accordingly, add logic to `sendAction` in `text_support.js` to unwrap a
mutable cell if it is set, and otherwise to carry on with the logic as
it was previously.

Resolves #18994
---
 .../components/input-angle-test.js            | 11 +++++++++
 .../components/input-curly-test.js            | 11 +++++++++
 .../components/textarea-angle-test.js         | 11 +++++++++
 .../components/textarea-curly-test.js         | 11 +++++++++
 .../views/lib/mixins/text_support.js          | 23 +++++++++++++------
 5 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 3edda7cdb7d..c6a029c2429 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,5 +1,6 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 
+import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
@@ -780,6 +781,16 @@ moduleFor(
     ['@test sends an action with `<Input EVENT={{action "foo"}} />` for native DOM events']() {
       this.assertTriggersNativeDOMEvents();
     }
+
+    ['@test triggers a method with `<Input @key-up={{this.didTrigger}} />`'](assert) {
+      this.render(`<Input @key-up={{this.didTrigger}} />`, {
+        didTrigger: action(function() {
+          assert.ok(true, 'action was triggered');
+        }),
+      });
+
+      this.triggerEvent('keyup', { keyCode: 65 });
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 948d7a1cc6e..47f91bf60b1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -1,5 +1,6 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 
+import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
@@ -631,6 +632,16 @@ moduleFor(
     ['@test sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
       this.assertTriggersNativeDOMEvents();
     }
+
+    ['@test triggers a method with `{{input key-up=this.didTrigger}}`'](assert) {
+      this.render(`{{input key-up=this.didTrigger}}`, {
+        didTrigger: action(function() {
+          assert.ok(true, 'action was triggered');
+        }),
+      });
+
+      this.triggerEvent('keyup', { keyCode: 65 });
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index 592107c7143..63dda4652c8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -1,5 +1,6 @@
 import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
 
+import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 
@@ -209,5 +210,15 @@ moduleFor(
       runTask(() => set(this.context, 'model', { val: 'A beautiful day in Seattle' }));
       this.assertTextArea({ value: 'A beautiful day in Seattle' });
     }
+
+    ['@test triggers a method with `<Textarea @key-up={{this.didTrigger}} />`'](assert) {
+      this.render(`<Textarea @key-up={{this.didTrigger}} />`, {
+        didTrigger: action(function() {
+          assert.ok(true, 'action was triggered');
+        }),
+      });
+
+      this.triggerEvent('keyup', { keyCode: 65 });
+    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 18636e19692..b15ca7166bd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -1,5 +1,6 @@
 import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
 
+import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 
@@ -161,5 +162,15 @@ moduleFor(
       runTask(() => set(this.context, 'model', { val: 'A beautiful day in Seattle' }));
       this.assertTextArea({ value: 'A beautiful day in Seattle' });
     }
+
+    ['@test triggers a method with `{{textarea key-up=this.didTrigger}}`'](assert) {
+      this.render(`{{textarea key-up=this.didTrigger}}`, {
+        didTrigger: action(function() {
+          assert.ok(true, 'action was triggered');
+        }),
+      });
+
+      this.triggerEvent('keyup', { keyCode: 65 });
+    }
   }
 );
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index 8f32ddac8aa..f26be5ef22b 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -6,6 +6,7 @@ import { get, set, Mixin } from '@ember/-internals/metal';
 import { TargetActionSupport } from '@ember/-internals/runtime';
 import { deprecate } from '@ember/debug';
 import { SEND_ACTION } from '@ember/deprecated-features';
+import { MUTABLE_CELL } from '@ember/-internals/views';
 
 const KEY_EVENTS = {
   13: 'insertNewline',
@@ -306,11 +307,19 @@ export default Mixin.create(TargetActionSupport, {
 // sendAction semantics for TextField are different from
 // the component semantics so this method normalizes them.
 function sendAction(eventName, view, event) {
-  let actionName = get(view, `attrs.${eventName}`) || get(view, eventName);
+  let action = get(view, `attrs.${eventName}`);
+  if (action !== null && typeof action === 'object' && action[MUTABLE_CELL] === true) {
+    action = action.value;
+  }
+
+  if (action === undefined) {
+    action = get(view, eventName);
+  }
+
   let value = get(view, 'value');
 
-  if (SEND_ACTION && typeof actionName === 'string') {
-    let message = `Passing actions to components as strings (like \`<Input @${eventName}="${actionName}" />\`) is deprecated. Please use closure actions instead (\`<Input @${eventName}={{action "${actionName}"}} />\`).`;
+  if (SEND_ACTION && typeof action === 'string') {
+    let message = `Passing actions to components as strings (like \`<Input @${eventName}="${action}" />\`) is deprecated. Please use closure actions instead (\`<Input @${eventName}={{action "${action}"}} />\`).`;
 
     deprecate(message, false, {
       id: 'ember-component.send-action',
@@ -319,14 +328,14 @@ function sendAction(eventName, view, event) {
     });
 
     view.triggerAction({
-      action: actionName,
+      action: action,
       actionContext: [value, event],
     });
-  } else if (typeof actionName === 'function') {
-    actionName(value, event);
+  } else if (typeof action === 'function') {
+    action(value, event);
   }
 
-  if (actionName && !get(view, 'bubbles')) {
+  if (action && !get(view, 'bubbles')) {
     event.stopPropagation();
   }
 }

From ef67e4a18465f1e23b3112a65843594179a9a6f7 Mon Sep 17 00:00:00 2001
From: bekzod <bekzod@me.com>
Date: Sun, 31 May 2020 14:35:10 +0500
Subject: [PATCH 0012/1405] [CLEANUP]: remove redundant `-input-type` helper

---
 .../-internals/glimmer/lib/helpers/-input-type.ts  | 14 --------------
 packages/@ember/-internals/glimmer/lib/resolver.ts |  2 --
 2 files changed, 16 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts b/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts
deleted file mode 100644
index 58286e7f6fe..00000000000
--- a/packages/@ember/-internals/glimmer/lib/helpers/-input-type.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
-
-function inputTypeHelper({ positional }: CapturedArguments) {
-  let type = positional.at(0).value();
-  if (type === 'checkbox') {
-    return '-checkbox';
-  }
-  return '-text-field';
-}
-
-export default function(args: VMArguments, vm: VM) {
-  return new HelperRootReference(inputTypeHelper, args.capture(), vm.env);
-}
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 29c977b6e80..90fdedbad1e 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -30,7 +30,6 @@ import InternalComponentManager, {
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
 import { isClassHelper, isHelperFactory } from './helper';
 import { default as componentAssertionHelper } from './helpers/-assert-implicit-component-helper-argument';
-import { default as inputTypeHelper } from './helpers/-input-type';
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
 import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
@@ -257,7 +256,6 @@ const BUILTINS_HELPERS: IBuiltInHelpers = {
   unless: inlineUnless,
   '-hash': hash,
   '-each-in': eachIn,
-  '-input-type': inputTypeHelper,
   '-normalize-class': normalizeClassHelper,
   '-track-array': trackArray,
   '-get-dynamic-var': getDynamicVar,

From b17c5e3dcdd0525e0aa7707afbf4858496732af1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Jun 2020 13:23:41 +0000
Subject: [PATCH 0013/1405] Bump aws-sdk from 2.674.0 to 2.686.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.674.0 to 2.686.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.674.0...v2.686.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7d0d5646c01..093ac1759e2 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "@types/rsvp": "^4.0.3",
     "@typescript-eslint/parser": "^2.33.0",
     "auto-dist-tag": "^1.0.0",
-    "aws-sdk": "^2.674.0",
+    "aws-sdk": "^2.686.0",
     "babel-eslint": "^10.1.0",
     "babel-plugin-module-resolver": "^4.0.0",
     "babel-template": "^6.26.0",
diff --git a/yarn.lock b/yarn.lock
index 5928287f981..7e9e447915c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1580,10 +1580,10 @@ auto-dist-tag@^1.0.0:
     pkg-up "^2.0.0"
     semver "^5.3.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.674.0:
-  version "2.674.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.674.0.tgz#aa015f77f11d073089bf080031f3936bb16c423d"
-  integrity sha512-C0hBwsA779y3xbS1AClDcsg8ZBJE+BJC4vt1eHpI2mEbr0/qIwOcR2hl1DjXyp3RwHKoa/LPOTHRSSHDq01PxA==
+aws-sdk@^2.0.9, aws-sdk@^2.686.0:
+  version "2.686.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.686.0.tgz#c58c3874eff4c76c763d137df617e87971321eb7"
+  integrity sha512-QhYhJ5y8tUG5SlmY3CSf9RBaa3EFbta28oarOyiwceHKmY80cMCafRI1YypT6CVDx/q91dbnSNQfWhs0cZPbBQ==
   dependencies:
     buffer "4.9.1"
     events "1.1.1"

From 7676db612c554ce49b1c6917762e0242e6c5d802 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 2 Jun 2020 15:34:22 -0400
Subject: [PATCH 0014/1405] Add v3.20.0-beta.2 to CHANGELOG [ci skip]

(cherry picked from commit 74d757e6bc4b77845e61372b682f2218e6ed2535)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0c15ff3e40..82c701b84f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.20.0-beta.2 (June 2, 2020)
+
+- [#18997](https://github.com/emberjs/ember.js/pull/18997) [BUGFIX] Fix components `<Input>` and `<Textarea>` to work with native class actions correctly.
+
 ### v3.20.0-beta.1 (May 26, 2020)
 
 - [#18926](https://github.com/emberjs/ember.js/pull/18926) / [#18852](https://github.com/emberjs/ember.js/pull/18852) [FEATURE] Implement the [Yieldable Named Blocks](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md) RFC.

From e978f2958f5523961c87701581ea5b17fdd1d1c7 Mon Sep 17 00:00:00 2001
From: sammichelson <s.michelson89@gmail.com>
Date: Fri, 5 Jun 2020 15:30:08 -0400
Subject: [PATCH 0015/1405] [DOC] Updated decorator example.

---
 packages/@ember/-internals/metal/lib/computed.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 6d663273e93..656d214e6af 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -174,7 +174,7 @@ function noop(): void {}
       set(this, 'lastName', lastName);
     }
 
-    @fullNameMacro fullName;
+    @fullNameMacro('firstName', 'lastName') fullName;
   });
 
   let person = new Person();

From 68d741737b46ca5287177584d0a8bf6196ac908b Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 18 Jun 2020 16:37:59 -0700
Subject: [PATCH 0016/1405] [BUGFIX beta] Disallow null/undefined targets in
 in-element

---
 .../lib/helpers/-in-element-null-check.ts     | 38 +++++++++++++++++++
 .../@ember/-internals/glimmer/lib/resolver.ts |  2 +
 .../syntax/public-in-element-test.js          | 36 ++++++++++++++++++
 .../lib/plugins/transform-in-element.ts       |  9 +++++
 4 files changed, 85 insertions(+)
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
new file mode 100644
index 00000000000..26b5340443e
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -0,0 +1,38 @@
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { Helper, VMArguments } from '@glimmer/interfaces';
+import { VersionedPathReference } from '@glimmer/reference';
+import { Tag } from '@glimmer/validator';
+
+let helper: Helper;
+
+if (DEBUG) {
+  class InElementNullCheckReference implements VersionedPathReference {
+    public tag: Tag;
+
+    constructor(private inner: VersionedPathReference) {
+      this.tag = inner.tag;
+    }
+
+    value(): unknown {
+      let value = this.inner.value();
+
+      assert(
+        'You cannot pass a null or undefined destination element to in-element',
+        value !== null && value !== undefined
+      );
+
+      return value;
+    }
+
+    get(key: string): VersionedPathReference {
+      return this.inner.get(key);
+    }
+  }
+
+  helper = (args: VMArguments) => new InElementNullCheckReference(args.positional.at(0));
+} else {
+  helper = (args: VMArguments) => args.positional.at(0);
+}
+
+export default helper;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 90fdedbad1e..3550593bd7c 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -30,6 +30,7 @@ import InternalComponentManager, {
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
 import { isClassHelper, isHelperFactory } from './helper';
 import { default as componentAssertionHelper } from './helpers/-assert-implicit-component-helper-argument';
+import { default as inElementNullCheckHelper } from './helpers/-in-element-null-check';
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
 import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
@@ -262,6 +263,7 @@ const BUILTINS_HELPERS: IBuiltInHelpers = {
   '-mount': mountHelper,
   '-outlet': outletHelper,
   '-assert-implicit-component-helper-argument': componentAssertionHelper,
+  '-in-el-null': inElementNullCheckHelper,
 };
 
 interface IBuiltInModifiers {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
index 9d653c287e7..7a9a6db03be 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
@@ -119,6 +119,42 @@ moduleFor(
       }, /Can only pass null to insertBefore in in-element, received:/);
     }
 
+    ['@feature(EMBER_GLIMMER_IN_ELEMENT) does not allow null as a destination element']() {
+      let someElement = null;
+
+      expectAssertion(() => {
+        this.render(
+          strip`
+            {{#in-element someElement}}
+              {{text}}
+            {{/in-element}}
+          `,
+          {
+            someElement,
+            text: 'Whoop!',
+          }
+        );
+      }, /You cannot pass a null or undefined destination element to in-element/);
+    }
+
+    ['@feature(EMBER_GLIMMER_IN_ELEMENT) does not undefined as a destination element']() {
+      let someElement = undefined;
+
+      expectAssertion(() => {
+        this.render(
+          strip`
+            {{#in-element someElement}}
+              {{text}}
+            {{/in-element}}
+          `,
+          {
+            someElement,
+            text: 'Whoop!',
+          }
+        );
+      }, /You cannot pass a null or undefined destination element to in-element/);
+    }
+
     ['@feature(EMBER_GLIMMER_IN_ELEMENT) components are cleaned up properly'](assert) {
       let hooks = [];
 
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 5c17597ccb6..9a84aed7b40 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -55,6 +55,15 @@ export default function transformInElement(env: ASTPluginEnvironment): ASTPlugin
 
         if (node.path.original === 'in-element') {
           if (EMBER_GLIMMER_IN_ELEMENT) {
+            let originalValue = node.params[0];
+
+            if (originalValue) {
+              let subExpr = b.sexpr('-in-el-null', [originalValue]);
+
+              node.params.shift();
+              node.params.unshift(subExpr);
+            }
+
             node.hash.pairs.forEach(pair => {
               if (pair.key === 'insertBefore') {
                 assert(

From 21a85072737c304c02b5921fbddb136b48379052 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <runspired@gmail.com>
Date: Fri, 19 Jun 2020 17:03:17 -0700
Subject: [PATCH 0017/1405] [BUGFIX lts] dont access properties during init
 unless required

---
 .../runtime/lib/system/core_object.js         |  4 ++--
 .../runtime/tests/system/core_object_test.js  | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 186a52c6f8f..5ebddd826dc 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -102,9 +102,8 @@ function initialize(obj, properties) {
       let isDescriptor = possibleDesc !== undefined;
 
       if (!isDescriptor) {
-        let baseValue = obj[keyName];
-
         if (hasConcatenatedProps && concatenatedProperties.indexOf(keyName) > -1) {
+          let baseValue = obj[keyName];
           if (baseValue) {
             value = makeArray(baseValue).concat(value);
           } else {
@@ -113,6 +112,7 @@ function initialize(obj, properties) {
         }
 
         if (hasMergedProps && mergedProperties.indexOf(keyName) > -1) {
+          let baseValue = obj[keyName];
           value = assign({}, baseValue, value);
         }
       }
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index c638e419aa9..db0f8c0e9c5 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -2,6 +2,7 @@ import { getOwner, setOwner } from '@ember/-internals/owner';
 import { get, set, observer } from '@ember/-internals/metal';
 import CoreObject from '../../lib/system/core_object';
 import { moduleFor, AbstractTestCase, buildOwner, runLoopSettled } from 'internal-test-helpers';
+import { track } from '@glimmer/validator';
 
 moduleFor(
   'Ember.CoreObject',
@@ -132,5 +133,24 @@ moduleFor(
 
       test.destroy();
     }
+
+    ['@test native getters/setters do not cause rendering invalidation during init'](assert) {
+      let objectMeta = Object.create(null);
+
+      class TestObject extends CoreObject {
+        get hiddenValue() {
+          let v = get(objectMeta, 'hiddenValue');
+          return v !== undefined ? v : false;
+        }
+        set hiddenValue(v) {
+          set(objectMeta, 'hiddenValue', v);
+        }
+      }
+
+      track(() => {
+        TestObject.create({ hiddenValue: true });
+        assert.ok(true, 'We did not error');
+      });
+    }
   }
 );

From 0b53acaafb707d8f602211cfbecb3ad64105c50e Mon Sep 17 00:00:00 2001
From: Christophe Charles <ccharles@octo.com>
Date: Sun, 21 Jun 2020 16:18:37 +0200
Subject: [PATCH 0018/1405] [DOC] Added example for LinkTo query param property

---
 .../glimmer/lib/components/link-to.ts         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 6cb7edbd91c..5b34abd73e8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -230,6 +230,25 @@ import layout from '../templates/link-to';
   In general, this is not recommended. Instead, you can use the `transition-to` helper together
   with a click event handler on the HTML tag of your choosing.
 
+  ### Supplying query parameters
+
+  If you need to add optional key-value pairs that appear to the right of the ? in a URL,
+  you can use the `query` argument.
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @query={{hash page=1 per_page=20}}>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  This will result in:
+
+  ```html
+  <a href="/hamster-photos?page=1&per_page=20">
+    Great Hamster Photos
+  </a>
+  ```
+
   @for Ember.Templates.components
   @method LinkTo
   @see {LinkComponent}

From 17f9c2800b2a48c363fe77f8762c24ac1d49ac42 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 22 Jun 2020 15:26:23 -0400
Subject: [PATCH 0019/1405] Add v3.20.0-beta.3 to CHANGELOG [ci skip]

(cherry picked from commit 25d806cfcda2b0b6b5172e2be1a60ba869d681fc)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82c701b84f9..123953a6f98 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.20.0-beta.3 (June 22, 2020)
+
+- [#19021](https://github.com/emberjs/ember.js/pull/19021) [BUGFIX] Disallow null/undefined targets in `in-element`.
+- [#19023](https://github.com/emberjs/ember.js/pull/19023) [BUGFIX] Don't access properties during init unless required to prevent unnecessary rendering invalidations.
+
 ### v3.20.0-beta.2 (June 2, 2020)
 
 - [#18997](https://github.com/emberjs/ember.js/pull/18997) [BUGFIX] Fix components `<Input>` and `<Textarea>` to work with native class actions correctly.

From 2bf857e3af0d87c08bc28c6a09ccfa902f15b615 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 22 Jun 2020 14:03:48 -0700
Subject: [PATCH 0020/1405] [BUGFIX beta] Updates Glimmer VM to 0.54.0

---
 package.json                                  |  16 +-
 .../lib/component-managers/abstract.ts        |   2 +-
 .../glimmer/lib/component-managers/curly.ts   |  22 +-
 .../glimmer/lib/component-managers/custom.ts  |  40 +---
 .../glimmer/lib/component-managers/input.ts   |  16 +-
 .../glimmer/lib/component-managers/mount.ts   |  32 ++-
 .../glimmer/lib/component-managers/outlet.ts  |  26 +--
 .../lib/component-managers/template-only.ts   |  16 +-
 .../-internals/glimmer/lib/environment.ts     |  52 ++++-
 .../glimmer/lib/modifiers/action.ts           |  12 +-
 .../glimmer/lib/modifiers/custom.ts           |  12 +-
 .../-internals/glimmer/lib/modifiers/on.ts    |  13 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |   5 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  12 +-
 .../lib/utils/curly-component-state-bucket.ts |   8 +-
 .../integration/components/append-test.js     |   4 +-
 packages/@ember/-internals/meta/lib/meta.ts   |  67 +-----
 packages/@ember/-internals/metal/index.ts     |   1 -
 .../@ember/-internals/metal/lib/computed.ts   |   3 +-
 .../@ember/-internals/metal/lib/destroy.ts    |  37 ----
 .../@ember/-internals/metal/lib/observer.ts   |  13 +-
 packages/@ember/-internals/metal/lib/tags.ts  |  59 +-----
 .../metal/tests/accessors/get_test.js         |   2 +-
 .../-internals/metal/tests/alias_test.js      |   2 +-
 .../-internals/metal/tests/computed_test.js   |  10 +-
 .../metal/tests/mixin/observer_test.js        |   3 +-
 .../-internals/metal/tests/observer_test.js   |   2 +-
 .../metal/tests/performance_test.js           |   2 +-
 .../runtime/lib/system/core_object.js         |  16 +-
 .../runtime/tests/ext/function_test.js        |   3 +-
 .../tests/mutable-array/removeObjects-test.js |   3 +-
 .../tests/system/object/create_test.js        |   3 +-
 packages/ember/index.js                       |   3 +-
 packages/ember/tests/reexports_test.js        |   2 +-
 yarn.lock                                     | 196 +++++++++---------
 35 files changed, 291 insertions(+), 424 deletions(-)
 delete mode 100644 packages/@ember/-internals/metal/lib/destroy.ts

diff --git a/package.json b/package.json
index 093ac1759e2..3942b8cf70d 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.53.0",
+    "@glimmer/compiler": "^0.54.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.53.0",
-    "@glimmer/node": "^0.53.0",
-    "@glimmer/opcode-compiler": "^0.53.0",
-    "@glimmer/program": "^0.53.0",
-    "@glimmer/reference": "^0.53.0",
-    "@glimmer/runtime": "^0.53.0",
-    "@glimmer/validator": "^0.53.0",
+    "@glimmer/interfaces": "^0.54.0",
+    "@glimmer/node": "^0.54.0",
+    "@glimmer/opcode-compiler": "^0.54.0",
+    "@glimmer/program": "^0.54.0",
+    "@glimmer/reference": "^0.54.0",
+    "@glimmer/runtime": "^0.54.0",
+    "@glimmer/validator": "^0.54.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
index 4bf8f7c69fd..6ccabd6838c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
@@ -61,5 +61,5 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
     // noop
   }
 
-  abstract getDestructor(bucket: T): Option<Destroyable>;
+  abstract getDestroyable(bucket: T): Option<Destroyable>;
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 67a2e480423..d7fdb8fabba 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -22,7 +22,7 @@ import {
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
 import { RootReference, VersionedPathReference } from '@glimmer/reference';
-import { PrimitiveReference } from '@glimmer/runtime';
+import { PrimitiveReference, registerDestructor } from '@glimmer/runtime';
 import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
 import { combine, Tag, validateTag, valueForTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
@@ -331,6 +331,10 @@ export default class CurlyComponentManager
         instance: component,
         template: state.template,
       });
+
+      registerDestructor(bucket, () => {
+        environment.extra.debugRenderTree.willDestroy(bucket);
+      });
     }
 
     return bucket;
@@ -453,20 +457,8 @@ export default class CurlyComponentManager
     }
   }
 
-  getDestructor(bucket: ComponentStateBucket): Option<Destroyable> {
-    if (ENV._DEBUG_RENDER_TREE) {
-      return {
-        willDestroy() {
-          bucket.willDestroy();
-        },
-        destroy() {
-          bucket.environment.extra.debugRenderTree.willDestroy(bucket);
-          bucket.destroy();
-        },
-      };
-    } else {
-      return bucket;
-    }
+  getDestroyable(bucket: ComponentStateBucket): Option<Destroyable> {
+    return bucket;
   }
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 4496d132c1f..a865ef2813f 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -1,3 +1,4 @@
+import { ENV } from '@ember/-internals/environment';
 import { CUSTOM_TAG_FOR } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
 import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
@@ -16,10 +17,9 @@ import {
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
 import { ComponentRootReference, PathReference } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { consumeTag, createTag, isConstTagged, Tag } from '@glimmer/validator';
-
-import { ENV } from '@ember/-internals/environment';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
@@ -285,6 +285,10 @@ export default class CustomComponentManager<ComponentInstance>
         instance: component,
         template: definition.template,
       });
+
+      registerDestructor(bucket, () => {
+        env.extra.debugRenderTree.willDestroy(bucket);
+      });
     }
 
     return bucket;
@@ -337,28 +341,8 @@ export default class CustomComponentManager<ComponentInstance>
     return new ComponentRootReference(delegate.getContext(component), env);
   }
 
-  getDestructor(state: CustomComponentState<ComponentInstance>): Option<Destroyable> {
-    let destructor: Option<Destroyable> = null;
-
-    if (hasDestructors(state.delegate)) {
-      destructor = state;
-    }
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      let inner = destructor;
-
-      destructor = {
-        destroy() {
-          state.env.extra.debugRenderTree.willDestroy(state);
-
-          if (inner) {
-            inner.destroy();
-          }
-        },
-      };
-    }
-
-    return destructor;
+  getDestroyable(bucket: CustomComponentState<ComponentInstance>): Option<Destroyable> {
+    return bucket;
   }
 
   getCapabilities({
@@ -406,13 +390,9 @@ export class CustomComponentState<ComponentInstance> {
     public args: CapturedArguments,
     public env: EmberVMEnvironment,
     public namedArgsProxy?: {}
-  ) {}
-
-  destroy() {
-    const { delegate, component } = this;
-
+  ) {
     if (hasDestructors(delegate)) {
-      delegate.destroyComponent(component);
+      registerDestructor(this, () => delegate.destroyComponent(component));
     }
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
index e5c9ff5a9f1..71f7a381b34 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
@@ -12,6 +12,7 @@ import {
   VMArguments,
 } from '@glimmer/interfaces';
 import { ComponentRootReference, ConstReference, VersionedPathReference } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { CONSTANT_TAG, createTag, isConstTagged } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import InternalComponentManager, { InternalDefinitionState } from './internal';
@@ -89,6 +90,8 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
         instance,
         template: layout,
       });
+
+      registerDestructor(instance, () => env.extra.debugRenderTree.willDestroy(state));
     }
 
     return state;
@@ -128,17 +131,8 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     }
   }
 
-  getDestructor(state: InputComponentState): Destroyable {
-    if (ENV._DEBUG_RENDER_TREE) {
-      return {
-        destroy() {
-          state.env.extra.debugRenderTree.willDestroy(state);
-          state.instance.destroy();
-        },
-      };
-    } else {
-      return state.instance;
-    }
+  getDestroyable(state: InputComponentState): Destroyable {
+    return state.instance;
   }
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 984ac6bd6f5..aa13beb37d9 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,3 +1,7 @@
+import { ENV } from '@ember/-internals/environment';
+import { generateControllerFactory } from '@ember/-internals/routing';
+import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
+import EngineInstance from '@ember/engine/instance';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
@@ -9,13 +13,8 @@ import {
   WithJitDynamicLayout,
 } from '@glimmer/interfaces';
 import { ComponentRootReference, VersionedPathReference } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { CONSTANT_TAG, createTag, isConstTag, Tag } from '@glimmer/validator';
-
-import { generateControllerFactory } from '@ember/-internals/routing';
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
-
-import { ENV } from '@ember/-internals/environment';
-import EngineInstance from '@ember/engine/instance';
 import { TemplateFactory } from '../..';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
@@ -119,6 +118,11 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
         // set in getDynamicLayout
         template: undefined,
       });
+
+      registerDestructor(engine, () => {
+        environment.extra.debugRenderTree.willDestroy(controller);
+        environment.extra.debugRenderTree.willDestroy(bucket);
+      });
     }
 
     return bucket;
@@ -142,20 +146,8 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
     return tag;
   }
 
-  getDestructor(bucket: EngineState): Option<Destroyable> {
-    let { engine, environment, controller } = bucket;
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      return {
-        destroy() {
-          environment.extra.debugRenderTree.willDestroy(controller);
-          environment.extra.debugRenderTree.willDestroy(bucket);
-          engine.destroy();
-        },
-      };
-    } else {
-      return engine;
-    }
+  getDestroyable(bucket: EngineState): Option<Destroyable> {
+    return bucket.engine;
   }
 
   didRenderLayout(bucket: EngineState, bounds: Bounds): void {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index ab608f6f894..9fed9fde112 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -16,7 +16,7 @@ import {
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
 import { ComponentRootReference, VersionedPathReference } from '@glimmer/reference';
-import { EMPTY_ARGS } from '@glimmer/runtime';
+import { EMPTY_ARGS, registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { CONSTANT_TAG, createTag, Tag } from '@glimmer/validator';
 
@@ -125,6 +125,16 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
         instance: definition.controller,
         template: definition.template,
       });
+
+      registerDestructor(state, () => {
+        state.environment.extra.debugRenderTree.willDestroy(state);
+
+        if (state.engine) {
+          state.environment.extra.debugRenderTree.willDestroy(state.engine);
+        }
+
+        state.environment.extra.debugRenderTree.willDestroy(state.outlet!);
+      });
     }
 
     return state;
@@ -191,19 +201,9 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
     }
   }
 
-  getDestructor(state: OutletInstanceState): Option<Destroyable> {
+  getDestroyable(state: OutletInstanceState): Option<Destroyable> {
     if (ENV._DEBUG_RENDER_TREE) {
-      return {
-        destroy() {
-          state.environment.extra.debugRenderTree.willDestroy(state);
-
-          if (state.engine) {
-            state.environment.extra.debugRenderTree.willDestroy(state.engine);
-          }
-
-          state.environment.extra.debugRenderTree.willDestroy(state.outlet!);
-        },
-      };
+      return state;
     } else {
       return null;
     }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index 7a586bf6ed7..c73f6d7b2ae 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -7,7 +7,7 @@ import {
   VMArguments,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { NULL_REFERENCE } from '@glimmer/runtime';
+import { NULL_REFERENCE, registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { CONSTANT_TAG, createTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
@@ -57,6 +57,7 @@ export default class TemplateOnlyComponentManager
   ): Option<DebugStateBucket> {
     if (ENV._DEBUG_RENDER_TREE) {
       let bucket = { environment };
+
       environment.extra.debugRenderTree.create(bucket, {
         type: 'component',
         name: name,
@@ -64,6 +65,11 @@ export default class TemplateOnlyComponentManager
         instance: null,
         template,
       });
+
+      registerDestructor(bucket, () => {
+        bucket.environment.extra.debugRenderTree.willDestroy(bucket!);
+      });
+
       return bucket;
     } else {
       return null;
@@ -84,13 +90,9 @@ export default class TemplateOnlyComponentManager
     }
   }
 
-  getDestructor(bucket: Option<DebugStateBucket>) {
+  getDestroyable(bucket: Option<DebugStateBucket>) {
     if (ENV._DEBUG_RENDER_TREE) {
-      return {
-        destroy() {
-          bucket!.environment.extra.debugRenderTree.willDestroy(bucket!);
-        },
-      };
+      return bucket;
     } else {
       return null;
     }
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index d9d78f54f3a..57f2eeb3b8b 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -1,8 +1,10 @@
 import { ENV } from '@ember/-internals/environment';
 import { get, set } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
+import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
-import { warn } from '@ember/debug';
+import { assert, deprecate, warn } from '@ember/debug';
+import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { ElementBuilder, Environment, Option } from '@glimmer/interfaces';
 import {
@@ -14,8 +16,11 @@ import {
   DynamicAttribute,
   dynamicAttribute,
   EnvironmentDelegate,
+  setScheduleDestroy,
+  setScheduleDestroyed,
   SimpleDynamicAttribute,
 } from '@glimmer/runtime';
+import { setAutotrackingTransactionEnv, setPropertyDidChange } from '@glimmer/validator';
 import { AttrNamespace as SimpleAttrNamespace, SimpleElement } from '@simple-dom/interface';
 import installPlatformSpecificProtocolForURL from './protocol-for-url';
 import { OwnedTemplate } from './template';
@@ -24,6 +29,51 @@ import toIterator from './utils/iterator';
 import { isHTMLSafe } from './utils/string';
 import toBool from './utils/to-bool';
 
+///////////
+
+// Setup global environment
+
+// Autotracking
+
+setPropertyDidChange(() => backburner.ensureInstance());
+
+if (DEBUG) {
+  setAutotrackingTransactionEnv!({
+    assert(message) {
+      assert(message, false);
+    },
+
+    deprecate(message) {
+      deprecate(message, false, {
+        id: 'autotracking.mutation-after-consumption',
+        until: '4.0.0',
+      });
+    },
+
+    debugMessage(obj, keyName) {
+      let dirtyString = keyName
+        ? `\`${keyName}\` on \`${getDebugName!(obj)}\``
+        : `\`${getDebugName!(obj)}\``;
+
+      return `You attempted to update ${dirtyString}, but it had already been used previously in the same computation.  Attempting to update a value after using it in a computation can cause logical errors, infinite revalidation bugs, and performance issues, and is not supported.`;
+    },
+  });
+}
+
+// Destruction
+
+setScheduleDestroy((destroyable, destructor) => {
+  schedule('actions', null, destructor, destroyable);
+});
+
+setScheduleDestroyed(finalizeDestructor => {
+  schedule('destroy', null, finalizeDestructor);
+});
+
+///////////
+
+// Define environment delegate
+
 export interface CompilerFactory {
   id: string;
   new (template: OwnedTemplate): any;
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index c3887b94bd8..b9001a590d1 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -6,11 +6,11 @@ import { join } from '@ember/runloop';
 import {
   CapturedNamedArguments,
   CapturedPositionalArguments,
-  Destroyable,
   DynamicScope,
   ModifierManager,
   VMArguments,
 } from '@glimmer/interfaces';
+import { registerDestructor } from '@glimmer/runtime';
 import { Tag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { INVOKE } from '../helpers/mut';
@@ -93,6 +93,8 @@ export class ActionState {
     this.dom = dom;
     this.eventName = this.getEventName();
     this.tag = tag;
+
+    registerDestructor(this, () => ActionHelper.unregisterAction(this));
   }
 
   getEventName() {
@@ -179,10 +181,6 @@ export class ActionState {
 
     return shouldBubble;
   }
-
-  destroy() {
-    ActionHelper.unregisterAction(this);
-  }
 }
 
 // implements ModifierManager<Action>
@@ -281,7 +279,7 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     return actionState.tag;
   }
 
-  getDestructor(modifier: Destroyable) {
-    return modifier;
+  getDestroyable(actionState: ActionState) {
+    return actionState;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index c8718480236..15fd849c6f2 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -3,6 +3,7 @@ import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Dict, ModifierManager, VMArguments } from '@glimmer/interfaces';
+import { registerDestructor } from '@glimmer/runtime';
 import {
   combine,
   CONSTANT_TAG,
@@ -70,11 +71,8 @@ export class CustomModifierState<ModifierInstance> {
     public delegate: ModifierManagerDelegate<ModifierInstance>,
     public modifier: ModifierInstance,
     public args: CapturedArguments
-  ) {}
-
-  destroy() {
-    const { delegate, modifier, args } = this;
-    delegate.destroyModifier(modifier, args.value());
+  ) {
+    registerDestructor(this, () => delegate.destroyModifier(modifier, args.value()));
   }
 }
 
@@ -176,7 +174,7 @@ class InteractiveCustomModifierManager<ModifierInstance>
     }
   }
 
-  getDestructor(state: CustomModifierState<ModifierInstance>) {
+  getDestroyable(state: CustomModifierState<ModifierInstance>) {
     return state;
   }
 }
@@ -195,7 +193,7 @@ class NonInteractiveCustomModifierManager<ModifierInstance>
 
   update() {}
 
-  getDestructor() {
+  getDestroyable() {
     return null;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 7c05cbbfa31..56db7bf1b63 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -1,7 +1,8 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Destroyable, ModifierManager, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
+import { registerDestructor } from '@glimmer/runtime';
 import { expect } from '@glimmer/util';
 import { CONSTANT_TAG, Tag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
@@ -169,12 +170,6 @@ export class OnModifierState {
       }
     }
   }
-
-  destroy() {
-    let { element, eventName, callback, options } = this;
-
-    removeEventListener(element, eventName, callback, options);
-  }
 }
 
 let adds = 0;
@@ -368,6 +363,8 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
 
     addEventListener(element, eventName, callback, options);
 
+    registerDestructor(state, () => removeEventListener(element, eventName, callback, options));
+
     state.shouldUpdate = false;
   }
 
@@ -394,7 +391,7 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     state.shouldUpdate = false;
   }
 
-  getDestructor(state: Destroyable | null) {
+  getDestroyable(state: OnModifierState | null) {
     return state;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 19167802dd4..c6618af28b0 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -21,6 +21,7 @@ import {
   clientBuilder,
   CurriedComponentDefinition,
   curry,
+  destroy,
   DOMChanges,
   DOMTreeConstruction,
   inTransaction,
@@ -148,7 +149,7 @@ class RootState {
     this.result = undefined;
     this.render = undefined as any;
 
-    if (result) {
+    if (result !== undefined) {
       /*
        Handles these scenarios:
 
@@ -160,7 +161,7 @@ class RootState {
 
        */
 
-      inTransaction(env, () => result!.destroy());
+      inTransaction(env, () => destroy(result!));
     }
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 3550593bd7c..4172f3d3c65 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -20,7 +20,7 @@ import {
   PartialDefinition,
 } from '@glimmer/interfaces';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
-import { getDynamicVar, ModifierDefinition } from '@glimmer/runtime';
+import { getDynamicVar, ModifierDefinition, registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { CurlyComponentDefinition } from './component-managers/curly';
 import { CustomManagerDefinition, ManagerDelegate } from './component-managers/custom';
@@ -426,11 +426,11 @@ export default class RuntimeResolver implements JitRuntimeResolver<OwnedTemplate
       const helper = factory.create();
 
       if (isClassHelper(helper)) {
-        vm.associateDestroyable({
-          destroy() {
-            helper.destroy();
-          },
-        });
+        let helperDestroyable = {};
+
+        // Do this so that `destroy` gets called correctly
+        registerDestructor(helperDestroyable, () => helper.destroy(), true);
+        vm.associateDestroyable(helperDestroyable);
       } else if (DEBUG) {
         // Bind to null in case someone accidentally passed an unbound function
         // in, and attempts use `this` on it.
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 937c6651573..7e28b47db32 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,6 +1,7 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
 import { ComponentRootReference, VersionedReference } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { Revision, valueForTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import { Renderer } from '../renderer';
@@ -53,6 +54,9 @@ export default class ComponentStateBucket {
     this.classRef = null;
     this.argsRevision = args === null ? 0 : valueForTag(args.tag);
     this.rootRef = new ComponentRootReference(component, environment);
+
+    registerDestructor(this, () => this.willDestroy(), true);
+    registerDestructor(this, () => this.component.destroy());
   }
 
   willDestroy() {
@@ -73,10 +77,6 @@ export default class ComponentStateBucket {
     component.renderer.unregister(component);
   }
 
-  destroy() {
-    this.component.destroy();
-  }
-
   finalize() {
     let { finalizer } = this;
     finalizer();
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
index bffe0041669..574f11f6d9f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -269,10 +269,10 @@ class AbstractAppendTest extends RenderingTestCase {
         ['x-child', 'willDestroyElement'],
         ['x-child', 'willClearRender'],
 
-        ['x-child', 'didDestroyElement'],
         ['x-parent', 'didDestroyElement'],
-
         ['x-parent', 'willDestroy'],
+
+        ['x-child', 'didDestroyElement'],
         ['x-child', 'willDestroy'],
       ],
       'destroy'
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 91e1a2b335a..af3eb3a7bd7 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -1,6 +1,7 @@
 import { symbol, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+import { isDestroyed } from '@glimmer/runtime';
 import { UpdatableTag } from '@glimmer/validator';
 
 type ObjMap<T> = { [key: string]: T };
@@ -58,15 +59,6 @@ if (DEBUG) {
 
 export const UNDEFINED = symbol('undefined');
 
-// FLAGS
-const enum MetaFlags {
-  NONE = 0,
-  SOURCE_DESTROYING = 1 << 0,
-  SOURCE_DESTROYED = 1 << 1,
-  META_DESTROYED = 1 << 2,
-  INITIALIZING = 1 << 3,
-}
-
 const enum ListenerKind {
   ADD = 0,
   ONCE = 1,
@@ -96,7 +88,7 @@ let currentListenerVersion = 1;
 export class Meta {
   _descriptors: Map<string, any> | undefined;
   _mixins: any | undefined;
-  _flags: MetaFlags;
+  _isInit: boolean;
   _lazyChains: ObjMap<ObjMap<UpdatableTag>> | undefined;
   source: object;
   proto: object | undefined;
@@ -121,7 +113,7 @@ export class Meta {
 
     // initial value for all flags right now is false
     // see FLAGS const for detailed list of flags used
-    this._flags = MetaFlags.NONE;
+    this._isInit = false;
 
     // used only internally
     this.source = obj;
@@ -140,60 +132,21 @@ export class Meta {
   }
 
   setInitializing() {
-    this._flags |= MetaFlags.INITIALIZING;
+    this._isInit = true;
   }
 
   unsetInitializing() {
-    this._flags ^= MetaFlags.INITIALIZING;
+    this._isInit = false;
   }
 
   isInitializing() {
-    return this._hasFlag(MetaFlags.INITIALIZING);
+    return this._isInit;
   }
 
   isPrototypeMeta(obj: object) {
     return this.proto === this.source && this.source === obj;
   }
 
-  destroy() {
-    if (DEBUG) {
-      counters!.deleteCalls++;
-    }
-
-    if (this.isMetaDestroyed()) {
-      return;
-    }
-    this.setMetaDestroyed();
-  }
-
-  isSourceDestroying() {
-    return this._hasFlag(MetaFlags.SOURCE_DESTROYING);
-  }
-
-  setSourceDestroying() {
-    this._flags |= MetaFlags.SOURCE_DESTROYING;
-  }
-
-  isSourceDestroyed() {
-    return this._hasFlag(MetaFlags.SOURCE_DESTROYED);
-  }
-
-  setSourceDestroyed() {
-    this._flags |= MetaFlags.SOURCE_DESTROYED;
-  }
-
-  isMetaDestroyed() {
-    return this._hasFlag(MetaFlags.META_DESTROYED);
-  }
-
-  setMetaDestroyed() {
-    this._flags |= MetaFlags.META_DESTROYED;
-  }
-
-  _hasFlag(flag: number) {
-    return (this._flags & flag) === flag;
-  }
-
   _getOrCreateOwnMap(key: string) {
     return this[key] || (this[key] = Object.create(null));
   }
@@ -258,12 +211,12 @@ export class Meta {
 
   addMixin(mixin: any) {
     assert(
-      this.isMetaDestroyed()
+      isDestroyed(this.source)
         ? `Cannot add mixins of \`${toString(mixin)}\` on \`${toString(
             this.source
           )}\` call addMixin after it has been destroyed.`
         : '',
-      !this.isMetaDestroyed()
+      !isDestroyed(this.source)
     );
     let set = this._getOrCreateOwnSet('_mixins');
     set.add(mixin);
@@ -294,12 +247,12 @@ export class Meta {
 
   writeDescriptors(subkey: string, value: any) {
     assert(
-      this.isMetaDestroyed()
+      isDestroyed(this.source)
         ? `Cannot update descriptors for \`${subkey}\` on \`${toString(
             this.source
           )}\` after it has been destroyed.`
         : '',
-      !this.isMetaDestroyed()
+      !isDestroyed(this.source)
     );
     let map = this._descriptors || (this._descriptors = new Map());
     map.set(subkey, value);
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index ad4de138078..2db4dd0c322 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -50,7 +50,6 @@ export { default as getProperties } from './lib/get_properties';
 export { default as setProperties } from './lib/set_properties';
 export { default as expandProperties } from './lib/expand_properties';
 
-export { destroy } from './lib/destroy';
 export {
   ASYNC_OBSERVERS,
   SYNC_OBSERVERS,
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 6d663273e93..94298748865 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -2,6 +2,7 @@ import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect, isEmberArray, toString } from '@ember/-internals/utils';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberError from '@ember/error';
+import { isDestroyed } from '@glimmer/runtime';
 import {
   combine,
   consumeTag,
@@ -614,7 +615,7 @@ export class ComputedProperty extends ComputedDescriptor {
       // should be allowed, even after the object has been destroyed, which is why we check _dependentKeys.
       assert(
         `Attempted to access the computed ${obj}.${keyName} on a destroyed object, which is not allowed`,
-        this._dependentKeys === undefined || !metaFor(obj).isMetaDestroyed()
+        this._dependentKeys === undefined || !isDestroyed(obj)
       );
 
       let upstreamTag: Tag | undefined = undefined;
diff --git a/packages/@ember/-internals/metal/lib/destroy.ts b/packages/@ember/-internals/metal/lib/destroy.ts
deleted file mode 100644
index 71e7011aaf0..00000000000
--- a/packages/@ember/-internals/metal/lib/destroy.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { Meta, peekMeta } from '@ember/-internals/meta/lib/meta';
-import { assert } from '@ember/debug';
-import { schedule } from '@ember/runloop';
-import { destroyObservers } from './observer';
-
-/**
-  Enqueues finalization on an object so that it can be garbage collected.
-  Multiple calls will have no effect.
-
-  @method destroy
-  @for Ember
-  @param {Object} obj the object to destroy
-  @return {boolean} true if the object went from not destroying to destroying.
-  @private
-*/
-export function destroy(obj: object): boolean {
-  assert('Cannot call `destroy` on null', obj !== null);
-  assert('Cannot call `destroy` on undefined', obj !== undefined);
-  assert(
-    `Cannot call \`destroy\` on ${typeof obj}`,
-    typeof obj === 'object' || typeof obj === 'function'
-  );
-
-  const m = peekMeta(obj);
-  if (m === null || m.isSourceDestroying()) {
-    return false;
-  }
-  m.setSourceDestroying();
-  destroyObservers(obj);
-  schedule('destroy', m, finalize);
-  return true;
-}
-
-function finalize(this: Meta) {
-  this.setSourceDestroyed();
-  this.destroy();
-}
diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts
index 097eacdd0c1..4d49087d507 100644
--- a/packages/@ember/-internals/metal/lib/observer.ts
+++ b/packages/@ember/-internals/metal/lib/observer.ts
@@ -1,6 +1,7 @@
 import { ENV } from '@ember/-internals/environment';
 import { peekMeta } from '@ember/-internals/meta';
 import { schedule } from '@ember/runloop';
+import { registerDestructor } from '@glimmer/runtime';
 import { combine, CURRENT_TAG, Tag, validateTag, valueForTag } from '@glimmer/validator';
 import { getChainTagsForKey } from './chain-tags';
 import changeEvent from './change_event';
@@ -83,6 +84,7 @@ function getOrCreateActiveObserversFor(target: object, sync: boolean) {
 
   if (!observerMap.has(target)) {
     observerMap.set(target, new Map());
+    registerDestructor(target, () => destroyObservers(target), true);
   }
 
   return observerMap.get(target)!;
@@ -184,12 +186,6 @@ export function flushAsyncObservers(shouldSchedule = true) {
   ASYNC_OBSERVERS.forEach((activeObservers, target) => {
     let meta = peekMeta(target);
 
-    // if observer target is destroyed remove observers
-    if (meta && (meta.isSourceDestroying() || meta.isMetaDestroyed())) {
-      ASYNC_OBSERVERS.delete(target);
-      return;
-    }
-
     activeObservers.forEach((observer, eventName) => {
       if (!validateTag(observer.tag, observer.lastRevision)) {
         let sendObserver = () => {
@@ -219,11 +215,6 @@ export function flushSyncObservers() {
   SYNC_OBSERVERS.forEach((activeObservers, target) => {
     let meta = peekMeta(target);
 
-    if (meta && (meta.isSourceDestroying() || meta.isMetaDestroyed())) {
-      SYNC_OBSERVERS.delete(target);
-      return;
-    }
-
     activeObservers.forEach((observer, eventName) => {
       if (!observer.suspended && !validateTag(observer.tag, observer.lastRevision)) {
         try {
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
index 48d670391f0..5cd76e5746f 100644
--- a/packages/@ember/-internals/metal/lib/tags.ts
+++ b/packages/@ember/-internals/metal/lib/tags.ts
@@ -1,51 +1,8 @@
-import { meta as metaFor } from '@ember/-internals/meta';
-import {
-  getDebugName,
-  isObject,
-  setupMandatorySetter,
-  symbol,
-  toString,
-} from '@ember/-internals/utils';
-import { assert, deprecate } from '@ember/debug';
-import { backburner } from '@ember/runloop';
+import { isObject, setupMandatorySetter, symbol, toString } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import {
-  CONSTANT_TAG,
-  dirtyTagFor,
-  setAutotrackingTransactionEnv,
-  setPropertyDidChange,
-  Tag,
-  tagFor,
-} from '@glimmer/validator';
-
-/////////
-
-// Setup tracking environment
-
-setPropertyDidChange(() => backburner.ensureInstance());
-
-if (DEBUG) {
-  setAutotrackingTransactionEnv!({
-    assert(message) {
-      assert(message, false);
-    },
-
-    deprecate(message) {
-      deprecate(message, false, {
-        id: 'autotracking.mutation-after-consumption',
-        until: '4.0.0',
-      });
-    },
-
-    debugMessage(obj, keyName) {
-      let dirtyString = keyName
-        ? `\`${keyName}\` on \`${getDebugName!(obj)}\``
-        : `\`${getDebugName!(obj)}\``;
-
-      return `You attempted to update ${dirtyString}, but it had already been used previously in the same computation.  Attempting to update a value after using it in a computation can cause logical errors, infinite revalidation bugs, and performance issues, and is not supported.`;
-    },
-  });
-}
+import { isDestroyed } from '@glimmer/runtime';
+import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor } from '@glimmer/validator';
 
 /////////
 
@@ -84,13 +41,11 @@ export function tagForProperty(
 export function tagForObject(obj: unknown | null): Tag {
   if (isObject(obj)) {
     if (DEBUG) {
-      let meta = metaFor(obj);
-
       assert(
-        meta.isMetaDestroyed()
-          ? `Cannot create a new tag for \`${toString(meta.source)}\` after it has been destroyed.`
+        isDestroyed(obj)
+          ? `Cannot create a new tag for \`${toString(obj)}\` after it has been destroyed.`
           : '',
-        !meta.isMetaDestroyed()
+        !isDestroyed(obj)
       );
     }
 
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index 30596be0db0..9ce0df73801 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -1,9 +1,9 @@
 import { ENV } from '@ember/-internals/environment';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { destroy } from '@ember/-internals/metal';
 import { get, set, getWithDefault, Mixin, observer, computed } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
+import { destroy } from '@glimmer/runtime';
 import { track } from '@glimmer/validator';
 
 function aget(x, y) {
diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js
index f89531c25f4..4410748bf89 100644
--- a/packages/@ember/-internals/metal/tests/alias_test.js
+++ b/packages/@ember/-internals/metal/tests/alias_test.js
@@ -2,7 +2,6 @@ import {
   alias,
   computed,
   defineProperty,
-  destroy,
   get,
   set,
   addObserver,
@@ -11,6 +10,7 @@ import {
 } from '..';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
+import { destroy } from '@glimmer/runtime';
 import { valueForTag, validateTag } from '@glimmer/validator';
 
 let obj, count;
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 3863b219df3..2e64aa8c56d 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -2,7 +2,6 @@ import { Object as EmberObject } from '@ember/-internals/runtime';
 import {
   computed,
   defineProperty,
-  destroy,
   getCachedValueFor,
   isClassicDecorator,
   isComputed,
@@ -10,8 +9,9 @@ import {
   set,
   addObserver,
 } from '..';
-import { meta as metaFor } from '@ember/-internals/meta';
+import { run } from '@ember/runloop';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
+import { destroy } from '@glimmer/runtime';
 
 let obj, objA, objB, count, func;
 
@@ -605,8 +605,7 @@ moduleFor(
     }
 
     ['@test throws an assertion if an uncached `get` is called after object is destroyed']() {
-      let meta = metaFor(obj);
-      meta.destroy();
+      run(() => destroy(obj));
 
       obj.toString = () => '<custom-obj:here>';
 
@@ -619,7 +618,6 @@ moduleFor(
     ['@test does not throw an assertion if an uncached `get` is called on computed without dependencies after object is destroyed'](
       assert
     ) {
-      let meta = metaFor(obj);
       defineProperty(
         obj,
         'foo',
@@ -628,7 +626,7 @@ moduleFor(
         })
       );
 
-      meta.destroy();
+      run(() => destroy(obj));
 
       assert.equal(get(obj, 'foo'), 'baz', 'CP calculated successfully');
     }
diff --git a/packages/@ember/-internals/metal/tests/mixin/observer_test.js b/packages/@ember/-internals/metal/tests/mixin/observer_test.js
index 36c79d16c98..fd21971bb98 100644
--- a/packages/@ember/-internals/metal/tests/mixin/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/observer_test.js
@@ -1,5 +1,6 @@
-import { set, get, destroy, observer, mixin, Mixin } from '../..';
+import { set, get, observer, mixin, Mixin } from '../..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
+import { destroy } from '@glimmer/runtime';
 
 let obj;
 
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index bc342f7d0ae..a26e3bfc5ef 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -1,6 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
 import {
-  destroy,
   changeProperties,
   addObserver,
   removeObserver,
@@ -18,6 +17,7 @@ import {
 } from '..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
+import { destroy } from '@glimmer/runtime';
 
 function K() {}
 
diff --git a/packages/@ember/-internals/metal/tests/performance_test.js b/packages/@ember/-internals/metal/tests/performance_test.js
index 0a6020714f4..eca683e5e99 100644
--- a/packages/@ember/-internals/metal/tests/performance_test.js
+++ b/packages/@ember/-internals/metal/tests/performance_test.js
@@ -2,7 +2,6 @@ import {
   set,
   get,
   computed,
-  destroy,
   defineProperty,
   notifyPropertyChange,
   beginPropertyChanges,
@@ -10,6 +9,7 @@ import {
   addObserver,
 } from '..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
+import { destroy } from '@glimmer/runtime';
 
 let obj;
 
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 186a52c6f8f..a37603e7196 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -14,8 +14,7 @@ import {
   HAS_NATIVE_PROXY,
   isInternalSymbol,
 } from '@ember/-internals/utils';
-import { schedule } from '@ember/runloop';
-import { meta, peekMeta } from '@ember/-internals/meta';
+import { meta } from '@ember/-internals/meta';
 import {
   PROXY_CONTENT,
   sendEvent,
@@ -24,7 +23,6 @@ import {
   applyMixin,
   defineProperty,
   descriptorForProperty,
-  destroy,
   classToString,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
@@ -32,6 +30,7 @@ import {
 import ActionHandler from '../mixins/action_handler';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/runtime';
 
 const reopen = Mixin.prototype.reopen;
 
@@ -280,6 +279,8 @@ class CoreObject {
       FACTORY_FOR.set(self, initFactory);
     }
 
+    registerDestructor(self, () => self.willDestroy());
+
     // disable chains
     let m = meta(self);
 
@@ -503,7 +504,7 @@ class CoreObject {
     @public
   */
   get isDestroyed() {
-    return peekMeta(this).isSourceDestroyed();
+    return isDestroyed(this);
   }
 
   set isDestroyed(value) {
@@ -521,7 +522,7 @@ class CoreObject {
     @public
   */
   get isDestroying() {
-    return peekMeta(this).isSourceDestroying();
+    return isDestroying(this);
   }
 
   set isDestroying(value) {
@@ -543,10 +544,7 @@ class CoreObject {
     @public
   */
   destroy() {
-    if (destroy(this)) {
-      schedule('actions', this, this.willDestroy);
-      return;
-    }
+    destroy(this);
     return this;
   }
 
diff --git a/packages/@ember/-internals/runtime/tests/ext/function_test.js b/packages/@ember/-internals/runtime/tests/ext/function_test.js
index 7ac5729f286..f2059da1930 100644
--- a/packages/@ember/-internals/runtime/tests/ext/function_test.js
+++ b/packages/@ember/-internals/runtime/tests/ext/function_test.js
@@ -1,9 +1,10 @@
 import { ENV } from '@ember/-internals/environment';
-import { Mixin, mixin, get, set, destroy } from '@ember/-internals/metal';
+import { Mixin, mixin, get, set } from '@ember/-internals/metal';
 import EmberObject from '../../lib/system/object';
 import Evented from '../../lib/mixins/evented';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
+import { destroy } from '@glimmer/runtime';
 
 moduleFor(
   'Function.prototype.observes() helper',
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
index d010061e824..6d6c38b1dca 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
@@ -1,7 +1,8 @@
-import { destroy, get } from '@ember/-internals/metal';
+import { get } from '@ember/-internals/metal';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture, newObjectsFixture } from '../helpers/array';
 import { A as emberA } from '../../lib/mixins/array';
+import { destroy } from '@glimmer/runtime';
 
 class RemoveObjectsTests extends AbstractTestCase {
   '@test should return receiver'() {
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 8e4ec52e38a..8911d422548 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -1,8 +1,9 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { computed, Mixin, observer, addObserver, destroy, alias } from '@ember/-internals/metal';
+import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { destroy } from '@glimmer/runtime';
 
 moduleFor(
   'EmberObject.create',
diff --git a/packages/ember/index.js b/packages/ember/index.js
index e092ae6334a..4cc5462eab1 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -138,6 +138,7 @@ import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
 import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import templateOnlyComponent from '@ember/component/template-only';
+import { destroy } from '@glimmer/runtime';
 
 // ****@ember/-internals/environment****
 
@@ -322,7 +323,7 @@ Ember.platform = {
   hasPropertyAccessors: true,
 };
 Ember.defineProperty = metal.defineProperty;
-Ember.destroy = metal.destroy;
+Ember.destroy = destroy;
 Ember.libraries = metal.libraries;
 Ember.getProperties = metal.getProperties;
 Ember.setProperties = metal.setProperties;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 15f92fdb020..efd08df6407 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -173,7 +173,7 @@ let allExports = [
   ['platform.defineProperty', null, { value: true }],
   ['platform.hasPropertyAccessors', null, { value: true }],
   ['defineProperty', '@ember/-internals/metal'],
-  ['destroy', '@ember/-internals/metal', 'destroy'],
+  ['destroy', '@glimmer/runtime', 'destroy'],
   ['libraries', '@ember/-internals/metal'],
   ['getProperties', '@ember/-internals/metal'],
   ['setProperties', '@ember/-internals/metal'],
diff --git a/yarn.lock b/yarn.lock
index 7e9e447915c..b960d944188 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.53.0.tgz#313b2b7138add2d7fb28737b324a5395f076a794"
-  integrity sha512-Fn/OD4irLHzj1kAtOYK6NDffcEl+nZu8Gg9F3TeKBT3nZJquJc7wL/gydvN34waIEo88o42HpiG1IiXVXdAIrQ==
-  dependencies:
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/syntax" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
-    "@glimmer/wire-format" "^0.53.0"
+"@glimmer/compiler@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.54.0.tgz#25c794495ef0ed0cc4014eb1b160a859d8b602a7"
+  integrity sha512-/+xi54syHB5VtDuo6lWjZpTLaIwVfk6iWkPoRrSvQT93PN663fvTlJlW2NgI5q+h/WAJgGUoTMGYdGQGd9vFAw==
+  dependencies:
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/syntax" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
+    "@glimmer/wire-format" "^0.54.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.53.0.tgz#bb9cc47a6dbe6d1d948d72f737879b1a3fa3a01c"
-  integrity sha512-Xa3Bo+FQIql+qIYEC/JyEm43Fla2yOmTRNIEuCOx/540XcnzWrbYheRg8etH9nbqdI0AWYi/jXPptGKPDzz4AA==
+"@glimmer/encoder@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.54.0.tgz#8fe9a175a91081661e47862ca55dcbc330e86907"
+  integrity sha512-nqFhqYy6G4cf85e6cyahUVESOSz+uCAVa2nMrGhciV259JYbRGI+3xVnuQCQW5UPYjERz0idGTi0tNVApLB/Yw==
   dependencies:
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/vm" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/vm" "^0.54.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.53.0.tgz#cb519256b0b446048b4c674c4db00754d796e0d7"
-  integrity sha512-Jiq4b5XLXc3OJDPlxj+uq3Owu4rl3e6UyApc6Of6EPal48Ync1jhGcsUUOiP0TdNIm6KeFuzwA2mY6rJ7B5IfQ==
+"@glimmer/interfaces@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.54.0.tgz#99cb943f5652edf4a8fe1a11594050db0e0b9bb1"
+  integrity sha512-IXP6wkEqO+1P5aoDBZ7SvPBM6073eXMbKaWAWsYHlbMp7qXYN92dPnFVtrf6CVUB2NciLNvmEUzzDDteYxsH0A==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.53.0.tgz#acbbed3cae9038d497e81b741cacd9f0c9c5952f"
-  integrity sha512-l46nrSu4Wj1lsQa2wBIZOFPUa9E37HxGSNARs1nl6gRB+vW7n4nNUWZ8tSfTo8jGw2OETxgH+s3HT8HloIkMbw==
+"@glimmer/low-level@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.54.0.tgz#f60b7566321b0ebfa5aa6068f387805d5e113aef"
+  integrity sha512-yPyNdDyA7ssZPi0at/7eRcGJOr6OQLGkkdXxNL8870ASw7JpNMIK2j1dJR5VHhIZc+fmBu6xC97DfzM4xMkVmA==
 
-"@glimmer/node@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.53.0.tgz#5cd92f0fa23364a425219537c1481228083e2ce7"
-  integrity sha512-Ua15rR+FnXv8gSUsDzOtQAKf5Op4lOc9PvOagTalgiKX2O08JUtwd/MDwiJGIJ31DgOUkitu+6d8bz4V6unTDg==
+"@glimmer/node@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.54.0.tgz#8d312c58eb94d9e019f6a6764ab2bb5bc24f6536"
+  integrity sha512-E19kMaYJ0k+vHwbPrruCnyIYtVSAATosj1azmsROHFVMLKnFouDv3QFhXehH+wQEIHZOxNoVQ0QwCrFn5Rkohw==
   dependencies:
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/runtime" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/runtime" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.53.0.tgz#96e7a999fefa6c10d8b95202772341d9e453d613"
-  integrity sha512-P6usfggdDdbKLPWc87Ca4KpvW7e3erLT1wnmLzzJaro8k3Tmy+XK+MW7w3t0//ixeRjpHa3qBH67WYaZtJP5/g==
-  dependencies:
-    "@glimmer/encoder" "^0.53.0"
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/program" "^0.53.0"
-    "@glimmer/reference" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
-    "@glimmer/vm" "^0.53.0"
-    "@glimmer/wire-format" "^0.53.0"
-
-"@glimmer/program@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.53.0.tgz#ae0ecc6b6131d122cb4862bff4c98b98001c3829"
-  integrity sha512-bu1mu00BXEpOnmwBnvBNmiO/9Slybfun75T7AhIKRsV79yDGkkjCfIZoT/4I8UBX0D0vKdu5ZHMXWqp8PjEiYw==
-  dependencies:
-    "@glimmer/encoder" "^0.53.0"
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
-
-"@glimmer/reference@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.53.0.tgz#3ef189259e28de65eb6e781add27c62d1475ac58"
-  integrity sha512-wLiUQJ2RrjrwfR3sbbXp6aAmAZpbSmx/q2xk/LDd8Sa9D3hD0FhWeLg/nc7qOxo5USAOYu+5npP2LMuT4nAB0g==
+"@glimmer/opcode-compiler@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.54.0.tgz#8bd10814539028764a3961e4584bef3dcae86c85"
+  integrity sha512-1sIrRWt8ocO9MGHBtXt5VcrcI2TKjVfyd63EOLsNXFcCqUlQhoxljagwe/v+qTOzv6RfXZgfLCcnnKC1cGuuIg==
+  dependencies:
+    "@glimmer/encoder" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/program" "^0.54.0"
+    "@glimmer/reference" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
+    "@glimmer/vm" "^0.54.0"
+    "@glimmer/wire-format" "^0.54.0"
+
+"@glimmer/program@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.54.0.tgz#8dd5be71e8f0f28038b05ed2ebd09c8d907849f9"
+  integrity sha512-RkbXrW+l/vQ3gwGM5ArTj5HO66+uVRpAqzjcUElZjjygWqDlBbU/vY+MOLbQReM48Vsa5l9wUDgUFue4876zbw==
+  dependencies:
+    "@glimmer/encoder" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
+
+"@glimmer/reference@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.54.0.tgz#eab11698cf9b539bd6d5d5eed38be9dbeae6bbd0"
+  integrity sha512-8jiIOqDdMt88MesF/9Nv3+ge99GyRF29bAXfjzbUVJFDu6krmm2qiIpCLkKmcofsCyg82pJvn+OUEAmXcI2ZaA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
-    "@glimmer/validator" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
+    "@glimmer/validator" "^0.54.0"
 
-"@glimmer/runtime@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.53.0.tgz#eb48638c8538a2a38f19eb1f0f85cffacd57fa63"
-  integrity sha512-ucHa0vFYI/hGSPydGhOoG8dplPNFc5jrG+nwxZJyfRnJEsNNTX8ygmqfYjst9Go7XLfGGTXy+kFRtyXPG4RTUg==
+"@glimmer/runtime@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.54.0.tgz#5ef89928e245966ba1c3a3d69a1a593f05c3b528"
+  integrity sha512-5fA/RXuJS+2bE71m84KlXCPVCE2RsXIrs3k68YKaV50IzZR5hPftN0IPWZ/qsQIwbhaXvqrXGBQbMG0WZlp2IA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/low-level" "^0.53.0"
-    "@glimmer/program" "^0.53.0"
-    "@glimmer/reference" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
-    "@glimmer/validator" "^0.53.0"
-    "@glimmer/vm" "^0.53.0"
-    "@glimmer/wire-format" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/low-level" "^0.54.0"
+    "@glimmer/program" "^0.54.0"
+    "@glimmer/reference" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
+    "@glimmer/validator" "^0.54.0"
+    "@glimmer/vm" "^0.54.0"
+    "@glimmer/wire-format" "^0.54.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.53.0.tgz#61f2dd848aae7644c16f649d2ed0bb1d42c1c0fe"
-  integrity sha512-j1kXXXlb1+UrmQG6J1b6lByedFEX24zZskvqBxEcrbnwfuvRYf/LYspKlV8MCJIJLbhJCzesMsDBPdYF6IcgyA==
+"@glimmer/syntax@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.54.0.tgz#d257a61141d9debcc00a39dd62e415f782cc202b"
+  integrity sha512-pL8BBkZ34bTJixSUKj3V84bMqh7J6PCQ7b+65HsNEMQcQAkGVoX5RMukYI2KfVKzGk2gSCi4Qmdly9if2ooF8g==
   dependencies:
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.53.0.tgz#19375e75c5d248d77b0f751a5f1808c7a23f77a8"
-  integrity sha512-J/46gQRLe09viNS9/bAvsEOeu70ZfFqKEU4sM9TxeMjNiiWJIN+mPoC3bFG9Ub4pPrmfbIqPOr7lTtBDibB2Sw==
+"@glimmer/util@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.54.0.tgz#2657939303c2be1075c8accf701efc936306d653"
+  integrity sha512-hqbmkD3FBIGbRQzXMjgqW+z2hbbUgDvbWfr3b4ifJQNhwD/JlUyI1txMXFFFEzduWkTlhzoY52/LFDXdF4DY8Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.53.0.tgz#ca9d7565a3ffd187f4c8ed4e315d7f2860ec58bb"
-  integrity sha512-T40WmR6MTznVq3SYUCOAxsG+G4XOAXAgjZYQQ2x3pRpKQGIDE6ky6BRJ7sChLkZxXjFYyPwOKZtYtIio7gWkLQ==
+"@glimmer/validator@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.54.0.tgz#fe78eeaf52c54a88aec41d13bba20e240f9e687f"
+  integrity sha512-3O/hR6ykWbKryyKOnnj9daEmLD535dMmb0Dz7jGptUGvDRbIV9ubUf6xixfvjJHvyPDSuBVEgtMI1ANpX1oeOg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.53.0.tgz#09a9b41de17d81e45c13a23dd5a2d29202531753"
-  integrity sha512-1zP1s2N4dqXDRBWX/AGGH5NoLzC5U5y2dFn4w+v9NUHTeTFMpTgYn4bvNk1RzZBy9CFfnCvBk/4No/KRbq5ZEA==
+"@glimmer/vm@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.54.0.tgz#4b6e284023b5a82a796468b0cc275d5b1f871991"
+  integrity sha512-EqFDCqD1zKkxL7H9crgIyXwu8arEl2VtubZj5uiWefsWgDa8b2exaaeLJG2WB0uA7OSnTpl+IAjruM+VmhNu6Q==
   dependencies:
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
 
-"@glimmer/wire-format@^0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.53.0.tgz#93dd32ffc6f4a03f1ede57801931d191a8af6293"
-  integrity sha512-BtFAjCQy1/eEPs0soRV87WqK4g65KpL0f0S1FwUEZdpRocnNdbHI971Xk5N24nCRkuRwfjfXwIVpWw2hz6dVwg==
+"@glimmer/wire-format@^0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.54.0.tgz#128a75aea18cb2f3f904dbb317fdad6a299cb770"
+  integrity sha512-gcevzlWFmQU7dLtWLDfjTDCmiyAaKxuBMdapd7OvbQZC5pQUkngCy1EVbMQDAEtxmxncOsbDgi0EFemIspprgQ==
   dependencies:
-    "@glimmer/interfaces" "^0.53.0"
-    "@glimmer/util" "^0.53.0"
+    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/util" "^0.54.0"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 54ede4cc69a72b561cfaaf0af8446f555b782601 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Tue, 9 Jun 2020 22:06:47 -0500
Subject: [PATCH 0021/1405] [Chore]: Add integration test for accessing a
 property during init

---
 .../integration/components/tracked-test.js    | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 10a5f5b9c97..a6342af3e9c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -1,6 +1,12 @@
 import { Object as EmberObject, A, ArrayProxy, PromiseProxyMixin } from '@ember/-internals/runtime';
 import { EMBER_CUSTOM_COMPONENT_ARG_PROXY } from '@ember/canary-features';
-import { computed, get, tracked, nativeDescDecorator as descriptor } from '@ember/-internals/metal';
+import {
+  computed,
+  get,
+  set,
+  tracked,
+  nativeDescDecorator as descriptor,
+} from '@ember/-internals/metal';
 import { Promise } from 'rsvp';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 import GlimmerishComponent from '../../utils/glimmerish-component';
@@ -493,6 +499,50 @@ moduleFor(
       // check to make sure we can still mutate the person
       person.first = 'max';
     }
+
+    '@test works when EmberObject created during render'() {
+      this.registerComponent('test', {
+        ComponentClass: class extends GlimmerishComponent {},
+        template: '{{@data.length}}',
+      });
+
+      let RecordMeta = new WeakMap();
+      function getRecordMeta(record) {
+        let meta = RecordMeta.get(record);
+        if (meta === undefined) {
+          meta = Object.create(null);
+          RecordMeta.set(record, meta);
+        }
+
+        return meta;
+      }
+
+      // does not reproduce with native JS class only
+      class Person extends EmberObject {
+        get name() {
+          let meta = getRecordMeta(this);
+          let name = get(meta, 'name');
+          return name;
+        }
+        set name(v) {
+          let meta = getRecordMeta(this);
+          set(meta, 'name', v);
+        }
+      }
+
+      class List {
+        get records() {
+          let p = Person.create({ name: 'ye-haw' });
+          return [p];
+        }
+      }
+
+      this.render('<Test @data={{this.data.records}} />', {
+        data: new List(),
+      });
+
+      this.assertText('1');
+    }
   }
 );
 

From b4cf520e320fc6861801c5859bd8eb3f59ad4a89 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 23 Jun 2020 12:09:26 -0700
Subject: [PATCH 0022/1405] update loading and clearing Ember in node tests

---
 tests/node/helpers/load-ember.js      | 39 +++++++++++++++++++++++++++
 tests/node/helpers/setup-app.js       | 24 +++++------------
 tests/node/helpers/setup-component.js | 25 +++--------------
 tests/node/instrumentation-test.js    | 10 +++----
 4 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 tests/node/helpers/load-ember.js

diff --git a/tests/node/helpers/load-ember.js b/tests/node/helpers/load-ember.js
new file mode 100644
index 00000000000..7a9da12fbd7
--- /dev/null
+++ b/tests/node/helpers/load-ember.js
@@ -0,0 +1,39 @@
+const path = require('path');
+const distPath = path.join(__dirname, '../../../dist');
+const emberPath = path.join(distPath, 'tests/ember');
+const templateCompilerPath = path.join(distPath, 'ember-template-compiler');
+
+// We store the global symbols beforehand so that we can reset the state
+// properly to avoid the @glimmer/validator assertion
+const originalGlobalSymbols = Object.getOwnPropertySymbols(global).map(sym => [sym, global[sym]]);
+
+module.exports.loadEmber = function() {
+  let Ember = require(emberPath);
+
+  let precompile = require(templateCompilerPath).precompile;
+
+  let compile = function(templateString, options) {
+    let templateSpec = precompile(templateString, options);
+    let template = new Function('return ' + templateSpec)();
+
+    return Ember.HTMLBars.template(template);
+  };
+
+  return { Ember, compile };
+};
+
+module.exports.clearEmber = function() {
+  delete global.Ember;
+
+  Object.getOwnPropertySymbols(global).forEach(sym => {
+    delete global[sym];
+  });
+
+  originalGlobalSymbols.forEach(([sym, value]) => {
+    global[sym] = value;
+  });
+
+  // clear the previously cached version of this module
+  delete require.cache[emberPath + '.js'];
+  delete require.cache[templateCompilerPath + '.js'];
+};
diff --git a/tests/node/helpers/setup-app.js b/tests/node/helpers/setup-app.js
index 0c854f88e7c..f1e43836317 100644
--- a/tests/node/helpers/setup-app.js
+++ b/tests/node/helpers/setup-app.js
@@ -1,10 +1,7 @@
 /* eslint-disable no-console */
 
-const path = require('path');
-const distPath = path.join(__dirname, '../../../dist');
-const emberPath = path.join(distPath, 'tests/ember');
-const templateCompilerPath = path.join(distPath, 'ember-template-compiler');
 const SimpleDOM = require('simple-dom');
+const { loadEmber, clearEmber } = require('./load-ember');
 
 /*
  * This helper sets up a QUnit test module with all of the environment and
@@ -60,17 +57,12 @@ const SimpleDOM = require('simple-dom');
 
 module.exports = function(hooks) {
   hooks.beforeEach(function() {
-    let Ember = (this.Ember = require(emberPath));
+    let { Ember, compile } = loadEmber();
 
-    Ember.testing = true;
-
-    let precompile = require(templateCompilerPath).precompile;
-    this.compile = function(templateString, options) {
-      let templateSpec = precompile(templateString, options);
-      let template = new Function('return ' + templateSpec)();
+    this.Ember = Ember;
+    this.compile = compile;
 
-      return Ember.HTMLBars.template(template);
-    };
+    Ember.testing = true;
 
     this.run = Ember.run;
     this.all = Ember.RSVP.all;
@@ -91,11 +83,7 @@ module.exports = function(hooks) {
   hooks.afterEach(function() {
     this.run(this.app, 'destroy');
 
-    delete global.Ember;
-
-    // clear the previously cached version of this module
-    delete require.cache[emberPath + '.js'];
-    delete require.cache[templateCompilerPath + '.js'];
+    clearEmber();
   });
 };
 
diff --git a/tests/node/helpers/setup-component.js b/tests/node/helpers/setup-component.js
index 7cb95e297d4..ddfd379ae69 100644
--- a/tests/node/helpers/setup-component.js
+++ b/tests/node/helpers/setup-component.js
@@ -1,32 +1,15 @@
 'use strict';
 
-const path = require('path');
 const SimpleDOM = require('simple-dom');
 const buildOwner = require('./build-owner');
-
-const distPath = path.join(__dirname, '../../../dist');
-const emberPath = path.join(distPath, 'tests/ember');
-const templateCompilerPath = path.join(distPath, 'ember-template-compiler');
-
-function clearEmber() {
-  delete global.Ember;
-
-  // clear the previously cached version of this module
-  delete require.cache[emberPath + '.js'];
-  delete require.cache[templateCompilerPath + '.js'];
-}
+const { loadEmber, clearEmber } = require('./load-ember');
 
 module.exports = function(hooks) {
   hooks.beforeEach(function() {
-    let precompile = require(templateCompilerPath).precompile;
-    this.compile = function compile(templateString, options) {
-      let templateSpec = precompile(templateString, options);
-      let template = new Function('return ' + templateSpec)();
-
-      return this.Ember.HTMLBars.template(template);
-    };
+    let { Ember, compile } = loadEmber();
 
-    let Ember = (this.Ember = require(emberPath));
+    this.compile = compile;
+    this.Ember = Ember;
 
     Ember.testing = true;
     this.run = Ember.run;
diff --git a/tests/node/instrumentation-test.js b/tests/node/instrumentation-test.js
index e8dc4f9e39d..c3456bd83e8 100644
--- a/tests/node/instrumentation-test.js
+++ b/tests/node/instrumentation-test.js
@@ -1,20 +1,18 @@
 'use strict';
 
-const path = require('path');
-const distPath = path.join(__dirname, '../../dist');
-const emberPath = path.join(distPath, 'tests/ember');
+const { loadEmber, clearEmber } = require('./helpers/load-ember');
+
+const { Ember } = loadEmber();
 
 QUnit.module('instrumentation', function(hooks) {
   hooks.afterEach(function() {
-    delete global.Ember;
-    delete require.cache[emberPath + '.js'];
+    clearEmber();
   });
 
   QUnit.test('it works in FastBoot environment', function(assert) {
     let _originalWindow = global.window;
 
     global.window = {}; // mock window without `performance` property
-    let Ember = require(emberPath);
 
     let result = Ember.instrument('render', {}, function() {
       return 'hello';

From bb8ba6de9846059b448a5938ef31d2b78d0ca07e Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 23 Jun 2020 19:18:38 -0700
Subject: [PATCH 0023/1405] add back deprecated intimate APIs

---
 packages/@ember/-internals/meta/lib/meta.ts | 54 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index af3eb3a7bd7..a63dafea1ce 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -1,7 +1,7 @@
 import { symbol, toString } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { isDestroyed } from '@glimmer/runtime';
+import { isDestroyed, isDestroying } from '@glimmer/runtime';
 import { UpdatableTag } from '@glimmer/validator';
 
 type ObjMap<T> = { [key: string]: T };
@@ -131,6 +131,56 @@ export class Meta {
     return parent;
   }
 
+  // These methods are here to prevent errors in legacy compat with some addons
+  // that used them as intimate API
+  setSourceDestroying() {
+    deprecate(
+      'setSourceDestroying is deprecated, use the destroy() API to destroy the object directly instead',
+      false,
+      {
+        id: 'meta-destruction-apis',
+        until: '3.25.0',
+      }
+    );
+  }
+
+  setSourceDestroyed() {
+    deprecate(
+      'setSourceDestroyed is deprecated, use the destroy() API to destroy the object directly instead',
+      false,
+      {
+        id: 'meta-destruction-apis',
+        until: '3.25.0',
+      }
+    );
+  }
+
+  isSourceDestroying() {
+    deprecate(
+      'isSourceDestroying is deprecated, use the isDestroying() API to check the object destruction state directly instead',
+      false,
+      {
+        id: 'meta-destruction-apis',
+        until: '3.25.0',
+      }
+    );
+
+    return isDestroying(this.source);
+  }
+
+  isSourceDestroyed() {
+    deprecate(
+      'isSourceDestroyed is deprecated, use the isDestroyed() API to check the object destruction state directly instead',
+      false,
+      {
+        id: 'meta-destruction-apis',
+        until: '3.25.0',
+      }
+    );
+
+    return isDestroyed(this.source);
+  }
+
   setInitializing() {
     this._isInit = true;
   }

From acc8100844968f4f4b760c8fd71fd28165200f41 Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Thu, 25 Jun 2020 13:23:05 -0400
Subject: [PATCH 0024/1405] Add test case for two way binding through a setter
 CP.

Co-authored-by: Robert Jackson <me@rwjblue.com>
---
 .../components/curly-components-test.js       | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 55582b5fffe..5d6dcf1adfd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -2904,6 +2904,84 @@ moduleFor(
       this.assertText('initial value');
     }
 
+    ['@test GH#18147 - a two way binding flows upstream to a parent component through a CP']() {
+      let parent, child;
+      let ParentComponent = Component.extend({
+        init() {
+          this._super(...arguments);
+          parent = this;
+        },
+        string: 'Hello|World',
+      });
+
+      this.registerComponent('parent', {
+        ComponentClass: ParentComponent,
+        template: `{{child value=string}}
+
+        Parent String=<span data-test-parent-value>{{string}}</span>`,
+      });
+
+      let ChildComponent = Component.extend({
+        init() {
+          this._super(...arguments);
+          child = this;
+        },
+
+        a: null, // computed based on passed in value of `string`
+        b: null, // computed based on passed in value of `string`
+
+        value: computed('a', 'b', {
+          get() {
+            return this.a + '|' + this.b;
+          },
+
+          set(key, value) {
+            let vals = value.split('|');
+            set(this, 'a', vals[0]);
+            set(this, 'b', vals[1]);
+            return value;
+          },
+        }),
+      });
+
+      this.registerComponent('child', {
+        ComponentClass: ChildComponent,
+        template: '{{value}}',
+      });
+
+      this.render('{{parent}}');
+
+      this.assert.equal(parent.string, 'Hello|World', 'precond - parent value');
+      this.assert.equal(
+        this.element.querySelector('[data-test-parent-value]').textContent.trim(),
+        'Hello|World',
+        'precond - parent rendered value'
+      );
+
+      runTask(() => {
+        child.set('a', 'Foo');
+      });
+
+      this.assert.equal(parent.string, 'Foo|World', 'parent value updated');
+
+      this.assert.equal(
+        this.element.querySelector('[data-test-parent-value]').textContent.trim(),
+        'Foo|World',
+        'parent updated value rendered'
+      );
+
+      runTask(() => {
+        child.set('a', 'Hello');
+      });
+
+      this.assert.equal(parent.string, 'Hello|World', 'parent value reset');
+      this.assert.equal(
+        this.element.querySelector('[data-test-parent-value]').textContent.trim(),
+        'Hello|World',
+        'parent template reset'
+      );
+    }
+
     ['@test services can be injected into components']() {
       let service;
       this.registerService(

From 02495322b984996c640cc9932b37e90d64bb5e1b Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 25 Jun 2020 16:23:04 -0400
Subject: [PATCH 0025/1405] Add sync observer when passing an argument into a
 setter CP with dep keys

---
 .../glimmer/lib/component-managers/curly.ts   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index d7fdb8fabba..a5d6382dca5 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -42,6 +42,8 @@ import ComponentStateBucket, { Component } from '../utils/curly-component-state-
 import { processComponentArgs } from '../utils/process-args';
 import AbstractManager from './abstract';
 import DefinitionState from './definition-state';
+import { addObserver, descriptorForProperty, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
+import { ComputedDescriptor } from '@ember/-internals/metal/lib/decorator';
 
 function aliasIdToElementId(args: VMArguments, props: any) {
   if (args.named.has('id')) {
@@ -301,6 +303,35 @@ export default class CurlyComponentManager
       }
     }
 
+    // ensure two way binding works when the component has defined a computed
+    // property with both a setter and dependent keys, in that scenario without
+    // the sync observer added below the caller's value will never be updated
+    //
+    // See GH#18147 / GH#19028 for details.
+    let keyName: string, descriptor: ComputedDescriptor;
+    if (environment.isInteractive && capturedArgs.names.length > 0) {
+      for (let i = 0; i < capturedArgs.names.length; i++) {
+        keyName = capturedArgs.names[i];
+        descriptor = descriptorForProperty(component, keyName);
+
+        if (
+          descriptor !== undefined &&
+          descriptor._dependentKeys !== undefined &&
+          descriptor._dependentKeys.length > 0
+        ) {
+          addObserver(
+            component,
+            keyName,
+            () => {
+              component[PROPERTY_DID_CHANGE](keyName);
+            },
+            undefined,
+            true
+          );
+        }
+      }
+    }
+
     // Track additional lifecycle metadata about this component in a state bucket.
     // Essentially we're saving off all the state we'll need in the future.
     let bucket = new ComponentStateBucket(

From ae0c5d83643fe1408e7620a772eb84787bc6926c Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Thu, 25 Jun 2020 16:39:39 -0400
Subject: [PATCH 0026/1405] Fix lint issue

---
 .../-internals/glimmer/lib/component-managers/curly.ts       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index a5d6382dca5..886f8a41153 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,5 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
+import { addObserver, descriptorForProperty, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
+import { ComputedDescriptor } from '@ember/-internals/metal/lib/decorator';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
@@ -38,12 +40,11 @@ import {
   referenceForKey,
   SimpleClassNameBindingReference,
 } from '../utils/bindings';
+
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
 import AbstractManager from './abstract';
 import DefinitionState from './definition-state';
-import { addObserver, descriptorForProperty, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import { ComputedDescriptor } from '@ember/-internals/metal/lib/decorator';
 
 function aliasIdToElementId(args: VMArguments, props: any) {
   if (args.named.has('id')) {

From 5a7e16666cd0579b24f3b80be1e4f6fd6d3f0602 Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Thu, 25 Jun 2020 18:00:00 -0400
Subject: [PATCH 0027/1405] Fix typo in issue number in test

---
 .../@ember/-internals/glimmer/lib/component-managers/curly.ts   | 2 +-
 .../tests/integration/components/curly-components-test.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 886f8a41153..a79357c7a1a 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -308,7 +308,7 @@ export default class CurlyComponentManager
     // property with both a setter and dependent keys, in that scenario without
     // the sync observer added below the caller's value will never be updated
     //
-    // See GH#18147 / GH#19028 for details.
+    // See GH#18417 / GH#19028 for details.
     let keyName: string, descriptor: ComputedDescriptor;
     if (environment.isInteractive && capturedArgs.names.length > 0) {
       for (let i = 0; i < capturedArgs.names.length; i++) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 5d6dcf1adfd..473284052c9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -2904,7 +2904,7 @@ moduleFor(
       this.assertText('initial value');
     }
 
-    ['@test GH#18147 - a two way binding flows upstream to a parent component through a CP']() {
+    ['@test GH#18417 - a two way binding flows upstream to a parent component through a CP']() {
       let parent, child;
       let ParentComponent = Component.extend({
         init() {

From 8d4ffc678c31c4c60caea01d049e58097678161e Mon Sep 17 00:00:00 2001
From: Michael Peirce <michaelp@squareup.com>
Date: Sun, 28 Jun 2020 18:06:10 -0700
Subject: [PATCH 0028/1405] Fix categories type on issue template.

---
 .github/ISSUE_TEMPLATE/4-other.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/4-other.md b/.github/ISSUE_TEMPLATE/4-other.md
index f6ee379febb..7f9131c19f2 100644
--- a/.github/ISSUE_TEMPLATE/4-other.md
+++ b/.github/ISSUE_TEMPLATE/4-other.md
@@ -1,6 +1,6 @@
 ---
 name: Other
-about: Report an issue that does not fit any of the categoroes above.
+about: Report an issue that does not fit any of the categories above.
 title: ''
 labels: ''
 assignees: ''

From b5088f6fdff164067dfb2e608531f6e8a02f9f54 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 29 Jun 2020 17:19:07 -0400
Subject: [PATCH 0029/1405] Add v3.20.0-beta.4 to CHANGELOG [ci skip]

(cherry picked from commit d5ce21323dd413a4fd6c6b346ea63f81e1c595b0)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 123953a6f98..d22b3cb3758 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.20.0-beta.4 (June 29, 2020)
+
+- [#19025](https://github.com/emberjs/ember.js/pull/19025) [BUGFIX] Updates Glimmer VM to 0.54.0
+
 ### v3.20.0-beta.3 (June 22, 2020)
 
 - [#19021](https://github.com/emberjs/ember.js/pull/19021) [BUGFIX] Disallow null/undefined targets in `in-element`.

From e3c523f5ca42581836bceaad529c9afd3f328f67 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 2 Jul 2020 11:24:49 -0700
Subject: [PATCH 0030/1405] [BUGFIX canary] Disable named blocks

See ember-polyfills/ember-named-blocks-polyfill#17

Please continue to use the polyfill in the meantime.
---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 0722ff80e08..e4e6b7c8329 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -15,7 +15,7 @@ import { assign } from '@ember/polyfills';
 export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
-  EMBER_NAMED_BLOCKS: true,
+  EMBER_NAMED_BLOCKS: null,
   EMBER_MODULE_UNIFICATION: false,
   EMBER_CUSTOM_COMPONENT_ARG_PROXY: true,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,

From 251c17f86f5375187dec7a6165cb8017d3fa7592 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 6 Jul 2020 15:48:19 -0400
Subject: [PATCH 0031/1405] Add v3.20.0-beta.5 to CHANGELOG [ci skip]

(cherry picked from commit 0fd013db7d515737d537631923e4853293e9859c)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d22b3cb3758..a1f50ddbb49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.20.0-beta.5 (July 6, 2020)
+
+- [#19034](https://github.com/emberjs/ember.js/pull/19034) [BUGFIX] Disable named blocks; please continue to use the polyfill. 
+
 ### v3.20.0-beta.4 (June 29, 2020)
 
 - [#19025](https://github.com/emberjs/ember.js/pull/19025) [BUGFIX] Updates Glimmer VM to 0.54.0

From 3c6f9dc6cfb9cb05f8dfeb665d2ab5d20d894f25 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 13 Jul 2020 11:55:41 -0700
Subject: [PATCH 0032/1405] [BUGFIX lts] Fixes the {{each}} memory leak

Updates the VM to a version which fixes the {{each}} memory leak.
---
 package.json |  16 ++---
 yarn.lock    | 196 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index 3942b8cf70d..bdee9a74086 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.54.0",
+    "@glimmer/compiler": "^0.54.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.54.0",
-    "@glimmer/node": "^0.54.0",
-    "@glimmer/opcode-compiler": "^0.54.0",
-    "@glimmer/program": "^0.54.0",
-    "@glimmer/reference": "^0.54.0",
-    "@glimmer/runtime": "^0.54.0",
-    "@glimmer/validator": "^0.54.0",
+    "@glimmer/interfaces": "^0.54.1",
+    "@glimmer/node": "^0.54.1",
+    "@glimmer/opcode-compiler": "^0.54.1",
+    "@glimmer/program": "^0.54.1",
+    "@glimmer/reference": "^0.54.1",
+    "@glimmer/runtime": "^0.54.1",
+    "@glimmer/validator": "^0.54.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index b960d944188..bc5cd756630 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.54.0.tgz#25c794495ef0ed0cc4014eb1b160a859d8b602a7"
-  integrity sha512-/+xi54syHB5VtDuo6lWjZpTLaIwVfk6iWkPoRrSvQT93PN663fvTlJlW2NgI5q+h/WAJgGUoTMGYdGQGd9vFAw==
-  dependencies:
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/syntax" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
-    "@glimmer/wire-format" "^0.54.0"
+"@glimmer/compiler@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.54.1.tgz#92d1aa56918252df5ea159bf245c8179d65ca5f5"
+  integrity sha512-7lxTajz9yCJrgzHGd9FRdPEXqya3VFtur+tMWTbu/KumbjWXcOIfsFJytVduFUACTnV6+xK7WKTQBiG0+YJjJA==
+  dependencies:
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/syntax" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
+    "@glimmer/wire-format" "^0.54.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.54.0.tgz#8fe9a175a91081661e47862ca55dcbc330e86907"
-  integrity sha512-nqFhqYy6G4cf85e6cyahUVESOSz+uCAVa2nMrGhciV259JYbRGI+3xVnuQCQW5UPYjERz0idGTi0tNVApLB/Yw==
+"@glimmer/encoder@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.54.1.tgz#73d328b0a54af698d89b7882b27832f1e5e75f06"
+  integrity sha512-pZZgb48jOY9cM9GzeDu42g61hW+oqORHjF40DuY2LpPEciUNV2pe306R4HXD4SrSlRBVnlKE8cspWaqsIWvNiQ==
   dependencies:
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/vm" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/vm" "^0.54.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.54.0.tgz#99cb943f5652edf4a8fe1a11594050db0e0b9bb1"
-  integrity sha512-IXP6wkEqO+1P5aoDBZ7SvPBM6073eXMbKaWAWsYHlbMp7qXYN92dPnFVtrf6CVUB2NciLNvmEUzzDDteYxsH0A==
+"@glimmer/interfaces@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.54.1.tgz#b8d2cfc59ed5dd5eefd8dd109657b580a34ef377"
+  integrity sha512-G8PdpZH2lugcsxt2N/R/WNKGCOXukCDKMCukda4a3DnYEXQLccTyhNVtJFWKHh1C6pxYLXD5sNA0b90GJUrCww==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.54.0.tgz#f60b7566321b0ebfa5aa6068f387805d5e113aef"
-  integrity sha512-yPyNdDyA7ssZPi0at/7eRcGJOr6OQLGkkdXxNL8870ASw7JpNMIK2j1dJR5VHhIZc+fmBu6xC97DfzM4xMkVmA==
+"@glimmer/low-level@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.54.1.tgz#5989aeebfa5ed80136c3e72ccf8aa59997cdf6be"
+  integrity sha512-XmgzEYvgkMmwC53CdVM9bJ3SdNyNggXIerQsjlF4KSXgVowxbaL8atpLFzPu6h18la4apAmsvYMb81u25xbryQ==
 
-"@glimmer/node@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.54.0.tgz#8d312c58eb94d9e019f6a6764ab2bb5bc24f6536"
-  integrity sha512-E19kMaYJ0k+vHwbPrruCnyIYtVSAATosj1azmsROHFVMLKnFouDv3QFhXehH+wQEIHZOxNoVQ0QwCrFn5Rkohw==
+"@glimmer/node@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.54.1.tgz#40e7408530f5e5f1e153868af2dcfa33832a9181"
+  integrity sha512-6YaDE0J23dQj/X20pblSFzdQie85n5rIKsRp4fMrUZRIR6OSW0FVMp6hTKp73jP4oe8DciQ4EVcW0sg5xeVlpA==
   dependencies:
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/runtime" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/runtime" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.54.0.tgz#8bd10814539028764a3961e4584bef3dcae86c85"
-  integrity sha512-1sIrRWt8ocO9MGHBtXt5VcrcI2TKjVfyd63EOLsNXFcCqUlQhoxljagwe/v+qTOzv6RfXZgfLCcnnKC1cGuuIg==
-  dependencies:
-    "@glimmer/encoder" "^0.54.0"
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/program" "^0.54.0"
-    "@glimmer/reference" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
-    "@glimmer/vm" "^0.54.0"
-    "@glimmer/wire-format" "^0.54.0"
-
-"@glimmer/program@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.54.0.tgz#8dd5be71e8f0f28038b05ed2ebd09c8d907849f9"
-  integrity sha512-RkbXrW+l/vQ3gwGM5ArTj5HO66+uVRpAqzjcUElZjjygWqDlBbU/vY+MOLbQReM48Vsa5l9wUDgUFue4876zbw==
-  dependencies:
-    "@glimmer/encoder" "^0.54.0"
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
-
-"@glimmer/reference@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.54.0.tgz#eab11698cf9b539bd6d5d5eed38be9dbeae6bbd0"
-  integrity sha512-8jiIOqDdMt88MesF/9Nv3+ge99GyRF29bAXfjzbUVJFDu6krmm2qiIpCLkKmcofsCyg82pJvn+OUEAmXcI2ZaA==
+"@glimmer/opcode-compiler@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.54.1.tgz#8cfd833b9ce9d0958d073f5b93a47fe390745c61"
+  integrity sha512-H8MaTAzoyekoBWUU9MQJmUPSpsuRA1BgHjhvXxTHb4CWH7wkbckBGe3hDIQx5XlofqRWEYBdjuDfC5pZ4GGKZw==
+  dependencies:
+    "@glimmer/encoder" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/program" "^0.54.1"
+    "@glimmer/reference" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
+    "@glimmer/vm" "^0.54.1"
+    "@glimmer/wire-format" "^0.54.1"
+
+"@glimmer/program@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.54.1.tgz#a219196e2255f0a229ade4babd674d2ff88b07ed"
+  integrity sha512-8ozfp7+XnsZsyT2dHi2OLY8l8IGS4pMVc6TMSWkVllLifPjPscDdgdZknTAEOMiBuPzZriT5VTXF00+3Q6+QEQ==
+  dependencies:
+    "@glimmer/encoder" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
+
+"@glimmer/reference@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.54.1.tgz#12561612d117cd877cdf56f77c2bae4eefa37ad1"
+  integrity sha512-sSDnh5/fhGHRcXkgVvWPnTRszzYVfcrrCh5pYkNADM+A1ivVJQzhAfZyV5+WSbPN5eXeh5Z7tXRpSiMH3NwH4g==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
-    "@glimmer/validator" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
+    "@glimmer/validator" "^0.54.1"
 
-"@glimmer/runtime@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.54.0.tgz#5ef89928e245966ba1c3a3d69a1a593f05c3b528"
-  integrity sha512-5fA/RXuJS+2bE71m84KlXCPVCE2RsXIrs3k68YKaV50IzZR5hPftN0IPWZ/qsQIwbhaXvqrXGBQbMG0WZlp2IA==
+"@glimmer/runtime@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.54.1.tgz#ed868ba80d6edf91a53da0652f306bcc50dd5276"
+  integrity sha512-YCsngOiaH8EFXxuyVONK9Sz5CYvwHs4lcNbHoTdFP7bpVWgXg9mHLdqryOSoP9Ei9FF7Z5NWTO/KCo8UGeR4Lg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/low-level" "^0.54.0"
-    "@glimmer/program" "^0.54.0"
-    "@glimmer/reference" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
-    "@glimmer/validator" "^0.54.0"
-    "@glimmer/vm" "^0.54.0"
-    "@glimmer/wire-format" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/low-level" "^0.54.1"
+    "@glimmer/program" "^0.54.1"
+    "@glimmer/reference" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
+    "@glimmer/validator" "^0.54.1"
+    "@glimmer/vm" "^0.54.1"
+    "@glimmer/wire-format" "^0.54.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.54.0.tgz#d257a61141d9debcc00a39dd62e415f782cc202b"
-  integrity sha512-pL8BBkZ34bTJixSUKj3V84bMqh7J6PCQ7b+65HsNEMQcQAkGVoX5RMukYI2KfVKzGk2gSCi4Qmdly9if2ooF8g==
+"@glimmer/syntax@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.54.1.tgz#e3a1e1bfa72719ea2357a7f147ff595d0790a95f"
+  integrity sha512-bNRSXVOKBaZyE+kPjFy5BkoUK0VnVkQ3ph//YSwnVY4xM9AF9E5nKVgDBPxQlioCK3ODBWzhMdfTHZ/RHkLS3Q==
   dependencies:
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.54.0.tgz#2657939303c2be1075c8accf701efc936306d653"
-  integrity sha512-hqbmkD3FBIGbRQzXMjgqW+z2hbbUgDvbWfr3b4ifJQNhwD/JlUyI1txMXFFFEzduWkTlhzoY52/LFDXdF4DY8Q==
+"@glimmer/util@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.54.1.tgz#9995b08dc7fd0cc8fb5c3522574d680ccc8f5511"
+  integrity sha512-WrpTueecsmzVALrG7U0LBLDWtsGvj3eRZ/z72BKi4+usK2DYt+346LS+VCgozC8XdCIS9BawI37qogIXCyZrjw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.54.0.tgz#fe78eeaf52c54a88aec41d13bba20e240f9e687f"
-  integrity sha512-3O/hR6ykWbKryyKOnnj9daEmLD535dMmb0Dz7jGptUGvDRbIV9ubUf6xixfvjJHvyPDSuBVEgtMI1ANpX1oeOg==
+"@glimmer/validator@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.54.1.tgz#955406fcd86a48aa8b635bf49dec82a5f6138a33"
+  integrity sha512-EFd/jQwqqlTi5fdN5+KEt051GjgDiC42Sa8LJxFJnDb6lxsEm0cpgxWMPPASgLEEgQK3OWVJz5sxZKJfMNP/aQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.54.0.tgz#4b6e284023b5a82a796468b0cc275d5b1f871991"
-  integrity sha512-EqFDCqD1zKkxL7H9crgIyXwu8arEl2VtubZj5uiWefsWgDa8b2exaaeLJG2WB0uA7OSnTpl+IAjruM+VmhNu6Q==
+"@glimmer/vm@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.54.1.tgz#b4fe9992febfbd72f9bb85843e02307b55e643b0"
+  integrity sha512-zZRc9z/0NPJhu0uG4ZmHw+VYL2AcQAgwfTYNAW6+7+CvP2Jxd04Anvz4HuaqO4NhntjbmUN0jolz+xmPOts4jg==
   dependencies:
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
 
-"@glimmer/wire-format@^0.54.0":
-  version "0.54.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.54.0.tgz#128a75aea18cb2f3f904dbb317fdad6a299cb770"
-  integrity sha512-gcevzlWFmQU7dLtWLDfjTDCmiyAaKxuBMdapd7OvbQZC5pQUkngCy1EVbMQDAEtxmxncOsbDgi0EFemIspprgQ==
+"@glimmer/wire-format@^0.54.1":
+  version "0.54.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.54.1.tgz#59804ce334a6d265de1f2e04c97862087ac897be"
+  integrity sha512-XrN5TOi//MGd3/wbeTVex2lJodCxT9r1ySLXsSIfsZ9y8cb+IqNgVwqYpfvBdafzRLdiI1OnatTjSdnILGvVzw==
   dependencies:
-    "@glimmer/interfaces" "^0.54.0"
-    "@glimmer/util" "^0.54.0"
+    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/util" "^0.54.1"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 82baa28ced6dd7323955318730a0a7fa8c569a66 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jul 2020 14:53:16 -0400
Subject: [PATCH 0033/1405] Add v3.20.0 to CHANGELOG [ci skip]

(cherry picked from commit 13ec04419c77371a4ca020978860fb63c684b458)
---
 CHANGELOG.md | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1f50ddbb49..0c8450cd5fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,27 +1,13 @@
 # Ember Changelog
 
-### v3.20.0-beta.5 (July 6, 2020)
-
-- [#19034](https://github.com/emberjs/ember.js/pull/19034) [BUGFIX] Disable named blocks; please continue to use the polyfill. 
-
-### v3.20.0-beta.4 (June 29, 2020)
+### v3.20.0 (July 13, 2020)
 
+- [#18867](https://github.com/emberjs/ember.js/pull/18867) / [#18927](https://github.com/emberjs/ember.js/pull/18927) / [#18928](https://github.com/emberjs/ember.js/pull/18928) [FEATURE] [Promote `{{in-element}}` to public API](https://github.com/emberjs/rfcs/blob/master/text/0287-promote-in-element-to-public-api.md) RFC.
 - [#19025](https://github.com/emberjs/ember.js/pull/19025) [BUGFIX] Updates Glimmer VM to 0.54.0
-
-### v3.20.0-beta.3 (June 22, 2020)
-
 - [#19021](https://github.com/emberjs/ember.js/pull/19021) [BUGFIX] Disallow null/undefined targets in `in-element`.
 - [#19023](https://github.com/emberjs/ember.js/pull/19023) [BUGFIX] Don't access properties during init unless required to prevent unnecessary rendering invalidations.
-
-### v3.20.0-beta.2 (June 2, 2020)
-
 - [#18997](https://github.com/emberjs/ember.js/pull/18997) [BUGFIX] Fix components `<Input>` and `<Textarea>` to work with native class actions correctly.
-
-### v3.20.0-beta.1 (May 26, 2020)
-
-- [#18926](https://github.com/emberjs/ember.js/pull/18926) / [#18852](https://github.com/emberjs/ember.js/pull/18852) [FEATURE] Implement the [Yieldable Named Blocks](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md) RFC.
-- [#18867](https://github.com/emberjs/ember.js/pull/18867) / [#18927](https://github.com/emberjs/ember.js/pull/18927) / [#18928](https://github.com/emberjs/ember.js/pull/18928) [FEATURE] [Promote `{{in-element}}` to public API](https://github.com/emberjs/rfcs/blob/master/text/0287-promote-in-element-to-public-api.md) RFC.
-- [#18859](https://github.com/emberjs/ember.js/pull/18859) Fix transitionTo with scoped aliased queryParam.
+- [#18859](https://github.com/emberjs/ember.js/pull/18859) [BUGFIX] Fix transitionTo with scoped aliased queryParam.
 - [#18961](https://github.com/emberjs/ember.js/pull/18961) [BUGFIX] Remove assertions for updating auto-tracked state without Ember.set / this.set
 
 ### v3.19.0 (May 26, 2020)

From b6166734043bdea11622675bd96d4c5e4ebee7db Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jul 2020 16:29:33 -0400
Subject: [PATCH 0034/1405] Add v3.21.0-beta.1 to CHANGELOG [ci skip]

(cherry picked from commit 6a868bab610fb9dcb52674a4a32803f36c8c86c5)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8450cd5fc..49fb815cdac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.21.0-beta.1 (July 13, 2020)
+
+- [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
+- [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
+
 ### v3.20.0 (July 13, 2020)
 
 - [#18867](https://github.com/emberjs/ember.js/pull/18867) / [#18927](https://github.com/emberjs/ember.js/pull/18927) / [#18928](https://github.com/emberjs/ember.js/pull/18928) [FEATURE] [Promote `{{in-element}}` to public API](https://github.com/emberjs/rfcs/blob/master/text/0287-promote-in-element-to-public-api.md) RFC.

From cecad7bf3800e8a6c2f6b366808637928d0393d8 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jul 2020 16:33:17 -0400
Subject: [PATCH 0035/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3942b8cf70d..dc8f328a429 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.21.0",
+  "version": "3.22.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 57277d3e2edfd76e8e89592b431bf0f78f8369f0 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Sun, 15 Sep 2019 15:43:00 -0500
Subject: [PATCH 0036/1405] Replace Travis CI with a Github Actions workflow to
 run builds

Remove old jQuery test suite -- those versions are no longer supported
by jQuery
---
 .eslintrc.js                                  |   2 +-
 .github/workflows/build.yml                   | 259 ++++++++++++++++++
 .github/workflows/cron.yml                    |  56 ++++
 .travis.yml                                   | 120 --------
 CONTRIBUTING.md                               |  12 +-
 README.md                                     |   8 +-
 RELEASE.md                                    |  21 +-
 bin/build-for-publishing.js                   |   2 +-
 bin/publish_builds                            |  28 --
 bin/publish_to_s3.js                          |   9 +-
 bin/run-browserstack-tests.js                 |   2 +-
 bin/run-tests.js                              |  12 +-
 broccoli/build-info.js                        |  83 +++---
 package.json                                  |   2 +-
 ...ravis-browsers.js => testem.ci-browsers.js |   0
 tests/node/build-info-test.js                 |  78 ++----
 yarn.lock                                     |   8 +-
 17 files changed, 401 insertions(+), 301 deletions(-)
 create mode 100644 .github/workflows/build.yml
 create mode 100644 .github/workflows/cron.yml
 delete mode 100644 .travis.yml
 delete mode 100755 bin/publish_builds
 rename testem.travis-browsers.js => testem.ci-browsers.js (100%)

diff --git a/.eslintrc.js b/.eslintrc.js
index ac34ace5fd1..ca2f0921c08 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -137,7 +137,7 @@ module.exports = {
         'lib/**/*.js',
         'server/**/*.js',
         'testem.js',
-        'testem.travis-browsers.js',
+        'testem.ci-browsers.js',
         'testem.browserstack.js',
         'd8-runner.js',
         'broccoli/**/*.js',
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000000..8705cfb0129
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,259 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+      - beta
+      - release
+      # release branches
+      - release*
+      - lts*
+      # nightly ci cron branches
+      - cron*
+    tags:
+      - 'v*'
+  pull_request:
+
+jobs:
+  lint:
+    name: Linting
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: linting
+        run: yarn lint
+
+  basic-test:
+    name: Debug and Prebuilt (All Tests by Package + Canary Features + Optional Jquery)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        env:
+          DISABLE_SOURCE_MAPS: true
+          BROCCOLI_ENV: production
+        run: yarn ember build
+      - name: Upload build
+        uses: actions/upload-artifact@v1
+        with:
+          name: dist
+          path: dist
+      - name: test
+        env:
+          TEST_SUITE: each-package
+        run: yarn test
+
+  browserstack-test:
+    name: Browserstack Tests (Safari, Edge, IE11)
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        env:
+          DISABLE_SOURCE_MAPS: true
+          BROCCOLI_ENV: production
+          SHOULD_TRANSPILE: true
+        run: yarn ember build
+      - name: test:browserstack
+        env:
+          BROWSERSTACK_USERNAME: emberjscoreteam1
+          BROWSERSTACK_ACCESS_KEY: YsPxXKcahx9XszyHS2Gr
+        run: yarn test:browserstack
+
+  production-test:
+    name: Production (All Tests + Canary Features)
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        env:
+          DISABLE_SOURCE_MAPS: true
+          BROCCOLI_ENV: production
+        run: yarn ember build -prod
+      - name: test
+        run: yarn test
+
+  production-debug-render-test:
+    name: Production (All Tests + Canary Features with Debug Render Tree)
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        env:
+          DISABLE_SOURCE_MAPS: true
+          BROCCOLI_ENV: production
+          DEBUG_RENDER_TREE: true
+        run: yarn ember build -prod
+      - name: test
+        run: yarn test
+
+  extend-prototypes-test:
+    name: Extend Prototypes
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist
+          path: dist
+      - name: test
+        env:
+          TEST_SUITE: extend-prototypes
+        run: yarn test
+
+  node-test:
+    name: Node.js Tests
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        env:
+          DISABLE_SOURCE_MAPS: true
+          BROCCOLI_ENV: production
+        run: yarn ember build -prod
+      - name: test
+        run: yarn test:node
+
+  blueprint-test:
+    name: Blueprint Tests
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist
+          path: dist
+      - name: test
+        run: yarn test:blueprints
+
+  browser-test:
+    name: Browser Tests (Firefox)
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - uses: actions/download-artifact@v1
+        with:
+          name: dist
+          path: dist
+      - name: test
+        run: yarn ember test -c testem.ci-browsers.js
+
+  deploy-tag:
+    name: Deploy tags to npm
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+          registry-url: 'https://registry.npmjs.org'
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build for publish
+        run: node bin/build-for-publishing.js
+      - name: publish to npm
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+
+  publish:
+    name: Publish channel to s3
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    # Only run on pushes to branches that are not from the cron workflow
+    if: github.event_name == 'push' && contains(github.ref, 'cron') != true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build for publish
+        run: node bin/build-for-publishing.js
+      - name: publish to s3
+        run: node bin/publish_to_s3.js
+        env:
+          S3_BUCKET_NAME: 'builds.emberjs.com'
+          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY}}
+          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID}}
+
+  publish-alpha:
+    name: Publish alpha from default branch
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    # Only run on pushes to master
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build for publish
+        run: node bin/build-for-publishing.js
+      - name: publish to s3
+        run: node bin/publish_to_s3.js
+        env:
+          BUILD_TYPE: alpha
+          OVERRIDE_FEATURES: EMBER_METAL_TRACKED_PROPERTIES
+          S3_BUCKET_NAME: 'builds.emberjs.com'
+          S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY}}
+          S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID}}
+
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
new file mode 100644
index 00000000000..e4603797d04
--- /dev/null
+++ b/.github/workflows/cron.yml
@@ -0,0 +1,56 @@
+name: Cron
+
+on:
+  schedule:
+    - cron:  '0 7 * * *' # daily, 7am
+
+jobs:
+  trigger-ci:
+    name: Trigger cron build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        branch:
+          - master
+          - beta
+          - release
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+          ref: ${{matrix.branch}}
+
+      - name: Make a commit to have a unique sha
+        run: |
+          touch cron.txt
+          git config --local user.email 'cron@example.com'
+          git config --local user.name 'Ember.js Cron CI'
+          git add cron.txt
+          git commit -m "Cron $(date +%Y-%m-%d) for ${{matrix.branch}}"
+          export SHA=`git rev-parse HEAD`
+          echo "::set-env name=SHA::$SHA"
+
+      - name: Push branch to trigger Build workflow
+        # This must use a personal access token because of a Github Actions
+        # limitation where it will not trigger workflows from pushes from
+        # other workflows with the token it provides.
+        # The PERSONAL_ACCESS secret must be a token with `repo` scope.
+        # See https://help.github.com/en/actions/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token
+        run: |
+          git checkout -B cron-${{matrix.branch}}-${{env.SHA}}
+          git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN }}@github.com/${GITHUB_REPOSITORY} cron-${{matrix.branch}}-${{env.SHA}} --force
+
+      - name: Wait for Build completion
+        uses: jitterbit/await-check-suites@v1
+        with:
+          ref: ${{ env.SHA }}
+          appSlugFilter: github-actions
+          onlyFirstCheckSuite: true
+          timeoutSeconds: 1800
+
+      - name: Cleanup
+        # Always cleanup the cron-* branches
+        if: ${{ success() }} || ${{ failure() }}
+        run: git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN}}@github.com/${GITHUB_REPOSITORY} --delete cron-${{matrix.branch}}-${{env.SHA}} || true # Don't fail build if cleanup fails
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ac96d17ad5e..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-branches:
-  only:
-  - master
-  - beta
-  - release
-  # release branches
-  - /^(?:release|lts)-\d+-\d+$/
-  # npm version tags
-  - /^v\d+\.\d+\.\d+/
-
-language: node_js
-node_js:
-  - "10"
-
-addons:
-  firefox: "latest"
-
-env:
-  global:
-    - BROWSERSTACK_USERNAME=emberjscoreteam1
-    - BROWSERSTACK_ACCESS_KEY=YsPxXKcahx9XszyHS2Gr
-    - DISABLE_SOURCE_MAPS=true
-    - BROCCOLI_ENV=production
-    - S3_BUCKET_NAME=builds.emberjs.com
-    - secure: "SHnuJ4A3QbSc3LV2fYynDPbbSbhVl0ZWnCiKPuRgwnddDnoSaMQUY2RqyHdtsQGdUZCOeNaMvYUhYx6hzxBVHn0yuN3KA20aSwvYdwaMgZXfJi+lyxgsEI8iYdksWXvVbCAyKM8zjTWXUtNcMBGtsGYOfdD41wfZgI8GsI0YYJc="
-    - secure: ! 'KXJmcGLpnxnPmmei/qPNVcdQxLX1xyYIaVocinQ0YAjtBvCtAwg63EWMFnGp
-
-      VIzUNikE+Cej3g+nwEdDJiL1c9NFPL+zCnriR2iMVjPak+IQaG3YcMm0T+hY
-      /WLEPAquZBKw1gU6lBEUuDumTlkXQQdHz3cJYoidAXz3uV1EXIU='
-    - secure: ! 'qCW0BVNFuQjAI53pvvE6oeGxtEdZ+RlvcCpYjU4vxEjedidEEcHKtIVh7d7J
-
-      PZ8DNTxX0zsp2jjY8NwTR5MC8NBH+J5VjuTSGv82t5sm0i0jzaBmOOSLbKqH
-
-      I/BFT0MbnR6JVCZiPV7TCWPgY1gvgZ6TEEIKGqauDMUBdL8ZK6I='
-    - secure: e0yxVfwVW61d3Mi/QBOsY6Rfd1mZd3VXUd9xNRoz/fkvQJRuVwDe7oG3NOuJ4LZzvMw7BJ+zpDV9D8nKhAyPEEOgpkkMHUB7Ds83pHG4qSMzm4EAwBCadDLXCQirldz8dzN5FAqgGucXoj5fj/p2SKOkO6qWIZveGr8pdBJEG1E=
-
-cache:
-  yarn: true
-
-stages:
-  - basic tests
-  - additional tests
-  - name: deploy
-    if: type IN (push)
-
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-
-  # install the most recent `npm version`
-  # used when publishing to build a properly packed tarball
-  - npm i -g npm
-
-install:
-  - yarn install --frozen-lockfile --non-interactive
-
-jobs:
-  include:
-    - stage: Basic Tests
-      name: Debug and Prebuilt (All Tests by Package + Canary Features + Optional Jquery)
-      env: TEST_SUITE=each-package
-      script:
-        - yarn ember build
-        - yarn test
-
-    - name: Linting
-      script:
-        - yarn lint
-
-    - stage: Additional Tests
-      name: Browserstack Tests (Safari, Edge, IE11)
-      env: SHOULD_TRANSPILE=true
-      script:
-        - yarn ember build
-        - yarn test:browserstack
-
-    - name: Production (All Tests + Canary Features)
-      script:
-        - yarn ember build -prod
-        - yarn test
-
-    - name: Production (All Tests + Canary Features + Debug Render Tree)
-      env: DEBUG_RENDER_TREE=true
-      script:
-        - yarn ember build -prod
-        - yarn test
-
-    - name: Old Jquery and Extend Prototypes
-      env: TEST_SUITE=old-jquery-and-extend-prototypes
-      script:
-        - yarn ember build
-        - yarn test
-
-    - name: Node.js Tests
-      script:
-        - yarn ember build -prod
-        - yarn test:node
-
-    - name: Blueprint Tests
-      script:
-        - yarn test:blueprints
-
-    - name: Browser Tests (Firefox)
-      script:
-        - yarn ember build
-        - yarn ember test -c testem.travis-browsers.js
-
-    - stage: deploy
-      env:
-      - PUBLISH=true
-      script:
-        - "./bin/publish_builds"
-
-    - if: branch = master
-      env:
-      - BUILD_TYPE=alpha
-      - OVERRIDE_FEATURES=EMBER_METAL_TRACKED_PROPERTIES
-      - PUBLISH=true
-      script:
-        - "./bin/publish_builds"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1f34fffd4f2..efa15e7100f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -250,19 +250,19 @@ And in case we didn't emphasize it enough: we love tests!
 
 NOTE: Partially copied from https://raw.github.com/thoughtbot/factory_girl_rails/master/CONTRIBUTING.md
 
-# Travis CI Tests
+# CI (Github Actions) Tests
 
-We use [Travis CI](https://travis-ci.org/emberjs/ember.js/pull_requests) to test each PR before it is merged.
+We use [GitHub Actions](https://github.com/ember.js/ember.js/actions?query=workflow%3ABuild+event%3Apull_request) to test each PR before it is merged.
 
-When you submit your PR (or later change that code), a Travis build will automatically be kicked off.  A note will be added to the PR, and will indicate the current status of the build.
+When you submit your PR (or later change that code), a CI build will automatically be kicked off.  A note will be added to the PR, and will indicate the current status of the build.
 
-Within the Travis build, you can see that we (currently) run six different test suites.
+Within the CI build, you can see that we (currently) run six different test suites.
 
 * The `each-package` test suite is closest to what you normally run locally on your machine.
 * The `build-tests EMBER_ENV=production...` test suite runs tests against a production build.
 * The `browserstack` test suite runs tests against various supported browsers.
 
-## Common Travis CI Build Issues
+## Common CI Build Issues
 
 ### Production Build Failures
 
@@ -289,7 +289,7 @@ To recreate this build environment locally:
 
 Sometimes a single test suite will fail, without giving any indication of a real error.
 * Try to recreate the test environment locally (see above for production builds)
-* Restart all the test suites on Travis CI by doing another push
+* Restart all the test suites on CI by doing another push
 * Ask a repo collab to restart that single test suite
 
 # Appendix
diff --git a/README.md b/README.md
index cd05e71e859..4dd30909dea 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,12 @@
 </p>
 
 <p align="center">
-   <a href="https://www.npmjs.com/package/ember-source"><img src="https://img.shields.io/npm/v/ember-source.svg?style=flat" alt="npm version"></a>  
-  <a href="http://travis-ci.org/emberjs/ember.js"><img src="https://secure.travis-ci.org/emberjs/ember.js.svg?branch=master" alt="Build Status"></a>
+  <a href="https://www.npmjs.com/package/ember-source"><img src="https://img.shields.io/npm/v/ember-source.svg?style=flat" alt="npm version"></a>
+  <a href="/emberjs/ember.js/actions?query=workflow%3ABuild"><img src="https://github.com/emberjs/ember.js/workflows/Build/badge.svg" alt="Build Status"></a>
   <a href="https://codeclimate.com/github/emberjs/ember.js"><img src="https://codeclimate.com/github/emberjs/ember.js.svg" alt="Code Climate"></a>
   <a href="https://discord.gg/zT3asNS"><img src="https://img.shields.io/discord/480462759797063690.svg?logo=discord" alt="Discord Community Server"></a>
-   <a href="https://help-wanted.emberjs.com/"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome"></a>
-   <a href="/emberjs/ember.js/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
+  <a href="https://help-wanted.emberjs.com/"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome"></a>
+  <a href="/emberjs/ember.js/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="GitHub license"></a>
 
 </p>
 
diff --git a/RELEASE.md b/RELEASE.md
index d7d665f8e92..0d73816ad68 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -19,7 +19,7 @@
 
 1. Check out `beta` branch and `git pull`
 1. Make sure any master commits that are conceptually `[{BUGFIX,DOC} {beta,release}]` are cherry-picked.
-1. `git push origin beta`, and `let travisBranch = kick off a travis build`
+1. `git push origin beta`, and `let ciBranch = kick off a CI build`
 1. `PRIOR_VERSION=v2.5.0-beta.1 ./bin/changelog.js | uniq | pbcopy`
 1. Open `CHANGELOG.md`, paste in the results of the previous script, and clean it up for human-readability.
     1. e.g. [BUGFIX beta] -> [BUGFIX], [DEPRECATE beta] -> [DEPRECATE], ...
@@ -27,14 +27,14 @@
     1. rm [DOC] (usually)
     1. rm other trivial things
 1. Backport CHANGELOG to master
-1. `await travisBranch`
-    1. if travis succeeds, process
-    1. if travis fails and it's a fix that doesn't need to be on master (e.g. linting or merge conflicts accidentally checked in), fix and retry.
+1. `await ciBranch`
+    1. if CI succeeds, process
+    1. if CI fails and it's a fix that doesn't need to be on master (e.g. linting or merge conflicts accidentally checked in), fix and retry.
     1. otherwise, start over
 1. Update `package.json` and `VERSION` file to use new version number
 1. git add/commit -m "Release v2.5.0-beta.2."
 1. `git tag v2.5.0-beta.2`
-1. `git push origin v2.5.0-beta.2`, and `let travisTag = kick off a travis build` (to produce the assets)
+1. `git push origin v2.5.0-beta.2`, and `let ciTag = kick off a CI build` (to produce the assets)
 1. `git push origin beta`
 1. `git checkout beta`
 1. `rm -rf dist && mkdir dist && cp ../components-ember/* dist/`
@@ -73,7 +73,7 @@ Starting point: [https://gist.github.com/rwjblue/fb945e55c70d698d4074](https://g
 
 ### Build Changelog
 
-1. Push `beta` branch to get Travis to run
+1. Push `beta` branch to get CI to run
 1. Run `PRIOR_VERSION=<tag> ./bin/changelog.js | uniq | pbcopy`
 1. Clean up commits in CHANGELOG
     1. e.g. [BUGFIX beta] -> [BUGFIX], [DEPRECATE beta] -> [DEPRECATE], ...
@@ -94,8 +94,8 @@ Starting point: [https://gist.github.com/rwjblue/fb945e55c70d698d4074](https://g
 
 ### Release
 
-1. `git push origin v2.4.0` to push JUST the tag. This lets us run the tag first on Travis CI, which does the correct deploy to S3, Bower, etc.
-1. THEN wait for Travis CI build to finish
+1. `git push origin v2.4.0` to push JUST the tag. This lets us run the tag first on CI, which does the correct deploy to S3, Bower, etc.
+1. THEN wait for CI build to finish
 1. Go to github and disable branch protection for the **release** branch
 1. Backup the current release branch: `git push origin release:release-version`
 1. To make this the current `release` branch: `git push -f origin beta:release`
@@ -132,9 +132,8 @@ end
     1. Any feature that has been GOed gets changed to true
 1. Run `ember s -prod`
 1. Run tests at `http://localhost:4200/tests/index.html`
-2. Run production tests `http://localhost:4200/tests/index.html?dist=prod&prod=true`
-3. In `.travis.yml`, remove `branches:` section e.g. [this commit](https://github.com/emberjs/ember.js/commit/e38ec5d910721a9e02a819b4105a4875723f4b1b).
-4. Now we have to look at the commit just prior to branching 2.4.0.beta-1. Then find the commit after that to start the new branch at.
+1. Run production tests `http://localhost:4200/tests/index.html?dist=prod&prod=true`
+1. Now we have to look at the commit just prior to branching 2.4.0.beta-1. Then find the commit after that to start the new branch at.
 
 ### Changelog
 
diff --git a/bin/build-for-publishing.js b/bin/build-for-publishing.js
index 3128997b06a..5f8ffc72a50 100755
--- a/bin/build-for-publishing.js
+++ b/bin/build-for-publishing.js
@@ -56,7 +56,7 @@ Promise.resolve()
   .then(() => {
     updatePackageJSONVersion();
     // ensures that we tag this correctly
-    return exec('auto-dist-tag', ['--write']);
+    return exec('node_modules/.bin/auto-dist-tag', ['--write']);
   })
   .then(() => {
     // do a production build
diff --git a/bin/publish_builds b/bin/publish_builds
deleted file mode 100755
index fdf49065016..00000000000
--- a/bin/publish_builds
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# ensure the first failure, stops the script
-set -e
-
-echo -e "CURRENT_BRANCH: ${TRAVIS_BRANCH}\n"
-echo -e "PULL_REQUEST: ${TRAVIS_PULL_REQUEST}\n"
-
-if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$PUBLISH" == "true" ]; then
-
-  node ./bin/build-for-publishing.js
-
-  node ./bin/publish_to_s3.js
-
-  #### NPM PUBLISHING
-  if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+ ]]; then
-    echo -e "CURRENT_TAG: ${TRAVIS_TAG}\n"
-    echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}"> ~/.npmrc
-
-    NPM_USER=$(npm whoami)
-    echo -e "Publishing to npm as $NPM_USER...\n"
-
-    # auto-dist-tag is ran by bin/build-for-publishing.js
-    # this ensures that the `publishConfig` object in the `package.json`
-    # indicates the correct tag to be published
-    npm publish
-  fi
-fi
diff --git a/bin/publish_to_s3.js b/bin/publish_to_s3.js
index 54db6c0681e..fa329fcd197 100755
--- a/bin/publish_to_s3.js
+++ b/bin/publish_to_s3.js
@@ -5,9 +5,6 @@ const buildInfo = require('../broccoli/build-info').buildInfo();
 // To invoke this from the commandline you need the following to env vars to exist:
 //
 // S3_BUCKET_NAME
-// TRAVIS_BRANCH
-// TRAVIS_TAG
-// TRAVIS_COMMIT
 // S3_SECRET_ACCESS_KEY
 // S3_ACCESS_KEY_ID
 //
@@ -21,7 +18,11 @@ if (!buildInfo.isBuildForTag) {
   const S3Publisher = require('ember-publisher');
   const configPath = require('path').join(__dirname, '../config/s3ProjectConfig.js');
 
-  let publisher = new S3Publisher({ projectConfigPath: configPath });
+  let publisher = new S3Publisher({
+    projectConfigPath: configPath,
+    TRAVIS_TAG: buildInfo.tag,
+    TRAVIS_COMMIT: buildInfo.sha,
+  });
 
   publisher.currentBranch = function() {
     return buildInfo.channel;
diff --git a/bin/run-browserstack-tests.js b/bin/run-browserstack-tests.js
index 8dd345a363f..f03a67bdd09 100755
--- a/bin/run-browserstack-tests.js
+++ b/bin/run-browserstack-tests.js
@@ -34,7 +34,7 @@ function run(command, args = []) {
       console.log('success');
       process.exit(0);
     } finally {
-      if (process.env.TRAVIS_JOB_NUMBER) {
+      if (process.env.GITHUB_RUN_ID) {
         await run('ember', ['browserstack:results']);
       }
       await run('ember', ['browserstack:disconnect']);
diff --git a/bin/run-tests.js b/bin/run-tests.js
index 4d5e6d284d3..8dffd016540 100755
--- a/bin/run-tests.js
+++ b/bin/run-tests.js
@@ -89,12 +89,6 @@ function generateStandardTests() {
   testFunctions.push(() => run('enableoptionalfeatures=true'));
 }
 
-function generateOldJQueryTests() {
-  testFunctions.push(() => run('jquery=1.10.2'));
-  testFunctions.push(() => run('jquery=1.12.4'));
-  testFunctions.push(() => run('jquery=2.2.4'));
-}
-
 function generateExtendPrototypeTests() {
   testFunctions.push(() => run('extendprototypes=true'));
   testFunctions.push(() => run('extendprototypes=true&enableoptionalfeatures=true'));
@@ -137,15 +131,13 @@ switch (process.env.TEST_SUITE) {
     generateEachPackageTests();
     runAndExit();
     break;
-  case 'old-jquery-and-extend-prototypes':
-    console.log('suite: old-jquery-and-extend-prototypes');
-    generateOldJQueryTests();
+  case 'extend-prototypes':
+    console.log('suite: extend-prototypes');
     generateExtendPrototypeTests();
     runAndExit();
     break;
   case 'all':
     console.log('suite: all');
-    generateOldJQueryTests();
     generateExtendPrototypeTests();
     generateEachPackageTests();
     runAndExit();
diff --git a/broccoli/build-info.js b/broccoli/build-info.js
index e611bb3f39c..98e77db0919 100644
--- a/broccoli/build-info.js
+++ b/broccoli/build-info.js
@@ -20,12 +20,7 @@ function buildInfo(options) {
   let root = (options && options.root) || path.resolve(__dirname, '..');
   let packageVersion = (options && options.packageVersion) || readPackageVersion(root);
   let gitInfo = (options && options.gitInfo) || buildGitInfo(root);
-  let buildInfo = buildFromParts(
-    packageVersion,
-    gitInfo,
-    process.env.TRAVIS,
-    process.env.TRAVIS_BRANCH
-  );
+  let buildInfo = buildFromParts(packageVersion, gitInfo);
   if (!options) {
     cached = buildInfo;
   }
@@ -75,47 +70,44 @@ function buildGitInfo(root) {
  * Build info object from parts.
  * @param {string} packageVersion
  * @param {GitInfo} gitInfo
- * @param {boolean} isCI
- * @param {string} travisBranch
  * @returns {BuildInfo}
  */
-function buildFromParts(packageVersion, gitInfo, isCI = false, travisBranch = '') {
+function buildFromParts(packageVersion, gitInfo) {
   let { tag, branch, sha } = gitInfo;
-
-  let tagVersion = parseTagVersion(tag);
   let shortSha = sha.slice(0, 8);
-  branch = travisBranch || branch; // Travis builds are always detached
-  let channel =
-    branch === 'master'
-      ? process.env.BUILD_TYPE === 'alpha'
-        ? 'alpha'
-        : 'canary'
-      : branch && escapeSemVerIdentifier(branch);
-
-  let isBuildForTag = isTagBuild(tag, branch, isCI);
-  let version = isBuildForTag ? tagVersion : buildVersion(packageVersion, shortSha, channel);
-
-  return {
-    tag,
-    branch,
-    sha,
-    shortSha,
-    channel,
-    packageVersion,
-    tagVersion,
-    version,
-    isBuildForTag,
-  };
-}
-
-function isTagBuild(tag, branch, isCI) {
-  if (!tag) {
-    return false;
+  if (tag) {
+    let tagVersion = parseTagVersion(tag);
+    return {
+      tag,
+      branch: null,
+      sha,
+      shortSha,
+      channel: 'tag',
+      packageVersion,
+      tagVersion,
+      version: tagVersion,
+      isBuildForTag: true,
+    };
+  } else {
+    let channel =
+      branch === 'master'
+        ? process.env.BUILD_TYPE === 'alpha'
+          ? 'alpha'
+          : 'canary'
+        : branch && escapeSemVerIdentifier(branch);
+    let version = buildVersion(packageVersion, shortSha, channel);
+    return {
+      tag: null,
+      branch,
+      sha,
+      shortSha,
+      channel,
+      packageVersion,
+      tagVersion: null,
+      version,
+      isBuildForTag: false,
+    };
   }
-  if (isCI) {
-    return branch === tag;
-  }
-  return true;
 }
 
 /**
@@ -133,11 +125,7 @@ function readPackageVersion(root) {
  * @param {string} tag
  */
 function parseTagVersion(tag) {
-  try {
-    return tag && semver.parse(tag).version;
-  } catch (e) {
-    return;
-  }
+  return tag && semver.parse(tag).version;
 }
 
 /**
@@ -182,4 +170,3 @@ module.exports.buildInfo = buildInfo;
 module.exports.buildFromParts = buildFromParts;
 module.exports.buildVersion = buildVersion;
 module.exports.parseTagVersion = parseTagVersion;
-module.exports.isTagBuild = isTagBuild;
diff --git a/package.json b/package.json
index 054a230ce58..3d4079274f0 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "dag-map": "^2.0.2",
     "ember-cli": "^3.12.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-browserstack": "^1.0.1",
+    "ember-cli-browserstack": "^1.1.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
diff --git a/testem.travis-browsers.js b/testem.ci-browsers.js
similarity index 100%
rename from testem.travis-browsers.js
rename to testem.ci-browsers.js
diff --git a/tests/node/build-info-test.js b/tests/node/build-info-test.js
index 166ef934544..500ae0c2eb7 100644
--- a/tests/node/build-info-test.js
+++ b/tests/node/build-info-test.js
@@ -1,11 +1,6 @@
 'use strict';
 
-const {
-  buildVersion,
-  parseTagVersion,
-  buildFromParts,
-  isTagBuild,
-} = require('../../broccoli/build-info');
+const { buildVersion, parseTagVersion, buildFromParts } = require('../../broccoli/build-info');
 
 QUnit.module('buildVersion', () => {
   flatMap(
@@ -53,15 +48,17 @@ QUnit.module('parseTagVersion', () => {
       tag: 'v3.1.1-beta.2',
       expected: '3.1.1-beta.2',
     },
-    {
-      tag: 'some-non-version-tag',
-      expected: undefined,
-    },
   ].forEach(({ tag, expected }) => {
     QUnit.test(JSON.stringify(tag), assert => {
       assert.equal(parseTagVersion(tag), expected);
     });
   });
+
+  QUnit.test('parseTagVersion raises on non-semver tags', assert => {
+    assert.throws(() => {
+      parseTagVersion('some-non-version-tag');
+    });
+  });
 });
 
 QUnit.module('buildFromParts', () => {
@@ -89,73 +86,46 @@ QUnit.module('buildFromParts', () => {
     },
     {
       args: [
-        '3.4.4', // Channel build on CI, tag
+        '3.4.4', // Channel build
         {
           sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
-          branch: '',
-          tag: 'v3.4.4-beta.2',
+          branch: 'beta',
+          tag: null,
         },
-        true,
-        'beta',
       ],
       expected: {
-        tag: 'v3.4.4-beta.2',
+        tag: null,
         branch: 'beta',
         sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
         shortSha: 'f572d396',
         channel: 'beta',
         packageVersion: '3.4.4',
-        tagVersion: '3.4.4-beta.2',
+        tagVersion: null,
         version: '3.4.4-beta+f572d396',
         isBuildForTag: false,
       },
     },
     {
       args: [
-        '3.4.4', // Tag build, CI
+        '3.4.4', // Tag build
         {
           sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
-          branch: '',
+          branch: null,
           tag: 'v3.4.4-beta.2',
         },
-        true,
-        'v3.4.4-beta.2',
       ],
       expected: {
         tag: 'v3.4.4-beta.2',
-        branch: 'v3.4.4-beta.2',
+        branch: null,
         sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
         shortSha: 'f572d396',
-        channel: 'v3-4-4-beta-2',
+        channel: 'tag',
         packageVersion: '3.4.4',
         tagVersion: '3.4.4-beta.2',
         version: '3.4.4-beta.2',
         isBuildForTag: true,
       },
     },
-    {
-      args: [
-        '3.4.4',
-        {
-          sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
-          branch: '',
-          tag: 'some weird tag',
-        },
-        true,
-        'a "funky" branch',
-      ],
-      expected: {
-        tag: 'some weird tag',
-        branch: 'a "funky" branch',
-        sha: 'f572d396fae9206628714fb2ce00f72e94f2258f',
-        shortSha: 'f572d396',
-        channel: 'a--funky--branch',
-        packageVersion: '3.4.4',
-        tagVersion: undefined,
-        version: '3.4.4-a--funky--branch+f572d396',
-        isBuildForTag: false,
-      },
-    },
   ].forEach(({ args, expected }) => {
     QUnit.test(JSON.stringify(args), assert => {
       assert.deepEqual(buildFromParts(...args), expected);
@@ -163,22 +133,6 @@ QUnit.module('buildFromParts', () => {
   });
 });
 
-QUnit.module('isTagBuild', () => {
-  QUnit.test('on CI', assert => {
-    assert.equal(isTagBuild('v3.4.4', 'v3.4.4', true), true);
-    assert.equal(isTagBuild('v3.4.4', 'release', true), false);
-    assert.equal(isTagBuild('v3.4.4-beta.4', 'random-branch', true), false);
-    assert.equal(isTagBuild(null, 'release', true), false);
-  });
-
-  QUnit.test('not on CI', assert => {
-    assert.equal(isTagBuild('v3.4.4', 'release', false), true);
-    assert.equal(isTagBuild('v3.4.4', null, false), true);
-    assert.equal(isTagBuild('v3.4.4-beta.4', 'random-branch', false), true);
-    assert.equal(isTagBuild(null, 'release', false), false);
-  });
-});
-
 /**
  * @typedef {Object} MatrixEntry
  * @property {any[]} args
diff --git a/yarn.lock b/yarn.lock
index bc5cd756630..454c3033c20 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3385,10 +3385,10 @@ ember-cli-broccoli-sane-watcher@^3.0.0:
     rsvp "^3.0.18"
     sane "^4.0.0"
 
-ember-cli-browserstack@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-browserstack/-/ember-cli-browserstack-1.0.1.tgz#ecca7bd72503b58f8185effb14215d703826b0c1"
-  integrity sha512-jujodiUQrt7NddYTeoYXesmQE6SzRP7mla2FYikR49DBCoTIVUOg2J9tfqQL5AroMxmeRIsDveVJPseDyrOyaw==
+ember-cli-browserstack@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-browserstack/-/ember-cli-browserstack-1.1.0.tgz#1d2bcf84370c196dc0c091ee65d54193072dadfc"
+  integrity sha512-nSYHa5YP0RjthfMBpasLJt4bnodV2AgKR4KZ4DaFrboiW+FVfqNZ8MRLBrTfaH3NqDWofcnCQTfqriByAcqbRA==
   dependencies:
     browserstack "^1.5.3"
     browserstack-local "^1.4.2"

From 0d25d3b7d910a35603654ab08d78ebe8ee041903 Mon Sep 17 00:00:00 2001
From: Arthi Ravi Shankar <aravishankar@linkedin.com>
Date: Fri, 17 Jul 2020 15:46:28 -0700
Subject: [PATCH 0037/1405] Parallelize inject-babel-helpers plugin

---
 lib/index.js                           |  5 ++-
 lib/transforms/inject-babel-helpers.js | 53 ++++++++++++++++----------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d1c637a7cce..5fc92120dbd 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -7,7 +7,7 @@ const resolve = require('resolve');
 const concatBundle = require('./concat-bundle');
 const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
-const injectBabelHelpers = require('./transforms/inject-babel-helpers');
+const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 
 const PRE_BUILT_TARGETS = [
@@ -138,6 +138,7 @@ module.exports = {
     // We want to enable async/generator helpers if we are developing locally,
     // but not for any other project.
     let isEmberSource = this.project.name() === 'ember-source';
+    let babelHelperPlugin =  injectBabelHelpers(isEmberSource);
 
     let options = {
       'ember-cli-babel': {
@@ -147,7 +148,7 @@ module.exports = {
       babel: Object.assign({}, babelOptions, {
         loose: true,
         plugins: [
-          injectBabelHelpers(isEmberSource),
+          babelHelperPlugin,
           buildDebugMacroPlugin(!isProduction),
           [
             require.resolve('@babel/plugin-transform-block-scoping'),
diff --git a/lib/transforms/inject-babel-helpers.js b/lib/transforms/inject-babel-helpers.js
index 18cc33ed212..c01efbf413d 100644
--- a/lib/transforms/inject-babel-helpers.js
+++ b/lib/transforms/inject-babel-helpers.js
@@ -3,29 +3,40 @@
 const { addNamed } = require('@babel/helper-module-imports');
 
 function injectBabelHelpers(isEmberSource = false) {
-  function injectBabelHelpersPlugin() {
-    return {
-      pre(file) {
-        file.set('helperGenerator', function(name) {
-          if (name === 'extends') {
-            return addNamed(file.path, 'assign', '@ember/polyfills');
-          } else if (isEmberSource && name === 'asyncToGenerator') {
-            // Returning a falsy value will cause the helper to be inlined,
-            // which is fine for local tests
-            return false;
-          }
-
-          return addNamed(file.path, name, 'ember-babel');
-        });
-      },
-    };
-  }
-
-  injectBabelHelpersPlugin.baseDir = function() {
+
+  let helperplugin = injectBabelHelpersPlugin;
+  helperplugin._parallelBabel = {
+    requireFile: __filename,
+    buildUsing: 'injectBabelHelpersPlugin',
+    params : { isEmberSource },
+ };
+
+  helperplugin.baseDir = function() {
     return 'babel-core';
   };
 
-  return injectBabelHelpersPlugin;
+  return helperplugin;
+}
+
+function injectBabelHelpersPlugin(isEmberSource) {
+  return {
+    pre(file) {
+      file.set('helperGenerator', function(name) {
+        if (name === 'extends') {
+          return addNamed(file.path, 'assign', '@ember/polyfills');
+        } else if (isEmberSource && name === 'asyncToGenerator') {
+          // Returning a falsy value will cause the helper to be inlined,
+          // which is fine for local tests
+          return false;
+        }
+
+        return addNamed(file.path, name, 'ember-babel');
+      });
+    },
+  };
 }
 
-module.exports = injectBabelHelpers;
+module.exports = {
+  injectBabelHelpers,
+  injectBabelHelpersPlugin
+};

From 104265a63c8dd4e9f28972223be7ddfbb914381f Mon Sep 17 00:00:00 2001
From: Arthi Ravi Shankar <aravishankar@linkedin.com>
Date: Fri, 17 Jul 2020 15:46:28 -0700
Subject: [PATCH 0038/1405] Parallelize inject-babel-helpers plugin

---
 lib/index.js                           |  5 +--
 lib/transforms/inject-babel-helpers.js | 50 +++++++++++++++-----------
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index d1c637a7cce..02051db7d9d 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -7,7 +7,7 @@ const resolve = require('resolve');
 const concatBundle = require('./concat-bundle');
 const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
-const injectBabelHelpers = require('./transforms/inject-babel-helpers');
+const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 
 const PRE_BUILT_TARGETS = [
@@ -138,6 +138,7 @@ module.exports = {
     // We want to enable async/generator helpers if we are developing locally,
     // but not for any other project.
     let isEmberSource = this.project.name() === 'ember-source';
+    let babelHelperPlugin = injectBabelHelpers(isEmberSource);
 
     let options = {
       'ember-cli-babel': {
@@ -147,7 +148,7 @@ module.exports = {
       babel: Object.assign({}, babelOptions, {
         loose: true,
         plugins: [
-          injectBabelHelpers(isEmberSource),
+          babelHelperPlugin,
           buildDebugMacroPlugin(!isProduction),
           [
             require.resolve('@babel/plugin-transform-block-scoping'),
diff --git a/lib/transforms/inject-babel-helpers.js b/lib/transforms/inject-babel-helpers.js
index 18cc33ed212..2cb4c90564e 100644
--- a/lib/transforms/inject-babel-helpers.js
+++ b/lib/transforms/inject-babel-helpers.js
@@ -3,29 +3,39 @@
 const { addNamed } = require('@babel/helper-module-imports');
 
 function injectBabelHelpers(isEmberSource = false) {
-  function injectBabelHelpersPlugin() {
-    return {
-      pre(file) {
-        file.set('helperGenerator', function(name) {
-          if (name === 'extends') {
-            return addNamed(file.path, 'assign', '@ember/polyfills');
-          } else if (isEmberSource && name === 'asyncToGenerator') {
-            // Returning a falsy value will cause the helper to be inlined,
-            // which is fine for local tests
-            return false;
-          }
-
-          return addNamed(file.path, name, 'ember-babel');
-        });
-      },
-    };
-  }
+  let helperplugin = injectBabelHelpersPlugin;
+  helperplugin._parallelBabel = {
+    requireFile: __filename,
+    buildUsing: 'injectBabelHelpersPlugin',
+    params: { isEmberSource },
+  };
 
-  injectBabelHelpersPlugin.baseDir = function() {
+  helperplugin.baseDir = function() {
     return 'babel-core';
   };
 
-  return injectBabelHelpersPlugin;
+  return helperplugin;
+}
+
+function injectBabelHelpersPlugin(isEmberSource) {
+  return {
+    pre(file) {
+      file.set('helperGenerator', function(name) {
+        if (name === 'extends') {
+          return addNamed(file.path, 'assign', '@ember/polyfills');
+        } else if (isEmberSource && name === 'asyncToGenerator') {
+          // Returning a falsy value will cause the helper to be inlined,
+          // which is fine for local tests
+          return false;
+        }
+
+        return addNamed(file.path, name, 'ember-babel');
+      });
+    },
+  };
 }
 
-module.exports = injectBabelHelpers;
+module.exports = {
+  injectBabelHelpers,
+  injectBabelHelpersPlugin,
+};

From eff98d676611a5e366f19ebce62fca5c7b10a4c2 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 20 Jul 2020 14:26:12 -0400
Subject: [PATCH 0039/1405] Add v3.20.1 to CHANGELOG [ci skip]

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49fb815cdac..54457de767a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
 
+### v3.20.1 (July 13, 2020)
+
+- [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`
+
 ### v3.20.0 (July 13, 2020)
 
 - [#18867](https://github.com/emberjs/ember.js/pull/18867) / [#18927](https://github.com/emberjs/ember.js/pull/18927) / [#18928](https://github.com/emberjs/ember.js/pull/18928) [FEATURE] [Promote `{{in-element}}` to public API](https://github.com/emberjs/rfcs/blob/master/text/0287-promote-in-element-to-public-api.md) RFC.

From a43f203010669f22fca0277a9edf0231a3e94079 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 20 Jul 2020 14:30:46 -0400
Subject: [PATCH 0040/1405] Add v3.21.0-beta.2 to CHANGELOG [ci skip]

(cherry picked from commit 1be10910593f135cdefb2b8ecfbb932dba061c1e)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54457de767a..a61d30ed78a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.21.0-beta.2 (July 20, 2020)
+
+- [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`
+- [#19047](https://github.com/emberjs/ember.js/pull/19047) [BUGFIX] Ensure `inject-babel-helpers` plugin can be parallelized
+
 ### v3.21.0-beta.1 (July 13, 2020)
 
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).

From 17ddeee07df018752423fc8ea54263b03c098318 Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Mon, 20 Jul 2020 18:02:28 -0400
Subject: [PATCH 0041/1405] [BUGFIX lts] Update router.js to ensure
 transition.abort works for query param only transitions

---
 package.json |  2 +-
 yarn.lock    | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 054a230ce58..478abb42e94 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^6.2.5",
+    "router_js": "^6.2.6",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index bc5cd756630..784f4932d83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1144,11 +1144,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
   integrity sha512-HOtU5KqROKT7qX/itKHuTtt5fV0iXbheQvrgbLNXFJQBY/eh+VS5vmmTAVlo3qIGMsypm0G4N1t2AXjy1ZicaQ==
 
-"@types/node@^10.5.5":
-  version "10.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
-  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
-
 "@types/node@^9.6.0":
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
@@ -7983,12 +7978,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-router_js@^6.2.5:
-  version "6.2.5"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-6.2.5.tgz#b23b70d50548423744e4b1ad236055fcfe8ad3f4"
-  integrity sha512-mvDbwtF/B9bUyawg42aKRWed92lPRQe15bMEu09f2KJfqJYiyjg9mG2Bwof1t0XqJ2z1QeiYgDwFdFL7pyzyZw==
-  dependencies:
-    "@types/node" "^10.5.5"
+router_js@^6.2.6:
+  version "6.2.6"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-6.2.6.tgz#148288fbfa87cb726b8a2f138b07f1fb549ebcb7"
+  integrity sha1-FIKI+/qHy3Jrii8Tiwfx+1SevLc=
 
 rsvp@3.0.14:
   version "3.0.14"

From 5cbf51e8e6b24c43c6d1e54ff6e2ce2fc3684078 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Mon, 20 Jul 2020 20:26:55 -0700
Subject: [PATCH 0042/1405] Bump router_js to v7.0.0

---
 package.json                                            | 2 +-
 packages/@ember/-internals/routing/lib/system/route.ts  | 9 ++++++++-
 packages/@ember/-internals/routing/lib/system/router.ts | 6 +++++-
 yarn.lock                                               | 8 ++++----
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 478abb42e94..96e1fb56b85 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^6.2.6",
+    "router_js": "^7.0.0",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 75b586f0a9e..3cebc41ebda 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -98,7 +98,14 @@ class Route extends EmberObject implements IRoute {
   _internalName!: string;
   _names: unknown;
 
-  serialize!: (model: {}, params: string[]) => object | undefined;
+  serialize!: (
+    model: {},
+    params: string[]
+  ) =>
+    | {
+        [key: string]: unknown;
+      }
+    | undefined;
 
   _router!: EmberRouter;
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index db18367809b..55ebc2588ad 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1438,7 +1438,11 @@ function calculatePostTransitionState(
 
     // If the routeInfo is not resolved, we serialize the context into params
     if (!routeInfo.isResolved) {
-      params[routeInfo.name] = routeInfo.serialize(routeInfo.context);
+      params[routeInfo.name] = routeInfo.serialize(routeInfo.context as
+        | {
+            [key: string]: unknown;
+          }
+        | undefined);
     } else {
       params[routeInfo.name] = routeInfo.params;
     }
diff --git a/yarn.lock b/yarn.lock
index 784f4932d83..02dbd01b3a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7978,10 +7978,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-router_js@^6.2.6:
-  version "6.2.6"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-6.2.6.tgz#148288fbfa87cb726b8a2f138b07f1fb549ebcb7"
-  integrity sha1-FIKI+/qHy3Jrii8Tiwfx+1SevLc=
+router_js@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.0.0.tgz#92eb56141ee2cb59e04271e5f2d685cdfa836c37"
+  integrity sha512-pJ+W6SyPmMkZ/qawWyaDaAue1bXOx4FOuMMpxvYW/1r6Hifpp06+jURFbR8ryZszYopPYKS5OUQnv1izd3iPKA==
 
 rsvp@3.0.14:
   version "3.0.14"

From 35f2b1e02cb29792e7c0268be0623d6e7f090040 Mon Sep 17 00:00:00 2001
From: Akanksha Dharkar <akankshadharkar@gmail.com>
Date: Wed, 22 Jul 2020 17:34:18 +0530
Subject: [PATCH 0043/1405] Minor fix for Tom Dale's missplelled name in code
 examples documentation

---
 packages/@ember/-internals/glimmer/lib/helpers/array.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index f076c374ecb..2b43f0294b0 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -11,7 +11,7 @@ import { PathReference } from '@glimmer/reference';
 
    ```handlebars
    <MyComponent @people={{array
-     'Tom Dade'
+     'Tom Dale'
      'Yehuda Katz'
      this.myOtherPerson}}
    />
@@ -19,7 +19,7 @@ import { PathReference } from '@glimmer/reference';
     or
    ```handlebars
    {{my-component people=(array
-     'Tom Dade'
+     'Tom Dale'
      'Yehuda Katz'
      this.myOtherPerson)
    }}
@@ -28,7 +28,7 @@ import { PathReference } from '@glimmer/reference';
    Would result in an object such as:
 
    ```js
-   ['Tom Date', 'Yehuda Katz', this.get('myOtherPerson')]
+   ['Tom Dale', 'Yehuda Katz', this.get('myOtherPerson')]
    ```
 
    Where the 3rd item in the array is bound to updates of the `myOtherPerson` property.

From 563c8111629e3ac83a0a70716eee4a62b41da063 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Sat, 25 Jul 2020 15:25:04 -0400
Subject: [PATCH 0044/1405] Update CONTRIBUTING.md

Co-authored-by: Isaac Lee <16869656+ijlee2@users.noreply.github.com>
---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index efa15e7100f..f3dc7d00eb9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -252,7 +252,7 @@ NOTE: Partially copied from https://raw.github.com/thoughtbot/factory_girl_rails
 
 # CI (Github Actions) Tests
 
-We use [GitHub Actions](https://github.com/ember.js/ember.js/actions?query=workflow%3ABuild+event%3Apull_request) to test each PR before it is merged.
+We use [GitHub Actions](https://github.com/emberjs/ember.js/actions?query=workflow%3ABuild+event%3Apull_request) to test each PR before it is merged.
 
 When you submit your PR (or later change that code), a CI build will automatically be kicked off.  A note will be added to the PR, and will indicate the current status of the build.
 

From 6532c0da0a2e323f1e0f021e2dd37b40007a344a Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Sat, 25 Jul 2020 19:04:23 -0400
Subject: [PATCH 0045/1405] Fix keyName binding issue

---
 .../@ember/-internals/glimmer/lib/component-managers/curly.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index a79357c7a1a..1d5859fcac5 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -323,9 +323,7 @@ export default class CurlyComponentManager
           addObserver(
             component,
             keyName,
-            () => {
-              component[PROPERTY_DID_CHANGE](keyName);
-            },
+            component[PROPERTY_DID_CHANGE].bind(component, keyName),
             undefined,
             true
           );

From bdc02d999c96306981e7331ac9ff0d1e2ca086e0 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Sat, 25 Jul 2020 22:11:26 -0400
Subject: [PATCH 0046/1405] Update .github/workflows/cron.yml

Co-authored-by: Godfrey Chan <godfreykfc@gmail.com>
---
 .github/workflows/cron.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index e4603797d04..9386d198ec6 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -52,5 +52,5 @@ jobs:
 
       - name: Cleanup
         # Always cleanup the cron-* branches
-        if: ${{ success() }} || ${{ failure() }}
+        if: always()
         run: git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN}}@github.com/${GITHUB_REPOSITORY} --delete cron-${{matrix.branch}}-${{env.SHA}} || true # Don't fail build if cleanup fails

From 54f87f6dd0d195e575b7efeeb54de0d82b2c5c47 Mon Sep 17 00:00:00 2001
From: bekzod <bekzod@me.com>
Date: Sun, 26 Jul 2020 17:44:16 +0500
Subject: [PATCH 0047/1405] remove `_viewRegistry` inject to view

---
 packages/@ember/application/tests/application_test.js      | 1 -
 packages/@ember/engine/index.js                            | 1 -
 packages/@ember/engine/tests/engine_test.js                | 1 -
 packages/internal-test-helpers/lib/test-cases/rendering.js | 1 -
 4 files changed, 4 deletions(-)

diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 321febb4909..f10e7cec725 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -129,7 +129,6 @@ moduleFor(
 
       verifyRegistration(assert, application, 'controller:basic');
       verifyRegistration(assert, application, '-view-registry:main');
-      verifyInjection(assert, application, 'view', '_viewRegistry', '-view-registry:main');
       verifyInjection(assert, application, 'route', '_topLevelViewTemplate', 'template:-outlet');
       verifyRegistration(assert, application, 'route:basic');
       verifyRegistration(assert, application, 'event_dispatcher:main');
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index cc67b527c4b..7bd6caeec5c 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -495,7 +495,6 @@ function commonSetupRegistry(registry) {
 
   registry.register('controller:basic', Controller, { instantiate: false });
 
-  registry.injection('view', '_viewRegistry', '-view-registry:main');
   registry.injection('renderer', '_viewRegistry', '-view-registry:main');
 
   registry.injection('route', '_topLevelViewTemplate', 'template:-outlet');
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index e3fb1e7cc04..4dd6b754f1f 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -62,7 +62,6 @@ moduleFor(
         `optionsForType 'view'`
       );
       verifyRegistration(assert, engine, 'controller:basic');
-      verifyInjection(assert, engine, 'view', '_viewRegistry', '-view-registry:main');
       verifyInjection(assert, engine, 'renderer', '_viewRegistry', '-view-registry:main');
       verifyInjection(assert, engine, 'route', '_topLevelViewTemplate', 'template:-outlet');
       verifyInjection(assert, engine, 'view:-outlet', 'namespace', 'application:main');
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.js
index 405bfa028ca..ab152b5e70c 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.js
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.js
@@ -25,7 +25,6 @@ export default class RenderingTestCase extends AbstractTestCase {
     owner.register('event_dispatcher:main', EventDispatcher);
 
     // TODO: why didn't buildOwner do this for us?
-    owner.inject('view', '_viewRegistry', '-view-registry:main');
     owner.inject('renderer', '_viewRegistry', '-view-registry:main');
 
     this.renderer = this.owner.lookup('renderer:-dom');

From cc892c0160c2dd21fd31235476ac45cc84f14ec4 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 26 Jul 2020 18:07:26 -0400
Subject: [PATCH 0048/1405] [BUGFIX release] Update glimmer-vm to 0.54.2.

Fixes issues with the (still private) `assertDestroyablesDestroyed`
API that was introduced with the Destroyables RFC.

See https://github.com/glimmerjs/glimmer-vm/pull/1119 for details.
---
 package.json |  16 ++---
 yarn.lock    | 196 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index 96e1fb56b85..bdcac6e87a2 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.54.1",
+    "@glimmer/compiler": "^0.54.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.54.1",
-    "@glimmer/node": "^0.54.1",
-    "@glimmer/opcode-compiler": "^0.54.1",
-    "@glimmer/program": "^0.54.1",
-    "@glimmer/reference": "^0.54.1",
-    "@glimmer/runtime": "^0.54.1",
-    "@glimmer/validator": "^0.54.1",
+    "@glimmer/interfaces": "^0.54.2",
+    "@glimmer/node": "^0.54.2",
+    "@glimmer/opcode-compiler": "^0.54.2",
+    "@glimmer/program": "^0.54.2",
+    "@glimmer/reference": "^0.54.2",
+    "@glimmer/runtime": "^0.54.2",
+    "@glimmer/validator": "^0.54.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 02dbd01b3a4..1f8b045d0e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.54.1.tgz#92d1aa56918252df5ea159bf245c8179d65ca5f5"
-  integrity sha512-7lxTajz9yCJrgzHGd9FRdPEXqya3VFtur+tMWTbu/KumbjWXcOIfsFJytVduFUACTnV6+xK7WKTQBiG0+YJjJA==
-  dependencies:
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/syntax" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
-    "@glimmer/wire-format" "^0.54.1"
+"@glimmer/compiler@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.54.2.tgz#e81b7302ebac707dfd5b6af438c4da1e7571ccc0"
+  integrity sha512-1e4vYznBYz7OmEpW7ZhO2D3xYy2W1sOXMeJFEQ+yGagQp9M4FdEERJSMYpcslJ0TFYWxY5xrg8F2et+fZpSadQ==
+  dependencies:
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/syntax" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
+    "@glimmer/wire-format" "^0.54.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.54.1.tgz#73d328b0a54af698d89b7882b27832f1e5e75f06"
-  integrity sha512-pZZgb48jOY9cM9GzeDu42g61hW+oqORHjF40DuY2LpPEciUNV2pe306R4HXD4SrSlRBVnlKE8cspWaqsIWvNiQ==
+"@glimmer/encoder@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.54.2.tgz#bcae3d066f4408335b629841190cb53fe424a668"
+  integrity sha512-HBiEAA4/PJFJvI/7TsObv0UwfoI/nrhvdMpgng9uW6O7ztucq7mdKvaVYvCOsgGo7X2X+3pjL3kKtRlihRinUw==
   dependencies:
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/vm" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/vm" "^0.54.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.54.1.tgz#b8d2cfc59ed5dd5eefd8dd109657b580a34ef377"
-  integrity sha512-G8PdpZH2lugcsxt2N/R/WNKGCOXukCDKMCukda4a3DnYEXQLccTyhNVtJFWKHh1C6pxYLXD5sNA0b90GJUrCww==
+"@glimmer/interfaces@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.54.2.tgz#d7735869050ca7e1731424aa64ae37b1cb853091"
+  integrity sha512-Gqvr6Eh4Xy7lF14GZi6RbnVeA7gDj2pXMJtdh68TFL2u/VqfhTXy4+IFRvUh4bpJj+1YayNFupuJSn0oVrEDGQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.54.1.tgz#5989aeebfa5ed80136c3e72ccf8aa59997cdf6be"
-  integrity sha512-XmgzEYvgkMmwC53CdVM9bJ3SdNyNggXIerQsjlF4KSXgVowxbaL8atpLFzPu6h18la4apAmsvYMb81u25xbryQ==
+"@glimmer/low-level@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.54.2.tgz#ba6c49e64b1edc17229930785eb900ca294f9247"
+  integrity sha512-zvqOvkN1FzaQWy2n9CNqTWj7ziyVvAL82CE6wT9Wumw0R6JiS4UnL+EymWLltvRxdO9k7tfVH1sIacx2+H1WEQ==
 
-"@glimmer/node@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.54.1.tgz#40e7408530f5e5f1e153868af2dcfa33832a9181"
-  integrity sha512-6YaDE0J23dQj/X20pblSFzdQie85n5rIKsRp4fMrUZRIR6OSW0FVMp6hTKp73jP4oe8DciQ4EVcW0sg5xeVlpA==
+"@glimmer/node@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.54.2.tgz#ac3ecd45cd2738e7b0e1a2232950e73926efbcf7"
+  integrity sha512-TG6z/L/cDYgN6VOkoJKhXlTvq6sNTdARzEBCryp2jbIU3o7SGx5OZjcCjsH+vELEntWrh/b7RXFo9areaKUSWg==
   dependencies:
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/runtime" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/runtime" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.54.1.tgz#8cfd833b9ce9d0958d073f5b93a47fe390745c61"
-  integrity sha512-H8MaTAzoyekoBWUU9MQJmUPSpsuRA1BgHjhvXxTHb4CWH7wkbckBGe3hDIQx5XlofqRWEYBdjuDfC5pZ4GGKZw==
-  dependencies:
-    "@glimmer/encoder" "^0.54.1"
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/program" "^0.54.1"
-    "@glimmer/reference" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
-    "@glimmer/vm" "^0.54.1"
-    "@glimmer/wire-format" "^0.54.1"
-
-"@glimmer/program@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.54.1.tgz#a219196e2255f0a229ade4babd674d2ff88b07ed"
-  integrity sha512-8ozfp7+XnsZsyT2dHi2OLY8l8IGS4pMVc6TMSWkVllLifPjPscDdgdZknTAEOMiBuPzZriT5VTXF00+3Q6+QEQ==
-  dependencies:
-    "@glimmer/encoder" "^0.54.1"
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
-
-"@glimmer/reference@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.54.1.tgz#12561612d117cd877cdf56f77c2bae4eefa37ad1"
-  integrity sha512-sSDnh5/fhGHRcXkgVvWPnTRszzYVfcrrCh5pYkNADM+A1ivVJQzhAfZyV5+WSbPN5eXeh5Z7tXRpSiMH3NwH4g==
+"@glimmer/opcode-compiler@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.54.2.tgz#55cab6ebcb8134b4bbcacbdeedbb10b2b55f597f"
+  integrity sha512-yHdhAUeNJqqH6I91kbi07/K7sk7nfGl6Bp9zA5oVYe+PnFTWsMAtySQT51QFie7vXgPNiHq+M1YWOtqBSGKm6A==
+  dependencies:
+    "@glimmer/encoder" "^0.54.2"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/program" "^0.54.2"
+    "@glimmer/reference" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
+    "@glimmer/vm" "^0.54.2"
+    "@glimmer/wire-format" "^0.54.2"
+
+"@glimmer/program@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.54.2.tgz#2ce978a3bdd853804d2d03021f9a7616fb2f9607"
+  integrity sha512-CQIwVMtE3Hh6W8NkombU1sh8CUgZUCESrhQx42eK58Rf8fEOQOxGdFbrz2TzXM2jNCE3buh1vwSVC0oKAdsQLg==
+  dependencies:
+    "@glimmer/encoder" "^0.54.2"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
+
+"@glimmer/reference@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.54.2.tgz#996509e483f7299f5191260ab622db5816485a3a"
+  integrity sha512-upBx3AMJVf3BkGN0UtgVVapcdjR7g/UF/GkQWcrzIOGchDFnFhY443Ys1oLtMNBA02RhtUr+U8KzUSsFV3sfsw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
-    "@glimmer/validator" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
+    "@glimmer/validator" "^0.54.2"
 
-"@glimmer/runtime@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.54.1.tgz#ed868ba80d6edf91a53da0652f306bcc50dd5276"
-  integrity sha512-YCsngOiaH8EFXxuyVONK9Sz5CYvwHs4lcNbHoTdFP7bpVWgXg9mHLdqryOSoP9Ei9FF7Z5NWTO/KCo8UGeR4Lg==
+"@glimmer/runtime@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.54.2.tgz#149fe6a29f279785d6fbac6ec933036088f7a5e7"
+  integrity sha512-SwumHB0uw4/L6sgXmMTc4cf3GwYe8siFk7Qi2hVVTSZdZGrfIOP5ZB94x0HEWWeSUgy/4ar9TcsKvfj5LyLBvA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/low-level" "^0.54.1"
-    "@glimmer/program" "^0.54.1"
-    "@glimmer/reference" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
-    "@glimmer/validator" "^0.54.1"
-    "@glimmer/vm" "^0.54.1"
-    "@glimmer/wire-format" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/low-level" "^0.54.2"
+    "@glimmer/program" "^0.54.2"
+    "@glimmer/reference" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
+    "@glimmer/validator" "^0.54.2"
+    "@glimmer/vm" "^0.54.2"
+    "@glimmer/wire-format" "^0.54.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.54.1.tgz#e3a1e1bfa72719ea2357a7f147ff595d0790a95f"
-  integrity sha512-bNRSXVOKBaZyE+kPjFy5BkoUK0VnVkQ3ph//YSwnVY4xM9AF9E5nKVgDBPxQlioCK3ODBWzhMdfTHZ/RHkLS3Q==
+"@glimmer/syntax@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.54.2.tgz#60d08458002c106791d4c5b648227ec0f29a1b2a"
+  integrity sha512-EpQGbbzfvBmeztc15SsriyAgD0aKgsxMOARVtW5buvCPw3dGYYNdSeyUJ3vInbrFGxkZLV390ht8VCbsDbqtlA==
   dependencies:
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.54.1.tgz#9995b08dc7fd0cc8fb5c3522574d680ccc8f5511"
-  integrity sha512-WrpTueecsmzVALrG7U0LBLDWtsGvj3eRZ/z72BKi4+usK2DYt+346LS+VCgozC8XdCIS9BawI37qogIXCyZrjw==
+"@glimmer/util@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.54.2.tgz#211b027982006b6bcd393312cf474c7ee17922a0"
+  integrity sha512-ggJY3qayAxjiMuoToxxtwai+AI2KXrJSbOEvbvBV9K+IMykmdjhWGRWWEONnd9xJzQDlus5D9ROMypOEvsbS9w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.54.1.tgz#955406fcd86a48aa8b635bf49dec82a5f6138a33"
-  integrity sha512-EFd/jQwqqlTi5fdN5+KEt051GjgDiC42Sa8LJxFJnDb6lxsEm0cpgxWMPPASgLEEgQK3OWVJz5sxZKJfMNP/aQ==
+"@glimmer/validator@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.54.2.tgz#9681ff89d9874a5b075c73bfc828ffc15b23c7df"
+  integrity sha512-D/BJo06+dSmjJuLchYK79Gj1kPHZ3K6qz5bOJn3FtOwftFa1XqW+1zbBYs4tqwbe3dHoRll4+t/X0Q4AXZpt7Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.54.1.tgz#b4fe9992febfbd72f9bb85843e02307b55e643b0"
-  integrity sha512-zZRc9z/0NPJhu0uG4ZmHw+VYL2AcQAgwfTYNAW6+7+CvP2Jxd04Anvz4HuaqO4NhntjbmUN0jolz+xmPOts4jg==
+"@glimmer/vm@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.54.2.tgz#9a7e9c5839be0cd5d7b1495d06f369754686a750"
+  integrity sha512-LdvD8kqUT5VewGC52uhdGuJZlX/Mwm6/8sf/pRvI/4Cz0bZL+PMQQsX8IPdwGvftSu3wRIt33JWdrL+9tjPgAA==
   dependencies:
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
 
-"@glimmer/wire-format@^0.54.1":
-  version "0.54.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.54.1.tgz#59804ce334a6d265de1f2e04c97862087ac897be"
-  integrity sha512-XrN5TOi//MGd3/wbeTVex2lJodCxT9r1ySLXsSIfsZ9y8cb+IqNgVwqYpfvBdafzRLdiI1OnatTjSdnILGvVzw==
+"@glimmer/wire-format@^0.54.2":
+  version "0.54.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.54.2.tgz#aef5f618cbacd212359022df94393987d9e4a876"
+  integrity sha512-lmp9zW9Uo7CuNqpXJk2hxF7zLOkbr9fOjQKbSc3b+YletT0LhfNFRAs0R2WhQMlyw2UrNzc81+C0zt4wUdypkQ==
   dependencies:
-    "@glimmer/interfaces" "^0.54.1"
-    "@glimmer/util" "^0.54.1"
+    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/util" "^0.54.2"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From ef9f971fe94de3f5823b51060d0e16fceb4a236c Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 26 Jul 2020 18:48:47 -0400
Subject: [PATCH 0049/1405] Update CHANGELOG.md for 3.20.2.

[ci skip]
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a61d30ed78a..51a52199ae7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.20.2 (July 26, 2020)
+
+- [#19056](https://github.com/emberjs/ember.js/pull/19056) Update Glimmer rendering engine to 0.54.2. Fixes an issue with (private for now) destroyables work to enable the destroyables polyfill to work more appropriately.
+
 ### v3.21.0-beta.2 (July 20, 2020)
 
 - [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`

From 1b8e122635607afe8f967a00f9a33c52ab1f3472 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 27 Jul 2020 17:54:38 -0400
Subject: [PATCH 0050/1405] Add v3.21.0-beta.3 to CHANGELOG [ci skip]

(cherry picked from commit 9d50c45961f30b2efe26074e9e0ae11c3c6f82c7)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51a52199ae7..096c0102a7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.21.0-beta.3 (July 27, 2020)
+
+- [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update router.js to ensure transition.abort works for query param only transitions.
+- [#19056](https://github.com/emberjs/ember.js/pull/19056) [BUGFIX] Update glimmer-vm to 0.54.2.
+
 ### v3.20.2 (July 26, 2020)
 
 - [#19056](https://github.com/emberjs/ember.js/pull/19056) Update Glimmer rendering engine to 0.54.2. Fixes an issue with (private for now) destroyables work to enable the destroyables polyfill to work more appropriately.

From 46b7aad9276f389982418b4a3dde527bb7b6608c Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 29 Jul 2020 09:45:26 -0400
Subject: [PATCH 0051/1405] [BUGFIX lts] Prevent `<base target="_parent">` from
 erroring in HistoryLocation

It is perfectly valid to have a `<base>` element without an `href`
attribute but the code previously assumed that if a `<base>` was present
that it **must** contain an `href`.

Specifically, prior to this change if you had a `<base>` like:

```html
<base target="_parent">
```

You would get the following error:

```
Uncaught TypeError: Cannot read property 'replace' of null
```

See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base for
more details on usage of `<base>` without an `href`.
---
 .../routing/lib/location/history_location.ts  |  2 +-
 .../tests/location/history_location_test.js   | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index 9fd5206766d..a368f13b1b7 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -77,7 +77,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
 
     let base = document.querySelector('base');
     let baseURL: string | null = '';
-    if (base) {
+    if (base !== null && base.hasAttribute('href')) {
       baseURL = base.getAttribute('href');
     }
 
diff --git a/packages/@ember/-internals/routing/tests/location/history_location_test.js b/packages/@ember/-internals/routing/tests/location/history_location_test.js
index 988e4b3660f..6efad8dd768 100644
--- a/packages/@ember/-internals/routing/tests/location/history_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/history_location_test.js
@@ -97,6 +97,42 @@ moduleFor(
       location.initState();
     }
 
+    ['@test <base> with href sets `baseURL`'](assert) {
+      assert.expect(1);
+
+      let base = document.createElement('base');
+      base.setAttribute('href', '/foo/');
+
+      document.head.appendChild(base);
+
+      try {
+        createLocation();
+        location.initState();
+
+        assert.strictEqual(location.get('baseURL'), '/foo/');
+      } finally {
+        document.head.removeChild(base);
+      }
+    }
+
+    ['@test <base> without href is ignored'](assert) {
+      assert.expect(1);
+
+      let base = document.createElement('base');
+      base.setAttribute('target', '_parent');
+
+      document.head.appendChild(base);
+
+      try {
+        createLocation();
+        location.initState();
+
+        assert.strictEqual(location.get('baseURL'), '');
+      } finally {
+        document.head.removeChild(base);
+      }
+    }
+
     ['@test base URL is removed when retrieving the current pathname'](assert) {
       assert.expect(1);
 

From 6f143b6cd307148668c26be2c773f1b9552744bf Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 29 Jul 2020 10:10:57 -0400
Subject: [PATCH 0052/1405] [BUGFIX release] Update to glimmer-vm 0.55.1

The primary change here is a refactor of the iteration protocols.
---
 package.json |  16 ++---
 yarn.lock    | 196 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index bdcac6e87a2..8d2a767e84c 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.54.2",
+    "@glimmer/compiler": "^0.55.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.54.2",
-    "@glimmer/node": "^0.54.2",
-    "@glimmer/opcode-compiler": "^0.54.2",
-    "@glimmer/program": "^0.54.2",
-    "@glimmer/reference": "^0.54.2",
-    "@glimmer/runtime": "^0.54.2",
-    "@glimmer/validator": "^0.54.2",
+    "@glimmer/interfaces": "^0.55.1",
+    "@glimmer/node": "^0.55.1",
+    "@glimmer/opcode-compiler": "^0.55.1",
+    "@glimmer/program": "^0.55.1",
+    "@glimmer/reference": "^0.55.1",
+    "@glimmer/runtime": "^0.55.1",
+    "@glimmer/validator": "^0.55.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 1f8b045d0e4..792531ec789 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.54.2.tgz#e81b7302ebac707dfd5b6af438c4da1e7571ccc0"
-  integrity sha512-1e4vYznBYz7OmEpW7ZhO2D3xYy2W1sOXMeJFEQ+yGagQp9M4FdEERJSMYpcslJ0TFYWxY5xrg8F2et+fZpSadQ==
-  dependencies:
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/syntax" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
-    "@glimmer/wire-format" "^0.54.2"
+"@glimmer/compiler@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.55.1.tgz#c85fcbf00125c7c0fb74cd179a9e30c42dddccee"
+  integrity sha512-t4jFag9i1/jo9JId2VMPuFOIY0E8MlRmyMnfh9mipC9iZXZsC8d0PCia6/FvZRvUJvNRA+brMwck6IHfiW2Nmw==
+  dependencies:
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/syntax" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
+    "@glimmer/wire-format" "^0.55.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.54.2.tgz#bcae3d066f4408335b629841190cb53fe424a668"
-  integrity sha512-HBiEAA4/PJFJvI/7TsObv0UwfoI/nrhvdMpgng9uW6O7ztucq7mdKvaVYvCOsgGo7X2X+3pjL3kKtRlihRinUw==
+"@glimmer/encoder@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.55.1.tgz#1356c123e61d43fed9b3a36a189cd1776974dae2"
+  integrity sha512-Q3WueSDKYxCnQlk/0Sp1rpyMckh553zwA3yQ9PE25pEnt9LVnfn3TWGKb4XOAjiaGt0hyDLfFI7Ftt+4rbsCOA==
   dependencies:
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/vm" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/vm" "^0.55.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.54.2.tgz#d7735869050ca7e1731424aa64ae37b1cb853091"
-  integrity sha512-Gqvr6Eh4Xy7lF14GZi6RbnVeA7gDj2pXMJtdh68TFL2u/VqfhTXy4+IFRvUh4bpJj+1YayNFupuJSn0oVrEDGQ==
+"@glimmer/interfaces@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.55.1.tgz#be9499d83a63514b2470f19e5430b06c7edb2076"
+  integrity sha512-rbmL/xT9mHWX2jioYLT0V/H0QS8qaIJ1HCOlkbX5zvAASNu8+kwTXy8Bq4hx1OW3qwul6ihfHq/6k2oLxJ90JQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.54.2.tgz#ba6c49e64b1edc17229930785eb900ca294f9247"
-  integrity sha512-zvqOvkN1FzaQWy2n9CNqTWj7ziyVvAL82CE6wT9Wumw0R6JiS4UnL+EymWLltvRxdO9k7tfVH1sIacx2+H1WEQ==
+"@glimmer/low-level@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.55.1.tgz#f3ab819637cfb0a38c04bd675b28ebb3f4bd238d"
+  integrity sha512-wK0Lkb7P3ajOcMbzCrDokC13GAtvyABrF+KYkNlNMzrCBSZ0q9BsFXRhSHhO4UIZm4jQmbaQVOy5SYdoB4Bu2A==
 
-"@glimmer/node@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.54.2.tgz#ac3ecd45cd2738e7b0e1a2232950e73926efbcf7"
-  integrity sha512-TG6z/L/cDYgN6VOkoJKhXlTvq6sNTdARzEBCryp2jbIU3o7SGx5OZjcCjsH+vELEntWrh/b7RXFo9areaKUSWg==
+"@glimmer/node@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.55.1.tgz#0d6fd43b6f4cbd0a0b47c0482cfd047f31bff5b7"
+  integrity sha512-PgAkx8tSJc4xWyVS4qCSNo13KNRklUZDShQmhoFOv9nvCZdWLcUv1SZJshGQlmwQNxY6YCHjRlnRJN17VBcZBQ==
   dependencies:
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/runtime" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/runtime" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.54.2.tgz#55cab6ebcb8134b4bbcacbdeedbb10b2b55f597f"
-  integrity sha512-yHdhAUeNJqqH6I91kbi07/K7sk7nfGl6Bp9zA5oVYe+PnFTWsMAtySQT51QFie7vXgPNiHq+M1YWOtqBSGKm6A==
-  dependencies:
-    "@glimmer/encoder" "^0.54.2"
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/program" "^0.54.2"
-    "@glimmer/reference" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
-    "@glimmer/vm" "^0.54.2"
-    "@glimmer/wire-format" "^0.54.2"
-
-"@glimmer/program@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.54.2.tgz#2ce978a3bdd853804d2d03021f9a7616fb2f9607"
-  integrity sha512-CQIwVMtE3Hh6W8NkombU1sh8CUgZUCESrhQx42eK58Rf8fEOQOxGdFbrz2TzXM2jNCE3buh1vwSVC0oKAdsQLg==
-  dependencies:
-    "@glimmer/encoder" "^0.54.2"
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
-
-"@glimmer/reference@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.54.2.tgz#996509e483f7299f5191260ab622db5816485a3a"
-  integrity sha512-upBx3AMJVf3BkGN0UtgVVapcdjR7g/UF/GkQWcrzIOGchDFnFhY443Ys1oLtMNBA02RhtUr+U8KzUSsFV3sfsw==
+"@glimmer/opcode-compiler@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.55.1.tgz#d71e67ad3b4a0852c4aad45f2ca9dff0010e60fb"
+  integrity sha512-b/xH+2It9MtpK4PbltUnlLtjQdX4eaggWXrS86i+leSXfj2F6BtBPZd7k9QZGcXXGHuZmuF0fQXZrN1LN8pxDA==
+  dependencies:
+    "@glimmer/encoder" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/program" "^0.55.1"
+    "@glimmer/reference" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
+    "@glimmer/vm" "^0.55.1"
+    "@glimmer/wire-format" "^0.55.1"
+
+"@glimmer/program@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.55.1.tgz#19b0af648044ac2e727a25fb446dd30fa6aa6264"
+  integrity sha512-JXPF1o6hHp9SX3MX+l2t4B61mJp4YGO5LWV1E0ciHUGGQSVaHh7DUnc0Qje36yUthVbB6qT5I0GWF487Egzgyg==
+  dependencies:
+    "@glimmer/encoder" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
+
+"@glimmer/reference@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.55.1.tgz#6f5028a16ea449e57f0e9ac9b47528f8c2182991"
+  integrity sha512-7EwHUO2pc5P9IdhypZn2eqFL9rvcME3Xs7x8Uhp9N+Wqfmuzkf3IhZs9GgQf3Tk4h52j5ZNnS6yXy/bj7uHClA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
-    "@glimmer/validator" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
+    "@glimmer/validator" "^0.55.1"
 
-"@glimmer/runtime@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.54.2.tgz#149fe6a29f279785d6fbac6ec933036088f7a5e7"
-  integrity sha512-SwumHB0uw4/L6sgXmMTc4cf3GwYe8siFk7Qi2hVVTSZdZGrfIOP5ZB94x0HEWWeSUgy/4ar9TcsKvfj5LyLBvA==
+"@glimmer/runtime@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.55.1.tgz#cd79f451a2ff2b6d9aac74164752812415b7d149"
+  integrity sha512-t9J+tSSGq0KY2WoVhKaZkhmLWGlC7Hjosn43EiKPERf2x+wpkKkS/EGo6UHa0YjPIVnfFhWeY5C3fcVMZajKVw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/low-level" "^0.54.2"
-    "@glimmer/program" "^0.54.2"
-    "@glimmer/reference" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
-    "@glimmer/validator" "^0.54.2"
-    "@glimmer/vm" "^0.54.2"
-    "@glimmer/wire-format" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/low-level" "^0.55.1"
+    "@glimmer/program" "^0.55.1"
+    "@glimmer/reference" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
+    "@glimmer/validator" "^0.55.1"
+    "@glimmer/vm" "^0.55.1"
+    "@glimmer/wire-format" "^0.55.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.54.2.tgz#60d08458002c106791d4c5b648227ec0f29a1b2a"
-  integrity sha512-EpQGbbzfvBmeztc15SsriyAgD0aKgsxMOARVtW5buvCPw3dGYYNdSeyUJ3vInbrFGxkZLV390ht8VCbsDbqtlA==
+"@glimmer/syntax@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.55.1.tgz#adca96147e5c2b4e47a6ee8d8276effc4d31b6e5"
+  integrity sha512-QKW97Cl+Rz8dTWkYUewclLBRcyICg2Fb6BFz2oUDo17gP7w8eqb+XL8wAfzG1lDJ+WDT7pwprM8zUyvn2eYa5g==
   dependencies:
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.54.2.tgz#211b027982006b6bcd393312cf474c7ee17922a0"
-  integrity sha512-ggJY3qayAxjiMuoToxxtwai+AI2KXrJSbOEvbvBV9K+IMykmdjhWGRWWEONnd9xJzQDlus5D9ROMypOEvsbS9w==
+"@glimmer/util@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.55.1.tgz#43657af0adde30ad1cb3a8d72c85a8af35de0194"
+  integrity sha512-F9Hr2hS/H738F2voG+W4Hx/4+W7uDeuqg7ddIPUecZP6HQHhqTbgGaQJIt5J1emJ1D4nLPpjSJpn50MVbVGeaQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.54.2.tgz#9681ff89d9874a5b075c73bfc828ffc15b23c7df"
-  integrity sha512-D/BJo06+dSmjJuLchYK79Gj1kPHZ3K6qz5bOJn3FtOwftFa1XqW+1zbBYs4tqwbe3dHoRll4+t/X0Q4AXZpt7Q==
+"@glimmer/validator@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.55.1.tgz#c2ff4c8c9fd7e20d3df4bb98519eda840f8bc4ce"
+  integrity sha512-CX1Vb118xIjt0lYjBQvnAJo5lZIMaMg3Ef6cNQRM1gFqZkrh7sSs5Kz3hoxNxUtjiukRd2nfi+EirMhfcGgsWg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.54.2.tgz#9a7e9c5839be0cd5d7b1495d06f369754686a750"
-  integrity sha512-LdvD8kqUT5VewGC52uhdGuJZlX/Mwm6/8sf/pRvI/4Cz0bZL+PMQQsX8IPdwGvftSu3wRIt33JWdrL+9tjPgAA==
+"@glimmer/vm@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.55.1.tgz#a8ae535de6ae6ebac6623da709b3f76097b84fa4"
+  integrity sha512-mui0Jf6H4R3U35Gy3viaipawPQbU0rqWf+49qwLALXHgZNtyhHzuLdcn41xVLNikAsRmvmVPbmczBN7uWiAZMw==
   dependencies:
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
 
-"@glimmer/wire-format@^0.54.2":
-  version "0.54.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.54.2.tgz#aef5f618cbacd212359022df94393987d9e4a876"
-  integrity sha512-lmp9zW9Uo7CuNqpXJk2hxF7zLOkbr9fOjQKbSc3b+YletT0LhfNFRAs0R2WhQMlyw2UrNzc81+C0zt4wUdypkQ==
+"@glimmer/wire-format@^0.55.1":
+  version "0.55.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.55.1.tgz#eff31e76225483ed3b5009639abdc050b7df3212"
+  integrity sha512-plDG2h5q0d/mz5Gzwtx+II/IVwPDIgXK9KsqITFqorQmxzOd2MoYY04nk3C7yN4bFdaqEl0P37rynfE63pgMqw==
   dependencies:
-    "@glimmer/interfaces" "^0.54.2"
-    "@glimmer/util" "^0.54.2"
+    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/util" "^0.55.1"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 71f62351f501dba5c7a04a474e8c47c9bd73ddf9 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 29 Jul 2020 12:26:02 -0400
Subject: [PATCH 0053/1405] Add v3.16.9 to CHANGELOG.md.

[ci skip]
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 096c0102a7c..a6ddad8d063 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -92,6 +92,14 @@
 - [#18694](https://github.com/emberjs/ember.js/pull/18694) [BUGFIX] Ensure tag updates are buffered, remove error message
 - [#18709](https://github.com/emberjs/ember.js/pull/18709) [BUGFIX] Fix `this` in `@tracked` initializer
 
+### v3.16.9 (July 29, 2020)
+
+- [#19001](https://github.com/emberjs/ember.js/pull/19001) [BUGFIX] Invoke methods correctly in `TextSupport` `sendAction`
+- [#19023](https://github.com/emberjs/ember.js/pull/19023) [BUGFIX] Avoid over eager property access during `init`
+- [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update `router.js` to ensure `transition.abort` works for query param only transitions
+- [#19057](https://github.com/emberjs/ember.js/pull/19057) [BUGFIX] Parallelize `inject-babel-helpers` plugin
+- [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in HistoryLocation
+
 ### v3.16.8 (April 24, 2020)
 
 - [#18879](https://github.com/emberjs/ember.js/pull/18879) Ensure errors thrown during component construction do not cause (unrelated) errors during application teardown (fixes a common issue when using `setupOnerror` with components asserting during `constructor`/`init`/`didInssertElement`).

From 863cca5986c3ff781d6e235fd382046a3c1f7956 Mon Sep 17 00:00:00 2001
From: Jen Weber <j@jenweber.me>
Date: Wed, 29 Jul 2020 22:27:28 -0400
Subject: [PATCH 0054/1405] [DOC release-3-20-1] fix missing docs

---
 packages/@ember/-internals/glimmer/lib/syntax/in-element.ts | 2 --
 tests/docs/expected.js                                      | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts b/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
index d0d25fad539..70c36a157b6 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
@@ -30,8 +30,6 @@
  `destinationElement`. Passing `null` changes the behaviour to appended at the end
  of any existing content. Any other value than `null` is currently not supported.
 
- ```
-
  @method in-element
  @for Ember.Templates.helpers
  @public
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 9c0b522a6d0..037ec0a9b03 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -276,6 +276,7 @@ module.exports = {
     'href',
     'htmlSafe',
     'if',
+    'in-element',
     'includes',
     'incrementProperty',
     'indexOf',

From 2e19e0d61050682b1a356a8f0853a0b10f41bb40 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 29 Jul 2020 22:15:10 -0400
Subject: [PATCH 0055/1405] [FEATURE] Add @ember/destroyable feature.

The primary implementation happened upstream in Glimmer itself, this is
adding API docs and module exports to be used.
---
 packages/@ember/canary-features/index.ts |   2 +
 packages/@ember/destroyable/index.ts     | 265 +++++++++++++++++++++++
 packages/ember/index.js                  |  23 +-
 tests/docs/expected.js                   |   5 +
 4 files changed, 294 insertions(+), 1 deletion(-)
 create mode 100644 packages/@ember/destroyable/index.ts

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index e4e6b7c8329..189b8db78ad 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -22,6 +22,7 @@ export const DEFAULT_FEATURES = {
   EMBER_ROUTING_MODEL_ARG: true,
   EMBER_GLIMMER_IN_ELEMENT: true,
   EMBER_CACHE_API: null,
+  EMBER_DESTROYABLES: null,
 };
 
 /**
@@ -83,3 +84,4 @@ export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
 export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL_ARG);
 export const EMBER_GLIMMER_IN_ELEMENT = featureValue(FEATURES.EMBER_GLIMMER_IN_ELEMENT);
 export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
+export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
diff --git a/packages/@ember/destroyable/index.ts b/packages/@ember/destroyable/index.ts
new file mode 100644
index 00000000000..379ab4711eb
--- /dev/null
+++ b/packages/@ember/destroyable/index.ts
@@ -0,0 +1,265 @@
+export {
+  assertDestroyablesDestroyed,
+  associateDestroyableChild,
+  destroy,
+  enableDestroyableTracking,
+  isDestroying,
+  isDestroyed,
+} from '@glimmer/runtime';
+
+import {
+  registerDestructor as _registerDestructor,
+  unregisterDestructor as _unregisterDestructor,
+} from '@glimmer/runtime';
+
+/**
+  Ember manages the lifecycles and lifetimes of many built in constructs, such
+  as components, and does so in a hierarchical way - when a parent component is
+  destroyed, all of its children are destroyed as well.
+
+  This destroyables API exposes the basic building blocks for destruction:
+
+  * registering a function to be ran when an object is destroyyed
+  * checking if an object is in a destroying state
+  * associate an object as a child of another so that the child object will be destroyed
+    when the associated parent object is destroyed.
+
+  @module @ember/destroyable
+  @category EMBER_DESTROYABLES
+  @public
+*/
+
+/**
+  This function is used to associate a destroyable object with a parent. When the parent
+  is destroyed, all registered children will also be destroyed.
+
+  ```js
+  class CustomSelect extends Component {
+    constructor() {
+      // obj is now a child of the component. When the component is destroyed,
+      // obj will also be destroyed, and have all of its destructors triggered.
+      this.obj = associateDestroyableChild(this, {});
+    }
+  }
+  ```
+
+  Returns the associated child for convenience.
+
+  @method associateDestroyableChild
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @param {Object|Function} parent the destroyable to entangle the child destroyables lifetime with
+  @param {Object|Function} child the destroyable to be entangled with the parents lifetime
+  @param {Function} destructor the destructor to run when the destroyable object is destroyed
+  @returns {Object|Function} the child argument
+  @static
+  @public
+*/
+
+/**
+ Receives a destroyable, and returns true if the destroyable has begun destroying. Otherwise returns
+ false.
+
+  ```js
+  let obj = {};
+  isDestroying(obj); // false
+  destroy(obj);
+  isDestroying(obj); // true
+  // ...sometime later, after scheduled destruction
+  isDestroyed(obj); // true
+  isDestroying(obj); // true
+  ```
+
+  @method isDestroying
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @param {Object|Function} destroyable the object to check
+  @returns {Boolean}
+  @static
+  @public
+*/
+
+/**
+  Receives a destroyable, and returns true if the destroyable has finished destroying. Otherwise
+  returns false.
+
+  ```js
+  let obj = {};
+
+  isDestroyed(obj); // false
+  destroy(obj);
+
+  // ...sometime later, after scheduled destruction
+
+  isDestroyed(obj); // true
+  ```
+
+  @method isDestroyed
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @param {Object|Function} destroyable the object to check
+  @returns {Boolean}
+  @static
+  @public
+*/
+
+/**
+  Initiates the destruction of a destroyable object. It runs all associated destructors, and then
+  destroys all children recursively.
+
+  ```js
+  let obj = {};
+
+  registerDestructor(obj, () => console.log('destroyed!'));
+
+  destroy(obj); // this will schedule the destructor to be called
+
+  // ...some time later, during scheduled destruction
+
+  // destroyed!
+  ```
+
+  Destruction via `destroy()` follows these steps:
+
+  1, Mark the destroyable such that `isDestroying(destroyable)` returns `true`
+  2, Call `destroy()` on each of the destroyable's associated children
+  3, Schedule calling the destroyable's destructors
+  4, Schedule setting destroyable such that `isDestroyed(destroyable)` returns `true`
+
+  This results in the entire tree of destroyables being first marked as destroying,
+  then having all of their destructors called, and finally all being marked as isDestroyed.
+  There won't be any in between states where some items are marked as `isDestroying` while
+  destroying, while others are not.
+
+  @method destroy
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @param {Object|Function} destroyable the object to destroy
+  @static
+  @public
+*/
+
+/**
+  This function asserts that all objects which have associated destructors or associated children
+  have been destroyed at the time it is called. It is meant to be a low level hook that testing
+  frameworks can use to hook into and validate that all destroyables have in fact been destroyed.
+
+  This function requires that `enableDestroyableTracking` was called previously, and is only
+  available in non-production builds.
+
+  @method assertDestroyablesDestroyed
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @static
+  @public
+*/
+
+/**
+  This function instructs the destroyable system to keep track of all destroyables (their
+  children, destructors, etc). This enables a future usage of `assertDestroyablesDestroyed`
+  to be used to ensure that all destroyable tasks (registered destructors and associated children)
+  have completed when `assertDestroyablesDestroyed` is called.
+
+  @method enableDestroyableTracking
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @static
+  @public
+*/
+
+/**
+  Receives a destroyable object and a destructor function, and associates the
+  function with it. When the destroyable is destroyed with destroy, or when its
+  parent is destroyed, the destructor function will be called.
+
+  ```js
+  import { registerDestructor } from '@ember/destroyable';
+
+  class Modal extends Component {
+    @service resize;
+
+    constructor() {
+      this.resize.register(this, this.layout);
+
+      registerDestructor(this, () => this.resize.unregister(this));
+    }
+  }
+  ```
+
+  Multiple destructors can be associated with a given destroyable, and they can be
+  associated over time, allowing libraries to dynamically add destructors as needed.
+  `registerDestructor` also returns the associated destructor function, for convenience.
+
+  The destructor function is passed a single argument, which is the destroyable itself.
+  This allows the function to be reused multiple times for many destroyables, rather
+  than creating a closure function per destroyable.
+
+  ```js
+  import { registerDestructor } from '@ember/destroyable';
+
+  function unregisterResize(instance) {
+    instance.resize.unregister(instance);
+  }
+
+  class Modal extends Component {
+    @service resize;
+
+    constructor() {
+      this.resize.register(this, this.layout);
+
+      registerDestructor(this, unregisterResize);
+    }
+  }
+  ```
+
+  @method registerDestructor
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @param {Object|Function} destroyable the destroyable to register the destructor function with
+  @param {Function} destructor the destructor to run when the destroyable object is destroyed
+  @static
+  @public
+*/
+export function registerDestructor<T extends object>(
+  destroyable: T,
+  destructor: (destroyable: T) => void
+): (destroyable: T) => void {
+  return _registerDestructor(destroyable, destructor);
+}
+
+/**
+  Receives a destroyable and a destructor function, and de-associates the destructor
+  from the destroyable.
+
+  ```js
+  import { registerDestructor, unregisterDestructor } from '@ember/destroyable';
+
+  class Modal extends Component {
+    @service modals;
+
+    constructor() {
+      this.modals.add(this);
+
+      this.modalDestructor = registerDestructor(this, () => this.modals.remove(this));
+    }
+
+    @action pinModal() {
+      unregisterDestructor(this, this.modalDestructor);
+    }
+  }
+  ```
+
+  @method unregisterDestructor
+  @category EMBER_DESTROYABLES
+  @for @ember/destroyable
+  @param {Object|Function} destroyable the destroyable to unregister the destructor function from
+  @param {Function} destructor the destructor to remove from the destroyable
+  @static
+  @public
+*/
+export function unregisterDestructor<T extends object>(
+  destroyable: T,
+  destructor: (destroyable: T) => void
+): void {
+  return _unregisterDestructor(destroyable, destructor);
+}
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 4cc5462eab1..af42c3bd247 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -12,6 +12,7 @@ import {
   isEnabled,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
   EMBER_CACHE_API,
+  EMBER_DESTROYABLES,
 } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
@@ -138,7 +139,17 @@ import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
 import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import templateOnlyComponent from '@ember/component/template-only';
-import { destroy } from '@glimmer/runtime';
+
+import {
+  assertDestroyablesDestroyed,
+  associateDestroyableChild,
+  destroy,
+  enableDestroyableTracking,
+  isDestroying,
+  isDestroyed,
+  registerDestructor,
+  unregisterDestructor,
+} from '@ember/destroyable';
 
 // ****@ember/-internals/environment****
 
@@ -341,6 +352,16 @@ if (EMBER_CACHE_API) {
   Ember._cacheIsConst = metal.isConst;
 }
 
+if (EMBER_DESTROYABLES) {
+  Ember._registerDestructor = registerDestructor;
+  Ember._unregisterDestructor = unregisterDestructor;
+  Ember._associateDestroyableChild = associateDestroyableChild;
+  Ember._assertDestroyablesDestroyed = assertDestroyablesDestroyed;
+  Ember._enableDestroyableTracking = enableDestroyableTracking;
+  Ember._isDestroying = isDestroying;
+  Ember._isDestroyed = isDestroyed;
+}
+
 /**
   A function may be assigned to `Ember.onerror` to be called when Ember
   internals encounter an error. This is useful for specialized error handling
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 037ec0a9b03..90ef27138f0 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -89,7 +89,9 @@ module.exports = {
     'arrayContentDidChange',
     'arrayContentWillChange',
     'assert',
+    'assertDestroyablesDestroyed',
     'assign',
+    'associateDestroyableChild',
     'asyncEnd',
     'asyncStart',
     'attributeBindings',
@@ -193,6 +195,7 @@ module.exports = {
     'element',
     'elementId',
     'empty',
+    'enableDestroyableTracking',
     'end',
     'endPropertyChanges',
     'engine',
@@ -436,6 +439,7 @@ module.exports = {
     'register',
     'registerAsyncHelper',
     'registerDeprecationHandler',
+    'registerDestructor',
     'registerHelper',
     'registerOptions',
     'registerOptionsForType',
@@ -565,6 +569,7 @@ module.exports = {
     'uniqBy',
     'unless',
     'unregister',
+    'unregisterDestructor',
     'unregisterHelper',
     'unregisterWaiter',
     'unshiftObject',

From 0bd4855c2d2b77f1b4ad92372a6e7c96d52430a9 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 30 Jul 2020 09:51:35 -0400
Subject: [PATCH 0056/1405] Add v3.20.3 to CHANGELOG.md.

[ci skip]
---
 CHANGELOG.md | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6ddad8d063..ee14870f290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,10 +5,6 @@
 - [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update router.js to ensure transition.abort works for query param only transitions.
 - [#19056](https://github.com/emberjs/ember.js/pull/19056) [BUGFIX] Update glimmer-vm to 0.54.2.
 
-### v3.20.2 (July 26, 2020)
-
-- [#19056](https://github.com/emberjs/ember.js/pull/19056) Update Glimmer rendering engine to 0.54.2. Fixes an issue with (private for now) destroyables work to enable the destroyables polyfill to work more appropriately.
-
 ### v3.21.0-beta.2 (July 20, 2020)
 
 - [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`
@@ -19,6 +15,17 @@
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
 
+### v3.20.3 (July 30, 2020)
+
+- [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update `router.js` to ensure `transition.abort` works for query param only transitions
+- [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in `HistoryLocation`
+- [#19060](https://github.com/emberjs/ember.js/pull/19060) [BUGFIX] Update rendering engine to `@glimmer/*` 0.55.1
+- [#19063](https://github.com/emberjs/ember.js/pull/19063) [DOC] Fix missing docs for `{{#in-element}}`
+
+### v3.20.2 (July 26, 2020)
+
+- [#19056](https://github.com/emberjs/ember.js/pull/19056) Update Glimmer rendering engine to 0.54.2. Fixes an issue with (private for now) destroyables work to enable the destroyables polyfill to work more appropriately.
+
 ### v3.20.1 (July 13, 2020)
 
 - [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`

From 579e2702d3a76034605ae62304d435f2c706d474 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 30 Jul 2020 16:12:49 -0400
Subject: [PATCH 0057/1405] Small updates to the github workflow, rename

---
 .github/workflows/{build.yml => ci.yml} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename .github/workflows/{build.yml => ci.yml} (98%)

diff --git a/.github/workflows/build.yml b/.github/workflows/ci.yml
similarity index 98%
rename from .github/workflows/build.yml
rename to .github/workflows/ci.yml
index 8705cfb0129..9cb5b4ccd1d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Build
+name: CI
 
 on:
   push:
@@ -158,7 +158,7 @@ jobs:
   blueprint-test:
     name: Blueprint Tests
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [lint]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -252,7 +252,7 @@ jobs:
         run: node bin/publish_to_s3.js
         env:
           BUILD_TYPE: alpha
-          OVERRIDE_FEATURES: EMBER_METAL_TRACKED_PROPERTIES
+          OVERRIDE_FEATURES: ''
           S3_BUCKET_NAME: 'builds.emberjs.com'
           S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY}}
           S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID}}

From f4dedb690d3259c762ba2feaaf126d405b9a3b70 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 30 Jul 2020 17:53:35 -0400
Subject: [PATCH 0058/1405] Update to 0.55.2 of glimmer-vm.

A few nice enhancments upstream:

* add destroyables to the error thrown within
  `assertDestroyablesDestroyed`
* fix a type issue with `MonomorphicTag` in newer TypeScript
* improve performance of constant lookup during runtime template
  compilation

https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.55.2
---
 package.json |  16 ++---
 yarn.lock    | 196 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index aa535a94a01..3f06a732b83 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.55.1",
+    "@glimmer/compiler": "^0.55.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.55.1",
-    "@glimmer/node": "^0.55.1",
-    "@glimmer/opcode-compiler": "^0.55.1",
-    "@glimmer/program": "^0.55.1",
-    "@glimmer/reference": "^0.55.1",
-    "@glimmer/runtime": "^0.55.1",
-    "@glimmer/validator": "^0.55.1",
+    "@glimmer/interfaces": "^0.55.2",
+    "@glimmer/node": "^0.55.2",
+    "@glimmer/opcode-compiler": "^0.55.2",
+    "@glimmer/program": "^0.55.2",
+    "@glimmer/reference": "^0.55.2",
+    "@glimmer/runtime": "^0.55.2",
+    "@glimmer/validator": "^0.55.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 6bd16aefdab..3302f477061 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.55.1.tgz#c85fcbf00125c7c0fb74cd179a9e30c42dddccee"
-  integrity sha512-t4jFag9i1/jo9JId2VMPuFOIY0E8MlRmyMnfh9mipC9iZXZsC8d0PCia6/FvZRvUJvNRA+brMwck6IHfiW2Nmw==
-  dependencies:
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/syntax" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
-    "@glimmer/wire-format" "^0.55.1"
+"@glimmer/compiler@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.55.2.tgz#565780010ed6e5ffbe8554851b8cae2236480454"
+  integrity sha512-5aUQfXB9Jl1XJyJ82DRDetf4XVLjvUsFNUKCeg9FqAnMt4WVoxc5bsCzYvBWyXh4QW1XBfnEdy8eRNctkATzhw==
+  dependencies:
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/syntax" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
+    "@glimmer/wire-format" "^0.55.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.55.1.tgz#1356c123e61d43fed9b3a36a189cd1776974dae2"
-  integrity sha512-Q3WueSDKYxCnQlk/0Sp1rpyMckh553zwA3yQ9PE25pEnt9LVnfn3TWGKb4XOAjiaGt0hyDLfFI7Ftt+4rbsCOA==
+"@glimmer/encoder@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.55.2.tgz#a268451ecaf814a891fa068ad3ec1d0c80f39eb9"
+  integrity sha512-LQREUzEjGkyLJyboTlaV/0ffUf2+5zm6PYEZSdk3RJ4ZKkv8ucxytnfxYdxuHWKH1lS4sHlPAdPO5hGSRLsnNg==
   dependencies:
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/vm" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/vm" "^0.55.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.55.1.tgz#be9499d83a63514b2470f19e5430b06c7edb2076"
-  integrity sha512-rbmL/xT9mHWX2jioYLT0V/H0QS8qaIJ1HCOlkbX5zvAASNu8+kwTXy8Bq4hx1OW3qwul6ihfHq/6k2oLxJ90JQ==
+"@glimmer/interfaces@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.55.2.tgz#de90ad8501bf3d2439fd752bb83bcce2a65730a2"
+  integrity sha512-VTszj/QmgDqdo/xTopzMBdaQ4s9rtP2jo070qNkAWrTV0QLe+N/pjTx082epk8Jy84kmw8yu80Tpyw+y0iHS2g==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.55.1.tgz#f3ab819637cfb0a38c04bd675b28ebb3f4bd238d"
-  integrity sha512-wK0Lkb7P3ajOcMbzCrDokC13GAtvyABrF+KYkNlNMzrCBSZ0q9BsFXRhSHhO4UIZm4jQmbaQVOy5SYdoB4Bu2A==
+"@glimmer/low-level@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.55.2.tgz#6a35f548a433f324b2d2c6ea82cf7d12ca789f40"
+  integrity sha512-Ie7L+8xXYVPiqGvlaXD4EDjYULF+zKk191OQ7pcSVsTxHCgqFzw3fzbsAnvLkWHwzPpQ3vlpQGgi18i/H18yFA==
 
-"@glimmer/node@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.55.1.tgz#0d6fd43b6f4cbd0a0b47c0482cfd047f31bff5b7"
-  integrity sha512-PgAkx8tSJc4xWyVS4qCSNo13KNRklUZDShQmhoFOv9nvCZdWLcUv1SZJshGQlmwQNxY6YCHjRlnRJN17VBcZBQ==
+"@glimmer/node@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.55.2.tgz#ba9aaa9c859062b5c2d54fc142205b0f7e25824f"
+  integrity sha512-R6KdMauN9u7JdtUaCfgfxsiKvJodQ2OaGhKXIbg0mcEBUXv1W3bVtKhnExTf21AeErWZ/gK6f2wnOqVjV0w41w==
   dependencies:
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/runtime" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/runtime" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.55.1.tgz#d71e67ad3b4a0852c4aad45f2ca9dff0010e60fb"
-  integrity sha512-b/xH+2It9MtpK4PbltUnlLtjQdX4eaggWXrS86i+leSXfj2F6BtBPZd7k9QZGcXXGHuZmuF0fQXZrN1LN8pxDA==
-  dependencies:
-    "@glimmer/encoder" "^0.55.1"
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/program" "^0.55.1"
-    "@glimmer/reference" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
-    "@glimmer/vm" "^0.55.1"
-    "@glimmer/wire-format" "^0.55.1"
-
-"@glimmer/program@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.55.1.tgz#19b0af648044ac2e727a25fb446dd30fa6aa6264"
-  integrity sha512-JXPF1o6hHp9SX3MX+l2t4B61mJp4YGO5LWV1E0ciHUGGQSVaHh7DUnc0Qje36yUthVbB6qT5I0GWF487Egzgyg==
-  dependencies:
-    "@glimmer/encoder" "^0.55.1"
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
-
-"@glimmer/reference@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.55.1.tgz#6f5028a16ea449e57f0e9ac9b47528f8c2182991"
-  integrity sha512-7EwHUO2pc5P9IdhypZn2eqFL9rvcME3Xs7x8Uhp9N+Wqfmuzkf3IhZs9GgQf3Tk4h52j5ZNnS6yXy/bj7uHClA==
+"@glimmer/opcode-compiler@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.55.2.tgz#4f69eb97dd173e3a17ae1b075a46447c51c301b4"
+  integrity sha512-K9r+Qt05UU3+dPV/AMxrumimqMlCoHJ4ohd2cSOYShpvin+XHgAooKdhtUE0WzXrsN4c0epCcNSMbif1VE/MUg==
+  dependencies:
+    "@glimmer/encoder" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/program" "^0.55.2"
+    "@glimmer/reference" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
+    "@glimmer/vm" "^0.55.2"
+    "@glimmer/wire-format" "^0.55.2"
+
+"@glimmer/program@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.55.2.tgz#fca9e4070adcfc73cdbe383d08be824218a5974d"
+  integrity sha512-1rKP2BKrNpDemqzy63KfrUL6Dz0mKqC1BEr5QJpvgl3o4/BNwp6qlNxNVkMOj9ExzkmEv8HSgKqY36xTQ5Kptg==
+  dependencies:
+    "@glimmer/encoder" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
+
+"@glimmer/reference@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.55.2.tgz#1f0ee83f36047f35907aa5e8c4b481cd2933fa38"
+  integrity sha512-tUJir3YGtkoGjilhUhYx8s6fO6HuO3LqTqs9dBGYelhZPuQfLzG7NmgSs2TkDXqEDPqNR49wTMHEr95frrfJEw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
-    "@glimmer/validator" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
+    "@glimmer/validator" "^0.55.2"
 
-"@glimmer/runtime@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.55.1.tgz#cd79f451a2ff2b6d9aac74164752812415b7d149"
-  integrity sha512-t9J+tSSGq0KY2WoVhKaZkhmLWGlC7Hjosn43EiKPERf2x+wpkKkS/EGo6UHa0YjPIVnfFhWeY5C3fcVMZajKVw==
+"@glimmer/runtime@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.55.2.tgz#bbb4b7c941b39a374d5017a70663060e4a233caf"
+  integrity sha512-HrMhgg3pcKhQOO+Ad347JoofKgP4pqbkkUynFQoYsOf6HrMmDe/2QlCgcc3PU2Ngd39NVzazVPlOlviOHXql0w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/low-level" "^0.55.1"
-    "@glimmer/program" "^0.55.1"
-    "@glimmer/reference" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
-    "@glimmer/validator" "^0.55.1"
-    "@glimmer/vm" "^0.55.1"
-    "@glimmer/wire-format" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/low-level" "^0.55.2"
+    "@glimmer/program" "^0.55.2"
+    "@glimmer/reference" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
+    "@glimmer/validator" "^0.55.2"
+    "@glimmer/vm" "^0.55.2"
+    "@glimmer/wire-format" "^0.55.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.55.1.tgz#adca96147e5c2b4e47a6ee8d8276effc4d31b6e5"
-  integrity sha512-QKW97Cl+Rz8dTWkYUewclLBRcyICg2Fb6BFz2oUDo17gP7w8eqb+XL8wAfzG1lDJ+WDT7pwprM8zUyvn2eYa5g==
+"@glimmer/syntax@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.55.2.tgz#5b90f8cc1dc72771aab3ee7e3b00891912451419"
+  integrity sha512-mvVUp2nPePOR9wUXf9iRvGAIccon2iHGyGdU7C5945TE2vPvmcfbUpJNpjA6OFJzTD1qXt4zK2OcUkm6Jm8e5w==
   dependencies:
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.55.1.tgz#43657af0adde30ad1cb3a8d72c85a8af35de0194"
-  integrity sha512-F9Hr2hS/H738F2voG+W4Hx/4+W7uDeuqg7ddIPUecZP6HQHhqTbgGaQJIt5J1emJ1D4nLPpjSJpn50MVbVGeaQ==
+"@glimmer/util@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.55.2.tgz#5921849bfc51219d266c0b71a54fe2cbf8864524"
+  integrity sha512-4BbldC7Hr+nkJ0Fm3iO852kYQ8HC/SuKBVNM3o9EMk2QJkbgoDKBNFSDLO4mc8EPl16hUZHiJeaIw8UyEEQa9w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.55.1.tgz#c2ff4c8c9fd7e20d3df4bb98519eda840f8bc4ce"
-  integrity sha512-CX1Vb118xIjt0lYjBQvnAJo5lZIMaMg3Ef6cNQRM1gFqZkrh7sSs5Kz3hoxNxUtjiukRd2nfi+EirMhfcGgsWg==
+"@glimmer/validator@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.55.2.tgz#805a60043f9045cb5e6947740435cbc2650bac08"
+  integrity sha512-GvwTpOgkd+dadELT9X6YEbDnhhkSF0XPOww8qc9C9BeFxzEBp/lTBA6Aj/Qq3ucOmyx3cbqIbefdsTFkRc0v2A==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.55.1.tgz#a8ae535de6ae6ebac6623da709b3f76097b84fa4"
-  integrity sha512-mui0Jf6H4R3U35Gy3viaipawPQbU0rqWf+49qwLALXHgZNtyhHzuLdcn41xVLNikAsRmvmVPbmczBN7uWiAZMw==
+"@glimmer/vm@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.55.2.tgz#6d43a3ae14585bb3a45799b1b0722153c3fec4f4"
+  integrity sha512-B0rJ3L9/kOSiohOfuGnMLqH94VNray95Uc7bCyBZ0yfH1NsdKhs74AhPYYFP2Gb5wj4o3jX6fxej26ZTbR4veg==
   dependencies:
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
 
-"@glimmer/wire-format@^0.55.1":
-  version "0.55.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.55.1.tgz#eff31e76225483ed3b5009639abdc050b7df3212"
-  integrity sha512-plDG2h5q0d/mz5Gzwtx+II/IVwPDIgXK9KsqITFqorQmxzOd2MoYY04nk3C7yN4bFdaqEl0P37rynfE63pgMqw==
+"@glimmer/wire-format@^0.55.2":
+  version "0.55.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.55.2.tgz#548e24255b4c2375f23f4064f1256b57631da1c5"
+  integrity sha512-rdWOsH0K/pS43iFMIvzAbq62ovt2FPMI4Gu9J06tDMwWgOdhzm4ShXwFHGppnH6FbqLoZHJiVlkN9xZPJOvfLA==
   dependencies:
-    "@glimmer/interfaces" "^0.55.1"
-    "@glimmer/util" "^0.55.1"
+    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/util" "^0.55.2"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 7f7c22ca7fa32b4578f35fb427e0d2a76c398251 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Fri, 31 Jul 2020 17:59:50 -0400
Subject: [PATCH 0059/1405] [FEATURE] Enable @glimmer/tracking/primitives/cache
 APIs.

---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 189b8db78ad..d5078f383f4 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -21,7 +21,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
   EMBER_GLIMMER_IN_ELEMENT: true,
-  EMBER_CACHE_API: null,
+  EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: null,
 };
 

From 39494a1e363371cd70b6fc4f4130626e2c04090f Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Fri, 31 Jul 2020 18:03:09 -0400
Subject: [PATCH 0060/1405] [FEATURE] Enable @ember/destroyable API.

As discussed in todays core team meeting.
---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 189b8db78ad..b4a36724116 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -22,7 +22,7 @@ export const DEFAULT_FEATURES = {
   EMBER_ROUTING_MODEL_ARG: true,
   EMBER_GLIMMER_IN_ELEMENT: true,
   EMBER_CACHE_API: null,
-  EMBER_DESTROYABLES: null,
+  EMBER_DESTROYABLES: true,
 };
 
 /**

From 491958373ca53664e3030e21aee93cc0cead71ee Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 2 Aug 2020 12:36:15 -0400
Subject: [PATCH 0061/1405] Update to glimmerjs/glimmer-vm 0.55.3.

Mostly internal changes RE: validators.

https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.55.3
---
 package.json |  16 ++---
 yarn.lock    | 196 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index 3f06a732b83..1085ee284e5 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.55.2",
+    "@glimmer/compiler": "^0.55.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.55.2",
-    "@glimmer/node": "^0.55.2",
-    "@glimmer/opcode-compiler": "^0.55.2",
-    "@glimmer/program": "^0.55.2",
-    "@glimmer/reference": "^0.55.2",
-    "@glimmer/runtime": "^0.55.2",
-    "@glimmer/validator": "^0.55.2",
+    "@glimmer/interfaces": "^0.55.3",
+    "@glimmer/node": "^0.55.3",
+    "@glimmer/opcode-compiler": "^0.55.3",
+    "@glimmer/program": "^0.55.3",
+    "@glimmer/reference": "^0.55.3",
+    "@glimmer/runtime": "^0.55.3",
+    "@glimmer/validator": "^0.55.3",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 3302f477061..3606f19bce2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.55.2.tgz#565780010ed6e5ffbe8554851b8cae2236480454"
-  integrity sha512-5aUQfXB9Jl1XJyJ82DRDetf4XVLjvUsFNUKCeg9FqAnMt4WVoxc5bsCzYvBWyXh4QW1XBfnEdy8eRNctkATzhw==
-  dependencies:
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/syntax" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
-    "@glimmer/wire-format" "^0.55.2"
+"@glimmer/compiler@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.55.3.tgz#7fc78279b06eceab92c1dca59e3018bf8e46f9d8"
+  integrity sha512-iJx6VWuvm8CBxny5gVSuGQH05tFP/B0wqapAkJWtfhgAdGkVCaL2q4P5YsAE6ZabE4XmcdPNS0oksRC1J09Nkw==
+  dependencies:
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/syntax" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
+    "@glimmer/wire-format" "^0.55.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.55.2.tgz#a268451ecaf814a891fa068ad3ec1d0c80f39eb9"
-  integrity sha512-LQREUzEjGkyLJyboTlaV/0ffUf2+5zm6PYEZSdk3RJ4ZKkv8ucxytnfxYdxuHWKH1lS4sHlPAdPO5hGSRLsnNg==
+"@glimmer/encoder@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.55.3.tgz#66b516939cc69bd67f173ba51746939bf5fc3098"
+  integrity sha512-g4YxmjRTkrsrQIoyZgec0cI0OWI3pTw4VZKOVL3jUdUf1sRwXGxK++qztaMbN5YTDFLAJU1JPSuvJkwRYZPBAg==
   dependencies:
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/vm" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/vm" "^0.55.3"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.55.2.tgz#de90ad8501bf3d2439fd752bb83bcce2a65730a2"
-  integrity sha512-VTszj/QmgDqdo/xTopzMBdaQ4s9rtP2jo070qNkAWrTV0QLe+N/pjTx082epk8Jy84kmw8yu80Tpyw+y0iHS2g==
+"@glimmer/interfaces@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.55.3.tgz#89f22729141fef4d3ed7441e38095dd84c0bec22"
+  integrity sha512-EbnLv4CDKVBdW4+uv4OG50UTSoyuDYeXQ6hQ8HJrlkmgy5qpY6m/lIrvbMbR1tBcJsULQD37qdmSoDb9zOQycg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.55.2.tgz#6a35f548a433f324b2d2c6ea82cf7d12ca789f40"
-  integrity sha512-Ie7L+8xXYVPiqGvlaXD4EDjYULF+zKk191OQ7pcSVsTxHCgqFzw3fzbsAnvLkWHwzPpQ3vlpQGgi18i/H18yFA==
+"@glimmer/low-level@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.55.3.tgz#a73d50f92ef6d3ac9aa60a18618788e4fe20d3d7"
+  integrity sha512-rtdHpau9bzIYW1tAxYZkP6p3Ziyen/euj80wmO3lM92Mvwcuj+xqr+IWvRlsMi4npVe+z+kHLdNYLORaJPgtaA==
 
-"@glimmer/node@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.55.2.tgz#ba9aaa9c859062b5c2d54fc142205b0f7e25824f"
-  integrity sha512-R6KdMauN9u7JdtUaCfgfxsiKvJodQ2OaGhKXIbg0mcEBUXv1W3bVtKhnExTf21AeErWZ/gK6f2wnOqVjV0w41w==
+"@glimmer/node@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.55.3.tgz#c685237689d0d4eb46fb20a9a609643a49167242"
+  integrity sha512-dTd3jO6Ys56tyh8Mmg43CCnYJBX9stt3/vC3CHhjZAgKB7Xad17P+wzNp1xVfWhHaCUoW1XFoypY2Y4ARM5iDg==
   dependencies:
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/runtime" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/runtime" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.55.2.tgz#4f69eb97dd173e3a17ae1b075a46447c51c301b4"
-  integrity sha512-K9r+Qt05UU3+dPV/AMxrumimqMlCoHJ4ohd2cSOYShpvin+XHgAooKdhtUE0WzXrsN4c0epCcNSMbif1VE/MUg==
-  dependencies:
-    "@glimmer/encoder" "^0.55.2"
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/program" "^0.55.2"
-    "@glimmer/reference" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
-    "@glimmer/vm" "^0.55.2"
-    "@glimmer/wire-format" "^0.55.2"
-
-"@glimmer/program@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.55.2.tgz#fca9e4070adcfc73cdbe383d08be824218a5974d"
-  integrity sha512-1rKP2BKrNpDemqzy63KfrUL6Dz0mKqC1BEr5QJpvgl3o4/BNwp6qlNxNVkMOj9ExzkmEv8HSgKqY36xTQ5Kptg==
-  dependencies:
-    "@glimmer/encoder" "^0.55.2"
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
-
-"@glimmer/reference@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.55.2.tgz#1f0ee83f36047f35907aa5e8c4b481cd2933fa38"
-  integrity sha512-tUJir3YGtkoGjilhUhYx8s6fO6HuO3LqTqs9dBGYelhZPuQfLzG7NmgSs2TkDXqEDPqNR49wTMHEr95frrfJEw==
+"@glimmer/opcode-compiler@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.55.3.tgz#9f73c2845ff3ee55f1c106e5dc14fe28506c1667"
+  integrity sha512-PSmZQcS4ze33vSErpB//s7L0g+zutqAx7Qlij0VMpl655ae3W45WjEHq4QclBMDJDqMZar6CjrUFDeSCS+S89w==
+  dependencies:
+    "@glimmer/encoder" "^0.55.3"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/program" "^0.55.3"
+    "@glimmer/reference" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
+    "@glimmer/vm" "^0.55.3"
+    "@glimmer/wire-format" "^0.55.3"
+
+"@glimmer/program@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.55.3.tgz#769ac149e03fb0a48e41b72c9f57a7188579337a"
+  integrity sha512-c0fSdtFQVa90k/CnSFPikxGFCIoNDHTSCpAzOb0BoLcfMdPbNqPkmTItci68Nz6Voul4a23MKvdEA/lDGwCPxA==
+  dependencies:
+    "@glimmer/encoder" "^0.55.3"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
+
+"@glimmer/reference@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.55.3.tgz#da716add87a6c0ba4e91510c52aef1e6af60644a"
+  integrity sha512-9nRG3aqApqmVnscbCBFeS8CvnixPDYSRBlj6t2SBCe6YLiqDl7Zu3GuoS0QLZeTov32+kf3anRWQGbZFw+XyEQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
-    "@glimmer/validator" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
+    "@glimmer/validator" "^0.55.3"
 
-"@glimmer/runtime@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.55.2.tgz#bbb4b7c941b39a374d5017a70663060e4a233caf"
-  integrity sha512-HrMhgg3pcKhQOO+Ad347JoofKgP4pqbkkUynFQoYsOf6HrMmDe/2QlCgcc3PU2Ngd39NVzazVPlOlviOHXql0w==
+"@glimmer/runtime@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.55.3.tgz#6d917c74923839cc82205e7376cd685856f67f5e"
+  integrity sha512-RDvPds1dh5EXWKbZlBjwga+8vNqj6bllD69r7GbOWJs9ZbqP5aXk3kKiewYmvrj2S0kDAU9lpLJ2iXhi/ppDEQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/low-level" "^0.55.2"
-    "@glimmer/program" "^0.55.2"
-    "@glimmer/reference" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
-    "@glimmer/validator" "^0.55.2"
-    "@glimmer/vm" "^0.55.2"
-    "@glimmer/wire-format" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/low-level" "^0.55.3"
+    "@glimmer/program" "^0.55.3"
+    "@glimmer/reference" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
+    "@glimmer/validator" "^0.55.3"
+    "@glimmer/vm" "^0.55.3"
+    "@glimmer/wire-format" "^0.55.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.55.2.tgz#5b90f8cc1dc72771aab3ee7e3b00891912451419"
-  integrity sha512-mvVUp2nPePOR9wUXf9iRvGAIccon2iHGyGdU7C5945TE2vPvmcfbUpJNpjA6OFJzTD1qXt4zK2OcUkm6Jm8e5w==
+"@glimmer/syntax@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.55.3.tgz#74054fef17e2d56b363d747e29e1a46cd940ebd2"
+  integrity sha512-D2GnLNG10TSh1dujojPUWnt3bAXgiHT90xZMcd/TX9pt3Mf31cXhGOv0FYzbsF/R5XTQKNmR1am8Gy870bsjng==
   dependencies:
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.55.2.tgz#5921849bfc51219d266c0b71a54fe2cbf8864524"
-  integrity sha512-4BbldC7Hr+nkJ0Fm3iO852kYQ8HC/SuKBVNM3o9EMk2QJkbgoDKBNFSDLO4mc8EPl16hUZHiJeaIw8UyEEQa9w==
+"@glimmer/util@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.55.3.tgz#10b8d19fc3547d1818cc0fa7bc8cb5301ce9ec22"
+  integrity sha512-K9oy5YHilHWFO9NHlUeBPV3jwMlF5n/FulAbyfrylwORyxR0F0Obue8Rdf8BElsG6/mKoFqfhbp53kFOjLhydA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.55.2.tgz#805a60043f9045cb5e6947740435cbc2650bac08"
-  integrity sha512-GvwTpOgkd+dadELT9X6YEbDnhhkSF0XPOww8qc9C9BeFxzEBp/lTBA6Aj/Qq3ucOmyx3cbqIbefdsTFkRc0v2A==
+"@glimmer/validator@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.55.3.tgz#f57a6267819d2f29241a2ea04e2ee677973b47d7"
+  integrity sha512-DeXn8/jCtpwSEmFEwrWgLbighPVqT5IinmLrDUf9+OwBJ4LflN23fD4ZlCAO8mXy/FVDCRjVfgB9rRvJzUnpJw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.55.2.tgz#6d43a3ae14585bb3a45799b1b0722153c3fec4f4"
-  integrity sha512-B0rJ3L9/kOSiohOfuGnMLqH94VNray95Uc7bCyBZ0yfH1NsdKhs74AhPYYFP2Gb5wj4o3jX6fxej26ZTbR4veg==
+"@glimmer/vm@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.55.3.tgz#3fca7e58d1e4f3e43550af40c638ed774168bbb4"
+  integrity sha512-KxPzGoKLKYygQKgjGmJXw3pE3maHtqVznnzpIvu31gEDV6qDxw8bVTFGxWSz2UgpDVMhc4occAkmfir4BuUrCA==
   dependencies:
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
 
-"@glimmer/wire-format@^0.55.2":
-  version "0.55.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.55.2.tgz#548e24255b4c2375f23f4064f1256b57631da1c5"
-  integrity sha512-rdWOsH0K/pS43iFMIvzAbq62ovt2FPMI4Gu9J06tDMwWgOdhzm4ShXwFHGppnH6FbqLoZHJiVlkN9xZPJOvfLA==
+"@glimmer/wire-format@^0.55.3":
+  version "0.55.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.55.3.tgz#f71e73d242e3b8109db6766f49e03855bccb3f0a"
+  integrity sha512-cvWyRTNRtLSOkqwOOU1wJeUPz6BMlUHqkuCanWLT5Sao71DuRNcFBKlwTI6uScvawR9jCos7F3LLmB+gG0NT3w==
   dependencies:
-    "@glimmer/interfaces" "^0.55.2"
-    "@glimmer/util" "^0.55.2"
+    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/util" "^0.55.3"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From f2e8c2d165932b2165a446cc4167aaf0589ab440 Mon Sep 17 00:00:00 2001
From: Rich Glazerman <rglazerman@squareup.com>
Date: Sun, 2 Aug 2020 21:08:12 -0400
Subject: [PATCH 0062/1405] Move computed fix to computed property set

---
 .../glimmer/lib/component-managers/curly.ts   | 29 -------------------
 .../@ember/-internals/metal/lib/computed.ts   | 20 +++++++++++++
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 1d5859fcac5..02834779a79 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,7 +1,5 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import { addObserver, descriptorForProperty, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import { ComputedDescriptor } from '@ember/-internals/metal/lib/decorator';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
@@ -304,33 +302,6 @@ export default class CurlyComponentManager
       }
     }
 
-    // ensure two way binding works when the component has defined a computed
-    // property with both a setter and dependent keys, in that scenario without
-    // the sync observer added below the caller's value will never be updated
-    //
-    // See GH#18417 / GH#19028 for details.
-    let keyName: string, descriptor: ComputedDescriptor;
-    if (environment.isInteractive && capturedArgs.names.length > 0) {
-      for (let i = 0; i < capturedArgs.names.length; i++) {
-        keyName = capturedArgs.names[i];
-        descriptor = descriptorForProperty(component, keyName);
-
-        if (
-          descriptor !== undefined &&
-          descriptor._dependentKeys !== undefined &&
-          descriptor._dependentKeys.length > 0
-        ) {
-          addObserver(
-            component,
-            keyName,
-            component[PROPERTY_DID_CHANGE].bind(component, keyName),
-            undefined,
-            true
-          );
-        }
-      }
-    }
-
     // Track additional lifecycle metadata about this component in a state bucket.
     // Essentially we're saving off all the state we'll need in the future.
     let bucket = new ComponentStateBucket(
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 94298748865..32638662e47 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,4 +1,5 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
+import { addObserver, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { inspect, isEmberArray, toString } from '@ember/-internals/utils';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberError from '@ember/error';
@@ -675,6 +676,25 @@ export class ComputedProperty extends ComputedDescriptor {
     let ret;
 
     try {
+      if (obj instanceof Ember.Component) {
+        // ensure two way binding works when the component has defined a computed
+        // property with both a setter and dependent keys, in that scenario without
+        // the sync observer added below the caller's value will never be updated
+        //
+        // See GH#18417 / GH#19028 for details.
+        let descriptor: ComputedDescriptor;
+        descriptor = descriptorForProperty(obj, keyName);
+        let meta = metaFor(obj);
+        if (
+          meta.isInitializing() &&
+          descriptor !== undefined &&
+          descriptor._dependentKeys !== undefined &&
+          descriptor._dependentKeys.length > 0
+        ) {
+          addObserver(obj, keyName, obj[PROPERTY_DID_CHANGE].bind(obj, keyName), undefined, true);
+        }
+      }
+
       beginPropertyChanges();
 
       ret = this._set(obj, keyName, value);

From dbebd35ecd9eb71219cc22bfb5af19826d27de54 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 3 Aug 2020 11:01:56 -0400
Subject: [PATCH 0063/1405] Refactor computed solution

* Change guard for setting observer up to use `this` instead of
  `descriptorForProperty`
* Check for `obj[PROPERTY_DID_CHANGE]` and `obj.isComponent` instead of
  `instanceof Ember.Component`
* Move observer setup outside of `try`/`finally`
* Use arrow function for observer (instead of `Function.prototype.bind`)
---
 .../@ember/-internals/metal/lib/computed.ts   | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 32638662e47..be977ec50d9 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -673,28 +673,34 @@ export class ComputedProperty extends ComputedDescriptor {
       return this.volatileSet(obj, keyName, value);
     }
 
+    // ensure two way binding works when the component has defined a computed
+    // property with both a setter and dependent keys, in that scenario without
+    // the sync observer added below the caller's value will never be updated
+    //
+    // See GH#18147 / GH#19028 for details.
+    if (
+      this._dependentKeys !== undefined &&
+      this._dependentKeys.length > 0 &&
+      // These two properties are set on Ember.Component
+      typeof obj[PROPERTY_DID_CHANGE] === 'function' &&
+      (obj as any).isComponent &&
+      // ensure that we only run this once, while the component is being instantiated
+      metaFor(obj).isInitializing()
+    ) {
+      addObserver(
+        obj,
+        keyName,
+        () => {
+          obj[PROPERTY_DID_CHANGE](keyName);
+        },
+        undefined,
+        true
+      );
+    }
+
     let ret;
 
     try {
-      if (obj instanceof Ember.Component) {
-        // ensure two way binding works when the component has defined a computed
-        // property with both a setter and dependent keys, in that scenario without
-        // the sync observer added below the caller's value will never be updated
-        //
-        // See GH#18417 / GH#19028 for details.
-        let descriptor: ComputedDescriptor;
-        descriptor = descriptorForProperty(obj, keyName);
-        let meta = metaFor(obj);
-        if (
-          meta.isInitializing() &&
-          descriptor !== undefined &&
-          descriptor._dependentKeys !== undefined &&
-          descriptor._dependentKeys.length > 0
-        ) {
-          addObserver(obj, keyName, obj[PROPERTY_DID_CHANGE].bind(obj, keyName), undefined, true);
-        }
-      }
-
       beginPropertyChanges();
 
       ret = this._set(obj, keyName, value);

From 13ff365e9595071639f8ee6c4c338d11a86c3733 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 Aug 2020 15:22:38 -0400
Subject: [PATCH 0064/1405] Add v3.21.0-beta.4 to CHANGELOG

(cherry picked from commit e2d28a763d0ecae1cce14bae3f9b2b59d22a05c6)
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee14870f290..2c84fef3345 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v3.21.0-beta.4 (August 3, 2020)
+
+- [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in `HistoryLocation`
+- [#19060](https://github.com/emberjs/ember.js/pull/19060) / [#19065](https://github.com/emberjs/ember.js/pull/19065) / [#19072](https://github.com/emberjs/ember.js/pull/19072) [BUGFIX] Update rendering engine to `@glimmer/*` 0.55.3
+- [#19063](https://github.com/emberjs/ember.js/pull/19063) [DOC] Fix missing docs for `{{#in-element}}`
+
 ### v3.21.0-beta.3 (July 27, 2020)
 
 - [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update router.js to ensure transition.abort works for query param only transitions.

From fcaab2c9f16ff1a5c78446e413c61424a9941273 Mon Sep 17 00:00:00 2001
From: Toshbaqa <tashvaqa@gmail.com>
Date: Tue, 4 Aug 2020 12:20:32 -0400
Subject: [PATCH 0065/1405] integration/components/life-cycle: fix
 removeComponent

---
 .../glimmer/tests/integration/components/life-cycle-test.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index f710961adbb..e2a8f84cc1f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -88,7 +88,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
     };
 
     let removeComponent = instance => {
-      let index = this.componentRegistry.indexOf(instance);
+      let index = this.componentRegistry.indexOf(getViewId(instance));
       this.componentRegistry.splice(index, 1);
 
       delete this.components[name];

From 7328532bbea63778fae478722b6a4972372f4ec3 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 5 Aug 2020 15:51:55 -0400
Subject: [PATCH 0066/1405] Add v3.16.10 to CHANGELOG.md

[ci skip]
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c84fef3345..864a17975fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,10 @@
 - [#18694](https://github.com/emberjs/ember.js/pull/18694) [BUGFIX] Ensure tag updates are buffered, remove error message
 - [#18709](https://github.com/emberjs/ember.js/pull/18709) [BUGFIX] Fix `this` in `@tracked` initializer
 
+### v3.16.10 (August 5, 2020)
+
+- [#19028](https://github.com/emberjs/ember.js/pull/19028) [BUGFIX] Ensure setter CP's with dependent keys on curly components can be two way bound
+
 ### v3.16.9 (July 29, 2020)
 
 - [#19001](https://github.com/emberjs/ember.js/pull/19001) [BUGFIX] Invoke methods correctly in `TextSupport` `sendAction`

From 0460716c4ad74338cf67beb5f39827cc3fb089f5 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 5 Aug 2020 16:26:48 -0400
Subject: [PATCH 0067/1405] Add v3.21.0-beta.5 to CHANGELOG

(cherry picked from commit 045bbff5a1a7aa6081bf9b3712647beef5c3a9e5)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 864a17975fd..e64c7709015 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.21.0-beta.5 (August 5, 2020)
+
+- [#19028](https://github.com/emberjs/ember.js/pull/19028) [BUGFIX] Ensure setter CP's with dependent keys on curly components can be two way bound
+
 ### v3.21.0-beta.4 (August 3, 2020)
 
 - [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in `HistoryLocation`

From e69b6f1c5d445a35b026c6f091b23237dcdfb5b2 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 28 Jul 2020 22:03:37 -0700
Subject: [PATCH 0068/1405] [REFACTOR] Simplify get and computeds

This refactor simplifies get and computeds in the following ways:

- Removes several brand checks that were unnecessary from `get`:
  - `isEmberArray`: Ember Arrays that are not native arrays will
    automatically be tracked through proper usage.
  - `isProxy`: This was only necessary for conditionals, and updates in
    the VM allow us to autotrack that instead.
- Uses `tagFor` instead of `tagForProperty` in many places including
  `get`. This allows us to avoid the brand check for
  `CUSTOM_PROPERTY_TAG`, which is really only necessary for chain tags.
- Updates everywhere that looks up tags multiple times on the same
  object to use a shared `tagMeta` so we don't lookup that map multiple
  times.
- Moves computed revision and value caches onto Meta, so we're looking
  up fewer maps.
- Creates a new AutoComputed descriptor for computed properties that
  use autotracking, so we can simplify the get logic for standard CPs.
---
 package.json                                  |  16 +-
 .../-internals/glimmer/lib/environment.ts     |   3 +-
 .../glimmer/lib/helpers/-track-array.ts       |   5 +-
 .../-internals/glimmer/lib/utils/iterator.ts  |  10 +-
 .../-internals/glimmer/lib/utils/to-bool.ts   |   7 +-
 packages/@ember/-internals/meta/lib/meta.ts   |  50 ++++-
 packages/@ember/-internals/metal/index.ts     |   6 +-
 packages/@ember/-internals/metal/lib/alias.ts |  25 +--
 .../-internals/metal/lib/array_events.ts      |   8 +-
 .../@ember/-internals/metal/lib/chain-tags.ts | 127 ++++++------
 .../@ember/-internals/metal/lib/computed.ts   | 189 ++++++++++-------
 .../-internals/metal/lib/computed_cache.ts    |  60 +-----
 .../@ember/-internals/metal/lib/observer.ts   |  32 ++-
 .../-internals/metal/lib/property_get.ts      |  63 +++---
 packages/@ember/-internals/metal/lib/tags.ts  |  22 +-
 .../@ember/-internals/metal/lib/tracked.ts    |   9 +-
 .../-internals/metal/tests/computed_test.js   |  14 +-
 .../-internals/metal/tests/observer_test.js   |   4 +-
 .../metal/tests/tracked/validation_test.js    |  47 -----
 .../-internals/runtime/lib/mixins/-proxy.js   |  19 +-
 .../runtime/lib/mixins/observable.js          |   8 +-
 .../runtime/lib/system/array_proxy.js         |  17 +-
 packages/@ember/object/compat.ts              |   5 +-
 .../lib/computed/reduce_computed_macros.js    |  11 +-
 yarn.lock                                     | 196 +++++++++---------
 25 files changed, 490 insertions(+), 463 deletions(-)

diff --git a/package.json b/package.json
index 1085ee284e5..4c853f473f3 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.55.3",
+    "@glimmer/compiler": "^0.56.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.55.3",
-    "@glimmer/node": "^0.55.3",
-    "@glimmer/opcode-compiler": "^0.55.3",
-    "@glimmer/program": "^0.55.3",
-    "@glimmer/reference": "^0.55.3",
-    "@glimmer/runtime": "^0.55.3",
-    "@glimmer/validator": "^0.55.3",
+    "@glimmer/interfaces": "^0.56.0",
+    "@glimmer/node": "^0.56.0",
+    "@glimmer/opcode-compiler": "^0.56.0",
+    "@glimmer/program": "^0.56.0",
+    "@glimmer/reference": "^0.56.0",
+    "@glimmer/runtime": "^0.56.0",
+    "@glimmer/validator": "^0.56.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 57f2eeb3b8b..d5de72884e3 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import { get, set } from '@ember/-internals/metal';
+import { _getProp, get, set } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
@@ -117,6 +117,7 @@ export class EmberEnvironmentDelegate implements EnvironmentDelegate<EmberEnviro
   public toBool = toBool;
   public toIterator = toIterator;
 
+  public getProp = _getProp;
   public getPath = get;
   public setPath = set;
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index 19886ddb58b..7ddb1338b5d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -2,9 +2,10 @@
 @module ember
 */
 import { tagForProperty } from '@ember/-internals/metal';
+import { isObject } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
 import { VersionedPathReference } from '@glimmer/reference';
-import { combine, createUpdatableTag, Tag, updateTag } from '@glimmer/validator';
+import { combine, CONSTANT_TAG, createUpdatableTag, Tag, updateTag } from '@glimmer/validator';
 
 /**
   This reference is used to get the `[]` tag of iterables, so we can trigger
@@ -22,7 +23,7 @@ class TrackArrayReference implements VersionedPathReference {
   value(): unknown {
     let iterable = this.inner.value();
 
-    let tag = tagForProperty(iterable, '[]');
+    let tag = isObject(iterable) ? tagForProperty(iterable, '[]') : CONSTANT_TAG;
 
     updateTag(this.valueTag, tag);
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 765af517819..1e1f1f3c350 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -1,9 +1,9 @@
-import { objectAt, tagForProperty } from '@ember/-internals/metal';
+import { objectAt } from '@ember/-internals/metal';
 import { _contentFor } from '@ember/-internals/runtime';
 import { EmberArray, HAS_NATIVE_SYMBOL, isEmberArray, isObject } from '@ember/-internals/utils';
 import { Option } from '@glimmer/interfaces';
 import { IteratorDelegate } from '@glimmer/reference';
-import { consumeTag, isTracking } from '@glimmer/validator';
+import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
 import { EachInWrapper } from '../helpers/each-in';
 
 export default function toIterator(iterable: unknown): Option<IteratorDelegate> {
@@ -131,10 +131,10 @@ class ObjectIterator extends BoundedIterator {
         // Add the tag of the returned value if it is an array, since arrays
         // should always cause updates if they are consumed and then changed
         if (isTracking()) {
-          consumeTag(tagForProperty(obj, key));
+          consumeTag(tagFor(obj, key));
 
-          if (Array.isArray(value) || isEmberArray(value)) {
-            consumeTag(tagForProperty(value, '[]'));
+          if (Array.isArray(value)) {
+            consumeTag(tagFor(value, '[]'));
           }
         }
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
index 42c29a424c5..455e3bfeb58 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
@@ -1,11 +1,16 @@
-import { get } from '@ember/-internals/metal';
+import { get, tagForProperty } from '@ember/-internals/metal';
 import { isArray } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
+import { consumeTag } from '@glimmer/validator';
 
 export default function toBool(predicate: unknown): boolean {
   if (isProxy(predicate)) {
+    consumeTag(tagForProperty(predicate as object, 'content'));
+
     return Boolean(get(predicate, 'isTruthy'));
   } else if (isArray(predicate)) {
+    consumeTag(tagForProperty(predicate as object, '[]'));
+
     return (predicate as { length: number }).length !== 0;
   } else {
     return Boolean(predicate);
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index a63dafea1ce..f54e0706f18 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -2,7 +2,7 @@ import { symbol, toString } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { isDestroyed, isDestroying } from '@glimmer/runtime';
-import { UpdatableTag } from '@glimmer/validator';
+import { Revision, UpdatableTag } from '@glimmer/validator';
 
 type ObjMap<T> = { [key: string]: T };
 
@@ -89,7 +89,10 @@ export class Meta {
   _descriptors: Map<string, any> | undefined;
   _mixins: any | undefined;
   _isInit: boolean;
-  _lazyChains: ObjMap<ObjMap<UpdatableTag>> | undefined;
+  _lazyChains: ObjMap<[UpdatableTag, unknown][]> | undefined;
+  _values: ObjMap<unknown> | undefined;
+  _tags: ObjMap<UpdatableTag> | undefined;
+  _revisions: ObjMap<Revision> | undefined;
   source: object;
   proto: object | undefined;
   _parent: Meta | undefined | null;
@@ -100,16 +103,17 @@ export class Meta {
   _flattenedVersion = 0;
 
   // DEBUG
-  _values: any | undefined;
-
   constructor(obj: object) {
     if (DEBUG) {
       counters!.metaInstantiated++;
-      this._values = undefined;
     }
     this._parent = undefined;
     this._descriptors = undefined;
     this._mixins = undefined;
+    this._lazyChains = undefined;
+    this._values = undefined;
+    this._tags = undefined;
+    this._revisions = undefined;
 
     // initial value for all flags right now is false
     // see FLAGS const for detailed list of flags used
@@ -231,21 +235,47 @@ export class Meta {
     return false;
   }
 
-  writableLazyChainsFor(key: string) {
+  valueFor(key: string): unknown {
+    let values = this._values;
+
+    return values !== undefined ? values[key] : undefined;
+  }
+
+  setValueFor(key: string, value: unknown) {
+    let values = this._getOrCreateOwnMap('_values');
+
+    values[key] = value;
+  }
+
+  revisionFor(key: string): Revision | undefined {
+    let revisions = this._revisions;
+
+    return revisions !== undefined ? revisions[key] : undefined;
+  }
+
+  setRevisionFor(key: string, revision: Revision | undefined) {
+    let revisions = this._getOrCreateOwnMap('_revisions');
+
+    revisions[key] = revision;
+  }
+
+  writableLazyChainsFor(key: string): [UpdatableTag, unknown][] {
     if (DEBUG) {
       counters!.writableLazyChainsCalls++;
     }
 
     let lazyChains = this._getOrCreateOwnMap('_lazyChains');
 
-    if (!(key in lazyChains)) {
-      lazyChains[key] = Object.create(null);
+    let chains = lazyChains[key];
+
+    if (chains === undefined) {
+      chains = lazyChains[key] = [];
     }
 
-    return lazyChains[key];
+    return chains;
   }
 
-  readableLazyChainsFor(key: string) {
+  readableLazyChainsFor(key: string): [UpdatableTag, unknown][] | undefined {
     if (DEBUG) {
       counters!.readableLazyChainsCalls++;
     }
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 2db4dd0c322..8791dc829ea 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -1,13 +1,14 @@
 export {
   default as computed,
+  autoComputed,
   isComputed,
   _globalsComputed,
   ComputedProperty,
 } from './lib/computed';
-export { getCacheFor, getCachedValueFor, peekCacheFor } from './lib/computed_cache';
+export { getCachedValueFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
-export { PROXY_CONTENT, _getPath, get, getWithDefault } from './lib/property_get';
+export { PROXY_CONTENT, _getPath, get, getWithDefault, _getProp } from './lib/property_get';
 export { set, trySet } from './lib/property_set';
 export {
   objectAt,
@@ -44,7 +45,6 @@ export {
   isClassicDecorator,
   setClassicDecorator,
 } from './lib/descriptor_map';
-export { getChainTagsForKey } from './lib/chain-tags';
 export { default as libraries, Libraries } from './lib/libraries';
 export { default as getProperties } from './lib/get_properties';
 export { default as setProperties } from './lib/set_properties';
diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index 61cf847721d..823abc96c49 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -1,10 +1,11 @@
-import { Meta } from '@ember/-internals/meta';
+import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import {
-  combine,
   consumeTag,
+  tagFor,
+  tagMetaFor,
   untrack,
   UpdatableTag,
   updateTag,
@@ -12,7 +13,6 @@ import {
   valueForTag,
 } from '@glimmer/validator';
 import { finishLazyChains, getChainTagsForKey } from './chain-tags';
-import { getLastRevisionFor, setLastRevisionFor } from './computed_cache';
 import {
   ComputedDescriptor,
   Decorator,
@@ -23,7 +23,6 @@ import { descriptorForDecorator } from './descriptor_map';
 import { defineProperty } from './properties';
 import { get } from './property_get';
 import { set } from './property_set';
-import { tagForProperty } from './tags';
 
 export type AliasDecorator = Decorator & PropertyDecorator & AliasDecoratorImpl;
 
@@ -73,14 +72,12 @@ export class AliasedProperty extends ComputedDescriptor {
     super.setup(obj, keyName, propertyDesc, meta);
   }
 
-  teardown(obj: object, keyName: string, meta: Meta): void {
-    super.teardown(obj, keyName, meta);
-  }
-
   get(obj: object, keyName: string): any {
     let ret: any;
 
-    let propertyTag = tagForProperty(obj, keyName) as UpdatableTag;
+    let meta = metaFor(obj);
+    let tagMeta = tagMetaFor(obj);
+    let propertyTag = tagFor(obj, keyName, tagMeta) as UpdatableTag;
 
     // We don't use the tag since CPs are not automatic, we just want to avoid
     // anything tracking while we get the altKey
@@ -88,12 +85,12 @@ export class AliasedProperty extends ComputedDescriptor {
       ret = get(obj, this.altKey);
     });
 
-    let lastRevision = getLastRevisionFor(obj, keyName);
+    let lastRevision = meta.revisionFor(keyName);
 
-    if (!validateTag(propertyTag, lastRevision)) {
-      updateTag(propertyTag, combine(getChainTagsForKey(obj, this.altKey, true)));
-      setLastRevisionFor(obj, keyName, valueForTag(propertyTag));
-      finishLazyChains(obj, keyName, ret);
+    if (lastRevision === undefined || !validateTag(propertyTag, lastRevision)) {
+      updateTag(propertyTag, getChainTagsForKey(obj, this.altKey, tagMeta, meta));
+      meta.setRevisionFor(keyName, valueForTag(propertyTag));
+      finishLazyChains(meta, keyName, ret);
     }
 
     consumeTag(propertyTag);
diff --git a/packages/@ember/-internals/metal/lib/array_events.ts b/packages/@ember/-internals/metal/lib/array_events.ts
index f898b76c9bf..ee7c73285c5 100644
--- a/packages/@ember/-internals/metal/lib/array_events.ts
+++ b/packages/@ember/-internals/metal/lib/array_events.ts
@@ -1,5 +1,4 @@
 import { peekMeta } from '@ember/-internals/meta';
-import { peekCacheFor } from './computed_cache';
 import { sendEvent } from './events';
 import { notifyPropertyChange } from './property_events';
 
@@ -61,8 +60,7 @@ export function arrayContentDidChange<T extends { length: number }>(
 
   sendEvent(array, '@array:change', [array, startIdx, removeAmt, addAmt]);
 
-  let cache = peekCacheFor(array);
-  if (cache !== undefined) {
+  if (meta !== null) {
     let length = array.length;
     let addedAmount = addAmt === -1 ? 0 : addAmt;
     let removedAmount = removeAmt === -1 ? 0 : removeAmt;
@@ -70,11 +68,11 @@ export function arrayContentDidChange<T extends { length: number }>(
     let previousLength = length - delta;
 
     let normalStartIdx = startIdx < 0 ? previousLength + startIdx : startIdx;
-    if (cache.has('firstObject') && normalStartIdx === 0) {
+    if (meta.revisionFor('firstObject') !== undefined && normalStartIdx === 0) {
       notifyPropertyChange(array, 'firstObject', meta);
     }
 
-    if (cache.has('lastObject')) {
+    if (meta.revisionFor('lastObject') !== undefined) {
       let previousLastIndex = previousLength - 1;
       let lastAffectedIndex = normalStartIdx + removedAmount;
       if (previousLastIndex < lastAffectedIndex) {
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index de6b769a2e1..6666495a256 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,4 +1,5 @@
-import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import { isObject } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -6,52 +7,65 @@ import {
   combine,
   createUpdatableTag,
   Tag,
+  TagMeta,
+  tagMetaFor,
   updateTag,
   validateTag,
 } from '@glimmer/validator';
 import { objectAt } from './array';
-import { getLastRevisionFor, peekCacheFor } from './computed_cache';
-import { descriptorForProperty } from './descriptor_map';
 import { tagForProperty } from './tags';
 
-export function finishLazyChains(obj: any, key: string, value: any) {
-  let meta = peekMeta(obj);
-  let lazyTags = meta !== null ? meta.readableLazyChainsFor(key) : undefined;
+export function finishLazyChains(meta: Meta, key: string, value: any) {
+  let lazyTags = meta.readableLazyChainsFor(key);
 
   if (lazyTags === undefined) {
     return;
   }
 
-  if (value === null || (typeof value !== 'object' && typeof value !== 'function')) {
-    for (let path in lazyTags) {
-      delete lazyTags[path];
+  if (isObject(value)) {
+    for (let i = 0; i < lazyTags.length; i++) {
+      let [tag, deps] = lazyTags[i];
+      updateTag(tag, getChainTagsForKey(value, deps as string, tagMetaFor(value), peekMeta(value)));
     }
-    return;
   }
 
-  for (let path in lazyTags) {
-    let tag = lazyTags[path];
-
-    updateTag(tag, combine(getChainTagsForKey(value, path)));
-
-    delete lazyTags[path];
-  }
+  lazyTags.length = 0;
 }
 
-export function getChainTagsForKeys(obj: any, keys: string[], addMandatorySetter = false) {
-  let chainTags: Tag[] = [];
+export function getChainTagsForKeys(
+  obj: object,
+  keys: string[],
+  tagMeta: TagMeta,
+  meta: Meta | null
+): Tag {
+  let tags: Tag[] = [];
 
   for (let i = 0; i < keys.length; i++) {
-    chainTags.push(...getChainTagsForKey(obj, keys[i], addMandatorySetter));
+    getChainTags(tags, obj, keys[i], tagMeta, meta);
   }
 
-  return chainTags;
+  return combine(tags);
 }
 
-export function getChainTagsForKey(obj: any, path: string, addMandatorySetter = false) {
-  let chainTags: Tag[] = [];
+export function getChainTagsForKey(
+  obj: object,
+  key: string,
+  tagMeta: TagMeta,
+  meta: Meta | null
+): Tag {
+  return combine(getChainTags([], obj, key, tagMeta, meta));
+}
 
+function getChainTags(
+  chainTags: Tag[],
+  obj: object,
+  path: string,
+  tagMeta: TagMeta,
+  meta: Meta | null
+) {
   let current: any = obj;
+  let currentTagMeta = tagMeta;
+  let currentMeta = meta;
 
   let pathLength = path.length;
   let segmentEnd = -1;
@@ -60,13 +74,6 @@ export function getChainTagsForKey(obj: any, path: string, addMandatorySetter =
 
   // eslint-disable-next-line no-constant-condition
   while (true) {
-    let currentType = typeof current;
-
-    if (current === null || (currentType !== 'object' && currentType !== 'function')) {
-      // we've hit the end of the chain for now, break out
-      break;
-    }
-
     let lastSegmentEnd = segmentEnd + 1;
     segmentEnd = path.indexOf('.', lastSegmentEnd);
 
@@ -137,42 +144,32 @@ export function getChainTagsForKey(obj: any, path: string, addMandatorySetter =
             typeof item === 'object'
           );
 
-          chainTags.push(tagForProperty(item, segment, addMandatorySetter));
+          chainTags.push(tagForProperty(item, segment, true));
         }
       }
 
       // Push the tag for the array length itself
-      chainTags.push(tagForProperty(current, '[]', addMandatorySetter));
+      chainTags.push(tagForProperty(current, '[]', true, currentTagMeta));
 
       break;
     }
 
-    // TODO: Assert that current[segment] isn't an undecorated, non-MANDATORY_SETTER/dependentKeyCompat getter
-
-    let propertyTag = tagForProperty(current, segment, addMandatorySetter);
-    descriptor = descriptorForProperty(current, segment);
+    let propertyTag = tagForProperty(current, segment, true, currentTagMeta);
+    descriptor = currentMeta !== null ? currentMeta.peekDescriptors(segment) : undefined;
 
     chainTags.push(propertyTag);
 
-    // If the key was an alias, we should always get the next value in order to
-    // bootstrap the alias. This is because aliases, unlike other CPs, should
-    // always be in sync with the aliased value.
-    if (descriptor !== undefined && typeof descriptor.altKey === 'string') {
-      current = current[segment];
-
-      // We still need to break if we're at the end of the path.
-      if (segmentEnd === pathLength) {
-        break;
-      }
-
-      // Otherwise, continue to process the next segment
-      continue;
-    }
-
     // If we're at the end of the path, processing the last segment, and it's
     // not an alias, we should _not_ get the last value, since we already have
     // its tag. There's no reason to access it and do more work.
     if (segmentEnd === pathLength) {
+      // If the key was an alias, we should always get the next value in order to
+      // bootstrap the alias. This is because aliases, unlike other CPs, should
+      // always be in sync with the aliased value.
+      if (descriptor !== undefined && typeof descriptor.altKey === 'string') {
+        // tslint:disable-next-line: no-unused-expression
+        current[segment];
+      }
       break;
     }
 
@@ -185,32 +182,40 @@ export function getChainTagsForKey(obj: any, path: string, addMandatorySetter =
       } else {
         current = current[segment];
       }
+    } else if (typeof descriptor.altKey === 'string') {
+      current = current[segment];
     } else {
       // If the descriptor is defined, then its a normal CP (not an alias, which
       // would have been handled earlier). We get the last revision to check if
       // the CP is still valid, and if so we use the cached value. If not, then
       // we create a lazy chain lookup, and the next time the CP is calculated,
       // it will update that lazy chain.
-      let lastRevision = getLastRevisionFor(current, segment);
+      let instanceMeta = currentMeta!.source === current ? currentMeta! : metaFor(current);
+      let lastRevision = instanceMeta.revisionFor(segment);
 
-      if (validateTag(propertyTag, lastRevision)) {
-        current = peekCacheFor(current).get(segment);
+      if (lastRevision !== undefined && validateTag(propertyTag, lastRevision)) {
+        current = instanceMeta.valueFor(segment);
       } else {
-        let lazyChains = metaFor(current).writableLazyChainsFor(segment);
-
+        // use metaFor here to ensure we have the meta for the instance
+        let lazyChains = instanceMeta.writableLazyChainsFor(segment);
         let rest = path.substr(segmentEnd + 1);
 
-        let placeholderTag = lazyChains[rest];
-
-        if (placeholderTag === undefined) {
-          placeholderTag = lazyChains[rest] = createUpdatableTag();
-        }
+        let placeholderTag = createUpdatableTag();
 
+        lazyChains.push([placeholderTag, rest]);
         chainTags.push(placeholderTag);
 
         break;
       }
     }
+
+    if (!isObject(current)) {
+      // we've hit the end of the chain for now, break out
+      break;
+    }
+
+    currentTagMeta = tagMetaFor(current);
+    currentMeta = peekMeta(current);
   }
 
   if (DEBUG) {
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 205e84fd0e0..b2f872e6419 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,13 +1,12 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
-import { addObserver, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import { inspect, isEmberArray, toString } from '@ember/-internals/utils';
+import { inspect, symbol, toString } from '@ember/-internals/utils';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberError from '@ember/error';
 import { isDestroyed } from '@glimmer/runtime';
 import {
-  combine,
   consumeTag,
-  Tag,
+  tagFor,
+  tagMetaFor,
   track,
   untrack,
   UpdatableTag,
@@ -16,13 +15,6 @@ import {
   valueForTag,
 } from '@glimmer/validator';
 import { finishLazyChains, getChainTagsForKeys } from './chain-tags';
-import {
-  getCachedValueFor,
-  getCacheFor,
-  getLastRevisionFor,
-  peekCacheFor,
-  setLastRevisionFor,
-} from './computed_cache';
 import {
   ComputedDescriptor,
   Decorator,
@@ -36,11 +28,17 @@ import {
   isClassicDecorator,
 } from './descriptor_map';
 import expandProperties from './expand_properties';
-import { setObserverSuspended } from './observer';
+import { addObserver, setObserverSuspended } from './observer';
 import { defineProperty } from './properties';
-import { beginPropertyChanges, endPropertyChanges, notifyPropertyChange } from './property_events';
+import {
+  beginPropertyChanges,
+  endPropertyChanges,
+  notifyPropertyChange,
+  PROPERTY_DID_CHANGE,
+} from './property_events';
 import { set } from './property_set';
-import { tagForProperty } from './tags';
+
+export const AUTO = symbol('COMPUTED_AUTO');
 
 export type ComputedPropertyGetter = (keyName: string) => any;
 export type ComputedPropertySetter = (keyName: string, value: any, cachedValue?: any) => any;
@@ -255,13 +253,12 @@ function noop(): void {}
   @public
 */
 export class ComputedProperty extends ComputedDescriptor {
-  private _volatile = false;
-  private _readOnly = false;
-  private _hasConfig = false;
+  protected _volatile = false;
+  protected _readOnly = false;
+  protected _hasConfig = false;
 
   _getter?: ComputedPropertyGetter = undefined;
   _setter?: ComputedPropertySetter = undefined;
-  _auto?: boolean;
 
   constructor(args: Array<string | ComputedPropertyConfig>) {
     super();
@@ -604,13 +601,17 @@ export class ComputedProperty extends ComputedDescriptor {
       return this._getter!.call(obj, keyName);
     }
 
-    let cache = getCacheFor(obj);
-    let propertyTag = tagForProperty(obj, keyName) as UpdatableTag;
+    let meta = metaFor(obj);
+    let tagMeta = tagMetaFor(obj);
+
+    let propertyTag = tagFor(obj, keyName, tagMeta) as UpdatableTag;
 
     let ret;
 
-    if (cache.has(keyName) && validateTag(propertyTag, getLastRevisionFor(obj, keyName))) {
-      ret = cache.get(keyName);
+    let revision = meta.revisionFor(keyName);
+
+    if (revision !== undefined && validateTag(propertyTag, revision)) {
+      ret = meta.valueFor(keyName);
     } else {
       // For backwards compatibility, we only throw if the CP has any dependencies. CPs without dependencies
       // should be allowed, even after the object has been destroyed, which is why we check _dependentKeys.
@@ -619,42 +620,29 @@ export class ComputedProperty extends ComputedDescriptor {
         this._dependentKeys === undefined || !isDestroyed(obj)
       );
 
-      let upstreamTag: Tag | undefined = undefined;
-
-      if (this._auto === true) {
-        upstreamTag = track(() => {
-          ret = this._getter!.call(obj, keyName);
-        });
-      } else {
-        // Create a tracker that absorbs any trackable actions inside the CP
-        untrack(() => {
-          ret = this._getter!.call(obj, keyName);
-        });
-      }
+      let { _getter, _dependentKeys } = this;
 
-      if (this._dependentKeys !== undefined) {
-        let tag = combine(getChainTagsForKeys(obj, this._dependentKeys, true));
-
-        upstreamTag = upstreamTag === undefined ? tag : combine([upstreamTag, tag]);
-      }
+      // Create a tracker that absorbs any trackable actions inside the CP
+      untrack(() => {
+        ret = _getter!.call(obj, keyName);
+      });
 
-      if (upstreamTag !== undefined) {
-        updateTag(propertyTag!, upstreamTag);
+      if (_dependentKeys !== undefined) {
+        updateTag(propertyTag!, getChainTagsForKeys(obj, _dependentKeys, tagMeta, meta));
       }
 
-      setLastRevisionFor(obj, keyName, valueForTag(propertyTag));
+      meta.setValueFor(keyName, ret);
+      meta.setRevisionFor(keyName, valueForTag(propertyTag));
 
-      cache.set(keyName, ret);
-
-      finishLazyChains(obj, keyName, ret);
+      finishLazyChains(meta, keyName, ret);
     }
 
     consumeTag(propertyTag!);
 
     // Add the tag of the returned value if it is an array, since arrays
     // should always cause updates if they are consumed and then changed
-    if (Array.isArray(ret) || isEmberArray(ret)) {
-      consumeTag(tagForProperty(ret, '[]'));
+    if (Array.isArray(ret)) {
+      consumeTag(tagFor(ret, '[]'));
     }
 
     return ret;
@@ -673,19 +661,21 @@ export class ComputedProperty extends ComputedDescriptor {
       return this.volatileSet(obj, keyName, value);
     }
 
+    let meta = metaFor(obj);
+
     // ensure two way binding works when the component has defined a computed
     // property with both a setter and dependent keys, in that scenario without
     // the sync observer added below the caller's value will never be updated
     //
     // See GH#18147 / GH#19028 for details.
     if (
+      // ensure that we only run this once, while the component is being instantiated
+      meta.isInitializing() &&
       this._dependentKeys !== undefined &&
       this._dependentKeys.length > 0 &&
       // These two properties are set on Ember.Component
       typeof obj[PROPERTY_DID_CHANGE] === 'function' &&
-      (obj as any).isComponent &&
-      // ensure that we only run this once, while the component is being instantiated
-      metaFor(obj).isInitializing()
+      (obj as any).isComponent
     ) {
       addObserver(
         obj,
@@ -703,17 +693,20 @@ export class ComputedProperty extends ComputedDescriptor {
     try {
       beginPropertyChanges();
 
-      ret = this._set(obj, keyName, value);
+      ret = this._set(obj, keyName, value, meta);
 
-      finishLazyChains(obj, keyName, ret);
+      finishLazyChains(meta, keyName, ret);
 
-      let propertyTag = tagForProperty(obj, keyName) as UpdatableTag;
+      let tagMeta = tagMetaFor(obj);
+      let propertyTag = tagFor(obj, keyName, tagMeta) as UpdatableTag;
 
-      if (this._dependentKeys !== undefined) {
-        updateTag(propertyTag, combine(getChainTagsForKeys(obj, this._dependentKeys, true)));
+      let { _dependentKeys } = this;
+
+      if (_dependentKeys !== undefined) {
+        updateTag(propertyTag, getChainTagsForKeys(obj, _dependentKeys, tagMeta, meta));
       }
 
-      setLastRevisionFor(obj, keyName, valueForTag(propertyTag));
+      meta.setRevisionFor(keyName, valueForTag(propertyTag));
     } finally {
       endPropertyChanges();
     }
@@ -738,7 +731,7 @@ export class ComputedProperty extends ComputedDescriptor {
       }
     );
 
-    let cachedValue = getCachedValueFor(obj, keyName);
+    let cachedValue = metaFor(obj).valueFor(keyName);
     defineProperty(obj, keyName, null, cachedValue);
     set(obj, keyName, value);
     return value;
@@ -748,17 +741,17 @@ export class ComputedProperty extends ComputedDescriptor {
     return this._setter!.call(obj, keyName, value);
   }
 
-  _set(obj: object, keyName: string, value: unknown): any {
-    let cache = getCacheFor(obj);
-    let hadCachedValue = cache.has(keyName);
-    let cachedValue = cache.get(keyName);
+  _set(obj: object, keyName: string, value: unknown, meta: Meta): any {
+    let hadCachedValue = meta.revisionFor(keyName) !== undefined;
+    let cachedValue = meta.valueFor(keyName);
 
     let ret;
+    let { _setter } = this;
 
     setObserverSuspended(obj, keyName, true);
 
     try {
-      ret = this._setter!.call(obj, keyName, value, cachedValue);
+      ret = _setter!.call(obj, keyName, value, cachedValue);
     } finally {
       setObserverSuspended(obj, keyName, false);
     }
@@ -768,9 +761,7 @@ export class ComputedProperty extends ComputedDescriptor {
       return ret;
     }
 
-    let meta = metaFor(obj);
-
-    cache.set(keyName, ret);
+    meta.setValueFor(keyName, ret);
 
     notifyPropertyChange(obj, keyName, meta, value);
 
@@ -778,18 +769,65 @@ export class ComputedProperty extends ComputedDescriptor {
   }
 
   /* called before property is overridden */
-  teardown(obj: object, keyName: string, meta?: any): void {
+  teardown(obj: object, keyName: string, meta: Meta): void {
     if (!this._volatile) {
-      let cache = peekCacheFor(obj);
-      if (cache !== undefined) {
-        cache.delete(keyName);
+      if (meta.revisionFor(keyName) !== undefined) {
+        meta.setRevisionFor(keyName, undefined);
+        meta.setValueFor(keyName, undefined);
       }
     }
+
     super.teardown(obj, keyName, meta);
   }
+}
+
+class AutoComputedProperty extends ComputedProperty {
+  get(obj: object, keyName: string): any {
+    if (this._volatile) {
+      return this._getter!.call(obj, keyName);
+    }
+
+    let meta = metaFor(obj);
+    let tagMeta = tagMetaFor(obj);
 
-  auto() {
-    this._auto = true;
+    let propertyTag = tagFor(obj, keyName, tagMeta) as UpdatableTag;
+
+    let ret;
+
+    let revision = meta.revisionFor(keyName);
+
+    if (revision !== undefined && validateTag(propertyTag, revision)) {
+      ret = meta.valueFor(keyName);
+    } else {
+      assert(
+        `Attempted to access the computed ${obj}.${keyName} on a destroyed object, which is not allowed`,
+        !isDestroyed(obj)
+      );
+
+      let { _getter } = this;
+
+      // Create a tracker that absorbs any trackable actions inside the CP
+      let tag = track(() => {
+        ret = _getter!.call(obj, keyName);
+      });
+
+      updateTag(propertyTag!, tag);
+
+      meta.setValueFor(keyName, ret);
+      meta.setRevisionFor(keyName, valueForTag(propertyTag));
+
+      finishLazyChains(meta, keyName, ret);
+    }
+
+    consumeTag(propertyTag!);
+
+    // Add the tag of the returned value if it is an array, since arrays
+    // should always cause updates if they are consumed and then changed
+    if (Array.isArray(ret)) {
+      consumeTag(tagFor(ret, '[]', tagMeta));
+    }
+
+    return ret;
   }
 }
 
@@ -1011,6 +1049,15 @@ export function computed(
   ) as ComputedDecorator;
 }
 
+export function autoComputed(
+  ...config: [ComputedPropertyConfig]
+): ComputedDecorator | DecoratorPropertyDescriptor {
+  return makeComputedDecorator(
+    new AutoComputedProperty(config),
+    ComputedDecoratorImpl
+  ) as ComputedDecorator;
+}
+
 /**
   Allows checking if a given property on an object is a computed property. For the most part,
   this doesn't matter (you would normally just access the property directly and use its value),
diff --git a/packages/@ember/-internals/metal/lib/computed_cache.ts b/packages/@ember/-internals/metal/lib/computed_cache.ts
index f038db4ce87..32d433f7ded 100644
--- a/packages/@ember/-internals/metal/lib/computed_cache.ts
+++ b/packages/@ember/-internals/metal/lib/computed_cache.ts
@@ -1,59 +1,9 @@
-const COMPUTED_PROPERTY_CACHED_VALUES = new WeakMap<object, Map<string, any | null | undefined>>();
-const COMPUTED_PROPERTY_LAST_REVISION = new WeakMap<object, Map<string, number>>();
+import { peekMeta } from '@ember/-internals/meta';
 
-export function getCacheFor(obj: object): Map<string, any> {
-  let cache = COMPUTED_PROPERTY_CACHED_VALUES.get(obj);
-  if (cache === undefined) {
-    cache = new Map<string, any>();
+export function getCachedValueFor(obj: object, key: string) {
+  let meta = peekMeta(obj);
 
-    COMPUTED_PROPERTY_CACHED_VALUES.set(obj, cache);
+  if (meta) {
+    return meta.valueFor(key);
   }
-  return cache;
-}
-
-/**
-  Returns the cached value for a property, if one exists.
-  This can be useful for peeking at the value of a computed
-  property that is generated lazily, without accidentally causing
-  it to be created.
-
-  @method cacheFor
-  @static
-  @for @ember/object/internals
-  @param {Object} obj the object whose property you want to check
-  @param {String} key the name of the property whose cached value you want
-    to return
-  @return {Object} the cached value
-  @public
-*/
-export function getCachedValueFor(obj: object, key: string): any {
-  let cache = COMPUTED_PROPERTY_CACHED_VALUES.get(obj);
-  if (cache !== undefined) {
-    return cache.get(key);
-  }
-}
-
-export function setLastRevisionFor(obj: object, key: string, revision: number): void {
-  let cache = COMPUTED_PROPERTY_LAST_REVISION!.get(obj);
-
-  if (cache === undefined) {
-    cache = new Map<string, any>();
-    COMPUTED_PROPERTY_LAST_REVISION!.set(obj, cache);
-  }
-
-  cache!.set(key, revision);
-}
-
-export function getLastRevisionFor(obj: object, key: string): number {
-  let cache = COMPUTED_PROPERTY_LAST_REVISION!.get(obj);
-  if (cache === undefined) {
-    return 0;
-  } else {
-    let revision = cache.get(key);
-    return revision === undefined ? 0 : revision;
-  }
-}
-
-export function peekCacheFor(obj: object): any {
-  return COMPUTED_PROPERTY_CACHED_VALUES.get(obj);
 }
diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts
index 4d49087d507..e4b32bab5c2 100644
--- a/packages/@ember/-internals/metal/lib/observer.ts
+++ b/packages/@ember/-internals/metal/lib/observer.ts
@@ -2,7 +2,7 @@ import { ENV } from '@ember/-internals/environment';
 import { peekMeta } from '@ember/-internals/meta';
 import { schedule } from '@ember/runloop';
 import { registerDestructor } from '@glimmer/runtime';
-import { combine, CURRENT_TAG, Tag, validateTag, valueForTag } from '@glimmer/validator';
+import { CURRENT_TAG, Tag, tagMetaFor, validateTag, valueForTag } from '@glimmer/validator';
 import { getChainTagsForKey } from './chain-tags';
 import changeEvent from './change_event';
 import { addListener, removeListener, sendEvent } from './events';
@@ -97,7 +97,7 @@ export function activateObserver(target: object, eventName: string, sync = false
     activeObservers.get(eventName)!.count++;
   } else {
     let [path] = eventName.split(':');
-    let tag = combine(getChainTagsForKey(target, path, true));
+    let tag = getChainTagsForKey(target, path, tagMetaFor(target), peekMeta(target));
 
     activeObservers.set(eventName, {
       count: 1,
@@ -161,14 +161,24 @@ export function resumeObserverDeactivation() {
 export function revalidateObservers(target: object) {
   if (ASYNC_OBSERVERS.has(target)) {
     ASYNC_OBSERVERS.get(target)!.forEach(observer => {
-      observer.tag = combine(getChainTagsForKey(target, observer.path, true));
+      observer.tag = getChainTagsForKey(
+        target,
+        observer.path,
+        tagMetaFor(target),
+        peekMeta(target)
+      );
       observer.lastRevision = valueForTag(observer.tag);
     });
   }
 
   if (SYNC_OBSERVERS.has(target)) {
     SYNC_OBSERVERS.get(target)!.forEach(observer => {
-      observer.tag = combine(getChainTagsForKey(target, observer.path, true));
+      observer.tag = getChainTagsForKey(
+        target,
+        observer.path,
+        tagMetaFor(target),
+        peekMeta(target)
+      );
       observer.lastRevision = valueForTag(observer.tag);
     });
   }
@@ -192,7 +202,12 @@ export function flushAsyncObservers(shouldSchedule = true) {
           try {
             sendEvent(target, eventName, [target, observer.path], undefined, meta);
           } finally {
-            observer.tag = combine(getChainTagsForKey(target, observer.path, true));
+            observer.tag = getChainTagsForKey(
+              target,
+              observer.path,
+              tagMetaFor(target),
+              peekMeta(target)
+            );
             observer.lastRevision = valueForTag(observer.tag);
           }
         };
@@ -221,7 +236,12 @@ export function flushSyncObservers() {
           observer.suspended = true;
           sendEvent(target, eventName, [target, observer.path], undefined, meta);
         } finally {
-          observer.tag = combine(getChainTagsForKey(target, observer.path, true));
+          observer.tag = getChainTagsForKey(
+            target,
+            observer.path,
+            tagMetaFor(target),
+            peekMeta(target)
+          );
           observer.lastRevision = valueForTag(observer.tag);
           observer.suspended = false;
         }
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 4f891b6c3c2..08a7b090133 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -1,16 +1,17 @@
 /**
 @module @ember/object
 */
-import { HAS_NATIVE_PROXY, isEmberArray, isProxy, symbol } from '@ember/-internals/utils';
+import { HAS_NATIVE_PROXY, setProxy, symbol } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
   consumeTag,
   deprecateMutationsInAutotrackingTransaction,
   isTracking,
+  tagFor,
+  track,
 } from '@glimmer/validator';
 import { isPath } from './path_cache';
-import { tagForProperty } from './tags';
 
 export const PROXY_CONTENT = symbol('PROXY_CONTENT');
 
@@ -92,17 +93,17 @@ export function get(obj: object, keyName: string): any {
     typeof keyName !== 'string' || keyName.lastIndexOf('this.', 0) !== 0
   );
 
+  return isPath(keyName) ? _getPath(obj, keyName) : _getProp(obj, keyName);
+}
+
+export function _getProp(obj: object, keyName: string) {
   let type = typeof obj;
 
   let isObject = type === 'object';
   let isFunction = type === 'function';
   let isObjectLike = isObject || isFunction;
 
-  if (isPath(keyName)) {
-    return isObjectLike ? _getPath(obj, keyName) : undefined;
-  }
-
-  let value: any;
+  let value: unknown;
 
   if (isObjectLike) {
     if (DEBUG && HAS_NATIVE_PROXY) {
@@ -110,12 +111,9 @@ export function get(obj: object, keyName: string): any {
     } else {
       value = obj[keyName];
     }
-  } else {
-    value = obj[keyName];
-  }
 
-  if (value === undefined) {
     if (
+      value === undefined &&
       isObject &&
       !(keyName in obj) &&
       typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
@@ -128,22 +126,18 @@ export function get(obj: object, keyName: string): any {
         value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
       }
     }
-  }
 
-  if (isObjectLike && isTracking()) {
-    consumeTag(tagForProperty(obj, keyName));
+    if (isTracking()) {
+      consumeTag(tagFor(obj, keyName));
 
-    // Add the tag of the returned value if it is an array, since arrays
-    // should always cause updates if they are consumed and then changed
-    if (Array.isArray(value) || isEmberArray(value)) {
-      consumeTag(tagForProperty(value, '[]'));
-    }
-
-    // Add the value of the content if the value is a proxy. This is because
-    // content changes the truthiness/falsiness of the proxy.
-    if (isProxy(value)) {
-      consumeTag(tagForProperty(value, 'content'));
+      if (Array.isArray(value)) {
+        // Add the tag of the returned value if it is an array, since arrays
+        // should always cause updates if they are consumed and then changed
+        consumeTag(tagFor(value, '[]'));
+      }
     }
+  } else {
+    value = obj[keyName];
   }
 
   return value;
@@ -158,7 +152,7 @@ export function _getPath<T extends object>(root: T, path: string | string[]): an
       return undefined;
     }
 
-    obj = get(obj, parts[i]);
+    obj = _getProp(obj, parts[i]);
   }
 
   return obj;
@@ -207,3 +201,22 @@ export function getWithDefault<T extends object, K extends Extract<keyof T, stri
 }
 
 export default get;
+
+// Warm it up
+_getProp('foo' as any, 'a');
+_getProp('foo' as any, 1 as any);
+_getProp({}, 'a');
+_getProp({}, 1 as any);
+_getProp({ unkonwnProperty() {} }, 'a');
+_getProp({ unkonwnProperty() {} }, 1 as any);
+
+get({}, 'foo');
+get({}, 'foo.bar');
+
+let fakeProxy = {};
+setProxy(fakeProxy);
+
+track(() => _getProp({}, 'a'));
+track(() => _getProp({}, 1 as any));
+track(() => _getProp({ a: [] }, 'a'));
+track(() => _getProp({ a: fakeProxy }, 'a'));
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
index 5cd76e5746f..d19d39087c6 100644
--- a/packages/@ember/-internals/metal/lib/tags.ts
+++ b/packages/@ember/-internals/metal/lib/tags.ts
@@ -2,7 +2,7 @@ import { isObject, setupMandatorySetter, symbol, toString } from '@ember/-intern
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { isDestroyed } from '@glimmer/runtime';
-import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor } from '@glimmer/validator';
+import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor, TagMeta } from '@glimmer/validator';
 
 /////////
 
@@ -12,27 +12,19 @@ export const CUSTOM_TAG_FOR = symbol('CUSTOM_TAG_FOR');
 export const SELF_TAG: string = symbol('SELF_TAG');
 
 export function tagForProperty(
-  obj: unknown,
+  obj: object,
   propertyKey: string | symbol,
-  addMandatorySetter = false
+  addMandatorySetter = false,
+  meta?: TagMeta
 ): Tag {
-  if (!isObject(obj)) {
-    return CONSTANT_TAG;
-  }
-
   if (typeof obj[CUSTOM_TAG_FOR] === 'function') {
     return obj[CUSTOM_TAG_FOR](propertyKey, addMandatorySetter);
   }
 
-  let tag = tagFor(obj, propertyKey);
-
-  if (DEBUG) {
-    if (addMandatorySetter) {
-      setupMandatorySetter!(tag, obj, propertyKey);
-    }
+  let tag = tagFor(obj, propertyKey, meta);
 
-    // TODO: Replace this with something more first class for tracking tags in DEBUG
-    (tag as any)._propertyKey = propertyKey;
+  if (DEBUG && addMandatorySetter) {
+    setupMandatorySetter!(tag, obj, propertyKey);
   }
 
   return tag;
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 8f415805486..ad90cb75969 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -1,10 +1,9 @@
-import { isEmberArray } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { consumeTag, dirtyTagFor, trackedData } from '@glimmer/validator';
+import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
 import { Decorator, DecoratorPropertyDescriptor, isElementDescriptor } from './decorator';
 import { setClassicDecorator } from './descriptor_map';
-import { SELF_TAG, tagForProperty } from './tags';
+import { SELF_TAG } from './tags';
 
 /**
   @decorator
@@ -159,8 +158,8 @@ function descriptorForField([_target, key, desc]: [
 
       // Add the tag of the returned value if it is an array, since arrays
       // should always cause updates if they are consumed and then changed
-      if (Array.isArray(value) || isEmberArray(value)) {
-        consumeTag(tagForProperty(value, '[]'));
+      if (Array.isArray(value)) {
+        consumeTag(tagFor(value, '[]'));
       }
 
       return value;
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 2e64aa8c56d..0cd5d6a55fd 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -1,8 +1,8 @@
 import { Object as EmberObject } from '@ember/-internals/runtime';
+import { meta as metaFor } from '@ember/-internals/meta';
 import {
   computed,
   defineProperty,
-  getCachedValueFor,
   isClassicDecorator,
   isComputed,
   get,
@@ -434,15 +434,15 @@ moduleFor(
       assert.equal(get(objB, 'foo'), 'bar 2', 'objB third get');
     }
 
-    ['@test getCachedValueFor should return the cached value'](assert) {
-      assert.equal(getCachedValueFor(obj, 'foo'), undefined, 'should not yet be a cached value');
+    ['@test meta.valueFor should return the cached value'](assert) {
+      assert.equal(metaFor(obj).valueFor('foo'), undefined, 'should not yet be a cached value');
 
       get(obj, 'foo');
 
-      assert.equal(getCachedValueFor(obj, 'foo'), 'bar 1', 'should retrieve cached value');
+      assert.equal(metaFor(obj).valueFor('foo'), 'bar 1', 'should retrieve cached value');
     }
 
-    ['@test getCachedValueFor should return falsy cached values'](assert) {
+    ['@test meta.valueFor should return falsy cached values'](assert) {
       defineProperty(
         obj,
         'falsy',
@@ -451,11 +451,11 @@ moduleFor(
         })
       );
 
-      assert.equal(getCachedValueFor(obj, 'falsy'), undefined, 'should not yet be a cached value');
+      assert.equal(metaFor(obj).valueFor('falsy'), undefined, 'should not yet be a cached value');
 
       get(obj, 'falsy');
 
-      assert.equal(getCachedValueFor(obj, 'falsy'), false, 'should retrieve cached value');
+      assert.equal(metaFor(obj).valueFor('falsy'), false, 'should retrieve cached value');
     }
 
     ['@test setting a cached computed property passes the old value as the third argument'](
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index a26e3bfc5ef..6ad6ff1b14e 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -6,7 +6,6 @@ import {
   notifyPropertyChange,
   defineProperty,
   computed,
-  getCachedValueFor,
   Mixin,
   mixin,
   observer,
@@ -18,6 +17,7 @@ import {
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
 import { destroy } from '@glimmer/runtime';
+import { meta as metaFor } from '@ember/-internals/meta';
 
 function K() {}
 
@@ -634,7 +634,7 @@ moduleFor(
       });
 
       assert.equal(
-        getCachedValueFor(obj, 'computed'),
+        metaFor(obj).valueFor('computed'),
         undefined,
         'addObserver should not compute CP'
       );
diff --git a/packages/@ember/-internals/metal/tests/tracked/validation_test.js b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
index 052f5c4ff14..075a4df4785 100644
--- a/packages/@ember/-internals/metal/tests/tracked/validation_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
@@ -8,7 +8,6 @@ import {
   notifyPropertyChange,
 } from '../..';
 
-import { EMBER_ARRAY } from '@ember/-internals/utils';
 import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 import { track, valueForTag, validateTag } from '@glimmer/validator';
 
@@ -364,52 +363,6 @@ moduleFor(
       );
     }
 
-    ['@test ember get interaction with ember arrays'](assert) {
-      class EmberObject {
-        emberArray = {
-          [EMBER_ARRAY]: true,
-        };
-      }
-
-      let obj = new EmberObject();
-      let emberArray;
-
-      let tag = track(() => (emberArray = get(obj, 'emberArray')));
-      let snapshot = valueForTag(tag);
-
-      assert.equal(validateTag(tag, snapshot), true);
-
-      notifyPropertyChange(emberArray, '[]');
-      assert.equal(
-        validateTag(tag, snapshot),
-        false,
-        'invalid after setting a property on the object'
-      );
-    }
-
-    ['@test native get interaction with ember arrays'](assert) {
-      class EmberObject {
-        @tracked emberArray = {
-          [EMBER_ARRAY]: true,
-        };
-      }
-
-      let obj = new EmberObject();
-      let emberArray;
-
-      let tag = track(() => (emberArray = obj.emberArray));
-      let snapshot = valueForTag(tag);
-
-      assert.equal(validateTag(tag, snapshot), true);
-
-      notifyPropertyChange(emberArray, '[]');
-      assert.equal(
-        validateTag(tag, snapshot),
-        false,
-        'invalid after setting a property on the object'
-      );
-    }
-
     ['@test gives helpful assertion when a tracked property is mutated after access in with an autotracking transaction']() {
       class EmberObject {
         @tracked value;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
index 25dca814d6e..a4ceff3a524 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
@@ -11,12 +11,12 @@ import {
   tagForObject,
   computed,
   CUSTOM_TAG_FOR,
-  getChainTagsForKey,
+  tagForProperty,
 } from '@ember/-internals/metal';
-import { setProxy, setupMandatorySetter } from '@ember/-internals/utils';
+import { setProxy, setupMandatorySetter, isObject } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { combine, updateTag, tagFor } from '@glimmer/validator';
+import { combine, updateTag, tagFor, tagMetaFor } from '@glimmer/validator';
 
 export function contentFor(proxy) {
   let content = get(proxy, 'content');
@@ -59,7 +59,8 @@ export default Mixin.create({
   }),
 
   [CUSTOM_TAG_FOR](key, addMandatorySetter) {
-    let tag = tagFor(this, key);
+    let meta = tagMetaFor(this);
+    let tag = tagFor(this, key, meta);
 
     if (DEBUG) {
       // TODO: Replace this with something more first class for tracking tags in DEBUG
@@ -73,7 +74,15 @@ export default Mixin.create({
 
       return tag;
     } else {
-      return combine([tag, ...getChainTagsForKey(this, `content.${key}`, addMandatorySetter)]);
+      let tags = [tag, tagFor(this, 'content', meta)];
+
+      let content = contentFor(this);
+
+      if (isObject(content)) {
+        tags.push(tagForProperty(content, key, addMandatorySetter));
+      }
+
+      return combine(tags);
     }
   },
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.js b/packages/@ember/-internals/runtime/lib/mixins/observable.js
index 840bda8f4ca..763a86cc0c9 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.js
@@ -2,6 +2,7 @@
 @module @ember/object
 */
 
+import { peekMeta } from '@ember/-internals/meta';
 import {
   get,
   getWithDefault,
@@ -15,7 +16,6 @@ import {
   endPropertyChanges,
   addObserver,
   removeObserver,
-  getCachedValueFor,
 } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 
@@ -496,6 +496,10 @@ export default Mixin.create({
     @public
   */
   cacheFor(keyName) {
-    return getCachedValueFor(this, keyName);
+    let meta = peekMeta(this);
+
+    if (meta !== null) {
+      return meta.valueFor(keyName);
+    }
   },
 });
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
index 0d7034759a7..30774479227 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
@@ -10,10 +10,11 @@ import {
   addArrayObserver,
   removeArrayObserver,
   replace,
-  getChainTagsForKey,
   CUSTOM_TAG_FOR,
   arrayContentDidChange,
+  tagForProperty,
 } from '@ember/-internals/metal';
+import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
 import { isArray, MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
@@ -119,7 +120,17 @@ export default class ArrayProxy extends EmberObject {
       // revalidate eagerly if we're being tracked, since we no longer will
       // be able to later on due to backtracking re-render assertion
       this._revalidate();
-      return combine(getChainTagsForKey(this, `arrangedContent.${key}`, addMandatorySetter));
+      let arrangedContentTag = this._arrangedContentTag;
+      let arrangedContent = get(this, 'arrangedContent');
+
+      if (isObject(arrangedContent)) {
+        return combine([
+          arrangedContentTag,
+          tagForProperty(arrangedContent, key, addMandatorySetter),
+        ]);
+      } else {
+        return arrangedContentTag;
+      }
     }
 
     return tagFor(this, key);
@@ -318,7 +329,7 @@ export default class ArrayProxy extends EmberObject {
         this._arrangedContentIsUpdating = false;
       }
 
-      this._arrangedContentTag = combine(getChainTagsForKey(this, 'arrangedContent'));
+      this._arrangedContentTag = tagFor(this, 'arrangedContent');
       this._arrangedContentRevision = valueForTag(this._arrangedContentTag);
     }
   }
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index ff987096979..0769033c58e 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -4,17 +4,16 @@ import {
   DecoratorPropertyDescriptor,
   isElementDescriptor,
   setClassicDecorator,
-  tagForProperty,
 } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
-import { consumeTag, track, UpdatableTag, updateTag } from '@glimmer/validator';
+import { consumeTag, tagFor, track, UpdatableTag, updateTag } from '@glimmer/validator';
 
 let wrapGetterSetter = function(_target: object, key: string, desc: PropertyDescriptor) {
   let { get: originalGet } = desc;
 
   if (originalGet !== undefined) {
     desc.get = function() {
-      let propertyTag = tagForProperty(this, key) as UpdatableTag;
+      let propertyTag = tagFor(this, key) as UpdatableTag;
       let ret;
 
       let tag = track(() => {
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.js b/packages/@ember/object/lib/computed/reduce_computed_macros.js
index 2950fd49511..69fdab3f1ea 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.js
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.js
@@ -3,12 +3,7 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
-import {
-  computed,
-  descriptorForDecorator,
-  get,
-  isElementDescriptor,
-} from '@ember/-internals/metal';
+import { computed, autoComputed, get, isElementDescriptor } from '@ember/-internals/metal';
 import { compare, isArray, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime';
 
 function reduceMacro(dependentKey, callback, initialValue, name) {
@@ -1479,7 +1474,7 @@ function customSort(itemsKey, additionalDependentKeys, comparator) {
 // This one needs to dynamically set up and tear down observers on the itemsKey
 // depending on the sortProperties
 function propertySort(itemsKey, sortPropertiesKey) {
-  let cp = computed(`${itemsKey}.[]`, `${sortPropertiesKey}.[]`, function(key) {
+  let cp = autoComputed(function(key) {
     let sortProperties = get(this, sortPropertiesKey);
 
     assert(
@@ -1502,8 +1497,6 @@ function propertySort(itemsKey, sortPropertiesKey) {
     }
   }).readOnly();
 
-  descriptorForDecorator(cp).auto();
-
   return cp;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 3606f19bce2..9275271fb89 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.55.3.tgz#7fc78279b06eceab92c1dca59e3018bf8e46f9d8"
-  integrity sha512-iJx6VWuvm8CBxny5gVSuGQH05tFP/B0wqapAkJWtfhgAdGkVCaL2q4P5YsAE6ZabE4XmcdPNS0oksRC1J09Nkw==
-  dependencies:
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/syntax" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
-    "@glimmer/wire-format" "^0.55.3"
+"@glimmer/compiler@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.56.0.tgz#9dd22beb0924341ae92cd9a5bfe275ec50573c64"
+  integrity sha512-QCeQc39lLvbJ7Ku9mzNDMxELb7QBwdVALDhJJE7fAwYvJSpnAcLYdg+D0iTpA8S5MCxHI8oM2XeYLSyi2SnB6w==
+  dependencies:
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/syntax" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
+    "@glimmer/wire-format" "^0.56.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.55.3.tgz#66b516939cc69bd67f173ba51746939bf5fc3098"
-  integrity sha512-g4YxmjRTkrsrQIoyZgec0cI0OWI3pTw4VZKOVL3jUdUf1sRwXGxK++qztaMbN5YTDFLAJU1JPSuvJkwRYZPBAg==
+"@glimmer/encoder@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.56.0.tgz#24a773678826d73568cc4f82301f7e49f5a3c12f"
+  integrity sha512-qLRYDjXwiIm3ItZWaO9kKT+1My62JjJ/lRrzhrSV921VoK1SQQd9kX1FWAefELyLbKl/+1xmSmXzHHwuP9A5fg==
   dependencies:
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/vm" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/vm" "^0.56.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.55.3.tgz#89f22729141fef4d3ed7441e38095dd84c0bec22"
-  integrity sha512-EbnLv4CDKVBdW4+uv4OG50UTSoyuDYeXQ6hQ8HJrlkmgy5qpY6m/lIrvbMbR1tBcJsULQD37qdmSoDb9zOQycg==
+"@glimmer/interfaces@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.56.0.tgz#88fbbfb31076c39de4b87af12151c2f6b2aec75c"
+  integrity sha512-MXWkPg8/EECK0pkjCmDb6BTpCBQT83S8R5qKHSZ6yPJmd6AWUunfT/CoHM6faH5yHW4ya7ckM1ZfrHnU5eda4Q==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.55.3.tgz#a73d50f92ef6d3ac9aa60a18618788e4fe20d3d7"
-  integrity sha512-rtdHpau9bzIYW1tAxYZkP6p3Ziyen/euj80wmO3lM92Mvwcuj+xqr+IWvRlsMi4npVe+z+kHLdNYLORaJPgtaA==
+"@glimmer/low-level@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.56.0.tgz#b998cf3ef765ca1bfbb0e152f6570fb665b0635d"
+  integrity sha512-2/xkj5YaB+pdEWX9qklYpxQFquo7NfgyOlY0yOeKv6mkEm+IVgMEI6ybxF58aL94SmRKnD7SdwnbqSJXP8bIiA==
 
-"@glimmer/node@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.55.3.tgz#c685237689d0d4eb46fb20a9a609643a49167242"
-  integrity sha512-dTd3jO6Ys56tyh8Mmg43CCnYJBX9stt3/vC3CHhjZAgKB7Xad17P+wzNp1xVfWhHaCUoW1XFoypY2Y4ARM5iDg==
+"@glimmer/node@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.56.0.tgz#991dbe294ca917062fa4d1ee52010dbdfbc3c2c1"
+  integrity sha512-xwAIZtwDuddQ73fJBC41Fg+i7okGBH+VRsacA7UOzLSkb9joEE2aY8+VFpAYs27VW8N35djdcTlkMU0XIxQ2PQ==
   dependencies:
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/runtime" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/runtime" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.55.3.tgz#9f73c2845ff3ee55f1c106e5dc14fe28506c1667"
-  integrity sha512-PSmZQcS4ze33vSErpB//s7L0g+zutqAx7Qlij0VMpl655ae3W45WjEHq4QclBMDJDqMZar6CjrUFDeSCS+S89w==
-  dependencies:
-    "@glimmer/encoder" "^0.55.3"
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/program" "^0.55.3"
-    "@glimmer/reference" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
-    "@glimmer/vm" "^0.55.3"
-    "@glimmer/wire-format" "^0.55.3"
-
-"@glimmer/program@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.55.3.tgz#769ac149e03fb0a48e41b72c9f57a7188579337a"
-  integrity sha512-c0fSdtFQVa90k/CnSFPikxGFCIoNDHTSCpAzOb0BoLcfMdPbNqPkmTItci68Nz6Voul4a23MKvdEA/lDGwCPxA==
-  dependencies:
-    "@glimmer/encoder" "^0.55.3"
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
-
-"@glimmer/reference@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.55.3.tgz#da716add87a6c0ba4e91510c52aef1e6af60644a"
-  integrity sha512-9nRG3aqApqmVnscbCBFeS8CvnixPDYSRBlj6t2SBCe6YLiqDl7Zu3GuoS0QLZeTov32+kf3anRWQGbZFw+XyEQ==
+"@glimmer/opcode-compiler@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.56.0.tgz#da8aff1c2afab58e71254649df0766410fd20513"
+  integrity sha512-4qLIOiDDw7OgvSyuwQMU1o5yVuThPJJoMWEyT7WuC+8lLiHui06Bic4X1YdtYFWaMPyJ4EMBREcjsvbX7JnPbQ==
+  dependencies:
+    "@glimmer/encoder" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/program" "^0.56.0"
+    "@glimmer/reference" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
+    "@glimmer/vm" "^0.56.0"
+    "@glimmer/wire-format" "^0.56.0"
+
+"@glimmer/program@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.56.0.tgz#69705bf601f19ec158872aa5bf6ef10d362e0953"
+  integrity sha512-ugKvzQ02zaZBBkM/TOANJqcmIjNcvbjtItn3mq1l9VuQyOyG3tT2GESxgUPvBl2uHmoDC0Cw0dtEFW42gDqbig==
+  dependencies:
+    "@glimmer/encoder" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
+
+"@glimmer/reference@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.56.0.tgz#a664692c92b12dd54608c03d0fca69f3d3305ff3"
+  integrity sha512-nDTAKFMXDaps73dYYhrSOnXlx0ko788Q14pQGGvNSlBCzJZ02uERAzABsqAs+cyhLqOcd9wTrIwWi1Br2JYJeQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
-    "@glimmer/validator" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
+    "@glimmer/validator" "^0.56.0"
 
-"@glimmer/runtime@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.55.3.tgz#6d917c74923839cc82205e7376cd685856f67f5e"
-  integrity sha512-RDvPds1dh5EXWKbZlBjwga+8vNqj6bllD69r7GbOWJs9ZbqP5aXk3kKiewYmvrj2S0kDAU9lpLJ2iXhi/ppDEQ==
+"@glimmer/runtime@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.56.0.tgz#4aac0d92a01c807d41ea2f5dd466cc8451564eb6"
+  integrity sha512-7SqVzPCmASNPuV70lJz8ZPNY7UxgUMRNvIPVwBKz6TPLbals/+mUihf0cLo873tPLrghsqxbvSKgL+ZwuBappQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/low-level" "^0.55.3"
-    "@glimmer/program" "^0.55.3"
-    "@glimmer/reference" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
-    "@glimmer/validator" "^0.55.3"
-    "@glimmer/vm" "^0.55.3"
-    "@glimmer/wire-format" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/low-level" "^0.56.0"
+    "@glimmer/program" "^0.56.0"
+    "@glimmer/reference" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
+    "@glimmer/validator" "^0.56.0"
+    "@glimmer/vm" "^0.56.0"
+    "@glimmer/wire-format" "^0.56.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.55.3.tgz#74054fef17e2d56b363d747e29e1a46cd940ebd2"
-  integrity sha512-D2GnLNG10TSh1dujojPUWnt3bAXgiHT90xZMcd/TX9pt3Mf31cXhGOv0FYzbsF/R5XTQKNmR1am8Gy870bsjng==
+"@glimmer/syntax@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.56.0.tgz#9f7673bdf94637e8652a942a42c96d67fcce9523"
+  integrity sha512-bh0pYOIRKABm6hy2B0QDL1+iJHafDj+lwaLQGtuoDBd2rfbJdmeOfGuKPjU51gQ7tllt/6lOdkQQG4yuO2CNRQ==
   dependencies:
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.55.3.tgz#10b8d19fc3547d1818cc0fa7bc8cb5301ce9ec22"
-  integrity sha512-K9oy5YHilHWFO9NHlUeBPV3jwMlF5n/FulAbyfrylwORyxR0F0Obue8Rdf8BElsG6/mKoFqfhbp53kFOjLhydA==
+"@glimmer/util@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.56.0.tgz#8bce5676c8ac9b9389a736505a57925f7b55d1af"
+  integrity sha512-3TmGZIe5jTtHbjjTV7mwr71M47c+Y1njm3QrJ8Jq4KzD2udryiQkj44Aki+RFlpjZxBRTWWHHInurb6niPr/cg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.55.3.tgz#f57a6267819d2f29241a2ea04e2ee677973b47d7"
-  integrity sha512-DeXn8/jCtpwSEmFEwrWgLbighPVqT5IinmLrDUf9+OwBJ4LflN23fD4ZlCAO8mXy/FVDCRjVfgB9rRvJzUnpJw==
+"@glimmer/validator@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.56.0.tgz#ec5f1f2f965cf12934fb4c33df23e658e1a78711"
+  integrity sha512-9LNQB6TWOKNvdnlWhuhvL82LPCMXQ15C1srxIFTjj+lVq9+gq9diOBMKb2cN4EMRzh9o1e6lRGff5jppbs6ppQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.55.3.tgz#3fca7e58d1e4f3e43550af40c638ed774168bbb4"
-  integrity sha512-KxPzGoKLKYygQKgjGmJXw3pE3maHtqVznnzpIvu31gEDV6qDxw8bVTFGxWSz2UgpDVMhc4occAkmfir4BuUrCA==
+"@glimmer/vm@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.56.0.tgz#6194274a13d4c4175cd32972223ab4f5c3cf7a25"
+  integrity sha512-6G5UlLTrotC/hMrFocQOm+GdkESyIAdOnYLmCNFJjikmzXOnUQaEVESsjeOb2RdJ+YnRJlx1ZDGzPWbXJudpig==
   dependencies:
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
 
-"@glimmer/wire-format@^0.55.3":
-  version "0.55.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.55.3.tgz#f71e73d242e3b8109db6766f49e03855bccb3f0a"
-  integrity sha512-cvWyRTNRtLSOkqwOOU1wJeUPz6BMlUHqkuCanWLT5Sao71DuRNcFBKlwTI6uScvawR9jCos7F3LLmB+gG0NT3w==
+"@glimmer/wire-format@^0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.56.0.tgz#2585b20244af9c569103d7cbbf87ca7bc3f9e4e2"
+  integrity sha512-0OHUdCTrFgfnzUHTO2licAYrd8ccvuRjmDluvcLinAmUPbb+smZFKSM8G6jcsvyVsYCQwzmFoskFp1heZgoM4g==
   dependencies:
-    "@glimmer/interfaces" "^0.55.3"
-    "@glimmer/util" "^0.55.3"
+    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/util" "^0.56.0"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From e5b7a5a49cdc634774bf8482356133ff6ad93c75 Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Fri, 7 Aug 2020 15:14:12 -0400
Subject: [PATCH 0069/1405] Ensure ESLint plugins use the correct
 `tsconfig.json`

---
 .eslintrc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index ca2f0921c08..a850e9954af 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -58,6 +58,8 @@ module.exports = {
 
       parserOptions: {
         sourceType: 'module',
+        project: './tsconfig.json',
+        tsconfigRootDir: __dirname,
       },
 
       rules: {

From 28bca19692a99a19555c5a1d077db3ce12051577 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 7 Aug 2020 13:00:47 -0700
Subject: [PATCH 0070/1405] [REFACTOR] Simplify init-factory and owner side
 channeling

Removes `_initFactory` as a method and instead sets the owner factory
directly in an INIT_FACTORY_MAP. If the factory being initialized
extends from CoreObject, it will pull the factory off immediately and
use it.

Simplifies passing the owner to CoreObject as well. The owner is now
always passed as an injection, then plucked off and passed as the first
argument to the constructor. It is not gotten through side-channeling
the factory at all.
---
 packages/@ember/-internals/container/index.ts |  2 +-
 .../-internals/container/lib/container.ts     | 46 +++++--------
 .../container/tests/container_test.js         | 24 -------
 .../runtime/lib/system/core_object.js         | 66 +++----------------
 .../runtime/tests/system/core_object_test.js  | 49 --------------
 5 files changed, 25 insertions(+), 162 deletions(-)

diff --git a/packages/@ember/-internals/container/index.ts b/packages/@ember/-internals/container/index.ts
index 76660ceb27a..a4fb959532a 100644
--- a/packages/@ember/-internals/container/index.ts
+++ b/packages/@ember/-internals/container/index.ts
@@ -6,4 +6,4 @@ The public API, specified on the application namespace should be considered the
 */
 
 export { default as Registry, privatize } from './lib/registry';
-export { default as Container, FACTORY_FOR } from './lib/container';
+export { default as Container, FACTORY_FOR, INIT_FACTORY_FOR } from './lib/container';
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 63d1ae55ae7..cd473116a9c 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -542,6 +542,8 @@ declare interface DebugFactory<T, C> extends Factory<T, C> {
 }
 
 export const FACTORY_FOR = new WeakMap<any, FactoryManager<any, any>>();
+export const INIT_FACTORY_FOR = new Map<any, FactoryManager<any, any>>();
+
 class FactoryManager<T, C> {
   readonly container: Container;
   readonly owner: Owner | null;
@@ -576,7 +578,7 @@ class FactoryManager<T, C> {
   }
 
   create(options?: { [prop: string]: any }) {
-    let { container } = this;
+    let { container, class: klass } = this;
 
     if (container.isDestroyed) {
       throw new Error(
@@ -584,18 +586,19 @@ class FactoryManager<T, C> {
       );
     }
 
-    let injectionsCache = this.injections;
-    if (injectionsCache === undefined) {
+    let props = this.injections;
+    if (props === undefined) {
       let { injections, isDynamic } = injectionsFor(this.container, this.normalizedName);
-      injectionsCache = injections;
+      props = injections || {};
+      setOwner(props, this.owner!);
+
       if (!isDynamic) {
         this.injections = injections;
       }
     }
 
-    let props = injectionsCache;
     if (options !== undefined) {
-      props = assign({}, injectionsCache, options);
+      props = assign({}, props, options);
     }
 
     if (DEBUG) {
@@ -614,35 +617,18 @@ class FactoryManager<T, C> {
       }
 
       validationCache[this.fullName] = true;
-    }
-
-    if (!this.class.create) {
-      throw new Error(
-        `Failed to create an instance of '${this.normalizedName}'. Most likely an improperly defined class or an invalid module export.`
-      );
-    }
 
-    // required to allow access to things like
-    // the customized toString, _debugContainerKey,
-    // owner, etc. without a double extend and without
-    // modifying the objects properties
-    if (typeof this.class._initFactory === 'function') {
-      this.class._initFactory(this);
-    } else {
-      // in the non-EmberObject case we need to still setOwner
-      // this is required for supporting glimmer environment and
-      // template instantiation which rely heavily on
-      // `options[OWNER]` being passed into `create`
-      // TODO: clean this up, and remove in future versions
-      if (options === undefined || props === undefined) {
-        // avoid mutating `props` here since they are the cached injections
-        props = assign({}, props);
+      if (!this.class.create) {
+        throw new Error(
+          `Failed to create an instance of '${this.normalizedName}'. Most likely an improperly defined class or an invalid module export.`
+        );
       }
-      setOwner(props, this.owner!);
     }
 
-    let instance = this.class.create(props);
+    INIT_FACTORY_FOR.set(klass, this);
+    let instance = klass.create(props);
     FACTORY_FOR.set(instance, this);
+    INIT_FACTORY_FOR.delete(klass);
 
     return instance;
   }
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index dc85d353231..ff13325ac76 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -666,30 +666,6 @@ moduleFor(
       assert.equal(instrance.ajax, 'fetch');
     }
 
-    ['@test #factoryFor does not add properties to the object being instantiated when _initFactory is present'](
-      assert
-    ) {
-      let registry = new Registry();
-      let container = registry.container();
-
-      class Component {
-        static _initFactory() {}
-        static create(options) {
-          let instance = new this();
-          assign(instance, options);
-          return instance;
-        }
-      }
-      registry.register('component:foo-bar', Component);
-
-      let componentFactory = container.factoryFor('component:foo-bar');
-      let instance = componentFactory.create();
-
-      // note: _guid and isDestroyed are being set in the `factory` constructor
-      // not via registry/container shenanigans
-      assert.deepEqual(Object.keys(instance), []);
-    }
-
     [`@test assert when calling lookup after destroy on a container`](assert) {
       let registry = new Registry();
       let container = registry.container();
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 2f58ba85d1b..9141e0a3cf5 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -2,8 +2,8 @@
   @module @ember/object
 */
 
-import { FACTORY_FOR } from '@ember/-internals/container';
-import { getOwner } from '@ember/-internals/owner';
+import { FACTORY_FOR, INIT_FACTORY_FOR } from '@ember/-internals/container';
+import { getOwner, setOwner } from '@ember/-internals/owner';
 import { assign, _WeakSet as WeakSet } from '@ember/polyfills';
 import {
   guidFor,
@@ -35,18 +35,9 @@ import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer
 const reopen = Mixin.prototype.reopen;
 
 const wasApplied = new WeakSet();
-
-const factoryMap = new WeakMap();
-let debugOwnerMap;
-
-if (DEBUG) {
-  debugOwnerMap = new WeakMap();
-}
-
 const prototypeMixinMap = new WeakMap();
 
 const initCalled = DEBUG ? new WeakSet() : undefined; // only used in debug builds to enable the proxy trap
-const PASSED_FROM_CREATE = DEBUG ? symbol('PASSED_FROM_CREATE') : undefined;
 
 const FRAMEWORK_CLASSES = symbol('FRAMEWORK_CLASS');
 
@@ -211,17 +202,10 @@ function initialize(obj, properties) {
   @public
 */
 class CoreObject {
-  static _initFactory(factory) {
-    factoryMap.set(this, factory);
-  }
-
-  constructor(passedFromCreate) {
-    // pluck off factory
-    let initFactory = factoryMap.get(this.constructor);
-    if (initFactory !== undefined) {
-      factoryMap.delete(this.constructor);
-      FACTORY_FOR.set(this, initFactory);
-    }
+  constructor(owner) {
+    // pluck off factory and set it as the instance factory
+    FACTORY_FOR.set(this, INIT_FACTORY_FOR.get(this.constructor));
+    setOwner(this, owner);
 
     // prepare prototype...
     this.constructor.proto();
@@ -275,8 +259,6 @@ class CoreObject {
           }
         },
       });
-
-      FACTORY_FOR.set(self, initFactory);
     }
 
     registerDestructor(self, () => self.willDestroy());
@@ -286,19 +268,6 @@ class CoreObject {
 
     m.setInitializing();
 
-    assert(
-      `An EmberObject based class, ${this.constructor}, was not instantiated correctly. You may have either used \`new\` instead of \`.create()\`, or not passed arguments to your call to super in the constructor: \`super(...arguments)\`. If you are trying to use \`new\`, consider using native classes without extending from EmberObject.`,
-      (() => {
-        let owner = debugOwnerMap.get(this.constructor);
-        debugOwnerMap.delete(this.constructor);
-
-        return (
-          passedFromCreate !== undefined &&
-          (passedFromCreate === PASSED_FROM_CREATE || passedFromCreate === owner)
-        );
-      })()
-    );
-
     // only return when in debug builds and `self` is the proxy created above
     if (DEBUG && self !== this) {
       return self;
@@ -752,28 +721,9 @@ class CoreObject {
     let instance;
 
     if (this[FRAMEWORK_CLASSES]) {
-      let initFactory = factoryMap.get(this);
-      let owner;
-      if (initFactory !== undefined) {
-        owner = initFactory.owner;
-      } else if (props !== undefined) {
-        owner = getOwner(props);
-      }
-
-      if (DEBUG) {
-        if (owner === undefined) {
-          // fallback to passing the special PASSED_FROM_CREATE symbol
-          // to avoid an error when folks call things like Controller.extend().create()
-          // we should do a subsequent deprecation pass to ensure this isn't allowed
-          owner = PASSED_FROM_CREATE;
-        } else {
-          debugOwnerMap.set(this, owner);
-        }
-      }
-
-      instance = new C(owner);
+      instance = new C(props !== undefined ? getOwner(props) : undefined);
     } else {
-      instance = DEBUG ? new C(PASSED_FROM_CREATE) : new C();
+      instance = new C();
     }
 
     if (extra === undefined) {
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index db0f8c0e9c5..5d46ece0bad 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -7,29 +7,6 @@ import { track } from '@glimmer/validator';
 moduleFor(
   'Ember.CoreObject',
   class extends AbstractTestCase {
-    ['@test throws an error with new (one arg)']() {
-      expectAssertion(() => {
-        new CoreObject({
-          firstName: 'Stef',
-          lastName: 'Penner',
-        });
-      }, /You may have either used `new` instead of `.create\(\)`/);
-    }
-
-    ['@test throws an error with new (> 1 arg)']() {
-      expectAssertion(() => {
-        new CoreObject(
-          {
-            firstName: 'Stef',
-            lastName: 'Penner',
-          },
-          {
-            other: 'name',
-          }
-        );
-      }, /You may have either used `new` instead of `.create\(\)`/);
-    }
-
     ['@test toString should be not be added as a property when calling toString()'](assert) {
       let obj = CoreObject.create({
         firstName: 'Foo',
@@ -108,32 +85,6 @@ moduleFor(
       }).create(options);
     }
 
-    async ['@test observed properties are enumerable when set GH#14594'](assert) {
-      let callCount = 0;
-      let Test = CoreObject.extend({
-        myProp: null,
-        anotherProp: undefined,
-        didChangeMyProp: observer('myProp', function() {
-          callCount++;
-        }),
-      });
-
-      let test = Test.create();
-      set(test, 'id', '3');
-      set(test, 'myProp', { id: 1 });
-
-      assert.deepEqual(Object.keys(test).sort(), ['id', 'myProp']);
-
-      set(test, 'anotherProp', 'nice');
-
-      assert.deepEqual(Object.keys(test).sort(), ['anotherProp', 'id', 'myProp']);
-      await runLoopSettled();
-
-      assert.equal(callCount, 1);
-
-      test.destroy();
-    }
-
     ['@test native getters/setters do not cause rendering invalidation during init'](assert) {
       let objectMeta = Object.create(null);
 

From cc432a5006f5c389080fec6e8d6f0eda16e64de2 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 7 Aug 2020 13:11:26 -0700
Subject: [PATCH 0071/1405] [REFACTOR] Remove setFrameworkClass

FrameworkClass limited the owner injection to just a few specific
classes, but the brand check required to figure out what those classes
were was costly. This removes it and updates to passing the owner to any
object that extends from CoreObject.
---
 .../@ember/-internals/glimmer/lib/component.ts    |  4 +---
 packages/@ember/-internals/glimmer/lib/helper.ts  |  4 +---
 .../@ember/-internals/routing/lib/system/route.ts |  3 ---
 packages/@ember/-internals/runtime/index.d.ts     |  1 -
 packages/@ember/-internals/runtime/index.js       |  2 +-
 .../-internals/runtime/lib/system/core_object.js  | 15 +--------------
 .../runtime/tests/system/object/framework_test.js |  2 --
 packages/@ember/controller/index.js               |  4 +---
 packages/@ember/service/index.js                  |  4 +---
 packages/ember/index.js                           |  2 --
 10 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 263529e27b0..7bfaa17450d 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,6 +1,6 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { setFrameworkClass, TargetActionSupport } from '@ember/-internals/runtime';
+import { TargetActionSupport } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
 import {
   ActionSupport,
@@ -1115,6 +1115,4 @@ Component.reopenClass({
   positionalParams: [],
 });
 
-setFrameworkClass(Component);
-
 export default Component;
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index da62fe01aa7..4403bb613f0 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -3,7 +3,7 @@
 */
 
 import { Factory } from '@ember/-internals/owner';
-import { FrameworkObject, setFrameworkClass } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
 import { Dict } from '@glimmer/interfaces';
@@ -138,8 +138,6 @@ let Helper = FrameworkObject.extend({
 
 Helper.isHelperFactory = true;
 
-setFrameworkClass(Helper);
-
 class Wrapper implements HelperFactory<SimpleHelper> {
   isHelperFactory: true = true;
 
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 3cebc41ebda..70b32ae9130 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -17,7 +17,6 @@ import {
   ActionHandler,
   Evented,
   Object as EmberObject,
-  setFrameworkClass,
   typeOf,
 } from '@ember/-internals/runtime';
 import { lookupDescriptor } from '@ember/-internals/utils';
@@ -2669,6 +2668,4 @@ if (ROUTER_EVENTS) {
   });
 }
 
-setFrameworkClass(Route);
-
 export default Route;
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index 94519e464f3..b3a044c855c 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -11,7 +11,6 @@ export function deprecatingAlias(
 ): any;
 
 export const FrameworkObject: any;
-export function setFrameworkClass<T>(klass: new () => T): void;
 export const Object: any;
 
 export function _contentFor(proxy: any): any;
diff --git a/packages/@ember/-internals/runtime/index.js b/packages/@ember/-internals/runtime/index.js
index 52d7202269c..6558895952b 100644
--- a/packages/@ember/-internals/runtime/index.js
+++ b/packages/@ember/-internals/runtime/index.js
@@ -17,7 +17,7 @@ export { default as Comparable } from './lib/mixins/comparable';
 export { default as Namespace } from './lib/system/namespace';
 export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
-export { default as CoreObject, setFrameworkClass } from './lib/system/core_object';
+export { default as CoreObject } from './lib/system/core_object';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as Copyable } from './lib/mixins/copyable';
 export { default as Enumerable } from './lib/mixins/enumerable';
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 9141e0a3cf5..ed52cf17b48 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -39,12 +39,6 @@ const prototypeMixinMap = new WeakMap();
 
 const initCalled = DEBUG ? new WeakSet() : undefined; // only used in debug builds to enable the proxy trap
 
-const FRAMEWORK_CLASSES = symbol('FRAMEWORK_CLASS');
-
-export function setFrameworkClass(klass) {
-  klass[FRAMEWORK_CLASSES] = true;
-}
-
 function initialize(obj, properties) {
   let m = meta(obj);
 
@@ -717,14 +711,7 @@ class CoreObject {
     @public
   */
   static create(props, extra) {
-    let C = this;
-    let instance;
-
-    if (this[FRAMEWORK_CLASSES]) {
-      instance = new C(props !== undefined ? getOwner(props) : undefined);
-    } else {
-      instance = new C();
-    }
+    let instance = new this(props !== undefined ? getOwner(props) : undefined);
 
     if (extra === undefined) {
       initialize(instance, props);
diff --git a/packages/@ember/-internals/runtime/tests/system/object/framework_test.js b/packages/@ember/-internals/runtime/tests/system/object/framework_test.js
index 188a2145109..bd464012383 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/framework_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/framework_test.js
@@ -1,7 +1,6 @@
 import { getOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '../../../index';
 import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
-import { setFrameworkClass } from '../../../lib/system/core_object';
 
 moduleFor(
   'FrameworkObject',
@@ -23,7 +22,6 @@ moduleFor(
           assert.equal(owner, testContext.owner, 'owner was passed properly to the constructor');
         }
       }
-      setFrameworkClass(Model);
       this.owner.register('model:blah', Model);
 
       this.owner.factoryFor('model:blah').create();
diff --git a/packages/@ember/controller/index.js b/packages/@ember/controller/index.js
index 24577072384..660a8bed3d8 100644
--- a/packages/@ember/controller/index.js
+++ b/packages/@ember/controller/index.js
@@ -1,4 +1,4 @@
-import { FrameworkObject, setFrameworkClass } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/-internals/runtime';
 import { inject as metalInject } from '@ember/-internals/metal';
 import ControllerMixin from './lib/controller_mixin';
 
@@ -14,8 +14,6 @@ import ControllerMixin from './lib/controller_mixin';
 */
 const Controller = FrameworkObject.extend(ControllerMixin);
 
-setFrameworkClass(Controller);
-
 /**
   Creates a property that lazily looks up another controller in the container.
   Can only be used when defining another controller.
diff --git a/packages/@ember/service/index.js b/packages/@ember/service/index.js
index 3710255b05a..25f420d83bf 100644
--- a/packages/@ember/service/index.js
+++ b/packages/@ember/service/index.js
@@ -1,4 +1,4 @@
-import { FrameworkObject, setFrameworkClass } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/-internals/runtime';
 import { inject as metalInject } from '@ember/-internals/metal';
 
 /**
@@ -69,6 +69,4 @@ Service.reopenClass({
   isServiceFactory: true,
 });
 
-setFrameworkClass(Service);
-
 export default Service;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index af42c3bd247..ab3397d6e51 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -98,7 +98,6 @@ import {
   CoreObject,
   NativeArray,
   A,
-  setFrameworkClass,
 } from '@ember/-internals/runtime';
 import {
   Checkbox,
@@ -422,7 +421,6 @@ Ember._ContainerProxyMixin = ContainerProxyMixin;
 Ember.compare = compare;
 Ember.copy = copy;
 Ember.isEqual = isEqual;
-Ember._setFrameworkClass = setFrameworkClass;
 
 /**
 @module ember

From 12e6ab68332a89dfff905cedfcbc9dabbd203478 Mon Sep 17 00:00:00 2001
From: Mehul Kar <mehulkar@apple.com>
Date: Thu, 30 Jul 2020 13:49:18 -0700
Subject: [PATCH 0072/1405] Pass transition object to activate/deactivate hooks
 and events

Closes #19022
---
 .../-internals/routing/lib/system/route.ts     | 18 ++++++++++--------
 .../tests/routing/decoupled_basic_test.js      | 16 ++++++++++------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 3cebc41ebda..51f9c7ba30d 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -360,9 +360,9 @@ class Route extends EmberObject implements IRoute {
 
     @method exit
   */
-  exit() {
-    this.deactivate();
-    this.trigger('deactivate');
+  exit(transition?: Transition) {
+    this.deactivate(transition);
+    this.trigger('deactivate', transition);
     this.teardownViews();
   }
 
@@ -384,10 +384,10 @@ class Route extends EmberObject implements IRoute {
 
     @method enter
   */
-  enter() {
+  enter(transition: Transition) {
     ROUTE_CONNECTIONS.set(this, []);
-    this.activate();
-    this.trigger('activate');
+    this.activate(transition);
+    this.trigger('activate', transition);
   }
 
   /**
@@ -596,20 +596,22 @@ class Route extends EmberObject implements IRoute {
     not executed when the model for the route changes.
 
     @method deactivate
+    @param {Transition} transition
     @since 1.0.0
     @public
   */
-  deactivate() {}
+  deactivate(_transition?: Transition) {}
 
   /**
     This hook is executed when the router enters the route. It is not executed
     when the model for the route changes.
 
     @method activate
+    @param {Transition} transition
     @since 1.0.0
     @public
   */
-  activate() {}
+  activate(_transition: Transition) {}
 
   /**
     Transition the application into another route. The route may
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 8d6865a0f05..d8727e96d1e 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -1518,7 +1518,7 @@ moduleFor(
     }
 
     ['@test `activate` event fires on the route'](assert) {
-      assert.expect(2);
+      assert.expect(4);
 
       let eventFired = 0;
 
@@ -1532,13 +1532,15 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.on('activate', function() {
+            this.on('activate', function(transition) {
               assert.equal(++eventFired, 1, 'activate event is fired once');
+              assert.ok(transition, 'transition is passed to activate event');
             });
           },
 
-          activate() {
+          activate(transition) {
             assert.ok(true, 'activate hook is called');
+            assert.ok(transition, 'transition is passed to activate hook');
           },
         })
       );
@@ -1547,7 +1549,7 @@ moduleFor(
     }
 
     ['@test `deactivate` event fires on the route'](assert) {
-      assert.expect(2);
+      assert.expect(4);
 
       let eventFired = 0;
 
@@ -1562,13 +1564,15 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.on('deactivate', function() {
+            this.on('deactivate', function(transition) {
               assert.equal(++eventFired, 1, 'deactivate event is fired once');
+              assert.ok(transition, 'transition is passed');
             });
           },
 
-          deactivate() {
+          deactivate(transition) {
             assert.ok(true, 'deactivate hook is called');
+            assert.ok(transition, 'transition is passed');
           },
         })
       );

From fa35230d082e4b9667f04b214e77f314385d18e7 Mon Sep 17 00:00:00 2001
From: Mehul Kar <mehulkar@apple.com>
Date: Thu, 30 Jul 2020 12:06:37 -0700
Subject: [PATCH 0073/1405] Pass resolver to Test app in generated initializer
 test

The default resolver (the globals resolver is deprecated), so we
always need to pass this in.

Closes #19046
---
 .../__root__/__testType__/__path__/__name__-test.js          | 5 +++--
 .../__root__/__testType__/__path__/__name__-test.js          | 5 +++--
 .../fixtures/initializer-test/module-unification/rfc232.js   | 5 +++--
 node-tests/fixtures/initializer-test/rfc232.js               | 5 +++--
 .../instance-initializer-test/module-unification/rfc232.js   | 5 +++--
 node-tests/fixtures/instance-initializer-test/rfc232.js      | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 0ef7a9944e6..b5bd4650aee 100644
--- a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -2,17 +2,18 @@ import Application from '@ember/application';
 
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
 module('<%= friendlyTestName %>', function(hooks) {
   hooks.beforeEach(function() {
-    this.TestApplication = Application.extend();
+    this.TestApplication = class TestApplication extends Application {}
     this.TestApplication.initializer({
       name: 'initializer under test',
       initialize
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({ autoboot: false, Resolver });
   });
 
   hooks.afterEach(function() {
diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 7efaeafe77a..9e09050e437 100644
--- a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -2,16 +2,17 @@ import Application from '@ember/application';
 
 import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
 module('<%= friendlyTestName %>', function(hooks) {
   hooks.beforeEach(function() {
-    this.TestApplication = Application.extend();
+    this.TestApplication = class TestApplication extends Application {}
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
       initialize
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({ autoboot: false, Resolver });
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
diff --git a/node-tests/fixtures/initializer-test/module-unification/rfc232.js b/node-tests/fixtures/initializer-test/module-unification/rfc232.js
index 04a51ea4d36..d62aa67bf32 100644
--- a/node-tests/fixtures/initializer-test/module-unification/rfc232.js
+++ b/node-tests/fixtures/initializer-test/module-unification/rfc232.js
@@ -2,17 +2,18 @@ import Application from '@ember/application';
 
 import { initialize } from 'my-app/init/initializers/foo';
 import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
 import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', function(hooks) {
   hooks.beforeEach(function() {
-    this.TestApplication = Application.extend();
+    this.TestApplication = class TestApplication extends Application {}
     this.TestApplication.initializer({
       name: 'initializer under test',
       initialize
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({ autoboot: false, Resolver });
   });
 
   hooks.afterEach(function() {
diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
index 36dcdc6da27..709ea9aaf46 100644
--- a/node-tests/fixtures/initializer-test/rfc232.js
+++ b/node-tests/fixtures/initializer-test/rfc232.js
@@ -2,17 +2,18 @@ import Application from '@ember/application';
 
 import { initialize } from 'my-app/initializers/foo';
 import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
 import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', function(hooks) {
   hooks.beforeEach(function() {
-    this.TestApplication = Application.extend();
+    this.TestApplication = class TestApplication extends Application {}
     this.TestApplication.initializer({
       name: 'initializer under test',
       initialize
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({ autoboot: false, Resolver });
   });
 
   hooks.afterEach(function() {
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js b/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
index 4c97d5f64bf..99f2459db29 100644
--- a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
@@ -2,16 +2,17 @@ import Application from '@ember/application';
 
 import { initialize } from 'my-app/init/instance-initializers/foo';
 import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
 import { run } from '@ember/runloop';
 
 module('Unit | Instance Initializer | foo', function(hooks) {
   hooks.beforeEach(function() {
-    this.TestApplication = Application.extend();
+    this.TestApplication = class TestApplication extends Application {}
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
       initialize
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({ autoboot: false, Resolver });
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
index c6f693da2ce..64814eda522 100644
--- a/node-tests/fixtures/instance-initializer-test/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -2,16 +2,17 @@ import Application from '@ember/application';
 
 import { initialize } from 'my-app/instance-initializers/foo';
 import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
 import { run } from '@ember/runloop';
 
 module('Unit | Instance Initializer | foo', function(hooks) {
   hooks.beforeEach(function() {
-    this.TestApplication = Application.extend();
+    this.TestApplication = class TestApplication extends Application {}
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
       initialize
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({ autoboot: false, Resolver });
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {

From ef0e277533b3eab01e58d68b79d7e37d8b11ee34 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 7 Aug 2020 15:37:25 -0700
Subject: [PATCH 0074/1405] [REFACTOR] Convert to native symbol

Converts to native symbol in as many places as we can, and uses the
benefits of native symbols non-enumerability in a few places, such as
assigning properties OWNER to the instance of CoreObject/EmberObject.

A few symbols still need to be enumerable, either because they are
passed into mixins (which do not support non-enumerable symbols) or
because we use enumerability in other ways. We should look into removing
these in the future.
---
 packages/@ember/-internals/container/index.ts |  2 +-
 .../-internals/container/lib/container.ts     | 33 +++++++-----
 .../-internals/container/tests/owner_test.js  | 19 +++++++
 .../glimmer/lib/component-managers/root.ts    |  4 +-
 .../-internals/glimmer/lib/component.ts       |  7 +--
 .../@ember/-internals/glimmer/lib/renderer.ts |  2 +-
 .../@ember/-internals/metal/lib/computed.ts   |  4 +-
 .../@ember/-internals/metal/lib/events.ts     |  2 +-
 .../-internals/metal/lib/property_events.ts   |  4 +-
 packages/@ember/-internals/metal/lib/tags.ts  | 12 +++--
 packages/@ember/-internals/owner/index.ts     | 22 +++++++-
 .../runtime/lib/system/core_object.js         | 19 ++++---
 .../-internals/runtime/lib/system/object.js   | 51 +++++++++++--------
 .../runtime/tests/system/core_object_test.js  |  4 +-
 packages/@ember/-internals/utils/index.ts     |  2 +-
 .../-internals/utils/lib/ember-array.ts       |  2 +-
 .../@ember/-internals/utils/lib/symbol.ts     | 15 +++++-
 17 files changed, 137 insertions(+), 67 deletions(-)

diff --git a/packages/@ember/-internals/container/index.ts b/packages/@ember/-internals/container/index.ts
index a4fb959532a..d3c5006ba40 100644
--- a/packages/@ember/-internals/container/index.ts
+++ b/packages/@ember/-internals/container/index.ts
@@ -6,4 +6,4 @@ The public API, specified on the application namespace should be considered the
 */
 
 export { default as Registry, privatize } from './lib/registry';
-export { default as Container, FACTORY_FOR, INIT_FACTORY_FOR } from './lib/container';
+export { default as Container, getFactoryFor, setFactoryFor, INIT_FACTORY } from './lib/container';
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index cd473116a9c..4d48babce06 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,5 +1,5 @@
-import { Factory, LookupOptions, Owner, OWNER, setOwner } from '@ember/-internals/owner';
-import { dictionary, HAS_NATIVE_PROXY } from '@ember/-internals/utils';
+import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
+import { dictionary, HAS_NATIVE_PROXY, symbol } from '@ember/-internals/utils';
 import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
@@ -198,7 +198,9 @@ export default class Container {
    @returns { Object }
   */
   ownerInjection() {
-    return { [OWNER]: this.owner };
+    let injection = {};
+    setOwner(injection, this.owner!);
+    return injection;
   }
 
   /**
@@ -266,7 +268,7 @@ function wrapManagerInDeprecationProxy<T, C>(manager: FactoryManager<T, C>) {
     };
 
     let proxy = new Proxy(proxiedManager, validator as any);
-    FACTORY_FOR.set(proxy, manager);
+    // FACTORY_FOR.set(proxy, manager);
   }
 
   return manager;
@@ -541,8 +543,15 @@ declare interface DebugFactory<T, C> extends Factory<T, C> {
   _lazyInjections(): { [key: string]: LazyInjection };
 }
 
-export const FACTORY_FOR = new WeakMap<any, FactoryManager<any, any>>();
-export const INIT_FACTORY_FOR = new Map<any, FactoryManager<any, any>>();
+export const INIT_FACTORY = symbol('INIT_FACTORY');
+
+export function getFactoryFor(obj: any): FactoryManager<any, any> {
+  return obj[INIT_FACTORY];
+}
+
+export function setFactoryFor(obj: any, factory: FactoryManager<any, any>) {
+  obj[INIT_FACTORY] = factory;
+}
 
 class FactoryManager<T, C> {
   readonly container: Container;
@@ -566,7 +575,7 @@ class FactoryManager<T, C> {
     this.normalizedName = normalizedName;
     this.madeToString = undefined;
     this.injections = undefined;
-    FACTORY_FOR.set(this, this);
+    setFactoryFor(this, this);
   }
 
   toString(): string {
@@ -578,7 +587,7 @@ class FactoryManager<T, C> {
   }
 
   create(options?: { [prop: string]: any }) {
-    let { container, class: klass } = this;
+    let { container } = this;
 
     if (container.isDestroyed) {
       throw new Error(
@@ -591,6 +600,7 @@ class FactoryManager<T, C> {
       let { injections, isDynamic } = injectionsFor(this.container, this.normalizedName);
       props = injections || {};
       setOwner(props, this.owner!);
+      props[INIT_FACTORY as string] = this;
 
       if (!isDynamic) {
         this.injections = injections;
@@ -625,11 +635,6 @@ class FactoryManager<T, C> {
       }
     }
 
-    INIT_FACTORY_FOR.set(klass, this);
-    let instance = klass.create(props);
-    FACTORY_FOR.set(instance, this);
-    INIT_FACTORY_FOR.delete(klass);
-
-    return instance;
+    return this.class.create(props);
   }
 }
diff --git a/packages/@ember/-internals/container/tests/owner_test.js b/packages/@ember/-internals/container/tests/owner_test.js
index ac3fa5cb423..f5de21843f9 100644
--- a/packages/@ember/-internals/container/tests/owner_test.js
+++ b/packages/@ember/-internals/container/tests/owner_test.js
@@ -16,5 +16,24 @@ moduleFor(
 
       assert.strictEqual(obj[OWNER], owner, 'owner has been set to the OWNER symbol');
     }
+
+    ['@test getOwner deprecates using LEGACY_OWNER'](assert) {
+      let owner = {};
+      let obj = {};
+
+      setOwner(obj, owner);
+
+      let legacyOwner;
+
+      for (let key in obj) {
+        legacyOwner = key;
+      }
+
+      let newObj = { [legacyOwner]: owner };
+
+      expectDeprecation(() => {
+        assert.strictEqual(getOwner(newObj), owner, 'owner has been set');
+      }, /You accessed the owner using `getOwner` on an object/);
+    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index 62b32836ede..d0008d5aec9 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -1,4 +1,4 @@
-import { FACTORY_FOR } from '@ember/-internals/container';
+import { getFactoryFor } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory } from '@ember/-internals/owner';
 import { _instrumentStart } from '@ember/instrumentation';
@@ -111,7 +111,7 @@ export class RootComponentDefinition implements ComponentDefinition {
   constructor(public component: Component) {
     let manager = new RootComponentManager(component);
     this.manager = manager;
-    let factory = FACTORY_FOR.get(component);
+    let factory = getFactoryFor(component);
     this.state = {
       name: factory!.fullName.slice(10),
       capabilities: ROOT_CAPABILITIES,
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 7bfaa17450d..5f9c564b1d7 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,7 +1,7 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
-import { symbol } from '@ember/-internals/utils';
+import { enumerableSymbol, symbol } from '@ember/-internals/utils';
 import {
   ActionSupport,
   ChildViewsSupport,
@@ -18,10 +18,11 @@ import { normalizeProperty } from '@glimmer/runtime';
 import { createTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
 
+export const ARGS = enumerableSymbol('ARGS');
+export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
+
 export const DIRTY_TAG = symbol('DIRTY_TAG');
-export const ARGS = symbol('ARGS');
 export const IS_DISPATCHING_ATTRS = symbol('IS_DISPATCHING_ATTRS');
-export const HAS_BLOCK = symbol('HAS_BLOCK');
 export const BOUNDS = symbol('BOUNDS');
 
 /**
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index c6618af28b0..450cf8310aa 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import { Owner, OWNER } from '@ember/-internals/owner';
+import { OWNER, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index b2f872e6419..8c50f0247cf 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,5 +1,5 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
-import { inspect, symbol, toString } from '@ember/-internals/utils';
+import { inspect, toString } from '@ember/-internals/utils';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberError from '@ember/error';
 import { isDestroyed } from '@glimmer/runtime';
@@ -38,8 +38,6 @@ import {
 } from './property_events';
 import { set } from './property_set';
 
-export const AUTO = symbol('COMPUTED_AUTO');
-
 export type ComputedPropertyGetter = (keyName: string) => any;
 export type ComputedPropertySetter = (keyName: string, value: any, cachedValue?: any) => any;
 
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index cfbeb8c5cdf..bac978b4a5b 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -146,7 +146,7 @@ export function sendEvent(
     if (!target) {
       target = obj;
     }
-    if ('string' === typeof method) {
+    if (typeof method === 'string' || typeof method === 'symbol') {
       method = target[method] as Function;
     }
 
diff --git a/packages/@ember/-internals/metal/lib/property_events.ts b/packages/@ember/-internals/metal/lib/property_events.ts
index a562397dfa0..49e8f020a5f 100644
--- a/packages/@ember/-internals/metal/lib/property_events.ts
+++ b/packages/@ember/-internals/metal/lib/property_events.ts
@@ -1,5 +1,5 @@
 import { Meta, peekMeta } from '@ember/-internals/meta';
-import { symbol } from '@ember/-internals/utils';
+import { enumerableSymbol } from '@ember/-internals/utils';
 import {
   flushSyncObservers,
   resumeObserverDeactivation,
@@ -12,7 +12,7 @@ import { markObjectAsDirty } from './tags';
  @private
  */
 
-export const PROPERTY_DID_CHANGE = symbol('PROPERTY_DID_CHANGE');
+export const PROPERTY_DID_CHANGE = enumerableSymbol('PROPERTY_DID_CHANGE');
 
 let deferred = 0;
 
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
index d19d39087c6..98dfb1324d6 100644
--- a/packages/@ember/-internals/metal/lib/tags.ts
+++ b/packages/@ember/-internals/metal/lib/tags.ts
@@ -1,4 +1,10 @@
-import { isObject, setupMandatorySetter, symbol, toString } from '@ember/-internals/utils';
+import {
+  enumerableSymbol,
+  isObject,
+  setupMandatorySetter,
+  symbol,
+  toString,
+} from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { isDestroyed } from '@glimmer/runtime';
@@ -6,10 +12,10 @@ import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor, TagMeta } from '@glimmer/valida
 
 /////////
 
-export const CUSTOM_TAG_FOR = symbol('CUSTOM_TAG_FOR');
+export const CUSTOM_TAG_FOR = enumerableSymbol('CUSTOM_TAG_FOR');
 
 // This is exported for `@tracked`, but should otherwise be avoided. Use `tagForObject`.
-export const SELF_TAG: string = symbol('SELF_TAG');
+export const SELF_TAG: string | symbol = symbol('SELF_TAG');
 
 export function tagForProperty(
   obj: object,
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index d0abafe68ef..6f25b433ff7 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -37,8 +37,10 @@ export interface Owner {
   routable?: boolean;
 }
 
-import { symbol } from '@ember/-internals/utils';
+import { enumerableSymbol, symbol } from '@ember/-internals/utils';
+import { deprecate } from '@ember/debug';
 
+export const LEGACY_OWNER: unique symbol = enumerableSymbol('OWNER') as any;
 export const OWNER: unique symbol = symbol('OWNER') as any;
 
 /**
@@ -86,7 +88,22 @@ export const OWNER: unique symbol = symbol('OWNER') as any;
   @public
 */
 export function getOwner(object: any): Owner {
-  return object[OWNER];
+  let owner = object[OWNER];
+
+  if (owner === undefined) {
+    owner = object[LEGACY_OWNER];
+
+    deprecate(
+      `You accessed the owner using \`getOwner\` on an object, but it was not set on that object with \`setOwner\`. You must use \`setOwner\` to set the owner on all objects. You cannot use Object.assign().`,
+      owner === undefined,
+      {
+        id: 'owner.legacy-owner-injection',
+        until: '3.25.0',
+      }
+    );
+  }
+
+  return owner;
 }
 
 /**
@@ -103,4 +120,5 @@ export function getOwner(object: any): Owner {
 */
 export function setOwner(object: any, owner: Owner): void {
   object[OWNER] = owner;
+  object[LEGACY_OWNER] = owner;
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index ed52cf17b48..dbb0167f907 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -2,14 +2,13 @@
   @module @ember/object
 */
 
-import { FACTORY_FOR, INIT_FACTORY_FOR } from '@ember/-internals/container';
-import { getOwner, setOwner } from '@ember/-internals/owner';
+import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
+import { getOwner, OWNER } from '@ember/-internals/owner';
 import { assign, _WeakSet as WeakSet } from '@ember/polyfills';
 import {
   guidFor,
   getName,
   setName,
-  symbol,
   makeArray,
   HAS_NATIVE_PROXY,
   isInternalSymbol,
@@ -198,8 +197,7 @@ function initialize(obj, properties) {
 class CoreObject {
   constructor(owner) {
     // pluck off factory and set it as the instance factory
-    FACTORY_FOR.set(this, INIT_FACTORY_FOR.get(this.constructor));
-    setOwner(this, owner);
+    this[OWNER] = owner;
 
     // prepare prototype...
     this.constructor.proto();
@@ -562,7 +560,7 @@ class CoreObject {
     let hasToStringExtension = typeof this.toStringExtension === 'function';
     let extension = hasToStringExtension ? `:${this.toStringExtension()}` : '';
 
-    let ret = `<${getName(this) || FACTORY_FOR.get(this) || this.constructor.toString()}:${guidFor(
+    let ret = `<${getName(this) || getFactoryFor(this) || this.constructor.toString()}:${guidFor(
       this
     )}${extension}>`;
 
@@ -711,7 +709,14 @@ class CoreObject {
     @public
   */
   static create(props, extra) {
-    let instance = new this(props !== undefined ? getOwner(props) : undefined);
+    let instance;
+
+    if (props !== undefined) {
+      instance = new this(getOwner(props));
+      setFactoryFor(instance, getFactoryFor(props));
+    } else {
+      instance = new this();
+    }
 
     if (extra === undefined) {
       initialize(instance, props);
diff --git a/packages/@ember/-internals/runtime/lib/system/object.js b/packages/@ember/-internals/runtime/lib/system/object.js
index efff766a6be..c98d0f9cac3 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.js
+++ b/packages/@ember/-internals/runtime/lib/system/object.js
@@ -2,17 +2,15 @@
 @module @ember/object
 */
 
-import { FACTORY_FOR } from '@ember/-internals/container';
+import { getFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
 import { OWNER, setOwner } from '@ember/-internals/owner';
-import { symbol, setName } from '@ember/-internals/utils';
+import { HAS_NATIVE_SYMBOL, symbol, setName } from '@ember/-internals/utils';
 import { addListener } from '@ember/-internals/metal';
 import CoreObject from './core_object';
 import Observable from '../mixins/observable';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
-const instanceOwner = new WeakMap();
-
 /**
   `EmberObject` is the main base class for all Ember objects. It is a subclass
   of `CoreObject` with the `Observable` mixin applied. For details,
@@ -25,26 +23,35 @@ const instanceOwner = new WeakMap();
 */
 export default class EmberObject extends CoreObject {
   get _debugContainerKey() {
-    let factory = FACTORY_FOR.get(this);
+    let factory = getFactoryFor(this);
     return factory !== undefined && factory.fullName;
   }
+}
 
-  get [OWNER]() {
-    let owner = instanceOwner.get(this);
-
-    if (owner !== undefined) {
-      return owner;
-    }
-
-    let factory = FACTORY_FOR.get(this);
-    return factory !== undefined && factory.owner;
-  }
-
-  // we need a setter here largely to support
-  // folks calling `owner.ownerInjection()` API
-  set [OWNER](value) {
-    instanceOwner.set(this, value);
-  }
+if (!HAS_NATIVE_SYMBOL) {
+  // Allows OWNER and INIT_FACTORY to be non-enumerable in IE11
+  let instanceOwner = new WeakMap();
+  let instanceFactory = new WeakMap();
+
+  Object.defineProperty(EmberObject.prototype, OWNER, {
+    get() {
+      return instanceOwner.get(this);
+    },
+
+    set(value) {
+      instanceOwner.set(this, value);
+    },
+  });
+
+  Object.defineProperty(EmberObject.prototype, INIT_FACTORY, {
+    get() {
+      return instanceFactory.get(this);
+    },
+
+    set(value) {
+      instanceFactory.set(this, value);
+    },
+  });
 }
 
 setName(EmberObject, 'Ember.Object');
@@ -55,7 +62,7 @@ export let FrameworkObject;
 
 FrameworkObject = class FrameworkObject extends CoreObject {
   get _debugContainerKey() {
-    let factory = FACTORY_FOR.get(this);
+    let factory = getFactoryFor(this);
     return factory !== undefined && factory.fullName;
   }
 
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index 5d46ece0bad..b0f3b827f09 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,7 +1,7 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { get, set, observer } from '@ember/-internals/metal';
+import { get, set } from '@ember/-internals/metal';
 import CoreObject from '../../lib/system/core_object';
-import { moduleFor, AbstractTestCase, buildOwner, runLoopSettled } from 'internal-test-helpers';
+import { moduleFor, AbstractTestCase, buildOwner } from 'internal-test-helpers';
 import { track } from '@glimmer/validator';
 
 moduleFor(
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index 95427e74017..c837f780348 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -8,7 +8,7 @@
  Utility methods that are needed in < 80% of cases should be placed
  elsewhere (so they can be lazily evaluated / parsed).
 */
-export { default as symbol, isInternalSymbol } from './lib/symbol';
+export { symbol, enumerableSymbol, isInternalSymbol } from './lib/symbol';
 export { default as dictionary } from './lib/dictionary';
 export { default as getDebugName } from './lib/get-debug-name';
 export { default as getOwnPropertyDescriptors } from './lib/get-own-property-descriptors';
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index df291262fb4..81f43362eff 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -1,4 +1,4 @@
-import symbol from './symbol';
+import { symbol } from './symbol';
 
 export const EMBER_ARRAY = symbol('EMBER_ARRAY');
 
diff --git a/packages/@ember/-internals/utils/lib/symbol.ts b/packages/@ember/-internals/utils/lib/symbol.ts
index 0e11de4b5b3..849a176453a 100644
--- a/packages/@ember/-internals/utils/lib/symbol.ts
+++ b/packages/@ember/-internals/utils/lib/symbol.ts
@@ -1,5 +1,7 @@
+import { DEBUG } from '@glimmer/env';
 import { GUID_KEY } from './guid';
 import intern from './intern';
+import { HAS_NATIVE_SYMBOL } from './symbol-utils';
 
 const GENERATED_SYMBOLS: string[] = [];
 
@@ -7,12 +9,21 @@ export function isInternalSymbol(possibleSymbol: string) {
   return GENERATED_SYMBOLS.indexOf(possibleSymbol) !== -1;
 }
 
-export default function symbol(debugName: string): string {
+// Some legacy symbols still need to be enumerable for a variety of reasons.
+// This code exists for that, and as a fallback in IE11. In general, prefer
+// `symbol` below when creating a new symbol.
+export function enumerableSymbol(debugName: string): string {
   // TODO: Investigate using platform symbols, but we do not
   // want to require non-enumerability for this API, which
   // would introduce a large cost.
   let id = GUID_KEY + Math.floor(Math.random() * Date.now());
   let symbol = intern(`__${debugName}${id}__`);
-  GENERATED_SYMBOLS.push(symbol);
+
+  if (DEBUG) {
+    GENERATED_SYMBOLS.push(symbol);
+  }
+
   return symbol;
 }
+
+export const symbol = HAS_NATIVE_SYMBOL ? Symbol : enumerableSymbol;

From 9dcbfcc5ce56b5a4d50fd891f132b9eafe249cbf Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 9 Aug 2020 22:14:26 -0400
Subject: [PATCH 0075/1405] Update template compiler plugins to use specialized
 ASTPluginEnvironment.

This allows us to thread through custom options and have them be typed
properly (e.g. `env.meta` no longer needs to be cast to
`StaticTemplateMeta`).
---
 .../plugins/assert-against-named-blocks.ts    |  8 ++---
 .../assert-if-helper-without-arguments.ts     |  8 ++---
 .../assert-input-helper-without-block.ts      |  8 ++---
 ...al-variable-shadowing-helper-invocation.ts |  8 ++---
 .../assert-reserved-named-arguments.ts        |  8 ++---
 .../plugins/assert-splattribute-expression.ts |  8 ++---
 .../lib/plugins/deprecate-send-action.ts      | 14 +++++----
 .../lib/plugins/index.ts                      |  5 +---
 .../lib/plugins/transform-action-syntax.ts    |  6 ++--
 .../lib/plugins/transform-attrs-into-args.ts  |  5 ++--
 .../plugins/transform-component-invocation.ts |  9 +++---
 .../plugins/transform-each-in-into-each.ts    |  5 ++--
 .../lib/plugins/transform-each-track-array.ts |  5 ++--
 .../lib/plugins/transform-has-block-syntax.ts |  6 ++--
 .../lib/plugins/transform-in-element.ts       |  8 ++---
 .../lib/plugins/transform-link-to.ts          | 13 ++++-----
 .../transform-old-class-binding-syntax.ts     |  6 ++--
 .../transform-wrap-mount-and-outlet.ts        |  5 ++--
 .../lib/system/compile-options.ts             | 27 +++++------------
 .../lib/system/compile.ts                     |  2 +-
 .../lib/system/precompile.ts                  | 11 ++++---
 .../ember-template-compiler/lib/types.d.ts    | 29 ++++++++++++++++++-
 .../tests/utils/transform-test-case.ts        |  2 +-
 23 files changed, 115 insertions(+), 91 deletions(-)

diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
index 376d5e53994..f071f1c4db6 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
@@ -1,7 +1,7 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 
 /**
  @module ember
@@ -13,8 +13,8 @@ import calculateLocationDisplay from '../system/calculate-location-display';
   @private
   @class AssertAgainstNamedBlocks
 */
-export default function assertAgainstNamedBlocks(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function assertAgainstNamedBlocks(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
 
   return {
     name: 'assert-against-named-blocks',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts
index a988b7eb151..15f3e642f34 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts
@@ -1,11 +1,11 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
-export default function assertIfHelperWithoutArguments(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function assertIfHelperWithoutArguments(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
 
   return {
     name: 'assert-if-helper-without-arguments',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
index ef913ff209c..b8a5fbe62e9 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
@@ -1,11 +1,11 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
-export default function errorOnInputWithContent(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function errorOnInputWithContent(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
 
   return {
     name: 'assert-input-helper-without-block',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts b/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
index 00a475a8466..fdbe1fd93c4 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
@@ -1,13 +1,13 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath, trackLocals } from './utils';
 
 export default function assertLocalVariableShadowingHelperInvocation(
-  env: ASTPluginEnvironment
+  env: EmberASTPluginEnvironment
 ): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+  let { moduleName } = env.meta;
   let { hasLocal, node } = trackLocals();
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
index b84a045e74e..76e4344c008 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
@@ -1,10 +1,10 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 
-export default function assertReservedNamedArguments(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function assertReservedNamedArguments(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
 
   return {
     name: 'assert-reserved-named-arguments',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
index bb5a443318d..79c03ae40d3 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
@@ -1,10 +1,10 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 
-export default function assertSplattributeExpressions(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function assertSplattributeExpressions(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
 
   return {
     name: 'assert-splattribute-expressions',
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
index 644497a0e7c..04a8b5a91ed 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
@@ -1,8 +1,8 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { deprecate } from '@ember/debug';
 import { SEND_ACTION } from '@ember/deprecated-features';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 const EVENTS = [
@@ -16,9 +16,9 @@ const EVENTS = [
   'key-down',
 ];
 
-export default function deprecateSendAction(env: ASTPluginEnvironment): ASTPlugin | undefined {
+export default function deprecateSendAction(env: EmberASTPluginEnvironment): ASTPlugin {
   if (SEND_ACTION) {
-    let { moduleName } = env.meta as StaticTemplateMeta;
+    let { moduleName } = env.meta;
 
     let deprecationMessage = (node: AST.Node, eventName: string, actionName: string) => {
       let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
@@ -83,5 +83,9 @@ export default function deprecateSendAction(env: ASTPluginEnvironment): ASTPlugi
       },
     };
   }
-  return;
+
+  return {
+    name: 'deprecate-send-action',
+    visitor: {},
+  };
 }
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 07266ab0bdb..a882a0e4dce 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -19,12 +19,9 @@ import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
 import { EMBER_NAMED_BLOCKS } from '@ember/canary-features';
 import { SEND_ACTION } from '@ember/deprecated-features';
-import { ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
-
-export type APluginFunc = (env: ASTPluginEnvironment) => ASTPlugin | undefined;
 
 // order of plugins is important
-const transforms: Array<APluginFunc> = [
+const transforms = [
   TransformComponentInvocation,
   TransformOldClassBindingSyntax,
   TransformQuotedBindingsIntoJustBindings,
diff --git a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
index c74f6f64186..69c41a4774c 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
@@ -1,5 +1,5 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
-import { Builders } from '../types';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { Builders, EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
@@ -27,7 +27,7 @@ import { isPath } from './utils';
   @class TransformActionSyntax
 */
 
-export default function transformActionSyntax({ syntax }: ASTPluginEnvironment): ASTPlugin {
+export default function transformActionSyntax({ syntax }: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
index 31286ab7420..2981c52e2e7 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
@@ -1,4 +1,5 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { EmberASTPluginEnvironment } from '../types';
 
 /**
  @module ember
@@ -24,7 +25,7 @@ import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
   @class TransformAttrsToProps
 */
 
-export default function transformAttrsIntoArgs(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
 
   let stack: string[][] = [[]];
diff --git a/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts b/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
index 0a2c3f9e0a3..4f289264c14 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
@@ -1,7 +1,6 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { Builders } from '../types';
+import { Builders, EmberASTPluginEnvironment } from '../types';
 import { isPath, trackLocals } from './utils';
 
 /**
@@ -122,8 +121,8 @@ import { isPath, trackLocals } from './utils';
   @private
   @class TransFormComponentInvocation
 */
-export default function transformComponentInvocation(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function transformComponentInvocation(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
   let { builders: b } = env.syntax;
 
   let { hasLocal, node } = trackLocals();
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
index e661375ddb5..cfc457929e7 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
@@ -1,4 +1,5 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
@@ -21,7 +22,7 @@ import { isPath } from './utils';
   @private
   @class TransformHasBlockSyntax
 */
-export default function transformEachInIntoEach(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformEachInIntoEach(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
index 5df9fd54f46..af17e511e19 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
@@ -1,4 +1,5 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
@@ -21,7 +22,7 @@ import { isPath } from './utils';
   @private
   @class TransformHasBlockSyntax
 */
-export default function transformEachTrackArray(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformEachTrackArray(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
index cff677493a2..0a9a4e090b7 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
@@ -1,5 +1,7 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
+
 /**
  @module ember
 */
@@ -26,7 +28,7 @@ const TRANSFORMATIONS = {
   hasBlockParams: 'has-block-params',
 };
 
-export default function transformHasBlockSyntax(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 9a84aed7b40..806881a377a 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -1,8 +1,8 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { EMBER_GLIMMER_IN_ELEMENT } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
@@ -42,8 +42,8 @@ import { isPath } from './utils';
   @private
   @class TransformInElement
 */
-export default function transformInElement(env: ASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta as StaticTemplateMeta;
+export default function transformInElement(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
   let { builders: b } = env.syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
index a2dec50c710..d66269e2145 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
@@ -1,8 +1,7 @@
-import { StaticTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { Builders } from '../types';
+import { Builders, EmberASTPluginEnvironment } from '../types';
 import { isPath, isSubExpression } from './utils';
 
 function isInlineLinkTo(node: AST.MustacheStatement): boolean {
@@ -18,7 +17,7 @@ function isQueryParams(node: AST.Expression): node is AST.SubExpression {
 }
 
 function transformInlineLinkToIntoBlockForm(
-  env: ASTPluginEnvironment,
+  env: EmberASTPluginEnvironment,
   node: AST.MustacheStatement
 ): AST.BlockStatement {
   let { builders: b } = env.syntax;
@@ -39,11 +38,11 @@ function transformInlineLinkToIntoBlockForm(
 }
 
 function transformPositionalLinkToIntoNamedArguments(
-  env: ASTPluginEnvironment,
+  env: EmberASTPluginEnvironment,
   node: AST.BlockStatement
 ): AST.BlockStatement {
   let { builders: b } = env.syntax;
-  let { moduleName } = env.meta as StaticTemplateMeta;
+  let { moduleName } = env.meta;
   let {
     params,
     hash: { pairs },
@@ -181,7 +180,7 @@ function buildStatement(b: Builders, content: AST.Node, escaped: boolean, loc: A
   }
 }
 
-export default function transformLinkTo(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformLinkTo(env: EmberASTPluginEnvironment): ASTPlugin {
   return {
     name: 'transform-link-to',
 
diff --git a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
index 6002c95dddd..f5f2573d220 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
@@ -1,7 +1,7 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
-import { Builders } from '../types';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { Builders, EmberASTPluginEnvironment } from '../types';
 
-export default function transformOldClassBindingSyntax(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformOldClassBindingSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
   let b = env.syntax.builders;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
index a2e01ef36c8..97a1bd6914c 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
@@ -1,4 +1,5 @@
-import { AST, ASTPlugin, ASTPluginEnvironment } from '@glimmer/syntax';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import { EmberASTPluginEnvironment } from '../types';
 import { isPath, trackLocals } from './utils';
 
 /**
@@ -33,7 +34,7 @@ import { isPath, trackLocals } from './utils';
   @private
   @class TransformHasBlockSyntax
 */
-export default function transformWrapMountAndOutlet(env: ASTPluginEnvironment): ASTPlugin {
+export default function transformWrapMountAndOutlet(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
 
   let { hasLocal, node } = trackLocals();
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 47c961949ed..c7457de3fe0 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,26 +1,15 @@
 import { assign } from '@ember/polyfills';
-import { PrecompileOptions } from '@glimmer/compiler';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
-import PLUGINS, { APluginFunc } from '../plugins/index';
+import PLUGINS from '../plugins/index';
+import { CompileOptions, EmberPrecompileOptions, PluginFunc } from '../types';
 import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
 
-type PluginFunc = APluginFunc & {
-  __raw?: LegacyPluginClass | undefined;
-};
 let USER_PLUGINS: PluginFunc[] = [];
 
-interface Plugins {
-  ast: PluginFunc[];
-}
-
-export interface CompileOptions {
-  meta?: any;
-  moduleName?: string | undefined;
-  plugins?: Plugins | undefined;
-}
-
-export default function compileOptions(_options: Partial<CompileOptions> = {}): PrecompileOptions {
-  let options = assign({ meta: {} }, _options, {
+export default function compileOptions(
+  _options: Partial<CompileOptions> = {}
+): EmberPrecompileOptions {
+  let options: EmberPrecompileOptions = assign({ meta: {}, plugins: { ast: [] } }, _options, {
     customizeComponentName(tagname: string): string {
       return COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get(tagname);
     },
@@ -32,13 +21,13 @@ export default function compileOptions(_options: Partial<CompileOptions> = {}):
     meta.moduleName = options.moduleName;
   }
 
-  if (!options.plugins) {
+  if (!_options.plugins) {
     options.plugins = { ast: [...USER_PLUGINS, ...PLUGINS] };
   } else {
     let potententialPugins = [...USER_PLUGINS, ...PLUGINS];
     let providedPlugins = options.plugins.ast.map(plugin => wrapLegacyPluginIfNeeded(plugin));
     let pluginsToAdd = potententialPugins.filter(plugin => {
-      return options.plugins!.ast.indexOf(plugin) === -1;
+      return options.plugins.ast.indexOf(plugin) === -1;
     });
     options.plugins.ast = providedPlugins.concat(pluginsToAdd);
   }
diff --git a/packages/ember-template-compiler/lib/system/compile.ts b/packages/ember-template-compiler/lib/system/compile.ts
index 41e400d385f..87241d904e9 100644
--- a/packages/ember-template-compiler/lib/system/compile.ts
+++ b/packages/ember-template-compiler/lib/system/compile.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import require, { has } from 'require';
-import { CompileOptions } from './compile-options';
+import { CompileOptions } from '../types';
 import precompile from './precompile';
 
 // FIXME
diff --git a/packages/ember-template-compiler/lib/system/precompile.ts b/packages/ember-template-compiler/lib/system/precompile.ts
index d74fa690b06..691a6036017 100644
--- a/packages/ember-template-compiler/lib/system/precompile.ts
+++ b/packages/ember-template-compiler/lib/system/precompile.ts
@@ -2,8 +2,9 @@
 @module ember
 */
 
-import { precompile as glimmerPrecompile } from '@glimmer/compiler';
-import compileOptions, { CompileOptions } from './compile-options';
+import { precompile as glimmerPrecompile, PrecompileOptions } from '@glimmer/compiler';
+import { CompileOptions } from '../types';
+import compileOptions from './compile-options';
 
 /**
   Uses HTMLBars `compile` function to process a string into a compiled template string.
@@ -15,6 +16,8 @@ import compileOptions, { CompileOptions } from './compile-options';
   @method precompile
   @param {String} templateString This is the string to be compiled by HTMLBars.
 */
-export default function precompile(templateString: string, options: CompileOptions = {}): string {
-  return glimmerPrecompile(templateString, compileOptions(options));
+export default function precompile(templateString: string, _options: CompileOptions = {}): string {
+  let options: PrecompileOptions = compileOptions(_options) as any;
+
+  return glimmerPrecompile(templateString, options);
 }
diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts
index 9537ac057fd..e2af1fe70cf 100644
--- a/packages/ember-template-compiler/lib/types.d.ts
+++ b/packages/ember-template-compiler/lib/types.d.ts
@@ -1,3 +1,30 @@
-import { builders } from '@glimmer/syntax';
+import { ASTPlugin, ASTPluginEnvironment, builders } from '@glimmer/syntax';
+import { StaticTemplateMeta } from '@ember/-internals/views';
 
 export type Builders = typeof builders;
+
+export interface PluginFunc {
+  (env: EmberASTPluginEnvironment): ASTPlugin;
+  __raw?: LegacyPluginClass;
+}
+
+interface Plugins {
+  ast: PluginFunc[];
+}
+
+export interface CompileOptions {
+  meta?: any;
+  contents?: string;
+  moduleName?: string;
+  plugins?: Plugins;
+}
+
+export interface EmberPrecompileOptions {
+  customizeComponentName(tag: string): string;
+  contents?: string;
+  moduleName?: string;
+  plugins: Plugins;
+  meta: StaticTemplateMeta;
+}
+
+export type EmberASTPluginEnvironment = ASTPluginEnvironment & EmberPrecompileOptions;
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 1a18c7b975f..28a8dd4eb32 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -33,7 +33,7 @@ function ast(template: string): AST.Program {
 
   options.plugins!.ast!.push(extractProgram);
 
-  precompile(template, options);
+  precompile(template, options as any);
 
   return program!;
 }

From 79f173591107c93d54c84ca3cc835d14a56d8783 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 9 Aug 2020 22:15:56 -0400
Subject: [PATCH 0076/1405] Add `isProduction` option to
 `compile`/`precompile`.

---
 .../lib/system/compile-options.ts                  | 14 +++++++++-----
 packages/ember-template-compiler/lib/types.d.ts    |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index c7457de3fe0..47100dfe1ca 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -9,11 +9,15 @@ let USER_PLUGINS: PluginFunc[] = [];
 export default function compileOptions(
   _options: Partial<CompileOptions> = {}
 ): EmberPrecompileOptions {
-  let options: EmberPrecompileOptions = assign({ meta: {}, plugins: { ast: [] } }, _options, {
-    customizeComponentName(tagname: string): string {
-      return COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get(tagname);
-    },
-  });
+  let options: EmberPrecompileOptions = assign(
+    { meta: {}, isProduction: false, plugins: { ast: [] } },
+    _options,
+    {
+      customizeComponentName(tagname: string): string {
+        return COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get(tagname);
+      },
+    }
+  );
 
   // move `moduleName` into `meta` property
   if (options.moduleName) {
diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts
index e2af1fe70cf..016fa37827f 100644
--- a/packages/ember-template-compiler/lib/types.d.ts
+++ b/packages/ember-template-compiler/lib/types.d.ts
@@ -17,10 +17,12 @@ export interface CompileOptions {
   contents?: string;
   moduleName?: string;
   plugins?: Plugins;
+  isProduction?: boolean;
 }
 
 export interface EmberPrecompileOptions {
   customizeComponentName(tag: string): string;
+  isProduction: boolean;
   contents?: string;
   moduleName?: string;
   plugins: Plugins;

From 2e7b2be3bf84bffb6ddb7588fac40796ad94090e Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 9 Aug 2020 22:20:33 -0400
Subject: [PATCH 0077/1405] Avoid usage of
 `-assert-implicit-component-helper-argument` in production.

---
 .../plugins/transform-component-invocation.ts | 20 ++++++++++---------
 .../transform-component-invocation-test.js    | 17 +++++++++++++++-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts b/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
index 4f289264c14..103a1f28e4a 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
@@ -122,9 +122,6 @@ import { isPath, trackLocals } from './utils';
   @class TransFormComponentInvocation
 */
 export default function transformComponentInvocation(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
-  let { builders: b } = env.syntax;
-
   let { hasLocal, node } = trackLocals();
 
   let isAttrs = false;
@@ -153,13 +150,13 @@ export default function transformComponentInvocation(env: EmberASTPluginEnvironm
 
       BlockStatement(node: AST.BlockStatement) {
         if (isBlockInvocation(node, hasLocal)) {
-          wrapInComponent(moduleName, node, b);
+          wrapInComponent(env, node);
         }
       },
 
       MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
         if (!isAttrs && isInlineInvocation(node, hasLocal)) {
-          wrapInComponent(moduleName, node, b);
+          wrapInComponent(env, node);
         }
       },
     },
@@ -220,11 +217,16 @@ function wrapInAssertion(moduleName: string, node: AST.PathExpression, b: Builde
 }
 
 function wrapInComponent(
-  moduleName: string,
-  node: AST.MustacheStatement | AST.BlockStatement,
-  b: Builders
+  env: EmberASTPluginEnvironment,
+  node: AST.MustacheStatement | AST.BlockStatement
 ) {
-  let component = wrapInAssertion(moduleName, node.path as AST.PathExpression, b);
+  let { moduleName } = env.meta;
+  let { builders: b } = env.syntax;
+
+  let component = env.isProduction
+    ? node.path
+    : wrapInAssertion(moduleName, node.path as AST.PathExpression, b);
+
   node.path = b.path('component');
   node.params.unshift(component);
 }
diff --git a/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js b/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js
index c91857cb088..b693cec4030 100644
--- a/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js
+++ b/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js
@@ -1,4 +1,4 @@
-import { compile } from '../../index';
+import { compile, precompile } from '../../index';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -26,5 +26,20 @@ moduleFor(
         compile(layout, { moduleName: `example-${i}` });
       });
     }
+
+    '@test production compilation results in smaller template size'(assert) {
+      let layout = `{{this.modal open}}`;
+
+      let debugOutput = precompile(layout, { moduleName: `example.hbs` });
+      let prodOutput = precompile(layout, { isProduction: true, moduleName: `example.hbs` });
+
+      assert.notStrictEqual(
+        prodOutput,
+        debugOutput,
+        'expected output to differ between prod and non-prod'
+      );
+
+      assert.ok(prodOutput.length < debugOutput.length, 'prod output is smaller');
+    }
   }
 );

From 0cbf985347170431af07660497c2028a8f63898f Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sun, 9 Aug 2020 22:25:50 -0400
Subject: [PATCH 0078/1405] Avoid usage of `-in-el-null` in production.

---
 .../ember-template-compiler/lib/plugins/transform-in-element.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 806881a377a..5ae9ffc6363 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -57,7 +57,7 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
           if (EMBER_GLIMMER_IN_ELEMENT) {
             let originalValue = node.params[0];
 
-            if (originalValue) {
+            if (originalValue && !env.isProduction) {
               let subExpr = b.sexpr('-in-el-null', [originalValue]);
 
               node.params.shift();

From 56495f7655d9021f31fbdbfb6eaa4d433c633872 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sun, 9 Aug 2020 08:15:23 -0700
Subject: [PATCH 0079/1405] address comments

---
 .../-internals/container/lib/container.ts     | 32 +++++++--------
 .../container/tests/container_test.js         |  4 +-
 .../-internals/container/tests/owner_test.js  |  2 +
 .../@ember/-internals/glimmer/lib/renderer.ts | 28 ++++---------
 .../-internals/glimmer/lib/views/outlet.ts    |  4 +-
 .../@ember/-internals/metal/lib/events.ts     |  8 ++--
 packages/@ember/-internals/owner/index.ts     |  2 +-
 .../runtime/lib/system/core_object.js         | 39 +++++++++++++++++--
 .../-internals/runtime/lib/system/object.js   | 37 +-----------------
 .../runtime/tests/system/core_object_test.js  | 30 +++++++++++++-
 .../tests/system/object/create_test.js        | 34 ++++++++++++++++
 11 files changed, 134 insertions(+), 86 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 4d48babce06..f52d31c5331 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -246,7 +246,7 @@ if (DEBUG) {
  * Wrap a factory manager in a proxy which will not permit properties to be
  * set on the manager.
  */
-function wrapManagerInDeprecationProxy<T, C>(manager: FactoryManager<T, C>) {
+function wrapManagerInDeprecationProxy<T, C>(manager: FactoryManager<T, C>): FactoryManager<T, C> {
   if (HAS_NATIVE_PROXY) {
     let validator = {
       set(_obj: T, prop: keyof T) {
@@ -267,8 +267,7 @@ function wrapManagerInDeprecationProxy<T, C>(manager: FactoryManager<T, C>) {
       },
     };
 
-    let proxy = new Proxy(proxiedManager, validator as any);
-    // FACTORY_FOR.set(proxy, manager);
+    return new Proxy(proxiedManager, validator as any) as any;
   }
 
   return manager;
@@ -434,7 +433,7 @@ function instantiateFactory(
 }
 
 interface BuildInjectionsResult {
-  injections: { [key: string]: object } | undefined;
+  injections: { [key: string]: unknown };
   isDynamic: boolean;
 }
 
@@ -448,9 +447,6 @@ function processInjections(
   }
 
   let hash = result.injections;
-  if (hash === undefined) {
-    hash = result.injections = {};
-  }
 
   for (let i = 0; i < injections.length; i++) {
     let { property, specifier, source } = injections[i];
@@ -472,8 +468,12 @@ function buildInjections(
   typeInjections: Injection[],
   injections: Injection[]
 ): BuildInjectionsResult {
+  let injectionsHash = {};
+
+  setOwner(injectionsHash, container.owner!);
+
   let result: BuildInjectionsResult = {
-    injections: undefined,
+    injections: injectionsHash,
     isDynamic: false,
   };
 
@@ -560,7 +560,7 @@ class FactoryManager<T, C> {
   readonly fullName: string;
   readonly normalizedName: string;
   private madeToString: string | undefined;
-  injections: { [key: string]: object } | undefined;
+  injections: { [key: string]: unknown } | undefined;
 
   constructor(
     container: Container,
@@ -598,9 +598,8 @@ class FactoryManager<T, C> {
     let props = this.injections;
     if (props === undefined) {
       let { injections, isDynamic } = injectionsFor(this.container, this.normalizedName);
-      props = injections || {};
-      setOwner(props, this.owner!);
-      props[INIT_FACTORY as string] = this;
+      setFactoryFor(injections, this);
+      props = injections;
 
       if (!isDynamic) {
         this.injections = injections;
@@ -628,11 +627,10 @@ class FactoryManager<T, C> {
 
       validationCache[this.fullName] = true;
 
-      if (!this.class.create) {
-        throw new Error(
-          `Failed to create an instance of '${this.normalizedName}'. Most likely an improperly defined class or an invalid module export.`
-        );
-      }
+      assert(
+        `Failed to create an instance of '${this.normalizedName}'. Most likely an improperly defined class or an invalid module export.`,
+        typeof this.class.create === 'function'
+      );
     }
 
     return this.class.create(props);
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index ff13325ac76..4c5edcd8719 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -190,13 +190,13 @@ moduleFor(
       assert.equal(container.lookup('doesnot:exist'), undefined);
     }
 
-    ['@test An invalid factory throws an error'](assert) {
+    ['@test An invalid factory throws an error']() {
       let registry = new Registry();
       let container = registry.container();
 
       registry.register('controller:foo', {});
 
-      assert.throws(() => {
+      expectAssertion(() => {
         container.lookup('controller:foo');
       }, /Failed to create an instance of 'controller:foo'/);
     }
diff --git a/packages/@ember/-internals/container/tests/owner_test.js b/packages/@ember/-internals/container/tests/owner_test.js
index f5de21843f9..33e10eecfa3 100644
--- a/packages/@ember/-internals/container/tests/owner_test.js
+++ b/packages/@ember/-internals/container/tests/owner_test.js
@@ -25,6 +25,8 @@ moduleFor(
 
       let legacyOwner;
 
+      // This is not something we expect to happen a lot, but does exist currently
+      // in the wild: https://github.com/hjdivad/ember-m3/pull/822
       for (let key in obj) {
         legacyOwner = key;
       }
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 450cf8310aa..72f1601ce78 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import { OWNER, Owner } from '@ember/-internals/owner';
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
@@ -543,22 +543,15 @@ export abstract class Renderer {
 }
 
 export class InertRenderer extends Renderer {
-  static create({
-    [OWNER]: owner,
-    document,
-    env,
-    rootTemplate,
-    _viewRegistry,
-    builder,
-  }: {
-    [OWNER]: Owner;
+  static create(props: {
     document: SimpleDocument;
     env: { isInteractive: boolean; hasDOM: boolean };
     rootTemplate: TemplateFactory;
     _viewRegistry: any;
     builder: any;
   }) {
-    return new this(owner, document, env, rootTemplate, _viewRegistry, false, builder);
+    let { document, env, rootTemplate, _viewRegistry, builder } = props;
+    return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, false, builder);
   }
 
   getElement(_view: unknown): Option<SimpleElement> {
@@ -569,22 +562,15 @@ export class InertRenderer extends Renderer {
 }
 
 export class InteractiveRenderer extends Renderer {
-  static create({
-    [OWNER]: owner,
-    document,
-    env,
-    rootTemplate,
-    _viewRegistry,
-    builder,
-  }: {
-    [OWNER]: Owner;
+  static create(props: {
     document: SimpleDocument;
     env: { isInteractive: boolean; hasDOM: boolean };
     rootTemplate: TemplateFactory;
     _viewRegistry: any;
     builder: any;
   }) {
-    return new this(owner, document, env, rootTemplate, _viewRegistry, true, builder);
+    let { document, env, rootTemplate, _viewRegistry, builder } = props;
+    return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, true, builder);
   }
 
   getElement(view: unknown): Option<SimpleElement> {
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 2e871d687cc..8be846a0647 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,4 +1,4 @@
-import { OWNER, Owner } from '@ember/-internals/owner';
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import { schedule } from '@ember/runloop';
 import { SimpleElement } from '@simple-dom/interface';
@@ -35,7 +35,7 @@ export default class OutletView {
 
   static create(options: any) {
     let { _environment, renderer, template: templateFactory } = options;
-    let owner = options[OWNER];
+    let owner = getOwner(options);
     let template = templateFactory(owner);
     return new OutletView(_environment, renderer, owner, template);
   }
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index bac978b4a5b..cd9da74f243 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -146,11 +146,13 @@ export function sendEvent(
     if (!target) {
       target = obj;
     }
-    if (typeof method === 'string' || typeof method === 'symbol') {
-      method = target[method] as Function;
+
+    let type = typeof method;
+    if (type === 'string' || type === 'symbol') {
+      method = target[method as string] as Function;
     }
 
-    method.apply(target, params);
+    (method as Function).apply(target, params);
   }
   return true;
 }
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 6f25b433ff7..218ae9cb4b5 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -40,7 +40,7 @@ export interface Owner {
 import { enumerableSymbol, symbol } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
 
-export const LEGACY_OWNER: unique symbol = enumerableSymbol('OWNER') as any;
+export const LEGACY_OWNER: unique symbol = enumerableSymbol('LEGACY_OWNER') as any;
 export const OWNER: unique symbol = symbol('OWNER') as any;
 
 /**
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index dbb0167f907..a8f209d9153 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -2,8 +2,8 @@
   @module @ember/object
 */
 
-import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
-import { getOwner, OWNER } from '@ember/-internals/owner';
+import { getFactoryFor, setFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
+import { getOwner, LEGACY_OWNER, OWNER } from '@ember/-internals/owner';
 import { assign, _WeakSet as WeakSet } from '@ember/polyfills';
 import {
   guidFor,
@@ -11,6 +11,7 @@ import {
   setName,
   makeArray,
   HAS_NATIVE_PROXY,
+  HAS_NATIVE_SYMBOL,
   isInternalSymbol,
 } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
@@ -196,7 +197,9 @@ function initialize(obj, properties) {
 */
 class CoreObject {
   constructor(owner) {
-    // pluck off factory and set it as the instance factory
+    // setOwner has to set both OWNER and LEGACY_OWNER for backwards compatibility, and
+    // LEGACY_OWNER is enumerable, so setting it would add an enumerable property to the object,
+    // so we just set `OWNER` directly here.
     this[OWNER] = owner;
 
     // prepare prototype...
@@ -266,6 +269,10 @@ class CoreObject {
     }
   }
 
+  // Empty setter for absorbing setting the LEGACY_OWNER, which should _not_
+  // become an enumerable property, and should not be used in general.
+  set [LEGACY_OWNER](value) {}
+
   reopen(...args) {
     applyMixin(this, args);
     return this;
@@ -1068,4 +1075,30 @@ if (DEBUG) {
   };
 }
 
+if (!HAS_NATIVE_SYMBOL) {
+  // Allows OWNER and INIT_FACTORY to be non-enumerable in IE11
+  let instanceOwner = new WeakMap();
+  let instanceFactory = new WeakMap();
+
+  Object.defineProperty(CoreObject.prototype, OWNER, {
+    get() {
+      return instanceOwner.get(this);
+    },
+
+    set(value) {
+      instanceOwner.set(this, value);
+    },
+  });
+
+  Object.defineProperty(CoreObject.prototype, INIT_FACTORY, {
+    get() {
+      return instanceFactory.get(this);
+    },
+
+    set(value) {
+      instanceFactory.set(this, value);
+    },
+  });
+}
+
 export default CoreObject;
diff --git a/packages/@ember/-internals/runtime/lib/system/object.js b/packages/@ember/-internals/runtime/lib/system/object.js
index c98d0f9cac3..e789731c3fc 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.js
+++ b/packages/@ember/-internals/runtime/lib/system/object.js
@@ -2,9 +2,8 @@
 @module @ember/object
 */
 
-import { getFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
-import { OWNER, setOwner } from '@ember/-internals/owner';
-import { HAS_NATIVE_SYMBOL, symbol, setName } from '@ember/-internals/utils';
+import { getFactoryFor } from '@ember/-internals/container';
+import { symbol, setName } from '@ember/-internals/utils';
 import { addListener } from '@ember/-internals/metal';
 import CoreObject from './core_object';
 import Observable from '../mixins/observable';
@@ -28,32 +27,6 @@ export default class EmberObject extends CoreObject {
   }
 }
 
-if (!HAS_NATIVE_SYMBOL) {
-  // Allows OWNER and INIT_FACTORY to be non-enumerable in IE11
-  let instanceOwner = new WeakMap();
-  let instanceFactory = new WeakMap();
-
-  Object.defineProperty(EmberObject.prototype, OWNER, {
-    get() {
-      return instanceOwner.get(this);
-    },
-
-    set(value) {
-      instanceOwner.set(this, value);
-    },
-  });
-
-  Object.defineProperty(EmberObject.prototype, INIT_FACTORY, {
-    get() {
-      return instanceFactory.get(this);
-    },
-
-    set(value) {
-      instanceFactory.set(this, value);
-    },
-  });
-}
-
 setName(EmberObject, 'Ember.Object');
 
 Observable.apply(EmberObject.prototype);
@@ -65,12 +38,6 @@ FrameworkObject = class FrameworkObject extends CoreObject {
     let factory = getFactoryFor(this);
     return factory !== undefined && factory.fullName;
   }
-
-  constructor(owner) {
-    super();
-
-    setOwner(this, owner);
-  }
 };
 
 Observable.apply(FrameworkObject.prototype);
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index b0f3b827f09..7007285dd5a 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,7 +1,7 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { get, set } from '@ember/-internals/metal';
+import { get, set, observer } from '@ember/-internals/metal';
 import CoreObject from '../../lib/system/core_object';
-import { moduleFor, AbstractTestCase, buildOwner } from 'internal-test-helpers';
+import { moduleFor, AbstractTestCase, buildOwner, runLoopSettled } from 'internal-test-helpers';
 import { track } from '@glimmer/validator';
 
 moduleFor(
@@ -85,6 +85,32 @@ moduleFor(
       }).create(options);
     }
 
+    async ['@test observed properties are enumerable when set GH#14594'](assert) {
+      let callCount = 0;
+      let Test = CoreObject.extend({
+        myProp: null,
+        anotherProp: undefined,
+        didChangeMyProp: observer('myProp', function() {
+          callCount++;
+        }),
+      });
+
+      let test = Test.create();
+      set(test, 'id', '3');
+      set(test, 'myProp', { id: 1 });
+
+      assert.deepEqual(Object.keys(test).sort(), ['id', 'myProp']);
+
+      set(test, 'anotherProp', 'nice');
+
+      assert.deepEqual(Object.keys(test).sort(), ['anotherProp', 'id', 'myProp']);
+      await runLoopSettled();
+
+      assert.equal(callCount, 1);
+
+      test.destroy();
+    }
+
     ['@test native getters/setters do not cause rendering invalidation during init'](assert) {
       let objectMeta = Object.create(null);
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 8911d422548..6f29bed135f 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -1,3 +1,4 @@
+import { getFactoryFor, Registry } from '@ember/-internals/container';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
 import { DEBUG } from '@glimmer/env';
@@ -219,5 +220,38 @@ moduleFor(
         },
       }).create(options);
     }
+
+    ['@test does not create enumerable properties for owner and init factory when created by the container factory'](
+      assert
+    ) {
+      let registry = new Registry();
+      let container = registry.container();
+      container.owner = {};
+
+      registry.register('component:foo-bar', EmberObject);
+
+      let componentFactory = container.factoryFor('component:foo-bar');
+      let instance = componentFactory.create();
+
+      assert.deepEqual(Object.keys(instance), [], 'no enumerable properties were added');
+      assert.equal(getOwner(instance), container.owner, 'owner was defined on the instance');
+      assert.ok(getFactoryFor(instance), 'factory was defined on the instance');
+    }
+
+    ['@test does not create enumerable properties for owner and init factory when looked up on the container'](
+      assert
+    ) {
+      let registry = new Registry();
+      let container = registry.container();
+      container.owner = {};
+
+      registry.register('component:foo-bar', EmberObject);
+
+      let instance = container.lookup('component:foo-bar');
+
+      assert.deepEqual(Object.keys(instance), [], 'no enumerable properties were added');
+      assert.equal(getOwner(instance), container.owner, 'owner was defined on the instance');
+      assert.ok(getFactoryFor(instance), 'factory was defined on the instance');
+    }
   }
 );

From f77f5a463764d68b807d6e78beb0961b998158d9 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 6 Aug 2020 07:10:17 -0700
Subject: [PATCH 0080/1405] [BUGFIX release] Simplify mixin application

Simplifies mixin application in a number of ways:

- Ensures that we only access `meta` once for a given object when
  applying mixins
- Ensures that we only `peekDescriptors` once for a given descriptor
- Minimizes the number of if/else branches and defaulting in general
- Breaks apart `defineProperty` so that we can do less work per
  definition when mixing in mixins, since we know more about what
  possible operations will occur.
- Removes extra brand checks from `defineProperty` (Array.isArray) so
  we don't penalize every defineProperty for doing that.
- Only revalidate observers once per mixin application.
- Only brand check `didDefineProperty` once per mixin application.
- Replace `for..in` loops with `Object.keys` since we only care about
  own properties.
- Only loop once in `extractAccessors`.
- Combine observer and listener meta into a single object so we only
  need to do one lookup. In most cases, this is undefined in modern
  applications, so no extra memory cost.
- Simplify CP descriptor property lookups (remove duplicate functions).
---
 packages/@ember/-internals/metal/index.ts     |   4 +-
 packages/@ember/-internals/metal/lib/alias.ts |   2 +-
 .../@ember/-internals/metal/lib/computed.ts   | 454 +++++++++---------
 .../@ember/-internals/metal/lib/decorator.ts  |  65 ++-
 .../-internals/metal/lib/descriptor_map.ts    |  58 ---
 packages/@ember/-internals/metal/lib/mixin.ts | 435 +++++++++--------
 .../@ember/-internals/metal/lib/properties.ts | 102 ++--
 .../@ember/-internals/metal/lib/tracked.ts    |   8 +-
 .../-internals/metal/tests/properties_test.js |  60 +--
 .../-internals/runtime/lib/mixins/array.js    |   2 +-
 packages/@ember/-internals/utils/index.ts     |   4 +-
 .../utils/lib/get-own-property-descriptors.ts |  17 -
 packages/@ember/-internals/utils/lib/super.ts |  44 +-
 13 files changed, 576 insertions(+), 679 deletions(-)
 delete mode 100644 packages/@ember/-internals/metal/lib/descriptor_map.ts
 delete mode 100644 packages/@ember/-internals/utils/lib/get-own-property-descriptors.ts

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 8791dc829ea..a54b8b9604e 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -38,13 +38,11 @@ export {
   DecoratorPropertyDescriptor,
   isElementDescriptor,
   nativeDescDecorator,
-} from './lib/decorator';
-export {
   descriptorForDecorator,
   descriptorForProperty,
   isClassicDecorator,
   setClassicDecorator,
-} from './lib/descriptor_map';
+} from './lib/decorator';
 export { default as libraries, Libraries } from './lib/libraries';
 export { default as getProperties } from './lib/get_properties';
 export { default as setProperties } from './lib/set_properties';
diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index 823abc96c49..6b1fe8ae701 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -16,10 +16,10 @@ import { finishLazyChains, getChainTagsForKey } from './chain-tags';
 import {
   ComputedDescriptor,
   Decorator,
+  descriptorForDecorator,
   isElementDescriptor,
   makeComputedDecorator,
 } from './decorator';
-import { descriptorForDecorator } from './descriptor_map';
 import { defineProperty } from './properties';
 import { get } from './property_get';
 import { set } from './property_set';
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 8c50f0247cf..57a35ac88d5 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -19,14 +19,12 @@ import {
   ComputedDescriptor,
   Decorator,
   DecoratorPropertyDescriptor,
-  isElementDescriptor,
-  makeComputedDecorator,
-} from './decorator';
-import {
   descriptorForDecorator,
   descriptorForProperty,
   isClassicDecorator,
-} from './descriptor_map';
+  isElementDescriptor,
+  makeComputedDecorator,
+} from './decorator';
 import expandProperties from './expand_properties';
 import { addObserver, setObserverSuspended } from './observer';
 import { defineProperty } from './properties';
@@ -251,8 +249,8 @@ function noop(): void {}
   @public
 */
 export class ComputedProperty extends ComputedDescriptor {
-  protected _volatile = false;
-  protected _readOnly = false;
+  _volatile = false;
+  _readOnly = false;
   protected _hasConfig = false;
 
   _getter?: ComputedPropertyGetter = undefined;
@@ -350,182 +348,6 @@ export class ComputedProperty extends ComputedDescriptor {
     }
   }
 
-  /**
-    Call on a computed property to set it into non-cached mode. When in this
-    mode the computed property will not automatically cache the return value.
-    It also does not automatically fire any change events. You must manually notify
-    any changes if you want to observe this property.
-
-    Dependency keys have no effect on volatile properties as they are for cache
-    invalidation and notification when cached value is invalidated.
-
-    Example:
-
-    ```javascript
-    import { computed } from '@ember/object';
-
-    class CallCounter {
-      _calledCount = 0;
-
-      @computed().volatile()
-      get calledCount() {
-        return this._calledCount++;
-      }
-    }
-    ```
-
-    Classic Class Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    let CallCounter = EmberObject.extend({
-      _calledCount: 0,
-
-      value: computed(function() {
-        return this._calledCount++;
-      }).volatile()
-    });
-    ```
-    @method volatile
-    @deprecated
-    @return {ComputedProperty} this
-    @chainable
-    @public
-  */
-  volatile(): void {
-    deprecate(
-      'Setting a computed property as volatile has been deprecated. Instead, consider using a native getter with native class syntax.',
-      false,
-      {
-        id: 'computed-property.volatile',
-        until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-volatile',
-      }
-    );
-
-    this._volatile = true;
-  }
-
-  /**
-    Call on a computed property to set it into read-only mode. When in this
-    mode the computed property will throw an error when set.
-
-    Example:
-
-    ```javascript
-    import { computed, set } from '@ember/object';
-
-    class Person {
-      @computed().readOnly()
-      get guid() {
-        return 'guid-guid-guid';
-      }
-    }
-
-    let person = new Person();
-    set(person, 'guid', 'new-guid'); // will throw an exception
-    ```
-
-    Classic Class Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    let Person = EmberObject.extend({
-      guid: computed(function() {
-        return 'guid-guid-guid';
-      }).readOnly()
-    });
-
-    let person = Person.create();
-    person.set('guid', 'new-guid'); // will throw an exception
-    ```
-
-    @method readOnly
-    @return {ComputedProperty} this
-    @chainable
-    @public
-  */
-  readOnly(): void {
-    this._readOnly = true;
-    assert(
-      'Computed properties that define a setter using the new syntax cannot be read-only',
-      !(this._readOnly && this._setter && this._setter !== this._getter)
-    );
-  }
-
-  /**
-    Sets the dependent keys on this computed property. Pass any number of
-    arguments containing key paths that this computed property depends on.
-
-    Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    class President {
-      constructor(firstName, lastName) {
-        set(this, 'firstName', firstName);
-        set(this, 'lastName', lastName);
-      }
-
-      // Tell Ember that this computed property depends on firstName
-      // and lastName
-      @computed().property('firstName', 'lastName')
-      get fullName() {
-        return `${this.firstName} ${this.lastName}`;
-      }
-    }
-
-    let president = new President('Barack', 'Obama');
-
-    president.fullName; // 'Barack Obama'
-    ```
-
-    Classic Class Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    let President = EmberObject.extend({
-      fullName: computed(function() {
-        return this.get('firstName') + ' ' + this.get('lastName');
-
-        // Tell Ember that this computed property depends on firstName
-        // and lastName
-      }).property('firstName', 'lastName')
-    });
-
-    let president = President.create({
-      firstName: 'Barack',
-      lastName: 'Obama'
-    });
-
-    president.get('fullName'); // 'Barack Obama'
-    ```
-
-    @method property
-    @deprecated
-    @param {String} path* zero or more property paths
-    @return {ComputedProperty} this
-    @chainable
-    @public
-  */
-  property(...passedArgs: string[]): void {
-    deprecate(
-      'Setting dependency keys using the `.property()` modifier has been deprecated. Pass the dependency keys directly to computed as arguments instead. If you are using `.property()` on a computed property macro, consider refactoring your macro to receive additional dependent keys in its initial declaration.',
-      false,
-      {
-        id: 'computed-property.property',
-        until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-property',
-      }
-    );
-
-    this._property(...passedArgs);
-  }
-
   _property(...passedArgs: string[]): void {
     let args: string[] = [];
 
@@ -547,53 +369,6 @@ export class ComputedProperty extends ComputedDescriptor {
     this._dependentKeys = args;
   }
 
-  /**
-    In some cases, you may want to annotate computed properties with additional
-    metadata about how they function or what values they operate on. For example,
-    computed property functions may close over variables that are then no longer
-    available for introspection. You can pass a hash of these values to a
-    computed property.
-
-    Example:
-
-    ```javascript
-    import { computed } from '@ember/object';
-    import Person from 'my-app/utils/person';
-
-    class Store {
-      @computed().meta({ type: Person })
-      get person() {
-        let personId = this.personId;
-        return Person.create({ id: personId });
-      }
-    }
-    ```
-
-    Classic Class Example:
-
-    ```javascript
-    import { computed } from '@ember/object';
-    import Person from 'my-app/utils/person';
-
-    const Store = EmberObject.extend({
-      person: computed(function() {
-        let personId = this.get('personId');
-        return Person.create({ id: personId });
-      }).meta({ type: Person })
-    });
-    ```
-
-    The hash that you pass to the `meta()` function will be saved on the
-    computed property descriptor under the `_meta` key. Ember runtime
-    exposes a public API for retrieving these values from classes,
-    via the `metaForProperty()` function.
-
-    @method meta
-    @param {Object} meta
-    @chainable
-    @public
-  */
-
   get(obj: object, keyName: string): any {
     if (this._volatile) {
       return this._getter!.call(obj, keyName);
@@ -833,21 +608,230 @@ export type ComputedDecorator = Decorator & PropertyDecorator & ComputedDecorato
 
 // TODO: This class can be svelted once `meta` has been deprecated
 class ComputedDecoratorImpl extends Function {
+  /**
+    Call on a computed property to set it into read-only mode. When in this
+    mode the computed property will throw an error when set.
+
+    Example:
+
+    ```javascript
+    import { computed, set } from '@ember/object';
+
+    class Person {
+      @computed().readOnly()
+      get guid() {
+        return 'guid-guid-guid';
+      }
+    }
+
+    let person = new Person();
+    set(person, 'guid', 'new-guid'); // will throw an exception
+    ```
+
+    Classic Class Example:
+
+    ```javascript
+    import EmberObject, { computed } from '@ember/object';
+
+    let Person = EmberObject.extend({
+      guid: computed(function() {
+        return 'guid-guid-guid';
+      }).readOnly()
+    });
+
+    let person = Person.create();
+    person.set('guid', 'new-guid'); // will throw an exception
+    ```
+
+    @method readOnly
+    @return {ComputedProperty} this
+    @chainable
+    @public
+  */
   readOnly(this: Decorator) {
-    (descriptorForDecorator(this) as ComputedProperty).readOnly();
+    let desc = descriptorForDecorator(this) as ComputedProperty;
+    assert(
+      'Computed properties that define a setter using the new syntax cannot be read-only',
+      !(desc._setter && desc._setter !== desc._getter)
+    );
+    desc._readOnly = true;
     return this;
   }
 
+  /**
+    Call on a computed property to set it into non-cached mode. When in this
+    mode the computed property will not automatically cache the return value.
+    It also does not automatically fire any change events. You must manually notify
+    any changes if you want to observe this property.
+
+    Dependency keys have no effect on volatile properties as they are for cache
+    invalidation and notification when cached value is invalidated.
+
+    Example:
+
+    ```javascript
+    import { computed } from '@ember/object';
+
+    class CallCounter {
+      _calledCount = 0;
+
+      @computed().volatile()
+      get calledCount() {
+        return this._calledCount++;
+      }
+    }
+    ```
+
+    Classic Class Example:
+
+    ```javascript
+    import EmberObject, { computed } from '@ember/object';
+
+    let CallCounter = EmberObject.extend({
+      _calledCount: 0,
+
+      value: computed(function() {
+        return this._calledCount++;
+      }).volatile()
+    });
+    ```
+    @method volatile
+    @deprecated
+    @return {ComputedProperty} this
+    @chainable
+    @public
+  */
   volatile(this: Decorator) {
-    (descriptorForDecorator(this) as ComputedProperty).volatile();
+    deprecate(
+      'Setting a computed property as volatile has been deprecated. Instead, consider using a native getter with native class syntax.',
+      false,
+      {
+        id: 'computed-property.volatile',
+        until: '4.0.0',
+        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-volatile',
+      }
+    );
+    (descriptorForDecorator(this) as ComputedProperty)._volatile = true;
     return this;
   }
 
+  /**
+    Sets the dependent keys on this computed property. Pass any number of
+    arguments containing key paths that this computed property depends on.
+
+    Example:
+
+    ```javascript
+    import EmberObject, { computed } from '@ember/object';
+
+    class President {
+      constructor(firstName, lastName) {
+        set(this, 'firstName', firstName);
+        set(this, 'lastName', lastName);
+      }
+
+      // Tell Ember that this computed property depends on firstName
+      // and lastName
+      @computed().property('firstName', 'lastName')
+      get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+      }
+    }
+
+    let president = new President('Barack', 'Obama');
+
+    president.fullName; // 'Barack Obama'
+    ```
+
+    Classic Class Example:
+
+    ```javascript
+    import EmberObject, { computed } from '@ember/object';
+
+    let President = EmberObject.extend({
+      fullName: computed(function() {
+        return this.get('firstName') + ' ' + this.get('lastName');
+
+        // Tell Ember that this computed property depends on firstName
+        // and lastName
+      }).property('firstName', 'lastName')
+    });
+
+    let president = President.create({
+      firstName: 'Barack',
+      lastName: 'Obama'
+    });
+
+    president.get('fullName'); // 'Barack Obama'
+    ```
+
+    @method property
+    @deprecated
+    @param {String} path* zero or more property paths
+    @return {ComputedProperty} this
+    @chainable
+    @public
+  */
   property(this: Decorator, ...keys: string[]) {
-    (descriptorForDecorator(this) as ComputedProperty).property(...keys);
+    deprecate(
+      'Setting dependency keys using the `.property()` modifier has been deprecated. Pass the dependency keys directly to computed as arguments instead. If you are using `.property()` on a computed property macro, consider refactoring your macro to receive additional dependent keys in its initial declaration.',
+      false,
+      {
+        id: 'computed-property.property',
+        until: '4.0.0',
+        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-property',
+      }
+    );
+    (descriptorForDecorator(this) as ComputedProperty)._property(...keys);
     return this;
   }
 
+  /**
+    In some cases, you may want to annotate computed properties with additional
+    metadata about how they function or what values they operate on. For example,
+    computed property functions may close over variables that are then no longer
+    available for introspection. You can pass a hash of these values to a
+    computed property.
+
+    Example:
+
+    ```javascript
+    import { computed } from '@ember/object';
+    import Person from 'my-app/utils/person';
+
+    class Store {
+      @computed().meta({ type: Person })
+      get person() {
+        let personId = this.personId;
+        return Person.create({ id: personId });
+      }
+    }
+    ```
+
+    Classic Class Example:
+
+    ```javascript
+    import { computed } from '@ember/object';
+    import Person from 'my-app/utils/person';
+
+    const Store = EmberObject.extend({
+      person: computed(function() {
+        let personId = this.get('personId');
+        return Person.create({ id: personId });
+      }).meta({ type: Person })
+    });
+    ```
+
+    The hash that you pass to the `meta()` function will be saved on the
+    computed property descriptor under the `_meta` key. Ember runtime
+    exposes a public API for retrieving these values from classes,
+    via the `metaForProperty()` function.
+
+    @method meta
+    @param {Object} meta
+    @chainable
+    @public
+  */
   meta(this: Decorator, meta?: any): any {
     let prop = descriptorForDecorator(this) as ComputedProperty;
 
@@ -861,12 +845,12 @@ class ComputedDecoratorImpl extends Function {
 
   // TODO: Remove this when we can provide alternatives in the ecosystem to
   // addons such as ember-macro-helpers that use it.
-  get _getter(this: Decorator) {
+  get _getter() {
     return (descriptorForDecorator(this) as ComputedProperty)._getter;
   }
 
   // TODO: Refactor this, this is an internal API only
-  set enumerable(this: Decorator, value: boolean) {
+  set enumerable(value: boolean) {
     (descriptorForDecorator(this) as ComputedProperty).enumerable = value;
   }
 }
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index aeace1d0d7b..62d2acd13d2 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -1,7 +1,6 @@
-import { Meta, meta as metaFor } from '@ember/-internals/meta';
+import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
 import { _WeakSet as WeakSet } from '@ember/polyfills';
-import { setClassicDecorator } from './descriptor_map';
 
 export type DecoratorPropertyDescriptor = PropertyDescriptor & { initializer?: any } | undefined;
 
@@ -27,12 +26,7 @@ export function isElementDescriptor(
     // Make sure the key is a string
     typeof maybeKey === 'string' &&
     // Make sure the descriptor is the right shape
-    ((typeof maybeDesc === 'object' &&
-      maybeDesc !== null &&
-      'enumerable' in maybeDesc &&
-      'configurable' in maybeDesc) ||
-      // TS compatibility
-      maybeDesc === undefined)
+    ((typeof maybeDesc === 'object' && maybeDesc !== null) || maybeDesc === undefined)
   );
 }
 
@@ -135,3 +129,58 @@ export function makeComputedDecorator(
 
   return decorator;
 }
+
+/////////////
+
+const DECORATOR_DESCRIPTOR_MAP: WeakMap<Decorator, ComputedDescriptor | true> = new WeakMap();
+
+/**
+  Returns the CP descriptor associated with `obj` and `keyName`, if any.
+
+  @method descriptorForProperty
+  @param {Object} obj the object to check
+  @param {String} keyName the key to check
+  @return {Descriptor}
+  @private
+*/
+export function descriptorForProperty(obj: object, keyName: string, _meta?: Meta | null) {
+  assert('Cannot call `descriptorForProperty` on null', obj !== null);
+  assert('Cannot call `descriptorForProperty` on undefined', obj !== undefined);
+  assert(
+    `Cannot call \`descriptorForProperty\` on ${typeof obj}`,
+    typeof obj === 'object' || typeof obj === 'function'
+  );
+
+  let meta = _meta === undefined ? peekMeta(obj) : _meta;
+
+  if (meta !== null) {
+    return meta.peekDescriptors(keyName);
+  }
+}
+
+export function descriptorForDecorator(dec: Function): ComputedDescriptor | true | undefined {
+  return DECORATOR_DESCRIPTOR_MAP.get(dec as Decorator);
+}
+
+/**
+  Check whether a value is a decorator
+
+  @method isClassicDecorator
+  @param {any} possibleDesc the value to check
+  @return {boolean}
+  @private
+*/
+export function isClassicDecorator(dec: unknown): dec is Decorator {
+  return typeof dec === 'function' && DECORATOR_DESCRIPTOR_MAP.has(dec as Decorator);
+}
+
+/**
+  Set a value as a decorator
+
+  @method setClassicDecorator
+  @param {function} decorator the value to mark as a decorator
+  @private
+*/
+export function setClassicDecorator(dec: Decorator, value: ComputedDescriptor | true = true) {
+  DECORATOR_DESCRIPTOR_MAP.set(dec, value);
+}
diff --git a/packages/@ember/-internals/metal/lib/descriptor_map.ts b/packages/@ember/-internals/metal/lib/descriptor_map.ts
deleted file mode 100644
index e07ab4d8b04..00000000000
--- a/packages/@ember/-internals/metal/lib/descriptor_map.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Meta, peekMeta } from '@ember/-internals/meta';
-import { assert } from '@ember/debug';
-
-const DECORATOR_DESCRIPTOR_MAP: WeakMap<
-  import('./decorator').Decorator,
-  import('./decorator').ComputedDescriptor | boolean
-> = new WeakMap();
-
-/**
-  Returns the CP descriptor associated with `obj` and `keyName`, if any.
-
-  @method descriptorForProperty
-  @param {Object} obj the object to check
-  @param {String} keyName the key to check
-  @return {Descriptor}
-  @private
-*/
-export function descriptorForProperty(obj: object, keyName: string, _meta?: Meta | null) {
-  assert('Cannot call `descriptorForProperty` on null', obj !== null);
-  assert('Cannot call `descriptorForProperty` on undefined', obj !== undefined);
-  assert(
-    `Cannot call \`descriptorForProperty\` on ${typeof obj}`,
-    typeof obj === 'object' || typeof obj === 'function'
-  );
-
-  let meta = _meta === undefined ? peekMeta(obj) : _meta;
-
-  if (meta !== null) {
-    return meta.peekDescriptors(keyName);
-  }
-}
-
-export function descriptorForDecorator(dec: import('./decorator').Decorator) {
-  return DECORATOR_DESCRIPTOR_MAP.get(dec);
-}
-
-/**
-  Check whether a value is a decorator
-
-  @method isClassicDecorator
-  @param {any} possibleDesc the value to check
-  @return {boolean}
-  @private
-*/
-export function isClassicDecorator(dec: any) {
-  return dec !== null && dec !== undefined && DECORATOR_DESCRIPTOR_MAP.has(dec);
-}
-
-/**
-  Set a value as a decorator
-
-  @method setClassicDecorator
-  @param {function} decorator the value to mark as a decorator
-  @private
-*/
-export function setClassicDecorator(dec: import('./decorator').Decorator, value: any = true) {
-  DECORATOR_DESCRIPTOR_MAP.set(dec, value);
-}
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index f4eccd50cc8..35966e3c931 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -4,18 +4,16 @@
 import { ENV } from '@ember/-internals/environment';
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import {
-  getListeners,
-  getObservers,
-  getOwnPropertyDescriptors,
   guidFor,
   makeArray,
+  observerListenerMetaFor,
   ROOT,
   setObservers,
   wrap,
 } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import { ALIAS_METHOD } from '@ember/deprecated-features';
-import { assign } from '@ember/polyfills';
+import { _WeakSet, assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   ComputedDecorator,
@@ -23,78 +21,39 @@ import {
   ComputedPropertyGetter,
   ComputedPropertySetter,
 } from './computed';
-import { makeComputedDecorator, nativeDescDecorator } from './decorator';
 import {
+  ComputedDescriptor,
   descriptorForDecorator,
   descriptorForProperty,
-  isClassicDecorator,
-} from './descriptor_map';
+  makeComputedDecorator,
+  nativeDescDecorator,
+} from './decorator';
 import { addListener, removeListener } from './events';
 import expandProperties from './expand_properties';
 import { classToString, setUnprocessedMixins } from './namespace_search';
-import { addObserver, removeObserver } from './observer';
-import { defineProperty } from './properties';
+import { addObserver, removeObserver, revalidateObservers } from './observer';
+import { defineDecorator, defineValue } from './properties';
 
 const a_concat = Array.prototype.concat;
 const { isArray } = Array;
 
-function isMethod(obj: any): boolean {
-  return (
-    'function' === typeof obj &&
-    obj.isMethod !== false &&
-    obj !== Boolean &&
-    obj !== Object &&
-    obj !== Number &&
-    obj !== Array &&
-    obj !== Date &&
-    obj !== String
-  );
-}
-
-function isAccessor(desc: PropertyDescriptor) {
-  return typeof desc.get === 'function' || typeof desc.set === 'function';
-}
-
 function extractAccessors(properties: { [key: string]: any } | undefined) {
   if (properties !== undefined) {
-    let descriptors = getOwnPropertyDescriptors(properties);
-    let keys = Object.keys(descriptors);
-    let hasAccessors = keys.some(key => isAccessor(descriptors[key]));
-
-    if (hasAccessors) {
-      let extracted = {};
+    let keys = Object.keys(properties);
 
-      keys.forEach(key => {
-        let descriptor = descriptors[key];
-
-        if (isAccessor(descriptor)) {
-          extracted[key] = nativeDescDecorator(descriptor);
-        } else {
-          extracted[key] = properties[key];
-        }
-      });
+    for (let i = 0; i < keys.length; i++) {
+      let key = keys[i];
+      let desc = Object.getOwnPropertyDescriptor(properties, key)!;
 
-      return extracted;
+      if (desc.get !== undefined || desc.set !== undefined) {
+        Object.defineProperty(properties, key, { value: nativeDescDecorator(desc) });
+      }
     }
   }
 
   return properties;
 }
 
-const CONTINUE: MixinLike = {};
-
-function mixinProperties<T extends MixinLike>(mixinsMeta: Meta, mixin: T): MixinLike {
-  if (mixin instanceof Mixin) {
-    if (mixinsMeta.hasMixin(mixin)) {
-      return CONTINUE;
-    }
-    mixinsMeta.addMixin(mixin);
-    return mixin.properties!;
-  } else {
-    return mixin; // apply anonymous mixin properties
-  }
-}
-
 function concatenatedMixinProperties(
   concatProp: string,
   props: { [key: string]: any },
@@ -110,62 +69,75 @@ function concatenatedMixinProperties(
 }
 
 function giveDecoratorSuper(
-  meta: Meta,
   key: string,
   decorator: ComputedDecorator,
-  values: { [key: string]: any },
-  descs: { [key: string]: any },
-  base: object
+  property: ComputedProperty | true,
+  descs: { [key: string]: any }
 ): ComputedDecorator {
-  let property = descriptorForDecorator(decorator)!;
-  let superProperty;
-
-  if (!(property instanceof ComputedProperty) || property._getter === undefined) {
+  if (property === true) {
     return decorator;
   }
 
-  // Computed properties override methods, and do not call super to them
-  if (values[key] === undefined) {
-    // Find the original descriptor in a parent mixin
-    superProperty = descriptorForDecorator(descs[key]);
+  let originalGetter = property._getter;
+
+  if (originalGetter === undefined) {
+    return decorator;
   }
 
-  // If we didn't find the original descriptor in a parent mixin, find
-  // it on the original object.
-  if (!superProperty) {
-    superProperty = descriptorForProperty(base, key, meta);
+  let superDesc = descs[key];
+
+  // Check to see if the super property is a decorator first, if so load its descriptor
+  let superProperty: ComputedProperty | true | undefined =
+    typeof superDesc === 'function' ? descriptorForDecorator(superDesc) : superDesc;
+
+  if (superProperty === undefined || superProperty === true) {
+    return decorator;
   }
 
-  if (superProperty === undefined || !(superProperty instanceof ComputedProperty)) {
+  let superGetter = superProperty._getter;
+
+  if (superGetter === undefined) {
     return decorator;
   }
 
-  let get = wrap(property._getter!, superProperty._getter!) as ComputedPropertyGetter;
+  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter;
   let set;
+  let originalSetter = property._setter;
+  let superSetter = superProperty._setter;
 
-  if (superProperty._setter) {
-    if (property._setter) {
-      set = wrap(property._setter, superProperty._setter) as ComputedPropertySetter;
+  if (superSetter !== undefined) {
+    if (originalSetter !== undefined) {
+      set = wrap(originalSetter, superSetter) as ComputedPropertySetter;
     } else {
       // If the super property has a setter, we default to using it no matter what.
       // This is clearly very broken and weird, but it's what was here so we have
       // to keep it until the next major at least.
       //
       // TODO: Add a deprecation here.
-      set = superProperty._setter;
+      set = superSetter;
     }
   } else {
-    set = property._setter;
+    set = originalSetter;
   }
 
   // only create a new CP if we must
-  if (get !== property._getter || set !== property._setter) {
+  if (get !== originalGetter || set !== originalSetter) {
     // Since multiple mixins may inherit from the same parent, we need
     // to clone the computed property so that other mixins do not receive
     // the wrapped version.
-    let newProperty = Object.create(property);
-    newProperty._getter = get;
-    newProperty._setter = set;
+    let dependentKeys = property._dependentKeys || [];
+    let newProperty = new ComputedProperty([
+      ...dependentKeys,
+      {
+        get,
+        set,
+      },
+    ]);
+
+    newProperty._readOnly = property._readOnly;
+    newProperty._volatile = property._volatile;
+    newProperty._meta = property._meta;
+    newProperty.enumerable = property.enumerable;
 
     return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator;
   }
@@ -174,7 +146,6 @@ function giveDecoratorSuper(
 }
 
 function giveMethodSuper(
-  obj: object,
   key: string,
   method: Function,
   values: { [key: string]: any },
@@ -188,12 +159,6 @@ function giveMethodSuper(
   // Find the original method in a parent mixin
   let superMethod = values[key];
 
-  // If we didn't find the original value in a parent mixin, find it in
-  // the original object
-  if (superMethod === undefined && descriptorForProperty(obj, key) === undefined) {
-    superMethod = obj[key];
-  }
-
   // Only wrap the new method if the original method was a function
   if (typeof superMethod === 'function') {
     return wrap(method, superMethod);
@@ -202,13 +167,8 @@ function giveMethodSuper(
   return method;
 }
 
-function applyConcatenatedProperties(
-  obj: any,
-  key: string,
-  value: any,
-  values: { [key: string]: any }
-) {
-  let baseValue = values[key] || obj[key];
+function applyConcatenatedProperties(key: string, value: any, values: { [key: string]: any }) {
+  let baseValue = values[key];
   let ret = makeArray(baseValue).concat(makeArray(value));
 
   if (DEBUG) {
@@ -224,12 +184,11 @@ function applyConcatenatedProperties(
 }
 
 function applyMergedProperties(
-  obj: { [key: string]: any },
   key: string,
   value: { [key: string]: any },
   values: { [key: string]: any }
 ): { [key: string]: any } {
-  let baseValue = values[key] || obj[key];
+  let baseValue = values[key];
 
   assert(
     `You passed in \`${JSON.stringify(
@@ -245,16 +204,15 @@ function applyMergedProperties(
   let newBase = assign({}, baseValue);
   let hasFunction = false;
 
-  for (let prop in value) {
-    if (!Object.prototype.hasOwnProperty.call(value, prop)) {
-      continue;
-    }
+  let props = Object.keys(value);
 
+  for (let i = 0; i < props.length; i++) {
+    let prop = props[i];
     let propValue = value[prop];
-    if (isMethod(propValue)) {
-      // TODO: support for Computed Properties, etc?
+
+    if (typeof propValue === 'function') {
       hasFunction = true;
-      newBase[prop] = giveMethodSuper(obj, prop, propValue, baseValue, {});
+      newBase[prop] = giveMethodSuper(prop, propValue, baseValue, {});
     } else {
       newBase[prop] = propValue;
     }
@@ -267,56 +225,16 @@ function applyMergedProperties(
   return newBase;
 }
 
-function addNormalizedProperty(
-  base: any,
-  key: string,
-  value: any,
-  meta: Meta,
-  descs: { [key: string]: any },
-  values: { [key: string]: any },
-  concats?: string[],
-  mergings?: string[]
-): void {
-  if (isClassicDecorator(value)) {
-    // Wrap descriptor function to implement _super() if needed
-    descs[key] = giveDecoratorSuper(meta, key, value, values, descs, base);
-    values[key] = undefined;
-  } else {
-    if (
-      (concats && concats.indexOf(key) >= 0) ||
-      key === 'concatenatedProperties' ||
-      key === 'mergedProperties'
-    ) {
-      value = applyConcatenatedProperties(base, key, value, values);
-    } else if (mergings && mergings.indexOf(key) > -1) {
-      value = applyMergedProperties(base, key, value, values);
-    } else if (isMethod(value)) {
-      value = giveMethodSuper(base, key, value, values, descs);
-    }
-
-    descs[key] = undefined;
-    values[key] = value;
-  }
-}
-
-interface HasWillMergeMixin {
-  willMergeMixin?: (props: MixinLike) => void;
-}
-
 function mergeMixins(
   mixins: MixinLike[],
   meta: Meta,
   descs: { [key: string]: object },
   values: { [key: string]: object },
   base: { [key: string]: object },
-  keys: string[]
+  keys: string[],
+  keysWithSuper: string[]
 ): void {
-  let currentMixin, props, key, concats, mergings;
-
-  function removeKeys(keyName: string) {
-    delete descs[keyName];
-    delete values[keyName];
-  }
+  let currentMixin;
 
   for (let i = 0; i < mixins.length; i++) {
     currentMixin = mixins[i];
@@ -327,37 +245,114 @@ function mergeMixins(
         Object.prototype.toString.call(currentMixin) !== '[object Array]'
     );
 
-    props = mixinProperties(meta, currentMixin);
-    if (props === CONTINUE) {
-      continue;
-    }
-
-    if (props) {
-      // remove willMergeMixin after 3.4 as it was used for _actions
-      if ((base as HasWillMergeMixin).willMergeMixin) {
-        (base as HasWillMergeMixin).willMergeMixin!(props);
+    if (MIXINS.has(currentMixin)) {
+      if (meta.hasMixin(currentMixin)) {
+        continue;
       }
-      concats = concatenatedMixinProperties('concatenatedProperties', props, values, base);
-      mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
+      meta.addMixin(currentMixin);
+
+      let { properties, mixins } = currentMixin;
+
+      if (properties !== undefined) {
+        mergeProps(meta, properties, descs, values, base, keys, keysWithSuper);
+      } else if (mixins !== undefined) {
+        mergeMixins(mixins, meta, descs, values, base, keys, keysWithSuper);
+
+        if (currentMixin._without !== undefined) {
+          currentMixin._without.forEach((keyName: string) => {
+            // deleting the key means we won't process the value
+            let index = keys.indexOf(keyName);
 
-      for (key in props) {
-        if (!Object.prototype.hasOwnProperty.call(props, key)) {
-          continue;
+            if (index !== -1) {
+              keys.splice(index, 1);
+            }
+          });
         }
-        keys.push(key);
-        addNormalizedProperty(base, key, props[key], meta, descs, values, concats, mergings);
       }
+    } else {
+      mergeProps(meta, currentMixin, descs, values, base, keys, keysWithSuper);
+    }
+  }
+}
+
+function mergeProps(
+  meta: Meta,
+  props: { [key: string]: unknown },
+  descs: { [key: string]: unknown },
+  values: { [key: string]: unknown },
+  base: { [key: string]: unknown },
+  keys: string[],
+  keysWithSuper: string[]
+) {
+  let concats = concatenatedMixinProperties('concatenatedProperties', props, values, base);
+  let mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
+
+  let propKeys = Object.keys(props);
+
+  for (let i = 0; i < propKeys.length; i++) {
+    let key = propKeys[i];
+    let value = props[key];
+
+    if (value === undefined) continue;
+
+    if (keys.indexOf(key) === -1) {
+      keys.push(key);
 
-      // manually copy toString() because some JS engines do not enumerate it
-      if (Object.prototype.hasOwnProperty.call(props, 'toString')) {
-        base.toString = props.toString;
+      let desc = meta.peekDescriptors(key);
+
+      if (desc === undefined) {
+        // The superclass did not have a CP, which means it may have
+        // observers or listeners on that property.
+        let prev = (values[key] = base[key]);
+
+        if (typeof prev === 'function') {
+          updateObserversAndListeners(base, key, prev, false);
+        }
+      } else {
+        descs[key] = desc;
+
+        // The super desc will be overwritten on descs, so save off the fact that
+        // there was a super so we know to Object.defineProperty when writing
+        // the value
+        keysWithSuper.push(key);
+
+        desc.teardown(base, key, meta);
       }
-    } else if (currentMixin.mixins) {
-      mergeMixins(currentMixin.mixins, meta, descs, values, base, keys);
-      if (currentMixin._without) {
-        currentMixin._without.forEach(removeKeys);
+    }
+
+    let isFunction = typeof value === 'function';
+
+    if (isFunction) {
+      let desc: ComputedDescriptor | undefined | true = descriptorForDecorator(value as Function);
+
+      if (desc !== undefined) {
+        // Wrap descriptor function to implement _super() if needed
+        descs[key] = giveDecoratorSuper(
+          key,
+          value as ComputedDecorator,
+          desc as ComputedProperty,
+          descs
+        );
+        values[key] = undefined;
+
+        continue;
       }
     }
+
+    if (
+      (concats && concats.indexOf(key) >= 0) ||
+      key === 'concatenatedProperties' ||
+      key === 'mergedProperties'
+    ) {
+      value = applyConcatenatedProperties(key, value, values);
+    } else if (mergings && mergings.indexOf(key) > -1) {
+      value = applyMergedProperties(key, value as object, values);
+    } else if (isFunction) {
+      value = giveMethodSuper(key, value as Function, values, descs);
+    }
+
+    values[key] = value;
+    descs[key] = undefined;
   }
 }
 
@@ -395,8 +390,11 @@ if (ALIAS_METHOD) {
 }
 
 function updateObserversAndListeners(obj: object, key: string, fn: Function, add: boolean) {
-  let observers = getObservers(fn);
-  let listeners = getListeners(fn);
+  let meta = observerListenerMetaFor(fn);
+
+  if (meta === undefined) return;
+
+  let { observers, listeners } = meta;
 
   if (observers !== undefined) {
     let updateObserver = add ? addObserver : removeObserver;
@@ -415,27 +413,12 @@ function updateObserversAndListeners(obj: object, key: string, fn: Function, add
   }
 }
 
-function replaceObserversAndListeners(
-  obj: object,
-  key: string,
-  prev: Function | null,
-  next: Function | null
-): void {
-  if (typeof prev === 'function') {
-    updateObserversAndListeners(obj, key, prev, false);
-  }
-
-  if (typeof next === 'function') {
-    updateObserversAndListeners(obj, key, next, true);
-  }
-}
-
-export function applyMixin(obj: { [key: string]: any }, mixins: Mixin[]) {
-  let descs = {};
-  let values = {};
+export function applyMixin(obj: { [key: string]: any }, mixins: Mixin[], _hideKeys = false) {
+  let descs = Object.create(null);
+  let values = Object.create(null);
   let meta = metaFor(obj);
   let keys: string[] = [];
-  let key, value, desc;
+  let keysWithSuper: string[] = [];
 
   (obj as any)._super = ROOT;
 
@@ -446,36 +429,34 @@ export function applyMixin(obj: { [key: string]: any }, mixins: Mixin[]) {
   // * Set up _super wrapping if necessary
   // * Set up computed property descriptors
   // * Copying `toString` in broken browsers
-  mergeMixins(mixins, meta, descs, values, obj, keys);
+  mergeMixins(mixins, meta, descs, values, obj, keys, keysWithSuper);
 
   for (let i = 0; i < keys.length; i++) {
-    key = keys[i];
-    if (key === 'constructor' || !Object.prototype.hasOwnProperty.call(values, key)) {
-      continue;
-    }
-
-    desc = descs[key];
-    value = values[key];
+    let key = keys[i];
+    let value = values[key];
+    let desc = descs[key];
 
     if (ALIAS_METHOD) {
-      while (value && value instanceof AliasImpl) {
+      while (value !== undefined && isAlias(value)) {
         let followed = followMethodAlias(obj, value, descs, values);
         desc = followed.desc;
         value = followed.value;
       }
     }
 
-    if (desc === undefined && value === undefined) {
-      continue;
-    }
+    if (value !== undefined) {
+      if (typeof value === 'function') {
+        updateObserversAndListeners(obj, key, value, true);
+      }
 
-    if (descriptorForProperty(obj, key) !== undefined) {
-      replaceObserversAndListeners(obj, key, null, value);
-    } else {
-      replaceObserversAndListeners(obj, key, obj[key], value);
+      defineValue(obj, key, value, keysWithSuper.indexOf(key) !== -1, !_hideKeys);
+    } else if (desc !== undefined) {
+      defineDecorator(obj, key, desc, meta);
     }
+  }
 
-    defineProperty(obj, key, desc, value, meta);
+  if (!meta.isPrototypeMeta(obj)) {
+    revalidateObservers(obj);
   }
 
   return obj;
@@ -493,6 +474,8 @@ export function mixin(obj: object, ...args: any[]) {
   return obj;
 }
 
+const MIXINS = new _WeakSet();
+
 /**
   The `Mixin` class allows you to create mixins, whose properties can be
   added to other classes. For instance,
@@ -582,6 +565,7 @@ export default class Mixin {
   _without: any[] | undefined;
 
   constructor(mixins: Mixin[] | undefined, properties?: { [key: string]: any }) {
+    MIXINS.add(this);
     this.properties = extractAccessors(properties);
     this.mixins = buildMixinsArray(mixins);
     this.ownerConstructor = undefined;
@@ -608,7 +592,6 @@ export default class Mixin {
     @public
   */
   static create(...args: any[]): Mixin {
-    // ES6TODO: this relies on a global state?
     setUnprocessedMixins();
     let M = this;
     return new M(args, undefined);
@@ -661,8 +644,13 @@ export default class Mixin {
     @return applied object
     @private
   */
-  apply(obj: object) {
-    return applyMixin(obj, [this]);
+  apply(obj: object, _hideKeys = false) {
+    // Ember.NativeArray is a normal Ember.Mixin that we mix into `Array.prototype` when prototype extensions are enabled
+    // mutating a native object prototype like this should _not_ result in enumerable properties being added (or we have significant
+    // issues with things like deep equality checks from test frameworks, or things like jQuery.extend(true, [], [])).
+    //
+    // _hideKeys disables enumerablity when applying the mixin. This is a hack, and we should stop mutating the array prototype by default 😫
+    return applyMixin(obj, [this], _hideKeys);
   }
 
   applyPartial(obj: object) {
@@ -679,7 +667,7 @@ export default class Mixin {
     if (typeof obj !== 'object' || obj === null) {
       return false;
     }
-    if (obj instanceof Mixin) {
+    if (MIXINS.has(obj)) {
       return _detect(obj, this);
     }
     let meta = peekMeta(obj);
@@ -719,8 +707,8 @@ function buildMixinsArray(mixins: MixinLike[] | undefined): Mixin[] | undefined
           Object.prototype.toString.call(x) !== '[object Array]'
       );
 
-      if (x instanceof Mixin) {
-        m[i] = x;
+      if (MIXINS.has(x)) {
+        m[i] = x as Mixin;
       } else {
         m[i] = new Mixin(undefined, x);
       }
@@ -780,9 +768,19 @@ declare class Alias {
 
 let AliasImpl: typeof Alias;
 
+let isAlias: (alias: any) => alias is Alias;
+
 if (ALIAS_METHOD) {
+  const ALIASES = new _WeakSet();
+
+  isAlias = (alias: any): alias is Alias => {
+    return ALIASES.has(alias);
+  };
+
   AliasImpl = class AliasImpl {
-    constructor(public methodName: string) {}
+    constructor(public methodName: string) {
+      ALIASES.add(this);
+    }
   } as typeof Alias;
 }
 
@@ -896,10 +894,9 @@ export function observer(...args: (string | Function | ObserverDefinition)[]) {
   assert('observer called without sync', typeof sync === 'boolean');
 
   let paths: string[] = [];
-  let addWatchedProperty = (path: string) => paths.push(path);
 
   for (let i = 0; i < dependentKeys.length; ++i) {
-    expandProperties(dependentKeys[i] as string, addWatchedProperty);
+    expandProperties(dependentKeys[i] as string, (path: string) => paths.push(path));
   }
 
   setObservers(func as Function, {
diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts
index fd47c50a769..55d5403bcaf 100644
--- a/packages/@ember/-internals/metal/lib/properties.ts
+++ b/packages/@ember/-internals/metal/lib/properties.ts
@@ -5,14 +5,9 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { setWithMandatorySetter } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
-import { Decorator } from './decorator';
-import { descriptorForProperty, isClassicDecorator } from './descriptor_map';
+import { Decorator, descriptorForProperty, isClassicDecorator } from './decorator';
 import { revalidateObservers } from './observer';
 
-interface ExtendedObject {
-  didDefineProperty?: (obj: object, keyName: string, value: any) => void;
-}
-
 /**
   NOTE: This is a low-level method used by other parts of the API. You almost
   never want to call this method directly. Instead you should use
@@ -66,11 +61,9 @@ export function defineProperty(
   keyName: string,
   desc?: Decorator | undefined | null,
   data?: any | undefined | null,
-  meta?: Meta
+  _meta?: Meta
 ): void {
-  if (meta === undefined) {
-    meta = metaFor(obj);
-  }
+  let meta = _meta === undefined ? metaFor(obj) : _meta;
   let previousDesc = descriptorForProperty(obj, keyName, meta);
   let wasDescriptor = previousDesc !== undefined;
 
@@ -78,52 +71,11 @@ export function defineProperty(
     previousDesc.teardown(obj, keyName, meta);
   }
 
-  // used to track if the the property being defined be enumerable
-  let enumerable = true;
-
-  // Ember.NativeArray is a normal Ember.Mixin that we mix into `Array.prototype` when prototype extensions are enabled
-  // mutating a native object prototype like this should _not_ result in enumerable properties being added (or we have significant
-  // issues with things like deep equality checks from test frameworks, or things like jQuery.extend(true, [], [])).
-  //
-  // this is a hack, and we should stop mutating the array prototype by default 😫
-  if (obj === Array.prototype) {
-    enumerable = false;
-  }
-
-  let value;
   if (isClassicDecorator(desc)) {
-    let propertyDesc;
-
-    if (DEBUG) {
-      propertyDesc = desc!(obj, keyName, undefined, meta, true);
-    } else {
-      propertyDesc = desc!(obj, keyName, undefined, meta);
-    }
-
-    Object.defineProperty(obj, keyName, propertyDesc as PropertyDescriptor);
-
-    // pass the decorator function forward for backwards compat
-    value = desc;
-  } else if (desc === undefined || desc === null) {
-    value = data;
-
-    if (wasDescriptor || enumerable === false) {
-      Object.defineProperty(obj, keyName, {
-        configurable: true,
-        enumerable,
-        writable: true,
-        value,
-      });
-    } else {
-      if (DEBUG) {
-        setWithMandatorySetter!(obj, keyName, data);
-      } else {
-        obj[keyName] = data;
-      }
-    }
+    defineDecorator(obj, keyName, desc!, meta);
+  } else if (desc === null || desc === undefined) {
+    defineValue(obj, keyName, data, wasDescriptor, true);
   } else {
-    value = desc;
-
     // fallback to ES5
     Object.defineProperty(obj, keyName, desc);
   }
@@ -133,10 +85,44 @@ export function defineProperty(
   if (!meta.isPrototypeMeta(obj)) {
     revalidateObservers(obj);
   }
+}
+
+export function defineDecorator(obj: object, keyName: string, desc: Decorator, meta: Meta) {
+  let propertyDesc;
 
-  // The `value` passed to the `didDefineProperty` hook is
-  // either the descriptor or data, whichever was passed.
-  if (typeof (obj as ExtendedObject).didDefineProperty === 'function') {
-    (obj as ExtendedObject).didDefineProperty!(obj, keyName, value);
+  if (DEBUG) {
+    propertyDesc = desc!(obj, keyName, undefined, meta, true);
+  } else {
+    propertyDesc = desc!(obj, keyName, undefined, meta);
   }
+
+  Object.defineProperty(obj, keyName, propertyDesc as PropertyDescriptor);
+
+  // pass the decorator function forward for backwards compat
+  return desc;
+}
+
+export function defineValue(
+  obj: object,
+  keyName: string,
+  value: unknown,
+  wasDescriptor: boolean,
+  enumerable = true
+) {
+  if (wasDescriptor === true || enumerable === false) {
+    Object.defineProperty(obj, keyName, {
+      configurable: true,
+      enumerable,
+      writable: true,
+      value,
+    });
+  } else {
+    if (DEBUG) {
+      setWithMandatorySetter!(obj, keyName, value);
+    } else {
+      obj[keyName] = value;
+    }
+  }
+
+  return value;
 }
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index ad90cb75969..df9a47025f5 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -1,8 +1,12 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
-import { Decorator, DecoratorPropertyDescriptor, isElementDescriptor } from './decorator';
-import { setClassicDecorator } from './descriptor_map';
+import {
+  Decorator,
+  DecoratorPropertyDescriptor,
+  isElementDescriptor,
+  setClassicDecorator,
+} from './decorator';
 import { SELF_TAG } from './tags';
 
 /**
diff --git a/packages/@ember/-internals/metal/tests/properties_test.js b/packages/@ember/-internals/metal/tests/properties_test.js
index c8eced03038..a25a31006fe 100644
--- a/packages/@ember/-internals/metal/tests/properties_test.js
+++ b/packages/@ember/-internals/metal/tests/properties_test.js
@@ -1,4 +1,4 @@
-import { computed, defineProperty, deprecateProperty } from '..';
+import { defineProperty, deprecateProperty } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -11,64 +11,6 @@ moduleFor(
       });
       assert.equal(obj.toString(), 'FOO', 'should replace toString');
     }
-
-    ['@test for data properties, didDefineProperty hook should be called if implemented'](assert) {
-      assert.expect(2);
-
-      let obj = {
-        didDefineProperty(obj, keyName, value) {
-          assert.equal(keyName, 'foo', 'key name should be foo');
-          assert.equal(value, 'bar', 'value should be bar');
-        },
-      };
-
-      defineProperty(obj, 'foo', undefined, 'bar');
-    }
-
-    ['@test for computed properties, didDefineProperty hook should be called if implemented'](
-      assert
-    ) {
-      assert.expect(2);
-
-      let computedProperty = computed(function() {
-        return this;
-      });
-
-      let obj = {
-        didDefineProperty(obj, keyName, value) {
-          assert.equal(keyName, 'foo', 'key name should be foo');
-          assert.strictEqual(
-            value,
-            computedProperty,
-            'value should be passed as computed property'
-          );
-        },
-      };
-
-      defineProperty(obj, 'foo', computedProperty);
-    }
-
-    ['@test for descriptor properties, didDefineProperty hook should be called if implemented'](
-      assert
-    ) {
-      assert.expect(2);
-
-      let descriptor = {
-        writable: true,
-        configurable: false,
-        enumerable: true,
-        value: 42,
-      };
-
-      let obj = {
-        didDefineProperty(obj, keyName, value) {
-          assert.equal(keyName, 'answer', 'key name should be answer');
-          assert.strictEqual(value, descriptor, 'value should be passed as descriptor');
-        },
-      };
-
-      defineProperty(obj, 'answer', descriptor);
-    }
   }
 );
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index 09d9e4de331..f5baade158f 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -1982,7 +1982,7 @@ NativeArray = NativeArray.without(...ignore);
 let A;
 
 if (ENV.EXTEND_PROTOTYPES.Array) {
-  NativeArray.apply(Array.prototype);
+  NativeArray.apply(Array.prototype, true);
 
   A = function(arr) {
     assert(
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index c837f780348..0a6b3815bc6 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -11,15 +11,13 @@
 export { symbol, enumerableSymbol, isInternalSymbol } from './lib/symbol';
 export { default as dictionary } from './lib/dictionary';
 export { default as getDebugName } from './lib/get-debug-name';
-export { default as getOwnPropertyDescriptors } from './lib/get-own-property-descriptors';
 export { uuid, GUID_KEY, generateGuid, guidFor } from './lib/guid';
 export { default as intern } from './lib/intern';
 export {
   checkHasSuper,
   ROOT,
   wrap,
-  getObservers,
-  getListeners,
+  observerListenerMetaFor,
   setObservers,
   setListeners,
 } from './lib/super';
diff --git a/packages/@ember/-internals/utils/lib/get-own-property-descriptors.ts b/packages/@ember/-internals/utils/lib/get-own-property-descriptors.ts
deleted file mode 100644
index 30ddff39dd5..00000000000
--- a/packages/@ember/-internals/utils/lib/get-own-property-descriptors.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-let getOwnPropertyDescriptors: (obj: { [x: string]: any }) => { [x: string]: PropertyDescriptor };
-
-if (Object.getOwnPropertyDescriptors !== undefined) {
-  getOwnPropertyDescriptors = Object.getOwnPropertyDescriptors;
-} else {
-  getOwnPropertyDescriptors = function(obj: object) {
-    let descriptors = {};
-
-    Object.keys(obj).forEach(key => {
-      descriptors[key] = Object.getOwnPropertyDescriptor(obj, key);
-    });
-
-    return descriptors;
-  };
-}
-
-export default getOwnPropertyDescriptors;
diff --git a/packages/@ember/-internals/utils/lib/super.ts b/packages/@ember/-internals/utils/lib/super.ts
index c143420c116..27314fe1c94 100644
--- a/packages/@ember/-internals/utils/lib/super.ts
+++ b/packages/@ember/-internals/utils/lib/super.ts
@@ -36,26 +36,36 @@ function hasSuper(func: Function) {
   return hasSuper;
 }
 
-const OBSERVERS_MAP = new WeakMap();
-
-export function setObservers(func: Function, observers: { paths: string[]; sync: boolean }) {
-  OBSERVERS_MAP.set(func, observers);
+class ObserverListenerMeta {
+  listeners?: string[] = undefined;
+  observers?: { paths: string[]; sync: boolean } = undefined;
 }
 
-export function getObservers(func: Function) {
-  return OBSERVERS_MAP.get(func);
-}
+const OBSERVERS_LISTENERS_MAP = new WeakMap<Function, ObserverListenerMeta>();
 
-const LISTENERS_MAP = new WeakMap();
+function createObserverListenerMetaFor(fn: Function) {
+  let meta = OBSERVERS_LISTENERS_MAP.get(fn);
 
-export function setListeners(func: Function, listeners?: string[]) {
-  if (listeners) {
-    LISTENERS_MAP.set(func, listeners);
+  if (meta === undefined) {
+    meta = new ObserverListenerMeta();
+    OBSERVERS_LISTENERS_MAP.set(fn, meta);
   }
+
+  return meta;
+}
+
+export function observerListenerMetaFor(fn: Function) {
+  return OBSERVERS_LISTENERS_MAP.get(fn);
 }
 
-export function getListeners(func: Function) {
-  return LISTENERS_MAP.get(func);
+export function setObservers(func: Function, observers: { paths: string[]; sync: boolean }) {
+  let meta = createObserverListenerMetaFor(func);
+  meta.observers = observers;
+}
+
+export function setListeners(func: Function, listeners: string[]) {
+  let meta = createObserverListenerMetaFor(func);
+  meta.listeners = listeners;
 }
 
 const IS_WRAPPED_FUNCTION_SET = new WeakSet();
@@ -93,8 +103,12 @@ function _wrap(func: Function, superFunc: Function): Function {
   }
 
   IS_WRAPPED_FUNCTION_SET.add(superWrapper);
-  setObservers(superWrapper, getObservers(func));
-  setListeners(superWrapper, getListeners(func));
+
+  let meta = OBSERVERS_LISTENERS_MAP.get(func);
+
+  if (meta !== undefined) {
+    OBSERVERS_LISTENERS_MAP.set(superWrapper, meta);
+  }
 
   return superWrapper;
 }

From d813ef420b11f2c9d7e62ac5ddca68a3a7403de9 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 10 Aug 2020 17:45:20 -0700
Subject: [PATCH 0081/1405] [BUGFIX release] Update the Glimmer VM to 0.56.1

Updates the VM to include changes to immediate encoding for performance.
---
 package.json |  16 ++---
 yarn.lock    | 196 +++++++++++++++++++++++++--------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index 4c853f473f3..4462bf87b1e 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.56.0",
+    "@glimmer/compiler": "^0.56.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.56.0",
-    "@glimmer/node": "^0.56.0",
-    "@glimmer/opcode-compiler": "^0.56.0",
-    "@glimmer/program": "^0.56.0",
-    "@glimmer/reference": "^0.56.0",
-    "@glimmer/runtime": "^0.56.0",
-    "@glimmer/validator": "^0.56.0",
+    "@glimmer/interfaces": "^0.56.1",
+    "@glimmer/node": "^0.56.1",
+    "@glimmer/opcode-compiler": "^0.56.1",
+    "@glimmer/program": "^0.56.1",
+    "@glimmer/reference": "^0.56.1",
+    "@glimmer/runtime": "^0.56.1",
+    "@glimmer/validator": "^0.56.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 9275271fb89..56375ca3508 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.56.0.tgz#9dd22beb0924341ae92cd9a5bfe275ec50573c64"
-  integrity sha512-QCeQc39lLvbJ7Ku9mzNDMxELb7QBwdVALDhJJE7fAwYvJSpnAcLYdg+D0iTpA8S5MCxHI8oM2XeYLSyi2SnB6w==
-  dependencies:
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/syntax" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
-    "@glimmer/wire-format" "^0.56.0"
+"@glimmer/compiler@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.56.1.tgz#fe391a65f794f85483f4d1ab4c84910b37a822a7"
+  integrity sha512-W+vP8ykJt8VS4q5C9vE/7RDKLgeB6lcA9Lw6WP8rzs278hGGOz5yr1PKFKKoqY6x0lisIohdsqlHZ+cw0HMsZQ==
+  dependencies:
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/syntax" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
+    "@glimmer/wire-format" "^0.56.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.56.0.tgz#24a773678826d73568cc4f82301f7e49f5a3c12f"
-  integrity sha512-qLRYDjXwiIm3ItZWaO9kKT+1My62JjJ/lRrzhrSV921VoK1SQQd9kX1FWAefELyLbKl/+1xmSmXzHHwuP9A5fg==
+"@glimmer/encoder@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.56.1.tgz#202514cae28710f68a828b2db3db955e62c6a9b3"
+  integrity sha512-vIQTtHzqjm/7qC9EtR6zqcqzU7SabgyUDZ0jdsLIyhjv7SZGq5qFWlonkHDnB8/o3lzAuwcxhjOY2y10nOX/yw==
   dependencies:
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/vm" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/vm" "^0.56.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.56.0.tgz#88fbbfb31076c39de4b87af12151c2f6b2aec75c"
-  integrity sha512-MXWkPg8/EECK0pkjCmDb6BTpCBQT83S8R5qKHSZ6yPJmd6AWUunfT/CoHM6faH5yHW4ya7ckM1ZfrHnU5eda4Q==
+"@glimmer/interfaces@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.56.1.tgz#599d305fac56a1a757932c514d0e938ef2186135"
+  integrity sha512-+0KvSd7c9QmkEeCFHaBDub1DBeTONw+x6MZUcb/MlA3FfNis2aFs7kHVkjkdzp0Ust54Wn448dgWZFW27EuVJA==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.56.0.tgz#b998cf3ef765ca1bfbb0e152f6570fb665b0635d"
-  integrity sha512-2/xkj5YaB+pdEWX9qklYpxQFquo7NfgyOlY0yOeKv6mkEm+IVgMEI6ybxF58aL94SmRKnD7SdwnbqSJXP8bIiA==
+"@glimmer/low-level@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.56.1.tgz#d813bd5dbdd5914287623f0c3bfc3eedf97a279e"
+  integrity sha512-02S6C0HnQ4jTmhqBNXpA+9vtIduFJpfPzKKAREHuosWWNZnhQAziAowAUd3/MXZZkl2YDv6pRN30mT8NBMpRWg==
 
-"@glimmer/node@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.56.0.tgz#991dbe294ca917062fa4d1ee52010dbdfbc3c2c1"
-  integrity sha512-xwAIZtwDuddQ73fJBC41Fg+i7okGBH+VRsacA7UOzLSkb9joEE2aY8+VFpAYs27VW8N35djdcTlkMU0XIxQ2PQ==
+"@glimmer/node@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.56.1.tgz#94c276c1ddcb2a3ea7dba592e493c487b3da7337"
+  integrity sha512-2vw0OtfrrSy/FbjPfqu3DNs5oYGo7D4/ahyq0O4v4y1ACtkcSx768yj4iBe0Jxce69sDb24zYwq13UA0JUwN2w==
   dependencies:
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/runtime" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/runtime" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.56.0.tgz#da8aff1c2afab58e71254649df0766410fd20513"
-  integrity sha512-4qLIOiDDw7OgvSyuwQMU1o5yVuThPJJoMWEyT7WuC+8lLiHui06Bic4X1YdtYFWaMPyJ4EMBREcjsvbX7JnPbQ==
-  dependencies:
-    "@glimmer/encoder" "^0.56.0"
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/program" "^0.56.0"
-    "@glimmer/reference" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
-    "@glimmer/vm" "^0.56.0"
-    "@glimmer/wire-format" "^0.56.0"
-
-"@glimmer/program@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.56.0.tgz#69705bf601f19ec158872aa5bf6ef10d362e0953"
-  integrity sha512-ugKvzQ02zaZBBkM/TOANJqcmIjNcvbjtItn3mq1l9VuQyOyG3tT2GESxgUPvBl2uHmoDC0Cw0dtEFW42gDqbig==
-  dependencies:
-    "@glimmer/encoder" "^0.56.0"
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
-
-"@glimmer/reference@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.56.0.tgz#a664692c92b12dd54608c03d0fca69f3d3305ff3"
-  integrity sha512-nDTAKFMXDaps73dYYhrSOnXlx0ko788Q14pQGGvNSlBCzJZ02uERAzABsqAs+cyhLqOcd9wTrIwWi1Br2JYJeQ==
+"@glimmer/opcode-compiler@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.56.1.tgz#def91e1fa4f73049ad8a5827f90d3c457f162a6c"
+  integrity sha512-W2X+mA45PMkq4ZsGPqa7EqrMOSvWg7WC406yCwpLALMz7xueHN1aM/FdHxB2yVX0nppriKCgcqWfRFWeiM++SA==
+  dependencies:
+    "@glimmer/encoder" "^0.56.1"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/program" "^0.56.1"
+    "@glimmer/reference" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
+    "@glimmer/vm" "^0.56.1"
+    "@glimmer/wire-format" "^0.56.1"
+
+"@glimmer/program@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.56.1.tgz#f31a83a94a2095b2bc3bd0a8522439140c3503d4"
+  integrity sha512-ldu39AIIdOg5Mmg1bdl1f86xI6yLtHX52wUYWyowdlLO6r0UmdlDoeygKCtawJMSI1G/Gb4+fhcvyyg75rGXZw==
+  dependencies:
+    "@glimmer/encoder" "^0.56.1"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
+
+"@glimmer/reference@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.56.1.tgz#6760d1a143b17f20e16556d7cf8ce9a68e07fe5a"
+  integrity sha512-buPBW/5nmeIVqZQXNKRGS4UOT/zaZ2j0R+ARMRXJ/nVKF6IMchtWx8cAMxw3dO9jZBwX5R4uoZwr5tOSSMm3HQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
-    "@glimmer/validator" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
+    "@glimmer/validator" "^0.56.1"
 
-"@glimmer/runtime@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.56.0.tgz#4aac0d92a01c807d41ea2f5dd466cc8451564eb6"
-  integrity sha512-7SqVzPCmASNPuV70lJz8ZPNY7UxgUMRNvIPVwBKz6TPLbals/+mUihf0cLo873tPLrghsqxbvSKgL+ZwuBappQ==
+"@glimmer/runtime@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.56.1.tgz#258bfc8abbe86709ce188dac75603d060fa0f7e1"
+  integrity sha512-IHI3+KvZ4xH5TEYNgQzLxM0ei4ScGuVN2XhomfFKbe906D8DgnqoAHAUyiOUh8aVmVp92npz8R5T/Txps4ZkLA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/low-level" "^0.56.0"
-    "@glimmer/program" "^0.56.0"
-    "@glimmer/reference" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
-    "@glimmer/validator" "^0.56.0"
-    "@glimmer/vm" "^0.56.0"
-    "@glimmer/wire-format" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/low-level" "^0.56.1"
+    "@glimmer/program" "^0.56.1"
+    "@glimmer/reference" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
+    "@glimmer/validator" "^0.56.1"
+    "@glimmer/vm" "^0.56.1"
+    "@glimmer/wire-format" "^0.56.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.56.0.tgz#9f7673bdf94637e8652a942a42c96d67fcce9523"
-  integrity sha512-bh0pYOIRKABm6hy2B0QDL1+iJHafDj+lwaLQGtuoDBd2rfbJdmeOfGuKPjU51gQ7tllt/6lOdkQQG4yuO2CNRQ==
+"@glimmer/syntax@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.56.1.tgz#361989b70ed3482762f33ecb07dae52cefa76e87"
+  integrity sha512-4TdtIQVFo9UfIVzXnXpMuzsA4mX06oF9NER8FmIPjBosNiQsYB7P8sABSG+2rtWgsh6CkFXkwvxZ++BB+alwOw==
   dependencies:
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.56.0.tgz#8bce5676c8ac9b9389a736505a57925f7b55d1af"
-  integrity sha512-3TmGZIe5jTtHbjjTV7mwr71M47c+Y1njm3QrJ8Jq4KzD2udryiQkj44Aki+RFlpjZxBRTWWHHInurb6niPr/cg==
+"@glimmer/util@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.56.1.tgz#0947f75df9a1b30e3c0c505bc2be2e776b4364ae"
+  integrity sha512-g7R5hMtZ2BLF+AsYhSE1xoh0gOJALof4/JL6zovYvqrsKTLYGK1Qe3RKXSt8dPav8Ac0LXt+cOd6jHPGSrEs+A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.56.0.tgz#ec5f1f2f965cf12934fb4c33df23e658e1a78711"
-  integrity sha512-9LNQB6TWOKNvdnlWhuhvL82LPCMXQ15C1srxIFTjj+lVq9+gq9diOBMKb2cN4EMRzh9o1e6lRGff5jppbs6ppQ==
+"@glimmer/validator@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.56.1.tgz#584c0d6c68a0e2bfd92fe25626da70173b0ed9de"
+  integrity sha512-UDqM4NZLx5x1YJqbYt9LPxn6fzFU5bv5S306b51Bjj0MaNun3QRHw8D5RzrZaMufMr72Dph/4YyN2zKMavfmIA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.56.0.tgz#6194274a13d4c4175cd32972223ab4f5c3cf7a25"
-  integrity sha512-6G5UlLTrotC/hMrFocQOm+GdkESyIAdOnYLmCNFJjikmzXOnUQaEVESsjeOb2RdJ+YnRJlx1ZDGzPWbXJudpig==
+"@glimmer/vm@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.56.1.tgz#4c21a8fb5d492c1cb85228215cee22623fdd03c8"
+  integrity sha512-6Eb9EZmSFeb8M6DE+HfIZlWhKG8VyU3o7GSJw6n3J+1DNTfMID41NdS0Y8nd+gA6N1UJvEeC2QpKg4d8XCa50A==
   dependencies:
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
 
-"@glimmer/wire-format@^0.56.0":
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.56.0.tgz#2585b20244af9c569103d7cbbf87ca7bc3f9e4e2"
-  integrity sha512-0OHUdCTrFgfnzUHTO2licAYrd8ccvuRjmDluvcLinAmUPbb+smZFKSM8G6jcsvyVsYCQwzmFoskFp1heZgoM4g==
+"@glimmer/wire-format@^0.56.1":
+  version "0.56.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.56.1.tgz#40ce098eabb3c9ac06afcb35cd1c5228f52d38b4"
+  integrity sha512-5HMysobNYWh4HFWh+LH5k3BZUTnLngyp6V1VJo7DgQ5iC+8c57V+M3HBuQOB7n6EBT0+sO49xMoylX/rywoCuA==
   dependencies:
-    "@glimmer/interfaces" "^0.56.0"
-    "@glimmer/util" "^0.56.0"
+    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/util" "^0.56.1"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From a497a8e7354c334509d0b0817b2bde0126deda3c Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 10 Aug 2020 15:46:47 -0400
Subject: [PATCH 0082/1405] Add v3.20.4 to CHANGELOG.md.

[ci skip]
---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e64c7709015..82144852659 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,17 @@
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
 
+### v3.20.4 (August 11, 2020)
+
+- [#19047](https://github.com/emberjs/ember.js/pull/19047) Ensure `inject-babel-helpers` plugin can be parallelized
+- [#19089](https://github.com/emberjs/ember.js/pull/19089) Update rendering engine to improve immediate encoding performance
+- [#19082](https://github.com/emberjs/ember.js/pull/19082) Simplify mixin application
+- [#19088](https://github.com/emberjs/ember.js/pull/19088) Simplify factory instantiation from the container
+- [#19028](https://github.com/emberjs/ember.js/pull/19028) Ensure setter CP's with dependent keys on curly components can be two way bound
+- [#19077](https://github.com/emberjs/ember.js/pull/19077) Simplify `get` and improve `computed` caching scheme.
+- [#19065](https://github.com/emberjs/ember.js/pull/19065) / [#19072](https://github.com/emberjs/ember.js/pull/19072) - Updates GlimmerVM to improve internal destroyable system and improve tag / revision computation.
+- [#19081](https://github.com/emberjs/ember.js/pull/19081) Reduces template compilation size in production builds.
+
 ### v3.20.3 (July 30, 2020)
 
 - [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update `router.js` to ensure `transition.abort` works for query param only transitions

From 37b2a776286f788b2867d8ef731f771a6eed42e4 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Fri, 14 Aug 2020 10:35:35 -0400
Subject: [PATCH 0083/1405] Resolves #19004: RouterService#isActive() now
 consumes currentURL and currentRouteName

---
 .../-internals/routing/lib/services/router.ts | 14 +++++++
 .../router_service_test/isActive_test.js      | 37 +++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 4079bb1f484..e881e2bf864 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -5,6 +5,7 @@ import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { Transition } from 'router_js';
+import { consumeTag, tagFor } from '@glimmer/validator';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
@@ -309,6 +310,19 @@ export default class RouterService extends Service {
     let { routeName, models, queryParams } = extractRouteArgs(args);
     let routerMicrolib = this._router._routerMicrolib;
 
+    // When using isActive() in a getter, we want to entagle with the auto-tracking system
+    // for example,
+    // in
+    // get isBarActive() {
+    //   return isActive('foo.bar');
+    // }
+    //
+    // you'd expect isBarActive to be dirtied when the route changes.
+    //
+    // https://github.com/emberjs/ember.js/issues/19004
+    consumeTag(tagFor(this, 'currentURL'));
+    consumeTag(tagFor(this, 'currentRouteName'));
+
     // UNSAFE: casting `routeName as string` here encodes the existing
     // assumption but may be wrong: `extractRouteArgs` correctly returns it as
     // `string | undefined`. There may be bugs if `isActiveIntent` does
diff --git a/packages/ember/tests/routing/router_service_test/isActive_test.js b/packages/ember/tests/routing/router_service_test/isActive_test.js
index d638ea1d1c4..18021cf519f 100644
--- a/packages/ember/tests/routing/router_service_test/isActive_test.js
+++ b/packages/ember/tests/routing/router_service_test/isActive_test.js
@@ -1,5 +1,6 @@
 import Controller from '@ember/controller';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
+import Service, { inject as service } from '@ember/service';
 
 moduleFor(
   'Router Service - isActive',
@@ -33,6 +34,42 @@ moduleFor(
         });
     }
 
+    async ['@test RouterService#isActive entangles with route transitions'](assert) {
+      assert.expect(6);
+
+      this.add(
+        `service:foo`,
+        class extends Service {
+          @service router;
+
+          get isChildActive() {
+            return this.router.isActive('parent.child');
+          }
+
+          get isSisterActive() {
+            return this.router.isActive('parent.sister');
+          }
+        }
+      );
+
+      await this.visit('/');
+
+      let fooService = this.applicationInstance.lookup('service:foo');
+
+      assert.equal(fooService.isChildActive, false);
+      assert.equal(fooService.isSisterActive, false);
+
+      await this.routerService.transitionTo('parent.child');
+
+      assert.equal(fooService.isChildActive, true);
+      assert.equal(fooService.isSisterActive, false);
+
+      await this.routerService.transitionTo('parent.sister');
+
+      assert.equal(fooService.isChildActive, false);
+      assert.equal(fooService.isSisterActive, true);
+    }
+
     ['@test RouterService#isActive does not eagerly instantiate controller for query params'](
       assert
     ) {

From 863591939b63fa6c323bce1f4628e2fe4e566e4b Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Fri, 14 Aug 2020 10:46:06 -0400
Subject: [PATCH 0084/1405] fix tslint complaint

---
 packages/@ember/-internals/routing/lib/services/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index e881e2bf864..8fa2fe7239f 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -4,8 +4,8 @@ import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import { Transition } from 'router_js';
 import { consumeTag, tagFor } from '@glimmer/validator';
+import { Transition } from 'router_js';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 

From e79aa59f7727d64bf7c71a8c50d69d9a391139b9 Mon Sep 17 00:00:00 2001
From: Isaac Lee <16869656+ijlee2@users.noreply.github.com>
Date: Sat, 15 Aug 2020 14:56:21 -0500
Subject: [PATCH 0085/1405] Displayed the correct CI badge

It looked like, when the GitHub Actions workflow was [renamed](https://github.com/emberjs/ember.js/pull/19064) from `Build` to `CI`, the badge in the README didn't get updated. As a result, the badge shows a failing status, which can leave a bad impression.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4dd30909dea..0c431c8d8c7 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 <p align="center">
   <a href="https://www.npmjs.com/package/ember-source"><img src="https://img.shields.io/npm/v/ember-source.svg?style=flat" alt="npm version"></a>
-  <a href="/emberjs/ember.js/actions?query=workflow%3ABuild"><img src="https://github.com/emberjs/ember.js/workflows/Build/badge.svg" alt="Build Status"></a>
+  <a href="/emberjs/ember.js/actions?query=workflow%3ACI"><img src="https://github.com/emberjs/ember.js/workflows/CI/badge.svg" alt="CI Status"></a>
   <a href="https://codeclimate.com/github/emberjs/ember.js"><img src="https://codeclimate.com/github/emberjs/ember.js.svg" alt="Code Climate"></a>
   <a href="https://discord.gg/zT3asNS"><img src="https://img.shields.io/discord/480462759797063690.svg?logo=discord" alt="Discord Community Server"></a>
   <a href="https://help-wanted.emberjs.com/"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs Welcome"></a>

From 9ad9b7b2ff80e1100f6b278171412f4b558b111b Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 17 Aug 2020 16:17:52 -0400
Subject: [PATCH 0086/1405] Add v3.21.0-beta.6 to CHANGELOG

(cherry picked from commit 04a90457311ce50a0c9ac227944be8cfe60b8009)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82144852659..3ff4cc206c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Ember Changelog
 
+### v3.21.0-beta.6 (August 17, 2020)
+
+- [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
+- [#19077](https://github.com/emberjs/ember.js/pull/19077) Simplify `get` and improve `computed` caching scheme.
+- [#19082](https://github.com/emberjs/ember.js/pull/19082) Simplify mixin application
+- [#19089](https://github.com/emberjs/ember.js/pull/19089) Update rendering engine to improve immediate encoding performance
+
 ### v3.21.0-beta.5 (August 5, 2020)
 
 - [#19028](https://github.com/emberjs/ember.js/pull/19028) [BUGFIX] Ensure setter CP's with dependent keys on curly components can be two way bound

From d9e56b69369e61ede905cdf79493eda18a961c35 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 17 Aug 2020 18:33:22 -0400
Subject: [PATCH 0087/1405] Add a cache step to the github workflow for
 node_modules based on the yarn.lock

---
 .github/workflows/ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cb5b4ccd1d..aa6e84c1aa0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: linting
@@ -37,6 +41,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -63,6 +71,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -86,6 +98,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -105,6 +121,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -125,6 +145,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - uses: actions/download-artifact@v1
@@ -145,6 +169,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -164,6 +192,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - uses: actions/download-artifact@v1
@@ -182,6 +214,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - uses: actions/download-artifact@v1
@@ -202,6 +238,10 @@ jobs:
         with:
           node-version: 10.x
           registry-url: 'https://registry.npmjs.org'
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build for publish
@@ -222,6 +262,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build for publish
@@ -244,6 +288,10 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build for publish

From ba16712b1be6bab1faf94ca3734c7d60e6c955f4 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sun, 5 Jul 2020 13:38:27 -0700
Subject: [PATCH 0088/1405] [REFACTOR] Converts VM to use tracking internally

---
 package.json                                  |  16 +-
 .../lib/component-managers/abstract.ts        |  11 +-
 .../glimmer/lib/component-managers/curly.ts   |  65 ++++--
 .../glimmer/lib/component-managers/custom.ts  |  27 +--
 .../glimmer/lib/component-managers/input.ts   |  27 +--
 .../glimmer/lib/component-managers/mount.ts   |  23 +-
 .../glimmer/lib/component-managers/outlet.ts  |  25 +--
 .../glimmer/lib/component-managers/root.ts    |  12 +-
 .../lib/component-managers/template-only.ts   |  15 +-
 .../-internals/glimmer/lib/environment.ts     |  33 +--
 ...sert-implicit-component-helper-argument.ts |  13 +-
 .../lib/helpers/-in-element-null-check.ts     |  13 +-
 .../glimmer/lib/helpers/-track-array.ts       |  21 +-
 .../-internals/glimmer/lib/helpers/action.ts  |   9 +-
 .../-internals/glimmer/lib/helpers/each-in.ts |  19 +-
 .../-internals/glimmer/lib/helpers/fn.ts      |  15 +-
 .../-internals/glimmer/lib/helpers/get.ts     |  16 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |  28 +--
 .../glimmer/lib/helpers/readonly.ts           |  24 +--
 .../glimmer/lib/modifiers/action.ts           |  89 ++++----
 .../glimmer/lib/modifiers/custom.ts           |  59 +++---
 .../-internals/glimmer/lib/modifiers/on.ts    |  24 +--
 .../@ember/-internals/glimmer/lib/renderer.ts |  34 +--
 .../-internals/glimmer/lib/syntax/mount.ts    |  18 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   |  61 +++---
 .../-internals/glimmer/lib/utils/bindings.ts  |  86 +++-----
 .../lib/utils/curly-component-state-bucket.ts |   9 +-
 .../glimmer/lib/utils/debug-render-tree.ts    | 137 ------------
 .../-internals/glimmer/lib/utils/outlet.ts    |  49 +++--
 .../glimmer/lib/utils/references.ts           |  29 +--
 .../components/curly-components-test.js       |  18 +-
 .../template-only-components-test.js          |   2 +-
 .../glimmer/tests/integration/content-test.js |  17 +-
 .../custom-modifier-manager-test.js           |   2 +-
 .../glimmer/tests/integration/mount-test.js   |   2 +-
 .../-internals/metal/lib/property_get.ts      |   4 +-
 yarn.lock                                     | 196 +++++++++---------
 37 files changed, 502 insertions(+), 746 deletions(-)

diff --git a/package.json b/package.json
index 4462bf87b1e..8ccc6fe529f 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.56.1",
+    "@glimmer/compiler": "^0.57.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.56.1",
-    "@glimmer/node": "^0.56.1",
-    "@glimmer/opcode-compiler": "^0.56.1",
-    "@glimmer/program": "^0.56.1",
-    "@glimmer/reference": "^0.56.1",
-    "@glimmer/runtime": "^0.56.1",
-    "@glimmer/validator": "^0.56.1",
+    "@glimmer/interfaces": "^0.57.2",
+    "@glimmer/node": "^0.57.2",
+    "@glimmer/opcode-compiler": "^0.57.2",
+    "@glimmer/program": "^0.57.2",
+    "@glimmer/reference": "^0.57.2",
+    "@glimmer/runtime": "^0.57.2",
+    "@glimmer/validator": "^0.57.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
index 6ccabd6838c..e10deaca827 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
@@ -9,8 +9,7 @@ import {
   PreparedArguments,
   VMArguments,
 } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
-import { Tag } from '@glimmer/validator';
+import { PathReference } from '@glimmer/reference';
 import { SimpleElement } from '@simple-dom/interface';
 import { EmberVMEnvironment } from '../environment';
 
@@ -23,16 +22,18 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
     return null;
   }
 
+  abstract getDebugName(state: U): string;
+
   abstract create(
     env: EmberVMEnvironment,
     definition: U,
     args: VMArguments,
     dynamicScope: DynamicScope,
-    caller: VersionedPathReference<void | {}>,
+    caller: PathReference<void | {}>,
     hasDefaultBlock: boolean
   ): T;
 
-  abstract getSelf(component: T): VersionedPathReference<unknown>;
+  abstract getSelf(component: T): PathReference<unknown>;
   abstract getCapabilities(state: U): ComponentCapabilities;
 
   didCreateElement(_component: T, _element: SimpleElement, _operations: ElementOperations): void {
@@ -47,8 +48,6 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
     // noop
   }
 
-  abstract getTag(_bucket: T): Tag;
-
   update(_bucket: T, _dynamicScope: DynamicScope): void {
     // noop
   }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 02834779a79..ea19befad9a 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -21,10 +21,18 @@ import {
   WithJitDynamicLayout,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { RootReference, VersionedPathReference } from '@glimmer/reference';
+import { PathReference, RootReference } from '@glimmer/reference';
 import { PrimitiveReference, registerDestructor } from '@glimmer/runtime';
 import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
-import { combine, Tag, validateTag, valueForTag } from '@glimmer/validator';
+import {
+  beginTrackFrame,
+  beginUntrackFrame,
+  consumeTag,
+  endTrackFrame,
+  endUntrackFrame,
+  validateTag,
+  valueForTag,
+} from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS } from '../component';
 import { EmberVMEnvironment } from '../environment';
@@ -62,8 +70,7 @@ function applyAttributeBindings(
   attributeBindings: Array<string>,
   component: Component,
   rootRef: RootReference<Component>,
-  operations: ElementOperations,
-  environment: EmberVMEnvironment
+  operations: ElementOperations
 ) {
   let seen: string[] = [];
   let i = attributeBindings.length - 1;
@@ -75,7 +82,7 @@ function applyAttributeBindings(
 
     if (seen.indexOf(attribute) === -1) {
       seen.push(attribute);
-      AttributeBinding.install(component, rootRef, parsed, operations, environment);
+      AttributeBinding.install(component, rootRef, parsed, operations);
     }
 
     i--;
@@ -91,12 +98,12 @@ function applyAttributeBindings(
     installIsVisibleBinding !== undefined &&
     seen.indexOf('style') === -1
   ) {
-    installIsVisibleBinding(rootRef, operations, environment);
+    installIsVisibleBinding(rootRef, operations);
   }
 }
 
 const DEFAULT_LAYOUT = P`template:components/-default`;
-const EMPTY_POSITIONAL_ARGS: VersionedPathReference[] = [];
+const EMPTY_POSITIONAL_ARGS: PathReference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
@@ -167,7 +174,7 @@ export default class CurlyComponentManager
         positional: EMPTY_POSITIONAL_ARGS,
         named: {
           ...rest,
-          ...(__ARGS__.value() as { [key: string]: VersionedPathReference<unknown> }),
+          ...(__ARGS__.value() as { [key: string]: PathReference<unknown> }),
         },
       };
 
@@ -227,7 +234,7 @@ export default class CurlyComponentManager
     state: DefinitionState,
     args: VMArguments,
     dynamicScope: DynamicScope,
-    callerSelfRef: VersionedPathReference,
+    callerSelfRef: PathReference,
     hasBlock: boolean
   ): ComponentStateBucket {
     // Get the nearest concrete component instance from the scope. "Virtual"
@@ -240,7 +247,10 @@ export default class CurlyComponentManager
     // Capture the arguments, which tells Glimmer to give us our own, stable
     // copy of the Arguments object that is safe to hold on to between renders.
     let capturedArgs = args.named.capture();
+
+    beginTrackFrame();
     let props = processComponentArgs(capturedArgs);
+    let argsTag = endTrackFrame();
 
     // Alias `id` argument to `elementId` property on the component instance.
     aliasIdToElementId(args, props);
@@ -271,6 +281,7 @@ export default class CurlyComponentManager
 
     // Now that we've built up all of the properties to set on the component instance,
     // actually create it.
+    beginUntrackFrame();
     let component = factory.create(props);
 
     let finalizer = _instrumentStart('render.component', initialRenderInstrumentDetails, component);
@@ -308,6 +319,7 @@ export default class CurlyComponentManager
       environment,
       component,
       capturedArgs,
+      argsTag,
       finalizer,
       hasWrappedElement
     );
@@ -324,6 +336,8 @@ export default class CurlyComponentManager
       component.trigger('willRender');
     }
 
+    endUntrackFrame();
+
     if (ENV._DEBUG_RENDER_TREE) {
       environment.extra.debugRenderTree.create(bucket, {
         type: 'component',
@@ -338,10 +352,18 @@ export default class CurlyComponentManager
       });
     }
 
+    // consume every argument so we always run again
+    consumeTag(bucket.argsTag);
+    consumeTag(component[DIRTY_TAG]);
+
     return bucket;
   }
 
-  getSelf({ rootRef }: ComponentStateBucket): VersionedPathReference {
+  getDebugName({ name }: DefinitionState) {
+    return name;
+  }
+
+  getSelf({ rootRef }: ComponentStateBucket): PathReference {
     return rootRef;
   }
 
@@ -356,12 +378,12 @@ export default class CurlyComponentManager
     let { attributeBindings, classNames, classNameBindings } = component;
 
     if (attributeBindings && attributeBindings.length) {
-      applyAttributeBindings(attributeBindings, component, rootRef, operations, environment);
+      applyAttributeBindings(attributeBindings, component, rootRef, operations);
     } else {
       let id = component.elementId ? component.elementId : guidFor(component);
       operations.setAttribute('id', PrimitiveReference.create(id), false, null);
       if (EMBER_COMPONENT_IS_VISIBLE) {
-        installIsVisibleBinding!(rootRef, operations, environment);
+        installIsVisibleBinding!(rootRef, operations);
       }
     }
 
@@ -403,10 +425,6 @@ export default class CurlyComponentManager
     }
   }
 
-  getTag({ args, component }: ComponentStateBucket): Tag {
-    return args ? combine([args.tag, component[DIRTY_TAG]]) : component[DIRTY_TAG];
-  }
-
   didCreate({ component, environment }: ComponentStateBucket): void {
     if (environment.isInteractive) {
       component._transitionTo('inDOM');
@@ -416,7 +434,7 @@ export default class CurlyComponentManager
   }
 
   update(bucket: ComponentStateBucket): void {
-    let { component, args, argsRevision, environment } = bucket;
+    let { component, args, argsTag, argsRevision, environment } = bucket;
 
     if (ENV._DEBUG_RENDER_TREE) {
       environment.extra.debugRenderTree.update(bucket);
@@ -424,10 +442,14 @@ export default class CurlyComponentManager
 
     bucket.finalizer = _instrumentStart('render.component', rerenderInstrumentDetails, component);
 
-    if (args && !validateTag(args.tag, argsRevision)) {
+    beginUntrackFrame();
+
+    if (args !== null && !validateTag(argsTag, argsRevision)) {
+      beginTrackFrame();
       let props = processComponentArgs(args!);
+      argsTag = bucket.argsTag = endTrackFrame();
 
-      bucket.argsRevision = valueForTag(args!.tag);
+      bucket.argsRevision = valueForTag(argsTag);
 
       component[IS_DISPATCHING_ATTRS] = true;
       component.setProperties(props);
@@ -441,6 +463,11 @@ export default class CurlyComponentManager
       component.trigger('willUpdate');
       component.trigger('willRender');
     }
+
+    endUntrackFrame();
+
+    consumeTag(argsTag);
+    consumeTag(component[DIRTY_TAG]);
   }
 
   didUpdateLayout(bucket: ComponentStateBucket, bounds: Bounds): void {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index a865ef2813f..c1bd4933eab 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -19,7 +19,7 @@ import {
 import { ComponentRootReference, PathReference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
-import { consumeTag, createTag, isConstTagged, Tag } from '@glimmer/validator';
+import { track } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
@@ -194,17 +194,14 @@ export default class CustomComponentManager<ComponentInstance>
 
     if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
       let getTag = (key: string) => {
-        return namedArgs.get(key).tag;
+        return track(() => namedArgs.get(key).value());
       };
 
       if (HAS_NATIVE_PROXY) {
         let handler: ProxyHandler<{}> = {
           get(_target, prop) {
             if (namedArgs.has(prop as string)) {
-              let ref = namedArgs.get(prop as string);
-              consumeTag(ref.tag);
-
-              return ref.value();
+              return namedArgs.get(prop as string).value();
             } else if (prop === CUSTOM_TAG_FOR) {
               return getTag;
             }
@@ -256,10 +253,7 @@ export default class CustomComponentManager<ComponentInstance>
             enumerable: true,
             configurable: true,
             get() {
-              let ref = namedArgs.get(name);
-              consumeTag(ref.tag);
-
-              return ref.value();
+              return namedArgs.get(name).value();
             },
           });
         });
@@ -294,6 +288,10 @@ export default class CustomComponentManager<ComponentInstance>
     return bucket;
   }
 
+  getDebugName({ name }: CustomComponentDefinitionState<ComponentInstance>) {
+    return name;
+  }
+
   update(bucket: CustomComponentState<ComponentInstance>) {
     if (ENV._DEBUG_RENDER_TREE) {
       bucket.env.extra.debugRenderTree.update(bucket);
@@ -353,15 +351,6 @@ export default class CustomComponentManager<ComponentInstance>
     });
   }
 
-  getTag({ args }: CustomComponentState<ComponentInstance>): Tag {
-    if (isConstTagged(args)) {
-      // returning a const tag skips the update hook (VM BUG?)
-      return createTag();
-    } else {
-      return args.tag;
-    }
-  }
-
   didRenderLayout(bucket: CustomComponentState<ComponentInstance>, bounds: Bounds) {
     if (ENV._DEBUG_RENDER_TREE) {
       bucket.env.extra.debugRenderTree.didRender(bucket, bounds);
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
index 71f7a381b34..ca932be23db 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
@@ -11,9 +11,8 @@ import {
   PreparedArguments,
   VMArguments,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, ConstReference, VersionedPathReference } from '@glimmer/reference';
+import { ComponentRootReference, ConstReference, PathReference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { CONSTANT_TAG, createTag, isConstTagged } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import InternalComponentManager, { InternalDefinitionState } from './internal';
 
@@ -34,11 +33,11 @@ const CAPABILITIES: ComponentCapabilities = {
 
 export interface InputComponentState {
   env: EmberVMEnvironment;
-  type: VersionedPathReference;
+  type: PathReference;
   instance: Destroyable;
 }
 
-const EMPTY_POSITIONAL_ARGS: VersionedPathReference[] = [];
+const EMPTY_POSITIONAL_ARGS: PathReference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
@@ -53,7 +52,7 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
       args.positional.length === 0
     );
 
-    let __ARGS__: Dict<VersionedPathReference> = args.named.capture().map;
+    let __ARGS__: Dict<PathReference> = args.named.capture().map;
 
     return {
       positional: EMPTY_POSITIONAL_ARGS,
@@ -69,9 +68,9 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     { ComponentClass, layout }: InternalDefinitionState,
     args: VMArguments,
     _dynamicScope: DynamicScope,
-    caller: VersionedPathReference
+    caller: PathReference
   ): InputComponentState {
-    assert('caller must be const', isConstTagged(caller));
+    assert('caller must be const', caller.isConst());
 
     let type = args.named.get('type');
 
@@ -97,18 +96,12 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     return state;
   }
 
-  getSelf({ env, instance }: InputComponentState): VersionedPathReference {
-    return new ComponentRootReference(instance, env);
+  getDebugName() {
+    return 'input';
   }
 
-  getTag() {
-    if (ENV._DEBUG_RENDER_TREE) {
-      // returning a const tag skips the update hook (VM BUG?)
-      return createTag();
-    } else {
-      // an outlet has no hooks
-      return CONSTANT_TAG;
-    }
+  getSelf({ env, instance }: InputComponentState): PathReference {
+    return new ComponentRootReference(instance, env);
   }
 
   didRenderLayout(state: InputComponentState, bounds: Bounds): void {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index aa13beb37d9..9ec35c63c28 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -12,9 +12,8 @@ import {
   VMArguments,
   WithJitDynamicLayout,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, VersionedPathReference } from '@glimmer/reference';
+import { ComponentRootReference, PathReference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { CONSTANT_TAG, createTag, isConstTag, Tag } from '@glimmer/validator';
 import { TemplateFactory } from '../..';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
@@ -25,7 +24,7 @@ interface EngineState {
   controller: any;
   self: ComponentRootReference<any>;
   environment: EmberVMEnvironment;
-  modelRef?: VersionedPathReference<unknown>;
+  modelRef?: PathReference<unknown>;
 }
 
 interface EngineDefinitionState {
@@ -128,22 +127,12 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
     return bucket;
   }
 
-  getSelf({ self }: EngineState): VersionedPathReference<unknown> {
-    return self;
+  getDebugName({ name }: EngineDefinitionState) {
+    return name;
   }
 
-  getTag(state: EngineState): Tag {
-    let tag: Tag = CONSTANT_TAG;
-
-    if (state.modelRef) {
-      tag = state.modelRef.tag;
-    }
-
-    if (ENV._DEBUG_RENDER_TREE && isConstTag(tag)) {
-      tag = createTag();
-    }
-
-    return tag;
+  getSelf({ self }: EngineState): PathReference<unknown> {
+    return self;
   }
 
   getDestroyable(bucket: EngineState): Option<Destroyable> {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 9fed9fde112..85a87787196 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -15,10 +15,9 @@ import {
   WithDynamicTagName,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, VersionedPathReference } from '@glimmer/reference';
+import { ComponentRootReference, PathReference } from '@glimmer/reference';
 import { EMPTY_ARGS, registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
-import { CONSTANT_TAG, createTag, Tag } from '@glimmer/validator';
 
 import { SimpleElement } from '@simple-dom/interface';
 import { EmberVMEnvironment } from '../environment';
@@ -34,7 +33,7 @@ function instrumentationPayload(def: OutletDefinitionState) {
 }
 
 interface OutletInstanceState {
-  self: VersionedPathReference<any | undefined>;
+  self: PathReference<any | undefined>;
   environment: EmberVMEnvironment;
   outlet?: { name: string };
   engine?: { mountPoint: string };
@@ -42,7 +41,7 @@ interface OutletInstanceState {
 }
 
 export interface OutletDefinitionState {
-  ref: VersionedPathReference<OutletState | undefined>;
+  ref: PathReference<OutletState | undefined>;
   name: string;
   outlet: string;
   template: OwnedTemplate;
@@ -140,6 +139,14 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
     return state;
   }
 
+  getDebugName({ name }: OutletDefinitionState) {
+    if (name === '-top-level') {
+      return '- While rendering:';
+    }
+
+    return name;
+  }
+
   getJitStaticLayout({ template }: OutletDefinitionState, _resolver: RuntimeResolver) {
     // The router has already resolved the template
     return unwrapTemplate(template).asLayout();
@@ -153,16 +160,6 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
     return self;
   }
 
-  getTag(): Tag {
-    if (ENV._DEBUG_RENDER_TREE) {
-      // returning a const tag skips the update hook (VM BUG?)
-      return createTag();
-    } else {
-      // an outlet has no hooks
-      return CONSTANT_TAG;
-    }
-  }
-
   didRenderLayout(state: OutletInstanceState, bounds: Bounds): void {
     state.finalize();
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index d0008d5aec9..511416941ef 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -11,6 +11,7 @@ import {
 } from '@glimmer/interfaces';
 import { EMPTY_ARGS } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
+import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
 import { DIRTY_TAG } from '../component';
 import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
@@ -29,6 +30,10 @@ class RootComponentManager extends CurlyComponentManager {
     this.component = component;
   }
 
+  getDebugName() {
+    return '- While rendering:';
+  }
+
   getJitStaticLayout(_state: DefinitionState) {
     const template = this.templateFor(this.component);
     return unwrapTemplate(template).asWrappedLayout();
@@ -69,6 +74,7 @@ class RootComponentManager extends CurlyComponentManager {
       environment,
       component,
       null,
+      CONSTANT_TAG,
       finalizer,
       hasWrappedElement
     );
@@ -83,6 +89,8 @@ class RootComponentManager extends CurlyComponentManager {
       });
     }
 
+    consumeTag(component[DIRTY_TAG]);
+
     return bucket;
   }
 }
@@ -118,8 +126,4 @@ export class RootComponentDefinition implements ComponentDefinition {
       ComponentClass: factory as Factory<any, any>,
     };
   }
-
-  getTag({ component }: ComponentStateBucket) {
-    return component[DIRTY_TAG];
-  }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index c73f6d7b2ae..ab818f9a9bb 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -9,7 +9,6 @@ import {
 } from '@glimmer/interfaces';
 import { NULL_REFERENCE, registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
-import { CONSTANT_TAG, createTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
@@ -76,18 +75,12 @@ export default class TemplateOnlyComponentManager
     }
   }
 
-  getSelf() {
-    return NULL_REFERENCE;
+  getDebugName({ name }: TemplateOnlyComponentDefinitionState) {
+    return name;
   }
 
-  getTag() {
-    if (ENV._DEBUG_RENDER_TREE) {
-      // returning a const tag skips the update hook (VM BUG?)
-      return createTag();
-    } else {
-      // an outlet has no hooks
-      return CONSTANT_TAG;
-    }
+  getSelf() {
+    return NULL_REFERENCE;
   }
 
   getDestroyable(bucket: Option<DebugStateBucket>) {
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index d5de72884e3..249f110fb81 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -7,11 +7,6 @@ import { assert, deprecate, warn } from '@ember/debug';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { ElementBuilder, Environment, Option } from '@glimmer/interfaces';
-import {
-  IterationItemReference,
-  PropertyReference,
-  VersionedPathReference,
-} from '@glimmer/reference';
 import {
   DynamicAttribute,
   dynamicAttribute,
@@ -20,11 +15,11 @@ import {
   setScheduleDestroyed,
   SimpleDynamicAttribute,
 } from '@glimmer/runtime';
-import { setAutotrackingTransactionEnv, setPropertyDidChange } from '@glimmer/validator';
+import { setPropertyDidChange, setTrackingTransactionEnv } from '@glimmer/validator';
 import { AttrNamespace as SimpleAttrNamespace, SimpleElement } from '@simple-dom/interface';
 import installPlatformSpecificProtocolForURL from './protocol-for-url';
 import { OwnedTemplate } from './template';
-import DebugRenderTree, { PathNodeType } from './utils/debug-render-tree';
+import DebugRenderTree from './utils/debug-render-tree';
 import toIterator from './utils/iterator';
 import { isHTMLSafe } from './utils/string';
 import toBool from './utils/to-bool';
@@ -38,7 +33,7 @@ import toBool from './utils/to-bool';
 setPropertyDidChange(() => backburner.ensureInstance());
 
 if (DEBUG) {
-  setAutotrackingTransactionEnv!({
+  setTrackingTransactionEnv!({
     assert(message) {
       assert(message, false);
     },
@@ -143,28 +138,6 @@ export class EmberEnvironmentDelegate implements EnvironmentDelegate<EmberEnviro
     return s;
   }
 
-  getTemplatePathDebugContext(pathRef: VersionedPathReference) {
-    let stack = this.extra.debugRenderTree.logRenderStackForPath(pathRef);
-
-    return `While rendering:\n\n${stack}`;
-  }
-
-  setTemplatePathDebugContext(
-    pathRef: VersionedPathReference,
-    desc: string,
-    parentRef: Option<VersionedPathReference>
-  ) {
-    let type: PathNodeType = 'root';
-
-    if (pathRef instanceof IterationItemReference) {
-      type = 'iterator';
-    } else if (pathRef instanceof PropertyReference) {
-      type = 'property';
-    }
-
-    this.extra.debugRenderTree.createPath(pathRef, desc, type, parentRef);
-  }
-
   onTransactionBegin() {
     this.extra.begin();
   }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
index a827e52bc27..b9266bcea80 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
@@ -1,17 +1,16 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Helper, VMArguments } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
-import { Tag } from '@glimmer/validator';
+import { PathReference } from '@glimmer/reference';
 
 let helper: Helper;
 
 if (DEBUG) {
-  class ComponentAssertionReference implements VersionedPathReference<unknown> {
-    public tag: Tag;
+  class ComponentAssertionReference implements PathReference<unknown> {
+    constructor(private component: PathReference<unknown>, private message: string) {}
 
-    constructor(private component: VersionedPathReference<unknown>, private message: string) {
-      this.tag = component.tag;
+    isConst() {
+      return this.component.isConst();
     }
 
     value(): unknown {
@@ -22,7 +21,7 @@ if (DEBUG) {
       return value;
     }
 
-    get(property: string): VersionedPathReference<unknown> {
+    get(property: string): PathReference<unknown> {
       return this.component.get(property);
     }
   }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
index 26b5340443e..e2ff86c76e1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -1,17 +1,16 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Helper, VMArguments } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
-import { Tag } from '@glimmer/validator';
+import { PathReference } from '@glimmer/reference';
 
 let helper: Helper;
 
 if (DEBUG) {
-  class InElementNullCheckReference implements VersionedPathReference {
-    public tag: Tag;
+  class InElementNullCheckReference implements PathReference {
+    constructor(private inner: PathReference) {}
 
-    constructor(private inner: VersionedPathReference) {
-      this.tag = inner.tag;
+    isConst() {
+      return this.inner.isConst();
     }
 
     value(): unknown {
@@ -25,7 +24,7 @@ if (DEBUG) {
       return value;
     }
 
-    get(key: string): VersionedPathReference {
+    get(key: string): PathReference {
       return this.inner.get(key);
     }
   }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index 7ddb1338b5d..049d3d807f3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -4,33 +4,32 @@
 import { tagForProperty } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
-import { combine, CONSTANT_TAG, createUpdatableTag, Tag, updateTag } from '@glimmer/validator';
+import { PathReference } from '@glimmer/reference';
+import { consumeTag } from '@glimmer/validator';
 
 /**
   This reference is used to get the `[]` tag of iterables, so we can trigger
   updates to `{{each}}` when it changes. It is put into place by a template
   transform at build time, similar to the (-each-in) helper
 */
-class TrackArrayReference implements VersionedPathReference {
-  public tag: Tag;
-  private valueTag = createUpdatableTag();
+class TrackArrayReference implements PathReference {
+  constructor(private inner: PathReference) {}
 
-  constructor(private inner: VersionedPathReference) {
-    this.tag = combine([inner.tag, this.valueTag]);
+  isConst() {
+    return this.inner.isConst();
   }
 
   value(): unknown {
     let iterable = this.inner.value();
 
-    let tag = isObject(iterable) ? tagForProperty(iterable, '[]') : CONSTANT_TAG;
-
-    updateTag(this.valueTag, tag);
+    if (isObject(iterable)) {
+      consumeTag(tagForProperty(iterable, '[]'));
+    }
 
     return iterable;
   }
 
-  get(key: string): VersionedPathReference {
+  get(key: string): PathReference {
     return this.inner.get(key);
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 603bf6a1834..705dbe82e71 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -8,8 +8,7 @@ import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { VM, VMArguments } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
-import { isConstTagged } from '@glimmer/validator';
+import { PathReference } from '@glimmer/reference';
 import { UnboundRootReference } from '../utils/references';
 import { INVOKE } from './mut';
 
@@ -299,8 +298,6 @@ export default function(args: VMArguments, vm: VM): UnboundRootReference<Functio
 
   if (typeof action[INVOKE] === 'function') {
     fn = makeClosureAction(action, action, action[INVOKE], processArgs, debugKey);
-  } else if (isConstTagged(target) && isConstTagged(action)) {
-    fn = makeClosureAction(context.value(), target.value(), action.value(), processArgs, debugKey);
   } else {
     fn = makeDynamicClosureAction(context.value(), target, action, processArgs, debugKey);
   }
@@ -315,8 +312,8 @@ function NOOP(args: VMArguments) {
 }
 
 function makeArgsProcessor(
-  valuePathRef: VersionedPathReference<unknown> | false,
-  actionArgsRef: Array<VersionedPathReference<unknown>>
+  valuePathRef: PathReference<unknown> | false,
+  actionArgsRef: Array<PathReference<unknown>>
 ) {
   let mergeArgs: any;
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 9af103f4f62..46457caeac6 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -5,8 +5,8 @@ import { tagForObject } from '@ember/-internals/metal';
 import { _contentFor } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
-import { combine, createUpdatableTag, Tag, updateTag } from '@glimmer/validator';
+import { PathReference } from '@glimmer/reference';
+import { consumeTag } from '@glimmer/validator';
 
 /**
   The `{{#each}}` helper loops over elements in a collection. It is an extension
@@ -154,18 +154,17 @@ import { combine, createUpdatableTag, Tag, updateTag } from '@glimmer/validator'
   @public
   @since 2.1.0
 */
-class EachInReference implements VersionedPathReference {
-  public tag: Tag;
-  private valueTag = createUpdatableTag();
+class EachInReference implements PathReference {
+  constructor(private inner: PathReference) {}
 
-  constructor(private inner: VersionedPathReference) {
-    this.tag = combine([inner.tag, this.valueTag]);
+  isConst() {
+    return this.inner.isConst();
   }
 
   value(): unknown {
     let iterable = this.inner.value();
 
-    let tag = tagForObject(iterable);
+    consumeTag(tagForObject(iterable));
 
     if (isProxy(iterable)) {
       // this is because the each-in doesn't actually get(proxy, 'key') but bypasses it
@@ -173,12 +172,10 @@ class EachInReference implements VersionedPathReference {
       iterable = _contentFor(iterable);
     }
 
-    updateTag(this.valueTag, tag);
-
     return new EachInWrapper(iterable);
   }
 
-  get(key: string): VersionedPathReference {
+  get(key: string): PathReference {
     return this.inner.get(key);
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index a7789945e2f..5b9ec823e5a 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Environment, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 import buildUntouchableThis from '../utils/untouchable-this';
 import { INVOKE } from './mut';
@@ -79,7 +79,7 @@ const context = buildUntouchableThis('`fn` helper');
   @since 3.11.0
 */
 
-function fn({ positional }: CapturedArguments, env?: Environment<unknown>) {
+function fn({ positional }: CapturedArguments) {
   let callbackRef = positional.at(0);
 
   assert(
@@ -93,7 +93,7 @@ function fn({ positional }: CapturedArguments, env?: Environment<unknown>) {
     assert(
       `You must pass a function as the \`fn\` helpers first argument, you passed ${
         callback === null ? 'null' : typeof callback
-      }. ${env!.getTemplatePathDebugContext(callbackRef)}`,
+      }. While rendering:\n\n${callbackRef.debugLabel}`,
       typeof callback === 'function'
     );
   }
@@ -112,12 +112,5 @@ function fn({ positional }: CapturedArguments, env?: Environment<unknown>) {
 }
 
 export default function(args: VMArguments, vm: VM) {
-  let callback = fn;
-  if (DEBUG) {
-    callback = (args: CapturedArguments) => {
-      return fn(args, vm.env);
-    };
-  }
-
-  return new HelperRootReference(callback, args.capture(), vm.env);
+  return new HelperRootReference(fn, args.capture(), vm.env);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 1da33f32c32..5b5dd4f16f0 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -1,13 +1,8 @@
 import { get as emberGet, set as emberSet } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import { CapturedArguments, Environment, VM, VMArguments } from '@glimmer/interfaces';
-import {
-  HelperRootReference,
-  UPDATE_REFERENCED_VALUE,
-  VersionedPathReference,
-} from '@glimmer/reference';
+import { HelperRootReference, PathReference, UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
 import { NULL_REFERENCE } from '@glimmer/runtime';
-import { isConstTagged } from '@glimmer/validator';
 import { referenceFromParts } from '../utils/references';
 
 /**
@@ -98,11 +93,12 @@ export default function(args: VMArguments, vm: VM) {
   let sourceReference = args.positional.at(0);
   let pathReference = args.positional.at(1);
 
-  if (isConstTagged(pathReference)) {
+  let path = pathReference.value();
+
+  if (pathReference.isConst()) {
     // Since the path is constant, we can create a normal chain of property
     // references. The source reference will update like normal, and all of the
     // child references will update accordingly.
-    let path = pathReference.value();
 
     if (path === undefined || path === null || path === '') {
       return NULL_REFERENCE;
@@ -127,8 +123,8 @@ function get({ positional }: CapturedArguments) {
 }
 
 class GetHelperRootReference extends HelperRootReference {
-  private sourceReference: VersionedPathReference<object>;
-  private pathReference: VersionedPathReference<string>;
+  private sourceReference: PathReference<object>;
+  private pathReference: PathReference<string>;
 
   constructor(args: CapturedArguments, env: Environment) {
     super(get, args, env);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index 7a75461cd05..ae0c36eb70b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -3,9 +3,8 @@
 */
 import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { Environment, VM, VMArguments } from '@glimmer/interfaces';
-import { RootReference, UPDATE_REFERENCED_VALUE, VersionedPathReference } from '@glimmer/reference';
-import { Tag } from '@glimmer/validator';
+import { VMArguments } from '@glimmer/interfaces';
+import { PathReference, UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
 
 /**
   The `mut` helper lets you __clearly specify__ that a child `Component` can update the
@@ -83,21 +82,22 @@ import { Tag } from '@glimmer/validator';
 export const INVOKE: unique symbol = symbol('INVOKE') as any;
 const SOURCE: unique symbol = symbol('SOURCE') as any;
 
-class MutReference extends RootReference {
-  public tag: Tag;
-  public [SOURCE]: VersionedPathReference;
+class MutReference implements PathReference {
+  public [SOURCE]: PathReference;
 
-  constructor(protected inner: VersionedPathReference, env: Environment) {
-    super(env);
-    this.tag = inner.tag;
+  constructor(protected inner: PathReference) {
     this[SOURCE] = inner;
   }
 
-  value(): unknown {
+  value() {
     return this.inner.value();
   }
 
-  get(key: string): VersionedPathReference {
+  isConst() {
+    return this.inner.isConst();
+  }
+
+  get(key: string): PathReference {
     return this.inner.get(key);
   }
 
@@ -110,11 +110,11 @@ class MutReference extends RootReference {
   }
 }
 
-export function unMut(ref: VersionedPathReference) {
+export function unMut(ref: PathReference) {
   return ref[SOURCE] || ref;
 }
 
-export default function(args: VMArguments, vm: VM) {
+export default function(args: VMArguments) {
   let rawRef = args.positional.at(0);
 
   if (typeof rawRef[INVOKE] === 'function') {
@@ -135,5 +135,5 @@ export default function(args: VMArguments, vm: VM) {
   // confusing for the second case.
   assert('You can only pass a path to mut', rawRef[UPDATE_REFERENCED_VALUE] !== undefined);
 
-  return new MutReference(rawRef, vm.env);
+  return new MutReference(rawRef);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index d04214ca715..55080aff795 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -1,9 +1,8 @@
 /**
 @module ember
 */
-import { Environment, VM, VMArguments } from '@glimmer/interfaces';
-import { RootReference, VersionedPathReference } from '@glimmer/reference';
-import { Tag } from '@glimmer/validator';
+import { VMArguments } from '@glimmer/interfaces';
+import { PathReference } from '@glimmer/reference';
 import { INVOKE, unMut } from './mut';
 
 /**
@@ -121,29 +120,28 @@ import { INVOKE, unMut } from './mut';
   @for Ember.Templates.helpers
   @private
 */
-class ReadonlyReference extends RootReference {
-  public tag: Tag;
-
-  constructor(protected inner: VersionedPathReference, env: Environment) {
-    super(env);
-    this.tag = inner.tag;
-  }
+class ReadonlyReference implements PathReference {
+  constructor(protected inner: PathReference) {}
 
   get [INVOKE](): Function | undefined {
     return this.inner[INVOKE];
   }
 
+  isConst() {
+    return this.inner.isConst();
+  }
+
   value(): unknown {
     return this.inner.value();
   }
 
-  get(key: string): VersionedPathReference {
+  get(key: string): PathReference {
     return this.inner.get(key);
   }
 }
 
-export default function(args: VMArguments, vm: VM) {
+export default function(args: VMArguments) {
   let ref = unMut(args.positional.at(0));
 
-  return new ReadonlyReference(ref, vm.env);
+  return new ReadonlyReference(ref);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index b9001a590d1..795bae958aa 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -11,7 +11,7 @@ import {
   VMArguments,
 } from '@glimmer/interfaces';
 import { registerDestructor } from '@glimmer/runtime';
-import { Tag } from '@glimmer/validator';
+import { createUpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { INVOKE } from '../helpers/mut';
 
@@ -70,29 +70,23 @@ export class ActionState {
   public implicitTarget: any;
   public dom: any;
   public eventName: any;
-  public tag: Tag;
+  public tag = createUpdatableTag();
 
   constructor(
     element: SimpleElement,
     actionId: number,
-    actionName: any,
     actionArgs: any[],
     namedArgs: CapturedNamedArguments,
     positionalArgs: CapturedPositionalArguments,
-    implicitTarget: any,
-    dom: any,
-    tag: Tag
+    dom: any
   ) {
     this.element = element;
     this.actionId = actionId;
-    this.actionName = actionName;
     this.actionArgs = actionArgs;
     this.namedArgs = namedArgs;
     this.positional = positionalArgs;
-    this.implicitTarget = implicitTarget;
     this.dom = dom;
     this.eventName = this.getEventName();
-    this.tag = tag;
 
     registerDestructor(this, () => ActionHelper.unregisterAction(this));
   }
@@ -192,33 +186,7 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     _dynamicScope: DynamicScope,
     dom: any
   ) {
-    let { named, positional, tag } = args.capture();
-    let implicitTarget;
-    let actionName;
-    let actionNameRef: any;
-    if (positional.length > 1) {
-      implicitTarget = positional.at(0);
-      actionNameRef = positional.at(1);
-
-      if (actionNameRef[INVOKE]) {
-        actionName = actionNameRef;
-      } else {
-        let actionLabel = actionNameRef.propertyKey;
-        actionName = actionNameRef.value();
-
-        assert(
-          'You specified a quoteless path, `' +
-            actionLabel +
-            '`, to the ' +
-            '{{action}} helper which did not resolve to an action name (a ' +
-            'string). Perhaps you meant to use a quoted actionName? (e.g. ' +
-            '{{action "' +
-            actionLabel +
-            '"}}).',
-          typeof actionName === 'string' || typeof actionName === 'function'
-        );
-      }
-    }
+    let { named, positional } = args.capture();
 
     let actionArgs: any[] = [];
     // The first two arguments are (1) `this` and (2) the action name.
@@ -228,17 +196,7 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     }
 
     let actionId = uuid();
-    let actionState = new ActionState(
-      element,
-      actionId,
-      actionName,
-      actionArgs,
-      named,
-      positional,
-      implicitTarget,
-      dom,
-      tag
-    );
+    let actionState = new ActionState(element, actionId, actionArgs, named, positional, dom);
 
     deprecate(
       `Using the \`{{action}}\` modifier with \`${actionState.eventName}\` events has been deprecated.`,
@@ -255,8 +213,43 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     return actionState;
   }
 
+  getDebugName() {
+    return 'action';
+  }
+
   install(actionState: ActionState) {
-    let { dom, element, actionId } = actionState;
+    let { dom, element, actionId, positional } = actionState;
+
+    let actionName;
+    let actionNameRef: any;
+    let implicitTarget;
+
+    if (positional.length > 1) {
+      implicitTarget = positional.at(0);
+      actionNameRef = positional.at(1);
+
+      if (actionNameRef[INVOKE]) {
+        actionName = actionNameRef;
+      } else {
+        let actionLabel = actionNameRef.propertyKey;
+        actionName = actionNameRef.value();
+
+        assert(
+          'You specified a quoteless path, `' +
+            actionLabel +
+            '`, to the ' +
+            '{{action}} helper which did not resolve to an action name (a ' +
+            'string). Perhaps you meant to use a quoted actionName? (e.g. ' +
+            '{{action "' +
+            actionLabel +
+            '"}}).',
+          typeof actionName === 'string' || typeof actionName === 'function'
+        );
+      }
+    }
+
+    actionState.actionName = actionName;
+    actionState.implicitTarget = implicitTarget;
 
     ActionHelper.registerAction(actionState);
 
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index 15fd849c6f2..f14076aabb1 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -1,20 +1,10 @@
 import { Factory } from '@ember/-internals/owner';
-import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Dict, ModifierManager, VMArguments } from '@glimmer/interfaces';
 import { registerDestructor } from '@glimmer/runtime';
-import {
-  combine,
-  CONSTANT_TAG,
-  createUpdatableTag,
-  Tag,
-  track,
-  untrack,
-  updateTag,
-} from '@glimmer/validator';
+import { createUpdatableTag, untrack } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
-import debugRenderMessage from '../utils/debug-render-message';
 
 export interface CustomModifierDefinitionState<ModifierInstance> {
   ModifierClass: Factory<ModifierInstance>;
@@ -65,6 +55,7 @@ export class CustomModifierDefinition<ModifierInstance> {
 
 export class CustomModifierState<ModifierInstance> {
   public tag = createUpdatableTag();
+  debugName?: string;
 
   constructor(
     public element: SimpleElement,
@@ -129,16 +120,25 @@ class InteractiveCustomModifierManager<ModifierInstance>
     const capturedArgs = args.capture();
 
     let instance = definition.delegate.createModifier(ModifierClass, capturedArgs.value());
+    let state = new CustomModifierState(element, delegate, instance, capturedArgs);
 
-    return new CustomModifierState(element, delegate, instance, capturedArgs);
+    if (DEBUG) {
+      state.debugName = definition.name;
+    }
+
+    return state;
+  }
+
+  getDebugName({ debugName }: CustomModifierState<ModifierInstance>) {
+    return debugName!;
   }
 
-  getTag({ args, tag }: CustomModifierState<ModifierInstance>): Tag {
-    return combine([tag, args.tag]);
+  getTag({ tag }: CustomModifierState<ModifierInstance>) {
+    return tag;
   }
 
   install(state: CustomModifierState<ModifierInstance>) {
-    let { element, args, delegate, modifier, tag } = state;
+    let { element, args, delegate, modifier } = state;
 
     assert(
       'Custom modifier managers must define their capabilities using the capabilities() helper function',
@@ -146,31 +146,24 @@ class InteractiveCustomModifierManager<ModifierInstance>
     );
 
     let { capabilities } = delegate;
+    let argsValue = args.value();
 
     if (capabilities.disableAutoTracking === true) {
-      untrack(() => delegate.installModifier(modifier, element, args.value()));
+      untrack(() => delegate.installModifier(modifier, element, argsValue));
     } else {
-      let combinedTrackingTag = track(
-        () => delegate.installModifier(modifier, element, args.value()),
-        DEBUG && debugRenderMessage!(`(instance of a \`${getDebugName!(modifier)}\` modifier)`)
-      );
-
-      updateTag(tag, combinedTrackingTag);
+      delegate.installModifier(modifier, element, argsValue);
     }
   }
 
   update(state: CustomModifierState<ModifierInstance>) {
-    let { args, delegate, modifier, tag } = state;
+    let { args, delegate, modifier } = state;
     let { capabilities } = delegate;
+    let argsValue = args.value();
 
     if (capabilities.disableAutoTracking === true) {
-      untrack(() => delegate.updateModifier(modifier, args.value()));
+      untrack(() => delegate.updateModifier(modifier, argsValue));
     } else {
-      let combinedTrackingTag = track(
-        () => delegate.updateModifier(modifier, args.value()),
-        DEBUG && debugRenderMessage!(`(instance of a \`${getDebugName!(modifier)}\` modifier)`)
-      );
-      updateTag(tag, combinedTrackingTag);
+      delegate.updateModifier(modifier, argsValue);
     }
   }
 
@@ -185,8 +178,12 @@ class NonInteractiveCustomModifierManager<ModifierInstance>
     return null;
   }
 
-  getTag(): Tag {
-    return CONSTANT_TAG;
+  getDebugName() {
+    return '';
+  }
+
+  getTag() {
+    return null;
   }
 
   install() {}
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 56db7bf1b63..5ebb682b49a 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -3,10 +3,8 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
 import { registerDestructor } from '@glimmer/runtime';
-import { expect } from '@glimmer/util';
-import { CONSTANT_TAG, Tag } from '@glimmer/validator';
+import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
-import { Renderer } from '../renderer';
 import buildUntouchableThis from '../utils/untouchable-this';
 
 const untouchableContext = buildUntouchableThis('`on` modifier');
@@ -51,7 +49,7 @@ const SUPPORTS_EVENT_OPTIONS = (() => {
 })();
 
 export class OnModifierState {
-  public tag: Tag;
+  public tag = createUpdatableTag();
   public owner: Owner;
   public element: Element;
   public args: CapturedArguments;
@@ -68,7 +66,6 @@ export class OnModifierState {
     this.owner = owner;
     this.element = element;
     this.args = args;
-    this.tag = args.tag;
   }
 
   updateFromArgs() {
@@ -115,18 +112,11 @@ export class OnModifierState {
         args.positional.at(1) !== undefined
       );
 
-      // hardcoding `renderer:-dom` here because we guard for `this.isInteractive` before instantiating OnModifierState, it can never be created when the renderer is `renderer:-inert`
-      let renderer = expect(
-        this.owner.lookup<Renderer>('renderer:-dom'),
-        `BUG: owner is missing renderer:-dom`
-      );
-      let stack = renderer.debugRenderTree.logRenderStackForPath(userProvidedCallbackReference);
-
       let value = userProvidedCallbackReference.value();
       assert(
         `You must pass a function as the second argument to the \`on\` modifier, you passed ${
           value === null ? 'null' : typeof value
-        }. While rendering:\n\n${stack}`,
+        }. While rendering:\n\n${userProvidedCallbackReference.debugLabel}`,
         typeof value === 'function'
       );
     }
@@ -330,6 +320,10 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     this.owner = owner;
   }
 
+  getDebugName() {
+    return 'on';
+  }
+
   get counters() {
     return { adds, removes };
   }
@@ -344,9 +338,9 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     return new OnModifierState(this.owner, <Element>element, capturedArgs);
   }
 
-  getTag(state: OnModifierState | null): Tag {
+  getTag(state: OnModifierState | null): UpdatableTag | null {
     if (state === null) {
-      return CONSTANT_TAG;
+      return null;
     }
 
     return state.tag;
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 72f1601ce78..45d5dc524c7 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -3,7 +3,6 @@ import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
-import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   Cursor,
@@ -16,7 +15,7 @@ import {
   SyntaxCompilationContext,
 } from '@glimmer/interfaces';
 import { JitContext } from '@glimmer/opcode-compiler';
-import { VersionedPathReference } from '@glimmer/reference';
+import { PathReference } from '@glimmer/reference';
 import {
   clientBuilder,
   CurriedComponentDefinition,
@@ -25,19 +24,13 @@ import {
   DOMChanges,
   DOMTreeConstruction,
   inTransaction,
-  IteratorResult,
   JitRuntime,
   JitSyntaxCompilationContext,
   renderJitMain,
   UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
 import { unwrapHandle, unwrapTemplate } from '@glimmer/util';
-import {
-  CURRENT_TAG,
-  runInAutotrackingTransaction,
-  validateTag,
-  valueForTag,
-} from '@glimmer/validator';
+import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
 import { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
 import RSVP from 'rsvp';
 import CompileTimeResolver from './compile-time-lookup';
@@ -59,14 +52,14 @@ export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder;
 export class DynamicScope implements GlimmerDynamicScope {
   constructor(
     public view: Component | {} | null,
-    public outletState: VersionedPathReference<OutletState | undefined>
+    public outletState: PathReference<OutletState | undefined>
   ) {}
 
   child() {
     return new DynamicScope(this.view, this.outletState);
   }
 
-  get(key: 'outletState'): VersionedPathReference<OutletState | undefined> {
+  get(key: 'outletState'): PathReference<OutletState | undefined> {
     // tslint:disable-next-line:max-line-length
     assert(
       `Using \`-get-dynamic-scope\` is only supported for \`outletState\` (you used \`${key}\`).`,
@@ -75,7 +68,7 @@ export class DynamicScope implements GlimmerDynamicScope {
     return this.outletState;
   }
 
-  set(key: 'outletState', value: VersionedPathReference<OutletState | undefined>) {
+  set(key: 'outletState', value: PathReference<OutletState | undefined>) {
     // tslint:disable-next-line:max-line-length
     assert(
       `Using \`-with-dynamic-scope\` is only supported for \`outletState\` (you used \`${key}\`).`,
@@ -97,7 +90,7 @@ class RootState {
     public runtime: JitRuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>,
     context: SyntaxCompilationContext,
     template: OwnedTemplate,
-    self: VersionedPathReference<unknown>,
+    self: PathReference<unknown>,
     parentElement: SimpleElement,
     dynamicScope: DynamicScope,
     builder: IBuilder
@@ -120,12 +113,8 @@ class RootState {
         unwrapHandle(handle),
         dynamicScope
       );
-      let iteratorResult: IteratorResult<RenderResult>;
-      do {
-        iteratorResult = iterator.next();
-      } while (!iteratorResult.done);
 
-      let result = (this.result = iteratorResult.value);
+      let result = (this.result = iterator.sync());
 
       // override .render function after initial render
       this.render = () => result.rerender({ alwaysRevalidate: false });
@@ -457,14 +446,7 @@ export abstract class Renderer {
             continue;
           }
 
-          if (DEBUG) {
-            // run in an autotracking transaction to prevent backflow errors.
-            // we use `bind` here to avoid creating a closure (and requiring a
-            // hoisted variable).
-            runInAutotrackingTransaction!(root.render.bind(root));
-          } else {
-            root.render();
-          }
+          root.render();
         }
 
         this._lastRevision = valueForTag(CURRENT_TAG);
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 5f8b790c5cc..361ba06af40 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -4,21 +4,20 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
+import { PathReference } from '@glimmer/reference';
 import {
   CurriedComponentDefinition,
   curry,
   EMPTY_ARGS,
   UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
-import { Tag } from '@glimmer/validator';
 import { MODEL_ARG_NAME, MountDefinition } from '../component-managers/mount';
 import { EmberVMEnvironment } from '../environment';
 
 export function mountHelper(
   args: VMArguments,
   vm: VM
-): VersionedPathReference<CurriedComponentDefinition | null> {
+): PathReference<CurriedComponentDefinition | null> {
   let env = vm.env as EmberVMEnvironment;
   let nameRef = args.positional.at(0);
   let captured: Option<CapturedArguments> = null;
@@ -47,7 +46,6 @@ export function mountHelper(
     assert('[BUG] this should already be checked by the macro', args.named.length === 1);
 
     let named = args.named.capture();
-    let { tag } = named;
 
     // TODO delete me after EMBER_ROUTING_MODEL_ARG has shipped
     if (DEBUG && MODEL_ARG_NAME !== 'model') {
@@ -56,7 +54,6 @@ export function mountHelper(
     }
 
     captured = {
-      tag,
       positional: EMPTY_ARGS.positional,
       named,
       length: 1,
@@ -113,17 +110,18 @@ export function mountHelper(
   @public
 */
 
-class DynamicEngineReference implements VersionedPathReference<Option<CurriedComponentDefinition>> {
-  public tag: Tag;
+class DynamicEngineReference implements PathReference<Option<CurriedComponentDefinition>> {
   private _lastName: Option<string> = null;
   private _lastDef: Option<CurriedComponentDefinition> = null;
 
   constructor(
-    public nameRef: VersionedPathReference<any | undefined | null>,
+    public nameRef: PathReference<any | undefined | null>,
     public env: EmberVMEnvironment,
     public args: Option<CapturedArguments>
-  ) {
-    this.tag = nameRef.tag;
+  ) {}
+
+  isConst() {
+    return false;
   }
 
   value(): Option<CurriedComponentDefinition> {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 4ac1afa9af1..0e8c138846c 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,12 +1,7 @@
 import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Dict, Option, unsafe, VM, VMArguments } from '@glimmer/interfaces';
-import {
-  ConstReference,
-  Reference,
-  RootReference,
-  VersionedPathReference,
-} from '@glimmer/reference';
+import { ConstReference, PathReference, Reference, RootReference } from '@glimmer/reference';
 import {
   CurriedComponentDefinition,
   curry,
@@ -14,7 +9,6 @@ import {
   UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
-import { Tag } from '@glimmer/validator';
 import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
 import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
@@ -75,7 +69,7 @@ export function outletHelper(args: VMArguments, vm: VM) {
   if (args.positional.length === 0) {
     nameRef = new ConstReference('main');
   } else {
-    nameRef = args.positional.at<VersionedPathReference<string>>(0);
+    nameRef = args.positional.at<PathReference<string>>(0);
   }
 
   return new OutletComponentReference(
@@ -85,17 +79,19 @@ export function outletHelper(args: VMArguments, vm: VM) {
 }
 
 class OutletModelReference extends RootReference {
-  public tag: Tag;
-
-  constructor(
-    private parent: VersionedPathReference<OutletState | undefined>,
-    env: EmberVMEnvironment
-  ) {
+  constructor(private parent: PathReference<OutletState | undefined>, env: EmberVMEnvironment) {
     super(env);
-    this.tag = parent.tag;
+
+    if (DEBUG) {
+      this.debugLabel = '@model';
+    }
   }
 
-  value(): unknown {
+  isConst() {
+    return false;
+  }
+
+  compute(): unknown {
     let state = this.parent.value();
 
     if (state === undefined) {
@@ -112,22 +108,17 @@ class OutletModelReference extends RootReference {
   }
 }
 
-if (DEBUG) {
-  OutletModelReference.prototype['debugLogName'] = '@model';
-}
-
-class OutletComponentReference
-  implements VersionedPathReference<CurriedComponentDefinition | null> {
-  public tag: Tag;
+class OutletComponentReference implements PathReference<CurriedComponentDefinition | null> {
   private definition: Option<CurriedComponentDefinition> = null;
   private lastState: Option<OutletDefinitionState> = null;
 
   constructor(
-    private outletRef: VersionedPathReference<OutletState | undefined>,
+    private outletRef: PathReference<OutletState | undefined>,
     private env: EmberVMEnvironment
-  ) {
-    // The router always dirties the root state.
-    this.tag = outletRef.tag;
+  ) {}
+
+  isConst() {
+    return false;
   }
 
   value(): CurriedComponentDefinition | null {
@@ -154,22 +145,22 @@ class OutletComponentReference
 }
 
 function makeArgs(
-  outletRef: VersionedPathReference<OutletState | undefined>,
+  outletRef: PathReference<OutletState | undefined>,
   env: EmberVMEnvironment
 ): CapturedArguments {
-  let tag = outletRef.tag;
   let modelRef = new OutletModelReference(outletRef, env);
-  let map = dict<VersionedPathReference>();
+  let map = dict<PathReference>();
   map.model = modelRef;
 
   // TODO: the functionailty to create a proper CapturedArgument should be
   // exported by glimmer, or that it should provide an overload for `curry`
   // that takes `PreparedArguments`
   return {
-    tag,
     positional: EMPTY_ARGS.positional,
     named: {
-      tag,
+      isConst() {
+        return false;
+      },
       map,
       names: ['model'],
       references: [modelRef],
@@ -177,7 +168,7 @@ function makeArgs(
       has(key: string): boolean {
         return key === 'model';
       },
-      get<T extends VersionedPathReference>(key: string): T {
+      get<T extends PathReference>(key: string): T {
         return (key === 'model' ? modelRef : UNDEFINED_REFERENCE) as unsafe;
       },
       value(): Dict<unknown> {
@@ -195,9 +186,7 @@ function makeArgs(
   };
 }
 
-function stateFor(
-  ref: VersionedPathReference<OutletState | undefined>
-): OutletDefinitionState | null {
+function stateFor(ref: PathReference<OutletState | undefined>): OutletDefinitionState | null {
   let outlet = ref.value();
   if (outlet === undefined) return null;
   let render = outlet.render;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index caffdbd5407..2822d31bece 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -4,16 +4,10 @@ import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
 import { dasherize } from '@ember/string';
 import { DEBUG } from '@glimmer/env';
 import { ElementOperations, Option } from '@glimmer/interfaces';
-import {
-  Reference,
-  RootReference,
-  VersionedPathReference,
-  VersionedReference,
-} from '@glimmer/reference';
+import { CachedReference, PathReference, Reference, RootReference } from '@glimmer/reference';
 import { PrimitiveReference, UNDEFINED_REFERENCE } from '@glimmer/runtime';
-import { combine, Tag } from '@glimmer/validator';
+import { logTrackingStack } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
-import { EmberVMEnvironment } from '../environment';
 import { Component } from './curly-component-state-bucket';
 import { referenceFromParts } from './references';
 import { htmlSafe, isHTMLSafe, SafeString } from './string';
@@ -64,8 +58,7 @@ export const AttributeBinding = {
     component: Component,
     rootRef: RootReference<Component>,
     parsed: [string, string, boolean],
-    operations: ElementOperations,
-    env: EmberVMEnvironment
+    operations: ElementOperations
   ) {
     let [prop, attribute, isSimple] = parsed;
 
@@ -98,8 +91,7 @@ export const AttributeBinding = {
       reference = new StyleBindingReference(
         rootRef,
         reference,
-        referenceForKey(rootRef, 'isVisible'),
-        env
+        referenceForKey(rootRef, 'isVisible')
       );
     }
 
@@ -115,46 +107,39 @@ let StyleBindingReference:
   | undefined
   | {
       new (
-        parent: VersionedPathReference<Component>,
+        parent: PathReference<Component>,
         inner: Reference<unknown>,
-        isVisible: Reference<unknown>,
-        env: EmberVMEnvironment
-      ): VersionedReference<string | SafeString>;
+        isVisible: Reference<unknown>
+      ): Reference<string | SafeString>;
     };
 
 export let installIsVisibleBinding:
   | undefined
-  | ((
-      rootRef: RootReference<Component>,
-      operations: ElementOperations,
-      environment: EmberVMEnvironment
-    ) => void);
+  | ((rootRef: RootReference<Component>, operations: ElementOperations) => void);
 
 if (EMBER_COMPONENT_IS_VISIBLE) {
-  StyleBindingReference = class implements VersionedPathReference<string | SafeString> {
-    public tag: Tag;
+  StyleBindingReference = class extends CachedReference<string | SafeString> {
+    debugLabel?: string;
+
     constructor(
-      parent: VersionedPathReference<Component>,
+      parent: PathReference<Component>,
       private inner: Reference<unknown>,
-      private isVisible: Reference<unknown>,
-      private env: EmberVMEnvironment
+      private isVisible: Reference<unknown>
     ) {
-      this.tag = combine([inner.tag, isVisible.tag]);
+      super();
 
       if (DEBUG) {
-        env.setTemplatePathDebugContext(this, 'style', parent);
+        this.debugLabel = `${parent.debugLabel}.style`;
       }
     }
 
-    value(): string | SafeString {
+    compute(): string | SafeString {
       let value = this.inner.value();
       let isVisible = this.isVisible.value();
 
-      if (isVisible !== undefined) {
+      if (DEBUG && isVisible !== undefined) {
         deprecate(
-          `The \`isVisible\` property on classic component classes is deprecated. Was accessed ${this.env
-            .getTemplatePathDebugContext(this)
-            .replace(/^W/, 'w')}`,
+          `The \`isVisible\` property on classic component classes is deprecated. Was accessed:\n\n${logTrackingStack!()}`,
           false,
           {
             id: 'ember-component.is-visible',
@@ -179,19 +164,10 @@ if (EMBER_COMPONENT_IS_VISIBLE) {
     }
   };
 
-  installIsVisibleBinding = (
-    rootRef: RootReference<Component>,
-    operations: ElementOperations,
-    environment: EmberVMEnvironment
-  ) => {
+  installIsVisibleBinding = (rootRef: RootReference<Component>, operations: ElementOperations) => {
     operations.setAttribute(
       'style',
-      new StyleBindingReference!(
-        rootRef,
-        UNDEFINED_REFERENCE,
-        rootRef.get('isVisible'),
-        environment
-      ),
+      new StyleBindingReference!(rootRef, UNDEFINED_REFERENCE, rootRef.get('isVisible')),
       false,
       null
     );
@@ -227,13 +203,13 @@ export const ClassNameBinding = {
   },
 };
 
-export class SimpleClassNameBindingReference implements VersionedReference<Option<string>> {
-  public tag: Tag;
-  private dasherizedPath: Option<string>;
+export class SimpleClassNameBindingReference implements Reference<Option<string>> {
+  private dasherizedPath: Option<string> = null;
 
-  constructor(private inner: Reference<unknown | number>, private path: string) {
-    this.tag = inner.tag;
-    this.dasherizedPath = null;
+  constructor(private inner: Reference<unknown | number>, private path: string) {}
+
+  isConst() {
+    return this.inner.isConst();
   }
 
   value(): Option<string> {
@@ -250,15 +226,15 @@ export class SimpleClassNameBindingReference implements VersionedReference<Optio
   }
 }
 
-class ColonClassNameBindingReference implements VersionedReference<Option<string>> {
-  public tag: Tag;
-
+class ColonClassNameBindingReference implements Reference<Option<string>> {
   constructor(
     private inner: Reference<unknown>,
     private truthy: Option<string> = null,
     private falsy: Option<string> = null
-  ) {
-    this.tag = inner.tag;
+  ) {}
+
+  isConst() {
+    return this.inner.isConst();
   }
 
   value(): Option<string> {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 7e28b47db32..f58b051bbc0 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,8 +1,8 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
-import { ComponentRootReference, VersionedReference } from '@glimmer/reference';
+import { ComponentRootReference, Reference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { Revision, valueForTag } from '@glimmer/validator';
+import { Revision, Tag, valueForTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import { Renderer } from '../renderer';
 import { Factory as TemplateFactory, OwnedTemplate } from '../template';
@@ -40,7 +40,7 @@ function NOOP() {}
   @private
 */
 export default class ComponentStateBucket {
-  public classRef: VersionedReference<unknown> | null = null;
+  public classRef: Reference<unknown> | null = null;
   public rootRef: ComponentRootReference<Component>;
   public argsRevision: Revision;
 
@@ -48,11 +48,12 @@ export default class ComponentStateBucket {
     public environment: EmberVMEnvironment,
     public component: Component,
     public args: CapturedNamedArguments | null,
+    public argsTag: Tag,
     public finalizer: Finalizer,
     public hasWrappedElement: boolean
   ) {
     this.classRef = null;
-    this.argsRevision = args === null ? 0 : valueForTag(args.tag);
+    this.argsRevision = args === null ? 0 : valueForTag(argsTag);
     this.rootRef = new ComponentRootReference(component, environment);
 
     registerDestructor(this, () => this.willDestroy(), true);
diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
index 56aae9ebb9e..990529df378 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
@@ -1,14 +1,11 @@
 import { assert } from '@ember/debug';
 import { Bounds, CapturedArguments, Option } from '@glimmer/interfaces';
-import { VersionedPathReference } from '@glimmer/reference';
 import { expect, Stack, unwrapTemplate } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
 import { OwnedTemplate } from '../template';
 
 export type RenderNodeType = 'outlet' | 'engine' | 'route-template' | 'component';
 
-export type PathNodeType = 'root' | 'argument' | 'property' | 'iterator';
-
 export interface RenderNode {
   type: RenderNodeType;
   name: string;
@@ -20,17 +17,9 @@ export interface RenderNode {
 interface InternalRenderNode<T extends object> extends RenderNode {
   bounds: Option<Bounds>;
   refs: Set<Ref<T>>;
-  paths: Set<InternalPathNode<T>>;
   parent?: InternalRenderNode<T>;
 }
 
-interface InternalPathNode<T extends object> {
-  name: string;
-  type: PathNodeType;
-  parent: InternalPathNode<T> | InternalRenderNode<T>;
-  paths: Set<InternalPathNode<T>>;
-}
-
 export interface CapturedRenderNode {
   id: string;
   type: RenderNodeType;
@@ -48,17 +37,6 @@ export interface CapturedRenderNode {
 
 let GUID = 0;
 
-function isPathNode<T extends object>(
-  node: RenderNode | InternalPathNode<T>
-): node is InternalPathNode<T> {
-  return (
-    node.type === 'root' ||
-    node.type === 'argument' ||
-    node.type === 'property' ||
-    node.type === 'iterator'
-  );
-}
-
 export class Ref<T extends object> {
   readonly id: number = GUID++;
   private value: Option<T>;
@@ -91,23 +69,12 @@ export class Ref<T extends object> {
   }
 }
 
-const _repeat =
-  String.prototype.repeat ||
-  function(this: string, count: number) {
-    return new Array(count + 1).join(this);
-  };
-
-function repeatString(str: string, count: number) {
-  return _repeat.call(str, count);
-}
-
 export default class DebugRenderTree<Bucket extends object = object> {
   private stack = new Stack<Bucket>();
 
   private refs = new WeakMap<Bucket, Ref<Bucket>>();
   private roots = new Set<Ref<Bucket>>();
   private nodes = new WeakMap<Bucket, InternalRenderNode<Bucket>>();
-  private pathNodes = new WeakMap<VersionedPathReference, InternalPathNode<Bucket>>();
 
   begin(): void {
     this.reset();
@@ -118,7 +85,6 @@ export default class DebugRenderTree<Bucket extends object = object> {
       ...node,
       bounds: null,
       refs: new Set(),
-      paths: new Set(),
     };
     this.nodes.set(state, internalNode);
     this.appendChild(internalNode, state);
@@ -152,109 +118,6 @@ export default class DebugRenderTree<Bucket extends object = object> {
     return this.captureRefs(this.roots);
   }
 
-  createPath(
-    pathRef: VersionedPathReference,
-    name: string,
-    type: PathNodeType,
-    parentRef: Option<VersionedPathReference>
-  ) {
-    assert(
-      'BUG: Attempted to register a path that had already been registered',
-      !this.pathNodes.has(pathRef)
-    );
-
-    let { current } = this.stack;
-
-    if (current === null) {
-      // Not currently in a rendering context, don't register the node
-      return;
-    }
-
-    let currentNode = expect(
-      this.nodes.get(current),
-      'BUG: Attempted to create a path, but there is no current render node'
-    );
-
-    let parent: InternalPathNode<Bucket> | InternalRenderNode<Bucket>;
-
-    if (parentRef === null) {
-      parent = currentNode;
-    } else {
-      let { named } = currentNode.args;
-      let refIndex = named.references.indexOf(parentRef);
-
-      if (refIndex !== -1) {
-        parent = {
-          parent: currentNode,
-          type: 'argument',
-          name: `@${named.names[refIndex]}`,
-          paths: new Set(),
-        };
-      } else if (this.pathNodes.has(parentRef)) {
-        parent = this.pathNodes.get(parentRef)!;
-      } else {
-        // Some RootReferences get created before a component context has been
-        // setup (root, curly). This is mainly because the debugRenderTree is
-        // tied to the manager hooks, and not built into the VM directly. In
-        // these cases, we setup the path lazily when the first property is
-        // accessed.
-
-        this.createPath(parentRef, 'this', 'root', null);
-
-        parent = this.pathNodes.get(parentRef)!;
-      }
-    }
-
-    let pathNode: InternalPathNode<Bucket> = {
-      name,
-      type,
-      parent,
-      paths: new Set(),
-    };
-
-    parent.paths.add(pathNode);
-
-    this.pathNodes.set(pathRef, pathNode);
-  }
-
-  logRenderStackForPath(pathRef: VersionedPathReference): string {
-    let node: InternalRenderNode<Bucket> | InternalPathNode<Bucket> | undefined = expect(
-      this.pathNodes.get(pathRef),
-      'BUG: Attempted to create a log for a path reference, but no node exist for that reference'
-    );
-
-    let pathParts = [];
-
-    while (node !== undefined && isPathNode(node)) {
-      if (node.type === 'iterator') {
-        // Iterator items are a combination of their own name (the key of the item) and
-        // their parent, the iterable itself.
-        let part = `${node.parent.name}[${node.name}]`;
-        pathParts.push(part);
-
-        node = node.parent;
-      } else {
-        pathParts.unshift(node.name);
-      }
-
-      node = node.parent;
-    }
-
-    let messageParts = [pathParts.join('.')];
-
-    while (node !== undefined) {
-      if (node.type === 'outlet' || node.name === '-top-level') {
-        node = node.parent;
-        continue;
-      }
-
-      messageParts.unshift(node.name);
-      node = node.parent;
-    }
-
-    return messageParts.map((part, index) => `${repeatString(' ', index * 2)}${part}`).join('\n');
-  }
-
   private reset(): void {
     if (this.stack.size !== 0) {
       // We probably encountered an error during the rendering loop. This will
diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
index 7f705129da8..2d875581011 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
@@ -1,6 +1,6 @@
 import { Owner } from '@ember/-internals/owner';
-import { Reference, VersionedPathReference } from '@glimmer/reference';
-import { combine, createTag, dirtyTag, Tag } from '@glimmer/validator';
+import { PathReference, Reference } from '@glimmer/reference';
+import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 import { Factory as TemplateFactory, OwnedTemplate } from '../template';
 
 export interface RenderState {
@@ -67,16 +67,21 @@ export interface OutletState {
 /**
  * Represents the root outlet.
  */
-export class RootOutletReference implements VersionedPathReference<OutletState> {
-  tag = createTag();
+export class RootOutletReference implements PathReference<OutletState> {
+  private tag = createTag();
 
   constructor(public outletState: OutletState) {}
 
-  get(key: string): VersionedPathReference<unknown> {
-    return new PathReference(this, key);
+  get(key: string): PathReference {
+    return new OutletPathReference(this, key);
+  }
+
+  isConst() {
+    return false;
   }
 
   value(): OutletState {
+    consumeTag(this.tag);
     return this.outletState;
   }
 
@@ -89,14 +94,14 @@ export class RootOutletReference implements VersionedPathReference<OutletState>
 /**
  * Represents the connected outlet.
  */
-export class OutletReference implements VersionedPathReference<OutletState | undefined> {
-  tag: Tag;
-
+export class OutletReference implements PathReference<OutletState | undefined> {
   constructor(
-    public parentStateRef: VersionedPathReference<OutletState | undefined>,
+    public parentStateRef: PathReference<OutletState | undefined>,
     public outletNameRef: Reference<string>
-  ) {
-    this.tag = combine([parentStateRef.tag, outletNameRef.tag]);
+  ) {}
+
+  isConst() {
+    return false;
   }
 
   value(): OutletState | undefined {
@@ -105,8 +110,8 @@ export class OutletReference implements VersionedPathReference<OutletState | und
     return outlets === undefined ? undefined : outlets[this.outletNameRef.value()];
   }
 
-  get(key: string): VersionedPathReference<unknown> {
-    return new PathReference(this, key);
+  get(key: string): PathReference {
+    return new OutletPathReference(this, key);
   }
 }
 
@@ -114,19 +119,21 @@ export class OutletReference implements VersionedPathReference<OutletState | und
  * Outlet state is dirtied from root.
  * This just using the parent tag for dirtiness.
  */
-class PathReference implements VersionedPathReference<unknown> {
-  public parent: VersionedPathReference<unknown>;
+class OutletPathReference implements PathReference<unknown> {
+  public parent: PathReference<unknown>;
   public key: string;
-  public tag: Tag;
 
-  constructor(parent: VersionedPathReference<unknown>, key: string) {
+  constructor(parent: PathReference<unknown>, key: string) {
     this.parent = parent;
     this.key = key;
-    this.tag = parent.tag;
   }
 
-  get(key: string): VersionedPathReference<unknown> {
-    return new PathReference(this, key);
+  isConst() {
+    return false;
+  }
+
+  get(key: string): PathReference<unknown> {
+    return new OutletPathReference(this, key);
   }
 
   value(): unknown {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/references.ts b/packages/@ember/-internals/glimmer/lib/utils/references.ts
index 42f69ce91b4..2cc5bb53651 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/references.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/references.ts
@@ -2,9 +2,9 @@ import { getDebugName, isObject } from '@ember/-internals/utils';
 import { debugFreeze } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Environment } from '@glimmer/interfaces';
-import { HelperRootReference, RootReference, VersionedPathReference } from '@glimmer/reference';
+import { HelperRootReference, PathReference, RootReference } from '@glimmer/reference';
 import { PrimitiveReference } from '@glimmer/runtime';
-import { consumeTag, deprecateMutationsInAutotrackingTransaction } from '@glimmer/validator';
+import { consumeTag, deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
 import { HelperInstance, isClassHelper, RECOMPUTE_TAG, SimpleHelper } from '../helper';
 
 export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T> {
@@ -25,7 +25,7 @@ export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T
         debugFreeze(positionalValue);
         debugFreeze(namedValue);
 
-        deprecateMutationsInAutotrackingTransaction!(() => {
+        deprecateMutationsInTrackingTransaction!(() => {
           ret = helper.compute(positionalValue, namedValue);
         });
       } else {
@@ -50,24 +50,27 @@ export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T
 }
 
 export class UnboundRootReference<T = unknown> extends RootReference<T> {
-  constructor(
-    private inner: T,
-    protected env: Environment,
-    parent?: VersionedPathReference,
-    key?: string
-  ) {
+  constructor(private inner: T, protected env: Environment, parent?: PathReference, key?: string) {
     super(env);
 
     if (DEBUG) {
-      env.setTemplatePathDebugContext(this, key || 'this', parent || null);
+      this.debugLabel = parent ? `${parent.debugLabel}.${key}` : `this`;
     }
   }
 
+  isConst() {
+    return true;
+  }
+
   value() {
     return this.inner;
   }
 
-  get(key: string): VersionedPathReference<unknown> {
+  compute() {
+    return this.inner;
+  }
+
+  get(key: string): PathReference<unknown> {
     let value = this.value();
 
     if (isObject(value)) {
@@ -82,9 +85,9 @@ export class UnboundRootReference<T = unknown> extends RootReference<T> {
 export class UnboundPropertyReference extends UnboundRootReference {}
 
 export function referenceFromParts(
-  root: VersionedPathReference<unknown>,
+  root: PathReference<unknown>,
   parts: string[]
-): VersionedPathReference<unknown> {
+): PathReference<unknown> {
   let reference = root;
 
   for (let i = 0; i < parts.length; i++) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 473284052c9..90bb9229520 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3068,7 +3068,7 @@ moduleFor(
         this.render(`{{foo-bar id="foo-bar" isVisible=visible}}`, {
           visible: false,
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       assertStyle('display: none;');
 
@@ -3078,7 +3078,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', true);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       assertStyle('');
 
@@ -3086,7 +3086,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', false);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       assertStyle('display: none;');
     }
@@ -3105,7 +3105,7 @@ moduleFor(
         this.render(`{{foo-bar id="foo-bar" isVisible=visible}}`, {
           visible: false,
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -3118,7 +3118,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', true);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -3129,7 +3129,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', false);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -3165,7 +3165,7 @@ moduleFor(
           visible: false,
           foo: 'baz',
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       assertStyle('display: none;');
 
@@ -3175,7 +3175,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', true);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       assertStyle('');
 
@@ -3184,7 +3184,7 @@ moduleFor(
           set(this.context, 'visible', false);
           set(this.context, 'foo', 'woo');
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed while rendering:\n\nfoo-bar/);
+      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
 
       assertStyle('display: none;');
       assert.equal(this.firstChild.getAttribute('foo'), 'woo');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 0c08240dbd7..ea01c6391de 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -150,7 +150,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
         this.registerTemplateOnlyComponent('x-inner-template-only', '{{@value}}');
 
         let expectedBacktrackingMessage = backtrackingMessageFor('content', '<.+?>', {
-          renderTree: ['x-outer', 'this.wrapper.content'],
+          renderTree: ['x-outer', 'x-inner-template-only', 'this.wrapper.content'],
         });
 
         expectAssertion(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index c494df787fd..25ad36ceb6c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -707,18 +707,29 @@ class DynamicContentTestGenerator {
         [`${tag} rendering ${label}`]() {
           this.renderPath('value', { value });
 
+          // NaN is unstable, not worth optimizing for in the VM
+          let wasNaN = typeof value === 'number' && isNaN(value);
+
           this.assertContent(expected);
 
-          this.assertStableRerender();
+          if (!wasNaN) {
+            this.assertStableRerender();
+          }
 
           runTask(() => set(this.context, 'value', 'hello'));
           this.assertContent('hello');
-          this.assertInvariants();
+
+          if (!wasNaN) {
+            this.assertInvariants();
+          }
 
           runTask(() => set(this.context, 'value', value));
 
           this.assertContent(expected);
-          this.assertInvariants();
+
+          if (!wasNaN) {
+            this.assertInvariants();
+          }
         },
       };
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index caedda7718b..503878e65d6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -286,7 +286,7 @@ moduleFor(
       );
 
       let expectedMessage = backtrackingMessageFor('name', 'Person', {
-        renderTree: ['\\(instance of a `MyModifier` modifier\\)'],
+        renderTree: ['\\(instance of a `foo-bar` modifier\\)'],
       });
 
       expectAssertion(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 7ed2be76fa1..fa91cf2b10b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -146,7 +146,7 @@ moduleFor(
       });
 
       let expectedBacktrackingMessage = backtrackingMessageFor('name', 'Person \\(Ben\\)', {
-        renderTree: ['application', 'route-with-mount', 'chat', 'application', 'this.person.name'],
+        renderTree: ['application', 'route-with-mount', 'chat', 'this.person.name'],
       });
 
       await this.visit('/');
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 08a7b090133..bc1f8e08c0c 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -6,7 +6,7 @@ import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
   consumeTag,
-  deprecateMutationsInAutotrackingTransaction,
+  deprecateMutationsInTrackingTransaction,
   isTracking,
   tagFor,
   track,
@@ -119,7 +119,7 @@ export function _getProp(obj: object, keyName: string) {
       typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
     ) {
       if (DEBUG) {
-        deprecateMutationsInAutotrackingTransaction!(() => {
+        deprecateMutationsInTrackingTransaction!(() => {
           value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
         });
       } else {
diff --git a/yarn.lock b/yarn.lock
index 56375ca3508..90892227b73 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.56.1.tgz#fe391a65f794f85483f4d1ab4c84910b37a822a7"
-  integrity sha512-W+vP8ykJt8VS4q5C9vE/7RDKLgeB6lcA9Lw6WP8rzs278hGGOz5yr1PKFKKoqY6x0lisIohdsqlHZ+cw0HMsZQ==
-  dependencies:
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/syntax" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
-    "@glimmer/wire-format" "^0.56.1"
+"@glimmer/compiler@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.57.2.tgz#844b38b045a2d2f6cde382d100900cb8b64d38de"
+  integrity sha512-/2FDT/g7gEAzkn75hIhk/71iiLqbnaEY0dumeWY8vr89gfZ6jD4dOfhrofYp8+vdkkTWTu9v6ps/fYFIhu7i2g==
+  dependencies:
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/syntax" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
+    "@glimmer/wire-format" "^0.57.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.56.1.tgz#202514cae28710f68a828b2db3db955e62c6a9b3"
-  integrity sha512-vIQTtHzqjm/7qC9EtR6zqcqzU7SabgyUDZ0jdsLIyhjv7SZGq5qFWlonkHDnB8/o3lzAuwcxhjOY2y10nOX/yw==
+"@glimmer/encoder@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.57.2.tgz#6bc6d637eedb0020293e8e7f724b6fcb94f21c04"
+  integrity sha512-Z41y8agv9KaeOTXuNjFrBUfAA7cFMrv3ykoIlg538KT4iuW6pbLrXZvb7bU5PSNgQhXZZ/0ASc7ldanrO6HdIA==
   dependencies:
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/vm" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/vm" "^0.57.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.56.1.tgz#599d305fac56a1a757932c514d0e938ef2186135"
-  integrity sha512-+0KvSd7c9QmkEeCFHaBDub1DBeTONw+x6MZUcb/MlA3FfNis2aFs7kHVkjkdzp0Ust54Wn448dgWZFW27EuVJA==
+"@glimmer/interfaces@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.57.2.tgz#6cf59f970103439333459c499a3602b19937168e"
+  integrity sha512-wdG01BZzbT9lOvl9hLJbnCfJX2i9aEtVksM/5BsFY/ljwSGnzO5YkQU/PYQniaW5dgezPHnyq5jIH2g5LWyvtw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.56.1.tgz#d813bd5dbdd5914287623f0c3bfc3eedf97a279e"
-  integrity sha512-02S6C0HnQ4jTmhqBNXpA+9vtIduFJpfPzKKAREHuosWWNZnhQAziAowAUd3/MXZZkl2YDv6pRN30mT8NBMpRWg==
+"@glimmer/low-level@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.57.2.tgz#33b7361437230b1dc9d33e1ff0209ca25f9e4d21"
+  integrity sha512-s5CX0dio2SzWhROY4VL5hkj8+emTk/ZluHC76Mz4iL28EHoAmHOsYBsgfIler2R2iL47624WrdPwh+C0rZmiLA==
 
-"@glimmer/node@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.56.1.tgz#94c276c1ddcb2a3ea7dba592e493c487b3da7337"
-  integrity sha512-2vw0OtfrrSy/FbjPfqu3DNs5oYGo7D4/ahyq0O4v4y1ACtkcSx768yj4iBe0Jxce69sDb24zYwq13UA0JUwN2w==
+"@glimmer/node@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.57.2.tgz#c814bbfbf00aed6e07392c41582f31a1cbb8a0cd"
+  integrity sha512-ah+HjBbraTM6GTmYw+fKW9vQf/rStMyDBxgeaUVMm86GTrSecLmZFJZUWBjmmgVEBgb06qKPgdQlOcku2SHEVQ==
   dependencies:
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/runtime" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/runtime" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.56.1.tgz#def91e1fa4f73049ad8a5827f90d3c457f162a6c"
-  integrity sha512-W2X+mA45PMkq4ZsGPqa7EqrMOSvWg7WC406yCwpLALMz7xueHN1aM/FdHxB2yVX0nppriKCgcqWfRFWeiM++SA==
-  dependencies:
-    "@glimmer/encoder" "^0.56.1"
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/program" "^0.56.1"
-    "@glimmer/reference" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
-    "@glimmer/vm" "^0.56.1"
-    "@glimmer/wire-format" "^0.56.1"
-
-"@glimmer/program@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.56.1.tgz#f31a83a94a2095b2bc3bd0a8522439140c3503d4"
-  integrity sha512-ldu39AIIdOg5Mmg1bdl1f86xI6yLtHX52wUYWyowdlLO6r0UmdlDoeygKCtawJMSI1G/Gb4+fhcvyyg75rGXZw==
-  dependencies:
-    "@glimmer/encoder" "^0.56.1"
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
-
-"@glimmer/reference@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.56.1.tgz#6760d1a143b17f20e16556d7cf8ce9a68e07fe5a"
-  integrity sha512-buPBW/5nmeIVqZQXNKRGS4UOT/zaZ2j0R+ARMRXJ/nVKF6IMchtWx8cAMxw3dO9jZBwX5R4uoZwr5tOSSMm3HQ==
+"@glimmer/opcode-compiler@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.57.2.tgz#1b09b7356c81b3ff1354cd3225f08276ab30678a"
+  integrity sha512-hPCvH4VKY8+l3qzkuSPpcAnSh0hhJXHcuIPb06RKZwVfdK7l4A4C2Jv1jYuPUHru0in18H/0xOpHn7uvpBgvwQ==
+  dependencies:
+    "@glimmer/encoder" "^0.57.2"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/program" "^0.57.2"
+    "@glimmer/reference" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
+    "@glimmer/vm" "^0.57.2"
+    "@glimmer/wire-format" "^0.57.2"
+
+"@glimmer/program@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.57.2.tgz#6b1acb3d9a2d3d6f0d07d70052fb93467886fa1b"
+  integrity sha512-NoI1QxjAREulAM/SlvKJojuFLcpjpFaZ6XaWMNkYca84UTA09esyAv1dYgZQhwQMdHUOrQyrmsFQg/a3kiagGg==
+  dependencies:
+    "@glimmer/encoder" "^0.57.2"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
+
+"@glimmer/reference@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.57.2.tgz#378c0d3644d4a98c4138c3205f6d4f0b5e004e92"
+  integrity sha512-xkUsl4cYR9ZOBEsNOmdxmb7iQnfTzeQZSGOD7H2fP9RqKGXR4mpNuDyP2YDCs2bI5JChDo3QvPp24RHmDjd8rA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
-    "@glimmer/validator" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
+    "@glimmer/validator" "^0.57.2"
 
-"@glimmer/runtime@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.56.1.tgz#258bfc8abbe86709ce188dac75603d060fa0f7e1"
-  integrity sha512-IHI3+KvZ4xH5TEYNgQzLxM0ei4ScGuVN2XhomfFKbe906D8DgnqoAHAUyiOUh8aVmVp92npz8R5T/Txps4ZkLA==
+"@glimmer/runtime@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.57.2.tgz#f7502ecab591b4363b532928189d49ed64611ae3"
+  integrity sha512-QmsYJI8kBv9MBFWDALCcCX26KtvfQ/e8ltkJraApYzozmHVNAVikKLQvcBVd+1XasUoI0l8MI9G/NWqk7ulu8A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/low-level" "^0.56.1"
-    "@glimmer/program" "^0.56.1"
-    "@glimmer/reference" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
-    "@glimmer/validator" "^0.56.1"
-    "@glimmer/vm" "^0.56.1"
-    "@glimmer/wire-format" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/low-level" "^0.57.2"
+    "@glimmer/program" "^0.57.2"
+    "@glimmer/reference" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
+    "@glimmer/validator" "^0.57.2"
+    "@glimmer/vm" "^0.57.2"
+    "@glimmer/wire-format" "^0.57.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.56.1.tgz#361989b70ed3482762f33ecb07dae52cefa76e87"
-  integrity sha512-4TdtIQVFo9UfIVzXnXpMuzsA4mX06oF9NER8FmIPjBosNiQsYB7P8sABSG+2rtWgsh6CkFXkwvxZ++BB+alwOw==
+"@glimmer/syntax@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.57.2.tgz#f5c910d67027fbfda707b385d3ce03ecd324e2ee"
+  integrity sha512-gWMSSd0AqTRtTtqpjCY/qpyQqplNoqEVVGXwlHyao/Fzc7fmCoKyDmq7+nL19iU8O9wLKcwpIdYTm0cvEXJlKA==
   dependencies:
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.56.1.tgz#0947f75df9a1b30e3c0c505bc2be2e776b4364ae"
-  integrity sha512-g7R5hMtZ2BLF+AsYhSE1xoh0gOJALof4/JL6zovYvqrsKTLYGK1Qe3RKXSt8dPav8Ac0LXt+cOd6jHPGSrEs+A==
+"@glimmer/util@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.57.2.tgz#d44da407d2971b45982aef072915c75c6bbcf028"
+  integrity sha512-PIF29qQbR5w70UKZN/CXtSwGdDd5bolz5vKobPRgFHeigZUyICqvd74/PFe9gOzKWtCGt0Y8pi9BlAiVDXA1Fw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.56.1.tgz#584c0d6c68a0e2bfd92fe25626da70173b0ed9de"
-  integrity sha512-UDqM4NZLx5x1YJqbYt9LPxn6fzFU5bv5S306b51Bjj0MaNun3QRHw8D5RzrZaMufMr72Dph/4YyN2zKMavfmIA==
+"@glimmer/validator@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.57.2.tgz#7c37a33268c491280cc598fb3212c767f6fb3fce"
+  integrity sha512-e8WdKZod9Tznp62vHOd3SgyVFCD995z9PAmONvq4kDDONdBRTwFQaz72TaDB44bG6S3PL73s8GiuO7Iar0HX1g==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.56.1.tgz#4c21a8fb5d492c1cb85228215cee22623fdd03c8"
-  integrity sha512-6Eb9EZmSFeb8M6DE+HfIZlWhKG8VyU3o7GSJw6n3J+1DNTfMID41NdS0Y8nd+gA6N1UJvEeC2QpKg4d8XCa50A==
+"@glimmer/vm@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.57.2.tgz#c65c965eaad79faef53b6de92539fecf95445840"
+  integrity sha512-n7WwbASKo3AxOvtGXS6Wbk0zQh0Bd57NRTgrWGpdy4Ojw9TvaV/hOjYdRI1vxiS1T933N2VlDxLEtPzj1rg6Jw==
   dependencies:
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
 
-"@glimmer/wire-format@^0.56.1":
-  version "0.56.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.56.1.tgz#40ce098eabb3c9ac06afcb35cd1c5228f52d38b4"
-  integrity sha512-5HMysobNYWh4HFWh+LH5k3BZUTnLngyp6V1VJo7DgQ5iC+8c57V+M3HBuQOB7n6EBT0+sO49xMoylX/rywoCuA==
+"@glimmer/wire-format@^0.57.2":
+  version "0.57.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.57.2.tgz#294519d14da76e8d11eb7872daa2a23737e7cc70"
+  integrity sha512-g4EKDtImDHssNYkqwsb+VwS6f3LfogRuQlvMsk3LkACXYvwrvyBHJApKeCB3YvCbza7KMyYrfzcpzcBKIHcZhA==
   dependencies:
-    "@glimmer/interfaces" "^0.56.1"
-    "@glimmer/util" "^0.56.1"
+    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/util" "^0.57.2"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 8d51f08099020a634b34044002625458f6183e3d Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 14 Aug 2020 14:32:31 -0700
Subject: [PATCH 0089/1405] [REFACTOR] Simplify captured args

Integrates: https://github.com/glimmerjs/glimmer-vm/pull/1135
---
 package.json                                  |  16 +-
 .../glimmer/lib/component-managers/curly.ts   |  10 +-
 .../glimmer/lib/component-managers/custom.ts  |  28 +--
 .../glimmer/lib/component-managers/input.ts   |   2 +-
 .../glimmer/lib/component-managers/mount.ts   |  11 +-
 .../glimmer/lib/helpers/-normalize-class.ts   |   4 +-
 .../-internals/glimmer/lib/helpers/action.ts  |   2 +-
 .../-internals/glimmer/lib/helpers/array.ts   |   5 +-
 .../-internals/glimmer/lib/helpers/concat.ts  |   4 +-
 .../-internals/glimmer/lib/helpers/fn.ts      |   5 +-
 .../-internals/glimmer/lib/helpers/get.ts     |   8 +-
 .../-internals/glimmer/lib/helpers/hash.ts    |   7 +-
 .../glimmer/lib/helpers/if-unless.ts          |   8 +-
 .../-internals/glimmer/lib/helpers/log.ts     |   3 +-
 .../glimmer/lib/helpers/query-param.ts        |   5 +-
 .../glimmer/lib/modifiers/action.ts           |  38 ++--
 .../glimmer/lib/modifiers/custom.ts           |  10 +-
 .../-internals/glimmer/lib/modifiers/on.ts    |  12 +-
 .../-internals/glimmer/lib/syntax/mount.ts    |  25 +--
 .../-internals/glimmer/lib/syntax/outlet.ts   |  45 +---
 .../glimmer/lib/utils/debug-render-tree.ts    |   7 +-
 .../glimmer/lib/utils/process-args.ts         |  18 +-
 .../glimmer/lib/utils/references.ts           |  15 +-
 yarn.lock                                     | 196 +++++++++---------
 24 files changed, 215 insertions(+), 269 deletions(-)

diff --git a/package.json b/package.json
index 8ccc6fe529f..9f75a75baed 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,15 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.57.2",
+    "@glimmer/compiler": "^0.58.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.57.2",
-    "@glimmer/node": "^0.57.2",
-    "@glimmer/opcode-compiler": "^0.57.2",
-    "@glimmer/program": "^0.57.2",
-    "@glimmer/reference": "^0.57.2",
-    "@glimmer/runtime": "^0.57.2",
-    "@glimmer/validator": "^0.57.2",
+    "@glimmer/interfaces": "^0.58.0",
+    "@glimmer/node": "^0.58.0",
+    "@glimmer/opcode-compiler": "^0.58.0",
+    "@glimmer/program": "^0.58.0",
+    "@glimmer/reference": "^0.58.0",
+    "@glimmer/runtime": "^0.58.0",
+    "@glimmer/validator": "^0.58.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index ea19befad9a..4b398a14b79 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -22,7 +22,7 @@ import {
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
 import { PathReference, RootReference } from '@glimmer/reference';
-import { PrimitiveReference, registerDestructor } from '@glimmer/runtime';
+import { PrimitiveReference, registerDestructor, ReifyPositionalReference } from '@glimmer/runtime';
 import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
 import {
   beginTrackFrame,
@@ -168,7 +168,7 @@ export default class CurlyComponentManager
 
   prepareArgs(state: DefinitionState, args: VMArguments): Option<PreparedArguments> {
     if (args.named.has('__ARGS__')) {
-      let { __ARGS__, ...rest } = args.named.capture().map;
+      let { __ARGS__, ...rest } = args.named.capture();
 
       let prepared = {
         positional: EMPTY_POSITIONAL_ARGS,
@@ -199,12 +199,12 @@ export default class CurlyComponentManager
         `You cannot specify positional parameters and the hash argument \`${positionalParams}\`.`,
         !args.named.has(positionalParams)
       );
-      named = { [positionalParams]: args.positional.capture() };
-      assign(named, args.named.capture().map);
+      named = { [positionalParams]: new ReifyPositionalReference(args.positional.capture()) };
+      assign(named, args.named.capture());
     } else if (Array.isArray(positionalParams) && positionalParams.length > 0) {
       const count = Math.min(positionalParams.length, args.positional.length);
       named = {};
-      assign(named, args.named.capture().map);
+      assign(named, args.named.capture());
 
       for (let i = 0; i < count; i++) {
         const name = positionalParams[i];
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index c1bd4933eab..ed1e5656b23 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -17,7 +17,7 @@ import {
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
 import { ComponentRootReference, PathReference } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
+import { registerDestructor, reifyArgs, reifyPositional } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { track } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
@@ -194,31 +194,33 @@ export default class CustomComponentManager<ComponentInstance>
 
     if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
       let getTag = (key: string) => {
-        return track(() => namedArgs.get(key).value());
+        return track(() => namedArgs[key].value());
       };
 
       if (HAS_NATIVE_PROXY) {
         let handler: ProxyHandler<{}> = {
           get(_target, prop) {
-            if (namedArgs.has(prop as string)) {
-              return namedArgs.get(prop as string).value();
+            let ref = namedArgs[prop as string];
+
+            if (ref !== undefined) {
+              return ref.value();
             } else if (prop === CUSTOM_TAG_FOR) {
               return getTag;
             }
           },
 
           has(_target, prop) {
-            return namedArgs.has(prop as string);
+            return namedArgs[prop as string] !== undefined;
           },
 
           ownKeys(_target) {
-            return namedArgs.names;
+            return Object.keys(namedArgs);
           },
 
           getOwnPropertyDescriptor(_target, prop) {
             assert(
               'args proxies do not have real property descriptors, so you should never need to call getOwnPropertyDescriptor yourself. This code exists for enumerability, such as in for-in loops and Object.keys()',
-              namedArgs.has(prop as string)
+              namedArgs[prop as string] !== undefined
             );
 
             return {
@@ -248,12 +250,12 @@ export default class CustomComponentManager<ComponentInstance>
           value: getTag,
         });
 
-        namedArgs.names.forEach(name => {
+        Object.keys(namedArgs).forEach(name => {
           Object.defineProperty(namedArgsProxy, name, {
             enumerable: true,
             configurable: true,
             get() {
-              return namedArgs.get(name).value();
+              return namedArgs[name].value();
             },
           });
         });
@@ -261,10 +263,10 @@ export default class CustomComponentManager<ComponentInstance>
 
       value = {
         named: namedArgsProxy,
-        positional: capturedArgs.positional.value(),
+        positional: reifyPositional(capturedArgs.positional),
       };
     } else {
-      value = capturedArgs.value();
+      value = reifyArgs(capturedArgs);
     }
 
     const component = delegate.createComponent(definition.ComponentClass.class, value);
@@ -304,10 +306,10 @@ export default class CustomComponentManager<ComponentInstance>
     if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
       value = {
         named: namedArgsProxy!,
-        positional: args.positional.value(),
+        positional: reifyPositional(args.positional),
       };
     } else {
-      value = args.value();
+      value = reifyArgs(args);
     }
 
     if (hasUpdateHook(delegate)) {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
index ca932be23db..aa8c8646271 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
@@ -52,7 +52,7 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
       args.positional.length === 0
     );
 
-    let __ARGS__: Dict<PathReference> = args.named.capture().map;
+    let __ARGS__: Dict<PathReference> = args.named.capture();
 
     return {
       positional: EMPTY_POSITIONAL_ARGS,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 9ec35c63c28..f9075febf37 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,8 +1,6 @@
 import { ENV } from '@ember/-internals/environment';
 import { generateControllerFactory } from '@ember/-internals/routing';
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import EngineInstance from '@ember/engine/instance';
-import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   ComponentCapabilities,
@@ -46,11 +44,6 @@ const CAPABILITIES = {
   willDestroy: false,
 };
 
-// TODO
-// This "disables" the "@model" feature by making the arg untypable syntatically
-// Delete this when EMBER_ROUTING_MODEL_ARG has shipped
-export const MODEL_ARG_NAME = EMBER_ROUTING_MODEL_ARG || !DEBUG ? 'model' : ' untypable model arg ';
-
 class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
   implements WithJitDynamicLayout<EngineState, RuntimeResolver> {
   getJitDynamicLayout(state: EngineState, _: RuntimeResolver) {
@@ -85,8 +78,8 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
     let bucket: EngineState;
     let modelRef;
 
-    if (args.named.has(MODEL_ARG_NAME)) {
-      modelRef = args.named.get(MODEL_ARG_NAME);
+    if (args.named.has('model')) {
+      modelRef = args.named.get('model');
     }
 
     if (modelRef === undefined) {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 401996e826d..4a5899c5ce1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -3,9 +3,9 @@ import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 
 function normalizeClass({ positional }: CapturedArguments) {
-  let classNameParts = (positional.at(0).value() as string).split('.');
+  let classNameParts = (positional[0].value() as string).split('.');
   let className = classNameParts[classNameParts.length - 1];
-  let value = positional.at(1).value();
+  let value = positional[1].value();
 
   if (value === true) {
     return dasherize(className);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 705dbe82e71..d0133b7e27f 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -286,7 +286,7 @@ export default function(args: VMArguments, vm: VM): UnboundRootReference<Functio
   // pos[0] is the context (or `this`)
   // pos[1] is the action name or function
   // Anything else is an action argument.
-  let [context, action, ...restArgs] = capturedArgs.references;
+  let [context, action, ...restArgs] = capturedArgs;
 
   // TODO: Is there a better way of doing this?
   let debugKey: string | undefined = (action as any).propertyKey;
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index 2b43f0294b0..2aa151b726b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -1,5 +1,6 @@
 import { VMArguments } from '@glimmer/interfaces';
 import { PathReference } from '@glimmer/reference';
+import { ReifyPositionalReference } from '@glimmer/runtime';
 
 /**
 @module ember
@@ -41,6 +42,6 @@ import { PathReference } from '@glimmer/reference';
    @public
  */
 
-export default function(args: VMArguments): PathReference<unknown[]> {
-  return args.positional.capture();
+export default function(args: VMArguments): PathReference {
+  return new ReifyPositionalReference(args.positional.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index fab1f7ebf3e..c20ffa36bea 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -1,5 +1,6 @@
 import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
+import { reifyPositional } from '@glimmer/runtime';
 
 const isEmpty = (value: any): boolean => {
   return value === null || value === undefined || typeof value.toString !== 'function';
@@ -39,8 +40,7 @@ const normalizeTextValue = (value: any): string => {
   @since 1.13.0
 */
 function concat({ positional }: CapturedArguments) {
-  return positional
-    .value()
+  return reifyPositional(positional)
     .map(normalizeTextValue)
     .join('');
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 5b9ec823e5a..c46be713bb2 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -2,6 +2,7 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
+import { reifyPositional } from '@glimmer/runtime';
 import buildUntouchableThis from '../utils/untouchable-this';
 import { INVOKE } from './mut';
 
@@ -80,7 +81,7 @@ const context = buildUntouchableThis('`fn` helper');
 */
 
 function fn({ positional }: CapturedArguments) {
-  let callbackRef = positional.at(0);
+  let callbackRef = positional[0];
 
   assert(
     `You must pass a function as the \`fn\` helpers first argument.`,
@@ -99,7 +100,7 @@ function fn({ positional }: CapturedArguments) {
   }
 
   return (...invocationArgs: unknown[]) => {
-    let [fn, ...args] = positional.value();
+    let [fn, ...args] = reifyPositional(positional);
 
     if (typeof callbackRef[INVOKE] === 'function') {
       // references with the INVOKE symbol expect the function behind
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 5b5dd4f16f0..24e1bdeafd2 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -113,10 +113,10 @@ export default function(args: VMArguments, vm: VM) {
 }
 
 function get({ positional }: CapturedArguments) {
-  let source = positional.at(0).value();
+  let source = positional[0].value();
 
   if (isObject(source)) {
-    let path = positional.at(1).value();
+    let path = positional[1].value();
 
     return emberGet(source, String(path));
   }
@@ -128,8 +128,8 @@ class GetHelperRootReference extends HelperRootReference {
 
   constructor(args: CapturedArguments, env: Environment) {
     super(get, args, env);
-    this.sourceReference = args.positional.at(0);
-    this.pathReference = args.positional.at(1);
+    this.sourceReference = args.positional[0] as PathReference<object>;
+    this.pathReference = args.positional[1] as PathReference<string>;
   }
 
   [UPDATE_REFERENCED_VALUE](value: any) {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
index 16fe06b2e4b..a78485bd557 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
@@ -1,5 +1,6 @@
-import { Dict, VMArguments } from '@glimmer/interfaces';
+import { VMArguments } from '@glimmer/interfaces';
 import { PathReference } from '@glimmer/reference';
+import { ReifyNamedReference } from '@glimmer/runtime';
 
 /**
 @module ember
@@ -44,6 +45,6 @@ import { PathReference } from '@glimmer/reference';
    @public
  */
 
-export default function(args: VMArguments): PathReference<Dict<unknown>> {
-  return args.named.capture();
+export default function(args: VMArguments): PathReference {
+  return new ReifyNamedReference(args.named.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
index 229fdaaccaf..6c83467a2b1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
@@ -13,9 +13,7 @@ function ifHelper({ positional }: CapturedArguments) {
     positional.length === 3 || positional.length === 2
   );
 
-  let condition = positional.at(0);
-  let truthyValue = positional.at(1);
-  let falsyValue = positional.at(2);
+  let [condition, truthyValue, falsyValue] = positional;
 
   if (toBool(condition.value()) === true) {
     return truthyValue.value();
@@ -30,9 +28,7 @@ function unless({ positional }: CapturedArguments) {
     positional.length === 3 || positional.length === 2
   );
 
-  let condition = positional.at(0);
-  let truthyValue = positional.at(2);
-  let falsyValue = positional.at(1);
+  let [condition, falsyValue, truthyValue] = positional;
 
   if (toBool(condition.value()) === true) {
     return truthyValue !== undefined ? truthyValue.value() : undefined;
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
index 52b02eeb7c3..2da2ff384ab 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
@@ -1,5 +1,6 @@
 import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
+import { reifyPositional } from '@glimmer/runtime';
 /**
 @module ember
 */
@@ -19,7 +20,7 @@ import { HelperRootReference } from '@glimmer/reference';
 */
 function log({ positional }: CapturedArguments) {
   /* eslint-disable no-console */
-  console.log(...positional.value());
+  console.log(...reifyPositional(positional));
   /* eslint-enable no-console */
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index f12c18f432f..d7f5dd0d94c 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -6,6 +6,7 @@ import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
+import { reifyNamed } from '@glimmer/runtime';
 
 /**
   This is a helper to be used in conjunction with the link-to helper.
@@ -32,10 +33,10 @@ function queryParams({ positional, named }: CapturedArguments) {
   // tslint:disable-next-line:max-line-length
   assert(
     "The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='foo') as opposed to just (query-params 'foo')",
-    positional.value().length === 0
+    positional.length === 0
   );
 
-  return new QueryParams(assign({}, named.value() as any));
+  return new QueryParams(assign({}, reifyNamed(named) as any));
 }
 
 export default function(args: VMArguments, vm: VM) {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 795bae958aa..cbeac7814d7 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -92,7 +92,9 @@ export class ActionState {
   }
 
   getEventName() {
-    return this.namedArgs.get('on').value() || 'click';
+    let onRef = this.namedArgs.on;
+
+    return onRef !== undefined ? onRef.value() : 'click';
   }
 
   getActionArgs() {
@@ -107,30 +109,28 @@ export class ActionState {
 
   getTarget() {
     let { implicitTarget, namedArgs } = this;
-    let target;
-
-    if (namedArgs.has('target')) {
-      target = namedArgs.get('target').value();
-    } else {
-      target = implicitTarget.value();
-    }
+    let { target } = namedArgs;
 
-    return target;
+    return target !== undefined ? target.value() : implicitTarget.value();
   }
 
   handler(event: Event): boolean {
     let { actionName, namedArgs } = this;
-    let bubbles = namedArgs.get('bubbles');
-    let preventDefault = namedArgs.get('preventDefault');
-    let allowedKeys = namedArgs.get('allowedKeys');
+    let { bubbles, preventDefault, allowedKeys } = namedArgs;
+
+    let bubblesVal = bubbles !== undefined ? bubbles.value() : undefined;
+    let preventDefaultVal = preventDefault !== undefined ? preventDefault.value() : undefined;
+    let allowedKeysVal = allowedKeys !== undefined ? allowedKeys.value() : undefined;
+
     let target = this.getTarget();
-    let shouldBubble = bubbles.value() !== false;
 
-    if (!isAllowedEvent(event, allowedKeys.value())) {
+    let shouldBubble = bubblesVal !== false;
+
+    if (!isAllowedEvent(event, allowedKeysVal)) {
       return true;
     }
 
-    if (preventDefault.value() !== false) {
+    if (preventDefaultVal !== false) {
       event.preventDefault();
     }
 
@@ -192,7 +192,7 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     // The first two arguments are (1) `this` and (2) the action name.
     // Everything else is a param.
     for (let i = 2; i < positional.length; i++) {
-      actionArgs.push(positional.at(i));
+      actionArgs.push(positional[i]);
     }
 
     let actionId = uuid();
@@ -225,8 +225,8 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     let implicitTarget;
 
     if (positional.length > 1) {
-      implicitTarget = positional.at(0);
-      actionNameRef = positional.at(1);
+      implicitTarget = positional[0];
+      actionNameRef = positional[1];
 
       if (actionNameRef[INVOKE]) {
         actionName = actionNameRef;
@@ -259,7 +259,7 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
 
   update(actionState: ActionState) {
     let { positional } = actionState;
-    let actionNameRef = positional.at(1);
+    let actionNameRef = positional[1];
 
     if (!actionNameRef[INVOKE]) {
       actionState.actionName = actionNameRef.value();
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index f14076aabb1..26803915ec5 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -2,7 +2,7 @@ import { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Dict, ModifierManager, VMArguments } from '@glimmer/interfaces';
-import { registerDestructor } from '@glimmer/runtime';
+import { registerDestructor, reifyArgs } from '@glimmer/runtime';
 import { createUpdatableTag, untrack } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 
@@ -63,7 +63,7 @@ export class CustomModifierState<ModifierInstance> {
     public modifier: ModifierInstance,
     public args: CapturedArguments
   ) {
-    registerDestructor(this, () => delegate.destroyModifier(modifier, args.value()));
+    registerDestructor(this, () => delegate.destroyModifier(modifier, reifyArgs(args)));
   }
 }
 
@@ -119,7 +119,7 @@ class InteractiveCustomModifierManager<ModifierInstance>
     let { delegate, ModifierClass } = definition;
     const capturedArgs = args.capture();
 
-    let instance = definition.delegate.createModifier(ModifierClass, capturedArgs.value());
+    let instance = definition.delegate.createModifier(ModifierClass, reifyArgs(capturedArgs));
     let state = new CustomModifierState(element, delegate, instance, capturedArgs);
 
     if (DEBUG) {
@@ -146,7 +146,7 @@ class InteractiveCustomModifierManager<ModifierInstance>
     );
 
     let { capabilities } = delegate;
-    let argsValue = args.value();
+    let argsValue = reifyArgs(args);
 
     if (capabilities.disableAutoTracking === true) {
       untrack(() => delegate.installModifier(modifier, element, argsValue));
@@ -158,7 +158,7 @@ class InteractiveCustomModifierManager<ModifierInstance>
   update(state: CustomModifierState<ModifierInstance>) {
     let { args, delegate, modifier } = state;
     let { capabilities } = delegate;
-    let argsValue = args.value();
+    let argsValue = reifyArgs(args);
 
     if (capabilities.disableAutoTracking === true) {
       untrack(() => delegate.updateModifier(modifier, argsValue));
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 5ebb682b49a..b37d6ea72d3 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -2,7 +2,7 @@ import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
-import { registerDestructor } from '@glimmer/runtime';
+import { registerDestructor, reifyNamed } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import buildUntouchableThis from '../utils/untouchable-this';
@@ -71,7 +71,7 @@ export class OnModifierState {
   updateFromArgs() {
     let { args } = this;
 
-    let { once, passive, capture }: AddEventListenerOptions = args.named.value();
+    let { once, passive, capture }: AddEventListenerOptions = reifyNamed(args.named);
     if (once !== this.once) {
       this.once = once;
       this.shouldUpdate = true;
@@ -96,20 +96,20 @@ export class OnModifierState {
 
     assert(
       'You must pass a valid DOM event name as the first argument to the `on` modifier',
-      args.positional.at(0) !== undefined && typeof args.positional.at(0).value() === 'string'
+      args.positional[0] !== undefined && typeof args.positional[0].value() === 'string'
     );
-    let eventName = args.positional.at(0).value() as string;
+    let eventName = args.positional[0].value() as string;
     if (eventName !== this.eventName) {
       this.eventName = eventName;
       this.shouldUpdate = true;
     }
 
-    let userProvidedCallbackReference = args.positional.at(1);
+    let userProvidedCallbackReference = args.positional[1];
 
     if (DEBUG) {
       assert(
         `You must pass a function as the second argument to the \`on\` modifier.`,
-        args.positional.at(1) !== undefined
+        args.positional[1] !== undefined
       );
 
       let value = userProvidedCallbackReference.value();
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 361ba06af40..999d406fbb9 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -6,12 +6,13 @@ import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
 import { PathReference } from '@glimmer/reference';
 import {
+  createCapturedArgs,
   CurriedComponentDefinition,
   curry,
-  EMPTY_ARGS,
+  EMPTY_POSITIONAL,
   UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
-import { MODEL_ARG_NAME, MountDefinition } from '../component-managers/mount';
+import { MountDefinition } from '../component-managers/mount';
 import { EmberVMEnvironment } from '../environment';
 
 export function mountHelper(
@@ -45,25 +46,7 @@ export function mountHelper(
   if (args.named.has('model')) {
     assert('[BUG] this should already be checked by the macro', args.named.length === 1);
 
-    let named = args.named.capture();
-
-    // TODO delete me after EMBER_ROUTING_MODEL_ARG has shipped
-    if (DEBUG && MODEL_ARG_NAME !== 'model') {
-      assert('[BUG] named._map is not null', named['_map'] === null);
-      named.names = [MODEL_ARG_NAME];
-    }
-
-    captured = {
-      positional: EMPTY_ARGS.positional,
-      named,
-      length: 1,
-      value() {
-        return {
-          named: this.named.value(),
-          positional: this.positional.value(),
-        };
-      },
-    };
+    captured = createCapturedArgs(args.named.capture(), EMPTY_POSITIONAL);
   }
 
   return new DynamicEngineReference(nameRef, env, captured);
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 0e8c138846c..65bd12dd7bc 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,11 +1,11 @@
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Dict, Option, unsafe, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
 import { ConstReference, PathReference, Reference, RootReference } from '@glimmer/reference';
 import {
+  createCapturedArgs,
   CurriedComponentDefinition,
   curry,
-  EMPTY_ARGS,
+  EMPTY_POSITIONAL,
   UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
@@ -131,7 +131,7 @@ class OutletComponentReference implements PathReference<CurriedComponentDefiniti
     let definition = null;
 
     if (state !== null) {
-      let args = EMBER_ROUTING_MODEL_ARG ? makeArgs(this.outletRef, this.env) : null;
+      let args = makeArgs(this.outletRef, this.env);
 
       definition = curry(new OutletComponentDefinition(state), args);
     }
@@ -149,41 +149,10 @@ function makeArgs(
   env: EmberVMEnvironment
 ): CapturedArguments {
   let modelRef = new OutletModelReference(outletRef, env);
-  let map = dict<PathReference>();
-  map.model = modelRef;
+  let named = dict<PathReference>();
+  named.model = modelRef;
 
-  // TODO: the functionailty to create a proper CapturedArgument should be
-  // exported by glimmer, or that it should provide an overload for `curry`
-  // that takes `PreparedArguments`
-  return {
-    positional: EMPTY_ARGS.positional,
-    named: {
-      isConst() {
-        return false;
-      },
-      map,
-      names: ['model'],
-      references: [modelRef],
-      length: 1,
-      has(key: string): boolean {
-        return key === 'model';
-      },
-      get<T extends PathReference>(key: string): T {
-        return (key === 'model' ? modelRef : UNDEFINED_REFERENCE) as unsafe;
-      },
-      value(): Dict<unknown> {
-        let model = modelRef.value();
-        return { model };
-      },
-    },
-    length: 1,
-    value() {
-      return {
-        named: this.named.value(),
-        positional: this.positional.value(),
-      };
-    },
-  };
+  return createCapturedArgs(named, EMPTY_POSITIONAL);
 }
 
 function stateFor(ref: PathReference<OutletState | undefined>): OutletDefinitionState | null {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
index 990529df378..6002a03c379 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
@@ -1,5 +1,6 @@
 import { assert } from '@ember/debug';
-import { Bounds, CapturedArguments, Option } from '@glimmer/interfaces';
+import { Arguments, Bounds, CapturedArguments, Option } from '@glimmer/interfaces';
+import { reifyArgs } from '@glimmer/runtime';
 import { expect, Stack, unwrapTemplate } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
 import { OwnedTemplate } from '../template';
@@ -24,7 +25,7 @@ export interface CapturedRenderNode {
   id: string;
   type: RenderNodeType;
   name: string;
-  args: ReturnType<CapturedArguments['value']>;
+  args: Arguments;
   instance: unknown;
   template: Option<string>;
   bounds: Option<{
@@ -185,7 +186,7 @@ export default class DebugRenderTree<Bucket extends object = object> {
     let template = this.captureTemplate(node);
     let bounds = this.captureBounds(node);
     let children = this.captureRefs(refs);
-    return { id, type, name, args: args.value(), instance, template, bounds, children };
+    return { id, type, name, args: reifyArgs(args), instance, template, bounds, children };
   }
 
   private captureTemplate({ template }: InternalRenderNode<Bucket>): Option<string> {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
index 972f4d2d7ad..453b3b901a7 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
@@ -9,22 +9,22 @@ import { ACTION } from '../helpers/action';
 // inputs needed by CurlyComponents (attrs and props, with mutable
 // cells, etc).
 export function processComponentArgs(namedArgs: CapturedNamedArguments) {
-  let keys = namedArgs.names;
-  let attrs = namedArgs.value();
+  let attrs = Object.create(null);
   let props = Object.create(null);
   let args = Object.create(null);
 
   props[ARGS] = args;
 
-  for (let i = 0; i < keys.length; i++) {
-    let name = keys[i];
-    let ref = namedArgs.get(name);
-    let value = attrs[name];
+  for (let name in namedArgs) {
+    let ref = namedArgs[name];
+    let value = ref.value();
 
-    if (typeof value === 'function' && value[ACTION]) {
-      attrs[name] = value;
-    } else if (ref[UPDATE_REFERENCED_VALUE]) {
+    let isAction = typeof value === 'function' && value[ACTION];
+
+    if (ref[UPDATE_REFERENCED_VALUE] && !isAction) {
       attrs[name] = new MutableCell(ref, value);
+    } else {
+      attrs[name] = value;
     }
 
     args[name] = ref;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/references.ts b/packages/@ember/-internals/glimmer/lib/utils/references.ts
index 2cc5bb53651..bb1a6ded358 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/references.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/references.ts
@@ -3,7 +3,7 @@ import { debugFreeze } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Environment } from '@glimmer/interfaces';
 import { HelperRootReference, PathReference, RootReference } from '@glimmer/reference';
-import { PrimitiveReference } from '@glimmer/runtime';
+import { PrimitiveReference, reifyArgs } from '@glimmer/runtime';
 import { consumeTag, deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
 import { HelperInstance, isClassHelper, RECOMPUTE_TAG, SimpleHelper } from '../helper';
 
@@ -14,22 +14,19 @@ export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T
     env: Environment
   ) {
     let fnWrapper = (args: CapturedArguments) => {
-      let { positional, named } = args;
-
-      let positionalValue = positional.value();
-      let namedValue = named.value();
+      let { positional, named } = reifyArgs(args);
 
       let ret: T;
 
       if (DEBUG) {
-        debugFreeze(positionalValue);
-        debugFreeze(namedValue);
+        debugFreeze(positional);
+        debugFreeze(named);
 
         deprecateMutationsInTrackingTransaction!(() => {
-          ret = helper.compute(positionalValue, namedValue);
+          ret = helper.compute(positional, named);
         });
       } else {
-        ret = helper.compute(positionalValue, namedValue);
+        ret = helper.compute(positional, named);
       }
 
       if (helper[RECOMPUTE_TAG]) {
diff --git a/yarn.lock b/yarn.lock
index 90892227b73..1faadaf3af5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,142 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.57.2.tgz#844b38b045a2d2f6cde382d100900cb8b64d38de"
-  integrity sha512-/2FDT/g7gEAzkn75hIhk/71iiLqbnaEY0dumeWY8vr89gfZ6jD4dOfhrofYp8+vdkkTWTu9v6ps/fYFIhu7i2g==
-  dependencies:
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/syntax" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
-    "@glimmer/wire-format" "^0.57.2"
+"@glimmer/compiler@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.58.0.tgz#4e28db709f83bf5fbfcba1982c61d7ade710ec0b"
+  integrity sha512-SMyPZCF5yA6zv14A87gXr5QjYqItMnTGfg9zjU0Ki603soPiU8xnXBEa+EHZwJovzqi022v+cIN+RB5kRsu/Qw==
+  dependencies:
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/syntax" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
+    "@glimmer/wire-format" "^0.58.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.57.2.tgz#6bc6d637eedb0020293e8e7f724b6fcb94f21c04"
-  integrity sha512-Z41y8agv9KaeOTXuNjFrBUfAA7cFMrv3ykoIlg538KT4iuW6pbLrXZvb7bU5PSNgQhXZZ/0ASc7ldanrO6HdIA==
+"@glimmer/encoder@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.58.0.tgz#fd07870b173e2274ca9b2bf83a00fdecc19454c5"
+  integrity sha512-EUj8uKMmi/q+F3H7vRL9PH9M8FO5mrQdeoMWlTzZYHoJxASkbUbCnnV++BCqXcU+AJiO2h83/NwB/W8951rX2w==
   dependencies:
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/vm" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/vm" "^0.58.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.57.2.tgz#6cf59f970103439333459c499a3602b19937168e"
-  integrity sha512-wdG01BZzbT9lOvl9hLJbnCfJX2i9aEtVksM/5BsFY/ljwSGnzO5YkQU/PYQniaW5dgezPHnyq5jIH2g5LWyvtw==
+"@glimmer/interfaces@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.58.0.tgz#9271a89851b8711265f5bef7b69e6734f9621625"
+  integrity sha512-lajPG3VM3Z6SiCwjMqaqkdxjJYndVwAYZXvKP2FSqJPUadnyfSB59Ira8R1kUwV1+qRlugqPYAr95iEq+L6/lQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.57.2.tgz#33b7361437230b1dc9d33e1ff0209ca25f9e4d21"
-  integrity sha512-s5CX0dio2SzWhROY4VL5hkj8+emTk/ZluHC76Mz4iL28EHoAmHOsYBsgfIler2R2iL47624WrdPwh+C0rZmiLA==
+"@glimmer/low-level@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.58.0.tgz#aff3f109a32237426856bea45186af392a20f75e"
+  integrity sha512-rO1mcqFV/c8SVXxaErl/0bsHispHU2rY1TRH/ONi+YVORddKlzwCftcY/cgykV+xAEr4sNYk3ZeNVnKFTSMF/g==
 
-"@glimmer/node@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.57.2.tgz#c814bbfbf00aed6e07392c41582f31a1cbb8a0cd"
-  integrity sha512-ah+HjBbraTM6GTmYw+fKW9vQf/rStMyDBxgeaUVMm86GTrSecLmZFJZUWBjmmgVEBgb06qKPgdQlOcku2SHEVQ==
+"@glimmer/node@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.58.0.tgz#c15eb04bd5c3bf86703ac4c8114037b0247fc604"
+  integrity sha512-U2ZN8/Bk3MKYYEzBEbVrIPsDnjSynqfQvcuD57zyA6iQ1mNms/p/yE6Cdd6ZgIYH7fALVk6ZUf8Fznj64Cb+kg==
   dependencies:
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/runtime" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/runtime" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.57.2.tgz#1b09b7356c81b3ff1354cd3225f08276ab30678a"
-  integrity sha512-hPCvH4VKY8+l3qzkuSPpcAnSh0hhJXHcuIPb06RKZwVfdK7l4A4C2Jv1jYuPUHru0in18H/0xOpHn7uvpBgvwQ==
-  dependencies:
-    "@glimmer/encoder" "^0.57.2"
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/program" "^0.57.2"
-    "@glimmer/reference" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
-    "@glimmer/vm" "^0.57.2"
-    "@glimmer/wire-format" "^0.57.2"
-
-"@glimmer/program@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.57.2.tgz#6b1acb3d9a2d3d6f0d07d70052fb93467886fa1b"
-  integrity sha512-NoI1QxjAREulAM/SlvKJojuFLcpjpFaZ6XaWMNkYca84UTA09esyAv1dYgZQhwQMdHUOrQyrmsFQg/a3kiagGg==
-  dependencies:
-    "@glimmer/encoder" "^0.57.2"
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
-
-"@glimmer/reference@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.57.2.tgz#378c0d3644d4a98c4138c3205f6d4f0b5e004e92"
-  integrity sha512-xkUsl4cYR9ZOBEsNOmdxmb7iQnfTzeQZSGOD7H2fP9RqKGXR4mpNuDyP2YDCs2bI5JChDo3QvPp24RHmDjd8rA==
+"@glimmer/opcode-compiler@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.58.0.tgz#807d86247f33da44da983f2e01f0a06221c52674"
+  integrity sha512-BV+U7bK9zri3hdrvbtb31Nvrqh047/LmT1rJTBgmLNvmzt/YUW2CvZ4mrzUSnp0OxiapPQG7dgO7UgWknYGcDA==
+  dependencies:
+    "@glimmer/encoder" "^0.58.0"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/program" "^0.58.0"
+    "@glimmer/reference" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
+    "@glimmer/vm" "^0.58.0"
+    "@glimmer/wire-format" "^0.58.0"
+
+"@glimmer/program@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.58.0.tgz#fe206e3b18a0e6e084602675aa3bd7737f520dd5"
+  integrity sha512-zCWRHI6U6ljZWIjtyf5xlzObsNzMvYumaTS/impQZTVaqVdjOaKcxFPitZHFyZwF34e61XzLR0SQ/osFnhoM2g==
+  dependencies:
+    "@glimmer/encoder" "^0.58.0"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
+
+"@glimmer/reference@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.58.0.tgz#8d2fb4a53cf3bac299961236c1774641bb103c53"
+  integrity sha512-1pDal2ThvQWZumNQA8XU/6gbX/vbrdIcy7BTpR2PJHxw2QGTln8enKLEWq+PPXv952/xXgttRBP99Ge9a6fPYg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
-    "@glimmer/validator" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
+    "@glimmer/validator" "^0.58.0"
 
-"@glimmer/runtime@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.57.2.tgz#f7502ecab591b4363b532928189d49ed64611ae3"
-  integrity sha512-QmsYJI8kBv9MBFWDALCcCX26KtvfQ/e8ltkJraApYzozmHVNAVikKLQvcBVd+1XasUoI0l8MI9G/NWqk7ulu8A==
+"@glimmer/runtime@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.58.0.tgz#86ed829f6456c846ca4b580722c1b167816220a0"
+  integrity sha512-Tp6UaEcTAJSXI3fhv0+6ud3Nc0cugCnhkg+8Y+31jV0lTnMEnix8wUnZPpXwhRitIW/XcudTkWOYIPZg7UuArQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/low-level" "^0.57.2"
-    "@glimmer/program" "^0.57.2"
-    "@glimmer/reference" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
-    "@glimmer/validator" "^0.57.2"
-    "@glimmer/vm" "^0.57.2"
-    "@glimmer/wire-format" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/low-level" "^0.58.0"
+    "@glimmer/program" "^0.58.0"
+    "@glimmer/reference" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
+    "@glimmer/validator" "^0.58.0"
+    "@glimmer/vm" "^0.58.0"
+    "@glimmer/wire-format" "^0.58.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.57.2.tgz#f5c910d67027fbfda707b385d3ce03ecd324e2ee"
-  integrity sha512-gWMSSd0AqTRtTtqpjCY/qpyQqplNoqEVVGXwlHyao/Fzc7fmCoKyDmq7+nL19iU8O9wLKcwpIdYTm0cvEXJlKA==
+"@glimmer/syntax@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.58.0.tgz#4141a607694f1f7afdedbc904968bd697bb7f629"
+  integrity sha512-KYa4Knlkhg7d0u7hCTQxMjkpvGVPFsjoyorIWeSm1E6GKKKi7b+uY2zmOmkSdU5592X93J5npgp2eABqJUQFcQ==
   dependencies:
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.57.2.tgz#d44da407d2971b45982aef072915c75c6bbcf028"
-  integrity sha512-PIF29qQbR5w70UKZN/CXtSwGdDd5bolz5vKobPRgFHeigZUyICqvd74/PFe9gOzKWtCGt0Y8pi9BlAiVDXA1Fw==
+"@glimmer/util@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.58.0.tgz#18d22fb2eb4ed3f1323718cd1267c137a42eea4e"
+  integrity sha512-2ws68gTGOYNNW1dJx33O2CDMoKQiNhKjQyD6nY9bgFQ7cVWifVxs39HpWOe4yc/2MHaTLmHjuqdAr1gznpQsOA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.57.2.tgz#7c37a33268c491280cc598fb3212c767f6fb3fce"
-  integrity sha512-e8WdKZod9Tznp62vHOd3SgyVFCD995z9PAmONvq4kDDONdBRTwFQaz72TaDB44bG6S3PL73s8GiuO7Iar0HX1g==
+"@glimmer/validator@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.58.0.tgz#ada0b09840d8ff2de7827f0132d51a25dbfe8baf"
+  integrity sha512-j/ezeRlPiHTIfGYk4MZZ2h11Bm8sWdsdCr9ms8b/2UjFvvx5x3YPCK0+27PCQLqjwq19KhtHgdjbgWvK0ibEXA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/vm@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.57.2.tgz#c65c965eaad79faef53b6de92539fecf95445840"
-  integrity sha512-n7WwbASKo3AxOvtGXS6Wbk0zQh0Bd57NRTgrWGpdy4Ojw9TvaV/hOjYdRI1vxiS1T933N2VlDxLEtPzj1rg6Jw==
+"@glimmer/vm@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.58.0.tgz#044f32c11174f032b4fa4000de45dccc4a98ac8a"
+  integrity sha512-3TgMJyQOG2IHJf6sF5MArpmulHobMdLiP9uIhU2nAdwy4e3D0CEytbrYu+xV+/gSNMY1kGFIx/zTWs8HGvkXVQ==
   dependencies:
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
 
-"@glimmer/wire-format@^0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.57.2.tgz#294519d14da76e8d11eb7872daa2a23737e7cc70"
-  integrity sha512-g4EKDtImDHssNYkqwsb+VwS6f3LfogRuQlvMsk3LkACXYvwrvyBHJApKeCB3YvCbza7KMyYrfzcpzcBKIHcZhA==
+"@glimmer/wire-format@^0.58.0":
+  version "0.58.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.58.0.tgz#7e8b6940dd4fa1ff1d1acffaf9779a839f399384"
+  integrity sha512-m2gPnWQetPkn13iXLdlR8OvTwsCLpzLVQpdNlfC2OF4XkWhAlYg2ameiCBYphdmNbPbSt3EfbMs8TkJD4P4P/A==
   dependencies:
-    "@glimmer/interfaces" "^0.57.2"
-    "@glimmer/util" "^0.57.2"
+    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/util" "^0.58.0"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 863953756a754cdb73787715239a34b2cee8ac39 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 22 Aug 2020 09:11:54 -0700
Subject: [PATCH 0090/1405] [REFACTOR] Converts Env settings to use Global
 Context

Integrates https://github.com/glimmerjs/glimmer-vm/pull/1138
---
 package.json                                  |  17 +-
 .../glimmer/lib/component-managers/custom.ts  |   3 +-
 .../glimmer/lib/component-managers/input.ts   |   4 +-
 .../glimmer/lib/component-managers/mount.ts   |   4 +-
 .../glimmer/lib/component-managers/outlet.ts  |   2 +-
 .../-internals/glimmer/lib/environment.ts     | 133 ++++-------
 .../glimmer/lib/helpers/-normalize-class.ts   |   6 +-
 .../-internals/glimmer/lib/helpers/action.ts  |   6 +-
 .../-internals/glimmer/lib/helpers/concat.ts  |   6 +-
 .../-internals/glimmer/lib/helpers/fn.ts      |   6 +-
 .../-internals/glimmer/lib/helpers/get.ts     |  10 +-
 .../glimmer/lib/helpers/if-unless.ts          |  10 +-
 .../-internals/glimmer/lib/helpers/log.ts     |   6 +-
 .../glimmer/lib/helpers/query-param.ts        |   6 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |   6 +-
 .../glimmer/lib/protocol-for-url.ts           |  54 -----
 .../@ember/-internals/glimmer/lib/renderer.ts |   2 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |   2 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   |  24 +-
 .../lib/utils/curly-component-state-bucket.ts |   2 +-
 .../glimmer/lib/utils/references.ts           |  18 +-
 yarn.lock                                     | 206 +++++++++---------
 22 files changed, 210 insertions(+), 323 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/protocol-for-url.ts

diff --git a/package.json b/package.json
index 9f75a75baed..1ea60c1a98a 100644
--- a/package.json
+++ b/package.json
@@ -74,15 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.58.0",
+    "@glimmer/compiler": "^0.59.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/interfaces": "^0.58.0",
-    "@glimmer/node": "^0.58.0",
-    "@glimmer/opcode-compiler": "^0.58.0",
-    "@glimmer/program": "^0.58.0",
-    "@glimmer/reference": "^0.58.0",
-    "@glimmer/runtime": "^0.58.0",
-    "@glimmer/validator": "^0.58.0",
+    "@glimmer/global-context": "^0.59.0",
+    "@glimmer/interfaces": "^0.59.0",
+    "@glimmer/node": "^0.59.0",
+    "@glimmer/opcode-compiler": "^0.59.0",
+    "@glimmer/program": "^0.59.0",
+    "@glimmer/reference": "^0.59.0",
+    "@glimmer/runtime": "^0.59.0",
+    "@glimmer/validator": "^0.59.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index ed1e5656b23..c2342095497 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -334,11 +334,10 @@ export default class CustomComponentManager<ComponentInstance>
   }
 
   getSelf({
-    env,
     delegate,
     component,
   }: CustomComponentState<ComponentInstance>): PathReference<unknown> {
-    return new ComponentRootReference(delegate.getContext(component), env);
+    return new ComponentRootReference(delegate.getContext(component));
   }
 
   getDestroyable(bucket: CustomComponentState<ComponentInstance>): Option<Destroyable> {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
index aa8c8646271..40ebe8f3e2e 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
@@ -100,8 +100,8 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     return 'input';
   }
 
-  getSelf({ env, instance }: InputComponentState): PathReference {
-    return new ComponentRootReference(instance, env);
+  getSelf({ instance }: InputComponentState): PathReference {
+    return new ComponentRootReference(instance);
   }
 
   didRenderLayout(state: InputComponentState, bounds: Bounds): void {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index f9075febf37..d46116380fa 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -84,12 +84,12 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
 
     if (modelRef === undefined) {
       controller = controllerFactory.create();
-      self = new ComponentRootReference(controller, environment);
+      self = new ComponentRootReference(controller);
       bucket = { engine, controller, self, environment };
     } else {
       let model = modelRef.value();
       controller = controllerFactory.create({ model });
-      self = new ComponentRootReference(controller, environment);
+      self = new ComponentRootReference(controller);
       bucket = { engine, controller, self, modelRef, environment };
     }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 85a87787196..4a3e9df2385 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -78,7 +78,7 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
     dynamicScope.outletState = currentStateRef;
 
     let state: OutletInstanceState = {
-      self: new ComponentRootReference(definition.controller, environment),
+      self: new ComponentRootReference(definition.controller),
       environment,
       finalize: _instrumentStart('render.outlet', instrumentationPayload, definition),
     };
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 249f110fb81..d8ab17bb29a 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -6,18 +6,10 @@ import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { assert, deprecate, warn } from '@ember/debug';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { ElementBuilder, Environment, Option } from '@glimmer/interfaces';
-import {
-  DynamicAttribute,
-  dynamicAttribute,
-  EnvironmentDelegate,
-  setScheduleDestroy,
-  setScheduleDestroyed,
-  SimpleDynamicAttribute,
-} from '@glimmer/runtime';
-import { setPropertyDidChange, setTrackingTransactionEnv } from '@glimmer/validator';
-import { AttrNamespace as SimpleAttrNamespace, SimpleElement } from '@simple-dom/interface';
-import installPlatformSpecificProtocolForURL from './protocol-for-url';
+import setGlobalContext from '@glimmer/global-context';
+import { Environment } from '@glimmer/interfaces';
+import { EnvironmentDelegate } from '@glimmer/runtime';
+import { setTrackingTransactionEnv } from '@glimmer/validator';
 import { OwnedTemplate } from './template';
 import DebugRenderTree from './utils/debug-render-tree';
 import toIterator from './utils/iterator';
@@ -26,11 +18,41 @@ import toBool from './utils/to-bool';
 
 ///////////
 
-// Setup global environment
-
-// Autotracking
-
-setPropertyDidChange(() => backburner.ensureInstance());
+// Setup global context
+
+setGlobalContext({
+  scheduleRevalidate() {
+    backburner.ensureInstance();
+  },
+
+  toBool,
+  toIterator,
+
+  getProp: _getProp,
+  setProp: set,
+  getPath: get,
+
+  scheduleDestroy(destroyable, destructor) {
+    schedule('actions', null, destructor, destroyable);
+  },
+
+  scheduleDestroyed(finalizeDestructor) {
+    schedule('destroy', null, finalizeDestructor);
+  },
+
+  warnIfStyleNotTrusted(value: unknown) {
+    warn(
+      constructStyleDeprecationMessage(value),
+      (() => {
+        if (value === null || value === undefined || isHTMLSafe(value)) {
+          return true;
+        }
+        return false;
+      })(),
+      { id: 'ember-htmlbars.style-xss-warning' }
+    );
+  },
+});
 
 if (DEBUG) {
   setTrackingTransactionEnv!({
@@ -55,16 +77,6 @@ if (DEBUG) {
   });
 }
 
-// Destruction
-
-setScheduleDestroy((destroyable, destructor) => {
-  schedule('actions', null, destructor, destroyable);
-});
-
-setScheduleDestroyed(finalizeDestructor => {
-  schedule('destroy', null, finalizeDestructor);
-});
-
 ///////////
 
 // Define environment delegate
@@ -108,34 +120,11 @@ export class EmberEnvironmentExtra {
 
 export class EmberEnvironmentDelegate implements EnvironmentDelegate<EmberEnvironmentExtra> {
   public isInteractive: boolean;
-
-  public toBool = toBool;
-  public toIterator = toIterator;
-
-  public getProp = _getProp;
-  public getPath = get;
-  public setPath = set;
-
-  public attributeFor?: (
-    element: SimpleElement,
-    attr: string,
-    isTrusting: boolean,
-    namespace: Option<SimpleAttrNamespace>
-  ) => DynamicAttribute;
-
   public extra: EmberEnvironmentExtra;
 
   constructor(owner: Owner, isInteractive: boolean) {
     this.extra = new EmberEnvironmentExtra(owner);
     this.isInteractive = isInteractive;
-
-    installPlatformSpecificProtocolForURL(this);
-  }
-
-  // this gets clobbered by installPlatformSpecificProtocolForURL
-  // it really should just delegate to a platform specific injection
-  protocolForURL(s: string): string {
-    return s;
   }
 
   onTransactionBegin() {
@@ -148,47 +137,3 @@ export class EmberEnvironmentDelegate implements EnvironmentDelegate<EmberEnviro
 }
 
 export type EmberVMEnvironment = Environment<EmberEnvironmentExtra>;
-
-if (DEBUG) {
-  class StyleAttributeManager extends SimpleDynamicAttribute {
-    set(dom: ElementBuilder, value: unknown, env: Environment): void {
-      warn(
-        constructStyleDeprecationMessage(value),
-        (() => {
-          if (value === null || value === undefined || isHTMLSafe(value)) {
-            return true;
-          }
-          return false;
-        })(),
-        { id: 'ember-htmlbars.style-xss-warning' }
-      );
-      super.set(dom, value, env);
-    }
-    update(value: unknown, env: Environment): void {
-      warn(
-        constructStyleDeprecationMessage(value),
-        (() => {
-          if (value === null || value === undefined || isHTMLSafe(value)) {
-            return true;
-          }
-          return false;
-        })(),
-        { id: 'ember-htmlbars.style-xss-warning' }
-      );
-      super.update(value, env);
-    }
-  }
-
-  EmberEnvironmentDelegate.prototype.attributeFor = function(
-    element,
-    attribute: string,
-    isTrusting: boolean,
-    namespace: Option<SimpleAttrNamespace>
-  ) {
-    if (attribute === 'style' && !isTrusting) {
-      return new StyleAttributeManager({ element, name: attribute, namespace });
-    }
-
-    return dynamicAttribute(element, attribute, namespace);
-  };
-}
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 4a5899c5ce1..0e88034d6a7 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,5 +1,5 @@
 import { dasherize } from '@ember/string';
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 
 function normalizeClass({ positional }: CapturedArguments) {
@@ -16,6 +16,6 @@ function normalizeClass({ positional }: CapturedArguments) {
   }
 }
 
-export default function(args: VMArguments, vm: VM) {
-  return new HelperRootReference(normalizeClass, args.capture(), vm.env);
+export default function(args: VMArguments) {
+  return new HelperRootReference(normalizeClass, args.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index d0133b7e27f..9e80d275fef 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -7,7 +7,7 @@ import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { VM, VMArguments } from '@glimmer/interfaces';
+import { VMArguments } from '@glimmer/interfaces';
 import { PathReference } from '@glimmer/reference';
 import { UnboundRootReference } from '../utils/references';
 import { INVOKE } from './mut';
@@ -277,7 +277,7 @@ export const ACTION = symbol('ACTION');
   @for Ember.Templates.helpers
   @public
 */
-export default function(args: VMArguments, vm: VM): UnboundRootReference<Function> {
+export default function(args: VMArguments): UnboundRootReference<Function> {
   let { named, positional } = args;
 
   let capturedArgs = positional.capture();
@@ -304,7 +304,7 @@ export default function(args: VMArguments, vm: VM): UnboundRootReference<Functio
 
   fn[ACTION] = true;
 
-  return new UnboundRootReference(fn, vm.env);
+  return new UnboundRootReference(fn);
 }
 
 function NOOP(args: VMArguments) {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index c20ffa36bea..c0addf0fdd2 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -1,4 +1,4 @@
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 
@@ -45,6 +45,6 @@ function concat({ positional }: CapturedArguments) {
     .join('');
 }
 
-export default function(args: VMArguments, vm: VM) {
-  return new HelperRootReference(concat, args.capture(), vm.env);
+export default function(args: VMArguments) {
+  return new HelperRootReference(concat, args.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index c46be713bb2..6dc05818ff3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 import buildUntouchableThis from '../utils/untouchable-this';
@@ -112,6 +112,6 @@ function fn({ positional }: CapturedArguments) {
   };
 }
 
-export default function(args: VMArguments, vm: VM) {
-  return new HelperRootReference(fn, args.capture(), vm.env);
+export default function(args: VMArguments) {
+  return new HelperRootReference(fn, args.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 24e1bdeafd2..0a0bba94436 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -1,6 +1,6 @@
 import { get as emberGet, set as emberSet } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
-import { CapturedArguments, Environment, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference, PathReference, UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
 import { NULL_REFERENCE } from '@glimmer/runtime';
 import { referenceFromParts } from '../utils/references';
@@ -89,7 +89,7 @@ import { referenceFromParts } from '../utils/references';
   @for Ember.Templates.helpers
   @since 2.1.0
  */
-export default function(args: VMArguments, vm: VM) {
+export default function(args: VMArguments) {
   let sourceReference = args.positional.at(0);
   let pathReference = args.positional.at(1);
 
@@ -108,7 +108,7 @@ export default function(args: VMArguments, vm: VM) {
       return sourceReference.get(String(path));
     }
   } else {
-    return new GetHelperRootReference(args.capture(), vm.env);
+    return new GetHelperRootReference(args.capture());
   }
 }
 
@@ -126,8 +126,8 @@ class GetHelperRootReference extends HelperRootReference {
   private sourceReference: PathReference<object>;
   private pathReference: PathReference<string>;
 
-  constructor(args: CapturedArguments, env: Environment) {
-    super(get, args, env);
+  constructor(args: CapturedArguments) {
+    super(get, args);
     this.sourceReference = args.positional[0] as PathReference<object>;
     this.pathReference = args.positional[1] as PathReference<string>;
   }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
index 6c83467a2b1..4b90a82b045 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
@@ -3,7 +3,7 @@
 */
 
 import { assert } from '@ember/debug';
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 import toBool from '../utils/to-bool';
 
@@ -128,8 +128,8 @@ function unless({ positional }: CapturedArguments) {
   @for Ember.Templates.helpers
   @public
 */
-export function inlineIf(args: VMArguments, vm: VM) {
-  return new HelperRootReference(ifHelper, args.capture(), vm.env);
+export function inlineIf(args: VMArguments) {
+  return new HelperRootReference(ifHelper, args.capture());
 }
 
 /**
@@ -217,6 +217,6 @@ export function inlineIf(args: VMArguments, vm: VM) {
   @for Ember.Templates.helpers
   @public
 */
-export function inlineUnless(args: VMArguments, vm: VM) {
-  return new HelperRootReference(unless, args.capture(), vm.env);
+export function inlineUnless(args: VMArguments) {
+  return new HelperRootReference(unless, args.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
index 2da2ff384ab..24d67d6e4a3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
@@ -1,4 +1,4 @@
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 /**
@@ -24,6 +24,6 @@ function log({ positional }: CapturedArguments) {
   /* eslint-enable no-console */
 }
 
-export default function(args: VMArguments, vm: VM) {
-  return new HelperRootReference(log, args.capture(), vm.env);
+export default function(args: VMArguments) {
+  return new HelperRootReference(log, args.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index d7f5dd0d94c..dc753f1870e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -4,7 +4,7 @@
 import { QueryParams } from '@ember/-internals/routing';
 import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
-import { CapturedArguments, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
 import { HelperRootReference } from '@glimmer/reference';
 import { reifyNamed } from '@glimmer/runtime';
 
@@ -39,6 +39,6 @@ function queryParams({ positional, named }: CapturedArguments) {
   return new QueryParams(assign({}, reifyNamed(named) as any));
 }
 
-export default function(args: VMArguments, vm: VM) {
-  return new HelperRootReference(queryParams, args.capture(), vm.env);
+export default function(args: VMArguments) {
+  return new HelperRootReference(queryParams, args.capture());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index 4a63a4603aa..04f764cf62b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -3,7 +3,7 @@
 */
 
 import { assert } from '@ember/debug';
-import { VM, VMArguments } from '@glimmer/interfaces';
+import { VMArguments } from '@glimmer/interfaces';
 import { UnboundRootReference } from '../utils/references';
 
 /**
@@ -34,11 +34,11 @@ import { UnboundRootReference } from '../utils/references';
   @public
 */
 
-export default function(args: VMArguments, vm: VM) {
+export default function(args: VMArguments) {
   assert(
     'unbound helper cannot be called with multiple params or hash params',
     args.positional.length === 1 && args.named.length === 0
   );
 
-  return new UnboundRootReference(args.positional.at(0).value(), vm.env);
+  return new UnboundRootReference(args.positional.at(0).value());
 }
diff --git a/packages/@ember/-internals/glimmer/lib/protocol-for-url.ts b/packages/@ember/-internals/glimmer/lib/protocol-for-url.ts
deleted file mode 100644
index 5c8b6f5f3d4..00000000000
--- a/packages/@ember/-internals/glimmer/lib/protocol-for-url.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/* globals module, URL */
-
-import { hasDOM } from '@ember/-internals/browser-environment';
-import { EmberEnvironmentDelegate } from './environment';
-
-let nodeURL: any;
-let parsingNode: HTMLAnchorElement;
-
-export default function installProtocolForURL(environment: EmberEnvironmentDelegate) {
-  let protocol;
-
-  if (hasDOM) {
-    protocol = browserProtocolForURL.call(environment, 'foobar:baz');
-  }
-
-  // Test to see if our DOM implementation parses
-  // and normalizes URLs.
-  if (protocol === 'foobar:') {
-    // Swap in the method that doesn't do this test now that
-    // we know it works.
-    environment.protocolForURL = browserProtocolForURL;
-  } else if (typeof URL === 'object') {
-    // URL globally provided, likely from FastBoot's sandbox
-    nodeURL = URL;
-    environment.protocolForURL = nodeProtocolForURL;
-  } else if (typeof module !== 'undefined' && typeof module.require === 'function') {
-    // Otherwise, we need to fall back to our own URL parsing.
-    // Global `require` is shadowed by Ember's loader so we have to use the fully
-    // qualified `module.require`.
-
-    // tslint:disable-next-line:no-require-imports
-    nodeURL = module.require('url');
-    environment.protocolForURL = nodeProtocolForURL;
-  } else {
-    throw new Error('Could not find valid URL parsing mechanism for URL Sanitization');
-  }
-}
-
-function browserProtocolForURL(url: string) {
-  if (!parsingNode) {
-    parsingNode = document.createElement('a');
-  }
-
-  parsingNode.href = url;
-  return parsingNode.protocol;
-}
-
-function nodeProtocolForURL(url: string) {
-  let protocol = null;
-  if (typeof url === 'string') {
-    protocol = nodeURL.parse(url).protocol;
-  }
-  return protocol === null ? ':' : protocol;
-}
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 45d5dc524c7..2580c930f1a 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -316,7 +316,7 @@ export abstract class Renderer {
     definition: CurriedComponentDefinition,
     target: SimpleElement
   ) {
-    let self = new UnboundRootReference(definition, this._runtime.env);
+    let self = new UnboundRootReference(definition);
     let dynamicScope = new DynamicScope(null, UNDEFINED_REFERENCE);
     let rootState = new RootState(
       root,
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 4172f3d3c65..9438bf38400 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -440,7 +440,7 @@ export default class RuntimeResolver implements JitRuntimeResolver<OwnedTemplate
         helper.compute = helper.compute.bind(null);
       }
 
-      return new EmberHelperRootReference(helper, args.capture(), vm.env);
+      return new EmberHelperRootReference(helper, args.capture());
     };
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 65bd12dd7bc..2f0f0691824 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -10,7 +10,6 @@ import {
 } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
 import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
-import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
 import { isTemplateFactory } from '../template';
 import { OutletReference, OutletState } from '../utils/outlet';
@@ -72,15 +71,12 @@ export function outletHelper(args: VMArguments, vm: VM) {
     nameRef = args.positional.at<PathReference<string>>(0);
   }
 
-  return new OutletComponentReference(
-    new OutletReference(scope.outletState, nameRef),
-    vm.env as EmberVMEnvironment
-  );
+  return new OutletComponentReference(new OutletReference(scope.outletState, nameRef));
 }
 
 class OutletModelReference extends RootReference {
-  constructor(private parent: PathReference<OutletState | undefined>, env: EmberVMEnvironment) {
-    super(env);
+  constructor(private parent: PathReference<OutletState | undefined>) {
+    super();
 
     if (DEBUG) {
       this.debugLabel = '@model';
@@ -112,10 +108,7 @@ class OutletComponentReference implements PathReference<CurriedComponentDefiniti
   private definition: Option<CurriedComponentDefinition> = null;
   private lastState: Option<OutletDefinitionState> = null;
 
-  constructor(
-    private outletRef: PathReference<OutletState | undefined>,
-    private env: EmberVMEnvironment
-  ) {}
+  constructor(private outletRef: PathReference<OutletState | undefined>) {}
 
   isConst() {
     return false;
@@ -131,7 +124,7 @@ class OutletComponentReference implements PathReference<CurriedComponentDefiniti
     let definition = null;
 
     if (state !== null) {
-      let args = makeArgs(this.outletRef, this.env);
+      let args = makeArgs(this.outletRef);
 
       definition = curry(new OutletComponentDefinition(state), args);
     }
@@ -144,11 +137,8 @@ class OutletComponentReference implements PathReference<CurriedComponentDefiniti
   }
 }
 
-function makeArgs(
-  outletRef: PathReference<OutletState | undefined>,
-  env: EmberVMEnvironment
-): CapturedArguments {
-  let modelRef = new OutletModelReference(outletRef, env);
+function makeArgs(outletRef: PathReference<OutletState | undefined>): CapturedArguments {
+  let modelRef = new OutletModelReference(outletRef);
   let named = dict<PathReference>();
   named.model = modelRef;
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index f58b051bbc0..4246e9d7203 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -54,7 +54,7 @@ export default class ComponentStateBucket {
   ) {
     this.classRef = null;
     this.argsRevision = args === null ? 0 : valueForTag(argsTag);
-    this.rootRef = new ComponentRootReference(component, environment);
+    this.rootRef = new ComponentRootReference(component);
 
     registerDestructor(this, () => this.willDestroy(), true);
     registerDestructor(this, () => this.component.destroy());
diff --git a/packages/@ember/-internals/glimmer/lib/utils/references.ts b/packages/@ember/-internals/glimmer/lib/utils/references.ts
index bb1a6ded358..621d85fb4ff 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/references.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/references.ts
@@ -1,18 +1,14 @@
 import { getDebugName, isObject } from '@ember/-internals/utils';
 import { debugFreeze } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Environment } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { HelperRootReference, PathReference, RootReference } from '@glimmer/reference';
 import { PrimitiveReference, reifyArgs } from '@glimmer/runtime';
 import { consumeTag, deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
 import { HelperInstance, isClassHelper, RECOMPUTE_TAG, SimpleHelper } from '../helper';
 
 export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T> {
-  constructor(
-    helper: SimpleHelper<T> | HelperInstance<T>,
-    args: CapturedArguments,
-    env: Environment
-  ) {
+  constructor(helper: SimpleHelper<T> | HelperInstance<T>, args: CapturedArguments) {
     let fnWrapper = (args: CapturedArguments) => {
       let { positional, named } = reifyArgs(args);
 
@@ -39,16 +35,16 @@ export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T
     if (DEBUG) {
       let debugName = isClassHelper(helper) ? getDebugName!(helper) : getDebugName!(helper.compute);
 
-      super(fnWrapper, args, env, debugName);
+      super(fnWrapper, args, debugName);
     } else {
-      super(fnWrapper, args, env);
+      super(fnWrapper, args);
     }
   }
 }
 
 export class UnboundRootReference<T = unknown> extends RootReference<T> {
-  constructor(private inner: T, protected env: Environment, parent?: PathReference, key?: string) {
-    super(env);
+  constructor(private inner: T, parent?: PathReference, key?: string) {
+    super();
 
     if (DEBUG) {
       this.debugLabel = parent ? `${parent.debugLabel}.${key}` : `this`;
@@ -72,7 +68,7 @@ export class UnboundRootReference<T = unknown> extends RootReference<T> {
 
     if (isObject(value)) {
       // root of interop with ember objects
-      return new UnboundPropertyReference(value[key], this.env, this, key);
+      return new UnboundPropertyReference(value[key], this, key);
     } else {
       return PrimitiveReference.create(value as any);
     }
diff --git a/yarn.lock b/yarn.lock
index 1faadaf3af5..24df10cb78c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,142 +913,152 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.58.0.tgz#4e28db709f83bf5fbfcba1982c61d7ade710ec0b"
-  integrity sha512-SMyPZCF5yA6zv14A87gXr5QjYqItMnTGfg9zjU0Ki603soPiU8xnXBEa+EHZwJovzqi022v+cIN+RB5kRsu/Qw==
-  dependencies:
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/syntax" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
-    "@glimmer/wire-format" "^0.58.0"
+"@glimmer/compiler@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.59.0.tgz#96ceb23600aef2cb8ce0194fa527db991cf0ea00"
+  integrity sha512-8S3jHpQykERW9wmcpauqqwuA795telZZhgm8qagba2VqwXKGSTynv6SjXTcr3ZXUku/gejN/LFttn51Gb09a/Q==
+  dependencies:
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/syntax" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
+    "@glimmer/wire-format" "^0.59.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.58.0.tgz#fd07870b173e2274ca9b2bf83a00fdecc19454c5"
-  integrity sha512-EUj8uKMmi/q+F3H7vRL9PH9M8FO5mrQdeoMWlTzZYHoJxASkbUbCnnV++BCqXcU+AJiO2h83/NwB/W8951rX2w==
+"@glimmer/encoder@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.59.0.tgz#d28b7dfd583ea15c7466f64a4c1e2e66ad9e6df3"
+  integrity sha512-2jWNOMNgP7HBcuQ3TBF+WpbC5WPCo1mgpRJbGAku+th15CNiaTgzzgmi/Af9RhPwBKUuFXroTIrash9HEu+s2Q==
   dependencies:
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/vm" "^0.58.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/vm" "^0.59.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/interfaces@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.58.0.tgz#9271a89851b8711265f5bef7b69e6734f9621625"
-  integrity sha512-lajPG3VM3Z6SiCwjMqaqkdxjJYndVwAYZXvKP2FSqJPUadnyfSB59Ira8R1kUwV1+qRlugqPYAr95iEq+L6/lQ==
+"@glimmer/global-context@0.59.0", "@glimmer/global-context@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.59.0.tgz#7ccf9c6689dd240a78fcd6b04fb2660cfdbaac97"
+  integrity sha512-D8toHmniE1ufbK+A/pizPtfN4BY5n+E9/8/feFTERQBN5Q0+MQUAYoWtx2yb3RYprukwbQ8k+doOIAoHiZQ88A==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+
+"@glimmer/interfaces@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.59.0.tgz#b94e099609ed83bad686bf4759b373caa1c19210"
+  integrity sha512-k1ax7bbIdbwpS77d1G0y+y2C6pL+u6l/AXYvJip+yHRe163c5os8jbE9pSzzmOsdpqeJoQe0XYodLpyBMJebog==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.58.0.tgz#aff3f109a32237426856bea45186af392a20f75e"
-  integrity sha512-rO1mcqFV/c8SVXxaErl/0bsHispHU2rY1TRH/ONi+YVORddKlzwCftcY/cgykV+xAEr4sNYk3ZeNVnKFTSMF/g==
+"@glimmer/low-level@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.59.0.tgz#59c55dfc143e7f888d614188c353d16f4253435b"
+  integrity sha512-RSdI5A3jKxX9xO7zpzwf5NI6rpoIl9yW+ByAz3htrhqYpLLEsFNMEZoqGlKF2V7p+u3PnUyRq1m6lRgVRHNY5Q==
 
-"@glimmer/node@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.58.0.tgz#c15eb04bd5c3bf86703ac4c8114037b0247fc604"
-  integrity sha512-U2ZN8/Bk3MKYYEzBEbVrIPsDnjSynqfQvcuD57zyA6iQ1mNms/p/yE6Cdd6ZgIYH7fALVk6ZUf8Fznj64Cb+kg==
+"@glimmer/node@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.59.0.tgz#d545b5912ea93316e378ae00af4ecd42a7f6cb0c"
+  integrity sha512-1KIbRPwEJTeIdXktqnHAMVJru8dkyWi7BROTyqU2jwwVxK4zkgucYT30J3inVnghIs+nZB0BFmxdkv6uDvVVfQ==
   dependencies:
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/runtime" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/runtime" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.58.0.tgz#807d86247f33da44da983f2e01f0a06221c52674"
-  integrity sha512-BV+U7bK9zri3hdrvbtb31Nvrqh047/LmT1rJTBgmLNvmzt/YUW2CvZ4mrzUSnp0OxiapPQG7dgO7UgWknYGcDA==
-  dependencies:
-    "@glimmer/encoder" "^0.58.0"
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/program" "^0.58.0"
-    "@glimmer/reference" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
-    "@glimmer/vm" "^0.58.0"
-    "@glimmer/wire-format" "^0.58.0"
-
-"@glimmer/program@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.58.0.tgz#fe206e3b18a0e6e084602675aa3bd7737f520dd5"
-  integrity sha512-zCWRHI6U6ljZWIjtyf5xlzObsNzMvYumaTS/impQZTVaqVdjOaKcxFPitZHFyZwF34e61XzLR0SQ/osFnhoM2g==
-  dependencies:
-    "@glimmer/encoder" "^0.58.0"
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
-
-"@glimmer/reference@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.58.0.tgz#8d2fb4a53cf3bac299961236c1774641bb103c53"
-  integrity sha512-1pDal2ThvQWZumNQA8XU/6gbX/vbrdIcy7BTpR2PJHxw2QGTln8enKLEWq+PPXv952/xXgttRBP99Ge9a6fPYg==
+"@glimmer/opcode-compiler@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.59.0.tgz#37fd670d29317a2ad6b4a2c8186b514f05c398ae"
+  integrity sha512-MP/FaQrya4aeNWZ40QzvjMr0hLfMIUThA6dOGk3yq5ls9wYg0AzmM/EOShR7tNkNmH/85rXzaUvQXVvKKcQacg==
+  dependencies:
+    "@glimmer/encoder" "^0.59.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/program" "^0.59.0"
+    "@glimmer/reference" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
+    "@glimmer/vm" "^0.59.0"
+    "@glimmer/wire-format" "^0.59.0"
+
+"@glimmer/program@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.59.0.tgz#fd3a40c1786aae51cc9337d5c7d2cad42c3f5bdc"
+  integrity sha512-wD6sBFd4ilcYlSFz3JWihtWwXoJPyHeBNuqD9YdVd4s5yPUw1uFTI26zelWKfs0sMmMuG2FE4OD6Gsv5Nl4cew==
+  dependencies:
+    "@glimmer/encoder" "^0.59.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
+
+"@glimmer/reference@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.59.0.tgz#50bc7a993b62276300fc732dd5ebdb27dcd4e589"
+  integrity sha512-uJbzdwi965KdflNuaD1snaH7y54v+LAbt/W2VUFue0ZSWoAhBLPrRP8XGO+gnXYSRDNkkoUnPwTsvEB9Pg4bRQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
-    "@glimmer/validator" "^0.58.0"
+    "@glimmer/global-context" "^0.59.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
+    "@glimmer/validator" "^0.59.0"
 
-"@glimmer/runtime@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.58.0.tgz#86ed829f6456c846ca4b580722c1b167816220a0"
-  integrity sha512-Tp6UaEcTAJSXI3fhv0+6ud3Nc0cugCnhkg+8Y+31jV0lTnMEnix8wUnZPpXwhRitIW/XcudTkWOYIPZg7UuArQ==
+"@glimmer/runtime@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.59.0.tgz#9e458752413555be09149deb9387ec6e9bd2c718"
+  integrity sha512-1mIkLLwiBLQx/+kfsn5TaP5HPNcszJh2aENVa0ai14fCVtNPFNge+B+oQ3FbV944Hb4EzhFAnx9nvVB1NWa0OA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/low-level" "^0.58.0"
-    "@glimmer/program" "^0.58.0"
-    "@glimmer/reference" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
-    "@glimmer/validator" "^0.58.0"
-    "@glimmer/vm" "^0.58.0"
-    "@glimmer/wire-format" "^0.58.0"
+    "@glimmer/global-context" "0.59.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/low-level" "^0.59.0"
+    "@glimmer/program" "^0.59.0"
+    "@glimmer/reference" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
+    "@glimmer/validator" "^0.59.0"
+    "@glimmer/vm" "^0.59.0"
+    "@glimmer/wire-format" "^0.59.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.58.0.tgz#4141a607694f1f7afdedbc904968bd697bb7f629"
-  integrity sha512-KYa4Knlkhg7d0u7hCTQxMjkpvGVPFsjoyorIWeSm1E6GKKKi7b+uY2zmOmkSdU5592X93J5npgp2eABqJUQFcQ==
+"@glimmer/syntax@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.59.0.tgz#5ba14edd7c3d793d9f881ec59fc78991fb3c3f9f"
+  integrity sha512-cvd9//tWKO5Cb1o0c778cR1O75m3/idnoQv6hJK9jV60KAsKIuZL9gtG0eWOepiLnZYg0oXeLXvzBd3LcedSIg==
   dependencies:
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.58.0.tgz#18d22fb2eb4ed3f1323718cd1267c137a42eea4e"
-  integrity sha512-2ws68gTGOYNNW1dJx33O2CDMoKQiNhKjQyD6nY9bgFQ7cVWifVxs39HpWOe4yc/2MHaTLmHjuqdAr1gznpQsOA==
+"@glimmer/util@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.59.0.tgz#625a2a4481c9ff3a74edb18f841b6d89459327dd"
+  integrity sha512-93mlGdNTywN/F58KRWLWc3WKl0kzaiy6dLF7GpHmaPG4lsAAoZ0O0Vbz0nPIe4Qr/IVgDvm5CSa4govwHYjJvg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.58.0"
+    "@glimmer/interfaces" "^0.59.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.58.0.tgz#ada0b09840d8ff2de7827f0132d51a25dbfe8baf"
-  integrity sha512-j/ezeRlPiHTIfGYk4MZZ2h11Bm8sWdsdCr9ms8b/2UjFvvx5x3YPCK0+27PCQLqjwq19KhtHgdjbgWvK0ibEXA==
+"@glimmer/validator@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.59.0.tgz#58574fcbeaa5a29c6f0997c0e8a326f8d9a52016"
+  integrity sha512-kJAE9PicuxTHvCU9zWZdoK7j0vDh35TJ6rhfM1kxW/9IlIu2Q+NrFOT3i3bbxOkN7Z0TFaBvugjCREByw4sFpQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.59.0"
 
-"@glimmer/vm@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.58.0.tgz#044f32c11174f032b4fa4000de45dccc4a98ac8a"
-  integrity sha512-3TgMJyQOG2IHJf6sF5MArpmulHobMdLiP9uIhU2nAdwy4e3D0CEytbrYu+xV+/gSNMY1kGFIx/zTWs8HGvkXVQ==
+"@glimmer/vm@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.59.0.tgz#667d18b676dd4b7c991473acaabdabf194813676"
+  integrity sha512-V8jL9i3GkdFp5CoVWk5A0SlwtYauAxj60eblrzR4fUaEy/snEJjOhaMfCT6LH9QBowvvifyqxyY8YagaF0X+9A==
   dependencies:
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
 
-"@glimmer/wire-format@^0.58.0":
-  version "0.58.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.58.0.tgz#7e8b6940dd4fa1ff1d1acffaf9779a839f399384"
-  integrity sha512-m2gPnWQetPkn13iXLdlR8OvTwsCLpzLVQpdNlfC2OF4XkWhAlYg2ameiCBYphdmNbPbSt3EfbMs8TkJD4P4P/A==
+"@glimmer/wire-format@^0.59.0":
+  version "0.59.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.59.0.tgz#d6376e099867970b29d82418b34d36e1a84ccc30"
+  integrity sha512-TXThBQXZAbN15yWtYDCazzv3i3poWYXZZxcF1LvclxJS40I4E8FOfrl5npinGQeS0XZoypEOpVkne4EAL5cxEw==
   dependencies:
-    "@glimmer/interfaces" "^0.58.0"
-    "@glimmer/util" "^0.58.0"
+    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/util" "^0.59.0"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 20bc7a6a09fda8ff415fccca01dd61c8fd28b2f1 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 24 Aug 2020 13:59:56 -0400
Subject: [PATCH 0091/1405] Add v3.21.0 to CHANGELOG

(cherry picked from commit 4ec9cd59f3e68dad14bd52926d1351d683564332)
---
 CHANGELOG.md | 30 ++----------------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ff4cc206c6..6fe02f24513 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,35 +1,9 @@
 # Ember Changelog
 
-### v3.21.0-beta.6 (August 17, 2020)
-
-- [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
-- [#19077](https://github.com/emberjs/ember.js/pull/19077) Simplify `get` and improve `computed` caching scheme.
-- [#19082](https://github.com/emberjs/ember.js/pull/19082) Simplify mixin application
-- [#19089](https://github.com/emberjs/ember.js/pull/19089) Update rendering engine to improve immediate encoding performance
-
-### v3.21.0-beta.5 (August 5, 2020)
-
-- [#19028](https://github.com/emberjs/ember.js/pull/19028) [BUGFIX] Ensure setter CP's with dependent keys on curly components can be two way bound
-
-### v3.21.0-beta.4 (August 3, 2020)
-
-- [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in `HistoryLocation`
-- [#19060](https://github.com/emberjs/ember.js/pull/19060) / [#19065](https://github.com/emberjs/ember.js/pull/19065) / [#19072](https://github.com/emberjs/ember.js/pull/19072) [BUGFIX] Update rendering engine to `@glimmer/*` 0.55.3
-- [#19063](https://github.com/emberjs/ember.js/pull/19063) [DOC] Fix missing docs for `{{#in-element}}`
-
-### v3.21.0-beta.3 (July 27, 2020)
-
-- [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update router.js to ensure transition.abort works for query param only transitions.
-- [#19056](https://github.com/emberjs/ember.js/pull/19056) [BUGFIX] Update glimmer-vm to 0.54.2.
-
-### v3.21.0-beta.2 (July 20, 2020)
-
-- [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`
-- [#19047](https://github.com/emberjs/ember.js/pull/19047) [BUGFIX] Ensure `inject-babel-helpers` plugin can be parallelized
-
-### v3.21.0-beta.1 (July 13, 2020)
+### v3.21.0 (August 24, 2020)
 
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
+- [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
 
 ### v3.20.4 (August 11, 2020)

From 1a17a61a4d4e7e89a0fd51ac39d6acf7dbbc9991 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 24 Aug 2020 14:26:33 -0400
Subject: [PATCH 0092/1405] Add v3.22.0-beta.1 to CHANGELOG

(cherry picked from commit a429dda8555b812afaed5dd1874ef19bc37e1b02)
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fe02f24513..f856537c277 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v3.22.0-beta.1 (August 24, 2020)
+
+- [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).
+- [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
+- [#19086](https://github.com/emberjs/ember.js/pull/19086) [FEATURE] Pass transition object to activate/deactivate hooks and events
+
 ### v3.21.0 (August 24, 2020)
 
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).

From 180e9b7488a94ac00b91aee3c7a530f8ae1a89cf Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 24 Aug 2020 14:29:26 -0400
Subject: [PATCH 0093/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1ea60c1a98a..3aab080d875 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.22.0",
+  "version": "3.23.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 4d55dae3a7ebe2d9ba5b2181179c587c69c33fc7 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 25 Aug 2020 12:36:07 -0400
Subject: [PATCH 0094/1405] [BUGFIX lts] Ensure `destroy` methods on
 `CoreObject` are invoked.

When an instance of `CoreObject` is destroyed with `@ember/destroyable`
(or the polyfill when using Ember 3.20+), the instances own `destroy`
method is never called. In _general_ "this is fine" because the majority
of consumers are using `willDestroy` for their custom object teardown
needs. Unfortunately, this isn't _quite_ good enough and any consumers
that are directly relying on extending from `CoreObject` and having a
custom `destroy` method called will no longer function.

The prime example of this is the `Owner` instance itself. Currently,
running `destroy(owner)` **does not** actually destroy any instantiated
objects in the container. This is because `ContainerProxyMixin`
implements `destroy` in order to call `this.__container__.destroy()`
which is where the actual cleanup happens. That whole system should be
refactored to leveraging `@ember/destroyable` system directly, but in
the meantime this case (and any others where folks have implemented a
destroy method in Mixins or other subclasses of Ember.CoreObject) should
**absolutely** be fixed.

This fix ensures that any `destroy(someInstance)` calls on a
`CoreObject` directly invoke the `destroy` method on the instance in the
same manner as Ember < 3.20 (`.destroy()` is called eagerly, before
`willDestroy`).
---
 .../runtime/lib/system/core_object.js         | 19 +++++++++++-
 .../tests/mixins/container_proxy_test.js      | 22 ++++++++++++++
 .../runtime/tests/system/core_object_test.js  | 17 +++++++++++
 .../@ember/application/tests/reset_test.js    | 29 +++++++++++--------
 4 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index a8f209d9153..f90d38fdd3b 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -39,6 +39,14 @@ const prototypeMixinMap = new WeakMap();
 
 const initCalled = DEBUG ? new WeakSet() : undefined; // only used in debug builds to enable the proxy trap
 
+const destroyCalled = new Set();
+
+function ensureDestroyCalled(instance) {
+  if (!destroyCalled.has(instance)) {
+    instance.destroy();
+  }
+}
+
 function initialize(obj, properties) {
   let m = meta(obj);
 
@@ -256,6 +264,7 @@ class CoreObject {
       });
     }
 
+    registerDestructor(self, ensureDestroyCalled, true);
     registerDestructor(self, () => self.willDestroy());
 
     // disable chains
@@ -512,7 +521,15 @@ class CoreObject {
     @public
   */
   destroy() {
-    destroy(this);
+    // Used to ensure that manually calling `.destroy()` does not immediately call destroy again
+    destroyCalled.add(this);
+
+    try {
+      destroy(this);
+    } finally {
+      destroyCalled.delete(this);
+    }
+
     return this;
   }
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
index 860be7f0005..7119e9616e3 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
@@ -4,6 +4,7 @@ import ContainerProxy from '../../lib/mixins/container_proxy';
 import EmberObject from '../../lib/system/object';
 import { run, schedule } from '@ember/runloop';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { destroy } from '@glimmer/runtime';
 
 moduleFor(
   '@ember/-internals/runtime/mixins/container_proxy',
@@ -44,5 +45,26 @@ moduleFor(
         this.instance.destroy();
       });
     }
+
+    '@test being destroyed by @ember/destroyable properly destroys the container and created instances'(
+      assert
+    ) {
+      assert.expect(1);
+
+      this.registry.register(
+        'service:foo',
+        class FooService extends EmberObject {
+          willDestroy() {
+            assert.ok(true, 'is properly destroyed');
+          }
+        }
+      );
+
+      this.instance.lookup('service:foo');
+
+      run(() => {
+        destroy(this.instance);
+      });
+    }
   }
 );
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index 7007285dd5a..c788ad15e46 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -3,6 +3,8 @@ import { get, set, observer } from '@ember/-internals/metal';
 import CoreObject from '../../lib/system/core_object';
 import { moduleFor, AbstractTestCase, buildOwner, runLoopSettled } from 'internal-test-helpers';
 import { track } from '@glimmer/validator';
+import { destroy } from '@glimmer/runtime';
+import { run } from '@ember/runloop';
 
 moduleFor(
   'Ember.CoreObject',
@@ -129,5 +131,20 @@ moduleFor(
         assert.ok(true, 'We did not error');
       });
     }
+    '@test destroy method is called when being destroyed by @ember/destroyable'(assert) {
+      assert.expect(1);
+
+      class TestObject extends CoreObject {
+        destroy() {
+          assert.ok(true, 'destroy was invoked');
+        }
+      }
+
+      let instance = TestObject.create();
+
+      run(() => {
+        destroy(instance);
+      });
+    }
   }
 );
diff --git a/packages/@ember/application/tests/reset_test.js b/packages/@ember/application/tests/reset_test.js
index 1cbb81e9899..b3454826dc7 100644
--- a/packages/@ember/application/tests/reset_test.js
+++ b/packages/@ember/application/tests/reset_test.js
@@ -3,6 +3,7 @@ import { get } from '@ember/-internals/metal';
 import Controller from '@ember/controller';
 import { Router } from '@ember/-internals/routing';
 import { moduleFor, AutobootApplicationTestCase } from 'internal-test-helpers';
+import { CoreObject } from '@ember/-internals/runtime';
 
 moduleFor(
   'Application - resetting',
@@ -71,31 +72,35 @@ moduleFor(
       let eventDispatcherWasSetup = 0;
       let eventDispatcherWasDestroyed = 0;
 
-      let mockEventDispatcher = {
+      class FakeEventDispatcher extends CoreObject {
         setup() {
           eventDispatcherWasSetup++;
-        },
+        }
+
         destroy() {
+          if (this.isDestroying) {
+            return;
+          }
+          super.destroy();
+
           eventDispatcherWasDestroyed++;
-        },
-      };
+        }
+      }
 
       run(() => {
         this.createApplication();
-        this.add('event_dispatcher:main', {
-          create: () => mockEventDispatcher,
-        });
+        this.add('event_dispatcher:main', FakeEventDispatcher);
 
-        assert.equal(eventDispatcherWasSetup, 0);
-        assert.equal(eventDispatcherWasDestroyed, 0);
+        assert.equal(eventDispatcherWasSetup, 0, 'not setup yet');
+        assert.equal(eventDispatcherWasDestroyed, 0, 'not destroyed yet');
       });
 
-      assert.equal(eventDispatcherWasSetup, 1);
-      assert.equal(eventDispatcherWasDestroyed, 0);
+      assert.equal(eventDispatcherWasSetup, 1, 'setup');
+      assert.equal(eventDispatcherWasDestroyed, 0, 'still not destroyed');
 
       this.application.reset();
 
-      assert.equal(eventDispatcherWasDestroyed, 1);
+      assert.equal(eventDispatcherWasDestroyed, 1, 'destroyed');
       assert.equal(eventDispatcherWasSetup, 2, 'setup called after reset');
     }
 

From f43dce615808e8d732e2e36595daf72117bc53d2 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 26 Aug 2020 17:13:36 -0700
Subject: [PATCH 0095/1405] [BUGFIX lts] Fixes ArrayProxy length reactivity

Recent refactors for performance left a gap in the reactivity model,
specifically for the `length` property of ArrayProxy. We now only use
the `CUSTOM_TAG_FOR` API when getting chain tags, which is much better
for most `get()` usages since we don't have to do an extra brand check
that is not very commonly used. However, the `length` property of
ArrayProxy does not have a normal property tag, and it is a native
getter which does not entangle the value naturally when accessed via
autotracking.

This PR sets up the `length` tag eagerly whenever the content of the
ArrayProxy changes, and consumes it when the `length` property is
accessed. It also does the same thing for the `arrTag`, though that is
only used for chain tags. Normally, when the array tag is accessed, it
tracks things properly through the `objectAt` API.
---
 .../runtime/lib/system/array_proxy.js         | 50 ++++++++++---------
 .../tests/system/array_proxy/length_test.js   | 45 +++++++++++++++++
 2 files changed, 72 insertions(+), 23 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
index 30774479227..3546446f10a 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
@@ -18,7 +18,7 @@ import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
 import { isArray, MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
-import { combine, validateTag, valueForTag, tagFor } from '@glimmer/validator';
+import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
 
 const ARRAY_OBSERVER_MAPPING = {
   willChange: '_arrangedContentArrayWillChange',
@@ -109,28 +109,23 @@ export default class ArrayProxy extends EmberObject {
     this._arrangedContentIsUpdating = false;
     this._arrangedContentTag = null;
     this._arrangedContentRevision = null;
+    this._lengthTag = null;
+    this._arrTag = null;
   }
 
   [PROPERTY_DID_CHANGE]() {
     this._revalidate();
   }
 
-  [CUSTOM_TAG_FOR](key, addMandatorySetter) {
-    if (key === '[]' || key === 'length') {
-      // revalidate eagerly if we're being tracked, since we no longer will
-      // be able to later on due to backtracking re-render assertion
+  [CUSTOM_TAG_FOR](key) {
+    if (key === '[]') {
       this._revalidate();
-      let arrangedContentTag = this._arrangedContentTag;
-      let arrangedContent = get(this, 'arrangedContent');
 
-      if (isObject(arrangedContent)) {
-        return combine([
-          arrangedContentTag,
-          tagForProperty(arrangedContent, key, addMandatorySetter),
-        ]);
-      } else {
-        return arrangedContentTag;
-      }
+      return this._arrTag;
+    } else if (key === 'length') {
+      this._revalidate();
+
+      return this._lengthTag;
     }
 
     return tagFor(this, key);
@@ -229,6 +224,8 @@ export default class ArrayProxy extends EmberObject {
       this._lengthDirty = false;
     }
 
+    consumeTag(this._lengthTag);
+
     return this._length;
   }
 
@@ -252,9 +249,8 @@ export default class ArrayProxy extends EmberObject {
     }
   }
 
-  _updateArrangedContentArray() {
+  _updateArrangedContentArray(arrangedContent) {
     let oldLength = this._objects === null ? 0 : this._objects.length;
-    let arrangedContent = get(this, 'arrangedContent');
     let newLength = arrangedContent ? get(arrangedContent, 'length') : 0;
 
     this._removeArrangedContentArrayObserver();
@@ -263,11 +259,10 @@ export default class ArrayProxy extends EmberObject {
     this._invalidate();
 
     this.arrayContentDidChange(0, oldLength, newLength);
-    this._addArrangedContentArrayObserver();
+    this._addArrangedContentArrayObserver(arrangedContent);
   }
 
-  _addArrangedContentArrayObserver() {
-    let arrangedContent = get(this, 'arrangedContent');
+  _addArrangedContentArrayObserver(arrangedContent) {
     if (arrangedContent && !arrangedContent.isDestroyed) {
       assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
       assert(
@@ -319,18 +314,27 @@ export default class ArrayProxy extends EmberObject {
       this._arrangedContentTag === null ||
       !validateTag(this._arrangedContentTag, this._arrangedContentRevision)
     ) {
+      let arrangedContent = this.get('arrangedContent');
+
       if (this._arrangedContentTag === null) {
         // This is the first time the proxy has been setup, only add the observer
         // don't trigger any events
-        this._addArrangedContentArrayObserver();
+        this._addArrangedContentArrayObserver(arrangedContent);
       } else {
         this._arrangedContentIsUpdating = true;
-        this._updateArrangedContentArray();
+        this._updateArrangedContentArray(arrangedContent);
         this._arrangedContentIsUpdating = false;
       }
 
-      this._arrangedContentTag = tagFor(this, 'arrangedContent');
+      let arrangedContentTag = (this._arrangedContentTag = tagFor(this, 'arrangedContent'));
       this._arrangedContentRevision = valueForTag(this._arrangedContentTag);
+
+      if (isObject(arrangedContent)) {
+        this._lengthTag = combine([arrangedContentTag, tagForProperty(arrangedContent, 'length')]);
+        this._arrTag = combine([arrangedContentTag, tagForProperty(arrangedContent, '[]')]);
+      } else {
+        this._lengthTag = this._arrTag = arrangedContentTag;
+      }
     }
   }
 }
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
index ceeab97bac3..ae192431922 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
@@ -5,6 +5,7 @@ import { oneWay as reads, not } from '@ember/object/computed';
 import { A as a } from '../../../lib/mixins/array';
 import { moduleFor, AbstractTestCase, runTask, runLoopSettled } from 'internal-test-helpers';
 import { set, get } from '@ember/-internals/metal';
+import { createCache, getValue } from '@glimmer/validator';
 
 moduleFor(
   'Ember.ArrayProxy - content change (length)',
@@ -205,5 +206,49 @@ moduleFor(
 
       obj.destroy();
     }
+
+    async ['@test array proxy length is reactive when accessed normally'](assert) {
+      let proxy = ArrayProxy.create({
+        content: a([1, 2, 3]),
+      });
+
+      let lengthCache = createCache(() => proxy.length);
+
+      assert.equal(getValue(lengthCache), 3, 'length is correct');
+
+      proxy.pushObject(4);
+
+      assert.equal(getValue(lengthCache), 4, 'length is correct');
+
+      proxy.removeObject(1);
+
+      assert.equal(getValue(lengthCache), 3, 'length is correct');
+
+      proxy.set('content', []);
+
+      assert.equal(getValue(lengthCache), 0, 'length is correct');
+    }
+
+    async ['@test array proxy length is reactive when accessed using get'](assert) {
+      let proxy = ArrayProxy.create({
+        content: a([1, 2, 3]),
+      });
+
+      let lengthCache = createCache(() => get(proxy, 'length'));
+
+      assert.equal(getValue(lengthCache), 3, 'length is correct');
+
+      proxy.pushObject(4);
+
+      assert.equal(getValue(lengthCache), 4, 'length is correct');
+
+      proxy.removeObject(1);
+
+      assert.equal(getValue(lengthCache), 3, 'length is correct');
+
+      proxy.set('content', []);
+
+      assert.equal(getValue(lengthCache), 0, 'length is correct');
+    }
   }
 );

From 37f8d9fa5d361dd756c4afc1b86d5a4e13cd62a4 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Fri, 28 Aug 2020 19:50:54 -0400
Subject: [PATCH 0096/1405] Add v3.20.5 and v3.21.1 to CHANGELOG.md.

[ci skip]
---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f856537c277..2ed3dfdcc3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,22 @@
 - [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
 - [#19086](https://github.com/emberjs/ember.js/pull/19086) [FEATURE] Pass transition object to activate/deactivate hooks and events
 
+### v3.21.1 (August 28, 2020)
+
+- [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.
+- [#19111](https://github.com/emberjs/ember.js/pull/19111) [BUGFIX] Fixes `ArrayProxy` length reactivity.
+
 ### v3.21.0 (August 24, 2020)
 
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
 - [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
 
+### v3.20.5 (August 28, 2020)
+
+- [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.
+- [#19111](https://github.com/emberjs/ember.js/pull/19111) [BUGFIX] Fixes `ArrayProxy` length reactivity.
+
 ### v3.20.4 (August 11, 2020)
 
 - [#19047](https://github.com/emberjs/ember.js/pull/19047) Ensure `inject-babel-helpers` plugin can be parallelized

From 6b4f58971096decca38849b7081a56178b83d2b1 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 31 Aug 2020 15:02:53 -0400
Subject: [PATCH 0097/1405] Add v3.22.0-beta.2 to CHANGELOG

(cherry picked from commit a409f1de8396d11faf0e78b7b662370379417eb8)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ed3dfdcc3b..bd712f4b7d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.22.0-beta.2 (August 31, 2020)
+
+- [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.
+- [#19111](https://github.com/emberjs/ember.js/pull/19111) [BUGFIX] Fixes `ArrayProxy` length reactivity.
+
 ### v3.22.0-beta.1 (August 24, 2020)
 
 - [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).

From 3caa6f8cff24cd80bccc7d3835ab5b7e9d1a8855 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 14 Aug 2020 14:32:31 -0700
Subject: [PATCH 0098/1405] [REFACTOR] Monomorphic Reference

Integrates https://github.com/glimmerjs/glimmer-vm/pull/1142
---
 package.json                                  |  18 +-
 packages/@ember/-internals/glimmer/index.ts   |   2 +-
 .../lib/component-managers/abstract.ts        |   9 +-
 .../glimmer/lib/component-managers/curly.ts   |  55 ++--
 .../glimmer/lib/component-managers/custom.ts  |  15 +-
 .../glimmer/lib/component-managers/input.ts   |  24 +-
 .../glimmer/lib/component-managers/mount.ts   |  18 +-
 .../glimmer/lib/component-managers/outlet.ts  |  16 +-
 .../lib/component-managers/template-only.ts   |   3 +-
 .../-internals/glimmer/lib/component.ts       |   6 +-
 ...sert-implicit-component-helper-argument.ts |  28 +-
 .../lib/helpers/-in-element-null-check.ts     |  24 +-
 .../glimmer/lib/helpers/-normalize-class.ts   |  32 +--
 .../glimmer/lib/helpers/-track-array.ts       |  24 +-
 .../-internals/glimmer/lib/helpers/action.ts  | 146 ++++++----
 .../-internals/glimmer/lib/helpers/array.ts   |  10 +-
 .../-internals/glimmer/lib/helpers/concat.ts  |  21 +-
 .../-internals/glimmer/lib/helpers/each-in.ts |  30 +-
 .../-internals/glimmer/lib/helpers/fn.ts      |  74 ++---
 .../-internals/glimmer/lib/helpers/get.ts     |  77 +++--
 .../-internals/glimmer/lib/helpers/hash.ts    |  11 +-
 .../glimmer/lib/helpers/if-unless.ts          |  78 +++---
 .../-internals/glimmer/lib/helpers/log.ts     |  19 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |  47 +---
 .../glimmer/lib/helpers/query-param.ts        |  23 +-
 .../glimmer/lib/helpers/readonly.ts           |  27 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |   4 +-
 .../glimmer/lib/modifiers/action.ts           |  76 +++--
 .../-internals/glimmer/lib/modifiers/on.ts    |   9 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |  19 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |   4 +-
 .../-internals/glimmer/lib/syntax/mount.ts    | 108 +++----
 .../-internals/glimmer/lib/syntax/outlet.ts   | 109 +++----
 .../-internals/glimmer/lib/utils/bindings.ts  | 265 +++++++-----------
 .../lib/utils/curly-component-state-bucket.ts |   8 +-
 .../-internals/glimmer/lib/utils/outlet.ts    |  80 ------
 .../glimmer/lib/utils/process-args.ts         |  16 +-
 .../glimmer/lib/utils/references.ts           |  77 +----
 .../-internals/glimmer/lib/views/outlet.ts    |  25 +-
 .../components/curly-components-test.js       |  38 ---
 .../helpers/closure-action-test.js            |  77 ++---
 .../helpers/element-action-test.js            |   2 +-
 .../@ember/-internals/metal/lib/decorator.ts  |   2 +-
 packages/@ember/-internals/metal/lib/mixin.ts |   3 +-
 .../runtime/lib/system/core_object.js         |   3 +-
 .../@ember/-internals/utils/lib/inspect.ts    |   2 +-
 .../@ember/-internals/utils/lib/is_proxy.ts   |   2 +-
 .../-internals/utils/lib/mandatory-setter.ts  |   2 +-
 packages/@ember/-internals/utils/lib/super.ts |   2 +-
 packages/@ember/polyfills/index.ts            |   1 -
 packages/@ember/polyfills/lib/weak_set.ts     |  20 --
 yarn.lock                                     | 210 +++++++-------
 52 files changed, 854 insertions(+), 1147 deletions(-)
 delete mode 100644 packages/@ember/polyfills/lib/weak_set.ts

diff --git a/package.json b/package.json
index 3aab080d875..d1b29cbb0d9 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.59.0",
+    "@glimmer/compiler": "^0.60.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "^0.59.0",
-    "@glimmer/interfaces": "^0.59.0",
-    "@glimmer/node": "^0.59.0",
-    "@glimmer/opcode-compiler": "^0.59.0",
-    "@glimmer/program": "^0.59.0",
-    "@glimmer/reference": "^0.59.0",
-    "@glimmer/runtime": "^0.59.0",
-    "@glimmer/validator": "^0.59.0",
+    "@glimmer/global-context": "^0.60.0",
+    "@glimmer/interfaces": "^0.60.0",
+    "@glimmer/node": "^0.60.0",
+    "@glimmer/opcode-compiler": "^0.60.0",
+    "@glimmer/program": "^0.60.0",
+    "@glimmer/reference": "^0.60.0",
+    "@glimmer/runtime": "^0.60.0",
+    "@glimmer/validator": "^0.60.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index b15aa4a6543..beb9b2f0b23 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -400,7 +400,7 @@ export { default as AbstractComponentManager } from './lib/component-managers/ab
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
-export { INVOKE } from './lib/helpers/mut';
+export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export { capabilities } from './lib/component-managers/custom';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
index e10deaca827..c1feedf58a5 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
@@ -7,9 +7,10 @@ import {
   ElementOperations,
   Option,
   PreparedArguments,
+  VM,
   VMArguments,
 } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { Reference } from '@glimmer/reference';
 import { SimpleElement } from '@simple-dom/interface';
 import { EmberVMEnvironment } from '../environment';
 
@@ -18,7 +19,7 @@ import { EmberVMEnvironment } from '../environment';
 // https://github.com/glimmerjs/glimmer-vm/blob/v0.24.0-beta.4/packages/%40glimmer/runtime/lib/component/interfaces.ts#L21
 
 export default abstract class AbstractManager<T, U> implements ComponentManager<T, U> {
-  prepareArgs(_state: U, _args: VMArguments): Option<PreparedArguments> {
+  prepareArgs(_state: U, _args: VMArguments, _vm: VM): Option<PreparedArguments> {
     return null;
   }
 
@@ -29,11 +30,11 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
     definition: U,
     args: VMArguments,
     dynamicScope: DynamicScope,
-    caller: PathReference<void | {}>,
+    caller: Reference<void | {}>,
     hasDefaultBlock: boolean
   ): T;
 
-  abstract getSelf(component: T): PathReference<unknown>;
+  abstract getSelf(component: T): Reference;
   abstract getCapabilities(state: U): ComponentCapabilities;
 
   didCreateElement(_component: T, _element: SimpleElement, _operations: ElementOperations): void {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 4b398a14b79..64652d77d0e 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -21,8 +21,14 @@ import {
   WithJitDynamicLayout,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { PathReference, RootReference } from '@glimmer/reference';
-import { PrimitiveReference, registerDestructor, ReifyPositionalReference } from '@glimmer/runtime';
+import {
+  childRefFor,
+  createComputeRef,
+  createPrimitiveRef,
+  Reference,
+  valueForRef,
+} from '@glimmer/reference';
+import { registerDestructor, reifyPositional } from '@glimmer/runtime';
 import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
 import {
   beginTrackFrame,
@@ -40,11 +46,11 @@ import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
 import { Factory as TemplateFactory, isTemplateFactory, OwnedTemplate } from '../template';
 import {
-  AttributeBinding,
-  ClassNameBinding,
+  createClassNameBindingRef,
+  createSimpleClassNameBindingRef,
+  installAttributeBinding,
   installIsVisibleBinding,
-  referenceForKey,
-  SimpleClassNameBindingReference,
+  parseAttributeBinding,
 } from '../utils/bindings';
 
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
@@ -52,6 +58,8 @@ import { processComponentArgs } from '../utils/process-args';
 import AbstractManager from './abstract';
 import DefinitionState from './definition-state';
 
+const EMBER_VIEW_REF = createPrimitiveRef('ember-view');
+
 function aliasIdToElementId(args: VMArguments, props: any) {
   if (args.named.has('id')) {
     // tslint:disable-next-line:max-line-length
@@ -69,7 +77,7 @@ function aliasIdToElementId(args: VMArguments, props: any) {
 function applyAttributeBindings(
   attributeBindings: Array<string>,
   component: Component,
-  rootRef: RootReference<Component>,
+  rootRef: Reference<Component>,
   operations: ElementOperations
 ) {
   let seen: string[] = [];
@@ -77,12 +85,12 @@ function applyAttributeBindings(
 
   while (i !== -1) {
     let binding = attributeBindings[i];
-    let parsed: [string, string, boolean] = AttributeBinding.parse(binding);
+    let parsed: [string, string, boolean] = parseAttributeBinding(binding);
     let attribute = parsed[1];
 
     if (seen.indexOf(attribute) === -1) {
       seen.push(attribute);
-      AttributeBinding.install(component, rootRef, parsed, operations);
+      installAttributeBinding(component, rootRef, parsed, operations);
     }
 
     i--;
@@ -90,7 +98,7 @@ function applyAttributeBindings(
 
   if (seen.indexOf('id') === -1) {
     let id = component.elementId ? component.elementId : guidFor(component);
-    operations.setAttribute('id', PrimitiveReference.create(id), false, null);
+    operations.setAttribute('id', createPrimitiveRef(id), false, null);
   }
 
   if (
@@ -103,7 +111,7 @@ function applyAttributeBindings(
 }
 
 const DEFAULT_LAYOUT = P`template:components/-default`;
-const EMPTY_POSITIONAL_ARGS: PathReference[] = [];
+const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
@@ -174,7 +182,7 @@ export default class CurlyComponentManager
         positional: EMPTY_POSITIONAL_ARGS,
         named: {
           ...rest,
-          ...(__ARGS__.value() as { [key: string]: PathReference<unknown> }),
+          ...(valueForRef(__ARGS__) as { [key: string]: Reference }),
         },
       };
 
@@ -199,7 +207,10 @@ export default class CurlyComponentManager
         `You cannot specify positional parameters and the hash argument \`${positionalParams}\`.`,
         !args.named.has(positionalParams)
       );
-      named = { [positionalParams]: new ReifyPositionalReference(args.positional.capture()) };
+      let captured = args.positional.capture();
+      named = {
+        [positionalParams]: createComputeRef(() => reifyPositional(captured)),
+      };
       assign(named, args.named.capture());
     } else if (Array.isArray(positionalParams) && positionalParams.length > 0) {
       const count = Math.min(positionalParams.length, args.positional.length);
@@ -234,7 +245,7 @@ export default class CurlyComponentManager
     state: DefinitionState,
     args: VMArguments,
     dynamicScope: DynamicScope,
-    callerSelfRef: PathReference,
+    callerSelfRef: Reference,
     hasBlock: boolean
   ): ComponentStateBucket {
     // Get the nearest concrete component instance from the scope. "Virtual"
@@ -266,7 +277,7 @@ export default class CurlyComponentManager
 
     // Save the current `this` context of the template as the component's
     // `_target`, so bubbled actions are routed to the right place.
-    props._target = callerSelfRef.value();
+    props._target = valueForRef(callerSelfRef);
 
     // static layout asserts CurriedDefinition
     if (state.template) {
@@ -363,7 +374,7 @@ export default class CurlyComponentManager
     return name;
   }
 
-  getSelf({ rootRef }: ComponentStateBucket): PathReference {
+  getSelf({ rootRef }: ComponentStateBucket): Reference {
     return rootRef;
   }
 
@@ -381,32 +392,32 @@ export default class CurlyComponentManager
       applyAttributeBindings(attributeBindings, component, rootRef, operations);
     } else {
       let id = component.elementId ? component.elementId : guidFor(component);
-      operations.setAttribute('id', PrimitiveReference.create(id), false, null);
+      operations.setAttribute('id', createPrimitiveRef(id), false, null);
       if (EMBER_COMPONENT_IS_VISIBLE) {
         installIsVisibleBinding!(rootRef, operations);
       }
     }
 
     if (classRef) {
-      const ref = new SimpleClassNameBindingReference(classRef, classRef['propertyKey']);
+      const ref = createSimpleClassNameBindingRef(classRef);
       operations.setAttribute('class', ref, false, null);
     }
 
     if (classNames && classNames.length) {
       classNames.forEach((name: string) => {
-        operations.setAttribute('class', PrimitiveReference.create(name), false, null);
+        operations.setAttribute('class', createPrimitiveRef(name), false, null);
       });
     }
 
     if (classNameBindings && classNameBindings.length) {
       classNameBindings.forEach((binding: string) => {
-        ClassNameBinding.install(element, rootRef, binding, operations);
+        createClassNameBindingRef(rootRef, binding, operations);
       });
     }
-    operations.setAttribute('class', PrimitiveReference.create('ember-view'), false, null);
+    operations.setAttribute('class', EMBER_VIEW_REF, false, null);
 
     if ('ariaRole' in component) {
-      operations.setAttribute('role', referenceForKey(rootRef, 'ariaRole'), false, null);
+      operations.setAttribute('role', childRefFor(rootRef, 'ariaRole'), false, null);
     }
 
     component._transitionTo('hasElement');
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index c2342095497..98a2d745f45 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -16,7 +16,7 @@ import {
   VMArguments,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, PathReference } from '@glimmer/reference';
+import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor, reifyArgs, reifyPositional } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { track } from '@glimmer/validator';
@@ -194,7 +194,7 @@ export default class CustomComponentManager<ComponentInstance>
 
     if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
       let getTag = (key: string) => {
-        return track(() => namedArgs[key].value());
+        return track(() => valueForRef(namedArgs[key]));
       };
 
       if (HAS_NATIVE_PROXY) {
@@ -203,7 +203,7 @@ export default class CustomComponentManager<ComponentInstance>
             let ref = namedArgs[prop as string];
 
             if (ref !== undefined) {
-              return ref.value();
+              return valueForRef(ref);
             } else if (prop === CUSTOM_TAG_FOR) {
               return getTag;
             }
@@ -255,7 +255,7 @@ export default class CustomComponentManager<ComponentInstance>
             enumerable: true,
             configurable: true,
             get() {
-              return namedArgs[name].value();
+              return valueForRef(namedArgs[name]);
             },
           });
         });
@@ -333,11 +333,8 @@ export default class CustomComponentManager<ComponentInstance>
     delegate.getContext(component);
   }
 
-  getSelf({
-    delegate,
-    component,
-  }: CustomComponentState<ComponentInstance>): PathReference<unknown> {
-    return new ComponentRootReference(delegate.getContext(component));
+  getSelf({ delegate, component }: CustomComponentState<ComponentInstance>): Reference {
+    return createConstRef(delegate.getContext(component), 'this');
   }
 
   getDestroyable(bucket: CustomComponentState<ComponentInstance>): Option<Destroyable> {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
index 40ebe8f3e2e..1432e24ae3a 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
@@ -11,7 +11,7 @@ import {
   PreparedArguments,
   VMArguments,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, ConstReference, PathReference } from '@glimmer/reference';
+import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { EmberVMEnvironment } from '../environment';
 import InternalComponentManager, { InternalDefinitionState } from './internal';
@@ -33,11 +33,11 @@ const CAPABILITIES: ComponentCapabilities = {
 
 export interface InputComponentState {
   env: EmberVMEnvironment;
-  type: PathReference;
+  type: Reference;
   instance: Destroyable;
 }
 
-const EMPTY_POSITIONAL_ARGS: PathReference[] = [];
+const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
@@ -52,12 +52,12 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
       args.positional.length === 0
     );
 
-    let __ARGS__: Dict<PathReference> = args.named.capture();
+    let __ARGS__: Dict<Reference> = args.named.capture();
 
     return {
       positional: EMPTY_POSITIONAL_ARGS,
       named: {
-        __ARGS__: new ConstReference(__ARGS__),
+        __ARGS__: createConstRef(__ARGS__, 'args'),
         type: args.named.get('type'),
       },
     };
@@ -68,15 +68,15 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     { ComponentClass, layout }: InternalDefinitionState,
     args: VMArguments,
     _dynamicScope: DynamicScope,
-    caller: PathReference
+    caller: Reference
   ): InputComponentState {
-    assert('caller must be const', caller.isConst());
+    assert('caller must be const', isConstRef(caller));
 
     let type = args.named.get('type');
 
     let instance = ComponentClass.create({
-      caller: caller.value(),
-      type: type.value(),
+      caller: valueForRef(caller),
+      type: valueForRef(type),
     });
 
     let state = { env, type, instance };
@@ -100,8 +100,8 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
     return 'input';
   }
 
-  getSelf({ instance }: InputComponentState): PathReference {
-    return new ComponentRootReference(instance);
+  getSelf({ instance }: InputComponentState): Reference {
+    return createConstRef(instance, 'this');
   }
 
   didRenderLayout(state: InputComponentState, bounds: Bounds): void {
@@ -111,7 +111,7 @@ export default class InputComponentManager extends InternalComponentManager<Inpu
   }
 
   update(state: InputComponentState): void {
-    set(state.instance, 'type', state.type.value());
+    set(state.instance, 'type', valueForRef(state.type));
 
     if (ENV._DEBUG_RENDER_TREE) {
       state.env.extra.debugRenderTree.update(state);
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index d46116380fa..39fd5282d85 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -10,7 +10,7 @@ import {
   VMArguments,
   WithJitDynamicLayout,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, PathReference } from '@glimmer/reference';
+import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { TemplateFactory } from '../..';
 import { EmberVMEnvironment } from '../environment';
@@ -20,9 +20,9 @@ import AbstractManager from './abstract';
 interface EngineState {
   engine: EngineInstance;
   controller: any;
-  self: ComponentRootReference<any>;
+  self: Reference;
   environment: EmberVMEnvironment;
-  modelRef?: PathReference<unknown>;
+  modelRef?: Reference;
 }
 
 interface EngineDefinitionState {
@@ -74,7 +74,7 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
     let applicationFactory = engine.factoryFor(`controller:application`);
     let controllerFactory = applicationFactory || generateControllerFactory(engine, 'application');
     let controller: any;
-    let self: ComponentRootReference<any>;
+    let self: Reference;
     let bucket: EngineState;
     let modelRef;
 
@@ -84,12 +84,12 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
 
     if (modelRef === undefined) {
       controller = controllerFactory.create();
-      self = new ComponentRootReference(controller);
+      self = createConstRef(controller, 'this');
       bucket = { engine, controller, self, environment };
     } else {
-      let model = modelRef.value();
+      let model = valueForRef(modelRef);
       controller = controllerFactory.create({ model });
-      self = new ComponentRootReference(controller);
+      self = createConstRef(controller, 'this');
       bucket = { engine, controller, self, modelRef, environment };
     }
 
@@ -124,7 +124,7 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
     return name;
   }
 
-  getSelf({ self }: EngineState): PathReference<unknown> {
+  getSelf({ self }: EngineState): Reference {
     return self;
   }
 
@@ -143,7 +143,7 @@ class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
     let { controller, environment, modelRef } = bucket;
 
     if (modelRef !== undefined) {
-      controller.set('model', modelRef!.value());
+      controller.set('model', valueForRef(modelRef!));
     }
 
     if (ENV._DEBUG_RENDER_TREE) {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 4a3e9df2385..54637bb6f95 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -15,7 +15,7 @@ import {
   WithDynamicTagName,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { ComponentRootReference, PathReference } from '@glimmer/reference';
+import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { EMPTY_ARGS, registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 
@@ -33,7 +33,7 @@ function instrumentationPayload(def: OutletDefinitionState) {
 }
 
 interface OutletInstanceState {
-  self: PathReference<any | undefined>;
+  self: Reference;
   environment: EmberVMEnvironment;
   outlet?: { name: string };
   engine?: { mountPoint: string };
@@ -41,7 +41,7 @@ interface OutletInstanceState {
 }
 
 export interface OutletDefinitionState {
-  ref: PathReference<OutletState | undefined>;
+  ref: Reference<OutletState | undefined>;
   name: string;
   outlet: string;
   template: OwnedTemplate;
@@ -72,13 +72,13 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
     args: VMArguments,
     dynamicScope: DynamicScope
   ): OutletInstanceState {
-    let parentStateRef = dynamicScope.outletState;
+    let parentStateRef = dynamicScope.get('outletState');
     let currentStateRef = definition.ref;
 
-    dynamicScope.outletState = currentStateRef;
+    dynamicScope.set('outletState', currentStateRef);
 
     let state: OutletInstanceState = {
-      self: new ComponentRootReference(definition.controller),
+      self: createConstRef(definition.controller, 'this'),
       environment,
       finalize: _instrumentStart('render.outlet', instrumentationPayload, definition),
     };
@@ -94,9 +94,9 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
         template: undefined,
       });
 
-      let parentState = parentStateRef.value();
+      let parentState = valueForRef(parentStateRef);
       let parentOwner = parentState && parentState.render && parentState.render.owner;
-      let currentOwner = currentStateRef.value()!.render!.owner;
+      let currentOwner = valueForRef(currentStateRef)!.render!.owner;
 
       if (parentOwner && parentOwner !== currentOwner) {
         let engine = currentOwner as EngineInstance;
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index ab818f9a9bb..cdd739ee936 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -7,7 +7,8 @@ import {
   VMArguments,
   WithJitStaticLayout,
 } from '@glimmer/interfaces';
-import { NULL_REFERENCE, registerDestructor } from '@glimmer/runtime';
+import { NULL_REFERENCE } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 5f9c564b1d7..5820c596b19 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -13,7 +13,7 @@ import {
 } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
+import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
 import { createTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
@@ -787,8 +787,8 @@ const Component = CoreView.extend(
       let args = this[ARGS];
       let reference = args !== undefined ? args[key] : undefined;
 
-      if (reference !== undefined && reference[UPDATE_REFERENCED_VALUE] !== undefined) {
-        reference[UPDATE_REFERENCED_VALUE](arguments.length === 2 ? value : get(this, key));
+      if (reference !== undefined && isUpdatableRef(reference)) {
+        updateRef(reference, arguments.length === 2 ? value : get(this, key));
       }
     },
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
index b9266bcea80..ad86606eb6e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
@@ -1,33 +1,23 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Helper, VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
 
 let helper: Helper;
 
 if (DEBUG) {
-  class ComponentAssertionReference implements PathReference<unknown> {
-    constructor(private component: PathReference<unknown>, private message: string) {}
+  helper = (args: VMArguments) => {
+    let inner = args.positional.at(0);
+    let messageRef = args.positional.at(1);
 
-    isConst() {
-      return this.component.isConst();
-    }
+    return createComputeRef(() => {
+      let value = valueForRef(inner);
 
-    value(): unknown {
-      let value = this.component.value();
-
-      assert(this.message, typeof value !== 'string');
+      assert(valueForRef(messageRef) as string, typeof value !== 'string');
 
       return value;
-    }
-
-    get(property: string): PathReference<unknown> {
-      return this.component.get(property);
-    }
-  }
-
-  helper = (args: VMArguments) =>
-    new ComponentAssertionReference(args.positional.at(0), args.positional.at(1).value() as string);
+    });
+  };
 } else {
   helper = (args: VMArguments) => args.positional.at(0);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
index e2ff86c76e1..111c8099a71 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -1,20 +1,16 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Helper, VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
 
 let helper: Helper;
 
 if (DEBUG) {
-  class InElementNullCheckReference implements PathReference {
-    constructor(private inner: PathReference) {}
+  helper = (args: VMArguments) => {
+    let inner = args.positional.at(0);
 
-    isConst() {
-      return this.inner.isConst();
-    }
-
-    value(): unknown {
-      let value = this.inner.value();
+    return createComputeRef(() => {
+      let value = valueForRef(inner);
 
       assert(
         'You cannot pass a null or undefined destination element to in-element',
@@ -22,14 +18,8 @@ if (DEBUG) {
       );
 
       return value;
-    }
-
-    get(key: string): PathReference {
-      return this.inner.get(key);
-    }
-  }
-
-  helper = (args: VMArguments) => new InElementNullCheckReference(args.positional.at(0));
+    });
+  };
 } else {
   helper = (args: VMArguments) => args.positional.at(0);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 0e88034d6a7..241584ca94b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,21 +1,21 @@
 import { dasherize } from '@ember/string';
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
+import { VMArguments } from '@glimmer/interfaces';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
 
-function normalizeClass({ positional }: CapturedArguments) {
-  let classNameParts = (positional[0].value() as string).split('.');
-  let className = classNameParts[classNameParts.length - 1];
-  let value = positional[1].value();
+export default function(args: VMArguments) {
+  let positional = args.positional.capture();
 
-  if (value === true) {
-    return dasherize(className);
-  } else if (!value && value !== 0) {
-    return '';
-  } else {
-    return String(value);
-  }
-}
+  return createComputeRef(() => {
+    let classNameParts = (valueForRef(positional[0]) as string).split('.');
+    let className = classNameParts[classNameParts.length - 1];
+    let value = valueForRef(positional[1]);
 
-export default function(args: VMArguments) {
-  return new HelperRootReference(normalizeClass, args.capture());
+    if (value === true) {
+      return dasherize(className);
+    } else if (!value && value !== 0) {
+      return '';
+    } else {
+      return String(value);
+    }
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index 049d3d807f3..04c444ca6c1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -4,7 +4,7 @@
 import { tagForProperty } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
 
 /**
@@ -12,28 +12,16 @@ import { consumeTag } from '@glimmer/validator';
   updates to `{{each}}` when it changes. It is put into place by a template
   transform at build time, similar to the (-each-in) helper
 */
-class TrackArrayReference implements PathReference {
-  constructor(private inner: PathReference) {}
-
-  isConst() {
-    return this.inner.isConst();
-  }
+export default function trackArray(args: VMArguments) {
+  let inner = args.positional.at(0);
 
-  value(): unknown {
-    let iterable = this.inner.value();
+  return createComputeRef(() => {
+    let iterable = valueForRef(inner);
 
     if (isObject(iterable)) {
       consumeTag(tagForProperty(iterable, '[]'));
     }
 
     return iterable;
-  }
-
-  get(key: string): PathReference {
-    return this.inner.get(key);
-  }
-}
-
-export default function trackArray(args: VMArguments) {
-  return new TrackArrayReference(args.positional.at(0));
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 9e80d275fef..7b5576dc59b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -3,16 +3,22 @@
 */
 import { get } from '@ember/-internals/metal';
 import { symbol } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
-import { UnboundRootReference } from '../utils/references';
-import { INVOKE } from './mut';
-
-export const ACTION = symbol('ACTION');
+import {
+  createUnboundRef,
+  isInvokableRef,
+  Reference,
+  updateRef,
+  valueForRef,
+} from '@glimmer/reference';
+import { _WeakSet } from '@glimmer/util';
+
+export const ACTIONS = new _WeakSet();
+export const INVOKE: unique symbol = symbol('INVOKE') as any;
 
 /**
   The `{{action}}` helper provides a way to pass triggers for behavior (usually
@@ -277,7 +283,7 @@ export const ACTION = symbol('ACTION');
   @for Ember.Templates.helpers
   @public
 */
-export default function(args: VMArguments): UnboundRootReference<Function> {
+export default function(args: VMArguments): Reference<Function> {
   let { named, positional } = args;
 
   let capturedArgs = positional.capture();
@@ -288,49 +294,51 @@ export default function(args: VMArguments): UnboundRootReference<Function> {
   // Anything else is an action argument.
   let [context, action, ...restArgs] = capturedArgs;
 
-  // TODO: Is there a better way of doing this?
-  let debugKey: string | undefined = (action as any).propertyKey;
+  let debugKey: string = action.debugLabel!;
 
   let target = named.has('target') ? named.get('target') : context;
   let processArgs = makeArgsProcessor(named.has('value') && named.get('value'), restArgs);
 
   let fn: Function;
 
-  if (typeof action[INVOKE] === 'function') {
-    fn = makeClosureAction(action, action, action[INVOKE], processArgs, debugKey);
+  if (isInvokableRef(action)) {
+    fn = makeClosureAction(action, action as MaybeActionHandler, invokeRef, processArgs, debugKey);
   } else {
-    fn = makeDynamicClosureAction(context.value(), target, action, processArgs, debugKey);
+    fn = makeDynamicClosureAction(
+      valueForRef(context) as object,
+      target,
+      action,
+      processArgs,
+      debugKey
+    );
   }
 
-  fn[ACTION] = true;
+  ACTIONS.add(fn);
 
-  return new UnboundRootReference(fn);
+  return createUnboundRef(fn, '(result of an `action` helper)');
 }
 
-function NOOP(args: VMArguments) {
+function NOOP(args: unknown[]) {
   return args;
 }
 
-function makeArgsProcessor(
-  valuePathRef: PathReference<unknown> | false,
-  actionArgsRef: Array<PathReference<unknown>>
-) {
-  let mergeArgs: any;
+function makeArgsProcessor(valuePathRef: Reference | false, actionArgsRef: Reference[]) {
+  let mergeArgs: ((args: unknown[]) => unknown[]) | undefined;
 
   if (actionArgsRef.length > 0) {
-    mergeArgs = (args: VMArguments) => {
-      return actionArgsRef.map(ref => ref.value()).concat(args);
+    mergeArgs = (args: unknown[]) => {
+      return actionArgsRef.map(valueForRef).concat(args);
     };
   }
 
-  let readValue: any;
+  let readValue: ((args: unknown[]) => unknown[]) | undefined;
 
   if (valuePathRef) {
-    readValue = (args: any) => {
-      let valuePath = valuePathRef.value();
+    readValue = (args: unknown[]) => {
+      let valuePath = valueForRef(valuePathRef);
 
       if (valuePath && args.length > 0) {
-        args[0] = get(args[0], valuePath as string);
+        args[0] = get(args[0] as object, valuePath as string);
       }
 
       return args;
@@ -338,8 +346,8 @@ function makeArgsProcessor(
   }
 
   if (mergeArgs && readValue) {
-    return (args: VMArguments) => {
-      return readValue(mergeArgs(args));
+    return (args: unknown[]) => {
+      return readValue!(mergeArgs!(args));
     };
   } else {
     return mergeArgs || readValue || NOOP;
@@ -347,33 +355,51 @@ function makeArgsProcessor(
 }
 
 function makeDynamicClosureAction(
-  context: any,
-  targetRef: any,
-  actionRef: any,
-  processArgs: any,
-  debugKey: any
+  context: object,
+  targetRef: Reference<MaybeActionHandler>,
+  actionRef: Reference<string | Function | Invokable>,
+  processArgs: (args: unknown[]) => unknown[],
+  debugKey: string
 ) {
   // We don't allow undefined/null values, so this creates a throw-away action to trigger the assertions
   if (DEBUG) {
-    makeClosureAction(context, targetRef.value(), actionRef.value(), processArgs, debugKey);
+    makeClosureAction(
+      context,
+      valueForRef(targetRef),
+      valueForRef(actionRef),
+      processArgs,
+      debugKey
+    );
   }
 
   return (...args: any[]) => {
-    return makeClosureAction(context, targetRef.value(), actionRef.value(), processArgs, debugKey)(
-      ...args
-    );
+    return makeClosureAction(
+      context,
+      valueForRef(targetRef),
+      valueForRef(actionRef),
+      processArgs,
+      debugKey
+    )(...args);
   };
 }
 
+interface MaybeActionHandler {
+  actions?: Record<string, Function>;
+}
+
+interface Invokable {
+  [INVOKE]: Function;
+}
+
 function makeClosureAction(
-  context: any,
-  target: any,
-  action: any,
-  processArgs: any,
-  debugKey: any
+  context: object,
+  target: MaybeActionHandler,
+  action: string | Function | Invokable,
+  processArgs: (args: unknown[]) => unknown[],
+  debugKey: string
 ) {
-  let self: any;
-  let fn: any;
+  let self: object;
+  let fn: Function;
 
   assert(
     `Action passed is null or undefined in (action) from ${target}.`,
@@ -381,19 +407,30 @@ function makeClosureAction(
   );
 
   if (typeof action[INVOKE] === 'function') {
-    self = action;
+    deprecate(
+      `Usage of the private INVOKE API to make an object callable via action or fn is no longer supported. Please update to pass in a callback function instead. Received: ${String(
+        action
+      )}`,
+      false,
+      {
+        until: '3.25.0',
+        id: 'actions.custom-invoke-invokable',
+      }
+    );
+
+    self = action as Invokable;
     fn = action[INVOKE];
   } else {
     let typeofAction = typeof action;
 
     if (typeofAction === 'string') {
       self = target;
-      fn = target.actions && target.actions[action];
+      fn = target.actions! && target.actions![action as string];
 
-      assert(`An action named '${action}' was not found in ${target}`, fn);
+      assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
     } else if (typeofAction === 'function') {
       self = context;
-      fn = action;
+      fn = action as Function;
     } else {
       // tslint:disable-next-line:max-line-length
       assert(
@@ -412,3 +449,16 @@ function makeClosureAction(
     });
   };
 }
+
+// The code above:
+
+// 1. Finds an action function, usually on the `actions` hash
+// 2. Calls it with the target as the correct `this` context
+
+// Previously, `UPDATE_REFERENCED_VALUE` was a method on the reference itself,
+// so this made a bit more sense. Now, it isn't, and so we need to create a
+// function that can have `this` bound to it when called. This allows us to use
+// the same codepath to call `updateRef` on the reference.
+function invokeRef(this: Reference, value: unknown) {
+  updateRef(this, value);
+}
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index 2aa151b726b..efb16e60a4a 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -1,6 +1,6 @@
 import { VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
-import { ReifyPositionalReference } from '@glimmer/runtime';
+import { createComputeRef, Reference } from '@glimmer/reference';
+import { reifyPositional } from '@glimmer/runtime';
 
 /**
 @module ember
@@ -42,6 +42,8 @@ import { ReifyPositionalReference } from '@glimmer/runtime';
    @public
  */
 
-export default function(args: VMArguments): PathReference {
-  return new ReifyPositionalReference(args.positional.capture());
+export default function(args: VMArguments): Reference<unknown[]> {
+  let captured = args.positional.capture();
+
+  return createComputeRef(() => reifyPositional(captured), null, 'array');
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index c0addf0fdd2..7f1a8f6a824 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -1,5 +1,5 @@
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
+import { VMArguments } from '@glimmer/interfaces';
+import { createComputeRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 
 const isEmpty = (value: any): boolean => {
@@ -39,12 +39,15 @@ const normalizeTextValue = (value: any): string => {
   @for Ember.Templates.helpers
   @since 1.13.0
 */
-function concat({ positional }: CapturedArguments) {
-  return reifyPositional(positional)
-    .map(normalizeTextValue)
-    .join('');
-}
-
 export default function(args: VMArguments) {
-  return new HelperRootReference(concat, args.capture());
+  let captured = args.positional.capture();
+
+  return createComputeRef(
+    () =>
+      reifyPositional(captured)
+        .map(normalizeTextValue)
+        .join(''),
+    null,
+    'concat'
+  );
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 46457caeac6..a3a3be8e257 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -5,7 +5,7 @@ import { tagForObject } from '@ember/-internals/metal';
 import { _contentFor } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
 
 /**
@@ -154,15 +154,15 @@ import { consumeTag } from '@glimmer/validator';
   @public
   @since 2.1.0
 */
-class EachInReference implements PathReference {
-  constructor(private inner: PathReference) {}
+export class EachInWrapper {
+  constructor(public inner: unknown) {}
+}
 
-  isConst() {
-    return this.inner.isConst();
-  }
+export default function(args: VMArguments) {
+  let inner = args.positional.at(0);
 
-  value(): unknown {
-    let iterable = this.inner.value();
+  return createComputeRef(() => {
+    let iterable = valueForRef(inner);
 
     consumeTag(tagForObject(iterable));
 
@@ -173,17 +173,5 @@ class EachInReference implements PathReference {
     }
 
     return new EachInWrapper(iterable);
-  }
-
-  get(key: string): PathReference {
-    return this.inner.get(key);
-  }
-}
-
-export class EachInWrapper {
-  constructor(public inner: unknown) {}
-}
-
-export default function(args: VMArguments) {
-  return new EachInReference(args.positional.at(0));
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 6dc05818ff3..1b54e33dea5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -1,10 +1,9 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
+import { VMArguments } from '@glimmer/interfaces';
+import { createComputeRef, isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 import buildUntouchableThis from '../utils/untouchable-this';
-import { INVOKE } from './mut';
 
 const context = buildUntouchableThis('`fn` helper');
 
@@ -80,38 +79,41 @@ const context = buildUntouchableThis('`fn` helper');
   @since 3.11.0
 */
 
-function fn({ positional }: CapturedArguments) {
-  let callbackRef = positional[0];
-
-  assert(
-    `You must pass a function as the \`fn\` helpers first argument.`,
-    callbackRef !== undefined
-  );
-
-  if (DEBUG && typeof callbackRef[INVOKE] !== 'function') {
-    let callback = callbackRef.value();
-
-    assert(
-      `You must pass a function as the \`fn\` helpers first argument, you passed ${
-        callback === null ? 'null' : typeof callback
-      }. While rendering:\n\n${callbackRef.debugLabel}`,
-      typeof callback === 'function'
-    );
-  }
-
-  return (...invocationArgs: unknown[]) => {
-    let [fn, ...args] = reifyPositional(positional);
-
-    if (typeof callbackRef[INVOKE] === 'function') {
-      // references with the INVOKE symbol expect the function behind
-      // the symbol to be bound to the reference
-      return callbackRef[INVOKE](...args, ...invocationArgs);
-    } else {
-      return (fn as Function).call(context, ...args, ...invocationArgs);
-    }
-  };
-}
-
 export default function(args: VMArguments) {
-  return new HelperRootReference(fn, args.capture());
+  let positional = args.positional.capture();
+
+  return createComputeRef(
+    () => {
+      let callbackRef = positional[0];
+
+      assert(
+        `You must pass a function as the \`fn\` helpers first argument.`,
+        callbackRef !== undefined
+      );
+
+      if (DEBUG && !isInvokableRef(callbackRef)) {
+        let callback = valueForRef(callbackRef);
+
+        assert(
+          `You must pass a function as the \`fn\` helpers first argument, you passed ${
+            callback === null ? 'null' : typeof callback
+          }. While rendering:\n\n${callbackRef.debugLabel}`,
+          typeof callback === 'function'
+        );
+      }
+
+      return (...invocationArgs: unknown[]) => {
+        let [fn, ...args] = reifyPositional(positional);
+
+        if (isInvokableRef(callbackRef)) {
+          let value = args[0] || invocationArgs[0];
+          return updateRef(callbackRef, value);
+        } else {
+          return (fn as Function).call(context, ...args, ...invocationArgs);
+        }
+      };
+    },
+    null,
+    'fn'
+  );
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 0a0bba94436..75426c6808f 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -1,9 +1,14 @@
-import { get as emberGet, set as emberSet } from '@ember/-internals/metal';
+import { get, set } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference, PathReference, UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
-import { NULL_REFERENCE } from '@glimmer/runtime';
-import { referenceFromParts } from '../utils/references';
+import { VMArguments } from '@glimmer/interfaces';
+import {
+  childRefFor,
+  childRefFromParts,
+  createComputeRef,
+  isConstRef,
+  NULL_REFERENCE,
+  valueForRef,
+} from '@glimmer/reference';
 
 /**
 @module ember
@@ -90,55 +95,39 @@ import { referenceFromParts } from '../utils/references';
   @since 2.1.0
  */
 export default function(args: VMArguments) {
-  let sourceReference = args.positional.at(0);
-  let pathReference = args.positional.at(1);
+  let sourceRef = args.positional.at(0);
+  let pathRef = args.positional.at(1);
 
-  let path = pathReference.value();
-
-  if (pathReference.isConst()) {
+  if (isConstRef(pathRef)) {
     // Since the path is constant, we can create a normal chain of property
     // references. The source reference will update like normal, and all of the
     // child references will update accordingly.
+    let path = valueForRef(pathRef);
 
     if (path === undefined || path === null || path === '') {
       return NULL_REFERENCE;
     } else if (typeof path === 'string' && path.indexOf('.') > -1) {
-      return referenceFromParts(sourceReference, path.split('.'));
+      return childRefFromParts(sourceRef, path.split('.'));
     } else {
-      return sourceReference.get(String(path));
+      return childRefFor(sourceRef, String(path));
     }
   } else {
-    return new GetHelperRootReference(args.capture());
-  }
-}
-
-function get({ positional }: CapturedArguments) {
-  let source = positional[0].value();
-
-  if (isObject(source)) {
-    let path = positional[1].value();
-
-    return emberGet(source, String(path));
-  }
-}
-
-class GetHelperRootReference extends HelperRootReference {
-  private sourceReference: PathReference<object>;
-  private pathReference: PathReference<string>;
-
-  constructor(args: CapturedArguments) {
-    super(get, args);
-    this.sourceReference = args.positional[0] as PathReference<object>;
-    this.pathReference = args.positional[1] as PathReference<string>;
-  }
-
-  [UPDATE_REFERENCED_VALUE](value: any) {
-    let source = this.sourceReference.value();
-
-    if (isObject(source)) {
-      let path = String(this.pathReference.value());
-
-      emberSet(source, path, value);
-    }
+    return createComputeRef(
+      () => {
+        let source = valueForRef(sourceRef);
+
+        if (isObject(source)) {
+          return get(source, String(valueForRef(pathRef)));
+        }
+      },
+      value => {
+        let source = valueForRef(sourceRef);
+
+        if (isObject(source)) {
+          return set(source, String(valueForRef(pathRef)), value);
+        }
+      },
+      'get'
+    );
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
index a78485bd557..f8dcb357ca1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
@@ -1,6 +1,6 @@
-import { VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
-import { ReifyNamedReference } from '@glimmer/runtime';
+import { Dict, VMArguments } from '@glimmer/interfaces';
+import { createComputeRef, Reference } from '@glimmer/reference';
+import { reifyNamed } from '@glimmer/runtime';
 
 /**
 @module ember
@@ -44,7 +44,8 @@ import { ReifyNamedReference } from '@glimmer/runtime';
    @since 2.3.0
    @public
  */
+export default function(args: VMArguments): Reference<Dict<unknown>> {
+  let positional = args.named.capture();
 
-export default function(args: VMArguments): PathReference {
-  return new ReifyNamedReference(args.named.capture());
+  return createComputeRef(() => reifyNamed(positional), null, 'hash');
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
index 4b90a82b045..70ddb97980a 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
@@ -3,39 +3,9 @@
 */
 
 import { assert } from '@ember/debug';
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
-import toBool from '../utils/to-bool';
-
-function ifHelper({ positional }: CapturedArguments) {
-  assert(
-    'The inline form of the `if` helper expects two or three arguments, e.g. `{{if trialExpired "Expired" expiryDate}}`.',
-    positional.length === 3 || positional.length === 2
-  );
-
-  let [condition, truthyValue, falsyValue] = positional;
-
-  if (toBool(condition.value()) === true) {
-    return truthyValue.value();
-  } else {
-    return falsyValue !== undefined ? falsyValue.value() : undefined;
-  }
-}
-
-function unless({ positional }: CapturedArguments) {
-  assert(
-    'The inline form of the `unless` helper expects two or three arguments, e.g. `{{unless isFirstLogin "Welcome back!"}}`.',
-    positional.length === 3 || positional.length === 2
-  );
-
-  let [condition, falsyValue, truthyValue] = positional;
-
-  if (toBool(condition.value()) === true) {
-    return truthyValue !== undefined ? truthyValue.value() : undefined;
-  } else {
-    return falsyValue.value();
-  }
-}
+import { toBool } from '@glimmer/global-context';
+import { VMArguments } from '@glimmer/interfaces';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
 
 /**
   The `if` helper allows you to conditionally render one of two branches,
@@ -129,7 +99,26 @@ function unless({ positional }: CapturedArguments) {
   @public
 */
 export function inlineIf(args: VMArguments) {
-  return new HelperRootReference(ifHelper, args.capture());
+  let positional = args.positional.capture();
+
+  return createComputeRef(
+    () => {
+      assert(
+        'The inline form of the `if` helper expects two or three arguments, e.g. `{{if trialExpired "Expired" expiryDate}}`.',
+        positional.length === 3 || positional.length === 2
+      );
+
+      let [condition, truthyValue, falsyValue] = positional;
+
+      if (toBool(valueForRef(condition)) === true) {
+        return valueForRef(truthyValue);
+      } else {
+        return falsyValue !== undefined ? valueForRef(falsyValue) : undefined;
+      }
+    },
+    null,
+    'if'
+  );
 }
 
 /**
@@ -218,5 +207,24 @@ export function inlineIf(args: VMArguments) {
   @public
 */
 export function inlineUnless(args: VMArguments) {
-  return new HelperRootReference(unless, args.capture());
+  let positional = args.positional.capture();
+
+  return createComputeRef(
+    () => {
+      assert(
+        'The inline form of the `unless` helper expects two or three arguments, e.g. `{{unless isFirstLogin "Welcome back!"}}`.',
+        positional.length === 3 || positional.length === 2
+      );
+
+      let [condition, falsyValue, truthyValue] = positional;
+
+      if (toBool(valueForRef(condition)) === true) {
+        return truthyValue !== undefined ? valueForRef(truthyValue) : undefined;
+      } else {
+        return valueForRef(falsyValue);
+      }
+    },
+    null,
+    'unless'
+  );
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
index 24d67d6e4a3..ea3f7c4584b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
@@ -1,6 +1,7 @@
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
+import { VMArguments } from '@glimmer/interfaces';
+import { createComputeRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
+
 /**
 @module ember
 */
@@ -18,12 +19,12 @@ import { reifyPositional } from '@glimmer/runtime';
   @param {Array} params
   @public
 */
-function log({ positional }: CapturedArguments) {
-  /* eslint-disable no-console */
-  console.log(...reifyPositional(positional));
-  /* eslint-enable no-console */
-}
-
 export default function(args: VMArguments) {
-  return new HelperRootReference(log, args.capture());
+  let positional = args.positional.capture();
+
+  return createComputeRef(() => {
+    /* eslint-disable no-console */
+    console.log(...reifyPositional(positional));
+    /* eslint-enable no-console */
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index ae0c36eb70b..20dbeacc4b3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -1,10 +1,9 @@
 /**
 @module ember
 */
-import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { VMArguments } from '@glimmer/interfaces';
-import { PathReference, UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
+import { createInvokableRef, isUpdatableRef } from '@glimmer/reference';
 
 /**
   The `mut` helper lets you __clearly specify__ that a child `Component` can update the
@@ -79,47 +78,9 @@ import { PathReference, UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
   @for Ember.Templates.helpers
   @public
 */
-export const INVOKE: unique symbol = symbol('INVOKE') as any;
-const SOURCE: unique symbol = symbol('SOURCE') as any;
-
-class MutReference implements PathReference {
-  public [SOURCE]: PathReference;
-
-  constructor(protected inner: PathReference) {
-    this[SOURCE] = inner;
-  }
-
-  value() {
-    return this.inner.value();
-  }
-
-  isConst() {
-    return this.inner.isConst();
-  }
-
-  get(key: string): PathReference {
-    return this.inner.get(key);
-  }
-
-  [UPDATE_REFERENCED_VALUE](value: unknown) {
-    return this.inner[UPDATE_REFERENCED_VALUE](value);
-  }
-
-  [INVOKE](value: unknown) {
-    return this.inner[UPDATE_REFERENCED_VALUE](value);
-  }
-}
-
-export function unMut(ref: PathReference) {
-  return ref[SOURCE] || ref;
-}
 
 export default function(args: VMArguments) {
-  let rawRef = args.positional.at(0);
-
-  if (typeof rawRef[INVOKE] === 'function') {
-    return rawRef;
-  }
+  let ref = args.positional.at(0);
 
   // TODO: Improve this error message. This covers at least two distinct
   // cases:
@@ -133,7 +94,7 @@ export default function(args: VMArguments) {
   //
   // This message is alright for the first case, but could be quite
   // confusing for the second case.
-  assert('You can only pass a path to mut', rawRef[UPDATE_REFERENCED_VALUE] !== undefined);
+  assert('You can only pass a path to mut', isUpdatableRef(ref));
 
-  return new MutReference(rawRef);
+  return createInvokableRef(ref);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index dc753f1870e..6e551f45ff7 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -4,8 +4,8 @@
 import { QueryParams } from '@ember/-internals/routing';
 import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
-import { CapturedArguments, VMArguments } from '@glimmer/interfaces';
-import { HelperRootReference } from '@glimmer/reference';
+import { VMArguments } from '@glimmer/interfaces';
+import { createComputeRef } from '@glimmer/reference';
 import { reifyNamed } from '@glimmer/runtime';
 
 /**
@@ -29,16 +29,15 @@ import { reifyNamed } from '@glimmer/runtime';
   @return {Object} A `QueryParams` object for `{{link-to}}`
   @public
 */
-function queryParams({ positional, named }: CapturedArguments) {
-  // tslint:disable-next-line:max-line-length
-  assert(
-    "The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='foo') as opposed to just (query-params 'foo')",
-    positional.length === 0
-  );
+export default function(args: VMArguments) {
+  let { positional, named } = args.capture();
 
-  return new QueryParams(assign({}, reifyNamed(named) as any));
-}
+  return createComputeRef(() => {
+    assert(
+      "The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='foo') as opposed to just (query-params 'foo')",
+      positional.length === 0
+    );
 
-export default function(args: VMArguments) {
-  return new HelperRootReference(queryParams, args.capture());
+    return new QueryParams(assign({}, reifyNamed(named) as any));
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index 55080aff795..86c78a4c06d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -2,8 +2,7 @@
 @module ember
 */
 import { VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
-import { INVOKE, unMut } from './mut';
+import { createReadOnlyRef } from '@glimmer/reference';
 
 /**
   The `readonly` helper let's you specify that a binding is one-way only,
@@ -120,28 +119,6 @@ import { INVOKE, unMut } from './mut';
   @for Ember.Templates.helpers
   @private
 */
-class ReadonlyReference implements PathReference {
-  constructor(protected inner: PathReference) {}
-
-  get [INVOKE](): Function | undefined {
-    return this.inner[INVOKE];
-  }
-
-  isConst() {
-    return this.inner.isConst();
-  }
-
-  value(): unknown {
-    return this.inner.value();
-  }
-
-  get(key: string): PathReference {
-    return this.inner.get(key);
-  }
-}
-
 export default function(args: VMArguments) {
-  let ref = unMut(args.positional.at(0));
-
-  return new ReadonlyReference(ref);
+  return createReadOnlyRef(args.positional.at(0));
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index 04f764cf62b..f0926187f59 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -4,7 +4,7 @@
 
 import { assert } from '@ember/debug';
 import { VMArguments } from '@glimmer/interfaces';
-import { UnboundRootReference } from '../utils/references';
+import { createUnboundRef, valueForRef } from '@glimmer/reference';
 
 /**
   The `{{unbound}}` helper disconnects the one-way binding of a property,
@@ -40,5 +40,5 @@ export default function(args: VMArguments) {
     args.positional.length === 1 && args.named.length === 0
   );
 
-  return new UnboundRootReference(args.positional.at(0).value());
+  return createUnboundRef(valueForRef(args.positional.at(0)), '(resurt of an `unbound` helper)');
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index cbeac7814d7..571b4f94033 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -3,6 +3,7 @@ import { ActionManager, isSimpleClick } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
 import {
   CapturedNamedArguments,
   CapturedPositionalArguments,
@@ -10,10 +11,11 @@ import {
   ModifierManager,
   VMArguments,
 } from '@glimmer/interfaces';
+import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { createUpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
-import { INVOKE } from '../helpers/mut';
+import { INVOKE } from '../helpers/action';
 
 const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl'];
 const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
@@ -92,35 +94,35 @@ export class ActionState {
   }
 
   getEventName() {
-    let onRef = this.namedArgs.on;
+    let { on } = this.namedArgs;
 
-    return onRef !== undefined ? onRef.value() : 'click';
+    return on !== undefined ? valueForRef(on) : 'click';
   }
 
   getActionArgs() {
     let result = new Array(this.actionArgs.length);
 
     for (let i = 0; i < this.actionArgs.length; i++) {
-      result[i] = this.actionArgs[i].value();
+      result[i] = valueForRef(this.actionArgs[i]);
     }
 
     return result;
   }
 
-  getTarget() {
+  getTarget(): any {
     let { implicitTarget, namedArgs } = this;
     let { target } = namedArgs;
 
-    return target !== undefined ? target.value() : implicitTarget.value();
+    return target !== undefined ? valueForRef(target) : valueForRef(implicitTarget);
   }
 
   handler(event: Event): boolean {
     let { actionName, namedArgs } = this;
     let { bubbles, preventDefault, allowedKeys } = namedArgs;
 
-    let bubblesVal = bubbles !== undefined ? bubbles.value() : undefined;
-    let preventDefaultVal = preventDefault !== undefined ? preventDefault.value() : undefined;
-    let allowedKeysVal = allowedKeys !== undefined ? allowedKeys.value() : undefined;
+    let bubblesVal = bubbles !== undefined ? valueForRef(bubbles) : undefined;
+    let preventDefaultVal = preventDefault !== undefined ? valueForRef(preventDefault) : undefined;
+    let allowedKeysVal = allowedKeys !== undefined ? valueForRef(allowedKeys) : undefined;
 
     let target = this.getTarget();
 
@@ -146,11 +148,28 @@ export class ActionState {
         name: null,
       };
       if (typeof actionName[INVOKE] === 'function') {
+        deprecate(
+          `Usage of the private INVOKE API to make an object callable via action or fn is no longer supported. Please update to pass in a callback function instead. Received: ${String(
+            actionName
+          )}`,
+          false,
+          {
+            until: '3.25.0',
+            id: 'actions.custom-invoke-invokable',
+          }
+        );
+
         flaggedInstrument('interaction.ember-action', payload, () => {
           actionName[INVOKE].apply(actionName, args);
         });
         return;
       }
+      if (isInvokableRef(actionName)) {
+        flaggedInstrument('interaction.ember-action', payload, () => {
+          updateRef(actionName, args[0]);
+        });
+        return;
+      }
       if (typeof actionName === 'function') {
         flaggedInstrument('interaction.ember-action', payload, () => {
           actionName.apply(target, args);
@@ -228,23 +247,28 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
       implicitTarget = positional[0];
       actionNameRef = positional[1];
 
-      if (actionNameRef[INVOKE]) {
+      if (isInvokableRef(actionNameRef)) {
         actionName = actionNameRef;
       } else {
-        let actionLabel = actionNameRef.propertyKey;
-        actionName = actionNameRef.value();
-
-        assert(
-          'You specified a quoteless path, `' +
-            actionLabel +
-            '`, to the ' +
-            '{{action}} helper which did not resolve to an action name (a ' +
-            'string). Perhaps you meant to use a quoted actionName? (e.g. ' +
-            '{{action "' +
-            actionLabel +
-            '"}}).',
-          typeof actionName === 'string' || typeof actionName === 'function'
-        );
+        actionName = valueForRef(actionNameRef);
+
+        if (DEBUG) {
+          let actionPath = actionNameRef.debugLabel;
+          let actionPathParts = actionPath.split('.');
+          let actionLabel = actionPathParts[actionPathParts.length - 1];
+
+          assert(
+            'You specified a quoteless path, `' +
+              actionPath +
+              '`, to the ' +
+              '{{action}} helper which did not resolve to an action name (a ' +
+              'string). Perhaps you meant to use a quoted actionName? (e.g. ' +
+              '{{action "' +
+              actionLabel +
+              '"}}).',
+            typeof actionName === 'string' || typeof actionName === 'function'
+          );
+        }
       }
     }
 
@@ -261,8 +285,8 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     let { positional } = actionState;
     let actionNameRef = positional[1];
 
-    if (!actionNameRef[INVOKE]) {
-      actionState.actionName = actionNameRef.value();
+    if (!isInvokableRef(actionNameRef)) {
+      actionState.actionName = valueForRef(actionNameRef);
     }
 
     actionState.eventName = actionState.getEventName();
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index b37d6ea72d3..2798d9c449d 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -2,6 +2,7 @@ import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
+import { valueForRef } from '@glimmer/reference';
 import { registerDestructor, reifyNamed } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
@@ -96,9 +97,9 @@ export class OnModifierState {
 
     assert(
       'You must pass a valid DOM event name as the first argument to the `on` modifier',
-      args.positional[0] !== undefined && typeof args.positional[0].value() === 'string'
+      args.positional[0] !== undefined && typeof valueForRef(args.positional[0]) === 'string'
     );
-    let eventName = args.positional[0].value() as string;
+    let eventName = valueForRef(args.positional[0]) as string;
     if (eventName !== this.eventName) {
       this.eventName = eventName;
       this.shouldUpdate = true;
@@ -112,7 +113,7 @@ export class OnModifierState {
         args.positional[1] !== undefined
       );
 
-      let value = userProvidedCallbackReference.value();
+      let value = valueForRef(userProvidedCallbackReference);
       assert(
         `You must pass a function as the second argument to the \`on\` modifier, you passed ${
           value === null ? 'null' : typeof value
@@ -121,7 +122,7 @@ export class OnModifierState {
       );
     }
 
-    let userProvidedCallback = userProvidedCallbackReference.value() as EventListener;
+    let userProvidedCallback = valueForRef(userProvidedCallbackReference) as EventListener;
     if (userProvidedCallback !== this.userProvidedCallback) {
       this.userProvidedCallback = userProvidedCallback;
       this.shouldUpdate = true;
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 2580c930f1a..2a8278d4822 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -15,7 +15,7 @@ import {
   SyntaxCompilationContext,
 } from '@glimmer/interfaces';
 import { JitContext } from '@glimmer/opcode-compiler';
-import { PathReference } from '@glimmer/reference';
+import { createConstRef, Reference, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
 import {
   clientBuilder,
   CurriedComponentDefinition,
@@ -27,7 +27,6 @@ import {
   JitRuntime,
   JitSyntaxCompilationContext,
   renderJitMain,
-  UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
 import { unwrapHandle, unwrapTemplate } from '@glimmer/util';
 import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
@@ -44,7 +43,6 @@ import { populateMacros } from './syntax';
 import { Factory as TemplateFactory, OwnedTemplate } from './template';
 import { Component } from './utils/curly-component-state-bucket';
 import { OutletState } from './utils/outlet';
-import { UnboundRootReference } from './utils/references';
 import OutletView from './views/outlet';
 
 export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder;
@@ -52,14 +50,14 @@ export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder;
 export class DynamicScope implements GlimmerDynamicScope {
   constructor(
     public view: Component | {} | null,
-    public outletState: PathReference<OutletState | undefined>
+    public outletState: Reference<OutletState | undefined>
   ) {}
 
   child() {
     return new DynamicScope(this.view, this.outletState);
   }
 
-  get(key: 'outletState'): PathReference<OutletState | undefined> {
+  get(key: 'outletState'): Reference<OutletState | undefined> {
     // tslint:disable-next-line:max-line-length
     assert(
       `Using \`-get-dynamic-scope\` is only supported for \`outletState\` (you used \`${key}\`).`,
@@ -68,7 +66,7 @@ export class DynamicScope implements GlimmerDynamicScope {
     return this.outletState;
   }
 
-  set(key: 'outletState', value: PathReference<OutletState | undefined>) {
+  set(key: 'outletState', value: Reference<OutletState | undefined>) {
     // tslint:disable-next-line:max-line-length
     assert(
       `Using \`-with-dynamic-scope\` is only supported for \`outletState\` (you used \`${key}\`).`,
@@ -90,12 +88,15 @@ class RootState {
     public runtime: JitRuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>,
     context: SyntaxCompilationContext,
     template: OwnedTemplate,
-    self: PathReference<unknown>,
+    self: Reference<unknown>,
     parentElement: SimpleElement,
     dynamicScope: DynamicScope,
     builder: IBuilder
   ) {
-    assert(`You cannot render \`${self.value()}\` without a template.`, template !== undefined);
+    assert(
+      `You cannot render \`${valueForRef(self)}\` without a template.`,
+      template !== undefined
+    );
 
     this.id = getViewId(root);
     this.result = undefined;
@@ -316,7 +317,7 @@ export abstract class Renderer {
     definition: CurriedComponentDefinition,
     target: SimpleElement
   ) {
-    let self = new UnboundRootReference(definition);
+    let self = createConstRef(definition, 'this');
     let dynamicScope = new DynamicScope(null, UNDEFINED_REFERENCE);
     let rootState = new RootState(
       root,
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 9438bf38400..6543232b2f1 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -55,7 +55,7 @@ import { Factory as TemplateFactory, OwnedTemplate } from './template';
 import { getComponentTemplate } from './utils/component-template';
 import { getModifierManager } from './utils/custom-modifier-manager';
 import { getManager } from './utils/managers';
-import { EmberHelperRootReference } from './utils/references';
+import { createHelperRef } from './utils/references';
 
 function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
@@ -440,7 +440,7 @@ export default class RuntimeResolver implements JitRuntimeResolver<OwnedTemplate
         helper.compute = helper.compute.bind(null);
       }
 
-      return new EmberHelperRootReference(helper, args.capture());
+      return createHelperRef(helper, args.capture());
     };
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 999d406fbb9..2d5f08c94f0 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -4,54 +4,16 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
-import { PathReference } from '@glimmer/reference';
+import { createComputeRef, Reference, valueForRef } from '@glimmer/reference';
 import {
   createCapturedArgs,
   CurriedComponentDefinition,
   curry,
   EMPTY_POSITIONAL,
-  UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
 import { MountDefinition } from '../component-managers/mount';
 import { EmberVMEnvironment } from '../environment';
 
-export function mountHelper(
-  args: VMArguments,
-  vm: VM
-): PathReference<CurriedComponentDefinition | null> {
-  let env = vm.env as EmberVMEnvironment;
-  let nameRef = args.positional.at(0);
-  let captured: Option<CapturedArguments> = null;
-
-  assert(
-    'You can only pass a single positional argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.',
-    args.positional.length === 1
-  );
-
-  if (DEBUG && args.named) {
-    let keys = args.named.names;
-    let extra = keys.filter(k => k !== 'model');
-
-    assert(
-      'You can only pass a `model` argument to the {{mount}} helper, ' +
-        'e.g. {{mount "profile-engine" model=this.profile}}. ' +
-        `You passed ${extra.join(',')}.`,
-      extra.length === 0
-    );
-  }
-
-  // TODO: the functionality to create a proper CapturedArgument should be
-  // exported by glimmer, or that it should provide an overload for `curry`
-  // that takes `PreparedArguments`
-  if (args.named.has('model')) {
-    assert('[BUG] this should already be checked by the macro', args.named.length === 1);
-
-    captured = createCapturedArgs(args.named.capture(), EMPTY_POSITIONAL);
-  }
-
-  return new DynamicEngineReference(nameRef, env, captured);
-}
-
 /**
   The `{{mount}}` helper lets you embed a routeless engine in a template.
   Mounting an engine will cause an instance to be booted and its `application`
@@ -92,28 +54,50 @@ export function mountHelper(
   @for Ember.Templates.helpers
   @public
 */
+export function mountHelper(
+  args: VMArguments,
+  vm: VM
+): Reference<CurriedComponentDefinition | null> {
+  let env = vm.env as EmberVMEnvironment;
+  let nameRef = args.positional.at(0) as Reference<Option<string>>;
+  let captured: Option<CapturedArguments> = null;
+
+  assert(
+    'You can only pass a single positional argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.',
+    args.positional.length === 1
+  );
+
+  if (DEBUG && args.named) {
+    let keys = args.named.names;
+    let extra = keys.filter(k => k !== 'model');
+
+    assert(
+      'You can only pass a `model` argument to the {{mount}} helper, ' +
+        'e.g. {{mount "profile-engine" model=this.profile}}. ' +
+        `You passed ${extra.join(',')}.`,
+      extra.length === 0
+    );
+  }
 
-class DynamicEngineReference implements PathReference<Option<CurriedComponentDefinition>> {
-  private _lastName: Option<string> = null;
-  private _lastDef: Option<CurriedComponentDefinition> = null;
+  // TODO: the functionality to create a proper CapturedArgument should be
+  // exported by glimmer, or that it should provide an overload for `curry`
+  // that takes `PreparedArguments`
+  if (args.named.has('model')) {
+    assert('[BUG] this should already be checked by the macro', args.named.length === 1);
 
-  constructor(
-    public nameRef: PathReference<any | undefined | null>,
-    public env: EmberVMEnvironment,
-    public args: Option<CapturedArguments>
-  ) {}
+    let named = args.named.capture();
 
-  isConst() {
-    return false;
+    captured = createCapturedArgs(named, EMPTY_POSITIONAL);
   }
 
-  value(): Option<CurriedComponentDefinition> {
-    let { env, nameRef, args } = this;
-    let name = nameRef.value();
+  let lastName: Option<string>, lastDef: Option<CurriedComponentDefinition>;
+
+  return createComputeRef(() => {
+    let name = valueForRef(nameRef);
 
     if (typeof name === 'string') {
-      if (this._lastName === name) {
-        return this._lastDef;
+      if (lastName === name) {
+        return lastDef;
       }
 
       assert(
@@ -125,22 +109,18 @@ class DynamicEngineReference implements PathReference<Option<CurriedComponentDef
         return null;
       }
 
-      this._lastName = name;
-      this._lastDef = curry(new MountDefinition(name), args);
+      lastName = name;
+      lastDef = curry(new MountDefinition(name), captured);
 
-      return this._lastDef;
+      return lastDef;
     } else {
       assert(
         `Invalid engine name '${name}' specified, engine name must be either a string, null or undefined.`,
         name === null || name === undefined
       );
-      this._lastDef = null;
-      this._lastName = null;
+      lastDef = null;
+      lastName = null;
       return null;
     }
-  }
-
-  get() {
-    return UNDEFINED_REFERENCE;
-  }
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 2f0f0691824..799ec366d71 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,18 +1,24 @@
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
-import { ConstReference, PathReference, Reference, RootReference } from '@glimmer/reference';
+import { Option, VM, VMArguments } from '@glimmer/interfaces';
+import {
+  childRefFromParts,
+  createComputeRef,
+  createDebugAliasRef,
+  createPrimitiveRef,
+  Reference,
+  valueForRef,
+} from '@glimmer/reference';
 import {
   createCapturedArgs,
   CurriedComponentDefinition,
   curry,
   EMPTY_POSITIONAL,
-  UNDEFINED_REFERENCE,
 } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
 import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
 import { DynamicScope } from '../renderer';
 import { isTemplateFactory } from '../template';
-import { OutletReference, OutletState } from '../utils/outlet';
+import { OutletState } from '../utils/outlet';
 
 /**
   The `{{outlet}}` helper lets you specify where a child route will render in
@@ -66,87 +72,48 @@ export function outletHelper(args: VMArguments, vm: VM) {
   let nameRef: Reference<string>;
 
   if (args.positional.length === 0) {
-    nameRef = new ConstReference('main');
+    nameRef = createPrimitiveRef('main');
   } else {
-    nameRef = args.positional.at<PathReference<string>>(0);
+    nameRef = args.positional.at(0);
   }
 
-  return new OutletComponentReference(new OutletReference(scope.outletState, nameRef));
-}
+  let outletRef = createComputeRef(() => {
+    let state = valueForRef(scope.get('outletState'));
+    let outlets = state !== undefined ? state.outlets : undefined;
 
-class OutletModelReference extends RootReference {
-  constructor(private parent: PathReference<OutletState | undefined>) {
-    super();
+    return outlets !== undefined ? outlets[valueForRef(nameRef)] : undefined;
+  });
 
-    if (DEBUG) {
-      this.debugLabel = '@model';
-    }
-  }
+  let lastState: Option<OutletDefinitionState> = null;
+  let definition: Option<CurriedComponentDefinition> = null;
 
-  isConst() {
-    return false;
-  }
+  return createComputeRef(() => {
+    let state = stateFor(outletRef);
 
-  compute(): unknown {
-    let state = this.parent.value();
+    if (!validate(state, lastState)) {
+      lastState = state;
 
-    if (state === undefined) {
-      return undefined;
-    }
+      if (state !== null) {
+        let named = dict<Reference>();
+        named.model = childRefFromParts(outletRef, ['render', 'model']);
 
-    let { render } = state;
+        if (DEBUG) {
+          named.model = createDebugAliasRef!('@model', named.model);
+        }
 
-    if (render === undefined) {
-      return undefined;
+        let args = createCapturedArgs(named, EMPTY_POSITIONAL);
+        definition = curry(new OutletComponentDefinition(state), args);
+      } else {
+        definition = null;
+      }
     }
 
-    return render.model as unknown;
-  }
-}
-
-class OutletComponentReference implements PathReference<CurriedComponentDefinition | null> {
-  private definition: Option<CurriedComponentDefinition> = null;
-  private lastState: Option<OutletDefinitionState> = null;
-
-  constructor(private outletRef: PathReference<OutletState | undefined>) {}
-
-  isConst() {
-    return false;
-  }
-
-  value(): CurriedComponentDefinition | null {
-    let state = stateFor(this.outletRef);
-    if (validate(state, this.lastState)) {
-      return this.definition;
-    }
-    this.lastState = state;
-
-    let definition = null;
-
-    if (state !== null) {
-      let args = makeArgs(this.outletRef);
-
-      definition = curry(new OutletComponentDefinition(state), args);
-    }
-
-    return (this.definition = definition);
-  }
-
-  get(_key: string) {
-    return UNDEFINED_REFERENCE;
-  }
-}
-
-function makeArgs(outletRef: PathReference<OutletState | undefined>): CapturedArguments {
-  let modelRef = new OutletModelReference(outletRef);
-  let named = dict<PathReference>();
-  named.model = modelRef;
-
-  return createCapturedArgs(named, EMPTY_POSITIONAL);
+    return definition;
+  });
 }
 
-function stateFor(ref: PathReference<OutletState | undefined>): OutletDefinitionState | null {
-  let outlet = ref.value();
+function stateFor(ref: Reference<OutletState | undefined>): OutletDefinitionState | null {
+  let outlet = valueForRef(ref);
   if (outlet === undefined) return null;
   let render = outlet.render;
   if (render === undefined) return null;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 2822d31bece..94d5bfed816 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -3,20 +3,21 @@ import { assert, deprecate } from '@ember/debug';
 import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
 import { dasherize } from '@ember/string';
 import { DEBUG } from '@glimmer/env';
-import { ElementOperations, Option } from '@glimmer/interfaces';
-import { CachedReference, PathReference, Reference, RootReference } from '@glimmer/reference';
-import { PrimitiveReference, UNDEFINED_REFERENCE } from '@glimmer/runtime';
+import { ElementOperations } from '@glimmer/interfaces';
+import {
+  childRefFor,
+  childRefFromParts,
+  createComputeRef,
+  createPrimitiveRef,
+  Reference,
+  UNDEFINED_REFERENCE,
+  valueForRef,
+} from '@glimmer/reference';
 import { logTrackingStack } from '@glimmer/validator';
-import { SimpleElement } from '@simple-dom/interface';
 import { Component } from './curly-component-state-bucket';
-import { referenceFromParts } from './references';
 import { htmlSafe, isHTMLSafe, SafeString } from './string';
 
-export function referenceForKey(rootRef: RootReference<Component>, key: string) {
-  return rootRef.get(key);
-}
-
-function referenceForParts(rootRef: RootReference<Component>, parts: string[]): Reference {
+function referenceForParts(rootRef: Reference<Component>, parts: string[]): Reference {
   let isAttrs = parts[0] === 'attrs';
 
   // TODO deprecate this
@@ -24,118 +25,84 @@ function referenceForParts(rootRef: RootReference<Component>, parts: string[]):
     parts.shift();
 
     if (parts.length === 1) {
-      return referenceForKey(rootRef, parts[0]);
+      return childRefFor(rootRef, parts[0]);
     }
   }
 
-  return referenceFromParts(rootRef, parts);
+  return childRefFromParts(rootRef, parts);
 }
 
-export const AttributeBinding = {
-  parse(microsyntax: string): [string, string, boolean] {
-    let colonIndex = microsyntax.indexOf(':');
+export function parseAttributeBinding(microsyntax: string): [string, string, boolean] {
+  let colonIndex = microsyntax.indexOf(':');
 
-    if (colonIndex === -1) {
-      assert(
-        'You cannot use class as an attributeBinding, use classNameBindings instead.',
-        microsyntax !== 'class'
-      );
-      return [microsyntax, microsyntax, true];
-    } else {
-      let prop = microsyntax.substring(0, colonIndex);
-      let attribute = microsyntax.substring(colonIndex + 1);
+  if (colonIndex === -1) {
+    assert(
+      'You cannot use class as an attributeBinding, use classNameBindings instead.',
+      microsyntax !== 'class'
+    );
+    return [microsyntax, microsyntax, true];
+  } else {
+    let prop = microsyntax.substring(0, colonIndex);
+    let attribute = microsyntax.substring(colonIndex + 1);
 
-      assert(
-        'You cannot use class as an attributeBinding, use classNameBindings instead.',
-        attribute !== 'class'
-      );
+    assert(
+      'You cannot use class as an attributeBinding, use classNameBindings instead.',
+      attribute !== 'class'
+    );
 
-      return [prop, attribute, false];
-    }
-  },
-
-  install(
-    component: Component,
-    rootRef: RootReference<Component>,
-    parsed: [string, string, boolean],
-    operations: ElementOperations
-  ) {
-    let [prop, attribute, isSimple] = parsed;
-
-    if (attribute === 'id') {
-      let elementId = get(component, prop);
-      if (elementId === undefined || elementId === null) {
-        elementId = component.elementId;
-      }
-      elementId = PrimitiveReference.create(elementId);
-      operations.setAttribute('id', elementId, true, null);
-      // operations.addStaticAttribute(element, 'id', elementId);
-      return;
+    return [prop, attribute, false];
+  }
+}
+
+export function installAttributeBinding(
+  component: Component,
+  rootRef: Reference<Component>,
+  parsed: [string, string, boolean],
+  operations: ElementOperations
+) {
+  let [prop, attribute, isSimple] = parsed;
+
+  if (attribute === 'id') {
+    let elementId = get(component, prop);
+    if (elementId === undefined || elementId === null) {
+      elementId = component.elementId;
     }
+    elementId = createPrimitiveRef(elementId);
+    operations.setAttribute('id', elementId, true, null);
+    return;
+  }
 
-    let isPath = prop.indexOf('.') > -1;
-    let reference = isPath
-      ? referenceForParts(rootRef, prop.split('.'))
-      : referenceForKey(rootRef, prop);
+  let isPath = prop.indexOf('.') > -1;
+  let reference = isPath ? referenceForParts(rootRef, prop.split('.')) : childRefFor(rootRef, prop);
 
-    assert(
-      `Illegal attributeBinding: '${prop}' is not a valid attribute name.`,
-      !(isSimple && isPath)
-    );
+  assert(
+    `Illegal attributeBinding: '${prop}' is not a valid attribute name.`,
+    !(isSimple && isPath)
+  );
 
-    if (
-      EMBER_COMPONENT_IS_VISIBLE &&
-      attribute === 'style' &&
-      StyleBindingReference !== undefined
-    ) {
-      reference = new StyleBindingReference(
-        rootRef,
-        reference,
-        referenceForKey(rootRef, 'isVisible')
-      );
-    }
+  if (EMBER_COMPONENT_IS_VISIBLE && attribute === 'style' && createStyleBindingRef !== undefined) {
+    reference = createStyleBindingRef(reference, childRefFor(rootRef, 'isVisible'));
+  }
 
-    operations.setAttribute(attribute, reference, false, null);
-    // operations.addDynamicAttribute(element, attribute, reference, false);
-  },
-};
+  operations.setAttribute(attribute, reference, false, null);
+}
 
 const DISPLAY_NONE = 'display: none;';
 const SAFE_DISPLAY_NONE = htmlSafe(DISPLAY_NONE);
 
-let StyleBindingReference:
+let createStyleBindingRef:
   | undefined
-  | {
-      new (
-        parent: PathReference<Component>,
-        inner: Reference<unknown>,
-        isVisible: Reference<unknown>
-      ): Reference<string | SafeString>;
-    };
+  | ((inner: Reference, isVisible: Reference) => Reference<string | SafeString>);
 
 export let installIsVisibleBinding:
   | undefined
-  | ((rootRef: RootReference<Component>, operations: ElementOperations) => void);
+  | ((rootRef: Reference<Component>, operations: ElementOperations) => void);
 
 if (EMBER_COMPONENT_IS_VISIBLE) {
-  StyleBindingReference = class extends CachedReference<string | SafeString> {
-    debugLabel?: string;
-
-    constructor(
-      parent: PathReference<Component>,
-      private inner: Reference<unknown>,
-      private isVisible: Reference<unknown>
-    ) {
-      super();
-
-      if (DEBUG) {
-        this.debugLabel = `${parent.debugLabel}.style`;
-      }
-    }
-
-    compute(): string | SafeString {
-      let value = this.inner.value();
-      let isVisible = this.isVisible.value();
+  createStyleBindingRef = (inner: Reference, isVisibleRef: Reference) => {
+    return createComputeRef(() => {
+      let value = valueForRef(inner);
+      let isVisible = valueForRef(isVisibleRef);
 
       if (DEBUG && isVisible !== undefined) {
         deprecate(
@@ -157,88 +124,68 @@ if (EMBER_COMPONENT_IS_VISIBLE) {
         let style = value + ' ' + DISPLAY_NONE;
         return isHTMLSafe(value) ? htmlSafe(style) : style;
       }
-    }
-
-    get() {
-      return UNDEFINED_REFERENCE;
-    }
+    });
   };
 
-  installIsVisibleBinding = (rootRef: RootReference<Component>, operations: ElementOperations) => {
+  installIsVisibleBinding = (rootRef: Reference<Component>, operations: ElementOperations) => {
     operations.setAttribute(
       'style',
-      new StyleBindingReference!(rootRef, UNDEFINED_REFERENCE, rootRef.get('isVisible')),
+      createStyleBindingRef!(UNDEFINED_REFERENCE, childRefFor(rootRef, 'isVisible')),
       false,
       null
     );
   };
 }
 
-export const ClassNameBinding = {
-  install(
-    _element: SimpleElement,
-    rootRef: RootReference<Component>,
-    microsyntax: string,
-    operations: ElementOperations
-  ) {
-    let [prop, truthy, falsy] = microsyntax.split(':');
-    let isStatic = prop === '';
-
-    if (isStatic) {
-      operations.setAttribute('class', PrimitiveReference.create(truthy), true, null);
-    } else {
-      let isPath = prop.indexOf('.') > -1;
-      let parts = isPath ? prop.split('.') : [];
-      let value = isPath ? referenceForParts(rootRef, parts) : referenceForKey(rootRef, prop);
-      let ref;
-
-      if (truthy === undefined) {
-        ref = new SimpleClassNameBindingReference(value, isPath ? parts[parts.length - 1] : prop);
-      } else {
-        ref = new ColonClassNameBindingReference(value, truthy, falsy);
-      }
+export function createClassNameBindingRef(
+  rootRef: Reference<Component>,
+  microsyntax: string,
+  operations: ElementOperations
+) {
+  let [prop, truthy, falsy] = microsyntax.split(':');
+  let isStatic = prop === '';
+
+  if (isStatic) {
+    operations.setAttribute('class', createPrimitiveRef(truthy), true, null);
+  } else {
+    let isPath = prop.indexOf('.') > -1;
+    let parts = isPath ? prop.split('.') : [];
+    let value = isPath ? referenceForParts(rootRef, parts) : childRefFor(rootRef, prop);
+    let ref;
 
-      operations.setAttribute('class', ref, false, null);
+    if (truthy === undefined) {
+      ref = createSimpleClassNameBindingRef(value, isPath ? parts[parts.length - 1] : prop);
+    } else {
+      ref = createColonClassNameBindingRef(value, truthy, falsy);
     }
-  },
-};
 
-export class SimpleClassNameBindingReference implements Reference<Option<string>> {
-  private dasherizedPath: Option<string> = null;
-
-  constructor(private inner: Reference<unknown | number>, private path: string) {}
-
-  isConst() {
-    return this.inner.isConst();
+    operations.setAttribute('class', ref, false, null);
   }
+}
 
-  value(): Option<string> {
-    let value = this.inner.value();
+export function createSimpleClassNameBindingRef(inner: Reference, path?: string) {
+  let dasherizedPath: string;
+
+  return createComputeRef(() => {
+    let value = valueForRef(inner);
 
     if (value === true) {
-      let { path, dasherizedPath } = this;
-      return dasherizedPath || (this.dasherizedPath = dasherize(path));
+      assert(
+        'You must pass a path when binding a to a class name using classNameBindings',
+        path !== undefined
+      );
+
+      return dasherizedPath || (dasherizedPath = dasherize(path!));
     } else if (value || value === 0) {
       return String(value);
     } else {
       return null;
     }
-  }
+  });
 }
 
-class ColonClassNameBindingReference implements Reference<Option<string>> {
-  constructor(
-    private inner: Reference<unknown>,
-    private truthy: Option<string> = null,
-    private falsy: Option<string> = null
-  ) {}
-
-  isConst() {
-    return this.inner.isConst();
-  }
-
-  value(): Option<string> {
-    let { inner, truthy, falsy } = this;
-    return inner.value() ? truthy : falsy;
-  }
+export function createColonClassNameBindingRef(inner: Reference, truthy: string, falsy: string) {
+  return createComputeRef(() => {
+    return valueForRef(inner) ? truthy : falsy;
+  });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 4246e9d7203..e5089080f0b 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,6 +1,6 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
-import { ComponentRootReference, Reference } from '@glimmer/reference';
+import { createConstRef, Reference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { Revision, Tag, valueForTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
@@ -40,8 +40,8 @@ function NOOP() {}
   @private
 */
 export default class ComponentStateBucket {
-  public classRef: Reference<unknown> | null = null;
-  public rootRef: ComponentRootReference<Component>;
+  public classRef: Reference | null = null;
+  public rootRef: Reference<Component>;
   public argsRevision: Revision;
 
   constructor(
@@ -54,7 +54,7 @@ export default class ComponentStateBucket {
   ) {
     this.classRef = null;
     this.argsRevision = args === null ? 0 : valueForTag(argsTag);
-    this.rootRef = new ComponentRootReference(component);
+    this.rootRef = createConstRef(component, 'this');
 
     registerDestructor(this, () => this.willDestroy(), true);
     registerDestructor(this, () => this.component.destroy());
diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
index 2d875581011..764398a819d 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
@@ -1,6 +1,4 @@
 import { Owner } from '@ember/-internals/owner';
-import { PathReference, Reference } from '@glimmer/reference';
-import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 import { Factory as TemplateFactory, OwnedTemplate } from '../template';
 
 export interface RenderState {
@@ -63,81 +61,3 @@ export interface OutletState {
    */
   wasUsed?: boolean;
 }
-
-/**
- * Represents the root outlet.
- */
-export class RootOutletReference implements PathReference<OutletState> {
-  private tag = createTag();
-
-  constructor(public outletState: OutletState) {}
-
-  get(key: string): PathReference {
-    return new OutletPathReference(this, key);
-  }
-
-  isConst() {
-    return false;
-  }
-
-  value(): OutletState {
-    consumeTag(this.tag);
-    return this.outletState;
-  }
-
-  update(state: OutletState) {
-    this.outletState.outlets.main = state;
-    dirtyTag(this.tag);
-  }
-}
-
-/**
- * Represents the connected outlet.
- */
-export class OutletReference implements PathReference<OutletState | undefined> {
-  constructor(
-    public parentStateRef: PathReference<OutletState | undefined>,
-    public outletNameRef: Reference<string>
-  ) {}
-
-  isConst() {
-    return false;
-  }
-
-  value(): OutletState | undefined {
-    let outletState = this.parentStateRef.value();
-    let outlets = outletState === undefined ? undefined : outletState.outlets;
-    return outlets === undefined ? undefined : outlets[this.outletNameRef.value()];
-  }
-
-  get(key: string): PathReference {
-    return new OutletPathReference(this, key);
-  }
-}
-
-/**
- * Outlet state is dirtied from root.
- * This just using the parent tag for dirtiness.
- */
-class OutletPathReference implements PathReference<unknown> {
-  public parent: PathReference<unknown>;
-  public key: string;
-
-  constructor(parent: PathReference<unknown>, key: string) {
-    this.parent = parent;
-    this.key = key;
-  }
-
-  isConst() {
-    return false;
-  }
-
-  get(key: string): PathReference<unknown> {
-    return new OutletPathReference(this, key);
-  }
-
-  value(): unknown {
-    let parent = this.parent.value();
-    return parent && (parent as object)[this.key];
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
index 453b3b901a7..a1d357e67ef 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
@@ -1,9 +1,9 @@
 import { symbol } from '@ember/-internals/utils';
 import { MUTABLE_CELL } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
-import { UPDATE_REFERENCED_VALUE } from '@glimmer/reference';
+import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { ARGS } from '../component';
-import { ACTION } from '../helpers/action';
+import { ACTIONS } from '../helpers/action';
 
 // ComponentArgs takes EvaluatedNamedArgs and converts them into the
 // inputs needed by CurlyComponents (attrs and props, with mutable
@@ -11,23 +11,21 @@ import { ACTION } from '../helpers/action';
 export function processComponentArgs(namedArgs: CapturedNamedArguments) {
   let attrs = Object.create(null);
   let props = Object.create(null);
-  let args = Object.create(null);
 
-  props[ARGS] = args;
+  props[ARGS] = namedArgs;
 
   for (let name in namedArgs) {
     let ref = namedArgs[name];
-    let value = ref.value();
+    let value = valueForRef(ref);
 
-    let isAction = typeof value === 'function' && value[ACTION];
+    let isAction = typeof value === 'function' && ACTIONS.has(value);
 
-    if (ref[UPDATE_REFERENCED_VALUE] && !isAction) {
+    if (isUpdatableRef(ref) && !isAction) {
       attrs[name] = new MutableCell(ref, value);
     } else {
       attrs[name] = value;
     }
 
-    args[name] = ref;
     props[name] = value;
   }
 
@@ -47,6 +45,6 @@ class MutableCell {
   }
 
   update(val: any) {
-    this[REF][UPDATE_REFERENCED_VALUE](val);
+    updateRef(this[REF], val);
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/utils/references.ts b/packages/@ember/-internals/glimmer/lib/utils/references.ts
index 621d85fb4ff..8a9a7400f96 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/references.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/references.ts
@@ -1,15 +1,18 @@
-import { getDebugName, isObject } from '@ember/-internals/utils';
+import { getDebugName } from '@ember/-internals/utils';
 import { debugFreeze } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments } from '@glimmer/interfaces';
-import { HelperRootReference, PathReference, RootReference } from '@glimmer/reference';
-import { PrimitiveReference, reifyArgs } from '@glimmer/runtime';
+import { createComputeRef, Reference } from '@glimmer/reference';
+import { reifyArgs } from '@glimmer/runtime';
 import { consumeTag, deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
 import { HelperInstance, isClassHelper, RECOMPUTE_TAG, SimpleHelper } from '../helper';
 
-export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T> {
-  constructor(helper: SimpleHelper<T> | HelperInstance<T>, args: CapturedArguments) {
-    let fnWrapper = (args: CapturedArguments) => {
+export function createHelperRef<T = unknown>(
+  helper: SimpleHelper<T> | HelperInstance<T>,
+  args: CapturedArguments
+): Reference<T> {
+  return createComputeRef(
+    () => {
       let { positional, named } = reifyArgs(args);
 
       let ret: T;
@@ -30,62 +33,8 @@ export class EmberHelperRootReference<T = unknown> extends HelperRootReference<T
       }
 
       return ret!;
-    };
-
-    if (DEBUG) {
-      let debugName = isClassHelper(helper) ? getDebugName!(helper) : getDebugName!(helper.compute);
-
-      super(fnWrapper, args, debugName);
-    } else {
-      super(fnWrapper, args);
-    }
-  }
-}
-
-export class UnboundRootReference<T = unknown> extends RootReference<T> {
-  constructor(private inner: T, parent?: PathReference, key?: string) {
-    super();
-
-    if (DEBUG) {
-      this.debugLabel = parent ? `${parent.debugLabel}.${key}` : `this`;
-    }
-  }
-
-  isConst() {
-    return true;
-  }
-
-  value() {
-    return this.inner;
-  }
-
-  compute() {
-    return this.inner;
-  }
-
-  get(key: string): PathReference<unknown> {
-    let value = this.value();
-
-    if (isObject(value)) {
-      // root of interop with ember objects
-      return new UnboundPropertyReference(value[key], this, key);
-    } else {
-      return PrimitiveReference.create(value as any);
-    }
-  }
-}
-
-export class UnboundPropertyReference extends UnboundRootReference {}
-
-export function referenceFromParts(
-  root: PathReference<unknown>,
-  parts: string[]
-): PathReference<unknown> {
-  let reference = root;
-
-  for (let i = 0; i < parts.length; i++) {
-    reference = reference.get(parts[i]);
-  }
-
-  return reference;
+    },
+    null,
+    DEBUG && (isClassHelper(helper) ? getDebugName!(helper) : getDebugName!(helper.compute))
+  );
 }
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 8be846a0647..11b1cc71c55 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,11 +1,13 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import { schedule } from '@ember/runloop';
+import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
+import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { OutletDefinitionState } from '../component-managers/outlet';
 import { Renderer } from '../renderer';
 import { OwnedTemplate } from '../template';
-import { OutletState, RootOutletReference } from '../utils/outlet';
+import { OutletState } from '../utils/outlet';
 
 export interface BootEnvironment {
   hasDOM: boolean;
@@ -40,7 +42,7 @@ export default class OutletView {
     return new OutletView(_environment, renderer, owner, template);
   }
 
-  public ref: RootOutletReference;
+  private ref: Reference;
   public state: OutletDefinitionState;
 
   constructor(
@@ -49,7 +51,8 @@ export default class OutletView {
     public owner: Owner,
     public template: OwnedTemplate
   ) {
-    let ref = (this.ref = new RootOutletReference({
+    let outletStateTag = createTag();
+    let outletState: OutletState = {
       outlets: { main: undefined },
       render: {
         owner: owner,
@@ -60,7 +63,19 @@ export default class OutletView {
         model: undefined,
         template,
       },
-    }));
+    };
+
+    let ref = (this.ref = createComputeRef(
+      () => {
+        consumeTag(outletStateTag);
+        return outletState;
+      },
+      (state: OutletState) => {
+        dirtyTag(outletStateTag);
+        outletState.outlets.main = state;
+      }
+    ));
+
     this.state = {
       ref,
       name: TOP_LEVEL_NAME,
@@ -88,7 +103,7 @@ export default class OutletView {
   }
 
   setOutletState(state: OutletState) {
-    this.ref.update(state);
+    updateRef(this.ref, state);
   }
 
   destroy() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 90bb9229520..2bff72911de 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -459,44 +459,6 @@ moduleFor(
       });
     }
 
-    ['@test should apply classes of the dasherized property name when bound property specified is true']() {
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar class=this.model.someTruth}}', {
-        model: { someTruth: true },
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view some-truth') },
-        content: 'hello',
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view some-truth') },
-        content: 'hello',
-      });
-
-      runTask(() => set(this.context, 'model.someTruth', false));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view') },
-        content: 'hello',
-      });
-
-      runTask(() => set(this.context, 'model', { someTruth: true }));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view some-truth') },
-        content: 'hello',
-      });
-    }
-
     ['@test class property on components can be dynamic']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index d8d37965479..fa1e09489ad 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -1039,51 +1039,54 @@ moduleFor(
       this.assert.ok(capturedRunLoop, 'action is called within a run loop');
     }
 
+    // TODO: This is for intimate APIs, specifically ember-concurrency
     ['@test objects that define INVOKE can be casted to actions']() {
-      let innerComponent;
-      let actionArgs;
-      let invokableArgs;
+      expectDeprecation(() => {
+        let innerComponent;
+        let actionArgs;
+        let invokableArgs;
 
-      let InnerComponent = Component.extend({
-        init() {
-          this._super(...arguments);
-          innerComponent = this;
-        },
-        fireAction() {
-          actionArgs = this.attrs.submit(4, 5, 6);
-        },
-      });
+        let InnerComponent = Component.extend({
+          init() {
+            this._super(...arguments);
+            innerComponent = this;
+          },
+          fireAction() {
+            actionArgs = this.attrs.submit(4, 5, 6);
+          },
+        });
 
-      let OuterComponent = Component.extend({
-        foo: 123,
-        submitTask: computed(function() {
-          return {
-            [INVOKE]: (...args) => {
-              invokableArgs = args;
-              return this.foo;
-            },
-          };
-        }),
-      });
+        let OuterComponent = Component.extend({
+          foo: 123,
+          submitTask: computed(function() {
+            return {
+              [INVOKE]: (...args) => {
+                invokableArgs = args;
+                return this.foo;
+              },
+            };
+          }),
+        });
 
-      this.registerComponent('inner-component', {
-        ComponentClass: InnerComponent,
-        template: 'inner',
-      });
+        this.registerComponent('inner-component', {
+          ComponentClass: InnerComponent,
+          template: 'inner',
+        });
 
-      this.registerComponent('outer-component', {
-        ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action submitTask 1 2 3)}}`,
-      });
+        this.registerComponent('outer-component', {
+          ComponentClass: OuterComponent,
+          template: `{{inner-component submit=(action submitTask 1 2 3)}}`,
+        });
 
-      this.render('{{outer-component}}');
+        this.render('{{outer-component}}');
 
-      runTask(() => {
-        innerComponent.fireAction();
-      });
+        runTask(() => {
+          innerComponent.fireAction();
+        });
 
-      this.assert.equal(actionArgs, 123);
-      this.assert.deepEqual(invokableArgs, [1, 2, 3, 4, 5, 6]);
+        this.assert.equal(actionArgs, 123);
+        this.assert.deepEqual(invokableArgs, [1, 2, 3, 4, 5, 6]);
+      }, /Usage of the private INVOKE API to make an object callable/);
     }
 
     ['@test closure action with `(mut undefinedThing)` works properly [GH#13959]']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 9917d1d6617..1acf236c473 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -1356,7 +1356,7 @@ moduleFor(
 
       expectAssertion(() => {
         this.render('{{example-component}}');
-      }, 'You specified a quoteless path, `ohNoeNotValid`, to the {{action}} helper ' + 'which did not resolve to an action name (a string). ' + 'Perhaps you meant to use a quoted actionName? (e.g. {{action "ohNoeNotValid"}}).');
+      }, 'You specified a quoteless path, `this.ohNoeNotValid`, to the {{action}} helper ' + 'which did not resolve to an action name (a string). ' + 'Perhaps you meant to use a quoted actionName? (e.g. {{action "ohNoeNotValid"}}).');
     }
 
     ['@test allows multiple actions on a single element']() {
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 62d2acd13d2..78fa8547cf2 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -1,6 +1,6 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
-import { _WeakSet as WeakSet } from '@ember/polyfills';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 
 export type DecoratorPropertyDescriptor = PropertyDescriptor & { initializer?: any } | undefined;
 
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 35966e3c931..1363a411fbb 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -13,8 +13,9 @@ import {
 } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import { ALIAS_METHOD } from '@ember/deprecated-features';
-import { _WeakSet, assign } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
+import { _WeakSet } from '@glimmer/util';
 import {
   ComputedDecorator,
   ComputedProperty,
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index a8f209d9153..cca01e80fba 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -4,7 +4,7 @@
 
 import { getFactoryFor, setFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
 import { getOwner, LEGACY_OWNER, OWNER } from '@ember/-internals/owner';
-import { assign, _WeakSet as WeakSet } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import {
   guidFor,
   getName,
@@ -30,6 +30,7 @@ import {
 import ActionHandler from '../mixins/action_handler';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/runtime';
 
 const reopen = Mixin.prototype.reopen;
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index 0d87933926d..b03bd695338 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -1,4 +1,4 @@
-import { _WeakSet as WeakSet } from '@ember/polyfills';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 const { toString: objectToString } = Object.prototype;
 const { toString: functionToString } = Function.prototype;
 const { isArray } = Array;
diff --git a/packages/@ember/-internals/utils/lib/is_proxy.ts b/packages/@ember/-internals/utils/lib/is_proxy.ts
index dc7934187a9..f01a84eda53 100644
--- a/packages/@ember/-internals/utils/lib/is_proxy.ts
+++ b/packages/@ember/-internals/utils/lib/is_proxy.ts
@@ -1,4 +1,4 @@
-import { _WeakSet as WeakSet } from '@ember/polyfills';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 import { isObject } from './spec';
 
 const PROXIES = new WeakSet();
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 6d11e4c2445..9adb5ad5827 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
-import { _WeakSet as WeakSet } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 import { Tag } from '@glimmer/validator';
 import lookupDescriptor from './lookup-descriptor';
 
diff --git a/packages/@ember/-internals/utils/lib/super.ts b/packages/@ember/-internals/utils/lib/super.ts
index 27314fe1c94..c2eb7ea75f3 100644
--- a/packages/@ember/-internals/utils/lib/super.ts
+++ b/packages/@ember/-internals/utils/lib/super.ts
@@ -1,4 +1,4 @@
-import { _WeakSet as WeakSet } from '@ember/polyfills';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 
 const HAS_SUPER_PATTERN = /\.(_super|call\(this|apply\(this)/;
 const fnToString = Function.prototype.toString;
diff --git a/packages/@ember/polyfills/index.ts b/packages/@ember/polyfills/index.ts
index fa4e9006fba..cb6526e1ed3 100644
--- a/packages/@ember/polyfills/index.ts
+++ b/packages/@ember/polyfills/index.ts
@@ -5,5 +5,4 @@ let merge = MERGE ? deprecatedMerge : undefined;
 
 // Export `assignPolyfill` for testing
 export { default as assign, assign as assignPolyfill } from './lib/assign';
-export { default as _WeakSet } from './lib/weak_set';
 export { merge };
diff --git a/packages/@ember/polyfills/lib/weak_set.ts b/packages/@ember/polyfills/lib/weak_set.ts
deleted file mode 100644
index 16c825318d3..00000000000
--- a/packages/@ember/polyfills/lib/weak_set.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/* globals WeakSet */
-
-export default (typeof WeakSet === 'function'
-  ? WeakSet
-  : class WeakSetPolyFill<T extends object> {
-      private _map = new WeakMap();
-
-      add(val: T): this {
-        this._map.set(val, true);
-        return this;
-      }
-
-      delete(val: T) {
-        return this._map.delete(val);
-      }
-
-      has(val: T) {
-        return this._map.has(val);
-      }
-    }) as WeakSetConstructor;
diff --git a/yarn.lock b/yarn.lock
index 24df10cb78c..3560d5c170f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,152 +913,152 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.59.0.tgz#96ceb23600aef2cb8ce0194fa527db991cf0ea00"
-  integrity sha512-8S3jHpQykERW9wmcpauqqwuA795telZZhgm8qagba2VqwXKGSTynv6SjXTcr3ZXUku/gejN/LFttn51Gb09a/Q==
-  dependencies:
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/syntax" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
-    "@glimmer/wire-format" "^0.59.0"
+"@glimmer/compiler@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.60.0.tgz#6b15916779711704596c7e5487cd0d2e986f745d"
+  integrity sha512-IemmKChNTljY1dtVEGhmeyKSeEfa/zQMZ0MFadwQYlJv5DphWhGaVXF6l3J2sPRJRGgpGQolJTy2YsSwHAX9mQ==
+  dependencies:
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/syntax" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
+    "@glimmer/wire-format" "^0.60.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.59.0.tgz#d28b7dfd583ea15c7466f64a4c1e2e66ad9e6df3"
-  integrity sha512-2jWNOMNgP7HBcuQ3TBF+WpbC5WPCo1mgpRJbGAku+th15CNiaTgzzgmi/Af9RhPwBKUuFXroTIrash9HEu+s2Q==
+"@glimmer/encoder@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.60.0.tgz#c77afeb6f6c562117424ca352c49d5637be818c6"
+  integrity sha512-HKmgUtgb8JXJdEKM1kehdi8xvNsJMwXP+QRaTfdbCapDQG+tiiZB7lqAYZvf+2Sdg8Rue3twROJvqgq4nmhVJA==
   dependencies:
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/vm" "^0.59.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/vm" "^0.60.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.59.0", "@glimmer/global-context@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.59.0.tgz#7ccf9c6689dd240a78fcd6b04fb2660cfdbaac97"
-  integrity sha512-D8toHmniE1ufbK+A/pizPtfN4BY5n+E9/8/feFTERQBN5Q0+MQUAYoWtx2yb3RYprukwbQ8k+doOIAoHiZQ88A==
+"@glimmer/global-context@0.60.0", "@glimmer/global-context@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.60.0.tgz#efec1899fd82d99fb58c3a8985e0d5c4e78a18eb"
+  integrity sha512-sKwcLY2S3yg792HMeUDlxdo8JdlGdnbsXW2UpnlDzDDW8mJ9KUaKbCXpQ5FWIhEjsu89ARqNC8qthOI5KuGcng==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.59.0.tgz#b94e099609ed83bad686bf4759b373caa1c19210"
-  integrity sha512-k1ax7bbIdbwpS77d1G0y+y2C6pL+u6l/AXYvJip+yHRe163c5os8jbE9pSzzmOsdpqeJoQe0XYodLpyBMJebog==
+"@glimmer/interfaces@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.60.0.tgz#cb2d28bb0441743b5b7b0b23b64e754fd4ca06ed"
+  integrity sha512-gEraOjACkSlgNr3GeH9GU370DLW+uwaxCStq6BGk0ShxkQI9BuhwWYC6gqsPkbiRI24L+UrpPo8qajFew/2Nrg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.59.0.tgz#59c55dfc143e7f888d614188c353d16f4253435b"
-  integrity sha512-RSdI5A3jKxX9xO7zpzwf5NI6rpoIl9yW+ByAz3htrhqYpLLEsFNMEZoqGlKF2V7p+u3PnUyRq1m6lRgVRHNY5Q==
+"@glimmer/low-level@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.60.0.tgz#1b6f6b14fff7d378bd109dfd4966075ad6d57eec"
+  integrity sha512-8+Y9UBkbkZX9XDwlSz+L+LJ2hfu2rR5a06kuzf1om3G0ghAoBbHKxepQEeer/OAzwQENFUL2+2teE3J9v7yh8A==
 
-"@glimmer/node@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.59.0.tgz#d545b5912ea93316e378ae00af4ecd42a7f6cb0c"
-  integrity sha512-1KIbRPwEJTeIdXktqnHAMVJru8dkyWi7BROTyqU2jwwVxK4zkgucYT30J3inVnghIs+nZB0BFmxdkv6uDvVVfQ==
+"@glimmer/node@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.60.0.tgz#bd25f717c85ac7c9dfce21ef793bf1fa34b1ccc1"
+  integrity sha512-qN29qSHYDKj1FidVh945xaKTEE/A1nU1DQ91/A+uHxPOlXe7dx+LPpyqzIeZPJitEWMqI6EMaqJWXhnN28UhLA==
   dependencies:
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/runtime" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/runtime" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.59.0.tgz#37fd670d29317a2ad6b4a2c8186b514f05c398ae"
-  integrity sha512-MP/FaQrya4aeNWZ40QzvjMr0hLfMIUThA6dOGk3yq5ls9wYg0AzmM/EOShR7tNkNmH/85rXzaUvQXVvKKcQacg==
-  dependencies:
-    "@glimmer/encoder" "^0.59.0"
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/program" "^0.59.0"
-    "@glimmer/reference" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
-    "@glimmer/vm" "^0.59.0"
-    "@glimmer/wire-format" "^0.59.0"
-
-"@glimmer/program@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.59.0.tgz#fd3a40c1786aae51cc9337d5c7d2cad42c3f5bdc"
-  integrity sha512-wD6sBFd4ilcYlSFz3JWihtWwXoJPyHeBNuqD9YdVd4s5yPUw1uFTI26zelWKfs0sMmMuG2FE4OD6Gsv5Nl4cew==
-  dependencies:
-    "@glimmer/encoder" "^0.59.0"
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
-
-"@glimmer/reference@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.59.0.tgz#50bc7a993b62276300fc732dd5ebdb27dcd4e589"
-  integrity sha512-uJbzdwi965KdflNuaD1snaH7y54v+LAbt/W2VUFue0ZSWoAhBLPrRP8XGO+gnXYSRDNkkoUnPwTsvEB9Pg4bRQ==
+"@glimmer/opcode-compiler@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.60.0.tgz#9fc0c9543baf7d7c2940db6a2d3138951a926a63"
+  integrity sha512-bSHS4VZmuTOFIegcJdB0ivSJ0f7WV0504bHcLBMtmhZDv6ItzMrrk1IuRxIUqRRZsdLEs6ucNL01myHfONa9Mg==
+  dependencies:
+    "@glimmer/encoder" "^0.60.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/program" "^0.60.0"
+    "@glimmer/reference" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
+    "@glimmer/vm" "^0.60.0"
+    "@glimmer/wire-format" "^0.60.0"
+
+"@glimmer/program@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.60.0.tgz#5d8fd62cdacef210a3bb458205d5e8ba33d3a1a2"
+  integrity sha512-nOVBfps0EBQcA2VhPPapDUg2Ndid21v7HNN+YYeaQV/3oTV+lkDoKRWNSWLnjPmCDXsdc2pQyx7PX16tm3uQmQ==
+  dependencies:
+    "@glimmer/encoder" "^0.60.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
+
+"@glimmer/reference@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.60.0.tgz#b986368b8b62dbafa76a9c4ba88943a94733bad3"
+  integrity sha512-fBv5/kZOS+WbNEbLAl2x5Iz1R+CviVAd7cOWJc6jyZkSLWTdnN12Hn3bfHJdJ1x4K4bt+ePAsaBK/Alrz7u3Hg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "^0.59.0"
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
-    "@glimmer/validator" "^0.59.0"
+    "@glimmer/global-context" "^0.60.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
+    "@glimmer/validator" "^0.60.0"
 
-"@glimmer/runtime@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.59.0.tgz#9e458752413555be09149deb9387ec6e9bd2c718"
-  integrity sha512-1mIkLLwiBLQx/+kfsn5TaP5HPNcszJh2aENVa0ai14fCVtNPFNge+B+oQ3FbV944Hb4EzhFAnx9nvVB1NWa0OA==
+"@glimmer/runtime@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.60.0.tgz#40724259eeaa4825e9345da6237ad427e573842b"
+  integrity sha512-3U5y0WbMgEmK4tbshJLD9ka8Tc1e6Cxxw3z+NtGI4of7yN31Gnl9qH8+MBgJzX8ZIc5D3LuJpYA5/a4ZLj/LrQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.59.0"
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/low-level" "^0.59.0"
-    "@glimmer/program" "^0.59.0"
-    "@glimmer/reference" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
-    "@glimmer/validator" "^0.59.0"
-    "@glimmer/vm" "^0.59.0"
-    "@glimmer/wire-format" "^0.59.0"
+    "@glimmer/global-context" "0.60.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/low-level" "^0.60.0"
+    "@glimmer/program" "^0.60.0"
+    "@glimmer/reference" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
+    "@glimmer/validator" "^0.60.0"
+    "@glimmer/vm" "^0.60.0"
+    "@glimmer/wire-format" "^0.60.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.59.0.tgz#5ba14edd7c3d793d9f881ec59fc78991fb3c3f9f"
-  integrity sha512-cvd9//tWKO5Cb1o0c778cR1O75m3/idnoQv6hJK9jV60KAsKIuZL9gtG0eWOepiLnZYg0oXeLXvzBd3LcedSIg==
+"@glimmer/syntax@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.60.0.tgz#309a683efb41c171ea82dbf8e3845bea591686eb"
+  integrity sha512-Q4W1Ly8bjjAe8DY0cj23PC2Q//+XEFdrBXhOqNVjtAjJHBd3Vm/sIokKhuUCrqHEppsn2/xYZFRf1qEUAib1lA==
   dependencies:
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.59.0.tgz#625a2a4481c9ff3a74edb18f841b6d89459327dd"
-  integrity sha512-93mlGdNTywN/F58KRWLWc3WKl0kzaiy6dLF7GpHmaPG4lsAAoZ0O0Vbz0nPIe4Qr/IVgDvm5CSa4govwHYjJvg==
+"@glimmer/util@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.60.0.tgz#dc9cffd7b327430ecd8fdb1570e01fe727e0583c"
+  integrity sha512-qJp+X9x1E7WZRAND1SxyrkQuXE/ptutHDpoZJB2uqhaeFPe6FupBkFHjF/leF7H6Zzg/i4uo+vLmM6S50Hc1Zg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.59.0"
+    "@glimmer/interfaces" "^0.60.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.59.0.tgz#58574fcbeaa5a29c6f0997c0e8a326f8d9a52016"
-  integrity sha512-kJAE9PicuxTHvCU9zWZdoK7j0vDh35TJ6rhfM1kxW/9IlIu2Q+NrFOT3i3bbxOkN7Z0TFaBvugjCREByw4sFpQ==
+"@glimmer/validator@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.60.0.tgz#8e5c8c60fd9df61d7adb8d0d4457147cd8678cfd"
+  integrity sha512-ekYCWWqE76HX0b92/Cbn14it8OIbjzr1A4AtJfOo2Q6MitnrH9wkfXcH+qEvMJ7olgUlFf2vg/bs6Mlo002JMA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.59.0"
+    "@glimmer/global-context" "0.60.0"
 
-"@glimmer/vm@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.59.0.tgz#667d18b676dd4b7c991473acaabdabf194813676"
-  integrity sha512-V8jL9i3GkdFp5CoVWk5A0SlwtYauAxj60eblrzR4fUaEy/snEJjOhaMfCT6LH9QBowvvifyqxyY8YagaF0X+9A==
+"@glimmer/vm@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.60.0.tgz#c027e2c7270eed26d3106b7af639914b9ae39ae7"
+  integrity sha512-X/OIZdEZgG+95+yCZbqsfZs9FvIhY5JFPfKtKlPKqRteiOU+6hIoGFiUD5C1bc4yorvpusdSgICHkeJ5nP4T3A==
   dependencies:
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
 
-"@glimmer/wire-format@^0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.59.0.tgz#d6376e099867970b29d82418b34d36e1a84ccc30"
-  integrity sha512-TXThBQXZAbN15yWtYDCazzv3i3poWYXZZxcF1LvclxJS40I4E8FOfrl5npinGQeS0XZoypEOpVkne4EAL5cxEw==
+"@glimmer/wire-format@^0.60.0":
+  version "0.60.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.60.0.tgz#2049afe5e47c589c4117a23113ef0c733530918d"
+  integrity sha512-YlQan+8og8SlDDPTVanHyRXkAu26LHZFO8bT+moAksQizdqpeyA9QFxd3aq7b3/h/IFsjzD6PRok+Ru7PJlJ3g==
   dependencies:
-    "@glimmer/interfaces" "^0.59.0"
-    "@glimmer/util" "^0.59.0"
+    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/util" "^0.60.0"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 94f31716f157317989c95517aba81d9ae071df1c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Sep 2020 05:25:37 +0000
Subject: [PATCH 0099/1405] [Security] Bump dot-prop from 4.2.0 to 4.2.1

Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1. **This update includes a security fix.**
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3560d5c170f..8877d216ebd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3292,9 +3292,9 @@ doctrine@^3.0.0:
     esutils "^2.0.2"
 
 dot-prop@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
-  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
+  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
   dependencies:
     is-obj "^1.0.0"
 

From 391cd5044d27341214d0fa25497e844058bd9fbe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Sep 2020 05:26:22 +0000
Subject: [PATCH 0100/1405] [Security] Bump lodash from 4.17.15 to 4.17.20

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3560d5c170f..2f7cd19bfb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6285,9 +6285,9 @@ lodash.values@~2.3.0:
     lodash.keys "~2.3.0"
 
 lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4:
-  version "4.17.15"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
-  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
 log-symbols@3.0.0:
   version "3.0.0"

From a5e721ee7cc7938e24838a4ae913608579f528de Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 1 Sep 2020 20:20:29 -0700
Subject: [PATCH 0101/1405] [REFACTOR] Removes AoT mode

Integrates Glimmer VM 0.61
---
 package.json                                  |  18 +-
 .../glimmer/lib/compile-time-lookup.ts        |  10 +-
 .../glimmer/lib/component-managers/curly.ts   |  12 +-
 .../glimmer/lib/component-managers/custom.ts  |   6 +-
 .../lib/component-managers/internal.ts        |   6 +-
 .../glimmer/lib/component-managers/mount.ts   |   6 +-
 .../glimmer/lib/component-managers/outlet.ts  |   8 +-
 .../glimmer/lib/component-managers/root.ts    |   2 +-
 .../lib/component-managers/template-only.ts   |   6 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |  30 +--
 .../@ember/-internals/glimmer/lib/resolver.ts |   4 +-
 .../@ember/-internals/glimmer/lib/syntax.ts   |   2 +-
 yarn.lock                                     | 210 +++++++++---------
 13 files changed, 161 insertions(+), 159 deletions(-)

diff --git a/package.json b/package.json
index d1b29cbb0d9..0a11506ef22 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.60.0",
+    "@glimmer/compiler": "^0.61.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "^0.60.0",
-    "@glimmer/interfaces": "^0.60.0",
-    "@glimmer/node": "^0.60.0",
-    "@glimmer/opcode-compiler": "^0.60.0",
-    "@glimmer/program": "^0.60.0",
-    "@glimmer/reference": "^0.60.0",
-    "@glimmer/runtime": "^0.60.0",
-    "@glimmer/validator": "^0.60.0",
+    "@glimmer/global-context": "^0.61.0",
+    "@glimmer/interfaces": "^0.61.0",
+    "@glimmer/node": "^0.61.0",
+    "@glimmer/opcode-compiler": "^0.61.0",
+    "@glimmer/program": "^0.61.0",
+    "@glimmer/reference": "^0.61.0",
+    "@glimmer/runtime": "^0.61.0",
+    "@glimmer/validator": "^0.61.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
index cefb743314b..edfa5ebe686 100644
--- a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
+++ b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
@@ -1,17 +1,17 @@
 import { OwnedTemplateMeta } from '@ember/-internals/views';
 import {
   CompileTimeComponent,
-  CompileTimeResolverDelegate,
+  CompileTimeResolver,
   ComponentCapabilities,
   ComponentDefinition,
   ComponentManager,
   Option,
-  WithJitStaticLayout,
+  WithStaticLayout,
 } from '@glimmer/interfaces';
 import RuntimeResolver from './resolver';
 
 interface StaticComponentManager
-  extends WithJitStaticLayout<unknown, unknown, RuntimeResolver>,
+  extends WithStaticLayout<unknown, unknown, RuntimeResolver>,
     ComponentManager<unknown, unknown> {}
 
 function isStaticComponentManager(
@@ -21,7 +21,7 @@ function isStaticComponentManager(
   return !capabilities.dynamicLayout;
 }
 
-export default class CompileTimeResolver implements CompileTimeResolverDelegate<OwnedTemplateMeta> {
+export default class CompileTimeResolverImpl implements CompileTimeResolver<OwnedTemplateMeta> {
   constructor(private resolver: RuntimeResolver) {}
 
   lookupHelper(name: string, referrer: OwnedTemplateMeta): Option<number> {
@@ -55,7 +55,7 @@ export default class CompileTimeResolver implements CompileTimeResolverDelegate<
     return {
       handle: definitionHandle,
       capabilities,
-      compilable: manager.getJitStaticLayout(state, this.resolver),
+      compilable: manager.getStaticLayout(state, this.resolver),
     };
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 64652d77d0e..e940e61cd21 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -17,9 +17,9 @@ import {
   Option,
   PreparedArguments,
   VMArguments,
+  WithDynamicLayout,
   WithDynamicTagName,
-  WithJitDynamicLayout,
-  WithJitStaticLayout,
+  WithStaticLayout,
 } from '@glimmer/interfaces';
 import {
   childRefFor,
@@ -118,8 +118,8 @@ debugFreeze(EMPTY_POSITIONAL_ARGS);
 export default class CurlyComponentManager
   extends AbstractManager<ComponentStateBucket, DefinitionState>
   implements
-    WithJitStaticLayout<ComponentStateBucket, DefinitionState, RuntimeResolver>,
-    WithJitDynamicLayout<ComponentStateBucket, RuntimeResolver>,
+    WithStaticLayout<ComponentStateBucket, DefinitionState, RuntimeResolver>,
+    WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket> {
   protected templateFor(component: Component): OwnedTemplate {
     let { layout, layoutName } = component;
@@ -145,11 +145,11 @@ export default class CurlyComponentManager
     return factory(owner);
   }
 
-  getJitStaticLayout(state: DefinitionState, _resolver: RuntimeResolver) {
+  getStaticLayout(state: DefinitionState, _resolver: RuntimeResolver) {
     return unwrapTemplate(state.template!).asLayout();
   }
 
-  getJitDynamicLayout(bucket: ComponentStateBucket) {
+  getDynamicLayout(bucket: ComponentStateBucket) {
     let component = bucket.component;
     let template = this.templateFor(component);
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 98a2d745f45..dd2ae166bca 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -14,7 +14,7 @@ import {
   Dict,
   Option,
   VMArguments,
-  WithJitStaticLayout,
+  WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor, reifyArgs, reifyPositional } from '@glimmer/runtime';
@@ -175,7 +175,7 @@ export default class CustomComponentManager<ComponentInstance>
     CustomComponentDefinitionState<ComponentInstance>
   >
   implements
-    WithJitStaticLayout<
+    WithStaticLayout<
       CustomComponentState<ComponentInstance>,
       CustomComponentDefinitionState<ComponentInstance>,
       RuntimeResolver
@@ -361,7 +361,7 @@ export default class CustomComponentManager<ComponentInstance>
     }
   }
 
-  getJitStaticLayout(state: DefinitionState<ComponentInstance>) {
+  getStaticLayout(state: DefinitionState<ComponentInstance>) {
     return unwrapTemplate(state.template).asLayout();
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index 99021d84b7e..2a51083e6ff 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -1,5 +1,5 @@
 import { Factory, Owner } from '@ember/-internals/owner';
-import { ComponentDefinition, WithJitStaticLayout } from '@glimmer/interfaces';
+import { ComponentDefinition, WithStaticLayout } from '@glimmer/interfaces';
 import { unwrapTemplate } from '@glimmer/util';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
@@ -25,12 +25,12 @@ export class InternalComponentDefinition<T>
 
 export default abstract class InternalManager<T>
   extends AbstractComponentManager<T, InternalDefinitionState>
-  implements WithJitStaticLayout<T, InternalDefinitionState, RuntimeResolver> {
+  implements WithStaticLayout<T, InternalDefinitionState, RuntimeResolver> {
   constructor(protected owner: Owner) {
     super();
   }
 
-  getJitStaticLayout({ layout: template }: InternalDefinitionState) {
+  getStaticLayout({ layout: template }: InternalDefinitionState) {
     return unwrapTemplate(template).asLayout();
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 39fd5282d85..5f5edf4cd18 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -8,7 +8,7 @@ import {
   Destroyable,
   Option,
   VMArguments,
-  WithJitDynamicLayout,
+  WithDynamicLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
@@ -45,8 +45,8 @@ const CAPABILITIES = {
 };
 
 class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
-  implements WithJitDynamicLayout<EngineState, RuntimeResolver> {
-  getJitDynamicLayout(state: EngineState, _: RuntimeResolver) {
+  implements WithDynamicLayout<EngineState, RuntimeResolver> {
+  getDynamicLayout(state: EngineState, _: RuntimeResolver) {
     let templateFactory = state.engine.lookup('template:application') as TemplateFactory;
     let template = templateFactory(state.engine);
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 54637bb6f95..b4a6bacd8c3 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -13,7 +13,7 @@ import {
   Option,
   VMArguments,
   WithDynamicTagName,
-  WithJitStaticLayout,
+  WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { EMPTY_ARGS, registerDestructor } from '@glimmer/runtime';
@@ -65,7 +65,7 @@ const CAPABILITIES: ComponentCapabilities = {
 };
 
 class OutletComponentManager extends AbstractManager<OutletInstanceState, OutletDefinitionState>
-  implements WithJitStaticLayout<OutletInstanceState, OutletDefinitionState, RuntimeResolver> {
+  implements WithStaticLayout<OutletInstanceState, OutletDefinitionState, RuntimeResolver> {
   create(
     environment: EmberVMEnvironment,
     definition: OutletDefinitionState,
@@ -147,7 +147,7 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
     return name;
   }
 
-  getJitStaticLayout({ template }: OutletDefinitionState, _resolver: RuntimeResolver) {
+  getStaticLayout({ template }: OutletDefinitionState, _resolver: RuntimeResolver) {
     // The router has already resolved the template
     return unwrapTemplate(template).asLayout();
   }
@@ -232,7 +232,7 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
         return 'div';
       }
 
-      getJitStaticLayout({ template }: OutletDefinitionState) {
+      getStaticLayout({ template }: OutletDefinitionState) {
         // The router has already resolved the template
         return unwrapTemplate(template).asWrappedLayout();
       }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index 511416941ef..ddb5cd2ad44 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -34,7 +34,7 @@ class RootComponentManager extends CurlyComponentManager {
     return '- While rendering:';
   }
 
-  getJitStaticLayout(_state: DefinitionState) {
+  getStaticLayout(_state: DefinitionState) {
     const template = this.templateFor(this.component);
     return unwrapTemplate(template).asWrappedLayout();
   }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index cdd739ee936..53a08ce1472 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -5,7 +5,7 @@ import {
   ComponentDefinition,
   Option,
   VMArguments,
-  WithJitStaticLayout,
+  WithStaticLayout,
 } from '@glimmer/interfaces';
 import { NULL_REFERENCE } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
@@ -37,12 +37,12 @@ export interface DebugStateBucket {
 export default class TemplateOnlyComponentManager
   extends AbstractManager<Option<DebugStateBucket>, TemplateOnlyComponentDefinitionState>
   implements
-    WithJitStaticLayout<
+    WithStaticLayout<
       Option<DebugStateBucket>,
       TemplateOnlyComponentDefinitionState,
       RuntimeResolver
     > {
-  getJitStaticLayout({ template }: TemplateOnlyComponentDefinitionState) {
+  getStaticLayout({ template }: TemplateOnlyComponentDefinitionState) {
     return unwrapTemplate(template).asLayout();
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 2a8278d4822..418357e7c90 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -9,12 +9,13 @@ import {
   DynamicScope as GlimmerDynamicScope,
   ElementBuilder,
   Environment,
-  JitRuntimeContext,
   Option,
   RenderResult,
+  RuntimeContext,
   SyntaxCompilationContext,
 } from '@glimmer/interfaces';
-import { JitContext } from '@glimmer/opcode-compiler';
+import { syntaxCompilationContext } from '@glimmer/opcode-compiler';
+import { artifacts } from '@glimmer/program';
 import { createConstRef, Reference, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
 import {
   clientBuilder,
@@ -24,15 +25,14 @@ import {
   DOMChanges,
   DOMTreeConstruction,
   inTransaction,
-  JitRuntime,
-  JitSyntaxCompilationContext,
-  renderJitMain,
+  renderMain,
+  runtimeContext,
 } from '@glimmer/runtime';
 import { unwrapHandle, unwrapTemplate } from '@glimmer/util';
 import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
 import { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
 import RSVP from 'rsvp';
-import CompileTimeResolver from './compile-time-lookup';
+import CompileTimeResolverImpl from './compile-time-lookup';
 import { BOUNDS } from './component';
 import { createRootOutlet } from './component-managers/outlet';
 import { RootComponentDefinition } from './component-managers/root';
@@ -85,7 +85,7 @@ class RootState {
 
   constructor(
     public root: Component | OutletView,
-    public runtime: JitRuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>,
+    public runtime: RuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>,
     context: SyntaxCompilationContext,
     template: OwnedTemplate,
     self: Reference<unknown>,
@@ -106,7 +106,7 @@ class RootState {
       let layout = unwrapTemplate(template).asLayout();
       let handle = layout.compile(context);
 
-      let iterator = renderJitMain(
+      let iterator = renderMain(
         runtime,
         context,
         self,
@@ -250,8 +250,8 @@ export abstract class Renderer {
   private _builder: IBuilder;
   private _inRenderTransaction = false;
 
-  private _context: JitSyntaxCompilationContext;
-  private _runtime: JitRuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>;
+  private _context: SyntaxCompilationContext;
+  private _runtime: RuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>;
 
   private _lastRevision = -1;
   private _destroyed = false;
@@ -276,14 +276,16 @@ export abstract class Renderer {
 
     // resolver is exposed for tests
     let runtimeResolver = (this._runtimeResolver = new RuntimeResolver(owner, env.isInteractive));
-    let compileTimeResolver = new CompileTimeResolver(runtimeResolver);
+    let compileTimeResolver = new CompileTimeResolverImpl(runtimeResolver);
 
-    let context = (this._context = JitContext(compileTimeResolver));
+    let sharedArtifacts = artifacts();
+
+    let context = (this._context = syntaxCompilationContext(sharedArtifacts, compileTimeResolver));
 
     populateMacros(context.macros);
 
     let runtimeEnvironmentDelegate = new EmberEnvironmentDelegate(owner, env.isInteractive);
-    this._runtime = JitRuntime(
+    this._runtime = runtimeContext(
       {
         appendOperations: env.hasDOM
           ? new DOMTreeConstruction(document)
@@ -291,7 +293,7 @@ export abstract class Renderer {
         updateOperations: new DOMChanges(document),
       },
       runtimeEnvironmentDelegate,
-      context,
+      sharedArtifacts,
       runtimeResolver
     );
   }
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 6543232b2f1..00f5fc76546 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -15,9 +15,9 @@ import { DEBUG } from '@glimmer/env';
 import {
   ComponentDefinition,
   Helper,
-  JitRuntimeResolver,
   Option,
   PartialDefinition,
+  RuntimeResolver,
 } from '@glimmer/interfaces';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
 import { getDynamicVar, ModifierDefinition, registerDestructor } from '@glimmer/runtime';
@@ -270,7 +270,7 @@ interface IBuiltInModifiers {
   [name: string]: ModifierDefinition | undefined;
 }
 
-export default class RuntimeResolver implements JitRuntimeResolver<OwnedTemplateMeta> {
+export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplateMeta> {
   public isInteractive: boolean;
 
   private handles: any[] = [
diff --git a/packages/@ember/-internals/glimmer/lib/syntax.ts b/packages/@ember/-internals/glimmer/lib/syntax.ts
index 0c48ddc8147..6caa7759b2e 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax.ts
@@ -61,7 +61,7 @@ function refineBlockSyntax(
   assert(
     `Helpers may not be used in the block form, for example {{#${name}}}{{/${name}}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (${name})}}{{/if}}.`,
     !(() => {
-      const resolver = context.resolver['inner']['resolver'];
+      const resolver = context.resolver['resolver'];
       const { moduleName, owner } = context.meta.referrer as OwnedTemplateMeta;
       if (name === 'component' || resolver['builtInHelpers'][name]) {
         return true;
diff --git a/yarn.lock b/yarn.lock
index 3560d5c170f..4c794dd179f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,152 +913,152 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.60.0.tgz#6b15916779711704596c7e5487cd0d2e986f745d"
-  integrity sha512-IemmKChNTljY1dtVEGhmeyKSeEfa/zQMZ0MFadwQYlJv5DphWhGaVXF6l3J2sPRJRGgpGQolJTy2YsSwHAX9mQ==
-  dependencies:
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/syntax" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
-    "@glimmer/wire-format" "^0.60.0"
+"@glimmer/compiler@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.0.tgz#20ee5ecef0630a76706adf84922b064cf5bb5ce7"
+  integrity sha512-hBckb4+1RT0B3PC/f0L5rQlpT+hycHRjsx5KR6m0DKD9rxxs9/B5lFWbZ1p8QfQovqVaG+edcTpDG5YdacFw9w==
+  dependencies:
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/syntax" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
+    "@glimmer/wire-format" "^0.61.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.60.0.tgz#c77afeb6f6c562117424ca352c49d5637be818c6"
-  integrity sha512-HKmgUtgb8JXJdEKM1kehdi8xvNsJMwXP+QRaTfdbCapDQG+tiiZB7lqAYZvf+2Sdg8Rue3twROJvqgq4nmhVJA==
+"@glimmer/encoder@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.0.tgz#90c934c8ac86c453f4315823d91633e8eede5f1f"
+  integrity sha512-nlyuC7cenrtMxSmbq61jIZ3zmsDy11sWIcRCmzqAazC/XHPKoqXtujXQQ0yWn13CiHah85tCxw+/4rGl8TiqfQ==
   dependencies:
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/vm" "^0.60.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/vm" "^0.61.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.60.0", "@glimmer/global-context@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.60.0.tgz#efec1899fd82d99fb58c3a8985e0d5c4e78a18eb"
-  integrity sha512-sKwcLY2S3yg792HMeUDlxdo8JdlGdnbsXW2UpnlDzDDW8mJ9KUaKbCXpQ5FWIhEjsu89ARqNC8qthOI5KuGcng==
+"@glimmer/global-context@0.61.0", "@glimmer/global-context@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.0.tgz#94c75a860c098b5d1dc0b09e9c7140c7349b3298"
+  integrity sha512-rC8nyogG0uhdxuDZpwg+ms0KqTE6Vb9gsmNubVdePIG669+GePmyJz7xxQI7Gkl166Ru9kw9srMHOVBEi4sjPA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.60.0.tgz#cb2d28bb0441743b5b7b0b23b64e754fd4ca06ed"
-  integrity sha512-gEraOjACkSlgNr3GeH9GU370DLW+uwaxCStq6BGk0ShxkQI9BuhwWYC6gqsPkbiRI24L+UrpPo8qajFew/2Nrg==
+"@glimmer/interfaces@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.0.tgz#5da3f7315e6220a1e14d4d07f92bbc0a281ee647"
+  integrity sha512-+iszGSBU+KioNroHhXYBE5YQXdYGFmIPLF1aRBkiA6XIfhFe2L0RGT1rjvyQvAziD6IQFDZNxMm0eaiWwhsKKg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.60.0.tgz#1b6f6b14fff7d378bd109dfd4966075ad6d57eec"
-  integrity sha512-8+Y9UBkbkZX9XDwlSz+L+LJ2hfu2rR5a06kuzf1om3G0ghAoBbHKxepQEeer/OAzwQENFUL2+2teE3J9v7yh8A==
+"@glimmer/low-level@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.0.tgz#0f0125afdfa3aa0209d79708af56330f555ee375"
+  integrity sha512-PGuVXYQzTVCwClnOBNIPfc86VcdDMcL4/m/VPDhcG9iW86B2IH5cJ/pC13lkLNC0voEr1sq2oIGjPrjO2Va2Kw==
 
-"@glimmer/node@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.60.0.tgz#bd25f717c85ac7c9dfce21ef793bf1fa34b1ccc1"
-  integrity sha512-qN29qSHYDKj1FidVh945xaKTEE/A1nU1DQ91/A+uHxPOlXe7dx+LPpyqzIeZPJitEWMqI6EMaqJWXhnN28UhLA==
+"@glimmer/node@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.0.tgz#21654f548814eefb178a3911119e695001f05191"
+  integrity sha512-MBRdWByY3YCyVm0YGMC+0aZXAbj1bXLbF+94oJ9G9VdHJZNEzipSWOwLJwEOXWZWK3lmRdK2vRoZIPjPDMeHSQ==
   dependencies:
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/runtime" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/runtime" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.60.0.tgz#9fc0c9543baf7d7c2940db6a2d3138951a926a63"
-  integrity sha512-bSHS4VZmuTOFIegcJdB0ivSJ0f7WV0504bHcLBMtmhZDv6ItzMrrk1IuRxIUqRRZsdLEs6ucNL01myHfONa9Mg==
-  dependencies:
-    "@glimmer/encoder" "^0.60.0"
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/program" "^0.60.0"
-    "@glimmer/reference" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
-    "@glimmer/vm" "^0.60.0"
-    "@glimmer/wire-format" "^0.60.0"
-
-"@glimmer/program@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.60.0.tgz#5d8fd62cdacef210a3bb458205d5e8ba33d3a1a2"
-  integrity sha512-nOVBfps0EBQcA2VhPPapDUg2Ndid21v7HNN+YYeaQV/3oTV+lkDoKRWNSWLnjPmCDXsdc2pQyx7PX16tm3uQmQ==
-  dependencies:
-    "@glimmer/encoder" "^0.60.0"
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
-
-"@glimmer/reference@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.60.0.tgz#b986368b8b62dbafa76a9c4ba88943a94733bad3"
-  integrity sha512-fBv5/kZOS+WbNEbLAl2x5Iz1R+CviVAd7cOWJc6jyZkSLWTdnN12Hn3bfHJdJ1x4K4bt+ePAsaBK/Alrz7u3Hg==
+"@glimmer/opcode-compiler@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.0.tgz#cf6bd4f60ee3ef10be50964e2e997f035ec48807"
+  integrity sha512-hF5zRWA/Aq8eZmexJLAtFUMYMHwINQ/mRxDM5CLUpBVKiLps16EArochsJONKminQgBG9MRZI+LP2EcNtLXStQ==
+  dependencies:
+    "@glimmer/encoder" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/program" "^0.61.0"
+    "@glimmer/reference" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
+    "@glimmer/vm" "^0.61.0"
+    "@glimmer/wire-format" "^0.61.0"
+
+"@glimmer/program@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.0.tgz#df9131f875d2688a223a2d5d87d1a84e051f9af2"
+  integrity sha512-KajImwoEWatuv8L4JDz6jirmFPhVnt8PvHWZPzEJchiOM6+Ct1ZioZn3s2dam0YznJGSCRlPHaLzIaMtbCN6qQ==
+  dependencies:
+    "@glimmer/encoder" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
+
+"@glimmer/reference@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.0.tgz#74531c0c788dd2ab5627b33a4010032a74b24b6d"
+  integrity sha512-KGtKFhyBuXDGlfZexdXpfScqNppmEP007W0euLmZ6Ki6y/TN4kDBOWxHjJke3EF7sOTDn9cMLxzO5ITCxiAJyg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "^0.60.0"
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
-    "@glimmer/validator" "^0.60.0"
+    "@glimmer/global-context" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
+    "@glimmer/validator" "^0.61.0"
 
-"@glimmer/runtime@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.60.0.tgz#40724259eeaa4825e9345da6237ad427e573842b"
-  integrity sha512-3U5y0WbMgEmK4tbshJLD9ka8Tc1e6Cxxw3z+NtGI4of7yN31Gnl9qH8+MBgJzX8ZIc5D3LuJpYA5/a4ZLj/LrQ==
+"@glimmer/runtime@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.0.tgz#4bb2113a3217d91a89aa45db532be35c80d5835e"
+  integrity sha512-uBSDO6FwqUeKSpSnKs3m2A1WKiOOg/57UgIuLNxIvoiNfkSJVyLEsD/AvY6alYxZGoAFXQOH5YzBHLDUOcdZWQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.60.0"
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/low-level" "^0.60.0"
-    "@glimmer/program" "^0.60.0"
-    "@glimmer/reference" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
-    "@glimmer/validator" "^0.60.0"
-    "@glimmer/vm" "^0.60.0"
-    "@glimmer/wire-format" "^0.60.0"
+    "@glimmer/global-context" "0.61.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/low-level" "^0.61.0"
+    "@glimmer/program" "^0.61.0"
+    "@glimmer/reference" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
+    "@glimmer/validator" "^0.61.0"
+    "@glimmer/vm" "^0.61.0"
+    "@glimmer/wire-format" "^0.61.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.60.0.tgz#309a683efb41c171ea82dbf8e3845bea591686eb"
-  integrity sha512-Q4W1Ly8bjjAe8DY0cj23PC2Q//+XEFdrBXhOqNVjtAjJHBd3Vm/sIokKhuUCrqHEppsn2/xYZFRf1qEUAib1lA==
+"@glimmer/syntax@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.0.tgz#85d1134210cb46a9621e0d5179f910e22c4d3238"
+  integrity sha512-zX6QX1ZNL1OXlVXPvwI+D2UMwY5csBI04F0vLMqjLZM+81zYXcrxdEe6Qr6yoEC3VjpKxudbdSX5/1mMJuT2+A==
   dependencies:
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.60.0.tgz#dc9cffd7b327430ecd8fdb1570e01fe727e0583c"
-  integrity sha512-qJp+X9x1E7WZRAND1SxyrkQuXE/ptutHDpoZJB2uqhaeFPe6FupBkFHjF/leF7H6Zzg/i4uo+vLmM6S50Hc1Zg==
+"@glimmer/util@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.0.tgz#59d2ff8b3291c452cfcb36b079968c5475940cb5"
+  integrity sha512-SPcLlaqXzECAak6a8UWO9k0i0OTao85r3+wYPsNF/PvBoWaiVai85RqK7KgYml1snIwC3vZfo5YAT8RAh7jXOg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.60.0"
+    "@glimmer/interfaces" "^0.61.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.60.0.tgz#8e5c8c60fd9df61d7adb8d0d4457147cd8678cfd"
-  integrity sha512-ekYCWWqE76HX0b92/Cbn14it8OIbjzr1A4AtJfOo2Q6MitnrH9wkfXcH+qEvMJ7olgUlFf2vg/bs6Mlo002JMA==
+"@glimmer/validator@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.0.tgz#77ed67fa2673ea504fc8edea95af17cd9769c16a"
+  integrity sha512-efCTK/ykmZzJnGm4uMsEEo31HrXcR3RPqDJrqriDxzFPjpyH/2MGy3QeOqSwP0GP6QHABMpJeqJ+IQw0HZ/4Cw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.60.0"
+    "@glimmer/global-context" "0.61.0"
 
-"@glimmer/vm@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.60.0.tgz#c027e2c7270eed26d3106b7af639914b9ae39ae7"
-  integrity sha512-X/OIZdEZgG+95+yCZbqsfZs9FvIhY5JFPfKtKlPKqRteiOU+6hIoGFiUD5C1bc4yorvpusdSgICHkeJ5nP4T3A==
+"@glimmer/vm@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.0.tgz#d4722d04b878faa66cd199bd41d96e4a693fac44"
+  integrity sha512-kj6XiW+U3SGS1/f0t9rZdYwipgNGD5iCUuKskVAt5x60ziXYTlaqra6p+uf61oSgTuan8vbFGiqqgFewOVyUKw==
   dependencies:
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
 
-"@glimmer/wire-format@^0.60.0":
-  version "0.60.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.60.0.tgz#2049afe5e47c589c4117a23113ef0c733530918d"
-  integrity sha512-YlQan+8og8SlDDPTVanHyRXkAu26LHZFO8bT+moAksQizdqpeyA9QFxd3aq7b3/h/IFsjzD6PRok+Ru7PJlJ3g==
+"@glimmer/wire-format@^0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.0.tgz#2ac9916c6f87a4195b78542b4fba52c55e57f7b1"
+  integrity sha512-75Vl1uNNAMRzgsPVURoVsNxqlkt1J3kAhodpPqZdMHuJejNabFAkxZPDpXtncob65b+Vww77KbI26/vvzXDffg==
   dependencies:
-    "@glimmer/interfaces" "^0.60.0"
-    "@glimmer/util" "^0.60.0"
+    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/util" "^0.61.0"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 3f5b8f02bde4c2cd1bb8ff8126cf351086625c15 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 2 Sep 2020 11:43:17 -0700
Subject: [PATCH 0102/1405] [BUGFIX] Prevent dynamic invocations

Prevents dynamic invocations of string values when referenced directly in
angle brackets
---
 package.json |  18 ++---
 yarn.lock    | 210 +++++++++++++++++++++++++--------------------------
 2 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/package.json b/package.json
index 0a11506ef22..310b5550dca 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.61.0",
+    "@glimmer/compiler": "^0.61.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "^0.61.0",
-    "@glimmer/interfaces": "^0.61.0",
-    "@glimmer/node": "^0.61.0",
-    "@glimmer/opcode-compiler": "^0.61.0",
-    "@glimmer/program": "^0.61.0",
-    "@glimmer/reference": "^0.61.0",
-    "@glimmer/runtime": "^0.61.0",
-    "@glimmer/validator": "^0.61.0",
+    "@glimmer/global-context": "^0.61.1",
+    "@glimmer/interfaces": "^0.61.1",
+    "@glimmer/node": "^0.61.1",
+    "@glimmer/opcode-compiler": "^0.61.1",
+    "@glimmer/program": "^0.61.1",
+    "@glimmer/reference": "^0.61.1",
+    "@glimmer/runtime": "^0.61.1",
+    "@glimmer/validator": "^0.61.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index ddee4e06ae9..2859d2c6603 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,152 +913,152 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.0.tgz#20ee5ecef0630a76706adf84922b064cf5bb5ce7"
-  integrity sha512-hBckb4+1RT0B3PC/f0L5rQlpT+hycHRjsx5KR6m0DKD9rxxs9/B5lFWbZ1p8QfQovqVaG+edcTpDG5YdacFw9w==
-  dependencies:
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/syntax" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
-    "@glimmer/wire-format" "^0.61.0"
+"@glimmer/compiler@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.1.tgz#00b92eadfbdd90f17fbfbf66c07046fcbac13607"
+  integrity sha512-3NUp9x3mlZtNV8fwjue0UcUdKIdBNbEiXH6eH7z/Auru/Y0hSP/VpNF2yj2AxuAGJQJTGJgK5VK/puUlKipR1g==
+  dependencies:
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/syntax" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
+    "@glimmer/wire-format" "^0.61.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.0.tgz#90c934c8ac86c453f4315823d91633e8eede5f1f"
-  integrity sha512-nlyuC7cenrtMxSmbq61jIZ3zmsDy11sWIcRCmzqAazC/XHPKoqXtujXQQ0yWn13CiHah85tCxw+/4rGl8TiqfQ==
+"@glimmer/encoder@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.1.tgz#9149c2caff94c6dcc7173cc7f5b1763039f48d14"
+  integrity sha512-a6mJ7UozPXu31S7HFr9va1UyuewpkKcZFocPbAmlBSX/HbrtX0II0YbRv5nmZXRIIb4ifzDQmU/COhh6YBYO6A==
   dependencies:
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/vm" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/vm" "^0.61.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.61.0", "@glimmer/global-context@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.0.tgz#94c75a860c098b5d1dc0b09e9c7140c7349b3298"
-  integrity sha512-rC8nyogG0uhdxuDZpwg+ms0KqTE6Vb9gsmNubVdePIG669+GePmyJz7xxQI7Gkl166Ru9kw9srMHOVBEi4sjPA==
+"@glimmer/global-context@0.61.1", "@glimmer/global-context@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.1.tgz#d1a47d03e8546297bc2b96d52d7cd52a283dbc05"
+  integrity sha512-TUVVxLy0Xot5wq6jUBelLXqh0WnyW6OLBMxJGUo+ZbXXGcw8XG6V2koJZbYZsBQvz9kvQgfN43sLW9Ch9Wpx7w==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.0.tgz#5da3f7315e6220a1e14d4d07f92bbc0a281ee647"
-  integrity sha512-+iszGSBU+KioNroHhXYBE5YQXdYGFmIPLF1aRBkiA6XIfhFe2L0RGT1rjvyQvAziD6IQFDZNxMm0eaiWwhsKKg==
+"@glimmer/interfaces@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.1.tgz#f7249898f6bd130d43c13615e2151a85e21a0b74"
+  integrity sha512-Ga1Ttf9Tt/EMBEVSczE4SzNymY/nUDBwuk/Hss82Fqx5G8usB5a9fPfVoRmTXUmhe0Mm13PqHrvs5EV6D0ERDQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.0.tgz#0f0125afdfa3aa0209d79708af56330f555ee375"
-  integrity sha512-PGuVXYQzTVCwClnOBNIPfc86VcdDMcL4/m/VPDhcG9iW86B2IH5cJ/pC13lkLNC0voEr1sq2oIGjPrjO2Va2Kw==
+"@glimmer/low-level@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.1.tgz#5d5e683ca02624e0caa82311a5425efab8ecf34d"
+  integrity sha512-8dVXDni2AUa+yW2Cr+y3fbeNYmJZwsOhFhMaPCE54RrKiIOBnOqAWcmnu/Bw4fqAeaFKGk0f7vjVZ4lprIj69Q==
 
-"@glimmer/node@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.0.tgz#21654f548814eefb178a3911119e695001f05191"
-  integrity sha512-MBRdWByY3YCyVm0YGMC+0aZXAbj1bXLbF+94oJ9G9VdHJZNEzipSWOwLJwEOXWZWK3lmRdK2vRoZIPjPDMeHSQ==
+"@glimmer/node@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.1.tgz#4a2b32779b3e20f2d54509d0b4fc7535f6bbd6f4"
+  integrity sha512-NMiZ1p/PykmZtkgRe09OdYNojnIORHa7dbQTcloNDM0M7QuBoIYl4I+BA+cLYpfCKlRsZMlyRooPZ99GLFVuZw==
   dependencies:
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/runtime" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/runtime" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.0.tgz#cf6bd4f60ee3ef10be50964e2e997f035ec48807"
-  integrity sha512-hF5zRWA/Aq8eZmexJLAtFUMYMHwINQ/mRxDM5CLUpBVKiLps16EArochsJONKminQgBG9MRZI+LP2EcNtLXStQ==
-  dependencies:
-    "@glimmer/encoder" "^0.61.0"
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/program" "^0.61.0"
-    "@glimmer/reference" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
-    "@glimmer/vm" "^0.61.0"
-    "@glimmer/wire-format" "^0.61.0"
-
-"@glimmer/program@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.0.tgz#df9131f875d2688a223a2d5d87d1a84e051f9af2"
-  integrity sha512-KajImwoEWatuv8L4JDz6jirmFPhVnt8PvHWZPzEJchiOM6+Ct1ZioZn3s2dam0YznJGSCRlPHaLzIaMtbCN6qQ==
-  dependencies:
-    "@glimmer/encoder" "^0.61.0"
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
-
-"@glimmer/reference@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.0.tgz#74531c0c788dd2ab5627b33a4010032a74b24b6d"
-  integrity sha512-KGtKFhyBuXDGlfZexdXpfScqNppmEP007W0euLmZ6Ki6y/TN4kDBOWxHjJke3EF7sOTDn9cMLxzO5ITCxiAJyg==
+"@glimmer/opcode-compiler@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.1.tgz#8dea0922a90a8ed4ee2c0787995bb040dc55d461"
+  integrity sha512-kSXq+s9VJQtw4KlJRirshkhDc8k1tjR/Lo1TLlKw3ThmgeKSKAWJoGlW5wjxuBGBA9bvDRucQfeMgcTKyPEYlQ==
+  dependencies:
+    "@glimmer/encoder" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/program" "^0.61.1"
+    "@glimmer/reference" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
+    "@glimmer/vm" "^0.61.1"
+    "@glimmer/wire-format" "^0.61.1"
+
+"@glimmer/program@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.1.tgz#6b7194fbde55d550b3dde07f5cb5777632614200"
+  integrity sha512-TM7dw/2fBuU0g5ElE5vvHUV8E2Tg374B4JSTASY383J0qxHWKsOHN5m2QKN2PgvX6ssk2E8xBibHH/EW8jCq6g==
+  dependencies:
+    "@glimmer/encoder" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
+
+"@glimmer/reference@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.1.tgz#a3394941ddf47a2bc00230d25dd312835751bbdb"
+  integrity sha512-7QS/AjF1/U/kmZWpDCF5PkyZpDrOkXWPATjcApNDdJpdtK762z5BzA4lK+ig2VjvkEMJLEbbnk9/ZqePPaBloQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "^0.61.0"
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
-    "@glimmer/validator" "^0.61.0"
+    "@glimmer/global-context" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
+    "@glimmer/validator" "^0.61.1"
 
-"@glimmer/runtime@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.0.tgz#4bb2113a3217d91a89aa45db532be35c80d5835e"
-  integrity sha512-uBSDO6FwqUeKSpSnKs3m2A1WKiOOg/57UgIuLNxIvoiNfkSJVyLEsD/AvY6alYxZGoAFXQOH5YzBHLDUOcdZWQ==
+"@glimmer/runtime@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.1.tgz#36e531da548b2148a9ad1f97eaf2834d6a5173c5"
+  integrity sha512-X0B1WnPDk2nJktbgFpDZJP9UhKwuwPaxj6mK29jft4uw7Ff62p3SCW3gqwWE1E7s4GnMAeO5FLoKuSTQjZL9Cw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.61.0"
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/low-level" "^0.61.0"
-    "@glimmer/program" "^0.61.0"
-    "@glimmer/reference" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
-    "@glimmer/validator" "^0.61.0"
-    "@glimmer/vm" "^0.61.0"
-    "@glimmer/wire-format" "^0.61.0"
+    "@glimmer/global-context" "0.61.1"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/low-level" "^0.61.1"
+    "@glimmer/program" "^0.61.1"
+    "@glimmer/reference" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
+    "@glimmer/validator" "^0.61.1"
+    "@glimmer/vm" "^0.61.1"
+    "@glimmer/wire-format" "^0.61.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.0.tgz#85d1134210cb46a9621e0d5179f910e22c4d3238"
-  integrity sha512-zX6QX1ZNL1OXlVXPvwI+D2UMwY5csBI04F0vLMqjLZM+81zYXcrxdEe6Qr6yoEC3VjpKxudbdSX5/1mMJuT2+A==
+"@glimmer/syntax@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.1.tgz#8360c3e49c0806dc755c7465e4bd0ed14e25a16a"
+  integrity sha512-NhYG5u9Jjpdh9zh0x+ypnC1nesF2IjDkmHWrenEx4jDRo4csWK+uFBBzqwhNYjt4mTlSLpgA1pQLGdDEbcy4Xg==
   dependencies:
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.0.tgz#59d2ff8b3291c452cfcb36b079968c5475940cb5"
-  integrity sha512-SPcLlaqXzECAak6a8UWO9k0i0OTao85r3+wYPsNF/PvBoWaiVai85RqK7KgYml1snIwC3vZfo5YAT8RAh7jXOg==
+"@glimmer/util@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.1.tgz#0d5b7928659b78023420fdebca01e978ac3288f6"
+  integrity sha512-4NK84t281+BJVHhDWTySwfR7i4kCEbdTQ6e1b2FUL3sMuQywDMHJaQED3/uphKEIoi9ZTGPrdmKMQKIYKwi49A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.0.tgz#77ed67fa2673ea504fc8edea95af17cd9769c16a"
-  integrity sha512-efCTK/ykmZzJnGm4uMsEEo31HrXcR3RPqDJrqriDxzFPjpyH/2MGy3QeOqSwP0GP6QHABMpJeqJ+IQw0HZ/4Cw==
+"@glimmer/validator@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.1.tgz#8e7e289d938c70e5547e8e6d2fa4e977843ea434"
+  integrity sha512-HHDK/c8FV9TOL10HjKZs1erh1InwPpSwO9rtdNfUWGEhwnV7MjLjrjnFmJYsThmtOmdr4xy9C4C9Sx7GM2m6AQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.61.0"
+    "@glimmer/global-context" "0.61.1"
 
-"@glimmer/vm@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.0.tgz#d4722d04b878faa66cd199bd41d96e4a693fac44"
-  integrity sha512-kj6XiW+U3SGS1/f0t9rZdYwipgNGD5iCUuKskVAt5x60ziXYTlaqra6p+uf61oSgTuan8vbFGiqqgFewOVyUKw==
+"@glimmer/vm@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.1.tgz#3d2f91cf6cd4f352da04143fb34f0426ae5af18a"
+  integrity sha512-QpNWKwxA4w+2hYWJb/vFYIpdsgdnFocLecub9o1DgD2T8qIu3pfgz9RkAh28z3RPo6j3AXnQgVnLfQ/Tjn35sg==
   dependencies:
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
 
-"@glimmer/wire-format@^0.61.0":
-  version "0.61.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.0.tgz#2ac9916c6f87a4195b78542b4fba52c55e57f7b1"
-  integrity sha512-75Vl1uNNAMRzgsPVURoVsNxqlkt1J3kAhodpPqZdMHuJejNabFAkxZPDpXtncob65b+Vww77KbI26/vvzXDffg==
+"@glimmer/wire-format@^0.61.1":
+  version "0.61.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.1.tgz#a5787f46a444966ec26ad1228467a7ee5622fe41"
+  integrity sha512-N7icZ+4G0cVuYoakyZw+Mhsbb6f4C1Npdw6HD8XIXs/usZxvUH5fmf/pVB7kYkZj0AlxM4r3opEk4i7O2hv6PA==
   dependencies:
-    "@glimmer/interfaces" "^0.61.0"
-    "@glimmer/util" "^0.61.0"
+    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/util" "^0.61.1"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 4ed58f179f205e5377e0f2cdfb227aa1efe90d3f Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 2 Sep 2020 15:45:53 -0400
Subject: [PATCH 0103/1405] Add testing harness that replicates FastBoot
 environment.

Prior to this we were simulating FastBoot in a non-isolated VM context.
That meant that the running Node context was available within rendering
attempts. However, when ran with "real" FastBoot that is **not** the
case. In the real FastBoot environment, we create an isolated `vm`
context and evaluate both Ember and the application within that context.
This ensures that the running context does not have access to arbitrary
Node-land APIs (e.g. `require`).

(cherry picked from commit f9ef7dcca312148832894259713ca350de1c8085)
---
 .eslintrc.js                           |  14 ---
 tests/node/component-rendering-test.js |   8 ++
 tests/node/fastboot-sandbox-test.js    | 120 +++++++++++++++++++++++++
 tests/node/helpers/load-ember.js       |  14 ++-
 4 files changed, 139 insertions(+), 17 deletions(-)
 create mode 100644 tests/node/fastboot-sandbox-test.js

diff --git a/.eslintrc.js b/.eslintrc.js
index a850e9954af..9512c474dba 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -166,20 +166,6 @@ module.exports = {
         'disable-features/disable-generator-functions': 'off',
       }),
     },
-    {
-      // matches node-land files that aren't shipped to consumers (allows using Node 6+ features)
-      files: [
-        'broccoli/**/*.js',
-        'tests/node/**/*.js',
-        'ember-cli-build.js',
-        'rollup.config.js',
-        'd8-runner.js',
-      ],
-
-      rules: {
-        'node/no-unsupported-features': ['error', { version: 6 }],
-      }
-    },
     {
       files: [ 'node-tests/**/*.js' ],
 
diff --git a/tests/node/component-rendering-test.js b/tests/node/component-rendering-test.js
index e8fcce14a91..a5e9c17aeef 100644
--- a/tests/node/component-rendering-test.js
+++ b/tests/node/component-rendering-test.js
@@ -33,4 +33,12 @@ QUnit.module('Components can be rendered without a DOM dependency', function(hoo
 
     assert.ok(html.match(/rel="canonical"/));
   });
+
+  QUnit.test('attributes requiring protocol sanitization do not error', function(assert) {
+    this.set('someHref', 'https://foo.com/');
+
+    let html = this.render('<a href={{this.someHref}}>Some Link</a>');
+
+    assert.ok(html.match(/<a href="https:\/\/foo.com\/">Some Link<\/a>/));
+  });
 });
diff --git a/tests/node/fastboot-sandbox-test.js b/tests/node/fastboot-sandbox-test.js
new file mode 100644
index 00000000000..91d8de63dd5
--- /dev/null
+++ b/tests/node/fastboot-sandbox-test.js
@@ -0,0 +1,120 @@
+const fs = require('fs');
+const vm = require('vm');
+const SimpleDOM = require('simple-dom');
+const { emberPath, loadEmber, clearEmber } = require('./helpers/load-ember');
+
+// This is based on what fastboot-server does
+let HTMLSerializer = new SimpleDOM.HTMLSerializer(SimpleDOM.voidMap);
+
+async function fastbootVisit(context, url) {
+  let doc = new SimpleDOM.Document();
+  let rootElement = doc.body;
+  let options = { isBrowser: false, document: doc, rootElement: rootElement };
+
+  let { app } = context;
+
+  await app.boot();
+
+  let instance = await app.buildInstance();
+
+  try {
+    await instance.boot(options);
+    await instance.visit(url, options);
+
+    return {
+      url: instance.getURL(),
+      title: doc.title,
+      body: HTMLSerializer.serialize(rootElement),
+    };
+  } finally {
+    instance.destroy();
+  }
+}
+
+// essentially doing the same as what is done in FastBoot 3.1.0
+// https://github.com/ember-fastboot/fastboot/blob/v3.1.0/src/sandbox.js
+function buildSandboxContext(precompile) {
+  let URL = require('url');
+
+  let sandbox = {
+    console,
+    setTimeout,
+    clearTimeout,
+    URL,
+
+    // Convince jQuery not to assume it's in a browser
+    module: { exports: {} },
+  };
+
+  // Set the global as `window`
+  sandbox.window = sandbox;
+  sandbox.window.self = sandbox;
+
+  let context = vm.createContext(sandbox);
+
+  let environmentSetupScript = new vm.Script(
+    `
+var EmberENV = {
+  _TEMPLATE_ONLY_GLIMMER_COMPONENTS: true,
+  _APPLICATION_TEMPLATE_WRAPPER: false,
+  _DEFAULT_ASYNC_OBSERVERS: true,
+  _JQUERY_INTEGRATION: false,
+};`,
+    { filename: 'prepend.js' }
+  );
+  environmentSetupScript.runInContext(context);
+
+  let emberSource = fs.readFileSync(emberPath, { encoding: 'utf-8' });
+  let emberScript = new vm.Script(emberSource, { filename: emberPath });
+  emberScript.runInContext(context);
+
+  let applicationSource = `
+class Router extends Ember.Router {}
+Router.map(function() {
+  this.route('a');
+  this.route('b');
+});
+
+const registry = {
+  'router:main': Router,
+  'template:application': ${precompile('<h1>Hello world!</h1>\n{{outlet}}')}
+};
+
+class Resolver extends Ember.Object {
+  resolve(specifier) {
+    return registry[specifier];
+  }
+}
+
+var app = Ember.Application.extend().create({
+  autoboot: false,
+  Resolver,
+});
+`;
+  let appScript = new vm.Script(applicationSource, { filename: 'app.js' });
+  appScript.runInContext(context);
+
+  return context;
+}
+
+QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
+  hooks.beforeEach(function() {
+    let { precompile } = loadEmber();
+    this.context = buildSandboxContext(precompile);
+  });
+
+  hooks.afterEach(function() {
+    clearEmber();
+  });
+
+  QUnit.test('FastBoot: basic', async function(assert) {
+    let result = await fastbootVisit(this.context, '/');
+
+    assert.equal(result.url, '/', 'landed on correct url');
+    assert.equal(
+      result.body,
+      '<body><h1>Hello world!</h1>\n<!----></body>',
+      'results in expected HTML'
+    );
+  });
+});
diff --git a/tests/node/helpers/load-ember.js b/tests/node/helpers/load-ember.js
index 7a9da12fbd7..4b6d5df56a3 100644
--- a/tests/node/helpers/load-ember.js
+++ b/tests/node/helpers/load-ember.js
@@ -7,19 +7,27 @@ const templateCompilerPath = path.join(distPath, 'ember-template-compiler');
 // properly to avoid the @glimmer/validator assertion
 const originalGlobalSymbols = Object.getOwnPropertySymbols(global).map(sym => [sym, global[sym]]);
 
+module.exports.emberPath = require.resolve(emberPath);
+
 module.exports.loadEmber = function() {
   let Ember = require(emberPath);
 
-  let precompile = require(templateCompilerPath).precompile;
+  let _precompile = require(templateCompilerPath).precompile;
+
+  let precompile = function(templateString, options) {
+    let templateSpec = _precompile(templateString, options);
+
+    return `Ember.HTMLBars.template(${templateSpec})`;
+  };
 
   let compile = function(templateString, options) {
-    let templateSpec = precompile(templateString, options);
+    let templateSpec = _precompile(templateString, options);
     let template = new Function('return ' + templateSpec)();
 
     return Ember.HTMLBars.template(template);
   };
 
-  return { Ember, compile };
+  return { Ember, compile, precompile };
 };
 
 module.exports.clearEmber = function() {

From 3f2501382f7cd4c4b8b5ac894c163d99c7d3afeb Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 2 Sep 2020 19:51:05 -0400
Subject: [PATCH 0104/1405] Fix rendering engine usage within a `fastboot`
 sandbox

---
 package.json |  18 ++---
 yarn.lock    | 210 +++++++++++++++++++++++++--------------------------
 2 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/package.json b/package.json
index 310b5550dca..a28dbe18b96 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.61.1",
+    "@glimmer/compiler": "^0.61.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "^0.61.1",
-    "@glimmer/interfaces": "^0.61.1",
-    "@glimmer/node": "^0.61.1",
-    "@glimmer/opcode-compiler": "^0.61.1",
-    "@glimmer/program": "^0.61.1",
-    "@glimmer/reference": "^0.61.1",
-    "@glimmer/runtime": "^0.61.1",
-    "@glimmer/validator": "^0.61.1",
+    "@glimmer/global-context": "^0.61.2",
+    "@glimmer/interfaces": "^0.61.2",
+    "@glimmer/node": "^0.61.2",
+    "@glimmer/opcode-compiler": "^0.61.2",
+    "@glimmer/program": "^0.61.2",
+    "@glimmer/reference": "^0.61.2",
+    "@glimmer/runtime": "^0.61.2",
+    "@glimmer/validator": "^0.61.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 2859d2c6603..3a3413cbe1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,152 +913,152 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.1.tgz#00b92eadfbdd90f17fbfbf66c07046fcbac13607"
-  integrity sha512-3NUp9x3mlZtNV8fwjue0UcUdKIdBNbEiXH6eH7z/Auru/Y0hSP/VpNF2yj2AxuAGJQJTGJgK5VK/puUlKipR1g==
-  dependencies:
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/syntax" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
-    "@glimmer/wire-format" "^0.61.1"
+"@glimmer/compiler@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.2.tgz#76c1334d318955ae16ca61c3110ae4e0e9fd0935"
+  integrity sha512-+WrDbTKeOFsoxn1wLHmDt22IAEr7u/dqfc2V9kTH8CzB+f7HHtO++jmctoxD+arHx/lTJtZHITXFZNFqLmU6hw==
+  dependencies:
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/syntax" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
+    "@glimmer/wire-format" "^0.61.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.1.tgz#9149c2caff94c6dcc7173cc7f5b1763039f48d14"
-  integrity sha512-a6mJ7UozPXu31S7HFr9va1UyuewpkKcZFocPbAmlBSX/HbrtX0II0YbRv5nmZXRIIb4ifzDQmU/COhh6YBYO6A==
+"@glimmer/encoder@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.2.tgz#d160d867dc44c808740d0ff119f5070fb3694094"
+  integrity sha512-AbxpNdfkPbPvQGNTwuYqrnZvBHEYx/ruBnUC04rMG7Z2GDrPgNyToEtuhRPcRoRBOuOsU7tAjG+U7Xz/f89BZw==
   dependencies:
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/vm" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/vm" "^0.61.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.61.1", "@glimmer/global-context@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.1.tgz#d1a47d03e8546297bc2b96d52d7cd52a283dbc05"
-  integrity sha512-TUVVxLy0Xot5wq6jUBelLXqh0WnyW6OLBMxJGUo+ZbXXGcw8XG6V2koJZbYZsBQvz9kvQgfN43sLW9Ch9Wpx7w==
+"@glimmer/global-context@0.61.2", "@glimmer/global-context@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.2.tgz#d455827850c5b1f3eacae150defbfeea9f2f9342"
+  integrity sha512-rqNb2JAkDtakYI5y5wOEYmQym67woIA7KYbifB9/mL9N1xZXvc87XK/lO60+7U8IdX/guevnkw0N+Fkjkr+UOQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.1.tgz#f7249898f6bd130d43c13615e2151a85e21a0b74"
-  integrity sha512-Ga1Ttf9Tt/EMBEVSczE4SzNymY/nUDBwuk/Hss82Fqx5G8usB5a9fPfVoRmTXUmhe0Mm13PqHrvs5EV6D0ERDQ==
+"@glimmer/interfaces@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.2.tgz#c8760d9aab6469d4a3bde923f129fb86a3b70262"
+  integrity sha512-i4qTGFKXWD1Bjr3V6HVxTRWj8DzAhXQ0W0pvsymDRY/r386crH11sTclp8ZFyEiybA8JBlsUvadX8lUD7Oc0TA==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.1.tgz#5d5e683ca02624e0caa82311a5425efab8ecf34d"
-  integrity sha512-8dVXDni2AUa+yW2Cr+y3fbeNYmJZwsOhFhMaPCE54RrKiIOBnOqAWcmnu/Bw4fqAeaFKGk0f7vjVZ4lprIj69Q==
+"@glimmer/low-level@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.2.tgz#1d03de3341d73648abaf56a55f9a11c1bf8d6649"
+  integrity sha512-XYIOUgWqCSld43xzZgy4Mi2XN1r6xrL14VFbH4Eh3LwuT0avMqB6lJCeT3Xt4ROO1lDmVAuJIL4/eniBcErc0g==
 
-"@glimmer/node@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.1.tgz#4a2b32779b3e20f2d54509d0b4fc7535f6bbd6f4"
-  integrity sha512-NMiZ1p/PykmZtkgRe09OdYNojnIORHa7dbQTcloNDM0M7QuBoIYl4I+BA+cLYpfCKlRsZMlyRooPZ99GLFVuZw==
+"@glimmer/node@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.2.tgz#82f3f550b0dbb3a8628db3acffa6349a9a12aa6e"
+  integrity sha512-mkwfHjDcRzyQhyngqx8fVCT1VpPPWamnKEiDtnWLS/Ay9Or5ApK+cflmvWUaoIBrpLxhGoxBGI0j8lSECQDy/w==
   dependencies:
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/runtime" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/runtime" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.1.tgz#8dea0922a90a8ed4ee2c0787995bb040dc55d461"
-  integrity sha512-kSXq+s9VJQtw4KlJRirshkhDc8k1tjR/Lo1TLlKw3ThmgeKSKAWJoGlW5wjxuBGBA9bvDRucQfeMgcTKyPEYlQ==
-  dependencies:
-    "@glimmer/encoder" "^0.61.1"
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/program" "^0.61.1"
-    "@glimmer/reference" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
-    "@glimmer/vm" "^0.61.1"
-    "@glimmer/wire-format" "^0.61.1"
-
-"@glimmer/program@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.1.tgz#6b7194fbde55d550b3dde07f5cb5777632614200"
-  integrity sha512-TM7dw/2fBuU0g5ElE5vvHUV8E2Tg374B4JSTASY383J0qxHWKsOHN5m2QKN2PgvX6ssk2E8xBibHH/EW8jCq6g==
-  dependencies:
-    "@glimmer/encoder" "^0.61.1"
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
-
-"@glimmer/reference@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.1.tgz#a3394941ddf47a2bc00230d25dd312835751bbdb"
-  integrity sha512-7QS/AjF1/U/kmZWpDCF5PkyZpDrOkXWPATjcApNDdJpdtK762z5BzA4lK+ig2VjvkEMJLEbbnk9/ZqePPaBloQ==
+"@glimmer/opcode-compiler@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.2.tgz#424d01f99c7863bece55061abce7f297589fb175"
+  integrity sha512-XUALj/8PqEbStGSoYZ9jfli1BPKO55nUdPo5jpMEPPmRb/Ai6PZi2Q8Ih3RBOYQAIGOnlfLa4R8jUB+oz2lh2Q==
+  dependencies:
+    "@glimmer/encoder" "^0.61.2"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/program" "^0.61.2"
+    "@glimmer/reference" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
+    "@glimmer/vm" "^0.61.2"
+    "@glimmer/wire-format" "^0.61.2"
+
+"@glimmer/program@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.2.tgz#0e23fd9483117b1dccb594944c4c65744b5e82b6"
+  integrity sha512-nxVhZudrJBtBETCSG7DLy41daO3b2pckQ/jNcYzX8jrqe3hgr1eFo+xEr6s9jiceakDY51DXDtAmXwJbo04ZAg==
+  dependencies:
+    "@glimmer/encoder" "^0.61.2"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
+
+"@glimmer/reference@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.2.tgz#991f1f19bedf474af55ed42faebd526542a8d941"
+  integrity sha512-e1SZpao8ht2OYaWr1Q2vcNMqO6/g4usZmj3SzUCgHbXeB/u+VCPiHEl9S3WZXwQwMWTGzxphkB2Q1MaUagR1Cg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "^0.61.1"
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
-    "@glimmer/validator" "^0.61.1"
+    "@glimmer/global-context" "^0.61.2"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
+    "@glimmer/validator" "^0.61.2"
 
-"@glimmer/runtime@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.1.tgz#36e531da548b2148a9ad1f97eaf2834d6a5173c5"
-  integrity sha512-X0B1WnPDk2nJktbgFpDZJP9UhKwuwPaxj6mK29jft4uw7Ff62p3SCW3gqwWE1E7s4GnMAeO5FLoKuSTQjZL9Cw==
+"@glimmer/runtime@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.2.tgz#a7d525cde6a16ee0821f8e77c123a056d9f53cd1"
+  integrity sha512-1C/tODub6Hy/oAj7bU+RoOaLzJJkMkYQUc1KPOCGxb49kRe/RgN2mAPuM4BvZI00JReD/NXXBRAXVA0R/dUsXg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.61.1"
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/low-level" "^0.61.1"
-    "@glimmer/program" "^0.61.1"
-    "@glimmer/reference" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
-    "@glimmer/validator" "^0.61.1"
-    "@glimmer/vm" "^0.61.1"
-    "@glimmer/wire-format" "^0.61.1"
+    "@glimmer/global-context" "0.61.2"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/low-level" "^0.61.2"
+    "@glimmer/program" "^0.61.2"
+    "@glimmer/reference" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
+    "@glimmer/validator" "^0.61.2"
+    "@glimmer/vm" "^0.61.2"
+    "@glimmer/wire-format" "^0.61.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.1.tgz#8360c3e49c0806dc755c7465e4bd0ed14e25a16a"
-  integrity sha512-NhYG5u9Jjpdh9zh0x+ypnC1nesF2IjDkmHWrenEx4jDRo4csWK+uFBBzqwhNYjt4mTlSLpgA1pQLGdDEbcy4Xg==
+"@glimmer/syntax@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.2.tgz#a8c381872354ebf441e23cfd6fd27caacdb5356b"
+  integrity sha512-YiXP/saSy/JWVf6AiSWWZemCnYn6z9b4mAifqdba2D/3wrH5TScEiS01mDLlGi2HNhCXffcWf9aOAkEUbnOtFw==
   dependencies:
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
     handlebars "^4.7.4"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.1.tgz#0d5b7928659b78023420fdebca01e978ac3288f6"
-  integrity sha512-4NK84t281+BJVHhDWTySwfR7i4kCEbdTQ6e1b2FUL3sMuQywDMHJaQED3/uphKEIoi9ZTGPrdmKMQKIYKwi49A==
+"@glimmer/util@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.2.tgz#c1d7ccfdd38f97c828e218c6d8e237c0c96ff724"
+  integrity sha512-xel7wbNldpHzDOmC4GJ1je4UnSmehy5MGzPp/rEON9OcSggCrl2v8cEP413TMfyRGDQJ5Houkr0R4zpvs8aqOg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.1.tgz#8e7e289d938c70e5547e8e6d2fa4e977843ea434"
-  integrity sha512-HHDK/c8FV9TOL10HjKZs1erh1InwPpSwO9rtdNfUWGEhwnV7MjLjrjnFmJYsThmtOmdr4xy9C4C9Sx7GM2m6AQ==
+"@glimmer/validator@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.2.tgz#deeb324a767c776b55d5b2ba14700b881a16dd7e"
+  integrity sha512-gNZ+XFeP8fFAyqRr3kHXdRVaGTpfCTUfDOeo6mgsQXgoJl7wGV2pjMZVh9fImozUKCLzjLNd9Xtu11hcmwSHNg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.61.1"
+    "@glimmer/global-context" "0.61.2"
 
-"@glimmer/vm@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.1.tgz#3d2f91cf6cd4f352da04143fb34f0426ae5af18a"
-  integrity sha512-QpNWKwxA4w+2hYWJb/vFYIpdsgdnFocLecub9o1DgD2T8qIu3pfgz9RkAh28z3RPo6j3AXnQgVnLfQ/Tjn35sg==
+"@glimmer/vm@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.2.tgz#d9ddc7d8c4a7801e4d90a445eb7d7d6577676cc8"
+  integrity sha512-sak45jpV5hNRGSAq1dmvXfyAjF6MTMtrd8rD8UE7CCfSnnIXn2nUwbqkimHoxi9HvbdPzy1fK5pecpJYiG4htA==
   dependencies:
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
 
-"@glimmer/wire-format@^0.61.1":
-  version "0.61.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.1.tgz#a5787f46a444966ec26ad1228467a7ee5622fe41"
-  integrity sha512-N7icZ+4G0cVuYoakyZw+Mhsbb6f4C1Npdw6HD8XIXs/usZxvUH5fmf/pVB7kYkZj0AlxM4r3opEk4i7O2hv6PA==
+"@glimmer/wire-format@^0.61.2":
+  version "0.61.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.2.tgz#2c8a09d75ee77a7923e4c09222f1004a3c2d4ef8"
+  integrity sha512-HDy/3Vm1Lu2KQLMsKri6v0xSIxetqrGs+DK+XhECRaZicW2Y6LZE1+mDiTly9axO38jMHsNlnLtAryiQB3aM4Q==
   dependencies:
-    "@glimmer/interfaces" "^0.61.1"
-    "@glimmer/util" "^0.61.1"
+    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/util" "^0.61.2"
 
 "@simple-dom/document@^1.4.0":
   version "1.4.0"

From 1da222a1d3095ea2211fda5440542edd20ec243b Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesconovy@gmail.com>
Date: Thu, 3 Sep 2020 08:31:28 +0200
Subject: [PATCH 0105/1405] [DOC] Update documentation for `runInDebug`

The documentation was incorrect, see:
https://github.com/emberjs/ember.js/issues/18912
---
 packages/@ember/debug/index.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index be77e1984f6..b442439cc08 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -171,9 +171,7 @@ if (DEBUG) {
   /**
     Display a debug notice.
 
-    Calls to this function are removed from production builds, so they can be
-    freely added for documentation and debugging purposes without worries of
-    incuring any performance penalty.
+    Calls to this function are not invoked in production builds.
 
     ```javascript
     import { debug } from '@ember/debug';

From 84141355406d8abab328c3ad680ac27f9730eda3 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Fri, 4 Sep 2020 11:56:52 -0400
Subject: [PATCH 0106/1405] consume only currentURL on the private router
 instead of computed aliases

---
 packages/@ember/-internals/routing/lib/services/router.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 8fa2fe7239f..ab114790ea5 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -320,8 +320,7 @@ export default class RouterService extends Service {
     // you'd expect isBarActive to be dirtied when the route changes.
     //
     // https://github.com/emberjs/ember.js/issues/19004
-    consumeTag(tagFor(this, 'currentURL'));
-    consumeTag(tagFor(this, 'currentRouteName'));
+    consumeTag(tagFor(this._router, 'currentURL'));
 
     // UNSAFE: casting `routeName as string` here encodes the existing
     // assumption but may be wrong: `extractRouteArgs` correctly returns it as

From 97967d8cb2ab1e28144e1e1fcb142580c19a001d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 5 Sep 2020 18:02:25 +0000
Subject: [PATCH 0107/1405] [Security] Bump http-proxy from 1.17.0 to 1.18.1

Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. **This update includes a security fix.**
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3a3413cbe1c..06a6fa3e8a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3139,7 +3139,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-debug@=3.1.0, debug@~3.1.0:
+debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
@@ -4075,10 +4075,10 @@ event-stream@=3.3.4:
     stream-combiner "~0.0.4"
     through "~2.3.1"
 
-eventemitter3@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-  integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events-to-array@^1.0.1:
   version "1.1.2"
@@ -4480,11 +4480,9 @@ flatted@^2.0.0:
   integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
 
 follow-redirects@^1.0.0:
-  version "1.5.10"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
-  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
-  dependencies:
-    debug "=3.1.0"
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
+  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -5138,11 +5136,11 @@ http-parser-js@>=0.4.0:
   integrity sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=
 
 http-proxy@^1.13.1, http-proxy@^1.17.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
-  integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
-    eventemitter3 "^3.0.0"
+    eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 

From cba436fe343c51b7ec4012eaddf9aacef7971eef Mon Sep 17 00:00:00 2001
From: Aleksandr Kanunnikov <lifeart92@gmail.com>
Date: Wed, 9 Sep 2020 18:27:19 +0300
Subject: [PATCH 0108/1405] removed module unification usages

---
 blueprints/controller-test/index.js           |  49 +--
 blueprints/controller/index.js                |  23 --
 blueprints/helper-test/index.js               |  58 +---
 blueprints/helper/index.js                    |  40 +--
 blueprints/initializer-test/index.js          |  36 +-
 blueprints/initializer/index.js               |  20 +-
 blueprints/instance-initializer-test/index.js |  37 +--
 blueprints/instance-initializer/index.js      |  18 -
 blueprints/mixin-test/index.js                |  32 +-
 blueprints/mixin/index.js                     |  19 --
 blueprints/module-unification.js              |   7 -
 blueprints/route-test/index.js                |  67 ++--
 blueprints/route/index.js                     | 107 +++---
 blueprints/service-test/index.js              |  32 +-
 blueprints/service/index.js                   |  19 --
 blueprints/template/index.js                  |  26 --
 blueprints/util-test/index.js                 |  32 +-
 blueprints/util/index.js                      |  22 --
 node-tests/blueprints/acceptance-test-test.js | 133 --------
 node-tests/blueprints/controller-test-test.js | 169 ----------
 node-tests/blueprints/controller-test.js      | 179 ----------
 node-tests/blueprints/helper-test-test.js     | 167 ----------
 node-tests/blueprints/helper-test.js          | 167 ----------
 .../blueprints/initializer-test-test.js       | 113 -------
 node-tests/blueprints/initializer-test.js     | 137 --------
 .../instance-initializer-test-test.js         | 112 -------
 .../blueprints/instance-initializer-test.js   | 135 --------
 node-tests/blueprints/mixin-test-test.js      |  77 -----
 node-tests/blueprints/mixin-test.js           | 149 ---------
 node-tests/blueprints/route-test.js           | 310 ------------------
 node-tests/blueprints/service-test.js         | 123 -------
 node-tests/blueprints/template-test.js        |  91 -----
 node-tests/blueprints/util-test-test.js       |  81 -----
 node-tests/blueprints/util-test.js            | 126 -------
 .../module-unification/default.js             |  26 --
 .../module-unification/dummy.js               |  26 --
 .../module-unification/mocha-rfc232.js        |  29 --
 .../module-unification/mocha.js               |  29 --
 .../module-unification/rfc232.js              |  29 --
 .../module-unification/default.js             |  25 --
 .../module-unification/dummy.js               |  25 --
 .../module-unification/mocha-rfc232.js        |  28 --
 .../module-unification/mocha.js               |  30 --
 .../module-unification/rfc232.js              |  29 --
 node-tests/helpers/setup-test-environment.js  |  11 -
 .../-internals/container/lib/container.ts     |  12 +-
 .../container/tests/container_test.js         | 140 --------
 .../container/tests/registry_test.js          |  70 ----
 .../@ember/-internals/glimmer/lib/resolver.ts |  73 +----
 .../components/component-template-test.js     | 196 ++++++-----
 .../components/local-lookup-test.js           | 127 -------
 .../components/namespaced-lookup-test.js      | 186 -----------
 .../-internals/metal/lib/injected_property.ts |  16 -
 .../ember/tests/service_injection_test.js     | 197 -----------
 54 files changed, 234 insertions(+), 3983 deletions(-)
 delete mode 100644 blueprints/module-unification.js
 delete mode 100644 node-tests/fixtures/initializer-test/module-unification/default.js
 delete mode 100644 node-tests/fixtures/initializer-test/module-unification/dummy.js
 delete mode 100644 node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
 delete mode 100644 node-tests/fixtures/initializer-test/module-unification/mocha.js
 delete mode 100644 node-tests/fixtures/initializer-test/module-unification/rfc232.js
 delete mode 100644 node-tests/fixtures/instance-initializer-test/module-unification/default.js
 delete mode 100644 node-tests/fixtures/instance-initializer-test/module-unification/dummy.js
 delete mode 100644 node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js
 delete mode 100644 node-tests/fixtures/instance-initializer-test/module-unification/mocha.js
 delete mode 100644 node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/components/namespaced-lookup-test.js

diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js
index 90dd95340c6..1e920b2b434 100644
--- a/blueprints/controller-test/index.js
+++ b/blueprints/controller-test/index.js
@@ -3,7 +3,6 @@
 const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 const path = require('path');
 
 module.exports = useTestFrameworkDetector({
@@ -18,39 +17,19 @@ module.exports = useTestFrameworkDetector({
     };
   },
   fileMapTokens: function() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __test__() {
-          return 'controller-test';
-        },
-        __testType__() {
-          return '';
-        },
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-          return 'src';
-        },
-        __path__(options) {
-          return path.join('ui', 'routes', options.dasherizedModuleName);
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return 'unit';
-        },
-        __path__(options) {
-          if (options.pod) {
-            return path.join(options.podPath, options.dasherizedModuleName);
-          }
-          return 'controllers';
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return 'unit';
+      },
+      __path__(options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.dasherizedModuleName);
+        }
+        return 'controllers';
+      },
+    };
   },
 });
diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
index 6a4b8d1e9b6..b3174f03e6d 100644
--- a/blueprints/controller/index.js
+++ b/blueprints/controller/index.js
@@ -1,32 +1,9 @@
 'use strict';
 
 const useEditionDetector = require('../edition-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
-const path = require('path');
 
 module.exports = useEditionDetector({
   description: 'Generates a controller.',
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src');
-          }
-          return 'src';
-        },
-        __path__(options) {
-          return path.join('ui', 'routes', options.dasherizedModuleName);
-        },
-        __name__() {
-          return 'controller';
-        },
-      };
-    }
-  },
   normalizeEntityName: function(entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index 8d042b7e073..c9bd0367db6 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -5,9 +5,6 @@ const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
-
-const path = require('path');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a helper integration test or a unit test.',
@@ -27,55 +24,24 @@ module.exports = useTestFrameworkDetector({
   ],
 
   fileMapTokens: function() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.inRepoAddon) {
-            return path.join('packages', options.inRepoAddon, 'src');
-          }
-
-          if (options.inDummy) {
-            throw new Error("The --dummy flag isn't supported within a module unification app");
-          }
-
-          return 'src';
-        },
-        __testType__() {
-          return '';
-        },
-        __collection__() {
-          return 'ui/components';
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__(options) {
-          return options.locals.testType || 'integration';
-        },
-        __collection__() {
-          return 'helpers';
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__(options) {
+        return options.locals.testType || 'integration';
+      },
+      __collection__() {
+        return 'helpers';
+      },
+    };
   },
 
   locals: function(options) {
     let testType = options.testType || 'integration';
     let testName = testType === 'integration' ? 'Integration' : 'Unit';
     let friendlyTestName = [testName, 'Helper', options.entity.name].join(' | ');
-    let dasherizedModulePrefix;
-
-    if (
-      isModuleUnificationProject(options.project) &&
-      (options.project.isEmberCLIAddon() || options.inRepoAddon)
-    ) {
-      dasherizedModulePrefix = options.inRepoAddon || options.project.name();
-    } else {
-      dasherizedModulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
-    }
+    let dasherizedModulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
 
     let hbsImportStatement = this._useNamedHbsImport()
       ? "import { hbs } from 'ember-cli-htmlbars';"
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
index 5aaca5f9068..58ec241153b 100644
--- a/blueprints/helper/index.js
+++ b/blueprints/helper/index.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 
 const path = require('path');
@@ -9,43 +8,16 @@ module.exports = {
   description: 'Generates a helper function.',
 
   filesPath() {
-    let rootPath = isModuleUnificationProject(this.project) ? 'mu-files' : 'files';
+    let rootPath = 'files';
     return path.join(this.path, rootPath);
   },
 
   fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          if (options.inRepoAddon) {
-            return path.join('packages', options.inRepoAddon, 'src');
-          }
-
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src');
-          }
-
-          return 'src';
-        },
-        __collection__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          return path.join('ui', 'components');
-        },
-      };
-    } else {
-      return {
-        __collection__() {
-          return 'helpers';
-        },
-      };
-    }
+    return {
+      __collection__() {
+        return 'helpers';
+      },
+    };
   },
 
   normalizeEntityName: function(entityName) {
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index 8394f9c5dbe..f040601a551 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -5,43 +5,23 @@ const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an initializer unit test.',
 
   fileMapTokens: function() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error('Pods arenʼt supported within a module unification app');
-          } else if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src', 'init');
-          }
-          return path.join('src', 'init');
-        },
-        __testType__() {
-          return '';
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return 'unit';
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return 'unit';
+      },
+    };
   },
 
   locals: function(options) {
     let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
-    if (isModuleUnificationProject(this.project)) {
-      modulePrefix += '/init';
-    }
     return {
       friendlyTestName: ['Unit', 'Initializer', options.entity.name].join(' | '),
       modulePrefix,
diff --git a/blueprints/initializer/index.js b/blueprints/initializer/index.js
index d241e963531..1a96d3a0735 100644
--- a/blueprints/initializer/index.js
+++ b/blueprints/initializer/index.js
@@ -1,23 +1,5 @@
 'use strict';
 
-const path = require('path');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
-
 module.exports = {
-  description: 'Generates an initializer.',
-
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error('Pods arenʼt supported within a module unification app');
-          } else if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src/init');
-          }
-          return 'src/init';
-        },
-      };
-    }
-  },
+  description: 'Generates an initializer.'
 };
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index 64f6bc22cd9..7edbd464123 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -5,42 +5,23 @@ const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an instance initializer unit test.',
 
   fileMapTokens: function() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error('Pods arenʼt supported within a module unification app');
-          } else if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src', 'init');
-          }
-          return path.join('src', 'init');
-        },
-        __testType__() {
-          return '';
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return 'unit';
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return 'unit';
+      },
+    };
   },
   locals: function(options) {
     let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
-    if (isModuleUnificationProject(this.project)) {
-      modulePrefix += '/init';
-    }
+
     return {
       friendlyTestName: ['Unit', 'Instance Initializer', options.entity.name].join(' | '),
       modulePrefix,
diff --git a/blueprints/instance-initializer/index.js b/blueprints/instance-initializer/index.js
index 533141bff4f..79c87c1db92 100644
--- a/blueprints/instance-initializer/index.js
+++ b/blueprints/instance-initializer/index.js
@@ -1,23 +1,5 @@
 'use strict';
 
-const path = require('path');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
-
 module.exports = {
   description: 'Generates an instance initializer.',
-
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error('Pods arenʼt supported within a module unification app');
-          } else if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src/init');
-          }
-          return 'src/init';
-        },
-      };
-    }
-  },
 };
diff --git a/blueprints/mixin-test/index.js b/blueprints/mixin-test/index.js
index f55cbc640e6..126fa5995ce 100644
--- a/blueprints/mixin-test/index.js
+++ b/blueprints/mixin-test/index.js
@@ -3,35 +3,19 @@
 const path = require('path');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a mixin unit test.',
 
   fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          return 'src';
-        },
-        __testType__() {
-          return 'mixins';
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return path.join('unit', 'mixins');
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return path.join('unit', 'mixins');
+      },
+    };
   },
 
   locals: function(options) {
diff --git a/blueprints/mixin/index.js b/blueprints/mixin/index.js
index 929d1cc0303..bce45489630 100644
--- a/blueprints/mixin/index.js
+++ b/blueprints/mixin/index.js
@@ -1,28 +1,9 @@
 'use strict';
 
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 const path = require('path');
 
 module.exports = {
   description: 'Generates a mixin.',
-
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src');
-          }
-
-          return 'src';
-        },
-      };
-    }
-  },
   normalizeEntityName: function(entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/blueprints/module-unification.js b/blueprints/module-unification.js
deleted file mode 100644
index aa7f4683ae7..00000000000
--- a/blueprints/module-unification.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-module.exports = {
-  isModuleUnificationProject(project) {
-    return project && project.isModuleUnification && project.isModuleUnification();
-  },
-};
diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js
index 1ba5e879c8e..e410e62a7f5 100644
--- a/blueprints/route-test/index.js
+++ b/blueprints/route-test/index.js
@@ -3,7 +3,6 @@
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
@@ -16,49 +15,29 @@ module.exports = useTestFrameworkDetector({
   ],
 
   fileMapTokens: function() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __test__() {
-          return 'route-test';
-        },
-        __root__(options) {
-          if (options.inRepoAddon) {
-            return path.join('packages', options.inRepoAddon, 'src');
-          }
-          return 'src';
-        },
-        __testType__() {
-          return '';
-        },
-        __path__(options) {
-          return path.join('ui', 'routes', options.dasherizedModuleName);
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return 'unit';
-        },
-        __test__: function(options) {
-          let moduleName = options.locals.moduleName;
-
-          if (options.pod) {
-            moduleName = 'route';
-          }
-
-          return `${moduleName}-test`;
-        },
-        __path__: function(options) {
-          if (options.pod) {
-            return path.join(options.podPath, options.locals.moduleName);
-          }
-          return 'routes';
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return 'unit';
+      },
+      __test__: function(options) {
+        let moduleName = options.locals.moduleName;
+
+        if (options.pod) {
+          moduleName = 'route';
+        }
+
+        return `${moduleName}-test`;
+      },
+      __path__: function(options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.moduleName);
+        }
+        return 'routes';
+      },
+    };
   },
 
   locals: function(options) {
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index beb2ad74c41..19342c72786 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -6,7 +6,6 @@ const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
 const useEditionDetector = require('../edition-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useEditionDetector({
   description: 'Generates a route and a template, and registers the route with the router.',
@@ -29,73 +28,47 @@ module.exports = useEditionDetector({
   ],
 
   fileMapTokens: function() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src');
-          }
-          return 'src';
-        },
-        __path__(options) {
-          return path.join('ui', 'routes', options.dasherizedModuleName);
-        },
-        __name__() {
+    return {
+      __name__(options) {
+        if (options.pod) {
           return 'route';
-        },
-        __templatepath__(options) {
-          return path.join('ui', 'routes', options.dasherizedModuleName);
-        },
-        __templatename__() {
+        }
+        return options.locals.moduleName;
+      },
+      __path__(options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.moduleName);
+        }
+        return 'routes';
+      },
+      __templatepath__(options) {
+        if (options.pod) {
+          return path.join(options.podPath, options.locals.moduleName);
+        }
+        return 'templates';
+      },
+      __templatename__(options) {
+        if (options.pod) {
           return 'template';
-        },
-      };
-    } else {
-      return {
-        __name__(options) {
-          if (options.pod) {
-            return 'route';
-          }
-          return options.locals.moduleName;
-        },
-        __path__(options) {
-          if (options.pod) {
-            return path.join(options.podPath, options.locals.moduleName);
-          }
-          return 'routes';
-        },
-        __templatepath__(options) {
-          if (options.pod) {
-            return path.join(options.podPath, options.locals.moduleName);
-          }
-          return 'templates';
-        },
-        __templatename__(options) {
-          if (options.pod) {
-            return 'template';
-          }
-          return options.locals.moduleName;
-        },
-        __root__(options) {
-          if (options.inRepoAddon) {
-            return path.join('lib', options.inRepoAddon, 'addon');
-          }
-
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'app');
-          }
-
-          if (options.inAddon) {
-            return 'addon';
-          }
-
-          return 'app';
-        },
-      };
-    }
+        }
+        return options.locals.moduleName;
+      },
+      __root__(options) {
+        if (options.inRepoAddon) {
+          return path.join('lib', options.inRepoAddon, 'addon');
+        }
+
+        if (options.inDummy) {
+          return path.join('tests', 'dummy', 'app');
+        }
+
+        if (options.inAddon) {
+          return 'addon';
+        }
+
+        return 'app';
+      },
+    };
   },
 
   locals: function(options) {
@@ -163,7 +136,7 @@ function updateRouter(action, options) {
 
 function findRouter(options) {
   let routerPathParts = [options.project.root];
-  let root = isModuleUnificationProject(options.project) ? 'src' : 'app';
+  let root = 'app';
 
   if (options.dummy && options.project.isEmberCLIAddon()) {
     routerPathParts = routerPathParts.concat(['tests', 'dummy', root, 'router.js']);
diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.js
index cfe1c361ebc..bb022737ce8 100644
--- a/blueprints/service-test/index.js
+++ b/blueprints/service-test/index.js
@@ -1,35 +1,19 @@
 'use strict';
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a service unit test.',
 
   fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          return 'src';
-        },
-        __testType__() {
-          return '';
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return 'unit';
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return 'unit';
+      },
+    };
   },
 
   locals(options) {
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index 031b5a979ce..793a2e948c5 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -2,28 +2,9 @@
 
 const path = require('path');
 const useEditionDetector = require('../edition-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useEditionDetector({
   description: 'Generates a service.',
-
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src');
-          }
-
-          return 'src';
-        },
-      };
-    }
-  },
   normalizeEntityName: function(entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/blueprints/template/index.js b/blueprints/template/index.js
index d4db3cb1805..9418f1d40ea 100644
--- a/blueprints/template/index.js
+++ b/blueprints/template/index.js
@@ -1,33 +1,7 @@
 'use strict';
 
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
-
 module.exports = {
   description: 'Generates a template.',
-
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          } else if (options.inDummy) {
-            return 'tests/dummy/src/ui/routes';
-          } else {
-            return 'src/ui/routes';
-          }
-        },
-
-        __path__(options) {
-          return options.dasherizedModuleName;
-        },
-
-        __name__() {
-          return 'template';
-        },
-      };
-    }
-  },
   normalizeEntityName: function(entityName) {
     return entityName.replace(/\.hbs$/, ''); //Prevent generation of ".hbs.hbs" files
   },
diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
index 28f283435c6..a52f1eb7aa9 100644
--- a/blueprints/util-test/index.js
+++ b/blueprints/util-test/index.js
@@ -4,35 +4,19 @@ const stringUtils = require('ember-cli-string-utils');
 const path = require('path');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a util unit test.',
 
   fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          return 'src';
-        },
-        __testType__() {
-          return 'utils';
-        },
-      };
-    } else {
-      return {
-        __root__() {
-          return 'tests';
-        },
-        __testType__() {
-          return path.join('unit', 'utils');
-        },
-      };
-    }
+    return {
+      __root__() {
+        return 'tests';
+      },
+      __testType__() {
+        return path.join('unit', 'utils');
+      },
+    };
   },
 
   locals: function(options) {
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
index 5c741a18a00..4ca8dc4d51d 100644
--- a/blueprints/util/index.js
+++ b/blueprints/util/index.js
@@ -1,31 +1,9 @@
 'use strict';
 
 const path = require('path');
-const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 
 module.exports = {
   description: 'Generates a simple utility module/function.',
-
-  fileMapTokens() {
-    if (isModuleUnificationProject(this.project)) {
-      return {
-        __root__(options) {
-          if (options.pod) {
-            throw new Error("Pods aren't supported within a module unification app");
-          }
-
-          if (options.inDummy) {
-            return path.join('tests', 'dummy', 'src');
-          }
-
-          return 'src';
-        },
-        __testType__() {
-          return '';
-        },
-      };
-    }
-  },
   normalizeEntityName: function(entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index 763464b3647..d7f4ff7b91b 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -10,8 +10,6 @@ const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
 const fixture = require('../helpers/fixture');
 
 describe('Blueprint: acceptance-test', function() {
@@ -145,135 +143,4 @@ describe('Blueprint: acceptance-test', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
-          expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/default.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
-          expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/qunit-rfc268.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-      });
-
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
-          expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/mocha.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
-        generateFakePackageManifest('ember-mocha', '0.14.0');
-      });
-
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
-          expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/mocha-rfc268.js')
-          );
-        });
-      });
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' });
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
-          expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/addon-default.js')
-          );
-
-          expect(_file('app/acceptance-tests/foo.js')).to.not.exist;
-        });
-      });
-
-      it('acceptance-test foo/bar', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo/bar'], _file => {
-          expect(_file('tests/acceptance/foo/bar-test.js')).to.equal(
-            fixture('acceptance-test/addon-nested.js')
-          );
-
-          expect(_file('app/acceptance-tests/foo/bar.js')).to.not.exist;
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
-          expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/qunit-rfc268.js')
-          );
-        });
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/controller-test-test.js b/node-tests/blueprints/controller-test-test.js
index a50cb2cf3ba..7b1e1ac5e02 100644
--- a/node-tests/blueprints/controller-test-test.js
+++ b/node-tests/blueprints/controller-test-test.js
@@ -12,9 +12,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: controller-test', function() {
   setupTestHooks(this);
 
@@ -151,141 +148,6 @@ describe('Blueprint: controller-test', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
-          expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-            fixture('controller-test/default.js')
-          );
-        });
-      });
-
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
-          expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-            fixture('controller-test/default-nested.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
-          expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-            fixture('controller-test/rfc232.js')
-          );
-        });
-      });
-
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
-          expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-            fixture('controller-test/rfc232-nested.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-mocha', '0.11.0');
-      });
-
-      it('controller-test foo for mocha', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
-          expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-            fixture('controller-test/mocha.js')
-          );
-        });
-      });
-
-      it('controller-test foo/bar for mocha', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
-          expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-            fixture('controller-test/mocha-nested.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-mocha', '0.12.0');
-      });
-
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
-          expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-            fixture('controller-test/mocha-0.12.js')
-          );
-        });
-      });
-
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
-          expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-            fixture('controller-test/mocha-0.12-nested.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
-        generateFakePackageManifest('ember-mocha', '0.14.0');
-      });
-
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
-          expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-            fixture('controller-test/mocha-rfc232.js')
-          );
-        });
-      });
-
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
-          expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-            fixture('controller-test/mocha-rfc232-nested.js')
-          );
-        });
-      });
-    });
-  });
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' })
@@ -314,35 +176,4 @@ describe('Blueprint: controller-test', function() {
       });
     });
   });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('controller-test foo', function() {
-      return emberGenerateDestroy(['controller-test', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller-test foo/bar', function() {
-      return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
-        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js
index c77eddf2e80..a945b66389e 100644
--- a/node-tests/blueprints/controller-test.js
+++ b/node-tests/blueprints/controller-test.js
@@ -15,7 +15,6 @@ const generateFakePackageManifest = require('../helpers/generate-fake-package-ma
 const fixture = require('../helpers/fixture');
 
 const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
 const enableOctane = setupTestEnvironment.enableOctane;
 
 describe('Blueprint: controller', function() {
@@ -244,184 +243,6 @@ describe('Blueprint: controller', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('controller foo', function() {
-      return emberGenerateDestroy(['controller', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/controller.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo.js', function() {
-      return emberGenerateDestroy(['controller', 'foo.js'], _file => {
-        expect(_file('src/ui/routes/foo.js/controller.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo.js/controller-test.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/controller.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo/bar', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
-        expect(_file('src/ui/routes/foo/bar/controller.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-      });
-    });
-
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('controller foo --pod podModulePrefix', function() {
-        return expectError(
-          emberGenerateDestroy(['controller', 'foo', '--pod']),
-          "Pods aren't supported within a module unification app"
-        );
-      });
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('controller foo', function() {
-      return emberGenerateDestroy(['controller', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/controller.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-
-        expect(_file('app/controllers/foo.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo.js', function() {
-      return emberGenerateDestroy(['controller', 'foo.js'], _file => {
-        expect(_file('src/ui/routes/foo.js/controller.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo.js/controller-test.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/controller.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-
-        expect(_file('app/controllers/foo.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo/bar', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
-        expect(_file('src/ui/routes/foo/bar/controller.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-
-        expect(_file('app/controllers/foo/bar.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo/controller.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('src/ui/routes/foo/controller.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo.js --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo.js', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo.js/controller.js')).to.not.exist;
-
-        expect(_file('tests/dummy/src/ui/routes/foo/controller.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('src/ui/routes/foo/controller.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/controller-test.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo/bar --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo/bar/controller.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('src/ui/routes/foo/bar/controller.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.not.exist;
-      });
-    });
-
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('controller foo --pod podModulePrefix', function() {
-        return expectError(
-          emberGenerateDestroy(['controller', 'foo', '--pod']),
-          "Pods aren't supported within a module unification app"
-        );
-      });
-    });
-  });
-
   describe('in app - octane', function() {
     enableOctane();
 
diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js
index 713d539ea57..97480d6c96d 100644
--- a/node-tests/blueprints/helper-test-test.js
+++ b/node-tests/blueprints/helper-test-test.js
@@ -12,9 +12,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: helper-test', function() {
   setupTestHooks(this);
 
@@ -151,141 +148,6 @@ describe('Blueprint: helper-test', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('helper-test foo/bar-baz', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/integration.js')
-          );
-        });
-      });
-
-      it('helper-test foo/bar-baz --integration', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--integration'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/integration.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('helper-test foo/bar-baz', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/rfc232.js')
-          );
-        });
-      });
-
-      it('helper-test foo/bar-baz --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/rfc232-unit.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-mocha', '0.11.0');
-      });
-
-      it('helper-test foo/bar-baz --integration', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha.js')
-          );
-        });
-      });
-
-      it('helper-test foo/bar-baz --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-unit.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-mocha', '0.12.0');
-      });
-
-      it('helper-test foo/bar-baz for mocha', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-0.12.js')
-          );
-        });
-      });
-
-      it('helper-test foo/bar-baz for mocha --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-0.12-unit.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
-        generateFakePackageManifest('ember-mocha', '0.14.0');
-      });
-
-      it('helper-test foo/bar-baz for mocha', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-rfc232.js')
-          );
-        });
-      });
-
-      it('helper-test foo/bar-baz for mocha --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
-          expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-rfc232-unit.js')
-          );
-        });
-      });
-    });
-  });
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' }).then(() => {
@@ -306,33 +168,4 @@ describe('Blueprint: helper-test', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' }).then(() => {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-    });
-
-    it('helper-test foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
-      });
-    });
-
-    it('helper-test foo/bar-baz --unit', function() {
-      return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/module-unification/addon-unit.js')
-        );
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/helper-test.js b/node-tests/blueprints/helper-test.js
index 0cc5ff0ba73..aa8c0ee5d5f 100644
--- a/node-tests/blueprints/helper-test.js
+++ b/node-tests/blueprints/helper-test.js
@@ -13,9 +13,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: helper', function() {
   setupTestHooks(this);
 
@@ -109,50 +106,6 @@ describe('Blueprint: helper', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew().then(() => {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-    });
-
-    it('helper foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.equal(fixture('helper/mu-helper.js'));
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
-      });
-    });
-
-    it('helper foo/bar-baz.js', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz.js'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz.js.js')).to.not.exist;
-        expect(_file('src/ui/components/foo/bar-baz.js-test.js')).to.not.exist;
-
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.equal(fixture('helper/mu-helper.js'));
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
-      });
-    });
-
-    it('helper foo/bar-baz unit', function() {
-      return emberGenerateDestroy(['helper', '--test-type=unit', 'foo/bar-baz'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.equal(fixture('helper/mu-helper.js'));
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/unit.js')
-        );
-      });
-    });
-  });
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' }).then(() => {
@@ -211,70 +164,6 @@ describe('Blueprint: helper', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' }).then(() => {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-    });
-
-    it('helper foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.equal(fixture('helper/mu-helper.js'));
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
-      });
-    });
-
-    it('helper foo/bar-baz unit', function() {
-      return emberGenerateDestroy(['helper', '--test-type=unit', 'foo/bar-baz'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.equal(fixture('helper/mu-helper.js'));
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/module-unification/addon-unit.js')
-        );
-      });
-    });
-
-    it('helper foo/bar-baz.js unit', function() {
-      return emberGenerateDestroy(['helper', '--test-type=unit', 'foo/bar-baz'], _file => {
-        expect(_file('src/ui/components/foo/bar-baz.js.js')).to.not.exist;
-        expect(_file('src/ui/components/foo/bar-baz.js-test.js')).to.not.exist;
-
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.equal(fixture('helper/mu-helper.js'));
-        expect(_file('src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/module-unification/addon-unit.js')
-        );
-      });
-    });
-
-    it('helper foo/bar-baz --dummy', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/components/foo/bar-baz.js')).to.equal(
-          fixture('helper/mu-helper.js')
-        );
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.not.exist;
-      });
-    });
-
-    it('helper foo/bar-baz.js --dummy', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/components/foo/bar-baz.js.js')).to.not.exist;
-
-        expect(_file('tests/dummy/src/ui/components/foo/bar-baz.js')).to.equal(
-          fixture('helper/mu-helper.js')
-        );
-        expect(_file('src/ui/components/foo/bar-baz.js')).to.not.exist;
-      });
-    });
-  });
-
   describe('in in-repo-addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'in-repo-addon' }).then(() => {
@@ -321,60 +210,4 @@ describe('Blueprint: helper', function() {
       );
     });
   });
-
-  describe('in in-repo-addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'in-repo-addon' }).then(() => {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-    });
-
-    it('helper foo/bar-baz --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('packages/my-addon/src/ui/components/foo/bar-baz.js')).to.equal(
-          fixture('helper/mu-helper.js')
-        );
-        expect(_file('packages/my-addon/src/ui/components/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
-      });
-    });
-
-    it('helper foo/bar-baz.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(
-        ['helper', 'foo/bar-baz.js', '--in-repo-addon=my-addon'],
-        _file => {
-          expect(_file('packages/my-addon/src/ui/components/foo/bar-baz.js.js')).to.not.exist;
-          expect(_file('packages/my-addon/src/ui/components/foo/bar-baz.js-test.js')).to.not.exist;
-
-          expect(_file('packages/my-addon/src/ui/components/foo/bar-baz.js')).to.equal(
-            fixture('helper/mu-helper.js')
-          );
-          expect(_file('packages/my-addon/src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/integration.js')
-          );
-        }
-      );
-    });
-
-    it('helper foo/bar-baz unit --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(
-        ['helper', '--test-type=unit', 'foo/bar-baz', '--in-repo-addon=my-addon'],
-        _file => {
-          expect(_file('packages/my-addon/src/ui/components/foo/bar-baz.js')).to.equal(
-            fixture('helper/mu-helper.js')
-          );
-          expect(_file('packages/my-addon/src/ui/components/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/module-unification/addon-unit.js')
-          );
-        }
-      );
-    });
-  });
 });
diff --git a/node-tests/blueprints/initializer-test-test.js b/node-tests/blueprints/initializer-test-test.js
index 89aa9b72e3e..61fb5fcf40b 100644
--- a/node-tests/blueprints/initializer-test-test.js
+++ b/node-tests/blueprints/initializer-test-test.js
@@ -12,9 +12,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: initializer-test', function() {
   setupTestHooks(this);
 
@@ -115,114 +112,4 @@ describe('Blueprint: initializer-test', function() {
       });
     });
   });
-
-  describe('in app – module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
-          expect(_file('src/init/initializers/foo-test.js')).to.equal(
-            fixture('initializer-test/module-unification/default.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
-          expect(_file('src/init/initializers/foo-test.js')).to.equal(
-            fixture('initializer-test/module-unification/rfc232.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-      });
-
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
-          expect(_file('src/init/initializers/foo-test.js')).to.equal(
-            fixture('initializer-test/module-unification/mocha.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
-        generateFakePackageManifest('ember-mocha', '0.14.0');
-      });
-
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
-          expect(_file('src/init/initializers/foo-test.js')).to.equal(
-            fixture('initializer-test/module-unification/mocha-rfc232.js')
-          );
-        });
-      });
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' });
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
-          expect(_file('src/init/initializers/foo-test.js')).to.equal(
-            fixture('initializer-test/module-unification/dummy.js')
-          );
-        });
-      });
-
-      it('initializer-test foo --dummy', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo', '--dummy'], _file => {
-          expect(_file('tests/dummy/src/init/initializers/foo-test.js')).to.equal(
-            fixture('initializer-test/module-unification/dummy.js')
-          );
-        });
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/initializer-test.js b/node-tests/blueprints/initializer-test.js
index 360a2f4afc0..a06bd51815f 100644
--- a/node-tests/blueprints/initializer-test.js
+++ b/node-tests/blueprints/initializer-test.js
@@ -14,9 +14,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: initializer', function() {
   setupTestHooks(this);
 
@@ -192,138 +189,4 @@ describe('Blueprint: initializer', function() {
       });
     });
   });
-
-  describe('in app – module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('initializer foo', function() {
-      return emberGenerateDestroy(['initializer', 'foo'], _file => {
-        expect(_file('src/init/initializers/foo.js')).to.equal(
-          fixture('initializer/initializer.js')
-        );
-
-        expect(_file('src/init/initializers/foo-test.js')).to.contain(
-          "import { initialize } from 'my-app/init/initializers/foo';"
-        );
-      });
-    });
-
-    it('initializer foo/bar', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
-        expect(_file('src/init/initializers/foo/bar.js')).to.equal(
-          fixture('initializer/initializer-nested.js')
-        );
-
-        expect(_file('src/init/initializers/foo/bar-test.js')).to.contain(
-          "import { initialize } from 'my-app/init/initializers/foo/bar';"
-        );
-      });
-    });
-
-    it('initializer foo --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['initializer', 'foo', '--pod']),
-        'Pods arenʼt supported within a module unification app'
-      );
-    });
-
-    it('initializer foo/bar --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['initializer', 'foo/bar', '--pod']),
-        'Pods arenʼt supported within a module unification app'
-      );
-    });
-
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('initializer foo --pod', function() {
-        return expectError(
-          emberGenerateDestroy(['initializer', 'foo', '--pod']),
-          'Pods arenʼt supported within a module unification app'
-        );
-      });
-
-      it('initializer foo/bar --pod', function() {
-        return expectError(
-          emberGenerateDestroy(['initializer', 'foo/bar', '--pod']),
-          'Pods arenʼt supported within a module unification app'
-        );
-      });
-    });
-  });
-
-  describe('in addon – module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('initializer foo', function() {
-      return emberGenerateDestroy(['initializer', 'foo'], _file => {
-        expect(_file('src/init/initializers/foo.js')).to.equal(
-          fixture('initializer/initializer.js')
-        );
-
-        expect(_file('src/init/initializers/foo-test.js')).to.contain(
-          "import { initialize } from 'dummy/init/initializers/foo';"
-        );
-      });
-    });
-
-    it('initializer foo/bar', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
-        expect(_file('src/init/initializers/foo/bar.js')).to.equal(
-          fixture('initializer/initializer-nested.js')
-        );
-
-        expect(_file('src/init/initializers/foo/bar-test.js')).to.contain(
-          "import { initialize } from 'dummy/init/initializers/foo/bar';"
-        );
-      });
-    });
-
-    it('initializer foo --dummy', function() {
-      return emberGenerateDestroy(['initializer', 'foo', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/init/initializers/foo.js')).to.equal(
-          fixture('initializer/initializer.js')
-        );
-
-        expect(_file('src/init/initializers/foo.js')).to.not.exist;
-        expect(_file('src/init/initializers/foo-test.js')).to.not.exist;
-      });
-    });
-
-    it('initializer foo/bar --dummy', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/init/initializers/foo/bar.js')).to.equal(
-          fixture('initializer/initializer-nested.js')
-        );
-
-        expect(_file('src/init/initializers/foo/bar.js')).to.not.exist;
-        expect(_file('src/init/initializers/foo/bar-test.js')).to.not.exist;
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/instance-initializer-test-test.js b/node-tests/blueprints/instance-initializer-test-test.js
index 2f489d86159..928f2ebe0a1 100644
--- a/node-tests/blueprints/instance-initializer-test-test.js
+++ b/node-tests/blueprints/instance-initializer-test-test.js
@@ -12,9 +12,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: instance-initializer-test', function() {
   setupTestHooks(this);
 
@@ -116,113 +113,4 @@ describe('Blueprint: instance-initializer-test', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('instance-initializer-test foo', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
-          expect(_file('src/init/instance-initializers/foo-test.js')).to.equal(
-            fixture('instance-initializer-test/module-unification/default.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('instance-initializer-test foo', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
-          expect(_file('src/init/instance-initializers/foo-test.js')).to.equal(
-            fixture('instance-initializer-test/module-unification/rfc232.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-      });
-
-      it('instance-initializer-test foo for mocha', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
-          expect(_file('src/init/instance-initializers/foo-test.js')).to.equal(
-            fixture('instance-initializer-test/module-unification/mocha.js')
-          );
-        });
-      });
-    });
-
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
-        generateFakePackageManifest('ember-mocha', '0.14.0');
-      });
-
-      it('instance-initializer-test foo for mocha', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
-          expect(_file('src/init/instance-initializers/foo-test.js')).to.equal(
-            fixture('instance-initializer-test/module-unification/mocha-rfc232.js')
-          );
-        });
-      });
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' });
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('instance-initializer-test foo', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
-          expect(_file('src/init/instance-initializers/foo-test.js')).to.equal(
-            fixture('instance-initializer-test/module-unification/dummy.js')
-          );
-        });
-      });
-
-      it('instance-initializer-test foo --dummy', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo', '--dummy'], _file => {
-          expect(_file('tests/dummy/src/init/instance-initializers/foo-test.js')).to.equal(
-            fixture('instance-initializer-test/module-unification/dummy.js')
-          );
-        });
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/instance-initializer-test.js b/node-tests/blueprints/instance-initializer-test.js
index fd785826542..7f632db433f 100644
--- a/node-tests/blueprints/instance-initializer-test.js
+++ b/node-tests/blueprints/instance-initializer-test.js
@@ -14,9 +14,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: instance-initializer', function() {
   setupTestHooks(this);
 
@@ -206,136 +203,4 @@ describe('Blueprint: instance-initializer', function() {
       );
     });
   });
-
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('instance-initializer foo', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo'], _file => {
-        expect(_file('src/init/instance-initializers/foo.js')).to.equal(
-          fixture('instance-initializer/instance-initializer.js')
-        );
-
-        expect(_file('src/init/instance-initializers/foo-test.js')).to.contain(
-          "import { initialize } from 'my-app/init/instance-initializers/foo';"
-        );
-      });
-    });
-
-    it('instance-initializer foo/bar', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar'], _file => {
-        expect(_file('src/init/instance-initializers/foo/bar.js')).to.equal(
-          fixture('instance-initializer/instance-initializer-nested.js')
-        );
-
-        expect(_file('src/init/instance-initializers/foo/bar-test.js')).to.contain(
-          "import { initialize } from 'my-app/init/instance-initializers/foo/bar';"
-        );
-      });
-    });
-
-    it('instance-initializer foo --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['instance-initializer', 'foo', '--pod']),
-        'Pods arenʼt supported within a module unification app'
-      );
-    });
-
-    it('instance-initializer foo/bar --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod']),
-        'Pods arenʼt supported within a module unification app'
-      );
-    });
-
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('instance-initializer foo --pod', function() {
-        return expectError(
-          emberGenerateDestroy(['instance-initializer', 'foo', '--pod']),
-          'Pods arenʼt supported within a module unification app'
-        );
-      });
-
-      it('instance-initializer foo/bar --pod', function() {
-        return expectError(
-          emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod']),
-          'Pods arenʼt supported within a module unification app'
-        );
-      });
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('instance-initializer foo', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo'], _file => {
-        expect(_file('src/init/instance-initializers/foo.js')).to.equal(
-          fixture('instance-initializer/instance-initializer.js')
-        );
-
-        expect(_file('tests/unit/instance-initializers/foo-test.js'));
-      });
-    });
-
-    it('instance-initializer foo/bar', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar'], _file => {
-        expect(_file('src/init/instance-initializers/foo/bar.js')).to.equal(
-          fixture('instance-initializer/instance-initializer-nested.js')
-        );
-
-        expect(_file('src/init/instance-initializers/foo/bar-test.js'));
-      });
-    });
-
-    it('instance-initializer foo --dummy', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/init/instance-initializers/foo.js')).to.equal(
-          fixture('instance-initializer/instance-initializer.js')
-        );
-
-        expect(_file('src/init/instance-initializers/foo.js')).to.not.exist;
-
-        expect(_file('src/init/instance-initializers/foo-test.js')).to.not.exist;
-      });
-    });
-
-    it('instance-initializer foo/bar --dummy', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/init/instance-initializers/foo/bar.js')).to.equal(
-          fixture('instance-initializer/instance-initializer-nested.js')
-        );
-
-        expect(_file('src/init/instance-initializers/foo/bar.js')).to.not.exist;
-
-        expect(_file('src/init/instance-initializers/foo/bar-test.js')).to.not.exist;
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/mixin-test-test.js b/node-tests/blueprints/mixin-test-test.js
index 7ffed38870d..c743c1dd861 100644
--- a/node-tests/blueprints/mixin-test-test.js
+++ b/node-tests/blueprints/mixin-test-test.js
@@ -12,9 +12,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: mixin-test', function() {
   setupTestHooks(this);
 
@@ -86,61 +83,6 @@ describe('Blueprint: mixin-test', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
-          expect(_file('src/mixins/foo-test.js')).to.equal(fixture('mixin-test/default.js'));
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-      });
-
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
-          expect(_file('src/mixins/foo-test.js')).to.equal(fixture('mixin-test/mocha.js'));
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
-          expect(_file('src/mixins/foo-test.js')).to.equal(fixture('mixin-test/rfc232.js'));
-        });
-      });
-    });
-  });
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' }).then(() =>
@@ -158,25 +100,6 @@ describe('Blueprint: mixin-test', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' }).then(() =>
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ])
-      );
-    });
-
-    it('mixin-test foo', function() {
-      return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
-        expect(_file('src/mixins/foo-test.js')).to.equal(fixture('mixin-test/addon.js'));
-      });
-    });
-  });
-
   describe('in in-repo-addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'in-repo-addon' }).then(() =>
diff --git a/node-tests/blueprints/mixin-test.js b/node-tests/blueprints/mixin-test.js
index 0d70a37cc37..203cdb6f775 100644
--- a/node-tests/blueprints/mixin-test.js
+++ b/node-tests/blueprints/mixin-test.js
@@ -11,9 +11,6 @@ const EOL = require('os').EOL;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: mixin', function() {
   setupTestHooks(this);
 
@@ -162,71 +159,6 @@ describe('Blueprint: mixin', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    it('mixin foo', function() {
-      return emberGenerateDestroy(['mixin', 'foo'], _file => {
-        expect(_file('src/mixins/foo.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo-test.js')).to.contain(
-          "import FooMixin from 'my-app/mixins/foo';"
-        );
-      });
-    });
-
-    it('mixin foo.js', function() {
-      return emberGenerateDestroy(['mixin', 'foo'], _file => {
-        expect(_file('src/mixins/foo.js.js')).to.not.exist;
-        expect(_file('src/mixins/foo.js-test.js')).to.not.exist;
-
-        expect(_file('src/mixins/foo.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo-test.js')).to.contain(
-          "import FooMixin from 'my-app/mixins/foo';"
-        );
-      });
-    });
-
-    it('mixin foo/bar', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
-        expect(_file('src/mixins/foo/bar.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo/bar-test.js')).to.contain(
-          "import FooBarMixin from 'my-app/mixins/foo/bar';"
-        );
-      });
-    });
-
-    it('mixin foo/bar/baz', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
-        expect(_file('src/mixins/foo/bar/baz.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo/bar/baz-test.js')).to.contain(
-          "import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
-        );
-      });
-    });
-
-    it('mixin foo --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['service', 'foo', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-  });
 
   describe('in addon', function() {
     beforeEach(function() {
@@ -315,87 +247,6 @@ describe('Blueprint: mixin', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' });
-    });
-
-    it('mixin foo', function() {
-      return emberGenerateDestroy(['mixin', 'foo'], _file => {
-        expect(_file('src/mixins/foo.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo-test.js')).to.contain(
-          "import FooMixin from 'my-addon/mixins/foo';"
-        );
-      });
-    });
-
-    it('mixin foo.js', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js'], _file => {
-        expect(_file('src/mixins/foo.js.js')).to.not.exist;
-        expect(_file('src/mixins/foo.js-test.js')).to.not.exist;
-
-        expect(_file('src/mixins/foo.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo-test.js')).to.contain(
-          "import FooMixin from 'my-addon/mixins/foo';"
-        );
-      });
-    });
-
-    it('mixin foo/bar', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
-        expect(_file('src/mixins/foo/bar.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo/bar-test.js')).to.contain(
-          "import FooBarMixin from 'my-addon/mixins/foo/bar';"
-        );
-      });
-    });
-
-    it('mixin foo/bar/baz', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
-        expect(_file('src/mixins/foo/bar/baz.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo/bar/baz-test.js')).to.contain(
-          "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
-        );
-      });
-    });
-
-    it('mixin foo/bar/baz --dummy', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/mixins/foo/bar/baz.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo/bar/baz.js')).to.not.exist;
-      });
-    });
-
-    it('mixin foo.js --dummy', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/mixins/foo.js.js')).to.not.exist;
-
-        expect(_file('tests/dummy/src/mixins/foo.js'))
-          .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
-
-        expect(_file('src/mixins/foo.js')).to.not.exist;
-      });
-    });
-  });
-
   describe('in in-repo-addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'in-repo-addon' });
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index 2d9f3bc010d..c9a1f933cd1 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -9,7 +9,6 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const modifyPackages = blueprintHelpers.modifyPackages;
 
-const expectError = require('../helpers/expect-error');
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 const file = chai.file;
@@ -19,7 +18,6 @@ const generateFakePackageManifest = require('../helpers/generate-fake-package-ma
 const fixture = require('../helpers/fixture');
 
 const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
 const enableOctane = setupTestEnvironment.enableOctane;
 
 describe('Blueprint: route', function() {
@@ -466,314 +464,6 @@ describe('Blueprint: route', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('route foo', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('src/router.js')).to.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js', function() {
-      return emberGenerateDestroy(['route', 'foo.js'], _file => {
-        expect(_file('src/ui/routes/foo.js/route.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo.js/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo.js/route-test.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('src/router.js')).to.contain("this.route('foo')");
-        expect(file('src/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo --skip-router', function() {
-      return emberGenerateDestroy(['route', 'foo', '--skip-router'], _file => {
-        expect(_file('src/ui/routes/foo/route.js')).to.exist;
-        expect(_file('src/ui/routes/foo/template.hbs')).to.exist;
-        expect(_file('src/ui/routes/foo/route-test.js')).to.exist;
-        expect(file('src/router.js')).to.not.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo --path=:foo_id/show', function() {
-      return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], _file => {
-        expect(_file('src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('src/router.js'))
-          .to.contain("this.route('foo', {")
-          .to.contain("path: ':foo_id/show'")
-          .to.contain('});');
-      }).then(() => {
-        expect(file('src/router.js'))
-          .to.not.contain("this.route('foo'")
-          .to.not.contain("path: ':foo_id/show'");
-      });
-    });
-
-    it('route parent/child --reset-namespace', function() {
-      return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], _file => {
-        expect(_file('src/ui/routes/parent/child/route.js')).to.equal(
-          fixture('route/route-child.js')
-        );
-
-        expect(_file('src/ui/routes/parent/child/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/parent/child/route-test.js')).to.equal(
-          fixture('route-test/default-child.js')
-        );
-
-        expect(file('src/router.js'))
-          .to.contain("this.route('parent', {")
-          .to.contain("this.route('child', {")
-          .to.contain('resetNamespace: true')
-          .to.contain('});');
-      });
-    });
-
-    it('route parent/child --reset-namespace --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['route', 'parent/child', '--reset-namespace', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-
-    it('route index', function() {
-      return emberGenerateDestroy(['route', 'index'], _file => {
-        expect(_file('src/ui/routes/index/route.js')).to.exist;
-        expect(_file('src/ui/routes/index/template.hbs')).to.exist;
-        expect(_file('src/ui/routes/index/route-test.js')).to.exist;
-        expect(file('src/router.js')).to.not.contain("this.route('index')");
-      }).then(() => {
-        expect(file('src/router.js')).to.not.contain("this.route('index')");
-      });
-    });
-
-    it('route application', function() {
-      fs.removeSync('src/ui/routes/application/template.hbs');
-      return emberGenerate(['route', 'application']).then(() => {
-        expect(file('src/ui/routes/application/template.hbs')).to.exist;
-        expect(file('src/router.js')).to.not.contain("this.route('application')");
-      });
-    });
-
-    it('route basic', function() {
-      return emberGenerateDestroy(['route', 'basic'], _file => {
-        expect(_file('src/ui/routes/basic/route.js')).to.exist;
-        expect(file('src/router.js')).to.not.contain("this.route('basic')");
-      }).then(() => {
-        expect(file('src/router.js')).to.not.contain("this.route('basic')");
-      });
-    });
-
-    it('route foo --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['route', 'foo', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-
-    it('route foo --pod with --path', function() {
-      return expectError(
-        emberGenerateDestroy(['route', 'foo', '--pod', '--path=:foo_id/show']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-
-    it('route index --pod', function() {
-      return expectError(
-        emberGenerate(['route', 'index', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-
-    it('route application --pod', function() {
-      return expectError(
-        emberGenerate(['route', 'application', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-
-    it('route basic --pod', function() {
-      return expectError(
-        emberGenerate(['route', 'basic', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('route foo --pod', function() {
-        return expectError(
-          emberGenerateDestroy(['route', 'foo', '--pod']),
-          "Pods aren't supported within a module unification app"
-        );
-      });
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('route foo', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo.js/route.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo.js/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo.js/route-test.js')).to.not.exist;
-
-        expect(_file('src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo')");
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo/bar', function() {
-      return emberGenerateDestroy(['route', 'foo/bar'], _file => {
-        expect(_file('src/ui/routes/foo/bar/route.js')).to.equal(fixture('route/route-nested.js'));
-
-        expect(_file('src/ui/routes/foo/bar/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/bar/route-test.js')).to.equal(
-          fixture('route-test/default-nested.js')
-        );
-
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('bar')");
-      }).then(() => {
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('bar')");
-      });
-    });
-
-    it('route foo --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('tests/dummy/src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo/route-test.js')).to.not.exist;
-
-        expect(file('tests/dummy/src/router.js')).to.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo.js/route.js')).to.not.exist;
-        expect(_file('tests/dummy/src/ui/routes/foo.js/template.hbs')).to.not.exist;
-
-        expect(_file('tests/dummy/src/ui/routes/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('tests/dummy/src/ui/routes/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo/route-test.js')).to.not.exist;
-
-        expect(file('tests/dummy/src/router.js')).to.contain("this.route('foo')");
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo/bar --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo/bar/route.js')).to.equal(
-          fixture('route/route-nested.js')
-        );
-
-        expect(_file('tests/dummy/src/ui/routes/foo/bar/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('src/ui/routes/foo/route.js')).to.not.exist;
-        expect(_file('src/ui/routes/foo/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo/route-test.js')).to.not.exist;
-
-        expect(file('tests/dummy/src/router.js'))
-          .to.contain("this.route('foo', function() {")
-          .to.contain("this.route('bar')");
-      }).then(() => {
-        expect(file('tests/dummy/src/router.js')).to.not.contain("this.route('bar')");
-      });
-    });
-
-    it('route foo --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['route', 'foo', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-  });
-
   describe('in app - octane', function() {
     enableOctane();
 
diff --git a/node-tests/blueprints/service-test.js b/node-tests/blueprints/service-test.js
index b9b7edfc4ce..6d70fc3d039 100644
--- a/node-tests/blueprints/service-test.js
+++ b/node-tests/blueprints/service-test.js
@@ -6,7 +6,6 @@ const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const modifyPackages = blueprintHelpers.modifyPackages;
-const expectError = require('../helpers/expect-error');
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
@@ -15,7 +14,6 @@ const generateFakePackageManifest = require('../helpers/generate-fake-package-ma
 const fixture = require('../helpers/fixture');
 
 const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
 const enableOctane = setupTestEnvironment.enableOctane;
 
 describe('Blueprint: service', function() {
@@ -141,57 +139,6 @@ describe('Blueprint: service', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('service foo', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
-        expect(_file('src/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('src/services/foo-test.js')).to.equal(fixture('service-test/default.js'));
-      });
-    });
-
-    it('service foo.js', function() {
-      return emberGenerateDestroy(['service', 'foo.js'], _file => {
-        expect(_file('src/services/foo.js.js')).to.not.exist;
-        expect(_file('src/services/foo.js-test.js')).to.not.exist;
-
-        expect(_file('src/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('src/services/foo-test.js')).to.equal(fixture('service-test/default.js'));
-      });
-    });
-
-    it('service foo/bar', function() {
-      return emberGenerateDestroy(['service', 'foo/bar'], _file => {
-        expect(_file('src/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
-
-        expect(_file('src/services/foo/bar-test.js')).to.equal(
-          fixture('service-test/default-nested.js')
-        );
-      });
-    });
-
-    it('service foo --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['service', 'foo', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-  });
-
   describe('in app - octane', function() {
     enableOctane();
 
@@ -397,76 +344,6 @@ describe('Blueprint: service', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('service foo', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
-        expect(_file('src/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('src/services/foo-test.js')).to.equal(fixture('service-test/default.js'));
-
-        expect(_file('app/services/foo.js')).to.not.exist;
-      });
-    });
-
-    it('service foo.js', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
-        expect(_file('src/services/foo.js.js')).to.not.exist;
-        expect(_file('src/services/foo.js-test.js')).to.not.exist;
-
-        expect(_file('src/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('src/services/foo-test.js')).to.equal(fixture('service-test/default.js'));
-
-        expect(_file('app/services/foo.js')).to.not.exist;
-      });
-    });
-
-    it('service foo/bar', function() {
-      return emberGenerateDestroy(['service', 'foo/bar'], _file => {
-        expect(_file('src/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
-
-        expect(_file('src/services/foo/bar-test.js')).to.equal(
-          fixture('service-test/default-nested.js')
-        );
-
-        expect(_file('app/services/foo/bar.js')).to.not.exist;
-      });
-    });
-
-    it('service foo/bar --dummy', function() {
-      return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/services/foo/bar.js')).to.equal(
-          fixture('service/service-nested.js')
-        );
-        expect(_file('src/services/foo/bar.js')).to.not.exist;
-      });
-    });
-
-    it('service foo/bar.js --dummy', function() {
-      return emberGenerateDestroy(['service', 'foo/bar.js', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/services/foo/bar.js.js')).to.not.exist;
-
-        expect(_file('tests/dummy/src/services/foo/bar.js')).to.equal(
-          fixture('service/service-nested.js')
-        );
-        expect(_file('src/services/foo/bar.js')).to.not.exist;
-      });
-    });
-  });
-
   describe('in addon - octane', function() {
     enableOctane();
 
diff --git a/node-tests/blueprints/template-test.js b/node-tests/blueprints/template-test.js
index 72ff75c7b41..c49db42cff9 100644
--- a/node-tests/blueprints/template-test.js
+++ b/node-tests/blueprints/template-test.js
@@ -10,9 +10,6 @@ const expectError = require('../helpers/expect-error');
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: template', function() {
   setupTestHooks(this);
 
@@ -162,92 +159,4 @@ describe('Blueprint: template', function() {
       });
     });
   });
-
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    it('template foo', function() {
-      return emberGenerateDestroy(['template', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo.hbs', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs'], _file => {
-        expect(_file('src/ui/routes/foo.hbs/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo/bar', function() {
-      return emberGenerateDestroy(['template', 'foo/bar'], _file => {
-        expect(_file('src/ui/routes/foo/bar/template.hbs')).to.equal('');
-      });
-    });
-  });
-
-  describe('with usePods - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    it('shows an error', function() {
-      return expectError(
-        emberGenerateDestroy(['template', 'foo', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-  });
-
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' });
-    });
-
-    it('template foo', function() {
-      return emberGenerateDestroy(['template', 'foo'], _file => {
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo.hbs', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs'], _file => {
-        expect(_file('src/ui/routes/foo.hbs/template.hbs')).to.not.exist;
-        expect(_file('src/ui/routes/foo/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo/bar', function() {
-      return emberGenerateDestroy(['template', 'foo/bar'], _file => {
-        expect(_file('src/ui/routes/foo/bar/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo --dummy', function() {
-      return emberGenerateDestroy(['template', 'foo', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo.hbs --dummy', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo.hbs/template.hbs')).to.not.exist;
-        expect(_file('tests/dummy/src/ui/routes/foo/template.hbs')).to.equal('');
-      });
-    });
-
-    it('template foo/bar --dummy', function() {
-      return emberGenerateDestroy(['template', 'foo/bar', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/ui/routes/foo/bar/template.hbs')).to.equal('');
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/util-test-test.js b/node-tests/blueprints/util-test-test.js
index 08d15dedafa..1372aececfd 100644
--- a/node-tests/blueprints/util-test-test.js
+++ b/node-tests/blueprints/util-test-test.js
@@ -12,9 +12,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: util-test', function() {
   setupTestHooks(this);
 
@@ -90,61 +87,6 @@ describe('Blueprint: util-test', function() {
     });
   });
 
-  describe('in app - module uninification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew();
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
-          expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js'));
-        });
-      });
-    });
-
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.2.0');
-      });
-
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
-          expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/rfc232.js'));
-        });
-      });
-    });
-
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-mocha', dev: true },
-        ]);
-      });
-
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
-          expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/mocha.js'));
-        });
-      });
-    });
-  });
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' });
@@ -167,27 +109,4 @@ describe('Blueprint: util-test', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' });
-    });
-
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
-        modifyPackages([
-          { name: 'ember-qunit', delete: true },
-          { name: 'ember-cli-qunit', dev: true },
-        ]);
-        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
-      });
-
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
-          expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/dummy.js'));
-        });
-      });
-    });
-  });
 });
diff --git a/node-tests/blueprints/util-test.js b/node-tests/blueprints/util-test.js
index e11b1bed2e3..6922eb70a20 100644
--- a/node-tests/blueprints/util-test.js
+++ b/node-tests/blueprints/util-test.js
@@ -14,9 +14,6 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-const setupTestEnvironment = require('../helpers/setup-test-environment');
-const enableModuleUnification = setupTestEnvironment.enableModuleUnification;
-
 describe('Blueprint: util', function() {
   setupTestHooks(this);
 
@@ -120,57 +117,6 @@ describe('Blueprint: util', function() {
     });
   });
 
-  describe('in app - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('util foo-bar', function() {
-      return emberGenerateDestroy(['util', 'foo-bar'], _file => {
-        expect(_file('src/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
-
-        expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js'));
-      });
-    });
-
-    it('util foo-bar.js', function() {
-      return emberGenerateDestroy(['util', 'foo-bar.js'], _file => {
-        expect(_file('src/utils/foo-bar.js.js')).to.not.exist;
-        expect(_file('src/utils/foo-bar.js-test.js')).to.not.exist;
-
-        expect(_file('src/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
-
-        expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js'));
-      });
-    });
-
-    it('util foo/bar-baz', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz'], _file => {
-        expect(_file('src/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js'));
-
-        expect(_file('src/utils/foo/bar-baz-test.js')).to.equal(
-          fixture('util-test/default-nested.js')
-        );
-      });
-    });
-
-    it('util foo-bar --pod', function() {
-      return expectError(
-        emberGenerateDestroy(['util', 'foo-bar', '--pod']),
-        "Pods aren't supported within a module unification app"
-      );
-    });
-  });
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' })
@@ -240,78 +186,6 @@ describe('Blueprint: util', function() {
     });
   });
 
-  describe('in addon - module unification', function() {
-    enableModuleUnification();
-
-    beforeEach(function() {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('util foo-bar', function() {
-      return emberGenerateDestroy(['util', 'foo-bar'], _file => {
-        expect(_file('src/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
-
-        expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/addon-default.js'));
-
-        expect(_file('app/utils/foo-bar.js')).to.not.exist;
-      });
-    });
-
-    it('util foo-bar.js', function() {
-      return emberGenerateDestroy(['util', 'foo-bar.js'], _file => {
-        expect(_file('src/utils/foo-bar.js.js')).to.not.exist;
-        expect(_file('src/utils/foo-bar.js-test.js')).to.not.exist;
-
-        expect(_file('src/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
-
-        expect(_file('src/utils/foo-bar-test.js')).to.equal(fixture('util-test/addon-default.js'));
-
-        expect(_file('app/utils/foo-bar.js')).to.not.exist;
-      });
-    });
-
-    it('util foo-bar/baz', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz'], _file => {
-        expect(_file('src/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js'));
-
-        expect(_file('src/utils/foo/bar-baz-test.js')).to.equal(
-          fixture('util-test/addon-default-nested.js')
-        );
-
-        expect(_file('app/utils/foo/bar-baz.js')).to.not.exist;
-      });
-    });
-
-    it('util foo/bar-baz --dummy', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/utils/foo/bar-baz.js')).to.equal(
-          fixture('util/util-nested.js')
-        );
-
-        expect(_file('src/utils/foo/bar-baz.js')).to.not.exist;
-      });
-    });
-
-    it('util foo/bar-baz.js --dummy', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz.js', '--dummy'], _file => {
-        expect(_file('tests/dummy/src/utils/foo/bar-baz.js.js')).to.not.exist;
-
-        expect(_file('tests/dummy/src/utils/foo/bar-baz.js')).to.equal(
-          fixture('util/util-nested.js')
-        );
-
-        expect(_file('src/utils/foo/bar-baz.js')).to.not.exist;
-      });
-    });
-  });
-
   describe('in in-repo-addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'in-repo-addon' })
diff --git a/node-tests/fixtures/initializer-test/module-unification/default.js b/node-tests/fixtures/initializer-test/module-unification/default.js
deleted file mode 100644
index 24cbe31ebe0..00000000000
--- a/node-tests/fixtures/initializer-test/module-unification/default.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Application from '@ember/application';
-import { run } from '@ember/runloop';
-
-import { initialize } from 'my-app/init/initializers/foo';
-import { module, test } from 'qunit';
-
-
-module('Unit | Initializer | foo', {
-  beforeEach() {
-    run(() => {
-      this.application = Application.create();
-      this.application.deferReadiness();
-    });
-  },
-  afterEach() {
-    run(this.application, 'destroy');
-  }
-});
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  initialize(this.application);
-
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
-});
diff --git a/node-tests/fixtures/initializer-test/module-unification/dummy.js b/node-tests/fixtures/initializer-test/module-unification/dummy.js
deleted file mode 100644
index 6ef5db4cb45..00000000000
--- a/node-tests/fixtures/initializer-test/module-unification/dummy.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import Application from '@ember/application';
-import { run } from '@ember/runloop';
-
-import { initialize } from 'dummy/init/initializers/foo';
-import { module, test } from 'qunit';
-
-
-module('Unit | Initializer | foo', {
-  beforeEach() {
-    run(() => {
-      this.application = Application.create();
-      this.application.deferReadiness();
-    });
-  },
-  afterEach() {
-    run(this.application, 'destroy');
-  }
-});
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  initialize(this.application);
-
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
-});
diff --git a/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js b/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
deleted file mode 100644
index 91fbb90f68e..00000000000
--- a/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { expect } from 'chai';
-import { describe, it, beforeEach, afterEach } from 'mocha';
-import Application from '@ember/application';
-import { initialize } from 'my-app/init/initializers/foo';
-import { run } from '@ember/runloop';
-
-describe('Unit | Initializer | foo', function() {
-  beforeEach(function() {
-    this.TestApplication = Application.extend();
-    this.TestApplication.initializer({
-      name: 'initializer under test',
-      initialize
-    });
-
-    this.application = this.TestApplication.create({ autoboot: false });
-  });
-
-  afterEach(function() {
-    run(this.application, 'destroy');
-  });
-
-  // TODO: Replace this with your real tests.
-  it('works', async function() {
-    await this.application.boot();
-
-    // you would normally confirm the results of the initializer here
-    expect(true).to.be.ok;
-  });
-});
diff --git a/node-tests/fixtures/initializer-test/module-unification/mocha.js b/node-tests/fixtures/initializer-test/module-unification/mocha.js
deleted file mode 100644
index fddc49536fa..00000000000
--- a/node-tests/fixtures/initializer-test/module-unification/mocha.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { expect } from 'chai';
-import { describe, it, beforeEach, afterEach } from 'mocha';
-import { run } from '@ember/runloop';
-import Application from '@ember/application';
-import { initialize } from 'my-app/init/initializers/foo';
-
-
-describe('Unit | Initializer | foo', function() {
-  let application;
-
-  beforeEach(function() {
-    run(function() {
-      application = Application.create();
-      application.deferReadiness();
-    });
-  });
-
-  afterEach(function() {
-    run(application, 'destroy');
-  });
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    initialize(application);
-
-    // you would normally confirm the results of the initializer here
-    expect(true).to.be.ok;
-  });
-});
diff --git a/node-tests/fixtures/initializer-test/module-unification/rfc232.js b/node-tests/fixtures/initializer-test/module-unification/rfc232.js
deleted file mode 100644
index d62aa67bf32..00000000000
--- a/node-tests/fixtures/initializer-test/module-unification/rfc232.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Application from '@ember/application';
-
-import { initialize } from 'my-app/init/initializers/foo';
-import { module, test } from 'qunit';
-import Resolver from 'ember-resolver';
-import { run } from '@ember/runloop';
-
-module('Unit | Initializer | foo', function(hooks) {
-  hooks.beforeEach(function() {
-    this.TestApplication = class TestApplication extends Application {}
-    this.TestApplication.initializer({
-      name: 'initializer under test',
-      initialize
-    });
-
-    this.application = this.TestApplication.create({ autoboot: false, Resolver });
-  });
-
-  hooks.afterEach(function() {
-    run(this.application, 'destroy');
-  });
-
-  // TODO: Replace this with your real tests.
-  test('it works', async function(assert) {
-    await this.application.boot();
-
-    assert.ok(true);
-  });
-});
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/default.js b/node-tests/fixtures/instance-initializer-test/module-unification/default.js
deleted file mode 100644
index 3fb5614db4e..00000000000
--- a/node-tests/fixtures/instance-initializer-test/module-unification/default.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Application from '@ember/application';
-import { run } from '@ember/runloop';
-import { initialize } from 'my-app/init/instance-initializers/foo';
-import { module, test } from 'qunit';
-
-module('Unit | Instance Initializer | foo', {
-  beforeEach() {
-    run(() => {
-      this.application = Application.create();
-      this.appInstance = this.application.buildInstance();
-    });
-  },
-  afterEach() {
-    run(this.appInstance, 'destroy');
-    run(this.application, 'destroy');
-  }
-});
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  initialize(this.appInstance);
-
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
-});
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js b/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js
deleted file mode 100644
index c8fe5b8ad4c..00000000000
--- a/node-tests/fixtures/instance-initializer-test/module-unification/dummy.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Application from '@ember/application';
-import { run } from '@ember/runloop';
-import { initialize } from 'dummy/init/instance-initializers/foo';
-import { module, test } from 'qunit';
-
-module('Unit | Instance Initializer | foo', {
-  beforeEach() {
-    run(() => {
-      this.application = Application.create();
-      this.appInstance = this.application.buildInstance();
-    });
-  },
-  afterEach() {
-    run(this.appInstance, 'destroy');
-    run(this.application, 'destroy');
-  }
-});
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  initialize(this.appInstance);
-
-  // you would normally confirm the results of the initializer here
-  assert.ok(true);
-});
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js b/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js
deleted file mode 100644
index 052dd2806c7..00000000000
--- a/node-tests/fixtures/instance-initializer-test/module-unification/mocha-rfc232.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { expect } from 'chai';
-import { describe, it, beforeEach, afterEach } from 'mocha';
-import Application from '@ember/application';
-import { initialize } from 'my-app/init/instance-initializers/foo';
-import { run } from '@ember/runloop';
-
-describe('Unit | Instance Initializer | foo', function() {
-  beforeEach(function() {
-    this.TestApplication = Application.extend();
-    this.TestApplication.instanceInitializer({
-      name: 'initializer under test',
-      initialize
-    });
-    this.application = this.TestApplication.create({ autoboot: false });
-    this.instance = this.application.buildInstance();
-  });
-  afterEach(function() {
-    run(this.instance, 'destroy');
-    run(this.application, 'destroy');
-  });
-
-  // TODO: Replace this with your real tests.
-  it('works', async function() {
-    await this.instance.boot();
-
-    expect(true).to.be.ok;
-  });
-});
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js b/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js
deleted file mode 100644
index a37bc43820c..00000000000
--- a/node-tests/fixtures/instance-initializer-test/module-unification/mocha.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { expect } from 'chai';
-import { describe, it, afterEach, beforeEach } from 'mocha';
-import Application from '@ember/application';
-import { run } from '@ember/runloop';
-import { initialize } from 'my-app/init/instance-initializers/foo';
-import destroyApp from '../../helpers/destroy-app';
-
-describe('Unit | Instance Initializer | foo', function() {
-  let application, appInstance;
-
-  beforeEach(function() {
-    run(function() {
-      application = Application.create();
-      appInstance = application.buildInstance();
-    });
-  });
-
-  afterEach(function() {
-    run(appInstance, 'destroy');
-    destroyApp(application);
-  });
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    initialize(appInstance);
-
-    // you would normally confirm the results of the initializer here
-    expect(true).to.be.ok;
-  });
-});
diff --git a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js b/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
deleted file mode 100644
index 99f2459db29..00000000000
--- a/node-tests/fixtures/instance-initializer-test/module-unification/rfc232.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import Application from '@ember/application';
-
-import { initialize } from 'my-app/init/instance-initializers/foo';
-import { module, test } from 'qunit';
-import Resolver from 'ember-resolver';
-import { run } from '@ember/runloop';
-
-module('Unit | Instance Initializer | foo', function(hooks) {
-  hooks.beforeEach(function() {
-    this.TestApplication = class TestApplication extends Application {}
-    this.TestApplication.instanceInitializer({
-      name: 'initializer under test',
-      initialize
-    });
-    this.application = this.TestApplication.create({ autoboot: false, Resolver });
-    this.instance = this.application.buildInstance();
-  });
-  hooks.afterEach(function() {
-    run(this.instance, 'destroy');
-    run(this.application, 'destroy');
-  });
-
-  // TODO: Replace this with your real tests.
-  test('it works', async function(assert) {
-    await this.instance.boot();
-
-    assert.ok(true);
-  });
-});
diff --git a/node-tests/helpers/setup-test-environment.js b/node-tests/helpers/setup-test-environment.js
index cf1af8322e0..33c7db91ace 100644
--- a/node-tests/helpers/setup-test-environment.js
+++ b/node-tests/helpers/setup-test-environment.js
@@ -10,17 +10,6 @@ function enableOctane() {
   });
 }
 
-function enableModuleUnification() {
-  beforeEach(function() {
-    process.env.EMBER_CLI_MODULE_UNIFICATION = 'true';
-  });
-
-  afterEach(function() {
-    delete process.env.EMBER_CLI_MODULE_UNIFICATION;
-  });
-}
-
 module.exports = {
-  enableModuleUnification,
   enableOctane,
 };
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index f52d31c5331..cc2075234a8 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,6 +1,5 @@
 import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
 import { dictionary, HAS_NATIVE_PROXY, symbol } from '@ember/-internals/utils';
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
@@ -223,8 +222,8 @@ export default class Container {
 
     assert('fullName must be a proper full name', this.registry.isValidFullName(normalizedName));
     assert(
-      'EMBER_MODULE_UNIFICATION must be enabled to pass a namespace option to factoryFor',
-      EMBER_MODULE_UNIFICATION || !options.namespace
+      'namespace must be enabled to pass a namespace option to factoryFor',
+      !options.namespace
     );
 
     if (options.source || options.namespace) {
@@ -282,10 +281,7 @@ function isInstantiatable(container: Container, fullName: string) {
 }
 
 function lookup(container: Container, fullName: string, options: LookupOptions = {}) {
-  assert(
-    'EMBER_MODULE_UNIFICATION must be enabled to pass a namespace option to lookup',
-    EMBER_MODULE_UNIFICATION || !options.namespace
-  );
+  assert('namespace must be enabled to pass a namespace option to lookup', !options.namespace);
 
   let normalizedName = fullName;
 
@@ -403,7 +399,7 @@ function instantiateFactory(
   // SomeClass { singleton: true, instantiate: true } | { singleton: true } | { instantiate: true } | {}
   // By default majority of objects fall into this case
   if (isSingletonInstance(container, fullName, options)) {
-    let instance = (container.cache[normalizedName] = factoryManager.create());
+    let instance = (container.cache[normalizedName] = factoryManager.create() as CacheMember);
 
     // if this lookup happened _during_ destruction (emits a deprecation, but
     // is still possible) ensure that it gets destroyed
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index 4c5edcd8719..78c6bb1e33e 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -1,6 +1,5 @@
 import { OWNER } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 import Service from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { Registry } from '..';
@@ -767,142 +766,3 @@ moduleFor(
     }
   }
 );
-
-if (EMBER_MODULE_UNIFICATION) {
-  moduleFor(
-    'Container module unification',
-    class extends AbstractTestCase {
-      ['@test The container can expand and resolve a source to factoryFor'](assert) {
-        let PrivateComponent = factory();
-        let lookup = 'component:my-input';
-        let expectedSource = 'template:routes/application';
-        let registry = new Registry();
-        let resolveCount = 0;
-        let expandedKey = 'boom, special expanded key';
-        registry.expandLocalLookup = (specifier, options) => {
-          this.assert.strictEqual(specifier, lookup, 'specifier is expanded');
-          this.assert.strictEqual(options.source, expectedSource, 'source is expanded');
-          return expandedKey;
-        };
-        registry.resolve = function(fullName) {
-          resolveCount++;
-          if (fullName === expandedKey) {
-            return PrivateComponent;
-          }
-        };
-
-        let container = registry.container();
-
-        assert.strictEqual(
-          container.factoryFor(lookup, { source: expectedSource }).class,
-          PrivateComponent,
-          'The correct factory was provided'
-        );
-        assert.strictEqual(
-          container.factoryFor(lookup, { source: expectedSource }).class,
-          PrivateComponent,
-          'The correct factory was provided again'
-        );
-        assert.equal(
-          resolveCount,
-          1,
-          'resolve called only once and a cached factory was returned the second time'
-        );
-      }
-
-      ['@test The container can expand and resolve a source to lookup']() {
-        let PrivateComponent = factory();
-        let lookup = 'component:my-input';
-        let expectedSource = 'template:routes/application';
-        let registry = new Registry();
-        let expandedKey = 'boom, special expanded key';
-        registry.expandLocalLookup = (specifier, options) => {
-          this.assert.strictEqual(specifier, lookup, 'specifier is expanded');
-          this.assert.strictEqual(options.source, expectedSource, 'source is expanded');
-          return expandedKey;
-        };
-        registry.resolve = function(fullName) {
-          if (fullName === expandedKey) {
-            return PrivateComponent;
-          }
-        };
-
-        let container = registry.container();
-
-        let result = container.lookup(lookup, { source: expectedSource });
-        this.assert.ok(result instanceof PrivateComponent, 'The correct factory was provided');
-
-        this.assert.ok(
-          container.cache[expandedKey] instanceof PrivateComponent,
-          'The correct factory was stored in the cache with the correct key which includes the source.'
-        );
-      }
-
-      ['@test The container can expand and resolve a namespace to factoryFor'](assert) {
-        let PrivateComponent = factory();
-        let lookup = 'component:my-input';
-        let expectedNamespace = 'my-addon';
-        let registry = new Registry();
-        let resolveCount = 0;
-        let expandedKey = 'boom, special expanded key';
-        registry.expandLocalLookup = (specifier, options) => {
-          this.assert.strictEqual(specifier, lookup, 'specifier is expanded');
-          this.assert.strictEqual(options.namespace, expectedNamespace, 'namespace is expanded');
-          return expandedKey;
-        };
-        registry.resolve = function(fullName) {
-          resolveCount++;
-          if (fullName === expandedKey) {
-            return PrivateComponent;
-          }
-        };
-
-        let container = registry.container();
-
-        assert.strictEqual(
-          container.factoryFor(lookup, { namespace: expectedNamespace }).class,
-          PrivateComponent,
-          'The correct factory was provided'
-        );
-        assert.strictEqual(
-          container.factoryFor(lookup, { namespace: expectedNamespace }).class,
-          PrivateComponent,
-          'The correct factory was provided again'
-        );
-        assert.equal(
-          resolveCount,
-          1,
-          'resolve called only once and a cached factory was returned the second time'
-        );
-      }
-
-      ['@test The container can expand and resolve a namespace to lookup']() {
-        let PrivateComponent = factory();
-        let lookup = 'component:my-input';
-        let expectedNamespace = 'my-addon';
-        let registry = new Registry();
-        let expandedKey = 'boom, special expanded key';
-        registry.expandLocalLookup = (specifier, options) => {
-          this.assert.strictEqual(specifier, lookup, 'specifier is expanded');
-          this.assert.strictEqual(options.namespace, expectedNamespace, 'namespace is expanded');
-          return expandedKey;
-        };
-        registry.resolve = function(fullName) {
-          if (fullName === expandedKey) {
-            return PrivateComponent;
-          }
-        };
-
-        let container = registry.container();
-
-        let result = container.lookup(lookup, { namespace: expectedNamespace });
-        this.assert.ok(result instanceof PrivateComponent, 'The correct factory was provided');
-
-        this.assert.ok(
-          container.cache[expandedKey] instanceof PrivateComponent,
-          'The correct factory was stored in the cache with the correct key which includes the source.'
-        );
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/container/tests/registry_test.js b/packages/@ember/-internals/container/tests/registry_test.js
index f0f68b4c2f6..af48c057274 100644
--- a/packages/@ember/-internals/container/tests/registry_test.js
+++ b/packages/@ember/-internals/container/tests/registry_test.js
@@ -5,7 +5,6 @@ import {
   AbstractTestCase,
   ModuleBasedTestResolver,
 } from 'internal-test-helpers';
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 
 moduleFor(
   'Registry',
@@ -820,72 +819,3 @@ moduleFor(
     }
   }
 );
-
-if (EMBER_MODULE_UNIFICATION) {
-  moduleFor(
-    'Registry module unification',
-    class extends AbstractTestCase {
-      ['@test The registry can pass a source to the resolver'](assert) {
-        let PrivateComponent = factory();
-        let type = 'component';
-        let name = 'my-input';
-        let specifier = `${type}:${name}`;
-        let source = 'template:routes/application';
-
-        let resolver = new ModuleBasedTestResolver();
-        resolver.add({ specifier, source }, PrivateComponent);
-        let registry = new Registry({ resolver });
-
-        assert.strictEqual(
-          registry.resolve(specifier),
-          undefined,
-          'Not returned when specifier not scoped'
-        );
-        assert.strictEqual(
-          registry.resolve(specifier, { source }),
-          PrivateComponent,
-          'The correct factory was provided'
-        );
-        assert.strictEqual(
-          registry.resolve(specifier, { source }),
-          PrivateComponent,
-          'The correct factory was provided again'
-        );
-      }
-
-      ['@test The registry can pass a namespace to the resolver'](assert) {
-        let PrivateComponent = factory();
-        let type = 'component';
-        let name = 'my-input';
-        let specifier = `${type}:${name}`;
-        let source = 'template:routes/application';
-        let namespace = 'my-addon';
-
-        let resolver = new ModuleBasedTestResolver();
-        resolver.add({ specifier, source, namespace }, PrivateComponent);
-        let registry = new Registry({ resolver });
-
-        assert.strictEqual(
-          registry.resolve(specifier),
-          undefined,
-          'Not returned when specifier not scoped'
-        );
-        assert.strictEqual(
-          registry.resolve(specifier, { source }),
-          undefined,
-          'Not returned when specifier is missing namespace'
-        );
-        assert.strictEqual(
-          registry.resolve(specifier, { source, namespace }),
-          PrivateComponent,
-          'The correct factory was provided'
-        );
-        assert.strictEqual(
-          registry.resolve(specifier, { source, namespace }),
-          PrivateComponent,
-          'The correct factory was provided again'
-        );
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 00f5fc76546..322798f432d 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -4,7 +4,6 @@ import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/o
 import { OwnedTemplateMeta } from '@ember/-internals/views';
 import {
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-  EMBER_MODULE_UNIFICATION,
 } from '@ember/canary-features';
 import { isTemplateOnlyComponent } from '@ember/component/template-only';
 import { assert, deprecate } from '@ember/debug';
@@ -21,7 +20,6 @@ import {
 } from '@glimmer/interfaces';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
 import { getDynamicVar, ModifierDefinition, registerDestructor } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
 import { CurlyComponentDefinition } from './component-managers/curly';
 import { CustomManagerDefinition, ManagerDelegate } from './component-managers/custom';
 import InternalComponentManager, {
@@ -83,44 +81,6 @@ function layoutFor(name: string, owner: Owner, options?: LookupOptions): Option<
   return owner.lookup(templateFullName, options) || null;
 }
 
-function lookupModuleUnificationComponentPair(
-  owner: Owner,
-  name: string,
-  options?: LookupOptions
-): Option<LookupResult> {
-  let localComponent = componentFor(name, owner, options);
-  let localLayout = layoutFor(name, owner, options);
-
-  let globalComponent = componentFor(name, owner);
-  let globalLayout = layoutFor(name, owner);
-
-  // TODO: we shouldn't have to recheck fallback, we should have a lookup that doesn't fallback
-  if (
-    localComponent !== null &&
-    globalComponent !== null &&
-    globalComponent.class === localComponent.class
-  ) {
-    localComponent = null;
-  }
-  // TODO: Remove this when the MU feature flag is removed
-  if (
-    localLayout !== null &&
-    globalLayout !== null &&
-    unwrapTemplate(localLayout).referrer.moduleName ===
-      unwrapTemplate(globalLayout).referrer.moduleName
-  ) {
-    localLayout = null;
-  }
-
-  if (localComponent !== null || localLayout !== null) {
-    return { component: localComponent, layout: localLayout } as LookupResult;
-  } else if (globalComponent !== null || globalLayout !== null) {
-    return { component: globalComponent, layout: globalLayout } as LookupResult;
-  } else {
-    return null;
-  }
-}
-
 type LookupResult =
   | {
       component: Factory<{}, {}>;
@@ -163,21 +123,12 @@ function lookupComponentPair(
 
 function lookupComponent(owner: Owner, name: string, options: LookupOptions): Option<LookupResult> {
   if (options.source || options.namespace) {
-    if (EMBER_MODULE_UNIFICATION) {
-      return lookupModuleUnificationComponentPair(owner, name, options);
-    }
-
     let pair = lookupComponentPair(owner, name, options);
 
     if (pair !== null) {
       return pair;
     }
   }
-
-  if (EMBER_MODULE_UNIFICATION) {
-    return lookupModuleUnificationComponentPair(owner, name);
-  }
-
   return lookupComponentPair(owner, name);
 }
 
@@ -407,11 +358,6 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
 
     let name = _name;
     let namespace = undefined;
-    if (EMBER_MODULE_UNIFICATION) {
-      const parsed = this._parseNameForNamespace(_name);
-      name = parsed.name;
-      namespace = parsed.namespace;
-    }
 
     const options: LookupOptions = makeOptions(moduleName, namespace);
 
@@ -422,7 +368,7 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       return null;
     }
 
-    return (args, vm) => {
+    return (args: { capture: () => any }, vm: { associateDestroyable: (arg0: {}) => void }) => {
       const helper = factory.create();
 
       if (isClassHelper(helper)) {
@@ -469,18 +415,6 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     return builtin;
   }
 
-  private _parseNameForNamespace(_name: string) {
-    let name = _name;
-    let namespace = undefined;
-    let namespaceDelimiterOffset = _name.indexOf('::');
-    if (namespaceDelimiterOffset !== -1) {
-      name = _name.slice(namespaceDelimiterOffset + 2);
-      namespace = _name.slice(0, namespaceDelimiterOffset);
-    }
-
-    return { name, namespace };
-  }
-
   private _lookupComponentDefinition(
     _name: string,
     meta: OwnedTemplateMeta
@@ -490,11 +424,6 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     let owner = meta.owner;
     let { moduleName } = meta;
 
-    if (EMBER_MODULE_UNIFICATION) {
-      const parsed = this._parseNameForNamespace(_name);
-      name = parsed.name;
-      namespace = parsed.namespace;
-    }
     let pair = lookupComponent(owner, name, makeOptions(moduleName, namespace));
     if (pair === null) {
       return null;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
index e569df0789e..6d1a098b58a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -1,150 +1,138 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import {
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-  EMBER_MODULE_UNIFICATION,
-} from '@ember/canary-features';
+import { EMBER_GLIMMER_SET_COMPONENT_TEMPLATE } from '@ember/canary-features';
 import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 
 import { Component, compile } from '../../utils/helpers';
 import { setComponentTemplate, getComponentTemplate } from '../../..';
 
 if (EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
-  if (EMBER_MODULE_UNIFICATION) {
-    moduleFor(
-      'Components test: setComponentTemplate',
-      class extends RenderingTestCase {
-        '@skip setComponentTemplate does not work with module unification!'() {}
-      }
-    );
-  } else {
-    moduleFor(
-      'Components test: setComponentTemplate',
-      class extends RenderingTestCase {
-        '@test it basically works'() {
-          this.registerComponent('foo-bar', {
-            ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
-          });
+  moduleFor(
+    'Components test: setComponentTemplate',
+    class extends RenderingTestCase {
+      '@test it basically works'() {
+        this.registerComponent('foo-bar', {
+          ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
+        });
 
-          this.render('<FooBar />');
+        this.render('<FooBar />');
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-          runTask(() => this.rerender());
+        runTask(() => this.rerender());
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
-        }
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      }
 
-        '@test it takes precedence over resolver'() {
-          this.registerComponent('foo-bar', {
-            ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
-            template: 'noooooo!',
-          });
+      '@test it takes precedence over resolver'() {
+        this.registerComponent('foo-bar', {
+          ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
+          template: 'noooooo!',
+        });
 
-          this.render('<FooBar />');
+        this.render('<FooBar />');
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-          runTask(() => this.rerender());
+        runTask(() => this.rerender());
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
-        }
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      }
 
-        '@test calling it with primitives asserts'() {
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), null);
-          }, /Cannot call `setComponentTemplate` on `null`/);
+      '@test calling it with primitives asserts'() {
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), null);
+        }, /Cannot call `setComponentTemplate` on `null`/);
 
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), undefined);
-          }, /Cannot call `setComponentTemplate` on `undefined`/);
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), undefined);
+        }, /Cannot call `setComponentTemplate` on `undefined`/);
 
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), true);
-          }, /Cannot call `setComponentTemplate` on `true`/);
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), true);
+        }, /Cannot call `setComponentTemplate` on `true`/);
 
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), false);
-          }, /Cannot call `setComponentTemplate` on `false`/);
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), false);
+        }, /Cannot call `setComponentTemplate` on `false`/);
 
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), 123);
-          }, /Cannot call `setComponentTemplate` on `123`/);
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), 123);
+        }, /Cannot call `setComponentTemplate` on `123`/);
 
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), 'foo');
-          }, /Cannot call `setComponentTemplate` on `foo`/);
-
-          if (HAS_NATIVE_SYMBOL) {
-            expectAssertion(() => {
-              setComponentTemplate(compile('foo'), Symbol('foo'));
-            }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
-          }
-        }
-
-        '@test calling it twice on the same object asserts'() {
-          let Thing = setComponentTemplate(
-            compile('hello'),
-            Component.extend().reopenClass({
-              toString() {
-                return 'Thing';
-              },
-            })
-          );
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), 'foo');
+        }, /Cannot call `setComponentTemplate` on `foo`/);
 
+        if (HAS_NATIVE_SYMBOL) {
           expectAssertion(() => {
-            setComponentTemplate(compile('foo'), Thing);
-          }, /Cannot call `setComponentTemplate` multiple times on the same class \(`Thing`\)/);
+            setComponentTemplate(compile('foo'), Symbol('foo'));
+          }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
         }
+      }
 
-        '@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
-          let Parent = setComponentTemplate(compile('hello'), Component.extend());
+      '@test calling it twice on the same object asserts'() {
+        let Thing = setComponentTemplate(
+          compile('hello'),
+          Component.extend().reopenClass({
+            toString() {
+              return 'Thing';
+            },
+          })
+        );
+
+        expectAssertion(() => {
+          setComponentTemplate(compile('foo'), Thing);
+        }, /Cannot call `setComponentTemplate` multiple times on the same class \(`Thing`\)/);
+      }
 
-          this.registerComponent('foo-bar', {
-            ComponentClass: Parent.extend(),
-          });
+      '@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
+        let Parent = setComponentTemplate(compile('hello'), Component.extend());
 
-          this.render('<FooBar />');
+        this.registerComponent('foo-bar', {
+          ComponentClass: Parent.extend(),
+        });
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
+        this.render('<FooBar />');
 
-          runTask(() => this.rerender());
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
-        }
+        runTask(() => this.rerender());
 
-        '@test templates set with setComponentTemplate are inherited (native ES class extends)'() {
-          let Parent = setComponentTemplate(compile('hello'), Component.extend());
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      }
 
-          this.registerComponent('foo-bar', {
-            ComponentClass: class extends Parent {},
-          });
+      '@test templates set with setComponentTemplate are inherited (native ES class extends)'() {
+        let Parent = setComponentTemplate(compile('hello'), Component.extend());
 
-          this.render('<FooBar />');
+        this.registerComponent('foo-bar', {
+          ComponentClass: class extends Parent {},
+        });
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
+        this.render('<FooBar />');
 
-          runTask(() => this.rerender());
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-          this.assertComponentElement(this.firstChild, { content: 'hello' });
-        }
+        runTask(() => this.rerender());
 
-        '@test it can re-assign templates from another class'() {
-          let Foo = setComponentTemplate(compile('shared'), Component.extend());
-          let Bar = setComponentTemplate(getComponentTemplate(Foo), Component.extend());
+        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      }
 
-          this.registerComponent('foo', { ComponentClass: Foo });
-          this.registerComponent('bar', { ComponentClass: Bar });
+      '@test it can re-assign templates from another class'() {
+        let Foo = setComponentTemplate(compile('shared'), Component.extend());
+        let Bar = setComponentTemplate(getComponentTemplate(Foo), Component.extend());
 
-          this.render('<Foo />|<Bar />');
+        this.registerComponent('foo', { ComponentClass: Foo });
+        this.registerComponent('bar', { ComponentClass: Bar });
 
-          this.assertText('shared|shared');
+        this.render('<Foo />|<Bar />');
 
-          runTask(() => this.rerender());
+        this.assertText('shared|shared');
 
-          this.assertText('shared|shared');
-        }
+        runTask(() => this.rerender());
+
+        this.assertText('shared|shared');
       }
-    );
-  }
+    }
+  );
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
index 5f5cdbe5b0b..9451c5de8eb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
@@ -7,7 +7,6 @@ import {
 } from 'internal-test-helpers';
 
 import { compile } from 'ember-template-compiler';
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 import { helper, Helper } from '@ember/-internals/glimmer';
 
 import { Component } from '../../utils/helpers';
@@ -292,129 +291,3 @@ moduleFor(
     }
   }
 );
-
-if (EMBER_MODULE_UNIFICATION) {
-  class LocalLookupTestResolver extends ModuleBasedTestResolver {
-    expandLocalLookup(specifier, source) {
-      if (source && source.indexOf('components/') !== -1) {
-        let namespace = source.split('components/')[1];
-        let [type, name] = specifier.split(':');
-        name = name.replace('components/', '');
-
-        namespace = namespace.replace('.hbs', '');
-        return `${type}:${type === 'template' ? 'components/' : ''}${namespace}/${name}`;
-      }
-
-      return super.expandLocalLookup(specifier, source);
-    }
-  }
-
-  /*
-   * This sub-classing changes `registerXXX` methods to use the resolver.
-   * Required for testing the module unification-friendly `resolve` call
-   * with a `referrer` argument.
-   *
-   * In theory all these tests can be ported to use the resolver instead of
-   * the registry.
-   */
-  moduleFor(
-    'Components test: local lookup with resolution referrer',
-    class extends LocalLookupTest {
-      get resolver() {
-        return this.owner.__registry__.fallback.resolver;
-      }
-
-      getResolver() {
-        return new LocalLookupTestResolver();
-      }
-
-      registerComponent(name, { ComponentClass = Component, template = null }) {
-        let { resolver } = this;
-
-        if (ComponentClass) {
-          resolver.add(`component:${name}`, ComponentClass);
-        }
-
-        if (typeof template === 'string') {
-          resolver.add(
-            `template:components/${name}`,
-            this.compile(template, {
-              moduleName: `my-name/templates/components/${name}.hbs`,
-            })
-          );
-        }
-      }
-
-      registerTemplate(name, template) {
-        let { resolver } = this;
-        if (typeof template === 'string') {
-          resolver.add(
-            `template:${name}`,
-            this.compile(template, {
-              moduleName: `my-name/templates/${name}.hbs`,
-            })
-          );
-        } else {
-          throw new Error(`Registered template "${name}" must be a string`);
-        }
-      }
-
-      registerHelper(name, funcOrClassBody) {
-        let { resolver } = this;
-        let type = typeof funcOrClassBody;
-
-        if (type === 'function') {
-          resolver.add(`helper:${name}`, helper(funcOrClassBody));
-        } else if (type === 'object' && type !== null) {
-          resolver.add(`helper:${name}`, Helper.extend(funcOrClassBody));
-        } else {
-          throw new Error(`Cannot register ${funcOrClassBody} as a helper`);
-        }
-      }
-    }
-  );
-}
-
-if (EMBER_MODULE_UNIFICATION) {
-  moduleFor(
-    'Components test: local lookup with resolution referrer (MU)',
-    class extends ApplicationTestCase {
-      ['@test Ensure that the same specifier with two sources does not share a cache key'](assert) {
-        this.add(
-          {
-            specifier: 'template:components/x-not-shared',
-            source: 'template:my-app/templates/components/x-top.hbs',
-          },
-          compile('child-x-not-shared')
-        );
-
-        this.add(
-          {
-            specifier: 'template:components/x-top',
-            source: 'template:my-app/templates/application.hbs',
-          },
-          compile('top-level-x-top ({{x-not-shared}})', {
-            moduleName: 'my-app/templates/components/x-top.hbs',
-          })
-        );
-
-        this.add(
-          {
-            specifier: 'template:components/x-not-shared',
-            source: 'template:my-app/templates/application.hbs',
-          },
-          compile('top-level-x-not-shared')
-        );
-
-        this.addTemplate('application', '{{x-not-shared}} {{x-top}} {{x-not-shared}} {{x-top}}');
-
-        return this.visit('/').then(() => {
-          assert.equal(
-            this.element.textContent,
-            'top-level-x-not-shared top-level-x-top (child-x-not-shared) top-level-x-not-shared top-level-x-top (child-x-not-shared)'
-          );
-        });
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/namespaced-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/namespaced-lookup-test.js
deleted file mode 100644
index c130599bbf8..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/components/namespaced-lookup-test.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
-
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
-import { Component, helper } from '@ember/-internals/glimmer';
-
-if (EMBER_MODULE_UNIFICATION) {
-  moduleFor(
-    'Namespaced lookup',
-    class extends RenderingTestCase {
-      ['@test it can render a namespaced component']() {
-        this.addTemplate(
-          {
-            specifier: 'template:components/my-component',
-            namespace: 'my-addon',
-          },
-          'namespaced template {{myProp}}'
-        );
-
-        this.add(
-          {
-            specifier: 'component:my-component',
-            namespace: 'my-addon',
-          },
-          Component.extend({
-            myProp: 'My property',
-          })
-        );
-
-        this.addComponent('x-outer', {
-          template: '{{my-addon::my-component}}',
-        });
-
-        this.render('{{x-outer}}');
-
-        this.assertText('namespaced template My property');
-
-        runTask(() => this.rerender());
-
-        this.assertText('namespaced template My property');
-      }
-
-      ['@test it can render a nested namespaced component']() {
-        this.addTemplate(
-          {
-            specifier: 'template:components/my-component',
-            namespace: 'second-addon',
-          },
-          'second namespaced template'
-        );
-
-        this.addTemplate(
-          {
-            specifier: 'template:components/my-component',
-            namespace: 'first-addon',
-          },
-          'first namespaced template - {{second-addon::my-component}}'
-        );
-
-        this.addComponent('x-outer', {
-          template: '{{first-addon::my-component}}',
-        });
-
-        this.render('{{x-outer}}');
-
-        this.assertText('first namespaced template - second namespaced template');
-
-        runTask(() => this.rerender());
-
-        this.assertText('first namespaced template - second namespaced template');
-      }
-
-      ['@test it can render a nested un-namespaced component']() {
-        this.addTemplate(
-          {
-            specifier: 'template:components/addon-component',
-            source: 'template:first-addon/src/ui/components/my-component.hbs',
-          },
-          'un-namespaced addon template'
-        );
-
-        this.addTemplate(
-          {
-            specifier: 'template:components/my-component',
-            moduleName: 'first-addon/src/ui/components/my-component.hbs',
-            namespace: 'first-addon',
-          },
-          '{{addon-component}}'
-        );
-
-        this.addComponent('x-outer', {
-          template: '{{first-addon::my-component}}',
-        });
-
-        this.render('{{x-outer}}');
-
-        this.assertText('un-namespaced addon template');
-
-        runTask(() => this.rerender());
-
-        this.assertText('un-namespaced addon template');
-      }
-
-      ['@test it can render a namespaced main component']() {
-        this.addTemplate(
-          {
-            specifier: 'template:components/addon-component',
-            soruce: 'template:first-addon/src/ui/components/main.hbs',
-          },
-          'Nested namespaced component'
-        );
-
-        this.addTemplate(
-          {
-            specifier: 'template:components/first-addon',
-            moduleName: 'first-addon/src/ui/components/main.hbs',
-          },
-          '{{addon-component}}'
-        );
-
-        this.addComponent('x-outer', { template: '{{first-addon}}' });
-
-        this.render('{{x-outer}}');
-
-        this.assertText('Nested namespaced component');
-
-        runTask(() => this.rerender());
-
-        this.assertText('Nested namespaced component');
-      }
-
-      ['@test it does not render a main component when using a namespace']() {
-        this.addTemplate(
-          {
-            specifier: 'template:components/main',
-            namespace: 'my-addon',
-          },
-          'namespaced template {{myProp}}'
-        );
-
-        this.add(
-          {
-            specifier: 'component:main',
-            namespace: 'my-addon',
-          },
-          Component.extend({
-            myProp: 'My property',
-          })
-        );
-
-        this.add(
-          {
-            specifier: 'helper:my-addon',
-            namespace: 'empty-namespace',
-          },
-          helper(() => 'my helper')
-        );
-
-        this.render('{{empty-namespace::my-addon}}');
-
-        this.assertText('my helper'); // component should be not found
-
-        runTask(() => this.rerender());
-
-        this.assertText('my helper');
-      }
-
-      ['@test it renders a namespaced helper']() {
-        this.add(
-          {
-            specifier: 'helper:my-helper',
-            namespace: 'my-namespace',
-          },
-          helper(() => 'my helper')
-        );
-
-        this.render('{{my-namespace::my-helper}}');
-
-        this.assertText('my helper');
-
-        runTask(() => this.rerender());
-
-        this.assertText('my helper');
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index a8804872f58..e09088bb41a 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -1,5 +1,4 @@
 import { getOwner } from '@ember/-internals/owner';
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { computed } from './computed';
@@ -53,21 +52,6 @@ export default function inject(
   let source: string | undefined, namespace: string | undefined;
 
   let name = calledAsDecorator ? undefined : args[0];
-  let options = calledAsDecorator ? undefined : args[1];
-
-  if (EMBER_MODULE_UNIFICATION) {
-    source = options ? options.source : undefined;
-    namespace = undefined;
-
-    if (name !== undefined) {
-      let namespaceDelimiterOffset = name.indexOf('::');
-
-      if (namespaceDelimiterOffset !== -1) {
-        namespace = name.slice(0, namespaceDelimiterOffset);
-        name = name.slice(namespaceDelimiterOffset + 2);
-      }
-    }
-  }
 
   let getInjection = function(this: any, propertyName: string) {
     let owner = getOwner(this) || this.container; // fallback to `container` for backwards compat
diff --git a/packages/ember/tests/service_injection_test.js b/packages/ember/tests/service_injection_test.js
index c5f86500dde..8f3864fdb5a 100644
--- a/packages/ember/tests/service_injection_test.js
+++ b/packages/ember/tests/service_injection_test.js
@@ -4,7 +4,6 @@ import Service, { inject as injectService } from '@ember/service';
 import { _ProxyMixin } from '@ember/-internals/runtime';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { computed } from '@ember/-internals/metal';
-import { EMBER_MODULE_UNIFICATION } from '@ember/canary-features';
 
 moduleFor(
   'Service Injection',
@@ -80,199 +79,3 @@ moduleFor(
     }
   }
 );
-
-if (EMBER_MODULE_UNIFICATION) {
-  moduleFor(
-    'Service Injection (MU)',
-    class extends ApplicationTestCase {
-      ['@test Service can be injected with source and is resolved'](assert) {
-        let source = 'controller:src/ui/routes/application/controller';
-        this.add(
-          'controller:application',
-          Controller.extend({
-            myService: injectService('my-service', { source }),
-          })
-        );
-        let MyService = Service.extend();
-        this.add(
-          {
-            specifier: 'service:my-service',
-            source,
-          },
-          MyService
-        );
-
-        return this.visit('/').then(() => {
-          let controller = this.applicationInstance.lookup('controller:application');
-
-          assert.ok(controller.get('myService') instanceof MyService);
-        });
-      }
-
-      ['@test Services can be injected with same name, different source, and resolve different instances'](
-        assert
-      ) {
-        // This test implies that there is a file src/ui/routes/route-a/-services/my-service
-        let routeASource = 'controller:src/ui/routes/route-a/controller';
-        // This test implies that there is a file src/ui/routes/route-b/-services/my-service
-        let routeBSource = 'controller:src/ui/routes/route-b/controller';
-
-        this.add(
-          'controller:route-a',
-          Controller.extend({
-            myService: injectService('my-service', { source: routeASource }),
-          })
-        );
-
-        this.add(
-          'controller:route-b',
-          Controller.extend({
-            myService: injectService('my-service', { source: routeBSource }),
-          })
-        );
-
-        let LocalLookupService = Service.extend();
-        this.add(
-          {
-            specifier: 'service:my-service',
-            source: routeASource,
-          },
-          LocalLookupService
-        );
-
-        let MyService = Service.extend();
-        this.add(
-          {
-            specifier: 'service:my-service',
-            source: routeBSource,
-          },
-          MyService
-        );
-
-        return this.visit('/').then(() => {
-          let controllerA = this.applicationInstance.lookup('controller:route-a');
-          let serviceFromControllerA = controllerA.get('myService');
-          assert.ok(
-            serviceFromControllerA instanceof LocalLookupService,
-            'local lookup service is returned'
-          );
-
-          let controllerB = this.applicationInstance.lookup('controller:route-b');
-          let serviceFromControllerB = controllerB.get('myService');
-          assert.ok(serviceFromControllerB instanceof MyService, 'global service is returned');
-
-          assert.notStrictEqual(serviceFromControllerA, serviceFromControllerB);
-        });
-      }
-
-      ['@test Services can be injected with same name, different source, but same resolution result, and share an instance'](
-        assert
-      ) {
-        let routeASource = 'controller:src/ui/routes/route-a/controller';
-        let routeBSource = 'controller:src/ui/routes/route-b/controller';
-
-        this.add(
-          'controller:route-a',
-          Controller.extend({
-            myService: injectService('my-service', { source: routeASource }),
-          })
-        );
-
-        this.add(
-          'controller:route-b',
-          Controller.extend({
-            myService: injectService('my-service', { source: routeBSource }),
-          })
-        );
-
-        let MyService = Service.extend();
-        this.add(
-          {
-            specifier: 'service:my-service',
-          },
-          MyService
-        );
-
-        return this.visit('/').then(() => {
-          let controllerA = this.applicationInstance.lookup('controller:route-a');
-          let serviceFromControllerA = controllerA.get('myService');
-          assert.ok(serviceFromControllerA instanceof MyService);
-
-          let controllerB = this.applicationInstance.lookup('controller:route-b');
-          assert.strictEqual(serviceFromControllerA, controllerB.get('myService'));
-        });
-      }
-
-      /*
-       * This test demonstrates a failure in the caching system of ember's
-       * container around singletons and and local lookup. The local lookup
-       * is cached and the global injection is then looked up incorrectly.
-       *
-       * The paractical rules of Ember's module unification config are such
-       * that services cannot be locally looked up, thus this case is really
-       * just a demonstration of what could go wrong if we permit arbitrary
-       * configuration (such as a singleton type that has local lookup).
-       */
-      ['@test Services can be injected with same name, one with source one without, and share an instance'](
-        assert
-      ) {
-        let routeASource = 'controller:src/ui/routes/route-a/controller';
-        this.add(
-          'controller:route-a',
-          Controller.extend({
-            myService: injectService('my-service', { source: routeASource }),
-          })
-        );
-
-        this.add(
-          'controller:route-b',
-          Controller.extend({
-            myService: injectService('my-service'),
-          })
-        );
-
-        let MyService = Service.extend();
-        this.add(
-          {
-            specifier: 'service:my-service',
-          },
-          MyService
-        );
-
-        return this.visit('/').then(() => {
-          let controllerA = this.applicationInstance.lookup('controller:route-a');
-          let serviceFromControllerA = controllerA.get('myService');
-          assert.ok(serviceFromControllerA instanceof MyService, 'global service is returned');
-
-          let controllerB = this.applicationInstance.lookup('controller:route-b');
-          let serviceFromControllerB = controllerB.get('myService');
-          assert.ok(serviceFromControllerB instanceof MyService, 'global service is returned');
-
-          assert.strictEqual(serviceFromControllerA, serviceFromControllerB);
-        });
-      }
-
-      async ['@test Service with namespace can be injected and is resolved'](assert) {
-        this.add(
-          'controller:application',
-          Controller.extend({
-            myService: injectService('my-namespace::my-service'),
-          })
-        );
-        let MyService = Service.extend();
-        this.add(
-          {
-            specifier: 'service:my-service',
-            namespace: 'my-namespace',
-          },
-          MyService
-        );
-
-        await this.visit('/');
-
-        let controller = this.applicationInstance.lookup('controller:application');
-        assert.ok(controller.get('myService') instanceof MyService);
-      }
-    }
-  );
-}

From 4286b7be981ce7a0a66e098fe884867bf9bcc800 Mon Sep 17 00:00:00 2001
From: Aleksandr Kanunnikov <lifeart92@gmail.com>
Date: Wed, 9 Sep 2020 18:41:05 +0300
Subject: [PATCH 0109/1405] remove lint issues and experiment itself

---
 blueprints/initializer/index.js                      |  2 +-
 blueprints/mixin/index.js                            |  2 --
 blueprints/service/index.js                          |  1 -
 blueprints/util/index.js                             |  2 --
 node-tests/blueprints/acceptance-test-test.js        |  1 -
 node-tests/blueprints/controller-test.js             |  1 -
 node-tests/blueprints/helper-test-test.js            |  1 -
 node-tests/blueprints/initializer-test.js            |  1 -
 .../blueprints/instance-initializer-test-test.js     |  1 -
 node-tests/blueprints/instance-initializer-test.js   |  1 -
 node-tests/blueprints/mixin-test.js                  |  2 --
 node-tests/blueprints/template-test.js               |  1 -
 node-tests/blueprints/util-test-test.js              |  1 -
 node-tests/blueprints/util-test.js                   |  1 -
 .../-internals/container/tests/registry_test.js      |  7 +------
 packages/@ember/-internals/glimmer/lib/resolver.ts   |  4 +---
 .../integration/components/local-lookup-test.js      | 12 +-----------
 packages/@ember/canary-features/index.ts             |  2 --
 18 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/blueprints/initializer/index.js b/blueprints/initializer/index.js
index 1a96d3a0735..201732241cd 100644
--- a/blueprints/initializer/index.js
+++ b/blueprints/initializer/index.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  description: 'Generates an initializer.'
+  description: 'Generates an initializer.',
 };
diff --git a/blueprints/mixin/index.js b/blueprints/mixin/index.js
index bce45489630..5e707284920 100644
--- a/blueprints/mixin/index.js
+++ b/blueprints/mixin/index.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const path = require('path');
-
 module.exports = {
   description: 'Generates a mixin.',
   normalizeEntityName: function(entityName) {
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index 793a2e948c5..e008e7dc090 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -1,6 +1,5 @@
 'use strict';
 
-const path = require('path');
 const useEditionDetector = require('../edition-detector');
 
 module.exports = useEditionDetector({
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
index 4ca8dc4d51d..755a5745e6b 100644
--- a/blueprints/util/index.js
+++ b/blueprints/util/index.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const path = require('path');
-
 module.exports = {
   description: 'Generates a simple utility module/function.',
   normalizeEntityName: function(entityName) {
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index d7f4ff7b91b..c5b173bebe9 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -142,5 +142,4 @@ describe('Blueprint: acceptance-test', function() {
       });
     });
   });
-
 });
diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js
index a945b66389e..3e9a3f06b4c 100644
--- a/node-tests/blueprints/controller-test.js
+++ b/node-tests/blueprints/controller-test.js
@@ -7,7 +7,6 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const modifyPackages = blueprintHelpers.modifyPackages;
 
-const expectError = require('../helpers/expect-error');
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js
index 97480d6c96d..bd836ad57af 100644
--- a/node-tests/blueprints/helper-test-test.js
+++ b/node-tests/blueprints/helper-test-test.js
@@ -167,5 +167,4 @@ describe('Blueprint: helper-test', function() {
       });
     });
   });
-
 });
diff --git a/node-tests/blueprints/initializer-test.js b/node-tests/blueprints/initializer-test.js
index a06bd51815f..bf08d4b6030 100644
--- a/node-tests/blueprints/initializer-test.js
+++ b/node-tests/blueprints/initializer-test.js
@@ -6,7 +6,6 @@ const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const modifyPackages = blueprintHelpers.modifyPackages;
-const expectError = require('../helpers/expect-error');
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
diff --git a/node-tests/blueprints/instance-initializer-test-test.js b/node-tests/blueprints/instance-initializer-test-test.js
index 928f2ebe0a1..bcc053b709b 100644
--- a/node-tests/blueprints/instance-initializer-test-test.js
+++ b/node-tests/blueprints/instance-initializer-test-test.js
@@ -112,5 +112,4 @@ describe('Blueprint: instance-initializer-test', function() {
       });
     });
   });
-
 });
diff --git a/node-tests/blueprints/instance-initializer-test.js b/node-tests/blueprints/instance-initializer-test.js
index 7f632db433f..b5dda622247 100644
--- a/node-tests/blueprints/instance-initializer-test.js
+++ b/node-tests/blueprints/instance-initializer-test.js
@@ -6,7 +6,6 @@ const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const modifyPackages = blueprintHelpers.modifyPackages;
-const expectError = require('../helpers/expect-error');
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
diff --git a/node-tests/blueprints/mixin-test.js b/node-tests/blueprints/mixin-test.js
index 203cdb6f775..915c824ad42 100644
--- a/node-tests/blueprints/mixin-test.js
+++ b/node-tests/blueprints/mixin-test.js
@@ -5,7 +5,6 @@ const setupTestHooks = blueprintHelpers.setupTestHooks;
 const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
-const expectError = require('../helpers/expect-error');
 const EOL = require('os').EOL;
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
@@ -159,7 +158,6 @@ describe('Blueprint: mixin', function() {
     });
   });
 
-
   describe('in addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'addon' });
diff --git a/node-tests/blueprints/template-test.js b/node-tests/blueprints/template-test.js
index c49db42cff9..6a8b7a2be1c 100644
--- a/node-tests/blueprints/template-test.js
+++ b/node-tests/blueprints/template-test.js
@@ -5,7 +5,6 @@ const setupTestHooks = blueprintHelpers.setupTestHooks;
 const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
-const expectError = require('../helpers/expect-error');
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
diff --git a/node-tests/blueprints/util-test-test.js b/node-tests/blueprints/util-test-test.js
index 1372aececfd..56ee10daa7f 100644
--- a/node-tests/blueprints/util-test-test.js
+++ b/node-tests/blueprints/util-test-test.js
@@ -108,5 +108,4 @@ describe('Blueprint: util-test', function() {
       });
     });
   });
-
 });
diff --git a/node-tests/blueprints/util-test.js b/node-tests/blueprints/util-test.js
index 6922eb70a20..335c2921967 100644
--- a/node-tests/blueprints/util-test.js
+++ b/node-tests/blueprints/util-test.js
@@ -6,7 +6,6 @@ const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const modifyPackages = blueprintHelpers.modifyPackages;
-const expectError = require('../helpers/expect-error');
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
diff --git a/packages/@ember/-internals/container/tests/registry_test.js b/packages/@ember/-internals/container/tests/registry_test.js
index af48c057274..9459582f3cd 100644
--- a/packages/@ember/-internals/container/tests/registry_test.js
+++ b/packages/@ember/-internals/container/tests/registry_test.js
@@ -1,10 +1,5 @@
 import { Registry, privatize } from '..';
-import {
-  factory,
-  moduleFor,
-  AbstractTestCase,
-  ModuleBasedTestResolver,
-} from 'internal-test-helpers';
+import { factory, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   'Registry',
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 322798f432d..fcef8aed6a7 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -2,9 +2,7 @@ import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
 import { OwnedTemplateMeta } from '@ember/-internals/views';
-import {
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-} from '@ember/canary-features';
+import { EMBER_GLIMMER_SET_COMPONENT_TEMPLATE } from '@ember/canary-features';
 import { isTemplateOnlyComponent } from '@ember/component/template-only';
 import { assert, deprecate } from '@ember/debug';
 import { PARTIALS } from '@ember/deprecated-features';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
index 9451c5de8eb..0d3124c6997 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
@@ -1,14 +1,4 @@
-import {
-  moduleFor,
-  RenderingTestCase,
-  ModuleBasedTestResolver,
-  ApplicationTestCase,
-  runTask,
-} from 'internal-test-helpers';
-
-import { compile } from 'ember-template-compiler';
-import { helper, Helper } from '@ember/-internals/glimmer';
-
+import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 import { Component } from '../../utils/helpers';
 
 class LocalLookupTest extends RenderingTestCase {
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 20704ef6b28..61d61243b83 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -16,7 +16,6 @@ export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_NAMED_BLOCKS: null,
-  EMBER_MODULE_UNIFICATION: false,
   EMBER_CUSTOM_COMPONENT_ARG_PROXY: true,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
@@ -74,7 +73,6 @@ function featureValue(value: null | boolean) {
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
-export const EMBER_MODULE_UNIFICATION = featureValue(FEATURES.EMBER_MODULE_UNIFICATION);
 export const EMBER_CUSTOM_COMPONENT_ARG_PROXY = featureValue(
   FEATURES.EMBER_CUSTOM_COMPONENT_ARG_PROXY
 );

From 442fbea2708c770b32d0328a088bde15cb5fb0ac Mon Sep 17 00:00:00 2001
From: Aleksandr Kanunnikov <lifeart92@gmail.com>
Date: Wed, 9 Sep 2020 22:25:12 +0300
Subject: [PATCH 0110/1405] fix ts lag

---
 packages/@ember/-internals/glimmer/lib/resolver.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index fcef8aed6a7..cc2b1537304 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -366,7 +366,7 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       return null;
     }
 
-    return (args: { capture: () => any }, vm: { associateDestroyable: (arg0: {}) => void }) => {
+    return (args, vm) => {
       const helper = factory.create();
 
       if (isClassHelper(helper)) {

From 39ed2bbc2328f5efc3b32f783c744376f8cd6e38 Mon Sep 17 00:00:00 2001
From: Aleksandr Kanunnikov <lifeart92@gmail.com>
Date: Wed, 9 Sep 2020 22:27:59 +0300
Subject: [PATCH 0111/1405] remove unused namespace asserts

---
 packages/@ember/-internals/container/lib/container.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index cc2075234a8..d3c2c5032b9 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -221,10 +221,6 @@ export default class Container {
     let normalizedName = this.registry.normalize(fullName);
 
     assert('fullName must be a proper full name', this.registry.isValidFullName(normalizedName));
-    assert(
-      'namespace must be enabled to pass a namespace option to factoryFor',
-      !options.namespace
-    );
 
     if (options.source || options.namespace) {
       normalizedName = this.registry.expandLocalLookup(fullName, options);
@@ -281,8 +277,6 @@ function isInstantiatable(container: Container, fullName: string) {
 }
 
 function lookup(container: Container, fullName: string, options: LookupOptions = {}) {
-  assert('namespace must be enabled to pass a namespace option to lookup', !options.namespace);
-
   let normalizedName = fullName;
 
   if (options.source || options.namespace) {

From ab4dcea20d68d0823f0245f133d015afe791bb76 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 9 Sep 2020 15:49:39 -0400
Subject: [PATCH 0112/1405] Update router microlib to improve Transition
 related debugging.

---
 package.json                                  |  2 +-
 .../routing/lib/system/transition.ts          | 26 +++++++++++++++++++
 tests/docs/expected.js                        |  3 +++
 yarn.lock                                     | 10 ++++---
 4 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a28dbe18b96..b88a59a98e1 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^7.0.0",
+    "router_js": "^7.1.0",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/packages/@ember/-internals/routing/lib/system/transition.ts b/packages/@ember/-internals/routing/lib/system/transition.ts
index e49ce373a6a..fce723fe136 100644
--- a/packages/@ember/-internals/routing/lib/system/transition.ts
+++ b/packages/@ember/-internals/routing/lib/system/transition.ts
@@ -166,3 +166,29 @@
     value that the final redirecting transition fulfills with
   @public
 */
+
+/**
+  In non-production builds, this function will return the stack that this Transition was
+  created within. In production builds, this function will not be present.
+
+  @method debugCreationStack
+  @return string
+*/
+
+/**
+  In non-production builds, this function will return the stack that this Transition was
+  aborted within (or `undefined` if the Transition has not been aborted yet). In production
+  builds, this function will not be present.
+
+  @method debugAbortStack
+  @return string
+*/
+
+/**
+  In non-production builds, this property references the Transition that _this_ Transition
+  was derived from or `undefined` if this transition did not derive from another. In
+  production builds, this property will not be present.
+
+  @property debugPreviousTransition
+  @type {Transition | undefined}
+*/
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 90ef27138f0..a6dce1dc197 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -159,7 +159,10 @@ module.exports = {
     'deactivate',
     'debounce',
     'debug',
+    'debugAbortStack',
+    'debugCreationStack',
     'debugger',
+    'debugPreviousTransition',
     'decamelize',
     'decrementProperty',
     'defer',
diff --git a/yarn.lock b/yarn.lock
index 06a6fa3e8a6..c5dbd7ef55a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7986,10 +7986,12 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-router_js@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.0.0.tgz#92eb56141ee2cb59e04271e5f2d685cdfa836c37"
-  integrity sha512-pJ+W6SyPmMkZ/qawWyaDaAue1bXOx4FOuMMpxvYW/1r6Hifpp06+jURFbR8ryZszYopPYKS5OUQnv1izd3iPKA==
+router_js@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.1.0.tgz#d2a47d7224a30f3b6416be20c9c80868fc14ff0c"
+  integrity sha512-03n6mJCD6hTX4bUkowS+HcsyI9ghP3AxmtVSRnMmDWzykNlHE/wXy+hbybdHmnOH2sDe97L/4V7q6MfrVQBoIg==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
 
 rsvp@3.0.14:
   version "3.0.14"

From d654a6e588451503f8b2518d6d31ed264f95f634 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 9 Sep 2020 16:02:13 -0400
Subject: [PATCH 0113/1405] Add v3.22.0-beta.3 to CHANGELOG

(cherry picked from commit 676f728fbe9a5300a7c3d0fcd24f5b23af1ca7d9)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd712f4b7d7..82692094222 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.22.0-beta.3 (September 09, 2020)
+
+- [#19124](https://github.com/emberjs/ember.js/pull/19124) Fix rendering engine usage within a `fastboot` sandbox
+
 ### v3.22.0-beta.2 (August 31, 2020)
 
 - [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.

From b768a127fe5442ed801e373d55a8e7694f11bd79 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 24 Sep 2020 18:05:43 -0700
Subject: [PATCH 0114/1405] [DOC lts] Fix incorrect @action import

---
 packages/@ember/-internals/routing/lib/system/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index b91b41a646c..b2d714b5a56 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2429,7 +2429,7 @@ Route.reopen(ActionHandler, Evented, {
 
     ```app/routes/index.js
     import Route from '@ember/routing/route';
-    import { action } from '@glimmer/tracking';
+    import { action } from '@ember/object';
 
     export default class IndexRoute extends Route {
       @action

From 61e246d4074122a5aef72869cf7cfdd534f0d930 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 24 Sep 2020 19:54:53 -0700
Subject: [PATCH 0115/1405] [CLEANUP] Remove EMBER_CUSTOM_COMPONENT_ARG_PROXY
 feature

Also extract named args proxy logic into a function.
---
 .../glimmer/lib/component-managers/custom.ts  | 233 ++++++-------
 .../integration/components/tracked-test.js    | 313 +++++++++---------
 packages/@ember/canary-features/index.ts      |   4 -
 3 files changed, 276 insertions(+), 274 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index dd2ae166bca..a93f6ff52fd 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -2,12 +2,12 @@ import { ENV } from '@ember/-internals/environment';
 import { CUSTOM_TAG_FOR } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
 import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
-import { EMBER_CUSTOM_COMPONENT_ARG_PROXY } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   CapturedArguments,
+  CapturedNamedArguments,
   ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
@@ -17,9 +17,9 @@ import {
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { registerDestructor, reifyArgs, reifyPositional } from '@glimmer/runtime';
+import { registerDestructor, reifyPositional } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
-import { track } from '@glimmer/validator';
+import { Tag, track } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
@@ -41,16 +41,21 @@ const CAPABILITIES = {
 };
 
 export interface OptionalCapabilities {
-  asyncLifecycleCallbacks?: boolean;
-  destructor?: boolean;
-  updateHook?: boolean;
-}
+  '3.4': {
+    asyncLifecycleCallbacks?: boolean;
+    destructor?: boolean;
+  };
 
-type managerAPIVersion = '3.4' | '3.13';
+  '3.13': {
+    asyncLifecycleCallbacks?: boolean;
+    destructor?: boolean;
+    updateHook?: boolean;
+  };
+}
 
-export function capabilities(
-  managerAPI: managerAPIVersion,
-  options: OptionalCapabilities = {}
+export function capabilities<Version extends keyof OptionalCapabilities>(
+  managerAPI: Version,
+  options: OptionalCapabilities[Version] = {}
 ): Capabilities {
   assert(
     'Invalid component manager compatibility specified',
@@ -59,8 +64,8 @@ export function capabilities(
 
   let updateHook = true;
 
-  if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
-    updateHook = managerAPI === '3.13' ? Boolean(options.updateHook) : true;
+  if (managerAPI === '3.13') {
+    updateHook = Boolean((options as OptionalCapabilities['3.13']).updateHook);
   }
 
   return {
@@ -144,6 +149,94 @@ export interface ComponentArguments {
   named: Dict<unknown>;
 }
 
+function tagForNamedArg<NamedArgs extends CapturedNamedArguments, K extends keyof NamedArgs>(
+  namedArgs: NamedArgs,
+  key: K
+): Tag {
+  return track(() => valueForRef(namedArgs[key]));
+}
+
+let namedArgsProxyFor: (namedArgs: CapturedNamedArguments, debugName?: string) => Args['named'];
+
+if (HAS_NATIVE_PROXY) {
+  namedArgsProxyFor = <NamedArgs extends CapturedNamedArguments>(
+    namedArgs: NamedArgs,
+    debugName?: string
+  ) => {
+    let getTag = (key: keyof Args) => tagForNamedArg(namedArgs, key);
+
+    let handler: ProxyHandler<{}> = {
+      get(_target, prop) {
+        let ref = namedArgs[prop as string];
+
+        if (ref !== undefined) {
+          return valueForRef(ref);
+        } else if (prop === CUSTOM_TAG_FOR) {
+          return getTag;
+        }
+      },
+
+      has(_target, prop) {
+        return namedArgs[prop as string] !== undefined;
+      },
+
+      ownKeys(_target) {
+        return Object.keys(namedArgs);
+      },
+
+      getOwnPropertyDescriptor(_target, prop) {
+        assert(
+          'args proxies do not have real property descriptors, so you should never need to call getOwnPropertyDescriptor yourself. This code exists for enumerability, such as in for-in loops and Object.keys()',
+          namedArgs[prop as string] !== undefined
+        );
+
+        return {
+          enumerable: true,
+          configurable: true,
+        };
+      },
+    };
+
+    if (DEBUG) {
+      handler.set = function(_target, prop) {
+        assert(
+          `You attempted to set ${debugName}#${String(
+            prop
+          )} on a components arguments. Component arguments are immutable and cannot be updated directly, they always represent the values that are passed to your component. If you want to set default values, you should use a getter instead`
+        );
+
+        return false;
+      };
+    }
+
+    return new Proxy({}, handler);
+  };
+} else {
+  namedArgsProxyFor = <NamedArgs extends CapturedNamedArguments>(namedArgs: NamedArgs) => {
+    let getTag = (key: keyof Args) => tagForNamedArg(namedArgs, key);
+
+    let proxy = {};
+
+    Object.defineProperty(proxy, CUSTOM_TAG_FOR, {
+      configurable: false,
+      enumerable: false,
+      value: getTag,
+    });
+
+    Object.keys(namedArgs).forEach(name => {
+      Object.defineProperty(proxy, name, {
+        enumerable: true,
+        configurable: true,
+        get() {
+          return valueForRef(namedArgs[name]);
+        },
+      });
+    });
+
+    return proxy;
+  };
+}
+
 /**
   The CustomComponentManager allows addons to provide custom component
   implementations that integrate seamlessly into Ember. This is accomplished
@@ -185,91 +278,15 @@ export default class CustomComponentManager<ComponentInstance>
     definition: CustomComponentDefinitionState<ComponentInstance>,
     args: VMArguments
   ): CustomComponentState<ComponentInstance> {
-    const { delegate } = definition;
-    const capturedArgs = args.capture();
-    const namedArgs = capturedArgs.named;
-
-    let value;
-    let namedArgsProxy = {};
-
-    if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
-      let getTag = (key: string) => {
-        return track(() => valueForRef(namedArgs[key]));
-      };
-
-      if (HAS_NATIVE_PROXY) {
-        let handler: ProxyHandler<{}> = {
-          get(_target, prop) {
-            let ref = namedArgs[prop as string];
-
-            if (ref !== undefined) {
-              return valueForRef(ref);
-            } else if (prop === CUSTOM_TAG_FOR) {
-              return getTag;
-            }
-          },
-
-          has(_target, prop) {
-            return namedArgs[prop as string] !== undefined;
-          },
-
-          ownKeys(_target) {
-            return Object.keys(namedArgs);
-          },
-
-          getOwnPropertyDescriptor(_target, prop) {
-            assert(
-              'args proxies do not have real property descriptors, so you should never need to call getOwnPropertyDescriptor yourself. This code exists for enumerability, such as in for-in loops and Object.keys()',
-              namedArgs[prop as string] !== undefined
-            );
-
-            return {
-              enumerable: true,
-              configurable: true,
-            };
-          },
-        };
-
-        if (DEBUG) {
-          handler.set = function(_target, prop) {
-            assert(
-              `You attempted to set ${definition.ComponentClass.class}#${String(
-                prop
-              )} on a components arguments. Component arguments are immutable and cannot be updated directly, they always represent the values that are passed to your component. If you want to set default values, you should use a getter instead`
-            );
-
-            return false;
-          };
-        }
-
-        namedArgsProxy = new Proxy(namedArgsProxy, handler);
-      } else {
-        Object.defineProperty(namedArgsProxy, CUSTOM_TAG_FOR, {
-          configurable: false,
-          enumerable: false,
-          value: getTag,
-        });
-
-        Object.keys(namedArgs).forEach(name => {
-          Object.defineProperty(namedArgsProxy, name, {
-            enumerable: true,
-            configurable: true,
-            get() {
-              return valueForRef(namedArgs[name]);
-            },
-          });
-        });
-      }
-
-      value = {
-        named: namedArgsProxy,
-        positional: reifyPositional(capturedArgs.positional),
-      };
-    } else {
-      value = reifyArgs(capturedArgs);
-    }
-
-    const component = delegate.createComponent(definition.ComponentClass.class, value);
+    let { delegate } = definition;
+    let capturedArgs = args.capture();
+    let { named, positional } = capturedArgs;
+    let namedArgsProxy = namedArgsProxyFor(named);
+
+    let component = delegate.createComponent(definition.ComponentClass.class, {
+      named: namedArgsProxy,
+      positional: reifyPositional(positional),
+    });
 
     let bucket = new CustomComponentState(delegate, component, capturedArgs, env, namedArgsProxy);
 
@@ -299,21 +316,13 @@ export default class CustomComponentManager<ComponentInstance>
       bucket.env.extra.debugRenderTree.update(bucket);
     }
 
-    let { delegate, component, args, namedArgsProxy } = bucket;
+    if (hasUpdateHook(bucket.delegate)) {
+      let { delegate, component, args, namedArgsProxy } = bucket;
 
-    let value;
-
-    if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
-      value = {
-        named: namedArgsProxy!,
+      delegate.updateComponent(component, {
+        named: namedArgsProxy,
         positional: reifyPositional(args.positional),
-      };
-    } else {
-      value = reifyArgs(args);
-    }
-
-    if (hasUpdateHook(delegate)) {
-      delegate.updateComponent(component, value);
+      });
     }
   }
 
@@ -376,7 +385,7 @@ export class CustomComponentState<ComponentInstance> {
     public component: ComponentInstance,
     public args: CapturedArguments,
     public env: EmberVMEnvironment,
-    public namedArgsProxy?: {}
+    public namedArgsProxy: Args['named']
   ) {
     if (hasDestructors(delegate)) {
       registerDestructor(this, () => delegate.destroyComponent(component));
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index a6342af3e9c..c701a34208c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -1,5 +1,4 @@
 import { Object as EmberObject, A, ArrayProxy, PromiseProxyMixin } from '@ember/-internals/runtime';
-import { EMBER_CUSTOM_COMPONENT_ARG_PROXY } from '@ember/canary-features';
 import {
   computed,
   get,
@@ -546,213 +545,211 @@ moduleFor(
   }
 );
 
-if (EMBER_CUSTOM_COMPONENT_ARG_PROXY) {
-  moduleFor(
-    'Component Tracked Properties w/ Args Proxy',
-    class extends RenderingTestCase {
-      '@test downstream property changes do not invalidate upstream component getters/arguments'(
-        assert
-      ) {
-        let outerRenderCount = 0;
-        let innerRenderCount = 0;
-
-        class OuterComponent extends GlimmerishComponent {
-          get count() {
-            outerRenderCount++;
-            return this.args.count;
-          }
+moduleFor(
+  'Component Tracked Properties w/ Args Proxy',
+  class extends RenderingTestCase {
+    '@test downstream property changes do not invalidate upstream component getters/arguments'(
+      assert
+    ) {
+      let outerRenderCount = 0;
+      let innerRenderCount = 0;
+
+      class OuterComponent extends GlimmerishComponent {
+        get count() {
+          outerRenderCount++;
+          return this.args.count;
         }
+      }
 
-        class InnerComponent extends GlimmerishComponent {
-          @tracked count = 0;
+      class InnerComponent extends GlimmerishComponent {
+        @tracked count = 0;
 
-          get combinedCounts() {
-            innerRenderCount++;
-            return this.args.count + this.count;
-          }
+        get combinedCounts() {
+          innerRenderCount++;
+          return this.args.count + this.count;
+        }
 
-          updateInnerCount() {
-            this.count++;
-          }
+        updateInnerCount() {
+          this.count++;
         }
+      }
 
-        this.registerComponent('outer', {
-          ComponentClass: OuterComponent,
-          template: '<Inner @count={{this.count}}/>',
-        });
+      this.registerComponent('outer', {
+        ComponentClass: OuterComponent,
+        template: '<Inner @count={{this.count}}/>',
+      });
 
-        this.registerComponent('inner', {
-          ComponentClass: InnerComponent,
-          template: '<button {{action this.updateInnerCount}}>{{this.combinedCounts}}</button>',
-        });
+      this.registerComponent('inner', {
+        ComponentClass: InnerComponent,
+        template: '<button {{action this.updateInnerCount}}>{{this.combinedCounts}}</button>',
+      });
 
-        this.render('<Outer @count={{this.count}}/>', {
-          count: 0,
-        });
+      this.render('<Outer @count={{this.count}}/>', {
+        count: 0,
+      });
 
-        this.assertText('0');
+      this.assertText('0');
 
-        assert.equal(outerRenderCount, 1);
-        assert.equal(innerRenderCount, 1);
+      assert.equal(outerRenderCount, 1);
+      assert.equal(innerRenderCount, 1);
 
-        runTask(() => this.$('button').click());
+      runTask(() => this.$('button').click());
 
-        this.assertText('1');
+      this.assertText('1');
 
-        assert.equal(
-          outerRenderCount,
-          1,
-          'updating inner component does not cause outer component to rerender'
-        );
-        assert.equal(
-          innerRenderCount,
-          2,
-          'updating inner component causes inner component to rerender'
-        );
+      assert.equal(
+        outerRenderCount,
+        1,
+        'updating inner component does not cause outer component to rerender'
+      );
+      assert.equal(
+        innerRenderCount,
+        2,
+        'updating inner component causes inner component to rerender'
+      );
 
-        runTask(() => this.context.set('count', 1));
+      runTask(() => this.context.set('count', 1));
 
-        this.assertText('2');
+      this.assertText('2');
 
-        assert.equal(outerRenderCount, 2, 'outer component updates based on context');
-        assert.equal(innerRenderCount, 3, 'inner component updates based on outer component');
-      }
+      assert.equal(outerRenderCount, 2, 'outer component updates based on context');
+      assert.equal(innerRenderCount, 3, 'inner component updates based on outer component');
+    }
 
-      '@test computed properties can depend on args'() {
-        class TestComponent extends GlimmerishComponent {
-          @computed('args.text')
-          get text() {
-            return this.args.text;
-          }
+    '@test computed properties can depend on args'() {
+      class TestComponent extends GlimmerishComponent {
+        @computed('args.text')
+        get text() {
+          return this.args.text;
         }
+      }
 
-        this.registerComponent('test', {
-          ComponentClass: TestComponent,
-          template: '<p>{{this.text}}</p>',
-        });
+      this.registerComponent('test', {
+        ComponentClass: TestComponent,
+        template: '<p>{{this.text}}</p>',
+      });
 
-        this.render('<Test @text={{this.text}}/>', {
-          text: 'hello!',
-        });
+      this.render('<Test @text={{this.text}}/>', {
+        text: 'hello!',
+      });
 
-        this.assertText('hello!');
+      this.assertText('hello!');
 
-        runTask(() => this.context.set('text', 'hello world!'));
-        this.assertText('hello world!');
+      runTask(() => this.context.set('text', 'hello world!'));
+      this.assertText('hello world!');
 
-        runTask(() => this.context.set('text', 'hello!'));
-        this.assertText('hello!');
-      }
+      runTask(() => this.context.set('text', 'hello!'));
+      this.assertText('hello!');
+    }
 
-      '@test computed properties can depend on nested args'() {
-        let foo = EmberObject.create({
-          text: 'hello!',
-        });
+    '@test computed properties can depend on nested args'() {
+      let foo = EmberObject.create({
+        text: 'hello!',
+      });
 
-        class TestComponent extends GlimmerishComponent {
-          @computed('args.foo.text')
-          get text() {
-            return this.args.foo.text;
-          }
+      class TestComponent extends GlimmerishComponent {
+        @computed('args.foo.text')
+        get text() {
+          return this.args.foo.text;
         }
+      }
 
-        this.registerComponent('test', {
-          ComponentClass: TestComponent,
-          template: '<p>{{this.text}}</p>',
-        });
+      this.registerComponent('test', {
+        ComponentClass: TestComponent,
+        template: '<p>{{this.text}}</p>',
+      });
 
-        this.render('<Test @foo={{this.foo}}/>', {
-          foo: foo,
-        });
+      this.render('<Test @foo={{this.foo}}/>', {
+        foo: foo,
+      });
 
-        this.assertText('hello!');
+      this.assertText('hello!');
 
-        runTask(() => foo.set('text', 'hello world!'));
-        this.assertText('hello world!');
+      runTask(() => foo.set('text', 'hello world!'));
+      this.assertText('hello world!');
 
-        runTask(() => foo.set('text', 'hello!'));
-        this.assertText('hello!');
-      }
+      runTask(() => foo.set('text', 'hello!'));
+      this.assertText('hello!');
+    }
 
-      '@test args can be accessed with get()'() {
-        class TestComponent extends GlimmerishComponent {
-          get text() {
-            return get(this, 'args.text');
-          }
+    '@test args can be accessed with get()'() {
+      class TestComponent extends GlimmerishComponent {
+        get text() {
+          return get(this, 'args.text');
         }
+      }
 
-        this.registerComponent('test', {
-          ComponentClass: TestComponent,
-          template: '<p>{{this.text}}</p>',
-        });
+      this.registerComponent('test', {
+        ComponentClass: TestComponent,
+        template: '<p>{{this.text}}</p>',
+      });
 
-        this.render('<Test @text={{this.text}}/>', {
-          text: 'hello!',
-        });
+      this.render('<Test @text={{this.text}}/>', {
+        text: 'hello!',
+      });
 
-        this.assertText('hello!');
+      this.assertText('hello!');
 
-        runTask(() => this.context.set('text', 'hello world!'));
-        this.assertText('hello world!');
+      runTask(() => this.context.set('text', 'hello world!'));
+      this.assertText('hello world!');
 
-        runTask(() => this.context.set('text', 'hello!'));
-        this.assertText('hello!');
-      }
+      runTask(() => this.context.set('text', 'hello!'));
+      this.assertText('hello!');
+    }
 
-      '@test args can be accessed with get() if no value is passed'() {
-        class TestComponent extends GlimmerishComponent {
-          get text() {
-            return get(this, 'args.text') || 'hello!';
-          }
+    '@test args can be accessed with get() if no value is passed'() {
+      class TestComponent extends GlimmerishComponent {
+        get text() {
+          return get(this, 'args.text') || 'hello!';
         }
+      }
 
-        this.registerComponent('test', {
-          ComponentClass: TestComponent,
-          template: '<p>{{this.text}}</p>',
-        });
+      this.registerComponent('test', {
+        ComponentClass: TestComponent,
+        template: '<p>{{this.text}}</p>',
+      });
 
-        this.render('<Test/>', {
-          text: 'hello!',
-        });
+      this.render('<Test/>', {
+        text: 'hello!',
+      });
 
-        this.assertText('hello!');
-      }
+      this.assertText('hello!');
+    }
 
-      '@test named args are enumerable'() {
-        class TestComponent extends GlimmerishComponent {
-          get objectKeys() {
-            return Object.keys(this.args).join('');
-          }
+    '@test named args are enumerable'() {
+      class TestComponent extends GlimmerishComponent {
+        get objectKeys() {
+          return Object.keys(this.args).join('');
+        }
 
-          get hasArg() {
-            return 'text' in this.args;
-          }
+        get hasArg() {
+          return 'text' in this.args;
         }
+      }
 
-        this.registerComponent('test', {
-          ComponentClass: TestComponent,
-          template: '<p>{{this.objectKeys}} {{this.hasArg}}</p>',
-        });
+      this.registerComponent('test', {
+        ComponentClass: TestComponent,
+        template: '<p>{{this.objectKeys}} {{this.hasArg}}</p>',
+      });
 
-        this.render('<Test @text={{this.text}}/>', {
-          text: 'hello!',
-        });
+      this.render('<Test @text={{this.text}}/>', {
+        text: 'hello!',
+      });
 
-        this.assertText('text true');
-      }
+      this.assertText('text true');
+    }
 
-      '@test each-in works with args'() {
-        this.registerComponent('test', {
-          ComponentClass: class extends GlimmerishComponent {},
-          template: '{{#each-in this.args as |key value|}}{{key}}:{{value}}{{/each-in}}',
-        });
+    '@test each-in works with args'() {
+      this.registerComponent('test', {
+        ComponentClass: class extends GlimmerishComponent {},
+        template: '{{#each-in this.args as |key value|}}{{key}}:{{value}}{{/each-in}}',
+      });
 
-        this.render('<Test @text={{this.text}}/>', {
-          text: 'hello!',
-        });
+      this.render('<Test @text={{this.text}}/>', {
+        text: 'hello!',
+      });
 
-        this.assertText('text:hello!');
-      }
+      this.assertText('text:hello!');
     }
-  );
-}
+  }
+);
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 61d61243b83..88e0837c402 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -16,7 +16,6 @@ export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_NAMED_BLOCKS: null,
-  EMBER_CUSTOM_COMPONENT_ARG_PROXY: true,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
   EMBER_GLIMMER_IN_ELEMENT: true,
@@ -73,9 +72,6 @@ function featureValue(value: null | boolean) {
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
-export const EMBER_CUSTOM_COMPONENT_ARG_PROXY = featureValue(
-  FEATURES.EMBER_CUSTOM_COMPONENT_ARG_PROXY
-);
 export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
   FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 );

From 4f6d0d5cbf58a43b8060d9d7b7acb11a0355ba01 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 24 Sep 2020 21:45:42 -0700
Subject: [PATCH 0116/1405] Upgrade to TypeScript 3.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This seems to have Just Worked™? We can probably try upgrading to
4.0 with broccoli-typescript-compiler 6.0 after this.
---
 package.json |  2 +-
 yarn.lock    | 56 ++++++++++++++++++++++++++--------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index b88a59a98e1..be08e13d57e 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "broccoli-rollup": "^2.1.1",
     "broccoli-source": "^3.0.0",
     "broccoli-string-replace": "^0.1.2",
-    "broccoli-typescript-compiler": "^4.2.0",
+    "broccoli-typescript-compiler": "^5.0.0",
     "broccoli-uglify-sourcemap": "^3.2.0",
     "common-tags": "^1.8.0",
     "core-js": "^2.6.5",
diff --git a/yarn.lock b/yarn.lock
index c5dbd7ef55a..d6f13a513e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1838,6 +1838,11 @@ bluebird@^3.1.1, bluebird@^3.4.6:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
   integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
 
+blueimp-md5@^2.10.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935"
+  integrity sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q==
+
 body-parser@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
@@ -2120,7 +2125,7 @@ broccoli-merge-trees@^1.1.1:
     rimraf "^2.4.3"
     symlink-or-copy "^1.0.0"
 
-broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
+broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.2.tgz#f33b451994225522b5c9bcf27d59decfd8ba537d"
   integrity sha512-ZyPAwrOdlCddduFbsMyyFzJUrvW6b04pMvDiAQZrCwghlvgowJDY+EfoXn+eR1RRA5nmGHJ+B68T63VnpRiT1A==
@@ -2128,7 +2133,7 @@ broccoli-merge-trees@^3.0.0, broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^
     broccoli-plugin "^1.3.0"
     merge-trees "^2.0.0"
 
-broccoli-merge-trees@^4.2.0:
+broccoli-merge-trees@^4.1.0, broccoli-merge-trees@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
   integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
@@ -2251,7 +2256,7 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
-broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
+broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.3.tgz#9dcfbfb6a1b27a37cc22e65c071719ce9f92bc1e"
   integrity sha512-CtAIEYq5K+4yQv8c/BHymOteuyjDAJfvy/asu4LudIWcMSS7dTn3yGI5gNBkwHG+qlRangYkHJNVAcDZMQbSVQ==
@@ -2328,19 +2333,19 @@ broccoli-string-replace@^0.1.2:
     broccoli-persistent-filter "^1.1.5"
     minimatch "^3.0.3"
 
-broccoli-typescript-compiler@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-4.2.0.tgz#b0c75898c75b897f40d3f627d548a64e0bb3d9f2"
-  integrity sha512-Fk17EapT3Yye5pUNC3lzxq78KdFTWGC7m8Zi8BnIfwD6ZPzVT+uEYMEcYXsfCtMD//jHSIXDQi9YlWZcHVjiDw==
+broccoli-typescript-compiler@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-5.0.0.tgz#c56e6383e5c57efb2ce6852aa3f8154e92c689ed"
+  integrity sha512-pUd+VYyD5Afy4mYWnrGbEt+DmuqUDh4mFAP5tOaDz0y/rwlbEN3OvXrhSMcXhTDq2cDSiHqsfQO304nSYFT0Nw==
   dependencies:
-    broccoli-funnel "^2.0.1"
-    broccoli-merge-trees "^3.0.0"
-    broccoli-plugin "^1.3.0"
-    fs-tree-diff "^0.5.7"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^4.1.0"
+    broccoli-plugin "^4.0.1"
+    fs-tree-diff "^2.0.1"
     heimdalljs "0.3.3"
-    md5-hex "^2.0.0"
-    typescript "~3.5.3"
-    walk-sync "^0.3.2"
+    md5-hex "^3.0.1"
+    typescript "~3.7.5"
+    walk-sync "^2.0.2"
 
 broccoli-uglify-sourcemap@^3.2.0:
   version "3.2.0"
@@ -6424,17 +6429,12 @@ matcher-collection@^2.0.0:
     "@types/minimatch" "^3.0.3"
     minimatch "^3.0.2"
 
-md5-hex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33"
-  integrity sha1-0FiOnxx0lUSS7NJKwKxs6ZfZLjM=
+md5-hex@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"
+  integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==
   dependencies:
-    md5-o-matic "^0.1.1"
-
-md5-o-matic@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/md5-o-matic/-/md5-o-matic-0.1.1.tgz#822bccd65e117c514fab176b25945d54100a03c3"
-  integrity sha1-givM1l4RfFFPqxdrJZRdVBAKA8M=
+    blueimp-md5 "^2.10.0"
 
 mdn-links@^0.1.0:
   version "0.1.0"
@@ -9096,10 +9096,10 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@~3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977"
-  integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==
+typescript@~3.7.5:
+  version "3.7.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
+  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From eb2152148139838d22f1b1cbaf004abba4530323 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 25 Sep 2020 12:32:44 -0700
Subject: [PATCH 0117/1405] Change assert signature to try TS 3.7 features

---
 packages/@ember/debug/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index be77e1984f6..121f10053b9 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -21,7 +21,7 @@ export type DebugFunctionType =
   | 'runInDebug'
   | 'deprecateFunc';
 
-export type AssertFunc = (desc: string, test?: boolean) => void;
+export type AssertFunc = (desc: string, condition?: unknown) => asserts condition;
 export type DebugFunc = (message: string) => void;
 export type DebugSealFunc = (obj: object) => void;
 export type DebugFreezeFunc = (obj: object) => void;

From d46bbf9a4ff3cf4a5a36044dc98dd924f76350a1 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 25 Sep 2020 18:08:58 -0700
Subject: [PATCH 0118/1405] Upgrade prettier to fix parse error

---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index be08e13d57e..ea1da2920ec 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "eslint-plugin-ember-internal": "^1.1.1",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-qunit": "^4.0.0",
     "execa": "^2.0.4",
     "express": "^4.17.1",
@@ -132,7 +132,7 @@
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
     "mocha": "^7.1.2",
-    "prettier": "^1.18.2",
+    "prettier": "^1.19.1",
     "puppeteer": "^3.0.4",
     "qunit": "^2.10.0",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index d6f13a513e1..66fec39e073 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3918,10 +3918,10 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca"
-  integrity sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==
+eslint-plugin-prettier@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
+  integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -7350,10 +7350,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
-  integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
+prettier@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
+  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 pretty-ms@^3.1.0:
   version "3.1.0"

From 68f4483df86c7a2e42739c3d99c87d34fa445edd Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 25 Sep 2020 18:12:10 -0700
Subject: [PATCH 0119/1405] Apply new prettier autofix

---
 lib/index.js                                  |  4 +-
 node-tests/blueprints/acceptance-test-test.js |  5 ++-
 node-tests/blueprints/component-test-test.js  |  5 ++-
 node-tests/blueprints/controller-test-test.js |  5 ++-
 node-tests/blueprints/helper-test-test.js     |  5 ++-
 .../blueprints/initializer-test-test.js       |  5 ++-
 .../instance-initializer-test-test.js         |  5 ++-
 node-tests/blueprints/mixin-test-test.js      |  5 ++-
 node-tests/blueprints/route-test-test.js      |  5 ++-
 node-tests/blueprints/service-test-test.js    |  5 ++-
 node-tests/blueprints/util-test-test.js       |  5 ++-
 .../application/debug-render-tree-test.ts     |  2 +-
 .../application/helper-registration-test.js   | 10 ++++-
 .../integration/components/append-test.js     |  5 ++-
 .../integration/components/life-cycle-test.js | 11 ++++-
 .../glimmer/tests/integration/mount-test.js   |  4 +-
 .../tests/integration/syntax/each-test.js     | 10 ++++-
 packages/@ember/-internals/meta/lib/meta.ts   |  2 +-
 .../@ember/-internals/metal/lib/decorator.ts  |  2 +-
 .../metal/tests/accessors/get_test.js         |  5 ++-
 .../-internals/metal/tests/computed_test.js   | 42 +++++++++++++++----
 .../-internals/routing/lib/system/router.ts   | 12 +++---
 .../runtime/tests/array/sortBy-test.js        |  5 ++-
 .../runtime/tests/array/uniqBy-test.js        |  5 ++-
 .../mixins/observable/observable_test.js      |  4 +-
 .../tests/mixins/promise_proxy_test.js        | 25 ++++++++---
 .../utils/tests/checkHasSuper_test.js         |  5 ++-
 .../utils/tests/get-debug-name-test.js        | 10 ++++-
 .../computed/reduce_computed_macros_test.js   | 28 ++++++++++---
 packages/@ember/runloop/tests/run_test.js     |  6 ++-
 .../tests/routing/decoupled_basic_test.js     | 16 +++++--
 packages/internal-test-helpers/index.js       |  4 +-
 32 files changed, 206 insertions(+), 61 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 02051db7d9d..b14203c05ca 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -250,8 +250,8 @@ module.exports = {
 
     if (
       !isProduction &&
-      (PRE_BUILT_TARGETS.every(target => targets.includes(target)) &&
-        targets.length === PRE_BUILT_TARGETS.length)
+      PRE_BUILT_TARGETS.every(target => targets.includes(target)) &&
+      targets.length === PRE_BUILT_TARGETS.length
     ) {
       ember = new Funnel(tree, {
         destDir: 'ember',
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index c5b173bebe9..8266fa9b7d4 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -75,7 +75,10 @@ describe('Blueprint: acceptance-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/component-test-test.js b/node-tests/blueprints/component-test-test.js
index bdaaa7a579f..9a7dd61cc5e 100644
--- a/node-tests/blueprints/component-test-test.js
+++ b/node-tests/blueprints/component-test-test.js
@@ -166,7 +166,10 @@ describe('Blueprint: component-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/controller-test-test.js b/node-tests/blueprints/controller-test-test.js
index 7b1e1ac5e02..b33b55de1fb 100644
--- a/node-tests/blueprints/controller-test-test.js
+++ b/node-tests/blueprints/controller-test-test.js
@@ -126,7 +126,10 @@ describe('Blueprint: controller-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js
index bd836ad57af..2d23bf02100 100644
--- a/node-tests/blueprints/helper-test-test.js
+++ b/node-tests/blueprints/helper-test-test.js
@@ -126,7 +126,10 @@ describe('Blueprint: helper-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/initializer-test-test.js b/node-tests/blueprints/initializer-test-test.js
index 61fb5fcf40b..e9034463c4e 100644
--- a/node-tests/blueprints/initializer-test-test.js
+++ b/node-tests/blueprints/initializer-test-test.js
@@ -75,7 +75,10 @@ describe('Blueprint: initializer-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/instance-initializer-test-test.js b/node-tests/blueprints/instance-initializer-test-test.js
index bcc053b709b..e696d2f2c15 100644
--- a/node-tests/blueprints/instance-initializer-test-test.js
+++ b/node-tests/blueprints/instance-initializer-test-test.js
@@ -75,7 +75,10 @@ describe('Blueprint: instance-initializer-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/mixin-test-test.js b/node-tests/blueprints/mixin-test-test.js
index c743c1dd861..d0105b97c1f 100644
--- a/node-tests/blueprints/mixin-test-test.js
+++ b/node-tests/blueprints/mixin-test-test.js
@@ -69,7 +69,10 @@ describe('Blueprint: mixin-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/route-test-test.js b/node-tests/blueprints/route-test-test.js
index 081ceeb5c08..ddfac988d31 100644
--- a/node-tests/blueprints/route-test-test.js
+++ b/node-tests/blueprints/route-test-test.js
@@ -88,7 +88,10 @@ describe('Blueprint: route-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/service-test-test.js b/node-tests/blueprints/service-test-test.js
index 6f887cb7d36..e5a26004e33 100644
--- a/node-tests/blueprints/service-test-test.js
+++ b/node-tests/blueprints/service-test-test.js
@@ -92,7 +92,10 @@ describe('Blueprint: service-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/node-tests/blueprints/util-test-test.js b/node-tests/blueprints/util-test-test.js
index 56ee10daa7f..f91663517f7 100644
--- a/node-tests/blueprints/util-test-test.js
+++ b/node-tests/blueprints/util-test-test.js
@@ -73,7 +73,10 @@ describe('Blueprint: util-test', function() {
 
     describe('with ember-mocha@0.14.0', function() {
       beforeEach(function() {
-        modifyPackages([{ name: 'ember-qunit', delete: true }, { name: 'ember-mocha', dev: true }]);
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index ee7815caf9b..83df68d62bd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1502,7 +1502,7 @@ if (ENV._DEBUG_RENDER_TREE) {
       ): ExpectedRenderNode;
       outlet(node: ExpectedRenderNode & { type: 'engine' | 'route-template' }): ExpectedRenderNode;
       outlet(
-        nodeOrName: string | ExpectedRenderNode & { type: 'engine' | 'route-template' },
+        nodeOrName: string | (ExpectedRenderNode & { type: 'engine' | 'route-template' }),
         node?: ExpectedRenderNode & { type: 'engine' | 'route-template' }
       ): ExpectedRenderNode {
         let name: string;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
index e9ac8864d72..ffd04024688 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
@@ -58,9 +58,15 @@ moduleFor(
         `<div id='wrapper'>{{omg}}|{{yorp 'boo'}}|{{yorp 'ya'}}</div>`
       );
 
-      this.application.register('helper:omg', helper(() => 'OMG'));
+      this.application.register(
+        'helper:omg',
+        helper(() => 'OMG')
+      );
 
-      this.application.register('helper:yorp', helper(([value]) => value));
+      this.application.register(
+        'helper:yorp',
+        helper(([value]) => value)
+      );
 
       return this.visit('/').then(() => {
         assert.equal(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
index 574f11f6d9f..bd4c5a1b3c4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -140,7 +140,10 @@ class AbstractAppendTest extends RenderingTestCase {
 
     assert.deepEqual(
       hooks,
-      [['x-parent', 'init'], ['x-parent', 'on(init)']],
+      [
+        ['x-parent', 'init'],
+        ['x-parent', 'on(init)'],
+      ],
       'creation of x-parent'
     );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index e2a8f84cc1f..1cef9564e49 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -1077,7 +1077,11 @@ class LifeCycleHooksTest extends RenderingTestCase {
     this.assertRegisteredViews('intial render');
 
     let initialHooks = () => {
-      let ret = [['an-item', 'init'], ['an-item', 'on(init)'], ['an-item', 'didReceiveAttrs']];
+      let ret = [
+        ['an-item', 'init'],
+        ['an-item', 'on(init)'],
+        ['an-item', 'didReceiveAttrs'],
+      ];
       if (this.isInteractive) {
         ret.push(['an-item', 'willRender'], ['an-item', 'willInsertElement']);
       }
@@ -1259,7 +1263,10 @@ class LifeCycleHooksTest extends RenderingTestCase {
           ['nested-item', 'willDestroy'],
         ],
 
-        nonInteractive: [['no-items', 'willDestroy'], ['nested-item', 'willDestroy']],
+        nonInteractive: [
+          ['no-items', 'willDestroy'],
+          ['nested-item', 'willDestroy'],
+        ],
       });
 
       this.assertRegisteredViews('after destroy');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index fa91cf2b10b..2c98b964189 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -121,7 +121,9 @@ moduleFor(
 
       this.engineRegistrations['template:application'] = compile(
         'hi {{person.name}} [{{component-with-backtracking-set person=person}}]',
-        { moduleName: 'my-app/templates/application.hbs' }
+        {
+          moduleName: 'my-app/templates/application.hbs',
+        }
       );
       this.engineRegistrations['controller:application'] = Controller.extend({
         person: {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 747bf9abe84..21fd70c7a99 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -890,7 +890,10 @@ class EachTest extends AbstractEachTest {
 
   [`@test an outer {{#each}}'s scoped variable does not clobber an inner {{#each}}'s property if they share the same name - Issue #1315`]() {
     let content = this.createList(['X', 'Y']);
-    let options = this.createList([{ label: 'One', value: 1 }, { label: 'Two', value: 2 }]);
+    let options = this.createList([
+      { label: 'One', value: 1 },
+      { label: 'Two', value: 2 },
+    ]);
 
     this.render(
       strip`
@@ -923,7 +926,10 @@ class EachTest extends AbstractEachTest {
       set(
         this.context,
         'options',
-        this.createList([{ label: 'One', value: 1 }, { label: 'Two', value: 2 }]).list
+        this.createList([
+          { label: 'One', value: 1 },
+          { label: 'Two', value: 2 },
+        ]).list
       );
     });
 
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index f54e0706f18..04d129b4c1e 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -744,7 +744,7 @@ function indexOfListener(
   for (let i = listeners.length - 1; i >= 0; i--) {
     let listener = listeners[i];
 
-    if (listener.event === event && (listener.target === target && listener.method === method)) {
+    if (listener.event === event && listener.target === target && listener.method === method) {
       return i;
     }
   }
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 78fa8547cf2..4be08fb2bf6 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -2,7 +2,7 @@ import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
 import { _WeakSet as WeakSet } from '@glimmer/util';
 
-export type DecoratorPropertyDescriptor = PropertyDescriptor & { initializer?: any } | undefined;
+export type DecoratorPropertyDescriptor = (PropertyDescriptor & { initializer?: any }) | undefined;
 
 export type Decorator = (
   target: object,
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index 9ce0df73801..56f2aaeaefd 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -110,7 +110,10 @@ moduleFor(
       assert.equal(get({ foo: func }, 'foo.bar'), 'awesome');
       assert.equal(get({ foo: func }, 'foo.bar.length'), 7);
       assert.equal(get({}, 'foo.bar.length'), undefined);
-      assert.equal(get(function() {}, 'foo.bar.length'), undefined);
+      assert.equal(
+        get(function() {}, 'foo.bar.length'),
+        undefined
+      );
       assert.equal(get('', 'foo.bar.length'), undefined);
       assert.equal(get({ foo: destroyedObj }, 'foo.bar'), undefined);
     }
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 0cd5d6a55fd..6d347c98ad3 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -183,22 +183,38 @@ moduleFor(
     ['@test defining a computed property with a dependent key more than one level deep beyond @each is not supported']() {
       expectNoWarning(() => {
         obj = {};
-        defineProperty(obj, 'someProp', computed('todos', () => {}));
+        defineProperty(
+          obj,
+          'someProp',
+          computed('todos', () => {})
+        );
       });
 
       expectNoWarning(() => {
         obj = {};
-        defineProperty(obj, 'someProp', computed('todos.@each.owner', () => {}));
+        defineProperty(
+          obj,
+          'someProp',
+          computed('todos.@each.owner', () => {})
+        );
       });
 
       expectWarning(() => {
         obj = {};
-        defineProperty(obj, 'someProp', computed('todos.@each.owner.name', () => {}));
+        defineProperty(
+          obj,
+          'someProp',
+          computed('todos.@each.owner.name', () => {})
+        );
       }, /You used the key "todos\.@each\.owner\.name" which is invalid\. /);
 
       expectWarning(() => {
         obj = {};
-        defineProperty(obj, 'someProp', computed('todos.@each.owner.@each.name', () => {}));
+        defineProperty(
+          obj,
+          'someProp',
+          computed('todos.@each.owner.@each.name', () => {})
+        );
       }, /You used the key "todos\.@each\.owner\.@each\.name" which is invalid\. /);
 
       let expected = new RegExp(
@@ -220,7 +236,11 @@ moduleFor(
         obj = {
           todos: [],
         };
-        defineProperty(obj, 'someProp', computed('todos.@each.owner.name', () => {}));
+        defineProperty(
+          obj,
+          'someProp',
+          computed('todos.@each.owner.name', () => {})
+        );
 
         get(obj, 'someProp');
       }, expected);
@@ -703,7 +723,11 @@ moduleFor(
 
     ['@test chained dependent keys should evaluate computed properties lazily'](assert) {
       defineProperty(obj.foo.bar, 'b', computed(func));
-      defineProperty(obj.foo, 'c', computed('bar.b', function() {}));
+      defineProperty(
+        obj.foo,
+        'c',
+        computed('bar.b', function() {})
+      );
       assert.equal(count, 0, 'b should not run');
     }
   }
@@ -806,7 +830,11 @@ moduleFor(
   class extends ComputedTestCase {
     ['@test adding a computed property should show up in key iteration'](assert) {
       obj = {};
-      defineProperty(obj, 'foo', computed(function() {}));
+      defineProperty(
+        obj,
+        'foo',
+        computed(function() {})
+      );
 
       let found = [];
       for (let key in obj) {
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 55ebc2588ad..f3263962e72 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1438,11 +1438,13 @@ function calculatePostTransitionState(
 
     // If the routeInfo is not resolved, we serialize the context into params
     if (!routeInfo.isResolved) {
-      params[routeInfo.name] = routeInfo.serialize(routeInfo.context as
-        | {
-            [key: string]: unknown;
-          }
-        | undefined);
+      params[routeInfo.name] = routeInfo.serialize(
+        routeInfo.context as
+          | {
+              [key: string]: unknown;
+            }
+          | undefined
+      );
     } else {
       params[routeInfo.name] = routeInfo.params;
     }
diff --git a/packages/@ember/-internals/runtime/tests/array/sortBy-test.js b/packages/@ember/-internals/runtime/tests/array/sortBy-test.js
index a610f226081..e28610a39f4 100644
--- a/packages/@ember/-internals/runtime/tests/array/sortBy-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/sortBy-test.js
@@ -12,7 +12,10 @@ class SortByTests extends AbstractTestCase {
   }
 
   '@test supports multiple propertyNames'() {
-    let obj = this.newObject([{ a: 1, b: 2 }, { a: 1, b: 1 }]);
+    let obj = this.newObject([
+      { a: 1, b: 2 },
+      { a: 1, b: 1 },
+    ]);
     let sorted = obj.sortBy('a', 'b');
 
     this.assert.equal(get(sorted[0], 'b'), 1);
diff --git a/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js b/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js
index be65094e126..5ec51e9c270 100644
--- a/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js
@@ -8,7 +8,10 @@ class UniqByTests extends AbstractTestCase {
       { id: 2, value: 'two' },
       { id: 1, value: 'one' },
     ]);
-    this.assert.deepEqual(numbers.uniqBy('id'), [{ id: 1, value: 'one' }, { id: 2, value: 'two' }]);
+    this.assert.deepEqual(numbers.uniqBy('id'), [
+      { id: 1, value: 'one' },
+      { id: 2, value: 'two' },
+    ]);
   }
 
   '@test supports function as key'() {
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
index d464e571b35..499f2984823 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
@@ -430,9 +430,7 @@ moduleFor(
         assert.equal(
           object.set(key, values[1]),
           values[1],
-          `Try #3: object.set(${key}, ${
-            values[1]
-          }) should not run function since it is setting same value as before`
+          `Try #3: object.set(${key}, ${values[1]}) should not run function since it is setting same value as before`
         );
       });
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
index a5ffd6f0c48..8f731019ab9 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
@@ -56,7 +56,10 @@ moduleFor(
       let didFulfillCount = 0;
       let didRejectCount = 0;
 
-      proxy.then(() => didFulfillCount++, () => didRejectCount++);
+      proxy.then(
+        () => didFulfillCount++,
+        () => didRejectCount++
+      );
 
       assert.equal(get(proxy, 'content'), undefined, 'expects the proxy to have no content');
       assert.equal(get(proxy, 'reason'), undefined, 'expects the proxy to have no reason');
@@ -162,7 +165,10 @@ moduleFor(
       let didFulfillCount = 0;
       let didRejectCount = 0;
 
-      proxy.then(() => didFulfillCount++, () => didRejectCount++);
+      proxy.then(
+        () => didFulfillCount++,
+        () => didRejectCount++
+      );
 
       assert.equal(get(proxy, 'content'), undefined, 'expects the proxy to have no content');
       assert.equal(get(proxy, 'reason'), undefined, 'expects the proxy to have no reason');
@@ -262,7 +268,10 @@ moduleFor(
       let didFulfillCount = 0;
       let didRejectCount = 0;
 
-      proxy.then(() => didFulfillCount++, () => didRejectCount++);
+      proxy.then(
+        () => didFulfillCount++,
+        () => didRejectCount++
+      );
 
       assert.equal(get(proxy, 'content'), undefined, 'expects the proxy to have no content');
       assert.equal(get(proxy, 'reason'), undefined, 'expects the proxy to have no reason');
@@ -497,7 +506,10 @@ moduleFor(
         promise: deferred.promise,
       });
 
-      proxy.then(() => {}, () => {});
+      proxy.then(
+        () => {},
+        () => {}
+      );
 
       run(proxy, 'destroy');
 
@@ -516,7 +528,10 @@ moduleFor(
         promise: deferred.promise,
       });
 
-      proxy.then(() => {}, () => {});
+      proxy.then(
+        () => {},
+        () => {}
+      );
 
       run(proxy, 'destroy');
 
diff --git a/packages/@ember/-internals/utils/tests/checkHasSuper_test.js b/packages/@ember/-internals/utils/tests/checkHasSuper_test.js
index 7b4c3cd54c6..ba4f09b7435 100644
--- a/packages/@ember/-internals/utils/tests/checkHasSuper_test.js
+++ b/packages/@ember/-internals/utils/tests/checkHasSuper_test.js
@@ -10,7 +10,10 @@ if (isChrome || isFirefox) {
     'checkHasSuper',
     class extends TestCase {
       ['@test does not super wrap needlessly [GH #12462]'](assert) {
-        assert.notOk(checkHasSuper(function() {}), 'empty function does not have super');
+        assert.notOk(
+          checkHasSuper(function() {}),
+          'empty function does not have super'
+        );
       }
     }
   );
diff --git a/packages/@ember/-internals/utils/tests/get-debug-name-test.js b/packages/@ember/-internals/utils/tests/get-debug-name-test.js
index 086653244e4..ffd0ee6d731 100644
--- a/packages/@ember/-internals/utils/tests/get-debug-name-test.js
+++ b/packages/@ember/-internals/utils/tests/get-debug-name-test.js
@@ -10,10 +10,16 @@ if (DEBUG) {
         class Person {}
 
         assert.equal(getDebugName({}), '(unknown object)');
-        assert.equal(getDebugName(() => {}), '(unknown function)');
+        assert.equal(
+          getDebugName(() => {}),
+          '(unknown function)'
+        );
         assert.equal(getDebugName(Person), 'Person');
         assert.equal(getDebugName(new Person()), 'Person');
-        assert.equal(getDebugName(function foo() {}), 'foo');
+        assert.equal(
+          getDebugName(function foo() {}),
+          'foo'
+        );
 
         assert.equal(
           getDebugName({
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index 3be2d8eb66d..63074d535d0 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -639,7 +639,10 @@ moduleFor(
   }
 );
 
-[['uniq', uniq], ['union', union]].forEach(tuple => {
+[
+  ['uniq', uniq],
+  ['union', union],
+].forEach(tuple => {
   let [name, macro] = tuple;
 
   moduleFor(
@@ -745,7 +748,11 @@ moduleFor(
         list: null,
         uniqueById: uniqBy('list', 'id'),
       }).create({
-        list: emberA([{ id: 1, value: 'one' }, { id: 2, value: 'two' }, { id: 1, value: 'one' }]),
+        list: emberA([
+          { id: 1, value: 'one' },
+          { id: 2, value: 'two' },
+          { id: 1, value: 'one' },
+        ]),
       });
     }
 
@@ -759,7 +766,10 @@ moduleFor(
       }, /Cannot set read-only property "uniqueById" on object:/);
     }
     ['@test does not include duplicates'](assert) {
-      assert.deepEqual(obj.get('uniqueById'), [{ id: 1, value: 'one' }, { id: 2, value: 'two' }]);
+      assert.deepEqual(obj.get('uniqueById'), [
+        { id: 1, value: 'one' },
+        { id: 2, value: 'two' },
+      ]);
     }
 
     ['@test it does not share state among instances'](assert) {
@@ -784,7 +794,11 @@ moduleFor(
 
       assert.deepEqual(
         obj.get('uniqueById'),
-        [{ id: 1, value: 'one' }, { id: 2, value: 'two' }, { id: 3, value: 'three' }],
+        [
+          { id: 1, value: 'one' },
+          { id: 2, value: 'two' },
+          { id: 3, value: 'three' },
+        ],
         'The list includes three'
       );
 
@@ -792,7 +806,11 @@ moduleFor(
 
       assert.deepEqual(
         obj.get('uniqueById'),
-        [{ id: 1, value: 'one' }, { id: 2, value: 'two' }, { id: 3, value: 'three' }],
+        [
+          { id: 1, value: 'one' },
+          { id: 2, value: 'two' },
+          { id: 3, value: 'three' },
+        ],
         'The list does not include a duplicate three'
       );
     }
diff --git a/packages/@ember/runloop/tests/run_test.js b/packages/@ember/runloop/tests/run_test.js
index fa2f3993d0c..d7c490cf006 100644
--- a/packages/@ember/runloop/tests/run_test.js
+++ b/packages/@ember/runloop/tests/run_test.js
@@ -15,7 +15,11 @@ moduleFor(
         },
       };
 
-      assert.equal(run(() => 'FOO'), 'FOO', 'pass function only');
+      assert.equal(
+        run(() => 'FOO'),
+        'FOO',
+        'pass function only'
+      );
       assert.deepEqual(run(obj, obj.foo), ['BAR', 'FOO'], 'pass obj and obj.method');
       assert.deepEqual(run(obj, 'foo'), ['BAR', 'FOO'], 'pass obj and "method"');
       assert.deepEqual(
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index d8727e96d1e..e3b59f0eef3 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -2035,17 +2035,27 @@ moduleFor(
           return run(router, 'transitionTo', 'b', 'b-1');
         })
         .then(() => {
-          assert.deepEqual(calls, [['setup', 'a'], ['setup', 'b']]);
+          assert.deepEqual(calls, [
+            ['setup', 'a'],
+            ['setup', 'b'],
+          ]);
           calls.length = 0;
           return run(router, 'transitionTo', 'c', 'c-1');
         })
         .then(() => {
-          assert.deepEqual(calls, [['reset', 'b'], ['setup', 'c']]);
+          assert.deepEqual(calls, [
+            ['reset', 'b'],
+            ['setup', 'c'],
+          ]);
           calls.length = 0;
           return run(router, 'transitionTo', 'out');
         })
         .then(() => {
-          assert.deepEqual(calls, [['reset', 'c'], ['reset', 'a'], ['setup', 'out']]);
+          assert.deepEqual(calls, [
+            ['reset', 'c'],
+            ['reset', 'a'],
+            ['setup', 'out'],
+          ]);
         });
     }
 
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index 46b5ef163c2..8691e514536 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -18,9 +18,7 @@ export { default as QueryParamTestCase } from './lib/test-cases/query-param';
 export { default as RenderingTestCase } from './lib/test-cases/rendering';
 export { default as RouterTestCase } from './lib/test-cases/router';
 export { default as AutobootApplicationTestCase } from './lib/test-cases/autoboot-application';
-export {
-  default as DefaultResolverApplicationTestCase,
-} from './lib/test-cases/default-resolver-application';
+export { default as DefaultResolverApplicationTestCase } from './lib/test-cases/default-resolver-application';
 
 export {
   default as TestResolver,

From 85d2418bcd6ad491cb08bc50da17daff0c3a157b Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 25 Sep 2020 21:30:49 -0700
Subject: [PATCH 0120/1405] Refactor internal `<Input>` component
 implementation

- Add `InternalComponent` super class with a Glimmer-ish API
- Remove `InputComponentManager` and merge with `InternalManager`
- Rewrite internal `<Input>` component implementation to subclass
  from the new `InternalComponent` instead of `Ember.Object`
---
 .../glimmer/lib/component-managers/input.ts   | 134 ------------------
 .../lib/component-managers/internal.ts        | 127 +++++++++++++++--
 .../glimmer/lib/components/input.ts           |  19 ++-
 .../glimmer/lib/components/internal.ts        |  40 ++++++
 .../@ember/-internals/glimmer/lib/resolver.ts |   5 +-
 .../glimmer/lib/templates/input.hbs           |   4 +-
 .../application/debug-render-tree-test.ts     |  18 +--
 packages/@ember/debug/index.ts                |   4 +-
 8 files changed, 182 insertions(+), 169 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/component-managers/input.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/components/internal.ts

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts b/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
deleted file mode 100644
index 1432e24ae3a..00000000000
--- a/packages/@ember/-internals/glimmer/lib/component-managers/input.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { ENV } from '@ember/-internals/environment';
-import { set } from '@ember/-internals/metal';
-import { Owner } from '@ember/-internals/owner';
-import { assert, debugFreeze } from '@ember/debug';
-import {
-  Bounds,
-  ComponentCapabilities,
-  Destroyable,
-  Dict,
-  DynamicScope,
-  PreparedArguments,
-  VMArguments,
-} from '@glimmer/interfaces';
-import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
-import { EmberVMEnvironment } from '../environment';
-import InternalComponentManager, { InternalDefinitionState } from './internal';
-
-const CAPABILITIES: ComponentCapabilities = {
-  dynamicLayout: false,
-  dynamicTag: false,
-  prepareArgs: true,
-  createArgs: true,
-  attributeHook: false,
-  elementHook: false,
-  createCaller: true,
-  dynamicScope: false,
-  updateHook: true,
-  createInstance: true,
-  wrapped: false,
-  willDestroy: false,
-};
-
-export interface InputComponentState {
-  env: EmberVMEnvironment;
-  type: Reference;
-  instance: Destroyable;
-}
-
-const EMPTY_POSITIONAL_ARGS: Reference[] = [];
-
-debugFreeze(EMPTY_POSITIONAL_ARGS);
-
-export default class InputComponentManager extends InternalComponentManager<InputComponentState> {
-  getCapabilities(): ComponentCapabilities {
-    return CAPABILITIES;
-  }
-
-  prepareArgs(_state: InternalDefinitionState, args: VMArguments): PreparedArguments {
-    assert(
-      'The `<Input />` component does not take any positional arguments',
-      args.positional.length === 0
-    );
-
-    let __ARGS__: Dict<Reference> = args.named.capture();
-
-    return {
-      positional: EMPTY_POSITIONAL_ARGS,
-      named: {
-        __ARGS__: createConstRef(__ARGS__, 'args'),
-        type: args.named.get('type'),
-      },
-    };
-  }
-
-  create(
-    env: EmberVMEnvironment,
-    { ComponentClass, layout }: InternalDefinitionState,
-    args: VMArguments,
-    _dynamicScope: DynamicScope,
-    caller: Reference
-  ): InputComponentState {
-    assert('caller must be const', isConstRef(caller));
-
-    let type = args.named.get('type');
-
-    let instance = ComponentClass.create({
-      caller: valueForRef(caller),
-      type: valueForRef(type),
-    });
-
-    let state = { env, type, instance };
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      env.extra.debugRenderTree.create(state, {
-        type: 'component',
-        name: 'input',
-        args: args.capture(),
-        instance,
-        template: layout,
-      });
-
-      registerDestructor(instance, () => env.extra.debugRenderTree.willDestroy(state));
-    }
-
-    return state;
-  }
-
-  getDebugName() {
-    return 'input';
-  }
-
-  getSelf({ instance }: InputComponentState): Reference {
-    return createConstRef(instance, 'this');
-  }
-
-  didRenderLayout(state: InputComponentState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.env.extra.debugRenderTree.didRender(state, bounds);
-    }
-  }
-
-  update(state: InputComponentState): void {
-    set(state.instance, 'type', valueForRef(state.type));
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.env.extra.debugRenderTree.update(state);
-    }
-  }
-
-  didUpdateLayout(state: InputComponentState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.env.extra.debugRenderTree.didRender(state, bounds);
-    }
-  }
-
-  getDestroyable(state: InputComponentState): Destroyable {
-    return state.instance;
-  }
-}
-
-export const InputComponentManagerFactory = (owner: Owner) => {
-  return new InputComponentManager(owner);
-};
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index 2a51083e6ff..42a0509a325 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -1,35 +1,140 @@
-import { Factory, Owner } from '@ember/-internals/owner';
-import { ComponentDefinition, WithStaticLayout } from '@glimmer/interfaces';
+import { ENV } from '@ember/-internals/environment';
+import { Owner } from '@ember/-internals/owner';
+import { assert } from '@ember/debug';
+import {
+  Bounds,
+  ComponentCapabilities,
+  ComponentDefinition,
+  Destroyable,
+  DynamicScope,
+  VMArguments,
+  WithStaticLayout,
+} from '@glimmer/interfaces';
+import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
+import InternalComponent from '../components/internal';
+import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
 import AbstractComponentManager from './abstract';
 
+const CAPABILITIES: ComponentCapabilities = {
+  dynamicLayout: false,
+  dynamicTag: false,
+  prepareArgs: false,
+  createArgs: true,
+  attributeHook: false,
+  elementHook: false,
+  createCaller: true,
+  dynamicScope: false,
+  updateHook: true,
+  createInstance: true,
+  wrapped: false,
+  willDestroy: false,
+};
+
 export interface InternalDefinitionState {
-  ComponentClass: Factory<any, any>;
+  ComponentClass: typeof InternalComponent;
   layout: OwnedTemplate;
 }
 
-export class InternalComponentDefinition<T>
-  implements ComponentDefinition<InternalDefinitionState, T, InternalManager<T>> {
+export interface InternalComponentState {
+  env: EmberVMEnvironment;
+  instance: Destroyable;
+}
+
+export class InternalComponentDefinition
+  implements ComponentDefinition<InternalDefinitionState, InternalComponentState, InternalManager> {
   public state: InternalDefinitionState;
 
   constructor(
-    public manager: InternalManager<T>,
-    ComponentClass: Factory<any, any>,
+    public manager: InternalManager,
+    ComponentClass: typeof InternalComponent,
     layout: OwnedTemplate
   ) {
     this.state = { ComponentClass, layout };
   }
 }
 
-export default abstract class InternalManager<T>
-  extends AbstractComponentManager<T, InternalDefinitionState>
-  implements WithStaticLayout<T, InternalDefinitionState, RuntimeResolver> {
-  constructor(protected owner: Owner) {
+export default class InternalManager
+  extends AbstractComponentManager<InternalComponentState, InternalDefinitionState>
+  implements WithStaticLayout<InternalComponentState, InternalDefinitionState, RuntimeResolver> {
+  static for(name: string): (owner: Owner) => InternalManager {
+    return (owner: Owner) => new InternalManager(owner, name);
+  }
+
+  constructor(private owner: Owner, private name: string) {
     super();
   }
 
+  getCapabilities(): ComponentCapabilities {
+    return CAPABILITIES;
+  }
+
+  create(
+    env: EmberVMEnvironment,
+    { ComponentClass, layout }: InternalDefinitionState,
+    args: VMArguments,
+    _dynamicScope: DynamicScope,
+    caller: Reference
+  ): InternalComponentState {
+    assert('caller must be const', isConstRef(caller));
+
+    assert(
+      `The ${this.name} component does not take any positional arguments`,
+      args.positional.length === 0
+    );
+
+    let instance = new ComponentClass(this.owner, args.named.capture(), valueForRef(caller));
+
+    let state = { env, instance };
+
+    if (ENV._DEBUG_RENDER_TREE) {
+      env.extra.debugRenderTree.create(state, {
+        type: 'component',
+        name: this.getDebugName(),
+        args: args.capture(),
+        instance,
+        template: layout,
+      });
+
+      registerDestructor(instance, () => env.extra.debugRenderTree.willDestroy(state));
+    }
+
+    return state;
+  }
+
+  getDebugName(): string {
+    return this.name;
+  }
+
+  getSelf({ instance }: InternalComponentState): Reference {
+    return createConstRef(instance, 'this');
+  }
+
+  didRenderLayout(state: InternalComponentState, bounds: Bounds): void {
+    if (ENV._DEBUG_RENDER_TREE) {
+      state.env.extra.debugRenderTree.didRender(state, bounds);
+    }
+  }
+
+  update(state: InternalComponentState): void {
+    if (ENV._DEBUG_RENDER_TREE) {
+      state.env.extra.debugRenderTree.update(state);
+    }
+  }
+
+  didUpdateLayout(state: InternalComponentState, bounds: Bounds): void {
+    if (ENV._DEBUG_RENDER_TREE) {
+      state.env.extra.debugRenderTree.didRender(state, bounds);
+    }
+  }
+
+  getDestroyable(state: InternalComponentState): Destroyable {
+    return state.instance;
+  }
+
   getStaticLayout({ layout: template }: InternalDefinitionState) {
     return unwrapTemplate(template).asLayout();
   }
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index bbf1233dabf..fe66a32679c 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -1,10 +1,9 @@
 /**
 @module @ember/component
 */
-import { computed } from '@ember/-internals/metal';
-import { Object as EmberObject } from '@ember/-internals/runtime';
-import { InputComponentManagerFactory } from '../component-managers/input';
+import InternalManager from '../component-managers/internal';
 import { setManager } from '../utils/managers';
+import InternalComponent from './internal';
 
 /**
   See [Ember.Templates.components.Input](/ember/release/classes/Ember.Templates.components/methods/Input?anchor=Input).
@@ -112,15 +111,15 @@ import { setManager } from '../utils/managers';
   @param {Hash} options
   @public
 */
-const Input = EmberObject.extend({
-  isCheckbox: computed('type', function(this: { type?: unknown }) {
-    return this.type === 'checkbox';
-  }),
-});
+export default class Input extends InternalComponent {
+  get isCheckbox(): boolean {
+    return this.arg('type') === 'checkbox';
+  }
+}
 
 setManager(
   {
-    factory: InputComponentManagerFactory,
+    factory: InternalManager.for('input'),
     internal: true,
     type: 'component',
   },
@@ -128,5 +127,3 @@ setManager(
 );
 
 Input.toString = () => '@ember/component/input';
-
-export default Input;
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
new file mode 100644
index 00000000000..d2e09db9957
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -0,0 +1,40 @@
+import { Owner, setOwner } from '@ember/-internals/owner';
+import { guidFor } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
+import { Reference, valueForRef } from '@glimmer/reference';
+
+export default class InternalComponent {
+  // Factory interface
+  static create(): never {
+    throw assert('Use constructor instead of create');
+  }
+
+  static get class(): typeof InternalComponent {
+    return this;
+  }
+
+  static get fullName(): string {
+    return this.name;
+  }
+
+  static get normalizedName(): string {
+    return this.name;
+  }
+
+  constructor(
+    protected owner: Owner,
+    public args: Record<string, Reference | undefined>,
+    public caller: unknown
+  ) {
+    setOwner(this, owner);
+  }
+
+  protected arg(key: string): unknown {
+    let ref = this.args[key];
+    return ref ? valueForRef(ref) : undefined;
+  }
+
+  toString(): string {
+    return `<${this.constructor.toString()}:${guidFor(this)}>`;
+  }
+}
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index cc2b1537304..a2f34872567 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -24,6 +24,7 @@ import InternalComponentManager, {
   InternalComponentDefinition,
 } from './component-managers/internal';
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
+import InternalComponent from './components/internal';
 import { isClassHelper, isHelperFactory } from './helper';
 import { default as componentAssertionHelper } from './helpers/-assert-implicit-component-helper-argument';
 import { default as inElementNullCheckHelper } from './helpers/-in-element-null-check';
@@ -473,8 +474,8 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
           assert(`missing layout for internal component ${name}`, pair.layout !== null);
 
           definition = new InternalComponentDefinition(
-            factory(owner) as InternalComponentManager<unknown>,
-            ComponentClass as Factory<any, any>,
+            factory(owner) as InternalComponentManager,
+            ComponentClass as typeof InternalComponent,
             layout!
           );
         } else {
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index 6046ab9b6b3..5097a8ebc6f 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -1,7 +1,7 @@
 {{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}
   {{~#if this.isCheckbox~}}
-    <Checkbox @target={{this.caller}} @__ARGS__={{@__ARGS__}} ...attributes />
+    <Checkbox @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
   {{~else~}}
-    <TextField @target={{this.caller}} @__ARGS__={{@__ARGS__}} ...attributes />
+    <TextField @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
   {{~/if~}}
 {{~/let~}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 83df68d62bd..9803d2f745a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1266,12 +1266,14 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         let target = this.controllerFor('application');
 
+        let inputToString = /<@ember\/component\/input:ember[0-9]+>/;
+
         this.assertRenderTree([
           {
             type: 'component',
             name: 'input',
-            args: args => args.named.type === 'text' && '__ARGS__' in args.named,
-            instance: (instance: object) => instance['type'] === 'text',
+            args: { positional: [], named: { type: 'text', value: 'first' } },
+            instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
             children: [
@@ -1294,8 +1296,8 @@ if (ENV._DEBUG_RENDER_TREE) {
           {
             type: 'component',
             name: 'input',
-            args: args => args.named.type === 'text' && '__ARGS__' in args.named,
-            instance: (instance: object) => instance['type'] === 'text',
+            args: { positional: [], named: { type: 'text', value: 'first' } },
+            instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
             children: [
@@ -1313,8 +1315,8 @@ if (ENV._DEBUG_RENDER_TREE) {
           {
             type: 'component',
             name: 'input',
-            args: args => args.named.type === 'checkbox' && '__ARGS__' in args.named,
-            instance: (instance: object) => instance['type'] === 'checkbox',
+            args: { positional: [], named: { type: 'checkbox', checked: false } },
+            instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.lastChild),
             children: [
@@ -1337,8 +1339,8 @@ if (ENV._DEBUG_RENDER_TREE) {
           {
             type: 'component',
             name: 'input',
-            args: args => args.named.type === 'text' && '__ARGS__' in args.named,
-            instance: (instance: object) => instance['type'] === 'text',
+            args: { positional: [], named: { type: 'text', value: 'first' } },
+            instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
             children: [
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 121f10053b9..e30e739daf1 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -21,7 +21,9 @@ export type DebugFunctionType =
   | 'runInDebug'
   | 'deprecateFunc';
 
-export type AssertFunc = (desc: string, condition?: unknown) => asserts condition;
+export type AssertFunc =
+  | ((desc: string) => never)
+  | ((desc: string, condition?: unknown) => asserts condition);
 export type DebugFunc = (message: string) => void;
 export type DebugSealFunc = (obj: object) => void;
 export type DebugFreezeFunc = (obj: object) => void;

From 4789dc57e4491ab97830129feb0d6e4495bd5782 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Sat, 26 Sep 2020 13:59:34 -0700
Subject: [PATCH 0121/1405] Workaround for strange TS bug

---
 .../-internals/glimmer/lib/component-managers/curly.ts   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index e940e61cd21..6587f4faa13 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -218,7 +218,14 @@ export default class CurlyComponentManager
       assign(named, args.named.capture());
 
       for (let i = 0; i < count; i++) {
-        const name = positionalParams[i];
+        // As of TS 3.7, tsc is giving us the following error on this line without the type annotation
+        //
+        //   TS7022: 'name' implicitly has type 'any' because it does not have a type annotation and is
+        //   referenced directly or indirectly in its own initializer.
+        //
+        // This is almost certainly a TypeScript bug, feel free to try and remove the annotation after
+        // upgrading if it is not needed anymore.
+        const name: string = positionalParams[i];
 
         assert(
           `You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`,

From cce03c210034e58406c35baae135c1d11d1e76e4 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sun, 27 Sep 2020 15:05:15 -0700
Subject: [PATCH 0122/1405] [REFACTOR] Split managers into multiple maps

This refactors managers to split different types of managers into
different maps per-type. This allows more than one type of manager to
be associated with a given definition. For instance, this is a useful
capability for helper and modifier managers to have, since helpers and
modifiers have a lot in common and may end up being able to share
implementations.

This also upstreams the deduplication logic from Glimmer.js, which was
more stringent than in Ember. In Ember, we currently create one instance
of a given manager _per-component-definition_, whereas in Glimmer.js, we
create one _per-factory/owner combination_. Given that managers are
generally encouraged to be mostly-stateless in general, this change
shouldn't be a problem, and should be slightly more performant in apps
with many component definitions.
---
 packages/@ember/-internals/glimmer/index.ts   |   8 +-
 .../lib/component-managers/internal.ts        |   9 +-
 .../glimmer/lib/components/input.ts           |  11 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  28 ++--
 .../lib/utils/custom-component-manager.ts     |  40 -----
 .../lib/utils/custom-modifier-manager.ts      |  15 --
 .../-internals/glimmer/lib/utils/managers.ts  | 140 ++++++++++++++++--
 7 files changed, 152 insertions(+), 99 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index beb9b2f0b23..0a65246c8a2 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -404,8 +404,12 @@ export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export { capabilities } from './lib/component-managers/custom';
-export { setComponentManager, getComponentManager } from './lib/utils/custom-component-manager';
-export { setModifierManager, getModifierManager } from './lib/utils/custom-modifier-manager';
+export {
+  setComponentManager,
+  getComponentManager,
+  setModifierManager,
+  getModifierManager,
+} from './lib/utils/managers';
 export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
 export { setComponentTemplate, getComponentTemplate } from './lib/utils/component-template';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index 42a0509a325..67b4dd15812 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -12,7 +12,7 @@ import {
 } from '@glimmer/interfaces';
 import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
+import { _WeakSet, unwrapTemplate } from '@glimmer/util';
 import InternalComponent from '../components/internal';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
@@ -57,6 +57,12 @@ export class InternalComponentDefinition
   }
 }
 
+const INTERNAL_MANAGERS = new _WeakSet();
+
+export function isInternalManager(manager: object): manager is InternalManager {
+  return INTERNAL_MANAGERS.has(manager);
+}
+
 export default class InternalManager
   extends AbstractComponentManager<InternalComponentState, InternalDefinitionState>
   implements WithStaticLayout<InternalComponentState, InternalDefinitionState, RuntimeResolver> {
@@ -66,6 +72,7 @@ export default class InternalManager
 
   constructor(private owner: Owner, private name: string) {
     super();
+    INTERNAL_MANAGERS.add(this);
   }
 
   getCapabilities(): ComponentCapabilities {
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index fe66a32679c..bb0a64628a7 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -2,7 +2,7 @@
 @module @ember/component
 */
 import InternalManager from '../component-managers/internal';
-import { setManager } from '../utils/managers';
+import { setComponentManager } from '../utils/managers';
 import InternalComponent from './internal';
 
 /**
@@ -117,13 +117,6 @@ export default class Input extends InternalComponent {
   }
 }
 
-setManager(
-  {
-    factory: InternalManager.for('input'),
-    internal: true,
-    type: 'component',
-  },
-  Input
-);
+setComponentManager(InternalManager.for('input'), Input);
 
 Input.toString = () => '@ember/component/input';
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index a2f34872567..7ae05061e22 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -19,10 +19,8 @@ import {
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
 import { getDynamicVar, ModifierDefinition, registerDestructor } from '@glimmer/runtime';
 import { CurlyComponentDefinition } from './component-managers/curly';
-import { CustomManagerDefinition, ManagerDelegate } from './component-managers/custom';
-import InternalComponentManager, {
-  InternalComponentDefinition,
-} from './component-managers/internal';
+import { CustomManagerDefinition } from './component-managers/custom';
+import { InternalComponentDefinition, isInternalManager } from './component-managers/internal';
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
 import InternalComponent from './components/internal';
 import { isClassHelper, isHelperFactory } from './helper';
@@ -44,14 +42,13 @@ import { default as queryParams } from './helpers/query-param';
 import { default as readonly } from './helpers/readonly';
 import { default as unbound } from './helpers/unbound';
 import ActionModifierManager from './modifiers/action';
-import { CustomModifierDefinition, ModifierManagerDelegate } from './modifiers/custom';
+import { CustomModifierDefinition } from './modifiers/custom';
 import OnModifierManager from './modifiers/on';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
 import { Factory as TemplateFactory, OwnedTemplate } from './template';
 import { getComponentTemplate } from './utils/component-template';
-import { getModifierManager } from './utils/custom-modifier-manager';
-import { getManager } from './utils/managers';
+import { getComponentManager, getModifierManager } from './utils/managers';
 import { createHelperRef } from './utils/references';
 
 function instrumentationPayload(name: string) {
@@ -404,10 +401,9 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       let owner = meta.owner;
       let modifier = owner.factoryFor<unknown, FactoryClass>(`modifier:${name}`);
       if (modifier !== undefined) {
-        let managerFactory = getModifierManager<ModifierManagerDelegate<unknown>>(modifier.class);
-        let manager = managerFactory!(owner);
+        let manager = getModifierManager(owner, modifier.class!);
 
-        return new CustomModifierDefinition(name, modifier, manager, this.isInteractive);
+        return new CustomModifierDefinition(name, modifier, manager!, this.isInteractive);
       }
     }
 
@@ -465,16 +461,14 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       assert(`missing component class ${name}`, pair.component.class !== undefined);
 
       let ComponentClass = pair.component.class!;
-      let wrapper = getManager(ComponentClass);
+      let manager = getComponentManager(owner, ComponentClass);
 
-      if (wrapper !== null && wrapper.type === 'component') {
-        let { factory } = wrapper;
-
-        if (wrapper.internal) {
+      if (manager !== undefined) {
+        if (isInternalManager(manager)) {
           assert(`missing layout for internal component ${name}`, pair.layout !== null);
 
           definition = new InternalComponentDefinition(
-            factory(owner) as InternalComponentManager,
+            manager,
             ComponentClass as typeof InternalComponent,
             layout!
           );
@@ -482,7 +476,7 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
           definition = new CustomManagerDefinition(
             name,
             pair.component,
-            factory(owner) as ManagerDelegate<unknown>,
+            manager,
             layout !== undefined
               ? layout
               : owner.lookup<TemplateFactory>(P`template:components/-default`)!(owner)
diff --git a/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts b/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts
deleted file mode 100644
index e4ab147e8cc..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/custom-component-manager.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Owner } from '@ember/-internals/owner';
-import { deprecate } from '@ember/debug';
-import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
-import { ManagerDelegate } from '../component-managers/custom';
-import { getManager, ManagerFactory, setManager } from './managers';
-
-export function setComponentManager(
-  stringOrFunction: string | ManagerFactory<ManagerDelegate<unknown>>,
-  obj: any
-) {
-  let factory: ManagerFactory<unknown>;
-  if (COMPONENT_MANAGER_STRING_LOOKUP && typeof stringOrFunction === 'string') {
-    deprecate(
-      'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.',
-      false,
-      {
-        id: 'deprecate-string-based-component-manager',
-        until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x/#toc_component-manager-string-lookup',
-      }
-    );
-    factory = function(owner: Owner) {
-      return owner.lookup(`component-manager:${stringOrFunction}`);
-    };
-  } else {
-    factory = stringOrFunction as ManagerFactory<unknown>;
-  }
-
-  return setManager({ factory, internal: false, type: 'component' }, obj);
-}
-
-export function getComponentManager<T>(obj: any): undefined | ManagerFactory<ManagerDelegate<T>> {
-  let wrapper = getManager<ManagerDelegate<T>>(obj);
-
-  if (wrapper && !wrapper.internal && wrapper.type === 'component') {
-    return wrapper.factory;
-  } else {
-    return undefined;
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts b/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts
deleted file mode 100644
index 8a31a370720..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/custom-modifier-manager.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getManager, ManagerFactory, setManager } from './managers';
-
-export function setModifierManager(factory: ManagerFactory<unknown>, obj: any) {
-  return setManager({ factory, internal: false, type: 'modifier' }, obj);
-}
-
-export function getModifierManager<T>(obj: any): undefined | ManagerFactory<T> {
-  let wrapper = getManager<T>(obj);
-
-  if (wrapper && !wrapper.internal && wrapper.type === 'modifier') {
-    return wrapper.factory;
-  } else {
-    return undefined;
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 9abdd6d78f2..b89ea86ae07 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,34 +1,144 @@
 import { Owner } from '@ember/-internals/owner';
-import { Option } from '@glimmer/interfaces';
+import { deprecate } from '@ember/debug';
+import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
+import { ManagerDelegate as ComponentManagerDelegate } from '../component-managers/custom';
+import InternalComponentManager from '../component-managers/internal';
+import { ModifierManagerDelegate } from '../modifiers/custom';
 
-const MANAGERS: WeakMap<object, ManagerWrapper<unknown>> = new WeakMap();
+type ManagerDelegate =
+  | ComponentManagerDelegate<unknown>
+  | InternalComponentManager
+  | ModifierManagerDelegate<unknown>;
 
-const getPrototypeOf = Object.getPrototypeOf;
+const COMPONENT_MANAGERS = new WeakMap<
+  object,
+  ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>
+>();
 
-export type ManagerFactory<ManagerDelegate> = (owner: Owner) => ManagerDelegate;
+const MODIFIER_MANAGERS = new WeakMap<object, ManagerFactory<ModifierManagerDelegate<unknown>>>();
 
-export interface ManagerWrapper<ManagerDelegate> {
-  factory: ManagerFactory<ManagerDelegate>;
-  internal: boolean;
-  type: 'component' | 'modifier';
-}
+const MANAGER_INSTANCES: WeakMap<Owner, WeakMap<ManagerFactory, unknown>> = new WeakMap();
+
+export type ManagerFactory<D extends ManagerDelegate = ManagerDelegate> = (owner: Owner) => D;
+
+///////////
 
-export function setManager<ManagerDelegate>(wrapper: ManagerWrapper<ManagerDelegate>, obj: object) {
-  MANAGERS.set(obj, wrapper);
+const getPrototypeOf = Object.getPrototypeOf;
+
+function setManager<Def extends object>(
+  map: WeakMap<object, ManagerFactory>,
+  factory: ManagerFactory,
+  obj: Def
+): Def {
+  map.set(obj, factory);
   return obj;
 }
 
-export function getManager<ManagerDelegate>(obj: object): Option<ManagerWrapper<ManagerDelegate>> {
+function getManager<D extends ManagerDelegate>(
+  map: WeakMap<object, ManagerFactory<D>>,
+  obj: object
+): ManagerFactory<D> | undefined {
   let pointer = obj;
   while (pointer !== undefined && pointer !== null) {
-    let manager = MANAGERS.get(pointer);
+    const manager = map.get(pointer);
 
     if (manager !== undefined) {
-      return manager as ManagerWrapper<ManagerDelegate>;
+      return manager;
     }
 
     pointer = getPrototypeOf(pointer);
   }
 
-  return null;
+  return undefined;
+}
+
+function getManagerInstanceForOwner<D extends ManagerDelegate>(
+  owner: Owner,
+  factory: ManagerFactory<D>
+): D {
+  let managers = MANAGER_INSTANCES.get(owner);
+
+  if (managers === undefined) {
+    managers = new WeakMap();
+    MANAGER_INSTANCES.set(owner, managers);
+  }
+
+  let instance = managers.get(factory);
+
+  if (instance === undefined) {
+    instance = factory(owner);
+    managers.set(factory, instance!);
+  }
+
+  // We know for sure that it's the correct type at this point, but TS can't know
+  return instance as D;
+}
+
+///////////
+
+export function setModifierManager(
+  factory: ManagerFactory<ModifierManagerDelegate<unknown>>,
+  definition: object
+) {
+  return setManager(MODIFIER_MANAGERS, factory, definition);
+}
+
+export function getModifierManager(
+  owner: Owner,
+  definition: object
+): ModifierManagerDelegate<unknown> | undefined {
+  const factory = getManager(MODIFIER_MANAGERS, definition);
+
+  if (factory !== undefined) {
+    return getManagerInstanceForOwner(owner, factory);
+  }
+
+  return undefined;
+}
+
+export function setComponentManager(
+  stringOrFunction:
+    | string
+    | ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>,
+  obj: object
+) {
+  let factory: ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>;
+  if (COMPONENT_MANAGER_STRING_LOOKUP && typeof stringOrFunction === 'string') {
+    deprecate(
+      'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.',
+      false,
+      {
+        id: 'deprecate-string-based-component-manager',
+        until: '4.0.0',
+        url: 'https://emberjs.com/deprecations/v3.x/#toc_component-manager-string-lookup',
+      }
+    );
+    factory = function(owner: Owner) {
+      return owner.lookup<ComponentManagerDelegate<unknown> | InternalComponentManager>(
+        `component-manager:${stringOrFunction}`
+      )!;
+    };
+  } else {
+    factory = stringOrFunction as ManagerFactory<
+      ComponentManagerDelegate<unknown> | InternalComponentManager
+    >;
+  }
+
+  return setManager(COMPONENT_MANAGERS, factory, obj);
+}
+
+export function getComponentManager(
+  owner: Owner,
+  definition: object
+): ComponentManagerDelegate<unknown> | InternalComponentManager | undefined {
+  const factory = getManager<ComponentManagerDelegate<unknown> | InternalComponentManager>(
+    COMPONENT_MANAGERS,
+    definition
+  );
+
+  if (factory !== undefined) {
+    return getManagerInstanceForOwner(owner, factory);
+  }
+
+  return undefined;
 }

From b49f91dabe3738c939337689f8bb422c08727f24 Mon Sep 17 00:00:00 2001
From: Chris Garret <me@pzuraq.com>
Date: Mon, 28 Sep 2020 11:47:27 -0400
Subject: [PATCH 0123/1405] [BUGFIX beta] Generalize args proxy.

 Generalizes the args proxy for use in both components and helpers.
 This does change the semantics slightly of `positional` arguments for
 component managers, notably it would make it so using computed
 properties with them would require a bit more work from custom
 component managers. The new semantics are more inline with the future
 of Ember, but if there many custom managers that use positional args we
 may want to reconsider this change.

Co-authored-by: Robert Jackson <me@rwjblue.com>
---
 .../glimmer/lib/component-managers/custom.ts  | 127 ++---------
 .../glimmer/lib/utils/args-proxy.ts           | 210 ++++++++++++++++++
 .../custom-component-manager-test.js          |  70 +++++-
 3 files changed, 290 insertions(+), 117 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index a93f6ff52fd..7f5f822a0d3 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -1,13 +1,9 @@
 import { ENV } from '@ember/-internals/environment';
-import { CUSTOM_TAG_FOR } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
 import {
+  Arguments,
   Bounds,
-  CapturedArguments,
-  CapturedNamedArguments,
   ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
@@ -16,13 +12,13 @@ import {
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
-import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { registerDestructor, reifyPositional } from '@glimmer/runtime';
+import { createConstRef, Reference } from '@glimmer/reference';
+import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
-import { Tag, track } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
+import { argsProxyFor } from '../utils/args-proxy';
 import AbstractComponentManager from './abstract';
 
 const CAPABILITIES = {
@@ -149,94 +145,6 @@ export interface ComponentArguments {
   named: Dict<unknown>;
 }
 
-function tagForNamedArg<NamedArgs extends CapturedNamedArguments, K extends keyof NamedArgs>(
-  namedArgs: NamedArgs,
-  key: K
-): Tag {
-  return track(() => valueForRef(namedArgs[key]));
-}
-
-let namedArgsProxyFor: (namedArgs: CapturedNamedArguments, debugName?: string) => Args['named'];
-
-if (HAS_NATIVE_PROXY) {
-  namedArgsProxyFor = <NamedArgs extends CapturedNamedArguments>(
-    namedArgs: NamedArgs,
-    debugName?: string
-  ) => {
-    let getTag = (key: keyof Args) => tagForNamedArg(namedArgs, key);
-
-    let handler: ProxyHandler<{}> = {
-      get(_target, prop) {
-        let ref = namedArgs[prop as string];
-
-        if (ref !== undefined) {
-          return valueForRef(ref);
-        } else if (prop === CUSTOM_TAG_FOR) {
-          return getTag;
-        }
-      },
-
-      has(_target, prop) {
-        return namedArgs[prop as string] !== undefined;
-      },
-
-      ownKeys(_target) {
-        return Object.keys(namedArgs);
-      },
-
-      getOwnPropertyDescriptor(_target, prop) {
-        assert(
-          'args proxies do not have real property descriptors, so you should never need to call getOwnPropertyDescriptor yourself. This code exists for enumerability, such as in for-in loops and Object.keys()',
-          namedArgs[prop as string] !== undefined
-        );
-
-        return {
-          enumerable: true,
-          configurable: true,
-        };
-      },
-    };
-
-    if (DEBUG) {
-      handler.set = function(_target, prop) {
-        assert(
-          `You attempted to set ${debugName}#${String(
-            prop
-          )} on a components arguments. Component arguments are immutable and cannot be updated directly, they always represent the values that are passed to your component. If you want to set default values, you should use a getter instead`
-        );
-
-        return false;
-      };
-    }
-
-    return new Proxy({}, handler);
-  };
-} else {
-  namedArgsProxyFor = <NamedArgs extends CapturedNamedArguments>(namedArgs: NamedArgs) => {
-    let getTag = (key: keyof Args) => tagForNamedArg(namedArgs, key);
-
-    let proxy = {};
-
-    Object.defineProperty(proxy, CUSTOM_TAG_FOR, {
-      configurable: false,
-      enumerable: false,
-      value: getTag,
-    });
-
-    Object.keys(namedArgs).forEach(name => {
-      Object.defineProperty(proxy, name, {
-        enumerable: true,
-        configurable: true,
-        get() {
-          return valueForRef(namedArgs[name]);
-        },
-      });
-    });
-
-    return proxy;
-  };
-}
-
 /**
   The CustomComponentManager allows addons to provide custom component
   implementations that integrate seamlessly into Ember. This is accomplished
@@ -276,25 +184,20 @@ export default class CustomComponentManager<ComponentInstance>
   create(
     env: EmberVMEnvironment,
     definition: CustomComponentDefinitionState<ComponentInstance>,
-    args: VMArguments
+    vmArgs: VMArguments
   ): CustomComponentState<ComponentInstance> {
     let { delegate } = definition;
-    let capturedArgs = args.capture();
-    let { named, positional } = capturedArgs;
-    let namedArgsProxy = namedArgsProxyFor(named);
+    let args = argsProxyFor(vmArgs.capture(), 'component');
 
-    let component = delegate.createComponent(definition.ComponentClass.class, {
-      named: namedArgsProxy,
-      positional: reifyPositional(positional),
-    });
+    let component = delegate.createComponent(definition.ComponentClass.class, args);
 
-    let bucket = new CustomComponentState(delegate, component, capturedArgs, env, namedArgsProxy);
+    let bucket = new CustomComponentState(delegate, component, args, env);
 
     if (ENV._DEBUG_RENDER_TREE) {
       env.extra.debugRenderTree.create(bucket, {
         type: 'component',
         name: definition.name,
-        args: args.capture(),
+        args: vmArgs.capture(),
         instance: component,
         template: definition.template,
       });
@@ -317,12 +220,9 @@ export default class CustomComponentManager<ComponentInstance>
     }
 
     if (hasUpdateHook(bucket.delegate)) {
-      let { delegate, component, args, namedArgsProxy } = bucket;
+      let { delegate, component, args } = bucket;
 
-      delegate.updateComponent(component, {
-        named: namedArgsProxy,
-        positional: reifyPositional(args.positional),
-      });
+      delegate.updateComponent(component, args);
     }
   }
 
@@ -383,9 +283,8 @@ export class CustomComponentState<ComponentInstance> {
   constructor(
     public delegate: ManagerDelegate<ComponentInstance>,
     public component: ComponentInstance,
-    public args: CapturedArguments,
-    public env: EmberVMEnvironment,
-    public namedArgsProxy: Args['named']
+    public args: Arguments,
+    public env: EmberVMEnvironment
   ) {
     if (hasDestructors(delegate)) {
       registerDestructor(this, () => delegate.destroyComponent(component));
diff --git a/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts b/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
new file mode 100644
index 00000000000..a7ccf0559e5
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
@@ -0,0 +1,210 @@
+import { CUSTOM_TAG_FOR } from '@ember/-internals/metal';
+import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import {
+  Arguments,
+  CapturedArguments,
+  CapturedNamedArguments,
+  CapturedPositionalArguments,
+} from '@glimmer/interfaces';
+import { Reference, valueForRef } from '@glimmer/reference';
+import { Tag, track } from '@glimmer/validator';
+
+function convertToInt(prop: number | string | symbol): number | null {
+  if (typeof prop === 'symbol') return null;
+
+  const num = Number(prop);
+
+  if (isNaN(num)) return null;
+
+  return num % 1 === 0 ? num : null;
+}
+
+function tagForNamedArg(namedArgs: CapturedNamedArguments, key: string): Tag {
+  return track(() => {
+    if (key in namedArgs) {
+      valueForRef(namedArgs[key]);
+    }
+  });
+}
+
+function tagForPositionalArg(positionalArgs: CapturedPositionalArguments, key: string): Tag {
+  return track(() => {
+    if (key === '[]') {
+      // consume all of the tags in the positional array
+      positionalArgs.forEach(valueForRef);
+    }
+
+    const parsed = convertToInt(key);
+
+    if (parsed !== null && parsed < positionalArgs.length) {
+      // consume the tag of the referenced index
+      valueForRef(positionalArgs[parsed]);
+    }
+  });
+}
+
+export let argsProxyFor: (
+  capturedArgs: CapturedArguments,
+  type: 'component' | 'helper' | 'modifier'
+) => Arguments;
+
+if (HAS_NATIVE_PROXY) {
+  argsProxyFor = (capturedArgs, type) => {
+    const { named, positional } = capturedArgs;
+
+    let getNamedTag = (key: string) => tagForNamedArg(named, key);
+    let getPositionalTag = (key: string) => tagForPositionalArg(positional, key);
+
+    const namedHandler: ProxyHandler<{}> = {
+      get(_target, prop) {
+        const ref = named[prop as string];
+
+        if (ref !== undefined) {
+          return valueForRef(ref);
+        } else if (prop === CUSTOM_TAG_FOR) {
+          return getNamedTag;
+        }
+      },
+
+      has(_target, prop) {
+        return prop in named;
+      },
+
+      ownKeys(_target) {
+        return Object.keys(named);
+      },
+
+      isExtensible() {
+        return false;
+      },
+
+      getOwnPropertyDescriptor(_target, prop) {
+        assert(
+          'args proxies do not have real property descriptors, so you should never need to call getOwnPropertyDescriptor yourself. This code exists for enumerability, such as in for-in loops and Object.keys()',
+          prop in named
+        );
+
+        return {
+          enumerable: true,
+          configurable: true,
+        };
+      },
+    };
+
+    const positionalHandler: ProxyHandler<[]> = {
+      get(target, prop) {
+        if (prop === 'length') {
+          return positional.length;
+        }
+
+        const parsed = convertToInt(prop);
+
+        if (parsed !== null && parsed < positional.length) {
+          return valueForRef(positional[parsed]);
+        }
+
+        if (prop === CUSTOM_TAG_FOR) {
+          return getPositionalTag;
+        }
+
+        return (target as any)[prop];
+      },
+
+      isExtensible() {
+        return false;
+      },
+
+      has(_target, prop) {
+        const parsed = convertToInt(prop);
+
+        return parsed !== null && parsed < positional.length;
+      },
+    };
+
+    const namedTarget = Object.create(null);
+    const positionalTarget: unknown[] = [];
+
+    if (DEBUG) {
+      const setHandler = function(_target: unknown, prop: symbol | string | number): never {
+        throw new Error(
+          `You attempted to set ${String(
+            prop
+          )} on the arguments of a component, helper, or modifier. Arguments are immutable and cannot be updated directly, they always represent the values that is passed down. If you want to set default values, you should use a getter and local tracked state instead.`
+        );
+      };
+
+      const forInDebugHandler = (): never => {
+        throw new Error(
+          `Object.keys() was called on the positional arguments array for a ${type}, which is not supported. This function is a low-level function that should not need to be called for positional argument arrays. You may be attempting to iterate over the array using for...in instead of for...of.`
+        );
+      };
+
+      namedHandler.set = setHandler;
+      positionalHandler.set = setHandler;
+      positionalHandler.ownKeys = forInDebugHandler;
+    }
+
+    return {
+      named: new Proxy(namedTarget, namedHandler),
+      positional: new Proxy(positionalTarget, positionalHandler),
+    };
+  };
+} else {
+  argsProxyFor = (capturedArgs, _type) => {
+    const { named, positional } = capturedArgs;
+
+    let getNamedTag = (key: string) => tagForNamedArg(named, key);
+    let getPositionalTag = (key: string) => tagForPositionalArg(positional, key);
+
+    let namedProxy = {};
+
+    Object.defineProperty(namedProxy, CUSTOM_TAG_FOR, {
+      configurable: false,
+      enumerable: false,
+      value: getNamedTag,
+    });
+
+    Object.keys(named).forEach(name => {
+      Object.defineProperty(namedProxy, name, {
+        enumerable: true,
+        configurable: true,
+        get() {
+          return valueForRef(named[name]);
+        },
+      });
+    });
+
+    let positionalProxy: unknown[] = [];
+
+    Object.defineProperty(positionalProxy, CUSTOM_TAG_FOR, {
+      configurable: false,
+      enumerable: false,
+      value: getPositionalTag,
+    });
+
+    positional.forEach((ref: Reference, index: number) => {
+      Object.defineProperty(positionalProxy, index, {
+        enumerable: true,
+        configurable: true,
+        get() {
+          return valueForRef(ref);
+        },
+      });
+    });
+
+    if (DEBUG) {
+      // Prevent mutations in development mode. This will not prevent the
+      // proxy from updating, but will prevent assigning new values or pushing
+      // for instance.
+      Object.freeze(namedProxy);
+      Object.freeze(positionalProxy);
+    }
+
+    return {
+      named: namedProxy,
+      positional: positionalProxy,
+    };
+  };
+}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 0e7dbd68146..1463c7999b9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -304,7 +304,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.positional', function() {
+          salutation: computed('args.positional.[]', function() {
             return this.args.positional[0] + ' ' + this.args.positional[1];
           }),
         })
@@ -320,11 +320,11 @@ moduleFor(
       this.assertHTML(`<p>Yehuda Katz</p>`);
     }
 
-    ['@test positional params are updated if they change']() {
+    ['@test positional params are updated if they change (computed, arr tag)']() {
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.positional', function() {
+          salutation: computed('args.positional.[]', function() {
             return this.args.positional[0] + ' ' + this.args.positional[1];
           }),
         })
@@ -352,6 +352,70 @@ moduleFor(
       this.assertHTML(`<p>Chad Hietala</p>`);
     }
 
+    ['@test positional params are updated if they change (computed, individual tags)']() {
+      let ComponentClass = setComponentManager(
+        createBasicManager,
+        EmberObject.extend({
+          salutation: computed('args.positional.0', 'args.positional.1', function() {
+            return this.args.positional[0] + ' ' + this.args.positional[1];
+          }),
+        })
+      );
+
+      this.registerComponent('foo-bar', {
+        template: `<p>{{salutation}}</p>`,
+        ComponentClass,
+      });
+
+      this.render('{{foo-bar firstName lastName}}', {
+        firstName: 'Yehuda',
+        lastName: 'Katz',
+      });
+
+      this.assertHTML(`<p>Yehuda Katz</p>`);
+
+      runTask(() =>
+        setProperties(this.context, {
+          firstName: 'Chad',
+          lastName: 'Hietala',
+        })
+      );
+
+      this.assertHTML(`<p>Chad Hietala</p>`);
+    }
+
+    ['@test positional params are updated if they change (native)']() {
+      let ComponentClass = setComponentManager(
+        createBasicManager,
+        class extends EmberObject {
+          get salutation() {
+            return this.args.positional[0] + ' ' + this.args.positional[1];
+          }
+        }
+      );
+
+      this.registerComponent('foo-bar', {
+        template: `<p>{{salutation}}</p>`,
+        ComponentClass,
+      });
+
+      this.render('{{foo-bar firstName lastName}}', {
+        firstName: 'Yehuda',
+        lastName: 'Katz',
+      });
+
+      this.assertHTML(`<p>Yehuda Katz</p>`);
+
+      runTask(() =>
+        setProperties(this.context, {
+          firstName: 'Chad',
+          lastName: 'Hietala',
+        })
+      );
+
+      this.assertHTML(`<p>Chad Hietala</p>`);
+    }
+
     ['@test it can opt-in to running destructor'](assert) {
       let ComponentClass = setComponentManager(
         () => {

From d7f56c44e4d5ec1d0e18449451419ecb045458ea Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 28 Sep 2020 14:01:00 -0400
Subject: [PATCH 0124/1405] [BUGFIX beta] Ensure custom modifiers use args
 proxy.

Prior to this change, all custom modifiers **always** consumed every
argument on install/update/destroy. This was because `reifyArgs`
specifically reads all of them, and the actual usage was not
consumption based.

After this change, any modifiers using `modifierCapabilities('3.22')`
will only consume the arguments that are actually used (named and
positional). All modifiers that use `modifierCapabilities('3.13')` are
unchanged (preserving backwards compatibility).
---
 .../glimmer/lib/modifiers/custom.ts           | 112 ++--
 .../angle-bracket-invocation-test.js          |  26 +-
 .../custom-modifier-manager-test.js           | 516 ++++++++++++------
 3 files changed, 431 insertions(+), 223 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index 26803915ec5..f677d581525 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -1,10 +1,11 @@
 import { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Dict, ModifierManager, VMArguments } from '@glimmer/interfaces';
+import { Arguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
 import { registerDestructor, reifyArgs } from '@glimmer/runtime';
-import { createUpdatableTag, untrack } from '@glimmer/validator';
+import { createUpdatableTag, untrack, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
+import { argsProxyFor } from '../utils/args-proxy';
 
 export interface CustomModifierDefinitionState<ModifierInstance> {
   ModifierClass: Factory<ModifierInstance>;
@@ -13,21 +14,33 @@ export interface CustomModifierDefinitionState<ModifierInstance> {
 }
 
 export interface OptionalCapabilities {
-  disableAutoTracking?: boolean;
+  '3.13': {
+    disableAutoTracking?: boolean;
+  };
+
+  // uses args proxy, does not provide a way to opt-out
+  '3.22': {
+    disableAutoTracking?: boolean;
+  };
 }
 
 export interface Capabilities {
   disableAutoTracking: boolean;
+  useArgsProxy: boolean;
 }
 
-export function capabilities(
-  managerAPI: string,
-  optionalFeatures: OptionalCapabilities = {}
+export function capabilities<Version extends keyof OptionalCapabilities>(
+  managerAPI: Version,
+  optionalFeatures: OptionalCapabilities[Version] = {}
 ): Capabilities {
-  assert('Invalid modifier manager compatibility specified', managerAPI === '3.13');
+  assert(
+    'Invalid modifier manager compatibility specified',
+    managerAPI === '3.13' || managerAPI === '3.22'
+  );
 
   return {
     disableAutoTracking: Boolean(optionalFeatures.disableAutoTracking),
+    useArgsProxy: managerAPI === '3.13' ? false : true,
   };
 }
 
@@ -53,32 +66,21 @@ export class CustomModifierDefinition<ModifierInstance> {
   }
 }
 
-export class CustomModifierState<ModifierInstance> {
-  public tag = createUpdatableTag();
+export interface CustomModifierState<ModifierInstance> {
+  tag: UpdatableTag;
+  element: SimpleElement;
+  delegate: ModifierManagerDelegate<ModifierInstance>;
+  modifier: ModifierInstance;
+  args: Arguments;
   debugName?: string;
-
-  constructor(
-    public element: SimpleElement,
-    public delegate: ModifierManagerDelegate<ModifierInstance>,
-    public modifier: ModifierInstance,
-    public args: CapturedArguments
-  ) {
-    registerDestructor(this, () => delegate.destroyModifier(modifier, reifyArgs(args)));
-  }
-}
-
-// TODO: export ICapturedArgumentsValue from glimmer and replace this
-export interface Args {
-  named: Dict<unknown>;
-  positional: unknown[];
 }
 
 export interface ModifierManagerDelegate<ModifierInstance> {
   capabilities: Capabilities;
-  createModifier(factory: unknown, args: Args): ModifierInstance;
-  installModifier(instance: ModifierInstance, element: SimpleElement, args: Args): void;
-  updateModifier(instance: ModifierInstance, args: Args): void;
-  destroyModifier(instance: ModifierInstance, args: Args): void;
+  createModifier(factory: unknown, args: Arguments): ModifierInstance;
+  installModifier(instance: ModifierInstance, element: SimpleElement, args: Arguments): void;
+  updateModifier(instance: ModifierInstance, args: Arguments): void;
+  destroyModifier(instance: ModifierInstance, args: Arguments): void;
 }
 
 /**
@@ -114,18 +116,49 @@ class InteractiveCustomModifierManager<ModifierInstance>
   create(
     element: SimpleElement,
     definition: CustomModifierDefinitionState<ModifierInstance>,
-    args: VMArguments
+    vmArgs: VMArguments
   ) {
     let { delegate, ModifierClass } = definition;
-    const capturedArgs = args.capture();
+    let capturedArgs = vmArgs.capture();
+
+    assert(
+      'Custom modifier managers must define their capabilities using the capabilities() helper function',
+      typeof delegate.capabilities === 'object' && delegate.capabilities !== null
+    );
 
-    let instance = definition.delegate.createModifier(ModifierClass, reifyArgs(capturedArgs));
-    let state = new CustomModifierState(element, delegate, instance, capturedArgs);
+    let useArgsProxy = delegate.capabilities.useArgsProxy;
+
+    let args = useArgsProxy ? argsProxyFor(capturedArgs, 'modifier') : reifyArgs(capturedArgs);
+    let instance = delegate.createModifier(ModifierClass, args);
+
+    let tag = createUpdatableTag();
+    let state: CustomModifierState<ModifierInstance>;
+    if (useArgsProxy) {
+      state = {
+        tag,
+        element,
+        delegate,
+        args,
+        modifier: instance,
+      };
+    } else {
+      state = {
+        tag,
+        element,
+        delegate,
+        modifier: instance,
+        get args() {
+          return reifyArgs(capturedArgs);
+        },
+      };
+    }
 
     if (DEBUG) {
       state.debugName = definition.name;
     }
 
+    registerDestructor(state, () => delegate.destroyModifier(instance, state.args));
+
     return state;
   }
 
@@ -140,30 +173,23 @@ class InteractiveCustomModifierManager<ModifierInstance>
   install(state: CustomModifierState<ModifierInstance>) {
     let { element, args, delegate, modifier } = state;
 
-    assert(
-      'Custom modifier managers must define their capabilities using the capabilities() helper function',
-      typeof delegate.capabilities === 'object' && delegate.capabilities !== null
-    );
-
     let { capabilities } = delegate;
-    let argsValue = reifyArgs(args);
 
     if (capabilities.disableAutoTracking === true) {
-      untrack(() => delegate.installModifier(modifier, element, argsValue));
+      untrack(() => delegate.installModifier(modifier, element, args));
     } else {
-      delegate.installModifier(modifier, element, argsValue);
+      delegate.installModifier(modifier, element, args);
     }
   }
 
   update(state: CustomModifierState<ModifierInstance>) {
     let { args, delegate, modifier } = state;
     let { capabilities } = delegate;
-    let argsValue = reifyArgs(args);
 
     if (capabilities.disableAutoTracking === true) {
-      untrack(() => delegate.updateModifier(modifier, argsValue));
+      untrack(() => delegate.updateModifier(modifier, args));
     } else {
-      delegate.updateModifier(modifier, argsValue);
+      delegate.updateModifier(modifier, args);
     }
   }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 40cf897a6c8..8a7139385b0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -1258,6 +1258,15 @@ moduleFor(
 moduleFor(
   'Element modifiers on AngleBracket components',
   class extends RenderingTestCase {
+    assertNamedArgs(actual, expected, message) {
+      // `actual` is likely to be a named args proxy, while the `deepEqual` below would see
+      // the values as the same it would still flag as not deep equals because the constructors
+      // of the two objects do not match (one is a proxy, one is Object)
+      let reifiedActual = Object.assign({}, actual);
+
+      this.assert.deepEqual(reifiedActual, expected, message);
+    }
+
     '@test modifiers are forwarded to a single element receiving the splattributes'(assert) {
       let modifierParams = null;
       let modifierNamedArgs = null;
@@ -1277,8 +1286,8 @@ moduleFor(
         })
       );
       this.render('<TheFoo {{bar "something" foo="else"}}/>', {});
-      assert.deepEqual(modifierParams, ['something']);
-      assert.deepEqual(modifierNamedArgs, { foo: 'else' });
+      assert.deepEqual(modifierParams, ['something'], 'positional arguments');
+      this.assertNamedArgs(modifierNamedArgs, { foo: 'else' }, 'named arguments');
       assert.equal(
         modifiedElement && modifiedElement.getAttribute('id'),
         'inner-div',
@@ -1293,12 +1302,13 @@ moduleFor(
         template:
           '<div id="inner-one" ...attributes>Foo</div><div id="inner-two" ...attributes>Bar</div>',
       });
+      let test = this;
       this.registerModifier(
         'bar',
         BaseModifier.extend({
           didInsertElement(params, namedArgs) {
             assert.deepEqual(params, ['something']);
-            assert.deepEqual(namedArgs, { foo: 'else' });
+            test.assertNamedArgs(namedArgs, { foo: 'else' });
             if (this.element) {
               elementIds.push(this.element.getAttribute('id'));
             }
@@ -1341,7 +1351,7 @@ moduleFor(
         foo: 'else',
       });
       assert.deepEqual(modifierParams, ['something']);
-      assert.deepEqual(modifierNamedArgs, { foo: 'else' });
+      this.assertNamedArgs(modifierNamedArgs, { foo: 'else' });
       assert.equal(
         modifiedElement && modifiedElement.getAttribute('id'),
         'inner-div',
@@ -1349,7 +1359,7 @@ moduleFor(
       );
       runTask(() => setProperties(this.context, { something: 'another', foo: 'thingy' }));
       assert.deepEqual(modifierParams, ['another']);
-      assert.deepEqual(modifierNamedArgs, { foo: 'thingy' });
+      this.assertNamedArgs(modifierNamedArgs, { foo: 'thingy' });
       assert.equal(
         modifiedElement && modifiedElement.getAttribute('id'),
         'inner-div',
@@ -1435,7 +1445,7 @@ moduleFor(
         { foo: 'bar' }
       );
       assert.deepEqual(modifierParams, ['bar']);
-      assert.deepEqual(modifierNamedArgs, { foo: 'bar' });
+      this.assertNamedArgs(modifierNamedArgs, { foo: 'bar' });
       assert.equal(
         modifiedElement && modifiedElement.getAttribute('id'),
         'inner-div',
@@ -1443,7 +1453,7 @@ moduleFor(
       );
       runTask(() => setProperties(this.context, { foo: 'qux' }));
       assert.deepEqual(modifierParams, ['qux']);
-      assert.deepEqual(modifierNamedArgs, { foo: 'qux' });
+      this.assertNamedArgs(modifierNamedArgs, { foo: 'qux' });
       assert.equal(
         modifiedElement && modifiedElement.getAttribute('id'),
         'inner-div',
@@ -1486,7 +1496,7 @@ moduleFor(
         { foo: 'bar' }
       );
       assert.deepEqual(modifierParams, ['bar']);
-      assert.deepEqual(modifierNamedArgs, { foo: 'bar' });
+      this.assertNamedArgs(modifierNamedArgs, { foo: 'bar' });
       assert.deepEqual(
         elementIds,
         ['outer-div', 'inner-div'],
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 503878e65d6..3565fdc6f51 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -5,11 +5,8 @@ import { setModifierManager, modifierCapabilities } from '@ember/-internals/glim
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../utils/backtracking-rerender';
 
-class ModifierManagerTest extends RenderingTestCase {}
-
 class CustomModifierManager {
   constructor(owner) {
-    this.capabilities = modifierCapabilities('3.13');
     this.owner = owner;
   }
 
@@ -32,100 +29,283 @@ class CustomModifierManager {
     instance.willDestroyElement();
   }
 }
+class ModifierManagerTest extends RenderingTestCase {
+  '@test throws a useful error when missing capabilities'() {
+    this.registerModifier(
+      'foo-bar',
+      setModifierManager(() => {
+        return {
+          createModifier() {},
+          installModifier() {},
+          updateModifier() {},
+          destroyModifier() {},
+        };
+      }, {})
+    );
+
+    expectAssertion(() => {
+      this.render('<h1 {{foo-bar}}>hello world</h1>');
+    }, /Custom modifier managers must define their capabilities/);
+  }
 
-moduleFor(
-  'Basic Custom Modifier Manager',
-  class extends ModifierManagerTest {
-    '@test throws a useful error when missing capabilities'() {
-      this.registerModifier(
-        'foo-bar',
-        setModifierManager(() => {
-          return {
-            createModifier() {},
-            installModifier() {},
-            updateModifier() {},
-            destroyModifier() {},
-          };
-        }, {})
-      );
+  '@test can register a custom element modifier and render it'(assert) {
+    let ModifierClass = setModifierManager(
+      owner => {
+        return new this.CustomModifierManager(owner);
+      },
+      EmberObject.extend({
+        didInsertElement() {},
+        didUpdate() {},
+        willDestroyElement() {},
+      })
+    );
+
+    this.registerModifier(
+      'foo-bar',
+      ModifierClass.extend({
+        didInsertElement() {
+          assert.ok(true, 'Called didInsertElement');
+        },
+      })
+    );
 
-      expectAssertion(() => {
-        this.render('<h1 {{foo-bar}}>hello world</h1>');
-      }, /Custom modifier managers must define their capabilities/);
-    }
+    this.render('<h1 {{foo-bar}}>hello world</h1>');
+    this.assertHTML(`<h1>hello world</h1>`);
+  }
 
-    '@test can register a custom element modifier and render it'(assert) {
-      let ModifierClass = setModifierManager(
-        owner => {
-          return new CustomModifierManager(owner);
+  '@test custom lifecycle hooks'(assert) {
+    assert.expect(9);
+    let ModifierClass = setModifierManager(
+      owner => {
+        return new this.CustomModifierManager(owner);
+      },
+      EmberObject.extend({
+        didInsertElement() {},
+        didUpdate() {},
+        willDestroyElement() {},
+      })
+    );
+
+    this.registerModifier(
+      'foo-bar',
+      ModifierClass.extend({
+        didUpdate([truthy]) {
+          assert.ok(true, 'Called didUpdate');
+          assert.equal(truthy, 'true', 'gets updated args');
         },
-        EmberObject.extend({
-          didInsertElement() {},
-          didUpdate() {},
-          willDestroyElement() {},
-        })
-      );
+        didInsertElement([truthy]) {
+          assert.ok(true, 'Called didInsertElement');
+          assert.equal(truthy, true, 'gets initial args');
+        },
+        willDestroyElement() {
+          assert.ok(true, 'Called willDestroyElement');
+        },
+      })
+    );
 
-      this.registerModifier(
-        'foo-bar',
-        ModifierClass.extend({
-          didInsertElement() {
-            assert.ok(true, 'Called didInsertElement');
-          },
-        })
-      );
+    this.render('{{#if truthy}}<h1 {{foo-bar truthy}}>hello world</h1>{{/if}}', {
+      truthy: true,
+    });
+    this.assertHTML(`<h1>hello world</h1>`);
 
-      this.render('<h1 {{foo-bar}}>hello world</h1>');
-      this.assertHTML(`<h1>hello world</h1>`);
-    }
+    runTask(() => set(this.context, 'truthy', 'true'));
 
-    '@test custom lifecycle hooks'(assert) {
-      assert.expect(9);
-      let ModifierClass = setModifierManager(
-        owner => {
-          return new CustomModifierManager(owner);
+    runTask(() => set(this.context, 'truthy', false));
+
+    runTask(() => set(this.context, 'truthy', true));
+  }
+
+  '@test associates manager even through an inheritance structure'(assert) {
+    assert.expect(5);
+    let ModifierClass = setModifierManager(
+      owner => {
+        return new this.CustomModifierManager(owner);
+      },
+      EmberObject.extend({
+        didInsertElement() {},
+        didUpdate() {},
+        willDestroyElement() {},
+      })
+    );
+
+    ModifierClass = ModifierClass.extend({
+      didInsertElement([truthy]) {
+        this._super(...arguments);
+        assert.ok(true, 'Called didInsertElement');
+        assert.equal(truthy, true, 'gets initial args');
+      },
+    });
+
+    this.registerModifier(
+      'foo-bar',
+      ModifierClass.extend({
+        didInsertElement([truthy]) {
+          this._super(...arguments);
+          assert.ok(true, 'Called didInsertElement');
+          assert.equal(truthy, true, 'gets initial args');
         },
-        EmberObject.extend({
-          didInsertElement() {},
-          didUpdate() {},
-          willDestroyElement() {},
-        })
-      );
+      })
+    );
 
-      this.registerModifier(
-        'foo-bar',
-        ModifierClass.extend({
-          didUpdate([truthy]) {
-            assert.ok(true, 'Called didUpdate');
-            assert.equal(truthy, 'true', 'gets updated args');
-          },
-          didInsertElement([truthy]) {
-            assert.ok(true, 'Called didInsertElement');
-            assert.equal(truthy, true, 'gets initial args');
-          },
-          willDestroyElement() {
-            assert.ok(true, 'Called willDestroyElement');
-          },
-        })
-      );
+    this.render('<h1 {{foo-bar truthy}}>hello world</h1>', {
+      truthy: true,
+    });
+    this.assertHTML(`<h1>hello world</h1>`);
+  }
 
-      this.render('{{#if truthy}}<h1 {{foo-bar truthy}}>hello world</h1>{{/if}}', {
-        truthy: true,
-      });
-      this.assertHTML(`<h1>hello world</h1>`);
+  '@test can give consistent access to underlying DOM element'(assert) {
+    assert.expect(4);
+    let ModifierClass = setModifierManager(
+      owner => {
+        return new this.CustomModifierManager(owner);
+      },
+      EmberObject.extend({
+        didInsertElement() {},
+        didUpdate() {},
+        willDestroyElement() {},
+      })
+    );
+
+    this.registerModifier(
+      'foo-bar',
+      ModifierClass.extend({
+        savedElement: undefined,
+        didInsertElement(positional) {
+          // consume first positional argument (ensures updates run)
+          positional[0];
+
+          assert.equal(this.element.tagName, 'H1');
+          this.set('savedElement', this.element);
+        },
+        didUpdate() {
+          assert.equal(this.element, this.savedElement);
+        },
+        willDestroyElement() {
+          assert.equal(this.element, this.savedElement);
+        },
+      })
+    );
+
+    this.render('<h1 {{foo-bar truthy}}>hello world</h1>', {
+      truthy: true,
+    });
+    this.assertHTML(`<h1>hello world</h1>`);
+
+    runTask(() => set(this.context, 'truthy', 'true'));
+  }
+
+  '@test lifecycle hooks are autotracked by default'(assert) {
+    let TrackedClass = EmberObject.extend({
+      count: tracked({ value: 0 }),
+    });
+
+    let trackedOne = TrackedClass.create();
+    let trackedTwo = TrackedClass.create();
+
+    let insertCount = 0;
+    let updateCount = 0;
+
+    let ModifierClass = setModifierManager(
+      owner => {
+        return new this.CustomModifierManager(owner);
+      },
+      EmberObject.extend({
+        didInsertElement() {},
+        didUpdate() {},
+        willDestroyElement() {},
+      })
+    );
+
+    this.registerModifier(
+      'foo-bar',
+      ModifierClass.extend({
+        didInsertElement() {
+          // track the count of the first item
+          trackedOne.count;
+          insertCount++;
+        },
+
+        didUpdate() {
+          // track the count of the second item
+          trackedTwo.count;
+          updateCount++;
+        },
+      })
+    );
+
+    this.render('<h1 {{foo-bar truthy}}>hello world</h1>');
+    this.assertHTML(`<h1>hello world</h1>`);
+
+    assert.equal(insertCount, 1);
+    assert.equal(updateCount, 0);
+
+    runTask(() => trackedTwo.count++);
+    assert.equal(updateCount, 0);
 
-      runTask(() => set(this.context, 'truthy', 'true'));
+    runTask(() => trackedOne.count++);
+    assert.equal(updateCount, 1);
 
-      runTask(() => set(this.context, 'truthy', false));
+    runTask(() => trackedOne.count++);
+    assert.equal(updateCount, 1);
 
-      runTask(() => set(this.context, 'truthy', true));
+    runTask(() => trackedTwo.count++);
+    assert.equal(updateCount, 2);
+  }
+
+  '@test provides a helpful assertion when mutating a value that was consumed already'() {
+    class Person {
+      @tracked name = 'bob';
     }
 
-    '@test associates manager even through an inheritance structure'(assert) {
-      assert.expect(5);
+    let ModifierClass = setModifierManager(
+      owner => {
+        return new this.CustomModifierManager(owner);
+      },
+      class {
+        static create() {
+          return new this();
+        }
+
+        didInsertElement() {}
+        didUpdate() {}
+        willDestroyElement() {}
+      }
+    );
+
+    this.registerModifier(
+      'foo-bar',
+      class MyModifier extends ModifierClass {
+        didInsertElement([person]) {
+          person.name;
+          person.name = 'sam';
+        }
+      }
+    );
+
+    let expectedMessage = backtrackingMessageFor('name', 'Person', {
+      renderTree: ['\\(instance of a `foo-bar` modifier\\)'],
+    });
+
+    expectAssertion(() => {
+      this.render('<h1 {{foo-bar this.person}}>hello world</h1>', { person: new Person() });
+    }, expectedMessage);
+  }
+}
+
+moduleFor(
+  'Basic Custom Modifier Manager: 3.13',
+  class extends ModifierManagerTest {
+    CustomModifierManager = class extends CustomModifierManager {
+      capabilities = modifierCapabilities('3.13');
+    };
+
+    '@test modifers consume all arguments'(assert) {
+      let insertCount = 0;
+      let updateCount = 0;
+
       let ModifierClass = setModifierManager(
         owner => {
-          return new CustomModifierManager(owner);
+          return new this.CustomModifierManager(owner);
         },
         EmberObject.extend({
           didInsertElement() {},
@@ -134,36 +314,58 @@ moduleFor(
         })
       );
 
-      ModifierClass = ModifierClass.extend({
-        didInsertElement([truthy]) {
-          this._super(...arguments);
-          assert.ok(true, 'Called didInsertElement');
-          assert.equal(truthy, true, 'gets initial args');
-        },
-      });
-
       this.registerModifier(
         'foo-bar',
         ModifierClass.extend({
-          didInsertElement([truthy]) {
-            this._super(...arguments);
-            assert.ok(true, 'Called didInsertElement');
-            assert.equal(truthy, true, 'gets initial args');
+          didInsertElement(_positional, named) {
+            insertCount++;
+
+            // consume qux
+            named.qux;
+          },
+
+          didUpdate(_positiona, named) {
+            updateCount++;
+
+            // consume qux
+            named.qux;
           },
         })
       );
 
-      this.render('<h1 {{foo-bar truthy}}>hello world</h1>', {
-        truthy: true,
+      this.render('<h1 {{foo-bar bar=this.bar qux=this.qux}}>hello world</h1>', {
+        bar: 'bar',
+        qux: 'quz',
       });
+
       this.assertHTML(`<h1>hello world</h1>`);
+
+      assert.equal(insertCount, 1);
+      assert.equal(updateCount, 0);
+
+      runTask(() => set(this.context, 'bar', 'other bar'));
+      assert.equal(updateCount, 1);
+
+      runTask(() => set(this.context, 'qux', 'quuuuxxxxxx'));
+      assert.equal(updateCount, 2);
     }
+  }
+);
+
+moduleFor(
+  'Basic Custom Modifier Manager: 3.22',
+  class extends ModifierManagerTest {
+    CustomModifierManager = class extends CustomModifierManager {
+      capabilities = modifierCapabilities('3.22');
+    };
+
+    '@test modifers only track positional arguments they consume'(assert) {
+      let insertCount = 0;
+      let updateCount = 0;
 
-    '@test can give consistent access to underlying DOM element'(assert) {
-      assert.expect(4);
       let ModifierClass = setModifierManager(
         owner => {
-          return new CustomModifierManager(owner);
+          return new this.CustomModifierManager(owner);
         },
         EmberObject.extend({
           didInsertElement() {},
@@ -175,42 +377,51 @@ moduleFor(
       this.registerModifier(
         'foo-bar',
         ModifierClass.extend({
-          savedElement: undefined,
-          didInsertElement() {
-            assert.equal(this.element.tagName, 'H1');
-            this.set('savedElement', this.element);
-          },
-          didUpdate() {
-            assert.equal(this.element, this.savedElement);
+          didInsertElement(positional) {
+            insertCount++;
+
+            // consume the second positional
+            positional[1];
           },
-          willDestroyElement() {
-            assert.equal(this.element, this.savedElement);
+
+          didUpdate(positional) {
+            updateCount++;
+
+            // consume the second positional
+            positional[1];
           },
         })
       );
 
-      this.render('<h1 {{foo-bar truthy}}>hello world</h1>', {
-        truthy: true,
-      });
+      this.render(
+        '<h1 {{foo-bar this.positionOne this.positionTwo bar=this.bar qux=this.qux}}>hello world</h1>',
+        {
+          positionOne: 'first!!!',
+          positionTwo: 'second :(',
+          bar: 'bar',
+          qux: 'quz',
+        }
+      );
+
       this.assertHTML(`<h1>hello world</h1>`);
 
-      runTask(() => set(this.context, 'truthy', 'true'));
-    }
+      assert.equal(insertCount, 1);
+      assert.equal(updateCount, 0);
 
-    '@test lifecycle hooks are autotracked by default'(assert) {
-      let TrackedClass = EmberObject.extend({
-        count: tracked({ value: 0 }),
-      });
+      runTask(() => set(this.context, 'positionOne', 'no first?'));
+      assert.equal(updateCount, 0);
 
-      let trackedOne = TrackedClass.create();
-      let trackedTwo = TrackedClass.create();
+      runTask(() => set(this.context, 'positionTwo', 'YASSSSSSS!!!'));
+      assert.equal(updateCount, 1);
+    }
 
+    '@test modifers only track named arguments they consume'(assert) {
       let insertCount = 0;
       let updateCount = 0;
 
       let ModifierClass = setModifierManager(
         owner => {
-          return new CustomModifierManager(owner);
+          return new this.CustomModifierManager(owner);
         },
         EmberObject.extend({
           didInsertElement() {},
@@ -222,76 +433,37 @@ moduleFor(
       this.registerModifier(
         'foo-bar',
         ModifierClass.extend({
-          didInsertElement() {
-            // track the count of the first item
-            trackedOne.count;
+          didInsertElement(_positional, named) {
             insertCount++;
+
+            // consume qux
+            named.qux;
           },
 
-          didUpdate() {
-            // track the count of the second item
-            trackedTwo.count;
+          didUpdate(_positiona, named) {
             updateCount++;
+
+            // consume qux
+            named.qux;
           },
         })
       );
 
-      this.render('<h1 {{foo-bar truthy}}>hello world</h1>');
+      this.render('<h1 {{foo-bar bar=this.bar qux=this.qux}}>hello world</h1>', {
+        bar: 'bar',
+        qux: 'quz',
+      });
+
       this.assertHTML(`<h1>hello world</h1>`);
 
       assert.equal(insertCount, 1);
       assert.equal(updateCount, 0);
 
-      runTask(() => trackedTwo.count++);
+      runTask(() => set(this.context, 'bar', 'other bar'));
       assert.equal(updateCount, 0);
 
-      runTask(() => trackedOne.count++);
+      runTask(() => set(this.context, 'qux', 'quuuuxxxxxx'));
       assert.equal(updateCount, 1);
-
-      runTask(() => trackedOne.count++);
-      assert.equal(updateCount, 1);
-
-      runTask(() => trackedTwo.count++);
-      assert.equal(updateCount, 2);
-    }
-
-    '@test provides a helpful assertion when mutating a value that was consumed already'() {
-      class Person {
-        @tracked name = 'bob';
-      }
-
-      let ModifierClass = setModifierManager(
-        owner => {
-          return new CustomModifierManager(owner);
-        },
-        class {
-          static create() {
-            return new this();
-          }
-
-          didInsertElement() {}
-          didUpdate() {}
-          willDestroyElement() {}
-        }
-      );
-
-      this.registerModifier(
-        'foo-bar',
-        class MyModifier extends ModifierClass {
-          didInsertElement([person]) {
-            person.name;
-            person.name = 'sam';
-          }
-        }
-      );
-
-      let expectedMessage = backtrackingMessageFor('name', 'Person', {
-        renderTree: ['\\(instance of a `foo-bar` modifier\\)'],
-      });
-
-      expectAssertion(() => {
-        this.render('<h1 {{foo-bar this.person}}>hello world</h1>', { person: new Person() });
-      }, expectedMessage);
     }
   }
 );

From ef26b1fa43edcce2bd04a78ef087ff5615683af2 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 28 Sep 2020 12:58:27 -0700
Subject: [PATCH 0125/1405] [BUGFIX lts] Entangles custom EmberArray
 implementations when accessed

Restores the previous logic that existed for entangling custom
EmberArray implementations when they are accessed, along with a test
for the functionality.
---
 .../tests/integration/helpers/tracked-test.js | 65 ++++++++++++++++++-
 .../-internals/metal/lib/property_get.ts      |  4 +-
 .../@ember/-internals/metal/lib/tracked.ts    |  3 +-
 .../-internals/runtime/lib/mixins/array.js    |  7 +-
 packages/@ember/-internals/utils/index.ts     |  2 +-
 .../-internals/utils/lib/ember-array.ts       | 12 ++--
 .../utils/tests/trackable-object-test.js      |  9 ++-
 7 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index fe81f543951..cba9cd63f49 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -1,5 +1,11 @@
-import { Object as EmberObject, A } from '@ember/-internals/runtime';
-import { get, set, tracked, nativeDescDecorator as descriptor } from '@ember/-internals/metal';
+import { Object as EmberObject, A, MutableArray } from '@ember/-internals/runtime';
+import {
+  get,
+  set,
+  tracked,
+  nativeDescDecorator as descriptor,
+  notifyPropertyChange,
+} from '@ember/-internals/metal';
 import Service, { inject } from '@ember/service';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
@@ -169,6 +175,61 @@ moduleFor(
       this.assertText('1, 2, 3, 4');
     }
 
+    '@test custom ember array properties rerender when updated'() {
+      let CustomArray = EmberObject.extend(MutableArray, {
+        init() {
+          this._super(...arguments);
+          this._vals = [1, 2, 3];
+        },
+
+        objectAt(index) {
+          return this._vals[index];
+        },
+
+        replace(start, deleteCount, items = []) {
+          this._vals.splice(start, deleteCount, ...items);
+          notifyPropertyChange(this, '[]');
+        },
+
+        join() {
+          return this._vals.join(...arguments);
+        },
+
+        get length() {
+          return this._vals.length;
+        },
+      });
+
+      let NumListComponent = Component.extend({
+        numbers: tracked({ initializer: () => CustomArray.create() }),
+
+        addNumber() {
+          this.numbers.pushObject(4);
+        },
+      });
+
+      this.registerComponent('num-list', {
+        ComponentClass: NumListComponent,
+        template: strip`
+            <button {{action this.addNumber}}>
+              {{join this.numbers}}
+            </button>
+          `,
+      });
+
+      this.registerHelper('join', ([value]) => {
+        return value.join(', ');
+      });
+
+      this.render('<NumList />');
+
+      this.assertText('1, 2, 3');
+
+      runTask(() => this.$('button').click());
+
+      this.assertText('1, 2, 3, 4');
+    }
+
     '@test nested getters update when dependent properties are invalidated'(assert) {
       let computeCount = 0;
 
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index bc1f8e08c0c..b5de81e4554 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -1,7 +1,7 @@
 /**
 @module @ember/object
 */
-import { HAS_NATIVE_PROXY, setProxy, symbol } from '@ember/-internals/utils';
+import { HAS_NATIVE_PROXY, isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -130,7 +130,7 @@ export function _getProp(obj: object, keyName: string) {
     if (isTracking()) {
       consumeTag(tagFor(obj, keyName));
 
-      if (Array.isArray(value)) {
+      if (Array.isArray(value) || isEmberArray(value)) {
         // Add the tag of the returned value if it is an array, since arrays
         // should always cause updates if they are consumed and then changed
         consumeTag(tagFor(value, '[]'));
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index df9a47025f5..951b88f7ddd 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -1,3 +1,4 @@
+import { isEmberArray } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
@@ -162,7 +163,7 @@ function descriptorForField([_target, key, desc]: [
 
       // Add the tag of the returned value if it is an array, since arrays
       // should always cause updates if they are consumed and then changed
-      if (Array.isArray(value)) {
+      if (Array.isArray(value) || isEmberArray(value)) {
         consumeTag(tagFor(value, '[]'));
       }
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index f5baade158f..22c6d8d49e6 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -3,7 +3,7 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { PROXY_CONTENT } from '@ember/-internals/metal';
-import { EMBER_ARRAY, HAS_NATIVE_PROXY, tryInvoke } from '@ember/-internals/utils';
+import { setEmberArray, HAS_NATIVE_PROXY, tryInvoke } from '@ember/-internals/utils';
 import {
   get,
   set,
@@ -216,7 +216,10 @@ function mapBy(key) {
   @public
 */
 const ArrayMixin = Mixin.create(Enumerable, {
-  [EMBER_ARRAY]: true,
+  init() {
+    this._super(...arguments);
+    setEmberArray(this);
+  },
 
   /**
     __Required.__ You must implement this method to apply this mixin.
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index 0a6b3815bc6..12504123e60 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -32,7 +32,7 @@ export { HAS_NATIVE_SYMBOL } from './lib/symbol-utils';
 export { HAS_NATIVE_PROXY } from './lib/proxy-utils';
 export { isProxy, setProxy } from './lib/is_proxy';
 export { default as Cache } from './lib/cache';
-export { EMBER_ARRAY, EmberArray, isEmberArray } from './lib/ember-array';
+export { EmberArray, setEmberArray, isEmberArray } from './lib/ember-array';
 export {
   setupMandatorySetter,
   teardownMandatorySetter,
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index 81f43362eff..f6b3d68a2b5 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -1,6 +1,6 @@
-import { symbol } from './symbol';
+import { _WeakSet } from '@glimmer/util';
 
-export const EMBER_ARRAY = symbol('EMBER_ARRAY');
+const EMBER_ARRAYS = new _WeakSet();
 
 export interface EmberArray<T> {
   length: number;
@@ -10,6 +10,10 @@ export interface EmberArray<T> {
   splice(start: number, deleteCount: number, ...items: T[]): void;
 }
 
-export function isEmberArray(obj: any): obj is EmberArray<unknown> {
-  return obj && obj[EMBER_ARRAY];
+export function setEmberArray(obj: object) {
+  EMBER_ARRAYS.add(obj);
+}
+
+export function isEmberArray(obj: unknown): obj is EmberArray<unknown> {
+  return EMBER_ARRAYS.has(obj as object);
 }
diff --git a/packages/@ember/-internals/utils/tests/trackable-object-test.js b/packages/@ember/-internals/utils/tests/trackable-object-test.js
index ee8542b6e28..7355dfad3d7 100644
--- a/packages/@ember/-internals/utils/tests/trackable-object-test.js
+++ b/packages/@ember/-internals/utils/tests/trackable-object-test.js
@@ -1,12 +1,15 @@
-import { EMBER_ARRAY, isEmberArray } from '..';
+import { setEmberArray, isEmberArray } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   '@ember/-internals/utils Trackable Object',
   class extends AbstractTestCase {
     ['@test classes'](assert) {
-      class Test {}
-      Test.prototype[EMBER_ARRAY] = true;
+      class Test {
+        constructor() {
+          setEmberArray(this);
+        }
+      }
 
       let instance = new Test();
 

From 26ef075c85688d26b1b12921bb4b5d4073507d83 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 28 Sep 2020 16:24:32 -0700
Subject: [PATCH 0126/1405] Update TypeScript to v4.0.0

---
 .eslintrc.js                                  |   1 +
 package.json                                  |   4 +-
 .../application/debug-render-tree-test.ts     |  14 +-
 .../-internals/views/lib/system/utils.ts      |   4 +-
 yarn.lock                                     | 234 ++++++++++++++----
 5 files changed, 199 insertions(+), 58 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 9512c474dba..6092bc3b36f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -68,6 +68,7 @@ module.exports = {
         'no-dupe-class-members': 'off',
         'no-unused-vars': 'off',
         'no-undef': 'off',
+        'no-redeclare': 'off',
 
         'import/export': 'off',
         'import/named': 'off',
diff --git a/package.json b/package.json
index ea1da2920ec..a7f431bbac5 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
-    "@typescript-eslint/parser": "^2.33.0",
+    "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.686.0",
     "babel-eslint": "^10.1.0",
@@ -101,7 +101,7 @@
     "broccoli-rollup": "^2.1.1",
     "broccoli-source": "^3.0.0",
     "broccoli-string-replace": "^0.1.2",
-    "broccoli-typescript-compiler": "^5.0.0",
+    "broccoli-typescript-compiler": "^7.0.0",
     "broccoli-uglify-sourcemap": "^3.2.0",
     "common-tags": "^1.8.0",
     "core-js": "^2.6.5",
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 9803d2f745a..c7a7111e609 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1530,20 +1530,20 @@ if (ENV._DEBUG_RENDER_TREE) {
 
       nodeBounds(node: Node): CapturedBounds {
         return {
-          parentElement: (expect(
+          parentElement: ((expect(
             node.parentNode,
             'BUG: detached node'
-          ) as SimpleNode) as SimpleElement,
-          firstNode: node as SimpleNode,
-          lastNode: node as SimpleNode,
+          ) as unknown) as SimpleNode) as SimpleElement,
+          firstNode: (node as unknown) as SimpleNode,
+          lastNode: (node as unknown) as SimpleNode,
         };
       }
 
       elementBounds(element: Element): CapturedBounds {
         return {
-          parentElement: element as SimpleElement,
-          firstNode: element.firstChild! as SimpleNode,
-          lastNode: element.lastChild! as SimpleNode,
+          parentElement: (element as unknown) as SimpleElement,
+          firstNode: (element.firstChild! as unknown) as SimpleNode,
+          lastNode: (element.lastChild! as unknown) as SimpleNode,
         };
       }
 
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index fc0c27dc9f1..88fe434c227 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -171,8 +171,8 @@ export function getViewRange(view: View): Range {
   let bounds = getViewBounds(view);
 
   let range = document.createRange();
-  range.setStartBefore(bounds.firstNode as Node);
-  range.setEndAfter(bounds.lastNode as Node);
+  range.setStartBefore((bounds.firstNode as unknown) as Node);
+  range.setEndAfter((bounds.lastNode as unknown) as Node);
 
   return range;
 }
diff --git a/yarn.lock b/yarn.lock
index 66fec39e073..271a04e105a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1060,6 +1060,27 @@
     "@glimmer/interfaces" "^0.61.2"
     "@glimmer/util" "^0.61.2"
 
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
 "@simple-dom/document@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/document/-/document-1.4.0.tgz#af60855f957f284d436983798ef1006cca1a1678"
@@ -1108,11 +1129,6 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
-"@types/eslint-visitor-keys@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
-  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
-
 "@types/estree@*", "@types/estree@0.0.38":
   version "0.0.38"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
@@ -1139,11 +1155,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/json-schema@^7.0.3":
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
-  integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
-
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1196,39 +1207,51 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/experimental-utils@2.33.0":
-  version "2.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.33.0.tgz#000f1e5f344fbea1323dc91cc174805d75f99a03"
-  integrity sha512-qzPM2AuxtMrRq78LwyZa8Qn6gcY8obkIrBs1ehqmQADwkYzTE1Pb4y2W+U3rE/iFkSWcWHG2LS6MJfj6SmHApg==
+"@typescript-eslint/parser@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3"
+  integrity sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==
   dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/typescript-estree" "2.33.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+    "@typescript-eslint/scope-manager" "4.3.0"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/typescript-estree" "4.3.0"
+    debug "^4.1.1"
 
-"@typescript-eslint/parser@^2.33.0":
-  version "2.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.33.0.tgz#395c0ef229ebef883608f8632a34f0acf02b9bdd"
-  integrity sha512-AUtmwUUhJoH6yrtxZMHbRUEMsC2G6z5NSxg9KsROOGqNXasM71I8P2NihtumlWTUCRld70vqIZ6Pm4E5PAziEA==
+"@typescript-eslint/scope-manager@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
+  integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==
   dependencies:
-    "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "2.33.0"
-    "@typescript-eslint/typescript-estree" "2.33.0"
-    eslint-visitor-keys "^1.1.0"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/visitor-keys" "4.3.0"
 
-"@typescript-eslint/typescript-estree@2.33.0":
-  version "2.33.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.33.0.tgz#33504c050ccafd38f397a645d4e9534d2eccbb5c"
-  integrity sha512-d8rY6/yUxb0+mEwTShCQF2zYQdLlqihukNfG9IUlLYz5y1CH6G/9XYbrxQLq3Z14RNvkCC6oe+OcFlyUpwUbkg==
+"@typescript-eslint/types@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
+  integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==
+
+"@typescript-eslint/typescript-estree@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
+  integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==
   dependencies:
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/visitor-keys" "4.3.0"
     debug "^4.1.1"
-    eslint-visitor-keys "^1.1.0"
-    glob "^7.1.6"
+    globby "^11.0.1"
     is-glob "^4.0.1"
     lodash "^4.17.15"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
+"@typescript-eslint/visitor-keys@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"
+  integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==
+  dependencies:
+    "@typescript-eslint/types" "4.3.0"
+    eslint-visitor-keys "^2.0.0"
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1462,6 +1485,11 @@ array-to-sentence@^1.1.0:
   resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
   integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1918,7 +1946,7 @@ braces@^2.3.1:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@~3.0.2:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2095,6 +2123,22 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
+broccoli-funnel@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
+  integrity sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ==
+  dependencies:
+    array-equal "^1.0.0"
+    blank-object "^1.0.1"
+    broccoli-plugin "^4.0.1"
+    debug "^4.1.1"
+    fast-ordered-set "^1.0.0"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    path-posix "^1.0.0"
+    walk-sync "^2.0.2"
+
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
@@ -2133,7 +2177,7 @@ broccoli-merge-trees@^3.0.1, broccoli-merge-trees@^3.0.2:
     broccoli-plugin "^1.3.0"
     merge-trees "^2.0.0"
 
-broccoli-merge-trees@^4.1.0, broccoli-merge-trees@^4.2.0:
+broccoli-merge-trees@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-4.2.0.tgz#692d3c163ecea08c5714a9434d664e628919f47c"
   integrity sha512-nTrQe5AQtCrW4enLRvbD/vTLHqyW2tz+vsLXQe4IEaUhepuMGVKJJr+I8n34Vu6fPjmPLwTjzNC8izMIDMtHPw==
@@ -2333,19 +2377,19 @@ broccoli-string-replace@^0.1.2:
     broccoli-persistent-filter "^1.1.5"
     minimatch "^3.0.3"
 
-broccoli-typescript-compiler@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-5.0.0.tgz#c56e6383e5c57efb2ce6852aa3f8154e92c689ed"
-  integrity sha512-pUd+VYyD5Afy4mYWnrGbEt+DmuqUDh4mFAP5tOaDz0y/rwlbEN3OvXrhSMcXhTDq2cDSiHqsfQO304nSYFT0Nw==
+broccoli-typescript-compiler@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-7.0.0.tgz#a7792ceb8db2ddb3d57e91e429750b4ce9568626"
+  integrity sha512-9BSZc9tVdm3SEbR7uyMQ6XqYMQWkdCvp2dPlZYnENEqbUToCIVOJuOZ24nrenR6N4eTZPnY3R99DkgyoxmRp5A==
   dependencies:
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^4.1.0"
+    broccoli-funnel "^3.0.3"
+    broccoli-merge-trees "^4.2.0"
     broccoli-plugin "^4.0.1"
     fs-tree-diff "^2.0.1"
     heimdalljs "0.3.3"
     md5-hex "^3.0.1"
-    typescript "~3.7.5"
-    walk-sync "^2.0.2"
+    typescript "~4.0.3"
+    walk-sync "^2.1.0"
 
 broccoli-uglify-sourcemap@^3.2.0:
   version "3.2.0"
@@ -3281,6 +3325,13 @@ diff@^4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
   integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -3957,6 +4008,11 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
 eslint@^6.8.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
@@ -4253,6 +4309,18 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
+fast-glob@^3.1.1:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -4298,6 +4366,13 @@ fast-sourcemap-concat@^2.1.0:
     source-map-url "^0.3.0"
     sourcemap-validator "^1.1.0"
 
+fastq@^1.6.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
+  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  dependencies:
+    reusify "^1.0.4"
+
 faye-websocket@~0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -4781,7 +4856,7 @@ github@^0.2.3:
   dependencies:
     mime "^1.2.11"
 
-glob-parent@^5.0.0, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
@@ -4860,6 +4935,18 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
+globby@^11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
+  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
 got@^8.0.1, got@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
@@ -5196,6 +5283,11 @@ ignore@^5.1.1:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
   integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
 
+ignore@^5.1.4:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
 import-fresh@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
@@ -6503,6 +6595,11 @@ merge-trees@^2.0.0:
     fs-updater "^1.0.4"
     heimdalljs "^0.2.5"
 
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -6527,6 +6624,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -7247,6 +7352,11 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 pathval@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
@@ -7269,6 +7379,11 @@ picomatch@^2.0.4:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
   integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
 
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -7908,6 +8023,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rimraf@2.6.3, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
@@ -8027,6 +8147,11 @@ run-async@^2.4.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
 rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
@@ -8229,6 +8354,11 @@ simple-html-tokenizer@^0.5.9:
   resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
   integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -9096,10 +9226,10 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@~3.7.5:
-  version "3.7.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae"
-  integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw==
+typescript@~4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
+  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
@@ -9366,6 +9496,16 @@ walk-sync@^2.0.2:
     ensure-posix-path "^1.1.0"
     matcher-collection "^2.0.0"
 
+walk-sync@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
+  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
+  dependencies:
+    "@types/minimatch" "^3.0.3"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.0"
+    minimatch "^3.0.4"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From be954758e7e66ad0c1c2a94772817c1771cb2193 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sun, 27 Sep 2020 20:55:05 -0700
Subject: [PATCH 0127/1405] [FEAT] Implements Helper Managers

Implements the helper manager feature specified in RFC 625. Highlights:

1. Adds `getDebugName` to the interface for helper managers. This is an
   optional hook that is used for better logging purposes, and matches
   other internal APIs we've added recently.

2. `hasScheduledEffect` has not yet been implemented, and attempting to
   use it will cause an assertion to be thrown.

Helper managers are not exposed with this PR, and the version passed to
`helperCapabilities` is optimistic, but can be changed when we do expose
them (along with an appropriate feature flag).

Co-authored-by: Robert Jackson <me@rwjblue.com>
---
 packages/@ember/-internals/glimmer/index.ts   |   8 +-
 .../@ember/-internals/glimmer/lib/helper.ts   | 110 ++++++-
 .../-internals/glimmer/lib/helpers/custom.ts  |  86 +++++
 .../@ember/-internals/glimmer/lib/resolver.ts |  62 ++--
 .../-internals/glimmer/lib/utils/managers.ts  |  26 +-
 .../glimmer/lib/utils/references.ts           |  40 ---
 .../helpers/helper-manager-test.js            | 294 ++++++++++++++++++
 packages/@ember/canary-features/index.ts      |   2 +
 packages/ember/index.js                       |   7 +
 packages/ember/tests/reexports_test.js        |  12 +-
 .../lib/test-cases/rendering.js               |   4 +
 11 files changed, 561 insertions(+), 90 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/custom.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/references.ts
 create mode 100644 packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 0a65246c8a2..d9139b7b000 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -403,14 +403,10 @@ export { default as AbstractComponentManager } from './lib/component-managers/ab
 export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
+export { setComponentManager, setModifierManager, setHelperManager } from './lib/utils/managers';
 export { capabilities } from './lib/component-managers/custom';
-export {
-  setComponentManager,
-  getComponentManager,
-  setModifierManager,
-  getModifierManager,
-} from './lib/utils/managers';
 export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
+export { helperCapabilities, HelperManager } from './lib/helpers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
 export { setComponentTemplate, getComponentTemplate } from './lib/utils/component-template';
 export { CapturedRenderNode } from './lib/utils/debug-render-tree';
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 4403bb613f0..4362b2f16c1 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -4,10 +4,18 @@
 
 import { Factory } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
-import { symbol } from '@ember/-internals/utils';
+import { getDebugName, symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
-import { Dict } from '@glimmer/interfaces';
-import { createTag, dirtyTag } from '@glimmer/validator';
+import { DEBUG } from '@glimmer/env';
+import { Arguments, Dict } from '@glimmer/interfaces';
+import {
+  consumeTag,
+  createTag,
+  deprecateMutationsInTrackingTransaction,
+  dirtyTag,
+} from '@glimmer/validator';
+import { helperCapabilities, HelperManager } from './helpers/custom';
+import { setHelperManager } from './utils/managers';
 
 export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
 
@@ -30,18 +38,6 @@ export interface SimpleHelper<T = unknown> {
   compute: HelperFunction<T>;
 }
 
-export function isHelperFactory(
-  helper: any | undefined | null
-): helper is Factory<SimpleHelper | HelperInstance, HelperFactory<SimpleHelper | HelperInstance>> {
-  return (
-    typeof helper === 'object' && helper !== null && helper.class && helper.class.isHelperFactory
-  );
-}
-
-export function isClassHelper(helper: SimpleHelper | HelperInstance): helper is HelperInstance {
-  return (helper as any).destroy !== undefined;
-}
-
 /**
   Ember Helpers are functions that can compute values, and are used in templates.
   For example, this code calls a helper named `format-currency`:
@@ -138,6 +134,56 @@ let Helper = FrameworkObject.extend({
 
 Helper.isHelperFactory = true;
 
+interface ClassicHelperStateBucket {
+  instance: HelperInstance;
+  args: Arguments;
+}
+
+class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
+  capabilities = helperCapabilities('3.23', {
+    hasValue: true,
+    hasDestroyable: true,
+  });
+
+  createHelper(definition: ClassHelperFactory, args: Arguments) {
+    return {
+      instance: definition.create(),
+      args,
+    };
+  }
+
+  getDestroyable({ instance }: ClassicHelperStateBucket) {
+    return instance;
+  }
+
+  getValue({ instance, args }: ClassicHelperStateBucket) {
+    let ret;
+    let { positional, named } = args;
+
+    if (DEBUG) {
+      deprecateMutationsInTrackingTransaction!(() => {
+        ret = instance.compute(positional, named);
+      });
+    } else {
+      ret = instance.compute(positional, named);
+    }
+
+    consumeTag(instance[RECOMPUTE_TAG]);
+
+    return ret;
+  }
+
+  getDebugName(definition: ClassHelperFactory) {
+    return getDebugName!(definition.class!['prototype']);
+  }
+}
+
+export const CLASSIC_HELPER_MANAGER = new ClassicHelperManager();
+
+setHelperManager(() => CLASSIC_HELPER_MANAGER, Helper);
+
+///////////
+
 class Wrapper implements HelperFactory<SimpleHelper> {
   isHelperFactory: true = true;
 
@@ -151,6 +197,40 @@ class Wrapper implements HelperFactory<SimpleHelper> {
   }
 }
 
+class SimpleClassicHelperManager implements HelperManager<() => unknown> {
+  capabilities = helperCapabilities('3.23', {
+    hasValue: true,
+  });
+
+  createHelper(definition: Wrapper, args: Arguments) {
+    if (DEBUG) {
+      return () => {
+        let ret;
+
+        deprecateMutationsInTrackingTransaction!(() => {
+          ret = definition.compute.call(null, args.positional, args.named);
+        });
+
+        return ret;
+      };
+    }
+
+    return definition.compute.bind(null, args.positional, args.named);
+  }
+
+  getValue(fn: () => unknown) {
+    return fn();
+  }
+
+  getDebugName(definition: Wrapper) {
+    return getDebugName!(definition.compute);
+  }
+}
+
+export const SIMPLE_CLASSIC_HELPER_MANAGER = new SimpleClassicHelperManager();
+
+setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype);
+
 /**
   In many cases it is not necessary to use the full `Helper` class.
   The `helper` method create pure-function helpers without instances.
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
new file mode 100644
index 00000000000..3f673627420
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
@@ -0,0 +1,86 @@
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { Arguments, Helper as GlimmerHelper } from '@glimmer/interfaces';
+import { createComputeRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
+import { argsProxyFor } from '../utils/args-proxy';
+
+export type HelperDefinition = object;
+
+export interface HelperCapabilities {
+  hasValue: boolean;
+  hasDestroyable: boolean;
+  hasScheduledEffect: boolean;
+}
+
+export function helperCapabilities(
+  managerAPI: string,
+  options: Partial<HelperCapabilities> = {}
+): HelperCapabilities {
+  assert('Invalid helper manager compatibility specified', managerAPI === '3.23');
+
+  assert(
+    'You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted.',
+    (options.hasValue || options.hasScheduledEffect) &&
+      !(options.hasValue && options.hasScheduledEffect)
+  );
+
+  assert(
+    'The `hasScheduledEffect` capability has not yet been implemented for helper managers. Please pass `hasValue` instead',
+    !options.hasScheduledEffect
+  );
+
+  return {
+    hasValue: Boolean(options.hasValue),
+    hasDestroyable: Boolean(options.hasDestroyable),
+    hasScheduledEffect: Boolean(options.hasScheduledEffect),
+  };
+}
+
+export interface HelperManager<HelperStateBucket = unknown> {
+  capabilities: HelperCapabilities;
+
+  createHelper(definition: HelperDefinition, args: Arguments): HelperStateBucket;
+
+  getDebugName?(definition: HelperDefinition): string;
+}
+
+export interface HelperManagerWithValue<HelperStateBucket = unknown>
+  extends HelperManager<HelperStateBucket> {
+  getValue(bucket: HelperStateBucket): unknown;
+}
+
+function hasValue(manager: HelperManager): manager is HelperManagerWithValue {
+  return manager.capabilities.hasValue;
+}
+
+export interface HelperManagerWithDestroyable<HelperStateBucket = unknown>
+  extends HelperManager<HelperStateBucket> {
+  getDestroyable(bucket: HelperStateBucket): object;
+}
+
+function hasDestroyable(manager: HelperManager): manager is HelperManagerWithDestroyable {
+  return manager.capabilities.hasDestroyable;
+}
+
+export default function customHelper(
+  manager: HelperManager<unknown>,
+  definition: HelperDefinition
+): GlimmerHelper {
+  return (args, vm) => {
+    const bucket = manager.createHelper(definition, argsProxyFor(args.capture(), 'helper'));
+
+    if (hasDestroyable(manager)) {
+      vm.associateDestroyable(manager.getDestroyable(bucket));
+    }
+
+    if (hasValue(manager)) {
+      return createComputeRef(
+        () => manager.getValue(bucket),
+        null,
+        DEBUG && manager.getDebugName && manager.getDebugName(definition)
+      );
+    } else {
+      return UNDEFINED_REFERENCE;
+    }
+  };
+}
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 7ae05061e22..7cdb26e7b5f 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -2,13 +2,15 @@ import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
 import { OwnedTemplateMeta } from '@ember/-internals/views';
-import { EMBER_GLIMMER_SET_COMPONENT_TEMPLATE } from '@ember/canary-features';
+import {
+  EMBER_GLIMMER_HELPER_MANAGER,
+  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
+} from '@ember/canary-features';
 import { isTemplateOnlyComponent } from '@ember/component/template-only';
 import { assert, deprecate } from '@ember/debug';
 import { PARTIALS } from '@ember/deprecated-features';
 import EmberError from '@ember/error';
 import { _instrumentStart } from '@ember/instrumentation';
-import { DEBUG } from '@glimmer/env';
 import {
   ComponentDefinition,
   Helper,
@@ -17,13 +19,19 @@ import {
   RuntimeResolver,
 } from '@glimmer/interfaces';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
-import { getDynamicVar, ModifierDefinition, registerDestructor } from '@glimmer/runtime';
+import { getDynamicVar, ModifierDefinition } from '@glimmer/runtime';
 import { CurlyComponentDefinition } from './component-managers/curly';
 import { CustomManagerDefinition } from './component-managers/custom';
 import { InternalComponentDefinition, isInternalManager } from './component-managers/internal';
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
 import InternalComponent from './components/internal';
-import { isClassHelper, isHelperFactory } from './helper';
+import {
+  CLASSIC_HELPER_MANAGER,
+  HelperFactory,
+  HelperInstance,
+  SIMPLE_CLASSIC_HELPER_MANAGER,
+  SimpleHelper,
+} from './helper';
 import { default as componentAssertionHelper } from './helpers/-assert-implicit-component-helper-argument';
 import { default as inElementNullCheckHelper } from './helpers/-in-element-null-check';
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
@@ -31,6 +39,7 @@ import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
 import { default as array } from './helpers/array';
 import { default as concat } from './helpers/concat';
+import customHelper from './helpers/custom';
 import { default as eachIn } from './helpers/each-in';
 import { default as fn } from './helpers/fn';
 import { default as get } from './helpers/get';
@@ -48,8 +57,7 @@ import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
 import { Factory as TemplateFactory, OwnedTemplate } from './template';
 import { getComponentTemplate } from './utils/component-template';
-import { getComponentManager, getModifierManager } from './utils/managers';
-import { createHelperRef } from './utils/references';
+import { getComponentManager, getHelperManager, getModifierManager } from './utils/managers';
 
 function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
@@ -358,32 +366,32 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     const options: LookupOptions = makeOptions(moduleName, namespace);
 
     const factory =
-      owner.factoryFor(`helper:${name}`, options) || owner.factoryFor(`helper:${name}`);
+      owner.factoryFor<SimpleHelper | HelperInstance, HelperFactory<SimpleHelper | HelperInstance>>(
+        `helper:${name}`,
+        options
+      ) || owner.factoryFor(`helper:${name}`);
 
-    if (!isHelperFactory(factory)) {
+    if (factory === undefined || factory.class === undefined) {
       return null;
     }
 
-    return (args, vm) => {
-      const helper = factory.create();
-
-      if (isClassHelper(helper)) {
-        let helperDestroyable = {};
-
-        // Do this so that `destroy` gets called correctly
-        registerDestructor(helperDestroyable, () => helper.destroy(), true);
-        vm.associateDestroyable(helperDestroyable);
-      } else if (DEBUG) {
-        // Bind to null in case someone accidentally passed an unbound function
-        // in, and attempts use `this` on it.
-        //
-        // TODO: Update buildUntouchableThis to be flexible enough to provide a
-        // nice error message here.
-        helper.compute = helper.compute.bind(null);
-      }
+    const manager = getHelperManager(owner, factory.class);
 
-      return createHelperRef(helper, args.capture());
-    };
+    if (manager === undefined) {
+      return null;
+    }
+
+    assert(
+      'helper managers have not been enabled yet, you must use classic helpers',
+      EMBER_GLIMMER_HELPER_MANAGER ||
+        manager === CLASSIC_HELPER_MANAGER ||
+        manager === SIMPLE_CLASSIC_HELPER_MANAGER
+    );
+
+    // For classic class based helpers, we need to pass the factoryFor result itself rather
+    // than the raw value (`factoryFor(...).class`). This is because injections are already
+    // bound in the factoryFor result, including type-based injections
+    return customHelper(manager, CLASSIC_HELPER_MANAGER === manager ? factory : factory.class);
   }
 
   private _lookupPartial(name: string, meta: OwnedTemplateMeta): PartialDefinition {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index b89ea86ae07..8dfaf55a952 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -3,12 +3,14 @@ import { deprecate } from '@ember/debug';
 import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
 import { ManagerDelegate as ComponentManagerDelegate } from '../component-managers/custom';
 import InternalComponentManager from '../component-managers/internal';
+import { HelperManager } from '../helpers/custom';
 import { ModifierManagerDelegate } from '../modifiers/custom';
 
 type ManagerDelegate =
   | ComponentManagerDelegate<unknown>
   | InternalComponentManager
-  | ModifierManagerDelegate<unknown>;
+  | ModifierManagerDelegate<unknown>
+  | HelperManager;
 
 const COMPONENT_MANAGERS = new WeakMap<
   object,
@@ -17,6 +19,8 @@ const COMPONENT_MANAGERS = new WeakMap<
 
 const MODIFIER_MANAGERS = new WeakMap<object, ManagerFactory<ModifierManagerDelegate<unknown>>>();
 
+const HELPER_MANAGERS = new WeakMap<object, ManagerFactory<HelperManager<unknown>>>();
+
 const MANAGER_INSTANCES: WeakMap<Owner, WeakMap<ManagerFactory, unknown>> = new WeakMap();
 
 export type ManagerFactory<D extends ManagerDelegate = ManagerDelegate> = (owner: Owner) => D;
@@ -96,6 +100,26 @@ export function getModifierManager(
   return undefined;
 }
 
+export function setHelperManager(
+  factory: ManagerFactory<HelperManager<unknown>>,
+  definition: object
+) {
+  return setManager(HELPER_MANAGERS, factory, definition);
+}
+
+export function getHelperManager(
+  owner: Owner,
+  definition: object
+): HelperManager<unknown> | undefined {
+  const factory = getManager(HELPER_MANAGERS, definition);
+
+  if (factory !== undefined) {
+    return getManagerInstanceForOwner(owner, factory);
+  }
+
+  return undefined;
+}
+
 export function setComponentManager(
   stringOrFunction:
     | string
diff --git a/packages/@ember/-internals/glimmer/lib/utils/references.ts b/packages/@ember/-internals/glimmer/lib/utils/references.ts
deleted file mode 100644
index 8a9a7400f96..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/references.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { getDebugName } from '@ember/-internals/utils';
-import { debugFreeze } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import { CapturedArguments } from '@glimmer/interfaces';
-import { createComputeRef, Reference } from '@glimmer/reference';
-import { reifyArgs } from '@glimmer/runtime';
-import { consumeTag, deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
-import { HelperInstance, isClassHelper, RECOMPUTE_TAG, SimpleHelper } from '../helper';
-
-export function createHelperRef<T = unknown>(
-  helper: SimpleHelper<T> | HelperInstance<T>,
-  args: CapturedArguments
-): Reference<T> {
-  return createComputeRef(
-    () => {
-      let { positional, named } = reifyArgs(args);
-
-      let ret: T;
-
-      if (DEBUG) {
-        debugFreeze(positional);
-        debugFreeze(named);
-
-        deprecateMutationsInTrackingTransaction!(() => {
-          ret = helper.compute(positional, named);
-        });
-      } else {
-        ret = helper.compute(positional, named);
-      }
-
-      if (helper[RECOMPUTE_TAG]) {
-        consumeTag(helper[RECOMPUTE_TAG]);
-      }
-
-      return ret!;
-    },
-    null,
-    DEBUG && (isClassHelper(helper) ? getDebugName!(helper) : getDebugName!(helper.compute))
-  );
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
new file mode 100644
index 00000000000..2611cd87fcb
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -0,0 +1,294 @@
+import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import {
+  setHelperManager,
+  setModifierManager,
+  helperCapabilities,
+} from '@ember/-internals/glimmer';
+import { tracked, set } from '@ember/-internals/metal';
+import { setOwner } from '@ember/-internals/owner';
+import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
+import Service, { inject as service } from '@ember/service';
+import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { registerDestructor } from '@glimmer/runtime';
+
+class TestHelperManager {
+  capabilities = helperCapabilities('3.23', {
+    hasValue: true,
+    hasDestroyable: true,
+  });
+
+  constructor(owner) {
+    this.owner = owner;
+  }
+
+  createHelper(Helper, args) {
+    return new Helper(this.owner, args);
+  }
+
+  getValue(instance) {
+    return instance.value();
+  }
+
+  getDestroyable(instance) {
+    return instance;
+  }
+
+  getDebugName() {
+    return 'TEST_HELPER';
+  }
+}
+
+class TestHelper {
+  constructor(owner, args) {
+    setOwner(this, owner);
+    this.args = args;
+
+    registerDestructor(this, () => this.willDestroy());
+  }
+
+  willDestroy() {}
+}
+
+setHelperManager(owner => new TestHelperManager(owner), TestHelper);
+
+if (EMBER_GLIMMER_HELPER_MANAGER) {
+  moduleFor(
+    'Helpers test: helper managers',
+    class extends RenderingTestCase {
+      ['@test it works']() {
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            value() {
+              return 'hello';
+            }
+          }
+        );
+
+        this.render('{{hello}}');
+
+        this.assertText('hello');
+
+        runTask(() => this.rerender());
+
+        this.assertText('hello');
+      }
+
+      ['@test tracks changes to named arguments'](assert) {
+        let count = 0;
+
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            value() {
+              count++;
+              return this.args.named.foo;
+            }
+          }
+        );
+
+        this.render('{{hello foo=foo}}', {
+          foo: 123,
+        });
+
+        assert.equal(count, 1, 'rendered once');
+        this.assertText('123');
+
+        runTask(() => this.rerender());
+
+        assert.equal(count, 1, 'rendered once');
+        this.assertText('123');
+
+        runTask(() => set(this.context, 'foo', 456));
+
+        assert.equal(count, 2, 'rendered twice');
+        this.assertText('456');
+      }
+
+      ['@test tracks changes to positional arguments'](assert) {
+        let count = 0;
+
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            value() {
+              count++;
+              return this.args.positional[0];
+            }
+          }
+        );
+
+        this.render('{{hello foo}}', {
+          foo: 123,
+        });
+
+        assert.equal(count, 1, 'rendered once');
+        this.assertText('123');
+
+        runTask(() => this.rerender());
+
+        assert.equal(count, 1, 'rendered once');
+        this.assertText('123');
+
+        runTask(() => set(this.context, 'foo', 456));
+
+        assert.equal(count, 2, 'rendered twice');
+        this.assertText('456');
+      }
+
+      ['@test tracks changes to tracked properties'](assert) {
+        let count = 0;
+        let instance;
+
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            @tracked foo = 123;
+
+            constructor(...args) {
+              super(...args);
+              instance = this;
+            }
+
+            value() {
+              count++;
+              return this.foo;
+            }
+          }
+        );
+
+        this.render('{{hello}}');
+
+        assert.equal(count, 1, 'rendered once');
+        this.assertText('123');
+
+        runTask(() => this.rerender());
+
+        assert.equal(count, 1, 'rendered once');
+        this.assertText('123');
+
+        runTask(() => (instance.foo = 456));
+
+        assert.equal(count, 2, 'rendered twice');
+        this.assertText('456');
+      }
+
+      ['@test services can be injected']() {
+        this.registerService(
+          'hello',
+          Service.extend({
+            value: 'hello',
+          })
+        );
+
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            @service hello;
+
+            value() {
+              return this.hello.value;
+            }
+          }
+        );
+
+        this.render('{{hello}}');
+
+        this.assertText('hello');
+      }
+
+      ['@test destroyable is associated correctly'](assert) {
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            value() {
+              return 'hello';
+            }
+
+            willDestroy() {
+              assert.ok(true, 'destructor called');
+            }
+          }
+        );
+
+        this.render('{{hello}}');
+
+        this.assertText('hello');
+      }
+
+      ['@test debug name is used for backtracking message']() {
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            @tracked foo = 123;
+
+            value() {
+              this.foo;
+              this.foo = 456;
+            }
+          }
+        );
+
+        let expectedMessage = backtrackingMessageFor('foo', '.*', {
+          renderTree: ['\\(result of a `TEST_HELPER` helper\\)'],
+        });
+
+        expectAssertion(() => {
+          this.render('{{hello}}');
+        }, expectedMessage);
+      }
+
+      ['@test asserts against using both `hasValue` and `hasScheduledEffect`']() {
+        expectAssertion(() => {
+          helperCapabilities('3.23', {
+            hasValue: true,
+            hasScheduledEffect: true,
+          });
+        }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
+      }
+
+      ['@test asserts requiring either `hasValue` or `hasScheduledEffect`']() {
+        expectAssertion(() => {
+          helperCapabilities('3.23', {});
+        }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
+      }
+
+      ['@test asserts against using `hasScheduledEffect`']() {
+        expectAssertion(() => {
+          helperCapabilities('3.23', {
+            hasScheduledEffect: true,
+          });
+        }, /The `hasScheduledEffect` capability has not yet been implemented for helper managers. Please pass `hasValue` instead/);
+      }
+
+      ['@test asserts against using incorrect version for capabilities']() {
+        expectAssertion(() => {
+          helperCapabilities('aoeu', {
+            hasScheduledEffect: true,
+          });
+        }, /Invalid helper manager compatibility specified/);
+      }
+
+      ['@test helper manager and modifier manager can be associated with the same value']() {
+        setModifierManager(() => ({}), TestHelper);
+
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            value() {
+              return 'hello';
+            }
+          }
+        );
+
+        this.render('{{hello}}');
+
+        this.assertText('hello');
+
+        runTask(() => this.rerender());
+
+        this.assertText('hello');
+      }
+    }
+  );
+}
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 88e0837c402..595761d2948 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -21,6 +21,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_IN_ELEMENT: true,
   EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: true,
+  EMBER_GLIMMER_HELPER_MANAGER: null,
 };
 
 /**
@@ -79,3 +80,4 @@ export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL
 export const EMBER_GLIMMER_IN_ELEMENT = featureValue(FEATURES.EMBER_GLIMMER_IN_ELEMENT);
 export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
 export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
+export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index ab3397d6e51..a9b8f12898a 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -10,6 +10,7 @@ import * as metal from '@ember/-internals/metal';
 import {
   FEATURES,
   isEnabled,
+  EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
   EMBER_CACHE_API,
   EMBER_DESTROYABLES,
@@ -103,11 +104,13 @@ import {
   Checkbox,
   Component,
   setComponentManager,
+  setHelperManager,
   capabilities,
   escapeExpression,
   getTemplates,
   Helper,
   helper,
+  helperCapabilities,
   htmlSafe,
   isHTMLSafe,
   LinkComponent,
@@ -562,6 +565,10 @@ if (EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
   Ember._setComponentTemplate = setComponentTemplate;
   Ember._templateOnlyComponent = templateOnlyComponent;
 }
+if (EMBER_GLIMMER_HELPER_MANAGER) {
+  Ember._helperManagerCapabilities = helperCapabilities;
+  Ember._setHelperManager = setHelperManager;
+}
 Ember._captureRenderTree = captureRenderTree;
 Ember.Handlebars = {
   template,
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index efd08df6407..12851c61600 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,5 +1,9 @@
 import Ember from '../index';
-import { FEATURES, EMBER_GLIMMER_SET_COMPONENT_TEMPLATE } from '@ember/canary-features';
+import {
+  FEATURES,
+  EMBER_GLIMMER_HELPER_MANAGER,
+  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
+} from '@ember/canary-features';
 import { confirmExport } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
@@ -226,6 +230,12 @@ let allExports = [
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
     ? ['_templateOnlyComponent', '@ember/component/template-only', 'default']
     : null,
+  EMBER_GLIMMER_HELPER_MANAGER
+    ? ['_setHelperManager', '@ember/-internals/glimmer', 'setHelperManager']
+    : null,
+  EMBER_GLIMMER_HELPER_MANAGER
+    ? ['_helperManagerCapabilities', '@ember/-internals/glimmer', 'helperCapabilities']
+    : null,
   ['_captureRenderTree', '@ember/debug', 'captureRenderTree'],
 
   // @ember/-internals/runtime
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.js
index ab152b5e70c..2be75933b24 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.js
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.js
@@ -147,6 +147,10 @@ export default class RenderingTestCase extends AbstractTestCase {
     }
   }
 
+  registerCustomHelper(name, definition) {
+    this.owner.register(`helper:${name}`, definition);
+  }
+
   registerPartial(name, template) {
     let owner = this.owner;
     if (typeof template === 'string') {

From 098b0d92f4969e656a14afd2c6f8014037a8b6f0 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 24 Sep 2020 13:55:29 -0700
Subject: [PATCH 0128/1405] [BUGFIX] Update Glimmer VM to 0.62.1

---
 broccoli/packages.js |  29 +-----
 package.json         |  18 ++--
 yarn.lock            | 219 ++++++++++++++++++++++---------------------
 3 files changed, 126 insertions(+), 140 deletions(-)

diff --git a/broccoli/packages.js b/broccoli/packages.js
index 543de0ecd77..e8d97866e0a 100644
--- a/broccoli/packages.js
+++ b/broccoli/packages.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { readFileSync, existsSync } = require('fs');
+const { existsSync } = require('fs');
 const path = require('path');
 const Rollup = require('broccoli-rollup');
 const Funnel = require('broccoli-funnel');
@@ -118,38 +118,19 @@ module.exports.getPackagesES = function getPackagesES() {
 };
 
 module.exports.handlebarsES = function _handlebars() {
-  return new Rollup(findLib('handlebars', 'lib'), {
-    annotation: 'handlebars',
+  return new Rollup(findLib('@handlebars/parser', 'dist/esm'), {
+    annotation: '@handlebars/parser',
     rollup: {
-      input: 'handlebars/compiler/base.js',
+      input: 'index.js',
       output: {
-        file: 'handlebars.js',
+        file: '@handlebars/parser/index.js',
         format: 'es',
         exports: 'named',
       },
-      plugins: [handlebarsFix()],
     },
   });
 };
 
-function handlebarsFix() {
-  let HANDLEBARS_PARSER = /[/\\]parser.js$/;
-  return {
-    load: function(id) {
-      if (HANDLEBARS_PARSER.test(id)) {
-        let code = readFileSync(id, 'utf8');
-        return {
-          code: code
-            .replace('exports.__esModule = true;', '')
-            .replace("exports['default'] = handlebars;", 'export default handlebars;'),
-
-          map: { mappings: null },
-        };
-      }
-    },
-  };
-}
-
 module.exports.rsvpES = function _rsvpES() {
   let lib = path.resolve(path.dirname(require.resolve('rsvp')), '../lib');
   return new Rollup(lib, {
diff --git a/package.json b/package.json
index a7f431bbac5..98859dae332 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "^0.61.2",
+    "@glimmer/compiler": "0.62.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "^0.61.2",
-    "@glimmer/interfaces": "^0.61.2",
-    "@glimmer/node": "^0.61.2",
-    "@glimmer/opcode-compiler": "^0.61.2",
-    "@glimmer/program": "^0.61.2",
-    "@glimmer/reference": "^0.61.2",
-    "@glimmer/runtime": "^0.61.2",
-    "@glimmer/validator": "^0.61.2",
+    "@glimmer/global-context": "0.62.1",
+    "@glimmer/interfaces": "0.62.1",
+    "@glimmer/node": "0.62.1",
+    "@glimmer/opcode-compiler": "0.62.1",
+    "@glimmer/program": "0.62.1",
+    "@glimmer/reference": "0.62.1",
+    "@glimmer/runtime": "0.62.1",
+    "@glimmer/validator": "0.62.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 271a04e105a..665459bac2a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,152 +913,157 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@glimmer/compiler@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.61.2.tgz#76c1334d318955ae16ca61c3110ae4e0e9fd0935"
-  integrity sha512-+WrDbTKeOFsoxn1wLHmDt22IAEr7u/dqfc2V9kTH8CzB+f7HHtO++jmctoxD+arHx/lTJtZHITXFZNFqLmU6hw==
-  dependencies:
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/syntax" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
-    "@glimmer/wire-format" "^0.61.2"
+"@glimmer/compiler@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.62.1.tgz#4b80f1cd55d39858e602080de03db6febf5b9303"
+  integrity sha512-s709URSvV3IzSmyyKd1t2twlxcjM7OZgh+pmehwjEEVXSm6nDrAtJcBw8OBPw0AL6TnArf5xHTHtH4EJJ8fyAg==
+  dependencies:
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/syntax" "0.62.1"
+    "@glimmer/util" "0.62.1"
+    "@glimmer/wire-format" "0.62.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.61.2.tgz#d160d867dc44c808740d0ff119f5070fb3694094"
-  integrity sha512-AbxpNdfkPbPvQGNTwuYqrnZvBHEYx/ruBnUC04rMG7Z2GDrPgNyToEtuhRPcRoRBOuOsU7tAjG+U7Xz/f89BZw==
+"@glimmer/encoder@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.62.1.tgz#75baeef7b923515ccfee778d99b1c61a5541050a"
+  integrity sha512-zlGhEYhWP+DSHumbJqckgUhFzhScze6D5ys69A3iJrmiDOYSs2uaRvonAKl7aQS4FGoUhelWfQT0xvWxD/u5OQ==
   dependencies:
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/vm" "^0.61.2"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/vm" "0.62.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.61.2", "@glimmer/global-context@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.61.2.tgz#d455827850c5b1f3eacae150defbfeea9f2f9342"
-  integrity sha512-rqNb2JAkDtakYI5y5wOEYmQym67woIA7KYbifB9/mL9N1xZXvc87XK/lO60+7U8IdX/guevnkw0N+Fkjkr+UOQ==
+"@glimmer/global-context@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.62.1.tgz#41f6a130a235361cdb853ba6da276d4b84fd0fee"
+  integrity sha512-ZqLPa6KZitYbvlQCE9oyy6h7MTEwV0MqPgtrlb2nAKDZ8lZ90pzVvVNEmXpr6lkajEggISCt3GDsl8W/2IiBeQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.61.2.tgz#c8760d9aab6469d4a3bde923f129fb86a3b70262"
-  integrity sha512-i4qTGFKXWD1Bjr3V6HVxTRWj8DzAhXQ0W0pvsymDRY/r386crH11sTclp8ZFyEiybA8JBlsUvadX8lUD7Oc0TA==
+"@glimmer/interfaces@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.1.tgz#42e4021569a00ca60d469ef06cc0c719883d109e"
+  integrity sha512-Ui4u/0G0zOYeDuz497DQ/isOgd43r6zNO0JdsDeVw1D/tYQQHR1Xk/1YRKC9jK2n5oicMYKVyEeT62Ec2rL/Jg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.61.2.tgz#1d03de3341d73648abaf56a55f9a11c1bf8d6649"
-  integrity sha512-XYIOUgWqCSld43xzZgy4Mi2XN1r6xrL14VFbH4Eh3LwuT0avMqB6lJCeT3Xt4ROO1lDmVAuJIL4/eniBcErc0g==
+"@glimmer/low-level@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.62.1.tgz#0fd0870d1ec97d6a81e29ac66ed69e2e17f3094a"
+  integrity sha512-sMNcGWdfgthq0DWHqawMJXoXuhtlA0dY3Y63HyMe5aB94JXw/0SujKdysjG5ImqgRxADcPj39EjS9aJO5AfW2A==
 
-"@glimmer/node@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.61.2.tgz#82f3f550b0dbb3a8628db3acffa6349a9a12aa6e"
-  integrity sha512-mkwfHjDcRzyQhyngqx8fVCT1VpPPWamnKEiDtnWLS/Ay9Or5ApK+cflmvWUaoIBrpLxhGoxBGI0j8lSECQDy/w==
+"@glimmer/node@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.62.1.tgz#48ecee29f596f833d7dc50a27abb83db8a31a711"
+  integrity sha512-gUaQJ950x3BSMKR/PPRD7P+dycqdrYd1gWBTvXDNuAHantH6lLofkGEJmeeDHq+nw8B/CXkD9uqn7H94jiOttg==
   dependencies:
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/runtime" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/runtime" "0.62.1"
+    "@glimmer/util" "0.62.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.61.2.tgz#424d01f99c7863bece55061abce7f297589fb175"
-  integrity sha512-XUALj/8PqEbStGSoYZ9jfli1BPKO55nUdPo5jpMEPPmRb/Ai6PZi2Q8Ih3RBOYQAIGOnlfLa4R8jUB+oz2lh2Q==
-  dependencies:
-    "@glimmer/encoder" "^0.61.2"
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/program" "^0.61.2"
-    "@glimmer/reference" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
-    "@glimmer/vm" "^0.61.2"
-    "@glimmer/wire-format" "^0.61.2"
-
-"@glimmer/program@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.61.2.tgz#0e23fd9483117b1dccb594944c4c65744b5e82b6"
-  integrity sha512-nxVhZudrJBtBETCSG7DLy41daO3b2pckQ/jNcYzX8jrqe3hgr1eFo+xEr6s9jiceakDY51DXDtAmXwJbo04ZAg==
-  dependencies:
-    "@glimmer/encoder" "^0.61.2"
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
-
-"@glimmer/reference@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.61.2.tgz#991f1f19bedf474af55ed42faebd526542a8d941"
-  integrity sha512-e1SZpao8ht2OYaWr1Q2vcNMqO6/g4usZmj3SzUCgHbXeB/u+VCPiHEl9S3WZXwQwMWTGzxphkB2Q1MaUagR1Cg==
+"@glimmer/opcode-compiler@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.62.1.tgz#86596ed10df791887de1f9d43d1e5bcead5878ec"
+  integrity sha512-OJ9kyBwFiPyxu8hNaHHadNlG7ujEu9SLwSJD+5p3lYO3aIbCr0XkQaPmYSgsXiTxtWU9lDLuUVowirHMk/0ZfQ==
+  dependencies:
+    "@glimmer/encoder" "0.62.1"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/program" "0.62.1"
+    "@glimmer/reference" "0.62.1"
+    "@glimmer/util" "0.62.1"
+    "@glimmer/vm" "0.62.1"
+    "@glimmer/wire-format" "0.62.1"
+
+"@glimmer/program@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.62.1.tgz#8ad8ccdf0ae68b74c349314734b6fb127730da5e"
+  integrity sha512-0gGN2hJWMFFby6PKsCvVA+Yp2fjqR1sjATR3dgZfi8VVxF+VQbMVVLA52o3xuyNzSsVL6GahX6t+RwksR9TXKQ==
+  dependencies:
+    "@glimmer/encoder" "0.62.1"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/util" "0.62.1"
+
+"@glimmer/reference@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.1.tgz#b4f2263634459673d3c839da04d47202deffb189"
+  integrity sha512-/bud6PB6yw89m9Vyg2CGwk5cwjYjRoA0ZJG3k5WDpLXXF/sHrMxdJFVtVcnmonKRuPzpduypvWzBDAxVdq7w0A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "^0.61.2"
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
-    "@glimmer/validator" "^0.61.2"
+    "@glimmer/global-context" "0.62.1"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/util" "0.62.1"
+    "@glimmer/validator" "0.62.1"
 
-"@glimmer/runtime@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.61.2.tgz#a7d525cde6a16ee0821f8e77c123a056d9f53cd1"
-  integrity sha512-1C/tODub6Hy/oAj7bU+RoOaLzJJkMkYQUc1KPOCGxb49kRe/RgN2mAPuM4BvZI00JReD/NXXBRAXVA0R/dUsXg==
+"@glimmer/runtime@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.62.1.tgz#b172f4315cfec831b380f7814c73021d78789501"
+  integrity sha512-yrpK1Hvj1GdiVHNyVcN12c/WMqxercdYMMn2ZEiaX9Oc+OcY7ojUK2gkOEoqPx905T8+q27yIc8Xs+89jKAVeg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.61.2"
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/low-level" "^0.61.2"
-    "@glimmer/program" "^0.61.2"
-    "@glimmer/reference" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
-    "@glimmer/validator" "^0.61.2"
-    "@glimmer/vm" "^0.61.2"
-    "@glimmer/wire-format" "^0.61.2"
+    "@glimmer/global-context" "0.62.1"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/low-level" "0.62.1"
+    "@glimmer/program" "0.62.1"
+    "@glimmer/reference" "0.62.1"
+    "@glimmer/util" "0.62.1"
+    "@glimmer/validator" "0.62.1"
+    "@glimmer/vm" "0.62.1"
+    "@glimmer/wire-format" "0.62.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.61.2.tgz#a8c381872354ebf441e23cfd6fd27caacdb5356b"
-  integrity sha512-YiXP/saSy/JWVf6AiSWWZemCnYn6z9b4mAifqdba2D/3wrH5TScEiS01mDLlGi2HNhCXffcWf9aOAkEUbnOtFw==
+"@glimmer/syntax@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.1.tgz#60f0b14c8503f059b9b73065a2d86f9ca6c6e3f3"
+  integrity sha512-pjnPouu3tVJ5sDcpYCv9hyodJW6T07LvOjsGQ+QT5TdMqN4hoc4iK3dkdrRh+dkNcUsBxFQhxOtAbwOVSgtVtg==
   dependencies:
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
-    handlebars "^4.7.4"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/util" "0.62.1"
+    "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.9"
 
-"@glimmer/util@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.61.2.tgz#c1d7ccfdd38f97c828e218c6d8e237c0c96ff724"
-  integrity sha512-xel7wbNldpHzDOmC4GJ1je4UnSmehy5MGzPp/rEON9OcSggCrl2v8cEP413TMfyRGDQJ5Houkr0R4zpvs8aqOg==
+"@glimmer/util@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.1.tgz#44221aca6a8bb06791b0057db9b1d72330c08094"
+  integrity sha512-e6YTDAgEh8fqarhyN+0ncXOixLn5Wt12/IWdwKmtGIhdALOc/lWbJfrxlmKD+kkFTTjUVJUKm1Y6pxUyXOo4Ww==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "^0.61.2"
+    "@glimmer/interfaces" "0.62.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.61.2.tgz#deeb324a767c776b55d5b2ba14700b881a16dd7e"
-  integrity sha512-gNZ+XFeP8fFAyqRr3kHXdRVaGTpfCTUfDOeo6mgsQXgoJl7wGV2pjMZVh9fImozUKCLzjLNd9Xtu11hcmwSHNg==
+"@glimmer/validator@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.1.tgz#30240a5d7bb574b833fdb39e90202dbbdde9886c"
+  integrity sha512-pewpCA8oh4ONnflgHDhuMYkS4D0sdkxrc9iNwf+LMweGGSszAa34hoiC4noLKdYPGx+oRwi/JXwUPf93cvj2+g==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.61.2"
+    "@glimmer/global-context" "0.62.1"
 
-"@glimmer/vm@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.61.2.tgz#d9ddc7d8c4a7801e4d90a445eb7d7d6577676cc8"
-  integrity sha512-sak45jpV5hNRGSAq1dmvXfyAjF6MTMtrd8rD8UE7CCfSnnIXn2nUwbqkimHoxi9HvbdPzy1fK5pecpJYiG4htA==
+"@glimmer/vm@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.62.1.tgz#418242bfcac4570872543a2a5c5c7fcdab33a690"
+  integrity sha512-W1bYb47jHmJYQIlvEtnrAUWZjbhH+CL83jiIoWBELhOAbiHUUdcmtjZlO3sweCHDsLz+9FQlTWOJuBoOCMRdZg==
   dependencies:
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/util" "0.62.1"
 
-"@glimmer/wire-format@^0.61.2":
-  version "0.61.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.61.2.tgz#2c8a09d75ee77a7923e4c09222f1004a3c2d4ef8"
-  integrity sha512-HDy/3Vm1Lu2KQLMsKri6v0xSIxetqrGs+DK+XhECRaZicW2Y6LZE1+mDiTly9axO38jMHsNlnLtAryiQB3aM4Q==
+"@glimmer/wire-format@0.62.1":
+  version "0.62.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.62.1.tgz#4b210a6746dd2430e891e4ce4e2c9a743d703bd7"
+  integrity sha512-oLmIosr7RNk6BrZvOKj/NhkZ4/rWqYiQ/nGqzZzwvLY7HZlWmzDcpVsOJtIGOKFO33zHgkEBRtfXDo1+CmmSWQ==
   dependencies:
-    "@glimmer/interfaces" "^0.61.2"
-    "@glimmer/util" "^0.61.2"
+    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/util" "0.62.1"
+
+"@handlebars/parser@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
+  integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -4990,7 +4995,7 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.7.4:
+handlebars@^4.0.11, handlebars@^4.0.4:
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
   integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==

From 1acd6d2c24a55b1376e8d46472d1a3c83b637004 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 29 Sep 2020 18:59:05 -0400
Subject: [PATCH 0129/1405] [BUGFIX beta] Make modifier manager 3.22 accept the
 resolved value directly.

When using `modifierCapabilities('3.13')` (the only allowed value in all
released Ember versions) you receive the result of `owner.factoryFor`
directly. If you want the raw value, you have to grab it off of the
first argument to `createModifier` like:

```js
class CustomModifierManager {
  capabilities = modifierCapabilities('3.13');

  constructor(owner) {
    this.owner = owner;
  }

  createModifier(factory, args) {
    let Modifier = factory.class;
    return new Modifier(owner, args)
  }

  // ...snip...
}
```

In order to align the modifier world with the way helpers and component
managers work, this commit changes to passing the
`owner.factoryFor(...).class` directly to `createModifier` instead.

So the above snippet would be rewritten to:

```js
class CustomModifierManager {
  capabilities = modifierCapabilities('3.22');

  constructor(owner) {
    this.owner = owner;
  }

  createModifier(Modifier, args) {
    return new Modifier(owner, args)
  }

  // ...snip...
}
```
---
 .../glimmer/lib/modifiers/custom.ts           |  10 +-
 .../custom-modifier-manager-test.js           | 159 +++++++++++++++---
 2 files changed, 140 insertions(+), 29 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index f677d581525..3dda936be71 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -18,6 +18,7 @@ export interface OptionalCapabilities {
     disableAutoTracking?: boolean;
   };
 
+  // passes factoryFor(...).class to `.createModifier`
   // uses args proxy, does not provide a way to opt-out
   '3.22': {
     disableAutoTracking?: boolean;
@@ -27,6 +28,7 @@ export interface OptionalCapabilities {
 export interface Capabilities {
   disableAutoTracking: boolean;
   useArgsProxy: boolean;
+  passFactoryToCreate: boolean;
 }
 
 export function capabilities<Version extends keyof OptionalCapabilities>(
@@ -41,6 +43,7 @@ export function capabilities<Version extends keyof OptionalCapabilities>(
   return {
     disableAutoTracking: Boolean(optionalFeatures.disableAutoTracking),
     useArgsProxy: managerAPI === '3.13' ? false : true,
+    passFactoryToCreate: managerAPI === '3.13',
   };
 }
 
@@ -126,10 +129,13 @@ class InteractiveCustomModifierManager<ModifierInstance>
       typeof delegate.capabilities === 'object' && delegate.capabilities !== null
     );
 
-    let useArgsProxy = delegate.capabilities.useArgsProxy;
+    let { useArgsProxy, passFactoryToCreate } = delegate.capabilities;
 
     let args = useArgsProxy ? argsProxyFor(capturedArgs, 'modifier') : reifyArgs(capturedArgs);
-    let instance = delegate.createModifier(ModifierClass, args);
+    let instance = delegate.createModifier(
+      passFactoryToCreate ? ModifierClass : ModifierClass.class,
+      args
+    );
 
     let tag = createUpdatableTag();
     let state: CustomModifierState<ModifierInstance>;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 3565fdc6f51..bd47728d4f4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -5,30 +5,6 @@ import { setModifierManager, modifierCapabilities } from '@ember/-internals/glim
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../utils/backtracking-rerender';
 
-class CustomModifierManager {
-  constructor(owner) {
-    this.owner = owner;
-  }
-
-  createModifier(factory, args) {
-    return factory.create(args);
-  }
-
-  installModifier(instance, element, args) {
-    instance.element = element;
-    let { positional, named } = args;
-    instance.didInsertElement(positional, named);
-  }
-
-  updateModifier(instance, args) {
-    let { positional, named } = args;
-    instance.didUpdate(positional, named);
-  }
-
-  destroyModifier(instance) {
-    instance.willDestroyElement();
-  }
-}
 class ModifierManagerTest extends RenderingTestCase {
   '@test throws a useful error when missing capabilities'() {
     this.registerModifier(
@@ -295,8 +271,32 @@ class ModifierManagerTest extends RenderingTestCase {
 moduleFor(
   'Basic Custom Modifier Manager: 3.13',
   class extends ModifierManagerTest {
-    CustomModifierManager = class extends CustomModifierManager {
+    CustomModifierManager = class CustomModifierManager {
       capabilities = modifierCapabilities('3.13');
+
+      constructor(owner) {
+        this.owner = owner;
+      }
+
+      createModifier(factory, args) {
+        // factory is the owner.factoryFor result
+        return factory.create(args);
+      }
+
+      installModifier(instance, element, args) {
+        instance.element = element;
+        let { positional, named } = args;
+        instance.didInsertElement(positional, named);
+      }
+
+      updateModifier(instance, args) {
+        let { positional, named } = args;
+        instance.didUpdate(positional, named);
+      }
+
+      destroyModifier(instance) {
+        instance.willDestroyElement();
+      }
     };
 
     '@test modifers consume all arguments'(assert) {
@@ -355,8 +355,31 @@ moduleFor(
 moduleFor(
   'Basic Custom Modifier Manager: 3.22',
   class extends ModifierManagerTest {
-    CustomModifierManager = class extends CustomModifierManager {
+    CustomModifierManager = class CustomModifierManager {
       capabilities = modifierCapabilities('3.22');
+
+      constructor(owner) {
+        this.owner = owner;
+      }
+
+      createModifier(Modifier, args) {
+        return Modifier.create(args);
+      }
+
+      installModifier(instance, element, args) {
+        instance.element = element;
+        let { positional, named } = args;
+        instance.didInsertElement(positional, named);
+      }
+
+      updateModifier(instance, args) {
+        let { positional, named } = args;
+        instance.didUpdate(positional, named);
+      }
+
+      destroyModifier(instance) {
+        instance.willDestroyElement();
+      }
     };
 
     '@test modifers only track positional arguments they consume'(assert) {
@@ -475,7 +498,89 @@ moduleFor(
       return { isInteractive: false };
     }
 
-    [`@test doesn't trigger lifecycle hooks when non-interactive`](assert) {
+    [`@test doesn't trigger lifecycle hooks when non-interactive: modifierCapabilities('3.13')`](
+      assert
+    ) {
+      class CustomModifierManager {
+        capabilities = modifierCapabilities('3.13');
+
+        constructor(owner) {
+          this.owner = owner;
+        }
+
+        createModifier(factory, args) {
+          return factory.create(args);
+        }
+
+        installModifier(instance, element, args) {
+          instance.element = element;
+          let { positional, named } = args;
+          instance.didInsertElement(positional, named);
+        }
+
+        updateModifier(instance, args) {
+          let { positional, named } = args;
+          instance.didUpdate(positional, named);
+        }
+
+        destroyModifier(instance) {
+          instance.willDestroyElement();
+        }
+      }
+      let ModifierClass = setModifierManager(
+        owner => {
+          return new CustomModifierManager(owner);
+        },
+        EmberObject.extend({
+          didInsertElement() {
+            assert.ok(false);
+          },
+          didUpdate() {
+            assert.ok(false);
+          },
+          willDestroyElement() {
+            assert.ok(false);
+          },
+        })
+      );
+
+      this.registerModifier('foo-bar', ModifierClass);
+
+      this.render('<h1 {{foo-bar baz}}>hello world</h1>');
+      runTask(() => this.context.set('baz', 'Hello'));
+
+      this.assertHTML('<h1>hello world</h1>');
+    }
+
+    [`@test doesn't trigger lifecycle hooks when non-interactive: modifierCapabilities('3.22')`](
+      assert
+    ) {
+      class CustomModifierManager {
+        capabilities = modifierCapabilities('3.22');
+
+        constructor(owner) {
+          this.owner = owner;
+        }
+
+        createModifier(Modifier, args) {
+          return Modifier.create(args);
+        }
+
+        installModifier(instance, element, args) {
+          instance.element = element;
+          let { positional, named } = args;
+          instance.didInsertElement(positional, named);
+        }
+
+        updateModifier(instance, args) {
+          let { positional, named } = args;
+          instance.didUpdate(positional, named);
+        }
+
+        destroyModifier(instance) {
+          instance.willDestroyElement();
+        }
+      }
       let ModifierClass = setModifierManager(
         owner => {
           return new CustomModifierManager(owner);

From 817a904bb83e6bfdd06461cee83849483ea4c83c Mon Sep 17 00:00:00 2001
From: Jonathan Haines <jonno.haines@gmail.com>
Date: Wed, 30 Sep 2020 09:42:04 +1000
Subject: [PATCH 0130/1405] Upgrade to prettier 2

---
 .eslintrc.js |  10 +++--
 package.json |   2 +-
 yarn.lock    | 109 +++++++++++++++++++++++++++------------------------
 3 files changed, 66 insertions(+), 55 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 6092bc3b36f..d2d4f05ccc6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,13 +5,12 @@ module.exports = {
   parser: 'babel-eslint',
   extends: [
     'eslint:recommended',
-    'prettier',
     'plugin:import/errors',
     'plugin:qunit/recommended',
+    'plugin:prettier/recommended',
   ],
   plugins: [
     'ember-internal',
-    'prettier',
     'import',
     'qunit',
     'disable-features',
@@ -22,7 +21,6 @@ module.exports = {
     'no-unused-vars': 'error',
     'no-throw-literal': 'error',
     'no-var': 'error',
-    'prettier/prettier': 'error',
     'qunit/no-commented-tests': 'off',
     'qunit/require-expect': 'off',
     'disable-features/disable-async-await': 'error',
@@ -55,6 +53,9 @@ module.exports = {
       files: [ '**/*.ts' ],
 
       parser: '@typescript-eslint/parser',
+      extends: [
+        'prettier/@typescript-eslint'
+      ],
 
       parserOptions: {
         sourceType: 'module',
@@ -71,6 +72,8 @@ module.exports = {
         'no-redeclare': 'off',
 
         'import/export': 'off',
+        // TODO: Remove with typescript 3.8
+        // Use `import type` instead
         'import/named': 'off',
         'import/no-unresolved': 'off',
       }
@@ -131,6 +134,7 @@ module.exports = {
     {
       // matches all node-land files
       files: [
+        '.eslintrc.js',
         'node-tests/**/*.js',
         'tests/node/**/*.js',
         'blueprints/**/*.js',
diff --git a/package.json b/package.json
index 98859dae332..e7ecf58d58d 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
     "mocha": "^7.1.2",
-    "prettier": "^1.19.1",
+    "prettier": "^2.1.2",
     "puppeteer": "^3.0.4",
     "qunit": "^2.10.0",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 665459bac2a..11f4d9e5102 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1288,9 +1288,9 @@ acorn@^5.0.0, acorn@^5.5.3:
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
 acorn@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
-  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
+  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
 
 after@0.8.2:
   version "0.8.2"
@@ -2733,14 +2733,6 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chalk@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
@@ -2749,6 +2741,14 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2860,6 +2860,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3987,11 +3992,11 @@ eslint-plugin-qunit@^4.0.0:
   integrity sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ==
 
 eslint-scope@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
-  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
 eslint-utils@^1.4.3:
@@ -4086,25 +4091,29 @@ esprima@~3.0.0:
   integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
 
 esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
   dependencies:
-    estraverse "^4.0.0"
+    estraverse "^5.1.0"
 
-esrecurse@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
-  integrity sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
-    estraverse "^4.1.0"
-    object-assign "^4.0.1"
+    estraverse "^5.2.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
   integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
 
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 estree-walker@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
@@ -5375,20 +5384,20 @@ inquirer@^6:
     through "^2.3.6"
 
 inquirer@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
-  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
+  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^3.0.0"
+    chalk "^4.1.0"
     cli-cursor "^3.1.0"
-    cli-width "^2.0.0"
+    cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
-    lodash "^4.17.15"
+    lodash "^4.17.19"
     mute-stream "0.0.8"
     run-async "^2.4.0"
-    rxjs "^6.5.3"
+    rxjs "^6.6.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
@@ -6384,7 +6393,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -6998,7 +7007,7 @@ oauth-sign@~0.3.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz#cb540f93bb2b22a7d5941691a288d60e8ea9386e"
   integrity sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=
 
-object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@4.1.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -7470,10 +7479,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-  integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
+prettier@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
+  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
 
 pretty-ms@^3.1.0:
   version "3.1.0"
@@ -8146,11 +8155,9 @@ run-async@^2.2.0:
     is-promise "^2.1.0"
 
 run-async@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8"
-  integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==
-  dependencies:
-    is-promise "^2.1.0"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
   version "1.1.9"
@@ -8164,10 +8171,10 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.5.3:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
-  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+rxjs@^6.6.0:
+  version "6.6.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
+  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -8787,9 +8794,9 @@ strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
 strip-json-comments@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
-  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 styled_string@0.0.1:
   version "0.0.1"

From 8e3a18a026d599b3a7aee17e0750f5c8db5aaede Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 30 Sep 2020 08:56:34 -0400
Subject: [PATCH 0131/1405] eslint . --ext=js,ts --fix

---
 bin/build-for-publishing.js                   |   2 +-
 bin/changelog.js                              |   8 +-
 bin/feature-flag-yuidoc-filter.js             |   2 +-
 bin/publish_to_s3.js                          |   2 +-
 bin/run-browserstack-tests.js                 |   2 +-
 bin/run-tests-injection.js                    |  10 +-
 bin/run-tests.js                              |  14 +-
 bin/yarn-link-glimmer.js                      |   4 +-
 bin/yarn-unlink-glimmer.js                    |   4 +-
 blueprints/-addon-import.js                   |  10 +-
 blueprints/acceptance-test/index.js           |   2 +-
 blueprints/component-addon/index.js           |  16 +-
 blueprints/component-class-addon/index.js     |  12 +-
 blueprints/component-class/index.js           |   2 +-
 blueprints/component-test/index.js            |  16 +-
 blueprints/component/index.js                 |   6 +-
 blueprints/controller-test/index.js           |   4 +-
 blueprints/controller/index.js                |   2 +-
 blueprints/edition-detector.js                |   4 +-
 blueprints/helper-test/index.js               |   8 +-
 blueprints/helper/index.js                    |   2 +-
 blueprints/initializer-test/index.js          |   4 +-
 blueprints/instance-initializer-test/index.js |   4 +-
 blueprints/mixin-test/index.js                |   2 +-
 blueprints/mixin/index.js                     |   2 +-
 blueprints/route-addon/index.js               |  16 +-
 blueprints/route-test/index.js                |   8 +-
 blueprints/route/index.js                     |  14 +-
 blueprints/service/index.js                   |   2 +-
 blueprints/template/index.js                  |   2 +-
 blueprints/test-framework-detector.js         |   6 +-
 blueprints/util-test/index.js                 |   2 +-
 blueprints/util/index.js                      |   2 +-
 broccoli/babel-helpers.js                     |   2 +-
 broccoli/deprecated-features.js               |   4 +-
 broccoli/glimmer-template-compiler.js         |   4 +-
 broccoli/package-json-writer.js               |  12 +-
 broccoli/transforms/inject-node-globals.js    |   2 +-
 d8-app.js                                     |  14 +-
 d8-runner.js                                  |   4 +-
 ember-cli-build.js                            |   4 +-
 lib/index.js                                  |   8 +-
 lib/transforms/inject-babel-helpers.js        |   4 +-
 node-tests/blueprints/acceptance-test-test.js |  62 +--
 node-tests/blueprints/component-addon-test.js |  14 +-
 .../blueprints/component-class-addon-test.js  |  14 +-
 node-tests/blueprints/component-class-test.js | 314 ++++++-------
 node-tests/blueprints/component-test-test.js  | 112 ++---
 node-tests/blueprints/component-test.js       | 412 +++++++++---------
 node-tests/blueprints/controller-test-test.js |  78 ++--
 node-tests/blueprints/controller-test.js      | 169 +++----
 node-tests/blueprints/helper-addon-test.js    |  14 +-
 node-tests/blueprints/helper-test-test.js     |  74 ++--
 node-tests/blueprints/helper-test.js          |  93 ++--
 .../blueprints/initializer-addon-test.js      |  14 +-
 .../blueprints/initializer-test-test.js       |  50 +--
 node-tests/blueprints/initializer-test.js     |  85 ++--
 .../instance-initializer-addon-test.js        |  14 +-
 .../instance-initializer-test-test.js         |  50 +--
 .../blueprints/instance-initializer-test.js   |  66 +--
 node-tests/blueprints/mixin-test-test.js      |  54 +--
 node-tests/blueprints/mixin-test.js           | 102 ++---
 node-tests/blueprints/route-addon-test.js     |  10 +-
 node-tests/blueprints/route-test-test.js      |  54 +--
 node-tests/blueprints/route-test.js           | 226 +++++-----
 node-tests/blueprints/service-test-test.js    |  66 +--
 node-tests/blueprints/service-test.js         | 154 +++----
 node-tests/blueprints/template-test.js        |  94 ++--
 node-tests/blueprints/util-test-test.js       |  50 +--
 node-tests/blueprints/util-test.js            |  78 ++--
 node-tests/helpers/expect-error.js            |   2 +-
 node-tests/helpers/fixture.js                 |   2 +-
 node-tests/helpers/setup-test-environment.js  |   4 +-
 .../-internals/container/lib/registry.ts      |   4 +-
 .../container/tests/container_test.js         |  14 +-
 .../container/tests/registry_test.js          |  12 +-
 .../-internals/environment/lib/context.ts     |   2 +-
 .../@ember/-internals/environment/lib/env.ts  |   4 +-
 .../-internals/environment/lib/global.ts      |   6 +-
 .../lib/container_debug_adapter.js            |   2 +-
 .../extension-support/lib/data_adapter.js     |  18 +-
 .../tests/data_adapter_test.js                |   4 +-
 .../glimmer/lib/component-managers/mount.ts   |   3 +-
 .../glimmer/lib/component-managers/outlet.ts  |   6 +-
 .../glimmer/lib/helpers/-normalize-class.ts   |   2 +-
 .../-internals/glimmer/lib/helpers/action.ts  |  10 +-
 .../-internals/glimmer/lib/helpers/array.ts   |   2 +-
 .../-internals/glimmer/lib/helpers/concat.ts  |   7 +-
 .../-internals/glimmer/lib/helpers/each-in.ts |   2 +-
 .../-internals/glimmer/lib/helpers/fn.ts      |   2 +-
 .../-internals/glimmer/lib/helpers/get.ts     |   4 +-
 .../-internals/glimmer/lib/helpers/hash.ts    |   2 +-
 .../-internals/glimmer/lib/helpers/loc.ts     |   2 +-
 .../-internals/glimmer/lib/helpers/log.ts     |   2 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |   2 +-
 .../glimmer/lib/helpers/query-param.ts        |   2 +-
 .../glimmer/lib/helpers/readonly.ts           |   2 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |   2 +-
 .../-internals/glimmer/lib/modifiers/on.ts    |   6 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |   6 +-
 .../-internals/glimmer/lib/syntax/mount.ts    |   2 +-
 .../-internals/glimmer/lib/syntax/utils.ts    |   2 +-
 .../glimmer/lib/utils/args-proxy.ts           |   4 +-
 .../glimmer/lib/utils/debug-render-tree.ts    |   2 +-
 .../-internals/glimmer/lib/utils/iterator.ts  |   4 +-
 .../-internals/glimmer/lib/utils/managers.ts  |   2 +-
 .../integration/application/actions-test.js   |   2 +-
 .../application/debug-render-tree-test.ts     |  12 +-
 .../integration/application/engine-test.js    |  48 +-
 .../application/helper-registration-test.js   |  11 +-
 .../application/hot-reload-test.js            |   4 +-
 .../integration/application/rendering-test.js |  50 +--
 .../angle-bracket-invocation-test.js          |   2 +-
 .../integration/components/append-test.js     |  10 +-
 .../components/attribute-bindings-test.js     |   6 +-
 .../components/attrs-lookup-test.js           |   2 +-
 .../components/class-bindings-test.js         |   2 +-
 .../components/contextual-components-test.js  |   2 +-
 .../components/curly-components-test.js       |  18 +-
 .../components/dynamic-components-test.js     |   6 +-
 .../components/input-angle-test.js            |  10 +-
 .../components/input-curly-test.js            |  16 +-
 .../integration/components/life-cycle-test.js |  10 +-
 .../link-to/query-params-angle-test.js        |  22 +-
 .../link-to/query-params-curly-test.js        |  20 +-
 .../link-to/rendering-angle-test.js           |   2 +-
 .../link-to/rendering-curly-test.js           |   2 +-
 .../components/link-to/routing-angle-test.js  |  98 ++---
 .../components/link-to/routing-curly-test.js  | 112 ++---
 .../transitioning-classes-angle-test.js       |   6 +-
 .../transitioning-classes-curly-test.js       |   6 +-
 .../components/target-action-test.js          |   6 +-
 .../components/textarea-angle-test.js         |   2 +-
 .../components/textarea-curly-test.js         |   2 +-
 .../integration/components/utils-test.js      |  12 +-
 .../glimmer/tests/integration/content-test.js |   6 +-
 .../custom-component-manager-test.js          |  14 +-
 .../custom-modifier-manager-test.js           |  22 +-
 .../tests/integration/helpers/array-test.js   |   2 +-
 .../helpers/closure-action-test.js            |   8 +-
 .../integration/helpers/custom-helper-test.js |   2 +-
 .../helpers/element-action-test.js            |  21 +-
 .../tests/integration/helpers/fn-test.js      |   2 +-
 .../tests/integration/helpers/get-test.js     |  36 +-
 .../helpers/helper-manager-test.js            |   2 +-
 .../tests/integration/helpers/mut-test.js     |   6 +-
 .../tests/integration/helpers/unbound-test.js |  10 +-
 .../glimmer/tests/integration/mount-test.js   |  16 +-
 .../tests/integration/syntax/each-in-test.js  |   2 +-
 .../tests/integration/syntax/each-test.js     |  20 +-
 .../syntax/experimental-syntax-test.js        |   4 +-
 .../tests/unit/runtime-resolver-cache-test.js |   2 +-
 .../tests/unit/template-factory-test.js       |   2 +-
 .../tests/utils/shared-conditional-tests.js   |  12 +-
 .../@ember/-internals/metal/lib/chain-tags.ts |   2 +-
 .../@ember/-internals/metal/lib/computed.ts   |   2 +-
 .../@ember/-internals/metal/lib/decorator.ts  |   2 +-
 .../@ember/-internals/metal/lib/events.ts     |   2 +-
 .../-internals/metal/lib/injected_property.ts |   2 +-
 .../@ember/-internals/metal/lib/libraries.ts  |   6 +-
 packages/@ember/-internals/metal/lib/mixin.ts |   6 +-
 .../@ember/-internals/metal/lib/observer.ts   |   4 +-
 .../@ember/-internals/metal/lib/path_cache.ts |   2 +-
 .../@ember/-internals/metal/lib/tracked.ts    |   2 +-
 .../metal/tests/accessors/get_test.js         |  18 +-
 .../metal/tests/computed_decorator_test.js    |   2 +-
 .../-internals/metal/tests/computed_test.js   |  64 +--
 .../-internals/metal/tests/events_test.js     |  14 +-
 .../metal/tests/expand_properties_test.js     |   4 +-
 .../metal/tests/injected_property_test.js     |   2 +-
 .../-internals/metal/tests/is_blank_test.js   |   2 +-
 .../-internals/metal/tests/is_empty_test.js   |   2 +-
 .../-internals/metal/tests/is_none_test.js    |   2 +-
 .../-internals/metal/tests/is_present_test.js |   2 +-
 .../-internals/metal/tests/libraries_test.js  |   2 +-
 .../metal/tests/mixin/computed_test.js        |  12 +-
 .../metal/tests/mixin/introspection_test.js   |   2 +-
 .../metal/tests/mixin/observer_test.js        |  22 +-
 .../metal/tests/native_desc_decorator_test.js |  16 +-
 .../-internals/metal/tests/observer_test.js   |  54 +--
 .../metal/tests/performance_test.js           |   8 +-
 .../-internals/metal/tests/properties_test.js |   2 +-
 .../metal/tests/tracked/get_test.js           |   2 +-
 .../metal/tests/tracked/validation_test.js    |   4 +-
 .../routing/lib/location/auto_location.ts     |   2 +-
 .../routing/lib/location/hash_location.ts     |   2 +-
 .../routing/lib/location/history_location.ts  |   2 +-
 .../-internals/routing/lib/system/dsl.ts      |   2 +-
 .../-internals/routing/lib/system/route.ts    |   4 +-
 .../-internals/routing/lib/system/router.ts   |   6 +-
 .../tests/location/auto_location_test.js      |   8 +-
 .../tests/location/hash_location_test.js      |   8 +-
 .../tests/system/controller_for_test.js       |   2 +-
 .../routing/tests/system/dsl_test.js          |  56 +--
 .../routing/tests/system/route_test.js        |   6 +-
 .../routing/tests/system/router_test.js       |   8 +-
 .../-internals/runtime/lib/ext/function.js    |   6 +-
 .../@ember/-internals/runtime/lib/ext/rsvp.js |   2 +-
 .../-internals/runtime/lib/mixins/-proxy.js   |   2 +-
 .../-internals/runtime/lib/mixins/array.js    |  40 +-
 .../runtime/lib/mixins/promise_proxy.js       |  10 +-
 .../runtime/lib/mixins/registry_proxy.js      |   2 +-
 .../lib/mixins/target_action_support.js       |   2 +-
 .../runtime/lib/system/core_object.js         |   2 +-
 .../runtime/tests/array/any-test.js           |   6 +-
 .../runtime/tests/array/every-test.js         |   4 +-
 .../runtime/tests/array/filter-test.js        |   2 +-
 .../runtime/tests/array/find-test.js          |   4 +-
 .../runtime/tests/array/forEach-test.js       |   6 +-
 .../runtime/tests/array/lastObject-test.js    |   2 +-
 .../runtime/tests/array/map-test.js           |   2 +-
 .../runtime/tests/array/reject-test.js        |   4 +-
 .../runtime/tests/array/uniqBy-test.js        |   2 +-
 .../runtime/tests/core/compare_test.js        |   2 +-
 .../runtime/tests/core/is_array_test.js       |   4 +-
 .../runtime/tests/core/type_of_test.js        |   2 +-
 .../runtime/tests/ext/function_test.js        |  12 +-
 .../-internals/runtime/tests/ext/rsvp_test.js |  50 +--
 .../-internals/runtime/tests/helpers/array.js |   6 +-
 .../mixins/observable/chained_test.js         |   2 +-
 .../mixins/observable/observable_test.js      |  60 +--
 .../runtime/tests/mixins/array_test.js        |   8 +-
 .../runtime/tests/mixins/evented_test.js      |   2 +-
 .../runtime/tests/mixins/observable_test.js   |   2 +-
 .../tests/mixins/promise_proxy_test.js        |  10 +-
 .../tests/mutable-array/insertAt-test.js      |   2 +-
 .../tests/mutable-array/replace-test.js       |   2 +-
 .../array_proxy/arranged_content_test.js      |  24 +-
 .../runtime/tests/system/core_object_test.js  |   2 +-
 .../tests/system/native_array/replace_test.js |   2 +-
 .../tests/system/object/computed_test.js      |  78 ++--
 .../tests/system/object/create_test.js        |  16 +-
 .../tests/system/object/destroy_test.js       |  18 +-
 .../system/object/es-compatibility-test.js    |   4 +-
 .../tests/system/object/events_test.js        |  16 +-
 .../tests/system/object/extend_test.js        |   4 +-
 .../tests/system/object/observer_test.js      |  26 +-
 .../tests/system/object/toString_test.js      |   4 +-
 .../runtime/tests/system/object_proxy_test.js |  14 +-
 .../-internals/utils/lib/mandatory-setter.ts  |   8 +-
 packages/@ember/-internals/utils/lib/super.ts |   4 +-
 .../-internals/utils/lib/symbol-utils.ts      |   2 +-
 .../-internals/utils/tests/cache_test.js      |   8 +-
 .../utils/tests/checkHasSuper_test.js         |   2 +-
 .../views/lib/mixins/view_support.js          |   4 +-
 .../views/lib/system/event_dispatcher.js      |  29 +-
 .../-internals/views/lib/system/jquery.js     |   2 +-
 .../lib/system/jquery_event_deprecation.js    |   2 +-
 .../-internals/views/lib/system/utils.ts      |   4 +-
 .../@ember/application/globals-resolver.js    |   4 +-
 packages/@ember/application/instance.js       |   4 +-
 .../@ember/application/lib/application.js     |   4 +-
 packages/@ember/application/lib/lazy_load.js  |   2 +-
 .../tests/application_instance_test.js        |  14 +-
 .../application/tests/application_test.js     |   4 +-
 .../default_resolver_test.js                  |   4 +-
 .../normalization_test.js                     |   2 +-
 .../application/tests/initializers_test.js    |   2 +-
 .../tests/instance_initializers_test.js       |   2 +-
 .../application/tests/lazy_load_test.js       |  12 +-
 .../@ember/application/tests/logging_test.js  |   2 +-
 .../application/tests/readiness_test.js       |   4 +-
 .../@ember/application/tests/reset_test.js    |   2 +-
 .../@ember/application/tests/visit_test.js    |  70 +--
 .../controller/tests/controller_test.js       |   4 +-
 packages/@ember/debug/index.ts                |  10 +-
 packages/@ember/debug/tests/handlers-test.js  |   4 +-
 packages/@ember/debug/tests/main_test.js      |  14 +-
 packages/@ember/engine/index.js               |   2 +-
 packages/@ember/engine/instance.js            |   6 +-
 .../engine/tests/engine_initializers_test.js  |   6 +-
 .../engine/tests/engine_instance_test.js      |   2 +-
 packages/@ember/error/tests/index_test.js     |   2 +-
 .../instrumentation/tests/index-test.js       |  24 +-
 packages/@ember/object/compat.ts              |   6 +-
 packages/@ember/object/index.js               |   2 +-
 .../object/lib/computed/computed_macros.js    |  28 +-
 .../lib/computed/reduce_computed_macros.js    |  50 +--
 packages/@ember/object/tests/action_test.js   |   6 +-
 .../tests/computed/computed_macros_test.js    |  28 +-
 .../computed/dependent-key-compat-test.js     |   2 +-
 .../computed/reduce_computed_macros_test.js   |  70 +--
 packages/@ember/runloop/index.js              |   2 +-
 packages/@ember/runloop/tests/later_test.js   |   6 +-
 packages/@ember/runloop/tests/onerror_test.js |   2 +-
 .../@ember/runloop/tests/run_bind_test.js     |   2 +-
 packages/@ember/runloop/tests/unwind_test.js  |   4 +-
 packages/@ember/string/index.ts               |  12 +-
 .../plugins/assert-against-named-blocks.ts    |   2 +-
 .../lib/plugins/deprecate-send-action.ts      |   2 +-
 .../lib/plugins/transform-in-element.ts       |   4 +-
 .../lib/plugins/transform-link-to.ts          |   2 +-
 .../transform-old-class-binding-syntax.ts     |   2 +-
 .../lib/system/compile-options.ts             |   6 +-
 .../lib/system/dasherize-component-name.ts    |   2 +-
 .../plugins/deprecate-send-action-test.js     |   4 +-
 .../tests/system/compile_options_test.js      |   2 +-
 .../tests/utils/transform-test-case.ts        |   4 +-
 packages/ember-testing/lib/events.js          |   2 +-
 packages/ember-testing/lib/ext/application.js |   4 +-
 packages/ember-testing/lib/ext/rsvp.js        |   2 +-
 .../ember-testing/lib/helpers/pause_test.js   |   2 +-
 packages/ember-testing/lib/helpers/wait.js    |   2 +-
 packages/ember-testing/lib/initializers.js    |   2 +-
 packages/ember-testing/lib/support.js         |   6 +-
 .../lib/test/pending_requests.js              |   2 +-
 packages/ember-testing/lib/test/promise.js    |   4 +-
 .../ember-testing/tests/acceptance_test.js    |  14 +-
 .../tests/adapters/qunit_test.js              |   4 +-
 packages/ember-testing/tests/adapters_test.js |  42 +-
 packages/ember-testing/tests/ext/rsvp_test.js |  22 +-
 .../tests/helper_registration_test.js         |   6 +-
 packages/ember-testing/tests/helpers_test.js  |  62 +--
 .../ember-testing/tests/integration_test.js   |   2 +-
 .../ember-testing/tests/reexports_test.js     |   4 +-
 .../ember-testing/tests/test/waiters-test.js  |  20 +-
 packages/ember/index.js                       |   6 +-
 .../ember/tests/application_lifecycle_test.js |   2 +-
 .../tests/component_registration_test.js      |  24 +-
 .../ember/tests/ember-test-helpers-test.js    |  14 +-
 packages/ember/tests/error_handler_test.js    |  84 ++--
 packages/ember/tests/homepage_example_test.js |   4 +-
 packages/ember/tests/reexports_test.js        |   2 +-
 .../tests/routing/decoupled_basic_test.js     | 258 +++++------
 .../ember/tests/routing/model_loading_test.js |  74 ++--
 .../ember/tests/routing/query_params_test.js  |  62 +--
 ..._dependent_state_with_query_params_test.js |  20 +-
 .../overlapping_query_params_test.js          |   4 +-
 .../query_param_async_get_handler_test.js     |  20 +-
 .../query_params_test/shared_state_test.js    |   2 +-
 .../ember/tests/routing/router_map_test.js    |   6 +-
 .../routing/router_service_test/basic_test.js |   2 +-
 .../build_routeinfo_metadata_test.js          |  28 +-
 .../currenturl_lifecycle_test.js              |   8 +-
 .../router_service_test/events_test.js        |  56 +--
 .../router_service_test/recognize_test.js     |   8 +-
 .../router_service_test/transitionTo_test.js  |  12 +-
 .../ember/tests/routing/substates_test.js     |  60 +--
 .../tests/routing/template_rendering_test.js  |  98 ++---
 .../ember/tests/service_injection_test.js     |   2 +-
 .../ember/tests/view_instrumentation_test.js  |   2 +-
 .../external-helpers/lib/external-helpers.js  |   4 +-
 .../internal-test-helpers/lib/apply-mixins.js |   6 +-
 .../lib/ember-dev/assertion.ts                |   6 +-
 .../lib/ember-dev/containers.ts               |   6 +-
 .../lib/ember-dev/deprecation.ts              |  14 +-
 .../lib/ember-dev/namespaces.ts               |   2 +-
 .../lib/ember-dev/observers.ts                |   2 +-
 .../lib/ember-dev/run-loop.ts                 |   2 +-
 .../lib/ember-dev/setup-qunit.ts              |  10 +-
 .../lib/ember-dev/warning.ts                  |  12 +-
 .../internal-test-helpers/lib/equal-tokens.js |   2 +-
 packages/internal-test-helpers/lib/factory.js |   4 +-
 .../lib/get-all-property-names.js             |   2 +-
 .../internal-test-helpers/lib/matchers.js     |  18 +-
 .../internal-test-helpers/lib/module-for.js   |  16 +-
 .../internal-test-helpers/lib/node-query.js   |  10 +-
 packages/internal-test-helpers/lib/run.ts     |   4 +-
 packages/internal-test-helpers/lib/strip.js   |   2 +-
 .../lib/system/synthetic-events.js            |   4 +-
 .../lib/test-cases/abstract-application.js    |  12 +-
 .../lib/test-cases/router.js                  |   6 +-
 packages/loader/lib/index.js                  |   6 +-
 server/index.js                               |   4 +-
 tests/docs/coverage-test.js                   |  14 +-
 tests/node/app-boot-test.js                   |  34 +-
 tests/node/build-info-test.js                 |  12 +-
 tests/node/component-rendering-test.js        |  10 +-
 tests/node/fastboot-sandbox-test.js           |   8 +-
 tests/node/helpers/assert-html-matches.js     |   2 +-
 tests/node/helpers/build-owner.js             |   2 +-
 tests/node/helpers/load-ember.js              |  12 +-
 tests/node/helpers/setup-app.js               |  12 +-
 tests/node/helpers/setup-component.js         |  20 +-
 tests/node/instrumentation-test.js            |   8 +-
 tests/node/sourcemap-test.js                  |   4 +-
 tests/node/template-compiler-test.js          |  18 +-
 tests/node/visit-test.js                      |  82 ++--
 378 files changed, 3196 insertions(+), 3240 deletions(-)

diff --git a/bin/build-for-publishing.js b/bin/build-for-publishing.js
index 5f8ffc72a50..f39fc95919a 100755
--- a/bin/build-for-publishing.js
+++ b/bin/build-for-publishing.js
@@ -87,7 +87,7 @@ Promise.resolve()
   .then(
     // eslint-disable-next-line
     () => console.log('build-for-publishing completed successfully!'),
-    error => {
+    (error) => {
       // eslint-disable-next-line
       console.error(error);
       // eslint-disable-next-line
diff --git a/bin/changelog.js b/bin/changelog.js
index c6f2caf68b4..c6397703fe8 100755
--- a/bin/changelog.js
+++ b/bin/changelog.js
@@ -32,7 +32,7 @@ compareCommits({
 })
   .then(processPages)
   .then(console.log)
-  .catch(err => console.error(err));
+  .catch((err) => console.error(err));
 
 function getCommitMessage(commitInfo) {
   let message = commitInfo.commit.message;
@@ -81,7 +81,7 @@ function processPages(res) {
   let contributions = res.commits
     .filter(excludeDependabot)
     .filter(isMergeOrCherryPick)
-    .map(commitInfo => {
+    .map((commitInfo) => {
       let message = getCommitMessage(commitInfo);
 
       let mergeFromBranchRegex = /#(\d+) from (.*)\//;
@@ -107,7 +107,7 @@ function processPages(res) {
       return result;
     })
     .sort(comparePrNumber)
-    .map(pr => {
+    .map((pr) => {
       let title = pr.title;
       let link;
       if (pr.number) {
@@ -123,7 +123,7 @@ function processPages(res) {
     .join('\n');
 
   if (github.hasNextPage(res)) {
-    return github.getNextPage(res).then(nextPage => {
+    return github.getNextPage(res).then((nextPage) => {
       contributions += processPages(nextPage);
     });
   } else {
diff --git a/bin/feature-flag-yuidoc-filter.js b/bin/feature-flag-yuidoc-filter.js
index 904c99c850b..6b3e1f3dc2c 100755
--- a/bin/feature-flag-yuidoc-filter.js
+++ b/bin/feature-flag-yuidoc-filter.js
@@ -48,7 +48,7 @@ function updateClassReferencesInNamespaces(data) {
   }
 }
 
-module.exports = function(data) {
+module.exports = function (data) {
   let featuresToFilter = gatherFeatures();
   data.classes = gatherClassesToDocument(data, featuresToFilter);
   updateClassReferencesInNamespaces(data);
diff --git a/bin/publish_to_s3.js b/bin/publish_to_s3.js
index fa329fcd197..f857e7f136f 100755
--- a/bin/publish_to_s3.js
+++ b/bin/publish_to_s3.js
@@ -24,7 +24,7 @@ if (!buildInfo.isBuildForTag) {
     TRAVIS_COMMIT: buildInfo.sha,
   });
 
-  publisher.currentBranch = function() {
+  publisher.currentBranch = function () {
     return buildInfo.channel;
   };
 
diff --git a/bin/run-browserstack-tests.js b/bin/run-browserstack-tests.js
index f03a67bdd09..94587018a49 100755
--- a/bin/run-browserstack-tests.js
+++ b/bin/run-browserstack-tests.js
@@ -13,7 +13,7 @@ function run(command, args = []) {
   return p;
 }
 
-(async function() {
+(async function () {
   await run('ember', ['browserstack:connect']);
 
   try {
diff --git a/bin/run-tests-injection.js b/bin/run-tests-injection.js
index 86bc1df4c5a..57f75b8eb6c 100644
--- a/bin/run-tests-injection.js
+++ b/bin/run-tests-injection.js
@@ -2,12 +2,12 @@
 /* eslint-disable no-console */
 /* globals QUnit */
 'use strict';
-document.addEventListener('DOMContentLoaded', function() {
+document.addEventListener('DOMContentLoaded', function () {
   let testsTotal = 0;
   let testsPassed = 0;
   let testsFailed = 0;
   let currentTestAssertions = [];
-  QUnit.log(function(details) {
+  QUnit.log(function (details) {
     let response;
 
     // Ignore passing assertions
@@ -32,7 +32,7 @@ document.addEventListener('DOMContentLoaded', function() {
     currentTestAssertions.push('Failed assertion: ' + response);
   });
 
-  QUnit.testDone(function(result) {
+  QUnit.testDone(function (result) {
     let i,
       len,
       name = '';
@@ -58,13 +58,13 @@ document.addEventListener('DOMContentLoaded', function() {
     currentTestAssertions.length = 0;
   });
 
-  QUnit.moduleDone(m => {
+  QUnit.moduleDone((m) => {
     console.log(
       `Module "${m.name}" finished ${m.total} tests${m.failed > 0 ? `${m.failed} failed` : ''}`
     );
   });
 
-  QUnit.done(function(result) {
+  QUnit.done(function (result) {
     console.log(
       '\n' +
         'Took ' +
diff --git a/bin/run-tests.js b/bin/run-tests.js
index 8dffd016540..d7cf15c0899 100755
--- a/bin/run-tests.js
+++ b/bin/run-tests.js
@@ -13,7 +13,7 @@ const fs = require('fs');
 const serve = serveStatic('./dist/', { index: ['index.html', 'index.htm'] });
 
 // Create server.
-const server = http.createServer(function(req, res) {
+const server = http.createServer(function (req, res) {
   let done = finalhandler(req, res);
   serve(req, res, done);
 });
@@ -71,15 +71,15 @@ function generateTestsFor(packageName) {
 
 function generateEachPackageTests() {
   fs.readdirSync('packages/@ember')
-    .filter(e => e !== '-internals')
-    .forEach(e => generateTestsFor(`@ember/${e}`));
+    .filter((e) => e !== '-internals')
+    .forEach((e) => generateTestsFor(`@ember/${e}`));
 
-  fs.readdirSync('packages/@ember/-internals').forEach(e =>
+  fs.readdirSync('packages/@ember/-internals').forEach((e) =>
     generateTestsFor(`@ember/-internals/${e}`)
   );
 
   fs.readdirSync('packages')
-    .filter(e => e !== '@ember')
+    .filter((e) => e !== '@ember')
     .forEach(generateTestsFor);
 }
 
@@ -108,11 +108,11 @@ function runInSequence(tasks) {
 
 function runAndExit() {
   runInSequence(testFunctions)
-    .then(function() {
+    .then(function () {
       console.log(chalk.green('Passed!'));
       process.exit(0);
     })
-    .catch(function(err) {
+    .catch(function (err) {
       console.error(chalk.red(err.toString()));
       console.error(chalk.red('Failed!'));
       process.exit(1);
diff --git a/bin/yarn-link-glimmer.js b/bin/yarn-link-glimmer.js
index 29310d2cfb4..d0288d23609 100755
--- a/bin/yarn-link-glimmer.js
+++ b/bin/yarn-link-glimmer.js
@@ -8,8 +8,8 @@ const yarnConfig = JSON.parse(
     })
   ).data
 );
-const linkedModules = yarnConfig.linkedModules.filter(m => m.startsWith('@glimmer/'));
+const linkedModules = yarnConfig.linkedModules.filter((m) => m.startsWith('@glimmer/'));
 
-linkedModules.forEach(mod => {
+linkedModules.forEach((mod) => {
   child_process.execSync(`yarn link "${mod}"`);
 });
diff --git a/bin/yarn-unlink-glimmer.js b/bin/yarn-unlink-glimmer.js
index cc4884fcb0a..7b9e240f85a 100755
--- a/bin/yarn-unlink-glimmer.js
+++ b/bin/yarn-unlink-glimmer.js
@@ -8,9 +8,9 @@ const yarnConfig = JSON.parse(
     })
   ).data
 );
-const linkedModules = yarnConfig.linkedModules.filter(m => m.startsWith('@glimmer/'));
+const linkedModules = yarnConfig.linkedModules.filter((m) => m.startsWith('@glimmer/'));
 
-linkedModules.forEach(mod => {
+linkedModules.forEach((mod) => {
   child_process.execSync(`yarn unlink "${mod}"`);
 });
 
diff --git a/blueprints/-addon-import.js b/blueprints/-addon-import.js
index dc54a2d22d5..27cf4f7f6fa 100644
--- a/blueprints/-addon-import.js
+++ b/blueprints/-addon-import.js
@@ -7,15 +7,15 @@ const inflector = require('inflection');
 module.exports = {
   description: 'Generates an import wrapper.',
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
-      __name__: function(options) {
+      __name__: function (options) {
         return options.dasherizedModuleName;
       },
-      __path__: function(options) {
+      __path__: function (options) {
         return inflector.pluralize(options.locals.blueprintName);
       },
-      __root__: function(options) {
+      __root__: function (options) {
         if (options.inRepoAddon) {
           return path.join('lib', options.inRepoAddon, 'app');
         }
@@ -24,7 +24,7 @@ module.exports = {
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let addonRawName = options.inRepoAddon ? options.inRepoAddon : options.project.name();
     let addonName = stringUtil.dasherize(addonRawName);
     let fileName = stringUtil.dasherize(options.entity.name);
diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js
index 2a305ae25d0..f2d3259aa04 100644
--- a/blueprints/acceptance-test/index.js
+++ b/blueprints/acceptance-test/index.js
@@ -10,7 +10,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates an acceptance test for a feature.',
 
-  locals: function(options) {
+  locals: function (options) {
     let testFolderRoot = stringUtils.dasherize(options.project.name());
 
     if (options.project.isEmberCLIAddon()) {
diff --git a/blueprints/component-addon/index.js b/blueprints/component-addon/index.js
index 046537deb94..a3f30e40a61 100644
--- a/blueprints/component-addon/index.js
+++ b/blueprints/component-addon/index.js
@@ -9,33 +9,33 @@ const useEditionDetector = require('../edition-detector');
 module.exports = useEditionDetector({
   description: 'Generates a component.',
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
-      __path__: function(options) {
+      __path__: function (options) {
         if (options.pod) {
           return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
         }
         return 'components';
       },
-      __name__: function(options) {
+      __name__: function (options) {
         if (options.pod) {
           return 'component';
         }
         return options.dasherizedModuleName;
       },
-      __root__: function(options) {
+      __root__: function (options) {
         if (options.inRepoAddon) {
           return path.join('lib', options.inRepoAddon, 'app');
         }
         return 'app';
       },
-      __templatepath__: function(options) {
+      __templatepath__: function (options) {
         if (options.pod) {
           return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
         }
         return 'templates/components';
       },
-      __templatename__: function(options) {
+      __templatename__: function (options) {
         if (options.pod) {
           return 'template';
         }
@@ -44,11 +44,11 @@ module.exports = useEditionDetector({
     };
   },
 
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return normalizeEntityName(entityName);
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let addonRawName = options.inRepoAddon ? options.inRepoAddon : options.project.name();
     let addonName = stringUtil.dasherize(addonRawName);
     let fileName = stringUtil.dasherize(options.entity.name);
diff --git a/blueprints/component-class-addon/index.js b/blueprints/component-class-addon/index.js
index 59a10cc4499..19272db5258 100644
--- a/blueprints/component-class-addon/index.js
+++ b/blueprints/component-class-addon/index.js
@@ -9,21 +9,21 @@ const useEditionDetector = require('../edition-detector');
 module.exports = useEditionDetector({
   description: 'Generates a component class.',
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
-      __path__: function(options) {
+      __path__: function (options) {
         if (options.pod) {
           return path.join(options.podPath, options.locals.path, options.dasherizedModuleName);
         }
         return 'components';
       },
-      __name__: function(options) {
+      __name__: function (options) {
         if (options.pod) {
           return 'component';
         }
         return options.dasherizedModuleName;
       },
-      __root__: function(options) {
+      __root__: function (options) {
         if (options.inRepoAddon) {
           return path.join('lib', options.inRepoAddon, 'app');
         }
@@ -32,11 +32,11 @@ module.exports = useEditionDetector({
     };
   },
 
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return normalizeEntityName(entityName);
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let addonRawName = options.inRepoAddon ? options.inRepoAddon : options.project.name();
     let addonName = stringUtil.dasherize(addonRawName);
     let fileName = stringUtil.dasherize(options.entity.name);
diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
index cb970dbb030..697d5b0b6c3 100644
--- a/blueprints/component-class/index.js
+++ b/blueprints/component-class/index.js
@@ -49,7 +49,7 @@ module.exports = {
     this._super && this._super.init.apply(this, arguments);
     let isOctane = has('octane');
 
-    this.availableOptions.forEach(option => {
+    this.availableOptions.forEach((option) => {
       if (option.name === 'component-class') {
         if (isOctane) {
           option.default = '@glimmer/component';
diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js
index 79ab3acd454..96d5c38a04f 100644
--- a/blueprints/component-test/index.js
+++ b/blueprints/component-test/index.js
@@ -10,7 +10,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
   let parts = options.entity.name.split('/');
-  return parts.map(p => stringUtil.classify(p)).join('::');
+  return parts.map((p) => stringUtil.classify(p)).join('::');
 }
 
 module.exports = useTestFrameworkDetector({
@@ -30,7 +30,7 @@ module.exports = useTestFrameworkDetector({
     },
   ],
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
@@ -47,7 +47,7 @@ module.exports = useTestFrameworkDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let componentPathName = dasherizedModuleName;
     let testType = options.testType || 'integration';
@@ -68,9 +68,9 @@ module.exports = useTestFrameworkDetector({
 
     let templateInvocation = invocationFor(options);
     let componentName = templateInvocation;
-    let openComponent = descriptor => `<${descriptor}>`;
-    let closeComponent = descriptor => `</${descriptor}>`;
-    let selfCloseComponent = descriptor => `<${descriptor} />`;
+    let openComponent = (descriptor) => `<${descriptor}>`;
+    let closeComponent = (descriptor) => `</${descriptor}>`;
+    let selfCloseComponent = (descriptor) => `<${descriptor} />`;
 
     return {
       path: getPathOption(options),
@@ -87,7 +87,7 @@ module.exports = useTestFrameworkDetector({
   },
 
   _useNamedHbsImport() {
-    let htmlbarsAddon = this.project.addons.find(a => a.name === 'ember-cli-htmlbars');
+    let htmlbarsAddon = this.project.addons.find((a) => a.name === 'ember-cli-htmlbars');
 
     if (htmlbarsAddon && semver.gte(htmlbarsAddon.pkg.version, '4.0.0-alpha.1')) {
       return true;
@@ -96,7 +96,7 @@ module.exports = useTestFrameworkDetector({
     return false;
   },
 
-  afterInstall: function(options) {
+  afterInstall: function (options) {
     if (
       !options.dryRun &&
       options.testType === 'integration' &&
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index 4a3e4a2563b..bb7cf036521 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -53,7 +53,7 @@ module.exports = {
     this._super && this._super.init.apply(this, arguments);
     let isOctane = has('octane');
 
-    this.availableOptions.forEach(option => {
+    this.availableOptions.forEach((option) => {
       if (option.name === 'component-class') {
         if (isOctane) {
           option.default = '--no-component-class';
@@ -121,7 +121,7 @@ module.exports = {
   afterInstall(options) {
     this._super.afterInstall.apply(this, arguments);
 
-    this.skippedJsFiles.forEach(file => {
+    this.skippedJsFiles.forEach((file) => {
       let mapped = this.mapFile(file, this.savedLocals);
       this.ui.writeLine(`  ${chalk.yellow('skip')} ${mapped}`);
     });
@@ -202,7 +202,7 @@ module.exports = {
     let files = this._super.files.apply(this, arguments);
 
     if (this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE && this.options.componentClass === '') {
-      files = files.filter(file => {
+      files = files.filter((file) => {
         if (file.endsWith('.js')) {
           this.skippedJsFiles.add(file);
           return false;
diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js
index 1e920b2b434..becf3ca8ac8 100644
--- a/blueprints/controller-test/index.js
+++ b/blueprints/controller-test/index.js
@@ -7,7 +7,7 @@ const path = require('path');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
-  locals: function(options) {
+  locals: function (options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let controllerPathName = dasherizedModuleName;
 
@@ -16,7 +16,7 @@ module.exports = useTestFrameworkDetector({
       friendlyTestDescription: ['Unit', 'Controller', dasherizedModuleName].join(' | '),
     };
   },
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
index b3174f03e6d..e6ff5f89e6e 100644
--- a/blueprints/controller/index.js
+++ b/blueprints/controller/index.js
@@ -4,7 +4,7 @@ const useEditionDetector = require('../edition-detector');
 
 module.exports = useEditionDetector({
   description: 'Generates a controller.',
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
 });
diff --git a/blueprints/edition-detector.js b/blueprints/edition-detector.js
index 6fb1115c23b..4e37fcf1e32 100644
--- a/blueprints/edition-detector.js
+++ b/blueprints/edition-detector.js
@@ -3,8 +3,8 @@
 const { has } = require('@ember/edition-utils');
 const path = require('path');
 
-module.exports = function(blueprint) {
-  blueprint.filesPath = function() {
+module.exports = function (blueprint) {
+  blueprint.filesPath = function () {
     let rootPath = has('octane') ? 'native-files' : 'files';
     return path.join(this.path, rootPath);
   };
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index c9bd0367db6..43a1ad7dbd3 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -23,7 +23,7 @@ module.exports = useTestFrameworkDetector({
     },
   ],
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
@@ -37,7 +37,7 @@ module.exports = useTestFrameworkDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let testType = options.testType || 'integration';
     let testName = testType === 'integration' ? 'Integration' : 'Unit';
     let friendlyTestName = [testName, 'Helper', options.entity.name].join(' | ');
@@ -56,7 +56,7 @@ module.exports = useTestFrameworkDetector({
   },
 
   _useNamedHbsImport() {
-    let htmlbarsAddon = this.project.addons.find(a => a.name === 'ember-cli-htmlbars');
+    let htmlbarsAddon = this.project.addons.find((a) => a.name === 'ember-cli-htmlbars');
 
     if (htmlbarsAddon && semver.gte(htmlbarsAddon.pkg.version, '4.0.0-alpha.1')) {
       return true;
@@ -65,7 +65,7 @@ module.exports = useTestFrameworkDetector({
     return false;
   },
 
-  afterInstall: function(options) {
+  afterInstall: function (options) {
     if (
       !options.dryRun &&
       options.testType === 'integration' &&
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
index 58ec241153b..9cd15da2616 100644
--- a/blueprints/helper/index.js
+++ b/blueprints/helper/index.js
@@ -20,7 +20,7 @@ module.exports = {
     };
   },
 
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return normalizeEntityName(
       entityName.replace(/\.js$/, '') //Prevent generation of ".js.js" files
     );
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index f040601a551..c4aee01abbd 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -9,7 +9,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates an initializer unit test.',
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
@@ -20,7 +20,7 @@ module.exports = useTestFrameworkDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
     return {
       friendlyTestName: ['Unit', 'Initializer', options.entity.name].join(' | '),
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index 7edbd464123..0fcba9e70b3 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -9,7 +9,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates an instance initializer unit test.',
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
@@ -19,7 +19,7 @@ module.exports = useTestFrameworkDetector({
       },
     };
   },
-  locals: function(options) {
+  locals: function (options) {
     let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
 
     return {
diff --git a/blueprints/mixin-test/index.js b/blueprints/mixin-test/index.js
index 126fa5995ce..73067ea9d0c 100644
--- a/blueprints/mixin-test/index.js
+++ b/blueprints/mixin-test/index.js
@@ -18,7 +18,7 @@ module.exports = useTestFrameworkDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     return {
       projectName: options.inRepoAddon ? options.inRepoAddon : options.project.name(),
       friendlyTestName: ['Unit', 'Mixin', options.entity.name].join(' | '),
diff --git a/blueprints/mixin/index.js b/blueprints/mixin/index.js
index 5e707284920..22061781a0f 100644
--- a/blueprints/mixin/index.js
+++ b/blueprints/mixin/index.js
@@ -2,7 +2,7 @@
 
 module.exports = {
   description: 'Generates a mixin.',
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
 };
diff --git a/blueprints/route-addon/index.js b/blueprints/route-addon/index.js
index 6727e51cb1e..f88a316f49a 100644
--- a/blueprints/route-addon/index.js
+++ b/blueprints/route-addon/index.js
@@ -7,35 +7,35 @@ const inflector = require('inflection');
 module.exports = {
   description: 'Generates import wrappers for a route and its template.',
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
-      __templatepath__: function(options) {
+      __templatepath__: function (options) {
         if (options.pod) {
           return path.join(options.podPath, options.dasherizedModuleName);
         }
         return 'templates';
       },
-      __templatename__: function(options) {
+      __templatename__: function (options) {
         if (options.pod) {
           return 'template';
         }
         return options.dasherizedModuleName;
       },
-      __name__: function(options) {
+      __name__: function (options) {
         if (options.pod) {
           return 'route';
         }
 
         return options.dasherizedModuleName;
       },
-      __path__: function(options) {
+      __path__: function (options) {
         if (options.pod && options.hasPathToken) {
           return path.join(options.podPath, options.dasherizedModuleName);
         }
 
         return 'routes';
       },
-      __root__: function(options) {
+      __root__: function (options) {
         if (options.inRepoAddon) {
           return path.join('lib', options.inRepoAddon, 'app');
         }
@@ -45,13 +45,13 @@ module.exports = {
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let locals = {};
     let addonRawName = options.inRepoAddon ? options.inRepoAddon : options.project.name();
     let addonName = stringUtil.dasherize(addonRawName);
     let fileName = stringUtil.dasherize(options.entity.name);
 
-    ['route', 'template'].forEach(function(blueprint) {
+    ['route', 'template'].forEach(function (blueprint) {
       let pathName = [addonName, inflector.pluralize(blueprint), fileName].join('/');
 
       if (options.pod) {
diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js
index e410e62a7f5..9437b5f4585 100644
--- a/blueprints/route-test/index.js
+++ b/blueprints/route-test/index.js
@@ -14,7 +14,7 @@ module.exports = useTestFrameworkDetector({
     },
   ],
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
@@ -22,7 +22,7 @@ module.exports = useTestFrameworkDetector({
       __testType__() {
         return 'unit';
       },
-      __test__: function(options) {
+      __test__: function (options) {
         let moduleName = options.locals.moduleName;
 
         if (options.pod) {
@@ -31,7 +31,7 @@ module.exports = useTestFrameworkDetector({
 
         return `${moduleName}-test`;
       },
-      __path__: function(options) {
+      __path__: function (options) {
         if (options.pod) {
           return path.join(options.podPath, options.locals.moduleName);
         }
@@ -40,7 +40,7 @@ module.exports = useTestFrameworkDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let moduleName = options.entity.name;
 
     if (options.resetNamespace) {
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index 19342c72786..48ea99144c8 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -27,7 +27,7 @@ module.exports = useEditionDetector({
     },
   ],
 
-  fileMapTokens: function() {
+  fileMapTokens: function () {
     return {
       __name__(options) {
         if (options.pod) {
@@ -71,7 +71,7 @@ module.exports = useEditionDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     let moduleName = options.entity.name;
 
     if (options.resetNamespace) {
@@ -83,7 +83,7 @@ module.exports = useEditionDetector({
     };
   },
 
-  shouldEntityTouchRouter: function(name) {
+  shouldEntityTouchRouter: function (name) {
     let isIndex = name === 'index';
     let isBasic = name === 'basic';
     let isApplication = name === 'application';
@@ -91,7 +91,7 @@ module.exports = useEditionDetector({
     return !isBasic && !isIndex && !isApplication;
   },
 
-  shouldTouchRouter: function(name, options) {
+  shouldTouchRouter: function (name, options) {
     let entityTouchesRouter = this.shouldEntityTouchRouter(name);
     let isDummy = Boolean(options.dummy);
     let isAddon = Boolean(options.project.isEmberCLIAddon());
@@ -106,14 +106,14 @@ module.exports = useEditionDetector({
     );
   },
 
-  afterInstall: function(options) {
+  afterInstall: function (options) {
     updateRouter.call(this, 'add', options);
   },
 
-  afterUninstall: function(options) {
+  afterUninstall: function (options) {
     updateRouter.call(this, 'remove', options);
   },
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
 });
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index e008e7dc090..528ffcddb19 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -4,7 +4,7 @@ const useEditionDetector = require('../edition-detector');
 
 module.exports = useEditionDetector({
   description: 'Generates a service.',
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
 });
diff --git a/blueprints/template/index.js b/blueprints/template/index.js
index 9418f1d40ea..3d060fc826e 100644
--- a/blueprints/template/index.js
+++ b/blueprints/template/index.js
@@ -2,7 +2,7 @@
 
 module.exports = {
   description: 'Generates a template.',
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return entityName.replace(/\.hbs$/, ''); //Prevent generation of ".hbs.hbs" files
   },
 };
diff --git a/blueprints/test-framework-detector.js b/blueprints/test-framework-detector.js
index eedef9e3049..cdbd405486c 100644
--- a/blueprints/test-framework-detector.js
+++ b/blueprints/test-framework-detector.js
@@ -4,12 +4,12 @@ const fs = require('fs');
 const path = require('path');
 const VersionChecker = require('ember-cli-version-checker');
 
-module.exports = function(blueprint) {
-  blueprint.supportsAddon = function() {
+module.exports = function (blueprint) {
+  blueprint.supportsAddon = function () {
     return false;
   };
 
-  blueprint.filesPath = function() {
+  blueprint.filesPath = function () {
     let type;
 
     let dependencies = this.project.dependencies();
diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
index a52f1eb7aa9..16f69b856d6 100644
--- a/blueprints/util-test/index.js
+++ b/blueprints/util-test/index.js
@@ -19,7 +19,7 @@ module.exports = useTestFrameworkDetector({
     };
   },
 
-  locals: function(options) {
+  locals: function (options) {
     return {
       friendlyTestName: ['Unit', 'Utility', options.entity.name].join(' | '),
       dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
index 755a5745e6b..dd9b34d9f86 100644
--- a/blueprints/util/index.js
+++ b/blueprints/util/index.js
@@ -2,7 +2,7 @@
 
 module.exports = {
   description: 'Generates a simple utility module/function.',
-  normalizeEntityName: function(entityName) {
+  normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
 };
diff --git a/broccoli/babel-helpers.js b/broccoli/babel-helpers.js
index 9d4818114f0..cbc20d8855d 100644
--- a/broccoli/babel-helpers.js
+++ b/broccoli/babel-helpers.js
@@ -2,7 +2,7 @@
 
 const Funnel = require('broccoli-funnel');
 
-module.exports = function() {
+module.exports = function () {
   return new Funnel('packages/external-helpers/lib', {
     files: ['external-helpers.js'],
     getDestinationPath() {
diff --git a/broccoli/deprecated-features.js b/broccoli/deprecated-features.js
index 743c974812d..f8073718f02 100644
--- a/broccoli/deprecated-features.js
+++ b/broccoli/deprecated-features.js
@@ -21,10 +21,10 @@ const DEPRECATED_FEATURES = (function getFeatures() {
   let sourceFile = ts.createSourceFile(fileName, contents, ts.ScriptTarget.ES2017);
   let flags = {};
 
-  sourceFile.statements.forEach(statement => {
+  sourceFile.statements.forEach((statement) => {
     if (
       statement.kind === ts.SyntaxKind.VariableStatement &&
-      statement.modifiers.some(m => m.kind === ts.SyntaxKind.ExportKeyword)
+      statement.modifiers.some((m) => m.kind === ts.SyntaxKind.ExportKeyword)
     ) {
       handleExportedDeclaration(statement, flags);
     }
diff --git a/broccoli/glimmer-template-compiler.js b/broccoli/glimmer-template-compiler.js
index 5baa7f8551b..6cb49b89e2e 100644
--- a/broccoli/glimmer-template-compiler.js
+++ b/broccoli/glimmer-template-compiler.js
@@ -22,11 +22,11 @@ function GlimmerTemplatePrecompiler(inputTree, options) {
 GlimmerTemplatePrecompiler.prototype.extensions = ['hbs'];
 GlimmerTemplatePrecompiler.prototype.targetExtension = 'js';
 
-GlimmerTemplatePrecompiler.prototype.baseDir = function() {
+GlimmerTemplatePrecompiler.prototype.baseDir = function () {
   return __dirname;
 };
 
-GlimmerTemplatePrecompiler.prototype.processString = function(content, relativePath) {
+GlimmerTemplatePrecompiler.prototype.processString = function (content, relativePath) {
   let compiled = this.precompile(content, {
     meta: { moduleName: relativePath },
   });
diff --git a/broccoli/package-json-writer.js b/broccoli/package-json-writer.js
index c00c8f286b0..4e6e6a746ae 100644
--- a/broccoli/package-json-writer.js
+++ b/broccoli/package-json-writer.js
@@ -26,9 +26,9 @@ module.exports = class PackageJSONWriter extends Plugin {
   build() {
     let packages = this.discoverPackages();
 
-    packages.forEach(packageName => {
+    packages.forEach((packageName) => {
       this.writeMainPackageJson(packageName);
-      this.discoverEntryPoints(packageName).forEach(entryPoint => {
+      this.discoverEntryPoints(packageName).forEach((entryPoint) => {
         this.writeEntryPointPackageJson(packageName, entryPoint);
       });
     });
@@ -53,11 +53,11 @@ module.exports = class PackageJSONWriter extends Plugin {
    */
   discoverEntryPoints(packageName) {
     let files = this.glob(`${packageName}/!(index).js`)
-      .map(file => path.basename(file, '.js'))
-      .map(file => [file, true]);
+      .map((file) => path.basename(file, '.js'))
+      .map((file) => [file, true]);
     let directories = this.glob(`${packageName}/!(lib|tests)/`)
-      .map(file => path.basename(file))
-      .map(file => [file, false]);
+      .map((file) => path.basename(file))
+      .map((file) => [file, false]);
 
     return [...files, ...directories];
   }
diff --git a/broccoli/transforms/inject-node-globals.js b/broccoli/transforms/inject-node-globals.js
index 5ead4a3d799..b5bba89fc1e 100644
--- a/broccoli/transforms/inject-node-globals.js
+++ b/broccoli/transforms/inject-node-globals.js
@@ -45,7 +45,7 @@ function injectNodeGlobals({ types: t }) {
   };
 }
 
-injectNodeGlobals.baseDir = function() {
+injectNodeGlobals.baseDir = function () {
   return 'babel-plugin-transform-es2015-modules-amd';
 };
 
diff --git a/d8-app.js b/d8-app.js
index 0b237bfc513..0e1738f711b 100644
--- a/d8-app.js
+++ b/d8-app.js
@@ -5,8 +5,8 @@ let Router = Ember.Router.extend({
   location: 'none',
   rootURL: '/',
 });
-Router.map(function() {
-  this.route('my-route', { path: '/my-route' }, function() {});
+Router.map(function () {
+  this.route('my-route', { path: '/my-route' }, function () {});
 });
 Ember.TEMPLATES['index'] = Ember.HTMLBars.template({
   id: null,
@@ -35,19 +35,19 @@ let options = {
 };
 app
   .visit('/', options)
-  .then(function(instance) {
+  .then(function (instance) {
     print(serializer.serialize(doc.body));
     let router = instance.lookup('router:main');
     return router.transitionTo('/my-route');
   })
-  .then(function() {
-    return new Ember.RSVP.Promise(function(resolve) {
+  .then(function () {
+    return new Ember.RSVP.Promise(function (resolve) {
       Ember.run.schedule('afterRender', resolve);
     });
   })
-  .then(function() {
+  .then(function () {
     print(serializer.serialize(doc.body));
   })
-  .catch(function(err) {
+  .catch(function (err) {
     print(err.stack);
   });
diff --git a/d8-runner.js b/d8-runner.js
index 1234ce41ef6..18fa7de7223 100644
--- a/d8-runner.js
+++ b/d8-runner.js
@@ -52,11 +52,11 @@ global.console = {
   },
 };
 
-global.setTimeout = function(callback) {
+global.setTimeout = function (callback) {
   // good enough
   Promise.resolve()
     .then(callback)
-    .catch(e => print('error' + e));
+    .catch((e) => print('error' + e));
 };
 loadFile('./node_modules/simple-dom/dist/simple-dom.js');
 
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 64f0b7d1aa5..8c0254be9bc 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -60,8 +60,8 @@ function withTargets(project, fn) {
   };
 }
 
-module.exports = function({ project }) {
-  let emberSource = project.addons.find(a => a.name === 'ember-source');
+module.exports = function ({ project }) {
+  let emberSource = project.addons.find((a) => a.name === 'ember-source');
 
   let transpileTree = withTargets(project, emberSource.transpileTree.bind(emberSource));
   let emberBundles = withTargets(project, emberSource.buildEmberBundles.bind(emberSource));
diff --git a/lib/index.js b/lib/index.js
index b14203c05ca..866bb7fed7c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -22,7 +22,7 @@ const absolutePaths = {};
 function add(paths, name, path) {
   Object.defineProperty(paths, name, {
     configurable: false,
-    get: function() {
+    get: function () {
       return path;
     },
   });
@@ -70,7 +70,7 @@ module.exports = {
     const { has } = require('@ember/edition-utils');
 
     if (has('octane')) {
-      let optionalFeatures = this.project.addons.find(a => a.name === '@ember/optional-features');
+      let optionalFeatures = this.project.addons.find((a) => a.name === '@ember/optional-features');
       let optionalFeaturesMissing = optionalFeatures === undefined;
       let message = [];
 
@@ -129,7 +129,7 @@ module.exports = {
   },
 
   transpileTree(tree, isProduction, shouldCompileModules) {
-    let emberCliBabel = this.addons.find(a => a.name === 'ember-cli-babel');
+    let emberCliBabel = this.addons.find((a) => a.name === 'ember-cli-babel');
 
     let parentOptions = this.parent && this.parent.options;
     let appOptions = this.app && this.app.options;
@@ -250,7 +250,7 @@ module.exports = {
 
     if (
       !isProduction &&
-      PRE_BUILT_TARGETS.every(target => targets.includes(target)) &&
+      PRE_BUILT_TARGETS.every((target) => targets.includes(target)) &&
       targets.length === PRE_BUILT_TARGETS.length
     ) {
       ember = new Funnel(tree, {
diff --git a/lib/transforms/inject-babel-helpers.js b/lib/transforms/inject-babel-helpers.js
index 2cb4c90564e..829be8114b2 100644
--- a/lib/transforms/inject-babel-helpers.js
+++ b/lib/transforms/inject-babel-helpers.js
@@ -10,7 +10,7 @@ function injectBabelHelpers(isEmberSource = false) {
     params: { isEmberSource },
   };
 
-  helperplugin.baseDir = function() {
+  helperplugin.baseDir = function () {
     return 'babel-core';
   };
 
@@ -20,7 +20,7 @@ function injectBabelHelpers(isEmberSource = false) {
 function injectBabelHelpersPlugin(isEmberSource) {
   return {
     pre(file) {
-      file.set('helperGenerator', function(name) {
+      file.set('helperGenerator', function (name) {
         if (name === 'extends') {
           return addNamed(file.path, 'assign', '@ember/polyfills');
         } else if (isEmberSource && name === 'asyncToGenerator') {
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index 8266fa9b7d4..70a32e23d7b 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: acceptance-test', function() {
+describe('Blueprint: acceptance-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,8 +29,8 @@ describe('Blueprint: acceptance-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
             fixture('acceptance-test/default.js')
           );
@@ -38,8 +38,8 @@ describe('Blueprint: acceptance-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -47,8 +47,8 @@ describe('Blueprint: acceptance-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
             fixture('acceptance-test/qunit-rfc268.js')
           );
@@ -56,16 +56,16 @@ describe('Blueprint: acceptance-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
         ]);
       });
 
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
             fixture('acceptance-test/mocha.js')
           );
@@ -73,8 +73,8 @@ describe('Blueprint: acceptance-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -82,8 +82,8 @@ describe('Blueprint: acceptance-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
             fixture('acceptance-test/mocha-rfc268.js')
           );
@@ -92,13 +92,13 @@ describe('Blueprint: acceptance-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -106,8 +106,8 @@ describe('Blueprint: acceptance-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
             fixture('acceptance-test/addon-default.js')
           );
@@ -116,8 +116,8 @@ describe('Blueprint: acceptance-test', function() {
         });
       });
 
-      it('acceptance-test foo/bar', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo/bar'], _file => {
+      it('acceptance-test foo/bar', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo/bar'], (_file) => {
           expect(_file('tests/acceptance/foo/bar-test.js')).to.equal(
             fixture('acceptance-test/addon-nested.js')
           );
@@ -127,8 +127,8 @@ describe('Blueprint: acceptance-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -136,8 +136,8 @@ describe('Blueprint: acceptance-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('acceptance-test foo', function() {
-        return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
             fixture('acceptance-test/qunit-rfc268.js')
           );
diff --git a/node-tests/blueprints/component-addon-test.js b/node-tests/blueprints/component-addon-test.js
index 0cfe86356db..b2f898f330f 100644
--- a/node-tests/blueprints/component-addon-test.js
+++ b/node-tests/blueprints/component-addon-test.js
@@ -8,23 +8,23 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: component-addon', function() {
+describe('Blueprint: component-addon', function () {
   setupTestHooks(this);
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('component-addon foo', function() {
-      return emberGenerateDestroy(['component-addon', 'foo'], _file => {
+    it('component-addon foo', function () {
+      return emberGenerateDestroy(['component-addon', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.contain(
           "export { default } from 'my-addon/components/foo';"
         );
       });
     });
-    it('component-addon foo-bar', function() {
-      return emberGenerateDestroy(['component-addon', 'foo-bar'], _file => {
+    it('component-addon foo-bar', function () {
+      return emberGenerateDestroy(['component-addon', 'foo-bar'], (_file) => {
         expect(_file('app/components/foo-bar.js')).to.contain(
           "export { default } from 'my-addon/components/foo-bar';"
         );
diff --git a/node-tests/blueprints/component-class-addon-test.js b/node-tests/blueprints/component-class-addon-test.js
index a5acecacb79..1dcdd80caaa 100644
--- a/node-tests/blueprints/component-class-addon-test.js
+++ b/node-tests/blueprints/component-class-addon-test.js
@@ -8,23 +8,23 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: component-class-addon', function() {
+describe('Blueprint: component-class-addon', function () {
   setupTestHooks(this);
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('component-addon foo', function() {
-      return emberGenerateDestroy(['component-class-addon', 'foo'], _file => {
+    it('component-addon foo', function () {
+      return emberGenerateDestroy(['component-class-addon', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.contain(
           "export { default } from 'my-addon/components/foo';"
         );
       });
     });
-    it('component-addon foo-bar', function() {
-      return emberGenerateDestroy(['component-class-addon', 'foo-bar'], _file => {
+    it('component-addon foo-bar', function () {
+      return emberGenerateDestroy(['component-class-addon', 'foo-bar'], (_file) => {
         expect(_file('app/components/foo-bar.js')).to.contain(
           "export { default } from 'my-addon/components/foo-bar';"
         );
diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js
index f7d358d4d1a..5fd49f4258a 100644
--- a/node-tests/blueprints/component-class-test.js
+++ b/node-tests/blueprints/component-class-test.js
@@ -35,11 +35,11 @@ const templateOnlyContents = `import templateOnly from '@ember/component/templat
 export default templateOnly();
 `;
 
-describe('Blueprint: component-class', function() {
+describe('Blueprint: component-class', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -50,15 +50,15 @@ describe('Blueprint: component-class', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-class foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo'], _file => {
+    it('component-class foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
       });
     });
 
     if (EMBER_SET_COMPONENT_TEMPLATE) {
       // classic default
-      it('component-class foo --component-structure=classic --component-class=@ember/component', function() {
+      it('component-class foo --component-structure=classic --component-class=@ember/component', function () {
         return emberGenerateDestroy(
           [
             'component-class',
@@ -68,14 +68,14 @@ describe('Blueprint: component-class', function() {
             '--component-class',
             '@ember/component',
           ],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
           }
         );
       });
 
       // Octane default
-      it('component-class foo --component-structure=flat --component-class=@glimmer/component', function() {
+      it('component-class foo --component-structure=flat --component-class=@glimmer/component', function () {
         return emberGenerateDestroy(
           [
             'component-class',
@@ -85,122 +85,125 @@ describe('Blueprint: component-class', function() {
             '@glimmer/component',
             'foo',
           ],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
           }
         );
       });
 
-      it('component-class foo --component-structure=flat', function() {
+      it('component-class foo --component-structure=flat', function () {
         return emberGenerateDestroy(
           ['component-class', '--component-structure', 'flat', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
           }
         );
       });
 
-      it('component-class foo --component-structure=nested', function() {
+      it('component-class foo --component-structure=nested', function () {
         return emberGenerateDestroy(
           ['component-class', '--component-structure', 'nested', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo/index.js')).to.equal(emberComponentContents);
           }
         );
       });
 
-      it('component-class foo --component-structure=classic', function() {
+      it('component-class foo --component-structure=classic', function () {
         return emberGenerateDestroy(
           ['component-class', '--component-structure', 'classic', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
           }
         );
       });
 
-      it('component-class foo --component-class=@ember/component', function() {
+      it('component-class foo --component-class=@ember/component', function () {
         return emberGenerateDestroy(
           ['component-class', '--component-class', '@ember/component', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
           }
         );
       });
 
-      it('component-class foo --component-class=@glimmer/component', function() {
+      it('component-class foo --component-class=@glimmer/component', function () {
         return emberGenerateDestroy(
           ['component-class', '--component-class', '@glimmer/component', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
           }
         );
       });
 
-      it('component-class foo --component-class=@ember/component/template-only', function() {
+      it('component-class foo --component-class=@ember/component/template-only', function () {
         return emberGenerateDestroy(
           ['component-class', '--component-class', '@ember/component/template-only', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(templateOnlyContents);
           }
         );
       });
     }
 
-    it('component-class x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo'], _file => {
+    it('component-class x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
       });
     });
 
-    it('component-class foo/x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], _file => {
+    it('component-class foo/x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
         expect(_file('app/components/foo/x-foo.js')).to.equal(
           fixture('component/component-nested.js')
         );
       });
     });
 
-    it('component-class x-foo --path foo', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--path', 'foo'], _file => {
+    it('component-class x-foo --path foo', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo', '--path', 'foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
       });
     });
 
-    it('component-class foo.js', function() {
-      return emberGenerateDestroy(['component-class', 'foo.js'], _file => {
+    it('component-class foo.js', function () {
+      return emberGenerateDestroy(['component-class', 'foo.js'], (_file) => {
         expect(_file('app/components/foo.js.js')).to.not.exist;
         expect(_file('app/components/foo.js')).to.equal(fixture('component/component.js'));
       });
     });
 
-    it('component-class x-foo --pod', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], _file => {
+    it('component-class x-foo --pod', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
         expect(_file('app/components/x-foo/component.js')).to.equal(
           fixture('component/component-dash.js')
         );
       });
     });
 
-    it('component-class foo/x-foo --pod', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], _file => {
+    it('component-class foo/x-foo --pod', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], (_file) => {
         expect(_file('app/components/foo/x-foo/component.js')).to.equal(
           fixture('component/component-nested.js')
         );
       });
     });
 
-    it('component-class x-foo --pod --path foo', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '--path', 'foo'], _file => {
-        expect(_file('app/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-      });
+    it('component-class x-foo --pod --path foo', function () {
+      return emberGenerateDestroy(
+        ['component-class', 'x-foo', '--pod', '--path', 'foo'],
+        (_file) => {
+          expect(_file('app/foo/x-foo/component.js')).to.equal(
+            fixture('component/component-dash.js')
+          );
+        }
+      );
     });
 
-    it('component-class foo/x-foo --pod --path bar', function() {
+    it('component-class foo/x-foo --pod --path bar', function () {
       return emberGenerateDestroy(
         ['component-class', 'foo/x-foo', '--pod', '--path', 'bar'],
-        _file => {
+        (_file) => {
           expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
             fixture('component/component-nested.js')
           );
@@ -208,10 +211,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class x-foo --pod --path bar/foo', function() {
+    it('component-class x-foo --pod --path bar/foo', function () {
       return emberGenerateDestroy(
         ['component-class', 'x-foo', '--pod', '--path', 'bar/foo'],
-        _file => {
+        (_file) => {
           expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
             fixture('component/component-dash.js')
           );
@@ -219,10 +222,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class foo/x-foo --pod --path bar/baz', function() {
+    it('component-class foo/x-foo --pod --path bar/baz', function () {
       return emberGenerateDestroy(
         ['component-class', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
-        _file => {
+        (_file) => {
           expect(_file('app/bar/baz/foo/x-foo/component.js')).to.equal(
             fixture('component/component-nested.js')
           );
@@ -230,22 +233,25 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class x-foo --pod -no-path', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], _file => {
+    it('component-class x-foo --pod -no-path', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], (_file) => {
         expect(_file('app/x-foo/component.js')).to.equal(fixture('component/component-dash.js'));
       });
     });
 
-    it('component-class foo/x-foo --pod -no-path', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod', '-no-path'], _file => {
-        expect(_file('app/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
-      });
+    it('component-class foo/x-foo --pod -no-path', function () {
+      return emberGenerateDestroy(
+        ['component-class', 'foo/x-foo', '--pod', '-no-path'],
+        (_file) => {
+          expect(_file('app/foo/x-foo/component.js')).to.equal(
+            fixture('component/component-nested.js')
+          );
+        }
+      );
     });
 
-    it('component-class x-foo.js --pod', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo.js', '--pod'], _file => {
+    it('component-class x-foo.js --pod', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo.js', '--pod'], (_file) => {
         expect(_file('app/components/x-foo.js/component.js')).to.not.exist;
         expect(_file('app/components/x-foo/component.js')).to.equal(
           fixture('component/component-dash.js')
@@ -253,39 +259,39 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('component-class foo --pod', function() {
-        return emberGenerateDestroy(['component-class', 'foo', '--pod'], _file => {
+      it('component-class foo --pod', function () {
+        return emberGenerateDestroy(['component-class', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/component.js')).to.equal(
             fixture('component/component.js')
           );
         });
       });
 
-      it('component-class x-foo --pod', function() {
-        return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], _file => {
+      it('component-class x-foo --pod', function () {
+        return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/x-foo/component.js')).to.equal(
             fixture('component/component-dash.js')
           );
         });
       });
 
-      it('component-class foo/x-foo --pod', function() {
-        return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], _file => {
+      it('component-class foo/x-foo --pod', function () {
+        return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/x-foo/component.js')).to.equal(
             fixture('component/component-nested.js')
           );
         });
       });
 
-      it('component-class x-foo --pod --path foo', function() {
+      it('component-class x-foo --pod --path foo', function () {
         return emberGenerateDestroy(
           ['component-class', 'x-foo', '--pod', '--path', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
               fixture('component/component-dash.js')
             );
@@ -293,10 +299,10 @@ describe('Blueprint: component-class', function() {
         );
       });
 
-      it('component-class foo/x-foo --pod --path bar', function() {
+      it('component-class foo/x-foo --pod --path bar', function () {
         return emberGenerateDestroy(
           ['component-class', 'foo/x-foo', '--pod', '--path', 'bar'],
-          _file => {
+          (_file) => {
             expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
               fixture('component/component-nested.js')
             );
@@ -304,10 +310,10 @@ describe('Blueprint: component-class', function() {
         );
       });
 
-      it('component-class x-foo --pod --path bar/foo', function() {
+      it('component-class x-foo --pod --path bar/foo', function () {
         return emberGenerateDestroy(
           ['component-class', 'x-foo', '--pod', '--path', 'bar/foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
               fixture('component/component-dash.js')
             );
@@ -315,10 +321,10 @@ describe('Blueprint: component-class', function() {
         );
       });
 
-      it('component-class foo/x-foo --pod --path bar/baz', function() {
+      it('component-class foo/x-foo --pod --path bar/baz', function () {
         return emberGenerateDestroy(
           ['component-class', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
-          _file => {
+          (_file) => {
             expect(_file('app/pods/bar/baz/foo/x-foo/component.js')).to.equal(
               fixture('component/component-nested.js')
             );
@@ -326,18 +332,18 @@ describe('Blueprint: component-class', function() {
         );
       });
 
-      it('component-class x-foo --pod -no-path', function() {
-        return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], _file => {
+      it('component-class x-foo --pod -no-path', function () {
+        return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], (_file) => {
           expect(_file('app/pods/x-foo/component.js')).to.equal(
             fixture('component/component-dash.js')
           );
         });
       });
 
-      it('component-class foo/x-foo --pod -no-path', function() {
+      it('component-class foo/x-foo --pod -no-path', function () {
         return emberGenerateDestroy(
           ['component-class', 'foo/x-foo', '--pod', '-no-path'],
-          _file => {
+          (_file) => {
             expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
               fixture('component/component-nested.js')
             );
@@ -347,10 +353,10 @@ describe('Blueprint: component-class', function() {
     });
   });
 
-  describe('in app - octane', function() {
+  describe('in app - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -361,22 +367,22 @@ describe('Blueprint: component-class', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-class foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo'], _file => {
+    it('component-class foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
       });
     });
 
-    it('component-class x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo'], _file => {
+    it('component-class x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.equal(
           glimmerComponentContents.replace('FooComponent', 'XFooComponent')
         );
       });
     });
 
-    it('component-class x-foo.js', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo.js'], _file => {
+    it('component-class x-foo.js', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo.js'], (_file) => {
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
         expect(_file('app/components/x-foo.js')).to.equal(
           glimmerComponentContents.replace('FooComponent', 'XFooComponent')
@@ -384,18 +390,18 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class foo/x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], _file => {
+    it('component-class foo/x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
         expect(_file('app/components/foo/x-foo.js')).to.equal(
           glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
         );
       });
     });
 
-    it('component-class foo/x-foo --component-class="@glimmer/component"', function() {
+    it('component-class foo/x-foo --component-class="@glimmer/component"', function () {
       return emberGenerateDestroy(
         ['component-class', 'foo/x-foo', '--component-class', '@glimmer/component'],
-        _file => {
+        (_file) => {
           expect(_file('app/components/foo/x-foo.js')).to.equal(
             glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
           );
@@ -404,8 +410,8 @@ describe('Blueprint: component-class', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -416,8 +422,8 @@ describe('Blueprint: component-class', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-class foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo'], _file => {
+    it('component-class foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
         expect(_file('addon/components/foo.js')).to.equal(fixture('component/component-addon.js'));
         expect(_file('app/components/foo.js')).to.contain(
           "export { default } from 'my-addon/components/foo';"
@@ -425,8 +431,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo'], _file => {
+    it('component-class x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
         expect(_file('addon/components/x-foo.js')).to.equal(
           fixture('component/component-addon-dash.js')
         );
@@ -436,8 +442,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo.js', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo.js'], _file => {
+    it('component-class x-foo.js', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo.js'], (_file) => {
         expect(_file('addon/components/x-foo.js.js')).to.not.exist;
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
         expect(_file('addon/components/x-foo.js')).to.equal(
@@ -449,8 +455,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class foo/x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], _file => {
+    it('component-class foo/x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
         expect(_file('addon/components/foo/x-foo.js')).to.equal(
           fixture('component/component-addon-nested.js')
         );
@@ -460,8 +466,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo --dummy', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--dummy'], _file => {
+    it('component-class x-foo --dummy', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
           fixture('component/component-addon-dash.js')
         );
@@ -469,8 +475,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class foo/x-foo --dummy', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--dummy'], _file => {
+    it('component-class foo/x-foo --dummy', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.equal(
           fixture('component/component-addon-nested.js')
         );
@@ -478,8 +484,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo.js --dummy', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo.js', '--dummy'], _file => {
+    it('component-class x-foo.js --dummy', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js.js')).to.not.exist;
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
         expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
@@ -489,8 +495,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo --pod', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], _file => {
+    it('component-class x-foo --pod', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
         expect(_file('addon/components/x-foo/component.js')).to.equal(
           fixture('component/component-addon-dash-pod.js')
         );
@@ -501,10 +507,10 @@ describe('Blueprint: component-class', function() {
     });
   });
 
-  describe('in addon - octane', function() {
+  describe('in addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -515,8 +521,8 @@ describe('Blueprint: component-class', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-class foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo'], _file => {
+    it('component-class foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
         expect(_file('addon/components/foo.js')).to.equal(glimmerComponentContents);
         expect(_file('app/components/foo.js')).to.contain(
           "export { default } from 'my-addon/components/foo';"
@@ -524,8 +530,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo'], _file => {
+    it('component-class x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
         expect(_file('addon/components/x-foo.js')).to.equal(
           glimmerComponentContents.replace('FooComponent', 'XFooComponent')
         );
@@ -535,8 +541,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class foo/x-foo', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], _file => {
+    it('component-class foo/x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
         expect(_file('addon/components/foo/x-foo.js')).to.equal(
           glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
         );
@@ -546,8 +552,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class x-foo --dummy', function() {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--dummy'], _file => {
+    it('component-class x-foo --dummy', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js')).equal(
           glimmerComponentContents.replace('FooComponent', 'XFooComponent')
         );
@@ -555,8 +561,8 @@ describe('Blueprint: component-class', function() {
       });
     });
 
-    it('component-class foo/x-foo --dummy', function() {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--dummy'], _file => {
+    it('component-class foo/x-foo --dummy', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.equal(
           glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
         );
@@ -565,8 +571,8 @@ describe('Blueprint: component-class', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -577,21 +583,24 @@ describe('Blueprint: component-class', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-class foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component-class', 'foo', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(
-          fixture('component/component-addon.js')
-        );
-        expect(_file('lib/my-addon/app/components/foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo';"
-        );
-      });
+    it('component-class foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['component-class', 'foo', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(
+            fixture('component/component-addon.js')
+          );
+          expect(_file('lib/my-addon/app/components/foo.js')).to.contain(
+            "export { default } from 'my-addon/components/foo';"
+          );
+        }
+      );
     });
 
-    it('component-class x-foo --in-repo-addon=my-addon', function() {
+    it('component-class x-foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['component-class', 'x-foo', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
             fixture('component/component-addon-dash.js')
           );
@@ -602,10 +611,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class x-foo.js --in-repo-addon=my-addon', function() {
+    it('component-class x-foo.js --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['component-class', 'x-foo.js', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo.js.js')).to.not.exist;
           expect(_file('lib/my-addon/app/components/x-foo.js.js')).to.not.exist;
 
@@ -619,10 +628,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class foo/x-foo --in-repo-addon=my-addon', function() {
+    it('component-class foo/x-foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['component-class', 'foo/x-foo', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/foo/x-foo.js')).to.equal(
             fixture('component/component-addon-nested.js')
           );
@@ -633,10 +642,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class x-foo --in-repo-addon=my-addon --pod', function() {
+    it('component-class x-foo --in-repo-addon=my-addon --pod', function () {
       return emberGenerateDestroy(
         ['component-class', 'x-foo', '--in-repo-addon=my-addon', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
             fixture('component/component-addon-dash-pod.js')
           );
@@ -647,10 +656,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class x-foo.js --in-repo-addon=my-addon --pod', function() {
+    it('component-class x-foo.js --in-repo-addon=my-addon --pod', function () {
       return emberGenerateDestroy(
         ['component-class', 'x-foo.js', '--in-repo-addon=my-addon', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo/component.js.js')).to.not.exist;
           expect(_file('lib/my-addon/app/components/x-foo/component.js.js')).to.not.exist;
           expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
@@ -663,10 +672,10 @@ describe('Blueprint: component-class', function() {
       );
     });
 
-    it('component-class foo/x-foo --in-repo-addon=my-addon --pod', function() {
+    it('component-class foo/x-foo --in-repo-addon=my-addon --pod', function () {
       return emberGenerateDestroy(
         ['component-class', 'foo/x-foo', '--in-repo-addon=my-addon', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/foo/x-foo/component.js')).to.equal(
             fixture('component/component-addon-nested-pod.js')
           );
@@ -678,10 +687,10 @@ describe('Blueprint: component-class', function() {
     });
   });
 
-  describe('in in-repo-addon - octane', function() {
+  describe('in in-repo-addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -692,19 +701,22 @@ describe('Blueprint: component-class', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-class foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component-class', 'foo', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(glimmerComponentContents);
-        expect(_file('lib/my-addon/app/components/foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo';"
-        );
-      });
+    it('component-class foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['component-class', 'foo', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(glimmerComponentContents);
+          expect(_file('lib/my-addon/app/components/foo.js')).to.contain(
+            "export { default } from 'my-addon/components/foo';"
+          );
+        }
+      );
     });
 
-    it('component-class x-foo --in-repo-addon=my-addon', function() {
+    it('component-class x-foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['component-class', 'x-foo', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
             glimmerComponentContents.replace('FooComponent', 'XFooComponent')
           );
diff --git a/node-tests/blueprints/component-test-test.js b/node-tests/blueprints/component-test-test.js
index 9a7dd61cc5e..d921f4f6658 100644
--- a/node-tests/blueprints/component-test-test.js
+++ b/node-tests/blueprints/component-test-test.js
@@ -14,25 +14,25 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: component-test', function() {
+describe('Blueprint: component-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with default setup', function() {
-      it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+    describe('with default setup', function () {
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/rfc232.js')
           );
         });
       });
 
-      it('component-test x-foo --unit', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/rfc232-unit.js')
           );
@@ -40,8 +40,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -49,24 +49,24 @@ describe('Blueprint: component-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/default.js')
           );
         });
       });
 
-      it('component-test x-foo --unit', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/unit.js')
           );
         });
       });
 
-      describe('with usePods=true', function() {
-        beforeEach(function() {
+      describe('with usePods=true', function () {
+        beforeEach(function () {
           fs.writeFileSync(
             '.ember-cli',
             `{
@@ -76,8 +76,8 @@ describe('Blueprint: component-test', function() {
           );
         });
 
-        it('component-test x-foo', function() {
-          return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+        it('component-test x-foo', function () {
+          return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
             expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal(
               fixture('component-test/default.js')
             );
@@ -86,8 +86,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -95,16 +95,16 @@ describe('Blueprint: component-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/rfc232.js')
           );
         });
       });
 
-      it('component-test x-foo --unit', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/rfc232-unit.js')
           );
@@ -112,8 +112,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.11.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -121,16 +121,16 @@ describe('Blueprint: component-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.11.0');
       });
 
-      it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/mocha.js')
           );
         });
       });
 
-      it('component-test x-foo --unit', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/mocha-unit.js')
           );
@@ -138,8 +138,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.12.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -147,16 +147,16 @@ describe('Blueprint: component-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.12.0');
       });
 
-      it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/mocha-0.12.js')
           );
         });
       });
 
-      it('component-test x-foo --unit', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/mocha-0.12-unit.js')
           );
@@ -164,8 +164,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -173,16 +173,16 @@ describe('Blueprint: component-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('component-test x-foo', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/mocha-rfc232.js')
           );
         });
       });
 
-      it('component-test x-foo --unit', function() {
-        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/mocha-rfc232-unit.js')
           );
@@ -191,8 +191,8 @@ describe('Blueprint: component-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -203,8 +203,8 @@ describe('Blueprint: component-test', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-test x-foo', function() {
-      return emberGenerateDestroy(['component-test', 'x-foo'], _file => {
+    it('component-test x-foo', function () {
+      return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
         expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
           fixture('component-test/default.js')
         );
@@ -213,8 +213,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    it('component-test x-foo --unit', function() {
-      return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], _file => {
+    it('component-test x-foo --unit', function () {
+      return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
         expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
           fixture('component-test/unit.js')
         );
@@ -223,8 +223,8 @@ describe('Blueprint: component-test', function() {
       });
     });
 
-    it('component-test x-foo --dummy', function() {
-      return emberGenerateDestroy(['component-test', 'x-foo', '--dummy'], _file => {
+    it('component-test x-foo --dummy', function () {
+      return emberGenerateDestroy(['component-test', 'x-foo', '--dummy'], (_file) => {
         expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
           fixture('component-test/default.js')
         );
@@ -234,8 +234,8 @@ describe('Blueprint: component-test', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -246,10 +246,10 @@ describe('Blueprint: component-test', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component-test x-foo --in-repo-addon=my-addon', function() {
+    it('component-test x-foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['component-test', 'x-foo', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
             fixture('component-test/default.js')
           );
@@ -257,10 +257,10 @@ describe('Blueprint: component-test', function() {
       );
     });
 
-    it('component-test x-foo --in-repo-addon=my-addon --unit', function() {
+    it('component-test x-foo --in-repo-addon=my-addon --unit', function () {
       return emberGenerateDestroy(
         ['component-test', 'x-foo', '--in-repo-addon=my-addon', '--unit'],
-        _file => {
+        (_file) => {
           expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
             fixture('component-test/unit.js')
           );
diff --git a/node-tests/blueprints/component-test.js b/node-tests/blueprints/component-test.js
index 37c0021ad1c..523662c9adf 100644
--- a/node-tests/blueprints/component-test.js
+++ b/node-tests/blueprints/component-test.js
@@ -35,11 +35,11 @@ const templateOnlyContents = `import templateOnly from '@ember/component/templat
 export default templateOnly();
 `;
 
-describe('Blueprint: component', function() {
+describe('Blueprint: component', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -50,8 +50,8 @@ describe('Blueprint: component', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component foo', function() {
-      return emberGenerateDestroy(['component', 'foo'], _file => {
+    it('component foo', function () {
+      return emberGenerateDestroy(['component', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
 
         expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -69,7 +69,7 @@ describe('Blueprint: component', function() {
 
     if (EMBER_SET_COMPONENT_TEMPLATE) {
       // classic default
-      it('component foo --component-structure=classic --component-class=@ember/component', function() {
+      it('component foo --component-structure=classic --component-class=@ember/component', function () {
         return emberGenerateDestroy(
           [
             'component',
@@ -79,7 +79,7 @@ describe('Blueprint: component', function() {
             '--component-class',
             '@ember/component',
           ],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
 
             expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -97,7 +97,7 @@ describe('Blueprint: component', function() {
       });
 
       // Octane default
-      it('component foo --component-structure=flat --component-class=@glimmer/component', function() {
+      it('component foo --component-structure=flat --component-class=@glimmer/component', function () {
         return emberGenerateDestroy(
           [
             'component',
@@ -107,7 +107,7 @@ describe('Blueprint: component', function() {
             '@glimmer/component',
             'foo',
           ],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
 
             expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
@@ -124,10 +124,10 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --component-structure=flat', function() {
+      it('component foo --component-structure=flat', function () {
         return emberGenerateDestroy(
           ['component', '--component-structure', 'flat', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
 
             expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
@@ -144,10 +144,10 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --component-structure=nested', function() {
+      it('component foo --component-structure=nested', function () {
         return emberGenerateDestroy(
           ['component', '--component-structure', 'nested', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo/index.js')).to.equal(emberComponentContents);
 
             expect(_file('app/components/foo/index.hbs')).to.equal('{{yield}}');
@@ -164,10 +164,10 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --component-structure=classic', function() {
+      it('component foo --component-structure=classic', function () {
         return emberGenerateDestroy(
           ['component', '--component-structure', 'classic', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
 
             expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -184,10 +184,10 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --component-class=@ember/component', function() {
+      it('component foo --component-class=@ember/component', function () {
         return emberGenerateDestroy(
           ['component', '--component-class', '@ember/component', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
 
             expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -204,10 +204,10 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --component-class=@glimmer/component', function() {
+      it('component foo --component-class=@glimmer/component', function () {
         return emberGenerateDestroy(
           ['component', '--component-class', '@glimmer/component', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
 
             expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -224,10 +224,10 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --component-class=@ember/component/template-only', function() {
+      it('component foo --component-class=@ember/component/template-only', function () {
         return emberGenerateDestroy(
           ['component', '--component-class', '@ember/component/template-only', 'foo'],
-          _file => {
+          (_file) => {
             expect(_file('app/components/foo.js')).to.equal(templateOnlyContents);
 
             expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -244,8 +244,8 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component foo --no-component-class', function() {
-        return emberGenerateDestroy(['component', '--no-component-class', 'foo'], _file => {
+      it('component foo --no-component-class', function () {
+        return emberGenerateDestroy(['component', '--no-component-class', 'foo'], (_file) => {
           expect(_file('app/components/foo.js')).to.not.exist;
 
           expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -261,8 +261,8 @@ describe('Blueprint: component', function() {
         });
       });
     }
-    it('component x-foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo'], _file => {
+    it('component x-foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
 
         expect(_file('app/templates/components/x-foo.hbs')).to.equal('{{yield}}');
@@ -278,8 +278,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo'], _file => {
+    it('component foo/x-foo', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo'], (_file) => {
         expect(_file('app/components/foo/x-foo.js')).to.equal(
           fixture('component/component-nested.js')
         );
@@ -297,8 +297,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --path foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--path', 'foo'], _file => {
+    it('component x-foo --path foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--path', 'foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
 
         expect(_file('app/templates/components/x-foo.hbs')).to.equal('{{yield}}');
@@ -314,8 +314,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo.js', function() {
-      return emberGenerateDestroy(['component', 'foo.js'], _file => {
+    it('component foo.js', function () {
+      return emberGenerateDestroy(['component', 'foo.js'], (_file) => {
         expect(_file('app/components/foo.js.js')).to.not.exist;
         expect(_file('app/templates/components/foo.js.hbs')).to.not.exist;
         expect(_file('tests/integration/components/foo.js-test.js')).to.not.exist;
@@ -335,8 +335,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --pod', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod'], _file => {
+    it('component x-foo --pod', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
         expect(_file('app/components/x-foo/component.js')).to.equal(
           fixture('component/component-dash.js')
         );
@@ -354,8 +354,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --pod', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], _file => {
+    it('component foo/x-foo --pod', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], (_file) => {
         expect(_file('app/components/foo/x-foo/component.js')).to.equal(
           fixture('component/component-nested.js')
         );
@@ -373,8 +373,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --pod --path foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], _file => {
+    it('component x-foo --pod --path foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], (_file) => {
         expect(_file('app/foo/x-foo/component.js')).to.equal(
           fixture('component/component-dash.js')
         );
@@ -393,8 +393,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --pod --path bar', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '--path', 'bar'], _file => {
+    it('component foo/x-foo --pod --path bar', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '--path', 'bar'], (_file) => {
         expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
           fixture('component/component-nested.js')
         );
@@ -413,8 +413,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --pod --path bar/foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'bar/foo'], _file => {
+    it('component x-foo --pod --path bar/foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'bar/foo'], (_file) => {
         expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
           fixture('component/component-dash.js')
         );
@@ -433,10 +433,10 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --pod --path bar/baz', function() {
+    it('component foo/x-foo --pod --path bar/baz', function () {
       return emberGenerateDestroy(
         ['component', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
-        _file => {
+        (_file) => {
           expect(_file('app/bar/baz/foo/x-foo/component.js')).to.equal(
             fixture('component/component-nested.js')
           );
@@ -456,8 +456,8 @@ describe('Blueprint: component', function() {
       );
     });
 
-    it('component x-foo --pod -no-path', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], _file => {
+    it('component x-foo --pod -no-path', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], (_file) => {
         expect(_file('app/x-foo/component.js')).to.equal(fixture('component/component-dash.js'));
 
         expect(_file('app/x-foo/template.hbs')).to.equal('{{yield}}');
@@ -473,8 +473,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --pod -no-path', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], _file => {
+    it('component foo/x-foo --pod -no-path', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], (_file) => {
         expect(_file('app/foo/x-foo/component.js')).to.equal(
           fixture('component/component-nested.js')
         );
@@ -492,8 +492,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo.js --pod', function() {
-      return emberGenerateDestroy(['component', 'x-foo.js', '--pod'], _file => {
+    it('component x-foo.js --pod', function () {
+      return emberGenerateDestroy(['component', 'x-foo.js', '--pod'], (_file) => {
         expect(_file('app/components/x-foo.js/component.js')).to.not.exist;
         expect(_file('app/components/x-foo.js/template.hbs')).to.not.exist;
         expect(_file('tests/integration/components/x-foo.js/component-test.js')).to.not.exist;
@@ -515,13 +515,13 @@ describe('Blueprint: component', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('component foo --pod', function() {
-        return emberGenerateDestroy(['component', 'foo', '--pod'], _file => {
+      it('component foo --pod', function () {
+        return emberGenerateDestroy(['component', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/component.js')).to.equal(
             fixture('component/component.js')
           );
@@ -539,8 +539,8 @@ describe('Blueprint: component', function() {
         });
       });
 
-      it('component x-foo --pod', function() {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod'], _file => {
+      it('component x-foo --pod', function () {
+        return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/x-foo/component.js')).to.equal(
             fixture('component/component-dash.js')
           );
@@ -558,8 +558,8 @@ describe('Blueprint: component', function() {
         });
       });
 
-      it('component foo/x-foo --pod', function() {
-        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], _file => {
+      it('component foo/x-foo --pod', function () {
+        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/x-foo/component.js')).to.equal(
             fixture('component/component-nested.js')
           );
@@ -577,8 +577,8 @@ describe('Blueprint: component', function() {
         });
       });
 
-      it('component x-foo --pod --path foo', function() {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], _file => {
+      it('component x-foo --pod --path foo', function () {
+        return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], (_file) => {
           expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
             fixture('component/component-dash.js')
           );
@@ -597,49 +597,55 @@ describe('Blueprint: component', function() {
         });
       });
 
-      it('component foo/x-foo --pod --path bar', function() {
-        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '--path', 'bar'], _file => {
-          expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
-          );
+      it('component foo/x-foo --pod --path bar', function () {
+        return emberGenerateDestroy(
+          ['component', 'foo/x-foo', '--pod', '--path', 'bar'],
+          (_file) => {
+            expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
+              fixture('component/component-nested.js')
+            );
 
-          expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
+            expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
 
-          expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo/x-foo',
-                componentInvocation: 'Foo::XFoo',
-                path: 'bar/',
-              },
-            })
-          );
-        });
+            expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
+              fixture('component-test/default-template.js', {
+                replace: {
+                  component: 'foo/x-foo',
+                  componentInvocation: 'Foo::XFoo',
+                  path: 'bar/',
+                },
+              })
+            );
+          }
+        );
       });
 
-      it('component x-foo --pod --path bar/foo', function() {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'bar/foo'], _file => {
-          expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
-          );
+      it('component x-foo --pod --path bar/foo', function () {
+        return emberGenerateDestroy(
+          ['component', 'x-foo', '--pod', '--path', 'bar/foo'],
+          (_file) => {
+            expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
+              fixture('component/component-dash.js')
+            );
 
-          expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-          expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
-                path: 'bar/foo/',
-              },
-            })
-          );
-        });
+            expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
+            expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
+              fixture('component-test/default-template.js', {
+                replace: {
+                  component: 'x-foo',
+                  componentInvocation: 'XFoo',
+                  path: 'bar/foo/',
+                },
+              })
+            );
+          }
+        );
       });
 
-      it('component foo/x-foo --pod --path bar/baz', function() {
+      it('component foo/x-foo --pod --path bar/baz', function () {
         return emberGenerateDestroy(
           ['component', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
-          _file => {
+          (_file) => {
             expect(_file('app/pods/bar/baz/foo/x-foo/component.js')).to.equal(
               fixture('component/component-nested.js')
             );
@@ -659,8 +665,8 @@ describe('Blueprint: component', function() {
         );
       });
 
-      it('component x-foo --pod -no-path', function() {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], _file => {
+      it('component x-foo --pod -no-path', function () {
+        return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], (_file) => {
           expect(_file('app/pods/x-foo/component.js')).to.equal(
             fixture('component/component-dash.js')
           );
@@ -678,8 +684,8 @@ describe('Blueprint: component', function() {
         });
       });
 
-      it('component foo/x-foo --pod -no-path', function() {
-        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], _file => {
+      it('component foo/x-foo --pod -no-path', function () {
+        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], (_file) => {
           expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
             fixture('component/component-nested.js')
           );
@@ -699,10 +705,10 @@ describe('Blueprint: component', function() {
     });
   });
 
-  describe('in app - octane', function() {
+  describe('in app - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -713,8 +719,8 @@ describe('Blueprint: component', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component foo', function() {
-      return emberGenerateDestroy(['component', 'foo'], _file => {
+    it('component foo', function () {
+      return emberGenerateDestroy(['component', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.not.exist;
         expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
 
@@ -729,8 +735,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo'], _file => {
+    it('component x-foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.not.exist;
         expect(_file('app/components/x-foo.hbs')).to.equal('{{yield}}');
 
@@ -745,8 +751,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo.js', function() {
-      return emberGenerateDestroy(['component', 'x-foo.js'], _file => {
+    it('component x-foo.js', function () {
+      return emberGenerateDestroy(['component', 'x-foo.js'], (_file) => {
         expect(_file('app/components/x-foo.js')).to.not.exist;
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
         expect(_file('app/templates/components/x-foo.js.hbs')).to.not.exist;
@@ -765,8 +771,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo'], _file => {
+    it('component foo/x-foo', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo'], (_file) => {
         expect(_file('app/components/foo/x-foo.js')).to.not.exist;
         expect(_file('app/components/foo/x-foo.hbs')).to.equal('{{yield}}');
 
@@ -781,10 +787,10 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --component-class="@glimmer/component"', function() {
+    it('component foo/x-foo --component-class="@glimmer/component"', function () {
       return emberGenerateDestroy(
         ['component', 'foo/x-foo', '--component-class', '@glimmer/component'],
-        _file => {
+        (_file) => {
           expect(_file('app/components/foo/x-foo.js')).to.equal(
             glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
           );
@@ -803,8 +809,8 @@ describe('Blueprint: component', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -815,8 +821,8 @@ describe('Blueprint: component', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component foo', function() {
-      return emberGenerateDestroy(['component', 'foo'], _file => {
+    it('component foo', function () {
+      return emberGenerateDestroy(['component', 'foo'], (_file) => {
         expect(_file('addon/components/foo.js')).to.equal(fixture('component/component-addon.js'));
 
         expect(_file('addon/templates/components/foo.hbs')).to.equal('{{yield}}');
@@ -836,8 +842,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo'], _file => {
+    it('component x-foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo'], (_file) => {
         expect(_file('addon/components/x-foo.js')).to.equal(
           fixture('component/component-addon-dash.js')
         );
@@ -859,8 +865,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo.js', function() {
-      return emberGenerateDestroy(['component', 'x-foo.js'], _file => {
+    it('component x-foo.js', function () {
+      return emberGenerateDestroy(['component', 'x-foo.js'], (_file) => {
         expect(_file('addon/components/x-foo.js.js')).to.not.exist;
         expect(_file('addon/templates/components/x-foo.js.hbs')).to.not.exist;
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
@@ -887,8 +893,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo'], _file => {
+    it('component foo/x-foo', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo'], (_file) => {
         expect(_file('addon/components/foo/x-foo.js')).to.equal(
           fixture('component/component-addon-nested.js')
         );
@@ -910,8 +916,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --dummy', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--dummy'], _file => {
+    it('component x-foo --dummy', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
           fixture('component/component-addon-dash.js')
         );
@@ -924,8 +930,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --dummy', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--dummy'], _file => {
+    it('component foo/x-foo --dummy', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.equal(
           fixture('component/component-addon-nested.js')
         );
@@ -938,8 +944,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo.js --dummy', function() {
-      return emberGenerateDestroy(['component', 'x-foo.js', '--dummy'], _file => {
+    it('component x-foo.js --dummy', function () {
+      return emberGenerateDestroy(['component', 'x-foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js.js')).to.not.exist;
         expect(_file('tests/dummy/app/templates/components/x-foo.js.hbs')).to.not.exist;
         expect(_file('app/components/x-foo.js.js')).to.not.exist;
@@ -957,8 +963,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --pod', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod'], _file => {
+    it('component x-foo --pod', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
         expect(_file('addon/components/x-foo/component.js')).to.equal(
           fixture('component/component-addon-dash-pod.js')
         );
@@ -981,10 +987,10 @@ describe('Blueprint: component', function() {
     });
   });
 
-  describe('in addon - octane', function() {
+  describe('in addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -995,8 +1001,8 @@ describe('Blueprint: component', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component foo', function() {
-      return emberGenerateDestroy(['component', 'foo'], _file => {
+    it('component foo', function () {
+      return emberGenerateDestroy(['component', 'foo'], (_file) => {
         expect(_file('addon/components/foo.js')).to.not.exist;
 
         expect(_file('addon/components/foo.hbs')).to.equal('{{yield}}');
@@ -1018,8 +1024,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo', function() {
-      return emberGenerateDestroy(['component', 'x-foo'], _file => {
+    it('component x-foo', function () {
+      return emberGenerateDestroy(['component', 'x-foo'], (_file) => {
         expect(_file('addon/components/x-foo.js')).to.not.exist;
 
         expect(_file('addon/components/x-foo.hbs')).to.equal('{{yield}}');
@@ -1042,8 +1048,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo'], _file => {
+    it('component foo/x-foo', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo'], (_file) => {
         expect(_file('addon/components/foo/x-foo.js')).to.not.exist;
 
         expect(_file('addon/components/foo/x-foo.hbs')).to.equal('{{yield}}');
@@ -1065,8 +1071,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --dummy', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--dummy'], _file => {
+    it('component x-foo --dummy', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/x-foo.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/components/x-foo.hbs')).to.equal('{{yield}}');
@@ -1079,8 +1085,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component foo/x-foo --dummy', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--dummy'], _file => {
+    it('component foo/x-foo --dummy', function () {
+      return emberGenerateDestroy(['component', 'foo/x-foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/components/foo/x-foo.hbs')).to.equal('{{yield}}');
@@ -1095,8 +1101,8 @@ describe('Blueprint: component', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -1107,8 +1113,8 @@ describe('Blueprint: component', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('component foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['component', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(
           fixture('component/component-addon.js')
         );
@@ -1130,8 +1136,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--in-repo-addon=my-addon'], _file => {
+    it('component x-foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
           fixture('component/component-addon-dash.js')
         );
@@ -1153,63 +1159,69 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component', 'x-foo.js', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/components/x-foo.js.js')).to.not.exist;
-        expect(_file('lib/my-addon/addon/templates/components/x-foo.js.hbs')).to.not.exist;
-        expect(_file('lib/my-addon/app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('tests/integration/components/x-foo-test.js.js')).to.not.exist;
-
-        expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
+    it('component x-foo.js --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['component', 'x-foo.js', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/components/x-foo.js.js')).to.not.exist;
+          expect(_file('lib/my-addon/addon/templates/components/x-foo.js.hbs')).to.not.exist;
+          expect(_file('lib/my-addon/app/components/x-foo.js.js')).to.not.exist;
+          expect(_file('tests/integration/components/x-foo-test.js.js')).to.not.exist;
+
+          expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
+            fixture('component/component-addon-dash.js')
+          );
 
-        expect(_file('lib/my-addon/addon/templates/components/x-foo.hbs')).to.equal('{{yield}}');
+          expect(_file('lib/my-addon/addon/templates/components/x-foo.hbs')).to.equal('{{yield}}');
 
-        expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo';"
-        );
+          expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
+            "export { default } from 'my-addon/components/x-foo';"
+          );
 
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
+          expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'x-foo',
+                componentInvocation: 'XFoo',
+              },
+            })
+          );
+        }
+      );
     });
 
-    it('component foo/x-foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-addon-nested.js')
-        );
+    it('component foo/x-foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['component', 'foo/x-foo', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/components/foo/x-foo.js')).to.equal(
+            fixture('component/component-addon-nested.js')
+          );
 
-        expect(_file('lib/my-addon/addon/templates/components/foo/x-foo.hbs')).to.equal(
-          '{{yield}}'
-        );
+          expect(_file('lib/my-addon/addon/templates/components/foo/x-foo.hbs')).to.equal(
+            '{{yield}}'
+          );
 
-        expect(_file('lib/my-addon/app/components/foo/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo/x-foo';"
-        );
+          expect(_file('lib/my-addon/app/components/foo/x-foo.js')).to.contain(
+            "export { default } from 'my-addon/components/foo/x-foo';"
+          );
 
-        expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo/x-foo',
-              componentInvocation: 'Foo::XFoo',
-            },
-          })
-        );
-      });
+          expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo/x-foo',
+                componentInvocation: 'Foo::XFoo',
+              },
+            })
+          );
+        }
+      );
     });
 
-    it('component x-foo --in-repo-addon=my-addon --pod', function() {
+    it('component x-foo --in-repo-addon=my-addon --pod', function () {
       return emberGenerateDestroy(
         ['component', 'x-foo', '--in-repo-addon=my-addon', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
             fixture('component/component-addon-dash-pod.js')
           );
@@ -1232,10 +1244,10 @@ describe('Blueprint: component', function() {
       );
     });
 
-    it('component x-foo.js --in-repo-addon=my-addon --pod', function() {
+    it('component x-foo.js --in-repo-addon=my-addon --pod', function () {
       return emberGenerateDestroy(
         ['component', 'x-foo.js', '--in-repo-addon=my-addon', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/x-foo/component.js.js')).to.not.exist;
           expect(_file('lib/my-addon/addon/components/x-foo/template.js.hbs')).to.not.exist;
           expect(_file('lib/my-addon/app/components/x-foo/component.js.js')).to.not.exist;
@@ -1263,10 +1275,10 @@ describe('Blueprint: component', function() {
       );
     });
 
-    it('component foo/x-foo --in-repo-addon=my-addon --pod', function() {
+    it('component foo/x-foo --in-repo-addon=my-addon --pod', function () {
       return emberGenerateDestroy(
         ['component', 'foo/x-foo', '--in-repo-addon=my-addon', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/components/foo/x-foo/component.js')).to.equal(
             fixture('component/component-addon-nested-pod.js')
           );
@@ -1292,10 +1304,10 @@ describe('Blueprint: component', function() {
     });
   });
 
-  describe('in in-repo-addon - octane', function() {
+  describe('in in-repo-addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -1306,8 +1318,8 @@ describe('Blueprint: component', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('component foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('component foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['component', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/components/foo.js')).to.not.exist;
         expect(_file('lib/my-addon/addon/components/foo.hbs')).to.equal('{{yield}}');
         expect(_file('lib/my-addon/addon/templates/components/foo.hbs')).to.not.exist;
@@ -1330,8 +1342,8 @@ describe('Blueprint: component', function() {
       });
     });
 
-    it('component x-foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['component', 'x-foo', '--in-repo-addon=my-addon'], _file => {
+    it('component x-foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['component', 'x-foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/components/x-foo.js')).to.not.exist;
         expect(_file('lib/my-addon/addon/components/x-foo.hbs')).to.equal('{{yield}}');
         expect(_file('lib/my-addon/addon/templates/components/x-foo.hbs')).to.not.exist;
diff --git a/node-tests/blueprints/controller-test-test.js b/node-tests/blueprints/controller-test-test.js
index b33b55de1fb..a7569690a18 100644
--- a/node-tests/blueprints/controller-test-test.js
+++ b/node-tests/blueprints/controller-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: controller-test', function() {
+describe('Blueprint: controller-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,16 +29,16 @@ describe('Blueprint: controller-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
           expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
             fixture('controller-test/default.js')
           );
         });
       });
 
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+      it('controller-test foo/bar', function () {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
           expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
             fixture('controller-test/default-nested.js')
           );
@@ -46,8 +46,8 @@ describe('Blueprint: controller-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -55,16 +55,16 @@ describe('Blueprint: controller-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
           expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
             fixture('controller-test/rfc232.js')
           );
         });
       });
 
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+      it('controller-test foo/bar', function () {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
           expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
             fixture('controller-test/rfc232-nested.js')
           );
@@ -72,8 +72,8 @@ describe('Blueprint: controller-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.11.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -81,16 +81,16 @@ describe('Blueprint: controller-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.11.0');
       });
 
-      it('controller-test foo for mocha', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+      it('controller-test foo for mocha', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
           expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
             fixture('controller-test/mocha.js')
           );
         });
       });
 
-      it('controller-test foo/bar for mocha', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+      it('controller-test foo/bar for mocha', function () {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
           expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
             fixture('controller-test/mocha-nested.js')
           );
@@ -98,8 +98,8 @@ describe('Blueprint: controller-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.12.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -107,16 +107,16 @@ describe('Blueprint: controller-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.12.0');
       });
 
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
           expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
             fixture('controller-test/mocha-0.12.js')
           );
         });
       });
 
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+      it('controller-test foo/bar', function () {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
           expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
             fixture('controller-test/mocha-0.12-nested.js')
           );
@@ -124,8 +124,8 @@ describe('Blueprint: controller-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -133,16 +133,16 @@ describe('Blueprint: controller-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('controller-test foo', function() {
-        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
           expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
             fixture('controller-test/mocha-rfc232.js')
           );
         });
       });
 
-      it('controller-test foo/bar', function() {
-        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+      it('controller-test foo/bar', function () {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
           expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
             fixture('controller-test/mocha-rfc232-nested.js')
           );
@@ -151,8 +151,8 @@ describe('Blueprint: controller-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -163,16 +163,16 @@ describe('Blueprint: controller-test', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('controller-test foo', function() {
-      return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+    it('controller-test foo', function () {
+      return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
         expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
           fixture('controller-test/default.js')
         );
       });
     });
 
-    it('controller-test foo/bar', function() {
-      return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+    it('controller-test foo/bar', function () {
+      return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
         expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
           fixture('controller-test/default-nested.js')
         );
diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js
index 3e9a3f06b4c..289e452228f 100644
--- a/node-tests/blueprints/controller-test.js
+++ b/node-tests/blueprints/controller-test.js
@@ -16,11 +16,11 @@ const fixture = require('../helpers/fixture');
 const setupTestEnvironment = require('../helpers/setup-test-environment');
 const enableOctane = setupTestEnvironment.enableOctane;
 
-describe('Blueprint: controller', function() {
+describe('Blueprint: controller', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -31,8 +31,8 @@ describe('Blueprint: controller', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('controller foo', function() {
-      return emberGenerateDestroy(['controller', 'foo'], _file => {
+    it('controller foo', function () {
+      return emberGenerateDestroy(['controller', 'foo'], (_file) => {
         expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
@@ -41,8 +41,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js', function() {
-      return emberGenerateDestroy(['controller', 'foo.js'], _file => {
+    it('controller foo.js', function () {
+      return emberGenerateDestroy(['controller', 'foo.js'], (_file) => {
         expect(_file('app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
 
@@ -54,8 +54,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
+    it('controller foo/bar', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
         expect(_file('app/controllers/foo/bar.js')).to.equal(
           fixture('controller/controller-nested.js')
         );
@@ -66,8 +66,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo --pod', function() {
-      return emberGenerateDestroy(['controller', 'foo', '--pod'], _file => {
+    it('controller foo --pod', function () {
+      return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
         expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('tests/unit/foo/controller-test.js')).to.equal(
@@ -76,8 +76,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js --pod', function() {
-      return emberGenerateDestroy(['controller', 'foo.js', '--pod'], _file => {
+    it('controller foo.js --pod', function () {
+      return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
         expect(_file('app/foo.js/controller.js')).to.not.exist;
         expect(_file('tests/unit/foo.js/controller-test.js')).to.not.exist;
 
@@ -89,8 +89,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar --pod', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], _file => {
+    it('controller foo/bar --pod', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/foo/bar/controller.js')).to.equal(
           fixture('controller/controller-nested.js')
         );
@@ -101,13 +101,13 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('controller foo --pod podModulePrefix', function() {
-        return emberGenerateDestroy(['controller', 'foo', '--pod'], _file => {
+      it('controller foo --pod podModulePrefix', function () {
+        return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
 
           expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
@@ -116,8 +116,8 @@ describe('Blueprint: controller', function() {
         });
       });
 
-      it('controller foo.js --pod podModulePrefix', function() {
-        return emberGenerateDestroy(['controller', 'foo.js', '--pod'], _file => {
+      it('controller foo.js --pod podModulePrefix', function () {
+        return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
           expect(_file('app/pods/foo.js/controller.js')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/controller-test.js')).to.not.exist;
 
@@ -129,8 +129,8 @@ describe('Blueprint: controller', function() {
         });
       });
 
-      it('controller foo/bar --pod podModulePrefix', function() {
-        return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], _file => {
+      it('controller foo/bar --pod podModulePrefix', function () {
+        return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/pods/foo/bar/controller.js')).to.equal(
             fixture('controller/controller-nested.js')
           );
@@ -143,8 +143,8 @@ describe('Blueprint: controller', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -155,8 +155,8 @@ describe('Blueprint: controller', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('controller foo', function() {
-      return emberGenerateDestroy(['controller', 'foo'], _file => {
+    it('controller foo', function () {
+      return emberGenerateDestroy(['controller', 'foo'], (_file) => {
         expect(_file('addon/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('app/controllers/foo.js')).to.contain(
@@ -169,8 +169,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js', function() {
-      return emberGenerateDestroy(['controller', 'foo.js'], _file => {
+    it('controller foo.js', function () {
+      return emberGenerateDestroy(['controller', 'foo.js'], (_file) => {
         expect(_file('addon/controllers/foo.js.js')).to.not.exist;
         expect(_file('app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
@@ -187,8 +187,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
+    it('controller foo/bar', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
         expect(_file('addon/controllers/foo/bar.js')).to.equal(
           fixture('controller/controller-nested.js')
         );
@@ -203,8 +203,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo', '--dummy'], _file => {
+    it('controller foo --dummy', function () {
+      return emberGenerateDestroy(['controller', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
           fixture('controller/controller.js')
         );
@@ -215,8 +215,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo.js', '--dummy'], _file => {
+    it('controller foo.js --dummy', function () {
+      return emberGenerateDestroy(['controller', 'foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
@@ -229,8 +229,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], _file => {
+    it('controller foo/bar --dummy', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo/bar.js')).to.equal(
           fixture('controller/controller-nested.js')
         );
@@ -242,10 +242,10 @@ describe('Blueprint: controller', function() {
     });
   });
 
-  describe('in app - octane', function() {
+  describe('in app - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -256,8 +256,8 @@ describe('Blueprint: controller', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('controller foo', function() {
-      return emberGenerateDestroy(['controller', 'foo'], _file => {
+    it('controller foo', function () {
+      return emberGenerateDestroy(['controller', 'foo'], (_file) => {
         expect(_file('app/controllers/foo.js')).to.equal(
           fixture('controller/native-controller.js')
         );
@@ -268,8 +268,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js', function() {
-      return emberGenerateDestroy(['controller', 'foo.js'], _file => {
+    it('controller foo.js', function () {
+      return emberGenerateDestroy(['controller', 'foo.js'], (_file) => {
         expect(_file('app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
 
@@ -283,8 +283,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
+    it('controller foo/bar', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
         expect(_file('app/controllers/foo/bar.js')).to.equal(
           fixture('controller/native-controller-nested.js')
         );
@@ -295,13 +295,13 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('controller foo --pod podModulePrefix', function() {
-        return emberGenerateDestroy(['controller', 'foo', '--pod'], _file => {
+      it('controller foo --pod podModulePrefix', function () {
+        return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/controller.js')).to.equal(
             fixture('controller/native-controller.js')
           );
@@ -312,8 +312,8 @@ describe('Blueprint: controller', function() {
         });
       });
 
-      it('controller foo.js --pod podModulePrefix', function() {
-        return emberGenerateDestroy(['controller', 'foo.js', '--pod'], _file => {
+      it('controller foo.js --pod podModulePrefix', function () {
+        return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
           expect(_file('app/pods/foo/controller.js')).to.equal(
             fixture('controller/native-controller.js')
           );
@@ -326,10 +326,10 @@ describe('Blueprint: controller', function() {
     });
   });
 
-  describe('in addon - octane', function() {
+  describe('in addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -340,8 +340,8 @@ describe('Blueprint: controller', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('controller foo', function() {
-      return emberGenerateDestroy(['controller', 'foo'], _file => {
+    it('controller foo', function () {
+      return emberGenerateDestroy(['controller', 'foo'], (_file) => {
         expect(_file('addon/controllers/foo.js')).to.equal(
           fixture('controller/native-controller.js')
         );
@@ -356,8 +356,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js', function() {
-      return emberGenerateDestroy(['controller', 'foo.js'], _file => {
+    it('controller foo.js', function () {
+      return emberGenerateDestroy(['controller', 'foo.js'], (_file) => {
         expect(_file('addon/controllers/foo.js.js')).to.not.exist;
         expect(_file('app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
@@ -376,8 +376,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
+    it('controller foo/bar', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
         expect(_file('addon/controllers/foo/bar.js')).to.equal(
           fixture('controller/native-controller-nested.js')
         );
@@ -392,8 +392,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo', '--dummy'], _file => {
+    it('controller foo --dummy', function () {
+      return emberGenerateDestroy(['controller', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
           fixture('controller/native-controller.js')
         );
@@ -404,8 +404,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo.js', '--dummy'], _file => {
+    it('controller foo.js --dummy', function () {
+      return emberGenerateDestroy(['controller', 'foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
@@ -418,8 +418,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar --dummy', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], _file => {
+    it('controller foo/bar --dummy', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo/bar.js')).to.equal(
           fixture('controller/native-controller-nested.js')
         );
@@ -431,8 +431,8 @@ describe('Blueprint: controller', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -443,8 +443,8 @@ describe('Blueprint: controller', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('controller foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['controller', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('controller foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['controller', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/controllers/foo.js')).to.equal(
           fixture('controller/controller.js')
         );
@@ -459,8 +459,8 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['controller', 'foo.js', '--in-repo-addon=my-addon'], _file => {
+    it('controller foo.js --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['controller', 'foo.js', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/controllers/foo.js.js')).to.not.exist;
         expect(_file('lib/my-addon/app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
@@ -479,20 +479,23 @@ describe('Blueprint: controller', function() {
       });
     });
 
-    it('controller foo/bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/controllers/foo/bar.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
+    it('controller foo/bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['controller', 'foo/bar', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/controllers/foo/bar.js')).to.equal(
+            fixture('controller/controller-nested.js')
+          );
 
-        expect(_file('lib/my-addon/app/controllers/foo/bar.js')).to.contain(
-          "export { default } from 'my-addon/controllers/foo/bar';"
-        );
+          expect(_file('lib/my-addon/app/controllers/foo/bar.js')).to.contain(
+            "export { default } from 'my-addon/controllers/foo/bar';"
+          );
 
-        expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-      });
+          expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
+            fixture('controller-test/default-nested.js')
+          );
+        }
+      );
     });
   });
 });
diff --git a/node-tests/blueprints/helper-addon-test.js b/node-tests/blueprints/helper-addon-test.js
index ba6db854fa0..5e8c755fa96 100644
--- a/node-tests/blueprints/helper-addon-test.js
+++ b/node-tests/blueprints/helper-addon-test.js
@@ -10,22 +10,22 @@ const expect = chai.expect;
 
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: helper-addon', function() {
+describe('Blueprint: helper-addon', function () {
   setupTestHooks(this);
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('helper-addon foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper-addon', 'foo/bar-baz'], _file => {
+    it('helper-addon foo/bar-baz', function () {
+      return emberGenerateDestroy(['helper-addon', 'foo/bar-baz'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper-addon.js'));
       });
     });
 
-    it('helper-addon foo/bar-baz --pod', function() {
-      return emberGenerateDestroy(['helper-addon', 'foo/bar-baz', '--pod'], _file => {
+    it('helper-addon foo/bar-baz --pod', function () {
+      return emberGenerateDestroy(['helper-addon', 'foo/bar-baz', '--pod'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper-addon.js'));
       });
     });
diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js
index 2d23bf02100..96adcb7747c 100644
--- a/node-tests/blueprints/helper-test-test.js
+++ b/node-tests/blueprints/helper-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: helper-test', function() {
+describe('Blueprint: helper-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,16 +29,16 @@ describe('Blueprint: helper-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('helper-test foo/bar-baz', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
+      it('helper-test foo/bar-baz', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/integration.js')
           );
         });
       });
 
-      it('helper-test foo/bar-baz --integration', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--integration'], _file => {
+      it('helper-test foo/bar-baz --integration', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--integration'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/integration.js')
           );
@@ -46,8 +46,8 @@ describe('Blueprint: helper-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -55,16 +55,16 @@ describe('Blueprint: helper-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('helper-test foo/bar-baz', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
+      it('helper-test foo/bar-baz', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/rfc232.js')
           );
         });
       });
 
-      it('helper-test foo/bar-baz --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
+      it('helper-test foo/bar-baz --unit', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
           expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/rfc232-unit.js')
           );
@@ -72,8 +72,8 @@ describe('Blueprint: helper-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.11.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -81,16 +81,16 @@ describe('Blueprint: helper-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.11.0');
       });
 
-      it('helper-test foo/bar-baz --integration', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
+      it('helper-test foo/bar-baz --integration', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha.js')
           );
         });
       });
 
-      it('helper-test foo/bar-baz --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
+      it('helper-test foo/bar-baz --unit', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
           expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha-unit.js')
           );
@@ -98,8 +98,8 @@ describe('Blueprint: helper-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.12.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -107,16 +107,16 @@ describe('Blueprint: helper-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.12.0');
       });
 
-      it('helper-test foo/bar-baz for mocha', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
+      it('helper-test foo/bar-baz for mocha', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha-0.12.js')
           );
         });
       });
 
-      it('helper-test foo/bar-baz for mocha --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
+      it('helper-test foo/bar-baz for mocha --unit', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
           expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha-0.12-unit.js')
           );
@@ -124,8 +124,8 @@ describe('Blueprint: helper-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -133,16 +133,16 @@ describe('Blueprint: helper-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('helper-test foo/bar-baz for mocha', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
+      it('helper-test foo/bar-baz for mocha', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha-rfc232.js')
           );
         });
       });
 
-      it('helper-test foo/bar-baz for mocha --unit', function() {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], _file => {
+      it('helper-test foo/bar-baz for mocha --unit', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
           expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha-rfc232-unit.js')
           );
@@ -151,8 +151,8 @@ describe('Blueprint: helper-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' }).then(() => {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
@@ -162,8 +162,8 @@ describe('Blueprint: helper-test', function() {
       });
     });
 
-    it('helper-test foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], _file => {
+    it('helper-test foo/bar-baz', function () {
+      return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
         expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
           fixture('helper-test/integration.js')
         );
diff --git a/node-tests/blueprints/helper-test.js b/node-tests/blueprints/helper-test.js
index aa8c0ee5d5f..dfecf47ddb7 100644
--- a/node-tests/blueprints/helper-test.js
+++ b/node-tests/blueprints/helper-test.js
@@ -13,11 +13,11 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: helper', function() {
+describe('Blueprint: helper', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew().then(() => {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
@@ -27,8 +27,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz'], _file => {
+    it('helper foo/bar-baz', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
         expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
           fixture('helper-test/integration.js')
@@ -36,8 +36,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz.js', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz.js'], _file => {
+    it('helper foo/bar-baz.js', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz.js'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js.js')).to.not.exist;
         expect(_file('tests/integration/helpers/foo/bar-baz.js-test.js')).to.not.exist;
 
@@ -48,8 +48,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz unit', function() {
-      return emberGenerateDestroy(['helper', '--test-type=unit', 'foo/bar-baz'], _file => {
+    it('helper foo/bar-baz unit', function () {
+      return emberGenerateDestroy(['helper', '--test-type=unit', 'foo/bar-baz'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
         expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
           fixture('helper-test/unit.js')
@@ -57,8 +57,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz --pod', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], _file => {
+    it('helper foo/bar-baz --pod', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
         expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
           fixture('helper-test/integration.js')
@@ -66,8 +66,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz.js --pod', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--pod'], _file => {
+    it('helper foo/bar-baz.js --pod', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--pod'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js.js')).to.not.exist;
         expect(_file('tests/integration/helpers/foo/bar-baz.js-test.js')).to.not.exist;
 
@@ -78,13 +78,13 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('helper foo/bar-baz --pod', function() {
-        return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], _file => {
+      it('helper foo/bar-baz --pod', function () {
+        return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], (_file) => {
           expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/integration.js')
@@ -92,8 +92,8 @@ describe('Blueprint: helper', function() {
         });
       });
 
-      it('helper foo/bar-baz.js --pod', function() {
-        return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--pod'], _file => {
+      it('helper foo/bar-baz.js --pod', function () {
+        return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--pod'], (_file) => {
           expect(_file('app/helpers/foo/bar-baz.js.js')).to.not.exist;
           expect(_file('tests/integration/helpers/foo/bar-baz.js-test.js')).to.not.exist;
 
@@ -106,8 +106,8 @@ describe('Blueprint: helper', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' }).then(() => {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
@@ -117,8 +117,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz'], _file => {
+    it('helper foo/bar-baz', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz'], (_file) => {
         expect(_file('addon/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper-addon.js'));
         expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
@@ -127,8 +127,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz.js', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz.js'], _file => {
+    it('helper foo/bar-baz.js', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz.js'], (_file) => {
         expect(_file('addon/helpers/foo/bar-baz.js.js')).to.not.exist;
         expect(_file('app/helpers/foo/bar-baz.js.js')).to.not.exist;
         expect(_file('tests/integration/helpers/foo/bar-baz.js-test.js')).to.not.exist;
@@ -141,8 +141,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz --dummy', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--dummy'], _file => {
+    it('helper foo/bar-baz --dummy', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/helpers/foo/bar-baz.js')).to.equal(
           fixture('helper/helper.js')
         );
@@ -151,8 +151,8 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz.js --dummy', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--dummy'], _file => {
+    it('helper foo/bar-baz.js --dummy', function () {
+      return emberGenerateDestroy(['helper', 'foo/bar-baz.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/helpers/foo/bar-baz.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/helpers/foo/bar-baz.js')).to.equal(
@@ -164,8 +164,8 @@ describe('Blueprint: helper', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' }).then(() => {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
@@ -175,24 +175,27 @@ describe('Blueprint: helper', function() {
       });
     });
 
-    it('helper foo/bar-baz --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['helper', 'foo/bar-baz', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/helpers/foo/bar-baz.js')).to.equal(
-          fixture('helper/helper.js')
-        );
-        expect(_file('lib/my-addon/app/helpers/foo/bar-baz.js')).to.equal(
-          fixture('helper/helper-addon.js')
-        );
-        expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
-      });
+    it('helper foo/bar-baz --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['helper', 'foo/bar-baz', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/helpers/foo/bar-baz.js')).to.equal(
+            fixture('helper/helper.js')
+          );
+          expect(_file('lib/my-addon/app/helpers/foo/bar-baz.js')).to.equal(
+            fixture('helper/helper-addon.js')
+          );
+          expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
+            fixture('helper-test/integration.js')
+          );
+        }
+      );
     });
 
-    it('helper foo/bar-baz.js --in-repo-addon=my-addon', function() {
+    it('helper foo/bar-baz.js --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['helper', 'foo/bar-baz.js', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/helpers/foo/bar-baz.js.js')).to.not.exist;
           expect(_file('lib/my-addon/app/helpers/foo/bar-baz.js.js')).to.not.exist;
           expect(_file('tests/integration/helpers/foo/bar-baz.js-test.js')).to.not.exist;
diff --git a/node-tests/blueprints/initializer-addon-test.js b/node-tests/blueprints/initializer-addon-test.js
index 5f12c6dff66..bafe3336a95 100644
--- a/node-tests/blueprints/initializer-addon-test.js
+++ b/node-tests/blueprints/initializer-addon-test.js
@@ -8,24 +8,24 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: initializer-addon', function() {
+describe('Blueprint: initializer-addon', function () {
   setupTestHooks(this);
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('initializer-addon foo', function() {
-      return emberGenerateDestroy(['initializer-addon', 'foo'], _file => {
+    it('initializer-addon foo', function () {
+      return emberGenerateDestroy(['initializer-addon', 'foo'], (_file) => {
         expect(_file('app/initializers/foo.js')).to.contain(
           "export { default, initialize } from 'my-addon/initializers/foo';"
         );
       });
     });
 
-    it('initializer-addon foo --pod', function() {
-      return emberGenerateDestroy(['initializer-addon', 'foo', '--pod'], _file => {
+    it('initializer-addon foo --pod', function () {
+      return emberGenerateDestroy(['initializer-addon', 'foo', '--pod'], (_file) => {
         expect(_file('app/initializers/foo.js')).to.contain(
           "export { default, initialize } from 'my-addon/initializers/foo';"
         );
diff --git a/node-tests/blueprints/initializer-test-test.js b/node-tests/blueprints/initializer-test-test.js
index e9034463c4e..2db53a16377 100644
--- a/node-tests/blueprints/initializer-test-test.js
+++ b/node-tests/blueprints/initializer-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: initializer-test', function() {
+describe('Blueprint: initializer-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,8 +29,8 @@ describe('Blueprint: initializer-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
+      it('initializer-test foo', function () {
+        return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/initializers/foo-test.js')).to.equal(
             fixture('initializer-test/default.js')
           );
@@ -38,8 +38,8 @@ describe('Blueprint: initializer-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -47,8 +47,8 @@ describe('Blueprint: initializer-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
+      it('initializer-test foo', function () {
+        return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/initializers/foo-test.js')).to.equal(
             fixture('initializer-test/rfc232.js')
           );
@@ -56,16 +56,16 @@ describe('Blueprint: initializer-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
         ]);
       });
 
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
+      it('initializer-test foo', function () {
+        return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/initializers/foo-test.js')).to.equal(
             fixture('initializer-test/mocha.js')
           );
@@ -73,8 +73,8 @@ describe('Blueprint: initializer-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -82,8 +82,8 @@ describe('Blueprint: initializer-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
+      it('initializer-test foo', function () {
+        return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/initializers/foo-test.js')).to.equal(
             fixture('initializer-test/mocha-rfc232.js')
           );
@@ -92,13 +92,13 @@ describe('Blueprint: initializer-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -106,8 +106,8 @@ describe('Blueprint: initializer-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('initializer-test foo', function() {
-        return emberGenerateDestroy(['initializer-test', 'foo'], _file => {
+      it('initializer-test foo', function () {
+        return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/initializers/foo-test.js')).to.equal(
             fixture('initializer-test/dummy.js')
           );
diff --git a/node-tests/blueprints/initializer-test.js b/node-tests/blueprints/initializer-test.js
index bf08d4b6030..29b4337e14b 100644
--- a/node-tests/blueprints/initializer-test.js
+++ b/node-tests/blueprints/initializer-test.js
@@ -13,11 +13,11 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: initializer', function() {
+describe('Blueprint: initializer', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -28,8 +28,8 @@ describe('Blueprint: initializer', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('initializer foo', function() {
-      return emberGenerateDestroy(['initializer', 'foo'], _file => {
+    it('initializer foo', function () {
+      return emberGenerateDestroy(['initializer', 'foo'], (_file) => {
         expect(_file('app/initializers/foo.js')).to.equal(fixture('initializer/initializer.js'));
 
         expect(_file('tests/unit/initializers/foo-test.js')).to.contain(
@@ -38,8 +38,8 @@ describe('Blueprint: initializer', function() {
       });
     });
 
-    it('initializer foo/bar', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
+    it('initializer foo/bar', function () {
+      return emberGenerateDestroy(['initializer', 'foo/bar'], (_file) => {
         expect(_file('app/initializers/foo/bar.js')).to.equal(
           fixture('initializer/initializer-nested.js')
         );
@@ -50,33 +50,33 @@ describe('Blueprint: initializer', function() {
       });
     });
 
-    it('initializer foo --pod', function() {
-      return emberGenerateDestroy(['initializer', 'foo', '--pod'], _file => {
+    it('initializer foo --pod', function () {
+      return emberGenerateDestroy(['initializer', 'foo', '--pod'], (_file) => {
         expect(_file('app/initializers/foo.js')).to.equal(fixture('initializer/initializer.js'));
       });
     });
 
-    it('initializer foo/bar --pod', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], _file => {
+    it('initializer foo/bar --pod', function () {
+      return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/initializers/foo/bar.js')).to.equal(
           fixture('initializer/initializer-nested.js')
         );
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('initializer foo --pod', function() {
-        return emberGenerateDestroy(['initializer', 'foo', '--pod'], _file => {
+      it('initializer foo --pod', function () {
+        return emberGenerateDestroy(['initializer', 'foo', '--pod'], (_file) => {
           expect(_file('app/initializers/foo.js')).to.equal(fixture('initializer/initializer.js'));
         });
       });
 
-      it('initializer foo/bar --pod', function() {
-        return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], _file => {
+      it('initializer foo/bar --pod', function () {
+        return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/initializers/foo/bar.js')).to.equal(
             fixture('initializer/initializer-nested.js')
           );
@@ -85,8 +85,8 @@ describe('Blueprint: initializer', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -97,8 +97,8 @@ describe('Blueprint: initializer', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('initializer foo', function() {
-      return emberGenerateDestroy(['initializer', 'foo'], _file => {
+    it('initializer foo', function () {
+      return emberGenerateDestroy(['initializer', 'foo'], (_file) => {
         expect(_file('addon/initializers/foo.js')).to.equal(fixture('initializer/initializer.js'));
 
         expect(_file('app/initializers/foo.js')).to.contain(
@@ -109,8 +109,8 @@ describe('Blueprint: initializer', function() {
       });
     });
 
-    it('initializer foo/bar', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
+    it('initializer foo/bar', function () {
+      return emberGenerateDestroy(['initializer', 'foo/bar'], (_file) => {
         expect(_file('addon/initializers/foo/bar.js')).to.equal(
           fixture('initializer/initializer-nested.js')
         );
@@ -123,8 +123,8 @@ describe('Blueprint: initializer', function() {
       });
     });
 
-    it('initializer foo --dummy', function() {
-      return emberGenerateDestroy(['initializer', 'foo', '--dummy'], _file => {
+    it('initializer foo --dummy', function () {
+      return emberGenerateDestroy(['initializer', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/initializers/foo.js')).to.equal(
           fixture('initializer/initializer.js')
         );
@@ -135,8 +135,8 @@ describe('Blueprint: initializer', function() {
       });
     });
 
-    it('initializer foo/bar --dummy', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar', '--dummy'], _file => {
+    it('initializer foo/bar --dummy', function () {
+      return emberGenerateDestroy(['initializer', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/initializers/foo/bar.js')).to.equal(
           fixture('initializer/initializer-nested.js')
         );
@@ -148,8 +148,8 @@ describe('Blueprint: initializer', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -160,8 +160,8 @@ describe('Blueprint: initializer', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('initializer foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['initializer', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('initializer foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['initializer', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/initializers/foo.js')).to.equal(
           fixture('initializer/initializer.js')
         );
@@ -174,18 +174,21 @@ describe('Blueprint: initializer', function() {
       });
     });
 
-    it('initializer foo/bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['initializer', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
-        expect(_file('lib/my-addon/addon/initializers/foo/bar.js')).to.equal(
-          fixture('initializer/initializer-nested.js')
-        );
+    it('initializer foo/bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(
+        ['initializer', 'foo/bar', '--in-repo-addon=my-addon'],
+        (_file) => {
+          expect(_file('lib/my-addon/addon/initializers/foo/bar.js')).to.equal(
+            fixture('initializer/initializer-nested.js')
+          );
 
-        expect(_file('lib/my-addon/app/initializers/foo/bar.js')).to.contain(
-          "export { default, initialize } from 'my-addon/initializers/foo/bar';"
-        );
+          expect(_file('lib/my-addon/app/initializers/foo/bar.js')).to.contain(
+            "export { default, initialize } from 'my-addon/initializers/foo/bar';"
+          );
 
-        expect(_file('tests/unit/initializers/foo/bar-test.js')).to.exist;
-      });
+          expect(_file('tests/unit/initializers/foo/bar-test.js')).to.exist;
+        }
+      );
     });
   });
 });
diff --git a/node-tests/blueprints/instance-initializer-addon-test.js b/node-tests/blueprints/instance-initializer-addon-test.js
index 0c341ddb92b..d01ce48f8d8 100644
--- a/node-tests/blueprints/instance-initializer-addon-test.js
+++ b/node-tests/blueprints/instance-initializer-addon-test.js
@@ -8,24 +8,24 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: instance-initializer-addon', function() {
+describe('Blueprint: instance-initializer-addon', function () {
   setupTestHooks(this);
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('instance-initializer-addon foo', function() {
-      return emberGenerateDestroy(['instance-initializer-addon', 'foo'], _file => {
+    it('instance-initializer-addon foo', function () {
+      return emberGenerateDestroy(['instance-initializer-addon', 'foo'], (_file) => {
         expect(_file('app/instance-initializers/foo.js')).to.contain(
           "export { default, initialize } from 'my-addon/instance-initializers/foo';"
         );
       });
     });
 
-    it('instance-initializer-addon foo --pod', function() {
-      return emberGenerateDestroy(['instance-initializer-addon', 'foo', '--pod'], _file => {
+    it('instance-initializer-addon foo --pod', function () {
+      return emberGenerateDestroy(['instance-initializer-addon', 'foo', '--pod'], (_file) => {
         expect(_file('app/instance-initializers/foo.js')).to.contain(
           "export { default, initialize } from 'my-addon/instance-initializers/foo';"
         );
diff --git a/node-tests/blueprints/instance-initializer-test-test.js b/node-tests/blueprints/instance-initializer-test-test.js
index e696d2f2c15..fa9a1205f67 100644
--- a/node-tests/blueprints/instance-initializer-test-test.js
+++ b/node-tests/blueprints/instance-initializer-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: instance-initializer-test', function() {
+describe('Blueprint: instance-initializer-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,8 +29,8 @@ describe('Blueprint: instance-initializer-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('instance-initializer-test foo', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
+      it('instance-initializer-test foo', function () {
+        return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal(
             fixture('instance-initializer-test/default.js')
           );
@@ -38,8 +38,8 @@ describe('Blueprint: instance-initializer-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -47,8 +47,8 @@ describe('Blueprint: instance-initializer-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('instance-initializer-test foo', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
+      it('instance-initializer-test foo', function () {
+        return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal(
             fixture('instance-initializer-test/rfc232.js')
           );
@@ -56,16 +56,16 @@ describe('Blueprint: instance-initializer-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
         ]);
       });
 
-      it('instance-initializer-test foo for mocha', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
+      it('instance-initializer-test foo for mocha', function () {
+        return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal(
             fixture('instance-initializer-test/mocha.js')
           );
@@ -73,8 +73,8 @@ describe('Blueprint: instance-initializer-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -82,8 +82,8 @@ describe('Blueprint: instance-initializer-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('instance-initializer-test foo for mocha', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
+      it('instance-initializer-test foo for mocha', function () {
+        return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal(
             fixture('instance-initializer-test/mocha-rfc232.js')
           );
@@ -92,13 +92,13 @@ describe('Blueprint: instance-initializer-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -106,8 +106,8 @@ describe('Blueprint: instance-initializer-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('instance-initializer-test foo', function() {
-        return emberGenerateDestroy(['instance-initializer-test', 'foo'], _file => {
+      it('instance-initializer-test foo', function () {
+        return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => {
           expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal(
             fixture('instance-initializer-test/dummy.js')
           );
diff --git a/node-tests/blueprints/instance-initializer-test.js b/node-tests/blueprints/instance-initializer-test.js
index b5dda622247..7783a5ddee3 100644
--- a/node-tests/blueprints/instance-initializer-test.js
+++ b/node-tests/blueprints/instance-initializer-test.js
@@ -13,11 +13,11 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: instance-initializer', function() {
+describe('Blueprint: instance-initializer', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -28,8 +28,8 @@ describe('Blueprint: instance-initializer', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('instance-initializer foo', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo'], _file => {
+    it('instance-initializer foo', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo'], (_file) => {
         expect(_file('app/instance-initializers/foo.js')).to.equal(
           fixture('instance-initializer/instance-initializer.js')
         );
@@ -40,8 +40,8 @@ describe('Blueprint: instance-initializer', function() {
       });
     });
 
-    it('instance-initializer foo/bar', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar'], _file => {
+    it('instance-initializer foo/bar', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo/bar'], (_file) => {
         expect(_file('app/instance-initializers/foo/bar.js')).to.equal(
           fixture('instance-initializer/instance-initializer-nested.js')
         );
@@ -52,37 +52,37 @@ describe('Blueprint: instance-initializer', function() {
       });
     });
 
-    it('instance-initializer foo --pod', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo', '--pod'], _file => {
+    it('instance-initializer foo --pod', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo', '--pod'], (_file) => {
         expect(_file('app/instance-initializers/foo.js')).to.equal(
           fixture('instance-initializer/instance-initializer.js')
         );
       });
     });
 
-    it('instance-initializer foo/bar --pod', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod'], _file => {
+    it('instance-initializer foo/bar --pod', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/instance-initializers/foo/bar.js')).to.equal(
           fixture('instance-initializer/instance-initializer-nested.js')
         );
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('instance-initializer foo --pod', function() {
-        return emberGenerateDestroy(['instance-initializer', 'foo', '--pod'], _file => {
+      it('instance-initializer foo --pod', function () {
+        return emberGenerateDestroy(['instance-initializer', 'foo', '--pod'], (_file) => {
           expect(_file('app/instance-initializers/foo.js')).to.equal(
             fixture('instance-initializer/instance-initializer.js')
           );
         });
       });
 
-      it('instance-initializer foo/bar --pod', function() {
-        return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod'], _file => {
+      it('instance-initializer foo/bar --pod', function () {
+        return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/instance-initializers/foo/bar.js')).to.equal(
             fixture('instance-initializer/instance-initializer-nested.js')
           );
@@ -91,8 +91,8 @@ describe('Blueprint: instance-initializer', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -103,8 +103,8 @@ describe('Blueprint: instance-initializer', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('instance-initializer foo', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo'], _file => {
+    it('instance-initializer foo', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo'], (_file) => {
         expect(_file('addon/instance-initializers/foo.js')).to.equal(
           fixture('instance-initializer/instance-initializer.js')
         );
@@ -117,8 +117,8 @@ describe('Blueprint: instance-initializer', function() {
       });
     });
 
-    it('instance-initializer foo/bar', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar'], _file => {
+    it('instance-initializer foo/bar', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo/bar'], (_file) => {
         expect(_file('addon/instance-initializers/foo/bar.js')).to.equal(
           fixture('instance-initializer/instance-initializer-nested.js')
         );
@@ -131,8 +131,8 @@ describe('Blueprint: instance-initializer', function() {
       });
     });
 
-    it('instance-initializer foo --dummy', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo', '--dummy'], _file => {
+    it('instance-initializer foo --dummy', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/instance-initializers/foo.js')).to.equal(
           fixture('instance-initializer/instance-initializer.js')
         );
@@ -143,8 +143,8 @@ describe('Blueprint: instance-initializer', function() {
       });
     });
 
-    it('instance-initializer foo/bar --dummy', function() {
-      return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--dummy'], _file => {
+    it('instance-initializer foo/bar --dummy', function () {
+      return emberGenerateDestroy(['instance-initializer', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/instance-initializers/foo/bar.js')).to.equal(
           fixture('instance-initializer/instance-initializer-nested.js')
         );
@@ -156,8 +156,8 @@ describe('Blueprint: instance-initializer', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -168,10 +168,10 @@ describe('Blueprint: instance-initializer', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('instance-initializer foo --in-repo-addon=my-addon', function() {
+    it('instance-initializer foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['instance-initializer', 'foo', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/instance-initializers/foo.js')).to.equal(
             fixture('instance-initializer/instance-initializer.js')
           );
@@ -185,10 +185,10 @@ describe('Blueprint: instance-initializer', function() {
       );
     });
 
-    it('instance-initializer foo/bar --in-repo-addon=my-addon', function() {
+    it('instance-initializer foo/bar --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(
         ['instance-initializer', 'foo/bar', '--in-repo-addon=my-addon'],
-        _file => {
+        (_file) => {
           expect(_file('lib/my-addon/addon/instance-initializers/foo/bar.js')).to.equal(
             fixture('instance-initializer/instance-initializer.js')
           );
diff --git a/node-tests/blueprints/mixin-test-test.js b/node-tests/blueprints/mixin-test-test.js
index d0105b97c1f..65f15a35bc3 100644
--- a/node-tests/blueprints/mixin-test-test.js
+++ b/node-tests/blueprints/mixin-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: mixin-test', function() {
+describe('Blueprint: mixin-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,30 +29,30 @@ describe('Blueprint: mixin-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
+      it('mixin-test foo', function () {
+        return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => {
           expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/default.js'));
         });
       });
     });
 
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
         ]);
       });
 
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
+      it('mixin-test foo', function () {
+        return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => {
           expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/mocha.js'));
         });
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -60,15 +60,15 @@ describe('Blueprint: mixin-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
+      it('mixin-test foo', function () {
+        return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => {
           expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/rfc232.js'));
         });
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -76,8 +76,8 @@ describe('Blueprint: mixin-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('mixin-test foo', function() {
-        return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
+      it('mixin-test foo', function () {
+        return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => {
           expect(_file('tests/unit/mixins/foo-test.js')).to.equal(
             fixture('mixin-test/mocha-rfc232.js')
           );
@@ -86,8 +86,8 @@ describe('Blueprint: mixin-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' }).then(() =>
         modifyPackages([
           { name: 'ember-qunit', delete: true },
@@ -96,15 +96,15 @@ describe('Blueprint: mixin-test', function() {
       );
     });
 
-    it('mixin-test foo', function() {
-      return emberGenerateDestroy(['mixin-test', 'foo'], _file => {
+    it('mixin-test foo', function () {
+      return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => {
         expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/addon.js'));
       });
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' }).then(() =>
         modifyPackages([
           { name: 'ember-qunit', delete: true },
@@ -113,8 +113,8 @@ describe('Blueprint: mixin-test', function() {
       );
     });
 
-    it('mixin-test foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['mixin-test', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('mixin-test foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['mixin-test', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/addon.js'));
       });
     });
diff --git a/node-tests/blueprints/mixin-test.js b/node-tests/blueprints/mixin-test.js
index 915c824ad42..7ee243a6b11 100644
--- a/node-tests/blueprints/mixin-test.js
+++ b/node-tests/blueprints/mixin-test.js
@@ -10,16 +10,16 @@ const EOL = require('os').EOL;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: mixin', function() {
+describe('Blueprint: mixin', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    it('mixin foo', function() {
-      return emberGenerateDestroy(['mixin', 'foo'], _file => {
+    it('mixin foo', function () {
+      return emberGenerateDestroy(['mixin', 'foo'], (_file) => {
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -30,8 +30,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo.js', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js'], _file => {
+    it('mixin foo.js', function () {
+      return emberGenerateDestroy(['mixin', 'foo.js'], (_file) => {
         expect(_file('app/mixins/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/mixins/foo.js-test.js')).to.not.exist;
 
@@ -45,8 +45,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
+    it('mixin foo/bar', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar'], (_file) => {
         expect(_file('app/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -57,16 +57,16 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar/baz', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
+    it('mixin foo/bar/baz', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar/baz'], (_file) => {
         expect(_file('tests/unit/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
         );
       });
     });
 
-    it('mixin foo --pod', function() {
-      return emberGenerateDestroy(['mixin', 'foo', '--pod'], _file => {
+    it('mixin foo --pod', function () {
+      return emberGenerateDestroy(['mixin', 'foo', '--pod'], (_file) => {
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -77,8 +77,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo.js --pod', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js', '--pod'], _file => {
+    it('mixin foo.js --pod', function () {
+      return emberGenerateDestroy(['mixin', 'foo.js', '--pod'], (_file) => {
         expect(_file('app/mixins/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/mixins/foo.js-test.js')).to.not.exist;
 
@@ -92,8 +92,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar --pod', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], _file => {
+    it('mixin foo/bar --pod', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -104,21 +104,21 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar/baz --pod', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--pod'], _file => {
+    it('mixin foo/bar/baz --pod', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--pod'], (_file) => {
         expect(_file('tests/unit/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
         );
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('mixin foo --pod', function() {
-        return emberGenerateDestroy(['mixin', 'foo', '--pod'], _file => {
+      it('mixin foo --pod', function () {
+        return emberGenerateDestroy(['mixin', 'foo', '--pod'], (_file) => {
           expect(_file('app/mixins/foo.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
             .to.contain(`export default Mixin.create({${EOL}});`);
@@ -129,8 +129,8 @@ describe('Blueprint: mixin', function() {
         });
       });
 
-      it('mixin foo.js --pod', function() {
-        return emberGenerateDestroy(['mixin', 'foo.js', '--pod'], _file => {
+      it('mixin foo.js --pod', function () {
+        return emberGenerateDestroy(['mixin', 'foo.js', '--pod'], (_file) => {
           expect(_file('app/mixins/foo.js.js')).to.not.exist;
           expect(_file('tests/unit/mixins/foo.js-test.js')).to.not.exist;
 
@@ -144,8 +144,8 @@ describe('Blueprint: mixin', function() {
         });
       });
 
-      it('mixin foo/bar --pod', function() {
-        return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], _file => {
+      it('mixin foo/bar --pod', function () {
+        return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/mixins/foo/bar.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
             .to.contain(`export default Mixin.create({${EOL}});`);
@@ -158,13 +158,13 @@ describe('Blueprint: mixin', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('mixin foo', function() {
-      return emberGenerateDestroy(['mixin', 'foo'], _file => {
+    it('mixin foo', function () {
+      return emberGenerateDestroy(['mixin', 'foo'], (_file) => {
         expect(_file('addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -177,8 +177,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo.js', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js'], _file => {
+    it('mixin foo.js', function () {
+      return emberGenerateDestroy(['mixin', 'foo.js'], (_file) => {
         expect(_file('addon/mixins/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/mixins/foo.js-test.js')).to.not.exist;
 
@@ -194,8 +194,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
+    it('mixin foo/bar', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar'], (_file) => {
         expect(_file('addon/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -208,8 +208,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar/baz', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
+    it('mixin foo/bar/baz', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar/baz'], (_file) => {
         expect(_file('addon/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -222,8 +222,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar/baz --dummy', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--dummy'], _file => {
+    it('mixin foo/bar/baz --dummy', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -232,8 +232,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo.js --dummy', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js', '--dummy'], _file => {
+    it('mixin foo.js --dummy', function () {
+      return emberGenerateDestroy(['mixin', 'foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/mixins/foo.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/mixins/foo.js'))
@@ -245,13 +245,13 @@ describe('Blueprint: mixin', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' });
     });
 
-    it('mixin foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['mixin', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('mixin foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['mixin', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -262,8 +262,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['mixin', 'foo.js', '--in-repo-addon=my-addon'], _file => {
+    it('mixin foo.js --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['mixin', 'foo.js', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/mixins/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/mixins/foo.js-test.js')).to.not.exist;
 
@@ -277,8 +277,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
+    it('mixin foo/bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
           .to.contain(`export default Mixin.create({${EOL}});`);
@@ -289,8 +289,8 @@ describe('Blueprint: mixin', function() {
       });
     });
 
-    it('mixin foo/bar/baz --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--in-repo-addon=my-addon'], _file => {
+    it('mixin foo/bar/baz --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('tests/unit/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
         );
diff --git a/node-tests/blueprints/route-addon-test.js b/node-tests/blueprints/route-addon-test.js
index 3086d38e797..f0a9b82ac97 100644
--- a/node-tests/blueprints/route-addon-test.js
+++ b/node-tests/blueprints/route-addon-test.js
@@ -8,16 +8,16 @@ const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: route-addon', function() {
+describe('Blueprint: route-addon', function () {
   setupTestHooks(this);
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('route-addon foo', function() {
-      return emberGenerateDestroy(['route-addon', 'foo'], _file => {
+    it('route-addon foo', function () {
+      return emberGenerateDestroy(['route-addon', 'foo'], (_file) => {
         expect(_file('app/routes/foo.js')).to.contain(
           "export { default } from 'my-addon/routes/foo';"
         );
diff --git a/node-tests/blueprints/route-test-test.js b/node-tests/blueprints/route-test-test.js
index ddfac988d31..5d4da686287 100644
--- a/node-tests/blueprints/route-test-test.js
+++ b/node-tests/blueprints/route-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: route-test', function() {
+describe('Blueprint: route-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,15 +29,15 @@ describe('Blueprint: route-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('route-test foo', function() {
-        return emberGenerateDestroy(['route-test', 'foo'], _file => {
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
           expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
         });
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -45,15 +45,15 @@ describe('Blueprint: route-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('route-test foo', function() {
-        return emberGenerateDestroy(['route-test', 'foo'], _file => {
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
           expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/rfc232.js'));
         });
       });
     });
 
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.11.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -61,15 +61,15 @@ describe('Blueprint: route-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.11.0');
       });
 
-      it('route-test foo', function() {
-        return emberGenerateDestroy(['route-test', 'foo'], _file => {
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
           expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/mocha.js'));
         });
       });
     });
 
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.12.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -77,8 +77,8 @@ describe('Blueprint: route-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.12.0');
       });
 
-      it('route-test foo', function() {
-        return emberGenerateDestroy(['route-test', 'foo'], _file => {
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
           expect(_file('tests/unit/routes/foo-test.js')).to.equal(
             fixture('route-test/mocha-0.12.js')
           );
@@ -86,8 +86,8 @@ describe('Blueprint: route-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -95,8 +95,8 @@ describe('Blueprint: route-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('route-test foo', function() {
-        return emberGenerateDestroy(['route-test', 'foo'], _file => {
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
           expect(_file('tests/unit/routes/foo-test.js')).to.equal(
             fixture('route-test/mocha-rfc232.js')
           );
@@ -105,8 +105,8 @@ describe('Blueprint: route-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -117,8 +117,8 @@ describe('Blueprint: route-test', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('route-test foo', function() {
-      return emberGenerateDestroy(['route-test', 'foo'], _file => {
+    it('route-test foo', function () {
+      return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
         expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
       });
     });
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index c9a1f933cd1..1b635cb1a06 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -20,11 +20,11 @@ const fixture = require('../helpers/fixture');
 const setupTestEnvironment = require('../helpers/setup-test-environment');
 const enableOctane = setupTestEnvironment.enableOctane;
 
-describe('Blueprint: route', function() {
+describe('Blueprint: route', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -35,8 +35,8 @@ describe('Blueprint: route', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('route foo', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
+    it('route foo', function () {
+      return emberGenerateDestroy(['route', 'foo'], (_file) => {
         expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -49,8 +49,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js', function() {
-      return emberGenerateDestroy(['route', 'foo.js'], _file => {
+    it('route foo.js', function () {
+      return emberGenerateDestroy(['route', 'foo.js'], (_file) => {
         expect(_file('app/routes/foo.js.js')).to.not.exist;
         expect(_file('app/templates/foo.js.hbs')).to.not.exist;
         expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
@@ -68,8 +68,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --skip-router', function() {
-      return emberGenerateDestroy(['route', 'foo', '--skip-router'], _file => {
+    it('route foo --skip-router', function () {
+      return emberGenerateDestroy(['route', 'foo', '--skip-router'], (_file) => {
         expect(_file('app/routes/foo.js')).to.exist;
         expect(_file('app/templates/foo.hbs')).to.exist;
         expect(_file('tests/unit/routes/foo-test.js')).to.exist;
@@ -79,8 +79,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --path=:foo_id/show', function() {
-      return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], _file => {
+    it('route foo --path=:foo_id/show', function () {
+      return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
         expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -98,8 +98,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route parent/child --reset-namespace', function() {
-      return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], _file => {
+    it('route parent/child --reset-namespace', function () {
+      return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], (_file) => {
         expect(_file('app/routes/child.js')).to.equal(fixture('route/route-child.js'));
 
         expect(_file('app/templates/child.hbs')).to.equal('{{outlet}}');
@@ -116,10 +116,10 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route parent/child --reset-namespace --pod', function() {
+    it('route parent/child --reset-namespace --pod', function () {
       return emberGenerateDestroy(
         ['route', 'parent/child', '--reset-namespace', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('app/child/route.js')).to.equal(fixture('route/route-child.js'));
 
           expect(_file('app/child/template.hbs')).to.equal('{{outlet}}');
@@ -137,8 +137,8 @@ describe('Blueprint: route', function() {
       );
     });
 
-    it('route index', function() {
-      return emberGenerateDestroy(['route', 'index'], _file => {
+    it('route index', function () {
+      return emberGenerateDestroy(['route', 'index'], (_file) => {
         expect(_file('app/routes/index.js')).to.exist;
         expect(_file('app/templates/index.hbs')).to.exist;
         expect(_file('tests/unit/routes/index-test.js')).to.exist;
@@ -148,15 +148,15 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route application', function() {
+    it('route application', function () {
       fs.removeSync('app/templates/application.hbs');
       return emberGenerate(['route', 'application']).then(() => {
         expect(file('app/router.js')).to.not.contain("this.route('application')");
       });
     });
 
-    it('route basic', function() {
-      return emberGenerateDestroy(['route', 'basic'], _file => {
+    it('route basic', function () {
+      return emberGenerateDestroy(['route', 'basic'], (_file) => {
         expect(_file('app/routes/basic.js')).to.exist;
         expect(file('app/router.js')).to.not.contain("this.route('basic')");
       }).then(() => {
@@ -164,8 +164,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --pod', function() {
-      return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+    it('route foo --pod', function () {
+      return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
         expect(_file('app/foo.js/route.js')).to.not.exist;
         expect(_file('app/foo.js/template.hbs')).to.not.exist;
         expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
@@ -183,8 +183,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --pod', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--pod'], _file => {
+    it('route foo.js --pod', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
         expect(_file('app/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/foo/template.hbs')).to.equal('{{outlet}}');
@@ -197,7 +197,7 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --pod with --path', function() {
+    it('route foo --pod with --path', function () {
       return emberGenerate(['route', 'foo', '--pod', '--path=:foo_id/show'])
         .then(() =>
           expect(file('app/router.js'))
@@ -214,33 +214,33 @@ describe('Blueprint: route', function() {
         );
     });
 
-    it('route index --pod', function() {
+    it('route index --pod', function () {
       return emberGenerate(['route', 'index', '--pod']).then(() =>
         expect(file('app/router.js')).to.not.contain("this.route('index')")
       );
     });
 
-    it('route application --pod', function() {
+    it('route application --pod', function () {
       return emberGenerate(['route', 'application', '--pod'])
         .then(() => expect(file('app/application/route.js')).to.exist)
         .then(() => expect(file('app/application/template.hbs')).to.exist)
         .then(() => expect(file('app/router.js')).to.not.contain("this.route('application')"));
     });
 
-    it('route basic --pod', function() {
-      return emberGenerateDestroy(['route', 'basic', '--pod'], _file => {
+    it('route basic --pod', function () {
+      return emberGenerateDestroy(['route', 'basic', '--pod'], (_file) => {
         expect(_file('app/basic/route.js')).to.exist;
         expect(file('app/router.js')).to.not.contain("this.route('index')");
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('route foo --pod', function() {
-        return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+      it('route foo --pod', function () {
+        return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/route.js'));
 
           expect(_file('app/pods/foo/template.hbs')).to.equal('{{outlet}}');
@@ -255,8 +255,8 @@ describe('Blueprint: route', function() {
         });
       });
 
-      it('route foo.js --pod', function() {
-        return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+      it('route foo.js --pod', function () {
+        return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo.js/route.js')).to.not.exist;
           expect(_file('app/pods/foo.js/template.hbs')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/route-test.js')).to.not.exist;
@@ -278,8 +278,8 @@ describe('Blueprint: route', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -290,8 +290,8 @@ describe('Blueprint: route', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('route foo', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
+    it('route foo', function () {
+      return emberGenerateDestroy(['route', 'foo'], (_file) => {
         expect(_file('addon/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -312,8 +312,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js', function() {
-      return emberGenerateDestroy(['route', 'foo.js'], _file => {
+    it('route foo.js', function () {
+      return emberGenerateDestroy(['route', 'foo.js'], (_file) => {
         expect(_file('addon/routes/foo.js.js')).to.not.exist;
         expect(_file('addon/templates/foo.js.hbs')).to.not.exist;
         expect(_file('app/routes/foo.js.js')).to.not.exist;
@@ -341,8 +341,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo/bar', function() {
-      return emberGenerateDestroy(['route', 'foo/bar'], _file => {
+    it('route foo/bar', function () {
+      return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
         expect(_file('addon/routes/foo/bar.js')).to.equal(fixture('route/route-nested.js'));
 
         expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
@@ -365,8 +365,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo', '--dummy'], _file => {
+    it('route foo --dummy', function () {
+      return emberGenerateDestroy(['route', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -381,8 +381,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--dummy'], _file => {
+    it('route foo.js --dummy', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo.js.js')).to.not.exist;
         expect(_file('tests/dummy/app/templates/foo.js.hbs')).to.not.exist;
 
@@ -401,8 +401,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo/bar --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], _file => {
+    it('route foo/bar --dummy', function () {
+      return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo/bar.js')).to.equal(
           fixture('route/route-nested.js')
         );
@@ -421,8 +421,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --pod', function() {
-      return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+    it('route foo --pod', function () {
+      return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
         expect(_file('addon/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('addon/foo/template.hbs')).to.equal('{{outlet}}');
@@ -439,8 +439,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --pod', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--pod'], _file => {
+    it('route foo.js --pod', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
         expect(_file('addon/foo.js/route.js')).to.not.exist;
         expect(_file('addon/foo.js/template.hbs')).to.not.exist;
         expect(_file('app/foo.js/route.js')).to.not.exist;
@@ -464,10 +464,10 @@ describe('Blueprint: route', function() {
     });
   });
 
-  describe('in app - octane', function() {
+  describe('in app - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -478,8 +478,8 @@ describe('Blueprint: route', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('route foo', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
+    it('route foo', function () {
+      return emberGenerateDestroy(['route', 'foo'], (_file) => {
         expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -492,8 +492,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js', function() {
-      return emberGenerateDestroy(['route', 'foo.js'], _file => {
+    it('route foo.js', function () {
+      return emberGenerateDestroy(['route', 'foo.js'], (_file) => {
         expect(_file('app/routes/foo.js.js')).to.not.exist;
         expect(_file('app/templates/foo.js.hbs')).to.not.exist;
         expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
@@ -511,8 +511,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --skip-router', function() {
-      return emberGenerateDestroy(['route', 'foo', '--skip-router'], _file => {
+    it('route foo --skip-router', function () {
+      return emberGenerateDestroy(['route', 'foo', '--skip-router'], (_file) => {
         expect(_file('app/routes/foo.js')).to.exist;
         expect(_file('app/templates/foo.hbs')).to.exist;
         expect(_file('tests/unit/routes/foo-test.js')).to.exist;
@@ -522,8 +522,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --path=:foo_id/show', function() {
-      return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], _file => {
+    it('route foo --path=:foo_id/show', function () {
+      return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
         expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -541,8 +541,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route parent/child --reset-namespace', function() {
-      return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], _file => {
+    it('route parent/child --reset-namespace', function () {
+      return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], (_file) => {
         expect(_file('app/routes/child.js')).to.equal(fixture('route/native-route-child.js'));
 
         expect(_file('app/templates/child.hbs')).to.equal('{{outlet}}');
@@ -559,10 +559,10 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route parent/child --reset-namespace --pod', function() {
+    it('route parent/child --reset-namespace --pod', function () {
       return emberGenerateDestroy(
         ['route', 'parent/child', '--reset-namespace', '--pod'],
-        _file => {
+        (_file) => {
           expect(_file('app/child/route.js')).to.equal(fixture('route/native-route-child.js'));
 
           expect(_file('app/child/template.hbs')).to.equal('{{outlet}}');
@@ -580,8 +580,8 @@ describe('Blueprint: route', function() {
       );
     });
 
-    it('route index', function() {
-      return emberGenerateDestroy(['route', 'index'], _file => {
+    it('route index', function () {
+      return emberGenerateDestroy(['route', 'index'], (_file) => {
         expect(_file('app/routes/index.js')).to.exist;
         expect(_file('app/templates/index.hbs')).to.exist;
         expect(_file('tests/unit/routes/index-test.js')).to.exist;
@@ -591,15 +591,15 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route application', function() {
+    it('route application', function () {
       fs.removeSync('app/templates/application.hbs');
       return emberGenerate(['route', 'application']).then(() => {
         expect(file('app/router.js')).to.not.contain("this.route('application')");
       });
     });
 
-    it('route basic', function() {
-      return emberGenerateDestroy(['route', 'basic'], _file => {
+    it('route basic', function () {
+      return emberGenerateDestroy(['route', 'basic'], (_file) => {
         expect(_file('app/routes/basic.js')).to.exist;
         expect(file('app/router.js')).to.not.contain("this.route('basic')");
       }).then(() => {
@@ -607,8 +607,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --pod', function() {
-      return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+    it('route foo --pod', function () {
+      return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
         expect(_file('app/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
         expect(_file('app/foo/template.hbs')).to.equal('{{outlet}}');
@@ -621,8 +621,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --pod', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--pod'], _file => {
+    it('route foo.js --pod', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
         expect(_file('app/foo.js/route.js')).to.not.exist;
         expect(_file('app/foo.js/template.hbs')).to.not.exist;
         expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
@@ -640,7 +640,7 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --pod with --path', function() {
+    it('route foo --pod with --path', function () {
       return emberGenerate(['route', 'foo', '--pod', '--path=:foo_id/show'])
         .then(() =>
           expect(file('app/router.js'))
@@ -657,33 +657,33 @@ describe('Blueprint: route', function() {
         );
     });
 
-    it('route index --pod', function() {
+    it('route index --pod', function () {
       return emberGenerate(['route', 'index', '--pod']).then(() =>
         expect(file('app/router.js')).to.not.contain("this.route('index')")
       );
     });
 
-    it('route application --pod', function() {
+    it('route application --pod', function () {
       return emberGenerate(['route', 'application', '--pod'])
         .then(() => expect(file('app/application/route.js')).to.exist)
         .then(() => expect(file('app/application/template.hbs')).to.exist)
         .then(() => expect(file('app/router.js')).to.not.contain("this.route('application')"));
     });
 
-    it('route basic --pod', function() {
-      return emberGenerateDestroy(['route', 'basic', '--pod'], _file => {
+    it('route basic --pod', function () {
+      return emberGenerateDestroy(['route', 'basic', '--pod'], (_file) => {
         expect(_file('app/basic/route.js')).to.exist;
         expect(file('app/router.js')).to.not.contain("this.route('index')");
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('route foo --pod', function() {
-        return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+      it('route foo --pod', function () {
+        return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
           expect(_file('app/pods/foo/template.hbs')).to.equal('{{outlet}}');
@@ -698,8 +698,8 @@ describe('Blueprint: route', function() {
         });
       });
 
-      it('route foo.js --pod', function() {
-        return emberGenerateDestroy(['route', 'foo.js', '--pod'], _file => {
+      it('route foo.js --pod', function () {
+        return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
           expect(_file('app/pods/foo.js/route.js')).to.not.exist;
           expect(_file('app/pods/foo.js/template.hbs')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/route-test.js')).to.not.exist;
@@ -721,10 +721,10 @@ describe('Blueprint: route', function() {
     });
   });
 
-  describe('in addon - octane', function() {
+  describe('in addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -735,8 +735,8 @@ describe('Blueprint: route', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('route foo', function() {
-      return emberGenerateDestroy(['route', 'foo'], _file => {
+    it('route foo', function () {
+      return emberGenerateDestroy(['route', 'foo'], (_file) => {
         expect(_file('addon/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
         expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -757,8 +757,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js', function() {
-      return emberGenerateDestroy(['route', 'foo.js'], _file => {
+    it('route foo.js', function () {
+      return emberGenerateDestroy(['route', 'foo.js'], (_file) => {
         expect(_file('addon/routes/foo.js.js')).to.not.exist;
         expect(_file('addon/templates/foo.js.hbs')).to.not.exist;
         expect(_file('app/routes/foo.js.js')).to.not.exist;
@@ -786,8 +786,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo/bar', function() {
-      return emberGenerateDestroy(['route', 'foo/bar'], _file => {
+    it('route foo/bar', function () {
+      return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
         expect(_file('addon/routes/foo/bar.js')).to.equal(fixture('route/native-route-nested.js'));
 
         expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
@@ -810,8 +810,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo', '--dummy'], _file => {
+    it('route foo --dummy', function () {
+      return emberGenerateDestroy(['route', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
         expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -826,8 +826,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--dummy'], _file => {
+    it('route foo.js --dummy', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo.js.js')).to.not.exist;
         expect(_file('tests/dummy/app/templates/foo.js.hbs')).to.not.exist;
 
@@ -846,8 +846,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo/bar --dummy', function() {
-      return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], _file => {
+    it('route foo/bar --dummy', function () {
+      return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo/bar.js')).to.equal(
           fixture('route/native-route-nested.js')
         );
@@ -866,8 +866,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo --pod', function() {
-      return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
+    it('route foo --pod', function () {
+      return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
         expect(_file('addon/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
         expect(_file('addon/foo/template.hbs')).to.equal('{{outlet}}');
@@ -884,8 +884,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --pod', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--pod'], _file => {
+    it('route foo.js --pod', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
         expect(_file('addon/foo.js/route.js')).to.not.exist;
         expect(_file('addon/foo.js/template.hbs')).to.not.exist;
         expect(_file('app/foo.js/route.js')).to.not.exist;
@@ -909,8 +909,8 @@ describe('Blueprint: route', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -921,8 +921,8 @@ describe('Blueprint: route', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('route foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('route foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('{{outlet}}');
@@ -939,8 +939,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['route', 'foo.js', '--in-repo-addon=my-addon'], _file => {
+    it('route foo.js --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['route', 'foo.js', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/routes/foo.js.js')).to.not.exist;
         expect(_file('lib/my-addon/addon/templates/foo.js.hbs')).to.not.exist;
         expect(_file('lib/my-addon/app/routes/foo.js.js')).to.not.exist;
@@ -963,8 +963,8 @@ describe('Blueprint: route', function() {
       });
     });
 
-    it('route foo/bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
+    it('route foo/bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/routes/foo/bar.js')).to.equal(
           fixture('route/route-nested.js')
         );
diff --git a/node-tests/blueprints/service-test-test.js b/node-tests/blueprints/service-test-test.js
index e5a26004e33..ff5a3c2dcdd 100644
--- a/node-tests/blueprints/service-test-test.js
+++ b/node-tests/blueprints/service-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: service-test', function() {
+describe('Blueprint: service-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,8 +29,8 @@ describe('Blueprint: service-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('service-test foo', function() {
-        return emberGenerateDestroy(['service-test', 'foo'], _file => {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
           expect(_file('tests/unit/services/foo-test.js')).to.equal(
             fixture('service-test/default.js')
           );
@@ -38,8 +38,8 @@ describe('Blueprint: service-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.11.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.11.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -47,16 +47,16 @@ describe('Blueprint: service-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.11.0');
       });
 
-      it('service-test foo', function() {
-        return emberGenerateDestroy(['service-test', 'foo'], _file => {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
           expect(_file('tests/unit/services/foo-test.js')).to.equal(
             fixture('service-test/mocha.js')
           );
         });
       });
 
-      it('service-test foo --pod', function() {
-        return emberGenerateDestroy(['service-test', 'foo', '--pod'], _file => {
+      it('service-test foo --pod', function () {
+        return emberGenerateDestroy(['service-test', 'foo', '--pod'], (_file) => {
           expect(_file('tests/unit/foo/service-test.js')).to.equal(
             fixture('service-test/mocha.js')
           );
@@ -64,8 +64,8 @@ describe('Blueprint: service-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha@0.12.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha@0.12.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
@@ -73,16 +73,16 @@ describe('Blueprint: service-test', function() {
         generateFakePackageManifest('ember-cli-mocha', '0.12.0');
       });
 
-      it('service-test foo', function() {
-        return emberGenerateDestroy(['service-test', 'foo'], _file => {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
           expect(_file('tests/unit/services/foo-test.js')).to.equal(
             fixture('service-test/mocha-0.12.js')
           );
         });
       });
 
-      it('service-test foo --pod', function() {
-        return emberGenerateDestroy(['service-test', 'foo', '--pod'], _file => {
+      it('service-test foo --pod', function () {
+        return emberGenerateDestroy(['service-test', 'foo', '--pod'], (_file) => {
           expect(_file('tests/unit/foo/service-test.js')).to.equal(
             fixture('service-test/mocha-0.12.js')
           );
@@ -90,8 +90,8 @@ describe('Blueprint: service-test', function() {
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -99,8 +99,8 @@ describe('Blueprint: service-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('service-test foo', function() {
-        return emberGenerateDestroy(['service-test', 'foo'], _file => {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
           expect(_file('tests/unit/services/foo-test.js')).to.equal(
             fixture('service-test/mocha-rfc232.js')
           );
@@ -108,8 +108,8 @@ describe('Blueprint: service-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -117,8 +117,8 @@ describe('Blueprint: service-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('service-test foo', function() {
-        return emberGenerateDestroy(['service-test', 'foo'], _file => {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
           expect(_file('tests/unit/services/foo-test.js')).to.equal(
             fixture('service-test/rfc232.js')
           );
@@ -127,13 +127,13 @@ describe('Blueprint: service-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -141,8 +141,8 @@ describe('Blueprint: service-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('service-test foo', function() {
-        return emberGenerateDestroy(['service-test', 'foo'], _file => {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
           expect(_file('tests/unit/services/foo-test.js')).to.equal(
             fixture('service-test/default.js')
           );
diff --git a/node-tests/blueprints/service-test.js b/node-tests/blueprints/service-test.js
index 6d70fc3d039..011555fc78a 100644
--- a/node-tests/blueprints/service-test.js
+++ b/node-tests/blueprints/service-test.js
@@ -16,11 +16,11 @@ const fixture = require('../helpers/fixture');
 const setupTestEnvironment = require('../helpers/setup-test-environment');
 const enableOctane = setupTestEnvironment.enableOctane;
 
-describe('Blueprint: service', function() {
+describe('Blueprint: service', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -31,8 +31,8 @@ describe('Blueprint: service', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('service foo', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
+    it('service foo', function () {
+      return emberGenerateDestroy(['service', 'foo'], (_file) => {
         expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('tests/unit/services/foo-test.js')).to.equal(
@@ -41,8 +41,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js', function() {
-      return emberGenerateDestroy(['service', 'foo.js'], _file => {
+    it('service foo.js', function () {
+      return emberGenerateDestroy(['service', 'foo.js'], (_file) => {
         expect(_file('app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo-test.js.js')).to.not.exist;
 
@@ -54,8 +54,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar', function() {
-      return emberGenerateDestroy(['service', 'foo/bar'], _file => {
+    it('service foo/bar', function () {
+      return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
         expect(_file('app/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
 
         expect(_file('tests/unit/services/foo/bar-test.js')).to.equal(
@@ -64,8 +64,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo --pod', function() {
-      return emberGenerateDestroy(['service', 'foo', '--pod'], _file => {
+    it('service foo --pod', function () {
+      return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
         expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('tests/unit/foo/service-test.js')).to.equal(
@@ -74,8 +74,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js --pod', function() {
-      return emberGenerateDestroy(['service', 'foo.js', '--pod'], _file => {
+    it('service foo.js --pod', function () {
+      return emberGenerateDestroy(['service', 'foo.js', '--pod'], (_file) => {
         expect(_file('app/foo.js/service.js')).to.not.exist;
         expect(_file('tests/unit/foo.js/service-test.js')).to.not.exist;
 
@@ -87,8 +87,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar --pod', function() {
-      return emberGenerateDestroy(['service', 'foo/bar', '--pod'], _file => {
+    it('service foo/bar --pod', function () {
+      return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/foo/bar/service.js')).to.equal(fixture('service/service-nested.js'));
 
         expect(_file('tests/unit/foo/bar/service-test.js')).to.equal(
@@ -97,13 +97,13 @@ describe('Blueprint: service', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('service foo --pod', function() {
-        return emberGenerateDestroy(['service', 'foo', '--pod'], _file => {
+      it('service foo --pod', function () {
+        return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js'));
 
           expect(_file('tests/unit/pods/foo/service-test.js')).to.equal(
@@ -112,8 +112,8 @@ describe('Blueprint: service', function() {
         });
       });
 
-      it('service foo.js --pod', function() {
-        return emberGenerateDestroy(['service', 'foo.js', '--pod'], _file => {
+      it('service foo.js --pod', function () {
+        return emberGenerateDestroy(['service', 'foo.js', '--pod'], (_file) => {
           expect(_file('app/pods/foo.js/service.js')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/service-test.js')).to.not.exist;
 
@@ -125,8 +125,8 @@ describe('Blueprint: service', function() {
         });
       });
 
-      it('service foo/bar --pod', function() {
-        return emberGenerateDestroy(['service', 'foo/bar', '--pod'], _file => {
+      it('service foo/bar --pod', function () {
+        return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/pods/foo/bar/service.js')).to.equal(
             fixture('service/service-nested.js')
           );
@@ -139,10 +139,10 @@ describe('Blueprint: service', function() {
     });
   });
 
-  describe('in app - octane', function() {
+  describe('in app - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -153,8 +153,8 @@ describe('Blueprint: service', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('service foo', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
+    it('service foo', function () {
+      return emberGenerateDestroy(['service', 'foo'], (_file) => {
         expect(_file('app/services/foo.js')).to.equal(fixture('service/native-service.js'));
 
         expect(_file('tests/unit/services/foo-test.js')).to.equal(
@@ -163,8 +163,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js', function() {
-      return emberGenerateDestroy(['service', 'foo.js'], _file => {
+    it('service foo.js', function () {
+      return emberGenerateDestroy(['service', 'foo.js'], (_file) => {
         expect(_file('app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
 
@@ -176,8 +176,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar', function() {
-      return emberGenerateDestroy(['service', 'foo/bar'], _file => {
+    it('service foo/bar', function () {
+      return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
         expect(_file('app/services/foo/bar.js')).to.equal(
           fixture('service/native-service-nested.js')
         );
@@ -188,8 +188,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo --pod', function() {
-      return emberGenerateDestroy(['service', 'foo', '--pod'], _file => {
+    it('service foo --pod', function () {
+      return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
         expect(_file('app/foo/service.js')).to.equal(fixture('service/native-service.js'));
 
         expect(_file('tests/unit/foo/service-test.js')).to.equal(
@@ -198,8 +198,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js --pod', function() {
-      return emberGenerateDestroy(['service', 'foo.js', '--pod'], _file => {
+    it('service foo.js --pod', function () {
+      return emberGenerateDestroy(['service', 'foo.js', '--pod'], (_file) => {
         expect(_file('app/foo.js/service.js')).to.not.exist;
         expect(_file('tests/unit/foo.js/service-test.js')).to.not.exist;
 
@@ -211,8 +211,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar --pod', function() {
-      return emberGenerateDestroy(['service', 'foo/bar', '--pod'], _file => {
+    it('service foo/bar --pod', function () {
+      return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/foo/bar/service.js')).to.equal(
           fixture('service/native-service-nested.js')
         );
@@ -223,13 +223,13 @@ describe('Blueprint: service', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
 
-      it('service foo --pod', function() {
-        return emberGenerateDestroy(['service', 'foo', '--pod'], _file => {
+      it('service foo --pod', function () {
+        return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/native-service.js'));
 
           expect(_file('tests/unit/pods/foo/service-test.js')).to.equal(
@@ -238,8 +238,8 @@ describe('Blueprint: service', function() {
         });
       });
 
-      it('service foo.js --pod', function() {
-        return emberGenerateDestroy(['service', 'foo.js', '--pod'], _file => {
+      it('service foo.js --pod', function () {
+        return emberGenerateDestroy(['service', 'foo.js', '--pod'], (_file) => {
           expect(_file('app/pods/foo.js/service.js')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/service-test.js')).to.not.exist;
 
@@ -251,8 +251,8 @@ describe('Blueprint: service', function() {
         });
       });
 
-      it('service foo/bar --pod', function() {
-        return emberGenerateDestroy(['service', 'foo/bar', '--pod'], _file => {
+      it('service foo/bar --pod', function () {
+        return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/pods/foo/bar/service.js')).to.equal(
             fixture('service/native-service-nested.js')
           );
@@ -265,8 +265,8 @@ describe('Blueprint: service', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -277,8 +277,8 @@ describe('Blueprint: service', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('service foo', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
+    it('service foo', function () {
+      return emberGenerateDestroy(['service', 'foo'], (_file) => {
         expect(_file('addon/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('app/services/foo.js')).to.contain(
@@ -291,8 +291,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js', function() {
-      return emberGenerateDestroy(['service', 'foo.js'], _file => {
+    it('service foo.js', function () {
+      return emberGenerateDestroy(['service', 'foo.js'], (_file) => {
         expect(_file('addon/services/foo.js.js')).to.not.exist;
         expect(_file('app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
@@ -309,8 +309,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar', function() {
-      return emberGenerateDestroy(['service', 'foo/bar'], _file => {
+    it('service foo/bar', function () {
+      return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
         expect(_file('addon/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
 
         expect(_file('app/services/foo/bar.js')).to.contain(
@@ -323,8 +323,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar --dummy', function() {
-      return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], _file => {
+    it('service foo/bar --dummy', function () {
+      return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
           fixture('service/service-nested.js')
         );
@@ -332,8 +332,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar.js --dummy', function() {
-      return emberGenerateDestroy(['service', 'foo/bar.js', '--dummy'], _file => {
+    it('service foo/bar.js --dummy', function () {
+      return emberGenerateDestroy(['service', 'foo/bar.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/services/foo/bar.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
@@ -344,10 +344,10 @@ describe('Blueprint: service', function() {
     });
   });
 
-  describe('in addon - octane', function() {
+  describe('in addon - octane', function () {
     enableOctane();
 
-    beforeEach(function() {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -358,8 +358,8 @@ describe('Blueprint: service', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('service foo', function() {
-      return emberGenerateDestroy(['service', 'foo'], _file => {
+    it('service foo', function () {
+      return emberGenerateDestroy(['service', 'foo'], (_file) => {
         expect(_file('addon/services/foo.js')).to.equal(fixture('service/native-service.js'));
 
         expect(_file('app/services/foo.js')).to.contain(
@@ -372,8 +372,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js', function() {
-      return emberGenerateDestroy(['service', 'foo.js'], _file => {
+    it('service foo.js', function () {
+      return emberGenerateDestroy(['service', 'foo.js'], (_file) => {
         expect(_file('addon/services/foo.js.js')).to.not.exist;
         expect(_file('app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
@@ -390,8 +390,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar', function() {
-      return emberGenerateDestroy(['service', 'foo/bar'], _file => {
+    it('service foo/bar', function () {
+      return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
         expect(_file('addon/services/foo/bar.js')).to.equal(
           fixture('service/native-service-nested.js')
         );
@@ -406,8 +406,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar --dummy', function() {
-      return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], _file => {
+    it('service foo/bar --dummy', function () {
+      return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
           fixture('service/native-service-nested.js')
         );
@@ -415,8 +415,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar.js --dummy', function() {
-      return emberGenerateDestroy(['service', 'foo/bar.js', '--dummy'], _file => {
+    it('service foo/bar.js --dummy', function () {
+      return emberGenerateDestroy(['service', 'foo/bar.js', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/services/foo/bar.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
@@ -427,8 +427,8 @@ describe('Blueprint: service', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -439,8 +439,8 @@ describe('Blueprint: service', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('service foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['service', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('service foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['service', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('lib/my-addon/app/services/foo.js')).to.contain(
@@ -453,8 +453,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['service', 'foo.js', '--in-repo-addon=my-addon'], _file => {
+    it('service foo.js --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['service', 'foo.js', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/services/foo.js.js')).to.not.exist;
         expect(_file('lib/my-addon/app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
@@ -471,8 +471,8 @@ describe('Blueprint: service', function() {
       });
     });
 
-    it('service foo/bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['service', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
+    it('service foo/bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['service', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/services/foo/bar.js')).to.equal(
           fixture('service/service-nested.js')
         );
diff --git a/node-tests/blueprints/template-test.js b/node-tests/blueprints/template-test.js
index 6a8b7a2be1c..6891380775d 100644
--- a/node-tests/blueprints/template-test.js
+++ b/node-tests/blueprints/template-test.js
@@ -9,151 +9,151 @@ const setupPodConfig = blueprintHelpers.setupPodConfig;
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
-describe('Blueprint: template', function() {
+describe('Blueprint: template', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    it('template foo', function() {
-      return emberGenerateDestroy(['template', 'foo'], _file => {
+    it('template foo', function () {
+      return emberGenerateDestroy(['template', 'foo'], (_file) => {
         expect(_file('app/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo.hbs', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs'], _file => {
+    it('template foo.hbs', function () {
+      return emberGenerateDestroy(['template', 'foo.hbs'], (_file) => {
         expect(_file('app/templates/foo.hbs.hbs')).to.not.exist;
         expect(_file('app/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo/bar', function() {
-      return emberGenerateDestroy(['template', 'foo/bar'], _file => {
+    it('template foo/bar', function () {
+      return emberGenerateDestroy(['template', 'foo/bar'], (_file) => {
         expect(_file('app/templates/foo/bar.hbs')).to.equal('');
       });
     });
 
-    describe('with usePods', function() {
-      beforeEach(function() {
+    describe('with usePods', function () {
+      beforeEach(function () {
         setupPodConfig({ usePods: true });
       });
 
-      it('template foo', function() {
-        return emberGenerateDestroy(['template', 'foo'], _file => {
+      it('template foo', function () {
+        return emberGenerateDestroy(['template', 'foo'], (_file) => {
           expect(_file('app/foo/template.hbs')).to.equal('');
         });
       });
 
-      it('template foo.hbs', function() {
-        return emberGenerateDestroy(['template', 'foo.hbs'], _file => {
+      it('template foo.hbs', function () {
+        return emberGenerateDestroy(['template', 'foo.hbs'], (_file) => {
           expect(_file('app/foo.hbs/template.hbs')).to.not.exist;
           expect(_file('app/foo/template.hbs')).to.equal('');
         });
       });
 
-      it('template foo/bar', function() {
-        return emberGenerateDestroy(['template', 'foo/bar'], _file => {
+      it('template foo/bar', function () {
+        return emberGenerateDestroy(['template', 'foo/bar'], (_file) => {
           expect(_file('app/foo/bar/template.hbs')).to.equal('');
         });
       });
     });
 
-    describe('with usePods + podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with usePods + podModulePrefix', function () {
+      beforeEach(function () {
         setupPodConfig({
           usePods: true,
           podModulePrefix: true,
         });
       });
 
-      it('template foo', function() {
-        return emberGenerateDestroy(['template', 'foo'], _file => {
+      it('template foo', function () {
+        return emberGenerateDestroy(['template', 'foo'], (_file) => {
           expect(_file('app/pods/foo/template.hbs')).to.equal('');
         });
       });
 
-      it('template foo.hbs', function() {
-        return emberGenerateDestroy(['template', 'foo.hbs'], _file => {
+      it('template foo.hbs', function () {
+        return emberGenerateDestroy(['template', 'foo.hbs'], (_file) => {
           expect(_file('app/pods/foo.hbs/template.hbs')).to.not.exist;
           expect(_file('app/pods/foo/template.hbs')).to.equal('');
         });
       });
 
-      it('template foo/bar', function() {
-        return emberGenerateDestroy(['template', 'foo/bar'], _file => {
+      it('template foo/bar', function () {
+        return emberGenerateDestroy(['template', 'foo/bar'], (_file) => {
           expect(_file('app/pods/foo/bar/template.hbs')).to.equal('');
         });
       });
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    it('template foo', function() {
-      return emberGenerateDestroy(['template', 'foo'], _file => {
+    it('template foo', function () {
+      return emberGenerateDestroy(['template', 'foo'], (_file) => {
         expect(_file('addon/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo.hbs', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs'], _file => {
+    it('template foo.hbs', function () {
+      return emberGenerateDestroy(['template', 'foo.hbs'], (_file) => {
         expect(_file('addon/templates/foo.hbs.hbs')).to.not.exist;
         expect(_file('addon/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo/bar', function() {
-      return emberGenerateDestroy(['template', 'foo/bar'], _file => {
+    it('template foo/bar', function () {
+      return emberGenerateDestroy(['template', 'foo/bar'], (_file) => {
         expect(_file('addon/templates/foo/bar.hbs')).to.equal('');
       });
     });
 
-    it('template foo --dummy', function() {
-      return emberGenerateDestroy(['template', 'foo', '--dummy'], _file => {
+    it('template foo --dummy', function () {
+      return emberGenerateDestroy(['template', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo.hbs --dummy', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs', '--dummy'], _file => {
+    it('template foo.hbs --dummy', function () {
+      return emberGenerateDestroy(['template', 'foo.hbs', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/templates/foo.hbs.hbs')).to.not.exist;
         expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo/bar --dummy', function() {
-      return emberGenerateDestroy(['template', 'foo/bar', '--dummy'], _file => {
+    it('template foo/bar --dummy', function () {
+      return emberGenerateDestroy(['template', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/templates/foo/bar.hbs')).to.equal('');
       });
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' });
     });
 
-    it('template foo --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['template', 'foo', '--in-repo-addon=my-addon'], _file => {
+    it('template foo --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['template', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo.hbs --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['template', 'foo.hbs', '--in-repo-addon=my-addon'], _file => {
+    it('template foo.hbs --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['template', 'foo.hbs', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/templates/foo.hbs.hbs')).to.not.exist;
         expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('');
       });
     });
 
-    it('template foo/bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['template', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
+    it('template foo/bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['template', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal('');
       });
     });
diff --git a/node-tests/blueprints/util-test-test.js b/node-tests/blueprints/util-test-test.js
index f91663517f7..27f122f9612 100644
--- a/node-tests/blueprints/util-test-test.js
+++ b/node-tests/blueprints/util-test-test.js
@@ -12,16 +12,16 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: util-test', function() {
+describe('Blueprint: util-test', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew();
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -29,8 +29,8 @@ describe('Blueprint: util-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
+      it('util-test foo-bar', function () {
+        return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => {
           expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(
             fixture('util-test/default.js')
           );
@@ -38,8 +38,8 @@ describe('Blueprint: util-test', function() {
       });
     });
 
-    describe('with ember-cli-qunit@4.2.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.2.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -47,8 +47,8 @@ describe('Blueprint: util-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.2.0');
       });
 
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
+      it('util-test foo-bar', function () {
+        return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => {
           expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(
             fixture('util-test/rfc232.js')
           );
@@ -56,23 +56,23 @@ describe('Blueprint: util-test', function() {
       });
     });
 
-    describe('with ember-cli-mocha', function() {
-      beforeEach(function() {
+    describe('with ember-cli-mocha', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-mocha', dev: true },
         ]);
       });
 
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
+      it('util-test foo-bar', function () {
+        return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => {
           expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/mocha.js'));
         });
       });
     });
 
-    describe('with ember-mocha@0.14.0', function() {
-      beforeEach(function() {
+    describe('with ember-mocha@0.14.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-mocha', dev: true },
@@ -80,8 +80,8 @@ describe('Blueprint: util-test', function() {
         generateFakePackageManifest('ember-mocha', '0.14.0');
       });
 
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
+      it('util-test foo-bar', function () {
+        return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => {
           expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(
             fixture('util-test/mocha-rfc232.js')
           );
@@ -90,13 +90,13 @@ describe('Blueprint: util-test', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' });
     });
 
-    describe('with ember-cli-qunit@4.1.0', function() {
-      beforeEach(function() {
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
@@ -104,8 +104,8 @@ describe('Blueprint: util-test', function() {
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
 
-      it('util-test foo-bar', function() {
-        return emberGenerateDestroy(['util-test', 'foo-bar'], _file => {
+      it('util-test foo-bar', function () {
+        return emberGenerateDestroy(['util-test', 'foo-bar'], (_file) => {
           expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/dummy.js'));
         });
       });
diff --git a/node-tests/blueprints/util-test.js b/node-tests/blueprints/util-test.js
index 335c2921967..cc9d9d91641 100644
--- a/node-tests/blueprints/util-test.js
+++ b/node-tests/blueprints/util-test.js
@@ -13,11 +13,11 @@ const expect = chai.expect;
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const fixture = require('../helpers/fixture');
 
-describe('Blueprint: util', function() {
+describe('Blueprint: util', function () {
   setupTestHooks(this);
 
-  describe('in app', function() {
-    beforeEach(function() {
+  describe('in app', function () {
+    beforeEach(function () {
       return emberNew()
         .then(() =>
           modifyPackages([
@@ -28,16 +28,16 @@ describe('Blueprint: util', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('util foo-bar', function() {
-      return emberGenerateDestroy(['util', 'foo-bar'], _file => {
+    it('util foo-bar', function () {
+      return emberGenerateDestroy(['util', 'foo-bar'], (_file) => {
         expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
 
         expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js'));
       });
     });
 
-    it('util foo-bar.js', function() {
-      return emberGenerateDestroy(['util', 'foo-bar.js'], _file => {
+    it('util foo-bar.js', function () {
+      return emberGenerateDestroy(['util', 'foo-bar.js'], (_file) => {
         expect(_file('app/utils/foo-bar.js.js')).to.not.exist;
         expect(_file('tests/unit/utils/foo-bar.js-test.js')).to.not.exist;
 
@@ -47,8 +47,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo/bar-baz', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz'], _file => {
+    it('util foo/bar-baz', function () {
+      return emberGenerateDestroy(['util', 'foo/bar-baz'], (_file) => {
         expect(_file('app/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js'));
 
         expect(_file('tests/unit/utils/foo/bar-baz-test.js')).to.equal(
@@ -57,16 +57,16 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo-bar --pod', function() {
-      return emberGenerateDestroy(['util', 'foo-bar', '--pod'], _file => {
+    it('util foo-bar --pod', function () {
+      return emberGenerateDestroy(['util', 'foo-bar', '--pod'], (_file) => {
         expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
 
         expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(fixture('util-test/default.js'));
       });
     });
 
-    it('util foo-bar.js --pod', function() {
-      return emberGenerateDestroy(['util', 'foo-bar.js', '--pod'], _file => {
+    it('util foo-bar.js --pod', function () {
+      return emberGenerateDestroy(['util', 'foo-bar.js', '--pod'], (_file) => {
         expect(_file('app/utils/foo-bar.js.js')).to.not.exist;
         expect(_file('tests/unit/utils/foo-bar.js-test.js')).to.not.exist;
 
@@ -76,8 +76,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo/bar-baz --pod', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz', '--pod'], _file => {
+    it('util foo/bar-baz --pod', function () {
+      return emberGenerateDestroy(['util', 'foo/bar-baz', '--pod'], (_file) => {
         expect(_file('app/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js'));
 
         expect(_file('tests/unit/utils/foo/bar-baz-test.js')).to.equal(
@@ -86,13 +86,13 @@ describe('Blueprint: util', function() {
       });
     });
 
-    describe('with podModulePrefix', function() {
-      beforeEach(function() {
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
         return setupPodConfig({ podModulePrefix: true });
       });
 
-      it('util foo-bar --pod', function() {
-        return emberGenerateDestroy(['util', 'foo-bar', '--pod'], _file => {
+      it('util foo-bar --pod', function () {
+        return emberGenerateDestroy(['util', 'foo-bar', '--pod'], (_file) => {
           expect(_file('app/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
 
           expect(_file('tests/unit/utils/foo-bar-test.js')).to.equal(
@@ -101,8 +101,8 @@ describe('Blueprint: util', function() {
         });
       });
 
-      it('util foo-bar.js --pod', function() {
-        return emberGenerateDestroy(['util', 'foo-bar.js', '--pod'], _file => {
+      it('util foo-bar.js --pod', function () {
+        return emberGenerateDestroy(['util', 'foo-bar.js', '--pod'], (_file) => {
           expect(_file('app/utils/foo-bar.js.js')).to.not.exist;
           expect(_file('tests/unit/utils/foo-bar.js-test.js')).to.not.exist;
 
@@ -116,8 +116,8 @@ describe('Blueprint: util', function() {
     });
   });
 
-  describe('in addon', function() {
-    beforeEach(function() {
+  describe('in addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'addon' })
         .then(() =>
           modifyPackages([
@@ -128,8 +128,8 @@ describe('Blueprint: util', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('util foo-bar', function() {
-      return emberGenerateDestroy(['util', 'foo-bar'], _file => {
+    it('util foo-bar', function () {
+      return emberGenerateDestroy(['util', 'foo-bar'], (_file) => {
         expect(_file('addon/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
 
         expect(_file('app/utils/foo-bar.js')).to.contain(
@@ -142,8 +142,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo-bar.js', function() {
-      return emberGenerateDestroy(['util', 'foo-bar.js'], _file => {
+    it('util foo-bar.js', function () {
+      return emberGenerateDestroy(['util', 'foo-bar.js'], (_file) => {
         expect(_file('addon/utils/foo-bar.js.js')).to.not.exist;
         expect(_file('app/utils/foo-bar.js.js')).to.not.exist;
         expect(_file('tests/unit/utils/foo-bar.js-test.js')).to.not.exist;
@@ -160,8 +160,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo/bar-baz', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz'], _file => {
+    it('util foo/bar-baz', function () {
+      return emberGenerateDestroy(['util', 'foo/bar-baz'], (_file) => {
         expect(_file('addon/utils/foo/bar-baz.js')).to.equal(fixture('util/util-nested.js'));
 
         expect(_file('app/utils/foo/bar-baz.js')).to.contain(
@@ -174,8 +174,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo/bar-baz --dummy', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz', '--dummy'], _file => {
+    it('util foo/bar-baz --dummy', function () {
+      return emberGenerateDestroy(['util', 'foo/bar-baz', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/utils/foo/bar-baz.js')).to.equal(
           fixture('util/util-nested.js')
         );
@@ -185,8 +185,8 @@ describe('Blueprint: util', function() {
     });
   });
 
-  describe('in in-repo-addon', function() {
-    beforeEach(function() {
+  describe('in in-repo-addon', function () {
+    beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
           modifyPackages([
@@ -197,8 +197,8 @@ describe('Blueprint: util', function() {
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
     });
 
-    it('util foo-bar --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['util', 'foo-bar', '--in-repo-addon=my-addon'], _file => {
+    it('util foo-bar --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['util', 'foo-bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/utils/foo-bar.js')).to.equal(fixture('util/util.js'));
 
         expect(_file('lib/my-addon/app/utils/foo-bar.js')).to.contain(
@@ -209,8 +209,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo-bar.js --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['util', 'foo-bar.js', '--in-repo-addon=my-addon'], _file => {
+    it('util foo-bar.js --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['util', 'foo-bar.js', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/utils/foo-bar.js.js')).to.not.exist;
         expect(_file('lib/my-addon/app/utils/foo-bar.js.js')).to.not.exist;
         expect(_file('tests/unit/utils/foo-bar.js-test.js')).to.not.exist;
@@ -225,8 +225,8 @@ describe('Blueprint: util', function() {
       });
     });
 
-    it('util foo/bar-baz --in-repo-addon=my-addon', function() {
-      return emberGenerateDestroy(['util', 'foo/bar-baz', '--in-repo-addon=my-addon'], _file => {
+    it('util foo/bar-baz --in-repo-addon=my-addon', function () {
+      return emberGenerateDestroy(['util', 'foo/bar-baz', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/utils/foo/bar-baz.js')).to.equal(
           fixture('util/util-nested.js')
         );
diff --git a/node-tests/helpers/expect-error.js b/node-tests/helpers/expect-error.js
index e8265a0a3d5..e9eda641846 100644
--- a/node-tests/helpers/expect-error.js
+++ b/node-tests/helpers/expect-error.js
@@ -8,7 +8,7 @@ module.exports = function expectError(promise, expectedErrorText) {
     .then(() => {
       throw new Error('the command should raise an exception');
     })
-    .catch(error => {
+    .catch((error) => {
       expect(error.message).to.equal(expectedErrorText);
     });
 };
diff --git a/node-tests/helpers/fixture.js b/node-tests/helpers/fixture.js
index e2ab920abb0..b55cde25f1c 100644
--- a/node-tests/helpers/fixture.js
+++ b/node-tests/helpers/fixture.js
@@ -4,7 +4,7 @@ const path = require('path');
 const file = require('ember-cli-blueprint-test-helpers/chai').file;
 const fs = require('fs');
 
-module.exports = function(filePath, options) {
+module.exports = function (filePath, options) {
   if (!options) {
     return file(path.join(__dirname, '../fixtures', filePath));
   }
diff --git a/node-tests/helpers/setup-test-environment.js b/node-tests/helpers/setup-test-environment.js
index 33c7db91ace..25d9a60deb4 100644
--- a/node-tests/helpers/setup-test-environment.js
+++ b/node-tests/helpers/setup-test-environment.js
@@ -1,11 +1,11 @@
 const { setEdition, clearEdition } = require('@ember/edition-utils');
 
 function enableOctane() {
-  beforeEach(function() {
+  beforeEach(function () {
     setEdition('octane');
   });
 
-  afterEach(function() {
+  afterEach(function () {
     clearEdition();
   });
 }
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 78834811778..e133219069d 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -706,7 +706,7 @@ export declare class DebugRegistry extends Registry {
 
 if (DEBUG) {
   const proto = Registry.prototype as DebugRegistry;
-  proto.normalizeInjectionsHash = function(hash: { [key: string]: LazyInjection }) {
+  proto.normalizeInjectionsHash = function (hash: { [key: string]: LazyInjection }) {
     let injections: Injection[] = [];
 
     for (let key in hash) {
@@ -729,7 +729,7 @@ if (DEBUG) {
     return injections;
   };
 
-  proto.validateInjections = function(injections: Injection[]) {
+  proto.validateInjections = function (injections: Injection[]) {
     if (!injections) {
       return;
     }
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index 78c6bb1e33e..26efba17fd2 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -177,7 +177,7 @@ moduleFor(
       let registry = new Registry();
       let container = registry.container();
 
-      let template = function() {};
+      let template = function () {};
       registry.register('template:foo', template, { instantiate: false });
       assert.equal(container.lookup('template:foo'), template);
     }
@@ -250,7 +250,7 @@ moduleFor(
       let container = registry.container();
       let PostController = factory();
       let PostView = factory();
-      let template = function() {};
+      let template = function () {};
 
       registry.register('controller:post', PostController);
       registry.register('view:post', PostView, { singleton: false });
@@ -292,7 +292,7 @@ moduleFor(
       let container = registry.container();
       let PostController = factory();
 
-      registry.normalizeFullName = function() {
+      registry.normalizeFullName = function () {
         return 'controller:post';
       };
 
@@ -307,7 +307,7 @@ moduleFor(
       let container = registry.container();
       let PostController = factory();
 
-      registry.normalizeFullName = function() {
+      registry.normalizeFullName = function () {
         return 'controller:post';
       };
 
@@ -394,7 +394,7 @@ moduleFor(
       let container = registry.container();
       let PostController = factory();
       let resolveWasCalled = [];
-      registry.resolve = function(fullName) {
+      registry.resolve = function (fullName) {
         resolveWasCalled.push(fullName);
         return PostController;
       };
@@ -412,7 +412,7 @@ moduleFor(
       let container = registry.container();
       let PostController = factory();
       let resolveWasCalled = [];
-      registry.resolve = function(fullName) {
+      registry.resolve = function (fullName) {
         resolveWasCalled.push(fullName);
         return PostController;
       };
@@ -431,7 +431,7 @@ moduleFor(
       let PostController = {};
       let resolveWasCalled = [];
 
-      registry.resolve = function(fullName) {
+      registry.resolve = function (fullName) {
         resolveWasCalled.push(fullName);
         return PostController;
       };
diff --git a/packages/@ember/-internals/container/tests/registry_test.js b/packages/@ember/-internals/container/tests/registry_test.js
index 9459582f3cd..bfb2503075e 100644
--- a/packages/@ember/-internals/container/tests/registry_test.js
+++ b/packages/@ember/-internals/container/tests/registry_test.js
@@ -126,7 +126,7 @@ moduleFor(
       let registry = new Registry();
       let PostController = factory();
 
-      registry.normalizeFullName = function() {
+      registry.normalizeFullName = function () {
         return 'controller:post';
       };
 
@@ -140,7 +140,7 @@ moduleFor(
       let registry = new Registry();
       let PostController = factory();
 
-      registry.normalizeFullName = function(fullName) {
+      registry.normalizeFullName = function (fullName) {
         return fullName === 'controller:normalized' ? 'controller:post' : fullName;
       };
 
@@ -159,7 +159,7 @@ moduleFor(
       let PostController = factory();
       let user = { name: 'Stef' };
 
-      registry.normalize = function() {
+      registry.normalize = function () {
         return 'controller:post';
       };
 
@@ -201,7 +201,7 @@ moduleFor(
       registry.register('controller:apple', FirstApple);
       assert.strictEqual(registry.resolve('controller:apple'), FirstApple);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         registry.register('controller:apple', SecondApple);
       }, /Cannot re-register: 'controller:apple', as it has already been resolved\./);
 
@@ -217,7 +217,7 @@ moduleFor(
       let FirstApple = factory('first');
       let SecondApple = factory('second');
 
-      SecondApple.extend = function() {
+      SecondApple.extend = function () {
         assert.ok(
           false,
           'should not extend or touch the injected model, merely to inspect existence of another'
@@ -768,7 +768,7 @@ moduleFor(
           return 'yippie!';
         },
 
-        expandLocalLookup: targetFullName => {
+        expandLocalLookup: (targetFullName) => {
           assert.ok(true, 'expandLocalLookup is called on the resolver');
 
           if (targetFullName === 'foo:bar') {
diff --git a/packages/@ember/-internals/environment/lib/context.ts b/packages/@ember/-internals/environment/lib/context.ts
index 7442e25e00d..0bb69e10d8a 100644
--- a/packages/@ember/-internals/environment/lib/context.ts
+++ b/packages/@ember/-internals/environment/lib/context.ts
@@ -7,7 +7,7 @@ export interface GlobalContext {
 }
 
 // legacy imports/exports/lookup stuff (should we keep this??)
-export const context = (function(
+export const context = (function (
   global: object,
   Ember: Partial<GlobalContext> | undefined
 ): GlobalContext {
diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index 7230efd318a..615aeccad45 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -181,7 +181,7 @@ export const ENV = {
   },
 };
 
-(EmberENV => {
+((EmberENV) => {
   if (typeof EmberENV !== 'object' || EmberENV === null) return;
 
   for (let flag in EmberENV) {
@@ -225,7 +225,7 @@ export const ENV = {
       if (!Object.prototype.hasOwnProperty.call(EMBER_LOAD_HOOKS, hookName)) continue;
       let hooks = EMBER_LOAD_HOOKS[hookName];
       if (Array.isArray(hooks)) {
-        ENV.EMBER_LOAD_HOOKS[hookName] = hooks.filter(hook => typeof hook === 'function');
+        ENV.EMBER_LOAD_HOOKS[hookName] = hooks.filter((hook) => typeof hook === 'function');
       }
     }
   }
diff --git a/packages/@ember/-internals/environment/lib/global.ts b/packages/@ember/-internals/environment/lib/global.ts
index 5d1670e4306..ceaff0c112c 100644
--- a/packages/@ember/-internals/environment/lib/global.ts
+++ b/packages/@ember/-internals/environment/lib/global.ts
@@ -13,7 +13,7 @@ function checkElementIdShadowing(value: any | null | undefined) {
 
 // export real global
 export default checkGlobal(checkElementIdShadowing(typeof global === 'object' && global)) ||
-checkGlobal(typeof self === 'object' && self) ||
-checkGlobal(typeof window === 'object' && window) ||
-(typeof mainContext !== 'undefined' && mainContext) || // set before strict mode in Ember loader/wrapper
+  checkGlobal(typeof self === 'object' && self) ||
+  checkGlobal(typeof window === 'object' && window) ||
+  (typeof mainContext !== 'undefined' && mainContext) || // set before strict mode in Ember loader/wrapper
   new Function('return this')(); // eval outside of strict mode
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
index 49227a4792f..8923585ecc8 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
@@ -81,7 +81,7 @@ export default EmberObject.extend({
     let types = emberA();
     let typeSuffixRegex = new RegExp(`${classify(type)}$`);
 
-    namespaces.forEach(namespace => {
+    namespaces.forEach((namespace) => {
       for (let key in namespace) {
         if (!Object.prototype.hasOwnProperty.call(namespace, key)) {
           continue;
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.js
index 2e54401d04e..eedb6e92d4b 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.js
@@ -135,7 +135,7 @@ export default EmberObject.extend({
     let releaseMethods = emberA();
     let typesToSend;
 
-    typesToSend = modelTypes.map(type => {
+    typesToSend = modelTypes.map((type) => {
       let klass = type.klass;
       let wrapped = this.wrapModelType(klass, type.name);
       releaseMethods.push(this.observeModelType(type.name, typesUpdated));
@@ -145,7 +145,7 @@ export default EmberObject.extend({
     typesAdded(typesToSend);
 
     let release = () => {
-      releaseMethods.forEach(fn => fn());
+      releaseMethods.forEach((fn) => fn());
       this.releaseMethods.removeObject(release);
     };
     this.releaseMethods.pushObject(release);
@@ -195,7 +195,7 @@ export default EmberObject.extend({
       recordsUpdated([updatedRecord]);
     }
 
-    let recordsToSend = records.map(record => {
+    let recordsToSend = records.map((record) => {
       releaseMethods.push(this.observeRecord(record, recordUpdated));
       return this.wrapRecord(record);
     });
@@ -222,7 +222,7 @@ export default EmberObject.extend({
     addArrayObserver(records, this, observer);
 
     release = () => {
-      releaseMethods.forEach(fn => fn());
+      releaseMethods.forEach((fn) => fn());
       removeArrayObserver(records, this, observer);
       this.releaseMethods.removeObject(release);
     };
@@ -240,7 +240,7 @@ export default EmberObject.extend({
   */
   willDestroy() {
     this._super(...arguments);
-    this.releaseMethods.forEach(fn => fn());
+    this.releaseMethods.forEach((fn) => fn());
   },
 
   /**
@@ -357,13 +357,13 @@ export default EmberObject.extend({
     }
 
     // New adapters return strings instead of classes.
-    types = emberA(types).map(name => {
+    types = emberA(types).map((name) => {
       return {
         klass: this._nameToClass(name),
         name,
       };
     });
-    types = emberA(types).filter(type => this.detect(type.klass));
+    types = emberA(types).filter((type) => this.detect(type.klass));
 
     return emberA(types);
   },
@@ -380,7 +380,7 @@ export default EmberObject.extend({
     let namespaces = emberA(Namespace.NAMESPACES);
     let types = emberA();
 
-    namespaces.forEach(namespace => {
+    namespaces.forEach((namespace) => {
       for (let key in namespace) {
         if (!Object.prototype.hasOwnProperty.call(namespace, key)) {
           continue;
@@ -488,6 +488,6 @@ export default EmberObject.extend({
     @return {Function} The function to call to remove all observers.
   */
   observeRecord() {
-    return function() {};
+    return function () {};
   },
 });
diff --git a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
index 555a3f36804..a6ae1f0b28b 100644
--- a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
+++ b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
@@ -82,7 +82,7 @@ moduleFor(
 
       return this.visit('/').then(() => {
         adapter = this.applicationInstance.lookup('data-adapter:main');
-        adapter.watchModelTypes(function() {});
+        adapter.watchModelTypes(function () {});
       });
     }
 
@@ -256,7 +256,7 @@ moduleFor(
               recordUpdated(self.wrapRecord(record));
             }
             addObserver(record, 'title', callback);
-            return function() {
+            return function () {
               removeObserver(record, 'title', callback);
             };
           },
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 5f5edf4cd18..355fbe3f4a4 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -44,7 +44,8 @@ const CAPABILITIES = {
   willDestroy: false,
 };
 
-class MountManager extends AbstractManager<EngineState, EngineDefinitionState>
+class MountManager
+  extends AbstractManager<EngineState, EngineDefinitionState>
   implements WithDynamicLayout<EngineState, RuntimeResolver> {
   getDynamicLayout(state: EngineState, _: RuntimeResolver) {
     let templateFactory = state.engine.lookup('template:application') as TemplateFactory;
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index b4a6bacd8c3..486d095f6f0 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -64,7 +64,8 @@ const CAPABILITIES: ComponentCapabilities = {
   willDestroy: false,
 };
 
-class OutletComponentManager extends AbstractManager<OutletInstanceState, OutletDefinitionState>
+class OutletComponentManager
+  extends AbstractManager<OutletInstanceState, OutletDefinitionState>
   implements WithStaticLayout<OutletInstanceState, OutletDefinitionState, RuntimeResolver> {
   create(
     environment: EmberVMEnvironment,
@@ -226,7 +227,8 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
       wrapped: true,
     });
 
-    const WrappedOutletComponentManager = class extends OutletComponentManager
+    const WrappedOutletComponentManager = class
+      extends OutletComponentManager
       implements WithDynamicTagName<OutletInstanceState> {
       getTagName(_component: OutletInstanceState) {
         return 'div';
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 241584ca94b..0aa1bde5a6b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -2,7 +2,7 @@ import { dasherize } from '@ember/string';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let positional = args.positional.capture();
 
   return createComputeRef(() => {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 7b5576dc59b..dd52fda0351 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -283,7 +283,7 @@ export const INVOKE: unique symbol = symbol('INVOKE') as any;
   @for Ember.Templates.helpers
   @public
 */
-export default function(args: VMArguments): Reference<Function> {
+export default function (args: VMArguments): Reference<Function> {
   let { named, positional } = args;
 
   let capturedArgs = positional.capture();
@@ -434,9 +434,11 @@ function makeClosureAction(
     } else {
       // tslint:disable-next-line:max-line-length
       assert(
-        `An action could not be made for \`${debugKey ||
-          action}\` in ${target}. Please confirm that you are using either a quoted action name (i.e. \`(action '${debugKey ||
-          'myAction'}')\`) or a function available in ${target}.`,
+        `An action could not be made for \`${
+          debugKey || action
+        }\` in ${target}. Please confirm that you are using either a quoted action name (i.e. \`(action '${
+          debugKey || 'myAction'
+        }')\`) or a function available in ${target}.`,
         false
       );
     }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index efb16e60a4a..80a1cc6e57e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -42,7 +42,7 @@ import { reifyPositional } from '@glimmer/runtime';
    @public
  */
 
-export default function(args: VMArguments): Reference<unknown[]> {
+export default function (args: VMArguments): Reference<unknown[]> {
   let captured = args.positional.capture();
 
   return createComputeRef(() => reifyPositional(captured), null, 'array');
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index 7f1a8f6a824..e21cfe8c25b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -39,14 +39,11 @@ const normalizeTextValue = (value: any): string => {
   @for Ember.Templates.helpers
   @since 1.13.0
 */
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let captured = args.positional.capture();
 
   return createComputeRef(
-    () =>
-      reifyPositional(captured)
-        .map(normalizeTextValue)
-        .join(''),
+    () => reifyPositional(captured).map(normalizeTextValue).join(''),
     null,
     'concat'
   );
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index a3a3be8e257..98505a89cb0 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -158,7 +158,7 @@ export class EachInWrapper {
   constructor(public inner: unknown) {}
 }
 
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let inner = args.positional.at(0);
 
   return createComputeRef(() => {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 1b54e33dea5..24c6b528fd8 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -79,7 +79,7 @@ const context = buildUntouchableThis('`fn` helper');
   @since 3.11.0
 */
 
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let positional = args.positional.capture();
 
   return createComputeRef(
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 75426c6808f..163533acc96 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -94,7 +94,7 @@ import {
   @for Ember.Templates.helpers
   @since 2.1.0
  */
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let sourceRef = args.positional.at(0);
   let pathRef = args.positional.at(1);
 
@@ -120,7 +120,7 @@ export default function(args: VMArguments) {
           return get(source, String(valueForRef(pathRef)));
         }
       },
-      value => {
+      (value) => {
         let source = valueForRef(sourceRef);
 
         if (isObject(source)) {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
index f8dcb357ca1..1ce8fbb6893 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
@@ -44,7 +44,7 @@ import { reifyNamed } from '@glimmer/runtime';
    @since 2.3.0
    @public
  */
-export default function(args: VMArguments): Reference<Dict<unknown>> {
+export default function (args: VMArguments): Reference<Dict<unknown>> {
   let positional = args.named.capture();
 
   return createComputeRef(() => reifyNamed(positional), null, 'hash');
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/loc.ts b/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
index 9eddb8c7871..5bfb0b4cc05 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
@@ -37,6 +37,6 @@ import { helper } from '../helper';
   @see {String#loc}
   @public
 */
-export default helper(function(params) {
+export default helper(function (params) {
   return loc.apply(null, params as any /* let the other side handle errors */);
 });
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
index ea3f7c4584b..3e3cf2a2031 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
@@ -19,7 +19,7 @@ import { reifyPositional } from '@glimmer/runtime';
   @param {Array} params
   @public
 */
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let positional = args.positional.capture();
 
   return createComputeRef(() => {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index 20dbeacc4b3..63dd959b60b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -79,7 +79,7 @@ import { createInvokableRef, isUpdatableRef } from '@glimmer/reference';
   @public
 */
 
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let ref = args.positional.at(0);
 
   // TODO: Improve this error message. This covers at least two distinct
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index 6e551f45ff7..291c8c935be 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -29,7 +29,7 @@ import { reifyNamed } from '@glimmer/runtime';
   @return {Object} A `QueryParams` object for `{{link-to}}`
   @public
 */
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   let { positional, named } = args.capture();
 
   return createComputeRef(() => {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index 86c78a4c06d..85229007796 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -119,6 +119,6 @@ import { createReadOnlyRef } from '@glimmer/reference';
   @for Ember.Templates.helpers
   @private
 */
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   return createReadOnlyRef(args.positional.at(0));
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index f0926187f59..b02e4959feb 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -34,7 +34,7 @@ import { createUnboundRef, valueForRef } from '@glimmer/reference';
   @public
 */
 
-export default function(args: VMArguments) {
+export default function (args: VMArguments) {
   assert(
     'unbound helper cannot be called with multiple params or hash params',
     args.positional.length === 1 && args.named.length === 0
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 2798d9c449d..7bd270114fd 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -134,12 +134,12 @@ export class OnModifierState {
     );
 
     let needsCustomCallback =
-        (SUPPORTS_EVENT_OPTIONS === false && once) /* needs manual once implementation */ ||
-        (DEBUG && passive) /* needs passive enforcement */;
+      (SUPPORTS_EVENT_OPTIONS === false && once) /* needs manual once implementation */ ||
+      (DEBUG && passive); /* needs passive enforcement */
 
     if (this.shouldUpdate) {
       if (needsCustomCallback) {
-        let callback = (this.callback = function(this: Element, event) {
+        let callback = (this.callback = function (this: Element, event) {
           if (DEBUG && passive) {
             event.preventDefault = () => {
               assert(
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 7cdb26e7b5f..41ff7353bdb 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -141,7 +141,7 @@ let templateFor: { owner: Owner; underscored: string; name: string } | any;
 let parseUnderscoredName: { templateName: string } | any;
 
 if (PARTIALS) {
-  lookupPartial = function(templateName: string, owner: Owner) {
+  lookupPartial = function (templateName: string, owner: Owner) {
     deprecate(
       `The use of \`{{partial}}\` is deprecated, please refactor the "${templateName}" partial to a component`,
       false,
@@ -163,7 +163,7 @@ if (PARTIALS) {
     return template;
   };
 
-  templateFor = function(owner: any, underscored: string, name: string) {
+  templateFor = function (owner: any, underscored: string, name: string) {
     if (PARTIALS) {
       if (!name) {
         return;
@@ -182,7 +182,7 @@ if (PARTIALS) {
     }
   };
 
-  parseUnderscoredName = function(templateName: string) {
+  parseUnderscoredName = function (templateName: string) {
     let nameParts = templateName.split('/');
     let lastPart = nameParts[nameParts.length - 1];
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 2d5f08c94f0..9f8e5a32dcc 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -69,7 +69,7 @@ export function mountHelper(
 
   if (DEBUG && args.named) {
     let keys = args.named.names;
-    let extra = keys.filter(k => k !== 'model');
+    let extra = keys.filter((k) => k !== 'model');
 
     assert(
       'You can only pass a `model` argument to the {{mount}} helper, ' +
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
index 8366056b5c6..7ed31e60daa 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
@@ -2,6 +2,6 @@ import { Core, Option } from '@glimmer/interfaces';
 
 export function hashToArgs(hash: Option<Core.Hash>): Option<Core.Hash> {
   if (hash === null) return null;
-  let names = hash[0].map(key => `@${key}`);
+  let names = hash[0].map((key) => `@${key}`);
   return [names, hash[1]];
 }
diff --git a/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts b/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
index a7ccf0559e5..154ce71999b 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
@@ -127,7 +127,7 @@ if (HAS_NATIVE_PROXY) {
     const positionalTarget: unknown[] = [];
 
     if (DEBUG) {
-      const setHandler = function(_target: unknown, prop: symbol | string | number): never {
+      const setHandler = function (_target: unknown, prop: symbol | string | number): never {
         throw new Error(
           `You attempted to set ${String(
             prop
@@ -166,7 +166,7 @@ if (HAS_NATIVE_PROXY) {
       value: getNamedTag,
     });
 
-    Object.keys(named).forEach(name => {
+    Object.keys(named).forEach((name) => {
       Object.defineProperty(namedProxy, name, {
         enumerable: true,
         configurable: true,
diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
index 6002a03c379..51437f49dc0 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
@@ -167,7 +167,7 @@ export default class DebugRenderTree<Bucket extends object = object> {
   private captureRefs(refs: Set<Ref<Bucket>>): CapturedRenderNode[] {
     let captured: CapturedRenderNode[] = [];
 
-    refs.forEach(ref => {
+    refs.forEach((ref) => {
       let state = ref.get();
 
       if (state) {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 1e1f1f3c350..189c0fa10a0 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -86,7 +86,7 @@ class ArrayIterator extends BoundedIterator {
 
   static fromForEachable(object: ForEachable) {
     let array: unknown[] = [];
-    object.forEach(item => array.push(item));
+    object.forEach((item) => array.push(item));
     return this.from(array);
   }
 
@@ -151,7 +151,7 @@ class ObjectIterator extends BoundedIterator {
     let isMapLike = false;
 
     // Not using an arrow function here so we can get an accurate `arguments`
-    obj.forEach(function(value: unknown, key: unknown) {
+    obj.forEach(function (value: unknown, key: unknown) {
       isMapLike = isMapLike || arguments.length >= 2;
 
       if (isMapLike) {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 8dfaf55a952..7045a77af58 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -137,7 +137,7 @@ export function setComponentManager(
         url: 'https://emberjs.com/deprecations/v3.x/#toc_component-manager-string-lookup',
       }
     );
-    factory = function(owner: Owner) {
+    factory = function (owner: Owner) {
       return owner.lookup<ComponentManagerDelegate<unknown> | InternalComponentManager>(
         `component-manager:${stringOrFunction}`
       )!;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/actions-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/actions-test.js
index 5973144a7b2..a0d3df9d997 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/actions-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/actions-test.js
@@ -6,7 +6,7 @@ import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { Component } from '../../utils/helpers';
 
 const originalDebug = getDebugFunction('debug');
-const noop = function() {};
+const noop = function () {};
 
 moduleFor(
   'Application test: actions',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index c7a7111e609..01227f70938 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -73,11 +73,11 @@ if (ENV._DEBUG_RENDER_TREE) {
         this.addTemplate('bar.index', 'index');
         this.addTemplate('bar.inner', '{{@model}}');
 
-        this.router.map(function(this: any) {
-          this.route('foo', function(this: any) {
+        this.router.map(function (this: any) {
+          this.route('foo', function (this: any) {
             this.route('inner', { path: '/:model' });
           });
-          this.route('foo', function(this: any) {
+          this.route('foo', function (this: any) {
             this.route('inner', { path: '/:model' });
           });
         });
@@ -719,11 +719,11 @@ if (ENV._DEBUG_RENDER_TREE) {
           }
         );
 
-        this.router.map(function(this: any) {
+        this.router.map(function (this: any) {
           this.mount('foo');
         });
 
-        this.add('route-map:foo', function() {});
+        this.add('route-map:foo', function () {});
 
         await this.visit('/');
 
@@ -1178,7 +1178,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         );
 
         this.addComponent('hello-world', {
-          ComponentClass: setComponentManager(_owner => {
+          ComponentClass: setComponentManager((_owner) => {
             return {
               capabilities: capabilities('3.13', {}),
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 9185b32f3d1..34c22729aa8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -28,7 +28,7 @@ moduleFor(
           this._enginePromises = Object.create(null);
           this._resolvedEngines = Object.create(null);
 
-          this._routerMicrolib.getRoute = name => {
+          this._routerMicrolib.getRoute = (name) => {
             let engineInfo = this._engineInfoByRoute[name];
             if (!engineInfo) {
               return getRoute(name);
@@ -42,7 +42,7 @@ moduleFor(
             let enginePromise = this._enginePromises[engineName];
 
             if (!enginePromise) {
-              enginePromise = new RSVP.Promise(resolve => {
+              enginePromise = new RSVP.Promise((resolve) => {
                 setTimeout(() => {
                   this._resolvedEngines[engineName] = true;
 
@@ -63,11 +63,11 @@ moduleFor(
 
       this.addTemplate('application', 'Application{{outlet}}');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
-      this.add('route-map:blog', function() {
-        this.route('post', function() {
+      this.add('route-map:blog', function () {
+        this.route('post', function () {
           this.route('comments');
           this.route('likes');
         });
@@ -161,10 +161,10 @@ moduleFor(
     setupAppAndRoutableEngineWithPartial(hooks) {
       this.addTemplate('application', 'Application{{outlet}}');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
-      this.add('route-map:blog', function() {});
+      this.add('route-map:blog', function () {});
       this.add(
         'route:application',
         Route.extend({
@@ -297,10 +297,10 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
-      this.add('route-map:blog', function() {});
+      this.add('route-map:blog', function () {});
 
       this.add(
         'engine:blog',
@@ -354,10 +354,10 @@ moduleFor(
 
       this.add('component:my-component', sharedComponent);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
-      this.add('route-map:blog', function() {});
+      this.add('route-map:blog', function () {});
 
       this.add(
         'engine:blog',
@@ -543,7 +543,7 @@ moduleFor(
       let errorEntered = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:application_error',
           Route.extend({
@@ -587,7 +587,7 @@ moduleFor(
       let errorEntered = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:error',
           Route.extend({
@@ -631,7 +631,7 @@ moduleFor(
       let errorEntered = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:post_error',
           Route.extend({
@@ -675,7 +675,7 @@ moduleFor(
       let errorEntered = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:post.error',
           Route.extend({
@@ -721,7 +721,7 @@ moduleFor(
       let resolveLoading = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:application_loading',
           Route.extend({
@@ -768,7 +768,7 @@ moduleFor(
       let resolveLoading = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:loading',
           Route.extend({
@@ -813,7 +813,7 @@ moduleFor(
       let resolveLoading;
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register('template:post', compile('{{outlet}}'));
         this.register('template:post.comments', compile('Comments'));
         this.register('template:post.likes_loading', compile('Loading'));
@@ -822,7 +822,7 @@ moduleFor(
           'route:post.likes',
           Route.extend({
             model() {
-              return new RSVP.Promise(resolve => {
+              return new RSVP.Promise((resolve) => {
                 resolveLoading = resolve;
               });
             },
@@ -853,7 +853,7 @@ moduleFor(
       let resolveLoading = RSVP.defer();
 
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register('template:post', compile('{{outlet}}'));
         this.register('template:post.comments', compile('Comments'));
         this.register(
@@ -898,7 +898,7 @@ moduleFor(
       assert.expect(1);
       let tmpl = '{{#link-to "blog.category" 1337}}Category 1337{{/link-to}}';
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register('template:category', compile(tmpl));
       });
 
@@ -918,7 +918,7 @@ moduleFor(
       let tmpl =
         '{{#link-to "blog.author" 1337 class="author-1337"}}Author 1337{{/link-to}}{{#link-to "blog.author" 1 class="author-1"}}Author 1{{/link-to}}';
       this.setupAppAndRoutableEngine();
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register('template:author', compile(tmpl));
       });
 
@@ -939,7 +939,7 @@ moduleFor(
 
       let hooks = [];
 
-      this.additionalEngineRegistrations(function() {
+      this.additionalEngineRegistrations(function () {
         this.register(
           'route:application',
           Route.extend({
@@ -956,7 +956,7 @@ moduleFor(
         .then(() => {
           return this.visit('/blog');
         })
-        .catch(error => {
+        .catch((error) => {
           assert.equal(error.message, 'Whoops! Something went wrong...');
         });
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
index ffd04024688..1c13a041754 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
@@ -9,7 +9,7 @@ moduleFor(
     ['@test Unbound dashed helpers registered on the container can be late-invoked'](assert) {
       this.addTemplate('application', `<div id='wrapper'>{{x-borf}} {{x-borf 'YES'}}</div>`);
 
-      let myHelper = helper(params => params[0] || 'BORF');
+      let myHelper = helper((params) => params[0] || 'BORF');
       this.application.register('helper:x-borf', myHelper);
 
       return this.visit('/').then(() => {
@@ -33,13 +33,8 @@ moduleFor(
 
       this.application.register(
         'helper:x-reverse',
-        helper(function([value]) {
-          return value
-            ? value
-                .split('')
-                .reverse()
-                .join('')
-            : '--';
+        helper(function ([value]) {
+          return value ? value.split('').reverse().join('') : '--';
         })
       );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js
index 1b3a8baeb36..8b617405363 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js
@@ -19,7 +19,7 @@ moduleFor(
       ENV._APPLICATION_TEMPLATE_WRAPPER = false;
       ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS = true;
 
-      let didCreateReloader = reloader => {
+      let didCreateReloader = (reloader) => {
         this.reloader = reloader;
       };
 
@@ -51,7 +51,7 @@ moduleFor(
 
             this.revisions[name] = ++revision;
 
-            this.callbacks.forEach(callback => callback());
+            this.callbacks.forEach((callback) => callback());
           },
         })
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index e9e0f2375ce..c600b2a2d1d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -164,7 +164,7 @@ moduleFor(
     }
 
     async ['@feature(EMBER_ROUTING_MODEL_ARG) interior mutations on the model with set'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
 
@@ -231,7 +231,7 @@ moduleFor(
         }
       }
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
 
@@ -287,7 +287,7 @@ moduleFor(
     }
 
     async ['@feature(EMBER_ROUTING_MODEL_ARG) exterior mutations on the model with set'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
 
@@ -346,7 +346,7 @@ moduleFor(
     async ['@feature(EMBER_ROUTING_MODEL_ARG) exterior mutations on the model with tracked properties'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
 
@@ -409,9 +409,9 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) it can render a nested route']() {
-      this.router.map(function() {
-        this.route('lists', function() {
-          this.route('colors', function() {
+      this.router.map(function () {
+        this.route('lists', function () {
+          this.route('colors', function () {
             this.route('favorite');
           });
         });
@@ -450,9 +450,9 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) it can render a nested route']() {
-      this.router.map(function() {
-        this.route('lists', function() {
-          this.route('colors', function() {
+      this.router.map(function () {
+        this.route('lists', function () {
+          this.route('colors', function () {
             this.route('favorite');
           });
         });
@@ -491,7 +491,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) it can render into named outlets']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('colors');
       });
 
@@ -560,7 +560,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) it can render into named outlets']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('colors');
       });
 
@@ -629,9 +629,9 @@ moduleFor(
     }
 
     ['@test it should update the outlets when switching between routes']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
-        this.route('b', function() {
+        this.route('b', function () {
           this.route('c');
           this.route('d');
         });
@@ -660,7 +660,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when the model changes']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
 
@@ -688,7 +688,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when the model changes']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
 
@@ -716,7 +716,7 @@ moduleFor(
     }
 
     ['@test it should have the right controller in scope for the route template']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b');
       });
@@ -747,7 +747,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) it should update correctly when the controller changes']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
 
@@ -791,7 +791,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) it should update correctly when the controller changes']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
 
@@ -835,7 +835,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when two routes render the same template']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b');
       });
@@ -888,7 +888,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when two routes render the same template']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b');
       });
@@ -953,7 +953,7 @@ moduleFor(
     }
 
     ['@test it allows a transition during route activate']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
       });
 
@@ -976,7 +976,7 @@ moduleFor(
     async ['@feature(!EMBER_ROUTING_MODEL_ARG) it emits a useful backtracking re-render assertion message'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('routeWithError');
       });
 
@@ -1027,7 +1027,7 @@ moduleFor(
     async ['@feature(EMBER_ROUTING_MODEL_ARG) it emits a useful backtracking re-render assertion message'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('routeWithError');
       });
 
@@ -1067,7 +1067,7 @@ moduleFor(
     }
 
     ['@test route templates with {{{undefined}}} [GH#14924] [GH#16172]']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('first');
         this.route('second');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 8a7139385b0..08441c22577 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -33,7 +33,7 @@ class CustomModifierManager {
   }
 }
 let BaseModifier = setModifierManager(
-  owner => {
+  (owner) => {
     return new CustomModifierManager(owner);
   },
   EmberObject.extend({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
index bd4c5a1b3c4..ff587db155c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -15,11 +15,11 @@ class AbstractAppendTest extends RenderingTestCase {
   teardown() {
     this.component = null;
 
-    this.components.forEach(component => {
+    this.components.forEach((component) => {
       runTask(() => component.destroy());
     });
 
-    this.ids.forEach(id => {
+    this.ids.forEach((id) => {
       let $element = document.getElementById(id);
       if ($element) {
         $element.parentNode.removeChild($element);
@@ -44,7 +44,7 @@ class AbstractAppendTest extends RenderingTestCase {
     let componentsByName = {};
 
     // TODO: refactor/combine with other life-cycle tests
-    this.registerComponent = function(name, _options) {
+    this.registerComponent = function (name, _options) {
       function pushHook(hookName) {
         hooks.push([name, hookName]);
       }
@@ -523,7 +523,7 @@ class AbstractAppendTest extends RenderingTestCase {
   ['@test can appendTo while rendering']() {
     let owner = this.owner;
 
-    let append = component => {
+    let append = (component) => {
       return this.append(component);
     };
 
@@ -563,7 +563,7 @@ class AbstractAppendTest extends RenderingTestCase {
   ['@test can appendTo and remove while rendering'](assert) {
     let owner = this.owner;
 
-    let append = component => {
+    let append = (component) => {
       return this.append(component);
     };
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
index 238b6e70552..025d03b0ad1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
@@ -591,7 +591,7 @@ moduleFor(
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
       this.render('{{foo-bar foo=foo}}', {
-        foo: function() {
+        foo: function () {
           return this;
         }.call('bar'),
       });
@@ -612,7 +612,7 @@ moduleFor(
         set(
           this.context,
           'foo',
-          function() {
+          function () {
             return this;
           }.call('baz')
         )
@@ -627,7 +627,7 @@ moduleFor(
         set(
           this.context,
           'foo',
-          function() {
+          function () {
             return this;
           }.call('bar')
         )
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
index 391cbf9ae3f..ece6ac6955f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
@@ -226,7 +226,7 @@ moduleFor(
     ['@test bound computed properties can be overridden in extensions, set during init, and passed in as attrs']() {
       let FooClass = Component.extend({
         attributeBindings: ['style'],
-        style: computed('height', 'color', function() {
+        style: computed('height', 'color', function () {
           let height = this.get('height');
           let color = this.get('color');
           return htmlSafe(`height: ${height}px; background-color: ${color};`);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
index 80634cec759..e8480ea0728 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
@@ -654,7 +654,7 @@ moduleFor(
 
     ['@test using a computed property for classNameBindings triggers an assertion']() {
       let FooBarComponent = Component.extend({
-        classNameBindings: computed(function() {
+        classNameBindings: computed(function () {
           return ['isHappy:happy:sad'];
         }),
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index 8f31f59cd7c..a39ef69fead 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1288,7 +1288,7 @@ moduleFor(
     }
 
     ['@test GH#17121 local variable should win over helper (with arguments)']() {
-      this.registerHelper('foo', params => `foo helper: ${params.join(' ')}`);
+      this.registerHelper('foo', (params) => `foo helper: ${params.join(' ')}`);
 
       this.registerComponent('foo-bar', {
         ComponentClass: Component.extend().reopenClass({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 2bff72911de..388becfbc27 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -164,7 +164,7 @@ moduleFor(
     ['@test layout supports computed property']() {
       let FooBarComponent = Component.extend({
         elementId: 'blahzorz',
-        layout: computed(function() {
+        layout: computed(function () {
           return compile('so much layout wat {{lulz}}');
         }),
         init() {
@@ -313,7 +313,7 @@ moduleFor(
 
     ['@test tagName can not be a computed property']() {
       let FooBarComponent = Component.extend({
-        tagName: computed(function() {
+        tagName: computed(function () {
           return 'foo-bar';
         }),
       });
@@ -3010,7 +3010,7 @@ moduleFor(
     }
 
     ['@test should toggle visibility with isVisible'](assert) {
-      let assertStyle = expected => {
+      let assertStyle = (expected) => {
         let matcher = styles(expected);
         let actual = this.firstChild.getAttribute('style');
 
@@ -3102,7 +3102,7 @@ moduleFor(
     ['@test adds isVisible binding when style binding is missing and other bindings exist'](
       assert
     ) {
-      let assertStyle = expected => {
+      let assertStyle = (expected) => {
         let matcher = styles(expected);
         let actual = this.firstChild.getAttribute('style');
 
@@ -3154,7 +3154,7 @@ moduleFor(
 
     ['@test it can use readDOMAttr to read input value']() {
       let component;
-      let assertElement = expectedValue => {
+      let assertElement = (expectedValue) => {
         // value is a property, not an attribute
         this.assertHTML(`<input class="ember-view" id="${component.elementId}">`);
         this.assert.equal(this.firstChild.value, expectedValue, 'value property is correct');
@@ -3260,7 +3260,7 @@ moduleFor(
             this.get('select').registerOption(this);
           },
 
-          selected: computed('select.value', function() {
+          selected: computed('select.value', function () {
             return this.get('value') === this.get('select.value');
           }),
 
@@ -3456,7 +3456,7 @@ moduleFor(
             );
           },
 
-          listenerForSomeMethod: on('someMethod', function(...data) {
+          listenerForSomeMethod: on('someMethod', function (...data) {
             assert.deepEqual(
               data,
               payload,
@@ -3464,7 +3464,7 @@ moduleFor(
             );
           }),
 
-          listenerForSomeTruthyProperty: on('someTruthyProperty', function(...data) {
+          listenerForSomeTruthyProperty: on('someTruthyProperty', function (...data) {
             assert.deepEqual(
               data,
               payload,
@@ -3676,7 +3676,7 @@ moduleFor(
           barInstance = this;
         },
 
-        bar: computed('target.foo', function() {
+        bar: computed('target.foo', function () {
           if (this.target) {
             return this.target.foo.toUpperCase();
           }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index 5f866eaa6aa..1bcdebed82c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -380,7 +380,7 @@ moduleFor(
       this.registerComponent('foo-bar', {
         template: 'foo-bar {{location}} {{locationCopy}} {{yield}}',
         ComponentClass: Component.extend({
-          init: function() {
+          init: function () {
             this._super(...arguments);
             this.set('locationCopy', this.get('location'));
           },
@@ -390,7 +390,7 @@ moduleFor(
       this.registerComponent('foo-bar-baz', {
         template: 'foo-bar-baz {{location}} {{locationCopy}} {{yield}}',
         ComponentClass: Component.extend({
-          init: function() {
+          init: function () {
             this._super(...arguments);
             this.set('locationCopy', this.get('location'));
           },
@@ -400,7 +400,7 @@ moduleFor(
       this.registerComponent('outer-component', {
         template: '{{#component componentName location=location}}arepas!{{/component}}',
         ComponentClass: Component.extend({
-          componentName: computed('location', function() {
+          componentName: computed('location', function () {
             if (this.get('location') === 'Caracas') {
               return 'foo-bar';
             } else {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index c6a029c2429..63fad348fa9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -57,7 +57,7 @@ class InputRenderingTest extends RenderingTestCase {
   }
 
   assertAllAttrs(names, expected) {
-    names.forEach(name => this.assertAttr(name, expected));
+    names.forEach((name) => this.assertAttr(name, expected));
   }
 
   assertSelectionRange(start, end) {
@@ -131,7 +131,7 @@ class InputRenderingTest extends RenderingTestCase {
         args.push(`@type="${type}"`);
       }
 
-      Object.keys(events).forEach(event => {
+      Object.keys(events).forEach((event) => {
         args.push(`@${events[event]}={{action "didTrigger" "${id}" "${event}"}}`);
       });
 
@@ -152,7 +152,7 @@ class InputRenderingTest extends RenderingTestCase {
 
     this.assert.equal($standard.type, $custom.type);
 
-    Object.keys(events).forEach(event => {
+    Object.keys(events).forEach((event) => {
       this.triggerEvent(event, null, '#standard');
       this.triggerEvent(event, null, '#custom');
     });
@@ -784,7 +784,7 @@ moduleFor(
 
     ['@test triggers a method with `<Input @key-up={{this.didTrigger}} />`'](assert) {
       this.render(`<Input @key-up={{this.didTrigger}} />`, {
-        didTrigger: action(function() {
+        didTrigger: action(function () {
           assert.ok(true, 'action was triggered');
         }),
       });
@@ -1206,7 +1206,7 @@ moduleFor(
   '@min="-5" @max="50" @value="%x" @type="range"',
   '@value="%x" @min="-5" @max="50" @type="range"',
   '@value="%x" @type="range" @min="-5" @max="50"',
-].forEach(attrs => {
+].forEach((attrs) => {
   moduleFor(
     `[GH#15675] Components test: <Input ${attrs} />`,
     class extends InputRenderingTest {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 47f91bf60b1..6b414e608e2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -57,7 +57,7 @@ class InputRenderingTest extends RenderingTestCase {
   }
 
   assertAllAttrs(names, expected) {
-    names.forEach(name => this.assertAttr(name, expected));
+    names.forEach((name) => this.assertAttr(name, expected));
   }
 
   assertSelectionRange(start, end) {
@@ -111,21 +111,21 @@ class InputRenderingTest extends RenderingTestCase {
 
     let triggeredEvents = [];
     let actions = {};
-    Object.keys(events).forEach(evt => {
-      actions[`run_${evt}`] = function() {
+    Object.keys(events).forEach((evt) => {
+      actions[`run_${evt}`] = function () {
         triggeredEvents.push(evt);
       };
     });
 
     let typeAttr = type ? `type="${type}" ` : '';
     let actionAttrs = Object.keys(events)
-      .map(evt => `${events[evt]}=(action 'run_${evt}')`)
+      .map((evt) => `${events[evt]}=(action 'run_${evt}')`)
       .join(' ');
     let template = `{{test-component ${typeAttr}${actionAttrs}}}{{input ${typeAttr}${actionAttrs}}}`;
 
     this.render(template, { actions });
 
-    Object.keys(events).forEach(evt => this.triggerEvent(evt, null, 'input:first-of-type'));
+    Object.keys(events).forEach((evt) => this.triggerEvent(evt, null, 'input:first-of-type'));
     let normallyTriggeredEvents = [].concat(triggeredEvents);
     triggeredEvents.length = 0;
 
@@ -134,7 +134,7 @@ class InputRenderingTest extends RenderingTestCase {
       'sanity check that most events are triggered'
     );
 
-    normallyTriggeredEvents.forEach(evt => this.triggerEvent(evt, null, 'input:last-of-type'));
+    normallyTriggeredEvents.forEach((evt) => this.triggerEvent(evt, null, 'input:last-of-type'));
 
     this.assert.deepEqual(triggeredEvents, normallyTriggeredEvents, 'called for all events');
   }
@@ -635,7 +635,7 @@ moduleFor(
 
     ['@test triggers a method with `{{input key-up=this.didTrigger}}`'](assert) {
       this.render(`{{input key-up=this.didTrigger}}`, {
-        didTrigger: action(function() {
+        didTrigger: action(function () {
           assert.ok(true, 'action was triggered');
         }),
       });
@@ -912,7 +912,7 @@ moduleFor(
   'min="-5" max="50" value="%x" type="range"',
   'value="%x" min="-5" max="50" type="range"',
   'value="%x" type="range" min="-5" max="50"',
-].forEach(attrs => {
+].forEach((attrs) => {
   moduleFor(
     `[GH#15675] Components test: {{input ${attrs}}}`,
     class extends InputRenderingTest {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index 1cef9564e49..3eb42f12a3b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -70,7 +70,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
     let topLevelId = getViewId(this.component);
     let actual = Object.keys(viewRegistry)
       .sort()
-      .filter(id => id !== topLevelId);
+      .filter((id) => id !== topLevelId);
 
     if (this.isInteractive) {
       let expected = this.componentRegistry.sort();
@@ -82,12 +82,12 @@ class LifeCycleHooksTest extends RenderingTestCase {
   }
 
   registerComponent(name, { template = null }) {
-    let pushComponent = instance => {
+    let pushComponent = (instance) => {
       this.components[name] = instance;
       this.componentRegistry.push(getViewId(instance));
     };
 
-    let removeComponent = instance => {
+    let removeComponent = (instance) => {
       let index = this.componentRegistry.indexOf(getViewId(instance));
       this.componentRegistry.splice(index, 1);
 
@@ -299,7 +299,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
 
   assertHooks({ label, interactive, nonInteractive }) {
     let rawHooks = this.isInteractive ? interactive : nonInteractive;
-    let hooks = rawHooks.map(raw => hook(...raw));
+    let hooks = rawHooks.map((raw) => hook(...raw));
     this.assert.deepEqual(json(this.hooks), json(hooks), label);
     this.hooks = [];
   }
@@ -1281,7 +1281,7 @@ class CurlyComponentsTest extends LifeCycleHooksTest {
 
   invocationFor(name, namedArgs = {}) {
     let attrs = Object.keys(namedArgs)
-      .map(k => `${k}=${this.val(namedArgs[k])}`)
+      .map((k) => `${k}=${this.val(namedArgs[k])}`)
       .join(' ');
     return `{{${name} ${attrs}}}`;
   }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 7a9e9da4645..3fd18b88771 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -206,7 +206,7 @@ moduleFor(
     ['@test updates controller QP properties on other route after transitioning to that route'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -238,7 +238,7 @@ moduleFor(
     ['@feature(!EMBER_ROUTING_MODEL_ARG) generates proper href for `LinkTo` with no @route after transitioning to an error route GH#17963'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('bad');
       });
 
@@ -309,7 +309,7 @@ moduleFor(
     async ['@feature(EMBER_ROUTING_MODEL_ARG) generates proper href for `LinkTo` with no @route after transitioning to an error route GH#17963'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('bad');
       });
 
@@ -472,8 +472,8 @@ moduleFor(
         `<LinkTo id='close-link' @route='cars'>Close create form</LinkTo>`
       );
 
-      this.router.map(function() {
-        this.route('cars', function() {
+      this.router.map(function () {
+        this.route('cars', function () {
           this.route('create');
         });
       });
@@ -545,8 +545,8 @@ moduleFor(
         `
       );
 
-      this.router.map(function() {
-        this.route('search', function() {
+      this.router.map(function () {
+        this.route('search', function () {
           this.route('results');
         });
       });
@@ -691,8 +691,8 @@ moduleFor(
         });
     }
     ['@test the <LinkTo /> component applies active class to the parent route'](assert) {
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
         });
       });
@@ -733,7 +733,7 @@ moduleFor(
     ) {
       let appLink;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('parent');
       });
 
@@ -802,7 +802,7 @@ moduleFor(
     ['@test the <LinkTo /> component default query params while in active transition regression test'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foos');
         this.route('bars');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index 9dd70f55043..6a61fd06ca4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -242,7 +242,7 @@ moduleFor(
     ['@test updates controller QP properties on other route after transitioning to that route'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -361,8 +361,8 @@ moduleFor(
         `{{#link-to 'cars' id='close-link'}}Close create form{{/link-to}}`
       );
 
-      this.router.map(function() {
-        this.route('cars', function() {
+      this.router.map(function () {
+        this.route('cars', function () {
           this.route('create');
         });
       });
@@ -432,8 +432,8 @@ moduleFor(
         `
       );
 
-      this.router.map(function() {
-        this.route('search', function() {
+      this.router.map(function () {
+        this.route('search', function () {
           this.route('results');
         });
       });
@@ -578,8 +578,8 @@ moduleFor(
         });
     }
     ['@test the {{link-to}} component applies active class to the parent route'](assert) {
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
         });
       });
@@ -620,7 +620,7 @@ moduleFor(
     ) {
       let appLink;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('parent');
       });
 
@@ -687,7 +687,7 @@ moduleFor(
     }
 
     ['@test {{link-to}} default query params while in active transition regression test'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foos');
         this.route('bars');
       });
@@ -810,7 +810,7 @@ moduleFor(
     }
 
     ['@test [GH#17869] it does not cause shadowing assertion with `hash` local variable']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/post/:id' });
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index e67cf1e08f3..220c9eaed2f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -63,7 +63,7 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('bar', { path: '/bar' });
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index 6fe8593ee3b..e2e834389ef 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -62,7 +62,7 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('bar', { path: '/bar' });
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 444d4a2b165..168d5f7c1cd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -31,7 +31,7 @@ moduleFor(
     constructor() {
       super();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -375,7 +375,7 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -498,7 +498,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
       constructor() {
         super();
 
-        this.router.map(function() {
+        this.router.map(function () {
           this.route('about');
         });
 
@@ -586,8 +586,8 @@ moduleFor(
   'The <LinkTo /> component - nested routes and link-to arguments',
   class extends ApplicationTestCase {
     ['@test The <LinkTo /> component supports leaving off .index for nested routes'](assert) {
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('item');
         });
       });
@@ -602,8 +602,8 @@ moduleFor(
     }
 
     [`@test The <LinkTo /> component supports custom, nested, current-when`](assert) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
 
@@ -628,12 +628,12 @@ moduleFor(
     [`@test The <LinkTo /> component does not disregard current-when when it is given explicitly for a route`](
       assert
     ) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
 
-        this.route('items', function() {
+        this.route('items', function () {
           this.route('item');
         });
       });
@@ -656,12 +656,12 @@ moduleFor(
     ['@test The <LinkTo /> component does not disregard current-when when it is set via a bound param'](
       assert
     ) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
 
-        this.route('items', function() {
+        this.route('items', function () {
           this.route('item');
         });
       });
@@ -689,8 +689,8 @@ moduleFor(
     }
 
     ['@test The <LinkTo /> component supports multiple current-when routes'](assert) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
         this.route('item');
@@ -740,8 +740,8 @@ moduleFor(
     }
 
     ['@test The <LinkTo /> component supports boolean values for current-when'](assert) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
         this.route('item');
@@ -790,8 +790,8 @@ moduleFor(
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('contact');
         });
       });
@@ -835,8 +835,8 @@ moduleFor(
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('contact');
         });
       });
@@ -887,8 +887,8 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('contact');
         });
       });
@@ -919,7 +919,7 @@ moduleFor(
     [`@feature(!EMBER_ROUTING_MODEL_ARG) The <LinkTo /> component moves into the named route with context`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
       });
@@ -1007,7 +1007,7 @@ moduleFor(
     async [`@feature(EMBER_ROUTING_MODEL_ARG) The <LinkTo /> component moves into the named route with context`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
       });
@@ -1146,7 +1146,7 @@ moduleFor(
     }
 
     [`@test the <LinkTo /> component calls preventDefault`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1160,7 +1160,7 @@ moduleFor(
     [`@test the <LinkTo /> component does not call preventDefault if '@preventDefault={{false}}' is passed as an option`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1177,7 +1177,7 @@ moduleFor(
     [`@test the <LinkTo /> component does not call preventDefault if '@preventDefault={{boundFalseyThing}}' is passed as an option`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1240,7 +1240,7 @@ moduleFor(
         `
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1261,7 +1261,7 @@ moduleFor(
     }
 
     [`@test The <LinkTo /> component accepts string/numeric arguments`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('filter', { path: '/filters/:filter' });
         this.route('post', { path: '/post/:post_id' });
         this.route('repo', { path: '/repo/:owner/:name' });
@@ -1304,8 +1304,8 @@ moduleFor(
       assert
     ) {
       assert.expect(2);
-      this.router.map(function() {
-        this.route('lobby', function() {
+      this.router.map(function () {
+        this.route('lobby', function () {
           this.route('index', { path: ':lobby_id' });
           this.route('list');
         });
@@ -1337,7 +1337,7 @@ moduleFor(
     }
 
     [`@test Quoteless route param performs property lookup`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1356,7 +1356,7 @@ moduleFor(
         })
       );
 
-      let assertEquality = href => {
+      let assertEquality = (href) => {
         assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
         assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
       };
@@ -1372,7 +1372,7 @@ moduleFor(
     }
 
     [`@test The <LinkTo /> component refreshes href element when one of params changes`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -1412,8 +1412,8 @@ moduleFor(
     }
 
     [`@test The <LinkTo /> component is active when a route is active`](assert) {
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('item');
         });
       });
@@ -1443,7 +1443,7 @@ moduleFor(
     }
 
     [`@test The <LinkTo /> component works in an #each'd array of string route names`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foo');
         this.route('bar');
         this.route('rar');
@@ -1507,7 +1507,7 @@ moduleFor(
         return;
       }
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: 'post/:post_id' });
       });
 
@@ -1522,7 +1522,7 @@ moduleFor(
     [`@test the <LinkTo /> component does not throw an error if its route has exited`](assert) {
       assert.expect(0);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: 'post/:post_id' });
       });
 
@@ -1570,8 +1570,8 @@ moduleFor(
     [`@test the <LinkTo /> component's active property respects changing parent route context`](
       assert
     ) {
-      this.router.map(function() {
-        this.route('things', { path: '/things/:name' }, function() {
+      this.router.map(function () {
+        this.route('things', { path: '/things/:name' }, function () {
           this.route('other');
         });
       });
@@ -1639,7 +1639,7 @@ moduleFor(
     [`@test the <LinkTo /> component with only query-params and a block updates when route changes`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1677,7 +1677,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -1715,7 +1715,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -1753,7 +1753,7 @@ moduleFor(
     }
 
     [`@test The <LinkTo /> component can use dynamic params`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foo', { path: 'foo/:some/:thing' });
         this.route('bar', { path: 'bar/:some/:thing/:else' });
       });
@@ -1795,8 +1795,8 @@ moduleFor(
     ) {
       assert.expect(1);
 
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
         });
       });
@@ -1831,7 +1831,7 @@ moduleFor(
       let warningMessage =
         'This link is in an inactive loading state because at least one of its models currently has a null/undefined value, or the provided route name is invalid.';
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('thing', { path: '/thing/:thing_id' });
         this.route('about');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 4d2a50b2baa..b24de43f8ba 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -31,7 +31,7 @@ moduleFor(
     constructor() {
       super();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -376,7 +376,7 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -499,7 +499,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
       constructor() {
         super();
 
-        this.router.map(function() {
+        this.router.map(function () {
           this.route('about');
         });
 
@@ -587,8 +587,8 @@ moduleFor(
   'The {{link-to}} component - nested routes and link-to arguments',
   class extends ApplicationTestCase {
     ['@test The {{link-to}} component supports leaving off .index for nested routes'](assert) {
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('item');
         });
       });
@@ -603,8 +603,8 @@ moduleFor(
     }
 
     [`@test The {{link-to}} component supports custom, nested, current-when`](assert) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
 
@@ -629,12 +629,12 @@ moduleFor(
     [`@test The {{link-to}} component does not disregard current-when when it is given explicitly for a route`](
       assert
     ) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
 
-        this.route('items', function() {
+        this.route('items', function () {
           this.route('item');
         });
       });
@@ -657,12 +657,12 @@ moduleFor(
     ['@test The {{link-to}} component does not disregard current-when when it is set via a bound param'](
       assert
     ) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
 
-        this.route('items', function() {
+        this.route('items', function () {
           this.route('item');
         });
       });
@@ -690,8 +690,8 @@ moduleFor(
     }
 
     ['@test The {{link-to}} component supports multiple current-when routes'](assert) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
         this.route('item');
@@ -741,8 +741,8 @@ moduleFor(
     }
 
     ['@test The {{link-to}} component supports boolean values for current-when'](assert) {
-      this.router.map(function() {
-        this.route('index', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('index', { path: '/' }, function () {
           this.route('about');
         });
         this.route('item');
@@ -791,8 +791,8 @@ moduleFor(
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('contact');
         });
       });
@@ -835,8 +835,8 @@ moduleFor(
       );
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('contact');
         });
       });
@@ -887,8 +887,8 @@ moduleFor(
         })
       );
 
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('contact');
         });
       });
@@ -919,7 +919,7 @@ moduleFor(
     [`@feature(!EMBER_ROUTING_MODEL_ARG) The {{link-to}} component moves into the named route with context`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
       });
@@ -1007,7 +1007,7 @@ moduleFor(
     async [`@feature(EMBER_ROUTING_MODEL_ARG) The {{link-to}} component moves into the named route with context`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
       });
@@ -1143,7 +1143,7 @@ moduleFor(
     }
 
     [`@test the {{link-to}} component calls preventDefault`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1157,7 +1157,7 @@ moduleFor(
     [`@test the {{link-to}} component does not call preventDefault if 'preventDefault=false' is passed as an option`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1174,7 +1174,7 @@ moduleFor(
     [`@test the {{link-to}} component does not call preventDefault if 'preventDefault=boundFalseyThing' is passed as an option`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1237,7 +1237,7 @@ moduleFor(
         `
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1258,7 +1258,7 @@ moduleFor(
     }
 
     [`@test The {{link-to}} component accepts string/numeric arguments`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('filter', { path: '/filters/:filter' });
         this.route('post', { path: '/post/:post_id' });
         this.route('repo', { path: '/repo/:owner/:name' });
@@ -1301,8 +1301,8 @@ moduleFor(
       assert
     ) {
       assert.expect(2);
-      this.router.map(function() {
-        this.route('lobby', function() {
+      this.router.map(function () {
+        this.route('lobby', function () {
           this.route('index', { path: ':lobby_id' });
           this.route('list');
         });
@@ -1334,7 +1334,7 @@ moduleFor(
     }
 
     [`@test Quoteless route param performs property lookup`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1353,7 +1353,7 @@ moduleFor(
         })
       );
 
-      let assertEquality = href => {
+      let assertEquality = (href) => {
         assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
         assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
       };
@@ -1369,7 +1369,7 @@ moduleFor(
     }
 
     [`@test The {{link-to}} component refreshes href element when one of params changes`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -1409,8 +1409,8 @@ moduleFor(
     }
 
     [`@test The {{link-to}} component is active when a route is active`](assert) {
-      this.router.map(function() {
-        this.route('about', function() {
+      this.router.map(function () {
+        this.route('about', function () {
           this.route('item');
         });
       });
@@ -1440,7 +1440,7 @@ moduleFor(
     }
 
     [`@test The {{link-to}} component works in an #each'd array of string route names`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foo');
         this.route('bar');
         this.route('rar');
@@ -1500,7 +1500,7 @@ moduleFor(
 
     [`@test The non-block form {{link-to}} component moves into the named route`](assert) {
       assert.expect(3);
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('contact');
       });
 
@@ -1544,7 +1544,7 @@ moduleFor(
       assert
     ) {
       assert.expect(8);
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('contact');
       });
 
@@ -1629,7 +1629,7 @@ moduleFor(
     ) {
       assert.expect(5);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('item', { path: '/item/:id' });
       });
 
@@ -1690,7 +1690,7 @@ moduleFor(
     ) {
       assert.expect(5);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('item', { path: '/item/:id' });
       });
 
@@ -1744,7 +1744,7 @@ moduleFor(
     }
 
     [`@test The non-block form {{link-to}} performs property lookup`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1764,7 +1764,7 @@ moduleFor(
       );
 
       return this.visit('/').then(() => {
-        let assertEquality = href => {
+        let assertEquality = (href) => {
           assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
           assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
         };
@@ -1805,7 +1805,7 @@ moduleFor(
         return;
       }
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: 'post/:post_id' });
       });
 
@@ -1820,7 +1820,7 @@ moduleFor(
     [`@test the {{link-to}} component does not throw an error if its route has exited`](assert) {
       assert.expect(0);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: 'post/:post_id' });
       });
 
@@ -1866,8 +1866,8 @@ moduleFor(
     }
 
     [`@test {{link-to}} active property respects changing parent route context`](assert) {
-      this.router.map(function() {
-        this.route('things', { path: '/things/:name' }, function() {
+      this.router.map(function () {
+        this.route('things', { path: '/things/:name' }, function () {
           this.route('other');
         });
       });
@@ -1933,7 +1933,7 @@ moduleFor(
     }
 
     [`@test {{link-to}} with only query-params and a block updates when route changes`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1971,7 +1971,7 @@ moduleFor(
     }
 
     [`@test Block-less {{link-to}} with only query-params updates when route changes`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -2009,7 +2009,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to link-to with `hash` helper works']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -2046,7 +2046,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to link-to with `hash` helper works']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -2080,7 +2080,7 @@ moduleFor(
     }
 
     [`@test The {{link-to}} component can use dynamic params`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foo', { path: 'foo/:some/:thing' });
         this.route('bar', { path: 'bar/:some/:thing/:else' });
       });
@@ -2122,8 +2122,8 @@ moduleFor(
     ) {
       assert.expect(1);
 
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
         });
       });
@@ -2160,7 +2160,7 @@ moduleFor(
       let warningMessage =
         'This link is in an inactive loading state because at least one of its models currently has a null/undefined value, or the provided route name is invalid.';
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('thing', { path: '/thing/:thing_id' });
         this.route('about');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
index 19b2be177d0..32e1f304438 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
@@ -25,7 +25,7 @@ moduleFor(
       this.newsDefer = RSVP.defer();
       let _this = this;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
         this.route('other');
         this.route('news');
@@ -160,8 +160,8 @@ moduleFor(
       this.otherDefer = RSVP.defer();
       let _this = this;
 
-      this.router.map(function() {
-        this.route('parent-route', function() {
+      this.router.map(function () {
+        this.route('parent-route', function () {
           this.route('about');
           this.route('other');
         });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
index 654737d6676..a54c5b76137 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
@@ -25,7 +25,7 @@ moduleFor(
       this.newsDefer = RSVP.defer();
       let _this = this;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
         this.route('other');
         this.route('news');
@@ -160,8 +160,8 @@ moduleFor(
       this.otherDefer = RSVP.defer();
       let _this = this;
 
-      this.router.map(function() {
-        this.route('parent-route', function() {
+      this.router.map(function () {
+        this.route('parent-route', function () {
           this.route('about');
           this.route('other');
         });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index 0cc23bbc900..5637727aa98 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -116,7 +116,7 @@ moduleFor(
       this.renderDelegate();
       expectSendActionDeprecation(() => {
         runTask(() => {
-          set(this.delegate, 'action', actualArgument => {
+          set(this.delegate, 'action', (actualArgument) => {
             this.assert.deepEqual(argument, actualArgument, 'argument is passed');
           });
           this.delegate.sendAction('action', argument);
@@ -348,10 +348,10 @@ moduleFor(
 
       let component;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b');
-        this.route('c', function() {
+        this.route('c', function () {
           this.route('d');
           this.route('e');
         });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index 63dda4652c8..4b8b5ff4e8f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -213,7 +213,7 @@ moduleFor(
 
     ['@test triggers a method with `<Textarea @key-up={{this.didTrigger}} />`'](assert) {
       this.render(`<Textarea @key-up={{this.didTrigger}} />`, {
-        didTrigger: action(function() {
+        didTrigger: action(function () {
           assert.ok(true, 'action was triggered');
         }),
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index b15ca7166bd..17f2d0b33f9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -165,7 +165,7 @@ moduleFor(
 
     ['@test triggers a method with `{{textarea key-up=this.didTrigger}}`'](assert) {
       this.render(`{{textarea key-up=this.didTrigger}}`, {
-        didTrigger: action(function() {
+        didTrigger: action(function () {
           assert.ok(true, 'action was triggered');
         }),
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
index 22334db48b5..09f79dc9f05 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
@@ -42,7 +42,7 @@ moduleFor(
         isExpanded: true,
 
         actions: {
-          toggle: function() {
+          toggle: function () {
             this.toggleProperty('isExpanded');
           },
         },
@@ -127,8 +127,8 @@ moduleFor(
     `
       );
 
-      this.router.map(function() {
-        this.route('zomg', function() {
+      this.router.map(function () {
+        this.route('zomg', function () {
           this.route('lol');
         });
       });
@@ -166,7 +166,7 @@ moduleFor(
       let owner = this.applicationInstance;
 
       let actual = getRootViews(owner)
-        .map(view => view.id)
+        .map((view) => view.id)
         .sort();
       let expected = ids.sort();
 
@@ -245,7 +245,7 @@ moduleFor(
       let parentView = this.viewFor(parentId);
       let childViews = getChildViews(parentView);
 
-      let actual = childViews.map(view => view.id).sort();
+      let actual = childViews.map((view) => view.id).sort();
       let expected = childIds.sort();
 
       this.assert.deepEqual(actual, expected, `child views for #${parentId}`);
@@ -262,7 +262,7 @@ moduleFor(
 let hasGetClientRects, hasGetBoundingClientRect;
 let ClientRectListCtor, ClientRectCtor;
 
-(function() {
+(function () {
   if (document.createRange) {
     let range = document.createRange();
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index 25ad36ceb6c..de917770878 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -292,7 +292,7 @@ class DynamicContentTest extends RenderingTestCase {
 
   ['@test it can render a computed property']() {
     let Formatter = EmberObject.extend({
-      formattedMessage: computed('message', function() {
+      formattedMessage: computed('message', function () {
         return this.get('message').toUpperCase();
       }),
     });
@@ -318,7 +318,7 @@ class DynamicContentTest extends RenderingTestCase {
 
   ['@test it can render a computed property with nested dependency']() {
     let Formatter = EmberObject.extend({
-      formattedMessage: computed('messenger.message', function() {
+      formattedMessage: computed('messenger.message', function () {
         return this.get('messenger.message').toUpperCase();
       }),
     });
@@ -1622,7 +1622,7 @@ class StyleTest extends RenderingTestCase {
     super(...arguments);
     warnings = [];
     originalWarn = getDebugFunction('warn');
-    setDebugFunction('warn', function(message, test) {
+    setDebugFunction('warn', function (message, test) {
       if (!test) {
         warnings.push(message);
       }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 1463c7999b9..fc5ade2b2e5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -252,7 +252,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.named.firstName', 'args.named.lastName', function() {
+          salutation: computed('args.named.firstName', 'args.named.lastName', function () {
             return this.args.named.firstName + ' ' + this.args.named.lastName;
           }),
         })
@@ -272,7 +272,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.named.firstName', 'args.named.lastName', function() {
+          salutation: computed('args.named.firstName', 'args.named.lastName', function () {
             return this.args.named.firstName + ' ' + this.args.named.lastName;
           }),
         })
@@ -304,7 +304,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.positional.[]', function() {
+          salutation: computed('args.positional.[]', function () {
             return this.args.positional[0] + ' ' + this.args.positional[1];
           }),
         })
@@ -324,7 +324,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.positional.[]', function() {
+          salutation: computed('args.positional.[]', function () {
             return this.args.positional[0] + ' ' + this.args.positional[1];
           }),
         })
@@ -356,7 +356,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.positional.0', 'args.positional.1', function() {
+          salutation: computed('args.positional.0', 'args.positional.1', function () {
             return this.args.positional[0] + ' ' + this.args.positional[1];
           }),
         })
@@ -550,7 +550,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.named.firstName', 'args.named.lastName', function() {
+          salutation: computed('args.named.firstName', 'args.named.lastName', function () {
             return this.args.named.firstName + ' ' + this.args.named.lastName;
           }),
         })
@@ -583,7 +583,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         createBasicManager,
         EmberObject.extend({
-          salutation: computed('args.named.firstName', 'args.named.lastName', function() {
+          salutation: computed('args.named.firstName', 'args.named.lastName', function () {
             return this.args.named.firstName + ' ' + this.args.named.lastName;
           }),
         })
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index bd47728d4f4..b37d26f785e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -26,7 +26,7 @@ class ModifierManagerTest extends RenderingTestCase {
 
   '@test can register a custom element modifier and render it'(assert) {
     let ModifierClass = setModifierManager(
-      owner => {
+      (owner) => {
         return new this.CustomModifierManager(owner);
       },
       EmberObject.extend({
@@ -52,7 +52,7 @@ class ModifierManagerTest extends RenderingTestCase {
   '@test custom lifecycle hooks'(assert) {
     assert.expect(9);
     let ModifierClass = setModifierManager(
-      owner => {
+      (owner) => {
         return new this.CustomModifierManager(owner);
       },
       EmberObject.extend({
@@ -94,7 +94,7 @@ class ModifierManagerTest extends RenderingTestCase {
   '@test associates manager even through an inheritance structure'(assert) {
     assert.expect(5);
     let ModifierClass = setModifierManager(
-      owner => {
+      (owner) => {
         return new this.CustomModifierManager(owner);
       },
       EmberObject.extend({
@@ -132,7 +132,7 @@ class ModifierManagerTest extends RenderingTestCase {
   '@test can give consistent access to underlying DOM element'(assert) {
     assert.expect(4);
     let ModifierClass = setModifierManager(
-      owner => {
+      (owner) => {
         return new this.CustomModifierManager(owner);
       },
       EmberObject.extend({
@@ -182,7 +182,7 @@ class ModifierManagerTest extends RenderingTestCase {
     let updateCount = 0;
 
     let ModifierClass = setModifierManager(
-      owner => {
+      (owner) => {
         return new this.CustomModifierManager(owner);
       },
       EmberObject.extend({
@@ -234,7 +234,7 @@ class ModifierManagerTest extends RenderingTestCase {
     }
 
     let ModifierClass = setModifierManager(
-      owner => {
+      (owner) => {
         return new this.CustomModifierManager(owner);
       },
       class {
@@ -304,7 +304,7 @@ moduleFor(
       let updateCount = 0;
 
       let ModifierClass = setModifierManager(
-        owner => {
+        (owner) => {
           return new this.CustomModifierManager(owner);
         },
         EmberObject.extend({
@@ -387,7 +387,7 @@ moduleFor(
       let updateCount = 0;
 
       let ModifierClass = setModifierManager(
-        owner => {
+        (owner) => {
           return new this.CustomModifierManager(owner);
         },
         EmberObject.extend({
@@ -443,7 +443,7 @@ moduleFor(
       let updateCount = 0;
 
       let ModifierClass = setModifierManager(
-        owner => {
+        (owner) => {
           return new this.CustomModifierManager(owner);
         },
         EmberObject.extend({
@@ -528,7 +528,7 @@ moduleFor(
         }
       }
       let ModifierClass = setModifierManager(
-        owner => {
+        (owner) => {
           return new CustomModifierManager(owner);
         },
         EmberObject.extend({
@@ -582,7 +582,7 @@ moduleFor(
         }
       }
       let ModifierClass = setModifierManager(
-        owner => {
+        (owner) => {
           return new CustomModifierManager(owner);
         },
         EmberObject.extend({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
index ee8982f6400..fa0b5fa0e03 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
@@ -268,7 +268,7 @@ moduleFor(
     ['@test capture array values in JS to assert deep equal']() {
       let captured;
 
-      this.registerHelper('capture', function([array]) {
+      this.registerHelper('capture', function ([array]) {
         captured = array;
         return 'captured';
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index fa1e09489ad..fd85e1a03f1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -764,7 +764,7 @@ moduleFor(
       });
 
       let OuterComponent = Component.extend({
-        otherComponent: computed(function() {
+        otherComponent: computed(function () {
           return {
             actions: {
               outerAction() {
@@ -1058,7 +1058,7 @@ moduleFor(
 
         let OuterComponent = Component.extend({
           foo: 123,
-          submitTask: computed(function() {
+          submitTask: computed(function () {
             return {
               [INVOKE]: (...args) => {
                 invokableArgs = args;
@@ -1165,7 +1165,7 @@ moduleFor(
         clicked: 0,
 
         actions: {
-          'on-click': function() {
+          'on-click': function () {
             this.incrementProperty('clicked');
           },
         },
@@ -1219,7 +1219,7 @@ moduleFor(
       assert.equal(didReceiveAttrsFired, 3);
 
       runTask(() =>
-        set(outer, 'onClick', function() {
+        set(outer, 'onClick', function () {
           outer.incrementProperty('clicked');
         })
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 1bec0b1f171..18aff940730 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -236,7 +236,7 @@ moduleFor(
     }
 
     ['@test helper params can be returned']() {
-      this.registerHelper('hello-world', values => {
+      this.registerHelper('hello-world', (values) => {
         return values;
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 1acf236c473..2719f227280 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -27,7 +27,7 @@ function getActionAttributes(element) {
 }
 
 function getActionIds(element) {
-  return getActionAttributes(element).map(attribute =>
+  return getActionAttributes(element).map((attribute) =>
     attribute.slice('data-ember-action-'.length)
   );
 }
@@ -1227,15 +1227,13 @@ moduleFor(
 
       let test = this;
 
-      let testBoundAction = propertyValue => {
+      let testBoundAction = (propertyValue) => {
         runTask(() => {
           component.set('hookMeUp', propertyValue);
         });
 
         runTask(() => {
-          this.wrap(component.element)
-            .findAll('#bound-param')
-            .click();
+          this.wrap(component.element).findAll('#bound-param').click();
         });
 
         test.assert.ok(lastAction, propertyValue, `lastAction set to ${propertyValue}`);
@@ -1293,11 +1291,9 @@ moduleFor(
 
       let test = this;
 
-      let testBoundAction = propertyValue => {
+      let testBoundAction = (propertyValue) => {
         runTask(() => {
-          this.wrap(component.element)
-            .findAll(`#${propertyValue}`)
-            .click();
+          this.wrap(component.element).findAll(`#${propertyValue}`).click();
         });
 
         test.assert.ok(lastAction, propertyValue, `lastAction set to ${propertyValue}`);
@@ -1610,12 +1606,7 @@ moduleFor(
         { show: true }
       );
 
-      this.assert.equal(
-        this.$('button')
-          .text()
-          .trim(),
-        'Show (true)'
-      );
+      this.assert.equal(this.$('button').text().trim(), 'Show (true)');
       // We need to focus in to simulate an actual click.
       runTask(() => {
         document.getElementById('ddButton').focus();
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
index 44a9b2dcb0a..646c37b4dab 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
@@ -8,7 +8,7 @@ moduleFor(
   'Helpers test: {{fn}}',
   class extends RenderingTestCase {
     beforeEach() {
-      this.registerHelper('invoke', function([fn]) {
+      this.registerHelper('invoke', function ([fn]) {
         return fn();
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
index 9de369ebe81..c47797e467b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
@@ -482,11 +482,7 @@ moduleFor(
 
       assert.strictEqual(this.$('#get-input').val(), 'yellow');
 
-      runTask(() =>
-        this.$('#get-input')
-          .val('some value')
-          .trigger('change')
-      );
+      runTask(() => this.$('#get-input').val('some value').trigger('change'));
 
       assert.strictEqual(this.$('#get-input').val(), 'some value');
       assert.strictEqual(get(this.context, 'source.banana'), 'some value');
@@ -515,11 +511,7 @@ moduleFor(
 
       assert.strictEqual(this.$('#get-input').val(), 'yellow');
 
-      runTask(() =>
-        this.$('#get-input')
-          .val('some value')
-          .trigger('change')
-      );
+      runTask(() => this.$('#get-input').val('some value').trigger('change'));
 
       assert.strictEqual(this.$('#get-input').val(), 'some value');
       assert.strictEqual(get(this.context, 'source.banana'), 'some value');
@@ -528,11 +520,7 @@ moduleFor(
 
       assert.strictEqual(this.$('#get-input').val(), 'apple');
 
-      runTask(() =>
-        this.$('#get-input')
-          .val('some other value')
-          .trigger('change')
-      );
+      runTask(() => this.$('#get-input').val('some other value').trigger('change'));
 
       assert.strictEqual(this.$('#get-input').val(), 'some other value');
       assert.strictEqual(get(this.context, 'source.apple'), 'some other value');
@@ -569,11 +557,7 @@ moduleFor(
 
       assert.strictEqual(this.$('#get-input').val(), 'red');
 
-      runTask(() =>
-        this.$('#get-input')
-          .val('some value')
-          .trigger('change')
-      );
+      runTask(() => this.$('#get-input').val('some value').trigger('change'));
 
       assert.strictEqual(this.$('#get-input').val(), 'some value');
       assert.strictEqual(get(this.context, 'source.apple.mcintosh'), 'some value');
@@ -582,11 +566,7 @@ moduleFor(
 
       assert.strictEqual(this.$('#get-input').val(), 'gala');
 
-      runTask(() =>
-        this.$('#get-input')
-          .val('some other value')
-          .trigger('change')
-      );
+      runTask(() => this.$('#get-input').val('some other value').trigger('change'));
 
       assert.strictEqual(this.$('#get-input').val(), 'some other value');
       assert.strictEqual(get(this.context, 'source.apple.gala'), 'some other value');
@@ -595,11 +575,7 @@ moduleFor(
 
       assert.strictEqual(this.$('#get-input').val(), 'banana');
 
-      runTask(() =>
-        this.$('#get-input')
-          .val('yet another value')
-          .trigger('change')
-      );
+      runTask(() => this.$('#get-input').val('yet another value').trigger('change'));
 
       assert.strictEqual(this.$('#get-input').val(), 'yet another value');
       assert.strictEqual(get(this.context, 'source.banana'), 'yet another value');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 2611cd87fcb..33821e44280 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -49,7 +49,7 @@ class TestHelper {
   willDestroy() {}
 }
 
-setHelperManager(owner => new TestHelperManager(owner), TestHelper);
+setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
 
 if (EMBER_GLIMMER_HELPER_MANAGER) {
   moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
index 68565befe4d..e8bc1014692 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
@@ -291,7 +291,7 @@ moduleFor(
       this.registerComponent('middle-mut', {
         ComponentClass: Component.extend({
           baseValue: 12,
-          val: computed('baseValue', function() {
+          val: computed('baseValue', function () {
             return this.get('baseValue');
           }),
           didInsertElement() {
@@ -452,7 +452,7 @@ moduleFor(
           didInsertElement() {
             output = this;
           },
-          style: computed('height', function() {
+          style: computed('height', function () {
             let height = this.get('height');
             return htmlSafe(`height: ${height}px;`);
           }),
@@ -520,7 +520,7 @@ moduleFor(
           didInsertElement() {
             output = this;
           },
-          style: computed('height', 'width', function() {
+          style: computed('height', 'width', function () {
             let height = this.get('height');
             let width = this.get('width');
             return htmlSafe(`height: ${height}px; width: ${width}px;`);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
index ce20db535ad..0891c1b94df 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
@@ -190,7 +190,7 @@ moduleFor(
 
     // semantics here is not guaranteed
     ['@test sexpr form does not update no matter what']() {
-      this.registerHelper('capitalize', args => args[0].toUpperCase());
+      this.registerHelper('capitalize', (args) => args[0].toUpperCase());
 
       this.render(`{{capitalize (unbound foo)}}`, {
         foo: 'bork',
@@ -222,9 +222,9 @@ moduleFor(
     }
 
     ['@test sexpr in helper form does not update on parent re-render']() {
-      this.registerHelper('capitalize', params => params[0].toUpperCase());
+      this.registerHelper('capitalize', (params) => params[0].toUpperCase());
 
-      this.registerHelper('doublize', params => `${params[0]} ${params[0]}`);
+      this.registerHelper('doublize', (params) => `${params[0]} ${params[0]}`);
 
       this.render(`{{capitalize (unbound (doublize foo))}}`, {
         foo: 'bork',
@@ -332,7 +332,7 @@ moduleFor(
     }
 
     ['@test should be able to render unbound forms of multi-arg helpers']() {
-      this.registerHelper('fauxconcat', params => params.join(''));
+      this.registerHelper('fauxconcat', (params) => params.join(''));
 
       this.render(
         `{{fauxconcat this.model.foo this.model.bar this.model.bing}} {{unbound (fauxconcat this.model.foo this.model.bar this.model.bing)}}`,
@@ -437,7 +437,7 @@ moduleFor(
     }
 
     ['@test should be able to render an unbound helper invocation in #each helper']() {
-      this.registerHelper('capitalize', params => params[0].toUpperCase());
+      this.registerHelper('capitalize', (params) => params[0].toUpperCase());
 
       this.render(
         `{{#each people as |person|}}{{capitalize person.firstName}} {{unbound (capitalize person.firstName)}}{{/each}}`,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 2c98b964189..8f413520b2d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -60,7 +60,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            Object.keys(engineRegistrations).forEach(fullName => {
+            Object.keys(engineRegistrations).forEach((fullName) => {
               this.register(fullName, engineRegistrations[fullName]);
             });
           },
@@ -112,7 +112,7 @@ moduleFor(
     }
 
     async ['@test it emits a useful backtracking re-render assertion message'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('route-with-mount');
       });
 
@@ -157,7 +157,7 @@ moduleFor(
     }
 
     ['@test it renders with a bound engine name']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('bound-engine-name');
       });
       let controller;
@@ -238,7 +238,7 @@ moduleFor(
     }
 
     ['@test it declares the event dispatcher as a singleton']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('engine-event-dispatcher-singleton');
       });
 
@@ -338,7 +338,7 @@ moduleFor(
     }
 
     ['@test it renders with static parameters']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('engine-params-static');
       });
       this.addTemplate('engine-params-static', '{{mount "paramEngine" model=(hash foo="bar")}}');
@@ -349,7 +349,7 @@ moduleFor(
     }
 
     ['@test it renders with bound parameters']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('engine-params-bound');
       });
       let controller;
@@ -398,7 +398,7 @@ moduleFor(
     }
 
     ['@test it renders contextual components passed as parameter values']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('engine-params-contextual-component');
       });
 
@@ -467,7 +467,7 @@ if (!EMBER_ROUTING_MODEL_ARG) {
       }
 
       ['@test it cannot access the model via @model']() {
-        this.router.map(function() {
+        this.router.map(function () {
           this.route('engine-params');
         });
         this.addTemplate('engine-params', '{{mount "paramEngine" model="foo"}}');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index e454e439025..071ff353502 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -622,7 +622,7 @@ moduleFor(
   class extends EachInTest {
     createHash(pojo) {
       let map = new Map();
-      Object.keys(pojo).forEach(key => {
+      Object.keys(pojo).forEach((key) => {
         map.set(key, pojo[key]);
       });
       return {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 21fd70c7a99..50e73c05057 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -99,11 +99,11 @@ const makeSet = (() => {
   let set = new Set([1, 2, 3]);
 
   if (set.size === 3) {
-    return items => new Set(items);
+    return (items) => new Set(items);
   } else {
-    return items => {
+    return (items) => {
       let s = new Set();
-      items.forEach(value => s.add(value));
+      items.forEach((value) => s.add(value));
       return s;
     };
   }
@@ -112,14 +112,14 @@ const makeSet = (() => {
 class SetDelegate extends ArrayDelegate {
   constructor(set) {
     let array = [];
-    set.forEach(value => array.push(value));
+    set.forEach((value) => array.push(value));
     super(array, set);
     this._set = set;
   }
 
   arrayContentDidChange() {
     this._set.clear();
-    this._array.forEach(value => this._set.add(value));
+    this._array.forEach((value) => this._set.add(value));
     super.arrayContentDidChange();
   }
 }
@@ -218,7 +218,7 @@ applyMixins(
     'hello',
     1,
     Object,
-    function() {},
+    function () {},
     {},
     { foo: 'bar' },
     Object.create(null),
@@ -650,7 +650,7 @@ class EachTest extends AbstractEachTest {
     this.assertText('HelloHelloHello');
 
     runTask(() => {
-      this.forEach(hash => set(hash, 'text', 'Goodbye'));
+      this.forEach((hash) => set(hash, 'text', 'Goodbye'));
     });
 
     this.assertText('GoodbyeGoodbyeGoodbye');
@@ -1101,7 +1101,7 @@ moduleFor(
     createList(items) {
       let wrapped = emberA(items);
       let proxy = ArrayProxy.extend({
-        arrangedContent: computed('wrappedItems.[]', function() {
+        arrangedContent: computed('wrappedItems.[]', function () {
           // Slice the items to ensure that updates must be propogated
           return this.wrappedItems.slice();
         }),
@@ -1120,7 +1120,7 @@ moduleFor(
     createList(items) {
       let wrapped = emberA(items);
       let proxy = ArrayProxy.extend({
-        setup: on('init', function() {
+        setup: on('init', function () {
           this.set('content', emberA(wrapped));
         }),
       }).create();
@@ -1200,7 +1200,7 @@ if (typeof MutationObserver === 'function') {
       }
 
       observe(element) {
-        let observer = (this.observer = new MutationObserver(function() {}));
+        let observer = (this.observer = new MutationObserver(function () {}));
         observer.observe(element, { childList: true, characterData: true });
       }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js
index 4e5b237cef3..6c1d793b2d1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js
@@ -9,7 +9,7 @@ moduleFor(
     constructor() {
       let originalMacros = _experimentalMacros.slice();
 
-      _registerMacros(blocks => {
+      _registerMacros((blocks) => {
         blocks.add('-test-block', (params, _hash, blocks) => {
           return invokeStaticBlockWithStack(blocks.get('default'));
         });
@@ -21,7 +21,7 @@ moduleFor(
 
     teardown() {
       _experimentalMacros.length = 0;
-      this.originalMacros.forEach(macro => _experimentalMacros.push(macro));
+      this.originalMacros.forEach((macro) => _experimentalMacros.push(macro));
 
       super.teardown();
     }
diff --git a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
index 00b8ba8d8d7..d2a1461e7dc 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
@@ -235,7 +235,7 @@ moduleFor(
 
 function diff(state, lastState) {
   let res = {};
-  Object.keys(state).forEach(key => {
+  Object.keys(state).forEach((key) => {
     let delta = state[key] - lastState[key];
     if (delta !== 0) {
       res[key] = state[key] - lastState[key];
diff --git a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
index bf5734c6fb9..d0523a485b0 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
@@ -97,7 +97,7 @@ moduleFor(
 
 function diff(state, lastState) {
   let res = {};
-  Object.keys(state).forEach(key => {
+  Object.keys(state).forEach((key) => {
     let delta = state[key] - lastState[key];
     if (delta !== 0) {
       res[key] = state[key] - lastState[key];
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index ee8806adefb..5c2c08ec71f 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -401,8 +401,8 @@ const IfUnlessWithTestCases = [
     EmberObject.create({ foo: 'bar' }),
     ObjectProxy.create({ content: true }),
     Object,
-    function() {},
-    async function() {},
+    function () {},
+    async function () {},
     new String('hello'),
     new String(''),
     new Boolean(true),
@@ -567,13 +567,13 @@ export class TogglingHelperConditionalsTest extends TogglingConditionalsTest {
     let truthyEvaluated;
     let falsyEvaluated;
 
-    let withoutEvaluatingTruthy = callback => {
+    let withoutEvaluatingTruthy = (callback) => {
       truthyEvaluated = false;
       callback();
       assert.ok(!truthyEvaluated, 'x-truthy is not evaluated');
     };
 
-    let withoutEvaluatingFalsy = callback => {
+    let withoutEvaluatingFalsy = (callback) => {
       falsyEvaluated = false;
       callback();
       assert.ok(!falsyEvaluated, 'x-falsy is not evaluated');
@@ -908,13 +908,13 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
     let truthyEvaluated;
     let falsyEvaluated;
 
-    let withoutEvaluatingTruthy = callback => {
+    let withoutEvaluatingTruthy = (callback) => {
       truthyEvaluated = false;
       callback();
       assert.ok(!truthyEvaluated, 'x-truthy is not evaluated');
     };
 
-    let withoutEvaluatingFalsy = callback => {
+    let withoutEvaluatingFalsy = (callback) => {
       falsyEvaluated = false;
       callback();
       assert.ok(!falsyEvaluated, 'x-falsy is not evaluated');
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 6666495a256..17c6c91c0e2 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -219,7 +219,7 @@ function getChainTags(
   }
 
   if (DEBUG) {
-    chainTags.forEach(t => ALLOW_CYCLES!.set(t, true));
+    chainTags.forEach((t) => ALLOW_CYCLES!.set(t, true));
   }
 
   return chainTags;
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 57a35ac88d5..94088e597e7 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -283,7 +283,7 @@ export class ComputedProperty extends ComputedDescriptor {
         );
         assert(
           'Config object passed to computed can only contain `get` and `set` keys.',
-          Object.keys(objectConfig).every(key => key === 'get' || key === 'set')
+          Object.keys(objectConfig).every((key) => key === 'get' || key === 'set')
         );
         assert(
           'Computed properties must receive a getter or a setter, you passed none.',
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 4be08fb2bf6..3f22ae3909a 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -31,7 +31,7 @@ export function isElementDescriptor(
 }
 
 export function nativeDescDecorator(propertyDesc: PropertyDescriptor) {
-  let decorator = function() {
+  let decorator = function () {
     return propertyDesc;
   };
 
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index cd9da74f243..270f7c277e9 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -210,7 +210,7 @@ export function on(...args: Array<string | Function>): Function {
   assert('on expects function as last argument', typeof func === 'function');
   assert(
     'on called without valid event names',
-    events.length > 0 && events.every(p => typeof p === 'string' && p.length > 0)
+    events.length > 0 && events.every((p) => typeof p === 'string' && p.length > 0)
   );
 
   setListeners(func, events);
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index e09088bb41a..d6eb311b988 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -53,7 +53,7 @@ export default function inject(
 
   let name = calledAsDecorator ? undefined : args[0];
 
-  let getInjection = function(this: any, propertyName: string) {
+  let getInjection = function (this: any, propertyName: string) {
     let owner = getOwner(this) || this.container; // fallback to `container` for backwards compat
 
     assert(
diff --git a/packages/@ember/-internals/metal/lib/libraries.ts b/packages/@ember/-internals/metal/lib/libraries.ts
index fc31ecdb53b..5823e50b629 100644
--- a/packages/@ember/-internals/metal/lib/libraries.ts
+++ b/packages/@ember/-internals/metal/lib/libraries.ts
@@ -76,15 +76,15 @@ export class Libraries {
 }
 
 if (EMBER_LIBRARIES_ISREGISTERED) {
-  Libraries.prototype.isRegistered = function(name: string): boolean {
+  Libraries.prototype.isRegistered = function (name: string): boolean {
     return Boolean(this._getLibraryByName(name));
   };
 }
 
 if (DEBUG) {
-  Libraries.prototype.logVersions = function(): void {
+  Libraries.prototype.logVersions = function (): void {
     let libs = this._registry;
-    let nameLengths = libs.map(item => get(item, 'name.length'));
+    let nameLengths = libs.map((item) => get(item, 'name.length'));
     let maxNameLength = Math.max.apply(null, nameLengths);
 
     debug('-------------------------------');
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 1363a411fbb..64cc56786a4 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -365,7 +365,7 @@ let followMethodAlias: (
 ) => { desc: any; value: any };
 
 if (ALIAS_METHOD) {
-  followMethodAlias = function(
+  followMethodAlias = function (
     obj: object,
     alias: Alias,
     descs: { [key: string]: any },
@@ -738,7 +738,7 @@ function _detect(curMixin: Mixin, targetMixin: Mixin, seen = new Set()): boolean
   }
   let mixins = curMixin.mixins;
   if (mixins) {
-    return mixins.some(mixin => _detect(mixin, targetMixin, seen));
+    return mixins.some((mixin) => _detect(mixin, targetMixin, seen));
   }
 
   return false;
@@ -890,7 +890,7 @@ export function observer(...args: (string | Function | ObserverDefinition)[]) {
     'observer called without valid path',
     Array.isArray(dependentKeys) &&
       dependentKeys.length > 0 &&
-      dependentKeys.every(p => typeof p === 'string' && Boolean(p.length))
+      dependentKeys.every((p) => typeof p === 'string' && Boolean(p.length))
   );
   assert('observer called without sync', typeof sync === 'boolean');
 
diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts
index e4b32bab5c2..98f8035d9a8 100644
--- a/packages/@ember/-internals/metal/lib/observer.ts
+++ b/packages/@ember/-internals/metal/lib/observer.ts
@@ -160,7 +160,7 @@ export function resumeObserverDeactivation() {
  */
 export function revalidateObservers(target: object) {
   if (ASYNC_OBSERVERS.has(target)) {
-    ASYNC_OBSERVERS.get(target)!.forEach(observer => {
+    ASYNC_OBSERVERS.get(target)!.forEach((observer) => {
       observer.tag = getChainTagsForKey(
         target,
         observer.path,
@@ -172,7 +172,7 @@ export function revalidateObservers(target: object) {
   }
 
   if (SYNC_OBSERVERS.has(target)) {
-    SYNC_OBSERVERS.get(target)!.forEach(observer => {
+    SYNC_OBSERVERS.get(target)!.forEach((observer) => {
       observer.tag = getChainTagsForKey(
         target,
         observer.path,
diff --git a/packages/@ember/-internals/metal/lib/path_cache.ts b/packages/@ember/-internals/metal/lib/path_cache.ts
index 64b18b62021..a4bfcea194c 100644
--- a/packages/@ember/-internals/metal/lib/path_cache.ts
+++ b/packages/@ember/-internals/metal/lib/path_cache.ts
@@ -1,6 +1,6 @@
 import { Cache } from '@ember/-internals/utils';
 
-const firstDotIndexCache = new Cache<string, number>(1000, key => key.indexOf('.'));
+const firstDotIndexCache = new Cache<string, number>(1000, (key) => key.indexOf('.'));
 
 export function isPath(path: any): boolean {
   return typeof path === 'string' && firstDotIndexCache.get(path) !== -1;
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 951b88f7ddd..ef7eb1455aa 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -109,7 +109,7 @@ export function tracked(...args: any[]): Decorator | DecoratorPropertyDescriptor
     let initializer = propertyDesc ? propertyDesc.initializer : undefined;
     let value = propertyDesc ? propertyDesc.value : undefined;
 
-    let decorator = function(
+    let decorator = function (
       target: object,
       key: string,
       _desc: DecoratorPropertyDescriptor,
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index 56f2aaeaefd..b508e04dd9b 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -99,7 +99,7 @@ moduleFor(
     }
 
     ['@test get works with paths correctly'](assert) {
-      let func = function() {};
+      let func = function () {};
       func.bar = 'awesome';
 
       let destroyedObj = EmberObject.create({ bar: 'great' });
@@ -111,7 +111,7 @@ moduleFor(
       assert.equal(get({ foo: func }, 'foo.bar.length'), 7);
       assert.equal(get({}, 'foo.bar.length'), undefined);
       assert.equal(
-        get(function() {}, 'foo.bar.length'),
+        get(function () {}, 'foo.bar.length'),
         undefined
       );
       assert.equal(get('', 'foo.bar.length'), undefined);
@@ -119,43 +119,43 @@ moduleFor(
     }
 
     ['@test warn on attempts to call get with no arguments']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get('aProperty');
       }, /Get must be called with two arguments;/i);
     }
 
     ['@test warn on attempts to call get with only one argument']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get('aProperty');
       }, /Get must be called with two arguments;/i);
     }
 
     ['@test warn on attempts to call get with more then two arguments']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get({}, 'aProperty', true);
       }, /Get must be called with two arguments;/i);
     }
 
     ['@test warn on attempts to get a property of undefined']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get(undefined, 'aProperty');
       }, /Cannot call get with 'aProperty' on an undefined object/i);
     }
 
     ['@test warn on attempts to get a property path of undefined']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get(undefined, 'aProperty.on.aPath');
       }, /Cannot call get with 'aProperty.on.aPath' on an undefined object/);
     }
 
     ['@test warn on attempts to get a property of null']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get(null, 'aProperty');
       }, /Cannot call get with 'aProperty' on an undefined object/);
     }
 
     ['@test warn on attempts to get a property path of null']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get(null, 'aProperty.on.aPath');
       }, /Cannot call get with 'aProperty.on.aPath' on an undefined object/);
     }
diff --git a/packages/@ember/-internals/metal/tests/computed_decorator_test.js b/packages/@ember/-internals/metal/tests/computed_decorator_test.js
index f585274457b..a26c3759fc3 100644
--- a/packages/@ember/-internals/metal/tests/computed_decorator_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_decorator_test.js
@@ -57,7 +57,7 @@ moduleFor(
         first = 'rob';
         last = 'jackson';
 
-        @computed('first', 'last', function() {
+        @computed('first', 'last', function () {
           assert.equal(this.first, 'rob');
           assert.equal(this.last, 'jackson');
         })
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 6d347c98ad3..f2078a24c02 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -29,7 +29,7 @@ moduleFor(
   class extends ComputedTestCase {
     ['@test isComputed is true for computed property on a factory'](assert) {
       let Obj = EmberObject.extend({
-        foo: computed(function() {}),
+        foo: computed(function () {}),
       });
 
       Obj.proto(); // ensure the prototype is "collapsed" / merged
@@ -39,25 +39,25 @@ moduleFor(
 
     ['@test isComputed is true for computed property on an instance'](assert) {
       obj = EmberObject.extend({
-        foo: computed(function() {}),
+        foo: computed(function () {}),
       }).create();
 
       assert.ok(isComputed(obj, 'foo'));
     }
 
     ['@test computed property should be an instance of descriptor'](assert) {
-      assert.ok(isClassicDecorator(computed(function() {})));
+      assert.ok(isClassicDecorator(computed(function () {})));
     }
 
     ['@test computed properties assert the presence of a getter or setter function']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         obj = {};
         defineProperty(obj, 'someProp', computed('nogetternorsetter', {}));
       }, 'Computed properties must receive a getter or a setter, you passed none.');
     }
 
     ['@test computed properties check for the presence of a function or configuration object']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         obj = {};
         defineProperty(obj, 'someProp', computed('nolastargument'));
       }, 'Attempted to use @computed on someProp, but it did not have a getter or a setter. You must either pass a get a function or getter/setter to @computed directly (e.g. `@computed({ get() { ... } })`) or apply @computed directly to a getter/setter');
@@ -65,7 +65,7 @@ moduleFor(
 
     // non valid properties are stripped away in the process of creating a computed property descriptor
     ['@test computed properties defined with an object only allow `get` and `set` keys']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         obj = EmberObject.extend({
           someProp: computed({
             get() {},
@@ -84,7 +84,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed(function(key) {
+        computed(function (key) {
           count++;
           return 'computed ' + key;
         })
@@ -100,7 +100,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed(function(key) {
+        computed(function (key) {
           count++;
           return 'computed ' + key;
         })
@@ -117,7 +117,7 @@ moduleFor(
       Obj.reopenClass({
         bar: 123,
 
-        foo: computed(function() {
+        foo: computed(function () {
           count++;
           return this.bar;
         }),
@@ -133,7 +133,7 @@ moduleFor(
       obj = {};
 
       expectDeprecation(() => {
-        defineProperty(obj, 'foo', computed(function() {}).volatile());
+        defineProperty(obj, 'foo', computed(function () {}).volatile());
       }, 'Setting a computed property as volatile has been deprecated. Instead, consider using a native getter with native class syntax.');
 
       expectDeprecation(() => {
@@ -391,7 +391,7 @@ moduleFor(
   'computed - metadata',
   class extends AbstractTestCase {
     ['@test can set metadata on a computed property'](assert) {
-      let computedProperty = computed(function() {});
+      let computedProperty = computed(function () {});
       computedProperty.meta({ key: 'keyValue' });
 
       assert.equal(
@@ -402,7 +402,7 @@ moduleFor(
     }
 
     ['@test meta should return an empty hash if no meta is set'](assert) {
-      let computedProperty = computed(function() {});
+      let computedProperty = computed(function () {});
       assert.deepEqual(computedProperty.meta(), {}, 'returned value is an empty hash');
     }
   }
@@ -418,7 +418,7 @@ moduleFor(
     beforeEach() {
       obj = {};
       count = 0;
-      let func = function() {
+      let func = function () {
         count++;
         return 'bar ' + count;
       };
@@ -466,7 +466,7 @@ moduleFor(
       defineProperty(
         obj,
         'falsy',
-        computed(function() {
+        computed(function () {
           return false;
         })
       );
@@ -521,7 +521,7 @@ moduleFor(
     beforeEach() {
       obj = { bar: 'baz' };
       count = 0;
-      let getterAndSetter = function() {
+      let getterAndSetter = function () {
         count++;
         get(this, 'bar');
         return 'bar ' + count;
@@ -537,7 +537,7 @@ moduleFor(
     }
 
     ['@test circular keys should not blow up'](assert) {
-      let func = function() {
+      let func = function () {
         count++;
         return 'bar ' + count;
       };
@@ -546,7 +546,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed('bar', function() {
+        computed('bar', function () {
           count++;
           return 'foo ' + count;
         })
@@ -567,7 +567,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed('baz', function() {
+        computed('baz', function () {
           count++;
           return 'baz ' + count;
         })
@@ -588,7 +588,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed('qux.{bar,baz}', function() {
+        computed('qux.{bar,baz}', function () {
           count++;
           return 'foo ' + count;
         })
@@ -612,11 +612,11 @@ moduleFor(
     }
 
     ['@test throws assertion if brace expansion notation has spaces']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         defineProperty(
           obj,
           'roo',
-          computed('fee.{bar, baz,bop , }', function() {
+          computed('fee.{bar, baz,bop , }', function () {
             count++;
             return 'roo ' + count;
           })
@@ -641,7 +641,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed(function() {
+        computed(function () {
           return 'baz';
         })
       );
@@ -672,7 +672,7 @@ moduleFor(
       };
 
       count = 0;
-      func = function() {
+      func = function () {
         count++;
         return get(obj, 'foo.bar.baz.biff') + ' ' + count;
       };
@@ -726,7 +726,7 @@ moduleFor(
       defineProperty(
         obj.foo,
         'c',
-        computed('bar.b', function() {})
+        computed('bar.b', function () {})
       );
       assert.equal(count, 0, 'b should not run');
     }
@@ -833,7 +833,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed(function() {})
+        computed(function () {})
       );
 
       let found = [];
@@ -903,13 +903,13 @@ moduleFor(
       let fullNameDidChange = 0;
       let firstNameDidChange = 0;
       let lastNameDidChange = 0;
-      addObserver(obj, 'fullName', function() {
+      addObserver(obj, 'fullName', function () {
         fullNameDidChange++;
       });
-      addObserver(obj, 'firstName', function() {
+      addObserver(obj, 'firstName', function () {
         firstNameDidChange++;
       });
-      addObserver(obj, 'lastName', function() {
+      addObserver(obj, 'lastName', function () {
         lastNameDidChange++;
       });
 
@@ -950,7 +950,7 @@ moduleFor(
       );
 
       let plusOneDidChange = 0;
-      addObserver(obj, 'plusOne', function() {
+      addObserver(obj, 'plusOne', function () {
         plusOneDidChange++;
       });
 
@@ -986,7 +986,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed(function() {
+        computed(function () {
           return 'foo';
         })
       );
@@ -1011,7 +1011,7 @@ moduleFor(
   'computed - readOnly',
   class extends ComputedTestCase {
     ['@test is chainable'](assert) {
-      let cp = computed(function() {});
+      let cp = computed(function () {});
       let readOnlyCp = cp.readOnly();
 
       assert.equal(cp, readOnlyCp);
@@ -1037,7 +1037,7 @@ moduleFor(
       defineProperty(
         obj,
         'bar',
-        computed(function() {
+        computed(function () {
           return 'barValue';
         }).readOnly()
       );
diff --git a/packages/@ember/-internals/metal/tests/events_test.js b/packages/@ember/-internals/metal/tests/events_test.js
index ef590183426..3db7f4065ad 100644
--- a/packages/@ember/-internals/metal/tests/events_test.js
+++ b/packages/@ember/-internals/metal/tests/events_test.js
@@ -97,7 +97,7 @@ moduleFor(
       sendEvent(obj, 'event!');
       assert.equal(target.count, 0, 'should invoke but do nothing');
 
-      target.method = function() {
+      target.method = function () {
         this.count++;
       };
       sendEvent(obj, 'event!');
@@ -107,7 +107,7 @@ moduleFor(
     ['@test calling sendEvent with extra params should be passed to listeners'](assert) {
       let obj = {};
       let params = null;
-      addListener(obj, 'event!', function() {
+      addListener(obj, 'event!', function () {
         params = Array.prototype.slice.call(arguments);
       });
 
@@ -141,11 +141,11 @@ moduleFor(
     ['@test a listener can be added as part of a mixin'](assert) {
       let triggered = 0;
       let MyMixin = Mixin.create({
-        foo1: on('bar', function() {
+        foo1: on('bar', function () {
           triggered++;
         }),
 
-        foo2: on('bar', function() {
+        foo2: on('bar', function () {
           triggered++;
         }),
       });
@@ -166,7 +166,7 @@ moduleFor(
 
       expectAssertion(() => {
         Mixin.create({
-          foo1: on(function() {}),
+          foo1: on(function () {}),
         });
       }, 'on called without valid event names');
     }
@@ -174,12 +174,12 @@ moduleFor(
     ['@test a listener added as part of a mixin may be overridden'](assert) {
       let triggered = 0;
       let FirstMixin = Mixin.create({
-        foo: on('bar', function() {
+        foo: on('bar', function () {
           triggered++;
         }),
       });
       let SecondMixin = Mixin.create({
-        foo: on('baz', function() {
+        foo: on('baz', function () {
           triggered++;
         }),
       });
diff --git a/packages/@ember/-internals/metal/tests/expand_properties_test.js b/packages/@ember/-internals/metal/tests/expand_properties_test.js
index 25186366fa8..aa83ea141b8 100644
--- a/packages/@ember/-internals/metal/tests/expand_properties_test.js
+++ b/packages/@ember/-internals/metal/tests/expand_properties_test.js
@@ -87,7 +87,7 @@ moduleFor(
         'model.{bar,baz',
       ];
 
-      nestedBraceProperties.forEach(invalidProperties => {
+      nestedBraceProperties.forEach((invalidProperties) => {
         expectAssertion(() => expandProperties(invalidProperties, addProperty));
       }, /Brace expanded properties have to be balanced and cannot be nested/);
     }
@@ -111,7 +111,7 @@ moduleFor(
     ['@test A pattern must not contain a space'](assert) {
       assert.expect(1);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         expandProperties('{a, b}', addProperty);
       }, /Brace expanded properties cannot contain spaces, e.g. "user.{firstName, lastName}" should be "user.{firstName,lastName}"/);
     }
diff --git a/packages/@ember/-internals/metal/tests/injected_property_test.js b/packages/@ember/-internals/metal/tests/injected_property_test.js
index 734ce2ed2cb..3bd93582b59 100644
--- a/packages/@ember/-internals/metal/tests/injected_property_test.js
+++ b/packages/@ember/-internals/metal/tests/injected_property_test.js
@@ -22,7 +22,7 @@ moduleFor(
       let obj = {};
       defineProperty(obj, 'foo', inject('type', 'name'));
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         get(obj, 'foo');
       }, /Attempting to lookup an injected property on an object without a container, ensure that the object was instantiated via a container./);
     }
diff --git a/packages/@ember/-internals/metal/tests/is_blank_test.js b/packages/@ember/-internals/metal/tests/is_blank_test.js
index e29e67710a6..c84a7bd9412 100644
--- a/packages/@ember/-internals/metal/tests/is_blank_test.js
+++ b/packages/@ember/-internals/metal/tests/is_blank_test.js
@@ -6,7 +6,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test isBlank'](assert) {
       let string = 'string';
-      let fn = function() {};
+      let fn = function () {};
       let object = { length: 0 };
 
       assert.equal(true, isBlank(null), 'for null');
diff --git a/packages/@ember/-internals/metal/tests/is_empty_test.js b/packages/@ember/-internals/metal/tests/is_empty_test.js
index b4c01b89ace..fc6c8106d71 100644
--- a/packages/@ember/-internals/metal/tests/is_empty_test.js
+++ b/packages/@ember/-internals/metal/tests/is_empty_test.js
@@ -6,7 +6,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test isEmpty'](assert) {
       let string = 'string';
-      let fn = function() {};
+      let fn = function () {};
       let object = { length: 0 };
 
       assert.equal(true, isEmpty(null), 'for null');
diff --git a/packages/@ember/-internals/metal/tests/is_none_test.js b/packages/@ember/-internals/metal/tests/is_none_test.js
index 1412ed38df2..b2be7c844e7 100644
--- a/packages/@ember/-internals/metal/tests/is_none_test.js
+++ b/packages/@ember/-internals/metal/tests/is_none_test.js
@@ -6,7 +6,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test isNone'](assert) {
       let string = 'string';
-      let fn = function() {};
+      let fn = function () {};
 
       assert.equal(true, isNone(null), 'for null');
       assert.equal(true, isNone(undefined), 'for undefined');
diff --git a/packages/@ember/-internals/metal/tests/is_present_test.js b/packages/@ember/-internals/metal/tests/is_present_test.js
index deac592c66b..00724568b0c 100644
--- a/packages/@ember/-internals/metal/tests/is_present_test.js
+++ b/packages/@ember/-internals/metal/tests/is_present_test.js
@@ -6,7 +6,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test isPresent'](assert) {
       let string = 'string';
-      let fn = function() {};
+      let fn = function () {};
       let object = { length: 0 };
 
       assert.equal(false, isPresent(), 'for no params');
diff --git a/packages/@ember/-internals/metal/tests/libraries_test.js b/packages/@ember/-internals/metal/tests/libraries_test.js
index c41800e97be..0241ccbb42c 100644
--- a/packages/@ember/-internals/metal/tests/libraries_test.js
+++ b/packages/@ember/-internals/metal/tests/libraries_test.js
@@ -72,7 +72,7 @@ moduleFor(
 
       libs.register('magic', 1.23);
 
-      setDebugFunction('warn', function(msg, test) {
+      setDebugFunction('warn', function (msg, test) {
         if (!test) {
           assert.equal(msg, 'Library "magic" is already registered with Ember.');
         }
diff --git a/packages/@ember/-internals/metal/tests/mixin/computed_test.js b/packages/@ember/-internals/metal/tests/mixin/computed_test.js
index 205e70b8a1c..9702066c9d6 100644
--- a/packages/@ember/-internals/metal/tests/mixin/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/computed_test.js
@@ -15,25 +15,25 @@ moduleFor(
       window.testStarted = true;
 
       MixinA = Mixin.create({
-        aProp: computed(function() {
+        aProp: computed(function () {
           return 'A';
         }),
       });
 
       MixinB = Mixin.create(MixinA, {
-        aProp: computed(function() {
+        aProp: computed(function () {
           return this._super(...arguments) + 'B';
         }),
       });
 
       MixinC = Mixin.create(MixinA, {
-        aProp: computed(function() {
+        aProp: computed(function () {
           return this._super(...arguments) + 'C';
         }),
       });
 
       MixinD = Mixin.create({
-        aProp: computed(function() {
+        aProp: computed(function () {
           return this._super(...arguments) + 'D';
         }),
       });
@@ -56,7 +56,7 @@ moduleFor(
       defineProperty(
         obj,
         'aProp',
-        computed(function() {
+        computed(function () {
           return 'obj';
         })
       );
@@ -137,7 +137,7 @@ moduleFor(
           },
         }),
 
-        cpWithoutSetter: computed(function() {
+        cpWithoutSetter: computed(function () {
           cpWasCalled = true;
         }),
       });
diff --git a/packages/@ember/-internals/metal/tests/mixin/introspection_test.js b/packages/@ember/-internals/metal/tests/mixin/introspection_test.js
index 83ce11febe1..bb15e9fb2ab 100644
--- a/packages/@ember/-internals/metal/tests/mixin/introspection_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/introspection_test.js
@@ -41,7 +41,7 @@ moduleFor(
 
     ['@test Ember.mixins()'](assert) {
       function mapGuids(ary) {
-        return ary.map(x => guidFor(x));
+        return ary.map((x) => guidFor(x));
       }
 
       assert.deepEqual(
diff --git a/packages/@ember/-internals/metal/tests/mixin/observer_test.js b/packages/@ember/-internals/metal/tests/mixin/observer_test.js
index fd21971bb98..21016807ac3 100644
--- a/packages/@ember/-internals/metal/tests/mixin/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/observer_test.js
@@ -19,7 +19,7 @@ moduleFor(
       let MyMixin = Mixin.create({
         count: 0,
 
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -37,7 +37,7 @@ moduleFor(
       let MyMixin = Mixin.create({
         count: 0,
 
-        foo: observer('bar', 'baz', function() {
+        foo: observer('bar', 'baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -61,13 +61,13 @@ moduleFor(
       let MyMixin = Mixin.create({
         count: 0,
 
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
 
       let Mixin2 = Mixin.create({
-        foo: observer('baz', function() {
+        foo: observer('baz', function () {
           set(this, 'count', get(this, 'count') + 10);
         }),
       });
@@ -92,7 +92,7 @@ moduleFor(
       let MyMixin = Mixin.create({
         count: 0,
         bar: obj2,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -111,7 +111,7 @@ moduleFor(
 
       let MyMixin = Mixin.create({
         count: 0,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
         bar: obj2,
@@ -131,7 +131,7 @@ moduleFor(
 
       let MyMixin = Mixin.create({
         count: 0,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -155,7 +155,7 @@ moduleFor(
 
       let MyMixin = Mixin.create({
         count: 0,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -175,7 +175,7 @@ moduleFor(
 
       let MyMixin = Mixin.create({
         count: 0,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -195,7 +195,7 @@ moduleFor(
 
       let MyMixin = Mixin.create({
         count: 0,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -217,7 +217,7 @@ moduleFor(
 
       let MyMixin = Mixin.create({
         count: 0,
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
diff --git a/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js b/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
index 114ee89fa39..e9f900e277e 100644
--- a/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
+++ b/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
@@ -148,7 +148,7 @@ let classes = [
   },
 ];
 
-classes.forEach(TestClass => {
+classes.forEach((TestClass) => {
   moduleFor(
     TestClass.module('@ember/-internals/metal/nativeDescDecorator'),
     class extends AbstractTestCase {
@@ -262,7 +262,7 @@ classes.forEach(TestClass => {
         factory.install(
           'foo',
           nativeDescDecorator({
-            get: function() {
+            get: function () {
               return this.__foo__;
             },
           }),
@@ -285,7 +285,7 @@ classes.forEach(TestClass => {
         factory.install(
           'foo',
           nativeDescDecorator({
-            set: function(value) {
+            set: function (value) {
               this.__foo__ = value;
             },
           }),
@@ -308,11 +308,11 @@ classes.forEach(TestClass => {
         factory.install(
           'foo',
           nativeDescDecorator({
-            get: function() {
+            get: function () {
               return this.__foo__;
             },
 
-            set: function(value) {
+            set: function (value) {
               this.__foo__ = value;
             },
           }),
@@ -324,11 +324,11 @@ classes.forEach(TestClass => {
         factory.install(
           'bar',
           nativeDescDecorator({
-            get: function() {
+            get: function () {
               return this.__bar__;
             },
 
-            set: function(value) {
+            set: function (value) {
               this.__bar__ = value;
             },
           }),
@@ -340,7 +340,7 @@ classes.forEach(TestClass => {
         factory.install(
           'fooBar',
           nativeDescDecorator({
-            get: function() {
+            get: function () {
               return this.foo + '-' + this.bar;
             },
           }),
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index 6ad6ff1b14e..135db852675 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -76,7 +76,7 @@ moduleFor(
       obj = {};
       let count = 0;
 
-      addObserver(obj, 'foo', function() {
+      addObserver(obj, 'foo', function () {
         assert.equal(get(obj, 'foo'), 'bar', 'should invoke AFTER value changed');
         count++;
       });
@@ -92,7 +92,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed('bar', function() {
+        computed('bar', function () {
           return get(this, 'bar').toUpperCase();
         })
       );
@@ -100,7 +100,7 @@ moduleFor(
       get(obj, 'foo');
 
       let count = 0;
-      addObserver(obj, 'foo', function() {
+      addObserver(obj, 'foo', function () {
         assert.equal(get(obj, 'foo'), 'BAZ', 'should have invoked after prop change');
         count++;
       });
@@ -130,7 +130,7 @@ moduleFor(
       get(obj, 'foo');
 
       let count = 0;
-      addObserver(obj, 'foo', function() {
+      addObserver(obj, 'foo', function () {
         assert.equal(get(obj, 'foo'), 'baz', 'should have invoked after prop change');
         count++;
       });
@@ -151,19 +151,19 @@ moduleFor(
       defineProperty(
         obj,
         'prop',
-        computed(function() {
+        computed(function () {
           return Math.random();
         })
       );
       defineProperty(
         obj,
         'anotherProp',
-        computed('prop', function() {
+        computed('prop', function () {
           return get(this, 'prop') + Math.random();
         })
       );
 
-      addObserver(obj, 'prop', function() {
+      addObserver(obj, 'prop', function () {
         observerCount++;
       });
 
@@ -186,7 +186,7 @@ moduleFor(
 
         expectDeprecation(() => {
           mixin(obj, {
-            observeFooAndBar: function() {
+            observeFooAndBar: function () {
               count++;
             }.observes('{foo,bar}'),
           });
@@ -221,7 +221,7 @@ moduleFor(
         defineProperty(
           obj,
           'foo',
-          computed('bar', function() {
+          computed('bar', function () {
             return get(this, 'bar').toLowerCase();
           })
         );
@@ -229,14 +229,14 @@ moduleFor(
         defineProperty(
           obj,
           'bar',
-          computed('baz', function() {
+          computed('baz', function () {
             return get(this, 'baz').toUpperCase();
           })
         );
 
         expectDeprecation(() => {
           mixin(obj, {
-            fooAndBarWatcher: function() {
+            fooAndBarWatcher: function () {
               count++;
             }.observes('{foo,bar}'),
           });
@@ -269,7 +269,7 @@ moduleFor(
       let count = 0;
 
       mixin(obj, {
-        observeFooAndBar: observer('{foo,bar}', function() {
+        observeFooAndBar: observer('{foo,bar}', function () {
           count++;
         }),
       });
@@ -299,7 +299,7 @@ moduleFor(
       defineProperty(
         obj,
         'foo',
-        computed('bar', function() {
+        computed('bar', function () {
           return get(this, 'bar').toLowerCase();
         })
       );
@@ -307,13 +307,13 @@ moduleFor(
       defineProperty(
         obj,
         'bar',
-        computed('baz', function() {
+        computed('baz', function () {
           return get(this, 'baz').toUpperCase();
         })
       );
 
       mixin(obj, {
-        fooAndBarWatcher: observer('{foo,bar}', function() {
+        fooAndBarWatcher: observer('{foo,bar}', function () {
           count++;
         }),
       });
@@ -385,7 +385,7 @@ moduleFor(
       obj = { foo: 'foo' };
       let fooCount = 0;
 
-      addObserver(obj, 'foo', function() {
+      addObserver(obj, 'foo', function () {
         fooCount++;
       });
 
@@ -510,11 +510,11 @@ moduleFor(
       let barObserved = 0;
 
       let MyMixin = Mixin.create({
-        foo1: observer('bar', function() {
+        foo1: observer('bar', function () {
           barObserved++;
         }),
 
-        foo2: observer('bar', function() {
+        foo2: observer('bar', function () {
           barObserved++;
         }),
       });
@@ -623,13 +623,13 @@ moduleFor(
       defineProperty(
         obj,
         'computed',
-        computed(function() {
+        computed(function () {
           return { foo: 'bar' };
         })
       );
 
       let changed = 0;
-      addObserver(obj, 'computed.foo', function() {
+      addObserver(obj, 'computed.foo', function () {
         changed++;
       });
 
@@ -647,7 +647,7 @@ moduleFor(
 
     async ['@test depending on a simple chain'](assert) {
       let val;
-      addObserver(obj, 'foo.bar.baz.biff', function(target, key) {
+      addObserver(obj, 'foo.bar.baz.biff', function (target, key) {
         val = get(target, key);
         count++;
       });
@@ -699,7 +699,7 @@ moduleFor(
     async ['@test depending on a chain with a capitalized first key'](assert) {
       let val;
 
-      addObserver(obj, 'Capital.foo.bar.baz.biff', function(target, key) {
+      addObserver(obj, 'Capital.foo.bar.baz.biff', function (target, key) {
         val = get(obj, key);
         count++;
       });
@@ -771,7 +771,7 @@ moduleFor(
       obj = { foo: 'bar' };
       let count = 0;
 
-      addObserver(obj, 'foo', function() {
+      addObserver(obj, 'foo', function () {
         count++;
       });
 
@@ -803,10 +803,10 @@ moduleFor(
         obj,
         'foo',
         computed('baz', {
-          get: function() {
+          get: function () {
             return get(this, 'baz');
           },
-          set: function(key, value) {
+          set: function (key, value) {
             return value;
           },
         })
@@ -814,7 +814,7 @@ moduleFor(
 
       let count = 0;
 
-      addObserver(obj, 'foo', function() {
+      addObserver(obj, 'foo', function () {
         count++;
       });
       set(obj, 'foo', 'bar');
@@ -1027,7 +1027,7 @@ moduleFor(
       removedBeforeFirstChangeObserver.add();
       removedBeforeLastChangeObserver.add();
       removedAfterLastChangeObserver.add();
-      changeProperties(function() {
+      changeProperties(function () {
         removedBeforeFirstChangeObserver.remove();
         addedBeforeFirstChangeObserver.add();
 
diff --git a/packages/@ember/-internals/metal/tests/performance_test.js b/packages/@ember/-internals/metal/tests/performance_test.js
index eca683e5e99..2de7fbb9afb 100644
--- a/packages/@ember/-internals/metal/tests/performance_test.js
+++ b/packages/@ember/-internals/metal/tests/performance_test.js
@@ -41,7 +41,7 @@ moduleFor(
       defineProperty(
         obj,
         'abc',
-        computed('a', 'b', 'c', function(key) {
+        computed('a', 'b', 'c', function (key) {
           cpCount++;
           return 'computed ' + key;
         })
@@ -51,7 +51,7 @@ moduleFor(
 
       cpCount = 0;
 
-      addObserver(obj, 'abc', function() {
+      addObserver(obj, 'abc', function () {
         obsCount++;
       });
 
@@ -79,12 +79,12 @@ moduleFor(
       defineProperty(
         obj.bar.baz,
         'bam',
-        computed(function() {
+        computed(function () {
           count++;
         })
       );
 
-      addObserver(obj, 'bar.baz.bam', function() {});
+      addObserver(obj, 'bar.baz.bam', function () {});
 
       notifyPropertyChange(get(obj, 'bar.baz'), 'bam');
 
diff --git a/packages/@ember/-internals/metal/tests/properties_test.js b/packages/@ember/-internals/metal/tests/properties_test.js
index a25a31006fe..74ada53512e 100644
--- a/packages/@ember/-internals/metal/tests/properties_test.js
+++ b/packages/@ember/-internals/metal/tests/properties_test.js
@@ -6,7 +6,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test toString'](assert) {
       let obj = {};
-      defineProperty(obj, 'toString', undefined, function() {
+      defineProperty(obj, 'toString', undefined, function () {
         return 'FOO';
       });
       assert.equal(obj.toString(), 'FOO', 'should replace toString');
diff --git a/packages/@ember/-internals/metal/tests/tracked/get_test.js b/packages/@ember/-internals/metal/tests/tracked/get_test.js
index 5a8dda09523..b05a6c1032c 100644
--- a/packages/@ember/-internals/metal/tests/tracked/get_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/get_test.js
@@ -1,7 +1,7 @@
 import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 import { get, getWithDefault, tracked } from '../..';
 
-let createObj = function() {
+let createObj = function () {
   class Obj {
     @tracked string = 'string';
     @tracked number = 23;
diff --git a/packages/@ember/-internals/metal/tests/tracked/validation_test.js b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
index 075a4df4785..e240efb1916 100644
--- a/packages/@ember/-internals/metal/tests/tracked/validation_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
@@ -212,7 +212,7 @@ moduleFor(
       defineProperty(
         EmberObject.prototype,
         'full',
-        computed('name.first', 'name.last', function() {
+        computed('name.first', 'name.last', function () {
           let name = get(this, 'name');
           return `${name.first} ${name.last}`;
         })
@@ -266,7 +266,7 @@ moduleFor(
       defineProperty(
         EmberObject.prototype,
         'full',
-        computed('contact.name.first', 'contact.name.last', function() {
+        computed('contact.name.first', 'contact.name.last', function () {
           let contact = get(self, 'contact');
           return `${get(contact.name, 'first')} ${get(contact.name, 'last')}`;
         })
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index fc0798cbff9..137b356c924 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -193,7 +193,7 @@ AutoLocation.reopen({
 });
 
 function delegateToConcreteImplementation(methodName: string) {
-  return function(this: AutoLocation, ...args: any[]) {
+  return function (this: AutoLocation, ...args: any[]) {
     let { concreteImplementation } = this;
     assert(
       "AutoLocation's detect() method should be called before calling any other hooks.",
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index d16a5823185..b5331d8cde4 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -125,7 +125,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
   */
   onUpdateURL(callback: UpdateCallback) {
     this._removeEventListener();
-    this._hashchangeHandler = bind(this, function(this: HashLocation) {
+    this._hashchangeHandler = bind(this, function (this: HashLocation) {
       let path = this.getURL();
       if (this.lastSetURL === path) {
         return;
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index a368f13b1b7..6594a5321ce 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -10,7 +10,7 @@ import { getHash } from './util';
 let popstateFired = false;
 
 function _uuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
     let r, v;
     r = (Math.random() * 16) | 0;
     v = c === 'x' ? r : (r & 3) | 8;
diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts
index fa3cf379fc6..10c0e3eb677 100644
--- a/packages/@ember/-internals/routing/lib/system/dsl.ts
+++ b/packages/@ember/-internals/routing/lib/system/dsl.ts
@@ -161,7 +161,7 @@ export default class DSLImpl implements DSL {
       this.route('index', { path: '/' });
     }
 
-    return match => {
+    return (match) => {
       for (let i = 0; i < dslMatches.length; i += 3) {
         match(dslMatches[i]).to(dslMatches[i + 1], dslMatches[i + 2]);
       }
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index b2d714b5a56..006e70f20b9 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2030,7 +2030,7 @@ function mergeEachQueryParams(controllerQP: {}, routeQP: {}) {
 }
 
 function addQueryParamsObservers(controller: any, propNames: string[]) {
-  propNames.forEach(prop => {
+  propNames.forEach((prop) => {
     if (descriptorForProperty(controller, prop) === undefined) {
       let desc = lookupDescriptor(controller, prop);
 
@@ -2277,7 +2277,7 @@ Route.reopen(ActionHandler, Evented, {
 
       @property _qp
     */
-  _qp: computed(function(this: Route) {
+  _qp: computed(function (this: Route) {
     let combinedQueryParameterConfiguration;
 
     let controllerName = this.controllerName || this.routeName;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index f3263962e72..4803cad7fd4 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -324,7 +324,7 @@ class EmberRouter extends EmberObject {
     dsl.route(
       'application',
       { path: '/', resetNamespace: true, overrideNameAssertion: true },
-      function() {
+      function () {
         for (let i = 0; i < dslCallbacks.length; i++) {
           dslCallbacks[i].call(this);
         }
@@ -1055,7 +1055,7 @@ class EmberRouter extends EmberObject {
 
         assert(
           `You passed the \`${presentProp}\` query parameter during a transition into ${qp.route.routeName}, please update to ${qp.urlKey}`,
-          (function() {
+          (function () {
             if (qp.urlKey === presentProp || qp.scopedPropertyName === presentProp) {
               return true;
             }
@@ -1796,7 +1796,7 @@ EmberRouter.reopen(Evented, {
    @type {String}
    @private
  */
-  url: computed(function(this: Router<Route>) {
+  url: computed(function (this: Router<Route>) {
     let location = get(this, 'location');
 
     if (typeof location === 'string') {
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index abc73af7c91..25b47e8d1d5 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -84,7 +84,7 @@ moduleFor(
 
       let concreteImplementation = get(location, 'concreteImplementation');
 
-      concreteImplementation.getURL = function() {
+      concreteImplementation.getURL = function () {
         return '/lincoln/park';
       };
 
@@ -246,18 +246,18 @@ moduleFor(
       location = createLocation(browserLocation);
       location.rootURL = 'app';
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         location.detect();
       }, expectedMsg);
 
       location.rootURL = '/app';
-      expectAssertion(function() {
+      expectAssertion(function () {
         location.detect();
       }, expectedMsg);
 
       // Note the trailing whitespace
       location.rootURL = '/app/ ';
-      expectAssertion(function() {
+      expectAssertion(function () {
         location.detect();
       }, expectedMsg);
     }
diff --git a/packages/@ember/-internals/routing/tests/location/hash_location_test.js b/packages/@ember/-internals/routing/tests/location/hash_location_test.js
index e34ec0b8daf..735b16be695 100644
--- a/packages/@ember/-internals/routing/tests/location/hash_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/hash_location_test.js
@@ -55,7 +55,7 @@ moduleFor(
   'HashLocation',
   class extends AbstractTestCase {
     teardown() {
-      run(function() {
+      run(function () {
         if (location) {
           location.destroy();
         }
@@ -148,7 +148,7 @@ moduleFor(
         assert
       );
 
-      let callback = function(param) {
+      let callback = function (param) {
         assert.equal(param, '/foo/bar', 'path is passed as param');
       };
 
@@ -170,7 +170,7 @@ moduleFor(
         assert
       );
 
-      let callback = function() {
+      let callback = function () {
         assert.ok(false, 'callback should not be called');
       };
 
@@ -190,7 +190,7 @@ moduleFor(
 
       createLocation({}, assert);
 
-      let callback = function() {
+      let callback = function () {
         assert.ok(true, 'should invoke callback once');
       };
 
diff --git a/packages/@ember/-internals/routing/tests/system/controller_for_test.js b/packages/@ember/-internals/routing/tests/system/controller_for_test.js
index 7954739e223..f2a3990ea1c 100644
--- a/packages/@ember/-internals/routing/tests/system/controller_for_test.js
+++ b/packages/@ember/-internals/routing/tests/system/controller_for_test.js
@@ -5,7 +5,7 @@ import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
 const originalDebug = getDebugFunction('debug');
-const noop = function() {};
+const noop = function () {};
 
 moduleFor(
   'controllerFor',
diff --git a/packages/@ember/-internals/routing/tests/system/dsl_test.js b/packages/@ember/-internals/routing/tests/system/dsl_test.js
index 92c7c5e0f1e..970dadc387d 100644
--- a/packages/@ember/-internals/routing/tests/system/dsl_test.js
+++ b/packages/@ember/-internals/routing/tests/system/dsl_test.js
@@ -21,11 +21,11 @@ moduleFor(
 
       assert.expect(reservedNames.length);
 
-      reservedNames.forEach(reservedName => {
+      reservedNames.forEach((reservedName) => {
         expectAssertion(() => {
           Router = EmberRouter.extend();
 
-          Router.map(function() {
+          Router.map(function () {
             this.route(reservedName);
           });
 
@@ -39,7 +39,7 @@ moduleFor(
       expectAssertion(() => {
         Router = EmberRouter.extend();
 
-        Router.map(function() {
+        Router.map(function () {
           this.route('resource/:id');
         });
 
@@ -49,9 +49,9 @@ moduleFor(
     }
 
     ['@test should retain resource namespace if nested with routes'](assert) {
-      Router = Router.map(function() {
-        this.route('bleep', function() {
-          this.route('bloop', function() {
+      Router = Router.map(function () {
+        this.route('bleep', function () {
+          this.route('bloop', function () {
             this.route('blork');
           });
         });
@@ -75,7 +75,7 @@ moduleFor(
     }
 
     ['@test should add loading and error routes if _isRouterMapResult is true'](assert) {
-      Router.map(function() {
+      Router.map(function () {
         this.route('blork');
       });
 
@@ -96,7 +96,7 @@ moduleFor(
     }
 
     ['@test should not add loading and error routes if _isRouterMapResult is false'](assert) {
-      Router.map(function() {
+      Router.map(function () {
         this.route('blork');
       });
 
@@ -117,8 +117,8 @@ moduleFor(
     ['@test should reset namespace of loading and error routes for routes with resetNamespace'](
       assert
     ) {
-      Router.map(function() {
-        this.route('blork', function() {
+      Router.map(function () {
+        this.route('blork', function () {
           this.route('blorp');
           this.route('bleep', { resetNamespace: true });
         });
@@ -167,9 +167,9 @@ moduleFor(
     }
 
     ['@test should throw an error when defining a route serializer outside an engine'](assert) {
-      Router.map(function() {
+      Router.map(function () {
         assert.throws(() => {
-          this.route('posts', { serialize: function() {} });
+          this.route('posts', { serialize: function () {} });
         }, /Defining a route serializer on route 'posts' outside an Engine is not allowed/);
       });
 
@@ -193,9 +193,9 @@ moduleFor(
     ['@test should allow mounting of engines'](assert) {
       assert.expect(3);
 
-      Router = Router.map(function() {
-        this.route('bleep', function() {
-          this.route('bloop', function() {
+      Router = Router.map(function () {
+        this.route('bleep', function () {
+          this.route('bloop', function () {
             this.mount('chat');
           });
         });
@@ -226,9 +226,9 @@ moduleFor(
     ['@test should allow mounting of engines at a custom path'](assert) {
       assert.expect(1);
 
-      Router = Router.map(function() {
-        this.route('bleep', function() {
-          this.route('bloop', function() {
+      Router = Router.map(function () {
+        this.route('bleep', function () {
+          this.route('bloop', function () {
             this.mount('chat', { path: 'custom-chat' });
           });
         });
@@ -245,7 +245,7 @@ moduleFor(
       assert.deepEqual(
         router._routerMicrolib.recognizer.names['bleep.bloop.chat'].segments
           .slice(1, 4)
-          .map(s => s.value),
+          .map((s) => s.value),
         ['bleep', 'bloop', 'custom-chat'],
         'segments are properly associated with mounted engine'
       );
@@ -254,9 +254,9 @@ moduleFor(
     ['@test should allow aliasing of engine names with `as`'](assert) {
       assert.expect(1);
 
-      Router = Router.map(function() {
-        this.route('bleep', function() {
-          this.route('bloop', function() {
+      Router = Router.map(function () {
+        this.route('bleep', function () {
+          this.route('bloop', function () {
             this.mount('chat', { as: 'blork' });
           });
         });
@@ -273,14 +273,14 @@ moduleFor(
       assert.deepEqual(
         router._routerMicrolib.recognizer.names['bleep.bloop.blork'].segments
           .slice(1, 4)
-          .map(s => s.value),
+          .map((s) => s.value),
         ['bleep', 'bloop', 'blork'],
         'segments are properly associated with mounted engine with aliased name'
       );
     }
 
     ['@test should add loading and error routes to a mount if _isRouterMapResult is true'](assert) {
-      Router.map(function() {
+      Router.map(function () {
         this.mount('chat');
       });
 
@@ -304,7 +304,7 @@ moduleFor(
     ['@test should add loading and error routes to a mount alias if _isRouterMapResult is true'](
       assert
     ) {
-      Router.map(function() {
+      Router.map(function () {
         this.mount('chat', { as: 'shoutbox' });
       });
 
@@ -331,7 +331,7 @@ moduleFor(
     ['@test should not add loading and error routes to a mount if _isRouterMapResult is false'](
       assert
     ) {
-      Router.map(function() {
+      Router.map(function () {
         this.mount('chat');
       });
 
@@ -357,8 +357,8 @@ moduleFor(
     ['@test should reset namespace of loading and error routes for mounts with resetNamespace'](
       assert
     ) {
-      Router.map(function() {
-        this.route('news', function() {
+      Router.map(function () {
+        this.route('news', function () {
           this.mount('chat');
           this.mount('blog', { resetNamespace: true });
         });
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index b29be0284b4..193cc254259 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -106,7 +106,7 @@ moduleFor(
 
       route = owner.lookup('route:index');
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         route.findModel('post', 1);
       }, 'Post has no method `find`.');
 
@@ -121,7 +121,7 @@ moduleFor(
 
       route = owner.lookup('route:index');
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         route.model({ post_id: 1 });
       }, /You used the dynamic segment post_id in your route undefined, but <Ember.Object:ember\d+>.Post did not exist and you did not override your route's `model` hook./);
 
@@ -137,7 +137,7 @@ moduleFor(
 
       route = owner.lookup('route:index');
 
-      ignoreAssertion(function() {
+      ignoreAssertion(function () {
         route.model({ post_id: 1 });
       });
 
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index 719358796e9..7d8716f8e78 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -50,7 +50,7 @@ moduleFor(
 
     ['@test [GH#15237] EmberError is imported correctly'](assert) {
       // If we get the right message it means Error is being imported correctly.
-      assert.throws(function() {
+      assert.throws(function () {
         triggerEvent(null, false, []);
       }, /because your app hasn't finished transitioning/);
     }
@@ -118,7 +118,7 @@ moduleFor(
       createRouter();
 
       function routePath() {
-        let routeInfos = Array.prototype.slice.call(arguments).map(function(s) {
+        let routeInfos = Array.prototype.slice.call(arguments).map(function (s) {
           return { name: s };
         });
         routeInfos.unshift({ name: 'ignored' });
@@ -275,11 +275,11 @@ moduleFor(
 
       router.currentRouteName = 'route-a';
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         router.transitionTo('route-b');
       }, "A transition was attempted from 'route-a' to 'route-b' but the application instance has already been destroyed.");
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         router.transitionTo('./route-b/1');
       }, "A transition was attempted from 'route-a' to './route-b/1' but the application instance has already been destroyed.");
     }
diff --git a/packages/@ember/-internals/runtime/lib/ext/function.js b/packages/@ember/-internals/runtime/lib/ext/function.js
index 0b499b461bf..93ced397442 100644
--- a/packages/@ember/-internals/runtime/lib/ext/function.js
+++ b/packages/@ember/-internals/runtime/lib/ext/function.js
@@ -78,7 +78,7 @@ if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
       configurable: true,
       enumerable: false,
       writable: true,
-      value: function() {
+      value: function () {
         deprecate(
           `Function prototype extensions have been deprecated, please migrate from function(){}.property('bar') to computed('bar', function() {}).`,
           false,
@@ -123,7 +123,7 @@ if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
       configurable: true,
       enumerable: false,
       writable: true,
-      value: function() {
+      value: function () {
         deprecate(
           `Function prototype extensions have been deprecated, please migrate from function(){}.observes('foo') to observer('foo', function() {}).`,
           false,
@@ -167,7 +167,7 @@ if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
       configurable: true,
       enumerable: false,
       writable: true,
-      value: function() {
+      value: function () {
         deprecate(
           `Function prototype extensions have been deprecated, please migrate from function(){}.on('foo') to on('foo', function() {}).`,
           false,
diff --git a/packages/@ember/-internals/runtime/lib/ext/rsvp.js b/packages/@ember/-internals/runtime/lib/ext/rsvp.js
index 4794f9bd364..e4cc58389a0 100644
--- a/packages/@ember/-internals/runtime/lib/ext/rsvp.js
+++ b/packages/@ember/-internals/runtime/lib/ext/rsvp.js
@@ -7,7 +7,7 @@ RSVP.configure('async', (callback, promise) => {
   backburner.schedule('actions', null, callback, promise);
 });
 
-RSVP.configure('after', cb => {
+RSVP.configure('after', (cb) => {
   backburner.schedule(_rsvpErrorQueue, null, cb);
 });
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
index a4ceff3a524..9184a071e11 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
@@ -54,7 +54,7 @@ export default Mixin.create({
     this._super(...arguments);
   },
 
-  isTruthy: computed('content', function() {
+  isTruthy: computed('content', function () {
     return Boolean(get(this, 'content'));
   }),
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index 22c6d8d49e6..4faaf32a745 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -31,16 +31,16 @@ import { typeOf } from '../type-of';
 
 const EMPTY_ARRAY = Object.freeze([]);
 
-const identityFunction = item => item;
+const identityFunction = (item) => item;
 
 export function uniqBy(array, key = identityFunction) {
   assert(`first argument passed to \`uniqBy\` should be array`, isArray(array));
 
   let ret = A();
   let seen = new Set();
-  let getter = typeof key === 'function' ? key : item => get(item, key);
+  let getter = typeof key === 'function' ? key : (item) => get(item, key);
 
-  array.forEach(item => {
+  array.forEach((item) => {
     let val = getter(item);
     if (!seen.has(val)) {
       seen.add(val);
@@ -53,7 +53,7 @@ export function uniqBy(array, key = identityFunction) {
 
 function iter(key, value) {
   let valueProvided = arguments.length === 2;
-  return valueProvided ? item => value === get(item, key) : item => Boolean(get(item, key));
+  return valueProvided ? (item) => value === get(item, key) : (item) => Boolean(get(item, key));
 }
 
 function findIndex(array, predicate, startAt) {
@@ -92,7 +92,7 @@ function indexOf(array, val, startAt = 0, withNaNCheck) {
   }
 
   // SameValueZero comparison (NaN !== NaN)
-  let predicate = withNaNCheck && val !== val ? item => item !== item : item => item === val;
+  let predicate = withNaNCheck && val !== val ? (item) => item !== item : (item) => item === val;
   return findIndex(array, predicate, startAt);
 }
 
@@ -176,7 +176,7 @@ function nonEnumerableComputed() {
 }
 
 function mapBy(key) {
-  return this.map(next => get(next, key));
+  return this.map((next) => get(next, key));
 }
 
 // ..........................................................
@@ -272,7 +272,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
    */
   objectsAt(indexes) {
-    return indexes.map(idx => objectAt(this, idx));
+    return indexes.map((idx) => objectAt(this, idx));
   },
 
   /**
@@ -324,7 +324,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Object | undefined} The first object in the array
     @public
   */
-  firstObject: nonEnumerableComputed(function() {
+  firstObject: nonEnumerableComputed(function () {
     return objectAt(this, 0);
   }).readOnly(),
 
@@ -335,7 +335,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Object | undefined} The last object in the array
     @public
   */
-  lastObject: nonEnumerableComputed(function() {
+  lastObject: nonEnumerableComputed(function () {
     return objectAt(this, this.length - 1);
   }).readOnly(),
 
@@ -774,7 +774,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   setEach(key, value) {
-    return this.forEach(item => set(item, key, value));
+    return this.forEach((item) => set(item, key, value));
   },
 
   /**
@@ -957,7 +957,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
   */
   reject(callback, target = null) {
     assert('`reject` expects a function as first argument.', typeof callback === 'function');
-    return this.filter(function() {
+    return this.filter(function () {
       return !callback.apply(target, arguments);
     });
   },
@@ -1307,7 +1307,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
 
     let ret = initialValue;
 
-    this.forEach(function(item, i) {
+    this.forEach(function (item, i) {
       ret = callback(ret, item, i, this);
     }, this);
 
@@ -1347,7 +1347,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
   invoke(methodName, ...args) {
     let ret = A();
 
-    this.forEach(item => ret.push(tryInvoke(item, methodName, args)));
+    this.forEach((item) => ret.push(tryInvoke(item, methodName, args)));
 
     return ret;
   },
@@ -1361,7 +1361,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   toArray() {
-    return this.map(item => item);
+    return this.map((item) => item);
   },
 
   /**
@@ -1377,7 +1377,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   compact() {
-    return this.filter(value => value != null);
+    return this.filter((value) => value != null);
   },
 
   /**
@@ -1519,7 +1519,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     }
 
     // SameValueZero comparison (NaN !== NaN)
-    let predicate = value === value ? item => item !== value : item => item === item;
+    let predicate = value === value ? (item) => item !== value : (item) => item === item;
     return this.filter(predicate);
   },
 });
@@ -1897,7 +1897,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
   */
   addObjects(objects) {
     beginPropertyChanges();
-    objects.forEach(obj => this.addObject(obj));
+    objects.forEach((obj) => this.addObject(obj));
     endPropertyChanges();
     return this;
   },
@@ -1974,7 +1974,7 @@ let NativeArray = Mixin.create(MutableArray, Observable, {
 
 // Remove any methods implemented natively so we don't override them
 const ignore = ['length'];
-NativeArray.keys().forEach(methodName => {
+NativeArray.keys().forEach((methodName) => {
   if (Array.prototype[methodName]) {
     ignore.push(methodName);
   }
@@ -1987,7 +1987,7 @@ let A;
 if (ENV.EXTEND_PROTOTYPES.Array) {
   NativeArray.apply(Array.prototype, true);
 
-  A = function(arr) {
+  A = function (arr) {
     assert(
       'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
       !(this instanceof A)
@@ -1996,7 +1996,7 @@ if (ENV.EXTEND_PROTOTYPES.Array) {
     return arr || [];
   };
 } else {
-  A = function(arr) {
+  A = function (arr) {
     assert(
       'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
       !(this instanceof A)
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js
index d3d3ce636d3..3a8d4a12d4f 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js
@@ -12,7 +12,7 @@ function tap(proxy, promise) {
   });
 
   return promise.then(
-    value => {
+    (value) => {
       if (!proxy.isDestroyed && !proxy.isDestroying) {
         setProperties(proxy, {
           content: value,
@@ -21,7 +21,7 @@ function tap(proxy, promise) {
       }
       return value;
     },
-    reason => {
+    (reason) => {
       if (!proxy.isDestroyed && !proxy.isDestroying) {
         setProperties(proxy, {
           reason,
@@ -115,7 +115,7 @@ export default Mixin.create({
     @default true
     @public
   */
-  isPending: computed('isSettled', function() {
+  isPending: computed('isSettled', function () {
     return !get(this, 'isSettled');
   }).readOnly(),
 
@@ -126,7 +126,7 @@ export default Mixin.create({
     @default false
     @public
   */
-  isSettled: computed('isRejected', 'isFulfilled', function() {
+  isSettled: computed('isRejected', 'isFulfilled', function () {
     return get(this, 'isRejected') || get(this, 'isFulfilled');
   }).readOnly(),
 
@@ -217,7 +217,7 @@ export default Mixin.create({
 });
 
 function promiseAlias(name) {
-  return function() {
+  return function () {
     let promise = get(this, 'promise');
     return promise[name](...arguments);
   };
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
index dbd836b9710..da3e416ef17 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
@@ -259,7 +259,7 @@ export default Mixin.create({
 });
 
 function registryAlias(name) {
-  return function() {
+  return function () {
     return this.__registry__[name](...arguments);
   };
 }
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
index f7d1f0687d2..963328915c1 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
@@ -22,7 +22,7 @@ export default Mixin.create({
   action: null,
   actionContext: null,
 
-  actionContextObject: computed('actionContext', function() {
+  actionContextObject: computed('actionContext', function () {
     let actionContext = get(this, 'actionContext');
 
     if (typeof actionContext === 'string') {
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index c93f6a9e959..0db14072c9b 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -1070,7 +1070,7 @@ if (DEBUG) {
     @return {Object} Hash of all lazy injected property keys to container names
     @private
   */
-  CoreObject._lazyInjections = function() {
+  CoreObject._lazyInjections = function () {
     let injections = {};
     let proto = this.proto();
     let key;
diff --git a/packages/@ember/-internals/runtime/tests/array/any-test.js b/packages/@ember/-internals/runtime/tests/array/any-test.js
index 01c7a17351e..54e50ca2a88 100644
--- a/packages/@ember/-internals/runtime/tests/array/any-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/any-test.js
@@ -9,7 +9,7 @@ class AnyTests extends AbstractTestCase {
     let found = [];
     let result;
 
-    result = obj.any(function(i) {
+    result = obj.any(function (i) {
       found.push(i);
       return false;
     });
@@ -26,7 +26,7 @@ class AnyTests extends AbstractTestCase {
     let found = [];
     let result;
 
-    result = obj.any(function(i) {
+    result = obj.any(function (i) {
       found.push(i);
       return --cnt <= 0;
     });
@@ -39,7 +39,7 @@ class AnyTests extends AbstractTestCase {
     let obj = emberA([0, 1, 2]);
     let result;
 
-    result = obj.any(i => Boolean(i));
+    result = obj.any((i) => Boolean(i));
     this.assert.equal(result, true, 'return value of obj.any');
   }
 
diff --git a/packages/@ember/-internals/runtime/tests/array/every-test.js b/packages/@ember/-internals/runtime/tests/array/every-test.js
index ea3e3cca3b4..53d8e0a7032 100644
--- a/packages/@ember/-internals/runtime/tests/array/every-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/every-test.js
@@ -9,7 +9,7 @@ class EveryTest extends AbstractTestCase {
     let found = [];
     let result;
 
-    result = obj.every(function(i) {
+    result = obj.every(function (i) {
       found.push(i);
       return true;
     });
@@ -25,7 +25,7 @@ class EveryTest extends AbstractTestCase {
     let found = [];
     let result;
 
-    result = obj.every(function(i) {
+    result = obj.every(function (i) {
       found.push(i);
       return --cnt > 0;
     });
diff --git a/packages/@ember/-internals/runtime/tests/array/filter-test.js b/packages/@ember/-internals/runtime/tests/array/filter-test.js
index d5d133a31cb..610a2bb8798 100644
--- a/packages/@ember/-internals/runtime/tests/array/filter-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/filter-test.js
@@ -11,7 +11,7 @@ class FilterTest extends AbstractTestCase {
     let result;
 
     // return true on all but the last two
-    result = obj.filter(function(i) {
+    result = obj.filter(function (i) {
       found.push(i);
       return --cnt >= 0;
     });
diff --git a/packages/@ember/-internals/runtime/tests/array/find-test.js b/packages/@ember/-internals/runtime/tests/array/find-test.js
index 035774e137a..c1c6c8a1da3 100644
--- a/packages/@ember/-internals/runtime/tests/array/find-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/find-test.js
@@ -9,7 +9,7 @@ class FindTests extends AbstractTestCase {
     let found = [];
     let result;
 
-    result = obj.find(function(i) {
+    result = obj.find(function (i) {
       found.push(i);
       return false;
     });
@@ -25,7 +25,7 @@ class FindTests extends AbstractTestCase {
     let found = [];
     let result;
 
-    result = obj.find(function(i) {
+    result = obj.find(function (i) {
       found.push(i);
       return --cnt >= 0;
     });
diff --git a/packages/@ember/-internals/runtime/tests/array/forEach-test.js b/packages/@ember/-internals/runtime/tests/array/forEach-test.js
index 7f9ac03117a..062a1302c36 100644
--- a/packages/@ember/-internals/runtime/tests/array/forEach-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/forEach-test.js
@@ -9,7 +9,7 @@ class ForEachTests extends AbstractTestCase {
     let ary = this.toArray(obj);
     let found = [];
 
-    obj.forEach(i => found.push(i));
+    obj.forEach((i) => found.push(i));
     this.assert.deepEqual(found, ary, 'items passed during forEach should match');
   }
 
@@ -23,14 +23,14 @@ class ForEachTests extends AbstractTestCase {
     let ary = this.toArray(obj);
     let found = [];
 
-    obj.forEach(i => found.push(i));
+    obj.forEach((i) => found.push(i));
     this.assert.deepEqual(found, ary, 'items passed during forEach should match');
 
     this.mutate(obj);
     ary = this.toArray(obj);
     found = [];
 
-    obj.forEach(i => found.push(i));
+    obj.forEach((i) => found.push(i));
     this.assert.deepEqual(found, ary, 'items passed during forEach should match');
   }
 
diff --git a/packages/@ember/-internals/runtime/tests/array/lastObject-test.js b/packages/@ember/-internals/runtime/tests/array/lastObject-test.js
index 4bb80e5d51f..94c4c9ef98d 100644
--- a/packages/@ember/-internals/runtime/tests/array/lastObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/lastObject-test.js
@@ -22,7 +22,7 @@ class LastObjectTests extends AbstractTestCase {
 
     this.assert.equal(get(obj, 'lastObject'), ary[ary.length - 1]);
 
-    this.assert.throws(function() {
+    this.assert.throws(function () {
       set(obj, 'lastObject', 'foo!');
     }, /Cannot set read-only property "lastObject" on object/);
   }
diff --git a/packages/@ember/-internals/runtime/tests/array/map-test.js b/packages/@ember/-internals/runtime/tests/array/map-test.js
index 691ead7d720..bb1ff9f1202 100644
--- a/packages/@ember/-internals/runtime/tests/array/map-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/map-test.js
@@ -3,7 +3,7 @@ import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 import { get } from '@ember/-internals/metal';
 
-const mapFunc = item => (item ? item.toString() : null);
+const mapFunc = (item) => (item ? item.toString() : null);
 
 class MapTests extends AbstractTestCase {
   '@test map should iterate over list'() {
diff --git a/packages/@ember/-internals/runtime/tests/array/reject-test.js b/packages/@ember/-internals/runtime/tests/array/reject-test.js
index 64f8c1ece78..aa9c9687919 100644
--- a/packages/@ember/-internals/runtime/tests/array/reject-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/reject-test.js
@@ -7,13 +7,13 @@ class RejectTest extends AbstractTestCase {
     let obj = this.newObject([1, 2, 3, 4]);
     let result;
 
-    result = obj.reject(i => i < 3);
+    result = obj.reject((i) => i < 3);
     this.assert.deepEqual(result, [3, 4], 'reject the correct items');
   }
 
   '@test should be the inverse of filter'() {
     let obj = this.newObject([1, 2, 3, 4]);
-    let isEven = i => i % 2 === 0;
+    let isEven = (i) => i % 2 === 0;
     let filtered, rejected;
 
     filtered = obj.filter(isEven);
diff --git a/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js b/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js
index 5ec51e9c270..4c8663f0f3a 100644
--- a/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/uniqBy-test.js
@@ -21,7 +21,7 @@ class UniqByTests extends AbstractTestCase {
       { id: 1, value: 'doom' },
     ]);
 
-    let keyFunction = val => {
+    let keyFunction = (val) => {
       this.assert.equal(arguments.length, 1);
       return val.value;
     };
diff --git a/packages/@ember/-internals/runtime/tests/core/compare_test.js b/packages/@ember/-internals/runtime/tests/core/compare_test.js
index b34cffa1c61..b2ca1869d2d 100644
--- a/packages/@ember/-internals/runtime/tests/core/compare_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/compare_test.js
@@ -30,7 +30,7 @@ moduleFor(
       data[10] = [1, 3];
       data[11] = { a: 'hash' };
       data[12] = EmberObject.create();
-      data[13] = function(a) {
+      data[13] = function (a) {
         return a;
       };
       data[14] = new Date('2012/01/01');
diff --git a/packages/@ember/-internals/runtime/tests/core/is_array_test.js b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
index 3614d993eab..748b14520b6 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_array_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
@@ -17,8 +17,8 @@ moduleFor(
       let object = {};
       let length = { length: 12 };
       let strangeLength = { length: 'yes' };
-      let fn = function() {};
-      let asyncFn = async function() {};
+      let fn = function () {};
+      let asyncFn = async function () {};
       let arrayProxy = ArrayProxy.create({ content: emberA() });
 
       assert.equal(isArray(numarray), true, '[1,2,3]');
diff --git a/packages/@ember/-internals/runtime/tests/core/type_of_test.js b/packages/@ember/-internals/runtime/tests/core/type_of_test.js
index 8b934d6153a..a74716c0118 100644
--- a/packages/@ember/-internals/runtime/tests/core/type_of_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/type_of_test.js
@@ -7,7 +7,7 @@ moduleFor(
   'Ember Type Checking',
   class extends AbstractTestCase {
     ['@test Ember.typeOf'](assert) {
-      let MockedDate = function() {};
+      let MockedDate = function () {};
       MockedDate.prototype = new Date();
 
       let mockedDate = new MockedDate();
diff --git a/packages/@ember/-internals/runtime/tests/ext/function_test.js b/packages/@ember/-internals/runtime/tests/ext/function_test.js
index f2059da1930..139a0268508 100644
--- a/packages/@ember/-internals/runtime/tests/ext/function_test.js
+++ b/packages/@ember/-internals/runtime/tests/ext/function_test.js
@@ -23,7 +23,7 @@ moduleFor(
         MyMixin = Mixin.create({
           count: 0,
 
-          foo: function() {
+          foo: function () {
             set(this, 'count', get(this, 'count') + 1);
           }.observes('bar', 'baz'),
         });
@@ -62,7 +62,7 @@ moduleFor(
         MyMixin = Mixin.create({
           count: 0,
 
-          foo: function() {
+          foo: function () {
             set(this, 'count', get(this, 'count') + 1);
           }.on('bar', 'baz'),
         });
@@ -83,11 +83,11 @@ moduleFor(
       }
 
       let MyMixin;
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         MyMixin = Mixin.create({
           count: 0,
           bay: 'bay',
-          foo: function() {
+          foo: function () {
             set(this, 'count', get(this, 'count') + 1);
           }
             .observes('bay')
@@ -122,11 +122,11 @@ moduleFor(
       }
 
       let MyClass;
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         MyClass = EmberObject.extend({
           firstName: null,
           lastName: null,
-          fullName: function() {
+          fullName: function () {
             return get(this, 'firstName') + ' ' + get(this, 'lastName');
           }.property('firstName', 'lastName'),
         });
diff --git a/packages/@ember/-internals/runtime/tests/ext/rsvp_test.js b/packages/@ember/-internals/runtime/tests/ext/rsvp_test.js
index cc77588ca87..e08c9c4778c 100644
--- a/packages/@ember/-internals/runtime/tests/ext/rsvp_test.js
+++ b/packages/@ember/-internals/runtime/tests/ext/rsvp_test.js
@@ -17,8 +17,8 @@ moduleFor(
       let error = new Error('Error thrown in a promise for testing purposes.');
 
       try {
-        run(function() {
-          new RSVP.Promise(function() {
+        run(function () {
+          new RSVP.Promise(function () {
             throw error;
           });
         });
@@ -75,7 +75,7 @@ moduleFor(
 
       try {
         setTesting(false);
-        setOnerror(error => {
+        setOnerror((error) => {
           assert.equal(error, actualError, 'expected the real error on the jqXHR');
           assert.equal(
             error.__reason_with_error_thrown__,
@@ -106,7 +106,7 @@ moduleFor(
 
       try {
         setTesting(false);
-        setOnerror(error => {
+        setOnerror((error) => {
           assert.equal(error.message, actualError, 'expected the real error on the jqXHR');
           assert.equal(
             error.__reason_with_error_thrown__,
@@ -135,7 +135,7 @@ moduleFor(
 
       try {
         setTesting(false);
-        setOnerror(error => {
+        setOnerror((error) => {
           assert.equal(error.message, 'a fail');
           assert.ok(JSON.stringify(error), 'Error can be serialized');
         });
@@ -155,7 +155,7 @@ moduleFor(
 
 const reason = 'i failed';
 function ajax() {
-  return new RSVP.Promise(function(resolve) {
+  return new RSVP.Promise(function (resolve) {
     setTimeout(resolve, 0); // fake true / foreign async
   });
 }
@@ -164,32 +164,32 @@ moduleFor(
   'Ember.test: rejection assertions',
   class extends AbstractTestCase {
     ['@test unambigiously unhandled rejection'](assert) {
-      assert.throws(function() {
-        run(function() {
+      assert.throws(function () {
+        run(function () {
           RSVP.Promise.reject(reason);
         }); // something is funky, we should likely assert
       }, reason);
     }
 
     ['@test sync handled'](assert) {
-      run(function() {
-        RSVP.Promise.reject(reason).catch(function() {});
+      run(function () {
+        RSVP.Promise.reject(reason).catch(function () {});
       }); // handled, we shouldn't need to assert.
       assert.ok(true, 'reached end of test');
     }
 
     ['@test handled within the same micro-task (via Ember.RVP.Promise)'](assert) {
-      run(function() {
+      run(function () {
         let rejection = RSVP.Promise.reject(reason);
-        RSVP.Promise.resolve(1).then(() => rejection.catch(function() {}));
+        RSVP.Promise.resolve(1).then(() => rejection.catch(function () {}));
       }); // handled, we shouldn't need to assert.
       assert.ok(true, 'reached end of test');
     }
 
     ['@test handled within the same micro-task (via direct run-loop)'](assert) {
-      run(function() {
+      run(function () {
         let rejection = RSVP.Promise.reject(reason);
-        schedule('afterRender', () => rejection.catch(function() {}));
+        schedule('afterRender', () => rejection.catch(function () {}));
       }); // handled, we shouldn't need to assert.
       assert.ok(true, 'reached end of test');
     }
@@ -198,12 +198,12 @@ moduleFor(
       assert.expect(2);
       let done = assert.async();
 
-      assert.throws(function() {
-        run(function() {
+      assert.throws(function () {
+        run(function () {
           let rejection = RSVP.Promise.reject(reason);
 
           next(() => {
-            rejection.catch(function() {});
+            rejection.catch(function () {});
             assert.ok(true, 'reached end of test');
             done();
           });
@@ -222,9 +222,9 @@ moduleFor(
           return RSVP.Promise.resolve(1);
         },
       };
-      run(function() {
+      run(function () {
         let rejection = RSVP.Promise.reject(reason);
-        store.find('user', 1).then(() => rejection.catch(function() {}));
+        store.find('user', 1).then(() => rejection.catch(function () {}));
       });
 
       assert.ok(true, 'reached end of test');
@@ -239,11 +239,11 @@ moduleFor(
           return ajax();
         },
       };
-      assert.throws(function() {
-        run(function() {
+      assert.throws(function () {
+        run(function () {
           let rejection = RSVP.Promise.reject(reason);
           store.find('user', 1).then(() => {
-            rejection.catch(function() {});
+            rejection.catch(function () {});
             assert.ok(true, 'reached end of test');
             done();
           });
@@ -254,11 +254,11 @@ moduleFor(
     ['@test handled in the next microTask queue flush (ajax example)'](assert) {
       let done = assert.async();
 
-      assert.throws(function() {
-        run(function() {
+      assert.throws(function () {
+        run(function () {
           let rejection = RSVP.Promise.reject(reason);
           ajax().then(() => {
-            rejection.catch(function() {});
+            rejection.catch(function () {});
             assert.ok(true, 'reached end of test');
             done();
           });
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index 482e5f2593f..3efb0459c5f 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -228,7 +228,7 @@ const TestArray = EmberObject.extend(EmberArray, {
     return this._content[idx];
   },
 
-  length: computed(function() {
+  length: computed(function () {
     return this._content.length;
   }),
 });
@@ -262,7 +262,7 @@ const TestMutableArray = EmberObject.extend(MutableArray, {
     return this._content[idx];
   },
 
-  length: computed(function() {
+  length: computed(function () {
     return this._content.length;
   }),
 
@@ -305,7 +305,7 @@ class EmberArrayHelpers extends MutableArrayHelpers {
 
 export function runArrayTests(name, Tests, ...types) {
   if (types.length > 0) {
-    types.forEach(type => {
+    types.forEach((type) => {
       switch (type) {
         case 'ArrayProxy':
           moduleFor(`ArrayProxy: ${name}`, Tests, ArrayProxyHelpers);
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
index 3f3fc3d2d9c..b18523c2b0b 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
@@ -32,7 +32,7 @@ moduleFor(
       set(momma, 'children', emberA([child1, child2, child3]));
 
       let observerFiredCount = 0;
-      addObserver(family, 'momma.children.@each.name', this, function() {
+      addObserver(family, 'momma.children.@each.name', this, function () {
         observerFiredCount++;
       });
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
index 499f2984823..8f7aff2389e 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
@@ -40,13 +40,13 @@ const originalLookup = context.lookup;
 class ObservableTestCase extends AbstractTestCase {
   afterEach() {
     let destroyables = [object, objectA, objectB, objectC, objectD, objectE, objectF].filter(
-      obj => obj && obj.destroy
+      (obj) => obj && obj.destroy
     );
 
     object = objectA = objectC = objectD = objectE = objectF = undefined;
     context.lookup = originalLookup;
     lookup = undefined;
-    destroyables.forEach(obj => obj.destroy());
+    destroyables.forEach((obj) => obj.destroy());
     return runLoopSettled();
   }
 }
@@ -60,7 +60,7 @@ moduleFor(
   class extends ObservableTestCase {
     beforeEach() {
       object = ObservableObject.extend(Observable, {
-        computed: computed(function() {
+        computed: computed(function () {
           return 'value';
         }),
         method() {
@@ -109,7 +109,7 @@ moduleFor(
   class extends ObservableTestCase {
     beforeEach() {
       objectA = ObservableObject.extend({
-        computed: computed(function() {
+        computed: computed(function () {
           return 'value';
         }),
         method() {
@@ -163,7 +163,7 @@ moduleFor(
     }
 
     ['@test raise if the provided object is undefined']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         get(undefined, 'key');
       }, /Cannot call get with 'key' on an undefined object/i);
     }
@@ -176,7 +176,7 @@ moduleFor(
     ['@test should return a property at a given path relative to the passed object'](assert) {
       let foo = ObservableObject.create({
         bar: ObservableObject.extend({
-          baz: computed(function() {
+          baz: computed(function () {
             return 'blargh';
           }),
         }).create(),
@@ -315,7 +315,7 @@ moduleFor(
               this.computedCachedCalls.push('getter-called');
               return 'computedCached';
             },
-            set: function(key, value) {
+            set: function (key, value) {
               this.computedCachedCalls.push(value);
             },
           }),
@@ -348,11 +348,11 @@ moduleFor(
             },
           }),
 
-          inc: computed('changer', function() {
+          inc: computed('changer', function () {
             return this.incCallCount++;
           }),
 
-          nestedInc: computed('inc', function() {
+          nestedInc: computed('inc', function () {
             get(this, 'inc');
             return this.nestedIncCallCount++;
           }),
@@ -394,17 +394,17 @@ moduleFor(
       // get each property twice. Verify return.
       let keys = w('computed computedCached dependent dependentFront dependentCached');
 
-      keys.forEach(function(key) {
+      keys.forEach(function (key) {
         assert.equal(object.get(key), key, `Try #1: object.get(${key}) should run function`);
         assert.equal(object.get(key), key, `Try #2: object.get(${key}) should run function`);
       });
 
       // verify each call count.  cached should only be called once
-      w('computedCalls dependentFrontCalls dependentCalls').forEach(key => {
+      w('computedCalls dependentFrontCalls dependentCalls').forEach((key) => {
         assert.equal(object[key].length, 2, `non-cached property ${key} should be called 2x`);
       });
 
-      w('computedCachedCalls dependentCachedCalls').forEach(key => {
+      w('computedCachedCalls dependentCachedCalls').forEach((key) => {
         assert.equal(object[key].length, 1, `non-cached property ${key} should be called 1x`);
       });
     }
@@ -414,7 +414,7 @@ moduleFor(
       let keys = w('computed dependent dependentFront computedCached dependentCached');
       let values = w('value1 value2');
 
-      keys.forEach(key => {
+      keys.forEach((key) => {
         assert.equal(
           object.set(key, values[0]),
           values[0],
@@ -435,7 +435,7 @@ moduleFor(
       });
 
       // verify each call count.  cached should only be called once
-      keys.forEach(key => {
+      keys.forEach((key) => {
         let calls = object[key + 'Calls'];
         let idx, expectedLength;
 
@@ -524,7 +524,7 @@ moduleFor(
       assert.equal(object.get('inc'), ret1, 'multiple calls should not run cached prop');
 
       // add observer to verify change...
-      object.addObserver('inc', this, function() {
+      object.addObserver('inc', this, function () {
         assert.equal(object.get('inc'), ret1 + 1, 'should increment after dependent key changes'); // should run again
       });
 
@@ -547,7 +547,7 @@ moduleFor(
 
     ['@test dependent keys should be able to be specified as property paths'](assert) {
       let depObj = ObservableObject.extend({
-        menuPrice: computed('menu.price', function() {
+        menuPrice: computed('menu.price', function () {
           return this.get('menu.price');
         }),
       }).create({
@@ -572,9 +572,9 @@ moduleFor(
 
       let DepObj;
 
-      run(function() {
+      run(function () {
         lookup.DepObj = DepObj = ObservableObject.extend({
-          price: computed('restaurant.menu.price', function() {
+          price: computed('restaurant.menu.price', function () {
             return this.get('restaurant.menu.price');
           }),
         }).create({
@@ -588,7 +588,7 @@ moduleFor(
 
       assert.equal(DepObj.get('price'), 5, 'precond - computed property is correct');
 
-      run(function() {
+      run(function () {
         DepObj.set('restaurant.menu.price', 10);
       });
       assert.equal(
@@ -597,7 +597,7 @@ moduleFor(
         'cacheable computed properties are invalidated even if no run loop occurred'
       );
 
-      run(function() {
+      run(function () {
         DepObj.set('restaurant.menu.price', 20);
       });
       assert.equal(
@@ -611,7 +611,7 @@ moduleFor(
         'precond - computed properties remain correct after a run loop'
       );
 
-      run(function() {
+      run(function () {
         DepObj.set(
           'restaurant.menu',
           ObservableObject.create({
@@ -626,7 +626,7 @@ moduleFor(
         'cacheable computed properties are invalidated after a middle property changes'
       );
 
-      run(function() {
+      run(function () {
         DepObj.set(
           'restaurant.menu',
           ObservableObject.create({
@@ -666,11 +666,11 @@ moduleFor(
           this.abnormal = 'changedValueObserved';
         },
 
-        testObserver: observer('normal', function() {
+        testObserver: observer('normal', function () {
           this.abnormal = 'removedObserver';
         }),
 
-        testArrayObserver: observer('normalArray.[]', function() {
+        testArrayObserver: observer('normalArray.[]', function () {
           this.abnormal = 'notifiedObserver';
         }),
       }).create({
@@ -701,15 +701,15 @@ moduleFor(
       newValue = object.incrementProperty('numberVal', 0);
       assert.equal(25, newValue, 'zero numerical value incremented by specified increment');
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         newValue = object.incrementProperty('numberVal', 0 - void 0); // Increment by NaN
       }, /Must pass a numeric value to incrementProperty/i);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         newValue = object.incrementProperty('numberVal', 'Ember'); // Increment by non-numeric String
       }, /Must pass a numeric value to incrementProperty/i);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         newValue = object.incrementProperty('numberVal', 1 / 0); // Increment by Infinity
       }, /Must pass a numeric value to incrementProperty/i);
 
@@ -729,15 +729,15 @@ moduleFor(
       newValue = object.decrementProperty('numberVal', 0);
       assert.equal(25, newValue, 'zero numerical value decremented by specified increment');
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         newValue = object.decrementProperty('numberVal', 0 - void 0); // Decrement by NaN
       }, /Must pass a numeric value to decrementProperty/i);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         newValue = object.decrementProperty('numberVal', 'Ember'); // Decrement by non-numeric String
       }, /Must pass a numeric value to decrementProperty/i);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         newValue = object.decrementProperty('numberVal', 1 / 0); // Decrement by Infinity
       }, /Must pass a numeric value to decrementProperty/i);
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index 8e7d9e3759d..ca46d2af4e5 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -45,7 +45,7 @@ const TestArray = EmberObject.extend(EmberArray, {
     return this._content[idx];
   },
 
-  length: computed(function() {
+  length: computed(function () {
     return this._content.length;
   }),
 });
@@ -102,7 +102,7 @@ moduleFor(
   class extends AbstractTestCase {
     async ['@test should notify observers of []'](assert) {
       obj = DummyArray.extend({
-        enumerablePropertyDidChange: emberObserver('[]', function() {
+        enumerablePropertyDidChange: emberObserver('[]', function () {
           this._count++;
         }),
       }).create({
@@ -134,7 +134,7 @@ moduleFor(
   class extends AbstractTestCase {
     beforeEach(assert) {
       obj = DummyArray.extend({
-        lengthDidChange: emberObserver('length', function() {
+        lengthDidChange: emberObserver('length', function () {
           this._after++;
         }),
       }).create({
@@ -362,7 +362,7 @@ moduleFor(
           set(this, 'resources', emberA());
         },
 
-        common: computed('resources.@each.common', function() {
+        common: computed('resources.@each.common', function () {
           return get(objectAt(get(this, 'resources'), 0), 'common');
         }),
       }).create();
diff --git a/packages/@ember/-internals/runtime/tests/mixins/evented_test.js b/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
index 424ca7c3086..5d621974688 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
@@ -12,7 +12,7 @@ moduleFor(
         },
       }).create();
 
-      let noop = function() {};
+      let noop = function () {};
 
       eventedProxyObj.on('foo', noop);
       eventedProxyObj.off('foo', noop);
diff --git a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
index 7672bc43344..70fdf9a7d99 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
@@ -86,7 +86,7 @@ moduleFor(
       assert
     ) {
       let obj = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'foo';
         }),
       }).create({
diff --git a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
index 8f731019ab9..794f70f0b77 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
@@ -29,12 +29,12 @@ moduleFor(
     ['@test no promise, invoking then should raise'](assert) {
       proxy = ObjectPromiseProxy.create();
 
-      assert.throws(function() {
+      assert.throws(function () {
         proxy.then(
-          function() {
+          function () {
             return this;
           },
-          function() {
+          function () {
             return this;
           }
         );
@@ -556,7 +556,7 @@ moduleFor(
       });
 
       proxy.then(
-        value => {
+        (value) => {
           receivedValue = value;
           didResolveCount++;
         },
@@ -589,7 +589,7 @@ moduleFor(
 
       proxy.then(
         () => {},
-        reason => {
+        (reason) => {
           receivedReason = reason;
           didRejectCount++;
         }
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js
index 86023cf246a..4f85abb50e6 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js
@@ -169,7 +169,7 @@ class InsertAtTests extends AbstractTestCase {
     let objectAtCalls = [];
 
     let objectAt = obj.objectAt;
-    obj.objectAt = ix => {
+    obj.objectAt = (ix) => {
       objectAtCalls.push(ix);
       return objectAt.call(obj, ix);
     };
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
index db21599d8e3..8d684149895 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
@@ -38,7 +38,7 @@ class ReplaceTests extends AbstractTestCase {
     let called = 0;
     exp = newFixture(1);
     obj = this.newObject([]);
-    obj.objectAt = function() {
+    obj.objectAt = function () {
       called++;
     };
     observer = this.newObserver(obj, 'firstObject', 'lastObject');
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
index c5a91b7de73..2f682c8e221 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
@@ -12,7 +12,7 @@ moduleFor(
     beforeEach() {
       run(() => {
         array = ArrayProxy.extend({
-          arrangedContent: computed('content.[]', function() {
+          arrangedContent: computed('content.[]', function () {
             let content = this.get('content');
             return (
               content &&
@@ -104,7 +104,7 @@ moduleFor(
   'ArrayProxy - arrangedContent matching content',
   class extends AbstractTestCase {
     beforeEach() {
-      run(function() {
+      run(function () {
         array = ArrayProxy.create({
           content: emberA([1, 2, 4, 5]),
         });
@@ -112,27 +112,27 @@ moduleFor(
     }
 
     afterEach() {
-      run(function() {
+      run(function () {
         array.destroy();
       });
     }
 
     ['@test insertAt - inserts object at specified index'](assert) {
-      run(function() {
+      run(function () {
         array.insertAt(2, 3);
       });
       assert.deepEqual(array.get('content'), [1, 2, 3, 4, 5]);
     }
 
     ['@test replace - does a standard array replace'](assert) {
-      run(function() {
+      run(function () {
         array.replace(1, 2, [3]);
       });
       assert.deepEqual(array.get('content'), [1, 3, 5]);
     }
 
     ['@test reverseObjects - reverses content'](assert) {
-      run(function() {
+      run(function () {
         array.reverseObjects();
       });
       assert.deepEqual(array.get('content'), [5, 4, 2, 1]);
@@ -144,14 +144,14 @@ moduleFor(
   'ArrayProxy - arrangedContent with transforms',
   class extends AbstractTestCase {
     beforeEach() {
-      run(function() {
+      run(function () {
         array = ArrayProxy.extend({
-          arrangedContent: computed('content.[]', function() {
+          arrangedContent: computed('content.[]', function () {
             let content = this.get('content');
             return (
               content &&
               emberA(
-                content.slice().sort(function(a, b) {
+                content.slice().sort(function (a, b) {
                   if (a == null) {
                     a = -1;
                   }
@@ -175,7 +175,7 @@ moduleFor(
     }
 
     afterEach() {
-      run(function() {
+      run(function () {
         array.destroy();
       });
     }
@@ -232,7 +232,7 @@ moduleFor(
   'ArrayProxy - with transforms',
   class extends AbstractTestCase {
     beforeEach() {
-      run(function() {
+      run(function () {
         array = ArrayProxy.extend({
           objectAtContent(idx) {
             let obj = objectAt(this.get('arrangedContent'), idx);
@@ -245,7 +245,7 @@ moduleFor(
     }
 
     afterEach() {
-      run(function() {
+      run(function () {
         array.destroy();
       });
     }
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index c788ad15e46..d5072dbe2aa 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -92,7 +92,7 @@ moduleFor(
       let Test = CoreObject.extend({
         myProp: null,
         anotherProp: undefined,
-        didChangeMyProp: observer('myProp', function() {
+        didChangeMyProp: observer('myProp', function () {
           callCount++;
         }),
       });
diff --git a/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js b/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js
index c2c9b7ae8e5..b8dd9217379 100644
--- a/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js
@@ -5,7 +5,7 @@ moduleFor(
   'NativeArray.replace',
   class extends AbstractTestCase {
     ['@test raises assertion if third argument is not an array']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         A([1, 2, 3]).replace(1, 1, '');
       }, 'The third argument to replace needs to be an array.');
     }
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
index 9eeecd27211..40078e3fe59 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
@@ -29,7 +29,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test computed property on instance'](assert) {
       let MyClass = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'FOO';
         }),
       });
@@ -39,13 +39,13 @@ moduleFor(
 
     ['@test computed property on subclass'](assert) {
       let MyClass = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'FOO';
         }),
       });
 
       let Subclass = MyClass.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'BAR';
         }),
       });
@@ -55,7 +55,7 @@ moduleFor(
 
     ['@test replacing computed property with regular val'](assert) {
       let MyClass = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'FOO';
         }),
       });
@@ -76,7 +76,7 @@ moduleFor(
 
         count: 0,
 
-        foo: computed('bar.baz', function() {
+        foo: computed('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
           return get(get(this, 'bar'), 'baz') + ' ' + get(this, 'count');
         }),
@@ -112,7 +112,7 @@ moduleFor(
 
         count: 0,
 
-        foo: computed('bar.baz', function() {
+        foo: computed('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
           return get(get(this, 'bar'), 'baz') + ' ' + get(this, 'count');
         }),
@@ -126,7 +126,7 @@ moduleFor(
 
         count: 0,
 
-        foo: computed('bar2.baz', function() {
+        foo: computed('bar2.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
           return get(get(this, 'bar2'), 'baz') + ' ' + get(this, 'count');
         }),
@@ -145,7 +145,7 @@ moduleFor(
 
     ['@test can retrieve metadata for a computed property'](assert) {
       let MyClass = EmberObject.extend({
-        computedProperty: computed(function() {}).meta({ key: 'keyValue' }),
+        computedProperty: computed(function () {}).meta({ key: 'keyValue' }),
       });
 
       assert.equal(
@@ -155,7 +155,7 @@ moduleFor(
       );
 
       let ClassWithNoMetadata = EmberObject.extend({
-        computedProperty: computed(function() {}),
+        computedProperty: computed(function () {}),
 
         staticProperty: 12,
       });
@@ -166,11 +166,11 @@ moduleFor(
         'returns empty hash if no metadata has been saved'
       );
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         ClassWithNoMetadata.metaForProperty('nonexistentProperty');
       }, "metaForProperty() could not find a computed property with key 'nonexistentProperty'.");
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         ClassWithNoMetadata.metaForProperty('staticProperty');
       }, "metaForProperty() could not find a computed property with key 'staticProperty'.");
     }
@@ -179,11 +179,11 @@ moduleFor(
       assert
     ) {
       let MyClass = EmberObject.extend({
-        foo: computed(function() {}),
+        foo: computed(function () {}),
 
-        fooDidChange: observer('foo', function() {}),
+        fooDidChange: observer('foo', function () {}),
 
-        bar: computed(function() {}),
+        bar: computed(function () {}),
       });
 
       let SubClass = MyClass.extend({
@@ -192,7 +192,7 @@ moduleFor(
 
       let list = [];
 
-      SubClass.eachComputedProperty(name => list.push(name));
+      SubClass.eachComputedProperty((name) => list.push(name));
 
       assert.deepEqual(
         list.sort(),
@@ -203,26 +203,26 @@ moduleFor(
 
     ['@test can iterate over a list of computed properties for a class'](assert) {
       let MyClass = EmberObject.extend({
-        foo: computed(function() {}),
+        foo: computed(function () {}),
 
-        fooDidChange: observer('foo', function() {}),
+        fooDidChange: observer('foo', function () {}),
 
-        bar: computed(function() {}),
+        bar: computed(function () {}),
 
         qux: alias('foo'),
       });
 
       let SubClass = MyClass.extend({
-        baz: computed(function() {}),
+        baz: computed(function () {}),
       });
 
       SubClass.reopen({
-        bat: computed(function() {}).meta({ iAmBat: true }),
+        bat: computed(function () {}).meta({ iAmBat: true }),
       });
 
       let list = [];
 
-      MyClass.eachComputedProperty(function(name) {
+      MyClass.eachComputedProperty(function (name) {
         list.push(name);
       });
 
@@ -234,7 +234,7 @@ moduleFor(
 
       list = [];
 
-      SubClass.eachComputedProperty(function(name, meta) {
+      SubClass.eachComputedProperty(function (name, meta) {
         list.push(name);
 
         if (name === 'bat') {
@@ -257,14 +257,14 @@ moduleFor(
       let MyClass = EmberObject.extend({
         foo: computed(K),
 
-        fooDidChange: observer('foo', function() {}),
+        fooDidChange: observer('foo', function () {}),
 
         bar: computed(K),
       });
 
       let list = [];
 
-      MyClass.eachComputedProperty(function(name) {
+      MyClass.eachComputedProperty(function (name) {
         list.push(name);
       });
 
@@ -278,7 +278,7 @@ moduleFor(
 
       list = [];
 
-      MyClass.eachComputedProperty(function(name) {
+      MyClass.eachComputedProperty(function (name) {
         list.push(name);
       });
 
@@ -292,7 +292,7 @@ moduleFor(
 
       list = [];
 
-      MyClass.eachComputedProperty(function(name) {
+      MyClass.eachComputedProperty(function (name) {
         list.push(name);
       });
 
@@ -305,19 +305,19 @@ moduleFor(
 
     ['@test Calling _super in call outside the immediate function of a CP getter works'](assert) {
       function macro(callback) {
-        return computed(function() {
+        return computed(function () {
           return callback.call(this);
         });
       }
 
       let MyClass = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'FOO';
         }),
       });
 
       let SubClass = MyClass.extend({
-        foo: macro(function() {
+        foo: macro(function () {
           return this._super();
         }),
       });
@@ -327,19 +327,19 @@ moduleFor(
 
     ['@test Calling _super in apply outside the immediate function of a CP getter works'](assert) {
       function macro(callback) {
-        return computed(function() {
+        return computed(function () {
           return callback.apply(this);
         });
       }
 
       let MyClass = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'FOO';
         }),
       });
 
       let SubClass = MyClass.extend({
-        foo: macro(function() {
+        foo: macro(function () {
           return this._super();
         }),
       });
@@ -350,7 +350,7 @@ moduleFor(
     ['@test observing computed.reads prop and overriding it in create() works'](assert) {
       let Obj = EmberObject.extend({
         name: reads('model.name'),
-        nameDidChange: observer('name', function() {}),
+        nameDidChange: observer('name', function () {}),
       });
 
       let obj1 = Obj.create({ name: '1' });
@@ -368,7 +368,7 @@ moduleFor(
 
       expectDeprecation(() => {
         Obj = EmberObject.extend({
-          foo: computed(function() {
+          foo: computed(function () {
             return this.bar;
           }).property('bar'),
         });
@@ -410,11 +410,11 @@ moduleFor(
         options: null, // null | undefined | { value: any } | Array<{ value: any }>
 
         // Normalize into Array<any>
-        normalized: computed('options', 'options.value', 'options.@each.value', function() {
+        normalized: computed('options', 'options.value', 'options.@each.value', function () {
           let { options } = this;
 
           if (isArray(options)) {
-            return options.map(item => item.value);
+            return options.map((item) => item.value);
           } else if (options !== null && typeof options === 'object') {
             return [options.value];
           } else {
@@ -502,9 +502,9 @@ moduleFor(
         options: null, // null | ArrayLike<{ value: any }>
 
         // Normalize into Array<any>
-        normalized: computed('options.@each.value', function() {
+        normalized: computed('options.@each.value', function () {
           let options = this.options || [];
-          return options.map(item => item.value);
+          return options.map((item) => item.value);
         }),
       });
 
@@ -524,7 +524,7 @@ moduleFor(
       // This is based off a real world bug found in ember-cp-validations:
       // https://github.com/offirgolan/ember-cp-validations/issues/659
       let CycleObject = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return EmberObject.extend({
             parent: this,
             alias: alias('parent.foo'),
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 6f29bed135f..76719f327ae 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -35,7 +35,7 @@ moduleFor(
         let MyClass = EmberObject.extend({
           foo: null,
           bar: null,
-          fooDidChange: observer('foo', function() {}),
+          fooDidChange: observer('foo', function () {}),
         });
 
         let o = MyClass.create({ foo: 'bar', bar: 'baz' });
@@ -58,7 +58,7 @@ moduleFor(
         let MyClass = EmberObject.extend({
           foo: null,
           bar: null,
-          fooAlias: computed('foo', function() {
+          fooAlias: computed('foo', function () {
             return this.foo;
           }),
         });
@@ -107,7 +107,7 @@ moduleFor(
           get foo() {
             return 'bar';
           },
-          fooDidChange: observer('foo', function() {}),
+          fooDidChange: observer('foo', function () {}),
         });
 
         let o = MyClass.create({});
@@ -127,7 +127,7 @@ moduleFor(
       if (DEBUG) {
         let arr = [123];
 
-        addObserver(arr, 0, function() {});
+        addObserver(arr, 0, function () {});
 
         let descriptor = Object.getOwnPropertyDescriptor(arr, 0);
         assert.ok(!descriptor.set, 'Mandatory setter was not setup');
@@ -152,15 +152,15 @@ moduleFor(
     }
 
     ['@test throws if you try to define a computed property']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         EmberObject.create({
-          foo: computed(function() {}),
+          foo: computed(function () {}),
         });
       }, 'EmberObject.create no longer supports defining computed properties. Define computed properties using extend() or reopen() before calling create().');
     }
 
     ['@test throws if you try to call _super in a method']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         EmberObject.create({
           foo() {
             this._super(...arguments);
@@ -176,7 +176,7 @@ moduleFor(
         },
       });
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         EmberObject.create(myMixin);
       }, 'EmberObject.create no longer supports mixing in other definitions, use .extend & .create separately instead.');
     }
diff --git a/packages/@ember/-internals/runtime/tests/system/object/destroy_test.js b/packages/@ember/-internals/runtime/tests/system/object/destroy_test.js
index f1270bc1961..571a07fba65 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/destroy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/destroy_test.js
@@ -38,7 +38,7 @@ moduleFor(
     ) {
       if (DEBUG) {
         let obj = EmberObject.extend({
-          fooDidChange: observer('foo', function() {}),
+          fooDidChange: observer('foo', function () {}),
         }).create({
           foo: 'bar',
         });
@@ -54,7 +54,7 @@ moduleFor(
     async ['@test observers should not fire after an object has been destroyed'](assert) {
       let count = 0;
       let obj = EmberObject.extend({
-        fooDidChange: observer('foo', function() {
+        fooDidChange: observer('foo', function () {
           count++;
         }),
       }).create();
@@ -87,10 +87,10 @@ moduleFor(
         willDestroy() {
           this.set('isAlive', false);
         },
-        bDidChange: observer('objs.b.isAlive', function() {
+        bDidChange: observer('objs.b.isAlive', function () {
           shouldNotChange++;
         }),
-        cDidChange: observer('objs.c.isAlive', function() {
+        cDidChange: observer('objs.c.isAlive', function () {
           shouldNotChange++;
         }),
       });
@@ -101,10 +101,10 @@ moduleFor(
         willDestroy() {
           this.set('isAlive', false);
         },
-        aDidChange: observer('objs.a.isAlive', function() {
+        aDidChange: observer('objs.a.isAlive', function () {
           shouldNotChange++;
         }),
-        cDidChange: observer('objs.c.isAlive', function() {
+        cDidChange: observer('objs.c.isAlive', function () {
           shouldNotChange++;
         }),
       });
@@ -115,17 +115,17 @@ moduleFor(
         willDestroy() {
           this.set('isAlive', false);
         },
-        aDidChange: observer('objs.a.isAlive', function() {
+        aDidChange: observer('objs.a.isAlive', function () {
           shouldNotChange++;
         }),
-        bDidChange: observer('objs.b.isAlive', function() {
+        bDidChange: observer('objs.b.isAlive', function () {
           shouldNotChange++;
         }),
       });
 
       let LongLivedObject = EmberObject.extend({
         objs: objs,
-        isAliveDidChange: observer('objs.a.isAlive', function() {
+        isAliveDidChange: observer('objs.a.isAlive', function () {
           shouldChange++;
         }),
       });
diff --git a/packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js b/packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js
index f6cfe65fa67..309cc26b1d4 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js
@@ -290,11 +290,11 @@ moduleFor(
       let someEventA = 0;
       let someEventB = 0;
       class A extends EmberObject.extend({
-        fooDidChange: observer('foo', function() {
+        fooDidChange: observer('foo', function () {
           fooDidChangeBase++;
         }),
 
-        onSomeEvent: on('someEvent', function() {
+        onSomeEvent: on('someEvent', function () {
           someEventBase++;
         }),
       }) {
diff --git a/packages/@ember/-internals/runtime/tests/system/object/events_test.js b/packages/@ember/-internals/runtime/tests/system/object/events_test.js
index f07d79dffea..3f84a46ccbd 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/events_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/events_test.js
@@ -7,7 +7,7 @@ moduleFor(
   class extends AbstractTestCase {
     ['@test a listener can be added to an object'](assert) {
       let count = 0;
-      let F = function() {
+      let F = function () {
         count++;
       };
 
@@ -27,7 +27,7 @@ moduleFor(
       assert
     ) {
       let count = 0;
-      let F = function() {
+      let F = function () {
         count++;
       };
 
@@ -48,7 +48,7 @@ moduleFor(
 
       let obj = EmberObject.extend(Evented).create();
 
-      obj.on('event!', function() {
+      obj.on('event!', function () {
         args = [].slice.call(arguments);
         self = this;
       });
@@ -65,7 +65,7 @@ moduleFor(
 
       let obj = EmberObject.extend(Evented).create();
 
-      obj.one('event!', function() {
+      obj.one('event!', function () {
         args = [].slice.call(arguments);
         self = this;
         count++;
@@ -90,7 +90,7 @@ moduleFor(
       let obj = EmberObject.extend(Evented).create();
       let target = {};
 
-      obj.on('event!', target, function() {
+      obj.on('event!', target, function () {
         args = [].slice.call(arguments);
         self = this;
       });
@@ -106,7 +106,7 @@ moduleFor(
     ) {
       let count = 0;
       let target = {};
-      target.fn = function() {
+      target.fn = function () {
         count++;
       };
 
@@ -126,7 +126,7 @@ moduleFor(
       let obj = EmberObject.extend(Evented, {
         F() {},
       }).create();
-      let F = function() {};
+      let F = function () {};
 
       obj.one('event!', F);
       obj.one('event!', obj, 'F');
@@ -141,7 +141,7 @@ moduleFor(
 
     ['@test adding and removing listeners should be chainable'](assert) {
       let obj = EmberObject.extend(Evented).create();
-      let F = function() {};
+      let F = function () {};
 
       let ret = obj.on('event!', F);
       assert.equal(ret, obj, '#on returns self');
diff --git a/packages/@ember/-internals/runtime/tests/system/object/extend_test.js b/packages/@ember/-internals/runtime/tests/system/object/extend_test.js
index 2b7d937c26c..11454a238ac 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/extend_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/extend_test.js
@@ -124,7 +124,7 @@ moduleFor(
 
     async ['@test Overriding a computed property with an observer'](assert) {
       let Parent = EmberObject.extend({
-        foo: computed(function() {
+        foo: computed(function () {
           return 'FOO';
         }),
       });
@@ -132,7 +132,7 @@ moduleFor(
       let seen = [];
 
       let Child = Parent.extend({
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           seen.push(this.get('bar'));
         }),
       });
diff --git a/packages/@ember/-internals/runtime/tests/system/object/observer_test.js b/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
index 4fca8038729..0f1a38a6fac 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
@@ -10,7 +10,7 @@ moduleFor(
       let MyClass = EmberObject.extend({
         count: 0,
 
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -29,7 +29,7 @@ moduleFor(
     async ['@test setting `undefined` value on observed property behaves correctly'](assert) {
       let MyClass = EmberObject.extend({
         mood: 'good',
-        foo: observer('mood', function() {}),
+        foo: observer('mood', function () {}),
       });
 
       let obj = MyClass.create();
@@ -57,13 +57,13 @@ moduleFor(
       let MyClass = EmberObject.extend({
         count: 0,
 
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
 
       let Subclass = MyClass.extend({
-        foo: observer('baz', function() {
+        foo: observer('baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -86,7 +86,7 @@ moduleFor(
 
     async ['@test observer on instance'](assert) {
       let obj = EmberObject.extend({
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       }).create({
@@ -108,13 +108,13 @@ moduleFor(
       let MyClass = EmberObject.extend({
         count: 0,
 
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
 
       let obj = MyClass.extend({
-        foo: observer('baz', function() {
+        foo: observer('baz', function () {
           // <-- change property we observe
           set(this, 'count', get(this, 'count') + 1);
         }),
@@ -138,7 +138,7 @@ moduleFor(
     async ['@test observer should not fire after being destroyed'](assert) {
       let obj = EmberObject.extend({
         count: 0,
-        foo: observer('bar', function() {
+        foo: observer('bar', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       }).create();
@@ -147,7 +147,7 @@ moduleFor(
 
       run(() => obj.destroy());
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         set(obj, 'bar', 'BAZ');
       }, `calling set on destroyed object: ${obj}.bar = BAZ`);
 
@@ -164,7 +164,7 @@ moduleFor(
       let MyClass = EmberObject.extend({
         count: 0,
 
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -200,7 +200,7 @@ moduleFor(
       let MyClass = EmberObject.extend({
         count: 0,
 
-        foo: observer('bar.baz', function() {
+        foo: observer('bar.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       });
@@ -210,7 +210,7 @@ moduleFor(
       });
 
       let obj2 = MyClass.extend({
-        foo: observer('bar2.baz', function() {
+        foo: observer('bar2.baz', function () {
           set(this, 'count', get(this, 'count') + 1);
         }),
       }).create({
@@ -250,7 +250,7 @@ moduleFor(
 
       let ChildClass = EmberObject.extend({
         parent: null,
-        parentOneTwoDidChange: observer('parent.one.two', function() {
+        parentOneTwoDidChange: observer('parent.one.two', function () {
           changed = true;
         }),
       });
diff --git a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js b/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
index 1bcb1f58a21..b150ee8eb7e 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
@@ -21,7 +21,7 @@ moduleFor(
 
     ['@test toString() returns the same value if called twice'](assert) {
       let Foo = Namespace.create();
-      Foo.toString = function() {
+      Foo.toString = function () {
         return 'Foo';
       };
 
@@ -44,7 +44,7 @@ moduleFor(
       let obj;
 
       let Foo = Namespace.create();
-      Foo.toString = function() {
+      Foo.toString = function () {
         return 'Foo';
       };
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
index 6a04222993e..31ab0487468 100644
--- a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
@@ -105,7 +105,7 @@ moduleFor(
         let proxy = ObjectProxy.extend({
           init() {
             if (!this.foobar) {
-              this.foobar = function() {
+              this.foobar = function () {
                 let content = get(this, 'content');
                 return content.foobar.apply(content, []);
               };
@@ -173,7 +173,7 @@ moduleFor(
       let last;
 
       let Proxy = ObjectProxy.extend({
-        fullName: computed('firstName', 'lastName', function() {
+        fullName: computed('firstName', 'lastName', function () {
           let firstName = this.get('firstName');
           let lastName = this.get('lastName');
 
@@ -191,11 +191,11 @@ moduleFor(
       });
 
       // We need separate observers for each property for async observers
-      addObserver(proxy, 'firstName', function() {
+      addObserver(proxy, 'firstName', function () {
         count++;
       });
 
-      addObserver(proxy, 'lastName', function() {
+      addObserver(proxy, 'lastName', function () {
         count++;
       });
 
@@ -253,7 +253,7 @@ moduleFor(
       assert.equal(proxy.get('foo.bar'), 'hello');
       assert.equal(proxy.get('content.foo.bar'), 'hello');
 
-      proxy.addObserver('foo.bar', function() {
+      proxy.addObserver('foo.bar', function () {
         count++;
       });
 
@@ -339,7 +339,7 @@ moduleFor(
       assert.expect(0);
 
       let obj = ObjectProxy.extend({
-        observe: observer('foo', function() {}),
+        observe: observer('foo', function () {}),
       }).create();
 
       obj.destroy();
@@ -361,7 +361,7 @@ moduleFor(
 
       let count = 0;
 
-      proxy.addObserver('foo', function() {
+      proxy.addObserver('foo', function () {
         count++;
       });
 
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 9adb5ad5827..3ab5b72cbca 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -36,11 +36,11 @@ if (DEBUG) {
     { [key: string | symbol]: PropertyDescriptorWithMeta }
   > = new WeakMap();
 
-  let propertyIsEnumerable = function(obj: object, key: string | symbol) {
+  let propertyIsEnumerable = function (obj: object, key: string | symbol) {
     return Object.prototype.propertyIsEnumerable.call(obj, key);
   };
 
-  setupMandatorySetter = function(tag: Tag, obj: object, keyName: string | symbol) {
+  setupMandatorySetter = function (tag: Tag, obj: object, keyName: string | symbol) {
     if (SEEN_TAGS.has(tag)) {
       return;
     }
@@ -99,7 +99,7 @@ if (DEBUG) {
     });
   };
 
-  teardownMandatorySetter = function(obj: object, keyName: string | symbol) {
+  teardownMandatorySetter = function (obj: object, keyName: string | symbol) {
     let setters = MANDATORY_SETTERS.get(obj);
 
     if (setters !== undefined && setters[keyName] !== undefined) {
@@ -109,7 +109,7 @@ if (DEBUG) {
     }
   };
 
-  setWithMandatorySetter = function(obj: object, keyName: string | symbol, value: any) {
+  setWithMandatorySetter = function (obj: object, keyName: string | symbol, value: any) {
     let setters = MANDATORY_SETTERS.get(obj);
 
     if (setters !== undefined && setters[keyName] !== undefined) {
diff --git a/packages/@ember/-internals/utils/lib/super.ts b/packages/@ember/-internals/utils/lib/super.ts
index c2eb7ea75f3..e28dc54a91d 100644
--- a/packages/@ember/-internals/utils/lib/super.ts
+++ b/packages/@ember/-internals/utils/lib/super.ts
@@ -6,7 +6,7 @@ const fnToString = Function.prototype.toString;
 export const checkHasSuper = (() => {
   let sourceAvailable =
     fnToString
-      .call(function(this: any) {
+      .call(function (this: any) {
         return this;
       })
       .indexOf('return this') > -1;
@@ -24,7 +24,7 @@ export const checkHasSuper = (() => {
 
 const HAS_SUPER_MAP = new WeakMap();
 
-export const ROOT = Object.freeze(function() {});
+export const ROOT = Object.freeze(function () {});
 HAS_SUPER_MAP.set(ROOT, false);
 
 function hasSuper(func: Function) {
diff --git a/packages/@ember/-internals/utils/lib/symbol-utils.ts b/packages/@ember/-internals/utils/lib/symbol-utils.ts
index 324aaa1ed15..207c6bdd251 100644
--- a/packages/@ember/-internals/utils/lib/symbol-utils.ts
+++ b/packages/@ember/-internals/utils/lib/symbol-utils.ts
@@ -1,4 +1,4 @@
-export const HAS_NATIVE_SYMBOL = (function() {
+export const HAS_NATIVE_SYMBOL = (function () {
   if (typeof Symbol !== 'function') {
     return false;
   }
diff --git a/packages/@ember/-internals/utils/tests/cache_test.js b/packages/@ember/-internals/utils/tests/cache_test.js
index 8e90497ce9a..73bbdbf0a13 100644
--- a/packages/@ember/-internals/utils/tests/cache_test.js
+++ b/packages/@ember/-internals/utils/tests/cache_test.js
@@ -5,7 +5,7 @@ moduleFor(
   'Cache',
   class extends AbstractTestCase {
     ['@test basic'](assert) {
-      let cache = new Cache(100, key => key.toUpperCase());
+      let cache = new Cache(100, (key) => key.toUpperCase());
 
       assert.equal(cache.get('foo'), 'FOO');
       assert.equal(cache.get('bar'), 'BAR');
@@ -13,7 +13,7 @@ moduleFor(
     }
 
     ['@test explicit sets'](assert) {
-      let cache = new Cache(100, key => key.toUpperCase());
+      let cache = new Cache(100, (key) => key.toUpperCase());
 
       assert.equal(cache.get('foo'), 'FOO');
 
@@ -28,7 +28,7 @@ moduleFor(
 
     ['@test caches computation correctly'](assert) {
       let count = 0;
-      let cache = new Cache(100, key => {
+      let cache = new Cache(100, (key) => {
         count++;
         return key.toUpperCase();
       });
@@ -62,7 +62,7 @@ moduleFor(
     }
 
     ['@test continues working after reaching cache limit'](assert) {
-      let cache = new Cache(3, key => key.toUpperCase());
+      let cache = new Cache(3, (key) => key.toUpperCase());
 
       cache.get('a');
       cache.get('b');
diff --git a/packages/@ember/-internals/utils/tests/checkHasSuper_test.js b/packages/@ember/-internals/utils/tests/checkHasSuper_test.js
index ba4f09b7435..a4fdd5c6f10 100644
--- a/packages/@ember/-internals/utils/tests/checkHasSuper_test.js
+++ b/packages/@ember/-internals/utils/tests/checkHasSuper_test.js
@@ -11,7 +11,7 @@ if (isChrome || isFirefox) {
     class extends TestCase {
       ['@test does not super wrap needlessly [GH #12462]'](assert) {
         assert.notOk(
-          checkHasSuper(function() {}),
+          checkHasSuper(function () {}),
           'empty function does not have super'
         );
       }
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.js
index ae981cf929e..e6fc6a4f977 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.js
@@ -84,7 +84,9 @@ let mixin = {
   nearestOfType(klass) {
     let view = this.parentView;
     let isOfType =
-      klass instanceof Mixin ? view => klass.detect(view) : view => klass.detect(view.constructor);
+      klass instanceof Mixin
+        ? (view) => klass.detect(view)
+        : (view) => klass.detect(view.constructor);
 
     while (view) {
       if (isOfType(view)) {
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 1ee757f3fc2..176a4b34356 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -164,8 +164,9 @@ export default EmberObject.extend({
       }
 
       assert(
-        `You cannot use the same root element (${get(this, 'rootElement') ||
-          rootElement.tagName}) multiple times in an Ember.Application`,
+        `You cannot use the same root element (${
+          get(this, 'rootElement') || rootElement.tagName
+        }) multiple times in an Ember.Application`,
         !rootElement.classList.contains(ROOT_ELEMENT_CLASS)
       );
       assert(
@@ -191,15 +192,17 @@ export default EmberObject.extend({
       rootElement.classList.add(ROOT_ELEMENT_CLASS);
 
       assert(
-        `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${get(this, 'rootElement') ||
-          rootElement.tagName}). Make sure you set rootElement to the body or an element in the body.`,
+        `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${
+          get(this, 'rootElement') || rootElement.tagName
+        }). Make sure you set rootElement to the body or an element in the body.`,
         rootElement.classList.contains(ROOT_ELEMENT_CLASS)
       );
     } else {
       rootElement = jQuery(rootElementSelector);
       assert(
-        `You cannot use the same root element (${rootElement.selector ||
-          rootElement[0].tagName}) multiple times in an Ember.Application`,
+        `You cannot use the same root element (${
+          rootElement.selector || rootElement[0].tagName
+        }) multiple times in an Ember.Application`,
         !rootElement.is(ROOT_ELEMENT_SELECTOR)
       );
       assert(
@@ -215,9 +218,9 @@ export default EmberObject.extend({
 
       if (!rootElement.is(ROOT_ELEMENT_SELECTOR)) {
         throw new TypeError(
-          `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${rootElement.selector ||
-            rootElement[0]
-              .tagName}). Make sure you set rootElement to the body or an element in the body.`
+          `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${
+            rootElement.selector || rootElement[0].tagName
+          }). Make sure you set rootElement to the body or an element in the body.`
         );
       }
     }
@@ -336,7 +339,7 @@ export default EmberObject.extend({
           return fakeEvent;
         };
 
-        let handleMappedEvent = (this._eventHandlers[mappedEventType] = event => {
+        let handleMappedEvent = (this._eventHandlers[mappedEventType] = (event) => {
           let target = event.target;
           let related = event.relatedTarget;
 
@@ -360,7 +363,7 @@ export default EmberObject.extend({
 
         rootElement.addEventListener(mappedEventType, handleMappedEvent);
       } else {
-        let handleEvent = (this._eventHandlers[event] = event => {
+        let handleEvent = (this._eventHandlers[event] = (event) => {
           let target = event.target;
 
           do {
@@ -388,7 +391,7 @@ export default EmberObject.extend({
         rootElement.addEventListener(event, handleEvent);
       }
     } else {
-      rootElement.on(`${event}.ember`, '.ember-view', function(evt) {
+      rootElement.on(`${event}.ember`, '.ember-view', function (evt) {
         let view = getElementView(this);
         let result = true;
 
@@ -399,7 +402,7 @@ export default EmberObject.extend({
         return result;
       });
 
-      rootElement.on(`${event}.ember`, '[data-ember-action]', evt => {
+      rootElement.on(`${event}.ember`, '[data-ember-action]', (evt) => {
         let attributes = evt.currentTarget.attributes;
         let handledActions = [];
 
diff --git a/packages/@ember/-internals/views/lib/system/jquery.js b/packages/@ember/-internals/views/lib/system/jquery.js
index 89dca88e8ec..f8463832e30 100644
--- a/packages/@ember/-internals/views/lib/system/jquery.js
+++ b/packages/@ember/-internals/views/lib/system/jquery.js
@@ -15,7 +15,7 @@ if (JQUERY_INTEGRATION && hasDOM) {
     } else {
       // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
       ['dragstart', 'drag', 'dragenter', 'dragleave', 'dragover', 'drop', 'dragend'].forEach(
-        eventName => {
+        (eventName) => {
           jQuery.event.fixHooks[eventName] = {
             props: ['dataTransfer'],
           };
diff --git a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
index f93e8091c09..a9d6db70ee7 100644
--- a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
+++ b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
@@ -18,7 +18,7 @@ export default function addJQueryEventDeprecation(jqEvent) {
           case 'originalEvent':
             deprecate(
               'Accessing jQuery.Event specific properties is deprecated. Either use the ember-jquery-legacy addon to normalize events to native events, or explicitly opt into jQuery integration using @ember/optional-features.',
-              (EmberENV => {
+              ((EmberENV) => {
                 // this deprecation is intentionally checking `global.EmberENV` so
                 // that we can ensure we _only_ deprecate in the case where jQuery
                 // integration is enabled implicitly (e.g. "defaulted" to enabled)
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 88fe434c227..baa1430f29a 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -48,7 +48,7 @@ export function getRootViews(owner: Owner): View[] {
 
   let rootViews: View[] = [];
 
-  Object.keys(registry).forEach(id => {
+  Object.keys(registry).forEach((id) => {
     let view = registry[id];
 
     if (view.parentView === null) {
@@ -142,7 +142,7 @@ export function collectChildViews(view: View, registry: Dict<View>): View[] {
   let childViews = CHILD_VIEW_IDS.get(view);
 
   if (childViews !== undefined) {
-    childViews.forEach(id => {
+    childViews.forEach((id) => {
       let view = registry[id];
       if (view && !view.isDestroying && !view.isDestroyed) {
         views.push(view);
diff --git a/packages/@ember/application/globals-resolver.js b/packages/@ember/application/globals-resolver.js
index c75174a5a97..848438bae3c 100644
--- a/packages/@ember/application/globals-resolver.js
+++ b/packages/@ember/application/globals-resolver.js
@@ -126,7 +126,7 @@ if (GLOBALS_RESOLVER) {
       );
 
       if (type !== 'template') {
-        let result = name.replace(/(\.|_|-)./g, m => m.charAt(1).toUpperCase());
+        let result = name.replace(/(\.|_|-)./g, (m) => m.charAt(1).toUpperCase());
 
         return `${type}:${result}`;
       } else {
@@ -443,7 +443,7 @@ if (GLOBALS_RESOLVER) {
         @param {Object} parsedName
         @private
       */
-    DefaultResolver.prototype._logLookup = function(found, parsedName) {
+    DefaultResolver.prototype._logLookup = function (found, parsedName) {
       let symbol = found ? '[✓]' : '[ ]';
 
       let padding;
diff --git a/packages/@ember/application/instance.js b/packages/@ember/application/instance.js
index 06fbd0e8f63..ce37621baa5 100644
--- a/packages/@ember/application/instance.js
+++ b/packages/@ember/application/instance.js
@@ -129,7 +129,7 @@ const ApplicationInstance = EngineInstance.extend({
     this.constructor.setupRegistry(this.__registry__, options);
   },
 
-  router: computed(function() {
+  router: computed(function () {
     return this.lookup('router:main');
   }).readOnly(),
 
@@ -256,7 +256,7 @@ const ApplicationInstance = EngineInstance.extend({
       }
     };
 
-    let handleTransitionReject = error => {
+    let handleTransitionReject = (error) => {
       if (error.error) {
         throw error.error;
       } else if (error.name === 'TransitionAborted' && router._routerMicrolib.activeTransition) {
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 36ca0326acb..13183a45ad2 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -880,7 +880,7 @@ const Application = Engine.extend({
     }
 
     if (this._applicationInstances.size) {
-      this._applicationInstances.forEach(i => i.destroy());
+      this._applicationInstances.forEach((i) => i.destroy());
       this._applicationInstances.clear();
     }
   },
@@ -1096,7 +1096,7 @@ const Application = Engine.extend({
       return instance
         .boot(options)
         .then(() => instance.visit(url))
-        .catch(error => {
+        .catch((error) => {
           run(instance, 'destroy');
           throw error;
         });
diff --git a/packages/@ember/application/lib/lazy_load.js b/packages/@ember/application/lib/lazy_load.js
index cd1650ba908..290f66cdeda 100644
--- a/packages/@ember/application/lib/lazy_load.js
+++ b/packages/@ember/application/lib/lazy_load.js
@@ -64,6 +64,6 @@ export function runLoadHooks(name, object) {
   }
 
   if (loadHooks[name]) {
-    loadHooks[name].forEach(callback => callback(object));
+    loadHooks[name].forEach((callback) => callback(object));
   }
 }
diff --git a/packages/@ember/application/tests/application_instance_test.js b/packages/@ember/application/tests/application_instance_test.js
index f2c5682d6bc..07ddb7bee96 100644
--- a/packages/@ember/application/tests/application_instance_test.js
+++ b/packages/@ember/application/tests/application_instance_test.js
@@ -13,7 +13,7 @@ import {
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
 const originalDebug = getDebugFunction('debug');
-const noop = function() {};
+const noop = function () {};
 
 let application, appInstance;
 
@@ -69,7 +69,7 @@ moduleFor(
       };
 
       let eventDispatcher = appInstance.lookup('event_dispatcher:main');
-      eventDispatcher.setup = function(events) {
+      eventDispatcher.setup = function (events) {
         assert.equal(events.awesome, 'sauce');
       };
 
@@ -87,7 +87,7 @@ moduleFor(
       };
 
       let eventDispatcher = appInstance.lookup('event_dispatcher:main');
-      eventDispatcher.setup = function(events) {
+      eventDispatcher.setup = function (events) {
         assert.equal(events.awesome, 'sauce');
       };
 
@@ -105,7 +105,7 @@ moduleFor(
       };
 
       let eventDispatcher = appInstance.lookup('event_dispatcher:main');
-      eventDispatcher.setup = function(events) {
+      eventDispatcher.setup = function (events) {
         assert.equal(events.awesome, 'sauce');
       };
 
@@ -195,7 +195,7 @@ moduleFor(
 
         let registrations = ['route:basic', 'service:-routing'];
 
-        registrations.forEach(key => {
+        registrations.forEach((key) => {
           assert.strictEqual(
             chatEngineInstance.resolveRegistration(key),
             appInstance.resolveRegistration(key),
@@ -215,7 +215,7 @@ moduleFor(
         let env = appInstance.lookup('-environment:main');
         singletons.push(env.isInteractive ? 'renderer:-dom' : 'renderer:-inert');
 
-        singletons.forEach(key => {
+        singletons.forEach((key) => {
           assert.strictEqual(
             chatEngineInstance.lookup(key),
             appInstance.lookup(key),
@@ -229,7 +229,7 @@ moduleFor(
       assert
     ) {
       let namespace = EmberObject.create({
-        Resolver: { create: function() {} },
+        Resolver: { create: function () {} },
       });
 
       let registry = Application.buildRegistry(namespace);
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index f10e7cec725..d80ad44e827 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -344,7 +344,7 @@ moduleFor(
 
       ENV.LOG_VERSION = true;
 
-      setDebugFunction('debug', message => messages.push(message));
+      setDebugFunction('debug', (message) => messages.push(message));
 
       libraries.register('my-lib', '2.0.0a');
 
@@ -399,7 +399,7 @@ moduleFor(
       assert
     ) {
       let namespace = EmberObject.create({
-        Resolver: { create: function() {} },
+        Resolver: { create: function () {} },
       });
 
       let registry = Application.buildRegistry(namespace);
diff --git a/packages/@ember/application/tests/dependency_injection/default_resolver_test.js b/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
index d55b6e5fb38..46b9a68ffa6 100644
--- a/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
+++ b/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
@@ -334,7 +334,7 @@ moduleFor(
       this.application.ScoobyDoo = EmberObject.extend();
       this.application.toString = () => 'App';
 
-      setDebugFunction('info', function(symbol, name, padding, lookupDescription) {
+      setDebugFunction('info', function (symbol, name, padding, lookupDescription) {
         assert.equal(symbol, '[✓]', 'proper symbol is printed when a module is found');
         assert.equal(name, 'doo:scooby', 'proper lookup value is logged');
         assert.equal(lookupDescription, 'App.ScoobyDoo');
@@ -355,7 +355,7 @@ moduleFor(
       this.application.LOG_RESOLVER = true;
       this.application.toString = () => 'App';
 
-      setDebugFunction('info', function(symbol, name, padding, lookupDescription) {
+      setDebugFunction('info', function (symbol, name, padding, lookupDescription) {
         assert.equal(symbol, '[ ]', 'proper symbol is printed when a module is not found');
         assert.equal(name, 'doo:scooby', 'proper lookup value is logged');
         assert.equal(lookupDescription, 'App.ScoobyDoo');
diff --git a/packages/@ember/application/tests/dependency_injection/normalization_test.js b/packages/@ember/application/tests/dependency_injection/normalization_test.js
index 93dd728588d..d6f726cbc22 100644
--- a/packages/@ember/application/tests/dependency_injection/normalization_test.js
+++ b/packages/@ember/application/tests/dependency_injection/normalization_test.js
@@ -67,7 +67,7 @@ moduleFor(
         'template:foo_bar',
       ];
 
-      examples.forEach(example => {
+      examples.forEach((example) => {
         assert.equal(registry.normalize(registry.normalize(example)), registry.normalize(example));
       });
     }
diff --git a/packages/@ember/application/tests/initializers_test.js b/packages/@ember/application/tests/initializers_test.js
index 391c8e14c79..b8288f433f6 100644
--- a/packages/@ember/application/tests/initializers_test.js
+++ b/packages/@ember/application/tests/initializers_test.js
@@ -80,7 +80,7 @@ moduleFor(
             () => {
               assert.ok(false, 'The boot promise should not resolve when there is a boot error');
             },
-            error => {
+            (error) => {
               assert.ok(error instanceof Error, 'The boot promise should reject with an error');
               assert.equal(error.message, 'boot failure');
             }
diff --git a/packages/@ember/application/tests/instance_initializers_test.js b/packages/@ember/application/tests/instance_initializers_test.js
index 8e64ecc8512..9c237b32359 100644
--- a/packages/@ember/application/tests/instance_initializers_test.js
+++ b/packages/@ember/application/tests/instance_initializers_test.js
@@ -318,7 +318,7 @@ moduleFor(
         initialize() {},
       });
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         FirstApp.instanceInitializer({
           name: 'abc',
           initialize() {},
diff --git a/packages/@ember/application/tests/lazy_load_test.js b/packages/@ember/application/tests/lazy_load_test.js
index 6abc697030e..526ce399f80 100644
--- a/packages/@ember/application/tests/lazy_load_test.js
+++ b/packages/@ember/application/tests/lazy_load_test.js
@@ -15,13 +15,13 @@ moduleFor(
     ['@test if a load hook is registered, it is executed when runLoadHooks are exected'](assert) {
       let count = 0;
 
-      run(function() {
-        onLoad('__test_hook__', function(object) {
+      run(function () {
+        onLoad('__test_hook__', function (object) {
           count += object;
         });
       });
 
-      run(function() {
+      run(function () {
         runLoadHooks('__test_hook__', 1);
       });
 
@@ -31,14 +31,14 @@ moduleFor(
     ['@test if runLoadHooks was already run, it executes newly added hooks immediately'](assert) {
       let count = 0;
       run(() => {
-        onLoad('__test_hook__', object => (count += object));
+        onLoad('__test_hook__', (object) => (count += object));
       });
 
       run(() => runLoadHooks('__test_hook__', 1));
 
       count = 0;
       run(() => {
-        onLoad('__test_hook__', object => (count += object));
+        onLoad('__test_hook__', (object) => (count += object));
       });
 
       assert.equal(count, 1, 'the original object was passed into the load hook');
@@ -67,7 +67,7 @@ moduleFor(
       ) {
         let eventObject = 'super duper awesome events';
 
-        window.addEventListener('__test_hook_for_events__', function(e) {
+        window.addEventListener('__test_hook_for_events__', function (e) {
           assert.ok(true, 'custom event was fired');
           assert.equal(e.detail, eventObject, 'event details are provided properly');
         });
diff --git a/packages/@ember/application/tests/logging_test.js b/packages/@ember/application/tests/logging_test.js
index 8aae7d0e4f9..ef8ff83d0b4 100644
--- a/packages/@ember/application/tests/logging_test.js
+++ b/packages/@ember/application/tests/logging_test.js
@@ -23,7 +23,7 @@ class LoggingApplicationTestCase extends ApplicationTestCase {
       this.logs[fullName]++;
     };
 
-    this.router.map(function() {
+    this.router.map(function () {
       this.route('posts', { resetNamespace: true });
     });
   }
diff --git a/packages/@ember/application/tests/readiness_test.js b/packages/@ember/application/tests/readiness_test.js
index ebe9e6cf0d3..a161246235a 100644
--- a/packages/@ember/application/tests/readiness_test.js
+++ b/packages/@ember/application/tests/readiness_test.js
@@ -27,13 +27,13 @@ moduleFor(
         },
       };
 
-      jQuery = function() {
+      jQuery = function () {
         return jQueryInstance;
       };
       jQuery.isReady = false;
 
       let domReadyCalled = 0;
-      domReady = function() {
+      domReady = function () {
         if (domReadyCalled !== 0) {
           return;
         }
diff --git a/packages/@ember/application/tests/reset_test.js b/packages/@ember/application/tests/reset_test.js
index b3454826dc7..b2f15524e49 100644
--- a/packages/@ember/application/tests/reset_test.js
+++ b/packages/@ember/application/tests/reset_test.js
@@ -115,7 +115,7 @@ moduleFor(
           })
         );
 
-        this.router.map(function() {
+        this.router.map(function () {
           this.route('one');
           this.route('two');
         });
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index c5e9ff314e3..6dc741e79a3 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -76,7 +76,7 @@ moduleFor(
       ENV._APPLICATION_TEMPLATE_WRAPPER = false;
 
       return this.visit('/', bootOptions)
-        .then(instance => {
+        .then((instance) => {
           assert.ok(
             isSerializationFirstNode(instance.rootElement.firstChild),
             'glimmer-vm comment node was not found'
@@ -95,7 +95,7 @@ moduleFor(
             _renderMode: 'rehydrate',
           };
 
-          this.application.visit('/', bootOptions).then(instance => {
+          this.application.visit('/', bootOptions).then((instance) => {
             assert.equal(
               instance.rootElement.innerHTML,
               indexTemplate,
@@ -113,7 +113,7 @@ moduleFor(
     // does not fire.
     [`@test Applications with autoboot set to false do not autoboot`](assert) {
       function delay(time) {
-        return new RSVP.Promise(resolve => later(resolve, time));
+        return new RSVP.Promise((resolve) => later(resolve, time));
       }
 
       let appBooted = 0;
@@ -220,7 +220,7 @@ moduleFor(
            * Visit on the application a second time. The application should remain
            * booted, but a new instance will be created.
            */
-          return this.application.visit('/').then(instance => {
+          return this.application.visit('/').then((instance) => {
             this.applicationInstance = instance;
           });
         })
@@ -244,7 +244,7 @@ moduleFor(
         () => {
           assert.ok(false, 'It should not resolve the promise');
         },
-        error => {
+        (error) => {
           assert.ok(error instanceof Error, 'It should reject the promise with the boot error');
           assert.equal(error.message, 'boot failure');
         }
@@ -265,7 +265,7 @@ moduleFor(
         () => {
           assert.ok(false, 'It should not resolve the promise');
         },
-        error => {
+        (error) => {
           assert.ok(error instanceof Error, 'It should reject the promise with the boot error');
           assert.equal(error.message, 'boot failure');
         }
@@ -273,7 +273,7 @@ moduleFor(
     }
 
     [`@test visit() follows redirects`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b', { path: '/b/:b' });
         this.route('c', { path: '/c/:c' });
@@ -301,7 +301,7 @@ moduleFor(
        * First call to `visit` is `this.application.visit` and returns the
        * applicationInstance.
        */
-      return this.visit('/a').then(instance => {
+      return this.visit('/a').then((instance) => {
         assert.ok(
           instance instanceof ApplicationInstance,
           'promise is resolved with an ApplicationInstance'
@@ -311,7 +311,7 @@ moduleFor(
     }
 
     [`@test visit() rejects if an error occurred during a transition`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b', { path: '/b/:b' });
         this.route('c', { path: '/c/:c' });
@@ -350,7 +350,7 @@ moduleFor(
         () => {
           assert.ok(false, 'It should not resolve the promise');
         },
-        error => {
+        (error) => {
           assert.ok(error instanceof Error, 'It should reject the promise with the boot error');
           assert.equal(error.message, 'transition failure');
         }
@@ -358,14 +358,14 @@ moduleFor(
     }
 
     [`@test visit() chain`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('a');
         this.route('b');
         this.route('c');
       });
 
       return this.visit('/')
-        .then(instance => {
+        .then((instance) => {
           assert.ok(
             instance instanceof ApplicationInstance,
             'promise is resolved with an ApplicationInstance'
@@ -374,7 +374,7 @@ moduleFor(
 
           return instance.visit('/a');
         })
-        .then(instance => {
+        .then((instance) => {
           assert.ok(
             instance instanceof ApplicationInstance,
             'promise is resolved with an ApplicationInstance'
@@ -383,7 +383,7 @@ moduleFor(
 
           return instance.visit('/b');
         })
-        .then(instance => {
+        .then((instance) => {
           assert.ok(
             instance instanceof ApplicationInstance,
             'promise is resolved with an ApplicationInstance'
@@ -392,7 +392,7 @@ moduleFor(
 
           return instance.visit('/c');
         })
-        .then(instance => {
+        .then((instance) => {
           assert.ok(
             instance instanceof ApplicationInstance,
             'promise is resolved with an ApplicationInstance'
@@ -406,7 +406,7 @@ moduleFor(
 
       this.assertEmptyFixture();
 
-      return this.visit('/').then(instance => {
+      return this.visit('/').then((instance) => {
         assert.ok(
           instance instanceof ApplicationInstance,
           'promise is resolved with an ApplicationInstance'
@@ -428,7 +428,7 @@ moduleFor(
 
       this.assertEmptyFixture();
 
-      return this.visit('/', { shouldRender: false }).then(instance => {
+      return this.visit('/', { shouldRender: false }).then((instance) => {
         assert.ok(
           instance instanceof ApplicationInstance,
           'promise is resolved with an ApplicationInstance'
@@ -445,7 +445,7 @@ moduleFor(
 
       this.assertEmptyFixture();
 
-      return this.visit('/', { shouldRender: true }).then(instance => {
+      return this.visit('/', { shouldRender: true }).then((instance) => {
         assert.ok(
           instance instanceof ApplicationInstance,
           'promise is resolved with an ApplicationInstance'
@@ -463,7 +463,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -476,12 +476,12 @@ moduleFor(
       this.add('engine:blog', BlogEngine);
 
       // Register engine route map
-      let BlogMap = function() {};
+      let BlogMap = function () {};
       this.add('route-map:blog', BlogMap);
 
       this.assertEmptyFixture();
 
-      return this.visit('/blog', { shouldRender: false }).then(instance => {
+      return this.visit('/blog', { shouldRender: false }).then((instance) => {
         assert.ok(
           instance instanceof ApplicationInstance,
           'promise is resolved with an ApplicationInstance'
@@ -496,7 +496,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -526,12 +526,12 @@ moduleFor(
       this.add('engine:blog', BlogEngine);
 
       // Register engine route map
-      let BlogMap = function() {};
+      let BlogMap = function () {};
       this.add('route-map:blog', BlogMap);
 
       this.assertEmptyFixture();
 
-      return this.visit('/blog', { isInteractive: false }).then(instance => {
+      return this.visit('/blog', { isInteractive: false }).then((instance) => {
         assert.ok(
           instance instanceof ApplicationInstance,
           'promise is resolved with an ApplicationInstance'
@@ -547,7 +547,7 @@ moduleFor(
     [`@test visit() on engine resolves engine component`](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -570,7 +570,7 @@ moduleFor(
       this.add('engine:blog', BlogEngine);
 
       // Register engine route map
-      let BlogMap = function() {};
+      let BlogMap = function () {};
       this.add('route-map:blog', BlogMap);
 
       this.assertEmptyFixture();
@@ -587,7 +587,7 @@ moduleFor(
     [`@test visit() on engine resolves engine helper`](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -600,7 +600,7 @@ moduleFor(
           this.register('template:application', compile('{{swag}}'));
           this.register(
             'helper:swag',
-            helper(function() {
+            helper(function () {
               return 'turnt up';
             })
           );
@@ -609,7 +609,7 @@ moduleFor(
       this.add('engine:blog', BlogEngine);
 
       // Register engine route map
-      let BlogMap = function() {};
+      let BlogMap = function () {};
       this.add('route-map:blog', BlogMap);
 
       this.assertEmptyFixture();
@@ -626,7 +626,7 @@ moduleFor(
       let xBarInitCalled = false;
       let xBarDidInsertElementCalled = false;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('show', { path: '/:component_name' });
       });
 
@@ -746,7 +746,7 @@ moduleFor(
           return this.application.visit('/x-bar', { rootElement: bar });
         }),
       ])
-        .then(_instances => {
+        .then((_instances) => {
           instances = _instances;
 
           assert.ok(xFooInitCalled);
@@ -789,7 +789,7 @@ moduleFor(
         })
         .finally(() => {
           runTask(() => {
-            instances.forEach(instance => {
+            instances.forEach((instance) => {
               instance.destroy();
             });
           });
@@ -803,7 +803,7 @@ moduleFor(
       let xBarInitCalled = false;
       let xBarDidInsertElementCalled = false;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('show', { path: '/:component_name' });
       });
 
@@ -920,7 +920,7 @@ moduleFor(
           return this.application.visit('/x-bar', { rootElement: bar });
         }),
       ])
-        .then(_instances => {
+        .then((_instances) => {
           instances = _instances;
 
           assert.ok(xFooInitCalled);
@@ -963,7 +963,7 @@ moduleFor(
         })
         .finally(() => {
           runTask(() => {
-            instances.forEach(instance => {
+            instances.forEach((instance) => {
               instance.destroy();
             });
           });
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index fd00c2ec6a3..1d456422f6e 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -173,7 +173,7 @@ moduleFor(
       assert.expect(2);
       let controller;
 
-      ignoreDeprecation(function() {
+      ignoreDeprecation(function () {
         controller = Controller.extend({
           content: 'foo-bar',
         }).create();
@@ -215,7 +215,7 @@ moduleFor(
   'Controller deprecations -> Controller injected properties',
   class extends AbstractTestCase {
     ['@test defining a controller on a non-controller should fail assertion']() {
-      expectAssertion(function() {
+      expectAssertion(function () {
         let owner = buildOwner();
 
         let AnObject = EmberObject.extend({
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index e30e739daf1..a55c1bfcdc4 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -73,12 +73,12 @@ let runInDebug: RunInDebugFunc = noop;
 let setDebugFunction: SetDebugFunction = noop as any;
 let getDebugFunction: GetDebugFunction = noop as any;
 
-let deprecateFunc: DeprecateFuncFunc = function() {
+let deprecateFunc: DeprecateFuncFunc = function () {
   return arguments[arguments.length - 1];
 };
 
 if (DEBUG) {
-  setDebugFunction = function(type: DebugFunctionType, callback: Function) {
+  setDebugFunction = function (type: DebugFunctionType, callback: Function) {
     switch (type) {
       case 'assert':
         return (assert = callback as AssertFunc);
@@ -101,7 +101,7 @@ if (DEBUG) {
     }
   } as any;
 
-  getDebugFunction = function(type: DebugFunctionType) {
+  getDebugFunction = function (type: DebugFunctionType) {
     switch (type) {
       case 'assert':
         return assert;
@@ -246,13 +246,13 @@ if (DEBUG) {
   setDebugFunction('deprecateFunc', function deprecateFunc(...args: any[]) {
     if (args.length === 3) {
       let [message, options, func] = args as [string, DeprecationOptions, (...args: any[]) => any];
-      return function(this: any, ...args: any[]) {
+      return function (this: any, ...args: any[]) {
         deprecate(message, false, options);
         return func.apply(this, args);
       };
     } else {
       let [message, func] = args;
-      return function(this: any) {
+      return function (this: any) {
         deprecate(message);
         return func.apply(this, arguments);
       };
diff --git a/packages/@ember/debug/tests/handlers-test.js b/packages/@ember/debug/tests/handlers-test.js
index e02a98ec4d9..62e4e138c92 100644
--- a/packages/@ember/debug/tests/handlers-test.js
+++ b/packages/@ember/debug/tests/handlers-test.js
@@ -80,7 +80,7 @@ moduleFor(
       let actualCalls = [];
 
       function generateHandler(item) {
-        return function(message, options, next) {
+        return function (message, options, next) {
           assert.equal(message, expectedMessage, `message supplied to ${item} handler is correct`);
           assert.equal(options, expectedOptions, `options supplied to ${item} handler is correct`);
 
@@ -90,7 +90,7 @@ moduleFor(
         };
       }
 
-      expected.forEach(item => registerHandler('blarz', generateHandler(item)));
+      expected.forEach((item) => registerHandler('blarz', generateHandler(item)));
 
       invoke('blarz', expectedMessage, false, expectedOptions);
 
diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 6dd05eaf3f3..0d5d401dd98 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -23,7 +23,7 @@ let originalDeprecateHandler;
 let originalWarnHandler;
 
 const originalConsoleWarn = console.warn; // eslint-disable-line no-console
-const noop = function() {};
+const noop = function () {};
 
 moduleFor(
   'ember-debug',
@@ -91,7 +91,7 @@ moduleFor(
       assert.expect(3);
 
       ENV.RAISE_ON_DEPRECATION = true;
-      registerHandler(function(message, options, next) {
+      registerHandler(function (message, options, next) {
         if (!options || options.id !== 'my-deprecation') {
           next(...arguments);
         }
@@ -140,7 +140,7 @@ moduleFor(
 
       deprecate(
         'Deprecation is thrown',
-        function() {
+        function () {
           assert.ok(false, 'this function should not be invoked');
         },
         { id: 'test', until: 'forever' }
@@ -204,7 +204,7 @@ moduleFor(
       let until = 'forever';
       let shouldThrow = false;
 
-      registerHandler(function(message, options) {
+      registerHandler(function (message, options) {
         if (options && options.id === id) {
           if (shouldThrow) {
             throw new Error(message);
@@ -228,11 +228,11 @@ moduleFor(
 
       shouldThrow = true;
 
-      assert.throws(function() {
+      assert.throws(function () {
         deprecate('Deprecation is thrown', false, { id, until });
       });
 
-      assert.throws(function() {
+      assert.throws(function () {
         deprecate('Deprecation is thrown', false, { id, until });
       });
     }
@@ -306,7 +306,7 @@ moduleFor(
     ['@test warn without test but with options does not trigger an assertion'](assert) {
       assert.expect(1);
 
-      registerWarnHandler(function(message) {
+      registerWarnHandler(function (message) {
         assert.equal(message, 'foo', 'warning was triggered');
       });
 
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 7bd6caeec5c..62844532a9e 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -458,7 +458,7 @@ function resolverFor(namespace) {
 }
 
 function buildInitializerMethod(bucketName, humanName) {
-  return function(initializer) {
+  return function (initializer) {
     // If this is the first initializer being added to a subclass, we are going to reopen the class
     // to make sure we have a new `initializers` object, which extends from the parent class' using
     // prototypal inheritance. Without this, attempting to add initializers to the subclass would
diff --git a/packages/@ember/engine/instance.js b/packages/@ember/engine/instance.js
index df67f5b7f53..2718d18e03b 100644
--- a/packages/@ember/engine/instance.js
+++ b/packages/@ember/engine/instance.js
@@ -77,7 +77,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
       return this._bootPromise;
     }
 
-    this._bootPromise = new RSVP.Promise(resolve => resolve(this._bootSync(options)));
+    this._bootPromise = new RSVP.Promise((resolve) => resolve(this._bootSync(options)));
 
     return this._bootPromise;
   },
@@ -175,7 +175,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
 
     let registrations = ['route:basic', 'service:-routing'];
 
-    registrations.forEach(key => this.register(key, parent.resolveRegistration(key)));
+    registrations.forEach((key) => this.register(key, parent.resolveRegistration(key)));
 
     let env = parent.lookup('-environment:main');
     this.register('-environment:main', env, { instantiate: false });
@@ -192,7 +192,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
       singletons.push('event_dispatcher:main');
     }
 
-    singletons.forEach(key => this.register(key, parent.lookup(key), { instantiate: false }));
+    singletons.forEach((key) => this.register(key, parent.lookup(key), { instantiate: false }));
 
     this.inject('view', '_environment', '-environment:main');
     this.inject('route', '_environment', '-environment:main');
diff --git a/packages/@ember/engine/tests/engine_initializers_test.js b/packages/@ember/engine/tests/engine_initializers_test.js
index 5ac0795b61b..94f604705e1 100644
--- a/packages/@ember/engine/tests/engine_initializers_test.js
+++ b/packages/@ember/engine/tests/engine_initializers_test.js
@@ -274,7 +274,7 @@ moduleFor(
       assert.equal(firstInitializerRunCount, 1, 'second initializer only was run');
       assert.equal(secondInitializerRunCount, 1, 'second initializer only was run');
 
-      run(function() {
+      run(function () {
         firstEngineInstance.destroy();
         secondEngineInstance.destroy();
 
@@ -331,7 +331,7 @@ moduleFor(
         'second initializers was run when subclass created'
       );
 
-      run(function() {
+      run(function () {
         firstEngineInstance.destroy();
         secondEngineInstance.destroy();
 
@@ -352,7 +352,7 @@ moduleFor(
         initialize() {},
       });
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         FirstEngine.initializer({
           name: 'abc',
           initialize() {},
diff --git a/packages/@ember/engine/tests/engine_instance_test.js b/packages/@ember/engine/tests/engine_instance_test.js
index c47348a1ba6..91e52ba4082 100644
--- a/packages/@ember/engine/tests/engine_instance_test.js
+++ b/packages/@ember/engine/tests/engine_instance_test.js
@@ -83,7 +83,7 @@ moduleFor(
 
       // Stub `cloneParentDependencies`, the internals of which are tested along
       // with application instances.
-      engineInstance.cloneParentDependencies = function() {
+      engineInstance.cloneParentDependencies = function () {
         assert.ok(true, 'parent dependencies are cloned');
       };
 
diff --git a/packages/@ember/error/tests/index_test.js b/packages/@ember/error/tests/index_test.js
index bf053d05b85..f6ecf5815cf 100644
--- a/packages/@ember/error/tests/index_test.js
+++ b/packages/@ember/error/tests/index_test.js
@@ -9,7 +9,7 @@ moduleFor(
         () => {
           throw new EmberError('A Message');
         },
-        function(e) {
+        function (e) {
           return e.message === 'A Message';
         },
         'the assigned message was displayed'
diff --git a/packages/@ember/instrumentation/tests/index-test.js b/packages/@ember/instrumentation/tests/index-test.js
index a3b79c2d927..40fdb21dfaa 100644
--- a/packages/@ember/instrumentation/tests/index-test.js
+++ b/packages/@ember/instrumentation/tests/index-test.js
@@ -9,7 +9,7 @@ moduleFor(
     }
 
     ['@test execute block even if no listeners'](assert) {
-      let result = instrument('render', {}, function() {
+      let result = instrument('render', {}, function () {
         return 'hello';
       });
       assert.equal(result, 'hello', 'called block');
@@ -47,9 +47,9 @@ moduleFor(
         },
       });
 
-      instrument('render', sentPayload, function() {});
+      instrument('render', sentPayload, function () {});
 
-      instrument('render.handlebars', sentPayload, function() {});
+      instrument('render.handlebars', sentPayload, function () {});
     }
 
     ['@test returning a value from the before callback passes it to the after callback'](assert) {
@@ -76,7 +76,7 @@ moduleFor(
         },
       });
 
-      instrument('render', null, function() {});
+      instrument('render', null, function () {});
     }
 
     ['@test instrument with 2 args (name, callback) no payload'](assert) {
@@ -89,7 +89,7 @@ moduleFor(
         after() {},
       });
 
-      instrument('render', function() {});
+      instrument('render', function () {});
     }
 
     ['@test instrument with 3 args (name, callback, binding) no payload'](assert) {
@@ -105,7 +105,7 @@ moduleFor(
 
       instrument(
         'render',
-        function() {
+        function () {
           assert.deepEqual(this, binding);
         },
         binding
@@ -123,7 +123,7 @@ moduleFor(
         after() {},
       });
 
-      instrument('render', expectedPayload, function() {});
+      instrument('render', expectedPayload, function () {});
     }
 
     ['@test instrument with 4 args (name, payload, callback, binding) with payload'](assert) {
@@ -141,7 +141,7 @@ moduleFor(
       instrument(
         'render',
         expectedPayload,
-        function() {
+        function () {
           assert.deepEqual(this, binding);
         },
         binding
@@ -177,7 +177,7 @@ moduleFor(
     }
 
     ['@test it is possible to add a new subscriber after the first instrument'](assert) {
-      instrument('render.handlebars', null, function() {});
+      instrument('render.handlebars', null, function () {});
 
       subscribe('render', {
         before() {
@@ -188,7 +188,7 @@ moduleFor(
         },
       });
 
-      instrument('render.handlebars', null, function() {});
+      instrument('render.handlebars', null, function () {});
     }
 
     ['@test it is possible to remove a subscriber'](assert) {
@@ -208,11 +208,11 @@ moduleFor(
         },
       });
 
-      instrument('render.handlebars', null, function() {});
+      instrument('render.handlebars', null, function () {});
 
       unsubscribe(subscriber);
 
-      instrument('render.handlebars', null, function() {});
+      instrument('render.handlebars', null, function () {});
     }
   }
 );
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 0769033c58e..53bfafc5039 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -8,11 +8,11 @@ import {
 import { assert } from '@ember/debug';
 import { consumeTag, tagFor, track, UpdatableTag, updateTag } from '@glimmer/validator';
 
-let wrapGetterSetter = function(_target: object, key: string, desc: PropertyDescriptor) {
+let wrapGetterSetter = function (_target: object, key: string, desc: PropertyDescriptor) {
   let { get: originalGet } = desc;
 
   if (originalGet !== undefined) {
-    desc.get = function() {
+    desc.get = function () {
       let propertyTag = tagFor(this, key) as UpdatableTag;
       let ret;
 
@@ -128,7 +128,7 @@ export function dependentKeyCompat(
   if (!isElementDescriptor([target, key, desc])) {
     desc = target as PropertyDescriptor;
 
-    let decorator = function(
+    let decorator = function (
       target: object,
       key: string,
       _desc: DecoratorPropertyDescriptor,
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index f39c27b812e..461b6d6f8a6 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -157,7 +157,7 @@ export function action(target, key, desc) {
   if (!isElementDescriptor([target, key, desc])) {
     actionFn = target;
 
-    let decorator = function(target, key, desc, meta, isClassicDecorator) {
+    let decorator = function (target, key, desc, meta, isClassicDecorator) {
       assert(
         'The @action decorator may only be passed a method when used in classic classes. You should decorate methods directly in native classes',
         isClassicDecorator
diff --git a/packages/@ember/object/lib/computed/computed_macros.js b/packages/@ember/object/lib/computed/computed_macros.js
index 5806d6f5e69..a18ebdbf7a4 100644
--- a/packages/@ember/object/lib/computed/computed_macros.js
+++ b/packages/@ember/object/lib/computed/computed_macros.js
@@ -43,7 +43,7 @@ function generateComputedWithPredicate(name, predicate) {
 
     let dependentKeys = expandPropertiesToArray(name, properties);
 
-    let computedFunc = computed(...dependentKeys, function() {
+    let computedFunc = computed(...dependentKeys, function () {
       let lastIdx = dependentKeys.length - 1;
 
       for (let i = 0; i < lastIdx; i++) {
@@ -123,7 +123,7 @@ export function empty(dependentKey) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(`${dependentKey}.length`, function() {
+  return computed(`${dependentKey}.length`, function () {
     return isEmpty(get(this, dependentKey));
   });
 }
@@ -188,7 +188,7 @@ export function notEmpty(dependentKey) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(`${dependentKey}.length`, function() {
+  return computed(`${dependentKey}.length`, function () {
     return !isEmpty(get(this, dependentKey));
   });
 }
@@ -252,7 +252,7 @@ export function none(dependentKey) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return isNone(get(this, dependentKey));
   });
 }
@@ -313,7 +313,7 @@ export function not(dependentKey) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return !get(this, dependentKey);
   });
 }
@@ -386,7 +386,7 @@ export function bool(dependentKey) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return Boolean(get(this, dependentKey));
   });
 }
@@ -453,7 +453,7 @@ export function match(dependentKey, regexp) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     let value = get(this, dependentKey);
     return regexp.test(value);
   });
@@ -520,7 +520,7 @@ export function equal(dependentKey, value) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return get(this, dependentKey) === value;
   });
 }
@@ -586,7 +586,7 @@ export function gt(dependentKey, value) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return get(this, dependentKey) > value;
   });
 }
@@ -652,7 +652,7 @@ export function gte(dependentKey, value) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return get(this, dependentKey) >= value;
   });
 }
@@ -718,7 +718,7 @@ export function lt(dependentKey, value) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return get(this, dependentKey) < value;
   });
 }
@@ -784,7 +784,7 @@ export function lte(dependentKey, value) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return computed(dependentKey, function() {
+  return computed(dependentKey, function () {
     return get(this, dependentKey) <= value;
   });
 }
@@ -861,7 +861,7 @@ export function lte(dependentKey, value) {
   the values of all the original values for properties.
   @public
 */
-export const and = generateComputedWithPredicate('and', value => value);
+export const and = generateComputedWithPredicate('and', (value) => value);
 
 /**
   A computed property which performs a logical `or` on the original values for
@@ -929,7 +929,7 @@ export const and = generateComputedWithPredicate('and', value => value);
   the values of all the original values for properties.
   @public
 */
-export const or = generateComputedWithPredicate('or', value => !value);
+export const or = generateComputedWithPredicate('or', (value) => !value);
 
 /**
   Creates a new property that is an alias for another property on an object.
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.js b/packages/@ember/object/lib/computed/reduce_computed_macros.js
index 69fdab3f1ea..d2e80b7a2a2 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.js
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.js
@@ -12,7 +12,7 @@ function reduceMacro(dependentKey, callback, initialValue, name) {
     !/[[\]{}]/g.test(dependentKey)
   );
 
-  return computed(`${dependentKey}.[]`, function() {
+  return computed(`${dependentKey}.[]`, function () {
     let arr = get(this, dependentKey);
     if (arr === null || typeof arr !== 'object') {
       return initialValue;
@@ -31,7 +31,7 @@ function arrayMacro(dependentKey, additionalDependentKeys, callback) {
     dependentKey += '.[]';
   }
 
-  return computed(dependentKey, ...additionalDependentKeys, function() {
+  return computed(dependentKey, ...additionalDependentKeys, function () {
     let value = get(this, propertyName);
     if (isArray(value)) {
       return emberA(callback.call(this, value));
@@ -44,11 +44,11 @@ function arrayMacro(dependentKey, additionalDependentKeys, callback) {
 function multiArrayMacro(_dependentKeys, callback, name) {
   assert(
     `Dependent keys passed to \`computed.${name}\` shouldn't contain brace expanding pattern.`,
-    _dependentKeys.every(dependentKey => !/[[\]{}]/g.test(dependentKey))
+    _dependentKeys.every((dependentKey) => !/[[\]{}]/g.test(dependentKey))
   );
-  let dependentKeys = _dependentKeys.map(key => `${key}.[]`);
+  let dependentKeys = _dependentKeys.map((key) => `${key}.[]`);
 
-  return computed(...dependentKeys, function() {
+  return computed(...dependentKeys, function () {
     return emberA(callback.call(this, _dependentKeys));
   }).readOnly();
 }
@@ -421,7 +421,7 @@ export function map(dependentKey, additionalDependentKeys, callback) {
     Array.isArray(additionalDependentKeys)
   );
 
-  return arrayMacro(dependentKey, additionalDependentKeys, function(value) {
+  return arrayMacro(dependentKey, additionalDependentKeys, function (value) {
     return value.map(callback, this);
   });
 }
@@ -525,7 +525,7 @@ export function mapBy(dependentKey, propertyKey) {
     !/[[\]{}]/g.test(dependentKey)
   );
 
-  return map(`${dependentKey}.@each.${propertyKey}`, item => get(item, propertyKey));
+  return map(`${dependentKey}.@each.${propertyKey}`, (item) => get(item, propertyKey));
 }
 
 /**
@@ -677,7 +677,7 @@ export function filter(dependentKey, additionalDependentKeys, callback) {
     Array.isArray(additionalDependentKeys)
   );
 
-  return arrayMacro(dependentKey, additionalDependentKeys, function(value) {
+  return arrayMacro(dependentKey, additionalDependentKeys, function (value) {
     return value.filter(callback, this);
   });
 }
@@ -751,9 +751,9 @@ export function filterBy(dependentKey, propertyKey, value) {
 
   let callback;
   if (arguments.length === 2) {
-    callback = item => get(item, propertyKey);
+    callback = (item) => get(item, propertyKey);
   } else {
-    callback = item => get(item, propertyKey) === value;
+    callback = (item) => get(item, propertyKey) === value;
   }
 
   return filter(`${dependentKey}.@each.${propertyKey}`, callback);
@@ -825,14 +825,14 @@ export function uniq(...args) {
 
   return multiArrayMacro(
     args,
-    function(dependentKeys) {
+    function (dependentKeys) {
       let uniq = emberA();
       let seen = new Set();
 
-      dependentKeys.forEach(dependentKey => {
+      dependentKeys.forEach((dependentKey) => {
         let value = get(this, dependentKey);
         if (isArray(value)) {
-          value.forEach(item => {
+          value.forEach((item) => {
             if (!seen.has(item)) {
               seen.add(item);
               uniq.push(item);
@@ -917,7 +917,7 @@ export function uniqBy(dependentKey, propertyKey) {
     !/[[\]{}]/g.test(dependentKey)
   );
 
-  return computed(`${dependentKey}.[]`, function() {
+  return computed(`${dependentKey}.[]`, function () {
     let list = get(this, dependentKey);
     return isArray(list) ? uniqByArray(list, propertyKey) : emberA();
   }).readOnly();
@@ -1059,13 +1059,13 @@ export function intersect(...args) {
 
   return multiArrayMacro(
     args,
-    function(dependentKeys) {
-      let arrays = dependentKeys.map(dependentKey => {
+    function (dependentKeys) {
+      let arrays = dependentKeys.map((dependentKey) => {
         let array = get(this, dependentKey);
         return isArray(array) ? array : [];
       });
 
-      let results = arrays.pop().filter(candidate => {
+      let results = arrays.pop().filter((candidate) => {
         for (let i = 0; i < arrays.length; i++) {
           let found = false;
           let array = arrays[i];
@@ -1170,7 +1170,7 @@ export function setDiff(setAProperty, setBProperty) {
     !/[[\]{}]/g.test(setAProperty) && !/[[\]{}]/g.test(setBProperty)
   );
 
-  return computed(`${setAProperty}.[]`, `${setBProperty}.[]`, function() {
+  return computed(`${setAProperty}.[]`, `${setBProperty}.[]`, function () {
     let setA = get(this, setAProperty);
     let setB = get(this, setBProperty);
 
@@ -1181,7 +1181,7 @@ export function setDiff(setAProperty, setBProperty) {
       return emberA(setA);
     }
 
-    return setA.filter(x => setB.indexOf(x) === -1);
+    return setA.filter((x) => setB.indexOf(x) === -1);
   }).readOnly();
 }
 
@@ -1243,8 +1243,8 @@ export function collect(...dependentKeys) {
 
   return multiArrayMacro(
     dependentKeys,
-    function() {
-      let res = dependentKeys.map(key => {
+    function () {
+      let res = dependentKeys.map((key) => {
         let val = get(this, key);
         return val === undefined ? null : val;
       });
@@ -1466,7 +1466,7 @@ export function sort(itemsKey, additionalDependentKeys, sortDefinition) {
 }
 
 function customSort(itemsKey, additionalDependentKeys, comparator) {
-  return arrayMacro(itemsKey, additionalDependentKeys, function(value) {
+  return arrayMacro(itemsKey, additionalDependentKeys, function (value) {
     return value.slice().sort((x, y) => comparator.call(this, x, y));
   });
 }
@@ -1474,12 +1474,12 @@ function customSort(itemsKey, additionalDependentKeys, comparator) {
 // This one needs to dynamically set up and tear down observers on the itemsKey
 // depending on the sortProperties
 function propertySort(itemsKey, sortPropertiesKey) {
-  let cp = autoComputed(function(key) {
+  let cp = autoComputed(function (key) {
     let sortProperties = get(this, sortPropertiesKey);
 
     assert(
       `The sort definition for '${key}' on ${this} must be a function or an array of strings`,
-      isArray(sortProperties) && sortProperties.every(s => typeof s === 'string')
+      isArray(sortProperties) && sortProperties.every((s) => typeof s === 'string')
     );
 
     let itemsKeyIsAtThis = itemsKey === '@this';
@@ -1501,7 +1501,7 @@ function propertySort(itemsKey, sortPropertiesKey) {
 }
 
 function normalizeSortProperties(sortProperties) {
-  return sortProperties.map(p => {
+  return sortProperties.map((p) => {
     let [prop, direction] = p.split(':');
     direction = direction || 'asc';
 
diff --git a/packages/@ember/object/tests/action_test.js b/packages/@ember/object/tests/action_test.js
index 88b26322d86..3de82ec35f9 100644
--- a/packages/@ember/object/tests/action_test.js
+++ b/packages/@ember/object/tests/action_test.js
@@ -233,7 +233,7 @@ moduleFor(
     '@test action decorator throws an error if passed a function in native classes'() {
       expectAssertion(() => {
         class TestObject extends EmberObject {
-          @action(function() {}) foo = 'bar';
+          @action(function () {}) foo = 'bar';
         }
 
         new TestObject();
@@ -242,7 +242,7 @@ moduleFor(
 
     '@test action decorator can be used as a classic decorator with strings'(assert) {
       let FooComponent = Component.extend({
-        foo: action(function() {
+        foo: action(function () {
           assert.ok(true, 'called!');
         }),
       });
@@ -259,7 +259,7 @@ moduleFor(
 
     '@test action decorator can be used as a classic decorator directly'(assert) {
       let FooComponent = Component.extend({
-        foo: action(function() {
+        foo: action(function () {
           assert.ok(true, 'called!');
         }),
       });
diff --git a/packages/@ember/object/tests/computed/computed_macros_test.js b/packages/@ember/object/tests/computed/computed_macros_test.js
index 07b13ee12d0..50817b2e89a 100644
--- a/packages/@ember/object/tests/computed/computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/computed_macros_test.js
@@ -109,7 +109,7 @@ moduleFor(
       defineProperty(
         obj,
         'bay',
-        computed(function() {
+        computed(function () {
           return 'apple';
         })
       );
@@ -145,10 +145,10 @@ moduleFor(
         obj,
         'original',
         computed({
-          get: function() {
+          get: function () {
             return constantValue;
           },
-          set: function() {
+          set: function () {
             return constantValue;
           },
         })
@@ -403,11 +403,11 @@ moduleFor(
 
     ['@test computed.or and computed.and warn about dependent keys with spaces']() {
       let obj = { one: true, two: true };
-      expectAssertion(function() {
+      expectAssertion(function () {
         defineProperty(obj, 'oneOrTwo', or('one', 'two three'));
       }, /Dependent keys passed to computed\.or\(\) can't have spaces\./);
 
-      expectAssertion(function() {
+      expectAssertion(function () {
         defineProperty(obj, 'oneAndTwo', and('one', 'two three'));
       }, /Dependent keys passed to computed\.and\(\) can't have spaces\./);
     }
@@ -448,7 +448,7 @@ moduleFor(
       assert.equal(get(obj, 'lastName'), 'Zeenny');
       assert.equal(get(obj, 'nickName'), 'Teddy');
 
-      assert.throws(function() {
+      assert.throws(function () {
         set(obj, 'nickName', 'TeddyBear');
       }, / /);
 
@@ -467,7 +467,7 @@ moduleFor(
       defineProperty(
         obj,
         'bay',
-        computed(function() {
+        computed(function () {
           return 'apple';
         })
       );
@@ -493,31 +493,31 @@ moduleFor(
         deprecatingAlias('bay', { id: 'bay-deprecation', until: 'some.version' })
       );
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         assert.equal(get(obj, 'barAlias'), 'asdf');
       }, 'Usage of `barAlias` is deprecated, use `bar` instead.');
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         assert.equal(get(obj, 'bazAlias'), null);
       }, 'Usage of `bazAlias` is deprecated, use `baz` instead.');
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         assert.equal(get(obj, 'quzAlias'), false);
       }, 'Usage of `quzAlias` is deprecated, use `quz` instead.');
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         assert.equal(get(obj, 'bayAlias'), 'apple');
       }, 'Usage of `bayAlias` is deprecated, use `bay` instead.');
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         set(obj, 'barAlias', 'newBar');
       }, 'Usage of `barAlias` is deprecated, use `bar` instead.');
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         set(obj, 'bazAlias', 'newBaz');
       }, 'Usage of `bazAlias` is deprecated, use `baz` instead.');
 
-      expectDeprecation(function() {
+      expectDeprecation(function () {
         set(obj, 'quzAlias', null);
       }, 'Usage of `quzAlias` is deprecated, use `quz` instead.');
 
diff --git a/packages/@ember/object/tests/computed/dependent-key-compat-test.js b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
index 412a5e64f77..4c18e43ec2c 100644
--- a/packages/@ember/object/tests/computed/dependent-key-compat-test.js
+++ b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
@@ -42,7 +42,7 @@ moduleFor(
           },
         }),
 
-        fullName: computed('givenName', 'lastName', function() {
+        fullName: computed('givenName', 'lastName', function () {
           return `${this.givenName} ${this.lastName}`;
         }),
       });
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index 63074d535d0..fe336f45f85 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -39,8 +39,8 @@ moduleFor(
   class extends AbstractTestCase {
     beforeEach() {
       obj = EmberObject.extend({
-        mapped: map('array.@each.v', item => item.v),
-        mappedObjects: map('arrayObjects.@each.v', item => ({
+        mapped: map('array.@each.v', (item) => item.v),
+        mappedObjects: map('arrayObjects.@each.v', (item) => ({
           name: item.v.name,
         })),
       }).create({
@@ -55,7 +55,7 @@ moduleFor(
     }
 
     ['@test map is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('mapped', 1);
       }, /Cannot set read-only property "mapped" on object:/);
     }
@@ -76,7 +76,7 @@ moduleFor(
       let array = emberA();
 
       obj = EmberObject.extend({
-        mapped: map('array', item => item.toUpperCase()),
+        mapped: map('array', (item) => item.toUpperCase()),
       }).create({
         array,
       });
@@ -96,7 +96,7 @@ moduleFor(
 
     ['@test it has the correct `this`'](assert) {
       obj = EmberObject.extend({
-        mapped: map('array', function(item) {
+        mapped: map('array', function (item) {
           assert.equal(this, obj, 'should have correct context');
           return this.upperCase(item);
         }),
@@ -153,7 +153,7 @@ moduleFor(
       let cObj = { v: 'c' };
 
       obj = EmberObject.extend({
-        mapped: map('array.@each.v', item => get(item, 'v').toUpperCase()),
+        mapped: map('array.@each.v', (item) => get(item, 'v').toUpperCase()),
       }).create({
         array,
       });
@@ -174,7 +174,7 @@ moduleFor(
 
     ['@test it updates if additional dependent keys are modified'](assert) {
       obj = EmberObject.extend({
-        mapped: map('array', ['key'], function(item) {
+        mapped: map('array', ['key'], function (item) {
           return item[this.key];
         }),
       }).create({
@@ -202,11 +202,11 @@ moduleFor(
       }, /The final parameter provided to map must be a callback function/);
 
       expectAssertion(() => {
-        map('items.@each.{prop}', 'foo', function() {});
+        map('items.@each.{prop}', 'foo', function () {});
       }, /The second parameter provided to map must either be the callback or an array of additional dependent keys/);
 
       expectAssertion(() => {
-        map('items.@each.{prop}', function() {}, ['foo']);
+        map('items.@each.{prop}', function () {}, ['foo']);
       }, /The final parameter provided to map must be a callback function/);
 
       expectAssertion(() => {
@@ -232,7 +232,7 @@ moduleFor(
     }
 
     ['@test mapBy is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('mapped', 1);
       }, /Cannot set read-only property "mapped" on object:/);
     }
@@ -269,7 +269,7 @@ moduleFor(
   class extends AbstractTestCase {
     beforeEach() {
       obj = EmberObject.extend({
-        filtered: filter('array', item => item % 2 === 0),
+        filtered: filter('array', (item) => item % 2 === 0),
       }).create({
         array: emberA([1, 2, 3, 4, 5, 6, 7, 8]),
       });
@@ -280,7 +280,7 @@ moduleFor(
     }
 
     ['@test filter is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('filtered', 1);
       }, /Cannot set read-only property "filtered" on object:/);
     }
@@ -305,7 +305,7 @@ moduleFor(
 
     ['@test it has the correct `this`'](assert) {
       obj = EmberObject.extend({
-        filtered: filter('array', function(item, index) {
+        filtered: filter('array', function (item, index) {
           assert.equal(this, obj);
           return this.isOne(index);
         }),
@@ -430,7 +430,7 @@ moduleFor(
       let item = EmberObject.create({ prop: true });
 
       obj = EmberObject.extend({
-        filtered: filter('items.@each.{prop}', function(item) {
+        filtered: filter('items.@each.{prop}', function (item) {
           return item.get('prop') === true;
         }),
       }).create({
@@ -446,7 +446,7 @@ moduleFor(
 
     ['@test it updates if additional dependent keys are modified'](assert) {
       obj = EmberObject.extend({
-        filtered: filter('array', ['modulo'], function(item) {
+        filtered: filter('array', ['modulo'], function (item) {
           return item % this.modulo === 0;
         }),
       }).create({
@@ -474,11 +474,11 @@ moduleFor(
       }, /The final parameter provided to filter must be a callback function/);
 
       expectAssertion(() => {
-        filter('items.@each.{prop}', 'foo', function() {});
+        filter('items.@each.{prop}', 'foo', function () {});
       }, /The second parameter provided to filter must either be the callback or an array of additional dependent keys/);
 
       expectAssertion(() => {
-        filter('items.@each.{prop}', function() {}, ['foo']);
+        filter('items.@each.{prop}', function () {}, ['foo']);
       }, /The final parameter provided to filter must be a callback function/);
 
       expectAssertion(() => {
@@ -511,7 +511,7 @@ moduleFor(
     }
 
     ['@test filterBy is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('as', 1);
       }, /Cannot set read-only property "as" on object:/);
     }
@@ -642,7 +642,7 @@ moduleFor(
 [
   ['uniq', uniq],
   ['union', union],
-].forEach(tuple => {
+].forEach((tuple) => {
   let [name, macro] = tuple;
 
   moduleFor(
@@ -663,7 +663,7 @@ moduleFor(
       }
 
       [`@test ${name} is readOnly`](assert) {
-        assert.throws(function() {
+        assert.throws(function () {
           obj.set('union', 1);
         }, /Cannot set read-only property "union" on object:/);
       }
@@ -761,7 +761,7 @@ moduleFor(
     }
 
     ['@test uniqBy is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('uniqueById', 1);
       }, /Cannot set read-only property "uniqueById" on object:/);
     }
@@ -845,7 +845,7 @@ moduleFor(
     }
 
     ['@test intersect is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('intersection', 1);
       }, /Cannot set read-only property "intersection" on object:/);
     }
@@ -920,14 +920,14 @@ moduleFor(
     }
 
     ['@test setDiff is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('diff', 1);
       }, /Cannot set read-only property "diff" on object:/);
     }
 
     ['@test it asserts if given fewer or more than two dependent properties']() {
       expectAssertion(
-        function() {
+        function () {
           EmberObject.extend({
             diff: setDiff('array'),
           }).create({
@@ -940,7 +940,7 @@ moduleFor(
       );
 
       expectAssertion(
-        function() {
+        function () {
           EmberObject.extend({
             diff: setDiff('array', 'array2', 'array3'),
           }).create({
@@ -1601,7 +1601,7 @@ moduleFor(
 
     ['@test sort has correct `this`'](assert) {
       let obj = EmberObject.extend({
-        sortedItems: sort('items.@each.fname', function(a, b) {
+        sortedItems: sort('items.@each.fname', function (a, b) {
           assert.equal(this, obj, 'expected the object to be `this`');
           return this.sortByLastName(a, b);
         }),
@@ -1621,7 +1621,7 @@ moduleFor(
     }
 
     ['@test sort (with function) is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('sortedItems', 1);
       }, /Cannot set read-only property "sortedItems" on object:/);
     }
@@ -1807,7 +1807,7 @@ moduleFor(
 
     ['@test sort updates if additional dependent keys are present'](assert) {
       obj = EmberObject.extend({
-        sortedItems: sort('items', ['sortFunction'], function() {
+        sortedItems: sort('items', ['sortFunction'], function () {
           return this.sortFunction(...arguments);
         }),
       }).create({
@@ -1853,11 +1853,11 @@ moduleFor(
       }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
 
       expectAssertion(() => {
-        sort('foo', 'bar', function() {});
+        sort('foo', 'bar', function () {});
       }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
 
       expectAssertion(() => {
-        sort('foo', ['bar'], function() {}, 'baz');
+        sort('foo', ['bar'], function () {}, 'baz');
       }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
     }
   }
@@ -1977,10 +1977,10 @@ moduleFor(
     ) {
       let obj2 = klass
         .extend({
-          items: computed('sibling.sortedItems.[]', function() {
+          items: computed('sibling.sortedItems.[]', function () {
             return this.get('sibling.sortedItems');
           }),
-          asdf: observer('sibling.sortedItems.[]', function() {
+          asdf: observer('sibling.sortedItems.[]', function () {
             this.get('sibling.sortedItems');
           }),
         })
@@ -2064,7 +2064,7 @@ moduleFor(
     }
 
     ['@test max is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('max', 1);
       }, /Cannot set read-only property "max" on object:/);
     }
@@ -2113,7 +2113,7 @@ moduleFor(
     }
 
     ['@test min is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('min', 1);
       }, /Cannot set read-only property "min" on object:/);
     }
@@ -2331,7 +2331,7 @@ moduleFor(
     }
 
     ['@test sum is readOnly'](assert) {
-      assert.throws(function() {
+      assert.throws(function () {
         obj.set('total', 1);
       }, /Cannot set read-only property "total" on object:/);
     }
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index ed1d39a4f35..caadd6c4a2d 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -219,7 +219,7 @@ export function join() {
 export const bind = (...curried) => {
   assert(
     'could not find a suitable method to bind',
-    (function(methodOrTarget, methodOrArg) {
+    (function (methodOrTarget, methodOrArg) {
       // Applies the same logic as backburner parseArgs for detecting if a method
       // is actually being passed.
       let length = arguments.length;
diff --git a/packages/@ember/runloop/tests/later_test.js b/packages/@ember/runloop/tests/later_test.js
index ae7c4cf812e..5a5181545cd 100644
--- a/packages/@ember/runloop/tests/later_test.js
+++ b/packages/@ember/runloop/tests/later_test.js
@@ -61,7 +61,7 @@ moduleFor(
       run(() => {
         later(
           obj,
-          function() {
+          function () {
             this.invoked = true;
           },
           100
@@ -81,7 +81,7 @@ moduleFor(
       run(() => {
         later(
           obj,
-          function(amt) {
+          function (amt) {
             this.invoked += amt;
           },
           10,
@@ -105,7 +105,7 @@ moduleFor(
 
         later(
           obj,
-          function(amt) {
+          function (amt) {
             this.invoked += amt;
             secondRunLoop = getCurrentRunLoop();
           },
diff --git a/packages/@ember/runloop/tests/onerror_test.js b/packages/@ember/runloop/tests/onerror_test.js
index efa0442edad..5bde8671809 100644
--- a/packages/@ember/runloop/tests/onerror_test.js
+++ b/packages/@ember/runloop/tests/onerror_test.js
@@ -37,7 +37,7 @@ moduleFor(
       let originalIsTesting = isTesting();
 
       let caught;
-      setOnerror(error => {
+      setOnerror((error) => {
         caught = error;
       });
       setDispatchOverride(null);
diff --git a/packages/@ember/runloop/tests/run_bind_test.js b/packages/@ember/runloop/tests/run_bind_test.js
index 51f4da6e236..505c9bd4ab8 100644
--- a/packages/@ember/runloop/tests/run_bind_test.js
+++ b/packages/@ember/runloop/tests/run_bind_test.js
@@ -40,7 +40,7 @@ moduleFor(
     ['@test [GH#16652] bind throws an error if callback is undefined']() {
       let assertBindThrows = (msg, ...args) => {
         expectAssertion(
-          function() {
+          function () {
             bind(...args);
           },
           /could not find a suitable method to bind/,
diff --git a/packages/@ember/runloop/tests/unwind_test.js b/packages/@ember/runloop/tests/unwind_test.js
index 9dea6bdca8e..d551a355356 100644
--- a/packages/@ember/runloop/tests/unwind_test.js
+++ b/packages/@ember/runloop/tests/unwind_test.js
@@ -11,7 +11,7 @@ moduleFor(
       assert.throws(
         () => {
           run(() => {
-            schedule('actions', function() {
+            schedule('actions', function () {
               throw new EmberError('boom!');
             });
           });
@@ -36,7 +36,7 @@ moduleFor(
 
       assert.throws(
         () => {
-          run(function() {
+          run(function () {
             throw new EmberError('boom!');
           });
         },
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 3e138b4bf1b..0a621de3ddd 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -10,14 +10,14 @@ import { getString } from './lib/string_registry';
 
 const STRING_DASHERIZE_REGEXP = /[ _]/g;
 
-const STRING_DASHERIZE_CACHE = new Cache<string, string>(1000, key =>
+const STRING_DASHERIZE_CACHE = new Cache<string, string>(1000, (key) =>
   decamelize(key).replace(STRING_DASHERIZE_REGEXP, '-')
 );
 
 const STRING_CAMELIZE_REGEXP_1 = /(-|_|\.|\s)+(.)?/g;
 const STRING_CAMELIZE_REGEXP_2 = /(^|\/)([A-Z])/g;
 
-const CAMELIZE_CACHE = new Cache<string, string>(1000, key =>
+const CAMELIZE_CACHE = new Cache<string, string>(1000, (key) =>
   key
     .replace(STRING_CAMELIZE_REGEXP_1, (_match, _separator, chr) => (chr ? chr.toUpperCase() : ''))
     .replace(STRING_CAMELIZE_REGEXP_2, (match /*, separator, chr */) => match.toLowerCase())
@@ -27,7 +27,7 @@ const STRING_CLASSIFY_REGEXP_1 = /^(-|_)+(.)?/;
 const STRING_CLASSIFY_REGEXP_2 = /(.)(-|_|\.|\s)+(.)?/g;
 const STRING_CLASSIFY_REGEXP_3 = /(^|\/|\.)([a-z])/g;
 
-const CLASSIFY_CACHE = new Cache<string, string>(1000, str => {
+const CLASSIFY_CACHE = new Cache<string, string>(1000, (str) => {
   let replace1 = (_match: string, _separator: string, chr: string) =>
     chr ? `_${chr.toUpperCase()}` : '';
   let replace2 = (_match: string, initialChar: string, _separator: string, chr: string) =>
@@ -46,7 +46,7 @@ const CLASSIFY_CACHE = new Cache<string, string>(1000, str => {
 const STRING_UNDERSCORE_REGEXP_1 = /([a-z\d])([A-Z]+)/g;
 const STRING_UNDERSCORE_REGEXP_2 = /-|\s+/g;
 
-const UNDERSCORE_CACHE = new Cache<string, string>(1000, str =>
+const UNDERSCORE_CACHE = new Cache<string, string>(1000, (str) =>
   str
     .replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2')
     .replace(STRING_UNDERSCORE_REGEXP_2, '_')
@@ -55,13 +55,13 @@ const UNDERSCORE_CACHE = new Cache<string, string>(1000, str =>
 
 const STRING_CAPITALIZE_REGEXP = /(^|\/)([a-z\u00C0-\u024F])/g;
 
-const CAPITALIZE_CACHE = new Cache<string, string>(1000, str =>
+const CAPITALIZE_CACHE = new Cache<string, string>(1000, (str) =>
   str.replace(STRING_CAPITALIZE_REGEXP, (match /*, separator, chr */) => match.toUpperCase())
 );
 
 const STRING_DECAMELIZE_REGEXP = /([a-z\d])([A-Z])/g;
 
-const DECAMELIZE_CACHE = new Cache<string, string>(1000, str =>
+const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
   str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase()
 );
 
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
index f071f1c4db6..0910b606761 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
@@ -32,7 +32,7 @@ export default function assertAgainstNamedBlocks(env: EmberASTPluginEnvironment)
 
       MustacheStatement(node: AST.MustacheStatement) {
         if (node.path.type === 'PathExpression' && node.path.original === 'yield') {
-          let to = node.hash.pairs.filter(pair => pair.key === 'to')[0];
+          let to = node.hash.pairs.filter((pair) => pair.key === 'to')[0];
 
           // Glimmer template compiler ensures yield must receive a string literal,
           // so we only need to check if it is not "default" or "inverse"
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
index 04a8b5a91ed..5931fee8327 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
@@ -70,7 +70,7 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
             return;
           }
 
-          node.hash.pairs.forEach(pair => {
+          node.hash.pairs.forEach((pair) => {
             if (EVENTS.indexOf(pair.key) > -1 && pair.value.type === 'StringLiteral') {
               deprecate(deprecationMessage(node, pair.key, pair.value.original), false, {
                 id: 'ember-component.send-action',
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 5ae9ffc6363..abb6122223d 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -64,7 +64,7 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
               node.params.unshift(subExpr);
             }
 
-            node.hash.pairs.forEach(pair => {
+            node.hash.pairs.forEach((pair) => {
               if (pair.key === 'insertBefore') {
                 assert(
                   `Can only pass null to insertBefore in in-element, received: ${JSON.stringify(
@@ -97,7 +97,7 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
           // https://github.com/glimmerjs/glimmer-vm/blob/ba9b37d44b85fa1385eeeea71910ff5798198c8e/packages/%40glimmer/syntax/lib/parser/handlebars-node-visitors.ts#L340-L363
           let needsInsertBefore = true;
           let hash = node.hash;
-          hash.pairs.forEach(pair => {
+          hash.pairs.forEach((pair) => {
             if (pair.key === 'insertBefore') {
               assert(
                 `Can only pass a null or undefined literals to insertBefore in -in-element, received: ${JSON.stringify(
diff --git a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
index d66269e2145..dce5af89144 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
@@ -48,7 +48,7 @@ function transformPositionalLinkToIntoNamedArguments(
     hash: { pairs },
   } = node;
 
-  let keys = pairs.map(pair => pair.key);
+  let keys = pairs.map((pair) => pair.key);
 
   if (params.length === 0) {
     assert(
diff --git a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
index f5f2573d220..b18447583fc 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
@@ -49,7 +49,7 @@ function process(b: Builders, node: AST.BlockStatement | AST.MustacheStatement)
     node.hash.pairs.push(classPair);
   }
 
-  each(allOfTheMicrosyntaxIndexes, index => {
+  each(allOfTheMicrosyntaxIndexes, (index) => {
     node.hash.pairs.splice(index, 1);
   });
 
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 47100dfe1ca..9707713a516 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -29,8 +29,8 @@ export default function compileOptions(
     options.plugins = { ast: [...USER_PLUGINS, ...PLUGINS] };
   } else {
     let potententialPugins = [...USER_PLUGINS, ...PLUGINS];
-    let providedPlugins = options.plugins.ast.map(plugin => wrapLegacyPluginIfNeeded(plugin));
-    let pluginsToAdd = potententialPugins.filter(plugin => {
+    let providedPlugins = options.plugins.ast.map((plugin) => wrapLegacyPluginIfNeeded(plugin));
+    let pluginsToAdd = potententialPugins.filter((plugin) => {
       return options.plugins.ast.indexOf(plugin) === -1;
     });
     options.plugins.ast = providedPlugins.concat(pluginsToAdd);
@@ -103,6 +103,6 @@ export function unregisterPlugin(type: string, PluginClass: PluginFunc | LegacyP
   }
 
   USER_PLUGINS = USER_PLUGINS.filter(
-    plugin => plugin !== PluginClass && plugin.__raw !== PluginClass
+    (plugin) => plugin !== PluginClass && plugin.__raw !== PluginClass
   );
 }
diff --git a/packages/ember-template-compiler/lib/system/dasherize-component-name.ts b/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
index df9783d3a09..44a25065881 100644
--- a/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
+++ b/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
@@ -7,7 +7,7 @@ import { Cache } from '@ember/-internals/utils';
 const SIMPLE_DASHERIZE_REGEXP = /[A-Z]|::/g;
 const ALPHA = /[A-Za-z0-9]/;
 
-export default new Cache<string, string>(1000, key =>
+export default new Cache<string, string>(1000, (key) =>
   key.replace(SIMPLE_DASHERIZE_REGEXP, (char, index) => {
     if (char === '::') {
       return '/';
diff --git a/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js b/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js
index cf97ce70f1a..e5276727e14 100644
--- a/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js
+++ b/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js
@@ -14,10 +14,10 @@ const EVENTS = [
 
 class DeprecateSendActionTest extends AbstractTestCase {}
 
-EVENTS.forEach(function(e) {
+EVENTS.forEach(function (e) {
   DeprecateSendActionTest.prototype[
     `@test Using \`{{input ${e}="actionName"}}\` provides a deprecation`
-  ] = function() {
+  ] = function () {
     let expectedMessage = `Passing actions to components as strings (like \`{{input ${e}="foo-bar"}}\`) is deprecated. Please use closure actions instead (\`{{input ${e}=(action "foo-bar")}}\`). ('baz/foo-bar' @ L1:C0) `;
 
     expectDeprecation(() => {
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index 66bdd896242..c49297f0b59 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -38,7 +38,7 @@ class LegacyCustomTransform {
   transform(ast) {
     let walker = new this.syntax.Walker();
 
-    walker.visit(ast, node => {
+    walker.visit(ast, (node) => {
       if (node.type !== 'ElementNode') {
         return;
       }
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 28a8dd4eb32..1c2b85a6fe1 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -42,7 +42,7 @@ function clone<T extends object>(node: T): T {
   let out = Object.create(null);
   let keys = Object.keys(node);
 
-  keys.forEach(key => {
+  keys.forEach((key) => {
     let value = node[key];
 
     if (value !== null && typeof value === 'object') {
@@ -59,7 +59,7 @@ function deloc<T extends object, U extends { loc?: AST.SourceLocation }>(node: T
   let out = Object.create(null);
   let keys = Object.keys(node);
 
-  keys.forEach(key => {
+  keys.forEach((key) => {
     let value = node[key];
 
     if (key === 'loc') {
diff --git a/packages/ember-testing/lib/events.js b/packages/ember-testing/lib/events.js
index 94719847d7b..3cf439c6876 100644
--- a/packages/ember-testing/lib/events.js
+++ b/packages/ember-testing/lib/events.js
@@ -23,7 +23,7 @@ export function focus(el) {
   if (el.isContentEditable || isFormControl(el)) {
     let type = el.getAttribute('type');
     if (type !== 'checkbox' && type !== 'radio' && type !== 'hidden') {
-      run(null, function() {
+      run(null, function () {
         let browserIsNotFocused = document.hasFocus && !document.hasFocus();
 
         // makes `document.activeElement` be `element`. If the browser is focused, it also fires a focus event
diff --git a/packages/ember-testing/lib/ext/application.js b/packages/ember-testing/lib/ext/application.js
index a7a2c6cd932..aaefc303179 100644
--- a/packages/ember-testing/lib/ext/application.js
+++ b/packages/ember-testing/lib/ext/application.js
@@ -160,11 +160,11 @@ EmberApplication.reopen({
 // But still here for backwards compatibility
 // of helper chaining
 function protoWrap(proto, name, callback, isAsync) {
-  proto[name] = function(...args) {
+  proto[name] = function (...args) {
     if (isAsync) {
       return callback.apply(this, args);
     } else {
-      return this.then(function() {
+      return this.then(function () {
         return callback.apply(this, args);
       });
     }
diff --git a/packages/ember-testing/lib/ext/rsvp.js b/packages/ember-testing/lib/ext/rsvp.js
index 47dfccb2a85..1c67abfb2b2 100644
--- a/packages/ember-testing/lib/ext/rsvp.js
+++ b/packages/ember-testing/lib/ext/rsvp.js
@@ -3,7 +3,7 @@ import { backburner } from '@ember/runloop';
 import { isTesting } from '@ember/debug';
 import { asyncStart, asyncEnd } from '../test/adapter';
 
-RSVP.configure('async', function(callback, promise) {
+RSVP.configure('async', function (callback, promise) {
   // if schedule will cause autorun, we need to inform adapter
   if (isTesting() && !backburner.currentInstance) {
     asyncStart();
diff --git a/packages/ember-testing/lib/helpers/pause_test.js b/packages/ember-testing/lib/helpers/pause_test.js
index 1b26ffb52da..c4dd718035d 100644
--- a/packages/ember-testing/lib/helpers/pause_test.js
+++ b/packages/ember-testing/lib/helpers/pause_test.js
@@ -59,7 +59,7 @@ export function resumeTest() {
 export function pauseTest() {
   info('Testing paused. Use `resumeTest()` to continue.');
 
-  return new RSVP.Promise(resolve => {
+  return new RSVP.Promise((resolve) => {
     resume = resolve;
   }, 'TestAdapter paused promise');
 }
diff --git a/packages/ember-testing/lib/helpers/wait.js b/packages/ember-testing/lib/helpers/wait.js
index 04e8ff0a687..9ae293cf586 100644
--- a/packages/ember-testing/lib/helpers/wait.js
+++ b/packages/ember-testing/lib/helpers/wait.js
@@ -37,7 +37,7 @@ import { pendingRequests } from '../test/pending_requests';
   @since 1.0.0
 */
 export default function wait(app, value) {
-  return new RSVP.Promise(function(resolve) {
+  return new RSVP.Promise(function (resolve) {
     let router = app.__container__.lookup('router:main');
 
     // Every 10ms, poll for the async thing to have finished
diff --git a/packages/ember-testing/lib/initializers.js b/packages/ember-testing/lib/initializers.js
index 1d4cf57757a..0ff1d963fb6 100644
--- a/packages/ember-testing/lib/initializers.js
+++ b/packages/ember-testing/lib/initializers.js
@@ -2,7 +2,7 @@ import { onLoad } from '@ember/application';
 
 let name = 'deferReadiness in `testing` mode';
 
-onLoad('Ember.Application', function(Application) {
+onLoad('Ember.Application', function (Application) {
   if (!Application.initializers[name]) {
     Application.initializer({
       name: name,
diff --git a/packages/ember-testing/lib/support.js b/packages/ember-testing/lib/support.js
index 0b78db8bc24..a45df0845ca 100644
--- a/packages/ember-testing/lib/support.js
+++ b/packages/ember-testing/lib/support.js
@@ -29,7 +29,7 @@ function testCheckboxClick(handler) {
 }
 
 if (hasDOM && !jQueryDisabled) {
-  $(function() {
+  $(function () {
     /*
       Determine whether a checkbox checked using jQuery's "click" method will have
       the correct value for its checked property.
@@ -38,7 +38,7 @@ if (hasDOM && !jQueryDisabled) {
       patch it to work correctly as in the commit for the actual fix:
       https://github.com/jquery/jquery/commit/1fb2f92.
     */
-    testCheckboxClick(function() {
+    testCheckboxClick(function () {
       if (!this.checked && !$.event.special.click) {
         $.event.special.click = {
           // For checkbox, fire native event so checked state will be right
@@ -53,7 +53,7 @@ if (hasDOM && !jQueryDisabled) {
     });
 
     // Try again to verify that the patch took effect or blow up.
-    testCheckboxClick(function() {
+    testCheckboxClick(function () {
       warn("clicked checkboxes should be checked! the jQuery patch didn't work", this.checked, {
         id: 'ember-testing.test-checkbox-click',
       });
diff --git a/packages/ember-testing/lib/test/pending_requests.js b/packages/ember-testing/lib/test/pending_requests.js
index 4ba949f5ba0..7ebb01b7894 100644
--- a/packages/ember-testing/lib/test/pending_requests.js
+++ b/packages/ember-testing/lib/test/pending_requests.js
@@ -13,7 +13,7 @@ export function incrementPendingRequests(_, xhr) {
 }
 
 export function decrementPendingRequests(_, xhr) {
-  setTimeout(function() {
+  setTimeout(function () {
     for (let i = 0; i < requests.length; i++) {
       if (xhr === requests[i]) {
         requests.splice(i, 1);
diff --git a/packages/ember-testing/lib/test/promise.js b/packages/ember-testing/lib/test/promise.js
index c3c1077b8b9..5ab18027d65 100644
--- a/packages/ember-testing/lib/test/promise.js
+++ b/packages/ember-testing/lib/test/promise.js
@@ -11,7 +11,9 @@ export default class TestPromise extends RSVP.Promise {
 
   then(_onFulfillment, ...args) {
     let onFulfillment =
-      typeof _onFulfillment === 'function' ? result => isolate(_onFulfillment, result) : undefined;
+      typeof _onFulfillment === 'function'
+        ? (result) => isolate(_onFulfillment, result)
+        : undefined;
     return super.then(onFulfillment, ...args);
   }
 }
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index bef2385fb32..c75a86877b1 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -18,7 +18,7 @@ if (!jQueryDisabled) {
     'ember-testing Acceptance',
     class extends AutobootApplicationTestCase {
       constructor() {
-        setDebugFunction('debug', function() {});
+        setDebugFunction('debug', function () {});
         super();
         this._originalAdapter = Test.adapter;
 
@@ -26,7 +26,7 @@ if (!jQueryDisabled) {
 
         runTask(() => {
           this.createApplication();
-          this.router.map(function() {
+          this.router.map(function () {
             this.route('posts');
             this.route('comments');
 
@@ -102,7 +102,7 @@ if (!jQueryDisabled) {
           this.application.setupForTesting();
 
           Test.registerAsyncHelper('slowHelper', () => {
-            return new RSVP.Promise(resolve => later(resolve, 10));
+            return new RSVP.Promise((resolve) => later(resolve, 10));
           });
 
           this.application.injectTestHelpers();
@@ -152,7 +152,7 @@ if (!jQueryDisabled) {
             );
             return window.click('.does-not-exist');
           })
-          .catch(e => {
+          .catch((e) => {
             assert.equal(
               e.message,
               'Element .does-not-exist not found.',
@@ -176,7 +176,7 @@ if (!jQueryDisabled) {
               'hello',
               'Fillin successfully works'
             );
-            window.find('.ember-text-field').one('keypress', e => {
+            window.find('.ember-text-field').one('keypress', (e) => {
               assert.equal(e.keyCode, 13, 'keyevent chained with correct keyCode.');
               assert.equal(e.which, 13, 'keyevent chained with correct which.');
             });
@@ -327,7 +327,7 @@ if (!jQueryDisabled) {
 
         window.visit('/posts');
 
-        window.click('.invalid-element').catch(error => {
+        window.click('.invalid-element').catch((error) => {
           assert.equal(
             error.message,
             'Element .invalid-element not found.',
@@ -441,7 +441,7 @@ if (!jQueryDisabled) {
 
         window.visit('/posts');
 
-        window.andThen(function() {
+        window.andThen(function () {
           assert.equal(window.currentURL(), '/posts', 'First visited URL is correct');
         });
 
diff --git a/packages/ember-testing/tests/adapters/qunit_test.js b/packages/ember-testing/tests/adapters/qunit_test.js
index 5c0e1d01e28..46864f04167 100644
--- a/packages/ember-testing/tests/adapters/qunit_test.js
+++ b/packages/ember-testing/tests/adapters/qunit_test.js
@@ -28,7 +28,7 @@ moduleFor(
     ['@test asyncStart waits for asyncEnd to finish a test'](assert) {
       adapter.asyncStart();
 
-      setTimeout(function() {
+      setTimeout(function () {
         assert.ok(true);
         adapter.asyncEnd();
       }, 50);
@@ -41,7 +41,7 @@ moduleFor(
       adapter.asyncStart();
       adapter.asyncEnd();
 
-      setTimeout(function() {
+      setTimeout(function () {
         assert.ok(true);
         adapter.asyncEnd();
       }, 50);
diff --git a/packages/ember-testing/tests/adapters_test.js b/packages/ember-testing/tests/adapters_test.js
index 55cf16eb5fe..7d94f0dccc5 100644
--- a/packages/ember-testing/tests/adapters_test.js
+++ b/packages/ember-testing/tests/adapters_test.js
@@ -11,7 +11,7 @@ import { getDebugFunction, setDebugFunction } from '@ember/debug';
 const HAS_UNHANDLED_REJECTION_HANDLER = 'onunhandledrejection' in window;
 
 const originalDebug = getDebugFunction('debug');
-const noop = function() {};
+const noop = function () {};
 
 let App, originalAdapter, originalQUnit, originalWindowOnerror, originalQUnitUnhandledRejection;
 
@@ -71,7 +71,7 @@ moduleFor(
         },
       });
 
-      run(function() {
+      run(function () {
         App = EmberApplication.create({
           Resolver: ModuleBasedTestResolver,
         });
@@ -87,7 +87,7 @@ moduleFor(
 
       Test.adapter = null;
 
-      run(function() {
+      run(function () {
         App = EmberApplication.create({
           Resolver: ModuleBasedTestResolver,
         });
@@ -104,7 +104,7 @@ moduleFor(
 
       Test.adapter = null;
 
-      run(function() {
+      run(function () {
         App = EmberApplication.create({
           Resolver: ModuleBasedTestResolver,
         });
@@ -152,7 +152,7 @@ moduleFor(
         },
       };
 
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.ok(true, 'onerror is called for sync errors even if TestAdapter is setup');
         throw error;
       });
@@ -171,7 +171,7 @@ moduleFor(
         },
       };
 
-      setOnerror(function() {
+      setOnerror(function () {
         assert.ok(true, 'onerror is called for sync errors even if TestAdapter is setup');
       });
 
@@ -190,7 +190,7 @@ moduleFor(
         },
       };
 
-      window.onerror = function(message) {
+      window.onerror = function (message) {
         caughtByWindowOnerror = message;
         // prevent "bubbling" and therefore failing the test
         return true;
@@ -236,7 +236,7 @@ moduleFor(
         },
       };
 
-      setOnerror(function() {
+      setOnerror(function () {
         assert.ok(true, 'onerror is invoked for errors thrown in next/later');
       });
 
@@ -264,7 +264,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(rejection) {
+      window.onunhandledrejection = function (rejection) {
         assert.pushResult({
           result: /the error/.test(rejection.reason),
           actual: rejection.reason,
@@ -281,7 +281,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, timeout));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, timeout));
     }
 
     [`@test ${message} when both Ember.onerror and TestAdapter without \`exception\` method are present - rsvp`](
@@ -294,7 +294,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
         exception: undefined,
       });
 
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.pushResult({
           result: /the error/.test(error.message),
           actual: error.message,
@@ -308,7 +308,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, timeout));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, timeout));
     }
 
     [`@test ${message} when TestAdapter is present - rsvp`](assert) {
@@ -330,7 +330,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, timeout));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, timeout));
     }
 
     [`@test ${message} when both Ember.onerror and TestAdapter are present - rsvp`](assert) {
@@ -347,7 +347,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
         },
       });
 
-      setOnerror(function() {
+      setOnerror(function () {
         assert.notOk(true, 'Ember.onerror is not called if Test.adapter does not rethrow');
       });
 
@@ -355,7 +355,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, timeout));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, timeout));
     }
 
     [`@test ${message} when both Ember.onerror and TestAdapter are present - rsvp`](assert) {
@@ -373,7 +373,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
         },
       });
 
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -385,14 +385,14 @@ function testAdapter(message, generatePromise, timeout = 10) {
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, timeout));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, timeout));
     }
   };
 }
 
 moduleFor(
   'Adapter Errors: .then callback',
-  testAdapter('errors in promise constructor', error => {
+  testAdapter('errors in promise constructor', (error) => {
     new RSVP.Promise(() => {
       throw error;
     });
@@ -401,7 +401,7 @@ moduleFor(
 
 moduleFor(
   'Adapter Errors: Promise Contructor',
-  testAdapter('errors in promise constructor', error => {
+  testAdapter('errors in promise constructor', (error) => {
     RSVP.resolve().then(() => {
       throw error;
     });
@@ -412,8 +412,8 @@ moduleFor(
   'Adapter Errors: Promise chain .then callback',
   testAdapter(
     'errors in promise constructor',
-    error => {
-      new RSVP.Promise(resolve => setTimeout(resolve, 10)).then(() => {
+    (error) => {
+      new RSVP.Promise((resolve) => setTimeout(resolve, 10)).then(() => {
         throw error;
       });
     },
diff --git a/packages/ember-testing/tests/ext/rsvp_test.js b/packages/ember-testing/tests/ext/rsvp_test.js
index aa72ae0d243..9c5e5267383 100644
--- a/packages/ember-testing/tests/ext/rsvp_test.js
+++ b/packages/ember-testing/tests/ext/rsvp_test.js
@@ -53,23 +53,23 @@ moduleFor(
       assert.equal(asyncEnded, 0);
 
       user
-        .then(function(user) {
+        .then(function (user) {
           assert.equal(asyncStarted, 1);
           assert.equal(asyncEnded, 1);
 
           assert.equal(user.name, 'tomster');
 
-          return RSVP.Promise.resolve(1).then(function() {
+          return RSVP.Promise.resolve(1).then(function () {
             assert.equal(asyncStarted, 1);
             assert.equal(asyncEnded, 1);
           });
         })
-        .then(function() {
+        .then(function () {
           assert.equal(asyncStarted, 1);
           assert.equal(asyncEnded, 1);
 
-          return new RSVP.Promise(function(resolve) {
-            setTimeout(function() {
+          return new RSVP.Promise(function (resolve) {
+            setTimeout(function () {
               assert.equal(asyncStarted, 1);
               assert.equal(asyncEnded, 1);
 
@@ -80,7 +80,7 @@ moduleFor(
             }, 0);
           });
         })
-        .then(function(user) {
+        .then(function (user) {
           assert.equal(user.name, 'async tomster');
           assert.equal(asyncStarted, 2);
           assert.equal(asyncEnded, 2);
@@ -95,11 +95,11 @@ moduleFor(
   class extends AbstractTestCase {
     ['does not throw error when falsy value passed to then'](assert) {
       assert.expect(1);
-      return new TestPromise(function(resolve) {
+      return new TestPromise(function (resolve) {
         resolve();
       })
         .then(null)
-        .then(function() {
+        .then(function () {
           assert.ok(true);
         });
     }
@@ -107,13 +107,13 @@ moduleFor(
     ['able to get last Promise'](assert) {
       assert.expect(2);
 
-      let p1 = new TestPromise(function(resolve) {
+      let p1 = new TestPromise(function (resolve) {
         resolve();
-      }).then(function() {
+      }).then(function () {
         assert.ok(true);
       });
 
-      let p2 = new TestPromise(function(resolve) {
+      let p2 = new TestPromise(function (resolve) {
         resolve();
       });
 
diff --git a/packages/ember-testing/tests/helper_registration_test.js b/packages/ember-testing/tests/helper_registration_test.js
index e557678266d..e265a50d7ed 100644
--- a/packages/ember-testing/tests/helper_registration_test.js
+++ b/packages/ember-testing/tests/helper_registration_test.js
@@ -6,7 +6,7 @@ import { moduleFor, ModuleBasedTestResolver, AbstractTestCase } from 'internal-t
 let App, appBooted, helperContainer;
 
 function registerHelper() {
-  Test.registerHelper('boot', function(app) {
+  Test.registerHelper('boot', function (app) {
     run(app, app.advanceReadiness);
     appBooted = true;
     return app.testHelpers.wait();
@@ -23,7 +23,7 @@ function setupApp() {
   appBooted = false;
   helperContainer = {};
 
-  run(function() {
+  run(function () {
     App = EmberApplication.create({
       Resolver: ModuleBasedTestResolver,
     });
@@ -67,7 +67,7 @@ moduleFor(
 
       App.testHelpers
         .boot()
-        .then(function() {
+        .then(function () {
           assert.ok(appBooted);
         })
         .finally(done);
diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
index 253af59d2e8..6d5da3d186d 100644
--- a/packages/ember-testing/tests/helpers_test.js
+++ b/packages/ember-testing/tests/helpers_test.js
@@ -21,7 +21,7 @@ import { registerWaiter, unregisterWaiter } from '../lib/test/waiters';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
 const originalInfo = getDebugFunction('info');
-const noop = function() {};
+const noop = function () {};
 
 function registerHelper() {
   Test.registerHelper('LeakyMcLeakLeak', () => {});
@@ -187,7 +187,7 @@ if (!jQueryDisabled) {
         // bind(this) so Babel doesn't leak _this
         // into the context onInjectHelpers.
         runTask(
-          function() {
+          function () {
             this.createApplication();
             this.application.setupForTesting();
           }.bind(this)
@@ -312,19 +312,19 @@ if (!jQueryDisabled) {
         } = this;
         return testHelpers
           .wait('text')
-          .then(val => {
+          .then((val) => {
             assert.equal(val, 'text', 'can resolve to a string');
             return testHelpers.wait(1);
           })
-          .then(val => {
+          .then((val) => {
             assert.equal(val, 1, 'can resolve to an integer');
             return testHelpers.wait(objectValue);
           })
-          .then(val => {
+          .then((val) => {
             assert.equal(val, objectValue, 'can resolve to an object');
             return testHelpers.wait(RSVP.resolve(promiseObjectValue));
           })
-          .then(val => {
+          .then((val) => {
             assert.equal(val, promiseObjectValue, 'can resolve to a promise resolution value');
           });
       }
@@ -339,10 +339,10 @@ if (!jQueryDisabled) {
 
             didInsertElement() {
               let wrapper = document.querySelector('.index-wrapper');
-              wrapper.addEventListener('mousedown', e => events.push(e.type));
-              wrapper.addEventListener('mouseup', e => events.push(e.type));
-              wrapper.addEventListener('click', e => events.push(e.type));
-              wrapper.addEventListener('focusin', e => {
+              wrapper.addEventListener('mousedown', (e) => events.push(e.type));
+              wrapper.addEventListener('mouseup', (e) => events.push(e.type));
+              wrapper.addEventListener('click', (e) => events.push(e.type));
+              wrapper.addEventListener('focusin', (e) => {
                 // IE11 _sometimes_ triggers focusin **twice** in a row
                 // (we believe this is when it is under higher load)
                 //
@@ -458,7 +458,7 @@ if (!jQueryDisabled) {
             classNames: 'index-wrapper',
 
             didInsertElement() {
-              let pushEvent = e => events.push(e);
+              let pushEvent = (e) => events.push(e);
               this.element.addEventListener('mousedown', pushEvent);
               this.element.addEventListener('mouseup', pushEvent);
               this.element.addEventListener('click', pushEvent);
@@ -489,7 +489,7 @@ if (!jQueryDisabled) {
             return click('.index-wrapper');
           })
           .then(() => {
-            events.forEach(e => {
+            events.forEach((e) => {
               assert.ok(e instanceof window.Event, 'The event is an instance of MouseEvent');
               assert.ok(typeof e.screenX === 'number', 'screenX is correct');
               assert.ok(typeof e.screenY === 'number', 'screenY is correct');
@@ -510,7 +510,7 @@ if (!jQueryDisabled) {
           Component.extend({
             classNames: 'index-wrapper',
             didInsertElement() {
-              this.element.addEventListener('mouseenter', e => (evt = e));
+              this.element.addEventListener('mouseenter', (e) => (evt = e));
             },
           })
         );
@@ -616,8 +616,8 @@ if (!jQueryDisabled) {
           Component.extend({
             didInsertElement() {
               let domElem = document.querySelector('.input');
-              domElem.addEventListener('change', e => (event = e));
-              domElem.addEventListener('keydown', e => (event = e));
+              domElem.addEventListener('change', (e) => (event = e));
+              domElem.addEventListener('keydown', (e) => (event = e));
             },
           })
         );
@@ -663,11 +663,11 @@ if (!jQueryDisabled) {
           Component.extend({
             didInsertElement() {
               let firstInput = document.querySelector('.input');
-              firstInput.addEventListener('blur', e => (event = e));
-              firstInput.addEventListener('change', e => (event = e));
+              firstInput.addEventListener('blur', (e) => (event = e));
+              firstInput.addEventListener('change', (e) => (event = e));
               let secondInput = document.querySelector('#limited .input');
-              secondInput.addEventListener('blur', e => (event = e));
-              secondInput.addEventListener('change', e => (event = e));
+              secondInput.addEventListener('blur', (e) => (event = e));
+              secondInput.addEventListener('change', (e) => (event = e));
             },
           })
         );
@@ -715,8 +715,8 @@ if (!jQueryDisabled) {
           Component.extend({
             didInsertElement() {
               let foo = document.getElementById('foo');
-              foo.addEventListener('blur', e => (event = e));
-              foo.addEventListener('change', e => (event = e));
+              foo.addEventListener('blur', (e) => (event = e));
+              foo.addEventListener('change', (e) => (event = e));
             },
           })
         );
@@ -914,11 +914,11 @@ if (!jQueryDisabled) {
           Component.extend({
             didInsertElement() {
               let firstInput = document.querySelector('.input');
-              firstInput.addEventListener('keydown', e => (event = e), false);
-              firstInput.addEventListener('change', e => (event = e), false);
+              firstInput.addEventListener('keydown', (e) => (event = e), false);
+              firstInput.addEventListener('change', (e) => (event = e), false);
               let secondInput = document.querySelector('#limited .input');
-              secondInput.addEventListener('keydown', e => (event = e), false);
-              secondInput.addEventListener('change', e => (event = e), false);
+              secondInput.addEventListener('keydown', (e) => (event = e), false);
+              secondInput.addEventListener('change', (e) => (event = e), false);
             },
           })
         );
@@ -1029,8 +1029,8 @@ if (!jQueryDisabled) {
           this.createApplication();
           this.application.setupForTesting();
           this.application.injectTestHelpers();
-          this.router.map(function() {
-            this.route('posts', { resetNamespace: true }, function() {
+          this.router.map(function () {
+            this.route('posts', { resetNamespace: true }, function () {
               this.route('new');
               this.route('edit', { resetNamespace: true });
             });
@@ -1116,7 +1116,7 @@ if (!jQueryDisabled) {
         assert.equal(pendingRequests(), 1, 'Ember.Test.pendingRequests was incremented');
 
         this.trigger('ajaxComplete', xhr);
-        setTimeout(function() {
+        setTimeout(function () {
           assert.equal(pendingRequests(), 0, 'Ember.Test.pendingRequests was decremented');
           done();
         }, 0);
@@ -1168,8 +1168,8 @@ if (!jQueryDisabled) {
         runTask(() => {
           this.createApplication();
 
-          this.router.map(function() {
-            this.route('user', { resetNamespace: true }, function() {
+          this.router.map(function () {
+            this.route('user', { resetNamespace: true }, function () {
               this.route('profile');
               this.route('edit');
             });
@@ -1177,7 +1177,7 @@ if (!jQueryDisabled) {
 
           // Emulate a long-running unscheduled async operation.
           let resolveLater = () =>
-            new RSVP.Promise(resolve => {
+            new RSVP.Promise((resolve) => {
               /*
                * The wait() helper has a 10ms tick. We should resolve() after
                * at least one tick to test whether wait() held off while the
diff --git a/packages/ember-testing/tests/integration_test.js b/packages/ember-testing/tests/integration_test.js
index b8ce3d868df..962988e4362 100644
--- a/packages/ember-testing/tests/integration_test.js
+++ b/packages/ember-testing/tests/integration_test.js
@@ -42,7 +42,7 @@ moduleFor(
           );
         }
 
-        this.router.map(function() {
+        this.router.map(function () {
           this.route('people', { path: '/' });
         });
 
diff --git a/packages/ember-testing/tests/reexports_test.js b/packages/ember-testing/tests/reexports_test.js
index fc5c0e056fe..a667216214b 100644
--- a/packages/ember-testing/tests/reexports_test.js
+++ b/packages/ember-testing/tests/reexports_test.js
@@ -10,7 +10,7 @@ class ReexportsTestCase extends AbstractTestCase {}
   ['Test.Adapter', 'ember-testing', 'Adapter'],
   ['Test.QUnitAdapter', 'ember-testing', 'QUnitAdapter'],
   ['setupForTesting', 'ember-testing'],
-].forEach(reexport => {
+].forEach((reexport) => {
   let [path, moduleId, exportName] = reexport;
 
   // default path === exportName if none present
@@ -18,7 +18,7 @@ class ReexportsTestCase extends AbstractTestCase {}
     exportName = path;
   }
 
-  ReexportsTestCase.prototype[`@test Ember.${path} exports correctly`] = function(assert) {
+  ReexportsTestCase.prototype[`@test Ember.${path} exports correctly`] = function (assert) {
     confirmExport(Ember, assert, path, moduleId, exportName);
   };
 });
diff --git a/packages/ember-testing/tests/test/waiters-test.js b/packages/ember-testing/tests/test/waiters-test.js
index 9ad81c1f2b2..34fbb0ddceb 100644
--- a/packages/ember-testing/tests/test/waiters-test.js
+++ b/packages/ember-testing/tests/test/waiters-test.js
@@ -56,12 +56,12 @@ moduleFor(
 
       let obj = { foo: true };
 
-      this.waiters.add(obj, function() {
+      this.waiters.add(obj, function () {
         assert.ok(this.foo, 'has proper `this` context');
         return true;
       });
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'is called');
         return true;
       });
@@ -74,12 +74,12 @@ moduleFor(
 
       let obj = { foo: true };
 
-      this.waiters.add(obj, function() {
+      this.waiters.add(obj, function () {
         assert.ok(true, 'precond - waiter with context is registered');
         return true;
       });
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'precond - waiter without context is registered');
         return true;
       });
@@ -93,13 +93,13 @@ moduleFor(
     ['@test checkWaiters returns false if all waiters return true'](assert) {
       assert.expect(3);
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'precond - waiter is registered');
 
         return true;
       });
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'precond - waiter is registered');
 
         return true;
@@ -111,13 +111,13 @@ moduleFor(
     ['@test checkWaiters returns true if any waiters return false'](assert) {
       assert.expect(3);
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'precond - waiter is registered');
 
         return true;
       });
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'precond - waiter is registered');
 
         return false;
@@ -129,13 +129,13 @@ moduleFor(
     ['@test checkWaiters short circuits after first falsey waiter'](assert) {
       assert.expect(2);
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.ok(true, 'precond - waiter is registered');
 
         return false;
       });
 
-      this.waiters.add(function() {
+      this.waiters.add(function () {
         assert.notOk(true, 'waiter should not be called');
       });
 
diff --git a/packages/ember/index.js b/packages/ember/index.js
index a9b8f12898a..f1c777877fe 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -158,7 +158,7 @@ import {
 const Ember = (typeof context.imports.Ember === 'object' && context.imports.Ember) || {};
 
 Ember.isNamespace = true;
-Ember.toString = function() {
+Ember.toString = function () {
   return 'Ember';
 };
 
@@ -440,7 +440,7 @@ Ember.isEqual = isEqual;
 Ember.inject = function inject() {
   assert(
     `Injected properties must be created through helpers, see '${Object.keys(inject)
-      .map(k => `'inject.${k}'`)
+      .map((k) => `'inject.${k}'`)
       .join(' or ')}'`
   );
 };
@@ -581,7 +581,7 @@ Ember.HTMLBars = {
 };
 
 if (ENV.EXTEND_PROTOTYPES.String) {
-  String.prototype.htmlSafe = function() {
+  String.prototype.htmlSafe = function () {
     return htmlSafe(this);
   };
 }
diff --git a/packages/ember/tests/application_lifecycle_test.js b/packages/ember/tests/application_lifecycle_test.js
index 278ba084cd3..54970ce1e9b 100644
--- a/packages/ember/tests/application_lifecycle_test.js
+++ b/packages/ember/tests/application_lifecycle_test.js
@@ -5,7 +5,7 @@ import { Component } from '@ember/-internals/glimmer';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
 const originalDebug = getDebugFunction('debug');
-const noop = function() {};
+const noop = function () {};
 
 moduleFor(
   'Application Lifecycle - route hooks',
diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
index 47bd522ed24..a7215de7fce 100644
--- a/packages/ember/tests/component_registration_test.js
+++ b/packages/ember/tests/component_registration_test.js
@@ -65,9 +65,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let text = this.$('div.testing123')
-          .text()
-          .trim();
+        let text = this.$('div.testing123').text().trim();
         assert.equal(text, 'hello world', 'The component is composed correctly');
       });
     }
@@ -89,9 +87,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let text = this.$('#wrapper')
-          .text()
-          .trim();
+        let text = this.$('#wrapper').text().trim();
         assert.equal(
           text,
           'there goes watch him as he GOES',
@@ -125,9 +121,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let text = this.$('#wrapper')
-          .text()
-          .trim();
+        let text = this.$('#wrapper').text().trim();
         assert.equal(
           text,
           'hello world funkytowny-funkytowny!!!',
@@ -155,9 +149,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let text = this.$('#wrapper')
-          .text()
-          .trim();
+        let text = this.$('#wrapper').text().trim();
         assert.equal(
           text,
           'hello world goodfreakingTIMES-goodfreakingTIMES!!!',
@@ -200,9 +192,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let text = this.$('#wrapper')
-          .text()
-          .trim();
+        let text = this.$('#wrapper').text().trim();
         assert.equal(text, 'inner-outer', 'The component is composed correctly');
       });
     }
@@ -242,9 +232,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let text = this.$('#wrapper')
-          .text()
-          .trim();
+        let text = this.$('#wrapper').text().trim();
         assert.equal(text, 'inner-outer', 'The component is composed correctly');
       });
     }
diff --git a/packages/ember/tests/ember-test-helpers-test.js b/packages/ember/tests/ember-test-helpers-test.js
index 300de65bbcc..a6b16625a4d 100644
--- a/packages/ember/tests/ember-test-helpers-test.js
+++ b/packages/ember/tests/ember-test-helpers-test.js
@@ -15,12 +15,12 @@ const { module, test } = QUnit;
   `@ember/test-helpers` here (will make a nested module for each significant
   revision).
 */
-module('@ember/test-helpers emulation test', function() {
-  module('v1.6.0', function() {
+module('@ember/test-helpers emulation test', function () {
+  module('v1.6.0', function () {
     let EMPTY_TEMPLATE = compile('');
 
     function settled() {
-      return new Promise(function(resolve) {
+      return new Promise(function (resolve) {
         let watcher = setInterval(() => {
           if (getCurrentRunLoop() || hasScheduledTimers()) {
             return;
@@ -106,8 +106,8 @@ module('@ember/test-helpers emulation test', function() {
       return settled();
     }
 
-    module('setupRenderingContext', function(hooks) {
-      hooks.beforeEach(async function() {
+    module('setupRenderingContext', function (hooks) {
+      hooks.beforeEach(async function () {
         this.application = Application.create({
           rootElement: '#qunit-fixture',
           autoboot: false,
@@ -118,12 +118,12 @@ module('@ember/test-helpers emulation test', function() {
         await setupRenderingContext(this);
       });
 
-      hooks.afterEach(function() {
+      hooks.afterEach(function () {
         run(this.owner, 'destroy');
         run(this.application, 'destroy');
       });
 
-      test('it basically works', async function(assert) {
+      test('it basically works', async function (assert) {
         await render(compile('Hi!'), this);
 
         assert.equal(this.element.textContent, 'Hi!');
diff --git a/packages/ember/tests/error_handler_test.js b/packages/ember/tests/error_handler_test.js
index d2eb79b6a3e..61eb7386156 100644
--- a/packages/ember/tests/error_handler_test.js
+++ b/packages/ember/tests/error_handler_test.js
@@ -42,7 +42,7 @@ moduleFor(
 
     ['@test when Ember.onerror (which rethrows) is registered - sync run'](assert) {
       assert.expect(2);
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.ok(true, 'onerror called');
         throw error;
       });
@@ -51,7 +51,7 @@ moduleFor(
 
     ['@test when Ember.onerror (which does not rethrow) is registered - sync run'](assert) {
       assert.expect(2);
-      setOnerror(function() {
+      setOnerror(function () {
         assert.ok(true, 'onerror called');
       });
       runThatThrowsSync();
@@ -89,7 +89,7 @@ moduleFor(
       assert.expect(2);
       setTesting(false);
 
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.ok(true, 'Ember.onerror was called');
         throw error;
       });
@@ -108,7 +108,7 @@ moduleFor(
       assert.expect(1);
       setTesting(false);
 
-      setOnerror(function() {
+      setOnerror(function () {
         assert.ok(true, 'Ember.onerror was called');
       });
 
@@ -133,7 +133,7 @@ moduleFor(
 
       setTesting(true);
 
-      window.onerror = function(message) {
+      window.onerror = function (message) {
         caughtByWindowOnerror = message;
         // prevent "bubbling" and therefore failing the test
         return true;
@@ -164,7 +164,7 @@ moduleFor(
 
       setTesting(false);
 
-      window.onerror = function(message) {
+      window.onerror = function (message) {
         caughtByWindowOnerror = message;
         // prevent "bubbling" and therefore failing the test
         return true;
@@ -194,7 +194,7 @@ moduleFor(
 
       setTesting(false);
 
-      window.onerror = function() {
+      window.onerror = function () {
         assert.notOk(
           true,
           'window.onerror is never invoked when Ember.onerror intentionally swallows errors'
@@ -204,7 +204,7 @@ moduleFor(
       };
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(error, thrown, 'Ember.onerror is called with the error');
       });
 
@@ -221,7 +221,7 @@ moduleFor(
       assert.expect(1);
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -235,7 +235,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise constructor when Ember.onerror which does rethrow is present - rsvp`](
@@ -249,7 +249,7 @@ moduleFor(
       assert.expect(2);
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -261,7 +261,7 @@ moduleFor(
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(event) {
+      window.onunhandledrejection = function (event) {
         assert.pushResult({
           result: /the error/.test(event.reason),
           actual: event.reason,
@@ -277,7 +277,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise constructor when Ember.onerror which does not rethrow is present (Ember.testing = false) - rsvp`](
@@ -287,7 +287,7 @@ moduleFor(
 
       setTesting(false);
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -301,7 +301,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise constructor when Ember.onerror which does rethrow is present (Ember.testing = false) - rsvp`](
@@ -316,7 +316,7 @@ moduleFor(
 
       setTesting(false);
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -328,7 +328,7 @@ moduleFor(
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(event) {
+      window.onunhandledrejection = function (event) {
         assert.pushResult({
           result: /the error/.test(event.reason),
           actual: event.reason,
@@ -344,7 +344,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise .then callback when Ember.onerror which does not rethrow is present - rsvp`](
@@ -353,7 +353,7 @@ moduleFor(
       assert.expect(1);
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -367,7 +367,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise .then callback when Ember.onerror which does rethrow is present - rsvp`](
@@ -381,7 +381,7 @@ moduleFor(
       assert.expect(2);
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -393,7 +393,7 @@ moduleFor(
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(event) {
+      window.onunhandledrejection = function (event) {
         assert.pushResult({
           result: /the error/.test(event.reason),
           actual: event.reason,
@@ -409,7 +409,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise .then callback when Ember.onerror which does not rethrow is present (Ember.testing = false) - rsvp`](
@@ -419,7 +419,7 @@ moduleFor(
 
       setTesting(false);
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -433,7 +433,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in promise .then callback when Ember.onerror which does rethrow is present (Ember.testing = false) - rsvp`](
@@ -448,7 +448,7 @@ moduleFor(
 
       setTesting(false);
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -460,7 +460,7 @@ moduleFor(
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(event) {
+      window.onunhandledrejection = function (event) {
         assert.pushResult({
           result: /the error/.test(event.reason),
           actual: event.reason,
@@ -476,7 +476,7 @@ moduleFor(
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 10));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 10));
     }
 
     [`@test errors in async promise .then callback when Ember.onerror which does not rethrow is present - rsvp`](
@@ -485,7 +485,7 @@ moduleFor(
       assert.expect(1);
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -493,13 +493,13 @@ moduleFor(
         );
       });
 
-      new RSVP.Promise(resolve => setTimeout(resolve, 10)).then(() => {
+      new RSVP.Promise((resolve) => setTimeout(resolve, 10)).then(() => {
         throw thrown;
       });
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 20));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 20));
     }
 
     [`@test errors in async promise .then callback when Ember.onerror which does rethrow is present - rsvp`](
@@ -513,7 +513,7 @@ moduleFor(
       assert.expect(2);
 
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -525,7 +525,7 @@ moduleFor(
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(event) {
+      window.onunhandledrejection = function (event) {
         assert.pushResult({
           result: /the error/.test(event.reason),
           actual: event.reason,
@@ -535,13 +535,13 @@ moduleFor(
         });
       };
 
-      new RSVP.Promise(resolve => setTimeout(resolve, 10)).then(() => {
+      new RSVP.Promise((resolve) => setTimeout(resolve, 10)).then(() => {
         throw thrown;
       });
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 20));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 20));
     }
 
     [`@test errors in async promise .then callback when Ember.onerror which does not rethrow is present (Ember.testing = false) - rsvp`](
@@ -551,7 +551,7 @@ moduleFor(
 
       setTesting(false);
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -559,13 +559,13 @@ moduleFor(
         );
       });
 
-      new RSVP.Promise(resolve => setTimeout(resolve, 10)).then(() => {
+      new RSVP.Promise((resolve) => setTimeout(resolve, 10)).then(() => {
         throw thrown;
       });
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 20));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 20));
     }
 
     [`@test errors in async promise .then callback when Ember.onerror which does rethrow is present (Ember.testing = false) - rsvp`](
@@ -579,7 +579,7 @@ moduleFor(
 
       setTesting(false);
       let thrown = new Error('the error');
-      setOnerror(function(error) {
+      setOnerror(function (error) {
         assert.strictEqual(
           error,
           thrown,
@@ -591,7 +591,7 @@ moduleFor(
       // prevent QUnit handler from failing test
       QUnit.onUnhandledRejection = () => {};
 
-      window.onunhandledrejection = function(event) {
+      window.onunhandledrejection = function (event) {
         assert.pushResult({
           result: /the error/.test(event.reason),
           actual: event.reason,
@@ -601,13 +601,13 @@ moduleFor(
         });
       };
 
-      new RSVP.Promise(resolve => setTimeout(resolve, 10)).then(() => {
+      new RSVP.Promise((resolve) => setTimeout(resolve, 10)).then(() => {
         throw thrown;
       });
 
       // RSVP.Promise's are configured to settle within the run loop, this
       // ensures that run loop has completed
-      return new RSVP.Promise(resolve => setTimeout(resolve, 20));
+      return new RSVP.Promise((resolve) => setTimeout(resolve, 20));
     }
   }
 );
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index dd3297b5580..a8ad4f8a4da 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -17,7 +17,7 @@ moduleFor(
       let Person = EmberObject.extend({
         firstName: null,
         lastName: null,
-        fullName: computed('firstName', 'lastName', function() {
+        fullName: computed('firstName', 'lastName', function () {
           return `${this.get('firstName')} ${this.get('lastName')}`;
         }),
       });
@@ -56,7 +56,7 @@ moduleFor(
       let Person = EmberObject.extend({
         firstName: null,
         lastName: null,
-        fullName: computed('firstName', 'lastName', function() {
+        fullName: computed('firstName', 'lastName', function () {
           return `${this.get('firstName')} ${this.get('lastName')}`;
         }),
       });
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 12851c61600..edd279a9af1 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -13,7 +13,7 @@ moduleFor(
   'ember reexports',
   class extends AbstractTestCase {
     [`@test Ember exports correctly`](assert) {
-      allExports.forEach(reexport => {
+      allExports.forEach((reexport) => {
         let [path, moduleId, exportName] = reexport;
 
         // default path === exportName if none present
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index e3b59f0eef3..4e470c202a0 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -26,7 +26,7 @@ function handleURLRejectsWith(context, assert, path, expectedReason) {
     .then(() => {
       assert.ok(false, 'expected handleURLing: `' + path + '` to fail');
     })
-    .catch(reason => {
+    .catch((reason) => {
       assert.equal(reason.message, expectedReason);
     });
 }
@@ -40,7 +40,7 @@ moduleFor(
       this.addTemplate('camelot', '<section id="camelot"><h3>Is a silly place</h3></section>');
       this.addTemplate('homepage', '<h3 id="troll">Megatroll</h3><p>{{this.name}}</p>');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -66,10 +66,10 @@ moduleFor(
         }
 
         result.then(
-          function() {
+          function () {
             assert.ok(false, 'url: `' + path + '` was NOT to be handled');
           },
-          function(reason) {
+          function (reason) {
             assert.ok(
               reason && reason.message === 'TransitionAborted',
               'url: `' + path + '` was to be aborted'
@@ -103,7 +103,7 @@ moduleFor(
     }
 
     [`@test The Homepage and the Camelot page with multiple Router.map calls`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('camelot', { path: '/camelot' });
       });
 
@@ -125,7 +125,7 @@ moduleFor(
     }
 
     ['@feature(!EMBER_ROUTING_MODEL_ARG) The Special Page returning a promise puts the app into a loading state until the promise is resolved']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -137,7 +137,7 @@ moduleFor(
         find(id) {
           menuItem = MenuItem.create({ id: id });
 
-          return new RSVP.Promise(function(res) {
+          return new RSVP.Promise(function (res) {
             resolve = res;
           });
         },
@@ -159,7 +159,7 @@ moduleFor(
     }
 
     ['@feature(EMBER_ROUTING_MODEL_ARG) The Special Page returning a promise puts the app into a loading state until the promise is resolved']() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -171,7 +171,7 @@ moduleFor(
         find(id) {
           menuItem = MenuItem.create({ id: id });
 
-          return new RSVP.Promise(function(res) {
+          return new RSVP.Promise(function (res) {
             resolve = res;
           });
         },
@@ -195,7 +195,7 @@ moduleFor(
     [`@feature(!EMBER_ROUTING_MODEL_ARG) The loading state doesn't get entered for promises that resolve on the same run loop`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -231,7 +231,7 @@ moduleFor(
     [`@feature(EMBER_ROUTING_MODEL_ARG) The loading state doesn't get entered for promises that resolve on the same run loop`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -265,7 +265,7 @@ moduleFor(
     }
 
     ["@test The Special page returning an error invokes SpecialRoute's error handler"](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -276,7 +276,7 @@ moduleFor(
       MenuItem.reopenClass({
         find(id) {
           menuItem = MenuItem.create({ id: id });
-          promise = new RSVP.Promise(res => (resolve = res));
+          promise = new RSVP.Promise((res) => (resolve = res));
 
           return promise;
         },
@@ -311,7 +311,7 @@ moduleFor(
     ["@test ApplicationRoute's default error handler can be overridden"](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -323,7 +323,7 @@ moduleFor(
       MenuItem.reopenClass({
         find(id) {
           menuItem = MenuItem.create({ id: id });
-          return new RSVP.Promise(res => (resolve = res));
+          return new RSVP.Promise((res) => (resolve = res));
         },
       });
       this.add('model:menu_item', MenuItem);
@@ -365,7 +365,7 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -403,10 +403,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@feature(EMBER_ROUTING_MODEL_ARG) Events are triggered on the controller if a matching action name is implemented'](
@@ -414,7 +411,7 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -452,10 +449,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@feature(!EMBER_ROUTING_MODEL_ARG) Events are triggered on the current state when defined in `actions` object'](
@@ -463,7 +457,7 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -491,10 +485,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@feature(EMBER_ROUTING_MODEL_ARG) Events are triggered on the current state when defined in `actions` object'](
@@ -502,7 +493,7 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -530,10 +521,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@feature(!EMBER_ROUTING_MODEL_ARG) Events defined in `actions` object are triggered on the current state when routes are nested'](
@@ -541,8 +529,8 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
-        this.route('root', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('root', { path: '/' }, function () {
           this.route('index', { path: '/' });
         });
       });
@@ -579,10 +567,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@feature(EMBER_ROUTING_MODEL_ARG) Events defined in `actions` object are triggered on the current state when routes are nested'](
@@ -590,8 +575,8 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
-        this.route('root', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('root', { path: '/' }, function () {
           this.route('index', { path: '/' });
         });
       });
@@ -625,10 +610,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     ['@test Events can be handled by inherited event handlers'](assert) {
@@ -686,7 +668,7 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -724,10 +706,7 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@feature(EMBER_ROUTING_MODEL_ARG) Actions are not triggered on the controller if a matching action name is implemented as a method'](
@@ -735,7 +714,7 @@ moduleFor(
     ) {
       let done = assert.async();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -773,16 +752,13 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     async ['@test actions can be triggered with multiple arguments'](assert) {
       let done = assert.async();
-      this.router.map(function() {
-        this.route('root', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('root', { path: '/' }, function () {
           this.route('index', { path: '/' });
         });
       });
@@ -823,14 +799,11 @@ moduleFor(
 
       await this.visit('/');
 
-      document
-        .getElementById('qunit-fixture')
-        .querySelector('a')
-        .click();
+      document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
     ['@test transitioning multiple times in a single run loop only sets the URL once'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('root', { path: '/' });
         this.route('foo');
         this.route('bar');
@@ -840,14 +813,14 @@ moduleFor(
         let urlSetCount = 0;
         let router = this.applicationInstance.lookup('router:main');
 
-        router.get('location').setURL = function(path) {
+        router.get('location').setURL = function (path) {
           urlSetCount++;
           set(this, 'path', path);
         };
 
         assert.equal(urlSetCount, 0);
 
-        run(function() {
+        run(function () {
           router.transitionTo('foo');
           router.transitionTo('bar');
         });
@@ -860,7 +833,7 @@ moduleFor(
     ['@test navigating away triggers a url property change'](assert) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('root', { path: '/' });
         this.route('foo', { path: '/foo' });
         this.route('bar', { path: '/bar' });
@@ -869,10 +842,10 @@ moduleFor(
       return this.visit('/').then(() => {
         let router = this.applicationInstance.lookup('router:main');
 
-        addObserver(router, 'url', function() {
+        addObserver(router, 'url', function () {
           assert.ok(true, 'url change event was fired');
         });
-        ['foo', 'bar', '/foo'].forEach(destination => run(router, 'transitionTo', destination));
+        ['foo', 'bar', '/foo'].forEach((destination) => run(router, 'transitionTo', destination));
       });
     }
 
@@ -893,7 +866,7 @@ moduleFor(
         }),
       });
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('root', { path: '/' });
         this.route('foo');
       });
@@ -923,7 +896,7 @@ moduleFor(
         }),
       });
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('root', { path: '/' });
         this.route('foo');
       });
@@ -939,7 +912,7 @@ moduleFor(
     }
 
     ['@test A redirection hook is provided'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('choose', { path: '/' });
         this.route('home');
       });
@@ -981,10 +954,10 @@ moduleFor(
     ['@test Redirecting from the middle of a route aborts the remainder of the routes'](assert) {
       assert.expect(4);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home');
-        this.route('foo', function() {
-          this.route('bar', { resetNamespace: true }, function() {
+        this.route('foo', function () {
+          this.route('bar', { resetNamespace: true }, function () {
             this.route('baz');
           });
         });
@@ -1030,10 +1003,10 @@ moduleFor(
     ) {
       assert.expect(6);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home');
-        this.route('foo', function() {
-          this.route('bar', { resetNamespace: true }, function() {
+        this.route('foo', function () {
+          this.route('bar', { resetNamespace: true }, function () {
             this.route('baz');
           });
         });
@@ -1045,7 +1018,7 @@ moduleFor(
         'route:bar',
         Route.extend({
           redirect() {
-            return this.transitionTo('bar.baz').then(function() {
+            return this.transitionTo('bar.baz').then(function () {
               successCount++;
             });
           },
@@ -1083,10 +1056,10 @@ moduleFor(
     ) {
       assert.expect(5);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home');
-        this.route('foo', function() {
-          this.route('bar', { path: 'bar/:id', resetNamespace: true }, function() {
+        this.route('foo', function () {
+          this.route('bar', { path: 'bar/:id', resetNamespace: true }, function () {
             this.route('baz');
           });
         });
@@ -1128,10 +1101,7 @@ moduleFor(
         }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
         assert.equal(currentPath, 'foo.bar.baz');
         assert.equal(
-          this.applicationInstance
-            .lookup('router:main')
-            .get('location')
-            .getURL(),
+          this.applicationInstance.lookup('router:main').get('location').getURL(),
           '/foo/bar/2/baz'
         );
       });
@@ -1140,9 +1110,9 @@ moduleFor(
     ['@test Transitioning from a parent event does not prevent currentPath from being set'](
       assert
     ) {
-      this.router.map(function() {
-        this.route('foo', function() {
-          this.route('bar', { resetNamespace: true }, function() {
+      this.router.map(function () {
+        this.route('foo', function () {
+          this.route('bar', { resetNamespace: true }, function () {
             this.route('baz');
           });
           this.route('qux');
@@ -1184,7 +1154,7 @@ moduleFor(
       let postsTemplateRendered = false;
       let setHistory;
 
-      setHistory = function(obj, path) {
+      setHistory = function (obj, path) {
         obj.set('history', { state: { path: path } });
       };
 
@@ -1214,7 +1184,7 @@ moduleFor(
         rootURL: rootURL,
       });
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('posts', { path: '/posts' });
       });
 
@@ -1266,7 +1236,7 @@ moduleFor(
     }
 
     ['@test Generating a URL should not affect currentModel'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
@@ -1297,8 +1267,8 @@ moduleFor(
     }
 
     ["@test Nested index route is not overridden by parent's implicit index route"](assert) {
-      this.router.map(function() {
-        this.route('posts', function() {
+      this.router.map(function () {
+        this.route('posts', function () {
           this.route('index', { path: ':category' });
         });
       });
@@ -1318,7 +1288,7 @@ moduleFor(
       assert.expect(2);
 
       let deferred = RSVP.defer();
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
 
@@ -1360,7 +1330,7 @@ moduleFor(
         },
       });
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('nork');
         this.route('about');
       });
@@ -1407,7 +1377,7 @@ moduleFor(
     ) {
       assert.expect(5);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index');
         this.route('nork');
         this.route('about');
@@ -1492,20 +1462,20 @@ moduleFor(
     async ['@test `didTransition` event fires on the router'](assert) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('nork');
       });
 
       await this.visit('/');
 
       let router = this.applicationInstance.lookup('router:main');
-      router.one('didTransition', function() {
+      router.one('didTransition', function () {
         assert.ok(true, 'didTransition fired on initial routing');
       });
 
       await this.visit('/');
 
-      router.one('didTransition', function() {
+      router.one('didTransition', function () {
         assert.ok(true, 'didTransition fired on the router');
         assert.equal(
           router.get('url'),
@@ -1522,7 +1492,7 @@ moduleFor(
 
       let eventFired = 0;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('nork');
       });
 
@@ -1532,7 +1502,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.on('activate', function(transition) {
+            this.on('activate', function (transition) {
               assert.equal(++eventFired, 1, 'activate event is fired once');
               assert.ok(transition, 'transition is passed to activate event');
             });
@@ -1553,7 +1523,7 @@ moduleFor(
 
       let eventFired = 0;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('nork');
         this.route('dork');
       });
@@ -1564,7 +1534,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.on('deactivate', function(transition) {
+            this.on('deactivate', function (transition) {
               assert.equal(++eventFired, 1, 'deactivate event is fired once');
               assert.ok(transition, 'transition is passed');
             });
@@ -1634,7 +1604,7 @@ moduleFor(
     ['@test transitionTo returns Transition when passed a route name'](assert) {
       assert.expect(1);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('root', { path: '/' });
         this.route('bar');
       });
@@ -1649,9 +1619,9 @@ moduleFor(
     ['@test transitionTo returns Transition when passed a url'](assert) {
       assert.expect(1);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('root', { path: '/' });
-        this.route('bar', function() {
+        this.route('bar', function () {
           this.route('baz');
         });
       });
@@ -1668,12 +1638,12 @@ moduleFor(
     ) {
       assert.expect(36);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
-        this.route('be', function() {
-          this.route('excellent', { resetNamespace: true }, function() {
-            this.route('to', { resetNamespace: true }, function() {
-              this.route('each', { resetNamespace: true }, function() {
+        this.route('be', function () {
+          this.route('excellent', { resetNamespace: true }, function () {
+            this.route('to', { resetNamespace: true }, function () {
+              this.route('each', { resetNamespace: true }, function () {
                 this.route('other');
               });
             });
@@ -1716,7 +1686,7 @@ moduleFor(
     }
 
     ["@test Redirecting with null model doesn't error out"](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('about', { path: '/about/:hurhurhur' });
       });
@@ -1724,7 +1694,7 @@ moduleFor(
       this.add(
         'route:about',
         Route.extend({
-          serialize: function(model) {
+          serialize: function (model) {
             if (model === null) {
               return { hurhurhur: 'TreeklesMcGeekles' };
             }
@@ -1755,11 +1725,11 @@ moduleFor(
       let rejectedMessage = 'OMG!! SOOOOOO BAD!!!!';
       let rejectedStack = 'Yeah, buddy: stack gets printed too.';
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('yippie', { path: '/' });
       });
 
-      console.error = function(initialMessage, errorMessage, errorStack) {
+      console.error = function (initialMessage, errorMessage, errorStack) {
         assert.equal(
           initialMessage,
           'Error while processing route: yippie',
@@ -1787,7 +1757,7 @@ moduleFor(
 
       await assert.rejects(
         this.visit('/'),
-        function(err) {
+        function (err) {
           assert.equal(err.message, rejectedMessage);
           return true;
         },
@@ -1802,11 +1772,11 @@ moduleFor(
       let rejectedMessage = 'OMG!! SOOOOOO BAD!!!!';
       let rejectedStack = 'Yeah, buddy: stack gets printed too.';
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('yippie', { path: '/' });
       });
 
-      console.error = function(initialMessage, errorMessage, errorStack) {
+      console.error = function (initialMessage, errorMessage, errorStack) {
         assert.equal(
           initialMessage,
           'Error while processing route: yippie',
@@ -1833,7 +1803,7 @@ moduleFor(
 
       await assert.rejects(
         this.visit('/'),
-        function({ errorThrown: err }) {
+        function ({ errorThrown: err }) {
           assert.equal(err.message, rejectedMessage);
           return true;
         },
@@ -1843,11 +1813,11 @@ moduleFor(
 
     async ['@test rejecting the model hooks promise with no reason still logs error'](assert) {
       assert.expect(2);
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('wowzers', { path: '/' });
       });
 
-      console.error = function(initialMessage) {
+      console.error = function (initialMessage) {
         assert.equal(
           initialMessage,
           'Error while processing route: wowzers',
@@ -1871,11 +1841,11 @@ moduleFor(
       assert.expect(3);
       let rejectedMessage = 'Supercalifragilisticexpialidocious';
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('yondo', { path: '/' });
       });
 
-      console.error = function(initialMessage, errorMessage) {
+      console.error = function (initialMessage, errorMessage) {
         assert.equal(
           initialMessage,
           'Error while processing route: yondo',
@@ -1905,7 +1875,7 @@ moduleFor(
     ) {
       assert.expect(1);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1940,7 +1910,7 @@ moduleFor(
       assert.expect(4);
       let actual = [];
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('yondo', { path: '/' });
         this.route('stink-bomb');
       });
@@ -1954,7 +1924,7 @@ moduleFor(
         })
       );
 
-      console.error = function() {
+      console.error = function () {
         // push the arguments onto an array so we can detect if the error gets logged twice
         actual.push(arguments);
       };
@@ -1974,7 +1944,7 @@ moduleFor(
     ['@test Errors in transition show error template if available'](assert) {
       this.addTemplate('error', "<div id='error'>Error!</div>");
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('yondo', { path: '/' });
         this.route('stink-bomb');
       });
@@ -2002,10 +1972,10 @@ moduleFor(
     ['@test Route#resetController gets fired when changing models and exiting routes'](assert) {
       assert.expect(4);
 
-      this.router.map(function() {
-        this.route('a', function() {
-          this.route('b', { path: '/b/:id', resetNamespace: true }, function() {});
-          this.route('c', { path: '/c/:id', resetNamespace: true }, function() {});
+      this.router.map(function () {
+        this.route('a', function () {
+          this.route('b', { path: '/b/:id', resetNamespace: true }, function () {});
+          this.route('c', { path: '/c/:id', resetNamespace: true }, function () {});
         });
         this.route('out');
       });
@@ -2060,7 +2030,7 @@ moduleFor(
     }
 
     async ['@test Exception during initialization of non-initial route is not swallowed'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('boom');
       });
       this.add(
@@ -2076,7 +2046,7 @@ moduleFor(
     }
 
     async ['@test Exception during initialization of initial route is not swallowed'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('boom', { path: '/' });
       });
       this.add(
@@ -2097,9 +2067,9 @@ moduleFor(
       this.addTemplate('index', 'index');
       this.addTemplate('other', 'other');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
-        this.route('other', function() {});
+        this.route('other', function () {});
       });
 
       this.add(
@@ -2131,13 +2101,13 @@ moduleFor(
       this.add('engine:blog', BlogEngine);
 
       // Register engine route map
-      let postSerialize = function(params) {
+      let postSerialize = function (params) {
         assert.ok(true, 'serialize hook runs');
         return {
           post_id: params.id,
         };
       };
-      let BlogMap = function() {
+      let BlogMap = function () {
         this.route('post', {
           path: '/post/:post_id',
           serialize: postSerialize,
@@ -2145,7 +2115,7 @@ moduleFor(
       };
       this.add('route-map:blog', BlogMap);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -2169,12 +2139,12 @@ moduleFor(
       this.add('engine:blog', BlogEngine);
 
       // Register engine route map
-      let BlogMap = function() {
+      let BlogMap = function () {
         this.route('post');
       };
       this.add('route-map:blog', BlogMap);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -2211,12 +2181,12 @@ moduleFor(
       });
 
       // Register engine route map
-      let BlogMap = function() {
+      let BlogMap = function () {
         this.route('post');
       };
       this.add('route-map:blog', BlogMap);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.mount('blog');
       });
 
@@ -2246,7 +2216,7 @@ moduleFor(
     ["@test Generated route should be an instance of App's default route if provided"](assert) {
       let generatedRoute;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('posts');
       });
 
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 5525e7d6a8c..6d251a94a58 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -17,7 +17,7 @@ moduleFor(
       this.addTemplate('camelot', '<section id="camelot"><h3>Is a silly place</h3></section>');
       this.addTemplate('homepage', '<h3 id="troll">Megatroll</h3><p>{{this.name}}</p>');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -43,10 +43,10 @@ moduleFor(
         }
 
         result.then(
-          function() {
+          function () {
             assert.ok(false, 'url: `' + path + '` was NOT to be handled');
           },
-          function(reason) {
+          function (reason) {
             assert.ok(
               reason && reason.message === 'TransitionAborted',
               'url: `' + path + '` was to be aborted'
@@ -73,7 +73,7 @@ moduleFor(
     ['@test properties that autotrack the model update when the model changes'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('track', { path: '/track/:id' });
       });
 
@@ -204,7 +204,7 @@ moduleFor(
     }
 
     [`@test The route controller specified via controllerName is used in render`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -249,7 +249,7 @@ moduleFor(
     [`@test The route controller specified via controllerName is used in render even when a controller with the routeName is available`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -296,7 +296,7 @@ moduleFor(
     }
 
     [`@test The Homepage with a 'setupController' hook modifying other controllers`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -327,14 +327,14 @@ moduleFor(
     }
 
     [`@test The Homepage with a computed model that does not get overridden`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
       this.add(
         'controller:home',
         Controller.extend({
-          model: computed(function() {
+          model: computed(function () {
             return [
               'Monday through Friday: 9am to 5pm',
               'Saturday: Noon to Midnight',
@@ -361,7 +361,7 @@ moduleFor(
     }
 
     [`@test The Homepage getting its controller context via model`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -400,7 +400,7 @@ moduleFor(
     [`@feature(!EMBER_ROUTING_MODEL_ARG) The Specials Page getting its controller context by deserializing the params hash`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -428,7 +428,7 @@ moduleFor(
     [`@feature(EMBER_ROUTING_MODEL_ARG) The Specials Page getting its model by deserializing the params hash`](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -462,7 +462,7 @@ moduleFor(
       });
       this.add('model:menu_item', MenuItem);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -483,7 +483,7 @@ moduleFor(
       });
       this.add('model:menu_item', MenuItem);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -500,7 +500,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -535,7 +535,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
       });
@@ -583,8 +583,8 @@ moduleFor(
         },
       });
 
-      this.router.map(function() {
-        this.route('root', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('root', { path: '/' }, function () {
           this.route('special', {
             path: '/specials/:menu_item_id',
             resetNamespace: true,
@@ -649,7 +649,7 @@ moduleFor(
         let router = this.applicationInstance.lookup('router:main');
         let menuItem = MenuItem.create({ id: 1 });
 
-        return router.transitionTo('special', menuItem).then(function() {
+        return router.transitionTo('special', menuItem).then(function () {
           assert.equal(rootSetup, 1, 'The root setup was not triggered again');
           assert.equal(rootRender, 1, 'The root render was not triggered again');
           assert.equal(rootSerialize, 0, 'The root serialize was not called');
@@ -681,8 +681,8 @@ moduleFor(
         },
       });
 
-      this.router.map(function() {
-        this.route('root', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('root', { path: '/' }, function () {
           this.route('special', {
             path: '/specials/:menu_item_id',
             resetNamespace: true,
@@ -747,7 +747,7 @@ moduleFor(
         let router = this.applicationInstance.lookup('router:main');
         let menuItem = MenuItem.create({ id: 1 });
 
-        return router.transitionTo('special', menuItem).then(function() {
+        return router.transitionTo('special', menuItem).then(function () {
           assert.equal(rootSetup, 1, 'The root setup was not triggered again');
           assert.equal(rootRender, 1, 'The root render was not triggered again');
           assert.equal(rootSerialize, 0, 'The root serialize was not called');
@@ -764,11 +764,11 @@ moduleFor(
     ['@test Route inherits model from parent route'](assert) {
       assert.expect(9);
 
-      this.router.map(function() {
-        this.route('the-post', { path: '/posts/:post_id' }, function() {
+      this.router.map(function () {
+        this.route('the-post', { path: '/posts/:post_id' }, function () {
           this.route('comments');
 
-          this.route('shares', { path: '/shares/:share_id', resetNamespace: true }, function() {
+          this.route('shares', { path: '/shares/:share_id', resetNamespace: true }, function () {
             this.route('share');
           });
         });
@@ -861,9 +861,9 @@ moduleFor(
     ['@test Routes with { resetNamespace: true } inherits model from parent route'](assert) {
       assert.expect(6);
 
-      this.router.map(function() {
-        this.route('the-post', { path: '/posts/:post_id' }, function() {
-          this.route('comments', { resetNamespace: true }, function() {});
+      this.router.map(function () {
+        this.route('the-post', { path: '/posts/:post_id' }, function () {
+          this.route('comments', { resetNamespace: true }, function () {});
         });
       });
 
@@ -914,8 +914,8 @@ moduleFor(
     ['@test It is possible to get the model from a parent route'](assert) {
       assert.expect(6);
 
-      this.router.map(function() {
-        this.route('the-post', { path: '/posts/:post_id' }, function() {
+      this.router.map(function () {
+        this.route('the-post', { path: '/posts/:post_id' }, function () {
           this.route('comments', { resetNamespace: true });
         });
       });
@@ -976,9 +976,9 @@ moduleFor(
       this.addTemplate('post/index', 'showing');
       this.addTemplate('post/edit', 'editing');
 
-      this.router.map(function() {
-        this.route('posts', function() {
-          this.route('post', { path: '/:postId', resetNamespace: true }, function() {
+      this.router.map(function () {
+        this.route('posts', function () {
+          this.route('post', { path: '/:postId', resetNamespace: true }, function () {
             this.route('edit');
           });
         });
@@ -1048,7 +1048,7 @@ moduleFor(
       // TODO: FIXME:
       let model = {};
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
 
@@ -1083,7 +1083,7 @@ moduleFor(
         },
       });
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/post/:post_id' });
       });
 
@@ -1093,8 +1093,8 @@ moduleFor(
     }
 
     ['@test Routes can refresh themselves causing their model hooks to be re-run'](assert) {
-      this.router.map(function() {
-        this.route('parent', { path: '/parent/:parent_id' }, function() {
+      this.router.map(function () {
+        this.route('parent', { path: '/parent/:parent_id' }, function () {
           this.route('child');
         });
       });
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 4824d612e4b..15cf6f7a97f 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -49,7 +49,7 @@ moduleFor(
             },
           },
           actions: {
-            [actionName]: function() {
+            [actionName]: function () {
               return loadingReturn;
             },
           },
@@ -57,7 +57,7 @@ moduleFor(
             indexModelCount++;
             if (indexModelCount === 2) {
               assert.deepEqual(params, { omg: 'lex' });
-              return new RSVP.Promise(function(resolve) {
+              return new RSVP.Promise(function (resolve) {
                 promiseResolve = resolve;
                 return;
               });
@@ -86,7 +86,7 @@ moduleFor(
       assert.equal(appModelCount, 1, 'appModelCount is 1');
       assert.equal(indexModelCount, 3);
 
-      run(function() {
+      run(function () {
         promiseResolve();
       });
 
@@ -106,8 +106,8 @@ moduleFor(
     ) {
       assert.expect(2);
 
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
           this.route('sibling');
         });
@@ -142,7 +142,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -216,7 +216,7 @@ moduleFor(
       assert.expect(3);
 
       this.setSingleQPController('index', 'a', 0, {
-        queryParams: computed(function() {
+        queryParams: computed(function () {
           return ['c'];
         }),
         c: true,
@@ -272,7 +272,7 @@ moduleFor(
     ['@test model hooks receives query params with dynamic segment params'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:id' });
       });
 
@@ -293,7 +293,7 @@ moduleFor(
     ['@test model hooks receives query params (overridden by incoming url value)'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:id' });
       });
 
@@ -312,7 +312,7 @@ moduleFor(
     }
 
     async ['@test error is thrown if dynamic segment and query param have same name'](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:foo' });
       });
 
@@ -369,7 +369,7 @@ moduleFor(
     ['@test Route#paramsFor fetches query params with default value'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:something' });
       });
 
@@ -394,7 +394,7 @@ moduleFor(
     ['@test Route#paramsFor fetches query params with non-default value'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:something' });
       });
 
@@ -419,7 +419,7 @@ moduleFor(
     ['@test Route#paramsFor fetches default falsy query params'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:something' });
       });
 
@@ -444,7 +444,7 @@ moduleFor(
     ['@test Route#paramsFor fetches non-default falsy query params'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/:something' });
       });
 
@@ -922,8 +922,8 @@ moduleFor(
         "{{link-to 'Parent' 'parent' (query-params foo='change') id='parent-link'}}"
       );
 
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
         });
       });
@@ -981,7 +981,7 @@ moduleFor(
     async ['@test can override incoming QP values in setupController'](assert) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1011,7 +1011,7 @@ moduleFor(
     async ['@test can override incoming QP array values in setupController'](assert) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('about');
       });
 
@@ -1055,8 +1055,8 @@ moduleFor(
     ['@test Subresource naming style is supported'](assert) {
       assert.expect(5);
 
-      this.router.map(function() {
-        this.route('abc.def', { path: '/abcdef' }, function() {
+      this.router.map(function () {
+        this.route('abc.def', { path: '/abcdef' }, function () {
           this.route('zoo');
         });
       });
@@ -1198,7 +1198,7 @@ moduleFor(
     async ['@test Array query params can be set'](assert) {
       assert.expect(2);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -1242,7 +1242,7 @@ moduleFor(
     async ['@test Array query params can be pushed/popped'](assert) {
       assert.expect(17);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -1295,7 +1295,7 @@ moduleFor(
     async ["@test Overwriting with array with same content shouldn't refire update"](assert) {
       assert.expect(4);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -1326,7 +1326,7 @@ moduleFor(
     ) {
       assert.expect(1);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('other');
       });
 
@@ -1356,7 +1356,7 @@ moduleFor(
     ) {
       assert.expect(9);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home');
       });
 
@@ -1394,7 +1394,7 @@ moduleFor(
         "{{link-to 'Home' 'home' (query-params foo=nullValue) id='null-link'}}{{link-to 'Home' 'home' (query-params foo=undefinedValue) id='undefined-link'}}"
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home');
       });
 
@@ -1451,7 +1451,7 @@ moduleFor(
         "{{link-to 'Foo' 'foo' id='foo-link'}}{{link-to 'Bar' 'bar' id='bar-no-qp-link'}}{{link-to 'Bar' 'bar' (query-params raytiley='isthebest') id='bar-link'}}{{outlet}}"
       );
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('foo');
         this.route('bar');
       });
@@ -1491,7 +1491,7 @@ moduleFor(
     ["@test undefined isn't serialized or deserialized into a string"](assert) {
       assert.expect(4);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('example');
       });
 
@@ -1561,7 +1561,7 @@ moduleFor(
     async ['@test handle route names that clash with Object.prototype properties'](assert) {
       assert.expect(1);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('constructor');
       });
 
@@ -1587,7 +1587,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -1616,7 +1616,7 @@ moduleFor(
     ) {
       assert.expect(3);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index 33469df564b..fa49a5028df 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -280,8 +280,8 @@ moduleFor(
   'Query Params - model-dependent state',
   class extends ModelDependentQPTestCase {
     setupApplication() {
-      this.router.map(function() {
-        this.route('article', { path: '/a/:id' }, function() {
+      this.router.map(function () {
+        this.route('article', { path: '/a/:id' }, function () {
           this.route('comments', { resetNamespace: true });
         });
         this.route('about');
@@ -384,9 +384,9 @@ moduleFor(
   'Query Params - model-dependent state (nested)',
   class extends ModelDependentQPTestCase {
     setupApplication() {
-      this.router.map(function() {
-        this.route('site', function() {
-          this.route('article', { path: '/a/:id' }, function() {
+      this.router.map(function () {
+        this.route('site', function () {
+          this.route('article', { path: '/a/:id' }, function () {
             this.route('comments');
           });
         });
@@ -490,9 +490,9 @@ moduleFor(
   'Query Params - model-dependent state (nested & more than 1 dynamic segment)',
   class extends ModelDependentQPTestCase {
     setupApplication() {
-      this.router.map(function() {
-        this.route('site', { path: '/site/:site_id' }, function() {
-          this.route('article', { path: '/a/:article_id' }, function() {
+      this.router.map(function () {
+        this.route('site', { path: '/site/:site_id' }, function () {
+          this.route('article', { path: '/a/:article_id' }, function () {
             this.route('comments');
           });
         });
@@ -511,9 +511,9 @@ moduleFor(
               let ret = [];
               let siteArticles = this.siteArticles;
               let sites = this.sites;
-              sites.forEach(site => {
+              sites.forEach((site) => {
                 ret = ret.concat(
-                  siteArticles.map(article => {
+                  siteArticles.map((article) => {
                     return {
                       id: `${site.id}-${article.id}`,
                       site_id: site.id,
diff --git a/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js b/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
index 62dcdbf028e..0f7578952bb 100644
--- a/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
@@ -7,8 +7,8 @@ moduleFor(
   'Query Params - overlapping query param property names',
   class extends QueryParamTestCase {
     setupBase() {
-      this.router.map(function() {
-        this.route('parent', function() {
+      this.router.map(function () {
+        this.route('parent', function () {
           this.route('child');
         });
       });
diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index 94658703968..b2f64ec5ee6 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -25,14 +25,14 @@ moduleFor(
           let { _handlerPromises: handlerPromises, _seenHandlers: seenHandlers } = this;
           let getRoute = this._routerMicrolib.getRoute;
 
-          this._routerMicrolib.getRoute = function(routeName) {
+          this._routerMicrolib.getRoute = function (routeName) {
             fetchedHandlers.push(routeName);
 
             // Cache the returns so we don't have more than one Promise for a
             // given handler.
             return (
               handlerPromises[routeName] ||
-              (handlerPromises[routeName] = new RSVP.Promise(resolve => {
+              (handlerPromises[routeName] = new RSVP.Promise((resolve) => {
                 setTimeout(() => {
                   let handler = getRoute(routeName);
 
@@ -59,7 +59,7 @@ moduleFor(
     ) {
       assert.expect(4);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/post/:id' });
       });
 
@@ -100,7 +100,7 @@ moduleFor(
     ['@test can transitionTo to an asynchronously loaded route with simple query params'](assert) {
       assert.expect(6);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/post/:id' });
         this.route('posts');
       });
@@ -145,7 +145,7 @@ moduleFor(
     ['@test can transitionTo to an asynchronously loaded route with array query params'](assert) {
       assert.expect(5);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('post', { path: '/post/:id' });
       });
 
@@ -181,8 +181,8 @@ moduleFor(
     ['@test can transitionTo to an asynchronously loaded route with mapped query params'](assert) {
       assert.expect(7);
 
-      this.router.map(function() {
-        this.route('post', { path: '/post/:id' }, function() {
+      this.router.map(function () {
+        this.route('post', { path: '/post/:id' }, function () {
           this.route('index', { path: '/' });
         });
       });
@@ -236,8 +236,8 @@ moduleFor(
     ['@test can transitionTo with a URL'](assert) {
       assert.expect(7);
 
-      this.router.map(function() {
-        this.route('post', { path: '/post/:id' }, function() {
+      this.router.map(function () {
+        this.route('post', { path: '/post/:id' }, function () {
           this.route('index', { path: '/' });
         });
       });
@@ -287,7 +287,7 @@ moduleFor(
     ["@test undefined isn't serialized or deserialized into a string"](assert) {
       assert.expect(4);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('example');
       });
 
diff --git a/packages/ember/tests/routing/query_params_test/shared_state_test.js b/packages/ember/tests/routing/query_params_test/shared_state_test.js
index 9f8b57360cd..d111cffc42f 100644
--- a/packages/ember/tests/routing/query_params_test/shared_state_test.js
+++ b/packages/ember/tests/routing/query_params_test/shared_state_test.js
@@ -12,7 +12,7 @@ moduleFor(
     }
 
     setupApplication() {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('dashboard');
       });
diff --git a/packages/ember/tests/routing/router_map_test.js b/packages/ember/tests/routing/router_map_test.js
index ab08a12de76..b6595e11b71 100644
--- a/packages/ember/tests/routing/router_map_test.js
+++ b/packages/ember/tests/routing/router_map_test.js
@@ -8,7 +8,7 @@ moduleFor(
     ['@test Router.map returns an Ember Router class'](assert) {
       assert.expect(1);
 
-      let ret = this.router.map(function() {
+      let ret = this.router.map(function () {
         this.route('hello');
       });
 
@@ -21,11 +21,11 @@ moduleFor(
       this.addTemplate('hello', 'Hello!');
       this.addTemplate('goodbye', 'Goodbye!');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('hello');
       });
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('goodbye');
       });
 
diff --git a/packages/ember/tests/routing/router_service_test/basic_test.js b/packages/ember/tests/routing/router_service_test/basic_test.js
index 0dc8fb208d0..c8407929de9 100644
--- a/packages/ember/tests/routing/router_service_test/basic_test.js
+++ b/packages/ember/tests/routing/router_service_test/basic_test.js
@@ -75,7 +75,7 @@ moduleFor(
         .then(() => {
           return this.routerService.transitionTo('/child');
         })
-        .catch(e => {
+        .catch((e) => {
           assert.equal(this.routerService.currentRouteName, 'parent.sister');
           assert.equal(e.message, 'TransitionAborted');
         });
diff --git a/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js b/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
index c72af15c155..8efb7e51431 100644
--- a/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
+++ b/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
@@ -13,12 +13,12 @@ moduleFor(
           router: service('router'),
           init() {
             this._super(...arguments);
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.metadata, 'parent-index-page');
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.metadata, 'parent-index-page');
             });
@@ -49,7 +49,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.metadata, 'parent-index-page');
               assert.equal(transition.to.parent.name, 'parent');
@@ -58,7 +58,7 @@ moduleFor(
               assert.equal(transition.to.parent.parent.metadata, 'application-shell');
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.metadata, 'parent-index-page');
               assert.equal(transition.to.parent.name, 'parent');
@@ -99,13 +99,13 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.metadata.name, 'parent-index-page');
               assert.equal(transition.to.metadata.title('PARENT'), 'My Name is PARENT');
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.metadata.name, 'parent-index-page');
               assert.equal(transition.to.metadata.title('PARENT'), 'My Name is PARENT');
@@ -122,7 +122,7 @@ moduleFor(
           buildRouteInfoMetadata() {
             return {
               name: 'parent-index-page',
-              title: name => `My Name is ${name}`,
+              title: (name) => `My Name is ${name}`,
             };
           },
         })
@@ -140,7 +140,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (transition.to.name === 'parent.index') {
                 assert.equal(transition.to.metadata.name, 'parent-index-page');
                 assert.equal(transition.to.metadata.title('INDEX'), 'My Name is INDEX');
@@ -152,7 +152,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (transition.to.name === 'parent.index') {
                 assert.equal(transition.to.metadata.name, 'parent-index-page');
                 assert.equal(transition.to.metadata.title('INDEX'), 'My Name is INDEX');
@@ -175,7 +175,7 @@ moduleFor(
           buildRouteInfoMetadata() {
             return {
               name: 'parent-index-page',
-              title: name => `My Name is ${name}`,
+              title: (name) => `My Name is ${name}`,
             };
           },
         })
@@ -187,7 +187,7 @@ moduleFor(
           buildRouteInfoMetadata() {
             return {
               name: 'parent-child-page',
-              title: name => `My Name is ${name}!!`,
+              title: (name) => `My Name is ${name}!!`,
             };
           },
         })
@@ -207,7 +207,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (transition.to.name === 'parent.index') {
                 assert.equal(transition.to.metadata.name, 'parent-index-page');
                 assert.equal(
@@ -242,7 +242,7 @@ moduleFor(
           buildRouteInfoMetadata() {
             return {
               name: 'parent-index-page',
-              title: model => `My Name is ${model.name}`,
+              title: (model) => `My Name is ${model.name}`,
             };
           },
         })
@@ -257,7 +257,7 @@ moduleFor(
           buildRouteInfoMetadata() {
             return {
               name: 'parent-child-page',
-              title: model => `My Name is ${model.name}!!`,
+              title: (model) => `My Name is ${model.name}!!`,
             };
           },
         })
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index 2432c7e7ea1..a89cf13b808 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -15,7 +15,7 @@ let InstrumentedRoute = Route.extend({
   init() {
     this._super(...arguments);
     let service = get(this, 'routerService');
-    service.on('routeWillChange', transition => {
+    service.on('routeWillChange', (transition) => {
       results.push([
         service.get('currentRouteName'),
         `${this.routeName} routeWillChange: ${transition.from && transition.from.name} - ${
@@ -24,7 +24,7 @@ let InstrumentedRoute = Route.extend({
         service.get('currentURL'),
       ]);
     });
-    service.on('routeDidChange', transition => {
+    service.on('routeDidChange', (transition) => {
       results.push([
         service.get('currentRouteName'),
         `${this.routeName} routeDidChange: ${transition.from && transition.from.name} - ${
@@ -69,7 +69,7 @@ let InstrumentedRoute = Route.extend({
       `${this.routeName} model`,
       service.get('currentURL'),
     ]);
-    return new RSVP.Promise(resolve => {
+    return new RSVP.Promise((resolve) => {
       setTimeout(resolve, 200);
     });
   },
@@ -115,7 +115,7 @@ moduleFor(
 
       results = [];
 
-      ROUTE_NAMES.forEach(name => {
+      ROUTE_NAMES.forEach((name) => {
         let routeName = `parent.${name}`;
         this.add(`route:${routeName}`, InstrumentedRoute.extend());
         this.addTemplate(routeName, '{{current-url}}');
diff --git a/packages/ember/tests/routing/router_service_test/events_test.js b/packages/ember/tests/routing/router_service_test/events_test.js
index 057d76a8990..b7c0201eec9 100644
--- a/packages/ember/tests/routing/router_service_test/events_test.js
+++ b/packages/ember/tests/routing/router_service_test/events_test.js
@@ -14,14 +14,14 @@ moduleFor(
           router: service('router'),
           init() {
             this._super(...arguments);
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.ok(transition);
               assert.equal(transition.from, undefined);
               assert.equal(transition.to.name, 'parent.index');
               assert.equal(transition.to.localName, 'index');
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.ok(transition);
               assert.ok(this.router.currentURL, `has URL ${this.router.currentURL}`);
               assert.equal(this.router.currentURL, '/');
@@ -50,7 +50,7 @@ moduleFor(
           router: service('router'),
           init() {
             this._super(...arguments);
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (toParent) {
                 assert.equal(this.router.currentURL, null, 'starts as null');
                 assert.equal(transition.from, undefined);
@@ -74,7 +74,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (toParent) {
                 assert.equal(this.router.currentURL, '/child');
                 assert.equal(transition.from, undefined);
@@ -120,7 +120,7 @@ moduleFor(
         .then(() => {
           return this.visit('/');
         })
-        .catch(e => {
+        .catch((e) => {
           assert.equal(e.message, 'TransitionAborted');
         });
     }
@@ -155,7 +155,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.from, undefined, 'initial');
               if (toChild) {
                 if (toSister) {
@@ -171,7 +171,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.from, undefined, 'initial');
               assert.equal(transition.to.name, 'parent.sister', 'landed on /sister');
             });
@@ -211,7 +211,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.from, undefined, 'initial');
               if (toChild) {
                 if (toSister) {
@@ -227,7 +227,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.from, undefined, 'initial');
               assert.equal(transition.to.name, 'parent.sister', 'landed on /sister');
             });
@@ -258,7 +258,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (toChild) {
                 assert.equal(transition.from.name, 'parent.index');
                 if (toSister) {
@@ -274,7 +274,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (toSister) {
                 assert.equal(transition.from.name, 'parent.index', 'initial');
                 assert.equal(transition.to.name, 'parent.sister', 'landed on /sister');
@@ -288,7 +288,7 @@ moduleFor(
       );
       return this.visit('/').then(() => {
         toChild = true;
-        return this.routerService.transitionTo('/child').catch(e => {
+        return this.routerService.transitionTo('/child').catch((e) => {
           assert.equal(e.name, 'TransitionAborted', 'Transition aborted');
         });
       });
@@ -315,7 +315,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (toChild) {
                 assert.equal(transition.from.name, 'parent.index');
                 if (toSister) {
@@ -331,7 +331,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (toSister) {
                 assert.equal(transition.from.name, 'parent.index', 'initial');
                 assert.equal(transition.to.name, 'parent.sister', 'landed on /sister');
@@ -345,7 +345,7 @@ moduleFor(
       );
       return this.visit('/').then(() => {
         toChild = true;
-        return this.routerService.transitionTo('/child').catch(e => {
+        return this.routerService.transitionTo('/child').catch((e) => {
           assert.equal(e.name, 'TransitionAborted', 'Transition aborted');
         });
       });
@@ -373,7 +373,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (didAbort) {
                 assert.equal(transition.to.name, 'parent.index', 'transition aborted');
                 assert.equal(transition.from.name, 'parent.index', 'transition aborted');
@@ -386,7 +386,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (didAbort) {
                 assert.equal(transition.to.name, 'parent.index', 'landed on /');
                 assert.equal(transition.from.name, 'parent.index', 'initial');
@@ -400,7 +400,7 @@ moduleFor(
       );
       return this.visit('/').then(() => {
         toChild = true;
-        return this.routerService.transitionTo('/child').catch(e => {
+        return this.routerService.transitionTo('/child').catch((e) => {
           assert.equal(e.name, 'TransitionAborted', 'Transition aborted');
         });
       });
@@ -419,7 +419,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.to.name, 'parent.index');
               if (initial) {
                 assert.equal(transition.from, null);
@@ -435,7 +435,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               if (initial) {
                 assert.equal(transition.from, null);
                 assert.deepEqual(transition.to.queryParams, { a: 'true' });
@@ -487,7 +487,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (toSister) {
                 assert.equal(transition.to.name, 'parent.sister');
                 assert.deepEqual(transition.to.queryParams, { a: 'a' });
@@ -497,7 +497,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'parent.sister');
               assert.deepEqual(transition.to.queryParams, { a: 'a' });
             });
@@ -528,7 +528,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               if (toSister) {
                 assert.equal(transition.to.name, 'parent.sister');
                 assert.deepEqual(transition.to.queryParams, { a: 'a' });
@@ -538,7 +538,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'parent.sister');
               assert.deepEqual(transition.to.queryParams, { a: 'a' });
             });
@@ -575,7 +575,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.to.name, 'dynamic');
               if (initial) {
                 assert.deepEqual(transition.to.paramNames, ['dynamic_id']);
@@ -586,7 +586,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'dynamic');
               assert.deepEqual(transition.to.paramNames, ['dynamic_id']);
               if (initial) {
@@ -640,7 +640,7 @@ moduleFor(
           init() {
             this._super(...arguments);
 
-            this.router.on('routeWillChange', transition => {
+            this.router.on('routeWillChange', (transition) => {
               assert.equal(transition.to.name, 'dynamicWithChild.child');
               assert.deepEqual(transition.to.paramNames, ['child_id']);
               assert.deepEqual(transition.to.params, { child_id: '456' });
@@ -654,7 +654,7 @@ moduleFor(
               }
             });
 
-            this.router.on('routeDidChange', transition => {
+            this.router.on('routeDidChange', (transition) => {
               assert.equal(transition.to.name, 'dynamicWithChild.child');
               assert.deepEqual(transition.to.paramNames, ['child_id']);
               assert.deepEqual(transition.to.params, { child_id: '456' });
diff --git a/packages/ember/tests/routing/router_service_test/recognize_test.js b/packages/ember/tests/routing/router_service_test/recognize_test.js
index a4e1f28b082..f5a65cd10a8 100644
--- a/packages/ember/tests/routing/router_service_test/recognize_test.js
+++ b/packages/ember/tests/routing/router_service_test/recognize_test.js
@@ -95,7 +95,7 @@ moduleFor(
         .then(() => {
           return this.routerService.recognizeAndLoad('/dynamic-with-child/123/1?a=b');
         })
-        .then(routeInfoWithAttributes => {
+        .then((routeInfoWithAttributes) => {
           assert.ok(routeInfoWithAttributes);
           let {
             name,
@@ -152,7 +152,7 @@ moduleFor(
         .then(() => {
           return this.routerService.recognizeAndLoad('/app/child/');
         })
-        .then(routeInfoWithAttributes => {
+        .then((routeInfoWithAttributes) => {
           assert.ok(routeInfoWithAttributes);
           let { name, localName, parent } = routeInfoWithAttributes;
           assert.equal(name, 'parent.child');
@@ -193,7 +193,7 @@ moduleFor(
           () => {
             assert.ok(false, 'never');
           },
-          reason => {
+          (reason) => {
             assert.equal(reason, 'URL /foo was not recognized');
           }
         );
@@ -219,7 +219,7 @@ moduleFor(
           () => {
             assert.ok(false, 'never');
           },
-          err => {
+          (err) => {
             assert.equal(err.message, 'Unhandled');
           }
         );
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index c37e307bc80..e20e8c96f62 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -118,7 +118,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        run(function() {
+        run(function () {
           componentInstance.send('transitionToSister');
         });
 
@@ -150,7 +150,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        run(function() {
+        run(function () {
           componentInstance.send('transitionToSister');
         });
 
@@ -184,7 +184,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        run(function() {
+        run(function () {
           componentInstance.send('transitionToDynamic');
         });
 
@@ -223,7 +223,7 @@ moduleFor(
 
       await this.visit('/');
 
-      run(function() {
+      run(function () {
         componentInstance.send('transitionToDynamic');
       });
 
@@ -269,7 +269,7 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        run(function() {
+        run(function () {
           componentInstance.send('transitionToDynamic');
         });
 
@@ -317,7 +317,7 @@ moduleFor(
 
       await this.visit('/');
 
-      run(function() {
+      run(function () {
         componentInstance.send('transitionToDynamic');
       });
 
diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index 76a0fc25b4f..cdf671af674 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -39,7 +39,7 @@ moduleFor(
     ['@test Slow promise from a child route of application enters nested loading state'](assert) {
       let turtleDeferred = RSVP.defer();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('turtle');
       });
 
@@ -122,7 +122,7 @@ moduleFor(
     [`@test Don't enter loading route unless either route or template defined`](assert) {
       let deferred = RSVP.defer();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('dummy');
       });
       this.add(
@@ -157,7 +157,7 @@ moduleFor(
     ['@test Enter loading route only if loadingRoute is defined'](assert) {
       let deferred = RSVP.defer();
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('dummy');
       });
 
@@ -266,9 +266,9 @@ moduleFor(
       this.addTemplate('foo.bar_loading', 'FOOBAR LOADING');
       this.addTemplate('foo.bar.index', 'YAY');
 
-      this.router.map(function() {
-        this.route('foo', function() {
-          this.route('bar', { path: '/bar' }, function() {});
+      this.router.map(function () {
+        this.route('foo', function () {
+          this.route('bar', { path: '/bar' }, function () {});
         });
       });
 
@@ -306,9 +306,9 @@ moduleFor(
       this.addTemplate('bar_loading', 'BAR LOADING');
       this.addTemplate('bar.index', 'YAY');
 
-      this.router.map(function() {
-        this.route('foo', function() {
-          this.route('bar', { path: '/bar', resetNamespace: true }, function() {});
+      this.router.map(function () {
+        this.route('foo', function () {
+          this.route('bar', { path: '/bar', resetNamespace: true }, function () {});
         });
       });
 
@@ -349,8 +349,8 @@ moduleFor(
       this.addTemplate('foo.bar_loading', 'FOOBAR LOADING');
       this.addTemplate('foo.bar', 'YAY');
 
-      this.router.map(function() {
-        this.route('foo', function() {
+      this.router.map(function () {
+        this.route('foo', function () {
           this.route('bar');
         });
       });
@@ -387,8 +387,8 @@ moduleFor(
       this.addTemplate('foo.bar_error', 'FOOBAR ERROR: {{this.model.msg}}');
       this.addTemplate('foo.bar', 'YAY');
 
-      this.router.map(function() {
-        this.route('foo', function() {
+      this.router.map(function () {
+        this.route('foo', function () {
           this.route('bar');
         });
       });
@@ -422,8 +422,8 @@ moduleFor(
       this.addTemplate('foo.bar_error', 'FOOBAR ERROR: {{@model.msg}}');
       this.addTemplate('foo.bar', 'YAY');
 
-      this.router.map(function() {
-        this.route('foo', function() {
+      this.router.map(function () {
+        this.route('foo', function () {
           this.route('bar');
         });
       });
@@ -456,8 +456,8 @@ moduleFor(
       this.addTemplate('foo.index', 'YAY');
       this.addTemplate('foo', '{{outlet}}');
 
-      this.router.map(function() {
-        this.route('foo', function() {
+      this.router.map(function () {
+        this.route('foo', function () {
           this.route('bar');
         });
       });
@@ -499,8 +499,8 @@ moduleFor(
       this.addTemplate('foo.index', 'YAY');
       this.addTemplate('foo', '{{outlet}}');
 
-      this.router.map(function() {
-        this.route('foo', function() {
+      this.router.map(function () {
+        this.route('foo', function () {
           this.route('bar');
         });
       });
@@ -540,8 +540,8 @@ moduleFor(
       this.addTemplate('foo.index', 'YAY');
       this.addTemplate('foo', '{{outlet}}');
 
-      this.router.map(function() {
-        this.route('foo', function() {
+      this.router.map(function () {
+        this.route('foo', function () {
           this.route('bar');
         });
       });
@@ -675,15 +675,15 @@ moduleFor(
       this.addTemplate('grandma', 'GRANDMA {{outlet}}');
       this.addTemplate('mom', 'MOM');
 
-      this.router.map(function() {
-        this.route('grandma', function() {
-          this.route('mom', { resetNamespace: true }, function() {
+      this.router.map(function () {
+        this.route('grandma', function () {
+          this.route('mom', { resetNamespace: true }, function () {
             this.route('sally');
             this.route('this-route-throws');
           });
           this.route('puppies');
         });
-        this.route('memere', { path: '/memere/:seg' }, function() {});
+        this.route('memere', { path: '/memere/:seg' }, function () {});
       });
     }
 
@@ -884,7 +884,7 @@ moduleFor(
 
       await assert.rejects(
         this.visit('/grandma/mom/sally'),
-        function(err) {
+        function (err) {
           return err.msg === 'did it broke?';
         },
         'it broke'
@@ -929,7 +929,7 @@ moduleFor(
 
       await assert.rejects(
         this.visit('/grandma/mom/sally'),
-        function(err) {
+        function (err) {
           return err.msg === 'did it broke?';
         },
         `it broke`
@@ -959,7 +959,7 @@ moduleFor(
 
       await assert.rejects(
         this.visit('/grandma/mom/sally'),
-        function(err) {
+        function (err) {
           return err.msg == 'did it broke?';
         },
         'Correct error was thrown'
@@ -1004,7 +1004,7 @@ moduleFor(
 
       await assert.rejects(
         this.visit('/grandma/mom/sally'),
-        function(err) {
+        function (err) {
           return err.msg === 'did it broke?';
         },
         'it broke'
@@ -1273,7 +1273,7 @@ moduleFor(
       this.add(
         'route:grandma',
         Route.extend({
-          beforeModel: function() {
+          beforeModel: function () {
             this.transitionTo('memere', 1);
           },
         })
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index a694bec1675..183ece6ba68 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -17,7 +17,7 @@ moduleFor(
       this.addTemplate('camelot', '<section id="camelot"><h3>Is a silly place</h3></section>');
       this.addTemplate('homepage', '<h3 id="troll">Megatroll</h3><p>{{this.name}}</p>');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -43,10 +43,10 @@ moduleFor(
         }
 
         result.then(
-          function() {
+          function () {
             assert.ok(false, 'url: `' + path + '` was NOT to be handled');
           },
-          function(reason) {
+          function (reason) {
             assert.ok(
               reason && reason.message === 'TransitionAborted',
               'url: `' + path + '` was to be aborted'
@@ -147,7 +147,7 @@ moduleFor(
     }
 
     async [`@test The template will pull in an alternate controller via key/value`](assert) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('homepage', { path: '/' });
       });
 
@@ -337,9 +337,9 @@ moduleFor(
       this.addTemplate('bar', "<div class='bottom'>{{outlet}}</div>");
       this.addTemplate('bar.baz', '<p>{{name}}Bottom!</p>');
 
-      this.router.map(function() {
-        this.route('foo', { path: '/top' }, function() {
-          this.route('bar', { path: '/middle', resetNamespace: true }, function() {
+      this.router.map(function () {
+        this.route('foo', { path: '/top' }, function () {
+          this.route('bar', { path: '/middle', resetNamespace: true }, function () {
             this.route('baz', { path: '/bottom' });
           });
         });
@@ -397,9 +397,9 @@ moduleFor(
       this.addTemplate('middle', "<div class='bottom'>{{outlet}}</div>");
       this.addTemplate('middle.bottom', '<p>Bottom!</p>');
 
-      this.router.map(function() {
-        this.route('top', function() {
-          this.route('middle', { resetNamespace: true }, function() {
+      this.router.map(function () {
+        this.route('top', function () {
+          this.route('middle', { resetNamespace: true }, function () {
             this.route('bottom');
           });
         });
@@ -423,9 +423,9 @@ moduleFor(
       this.addTemplate('middle', "<div class='bottom'>{{outlet}}</div>");
       this.addTemplate('middle.bottom', '<p>Bottom!</p>');
 
-      this.router.map(function() {
-        this.route('top', function() {
-          this.route('middle', { resetNamespace: true }, function() {
+      this.router.map(function () {
+        this.route('top', function () {
+          this.route('middle', { resetNamespace: true }, function () {
             this.route('bottom');
           });
         });
@@ -460,7 +460,7 @@ moduleFor(
       this.addTemplate('person.profile', 'profile {{outlet}}');
       this.addTemplate('person.details', 'details!');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -490,8 +490,8 @@ moduleFor(
       this.addTemplate('posts.index', '<p class="posts-index">postsIndex</p>');
       this.addTemplate('posts.menu', '<div class="posts-menu">postsMenu</div>');
 
-      this.router.map(function() {
-        this.route('posts', function() {});
+      this.router.map(function () {
+        this.route('posts', function () {});
       });
 
       this.add(
@@ -526,7 +526,7 @@ moduleFor(
     ['@test Application template does not duplicate when re-rendered'](assert) {
       this.addTemplate('application', '<h3 class="render-once">I render once</h3>{{outlet}}');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('posts');
       });
 
@@ -552,7 +552,7 @@ moduleFor(
       this.addTemplate('application', '<h3>App</h3> {{outlet}}');
       this.addTemplate('posts', 'posts');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('posts');
         this.route('photos');
       });
@@ -575,7 +575,7 @@ moduleFor(
     ["@feature(!EMBER_ROUTING_MODEL_ARG) The template is not re-rendered when the route's context changes"](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('page', { path: '/page/:name' });
       });
 
@@ -624,7 +624,7 @@ moduleFor(
     async ["@feature(EMBER_ROUTING_MODEL_ARG) The template is not re-rendered when the route's model changes"](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('page', { path: '/page/:name' });
       });
 
@@ -673,7 +673,7 @@ moduleFor(
     ['@test The template is not re-rendered when two routes present the exact same template & controller'](
       assert
     ) {
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('first');
         this.route('second');
         this.route('third');
@@ -729,10 +729,10 @@ moduleFor(
               .lookup('router:main')
               .transitionTo('third')
               .then(
-                function() {
+                function () {
                   assert.ok(true, 'expected transition');
                 },
-                function(reason) {
+                function (reason) {
                   assert.ok(false, 'unexpected transition failure: ', QUnit.jsDump.parse(reason));
                 }
               );
@@ -758,9 +758,9 @@ moduleFor(
       this.addTemplate('posts.menu', '<div class="posts-menu">postsMenu</div>');
       this.addTemplate('posts.footer', '<div class="posts-footer">postsFooter</div>');
 
-      this.router.map(function() {
-        this.route('posts', function() {});
-        this.route('users', function() {});
+      this.router.map(function () {
+        this.route('posts', function () {});
+        this.route('users', function () {});
       });
 
       this.add(
@@ -832,9 +832,9 @@ moduleFor(
       this.addTemplate('posts.modal', '<div class="posts-modal">postsModal</div>');
       this.addTemplate('posts.extra', '<div class="posts-extra">postsExtra</div>');
 
-      this.router.map(function() {
-        this.route('posts', function() {});
-        this.route('users', function() {});
+      this.router.map(function () {
+        this.route('posts', function () {});
+        this.route('users', function () {});
       });
 
       this.add(
@@ -911,7 +911,7 @@ moduleFor(
             null,
             'The posts/extra template was removed'
           );
-          run(function() {
+          run(function () {
             router.send('showModal');
           });
           assert.equal(
@@ -919,7 +919,7 @@ moduleFor(
             'postsModal',
             'The posts/modal template was rendered'
           );
-          run(function() {
+          run(function () {
             router.send('showExtra');
           });
           assert.equal(
@@ -955,9 +955,9 @@ moduleFor(
       this.addTemplate('posts.index', '<div class="posts-index">postsIndex {{outlet}}</div>');
       this.addTemplate('posts.modal', '<div class="posts-modal">postsModal</div>');
 
-      this.router.map(function() {
-        this.route('posts', function() {});
-        this.route('users', function() {});
+      this.router.map(function () {
+        this.route('posts', function () {});
+        this.route('users', function () {});
       });
 
       this.add(
@@ -1021,7 +1021,7 @@ moduleFor(
       this.addTemplate('posts', "{{outlet 'modal'}}");
       this.addTemplate('modal', 'A Yo.');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('posts');
       });
 
@@ -1057,7 +1057,7 @@ moduleFor(
     ['@test Specifying non-existent controller name in route#render throws'](assert) {
       assert.expect(1);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('home', { path: '/' });
       });
 
@@ -1081,8 +1081,8 @@ moduleFor(
       this.addTemplate('sample', 'Hi{{#if showTheThing}}{{outlet}}{{/if}}Bye');
       this.addTemplate('sample.inner', 'Yay');
       this.addTemplate('sample.inner2', 'Boo');
-      this.router.map(function() {
-        this.route('sample', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('sample', { path: '/' }, function () {
           this.route('inner', { path: '/' });
           this.route('inner2', { path: '/2' });
         });
@@ -1108,7 +1108,7 @@ moduleFor(
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
       this.addTemplate('index', 'The index');
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
       this.add(
@@ -1138,7 +1138,7 @@ moduleFor(
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
       this.addTemplate('index', 'The index');
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
       this.add(
@@ -1180,7 +1180,7 @@ moduleFor(
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('hasNoTemplate', { path: '/' });
       });
 
@@ -1207,7 +1207,7 @@ moduleFor(
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
       this.addTemplate('index', 'The index');
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
       this.add(
@@ -1245,8 +1245,8 @@ moduleFor(
       this.addTemplate('common', '<div id="common"></div>');
       this.addTemplate('sub', '<div id="sub"></div>');
 
-      this.router.map(function() {
-        this.route('app', { path: '/app' }, function() {
+      this.router.map(function () {
+        this.route('app', { path: '/app' }, function () {
           this.route('sub', { path: '/sub', resetNamespace: true });
         });
       });
@@ -1308,7 +1308,7 @@ moduleFor(
       this.addTemplate('application', '{{outlet}}{{outlet "modal"}}');
       this.addTemplate('index', 'hi');
       this.addTemplate('layer', 'layer');
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
       this.add(
@@ -1349,8 +1349,8 @@ moduleFor(
       this.addTemplate('exports.root', '<div class="b">{{outlet}}</div>');
       this.addTemplate('exports.index', '<div class="c"></div>');
 
-      this.router.map(function() {
-        this.route('root', function() {});
+      this.router.map(function () {
+        this.route('root', function () {});
       });
 
       this.add(
@@ -1381,7 +1381,7 @@ moduleFor(
       this.addTemplate('application', '{{outlet}}{{outlet "modal"}}');
       this.addTemplate('index', 'hi');
       this.addTemplate('layer', 'layer');
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
       this.add(
@@ -1434,7 +1434,7 @@ moduleFor(
       let otherComponentCounter = 0;
       let indexController;
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('index', { path: '/' });
       });
 
diff --git a/packages/ember/tests/service_injection_test.js b/packages/ember/tests/service_injection_test.js
index 8f3864fdb5a..280f7f81e0e 100644
--- a/packages/ember/tests/service_injection_test.js
+++ b/packages/ember/tests/service_injection_test.js
@@ -64,7 +64,7 @@ moduleFor(
         })
       );
       let MyService = Service.extend({
-        name: computed(function() {
+        name: computed(function () {
           return 'The service name';
         }),
       });
diff --git a/packages/ember/tests/view_instrumentation_test.js b/packages/ember/tests/view_instrumentation_test.js
index 5fede3cb664..4fa35d8bf5c 100644
--- a/packages/ember/tests/view_instrumentation_test.js
+++ b/packages/ember/tests/view_instrumentation_test.js
@@ -10,7 +10,7 @@ moduleFor(
       this.addTemplate('index', `<h1>Index</h1>`);
       this.addTemplate('posts', `<h1>Posts</h1>`);
 
-      this.router.map(function() {
+      this.router.map(function () {
         this.route('posts');
       });
     }
diff --git a/packages/external-helpers/lib/external-helpers.js b/packages/external-helpers/lib/external-helpers.js
index 167f6a7b9f3..c021c577804 100644
--- a/packages/external-helpers/lib/external-helpers.js
+++ b/packages/external-helpers/lib/external-helpers.js
@@ -131,7 +131,7 @@ export function objectDestructuringEmpty(obj) {
   Original source: https://github.com/babel/babel/blob/v7.9.2/packages/babel-helpers/src/helpers.js#L738-L757
 */
 export function createSuper(Derived) {
-  return function() {
+  return function () {
     let Super = getPrototypeOf(Derived);
     let result;
 
@@ -182,7 +182,7 @@ export function createForOfIteratorHelperLoose(o) {
   if (typeof Symbol === 'undefined' || o[Symbol.iterator] == null) {
     // Fallback for engines without symbol support
     if (Array.isArray(o) || (o = unsupportedIterableToArray(o)))
-      return function() {
+      return function () {
         if (i >= o.length) return { done: true };
         return { done: false, value: o[i++] };
       };
diff --git a/packages/internal-test-helpers/lib/apply-mixins.js b/packages/internal-test-helpers/lib/apply-mixins.js
index 81344a261d5..08cc8733d9c 100644
--- a/packages/internal-test-helpers/lib/apply-mixins.js
+++ b/packages/internal-test-helpers/lib/apply-mixins.js
@@ -6,7 +6,7 @@ function isGenerator(mixin) {
 }
 
 export default function applyMixins(TestClass, ...mixins) {
-  mixins.forEach(mixinOrGenerator => {
+  mixins.forEach((mixinOrGenerator) => {
     let mixin;
 
     if (isGenerator(mixinOrGenerator)) {
@@ -22,8 +22,8 @@ export default function applyMixins(TestClass, ...mixins) {
       let properties = getAllPropertyNames(mixinOrGenerator);
       mixin = new mixinOrGenerator();
 
-      properties.forEach(name => {
-        TestClass.prototype[name] = function() {
+      properties.forEach((name) => {
+        TestClass.prototype[name] = function () {
           return mixin[name].apply(mixin, arguments);
         };
       });
diff --git a/packages/internal-test-helpers/lib/ember-dev/assertion.ts b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
index ae1025d7015..6941203760b 100644
--- a/packages/internal-test-helpers/lib/ember-dev/assertion.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
@@ -33,7 +33,7 @@ const BREAK = {};
 export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv) {
   let originalAssertFunc = env.getDebugFunction('assert');
 
-  hooks.beforeEach(function(assert) {
+  hooks.beforeEach(function (assert) {
     let expectAssertion: ExpectAssertionFunc = (func: () => void, expectedMessage: Message) => {
       if (!DEBUG) {
         assert.ok(true, 'Assertions disabled in production builds.');
@@ -63,7 +63,7 @@ export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv) {
       check(assert, sawCall, actualMessage, expectedMessage);
     };
 
-    let ignoreAssertion: IgnoreAssertionFunc = func => {
+    let ignoreAssertion: IgnoreAssertionFunc = (func) => {
       callWithStub(env, 'assert', func);
     };
 
@@ -71,7 +71,7 @@ export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv) {
     window.ignoreAssertion = ignoreAssertion;
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     // Edge will occasionally not run finally blocks, so we have to be extra
     // sure we restore the original assert function
     env.setDebugFunction('assert', originalAssertFunc);
diff --git a/packages/internal-test-helpers/lib/ember-dev/containers.ts b/packages/internal-test-helpers/lib/ember-dev/containers.ts
index 50a8836d670..24a2c31cfc5 100644
--- a/packages/internal-test-helpers/lib/ember-dev/containers.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/containers.ts
@@ -3,7 +3,7 @@ import { Container } from '@ember/-internals/container';
 const { _leakTracking: containerLeakTracking } = Container;
 
 export function setupContainersCheck(hooks: NestedHooks) {
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     if (containerLeakTracking === undefined) return;
 
     let { config } = QUnit;
@@ -15,11 +15,11 @@ export function setupContainersCheck(hooks: NestedHooks) {
       finish: originalFinish,
     } = config.current;
 
-    config.current.finish = function() {
+    config.current.finish = function () {
       originalFinish.call(this);
       originalFinish = undefined;
 
-      (config as any).queue.unshift(function() {
+      (config as any).queue.unshift(function () {
         if (containerLeakTracking.hasContainers()) {
           containerLeakTracking.reset();
           // eslint-disable-next-line no-console
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index 0731fa74af2..6a64f5ac152 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -24,12 +24,12 @@ declare global {
 export function setupDeprecationHelpers(hooks: NestedHooks, env: DebugEnv) {
   let assertion = new DeprecationAssert(env);
 
-  hooks.beforeEach(function() {
+  hooks.beforeEach(function () {
     assertion.reset();
     assertion.inject();
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     assertion.assert();
     assertion.restore();
   });
@@ -51,12 +51,12 @@ class DeprecationAssert extends DebugAssert {
     // expectNoDeprecation();
     // Ember.deprecate("Old And Busted");
     //
-    let expectNoDeprecation: ExpectNoDeprecationFunc = func => {
+    let expectNoDeprecation: ExpectNoDeprecationFunc = (func) => {
       if (typeof func !== 'function') {
         func = undefined;
       }
 
-      this.runExpectation(func, tracker => {
+      this.runExpectation(func, (tracker) => {
         if (tracker.isExpectingCalls()) {
           throw new Error('expectNoDeprecation was called after expectDeprecation was called!');
         }
@@ -86,7 +86,7 @@ class DeprecationAssert extends DebugAssert {
         actualFunc = func;
       }
 
-      this.runExpectation(actualFunc, tracker => {
+      this.runExpectation(actualFunc, (tracker) => {
         if (tracker.isExpectingNoCalls()) {
           throw new Error('expectDeprecation was called after expectNoDeprecation was called!');
         }
@@ -106,7 +106,7 @@ class DeprecationAssert extends DebugAssert {
 
       await this.runExpectation(
         actualFunc,
-        tracker => {
+        (tracker) => {
           if (tracker.isExpectingNoCalls()) {
             throw new Error('expectDeprecation was called after expectNoDeprecation was called!');
           }
@@ -117,7 +117,7 @@ class DeprecationAssert extends DebugAssert {
       );
     };
 
-    let ignoreDeprecation: IgnoreDeprecationFunc = func => {
+    let ignoreDeprecation: IgnoreDeprecationFunc = (func) => {
       callWithStub(this.env, 'deprecate', func);
     };
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/namespaces.ts b/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
index 35b1de0b926..c2b9022cd26 100644
--- a/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
@@ -2,7 +2,7 @@ import { NAMESPACES, NAMESPACES_BY_ID } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 
 export function setupNamespacesCheck(hooks: NestedHooks) {
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     let { assert } = QUnit.config.current;
 
     if (NAMESPACES.length > 0) {
diff --git a/packages/internal-test-helpers/lib/ember-dev/observers.ts b/packages/internal-test-helpers/lib/ember-dev/observers.ts
index c99eb73d6f8..ea1411fdc5d 100644
--- a/packages/internal-test-helpers/lib/ember-dev/observers.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/observers.ts
@@ -2,7 +2,7 @@ import { ASYNC_OBSERVERS, SYNC_OBSERVERS } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 
 export function setupObserversCheck(hooks: NestedHooks) {
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     let { assert } = QUnit.config.current;
 
     if (ASYNC_OBSERVERS.size > 0) {
diff --git a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
index cb295790451..3eee140c732 100644
--- a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
@@ -2,7 +2,7 @@
 import { cancelTimers, end, getCurrentRunLoop, hasScheduledTimers } from '@ember/runloop';
 
 export function setupRunLoopCheck(hooks: NestedHooks) {
-  hooks.afterEach(function(assert) {
+  hooks.afterEach(function (assert) {
     if (getCurrentRunLoop() || hasScheduledTimers()) {
       let done = assert.async();
       // use a setTimeout to allow the current run loop to flush via autorun
diff --git a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
index 5747e0220a8..bcc6c785ab7 100644
--- a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
@@ -33,8 +33,8 @@ export default function setupQUnit() {
 
   let originalModule = QUnit.module;
 
-  QUnit.module = function(name: string, callback: any) {
-    return originalModule(name, function(hooks) {
+  QUnit.module = function (name: string, callback: any) {
+    return originalModule(name, function (hooks) {
       setupContainersCheck(hooks);
       setupNamespacesCheck(hooks);
       setupObserversCheck(hooks);
@@ -47,7 +47,7 @@ export default function setupQUnit() {
     });
   } as typeof QUnit.module;
 
-  QUnit.assert.rejects = async function(
+  QUnit.assert.rejects = async function (
     promise: Promise<any>,
     expected?: RegExp | string,
     message?: string
@@ -78,7 +78,7 @@ export default function setupQUnit() {
     Ember.onerror = prevOnError;
   };
 
-  QUnit.assert.throwsAssertion = function(
+  QUnit.assert.throwsAssertion = function (
     block: () => any,
     expected?: string | RegExp,
     message?: string
@@ -91,7 +91,7 @@ export default function setupQUnit() {
     return QUnit.assert.throws(block, expected, message);
   };
 
-  QUnit.assert.rejectsAssertion = async function(
+  QUnit.assert.rejectsAssertion = async function (
     promise: Promise<any>,
     expected?: string | RegExp,
     message?: string
diff --git a/packages/internal-test-helpers/lib/ember-dev/warning.ts b/packages/internal-test-helpers/lib/ember-dev/warning.ts
index 460c9d9814c..0c0b1368e8f 100644
--- a/packages/internal-test-helpers/lib/ember-dev/warning.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/warning.ts
@@ -19,12 +19,12 @@ declare global {
 export function setupWarningHelpers(hooks: NestedHooks, env: DebugEnv) {
   let assertion = new WarningAssert(env);
 
-  hooks.beforeEach(function() {
+  hooks.beforeEach(function () {
     assertion.reset();
     assertion.inject();
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     assertion.assert();
     assertion.restore();
   });
@@ -46,12 +46,12 @@ class WarningAssert extends DebugAssert {
     // expectNoWarning();
     // Ember.warn("Oh snap, didn't expect that");
     //
-    let expectNoWarning: ExpectNoWarningFunc = func => {
+    let expectNoWarning: ExpectNoWarningFunc = (func) => {
       if (typeof func !== 'function') {
         func = undefined;
       }
 
-      this.runExpectation(func, tracker => {
+      this.runExpectation(func, (tracker) => {
         if (tracker.isExpectingCalls()) {
           throw new Error('expectNoWarning was called after expectWarning was called!');
         }
@@ -81,7 +81,7 @@ class WarningAssert extends DebugAssert {
         actualFunc = func;
       }
 
-      this.runExpectation(actualFunc, tracker => {
+      this.runExpectation(actualFunc, (tracker) => {
         if (tracker.isExpectingNoCalls()) {
           throw new Error('expectWarning was called after expectNoWarning was called!');
         }
@@ -90,7 +90,7 @@ class WarningAssert extends DebugAssert {
       });
     };
 
-    let ignoreWarning: IgnoreWarningFunc = func => {
+    let ignoreWarning: IgnoreWarningFunc = (func) => {
       callWithStub(this.env, 'warn', func);
     };
 
diff --git a/packages/internal-test-helpers/lib/equal-tokens.js b/packages/internal-test-helpers/lib/equal-tokens.js
index 24b172e61f3..f4a984b0732 100644
--- a/packages/internal-test-helpers/lib/equal-tokens.js
+++ b/packages/internal-test-helpers/lib/equal-tokens.js
@@ -15,7 +15,7 @@ function generateTokens(containerOrHTML) {
 }
 
 function normalizeTokens(tokens) {
-  tokens.forEach(token => {
+  tokens.forEach((token) => {
     if (token.type === 'StartTag') {
       token.attributes = token.attributes.sort((a, b) => {
         if (a[0] > b[0]) {
diff --git a/packages/internal-test-helpers/lib/factory.js b/packages/internal-test-helpers/lib/factory.js
index e4b51cd2f99..b0e1294605a 100644
--- a/packages/internal-test-helpers/lib/factory.js
+++ b/packages/internal-test-helpers/lib/factory.js
@@ -16,11 +16,11 @@ export default function factory() {
   }
 
   Klass.prototype.constructor = Klass;
-  Klass.prototype.destroy = function() {
+  Klass.prototype.destroy = function () {
     this.isDestroyed = true;
   };
 
-  Klass.prototype.toString = function() {
+  Klass.prototype.toString = function () {
     return '<Factory:' + this._guid + '>';
   };
 
diff --git a/packages/internal-test-helpers/lib/get-all-property-names.js b/packages/internal-test-helpers/lib/get-all-property-names.js
index 65a3f7738a1..4a67a25ac68 100644
--- a/packages/internal-test-helpers/lib/get-all-property-names.js
+++ b/packages/internal-test-helpers/lib/get-all-property-names.js
@@ -4,7 +4,7 @@ export default function getAllPropertyNames(Klass) {
 
   while (proto !== Object.prototype) {
     let names = Object.getOwnPropertyNames(proto);
-    names.forEach(name => properties.add(name));
+    names.forEach((name) => properties.add(name));
     proto = Object.getPrototypeOf(proto);
   }
 
diff --git a/packages/internal-test-helpers/lib/matchers.js b/packages/internal-test-helpers/lib/matchers.js
index 4010f6dff4f..8ca276dd3bb 100644
--- a/packages/internal-test-helpers/lib/matchers.js
+++ b/packages/internal-test-helpers/lib/matchers.js
@@ -49,15 +49,7 @@ export function classes(expected) {
       actual = actual.trim();
       return (
         actual &&
-        expected
-          .split(/\s+/)
-          .sort()
-          .join(' ') ===
-          actual
-            .trim()
-            .split(/\s+/)
-            .sort()
-            .join(' ')
+        expected.split(/\s+/).sort().join(' ') === actual.trim().split(/\s+/).sort().join(' ')
       );
     },
 
@@ -84,14 +76,14 @@ export function styles(expected) {
       return (
         expected
           .split(';')
-          .map(s => s.trim())
-          .filter(s => s)
+          .map((s) => s.trim())
+          .filter((s) => s)
           .sort()
           .join('; ') ===
         actual
           .split(';')
-          .map(s => s.trim())
-          .filter(s => s)
+          .map((s) => s.trim())
+          .filter((s) => s)
           .sort()
           .join('; ')
       );
diff --git a/packages/internal-test-helpers/lib/module-for.js b/packages/internal-test-helpers/lib/module-for.js
index 49ac4e64b3f..9840af48551 100644
--- a/packages/internal-test-helpers/lib/module-for.js
+++ b/packages/internal-test-helpers/lib/module-for.js
@@ -5,13 +5,13 @@ import { setContext, unsetContext } from './test-context';
 import { all } from 'rsvp';
 
 export default function moduleFor(description, TestClass, ...mixins) {
-  QUnit.module(description, function(hooks) {
+  QUnit.module(description, function (hooks) {
     setupTestClass(hooks, TestClass, ...mixins);
   });
 }
 
 export function setupTestClass(hooks, TestClass, ...mixins) {
-  hooks.beforeEach(function(assert) {
+  hooks.beforeEach(function (assert) {
     let instance = new TestClass(assert);
     this.instance = instance;
 
@@ -22,7 +22,7 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
     }
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     let promises = [];
     let instance = this.instance;
     this.instance = null;
@@ -55,7 +55,7 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
   properties.forEach(generateTest);
 
   function shouldTest(features) {
-    return features.every(feature => {
+    return features.every((feature) => {
       if (feature[0] === '!') {
         return !isEnabled(feature.slice(1));
       } else {
@@ -66,16 +66,16 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
 
   function generateTest(name) {
     if (name.indexOf('@test ') === 0) {
-      QUnit.test(name.slice(5), function(assert) {
+      QUnit.test(name.slice(5), function (assert) {
         return this.instance[name](assert);
       });
     } else if (name.indexOf('@only ') === 0) {
       // eslint-disable-next-line qunit/no-only
-      QUnit.only(name.slice(5), function(assert) {
+      QUnit.only(name.slice(5), function (assert) {
         return this.instance[name](assert);
       });
     } else if (name.indexOf('@skip ') === 0) {
-      QUnit.skip(name.slice(5), function(assert) {
+      QUnit.skip(name.slice(5), function (assert) {
         return this.instance[name](assert);
       });
     } else {
@@ -85,7 +85,7 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
         let features = match[1].replace(/ /g, '').split(',');
 
         if (shouldTest(features)) {
-          QUnit.test(name.slice(match[0].length), function(assert) {
+          QUnit.test(name.slice(match[0].length), function (assert) {
             return this.instance[name](assert);
           });
         }
diff --git a/packages/internal-test-helpers/lib/node-query.js b/packages/internal-test-helpers/lib/node-query.js
index 0fb7ea1d29b..493675cf895 100644
--- a/packages/internal-test-helpers/lib/node-query.js
+++ b/packages/internal-test-helpers/lib/node-query.js
@@ -35,7 +35,7 @@ export default class NodeQuery {
   findAll(selector) {
     let nodes = [];
 
-    this.nodes.forEach(node => {
+    this.nodes.forEach((node) => {
       nodes.push(...node.querySelectorAll(selector));
     });
 
@@ -43,7 +43,7 @@ export default class NodeQuery {
   }
 
   trigger(eventName, options) {
-    return this.nodes.map(node => fireEvent(node, eventName, options));
+    return this.nodes.map((node) => fireEvent(node, eventName, options));
   }
 
   click() {
@@ -55,7 +55,7 @@ export default class NodeQuery {
   }
 
   text() {
-    return this.nodes.map(node => node.textContent).join('');
+    return this.nodes.map((node) => node.textContent).join('');
   }
 
   attr(name) {
@@ -79,7 +79,7 @@ export default class NodeQuery {
   }
 
   setProp(name, value) {
-    this.nodes.forEach(node => (node[name] = value));
+    this.nodes.forEach((node) => (node[name] = value));
 
     return this;
   }
@@ -93,7 +93,7 @@ export default class NodeQuery {
   }
 
   is(selector) {
-    return this.nodes.every(node => matches(node, selector));
+    return this.nodes.every((node) => matches(node, selector));
   }
 
   hasClass(className) {
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 28f93bef90b..719372e3c5e 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -24,14 +24,14 @@ export function runTask(callback: Function) {
 }
 
 export function runTaskNext(): Promise<void> {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     return next(resolve);
   });
 }
 
 // TODO: Find a better name 😎
 export function runLoopSettled(event?: any): Promise<void> {
-  return new Promise(function(resolve) {
+  return new Promise(function (resolve) {
     // Every 5ms, poll for the async thing to have finished
     let watcher = setInterval(() => {
       // If there are scheduled timers or we are inside of a run loop, keep polling
diff --git a/packages/internal-test-helpers/lib/strip.js b/packages/internal-test-helpers/lib/strip.js
index 3425a2acf05..5d0509410c3 100644
--- a/packages/internal-test-helpers/lib/strip.js
+++ b/packages/internal-test-helpers/lib/strip.js
@@ -7,6 +7,6 @@ export default function strip([...strings], ...values) {
     .join('');
   return str
     .split('\n')
-    .map(s => s.trim())
+    .map((s) => s.trim())
     .join('');
 }
diff --git a/packages/internal-test-helpers/lib/system/synthetic-events.js b/packages/internal-test-helpers/lib/system/synthetic-events.js
index 00fa8215030..79b5c10fd38 100644
--- a/packages/internal-test-helpers/lib/system/synthetic-events.js
+++ b/packages/internal-test-helpers/lib/system/synthetic-events.js
@@ -53,7 +53,7 @@ export function focus(el) {
     return;
   }
   if (isFocusable(el)) {
-    run(null, function() {
+    run(null, function () {
       let browserIsNotFocused = document.hasFocus && !document.hasFocus();
 
       // Firefox does not trigger the `focusin` event if the window
@@ -76,7 +76,7 @@ export function focus(el) {
 
 export function blur(el) {
   if (isFocusable(el)) {
-    run(null, function() {
+    run(null, function () {
       let browserIsNotFocused = document.hasFocus && !document.hasFocus();
 
       fireEvent(el, 'focusout');
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.js b/packages/internal-test-helpers/lib/test-cases/abstract-application.js
index 1793c4c41d7..a8d7d6e03e7 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.js
@@ -9,16 +9,18 @@ export default class AbstractApplicationTestCase extends AbstractTestCase {
       return this._applicationInstancePromise;
     }
 
-    return (this._applicationInstancePromise = runTask(() => this.application.boot()).then(app => {
-      this.applicationInstance = app.buildInstance();
+    return (this._applicationInstancePromise = runTask(() => this.application.boot()).then(
+      (app) => {
+        this.applicationInstance = app.buildInstance();
 
-      return this.applicationInstance.boot(bootOptions);
-    }));
+        return this.applicationInstance.boot(bootOptions);
+      }
+    ));
   }
 
   async visit(url, options) {
     // Create the instance
-    let instance = await this._ensureInstance(options).then(instance =>
+    let instance = await this._ensureInstance(options).then((instance) =>
       runTask(() => instance.visit(url))
     );
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router.js b/packages/internal-test-helpers/lib/test-cases/router.js
index 05d888e3beb..1e5b3b96ef1 100644
--- a/packages/internal-test-helpers/lib/test-cases/router.js
+++ b/packages/internal-test-helpers/lib/test-cases/router.js
@@ -4,14 +4,14 @@ export default class RouterTestCase extends ApplicationTestCase {
   constructor() {
     super(...arguments);
 
-    this.router.map(function() {
-      this.route('parent', { path: '/' }, function() {
+    this.router.map(function () {
+      this.route('parent', { path: '/' }, function () {
         this.route('child');
         this.route('sister');
         this.route('brother');
       });
       this.route('dynamic', { path: '/dynamic/:dynamic_id' });
-      this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function() {
+      this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function () {
         this.route('child', { path: '/:child_id' });
       });
     });
diff --git a/packages/loader/lib/index.js b/packages/loader/lib/index.js
index f64632e8817..dcb6c7c4594 100644
--- a/packages/loader/lib/index.js
+++ b/packages/loader/lib/index.js
@@ -4,7 +4,7 @@ let define, require, Ember;
 // Used in @ember/-internals/environment/lib/global.js
 mainContext = this; // eslint-disable-line no-undef
 
-(function() {
+(function () {
   let registry;
   let seen;
 
@@ -73,7 +73,7 @@ mainContext = this; // eslint-disable-line no-undef
     registry = Object.create(null);
     seen = Object.create(null);
 
-    define = function(name, deps, callback) {
+    define = function (name, deps, callback) {
       let value = {};
 
       if (!callback) {
@@ -87,7 +87,7 @@ mainContext = this; // eslint-disable-line no-undef
       registry[name] = value;
     };
 
-    require = function(name) {
+    require = function (name) {
       return internalRequire(name, null);
     };
 
diff --git a/server/index.js b/server/index.js
index 45239abe1a0..bb180fff6a5 100644
--- a/server/index.js
+++ b/server/index.js
@@ -1,5 +1,5 @@
-module.exports = function(app) {
-  app.get('/', function(req, res) {
+module.exports = function (app) {
+  app.get('/', function (req, res) {
     res.redirect('/tests/index.html?hidepassed');
   });
 };
diff --git a/tests/docs/coverage-test.js b/tests/docs/coverage-test.js
index ecc5147788b..a355536b42e 100644
--- a/tests/docs/coverage-test.js
+++ b/tests/docs/coverage-test.js
@@ -3,9 +3,9 @@
 
 const path = require('path');
 
-QUnit.module('Docs coverage', function(hooks) {
+QUnit.module('Docs coverage', function (hooks) {
   let docs, expected;
-  hooks.before(function() {
+  hooks.before(function () {
     if (!process.env.REUSE_DOCS) {
       buildDocs();
     }
@@ -13,14 +13,14 @@ QUnit.module('Docs coverage', function(hooks) {
     expected = require('./expected');
   });
 
-  QUnit.module('classitems', function(hooks) {
+  QUnit.module('classitems', function (hooks) {
     let docsItems, expectedItems;
-    hooks.before(function() {
-      docsItems = new Set(docs.classitems.map(item => item.name).filter(Boolean));
+    hooks.before(function () {
+      docsItems = new Set(docs.classitems.map((item) => item.name).filter(Boolean));
       expectedItems = new Set(expected.classitems);
     });
 
-    QUnit.test('No missing classitems', function(assert) {
+    QUnit.test('No missing classitems', function (assert) {
       let missing = setDifference(expectedItems, docsItems);
       assert.emptySet(
         missing,
@@ -28,7 +28,7 @@ QUnit.module('Docs coverage', function(hooks) {
       );
     });
 
-    QUnit.test('No extraneous classitems', function(assert) {
+    QUnit.test('No extraneous classitems', function (assert) {
       let extraneous = setDifference(docsItems, expectedItems);
       assert.emptySet(
         extraneous,
diff --git a/tests/node/app-boot-test.js b/tests/node/app-boot-test.js
index b6d595d90dc..ae040dd4559 100644
--- a/tests/node/app-boot-test.js
+++ b/tests/node/app-boot-test.js
@@ -2,15 +2,15 @@ const setupAppTest = require('./helpers/setup-app');
 
 require('./helpers/assert-html-matches').register();
 
-QUnit.module('App Boot', function(hooks) {
+QUnit.module('App Boot', function (hooks) {
   setupAppTest(hooks);
 
-  QUnit.test('App boots and routes to a URL', function(assert) {
+  QUnit.test('App boots and routes to a URL', function (assert) {
     this.visit('/');
     assert.ok(this.app);
   });
 
-  QUnit.test('nested {{component}}', function(assert) {
+  QUnit.test('nested {{component}}', function (assert) {
     this.template('index', '{{root-component}}');
 
     this.template(
@@ -30,7 +30,7 @@ QUnit.module('App Boot', function(hooks) {
       <p>The files are *inside* the computer?!</p>\
     ');
 
-    return this.renderToHTML('/').then(function(html) {
+    return this.renderToHTML('/').then(function (html) {
       assert.htmlMatches(
         html,
         '<body><div id="EMBER_ID" class="ember-view"><div id="EMBER_ID" class="ember-view"><h1>Hello World</h1><div><div id="EMBER_ID" class="ember-view"><p>The files are *inside* the computer?!</p></div></div></div></div></body>'
@@ -38,13 +38,13 @@ QUnit.module('App Boot', function(hooks) {
     });
   });
 
-  QUnit.test('{{link-to}}', function(assert) {
+  QUnit.test('{{link-to}}', function (assert) {
     this.template('application', "<h1>{{#link-to 'photos'}}Go to photos{{/link-to}}</h1>");
-    this.routes(function() {
+    this.routes(function () {
       this.route('photos');
     });
 
-    return this.renderToHTML('/').then(function(html) {
+    return this.renderToHTML('/').then(function (html) {
       assert.htmlMatches(
         html,
         '<body><div id="EMBER_ID" class="ember-view"><h1><a id="EMBER_ID" href="/photos" class="ember-view">Go to photos</a></h1></div></body>'
@@ -52,8 +52,8 @@ QUnit.module('App Boot', function(hooks) {
     });
   });
 
-  QUnit.test('non-escaped content', function(assert) {
-    this.routes(function() {
+  QUnit.test('non-escaped content', function (assert) {
+    this.routes(function () {
       this.route('photos');
     });
 
@@ -62,7 +62,7 @@ QUnit.module('App Boot', function(hooks) {
       title: '<b>Hello world</b>',
     });
 
-    return this.renderToHTML('/').then(function(html) {
+    return this.renderToHTML('/').then(function (html) {
       assert.htmlMatches(
         html,
         '<body><div id="EMBER_ID" class="ember-view"><h1><b>Hello world</b></h1></div></body>'
@@ -70,8 +70,8 @@ QUnit.module('App Boot', function(hooks) {
     });
   });
 
-  QUnit.test('outlets', function(assert) {
-    this.routes(function() {
+  QUnit.test('outlets', function (assert) {
+    this.routes(function () {
       this.route('photos');
     });
 
@@ -81,7 +81,7 @@ QUnit.module('App Boot', function(hooks) {
 
     let promises = [];
     promises.push(
-      this.renderToHTML('/').then(function(html) {
+      this.renderToHTML('/').then(function (html) {
         assert.htmlMatches(
           html,
           '<body><div id="EMBER_ID" class="ember-view"><p><span>index</span></p></div></body>'
@@ -90,7 +90,7 @@ QUnit.module('App Boot', function(hooks) {
     );
 
     promises.push(
-      this.renderToHTML('/photos').then(function(html) {
+      this.renderToHTML('/photos').then(function (html) {
         assert.htmlMatches(
           html,
           '<body><div id="EMBER_ID" class="ember-view"><p><em>photos</em></p></div></body>'
@@ -101,7 +101,7 @@ QUnit.module('App Boot', function(hooks) {
     return this.all(promises);
   });
 
-  QUnit.test('lifecycle hooks disabled', function(assert) {
+  QUnit.test('lifecycle hooks disabled', function (assert) {
     assert.expect(1);
 
     this.template('application', "{{my-component foo='bar'}}{{outlet}}");
@@ -127,12 +127,12 @@ QUnit.module('App Boot', function(hooks) {
     return this.renderToHTML('/');
   });
 
-  QUnit.test('Should not attempt to render element modifiers GH#14220', function(assert) {
+  QUnit.test('Should not attempt to render element modifiers GH#14220', function (assert) {
     assert.expect(1);
 
     this.template('application', "<div {{action 'foo'}}></div>");
 
-    return this.renderToHTML('/').then(function(html) {
+    return this.renderToHTML('/').then(function (html) {
       assert.htmlMatches(
         html,
         '<body><div id="EMBER_ID" class="ember-view"><div></div></div></body>'
diff --git a/tests/node/build-info-test.js b/tests/node/build-info-test.js
index 500ae0c2eb7..22f86f73a69 100644
--- a/tests/node/build-info-test.js
+++ b/tests/node/build-info-test.js
@@ -32,7 +32,7 @@ QUnit.module('buildVersion', () => {
     ],
     padEmptyArgs(3, [null, ''])
   ).forEach(({ args, expected }) => {
-    QUnit.test(JSON.stringify(args), assert => {
+    QUnit.test(JSON.stringify(args), (assert) => {
       assert.equal(buildVersion(...args), expected);
     });
   });
@@ -49,12 +49,12 @@ QUnit.module('parseTagVersion', () => {
       expected: '3.1.1-beta.2',
     },
   ].forEach(({ tag, expected }) => {
-    QUnit.test(JSON.stringify(tag), assert => {
+    QUnit.test(JSON.stringify(tag), (assert) => {
       assert.equal(parseTagVersion(tag), expected);
     });
   });
 
-  QUnit.test('parseTagVersion raises on non-semver tags', assert => {
+  QUnit.test('parseTagVersion raises on non-semver tags', (assert) => {
     assert.throws(() => {
       parseTagVersion('some-non-version-tag');
     });
@@ -127,7 +127,7 @@ QUnit.module('buildFromParts', () => {
       },
     },
   ].forEach(({ args, expected }) => {
-    QUnit.test(JSON.stringify(args), assert => {
+    QUnit.test(JSON.stringify(args), (assert) => {
       assert.deepEqual(buildFromParts(...args), expected);
     });
   });
@@ -146,11 +146,11 @@ QUnit.module('buildFromParts', () => {
  */
 function padEmptyArgs(count, replacements) {
   /** @type {function(MatrixEntry): MatrixEntry[]} */
-  let expand = entry => {
+  let expand = (entry) => {
     let expanded = [entry];
     let { args, expected } = entry;
     if (args.length < count) {
-      replacements.forEach(replacement => {
+      replacements.forEach((replacement) => {
         expanded.push({ args: padArgs(args, count, replacement), expected });
       });
     }
diff --git a/tests/node/component-rendering-test.js b/tests/node/component-rendering-test.js
index a5e9c17aeef..2d23b4f9a90 100644
--- a/tests/node/component-rendering-test.js
+++ b/tests/node/component-rendering-test.js
@@ -1,15 +1,15 @@
 const setupComponentTest = require('./helpers/setup-component');
 
-QUnit.module('Components can be rendered without a DOM dependency', function(hooks) {
+QUnit.module('Components can be rendered without a DOM dependency', function (hooks) {
   setupComponentTest(hooks);
 
-  QUnit.test('Simple component', function(assert) {
+  QUnit.test('Simple component', function (assert) {
     let html = this.render('<h1>Hello</h1>');
 
     assert.ok(html.match(/<h1>Hello<\/h1>/));
   });
 
-  QUnit.test('Component with dynamic value', function(assert) {
+  QUnit.test('Component with dynamic value', function (assert) {
     this.set('location', 'World');
 
     let html = this.render('<h1>Hello {{location}}</h1>');
@@ -17,7 +17,7 @@ QUnit.module('Components can be rendered without a DOM dependency', function(hoo
     assert.ok(html.match(/<h1>Hello World<\/h1>/));
   });
 
-  QUnit.test('Ensure undefined attributes requiring protocol sanitization do not error', function(
+  QUnit.test('Ensure undefined attributes requiring protocol sanitization do not error', function (
     assert
   ) {
     this.owner.register(
@@ -34,7 +34,7 @@ QUnit.module('Components can be rendered without a DOM dependency', function(hoo
     assert.ok(html.match(/rel="canonical"/));
   });
 
-  QUnit.test('attributes requiring protocol sanitization do not error', function(assert) {
+  QUnit.test('attributes requiring protocol sanitization do not error', function (assert) {
     this.set('someHref', 'https://foo.com/');
 
     let html = this.render('<a href={{this.someHref}}>Some Link</a>');
diff --git a/tests/node/fastboot-sandbox-test.js b/tests/node/fastboot-sandbox-test.js
index 91d8de63dd5..ea9affbe53e 100644
--- a/tests/node/fastboot-sandbox-test.js
+++ b/tests/node/fastboot-sandbox-test.js
@@ -97,17 +97,17 @@ var app = Ember.Application.extend().create({
   return context;
 }
 
-QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
-  hooks.beforeEach(function() {
+QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
+  hooks.beforeEach(function () {
     let { precompile } = loadEmber();
     this.context = buildSandboxContext(precompile);
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     clearEmber();
   });
 
-  QUnit.test('FastBoot: basic', async function(assert) {
+  QUnit.test('FastBoot: basic', async function (assert) {
     let result = await fastbootVisit(this.context, '/');
 
     assert.equal(result.url, '/', 'landed on correct url');
diff --git a/tests/node/helpers/assert-html-matches.js b/tests/node/helpers/assert-html-matches.js
index 604434b0017..49cb64c23bb 100644
--- a/tests/node/helpers/assert-html-matches.js
+++ b/tests/node/helpers/assert-html-matches.js
@@ -13,7 +13,7 @@ module.exports = {
    * auto-generates. Attribute ordering is also ignored.
    */
   register() {
-    QUnit.assert.htmlMatches = function(actual, expected, message) {
+    QUnit.assert.htmlMatches = function (actual, expected, message) {
       let isEqual = htmlDiffer.isEqual(actual, expected);
 
       this.pushResult({
diff --git a/tests/node/helpers/build-owner.js b/tests/node/helpers/build-owner.js
index ed71462358b..672a399838e 100644
--- a/tests/node/helpers/build-owner.js
+++ b/tests/node/helpers/build-owner.js
@@ -3,7 +3,7 @@ module.exports = function buildOwner(Ember, resolver) {
 
   let namespace = Ember.Object.create({
     Resolver: {
-      create: function() {
+      create: function () {
         return resolver;
       },
     },
diff --git a/tests/node/helpers/load-ember.js b/tests/node/helpers/load-ember.js
index 4b6d5df56a3..9fb1414c5f4 100644
--- a/tests/node/helpers/load-ember.js
+++ b/tests/node/helpers/load-ember.js
@@ -5,22 +5,22 @@ const templateCompilerPath = path.join(distPath, 'ember-template-compiler');
 
 // We store the global symbols beforehand so that we can reset the state
 // properly to avoid the @glimmer/validator assertion
-const originalGlobalSymbols = Object.getOwnPropertySymbols(global).map(sym => [sym, global[sym]]);
+const originalGlobalSymbols = Object.getOwnPropertySymbols(global).map((sym) => [sym, global[sym]]);
 
 module.exports.emberPath = require.resolve(emberPath);
 
-module.exports.loadEmber = function() {
+module.exports.loadEmber = function () {
   let Ember = require(emberPath);
 
   let _precompile = require(templateCompilerPath).precompile;
 
-  let precompile = function(templateString, options) {
+  let precompile = function (templateString, options) {
     let templateSpec = _precompile(templateString, options);
 
     return `Ember.HTMLBars.template(${templateSpec})`;
   };
 
-  let compile = function(templateString, options) {
+  let compile = function (templateString, options) {
     let templateSpec = _precompile(templateString, options);
     let template = new Function('return ' + templateSpec)();
 
@@ -30,10 +30,10 @@ module.exports.loadEmber = function() {
   return { Ember, compile, precompile };
 };
 
-module.exports.clearEmber = function() {
+module.exports.clearEmber = function () {
   delete global.Ember;
 
-  Object.getOwnPropertySymbols(global).forEach(sym => {
+  Object.getOwnPropertySymbols(global).forEach((sym) => {
     delete global[sym];
   });
 
diff --git a/tests/node/helpers/setup-app.js b/tests/node/helpers/setup-app.js
index f1e43836317..6749946018b 100644
--- a/tests/node/helpers/setup-app.js
+++ b/tests/node/helpers/setup-app.js
@@ -55,8 +55,8 @@ const { loadEmber, clearEmber } = require('./load-ember');
  *     });
  */
 
-module.exports = function(hooks) {
-  hooks.beforeEach(function() {
+module.exports = function (hooks) {
+  hooks.beforeEach(function () {
     let { Ember, compile } = loadEmber();
 
     this.Ember = Ember;
@@ -80,7 +80,7 @@ module.exports = function(hooks) {
     this.renderToHTML = renderToHTML;
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     this.run(this.app, 'destroy');
 
     clearEmber();
@@ -124,7 +124,7 @@ function visit(url) {
     isBrowser: false,
     document: dom,
     rootElement: dom.body,
-  }).catch(function(error) {
+  }).catch(function (error) {
     console.error(error.stack);
   });
 }
@@ -138,7 +138,7 @@ function renderToHTML(url) {
     isBrowser: false,
     document: dom,
     rootElement: root,
-  }).then(function() {
+  }).then(function () {
     let serializer = new SimpleDOM.HTMLSerializer(SimpleDOM.voidMap);
     return serializer.serialize(root);
   });
@@ -147,7 +147,7 @@ function renderToHTML(url) {
 function registerApplicationClasses(app, registry) {
   app.initializer({
     name: 'register-application-classes',
-    initialize: function(app) {
+    initialize: function (app) {
       for (let key in registry) {
         app.register(key, registry[key]);
       }
diff --git a/tests/node/helpers/setup-component.js b/tests/node/helpers/setup-component.js
index ddfd379ae69..7321695af4f 100644
--- a/tests/node/helpers/setup-component.js
+++ b/tests/node/helpers/setup-component.js
@@ -4,8 +4,8 @@ const SimpleDOM = require('simple-dom');
 const buildOwner = require('./build-owner');
 const { loadEmber, clearEmber } = require('./load-ember');
 
-module.exports = function(hooks) {
-  hooks.beforeEach(function() {
+module.exports = function (hooks) {
+  hooks.beforeEach(function () {
     let { Ember, compile } = loadEmber();
 
     this.compile = compile;
@@ -17,11 +17,11 @@ module.exports = function(hooks) {
     setupComponentTest.call(this);
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     let module = this;
 
     if (this.component) {
-      this.run(function() {
+      this.run(function () {
         module.component.destroy();
       });
 
@@ -40,7 +40,7 @@ function setupComponentTest() {
   let module = this;
 
   module.element = new SimpleDOM.Document();
-  module.owner = buildOwner(this.Ember, { resolve: function() {} });
+  module.owner = buildOwner(this.Ember, { resolve: function () {} });
   module.owner.register('service:-document', new SimpleDOM.Document(), {
     instantiate: false,
   });
@@ -63,14 +63,14 @@ function setupComponentTest() {
     outlets: {},
   };
 
-  this.run(function() {
+  this.run(function () {
     module.component.setOutletState(module._outletState);
   });
 
   module.render = render;
   module.serializeElement = serializeElement;
-  module.set = function(property, value) {
-    module.run(function() {
+  module.set = function (property, value) {
+    module.run(function () {
       module.Ember.set(module, property, value);
     });
   };
@@ -93,12 +93,12 @@ function render(_template) {
   stateToRender.name = 'index';
   this._outletState.outlets.main = { render: stateToRender, outlets: {} };
 
-  this.run(function() {
+  this.run(function () {
     module.component.setOutletState(module._outletState);
   });
 
   if (!this._hasRendered) {
-    this.run(function() {
+    this.run(function () {
       module.component.appendTo(module.element);
     });
     this._hasRendered = true;
diff --git a/tests/node/instrumentation-test.js b/tests/node/instrumentation-test.js
index c3456bd83e8..b6c5f665fff 100644
--- a/tests/node/instrumentation-test.js
+++ b/tests/node/instrumentation-test.js
@@ -4,17 +4,17 @@ const { loadEmber, clearEmber } = require('./helpers/load-ember');
 
 const { Ember } = loadEmber();
 
-QUnit.module('instrumentation', function(hooks) {
-  hooks.afterEach(function() {
+QUnit.module('instrumentation', function (hooks) {
+  hooks.afterEach(function () {
     clearEmber();
   });
 
-  QUnit.test('it works in FastBoot environment', function(assert) {
+  QUnit.test('it works in FastBoot environment', function (assert) {
     let _originalWindow = global.window;
 
     global.window = {}; // mock window without `performance` property
 
-    let result = Ember.instrument('render', {}, function() {
+    let result = Ember.instrument('render', {}, function () {
       return 'hello';
     });
 
diff --git a/tests/node/sourcemap-test.js b/tests/node/sourcemap-test.js
index d145f4e72b2..bf80bdecfa4 100644
--- a/tests/node/sourcemap-test.js
+++ b/tests/node/sourcemap-test.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 
-QUnit.module('sourcemap validation', function() {
-  QUnit.test(`ember.js has only a single sourcemaps comment`, function(assert) {
+QUnit.module('sourcemap validation', function () {
+  QUnit.test(`ember.js has only a single sourcemaps comment`, function (assert) {
     let jsPath = `dist/tests/ember.js`;
     assert.ok(fs.existsSync(jsPath));
 
diff --git a/tests/node/template-compiler-test.js b/tests/node/template-compiler-test.js
index 5d63d3e29a0..df471e7be0e 100644
--- a/tests/node/template-compiler-test.js
+++ b/tests/node/template-compiler-test.js
@@ -4,19 +4,19 @@ const distPath = path.join(__dirname, '../../dist');
 
 let templateCompiler;
 
-QUnit.module('ember-template-compiler.js', function() {
-  QUnit.module('modern', function(hooks) {
-    hooks.beforeEach(function() {
+QUnit.module('ember-template-compiler.js', function () {
+  QUnit.module('modern', function (hooks) {
+    hooks.beforeEach(function () {
       this.templateCompilerPath = path.resolve(path.join(distPath, 'ember-template-compiler.js'));
       templateCompiler = require(this.templateCompilerPath);
     });
 
-    hooks.afterEach(function() {
+    hooks.afterEach(function () {
       // clear the previously cached version of this module
       delete require.cache[this.templateCompilerPath];
     });
 
-    QUnit.test('can be required', function(assert) {
+    QUnit.test('can be required', function (assert) {
       assert.strictEqual(
         typeof templateCompiler.precompile,
         'function',
@@ -29,25 +29,25 @@ QUnit.module('ember-template-compiler.js', function() {
       );
     });
 
-    QUnit.test('can access _Ember.ENV (private API used by ember-cli-htmlbars)', function(assert) {
+    QUnit.test('can access _Ember.ENV (private API used by ember-cli-htmlbars)', function (assert) {
       assert.equal(typeof templateCompiler._Ember.ENV, 'object', '_Ember.ENV is present');
       assert.notEqual(typeof templateCompiler._Ember.ENV, null, '_Ember.ENV is not null');
     });
 
-    QUnit.test('can access _Ember.FEATURES (private API used by ember-cli-htmlbars)', function(
+    QUnit.test('can access _Ember.FEATURES (private API used by ember-cli-htmlbars)', function (
       assert
     ) {
       assert.equal(typeof templateCompiler._Ember.FEATURES, 'object', '_Ember.FEATURES is present');
       assert.notEqual(typeof templateCompiler._Ember.FEATURES, null, '_Ember.FEATURES is not null');
     });
 
-    QUnit.test('can access _Ember.VERSION (private API used by ember-cli-htmlbars)', function(
+    QUnit.test('can access _Ember.VERSION (private API used by ember-cli-htmlbars)', function (
       assert
     ) {
       assert.equal(typeof templateCompiler._Ember.VERSION, 'string', '_Ember.VERSION is present');
     });
 
-    QUnit.test('can generate a template with a server side generated `id`', function(assert) {
+    QUnit.test('can generate a template with a server side generated `id`', function (assert) {
       let TemplateJSON = JSON.parse(templateCompiler.precompile('<div>simple text</div>'));
 
       assert.ok(TemplateJSON.id, 'an `id` was generated');
diff --git a/tests/node/visit-test.js b/tests/node/visit-test.js
index dbac8d154b8..a478b867bfe 100644
--- a/tests/node/visit-test.js
+++ b/tests/node/visit-test.js
@@ -6,7 +6,7 @@ function assertHTMLMatches(assert, actualHTML, expectedHTML) {
 }
 
 function handleError(assert) {
-  return function(error) {
+  return function (error) {
     assert.ok(false, error.stack);
   };
 }
@@ -19,7 +19,7 @@ function fastbootVisit(App, url) {
   let rootElement = doc.body;
   let options = { isBrowser: false, document: doc, rootElement: rootElement };
 
-  return App.visit(url, options).then(function(instance) {
+  return App.visit(url, options).then(function (instance) {
     try {
       return {
         url: instance.getURL(),
@@ -33,17 +33,17 @@ function fastbootVisit(App, url) {
 }
 
 function assertFastbootResult(assert, expected) {
-  return function(actual) {
+  return function (actual) {
     assert.equal(actual.url, expected.url);
     assertHTMLMatches(assert, actual.body, expected.body);
   };
 }
 
-QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
+QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
   setupAppTest(hooks);
 
-  QUnit.test('FastBoot: basic', function(assert) {
-    this.routes(function() {
+  QUnit.test('FastBoot: basic', function (assert) {
+    this.routes(function () {
       this.route('a');
       this.route('b');
     });
@@ -58,11 +58,11 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
 
     this.component('x-foo', {
       tagName: 'span',
-      init: function() {
+      init: function () {
         this._super();
         initCalled = true;
       },
-      didInsertElement: function() {
+      didInsertElement: function () {
         didInsertElementCalled = true;
       },
     });
@@ -85,14 +85,14 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
         }),
         handleError
       ),
-    ]).then(function() {
+    ]).then(function () {
       assert.ok(initCalled, 'Component#init should be called');
       assert.ok(!didInsertElementCalled, 'Component#didInsertElement should not be called');
     });
   });
 
-  QUnit.test('FastBoot: redirect', function(assert) {
-    this.routes(function() {
+  QUnit.test('FastBoot: redirect', function (assert) {
+    this.routes(function () {
       this.route('a');
       this.route('b');
       this.route('c');
@@ -103,13 +103,13 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     this.template('c', '<h1>Hello from C</h1>');
 
     this.route('a', {
-      beforeModel: function() {
+      beforeModel: function () {
         this.replaceWith('b');
       },
     });
 
     this.route('b', {
-      afterModel: function() {
+      afterModel: function () {
         this.transitionTo('c');
       },
     });
@@ -134,7 +134,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     ]);
   });
 
-  QUnit.test('FastBoot: attributes are sanitized', function(assert) {
+  QUnit.test('FastBoot: attributes are sanitized', function (assert) {
     this.template('application', '<a href={{test}}></a>');
 
     this.controller('application', {
@@ -154,8 +154,8 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     ]);
   });
 
-  QUnit.test('FastBoot: route error', function(assert) {
-    this.routes(function() {
+  QUnit.test('FastBoot: route error', function (assert) {
+    this.routes(function () {
       this.route('a');
       this.route('b');
     });
@@ -164,13 +164,13 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     this.template('b', '<h1>Hello from B</h1>');
 
     this.route('a', {
-      beforeModel: function() {
+      beforeModel: function () {
         throw new Error('Error from A');
       },
     });
 
     this.route('b', {
-      afterModel: function() {
+      afterModel: function () {
         throw new Error('Error from B');
       },
     });
@@ -179,28 +179,28 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
 
     return Promise.all([
       fastbootVisit(App, '/a').then(
-        function(instance) {
+        function (instance) {
           assert.ok(false, 'It should not render');
           instance.destroy();
         },
-        function(error) {
+        function (error) {
           assert.equal(error.message, 'Error from A');
         }
       ),
       fastbootVisit(App, '/b').then(
-        function(instance) {
+        function (instance) {
           assert.ok(false, 'It should not render');
           instance.destroy();
         },
-        function(error) {
+        function (error) {
           assert.equal(error.message, 'Error from B');
         }
       ),
     ]);
   });
 
-  QUnit.test('FastBoot: route error template', function(assert) {
-    this.routes(function() {
+  QUnit.test('FastBoot: route error template', function (assert) {
+    this.routes(function () {
       this.route('a');
     });
 
@@ -208,7 +208,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     this.template('a', '<h1>Hello from A</h1>');
 
     this.route('a', {
-      model: function() {
+      model: function () {
         throw new Error('Error from A');
       },
     });
@@ -226,19 +226,19 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     ]);
   });
 
-  QUnit.test('Resource-discovery setup', function(assert) {
+  QUnit.test('Resource-discovery setup', function (assert) {
     this.service('network', {
-      init: function() {
+      init: function () {
         this.set('requests', []);
       },
 
-      fetch: function(url) {
+      fetch: function (url) {
         this.get('requests').push(url);
         return Promise.resolve();
       },
     });
 
-    this.routes(function() {
+    this.routes(function () {
       this.route('a');
       this.route('b');
       this.route('c');
@@ -247,40 +247,40 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     });
 
     this.route('a', {
-      model: function() {
+      model: function () {
         return this.network.fetch('/a');
       },
-      afterModel: function() {
+      afterModel: function () {
         this.replaceWith('b');
       },
     });
 
     this.route('b', {
-      model: function() {
+      model: function () {
         return this.network.fetch('/b');
       },
-      afterModel: function() {
+      afterModel: function () {
         this.replaceWith('c');
       },
     });
 
     this.route('c', {
-      model: function() {
+      model: function () {
         return this.network.fetch('/c');
       },
     });
 
     this.route('d', {
-      model: function() {
+      model: function () {
         return this.network.fetch('/d');
       },
-      afterModel: function() {
+      afterModel: function () {
         this.replaceWith('e');
       },
     });
 
     this.route('e', {
-      model: function() {
+      model: function () {
         return this.network.fetch('/e');
       },
     });
@@ -294,7 +294,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     let xFooInstances = 0;
 
     this.component('x-foo', {
-      init: function() {
+      init: function () {
         this._super();
         xFooInstances++;
       },
@@ -305,7 +305,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
     App.inject('route', 'network', 'service:network');
 
     function assertResources(url, resources) {
-      return App.visit(url, { isBrowser: false, shouldRender: false }).then(function(instance) {
+      return App.visit(url, { isBrowser: false, shouldRender: false }).then(function (instance) {
         try {
           let viewRegistry = instance.lookup('-view-registry:main');
           assert.strictEqual(Object.keys(viewRegistry).length, 0, 'did not create any views');
@@ -324,12 +324,12 @@ QUnit.module('Ember.Application - visit() Integration Tests', function(hooks) {
       assertResources('/c', ['/c']),
       assertResources('/d', ['/d', '/e']),
       assertResources('/e', ['/e']),
-    ]).then(function() {
+    ]).then(function () {
       assert.strictEqual(xFooInstances, 0, 'it should not create any x-foo components');
     });
   });
 
-  QUnit.test('FastBoot: tagless components can render', function(assert) {
+  QUnit.test('FastBoot: tagless components can render', function (assert) {
     this.template('application', "<div class='my-context'>{{my-component}}</div>");
     this.component('my-component', { tagName: '' });
     this.template('components/my-component', '<h1>hello world</h1>');

From 9fcbf5327c9116c446c9cc7b519066acc7cddb74 Mon Sep 17 00:00:00 2001
From: Jonathan Haines <jonno.haines@gmail.com>
Date: Sat, 26 Sep 2020 15:18:04 +1000
Subject: [PATCH 0132/1405] Upgrade to eslint 7

* Upgrade eslint and typescript-eslint packages to latest versions
* Add `@typescript-eslint/eslint-recommended` (and remove rules that are
  no longer required).
---
 .eslintrc.js |  95 +++++-----
 package.json |   7 +-
 yarn.lock    | 488 +++++++++++++++++++++++++++++----------------------
 3 files changed, 325 insertions(+), 265 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index d2d4f05ccc6..2996ea36066 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,12 +9,7 @@ module.exports = {
     'plugin:qunit/recommended',
     'plugin:prettier/recommended',
   ],
-  plugins: [
-    'ember-internal',
-    'import',
-    'qunit',
-    'disable-features',
-  ],
+  plugins: ['ember-internal', 'import', 'qunit', 'disable-features'],
   rules: {
     'no-implicit-coercion': 'error',
     'no-new-wrappers': 'error',
@@ -28,33 +23,27 @@ module.exports = {
   },
 
   settings: {
-    'import/core-modules': [
-      'require',
-      'backburner',
-      'router',
-      'ember/version',
-      'node-module',
-    ],
+    'import/core-modules': ['require', 'backburner', 'router', 'ember/version', 'node-module'],
     'import/parsers': {
       '@typescript-eslint/parser': ['.ts'],
     },
     'import/resolver': {
       node: {
-        extensions: [ '.js', '.ts' ],
-        paths: [
-          path.resolve('./packages/'),
-        ]
-      }
-    }
+        extensions: ['.js', '.ts'],
+        paths: [path.resolve('./packages/')],
+      },
+    },
   },
 
   overrides: [
     {
-      files: [ '**/*.ts' ],
+      files: ['**/*.ts'],
 
       parser: '@typescript-eslint/parser',
       extends: [
-        'prettier/@typescript-eslint'
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:import/typescript',
+        'prettier/@typescript-eslint',
       ],
 
       parserOptions: {
@@ -66,20 +55,23 @@ module.exports = {
       rules: {
         // the TypeScript compiler already takes care of this and
         // leaving it enabled results in false positives for interface imports
-        'no-dupe-class-members': 'off',
         'no-unused-vars': 'off',
-        'no-undef': 'off',
-        'no-redeclare': 'off',
+
+        // TODO: Enable and fix these rules
+        // Typescript provides better types with these rules enabled
+        'prefer-spread': 'off',
+        'prefer-const': 'off',
+        'prefer-rest-params': 'off',
 
         'import/export': 'off',
         // TODO: Remove with typescript 3.8
         // Use `import type` instead
         'import/named': 'off',
         'import/no-unresolved': 'off',
-      }
+      },
     },
     {
-      files: [ 'packages/**/*.js' ],
+      files: ['packages/**/*.js'],
 
       parserOptions: {
         ecmaVersion: 2017,
@@ -88,17 +80,17 @@ module.exports = {
 
       globals: {
         // A safe subset of 'browser:true':
-        'window': true,
-        'document': true,
-        'setTimeout': true,
-        'clearTimeout': true,
-        'setInterval': true,
-        'clearInterval': true,
-        'console': true,
-        'Map': true,
-        'Set': true,
-        'Symbol': true,
-        'WeakMap': true,
+        window: true,
+        document: true,
+        setTimeout: true,
+        clearTimeout: true,
+        setInterval: true,
+        clearInterval: true,
+        console: true,
+        Map: true,
+        Set: true,
+        Symbol: true,
+        WeakMap: true,
       },
 
       rules: {
@@ -117,19 +109,19 @@ module.exports = {
         qunit: true,
       },
       globals: {
-        'expectAssertion': true,
-        'expectDeprecation': true,
-        'expectDeprecationAsync': true,
-        'expectNoDeprecation': true,
-        'expectWarning': true,
-        'expectNoWarning': true,
-        'ignoreAssertion': true,
-        'ignoreDeprecation': true,
+        expectAssertion: true,
+        expectDeprecation: true,
+        expectDeprecationAsync: true,
+        expectNoDeprecation: true,
+        expectWarning: true,
+        expectNoWarning: true,
+        ignoreAssertion: true,
+        ignoreDeprecation: true,
       },
       rules: {
         'disable-features/disable-async-await': 'off',
         'disable-features/disable-generator-functions': 'off',
-      }
+      },
     },
     {
       // matches all node-land files
@@ -172,21 +164,18 @@ module.exports = {
       }),
     },
     {
-      files: [ 'node-tests/**/*.js' ],
+      files: ['node-tests/**/*.js'],
 
       env: {
         mocha: true,
       },
     },
     {
-      files: [
-        'tests/docs/**/*.js',
-        'tests/node/**/*.js',
-      ],
+      files: ['tests/docs/**/*.js', 'tests/node/**/*.js'],
 
       env: {
-        qunit: true
+        qunit: true,
       },
     },
-  ]
+  ],
 };
diff --git a/package.json b/package.json
index e7ecf58d58d..97a66d7b0c5 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "start": "ember serve",
     "lint": "yarn lint:tsc && yarn lint:tslint && yarn lint:eslint && yarn lint:docs",
     "lint:docs": "qunit tests/docs/coverage-test.js",
-    "lint:eslint": "eslint . --cache --ext=js,ts",
+    "lint:eslint": "eslint . --cache",
     "lint:tsc": "tsc --noEmit",
     "lint:tslint": "tslint -p tsconfig.json",
     "lint:fix": "yarn lint:eslint --fix && yarn lint:tslint --fix",
@@ -87,6 +87,7 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
+    "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.686.0",
@@ -112,12 +113,12 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^6.8.0",
+    "eslint": "^7.9.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^1.1.1",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-qunit": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 11f4d9e5102..c495ea4a198 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -913,6 +913,22 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
+"@eslint/eslintrc@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
+  integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    lodash "^4.17.19"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
 "@glimmer/compiler@0.62.1":
   version "0.62.1"
   resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.62.1.tgz#4b80f1cd55d39858e602080de03db6febf5b9303"
@@ -1160,6 +1176,16 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/json-schema@^7.0.3":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+
+"@types/json5@^0.0.29":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -1212,6 +1238,31 @@
   dependencies:
     "@types/node" "*"
 
+"@typescript-eslint/eslint-plugin@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa"
+  integrity sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "4.3.0"
+    "@typescript-eslint/scope-manager" "4.3.0"
+    debug "^4.1.1"
+    functional-red-black-tree "^1.0.1"
+    regexpp "^3.0.0"
+    semver "^7.3.2"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/experimental-utils@4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87"
+  integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/scope-manager" "4.3.0"
+    "@typescript-eslint/types" "4.3.0"
+    "@typescript-eslint/typescript-estree" "4.3.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^2.0.0"
+
 "@typescript-eslint/parser@^4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3"
@@ -1287,7 +1338,7 @@ acorn@^5.0.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^7.1.1:
+acorn@^7.4.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
   integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
@@ -1319,6 +1370,16 @@ ajv@^6.10.0, ajv@^6.9.1:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.4:
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -1337,18 +1398,16 @@ ansi-colors@3.2.3:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
   integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
 
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
-ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
-  dependencies:
-    type-fest "^0.11.0"
-
 ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -1470,13 +1529,14 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-includes@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
-  integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
+array-includes@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
+  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
   dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.7.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.17.0"
+    is-string "^1.0.5"
 
 array-to-error@^1.0.0:
   version "1.1.1"
@@ -1500,7 +1560,7 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.1:
+array.prototype.flat@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
   integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
@@ -2741,14 +2801,6 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -2836,13 +2888,6 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
-  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
-  dependencies:
-    restore-cursor "^3.1.0"
-
 cli-spinners@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.1.0.tgz#22c34b4d51f573240885b201efda4e4ec9fff3c7"
@@ -2860,11 +2905,6 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
-cli-width@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
-  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
-
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -3134,6 +3174,15 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 cryptiles@0.2.x:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
@@ -3249,7 +3298,7 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -3697,11 +3746,6 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
-emoji-regex@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
-  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
-
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -3761,6 +3805,13 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
@@ -3786,17 +3837,22 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0, es-abstract@^1.9.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+es-abstract@^1.17.0:
+  version "1.17.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
+  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
   dependencies:
-    es-to-primitive "^1.2.0"
+    es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
     has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
+    has-symbols "^1.0.1"
+    is-callable "^1.2.0"
+    is-regex "^1.1.0"
+    object-inspect "^1.7.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.0"
+    string.prototype.trimend "^1.0.1"
+    string.prototype.trimstart "^1.0.1"
 
 es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
   version "1.17.5"
@@ -3815,6 +3871,18 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
     string.prototype.trimleft "^2.1.1"
     string.prototype.trimright "^2.1.1"
 
+es-abstract@^1.5.1, es-abstract@^1.9.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
 es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
@@ -3910,7 +3978,7 @@ eslint-config-prettier@^6.11.0:
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.3:
+eslint-import-resolver-node@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
   integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
@@ -3918,7 +3986,7 @@ eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.3:
     debug "^2.6.9"
     resolve "^1.13.1"
 
-eslint-module-utils@^2.4.1:
+eslint-module-utils@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
   integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
@@ -3949,23 +4017,24 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.20.2:
-  version "2.20.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
-  integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
+eslint-plugin-import@^2.22.0:
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e"
+  integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==
   dependencies:
-    array-includes "^3.0.3"
-    array.prototype.flat "^1.2.1"
+    array-includes "^3.1.1"
+    array.prototype.flat "^1.2.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.1"
+    eslint-import-resolver-node "^0.3.3"
+    eslint-module-utils "^2.6.0"
     has "^1.0.3"
     minimatch "^3.0.4"
-    object.values "^1.1.0"
+    object.values "^1.1.1"
     read-pkg-up "^2.0.0"
-    resolve "^1.12.0"
+    resolve "^1.17.0"
+    tsconfig-paths "^3.9.0"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -3991,7 +4060,7 @@ eslint-plugin-qunit@^4.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-4.0.0.tgz#5945ba3434bfe8879bea195192e906701051cf01"
   integrity sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ==
 
-eslint-scope@^5.0.0:
+eslint-scope@^5.0.0, eslint-scope@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -3999,13 +4068,6 @@ eslint-scope@^5.0.0:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
 eslint-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
@@ -4013,32 +4075,46 @@ eslint-utils@^2.0.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
+eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
 eslint-visitor-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+eslint@^7.9.0:
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
+  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
+    "@eslint/eslintrc" "^0.1.3"
     ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.0"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^1.3.0"
+    espree "^7.3.0"
+    esquery "^1.2.0"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
@@ -4047,21 +4123,19 @@ eslint@^6.8.0:
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
     is-glob "^4.0.0"
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
+    levn "^0.4.1"
+    lodash "^4.17.19"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.3"
+    optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
     table "^5.2.3"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
@@ -4071,14 +4145,14 @@ esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
   integrity sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA==
 
-espree@^6.1.2:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
-  integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
+espree@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
+  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
   dependencies:
-    acorn "^7.1.1"
+    acorn "^7.4.0"
     acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.1.0"
+    eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
@@ -4090,7 +4164,7 @@ esprima@~3.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
   integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
 
-esquery@^1.0.1:
+esquery@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
   integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
@@ -4340,7 +4414,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -4415,13 +4489,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-figures@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
-  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -5310,6 +5377,14 @@ import-fresh@^3.0.0:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-fresh@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -5383,25 +5458,6 @@ inquirer@^6:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
-inquirer@^7.0.0:
-  version "7.3.3"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
-  integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
-    cli-cursor "^3.1.0"
-    cli-width "^3.0.0"
-    external-editor "^3.0.3"
-    figures "^3.0.0"
-    lodash "^4.17.19"
-    mute-stream "0.0.8"
-    run-async "^2.4.0"
-    rxjs "^6.6.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-    through "^2.3.6"
-
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -5485,6 +5541,11 @@ is-callable@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-callable@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
+  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -5551,11 +5612,6 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-fullwidth-code-point@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
-  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
-
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
@@ -5652,6 +5708,13 @@ is-regex@^1.0.5:
   dependencies:
     has "^1.0.3"
 
+is-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
+  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  dependencies:
+    has-symbols "^1.0.1"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -5677,6 +5740,11 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
 
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
@@ -5837,6 +5905,13 @@ json5@^0.5.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
 
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
 json5@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
@@ -5938,13 +6013,13 @@ levenary@^1.1.1:
   dependencies:
     leven "^3.1.0"
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
 
 line-column@^1.0.2:
   version "1.0.2"
@@ -6393,7 +6468,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -6832,11 +6907,6 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-mute-stream@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
-  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
-
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -7078,13 +7148,13 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
-  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
+object.values@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
+  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
   dependencies:
     define-properties "^1.1.3"
-    es-abstract "^1.12.0"
+    es-abstract "^1.17.0-next.1"
     function-bind "^1.1.1"
     has "^1.0.3"
 
@@ -7129,17 +7199,17 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.3:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
   dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
 
 ora@^3.4.0:
   version "3.4.0"
@@ -7325,6 +7395,11 @@ path-key@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
 
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -7462,10 +7537,10 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prepend-http@^2.0.0:
   version "2.0.0"
@@ -7834,16 +7909,16 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
 regexpp@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
   integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
 
+regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
 regexpu-core@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
@@ -8024,14 +8099,6 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-restore-cursor@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
-  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
-  dependencies:
-    onetime "^5.1.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -8154,11 +8221,6 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
-run-async@^2.4.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
-  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
-
 run-parallel@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -8171,13 +8233,6 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.6.0:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -8240,12 +8295,12 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2:
+semver@^7.2.1, semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -8328,11 +8383,23 @@ shebang-command@^1.2.0:
   dependencies:
     shebang-regex "^1.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
   integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
 
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 shellwords@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -8658,16 +8725,7 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
-
-string.prototype.trimend@^1.0.0:
+string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
   integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
@@ -8693,7 +8751,7 @@ string.prototype.trimright@^2.1.1:
     es-abstract "^1.17.5"
     string.prototype.trimend "^1.0.0"
 
-string.prototype.trimstart@^1.0.0:
+string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
   integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
@@ -8793,7 +8851,7 @@ strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-strip-json-comments@^3.0.1:
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -9155,6 +9213,16 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
 
+tsconfig-paths@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
+  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.1"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
@@ -9198,12 +9266,12 @@ tunnel-agent@~0.4.0:
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
   integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
-    prelude-ls "~1.1.2"
+    prelude-ls "^1.2.1"
 
 type-detect@0.1.1:
   version "0.1.1"
@@ -9220,11 +9288,6 @@ type-detect@^4.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
   integrity sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ==
 
-type-fest@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
-  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
-
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
@@ -9568,6 +9631,13 @@ which@1.3.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@1.1.3, wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
@@ -9575,7 +9645,7 @@ wide-align@1.1.3, wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
-word-wrap@~1.2.3:
+word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==

From 0145e9bf9f6e6fa0497c00cc96af14f6cc4c4185 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 30 Sep 2020 09:38:26 -0400
Subject: [PATCH 0133/1405] Manually fixup linting.

* Fix a bunch of tests that failed the no-dupe-class-members rule
* Remove a couple duplicated tests
* Add an `eslint-disable-next-line` for `no-setter-return` when
  **explicitly** testing `@computed` setters with a return statement
---
 .../syntax/with-dynamic-var-test.js            |  2 +-
 .../glimmer/tests/utils/string-test.js         |  2 +-
 .../metal/tests/accessors/set_path_test.js     |  4 ++--
 .../metal/tests/computed_decorator_test.js     |  1 +
 .../mixin/concatenated_properties_test.js      |  6 +++---
 .../-internals/metal/tests/tracked/get_test.js |  2 +-
 .../tests/system/object/observer_test.js       |  2 +-
 .../tests/system/object/toString_test.js       |  2 +-
 .../tests/application_instance_test.js         | 18 ------------------
 .../@ember/application/tests/readiness_test.js |  4 +++-
 .../tests/computed/macro_decorators_test.js    | 10 ----------
 11 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-dynamic-var-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-dynamic-var-test.js
index bfc274b90d7..7c61bc39e9f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-dynamic-var-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-dynamic-var-test.js
@@ -26,7 +26,7 @@ moduleFor(
       this.assertText('bar');
     }
 
-    ['@test does not allow setting values other than outletState']() {
+    ['@test does not allow getting values other than outletState']() {
       expectAssertion(() => {
         this.render(`{{-get-dynamic-var 'foo'}}`);
       }, /Using `-get-dynamic-scope` is only supported for `outletState` \(you used `foo`\)./);
diff --git a/packages/@ember/-internals/glimmer/tests/utils/string-test.js b/packages/@ember/-internals/glimmer/tests/utils/string-test.js
index 46430fd0743..139c6c3846d 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/string-test.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/string-test.js
@@ -18,7 +18,7 @@ moduleFor(
       this.assert.equal(safeString.toString(), '', 'should return an empty string');
     }
 
-    ['@test htmlSafe should return an instance of SafeString']() {
+    ['@test htmlSafe should return an instance of SafeString for an empty string']() {
       let safeString = htmlSafe();
 
       this.assert.equal(safeString instanceof SafeString, true, 'should be a SafeString');
diff --git a/packages/@ember/-internals/metal/tests/accessors/set_path_test.js b/packages/@ember/-internals/metal/tests/accessors/set_path_test.js
index bf1715ff3f2..26df3c77258 100644
--- a/packages/@ember/-internals/metal/tests/accessors/set_path_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/set_path_test.js
@@ -85,11 +85,11 @@ moduleFor(
       }
     }
 
-    ['@test [obj, foo.baz.bat] -> EXCEPTION'](assert) {
+    ['@test set(xobj, foo.baz.bat, ...) -> EXCEPTION'](assert) {
       assert.throws(() => set(obj, 'foo.baz.bat', 'BAM'));
     }
 
-    ['@test [obj, foo.baz.bat] -> EXCEPTION'](assert) {
+    ['@test trySet(obj, foo.baz.bat, ...)'](assert) {
       trySet(obj, 'foo.baz.bat', 'BAM');
       assert.ok(true, 'does not raise');
     }
diff --git a/packages/@ember/-internals/metal/tests/computed_decorator_test.js b/packages/@ember/-internals/metal/tests/computed_decorator_test.js
index a26c3759fc3..341c02bec9f 100644
--- a/packages/@ember/-internals/metal/tests/computed_decorator_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_decorator_test.js
@@ -301,6 +301,7 @@ moduleFor(
         }
         set foo(value) {
           this.__foo = `computed ${value}`;
+          // eslint-disable-next-line no-setter-return
           return this.__foo;
         }
       }
diff --git a/packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js b/packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js
index 177efe0b1aa..43de4d2b826 100644
--- a/packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js
@@ -18,7 +18,7 @@ moduleFor(
       assert.deepEqual(get(obj, 'foo'), ['a', 'b', 'c', 'd', 'e', 'f']);
     }
 
-    ['@test defining concatenated properties should concat future version'](assert) {
+    ['@test ensure we do not needlessly scan concatenatedProperties array'](assert) {
       let MixinA = Mixin.create({
         concatenatedProperties: null,
       });
@@ -58,7 +58,7 @@ moduleFor(
       assert.deepEqual(get(obj, 'bar'), [1, 2, 3, 4, 5, 6], 'get bar');
     }
 
-    ['@test adding a prop that is not an array should make array'](assert) {
+    ['@test adding a prop that is a number should make array'](assert) {
       let MixinA = Mixin.create({
         concatenatedProperties: ['foo'],
         foo: [1, 2, 3],
@@ -72,7 +72,7 @@ moduleFor(
       assert.deepEqual(get(obj, 'foo'), [1, 2, 3, 4]);
     }
 
-    ['@test adding a prop that is not an array should make array'](assert) {
+    ['@test adding a prop that is a string should make array'](assert) {
       let MixinA = Mixin.create({
         concatenatedProperties: ['foo'],
         foo: 'bar',
diff --git a/packages/@ember/-internals/metal/tests/tracked/get_test.js b/packages/@ember/-internals/metal/tests/tracked/get_test.js
index b05a6c1032c..7263666fb0e 100644
--- a/packages/@ember/-internals/metal/tests/tracked/get_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/get_test.js
@@ -43,7 +43,7 @@ moduleFor(
       this.assert.equal(get(obj, 'path.key.value'), 'value for some-key');
     }
 
-    ['@test should get arbitrary properties on an object']() {
+    ['@test should get arbitrary properties on an object (getWithDefault DEPRECATED)']() {
       expectDeprecation(() => {
         let obj = createObj();
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/observer_test.js b/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
index 0f1a38a6fac..7ae12caea89 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
@@ -196,7 +196,7 @@ moduleFor(
       obj2.destroy();
     }
 
-    async ['@test chain observer on class'](assert) {
+    async ['@test clobbering a chain observer on subclass'](assert) {
       let MyClass = EmberObject.extend({
         count: 0,
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js b/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
index b150ee8eb7e..1e612de956e 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
@@ -74,7 +74,7 @@ moduleFor(
       run(Foo, 'destroy');
     }
 
-    ['@test toString on a namespace finds the namespace in lookup'](assert) {
+    ['@test toString on a nested namespace finds the namespace in lookup'](assert) {
       let Foo = (lookup.Foo = Namespace.create());
       let obj;
 
diff --git a/packages/@ember/application/tests/application_instance_test.js b/packages/@ember/application/tests/application_instance_test.js
index 07ddb7bee96..a8a8adc9ce5 100644
--- a/packages/@ember/application/tests/application_instance_test.js
+++ b/packages/@ember/application/tests/application_instance_test.js
@@ -76,24 +76,6 @@ moduleFor(
       appInstance.setupEventDispatcher();
     }
 
-    ['@test customEvents added to the application before setupEventDispatcher'](assert) {
-      assert.expect(1);
-
-      appInstance = run(() => ApplicationInstance.create({ application }));
-      appInstance.setupRegistry();
-
-      application.customEvents = {
-        awesome: 'sauce',
-      };
-
-      let eventDispatcher = appInstance.lookup('event_dispatcher:main');
-      eventDispatcher.setup = function (events) {
-        assert.equal(events.awesome, 'sauce');
-      };
-
-      appInstance.setupEventDispatcher();
-    }
-
     ['@test customEvents added to the application instance before setupEventDispatcher'](assert) {
       assert.expect(1);
 
diff --git a/packages/@ember/application/tests/readiness_test.js b/packages/@ember/application/tests/readiness_test.js
index a161246235a..97a1406346e 100644
--- a/packages/@ember/application/tests/readiness_test.js
+++ b/packages/@ember/application/tests/readiness_test.js
@@ -112,7 +112,9 @@ moduleFor(
       assert.equal(readyWasCalled, 1, 'ready was called now all readiness deferrals are advanced');
     }
 
-    ["@test Application's ready event can be deferred by other components"](assert) {
+    ["@test Application's ready event can be deferred by other components (jQuery.isReady === false)"](
+      assert
+    ) {
       jQuery.isReady = false;
 
       run(() => {
diff --git a/packages/@ember/object/tests/computed/macro_decorators_test.js b/packages/@ember/object/tests/computed/macro_decorators_test.js
index 1b1e5257b3b..18ac7329a23 100644
--- a/packages/@ember/object/tests/computed/macro_decorators_test.js
+++ b/packages/@ember/object/tests/computed/macro_decorators_test.js
@@ -334,15 +334,5 @@ moduleFor(
         new Foo();
       }, /You attempted to use @uniqBy/);
     }
-
-    ['@test alias throws an error if used without parameters']() {
-      expectAssertion(() => {
-        class Foo {
-          @alias foo;
-        }
-
-        new Foo();
-      }, /You attempted to use @alias/);
-    }
   }
 );

From 1248d18cd9591b62eb228cbdf21bb38420eb6fef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Sep 2020 14:12:35 +0000
Subject: [PATCH 0134/1405] Bump bl from 4.0.2 to 4.0.3

Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 54 +++++++++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c495ea4a198..657b48d4fbc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1861,9 +1861,9 @@ base64-arraybuffer@0.1.5:
   integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
 
 base64-js@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
-  integrity sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
+  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
 base64id@1.0.0:
   version "1.0.0"
@@ -1908,9 +1908,9 @@ binary-extensions@^2.0.0:
   integrity sha1-5ZfRp6ajVYotHHJBoWyZll5qpA8=
 
 bl@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
-  integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"
@@ -5413,16 +5413,16 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
-
-inherits@^2.0.4:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+inherits@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
@@ -7798,10 +7798,10 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@2 || 3":
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
-  integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
+"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -7820,15 +7820,6 @@ readable-stream@^2.0.0, readable-stream@^2.0.6:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1, readable-stream@^3.4.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -8243,6 +8234,11 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, s
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
@@ -8765,11 +8761,11 @@ string_decoder@0.10, string_decoder@~0.10.x:
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
 string_decoder@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
-  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
-    safe-buffer "~5.1.0"
+    safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"

From 57a204444d044e7e25e23b3a468d97bb33f4651c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 28 Sep 2020 15:47:36 -0700
Subject: [PATCH 0135/1405] [BUGFIX lts] Fix tag cycles in query parameters

Currently, we wrap query parameters with @dependentKeyCompat manually
to ensure they work with the legacy router setup, which watches QPs
using observers. When a QP value is labeled as @tracked, we don't need
to replace it with @dependentKeyCompat, but since it's just a plain
native getter (from the decorator) we do anyways. This results in a tag
cycle being created, which can result in a negative performance impact,
as every render pass will be invalidated by the cycle and require a
subsequent full revalidation.

This bug would have been caught by our ALLOW_CYCLES logic, but that
logic was faulty - it was allowing too many cycles, anything that was
accessed via get. It should only have allowed cycles from computeds
themselves.

This PR fixes the bug with ALLOW_CYCLES, and the subsequent bug with
@tracked by only wrapping with @dependentKeyCompat if the value is
not @tracked. It also adds an assertion to prevent users from using
@dependentKeyCompat with @computed or @tracked.

Verified that the test failed after fixing ALLOW_CYCLES, and passed
again after the fix.
---
 packages/@ember/-internals/metal/lib/alias.ts |  3 +-
 .../@ember/-internals/metal/lib/chain-tags.ts | 13 ++----
 .../@ember/-internals/metal/lib/computed.ts   |  6 +++
 .../@ember/-internals/metal/lib/tracked.ts    | 46 ++++++++++++-------
 packages/@ember/object/compat.ts              |  8 +++-
 .../ember/tests/routing/query_params_test.js  | 40 ++++++++++++++++
 6 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index 6b1fe8ae701..e7b62f189b1 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -12,7 +12,7 @@ import {
   validateTag,
   valueForTag,
 } from '@glimmer/validator';
-import { finishLazyChains, getChainTagsForKey } from './chain-tags';
+import { CHAIN_PASS_THROUGH, finishLazyChains, getChainTagsForKey } from './chain-tags';
 import {
   ComputedDescriptor,
   Decorator,
@@ -70,6 +70,7 @@ export class AliasedProperty extends ComputedDescriptor {
   setup(obj: object, keyName: string, propertyDesc: PropertyDescriptor, meta: Meta): void {
     assert(`Setting alias '${keyName}' on self`, this.altKey !== keyName);
     super.setup(obj, keyName, propertyDesc, meta);
+    CHAIN_PASS_THROUGH.add(this);
   }
 
   get(obj: object, keyName: string): any {
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 17c6c91c0e2..28e12577a44 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,9 +1,8 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
+import { _WeakSet } from '@glimmer/util';
 import {
-  ALLOW_CYCLES,
   combine,
   createUpdatableTag,
   Tag,
@@ -15,6 +14,8 @@ import {
 import { objectAt } from './array';
 import { tagForProperty } from './tags';
 
+export const CHAIN_PASS_THROUGH = new _WeakSet();
+
 export function finishLazyChains(meta: Meta, key: string, value: any) {
   let lazyTags = meta.readableLazyChainsFor(key);
 
@@ -166,7 +167,7 @@ function getChainTags(
       // If the key was an alias, we should always get the next value in order to
       // bootstrap the alias. This is because aliases, unlike other CPs, should
       // always be in sync with the aliased value.
-      if (descriptor !== undefined && typeof descriptor.altKey === 'string') {
+      if (CHAIN_PASS_THROUGH.has(descriptor)) {
         // tslint:disable-next-line: no-unused-expression
         current[segment];
       }
@@ -182,7 +183,7 @@ function getChainTags(
       } else {
         current = current[segment];
       }
-    } else if (typeof descriptor.altKey === 'string') {
+    } else if (CHAIN_PASS_THROUGH.has(descriptor)) {
       current = current[segment];
     } else {
       // If the descriptor is defined, then its a normal CP (not an alias, which
@@ -218,9 +219,5 @@ function getChainTags(
     currentMeta = peekMeta(current);
   }
 
-  if (DEBUG) {
-    chainTags.forEach((t) => ALLOW_CYCLES!.set(t, true));
-  }
-
   return chainTags;
 }
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 94088e597e7..f5850f23474 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -2,8 +2,10 @@ import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect, toString } from '@ember/-internals/utils';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberError from '@ember/error';
+import { DEBUG } from '@glimmer/env';
 import { isDestroyed } from '@glimmer/runtime';
 import {
+  ALLOW_CYCLES,
   consumeTag,
   tagFor,
   tagMetaFor,
@@ -321,6 +323,10 @@ export class ComputedProperty extends ComputedDescriptor {
       )
     );
 
+    if (DEBUG) {
+      ALLOW_CYCLES!.set(tagFor(obj, keyName), true);
+    }
+
     if (this._hasConfig === false) {
       assert(
         `Attempted to use @computed on ${keyName}, but it did not have a getter or a setter. You must either pass a get a function or getter/setter to @computed directly (e.g. \`@computed({ get() { ... } })\`) or apply @computed directly to a getter/setter`,
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index ef7eb1455aa..614297cbbeb 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -1,8 +1,11 @@
+import { meta as metaFor } from '@ember/-internals/meta';
 import { isEmberArray } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
+import { CHAIN_PASS_THROUGH } from './chain-tags';
 import {
+  CP_SETTER_FUNCS,
   Decorator,
   DecoratorPropertyDescriptor,
   isElementDescriptor,
@@ -142,7 +145,7 @@ if (DEBUG) {
   setClassicDecorator(tracked);
 }
 
-function descriptorForField([_target, key, desc]: [
+function descriptorForField([target, key, desc]: [
   object,
   string,
   DecoratorPropertyDescriptor
@@ -154,25 +157,36 @@ function descriptorForField([_target, key, desc]: [
 
   let { getter, setter } = trackedData<any, any>(key, desc ? desc.initializer : undefined);
 
-  return {
+  function get(this: object): unknown {
+    let value = getter(this);
+
+    // Add the tag of the returned value if it is an array, since arrays
+    // should always cause updates if they are consumed and then changed
+    if (Array.isArray(value) || isEmberArray(value)) {
+      consumeTag(tagFor(value, '[]'));
+    }
+
+    return value;
+  }
+
+  function set(this: object, newValue: unknown): void {
+    setter(this, newValue);
+    dirtyTagFor(this, SELF_TAG);
+  }
+
+  let newDesc = {
     enumerable: true,
     configurable: true,
+    isTracked: true,
 
-    get(): any {
-      let value = getter(this);
+    get,
+    set,
+  };
 
-      // Add the tag of the returned value if it is an array, since arrays
-      // should always cause updates if they are consumed and then changed
-      if (Array.isArray(value) || isEmberArray(value)) {
-        consumeTag(tagFor(value, '[]'));
-      }
+  metaFor(target).writeDescriptors(key, newDesc);
 
-      return value;
-    },
+  CP_SETTER_FUNCS.add(set);
+  CHAIN_PASS_THROUGH.add(newDesc);
 
-    set(newValue: any): void {
-      setter(this, newValue);
-      dirtyTagFor(this, SELF_TAG);
-    },
-  };
+  return newDesc;
 }
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 53bfafc5039..dc429f3135e 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -2,15 +2,21 @@ import { Meta } from '@ember/-internals/meta';
 import {
   Decorator,
   DecoratorPropertyDescriptor,
+  descriptorForProperty,
   isElementDescriptor,
   setClassicDecorator,
 } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 import { consumeTag, tagFor, track, UpdatableTag, updateTag } from '@glimmer/validator';
 
-let wrapGetterSetter = function (_target: object, key: string, desc: PropertyDescriptor) {
+let wrapGetterSetter = function (target: object, key: string, desc: PropertyDescriptor) {
   let { get: originalGet } = desc;
 
+  assert(
+    'You attempted to use @dependentKeyCompat on a property that already has been decorated with either @computed or @tracked. @dependentKeyCompat is only necessary for native getters that are not decorated with @computed.',
+    descriptorForProperty(target, key) === undefined
+  );
+
   if (originalGet !== undefined) {
     desc.get = function () {
       let propertyTag = tagFor(this, key) as UpdatableTag;
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 15cf6f7a97f..b73a3ea4a72 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1611,6 +1611,46 @@ moduleFor(
       this.assertCurrentPath('/?foo=987');
     }
 
+    async ['@test Single query params defined with tracked properties can be linked to (and log is present)'](
+      assert
+    ) {
+      assert.expect(3);
+
+      this.addTemplate(
+        'application',
+        `
+          <LinkTo @route="application" id="the-link">
+            Home
+          </LinkTo>
+          <LinkTo @route="application" @query={{hash foo=(array 123)}} id="the-link-with-params">
+            'Home (with params)'
+          </LinkTo>
+
+          <!-- this log caused a failure previously, so we leave it to make sure this case is tested -->
+          {{log this.foo}}
+        `
+      );
+
+      this.add(
+        `controller:application`,
+        class extends Controller {
+          queryParams = ['foo', 'bar'];
+          @tracked foo = [];
+          @tracked bar = [];
+        }
+      );
+
+      await this.visitAndAssert('/');
+
+      document.getElementById('the-link').click();
+      await runLoopSettled();
+      this.assertCurrentPath('/');
+
+      document.getElementById('the-link-with-params').click();
+      await runLoopSettled();
+      this.assertCurrentPath('/?foo=%5B123%5D');
+    }
+
     async ['@test Single query params defined with native getters and tracked properties can be on the controller and reflected in the url'](
       assert
     ) {

From 15217a3ab36a35c8b26361c3155a30efe4a0f8ae Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 30 Sep 2020 11:39:59 -0400
Subject: [PATCH 0136/1405] Add v3.21.2 to CHANGELOG.md.

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82692094222..cce77242888 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,11 @@
 - [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
 - [#19086](https://github.com/emberjs/ember.js/pull/19086) [FEATURE] Pass transition object to activate/deactivate hooks and events
 
+### v3.21.2 (September 30, 2020)
+
+- [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters
+- [#19164](https://github.com/emberjs/ember.js/pull/19164) [BUGFIX] Entangles custom EmberArray implementations when accessed with `Ember.get`
+
 ### v3.21.1 (August 28, 2020)
 
 - [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.

From c1488b517ae06704626b9cc092d455eb04d309d0 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 30 Sep 2020 11:45:01 -0700
Subject: [PATCH 0137/1405] [BUGFIX lts] Ensures that tracked properties
 initialize property

Fixes tracked property initialization for classic classes.
---
 .../integration/components/tracked-test.js    | 38 +++++++++++++++++++
 .../@ember/-internals/metal/lib/decorator.ts  |  9 +----
 .../-internals/metal/lib/property_set.ts      | 16 +++-----
 .../@ember/-internals/metal/lib/tracked.ts    | 20 +++++++---
 4 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index c701a34208c..48a1f0d5352 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -14,6 +14,44 @@ import { Component } from '../../utils/helpers';
 moduleFor(
   'Component Tracked Properties',
   class extends RenderingTestCase {
+    '@test simple test using classic component'() {
+      let personId = 0;
+      class Person {
+        @tracked first;
+        @tracked last;
+
+        constructor(first, last) {
+          this.id = personId++;
+          this.first = first;
+          this.last = last;
+        }
+      }
+
+      class PersonComponent extends Component {
+        @tracked first;
+        @tracked last;
+
+        get person() {
+          return new Person(this.first, this.last);
+        }
+      }
+
+      this.registerComponent('person-wrapper', {
+        ComponentClass: PersonComponent,
+        template: '{{@first}} {{@last}} | {{this.person.first}} {{this.person.last}}',
+      });
+
+      this.render('<PersonWrapper @first={{first}} @last={{last}} />', {
+        first: 'robert',
+        last: 'jackson',
+      });
+
+      this.assertText('robert jackson | robert jackson');
+
+      runTask(() => this.context.set('first', 'max'));
+      this.assertText('max jackson | max jackson');
+    }
+
     '@test simple test using glimmerish component'() {
       let personId = 0;
       class Person {
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 3f22ae3909a..a493e52bca5 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -1,6 +1,5 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
-import { _WeakSet as WeakSet } from '@glimmer/util';
 
 export type DecoratorPropertyDescriptor = (PropertyDescriptor & { initializer?: any }) | undefined;
 
@@ -80,17 +79,11 @@ function DESCRIPTOR_SETTER_FUNCTION(
   name: string,
   descriptor: ComputedDescriptor
 ): (value: any) => void {
-  let func = function CPSETTER_FUNCTION(this: object, value: any): void {
+  return function CPSETTER_FUNCTION(this: object, value: any): void {
     return descriptor.set(this, name, value);
   };
-
-  CP_SETTER_FUNCS.add(func);
-
-  return func;
 }
 
-export const CP_SETTER_FUNCS = new WeakSet();
-
 export function makeComputedDecorator(
   desc: ComputedDescriptor,
   DecoratorClass: { prototype: object }
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index bec221166f5..aef085266ed 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -1,13 +1,8 @@
-import {
-  HAS_NATIVE_PROXY,
-  lookupDescriptor,
-  setWithMandatorySetter,
-  toString,
-} from '@ember/-internals/utils';
+import { HAS_NATIVE_PROXY, setWithMandatorySetter, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
-import { CP_SETTER_FUNCS } from './decorator';
+import { descriptorForProperty } from './decorator';
 import { isPath } from './path_cache';
 import { notifyPropertyChange } from './property_events';
 import { _getPath as getPath, getPossibleMandatoryProxyValue } from './property_get';
@@ -72,11 +67,10 @@ export function set(obj: object, keyName: string, value: any, tolerant?: boolean
     return setPath(obj, keyName, value, tolerant);
   }
 
-  let descriptor = lookupDescriptor(obj, keyName);
-  let setter = descriptor === null ? undefined : descriptor.set;
+  let descriptor = descriptorForProperty(obj, keyName);
 
-  if (setter !== undefined && CP_SETTER_FUNCS.has(setter)) {
-    obj[keyName] = value;
+  if (descriptor !== undefined) {
+    descriptor.set(obj, keyName, value);
     return value;
   }
 
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 614297cbbeb..e7399ead097 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -5,7 +5,6 @@ import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
 import { CHAIN_PASS_THROUGH } from './chain-tags';
 import {
-  CP_SETTER_FUNCS,
   Decorator,
   DecoratorPropertyDescriptor,
   isElementDescriptor,
@@ -183,10 +182,21 @@ function descriptorForField([target, key, desc]: [
     set,
   };
 
-  metaFor(target).writeDescriptors(key, newDesc);
-
-  CP_SETTER_FUNCS.add(set);
-  CHAIN_PASS_THROUGH.add(newDesc);
+  metaFor(target).writeDescriptors(key, new TrackedDescriptor(get, set));
 
   return newDesc;
 }
+
+class TrackedDescriptor {
+  constructor(private _get: () => unknown, private _set: (value: unknown) => void) {
+    CHAIN_PASS_THROUGH.add(this);
+  }
+
+  get(obj: object) {
+    return this._get.call(obj);
+  }
+
+  set(obj: object, _key: string, value: unknown) {
+    this._set.call(obj, value);
+  }
+}

From f776ac84baa67ae29fb2c13a94f2ca55a967b2b3 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 30 Sep 2020 15:31:02 -0400
Subject: [PATCH 0138/1405] Enforce usage of `capabilities` generation.

Prior to this change it was possible to avoid using a given type's
`capabilities` builder function (intentionally or on accident) by doing
something like:

```js
class MyManager {
  capabilities = {
    // magical properties from Ember's internals
  }
}
```

The API's that we _intended_ folks to be using is something like:

```js
import { capabilties as modifierCapabilities } from '@ember/modifier';

class MyManager {
  capabilities = modifierCapabilities('3.22');
}
```

This commit ensures that Ember's own internal structures can not be
"spoofed" (avoiding our constraints, or creating a frankenstein
manager).
---
 .../glimmer/lib/component-managers/custom.ts  |  27 ++---
 .../-internals/glimmer/lib/helpers/custom.ts  |   7 +-
 .../glimmer/lib/modifiers/custom.ts           |  12 +-
 .../-internals/glimmer/lib/utils/managers.ts  |  56 ++++++++-
 .../custom-component-manager-test.js          | 112 ++++++++++++++++++
 .../custom-modifier-manager-test.js           |  37 +++++-
 .../helpers/helper-manager-test.js            |  28 +++++
 7 files changed, 246 insertions(+), 33 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 7f5f822a0d3..2538dc4d01c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -19,6 +19,7 @@ import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import { OwnedTemplate } from '../template';
 import { argsProxyFor } from '../utils/args-proxy';
+import { buildCapabilities, InternalCapabilities } from '../utils/managers';
 import AbstractComponentManager from './abstract';
 
 const CAPABILITIES = {
@@ -49,6 +50,12 @@ export interface OptionalCapabilities {
   };
 }
 
+export interface Capabilities extends InternalCapabilities {
+  asyncLifeCycleCallbacks: boolean;
+  destructor: boolean;
+  updateHook: boolean;
+}
+
 export function capabilities<Version extends keyof OptionalCapabilities>(
   managerAPI: Version,
   options: OptionalCapabilities[Version] = {}
@@ -64,11 +71,11 @@ export function capabilities<Version extends keyof OptionalCapabilities>(
     updateHook = Boolean((options as OptionalCapabilities['3.13']).updateHook);
   }
 
-  return {
+  return buildCapabilities({
     asyncLifeCycleCallbacks: Boolean(options.asyncLifecycleCallbacks),
     destructor: Boolean(options.destructor),
     updateHook,
-  };
+  }) as Capabilities;
 }
 
 export interface DefinitionState<ComponentInstance> {
@@ -77,21 +84,9 @@ export interface DefinitionState<ComponentInstance> {
   template: OwnedTemplate;
 }
 
-export interface Capabilities {
-  asyncLifeCycleCallbacks: boolean;
-  destructor: boolean;
-  updateHook: boolean;
-}
-
-// TODO: export ICapturedArgumentsValue from glimmer and replace this
-export interface Args {
-  named: Dict<unknown>;
-  positional: unknown[];
-}
-
 export interface ManagerDelegate<ComponentInstance> {
   capabilities: Capabilities;
-  createComponent(factory: unknown, args: Args): ComponentInstance;
+  createComponent(factory: unknown, args: Arguments): ComponentInstance;
   getContext(instance: ComponentInstance): unknown;
 }
 
@@ -114,7 +109,7 @@ export function hasUpdateHook<ComponentInstance>(
 
 export interface ManagerDelegateWithUpdateHook<ComponentInstance>
   extends ManagerDelegate<ComponentInstance> {
-  updateComponent(instance: ComponentInstance, args: Args): void;
+  updateComponent(instance: ComponentInstance, args: Arguments): void;
 }
 
 export function hasAsyncUpdateHook<ComponentInstance>(
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
index 3f673627420..912842630b6 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
@@ -3,10 +3,11 @@ import { DEBUG } from '@glimmer/env';
 import { Arguments, Helper as GlimmerHelper } from '@glimmer/interfaces';
 import { createComputeRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
 import { argsProxyFor } from '../utils/args-proxy';
+import { buildCapabilities, InternalCapabilities } from '../utils/managers';
 
 export type HelperDefinition = object;
 
-export interface HelperCapabilities {
+export interface HelperCapabilities extends InternalCapabilities {
   hasValue: boolean;
   hasDestroyable: boolean;
   hasScheduledEffect: boolean;
@@ -29,11 +30,11 @@ export function helperCapabilities(
     !options.hasScheduledEffect
   );
 
-  return {
+  return buildCapabilities({
     hasValue: Boolean(options.hasValue),
     hasDestroyable: Boolean(options.hasDestroyable),
     hasScheduledEffect: Boolean(options.hasScheduledEffect),
-  };
+  });
 }
 
 export interface HelperManager<HelperStateBucket = unknown> {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index 3dda936be71..63cf4a97227 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -6,6 +6,7 @@ import { registerDestructor, reifyArgs } from '@glimmer/runtime';
 import { createUpdatableTag, untrack, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { argsProxyFor } from '../utils/args-proxy';
+import { buildCapabilities, InternalCapabilities } from '../utils/managers';
 
 export interface CustomModifierDefinitionState<ModifierInstance> {
   ModifierClass: Factory<ModifierInstance>;
@@ -25,7 +26,7 @@ export interface OptionalCapabilities {
   };
 }
 
-export interface Capabilities {
+export interface Capabilities extends InternalCapabilities {
   disableAutoTracking: boolean;
   useArgsProxy: boolean;
   passFactoryToCreate: boolean;
@@ -40,11 +41,11 @@ export function capabilities<Version extends keyof OptionalCapabilities>(
     managerAPI === '3.13' || managerAPI === '3.22'
   );
 
-  return {
+  return buildCapabilities({
     disableAutoTracking: Boolean(optionalFeatures.disableAutoTracking),
     useArgsProxy: managerAPI === '3.13' ? false : true,
     passFactoryToCreate: managerAPI === '3.13',
-  };
+  }) as Capabilities;
 }
 
 export class CustomModifierDefinition<ModifierInstance> {
@@ -124,11 +125,6 @@ class InteractiveCustomModifierManager<ModifierInstance>
     let { delegate, ModifierClass } = definition;
     let capturedArgs = vmArgs.capture();
 
-    assert(
-      'Custom modifier managers must define their capabilities using the capabilities() helper function',
-      typeof delegate.capabilities === 'object' && delegate.capabilities !== null
-    );
-
     let { useArgsProxy, passFactoryToCreate } = delegate.capabilities;
 
     let args = useArgsProxy ? argsProxyFor(capturedArgs, 'modifier') : reifyArgs(capturedArgs);
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 7045a77af58..db378330787 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,8 +1,10 @@
 import { Owner } from '@ember/-internals/owner';
-import { deprecate } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
+import { DEBUG } from '@glimmer/env';
+import { _WeakSet } from '@glimmer/util';
 import { ManagerDelegate as ComponentManagerDelegate } from '../component-managers/custom';
-import InternalComponentManager from '../component-managers/internal';
+import InternalComponentManager, { isInternalManager } from '../component-managers/internal';
 import { HelperManager } from '../helpers/custom';
 import { ModifierManagerDelegate } from '../modifiers/custom';
 
@@ -17,6 +19,8 @@ const COMPONENT_MANAGERS = new WeakMap<
   ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>
 >();
 
+const FROM_CAPABILITIES = DEBUG ? new _WeakSet() : undefined;
+
 const MODIFIER_MANAGERS = new WeakMap<object, ManagerFactory<ModifierManagerDelegate<unknown>>>();
 
 const HELPER_MANAGERS = new WeakMap<object, ManagerFactory<HelperManager<unknown>>>();
@@ -71,6 +75,7 @@ function getManagerInstanceForOwner<D extends ManagerDelegate>(
 
   if (instance === undefined) {
     instance = factory(owner);
+
     managers.set(factory, instance!);
   }
 
@@ -94,7 +99,15 @@ export function getModifierManager(
   const factory = getManager(MODIFIER_MANAGERS, definition);
 
   if (factory !== undefined) {
-    return getManagerInstanceForOwner(owner, factory);
+    let manager = getManagerInstanceForOwner(owner, factory);
+    assert(
+      `Custom modifier managers must have a \`capabilities\` property that is the result of calling the \`capabilities('3.13' | '3.22')\` (imported via \`import { capabilities } from '@ember/modifier';\`). Received: \`${JSON.stringify(
+        manager.capabilities
+      )}\` for: \`${manager}\``,
+      FROM_CAPABILITIES!.has(manager.capabilities)
+    );
+
+    return manager;
   }
 
   return undefined;
@@ -114,7 +127,16 @@ export function getHelperManager(
   const factory = getManager(HELPER_MANAGERS, definition);
 
   if (factory !== undefined) {
-    return getManagerInstanceForOwner(owner, factory);
+    let manager = getManagerInstanceForOwner(owner, factory);
+
+    assert(
+      `Custom helper managers must have a \`capabilities\` property that is the result of calling the \`capabilities('3.23')\` (imported via \`import { capabilities } from '@ember/helper';\`). Received: \`${JSON.stringify(
+        manager.capabilities
+      )}\` for: \`${manager}\``,
+      FROM_CAPABILITIES!.has(manager.capabilities)
+    );
+
+    return manager;
   }
 
   return undefined;
@@ -161,8 +183,32 @@ export function getComponentManager(
   );
 
   if (factory !== undefined) {
-    return getManagerInstanceForOwner(owner, factory);
+    let manager = getManagerInstanceForOwner(owner, factory);
+
+    assert(
+      `Custom component managers must have a \`capabilities\` property that is the result of calling the \`capabilities('3.4' | '3.13')\` (imported via \`import { capabilities } from '@ember/component';\`). Received: \`${JSON.stringify(
+        (manager as ComponentManagerDelegate<unknown>).capabilities
+      )}\` for: \`${manager}\``,
+      isInternalManager(manager) || FROM_CAPABILITIES!.has(manager.capabilities)
+    );
+
+    return manager;
   }
 
   return undefined;
 }
+
+declare const INTERNAL_CAPABILITIES: unique symbol;
+
+export interface InternalCapabilities {
+  [INTERNAL_CAPABILITIES]: true;
+}
+
+export function buildCapabilities<T extends object>(capabilities: T): T & InternalCapabilities {
+  if (DEBUG) {
+    FROM_CAPABILITIES!.add(capabilities);
+    Object.freeze(capabilities);
+  }
+
+  return capabilities as T & InternalCapabilities;
+}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index fc5ade2b2e5..3cc855fc8af 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -522,6 +522,62 @@ moduleFor(
       this.assertHTML(`<p>hello max</p>`);
       assert.verifySteps(['updateComponent', 'didUpdateComponent']);
     }
+
+    '@test capabilities helper function must be used to generate capabilities'(assert) {
+      let ComponentClass = setComponentManager(
+        () => {
+          return EmberObject.create({
+            capabilities: {
+              asyncLifecycleCallbacks: true,
+              destructor: true,
+              update: false,
+            },
+
+            createComponent(factory, args) {
+              assert.step('createComponent');
+              return factory.create({ args });
+            },
+
+            updateComponent(component, args) {
+              assert.step('updateComponent');
+              set(component, 'args', args);
+            },
+
+            destroyComponent(component) {
+              assert.step('destroyComponent');
+              component.destroy();
+            },
+
+            getContext(component) {
+              assert.step('getContext');
+              return component;
+            },
+
+            didCreateComponent() {
+              assert.step('didCreateComponent');
+            },
+
+            didUpdateComponent() {
+              assert.step('didUpdateComponent');
+            },
+          });
+        },
+        EmberObject.extend({
+          greeting: 'hello',
+        })
+      );
+
+      this.registerComponent('foo-bar', {
+        template: `<p>{{greeting}} {{@name}}</p>`,
+        ComponentClass,
+      });
+
+      expectAssertion(() => {
+        this.render('{{foo-bar name=name}}', { name: 'world' });
+      }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
+
+      assert.verifySteps([]);
+    }
   }
 );
 
@@ -774,5 +830,61 @@ moduleFor(
       runTask(() => this.context.set('value', 'bar'));
       assert.verifySteps([]);
     }
+
+    '@test capabilities helper function must be used to generate capabilities'(assert) {
+      let ComponentClass = setComponentManager(
+        () => {
+          return EmberObject.create({
+            capabilities: {
+              asyncLifecycleCallbacks: true,
+              destructor: true,
+              update: false,
+            },
+
+            createComponent(factory, args) {
+              assert.step('createComponent');
+              return factory.create({ args });
+            },
+
+            updateComponent(component, args) {
+              assert.step('updateComponent');
+              set(component, 'args', args);
+            },
+
+            destroyComponent(component) {
+              assert.step('destroyComponent');
+              component.destroy();
+            },
+
+            getContext(component) {
+              assert.step('getContext');
+              return component;
+            },
+
+            didCreateComponent() {
+              assert.step('didCreateComponent');
+            },
+
+            didUpdateComponent() {
+              assert.step('didUpdateComponent');
+            },
+          });
+        },
+        EmberObject.extend({
+          greeting: 'hello',
+        })
+      );
+
+      this.registerComponent('foo-bar', {
+        template: `<p>{{greeting}} {{@name}}</p>`,
+        ComponentClass,
+      });
+
+      expectAssertion(() => {
+        this.render('<FooBar @name={{name}} />', { name: 'world' });
+      }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
+
+      assert.verifySteps([]);
+    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index b37d26f785e..c05ee65d7e5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -21,7 +21,7 @@ class ModifierManagerTest extends RenderingTestCase {
 
     expectAssertion(() => {
       this.render('<h1 {{foo-bar}}>hello world</h1>');
-    }, /Custom modifier managers must define their capabilities/);
+    }, /Custom modifier managers must have a `capabilities` property /);
   }
 
   '@test can register a custom element modifier and render it'(assert) {
@@ -266,6 +266,41 @@ class ModifierManagerTest extends RenderingTestCase {
       this.render('<h1 {{foo-bar this.person}}>hello world</h1>', { person: new Person() });
     }, expectedMessage);
   }
+
+  '@test capabilities helper function must be used to generate capabilities'(assert) {
+    class OverrideCustomModifierManager extends this.CustomModifierManager {
+      capabilities = {
+        disableAutoTracking: false,
+        useArgsProxy: true,
+        passFactoryToCreate: false,
+      };
+    }
+
+    let ModifierClass = setModifierManager(
+      (owner) => {
+        return new OverrideCustomModifierManager(owner);
+      },
+      EmberObject.extend({
+        didInsertElement() {
+          assert.step('didInsertElement');
+        },
+        didUpdate() {
+          assert.step('didUpdate');
+        },
+        willDestroyElement() {
+          assert.step('willDestroyElement');
+        },
+      })
+    );
+
+    this.registerModifier('foo-bar', ModifierClass.extend());
+
+    expectAssertion(() => {
+      this.render('<h1 {{foo-bar}}>hello world</h1>');
+    }, /Custom modifier managers must have a `capabilities` property that is the result of calling the `capabilities\('3.13' \| '3.22'\)` \(imported via `import \{ capabilities \} from '@ember\/modifier';`\). /);
+
+    assert.verifySteps([]);
+  }
 }
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 33821e44280..81b0862058b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -289,6 +289,34 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
 
         this.assertText('hello');
       }
+
+      '@test capabilities helper function must be used to generate capabilities'(assert) {
+        class OverrideTestHelperManager extends TestHelperManager {
+          capabilities = {
+            hasValue: true,
+            hasDestroyable: true,
+            hasScheduledEffect: false,
+          };
+        }
+
+        class TestHelper {}
+
+        setHelperManager((owner) => new OverrideTestHelperManager(owner), TestHelper);
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            value() {
+              return 'hello';
+            }
+          }
+        );
+
+        expectAssertion(() => {
+          this.render('{{hello}}');
+        }, /Custom helper managers must have a `capabilities` property that is the result of calling the `capabilities\('3.23'\)` \(imported via `import \{ capabilities \} from '@ember\/helper';`\). /);
+
+        assert.verifySteps([]);
+      }
     }
   );
 }

From 389486714360f972eb44638c6874791d442c4216 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 30 Sep 2020 17:02:56 -0400
Subject: [PATCH 0139/1405] Add v3.21.3 to CHANGELOG.md.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cce77242888..b2a06ba1471 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@
 - [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
 - [#19086](https://github.com/emberjs/ember.js/pull/19086) [FEATURE] Pass transition object to activate/deactivate hooks and events
 
+### v3.21.3 (September 30, 2020)
+
+- [#19172](https://github.com/emberjs/ember.js/pull/19172) [BUGFIX] Ensures that tracked properties initialize property
+
 ### v3.21.2 (September 30, 2020)
 
 - [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters

From 984c9adaa2e863fd2f8dd919600f364e84c6a9a4 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 30 Sep 2020 17:02:46 -0400
Subject: [PATCH 0140/1405] Add v3.22.0-beta.4 to CHANGELOG

(cherry picked from commit 3010b89abd5fd15e65414b1654222498eb6607bf)
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2a06ba1471..e647bb58c8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Ember Changelog
 
+### v3.22.0-beta.4 (September 30, 2020)
+
+- [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters
+- [#19094](https://github.com/emberjs/ember.js/pull/19094) [BUGFIX] Fix RouterService#isActive() to work with tracking 
+- [#19163](https://github.com/emberjs/ember.js/pull/19163) [BUGFIX] Use args proxy for modifier managers.
+- [#19164](https://github.com/emberjs/ember.js/pull/19164) [BUGFIX] Entangles custom EmberArray implementations when accessed with `Ember.get`
+- [#19170](https://github.com/emberjs/ember.js/pull/19170) [BUGFIX] Make modifier manager 3.22 accept the resolved value directly.
+
 ### v3.22.0-beta.3 (September 09, 2020)
 
 - [#19124](https://github.com/emberjs/ember.js/pull/19124) Fix rendering engine usage within a `fastboot` sandbox

From 04071f0688b75c8af30d51ba98890c1c03f90aa5 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 30 Sep 2020 17:21:09 -0400
Subject: [PATCH 0141/1405] Don't trigger the CI build when only CHANGELOG is
 modified

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aa6e84c1aa0..e08a2826cb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,8 @@ on:
       - cron*
     tags:
       - 'v*'
+    paths-ignore:
+      - 'CHANGELOG.md'
   pull_request:
 
 jobs:

From 7fd407c2f80feb14d24a22ec762521bad563a746 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 30 Sep 2020 17:10:56 -0400
Subject: [PATCH 0142/1405] Add v3.22.0-beta.5 to CHANGELOG

(cherry picked from commit ae3c065f7c3416f6c497b2a5b5d9e6dd4d549662)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e647bb58c8a..bb6a77c62a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.22.0-beta.5 (September 30, 2020)
+
+- [#19172](https://github.com/emberjs/ember.js/pull/19172) [BUGFIX] Ensures that tracked properties initialize property
+
 ### v3.22.0-beta.4 (September 30, 2020)
 
 - [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters

From fc2157b122665977e50734112063d695ec622d81 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Mon, 28 Sep 2020 16:57:13 -0400
Subject: [PATCH 0143/1405] [FEAT] Implements invokeHelper

---
 packages/@ember/-internals/glimmer/index.ts   |   2 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  35 +-
 .../-internals/glimmer/lib/helpers/custom.ts  | 100 ++-
 .../@ember/-internals/glimmer/lib/resolver.ts |   6 +-
 .../-internals/glimmer/lib/utils/managers.ts  |  63 +-
 .../integration/helpers/invoke-helper-test.js | 618 ++++++++++++++++++
 packages/@ember/canary-features/index.ts      |   2 +
 packages/ember/index.js                       |   5 +
 packages/ember/tests/reexports_test.js        |   4 +
 9 files changed, 796 insertions(+), 39 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index d9139b7b000..482e47ae18f 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -406,7 +406,7 @@ export { OutletState } from './lib/utils/outlet';
 export { setComponentManager, setModifierManager, setHelperManager } from './lib/utils/managers';
 export { capabilities } from './lib/component-managers/custom';
 export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
-export { helperCapabilities, HelperManager } from './lib/helpers/custom';
+export { helperCapabilities, HelperManager, invokeHelper } from './lib/helpers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
 export { setComponentTemplate, getComponentTemplate } from './lib/utils/component-template';
 export { CapturedRenderNode } from './lib/utils/debug-render-tree';
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 4362b2f16c1..9b0d045244a 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -2,12 +2,13 @@
 @module @ember/component
 */
 
-import { Factory } from '@ember/-internals/owner';
+import { Factory, Owner, setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { getDebugName, symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { Arguments, Dict } from '@glimmer/interfaces';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 import {
   consumeTag,
   createTag,
@@ -38,6 +39,12 @@ export interface SimpleHelper<T = unknown> {
   compute: HelperFunction<T>;
 }
 
+const CLASSIC_HELPER_MANAGERS = new WeakSet();
+
+export function isClassicHelperManager(obj: object) {
+  return CLASSIC_HELPER_MANAGERS.has(obj);
+}
+
 /**
   Ember Helpers are functions that can compute values, and are used in templates.
   For example, this code calls a helper named `format-currency`:
@@ -145,9 +152,21 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
     hasDestroyable: true,
   });
 
-  createHelper(definition: ClassHelperFactory, args: Arguments) {
+  private ownerInjection: object;
+
+  constructor(owner: Owner | undefined) {
+    CLASSIC_HELPER_MANAGERS.add(this);
+    let ownerInjection = {};
+    setOwner(ownerInjection, owner!);
+    this.ownerInjection = ownerInjection;
+  }
+
+  createHelper(definition: ClassHelperFactory | typeof Helper, args: Arguments) {
+    let instance =
+      definition.class === undefined ? definition.create(this.ownerInjection) : definition.create();
+
     return {
-      instance: definition.create(),
+      instance,
       args,
     };
   }
@@ -178,9 +197,7 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
-export const CLASSIC_HELPER_MANAGER = new ClassicHelperManager();
-
-setHelperManager(() => CLASSIC_HELPER_MANAGER, Helper);
+setHelperManager((owner) => new ClassicHelperManager(owner), Helper);
 
 ///////////
 
@@ -203,19 +220,21 @@ class SimpleClassicHelperManager implements HelperManager<() => unknown> {
   });
 
   createHelper(definition: Wrapper, args: Arguments) {
+    let { compute } = definition;
+
     if (DEBUG) {
       return () => {
         let ret;
 
         deprecateMutationsInTrackingTransaction!(() => {
-          ret = definition.compute.call(null, args.positional, args.named);
+          ret = compute.call(null, args.positional, args.named);
         });
 
         return ret;
       };
     }
 
-    return definition.compute.bind(null, args.positional, args.named);
+    return () => compute.call(null, args.positional, args.named);
   }
 
   getValue(fn: () => unknown) {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
index 912842630b6..bf1b1e17bd5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
@@ -1,9 +1,20 @@
+import { getOwner } from '@ember/-internals/owner';
+import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Arguments, Helper as GlimmerHelper } from '@glimmer/interfaces';
 import { createComputeRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
+import {
+  associateDestroyableChild,
+  EMPTY_ARGS,
+  EMPTY_NAMED,
+  EMPTY_POSITIONAL,
+  isDestroyed,
+  isDestroying,
+} from '@glimmer/runtime';
+import { Cache, createCache, getValue } from '@glimmer/validator';
 import { argsProxyFor } from '../utils/args-proxy';
-import { buildCapabilities, InternalCapabilities } from '../utils/managers';
+import { buildCapabilities, getHelperManager, InternalCapabilities } from '../utils/managers';
 
 export type HelperDefinition = object;
 
@@ -63,12 +74,95 @@ function hasDestroyable(manager: HelperManager): manager is HelperManagerWithDes
   return manager.capabilities.hasDestroyable;
 }
 
+let ARGS_CACHES = DEBUG ? new WeakMap<SimpleArgsProxy, Cache<Partial<Arguments>>>() : undefined;
+
+function getArgs(proxy: SimpleArgsProxy): Partial<Arguments> {
+  return getValue(DEBUG ? ARGS_CACHES!.get(proxy)! : proxy.argsCache!)!;
+}
+
+class SimpleArgsProxy {
+  argsCache?: Cache<Partial<Arguments>>;
+
+  constructor(
+    context: object,
+    computeArgs: (context: object) => Partial<Arguments> = () => EMPTY_ARGS
+  ) {
+    let argsCache = createCache(() => computeArgs(context));
+
+    if (DEBUG) {
+      ARGS_CACHES!.set(this, argsCache);
+      Object.freeze(this);
+    } else {
+      this.argsCache = argsCache;
+    }
+  }
+
+  get named() {
+    return getArgs(this).named || EMPTY_NAMED;
+  }
+
+  get positional() {
+    return getArgs(this).positional || EMPTY_POSITIONAL;
+  }
+}
+
+export function invokeHelper(
+  context: object,
+  definition: HelperDefinition,
+  computeArgs: (context: object) => Partial<Arguments>
+): Cache<unknown> {
+  assert(
+    `Expected a context object to be passed as the first parameter to invokeHelper, got ${context}`,
+    context !== null && typeof context === 'object'
+  );
+
+  const owner = getOwner(context);
+  const manager = getHelperManager(owner, definition)!;
+
+  // TODO: figure out why assert isn't using the TS assert thing
+  assert(
+    `Expected a helper definition to be passed as the second parameter to invokeHelper, but no helper manager was found. The definition value that was passed was \`${getDebugName!(
+      definition
+    )}\`. Did you use setHelperManager to associate a helper manager with this value?`,
+    manager
+  );
+
+  let args = new SimpleArgsProxy(context, computeArgs);
+  let bucket = manager.createHelper(definition, args);
+
+  let cache: Cache<unknown>;
+
+  if (hasValue(manager)) {
+    cache = createCache(() => {
+      assert(
+        `You attempted to get the value of a helper after the helper was destroyed, which is not allowed`,
+        !isDestroying(cache) && !isDestroyed(cache)
+      );
+
+      return manager.getValue(bucket);
+    });
+
+    associateDestroyableChild(context, cache);
+  } else {
+    throw new Error('TODO: unreachable, to be implemented with hasScheduledEffect');
+  }
+
+  if (hasDestroyable(manager)) {
+    let destroyable = manager.getDestroyable(bucket);
+
+    associateDestroyableChild(cache, destroyable);
+  }
+
+  return cache;
+}
+
 export default function customHelper(
   manager: HelperManager<unknown>,
   definition: HelperDefinition
 ): GlimmerHelper {
-  return (args, vm) => {
-    const bucket = manager.createHelper(definition, argsProxyFor(args.capture(), 'helper'));
+  return (vmArgs, vm) => {
+    const args = argsProxyFor(vmArgs.capture(), 'helper');
+    const bucket = manager.createHelper(definition, args);
 
     if (hasDestroyable(manager)) {
       vm.associateDestroyable(manager.getDestroyable(bucket));
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 41ff7353bdb..ffb0b8505a7 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -26,9 +26,9 @@ import { InternalComponentDefinition, isInternalManager } from './component-mana
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
 import InternalComponent from './components/internal';
 import {
-  CLASSIC_HELPER_MANAGER,
   HelperFactory,
   HelperInstance,
+  isClassicHelperManager,
   SIMPLE_CLASSIC_HELPER_MANAGER,
   SimpleHelper,
 } from './helper';
@@ -384,14 +384,14 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     assert(
       'helper managers have not been enabled yet, you must use classic helpers',
       EMBER_GLIMMER_HELPER_MANAGER ||
-        manager === CLASSIC_HELPER_MANAGER ||
+        isClassicHelperManager(manager) ||
         manager === SIMPLE_CLASSIC_HELPER_MANAGER
     );
 
     // For classic class based helpers, we need to pass the factoryFor result itself rather
     // than the raw value (`factoryFor(...).class`). This is because injections are already
     // bound in the factoryFor result, including type-based injections
-    return customHelper(manager, CLASSIC_HELPER_MANAGER === manager ? factory : factory.class);
+    return customHelper(manager, isClassicHelperManager(manager) ? factory : factory.class);
   }
 
   private _lookupPartial(name: string, meta: OwnedTemplateMeta): PartialDefinition {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index db378330787..348aa3826d7 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -16,18 +16,27 @@ type ManagerDelegate =
 
 const COMPONENT_MANAGERS = new WeakMap<
   object,
-  ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>
+  ManagerFactory<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>
 >();
 
 const FROM_CAPABILITIES = DEBUG ? new _WeakSet() : undefined;
 
-const MODIFIER_MANAGERS = new WeakMap<object, ManagerFactory<ModifierManagerDelegate<unknown>>>();
+const MODIFIER_MANAGERS = new WeakMap<
+  object,
+  ManagerFactory<Owner, ModifierManagerDelegate<unknown>>
+>();
 
-const HELPER_MANAGERS = new WeakMap<object, ManagerFactory<HelperManager<unknown>>>();
+const HELPER_MANAGERS = new WeakMap<
+  object,
+  ManagerFactory<Owner | undefined, HelperManager<unknown>>
+>();
 
-const MANAGER_INSTANCES: WeakMap<Owner, WeakMap<ManagerFactory, unknown>> = new WeakMap();
+const OWNER_MANAGER_INSTANCES: WeakMap<Owner, WeakMap<ManagerFactory, unknown>> = new WeakMap();
+const UNDEFINED_MANAGER_INSTANCES: WeakMap<ManagerFactory, unknown> = new WeakMap();
 
-export type ManagerFactory<D extends ManagerDelegate = ManagerDelegate> = (owner: Owner) => D;
+export type ManagerFactory<O = Owner, D extends ManagerDelegate = ManagerDelegate> = (
+  owner: O
+) => D;
 
 ///////////
 
@@ -42,10 +51,10 @@ function setManager<Def extends object>(
   return obj;
 }
 
-function getManager<D extends ManagerDelegate>(
-  map: WeakMap<object, ManagerFactory<D>>,
+function getManager<O, D extends ManagerDelegate>(
+  map: WeakMap<object, ManagerFactory<O, D>>,
   obj: object
-): ManagerFactory<D> | undefined {
+): ManagerFactory<O, D> | undefined {
   let pointer = obj;
   while (pointer !== undefined && pointer !== null) {
     const manager = map.get(pointer);
@@ -61,21 +70,26 @@ function getManager<D extends ManagerDelegate>(
 }
 
 function getManagerInstanceForOwner<D extends ManagerDelegate>(
-  owner: Owner,
-  factory: ManagerFactory<D>
+  owner: Owner | undefined,
+  factory: ManagerFactory<Owner, D>
 ): D {
-  let managers = MANAGER_INSTANCES.get(owner);
+  let managers;
 
-  if (managers === undefined) {
-    managers = new WeakMap();
-    MANAGER_INSTANCES.set(owner, managers);
+  if (owner === undefined) {
+    managers = UNDEFINED_MANAGER_INSTANCES;
+  } else {
+    managers = OWNER_MANAGER_INSTANCES.get(owner);
+
+    if (managers === undefined) {
+      managers = new WeakMap();
+      OWNER_MANAGER_INSTANCES.set(owner, managers);
+    }
   }
 
   let instance = managers.get(factory);
 
   if (instance === undefined) {
-    instance = factory(owner);
-
+    instance = factory(owner!);
     managers.set(factory, instance!);
   }
 
@@ -86,14 +100,14 @@ function getManagerInstanceForOwner<D extends ManagerDelegate>(
 ///////////
 
 export function setModifierManager(
-  factory: ManagerFactory<ModifierManagerDelegate<unknown>>,
+  factory: ManagerFactory<Owner, ModifierManagerDelegate<unknown>>,
   definition: object
 ) {
   return setManager(MODIFIER_MANAGERS, factory, definition);
 }
 
 export function getModifierManager(
-  owner: Owner,
+  owner: Owner | undefined,
   definition: object
 ): ModifierManagerDelegate<unknown> | undefined {
   const factory = getManager(MODIFIER_MANAGERS, definition);
@@ -114,14 +128,14 @@ export function getModifierManager(
 }
 
 export function setHelperManager(
-  factory: ManagerFactory<HelperManager<unknown>>,
+  factory: ManagerFactory<Owner | undefined, HelperManager<unknown>>,
   definition: object
 ) {
   return setManager(HELPER_MANAGERS, factory, definition);
 }
 
 export function getHelperManager(
-  owner: Owner,
+  owner: Owner | undefined,
   definition: object
 ): HelperManager<unknown> | undefined {
   const factory = getManager(HELPER_MANAGERS, definition);
@@ -145,10 +159,10 @@ export function getHelperManager(
 export function setComponentManager(
   stringOrFunction:
     | string
-    | ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>,
+    | ManagerFactory<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>,
   obj: object
 ) {
-  let factory: ManagerFactory<ComponentManagerDelegate<unknown> | InternalComponentManager>;
+  let factory: ManagerFactory<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>;
   if (COMPONENT_MANAGER_STRING_LOOKUP && typeof stringOrFunction === 'string') {
     deprecate(
       'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.',
@@ -166,6 +180,7 @@ export function setComponentManager(
     };
   } else {
     factory = stringOrFunction as ManagerFactory<
+      Owner,
       ComponentManagerDelegate<unknown> | InternalComponentManager
     >;
   }
@@ -174,10 +189,10 @@ export function setComponentManager(
 }
 
 export function getComponentManager(
-  owner: Owner,
+  owner: Owner | undefined,
   definition: object
 ): ComponentManagerDelegate<unknown> | InternalComponentManager | undefined {
-  const factory = getManager<ComponentManagerDelegate<unknown> | InternalComponentManager>(
+  const factory = getManager<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>(
     COMPONENT_MANAGERS,
     definition
   );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
new file mode 100644
index 00000000000..dc9c788f9d4
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -0,0 +1,618 @@
+import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import {
+  invokeHelper,
+  Helper,
+  helper,
+  Component as EmberComponent,
+  setHelperManager,
+  helperCapabilities,
+} from '@ember/-internals/glimmer';
+import { tracked, set } from '@ember/-internals/metal';
+import { getOwner } from '@ember/-internals/owner';
+import { EMBER_GLIMMER_INVOKE_HELPER, EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
+import Service, { inject as service } from '@ember/service';
+import { DEBUG } from '@glimmer/env';
+import { getValue } from '@glimmer/validator';
+import { destroy, isDestroyed, registerDestructor } from '@glimmer/runtime';
+
+if (EMBER_GLIMMER_INVOKE_HELPER) {
+  moduleFor(
+    'Helpers test: invokeHelper',
+    class extends RenderingTestCase {
+      '@test it works with a component'() {
+        class PlusOneHelper extends Helper {
+          compute([num]) {
+            return num + 1;
+          }
+        }
+
+        class PlusOne extends EmberComponent {
+          @tracked number;
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return {
+              positional: [this.number],
+            };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        this.registerComponent('plus-one', {
+          template: `{{this.value}}`,
+          ComponentClass: PlusOne,
+        });
+
+        this.render(`<PlusOne @number={{this.value}} />`, {
+          value: 4,
+        });
+
+        this.assertText('5');
+
+        runTask(() => this.rerender());
+
+        this.assertText('5');
+
+        runTask(() => set(this.context, 'value', 5));
+
+        this.assertText('6');
+      }
+
+      '@test it works with simple helpers'() {
+        let PlusOneHelper = helper(([num]) => num + 1);
+
+        class PlusOne extends EmberComponent {
+          @tracked number;
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return {
+              positional: [this.number],
+            };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        this.registerComponent('plus-one', {
+          template: `{{this.value}}`,
+          ComponentClass: PlusOne,
+        });
+
+        this.render(`<PlusOne @number={{this.value}} />`, {
+          value: 4,
+        });
+
+        this.assertText('5');
+
+        runTask(() => this.rerender());
+
+        this.assertText('5');
+
+        runTask(() => set(this.context, 'value', 5));
+
+        this.assertText('6');
+      }
+
+      '@test services can be injected if there is an owner'() {
+        let numberService;
+
+        this.registerService(
+          'number',
+          class extends Service {
+            constructor() {
+              super(...arguments);
+              numberService = this;
+            }
+
+            @tracked value = 4;
+          }
+        );
+
+        class PlusOneHelper extends Helper {
+          @service number;
+
+          compute() {
+            return this.number.value + 1;
+          }
+        }
+
+        class PlusOne extends EmberComponent {
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return {
+              positional: [this.number],
+            };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        this.registerComponent('plus-one', {
+          template: `{{this.value}}`,
+          ComponentClass: PlusOne,
+        });
+
+        this.render(`<PlusOne />`);
+
+        this.assertText('5');
+
+        runTask(() => this.rerender());
+
+        this.assertText('5');
+
+        runTask(() => (numberService.value = 5));
+
+        this.assertText('6');
+      }
+
+      '@test works if there is no owner'(assert) {
+        class PlusOneHelper extends Helper {
+          compute([num]) {
+            return num + 1;
+          }
+        }
+
+        class PlusOne {
+          constructor(number) {
+            this.number = number;
+          }
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return { positional: [this.number] };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        let instance = new PlusOne(4);
+
+        assert.notOk(getOwner(instance), 'no owner exists on the wrapper');
+        assert.equal(instance.value, 5, 'helper works without an owner');
+      }
+
+      '@test tracking for arguments works for tracked properties'(assert) {
+        let count = 0;
+
+        class PlusOneHelper extends Helper {
+          compute([num]) {
+            count++;
+            return num + 1;
+          }
+        }
+
+        class PlusOne {
+          @tracked number;
+
+          constructor(number) {
+            this.number = number;
+          }
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return { positional: [this.number] };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        let instance = new PlusOne(4);
+
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(count, 1, 'helper only called once');
+
+        instance.number = 5;
+
+        assert.equal(instance.value, 6, 'helper works');
+        assert.equal(count, 2, 'helper called a second time');
+      }
+
+      '@test computeArgs only called when consumed values change'(assert) {
+        let count = 0;
+
+        class PlusNHelper extends Helper {
+          compute([num], { n }) {
+            return num + n;
+          }
+        }
+
+        class PlusN {
+          @tracked number;
+          @tracked n;
+
+          constructor(number, n) {
+            this.number = number;
+            this.n = n;
+          }
+
+          plusOne = invokeHelper(this, PlusNHelper, () => {
+            count++;
+            return {
+              positional: [this.number],
+              named: {
+                n: this.n,
+              },
+            };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        let instance = new PlusN(4, 1);
+
+        assert.equal(count, 0, 'computeArgs not called yet');
+
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(count, 1, 'computeArgs only called once');
+
+        instance.number = 5;
+
+        assert.equal(instance.value, 6, 'helper works');
+        assert.equal(instance.value, 6, 'helper works');
+        assert.equal(count, 2, 'computeArgs called a second time');
+
+        instance.n = 5;
+
+        assert.equal(instance.value, 10, 'helper works');
+        assert.equal(instance.value, 10, 'helper works');
+        assert.equal(count, 3, 'computeArgs called a third time');
+      }
+
+      '@test helper updates based on internal state changes'(assert) {
+        let count = 0;
+        let helper;
+
+        class PlusOneHelper extends Helper {
+          @tracked number = 4;
+
+          constructor() {
+            super(...arguments);
+            helper = this;
+          }
+
+          compute() {
+            count++;
+            return this.number + 1;
+          }
+        }
+
+        class PlusOne {
+          plusOne = invokeHelper(this, PlusOneHelper);
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        let instance = new PlusOne();
+
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(count, 1, 'helper only called once');
+
+        helper.number = 5;
+
+        assert.equal(instance.value, 6, 'helper works');
+        assert.equal(count, 2, 'helper called a second time');
+      }
+
+      '@test helper that with constant args is constant'(assert) {
+        let count = 0;
+
+        class PlusOneHelper extends Helper {
+          compute([num]) {
+            count++;
+            return num + 1;
+          }
+        }
+
+        class PlusOne {
+          number;
+
+          constructor(number) {
+            this.number = number;
+          }
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return { positional: [this.number] };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        let instance = new PlusOne(4);
+
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(count, 1, 'helper only called once');
+
+        instance.number = 5;
+
+        assert.equal(instance.value, 5, 'helper works');
+        assert.equal(count, 1, 'helper not called a second time');
+      }
+
+      '@test helper destroys correctly when context object is destroyed'(assert) {
+        let context = {};
+        let instance;
+
+        class TestHelper extends Helper {
+          constructor() {
+            super(...arguments);
+            instance = this;
+          }
+        }
+
+        let cache = invokeHelper(context, TestHelper);
+
+        registerDestructor(context, () => assert.step('context'));
+        registerDestructor(cache, () => assert.step('cache'));
+        registerDestructor(instance, () => assert.step('instance'));
+
+        runTask(() => destroy(context));
+
+        assert.ok(isDestroyed(context), 'context destroyed');
+        assert.ok(isDestroyed(cache), 'cache destroyed');
+        assert.ok(isDestroyed(instance), 'instance destroyed');
+
+        assert.verifySteps(['instance', 'cache', 'context'], 'destructors ran in correct order');
+      }
+
+      '@test helper destroys correctly when helper cache is destroyed'(assert) {
+        let context = {};
+        let instance;
+
+        class TestHelper extends Helper {
+          constructor() {
+            super(...arguments);
+            instance = this;
+          }
+        }
+
+        let cache = invokeHelper(context, TestHelper);
+
+        registerDestructor(context, () => assert.step('context'));
+        registerDestructor(cache, () => assert.step('cache'));
+        registerDestructor(instance, () => assert.step('instance'));
+
+        runTask(() => destroy(cache));
+
+        assert.notOk(isDestroyed(context), 'context NOT destroyed');
+        assert.ok(isDestroyed(cache), 'cache destroyed');
+        assert.ok(isDestroyed(instance), 'instance destroyed');
+
+        assert.verifySteps(['instance', 'cache'], 'destructors ran in correct order');
+      }
+
+      '@test simple helper destroys correctly when context object is destroyed'(assert) {
+        let context = {};
+
+        let TestHelper = helper(() => {});
+        let cache = invokeHelper(context, TestHelper);
+
+        registerDestructor(context, () => assert.step('context'));
+        registerDestructor(cache, () => assert.step('cache'));
+
+        runTask(() => destroy(context));
+
+        assert.ok(isDestroyed(context), 'context destroyed');
+        assert.ok(isDestroyed(cache), 'cache destroyed');
+
+        assert.verifySteps(['cache', 'context'], 'destructors ran in correct order');
+      }
+
+      '@test throws an error if value is accessed after it is destroyed'() {
+        expectAssertion(() => {
+          let helper = invokeHelper({}, class extends Helper {});
+
+          runTask(() => destroy(helper));
+
+          getValue(helper);
+        }, /You attempted to get the value of a helper after the helper was destroyed, which is not allowed/);
+      }
+
+      '@test asserts if no context object is passed'() {
+        expectAssertion(() => {
+          invokeHelper(undefined, class extends Helper {});
+        }, /Expected a context object to be passed as the first parameter to invokeHelper, got undefined/);
+      }
+
+      '@test asserts if no manager exists for the helper definition'() {
+        expectAssertion(() => {
+          invokeHelper({}, class {});
+        }, /Expected a helper definition to be passed as the second parameter to invokeHelper, but no helper manager was found. The definition value that was passed was `\(unknown function\)`. Did you use setHelperManager to associate a helper manager with this value?/);
+      }
+    }
+  );
+}
+
+if (EMBER_GLIMMER_HELPER_MANAGER && EMBER_GLIMMER_INVOKE_HELPER) {
+  class TestHelperManager {
+    capabilities = helperCapabilities('3.23', {
+      hasValue: true,
+      hasDestroyable: true,
+    });
+
+    createHelper(Helper, args) {
+      return new Helper(args);
+    }
+
+    getValue(instance) {
+      return instance.value();
+    }
+
+    getDestroyable(instance) {
+      return instance;
+    }
+  }
+
+  class TestHelper {
+    constructor(args) {
+      this.args = args;
+
+      registerDestructor(this, () => this.willDestroy());
+    }
+
+    willDestroy() {}
+  }
+
+  setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
+
+  moduleFor(
+    'Helpers test: invokeHelper with custom helper managers',
+    class extends RenderingTestCase {
+      '@test it works with custom helper managers'() {
+        class PlusOneHelper extends TestHelper {
+          value() {
+            return this.args.positional[0] + 1;
+          }
+        }
+
+        class PlusOne extends EmberComponent {
+          @tracked number;
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return {
+              positional: [this.number],
+            };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        this.registerComponent('plus-one', {
+          template: `{{this.value}}`,
+          ComponentClass: PlusOne,
+        });
+
+        this.render(`<PlusOne @number={{this.value}} />`, {
+          value: 4,
+        });
+
+        this.assertText('5');
+
+        runTask(() => this.rerender());
+
+        this.assertText('5');
+
+        runTask(() => set(this.context, 'value', 5));
+
+        this.assertText('6');
+      }
+
+      '@test helper that accesses no args is constant'(assert) {
+        let count = 0;
+
+        class PlusOneHelper extends TestHelper {
+          value() {
+            count++;
+            return 123;
+          }
+        }
+
+        class PlusOne {
+          @tracked number;
+
+          constructor(number) {
+            this.number = number;
+          }
+
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return { positional: [this.number] };
+          });
+
+          get value() {
+            return getValue(this.plusOne);
+          }
+        }
+
+        let instance = new PlusOne(4);
+
+        assert.equal(instance.value, 123, 'helper works');
+        assert.equal(instance.value, 123, 'helper works');
+        assert.equal(count, 1, 'helper only called once');
+
+        instance.number = 5;
+
+        assert.equal(instance.value, 123, 'helper works');
+        assert.equal(count, 1, 'helper not called a second time');
+      }
+
+      '@test helper destroys correctly when context object is destroyed'(assert) {
+        let context = {};
+        let instance;
+
+        class MyTestHelper extends TestHelper {
+          constructor() {
+            super(...arguments);
+            instance = this;
+          }
+        }
+
+        let cache = invokeHelper(context, MyTestHelper);
+
+        registerDestructor(context, () => assert.step('context'));
+        registerDestructor(cache, () => assert.step('cache'));
+        registerDestructor(instance, () => assert.step('instance'));
+
+        runTask(() => destroy(context));
+
+        assert.ok(isDestroyed(context), 'context destroyed');
+        assert.ok(isDestroyed(cache), 'cache destroyed');
+        assert.ok(isDestroyed(instance), 'instance destroyed');
+
+        assert.verifySteps(['instance', 'cache', 'context'], 'destructors ran in correct order');
+      }
+
+      '@test args are frozen in debug builds'(assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+        } else {
+          class PlusOneHelper extends TestHelper {
+            value() {
+              this.args.foo = 123;
+            }
+          }
+
+          class PlusOne {
+            number;
+
+            constructor(number) {
+              this.number = number;
+            }
+
+            plusOne = invokeHelper(this, PlusOneHelper, () => {
+              return { positional: [this.number] };
+            });
+
+            get value() {
+              return getValue(this.plusOne);
+            }
+          }
+
+          let instance = new PlusOne(4);
+
+          assert.throws(
+            () => instance.value,
+            /TypeError: Cannot add property foo, object is not extensible/
+          );
+        }
+      }
+    }
+  );
+}
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 595761d2948..2d93607ea89 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -22,6 +22,7 @@ export const DEFAULT_FEATURES = {
   EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: true,
   EMBER_GLIMMER_HELPER_MANAGER: null,
+  EMBER_GLIMMER_INVOKE_HELPER: null,
 };
 
 /**
@@ -81,3 +82,4 @@ export const EMBER_GLIMMER_IN_ELEMENT = featureValue(FEATURES.EMBER_GLIMMER_IN_E
 export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
 export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
+export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f1c777877fe..5b1e1bc324d 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -11,6 +11,7 @@ import {
   FEATURES,
   isEnabled,
   EMBER_GLIMMER_HELPER_MANAGER,
+  EMBER_GLIMMER_INVOKE_HELPER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
   EMBER_CACHE_API,
   EMBER_DESTROYABLES,
@@ -112,6 +113,7 @@ import {
   helper,
   helperCapabilities,
   htmlSafe,
+  invokeHelper,
   isHTMLSafe,
   LinkComponent,
   setTemplates,
@@ -569,6 +571,9 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
   Ember._helperManagerCapabilities = helperCapabilities;
   Ember._setHelperManager = setHelperManager;
 }
+if (EMBER_GLIMMER_INVOKE_HELPER) {
+  Ember._invokeHelper = invokeHelper;
+}
 Ember._captureRenderTree = captureRenderTree;
 Ember.Handlebars = {
   template,
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index edd279a9af1..e7fe8069c6e 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -2,6 +2,7 @@ import Ember from '../index';
 import {
   FEATURES,
   EMBER_GLIMMER_HELPER_MANAGER,
+  EMBER_GLIMMER_INVOKE_HELPER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
 } from '@ember/canary-features';
 import { confirmExport } from 'internal-test-helpers';
@@ -236,6 +237,9 @@ let allExports = [
   EMBER_GLIMMER_HELPER_MANAGER
     ? ['_helperManagerCapabilities', '@ember/-internals/glimmer', 'helperCapabilities']
     : null,
+  EMBER_GLIMMER_INVOKE_HELPER
+    ? ['_invokeHelper', '@ember/-internals/glimmer', 'invokeHelper']
+    : null,
   ['_captureRenderTree', '@ember/debug', 'captureRenderTree'],
 
   // @ember/-internals/runtime

From 083927cee1743908dbc588eb4acf3e0271156537 Mon Sep 17 00:00:00 2001
From: Jonathan Haines <jonno.haines@gmail.com>
Date: Thu, 1 Oct 2020 13:02:20 +1000
Subject: [PATCH 0144/1405] Replace babel-eslint with @typescript-eslint/parser

---
 .eslintrc.js | 32 +++++++++--------------
 package.json |  2 --
 yarn.lock    | 74 ++++++++++++++++------------------------------------
 3 files changed, 35 insertions(+), 73 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 2996ea36066..c7ec3ec8816 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,10 +2,11 @@ const path = require('path');
 
 module.exports = {
   root: true,
-  parser: 'babel-eslint',
+  parser: '@typescript-eslint/parser',
   extends: [
     'eslint:recommended',
     'plugin:import/errors',
+    'plugin:import/typescript',
     'plugin:qunit/recommended',
     'plugin:prettier/recommended',
   ],
@@ -23,13 +24,10 @@ module.exports = {
   },
 
   settings: {
-    'import/core-modules': ['require', 'backburner', 'router', 'ember/version', 'node-module'],
-    'import/parsers': {
-      '@typescript-eslint/parser': ['.ts'],
-    },
+    'import/core-modules': ['require', 'backburner', 'router', '@glimmer/interfaces'],
     'import/resolver': {
       node: {
-        extensions: ['.js', '.ts'],
+        extensions: ['.js', '.ts', '.d.ts'],
         paths: [path.resolve('./packages/')],
       },
     },
@@ -37,14 +35,9 @@ module.exports = {
 
   overrides: [
     {
-      files: ['**/*.ts'],
+      files: ['*.ts'],
 
-      parser: '@typescript-eslint/parser',
-      extends: [
-        'plugin:@typescript-eslint/eslint-recommended',
-        'plugin:import/typescript',
-        'prettier/@typescript-eslint',
-      ],
+      extends: ['plugin:@typescript-eslint/recommended', 'prettier/@typescript-eslint'],
 
       parserOptions: {
         sourceType: 'module',
@@ -53,9 +46,11 @@ module.exports = {
       },
 
       rules: {
-        // the TypeScript compiler already takes care of this and
-        // leaving it enabled results in false positives for interface imports
-        'no-unused-vars': 'off',
+        '@typescript-eslint/ban-ts-comment': 'warn',
+        '@typescript-eslint/ban-types': 'warn',
+        '@typescript-eslint/no-empty-function': 'warn',
+        '@typescript-eslint/no-this-alias': 'warn',
+        '@typescript-eslint/no-var-requires': 'warn',
 
         // TODO: Enable and fix these rules
         // Typescript provides better types with these rules enabled
@@ -64,13 +59,10 @@ module.exports = {
         'prefer-rest-params': 'off',
 
         'import/export': 'off',
-        // TODO: Remove with typescript 3.8
-        // Use `import type` instead
-        'import/named': 'off',
-        'import/no-unresolved': 'off',
       },
     },
     {
+      // TODO: files: ['packages/**/*.[jt]s'],
       files: ['packages/**/*.js'],
 
       parserOptions: {
diff --git a/package.json b/package.json
index 97a66d7b0c5..22d242c0ffb 100644
--- a/package.json
+++ b/package.json
@@ -91,8 +91,6 @@
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.686.0",
-    "babel-eslint": "^10.1.0",
-    "babel-plugin-module-resolver": "^4.0.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.6.0",
     "broccoli-babel-transpiler": "^7.4.0",
diff --git a/yarn.lock b/yarn.lock
index 657b48d4fbc..ff6a531a37b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -298,7 +298,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.4.5", "@babel/parser@^7.7.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
+"@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
   version "7.9.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
   integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
@@ -847,7 +847,7 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
+"@babel/traverse@^7.4.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
   integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
@@ -877,7 +877,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
+"@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
   integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
@@ -1707,18 +1707,6 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-eslint@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
-  integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@babel/parser" "^7.7.0"
-    "@babel/traverse" "^7.7.0"
-    "@babel/types" "^7.7.0"
-    eslint-visitor-keys "^1.0.0"
-    resolve "^1.12.0"
-
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -1773,17 +1761,6 @@ babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
-babel-plugin-module-resolver@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.0.0.tgz#8f3a3d9d48287dc1d3b0d5595113adabd36a847f"
-  integrity sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==
-  dependencies:
-    find-babel-config "^1.2.0"
-    glob "^7.1.6"
-    pkg-up "^3.1.0"
-    reselect "^4.0.0"
-    resolve "^1.13.1"
-
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -3972,16 +3949,16 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
 eslint-config-prettier@^6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1"
-  integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA==
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
+  integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-import-resolver-node@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
-  integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
+eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
   dependencies:
     debug "^2.6.9"
     resolve "^1.13.1"
@@ -4018,16 +3995,16 @@ eslint-plugin-es@^3.0.0:
     regexpp "^3.0.0"
 
 eslint-plugin-import@^2.22.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e"
-  integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
+  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flat "^1.2.3"
     contains-path "^0.1.0"
     debug "^2.6.9"
     doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.3"
+    eslint-import-resolver-node "^0.3.4"
     eslint-module-utils "^2.6.0"
     has "^1.0.3"
     minimatch "^3.0.4"
@@ -4060,7 +4037,7 @@ eslint-plugin-qunit@^4.0.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-4.0.0.tgz#5945ba3434bfe8879bea195192e906701051cf01"
   integrity sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ==
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.0:
+eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -4082,7 +4059,7 @@ eslint-utils@^2.1.0:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
+eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
@@ -4098,9 +4075,9 @@ eslint-visitor-keys@^2.0.0:
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
 eslint@^7.9.0:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
-  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
+  version "7.10.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9"
+  integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.1.3"
@@ -4110,7 +4087,7 @@ eslint@^7.9.0:
     debug "^4.0.1"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
+    eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
     eslint-visitor-keys "^1.3.0"
     espree "^7.3.0"
@@ -4544,7 +4521,7 @@ finalhandler@^1.1.2, finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0, find-babel-config@^1.2.0:
+find-babel-config@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
@@ -4967,7 +4944,7 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
+glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -8014,11 +7991,6 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
-reselect@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7"
-  integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==
-
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -8068,7 +8040,7 @@ resolve@1.9.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==

From f6a5c78144504c763afd0937552944b509cef9b0 Mon Sep 17 00:00:00 2001
From: Jonathan Haines <jonno.haines@gmail.com>
Date: Thu, 1 Oct 2020 13:03:30 +1000
Subject: [PATCH 0145/1405] Enable 'import/export' with fix for multiple
 default exports

---
 .eslintrc.js                                      |  2 --
 .../-internals/metal/lib/injected_property.ts     | 15 +++++----------
 .../@ember/-internals/utils/lib/make-array.ts     |  8 +++++---
 packages/@ember/polyfills/lib/merge.ts            |  6 ++++--
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c7ec3ec8816..eed3a6fda7a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -57,8 +57,6 @@ module.exports = {
         'prefer-spread': 'off',
         'prefer-const': 'off',
         'prefer-rest-params': 'off',
-
-        'import/export': 'off',
       },
     },
     {
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index d6eb311b988..8fa15c94b33 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -31,21 +31,14 @@ export interface InjectedPropertyOptions {
          to the property's name
   @private
 */
-export default function inject(
-  type: string,
-  name: string,
-  options?: InjectedPropertyOptions
-): Decorator;
-export default function inject(
+function inject(type: string, name: string, options?: InjectedPropertyOptions): Decorator;
+function inject(
   type: string,
   target: object,
   key: string,
   desc: DecoratorPropertyDescriptor
 ): DecoratorPropertyDescriptor;
-export default function inject(
-  type: string,
-  ...args: any[]
-): Decorator | DecoratorPropertyDescriptor {
+function inject(type: string, ...args: any[]): Decorator | DecoratorPropertyDescriptor {
   assert('a string type must be provided to inject', typeof type === 'string');
 
   let calledAsDecorator = isElementDescriptor(args);
@@ -87,3 +80,5 @@ export default function inject(
     return decorator;
   }
 }
+
+export default inject;
diff --git a/packages/@ember/-internals/utils/lib/make-array.ts b/packages/@ember/-internals/utils/lib/make-array.ts
index 9fb59796c12..aff0302e4a3 100644
--- a/packages/@ember/-internals/utils/lib/make-array.ts
+++ b/packages/@ember/-internals/utils/lib/make-array.ts
@@ -29,11 +29,13 @@ const { isArray } = Array;
  @return {Array}
  @private
  */
-export default function makeArray<T>(obj: T[]): T[];
-export default function makeArray<T>(obj: T): T[];
-export default function makeArray(obj: any | null | undefined): Array<any | null | undefined> {
+function makeArray<T>(obj: T[]): T[];
+function makeArray<T>(obj: T): T[];
+function makeArray(obj: any | null | undefined): Array<any | null | undefined> {
   if (obj === null || obj === undefined) {
     return [];
   }
   return isArray(obj) ? obj : [obj];
 }
+
+export default makeArray;
diff --git a/packages/@ember/polyfills/lib/merge.ts b/packages/@ember/polyfills/lib/merge.ts
index d087eb82143..95dacb7cb7d 100644
--- a/packages/@ember/polyfills/lib/merge.ts
+++ b/packages/@ember/polyfills/lib/merge.ts
@@ -4,7 +4,7 @@ import { deprecate } from '@ember/debug';
  @module @ember/polyfills
 */
 
-export default function merge<T, U>(original: T, updates: U): T & U;
+function merge<T, U>(original: T, updates: U): T & U;
 
 /**
   Merge the contents of two objects together into the first object.
@@ -27,7 +27,7 @@ export default function merge<T, U>(original: T, updates: U): T & U;
   @deprecated
   @public
 */
-export default function merge(original: object, updates: object) {
+function merge(original: object, updates: object) {
   deprecate('Use of `merge` has been deprecated. Please use `assign` instead.', false, {
     id: 'ember-polyfills.deprecate-merge',
     until: '4.0.0',
@@ -48,3 +48,5 @@ export default function merge(original: object, updates: object) {
 
   return original;
 }
+
+export default merge;

From fb7022b8f4af64534470b002fe91a4da9b9d96b5 Mon Sep 17 00:00:00 2001
From: Rishikesh Yadav <54662528+rishikesh7355@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:12:58 +0530
Subject: [PATCH 0146/1405] Update README.md

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0c431c8d8c7..9c1bca36f01 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@
 
 </p>
 
+# About 
 **Ember.js** is a JavaScript framework that greatly reduces the time, effort and resources needed to build any web application. It is focused on making you, the developer, as productive as possible by doing all the common, repetitive, yet essential, tasks involved in most web development projects.
 
 With Ember, you get all of these things:
@@ -31,7 +32,7 @@ With Ember, you get all of these things:
 
 
 
-Find out more: 
+## Find out more: 
 
 - [Website](https://emberjs.com)
 - [Guides](https://guides.emberjs.com)
@@ -40,7 +41,7 @@ Find out more:
 - [Blog](https://emberjs.com/blog)
 - [Builds](https://emberjs.com/builds)
 
-# Contribution
+## Contributions
 
 See [CONTRIBUTING.md](https://github.com/emberjs/ember.js/blob/master/CONTRIBUTING.md)
 

From 9a0d9a73ca82faea20ee18950c0b07cd4b71e859 Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Thu, 1 Oct 2020 11:03:24 -0400
Subject: [PATCH 0147/1405] Apply suggestions from code review

Co-authored-by: Jonathan Haines <jonno.haines@gmail.com>
---
 .eslintrc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index eed3a6fda7a..1afb795562b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -47,9 +47,9 @@ module.exports = {
 
       rules: {
         '@typescript-eslint/ban-ts-comment': 'warn',
-        '@typescript-eslint/ban-types': 'warn',
-        '@typescript-eslint/no-empty-function': 'warn',
-        '@typescript-eslint/no-this-alias': 'warn',
+        '@typescript-eslint/ban-types': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/no-this-alias': 'off',
         '@typescript-eslint/no-var-requires': 'warn',
 
         // TODO: Enable and fix these rules

From b612d47c2138f9b430f1ea5550301359f8ff3ed1 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 1 Oct 2020 12:42:26 -0700
Subject: [PATCH 0148/1405] [BUGFIX lts] Allow computeds to have cycles in
 their deps

The bugfix for disallowed cycles in tracked props in #19138 attempted
to also narrow the number of cycles that are allowed in general. Cycles
should only be allowed for computed property deps, for legacy support
reasons. The logic to allow cycles for these tags in particular was
mistakenly added to `setup`, which runs on the _prototype_ of the class.
This meant that _instance_ computed props were not allowed to have
cycles, and this was causing failures in the ecosystem.

Added a test that failed and is fixed with this change. I also attempted
to create a cycle with `@alias` since it uses a different
implementation, but I wasn't able to create one which didn't result in
a Maximum Callstack style recursion error, so I think it's just not
possible at all anyways, since `@alias` is eager always and never
caches.
---
 .../@ember/-internals/metal/lib/computed.ts   | 12 ++++++----
 .../tests/system/object/computed_test.js      | 24 +++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index f5850f23474..bbbe2af1f6e 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -323,10 +323,6 @@ export class ComputedProperty extends ComputedDescriptor {
       )
     );
 
-    if (DEBUG) {
-      ALLOW_CYCLES!.set(tagFor(obj, keyName), true);
-    }
-
     if (this._hasConfig === false) {
       assert(
         `Attempted to use @computed on ${keyName}, but it did not have a getter or a setter. You must either pass a get a function or getter/setter to @computed directly (e.g. \`@computed({ get() { ... } })\`) or apply @computed directly to a getter/setter`,
@@ -408,6 +404,10 @@ export class ComputedProperty extends ComputedDescriptor {
 
       if (_dependentKeys !== undefined) {
         updateTag(propertyTag!, getChainTagsForKeys(obj, _dependentKeys, tagMeta, meta));
+
+        if (DEBUG) {
+          ALLOW_CYCLES!.set(propertyTag, true);
+        }
       }
 
       meta.setValueFor(keyName, ret);
@@ -483,6 +483,10 @@ export class ComputedProperty extends ComputedDescriptor {
 
       if (_dependentKeys !== undefined) {
         updateTag(propertyTag, getChainTagsForKeys(obj, _dependentKeys, tagMeta, meta));
+
+        if (DEBUG) {
+          ALLOW_CYCLES!.set(propertyTag, true);
+        }
       }
 
       meta.setRevisionFor(keyName, valueForTag(propertyTag));
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
index 40078e3fe59..369dcc40261 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
@@ -6,6 +6,7 @@ import {
   getWithDefault,
   observer,
   defineProperty,
+  notifyPropertyChange,
 } from '@ember/-internals/metal';
 import { oneWay as reads } from '@ember/object/computed';
 import { A as EmberArray, isArray } from '../../..';
@@ -540,5 +541,28 @@ moduleFor(
 
       assert.ok(true);
     }
+
+    ['@test computeds can have cycles'](assert) {
+      class CycleObject {
+        // eslint-disable-next-line getter-return
+        @computed('bar')
+        get foo() {}
+
+        // eslint-disable-next-line getter-return
+        @computed('foo')
+        get bar() {}
+      }
+
+      let obj = new CycleObject();
+
+      obj.bar;
+      obj.foo;
+
+      notifyPropertyChange(obj, 'bar');
+
+      obj.foo;
+
+      assert.ok(true);
+    }
   }
 );

From ed459609cb6b79036949755f0c0d2ff001efc270 Mon Sep 17 00:00:00 2001
From: Rishikesh Yadav <54662528+rishikesh7355@users.noreply.github.com>
Date: Fri, 2 Oct 2020 22:11:57 +0530
Subject: [PATCH 0149/1405] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9c1bca36f01..67bbdac696b 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@
 
 </p>
 
-# About 
 **Ember.js** is a JavaScript framework that greatly reduces the time, effort and resources needed to build any web application. It is focused on making you, the developer, as productive as possible by doing all the common, repetitive, yet essential, tasks involved in most web development projects.
 
 With Ember, you get all of these things:
@@ -32,7 +31,7 @@ With Ember, you get all of these things:
 
 
 
-## Find out more: 
+- Find out more: 
 
 - [Website](https://emberjs.com)
 - [Guides](https://guides.emberjs.com)

From b3d075fa0324b506d4debbd3accf38b24234a559 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Sat, 3 Oct 2020 02:33:47 -0400
Subject: [PATCH 0150/1405] Rotated browserstack access key

The old key was in plain text in the repo, the new key is stored via GitHub Secrets.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e08a2826cb8..0b7d9799408 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,7 @@ jobs:
       - name: test:browserstack
         env:
           BROWSERSTACK_USERNAME: emberjscoreteam1
-          BROWSERSTACK_ACCESS_KEY: YsPxXKcahx9XszyHS2Gr
+          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
         run: yarn test:browserstack
 
   production-test:

From 5becf8846a00a1be254cb777c31258f5f8b86c54 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Sat, 3 Oct 2020 10:07:36 -0400
Subject: [PATCH 0151/1405] Keep browserstack key in plaintext

It turns out this was intentional. The key has no privileged access to anything in our case, and it needs to be in plaintext if we want to run browserstack against PRs.
---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0b7d9799408..fdee4c55d08 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -88,7 +88,9 @@ jobs:
       - name: test:browserstack
         env:
           BROWSERSTACK_USERNAME: emberjscoreteam1
-          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
+          # This is in plaintext on purpose. It has no privileged access to anything (this is a free
+          # account) and it allows us to run browserstack tests against PRs.
+          BROWSERSTACK_ACCESS_KEY: o5LNEdygq1SP4L9kst4s
         run: yarn test:browserstack
 
   production-test:

From efd895f493ca1f3984cec6e0c37061c177c3903a Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 3 Oct 2020 08:47:09 -0700
Subject: [PATCH 0152/1405] [FEAT] Enables Helper Managers and `invokeHelper`

Enables the Helper Manager and `invokeHelper` feature flags, and adds
API documentation for them.
---
 .../-internals/glimmer/lib/helpers/custom.ts  | 305 +++++++++++++++++-
 .../integration/helpers/invoke-helper-test.js |  15 +-
 packages/@ember/canary-features/index.ts      |   4 +-
 tests/docs/expected.js                        |   3 +
 4 files changed, 316 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
index bf1b1e17bd5..6de5bc7d427 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
@@ -16,6 +16,10 @@ import { Cache, createCache, getValue } from '@glimmer/validator';
 import { argsProxyFor } from '../utils/args-proxy';
 import { buildCapabilities, getHelperManager, InternalCapabilities } from '../utils/managers';
 
+/**
+@module @ember/helper
+*/
+
 export type HelperDefinition = object;
 
 export interface HelperCapabilities extends InternalCapabilities {
@@ -24,6 +28,58 @@ export interface HelperCapabilities extends InternalCapabilities {
   hasScheduledEffect: boolean;
 }
 
+/**
+  `capabilities` returns a capabilities configuration which can be used to modify
+  the behavior of the manager. Manager capabilities _must_ be provided using the
+  `capabilities` function, as the underlying implementation can change over time.
+
+  The first argument to capabilities is a version string, which is the version of
+  Ember that the capabilities were defined in. Ember can add new versions at any
+  time, and these may have entirely different behaviors, but it will not remove
+  old versions until the next major version.
+
+  ```js
+  capabilities('3.23');
+  ```
+
+  The second argument is an object of capabilities and boolean values indicating
+  whether they are enabled or disabled.
+
+  ```js
+  capabilities('3.23', {
+    hasValue: true,
+    hasDestructor: true,
+  });
+  ```
+
+  If no value is specified, then the default value will be used.
+
+  ### `3.23` capabilities
+
+  #### `hasDestroyable`
+
+  - Default value: false
+
+  Determines if the helper has a destroyable to include in the destructor
+  hierarchy. If enabled, the `getDestroyable` hook will be called, and its result
+  will be associated with the destroyable parent block.
+
+  #### `hasValue`
+
+  - Default value: false
+
+  Determines if the helper has a value which can be used externally. The helper's
+  `getValue` hook will be run whenever the value of the helper is accessed if this
+  capability is enabled.
+
+  @method capabilities
+  @for @ember/helper
+  @static
+  @param {String} managerApiVersion The version of capabilities that are being used
+  @param options The capabilities values
+  @return {Capabilities} The capabilities object instance
+  @public
+*/
 export function helperCapabilities(
   managerAPI: string,
   options: Partial<HelperCapabilities> = {}
@@ -48,6 +104,198 @@ export function helperCapabilities(
   });
 }
 
+/**
+  Sets the helper manager for an object or function.
+
+  ```js
+  setHelperManager((owner) => new ClassHelperManager(owner), Helper)
+  ```
+
+  When a value is used as a helper in a template, the helper manager is looked up
+  on the object by walking up its prototype chain and finding the first helper
+  manager. This manager then receives the value and can create and manage an
+  instance of a helper from it. This provides a layer of indirection that allows
+  users to design high-level helper APIs, without Ember needing to worry about the
+  details. High-level APIs can be experimented with and iterated on while the
+  core of Ember helpers remains stable, and new APIs can be introduced gradually
+  over time to existing code bases.
+
+  `setHelperManager` receives two arguments:
+
+  1. A factory function, which receives the `owner` and returns an instance of a
+    helper manager.
+  2. A helper definition, which is the object or function to associate the factory function with.
+
+  The first time the object is looked up, the factory function will be called to
+  create the helper manager. It will be cached, and in subsequent lookups the
+  cached helper manager will be used instead.
+
+  Only one helper manager is guaranteed to exist per `owner` and per usage of
+  `setHelperManager`, so many helpers will end up using the same instance of the
+  helper manager. As such, you should only store state that is related to the
+  manager itself. If you want to store state specific to a particular helper
+  definition, you should assign a unique helper manager to that helper. In
+  general, most managers should either be stateless, or only have the `owner` they
+  were created with as state.
+
+  Helper managers must fulfill the following interface (This example uses
+  [TypeScript interfaces](https://www.typescriptlang.org/docs/handbook/interfaces.html)
+  for precision, you do not need to write helper managers using TypeScript):
+
+  ```ts
+  interface HelperManager<HelperStateBucket> {
+    capabilities: HelperCapabilities;
+
+    createHelper(definition: HelperDefinition, args: TemplateArgs): HelperStateBucket;
+
+    getValue?(bucket: HelperStateBucket): unknown;
+
+    runEffect?(bucket: HelperStateBucket): void;
+
+    getDestroyable?(bucket: HelperStateBucket): object;
+  }
+  ```
+
+  The capabilities property _must_ be provided using the `capabilities()` function
+  imported from the same module as `setHelperManager`:
+
+  ```js
+  import { capabilities } from '@ember/helper';
+
+  class MyHelperManager {
+    capabilities = capabilities('3.21.0', { hasValue: true });
+
+    // ...snip...
+  }
+  ```
+
+  Below is a description of each of the methods on the interface and their
+  functions.
+
+  #### `createHelper`
+
+  `createHelper` is a required hook on the HelperManager interface. The hook is
+  passed the definition of the helper that is currently being created, and is
+  expected to return a _state bucket_. This state bucket is what represents the
+  current state of the helper, and will be passed to the other lifecycle hooks at
+  appropriate times. It is not necessarily related to the definition of the
+  helper itself - for instance, you could return an object _containing_ an
+  instance of the helper:
+
+  ```js
+  class MyManager {
+    createHelper(Definition, args) {
+      return {
+        instance: new Definition(args);
+      };
+    }
+  }
+  ```
+
+  This allows the manager to store metadata that it doesn't want to expose to the
+  user.
+
+  This hook is _not_ autotracked - changes to tracked values used within this hook
+  will _not_ result in a call to any of the other lifecycle hooks. This is because
+  it is unclear what should happen if it invalidates, and rather than make a
+  decision at this point, the initial API is aiming to allow as much expressivity
+  as possible. This could change in the future with changes to capabilities and
+  their behaviors.
+
+  If users do want to autotrack some values used during construction, they can
+  either create the instance of the helper in `runEffect` or `getValue`, or they
+  can use the `cache` API to autotrack the `createHelper` hook themselves. This
+  provides maximum flexibility and expressiveness to manager authors.
+
+  This hook has the following timing semantics:
+
+  **Always**
+  - called as discovered during DOM construction
+  - called in definition order in the template
+
+  #### `getValue`
+
+  `getValue` is an optional hook that should return the value of the helper. This
+  is the value that is returned from the helper and passed into the template.
+
+  This hook is called when the value is requested from the helper (e.g. when the
+  template is rendering and the helper value is needed). The hook is autotracked,
+  and will rerun whenever any tracked values used inside of it are updated.
+  Otherwise it does not rerun.
+
+  > Note: This means that arguments which are not _consumed_ within the hook will
+  > not trigger updates.
+
+  This hook is only called for helpers with the `hasValue` capability enabled.
+  This hook has the following timing semantics:
+
+  **Always**
+  - called the first time the helper value is requested
+  - called after autotracked state has changed
+
+  **Never**
+  - called if the `hasValue` capability is disabled
+
+  #### `runEffect`
+
+  `runEffect` is an optional hook that should run the effect that the helper is
+  applying, setting it up or updating it.
+
+  This hook is scheduled to be called some time after render and prior to paint.
+  There is not a guaranteed, 1-to-1 relationship between a render pass and this
+  hook firing. For instance, multiple render passes could occur, and the hook may
+  only trigger once. It may also never trigger if it was dirtied in one render
+  pass and then destroyed in the next.
+
+  The hook is autotracked, and will rerun whenever any tracked values used inside
+  of it are updated. Otherwise it does not rerun.
+
+  The hook is also run during a time period where state mutations are _disabled_
+  in Ember. Any tracked state mutation will throw an error during this time,
+  including changes to tracked properties, changes made using `Ember.set`, updates
+  to computed properties, etc. This is meant to prevent infinite rerenders and
+  other antipatterns.
+
+  This hook is only called for helpers with the `hasScheduledEffect` capability
+  enabled. This hook is also not called in SSR currently, though this could be
+  added as a capability in the future. It has the following timing semantics:
+
+  **Always**
+  - called after the helper was first created, if the helper has not been
+    destroyed since creation
+  - called after autotracked state has changed, if the helper has not been
+    destroyed during render
+
+  **Never**
+  - called if the `hasScheduledEffect` capability is disabled
+  - called in SSR
+
+  #### `getDestroyable`
+
+  `getDestroyable` is an optional hook that users can use to register a
+  destroyable object for the helper. This destroyable will be registered to the
+  containing block or template parent, and will be destroyed when it is destroyed.
+  See the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md)
+  for more details.
+
+  `getDestroyable` is only called if the `hasDestroyable` capability is enabled.
+
+  This hook has the following timing semantics:
+
+  **Always**
+  - called immediately after the `createHelper` hook is called
+
+  **Never**
+  - called if the `hasDestroyable` capability is disabled
+
+  @method setHelperManager
+  @for @ember/helper
+  @static
+  @param {Function} factory A factory function which receives an optional owner, and returns a helper manager
+  @param {object} definition The definition to associate the manager factory with
+  @return {object} The definition passed into setHelperManager
+  @public
+*/
 export interface HelperManager<HelperStateBucket = unknown> {
   capabilities: HelperCapabilities;
 
@@ -106,10 +354,65 @@ class SimpleArgsProxy {
   }
 }
 
+/**
+  The `invokeHelper` function can be used to create a helper instance in
+  JavaScript.
+
+  ```js
+  // app/components/data-loader.js
+  import Component from '@glimmer/component';
+  import Helper from '@ember/component/helper';
+  import { invokeHelper } from '@ember/helper';
+
+  class PlusOne extends Helper {
+    compute([num]) {
+      return number + 1;
+    }
+  }
+
+  export default class PlusOne extends Component {
+    plusOne = invokeHelper(this, RemoteData, () => {
+      return {
+        positional: [this.args.number],
+      };
+    });
+  }
+  ```
+  ```hbs
+  {{this.plusOne.value}}
+  ```
+
+  It receives three arguments:
+
+  * `context`: The parent context of the helper. When the parent is torn down and
+    removed, the helper will be as well.
+  * `definition`: The definition of the helper.
+  * `computeArgs`: An optional function that produces the arguments to the helper.
+    The function receives the parent context as an argument, and must return an
+    object with a `positional` property that is an array and/or a `named`
+    property that is an object.
+
+  And it returns a Cache instance that contains the most recent value of the
+  helper. You can access the helper using `getValue()` like any other cache. The
+  cache is also destroyable, and using the `destroy()` function on it will cause
+  the helper to be torn down.
+
+  Note that using `getValue()` on helpers that have scheduled effects will not
+  trigger the effect early. Effects will continue to run at their scheduled time.
+
+  @method invokeHelper
+  @for @ember/helper
+  @static
+  @param {object} context The parent context of the helper
+  @param {object} definition The helper definition
+  @param {Function} computeArgs An optional function that produces args
+  @returns
+  @public
+*/
 export function invokeHelper(
   context: object,
   definition: HelperDefinition,
-  computeArgs: (context: object) => Partial<Arguments>
+  computeArgs?: (context: object) => Partial<Arguments>
 ): Cache<unknown> {
   assert(
     `Expected a context object to be passed as the first parameter to invokeHelper, got ${context}`,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index dc9c788f9d4..facc5ef9ad3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -433,7 +433,7 @@ if (EMBER_GLIMMER_INVOKE_HELPER) {
       '@test asserts if no manager exists for the helper definition'() {
         expectAssertion(() => {
           invokeHelper({}, class {});
-        }, /Expected a helper definition to be passed as the second parameter to invokeHelper, but no helper manager was found. The definition value that was passed was `\(unknown function\)`. Did you use setHelperManager to associate a helper manager with this value?/);
+        }, /Expected a helper definition to be passed as the second parameter to invokeHelper, but no helper manager was found. The definition value that was passed was `.*`. Did you use setHelperManager to associate a helper manager with this value?/);
       }
     }
   );
@@ -583,9 +583,12 @@ if (EMBER_GLIMMER_HELPER_MANAGER && EMBER_GLIMMER_INVOKE_HELPER) {
         if (!DEBUG) {
           assert.expect(0);
         } else {
+          assert.expect(1);
+
           class PlusOneHelper extends TestHelper {
             value() {
-              this.args.foo = 123;
+              assert.ok(Object.isFrozen(this.args), 'args are frozen');
+              return 123;
             }
           }
 
@@ -605,12 +608,8 @@ if (EMBER_GLIMMER_HELPER_MANAGER && EMBER_GLIMMER_INVOKE_HELPER) {
             }
           }
 
-          let instance = new PlusOne(4);
-
-          assert.throws(
-            () => instance.value,
-            /TypeError: Cannot add property foo, object is not extensible/
-          );
+          // get the value to trigger the assertion
+          new PlusOne(4).value;
         }
       }
     }
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 2d93607ea89..2e8deea3cb9 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -21,8 +21,8 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_IN_ELEMENT: true,
   EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: true,
-  EMBER_GLIMMER_HELPER_MANAGER: null,
-  EMBER_GLIMMER_INVOKE_HELPER: null,
+  EMBER_GLIMMER_HELPER_MANAGER: true,
+  EMBER_GLIMMER_INVOKE_HELPER: true,
 };
 
 /**
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index a6dce1dc197..f0e0e5ae1c2 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -116,6 +116,7 @@ module.exports = {
     'canInvoke',
     'cancel',
     'cancelRouterSetup',
+    'capabilities',
     'capitalize',
     'captureRenderTree',
     'catalogEntriesByType',
@@ -302,6 +303,7 @@ module.exports = {
     'intermediateTransitionTo',
     'intersect',
     'invoke',
+    'invokeHelper',
     'isActive',
     'isActiveIntent',
     'isAny',
@@ -517,6 +519,7 @@ module.exports = {
     'setDiff',
     'setEach',
     'setEngineParent',
+    'setHelperManager',
     'setObjects',
     'setOwner',
     'setProperties',

From ed4e02ed7e97dca6fdaf5ffc0ac88f87991f8a82 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Sun, 4 Oct 2020 17:56:30 +0100
Subject: [PATCH 0153/1405] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 67bbdac696b..28089f14f35 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ With Ember, you get all of these things:
 
 
 
-- Find out more: 
+Find out more: 
 
 - [Website](https://emberjs.com)
 - [Guides](https://guides.emberjs.com)

From e2a6babc5fcca17f58343997854c558b5b5f1dd5 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 5 Oct 2020 15:28:53 -0400
Subject: [PATCH 0154/1405] Add v3.22.0 to CHANGELOG

(cherry picked from commit 388d5c381a48c409ace0ac38f4dd35109fe8f0a2)
---
 CHANGELOG.md | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb6a77c62a2..70ed3c03fac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,14 @@
 # Ember Changelog
 
-### v3.22.0-beta.5 (September 30, 2020)
-
-- [#19172](https://github.com/emberjs/ember.js/pull/19172) [BUGFIX] Ensures that tracked properties initialize property
-
-### v3.22.0-beta.4 (September 30, 2020)
-
-- [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters
-- [#19094](https://github.com/emberjs/ember.js/pull/19094) [BUGFIX] Fix RouterService#isActive() to work with tracking 
-- [#19163](https://github.com/emberjs/ember.js/pull/19163) [BUGFIX] Use args proxy for modifier managers.
-- [#19164](https://github.com/emberjs/ember.js/pull/19164) [BUGFIX] Entangles custom EmberArray implementations when accessed with `Ember.get`
-- [#19170](https://github.com/emberjs/ember.js/pull/19170) [BUGFIX] Make modifier manager 3.22 accept the resolved value directly.
-
-### v3.22.0-beta.3 (September 09, 2020)
-
-- [#19124](https://github.com/emberjs/ember.js/pull/19124) Fix rendering engine usage within a `fastboot` sandbox
-
-### v3.22.0-beta.2 (August 31, 2020)
-
-- [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.
-- [#19111](https://github.com/emberjs/ember.js/pull/19111) [BUGFIX] Fixes `ArrayProxy` length reactivity.
-
-### v3.22.0-beta.1 (August 24, 2020)
+### v3.22.0 (October 5, 2020)
 
 - [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).
 - [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
 - [#19086](https://github.com/emberjs/ember.js/pull/19086) [FEATURE] Pass transition object to activate/deactivate hooks and events
+- [#19094](https://github.com/emberjs/ember.js/pull/19094) [BUGFIX] Fix RouterService#isActive() to work with tracking 
+- [#19163](https://github.com/emberjs/ember.js/pull/19163) [BUGFIX] Use args proxy for modifier managers.
+- [#19170](https://github.com/emberjs/ember.js/pull/19170) [BUGFIX] Make modifier manager 3.22 accept the resolved value directly.
+- [#19124](https://github.com/emberjs/ember.js/pull/19124) [BUGFIX] Fix rendering engine usage within a `fastboot` sandbox
 
 ### v3.21.3 (September 30, 2020)
 

From c79a57ae3732d461aba234b2bd78d9fb4e90f862 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 5 Oct 2020 17:16:28 -0400
Subject: [PATCH 0155/1405] Add v3.23.0-beta.1 to CHANGELOG

(cherry picked from commit dd71cbb7d8b895979e93cdcb3ac1cba3ddc3bab3)
---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70ed3c03fac..a9010975277 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Ember Changelog
 
+### v3.23.0-beta.1 (October 5, 2020)
+
+- [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).
+- [#19171](https://github.com/emberjs/ember.js/pull/19171) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements `invokeHelper` from the [JavaScript Helper Invocation API RFC](https://github.com/emberjs/rfcs/blob/master/text/0626-invoke-helper.md).
+- [#19148](https://github.com/emberjs/ember.js/pull/19148) / [#19119](https://github.com/emberjs/ember.js/pull/19119) Update rendering engine to `@glimmer/*` 0.62.1 
+- [#19122](https://github.com/emberjs/ember.js/pull/19122) [BUGFIX] Prevents dynamic invocations of string values when referenced directly in angle brackets
+- [#19136](https://github.com/emberjs/ember.js/pull/19136) [BUGFIX] Update router microlib to improve Transition related debugging
+- [#19173](https://github.com/emberjs/ember.js/pull/19173) [BUGFIX] Enforce usage of `capabilities` generation.
+
 ### v3.22.0 (October 5, 2020)
 
 - [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).

From 7f8146bf6c152f291a4070fbbdfd1342b9ff7607 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 5 Oct 2020 17:18:35 -0400
Subject: [PATCH 0156/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 22d242c0ffb..11ca987744b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.23.0",
+  "version": "3.24.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 4b58d27918cfa3d02794674b077699aed56239be Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 5 Oct 2020 15:26:51 -0700
Subject: [PATCH 0157/1405] [FEATURE modernized-built-in-components] Add
 feature flag

---
 packages/@ember/canary-features/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 2e8deea3cb9..98bdcdf2cde 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -23,6 +23,7 @@ export const DEFAULT_FEATURES = {
   EMBER_DESTROYABLES: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
 };
 
 /**
@@ -52,10 +53,10 @@ export const FEATURES = assign(DEFAULT_FEATURES, ENV.FEATURES);
   @public
 */
 export function isEnabled(feature: string): boolean {
-  let featureValue = FEATURES[feature];
+  let value = FEATURES[feature];
 
-  if (featureValue === true || featureValue === false) {
-    return featureValue;
+  if (value === true || value === false) {
+    return value;
   } else if (ENV.ENABLE_OPTIONAL_FEATURES) {
     return true;
   } else {
@@ -83,3 +84,6 @@ export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
 export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
+export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
+  FEATURES.EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+);

From 8c3c1d7a1012ea7a04e1f05302e3c9abe7c7f044 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 5 Oct 2020 16:31:59 -0700
Subject: [PATCH 0158/1405] [FEATURE modernized-built-in-components] Start
 adding deprecations

This implements some of the deprecations proposed in [RFC #671][1].
The deprecations are gated behind the feature flag so they won't be
visible until the RFC is merged and the feature is enabled.

[1]: https://github.com/emberjs/rfcs/pull/671
---
 packages/ember/index.js                | 44 ++++++++++++++++++---
 packages/ember/tests/reexports_test.js | 53 +++++++++++++++++++++++---
 2 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index 5b1e1bc324d..488a3a1cdcc 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -15,6 +15,7 @@ import {
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
   EMBER_CACHE_API,
   EMBER_DESTROYABLES,
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
@@ -554,10 +555,44 @@ Object.defineProperty(Ember, 'BOOTED', {
 Ember.Component = Component;
 Helper.helper = helper;
 Ember.Helper = Helper;
-Ember.Checkbox = Checkbox;
-Ember.TextField = TextField;
-Ember.TextArea = TextArea;
-Ember.LinkComponent = LinkComponent;
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  [
+    ['Checkbox', '@ember/component/checkbox', Checkbox],
+    ['TextField', '@ember/component/text-field', TextField],
+    ['TextArea', '@ember/component/text-area', TextArea],
+    ['LinkComponent', '@ember/routing/link-component', LinkComponent],
+    ['TextSupport', '@ember/-internals/views', views.TextSupport],
+  ].forEach(([name, path, value]) => {
+    Object.defineProperty(Ember, name, {
+      get() {
+        deprecate(
+          `Using Ember.${name} or importing from '${path}' has been deprecated, install the ` +
+            `\`ember-legacy-built-in-components\` addon and use \`import { ${name} } from ` +
+            `'ember-legacy-built-in-components';\` instead`,
+          false,
+          {
+            id: 'ember.legacy-built-in-components',
+            until: '4.0.0',
+          }
+        );
+
+        return value;
+      },
+
+      configurable: true,
+      enumerable: true,
+    });
+
+    // Expose a non-deprecated version for tests and the ember-legacy-built-in-components addon
+    Ember[`_Legacy${name}`] = value;
+  });
+} else {
+  Ember.Checkbox = Checkbox;
+  Ember.TextField = TextField;
+  Ember.TextArea = TextArea;
+  Ember.LinkComponent = LinkComponent;
+  Ember.TextSupport = views.TextSupport;
+}
 Ember._setComponentManager = setComponentManager;
 Ember._componentManagerCapabilities = capabilities;
 Ember._setModifierManager = setModifierManager;
@@ -652,7 +687,6 @@ Ember.ViewUtils = {
   getChildViews: views.getChildViews,
   isSerializationFirstNode: isSerializationFirstNode,
 };
-Ember.TextSupport = views.TextSupport;
 Ember.ComponentLookup = views.ComponentLookup;
 Ember.EventDispatcher = views.EventDispatcher;
 
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index e7fe8069c6e..ab0da3577be 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,9 +1,11 @@
 import Ember from '../index';
+import require from 'require';
 import {
   FEATURES,
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
 import { confirmExport } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
@@ -26,6 +28,47 @@ moduleFor(
       });
     }
 
+    ['@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) deprecated built-in components'](assert) {
+      [
+        ['Checkbox', '@ember/component/checkbox', '@ember/-internals/glimmer'],
+        ['TextField', '@ember/component/text-field', '@ember/-internals/glimmer'],
+        ['TextArea', '@ember/component/text-area', '@ember/-internals/glimmer'],
+        ['LinkComponent', '@ember/routing/link-component', '@ember/-internals/glimmer'],
+        ['TextSupport', '@ember/-internals/views', '@ember/-internals/views'],
+      ].forEach(([name, publicPath, privatePath]) => {
+        // loosely based on confirmExport
+        try {
+          let module = require(privatePath);
+          let value = module[name];
+
+          assert.ok(
+            Object.prototype.hasOwnProperty.call(Ember, name),
+            `the ${name} property exists on the Ember global`
+          );
+
+          assert.strictEqual(
+            Ember[`_Legacy${name}`],
+            value,
+            `Ember._Legacy${name} has the correct value and does not trigger a deprecation`
+          );
+
+          expectDeprecation(() => {
+            assert.strictEqual(
+              Ember[name],
+              value,
+              `Ember.${name} has the correct value triggers a deprecation`
+            );
+          }, `Using Ember.${name} or importing from '${publicPath}' has been deprecated, install the \`ember-legacy-built-in-components\` addon and use \`import { ${name} } from 'ember-legacy-built-in-components';\` instead`);
+        } catch (error) {
+          assert.pushResult({
+            result: false,
+            message: `An error occurred while testing ${name} is exported from ${privatePath}.`,
+            source: error,
+          });
+        }
+      });
+    }
+
     ['@test Ember.String.isHTMLSafe exports correctly'](assert) {
       confirmExport(Ember, assert, 'String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe');
     }
@@ -203,7 +246,7 @@ let allExports = [
   ['ViewUtils.getRootViews', '@ember/-internals/views', 'getRootViews'],
   ['ViewUtils.getChildViews', '@ember/-internals/views', 'getChildViews'],
   ['ViewUtils.isSerializationFirstNode', '@ember/-internals/glimmer', 'isSerializationFirstNode'],
-  ['TextSupport', '@ember/-internals/views'],
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextSupport', '@ember/-internals/views'],
   ['ComponentLookup', '@ember/-internals/views'],
   ['EventDispatcher', '@ember/-internals/views'],
 
@@ -211,10 +254,10 @@ let allExports = [
   ['Component', '@ember/-internals/glimmer', 'Component'],
   ['Helper', '@ember/-internals/glimmer', 'Helper'],
   ['Helper.helper', '@ember/-internals/glimmer', 'helper'],
-  ['Checkbox', '@ember/-internals/glimmer', 'Checkbox'],
-  ['LinkComponent', '@ember/-internals/glimmer', 'LinkComponent'],
-  ['TextArea', '@ember/-internals/glimmer', 'TextArea'],
-  ['TextField', '@ember/-internals/glimmer', 'TextField'],
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['Checkbox', '@ember/-internals/glimmer'],
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['LinkComponent', '@ember/-internals/glimmer'],
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextArea', '@ember/-internals/glimmer'],
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextField', '@ember/-internals/glimmer'],
   ['TEMPLATES', '@ember/-internals/glimmer', { get: 'getTemplates', set: 'setTemplates' }],
   ['Handlebars.template', '@ember/-internals/glimmer', 'template'],
   ['HTMLBars.template', '@ember/-internals/glimmer', 'template'],

From 81c80483391dfefa138018dff841d809cab449ff Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 5 Oct 2020 21:42:34 -0700
Subject: [PATCH 0159/1405] Stop using deprecated `keyCode` on `KeyboardEvent`

Use `key` instead, which works in all supported browsers.
---
 .../components/input-angle-test.js            | 24 +++++++++----------
 .../components/input-curly-test.js            | 24 +++++++++----------
 .../components/textarea-angle-test.js         |  2 +-
 .../components/textarea-curly-test.js         |  2 +-
 .../views/lib/mixins/text_support.js          |  7 +++---
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 63fad348fa9..27806cfb8c0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -504,7 +504,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `<Input @enter="foo" />`) is deprecated. Please use closure actions instead (`<Input @enter={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keyup', { keyCode: 13 });
+        this.triggerEvent('keyup', { key: 'Enter' });
       }, 'Passing actions to components as strings (like `<Input @enter="foo" />`) is deprecated. Please use closure actions instead (`<Input @enter={{action "foo"}} />`).');
     }
 
@@ -527,7 +527,7 @@ moduleFor(
       });
 
       this.triggerEvent('keyup', {
-        keyCode: 13,
+        key: 'Enter',
       });
     }
 
@@ -552,7 +552,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `<Input @key-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-press={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keypress', { keyCode: 65 });
+        this.triggerEvent('keypress', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-press={{action "foo"}} />`).');
     }
 
@@ -574,7 +574,7 @@ moduleFor(
         },
       });
 
-      this.triggerEvent('keypress', { keyCode: 65 });
+      this.triggerEvent('keypress', { key: 'A' });
     }
 
     ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
@@ -630,7 +630,7 @@ moduleFor(
       });
 
       this.triggerEvent('keyup', {
-        keyCode: 13,
+        key: 'Enter',
       });
     }
 
@@ -655,7 +655,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `<Input @escape-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @escape-press={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keyup', { keyCode: 27 });
+        this.triggerEvent('keyup', { key: 'Escape' });
       }, 'Passing actions to components as strings (like `<Input @escape-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @escape-press={{action "foo"}} />`).');
     }
 
@@ -677,7 +677,7 @@ moduleFor(
         },
       });
 
-      this.triggerEvent('keyup', { keyCode: 27 });
+      this.triggerEvent('keyup', { key: 'Escape' });
     }
 
     ['@test [DEPRECATED] sends an action with `<Input @key-down="foo" />` when a key is pressed'](
@@ -701,7 +701,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keydown', { keyCode: 65 });
+        this.triggerEvent('keydown', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`).');
     }
 
@@ -723,7 +723,7 @@ moduleFor(
         },
       });
 
-      this.triggerEvent('keydown', { keyCode: 65 });
+      this.triggerEvent('keydown', { key: 'A' });
     }
 
     ['@test [DEPRECATED] sends an action with `<Input @key-up="foo" />` when a key is pressed'](
@@ -747,7 +747,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keyup', { keyCode: 65 });
+        this.triggerEvent('keyup', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`).');
     }
 
@@ -768,7 +768,7 @@ moduleFor(
           },
         },
       });
-      this.triggerEvent('keyup', { keyCode: 65 });
+      this.triggerEvent('keyup', { key: 'A' });
     }
 
     ['@test GH#14727 can render a file input after having had render an input of other type']() {
@@ -789,7 +789,7 @@ moduleFor(
         }),
       });
 
-      this.triggerEvent('keyup', { keyCode: 65 });
+      this.triggerEvent('keyup', { key: 'A' });
     }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 6b414e608e2..4211c09386a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -357,7 +357,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `{{input enter="foo"}}`) is deprecated. Please use closure actions instead (`{{input enter=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keyup', { keyCode: 13 });
+        this.triggerEvent('keyup', { key: 'Enter' });
       }, 'Passing actions to components as strings (like `<Input @enter="foo" />`) is deprecated. Please use closure actions instead (`<Input @enter={{action "foo"}} />`).');
     }
 
@@ -380,7 +380,7 @@ moduleFor(
       });
 
       this.triggerEvent('keyup', {
-        keyCode: 13,
+        key: 'Enter',
       });
     }
 
@@ -405,7 +405,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `{{input key-press="foo"}}`) is deprecated. Please use closure actions instead (`{{input key-press=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keypress', { keyCode: 65 });
+        this.triggerEvent('keypress', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-press={{action "foo"}} />`).');
     }
 
@@ -427,7 +427,7 @@ moduleFor(
         },
       });
 
-      this.triggerEvent('keypress', { keyCode: 65 });
+      this.triggerEvent('keypress', { key: 'A' });
     }
 
     ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
@@ -483,7 +483,7 @@ moduleFor(
       });
 
       this.triggerEvent('keyup', {
-        keyCode: 13,
+        key: 'Enter',
       });
     }
 
@@ -508,7 +508,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `{{input escape-press="foo"}}`) is deprecated. Please use closure actions instead (`{{input escape-press=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keyup', { keyCode: 27 });
+        this.triggerEvent('keyup', { key: 'Escape' });
       }, 'Passing actions to components as strings (like `<Input @escape-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @escape-press={{action "foo"}} />`).');
     }
 
@@ -530,7 +530,7 @@ moduleFor(
         },
       });
 
-      this.triggerEvent('keyup', { keyCode: 27 });
+      this.triggerEvent('keyup', { key: 'Escape' });
     }
 
     ['@test [DEPRECATED] sends an action with `{{input key-down="foo"}}` when a key is pressed'](
@@ -554,7 +554,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `{{input key-down="foo"}}`) is deprecated. Please use closure actions instead (`{{input key-down=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keydown', { keyCode: 65 });
+        this.triggerEvent('keydown', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`).');
     }
 
@@ -576,7 +576,7 @@ moduleFor(
         },
       });
 
-      this.triggerEvent('keydown', { keyCode: 65 });
+      this.triggerEvent('keydown', { key: 'A' });
     }
 
     ['@test [DEPRECATED] sends an action with `{{input key-up="foo"}}` when a key is pressed'](
@@ -600,7 +600,7 @@ moduleFor(
       }, 'Passing actions to components as strings (like `{{input key-up="foo"}}`) is deprecated. Please use closure actions instead (`{{input key-up=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
 
       expectDeprecation(() => {
-        this.triggerEvent('keyup', { keyCode: 65 });
+        this.triggerEvent('keyup', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`).');
     }
 
@@ -619,7 +619,7 @@ moduleFor(
           },
         },
       });
-      this.triggerEvent('keyup', { keyCode: 65 });
+      this.triggerEvent('keyup', { key: 'A' });
     }
 
     ['@test GH#14727 can render a file input after having had render an input of other type']() {
@@ -640,7 +640,7 @@ moduleFor(
         }),
       });
 
-      this.triggerEvent('keyup', { keyCode: 65 });
+      this.triggerEvent('keyup', { key: 'A' });
     }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index 4b8b5ff4e8f..fae5b50ab5c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -218,7 +218,7 @@ moduleFor(
         }),
       });
 
-      this.triggerEvent('keyup', { keyCode: 65 });
+      this.triggerEvent('keyup', { key: 'A' });
     }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 17f2d0b33f9..1efac177d9c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -170,7 +170,7 @@ moduleFor(
         }),
       });
 
-      this.triggerEvent('keyup', { keyCode: 65 });
+      this.triggerEvent('keyup', { key: 'A' });
     }
   }
 );
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index f26be5ef22b..ea7ff261614 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -9,8 +9,8 @@ import { SEND_ACTION } from '@ember/deprecated-features';
 import { MUTABLE_CELL } from '@ember/-internals/views';
 
 const KEY_EVENTS = {
-  13: 'insertNewline',
-  27: 'cancel',
+  Enter: 'insertNewline',
+  Escape: 'cancel',
 };
 
 /**
@@ -162,8 +162,7 @@ export default Mixin.create(TargetActionSupport, {
   bubbles: false,
 
   interpretKeyEvents(event) {
-    let map = KEY_EVENTS;
-    let method = map[event.keyCode];
+    let method = KEY_EVENTS[event.key];
 
     this._elementValueDidChange();
     if (method) {

From 1f420ce8857276a1ba4bce976fc5a1321bec3490 Mon Sep 17 00:00:00 2001
From: Mehul Kar <mehulkar@apple.com>
Date: Wed, 26 Aug 2020 13:04:06 -0500
Subject: [PATCH 0160/1405] Add `for` and `since` options to depreacte()
 function

This implements the first stage of the Deprecation Staging RFC
https://github.com/emberjs/rfcs/pull/649

This commit also:

- deprecates the usage of deprecate() function without passing
these options
- Updates all the usages of deprecate() in the repo to pass
these options.
---
 .../-internals/glimmer/lib/component.ts       |  12 ++
 .../-internals/glimmer/lib/environment.ts     |   4 +
 .../-internals/glimmer/lib/helpers/action.ts  |   4 +
 .../glimmer/lib/modifiers/action.ts           |   8 +
 .../@ember/-internals/glimmer/lib/resolver.ts |   4 +
 .../-internals/glimmer/lib/utils/bindings.ts  |   4 +
 .../-internals/glimmer/lib/utils/managers.ts  |   4 +
 packages/@ember/-internals/meta/lib/meta.ts   |  16 ++
 .../@ember/-internals/metal/lib/chain-tags.ts |   4 +
 .../@ember/-internals/metal/lib/computed.ts   |  12 ++
 packages/@ember/-internals/metal/lib/mixin.ts |   4 +
 .../-internals/metal/lib/property_get.ts      |   4 +
 packages/@ember/-internals/owner/index.ts     |   4 +
 .../-internals/routing/lib/system/route.ts    |   8 +
 .../-internals/routing/lib/system/router.ts   |  16 ++
 packages/@ember/debug/lib/deprecate.ts        |  50 +++++-
 packages/@ember/debug/tests/main_test.js      | 146 ++++++++++++++++--
 packages/@ember/polyfills/lib/merge.ts        |   4 +
 .../lib/plugins/deprecate-send-action.ts      |  12 ++
 .../lib/plugins/transform-in-element.ts       |   4 +
 20 files changed, 313 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 5820c596b19..abe9d409e95 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -752,6 +752,10 @@ const Component = CoreView.extend(
           id: 'ember-views.event-dispatcher.mouseenter-leave-move',
           until: '4.0.0',
           url: 'https://emberjs.com/deprecations/v3.x#toc_component-mouseenter-leave-move',
+          for: 'ember-source',
+          since: {
+            enabled: '3.13.0-beta.1',
+          },
         }
       );
       deprecate(
@@ -761,6 +765,10 @@ const Component = CoreView.extend(
           id: 'ember-views.event-dispatcher.mouseenter-leave-move',
           until: '4.0.0',
           url: 'https://emberjs.com/deprecations/v3.x#toc_component-mouseenter-leave-move',
+          for: 'ember-source',
+          since: {
+            enabled: '3.13.0-beta.1',
+          },
         }
       );
       deprecate(
@@ -770,6 +778,10 @@ const Component = CoreView.extend(
           id: 'ember-views.event-dispatcher.mouseenter-leave-move',
           until: '4.0.0',
           url: 'https://emberjs.com/deprecations/v3.x#toc_component-mouseenter-leave-move',
+          for: 'ember-source',
+          since: {
+            enabled: '3.13.0-beta.1',
+          },
         }
       );
     },
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index d8ab17bb29a..c58bf049f4b 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -64,6 +64,10 @@ if (DEBUG) {
       deprecate(message, false, {
         id: 'autotracking.mutation-after-consumption',
         until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.21.0',
+        },
       });
     },
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index dd52fda0351..5f7aa791e94 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -415,6 +415,10 @@ function makeClosureAction(
       {
         until: '3.25.0',
         id: 'actions.custom-invoke-invokable',
+        for: 'ember-source',
+        since: {
+          enabled: '3.23.0-beta.1',
+        },
       }
     );
 
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 571b4f94033..f59edfaf140 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -156,6 +156,10 @@ export class ActionState {
           {
             until: '3.25.0',
             id: 'actions.custom-invoke-invokable',
+            for: 'ember-source',
+            since: {
+              enabled: '3.23.0-beta.1',
+            },
           }
         );
 
@@ -226,6 +230,10 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
         id: 'ember-views.event-dispatcher.mouseenter-leave-move',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_action-mouseenter-leave-move',
+        for: 'ember-source',
+        since: {
+          enabled: '3.13.0-beta.1',
+        },
       }
     );
 
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ffb0b8505a7..3d53fc0f166 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -149,6 +149,10 @@ if (PARTIALS) {
         id: 'ember-views.partial',
         until: '4.0.0',
         url: 'https://deprecations.emberjs.com/v3.x#toc_ember-views-partial',
+        for: 'ember-source',
+        since: {
+          enabled: '3.15.0-beta.1',
+        },
       }
     );
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 94d5bfed816..55791ddb7ca 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -112,6 +112,10 @@ if (EMBER_COMPONENT_IS_VISIBLE) {
             id: 'ember-component.is-visible',
             until: '4.0.0',
             url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-is-visible',
+            for: 'ember-source',
+            since: {
+              enabled: '3.15.0-beta.1',
+            },
           }
         );
       }
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 348aa3826d7..b08b866364b 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -171,6 +171,10 @@ export function setComponentManager(
         id: 'deprecate-string-based-component-manager',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x/#toc_component-manager-string-lookup',
+        for: 'ember-source',
+        since: {
+          enabled: '3.8.0',
+        },
       }
     );
     factory = function (owner: Owner) {
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 04d129b4c1e..64ab5182b3d 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -144,6 +144,10 @@ export class Meta {
       {
         id: 'meta-destruction-apis',
         until: '3.25.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.21.0',
+        },
       }
     );
   }
@@ -155,6 +159,10 @@ export class Meta {
       {
         id: 'meta-destruction-apis',
         until: '3.25.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.21.0',
+        },
       }
     );
   }
@@ -166,6 +174,10 @@ export class Meta {
       {
         id: 'meta-destruction-apis',
         until: '3.25.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.21.0',
+        },
       }
     );
 
@@ -179,6 +191,10 @@ export class Meta {
       {
         id: 'meta-destruction-apis',
         until: '3.25.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.21.0',
+        },
       }
     );
 
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 28e12577a44..ca4ebf91cce 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -109,6 +109,10 @@ function getChainTags(
         {
           until: '3.17.0',
           id: 'ember-metal.computed-deep-each',
+          for: 'ember-source',
+          since: {
+            enabled: '3.13.0-beta.3',
+          },
         }
       );
 
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index f5850f23474..b8dc796e682 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -507,6 +507,10 @@ export class ComputedProperty extends ComputedDescriptor {
         id: 'computed-property.override',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-override',
+        for: 'ember-source',
+        since: {
+          enabled: '3.9.0-beta.1',
+        },
       }
     );
 
@@ -715,6 +719,10 @@ class ComputedDecoratorImpl extends Function {
         id: 'computed-property.volatile',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-volatile',
+        for: 'ember-source',
+        since: {
+          enabled: '3.9.0-beta.1',
+        },
       }
     );
     (descriptorForDecorator(this) as ComputedProperty)._volatile = true;
@@ -786,6 +794,10 @@ class ComputedDecoratorImpl extends Function {
         id: 'computed-property.property',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-property',
+        for: 'ember-source',
+        since: {
+          enabled: '3.9.0-beta.1',
+        },
       }
     );
     (descriptorForDecorator(this) as ComputedProperty)._property(...keys);
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 64cc56786a4..c3e98de5df1 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -826,6 +826,10 @@ if (ALIAS_METHOD) {
         id: 'object.alias-method',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_object-alias-method',
+        for: 'ember-source',
+        since: {
+          enabled: '3.9.0',
+        },
       }
     );
     return new AliasImpl(methodName);
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index b5de81e4554..518aa242719 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -189,6 +189,10 @@ export function getWithDefault<T extends object, K extends Extract<keyof T, stri
       id: 'ember-metal.get-with-default',
       until: '4.0.0',
       url: 'https://deprecations.emberjs.com/v3.x#toc_ember-metal-get-with-default',
+      for: 'ember-source',
+      since: {
+        enabled: '3.21.0',
+      },
     }
   );
 
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 218ae9cb4b5..8ea8e0d0e3b 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -99,6 +99,10 @@ export function getOwner(object: any): Owner {
       {
         id: 'owner.legacy-owner-injection',
         until: '3.25.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.22.0',
+        },
       }
     );
   }
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 006e70f20b9..77f85a3cb4b 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2640,6 +2640,10 @@ if (ROUTER_EVENTS) {
             id: 'deprecate-router-events',
             until: '4.0.0',
             url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+            for: 'ember-source',
+            since: {
+              enabled: '3.11.0',
+            },
           }
         );
       }
@@ -2652,6 +2656,10 @@ if (ROUTER_EVENTS) {
             id: 'deprecate-router-events',
             until: '4.0.0',
             url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+            for: 'ember-source',
+            since: {
+              enabled: '3.11.0',
+            },
           }
         );
       }
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 4803cad7fd4..8e08c6ca085 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -230,6 +230,10 @@ class EmberRouter extends EmberObject {
                 id: 'deprecate-router-events',
                 until: '4.0.0',
                 url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+                for: 'ember-source',
+                since: {
+                  enabled: '3.11.0',
+                },
               }
             );
           }
@@ -251,6 +255,10 @@ class EmberRouter extends EmberObject {
                 id: 'deprecate-router-events',
                 until: '4.0.0',
                 url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+                for: 'ember-source',
+                since: {
+                  enabled: '3.11.0',
+                },
               }
             );
           }
@@ -1486,6 +1494,10 @@ function updatePaths(router: EmberRouter) {
               until: '4.0.0',
               url:
                 'https://emberjs.com/deprecations/v3.x#toc_application-controller-router-properties',
+              for: 'ember-source',
+              since: {
+                enabled: '3.10.0-beta.1',
+              },
             }
           );
           return get(router, 'currentPath');
@@ -1505,6 +1517,10 @@ function updatePaths(router: EmberRouter) {
               until: '4.0.0',
               url:
                 'https://emberjs.com/deprecations/v3.x#toc_application-controller-router-properties',
+              for: 'ember-source',
+              since: {
+                enabled: '3.10.0-beta.1',
+              },
             }
           );
           return get(router, 'currentRouteName');
diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 1df582e31ea..0b351c2ac6a 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -10,13 +10,18 @@ declare global {
   };
 }
 
+export type DeprecationStages = 'available' | 'enabled';
+
 export interface DeprecationOptions {
   id: string;
   until: string;
   url?: string;
+  for: string;
+  since: Partial<Record<DeprecationStages, string>>;
 }
 
 export type DeprecateFunc = (message: string, test?: boolean, options?: DeprecationOptions) => void;
+export type MissingOptionDeprecateFunc = (id: string) => string;
 
 /**
  @module @ember/debug
@@ -64,7 +69,11 @@ let registerHandler: (handler: HandlerCallback) => void = () => {};
 let missingOptionsDeprecation: string;
 let missingOptionsIdDeprecation: string;
 let missingOptionsUntilDeprecation: string;
+let missingOptionsForDeprecation: MissingOptionDeprecateFunc = () => '';
+let missingOptionsSinceDeprecation: MissingOptionDeprecateFunc = () => '';
 let deprecate: DeprecateFunc = () => {};
+let FOR_MISSING_DEPRECATIONS = new Set();
+let SINCE_MISSING_DEPRECATIONS = new Set();
 
 if (DEBUG) {
   registerHandler = function registerHandler(handler: HandlerCallback) {
@@ -154,6 +163,13 @@ if (DEBUG) {
     '`options` should include `id` and `until` properties.';
   missingOptionsIdDeprecation = 'When calling `deprecate` you must provide `id` in options.';
   missingOptionsUntilDeprecation = 'When calling `deprecate` you must provide `until` in options.';
+
+  missingOptionsForDeprecation = (id: string) => {
+    return `When calling \`deprecate\` you must provide \`for\` in options. Missing options.for in "${id}" deprecation`;
+  };
+  missingOptionsSinceDeprecation = (id: string) => {
+    return `When calling \`deprecate\` you must provide \`since\` in options. Missing options.since in "${id}" deprecation`;
+  };
   /**
    @module @ember/debug
    @public
@@ -176,8 +192,10 @@ if (DEBUG) {
       "view.helper.select".
     @param {string} options.until The version of Ember when this deprecation
       warning will be removed.
+    @param {String} options.for A namespace for the deprecation, usually the package name
+    @param {Object} options.since Describes when the deprecation became available and enabled.
     @param {String} [options.url] An optional url to the transition guide on the
-      emberjs.com website.
+          emberjs.com website.
     @static
     @public
     @since 1.0.0
@@ -187,6 +205,32 @@ if (DEBUG) {
     assert(missingOptionsIdDeprecation, Boolean(options!.id));
     assert(missingOptionsUntilDeprecation, Boolean(options!.until));
 
+    if (!options!.for && !FOR_MISSING_DEPRECATIONS.has(options!.id)) {
+      FOR_MISSING_DEPRECATIONS.add(options!.id);
+
+      deprecate(missingOptionsForDeprecation(options!.id), Boolean(options!.for), {
+        id: 'ember-source.deprecation-without-for',
+        until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          available: '3.24.0',
+        },
+      });
+    }
+
+    if (!options!.since && !SINCE_MISSING_DEPRECATIONS.has(options!.id)) {
+      SINCE_MISSING_DEPRECATIONS.add(options!.id);
+
+      deprecate(missingOptionsSinceDeprecation(options!.id), Boolean(options!.since), {
+        id: 'ember-source.deprecation-without-since',
+        until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          available: '3.24.0',
+        },
+      });
+    }
+
     invoke('deprecate', message, test, options);
   };
 }
@@ -198,4 +242,8 @@ export {
   missingOptionsDeprecation,
   missingOptionsIdDeprecation,
   missingOptionsUntilDeprecation,
+  missingOptionsForDeprecation,
+  missingOptionsSinceDeprecation,
+  FOR_MISSING_DEPRECATIONS,
+  SINCE_MISSING_DEPRECATIONS,
 };
diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 0d5d401dd98..42213281502 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -6,6 +6,10 @@ import {
   missingOptionsDeprecation,
   missingOptionsIdDeprecation,
   missingOptionsUntilDeprecation,
+  missingOptionsForDeprecation,
+  missingOptionsSinceDeprecation,
+  FOR_MISSING_DEPRECATIONS,
+  SINCE_MISSING_DEPRECATIONS,
 } from '../lib/deprecate';
 
 import {
@@ -41,7 +45,8 @@ moduleFor(
     teardown() {
       HANDLERS.deprecate = originalDeprecateHandler;
       HANDLERS.warn = originalWarnHandler;
-
+      FOR_MISSING_DEPRECATIONS.clear();
+      SINCE_MISSING_DEPRECATIONS.clear();
       ENV.RAISE_ON_DEPRECATION = originalEnvValue;
     }
 
@@ -56,7 +61,12 @@ moduleFor(
       ENV.RAISE_ON_DEPRECATION = false;
 
       try {
-        deprecate('Should not throw', false, { id: 'test', until: 'forever' });
+        deprecate('Should not throw', false, {
+          id: 'test',
+          until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
+        });
         assert.ok(true, 'deprecate did not throw');
       } catch (e) {
         assert.ok(false, `Expected deprecate not to throw but it did: ${e.message}`);
@@ -72,7 +82,12 @@ moduleFor(
       ENV.RAISE_ON_DEPRECATION = false;
 
       try {
-        deprecate('Should not throw', false, { id: 'test', until: 'forever' });
+        deprecate('Should not throw', false, {
+          id: 'test',
+          until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
+        });
         assert.ok(true, 'deprecate did not throw');
       } catch (e) {
         assert.ok(false, `Expected deprecate not to throw but it did: ${e.message}`);
@@ -81,7 +96,12 @@ moduleFor(
       ENV.RAISE_ON_DEPRECATION = true;
 
       assert.throws(() => {
-        deprecate('Should throw', false, { id: 'test', until: 'forever' });
+        deprecate('Should throw', false, {
+          id: 'test',
+          until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
+        });
       }, /Should throw/);
     }
 
@@ -101,6 +121,8 @@ moduleFor(
         deprecate('should be silenced with matching id', false, {
           id: 'my-deprecation',
           until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
         });
         assert.ok(true, 'Did not throw when level is set by id');
       } catch (e) {
@@ -111,6 +133,8 @@ moduleFor(
         deprecate('Should throw with no matching id', false, {
           id: 'test',
           until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
         });
       }, /Should throw with no matching id/);
 
@@ -118,6 +142,8 @@ moduleFor(
         deprecate('Should throw with non-matching id', false, {
           id: 'other-id',
           until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
         });
       }, /Should throw with non-matching id/);
     }
@@ -129,10 +155,26 @@ moduleFor(
         deprecate('Deprecation is thrown', false, {
           id: 'test',
           until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
+        })
+      );
+      assert.throws(() =>
+        deprecate('Deprecation is thrown', '', {
+          id: 'test',
+          until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
+        })
+      );
+      assert.throws(() =>
+        deprecate('Deprecation is thrown', 0, {
+          id: 'test',
+          until: 'forever',
+          for: 'me',
+          since: { available: '1.0.0' },
         })
       );
-      assert.throws(() => deprecate('Deprecation is thrown', '', { id: 'test', until: 'forever' }));
-      assert.throws(() => deprecate('Deprecation is thrown', 0, { id: 'test', until: 'forever' }));
     }
 
     ['@test deprecate does not invoke a function as the second argument'](assert) {
@@ -143,7 +185,7 @@ moduleFor(
         function () {
           assert.ok(false, 'this function should not be invoked');
         },
-        { id: 'test', until: 'forever' }
+        { id: 'test', until: 'forever', for: 'me', since: { available: '1.0.0' } }
       );
 
       assert.ok(true, 'deprecations were not thrown');
@@ -155,9 +197,21 @@ moduleFor(
       deprecate('Deprecation is thrown', true, {
         id: 'test',
         until: 'forever',
+        for: 'me',
+        since: { available: '1.0.0' },
+      });
+      deprecate('Deprecation is thrown', '1', {
+        id: 'test',
+        until: 'forever',
+        for: 'me',
+        since: { available: '1.0.0' },
+      });
+      deprecate('Deprecation is thrown', 1, {
+        id: 'test',
+        until: 'forever',
+        for: 'me',
+        since: { available: '1.0.0' },
       });
-      deprecate('Deprecation is thrown', '1', { id: 'test', until: 'forever' });
-      deprecate('Deprecation is thrown', 1, { id: 'test', until: 'forever' });
 
       assert.ok(true, 'deprecations were not thrown');
     }
@@ -257,7 +311,8 @@ moduleFor(
       assert.expect(1);
 
       assert.throws(
-        () => deprecate('foo', false, { until: 'forever' }),
+        () =>
+          deprecate('foo', false, { until: 'forever', for: 'me', since: { available: '1.0.0' } }),
         new RegExp(missingOptionsIdDeprecation),
         'proper assertion is triggered when options.id is missing'
       );
@@ -273,6 +328,77 @@ moduleFor(
       );
     }
 
+    ['@test deprecate without options.for triggers an assertion'](assert) {
+      assert.expect(1);
+
+      assert.throws(
+        () => deprecate('message1', false, { id: 'test', until: 'forever' }),
+        new RegExp(missingOptionsForDeprecation('test')),
+        'proper assertion is triggered when options.for is missing'
+      );
+    }
+
+    ['@test deprecate without options.for only triggers once per id'](assert) {
+      ENV.RAISE_ON_DEPRECATION = false;
+      let messages = [];
+      registerHandler(function (message, options, next) {
+        if (options.id === 'ember-source.deprecation-without-for') {
+          messages.push(message);
+        }
+        next(...arguments);
+      });
+
+      deprecate('message1', false, { id: 'test', until: 'forever' });
+      deprecate('message2', false, { id: 'test', until: 'forever' });
+      deprecate('message3', false, { id: 'another', until: 'forever' });
+
+      assert.equal(messages.length, 2, 'correct number of deprecations');
+      assert.equal(messages[0], missingOptionsForDeprecation('test'), 'first message is correct');
+
+      assert.equal(
+        messages[1],
+        missingOptionsForDeprecation('another'),
+        'second message is correct'
+      );
+    }
+
+    ['@test deprecate without options.since triggers an assertion'](assert) {
+      assert.expect(1);
+
+      assert.throws(
+        () =>
+          deprecate('foo', false, {
+            id: 'test',
+            until: 'forever',
+            for: 'me',
+          }),
+        new RegExp(missingOptionsSinceDeprecation('test')),
+        'proper assertion is triggered when options.since is missing'
+      );
+    }
+
+    ['@test deprecate without options.since only triggers once per id'](assert) {
+      ENV.RAISE_ON_DEPRECATION = false;
+      let messages = [];
+      registerHandler(function (message, options, next) {
+        if (options.id === 'ember-source.deprecation-without-since') {
+          messages.push(message);
+        }
+        next(...arguments);
+      });
+      deprecate('foo', false, { id: 'test', until: 'forever', for: 'me' });
+      deprecate('foobar', false, { id: 'test', until: 'forever', for: 'me' });
+      deprecate('baz', false, { id: 'another', until: 'forever', for: 'me' });
+
+      assert.equal(messages.length, 2, 'deprecation message only sent once');
+      assert.equal(messages[0], missingOptionsSinceDeprecation('test'), 'first message is correct');
+      assert.equal(
+        messages[1],
+        missingOptionsSinceDeprecation('another'),
+        'second message is correct'
+      );
+    }
+
     ['@test warn without options triggers an assert'](assert) {
       assert.expect(1);
 
diff --git a/packages/@ember/polyfills/lib/merge.ts b/packages/@ember/polyfills/lib/merge.ts
index 95dacb7cb7d..3e7bf2c08d7 100644
--- a/packages/@ember/polyfills/lib/merge.ts
+++ b/packages/@ember/polyfills/lib/merge.ts
@@ -32,6 +32,10 @@ function merge(original: object, updates: object) {
     id: 'ember-polyfills.deprecate-merge',
     until: '4.0.0',
     url: 'https://emberjs.com/deprecations/v3.x/#toc_ember-polyfills-deprecate-merge',
+    for: 'ember-source',
+    since: {
+      enabled: '3.6.0-beta.1',
+    },
   });
 
   if (updates === null || typeof updates !== 'object') {
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
index 5931fee8327..2b119ec4a55 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
@@ -49,6 +49,10 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
                     id: 'ember-component.send-action',
                     until: '4.0.0',
                     url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                    for: 'ember-source',
+                    since: {
+                      enabled: '3.4.0',
+                    },
                   });
                 } else if (
                   value.type === 'MustacheStatement' &&
@@ -58,6 +62,10 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
                     id: 'ember-component.send-action',
                     until: '4.0.0',
                     url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                    for: 'ember-source',
+                    since: {
+                      enabled: '3.4.0',
+                    },
                   });
                 }
               }
@@ -76,6 +84,10 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
                 id: 'ember-component.send-action',
                 until: '4.0.0',
                 url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                for: 'ember-source',
+                since: {
+                  enabled: '3.4.0',
+                },
               });
             }
           });
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index abb6122223d..2b663493079 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -86,6 +86,10 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
               {
                 id: 'glimmer.private-in-element',
                 until: '3.25.0',
+                for: 'ember-source',
+                since: {
+                  enabled: '3.20.0',
+                },
               }
             );
           }

From 9916fc6856386a49e16568fe9f052e03d94bf904 Mon Sep 17 00:00:00 2001
From: Paul Kuruvilla <rohitpaulk@gmail.com>
Date: Fri, 9 Oct 2020 14:34:35 +0530
Subject: [PATCH 0161/1405] [DOC] replace this.get('router') with this.router
 in RoutingService docs

---
 packages/@ember/-internals/routing/lib/services/router.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index ab114790ea5..f3aa549e9c9 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -274,7 +274,7 @@ export default class RouterService extends Service {
        @service router;
 
        displayComments() {
-         return this.get('router').isActive('posts');
+         return this.router.isActive('posts');
        }
      });
      ```
@@ -290,7 +290,7 @@ export default class RouterService extends Service {
        @service router;
 
        displayComments(post) {
-         return this.get('router').isActive('posts', post.id);
+         return this.router.isActive('posts', post.id);
        }
      });
      ```

From 56a1da5b3b56ed84f6de2193a4fb0c01c0c7d4f2 Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Sun, 20 Sep 2020 09:44:32 +0300
Subject: [PATCH 0162/1405] CHORE: combine two test cases into one

Since `jQuery.isReady = false;` is set before each test case.
---
 .../application/tests/readiness_test.js       | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/packages/@ember/application/tests/readiness_test.js b/packages/@ember/application/tests/readiness_test.js
index 97a1406346e..1368671c0a1 100644
--- a/packages/@ember/application/tests/readiness_test.js
+++ b/packages/@ember/application/tests/readiness_test.js
@@ -96,6 +96,7 @@ moduleFor(
       run(() => {
         application = Application.create({ router: false });
         application.deferReadiness();
+        assert.equal(readyWasCalled, 0, "ready wasn't called yet");
       });
 
       assert.equal(readyWasCalled, 0, "ready wasn't called yet");
@@ -110,28 +111,6 @@ moduleFor(
       });
 
       assert.equal(readyWasCalled, 1, 'ready was called now all readiness deferrals are advanced');
-    }
-
-    ["@test Application's ready event can be deferred by other components (jQuery.isReady === false)"](
-      assert
-    ) {
-      jQuery.isReady = false;
-
-      run(() => {
-        application = Application.create({ router: false });
-        application.deferReadiness();
-        assert.equal(readyWasCalled, 0, "ready wasn't called yet");
-      });
-
-      domReady();
-
-      assert.equal(readyWasCalled, 0, "ready wasn't called yet");
-
-      run(() => {
-        application.advanceReadiness();
-      });
-
-      assert.equal(readyWasCalled, 1, 'ready was called now all readiness deferrals are advanced');
 
       expectAssertion(() => {
         application.deferReadiness();

From 88c59a4be85d0b83cc1ac807ea14a95a8f315a54 Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Thu, 10 Sep 2020 13:29:39 +0300
Subject: [PATCH 0163/1405] [BUGFIX beta] reimplement $.ready()

---
 .../@ember/application/lib/application.js     | 20 ++++-
 .../application/tests/readiness_test.js       | 86 +++++++++----------
 tests/docs/expected.js                        |  1 +
 3 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 13183a45ad2..5721e0fe011 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -7,7 +7,7 @@ import { ENV } from '@ember/-internals/environment';
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { assert, isTesting } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { bind, join, once, run, schedule } from '@ember/runloop';
+import { join, once, run, schedule } from '@ember/runloop';
 import {
   libraries,
   processAllNamespaces,
@@ -205,6 +205,15 @@ const Application = Engine.extend({
   */
   rootElement: 'body',
 
+  /**
+
+    @property _document
+    @type Document | null
+    @default 'window.document'
+    @private
+  */
+  _document: hasDOM ? window.document : null,
+
   /**
     The `Ember.EventDispatcher` responsible for delegating events to this
     application's views.
@@ -483,10 +492,15 @@ const Application = Engine.extend({
     @method waitForDOMReady
   */
   waitForDOMReady() {
-    if (!this.$ || this.$.isReady) {
+    if (this._document === null || this._document.readyState !== 'loading') {
       schedule('actions', this, 'domReady');
     } else {
-      this.$().ready(bind(this, 'domReady'));
+      let callback = () => {
+        this._document.removeEventListener('DOMContentLoaded', callback);
+        run(this, 'domReady');
+      };
+
+      this._document.addEventListener('DOMContentLoaded', callback);
     }
   },
 
diff --git a/packages/@ember/application/tests/readiness_test.js b/packages/@ember/application/tests/readiness_test.js
index 1368671c0a1..ba66745404d 100644
--- a/packages/@ember/application/tests/readiness_test.js
+++ b/packages/@ember/application/tests/readiness_test.js
@@ -2,52 +2,39 @@ import { moduleFor, ModuleBasedTestResolver, ApplicationTestCase } from 'interna
 import { run } from '@ember/runloop';
 import EmberApplication from '..';
 
-let jQuery, application, Application;
-let readyWasCalled, domReady, readyCallbacks;
+let application, Application, _document, callbacks;
+let readyWasCalled = 0;
+
+const dispatchEvent = (eventName) => {
+  callbacks[eventName].forEach((callback) => callback());
+};
+
+const removeEventListener = (eventName, callbackToRemove) => {
+  callbacks[eventName] = callbacks[eventName].filter((callback) => callback !== callbackToRemove);
+};
+
+const addEventListener = (eventName, callback) => {
+  callbacks[eventName] ? callbacks[eventName].push(callback) : (callbacks[eventName] = [callback]);
+};
 
-// We are using a small mock of jQuery because jQuery is third-party code with
-// very well-defined semantics, and we want to confirm that a jQuery stub run
-// in a more minimal server environment that implements this behavior will be
-// sufficient for Ember's requirements.
 moduleFor(
   'Application readiness',
   class extends ApplicationTestCase {
     constructor() {
       super();
 
-      readyWasCalled = 0;
-      readyCallbacks = [];
-
-      let jQueryInstance = {
-        ready(callback) {
-          readyCallbacks.push(callback);
-          if (jQuery.isReady) {
-            domReady();
-          }
-        },
-      };
-
-      jQuery = function () {
-        return jQueryInstance;
-      };
-      jQuery.isReady = false;
-
-      let domReadyCalled = 0;
-      domReady = function () {
-        if (domReadyCalled !== 0) {
-          return;
-        }
-        domReadyCalled++;
-        for (let i = 0; i < readyCallbacks.length; i++) {
-          readyCallbacks[i]();
-        }
+      callbacks = [];
+      _document = {
+        removeEventListener,
+        addEventListener,
       };
 
       Application = EmberApplication.extend({
-        $: jQuery,
         Resolver: ModuleBasedTestResolver,
+        _document,
 
         ready() {
+          this._super();
           readyWasCalled++;
         },
       });
@@ -56,52 +43,59 @@ moduleFor(
     teardown() {
       if (application) {
         run(() => application.destroy());
-        jQuery = readyCallbacks = domReady = Application = application = undefined;
+        Application = application = _document = callbacks = undefined;
+        readyWasCalled = 0;
       }
     }
 
-    // These tests are confirming that if the callbacks passed into jQuery's ready hook is called
-    // synchronously during the application's initialization, we get the same behavior as if
-    // it was triggered after initialization.
-
-    ["@test Application's ready event is called right away if jQuery is already ready"](assert) {
-      jQuery.isReady = true;
+    ["@test Application's ready event is called right away if DOM is already ready"](assert) {
+      _document.readyState = 'interactive';
 
       run(() => {
-        application = Application.create({ router: false });
+        application = Application.create({
+          router: false,
+        });
 
         assert.equal(readyWasCalled, 0, 'ready is not called until later');
       });
 
       assert.equal(readyWasCalled, 1, 'ready was called');
 
-      domReady();
+      application.domReady();
 
+      assert.equal(callbacks['DOMContentLoaded'], undefined);
       assert.equal(readyWasCalled, 1, "application's ready was not called again");
     }
 
     ["@test Application's ready event is called after the document becomes ready"](assert) {
+      _document.readyState = 'loading';
+
       run(() => {
         application = Application.create({ router: false });
+        assert.equal(callbacks['DOMContentLoaded'].length, 1);
       });
 
       assert.equal(readyWasCalled, 0, "ready wasn't called yet");
 
-      domReady();
+      dispatchEvent('DOMContentLoaded');
 
+      assert.equal(callbacks['DOMContentLoaded'].length, 0);
       assert.equal(readyWasCalled, 1, 'ready was called now that DOM is ready');
     }
 
     ["@test Application's ready event can be deferred by other components"](assert) {
+      _document.readyState = 'loading';
+
       run(() => {
         application = Application.create({ router: false });
         application.deferReadiness();
         assert.equal(readyWasCalled, 0, "ready wasn't called yet");
+        assert.equal(callbacks['DOMContentLoaded'].length, 1);
       });
 
       assert.equal(readyWasCalled, 0, "ready wasn't called yet");
 
-      domReady();
+      application.domReady();
 
       assert.equal(readyWasCalled, 0, "ready wasn't called yet");
 
@@ -112,6 +106,10 @@ moduleFor(
 
       assert.equal(readyWasCalled, 1, 'ready was called now all readiness deferrals are advanced');
 
+      dispatchEvent('DOMContentLoaded');
+
+      assert.equal(callbacks['DOMContentLoaded'].length, 0);
+
       expectAssertion(() => {
         application.deferReadiness();
       });
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index f0e0e5ae1c2..e68d3ccdad1 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -22,6 +22,7 @@ module.exports = {
     '_applicationInstances',
     '_deserializeQueryParam',
     '_deserializeQueryParams',
+    '_document',
     '_fullyScopeQueryParams',
     '_getHashPath',
     '_getObjectsOnNamespaces',

From 99d998c6c48ab8e5b55e9c6772d90992b31331bb Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Sun, 3 Feb 2019 14:40:39 -0800
Subject: [PATCH 0164/1405] Lazy router setup in non-application tests

During non setupApplicationTests type tests, the Router being injected
into service:router and service:routing does not setup automatically,
during which it initializes its _routerMicrolib, etc. Public API on
service:router will throw in those tests.  This commit will trigger
setupRouter when accessing EmberRouter via router service to avoid those
errors.
---
 .../-internals/routing/lib/services/router.ts |  15 ++-
 .../-internals/routing/lib/system/router.ts   |  13 ++-
 .../routing/tests/system/router_test.js       |  14 +++
 packages/@ember/application/instance.js       |  12 +-
 .../@ember/application/lib/application.js     |   3 +-
 .../non_application_test_test.js              | 110 ++++++++++++++++++
 6 files changed, 152 insertions(+), 15 deletions(-)
 create mode 100644 packages/ember/tests/routing/router_service_test/non_application_test_test.js

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index f3aa549e9c9..8f00468ee40 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,4 +1,6 @@
+import { getOwner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
+import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
@@ -9,6 +11,8 @@ import { Transition } from 'router_js';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
+const ROUTER = symbol('ROUTER');
+
 let freezeRouteInfo: Function;
 if (DEBUG) {
   freezeRouteInfo = (transition: Transition) => {
@@ -62,7 +66,16 @@ function cleanURL(url: string, rootURL: string) {
    @class RouterService
  */
 export default class RouterService extends Service {
-  _router!: EmberRouter;
+  get _router(): EmberRouter {
+    let router = this[ROUTER];
+    if (router !== undefined) {
+      return router;
+    }
+    const owner = getOwner(this) as any;
+    router = owner.lookup('router:main');
+    router.setupRouter();
+    return (this[ROUTER] = router);
+  }
 
   init() {
     super.init(...arguments);
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 8e08c6ca085..f816378a7ed 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -127,6 +127,7 @@ class EmberRouter extends EmberObject {
   location!: string | IEmberLocation;
   rootURL!: string;
   _routerMicrolib!: Router<Route>;
+  _didSetupRouter = false;
 
   currentURL: string | null = null;
   currentRouteName: string | null = null;
@@ -397,9 +398,8 @@ class EmberRouter extends EmberObject {
     @private
   */
   startRouting() {
-    let initialURL = get(this, 'initialURL');
-
     if (this.setupRouter()) {
+      let initialURL = get(this, 'initialURL');
       if (initialURL === undefined) {
         initialURL = get(this, 'location').getURL();
       }
@@ -411,6 +411,10 @@ class EmberRouter extends EmberObject {
   }
 
   setupRouter() {
+    if (this._didSetupRouter) {
+      return false;
+    }
+    this._didSetupRouter = true;
     this._setupLocation();
 
     let location = get(this, 'location');
@@ -480,7 +484,9 @@ class EmberRouter extends EmberObject {
       this._toplevelView = OutletView.create();
       this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
       let instance: any = owner.lookup('-application-instance:main');
-      instance.didCreateRootView(this._toplevelView);
+      if (instance) {
+        instance.didCreateRootView(this._toplevelView);
+      }
     } else {
       this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
     }
@@ -607,6 +613,7 @@ class EmberRouter extends EmberObject {
     @method reset
    */
   reset() {
+    this._didSetupRouter = false;
     if (this._routerMicrolib) {
       this._routerMicrolib.reset();
     }
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index 7d8716f8e78..544e8dc2fc2 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -61,6 +61,20 @@ moduleFor(
       assert.ok(!router._routerMicrolib);
     }
 
+    ['@test should create a router.js instance after setupRouter'](assert) {
+      let router = createRouter(undefined, { disableSetup: false });
+
+      assert.ok(router._didSetupRouter);
+      assert.ok(router._routerMicrolib);
+    }
+
+    ['@test should return false if setupRouter is called multiple times'](assert) {
+      let router = createRouter(undefined, { disableSetup: true });
+
+      assert.ok(router.setupRouter());
+      assert.notOk(router.setupRouter());
+    }
+
     ['@test should not reify location until setupRouter is called'](assert) {
       let router = createRouter(undefined, { disableSetup: true });
       assert.equal(typeof router.location, 'string', 'location is specified as a string');
diff --git a/packages/@ember/application/instance.js b/packages/@ember/application/instance.js
index ce37621baa5..4bfe80f66ae 100644
--- a/packages/@ember/application/instance.js
+++ b/packages/@ember/application/instance.js
@@ -159,7 +159,6 @@ const ApplicationInstance = EngineInstance.extend({
   */
   startRouting() {
     this.router.startRouting();
-    this._didSetupRouter = true;
   },
 
   /**
@@ -168,23 +167,18 @@ const ApplicationInstance = EngineInstance.extend({
 
     Because setup should only occur once, multiple calls to `setupRouter`
     beyond the first call have no effect.
-    
+
     This is commonly used in order to confirm things that rely on the router
     are functioning properly from tests that are primarily rendering related.
-    
+
     For example, from within [ember-qunit](https://github.com/emberjs/ember-qunit)'s
     `setupRenderingTest` calling `this.owner.setupRouter()` would allow that
     rendering test to confirm that any `<LinkTo></LinkTo>`'s that are rendered
     have the correct URL.
-    
+
     @public
   */
   setupRouter() {
-    if (this._didSetupRouter) {
-      return;
-    }
-    this._didSetupRouter = true;
-
     this.router.setupRouter();
   },
 
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 13183a45ad2..eb5404e0bfa 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -1143,7 +1143,7 @@ Application.reopenClass({
 });
 
 function commonSetupRegistry(registry) {
-  registry.register('router:main', Router.extend());
+  registry.register('router:main', Router);
   registry.register('-view-registry:main', {
     create() {
       return dictionary(null);
@@ -1167,7 +1167,6 @@ function commonSetupRegistry(registry) {
   });
 
   registry.register('service:router', RouterService);
-  registry.injection('service:router', '_router', 'router:main');
 }
 
 function registerLibraries() {
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
new file mode 100644
index 00000000000..5705cd58760
--- /dev/null
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -0,0 +1,110 @@
+import { inject as injectService } from '@ember/service';
+import { Router, NoneLocation } from '@ember/-internals/routing';
+import { get } from '@ember/-internals/metal';
+import { run } from '@ember/runloop';
+import { Component } from '@ember/-internals/glimmer';
+import { RenderingTestCase, moduleFor } from 'internal-test-helpers';
+
+moduleFor(
+  'Router Service - non application test',
+  class extends RenderingTestCase {
+    constructor() {
+      super(...arguments);
+
+      this.resolver.add('router:main', Router.extend(this.routerOptions));
+      this.router.map(function() {
+        this.route('parent', { path: '/' }, function() {
+          this.route('child');
+          this.route('sister');
+          this.route('brother');
+        });
+        this.route('dynamic', { path: '/dynamic/:dynamic_id' });
+        this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function() {
+          this.route('child', { path: '/:child_id' });
+        });
+      });
+    }
+
+    get routerOptions() {
+      return {
+        location: 'none',
+      };
+    }
+
+    get router() {
+      return this.owner.resolveRegistration('router:main');
+    }
+
+    get routerService() {
+      return this.owner.lookup('service:router');
+    }
+
+    afterEach() {
+      super.afterEach();
+    }
+
+    ['@test RouterService can be instantiated in non application test'](assert) {
+      assert.ok(this.routerService);
+    }
+
+    ['@test RouterService properties can be accessed with default'](assert) {
+      assert.expect(5);
+      assert.equal(this.routerService.get('currentRouteName'), null);
+      assert.equal(this.routerService.get('currentURL'), null);
+      assert.ok(this.routerService.get('location') instanceof NoneLocation);
+      assert.equal(this.routerService.get('rootURL'), '/');
+      assert.equal(this.routerService.get('currentRoute'), null);
+    }
+
+    ['@test RouterService#urlFor returns url'](assert) {
+      assert.equal(this.routerService.urlFor('parent.child'), '/child');
+    }
+
+    ['@test RouterService#transitionTo with basic route'](assert) {
+      assert.expect(2);
+
+      let componentInstance;
+
+      this.addTemplate('parent.index', '{{foo-bar}}');
+
+      this.addComponent('foo-bar', {
+        ComponentClass: Component.extend({
+          routerService: injectService('router'),
+          init() {
+            this._super(...arguments);
+            componentInstance = this;
+          },
+          actions: {
+            transitionToSister() {
+              get(this, 'routerService').transitionTo('parent.sister');
+            },
+          },
+        }),
+        template: `foo-bar`,
+      });
+
+      this.render('{{foo-bar}}');
+
+      run(function() {
+        componentInstance.send('transitionToSister');
+      });
+
+      assert.equal(this.routerService.get('currentRouteName'), 'parent.sister');
+      assert.ok(this.routerService.isActive('parent.sister'));
+    }
+
+    ['@test RouterService#recognize recognize returns routeInfo'](assert) {
+      let routeInfo = this.routerService.recognize('/dynamic-with-child/123/1?a=b');
+      assert.ok(routeInfo);
+      let { name, localName, parent, child, params, queryParams, paramNames } = routeInfo;
+      assert.equal(name, 'dynamicWithChild.child');
+      assert.equal(localName, 'child');
+      assert.ok(parent);
+      assert.equal(parent.name, 'dynamicWithChild');
+      assert.notOk(child);
+      assert.deepEqual(params, { child_id: '1' });
+      assert.deepEqual(queryParams, { a: 'b' });
+      assert.deepEqual(paramNames, ['child_id']);
+    }
+  }
+);

From c9116a8edd6702846ddef9ea392850c217439a18 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Sun, 20 Sep 2020 16:16:30 -0700
Subject: [PATCH 0165/1405] avoid RouterService's own router access triggers
 setup

---
 packages/@ember/-internals/routing/lib/services/router.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 8f00468ee40..8b7fa21181d 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -11,7 +11,7 @@ import { Transition } from 'router_js';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
-const ROUTER = symbol('ROUTER');
+const ROUTER = symbol('ROUTER') as string;
 
 let freezeRouteInfo: Function;
 if (DEBUG) {
@@ -80,14 +80,16 @@ export default class RouterService extends Service {
   init() {
     super.init(...arguments);
 
-    this._router.on('routeWillChange', (transition: Transition) => {
+    const router = getOwner(this).lookup('router:main') as EmberRouter;
+
+    router.on('routeWillChange', (transition: Transition) => {
       if (DEBUG) {
         freezeRouteInfo(transition);
       }
       this.trigger('routeWillChange', transition);
     });
 
-    this._router.on('routeDidChange', (transition: Transition) => {
+    router.on('routeDidChange', (transition: Transition) => {
       if (DEBUG) {
         freezeRouteInfo(transition);
       }

From 009b51abde39bd1cb76d8ebd8ad0d2fe524d27b7 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Tue, 22 Sep 2020 21:37:05 -0700
Subject: [PATCH 0166/1405] use constructor instead of init

---
 packages/@ember/-internals/routing/lib/services/router.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 8b7fa21181d..0046295aacf 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,4 +1,4 @@
-import { getOwner } from '@ember/-internals/owner';
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
@@ -77,10 +77,10 @@ export default class RouterService extends Service {
     return (this[ROUTER] = router);
   }
 
-  init() {
-    super.init(...arguments);
+  constructor(owner: Owner) {
+    super(owner);
 
-    const router = getOwner(this).lookup('router:main') as EmberRouter;
+    const router = owner.lookup('router:main') as EmberRouter;
 
     router.on('routeWillChange', (transition: Transition) => {
       if (DEBUG) {

From b713a3b6c3fafaddcf5972abbef39bd4a6ed8b63 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Thu, 24 Sep 2020 08:28:31 -0700
Subject: [PATCH 0167/1405] cast correct type

---
 packages/@ember/-internals/routing/lib/services/router.ts     | 4 ++--
 .../routing/router_service_test/non_application_test_test.js  | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 0046295aacf..14739d18fb7 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -71,8 +71,8 @@ export default class RouterService extends Service {
     if (router !== undefined) {
       return router;
     }
-    const owner = getOwner(this) as any;
-    router = owner.lookup('router:main');
+    const owner = getOwner(this) as Owner;
+    router = owner.lookup('router:main') as EmberRouter;
     router.setupRouter();
     return (this[ROUTER] = router);
   }
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index 5705cd58760..a898d4afa67 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -39,10 +39,6 @@ moduleFor(
       return this.owner.lookup('service:router');
     }
 
-    afterEach() {
-      super.afterEach();
-    }
-
     ['@test RouterService can be instantiated in non application test'](assert) {
       assert.ok(this.routerService);
     }

From 517927b594e0534dc04fa07f6d7f487c30dc5ec7 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Thu, 1 Oct 2020 22:53:49 -0700
Subject: [PATCH 0168/1405] Copy RenderingTestCase to a separate
 RouterNonApplicationTestCase

---
 .../non_application_test_test.js              |   4 +-
 packages/internal-test-helpers/index.js       |   1 +
 .../lib/test-cases/router-non-application.js  | 213 ++++++++++++++++++
 3 files changed, 216 insertions(+), 2 deletions(-)
 create mode 100644 packages/internal-test-helpers/lib/test-cases/router-non-application.js

diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index a898d4afa67..76beab597d3 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -3,11 +3,11 @@ import { Router, NoneLocation } from '@ember/-internals/routing';
 import { get } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';
-import { RenderingTestCase, moduleFor } from 'internal-test-helpers';
+import { RouterNonApplicationTestCase, moduleFor } from 'internal-test-helpers';
 
 moduleFor(
   'Router Service - non application test',
-  class extends RenderingTestCase {
+  class extends RouterNonApplicationTestCase {
     constructor() {
       super(...arguments);
 
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index 8691e514536..ca57769a58d 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -16,6 +16,7 @@ export { default as AbstractApplicationTestCase } from './lib/test-cases/abstrac
 export { default as ApplicationTestCase } from './lib/test-cases/application';
 export { default as QueryParamTestCase } from './lib/test-cases/query-param';
 export { default as RenderingTestCase } from './lib/test-cases/rendering';
+export { default as RouterNonApplicationTestCase } from './lib/test-cases/router-non-application';
 export { default as RouterTestCase } from './lib/test-cases/router';
 export { default as AutobootApplicationTestCase } from './lib/test-cases/autoboot-application';
 export { default as DefaultResolverApplicationTestCase } from './lib/test-cases/default-resolver-application';
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.js b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
new file mode 100644
index 00000000000..7e9837e4c65
--- /dev/null
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
@@ -0,0 +1,213 @@
+import { assign } from '@ember/polyfills';
+import { compile } from 'ember-template-compiler';
+import { EventDispatcher } from '@ember/-internals/views';
+import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer';
+import { ModuleBasedResolver } from '../test-resolver';
+
+import AbstractTestCase from './abstract';
+import buildOwner from '../build-owner';
+import { runAppend, runDestroy } from '../run';
+
+const TextNode = window.Text;
+
+export default class RouterNonApplicationTestCase extends AbstractTestCase {
+  constructor() {
+    super(...arguments);
+    let bootOptions = this.getBootOptions();
+
+    let owner = (this.owner = buildOwner({
+      ownerOptions: this.getOwnerOptions(),
+      resolver: this.getResolver(),
+      bootOptions,
+    }));
+
+    owner.register('-view-registry:main', Object.create(null), { instantiate: false });
+    owner.register('event_dispatcher:main', EventDispatcher);
+
+    // TODO: why didn't buildOwner do this for us?
+    owner.inject('renderer', '_viewRegistry', '-view-registry:main');
+
+    this.renderer = this.owner.lookup('renderer:-dom');
+    this.element = document.querySelector('#qunit-fixture');
+    this.component = null;
+
+    if (!bootOptions || bootOptions.isInteractive !== false) {
+      owner.lookup('event_dispatcher:main').setup(this.getCustomDispatcherEvents(), this.element);
+    }
+  }
+
+  compile() {
+    return compile(...arguments);
+  }
+
+  getCustomDispatcherEvents() {
+    return {};
+  }
+
+  getOwnerOptions() {}
+  getBootOptions() {}
+
+  get resolver() {
+    return this.owner.__registry__.fallback.resolver;
+  }
+
+  getResolver() {
+    return new ModuleBasedResolver();
+  }
+
+  add(specifier, factory) {
+    this.resolver.add(specifier, factory);
+  }
+
+  addTemplate(templateName, templateString) {
+    if (typeof templateName === 'string') {
+      this.resolver.add(
+        `template:${templateName}`,
+        this.compile(templateString, {
+          moduleName: templateName,
+        })
+      );
+    } else {
+      this.resolver.add(
+        templateName,
+        this.compile(templateString, {
+          moduleName: templateName.moduleName,
+        })
+      );
+    }
+  }
+
+  addComponent(name, { ComponentClass = null, template = null }) {
+    if (ComponentClass) {
+      this.resolver.add(`component:${name}`, ComponentClass);
+    }
+
+    if (typeof template === 'string') {
+      this.resolver.add(
+        `template:components/${name}`,
+        this.compile(template, {
+          moduleName: `components/${name}`,
+        })
+      );
+    }
+  }
+
+  afterEach() {
+    try {
+      if (this.component) {
+        runDestroy(this.component);
+      }
+      if (this.owner) {
+        runDestroy(this.owner);
+      }
+    } finally {
+      _resetRenderers();
+    }
+  }
+
+  get context() {
+    return this.component;
+  }
+
+  render(templateStr, context = {}) {
+    let { owner } = this;
+
+    owner.register(
+      'template:-top-level',
+      this.compile(templateStr, {
+        moduleName: '-top-level',
+      })
+    );
+
+    let attrs = assign({}, context, {
+      tagName: '',
+      layoutName: '-top-level',
+    });
+
+    owner.register('component:-top-level', Component.extend(attrs));
+
+    this.component = owner.lookup('component:-top-level');
+
+    runAppend(this.component);
+  }
+
+  rerender() {
+    this.component.rerender();
+  }
+
+  registerHelper(name, funcOrClassBody) {
+    let type = typeof funcOrClassBody;
+
+    if (type === 'function') {
+      this.owner.register(`helper:${name}`, helper(funcOrClassBody));
+    } else if (type === 'object' && type !== null) {
+      this.owner.register(`helper:${name}`, Helper.extend(funcOrClassBody));
+    } else {
+      throw new Error(`Cannot register ${funcOrClassBody} as a helper`);
+    }
+  }
+
+  registerPartial(name, template) {
+    let owner = this.owner;
+    if (typeof template === 'string') {
+      owner.register(
+        `template:${name}`,
+        this.compile(template, { moduleName: `my-app/templates/-${name}.hbs` })
+      );
+    }
+  }
+
+  registerComponent(name, { ComponentClass = Component, template = null }) {
+    let { owner } = this;
+
+    if (ComponentClass) {
+      owner.register(`component:${name}`, ComponentClass);
+    }
+
+    if (typeof template === 'string') {
+      owner.register(
+        `template:components/${name}`,
+        this.compile(template, {
+          moduleName: `my-app/templates/components/${name}.hbs`,
+        })
+      );
+    }
+  }
+
+  registerModifier(name, ModifierClass) {
+    let { owner } = this;
+
+    owner.register(`modifier:${name}`, ModifierClass);
+  }
+
+  registerComponentManager(name, manager) {
+    let owner = this.owner;
+    owner.register(`component-manager:${name}`, manager);
+  }
+
+  registerTemplate(name, template) {
+    let { owner } = this;
+    if (typeof template === 'string') {
+      owner.register(
+        `template:${name}`,
+        this.compile(template, {
+          moduleName: `my-app/templates/${name}.hbs`,
+        })
+      );
+    } else {
+      throw new Error(`Registered template "${name}" must be a string`);
+    }
+  }
+
+  registerService(name, klass) {
+    this.owner.register(`service:${name}`, klass);
+  }
+
+  assertTextNode(node, text) {
+    if (!(node instanceof TextNode)) {
+      throw new Error(`Expecting a text node, but got ${node}`);
+    }
+
+    this.assert.strictEqual(node.textContent, text, 'node.textContent');
+  }
+}

From cba48c512ce5426d6f6527a93e5366c3de5b9796 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Fri, 2 Oct 2020 15:48:09 -0700
Subject: [PATCH 0169/1405] Trim RouterNonApplicationTestCase to minimum

---
 .../non_application_test_test.js              |  8 +-
 .../lib/test-cases/router-non-application.js  | 96 +------------------
 2 files changed, 5 insertions(+), 99 deletions(-)

diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index 76beab597d3..ffaf14b3c10 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -12,14 +12,14 @@ moduleFor(
       super(...arguments);
 
       this.resolver.add('router:main', Router.extend(this.routerOptions));
-      this.router.map(function() {
-        this.route('parent', { path: '/' }, function() {
+      this.router.map(function () {
+        this.route('parent', { path: '/' }, function () {
           this.route('child');
           this.route('sister');
           this.route('brother');
         });
         this.route('dynamic', { path: '/dynamic/:dynamic_id' });
-        this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function() {
+        this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function () {
           this.route('child', { path: '/:child_id' });
         });
       });
@@ -81,7 +81,7 @@ moduleFor(
 
       this.render('{{foo-bar}}');
 
-      run(function() {
+      run(function () {
         componentInstance.send('transitionToSister');
       });
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.js b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
index 7e9837e4c65..f59a298f98a 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
@@ -1,15 +1,13 @@
 import { assign } from '@ember/polyfills';
 import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
-import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer';
+import { Component, _resetRenderers } from '@ember/-internals/glimmer';
 import { ModuleBasedResolver } from '../test-resolver';
 
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy } from '../run';
 
-const TextNode = window.Text;
-
 export default class RouterNonApplicationTestCase extends AbstractTestCase {
   constructor() {
     super(...arguments);
@@ -30,20 +28,12 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     this.renderer = this.owner.lookup('renderer:-dom');
     this.element = document.querySelector('#qunit-fixture');
     this.component = null;
-
-    if (!bootOptions || bootOptions.isInteractive !== false) {
-      owner.lookup('event_dispatcher:main').setup(this.getCustomDispatcherEvents(), this.element);
-    }
   }
 
   compile() {
     return compile(...arguments);
   }
 
-  getCustomDispatcherEvents() {
-    return {};
-  }
-
   getOwnerOptions() {}
   getBootOptions() {}
 
@@ -105,10 +95,6 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     }
   }
 
-  get context() {
-    return this.component;
-  }
-
   render(templateStr, context = {}) {
     let { owner } = this;
 
@@ -130,84 +116,4 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
 
     runAppend(this.component);
   }
-
-  rerender() {
-    this.component.rerender();
-  }
-
-  registerHelper(name, funcOrClassBody) {
-    let type = typeof funcOrClassBody;
-
-    if (type === 'function') {
-      this.owner.register(`helper:${name}`, helper(funcOrClassBody));
-    } else if (type === 'object' && type !== null) {
-      this.owner.register(`helper:${name}`, Helper.extend(funcOrClassBody));
-    } else {
-      throw new Error(`Cannot register ${funcOrClassBody} as a helper`);
-    }
-  }
-
-  registerPartial(name, template) {
-    let owner = this.owner;
-    if (typeof template === 'string') {
-      owner.register(
-        `template:${name}`,
-        this.compile(template, { moduleName: `my-app/templates/-${name}.hbs` })
-      );
-    }
-  }
-
-  registerComponent(name, { ComponentClass = Component, template = null }) {
-    let { owner } = this;
-
-    if (ComponentClass) {
-      owner.register(`component:${name}`, ComponentClass);
-    }
-
-    if (typeof template === 'string') {
-      owner.register(
-        `template:components/${name}`,
-        this.compile(template, {
-          moduleName: `my-app/templates/components/${name}.hbs`,
-        })
-      );
-    }
-  }
-
-  registerModifier(name, ModifierClass) {
-    let { owner } = this;
-
-    owner.register(`modifier:${name}`, ModifierClass);
-  }
-
-  registerComponentManager(name, manager) {
-    let owner = this.owner;
-    owner.register(`component-manager:${name}`, manager);
-  }
-
-  registerTemplate(name, template) {
-    let { owner } = this;
-    if (typeof template === 'string') {
-      owner.register(
-        `template:${name}`,
-        this.compile(template, {
-          moduleName: `my-app/templates/${name}.hbs`,
-        })
-      );
-    } else {
-      throw new Error(`Registered template "${name}" must be a string`);
-    }
-  }
-
-  registerService(name, klass) {
-    this.owner.register(`service:${name}`, klass);
-  }
-
-  assertTextNode(node, text) {
-    if (!(node instanceof TextNode)) {
-      throw new Error(`Expecting a text node, but got ${node}`);
-    }
-
-    this.assert.strictEqual(node.textContent, text, 'node.textContent');
-  }
 }

From 40ae052f97cc111419333281eac848c1a6491571 Mon Sep 17 00:00:00 2001
From: Russell Tepper <rtepper@movableink.com>
Date: Tue, 13 Oct 2020 12:27:11 -0400
Subject: [PATCH 0170/1405] [DOC beta] Add return types to Controller docs

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index df95e211a79..4e840e56a3d 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -147,6 +147,8 @@ ControllerMixin.reopen({
       containing a mapping of query parameters
     @for Ember.ControllerMixin
     @method transitionToRoute
+    @return {Transition} the transition object associated with this
+      attempted transition
     @public
   */
   transitionToRoute(...args: any[]) {
@@ -211,6 +213,8 @@ ControllerMixin.reopen({
     while transitioning to the route.
     @for Ember.ControllerMixin
     @method replaceRoute
+    @return {Transition} the transition object associated with this
+      attempted transition
     @public
   */
   replaceRoute(...args: string[]) {

From 35ca78132f93481a4127b5f5cad48b7107bd86a8 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 13 Oct 2020 09:35:36 -0700
Subject: [PATCH 0171/1405] [BUGFIX release] Ensure user lifecycle hooks are
 untracked

When we refactored the VM to use autotracking internally, some lifecycle
hooks were tracked that previously weren't on classic components. This
PR ensures those hooks are no longer tracked, maintaining their previous
behavior.
---
 .../glimmer/lib/component-managers/curly.ts   |  2 +
 .../lib/utils/curly-component-state-bucket.ts |  4 +-
 .../components/curly-components-test.js       | 71 ++++++++++++++++++-
 3 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 6587f4faa13..313bb87de38 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -430,7 +430,9 @@ export default class CurlyComponentManager
     component._transitionTo('hasElement');
 
     if (environment.isInteractive) {
+      beginUntrackFrame();
       component.trigger('willInsertElement');
+      endUntrackFrame();
     }
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index e5089080f0b..02738804bbe 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -2,7 +2,7 @@ import { clearElementView, clearViewElement, getViewElement } from '@ember/-inte
 import { CapturedNamedArguments } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { Revision, Tag, valueForTag } from '@glimmer/validator';
+import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import { Renderer } from '../renderer';
 import { Factory as TemplateFactory, OwnedTemplate } from '../template';
@@ -64,8 +64,10 @@ export default class ComponentStateBucket {
     let { component, environment } = this;
 
     if (environment.isInteractive) {
+      beginUntrackFrame();
       component.trigger('willDestroyElement');
       component.trigger('willClearRender');
+      endUntrackFrame();
 
       let element = getViewElement(component);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 388becfbc27..8204301edc0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -12,7 +12,7 @@ import {
 
 import { run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { alias, set, get, observer, on, computed } from '@ember/-internals/metal';
+import { alias, set, get, observer, on, computed, tracked } from '@ember/-internals/metal';
 import Service, { inject as injectService } from '@ember/service';
 import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 import { jQueryDisabled } from '@ember/-internals/views';
@@ -3732,6 +3732,75 @@ moduleFor(
 
       this.assertComponentElement(this.firstChild, { content: 'hello' });
     }
+
+    '@test lifecycle hooks are not tracked'() {
+      this.registerComponent('foo-bar', {
+        ComponentClass: class extends Component {
+          @tracked foo;
+
+          willInsertElement() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          willRender() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          didRender() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          didReceiveAttrs() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          didUpdate() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          didUpdateAttrs() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          didInsertElement() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          willClearRender() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          willDestroyElement() {
+            this.foo;
+            this.foo = 123;
+          }
+
+          didDestroyElement() {
+            this.foo;
+            this.foo = 123;
+          }
+        },
+        template: '{{this.baz}}',
+      });
+
+      this.render('{{#if cond}}{{foo-bar baz=this.value}}{{/if}}', { cond: true, value: 'hello' });
+
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+
+      runTask(() => set(this.context, 'value', 'world'));
+
+      this.assertComponentElement(this.firstChild, { content: 'world' });
+
+      runTask(() => set(this.context, 'cond', false));
+    }
   }
 );
 

From 8fc0f9b2b3220e44940e79493f7e101a958c6aa0 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 13 Oct 2020 12:57:06 -0700
Subject: [PATCH 0172/1405] [BUGFIX] Asserts that fn is passed a function
 eagerly

---
 .../-internals/glimmer/lib/helpers/fn.ts      | 41 ++++++++++---------
 .../tests/integration/helpers/fn-test.js      |  6 +--
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 24c6b528fd8..63a3f7e87d5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -1,7 +1,13 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { VMArguments } from '@glimmer/interfaces';
-import { createComputeRef, isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
+import {
+  createComputeRef,
+  isInvokableRef,
+  Reference,
+  updateRef,
+  valueForRef,
+} from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 import buildUntouchableThis from '../utils/untouchable-this';
 
@@ -78,33 +84,19 @@ const context = buildUntouchableThis('`fn` helper');
   @public
   @since 3.11.0
 */
-
 export default function (args: VMArguments) {
   let positional = args.positional.capture();
+  let callbackRef = positional[0];
+
+  if (DEBUG) assertCallbackIsFn(callbackRef);
 
   return createComputeRef(
     () => {
-      let callbackRef = positional[0];
-
-      assert(
-        `You must pass a function as the \`fn\` helpers first argument.`,
-        callbackRef !== undefined
-      );
-
-      if (DEBUG && !isInvokableRef(callbackRef)) {
-        let callback = valueForRef(callbackRef);
-
-        assert(
-          `You must pass a function as the \`fn\` helpers first argument, you passed ${
-            callback === null ? 'null' : typeof callback
-          }. While rendering:\n\n${callbackRef.debugLabel}`,
-          typeof callback === 'function'
-        );
-      }
-
       return (...invocationArgs: unknown[]) => {
         let [fn, ...args] = reifyPositional(positional);
 
+        if (DEBUG) assertCallbackIsFn(callbackRef);
+
         if (isInvokableRef(callbackRef)) {
           let value = args[0] || invocationArgs[0];
           return updateRef(callbackRef, value);
@@ -117,3 +109,12 @@ export default function (args: VMArguments) {
     'fn'
   );
 }
+
+function assertCallbackIsFn(callbackRef: Reference) {
+  assert(
+    `You must pass a function as the \`fn\` helpers first argument, you passed ${
+      callbackRef ? valueForRef(callbackRef) : callbackRef
+    }. While rendering:\n\n${callbackRef?.debugLabel}`,
+    callbackRef && (isInvokableRef(callbackRef) || typeof valueForRef(callbackRef) === 'function')
+  );
+}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
index 646c37b4dab..7a3f6c9cdc1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
@@ -122,7 +122,7 @@ moduleFor(
 
     '@test asserts if no argument given'() {
       expectAssertion(() => {
-        this.render(`{{invoke (fn)}}`, {
+        this.render(`{{fn}}`, {
           myFunc: null,
           arg1: 'foo',
           arg2: 'bar',
@@ -132,7 +132,7 @@ moduleFor(
 
     '@test asserts if the first argument is undefined'() {
       expectAssertion(() => {
-        this.render(`{{invoke (fn this.myFunc this.arg1 this.arg2)}}`, {
+        this.render(`{{fn this.myFunc this.arg1 this.arg2}}`, {
           myFunc: undefined,
           arg1: 'foo',
           arg2: 'bar',
@@ -142,7 +142,7 @@ moduleFor(
 
     '@test asserts if the first argument is null'() {
       expectAssertion(() => {
-        this.render(`{{invoke (fn this.myFunc this.arg1 this.arg2)}}`, {
+        this.render(`{{fn this.myFunc this.arg1 this.arg2}}`, {
           myFunc: null,
           arg1: 'foo',
           arg2: 'bar',

From 952a4fbf5394c02df7bbcbb24d1ff5dde8fcf531 Mon Sep 17 00:00:00 2001
From: Russell Tepper <rtepper@movableink.com>
Date: Tue, 13 Oct 2020 16:52:00 -0400
Subject: [PATCH 0173/1405] [CLEANUP beta] Remove in-element feature flag

---
 .../syntax/deprecated-in-element-test.js      | 39 ++--------
 .../syntax/public-in-element-test.js          | 16 ++---
 packages/@ember/canary-features/index.ts      |  2 -
 .../lib/plugins/transform-in-element.ts       | 71 ++++++++-----------
 4 files changed, 44 insertions(+), 84 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
index 3e1b7019d4a..b88e4f522aa 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
@@ -1,27 +1,14 @@
 import { moduleFor, RenderingTestCase, strip, equalTokens, runTask } from 'internal-test-helpers';
 import { Component } from '@ember/-internals/glimmer';
 import { set } from '@ember/-internals/metal';
-import { EMBER_GLIMMER_IN_ELEMENT } from '@ember/canary-features';
 
 const deprecationMessage = /The use of the private `{{-in-element}}` is deprecated, please refactor to the public `{{in-element}}`/;
 
 moduleFor(
   '{{-in-element}}',
   class extends RenderingTestCase {
-    ['@feature(!EMBER_GLIMMER_IN_ELEMENT) using {{#in-element whatever}} asserts']() {
-      // the in-element keyword is not yet public API this test should be removed
-      // once https://github.com/emberjs/rfcs/pull/287 lands and is enabled
-
-      let el = document.createElement('div');
-      expectAssertion(() => {
-        this.render(strip`{{#in-element el}}{{/in-element}}`, { el });
-      }, /The {{in-element}} helper cannot be used. \('-top-level' @ L1:C0\)/);
-    }
-
     ['@test allows rendering into an external element']() {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       let someElement = document.createElement('div');
 
@@ -54,9 +41,7 @@ moduleFor(
     }
 
     ['@test it appends to the external element by default']() {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       let someElement = document.createElement('div');
       someElement.appendChild(document.createTextNode('foo '));
@@ -90,9 +75,7 @@ moduleFor(
     }
 
     ['@test allows appending to the external element with insertBefore=null']() {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       let someElement = document.createElement('div');
       someElement.appendChild(document.createTextNode('foo '));
@@ -126,9 +109,7 @@ moduleFor(
     }
 
     ['@test allows clearing the external element with insertBefore=undefined']() {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       let someElement = document.createElement('div');
       someElement.appendChild(document.createTextNode('foo '));
@@ -162,9 +143,7 @@ moduleFor(
     }
 
     ['@test does not allow insertBefore=non-null-value']() {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       let someElement = document.createElement('div');
 
@@ -184,9 +163,7 @@ moduleFor(
     }
 
     ['@test components are cleaned up properly'](assert) {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       let hooks = [];
 
@@ -256,9 +233,7 @@ moduleFor(
     }
 
     ['@test appending to the root element should not cause double clearing']() {
-      if (EMBER_GLIMMER_IN_ELEMENT) {
-        expectDeprecation(deprecationMessage);
-      }
+      expectDeprecation(deprecationMessage);
 
       this.render(
         strip`
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
index 7a9a6db03be..3179b289c3d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
@@ -6,7 +6,7 @@ import { set } from '@ember/-internals/metal';
 moduleFor(
   '{{in-element}}',
   class extends RenderingTestCase {
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) allows rendering into an external element']() {
+    ['@test allows rendering into an external element']() {
       let someElement = document.createElement('div');
 
       this.render(
@@ -37,7 +37,7 @@ moduleFor(
       equalTokens(someElement, 'Whoop!');
     }
 
-    ["@feature(EMBER_GLIMMER_IN_ELEMENT) it replaces the external element's content by default"]() {
+    ["@test it replaces the external element's content by default"]() {
       let someElement = document.createElement('div');
       someElement.appendChild(document.createTextNode('foo '));
 
@@ -69,7 +69,7 @@ moduleFor(
       equalTokens(someElement, 'bar');
     }
 
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) allows appending to the external element with insertBefore=null']() {
+    ['@test allows appending to the external element with insertBefore=null']() {
       let someElement = document.createElement('div');
       someElement.appendChild(document.createTextNode('foo '));
 
@@ -101,7 +101,7 @@ moduleFor(
       equalTokens(someElement, 'foo bar');
     }
 
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) does not allow insertBefore=non-null-value']() {
+    ['@test does not allow insertBefore=non-null-value']() {
       let someElement = document.createElement('div');
 
       expectAssertion(() => {
@@ -119,7 +119,7 @@ moduleFor(
       }, /Can only pass null to insertBefore in in-element, received:/);
     }
 
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) does not allow null as a destination element']() {
+    ['@test does not allow null as a destination element']() {
       let someElement = null;
 
       expectAssertion(() => {
@@ -137,7 +137,7 @@ moduleFor(
       }, /You cannot pass a null or undefined destination element to in-element/);
     }
 
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) does not undefined as a destination element']() {
+    ['@test does not undefined as a destination element']() {
       let someElement = undefined;
 
       expectAssertion(() => {
@@ -155,7 +155,7 @@ moduleFor(
       }, /You cannot pass a null or undefined destination element to in-element/);
     }
 
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) components are cleaned up properly'](assert) {
+    ['@test components are cleaned up properly'](assert) {
       let hooks = [];
 
       let someElement = document.createElement('div');
@@ -223,7 +223,7 @@ moduleFor(
       assert.deepEqual(hooks, ['didInsertElement', 'willDestroyElement']);
     }
 
-    ['@feature(EMBER_GLIMMER_IN_ELEMENT) appending to the root element should not cause double clearing']() {
+    ['@test appending to the root element should not cause double clearing']() {
       this.render(
         strip`
           Before
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 98bdcdf2cde..8e2b946bf26 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -18,7 +18,6 @@ export const DEFAULT_FEATURES = {
   EMBER_NAMED_BLOCKS: null,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
-  EMBER_GLIMMER_IN_ELEMENT: true,
   EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
@@ -79,7 +78,6 @@ export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
   FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 );
 export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL_ARG);
-export const EMBER_GLIMMER_IN_ELEMENT = featureValue(FEATURES.EMBER_GLIMMER_IN_ELEMENT);
 export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
 export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 2b663493079..4c094518547 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -1,4 +1,3 @@
-import { EMBER_GLIMMER_IN_ELEMENT } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
@@ -54,45 +53,39 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
         if (!isPath(node.path)) return;
 
         if (node.path.original === 'in-element') {
-          if (EMBER_GLIMMER_IN_ELEMENT) {
-            let originalValue = node.params[0];
+          let originalValue = node.params[0];
 
-            if (originalValue && !env.isProduction) {
-              let subExpr = b.sexpr('-in-el-null', [originalValue]);
+          if (originalValue && !env.isProduction) {
+            let subExpr = b.sexpr('-in-el-null', [originalValue]);
 
-              node.params.shift();
-              node.params.unshift(subExpr);
-            }
-
-            node.hash.pairs.forEach((pair) => {
-              if (pair.key === 'insertBefore') {
-                assert(
-                  `Can only pass null to insertBefore in in-element, received: ${JSON.stringify(
-                    pair.value
-                  )}`,
-                  pair.value.type === 'NullLiteral' || pair.value.type === 'UndefinedLiteral'
-                );
-              }
-            });
-          } else {
-            assert(assertMessage(moduleName, node));
+            node.params.shift();
+            node.params.unshift(subExpr);
           }
+
+          node.hash.pairs.forEach((pair) => {
+            if (pair.key === 'insertBefore') {
+              assert(
+                `Can only pass null to insertBefore in in-element, received: ${JSON.stringify(
+                  pair.value
+                )}`,
+                pair.value.type === 'NullLiteral' || pair.value.type === 'UndefinedLiteral'
+              );
+            }
+          });
         } else if (node.path.original === '-in-element') {
-          if (EMBER_GLIMMER_IN_ELEMENT) {
-            let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-            deprecate(
-              `The use of the private \`{{-in-element}}\` is deprecated, please refactor to the public \`{{in-element}}\`. ${sourceInformation}`,
-              false,
-              {
-                id: 'glimmer.private-in-element',
-                until: '3.25.0',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.20.0',
-                },
-              }
-            );
-          }
+          let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
+          deprecate(
+            `The use of the private \`{{-in-element}}\` is deprecated, please refactor to the public \`{{in-element}}\`. ${sourceInformation}`,
+            false,
+            {
+              id: 'glimmer.private-in-element',
+              until: '3.25.0',
+              for: 'ember-source',
+              since: {
+                enabled: '3.20.0',
+              },
+            }
+          );
 
           node.path.original = 'in-element';
           node.path.parts = ['in-element'];
@@ -125,9 +118,3 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
     },
   };
 }
-
-function assertMessage(moduleName: string, node: AST.BlockStatement) {
-  let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-
-  return `The {{in-element}} helper cannot be used. ${sourceInformation}`;
-}

From e1b803e74103065ee73df997e02297df7cef699e Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 14 Oct 2020 18:44:14 -0700
Subject: [PATCH 0174/1405] [BUGFIX lts] Cleans up the DebugRenderTree more
 thoroughly on errors

The DebugRenderTree is currently left in a bad state after an error
occurs during render. Specifically, if an error occurs and we call
`capture` on the tree, it will throw errors because the state hasn't
been setup correctly. In real world development, this can happen
whenever the Ember Inspector is open and an app has errored, as the
inspector polls regardless of the state of the app and doesn't take
error state into account. This results in a follow on error to the
original error, which is confusing and can make it more difficult to
debug.

This fixes the issue by removing the affected root altogether, so that
it will not attempt to capture in the first place.
---
 .../glimmer/lib/utils/debug-render-tree.ts    |  9 ++++++++
 .../application/debug-render-tree-test.ts     | 22 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
index 51437f49dc0..a47ad15d265 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
@@ -128,6 +128,15 @@ export default class DebugRenderTree<Bucket extends object = object> {
 
       // TODO: We could warn here? But this happens all the time in our tests?
 
+      // Clean up the root reference to prevent errors from happening if we
+      // attempt to capture the render tree (Ember Inspector may do this)
+      let root = expect(this.stack.toArray()[0], 'expected root state when resetting render tree');
+      let ref = this.refs.get(root);
+
+      if (ref !== undefined) {
+        this.roots.delete(ref);
+      }
+
       while (!this.stack.isEmpty()) {
         this.stack.pop();
       }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 01227f70938..70784295787 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1644,6 +1644,28 @@ if (ENV._DEBUG_RENDER_TREE) {
           this.assert.strictEqual(actual, expected, `Matching ${path}`);
         }
       }
+
+      async '@test cleans up correctly after errors'(assert: Assert) {
+        this.addTemplate(
+          'application',
+          strip`
+            <HelloWorld @name="first" />
+          `
+        );
+
+        this.addComponent('hello-world', {
+          ComponentClass: Component.extend({
+            init() {
+              throw new Error('oops!');
+            },
+          }),
+          template: 'Hello World',
+        });
+
+        await assert.rejectsAssertion(this.visit('/'), /oops!/);
+
+        assert.deepEqual(captureRenderTree(this.owner), [], 'there was no output');
+      }
     }
   );
 }

From fdb0be062aabc61a67d9f9cd4af457e3bddb0f83 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 14 Oct 2020 17:55:52 -0700
Subject: [PATCH 0175/1405] [BUGFIX] Prevents infinite rerenders when errors
 occur during render

This adds a preventative measure against infinite rerenders that happen
due to an unrecoverable error during rendering. This type of error is
really annoying from a DX perspective and can really throw developers
for a loop. The most common cases appear to be caused by the Ember
Inspector, which polls after a render has occured whether on not it was
succesful, and in doing so also dirties state, causing a rerender.

An example of this is seen in this [example reproduction](https://github.com/xg-wang/getter-error)
with the following steps:

1. Load the app
2. Click the To View link to enter the page with the error
3. Open up the Ember Inspector to activate it
4. Reload the page
---
 .../@ember/-internals/glimmer/lib/renderer.ts | 35 +++++++++++++++++--
 .../components/error-handling-test.js         | 16 +++++++--
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 418357e7c90..d66aaacb783 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -3,6 +3,7 @@ import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   Cursor,
@@ -77,6 +78,34 @@ export class DynamicScope implements GlimmerDynamicScope {
   }
 }
 
+// This wrapper logic prevents us from rerendering in case of a hard failure
+// during render. This prevents infinite revalidation type loops from occuring,
+// and ensures that errors are not swallowed by subsequent follow on failures.
+function errorLoopTransaction(fn: () => void) {
+  if (DEBUG) {
+    return () => {
+      let didError = true;
+
+      try {
+        fn();
+        didError = false;
+      } finally {
+        if (didError) {
+          // Noop the function so that we won't keep calling it and causing
+          // infinite looping failures;
+          fn = () => {
+            console.warn(
+              'Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.'
+            );
+          };
+        }
+      }
+    };
+  } else {
+    return fn;
+  }
+}
+
 class RootState {
   public id: string;
   public result: RenderResult | undefined;
@@ -102,7 +131,7 @@ class RootState {
     this.result = undefined;
     this.destroyed = false;
 
-    this.render = () => {
+    this.render = errorLoopTransaction(() => {
       let layout = unwrapTemplate(template).asLayout();
       let handle = layout.compile(context);
 
@@ -118,8 +147,8 @@ class RootState {
       let result = (this.result = iterator.sync());
 
       // override .render function after initial render
-      this.render = () => result.rerender({ alwaysRevalidate: false });
-    };
+      this.render = errorLoopTransaction(() => result.rerender({ alwaysRevalidate: false }));
+    });
   }
 
   isFor(possibleRoot: unknown): boolean {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
index 7b1d6ea15ab..a220ae419df 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
@@ -1,3 +1,5 @@
+import { DEBUG } from '@glimmer/env';
+
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { set } from '@ember/-internals/metal';
@@ -43,10 +45,14 @@ moduleFor(
 
       runTask(() => set(this.context, 'switch', true));
 
-      this.assertText('hello');
+      if (DEBUG) {
+        this.assertText('', 'it does not rerender after error in development');
+      } else {
+        this.assertText('hello', 'it rerenders after error in production');
+      }
     }
 
-    ['@skip it can recover resets the transaction when an error is thrown during rerender'](
+    ['@test it can recover resets the transaction when an error is thrown during rerender'](
       assert
     ) {
       let shouldThrow = false;
@@ -91,7 +97,11 @@ moduleFor(
 
       runTask(() => set(this.context, 'switch', true));
 
-      this.assertText('hello');
+      if (DEBUG) {
+        this.assertText('', 'it does not rerender after error in development');
+      } else {
+        this.assertText('hello', 'it does rerender after error in production');
+      }
     }
 
     ['@test it can recover resets the transaction when an error is thrown during didInsertElement'](

From 41b68b7ccb0720e08ab7011be8809bb929b7664c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 13 Oct 2020 14:43:16 -0700
Subject: [PATCH 0176/1405] [BUGFIX] Asserts when users attempt to set a
 shadowed value with Ember.set

---
 .../@ember/-internals/metal/lib/decorator.ts  | 39 ++++++++++++++-----
 .../-internals/metal/lib/property_set.ts      | 24 ++++++++++--
 .../@ember/-internals/metal/lib/tracked.ts    |  7 ++++
 .../metal/tests/tracked/set_test.js           | 16 ++++++++
 .../-internals/routing/lib/system/router.ts   |  2 +-
 5 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index a493e52bca5..bd172ec2271 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -1,5 +1,7 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { _WeakSet as WeakSet } from '@glimmer/util';
 
 export type DecoratorPropertyDescriptor = (PropertyDescriptor & { initializer?: any }) | undefined;
 
@@ -69,19 +71,39 @@ export abstract class ComputedDescriptor {
   abstract set(obj: object, keyName: string, value: any | null | undefined): any | null | undefined;
 }
 
-function DESCRIPTOR_GETTER_FUNCTION(name: string, descriptor: ComputedDescriptor): () => any {
-  return function CPGETTER_FUNCTION(this: object): any {
+export let CPGETTERS: WeakSet<() => unknown>;
+export let CPSETTERS: WeakSet<(value: unknown) => void>;
+
+if (DEBUG) {
+  CPGETTERS = new WeakSet();
+  CPSETTERS = new WeakSet();
+}
+
+function DESCRIPTOR_GETTER_FUNCTION(name: string, descriptor: ComputedDescriptor): () => unknown {
+  function getter(this: object): unknown {
     return descriptor.get(this, name);
-  };
+  }
+
+  if (DEBUG) {
+    CPGETTERS.add(getter);
+  }
+
+  return getter;
 }
 
 function DESCRIPTOR_SETTER_FUNCTION(
   name: string,
   descriptor: ComputedDescriptor
-): (value: any) => void {
-  return function CPSETTER_FUNCTION(this: object, value: any): void {
+): (value: unknown) => void {
+  function setter(this: object, value: unknown): void {
     return descriptor.set(this, name, value);
-  };
+  }
+
+  if (DEBUG) {
+    CPSETTERS.add(setter);
+  }
+
+  return setter;
 }
 
 export function makeComputedDecorator(
@@ -97,10 +119,7 @@ export function makeComputedDecorator(
   ): DecoratorPropertyDescriptor {
     assert(
       `Only one computed property decorator can be applied to a class field or accessor, but '${key}' was decorated twice. You may have added the decorator to both a getter and setter, which is unnecessary.`,
-      isClassicDecorator ||
-        !propertyDesc ||
-        !propertyDesc.get ||
-        propertyDesc.get.toString().indexOf('CPGETTER_FUNCTION') === -1
+      isClassicDecorator || !propertyDesc || !propertyDesc.get || !CPGETTERS.has(propertyDesc.get)
     );
 
     let meta = arguments.length === 3 ? metaFor(target) : maybeMeta;
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index aef085266ed..3de6304a8bb 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -1,8 +1,13 @@
-import { HAS_NATIVE_PROXY, setWithMandatorySetter, toString } from '@ember/-internals/utils';
+import {
+  HAS_NATIVE_PROXY,
+  lookupDescriptor,
+  setWithMandatorySetter,
+  toString,
+} from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
-import { descriptorForProperty } from './decorator';
+import { CPSETTERS, descriptorForProperty } from './decorator';
 import { isPath } from './path_cache';
 import { notifyPropertyChange } from './property_events';
 import { _getPath as getPath, getPossibleMandatoryProxyValue } from './property_get';
@@ -37,7 +42,7 @@ interface ExtendedObject {
   @return {Object} the passed value.
   @public
 */
-export function set(obj: object, keyName: string, value: any, tolerant?: boolean): any {
+export function set<T = unknown>(obj: object, keyName: string, value: T, tolerant?: boolean): T {
   assert(
     `Set must be called with three or four arguments; an object, a property key, a value and tolerant true/false`,
     arguments.length === 3 || arguments.length === 4
@@ -60,7 +65,7 @@ export function set(obj: object, keyName: string, value: any, tolerant?: boolean
       `calling set on destroyed object: ${toString(obj)}.${keyName} = ${toString(value)}`,
       tolerant
     );
-    return;
+    return value;
   }
 
   if (isPath(keyName)) {
@@ -70,6 +75,17 @@ export function set(obj: object, keyName: string, value: any, tolerant?: boolean
   let descriptor = descriptorForProperty(obj, keyName);
 
   if (descriptor !== undefined) {
+    if (DEBUG) {
+      let instanceDesc = lookupDescriptor(obj, keyName);
+
+      assert(
+        `Attempted to set \`${toString(
+          obj
+        )}.${keyName}\` using Ember.set(), but the property was a computed or tracked property that was shadowed by another property declaration. This can happen if you defined a tracked or computed property on a parent class, and then redefined it on a subclass.`,
+        instanceDesc && instanceDesc.set && CPSETTERS.has(instanceDesc.set)
+      );
+    }
+
     descriptor.set(obj, keyName, value);
     return value;
   }
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index e7399ead097..9469a6110d7 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -5,6 +5,8 @@ import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
 import { CHAIN_PASS_THROUGH } from './chain-tags';
 import {
+  CPGETTERS,
+  CPSETTERS,
   Decorator,
   DecoratorPropertyDescriptor,
   isElementDescriptor,
@@ -182,6 +184,11 @@ function descriptorForField([target, key, desc]: [
     set,
   };
 
+  if (DEBUG) {
+    CPGETTERS.add(get);
+    CPSETTERS.add(set);
+  }
+
   metaFor(target).writeDescriptors(key, new TrackedDescriptor(get, set));
 
   return newDesc;
diff --git a/packages/@ember/-internals/metal/tests/tracked/set_test.js b/packages/@ember/-internals/metal/tests/tracked/set_test.js
index 5b9eaa9a84d..6bed7598dea 100644
--- a/packages/@ember/-internals/metal/tests/tracked/set_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/set_test.js
@@ -31,5 +31,21 @@ moduleFor(
         assert.equal(get(newObj, key), obj[key], 'should set value');
       }
     }
+
+    ['@test set should throw an error when setting on shadowed properties']() {
+      class Obj {
+        @tracked value = 'emberjs';
+
+        constructor() {
+          Object.defineProperty(this, 'value', { writable: true, value: 'emberjs' });
+        }
+      }
+
+      let newObj = new Obj();
+
+      expectAssertion(() => {
+        set(newObj, 'value', 123);
+      }, /Attempted to set `\[object Object\].value` using Ember.set\(\), but the property was a computed or tracked property that was shadowed by another property declaration. This can happen if you defined a tracked or computed property on a parent class, and then redefined it on a subclass/);
+    }
   }
 );
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 8e08c6ca085..5f5796a1f58 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -671,7 +671,7 @@ class EmberRouter extends EmberObject {
     let owner = getOwner(this);
 
     if ('string' === typeof location && owner) {
-      let resolvedLocation = owner.lookup(`location:${location}`);
+      let resolvedLocation = owner.lookup<IEmberLocation>(`location:${location}`);
 
       if (resolvedLocation !== undefined) {
         location = set(this, 'location', resolvedLocation);

From 28684dc36b3015ce943435b7e1403c80c69f729c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 16:04:25 +0300
Subject: [PATCH 0177/1405] [CLEANUP] Remove EMBER_CACHE_API feature flag

---
 packages/@ember/canary-features/index.ts | 2 --
 packages/ember/index.js                  | 9 +++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 8e2b946bf26..364e152ed03 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -18,7 +18,6 @@ export const DEFAULT_FEATURES = {
   EMBER_NAMED_BLOCKS: null,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
-  EMBER_CACHE_API: true,
   EMBER_DESTROYABLES: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
@@ -78,7 +77,6 @@ export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
   FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 );
 export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL_ARG);
-export const EMBER_CACHE_API = featureValue(FEATURES.EMBER_CACHE_API);
 export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 488a3a1cdcc..791aeb0f3ec 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -13,7 +13,6 @@ import {
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-  EMBER_CACHE_API,
   EMBER_DESTROYABLES,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
@@ -351,11 +350,9 @@ Ember.observer = metal.observer;
 Ember.mixin = metal.mixin;
 Ember.Mixin = metal.Mixin;
 
-if (EMBER_CACHE_API) {
-  Ember._createCache = metal.createCache;
-  Ember._cacheGetValue = metal.getValue;
-  Ember._cacheIsConst = metal.isConst;
-}
+Ember._createCache = metal.createCache;
+Ember._cacheGetValue = metal.getValue;
+Ember._cacheIsConst = metal.isConst;
 
 if (EMBER_DESTROYABLES) {
   Ember._registerDestructor = registerDestructor;

From 019ae7b69bfa83edceab2b2a7045b815068966f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 16:42:17 +0300
Subject: [PATCH 0178/1405] [CLEANUP] Remove EMBER_CACHE_API feature flag from
 documentation

---
 packages/@ember/-internals/metal/lib/cache.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/cache.ts b/packages/@ember/-internals/metal/lib/cache.ts
index 4f1826fd9b3..afc7080c6ca 100644
--- a/packages/@ember/-internals/metal/lib/cache.ts
+++ b/packages/@ember/-internals/metal/lib/cache.ts
@@ -8,7 +8,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   updated.
 
   @module @glimmer/tracking/primitives/cache
-  @category EMBER_CACHE_API
   @public
 */
 
@@ -49,7 +48,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   ```
 
   @method createCache
-  @category EMBER_CACHE_API
   @static
   @for @glimmer/tracking/primitives/cache
   @public
@@ -72,7 +70,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   ```
 
   @method getValue
-  @category EMBER_CACHE_API
   @static
   @for @glimmer/tracking/primitives/cache
   @public
@@ -120,7 +117,6 @@ export { createCache, getValue, isConst } from '@glimmer/validator';
   accident.
 
   @method isConst
-  @category EMBER_CACHE_API
   @static
   @for @glimmer/tracking/primitives/cache
   @public

From 6f3283237a47678988a32c0445cbde847a9605b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sta=C5=9Bkiewicz?=
 <staskiewicz.miko@gmail.com>
Date: Fri, 16 Oct 2020 14:54:51 +0200
Subject: [PATCH 0179/1405] [CLEANUP] Remove EMBER_DESTROYABLES feature flag

---
 packages/@ember/canary-features/index.ts |  2 --
 packages/ember/index.js                  | 17 +++++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 364e152ed03..2f9bd664680 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -18,7 +18,6 @@ export const DEFAULT_FEATURES = {
   EMBER_NAMED_BLOCKS: null,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_ROUTING_MODEL_ARG: true,
-  EMBER_DESTROYABLES: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
@@ -77,7 +76,6 @@ export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
   FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 );
 export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL_ARG);
-export const EMBER_DESTROYABLES = featureValue(FEATURES.EMBER_DESTROYABLES);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
 export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 791aeb0f3ec..79830be02f5 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -13,7 +13,6 @@ import {
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-  EMBER_DESTROYABLES,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
@@ -354,15 +353,13 @@ Ember._createCache = metal.createCache;
 Ember._cacheGetValue = metal.getValue;
 Ember._cacheIsConst = metal.isConst;
 
-if (EMBER_DESTROYABLES) {
-  Ember._registerDestructor = registerDestructor;
-  Ember._unregisterDestructor = unregisterDestructor;
-  Ember._associateDestroyableChild = associateDestroyableChild;
-  Ember._assertDestroyablesDestroyed = assertDestroyablesDestroyed;
-  Ember._enableDestroyableTracking = enableDestroyableTracking;
-  Ember._isDestroying = isDestroying;
-  Ember._isDestroyed = isDestroyed;
-}
+Ember._registerDestructor = registerDestructor;
+Ember._unregisterDestructor = unregisterDestructor;
+Ember._associateDestroyableChild = associateDestroyableChild;
+Ember._assertDestroyablesDestroyed = assertDestroyablesDestroyed;
+Ember._enableDestroyableTracking = enableDestroyableTracking;
+Ember._isDestroying = isDestroying;
+Ember._isDestroyed = isDestroyed;
 
 /**
   A function may be assigned to `Ember.onerror` to be called when Ember

From 75119b5c8a5d9f0fddff24c99e769cce1a09bbee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sta=C5=9Bkiewicz?=
 <staskiewicz.miko@gmail.com>
Date: Fri, 16 Oct 2020 15:27:08 +0200
Subject: [PATCH 0180/1405] [CLEANUP] Remove EMBER_DESTROYABLES feature flag
 from documentation

---
 packages/@ember/destroyable/index.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/@ember/destroyable/index.ts b/packages/@ember/destroyable/index.ts
index 379ab4711eb..62ddaee7e50 100644
--- a/packages/@ember/destroyable/index.ts
+++ b/packages/@ember/destroyable/index.ts
@@ -25,7 +25,6 @@ import {
     when the associated parent object is destroyed.
 
   @module @ember/destroyable
-  @category EMBER_DESTROYABLES
   @public
 */
 
@@ -46,7 +45,6 @@ import {
   Returns the associated child for convenience.
 
   @method associateDestroyableChild
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @param {Object|Function} parent the destroyable to entangle the child destroyables lifetime with
   @param {Object|Function} child the destroyable to be entangled with the parents lifetime
@@ -71,7 +69,6 @@ import {
   ```
 
   @method isDestroying
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @param {Object|Function} destroyable the object to check
   @returns {Boolean}
@@ -95,7 +92,6 @@ import {
   ```
 
   @method isDestroyed
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @param {Object|Function} destroyable the object to check
   @returns {Boolean}
@@ -132,7 +128,6 @@ import {
   destroying, while others are not.
 
   @method destroy
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @param {Object|Function} destroyable the object to destroy
   @static
@@ -148,7 +143,6 @@ import {
   available in non-production builds.
 
   @method assertDestroyablesDestroyed
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @static
   @public
@@ -161,7 +155,6 @@ import {
   have completed when `assertDestroyablesDestroyed` is called.
 
   @method enableDestroyableTracking
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @static
   @public
@@ -213,7 +206,6 @@ import {
   ```
 
   @method registerDestructor
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @param {Object|Function} destroyable the destroyable to register the destructor function with
   @param {Function} destructor the destructor to run when the destroyable object is destroyed
@@ -250,7 +242,6 @@ export function registerDestructor<T extends object>(
   ```
 
   @method unregisterDestructor
-  @category EMBER_DESTROYABLES
   @for @ember/destroyable
   @param {Object|Function} destroyable the destroyable to unregister the destructor function from
   @param {Function} destructor the destructor to remove from the destroyable

From c4e1cd1e572ae4efb1296ef664c6462b71ab2089 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 16 Oct 2020 13:16:27 -0400
Subject: [PATCH 0181/1405] Remove use of deprecated set-env github action API

See https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
---
 .github/workflows/cron.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 9386d198ec6..e4011c57eb4 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -30,7 +30,7 @@ jobs:
           git add cron.txt
           git commit -m "Cron $(date +%Y-%m-%d) for ${{matrix.branch}}"
           export SHA=`git rev-parse HEAD`
-          echo "::set-env name=SHA::$SHA"
+          echo "SHA=$SHA" >> $GITHUB_ENV
 
       - name: Push branch to trigger Build workflow
         # This must use a personal access token because of a Github Actions

From 619f902437ff9cd8f36ab999fef0576c4f0705ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 16:37:57 +0300
Subject: [PATCH 0182/1405] [CLEANUP] Remove EMBER_ROUTING_MODEL_ARG feature
 flag

---
 .../integration/application/engine-test.js    |   9 +-
 .../integration/application/rendering-test.js | 334 +-----------------
 .../link-to/query-params-angle-test.js        |  73 +---
 .../components/link-to/routing-angle-test.js  | 130 +------
 .../components/link-to/routing-curly-test.js  | 192 +---------
 .../glimmer/tests/integration/mount-test.js   |  47 +--
 .../@ember/application/tests/visit_test.js    | 179 +---------
 packages/@ember/canary-features/index.ts      |   2 -
 .../ember-testing/tests/integration_test.js   |  34 +-
 packages/ember/tests/homepage_example_test.js |  38 +-
 .../tests/routing/decoupled_basic_test.js     | 256 +-------------
 .../ember/tests/routing/model_loading_test.js | 190 +---------
 .../router_service_test/transitionTo_test.js  |  87 +----
 .../ember/tests/routing/substates_test.js     | 202 +----------
 .../tests/routing/template_rendering_test.js  |  75 +---
 15 files changed, 54 insertions(+), 1794 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 34c22729aa8..5bce09c0dcc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -9,7 +9,6 @@ import {
 import { Component } from '@ember/-internals/glimmer';
 import { Route } from '@ember/-internals/routing';
 import { RSVP } from '@ember/-internals/runtime';
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import Controller from '@ember/controller';
 import Engine from '@ember/engine';
 import { next } from '@ember/runloop';
@@ -555,7 +554,7 @@ moduleFor(
         this.register(
           'template:application_error',
           compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
+            'Error! {{@model.message}}'
           )
         );
         this.register(
@@ -599,7 +598,7 @@ moduleFor(
         this.register(
           'template:error',
           compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
+            'Error! {{@model.message}}'
           )
         );
         this.register(
@@ -643,7 +642,7 @@ moduleFor(
         this.register(
           'template:post_error',
           compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
+           'Error! {{@model.message}}'
           )
         );
         this.register(
@@ -687,7 +686,7 @@ moduleFor(
         this.register(
           'template:post.error',
           compile(
-            EMBER_ROUTING_MODEL_ARG ? 'Error! {{@model.message}}' : 'Error! {{this.model.message}}'
+            'Error! {{@model.message}}'
           )
         );
         this.register(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index c600b2a2d1d..e104ae9cf0e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -41,7 +41,7 @@ moduleFor(
       });
     }
 
-    ['@feature(EMBER_ROUTING_MODEL_ARG) it can access the model provided by the route via @model']() {
+    ['@test it can access the model provided by the route via @model']() {
       this.add(
         'route:application',
         Route.extend({
@@ -73,32 +73,6 @@ moduleFor(
       });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) it cannot access the model provided by the route via @model']() {
-      this.add(
-        'route:application',
-        Route.extend({
-          model() {
-            return ['red', 'yellow', 'blue'];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'application',
-        strip`
-        <ul>
-          {{#each @model as |item|}}
-            <li>{{item}}</li>
-          {{/each}}
-        </ul>
-        `
-      );
-
-      return this.visit('/').then(() => {
-        this.assertInnerHTML('<ul><!----></ul>');
-      });
-    }
-
     ['@test it can access the model provided by the route via this.model']() {
       this.add(
         'route:application',
@@ -163,7 +137,7 @@ moduleFor(
       });
     }
 
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) interior mutations on the model with set'](assert) {
+    async ['@test interior mutations on the model with set'](assert) {
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -220,7 +194,7 @@ moduleFor(
       `);
     }
 
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) interior mutations on the model with tracked properties'](
+    async ['@test interior mutations on the model with tracked properties'](
       assert
     ) {
       class Model {
@@ -286,7 +260,7 @@ moduleFor(
       `);
     }
 
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) exterior mutations on the model with set'](assert) {
+    async ['@test exterior mutations on the model with set'](assert) {
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -343,7 +317,7 @@ moduleFor(
       `);
     }
 
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) exterior mutations on the model with tracked properties'](
+    async ['@test exterior mutations on the model with tracked properties'](
       assert
     ) {
       this.router.map(function () {
@@ -408,48 +382,7 @@ moduleFor(
       `);
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) it can render a nested route']() {
-      this.router.map(function () {
-        this.route('lists', function () {
-          this.route('colors', function () {
-            this.route('favorite');
-          });
-        });
-      });
-
-      // The "favorite" route will inherit the model
-      this.add(
-        'route:lists.colors',
-        Route.extend({
-          model() {
-            return ['red', 'yellow', 'blue'];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'lists.colors.favorite',
-        strip`
-        <ul>
-          {{#each this.model as |item|}}
-            <li>{{item}}</li>
-          {{/each}}
-        </ul>
-        `
-      );
-
-      return this.visit('/lists/colors/favorite').then(() => {
-        this.assertInnerHTML(strip`
-          <ul>
-            <li>red</li>
-            <li>yellow</li>
-            <li>blue</li>
-          </ul>
-        `);
-      });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) it can render a nested route']() {
+    ['@test it can render a nested route']() {
       this.router.map(function () {
         this.route('lists', function () {
           this.route('colors', function () {
@@ -490,76 +423,7 @@ moduleFor(
       });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) it can render into named outlets']() {
-      this.router.map(function () {
-        this.route('colors');
-      });
-
-      this.addTemplate(
-        'application',
-        strip`
-        <nav>{{outlet "nav"}}</nav>
-        <main>{{outlet}}</main>
-        `
-      );
-
-      this.addTemplate(
-        'nav',
-        strip`
-        <a href="https://emberjs.com/">Ember</a>
-        `
-      );
-
-      this.add(
-        'route:application',
-        Route.extend({
-          renderTemplate() {
-            this.render();
-            this.render('nav', {
-              into: 'application',
-              outlet: 'nav',
-            });
-          },
-        })
-      );
-
-      this.add(
-        'route:colors',
-        Route.extend({
-          model() {
-            return ['red', 'yellow', 'blue'];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'colors',
-        strip`
-        <ul>
-          {{#each this.model as |item|}}
-            <li>{{item}}</li>
-          {{/each}}
-        </ul>
-        `
-      );
-
-      return this.visit('/colors').then(() => {
-        this.assertInnerHTML(strip`
-          <nav>
-            <a href="https://emberjs.com/">Ember</a>
-          </nav>
-          <main>
-            <ul>
-              <li>red</li>
-              <li>yellow</li>
-              <li>blue</li>
-            </ul>
-          </main>
-        `);
-      });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) it can render into named outlets']() {
+    ['@test it can render into named outlets']() {
       this.router.map(function () {
         this.route('colors');
       });
@@ -659,35 +523,7 @@ moduleFor(
         });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when the model changes']() {
-      this.router.map(function () {
-        this.route('color', { path: '/colors/:color' });
-      });
-
-      this.add(
-        'route:color',
-        Route.extend({
-          model(params) {
-            return params.color;
-          },
-        })
-      );
-
-      this.addTemplate('color', 'color: {{this.model}}');
-
-      return this.visit('/colors/red')
-        .then(() => {
-          this.assertInnerHTML('color: red');
-          this.takeSnapshot();
-          return this.visit('/colors/green');
-        })
-        .then(() => {
-          this.assertInnerHTML('color: green');
-          this.assertInvariants();
-        });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when the model changes']() {
+    ['@test it should produce a stable DOM when the model changes']() {
       this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
@@ -746,51 +582,7 @@ moduleFor(
         .then(() => this.assertText('b'));
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) it should update correctly when the controller changes']() {
-      this.router.map(function () {
-        this.route('color', { path: '/colors/:color' });
-      });
-
-      this.add(
-        'route:color',
-        Route.extend({
-          model(params) {
-            return { color: params.color };
-          },
-
-          renderTemplate(controller, model) {
-            this.render({ controller: model.color, model });
-          },
-        })
-      );
-
-      this.add(
-        'controller:red',
-        Controller.extend({
-          color: 'red',
-        })
-      );
-
-      this.add(
-        'controller:green',
-        Controller.extend({
-          color: 'green',
-        })
-      );
-
-      this.addTemplate('color', 'model color: {{this.model.color}}, controller color: {{color}}');
-
-      return this.visit('/colors/red')
-        .then(() => {
-          this.assertInnerHTML('model color: red, controller color: red');
-          return this.visit('/colors/green');
-        })
-        .then(() => {
-          this.assertInnerHTML('model color: green, controller color: green');
-        });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) it should update correctly when the controller changes']() {
+    ['@test it should update correctly when the controller changes']() {
       this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
@@ -834,60 +626,7 @@ moduleFor(
         });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when two routes render the same template']() {
-      this.router.map(function () {
-        this.route('a');
-        this.route('b');
-      });
-
-      this.add(
-        'route:a',
-        Route.extend({
-          model() {
-            return 'A';
-          },
-
-          renderTemplate(controller, model) {
-            this.render('common', { controller: 'common', model });
-          },
-        })
-      );
-
-      this.add(
-        'route:b',
-        Route.extend({
-          model() {
-            return 'B';
-          },
-
-          renderTemplate(controller, model) {
-            this.render('common', { controller: 'common', model });
-          },
-        })
-      );
-
-      this.add(
-        'controller:common',
-        Controller.extend({
-          prefix: 'common',
-        })
-      );
-
-      this.addTemplate('common', '{{prefix}} {{this.model}}');
-
-      return this.visit('/a')
-        .then(() => {
-          this.assertInnerHTML('common A');
-          this.takeSnapshot();
-          return this.visit('/b');
-        })
-        .then(() => {
-          this.assertInnerHTML('common B');
-          this.assertInvariants();
-        });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) it should produce a stable DOM when two routes render the same template']() {
+    ['@test it should produce a stable DOM when two routes render the same template']() {
       this.router.map(function () {
         this.route('a');
         this.route('b');
@@ -973,58 +712,7 @@ moduleFor(
       });
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) it emits a useful backtracking re-render assertion message'](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('routeWithError');
-      });
-
-      this.add(
-        'controller:routeWithError',
-        Controller.extend({
-          toString() {
-            return 'RouteWithErrorController';
-          },
-        })
-      );
-
-      this.add(
-        'route:routeWithError',
-        Route.extend({
-          model() {
-            return {
-              name: 'Alex',
-              toString() {
-                return `Person (${this.name})`;
-              },
-            };
-          },
-        })
-      );
-
-      this.addTemplate('routeWithError', 'Hi {{this.model.name}} <Foo @person={{this.model}} />');
-
-      this.addComponent('foo', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            this.set('person.name', 'Ben');
-          },
-        }),
-        template: 'Hi {{this.person.name}} from component',
-      });
-
-      let expectedBacktrackingMessage = backtrackingMessageFor('name', 'Person \\(Ben\\)', {
-        renderTree: ['application', 'routeWithError', 'this.model.name'],
-      });
-
-      await this.visit('/');
-
-      return assert.rejectsAssertion(this.visit('/routeWithError'), expectedBacktrackingMessage);
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) it emits a useful backtracking re-render assertion message'](
+    async ['@test it emits a useful backtracking re-render assertion message'](
       assert
     ) {
       this.router.map(function () {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 3fd18b88771..8e3b370e722 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -235,78 +235,7 @@ moduleFor(
       });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) generates proper href for `LinkTo` with no @route after transitioning to an error route GH#17963'](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('bad');
-      });
-
-      this.add(
-        'controller:application',
-        Controller.extend({
-          queryParams: ['baz'],
-        })
-      );
-
-      this.add(
-        'route:bad',
-        Route.extend({
-          model() {
-            throw new Error('bad!');
-          },
-        })
-      );
-
-      this.addTemplate('error', `Error: {{this.model.message}}`);
-
-      this.addTemplate(
-        'application',
-        `
-        <LinkTo id="bad-link" @route="bad">
-          Bad
-        </LinkTo>
-
-        <LinkTo id="good-link" @query={{hash baz='lol'}}>
-          Good
-        </LinkTo>
-
-        {{outlet}}
-        `
-      );
-
-      return this.visit('/')
-        .then(async () => {
-          assert.equal(this.$('#good-link').length, 1, 'good-link should be in the DOM');
-          assert.equal(this.$('#bad-link').length, 1, 'bad-link should be in the DOM');
-
-          let goodLink = this.$('#good-link');
-          assert.equal(goodLink.attr('href'), '/?baz=lol');
-
-          return this.visit('/bad');
-        })
-        .then(() => {
-          assert.equal(this.$('#good-link').length, 1, 'good-link should be in the DOM');
-          assert.equal(this.$('#bad-link').length, 1, 'bad-link should be in the DOM');
-
-          let goodLink = this.$('#good-link');
-          // should still be / because we never entered /bad (it errored before being fully entered)
-          // and error states do not get represented in the URL, so we are _effectively_ still
-          // on /
-          assert.equal(goodLink.attr('href'), '/?baz=lol');
-
-          runTask(() => this.click('#good-link'));
-
-          let applicationController = this.getController('application');
-          assert.deepEqual(
-            applicationController.getProperties('baz'),
-            { baz: 'lol' },
-            'index controller QP properties updated'
-          );
-        });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) generates proper href for `LinkTo` with no @route after transitioning to an error route GH#17963'](
+    async ['@test generates proper href for `LinkTo` with no @route after transitioning to an error route GH#17963'](
       assert
     ) {
       this.router.map(function () {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 168d5f7c1cd..295d2746b5d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -916,95 +916,7 @@ moduleFor(
         });
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) The <LinkTo /> component moves into the named route with context`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-        this.route('item', { path: '/item/:id' });
-      });
-
-      this.addTemplate(
-        'about',
-        `
-        <h3 class="list">List</h3>
-        <ul>
-          {{#each this.model as |person|}}
-            <li>
-              <LinkTo id={{person.id}} @route='item' @model={{person}}>
-                {{person.name}}
-              </LinkTo>
-            </li>
-          {{/each}}
-        </ul>
-        <LinkTo id='home-link' @route='index'>Home</LinkTo>
-        `
-      );
-
-      this.addTemplate(
-        'item',
-        `
-        <h3 class="item">Item</h3>
-        <p>{{this.model.name}}</p>
-        <LinkTo id='home-link' @route='index'>Home</LinkTo>
-        `
-      );
-
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <LinkTo id='about-link' @route='about'>About</LinkTo>
-        `
-      );
-
-      this.add(
-        'route:about',
-        Route.extend({
-          model() {
-            return [
-              { id: 'yehuda', name: 'Yehuda Katz' },
-              { id: 'tom', name: 'Tom Dale' },
-              { id: 'erik', name: 'Erik Brynroflsson' },
-            ];
-          },
-        })
-      );
-
-      return this.visit('/about')
-        .then(() => {
-          assert.equal(this.$('h3.list').length, 1, 'The home template was rendered');
-          assert.equal(
-            normalizeUrl(this.$('#home-link').attr('href')),
-            '/',
-            'The home link points back at /'
-          );
-
-          return this.click('#yehuda');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
-          assert.equal(this.$('p').text(), 'Yehuda Katz', 'The name is correct');
-
-          return this.click('#home-link');
-        })
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(normalizeUrl(this.$('li a#yehuda').attr('href')), '/item/yehuda');
-          assert.equal(normalizeUrl(this.$('li a#tom').attr('href')), '/item/tom');
-          assert.equal(normalizeUrl(this.$('li a#erik').attr('href')), '/item/erik');
-
-          return this.click('#erik');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
-          assert.equal(this.$('p').text(), 'Erik Brynroflsson', 'The name is correct');
-        });
-    }
-
-    async [`@feature(EMBER_ROUTING_MODEL_ARG) The <LinkTo /> component moves into the named route with context`](
+    async [`@test The <LinkTo /> component moves into the named route with context`](
       assert
     ) {
       this.router.map(function () {
@@ -1676,45 +1588,7 @@ moduleFor(
         });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
-      this.router.map(function () {
-        this.route('post', { path: '/posts/:post_id' });
-      });
-
-      this.add(
-        'route:index',
-        Route.extend({
-          model() {
-            return RSVP.hash({
-              user: { name: 'Papa Smurf' },
-            });
-          },
-        })
-      );
-
-      this.addTemplate(
-        'index',
-        `<LinkTo @route='post' @model={{hash id="someId" user=this.model.user}}>Post</LinkTo>`
-      );
-
-      this.addTemplate('post', 'Post: {{this.model.user.name}}');
-
-      return this.visit('/')
-        .then(() => {
-          this.assertComponentElement(this.firstChild, {
-            tagName: 'a',
-            attrs: { href: '/posts/someId' },
-            content: 'Post',
-          });
-
-          return this.click('a');
-        })
-        .then(() => {
-          this.assertText('Post: Papa Smurf');
-        });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
+    ['@test [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index b24de43f8ba..bf01cac2798 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -916,95 +916,7 @@ moduleFor(
         });
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) The {{link-to}} component moves into the named route with context`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-        this.route('item', { path: '/item/:id' });
-      });
-
-      this.addTemplate(
-        'about',
-        `
-        <h3 class="list">List</h3>
-        <ul>
-          {{#each this.model as |person|}}
-            <li>
-              {{#link-to 'item' person id=person.id}}
-                {{person.name}}
-              {{/link-to}}
-            </li>
-          {{/each}}
-        </ul>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        `
-      );
-
-      this.addTemplate(
-        'item',
-        `
-        <h3 class="item">Item</h3>
-        <p>{{this.model.name}}</p>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        `
-      );
-
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link'}}About{{/link-to}}
-        `
-      );
-
-      this.add(
-        'route:about',
-        Route.extend({
-          model() {
-            return [
-              { id: 'yehuda', name: 'Yehuda Katz' },
-              { id: 'tom', name: 'Tom Dale' },
-              { id: 'erik', name: 'Erik Brynroflsson' },
-            ];
-          },
-        })
-      );
-
-      return this.visit('/about')
-        .then(() => {
-          assert.equal(this.$('h3.list').length, 1, 'The home template was rendered');
-          assert.equal(
-            normalizeUrl(this.$('#home-link').attr('href')),
-            '/',
-            'The home link points back at /'
-          );
-
-          return this.click('#yehuda');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
-          assert.equal(this.$('p').text(), 'Yehuda Katz', 'The name is correct');
-
-          return this.click('#home-link');
-        })
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(normalizeUrl(this.$('li a#yehuda').attr('href')), '/item/yehuda');
-          assert.equal(normalizeUrl(this.$('li a#tom').attr('href')), '/item/tom');
-          assert.equal(normalizeUrl(this.$('li a#erik').attr('href')), '/item/erik');
-
-          return this.click('#erik');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
-          assert.equal(this.$('p').text(), 'Erik Brynroflsson', 'The name is correct');
-        });
-    }
-
-    async [`@feature(EMBER_ROUTING_MODEL_ARG) The {{link-to}} component moves into the named route with context`](
+    async [`@test The {{link-to}} component moves into the named route with context`](
       assert
     ) {
       this.router.map(function () {
@@ -1624,68 +1536,7 @@ moduleFor(
         });
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) The non-block form {{link-to}} component moves into the named route with context`](
-      assert
-    ) {
-      assert.expect(5);
-
-      this.router.map(function () {
-        this.route('item', { path: '/item/:id' });
-      });
-
-      this.add(
-        'route:index',
-        Route.extend({
-          model() {
-            return [
-              { id: 'yehuda', name: 'Yehuda Katz' },
-              { id: 'tom', name: 'Tom Dale' },
-              { id: 'erik', name: 'Erik Brynroflsson' },
-            ];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <ul>
-          {{#each this.model as |person|}}
-            <li>
-              {{link-to person.name 'item' person id=person.id}}
-            </li>
-          {{/each}}
-        </ul>
-        `
-      );
-      this.addTemplate(
-        'item',
-        `
-        <h3 class="item">Item</h3>
-        <p>{{this.model.name}}</p>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        `
-      );
-
-      return this.visit('/')
-        .then(() => {
-          return this.click('#yehuda');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
-          assert.equal(this.$('p').text(), 'Yehuda Katz', 'The name is correct');
-
-          return this.click('#home-link');
-        })
-        .then(() => {
-          assert.equal(normalizeUrl(this.$('li a#yehuda').attr('href')), '/item/yehuda');
-          assert.equal(normalizeUrl(this.$('li a#tom').attr('href')), '/item/tom');
-          assert.equal(normalizeUrl(this.$('li a#erik').attr('href')), '/item/erik');
-        });
-    }
-
-    async [`@feature(EMBER_ROUTING_MODEL_ARG) The non-block form {{link-to}} component moves into the named route with context`](
+    async [`@test The non-block form {{link-to}} component moves into the named route with context`](
       assert
     ) {
       assert.expect(5);
@@ -2008,44 +1859,7 @@ moduleFor(
         });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to link-to with `hash` helper works']() {
-      this.router.map(function () {
-        this.route('post', { path: '/posts/:post_id' });
-      });
-
-      this.add(
-        'route:index',
-        Route.extend({
-          model() {
-            return RSVP.hash({
-              user: { name: 'Papa Smurf' },
-            });
-          },
-        })
-      );
-
-      this.addTemplate(
-        'index',
-        `{{link-to 'Post' 'post' (hash id="someId" user=this.model.user)}}`
-      );
-      this.addTemplate('post', 'Post: {{this.model.user.name}}');
-
-      return this.visit('/')
-        .then(() => {
-          this.assertComponentElement(this.firstChild, {
-            tagName: 'a',
-            attrs: { href: '/posts/someId' },
-            content: 'Post',
-          });
-
-          return this.click('a');
-        })
-        .then(() => {
-          this.assertText('Post: Papa Smurf');
-        });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) [GH#17018] passing model to link-to with `hash` helper works']() {
+    ['@test [GH#17018] passing model to link-to with `hash` helper works']() {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 8f413520b2d..8ed288f813a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -8,7 +8,6 @@ import {
 
 import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import Controller from '@ember/controller';
 import Engine, { getEngineParent } from '@ember/engine';
 
@@ -324,9 +323,7 @@ moduleFor(
             this.register(
               'template:application',
               compile(
-                EMBER_ROUTING_MODEL_ARG
-                  ? '<h2>Param Engine: {{@model.foo}}</h2>'
-                  : '<h2>Param Engine: {{this.model.foo}}</h2>',
+                '<h2>Param Engine: {{@model.foo}}</h2>',
                 {
                   moduleName: 'my-app/templates/application.hbs',
                 }
@@ -419,7 +416,7 @@ moduleFor(
             this._super(...arguments);
             this.register(
               'template:application',
-              compile(EMBER_ROUTING_MODEL_ARG ? '{{@model.foo}}' : '{{this.model.foo}}', {
+              compile('{{@model.foo}}', {
                 moduleName: 'my-app/templates/application.hbs',
               })
             );
@@ -439,43 +436,3 @@ moduleFor(
     }
   }
 );
-
-if (!EMBER_ROUTING_MODEL_ARG) {
-  moduleFor(
-    '{{mount}} params tests without @model',
-    class extends ApplicationTestCase {
-      constructor() {
-        super(...arguments);
-
-        this.add(
-          'engine:paramEngine',
-          Engine.extend({
-            router: null,
-            Resolver: ModuleBasedTestResolver,
-
-            init() {
-              this._super(...arguments);
-              this.register(
-                'template:application',
-                compile('<h2>@model: {{@model}}, this.model: {{this.model}}</h2>', {
-                  moduleName: 'my-app/templates/application.hbs',
-                })
-              );
-            },
-          })
-        );
-      }
-
-      ['@test it cannot access the model via @model']() {
-        this.router.map(function () {
-          this.route('engine-params');
-        });
-        this.addTemplate('engine-params', '{{mount "paramEngine" model="foo"}}');
-
-        return this.visit('/engine-params').then(() => {
-          this.assertInnerHTML('<h2>@model: , this.model: foo</h2>');
-        });
-      }
-    }
-  );
-}
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index 6dc741e79a3..f8cf091ebd2 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -619,184 +619,7 @@ moduleFor(
       });
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) Ember Islands-style setup`](assert) {
-      let xFooInitCalled = false;
-      let xFooDidInsertElementCalled = false;
-
-      let xBarInitCalled = false;
-      let xBarDidInsertElementCalled = false;
-
-      this.router.map(function () {
-        this.route('show', { path: '/:component_name' });
-      });
-
-      this.add(
-        'route:show',
-        Route.extend({
-          queryParams: {
-            data: { refreshModel: true },
-          },
-
-          model(params) {
-            return {
-              componentName: params.component_name,
-              componentData: params.data ? JSON.parse(params.data) : undefined,
-            };
-          },
-        })
-      );
-
-      let Counter = EmberObject.extend({
-        value: 0,
-
-        increment() {
-          this.incrementProperty('value');
-        },
-      });
-
-      this.add('service:isolatedCounter', Counter);
-      this.add('service:sharedCounter', Counter.create());
-      this.application.registerOptions('service:sharedCounter', {
-        instantiate: false,
-      });
-
-      this.addTemplate(
-        'show',
-        '{{component this.model.componentName model=this.model.componentData}}'
-      );
-
-      this.addTemplate(
-        'components/x-foo',
-        `
-        <h1>X-Foo</h1>
-        <p>Hello {{@model.name}}, I have been clicked {{this.isolatedCounter.value}} times ({{this.sharedCounter.value}} times combined)!</p>
-        `
-      );
-
-      this.add(
-        'component:x-foo',
-        Component.extend({
-          tagName: 'x-foo',
-
-          isolatedCounter: injectService(),
-          sharedCounter: injectService(),
-
-          init() {
-            this._super();
-            xFooInitCalled = true;
-          },
-
-          didInsertElement() {
-            xFooDidInsertElementCalled = true;
-          },
-
-          click() {
-            this.get('isolatedCounter').increment();
-            this.get('sharedCounter').increment();
-          },
-        })
-      );
-
-      this.addTemplate(
-        'components/x-bar',
-        `
-        <h1>X-Bar</h1>
-        <button {{action "incrementCounter"}}>Join {{this.counter.value}} others in clicking me!</button>
-        `
-      );
-
-      this.add(
-        'component:x-bar',
-        Component.extend({
-          counter: injectService('sharedCounter'),
-
-          actions: {
-            incrementCounter() {
-              this.get('counter').increment();
-            },
-          },
-
-          init() {
-            this._super();
-            xBarInitCalled = true;
-          },
-
-          didInsertElement() {
-            xBarDidInsertElementCalled = true;
-          },
-        })
-      );
-
-      let fixtureElement = document.querySelector('#qunit-fixture');
-      let foo = document.createElement('div');
-      let bar = document.createElement('div');
-      fixtureElement.appendChild(foo);
-      fixtureElement.appendChild(bar);
-
-      let data = encodeURIComponent(JSON.stringify({ name: 'Godfrey' }));
-      let instances = [];
-
-      return RSVP.all([
-        runTask(() => {
-          return this.application.visit(`/x-foo?data=${data}`, {
-            rootElement: foo,
-          });
-        }),
-        runTask(() => {
-          return this.application.visit('/x-bar', { rootElement: bar });
-        }),
-      ])
-        .then((_instances) => {
-          instances = _instances;
-
-          assert.ok(xFooInitCalled);
-          assert.ok(xFooDidInsertElementCalled);
-
-          assert.ok(xBarInitCalled);
-          assert.ok(xBarDidInsertElementCalled);
-
-          assert.equal(foo.querySelector('h1').textContent, 'X-Foo');
-          assert.equal(
-            foo.querySelector('p').textContent,
-            'Hello Godfrey, I have been clicked 0 times (0 times combined)!'
-          );
-          assert.ok(foo.textContent.indexOf('X-Bar') === -1);
-
-          assert.equal(bar.querySelector('h1').textContent, 'X-Bar');
-          assert.equal(bar.querySelector('button').textContent, 'Join 0 others in clicking me!');
-          assert.ok(bar.textContent.indexOf('X-Foo') === -1);
-
-          runTask(() => {
-            this.click(foo.querySelector('x-foo'));
-          });
-
-          assert.equal(
-            foo.querySelector('p').textContent,
-            'Hello Godfrey, I have been clicked 1 times (1 times combined)!'
-          );
-          assert.equal(bar.querySelector('button').textContent, 'Join 1 others in clicking me!');
-
-          runTask(() => {
-            this.click(bar.querySelector('button'));
-            this.click(bar.querySelector('button'));
-          });
-
-          assert.equal(
-            foo.querySelector('p').textContent,
-            'Hello Godfrey, I have been clicked 1 times (3 times combined)!'
-          );
-          assert.equal(bar.querySelector('button').textContent, 'Join 3 others in clicking me!');
-        })
-        .finally(() => {
-          runTask(() => {
-            instances.forEach((instance) => {
-              instance.destroy();
-            });
-          });
-        });
-    }
-
-    [`@feature(EMBER_ROUTING_MODEL_ARG) Ember Islands-style setup`](assert) {
+    [`@test Ember Islands-style setup`](assert) {
       let xFooInitCalled = false;
       let xFooDidInsertElementCalled = false;
 
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 2f9bd664680..4abdc300489 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -17,7 +17,6 @@ export const DEFAULT_FEATURES = {
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_NAMED_BLOCKS: null,
   EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
-  EMBER_ROUTING_MODEL_ARG: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
@@ -75,7 +74,6 @@ export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
 export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
   FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 );
-export const EMBER_ROUTING_MODEL_ARG = featureValue(FEATURES.EMBER_ROUTING_MODEL_ARG);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
 export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
diff --git a/packages/ember-testing/tests/integration_test.js b/packages/ember-testing/tests/integration_test.js
index 962988e4362..0256518968c 100644
--- a/packages/ember-testing/tests/integration_test.js
+++ b/packages/ember-testing/tests/integration_test.js
@@ -1,7 +1,6 @@
 import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
 import Test from '../lib/test';
 
-import { EMBER_ROUTING_MODEL_ARG } from '@ember/canary-features';
 import { A as emberA } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
 import { jQueryDisabled } from '@ember/-internals/views';
@@ -18,29 +17,16 @@ moduleFor(
       runTask(() => {
         this.createApplication();
 
-        if (EMBER_ROUTING_MODEL_ARG) {
-          this.addTemplate(
-            'people',
-            `
-            <div>
-              {{#each @model as |person|}}
-                <div class="name">{{person.firstName}}</div>
-              {{/each}}
-            </div>
-            `
-          );
-        } else {
-          this.addTemplate(
-            'people',
-            `
-            <div>
-              {{#each this.model as |person|}}
-                <div class="name">{{person.firstName}}</div>
-              {{/each}}
-            </div>
-            `
-          );
-        }
+        this.addTemplate(
+          'people',
+          `
+          <div>
+            {{#each @model as |person|}}
+              <div class="name">{{person.firstName}}</div>
+            {{/each}}
+          </div>
+          `
+        );
 
         this.router.map(function () {
           this.route('people', { path: '/' });
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index a8ad4f8a4da..ba83f37036a 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -7,44 +7,8 @@ import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 moduleFor(
   'The example renders correctly',
   class extends ApplicationTestCase {
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) Render index template into application outlet'](assert) {
-      this.addTemplate('application', '{{outlet}}');
-      this.addTemplate(
-        'index',
-        '<h1>People</h1><ul>{{#each this.model as |person|}}<li>Hello, <b>{{person.fullName}}</b>!</li>{{/each}}</ul>'
-      );
-
-      let Person = EmberObject.extend({
-        firstName: null,
-        lastName: null,
-        fullName: computed('firstName', 'lastName', function () {
-          return `${this.get('firstName')} ${this.get('lastName')}`;
-        }),
-      });
-
-      this.add(
-        'route:index',
-        Route.extend({
-          model() {
-            return emberA([
-              Person.create({ firstName: 'Tom', lastName: 'Dale' }),
-              Person.create({ firstName: 'Yehuda', lastName: 'Katz' }),
-            ]);
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let $ = this.$();
-
-        assert.equal($.findAll('h1').text(), 'People');
-        assert.equal($.findAll('li').length, 2);
-        assert.equal($.findAll('li:nth-of-type(1)').text(), 'Hello, Tom Dale!');
-        assert.equal($.findAll('li:nth-of-type(2)').text(), 'Hello, Yehuda Katz!');
-      });
-    }
 
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Render index template into application outlet'](
+    async ['@test Render index template into application outlet'](
       assert
     ) {
       this.addTemplate('application', '{{outlet}}');
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 4e470c202a0..ca4b9acd43e 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -124,41 +124,7 @@ moduleFor(
         });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) The Special Page returning a promise puts the app into a loading state until the promise is resolved']() {
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-        this.route('special', { path: '/specials/:menu_item_id' });
-      });
-
-      let menuItem, resolve;
-
-      let MenuItem = EmberObject.extend();
-      MenuItem.reopenClass({
-        find(id) {
-          menuItem = MenuItem.create({ id: id });
-
-          return new RSVP.Promise(function (res) {
-            resolve = res;
-          });
-        },
-      });
-
-      this.add('model:menu_item', MenuItem);
-
-      this.addTemplate('special', '<p>{{this.model.id}}</p>');
-      this.addTemplate('loading', '<p>LOADING!</p>');
-
-      let visited = runTask(() => this.visit('/specials/1'));
-      this.assertText('LOADING!', 'The app is in the loading state');
-
-      resolve(menuItem);
-
-      return visited.then(() => {
-        this.assertText('1', 'The app is now in the specials state');
-      });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) The Special Page returning a promise puts the app into a loading state until the promise is resolved']() {
+    ['@test The Special Page returning a promise puts the app into a loading state until the promise is resolved']() {
       this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
@@ -192,43 +158,7 @@ moduleFor(
       });
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) The loading state doesn't get entered for promises that resolve on the same run loop`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-        this.route('special', { path: '/specials/:menu_item_id' });
-      });
-
-      let MenuItem = EmberObject.extend();
-      MenuItem.reopenClass({
-        find(id) {
-          return { id: id };
-        },
-      });
-
-      this.add('model:menu_item', MenuItem);
-
-      this.add(
-        'route:loading',
-        Route.extend({
-          enter() {
-            assert.ok(false, "LoadingRoute shouldn't have been entered.");
-          },
-        })
-      );
-
-      this.addTemplate('special', '<p>{{this.model.id}}</p>');
-      this.addTemplate('loading', '<p>LOADING!</p>');
-
-      return this.visit('/specials/1').then(() => {
-        let text = this.$('p').text();
-
-        assert.equal(text, '1', 'The app is now in the specials state');
-      });
-    }
-
-    [`@feature(EMBER_ROUTING_MODEL_ARG) The loading state doesn't get entered for promises that resolve on the same run loop`](
+    [`@test The loading state doesn't get entered for promises that resolve on the same run loop`](
       assert
     ) {
       this.router.map(function () {
@@ -360,53 +290,7 @@ moduleFor(
       return promise;
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) Events are triggered on the controller if a matching action name is implemented'](
-      assert
-    ) {
-      let done = assert.async();
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-      });
-
-      let model = { name: 'Tom Dale' };
-      let stateIsNotCalled = true;
-
-      this.add(
-        'route:home',
-        Route.extend({
-          model() {
-            return model;
-          },
-
-          actions: {
-            showStuff() {
-              stateIsNotCalled = false;
-            },
-          },
-        })
-      );
-
-      this.addTemplate('home', '<a {{action "showStuff" this.model}}>{{this.name}}</a>');
-      this.add(
-        'controller:home',
-        Controller.extend({
-          actions: {
-            showStuff(context) {
-              assert.ok(stateIsNotCalled, 'an event on the state is not triggered');
-              assert.deepEqual(context, { name: 'Tom Dale' }, 'an event with context is passed');
-              done();
-            },
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      document.getElementById('qunit-fixture').querySelector('a').click();
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Events are triggered on the controller if a matching action name is implemented'](
+    async ['@test Events are triggered on the controller if a matching action name is implemented'](
       assert
     ) {
       let done = assert.async();
@@ -452,43 +336,7 @@ moduleFor(
       document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) Events are triggered on the current state when defined in `actions` object'](
-      assert
-    ) {
-      let done = assert.async();
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-      });
-
-      let model = { name: 'Tom Dale' };
-      let HomeRoute = Route.extend({
-        model() {
-          return model;
-        },
-
-        actions: {
-          showStuff(obj) {
-            assert.ok(this instanceof HomeRoute, 'the handler is an App.HomeRoute');
-            assert.deepEqual(
-              Object.assign({}, obj),
-              { name: 'Tom Dale' },
-              'the context is correct'
-            );
-            done();
-          },
-        },
-      });
-
-      this.add('route:home', HomeRoute);
-      this.addTemplate('home', '<a {{action "showStuff" this.model}}>{{this.model.name}}</a>');
-
-      await this.visit('/');
-
-      document.getElementById('qunit-fixture').querySelector('a').click();
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Events are triggered on the current state when defined in `actions` object'](
+    async ['@test Events are triggered on the current state when defined in `actions` object'](
       assert
     ) {
       let done = assert.async();
@@ -524,53 +372,7 @@ moduleFor(
       document.getElementById('qunit-fixture').querySelector('a').click();
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) Events defined in `actions` object are triggered on the current state when routes are nested'](
-      assert
-    ) {
-      let done = assert.async();
-
-      this.router.map(function () {
-        this.route('root', { path: '/' }, function () {
-          this.route('index', { path: '/' });
-        });
-      });
-
-      let model = { name: 'Tom Dale' };
-
-      let RootRoute = Route.extend({
-        actions: {
-          showStuff(obj) {
-            assert.ok(this instanceof RootRoute, 'the handler is an App.HomeRoute');
-            assert.deepEqual(
-              Object.assign({}, obj),
-              { name: 'Tom Dale' },
-              'the context is correct'
-            );
-            done();
-          },
-        },
-      });
-      this.add('route:root', RootRoute);
-      this.add(
-        'route:root.index',
-        Route.extend({
-          model() {
-            return model;
-          },
-        })
-      );
-
-      this.addTemplate(
-        'root.index',
-        '<a {{action "showStuff" this.model}}>{{this.model.name}}</a>'
-      );
-
-      await this.visit('/');
-
-      document.getElementById('qunit-fixture').querySelector('a').click();
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Events defined in `actions` object are triggered on the current state when routes are nested'](
+    async ['@test Events defined in `actions` object are triggered on the current state when routes are nested'](
       assert
     ) {
       let done = assert.async();
@@ -663,53 +465,7 @@ moduleFor(
       });
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) Actions are not triggered on the controller if a matching action name is implemented as a method'](
-      assert
-    ) {
-      let done = assert.async();
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-      });
-
-      let model = { name: 'Tom Dale' };
-      let stateIsNotCalled = true;
-
-      this.add(
-        'route:home',
-        Route.extend({
-          model() {
-            return model;
-          },
-
-          actions: {
-            showStuff(context) {
-              assert.ok(stateIsNotCalled, 'an event on the state is not triggered');
-              assert.deepEqual(context, { name: 'Tom Dale' }, 'an event with context is passed');
-              done();
-            },
-          },
-        })
-      );
-
-      this.addTemplate('home', '<a {{action "showStuff" this.model}}>{{this.name}}</a>');
-
-      this.add(
-        'controller:home',
-        Controller.extend({
-          showStuff() {
-            stateIsNotCalled = false;
-            assert.ok(stateIsNotCalled, 'an event on the state is not triggered');
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      document.getElementById('qunit-fixture').querySelector('a').click();
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Actions are not triggered on the controller if a matching action name is implemented as a method'](
+    async ['@test Actions are not triggered on the controller if a matching action name is implemented as a method'](
       assert
     ) {
       let done = assert.async();
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 6d251a94a58..7c0c94a6228 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -397,35 +397,7 @@ moduleFor(
       });
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) The Specials Page getting its controller context by deserializing the params hash`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-        this.route('special', { path: '/specials/:menu_item_id' });
-      });
-
-      this.add(
-        'route:special',
-        Route.extend({
-          model(params) {
-            return EmberObject.create({
-              menuItemId: params.menu_item_id,
-            });
-          },
-        })
-      );
-
-      this.addTemplate('special', '<p>{{this.model.menuItemId}}</p>');
-
-      return this.visit('/specials/1').then(() => {
-        let text = this.$('p').text();
-
-        assert.equal(text, '1', 'The model was used to render the template');
-      });
-    }
-
-    [`@feature(EMBER_ROUTING_MODEL_ARG) The Specials Page getting its model by deserializing the params hash`](
+    [`@test The Specials Page getting its model by deserializing the params hash`](
       assert
     ) {
       this.router.map(function () {
@@ -453,28 +425,7 @@ moduleFor(
       });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) The Specials Page defaults to looking models up via `find`']() {
-      let MenuItem = EmberObject.extend();
-      MenuItem.reopenClass({
-        find(id) {
-          return MenuItem.create({ id });
-        },
-      });
-      this.add('model:menu_item', MenuItem);
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-        this.route('special', { path: '/specials/:menu_item_id' });
-      });
-
-      this.addTemplate('special', '{{this.model.id}}');
-
-      return this.visit('/specials/1').then(() => {
-        this.assertText('1', 'The model was used to render the template');
-      });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) The Specials Page defaults to looking models up via `find`']() {
+    ['@test The Specials Page defaults to looking models up via `find`']() {
       let MenuItem = EmberObject.extend();
       MenuItem.reopenClass({
         find(id) {
@@ -495,42 +446,7 @@ moduleFor(
       });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) Moving from one page to another triggers the correct callbacks'](
-      assert
-    ) {
-      assert.expect(3);
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-        this.route('special', { path: '/specials/:menu_item_id' });
-      });
-
-      let MenuItem = EmberObject.extend();
-      MenuItem.reopenClass({
-        find(id) {
-          return MenuItem.create({ id: id });
-        },
-      });
-      this.add('model:menu_item', MenuItem);
-
-      this.addTemplate('home', '<h3>Home</h3>');
-      this.addTemplate('special', '<p>{{this.model.id}}</p>');
-
-      return this.visit('/')
-        .then(() => {
-          this.assertText('Home', 'The app is now in the initial state');
-
-          let promiseContext = MenuItem.create({ id: 1 });
-
-          return this.visit('/specials/1', promiseContext);
-        })
-        .then(() => {
-          assert.equal(this.currentURL, '/specials/1');
-          this.assertText('1', 'The app is now transitioned');
-        });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) Moving from one page to another triggers the correct callbacks'](
+    ['@test Moving from one page to another triggers the correct callbacks'](
       assert
     ) {
       assert.expect(3);
@@ -565,105 +481,7 @@ moduleFor(
         });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) Nested callbacks are not exited when moving to siblings'](
-      assert
-    ) {
-      let rootSetup = 0;
-      let rootRender = 0;
-      let rootModel = 0;
-      let rootSerialize = 0;
-      let menuItem;
-      let rootElement;
-
-      let MenuItem = EmberObject.extend();
-      MenuItem.reopenClass({
-        find(id) {
-          menuItem = MenuItem.create({ id: id });
-          return menuItem;
-        },
-      });
-
-      this.router.map(function () {
-        this.route('root', { path: '/' }, function () {
-          this.route('special', {
-            path: '/specials/:menu_item_id',
-            resetNamespace: true,
-          });
-        });
-      });
-
-      this.add(
-        'route:root',
-        Route.extend({
-          model() {
-            rootModel++;
-            return this._super(...arguments);
-          },
-
-          setupController() {
-            rootSetup++;
-          },
-
-          renderTemplate() {
-            rootRender++;
-          },
-
-          serialize() {
-            rootSerialize++;
-            return this._super(...arguments);
-          },
-        })
-      );
-
-      this.add('route:loading', Route.extend({}));
-      this.add('route:home', Route.extend({}));
-      this.add(
-        'route:special',
-        Route.extend({
-          model({ menu_item_id }) {
-            return MenuItem.find(menu_item_id);
-          },
-          setupController(controller, model) {
-            set(controller, 'model', model);
-          },
-        })
-      );
-
-      this.addTemplate('root.index', '<h3>Home</h3>');
-      this.addTemplate('special', '<p>{{this.model.id}}</p>');
-      this.addTemplate('loading', '<p>LOADING!</p>');
-
-      return this.visit('/').then(() => {
-        rootElement = document.getElementById('qunit-fixture');
-
-        assert.equal(
-          getTextOf(rootElement.querySelector('h3')),
-          'Home',
-          'The app is now in the initial state'
-        );
-        assert.equal(rootSetup, 1, 'The root setup was triggered');
-        assert.equal(rootRender, 1, 'The root render was triggered');
-        assert.equal(rootSerialize, 0, 'The root serialize was not called');
-        assert.equal(rootModel, 1, 'The root model was called');
-
-        let router = this.applicationInstance.lookup('router:main');
-        let menuItem = MenuItem.create({ id: 1 });
-
-        return router.transitionTo('special', menuItem).then(function () {
-          assert.equal(rootSetup, 1, 'The root setup was not triggered again');
-          assert.equal(rootRender, 1, 'The root render was not triggered again');
-          assert.equal(rootSerialize, 0, 'The root serialize was not called');
-
-          // TODO: Should this be changed?
-          assert.equal(rootModel, 1, 'The root model was called again');
-
-          assert.deepEqual(router.location.path, '/specials/1');
-          assert.equal(router.currentPath, 'root.special');
-        });
-      });
-    }
-
-    ['@feature(EMBER_ROUTING_MODEL_ARG) Nested callbacks are not exited when moving to siblings'](
+    ['@test Nested callbacks are not exited when moving to siblings'](
       assert
     ) {
       let rootSetup = 0;
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index e20e8c96f62..22034856343 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -158,43 +158,7 @@ moduleFor(
       });
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) RouterService#transitionTo with dynamic segment'](assert) {
-      assert.expect(3);
-
-      let componentInstance;
-      let dynamicModel = { id: 1, contents: 'much dynamicism' };
-
-      this.addTemplate('parent.index', '{{foo-bar}}');
-      this.addTemplate('dynamic', '{{this.model.contents}}');
-
-      this.addComponent('foo-bar', {
-        ComponentClass: Component.extend({
-          routerService: injectService('router'),
-          init() {
-            this._super();
-            componentInstance = this;
-          },
-          actions: {
-            transitionToDynamic() {
-              get(this, 'routerService').transitionTo('dynamic', dynamicModel);
-            },
-          },
-        }),
-        template: `foo-bar`,
-      });
-
-      return this.visit('/').then(() => {
-        run(function () {
-          componentInstance.send('transitionToDynamic');
-        });
-
-        assert.equal(this.routerService.get('currentRouteName'), 'dynamic');
-        assert.equal(this.routerService.get('currentURL'), '/dynamic/1');
-        this.assertText('much dynamicism');
-      });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) RouterService#transitionTo with dynamic segment'](
+    async ['@test RouterService#transitionTo with dynamic segment'](
       assert
     ) {
       assert.expect(3);
@@ -232,54 +196,7 @@ moduleFor(
       this.assertText('much dynamicism');
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) RouterService#transitionTo with dynamic segment and model hook'](
-      assert
-    ) {
-      assert.expect(3);
-
-      let componentInstance;
-      let dynamicModel = { id: 1, contents: 'much dynamicism' };
-
-      this.add(
-        'route:dynamic',
-        Route.extend({
-          model() {
-            return dynamicModel;
-          },
-        })
-      );
-
-      this.addTemplate('parent.index', '{{foo-bar}}');
-      this.addTemplate('dynamic', '{{this.model.contents}}');
-
-      this.addComponent('foo-bar', {
-        ComponentClass: Component.extend({
-          routerService: injectService('router'),
-          init() {
-            this._super();
-            componentInstance = this;
-          },
-          actions: {
-            transitionToDynamic() {
-              get(this, 'routerService').transitionTo('dynamic', 1);
-            },
-          },
-        }),
-        template: `foo-bar`,
-      });
-
-      return this.visit('/').then(() => {
-        run(function () {
-          componentInstance.send('transitionToDynamic');
-        });
-
-        assert.equal(this.routerService.get('currentRouteName'), 'dynamic');
-        assert.equal(this.routerService.get('currentURL'), '/dynamic/1');
-        this.assertText('much dynamicism');
-      });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) RouterService#transitionTo with dynamic segment and model hook'](
+    async ['@test RouterService#transitionTo with dynamic segment and model hook'](
       assert
     ) {
       assert.expect(3);
diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index cdf671af674..e4755efdd5e 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -381,42 +381,7 @@ moduleFor(
       return promise;
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) Prioritized error substate entry works with preserved-namespace nested routes'](
-      assert
-    ) {
-      this.addTemplate('foo.bar_error', 'FOOBAR ERROR: {{this.model.msg}}');
-      this.addTemplate('foo.bar', 'YAY');
-
-      this.router.map(function () {
-        this.route('foo', function () {
-          this.route('bar');
-        });
-      });
-
-      this.add(
-        'route:foo.bar',
-        Route.extend({
-          model() {
-            return RSVP.reject({
-              msg: 'did it broke?',
-            });
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        return this.visit('/foo/bar').then(() => {
-          let text = this.$('#app').text();
-          assert.equal(
-            text,
-            'FOOBAR ERROR: did it broke?',
-            `foo.bar_error was entered (as opposed to something like foo/foo/bar_error)`
-          );
-        });
-      });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Prioritized error substate entry works with preserved-namespace nested routes'](
+    async ['@test Prioritized error substate entry works with preserved-namespace nested routes'](
       assert
     ) {
       this.addTemplate('foo.bar_error', 'FOOBAR ERROR: {{@model.msg}}');
@@ -492,48 +457,7 @@ moduleFor(
       return promise;
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) Prioritized error substate entry works with auto-generated index routes'](
-      assert
-    ) {
-      this.addTemplate('foo.index_error', 'FOO ERROR: {{this.model.msg}}');
-      this.addTemplate('foo.index', 'YAY');
-      this.addTemplate('foo', '{{outlet}}');
-
-      this.router.map(function () {
-        this.route('foo', function () {
-          this.route('bar');
-        });
-      });
-
-      this.add(
-        'route:foo.index',
-        Route.extend({
-          model() {
-            return RSVP.reject({
-              msg: 'did it broke?',
-            });
-          },
-        })
-      );
-      this.add(
-        'route:foo',
-        Route.extend({
-          model() {
-            return true;
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        return this.visit('/foo').then(() => {
-          let text = this.$('#app').text();
-
-          assert.equal(text, 'FOO ERROR: did it broke?', 'foo.index_error was entered');
-        });
-      });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Prioritized error substate entry works with auto-generated index routes'](
+    async ['@test Prioritized error substate entry works with auto-generated index routes'](
       assert
     ) {
       this.addTemplate('foo.index_error', 'FOO ERROR: {{@model.msg}}');
@@ -576,49 +500,7 @@ moduleFor(
       );
     }
 
-    ['@feature(!EMBER_ROUTING_MODEL_ARG) Rejected promises returned from ApplicationRoute transition into top-level application_error'](
-      assert
-    ) {
-      let reject = true;
-
-      this.addTemplate('index', '<div id="index">INDEX</div>');
-      this.add(
-        'route:application',
-        Route.extend({
-          init() {
-            this._super(...arguments);
-          },
-          model() {
-            if (reject) {
-              return RSVP.reject({ msg: 'BAD NEWS BEARS' });
-            } else {
-              return {};
-            }
-          },
-        })
-      );
-
-      this.addTemplate(
-        'application_error',
-        `<p id="toplevel-error">TOPLEVEL ERROR: {{this.model.msg}}</p>`
-      );
-
-      return this.visit('/')
-        .then(() => {
-          let text = this.$('#toplevel-error').text();
-          assert.equal(text, 'TOPLEVEL ERROR: BAD NEWS BEARS', 'toplevel error rendered');
-          reject = false;
-        })
-        .then(() => {
-          return this.visit('/');
-        })
-        .then(() => {
-          let text = this.$('#index').text();
-          assert.equal(text, 'INDEX', 'the index route resolved');
-        });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Rejected promises returned from ApplicationRoute transition into top-level application_error'](
+    async ['@test Rejected promises returned from ApplicationRoute transition into top-level application_error'](
       assert
     ) {
       let reject = true;
@@ -794,42 +676,7 @@ moduleFor(
       return promise;
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) Default error event moves into nested route'](
-      assert
-    ) {
-      await this.visit('/');
-
-      this.addTemplate('grandma.error', 'ERROR: {{this.model.msg}}');
-
-      this.add(
-        'route:mom.sally',
-        Route.extend({
-          model() {
-            step(assert, 1, 'MomSallyRoute#model');
-            return RSVP.reject({
-              msg: 'did it broke?',
-            });
-          },
-          actions: {
-            error() {
-              step(assert, 2, 'MomSallyRoute#actions.error');
-              return true;
-            },
-          },
-        })
-      );
-
-      return this.visit('/grandma/mom/sally').then(() => {
-        step(assert, 3, 'App finished loading');
-
-        let text = this.$('#app').text();
-
-        assert.equal(text, 'GRANDMA ERROR: did it broke?', 'error bubbles');
-        assert.equal(this.currentPath, 'grandma.error', 'Initial route fully loaded');
-      });
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Default error event moves into nested route'](
+    async ['@test Default error event moves into nested route'](
       assert
     ) {
       await this.visit('/');
@@ -1011,46 +858,7 @@ moduleFor(
       );
     }
 
-    async ['@feature(!EMBER_ROUTING_MODEL_ARG) Default error events move into nested route, prioritizing more specifically named error routes - NEW'](
-      assert
-    ) {
-      await this.visit('/');
-
-      this.addTemplate('grandma.error', 'ERROR: {{this.model.msg}}');
-      this.addTemplate('mom_error', 'MOM ERROR: {{this.model.msg}}');
-
-      this.add(
-        'route:mom.sally',
-        Route.extend({
-          model() {
-            step(assert, 1, 'MomSallyRoute#model');
-            return RSVP.reject({
-              msg: 'did it broke?',
-            });
-          },
-          actions: {
-            error() {
-              step(assert, 2, 'MomSallyRoute#actions.error');
-              return true;
-            },
-          },
-        })
-      );
-
-      await this.visit('/grandma/mom/sally');
-
-      step(assert, 3, 'Application finished booting');
-
-      assert.equal(
-        this.$('#app').text(),
-        'GRANDMA MOM ERROR: did it broke?',
-        'the more specifically named mome error substate was entered over the other error route'
-      );
-
-      assert.equal(this.currentPath, 'grandma.mom_error', 'Initial route fully loaded');
-    }
-
-    async ['@feature(EMBER_ROUTING_MODEL_ARG) Default error events move into nested route, prioritizing more specifically named error routes - NEW'](
+    async ['@test Default error events move into nested route, prioritizing more specifically named error routes - NEW'](
       assert
     ) {
       await this.visit('/');
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 183ece6ba68..e9b5041dc08 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -204,29 +204,7 @@ moduleFor(
       assert.equal(this.$('p').text(), 'YES I AM HOME', 'The homepage template was rendered');
     }
 
-    [`@feature(!EMBER_ROUTING_MODEL_ARG) Model passed via renderTemplate model is set as controller's model`](
-      assert
-    ) {
-      this.addTemplate('bio', '<p>{{this.model.name}}</p>');
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            this.render('bio', {
-              model: { name: 'emberjs' },
-            });
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let text = this.$('p').text();
-
-        assert.equal(text, 'emberjs', `Passed model was set as controller's model`);
-      });
-    }
-
-    async [`@feature(EMBER_ROUTING_MODEL_ARG) Model passed via renderTemplate model is set as controller's model`](
+    async [`@test Model passed via renderTemplate model is set as controller's model`](
       assert
     ) {
       this.addTemplate(
@@ -572,56 +550,7 @@ moduleFor(
       });
     }
 
-    ["@feature(!EMBER_ROUTING_MODEL_ARG) The template is not re-rendered when the route's context changes"](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('page', { path: '/page/:name' });
-      });
-
-      this.add(
-        'route:page',
-        Route.extend({
-          model(params) {
-            return EmberObject.create({ name: params.name });
-          },
-        })
-      );
-
-      let insertionCount = 0;
-      this.add(
-        'component:foo-bar',
-        Component.extend({
-          didInsertElement() {
-            insertionCount += 1;
-          },
-        })
-      );
-
-      this.addTemplate('page', '<p>{{this.model.name}}{{foo-bar}}</p>');
-
-      let rootElement = document.getElementById('qunit-fixture');
-      return this.visit('/page/first')
-        .then(() => {
-          assert.ok(true, '/page/first has been handled');
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'first');
-          assert.equal(insertionCount, 1);
-          return this.visit('/page/second');
-        })
-        .then(() => {
-          assert.ok(true, '/page/second has been handled');
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'second');
-          assert.equal(insertionCount, 1, 'view should have inserted only once');
-          let router = this.applicationInstance.lookup('router:main');
-          return run(() => router.transitionTo('page', EmberObject.create({ name: 'third' })));
-        })
-        .then(() => {
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'third');
-          assert.equal(insertionCount, 1, 'view should still have inserted only once');
-        });
-    }
-
-    async ["@feature(EMBER_ROUTING_MODEL_ARG) The template is not re-rendered when the route's model changes"](
+    async ["@test The template is not re-rendered when the route's model changes"](
       assert
     ) {
       this.router.map(function () {

From 02f092a2c1d4a77fbaf6a7e0e80a452634b7164c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 16:59:28 +0300
Subject: [PATCH 0183/1405] Fix linting issues

---
 .../integration/application/engine-test.js    | 28 +++----------------
 .../integration/application/rendering-test.js | 12 ++------
 .../components/link-to/routing-angle-test.js  |  4 +--
 .../components/link-to/routing-curly-test.js  |  4 +--
 .../glimmer/tests/integration/mount-test.js   |  9 ++----
 packages/ember/tests/homepage_example_test.js |  5 +---
 .../ember/tests/routing/model_loading_test.js | 12 ++------
 .../router_service_test/transitionTo_test.js  |  8 ++----
 .../ember/tests/routing/substates_test.js     |  4 +--
 .../tests/routing/template_rendering_test.js  |  8 ++----
 10 files changed, 21 insertions(+), 73 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 5bce09c0dcc..8869f0129a2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -551,12 +551,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:application_error',
-          compile(
-            'Error! {{@model.message}}'
-          )
-        );
+        this.register('template:application_error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post',
           Route.extend({
@@ -595,12 +590,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:error',
-          compile(
-            'Error! {{@model.message}}'
-          )
-        );
+        this.register('template:error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post',
           Route.extend({
@@ -639,12 +629,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:post_error',
-          compile(
-           'Error! {{@model.message}}'
-          )
-        );
+        this.register('template:post_error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post',
           Route.extend({
@@ -683,12 +668,7 @@ moduleFor(
             },
           })
         );
-        this.register(
-          'template:post.error',
-          compile(
-            'Error! {{@model.message}}'
-          )
-        );
+        this.register('template:post.error', compile('Error! {{@model.message}}'));
         this.register(
           'route:post.comments',
           Route.extend({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index e104ae9cf0e..3ba136d8532 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -194,9 +194,7 @@ moduleFor(
       `);
     }
 
-    async ['@test interior mutations on the model with tracked properties'](
-      assert
-    ) {
+    async ['@test interior mutations on the model with tracked properties'](assert) {
       class Model {
         @tracked color;
 
@@ -317,9 +315,7 @@ moduleFor(
       `);
     }
 
-    async ['@test exterior mutations on the model with tracked properties'](
-      assert
-    ) {
+    async ['@test exterior mutations on the model with tracked properties'](assert) {
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -712,9 +708,7 @@ moduleFor(
       });
     }
 
-    async ['@test it emits a useful backtracking re-render assertion message'](
-      assert
-    ) {
+    async ['@test it emits a useful backtracking re-render assertion message'](assert) {
       this.router.map(function () {
         this.route('routeWithError');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 295d2746b5d..8bec47c3f3c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -916,9 +916,7 @@ moduleFor(
         });
     }
 
-    async [`@test The <LinkTo /> component moves into the named route with context`](
-      assert
-    ) {
+    async [`@test The <LinkTo /> component moves into the named route with context`](assert) {
       this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index bf01cac2798..48d800e0a46 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -916,9 +916,7 @@ moduleFor(
         });
     }
 
-    async [`@test The {{link-to}} component moves into the named route with context`](
-      assert
-    ) {
+    async [`@test The {{link-to}} component moves into the named route with context`](assert) {
       this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 8ed288f813a..427f961b5f1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -322,12 +322,9 @@ moduleFor(
             this._super(...arguments);
             this.register(
               'template:application',
-              compile(
-                '<h2>Param Engine: {{@model.foo}}</h2>',
-                {
-                  moduleName: 'my-app/templates/application.hbs',
-                }
-              )
+              compile('<h2>Param Engine: {{@model.foo}}</h2>', {
+                moduleName: 'my-app/templates/application.hbs',
+              })
             );
           },
         })
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index ba83f37036a..974d1918fd5 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -7,10 +7,7 @@ import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 moduleFor(
   'The example renders correctly',
   class extends ApplicationTestCase {
-
-    async ['@test Render index template into application outlet'](
-      assert
-    ) {
+    async ['@test Render index template into application outlet'](assert) {
       this.addTemplate('application', '{{outlet}}');
       this.addTemplate(
         'index',
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 7c0c94a6228..b7caae710c4 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -397,9 +397,7 @@ moduleFor(
       });
     }
 
-    [`@test The Specials Page getting its model by deserializing the params hash`](
-      assert
-    ) {
+    [`@test The Specials Page getting its model by deserializing the params hash`](assert) {
       this.router.map(function () {
         this.route('home', { path: '/' });
         this.route('special', { path: '/specials/:menu_item_id' });
@@ -446,9 +444,7 @@ moduleFor(
       });
     }
 
-    ['@test Moving from one page to another triggers the correct callbacks'](
-      assert
-    ) {
+    ['@test Moving from one page to another triggers the correct callbacks'](assert) {
       assert.expect(3);
 
       this.router.map(function () {
@@ -481,9 +477,7 @@ moduleFor(
         });
     }
 
-    ['@test Nested callbacks are not exited when moving to siblings'](
-      assert
-    ) {
+    ['@test Nested callbacks are not exited when moving to siblings'](assert) {
       let rootSetup = 0;
       let rootRender = 0;
       let rootModel = 0;
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index 22034856343..7b6e23d96a5 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -158,9 +158,7 @@ moduleFor(
       });
     }
 
-    async ['@test RouterService#transitionTo with dynamic segment'](
-      assert
-    ) {
+    async ['@test RouterService#transitionTo with dynamic segment'](assert) {
       assert.expect(3);
 
       let componentInstance;
@@ -196,9 +194,7 @@ moduleFor(
       this.assertText('much dynamicism');
     }
 
-    async ['@test RouterService#transitionTo with dynamic segment and model hook'](
-      assert
-    ) {
+    async ['@test RouterService#transitionTo with dynamic segment and model hook'](assert) {
       assert.expect(3);
 
       let componentInstance;
diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index e4755efdd5e..5535e76d6e0 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -676,9 +676,7 @@ moduleFor(
       return promise;
     }
 
-    async ['@test Default error event moves into nested route'](
-      assert
-    ) {
+    async ['@test Default error event moves into nested route'](assert) {
       await this.visit('/');
 
       this.addTemplate('grandma.error', 'ERROR: {{@model.msg}}');
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index e9b5041dc08..3c223ccfc90 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -204,9 +204,7 @@ moduleFor(
       assert.equal(this.$('p').text(), 'YES I AM HOME', 'The homepage template was rendered');
     }
 
-    async [`@test Model passed via renderTemplate model is set as controller's model`](
-      assert
-    ) {
+    async [`@test Model passed via renderTemplate model is set as controller's model`](assert) {
       this.addTemplate(
         'bio',
         '<p>Model: {{@model.name}}</p><p>Controller: {{this.model.name}}</p>'
@@ -550,9 +548,7 @@ moduleFor(
       });
     }
 
-    async ["@test The template is not re-rendered when the route's model changes"](
-      assert
-    ) {
+    async ["@test The template is not re-rendered when the route's model changes"](assert) {
       this.router.map(function () {
         this.route('page', { path: '/page/:name' });
       });

From e8cfd08a835a3e4cf9503113cc64ed67c2bfd61b Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Sat, 17 Oct 2020 09:40:46 -0400
Subject: [PATCH 0184/1405] [BUGFIX beta] Update rendering engine to improve
 error ergonomics.

Fixes two major issues:

* Ensure "pause on uncaught" exceptions pauses in correct location
  (https://github.com/glimmerjs/glimmer-vm/pull/1172)
* Log template heirarchy to the console for any errors thrown during
  rendering (https://github.com/glimmerjs/glimmer-vm/pull/1169)
---
 package.json |  18 ++---
 yarn.lock    | 220 +++++++++++++++++++++++++--------------------------
 2 files changed, 119 insertions(+), 119 deletions(-)

diff --git a/package.json b/package.json
index 11ca987744b..fb39d24399f 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.62.1",
+    "@glimmer/compiler": "0.62.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.62.1",
-    "@glimmer/interfaces": "0.62.1",
-    "@glimmer/node": "0.62.1",
-    "@glimmer/opcode-compiler": "0.62.1",
-    "@glimmer/program": "0.62.1",
-    "@glimmer/reference": "0.62.1",
-    "@glimmer/runtime": "0.62.1",
-    "@glimmer/validator": "0.62.1",
+    "@glimmer/global-context": "0.62.3",
+    "@glimmer/interfaces": "0.62.3",
+    "@glimmer/node": "0.62.3",
+    "@glimmer/opcode-compiler": "0.62.3",
+    "@glimmer/program": "0.62.3",
+    "@glimmer/reference": "0.62.3",
+    "@glimmer/runtime": "0.62.3",
+    "@glimmer/validator": "0.62.3",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index ff6a531a37b..0c0dfc6ab48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -929,152 +929,152 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.62.1.tgz#4b80f1cd55d39858e602080de03db6febf5b9303"
-  integrity sha512-s709URSvV3IzSmyyKd1t2twlxcjM7OZgh+pmehwjEEVXSm6nDrAtJcBw8OBPw0AL6TnArf5xHTHtH4EJJ8fyAg==
-  dependencies:
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/syntax" "0.62.1"
-    "@glimmer/util" "0.62.1"
-    "@glimmer/wire-format" "0.62.1"
+"@glimmer/compiler@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.62.3.tgz#10b9dcddeed47fd151f4af24c3c4ff02fd44159c"
+  integrity sha512-Ouo3BFS1ASJ4HdLvqie5VeNHfZAwDuWz4kVlDIMBTTJxcWZ0SAlCCfRHBTwiSrJ+1vy0Bd12iGsRzyFkTRa/Vg==
+  dependencies:
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/syntax" "0.62.3"
+    "@glimmer/util" "0.62.3"
+    "@glimmer/wire-format" "0.62.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.62.1.tgz#75baeef7b923515ccfee778d99b1c61a5541050a"
-  integrity sha512-zlGhEYhWP+DSHumbJqckgUhFzhScze6D5ys69A3iJrmiDOYSs2uaRvonAKl7aQS4FGoUhelWfQT0xvWxD/u5OQ==
+"@glimmer/encoder@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.62.3.tgz#dce2aa494319820198b955479915a39c86ddee3b"
+  integrity sha512-QCRxuWgn9OXarktjrLLKiSU+0Z8fYh756uqmuFVmlV0egiu7bt6MaPDBWG7eZBfAoUQ7H+DYrtXsYhbUYcPh3A==
   dependencies:
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/vm" "0.62.1"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/vm" "0.62.3"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.62.1.tgz#41f6a130a235361cdb853ba6da276d4b84fd0fee"
-  integrity sha512-ZqLPa6KZitYbvlQCE9oyy6h7MTEwV0MqPgtrlb2nAKDZ8lZ90pzVvVNEmXpr6lkajEggISCt3GDsl8W/2IiBeQ==
+"@glimmer/global-context@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.62.3.tgz#d77f03d26aea0cb2a2275d0b7d71f52fee7ca9d5"
+  integrity sha512-TjjiuR0urcL2wrY3DMoXkU4838UbG2T9MIUE9Wsh1W9XwoyFMz6CqMOgq2/k7dASYzyAY2dhQB6Y+rEHibAZgA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.1.tgz#42e4021569a00ca60d469ef06cc0c719883d109e"
-  integrity sha512-Ui4u/0G0zOYeDuz497DQ/isOgd43r6zNO0JdsDeVw1D/tYQQHR1Xk/1YRKC9jK2n5oicMYKVyEeT62Ec2rL/Jg==
+"@glimmer/interfaces@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.3.tgz#8ad314d66d1a43197663509806e1cc2088db6741"
+  integrity sha512-bhbKs5vfys4mo+LRxcA4bfMl2zGn+43et4uAzsYppuNPSkP7rwdPD+mLXTYQRkTm0G5K4SnyxDPxMsWCWUNuTw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.62.1.tgz#0fd0870d1ec97d6a81e29ac66ed69e2e17f3094a"
-  integrity sha512-sMNcGWdfgthq0DWHqawMJXoXuhtlA0dY3Y63HyMe5aB94JXw/0SujKdysjG5ImqgRxADcPj39EjS9aJO5AfW2A==
+"@glimmer/low-level@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.62.3.tgz#05f8b09b4eac5b6c8196c7601747ca88c4f147a0"
+  integrity sha512-VeQN5peF20MiSLPkWjFqceLCrbfnYAopCoDCfZwubgNBcEESvbQGQ0fqKNs6pMbkhD4n22usJWiCAFQbMCOgkA==
 
-"@glimmer/node@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.62.1.tgz#48ecee29f596f833d7dc50a27abb83db8a31a711"
-  integrity sha512-gUaQJ950x3BSMKR/PPRD7P+dycqdrYd1gWBTvXDNuAHantH6lLofkGEJmeeDHq+nw8B/CXkD9uqn7H94jiOttg==
+"@glimmer/node@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.62.3.tgz#cb571804b7daaca1b314dc0b493d95dc9d2f3e1a"
+  integrity sha512-ru0shgN6l2xzFE5aCchURXYXdsDbLtkm9qm3nV5AIjNhW9/Z2pnmVwwDysBN5PbXIyF0hboRpDJJ0fgV9ml0Ug==
   dependencies:
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/runtime" "0.62.1"
-    "@glimmer/util" "0.62.1"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/runtime" "0.62.3"
+    "@glimmer/util" "0.62.3"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.62.1.tgz#86596ed10df791887de1f9d43d1e5bcead5878ec"
-  integrity sha512-OJ9kyBwFiPyxu8hNaHHadNlG7ujEu9SLwSJD+5p3lYO3aIbCr0XkQaPmYSgsXiTxtWU9lDLuUVowirHMk/0ZfQ==
-  dependencies:
-    "@glimmer/encoder" "0.62.1"
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/program" "0.62.1"
-    "@glimmer/reference" "0.62.1"
-    "@glimmer/util" "0.62.1"
-    "@glimmer/vm" "0.62.1"
-    "@glimmer/wire-format" "0.62.1"
-
-"@glimmer/program@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.62.1.tgz#8ad8ccdf0ae68b74c349314734b6fb127730da5e"
-  integrity sha512-0gGN2hJWMFFby6PKsCvVA+Yp2fjqR1sjATR3dgZfi8VVxF+VQbMVVLA52o3xuyNzSsVL6GahX6t+RwksR9TXKQ==
-  dependencies:
-    "@glimmer/encoder" "0.62.1"
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/util" "0.62.1"
-
-"@glimmer/reference@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.1.tgz#b4f2263634459673d3c839da04d47202deffb189"
-  integrity sha512-/bud6PB6yw89m9Vyg2CGwk5cwjYjRoA0ZJG3k5WDpLXXF/sHrMxdJFVtVcnmonKRuPzpduypvWzBDAxVdq7w0A==
+"@glimmer/opcode-compiler@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.62.3.tgz#f0a1f2d4984aa4389b7510e4da0642cbfc94caab"
+  integrity sha512-7ACPdDcT0Aa3RALnMxyxinpVnOQS1jVNgilNtryrocHsaIGRxuRj+GvvwJdCiP/xI4OIzMM30qcDeyKru9TtIw==
+  dependencies:
+    "@glimmer/encoder" "0.62.3"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/program" "0.62.3"
+    "@glimmer/reference" "0.62.3"
+    "@glimmer/util" "0.62.3"
+    "@glimmer/vm" "0.62.3"
+    "@glimmer/wire-format" "0.62.3"
+
+"@glimmer/program@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.62.3.tgz#eb22f1864b35d4e626733b099ed1058342e09d84"
+  integrity sha512-fVfM/myEkGERug/d6O3iVxIInTcQ2Tsr4Lp21UR+aEeDsC99bnfuZjTtG1vvmVeduraqjxvStS/9GBb/zdOJ8Q==
+  dependencies:
+    "@glimmer/encoder" "0.62.3"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/util" "0.62.3"
+
+"@glimmer/reference@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.3.tgz#23c6861eaad57def8d8ad54c94aefd1f6fa5541e"
+  integrity sha512-pAyZTFhswKyXOyQzcjh1DA7BMH8WNqjswfeAu8V98b4vfAYb2JYH3IdUadTDwsM5vbYou4e01+dFSAaPHex/lg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.62.1"
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/util" "0.62.1"
-    "@glimmer/validator" "0.62.1"
+    "@glimmer/global-context" "0.62.3"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/util" "0.62.3"
+    "@glimmer/validator" "0.62.3"
 
-"@glimmer/runtime@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.62.1.tgz#b172f4315cfec831b380f7814c73021d78789501"
-  integrity sha512-yrpK1Hvj1GdiVHNyVcN12c/WMqxercdYMMn2ZEiaX9Oc+OcY7ojUK2gkOEoqPx905T8+q27yIc8Xs+89jKAVeg==
+"@glimmer/runtime@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.62.3.tgz#1c254b58429f00e12005540a5da64ef60808de30"
+  integrity sha512-Ru8zDt0bNWtjdj/bdCdJ0rZSKVITdE3s3RRfMqpBRgbKwVWIXWfpJRcOteHcQnMIsAXs6QqE4st9hZTaoNOLGQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.62.1"
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/low-level" "0.62.1"
-    "@glimmer/program" "0.62.1"
-    "@glimmer/reference" "0.62.1"
-    "@glimmer/util" "0.62.1"
-    "@glimmer/validator" "0.62.1"
-    "@glimmer/vm" "0.62.1"
-    "@glimmer/wire-format" "0.62.1"
+    "@glimmer/global-context" "0.62.3"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/low-level" "0.62.3"
+    "@glimmer/program" "0.62.3"
+    "@glimmer/reference" "0.62.3"
+    "@glimmer/util" "0.62.3"
+    "@glimmer/validator" "0.62.3"
+    "@glimmer/vm" "0.62.3"
+    "@glimmer/wire-format" "0.62.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.1.tgz#60f0b14c8503f059b9b73065a2d86f9ca6c6e3f3"
-  integrity sha512-pjnPouu3tVJ5sDcpYCv9hyodJW6T07LvOjsGQ+QT5TdMqN4hoc4iK3dkdrRh+dkNcUsBxFQhxOtAbwOVSgtVtg==
+"@glimmer/syntax@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.3.tgz#8c4abd245a54e8cc084a47ab4a65c33194256fda"
+  integrity sha512-PU4PpMg9UOeYFTODkHN9K6As74lm16XGEQAQbd59oAbvGRu5OAIWFtSU4sMexpKOXu6iJacFO5udX7gVTACRQQ==
   dependencies:
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/util" "0.62.1"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/util" "0.62.3"
     "@handlebars/parser" "^1.1.0"
-    simple-html-tokenizer "^0.5.9"
+    simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.1.tgz#44221aca6a8bb06791b0057db9b1d72330c08094"
-  integrity sha512-e6YTDAgEh8fqarhyN+0ncXOixLn5Wt12/IWdwKmtGIhdALOc/lWbJfrxlmKD+kkFTTjUVJUKm1Y6pxUyXOo4Ww==
+"@glimmer/util@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.3.tgz#d6fc5d64e5e97cbec02b5fcf8a8c78c7f67dc6f5"
+  integrity sha512-HImkS2UJuZYPxyjXPFL9PS659kwjNcRIr5hnUo1PzrPfyZxXwWys2+vTxIv34tI1xkgkQmB1pB0S8pCdNrJY5w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.62.1"
+    "@glimmer/interfaces" "0.62.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.1.tgz#30240a5d7bb574b833fdb39e90202dbbdde9886c"
-  integrity sha512-pewpCA8oh4ONnflgHDhuMYkS4D0sdkxrc9iNwf+LMweGGSszAa34hoiC4noLKdYPGx+oRwi/JXwUPf93cvj2+g==
+"@glimmer/validator@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.3.tgz#241d97c3a42130a4d06d821de66147e50602ffe5"
+  integrity sha512-bge8EhoWvZNDvpfRI5BVvoT1E1+8GsYOWqOYIjXmQJObzXUE6KWgLMI1RGGcS+PItrAnniS1nv+hVdqk4aHDQQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.62.1"
+    "@glimmer/global-context" "0.62.3"
 
-"@glimmer/vm@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.62.1.tgz#418242bfcac4570872543a2a5c5c7fcdab33a690"
-  integrity sha512-W1bYb47jHmJYQIlvEtnrAUWZjbhH+CL83jiIoWBELhOAbiHUUdcmtjZlO3sweCHDsLz+9FQlTWOJuBoOCMRdZg==
+"@glimmer/vm@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.62.3.tgz#b0ce8a7cf3dba9146735d4b58f163495c03f0cfb"
+  integrity sha512-CRs/BdBBd6yu43h1aZStJXrfRwQwbpPTZ/EWAfH90cwjecDoYnjpJX+HnEDqSg+XNk+YgRo0j7cHTIieHju3jQ==
   dependencies:
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/util" "0.62.1"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/util" "0.62.3"
 
-"@glimmer/wire-format@0.62.1":
-  version "0.62.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.62.1.tgz#4b210a6746dd2430e891e4ce4e2c9a743d703bd7"
-  integrity sha512-oLmIosr7RNk6BrZvOKj/NhkZ4/rWqYiQ/nGqzZzwvLY7HZlWmzDcpVsOJtIGOKFO33zHgkEBRtfXDo1+CmmSWQ==
+"@glimmer/wire-format@0.62.3":
+  version "0.62.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.62.3.tgz#2fcbd95461b8bf6a3dfa88cb5357074bcff82ca2"
+  integrity sha512-4Lrk6Vno+3GOihSQMBg4yOP/HFmwiVj18ntbQPPF2+D9x174ydywmdWO5AGn3VNFPojomhatgdUezZ0+czC2WQ==
   dependencies:
-    "@glimmer/interfaces" "0.62.1"
-    "@glimmer/util" "0.62.1"
+    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/util" "0.62.3"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"
@@ -8396,10 +8396,10 @@ simple-dom@^1.4.0:
     "@simple-dom/serializer" "^1.4.0"
     "@simple-dom/void-map" "^1.4.0"
 
-simple-html-tokenizer@^0.5.9:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.9.tgz#1a83fe97f5a3e39b335fddf71cfe9b0263b581c2"
-  integrity sha512-w/3FEDN94r4JQ9WoYrIr8RqDIPZdyNkdpbK9glFady1CAEyD97XWCv8HFetQO21w81e7h7Nh59iYTyG1mUJftg==
+simple-html-tokenizer@^0.5.10:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.10.tgz#0843e4f00c9677f1c81e3dfeefcee0a4aca8e5d0"
+  integrity sha512-1DHMUmvUOGuUZ9/+cX/+hOhWhRD5dEw6lodn8WuV+T+cQ31hhBcCu1dcDsNotowi4mMaNhrLyKoS+DtB81HdDA==
 
 slash@^3.0.0:
   version "3.0.0"

From fb1f3e665cd9690784b8112434cc44e1ffd71b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Antropik?= <michal.antropik@gmail.com>
Date: Sat, 17 Oct 2020 19:42:32 +0200
Subject: [PATCH 0185/1405] add constants to test-framework-detector

---
 blueprints/test-framework-detector.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/blueprints/test-framework-detector.js b/blueprints/test-framework-detector.js
index cdbd405486c..a294a911dfb 100644
--- a/blueprints/test-framework-detector.js
+++ b/blueprints/test-framework-detector.js
@@ -11,37 +11,40 @@ module.exports = function (blueprint) {
 
   blueprint.filesPath = function () {
     let type;
+    const qunitRfcVersion = 'qunit-rfc-232';
+    const mochaRfcVersion = 'mocha-rfc-232';
+    const mochaVersion = 'mocha-0.12';
 
     let dependencies = this.project.dependencies();
     if ('ember-qunit' in dependencies) {
-      type = 'qunit-rfc-232';
+      type = qunitRfcVersion;
     } else if ('ember-cli-qunit' in dependencies) {
       let checker = new VersionChecker(this.project);
       if (
-        fs.existsSync(this.path + '/qunit-rfc-232-files') &&
+        fs.existsSync(`${this.path}/${qunitRfcVersion}-files`) &&
         checker.for('ember-cli-qunit', 'npm').gte('4.2.0')
       ) {
-        type = 'qunit-rfc-232';
+        type = qunitRfcVersion;
       } else {
         type = 'qunit';
       }
     } else if ('ember-mocha' in dependencies) {
       let checker = new VersionChecker(this.project);
       if (
-        fs.existsSync(this.path + '/mocha-rfc-232-files') &&
+        fs.existsSync(`${this.path}/${mochaRfcVersion}-files`) &&
         checker.for('ember-mocha', 'npm').gte('0.14.0')
       ) {
-        type = 'mocha-rfc-232';
+        type = mochaRfcVersion;
       } else {
-        type = 'mocha-0.12';
+        type = mochaVersion;
       }
     } else if ('ember-cli-mocha' in dependencies) {
       let checker = new VersionChecker(this.project);
       if (
-        fs.existsSync(this.path + '/mocha-0.12-files') &&
+        fs.existsSync(`${this.path}/${mochaVersion}-files`) &&
         checker.for('ember-cli-mocha', 'npm').gte('0.12.0')
       ) {
-        type = 'mocha-0.12';
+        type = mochaVersion;
       } else {
         type = 'mocha';
       }

From 3a866f974b6605db8a9a2b32355a7388de6ed536 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 19 Oct 2020 12:34:10 -0400
Subject: [PATCH 0186/1405] Add v3.23.0-beta.2 to CHANGELOG

(cherry picked from commit 4bfc97e683e623174263471e71e9ddf9b8a739b8)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9010975277..2e30a85197f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.23.0-beta.2 (October 19, 2020)
+
+- [#19193](https://github.com/emberjs/ember.js/pull/19193) [BUGFIX] Ensure user lifecycle hooks are untracked
+- [#19213](https://github.com/emberjs/ember.js/pull/19213) [BUGFIX] Update rendering engine to improve error ergonomics.
+
 ### v3.23.0-beta.1 (October 5, 2020)
 
 - [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).

From 09589f40e26ee64baf51d52b5ca96c91dc1151af Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 21 Oct 2020 10:29:40 -0700
Subject: [PATCH 0187/1405] [BUGFIX release] Ensure fn and (mut) work with
 falsy values

---
 .../@ember/-internals/glimmer/lib/helpers/fn.ts     |  2 +-
 .../glimmer/tests/integration/helpers/fn-test.js    | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 63a3f7e87d5..7c4dca12077 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -98,7 +98,7 @@ export default function (args: VMArguments) {
         if (DEBUG) assertCallbackIsFn(callbackRef);
 
         if (isInvokableRef(callbackRef)) {
-          let value = args[0] || invocationArgs[0];
+          let value = args.length > 0 ? args[0] : invocationArgs[0];
           return updateRef(callbackRef, value);
         } else {
           return (fn as Function).call(context, ...args, ...invocationArgs);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
index 7a3f6c9cdc1..6b9986d3547 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
@@ -244,5 +244,18 @@ moduleFor(
 
       this.assertText('bar');
     }
+
+    '@test can be used on the result of `mut` with a falsy value'() {
+      this.render(`{{this.arg1}}{{stash stashedFn=(fn (mut this.arg1) this.arg2)}}`, {
+        arg1: 'foo',
+        arg2: false,
+      });
+
+      this.assertText('foo');
+
+      runTask(() => this.stashedFn());
+
+      this.assertText('false');
+    }
   }
 );

From b21f22f1e5f2923c949dc2be5a4c204c3d77ed0d Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Fri, 23 Oct 2020 13:18:37 -0400
Subject: [PATCH 0188/1405] Revert "[BUGFIX lts] Prevents infinite rerenders
 when errors occur during render"

---
 .../@ember/-internals/glimmer/lib/renderer.ts | 35 ++-----------------
 .../components/error-handling-test.js         | 16 ++-------
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index d66aaacb783..418357e7c90 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -3,7 +3,6 @@ import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
-import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   Cursor,
@@ -78,34 +77,6 @@ export class DynamicScope implements GlimmerDynamicScope {
   }
 }
 
-// This wrapper logic prevents us from rerendering in case of a hard failure
-// during render. This prevents infinite revalidation type loops from occuring,
-// and ensures that errors are not swallowed by subsequent follow on failures.
-function errorLoopTransaction(fn: () => void) {
-  if (DEBUG) {
-    return () => {
-      let didError = true;
-
-      try {
-        fn();
-        didError = false;
-      } finally {
-        if (didError) {
-          // Noop the function so that we won't keep calling it and causing
-          // infinite looping failures;
-          fn = () => {
-            console.warn(
-              'Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.'
-            );
-          };
-        }
-      }
-    };
-  } else {
-    return fn;
-  }
-}
-
 class RootState {
   public id: string;
   public result: RenderResult | undefined;
@@ -131,7 +102,7 @@ class RootState {
     this.result = undefined;
     this.destroyed = false;
 
-    this.render = errorLoopTransaction(() => {
+    this.render = () => {
       let layout = unwrapTemplate(template).asLayout();
       let handle = layout.compile(context);
 
@@ -147,8 +118,8 @@ class RootState {
       let result = (this.result = iterator.sync());
 
       // override .render function after initial render
-      this.render = errorLoopTransaction(() => result.rerender({ alwaysRevalidate: false }));
-    });
+      this.render = () => result.rerender({ alwaysRevalidate: false });
+    };
   }
 
   isFor(possibleRoot: unknown): boolean {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
index a220ae419df..7b1d6ea15ab 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
@@ -1,5 +1,3 @@
-import { DEBUG } from '@glimmer/env';
-
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { set } from '@ember/-internals/metal';
@@ -45,14 +43,10 @@ moduleFor(
 
       runTask(() => set(this.context, 'switch', true));
 
-      if (DEBUG) {
-        this.assertText('', 'it does not rerender after error in development');
-      } else {
-        this.assertText('hello', 'it rerenders after error in production');
-      }
+      this.assertText('hello');
     }
 
-    ['@test it can recover resets the transaction when an error is thrown during rerender'](
+    ['@skip it can recover resets the transaction when an error is thrown during rerender'](
       assert
     ) {
       let shouldThrow = false;
@@ -97,11 +91,7 @@ moduleFor(
 
       runTask(() => set(this.context, 'switch', true));
 
-      if (DEBUG) {
-        this.assertText('', 'it does not rerender after error in development');
-      } else {
-        this.assertText('hello', 'it does rerender after error in production');
-      }
+      this.assertText('hello');
     }
 
     ['@test it can recover resets the transaction when an error is thrown during didInsertElement'](

From ed56eeb2b1b32694cc95bd49af144d0623b1239b Mon Sep 17 00:00:00 2001
From: Raido Kuli <raido357@gmail.com>
Date: Fri, 23 Oct 2020 16:01:45 +0300
Subject: [PATCH 0189/1405] Add {{page-title}} to route templates

---
 .../__templatepath__/__templatename__.hbs     |  3 +-
 blueprints/route/index.js                     |  6 +-
 .../__templatepath__/__templatename__.hbs     |  3 +-
 node-tests/blueprints/route-test.js           | 94 +++++++++++++++++++
 4 files changed, 103 insertions(+), 3 deletions(-)

diff --git a/blueprints/route/files/__root__/__templatepath__/__templatename__.hbs b/blueprints/route/files/__root__/__templatepath__/__templatename__.hbs
index e2147cab02d..9857cee0c36 100644
--- a/blueprints/route/files/__root__/__templatepath__/__templatename__.hbs
+++ b/blueprints/route/files/__root__/__templatepath__/__templatename__.hbs
@@ -1 +1,2 @@
-{{outlet}}
\ No newline at end of file
+<% if (addTitle) {%>{{page-title "<%= routeName %>"}}
+<%}%>{{outlet}}
\ No newline at end of file
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index 48ea99144c8..50b10685a4b 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -73,13 +73,17 @@ module.exports = useEditionDetector({
 
   locals: function (options) {
     let moduleName = options.entity.name;
+    let rawRouteName = moduleName.split('/').pop();
+    let emberPageTitleExists = 'ember-page-title' in options.project.dependencies();
 
     if (options.resetNamespace) {
-      moduleName = moduleName.split('/').pop();
+      moduleName = rawRouteName;
     }
 
     return {
       moduleName: stringUtil.dasherize(moduleName),
+      routeName: stringUtil.classify(rawRouteName),
+      addTitle: emberPageTitleExists,
     };
   },
 
diff --git a/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs b/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
index e2147cab02d..9857cee0c36 100644
--- a/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
+++ b/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
@@ -1 +1,2 @@
-{{outlet}}
\ No newline at end of file
+<% if (addTitle) {%>{{page-title "<%= routeName %>"}}
+<%}%>{{outlet}}
\ No newline at end of file
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index 1b635cb1a06..b8b55b15979 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -276,6 +276,24 @@ describe('Blueprint: route', function () {
         });
       });
     });
+
+    describe('ember-page-title is installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo'], (_file) => {
+          expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
+          expect(_file('app/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
+        });
+      });
+    });
   });
 
   describe('in addon', function () {
@@ -462,6 +480,24 @@ describe('Blueprint: route', function () {
         expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
       });
     });
+
+    describe('ember-page-title is installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo'], (_file) => {
+          expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
+          expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
+        });
+      });
+    });
   });
 
   describe('in app - octane', function () {
@@ -719,6 +755,24 @@ describe('Blueprint: route', function () {
         });
       });
     });
+
+    describe('ember-page-title is installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo'], (_file) => {
+          expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
+          expect(_file('app/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
+        });
+      });
+    });
   });
 
   describe('in addon - octane', function () {
@@ -907,6 +961,24 @@ describe('Blueprint: route', function () {
         expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
       });
     });
+
+    describe('ember-page-title is installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo'], (_file) => {
+          expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
+          expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
+        });
+      });
+    });
   });
 
   describe('in in-repo-addon', function () {
@@ -984,5 +1056,27 @@ describe('Blueprint: route', function () {
         );
       });
     });
+
+    describe('ember-page-title is installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
+          expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
+            '{{page-title "Foo"}}\n{{outlet}}'
+          );
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
+          expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal(
+            '{{page-title "Bar"}}\n{{outlet}}'
+          );
+        });
+      });
+    });
   });
 });

From 1377c9d0a898c47fbd52d7bc7e23338b2e493d40 Mon Sep 17 00:00:00 2001
From: bekzod <bekzod@me.com>
Date: Sat, 24 Oct 2020 13:07:25 +0500
Subject: [PATCH 0190/1405] remove obsolete _tags in meta

---
 packages/@ember/-internals/meta/lib/meta.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 64ab5182b3d..43e76ef9320 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -91,7 +91,6 @@ export class Meta {
   _isInit: boolean;
   _lazyChains: ObjMap<[UpdatableTag, unknown][]> | undefined;
   _values: ObjMap<unknown> | undefined;
-  _tags: ObjMap<UpdatableTag> | undefined;
   _revisions: ObjMap<Revision> | undefined;
   source: object;
   proto: object | undefined;
@@ -112,7 +111,6 @@ export class Meta {
     this._mixins = undefined;
     this._lazyChains = undefined;
     this._values = undefined;
-    this._tags = undefined;
     this._revisions = undefined;
 
     // initial value for all flags right now is false

From 245631c972cad2162ba2329a70cd7f77331b385a Mon Sep 17 00:00:00 2001
From: Sanjida Afrin <safrin2@myseneca.ca>
Date: Sun, 25 Oct 2020 13:04:53 -0400
Subject: [PATCH 0191/1405] [CLEANUP] Remove the
 EMBER_GLIMMER_SET_COMPONENT_TEMPLATE flag

---
 .../@ember/-internals/glimmer/lib/resolver.ts |  22 +--
 .../components/component-template-test.js     | 186 +++++++++---------
 .../template-only-components-test.js          |  76 ++++---
 packages/@ember/canary-features/index.ts      |   4 -
 packages/ember/index.js                       |  11 +-
 packages/ember/tests/reexports_test.js        |  14 +-
 6 files changed, 146 insertions(+), 167 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 3d53fc0f166..ba7f71f482a 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -2,10 +2,7 @@ import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
 import { OwnedTemplateMeta } from '@ember/-internals/views';
-import {
-  EMBER_GLIMMER_HELPER_MANAGER,
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
-} from '@ember/canary-features';
+import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import { isTemplateOnlyComponent } from '@ember/component/template-only';
 import { assert, deprecate } from '@ember/debug';
 import { PARTIALS } from '@ember/deprecated-features';
@@ -106,16 +103,16 @@ function lookupComponentPair(
 ): Option<LookupResult> {
   let component = componentFor(name, owner, options);
 
-  if (EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
-    if (component !== null && component.class !== undefined) {
-      let layout = getComponentTemplate(component.class);
 
-      if (layout !== null) {
-        return { component, layout };
-      }
+  if (component !== null && component.class !== undefined) {
+    let layout = getComponentTemplate(component.class);
+
+    if (layout !== null) {
+      return { component, layout };
     }
   }
 
+
   let layout = layoutFor(name, owner, options);
 
   if (component === null && layout === null) {
@@ -462,10 +459,7 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
         definition = new TemplateOnlyComponentDefinition(name, layout!);
       }
-    } else if (
-      EMBER_GLIMMER_SET_COMPONENT_TEMPLATE &&
-      isTemplateOnlyComponent(pair.component.class)
-    ) {
+    } else if (isTemplateOnlyComponent(pair.component.class)) {
       definition = new TemplateOnlyComponentDefinition(name, layout!);
     }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
index 6d1a098b58a..4257319701e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -1,138 +1,136 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { EMBER_GLIMMER_SET_COMPONENT_TEMPLATE } from '@ember/canary-features';
 import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 
 import { Component, compile } from '../../utils/helpers';
 import { setComponentTemplate, getComponentTemplate } from '../../..';
 
-if (EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
-  moduleFor(
-    'Components test: setComponentTemplate',
-    class extends RenderingTestCase {
-      '@test it basically works'() {
-        this.registerComponent('foo-bar', {
-          ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
-        });
+moduleFor(
+  'Components test: setComponentTemplate',
+  class extends RenderingTestCase {
+    '@test it basically works'() {
+      this.registerComponent('foo-bar', {
+        ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
+      });
 
-        this.render('<FooBar />');
+      this.render('<FooBar />');
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
-      }
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+    }
 
-      '@test it takes precedence over resolver'() {
-        this.registerComponent('foo-bar', {
-          ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
-          template: 'noooooo!',
-        });
+    '@test it takes precedence over resolver'() {
+      this.registerComponent('foo-bar', {
+        ComponentClass: setComponentTemplate(compile('hello'), Component.extend()),
+        template: 'noooooo!',
+      });
 
-        this.render('<FooBar />');
+      this.render('<FooBar />');
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
-      }
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+    }
 
-      '@test calling it with primitives asserts'() {
-        expectAssertion(() => {
-          setComponentTemplate(compile('foo'), null);
-        }, /Cannot call `setComponentTemplate` on `null`/);
+    '@test calling it with primitives asserts'() {
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), null);
+      }, /Cannot call `setComponentTemplate` on `null`/);
 
-        expectAssertion(() => {
-          setComponentTemplate(compile('foo'), undefined);
-        }, /Cannot call `setComponentTemplate` on `undefined`/);
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), undefined);
+      }, /Cannot call `setComponentTemplate` on `undefined`/);
 
-        expectAssertion(() => {
-          setComponentTemplate(compile('foo'), true);
-        }, /Cannot call `setComponentTemplate` on `true`/);
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), true);
+      }, /Cannot call `setComponentTemplate` on `true`/);
 
-        expectAssertion(() => {
-          setComponentTemplate(compile('foo'), false);
-        }, /Cannot call `setComponentTemplate` on `false`/);
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), false);
+      }, /Cannot call `setComponentTemplate` on `false`/);
 
-        expectAssertion(() => {
-          setComponentTemplate(compile('foo'), 123);
-        }, /Cannot call `setComponentTemplate` on `123`/);
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), 123);
+      }, /Cannot call `setComponentTemplate` on `123`/);
 
-        expectAssertion(() => {
-          setComponentTemplate(compile('foo'), 'foo');
-        }, /Cannot call `setComponentTemplate` on `foo`/);
-
-        if (HAS_NATIVE_SYMBOL) {
-          expectAssertion(() => {
-            setComponentTemplate(compile('foo'), Symbol('foo'));
-          }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
-        }
-      }
-
-      '@test calling it twice on the same object asserts'() {
-        let Thing = setComponentTemplate(
-          compile('hello'),
-          Component.extend().reopenClass({
-            toString() {
-              return 'Thing';
-            },
-          })
-        );
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), 'foo');
+      }, /Cannot call `setComponentTemplate` on `foo`/);
 
+      if (HAS_NATIVE_SYMBOL) {
         expectAssertion(() => {
-          setComponentTemplate(compile('foo'), Thing);
-        }, /Cannot call `setComponentTemplate` multiple times on the same class \(`Thing`\)/);
+          setComponentTemplate(compile('foo'), Symbol('foo'));
+        }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
       }
+    }
 
-      '@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
-        let Parent = setComponentTemplate(compile('hello'), Component.extend());
+    '@test calling it twice on the same object asserts'() {
+      let Thing = setComponentTemplate(
+        compile('hello'),
+        Component.extend().reopenClass({
+          toString() {
+            return 'Thing';
+          },
+        })
+      );
+
+      expectAssertion(() => {
+        setComponentTemplate(compile('foo'), Thing);
+      }, /Cannot call `setComponentTemplate` multiple times on the same class \(`Thing`\)/);
+    }
 
-        this.registerComponent('foo-bar', {
-          ComponentClass: Parent.extend(),
-        });
+    '@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
+      let Parent = setComponentTemplate(compile('hello'), Component.extend());
 
-        this.render('<FooBar />');
+      this.registerComponent('foo-bar', {
+        ComponentClass: Parent.extend(),
+      });
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.render('<FooBar />');
 
-        runTask(() => this.rerender());
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
-      }
+      runTask(() => this.rerender());
+
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+    }
 
-      '@test templates set with setComponentTemplate are inherited (native ES class extends)'() {
-        let Parent = setComponentTemplate(compile('hello'), Component.extend());
+    '@test templates set with setComponentTemplate are inherited (native ES class extends)'() {
+      let Parent = setComponentTemplate(compile('hello'), Component.extend());
 
-        this.registerComponent('foo-bar', {
-          ComponentClass: class extends Parent {},
-        });
+      this.registerComponent('foo-bar', {
+        ComponentClass: class extends Parent {},
+      });
 
-        this.render('<FooBar />');
+      this.render('<FooBar />');
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertComponentElement(this.firstChild, { content: 'hello' });
-      }
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+    }
 
-      '@test it can re-assign templates from another class'() {
-        let Foo = setComponentTemplate(compile('shared'), Component.extend());
-        let Bar = setComponentTemplate(getComponentTemplate(Foo), Component.extend());
+    '@test it can re-assign templates from another class'() {
+      let Foo = setComponentTemplate(compile('shared'), Component.extend());
+      let Bar = setComponentTemplate(getComponentTemplate(Foo), Component.extend());
 
-        this.registerComponent('foo', { ComponentClass: Foo });
-        this.registerComponent('bar', { ComponentClass: Bar });
+      this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('bar', { ComponentClass: Bar });
 
-        this.render('<Foo />|<Bar />');
+      this.render('<Foo />|<Bar />');
 
-        this.assertText('shared|shared');
+      this.assertText('shared|shared');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertText('shared|shared');
-      }
+      this.assertText('shared|shared');
     }
-  );
-}
+  }
+);
+
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index ea01c6391de..3f56b1c1855 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -1,6 +1,4 @@
 import { moduleFor, RenderingTestCase, classes, runTask } from 'internal-test-helpers';
-import { EMBER_GLIMMER_SET_COMPONENT_TEMPLATE } from '@ember/canary-features';
-
 import { ENV } from '@ember/-internals/environment';
 import { setComponentTemplate } from '@ember/-internals/glimmer';
 import templateOnly from '@ember/component/template-only';
@@ -266,56 +264,56 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
   );
 }
 
-if (EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
-  moduleFor(
-    'Components test: template-only components (using `templateOnlyComponent()`)',
-    class extends RenderingTestCase {
-      ['@test it can render a component']() {
-        this.registerComponent('foo-bar', { ComponentClass: templateOnly(), template: 'hello' });
 
-        this.render('{{foo-bar}}');
+moduleFor(
+  'Components test: template-only components (using `templateOnlyComponent()`)',
+  class extends RenderingTestCase {
+    ['@test it can render a component']() {
+      this.registerComponent('foo-bar', { ComponentClass: templateOnly(), template: 'hello' });
 
-        this.assertInnerHTML('hello');
+      this.render('{{foo-bar}}');
 
-        this.assertStableRerender();
-      }
+      this.assertInnerHTML('hello');
 
-      ['@test it can render a component when template was not registered']() {
-        let ComponentClass = templateOnly();
-        setComponentTemplate(compile('hello'), ComponentClass);
+      this.assertStableRerender();
+    }
 
-        this.registerComponent('foo-bar', { ComponentClass });
+    ['@test it can render a component when template was not registered']() {
+      let ComponentClass = templateOnly();
+      setComponentTemplate(compile('hello'), ComponentClass);
 
-        this.render('{{foo-bar}}');
+      this.registerComponent('foo-bar', { ComponentClass });
 
-        this.assertInnerHTML('hello');
+      this.render('{{foo-bar}}');
 
-        this.assertStableRerender();
-      }
+      this.assertInnerHTML('hello');
+
+      this.assertStableRerender();
+    }
 
-      ['@test setComponentTemplate takes precedence over registered layout']() {
-        let ComponentClass = templateOnly();
-        setComponentTemplate(compile('hello'), ComponentClass);
+    ['@test setComponentTemplate takes precedence over registered layout']() {
+      let ComponentClass = templateOnly();
+      setComponentTemplate(compile('hello'), ComponentClass);
 
-        this.registerComponent('foo-bar', {
-          ComponentClass,
-          template: 'this should not be rendered',
-        });
+      this.registerComponent('foo-bar', {
+        ComponentClass,
+        template: 'this should not be rendered',
+      });
 
-        this.render('{{foo-bar}}');
+      this.render('{{foo-bar}}');
 
-        this.assertInnerHTML('hello');
+      this.assertInnerHTML('hello');
 
-        this.assertStableRerender();
-      }
+      this.assertStableRerender();
+    }
 
-      ['@test templateOnly accepts a moduleName to be used for debugging / toString purposes'](
-        assert
-      ) {
-        let ComponentClass = templateOnly('my-app/components/foo');
+    ['@test templateOnly accepts a moduleName to be used for debugging / toString purposes'](
+      assert
+    ) {
+      let ComponentClass = templateOnly('my-app/components/foo');
 
-        assert.equal(`${ComponentClass}`, 'my-app/components/foo');
-      }
+      assert.equal(`${ComponentClass}`, 'my-app/components/foo');
     }
-  );
-}
+  }
+);
+
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 4abdc300489..9bf0601351f 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -16,7 +16,6 @@ export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_NAMED_BLOCKS: null,
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
@@ -71,9 +70,6 @@ function featureValue(value: null | boolean) {
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
-export const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = featureValue(
-  FEATURES.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
-);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
 export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 79830be02f5..e80787a2db6 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -12,7 +12,6 @@ import {
   isEnabled,
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
@@ -591,11 +590,11 @@ Ember._setComponentManager = setComponentManager;
 Ember._componentManagerCapabilities = capabilities;
 Ember._setModifierManager = setModifierManager;
 Ember._modifierManagerCapabilities = modifierCapabilities;
-if (EMBER_GLIMMER_SET_COMPONENT_TEMPLATE) {
-  Ember._getComponentTemplate = getComponentTemplate;
-  Ember._setComponentTemplate = setComponentTemplate;
-  Ember._templateOnlyComponent = templateOnlyComponent;
-}
+
+Ember._getComponentTemplate = getComponentTemplate;
+Ember._setComponentTemplate = setComponentTemplate;
+Ember._templateOnlyComponent = templateOnlyComponent;
+
 if (EMBER_GLIMMER_HELPER_MANAGER) {
   Ember._helperManagerCapabilities = helperCapabilities;
   Ember._setHelperManager = setHelperManager;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index ab0da3577be..fbfdb06ba98 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -4,7 +4,6 @@ import {
   FEATURES,
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
 import { confirmExport } from 'internal-test-helpers';
@@ -265,15 +264,10 @@ let allExports = [
   ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
   ['_setComponentManager', '@ember/-internals/glimmer', 'setComponentManager'],
   ['_componentManagerCapabilities', '@ember/-internals/glimmer', 'capabilities'],
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
-    ? ['_setComponentTemplate', '@ember/-internals/glimmer', 'setComponentTemplate']
-    : null,
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
-    ? ['_getComponentTemplate', '@ember/-internals/glimmer', 'getComponentTemplate']
-    : null,
-  EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
-    ? ['_templateOnlyComponent', '@ember/component/template-only', 'default']
-    : null,
+
+  ['_setComponentTemplate', '@ember/-internals/glimmer', 'setComponentTemplate'],
+  ['_getComponentTemplate', '@ember/-internals/glimmer', 'getComponentTemplate'], 
+  ['_templateOnlyComponent', '@ember/component/template-only', 'default'],
   EMBER_GLIMMER_HELPER_MANAGER
     ? ['_setHelperManager', '@ember/-internals/glimmer', 'setHelperManager']
     : null,

From 29b096bdceb31a6afabb9955e4f67a10b4e7e621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Antropik?= <michal.antropik@gmail.com>
Date: Sun, 25 Oct 2020 18:58:36 +0100
Subject: [PATCH 0192/1405] fix linitng warnings in run.ts file

---
 packages/internal-test-helpers/lib/run.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 719372e3c5e..f8f7e93874f 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -9,29 +9,29 @@ import {
 
 import { Promise } from 'rsvp';
 
-export function runAppend(view: any) {
+export function runAppend(view: any): void {
   run(view, 'appendTo', document.getElementById('qunit-fixture'));
 }
 
-export function runDestroy(toDestroy: any) {
+export function runDestroy(toDestroy: any): void {
   if (toDestroy) {
     run(toDestroy, 'destroy');
   }
 }
 
-export function runTask(callback: Function) {
+export function runTask(callback: Function): Function {
   return run(callback);
 }
 
 export function runTaskNext(): Promise<void> {
-  return new Promise((resolve) => {
+  return new Promise((resolve: Function) => {
     return next(resolve);
   });
 }
 
 // TODO: Find a better name 😎
 export function runLoopSettled(event?: any): Promise<void> {
-  return new Promise(function (resolve) {
+  return new Promise(function (resolve: Function) {
     // Every 5ms, poll for the async thing to have finished
     let watcher = setInterval(() => {
       // If there are scheduled timers or we are inside of a run loop, keep polling

From 3f9e7079913586f06e57bde2cfa9a735e149d9fa Mon Sep 17 00:00:00 2001
From: Sanjida Afrin <safrin2@myseneca.ca>
Date: Sun, 25 Oct 2020 14:01:29 -0400
Subject: [PATCH 0193/1405] Fixed lint reported issue

---
 packages/@ember/-internals/glimmer/lib/resolver.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ba7f71f482a..0f27fc62974 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -103,7 +103,6 @@ function lookupComponentPair(
 ): Option<LookupResult> {
   let component = componentFor(name, owner, options);
 
-
   if (component !== null && component.class !== undefined) {
     let layout = getComponentTemplate(component.class);
 
@@ -112,7 +111,6 @@ function lookupComponentPair(
     }
   }
 
-
   let layout = layoutFor(name, owner, options);
 
   if (component === null && layout === null) {

From a492ffedd7db6b641fd7e8e10fb9483d619995f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Antropik?= <michal.antropik@gmail.com>
Date: Sun, 25 Oct 2020 20:11:57 +0100
Subject: [PATCH 0194/1405] fix linter warnings in 14 files

---
 .../@ember/-internals/glimmer/lib/modifiers/on.ts  | 14 +++++++-------
 .../-internals/glimmer/lib/template_registry.ts    |  4 ++--
 .../lib/utils/curly-component-state-bucket.ts      |  4 ++--
 packages/@ember/-internals/utils/lib/super.ts      |  8 ++++----
 .../@ember/-internals/views/lib/system/utils.ts    | 10 +++++-----
 .../lib/system/compile-options.ts                  |  4 ++--
 .../tests/utils/transform-test-case.ts             |  6 ++++--
 .../lib/ember-dev/assertion.ts                     |  2 +-
 .../lib/ember-dev/containers.ts                    |  2 +-
 .../internal-test-helpers/lib/ember-dev/debug.ts   | 10 +++++-----
 .../lib/ember-dev/deprecation.ts                   |  6 +++---
 .../lib/ember-dev/method-call-tracker.ts           | 14 +++++++-------
 .../lib/ember-dev/namespaces.ts                    |  2 +-
 .../lib/ember-dev/observers.ts                     |  2 +-
 14 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 7bd270114fd..9c0832ef186 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -69,7 +69,7 @@ export class OnModifierState {
     this.args = args;
   }
 
-  updateFromArgs() {
+  updateFromArgs(): void {
     let { args } = this;
 
     let { once, passive, capture }: AddEventListenerOptions = reifyNamed(args.named);
@@ -321,15 +321,15 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     this.owner = owner;
   }
 
-  getDebugName() {
+  getDebugName(): string {
     return 'on';
   }
 
-  get counters() {
+  get counters(): {adds: number, removes: number} {
     return { adds, removes };
   }
 
-  create(element: SimpleElement | Element, _state: unknown, args: VMArguments) {
+  create(element: SimpleElement | Element, _state: unknown, args: VMArguments): OnModifierState | null {
     if (!this.isInteractive) {
       return null;
     }
@@ -347,7 +347,7 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     return state.tag;
   }
 
-  install(state: OnModifierState | null) {
+  install(state: OnModifierState | null): void {
     if (state === null) {
       return;
     }
@@ -363,7 +363,7 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     state.shouldUpdate = false;
   }
 
-  update(state: OnModifierState | null) {
+  update(state: OnModifierState | null): void {
     if (state === null) {
       return;
     }
@@ -386,7 +386,7 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     state.shouldUpdate = false;
   }
 
-  getDestroyable(state: OnModifierState | null) {
+  getDestroyable(state: OnModifierState | null): OnModifierState | null {
     return state;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/template_registry.ts b/packages/@ember/-internals/glimmer/lib/template_registry.ts
index 038be29cc0a..eae0457aa94 100644
--- a/packages/@ember/-internals/glimmer/lib/template_registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/template_registry.ts
@@ -7,11 +7,11 @@ interface TemplatesRegistry {
 }
 let TEMPLATES: TemplatesRegistry = {};
 
-export function setTemplates(templates: TemplatesRegistry) {
+export function setTemplates(templates: TemplatesRegistry): void {
   TEMPLATES = templates;
 }
 
-export function getTemplates() {
+export function getTemplates(): TemplatesRegistry {
   return TEMPLATES;
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 02738804bbe..41f3fd2b631 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -60,7 +60,7 @@ export default class ComponentStateBucket {
     registerDestructor(this, () => this.component.destroy());
   }
 
-  willDestroy() {
+  willDestroy(): void {
     let { component, environment } = this;
 
     if (environment.isInteractive) {
@@ -80,7 +80,7 @@ export default class ComponentStateBucket {
     component.renderer.unregister(component);
   }
 
-  finalize() {
+  finalize(): void {
     let { finalizer } = this;
     finalizer();
     this.finalizer = NOOP;
diff --git a/packages/@ember/-internals/utils/lib/super.ts b/packages/@ember/-internals/utils/lib/super.ts
index e28dc54a91d..2123597675a 100644
--- a/packages/@ember/-internals/utils/lib/super.ts
+++ b/packages/@ember/-internals/utils/lib/super.ts
@@ -54,16 +54,16 @@ function createObserverListenerMetaFor(fn: Function) {
   return meta;
 }
 
-export function observerListenerMetaFor(fn: Function) {
+export function observerListenerMetaFor(fn: Function): ObserverListenerMeta | undefined {
   return OBSERVERS_LISTENERS_MAP.get(fn);
 }
 
-export function setObservers(func: Function, observers: { paths: string[]; sync: boolean }) {
+export function setObservers(func: Function, observers: { paths: string[]; sync: boolean }): void {
   let meta = createObserverListenerMetaFor(func);
   meta.observers = observers;
 }
 
-export function setListeners(func: Function, listeners: string[]) {
+export function setListeners(func: Function, listeners: string[]): void {
   let meta = createObserverListenerMetaFor(func);
   meta.listeners = listeners;
 }
@@ -82,7 +82,7 @@ const IS_WRAPPED_FUNCTION_SET = new WeakSet();
   @param {Function} superFunc The super function.
   @return {Function} wrapped function.
 */
-export function wrap(func: Function, superFunc: Function) {
+export function wrap(func: Function, superFunc: Function): Function {
   if (!hasSuper(func)) {
     return func;
   }
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index baa1430f29a..81050f2b5bd 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -9,14 +9,14 @@ import { Dict, Option } from '@glimmer/interfaces';
 @module ember
 */
 
-export function isSimpleClick(event: MouseEvent) {
+export function isSimpleClick(event: MouseEvent): boolean {
   let modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
   let secondaryClick = event.which > 1; // IE9 may return undefined
 
   return !modifier && !secondaryClick;
 }
 
-export function constructStyleDeprecationMessage(affectedStyle: string) {
+export function constructStyleDeprecationMessage(affectedStyle: string): string {
   return (
     '' +
     'Binding style attributes may introduce cross-site scripting vulnerabilities; ' +
@@ -116,7 +116,7 @@ const CHILD_VIEW_IDS: WeakMap<View, Set<string>> = new WeakMap();
   @method getChildViews
   @param {Ember.View} view
 */
-export function getChildViews(view: View) {
+export function getChildViews(view: View): View[] {
   let owner = getOwner(view);
   let registry = owner.lookup<Dict<View>>('-view-registry:main')!;
   return collectChildViews(view, registry);
@@ -227,12 +227,12 @@ export const elMatches: typeof Element.prototype.matches | undefined =
       Element.prototype['webkitMatchesSelector']
     : undefined;
 
-export function matches(el: Element, selector: string) {
+export function matches(el: Element, selector: string): boolean {
   assert('cannot call `matches` in fastboot mode', elMatches !== undefined);
   return elMatches!.call(el, selector);
 }
 
-export function contains(a: Node, b: Node) {
+export function contains(a: Node, b: Node): boolean {
   if (a.contains !== undefined) {
     return a.contains(b);
   }
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 9707713a516..5844d0b50d5 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -76,7 +76,7 @@ function wrapLegacyPluginIfNeeded(_plugin: PluginFunc | LegacyPluginClass): Plug
   return plugin as PluginFunc;
 }
 
-export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginClass) {
+export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginClass): void {
   if (type !== 'ast') {
     throw new Error(
       `Attempting to register ${_plugin} as "${type}" which is not a valid Glimmer plugin type.`
@@ -95,7 +95,7 @@ export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginC
   USER_PLUGINS = [plugin, ...USER_PLUGINS];
 }
 
-export function unregisterPlugin(type: string, PluginClass: PluginFunc | LegacyPluginClass) {
+export function unregisterPlugin(type: string, PluginClass: PluginFunc | LegacyPluginClass): void {
   if (type !== 'ast') {
     throw new Error(
       `Attempting to unregister ${PluginClass} as "${type}" which is not a valid Glimmer plugin type.`
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 1c2b85a6fe1..8d2983c27e2 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -5,7 +5,7 @@ import { AbstractTestCase } from 'internal-test-helpers';
 import { compileOptions } from '../../index';
 
 export default class extends AbstractTestCase {
-  assertTransformed(before: string, after: string) {
+  assertTransformed(before: string, after: string): void {
     this.assert.deepEqual(deloc(ast(before)), deloc(ast(after)));
   }
 }
@@ -31,7 +31,9 @@ function ast(template: string): AST.Program {
     moduleName: '-top-level',
   });
 
-  options.plugins!.ast!.push(extractProgram);
+  if (options.plugins.ast) {
+    options.plugins.ast.push(extractProgram);
+  }
 
   precompile(template, options as any);
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/assertion.ts b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
index 6941203760b..ce1c3f2469b 100644
--- a/packages/internal-test-helpers/lib/ember-dev/assertion.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
@@ -30,7 +30,7 @@ const BREAK = {};
   In particular, this prevents `Ember.assert` from throw errors that would
   disrupt the control flow.
 */
-export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv) {
+export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv): void {
   let originalAssertFunc = env.getDebugFunction('assert');
 
   hooks.beforeEach(function (assert) {
diff --git a/packages/internal-test-helpers/lib/ember-dev/containers.ts b/packages/internal-test-helpers/lib/ember-dev/containers.ts
index 24a2c31cfc5..99659f0fe66 100644
--- a/packages/internal-test-helpers/lib/ember-dev/containers.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/containers.ts
@@ -2,7 +2,7 @@ import { Container } from '@ember/-internals/container';
 
 const { _leakTracking: containerLeakTracking } = Container;
 
-export function setupContainersCheck(hooks: NestedHooks) {
+export function setupContainersCheck(hooks: NestedHooks): void {
   hooks.afterEach(function () {
     if (containerLeakTracking === undefined) return;
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/debug.ts b/packages/internal-test-helpers/lib/ember-dev/debug.ts
index 3be735f873f..ee04360741f 100644
--- a/packages/internal-test-helpers/lib/ember-dev/debug.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/debug.ts
@@ -12,13 +12,13 @@ class DebugAssert {
     this.tracker = null;
   }
 
-  inject() {}
+  inject(): void {}
 
-  restore() {
+  restore(): void {
     this.reset();
   }
 
-  reset() {
+  reset(): void {
     if (this.tracker) {
       this.tracker.restoreMethod();
     }
@@ -26,7 +26,7 @@ class DebugAssert {
     this.tracker = null;
   }
 
-  assert() {
+  assert(): void {
     if (this.tracker) {
       this.tracker.assert();
     }
@@ -38,7 +38,7 @@ class DebugAssert {
     func: (() => any) | undefined,
     callback: (tracker: MethodCallTracker) => void,
     async = false
-  ) {
+  ): void {
     let originalTracker: MethodCallTracker | null = null;
 
     // When helpers are passed a callback, they get a new tracker context
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index 6a64f5ac152..2ab1784f168 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -21,7 +21,7 @@ declare global {
   }
 }
 
-export function setupDeprecationHelpers(hooks: NestedHooks, env: DebugEnv) {
+export function setupDeprecationHelpers(hooks: NestedHooks, env: DebugEnv): void {
   let assertion = new DeprecationAssert(env);
 
   hooks.beforeEach(function () {
@@ -40,7 +40,7 @@ class DeprecationAssert extends DebugAssert {
     super('deprecate', env);
   }
 
-  inject() {
+  inject(): void {
     // Expects no deprecation to happen within a function, or if no function is
     // passed, from the time of calling until the end of the test.
     //
@@ -127,7 +127,7 @@ class DeprecationAssert extends DebugAssert {
     window.ignoreDeprecation = ignoreDeprecation;
   }
 
-  restore() {
+  restore(): void {
     super.restore();
     window.expectDeprecation = null;
     window.expectDeprecationAsync = null;
diff --git a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
index 2d68b1e37c0..e5964c664b6 100644
--- a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
@@ -24,7 +24,7 @@ export default class MethodCallTracker {
     this._originalMethod = undefined;
   }
 
-  stubMethod() {
+  stubMethod(): void {
     if (this._originalMethod) {
       // Method is already stubbed
       return;
@@ -42,32 +42,32 @@ export default class MethodCallTracker {
     });
   }
 
-  restoreMethod() {
+  restoreMethod(): void {
     if (this._originalMethod) {
       this._env.setDebugFunction(this._methodName, this._originalMethod);
     }
   }
 
-  expectCall(message: Message, options?: OptionList) {
+  expectCall(message: Message, options?: OptionList): void {
     this.stubMethod();
     this._expectedMessages.push(message || /.*/);
     this._expectedOptionLists.push(options);
   }
 
-  expectNoCalls() {
+  expectNoCalls(): void {
     this.stubMethod();
     this._isExpectingNoCalls = true;
   }
 
-  isExpectingNoCalls() {
+  isExpectingNoCalls(): boolean {
     return this._isExpectingNoCalls;
   }
 
-  isExpectingCalls() {
+  isExpectingCalls(): boolean | number {
     return !this._isExpectingNoCalls && this._expectedMessages.length;
   }
 
-  assert() {
+  assert(): void {
     let { assert } = QUnit.config.current;
     let methodName = this._methodName;
     let isExpectingNoCalls = this._isExpectingNoCalls;
diff --git a/packages/internal-test-helpers/lib/ember-dev/namespaces.ts b/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
index c2b9022cd26..b15bfa502ce 100644
--- a/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
@@ -1,7 +1,7 @@
 import { NAMESPACES, NAMESPACES_BY_ID } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 
-export function setupNamespacesCheck(hooks: NestedHooks) {
+export function setupNamespacesCheck(hooks: NestedHooks): void {
   hooks.afterEach(function () {
     let { assert } = QUnit.config.current;
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/observers.ts b/packages/internal-test-helpers/lib/ember-dev/observers.ts
index ea1411fdc5d..bff9c424ded 100644
--- a/packages/internal-test-helpers/lib/ember-dev/observers.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/observers.ts
@@ -1,7 +1,7 @@
 import { ASYNC_OBSERVERS, SYNC_OBSERVERS } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 
-export function setupObserversCheck(hooks: NestedHooks) {
+export function setupObserversCheck(hooks: NestedHooks): void {
   hooks.afterEach(function () {
     let { assert } = QUnit.config.current;
 

From 9ff6ce7d4f4259b9b949d487a2c87597c6088592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Antropik?= <michal.antropik@gmail.com>
Date: Sun, 25 Oct 2020 20:19:46 +0100
Subject: [PATCH 0195/1405] properly format on.ts file

---
 packages/@ember/-internals/glimmer/lib/modifiers/on.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 9c0832ef186..394dce18903 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -325,11 +325,15 @@ export default class OnModifierManager implements ModifierManager<OnModifierStat
     return 'on';
   }
 
-  get counters(): {adds: number, removes: number} {
+  get counters(): { adds: number; removes: number } {
     return { adds, removes };
   }
 
-  create(element: SimpleElement | Element, _state: unknown, args: VMArguments): OnModifierState | null {
+  create(
+    element: SimpleElement | Element,
+    _state: unknown,
+    args: VMArguments
+  ): OnModifierState | null {
     if (!this.isInteractive) {
       return null;
     }

From 93ee2242fb3c04f507efe7b17003707fdc5734e1 Mon Sep 17 00:00:00 2001
From: Sanjida Afrin <safrin2@myseneca.ca>
Date: Sun, 25 Oct 2020 16:09:43 -0400
Subject: [PATCH 0196/1405] Fixed more linter related issues

---
 .../tests/integration/components/component-template-test.js    | 1 -
 .../integration/components/template-only-components-test.js    | 2 --
 packages/ember/tests/reexports_test.js                         | 3 +--
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
index 4257319701e..ac744699f6c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -133,4 +133,3 @@ moduleFor(
     }
   }
 );
-
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 3f56b1c1855..df680185d32 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -264,7 +264,6 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
   );
 }
 
-
 moduleFor(
   'Components test: template-only components (using `templateOnlyComponent()`)',
   class extends RenderingTestCase {
@@ -316,4 +315,3 @@ moduleFor(
     }
   }
 );
-
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index fbfdb06ba98..f2b91d7473f 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -264,9 +264,8 @@ let allExports = [
   ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
   ['_setComponentManager', '@ember/-internals/glimmer', 'setComponentManager'],
   ['_componentManagerCapabilities', '@ember/-internals/glimmer', 'capabilities'],
-
   ['_setComponentTemplate', '@ember/-internals/glimmer', 'setComponentTemplate'],
-  ['_getComponentTemplate', '@ember/-internals/glimmer', 'getComponentTemplate'], 
+  ['_getComponentTemplate', '@ember/-internals/glimmer', 'getComponentTemplate'],
   ['_templateOnlyComponent', '@ember/component/template-only', 'default'],
   EMBER_GLIMMER_HELPER_MANAGER
     ? ['_setHelperManager', '@ember/-internals/glimmer', 'setHelperManager']

From 5e7e54347488a7c2f25c3bc39256affb0ba52048 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 13 Oct 2020 14:36:21 -0700
Subject: [PATCH 0197/1405] [BUGFIX lts] Restores the shadowed property set
 behavior

Restores the previous behavior that would happen when setting a shadowed
property.
---
 .../@ember/-internals/metal/lib/decorator.ts  | 27 ++++++++++---------
 .../-internals/metal/lib/property_set.ts      | 19 +++----------
 .../@ember/-internals/metal/lib/tracked.ts    |  8 ++----
 .../metal/tests/tracked/set_test.js           |  8 +++---
 4 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index bd172ec2271..29e7b338ed1 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -71,12 +71,10 @@ export abstract class ComputedDescriptor {
   abstract set(obj: object, keyName: string, value: any | null | undefined): any | null | undefined;
 }
 
-export let CPGETTERS: WeakSet<() => unknown>;
-export let CPSETTERS: WeakSet<(value: unknown) => void>;
+export let COMPUTED_GETTERS: WeakSet<() => unknown>;
 
 if (DEBUG) {
-  CPGETTERS = new WeakSet();
-  CPSETTERS = new WeakSet();
+  COMPUTED_GETTERS = new WeakSet();
 }
 
 function DESCRIPTOR_GETTER_FUNCTION(name: string, descriptor: ComputedDescriptor): () => unknown {
@@ -85,7 +83,7 @@ function DESCRIPTOR_GETTER_FUNCTION(name: string, descriptor: ComputedDescriptor
   }
 
   if (DEBUG) {
-    CPGETTERS.add(getter);
+    COMPUTED_GETTERS.add(getter);
   }
 
   return getter;
@@ -94,18 +92,18 @@ function DESCRIPTOR_GETTER_FUNCTION(name: string, descriptor: ComputedDescriptor
 function DESCRIPTOR_SETTER_FUNCTION(
   name: string,
   descriptor: ComputedDescriptor
-): (value: unknown) => void {
-  function setter(this: object, value: unknown): void {
+): (value: any) => void {
+  let set = function CPSETTER_FUNCTION(this: object, value: any): void {
     return descriptor.set(this, name, value);
-  }
+  };
 
-  if (DEBUG) {
-    CPSETTERS.add(setter);
-  }
+  COMPUTED_SETTERS.add(set);
 
-  return setter;
+  return set;
 }
 
+export const COMPUTED_SETTERS = new WeakSet();
+
 export function makeComputedDecorator(
   desc: ComputedDescriptor,
   DecoratorClass: { prototype: object }
@@ -119,7 +117,10 @@ export function makeComputedDecorator(
   ): DecoratorPropertyDescriptor {
     assert(
       `Only one computed property decorator can be applied to a class field or accessor, but '${key}' was decorated twice. You may have added the decorator to both a getter and setter, which is unnecessary.`,
-      isClassicDecorator || !propertyDesc || !propertyDesc.get || !CPGETTERS.has(propertyDesc.get)
+      isClassicDecorator ||
+        !propertyDesc ||
+        !propertyDesc.get ||
+        !COMPUTED_GETTERS.has(propertyDesc.get)
     );
 
     let meta = arguments.length === 3 ? metaFor(target) : maybeMeta;
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 3de6304a8bb..e78e2b22037 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -7,7 +7,7 @@ import {
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
-import { CPSETTERS, descriptorForProperty } from './decorator';
+import { COMPUTED_SETTERS } from './decorator';
 import { isPath } from './path_cache';
 import { notifyPropertyChange } from './property_events';
 import { _getPath as getPath, getPossibleMandatoryProxyValue } from './property_get';
@@ -72,21 +72,10 @@ export function set<T = unknown>(obj: object, keyName: string, value: T, toleran
     return setPath(obj, keyName, value, tolerant);
   }
 
-  let descriptor = descriptorForProperty(obj, keyName);
+  let descriptor = lookupDescriptor(obj, keyName);
 
-  if (descriptor !== undefined) {
-    if (DEBUG) {
-      let instanceDesc = lookupDescriptor(obj, keyName);
-
-      assert(
-        `Attempted to set \`${toString(
-          obj
-        )}.${keyName}\` using Ember.set(), but the property was a computed or tracked property that was shadowed by another property declaration. This can happen if you defined a tracked or computed property on a parent class, and then redefined it on a subclass.`,
-        instanceDesc && instanceDesc.set && CPSETTERS.has(instanceDesc.set)
-      );
-    }
-
-    descriptor.set(obj, keyName, value);
+  if (descriptor !== null && COMPUTED_SETTERS.has(descriptor.set!)) {
+    obj[keyName] = value;
     return value;
   }
 
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 9469a6110d7..6a375adacf7 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -5,8 +5,7 @@ import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
 import { CHAIN_PASS_THROUGH } from './chain-tags';
 import {
-  CPGETTERS,
-  CPSETTERS,
+  COMPUTED_SETTERS,
   Decorator,
   DecoratorPropertyDescriptor,
   isElementDescriptor,
@@ -184,10 +183,7 @@ function descriptorForField([target, key, desc]: [
     set,
   };
 
-  if (DEBUG) {
-    CPGETTERS.add(get);
-    CPSETTERS.add(set);
-  }
+  COMPUTED_SETTERS.add(set);
 
   metaFor(target).writeDescriptors(key, new TrackedDescriptor(get, set));
 
diff --git a/packages/@ember/-internals/metal/tests/tracked/set_test.js b/packages/@ember/-internals/metal/tests/tracked/set_test.js
index 6bed7598dea..389bcf0ec6a 100644
--- a/packages/@ember/-internals/metal/tests/tracked/set_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/set_test.js
@@ -32,7 +32,7 @@ moduleFor(
       }
     }
 
-    ['@test set should throw an error when setting on shadowed properties']() {
+    ['@test set should not throw an error when setting on shadowed properties'](assert) {
       class Obj {
         @tracked value = 'emberjs';
 
@@ -43,9 +43,9 @@ moduleFor(
 
       let newObj = new Obj();
 
-      expectAssertion(() => {
-        set(newObj, 'value', 123);
-      }, /Attempted to set `\[object Object\].value` using Ember.set\(\), but the property was a computed or tracked property that was shadowed by another property declaration. This can happen if you defined a tracked or computed property on a parent class, and then redefined it on a subclass/);
+      set(newObj, 'value', 123);
+
+      assert.equal(newObj.value, 123, 'it worked');
     }
   }
 );

From 05e278a573a07f40177f75a5ab3daa41ea738d44 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 26 Oct 2020 16:50:48 -0400
Subject: [PATCH 0198/1405] Add v3.23.0-beta.3 to CHANGELOG

(cherry picked from commit a8aff10265bcfdbc1dafbe4d01669d8e5107328e)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e30a85197f..89fb6301f2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.23.0-beta.3 (October 26, 2020)
+
+- [#19199](https://github.com/emberjs/ember.js/pull/19199) [BUGFIX] Fix Ember Inspector to not be in a broken state after render errors
+- [#19221](https://github.com/emberjs/ember.js/pull/19221) [BUGFIX] Ensure fn and (mut) work with falsy values
+
 ### v3.23.0-beta.2 (October 19, 2020)
 
 - [#19193](https://github.com/emberjs/ember.js/pull/19193) [BUGFIX] Ensure user lifecycle hooks are untracked

From 1f92f8d6d238df1820771f37227a3cc9d6dd2acd Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 27 Oct 2020 01:27:38 -0700
Subject: [PATCH 0199/1405] Ensure multiple deprecations (warnings, etc) are
 tracked correctly

This fixes the tracker to fail the tests when multiple deprecations
are raised within the callback and not all of them are matched by
the given expectations (either by passin a regex that matches all
the messages, or by calling `expectDeprecation` multiple times).

This found some possible bugs that were masked by the fact that the
current tracker code does not really care about unmatched messages
as long as all the expectations matched *something*.
---
 .../tests/integration/helpers/custom-helper-test.js    |  7 +++++++
 .../glimmer/tests/integration/helpers/partial-test.js  |  8 ++++----
 .../glimmer/tests/integration/helpers/tracked-test.js  |  7 +++++++
 .../glimmer/tests/utils/backtracking-rerender.js       |  8 +++++++-
 .../-internals/metal/tests/accessors/get_test.js       |  5 +++++
 packages/ember/tests/routing/decoupled_basic_test.js   |  2 +-
 .../lib/ember-dev/method-call-tracker.ts               | 10 +++++++++-
 7 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 18aff940730..2017581b322 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -718,6 +718,13 @@ moduleFor(
       });
 
       expectDeprecation(() => {
+        // TODO: this must be a bug??
+        expectDeprecation(
+          backtrackingMessageFor('undefined', undefined, {
+            renderTree: ['\\(result of a `<\\(unknown\\).*?>` helper\\)'],
+          })
+        );
+
         this.render('{{hello-world}}');
       }, expectedMessage);
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
index 54bc7ddb247..82f119ea77d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
@@ -239,7 +239,7 @@ moduleFor(
             names: emberA(['Alex', 'Ben']),
           }
         );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "outer-partial" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "(inner|outer)-partial" partial to a component/);
 
       this.assertStableRerender();
 
@@ -247,7 +247,7 @@ moduleFor(
 
       expectDeprecation(() => {
         runTask(() => this.context.names.pushObject('Sophie'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "outer-partial" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "(inner|outer)-partial" partial to a component/);
 
       this.assertText(
         '0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]2: [outer: Sophie] [inner: Sophie]'
@@ -294,7 +294,7 @@ moduleFor(
         {{/with}}`,
           { age: 0 }
         );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "person2-partial" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "person(2|3|4)-partial" partial to a component/);
 
       this.assertStableRerender();
 
@@ -332,7 +332,7 @@ moduleFor(
             },
           }
         );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "odd" partial to a component');
+      }, /The use of `{{partial}}` is deprecated, please refactor the "(odd|even)" partial to a component/);
 
       this.assertStableRerender();
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index cba9cd63f49..da0cb247a4d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -418,6 +418,13 @@ moduleFor(
       });
 
       expectDeprecation(() => {
+        // TODO: this must be a bug??
+        expectDeprecation(
+          backtrackingMessageFor('undefined', undefined, {
+            renderTree: ['\\(result of a `.*` helper\\)'],
+          })
+        );
+
         this.render('{{hello-world this.model}}', { model: {} });
       }, expectedMessage);
     }
diff --git a/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js b/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js
index b05ba483b7a..04533d30794 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js
@@ -1,6 +1,12 @@
 export function backtrackingMessageFor(key, obj, { renderTree } = {}) {
   // Start off with standard backtracking assertion
-  let regex = [`You attempted to update \`${key}\` on \`${obj}\``];
+  let regex;
+
+  if (obj) {
+    regex = [`You attempted to update \`${key}\` on \`${obj}\``];
+  } else {
+    regex = [`You attempted to update \`${key}\``];
+  }
 
   if (renderTree) {
     // match the renderTree if it was included
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index b508e04dd9b..ca92740ea82 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -314,6 +314,11 @@ moduleFor(
       let obj = new EmberObject();
 
       expectDeprecation(() => {
+        // TODO: this must be a bug??
+        expectDeprecation(
+          /You attempted to update `undefined`, but it had already been used previously in the same computation/
+        );
+
         track(() => {
           get(obj, 'bar');
         });
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index ca4b9acd43e..c772f5e7bfe 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -1418,7 +1418,7 @@ moduleFor(
           expectDeprecation(() => {
             assert.equal(appController.get('currentPath'), expectedPath);
             assert.equal(appController.get('currentRouteName'), expectedRouteName);
-          }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
+          }, /Accessing `(currentPath|currentRouteName)` on `controller:application` is deprecated, use the `(currentPath|currentRouteName)` property on `service:router` instead\./);
         }
 
         transitionAndCheck(null, 'index', 'index');
diff --git a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
index e5964c664b6..149ee4b0c63 100644
--- a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
@@ -101,6 +101,7 @@ export default class MethodCallTracker {
 
     let actual: Actual | undefined;
     let match: Actual | undefined = undefined;
+    let matched: Set<number> = new Set();
 
     for (o = 0; o < expectedMessages.length; o++) {
       const expectedMessage = expectedMessages[o];
@@ -135,7 +136,8 @@ export default class MethodCallTracker {
 
         if (matchesMessage && matchesOptionList) {
           match = actual;
-          break;
+          matched.add(i);
+          continue;
         }
       }
 
@@ -171,5 +173,11 @@ export default class MethodCallTracker {
         );
       }
     }
+
+    for (i = 0; i < actuals.length; i++) {
+      if (!matched.has(i) && actuals[i][1] !== true) {
+        assert.ok(false, `Unexpected Ember.${methodName} call: ${actuals[i][0]}`);
+      }
+    }
   }
 }

From ec07cdc356b0082870b3bbe654fd137984130bcf Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Tue, 27 Oct 2020 11:21:09 +0000
Subject: [PATCH 0200/1405] deprecate String prototype extensions

---
 packages/@ember/string/index.ts | 49 +++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 0a621de3ddd..be86be5f3f6 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -6,6 +6,7 @@ export { getStrings as _getStrings, setStrings as _setStrings } from './lib/stri
 
 import { ENV } from '@ember/-internals/environment';
 import { Cache } from '@ember/-internals/utils';
+import { deprecate } from '@ember/debug';
 import { getString } from './lib/string_registry';
 
 const STRING_DASHERIZE_REGEXP = /[ _]/g;
@@ -279,6 +280,26 @@ export function capitalize(str: string): string {
 }
 
 if (ENV.EXTEND_PROTOTYPES.String) {
+  let deprecateEmberStringPrototypeExtension = function (
+    name: string,
+    fn: (utility: string, ...options: any) => string | string[],
+    message = `String prototype extensions are deprecated. Please import ${name} from '@ember/string' instead.`
+  ) {
+    return function (this: string) {
+      deprecate(message, false, {
+        id: 'ember-string.prototype-extensions',
+        for: '@ember/string',
+        since: {
+          available: '3.24',
+        },
+        until: '4.0.0',
+        url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-prototype_extensions',
+      });
+
+      return fn(this, ...arguments);
+    };
+  };
+
   Object.defineProperties(String.prototype, {
     /**
       See [String.w](/ember/release/classes/String/methods/w?anchor=w).
@@ -292,9 +313,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return w(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('w', w),
     },
 
     /**
@@ -326,9 +345,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return camelize(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('camelize', camelize),
     },
 
     /**
@@ -343,9 +360,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return decamelize(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('decamelize', decamelize),
     },
 
     /**
@@ -360,9 +375,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return dasherize(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('dasherize', dasherize),
     },
 
     /**
@@ -377,9 +390,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return underscore(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('underscore', underscore),
     },
 
     /**
@@ -394,9 +405,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return classify(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('classify', classify),
     },
 
     /**
@@ -411,9 +420,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       configurable: true,
       enumerable: false,
       writeable: true,
-      value() {
-        return capitalize(this);
-      },
+      value: deprecateEmberStringPrototypeExtension('capitalize', capitalize),
     },
   });
 }

From 591be249b6fd8500051d722732e3e14dde90e29b Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Tue, 27 Oct 2020 12:39:52 +0000
Subject: [PATCH 0201/1405] point deprecation to ember-source

---
 packages/@ember/string/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index be86be5f3f6..848dc1e993c 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -288,7 +288,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     return function (this: string) {
       deprecate(message, false, {
         id: 'ember-string.prototype-extensions',
-        for: '@ember/string',
+        for: 'ember-source',
         since: {
           available: '3.24',
         },

From 6e1c963c805ceb41470f56933c509322ebc7e5d4 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Tue, 27 Oct 2020 13:24:10 +0000
Subject: [PATCH 0202/1405] expect prototype extension deprecation in tests

---
 packages/@ember/string/tests/camelize_test.js   | 4 +++-
 packages/@ember/string/tests/capitalize_test.js | 4 +++-
 packages/@ember/string/tests/classify_test.js   | 4 +++-
 packages/@ember/string/tests/dasherize_test.js  | 4 +++-
 packages/@ember/string/tests/decamelize_test.js | 4 +++-
 packages/@ember/string/tests/underscore_test.js | 4 +++-
 packages/@ember/string/tests/w_test.js          | 4 +++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/string/tests/camelize_test.js b/packages/@ember/string/tests/camelize_test.js
index e73312d8bd0..252d6c1e4e0 100644
--- a/packages/@ember/string/tests/camelize_test.js
+++ b/packages/@ember/string/tests/camelize_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(camelize(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.camelize(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.camelize(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 
diff --git a/packages/@ember/string/tests/capitalize_test.js b/packages/@ember/string/tests/capitalize_test.js
index 3f5951802c5..23766f846cf 100644
--- a/packages/@ember/string/tests/capitalize_test.js
+++ b/packages/@ember/string/tests/capitalize_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(capitalize(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.capitalize(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.capitalize(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 
diff --git a/packages/@ember/string/tests/classify_test.js b/packages/@ember/string/tests/classify_test.js
index 21b2dbd1b11..a9e9aebea69 100644
--- a/packages/@ember/string/tests/classify_test.js
+++ b/packages/@ember/string/tests/classify_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(classify(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.classify(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.classify(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 
diff --git a/packages/@ember/string/tests/dasherize_test.js b/packages/@ember/string/tests/dasherize_test.js
index a7f50b60e95..aa5cbabdd28 100644
--- a/packages/@ember/string/tests/dasherize_test.js
+++ b/packages/@ember/string/tests/dasherize_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(dasherize(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.dasherize(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.dasherize(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 
diff --git a/packages/@ember/string/tests/decamelize_test.js b/packages/@ember/string/tests/decamelize_test.js
index b6237b12865..9e8da71ac40 100644
--- a/packages/@ember/string/tests/decamelize_test.js
+++ b/packages/@ember/string/tests/decamelize_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(decamelize(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.decamelize(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.decamelize(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 
diff --git a/packages/@ember/string/tests/underscore_test.js b/packages/@ember/string/tests/underscore_test.js
index 168c7eda712..d6516b11c61 100644
--- a/packages/@ember/string/tests/underscore_test.js
+++ b/packages/@ember/string/tests/underscore_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(underscore(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.underscore(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.underscore(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 
diff --git a/packages/@ember/string/tests/w_test.js b/packages/@ember/string/tests/w_test.js
index 0e5ed8fd073..026b87f0103 100644
--- a/packages/@ember/string/tests/w_test.js
+++ b/packages/@ember/string/tests/w_test.js
@@ -5,7 +5,9 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 function test(assert, given, expected, description) {
   assert.deepEqual(w(given), expected, description);
   if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.w(), expected, description);
+    expectDeprecation(() => {
+      assert.deepEqual(given.w(), expected, description);
+    }, /String prototype extensions are deprecated/);
   }
 }
 

From 1af2d49188183ca87be79901acd2b51dcd5cc2ef Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Thu, 29 Oct 2020 14:17:36 +0000
Subject: [PATCH 0203/1405] annotated String.prototype extensions as deprecated

---
 packages/@ember/string/index.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 848dc1e993c..4f4a1f76bb0 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -308,6 +308,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     w: {
       configurable: true,
@@ -340,6 +341,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     camelize: {
       configurable: true,
@@ -355,6 +357,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     decamelize: {
       configurable: true,
@@ -370,6 +373,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     dasherize: {
       configurable: true,
@@ -385,6 +389,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     underscore: {
       configurable: true,
@@ -400,6 +405,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     classify: {
       configurable: true,
@@ -415,6 +421,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     capitalize: {
       configurable: true,

From 56af48bb413f89766e0b355ca94c029e62695667 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 22 Oct 2020 17:55:37 -0700
Subject: [PATCH 0204/1405] [BUGFIX] `<LinkTo>` should link within the engine
 when used inside one

---
 .../glimmer/lib/components/link-to.ts         |  58 +++--
 .../integration/application/engine-test.js    |   4 +-
 .../components/link-to/routing-angle-test.js  | 213 +++++++++++++++++-
 .../components/link-to/routing-curly-test.js  | 213 +++++++++++++++++-
 .../routing/lib/services/routing.ts           |  10 +-
 .../routing/lib/system/router_state.ts        |   9 +-
 packages/@ember/engine/index.d.ts             |   6 +-
 7 files changed, 477 insertions(+), 36 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 5b34abd73e8..b3442b0473a 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -3,8 +3,11 @@
 */
 
 import { alias, computed } from '@ember/-internals/metal';
+import { getOwner } from '@ember/-internals/owner';
+import RouterState from '@ember/-internals/routing/lib/system/router_state';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, warn } from '@ember/debug';
+import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { inject as injectService } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
@@ -487,6 +490,13 @@ const LinkComponent = EmberComponent.extend({
   init() {
     this._super(...arguments);
 
+    assert(
+      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
+        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
+        'See https://ember-engines.com/docs/links for more info.',
+      !this._isEngine || this._engineMountPoint !== undefined
+    );
+
     // Map desired event name to invoke function
     let { eventName } = this;
     this.on(eventName, this, this._invoke);
@@ -497,9 +507,17 @@ const LinkComponent = EmberComponent.extend({
   _currentRouterState: alias('_routing.currentState'),
   _targetRouterState: alias('_routing.targetState'),
 
+  _isEngine: computed(function (this: any) {
+    return getEngineParent(getOwner(this) as EngineInstance) !== undefined;
+  }),
+
+  _engineMountPoint: computed(function (this: any) {
+    return (getOwner(this) as EngineInstance).mountPoint;
+  }),
+
   _route: computed('route', '_currentRouterState', function computeLinkToComponentRoute(this: any) {
     let { route } = this;
-    return route === UNDEFINED ? this._currentRoute : route;
+    return this._namespaceRoute(route === UNDEFINED ? this._currentRoute : route);
   }),
 
   _models: computed('model', 'models', function computeLinkToComponentModels(this: any) {
@@ -608,7 +626,7 @@ const LinkComponent = EmberComponent.extend({
     }
   ),
 
-  _isActive(routerState: any) {
+  _isActive(routerState: RouterState): boolean {
     if (this.loading) {
       return false;
     }
@@ -619,25 +637,17 @@ const LinkComponent = EmberComponent.extend({
       return currentWhen;
     }
 
-    let isCurrentWhenSpecified = Boolean(currentWhen);
+    let { _models: models, _routing: routing } = this;
 
-    if (isCurrentWhenSpecified) {
-      currentWhen = currentWhen.split(' ');
+    if (typeof currentWhen === 'string') {
+      return currentWhen
+        .split(' ')
+        .some((route) =>
+          routing.isActiveForRoute(models, undefined, this._namespaceRoute(route), routerState)
+        );
     } else {
-      currentWhen = [this._route];
-    }
-
-    let { _models: models, _query: query, _routing: routing } = this;
-
-    for (let i = 0; i < currentWhen.length; i++) {
-      if (
-        routing.isActiveForRoute(models, query, currentWhen[i], routerState, isCurrentWhenSpecified)
-      ) {
-        return true;
-      }
+      return routing.isActiveForRoute(models, this._query, this._route, routerState);
     }
-
-    return false;
   },
 
   transitioningIn: computed(
@@ -664,6 +674,18 @@ const LinkComponent = EmberComponent.extend({
     }
   ),
 
+  _namespaceRoute(route: string): string {
+    let { _engineMountPoint: mountPoint } = this;
+
+    if (mountPoint === undefined) {
+      return route;
+    } else if (route === 'application') {
+      return mountPoint;
+    } else {
+      return `${mountPoint}.${route}`;
+    }
+  },
+
   /**
     Event handler that invokes the link, activating the associated route.
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 8869f0129a2..5104cc5591d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -875,7 +875,7 @@ moduleFor(
 
     ["@test query params don't have stickiness by default between model"](assert) {
       assert.expect(1);
-      let tmpl = '{{#link-to "blog.category" 1337}}Category 1337{{/link-to}}';
+      let tmpl = '{{#link-to "category" 1337}}Category 1337{{/link-to}}';
       this.setupAppAndRoutableEngine();
       this.additionalEngineRegistrations(function () {
         this.register('template:category', compile(tmpl));
@@ -895,7 +895,7 @@ moduleFor(
     ) {
       assert.expect(2);
       let tmpl =
-        '{{#link-to "blog.author" 1337 class="author-1337"}}Author 1337{{/link-to}}{{#link-to "blog.author" 1 class="author-1"}}Author 1{{/link-to}}';
+        '{{#link-to "author" 1337 class="author-1337"}}Author 1337{{/link-to}}{{#link-to "author" 1 class="author-1"}}Author 1{{/link-to}}';
       this.setupAppAndRoutableEngine();
       this.additionalEngineRegistrations(function () {
         this.register('template:author', compile(tmpl));
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 8bec47c3f3c..1f26d1f4211 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -1,11 +1,19 @@
-import { moduleFor, ApplicationTestCase, runLoopSettled, runTask } from 'internal-test-helpers';
+import {
+  ApplicationTestCase,
+  ModuleBasedTestResolver,
+  moduleFor,
+  runLoopSettled,
+  runTask,
+} from 'internal-test-helpers';
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { alias } from '@ember/-internals/metal';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
+import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
+import { compile } from '../../../utils/helpers';
 
 // IE includes the host name
 function normalizeUrl(url) {
@@ -348,6 +356,209 @@ moduleFor(
         );
       });
     }
+
+    async ['@test Using <LinkTo> inside a non-routable engine errors'](assert) {
+      this.add(
+        'engine:not-routable',
+        class NotRoutableEngine extends Engine {
+          Resolver = ModuleBasedTestResolver;
+
+          init() {
+            super.init(...arguments);
+            this.register(
+              'template:application',
+              compile(`<LinkTo @route='about'>About</LinkTo>`, {
+                moduleName: 'non-routable/templates/application.hbs',
+              })
+            );
+          }
+        }
+      );
+
+      this.addTemplate('index', `{{mount 'not-routable'}}`);
+
+      await assert.rejectsAssertion(
+        this.visit('/'),
+        'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
+          'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
+          'See https://ember-engines.com/docs/links for more info.'
+      );
+    }
+
+    async ['@test Using <LinkTo> inside a routable engine link within the engine'](assert) {
+      this.add(
+        'engine:routable',
+        class RoutableEngine extends Engine {
+          Resolver = ModuleBasedTestResolver;
+
+          init() {
+            super.init(...arguments);
+            this.register(
+              'template:application',
+              compile(
+                `
+                <h2 id='engine-layout'>Routable Engine</h2>
+                {{outlet}}
+                <LinkTo @route='application' id='engine-application-link'>Engine Appliction</LinkTo>
+                `,
+                {
+                  moduleName: 'routable/templates/application.hbs',
+                }
+              )
+            );
+            this.register(
+              'template:index',
+              compile(
+                `
+                <h3 class='engine-home'>Engine Home</h3>
+                <LinkTo @route='about' id='engine-about-link'>Engine About</LinkTo>
+                <LinkTo @route='index' id='engine-self-link'>Engine Self</LinkTo>
+                `,
+                {
+                  moduleName: 'routable/templates/index.hbs',
+                }
+              )
+            );
+            this.register(
+              'template:about',
+              compile(
+                `
+                <h3 class='engine-about'>Engine About</h3>
+                <LinkTo @route='index' id='engine-home-link'>Engine Home</LinkTo>
+                <LinkTo @route='about' id='engine-self-link'>Engine Self</LinkTo>
+                `,
+                {
+                  moduleName: 'routable/templates/about.hbs',
+                }
+              )
+            );
+          }
+        }
+      );
+
+      this.router.map(function () {
+        this.mount('routable');
+      });
+
+      this.add('route-map:routable', function () {
+        this.route('about');
+      });
+
+      this.addTemplate(
+        'application',
+        `
+        <h1 id='application-layout'>Application</h1>
+        {{outlet}}
+        <LinkTo @route='application' id='application-link'>Appliction</LinkTo>
+        <LinkTo @route='routable' id='engine-link'>Engine</LinkTo>
+        `
+      );
+
+      await this.visit('/');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+
+      assert.equal(this.$('h3.home').length, 1, 'The application index page is rendered');
+      assert.equal(this.$('#self-link.active').length, 1, 'The application index link is active');
+      assert.equal(
+        this.$('#about-link:not(.active)').length,
+        1,
+        'The application about link is not active'
+      );
+
+      await this.click('#about-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+
+      assert.equal(this.$('h3.about').length, 1, 'The application about page is rendered');
+      assert.equal(this.$('#self-link.active').length, 1, 'The application about link is active');
+      assert.equal(
+        this.$('#home-link:not(.active)').length,
+        1,
+        'The application home link is not active'
+      );
+
+      await this.click('#engine-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link.active').length,
+        1,
+        'The engine application link is active'
+      );
+
+      assert.equal(this.$('h3.engine-home').length, 1, 'The engine index page is rendered');
+      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine index link is active');
+      assert.equal(
+        this.$('#engine-about-link:not(.active)').length,
+        1,
+        'The engine about link is not active'
+      );
+
+      await this.click('#engine-about-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link.active').length,
+        1,
+        'The engine application link is active'
+      );
+
+      assert.equal(this.$('h3.engine-about').length, 1, 'The engine about page is rendered');
+      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine about link is active');
+      assert.equal(
+        this.$('#engine-home-link:not(.active)').length,
+        1,
+        'The engine home link is not active'
+      );
+
+      await this.click('#engine-application-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link.active').length,
+        1,
+        'The engine application link is active'
+      );
+
+      assert.equal(this.$('h3.engine-home').length, 1, 'The engine index page is rendered');
+      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine index link is active');
+      assert.equal(
+        this.$('#engine-about-link:not(.active)').length,
+        1,
+        'The engine about link is not active'
+      );
+
+      await this.click('#application-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+
+      assert.equal(this.$('h3.home').length, 1, 'The application index page is rendered');
+      assert.equal(this.$('#self-link.active').length, 1, 'The application index link is active');
+      assert.equal(
+        this.$('#about-link:not(.active)').length,
+        1,
+        'The application about link is not active'
+      );
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 48d800e0a46..542736dd08d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -1,11 +1,19 @@
-import { moduleFor, ApplicationTestCase, runLoopSettled, runTask } from 'internal-test-helpers';
+import {
+  ApplicationTestCase,
+  ModuleBasedTestResolver,
+  moduleFor,
+  runLoopSettled,
+  runTask,
+} from 'internal-test-helpers';
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { alias } from '@ember/-internals/metal';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
+import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
+import { compile } from '../../../utils/helpers';
 
 // IE includes the host name
 function normalizeUrl(url) {
@@ -349,6 +357,209 @@ moduleFor(
         );
       });
     }
+
+    async ['@test Using {{link-to}} inside a non-routable engine errors'](assert) {
+      this.add(
+        'engine:not-routable',
+        class NotRoutableEngine extends Engine {
+          Resolver = ModuleBasedTestResolver;
+
+          init() {
+            super.init(...arguments);
+            this.register(
+              'template:application',
+              compile(`{{#link-to 'about'}}About{{/link-to}}`, {
+                moduleName: 'non-routable/templates/application.hbs',
+              })
+            );
+          }
+        }
+      );
+
+      this.addTemplate('index', `{{mount "not-routable"}}`);
+
+      await assert.rejectsAssertion(
+        this.visit('/'),
+        'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
+          'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
+          'See https://ember-engines.com/docs/links for more info.'
+      );
+    }
+
+    async ['@test Using {{link-to}} inside a routable engine link within the engine'](assert) {
+      this.add(
+        'engine:routable',
+        class RoutableEngine extends Engine {
+          Resolver = ModuleBasedTestResolver;
+
+          init() {
+            super.init(...arguments);
+            this.register(
+              'template:application',
+              compile(
+                `
+                <h2 id='engine-layout'>Routable Engine</h2>
+                {{outlet}}
+                {{#link-to 'application' id='engine-application-link'}}Engine Appliction{{/link-to}}
+                `,
+                {
+                  moduleName: 'routable/templates/application.hbs',
+                }
+              )
+            );
+            this.register(
+              'template:index',
+              compile(
+                `
+                <h3 class='engine-home'>Engine Home</h3>
+                {{#link-to 'about' id='engine-about-link'}}Engine About{{/link-to}}
+                {{#link-to 'index' id='engine-self-link'}}Engine Self{{/link-to}}
+                `,
+                {
+                  moduleName: 'routable/templates/index.hbs',
+                }
+              )
+            );
+            this.register(
+              'template:about',
+              compile(
+                `
+                <h3 class='engine-about'>Engine About</h3>
+                {{#link-to 'index' id='engine-home-link'}}Engine Home{{/link-to}}
+                {{#link-to 'about' id='engine-self-link'}}Engine Self{{/link-to}}
+                `,
+                {
+                  moduleName: 'routable/templates/about.hbs',
+                }
+              )
+            );
+          }
+        }
+      );
+
+      this.router.map(function () {
+        this.mount('routable');
+      });
+
+      this.add('route-map:routable', function () {
+        this.route('about');
+      });
+
+      this.addTemplate(
+        'application',
+        `
+        <h1 id="application-layout">Application</h1>
+        {{outlet}}
+        {{#link-to 'application' id='application-link'}}Appliction{{/link-to}}
+        {{#link-to 'routable' id='engine-link'}}Engine{{/link-to}}
+        `
+      );
+
+      await this.visit('/');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+
+      assert.equal(this.$('h3.home').length, 1, 'The application index page is rendered');
+      assert.equal(this.$('#self-link.active').length, 1, 'The application index link is active');
+      assert.equal(
+        this.$('#about-link:not(.active)').length,
+        1,
+        'The application about link is not active'
+      );
+
+      await this.click('#about-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+
+      assert.equal(this.$('h3.about').length, 1, 'The application about page is rendered');
+      assert.equal(this.$('#self-link.active').length, 1, 'The application about link is active');
+      assert.equal(
+        this.$('#home-link:not(.active)').length,
+        1,
+        'The application home link is not active'
+      );
+
+      await this.click('#engine-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link.active').length,
+        1,
+        'The engine application link is active'
+      );
+
+      assert.equal(this.$('h3.engine-home').length, 1, 'The engine index page is rendered');
+      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine index link is active');
+      assert.equal(
+        this.$('#engine-about-link:not(.active)').length,
+        1,
+        'The engine about link is not active'
+      );
+
+      await this.click('#engine-about-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link.active').length,
+        1,
+        'The engine application link is active'
+      );
+
+      assert.equal(this.$('h3.engine-about').length, 1, 'The engine about page is rendered');
+      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine about link is active');
+      assert.equal(
+        this.$('#engine-home-link:not(.active)').length,
+        1,
+        'The engine home link is not active'
+      );
+
+      await this.click('#engine-application-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link.active').length,
+        1,
+        'The engine application link is active'
+      );
+
+      assert.equal(this.$('h3.engine-home').length, 1, 'The engine index page is rendered');
+      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine index link is active');
+      assert.equal(
+        this.$('#engine-about-link:not(.active)').length,
+        1,
+        'The engine about link is not active'
+      );
+
+      await this.click('#application-link');
+
+      assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
+      assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
+      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
+      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+
+      assert.equal(this.$('h3.home').length, 1, 'The application index page is rendered');
+      assert.equal(this.$('#self-link.active').length, 1, 'The application index link is active');
+      assert.equal(
+        this.$('#about-link:not(.active)').length,
+        1,
+        'The application about link is not active'
+      );
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index caf18d3a944..8321daadbe4 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -6,6 +6,7 @@ import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import EmberRouter, { QueryParam } from '../system/router';
+import RouterState from '../system/router_state';
 
 /**
   The Routing service is used by LinkComponent, and provides facilities for
@@ -57,11 +58,10 @@ export default class RoutingService extends Service {
 
   isActiveForRoute(
     contexts: {}[],
-    queryParams: {},
+    queryParams: QueryParam | undefined,
     routeName: string,
-    routerState: any,
-    isCurrentWhenSpecified: any
-  ) {
+    routerState: RouterState
+  ): boolean {
     let handlers = this.router._routerMicrolib.recognizer.handlersFor(routeName);
     let leafName = handlers[handlers.length - 1].handler;
     let maximumContexts = numberOfContextsAcceptedByHandler(routeName, handlers);
@@ -80,7 +80,7 @@ export default class RoutingService extends Service {
       routeName = leafName;
     }
 
-    return routerState.isActiveIntent(routeName, contexts, queryParams, !isCurrentWhenSpecified);
+    return routerState.isActiveIntent(routeName, contexts, queryParams);
   }
 }
 
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index 8a4c6305498..886c8bd6ad9 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -18,18 +18,13 @@ export default class RouterState {
     this.routerJsState = routerJsState;
   }
 
-  isActiveIntent(
-    routeName: string,
-    models: {}[],
-    queryParams: QueryParam,
-    queryParamsMustMatch?: boolean
-  ) {
+  isActiveIntent(routeName: string, models: {}[], queryParams?: QueryParam): boolean {
     let state = this.routerJsState;
     if (!this.router.isActiveIntent(routeName, models, undefined, state)) {
       return false;
     }
 
-    if (queryParamsMustMatch && Object.keys(queryParams).length > 0) {
+    if (queryParams !== undefined && Object.keys(queryParams).length > 0) {
       let visibleQueryParams = assign({}, queryParams);
 
       this.emberRouter._prepareQueryParams(routeName, models, visibleQueryParams);
diff --git a/packages/@ember/engine/index.d.ts b/packages/@ember/engine/index.d.ts
index 3df5eac5b39..518a05dbebe 100644
--- a/packages/@ember/engine/index.d.ts
+++ b/packages/@ember/engine/index.d.ts
@@ -1,5 +1,7 @@
-import { Owner, LookupOptions, Factory, EngineInstanceOptions } from '@ember/-internals/owner';
-import EngineInstance from './instance';
+export { default as EngineInstance } from './instance';
+export function getEngineParent(instance: EngineInstance): EngineInstance | undefined;
+
+import { EngineInstanceOptions, Factory } from '@ember/-internals/owner';
 
 export default class Engine {
   constructor(...args: any[]);

From 473d15ae6e6f94ff2b2ba40b2fb89389b26664fd Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 28 Oct 2020 17:42:09 -0700
Subject: [PATCH 0205/1405] [CLEANUP] Removes the `expandLocalLookup` API

`expandLocalLookup` was a experimental API that was tied
closely to Module Unification. The API was shipped, but was never fully
released. It was primarily used for experimentation in general.
Currently, 3 addons use it, all of which are experimental addons that
try to establish MU like file structures.

This PR removes the API to simplify resolution as a whole, so we can
continue the work toward strict mode.
---
 FEATURES.md                                   |  15 -
 .../-internals/container/lib/container.ts     |  24 +-
 .../-internals/container/lib/registry.ts      | 126 +-------
 .../container/tests/container_test.js         |  21 --
 .../container/tests/registry_test.js          | 221 --------------
 .../@ember/-internals/glimmer/lib/resolver.ts |  30 +-
 .../@ember/-internals/glimmer/lib/syntax.ts   |   7 +-
 .../components/local-lookup-test.js           | 283 ------------------
 .../-internals/metal/lib/injected_property.ts |  11 +-
 packages/@ember/-internals/owner/index.ts     |   2 -
 .../lib/test-resolver.js                      |  19 --
 tests/docs/expected.js                        |   1 -
 12 files changed, 20 insertions(+), 740 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js

diff --git a/FEATURES.md b/FEATURES.md
index 7c8728e1ad9..823f87c6202 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -21,18 +21,3 @@ for a detailed explanation.
 * `ember-testing-resume-test`
 
   Introduces the `resumeTest` testing helper to complement the `pauseTest` helper.
-
-* `ember-module-unification`
-
-  Introduces support for Module Unification
-  ([RFC](https://github.com/dgeb/rfcs/blob/module-unification/text/0000-module-unification.md))
-  to Ember. This includes:
-
-  - Passing the `source` of a `lookup`/`factoryFor` call as an argument to
-    `expandLocalLookup` on the resolver.
-  - Making `lookupComponentPair` friendly to local/private resolutions. The
-    new code ensures a local resolution is not paired with a global resolution.
-
-  This feature is paired with the
-  [`EMBER_RESOLVER_MODULE_UNIFICATION`](https://github.com/ember-cli/ember-resolver#ember_resolver_module_unification)
-  flag on the ember-resolver package.
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index d3c2c5032b9..5d10fb8f106 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -214,7 +214,7 @@ export default class Container {
    @param {String} [options.source] The fullname of the request source (used for local lookup)
    @return {any}
    */
-  factoryFor<T, C>(fullName: string, options: LookupOptions = {}): Factory<T, C> | undefined {
+  factoryFor<T, C>(fullName: string): Factory<T, C> | undefined {
     if (this.isDestroyed) {
       throw new Error(`Can not call \`.factoryFor\` after the owner has been destroyed`);
     }
@@ -222,13 +222,6 @@ export default class Container {
 
     assert('fullName must be a proper full name', this.registry.isValidFullName(normalizedName));
 
-    if (options.source || options.namespace) {
-      normalizedName = this.registry.expandLocalLookup(fullName, options);
-      if (!normalizedName) {
-        return;
-      }
-    }
-
     return factoryFor<T, C>(this, normalizedName, fullName) as Factory<T, C> | undefined;
   }
 }
@@ -279,13 +272,6 @@ function isInstantiatable(container: Container, fullName: string) {
 function lookup(container: Container, fullName: string, options: LookupOptions = {}) {
   let normalizedName = fullName;
 
-  if (options.source || options.namespace) {
-    normalizedName = container.registry.expandLocalLookup(fullName, options);
-    if (!normalizedName) {
-      return;
-    }
-  }
-
   if (options.singleton !== false) {
     let cached = container.cache[normalizedName];
     if (cached !== undefined) {
@@ -439,13 +425,9 @@ function processInjections(
   let hash = result.injections;
 
   for (let i = 0; i < injections.length; i++) {
-    let { property, specifier, source } = injections[i];
+    let { property, specifier } = injections[i];
 
-    if (source) {
-      hash[property] = lookup(container, specifier, { source });
-    } else {
-      hash[property] = lookup(container, specifier);
-    }
+    hash[property] = lookup(container, specifier);
 
     if (!result.isDynamic) {
       result.isDynamic = !isSingleton(container, specifier);
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index e133219069d..4e657e5544e 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,26 +1,17 @@
-import { Factory, LookupOptions } from '@ember/-internals/owner';
+import { Factory } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import Container, { ContainerOptions, LazyInjection } from './container';
 
-interface HasOptions {
-  source?: string;
-  namespace?: string;
-}
-
 export interface Injection {
-  namespace?: string;
   property: string;
-  source?: string;
   specifier: string;
 }
 
 export type ResolveOptions = {
   specifier?: string;
-  source?: string | undefined;
-  namespace?: string | undefined;
 };
 
 export interface TypeOptions {
@@ -34,7 +25,6 @@ export interface KnownForTypeResult {
 
 export interface IRegistry {
   describe(fullName: string): string;
-  expandLocalLookup(fullName: string, options: LookupOptions): string;
   getInjections(fullName: string): Injection[];
   getOption<K extends keyof TypeOptions>(
     fullName: string,
@@ -50,7 +40,6 @@ export interface IRegistry {
 }
 
 export type NotResolver = {
-  expandLocalLookup: never;
   knownForType: never;
   lookupDescription: never;
   makeToString: never;
@@ -61,11 +50,6 @@ export type NotResolver = {
 export type Resolve = <T, C>(name: string) => Factory<T, C> | undefined;
 
 export interface Resolver {
-  expandLocalLookup?: (
-    normalizedName: string,
-    normalizedSource: string,
-    namespace?: string | undefined
-  ) => string;
   knownForType?: (type: string) => KnownForTypeResult;
   lookupDescription?: (fullName: string) => string;
   makeToString?: <T, C>(factory: Factory<T, C>, fullName: string) => string;
@@ -300,8 +284,8 @@ export default class Registry implements IRegistry {
    @param {String} [options.source] the fullname of the request source (used for local lookups)
    @return {Function} fullName's factory
    */
-  resolve<T, C>(fullName: string, options?: ResolveOptions): Factory<T, C> | undefined {
-    let factory = resolve<T, C>(this, this.normalize(fullName), options);
+  resolve<T, C>(fullName: string): Factory<T, C> | undefined {
+    let factory = resolve<T, C>(this, this.normalize(fullName));
     if (factory === undefined && this.fallback !== null) {
       factory = (this.fallback as any).resolve(...arguments);
     }
@@ -393,15 +377,12 @@ export default class Registry implements IRegistry {
    @param {String} [options.source] the fullname of the request source (used for local lookups)
    @return {Boolean}
    */
-  has(fullName: string, options?: HasOptions) {
+  has(fullName: string) {
     if (!this.isValidFullName(fullName)) {
       return false;
     }
 
-    let source = options && options.source && this.normalize(options.source);
-    let namespace = (options && options.namespace) || undefined;
-
-    return has(this, this.normalize(fullName), source, namespace);
+    return has(this, this.normalize(fullName));
   }
 
   /**
@@ -660,43 +641,6 @@ export default class Registry implements IRegistry {
 
     return injections;
   }
-
-  /**
-   Given a fullName and a source fullName returns the fully resolved
-   fullName. Used to allow for local lookup.
-
-   ```javascript
-   let registry = new Registry();
-
-   // the twitter factory is added to the module system
-   registry.expandLocalLookup('component:post-title', { source: 'template:post' }) // => component:post/post-title
-   ```
-
-   @private
-   @method expandLocalLookup
-   @param {String} fullName
-   @param {Object} [options]
-   @param {String} [options.source] the fullname of the request source (used for local lookups)
-   @return {String} fullName
-   */
-  expandLocalLookup(fullName: string, options: LookupOptions) {
-    if (this.resolver !== null && this.resolver.expandLocalLookup) {
-      assert('fullName must be a proper full name', this.isValidFullName(fullName));
-      assert(
-        'options.source must be a proper full name',
-        !options.source || this.isValidFullName(options.source)
-      );
-
-      let normalizedFullName = this.normalize(fullName);
-      let normalizedSource = this.normalize(options.source!);
-
-      return expandLocalLookup(this, normalizedFullName, normalizedSource, options.namespace);
-    } else if (this.fallback !== null) {
-      return this.fallback.expandLocalLookup(fullName, options);
-    } else {
-      return null;
-    }
-  }
 }
 
 export declare class DebugRegistry extends Registry {
@@ -711,7 +655,7 @@ if (DEBUG) {
 
     for (let key in hash) {
       if (Object.prototype.hasOwnProperty.call(hash, key)) {
-        let { specifier, source, namespace } = hash[key];
+        let { specifier } = hash[key];
         assert(
           `Expected a proper full name, given '${specifier}'`,
           this.isValidFullName(specifier)
@@ -720,8 +664,6 @@ if (DEBUG) {
         injections.push({
           property: key,
           specifier,
-          source,
-          namespace,
         });
       }
     }
@@ -735,56 +677,15 @@ if (DEBUG) {
     }
 
     for (let i = 0; i < injections.length; i++) {
-      let { specifier, source, namespace } = injections[i];
+      let { specifier } = injections[i];
 
-      assert(
-        `Attempting to inject an unknown injection: '${specifier}'`,
-        this.has(specifier, { source, namespace })
-      );
+      assert(`Attempting to inject an unknown injection: '${specifier}'`, this.has(specifier));
     }
   };
 }
 
-function expandLocalLookup(
-  registry: Registry,
-  normalizedName: string,
-  normalizedSource: string,
-  namespace: string | undefined
-) {
-  let cache = registry._localLookupCache;
-  let normalizedNameCache = cache[normalizedName];
-
-  if (!normalizedNameCache) {
-    normalizedNameCache = cache[normalizedName] = Object.create(null);
-  }
-
-  let cacheKey = namespace || normalizedSource;
-
-  let cached = normalizedNameCache[cacheKey];
-
-  if (cached !== undefined) {
-    return cached;
-  }
-
-  let expanded = registry.resolver!.expandLocalLookup!(normalizedName, normalizedSource, namespace);
-
-  return (normalizedNameCache[cacheKey] = expanded);
-}
-
-function resolve<T, C>(
-  registry: Registry,
-  _normalizedName: string,
-  options?: ResolveOptions
-): Factory<T, C> | undefined {
+function resolve<T, C>(registry: Registry, _normalizedName: string): Factory<T, C> | undefined {
   let normalizedName = _normalizedName;
-  // when `source` is provided expand normalizedName
-  // and source into the full normalizedName
-  if (options !== undefined && (options.source || options.namespace)) {
-    normalizedName = registry.expandLocalLookup(_normalizedName, options as LookupOptions);
-    if (!normalizedName) {
-      return;
-    }
-  }
 
   let cached = registry._resolveCache[normalizedName];
   if (cached !== undefined) {
@@ -813,13 +714,8 @@ function resolve<T, C>(
   return resolved;
 }
 
-function has(
-  registry: Registry,
-  fullName: string,
-  source: string | undefined,
-  namespace: string | undefined
-) {
-  return registry.resolve(fullName, { source, namespace }) !== undefined;
+function has(registry: Registry, fullName: string) {
+  return registry.resolve(fullName) !== undefined;
 }
 
 const privateNames: { [key: string]: string } = dictionary(null);
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index 26efba17fd2..e6d84453de6 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -513,27 +513,6 @@ moduleFor(
       Service.create(result);
     }
 
-    ['@test lookup passes options through to expandlocallookup'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostController = factory();
-
-      registry.register('controller:post', PostController);
-      registry.expandLocalLookup = (fullName, options) => {
-        assert.ok(true, 'expandLocalLookup was called');
-        assert.equal(fullName, 'foo:bar');
-        assert.deepEqual(options, { source: 'baz:qux' });
-
-        return 'controller:post';
-      };
-
-      let PostControllerLookupResult = container.lookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.ok(PostControllerLookupResult instanceof PostController);
-    }
-
     ['@test #factoryFor class is registered class'](assert) {
       let registry = new Registry();
       let container = registry.container();
diff --git a/packages/@ember/-internals/container/tests/registry_test.js b/packages/@ember/-internals/container/tests/registry_test.js
index bfb2503075e..9981c6e32be 100644
--- a/packages/@ember/-internals/container/tests/registry_test.js
+++ b/packages/@ember/-internals/container/tests/registry_test.js
@@ -576,227 +576,6 @@ moduleFor(
         'foo:bar-baz': true,
       });
     }
-
-    ['@test resolver.expandLocalLookup is not required'](assert) {
-      let registry = new Registry({
-        resolver: {},
-      });
-
-      let result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, null);
-    }
-
-    ['@test expandLocalLookup is called on the resolver if present'](assert) {
-      assert.expect(4);
-
-      let resolver = {
-        expandLocalLookup: (targetFullName, sourceFullName) => {
-          assert.ok(true, 'expandLocalLookup is called on the resolver');
-          assert.equal(targetFullName, 'foo:bar', 'the targetFullName was passed through');
-          assert.equal(sourceFullName, 'baz:qux', 'the sourceFullName was passed through');
-
-          return 'foo:qux/bar';
-        },
-      };
-
-      let registry = new Registry({
-        resolver,
-      });
-
-      let result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar');
-    }
-
-    ['@test `expandLocalLookup` is handled by the resolver, then by the fallback registry, if available'](
-      assert
-    ) {
-      assert.expect(9);
-
-      let fallbackResolver = {
-        expandLocalLookup: (targetFullName, sourceFullName) => {
-          assert.ok(true, 'expandLocalLookup is called on the fallback resolver');
-          assert.equal(targetFullName, 'foo:bar', 'the targetFullName was passed through');
-          assert.equal(sourceFullName, 'baz:qux', 'the sourceFullName was passed through');
-
-          return 'foo:qux/bar-fallback';
-        },
-      };
-
-      let resolver = {
-        expandLocalLookup: (targetFullName, sourceFullName) => {
-          assert.ok(true, 'expandLocalLookup is called on the resolver');
-          assert.equal(targetFullName, 'foo:bar', 'the targetFullName was passed through');
-          assert.equal(sourceFullName, 'baz:qux', 'the sourceFullName was passed through');
-
-          return 'foo:qux/bar-resolver';
-        },
-      };
-
-      let fallbackRegistry = new Registry({
-        resolver: fallbackResolver,
-      });
-
-      let registry = new Registry({
-        fallback: fallbackRegistry,
-        resolver,
-      });
-
-      let result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar-resolver', 'handled by the resolver');
-
-      registry.resolver = null;
-
-      result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar-fallback', 'handled by the fallback registry');
-
-      registry.fallback = null;
-
-      result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(
-        result,
-        null,
-        'null is returned by default when no resolver or fallback registry is present'
-      );
-    }
-
-    ['@test resolver.expandLocalLookup result is cached'](assert) {
-      assert.expect(3);
-      let result;
-
-      let resolver = {
-        expandLocalLookup: () => {
-          assert.ok(true, 'expandLocalLookup is called on the resolver');
-
-          return 'foo:qux/bar';
-        },
-      };
-
-      let registry = new Registry({
-        resolver,
-      });
-
-      result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar');
-
-      result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar');
-    }
-
-    ['@test resolver.expandLocalLookup cache is busted when any unregister is called'](assert) {
-      assert.expect(4);
-      let result;
-
-      let resolver = {
-        expandLocalLookup: () => {
-          assert.ok(true, 'expandLocalLookup is called on the resolver');
-
-          return 'foo:qux/bar';
-        },
-      };
-
-      let registry = new Registry({
-        resolver,
-      });
-
-      result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar');
-
-      registry.unregister('foo:bar');
-
-      result = registry.expandLocalLookup('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.equal(result, 'foo:qux/bar');
-    }
-
-    ['@test resolve calls expandLocallookup when it receives options.source'](assert) {
-      assert.expect(3);
-
-      let resolver = {
-        resolve() {},
-        expandLocalLookup: (targetFullName, sourceFullName) => {
-          assert.ok(true, 'expandLocalLookup is called on the resolver');
-          assert.equal(targetFullName, 'foo:bar', 'the targetFullName was passed through');
-          assert.equal(sourceFullName, 'baz:qux', 'the sourceFullName was passed through');
-
-          return 'foo:qux/bar';
-        },
-      };
-
-      let registry = new Registry({
-        resolver,
-      });
-
-      registry.resolve('foo:bar', {
-        source: 'baz:qux',
-      });
-    }
-
-    ['@test has uses expandLocalLookup'](assert) {
-      assert.expect(5);
-      let resolvedFullNames = [];
-      let result;
-
-      let resolver = {
-        resolve(name) {
-          resolvedFullNames.push(name);
-          return 'yippie!';
-        },
-
-        expandLocalLookup: (targetFullName) => {
-          assert.ok(true, 'expandLocalLookup is called on the resolver');
-
-          if (targetFullName === 'foo:bar') {
-            return 'foo:qux/bar';
-          } else {
-            return null;
-          }
-        },
-      };
-
-      let registry = new Registry({
-        resolver,
-      });
-
-      result = registry.has('foo:bar', {
-        source: 'baz:qux',
-      });
-
-      assert.ok(result, 'found foo:bar/qux');
-
-      result = registry.has('foo:baz', {
-        source: 'baz:qux',
-      });
-
-      assert.ok(!result, 'foo:baz/qux not found');
-
-      assert.deepEqual(['foo:qux/bar'], resolvedFullNames);
-    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 0f27fc62974..94557d94188 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -60,13 +60,6 @@ function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
 }
 
-function makeOptions(moduleName: string, namespace?: string): LookupOptions {
-  return {
-    source: moduleName !== undefined ? `template:${moduleName}` : undefined,
-    namespace,
-  };
-}
-
 function componentFor(
   name: string,
   owner: Owner,
@@ -120,17 +113,6 @@ function lookupComponentPair(
   }
 }
 
-function lookupComponent(owner: Owner, name: string, options: LookupOptions): Option<LookupResult> {
-  if (options.source || options.namespace) {
-    let pair = lookupComponentPair(owner, name, options);
-
-    if (pair !== null) {
-      return pair;
-    }
-  }
-  return lookupComponentPair(owner, name);
-}
-
 let lookupPartial: { templateName: string; owner: Owner } | any;
 let templateFor: { owner: Owner; underscored: string; name: string } | any;
 let parseUnderscoredName: { templateName: string } | any;
@@ -356,18 +338,12 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       return helper;
     }
 
-    const { moduleName } = meta;
     let owner = meta.owner;
-
     let name = _name;
-    let namespace = undefined;
-
-    const options: LookupOptions = makeOptions(moduleName, namespace);
 
     const factory =
       owner.factoryFor<SimpleHelper | HelperInstance, HelperFactory<SimpleHelper | HelperInstance>>(
-        `helper:${name}`,
-        options
+        `helper:${name}`
       ) || owner.factoryFor(`helper:${name}`);
 
     if (factory === undefined || factory.class === undefined) {
@@ -422,11 +398,9 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     meta: OwnedTemplateMeta
   ): Option<ComponentDefinition> {
     let name = _name;
-    let namespace = undefined;
     let owner = meta.owner;
-    let { moduleName } = meta;
 
-    let pair = lookupComponent(owner, name, makeOptions(moduleName, namespace));
+    let pair = lookupComponentPair(owner, name);
     if (pair === null) {
       return null;
     }
diff --git a/packages/@ember/-internals/glimmer/lib/syntax.ts b/packages/@ember/-internals/glimmer/lib/syntax.ts
index 6caa7759b2e..9988b23296b 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax.ts
@@ -62,14 +62,11 @@ function refineBlockSyntax(
     `Helpers may not be used in the block form, for example {{#${name}}}{{/${name}}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (${name})}}{{/if}}.`,
     !(() => {
       const resolver = context.resolver['resolver'];
-      const { moduleName, owner } = context.meta.referrer as OwnedTemplateMeta;
+      const { owner } = context.meta.referrer as OwnedTemplateMeta;
       if (name === 'component' || resolver['builtInHelpers'][name]) {
         return true;
       }
-      let options = { source: `template:${moduleName}` };
-      return (
-        owner.hasRegistration(`helper:${name}`, options) || owner.hasRegistration(`helper:${name}`)
-      );
+      return owner.hasRegistration(`helper:${name}`);
     })()
   );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
deleted file mode 100644
index 0d3124c6997..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/components/local-lookup-test.js
+++ /dev/null
@@ -1,283 +0,0 @@
-import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
-import { Component } from '../../utils/helpers';
-
-class LocalLookupTest extends RenderingTestCase {
-  ['@test it can lookup a local template']() {
-    this.registerComponent('x-outer/x-inner', {
-      template: 'Nested template says: {{yield}}',
-    });
-    this.registerComponent('x-outer', {
-      template: '{{#x-inner}}Hi!{{/x-inner}}',
-    });
-
-    this.render('{{x-outer}}');
-
-    this.assertText('Nested template says: Hi!', 'Initial render works');
-
-    runTask(() => this.rerender());
-
-    this.assertText('Nested template says: Hi!', 'Re-render works');
-  }
-
-  ['@test tagless blockless component can lookup local template']() {
-    this.registerComponent('x-outer/x-inner', {
-      template: 'Nested template says: {{yield}}',
-    });
-    this.registerTemplate('components/x-outer', '{{#x-inner}}Hi!{{/x-inner}}');
-    this.registerComponent('x-outer', {
-      ComponentClass: Component.extend({ tagName: '' }),
-    });
-
-    this.render('{{x-outer}}');
-
-    this.assertText('Nested template says: Hi!', 'Re-render works');
-
-    runTask(() => this.rerender());
-
-    this.assertText('Nested template says: Hi!', 'Re-render works');
-  }
-
-  ['@test it can lookup a local component template']() {
-    this.registerTemplate('components/x-outer/x-inner', 'Nested template says: {{yield}}');
-    this.registerTemplate('components/x-outer', '{{#x-inner}}Hi!{{/x-inner}}');
-
-    this.render('{{x-outer}}');
-
-    this.assertText('Nested template says: Hi!', 'Initial render works');
-
-    runTask(() => this.rerender());
-
-    this.assertText('Nested template says: Hi!', 'Re-render works');
-  }
-
-  ['@test it can local lookup a dynamic component']() {
-    this.registerComponent('foo-bar', {
-      template: 'yall finished {{component child}}',
-    });
-    this.registerComponent('foo-bar/biz-baz', { template: 'or yall done?' });
-
-    this.render('{{foo-bar child=child}}', { child: 'biz-baz' });
-
-    this.assertText('yall finished or yall done?');
-
-    runTask(() => this.rerender());
-
-    this.assertText('yall finished or yall done?');
-  }
-
-  ['@test it can local lookup a dynamic component from a dynamic component']() {
-    this.registerComponent('foo-bar', {
-      template: 'yall finished {{component child}}',
-    });
-    this.registerComponent('foo-bar/biz-baz', { template: 'or yall done?' });
-
-    this.render('{{component componentName child=child}}', {
-      componentName: 'foo-bar',
-      child: 'biz-baz',
-    });
-
-    this.assertText('yall finished or yall done?');
-
-    runTask(() => this.rerender());
-
-    this.assertText('yall finished or yall done?');
-  }
-
-  ['@test it can local lookup a dynamic component from a passed named argument']() {
-    this.registerComponent('parent-foo', {
-      template: `yall finished {{global-biz baz=(component 'local-bar')}}`,
-    });
-    this.registerComponent('global-biz', { template: 'or {{component baz}}' });
-    this.registerComponent('parent-foo/local-bar', { template: 'yall done?' });
-
-    this.render('{{parent-foo}}');
-
-    this.assertText('yall finished or yall done?');
-
-    runTask(() => this.rerender());
-
-    this.assertText('yall finished or yall done?');
-  }
-
-  ['@test it can local lookup a re-wrapped dynamic component from a passed named argument']() {
-    this.registerComponent('parent-foo', {
-      template: `yall finished {{global-x comp=(component 'local-bar')}}`,
-    });
-    this.registerComponent('global-x', {
-      template: `or {{global-y comp=(component comp phrase='done')}}`,
-    });
-    this.registerComponent('global-y', { template: `{{component comp}}?` });
-    this.registerComponent('parent-foo/local-bar', {
-      template: 'yall {{phrase}}',
-    });
-
-    this.render('{{parent-foo}}');
-
-    this.assertText('yall finished or yall done?');
-
-    runTask(() => this.rerender());
-
-    this.assertText('yall finished or yall done?');
-  }
-
-  ['@test it can nest local lookups of dynamic components from a passed named argument']() {
-    this.registerComponent('parent-foo', {
-      template: `yall finished {{global-x comp=(component 'local-bar')}}`,
-    });
-    this.registerComponent('global-x', {
-      template: `or {{global-y comp=(component comp phrase='done')}}`,
-    });
-    this.registerComponent('global-y', {
-      template: `{{component comp}}{{component 'local-bar'}}`,
-    });
-    this.registerComponent('parent-foo/local-bar', {
-      template: 'yall {{phrase}}',
-    });
-    this.registerComponent('global-y/local-bar', { template: `?` });
-
-    this.render('{{parent-foo}}');
-
-    this.assertText('yall finished or yall done?');
-
-    runTask(() => this.rerender());
-
-    this.assertText('yall finished or yall done?');
-  }
-
-  ['@test it can switch from local to global lookups of dynamic components from a passed named argument']() {
-    this.registerComponent('parent-foo', {
-      template: `yall finished {{global-x comp=(component bar)}}`,
-    });
-    this.registerComponent('global-x', {
-      template: `or yall {{component comp}}`,
-    });
-    this.registerComponent('parent-foo/local-bar', { template: 'done?' });
-    this.registerComponent('global-bar', { template: `ready?` });
-
-    this.render('{{parent-foo bar=bar}}', { bar: 'local-bar' });
-
-    this.assertText('yall finished or yall done?');
-
-    runTask(() => this.context.set('bar', 'global-bar'));
-
-    runTask(() => this.rerender());
-
-    this.assertText('yall finished or yall ready?');
-  }
-
-  ['@test it can lookup a local helper']() {
-    this.registerHelper('x-outer/x-helper', () => {
-      return 'Who dis?';
-    });
-    this.registerComponent('x-outer', { template: 'Who dat? {{x-helper}}' });
-
-    this.render('{{x-outer}}');
-
-    this.assertText('Who dat? Who dis?', 'Initial render works');
-
-    runTask(() => this.rerender());
-
-    this.assertText('Who dat? Who dis?', 'Re-render works');
-  }
-
-  ['@test it overrides global helper lookup']() {
-    this.registerHelper('x-outer/x-helper', () => {
-      return 'Who dis?';
-    });
-
-    this.registerHelper('x-helper', () => {
-      return 'I dunno';
-    });
-
-    this.registerComponent('x-outer', { template: 'Who dat? {{x-helper}}' });
-
-    this.render('{{x-outer}} {{x-helper}}');
-
-    this.assertText('Who dat? Who dis? I dunno', 'Initial render works');
-
-    runTask(() => this.rerender());
-
-    this.assertText('Who dat? Who dis? I dunno', 'Re-render works');
-  }
-
-  ['@test lookup without match issues standard assertion (with local helper name)']() {
-    this.registerComponent('x-outer', {
-      template: '{{#x-inner}}Hi!{{/x-inner}}',
-    });
-
-    expectAssertion(() => {
-      this.render('{{x-outer}}');
-    }, /A component or helper named "x-inner" could not be found/);
-  }
-
-  ['@test overrides global lookup']() {
-    this.registerComponent('x-outer', {
-      template: '{{#x-inner}}Hi!{{/x-inner}}',
-    });
-    this.registerComponent('x-outer/x-inner', {
-      template: 'Nested template says (from local): {{yield}}',
-    });
-    this.registerComponent('x-inner', {
-      template: 'Nested template says (from global): {{yield}}',
-    });
-
-    this.render(
-      '{{#x-inner}}Hi!{{/x-inner}} {{x-outer}} {{#x-outer/x-inner}}Hi!{{/x-outer/x-inner}}'
-    );
-
-    this.assertText(
-      'Nested template says (from global): Hi! Nested template says (from local): Hi! Nested template says (from local): Hi!'
-    );
-
-    runTask(() => this.rerender());
-
-    this.assertText(
-      'Nested template says (from global): Hi! Nested template says (from local): Hi! Nested template says (from local): Hi!'
-    );
-  }
-}
-
-// first run these tests with expandLocalLookup
-
-function buildResolver() {
-  let resolver = {
-    resolve() {},
-    expandLocalLookup(fullName, sourceFullName) {
-      if (!sourceFullName) {
-        return null;
-      }
-
-      let [sourceType, sourceName] = sourceFullName.split(':');
-      let [type, name] = fullName.split(':');
-
-      sourceName = sourceName.replace('my-app/', '');
-
-      if (sourceType === 'template' && sourceName.slice(0, 21) === 'templates/components/') {
-        sourceName = sourceName.slice(21);
-      }
-
-      name = name.replace('my-app/', '');
-
-      if (type === 'template' && name.slice(0, 11) === 'components/') {
-        name = name.slice(11);
-        sourceName = `components/${sourceName}`;
-      }
-
-      sourceName = sourceName.replace('.hbs', '');
-
-      let result = `${type}:${sourceName}/${name}`;
-      return result;
-    },
-  };
-
-  return resolver;
-}
-
-moduleFor(
-  'Components test: local lookup with expandLocalLookup feature',
-  class extends LocalLookupTest {
-    getResolver() {
-      return buildResolver();
-    }
-  }
-);
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index 8fa15c94b33..5462e4b2bc1 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -11,10 +11,6 @@ if (DEBUG) {
   DEBUG_INJECTION_FUNCTIONS = new WeakMap();
 }
 
-export interface InjectedPropertyOptions {
-  source: string;
-}
-
 /**
  @module ember
  @private
@@ -31,7 +27,7 @@ export interface InjectedPropertyOptions {
          to the property's name
   @private
 */
-function inject(type: string, name: string, options?: InjectedPropertyOptions): Decorator;
+function inject(type: string, name: string): Decorator;
 function inject(
   type: string,
   target: object,
@@ -42,7 +38,6 @@ function inject(type: string, ...args: any[]): Decorator | DecoratorPropertyDesc
   assert('a string type must be provided to inject', typeof type === 'string');
 
   let calledAsDecorator = isElementDescriptor(args);
-  let source: string | undefined, namespace: string | undefined;
 
   let name = calledAsDecorator ? undefined : args[0];
 
@@ -54,13 +49,11 @@ function inject(type: string, ...args: any[]): Decorator | DecoratorPropertyDesc
       Boolean(owner)
     );
 
-    return owner.lookup(`${type}:${name || propertyName}`, { source, namespace });
+    return owner.lookup(`${type}:${name || propertyName}`);
   };
 
   if (DEBUG) {
     DEBUG_INJECTION_FUNCTIONS.set(getInjection, {
-      namespace,
-      source,
       type,
       name,
     });
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 8ea8e0d0e3b..f7c1fe92a67 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -5,8 +5,6 @@
 export interface LookupOptions {
   singleton?: boolean;
   instantiate?: boolean;
-  source?: string;
-  namespace?: string;
 }
 
 export interface FactoryClass {
diff --git a/packages/internal-test-helpers/lib/test-resolver.js b/packages/internal-test-helpers/lib/test-resolver.js
index 4a2d1075599..1290fbc8f49 100644
--- a/packages/internal-test-helpers/lib/test-resolver.js
+++ b/packages/internal-test-helpers/lib/test-resolver.js
@@ -18,25 +18,6 @@ class Resolver {
   resolve(specifier) {
     return this._registered[specifier] || this._registered[serializeKey(specifier)];
   }
-  expandLocalLookup(specifier, source, namespace) {
-    if (specifier.indexOf('://') !== -1) {
-      return specifier; // an already expanded specifier
-    }
-
-    if (source || namespace) {
-      let key = serializeKey(specifier, source, namespace);
-      if (this._registered[key]) {
-        return key; // like local lookup
-      }
-
-      key = serializeKey(specifier);
-      if (this._registered[key]) {
-        return specifier; // top level resolution despite source/namespace
-      }
-    }
-
-    return specifier; // didn't know how to expand it
-  }
   add(lookup, factory) {
     let key;
     switch (typeof lookup) {
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index e68d3ccdad1..ee4e360480a 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -214,7 +214,6 @@ module.exports = {
     'every',
     'exception',
     'exit',
-    'expandLocalLookup',
     'expandProperties',
     'extend',
     'factoryFor',

From 7d160a83e38672e7290deeaf860efc4fa17dca21 Mon Sep 17 00:00:00 2001
From: Spencer Claxton <saclaxton@gmail.com>
Date: Wed, 28 Oct 2020 14:47:15 -0700
Subject: [PATCH 0206/1405] [DOC release] Document UUID for HistoryLocation.

UUIDs on history location states is a longstanding feature that has been maintained for years and is backed up by the RFC process in [RFC0816](https://github.com/emberjs/rfcs/blob/master/text/0186-track-unique-history-location-state.md). I propose we document this feature in the official docs alongside the API docs for the `HistoryLocation` class (where this feature is implemented).
---
 .../routing/lib/location/history_location.ts           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index 6594a5321ce..2f87266f1c4 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -44,6 +44,16 @@ function _uuid() {
   Keep in mind that your server must serve the Ember app at all the routes you
   define.
 
+  Using `HistoryLocation` will also result in location states being recorded by
+  the browser `history` API with the following schema:
+
+  ```
+  window.history.state -> { path: '/', uuid: '3552e730-b4a6-46bd-b8bf-d8c3c1a97e0a' }
+  ```
+
+  This allows each in-app location state to be tracked uniquely across history
+  state changes via the `uuid` field.
+
   @class HistoryLocation
   @extends EmberObject
   @protected

From ed203b2995b11738b6a3a86bb9ce6484f374fbf2 Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Sat, 31 Oct 2020 13:46:49 +0200
Subject: [PATCH 0207/1405] [REPRODUCTION] Multiple QP serialization...

...on activeTransition in `_doTransition`.
`_processActiveTransitionQueryParams` returns serialized values and we serialize them again in `_prepareQueryParams`, which expects deserialized values.

Refs: #14174
---
 .../ember/tests/routing/query_params_test.js  | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index b73a3ea4a72..74071df660d 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -137,6 +137,55 @@ moduleFor(
       });
     }
 
+    ['@test Calling transitionTo does not serialize query params already serialized on the activeTransition'](
+      assert
+    ) {
+      assert.expect(3);
+
+      this.router.map(function () {
+        this.route('parent', function () {
+          this.route('child');
+          this.route('sibling');
+        });
+      });
+
+      this.add(
+        'route:parent.child',
+        Route.extend({
+          afterModel() {
+            this.transitionTo('parent.sibling');
+          },
+        })
+      );
+
+      this.add(
+        'controller:parent',
+        Controller.extend({
+          queryParams: ['array', 'string'],
+          array: [],
+          string: '',
+        })
+      );
+
+      // `/parent/child?array=["one",2]&string=hello`
+      return this.visit('/parent/child?array=%5B%22one%22%2C2%5D&string=hello').then(() => {
+        this.assertCurrentPath(
+          '/parent/sibling?array=%5B%22one%22%2C2%5D&string=hello',
+          'redirected to the sibling route, instead of child route'
+        );
+        assert.equal(
+          this.getController('parent').get('string'),
+          'hello',
+          'controller has value from the active transition'
+        );
+        assert.deepEqual(
+          this.getController('parent').get('array'),
+          ['one', 2],
+          'controller has value from the active transition'
+        );
+      });
+    }
+
     async ['@test Single query params can be set on the controller and reflected in the url'](
       assert
     ) {

From 20da5b22c9afc287dd4fef206ce7a9b3de0933d6 Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Wed, 28 Oct 2020 16:47:46 +0200
Subject: [PATCH 0208/1405] [BUGFIX beta] Prevent multiple QP serialization

We're using serialized query parameters for active transition instead of deserialized ones. This results in multiple serialization of QP's.
---
 packages/@ember/-internals/routing/lib/system/route.ts  | 2 +-
 packages/@ember/-internals/routing/lib/system/router.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 77f85a3cb4b..0411715f2b5 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1935,7 +1935,7 @@ interface PartialRenderOptions {
   model?: {};
 }
 
-function getFullQueryParams(router: EmberRouter, state: TransitionState<Route>) {
+export function getFullQueryParams(router: EmberRouter, state: TransitionState<Route>) {
   if (state['fullQueryParams']) {
     return state['fullQueryParams'];
   }
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 8e08c6ca085..871c077c303 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -14,6 +14,7 @@ import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL
 import DSL from './dsl';
 import Route, {
   defaultSerialize,
+  getFullQueryParams,
   hasDefaultSerialize,
   RenderOptions,
   ROUTE_CONNECTIONS,
@@ -28,7 +29,6 @@ import { MatchCallback } from 'route-recognizer';
 import Router, {
   InternalRouteInfo,
   logAbort,
-  QUERY_PARAMS_SYMBOL,
   STATE_SYMBOL,
   Transition,
   TransitionError,
@@ -861,7 +861,7 @@ class EmberRouter extends EmberObject {
 
     let unchangedQPs = {};
     let qpUpdates = this._qpUpdates;
-    let params = this._routerMicrolib.activeTransition[QUERY_PARAMS_SYMBOL];
+    let params = getFullQueryParams(this, this._routerMicrolib.activeTransition[STATE_SYMBOL]);
     for (let key in params) {
       if (!qpUpdates.has(key)) {
         unchangedQPs[key] = params[key];

From 6bd6d15a684412d10360b024901c8dff8ddbc99f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 1 Nov 2020 05:33:04 +0000
Subject: [PATCH 0209/1405] Bump fs-extra from 9.0.0 to 9.0.1

Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.0.0...9.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index fb39d24399f..aa0bfb23e6c 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "execa": "^2.0.4",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
-    "fs-extra": "^9.0.0",
+    "fs-extra": "^9.0.1",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
     "glob": "^7.1.4",
diff --git a/yarn.lock b/yarn.lock
index 0c0dfc6ab48..93e4d6396f7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4742,10 +4742,10 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
-  integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
+fs-extra@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
+  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
   dependencies:
     at-least-node "^1.0.0"
     graceful-fs "^4.2.0"

From ec49e0eee542791ca6916a71096988acab9c2ec0 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 2 Nov 2020 16:51:47 -0500
Subject: [PATCH 0210/1405] Add v3.23.0-beta.4 to CHANGELOG

(cherry picked from commit 09ecf1cd3be31b0320e400d7172de0f13352d027)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89fb6301f2e..8671d028cdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.23.0-beta.4 (November 2, 2020)
+
+- [#19142](https://github.com/emberjs/ember.js/pull/19142) [BUGFIX] Fix App booting before DOM ready without jQuery
+- [#19198](https://github.com/emberjs/ember.js/pull/19198) / [#19232](https://github.com/emberjs/ember.js/pull/19232) [BUGFIX] Restores the shadowed property set behavior
+
 ### v3.23.0-beta.3 (October 26, 2020)
 
 - [#19199](https://github.com/emberjs/ember.js/pull/19199) [BUGFIX] Fix Ember Inspector to not be in a broken state after render errors

From 51059e9db8c19c343e95b9174ab835eb0ed57f9d Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Mon, 5 Oct 2020 18:10:20 -0400
Subject: [PATCH 0211/1405] Refactor changelog script and grab PR titles when
 they're needed

Makes a few improvements to the changelog generation script:
* handles cases where PR-merge commits don't include PR title
  (this led to 'undefined' in the output instead of a title)
* fixes sorting so PRs are ordered correctly, and non-PR-associated
  commits appear after PRs (and are also sorted)
* ensures that a PR will only appear once in the output
---
 bin/changelog.js | 172 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 112 insertions(+), 60 deletions(-)

diff --git a/bin/changelog.js b/bin/changelog.js
index c6397703fe8..f08e68186ce 100755
--- a/bin/changelog.js
+++ b/bin/changelog.js
@@ -19,72 +19,49 @@ const GitHubApi = require('github');
 const execSync = require('child_process').execSync;
 
 const github = new GitHubApi({ version: '3.0.0' });
+if (process.env.GITHUB_TOKEN) {
+  github.authenticate({
+    type: 'token',
+    token: process.env.GITHUB_TOKEN,
+  });
+}
 const compareCommits = RSVP.denodeify(github.repos.compareCommits);
+const getPullRequest = RSVP.denodeify(github.pullRequests.get);
 
 const currentVersion = process.env.PRIOR_VERSION;
 const head = process.env.HEAD || execSync('git rev-parse HEAD', { encoding: 'UTF-8' });
 
-compareCommits({
-  user: 'emberjs',
-  repo: 'ember.js',
-  base: currentVersion,
-  head: head,
-})
-  .then(processPages)
+generateChangelog()
   .then(console.log)
   .catch((err) => console.error(err));
 
-function getCommitMessage(commitInfo) {
-  let message = commitInfo.commit.message;
-
-  if (message.indexOf('cherry picked from commit') > -1) {
-    let cherryPickRegex = /cherry picked from commit ([a-z0-9]+)/;
-    let originalCommit = cherryPickRegex.exec(message)[1];
-
-    try {
-      // command from http://stackoverflow.com/questions/8475448/find-merge-commit-which-include-a-specific-commit
-      message = execSync(
-        'commit=$((git rev-list ' +
-          originalCommit +
-          '..origin/master --ancestry-path | cat -n; git rev-list ' +
-          originalCommit +
-          '..origin/master --first-parent | cat -n) | sort -k2 | uniq -f1 -d | sort -n | tail -1 | cut -f2) && git show --format="%s\n\n%b" $commit',
-        { encoding: 'utf8' }
-      );
-    } catch (e) {
-      // ignored
-    }
+async function fetchAllChanges() {
+  let result = await compareCommits({
+    user: 'emberjs',
+    repo: 'ember.js',
+    base: currentVersion,
+    head,
+  });
+  let data = result.commits;
+  while (github.hasNextPage(result)) {
+    result = await github.getNextPage(result);
+    data.concat(result.commits);
   }
 
-  return message;
+  return data;
 }
 
-function excludeDependabot(commitInfo) {
-  let author = commitInfo.author.login;
-  return author !== 'dependabot-preview[bot]' && author !== 'dependabot[bot]';
-}
-
-function isMergeOrCherryPick(commitInfo) {
-  if (commitInfo.parents.length == 2) return true;
+async function generateChangelog() {
+  let commits = await fetchAllChanges();
 
-  let message = commitInfo.commit.message;
-  return message.indexOf('Merge pull request #') > -1 || message.indexOf('cherry picked from') > -1;
-}
-
-function comparePrNumber(a, b) {
-  if (a.number < b.number) return -1;
-  if (a.number > b.number) return 1;
-  return 0;
-}
+  let contributions = commits.filter(excludeDependabot).filter(isMergeOrCherryPick);
 
-function processPages(res) {
-  let contributions = res.commits
-    .filter(excludeDependabot)
-    .filter(isMergeOrCherryPick)
-    .map((commitInfo) => {
-      let message = getCommitMessage(commitInfo);
+  let changes = await Promise.all(
+    contributions.map(async function (commitInfo) {
+      let message = await getCommitMessage(commitInfo);
 
-      let mergeFromBranchRegex = /#(\d+) from (.*)\//;
+      let mergeFromBranchRegex = /#(\d+) from (.+)\//;
+      let mergePullRequestRegex = /Merge pull request #(\d+)/;
       let mergeWithPrReferenceRegex = /\(#(\d+)\)$/m;
       let result = {
         sha: commitInfo.sha,
@@ -92,9 +69,11 @@ function processPages(res) {
 
       if (mergeFromBranchRegex.test(message)) {
         let match = message.match(mergeFromBranchRegex);
-        let numAndAuthor = match.slice(1, 3);
-
-        result.number = numAndAuthor[0];
+        result.number = match[1];
+        result.title = message.split('\n\n')[1];
+      } else if (mergePullRequestRegex.test(message)) {
+        let match = message.match(mergePullRequestRegex);
+        result.number = match[1];
         result.title = message.split('\n\n')[1];
       } else if (mergeWithPrReferenceRegex.test(message)) {
         let match = message.match(mergeWithPrReferenceRegex);
@@ -106,7 +85,11 @@ function processPages(res) {
 
       return result;
     })
+  );
+
+  return changes
     .sort(comparePrNumber)
+    .filter(uniqueByPrNumber)
     .map((pr) => {
       let title = pr.title;
       let link;
@@ -121,12 +104,81 @@ function processPages(res) {
       return '- ' + link + ' ' + title;
     })
     .join('\n');
+}
+
+async function getCommitMessage(commitInfo) {
+  let message = commitInfo.commit.message;
 
-  if (github.hasNextPage(res)) {
-    return github.getNextPage(res).then((nextPage) => {
-      contributions += processPages(nextPage);
-    });
-  } else {
-    return RSVP.resolve(contributions);
+  let matches;
+
+  if (message.indexOf('cherry picked from commit') > -1) {
+    let cherryPickRegex = /cherry picked from commit ([a-z0-9]+)/;
+    let originalCommit = cherryPickRegex.exec(message)[1];
+
+    try {
+      // command from http://stackoverflow.com/questions/8475448/find-merge-commit-which-include-a-specific-commit
+      message = execSync(
+        'commit=$((git rev-list ' +
+          originalCommit +
+          '..origin/master --ancestry-path | cat -n; git rev-list ' +
+          originalCommit +
+          '..origin/master --first-parent | cat -n) | sort -k2 | uniq -f1 -d | sort -n | tail -1 | cut -f2) && git show --format="%s\n\n%b" $commit',
+        { encoding: 'utf8' }
+      );
+    } catch (e) {
+      // ignored
+    }
   }
+
+  if ((matches = message.match(/^Merge pull request #(\d+)/))) {
+    // if the commit was a merge from a PR and there's no additional content in
+    // the commit message (which is normally the title of the merged PR) then
+    // hit the Github API for the PR to get the title.
+    let prNumber = matches[1];
+
+    let lines = message.split(/\n\n/);
+
+    if (lines[1] === '') {
+      let pullRequest = await getPullRequest({
+        user: 'emberjs',
+        repo: 'ember.js',
+        number: prNumber,
+      });
+      return `Merge pull request #${prNumber}\n\n${pullRequest.title}`;
+    }
+  }
+
+  return message;
+}
+
+function excludeDependabot(commitInfo) {
+  let author = commitInfo.author.login;
+  return author !== 'dependabot-preview[bot]' && author !== 'dependabot[bot]';
+}
+
+function isMergeOrCherryPick(commitInfo) {
+  if (commitInfo.parents.length == 2) return true;
+
+  let message = commitInfo.commit.message;
+  return message.indexOf('Merge pull request #') > -1 || message.indexOf('cherry picked from') > -1;
+}
+
+function comparePrNumber(a, b) {
+  if (a.number && !b.number) return -1;
+  if (!a.number && b.number) return 1;
+  if (!a.number && !b.number) {
+    if (a.sha < b.sha) return -1;
+    if (a.sha > b.sha) return 1;
+    return 0;
+  }
+
+  if (a.number < b.number) return -1;
+  if (a.number > b.number) return 1;
+  return 0;
+}
+
+function uniqueByPrNumber(commitInfo, index, commits) {
+  const foundIndex = commits.findIndex(({ number }) => number === commitInfo.number);
+  // keep this item if it has a `number` that isn't elsewhere in the array, or doesn't have `number`
+  return foundIndex === index || foundIndex === -1;
 }

From 61faaffe7d5a22c6079a8f272d3217346a07ae8c Mon Sep 17 00:00:00 2001
From: "James C. Davis" <jdavis@salsify.com>
Date: Wed, 4 Nov 2020 12:03:58 -0500
Subject: [PATCH 0212/1405] doc: RouteInfo.metadata

---
 .../@ember/-internals/routing/lib/system/route-info.ts     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/system/route-info.ts b/packages/@ember/-internals/routing/lib/system/route-info.ts
index a12bd7253f4..afc521047d5 100644
--- a/packages/@ember/-internals/routing/lib/system/route-info.ts
+++ b/packages/@ember/-internals/routing/lib/system/route-info.ts
@@ -166,6 +166,13 @@
   @public
 */
 
+/**
+  Will contain the result `Route#buildRouteInfoMetadata`
+  for the corresponding Route.
+  @property {Any} metadata
+  @public
+*/
+
 /**
   A reference to the parent route's `RouteInfo`.
   This can be used to traverse upward to the topmost

From c8cc5450b7b101313cdb1d02ab129155fa7326bf Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Thu, 5 Nov 2020 16:21:58 +0200
Subject: [PATCH 0213/1405] [REPRODUCTION] dynamic qp's bug in link-to

Refs: Based off reproduction in https://github.com/emberjs/ember.js/pull/16986
---
 .../link-to/query-params-angle-test.js        | 40 +++++++++++++++++++
 .../link-to/query-params-curly-test.js        | 40 +++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 3fd18b88771..8e72e7e3e24 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -879,5 +879,45 @@ moduleFor(
         this.shouldBeActive(assert, '#foos-link');
       });
     }
+
+    ['@test the <LinkTo /> component with dynamic segment and loading route should preserve query parameters'](
+      assert
+    ) {
+      this.router.map(function () {
+        this.route('foo', { path: ':foo' }, function () {
+          this.route('bar', function () {
+            this.route('baz');
+          });
+        });
+      });
+
+      this.addTemplate('foo.bar', `<LinkTo id='baz-link' @route='foo.bar.baz'>Baz</LinkTo>`);
+
+      this.addTemplate('foo.bar.loading', 'Loading');
+
+      this.add(
+        'controller:foo.bar',
+        Controller.extend({
+          queryParams: ['qux'],
+          qux: null,
+        })
+      );
+
+      this.add(
+        'route:foo.bar.baz',
+        Route.extend({
+          model() {
+            return new RSVP.Promise((resolve) => {
+              setTimeout(resolve, 1);
+            });
+          },
+        })
+      );
+
+      return this.visit('/foo/bar/baz?qux=abc').then(() => {
+        let bazLink = this.$('#baz-link');
+        assert.equal(bazLink.attr('href'), '/foo/bar/baz?qux=abc');
+      });
+    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index 6a61fd06ca4..f6903e4cf32 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -839,5 +839,45 @@ moduleFor(
         });
       });
     }
+
+    ['@test the {{link-to}} component with dynamic segment and loading route should preserve query parameters'](
+      assert
+    ) {
+      this.router.map(function () {
+        this.route('foo', { path: ':foo' }, function () {
+          this.route('bar', function () {
+            this.route('baz');
+          });
+        });
+      });
+
+      this.addTemplate('foo.bar', `{{link-to 'Baz' 'foo.bar.baz' id='baz-link'}}`);
+
+      this.addTemplate('foo.bar.loading', 'Loading');
+
+      this.add(
+        'controller:foo.bar',
+        Controller.extend({
+          queryParams: ['qux'],
+          qux: null,
+        })
+      );
+
+      this.add(
+        'route:foo.bar.baz',
+        Route.extend({
+          model() {
+            return new RSVP.Promise((resolve) => {
+              setTimeout(resolve, 1);
+            });
+          },
+        })
+      );
+
+      return this.visit('/foo/bar/baz?qux=abc').then(() => {
+        let bazLink = this.$('#baz-link');
+        assert.equal(bazLink.attr('href'), '/foo/bar/baz?qux=abc');
+      });
+    }
   }
 );

From e66ae7df2a8bbc45847f7e150af28862b9c7b1ef Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Thu, 5 Nov 2020 21:41:58 +0200
Subject: [PATCH 0214/1405] [REPRODUCTION] Updating single qp resets others

Refs: Based off reproduction in #14438
---
 .../ember/tests/routing/query_params_test.js  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index b73a3ea4a72..b9c623cb746 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1687,5 +1687,62 @@ moduleFor(
       await runLoopSettled();
       this.assertCurrentPath('/?foo=987');
     }
+
+    async [`@test Updating single query parameter doesn't affect other query parameters. Issue #14438`](
+      assert
+    ) {
+      assert.expect(5);
+
+      this.router.map(function () {
+        this.route('grandparent', { path: 'grandparent/:foo' }, function () {
+          this.route('parent', function () {
+            this.route('child');
+          });
+        });
+      });
+
+      this.addTemplate('grandparent.parent.loading', 'Loading...');
+
+      this.add(
+        'route:index',
+        Route.extend({
+          redirect() {
+            this.transitionTo('grandparent.parent.child', 1);
+          },
+        })
+      );
+
+      this.add(
+        'route:grandparent.parent.child',
+        Route.extend({
+          model() {
+            return Promise.resolve();
+          },
+        })
+      );
+
+      this.add(
+        'controller:grandparent.parent',
+        Controller.extend({
+          queryParams: ['foo', 'bar'],
+
+          foo: 'FOO',
+          bar: 'BAR',
+        })
+      );
+
+      await this.visit('/');
+
+      this.assertCurrentPath('/grandparent/1/parent/child');
+      let parentController = this.getController('grandparent.parent');
+
+      await this.setAndFlush(parentController, 'foo', 'NEW_FOO');
+      assert.equal(parentController.foo, 'NEW_FOO');
+      this.assertCurrentPath('/grandparent/1/parent/child?foo=NEW_FOO');
+
+      await this.setAndFlush(parentController, 'bar', 'NEW_BAR');
+      assert.equal(parentController.bar, 'NEW_BAR');
+      this.assertCurrentPath('/grandparent/1/parent/child?bar=NEW_BAR&foo=NEW_FOO');
+    }
   }
 );

From 4f4e69a285cb7a47a33b6fbf12ae5eac6a5b50e3 Mon Sep 17 00:00:00 2001
From: Volodymyr Radchenko <rreckonerr@gmail.com>
Date: Fri, 6 Nov 2020 08:40:21 +0200
Subject: [PATCH 0215/1405] CHORE: upgrade router_js

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 11ca987744b..6cd30a5ad77 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^7.1.0",
+    "router_js": "^7.1.1",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index ff6a531a37b..004ee0d0f06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8150,10 +8150,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-router_js@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.1.0.tgz#d2a47d7224a30f3b6416be20c9c80868fc14ff0c"
-  integrity sha512-03n6mJCD6hTX4bUkowS+HcsyI9ghP3AxmtVSRnMmDWzykNlHE/wXy+hbybdHmnOH2sDe97L/4V7q6MfrVQBoIg==
+router_js@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.1.1.tgz#cb7614a96cfb6bc65c066668b2dd32e3ad7ca38d"
+  integrity sha512-kOdKqBj7aj9GusG0umtWgkTtNtDspT9EfJNnJN9B8g0DDNp9CdIwpO+2Qnmf/fNos38Pj9jlfU44l/oycn5goQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 

From 1e09e2662e2fda8c969292061a9bdbbf22bf46e1 Mon Sep 17 00:00:00 2001
From: "James C. Davis" <jdavis@salsify.com>
Date: Fri, 6 Nov 2020 11:36:54 -0500
Subject: [PATCH 0216/1405] change return of getComponentTemplate from null to
 undefined

---
 packages/@ember/-internals/glimmer/lib/resolver.ts           | 2 +-
 .../-internals/glimmer/lib/utils/component-template.ts       | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 94557d94188..828f08568cb 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -99,7 +99,7 @@ function lookupComponentPair(
   if (component !== null && component.class !== undefined) {
     let layout = getComponentTemplate(component.class);
 
-    if (layout !== null) {
+    if (layout !== undefined) {
       return { component, layout };
     }
   }
diff --git a/packages/@ember/-internals/glimmer/lib/utils/component-template.ts b/packages/@ember/-internals/glimmer/lib/utils/component-template.ts
index 8ff9754ff57..deadffc69ef 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/component-template.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/component-template.ts
@@ -1,6 +1,5 @@
 import { toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { Option } from '@glimmer/interfaces';
 import { Factory as TemplateFactory } from '../template';
 
 const TEMPLATES: WeakMap<object, TemplateFactory> = new WeakMap();
@@ -23,7 +22,7 @@ export function setComponentTemplate(factory: TemplateFactory, obj: object) {
   return obj;
 }
 
-export function getComponentTemplate(obj: object): Option<TemplateFactory> {
+export function getComponentTemplate(obj: object): TemplateFactory | undefined {
   let pointer = obj;
   while (pointer !== undefined && pointer !== null) {
     let template = TEMPLATES.get(pointer);
@@ -35,5 +34,5 @@ export function getComponentTemplate(obj: object): Option<TemplateFactory> {
     pointer = getPrototypeOf(pointer);
   }
 
-  return null;
+  return undefined;
 }

From 2f8cde9f4ed8b131b0c2e282df79ae3bc0721b0c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 14 Oct 2020 17:55:52 -0700
Subject: [PATCH 0217/1405] [BUGFIX] Prevents infinite rerenders when errors
 occur during render

This adds a preventative measure against infinite rerenders that happen
due to an unrecoverable error during rendering. This type of error is
really annoying from a DX perspective and can really throw developers
for a loop. The most common cases appear to be caused by the Ember
Inspector, which polls after a render has occured whether on not it was
succesful, and in doing so also dirties state, causing a rerender.

An example of this is seen in this [example reproduction](https://github.com/xg-wang/getter-error)
with the following steps:

1. Load the app
2. Click the To View link to enter the page with the error
3. Open up the Ember Inspector to activate it
4. Reload the page
---
 .../@ember/-internals/glimmer/lib/renderer.ts | 35 +++++++++++++++++--
 .../application/debug-render-tree-test.ts     |  2 +-
 .../components/error-handling-test.js         | 14 ++++++--
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 418357e7c90..d66aaacb783 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -3,6 +3,7 @@ import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   Cursor,
@@ -77,6 +78,34 @@ export class DynamicScope implements GlimmerDynamicScope {
   }
 }
 
+// This wrapper logic prevents us from rerendering in case of a hard failure
+// during render. This prevents infinite revalidation type loops from occuring,
+// and ensures that errors are not swallowed by subsequent follow on failures.
+function errorLoopTransaction(fn: () => void) {
+  if (DEBUG) {
+    return () => {
+      let didError = true;
+
+      try {
+        fn();
+        didError = false;
+      } finally {
+        if (didError) {
+          // Noop the function so that we won't keep calling it and causing
+          // infinite looping failures;
+          fn = () => {
+            console.warn(
+              'Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.'
+            );
+          };
+        }
+      }
+    };
+  } else {
+    return fn;
+  }
+}
+
 class RootState {
   public id: string;
   public result: RenderResult | undefined;
@@ -102,7 +131,7 @@ class RootState {
     this.result = undefined;
     this.destroyed = false;
 
-    this.render = () => {
+    this.render = errorLoopTransaction(() => {
       let layout = unwrapTemplate(template).asLayout();
       let handle = layout.compile(context);
 
@@ -118,8 +147,8 @@ class RootState {
       let result = (this.result = iterator.sync());
 
       // override .render function after initial render
-      this.render = () => result.rerender({ alwaysRevalidate: false });
-    };
+      this.render = errorLoopTransaction(() => result.rerender({ alwaysRevalidate: false }));
+    });
   }
 
   isFor(possibleRoot: unknown): boolean {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 70784295787..d088dbc103b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1662,7 +1662,7 @@ if (ENV._DEBUG_RENDER_TREE) {
           template: 'Hello World',
         });
 
-        await assert.rejectsAssertion(this.visit('/'), /oops!/);
+        await assert.rejects(this.visit('/'), /oops!/);
 
         assert.deepEqual(captureRenderTree(this.owner), [], 'there was no output');
       }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
index 7b1d6ea15ab..b50ee890339 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
@@ -1,3 +1,5 @@
+import { DEBUG } from '@glimmer/env';
+
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { set } from '@ember/-internals/metal';
@@ -43,7 +45,11 @@ moduleFor(
 
       runTask(() => set(this.context, 'switch', true));
 
-      this.assertText('hello');
+      if (DEBUG) {
+        this.assertText('', 'it does not rerender after error in development');
+      } else {
+        this.assertText('hello', 'it rerenders after error in production');
+      }
     }
 
     ['@skip it can recover resets the transaction when an error is thrown during rerender'](
@@ -91,7 +97,11 @@ moduleFor(
 
       runTask(() => set(this.context, 'switch', true));
 
-      this.assertText('hello');
+      if (DEBUG) {
+        this.assertText('', 'it does not rerender after error in development');
+      } else {
+        this.assertText('hello', 'it does rerender after error in production');
+      }
     }
 
     ['@test it can recover resets the transaction when an error is thrown during didInsertElement'](

From 70fffeaa6320cc84455a1367fd1c84f89d30151b Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 9 Nov 2020 13:37:49 -0500
Subject: [PATCH 0218/1405] Add v3.23.0-beta.5 to CHANGELOG

(cherry picked from commit f757e5722048843b6f37a48514aec9eddbf27f79)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8671d028cdc..15b8480d03b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.23.0-beta.5 (November 9, 2020)
+
+- [#19249](https://github.com/emberjs/ember.js/pull/19249) [BUGFIX] Fix bugs in query params with intermediate transitions
+
 ### v3.23.0-beta.4 (November 2, 2020)
 
 - [#19142](https://github.com/emberjs/ember.js/pull/19142) [BUGFIX] Fix App booting before DOM ready without jQuery

From eff0aefa398e578abffe91b074f70bbc55535a6d Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Mon, 9 Nov 2020 17:10:54 -0800
Subject: [PATCH 0219/1405] Improve internal router type

---
 .../-internals/routing/lib/system/dsl.ts      | 23 +++++++++++--------
 .../-internals/routing/lib/system/engines.ts  |  2 +-
 .../-internals/routing/lib/system/route.ts    |  7 ++++--
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts
index 10c0e3eb677..91366ef8aef 100644
--- a/packages/@ember/-internals/routing/lib/system/dsl.ts
+++ b/packages/@ember/-internals/routing/lib/system/dsl.ts
@@ -10,7 +10,7 @@ let uuid = 0;
 export interface RouteOptions {
   path?: string;
   resetNamespace?: boolean;
-  serialize?: any;
+  serialize?: (model: {}, params: string[]) => { [key: string]: unknown | undefined };
   overrideNameAssertion?: boolean;
 }
 
@@ -43,16 +43,14 @@ function isOptions(value?: RouteOptions | DSLCallback): value is RouteOptions {
 }
 export interface DSLImplOptions {
   enableLoadingSubstates: boolean;
-  overrideNameAssertion?: boolean;
   engineInfo?: EngineInfo;
   addRouteForEngine(name: string, routeOptions: EngineRouteInfo): void;
   resolveRouteMap(name: string): Factory<any, any>;
-  path?: string;
 }
 
 export default class DSLImpl implements DSL {
   parent: string | null;
-  matches: any[];
+  matches: Array<Object | undefined>;
   enableLoadingSubstates: boolean;
   explicitIndex = false;
   options: DSLImplOptions;
@@ -69,7 +67,7 @@ export default class DSLImpl implements DSL {
   route(name: string, callback: DSLCallback): void;
   route(name: string, options: RouteOptions): void;
   route(name: string, options: RouteOptions, callback: DSLCallback): void;
-  route(name: string, _options?: RouteOptions | DSLCallback, _callback?: DSLCallback) {
+  route(name: string, _options?: RouteOptions | DSLCallback, _callback?: DSLCallback): void {
     let options: RouteOptions;
     let callback: Option<DSLCallback> = null;
 
@@ -127,9 +125,13 @@ export default class DSLImpl implements DSL {
       createRoute(this, name, options);
     }
   }
-  /* eslint-enable no-dupe-class-members */
 
-  push(url: string, name: string, callback?: MatchCallback, serialize?: any) {
+  push(
+    url: string,
+    name: string,
+    callback?: MatchCallback,
+    serialize?: (model: {}, params: string[]) => { [key: string]: unknown | undefined }
+  ): void {
     let parts = name.split('.');
 
     if (this.options.engineInfo) {
@@ -163,12 +165,15 @@ export default class DSLImpl implements DSL {
 
     return (match) => {
       for (let i = 0; i < dslMatches.length; i += 3) {
-        match(dslMatches[i]).to(dslMatches[i + 1], dslMatches[i + 2]);
+        match(dslMatches[i] as string).to(
+          dslMatches[i + 1] as string,
+          dslMatches[i + 2] as MatchCallback
+        );
       }
     };
   }
 
-  mount(_name: string, options: MountOptions = {}) {
+  mount(_name: string, options: MountOptions = {}): void {
     let engineRouteMap = this.options.resolveRouteMap(_name);
     let name = _name;
 
diff --git a/packages/@ember/-internals/routing/lib/system/engines.ts b/packages/@ember/-internals/routing/lib/system/engines.ts
index b6f89fe53ea..4d4ce378f58 100644
--- a/packages/@ember/-internals/routing/lib/system/engines.ts
+++ b/packages/@ember/-internals/routing/lib/system/engines.ts
@@ -7,5 +7,5 @@ export interface EngineInfo {
 
 export interface EngineRouteInfo extends EngineInfo {
   localFullName: string;
-  serializeMethod?: any;
+  serializeMethod?: (model: {}, params: string[]) => { [key: string]: unknown | undefined };
 }
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 0411715f2b5..3ed36a1101f 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -47,7 +47,10 @@ import EmberRouter, { QueryParam } from './router';
 
 export const ROUTE_CONNECTIONS = new WeakMap();
 
-export function defaultSerialize(model: {}, params: string[]) {
+export function defaultSerialize(
+  model: {},
+  params: string[]
+): { [key: string]: unknown } | undefined {
   if (params.length < 1 || !model) {
     return;
   }
@@ -67,7 +70,7 @@ export function defaultSerialize(model: {}, params: string[]) {
   return object;
 }
 
-export function hasDefaultSerialize(route: Route) {
+export function hasDefaultSerialize(route: Route): boolean {
   return route.serialize === defaultSerialize;
 }
 

From 4c9499d836122c4277cee48327e971fd3ace0c77 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 10 Nov 2020 16:09:40 -0500
Subject: [PATCH 0220/1405] Add v3.20.6 to CHANGELOG.md.

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15b8480d03b..86d5f0b3769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,14 @@
 - [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
 
+### v3.20.6 (November 11, 2020)
+
+- [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters
+- [#19158](https://github.com/emberjs/ember.js/pull/19158) [BUGFIX] `RouterService#isActive()` now consumes `currentURL` to 3.20
+- [#19164](https://github.com/emberjs/ember.js/pull/19164) [BUGFIX] Entangles custom EmberArray implementations when accessed
+- [#19172](https://github.com/emberjs/ember.js/pull/19172) / [#19197](https://github.com/emberjs/ember.js/pull/19197) [BUGFIX] Ensures that tracked properties initialize property
+- [#19178](https://github.com/emberjs/ember.js/pull/19178) [BUGFIX] Allow computeds to have cycles in their deps
+
 ### v3.20.5 (August 28, 2020)
 
 - [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.

From f2104f2d2a092cfdb95317f1f6745dcc498f1334 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 10 Nov 2020 13:24:48 -0500
Subject: [PATCH 0221/1405] Add v3.22.1 to CHANGELOG.md.

(cherry picked from commit 566424788b313efb8f4a63e182b461a013db8e05)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86d5f0b3769..a3a7fe4bc2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,13 @@
 - [#19136](https://github.com/emberjs/ember.js/pull/19136) [BUGFIX] Update router microlib to improve Transition related debugging
 - [#19173](https://github.com/emberjs/ember.js/pull/19173) [BUGFIX] Enforce usage of `capabilities` generation.
 
+### v3.22.1 (November 10, 2020)
+
+- [#19193](https://github.com/emberjs/ember.js/pull/19193) [BUGFIX] Ensure `@ember/component` user lifecycle hooks are untracked
+- [#19197](https://github.com/emberjs/ember.js/pull/19197) [BUGFIX] Restore the shadowed property set behavior
+- [#19199](https://github.com/emberjs/ember.js/pull/19199) [BUGFIX] Cleans up the DebugRenderTree more thoroughly on errors
+- [#19249](https://github.com/emberjs/ember.js/pull/19249) [BUGFIX] Fix issues with query params during intermediate transitions
+
 ### v3.22.0 (October 5, 2020)
 
 - [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).

From 87bcfb4f85eb1436cf13e54fa76c16c9db8f3b98 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 28 Oct 2020 17:05:49 -0700
Subject: [PATCH 0222/1405] [FEAT] Upgrade Glimmer VM to 0.63.5

Upgrade includes:

- Upstream `setComponentTemplate`/`getComponentTemplate`
- Upstream `setOwner`/`getOwner`
- Bugfix for double argument instantiation
---
 .gitignore                                    |   1 +
 broccoli/glimmer-template-compiler.js         |   4 +-
 package.json                                  |  18 +-
 .../container/tests/container_test.js         |   4 +-
 .../-internals/container/tests/owner_test.js  |   4 +-
 packages/@ember/-internals/glimmer/index.ts   |  10 +-
 .../glimmer/lib/compile-time-lookup.ts        |  26 +--
 .../glimmer/lib/component-managers/curly.ts   |  13 +-
 .../glimmer/lib/component-managers/custom.ts  |   6 +-
 .../component-managers/definition-state.ts    |   5 +-
 .../lib/component-managers/internal.ts        |   6 +-
 .../glimmer/lib/component-managers/mount.ts   |   2 +-
 .../glimmer/lib/component-managers/outlet.ts  |   6 +-
 .../lib/component-managers/template-only.ts   |   6 +-
 .../-internals/glimmer/lib/environment.ts     |   5 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |  13 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  50 ++---
 .../@ember/-internals/glimmer/lib/syntax.ts   |  11 +-
 .../@ember/-internals/glimmer/lib/template.ts |  58 +----
 .../glimmer/lib/template_registry.ts          |   9 +-
 .../glimmer/lib/templates/component.d.ts      |   4 +-
 .../glimmer/lib/templates/empty.d.ts          |   4 +-
 .../glimmer/lib/templates/input.d.ts          |   4 +-
 .../glimmer/lib/templates/link-to.d.ts        |   4 +-
 .../glimmer/lib/templates/outlet.d.ts         |   4 +-
 .../glimmer/lib/templates/root.d.ts           |   4 +-
 .../glimmer/lib/utils/component-template.ts   |  38 ----
 .../lib/utils/curly-component-state-bucket.ts |   5 +-
 .../glimmer/lib/utils/debug-render-tree.ts    |   9 +-
 .../-internals/glimmer/lib/utils/outlet.ts    |   4 +-
 .../-internals/glimmer/lib/views/outlet.ts    |   4 +-
 .../components/component-template-test.js     |  33 ++-
 packages/@ember/-internals/owner/index.ts     |   9 +-
 .../-internals/routing/lib/system/route.ts    |   4 +-
 .../tests/location/auto_location_test.js      |  11 +-
 .../runtime/lib/system/core_object.js         |   4 +-
 .../tests/mixins/container_proxy_test.js      |   4 +-
 packages/@ember/-internals/views/index.d.ts   |  15 +-
 yarn.lock                                     | 210 +++++++++---------
 39 files changed, 269 insertions(+), 362 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/component-template.ts

diff --git a/.gitignore b/.gitignore
index c03f4f312bd..f2f07319406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,4 +45,5 @@ npm-debug.log
 *.tgz
 *.tar.gz
 *.log
+/.vscode
 
diff --git a/broccoli/glimmer-template-compiler.js b/broccoli/glimmer-template-compiler.js
index 6cb49b89e2e..be6361d25f0 100644
--- a/broccoli/glimmer-template-compiler.js
+++ b/broccoli/glimmer-template-compiler.js
@@ -31,8 +31,8 @@ GlimmerTemplatePrecompiler.prototype.processString = function (content, relative
     meta: { moduleName: relativePath },
   });
   return stripIndent`
-    import template from '../template';
-    export default template(${compiled});
+    import { templateFactory } from '@glimmer/opcode-compiler';
+    export default templateFactory(${compiled});
   `;
 };
 
diff --git a/package.json b/package.json
index fd01de7a8f8..2f3af68d47d 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.62.3",
+    "@glimmer/compiler": "0.63.5",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.62.3",
-    "@glimmer/interfaces": "0.62.3",
-    "@glimmer/node": "0.62.3",
-    "@glimmer/opcode-compiler": "0.62.3",
-    "@glimmer/program": "0.62.3",
-    "@glimmer/reference": "0.62.3",
-    "@glimmer/runtime": "0.62.3",
-    "@glimmer/validator": "0.62.3",
+    "@glimmer/global-context": "0.63.5",
+    "@glimmer/interfaces": "0.63.5",
+    "@glimmer/node": "0.63.5",
+    "@glimmer/opcode-compiler": "0.63.5",
+    "@glimmer/program": "0.63.5",
+    "@glimmer/reference": "0.63.5",
+    "@glimmer/runtime": "0.63.5",
+    "@glimmer/validator": "0.63.5",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index e6d84453de6..f97ebbb6204 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -1,4 +1,4 @@
-import { OWNER } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { DEBUG } from '@glimmer/env';
@@ -498,7 +498,7 @@ moduleFor(
 
       let result = container.ownerInjection();
 
-      assert.equal(result[OWNER], owner, 'owner is properly included');
+      assert.equal(getOwner(result), owner, 'owner is properly included');
     }
 
     ['@test ownerInjection should be usable to create a service for testing'](assert) {
diff --git a/packages/@ember/-internals/container/tests/owner_test.js b/packages/@ember/-internals/container/tests/owner_test.js
index 33e10eecfa3..caa990de93d 100644
--- a/packages/@ember/-internals/container/tests/owner_test.js
+++ b/packages/@ember/-internals/container/tests/owner_test.js
@@ -1,4 +1,4 @@
-import { OWNER, getOwner, setOwner } from '@ember/-internals/owner';
+import { getOwner, setOwner } from '@ember/-internals/owner';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -13,8 +13,6 @@ moduleFor(
       setOwner(obj, owner);
 
       assert.strictEqual(getOwner(obj), owner, 'owner has been set');
-
-      assert.strictEqual(obj[OWNER], owner, 'owner has been set to the OWNER symbol');
     }
 
     ['@test getOwner deprecates using LEGACY_OWNER'](assert) {
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 482e47ae18f..64193dc5e0f 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -360,13 +360,10 @@
   @public
 */
 
+export { templateFactory as template, templateCacheCounters } from '@glimmer/opcode-compiler';
+export { setComponentTemplate, getComponentTemplate } from '@glimmer/runtime';
+
 export { default as RootTemplate } from './lib/templates/root';
-export {
-  default as template,
-  counters as templateCacheCounters,
-  Factory as TemplateFactory,
-  OwnedTemplate,
-} from './lib/template';
 export { default as Checkbox } from './lib/components/checkbox';
 export { default as TextField } from './lib/components/text-field';
 export { default as TextArea } from './lib/components/textarea';
@@ -408,5 +405,4 @@ export { capabilities } from './lib/component-managers/custom';
 export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
 export { helperCapabilities, HelperManager, invokeHelper } from './lib/helpers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
-export { setComponentTemplate, getComponentTemplate } from './lib/utils/component-template';
 export { CapturedRenderNode } from './lib/utils/debug-render-tree';
diff --git a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
index edfa5ebe686..ca251694fc4 100644
--- a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
+++ b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
@@ -1,4 +1,4 @@
-import { OwnedTemplateMeta } from '@ember/-internals/views';
+import { Owner } from '@ember/-internals/owner';
 import {
   CompileTimeComponent,
   CompileTimeResolver,
@@ -21,19 +21,19 @@ function isStaticComponentManager(
   return !capabilities.dynamicLayout;
 }
 
-export default class CompileTimeResolverImpl implements CompileTimeResolver<OwnedTemplateMeta> {
+export default class CompileTimeResolverImpl implements CompileTimeResolver<Owner> {
   constructor(private resolver: RuntimeResolver) {}
 
-  lookupHelper(name: string, referrer: OwnedTemplateMeta): Option<number> {
-    return this.resolver.lookupHelper(name, referrer);
+  lookupHelper(name: string, owner: Owner): Option<number> {
+    return this.resolver.lookupHelper(name, owner);
   }
 
-  lookupModifier(name: string, referrer: OwnedTemplateMeta): Option<number> {
-    return this.resolver.lookupModifier(name, referrer);
+  lookupModifier(name: string, owner: Owner): Option<number> {
+    return this.resolver.lookupModifier(name, owner);
   }
 
-  lookupComponent(name: string, referrer: OwnedTemplateMeta): Option<CompileTimeComponent> {
-    let definitionHandle = this.resolver.lookupComponentHandle(name, referrer);
+  lookupComponent(name: string, owner: Owner): Option<CompileTimeComponent> {
+    let definitionHandle = this.resolver.lookupComponentHandle(name, owner);
 
     if (definitionHandle === null) {
       return null;
@@ -55,15 +55,15 @@ export default class CompileTimeResolverImpl implements CompileTimeResolver<Owne
     return {
       handle: definitionHandle,
       capabilities,
-      compilable: manager.getStaticLayout(state, this.resolver),
+      compilable: manager.getStaticLayout(state),
     };
   }
 
-  lookupPartial(name: string, referrer: OwnedTemplateMeta): Option<number> {
-    return this.resolver.lookupPartial(name, referrer);
+  lookupPartial(name: string, owner: Owner): Option<number> {
+    return this.resolver.lookupPartial(name, owner);
   }
 
-  resolve(handle: number): OwnedTemplateMeta {
-    return this.resolver.resolve(handle);
+  resolve(): null {
+    return null;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 313bb87de38..12bc88cfcc6 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -10,12 +10,15 @@ import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
+  CompilableProgram,
   ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
   ElementOperations,
   Option,
   PreparedArguments,
+  Template,
+  TemplateFactory,
   VMArguments,
   WithDynamicLayout,
   WithDynamicTagName,
@@ -44,7 +47,7 @@ import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS } from '../component
 import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
-import { Factory as TemplateFactory, isTemplateFactory, OwnedTemplate } from '../template';
+import { isTemplateFactory } from '../template';
 import {
   createClassNameBindingRef,
   createSimpleClassNameBindingRef,
@@ -121,7 +124,7 @@ export default class CurlyComponentManager
     WithStaticLayout<ComponentStateBucket, DefinitionState, RuntimeResolver>,
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket> {
-  protected templateFor(component: Component): OwnedTemplate {
+  protected templateFor(component: Component): Template {
     let { layout, layoutName } = component;
     let owner = getOwner(component);
 
@@ -145,11 +148,11 @@ export default class CurlyComponentManager
     return factory(owner);
   }
 
-  getStaticLayout(state: DefinitionState, _resolver: RuntimeResolver) {
+  getStaticLayout(state: DefinitionState): CompilableProgram {
     return unwrapTemplate(state.template!).asLayout();
   }
 
-  getDynamicLayout(bucket: ComponentStateBucket) {
+  getDynamicLayout(bucket: ComponentStateBucket): Template {
     let component = bucket.component;
     let template = this.templateFor(component);
 
@@ -636,7 +639,7 @@ export class CurlyComponentDefinition implements ComponentDefinition {
   constructor(
     public name: string,
     public ComponentClass: any,
-    public template?: OwnedTemplate,
+    public template?: Template,
     public args?: CurriedArgs
   ) {
     this.state = {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 2538dc4d01c..5e5a932d4d1 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -9,6 +9,7 @@ import {
   Destroyable,
   Dict,
   Option,
+  Template,
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
@@ -17,7 +18,6 @@ import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
-import { OwnedTemplate } from '../template';
 import { argsProxyFor } from '../utils/args-proxy';
 import { buildCapabilities, InternalCapabilities } from '../utils/managers';
 import AbstractComponentManager from './abstract';
@@ -81,7 +81,7 @@ export function capabilities<Version extends keyof OptionalCapabilities>(
 export interface DefinitionState<ComponentInstance> {
   name: string;
   ComponentClass: Factory<ComponentInstance>;
-  template: OwnedTemplate;
+  template: Template;
 }
 
 export interface ManagerDelegate<ComponentInstance> {
@@ -302,7 +302,7 @@ export class CustomManagerDefinition<ComponentInstance> implements ComponentDefi
     public name: string,
     public ComponentClass: Factory<ComponentInstance>,
     public delegate: ManagerDelegate<ComponentInstance>,
-    public template: OwnedTemplate
+    public template: Template
   ) {
     this.state = {
       name,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts b/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
index 2b198ecae0f..be3056a75bf 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
@@ -1,6 +1,5 @@
 import { Factory } from '@ember/-internals/owner';
-import { ComponentCapabilities } from '@glimmer/interfaces';
-import { OwnedTemplate } from '../template';
+import { ComponentCapabilities, Template } from '@glimmer/interfaces';
 import { Component } from '../utils/curly-component-state-bucket';
 
 export default interface DefinitionState {
@@ -10,5 +9,5 @@ export default interface DefinitionState {
     Component,
     { create(props?: any): Component; positionalParams: string | string[] | undefined | null }
   >;
-  template?: OwnedTemplate;
+  template?: Template;
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index 67b4dd15812..b3d65a72461 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -7,6 +7,7 @@ import {
   ComponentDefinition,
   Destroyable,
   DynamicScope,
+  Template,
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
@@ -16,7 +17,6 @@ import { _WeakSet, unwrapTemplate } from '@glimmer/util';
 import InternalComponent from '../components/internal';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
-import { OwnedTemplate } from '../template';
 import AbstractComponentManager from './abstract';
 
 const CAPABILITIES: ComponentCapabilities = {
@@ -36,7 +36,7 @@ const CAPABILITIES: ComponentCapabilities = {
 
 export interface InternalDefinitionState {
   ComponentClass: typeof InternalComponent;
-  layout: OwnedTemplate;
+  layout: Template;
 }
 
 export interface InternalComponentState {
@@ -51,7 +51,7 @@ export class InternalComponentDefinition
   constructor(
     public manager: InternalManager,
     ComponentClass: typeof InternalComponent,
-    layout: OwnedTemplate
+    layout: Template
   ) {
     this.state = { ComponentClass, layout };
   }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 355fbe3f4a4..7cbc167c58c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -7,12 +7,12 @@ import {
   ComponentDefinition,
   Destroyable,
   Option,
+  TemplateFactory,
   VMArguments,
   WithDynamicLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { TemplateFactory } from '../..';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
 import AbstractManager from './abstract';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 486d095f6f0..813c9395047 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -11,6 +11,7 @@ import {
   Destroyable,
   ElementOperations,
   Option,
+  Template,
   VMArguments,
   WithDynamicTagName,
   WithStaticLayout,
@@ -23,7 +24,6 @@ import { SimpleElement } from '@simple-dom/interface';
 import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
-import { OwnedTemplate } from '../template';
 import { OutletState } from '../utils/outlet';
 import OutletView from '../views/outlet';
 import AbstractManager from './abstract';
@@ -44,7 +44,7 @@ export interface OutletDefinitionState {
   ref: Reference<OutletState | undefined>;
   name: string;
   outlet: string;
-  template: OwnedTemplate;
+  template: Template;
   controller: unknown;
   model: unknown;
 }
@@ -148,7 +148,7 @@ class OutletComponentManager
     return name;
   }
 
-  getStaticLayout({ template }: OutletDefinitionState, _resolver: RuntimeResolver) {
+  getStaticLayout({ template }: OutletDefinitionState) {
     // The router has already resolved the template
     return unwrapTemplate(template).asLayout();
   }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index 53a08ce1472..ba7907c82d1 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -4,6 +4,7 @@ import {
   ComponentCapabilities,
   ComponentDefinition,
   Option,
+  Template,
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
@@ -12,7 +13,6 @@ import { registerDestructor } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { EmberVMEnvironment } from '../environment';
 import RuntimeResolver from '../resolver';
-import { OwnedTemplate } from '../template';
 import AbstractManager from './abstract';
 
 const CAPABILITIES: ComponentCapabilities = {
@@ -115,7 +115,7 @@ const MANAGER = new TemplateOnlyComponentManager();
 
 export interface TemplateOnlyComponentDefinitionState {
   name: string;
-  template: OwnedTemplate;
+  template: Template;
 }
 
 export class TemplateOnlyComponentDefinition
@@ -127,7 +127,7 @@ export class TemplateOnlyComponentDefinition
       TemplateOnlyComponentManager
     > {
   manager = MANAGER;
-  constructor(public name: string, public template: OwnedTemplate) {}
+  constructor(public name: string, public template: Template) {}
 
   get state(): TemplateOnlyComponentDefinitionState {
     return this;
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index c58bf049f4b..485635d3925 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -7,10 +7,9 @@ import { assert, deprecate, warn } from '@ember/debug';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
-import { Environment } from '@glimmer/interfaces';
+import { Environment, Template } from '@glimmer/interfaces';
 import { EnvironmentDelegate } from '@glimmer/runtime';
 import { setTrackingTransactionEnv } from '@glimmer/validator';
-import { OwnedTemplate } from './template';
 import DebugRenderTree from './utils/debug-render-tree';
 import toIterator from './utils/iterator';
 import { isHTMLSafe } from './utils/string';
@@ -87,7 +86,7 @@ if (DEBUG) {
 
 export interface CompilerFactory {
   id: string;
-  new (template: OwnedTemplate): any;
+  new (template: Template): any;
 }
 
 export class EmberEnvironmentExtra {
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index d66aaacb783..1619f132970 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,6 +1,6 @@
 import { ENV } from '@ember/-internals/environment';
 import { getOwner, Owner } from '@ember/-internals/owner';
-import { getViewElement, getViewId, OwnedTemplateMeta } from '@ember/-internals/views';
+import { getViewElement, getViewId } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
@@ -14,6 +14,8 @@ import {
   RenderResult,
   RuntimeContext,
   SyntaxCompilationContext,
+  Template,
+  TemplateFactory,
 } from '@glimmer/interfaces';
 import { syntaxCompilationContext } from '@glimmer/opcode-compiler';
 import { artifacts } from '@glimmer/program';
@@ -41,7 +43,6 @@ import { NodeDOMTreeConstruction } from './dom';
 import { EmberEnvironmentDelegate, EmberEnvironmentExtra } from './environment';
 import RuntimeResolver from './resolver';
 import { populateMacros } from './syntax';
-import { Factory as TemplateFactory, OwnedTemplate } from './template';
 import { Component } from './utils/curly-component-state-bucket';
 import { OutletState } from './utils/outlet';
 import OutletView from './views/outlet';
@@ -114,9 +115,9 @@ class RootState {
 
   constructor(
     public root: Component | OutletView,
-    public runtime: RuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>,
+    public runtime: RuntimeContext<EmberEnvironmentExtra>,
     context: SyntaxCompilationContext,
-    template: OwnedTemplate,
+    template: Template,
     self: Reference<unknown>,
     parentElement: SimpleElement,
     dynamicScope: DynamicScope,
@@ -271,7 +272,7 @@ interface ViewRegistry {
 }
 
 export abstract class Renderer {
-  private _rootTemplate: OwnedTemplate;
+  private _rootTemplate: Template;
   private _viewRegistry: ViewRegistry;
   private _destinedForDOM: boolean;
   private _roots: RootState[];
@@ -280,7 +281,7 @@ export abstract class Renderer {
   private _inRenderTransaction = false;
 
   private _context: SyntaxCompilationContext;
-  private _runtime: RuntimeContext<OwnedTemplateMeta, EmberEnvironmentExtra>;
+  private _runtime: RuntimeContext<EmberEnvironmentExtra>;
 
   private _lastRevision = -1;
   private _destroyed = false;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 828f08568cb..a14e6d7b899 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,7 +1,6 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
-import { OwnedTemplateMeta } from '@ember/-internals/views';
 import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import { isTemplateOnlyComponent } from '@ember/component/template-only';
 import { assert, deprecate } from '@ember/debug';
@@ -14,9 +13,11 @@ import {
   Option,
   PartialDefinition,
   RuntimeResolver,
+  Template,
+  TemplateFactory,
 } from '@glimmer/interfaces';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
-import { getDynamicVar, ModifierDefinition } from '@glimmer/runtime';
+import { getComponentTemplate, getDynamicVar, ModifierDefinition } from '@glimmer/runtime';
 import { CurlyComponentDefinition } from './component-managers/curly';
 import { CustomManagerDefinition } from './component-managers/custom';
 import { InternalComponentDefinition, isInternalManager } from './component-managers/internal';
@@ -52,8 +53,6 @@ import { CustomModifierDefinition } from './modifiers/custom';
 import OnModifierManager from './modifiers/on';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
-import { Factory as TemplateFactory, OwnedTemplate } from './template';
-import { getComponentTemplate } from './utils/component-template';
 import { getComponentManager, getHelperManager, getModifierManager } from './utils/managers';
 
 function instrumentationPayload(name: string) {
@@ -69,7 +68,7 @@ function componentFor(
   return owner.factoryFor(fullName, options) || null;
 }
 
-function layoutFor(name: string, owner: Owner, options?: LookupOptions): Option<OwnedTemplate> {
+function layoutFor(name: string, owner: Owner, options?: LookupOptions): Option<Template> {
   let templateFullName = `template:components/${name}`;
 
   return owner.lookup(templateFullName, options) || null;
@@ -206,7 +205,7 @@ interface IBuiltInModifiers {
   [name: string]: ModifierDefinition | undefined;
 }
 
-export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplateMeta> {
+export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
   public isInteractive: boolean;
 
   private handles: any[] = [
@@ -238,8 +237,8 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
    * public componentDefHandleCount = 0;
    * Called while executing Append Op.PushDynamicComponentManager if string
    */
-  lookupComponent(name: string, meta: OwnedTemplateMeta): Option<ComponentDefinition> {
-    let handle = this.lookupComponentHandle(name, meta);
+  lookupComponent(name: string, owner: Owner): Option<ComponentDefinition> {
+    let handle = this.lookupComponentHandle(name, owner);
     if (handle === null) {
       assert(
         `Could not find component named "${name}" (no component or template with that name was found)`
@@ -249,9 +248,9 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     return this.resolve(handle);
   }
 
-  lookupComponentHandle(name: string, meta: OwnedTemplateMeta) {
+  lookupComponentHandle(name: string, owner: Owner) {
     let nextHandle = this.handles.length;
-    let handle = this.handle(this._lookupComponentDefinition(name, meta));
+    let handle = this.handle(this._lookupComponentDefinition(name, owner));
 
     assert(
       'Could not find component `<TextArea />` (did you mean `<Textarea />`?)',
@@ -275,9 +274,9 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
   /**
    * Called by CompileTimeLookup compiling Unknown or Helper OpCode
    */
-  lookupHelper(name: string, meta: OwnedTemplateMeta): Option<number> {
+  lookupHelper(name: string, owner: Owner): Option<number> {
     let nextHandle = this.handles.length;
-    let helper = this._lookupHelper(name, meta);
+    let helper = this._lookupHelper(name, owner);
     if (helper !== null) {
       let handle = this.handle(helper);
 
@@ -292,16 +291,16 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
   /**
    * Called by CompileTimeLookup compiling the
    */
-  lookupModifier(name: string, meta: OwnedTemplateMeta): Option<number> {
-    return this.handle(this._lookupModifier(name, meta));
+  lookupModifier(name: string, owner: Owner): Option<number> {
+    return this.handle(this._lookupModifier(name, owner));
   }
 
   /**
    * Called by CompileTimeLookup to lookup partial
    */
-  lookupPartial(name: string, meta: OwnedTemplateMeta): Option<number> {
+  lookupPartial(name: string, owner: Owner): Option<number> {
     if (PARTIALS) {
-      let partial = this._lookupPartial(name, meta);
+      let partial = this._lookupPartial(name, owner);
       return this.handle(partial);
     } else {
       return null;
@@ -327,10 +326,10 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     return handle;
   }
 
-  private _lookupHelper(_name: string, meta: OwnedTemplateMeta): Option<Helper> {
+  private _lookupHelper(_name: string, owner: Owner): Option<Helper> {
     assert(
       `You attempted to overwrite the built-in helper "${_name}" which is not allowed. Please rename the helper.`,
-      !(this.builtInHelpers[_name] && meta.owner.hasRegistration(`helper:${_name}`))
+      !(this.builtInHelpers[_name] && owner.hasRegistration(`helper:${_name}`))
     );
 
     const helper = this.builtInHelpers[_name];
@@ -338,7 +337,6 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
       return helper;
     }
 
-    let owner = meta.owner;
     let name = _name;
 
     const factory =
@@ -369,19 +367,17 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     return customHelper(manager, isClassicHelperManager(manager) ? factory : factory.class);
   }
 
-  private _lookupPartial(name: string, meta: OwnedTemplateMeta): PartialDefinition {
-    let owner = meta.owner;
+  private _lookupPartial(name: string, owner: Owner): PartialDefinition {
     let templateFactory = lookupPartial(name, owner);
     let template = templateFactory(owner);
 
     return new PartialDefinitionImpl(name, template);
   }
 
-  private _lookupModifier(name: string, meta: OwnedTemplateMeta) {
+  private _lookupModifier(name: string, owner: Owner) {
     let builtin = this.builtInModifiers[name];
 
     if (builtin === undefined) {
-      let owner = meta.owner;
       let modifier = owner.factoryFor<unknown, FactoryClass>(`modifier:${name}`);
       if (modifier !== undefined) {
         let manager = getModifierManager(owner, modifier.class!);
@@ -393,19 +389,15 @@ export default class RuntimeResolverImpl implements RuntimeResolver<OwnedTemplat
     return builtin;
   }
 
-  private _lookupComponentDefinition(
-    _name: string,
-    meta: OwnedTemplateMeta
-  ): Option<ComponentDefinition> {
+  private _lookupComponentDefinition(_name: string, owner: Owner): Option<ComponentDefinition> {
     let name = _name;
-    let owner = meta.owner;
 
     let pair = lookupComponentPair(owner, name);
     if (pair === null) {
       return null;
     }
 
-    let layout: OwnedTemplate | undefined;
+    let layout: Template | undefined;
     let key: object;
 
     if (pair.component === null) {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax.ts b/packages/@ember/-internals/glimmer/lib/syntax.ts
index 9988b23296b..601745012e4 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax.ts
@@ -1,4 +1,4 @@
-import { OwnedTemplateMeta } from '@ember/-internals/views';
+import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import {
   Core,
@@ -27,7 +27,7 @@ function refineInlineSyntax(
   hash: Option<Core.Hash>,
   context: MacroContext
 ): StatementCompileActions | Unhandled {
-  let component = context.resolver.lookupComponent(name, context.meta.referrer);
+  let component = context.resolver.lookupComponent(name, context.meta.owner!);
 
   if (component !== null) {
     return staticComponent(component, [
@@ -47,7 +47,7 @@ function refineBlockSyntax(
   blocks: NamedBlocks,
   context: MacroContext
 ): StatementCompileActions {
-  let handle = context.resolver.lookupComponent(name, context.meta.referrer);
+  let handle = context.resolver.lookupComponent(name, context.meta.owner!);
 
   if (handle !== null) {
     return staticComponent(handle, [params, hashToArgs(hash), blocks]);
@@ -55,14 +55,15 @@ function refineBlockSyntax(
 
   assert(
     `A component or helper named "${name}" could not be found`,
-    (context.meta.referrer as OwnedTemplateMeta).owner.hasRegistration(`helper:${name}`)
+    (context.meta.owner as Owner).hasRegistration(`helper:${name}`)
   );
 
   assert(
     `Helpers may not be used in the block form, for example {{#${name}}}{{/${name}}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (${name})}}{{/if}}.`,
     !(() => {
       const resolver = context.resolver['resolver'];
-      const { owner } = context.meta.referrer as OwnedTemplateMeta;
+      const owner = context.meta.owner as Owner;
+
       if (name === 'component' || resolver['builtInHelpers'][name]) {
         return true;
       }
diff --git a/packages/@ember/-internals/glimmer/lib/template.ts b/packages/@ember/-internals/glimmer/lib/template.ts
index a467a1df9d1..6b3fb56d8f6 100644
--- a/packages/@ember/-internals/glimmer/lib/template.ts
+++ b/packages/@ember/-internals/glimmer/lib/template.ts
@@ -1,56 +1,10 @@
-import { Owner } from '@ember/-internals/owner';
-import { OwnedTemplateMeta, StaticTemplateMeta } from '@ember/-internals/views';
-import { SerializedTemplateWithLazyBlock, Template } from '@glimmer/interfaces';
-import { templateFactory } from '@glimmer/opcode-compiler';
+import { SerializedTemplateWithLazyBlock, Template, TemplateFactory } from '@glimmer/interfaces';
 
-export type StaticTemplate = SerializedTemplateWithLazyBlock<StaticTemplateMeta>;
-export type OwnedTemplate = Template<OwnedTemplateMeta>;
+export type StaticTemplate = SerializedTemplateWithLazyBlock;
+export type OwnedTemplate = Template;
 
-export function isTemplateFactory(template: OwnedTemplate | Factory): template is Factory {
+export function isTemplateFactory(
+  template: Template | TemplateFactory
+): template is TemplateFactory {
   return typeof template === 'function';
 }
-
-export function id(factory: Factory): string {
-  return factory.__id;
-}
-
-export function meta(factory: Factory): StaticTemplateMeta {
-  return factory.__meta;
-}
-
-export let counters = {
-  cacheHit: 0,
-  cacheMiss: 0,
-};
-
-export default function template(json: StaticTemplate): Factory {
-  let glimmerFactory = templateFactory(json);
-  let cache = new WeakMap<Owner, OwnedTemplate>();
-
-  const meta = glimmerFactory.meta as StaticTemplateMeta;
-
-  let factory = ((owner: Owner) => {
-    let result = cache.get(owner);
-
-    if (result === undefined) {
-      counters.cacheMiss++;
-      result = glimmerFactory.create(Object.assign({ owner }, meta));
-      cache.set(owner, result);
-    } else {
-      counters.cacheHit++;
-    }
-
-    return result;
-  }) as Factory;
-
-  factory.__id = glimmerFactory.id;
-  factory.__meta = meta;
-
-  return factory;
-}
-
-export interface Factory {
-  __id: string;
-  __meta: StaticTemplateMeta;
-  (owner: Owner): OwnedTemplate;
-}
diff --git a/packages/@ember/-internals/glimmer/lib/template_registry.ts b/packages/@ember/-internals/glimmer/lib/template_registry.ts
index eae0457aa94..6bc3f2fefc5 100644
--- a/packages/@ember/-internals/glimmer/lib/template_registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/template_registry.ts
@@ -1,9 +1,10 @@
-import { Factory } from './template';
+import { TemplateFactory } from '@glimmer/interfaces';
+
 // STATE within a module is frowned upon, this exists
 // to support Ember.TEMPLATES but shield ember internals from this legacy
 // global API.
 interface TemplatesRegistry {
-  [name: string]: Factory;
+  [name: string]: TemplateFactory;
 }
 let TEMPLATES: TemplatesRegistry = {};
 
@@ -15,7 +16,7 @@ export function getTemplates(): TemplatesRegistry {
   return TEMPLATES;
 }
 
-export function getTemplate(name: string): Factory | void {
+export function getTemplate(name: string): TemplateFactory | void {
   if (Object.prototype.hasOwnProperty.call(TEMPLATES, name)) {
     return TEMPLATES[name];
   }
@@ -25,6 +26,6 @@ export function hasTemplate(name: string): boolean {
   return Object.prototype.hasOwnProperty.call(TEMPLATES, name);
 }
 
-export function setTemplate(name: string, template: Factory): Factory {
+export function setTemplate(name: string, template: TemplateFactory): TemplateFactory {
   return (TEMPLATES[name] = template);
 }
diff --git a/packages/@ember/-internals/glimmer/lib/templates/component.d.ts b/packages/@ember/-internals/glimmer/lib/templates/component.d.ts
index 786bb5e91a8..30e2f374432 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/component.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/component.d.ts
@@ -1,3 +1,3 @@
-import { Factory } from '../template';
-declare const TEMPLATE: Factory;
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts b/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts
index 786bb5e91a8..30e2f374432 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts
@@ -1,3 +1,3 @@
-import { Factory } from '../template';
-declare const TEMPLATE: Factory;
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.d.ts b/packages/@ember/-internals/glimmer/lib/templates/input.d.ts
index 786bb5e91a8..30e2f374432 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.d.ts
@@ -1,3 +1,3 @@
-import { Factory } from '../template';
-declare const TEMPLATE: Factory;
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts b/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts
index 786bb5e91a8..30e2f374432 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts
@@ -1,3 +1,3 @@
-import { Factory } from '../template';
-declare const TEMPLATE: Factory;
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts b/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts
index 786bb5e91a8..30e2f374432 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts
@@ -1,3 +1,3 @@
-import { Factory } from '../template';
-declare const TEMPLATE: Factory;
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/root.d.ts b/packages/@ember/-internals/glimmer/lib/templates/root.d.ts
index 786bb5e91a8..30e2f374432 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/root.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/root.d.ts
@@ -1,3 +1,3 @@
-import { Factory } from '../template';
-declare const TEMPLATE: Factory;
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/component-template.ts b/packages/@ember/-internals/glimmer/lib/utils/component-template.ts
deleted file mode 100644
index deadffc69ef..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/component-template.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { toString } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
-import { Factory as TemplateFactory } from '../template';
-
-const TEMPLATES: WeakMap<object, TemplateFactory> = new WeakMap();
-
-const getPrototypeOf = Object.getPrototypeOf;
-
-export function setComponentTemplate(factory: TemplateFactory, obj: object) {
-  assert(
-    `Cannot call \`setComponentTemplate\` on \`${toString(obj)}\``,
-    obj !== null && (typeof obj === 'object' || typeof obj === 'function')
-  );
-
-  assert(
-    `Cannot call \`setComponentTemplate\` multiple times on the same class (\`${obj}\`)`,
-    !TEMPLATES.has(obj)
-  );
-
-  TEMPLATES.set(obj, factory);
-
-  return obj;
-}
-
-export function getComponentTemplate(obj: object): TemplateFactory | undefined {
-  let pointer = obj;
-  while (pointer !== undefined && pointer !== null) {
-    let template = TEMPLATES.get(pointer);
-
-    if (template !== undefined) {
-      return template;
-    }
-
-    pointer = getPrototypeOf(pointer);
-  }
-
-  return undefined;
-}
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 41f3fd2b631..ea78b2a748d 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,16 +1,15 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
-import { CapturedNamedArguments } from '@glimmer/interfaces';
+import { CapturedNamedArguments, Template, TemplateFactory } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
 import { EmberVMEnvironment } from '../environment';
 import { Renderer } from '../renderer';
-import { Factory as TemplateFactory, OwnedTemplate } from '../template';
 
 export interface Component {
   _debugContainerKey: string;
   _transitionTo(name: string): void;
-  layout?: TemplateFactory | OwnedTemplate;
+  layout?: TemplateFactory | Template;
   layoutName?: string;
   attributeBindings: Array<string>;
   classNames: Array<string>;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
index a47ad15d265..5fcdb174042 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
@@ -1,9 +1,8 @@
 import { assert } from '@ember/debug';
-import { Arguments, Bounds, CapturedArguments, Option } from '@glimmer/interfaces';
+import { Arguments, Bounds, CapturedArguments, Option, Template } from '@glimmer/interfaces';
 import { reifyArgs } from '@glimmer/runtime';
 import { expect, Stack, unwrapTemplate } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
-import { OwnedTemplate } from '../template';
 
 export type RenderNodeType = 'outlet' | 'engine' | 'route-template' | 'component';
 
@@ -12,7 +11,7 @@ export interface RenderNode {
   name: string;
   args: CapturedArguments;
   instance: unknown;
-  template?: OwnedTemplate;
+  template?: Template;
 }
 
 interface InternalRenderNode<T extends object> extends RenderNode {
@@ -97,7 +96,7 @@ export default class DebugRenderTree<Bucket extends object = object> {
   }
 
   // for dynamic layouts
-  setTemplate(state: Bucket, template: OwnedTemplate): void {
+  setTemplate(state: Bucket, template: Template): void {
     this.nodeFor(state).template = template;
   }
 
@@ -199,7 +198,7 @@ export default class DebugRenderTree<Bucket extends object = object> {
   }
 
   private captureTemplate({ template }: InternalRenderNode<Bucket>): Option<string> {
-    return (template && unwrapTemplate(template).referrer.moduleName) || null;
+    return (template && unwrapTemplate(template).moduleName) || null;
   }
 
   private captureBounds(node: InternalRenderNode<Bucket>): CapturedRenderNode['bounds'] {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
index 764398a819d..df7e8506007 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
@@ -1,5 +1,5 @@
 import { Owner } from '@ember/-internals/owner';
-import { Factory as TemplateFactory, OwnedTemplate } from '../template';
+import { Template, TemplateFactory } from '@glimmer/interfaces';
 
 export interface RenderState {
   /**
@@ -37,7 +37,7 @@ export interface RenderState {
   /**
    * template (the layout of the outlet component)
    */
-  template: OwnedTemplate | TemplateFactory | undefined;
+  template: Template | TemplateFactory | undefined;
 }
 
 export interface Outlets {
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 11b1cc71c55..7f762113471 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,12 +1,12 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import { schedule } from '@ember/runloop';
+import { Template } from '@glimmer/interfaces';
 import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
 import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { OutletDefinitionState } from '../component-managers/outlet';
 import { Renderer } from '../renderer';
-import { OwnedTemplate } from '../template';
 import { OutletState } from '../utils/outlet';
 
 export interface BootEnvironment {
@@ -49,7 +49,7 @@ export default class OutletView {
     private _environment: BootEnvironment,
     public renderer: Renderer,
     public owner: Owner,
-    public template: OwnedTemplate
+    public template: Template
   ) {
     let outletStateTag = createTag();
     let outletState: OutletState = {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
index ac744699f6c..52041e5efe0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -1,3 +1,4 @@
+import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
@@ -37,39 +38,49 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'hello' });
     }
 
-    '@test calling it with primitives asserts'() {
-      expectAssertion(() => {
+    '@test calling it with primitives asserts'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), null);
       }, /Cannot call `setComponentTemplate` on `null`/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), undefined);
       }, /Cannot call `setComponentTemplate` on `undefined`/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), true);
       }, /Cannot call `setComponentTemplate` on `true`/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), false);
       }, /Cannot call `setComponentTemplate` on `false`/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), 123);
       }, /Cannot call `setComponentTemplate` on `123`/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), 'foo');
       }, /Cannot call `setComponentTemplate` on `foo`/);
 
       if (HAS_NATIVE_SYMBOL) {
-        expectAssertion(() => {
+        assert.throws(() => {
           setComponentTemplate(compile('foo'), Symbol('foo'));
         }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
       }
     }
 
-    '@test calling it twice on the same object asserts'() {
+    '@test calling it twice on the same object asserts'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
       let Thing = setComponentTemplate(
         compile('hello'),
         Component.extend().reopenClass({
@@ -79,9 +90,9 @@ moduleFor(
         })
       );
 
-      expectAssertion(() => {
+      assert.throws(() => {
         setComponentTemplate(compile('foo'), Thing);
-      }, /Cannot call `setComponentTemplate` multiple times on the same class \(`Thing`\)/);
+      }, /Cannot call `setComponentTemplate` multiple times on the same class \(`Class`\)/);
     }
 
     '@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index f7c1fe92a67..565ad7c1615 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,3 +1,5 @@
+import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/runtime';
+
 /**
 @module @ember/application
 */
@@ -35,11 +37,10 @@ export interface Owner {
   routable?: boolean;
 }
 
-import { enumerableSymbol, symbol } from '@ember/-internals/utils';
+import { enumerableSymbol } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
 
 export const LEGACY_OWNER: unique symbol = enumerableSymbol('LEGACY_OWNER') as any;
-export const OWNER: unique symbol = symbol('OWNER') as any;
 
 /**
   Framework objects in an Ember application (components, services, routes, etc.)
@@ -86,7 +87,7 @@ export const OWNER: unique symbol = symbol('OWNER') as any;
   @public
 */
 export function getOwner(object: any): Owner {
-  let owner = object[OWNER];
+  let owner = glimmerGetOwner(object) as Owner;
 
   if (owner === undefined) {
     owner = object[LEGACY_OWNER];
@@ -121,6 +122,6 @@ export function getOwner(object: any): Owner {
   @public
 */
 export function setOwner(object: any, owner: Owner): void {
-  object[OWNER] = owner;
+  glimmerSetOwner(object, owner);
   object[LEGACY_OWNER] = owner;
 }
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 0411715f2b5..36e029c0018 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1,4 +1,3 @@
-import { OwnedTemplate, TemplateFactory } from '@ember/-internals/glimmer';
 import {
   addObserver,
   computed,
@@ -28,6 +27,7 @@ import { assign } from '@ember/polyfills';
 import { once } from '@ember/runloop';
 import { classify } from '@ember/string';
 import { DEBUG } from '@glimmer/env';
+import { Template, TemplateFactory } from '@glimmer/interfaces';
 import {
   InternalRouteInfo,
   PARAMS_SYMBOL,
@@ -1925,7 +1925,7 @@ export interface RenderOptions {
   name: string;
   controller: unknown;
   model: unknown;
-  template: OwnedTemplate;
+  template: Template;
 }
 
 interface PartialRenderOptions {
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index 25b47e8d1d5..fc5e779f97a 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -1,8 +1,8 @@
-import { OWNER } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import { window } from '@ember/-internals/browser-environment';
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
+import { setOwner } from '@glimmer/runtime';
 import AutoLocation from '../../lib/location/auto_location';
 import { getHistoryPath, getHashPath } from '../../lib/location/auto_location';
 import HistoryLocation from '../../lib/location/history_location';
@@ -46,12 +46,15 @@ function createLocation(location, history) {
   owner.register('location:hash', HashLocation);
   owner.register('location:none', NoneLocation);
 
-  let autolocation = AutoLocation.create({
-    [OWNER]: owner,
+  let props = {
     location: location,
     history: history,
     global: {},
-  });
+  };
+
+  setOwner(props, owner);
+
+  let autolocation = AutoLocation.create(props);
 
   return autolocation;
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 0db14072c9b..affd39636e9 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -3,7 +3,7 @@
 */
 
 import { getFactoryFor, setFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
-import { getOwner, LEGACY_OWNER, OWNER } from '@ember/-internals/owner';
+import { getOwner, LEGACY_OWNER } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import {
   guidFor,
@@ -31,7 +31,7 @@ import ActionHandler from '../mixins/action_handler';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
-import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/runtime';
+import { destroy, isDestroying, isDestroyed, registerDestructor, OWNER } from '@glimmer/runtime';
 
 const reopen = Mixin.prototype.reopen;
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
index 7119e9616e3..ed2b6c17680 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
@@ -1,4 +1,4 @@
-import { OWNER, getOwner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { Container, Registry } from '@ember/-internals/container';
 import ContainerProxy from '../../lib/mixins/container_proxy';
 import EmberObject from '../../lib/system/object';
@@ -23,7 +23,7 @@ moduleFor(
     ['@test provides ownerInjection helper method'](assert) {
       let result = this.instance.ownerInjection();
 
-      assert.equal(result[OWNER], this.instance, 'returns an object with the OWNER symbol');
+      assert.equal(getOwner(result), this.instance, 'returns an object with an associated owner');
     }
 
     ['@test actions queue completes before destruction'](assert) {
diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts
index 8ea560ad229..b495f196b3e 100644
--- a/packages/@ember/-internals/views/index.d.ts
+++ b/packages/@ember/-internals/views/index.d.ts
@@ -1,19 +1,6 @@
-import { Template, Option } from '@glimmer/interfaces';
-import { Factory, Owner } from '@ember/-internals/owner';
-import { TemplateFactory } from '@ember/-internals/glimmer';
+import { Option } from '@glimmer/interfaces';
 import { SimpleElement } from '@simple-dom/interface';
 
-export interface StaticTemplateMeta {
-  moduleName: string;
-  managerId?: string;
-}
-
-export interface OwnedTemplateMeta extends StaticTemplateMeta {
-  owner: Owner;
-  moduleName: string;
-  managerId?: string;
-}
-
 export const ActionSupport: any;
 export const ChildViewsSupport: any;
 export const ClassNamesSupport: any;
diff --git a/yarn.lock b/yarn.lock
index 36a9a75a885..fdd214fdb22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -929,152 +929,152 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.62.3.tgz#10b9dcddeed47fd151f4af24c3c4ff02fd44159c"
-  integrity sha512-Ouo3BFS1ASJ4HdLvqie5VeNHfZAwDuWz4kVlDIMBTTJxcWZ0SAlCCfRHBTwiSrJ+1vy0Bd12iGsRzyFkTRa/Vg==
-  dependencies:
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/syntax" "0.62.3"
-    "@glimmer/util" "0.62.3"
-    "@glimmer/wire-format" "0.62.3"
+"@glimmer/compiler@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.63.5.tgz#4b3758a2da55963ddf545464241e9d8610787055"
+  integrity sha512-uoAejXrPPkfU9gdxtIuSasupEijChFu+xaiMFCtuLS3glFEwOoRYkjAxxwK37M2JbETs8ImN2n1SEFl03stI5g==
+  dependencies:
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/syntax" "0.63.5"
+    "@glimmer/util" "0.63.5"
+    "@glimmer/wire-format" "0.63.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.62.3.tgz#dce2aa494319820198b955479915a39c86ddee3b"
-  integrity sha512-QCRxuWgn9OXarktjrLLKiSU+0Z8fYh756uqmuFVmlV0egiu7bt6MaPDBWG7eZBfAoUQ7H+DYrtXsYhbUYcPh3A==
+"@glimmer/encoder@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.63.5.tgz#957c4a57d9521ffc38ecf9b1640c29b7718701d0"
+  integrity sha512-H6SbeEERMU6sYW8TPKjVfx1NHOX1JFCMyyd+g41t+UuLd8lR5DpVrkoV4kIR6X/7ZMB3lQOqdC8RfkI9E2VHfA==
   dependencies:
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/vm" "0.62.3"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/vm" "0.63.5"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.62.3.tgz#d77f03d26aea0cb2a2275d0b7d71f52fee7ca9d5"
-  integrity sha512-TjjiuR0urcL2wrY3DMoXkU4838UbG2T9MIUE9Wsh1W9XwoyFMz6CqMOgq2/k7dASYzyAY2dhQB6Y+rEHibAZgA==
+"@glimmer/global-context@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.63.5.tgz#4a8da4fee97d13a376549ceecebd16a5ffc8c4f6"
+  integrity sha512-xYsptoxo9ROos83oxG8ZT4e8T2QgsH+FdZxsPZNTN4WLumU2LTkxJQaiosW9q294IVY/mIVhZAohJkfNCvSwug==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.62.3.tgz#8ad314d66d1a43197663509806e1cc2088db6741"
-  integrity sha512-bhbKs5vfys4mo+LRxcA4bfMl2zGn+43et4uAzsYppuNPSkP7rwdPD+mLXTYQRkTm0G5K4SnyxDPxMsWCWUNuTw==
+"@glimmer/interfaces@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.5.tgz#ac614608ea618022b61b5d09e66089ceffc26e6e"
+  integrity sha512-ogozdIFOSxJ2QBU2NE0pk993qbb/zY1wF4BFL1ZN2GrfDDdaYC5vmDSs+RpbbF6JAjrt4kADXlOocs7dBiX4iQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.62.3.tgz#05f8b09b4eac5b6c8196c7601747ca88c4f147a0"
-  integrity sha512-VeQN5peF20MiSLPkWjFqceLCrbfnYAopCoDCfZwubgNBcEESvbQGQ0fqKNs6pMbkhD4n22usJWiCAFQbMCOgkA==
+"@glimmer/low-level@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.63.5.tgz#f10528b1155a7e030b84eb7660150a08b25901b2"
+  integrity sha512-BfhbHnnWoxs2gO9DDZv4T/Qvt+1vl5+mL7Jb/vMgsSJbAcjbjAnkAeDGnRCmxRU1t4yGtQ8yFJV48H7VtnoYWg==
 
-"@glimmer/node@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.62.3.tgz#cb571804b7daaca1b314dc0b493d95dc9d2f3e1a"
-  integrity sha512-ru0shgN6l2xzFE5aCchURXYXdsDbLtkm9qm3nV5AIjNhW9/Z2pnmVwwDysBN5PbXIyF0hboRpDJJ0fgV9ml0Ug==
+"@glimmer/node@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.63.5.tgz#2ade61ef07577639afaa736c1a769c33960229f9"
+  integrity sha512-Ee+CQDZyMeiU+gXCs4PCXdWSpaMI/SGfNPboVLo3rYwxSARcnvw2s4O57kvrkgurRIqnubHouiVXLYIOtssbpA==
   dependencies:
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/runtime" "0.62.3"
-    "@glimmer/util" "0.62.3"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/runtime" "0.63.5"
+    "@glimmer/util" "0.63.5"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.62.3.tgz#f0a1f2d4984aa4389b7510e4da0642cbfc94caab"
-  integrity sha512-7ACPdDcT0Aa3RALnMxyxinpVnOQS1jVNgilNtryrocHsaIGRxuRj+GvvwJdCiP/xI4OIzMM30qcDeyKru9TtIw==
-  dependencies:
-    "@glimmer/encoder" "0.62.3"
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/program" "0.62.3"
-    "@glimmer/reference" "0.62.3"
-    "@glimmer/util" "0.62.3"
-    "@glimmer/vm" "0.62.3"
-    "@glimmer/wire-format" "0.62.3"
-
-"@glimmer/program@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.62.3.tgz#eb22f1864b35d4e626733b099ed1058342e09d84"
-  integrity sha512-fVfM/myEkGERug/d6O3iVxIInTcQ2Tsr4Lp21UR+aEeDsC99bnfuZjTtG1vvmVeduraqjxvStS/9GBb/zdOJ8Q==
-  dependencies:
-    "@glimmer/encoder" "0.62.3"
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/util" "0.62.3"
-
-"@glimmer/reference@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.62.3.tgz#23c6861eaad57def8d8ad54c94aefd1f6fa5541e"
-  integrity sha512-pAyZTFhswKyXOyQzcjh1DA7BMH8WNqjswfeAu8V98b4vfAYb2JYH3IdUadTDwsM5vbYou4e01+dFSAaPHex/lg==
+"@glimmer/opcode-compiler@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.63.5.tgz#dcfa6e852c70a6d229f0f45cc80400ac5ff535ec"
+  integrity sha512-pWWE0zg2rPHIqtyQaVanVQpnPIgLVFKq9GWqiyvFc+4+VXKUPaNWjVL5v+ITZNSGkvkCzmhtMmNNfMb/Om24BA==
+  dependencies:
+    "@glimmer/encoder" "0.63.5"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/program" "0.63.5"
+    "@glimmer/reference" "0.63.5"
+    "@glimmer/util" "0.63.5"
+    "@glimmer/vm" "0.63.5"
+    "@glimmer/wire-format" "0.63.5"
+
+"@glimmer/program@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.63.5.tgz#3cc307327ddde72fe7924f0fc6bd32e56384d7b7"
+  integrity sha512-MgHGklwTDHp9kD5YEyyea7cWLp6Q4B+ycylpL9ldNyQvIuocW/+QzmTb9Hd/EJ7KAVDMRxy451iWJuzItBYxAg==
+  dependencies:
+    "@glimmer/encoder" "0.63.5"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
+
+"@glimmer/reference@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.5.tgz#bc99049c9400994641dea054e58bff61e1e31187"
+  integrity sha512-uE5O5eFcaKedomCDfendXjA7Sh9MYZG5RhadSSA8iD6TUlXxdpIe++tcRzNQOcMwHNbh+Bx7jX50jxtA1ShibQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.62.3"
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/util" "0.62.3"
-    "@glimmer/validator" "0.62.3"
+    "@glimmer/global-context" "0.63.5"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
+    "@glimmer/validator" "0.63.5"
 
-"@glimmer/runtime@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.62.3.tgz#1c254b58429f00e12005540a5da64ef60808de30"
-  integrity sha512-Ru8zDt0bNWtjdj/bdCdJ0rZSKVITdE3s3RRfMqpBRgbKwVWIXWfpJRcOteHcQnMIsAXs6QqE4st9hZTaoNOLGQ==
+"@glimmer/runtime@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.63.5.tgz#256a4e96e36185f1bf01b7eb3310f046b0222580"
+  integrity sha512-EqUS4BMTLtCgS/uGQKySVycHTLdaYBuDCvj1/OdjiFoqZlB0AqoJ65LBYxIqZuNkSUGom0ZVXuhcFcf2ZgjKdw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.62.3"
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/low-level" "0.62.3"
-    "@glimmer/program" "0.62.3"
-    "@glimmer/reference" "0.62.3"
-    "@glimmer/util" "0.62.3"
-    "@glimmer/validator" "0.62.3"
-    "@glimmer/vm" "0.62.3"
-    "@glimmer/wire-format" "0.62.3"
+    "@glimmer/global-context" "0.63.5"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/low-level" "0.63.5"
+    "@glimmer/program" "0.63.5"
+    "@glimmer/reference" "0.63.5"
+    "@glimmer/util" "0.63.5"
+    "@glimmer/validator" "0.63.5"
+    "@glimmer/vm" "0.63.5"
+    "@glimmer/wire-format" "0.63.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.62.3.tgz#8c4abd245a54e8cc084a47ab4a65c33194256fda"
-  integrity sha512-PU4PpMg9UOeYFTODkHN9K6As74lm16XGEQAQbd59oAbvGRu5OAIWFtSU4sMexpKOXu6iJacFO5udX7gVTACRQQ==
+"@glimmer/syntax@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.63.5.tgz#38ef6e41d9da3474ebc5d704c0e9743367de728e"
+  integrity sha512-w0/X7jQ5tzO6KevzeP1QBEfS2qjc897JlQa+9eMcFkxRxZCH4IVUjyxeRuu9cY0uV16ByVBTFh9fcGPfgaYULQ==
   dependencies:
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/util" "0.62.3"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.62.3.tgz#d6fc5d64e5e97cbec02b5fcf8a8c78c7f67dc6f5"
-  integrity sha512-HImkS2UJuZYPxyjXPFL9PS659kwjNcRIr5hnUo1PzrPfyZxXwWys2+vTxIv34tI1xkgkQmB1pB0S8pCdNrJY5w==
+"@glimmer/util@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.5.tgz#8f2ed10269fcf6ccaf4cc0338915cc618ed845d0"
+  integrity sha512-9eTXOx3l6N1YySBMe1Vb/F+SGuztgObQCoEVtvxUZ7VB37xTaaUEoZfQVQJyBizFIKIAOvXBhPYCT+cERvN7kw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.62.3"
+    "@glimmer/interfaces" "0.63.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.62.3.tgz#241d97c3a42130a4d06d821de66147e50602ffe5"
-  integrity sha512-bge8EhoWvZNDvpfRI5BVvoT1E1+8GsYOWqOYIjXmQJObzXUE6KWgLMI1RGGcS+PItrAnniS1nv+hVdqk4aHDQQ==
+"@glimmer/validator@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.5.tgz#8d196f1f29191c5ecd60ea5c87d1081f68dff840"
+  integrity sha512-+/YHIKrspDrqnAz4hE+VgIL2O6tZPxKA9KfI5syDcr+zxQeLjC/7ng6AK2g6+w8nHoS5WOABbA/gpH+wTV6ulQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.62.3"
+    "@glimmer/global-context" "0.63.5"
 
-"@glimmer/vm@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.62.3.tgz#b0ce8a7cf3dba9146735d4b58f163495c03f0cfb"
-  integrity sha512-CRs/BdBBd6yu43h1aZStJXrfRwQwbpPTZ/EWAfH90cwjecDoYnjpJX+HnEDqSg+XNk+YgRo0j7cHTIieHju3jQ==
+"@glimmer/vm@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.63.5.tgz#2ea8a0546f7826b95e49cb46cd46fa6392e317eb"
+  integrity sha512-gw9fXdzD4fVIKgEPhv63hPMR4/yFaos/tYFXlRp3DmRPyMViOs7JTQ3W1Yqdn3UqUFwgMKO/yEZEC8RLMFhl4w==
   dependencies:
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/util" "0.62.3"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
 
-"@glimmer/wire-format@0.62.3":
-  version "0.62.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.62.3.tgz#2fcbd95461b8bf6a3dfa88cb5357074bcff82ca2"
-  integrity sha512-4Lrk6Vno+3GOihSQMBg4yOP/HFmwiVj18ntbQPPF2+D9x174ydywmdWO5AGn3VNFPojomhatgdUezZ0+czC2WQ==
+"@glimmer/wire-format@0.63.5":
+  version "0.63.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.63.5.tgz#20c877f830527f2c8e697ec11537bb45cacefe25"
+  integrity sha512-F08YRRnVzCVTiJ38EVSpux9zNr7B6ryoZQSa1gMcqVkWkNfcNrp3hibXsdtg9Pq3pCyHWM6OLhmE355pdW7hAw==
   dependencies:
-    "@glimmer/interfaces" "0.62.3"
-    "@glimmer/util" "0.62.3"
+    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/util" "0.63.5"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From c7526f119325963ca06748201d4c4ee4e3038786 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Sat, 17 Oct 2020 00:36:32 +0100
Subject: [PATCH 0223/1405] deprecate Ember.String.loc and {{loc}}

---
 .../-internals/glimmer/lib/helpers/loc.ts     |  1 +
 .../tests/integration/helpers/loc-test.js     | 86 ++++++++++++-------
 packages/@ember/string/index.ts               | 16 ++++
 packages/@ember/string/tests/loc_test.js      | 16 ++--
 4 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/loc.ts b/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
index 5bfb0b4cc05..83a73688d43 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
@@ -36,6 +36,7 @@ import { helper } from '../helper';
   @param {String} str The string to format.
   @see {String#loc}
   @public
+  @deprecated
 */
 export default helper(function (params) {
   return loc.apply(null, params as any /* let the other side handle errors */);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
index db3c80129d9..c1e1fbb5d9c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
@@ -20,32 +20,36 @@ moduleFor(
     }
 
     ['@test it lets the original value through by default']() {
-      this.render(`{{loc "Hiya buddy!"}}`);
+      expectDeprecation(() => this.render(`{{loc "Hiya buddy!"}}`), /loc is deprecated/);
       this.assertText('Hiya buddy!', 'the unlocalized string is correct');
       runTask(() => this.rerender());
       this.assertText('Hiya buddy!', 'the unlocalized string is correct after rerender');
     }
 
     ['@test it localizes a simple string']() {
-      this.render(`{{loc "Hello Friend"}}`);
+      expectDeprecation(() => this.render(`{{loc "Hello Friend"}}`), /loc is deprecated/);
       this.assertText('Hallo Freund', 'the localized string is correct');
       runTask(() => this.rerender());
       this.assertText('Hallo Freund', 'the localized string is correct after rerender');
     }
 
     ['@test it takes passed formats into an account']() {
-      this.render(`{{loc "%@, %@" "Hello" "Mr. Pitkin"}}`);
+      expectDeprecation(() => {
+        this.render(`{{loc "%@, %@" "Hello" "Mr. Pitkin"}}`);
+      }, /loc is deprecated/);
       this.assertText('Hello, Mr. Pitkin', 'the formatted string is correct');
       runTask(() => this.rerender());
       this.assertText('Hello, Mr. Pitkin', 'the formatted string is correct after rerender');
     }
 
     ['@test it updates when bound params change']() {
-      this.render(`{{loc simple}} - {{loc personal 'Mr. Pitkin'}}`, {
-        simple: 'Hello Friend',
-        personal: 'Hello',
-      });
-      this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct');
+      expectDeprecation(() => {
+        this.render(`{{loc simple}} - {{loc personal 'Mr. Pitkin'}}`, {
+          simple: 'Hello Friend',
+          personal: 'Hello',
+        });
+        this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct');
+      }, /loc is deprecated/);
 
       runTask(() => this.rerender());
       this.assertText(
@@ -53,20 +57,32 @@ moduleFor(
         'the bound value is correct after rerender'
       );
 
-      runTask(() => set(this.context, 'simple', "G'day mate"));
-      this.assertText("G'day mate - Hallo, Mr. Pitkin", 'the bound value is correct after update');
+      expectDeprecation(() => {
+        runTask(() => set(this.context, 'simple', "G'day mate"));
+        this.assertText(
+          "G'day mate - Hallo, Mr. Pitkin",
+          'the bound value is correct after update'
+        );
+      }, /loc is deprecated/);
 
-      runTask(() => set(this.context, 'simple', 'Hello Friend'));
-      this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct after reset');
+      expectDeprecation(() => {
+        runTask(() => set(this.context, 'simple', 'Hello Friend'));
+        this.assertText(
+          'Hallo Freund - Hallo, Mr. Pitkin',
+          'the bound value is correct after reset'
+        );
+      }, /loc is deprecated/);
     }
 
     ['@test it updates when nested bound params change']() {
-      this.render(`{{loc greetings.simple}} - {{loc greetings.personal 'Mr. Pitkin'}}`, {
-        greetings: {
-          simple: 'Hello Friend',
-          personal: 'Hello',
-        },
-      });
+      expectDeprecation(() => {
+        this.render(`{{loc greetings.simple}} - {{loc greetings.personal 'Mr. Pitkin'}}`, {
+          greetings: {
+            simple: 'Hello Friend',
+            personal: 'Hello',
+          },
+        });
+      }, /loc is deprecated/);
       this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct');
 
       runTask(() => this.rerender());
@@ -75,22 +91,26 @@ moduleFor(
         'the bound value is correct after rerender'
       );
 
-      runTask(() => set(this.context, 'greetings.simple', "G'day mate"));
-      this.assertText(
-        "G'day mate - Hallo, Mr. Pitkin",
-        'the bound value is correct after interior mutation'
-      );
+      expectDeprecation(() => {
+        runTask(() => set(this.context, 'greetings.simple', "G'day mate"));
+        this.assertText(
+          "G'day mate - Hallo, Mr. Pitkin",
+          'the bound value is correct after interior mutation'
+        );
+      }, /loc is deprecated/);
 
-      runTask(() =>
-        set(this.context, 'greetings', {
-          simple: 'Hello Friend',
-          personal: 'Hello',
-        })
-      );
-      this.assertText(
-        'Hallo Freund - Hallo, Mr. Pitkin',
-        'the bound value is correct after replacement'
-      );
+      expectDeprecation(() => {
+        runTask(() =>
+          set(this.context, 'greetings', {
+            simple: 'Hello Friend',
+            personal: 'Hello',
+          })
+        );
+        this.assertText(
+          'Hallo Freund - Hallo, Mr. Pitkin',
+          'the bound value is correct after replacement'
+        );
+      }, /loc is deprecated/);
     }
 
     ['@test it can be overriden']() {
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 4f4a1f76bb0..6edcc044445 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -110,8 +110,23 @@ function _fmt(str: string, formats: any[]) {
   @param {Array} formats Optional array of parameters to interpolate into string.
   @return {String} formatted string
   @public
+  @deprecated
 */
 export function loc(str: string, formats: any[]): string {
+  deprecate(
+    'loc is deprecated, please use a dedicated localization solution like ember-intl. More alternatives listed at https://emberobserver.com/categories/internationalization.',
+    false,
+    {
+      id: 'ember-string.loc',
+      until: '4.0.0',
+      for: 'ember-source',
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-string-loc',
+      since: {
+        available: '3.24',
+      },
+    }
+  );
+
   if (!Array.isArray(formats) || arguments.length > 2) {
     formats = Array.prototype.slice.call(arguments, 1);
   }
@@ -324,6 +339,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       @for @ember/string
       @static
       @private
+      @deprecated
     */
     loc: {
       configurable: true,
diff --git a/packages/@ember/string/tests/loc_test.js b/packages/@ember/string/tests/loc_test.js
index e0559b0fea0..33cdc1e6875 100644
--- a/packages/@ember/string/tests/loc_test.js
+++ b/packages/@ember/string/tests/loc_test.js
@@ -6,10 +6,12 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 let oldString;
 
 function test(assert, given, args, expected, description) {
-  assert.equal(loc(given, args), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    assert.deepEqual(given.loc(...args), expected, description);
-  }
+  expectDeprecation(() => {
+    assert.equal(loc(given, args), expected, description);
+    if (ENV.EXTEND_PROTOTYPES.String) {
+      assert.deepEqual(given.loc(...args), expected, description);
+    }
+  }, /loc is deprecated/);
 }
 
 moduleFor(
@@ -69,8 +71,10 @@ moduleFor(
     }
 
     ['@test works with argument form'](assert) {
-      assert.equal(loc('_Hello %@', 'John'), 'Bonjour John');
-      assert.equal(loc('_Hello %@ %@', ['John'], 'Doe'), 'Bonjour John Doe');
+      expectDeprecation(() => {
+        assert.equal(loc('_Hello %@', 'John'), 'Bonjour John');
+        assert.equal(loc('_Hello %@ %@', ['John'], 'Doe'), 'Bonjour John Doe');
+      }, /loc is deprecated/);
     }
   }
 );

From 5cf465f398602cd4f882e22f0427998a75cca4e6 Mon Sep 17 00:00:00 2001
From: Krishna Patel <krishna.ricky.patel@gmail.com>
Date: Thu, 12 Nov 2020 13:05:42 -0500
Subject: [PATCH 0224/1405] [DOC] Update array.filterBy example to include all
 properties

---
 packages/@ember/-internals/runtime/lib/mixins/array.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index 4faaf32a745..11c9ab47a37 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -972,8 +972,8 @@ const ArrayMixin = Mixin.create(Enumerable, {
     ```javascript
     let things = Ember.A([{ food: 'apple', isFruit: true }, { food: 'beans', isFruit: false }]);
 
-    things.filterBy('food', 'beans'); // [{ food: 'beans' }]
-    things.filterBy('isFruit'); // [{ food: 'apple' }]
+    things.filterBy('food', 'beans'); // [{ food: 'beans', isFruit: false }]
+    things.filterBy('isFruit'); // [{ food: 'apple', isFruit: true }]
     ```
 
     @method filterBy

From 0213b78b8395956b9f3d3d914cb439d4cf4e70f4 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Thu, 12 Nov 2020 18:17:24 +0000
Subject: [PATCH 0225/1405] update ember-cli-babel to latest version available

This ensures a new enough `@babel/preset-env`
that includes `@babel/plugin-syntax-optional-chaining`.
---
 package.json |    2 +-
 yarn.lock    | 1002 ++++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 899 insertions(+), 105 deletions(-)

diff --git a/package.json b/package.json
index 2f3af68d47d..d3bbdc888a4 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-cli-babel": "^7.19.0",
+    "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cli-normalize-entity-name": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index fdd214fdb22..06b8976d807 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,6 +9,18 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
+"@babel/code-frame@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
+  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
+  integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
+
 "@babel/compat-data@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
@@ -18,7 +30,29 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.3.4", "@babel/core@^7.4.3", "@babel/core@^7.8.3", "@babel/core@^7.9.0":
+"@babel/core@^7.12.0":
+  version "7.12.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
+  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.1"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helpers" "^7.12.1"
+    "@babel/parser" "^7.12.3"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.1"
+    json5 "^2.1.2"
+    lodash "^4.17.19"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
+"@babel/core@^7.3.4", "@babel/core@^7.4.3", "@babel/core@^7.8.3":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
   integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
@@ -40,6 +74,15 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
+  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+  dependencies:
+    "@babel/types" "^7.12.5"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
@@ -60,6 +103,13 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
+"@babel/helper-annotate-as-pure@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
+  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-annotate-as-pure@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
@@ -67,6 +117,14 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
+  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
@@ -75,7 +133,17 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-compilation-targets@^7.8.7", "@babel/helper-compilation-targets@^7.9.6":
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.12.1":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
+  dependencies:
+    "@babel/compat-data" "^7.12.5"
+    "@babel/helper-validator-option" "^7.12.1"
+    browserslist "^4.14.5"
+    semver "^5.5.0"
+
+"@babel/helper-compilation-targets@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
   integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
@@ -86,29 +154,25 @@
     levenary "^1.1.1"
     semver "^5.5.0"
 
-"@babel/helper-create-class-features-plugin@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz#243a5b46e2f8f0f674dc1387631eb6b28b851de0"
-  integrity sha512-klTBDdsr+VFFqaDHm5rR69OpEQtO2Qv8ECxHS1mNhJJvaHArR6a1xTf5K/eZW7eZpJbhCx3NW1Yt/sKsLXLblg==
+"@babel/helper-create-class-features-plugin@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
+  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-member-expression-to-functions" "^7.12.1"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-class-features-plugin@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz#965c8b0a9f051801fd9d3b372ca0ccf200a90897"
-  integrity sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==
+"@babel/helper-create-regexp-features-plugin@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
+  integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
   dependencies:
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.9.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+    regexpu-core "^4.7.1"
 
 "@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
   version "7.8.8"
@@ -119,6 +183,15 @@
     "@babel/helper-regex" "^7.8.3"
     regexpu-core "^4.7.0"
 
+"@babel/helper-define-map@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
+  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/types" "^7.10.5"
+    lodash "^4.17.19"
+
 "@babel/helper-define-map@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
@@ -128,6 +201,13 @@
     "@babel/types" "^7.8.3"
     lodash "^4.17.13"
 
+"@babel/helper-explode-assignable-expression@^7.10.4":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
+  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
 "@babel/helper-explode-assignable-expression@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
@@ -136,6 +216,15 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-function-name@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
+  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
@@ -154,6 +243,13 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.9.5"
 
+"@babel/helper-get-function-arity@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
+  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
@@ -161,6 +257,13 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-hoist-variables@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
+  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-hoist-variables@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
@@ -168,6 +271,13 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-member-expression-to-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
+  integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
 "@babel/helper-member-expression-to-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
@@ -175,6 +285,13 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-module-imports@^7.12.1":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+  dependencies:
+    "@babel/types" "^7.12.5"
+
 "@babel/helper-module-imports@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
@@ -182,6 +299,21 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-module-transforms@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
+  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-simple-access" "^7.12.1"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.12.1"
+    "@babel/types" "^7.12.1"
+    lodash "^4.17.19"
+
 "@babel/helper-module-transforms@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
@@ -195,6 +327,13 @@
     "@babel/types" "^7.9.0"
     lodash "^4.17.13"
 
+"@babel/helper-optimise-call-expression@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
+  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
+  dependencies:
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-optimise-call-expression@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
@@ -207,6 +346,18 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
+"@babel/helper-plugin-utils@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
+"@babel/helper-regex@^7.10.4":
+  version "7.10.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
+  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
+  dependencies:
+    lodash "^4.17.19"
+
 "@babel/helper-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
@@ -214,6 +365,15 @@
   dependencies:
     lodash "^4.17.13"
 
+"@babel/helper-remap-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
+  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-wrap-function" "^7.10.4"
+    "@babel/types" "^7.12.1"
+
 "@babel/helper-remap-async-to-generator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
@@ -225,6 +385,16 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-replace-supers@^7.12.1":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
+  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.12.1"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
+
 "@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
@@ -235,15 +405,12 @@
     "@babel/traverse" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/helper-replace-supers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz#03149d7e6a5586ab6764996cd31d6981a17e1444"
-  integrity sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==
+"@babel/helper-simple-access@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
+  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
+    "@babel/types" "^7.12.1"
 
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
@@ -253,6 +420,20 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
+  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+  dependencies:
+    "@babel/types" "^7.12.1"
+
+"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
+  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+  dependencies:
+    "@babel/types" "^7.11.0"
+
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
@@ -260,6 +441,11 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
+"@babel/helper-validator-identifier@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
+  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+
 "@babel/helper-validator-identifier@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
@@ -270,6 +456,21 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
   integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
 
+"@babel/helper-validator-option@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
+  integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
+
+"@babel/helper-wrap-function@^7.10.4":
+  version "7.12.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
+  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -280,6 +481,15 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
+"@babel/helpers@^7.12.1":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
+  dependencies:
+    "@babel/template" "^7.10.4"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
+
 "@babel/helpers@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
@@ -289,6 +499,15 @@
     "@babel/traverse" "^7.9.6"
     "@babel/types" "^7.9.6"
 
+"@babel/highlight@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
+  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/highlight@^7.8.3":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
@@ -298,6 +517,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
+  integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
+
 "@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
   version "7.9.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
@@ -308,6 +532,15 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
   integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
 
+"@babel/plugin-proposal-async-generator-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
+  integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
@@ -317,22 +550,30 @@
     "@babel/helper-remap-async-to-generator" "^7.8.3"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
-"@babel/plugin-proposal-class-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz#5e06654af5cd04b608915aada9b2a6788004464e"
-  integrity sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==
+"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
+  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-proposal-decorators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz#2156860ab65c5abf068c3f67042184041066543e"
-  integrity sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==
+"@babel/plugin-proposal-decorators@^7.10.5":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f"
+  integrity sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-decorators" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-decorators" "^7.12.1"
+
+"@babel/plugin-proposal-dynamic-import@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
+  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -342,6 +583,22 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
+"@babel/plugin-proposal-export-namespace-from@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
+  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
+"@babel/plugin-proposal-json-strings@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
+  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+
 "@babel/plugin-proposal-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
@@ -350,6 +607,22 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
+  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
+  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
@@ -358,6 +631,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
+"@babel/plugin-proposal-numeric-separator@^7.12.1":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba"
+  integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
 "@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
@@ -366,6 +647,15 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.8.3"
 
+"@babel/plugin-proposal-object-rest-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
+  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+
 "@babel/plugin-proposal-object-rest-spread@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
@@ -375,6 +665,14 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.9.5"
 
+"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
+  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
@@ -383,6 +681,15 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
+"@babel/plugin-proposal-optional-chaining@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
+  integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+
 "@babel/plugin-proposal-optional-chaining@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
@@ -391,6 +698,22 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
+"@babel/plugin-proposal-private-methods@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
+  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
+  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
   version "7.8.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
@@ -406,12 +729,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-decorators@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz#8d2c15a9f1af624b0025f961682a9d53d3001bda"
-  integrity sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==
+"@babel/plugin-syntax-class-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
+  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-syntax-decorators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
+  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
@@ -420,6 +750,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-export-namespace-from@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.8.3"
+
 "@babel/plugin-syntax-json-strings@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -427,6 +764,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
@@ -434,6 +778,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
@@ -462,6 +813,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-top-level-await@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
+  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
@@ -469,12 +827,19 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-typescript@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz#c1f659dda97711a569cef75275f7e15dcaa6cabc"
-  integrity sha512-GO1MQ/SGGGoiEXY0e0bSpHimJvxqB7lktLLIq2pv8xG7WZ8IMEle74jIe1FhprHBWjwjZtXHkycDLZXIWM5Wfg==
+"@babel/plugin-syntax-typescript@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
+  integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-arrow-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
+  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-arrow-functions@^7.8.3":
   version "7.8.3"
@@ -483,6 +848,15 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-async-to-generator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
+  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
+  dependencies:
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-remap-async-to-generator" "^7.12.1"
+
 "@babel/plugin-transform-async-to-generator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
@@ -492,6 +866,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-remap-async-to-generator" "^7.8.3"
 
+"@babel/plugin-transform-block-scoped-functions@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
+  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-block-scoped-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
@@ -499,6 +880,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-block-scoping@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
+  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-block-scoping@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
@@ -507,6 +895,20 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     lodash "^4.17.13"
 
+"@babel/plugin-transform-classes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
+  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.10.4"
+    "@babel/helper-define-map" "^7.10.4"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-optimise-call-expression" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-split-export-declaration" "^7.10.4"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-classes@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
@@ -521,6 +923,13 @@
     "@babel/helper-split-export-declaration" "^7.8.3"
     globals "^11.1.0"
 
+"@babel/plugin-transform-computed-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
+  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-computed-properties@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
@@ -528,6 +937,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-destructuring@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
+  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-destructuring@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
@@ -535,6 +951,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-dotall-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
+  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
@@ -543,6 +967,13 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-duplicate-keys@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
+  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-duplicate-keys@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
@@ -550,6 +981,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-exponentiation-operator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
+  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-exponentiation-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
@@ -558,6 +997,13 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-for-of@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
+  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-for-of@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
@@ -565,6 +1011,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-function-name@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
+  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
+  dependencies:
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
@@ -573,6 +1027,13 @@
     "@babel/helper-function-name" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
+  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
@@ -580,6 +1041,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-member-expression-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
+  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-member-expression-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
@@ -587,7 +1055,16 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.2.0", "@babel/plugin-transform-modules-amd@^7.9.0", "@babel/plugin-transform-modules-amd@^7.9.6":
+"@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
+  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
+"@babel/plugin-transform-modules-amd@^7.2.0", "@babel/plugin-transform-modules-amd@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
   integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
@@ -596,6 +1073,16 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
+  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-simple-access" "^7.12.1"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-commonjs@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
@@ -606,6 +1093,17 @@
     "@babel/helper-simple-access" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-systemjs@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
+  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.10.4"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-systemjs@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
@@ -616,6 +1114,14 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-umd@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
+  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-modules-umd@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
@@ -624,6 +1130,13 @@
     "@babel/helper-module-transforms" "^7.9.0"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
+  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
@@ -631,6 +1144,13 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
 
+"@babel/plugin-transform-new-target@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
+  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-new-target@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
@@ -645,6 +1165,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-object-super@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
+  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-replace-supers" "^7.12.1"
+
 "@babel/plugin-transform-object-super@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
@@ -653,6 +1181,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
+"@babel/plugin-transform-parameters@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
+  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-parameters@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
@@ -661,6 +1196,13 @@
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-property-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
+  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-property-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
@@ -668,6 +1210,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-regenerator@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
+  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
 "@babel/plugin-transform-regenerator@^7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
@@ -675,6 +1224,13 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
+"@babel/plugin-transform-reserved-words@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
+  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
@@ -682,16 +1238,23 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-runtime@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz#3ba804438ad0d880a17bca5eaa0cdf1edeedb2fd"
-  integrity sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==
+"@babel/plugin-transform-runtime@^7.12.0":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
+  integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==
   dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
     resolve "^1.8.1"
     semver "^5.5.1"
 
+"@babel/plugin-transform-shorthand-properties@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
+  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-shorthand-properties@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
@@ -699,6 +1262,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-spread@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
+  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+
 "@babel/plugin-transform-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
@@ -706,6 +1277,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-sticky-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
+  integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-regex" "^7.10.4"
+
 "@babel/plugin-transform-sticky-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
@@ -714,6 +1293,13 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-regex" "^7.8.3"
 
+"@babel/plugin-transform-template-literals@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
+  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-template-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
@@ -722,6 +1308,13 @@
     "@babel/helper-annotate-as-pure" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-transform-typeof-symbol@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
+  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-transform-typeof-symbol@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
@@ -729,14 +1322,29 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-typescript@^7.9.0":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz#2248971416a506fc78278fc0c0ea3179224af1e9"
-  integrity sha512-8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ==
+"@babel/plugin-transform-typescript@^7.12.0":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
+  integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.9.6"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-typescript" "^7.8.3"
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-typescript" "^7.12.1"
+
+"@babel/plugin-transform-unicode-escapes@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
+  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
+"@babel/plugin-transform-unicode-regex@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
+  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-unicode-regex@^7.8.3":
   version "7.8.3"
@@ -746,7 +1354,15 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/polyfill@^7.8.3", "@babel/polyfill@^7.8.7":
+"@babel/polyfill@^7.11.5":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96"
+  integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==
+  dependencies:
+    core-js "^2.6.5"
+    regenerator-runtime "^0.13.4"
+
+"@babel/polyfill@^7.8.3":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
   integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
@@ -754,7 +1370,79 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.9.0", "@babel/preset-env@^7.9.5":
+"@babel/preset-env@^7.12.0":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
+  integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
+  dependencies:
+    "@babel/compat-data" "^7.12.1"
+    "@babel/helper-compilation-targets" "^7.12.1"
+    "@babel/helper-module-imports" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-validator-option" "^7.12.1"
+    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
+    "@babel/plugin-proposal-class-properties" "^7.12.1"
+    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
+    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
+    "@babel/plugin-proposal-json-strings" "^7.12.1"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
+    "@babel/plugin-proposal-numeric-separator" "^7.12.1"
+    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
+    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
+    "@babel/plugin-proposal-private-methods" "^7.12.1"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
+    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/plugin-syntax-class-properties" "^7.12.1"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/plugin-syntax-top-level-await" "^7.12.1"
+    "@babel/plugin-transform-arrow-functions" "^7.12.1"
+    "@babel/plugin-transform-async-to-generator" "^7.12.1"
+    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
+    "@babel/plugin-transform-block-scoping" "^7.12.1"
+    "@babel/plugin-transform-classes" "^7.12.1"
+    "@babel/plugin-transform-computed-properties" "^7.12.1"
+    "@babel/plugin-transform-destructuring" "^7.12.1"
+    "@babel/plugin-transform-dotall-regex" "^7.12.1"
+    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
+    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
+    "@babel/plugin-transform-for-of" "^7.12.1"
+    "@babel/plugin-transform-function-name" "^7.12.1"
+    "@babel/plugin-transform-literals" "^7.12.1"
+    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
+    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
+    "@babel/plugin-transform-modules-umd" "^7.12.1"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
+    "@babel/plugin-transform-new-target" "^7.12.1"
+    "@babel/plugin-transform-object-super" "^7.12.1"
+    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/plugin-transform-property-literals" "^7.12.1"
+    "@babel/plugin-transform-regenerator" "^7.12.1"
+    "@babel/plugin-transform-reserved-words" "^7.12.1"
+    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
+    "@babel/plugin-transform-spread" "^7.12.1"
+    "@babel/plugin-transform-sticky-regex" "^7.12.1"
+    "@babel/plugin-transform-template-literals" "^7.12.1"
+    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
+    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
+    "@babel/plugin-transform-unicode-regex" "^7.12.1"
+    "@babel/preset-modules" "^0.1.3"
+    "@babel/types" "^7.12.1"
+    core-js-compat "^3.6.2"
+    semver "^5.5.0"
+
+"@babel/preset-env@^7.9.5":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
   integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
@@ -831,13 +1519,29 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
+"@babel/runtime@^7.12.0":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
+"@babel/runtime@^7.8.4":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
   integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/template@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
+  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/parser" "^7.10.4"
+    "@babel/types" "^7.10.4"
+
 "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
@@ -847,6 +1551,21 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
+"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
+  integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    "@babel/generator" "^7.12.5"
+    "@babel/helper-function-name" "^7.10.4"
+    "@babel/helper-split-export-declaration" "^7.11.0"
+    "@babel/parser" "^7.12.5"
+    "@babel/types" "^7.12.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.19"
+
 "@babel/traverse@^7.4.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
@@ -877,6 +1596,15 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5":
+  version "7.12.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
+  integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.10.4"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
@@ -1714,7 +2442,7 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-debug-macros@^0.3.0, babel-plugin-debug-macros@^0.3.3:
+babel-plugin-debug-macros@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
   integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
@@ -1735,12 +2463,12 @@ babel-plugin-ember-data-packages-polyfill@^0.1.2:
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
 
-babel-plugin-ember-modules-api-polyfill@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.12.0.tgz#a5e703205ba4e625a7fab9bb1aea64ef3222cf75"
-  integrity sha512-ZQU4quX0TJ1yYyosPy5PFigKdCFEVHJ6H0b3hwjxekIP9CDwzk0OhQuKhCOPti+d52VWjjCjxu2BrXEih29mFw==
+babel-plugin-ember-modules-api-polyfill@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.2.0.tgz#302cb58a3c0fa33d93ab5115f1e91d76c6ec766b"
+  integrity sha512-k5gyC1kUDyZDcdD8LMGTI7KA+cHdKainuWpmc7d5yv42WgZFO75njPi3hZchEGsFFXtSqm9jiahgvLBUV8E8mA==
   dependencies:
-    ember-rfc176-data "^0.3.12"
+    ember-rfc176-data "^0.3.16"
 
 babel-plugin-filter-imports@^4.0.0:
   version "4.0.0"
@@ -2020,6 +2748,24 @@ broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.4.0:
     rsvp "^4.8.4"
     workerpool "^3.1.1"
 
+broccoli-babel-transpiler@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
+  integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/polyfill" "^7.11.5"
+    broccoli-funnel "^2.0.2"
+    broccoli-merge-trees "^3.0.2"
+    broccoli-persistent-filter "^2.2.1"
+    clone "^2.1.2"
+    hash-for-dep "^1.4.7"
+    heimdalljs "^0.2.1"
+    heimdalljs-logger "^0.1.9"
+    json-stable-stringify "^1.0.1"
+    rsvp "^4.8.4"
+    workerpool "^3.1.1"
+
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
@@ -2492,6 +3238,17 @@ browserslist@^4.11.1:
     node-releases "^1.1.53"
     pkg-up "^2.0.0"
 
+browserslist@^4.14.5:
+  version "4.14.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
+  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
+  dependencies:
+    caniuse-lite "^1.0.30001157"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.591"
+    escalade "^3.1.1"
+    node-releases "^1.1.66"
+
 browserslist@^4.8.3:
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
@@ -2682,6 +3439,11 @@ caniuse-lite@^1.0.30001043:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001052.tgz#33a5ddd13783cfe2c8a6a846ab983387d4edff75"
   integrity sha512-b2/oWZwkpWzEB1+Azr2Z4FcpdDkH+9R4dn+bkwk/6eH9mRSrnZjhA6v32+zsV+TSqC0pp2Rxush2yUVTJ0dJTQ==
 
+caniuse-lite@^1.0.30001157:
+  version "1.0.30001157"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"
+  integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -2947,6 +3709,11 @@ color-name@^1.1.1, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colorette@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
+  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -3420,37 +4187,42 @@ electron-to-chromium@^1.3.413:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.429.tgz#0d1ef6710ba84de3710615280c1f6f79c8205b47"
   integrity sha512-YW8rXMJx33FalISp0uP0+AkvBx9gfzzQ4NotblGga6Z8ZX00bg2e5FNWV8fyDD/VN3WLhEtjFXNwzdJrdaAHEQ==
 
-ember-cli-babel-plugin-helpers@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.0.tgz#de3baedd093163b6c2461f95964888c1676325ac"
-  integrity sha512-Zr4my8Xn+CzO0gIuFNXji0eTRml5AxZUTDQz/wsNJ5AJAtyFWCY4QtKdoELNNbiCVGt1lq5yLiwTm4scGKu6xA==
-
-ember-cli-babel@^7.19.0:
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.19.0.tgz#e6eddea18a867231fcf90a80689e92b98be9a63b"
-  integrity sha512-HiWKuoyy35vGEr+iCw6gUnQ3pS5qslyTlKEDW8cVoMbvZNGYBgRxHed5nklVUh+BS74AwR9lsp25BTAagYAP9Q==
-  dependencies:
-    "@babel/core" "^7.9.0"
-    "@babel/helper-compilation-targets" "^7.8.7"
-    "@babel/plugin-proposal-class-properties" "^7.8.3"
-    "@babel/plugin-proposal-decorators" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.0"
-    "@babel/plugin-transform-runtime" "^7.9.0"
-    "@babel/plugin-transform-typescript" "^7.9.0"
-    "@babel/polyfill" "^7.8.7"
-    "@babel/preset-env" "^7.9.0"
-    "@babel/runtime" "^7.9.0"
+electron-to-chromium@^1.3.591:
+  version "1.3.593"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz#947ccf6dc8e013e2b053d2463ecd1043c164fcef"
+  integrity sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA==
+
+ember-cli-babel-plugin-helpers@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
+  integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
+
+ember-cli-babel@^7.23.0:
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92"
+  integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.10.4"
+    "@babel/plugin-proposal-decorators" "^7.10.5"
+    "@babel/plugin-transform-modules-amd" "^7.10.5"
+    "@babel/plugin-transform-runtime" "^7.12.0"
+    "@babel/plugin-transform-typescript" "^7.12.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "^7.12.0"
     amd-name-resolver "^1.2.1"
-    babel-plugin-debug-macros "^0.3.0"
+    babel-plugin-debug-macros "^0.3.3"
     babel-plugin-ember-data-packages-polyfill "^0.1.2"
-    babel-plugin-ember-modules-api-polyfill "^2.12.0"
+    babel-plugin-ember-modules-api-polyfill "^3.2.0"
     babel-plugin-module-resolver "^3.1.1"
-    broccoli-babel-transpiler "^7.4.0"
+    broccoli-babel-transpiler "^7.8.0"
     broccoli-debug "^0.6.4"
     broccoli-funnel "^2.0.1"
     broccoli-source "^1.1.0"
     clone "^2.1.2"
-    ember-cli-babel-plugin-helpers "^1.1.0"
+    ember-cli-babel-plugin-helpers "^1.1.1"
     ember-cli-version-checker "^4.1.0"
     ensure-posix-path "^1.0.2"
     fixturify-project "^1.10.0"
@@ -3697,10 +4469,10 @@ ember-publisher@0.0.7:
   dependencies:
     aws-sdk "^2.0.9"
 
-ember-rfc176-data@^0.3.12:
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.12.tgz#90d82878e69e2ac9a5438e8ce14d12c6031c5bd2"
-  integrity sha512-g9HeZj/gU5bfIIrGXkP7MhS2b3Vu5DfNUrYr14hy99TgIvtZETO+96QF4WOEUXGjIJdfTRjerVnQlqngPQSv1g==
+ember-rfc176-data@^0.3.16:
+  version "0.3.16"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.16.tgz#2ace0ac9cf9016d493a74a1d931643a308679803"
+  integrity sha512-IYAzffS90r2ybAcx8c2qprYfkxa70G+/UPkxMN1hw55DU5S2aLOX6v3umKDZItoRhrvZMCnzwsdfKSrKdC9Wbg==
 
 ember-router-generator@^2.0.0:
   version "2.0.0"
@@ -3938,6 +4710,11 @@ es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
     d "1"
     es5-ext "~0.10.14"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -6962,6 +7739,11 @@ node-releases@^1.1.53:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz#8af23b7c561d8e2e6e36a46637bab84633b07cee"
   integrity sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==
 
+node-releases@^1.1.66:
+  version "1.1.66"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
+  integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
+
 node-uuid@~1.4.0:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
@@ -7899,6 +8681,18 @@ regexpu-core@^4.7.0:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
+regexpu-core@^4.7.1:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
+  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  dependencies:
+    regenerate "^1.4.0"
+    regenerate-unicode-properties "^8.2.0"
+    regjsgen "^0.5.1"
+    regjsparser "^0.6.4"
+    unicode-match-property-ecmascript "^1.0.4"
+    unicode-match-property-value-ecmascript "^1.2.0"
+
 registry-auth-token@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"

From 15e3eb27eab7f77933e630e63ef8df8f83434ea8 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Sat, 7 Nov 2020 23:10:56 +0000
Subject: [PATCH 0226/1405] deprecate tryInvoke

---
 .../integration/components/life-cycle-test.js |  5 ++---
 .../routing/lib/location/auto_location.ts     |  3 +--
 .../-internals/runtime/lib/mixins/array.js    |  4 ++--
 .../@ember/-internals/utils/lib/invoke.ts     | 17 ++++++++++++++++
 .../-internals/utils/tests/try_invoke_test.js | 20 +++++++++++++++----
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index 3eb42f12a3b..c0ea57ff659 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -11,7 +11,6 @@ import { schedule } from '@ember/runloop';
 import { set, setProperties } from '@ember/-internals/metal';
 import { A as emberA } from '@ember/-internals/runtime';
 import { getViewId, getViewElement, jQueryDisabled } from '@ember/-internals/views';
-import { tryInvoke } from '@ember/-internals/utils';
 
 import { Component } from '../../utils/helpers';
 
@@ -1645,9 +1644,9 @@ if (!jQueryDisabled) {
         expectDeprecation(() => {
           let comp = owner.lookup('component:foo-bar');
           runAppend(comp);
-          runTask(() => tryInvoke(component, 'destroy'));
+          runTask(() => component.destroy?.());
         }, 'Using this.$() in a component has been deprecated, consider using this.element');
-        runTask(() => tryInvoke(component, 'destroy'));
+        runTask(() => component.destroy?.());
       }
     }
   );
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 137b356c924..76a10fbc048 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -2,7 +2,6 @@ import { history, location, userAgent, window } from '@ember/-internals/browser-
 import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { tryInvoke } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { EmberLocation, UpdateCallback } from './api';
 import {
@@ -199,7 +198,7 @@ function delegateToConcreteImplementation(methodName: string) {
       "AutoLocation's detect() method should be called before calling any other hooks.",
       Boolean(concreteImplementation)
     );
-    return tryInvoke(concreteImplementation, methodName, args);
+    return concreteImplementation[methodName]?.(...args);
   };
 }
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index 4faaf32a745..645c52024d7 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -3,7 +3,7 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { PROXY_CONTENT } from '@ember/-internals/metal';
-import { setEmberArray, HAS_NATIVE_PROXY, tryInvoke } from '@ember/-internals/utils';
+import { setEmberArray, HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import {
   get,
   set,
@@ -1347,7 +1347,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
   invoke(methodName, ...args) {
     let ret = A();
 
-    this.forEach((item) => ret.push(tryInvoke(item, methodName, args)));
+    this.forEach((item) => ret.push(item[methodName]?.(...args)));
 
     return ret;
   },
diff --git a/packages/@ember/-internals/utils/lib/invoke.ts b/packages/@ember/-internals/utils/lib/invoke.ts
index e8bee7a03c2..16a5e458cb9 100644
--- a/packages/@ember/-internals/utils/lib/invoke.ts
+++ b/packages/@ember/-internals/utils/lib/invoke.ts
@@ -1,3 +1,5 @@
+import { deprecate } from '@ember/debug';
+
 /**
   Checks to see if the `methodName` exists on the `obj`.
 
@@ -46,12 +48,27 @@ export function canInvoke(obj: any | null | undefined, methodName: string): obj
   @param {Array} [args] The arguments to pass to the method
   @return {*} the return value of the invoked method or undefined if it cannot be invoked
   @public
+  @deprecated Use Javascript's optional chaining instead.
 */
 export function tryInvoke(
   obj: any | undefined | null,
   methodName: string,
   args: Array<any | undefined | null>
 ) {
+  deprecate(
+    `Use of tryInvoke is deprecated. Instead, consider using JavaScript's optional chaining.`,
+    false,
+    {
+      id: 'ember-utils.try-invoke',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        available: '3.24.0',
+      },
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-utils-try-invoke',
+    }
+  );
+
   if (canInvoke(obj, methodName)) {
     let method = obj[methodName];
     return method.apply(obj, args);
diff --git a/packages/@ember/-internals/utils/tests/try_invoke_test.js b/packages/@ember/-internals/utils/tests/try_invoke_test.js
index 0ae6f73f8c4..a572c5f466f 100644
--- a/packages/@ember/-internals/utils/tests/try_invoke_test.js
+++ b/packages/@ember/-internals/utils/tests/try_invoke_test.js
@@ -24,25 +24,37 @@ moduleFor(
     }
 
     ["@test should return undefined when the object doesn't exist"](assert) {
-      assert.equal(tryInvoke(undefined, 'aMethodThatDoesNotExist'), undefined);
+      expectDeprecation(
+        () => assert.equal(tryInvoke(undefined, 'aMethodThatDoesNotExist'), undefined),
+        /Use of tryInvoke is deprecated/
+      );
     }
 
     ["@test should return undefined when asked to perform a method that doesn't exist on the object"](
       assert
     ) {
-      assert.equal(tryInvoke(obj, 'aMethodThatDoesNotExist'), undefined);
+      expectDeprecation(
+        () => assert.equal(tryInvoke(obj, 'aMethodThatDoesNotExist'), undefined),
+        /Use of tryInvoke is deprecated/
+      );
     }
 
     ['@test should return what the method returns when asked to perform a method that exists on the object'](
       assert
     ) {
-      assert.equal(tryInvoke(obj, 'aMethodThatExists'), true);
+      expectDeprecation(
+        () => assert.equal(tryInvoke(obj, 'aMethodThatExists'), true),
+        /Use of tryInvoke is deprecated/
+      );
     }
 
     ['@test should return what the method returns when asked to perform a method that takes arguments and exists on the object'](
       assert
     ) {
-      assert.equal(tryInvoke(obj, 'aMethodThatTakesArguments', [true, true]), true);
+      expectDeprecation(
+        () => assert.equal(tryInvoke(obj, 'aMethodThatTakesArguments', [true, true]), true),
+        /Use of tryInvoke is deprecated/
+      );
     }
   }
 );

From 91699cce0913693a4fa42a9740020b59dae0a6bb Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 3 Nov 2020 15:35:36 -0800
Subject: [PATCH 0227/1405] [FEATURE] Upstreams the DebugRenderTree to Glimmer
 VM

---
 package.json                                  |  18 +-
 packages/@ember/-internals/glimmer/index.ts   |   1 -
 .../glimmer/lib/compile-time-lookup.ts        |   8 +-
 .../lib/component-managers/abstract.ts        |   4 +-
 .../glimmer/lib/component-managers/curly.ts   |  57 +----
 .../glimmer/lib/component-managers/custom.ts  |  69 ++----
 .../lib/component-managers/internal.ts        |  54 ++---
 .../glimmer/lib/component-managers/mount.ts   | 104 ++++-----
 .../glimmer/lib/component-managers/outlet.ts  | 167 ++++++--------
 .../glimmer/lib/component-managers/root.ts    |  29 +--
 .../lib/component-managers/template-only.ts   |  87 ++------
 .../-internals/glimmer/lib/environment.ts     |  59 +----
 .../@ember/-internals/glimmer/lib/renderer.ts |  18 +-
 .../-internals/glimmer/lib/syntax/mount.ts    |  10 +-
 .../lib/utils/curly-component-state-bucket.ts |  10 +-
 .../glimmer/lib/utils/debug-render-tree.ts    | 211 ------------------
 .../application/debug-render-tree-test.ts     |  10 +-
 .../integration/application/rendering-test.js |   2 +-
 .../components/curly-components-test.js       |  20 +-
 .../components/dynamic-components-test.js     |   2 +-
 .../template-only-components-test.js          |   2 +-
 .../custom-modifier-manager-test.js           |   3 +-
 .../integration/helpers/custom-helper-test.js |   2 +-
 .../helpers/helper-manager-test.js            |   2 +-
 .../tests/integration/helpers/tracked-test.js |   2 +-
 .../glimmer/tests/integration/mount-test.js   |   2 +-
 .../tests/unit/runtime-resolver-cache-test.js |  32 ++-
 .../tests/unit/template-factory-test.js       |   3 +-
 .../tests/utils/backtracking-rerender.js      |  23 --
 .../glimmer/tests/utils/debug-stack.js        |  32 +++
 .../@ember/debug/lib/capture-render-tree.ts   |   3 +-
 yarn.lock                                     | 210 ++++++++---------
 32 files changed, 403 insertions(+), 853 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
 delete mode 100644 packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js
 create mode 100644 packages/@ember/-internals/glimmer/tests/utils/debug-stack.js

diff --git a/package.json b/package.json
index 2f3af68d47d..d152a11bbb4 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.63.5",
+    "@glimmer/compiler": "0.64.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.63.5",
-    "@glimmer/interfaces": "0.63.5",
-    "@glimmer/node": "0.63.5",
-    "@glimmer/opcode-compiler": "0.63.5",
-    "@glimmer/program": "0.63.5",
-    "@glimmer/reference": "0.63.5",
-    "@glimmer/runtime": "0.63.5",
-    "@glimmer/validator": "0.63.5",
+    "@glimmer/global-context": "0.64.0",
+    "@glimmer/interfaces": "0.64.0",
+    "@glimmer/node": "0.64.0",
+    "@glimmer/opcode-compiler": "0.64.0",
+    "@glimmer/program": "0.64.0",
+    "@glimmer/reference": "0.64.0",
+    "@glimmer/runtime": "0.64.0",
+    "@glimmer/validator": "0.64.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 64193dc5e0f..36e1b978405 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -405,4 +405,3 @@ export { capabilities } from './lib/component-managers/custom';
 export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
 export { helperCapabilities, HelperManager, invokeHelper } from './lib/helpers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
-export { CapturedRenderNode } from './lib/utils/debug-render-tree';
diff --git a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
index ca251694fc4..8a6aa7a738e 100644
--- a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
+++ b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
@@ -8,10 +8,11 @@ import {
   Option,
   WithStaticLayout,
 } from '@glimmer/interfaces';
+import { unwrapTemplate } from '@glimmer/util';
 import RuntimeResolver from './resolver';
 
 interface StaticComponentManager
-  extends WithStaticLayout<unknown, unknown, RuntimeResolver>,
+  extends WithStaticLayout<unknown, unknown>,
     ComponentManager<unknown, unknown> {}
 
 function isStaticComponentManager(
@@ -52,10 +53,13 @@ export default class CompileTimeResolverImpl implements CompileTimeResolver<Owne
       };
     }
 
+    let template = unwrapTemplate(manager.getStaticLayout(state));
+    let layout = capabilities.wrapped ? template.asWrappedLayout() : template.asLayout();
+
     return {
       handle: definitionHandle,
       capabilities,
-      compilable: manager.getStaticLayout(state),
+      compilable: layout,
     };
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
index c1feedf58a5..8de8fb6c264 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
@@ -5,6 +5,7 @@ import {
   Destroyable,
   DynamicScope,
   ElementOperations,
+  Environment,
   Option,
   PreparedArguments,
   VM,
@@ -12,7 +13,6 @@ import {
 } from '@glimmer/interfaces';
 import { Reference } from '@glimmer/reference';
 import { SimpleElement } from '@simple-dom/interface';
-import { EmberVMEnvironment } from '../environment';
 
 // implements the ComponentManager interface as defined in glimmer:
 // tslint:disable-next-line:max-line-length
@@ -26,7 +26,7 @@ export default abstract class AbstractManager<T, U> implements ComponentManager<
   abstract getDebugName(state: U): string;
 
   abstract create(
-    env: EmberVMEnvironment,
+    env: Environment,
     definition: U,
     args: VMArguments,
     dynamicScope: DynamicScope,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 12bc88cfcc6..351f0139e2b 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,5 +1,4 @@
 import { privatize as P } from '@ember/-internals/container';
-import { ENV } from '@ember/-internals/environment';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
@@ -10,11 +9,11 @@ import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
-  CompilableProgram,
   ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
   ElementOperations,
+  Environment,
   Option,
   PreparedArguments,
   Template,
@@ -22,7 +21,6 @@ import {
   VMArguments,
   WithDynamicLayout,
   WithDynamicTagName,
-  WithStaticLayout,
 } from '@glimmer/interfaces';
 import {
   childRefFor,
@@ -31,8 +29,8 @@ import {
   Reference,
   valueForRef,
 } from '@glimmer/reference';
-import { registerDestructor, reifyPositional } from '@glimmer/runtime';
-import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
+import { reifyPositional } from '@glimmer/runtime';
+import { EMPTY_ARRAY } from '@glimmer/util';
 import {
   beginTrackFrame,
   beginUntrackFrame,
@@ -44,7 +42,6 @@ import {
 } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS } from '../component';
-import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
 import { isTemplateFactory } from '../template';
@@ -121,7 +118,6 @@ debugFreeze(EMPTY_POSITIONAL_ARGS);
 export default class CurlyComponentManager
   extends AbstractManager<ComponentStateBucket, DefinitionState>
   implements
-    WithStaticLayout<ComponentStateBucket, DefinitionState, RuntimeResolver>,
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket> {
   protected templateFor(component: Component): Template {
@@ -148,19 +144,8 @@ export default class CurlyComponentManager
     return factory(owner);
   }
 
-  getStaticLayout(state: DefinitionState): CompilableProgram {
-    return unwrapTemplate(state.template!).asLayout();
-  }
-
   getDynamicLayout(bucket: ComponentStateBucket): Template {
-    let component = bucket.component;
-    let template = this.templateFor(component);
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.environment.extra.debugRenderTree.setTemplate(bucket, template);
-    }
-
-    return template;
+    return this.templateFor(bucket.component);
   }
 
   getTagName(state: ComponentStateBucket): Option<string> {
@@ -173,7 +158,7 @@ export default class CurlyComponentManager
     return (component && component.tagName) || 'div';
   }
 
-  getCapabilities(state: DefinitionState) {
+  getCapabilities(state: DefinitionState): ComponentCapabilities {
     return state.capabilities;
   }
 
@@ -251,7 +236,7 @@ export default class CurlyComponentManager
    * etc.
    */
   create(
-    environment: EmberVMEnvironment,
+    environment: Environment,
     state: DefinitionState,
     args: VMArguments,
     dynamicScope: DynamicScope,
@@ -359,20 +344,6 @@ export default class CurlyComponentManager
 
     endUntrackFrame();
 
-    if (ENV._DEBUG_RENDER_TREE) {
-      environment.extra.debugRenderTree.create(bucket, {
-        type: 'component',
-        name: state.name,
-        args: args.capture(),
-        instance: component,
-        template: state.template,
-      });
-
-      registerDestructor(bucket, () => {
-        environment.extra.debugRenderTree.willDestroy(bucket);
-      });
-    }
-
     // consume every argument so we always run again
     consumeTag(bucket.argsTag);
     consumeTag(component[DIRTY_TAG]);
@@ -380,7 +351,7 @@ export default class CurlyComponentManager
     return bucket;
   }
 
-  getDebugName({ name }: DefinitionState) {
+  getDebugName({ name }: DefinitionState): string {
     return name;
   }
 
@@ -442,10 +413,6 @@ export default class CurlyComponentManager
   didRenderLayout(bucket: ComponentStateBucket, bounds: Bounds): void {
     bucket.component[BOUNDS] = bounds;
     bucket.finalize();
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.environment.extra.debugRenderTree.didRender(bucket, bounds);
-    }
   }
 
   didCreate({ component, environment }: ComponentStateBucket): void {
@@ -459,10 +426,6 @@ export default class CurlyComponentManager
   update(bucket: ComponentStateBucket): void {
     let { component, args, argsTag, argsRevision, environment } = bucket;
 
-    if (ENV._DEBUG_RENDER_TREE) {
-      environment.extra.debugRenderTree.update(bucket);
-    }
-
     bucket.finalizer = _instrumentStart('render.component', rerenderInstrumentDetails, component);
 
     beginUntrackFrame();
@@ -493,12 +456,8 @@ export default class CurlyComponentManager
     consumeTag(component[DIRTY_TAG]);
   }
 
-  didUpdateLayout(bucket: ComponentStateBucket, bounds: Bounds): void {
+  didUpdateLayout(bucket: ComponentStateBucket): void {
     bucket.finalize();
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.environment.extra.debugRenderTree.didRender(bucket, bounds);
-    }
   }
 
   didUpdate({ component, environment }: ComponentStateBucket): void {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 5e5a932d4d1..1a472a8ad59 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -1,13 +1,12 @@
-import { ENV } from '@ember/-internals/environment';
 import { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import {
   Arguments,
-  Bounds,
   ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
   Dict,
+  Environment,
   Option,
   Template,
   VMArguments,
@@ -15,9 +14,6 @@ import {
 } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
-import { EmberVMEnvironment } from '../environment';
-import RuntimeResolver from '../resolver';
 import { argsProxyFor } from '../utils/args-proxy';
 import { buildCapabilities, InternalCapabilities } from '../utils/managers';
 import AbstractComponentManager from './abstract';
@@ -173,11 +169,10 @@ export default class CustomComponentManager<ComponentInstance>
   implements
     WithStaticLayout<
       CustomComponentState<ComponentInstance>,
-      CustomComponentDefinitionState<ComponentInstance>,
-      RuntimeResolver
+      CustomComponentDefinitionState<ComponentInstance>
     > {
   create(
-    env: EmberVMEnvironment,
+    env: Environment,
     definition: CustomComponentDefinitionState<ComponentInstance>,
     vmArgs: VMArguments
   ): CustomComponentState<ComponentInstance> {
@@ -188,32 +183,14 @@ export default class CustomComponentManager<ComponentInstance>
 
     let bucket = new CustomComponentState(delegate, component, args, env);
 
-    if (ENV._DEBUG_RENDER_TREE) {
-      env.extra.debugRenderTree.create(bucket, {
-        type: 'component',
-        name: definition.name,
-        args: vmArgs.capture(),
-        instance: component,
-        template: definition.template,
-      });
-
-      registerDestructor(bucket, () => {
-        env.extra.debugRenderTree.willDestroy(bucket);
-      });
-    }
-
     return bucket;
   }
 
-  getDebugName({ name }: CustomComponentDefinitionState<ComponentInstance>) {
+  getDebugName({ name }: CustomComponentDefinitionState<ComponentInstance>): string {
     return name;
   }
 
-  update(bucket: CustomComponentState<ComponentInstance>) {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.env.extra.debugRenderTree.update(bucket);
-    }
-
+  update(bucket: CustomComponentState<ComponentInstance>): void {
     if (hasUpdateHook(bucket.delegate)) {
       let { delegate, component, args } = bucket;
 
@@ -221,21 +198,21 @@ export default class CustomComponentManager<ComponentInstance>
     }
   }
 
-  didCreate({ delegate, component }: CustomComponentState<ComponentInstance>) {
+  didCreate({ delegate, component }: CustomComponentState<ComponentInstance>): void {
     if (hasAsyncLifeCycleCallbacks(delegate)) {
       delegate.didCreateComponent(component);
     }
   }
 
-  didUpdate({ delegate, component }: CustomComponentState<ComponentInstance>) {
+  didUpdate({ delegate, component }: CustomComponentState<ComponentInstance>): void {
     if (hasAsyncUpdateHook(delegate)) {
       delegate.didUpdateComponent(component);
     }
   }
 
-  getContext({ delegate, component }: CustomComponentState<ComponentInstance>) {
-    delegate.getContext(component);
-  }
+  didRenderLayout(): void {}
+
+  didUpdateLayout(): void {}
 
   getSelf({ delegate, component }: CustomComponentState<ComponentInstance>): Reference {
     return createConstRef(delegate.getContext(component), 'this');
@@ -245,28 +222,12 @@ export default class CustomComponentManager<ComponentInstance>
     return bucket;
   }
 
-  getCapabilities({
-    delegate,
-  }: CustomComponentDefinitionState<ComponentInstance>): ComponentCapabilities {
-    return Object.assign({}, CAPABILITIES, {
-      updateHook: ENV._DEBUG_RENDER_TREE || delegate.capabilities.updateHook,
-    });
-  }
-
-  didRenderLayout(bucket: CustomComponentState<ComponentInstance>, bounds: Bounds) {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.env.extra.debugRenderTree.didRender(bucket, bounds);
-    }
-  }
-
-  didUpdateLayout(bucket: CustomComponentState<ComponentInstance>, bounds: Bounds) {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.env.extra.debugRenderTree.didRender(bucket, bounds);
-    }
+  getCapabilities(): ComponentCapabilities {
+    return CAPABILITIES;
   }
 
-  getStaticLayout(state: DefinitionState<ComponentInstance>) {
-    return unwrapTemplate(state.template).asLayout();
+  getStaticLayout(state: DefinitionState<ComponentInstance>): Template {
+    return state.template;
   }
 }
 const CUSTOM_COMPONENT_MANAGER = new CustomComponentManager();
@@ -279,7 +240,7 @@ export class CustomComponentState<ComponentInstance> {
     public delegate: ManagerDelegate<ComponentInstance>,
     public component: ComponentInstance,
     public args: Arguments,
-    public env: EmberVMEnvironment
+    public env: Environment
   ) {
     if (hasDestructors(delegate)) {
       registerDestructor(this, () => delegate.destroyComponent(component));
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index b3d65a72461..87c7f50d508 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -1,22 +1,18 @@
-import { ENV } from '@ember/-internals/environment';
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import {
-  Bounds,
   ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
   DynamicScope,
+  Environment,
   Template,
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
-import { _WeakSet, unwrapTemplate } from '@glimmer/util';
+import { _WeakSet } from '@glimmer/util';
 import InternalComponent from '../components/internal';
-import { EmberVMEnvironment } from '../environment';
-import RuntimeResolver from '../resolver';
 import AbstractComponentManager from './abstract';
 
 const CAPABILITIES: ComponentCapabilities = {
@@ -28,7 +24,7 @@ const CAPABILITIES: ComponentCapabilities = {
   elementHook: false,
   createCaller: true,
   dynamicScope: false,
-  updateHook: true,
+  updateHook: false,
   createInstance: true,
   wrapped: false,
   willDestroy: false,
@@ -40,7 +36,7 @@ export interface InternalDefinitionState {
 }
 
 export interface InternalComponentState {
-  env: EmberVMEnvironment;
+  env: Environment;
   instance: Destroyable;
 }
 
@@ -65,7 +61,7 @@ export function isInternalManager(manager: object): manager is InternalManager {
 
 export default class InternalManager
   extends AbstractComponentManager<InternalComponentState, InternalDefinitionState>
-  implements WithStaticLayout<InternalComponentState, InternalDefinitionState, RuntimeResolver> {
+  implements WithStaticLayout<InternalComponentState, InternalDefinitionState> {
   static for(name: string): (owner: Owner) => InternalManager {
     return (owner: Owner) => new InternalManager(owner, name);
   }
@@ -80,8 +76,8 @@ export default class InternalManager
   }
 
   create(
-    env: EmberVMEnvironment,
-    { ComponentClass, layout }: InternalDefinitionState,
+    env: Environment,
+    { ComponentClass }: InternalDefinitionState,
     args: VMArguments,
     _dynamicScope: DynamicScope,
     caller: Reference
@@ -97,18 +93,6 @@ export default class InternalManager
 
     let state = { env, instance };
 
-    if (ENV._DEBUG_RENDER_TREE) {
-      env.extra.debugRenderTree.create(state, {
-        type: 'component',
-        name: this.getDebugName(),
-        args: args.capture(),
-        instance,
-        template: layout,
-      });
-
-      registerDestructor(instance, () => env.extra.debugRenderTree.willDestroy(state));
-    }
-
     return state;
   }
 
@@ -120,29 +104,19 @@ export default class InternalManager
     return createConstRef(instance, 'this');
   }
 
-  didRenderLayout(state: InternalComponentState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.env.extra.debugRenderTree.didRender(state, bounds);
-    }
-  }
+  didCreate(): void {}
 
-  update(state: InternalComponentState): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.env.extra.debugRenderTree.update(state);
-    }
-  }
+  didUpdate(): void {}
 
-  didUpdateLayout(state: InternalComponentState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.env.extra.debugRenderTree.didRender(state, bounds);
-    }
-  }
+  didRenderLayout(): void {}
+
+  didUpdateLayout(): void {}
 
   getDestroyable(state: InternalComponentState): Destroyable {
     return state.instance;
   }
 
-  getStaticLayout({ layout: template }: InternalDefinitionState) {
-    return unwrapTemplate(template).asLayout();
+  getStaticLayout({ layout: template }: InternalDefinitionState): Template {
+    return template;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 7cbc167c58c..1bc8c7f1470 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,19 +1,22 @@
-import { ENV } from '@ember/-internals/environment';
+import { Owner } from '@ember/-internals/owner';
 import { generateControllerFactory } from '@ember/-internals/routing';
 import EngineInstance from '@ember/engine/instance';
 import {
-  Bounds,
+  CapturedArguments,
   ComponentCapabilities,
   ComponentDefinition,
+  CustomRenderNode,
   Destroyable,
+  Environment,
   Option,
+  Template,
   TemplateFactory,
   VMArguments,
+  WithCustomDebugRenderTree,
   WithDynamicLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
-import { EmberVMEnvironment } from '../environment';
+import { associateDestroyableChild } from '@glimmer/runtime';
 import RuntimeResolver from '../resolver';
 import AbstractManager from './abstract';
 
@@ -21,7 +24,6 @@ interface EngineState {
   engine: EngineInstance;
   controller: any;
   self: Reference;
-  environment: EmberVMEnvironment;
   modelRef?: Reference;
 }
 
@@ -46,29 +48,25 @@ const CAPABILITIES = {
 
 class MountManager
   extends AbstractManager<EngineState, EngineDefinitionState>
-  implements WithDynamicLayout<EngineState, RuntimeResolver> {
-  getDynamicLayout(state: EngineState, _: RuntimeResolver) {
+  implements
+    WithDynamicLayout<EngineState, RuntimeResolver>,
+    WithCustomDebugRenderTree<EngineState, EngineDefinitionState> {
+  getDynamicLayout(state: EngineState) {
     let templateFactory = state.engine.lookup('template:application') as TemplateFactory;
-    let template = templateFactory(state.engine);
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.environment.extra.debugRenderTree.setTemplate(state.controller, template);
-    }
-
-    return template;
+    return templateFactory(state.engine);
   }
 
   getCapabilities(): ComponentCapabilities {
     return CAPABILITIES;
   }
 
-  create(environment: EmberVMEnvironment, { name }: EngineDefinitionState, args: VMArguments) {
+  create(env: Environment<Owner>, { name }: EngineDefinitionState, args: VMArguments) {
     // TODO
     // mount is a runtime helper, this shouldn't use dynamic layout
     // we should resolve the engine app template in the helper
     // it also should use the owner that looked up the mount helper.
 
-    let engine = environment.extra.owner.buildChildEngineInstance(name);
+    let engine = env.owner.buildChildEngineInstance(name);
 
     engine.boot();
 
@@ -86,36 +84,16 @@ class MountManager
     if (modelRef === undefined) {
       controller = controllerFactory.create();
       self = createConstRef(controller, 'this');
-      bucket = { engine, controller, self, environment };
+      bucket = { engine, controller, self, modelRef };
     } else {
       let model = valueForRef(modelRef);
       controller = controllerFactory.create({ model });
       self = createConstRef(controller, 'this');
-      bucket = { engine, controller, self, modelRef, environment };
+      bucket = { engine, controller, self, modelRef };
     }
 
-    if (ENV._DEBUG_RENDER_TREE) {
-      environment.extra.debugRenderTree.create(bucket, {
-        type: 'engine',
-        name,
-        args: args.capture(),
-        instance: engine,
-        template: undefined,
-      });
-
-      environment.extra.debugRenderTree.create(controller, {
-        type: 'route-template',
-        name: 'application',
-        args: args.capture(),
-        instance: controller,
-        // set in getDynamicLayout
-        template: undefined,
-      });
-
-      registerDestructor(engine, () => {
-        environment.extra.debugRenderTree.willDestroy(controller);
-        environment.extra.debugRenderTree.willDestroy(bucket);
-      });
+    if (env.debugRenderTree) {
+      associateDestroyableChild(engine, controller);
     }
 
     return bucket;
@@ -125,6 +103,31 @@ class MountManager
     return name;
   }
 
+  getDebugCustomRenderTree(
+    definition: EngineDefinitionState,
+    state: EngineState,
+    args: CapturedArguments,
+    template?: Template
+  ): CustomRenderNode[] {
+    return [
+      {
+        bucket: state.engine,
+        instance: state.engine,
+        type: 'engine',
+        name: definition.name,
+        args,
+      },
+      {
+        bucket: state.controller,
+        instance: state.controller,
+        type: 'route-template',
+        name: 'application',
+        args,
+        template,
+      },
+    ];
+  }
+
   getSelf({ self }: EngineState): Reference {
     return self;
   }
@@ -133,32 +136,17 @@ class MountManager
     return bucket.engine;
   }
 
-  didRenderLayout(bucket: EngineState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.environment.extra.debugRenderTree.didRender(bucket.controller, bounds);
-      bucket.environment.extra.debugRenderTree.didRender(bucket, bounds);
-    }
-  }
+  didRenderLayout(): void {}
 
   update(bucket: EngineState): void {
-    let { controller, environment, modelRef } = bucket;
+    let { controller, modelRef } = bucket;
 
     if (modelRef !== undefined) {
       controller.set('model', valueForRef(modelRef!));
     }
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      environment.extra.debugRenderTree.update(bucket);
-      environment.extra.debugRenderTree.update(bucket.controller);
-    }
   }
 
-  didUpdateLayout(bucket: EngineState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket.environment.extra.debugRenderTree.didRender(bucket.controller, bounds);
-      bucket.environment.extra.debugRenderTree.didRender(bucket, bounds);
-    }
-  }
+  didUpdateLayout(): void {}
 }
 
 const MOUNT_MANAGER = new MountManager();
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 813c9395047..8955c65ff85 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -5,25 +5,24 @@ import EngineInstance from '@ember/engine/instance';
 import { _instrumentStart } from '@ember/instrumentation';
 import { assign } from '@ember/polyfills';
 import {
-  Bounds,
+  CapturedArguments,
   ComponentCapabilities,
   ComponentDefinition,
+  CustomRenderNode,
   Destroyable,
-  ElementOperations,
+  Environment,
   Option,
   Template,
   VMArguments,
+  WithCustomDebugRenderTree,
   WithDynamicTagName,
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { EMPTY_ARGS, registerDestructor } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
+import { EMPTY_ARGS } from '@glimmer/runtime';
 
 import { SimpleElement } from '@simple-dom/interface';
-import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
-import RuntimeResolver from '../resolver';
 import { OutletState } from '../utils/outlet';
 import OutletView from '../views/outlet';
 import AbstractManager from './abstract';
@@ -34,9 +33,9 @@ function instrumentationPayload(def: OutletDefinitionState) {
 
 interface OutletInstanceState {
   self: Reference;
-  environment: EmberVMEnvironment;
   outlet?: { name: string };
-  engine?: { mountPoint: string };
+  engineBucket?: { mountPoint: string };
+  engine?: EngineInstance;
   finalize: () => void;
 }
 
@@ -53,12 +52,12 @@ const CAPABILITIES: ComponentCapabilities = {
   dynamicLayout: false,
   dynamicTag: false,
   prepareArgs: false,
-  createArgs: ENV._DEBUG_RENDER_TREE,
+  createArgs: false,
   attributeHook: false,
   elementHook: false,
   createCaller: false,
   dynamicScope: true,
-  updateHook: ENV._DEBUG_RENDER_TREE,
+  updateHook: false,
   createInstance: true,
   wrapped: false,
   willDestroy: false,
@@ -66,11 +65,13 @@ const CAPABILITIES: ComponentCapabilities = {
 
 class OutletComponentManager
   extends AbstractManager<OutletInstanceState, OutletDefinitionState>
-  implements WithStaticLayout<OutletInstanceState, OutletDefinitionState, RuntimeResolver> {
+  implements
+    WithStaticLayout<OutletInstanceState, OutletDefinitionState>,
+    WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState> {
   create(
-    environment: EmberVMEnvironment,
+    env: Environment,
     definition: OutletDefinitionState,
-    args: VMArguments,
+    _args: VMArguments,
     dynamicScope: DynamicScope
   ): OutletInstanceState {
     let parentStateRef = dynamicScope.get('outletState');
@@ -80,21 +81,11 @@ class OutletComponentManager
 
     let state: OutletInstanceState = {
       self: createConstRef(definition.controller, 'this'),
-      environment,
       finalize: _instrumentStart('render.outlet', instrumentationPayload, definition),
     };
 
-    if (ENV._DEBUG_RENDER_TREE) {
+    if (env.debugRenderTree !== undefined) {
       state.outlet = { name: definition.outlet };
-
-      environment.extra.debugRenderTree.create(state.outlet, {
-        type: 'outlet',
-        name: state.outlet.name,
-        args: EMPTY_ARGS,
-        instance: undefined,
-        template: undefined,
-      });
-
       let parentState = valueForRef(parentStateRef);
       let parentOwner = parentState && parentState.render && parentState.render.owner;
       let currentOwner = valueForRef(currentStateRef)!.render!.owner;
@@ -107,50 +98,62 @@ class OutletComponentManager
 
         let mountPoint = engine.mountPoint!;
 
-        state.engine = { mountPoint };
-
-        environment.extra.debugRenderTree.create(state.engine, {
-          type: 'engine',
-          name: mountPoint,
-          args: EMPTY_ARGS,
-          instance: engine,
-          template: undefined,
-        });
+        state.engine = engine;
+        state.engineBucket = { mountPoint };
       }
-
-      environment.extra.debugRenderTree.create(state, {
-        type: 'route-template',
-        name: definition.name,
-        args: args.capture(),
-        instance: definition.controller,
-        template: definition.template,
-      });
-
-      registerDestructor(state, () => {
-        state.environment.extra.debugRenderTree.willDestroy(state);
-
-        if (state.engine) {
-          state.environment.extra.debugRenderTree.willDestroy(state.engine);
-        }
-
-        state.environment.extra.debugRenderTree.willDestroy(state.outlet!);
-      });
     }
 
     return state;
   }
 
   getDebugName({ name }: OutletDefinitionState) {
-    if (name === '-top-level') {
-      return '- While rendering:';
+    return name;
+  }
+
+  getDebugCustomRenderTree(
+    definition: OutletDefinitionState,
+    state: OutletInstanceState,
+    args: CapturedArguments
+  ): CustomRenderNode[] {
+    let nodes: CustomRenderNode[] = [];
+
+    if (state.outlet) {
+      nodes.push({
+        bucket: state.outlet,
+        type: 'outlet',
+        name: state.outlet.name,
+        args: EMPTY_ARGS,
+        instance: undefined,
+        template: undefined,
+      });
     }
 
-    return name;
+    if (state.engineBucket) {
+      nodes.push({
+        bucket: state.engineBucket,
+        type: 'engine',
+        name: state.engineBucket.mountPoint,
+        args: EMPTY_ARGS,
+        instance: state.engine,
+        template: undefined,
+      });
+    }
+
+    nodes.push({
+      bucket: state,
+      type: 'route-template',
+      name: definition.name,
+      args: args,
+      instance: definition.controller,
+      template: definition.template,
+    });
+
+    return nodes;
   }
 
   getStaticLayout({ template }: OutletDefinitionState) {
     // The router has already resolved the template
-    return unwrapTemplate(template).asLayout();
+    return template;
   }
 
   getCapabilities(): ComponentCapabilities {
@@ -161,50 +164,12 @@ class OutletComponentManager
     return self;
   }
 
-  didRenderLayout(state: OutletInstanceState, bounds: Bounds): void {
+  didRenderLayout(state: OutletInstanceState): void {
     state.finalize();
-
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.environment.extra.debugRenderTree.didRender(state, bounds);
-
-      if (state.engine) {
-        state.environment.extra.debugRenderTree.didRender(state.engine, bounds);
-      }
-
-      state.environment.extra.debugRenderTree.didRender(state.outlet!, bounds);
-    }
   }
 
-  update(state: OutletInstanceState): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.environment.extra.debugRenderTree.update(state.outlet!);
-
-      if (state.engine) {
-        state.environment.extra.debugRenderTree.update(state.engine);
-      }
-
-      state.environment.extra.debugRenderTree.update(state);
-    }
-  }
-
-  didUpdateLayout(state: OutletInstanceState, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      state.environment.extra.debugRenderTree.didRender(state, bounds);
-
-      if (state.engine) {
-        state.environment.extra.debugRenderTree.didRender(state.engine, bounds);
-      }
-
-      state.environment.extra.debugRenderTree.didRender(state.outlet!, bounds);
-    }
-  }
-
-  getDestroyable(state: OutletInstanceState): Option<Destroyable> {
-    if (ENV._DEBUG_RENDER_TREE) {
-      return state;
-    } else {
-      return null;
-    }
+  getDestroyable(): Option<Destroyable> {
+    return null;
   }
 }
 
@@ -230,24 +195,20 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
     const WrappedOutletComponentManager = class
       extends OutletComponentManager
       implements WithDynamicTagName<OutletInstanceState> {
-      getTagName(_component: OutletInstanceState) {
+      getTagName() {
         return 'div';
       }
 
       getStaticLayout({ template }: OutletDefinitionState) {
         // The router has already resolved the template
-        return unwrapTemplate(template).asWrappedLayout();
+        return template;
       }
 
       getCapabilities(): ComponentCapabilities {
         return WRAPPED_CAPABILITIES;
       }
 
-      didCreateElement(
-        component: OutletInstanceState,
-        element: SimpleElement,
-        _operations: ElementOperations
-      ): void {
+      didCreateElement(component: OutletInstanceState, element: SimpleElement): void {
         // to add GUID id and class
         element.setAttribute('class', 'ember-view');
         element.setAttribute('id', guidFor(component));
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index ddb5cd2ad44..6263f39887b 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -1,19 +1,17 @@
 import { getFactoryFor } from '@ember/-internals/container';
-import { ENV } from '@ember/-internals/environment';
 import { Factory } from '@ember/-internals/owner';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import {
   ComponentCapabilities,
   ComponentDefinition,
+  Environment,
   Option,
+  Template,
   VMArguments,
 } from '@glimmer/interfaces';
-import { EMPTY_ARGS } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
 import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
 import { DIRTY_TAG } from '../component';
-import { EmberVMEnvironment } from '../environment';
 import { DynamicScope } from '../renderer';
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
 import CurlyComponentManager, {
@@ -30,18 +28,13 @@ class RootComponentManager extends CurlyComponentManager {
     this.component = component;
   }
 
-  getDebugName() {
-    return '- While rendering:';
-  }
-
-  getStaticLayout(_state: DefinitionState) {
-    const template = this.templateFor(this.component);
-    return unwrapTemplate(template).asWrappedLayout();
+  getStaticLayout(): Template {
+    return this.templateFor(this.component);
   }
 
   create(
-    environment: EmberVMEnvironment,
-    state: DefinitionState,
+    environment: Environment,
+    _state: DefinitionState,
     _args: Option<VMArguments>,
     dynamicScope: DynamicScope
   ) {
@@ -79,16 +72,6 @@ class RootComponentManager extends CurlyComponentManager {
       hasWrappedElement
     );
 
-    if (ENV._DEBUG_RENDER_TREE) {
-      environment.extra.debugRenderTree.create(bucket, {
-        type: 'component',
-        name: state.name,
-        args: EMPTY_ARGS,
-        instance: component,
-        template: state.template!,
-      });
-    }
-
     consumeTag(component[DIRTY_TAG]);
 
     return bucket;
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index ba7907c82d1..3dccf8e411d 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -1,113 +1,52 @@
-import { ENV } from '@ember/-internals/environment';
 import {
-  Bounds,
   ComponentCapabilities,
   ComponentDefinition,
+  Environment,
   Option,
   Template,
-  VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
-import { NULL_REFERENCE } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
-import { unwrapTemplate } from '@glimmer/util';
-import { EmberVMEnvironment } from '../environment';
-import RuntimeResolver from '../resolver';
-import AbstractManager from './abstract';
+import { NULL_REFERENCE, Reference } from '@glimmer/reference';
 
 const CAPABILITIES: ComponentCapabilities = {
   dynamicLayout: false,
   dynamicTag: false,
   prepareArgs: false,
-  createArgs: ENV._DEBUG_RENDER_TREE,
+  createArgs: false,
   attributeHook: false,
   elementHook: false,
   createCaller: false,
   dynamicScope: false,
-  updateHook: ENV._DEBUG_RENDER_TREE,
-  createInstance: true,
+  updateHook: false,
+  createInstance: false,
   wrapped: false,
   willDestroy: false,
 };
 
 export interface DebugStateBucket {
-  environment: EmberVMEnvironment;
+  environment: Environment;
 }
 
 export default class TemplateOnlyComponentManager
-  extends AbstractManager<Option<DebugStateBucket>, TemplateOnlyComponentDefinitionState>
-  implements
-    WithStaticLayout<
-      Option<DebugStateBucket>,
-      TemplateOnlyComponentDefinitionState,
-      RuntimeResolver
-    > {
-  getStaticLayout({ template }: TemplateOnlyComponentDefinitionState) {
-    return unwrapTemplate(template).asLayout();
+  implements WithStaticLayout<Option<DebugStateBucket>, TemplateOnlyComponentDefinitionState> {
+  getStaticLayout({ template }: TemplateOnlyComponentDefinitionState): Template {
+    return template;
   }
 
   getCapabilities(): ComponentCapabilities {
     return CAPABILITIES;
   }
 
-  create(
-    environment: EmberVMEnvironment,
-    { name, template }: TemplateOnlyComponentDefinitionState,
-    args: VMArguments
-  ): Option<DebugStateBucket> {
-    if (ENV._DEBUG_RENDER_TREE) {
-      let bucket = { environment };
-
-      environment.extra.debugRenderTree.create(bucket, {
-        type: 'component',
-        name: name,
-        args: args.capture(),
-        instance: null,
-        template,
-      });
-
-      registerDestructor(bucket, () => {
-        bucket.environment.extra.debugRenderTree.willDestroy(bucket!);
-      });
-
-      return bucket;
-    } else {
-      return null;
-    }
-  }
-
-  getDebugName({ name }: TemplateOnlyComponentDefinitionState) {
+  getDebugName({ name }: TemplateOnlyComponentDefinitionState): string {
     return name;
   }
 
-  getSelf() {
+  getSelf(): Reference {
     return NULL_REFERENCE;
   }
 
-  getDestroyable(bucket: Option<DebugStateBucket>) {
-    if (ENV._DEBUG_RENDER_TREE) {
-      return bucket;
-    } else {
-      return null;
-    }
-  }
-
-  didRenderLayout(bucket: Option<DebugStateBucket>, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket!.environment.extra.debugRenderTree.didRender(bucket!, bounds);
-    }
-  }
-
-  update(bucket: Option<DebugStateBucket>): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket!.environment.extra.debugRenderTree.update(bucket!);
-    }
-  }
-
-  didUpdateLayout(bucket: Option<DebugStateBucket>, bounds: Bounds): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      bucket!.environment.extra.debugRenderTree.didRender(bucket!, bounds);
-    }
+  getDestroyable(): null {
+    return null;
   }
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 485635d3925..506ccca2eec 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -7,10 +7,8 @@ import { assert, deprecate, warn } from '@ember/debug';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
-import { Environment, Template } from '@glimmer/interfaces';
 import { EnvironmentDelegate } from '@glimmer/runtime';
 import { setTrackingTransactionEnv } from '@glimmer/validator';
-import DebugRenderTree from './utils/debug-render-tree';
 import toIterator from './utils/iterator';
 import { isHTMLSafe } from './utils/string';
 import toBool from './utils/to-bool';
@@ -84,59 +82,10 @@ if (DEBUG) {
 
 // Define environment delegate
 
-export interface CompilerFactory {
-  id: string;
-  new (template: Template): any;
-}
-
-export class EmberEnvironmentExtra {
-  private _debugRenderTree?: DebugRenderTree;
-
-  constructor(public owner: Owner) {
-    if (ENV._DEBUG_RENDER_TREE) {
-      this._debugRenderTree = new DebugRenderTree();
-    }
-  }
-
-  get debugRenderTree(): DebugRenderTree {
-    if (ENV._DEBUG_RENDER_TREE) {
-      return this._debugRenderTree!;
-    } else {
-      throw new Error(
-        "Can't access debug render tree outside of the inspector (_DEBUG_RENDER_TREE flag is disabled)"
-      );
-    }
-  }
-
-  begin(): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      this.debugRenderTree.begin();
-    }
-  }
-
-  commit(): void {
-    if (ENV._DEBUG_RENDER_TREE) {
-      this.debugRenderTree.commit();
-    }
-  }
-}
+export class EmberEnvironmentDelegate implements EnvironmentDelegate {
+  public enableDebugTooling: boolean = ENV._DEBUG_RENDER_TREE;
 
-export class EmberEnvironmentDelegate implements EnvironmentDelegate<EmberEnvironmentExtra> {
-  public isInteractive: boolean;
-  public extra: EmberEnvironmentExtra;
+  constructor(public owner: Owner, public isInteractive: boolean) {}
 
-  constructor(owner: Owner, isInteractive: boolean) {
-    this.extra = new EmberEnvironmentExtra(owner);
-    this.isInteractive = isInteractive;
-  }
-
-  onTransactionBegin() {
-    this.extra.begin();
-  }
-
-  onTransactionCommit() {
-    this.extra.commit();
-  }
+  onTransactionCommit() {}
 }
-
-export type EmberVMEnvironment = Environment<EmberEnvironmentExtra>;
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 1619f132970..76f7e309144 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -7,6 +7,7 @@ import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   Cursor,
+  DebugRenderTree,
   DynamicScope as GlimmerDynamicScope,
   ElementBuilder,
   Environment,
@@ -40,7 +41,7 @@ import { BOUNDS } from './component';
 import { createRootOutlet } from './component-managers/outlet';
 import { RootComponentDefinition } from './component-managers/root';
 import { NodeDOMTreeConstruction } from './dom';
-import { EmberEnvironmentDelegate, EmberEnvironmentExtra } from './environment';
+import { EmberEnvironmentDelegate } from './environment';
 import RuntimeResolver from './resolver';
 import { populateMacros } from './syntax';
 import { Component } from './utils/curly-component-state-bucket';
@@ -115,7 +116,7 @@ class RootState {
 
   constructor(
     public root: Component | OutletView,
-    public runtime: RuntimeContext<EmberEnvironmentExtra>,
+    public runtime: RuntimeContext,
     context: SyntaxCompilationContext,
     template: Template,
     self: Reference<unknown>,
@@ -281,7 +282,7 @@ export abstract class Renderer {
   private _inRenderTransaction = false;
 
   private _context: SyntaxCompilationContext;
-  private _runtime: RuntimeContext<EmberEnvironmentExtra>;
+  private _runtime: RuntimeContext;
 
   private _lastRevision = -1;
   private _destroyed = false;
@@ -328,8 +329,15 @@ export abstract class Renderer {
     );
   }
 
-  get debugRenderTree() {
-    return this._runtime.env.extra.debugRenderTree;
+  get debugRenderTree(): DebugRenderTree {
+    let { debugRenderTree } = this._runtime.env;
+
+    assert(
+      'Attempted to access the DebugRenderTree, but it did not exist. Is the Ember Inspector open?',
+      debugRenderTree
+    );
+
+    return debugRenderTree!;
   }
 
   // renderer HOOKS
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 9f8e5a32dcc..4099315fd5b 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -1,9 +1,10 @@
 /**
 @module ember
 */
+import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, Environment, Option, VM, VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, Reference, valueForRef } from '@glimmer/reference';
 import {
   createCapturedArgs,
@@ -12,7 +13,6 @@ import {
   EMPTY_POSITIONAL,
 } from '@glimmer/runtime';
 import { MountDefinition } from '../component-managers/mount';
-import { EmberVMEnvironment } from '../environment';
 
 /**
   The `{{mount}}` helper lets you embed a routeless engine in a template.
@@ -58,7 +58,7 @@ export function mountHelper(
   args: VMArguments,
   vm: VM
 ): Reference<CurriedComponentDefinition | null> {
-  let env = vm.env as EmberVMEnvironment;
+  let env = vm.env as Environment<Owner>;
   let nameRef = args.positional.at(0) as Reference<Option<string>>;
   let captured: Option<CapturedArguments> = null;
 
@@ -102,10 +102,10 @@ export function mountHelper(
 
       assert(
         `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`,
-        env.extra.owner.hasRegistration(`engine:${name}`)
+        env.owner.hasRegistration(`engine:${name}`)
       );
 
-      if (!env.extra.owner.hasRegistration(`engine:${name}`)) {
+      if (!env.owner.hasRegistration(`engine:${name}`)) {
         return null;
       }
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index ea78b2a748d..72d89abc7b2 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,9 +1,13 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
-import { CapturedNamedArguments, Template, TemplateFactory } from '@glimmer/interfaces';
+import {
+  CapturedNamedArguments,
+  Environment,
+  Template,
+  TemplateFactory,
+} from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
 import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
-import { EmberVMEnvironment } from '../environment';
 import { Renderer } from '../renderer';
 
 export interface Component {
@@ -44,7 +48,7 @@ export default class ComponentStateBucket {
   public argsRevision: Revision;
 
   constructor(
-    public environment: EmberVMEnvironment,
+    public environment: Environment,
     public component: Component,
     public args: CapturedNamedArguments | null,
     public argsTag: Tag,
diff --git a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts b/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
deleted file mode 100644
index 5fcdb174042..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/debug-render-tree.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import { assert } from '@ember/debug';
-import { Arguments, Bounds, CapturedArguments, Option, Template } from '@glimmer/interfaces';
-import { reifyArgs } from '@glimmer/runtime';
-import { expect, Stack, unwrapTemplate } from '@glimmer/util';
-import { SimpleElement, SimpleNode } from '@simple-dom/interface';
-
-export type RenderNodeType = 'outlet' | 'engine' | 'route-template' | 'component';
-
-export interface RenderNode {
-  type: RenderNodeType;
-  name: string;
-  args: CapturedArguments;
-  instance: unknown;
-  template?: Template;
-}
-
-interface InternalRenderNode<T extends object> extends RenderNode {
-  bounds: Option<Bounds>;
-  refs: Set<Ref<T>>;
-  parent?: InternalRenderNode<T>;
-}
-
-export interface CapturedRenderNode {
-  id: string;
-  type: RenderNodeType;
-  name: string;
-  args: Arguments;
-  instance: unknown;
-  template: Option<string>;
-  bounds: Option<{
-    parentElement: SimpleElement;
-    firstNode: SimpleNode;
-    lastNode: SimpleNode;
-  }>;
-  children: CapturedRenderNode[];
-}
-
-let GUID = 0;
-
-export class Ref<T extends object> {
-  readonly id: number = GUID++;
-  private value: Option<T>;
-
-  constructor(value: T) {
-    this.value = value;
-  }
-
-  get(): Option<T> {
-    return this.value;
-  }
-
-  release(): void {
-    assert('BUG: double release?', this.value !== null);
-    this.value = null;
-  }
-
-  toString(): String {
-    let label = `Ref ${this.id}`;
-
-    if (this.value === null) {
-      return `${label} (released)`;
-    } else {
-      try {
-        return `${label}: ${this.value}`;
-      } catch {
-        return label;
-      }
-    }
-  }
-}
-
-export default class DebugRenderTree<Bucket extends object = object> {
-  private stack = new Stack<Bucket>();
-
-  private refs = new WeakMap<Bucket, Ref<Bucket>>();
-  private roots = new Set<Ref<Bucket>>();
-  private nodes = new WeakMap<Bucket, InternalRenderNode<Bucket>>();
-
-  begin(): void {
-    this.reset();
-  }
-
-  create(state: Bucket, node: RenderNode): void {
-    let internalNode: InternalRenderNode<Bucket> = {
-      ...node,
-      bounds: null,
-      refs: new Set(),
-    };
-    this.nodes.set(state, internalNode);
-    this.appendChild(internalNode, state);
-    this.enter(state);
-  }
-
-  update(state: Bucket): void {
-    this.enter(state);
-  }
-
-  // for dynamic layouts
-  setTemplate(state: Bucket, template: Template): void {
-    this.nodeFor(state).template = template;
-  }
-
-  didRender(state: Bucket, bounds: Bounds): void {
-    assert(`BUG: expecting ${this.stack.current}, got ${state}`, this.stack.current === state);
-    this.nodeFor(state).bounds = bounds;
-    this.exit();
-  }
-
-  willDestroy(state: Bucket): void {
-    expect(this.refs.get(state), 'BUG: missing ref').release();
-  }
-
-  commit(): void {
-    this.reset();
-  }
-
-  capture(): CapturedRenderNode[] {
-    return this.captureRefs(this.roots);
-  }
-
-  private reset(): void {
-    if (this.stack.size !== 0) {
-      // We probably encountered an error during the rendering loop. This will
-      // likely trigger undefined behavior and memory leaks as the error left
-      // things in an inconsistent state. It is recommended that the user
-      // refresh the page.
-
-      // TODO: We could warn here? But this happens all the time in our tests?
-
-      // Clean up the root reference to prevent errors from happening if we
-      // attempt to capture the render tree (Ember Inspector may do this)
-      let root = expect(this.stack.toArray()[0], 'expected root state when resetting render tree');
-      let ref = this.refs.get(root);
-
-      if (ref !== undefined) {
-        this.roots.delete(ref);
-      }
-
-      while (!this.stack.isEmpty()) {
-        this.stack.pop();
-      }
-    }
-  }
-
-  private enter(state: Bucket): void {
-    this.stack.push(state);
-  }
-
-  private exit(): void {
-    assert('BUG: unbalanced pop', this.stack.size !== 0);
-    this.stack.pop();
-  }
-
-  private nodeFor(state: Bucket): InternalRenderNode<Bucket> {
-    return expect(this.nodes.get(state), 'BUG: missing node');
-  }
-
-  private appendChild(node: InternalRenderNode<Bucket>, state: Bucket): void {
-    assert('BUG: child already appended', !this.refs.has(state));
-
-    let parent = this.stack.current;
-    let ref = new Ref(state);
-
-    this.refs.set(state, ref);
-
-    if (parent) {
-      let parentNode = this.nodeFor(parent);
-      parentNode.refs.add(ref);
-      node.parent = parentNode;
-    } else {
-      this.roots.add(ref);
-    }
-  }
-
-  private captureRefs(refs: Set<Ref<Bucket>>): CapturedRenderNode[] {
-    let captured: CapturedRenderNode[] = [];
-
-    refs.forEach((ref) => {
-      let state = ref.get();
-
-      if (state) {
-        captured.push(this.captureNode(`render-node:${ref.id}`, state));
-      } else {
-        refs.delete(ref);
-      }
-    });
-
-    return captured;
-  }
-
-  private captureNode(id: string, state: Bucket): CapturedRenderNode {
-    let node = this.nodeFor(state);
-    let { type, name, args, instance, refs } = node;
-    let template = this.captureTemplate(node);
-    let bounds = this.captureBounds(node);
-    let children = this.captureRefs(refs);
-    return { id, type, name, args: reifyArgs(args), instance, template, bounds, children };
-  }
-
-  private captureTemplate({ template }: InternalRenderNode<Bucket>): Option<string> {
-    return (template && unwrapTemplate(template).moduleName) || null;
-  }
-
-  private captureBounds(node: InternalRenderNode<Bucket>): CapturedRenderNode['bounds'] {
-    let bounds = expect(node.bounds, 'BUG: missing bounds');
-    let parentElement = bounds.parentElement();
-    let firstNode = bounds.firstNode();
-    let lastNode = bounds.lastNode();
-    return { parentElement, firstNode, lastNode };
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index d088dbc103b..e9fde80104c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -8,7 +8,6 @@ import {
 import { ENV } from '@ember/-internals/environment';
 import {
   capabilities,
-  CapturedRenderNode,
   Component,
   setComponentManager,
   setComponentTemplate,
@@ -20,6 +19,7 @@ import Controller from '@ember/controller';
 import { captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
+import { CapturedRenderNode } from '@glimmer/interfaces';
 import { expect } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
 import { compile } from 'ember-template-compiler';
@@ -885,7 +885,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         this.addComponent('hello-world', {
           ComponentClass: null,
-          template: 'Hello World',
+          template: '{{@name}}',
         });
 
         await this.visit('/');
@@ -958,7 +958,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         this.addComponent('hello-world', {
           ComponentClass: templateOnly(),
-          template: 'Hello World',
+          template: '{{@name}}',
         });
 
         await this.visit('/');
@@ -1031,7 +1031,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         this.addComponent('hello-world', {
           ComponentClass: setComponentTemplate(
-            compile('Hello World', { moduleName: 'my-app/components/hello-world.hbs' }),
+            compile('{{@name}}', { moduleName: 'my-app/components/hello-world.hbs' }),
             templateOnly()
           ),
         });
@@ -1659,7 +1659,7 @@ if (ENV._DEBUG_RENDER_TREE) {
               throw new Error('oops!');
             },
           }),
-          template: 'Hello World',
+          template: '{{@name}}',
         });
 
         await assert.rejects(this.visit('/'), /oops!/);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 3ba136d8532..72bb3fd63fb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -5,7 +5,7 @@ import Controller from '@ember/controller';
 import { Route } from '@ember/-internals/routing';
 import { Component } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 import { runTask } from '../../../../../../internal-test-helpers/lib/run';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 8204301edc0..d7ef5142163 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -18,7 +18,7 @@ import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 import { jQueryDisabled } from '@ember/-internals/views';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor, debugStackMessageFor } from '../../utils/debug-stack';
 
 moduleFor(
   'Components test: curly components',
@@ -3030,7 +3030,7 @@ moduleFor(
         this.render(`{{foo-bar id="foo-bar" isVisible=visible}}`, {
           visible: false,
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       assertStyle('display: none;');
 
@@ -3040,7 +3040,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', true);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       assertStyle('');
 
@@ -3048,7 +3048,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', false);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       assertStyle('display: none;');
     }
@@ -3067,7 +3067,7 @@ moduleFor(
         this.render(`{{foo-bar id="foo-bar" isVisible=visible}}`, {
           visible: false,
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -3080,7 +3080,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', true);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -3091,7 +3091,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', false);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -3127,7 +3127,7 @@ moduleFor(
           visible: false,
           foo: 'baz',
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       assertStyle('display: none;');
 
@@ -3137,7 +3137,7 @@ moduleFor(
         runTask(() => {
           set(this.context, 'visible', true);
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       assertStyle('');
 
@@ -3146,7 +3146,7 @@ moduleFor(
           set(this.context, 'visible', false);
           set(this.context, 'foo', 'woo');
         });
-      }, /The `isVisible` property on classic component classes is deprecated. Was accessed:\n\n- While rendering:\n {2}foo-bar/);
+      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
 
       assertStyle('display: none;');
       assert.equal(this.firstChild.getAttribute('foo'), 'woo');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index 1bcdebed82c..2f537033da0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -4,7 +4,7 @@ import { set, computed } from '@ember/-internals/metal';
 import { jQueryDisabled } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 
 moduleFor(
   'Components test: dynamic components',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index df680185d32..6c5354248fe 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -5,7 +5,7 @@ import templateOnly from '@ember/component/template-only';
 import { compile } from 'ember-template-compiler';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { Component } from '../../utils/helpers';
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 
 class TemplateOnlyComponentsTest extends RenderingTestCase {
   registerTemplateOnlyComponent(name, template) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index c05ee65d7e5..ff65c64aa12 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -3,7 +3,7 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { setModifierManager, modifierCapabilities } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
-import { backtrackingMessageFor } from '../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../utils/debug-stack';
 
 class ModifierManagerTest extends RenderingTestCase {
   '@test throws a useful error when missing capabilities'() {
@@ -260,6 +260,7 @@ class ModifierManagerTest extends RenderingTestCase {
 
     let expectedMessage = backtrackingMessageFor('name', 'Person', {
       renderTree: ['\\(instance of a `foo-bar` modifier\\)'],
+      includeTopLevel: false,
     });
 
     expectAssertion(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 2017581b322..74d5d4e3553 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -3,7 +3,7 @@ import { DEBUG } from '@glimmer/env';
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 import { Helper } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 
 moduleFor(
   'Helpers test: custom helpers',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 81b0862058b..0477a22d48c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -8,7 +8,7 @@ import { tracked, set } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
 import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { inject as service } from '@ember/service';
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 import { registerDestructor } from '@glimmer/runtime';
 
 class TestHelperManager {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index da0cb247a4d..b0a44ffeb31 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -9,7 +9,7 @@ import {
 import Service, { inject } from '@ember/service';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { backtrackingMessageFor } from '../../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 import { Component } from '../../utils/helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 427f961b5f1..8b9604462e6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -11,7 +11,7 @@ import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import Engine, { getEngineParent } from '@ember/engine';
 
-import { backtrackingMessageFor } from '../utils/backtracking-rerender';
+import { backtrackingMessageFor } from '../utils/debug-stack';
 import { compile, Component } from '../utils/helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
index d2a1461e7dc..836bb3d448a 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
@@ -1,3 +1,4 @@
+import { ENV } from '@ember/-internals/environment';
 import {
   RenderingTestCase,
   moduleFor,
@@ -38,6 +39,8 @@ moduleFor(
           helperDefinitionCount: 1,
           // from this.render
           templateCacheMisses: 1,
+          // from debugRenderTree
+          templateCacheHits: ENV._DEBUG_RENDER_TREE ? 1 : 0,
         },
         'calculate foo-bar helper only'
       );
@@ -88,6 +91,8 @@ moduleFor(
           componentDefinitionCount: 1,
           // 1 from this.render, 1 from component-one
           templateCacheMisses: 2,
+          // debugRenderTree
+          templateCacheHits: ENV._DEBUG_RENDER_TREE ? 1 : 0,
         },
         'test case component and component-one no change'
       );
@@ -155,6 +160,7 @@ moduleFor(
         {
           componentDefinitionCount: 1,
           templateCacheMisses: 2,
+          templateCacheHits: ENV._DEBUG_RENDER_TREE ? 1 : 0,
         },
         'test case component and component-one no change'
       );
@@ -167,6 +173,7 @@ moduleFor(
         {
           templateCacheMisses: 1,
           componentDefinitionCount: 1,
+          templateCacheHits: ENV._DEBUG_RENDER_TREE ? 1 : 0,
         },
         'component-two first render misses template cache'
       );
@@ -183,7 +190,7 @@ moduleFor(
       this.assertText('Two');
       this.expectCacheChanges(
         {
-          templateCacheHits: 1,
+          templateCacheHits: ENV._DEBUG_RENDER_TREE ? 2 : 1,
         },
         'toggle back to component-two hits template cache'
       );
@@ -195,7 +202,7 @@ moduleFor(
         this.assertText('TwoOne');
         // roots have different capabilities so this will hit
         this.expectCacheChanges(
-          { templateCacheHits: 1 },
+          { templateCacheHits: ENV._DEBUG_RENDER_TREE ? 2 : 1 },
           'append root with component-one no change'
         );
 
@@ -204,7 +211,10 @@ moduleFor(
         try {
           runAppend(root2);
           this.assertText('TwoOneOne');
-          this.expectCacheChanges({ templateCacheHits: 1 }, 'append another root no change');
+          this.expectCacheChanges(
+            { templateCacheHits: ENV._DEBUG_RENDER_TREE ? 2 : 1 },
+            'append another root no change'
+          );
         } finally {
           runDestroy(root2);
         }
@@ -217,8 +227,8 @@ moduleFor(
       let { componentDefinitionCount, helperDefinitionCount } = this.renderer._runtimeResolver;
 
       return (this._counters = {
-        templateCacheHits: templateCacheCounters.cacheHit,
-        templateCacheMisses: templateCacheCounters.cacheMiss,
+        templateCacheHits: templateCacheCounters.cacheHit || 0,
+        templateCacheMisses: templateCacheCounters.cacheMiss || 0,
         componentDefinitionCount,
         helperDefinitionCount,
       });
@@ -228,11 +238,21 @@ moduleFor(
       let lastState = this._counters;
       let state = this.getCacheCounters();
       let actual = diff(state, lastState);
-      this.assert.deepEqual(actual, expected, message);
+      this.assert.deepEqual(actual, stripZeroes(expected), message);
     }
   }
 );
 
+function stripZeroes(value) {
+  let res = {};
+  Object.keys(value).forEach((key) => {
+    if (value[key]) {
+      res[key] = value[key];
+    }
+  });
+  return res;
+}
+
 function diff(state, lastState) {
   let res = {};
   Object.keys(state).forEach((key) => {
diff --git a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
index d0523a485b0..cf773fb78e5 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
@@ -1,3 +1,4 @@
+import { ENV } from '@ember/-internals/environment';
 import { RenderingTestCase, moduleFor } from 'internal-test-helpers';
 
 import { template, templateCacheCounters } from '@ember/-internals/glimmer';
@@ -70,7 +71,7 @@ moduleFor(
 
       this.expectCacheChanges(
         {
-          templateCacheHits: 2,
+          templateCacheHits: ENV._DEBUG_RENDER_TREE ? 5 : 2,
           // from this.render
           templateCacheMisses: 1,
         },
diff --git a/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js b/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js
deleted file mode 100644
index 04533d30794..00000000000
--- a/packages/@ember/-internals/glimmer/tests/utils/backtracking-rerender.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export function backtrackingMessageFor(key, obj, { renderTree } = {}) {
-  // Start off with standard backtracking assertion
-  let regex;
-
-  if (obj) {
-    regex = [`You attempted to update \`${key}\` on \`${obj}\``];
-  } else {
-    regex = [`You attempted to update \`${key}\``];
-  }
-
-  if (renderTree) {
-    // match the renderTree if it was included
-    regex.push(`\`${key}\` was first used:`);
-    regex.push('- While rendering:');
-    regex.push(renderTree.join('\\n\\s*'));
-  }
-
-  // Ensure stack trace is given
-  regex.push(`Stack trace for the update:`);
-
-  // Join with a regex that consumes all characters
-  return new RegExp(regex.join('[\\S\\s]*'));
-}
diff --git a/packages/@ember/-internals/glimmer/tests/utils/debug-stack.js b/packages/@ember/-internals/glimmer/tests/utils/debug-stack.js
new file mode 100644
index 00000000000..8ac48d0d7f7
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/utils/debug-stack.js
@@ -0,0 +1,32 @@
+function debugStackMessage(message, renderTree, includeTopLevel) {
+  let topLevel = includeTopLevel ? '-top-level\n {4}' : '';
+
+  return `${message}[\\S\\s]*- While rendering:\n {2}${topLevel}${renderTree.join('\\n\\s*')}`;
+}
+
+export function debugStackMessageFor(message, { renderTree, includeTopLevel = true }) {
+  // Join with a regex that consumes all characters
+  return new RegExp(debugStackMessage(message, renderTree, includeTopLevel));
+}
+
+export function backtrackingMessageFor(key, obj, { renderTree, includeTopLevel = true } = {}) {
+  // Start off with standard backtracking assertion
+  let message;
+
+  if (obj) {
+    message = `You attempted to update \`${key}\` on \`${obj}\``;
+  } else {
+    message = `You attempted to update \`${key}\``;
+  }
+
+  if (renderTree) {
+    message = debugStackMessage(
+      `${message}[\\S\\s]*\`${key}\` was first used:`,
+      renderTree,
+      includeTopLevel
+    );
+  }
+
+  // Join with a regex that consumes all characters
+  return new RegExp(`${message}[\\S\\s]*Stack trace for the update:`);
+}
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 5e02ac0c469..642ef24a2af 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -1,5 +1,6 @@
-import { CapturedRenderNode, Renderer } from '@ember/-internals/glimmer';
+import { Renderer } from '@ember/-internals/glimmer';
 import { Owner } from '@ember/-internals/owner';
+import { CapturedRenderNode } from '@glimmer/interfaces';
 import { expect } from '@glimmer/util';
 
 /**
diff --git a/yarn.lock b/yarn.lock
index fdd214fdb22..84acb75bf34 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -929,152 +929,152 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.63.5.tgz#4b3758a2da55963ddf545464241e9d8610787055"
-  integrity sha512-uoAejXrPPkfU9gdxtIuSasupEijChFu+xaiMFCtuLS3glFEwOoRYkjAxxwK37M2JbETs8ImN2n1SEFl03stI5g==
-  dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/syntax" "0.63.5"
-    "@glimmer/util" "0.63.5"
-    "@glimmer/wire-format" "0.63.5"
+"@glimmer/compiler@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.64.0.tgz#e117a9acf5797d785c8da5ce65f96765a0c674a6"
+  integrity sha512-697j0gI2i6yRlwmONAWVuznPGyq92IfBJdrF/62t1HsMrAsX9DsdpdcQx9Kxl8LoxKpjkijErU/bJ8soPV9zcA==
+  dependencies:
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/syntax" "0.64.0"
+    "@glimmer/util" "0.64.0"
+    "@glimmer/wire-format" "0.64.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.63.5.tgz#957c4a57d9521ffc38ecf9b1640c29b7718701d0"
-  integrity sha512-H6SbeEERMU6sYW8TPKjVfx1NHOX1JFCMyyd+g41t+UuLd8lR5DpVrkoV4kIR6X/7ZMB3lQOqdC8RfkI9E2VHfA==
+"@glimmer/encoder@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.64.0.tgz#405ce201959ec841c8f08e6ead683363fc6e5c71"
+  integrity sha512-7QWC700lbJPRedH/mYAjyP/gtJ2mfs3BmHx7ahXHklsiBLpWAELwimvZVkU3bJShYyKddOxaLXaCA+ZKUgP7IA==
   dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/vm" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/vm" "0.64.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.63.5.tgz#4a8da4fee97d13a376549ceecebd16a5ffc8c4f6"
-  integrity sha512-xYsptoxo9ROos83oxG8ZT4e8T2QgsH+FdZxsPZNTN4WLumU2LTkxJQaiosW9q294IVY/mIVhZAohJkfNCvSwug==
+"@glimmer/global-context@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.64.0.tgz#7019bea8795dd99890b922fe1678e6343983fdbd"
+  integrity sha512-iaaz/+bjmixjBhUtMs3Dqdz8TAetu4PW3re1h4VLpQYXL27MRv694kfjpouISKHZ5rOi77icTTDjQYtiHwV/9w==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.63.5.tgz#ac614608ea618022b61b5d09e66089ceffc26e6e"
-  integrity sha512-ogozdIFOSxJ2QBU2NE0pk993qbb/zY1wF4BFL1ZN2GrfDDdaYC5vmDSs+RpbbF6JAjrt4kADXlOocs7dBiX4iQ==
+"@glimmer/interfaces@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.64.0.tgz#8d6330ece98e20c97608ec6429fc9732824452bc"
+  integrity sha512-Y7HmwqtBNOzu9RL8N4WGQGGNCIO8REMORewMbnrZtLuFWcdDPCGVlNkxC77GStkHD+V54oEoW9Y+84MLFxkicg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.63.5.tgz#f10528b1155a7e030b84eb7660150a08b25901b2"
-  integrity sha512-BfhbHnnWoxs2gO9DDZv4T/Qvt+1vl5+mL7Jb/vMgsSJbAcjbjAnkAeDGnRCmxRU1t4yGtQ8yFJV48H7VtnoYWg==
+"@glimmer/low-level@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.64.0.tgz#d05dce2056dbae03b63b180539f8a4377d3ad810"
+  integrity sha512-UiSa96BSnF4COduh4UpBWyav1RXg9P1ylaF51hJWDFXA6xt8aME9NSgEmcy+gc/9MbKPOkao+rrKIxP+9upE4w==
 
-"@glimmer/node@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.63.5.tgz#2ade61ef07577639afaa736c1a769c33960229f9"
-  integrity sha512-Ee+CQDZyMeiU+gXCs4PCXdWSpaMI/SGfNPboVLo3rYwxSARcnvw2s4O57kvrkgurRIqnubHouiVXLYIOtssbpA==
+"@glimmer/node@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.64.0.tgz#4a9ee41d0017013b13a2abf24512a1b75f0bd195"
+  integrity sha512-+mRKTfmEEMxvLKJXpZXBobeCzpWDR284IM0akT8pYNcS7KSKfxjE/eNjDbkNylMiKRYkvemyMpuSqz0idBz6og==
   dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/runtime" "0.63.5"
-    "@glimmer/util" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/runtime" "0.64.0"
+    "@glimmer/util" "0.64.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.63.5.tgz#dcfa6e852c70a6d229f0f45cc80400ac5ff535ec"
-  integrity sha512-pWWE0zg2rPHIqtyQaVanVQpnPIgLVFKq9GWqiyvFc+4+VXKUPaNWjVL5v+ITZNSGkvkCzmhtMmNNfMb/Om24BA==
-  dependencies:
-    "@glimmer/encoder" "0.63.5"
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/program" "0.63.5"
-    "@glimmer/reference" "0.63.5"
-    "@glimmer/util" "0.63.5"
-    "@glimmer/vm" "0.63.5"
-    "@glimmer/wire-format" "0.63.5"
-
-"@glimmer/program@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.63.5.tgz#3cc307327ddde72fe7924f0fc6bd32e56384d7b7"
-  integrity sha512-MgHGklwTDHp9kD5YEyyea7cWLp6Q4B+ycylpL9ldNyQvIuocW/+QzmTb9Hd/EJ7KAVDMRxy451iWJuzItBYxAg==
-  dependencies:
-    "@glimmer/encoder" "0.63.5"
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
-
-"@glimmer/reference@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.63.5.tgz#bc99049c9400994641dea054e58bff61e1e31187"
-  integrity sha512-uE5O5eFcaKedomCDfendXjA7Sh9MYZG5RhadSSA8iD6TUlXxdpIe++tcRzNQOcMwHNbh+Bx7jX50jxtA1ShibQ==
+"@glimmer/opcode-compiler@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.64.0.tgz#5f2f3fddd639422ec7e5ba9231bdfeecc3650808"
+  integrity sha512-2XSN/z9piCSE7A9UVQ1Aa6SrY5oQZyBIknF8Quq8ekQZFVwPqM9qTa826qR/rChDUX7d65rVFSFeZ8/Eyd9ieg==
+  dependencies:
+    "@glimmer/encoder" "0.64.0"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/program" "0.64.0"
+    "@glimmer/reference" "0.64.0"
+    "@glimmer/util" "0.64.0"
+    "@glimmer/vm" "0.64.0"
+    "@glimmer/wire-format" "0.64.0"
+
+"@glimmer/program@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.64.0.tgz#411c2639ea5809a890375ce34ce3335944dc98c2"
+  integrity sha512-v5jFpGjJ9gUQBa1YpiNKCgO+8genGRfX7qzuAz1A/N0BnmD3+Xk2yl8qeli5+WySMAPRYV1lk/3MjrfCkK7TnA==
+  dependencies:
+    "@glimmer/encoder" "0.64.0"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/util" "0.64.0"
+
+"@glimmer/reference@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.64.0.tgz#92bac8f2de1b6073a01006ba1511d772ed545b91"
+  integrity sha512-UQ7+dhAuQskrcYtpX5vQT2JD+qoDdkzP69auRUb4SF0pZH8LIKLxOMi74anAd6AcWrYd25Wh+UUbcuH/Qx+b2g==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.63.5"
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
-    "@glimmer/validator" "0.63.5"
+    "@glimmer/global-context" "0.64.0"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/util" "0.64.0"
+    "@glimmer/validator" "0.64.0"
 
-"@glimmer/runtime@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.63.5.tgz#256a4e96e36185f1bf01b7eb3310f046b0222580"
-  integrity sha512-EqUS4BMTLtCgS/uGQKySVycHTLdaYBuDCvj1/OdjiFoqZlB0AqoJ65LBYxIqZuNkSUGom0ZVXuhcFcf2ZgjKdw==
+"@glimmer/runtime@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.64.0.tgz#3c2dbe0bd4abcda98b4e7abbcedc20661a4ccb7f"
+  integrity sha512-yLBXkTKvF0tzs6qEHNGPhg4zs9GySzmhWeOzWH91HbIH9PeLmx7cxMN1GPMUngoQz3Gfm5wvRmULEws4e91U0w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.63.5"
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/low-level" "0.63.5"
-    "@glimmer/program" "0.63.5"
-    "@glimmer/reference" "0.63.5"
-    "@glimmer/util" "0.63.5"
-    "@glimmer/validator" "0.63.5"
-    "@glimmer/vm" "0.63.5"
-    "@glimmer/wire-format" "0.63.5"
+    "@glimmer/global-context" "0.64.0"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/low-level" "0.64.0"
+    "@glimmer/program" "0.64.0"
+    "@glimmer/reference" "0.64.0"
+    "@glimmer/util" "0.64.0"
+    "@glimmer/validator" "0.64.0"
+    "@glimmer/vm" "0.64.0"
+    "@glimmer/wire-format" "0.64.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.63.5.tgz#38ef6e41d9da3474ebc5d704c0e9743367de728e"
-  integrity sha512-w0/X7jQ5tzO6KevzeP1QBEfS2qjc897JlQa+9eMcFkxRxZCH4IVUjyxeRuu9cY0uV16ByVBTFh9fcGPfgaYULQ==
+"@glimmer/syntax@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.64.0.tgz#4e665c8936dfb93c17bb53a2f355342fa29662b5"
+  integrity sha512-BVziEjDC7EKvPv4O3B9hfkevihiqZkBlWBkZbTJe45wImfl+6A4KvwP/s8r5u/yAhYnsA3LO77IuoYYr/I08Tg==
   dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/util" "0.64.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.63.5.tgz#8f2ed10269fcf6ccaf4cc0338915cc618ed845d0"
-  integrity sha512-9eTXOx3l6N1YySBMe1Vb/F+SGuztgObQCoEVtvxUZ7VB37xTaaUEoZfQVQJyBizFIKIAOvXBhPYCT+cERvN7kw==
+"@glimmer/util@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.64.0.tgz#872103ebb2313a693161ec69e5b70252b56a6cd5"
+  integrity sha512-evcvCmQ2VUgWQF3ecDwtkwW+D+FL2f4Z0X8XDUgHQTGbA9PkqQRwyyD0WdURVPYpt3YkbR1VLapADll9fjpevg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.63.5.tgz#8d196f1f29191c5ecd60ea5c87d1081f68dff840"
-  integrity sha512-+/YHIKrspDrqnAz4hE+VgIL2O6tZPxKA9KfI5syDcr+zxQeLjC/7ng6AK2g6+w8nHoS5WOABbA/gpH+wTV6ulQ==
+"@glimmer/validator@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.64.0.tgz#509ba8bfadd83853c52e997826ca406b49462734"
+  integrity sha512-rxeFHcJCIVmTyfP3f3E3NEU3cCT2pAQFCo1LYxdsWDoHZhNP4slisJDYW8UpFmrZKilooK3tki1fVB9Wvi0fpA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.63.5"
+    "@glimmer/global-context" "0.64.0"
 
-"@glimmer/vm@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.63.5.tgz#2ea8a0546f7826b95e49cb46cd46fa6392e317eb"
-  integrity sha512-gw9fXdzD4fVIKgEPhv63hPMR4/yFaos/tYFXlRp3DmRPyMViOs7JTQ3W1Yqdn3UqUFwgMKO/yEZEC8RLMFhl4w==
+"@glimmer/vm@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.64.0.tgz#4727a991d551bf2c8dd4c5273d647e3f155d283d"
+  integrity sha512-O0T4/mdPpLHoPe/YcQCkBla6QBkwvIg57LAo6AyesAwCsKF8GmNSY6YzC0qj/sFNh+mr0cdG8bpGeMMmqHM5ZA==
   dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/util" "0.64.0"
 
-"@glimmer/wire-format@0.63.5":
-  version "0.63.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.63.5.tgz#20c877f830527f2c8e697ec11537bb45cacefe25"
-  integrity sha512-F08YRRnVzCVTiJ38EVSpux9zNr7B6ryoZQSa1gMcqVkWkNfcNrp3hibXsdtg9Pq3pCyHWM6OLhmE355pdW7hAw==
+"@glimmer/wire-format@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.64.0.tgz#085afd3f6161f0c3b9ea18b500b4281b895f0252"
+  integrity sha512-EwodhWPbFRQ9AMFJgR5+rwFqscW4CPpBjl5eE5w1xIHS5S2wxKNuZJoo+Vq899SFS6n1f0yEzYoqe5acBR09mg==
   dependencies:
-    "@glimmer/interfaces" "0.63.5"
-    "@glimmer/util" "0.63.5"
+    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/util" "0.64.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 0901ef6ab6797cf82b52d47dfd949045882bf74d Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Sun, 8 Nov 2020 00:12:07 +0000
Subject: [PATCH 0228/1405] Deprecate Route and Controller transition methods

Route
- transitionTo
- replaceWith

Controller
- transitionToRoute
- replaceRoute
---
 .../integration/application/rendering-test.js |  4 +-
 .../components/link-to/routing-angle-test.js  |  6 +-
 .../components/link-to/routing-curly-test.js  |  6 +-
 .../-internals/routing/lib/ext/controller.ts  |  6 +-
 .../-internals/routing/lib/system/route.ts    |  5 +-
 .../@ember/-internals/routing/lib/utils.ts    | 17 ++++
 .../routing/tests/ext/controller_test.js      | 86 +++++++++++--------
 .../routing/tests/system/route_test.js        | 80 ++++++++++-------
 .../@ember/application/tests/visit_test.js    | 16 +++-
 .../ember-testing/tests/acceptance_test.js    |  8 +-
 packages/ember-testing/tests/helpers_test.js  |  8 +-
 .../tests/routing/decoupled_basic_test.js     | 50 +++++++----
 .../ember/tests/routing/model_loading_test.js |  8 +-
 .../ember/tests/routing/query_params_test.js  | 25 ++++--
 .../router_service_test/events_test.js        | 44 +++++++---
 .../ember/tests/routing/substates_test.js     | 12 ++-
 .../tests/routing/template_rendering_test.js  |  4 +-
 17 files changed, 258 insertions(+), 127 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 3ba136d8532..3c35d6ea00e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -696,7 +696,9 @@ moduleFor(
         'route:index',
         Route.extend({
           activate() {
-            this.transitionTo('a');
+            expectDeprecation(() => {
+              this.transitionTo('a');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 1f26d1f4211..4ff9a9db99a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -1876,7 +1876,7 @@ moduleFor(
     [`@test GJ: <LinkTo /> to a parent root model hook which performs a 'transitionTo' has correct active class #13256`](
       assert
     ) {
-      assert.expect(1);
+      assert.expect(3);
 
       this.router.map(function () {
         this.route('parent', function () {
@@ -1888,7 +1888,9 @@ moduleFor(
         'route:parent',
         Route.extend({
           afterModel() {
-            this.transitionTo('parent.child');
+            expectDeprecation(() => {
+              this.transitionTo('parent.child');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 542736dd08d..fe54123819a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -2143,7 +2143,7 @@ moduleFor(
     [`@test GJ: {{link-to}} to a parent root model hook which performs a 'transitionTo' has correct active class #13256`](
       assert
     ) {
-      assert.expect(1);
+      assert.expect(3);
 
       this.router.map(function () {
         this.route('parent', function () {
@@ -2155,7 +2155,9 @@ moduleFor(
         'route:parent',
         Route.extend({
           afterModel() {
-            this.transitionTo('parent.child');
+            expectDeprecation(() => {
+              this.transitionTo('parent.child');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 4e840e56a3d..bcdd3d2157b 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -1,6 +1,6 @@
 import { get } from '@ember/-internals/metal';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
-import { prefixRouteNameArg } from '../utils';
+import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
 
 /**
 @module ember
@@ -149,9 +149,12 @@ ControllerMixin.reopen({
     @method transitionToRoute
     @return {Transition} the transition object associated with this
       attempted transition
+    @deprecated Use transitionTo from the Router service instead.
     @public
   */
   transitionToRoute(...args: any[]) {
+    deprecateTransitionMethods('controller', 'transitionToRoute');
+
     // target may be either another controller or a router
     let target = get(this, 'target');
     let method = target.transitionToRoute || target.transitionTo;
@@ -218,6 +221,7 @@ ControllerMixin.reopen({
     @public
   */
   replaceRoute(...args: string[]) {
+    deprecateTransitionMethods('controller', 'replaceRoute');
     // target may be either another controller or a router
     let target = get(this, 'target');
     let method = target.replaceRoute || target.replaceWith;
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 6e45a2722b4..4af310ba98c 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -38,6 +38,7 @@ import {
 } from 'router_js';
 import {
   calculateCacheKey,
+  deprecateTransitionMethods,
   normalizeControllerQueryParams,
   prefixRouteNameArg,
   stashParamNames,
@@ -805,10 +806,11 @@ class Route extends EmberObject implements IRoute {
     @return {Transition} the transition object associated with this
       attempted transition
     @since 1.0.0
+    @deprecated Use transitionTo from the Router service instead.
     @public
   */
   transitionTo(...args: any[]) {
-    // eslint-disable-line no-unused-vars
+    deprecateTransitionMethods('route', 'transitionTo');
     return this._router.transitionTo(...prefixRouteNameArg(this, args));
   }
 
@@ -903,6 +905,7 @@ class Route extends EmberObject implements IRoute {
     @public
   */
   replaceWith(...args: any[]) {
+    deprecateTransitionMethods('route', 'replaceWith');
     return this._router.replaceWith(...prefixRouteNameArg(this, args));
   }
 
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 3767e5786b1..ccdb2dd197f 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -1,5 +1,6 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
+import { deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
 import { assign } from '@ember/polyfills';
 import Router, { STATE_SYMBOL } from 'router_js';
@@ -242,3 +243,19 @@ export function shallowEqual(a: {}, b: {}) {
 
   return aCount === bCount;
 }
+
+export function deprecateTransitionMethods(frameworkClass: string, methodName: string) {
+  deprecate(
+    `Calling ${methodName} on a ${frameworkClass} is deprecated. Use the RouterService instead.`,
+    false,
+    {
+      id: 'routing.transition-methods',
+      for: 'ember-source',
+      since: {
+        available: '3.24.0',
+      },
+      until: '4.0.0',
+      url: 'https://deprecations.emberjs.com/v3.x/#toc_routing-transition-methods',
+    }
+  );
+}
diff --git a/packages/@ember/-internals/routing/tests/ext/controller_test.js b/packages/@ember/-internals/routing/tests/ext/controller_test.js
index 38d37b105a3..83db6e54c88 100644
--- a/packages/@ember/-internals/routing/tests/ext/controller_test.js
+++ b/packages/@ember/-internals/routing/tests/ext/controller_test.js
@@ -22,27 +22,35 @@ moduleFor(
       let controller = Controller.create({ target: router });
       setOwner(controller, engineInstance);
 
-      assert.strictEqual(
-        controller.transitionToRoute('application'),
-        'foo.bar.application',
-        'properly prefixes application route'
-      );
-      assert.strictEqual(
-        controller.transitionToRoute('posts'),
-        'foo.bar.posts',
-        'properly prefixes child routes'
-      );
-      assert.throws(
-        () => controller.transitionToRoute('/posts'),
-        'throws when trying to use a url'
-      );
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.transitionToRoute('application'),
+          'foo.bar.application',
+          'properly prefixes application route'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.transitionToRoute('posts'),
+          'foo.bar.posts',
+          'properly prefixes child routes'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.throws(
+          () => controller.transitionToRoute('/posts'),
+          'throws when trying to use a url'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
 
       let queryParams = {};
-      assert.strictEqual(
-        controller.transitionToRoute(queryParams),
-        queryParams,
-        'passes query param only transitions through'
-      );
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.transitionToRoute(queryParams),
+          queryParams,
+          'passes query param only transitions through'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
     }
 
     ["@test replaceRoute considers an engine's mountPoint"](assert) {
@@ -62,24 +70,32 @@ moduleFor(
       let controller = Controller.create({ target: router });
       setOwner(controller, engineInstance);
 
-      assert.strictEqual(
-        controller.replaceRoute('application'),
-        'foo.bar.application',
-        'properly prefixes application route'
-      );
-      assert.strictEqual(
-        controller.replaceRoute('posts'),
-        'foo.bar.posts',
-        'properly prefixes child routes'
-      );
-      assert.throws(() => controller.replaceRoute('/posts'), 'throws when trying to use a url');
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.replaceRoute('application'),
+          'foo.bar.application',
+          'properly prefixes application route'
+        );
+      }, /Calling replaceRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.replaceRoute('posts'),
+          'foo.bar.posts',
+          'properly prefixes child routes'
+        );
+      }, /Calling replaceRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.throws(() => controller.replaceRoute('/posts'), 'throws when trying to use a url');
+      }, /Calling replaceRoute on a controller is deprecated/);
 
       let queryParams = {};
-      assert.strictEqual(
-        controller.replaceRoute(queryParams),
-        queryParams,
-        'passes query param only transitions through'
-      );
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.replaceRoute(queryParams),
+          queryParams,
+          'passes query param only transitions through'
+        );
+      }, /Calling replaceRoute on a controller is deprecated/);
     }
   }
 );
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 193cc254259..1a0d00fbf9c 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -487,24 +487,32 @@ moduleFor(
       let route = EmberRoute.create({ _router: router });
       setOwner(route, engineInstance);
 
-      assert.strictEqual(
-        route.transitionTo('application'),
-        'foo.bar.application',
-        'properly prefixes application route'
-      );
-      assert.strictEqual(
-        route.transitionTo('posts'),
-        'foo.bar.posts',
-        'properly prefixes child routes'
-      );
-      assert.throws(() => route.transitionTo('/posts'), 'throws when trying to use a url');
+      expectDeprecation(() => {
+        assert.strictEqual(
+          route.transitionTo('application'),
+          'foo.bar.application',
+          'properly prefixes application route'
+        );
+      }, /Calling transitionTo on a route is deprecated/);
+      expectDeprecation(() => {
+        assert.strictEqual(
+          route.transitionTo('posts'),
+          'foo.bar.posts',
+          'properly prefixes child routes'
+        );
+      }, /Calling transitionTo on a route is deprecated/);
+      expectDeprecation(() => {
+        assert.throws(() => route.transitionTo('/posts'), 'throws when trying to use a url');
+      }, /Calling transitionTo on a route is deprecated/);
 
       let queryParams = {};
-      assert.strictEqual(
-        route.transitionTo(queryParams),
-        queryParams,
-        'passes query param only transitions through'
-      );
+      expectDeprecation(() => {
+        assert.strictEqual(
+          route.transitionTo(queryParams),
+          queryParams,
+          'passes query param only transitions through'
+        );
+      }, /Calling transitionTo on a route is deprecated/);
     }
 
     ["@test intermediateTransitionTo considers an engine's mountPoint"](assert) {
@@ -558,24 +566,32 @@ moduleFor(
       let route = EmberRoute.create({ _router: router });
       setOwner(route, engineInstance);
 
-      assert.strictEqual(
-        route.replaceWith('application'),
-        'foo.bar.application',
-        'properly prefixes application route'
-      );
-      assert.strictEqual(
-        route.replaceWith('posts'),
-        'foo.bar.posts',
-        'properly prefixes child routes'
-      );
-      assert.throws(() => route.replaceWith('/posts'), 'throws when trying to use a url');
+      expectDeprecation(() => {
+        assert.strictEqual(
+          route.replaceWith('application'),
+          'foo.bar.application',
+          'properly prefixes application route'
+        );
+      }, /Calling replaceWith on a route is deprecated/);
+      expectDeprecation(() => {
+        assert.strictEqual(
+          route.replaceWith('posts'),
+          'foo.bar.posts',
+          'properly prefixes child routes'
+        );
+      }, /Calling replaceWith on a route is deprecated/);
+      expectDeprecation(() => {
+        assert.throws(() => route.replaceWith('/posts'), 'throws when trying to use a url');
+      }, /Calling replaceWith on a route is deprecated/);
 
       let queryParams = {};
-      assert.strictEqual(
-        route.replaceWith(queryParams),
-        queryParams,
-        'passes query param only transitions through'
-      );
+      expectDeprecation(() => {
+        assert.strictEqual(
+          route.replaceWith(queryParams),
+          queryParams,
+          'passes query param only transitions through'
+        );
+      }, /Calling replaceWith on a route is deprecated/);
     }
   }
 );
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index f8cf091ebd2..7fe0babca5e 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -283,7 +283,9 @@ moduleFor(
         'route:a',
         Route.extend({
           afterModel() {
-            this.replaceWith('b', 'zomg');
+            expectDeprecation(() => {
+              this.replaceWith('b', 'zomg');
+            }, /Calling replaceWith on a route is deprecated/);
           },
         })
       );
@@ -292,7 +294,9 @@ moduleFor(
         'route:b',
         Route.extend({
           afterModel(params) {
-            this.transitionTo('c', params.b);
+            expectDeprecation(() => {
+              this.transitionTo('c', params.b);
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -321,7 +325,9 @@ moduleFor(
         'route:a',
         Route.extend({
           afterModel() {
-            this.replaceWith('b', 'zomg');
+            expectDeprecation(() => {
+              this.replaceWith('b', 'zomg');
+            }, /Calling replaceWith on a route is deprecated/);
           },
         })
       );
@@ -330,7 +336,9 @@ moduleFor(
         'route:b',
         Route.extend({
           afterModel(params) {
-            this.transitionTo('c', params.b);
+            expectDeprecation(() => {
+              this.transitionTo('c', params.b);
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index c75a86877b1..682beae36bd 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -94,7 +94,9 @@ if (!jQueryDisabled) {
             'route:redirect',
             Route.extend({
               beforeModel() {
-                this.transitionTo('comments');
+                expectDeprecation(() => {
+                  this.transitionTo('comments');
+                }, /Calling transitionTo on a route is deprecated/);
               },
             })
           );
@@ -425,7 +427,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test visiting a URL that causes another transition should yield the correct URL`](assert) {
-        assert.expect(1);
+        assert.expect(2);
 
         window.visit('/redirect');
 
@@ -437,7 +439,7 @@ if (!jQueryDisabled) {
       [`@test visiting a URL and then visiting a second URL with a transition should yield the correct URL`](
         assert
       ) {
-        assert.expect(2);
+        assert.expect(3);
 
         window.visit('/posts');
 
diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
index 6d5da3d186d..33457f189d5 100644
--- a/packages/ember-testing/tests/helpers_test.js
+++ b/packages/ember-testing/tests/helpers_test.js
@@ -1199,7 +1199,11 @@ if (!jQueryDisabled) {
             'route:user.profile',
             Route.extend({
               beforeModel() {
-                return resolveLater().then(() => this.transitionTo('user.edit'));
+                return resolveLater().then(() => {
+                  return expectDeprecation(() => {
+                    return this.transitionTo('user.edit');
+                  }, /Calling transitionTo on a route is deprecated/);
+                });
               },
             })
           );
@@ -1229,7 +1233,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test currentRouteName for '/user/profile'`](assert) {
-        assert.expect(4);
+        assert.expect(5);
 
         let {
           application: { testHelpers },
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index c772f5e7bfe..a9e4bd03723 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -681,7 +681,9 @@ moduleFor(
         Route.extend({
           redirect() {
             if (destination) {
-              this.transitionTo(destination);
+              expectDeprecation(() => {
+                this.transitionTo(destination);
+              }, /Calling transitionTo on a route is deprecated/);
             }
           },
 
@@ -708,7 +710,7 @@ moduleFor(
     }
 
     ['@test Redirecting from the middle of a route aborts the remainder of the routes'](assert) {
-      assert.expect(4);
+      assert.expect(5);
 
       this.router.map(function () {
         this.route('home');
@@ -723,7 +725,9 @@ moduleFor(
         'route:bar',
         Route.extend({
           redirect() {
-            this.transitionTo('home');
+            expectDeprecation(() => {
+              this.transitionTo('home');
+            }, /Calling transitionTo on a route is deprecated/);
           },
           setupController() {
             assert.ok(false, 'Should transition before setupController');
@@ -757,7 +761,7 @@ moduleFor(
     ['@test Redirecting to the current target in the middle of a route does not abort initial routing'](
       assert
     ) {
-      assert.expect(6);
+      assert.expect(7);
 
       this.router.map(function () {
         this.route('home');
@@ -774,9 +778,11 @@ moduleFor(
         'route:bar',
         Route.extend({
           redirect() {
-            return this.transitionTo('bar.baz').then(function () {
-              successCount++;
-            });
+            return expectDeprecation(() => {
+              return this.transitionTo('bar.baz').then(function () {
+                successCount++;
+              });
+            }, /Calling transitionTo on a route is deprecated/);
           },
 
           setupController() {
@@ -810,7 +816,7 @@ moduleFor(
     ['@test Redirecting to the current target with a different context aborts the remainder of the routes'](
       assert
     ) {
-      assert.expect(5);
+      assert.expect(7);
 
       this.router.map(function () {
         this.route('home');
@@ -832,7 +838,9 @@ moduleFor(
             if (count++ > 10) {
               assert.ok(false, 'infinite loop');
             } else {
-              this.transitionTo('bar.baz', model);
+              expectDeprecation(() => {
+                this.transitionTo('bar.baz', model);
+              }, /Calling transitionTo on a route is deprecated/);
             }
           },
         })
@@ -880,7 +888,9 @@ moduleFor(
         Route.extend({
           actions: {
             goToQux() {
-              this.transitionTo('foo.qux');
+              expectDeprecation(() => {
+                this.transitionTo('foo.qux');
+              }, /Calling transitionTo on a route is deprecated/);
             },
           },
         })
@@ -1131,7 +1141,7 @@ moduleFor(
     ['@test Aborting/redirecting the transition in `willTransition` prevents LoadingRoute from being entered'](
       assert
     ) {
-      assert.expect(5);
+      assert.expect(6);
 
       this.router.map(function () {
         this.route('index');
@@ -1149,7 +1159,9 @@ moduleFor(
               assert.ok(true, 'willTransition was called');
               if (redirect) {
                 // router.js won't refire `willTransition` for this redirect
-                this.transitionTo('about');
+                expectDeprecation(() => {
+                  this.transitionTo('about');
+                }, /Calling transitionTo on a route is deprecated/);
               } else {
                 transition.abort();
               }
@@ -1462,7 +1474,9 @@ moduleFor(
         'route:home',
         Route.extend({
           beforeModel() {
-            this.transitionTo('about', null);
+            expectDeprecation(() => {
+              this.transitionTo('about', null);
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -1663,7 +1677,7 @@ moduleFor(
     }
 
     async ['@test Errors in transitionTo within redirect hook are logged'](assert) {
-      assert.expect(4);
+      assert.expect(5);
       let actual = [];
 
       this.router.map(function () {
@@ -1675,7 +1689,9 @@ moduleFor(
         'route:yondo',
         Route.extend({
           redirect() {
-            this.transitionTo('stink-bomb', { something: 'goes boom' });
+            expectDeprecation(() => {
+              this.transitionTo('stink-bomb', { something: 'goes boom' });
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -1709,7 +1725,9 @@ moduleFor(
         'route:yondo',
         Route.extend({
           redirect() {
-            this.transitionTo('stink-bomb', { something: 'goes boom' });
+            expectDeprecation(() => {
+              this.transitionTo('stink-bomb', { something: 'goes boom' });
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index b7caae710c4..e0b0fd629fa 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -801,7 +801,9 @@ moduleFor(
         Route.extend({
           actions: {
             showPost(context) {
-              this.transitionTo('post', context);
+              expectDeprecation(() => {
+                this.transitionTo('post', context);
+              }, /Calling transitionTo on a route is deprecated/);
             },
           },
         })
@@ -820,7 +822,9 @@ moduleFor(
 
           actions: {
             editPost() {
-              this.transitionTo('post.edit');
+              expectDeprecation(() => {
+                this.transitionTo('post.edit');
+              }, /Calling transitionTo on a route is deprecated/);
             },
           },
         })
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index f4cb3892f3d..cc84d2cf095 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -104,7 +104,7 @@ moduleFor(
     ['@test Calling transitionTo does not lose query params already on the activeTransition'](
       assert
     ) {
-      assert.expect(2);
+      assert.expect(3);
 
       this.router.map(function () {
         this.route('parent', function () {
@@ -117,7 +117,9 @@ moduleFor(
         'route:parent.child',
         Route.extend({
           afterModel() {
-            this.transitionTo('parent.sibling');
+            expectDeprecation(() => {
+              this.transitionTo('parent.sibling');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -140,7 +142,7 @@ moduleFor(
     ['@test Calling transitionTo does not serialize query params already serialized on the activeTransition'](
       assert
     ) {
-      assert.expect(3);
+      assert.expect(4);
 
       this.router.map(function () {
         this.route('parent', function () {
@@ -153,7 +155,9 @@ moduleFor(
         'route:parent.child',
         Route.extend({
           afterModel() {
-            this.transitionTo('parent.sibling');
+            expectDeprecation(() => {
+              this.transitionTo('parent.sibling');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -230,7 +234,7 @@ moduleFor(
       await this.setAndFlush(controller, 'foo', 'WOO');
       this.assertCurrentPath('/?other_foo=WOO', "QP updated correctly without 'as'");
 
-      this.transitionTo('/?other_foo=NAW');
+      await this.transitionTo('/?other_foo=NAW');
       assert.equal(controller.get('foo'), 'NAW', 'QP managed correctly on URL transition');
 
       await this.setAndFlush(controller, 'bar', 'NERK');
@@ -1135,6 +1139,7 @@ moduleFor(
 
       await this.visitAndAssert('/');
       await this.transitionTo({ queryParams: { foo: 'borf' } });
+
       this.assertCurrentPath('/?foo=borf', 'shorthand supported');
 
       await this.transitionTo({ queryParams: { 'index:foo': 'blaf' } });
@@ -1271,8 +1276,10 @@ moduleFor(
       await this.visitAndAssert('/');
       await this.transitionTo({ queryParams: { foo: [2, 3] } });
       this.assertCurrentPath('/?foo=%5B2%2C3%5D', 'shorthand supported');
+
       await this.transitionTo({ queryParams: { 'index:foo': [4, 5] } });
       this.assertCurrentPath('/?foo=%5B4%2C5%5D', 'longform supported');
+
       await this.transitionTo({ queryParams: { foo: [] } });
       this.assertCurrentPath('/?foo=%5B%5D', 'longform supported');
     }
@@ -1396,7 +1403,7 @@ moduleFor(
       );
 
       return this.visit('/').then(() => {
-        this.transitionTo('other');
+        return this.transitionTo('other');
       });
     }
 
@@ -1740,7 +1747,7 @@ moduleFor(
     async [`@test Updating single query parameter doesn't affect other query parameters. Issue #14438`](
       assert
     ) {
-      assert.expect(5);
+      assert.expect(6);
 
       this.router.map(function () {
         this.route('grandparent', { path: 'grandparent/:foo' }, function () {
@@ -1756,7 +1763,9 @@ moduleFor(
         'route:index',
         Route.extend({
           redirect() {
-            this.transitionTo('grandparent.parent.child', 1);
+            expectDeprecation(() => {
+              this.transitionTo('grandparent.parent.child', 1);
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/ember/tests/routing/router_service_test/events_test.js b/packages/ember/tests/routing/router_service_test/events_test.js
index b7c0201eec9..20131502ef5 100644
--- a/packages/ember/tests/routing/router_service_test/events_test.js
+++ b/packages/ember/tests/routing/router_service_test/events_test.js
@@ -126,7 +126,7 @@ moduleFor(
     }
 
     '@test redirection with `transitionTo`'(assert) {
-      assert.expect(8);
+      assert.expect(11);
       let toChild = false;
       let toSister = false;
 
@@ -134,7 +134,9 @@ moduleFor(
         `route:parent`,
         Route.extend({
           model() {
-            this.transitionTo('parent.child');
+            expectDeprecation(() => {
+              this.transitionTo('parent.child');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -143,7 +145,9 @@ moduleFor(
         `route:parent.child`,
         Route.extend({
           model() {
-            this.transitionTo('parent.sister');
+            expectDeprecation(() => {
+              this.transitionTo('parent.sister');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -182,7 +186,7 @@ moduleFor(
     }
 
     '@test redirection with `replaceWith`'(assert) {
-      assert.expect(8);
+      assert.expect(11);
       let toChild = false;
       let toSister = false;
 
@@ -190,7 +194,9 @@ moduleFor(
         `route:parent`,
         Route.extend({
           model() {
-            this.replaceWith('parent.child');
+            expectDeprecation(() => {
+              this.replaceWith('parent.child');
+            }, /Calling replaceWith on a route is deprecated/);
           },
         })
       );
@@ -199,7 +205,9 @@ moduleFor(
         `route:parent.child`,
         Route.extend({
           model() {
-            this.replaceWith('parent.sister');
+            expectDeprecation(() => {
+              this.replaceWith('parent.sister');
+            }, /Calling replaceWith on a route is deprecated/);
           },
         })
       );
@@ -238,7 +246,7 @@ moduleFor(
     }
 
     '@test nested redirection with `transitionTo`'(assert) {
-      assert.expect(11);
+      assert.expect(12);
       let toChild = false;
       let toSister = false;
 
@@ -246,7 +254,9 @@ moduleFor(
         `route:parent.child`,
         Route.extend({
           model() {
-            this.transitionTo('parent.sister');
+            expectDeprecation(() => {
+              this.transitionTo('parent.sister');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -295,7 +305,7 @@ moduleFor(
     }
 
     '@test nested redirection with `replaceWith`'(assert) {
-      assert.expect(11);
+      assert.expect(12);
       let toChild = false;
       let toSister = false;
 
@@ -303,7 +313,9 @@ moduleFor(
         `route:parent.child`,
         Route.extend({
           model() {
-            this.replaceWith('parent.sister');
+            expectDeprecation(() => {
+              this.replaceWith('parent.sister');
+            }, /Calling replaceWith on a route is deprecated/);
           },
         })
       );
@@ -467,7 +479,7 @@ moduleFor(
     }
 
     '@test query param redirects with `transitionTo`'(assert) {
-      assert.expect(6);
+      assert.expect(7);
       let toSister = false;
 
       this.add(
@@ -475,7 +487,9 @@ moduleFor(
         Route.extend({
           model() {
             toSister = true;
-            this.transitionTo('/sister?a=a');
+            expectDeprecation(() => {
+              this.transitionTo('/sister?a=a');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
@@ -508,7 +522,7 @@ moduleFor(
       return this.visit('/child');
     }
     '@test query param redirects with `replaceWith`'(assert) {
-      assert.expect(6);
+      assert.expect(7);
       let toSister = false;
 
       this.add(
@@ -516,7 +530,9 @@ moduleFor(
         Route.extend({
           model() {
             toSister = true;
-            this.replaceWith('/sister?a=a');
+            expectDeprecation(() => {
+              this.replaceWith('/sister?a=a');
+            }, /Calling replaceWith on a route is deprecated/);
           },
         })
       );
diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index 5535e76d6e0..4bbf2b8a77b 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -754,7 +754,9 @@ moduleFor(
             error(err) {
               step(assert, 2, 'MomSallyRoute#actions.error');
               handledError = err;
-              this.transitionTo('mom.this-route-throws');
+              expectDeprecation(() => {
+                this.transitionTo('mom.this-route-throws');
+              }, /Calling transitionTo on a route is deprecated/);
 
               return false;
             },
@@ -829,7 +831,9 @@ moduleFor(
             error(err) {
               step(assert, 2, 'MomSallyRoute#actions.error');
               handledError = err;
-              this.transitionTo('mom.this-route-throws');
+              expectDeprecation(() => {
+                this.transitionTo('mom.this-route-throws');
+              }, /Calling transitionTo on a route is deprecated/);
 
               return false;
             },
@@ -1080,7 +1084,9 @@ moduleFor(
         'route:grandma',
         Route.extend({
           beforeModel: function () {
-            this.transitionTo('memere', 1);
+            expectDeprecation(() => {
+              this.transitionTo('memere', 1);
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 3c223ccfc90..84b284af7d9 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -537,7 +537,9 @@ moduleFor(
         'route:application',
         Route.extend({
           afterModel() {
-            this.transitionTo('posts');
+            expectDeprecation(() => {
+              this.transitionTo('posts');
+            }, /Calling transitionTo on a route is deprecated/);
           },
         })
       );

From 615f8e44c2c4c71d98feeba7e4a5946ccec6989a Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 12 Nov 2020 13:15:22 -0800
Subject: [PATCH 0229/1405] [FEAT] Upstream manager infrastructure

---
 package.json                                  |  18 +-
 packages/@ember/-internals/glimmer/index.ts   |   5 +-
 .../glimmer/lib/compile-time-lookup.ts        |  10 +-
 .../lib/component-managers/abstract.ts        |  65 ------
 .../glimmer/lib/component-managers/curly.ts   |  11 +-
 .../glimmer/lib/component-managers/custom.ts  | 105 +++------
 .../component-managers/definition-state.ts    |   4 +-
 .../lib/component-managers/internal.ts        |  32 +--
 .../glimmer/lib/component-managers/mount.ts   |   9 +-
 .../glimmer/lib/component-managers/outlet.ts  |  13 +-
 .../glimmer/lib/component-managers/root.ts    |   4 +-
 .../lib/component-managers/template-only.ts   |   6 +-
 .../glimmer/lib/components/input.ts           |   2 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |   8 +-
 .../-internals/glimmer/lib/helpers/custom.ts  |  51 ++--
 .../glimmer/lib/modifiers/action.ts           |  28 +--
 .../glimmer/lib/modifiers/custom.ts           |  61 ++---
 .../-internals/glimmer/lib/modifiers/on.ts    |   5 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  31 ++-
 .../-internals/glimmer/lib/utils/managers.ts  | 218 +-----------------
 .../angle-bracket-invocation-test.js          |   3 +-
 .../custom-component-manager-test.js          |  15 +-
 .../custom-modifier-manager-test.js           |  20 +-
 .../helpers/helper-manager-test.js            |  16 +-
 .../integration/helpers/invoke-helper-test.js |   3 +-
 packages/@ember/debug/index.ts                |   4 +-
 packages/@ember/modifier/index.ts             |   3 +-
 packages/ember/index.js                       |  11 +-
 packages/ember/tests/reexports_test.js        |   2 +-
 yarn.lock                                     | 210 ++++++++---------
 30 files changed, 335 insertions(+), 638 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts

diff --git a/package.json b/package.json
index cdd4e9f6a57..ac969d408bf 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.64.0",
+    "@glimmer/compiler": "0.65.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.64.0",
-    "@glimmer/interfaces": "0.64.0",
-    "@glimmer/node": "0.64.0",
-    "@glimmer/opcode-compiler": "0.64.0",
-    "@glimmer/program": "0.64.0",
-    "@glimmer/reference": "0.64.0",
-    "@glimmer/runtime": "0.64.0",
-    "@glimmer/validator": "0.64.0",
+    "@glimmer/global-context": "0.65.0",
+    "@glimmer/interfaces": "0.65.0",
+    "@glimmer/node": "0.65.0",
+    "@glimmer/opcode-compiler": "0.65.0",
+    "@glimmer/program": "0.65.0",
+    "@glimmer/reference": "0.65.0",
+    "@glimmer/runtime": "0.65.0",
+    "@glimmer/validator": "0.65.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 36e1b978405..eee2fdb43cc 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -391,7 +391,6 @@ export {
   registerMacros as _registerMacros,
   experimentalMacros as _experimentalMacros,
 } from './lib/syntax';
-export { default as AbstractComponentManager } from './lib/component-managers/abstract';
 
 // needed for test
 // TODO just test these through public API
@@ -400,8 +399,8 @@ export { default as AbstractComponentManager } from './lib/component-managers/ab
 export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
-export { setComponentManager, setModifierManager, setHelperManager } from './lib/utils/managers';
+export { setComponentManager } from './lib/utils/managers';
 export { capabilities } from './lib/component-managers/custom';
 export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
-export { helperCapabilities, HelperManager, invokeHelper } from './lib/helpers/custom';
+export { helperCapabilities, invokeHelper } from './lib/helpers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
diff --git a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
index 8a6aa7a738e..e62cf9ec0e5 100644
--- a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
+++ b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
@@ -2,9 +2,9 @@ import { Owner } from '@ember/-internals/owner';
 import {
   CompileTimeComponent,
   CompileTimeResolver,
-  ComponentCapabilities,
   ComponentDefinition,
-  ComponentManager,
+  InternalComponentCapabilities,
+  InternalComponentManager,
   Option,
   WithStaticLayout,
 } from '@glimmer/interfaces';
@@ -13,11 +13,11 @@ import RuntimeResolver from './resolver';
 
 interface StaticComponentManager
   extends WithStaticLayout<unknown, unknown>,
-    ComponentManager<unknown, unknown> {}
+    InternalComponentManager<unknown, unknown> {}
 
 function isStaticComponentManager(
-  _manager: ComponentManager,
-  capabilities: ComponentCapabilities
+  _manager: InternalComponentManager,
+  capabilities: InternalComponentCapabilities
 ): _manager is StaticComponentManager {
   return !capabilities.dynamicLayout;
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts b/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
deleted file mode 100644
index 8de8fb6c264..00000000000
--- a/packages/@ember/-internals/glimmer/lib/component-managers/abstract.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import {
-  Bounds,
-  ComponentCapabilities,
-  ComponentManager,
-  Destroyable,
-  DynamicScope,
-  ElementOperations,
-  Environment,
-  Option,
-  PreparedArguments,
-  VM,
-  VMArguments,
-} from '@glimmer/interfaces';
-import { Reference } from '@glimmer/reference';
-import { SimpleElement } from '@simple-dom/interface';
-
-// implements the ComponentManager interface as defined in glimmer:
-// tslint:disable-next-line:max-line-length
-// https://github.com/glimmerjs/glimmer-vm/blob/v0.24.0-beta.4/packages/%40glimmer/runtime/lib/component/interfaces.ts#L21
-
-export default abstract class AbstractManager<T, U> implements ComponentManager<T, U> {
-  prepareArgs(_state: U, _args: VMArguments, _vm: VM): Option<PreparedArguments> {
-    return null;
-  }
-
-  abstract getDebugName(state: U): string;
-
-  abstract create(
-    env: Environment,
-    definition: U,
-    args: VMArguments,
-    dynamicScope: DynamicScope,
-    caller: Reference<void | {}>,
-    hasDefaultBlock: boolean
-  ): T;
-
-  abstract getSelf(component: T): Reference;
-  abstract getCapabilities(state: U): ComponentCapabilities;
-
-  didCreateElement(_component: T, _element: SimpleElement, _operations: ElementOperations): void {
-    // noop
-  }
-
-  didRenderLayout(_component: T, _bounds: Bounds): void {
-    // noop
-  }
-
-  didCreate(_bucket: T): void {
-    // noop
-  }
-
-  update(_bucket: T, _dynamicScope: DynamicScope): void {
-    // noop
-  }
-
-  didUpdateLayout(_bucket: T, _bounds: Bounds): void {
-    // noop
-  }
-
-  didUpdate(_bucket: T): void {
-    // noop
-  }
-
-  abstract getDestroyable(bucket: T): Option<Destroyable>;
-}
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 351f0139e2b..0e5138e393c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -9,11 +9,11 @@ import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
-  ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
   ElementOperations,
   Environment,
+  InternalComponentCapabilities,
   Option,
   PreparedArguments,
   Template,
@@ -29,7 +29,7 @@ import {
   Reference,
   valueForRef,
 } from '@glimmer/reference';
-import { reifyPositional } from '@glimmer/runtime';
+import { BaseInternalComponentManager, reifyPositional } from '@glimmer/runtime';
 import { EMPTY_ARRAY } from '@glimmer/util';
 import {
   beginTrackFrame,
@@ -55,7 +55,6 @@ import {
 
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
-import AbstractManager from './abstract';
 import DefinitionState from './definition-state';
 
 const EMBER_VIEW_REF = createPrimitiveRef('ember-view');
@@ -116,7 +115,7 @@ const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
 export default class CurlyComponentManager
-  extends AbstractManager<ComponentStateBucket, DefinitionState>
+  extends BaseInternalComponentManager<ComponentStateBucket, DefinitionState>
   implements
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket> {
@@ -158,7 +157,7 @@ export default class CurlyComponentManager
     return (component && component.tagName) || 'div';
   }
 
-  getCapabilities(state: DefinitionState): ComponentCapabilities {
+  getCapabilities(state: DefinitionState): InternalComponentCapabilities {
     return state.capabilities;
   }
 
@@ -575,7 +574,7 @@ interface CurriedArgs {
   named: any;
 }
 
-export const CURLY_CAPABILITIES: ComponentCapabilities = {
+export const CURLY_CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: true,
   dynamicTag: true,
   prepareArgs: true,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 1a472a8ad59..02f1093e39b 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -3,20 +3,28 @@ import { assert } from '@ember/debug';
 import {
   Arguments,
   ComponentCapabilities,
+  ComponentCapabilitiesVersions,
   ComponentDefinition,
+  ComponentManager,
+  ComponentManagerWithAsyncLifeCycleCallbacks,
+  ComponentManagerWithAsyncUpdateHook,
+  ComponentManagerWithDestructors,
+  ComponentManagerWithUpdateHook,
   Destroyable,
-  Dict,
   Environment,
+  InternalComponentCapabilities,
   Option,
   Template,
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
+import {
+  BaseInternalComponentManager,
+  buildCapabilities,
+  registerDestructor,
+} from '@glimmer/runtime';
 import { argsProxyFor } from '../utils/args-proxy';
-import { buildCapabilities, InternalCapabilities } from '../utils/managers';
-import AbstractComponentManager from './abstract';
 
 const CAPABILITIES = {
   dynamicLayout: false,
@@ -33,29 +41,10 @@ const CAPABILITIES = {
   willDestroy: false,
 };
 
-export interface OptionalCapabilities {
-  '3.4': {
-    asyncLifecycleCallbacks?: boolean;
-    destructor?: boolean;
-  };
-
-  '3.13': {
-    asyncLifecycleCallbacks?: boolean;
-    destructor?: boolean;
-    updateHook?: boolean;
-  };
-}
-
-export interface Capabilities extends InternalCapabilities {
-  asyncLifeCycleCallbacks: boolean;
-  destructor: boolean;
-  updateHook: boolean;
-}
-
-export function capabilities<Version extends keyof OptionalCapabilities>(
+export function capabilities<Version extends keyof ComponentCapabilitiesVersions>(
   managerAPI: Version,
-  options: OptionalCapabilities[Version] = {}
-): Capabilities {
+  options: ComponentCapabilitiesVersions[Version] = {}
+): ComponentCapabilities {
   assert(
     'Invalid component manager compatibility specified',
     managerAPI === '3.4' || managerAPI === '3.13'
@@ -64,14 +53,14 @@ export function capabilities<Version extends keyof OptionalCapabilities>(
   let updateHook = true;
 
   if (managerAPI === '3.13') {
-    updateHook = Boolean((options as OptionalCapabilities['3.13']).updateHook);
+    updateHook = Boolean((options as ComponentCapabilitiesVersions['3.13']).updateHook);
   }
 
   return buildCapabilities({
     asyncLifeCycleCallbacks: Boolean(options.asyncLifecycleCallbacks),
     destructor: Boolean(options.destructor),
     updateHook,
-  }) as Capabilities;
+  });
 }
 
 export interface DefinitionState<ComponentInstance> {
@@ -80,62 +69,30 @@ export interface DefinitionState<ComponentInstance> {
   template: Template;
 }
 
-export interface ManagerDelegate<ComponentInstance> {
-  capabilities: Capabilities;
-  createComponent(factory: unknown, args: Arguments): ComponentInstance;
-  getContext(instance: ComponentInstance): unknown;
-}
-
 export function hasAsyncLifeCycleCallbacks<ComponentInstance>(
-  delegate: ManagerDelegate<ComponentInstance>
-): delegate is ManagerDelegateWithAsyncLifeCycleCallbacks<ComponentInstance> {
+  delegate: ComponentManager<ComponentInstance>
+): delegate is ComponentManagerWithAsyncLifeCycleCallbacks<ComponentInstance> {
   return delegate.capabilities.asyncLifeCycleCallbacks;
 }
 
-export interface ManagerDelegateWithAsyncLifeCycleCallbacks<ComponentInstance>
-  extends ManagerDelegate<ComponentInstance> {
-  didCreateComponent(instance: ComponentInstance): void;
-}
-
 export function hasUpdateHook<ComponentInstance>(
-  delegate: ManagerDelegate<ComponentInstance>
-): delegate is ManagerDelegateWithUpdateHook<ComponentInstance> {
+  delegate: ComponentManager<ComponentInstance>
+): delegate is ComponentManagerWithUpdateHook<ComponentInstance> {
   return delegate.capabilities.updateHook;
 }
 
-export interface ManagerDelegateWithUpdateHook<ComponentInstance>
-  extends ManagerDelegate<ComponentInstance> {
-  updateComponent(instance: ComponentInstance, args: Arguments): void;
-}
-
 export function hasAsyncUpdateHook<ComponentInstance>(
-  delegate: ManagerDelegate<ComponentInstance>
-): delegate is ManagerDelegateWithAsyncUpdateHook<ComponentInstance> {
+  delegate: ComponentManager<ComponentInstance>
+): delegate is ComponentManagerWithAsyncUpdateHook<ComponentInstance> {
   return hasAsyncLifeCycleCallbacks(delegate) && hasUpdateHook(delegate);
 }
 
-export interface ManagerDelegateWithAsyncUpdateHook<ComponentInstance>
-  extends ManagerDelegateWithAsyncLifeCycleCallbacks<ComponentInstance>,
-    ManagerDelegateWithUpdateHook<ComponentInstance> {
-  didUpdateComponent(instance: ComponentInstance): void;
-}
-
 export function hasDestructors<ComponentInstance>(
-  delegate: ManagerDelegate<ComponentInstance>
-): delegate is ManagerDelegateWithDestructors<ComponentInstance> {
+  delegate: ComponentManager<ComponentInstance>
+): delegate is ComponentManagerWithDestructors<ComponentInstance> {
   return delegate.capabilities.destructor;
 }
 
-export interface ManagerDelegateWithDestructors<ComponentInstance>
-  extends ManagerDelegate<ComponentInstance> {
-  destroyComponent(instance: ComponentInstance): void;
-}
-
-export interface ComponentArguments {
-  positional: unknown[];
-  named: Dict<unknown>;
-}
-
 /**
   The CustomComponentManager allows addons to provide custom component
   implementations that integrate seamlessly into Ember. This is accomplished
@@ -162,7 +119,7 @@ export interface ComponentArguments {
   * `getContext()` - returns the object that should be
 */
 export default class CustomComponentManager<ComponentInstance>
-  extends AbstractComponentManager<
+  extends BaseInternalComponentManager<
     CustomComponentState<ComponentInstance>,
     CustomComponentDefinitionState<ComponentInstance>
   >
@@ -179,7 +136,7 @@ export default class CustomComponentManager<ComponentInstance>
     let { delegate } = definition;
     let args = argsProxyFor(vmArgs.capture(), 'component');
 
-    let component = delegate.createComponent(definition.ComponentClass.class, args);
+    let component = delegate.createComponent(definition.ComponentClass.class!, args);
 
     let bucket = new CustomComponentState(delegate, component, args, env);
 
@@ -222,7 +179,7 @@ export default class CustomComponentManager<ComponentInstance>
     return bucket;
   }
 
-  getCapabilities(): ComponentCapabilities {
+  getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
 
@@ -237,7 +194,7 @@ const CUSTOM_COMPONENT_MANAGER = new CustomComponentManager();
  */
 export class CustomComponentState<ComponentInstance> {
   constructor(
-    public delegate: ManagerDelegate<ComponentInstance>,
+    public delegate: ComponentManager<ComponentInstance>,
     public component: ComponentInstance,
     public args: Arguments,
     public env: Environment
@@ -250,7 +207,7 @@ export class CustomComponentState<ComponentInstance> {
 
 export interface CustomComponentDefinitionState<ComponentInstance>
   extends DefinitionState<ComponentInstance> {
-  delegate: ManagerDelegate<ComponentInstance>;
+  delegate: ComponentManager<ComponentInstance>;
 }
 
 export class CustomManagerDefinition<ComponentInstance> implements ComponentDefinition {
@@ -262,7 +219,7 @@ export class CustomManagerDefinition<ComponentInstance> implements ComponentDefi
   constructor(
     public name: string,
     public ComponentClass: Factory<ComponentInstance>,
-    public delegate: ManagerDelegate<ComponentInstance>,
+    public delegate: ComponentManager<ComponentInstance>,
     public template: Template
   ) {
     this.state = {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts b/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
index be3056a75bf..156fee126d9 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
@@ -1,9 +1,9 @@
 import { Factory } from '@ember/-internals/owner';
-import { ComponentCapabilities, Template } from '@glimmer/interfaces';
+import { InternalComponentCapabilities, Template } from '@glimmer/interfaces';
 import { Component } from '../utils/curly-component-state-bucket';
 
 export default interface DefinitionState {
-  capabilities: ComponentCapabilities;
+  capabilities: InternalComponentCapabilities;
   name: string;
   ComponentClass: Factory<
     Component,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index 87c7f50d508..b56161631c6 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -1,21 +1,21 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import {
-  ComponentCapabilities,
   ComponentDefinition,
   Destroyable,
   DynamicScope,
   Environment,
+  InternalComponentCapabilities,
+  InternalComponentManager,
   Template,
   VMArguments,
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { _WeakSet } from '@glimmer/util';
+import { BaseInternalComponentManager } from '@glimmer/runtime';
 import InternalComponent from '../components/internal';
-import AbstractComponentManager from './abstract';
 
-const CAPABILITIES: ComponentCapabilities = {
+const CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: false,
   dynamicTag: false,
   prepareArgs: false,
@@ -41,11 +41,12 @@ export interface InternalComponentState {
 }
 
 export class InternalComponentDefinition
-  implements ComponentDefinition<InternalDefinitionState, InternalComponentState, InternalManager> {
+  implements
+    ComponentDefinition<InternalDefinitionState, InternalComponentState, InternalComponentManager> {
   public state: InternalDefinitionState;
 
   constructor(
-    public manager: InternalManager,
+    public manager: InternalComponentManager,
     ComponentClass: typeof InternalComponent,
     layout: Template
   ) {
@@ -53,14 +54,8 @@ export class InternalComponentDefinition
   }
 }
 
-const INTERNAL_MANAGERS = new _WeakSet();
-
-export function isInternalManager(manager: object): manager is InternalManager {
-  return INTERNAL_MANAGERS.has(manager);
-}
-
 export default class InternalManager
-  extends AbstractComponentManager<InternalComponentState, InternalDefinitionState>
+  extends BaseInternalComponentManager<InternalComponentState, InternalDefinitionState>
   implements WithStaticLayout<InternalComponentState, InternalDefinitionState> {
   static for(name: string): (owner: Owner) => InternalManager {
     return (owner: Owner) => new InternalManager(owner, name);
@@ -68,10 +63,9 @@ export default class InternalManager
 
   constructor(private owner: Owner, private name: string) {
     super();
-    INTERNAL_MANAGERS.add(this);
   }
 
-  getCapabilities(): ComponentCapabilities {
+  getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
 
@@ -104,14 +98,6 @@ export default class InternalManager
     return createConstRef(instance, 'this');
   }
 
-  didCreate(): void {}
-
-  didUpdate(): void {}
-
-  didRenderLayout(): void {}
-
-  didUpdateLayout(): void {}
-
   getDestroyable(state: InternalComponentState): Destroyable {
     return state.instance;
   }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 1bc8c7f1470..9d5e3a97a48 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -3,11 +3,11 @@ import { generateControllerFactory } from '@ember/-internals/routing';
 import EngineInstance from '@ember/engine/instance';
 import {
   CapturedArguments,
-  ComponentCapabilities,
   ComponentDefinition,
   CustomRenderNode,
   Destroyable,
   Environment,
+  InternalComponentCapabilities,
   Option,
   Template,
   TemplateFactory,
@@ -16,9 +16,8 @@ import {
   WithDynamicLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { associateDestroyableChild } from '@glimmer/runtime';
+import { associateDestroyableChild, BaseInternalComponentManager } from '@glimmer/runtime';
 import RuntimeResolver from '../resolver';
-import AbstractManager from './abstract';
 
 interface EngineState {
   engine: EngineInstance;
@@ -47,7 +46,7 @@ const CAPABILITIES = {
 };
 
 class MountManager
-  extends AbstractManager<EngineState, EngineDefinitionState>
+  extends BaseInternalComponentManager<EngineState, EngineDefinitionState>
   implements
     WithDynamicLayout<EngineState, RuntimeResolver>,
     WithCustomDebugRenderTree<EngineState, EngineDefinitionState> {
@@ -56,7 +55,7 @@ class MountManager
     return templateFactory(state.engine);
   }
 
-  getCapabilities(): ComponentCapabilities {
+  getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 8955c65ff85..c0f53fb409e 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -6,11 +6,11 @@ import { _instrumentStart } from '@ember/instrumentation';
 import { assign } from '@ember/polyfills';
 import {
   CapturedArguments,
-  ComponentCapabilities,
   ComponentDefinition,
   CustomRenderNode,
   Destroyable,
   Environment,
+  InternalComponentCapabilities,
   Option,
   Template,
   VMArguments,
@@ -19,13 +19,12 @@ import {
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { EMPTY_ARGS } from '@glimmer/runtime';
+import { BaseInternalComponentManager, EMPTY_ARGS } from '@glimmer/runtime';
 
 import { SimpleElement } from '@simple-dom/interface';
 import { DynamicScope } from '../renderer';
 import { OutletState } from '../utils/outlet';
 import OutletView from '../views/outlet';
-import AbstractManager from './abstract';
 
 function instrumentationPayload(def: OutletDefinitionState) {
   return { object: `${def.name}:${def.outlet}` };
@@ -48,7 +47,7 @@ export interface OutletDefinitionState {
   model: unknown;
 }
 
-const CAPABILITIES: ComponentCapabilities = {
+const CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: false,
   dynamicTag: false,
   prepareArgs: false,
@@ -64,7 +63,7 @@ const CAPABILITIES: ComponentCapabilities = {
 };
 
 class OutletComponentManager
-  extends AbstractManager<OutletInstanceState, OutletDefinitionState>
+  extends BaseInternalComponentManager<OutletInstanceState, OutletDefinitionState>
   implements
     WithStaticLayout<OutletInstanceState, OutletDefinitionState>,
     WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState> {
@@ -156,7 +155,7 @@ class OutletComponentManager
     return template;
   }
 
-  getCapabilities(): ComponentCapabilities {
+  getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
 
@@ -204,7 +203,7 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
         return template;
       }
 
-      getCapabilities(): ComponentCapabilities {
+      getCapabilities(): InternalComponentCapabilities {
         return WRAPPED_CAPABILITIES;
       }
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index 6263f39887b..d8ae5774223 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -3,9 +3,9 @@ import { Factory } from '@ember/-internals/owner';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import {
-  ComponentCapabilities,
   ComponentDefinition,
   Environment,
+  InternalComponentCapabilities,
   Option,
   Template,
   VMArguments,
@@ -80,7 +80,7 @@ class RootComponentManager extends CurlyComponentManager {
 
 // ROOT is the top-level template it has nothing but one yield.
 // it is supposed to have a dummy element
-export const ROOT_CAPABILITIES: ComponentCapabilities = {
+export const ROOT_CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: false,
   dynamicTag: true,
   prepareArgs: false,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
index 3dccf8e411d..9aa36c1dd1e 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
@@ -1,14 +1,14 @@
 import {
-  ComponentCapabilities,
   ComponentDefinition,
   Environment,
+  InternalComponentCapabilities,
   Option,
   Template,
   WithStaticLayout,
 } from '@glimmer/interfaces';
 import { NULL_REFERENCE, Reference } from '@glimmer/reference';
 
-const CAPABILITIES: ComponentCapabilities = {
+const CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: false,
   dynamicTag: false,
   prepareArgs: false,
@@ -33,7 +33,7 @@ export default class TemplateOnlyComponentManager
     return template;
   }
 
-  getCapabilities(): ComponentCapabilities {
+  getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index bb0a64628a7..c74e0e6545d 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -1,8 +1,8 @@
 /**
 @module @ember/component
 */
+import { setComponentManager } from '@glimmer/runtime';
 import InternalManager from '../component-managers/internal';
-import { setComponentManager } from '../utils/managers';
 import InternalComponent from './internal';
 
 /**
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 9b0d045244a..70129c3807b 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -7,7 +7,8 @@ import { FrameworkObject } from '@ember/-internals/runtime';
 import { getDebugName, symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { Arguments, Dict } from '@glimmer/interfaces';
+import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
+import { setHelperManager } from '@glimmer/runtime';
 import { _WeakSet as WeakSet } from '@glimmer/util';
 import {
   consumeTag,
@@ -15,8 +16,7 @@ import {
   deprecateMutationsInTrackingTransaction,
   dirtyTag,
 } from '@glimmer/validator';
-import { helperCapabilities, HelperManager } from './helpers/custom';
-import { setHelperManager } from './utils/managers';
+import { helperCapabilities } from './helpers/custom';
 
 export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
 
@@ -197,7 +197,7 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
-setHelperManager((owner) => new ClassicHelperManager(owner), Helper);
+setHelperManager((owner: Owner | undefined) => new ClassicHelperManager(owner), Helper);
 
 ///////////
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
index 6de5bc7d427..cd15a76e759 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
@@ -2,32 +2,33 @@ import { getOwner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { Arguments, Helper as GlimmerHelper } from '@glimmer/interfaces';
+import {
+  Arguments,
+  Helper as GlimmerHelper,
+  HelperCapabilities,
+  HelperManager,
+  HelperManagerWithDestroyable,
+  HelperManagerWithValue,
+} from '@glimmer/interfaces';
 import { createComputeRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
 import {
   associateDestroyableChild,
+  buildCapabilities,
   EMPTY_ARGS,
   EMPTY_NAMED,
   EMPTY_POSITIONAL,
+  getHelperManager,
   isDestroyed,
   isDestroying,
+  isInternalHelper,
 } from '@glimmer/runtime';
 import { Cache, createCache, getValue } from '@glimmer/validator';
 import { argsProxyFor } from '../utils/args-proxy';
-import { buildCapabilities, getHelperManager, InternalCapabilities } from '../utils/managers';
 
 /**
 @module @ember/helper
 */
 
-export type HelperDefinition = object;
-
-export interface HelperCapabilities extends InternalCapabilities {
-  hasValue: boolean;
-  hasDestroyable: boolean;
-  hasScheduledEffect: boolean;
-}
-
 /**
   `capabilities` returns a capabilities configuration which can be used to modify
   the behavior of the manager. Manager capabilities _must_ be provided using the
@@ -296,29 +297,13 @@ export function helperCapabilities(
   @return {object} The definition passed into setHelperManager
   @public
 */
-export interface HelperManager<HelperStateBucket = unknown> {
-  capabilities: HelperCapabilities;
-
-  createHelper(definition: HelperDefinition, args: Arguments): HelperStateBucket;
-
-  getDebugName?(definition: HelperDefinition): string;
-}
-
-export interface HelperManagerWithValue<HelperStateBucket = unknown>
-  extends HelperManager<HelperStateBucket> {
-  getValue(bucket: HelperStateBucket): unknown;
-}
-
-function hasValue(manager: HelperManager): manager is HelperManagerWithValue {
+function hasValue(manager: HelperManager<unknown>): manager is HelperManagerWithValue<unknown> {
   return manager.capabilities.hasValue;
 }
 
-export interface HelperManagerWithDestroyable<HelperStateBucket = unknown>
-  extends HelperManager<HelperStateBucket> {
-  getDestroyable(bucket: HelperStateBucket): object;
-}
-
-function hasDestroyable(manager: HelperManager): manager is HelperManagerWithDestroyable {
+function hasDestroyable(
+  manager: HelperManager<unknown>
+): manager is HelperManagerWithDestroyable<unknown> {
   return manager.capabilities.hasDestroyable;
 }
 
@@ -411,7 +396,7 @@ class SimpleArgsProxy {
 */
 export function invokeHelper(
   context: object,
-  definition: HelperDefinition,
+  definition: object,
   computeArgs?: (context: object) => Partial<Arguments>
 ): Cache<unknown> {
   assert(
@@ -430,6 +415,8 @@ export function invokeHelper(
     manager
   );
 
+  assert('Invoke helper does not support internal helpers yet', !isInternalHelper(manager));
+
   let args = new SimpleArgsProxy(context, computeArgs);
   let bucket = manager.createHelper(definition, args);
 
@@ -461,7 +448,7 @@ export function invokeHelper(
 
 export default function customHelper(
   manager: HelperManager<unknown>,
-  definition: HelperDefinition
+  definition: object
 ): GlimmerHelper {
   return (vmArgs, vm) => {
     const args = argsProxyFor(vmArgs.capture(), 'helper');
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index f59edfaf140..81fb377262c 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -8,12 +8,13 @@ import {
   CapturedNamedArguments,
   CapturedPositionalArguments,
   DynamicScope,
-  ModifierManager,
+  GlimmerTreeChanges,
+  InternalModifierManager,
   VMArguments,
 } from '@glimmer/interfaces';
 import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { registerDestructor } from '@glimmer/runtime';
-import { createUpdatableTag } from '@glimmer/validator';
+import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { INVOKE } from '../helpers/action';
 
@@ -70,7 +71,7 @@ export class ActionState {
   public namedArgs: CapturedNamedArguments;
   public positional: CapturedPositionalArguments;
   public implicitTarget: any;
-  public dom: any;
+  public dom: GlimmerTreeChanges;
   public eventName: any;
   public tag = createUpdatableTag();
 
@@ -80,7 +81,7 @@ export class ActionState {
     actionArgs: any[],
     namedArgs: CapturedNamedArguments,
     positionalArgs: CapturedPositionalArguments,
-    dom: any
+    dom: GlimmerTreeChanges
   ) {
     this.element = element;
     this.actionId = actionId;
@@ -201,14 +202,15 @@ export class ActionState {
 }
 
 // implements ModifierManager<Action>
-export default class ActionModifierManager implements ModifierManager<ActionState, unknown> {
+export default class ActionModifierManager
+  implements InternalModifierManager<ActionState, unknown> {
   create(
     element: SimpleElement,
     _state: unknown,
     args: VMArguments,
     _dynamicScope: DynamicScope,
-    dom: any
-  ) {
+    dom: GlimmerTreeChanges
+  ): ActionState {
     let { named, positional } = args.capture();
 
     let actionArgs: any[] = [];
@@ -240,11 +242,11 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     return actionState;
   }
 
-  getDebugName() {
+  getDebugName(): string {
     return 'action';
   }
 
-  install(actionState: ActionState) {
+  install(actionState: ActionState): void {
     let { dom, element, actionId, positional } = actionState;
 
     let actionName;
@@ -286,10 +288,10 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     ActionHelper.registerAction(actionState);
 
     dom.setAttribute(element, 'data-ember-action', '');
-    dom.setAttribute(element, `data-ember-action-${actionId}`, actionId);
+    dom.setAttribute(element, `data-ember-action-${actionId}`, String(actionId));
   }
 
-  update(actionState: ActionState) {
+  update(actionState: ActionState): void {
     let { positional } = actionState;
     let actionNameRef = positional[1];
 
@@ -300,11 +302,11 @@ export default class ActionModifierManager implements ModifierManager<ActionStat
     actionState.eventName = actionState.getEventName();
   }
 
-  getTag(actionState: ActionState) {
+  getTag(actionState: ActionState): UpdatableTag {
     return actionState.tag;
   }
 
-  getDestroyable(actionState: ActionState) {
+  getDestroyable(actionState: ActionState): object {
     return actionState;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index 63cf4a97227..88a12791e69 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -1,41 +1,29 @@
 import { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { Arguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
-import { registerDestructor, reifyArgs } from '@glimmer/runtime';
+import {
+  Arguments,
+  InternalModifierManager,
+  ModifierCapabilities,
+  ModifierCapabilitiesVersions,
+  ModifierManager,
+  VMArguments,
+} from '@glimmer/interfaces';
+import { buildCapabilities, registerDestructor, reifyArgs } from '@glimmer/runtime';
 import { createUpdatableTag, untrack, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { argsProxyFor } from '../utils/args-proxy';
-import { buildCapabilities, InternalCapabilities } from '../utils/managers';
 
 export interface CustomModifierDefinitionState<ModifierInstance> {
   ModifierClass: Factory<ModifierInstance>;
   name: string;
-  delegate: ModifierManagerDelegate<ModifierInstance>;
+  delegate: ModifierManager<ModifierInstance>;
 }
 
-export interface OptionalCapabilities {
-  '3.13': {
-    disableAutoTracking?: boolean;
-  };
-
-  // passes factoryFor(...).class to `.createModifier`
-  // uses args proxy, does not provide a way to opt-out
-  '3.22': {
-    disableAutoTracking?: boolean;
-  };
-}
-
-export interface Capabilities extends InternalCapabilities {
-  disableAutoTracking: boolean;
-  useArgsProxy: boolean;
-  passFactoryToCreate: boolean;
-}
-
-export function capabilities<Version extends keyof OptionalCapabilities>(
+export function capabilities<Version extends keyof ModifierCapabilitiesVersions>(
   managerAPI: Version,
-  optionalFeatures: OptionalCapabilities[Version] = {}
-): Capabilities {
+  optionalFeatures: ModifierCapabilitiesVersions[Version] = {}
+): ModifierCapabilities {
   assert(
     'Invalid modifier manager compatibility specified',
     managerAPI === '3.13' || managerAPI === '3.22'
@@ -45,17 +33,20 @@ export function capabilities<Version extends keyof OptionalCapabilities>(
     disableAutoTracking: Boolean(optionalFeatures.disableAutoTracking),
     useArgsProxy: managerAPI === '3.13' ? false : true,
     passFactoryToCreate: managerAPI === '3.13',
-  }) as Capabilities;
+  });
 }
 
 export class CustomModifierDefinition<ModifierInstance> {
   public state: CustomModifierDefinitionState<ModifierInstance>;
-  public manager: ModifierManager<unknown | null, CustomModifierDefinitionState<ModifierInstance>>;
+  public manager: InternalModifierManager<
+    unknown | null,
+    CustomModifierDefinitionState<ModifierInstance>
+  >;
 
   constructor(
     public name: string,
     public ModifierClass: Factory<ModifierInstance>,
-    public delegate: ModifierManagerDelegate<ModifierInstance>,
+    public delegate: ModifierManager<ModifierInstance>,
     isInteractive: boolean
   ) {
     this.state = {
@@ -73,20 +64,12 @@ export class CustomModifierDefinition<ModifierInstance> {
 export interface CustomModifierState<ModifierInstance> {
   tag: UpdatableTag;
   element: SimpleElement;
-  delegate: ModifierManagerDelegate<ModifierInstance>;
+  delegate: ModifierManager<ModifierInstance>;
   modifier: ModifierInstance;
   args: Arguments;
   debugName?: string;
 }
 
-export interface ModifierManagerDelegate<ModifierInstance> {
-  capabilities: Capabilities;
-  createModifier(factory: unknown, args: Arguments): ModifierInstance;
-  installModifier(instance: ModifierInstance, element: SimpleElement, args: Arguments): void;
-  updateModifier(instance: ModifierInstance, args: Arguments): void;
-  destroyModifier(instance: ModifierInstance, args: Arguments): void;
-}
-
 /**
   The CustomModifierManager allows addons to provide custom modifier
   implementations that integrate seamlessly into Ember. This is accomplished
@@ -113,7 +96,7 @@ export interface ModifierManagerDelegate<ModifierInstance> {
 */
 class InteractiveCustomModifierManager<ModifierInstance>
   implements
-    ModifierManager<
+    InternalModifierManager<
       CustomModifierState<ModifierInstance>,
       CustomModifierDefinitionState<ModifierInstance>
     > {
@@ -201,7 +184,7 @@ class InteractiveCustomModifierManager<ModifierInstance>
 }
 
 class NonInteractiveCustomModifierManager<ModifierInstance>
-  implements ModifierManager<null, CustomModifierDefinitionState<ModifierInstance>> {
+  implements InternalModifierManager<null, CustomModifierDefinitionState<ModifierInstance>> {
   create() {
     return null;
   }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 394dce18903..596d01be855 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -1,7 +1,7 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, ModifierManager, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, InternalModifierManager, VMArguments } from '@glimmer/interfaces';
 import { valueForRef } from '@glimmer/reference';
 import { registerDestructor, reifyNamed } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
@@ -311,7 +311,8 @@ function addEventListener(
   @public
   @since 3.11.0
 */
-export default class OnModifierManager implements ModifierManager<OnModifierState | null, unknown> {
+export default class OnModifierManager
+  implements InternalModifierManager<OnModifierState | null, unknown> {
   public SUPPORTS_EVENT_OPTIONS: boolean = SUPPORTS_EVENT_OPTIONS;
   public isInteractive: boolean;
   private owner: Owner;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index a14e6d7b899..4ca1d316245 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -17,10 +17,20 @@ import {
   TemplateFactory,
 } from '@glimmer/interfaces';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
-import { getComponentTemplate, getDynamicVar, ModifierDefinition } from '@glimmer/runtime';
+import {
+  getComponentManager,
+  getComponentTemplate,
+  getDynamicVar,
+  getHelperManager,
+  getModifierManager,
+  isInternalComponentManager,
+  isInternalHelper,
+  isInternalModifierManager,
+  ModifierDefinition,
+} from '@glimmer/runtime';
 import { CurlyComponentDefinition } from './component-managers/curly';
 import { CustomManagerDefinition } from './component-managers/custom';
-import { InternalComponentDefinition, isInternalManager } from './component-managers/internal';
+import { InternalComponentDefinition } from './component-managers/internal';
 import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
 import InternalComponent from './components/internal';
 import {
@@ -53,7 +63,6 @@ import { CustomModifierDefinition } from './modifiers/custom';
 import OnModifierManager from './modifiers/on';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
-import { getComponentManager, getHelperManager, getModifierManager } from './utils/managers';
 
 function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
@@ -361,6 +370,11 @@ export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
         manager === SIMPLE_CLASSIC_HELPER_MANAGER
     );
 
+    assert(
+      `internal helpers are not supported via \`getHelperManager\` yet, found an internal manager for ${name}`,
+      !isInternalHelper(manager)
+    );
+
     // For classic class based helpers, we need to pass the factoryFor result itself rather
     // than the raw value (`factoryFor(...).class`). This is because injections are already
     // bound in the factoryFor result, including type-based injections
@@ -382,7 +396,14 @@ export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
       if (modifier !== undefined) {
         let manager = getModifierManager(owner, modifier.class!);
 
-        return new CustomModifierDefinition(name, modifier, manager!, this.isInteractive);
+        assert(`Expected a modifier manager to exist, but did not find one for ${name}`, manager);
+
+        assert(
+          `Internal modifier managers are not supported via \`getModifierManager\` yet, found an internal manager for ${name}`,
+          !isInternalModifierManager(manager)
+        );
+
+        return new CustomModifierDefinition(name, modifier, manager, this.isInteractive);
       }
     }
 
@@ -434,7 +455,7 @@ export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
       let manager = getComponentManager(owner, ComponentClass);
 
       if (manager !== undefined) {
-        if (isInternalManager(manager)) {
+        if (isInternalComponentManager(manager)) {
           assert(`missing layout for internal component ${name}`, pair.layout !== null);
 
           definition = new InternalComponentDefinition(
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index b08b866364b..0ef126cc1b6 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,168 +1,15 @@
 import { Owner } from '@ember/-internals/owner';
-import { assert, deprecate } from '@ember/debug';
+import { deprecate } from '@ember/debug';
 import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
-import { DEBUG } from '@glimmer/env';
-import { _WeakSet } from '@glimmer/util';
-import { ManagerDelegate as ComponentManagerDelegate } from '../component-managers/custom';
-import InternalComponentManager, { isInternalManager } from '../component-managers/internal';
-import { HelperManager } from '../helpers/custom';
-import { ModifierManagerDelegate } from '../modifiers/custom';
-
-type ManagerDelegate =
-  | ComponentManagerDelegate<unknown>
-  | InternalComponentManager
-  | ModifierManagerDelegate<unknown>
-  | HelperManager;
-
-const COMPONENT_MANAGERS = new WeakMap<
-  object,
-  ManagerFactory<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>
->();
-
-const FROM_CAPABILITIES = DEBUG ? new _WeakSet() : undefined;
-
-const MODIFIER_MANAGERS = new WeakMap<
-  object,
-  ManagerFactory<Owner, ModifierManagerDelegate<unknown>>
->();
-
-const HELPER_MANAGERS = new WeakMap<
-  object,
-  ManagerFactory<Owner | undefined, HelperManager<unknown>>
->();
-
-const OWNER_MANAGER_INSTANCES: WeakMap<Owner, WeakMap<ManagerFactory, unknown>> = new WeakMap();
-const UNDEFINED_MANAGER_INSTANCES: WeakMap<ManagerFactory, unknown> = new WeakMap();
-
-export type ManagerFactory<O = Owner, D extends ManagerDelegate = ManagerDelegate> = (
-  owner: O
-) => D;
-
-///////////
-
-const getPrototypeOf = Object.getPrototypeOf;
-
-function setManager<Def extends object>(
-  map: WeakMap<object, ManagerFactory>,
-  factory: ManagerFactory,
-  obj: Def
-): Def {
-  map.set(obj, factory);
-  return obj;
-}
-
-function getManager<O, D extends ManagerDelegate>(
-  map: WeakMap<object, ManagerFactory<O, D>>,
-  obj: object
-): ManagerFactory<O, D> | undefined {
-  let pointer = obj;
-  while (pointer !== undefined && pointer !== null) {
-    const manager = map.get(pointer);
-
-    if (manager !== undefined) {
-      return manager;
-    }
-
-    pointer = getPrototypeOf(pointer);
-  }
-
-  return undefined;
-}
-
-function getManagerInstanceForOwner<D extends ManagerDelegate>(
-  owner: Owner | undefined,
-  factory: ManagerFactory<Owner, D>
-): D {
-  let managers;
-
-  if (owner === undefined) {
-    managers = UNDEFINED_MANAGER_INSTANCES;
-  } else {
-    managers = OWNER_MANAGER_INSTANCES.get(owner);
-
-    if (managers === undefined) {
-      managers = new WeakMap();
-      OWNER_MANAGER_INSTANCES.set(owner, managers);
-    }
-  }
-
-  let instance = managers.get(factory);
-
-  if (instance === undefined) {
-    instance = factory(owner!);
-    managers.set(factory, instance!);
-  }
-
-  // We know for sure that it's the correct type at this point, but TS can't know
-  return instance as D;
-}
-
-///////////
-
-export function setModifierManager(
-  factory: ManagerFactory<Owner, ModifierManagerDelegate<unknown>>,
-  definition: object
-) {
-  return setManager(MODIFIER_MANAGERS, factory, definition);
-}
-
-export function getModifierManager(
-  owner: Owner | undefined,
-  definition: object
-): ModifierManagerDelegate<unknown> | undefined {
-  const factory = getManager(MODIFIER_MANAGERS, definition);
-
-  if (factory !== undefined) {
-    let manager = getManagerInstanceForOwner(owner, factory);
-    assert(
-      `Custom modifier managers must have a \`capabilities\` property that is the result of calling the \`capabilities('3.13' | '3.22')\` (imported via \`import { capabilities } from '@ember/modifier';\`). Received: \`${JSON.stringify(
-        manager.capabilities
-      )}\` for: \`${manager}\``,
-      FROM_CAPABILITIES!.has(manager.capabilities)
-    );
-
-    return manager;
-  }
-
-  return undefined;
-}
-
-export function setHelperManager(
-  factory: ManagerFactory<Owner | undefined, HelperManager<unknown>>,
-  definition: object
-) {
-  return setManager(HELPER_MANAGERS, factory, definition);
-}
-
-export function getHelperManager(
-  owner: Owner | undefined,
-  definition: object
-): HelperManager<unknown> | undefined {
-  const factory = getManager(HELPER_MANAGERS, definition);
-
-  if (factory !== undefined) {
-    let manager = getManagerInstanceForOwner(owner, factory);
-
-    assert(
-      `Custom helper managers must have a \`capabilities\` property that is the result of calling the \`capabilities('3.23')\` (imported via \`import { capabilities } from '@ember/helper';\`). Received: \`${JSON.stringify(
-        manager.capabilities
-      )}\` for: \`${manager}\``,
-      FROM_CAPABILITIES!.has(manager.capabilities)
-    );
-
-    return manager;
-  }
-
-  return undefined;
-}
+import { ComponentManager } from '@glimmer/interfaces';
+import { setComponentManager as glimmerSetComponentManager } from '@glimmer/runtime';
 
 export function setComponentManager(
-  stringOrFunction:
-    | string
-    | ManagerFactory<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>,
+  stringOrFunction: string | ((owner: Owner) => ComponentManager<unknown>),
   obj: object
-) {
-  let factory: ManagerFactory<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>;
+): object {
+  let factory: (owner: Owner) => ComponentManager<unknown>;
+
   if (COMPONENT_MANAGER_STRING_LOOKUP && typeof stringOrFunction === 'string') {
     deprecate(
       'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.',
@@ -178,56 +25,11 @@ export function setComponentManager(
       }
     );
     factory = function (owner: Owner) {
-      return owner.lookup<ComponentManagerDelegate<unknown> | InternalComponentManager>(
-        `component-manager:${stringOrFunction}`
-      )!;
+      return owner.lookup<ComponentManager<unknown>>(`component-manager:${stringOrFunction}`)!;
     };
   } else {
-    factory = stringOrFunction as ManagerFactory<
-      Owner,
-      ComponentManagerDelegate<unknown> | InternalComponentManager
-    >;
-  }
-
-  return setManager(COMPONENT_MANAGERS, factory, obj);
-}
-
-export function getComponentManager(
-  owner: Owner | undefined,
-  definition: object
-): ComponentManagerDelegate<unknown> | InternalComponentManager | undefined {
-  const factory = getManager<Owner, ComponentManagerDelegate<unknown> | InternalComponentManager>(
-    COMPONENT_MANAGERS,
-    definition
-  );
-
-  if (factory !== undefined) {
-    let manager = getManagerInstanceForOwner(owner, factory);
-
-    assert(
-      `Custom component managers must have a \`capabilities\` property that is the result of calling the \`capabilities('3.4' | '3.13')\` (imported via \`import { capabilities } from '@ember/component';\`). Received: \`${JSON.stringify(
-        (manager as ComponentManagerDelegate<unknown>).capabilities
-      )}\` for: \`${manager}\``,
-      isInternalManager(manager) || FROM_CAPABILITIES!.has(manager.capabilities)
-    );
-
-    return manager;
-  }
-
-  return undefined;
-}
-
-declare const INTERNAL_CAPABILITIES: unique symbol;
-
-export interface InternalCapabilities {
-  [INTERNAL_CAPABILITIES]: true;
-}
-
-export function buildCapabilities<T extends object>(capabilities: T): T & InternalCapabilities {
-  if (DEBUG) {
-    FROM_CAPABILITIES!.add(capabilities);
-    Object.freeze(capabilities);
+    factory = stringOrFunction as (owner: Owner) => ComponentManager<unknown>;
   }
 
-  return capabilities as T & InternalCapabilities;
+  return glimmerSetComponentManager(factory, obj);
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 08441c22577..9fa7ee194cb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -1,6 +1,7 @@
 import { moduleFor, RenderingTestCase, strip, classes, runTask } from 'internal-test-helpers';
+import { setModifierManager } from '@glimmer/runtime';
 import { ENV } from '@ember/-internals/environment';
-import { setModifierManager, modifierCapabilities } from '@ember/-internals/glimmer';
+import { modifierCapabilities } from '@ember/-internals/glimmer';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 
 import { set, setProperties } from '@ember/-internals/metal';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 3cc855fc8af..36fe9447b60 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -1,3 +1,4 @@
+import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { Object as EmberObject } from '@ember/-internals/runtime';
@@ -524,6 +525,11 @@ moduleFor(
     }
 
     '@test capabilities helper function must be used to generate capabilities'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
@@ -572,7 +578,7 @@ moduleFor(
         ComponentClass,
       });
 
-      expectAssertion(() => {
+      assert.throws(() => {
         this.render('{{foo-bar name=name}}', { name: 'world' });
       }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
 
@@ -832,6 +838,11 @@ moduleFor(
     }
 
     '@test capabilities helper function must be used to generate capabilities'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
@@ -880,7 +891,7 @@ moduleFor(
         ComponentClass,
       });
 
-      expectAssertion(() => {
+      assert.throws(() => {
         this.render('<FooBar @name={{name}} />', { name: 'world' });
       }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index ff65c64aa12..32752394b11 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -1,12 +1,19 @@
+import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
+import { setModifierManager } from '@glimmer/runtime';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { setModifierManager, modifierCapabilities } from '@ember/-internals/glimmer';
+import { modifierCapabilities } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../utils/debug-stack';
 
 class ModifierManagerTest extends RenderingTestCase {
-  '@test throws a useful error when missing capabilities'() {
+  '@test throws a useful error when missing capabilities'(assert) {
+    if (!DEBUG) {
+      assert.expect(0);
+      return;
+    }
+
     this.registerModifier(
       'foo-bar',
       setModifierManager(() => {
@@ -19,7 +26,7 @@ class ModifierManagerTest extends RenderingTestCase {
       }, {})
     );
 
-    expectAssertion(() => {
+    assert.throws(() => {
       this.render('<h1 {{foo-bar}}>hello world</h1>');
     }, /Custom modifier managers must have a `capabilities` property /);
   }
@@ -269,6 +276,11 @@ class ModifierManagerTest extends RenderingTestCase {
   }
 
   '@test capabilities helper function must be used to generate capabilities'(assert) {
+    if (!DEBUG) {
+      assert.expect(0);
+      return;
+    }
+
     class OverrideCustomModifierManager extends this.CustomModifierManager {
       capabilities = {
         disableAutoTracking: false,
@@ -296,7 +308,7 @@ class ModifierManagerTest extends RenderingTestCase {
 
     this.registerModifier('foo-bar', ModifierClass.extend());
 
-    expectAssertion(() => {
+    assert.throws(() => {
       this.render('<h1 {{foo-bar}}>hello world</h1>');
     }, /Custom modifier managers must have a `capabilities` property that is the result of calling the `capabilities\('3.13' \| '3.22'\)` \(imported via `import \{ capabilities \} from '@ember\/modifier';`\). /);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 0477a22d48c..8b48cb65819 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -1,15 +1,12 @@
+import { DEBUG } from '@glimmer/env';
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
-import {
-  setHelperManager,
-  setModifierManager,
-  helperCapabilities,
-} from '@ember/-internals/glimmer';
+import { helperCapabilities } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
 import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { inject as service } from '@ember/service';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
-import { registerDestructor } from '@glimmer/runtime';
+import { registerDestructor, setHelperManager, setModifierManager } from '@glimmer/runtime';
 
 class TestHelperManager {
   capabilities = helperCapabilities('3.23', {
@@ -291,6 +288,11 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
       }
 
       '@test capabilities helper function must be used to generate capabilities'(assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
         class OverrideTestHelperManager extends TestHelperManager {
           capabilities = {
             hasValue: true,
@@ -311,7 +313,7 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
           }
         );
 
-        expectAssertion(() => {
+        assert.throws(() => {
           this.render('{{hello}}');
         }, /Custom helper managers must have a `capabilities` property that is the result of calling the `capabilities\('3.23'\)` \(imported via `import \{ capabilities \} from '@ember\/helper';`\). /);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index facc5ef9ad3..2fe738c0d74 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -4,7 +4,6 @@ import {
   Helper,
   helper,
   Component as EmberComponent,
-  setHelperManager,
   helperCapabilities,
 } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
@@ -13,7 +12,7 @@ import { EMBER_GLIMMER_INVOKE_HELPER, EMBER_GLIMMER_HELPER_MANAGER } from '@embe
 import Service, { inject as service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
-import { destroy, isDestroyed, registerDestructor } from '@glimmer/runtime';
+import { destroy, isDestroyed, registerDestructor, setHelperManager } from '@glimmer/runtime';
 
 if (EMBER_GLIMMER_INVOKE_HELPER) {
   moduleFor(
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 53c9e5ea331..005f637cc42 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -21,9 +21,7 @@ export type DebugFunctionType =
   | 'runInDebug'
   | 'deprecateFunc';
 
-export type AssertFunc =
-  | ((desc: string) => never)
-  | ((desc: string, condition?: unknown) => asserts condition);
+export type AssertFunc = (desc: string, condition?: unknown) => asserts condition;
 export type DebugFunc = (message: string) => void;
 export type DebugSealFunc = (obj: object) => void;
 export type DebugFreezeFunc = (obj: object) => void;
diff --git a/packages/@ember/modifier/index.ts b/packages/@ember/modifier/index.ts
index 27aefcd98c5..1610a1f1f6f 100644
--- a/packages/@ember/modifier/index.ts
+++ b/packages/@ember/modifier/index.ts
@@ -1 +1,2 @@
-export { setModifierManager, modifierCapabilities as capabilties } from '@ember/-internals/glimmer';
+export { setModifierManager } from '@glimmer/runtime';
+export { modifierCapabilities as capabilties } from '@ember/-internals/glimmer';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index e80787a2db6..2e9bac501a2 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -103,7 +103,6 @@ import {
   Checkbox,
   Component,
   setComponentManager,
-  setHelperManager,
   capabilities,
   escapeExpression,
   getTemplates,
@@ -119,10 +118,7 @@ import {
   TextField,
   TextArea,
   isSerializationFirstNode,
-  setModifierManager,
   modifierCapabilities,
-  setComponentTemplate,
-  getComponentTemplate,
 } from '@ember/-internals/glimmer';
 // eslint-disable-next-line import/no-unresolved
 import VERSION from './version';
@@ -142,6 +138,13 @@ import { assign, merge } from '@ember/polyfills';
 import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import templateOnlyComponent from '@ember/component/template-only';
 
+import {
+  setModifierManager,
+  setComponentTemplate,
+  getComponentTemplate,
+  setHelperManager,
+} from '@glimmer/runtime';
+
 import {
   assertDestroyablesDestroyed,
   associateDestroyableChild,
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index f2b91d7473f..0e61faba05d 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -268,7 +268,7 @@ let allExports = [
   ['_getComponentTemplate', '@ember/-internals/glimmer', 'getComponentTemplate'],
   ['_templateOnlyComponent', '@ember/component/template-only', 'default'],
   EMBER_GLIMMER_HELPER_MANAGER
-    ? ['_setHelperManager', '@ember/-internals/glimmer', 'setHelperManager']
+    ? ['_setHelperManager', '@glimmer/runtime', 'setHelperManager']
     : null,
   EMBER_GLIMMER_HELPER_MANAGER
     ? ['_helperManagerCapabilities', '@ember/-internals/glimmer', 'helperCapabilities']
diff --git a/yarn.lock b/yarn.lock
index 362752e7cda..af1f85a5b50 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,152 +1657,152 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.64.0.tgz#e117a9acf5797d785c8da5ce65f96765a0c674a6"
-  integrity sha512-697j0gI2i6yRlwmONAWVuznPGyq92IfBJdrF/62t1HsMrAsX9DsdpdcQx9Kxl8LoxKpjkijErU/bJ8soPV9zcA==
-  dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/syntax" "0.64.0"
-    "@glimmer/util" "0.64.0"
-    "@glimmer/wire-format" "0.64.0"
+"@glimmer/compiler@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.65.0.tgz#d501526659c6dd885e0235556d87ca393439fae7"
+  integrity sha512-JDB6dKP94rqcRQQUGFM+iwh9/Sk20Gu4f9K9g7K1q1pYrxGaJ+Vjq/W03fLawd7iZEVUTRFR4OOG5M1lntoFlQ==
+  dependencies:
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/syntax" "0.65.0"
+    "@glimmer/util" "0.65.0"
+    "@glimmer/wire-format" "0.65.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.64.0.tgz#405ce201959ec841c8f08e6ead683363fc6e5c71"
-  integrity sha512-7QWC700lbJPRedH/mYAjyP/gtJ2mfs3BmHx7ahXHklsiBLpWAELwimvZVkU3bJShYyKddOxaLXaCA+ZKUgP7IA==
+"@glimmer/encoder@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.65.0.tgz#a11102c2ece4004678bb2bc0ab39276d7f0e3d26"
+  integrity sha512-UycgQr+b4l9X6e78fypO6/SWRDypFuIJkSuS4q43Of/a+hss11xVQAy+oANZjo6shrQtzH159v5F3LlSjYKbzg==
   dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/vm" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/vm" "0.65.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.64.0.tgz#7019bea8795dd99890b922fe1678e6343983fdbd"
-  integrity sha512-iaaz/+bjmixjBhUtMs3Dqdz8TAetu4PW3re1h4VLpQYXL27MRv694kfjpouISKHZ5rOi77icTTDjQYtiHwV/9w==
+"@glimmer/global-context@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.0.tgz#96d8b99d1a805be72d4dcf5d2eb90cd2ecfff550"
+  integrity sha512-czdgBmQRHFdrpKicZ1qJ0cd2yzNf/T4OV9VT+7dR356At3C7OWU0GJiIfA1IcW7nqS7x27rC8GDsUZm0ntEFRQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.64.0.tgz#8d6330ece98e20c97608ec6429fc9732824452bc"
-  integrity sha512-Y7HmwqtBNOzu9RL8N4WGQGGNCIO8REMORewMbnrZtLuFWcdDPCGVlNkxC77GStkHD+V54oEoW9Y+84MLFxkicg==
+"@glimmer/interfaces@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.0.tgz#e3852efb63fc9f18268991caea4ab362b75ae231"
+  integrity sha512-Ka9/w1u7SjWt8ZKa3Gs9IbFtLLDlaCdCTO7B+/Lat0bxGIctyEAyjxUdVqUwXWO4pMfkEFWKBP3L/t9CRT8sVQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.64.0.tgz#d05dce2056dbae03b63b180539f8a4377d3ad810"
-  integrity sha512-UiSa96BSnF4COduh4UpBWyav1RXg9P1ylaF51hJWDFXA6xt8aME9NSgEmcy+gc/9MbKPOkao+rrKIxP+9upE4w==
+"@glimmer/low-level@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.65.0.tgz#948e7513f36776608ee6cca605bb387ef1cc6c4b"
+  integrity sha512-BjLmBofuSst0t2iYShUBCsFgitVbmsWd9Lkw8rs1mvB3+jfPsan0yN53sjkIhganccntcW9T2Y2mi/TLGWt+PQ==
 
-"@glimmer/node@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.64.0.tgz#4a9ee41d0017013b13a2abf24512a1b75f0bd195"
-  integrity sha512-+mRKTfmEEMxvLKJXpZXBobeCzpWDR284IM0akT8pYNcS7KSKfxjE/eNjDbkNylMiKRYkvemyMpuSqz0idBz6og==
+"@glimmer/node@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.65.0.tgz#e07432564a076652bddee4f1fb405e05d374bcac"
+  integrity sha512-t7bqcPmmPRvRC+FkNlHxNzD3ooXmJnepdADKeYnJy+nLyZkgcxZ6ZjQWzHTl8K7BRYcVvIhOnk13/AMQ94orKQ==
   dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/runtime" "0.64.0"
-    "@glimmer/util" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/runtime" "0.65.0"
+    "@glimmer/util" "0.65.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.64.0.tgz#5f2f3fddd639422ec7e5ba9231bdfeecc3650808"
-  integrity sha512-2XSN/z9piCSE7A9UVQ1Aa6SrY5oQZyBIknF8Quq8ekQZFVwPqM9qTa826qR/rChDUX7d65rVFSFeZ8/Eyd9ieg==
-  dependencies:
-    "@glimmer/encoder" "0.64.0"
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/program" "0.64.0"
-    "@glimmer/reference" "0.64.0"
-    "@glimmer/util" "0.64.0"
-    "@glimmer/vm" "0.64.0"
-    "@glimmer/wire-format" "0.64.0"
-
-"@glimmer/program@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.64.0.tgz#411c2639ea5809a890375ce34ce3335944dc98c2"
-  integrity sha512-v5jFpGjJ9gUQBa1YpiNKCgO+8genGRfX7qzuAz1A/N0BnmD3+Xk2yl8qeli5+WySMAPRYV1lk/3MjrfCkK7TnA==
-  dependencies:
-    "@glimmer/encoder" "0.64.0"
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/util" "0.64.0"
-
-"@glimmer/reference@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.64.0.tgz#92bac8f2de1b6073a01006ba1511d772ed545b91"
-  integrity sha512-UQ7+dhAuQskrcYtpX5vQT2JD+qoDdkzP69auRUb4SF0pZH8LIKLxOMi74anAd6AcWrYd25Wh+UUbcuH/Qx+b2g==
+"@glimmer/opcode-compiler@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.65.0.tgz#cfc2461e2cb69fe8f6f35ac519634b7a6a223ba2"
+  integrity sha512-12A0TZgGr6FwGRwA1DwGiQcLiwsBH2i/HIxW3prtNEglmFnpJiDo3VmJJ3uwGNz5gL1qGt0Ftus2VmYHHJIPtA==
+  dependencies:
+    "@glimmer/encoder" "0.65.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/program" "0.65.0"
+    "@glimmer/reference" "0.65.0"
+    "@glimmer/util" "0.65.0"
+    "@glimmer/vm" "0.65.0"
+    "@glimmer/wire-format" "0.65.0"
+
+"@glimmer/program@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.65.0.tgz#c26d6a843c54586d0e6268a2360ad45fd28d9d93"
+  integrity sha512-cYWLF3bd/wcgZOttDBhcLXmMj8cqWiXm8S3/8IUvnkWRLPmfK+xqFYd7j9kFtJKHjiQ9UWue7wfV6lURZiuC+g==
+  dependencies:
+    "@glimmer/encoder" "0.65.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
+
+"@glimmer/reference@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.0.tgz#8863308d0865d45ae1fc5d07d5ccef9da4dff2d7"
+  integrity sha512-Cxb5Q91x+oV494dMtjx/fo5QudFCI1yJ4gg2Uj9hWWp2r8EqRmW2rlboLdnkjBDuY5MMuqwY9I8mc+SSAqQ46w==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.64.0"
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/util" "0.64.0"
-    "@glimmer/validator" "0.64.0"
+    "@glimmer/global-context" "0.65.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
+    "@glimmer/validator" "0.65.0"
 
-"@glimmer/runtime@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.64.0.tgz#3c2dbe0bd4abcda98b4e7abbcedc20661a4ccb7f"
-  integrity sha512-yLBXkTKvF0tzs6qEHNGPhg4zs9GySzmhWeOzWH91HbIH9PeLmx7cxMN1GPMUngoQz3Gfm5wvRmULEws4e91U0w==
+"@glimmer/runtime@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.65.0.tgz#a65889bf3bb23e35dcca6a4d6de0989887119b47"
+  integrity sha512-CHODyKgeAUrLaGhq5/s4mLpayIviqqDvpDnPNcKNBS3RQeJRzcTdb+JevZyAeR05PuPUxQ4wRLtwpaLJ5XNSRA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.64.0"
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/low-level" "0.64.0"
-    "@glimmer/program" "0.64.0"
-    "@glimmer/reference" "0.64.0"
-    "@glimmer/util" "0.64.0"
-    "@glimmer/validator" "0.64.0"
-    "@glimmer/vm" "0.64.0"
-    "@glimmer/wire-format" "0.64.0"
+    "@glimmer/global-context" "0.65.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/low-level" "0.65.0"
+    "@glimmer/program" "0.65.0"
+    "@glimmer/reference" "0.65.0"
+    "@glimmer/util" "0.65.0"
+    "@glimmer/validator" "0.65.0"
+    "@glimmer/vm" "0.65.0"
+    "@glimmer/wire-format" "0.65.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.64.0.tgz#4e665c8936dfb93c17bb53a2f355342fa29662b5"
-  integrity sha512-BVziEjDC7EKvPv4O3B9hfkevihiqZkBlWBkZbTJe45wImfl+6A4KvwP/s8r5u/yAhYnsA3LO77IuoYYr/I08Tg==
+"@glimmer/syntax@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.0.tgz#a4fd943ca558e15c77619d49a4d4500dd252868c"
+  integrity sha512-juVFrA62oFdr2FSxLMb7c3j7KU/onQlC7c4E9rnkivXqE7EmNGI7/+I48L/DsMmDOZDOf4bIhjeCWbXNB4dS9g==
   dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/util" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.64.0.tgz#872103ebb2313a693161ec69e5b70252b56a6cd5"
-  integrity sha512-evcvCmQ2VUgWQF3ecDwtkwW+D+FL2f4Z0X8XDUgHQTGbA9PkqQRwyyD0WdURVPYpt3YkbR1VLapADll9fjpevg==
+"@glimmer/util@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.0.tgz#8a90382500334e415415bf51b269bc7484b17543"
+  integrity sha512-tfsKVJpCJ5ADWXgpouiitIKlNacWQseYAlppgn8Y6LnzxcywgnumwFObkfzYlFE6Nd1IiymNxgEeSNJKylWl1A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.64.0.tgz#509ba8bfadd83853c52e997826ca406b49462734"
-  integrity sha512-rxeFHcJCIVmTyfP3f3E3NEU3cCT2pAQFCo1LYxdsWDoHZhNP4slisJDYW8UpFmrZKilooK3tki1fVB9Wvi0fpA==
+"@glimmer/validator@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.0.tgz#e4411e0a979f002efe236e3bcc91de5f5aaeaed2"
+  integrity sha512-nwFReFT9zOOV+9iSqhNookTfHbOsqqPvtsALXl5Rn4QmtAHFLdehiWyN6ddb/sJwllWq+fNW8DxQdiY1xRwn9A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.64.0"
+    "@glimmer/global-context" "0.65.0"
 
-"@glimmer/vm@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.64.0.tgz#4727a991d551bf2c8dd4c5273d647e3f155d283d"
-  integrity sha512-O0T4/mdPpLHoPe/YcQCkBla6QBkwvIg57LAo6AyesAwCsKF8GmNSY6YzC0qj/sFNh+mr0cdG8bpGeMMmqHM5ZA==
+"@glimmer/vm@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.65.0.tgz#8a6ff00eced670d7bf0acc45659b7d1510146dc6"
+  integrity sha512-xJ2NJlg8D0TS3prn/FzCq/nzVNEYmv+v4LShrH1Thp+rFwesFsCYwLpidD6btkH8odYF+2+aZZLmq6uBxs3HGQ==
   dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/util" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
 
-"@glimmer/wire-format@0.64.0":
-  version "0.64.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.64.0.tgz#085afd3f6161f0c3b9ea18b500b4281b895f0252"
-  integrity sha512-EwodhWPbFRQ9AMFJgR5+rwFqscW4CPpBjl5eE5w1xIHS5S2wxKNuZJoo+Vq899SFS6n1f0yEzYoqe5acBR09mg==
+"@glimmer/wire-format@0.65.0":
+  version "0.65.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.65.0.tgz#d51b3d8f2a94e113190302b2bdbe7a3ee70bb1b5"
+  integrity sha512-8KgxyLzYbelVLLIWheFwI3yXqkW17k/rfQnWQ8SV337LLvx9CFa6cqF9YTgjtaj9/cHMQq+CF8aMFRFhEwx+qw==
   dependencies:
-    "@glimmer/interfaces" "0.64.0"
-    "@glimmer/util" "0.64.0"
+    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/util" "0.65.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 175d5491f21d8f8564c5a7f2594b00df2ab0f0e4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 13 Nov 2020 19:46:51 -0800
Subject: [PATCH 0230/1405] [INTERNAL] Introduce `InternalModifier`

This commit introduces an `InternalModifier` API. Basically like the
`InternalComponent` API introduced a while back but for modifiers.

It will probably makes sense to port things like `{{on}}` to use this
eventually, but right now it's unused and untested.
---
 .../glimmer/lib/components/internal.ts        |   4 +-
 .../glimmer/lib/modifiers/internal.ts         | 107 ++++++++++++++++++
 2 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/lib/modifiers/internal.ts

diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index d2e09db9957..b6b41f4d911 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -23,8 +23,8 @@ export default class InternalComponent {
 
   constructor(
     protected owner: Owner,
-    public args: Record<string, Reference | undefined>,
-    public caller: unknown
+    protected readonly args: Record<string, Reference | undefined>,
+    protected readonly caller: unknown
   ) {
     setOwner(this, owner);
   }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
new file mode 100644
index 00000000000..7c8e7928583
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -0,0 +1,107 @@
+import { Owner, setOwner } from '@ember/-internals/owner';
+import { guidFor } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
+import {
+  CapturedArguments,
+  Destroyable,
+  InternalModifierManager as ModifierManager,
+  VMArguments,
+} from '@glimmer/interfaces';
+import { valueForRef } from '@glimmer/reference';
+import { registerDestructor, setModifierManager } from '@glimmer/runtime';
+import { SimpleElement } from '@simple-dom/interface';
+
+export default class InternalModifier {
+  // Factory interface
+  static create(): never {
+    throw assert('Use constructor instead of create');
+  }
+
+  static get class(): typeof InternalModifier {
+    return this;
+  }
+
+  static get fullName(): string {
+    return this.name;
+  }
+
+  static get normalizedName(): string {
+    return this.name;
+  }
+
+  constructor(
+    protected owner: Owner,
+    protected readonly element: Element,
+    protected readonly args: CapturedArguments
+  ) {
+    setOwner(this, owner);
+  }
+
+  install(): void {}
+
+  remove(): void {}
+
+  protected positional(index: number): unknown {
+    let ref = this.args.positional[index];
+    return ref ? valueForRef(ref) : undefined;
+  }
+
+  protected named(key: string): unknown {
+    let ref = this.args.named[key];
+    return ref ? valueForRef(ref) : undefined;
+  }
+
+  toString(): string {
+    return `<${this.constructor.toString()}:${guidFor(this)}>`;
+  }
+}
+
+class InternalModifierState implements Destroyable {
+  constructor(readonly name: string, readonly instance: InternalModifier) {}
+}
+
+class InternalModifierManager
+  implements ModifierManager<InternalModifierState, typeof InternalModifier> {
+  constructor(private readonly owner: Owner) {}
+
+  create(
+    element: SimpleElement,
+    factory: typeof InternalModifier,
+    args: VMArguments
+  ): InternalModifierState {
+    assert('element must be an HTMLElement', element instanceof HTMLElement);
+
+    let instance = new factory(this.owner, element, args.capture());
+
+    registerDestructor(instance, (modifier) => modifier.remove());
+
+    return new InternalModifierState(
+      factory.name,
+      new factory(this.owner, element, args.capture())
+    );
+  }
+
+  // not needed for now, but feel free to implement this
+  getTag(): null {
+    return null;
+  }
+
+  getDebugName({ name }: InternalModifierState): string {
+    return name;
+  }
+
+  install({ instance }: InternalModifierState): void {
+    return instance.install();
+  }
+
+  // not needed for now, but feel free to implement this
+  update(): void {
+    assert('update should never be called on an internal modifier');
+  }
+
+  getDestroyable({ instance }: InternalModifierState): Destroyable {
+    return instance;
+  }
+}
+
+setModifierManager((owner: Owner) => new InternalModifierManager(owner), InternalModifier);

From b30895b58ce33aa751333825718f1b5f9eb7709a Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 16 Nov 2020 17:30:01 -0500
Subject: [PATCH 0231/1405] Add v3.23.0 to CHANGELOG

(cherry picked from commit 21447b22453c5f6366e81d455f0b1c27aef087ca)
---
 CHANGELOG.md | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3a7fe4bc2b..9c77977079c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,25 +1,6 @@
 # Ember Changelog
 
-### v3.23.0-beta.5 (November 9, 2020)
-
-- [#19249](https://github.com/emberjs/ember.js/pull/19249) [BUGFIX] Fix bugs in query params with intermediate transitions
-
-### v3.23.0-beta.4 (November 2, 2020)
-
-- [#19142](https://github.com/emberjs/ember.js/pull/19142) [BUGFIX] Fix App booting before DOM ready without jQuery
-- [#19198](https://github.com/emberjs/ember.js/pull/19198) / [#19232](https://github.com/emberjs/ember.js/pull/19232) [BUGFIX] Restores the shadowed property set behavior
-
-### v3.23.0-beta.3 (October 26, 2020)
-
-- [#19199](https://github.com/emberjs/ember.js/pull/19199) [BUGFIX] Fix Ember Inspector to not be in a broken state after render errors
-- [#19221](https://github.com/emberjs/ember.js/pull/19221) [BUGFIX] Ensure fn and (mut) work with falsy values
-
-### v3.23.0-beta.2 (October 19, 2020)
-
-- [#19193](https://github.com/emberjs/ember.js/pull/19193) [BUGFIX] Ensure user lifecycle hooks are untracked
-- [#19213](https://github.com/emberjs/ember.js/pull/19213) [BUGFIX] Update rendering engine to improve error ergonomics.
-
-### v3.23.0-beta.1 (October 5, 2020)
+### v3.23.0 (November 16, 2020)
 
 - [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).
 - [#19171](https://github.com/emberjs/ember.js/pull/19171) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements `invokeHelper` from the [JavaScript Helper Invocation API RFC](https://github.com/emberjs/rfcs/blob/master/text/0626-invoke-helper.md).
@@ -27,6 +8,13 @@
 - [#19122](https://github.com/emberjs/ember.js/pull/19122) [BUGFIX] Prevents dynamic invocations of string values when referenced directly in angle brackets
 - [#19136](https://github.com/emberjs/ember.js/pull/19136) [BUGFIX] Update router microlib to improve Transition related debugging
 - [#19173](https://github.com/emberjs/ember.js/pull/19173) [BUGFIX] Enforce usage of `capabilities` generation.
+- [#19236](https://github.com/emberjs/ember.js/pull/19236) [BUGFIX] Only serialize query params once on activeTransition
+- [#19250](https://github.com/emberjs/ember.js/pull/19250) [BUGFIX] Prevents infinite rerenders when errors occur during render
+- [#19249](https://github.com/emberjs/ember.js/pull/19249) [BUGFIX] Fix bugs in query params with intermediate transitions
+- [#19142](https://github.com/emberjs/ember.js/pull/19142) [BUGFIX] Fix App booting before DOM ready without jQuery
+- [#19198](https://github.com/emberjs/ember.js/pull/19198) / [#19232](https://github.com/emberjs/ember.js/pull/19232) [BUGFIX] Restores the shadowed property set behavior
+- [#19221](https://github.com/emberjs/ember.js/pull/19221) [BUGFIX] Ensure fn and (mut) work with falsy values
+- [#19213](https://github.com/emberjs/ember.js/pull/19213) [BUGFIX] Update rendering engine to improve error ergonomics.
 
 ### v3.22.1 (November 10, 2020)
 

From 1341c3608c0b7c75672c4650df11a05218882613 Mon Sep 17 00:00:00 2001
From: Phil Gengler <phil@pgengler.net>
Date: Mon, 16 Nov 2020 18:28:33 -0500
Subject: [PATCH 0232/1405] Fetch PR title Github on undefined/null as well as
 empty string

---
 bin/changelog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/changelog.js b/bin/changelog.js
index f08e68186ce..69dcadfdce6 100755
--- a/bin/changelog.js
+++ b/bin/changelog.js
@@ -138,7 +138,7 @@ async function getCommitMessage(commitInfo) {
 
     let lines = message.split(/\n\n/);
 
-    if (lines[1] === '') {
+    if (!lines[1]) {
       let pullRequest = await getPullRequest({
         user: 'emberjs',
         repo: 'ember.js',

From 793fdddaaec8fe24ee9dafcf2ebda7a56d75b479 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 16 Nov 2020 18:48:58 -0500
Subject: [PATCH 0233/1405] Add v3.24.0-beta.1 to CHANGELOG

(cherry picked from commit a39707f0a35a288426fa9dcaaf5d86d06e8f576e)
---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c77977079c..57931b29860 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Ember Changelog
 
+### v3.24.0-beta.1 (November 16, 2020)
+
+- [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 
+- [#19133](https://github.com/emberjs/ember.js/pull/19133) [FEATURE / DEPRECATION] Add new options to `deprecate()` for `for` and `since` and deprecate using `deprecate()` without those options per the [Deprecation Staging RFC](https://github.com/emberjs/rfcs/blob/master/text/0649-deprecation-staging.md).
+- [#19211](https://github.com/emberjs/ember.js/pull/19211) [DEPRECATION] Deprecate `Ember.String.loc` and `{{loc}}` per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
+- [#19234](https://github.com/emberjs/ember.js/pull/19234) [DEPRECATION] Deprecate String Prototype extensions per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
+- [#19254](https://github.com/emberjs/ember.js/pull/19254) [DEPRECATION] Deprecate tryInvoke to implement the [Deprecate `tryInvoke` RFC](https://github.com/emberjs/rfcs/blob/master/text/0673-deprecate-tryinvoke.md).
+- [#19080](https://github.com/emberjs/ember.js/pull/19080) [BUGFIX] Lazily setup the router in non-application tests
+- [#19253](https://github.com/emberjs/ember.js/pull/19253) [BUGFIX] Correct return of getComponentTemplate from null to undefined to align with original RFC (#481)
+- [#19223](https://github.com/emberjs/ember.js/pull/19223) [BUGFIX] `<LinkTo>` should link within the engine when used inside one
+- [#19196](https://github.com/emberjs/ember.js/pull/19196) [CLEANUP] Remove EMBER_GLIMMER_IN_ELEMENT feature flag
+- [#19204](https://github.com/emberjs/ember.js/pull/19204) [CLEANUP] Remove EMBER_CACHE_API feature flag
+- [#19206](https://github.com/emberjs/ember.js/pull/19206) [CLEANUP] Remove EMBER_ROUTING_MODEL_ARG feature flag
+- [#19229](https://github.com/emberjs/ember.js/pull/19229) [CLEANUP] Remove the EMBER_GLIMMER_SET_COMPONENT_TEMPLATE feature flag
+- [#19238](https://github.com/emberjs/ember.js/pull/19238) [CLEANUP] Removes the `expandLocalLookup` API
+- [#19258](https://github.com/emberjs/ember.js/pull/19258) / [#19261](https://github.com/emberjs/ember.js/pull/19261) / [#19267](https://github.com/emberjs/ember.js/pull/19267) Update rendering engine to 0.65.0
+
 ### v3.23.0 (November 16, 2020)
 
 - [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).

From cf16878385825449f9f35b6ee78fa732c2f6908e Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 16 Nov 2020 18:51:58 -0500
Subject: [PATCH 0234/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ac969d408bf..95b696f23af 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.24.0",
+  "version": "3.25.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 51c717f5ccef3e076348064ecf3ebde40b9a70cf Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 6 Oct 2020 14:38:15 -0700
Subject: [PATCH 0235/1405] Update to Glimmer VM 0.66.0

---
 package.json                                  |  18 +-
 .../glimmer/lib/component-managers/curly.ts   |   2 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |   8 +-
 .../@ember/-internals/glimmer/lib/syntax.ts   |   6 +-
 .../-internals/glimmer/lib/syntax/utils.ts    |   4 +-
 .../angle-bracket-invocation-test.js          |  20 +-
 .../assert-reserved-named-arguments-test.js   |  14 +-
 yarn.lock                                     | 210 +++++++++---------
 8 files changed, 135 insertions(+), 147 deletions(-)

diff --git a/package.json b/package.json
index ac969d408bf..2637001da95 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.65.0",
+    "@glimmer/compiler": "0.66.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.65.0",
-    "@glimmer/interfaces": "0.65.0",
-    "@glimmer/node": "0.65.0",
-    "@glimmer/opcode-compiler": "0.65.0",
-    "@glimmer/program": "0.65.0",
-    "@glimmer/reference": "0.65.0",
-    "@glimmer/runtime": "0.65.0",
-    "@glimmer/validator": "0.65.0",
+    "@glimmer/global-context": "0.66.0",
+    "@glimmer/interfaces": "0.66.0",
+    "@glimmer/node": "0.66.0",
+    "@glimmer/opcode-compiler": "0.66.0",
+    "@glimmer/program": "0.66.0",
+    "@glimmer/reference": "0.66.0",
+    "@glimmer/runtime": "0.66.0",
+    "@glimmer/validator": "0.66.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 0e5138e393c..2bffb2280dd 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -225,7 +225,7 @@ export default class CurlyComponentManager
       return null;
     }
 
-    return { positional: EMPTY_ARRAY, named };
+    return { positional: EMPTY_ARRAY as readonly Reference[], named };
   }
 
   /*
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 70129c3807b..a35978fefa6 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -181,10 +181,10 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
 
     if (DEBUG) {
       deprecateMutationsInTrackingTransaction!(() => {
-        ret = instance.compute(positional, named);
+        ret = instance.compute(positional as unknown[], named);
       });
     } else {
-      ret = instance.compute(positional, named);
+      ret = instance.compute(positional as unknown[], named);
     }
 
     consumeTag(instance[RECOMPUTE_TAG]);
@@ -227,14 +227,14 @@ class SimpleClassicHelperManager implements HelperManager<() => unknown> {
         let ret;
 
         deprecateMutationsInTrackingTransaction!(() => {
-          ret = compute.call(null, args.positional, args.named);
+          ret = compute.call(null, args.positional as unknown[], args.named);
         });
 
         return ret;
       };
     }
 
-    return () => compute.call(null, args.positional, args.named);
+    return () => compute.call(null, args.positional as unknown[], args.named);
   }
 
   getValue(fn: () => unknown) {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax.ts b/packages/@ember/-internals/glimmer/lib/syntax.ts
index 601745012e4..b18c22354f1 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax.ts
@@ -30,11 +30,7 @@ function refineInlineSyntax(
   let component = context.resolver.lookupComponent(name, context.meta.owner!);
 
   if (component !== null) {
-    return staticComponent(component, [
-      params === null ? [] : params,
-      hashToArgs(hash),
-      EMPTY_BLOCKS,
-    ]);
+    return staticComponent(component, [params, hashToArgs(hash), EMPTY_BLOCKS]);
   }
 
   return UNHANDLED;
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
index 7ed31e60daa..c999b09f962 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
@@ -1,7 +1,7 @@
-import { Core, Option } from '@glimmer/interfaces';
+import { Core, Option, PresentArray } from '@glimmer/interfaces';
 
 export function hashToArgs(hash: Option<Core.Hash>): Option<Core.Hash> {
   if (hash === null) return null;
   let names = hash[0].map((key) => `@${key}`);
-  return [names, hash[1]];
+  return [names as PresentArray<string>, hash[1]];
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 9fa7ee194cb..c5a36aed550 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -613,20 +613,12 @@ moduleFor(
     }
 
     '@test can not invoke curried components with an implicit `this` path'(assert) {
-      assert.expect(0);
-      this.registerComponent('foo-bar', {
-        template: 'hello',
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            assert.ok(false, 'should not have instantiated');
-          },
-        }),
-      });
-      this.registerComponent('test-harness', {
-        template: '<foo.bar />',
-      });
-      this.render(strip`{{test-harness foo=(hash bar=(component 'foo-bar'))}}`);
+      assert.throws(() => {
+        // attempting to compile this template will throw
+        this.registerComponent('test-harness', {
+          template: '<foo.bar />',
+        });
+      }, /Error: You used foo.bar as a tag name, but foo is not in scope/);
     }
 
     '@test has-block'() {
diff --git a/packages/ember-template-compiler/tests/plugins/assert-reserved-named-arguments-test.js b/packages/ember-template-compiler/tests/plugins/assert-reserved-named-arguments-test.js
index a6134709dde..9eeff6931e4 100644
--- a/packages/ember-template-compiler/tests/plugins/assert-reserved-named-arguments-test.js
+++ b/packages/ember-template-compiler/tests/plugins/assert-reserved-named-arguments-test.js
@@ -165,24 +165,24 @@ moduleFor(
       }, `'@Foo' is reserved. ('baz/foo-bar' @ L1:C17) `);
     }
 
-    [`@test '@.' is reserved`]() {
-      expectAssertion(() => {
+    [`@test '@.' is reserved`](assert) {
+      assert.throws(() => {
         compile(`{{@.}}`, {
           moduleName: 'baz/foo-bar',
         });
-      }, `'@.' is reserved. ('baz/foo-bar' @ L1:C2) `);
+      }, /Attempted to parse a path expression, but it was not valid. Paths beginning with @ must start with a-z/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         compile(`{{#if @.}}Yup{{/if}}`, {
           moduleName: 'baz/foo-bar',
         });
-      }, `'@.' is reserved. ('baz/foo-bar' @ L1:C6) `);
+      }, /Attempted to parse a path expression, but it was not valid. Paths beginning with @ must start with a-z/);
 
-      expectAssertion(() => {
+      assert.throws(() => {
         compile(`{{input type=(if @. "bar" "baz")}}`, {
           moduleName: 'baz/foo-bar',
         });
-      }, `'@.' is reserved. ('baz/foo-bar' @ L1:C17) `);
+      }, /Attempted to parse a path expression, but it was not valid. Paths beginning with @ must start with a-z/);
     }
 
     [`@test '@_' is reserved`]() {
diff --git a/yarn.lock b/yarn.lock
index af1f85a5b50..7ccf7568185 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,152 +1657,152 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.65.0.tgz#d501526659c6dd885e0235556d87ca393439fae7"
-  integrity sha512-JDB6dKP94rqcRQQUGFM+iwh9/Sk20Gu4f9K9g7K1q1pYrxGaJ+Vjq/W03fLawd7iZEVUTRFR4OOG5M1lntoFlQ==
-  dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/syntax" "0.65.0"
-    "@glimmer/util" "0.65.0"
-    "@glimmer/wire-format" "0.65.0"
+"@glimmer/compiler@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.66.0.tgz#90df75c35a1a708192b8349294ca9aeddb45bb0e"
+  integrity sha512-AlD1VFHfI9RmHajGwJgBKlPVUFowu7meseQY+HH1uA5LpHNrTm/v0Sa2wBTNhCYMZ21WcwdnXehYMHA4n8Ywug==
+  dependencies:
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/syntax" "0.66.0"
+    "@glimmer/util" "0.66.0"
+    "@glimmer/wire-format" "0.66.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.65.0.tgz#a11102c2ece4004678bb2bc0ab39276d7f0e3d26"
-  integrity sha512-UycgQr+b4l9X6e78fypO6/SWRDypFuIJkSuS4q43Of/a+hss11xVQAy+oANZjo6shrQtzH159v5F3LlSjYKbzg==
+"@glimmer/encoder@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.66.0.tgz#8deede076db1c4ff0047069bc802585ed16e63f6"
+  integrity sha512-cxwuyEqX/lsHWB1CR7hJgoIX+LWRKhz2LPbwwunGOG2wiBFOO6629hs/FcfT84BJcBz1Plmit8t3IHWk2vgOzQ==
   dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/vm" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/vm" "0.66.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.65.0.tgz#96d8b99d1a805be72d4dcf5d2eb90cd2ecfff550"
-  integrity sha512-czdgBmQRHFdrpKicZ1qJ0cd2yzNf/T4OV9VT+7dR356At3C7OWU0GJiIfA1IcW7nqS7x27rC8GDsUZm0ntEFRQ==
+"@glimmer/global-context@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.0.tgz#4efc0d90ffc33a07e2f86b1462e71541f4e36cdd"
+  integrity sha512-3kaSDZptEF3dmCO/rcQptJ0qZQub8ax1C19+IkuBnTbeYOEgdW61rPFdApqAzY/EydMjBmxZRLhS/IMRx4wJcQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.65.0.tgz#e3852efb63fc9f18268991caea4ab362b75ae231"
-  integrity sha512-Ka9/w1u7SjWt8ZKa3Gs9IbFtLLDlaCdCTO7B+/Lat0bxGIctyEAyjxUdVqUwXWO4pMfkEFWKBP3L/t9CRT8sVQ==
+"@glimmer/interfaces@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.0.tgz#f281e1985d6b7f63648d960cc2745c68562fdb92"
+  integrity sha512-fw1pO6oyczSKeTPR6anrSI4OarLlaAR0SSDAhsYrINXfW7Xd/U/es7i6VE1JjLSZqfnsAxjNOFDe0lA5lmV/dw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.65.0.tgz#948e7513f36776608ee6cca605bb387ef1cc6c4b"
-  integrity sha512-BjLmBofuSst0t2iYShUBCsFgitVbmsWd9Lkw8rs1mvB3+jfPsan0yN53sjkIhganccntcW9T2Y2mi/TLGWt+PQ==
+"@glimmer/low-level@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.66.0.tgz#fa21f48c12d77ec765039e30027cbe701ec94081"
+  integrity sha512-9voF9pO6i+4nLi+h1ix8S/nhqYLUQBV+wlZpcmhDPnvaiCJlNF2ocH4ZjtrTfgg9mKl8vA8JI+xMzuagFvc/aw==
 
-"@glimmer/node@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.65.0.tgz#e07432564a076652bddee4f1fb405e05d374bcac"
-  integrity sha512-t7bqcPmmPRvRC+FkNlHxNzD3ooXmJnepdADKeYnJy+nLyZkgcxZ6ZjQWzHTl8K7BRYcVvIhOnk13/AMQ94orKQ==
+"@glimmer/node@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.66.0.tgz#d28a374a935829449ec386de310e7d89369abca4"
+  integrity sha512-tRlc1wHB9hD4ByLlc4CxDsO/GxaSVhKRJNLP7RBn74dQhywvz4y/q3qxgQngieX8RM29YmQRGMFYKpqkMhr2ZQ==
   dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/runtime" "0.65.0"
-    "@glimmer/util" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/runtime" "0.66.0"
+    "@glimmer/util" "0.66.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.65.0.tgz#cfc2461e2cb69fe8f6f35ac519634b7a6a223ba2"
-  integrity sha512-12A0TZgGr6FwGRwA1DwGiQcLiwsBH2i/HIxW3prtNEglmFnpJiDo3VmJJ3uwGNz5gL1qGt0Ftus2VmYHHJIPtA==
-  dependencies:
-    "@glimmer/encoder" "0.65.0"
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/program" "0.65.0"
-    "@glimmer/reference" "0.65.0"
-    "@glimmer/util" "0.65.0"
-    "@glimmer/vm" "0.65.0"
-    "@glimmer/wire-format" "0.65.0"
-
-"@glimmer/program@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.65.0.tgz#c26d6a843c54586d0e6268a2360ad45fd28d9d93"
-  integrity sha512-cYWLF3bd/wcgZOttDBhcLXmMj8cqWiXm8S3/8IUvnkWRLPmfK+xqFYd7j9kFtJKHjiQ9UWue7wfV6lURZiuC+g==
-  dependencies:
-    "@glimmer/encoder" "0.65.0"
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
-
-"@glimmer/reference@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.65.0.tgz#8863308d0865d45ae1fc5d07d5ccef9da4dff2d7"
-  integrity sha512-Cxb5Q91x+oV494dMtjx/fo5QudFCI1yJ4gg2Uj9hWWp2r8EqRmW2rlboLdnkjBDuY5MMuqwY9I8mc+SSAqQ46w==
+"@glimmer/opcode-compiler@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.66.0.tgz#bce49e98f6028d2e29dd4f48ea13197c2836bc18"
+  integrity sha512-Ei43PvD3FyZEMt3dC7HcQ/Ewl6cyFpLQb1+lWL+feMvs7wYPtzUgTXNa+bLKhrEVI4DEqIb+iVKiNiRZlqGsYg==
+  dependencies:
+    "@glimmer/encoder" "0.66.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/program" "0.66.0"
+    "@glimmer/reference" "0.66.0"
+    "@glimmer/util" "0.66.0"
+    "@glimmer/vm" "0.66.0"
+    "@glimmer/wire-format" "0.66.0"
+
+"@glimmer/program@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.66.0.tgz#30073786cd4938dc21d8a9628fbdb16ba38f6ab8"
+  integrity sha512-r3KuQK9QFADg8Dho/UvGXCB1+ubKeQToVQDaBL+GKQ3w/GGDfkzixxccSNhxOygwSDi/3pm2TWSlV1t5+IyOeg==
+  dependencies:
+    "@glimmer/encoder" "0.66.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
+
+"@glimmer/reference@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.0.tgz#3d1acb1755fe6c1660275aec7482cbc9935a656c"
+  integrity sha512-HNY2bxx+2/i5jEDQO5tVX3TZGVzCfpvVE5whkNxS+vDTV+E3KACWvxNz4e3cKbA98tYoZJjGw/jWOhgak3Bbvg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.65.0"
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
-    "@glimmer/validator" "0.65.0"
+    "@glimmer/global-context" "0.66.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
+    "@glimmer/validator" "0.66.0"
 
-"@glimmer/runtime@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.65.0.tgz#a65889bf3bb23e35dcca6a4d6de0989887119b47"
-  integrity sha512-CHODyKgeAUrLaGhq5/s4mLpayIviqqDvpDnPNcKNBS3RQeJRzcTdb+JevZyAeR05PuPUxQ4wRLtwpaLJ5XNSRA==
+"@glimmer/runtime@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.66.0.tgz#d47eb495a07e8154cb08c120b594dbc05bf2eece"
+  integrity sha512-ZzuVmXe1CBB3vEzKYBpSZRlMh8AIGmbYjTwqxebokdSMbypCVN96VrKgswheEvWwQXx4EGphO+3Wm027f0SFAQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.65.0"
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/low-level" "0.65.0"
-    "@glimmer/program" "0.65.0"
-    "@glimmer/reference" "0.65.0"
-    "@glimmer/util" "0.65.0"
-    "@glimmer/validator" "0.65.0"
-    "@glimmer/vm" "0.65.0"
-    "@glimmer/wire-format" "0.65.0"
+    "@glimmer/global-context" "0.66.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/low-level" "0.66.0"
+    "@glimmer/program" "0.66.0"
+    "@glimmer/reference" "0.66.0"
+    "@glimmer/util" "0.66.0"
+    "@glimmer/validator" "0.66.0"
+    "@glimmer/vm" "0.66.0"
+    "@glimmer/wire-format" "0.66.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.65.0.tgz#a4fd943ca558e15c77619d49a4d4500dd252868c"
-  integrity sha512-juVFrA62oFdr2FSxLMb7c3j7KU/onQlC7c4E9rnkivXqE7EmNGI7/+I48L/DsMmDOZDOf4bIhjeCWbXNB4dS9g==
+"@glimmer/syntax@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.0.tgz#d38561be48f6c4deeb94c24a1344a3426bb7e925"
+  integrity sha512-sgGQvoLprHjGV/TW2WY5wTmJaUjkHHgXhRJp+nLL5+JVC1zoR/mbGJk2Wfbj/R5D3pKzPln08HsSdXKj9Dl36g==
   dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.65.0.tgz#8a90382500334e415415bf51b269bc7484b17543"
-  integrity sha512-tfsKVJpCJ5ADWXgpouiitIKlNacWQseYAlppgn8Y6LnzxcywgnumwFObkfzYlFE6Nd1IiymNxgEeSNJKylWl1A==
+"@glimmer/util@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.0.tgz#c457951951f4ea1d5a1d63fa11c9ffeae8efa4f6"
+  integrity sha512-4J3sihRKZ7N4igk2BZGryC/E6qIy+20d3Dl9+jYhsM8SdviPm+PtFy7tdJsb3E+u/yITqHnvzt7+Cr+VtlT7KA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.65.0.tgz#e4411e0a979f002efe236e3bcc91de5f5aaeaed2"
-  integrity sha512-nwFReFT9zOOV+9iSqhNookTfHbOsqqPvtsALXl5Rn4QmtAHFLdehiWyN6ddb/sJwllWq+fNW8DxQdiY1xRwn9A==
+"@glimmer/validator@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.0.tgz#a127e6f9e36a41665f6bbb8d6635412db8160824"
+  integrity sha512-9xZK3Z8kIbTa3UoDU3lxel5AeQvr9bI6hQSbx21E2sO7R7dnozWM0GQjvnjCeyU5JLGJH/YKpeItZFhHhbDvtQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.65.0"
+    "@glimmer/global-context" "0.66.0"
 
-"@glimmer/vm@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.65.0.tgz#8a6ff00eced670d7bf0acc45659b7d1510146dc6"
-  integrity sha512-xJ2NJlg8D0TS3prn/FzCq/nzVNEYmv+v4LShrH1Thp+rFwesFsCYwLpidD6btkH8odYF+2+aZZLmq6uBxs3HGQ==
+"@glimmer/vm@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.66.0.tgz#6d476a4e8ce69fde71a2f9bab651ce156ce9f1b3"
+  integrity sha512-5pFMob++8bDJU99w0GztPc8HvUSthDRiW2pwScBGmyU0UNJVYRhGHAq0aVktbNKNzAoLh2u9IjNdul4N5fA1uQ==
   dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
 
-"@glimmer/wire-format@0.65.0":
-  version "0.65.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.65.0.tgz#d51b3d8f2a94e113190302b2bdbe7a3ee70bb1b5"
-  integrity sha512-8KgxyLzYbelVLLIWheFwI3yXqkW17k/rfQnWQ8SV337LLvx9CFa6cqF9YTgjtaj9/cHMQq+CF8aMFRFhEwx+qw==
+"@glimmer/wire-format@0.66.0":
+  version "0.66.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.66.0.tgz#aa359256b82febde4179a26da3d9164c64fb89da"
+  integrity sha512-7niSIcxAz0aWhhKuwi11y/0MrJAeiIO0NX6zv0IMFXu9Ul0ywM2UOxni2hNdpqD2XNn2z5O47QcqG2bdVq8fnA==
   dependencies:
-    "@glimmer/interfaces" "0.65.0"
-    "@glimmer/util" "0.65.0"
+    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/util" "0.66.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From eedd575b36993011f4ccaf8430f6046f5f4051d2 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 11 Apr 2019 22:28:57 -0400
Subject: [PATCH 0236/1405] Enable global event dispatcher listeners to be
 lazily created.

Prior to this change, all events that would ever possibly be used would
be eagerly setup by the event dispatcher's `setup` method.
Unfortunately, this has (at least) two major downsides:

* As of Chrome 51, adding listeners for touch events (`touchstart`,
  `touchmove`, `touchend`, etc) without the `passive` flag issue a
  performance focused warning. See
  https://www.chromestatus.com/feature/5745543795965952 for more
  details.
* A number of the events that we have historically listened for fire
  **massive** numbers of events (`mouseenter`, `mousemove`, etc) and most
  applications do not really use these events.

The two primary entry points into using the event dispatcher are the
`action` element modifier and `Ember.Component`'s implementing the
"event delegation" methods.

This commit enables the event listeners in the event dispatcher to be
lazily setup on demand by updating the action modifier manager and the
curly component manager to invoke the event dispatchers `setupHandler`
method lazily when needed.
---
 .../glimmer/lib/component-managers/curly.ts   | 15 +++++++++++
 .../-internals/glimmer/lib/component.ts       |  2 +-
 .../glimmer/lib/modifiers/action.ts           | 25 +++++++++++++++++-
 .../@ember/-internals/glimmer/lib/resolver.ts |  2 +-
 .../views/lib/system/event_dispatcher.js      | 26 ++++++++++++++-----
 5 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 2bffb2280dd..426b3c189ff 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -114,6 +114,19 @@ const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
+function _setupLazyEventsForComponent(dispatcher: any, component: object) {
+  // non-interactive rendering (e.g. SSR) has no event dispatcher
+  if (dispatcher === undefined) { return; }
+
+  let lazyEvents = dispatcher._lazyEvents;
+
+  lazyEvents.forEach((mappedEventName: string, event: string) => {
+    if (mappedEventName !== null && typeof component[mappedEventName] === 'function') {
+      dispatcher.setupHandler(event, mappedEventName);
+    }
+  });
+}
+
 export default class CurlyComponentManager
   extends BaseInternalComponentManager<ComponentStateBucket, DefinitionState>
   implements
@@ -318,6 +331,8 @@ export default class CurlyComponentManager
       }
     }
 
+    _setupLazyEventsForComponent(environment.eventDispatcher, component);
+
     // Track additional lifecycle metadata about this component in a state bucket.
     // Essentially we're saving off all the state we'll need in the future.
     let bucket = new ComponentStateBucket(
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index abe9d409e95..efe4c349f99 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -727,7 +727,7 @@ const Component = CoreView.extend(
       if (DEBUG && this.renderer._destinedForDOM && this.tagName === '') {
         let eventNames = [];
         let eventDispatcher = getOwner(this).lookup<any | undefined>('event_dispatcher:main');
-        let events = (eventDispatcher && eventDispatcher._finalEvents) || {};
+        let events = (eventDispatcher && eventDispatcher._finalEventNameMapping) || {};
 
         // tslint:disable-next-line:forin
         for (let key in events) {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 81fb377262c..43317f93ee6 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -17,6 +17,7 @@ import { registerDestructor } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { INVOKE } from '../helpers/action';
+import { Owner } from '@ember/-internals/owner';
 
 const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl'];
 const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
@@ -204,6 +205,22 @@ export class ActionState {
 // implements ModifierManager<Action>
 export default class ActionModifierManager
   implements InternalModifierManager<ActionState, unknown> {
+  public owner: Owner;
+  private _setupEventHandler?: (eventName: string) => void;
+
+  constructor(owner: Owner) {
+    this.owner = owner;
+  }
+
+  get setupEventHandler(): (eventName: string) => void {
+    if (this._setupEventHandler === undefined) {
+      let dispatcher = this.owner.lookup('event_dispatcher:main');
+      this._setupEventHandler = (eventName) => dispatcher['setupHandler'](eventName);
+    }
+
+    return this._setupEventHandler;
+  }
+
   create(
     element: SimpleElement,
     _state: unknown,
@@ -285,6 +302,8 @@ export default class ActionModifierManager
     actionState.actionName = actionName;
     actionState.implicitTarget = implicitTarget;
 
+    this.setupEventHandler(actionState.eventName);
+
     ActionHelper.registerAction(actionState);
 
     dom.setAttribute(element, 'data-ember-action', '');
@@ -299,7 +318,11 @@ export default class ActionModifierManager
       actionState.actionName = valueForRef(actionNameRef);
     }
 
-    actionState.eventName = actionState.getEventName();
+    let newEventName = actionState.getEventName();
+    if (newEventName !== actionState.eventName) {
+      this.setupEventHandler(actionState.eventName);
+      actionState.eventName = actionState.getEventName();
+    }
   }
 
   getTag(actionState: ActionState): UpdatableTag {
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 4ca1d316245..104fc26cb21 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -235,7 +235,7 @@ export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
     this.isInteractive = isInteractive;
 
     this.builtInModifiers = {
-      action: { manager: new ActionModifierManager(), state: null },
+      action: { manager: new ActionModifierManager(owner), state: null },
       on: { manager: new OnModifierManager(owner, isInteractive), state: null },
     };
   }
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 176a4b34356..33b09c5c02d 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -133,6 +133,9 @@ export default EmberObject.extend({
     );
 
     this._eventHandlers = Object.create(null);
+    this._finalEventNameMapping = null;
+    this._sanitizedRootElement = null;
+    this._lazyEvents = new Map();
   },
 
   /**
@@ -148,7 +151,8 @@ export default EmberObject.extend({
     @param addedEvents {Object}
   */
   setup(addedEvents, _rootElement) {
-    let events = (this._finalEvents = assign({}, get(this, 'events'), addedEvents));
+    let events = (this._finalEventNameMapping = assign({}, get(this, 'events'), addedEvents));
+    let lazyEvents = this._lazyEvents;
 
     if (_rootElement !== undefined && _rootElement !== null) {
       set(this, 'rootElement', _rootElement);
@@ -225,9 +229,13 @@ export default EmberObject.extend({
       }
     }
 
+    // save off the final sanitized root element (for usage in setupHandler)
+    this._sanitizedRootElement = rootElement;
+
+    // setup event listeners for the non-lazily setup events
     for (let event in events) {
       if (Object.prototype.hasOwnProperty.call(events, event)) {
-        this.setupHandler(rootElement, event, events[event]);
+        lazyEvents.set(event, events[event]);
       }
     }
   },
@@ -243,12 +251,16 @@ export default EmberObject.extend({
     @private
     @method setupHandler
     @param {Element} rootElement
-    @param {String} event the browser-originated event to listen to
+    @param {String} event the name of the event in the browser
     @param {String} eventName the name of the method to call on the view
   */
-  setupHandler(rootElement, event, eventName) {
-    if (eventName === null) {
-      return;
+  setupHandler(
+    event,
+    eventName = this._finalEventNameMapping[event],
+    rootElement = this._sanitizedRootElement
+  ) {
+    if (eventName === null || !this._lazyEvents.has(event)) {
+      return; // nothing to do
     }
 
     if (!JQUERY_INTEGRATION || jQueryDisabled) {
@@ -429,6 +441,8 @@ export default EmberObject.extend({
         }
       });
     }
+
+    this._lazyEvents.delete(event);
   },
 
   destroy() {

From 1731a3a1b075bb6d8d056f39669450db6732cf72 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 12:15:04 +0100
Subject: [PATCH 0237/1405] Add EventDispatcher to environment, lost after
 rebase

---
 .../-internals/glimmer/lib/component-managers/curly.ts      | 6 ++++--
 packages/@ember/-internals/glimmer/lib/modifiers/action.ts  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 426b3c189ff..604a5767692 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -116,7 +116,9 @@ debugFreeze(EMPTY_POSITIONAL_ARGS);
 
 function _setupLazyEventsForComponent(dispatcher: any, component: object) {
   // non-interactive rendering (e.g. SSR) has no event dispatcher
-  if (dispatcher === undefined) { return; }
+  if (dispatcher === undefined) {
+    return;
+  }
 
   let lazyEvents = dispatcher._lazyEvents;
 
@@ -331,7 +333,7 @@ export default class CurlyComponentManager
       }
     }
 
-    _setupLazyEventsForComponent(environment.eventDispatcher, component);
+    _setupLazyEventsForComponent(environment.extra.eventDispatcher, component);
 
     // Track additional lifecycle metadata about this component in a state bucket.
     // Essentially we're saving off all the state we'll need in the future.
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 43317f93ee6..09343c43d9f 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -214,7 +214,7 @@ export default class ActionModifierManager
 
   get setupEventHandler(): (eventName: string) => void {
     if (this._setupEventHandler === undefined) {
-      let dispatcher = this.owner.lookup('event_dispatcher:main');
+      let dispatcher = this.owner.lookup('event_dispatcher:main') as any; // @todo
       this._setupEventHandler = (eventName) => dispatcher['setupHandler'](eventName);
     }
 

From b2f89ef997458ddbfee55ea6bc2465fc96c61608 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 12:44:39 +0100
Subject: [PATCH 0238/1405] Fix event handling of built-in components

---
 .../glimmer/lib/components/link-to.ts         |  6 ++++++
 .../glimmer/lib/modifiers/action.ts           |  2 +-
 .../views/lib/mixins/text_support.js          | 19 ++++++++++++-------
 .../views/lib/system/event_dispatcher.js      |  4 ++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index b3442b0473a..91bb8c20879 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -13,6 +13,7 @@ import { inject as injectService } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberComponent, { HAS_BLOCK } from '../component';
 import layout from '../templates/link-to';
+import { getOwner } from '@ember/-internals/owner';
 
 /**
   The `LinkTo` component renders a link to the supplied `routeName` passing an optionally
@@ -500,6 +501,11 @@ const LinkComponent = EmberComponent.extend({
     // Map desired event name to invoke function
     let { eventName } = this;
     this.on(eventName, this, this._invoke);
+
+    // As our EventDispatcher adds event listeners lazily, and does not recognize the dynamic event pattern here,
+    // we must tell it explicitly that we need to listen to `eventName` events
+    let eventDispatcher = getOwner(this).lookup('event_dispatcher:main') as any;
+    eventDispatcher.setupHandler(eventName);
   },
 
   _routing: injectService('-routing'),
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 09343c43d9f..ba464f46a8c 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -215,7 +215,7 @@ export default class ActionModifierManager
   get setupEventHandler(): (eventName: string) => void {
     if (this._setupEventHandler === undefined) {
       let dispatcher = this.owner.lookup('event_dispatcher:main') as any; // @todo
-      this._setupEventHandler = (eventName) => dispatcher['setupHandler'](eventName);
+      this._setupEventHandler = (eventName) => dispatcher.setupHandler(eventName);
     }
 
     return this._setupEventHandler;
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index ea7ff261614..84a9a0f9c74 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -136,13 +136,6 @@ export default Mixin.create(TargetActionSupport, {
   disabled: false,
   maxlength: null,
 
-  init() {
-    this._super(...arguments);
-    this.on('paste', this, this._elementValueDidChange);
-    this.on('cut', this, this._elementValueDidChange);
-    this.on('input', this, this._elementValueDidChange);
-  },
-
   /**
     Whether the `keyUp` event that triggers an `action` to be sent continues
     propagating to other views.
@@ -178,6 +171,18 @@ export default Mixin.create(TargetActionSupport, {
     this._elementValueDidChange(event);
   },
 
+  paste(event) {
+    this._elementValueDidChange(event);
+  },
+
+  cut(event) {
+    this._elementValueDidChange(event);
+  },
+
+  input(event) {
+    this._elementValueDidChange(event);
+  },
+
   /**
     Allows you to specify a controller action to invoke when either the `enter`
     key is pressed or, in the case of the field being a textarea, when a newline
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 33b09c5c02d..6da1768686e 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -250,10 +250,10 @@ export default EmberObject.extend({
 
     @private
     @method setupHandler
-    @param {Element} rootElement
     @param {String} event the name of the event in the browser
     @param {String} eventName the name of the method to call on the view
-  */
+    @param {Element} rootElement
+   */
   setupHandler(
     event,
     eventName = this._finalEventNameMapping[event],

From 828c7aa6ad6e61c2af9002e1d4dab6a46360286a Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 13:32:09 +0100
Subject: [PATCH 0239/1405] Refactor setupHandler usage, fixing use of browser
 vs. Ember event names

---
 .../glimmer/lib/component-managers/curly.ts   |  2 +-
 .../glimmer/lib/components/link-to.ts         |  2 +-
 .../glimmer/lib/modifiers/action.ts           |  2 +-
 .../views/lib/system/event_dispatcher.js      | 40 +++++++++++++++----
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 604a5767692..40e271a49f9 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -124,7 +124,7 @@ function _setupLazyEventsForComponent(dispatcher: any, component: object) {
 
   lazyEvents.forEach((mappedEventName: string, event: string) => {
     if (mappedEventName !== null && typeof component[mappedEventName] === 'function') {
-      dispatcher.setupHandler(event, mappedEventName);
+      dispatcher.setupHandlerForBrowserEvent(event);
     }
   });
 }
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 91bb8c20879..00c0ba3595b 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -505,7 +505,7 @@ const LinkComponent = EmberComponent.extend({
     // As our EventDispatcher adds event listeners lazily, and does not recognize the dynamic event pattern here,
     // we must tell it explicitly that we need to listen to `eventName` events
     let eventDispatcher = getOwner(this).lookup('event_dispatcher:main') as any;
-    eventDispatcher.setupHandler(eventName);
+    eventDispatcher.setupHandlerForEmberEvent(eventName);
   },
 
   _routing: injectService('-routing'),
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index ba464f46a8c..c6e3ccd40bc 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -215,7 +215,7 @@ export default class ActionModifierManager
   get setupEventHandler(): (eventName: string) => void {
     if (this._setupEventHandler === undefined) {
       let dispatcher = this.owner.lookup('event_dispatcher:main') as any; // @todo
-      this._setupEventHandler = (eventName) => dispatcher.setupHandler(eventName);
+      this._setupEventHandler = (eventName) => dispatcher.setupHandlerForEmberEvent(eventName);
     }
 
     return this._setupEventHandler;
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 6da1768686e..08c5fec0e03 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -152,6 +152,10 @@ export default EmberObject.extend({
   */
   setup(addedEvents, _rootElement) {
     let events = (this._finalEventNameMapping = assign({}, get(this, 'events'), addedEvents));
+    this._reverseEventNameMapping = Object.keys(events).reduce(
+      (result, key) => assign(result, { [events[key]]: key }),
+      {}
+    );
     let lazyEvents = this._lazyEvents;
 
     if (_rootElement !== undefined && _rootElement !== null) {
@@ -240,6 +244,32 @@ export default EmberObject.extend({
     }
   },
 
+  /**
+    Setup event listeners for the given browser event name
+
+    @private
+    @method setupHandlerForBrowserEvent
+    @param event the name of the event in the browser
+  */
+  setupHandlerForBrowserEvent(event) {
+    this.setupHandler(this._sanitizedRootElement, event, this._finalEventNameMapping[event]);
+  },
+
+  /**
+    Setup event listeners for the given Ember event name (camel case)
+
+    @private
+    @method setupHandlerForEmberEvent
+    @param eventName
+  */
+  setupHandlerForEmberEvent(eventName) {
+    this.setupHandler(
+      this._sanitizedRootElement,
+      this._reverseEventNameMapping[eventName],
+      eventName
+    );
+  },
+
   /**
     Registers an event listener on the rootElement. If the given event is
     triggered, the provided event handler will be triggered on the target view.
@@ -250,15 +280,11 @@ export default EmberObject.extend({
 
     @private
     @method setupHandler
+    @param {Element} rootElement
     @param {String} event the name of the event in the browser
     @param {String} eventName the name of the method to call on the view
-    @param {Element} rootElement
-   */
-  setupHandler(
-    event,
-    eventName = this._finalEventNameMapping[event],
-    rootElement = this._sanitizedRootElement
-  ) {
+  */
+  setupHandler(rootElement, event, eventName) {
     if (eventName === null || !this._lazyEvents.has(event)) {
       return; // nothing to do
     }

From 5f0621c9381c3e3c67aca4ae3bc430f8d9ab2492 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 14:21:26 +0100
Subject: [PATCH 0240/1405] Fix EventDispatcher test

---
 .../tests/integration/event-dispatcher-test.js        | 11 +++++++----
 .../internal-test-helpers/lib/test-cases/rendering.js |  5 ++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index 8f1cce38c5c..1db813b3050 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -1,7 +1,7 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
 import { Component } from '../utils/helpers';
-import { getCurrentRunLoop, run } from '@ember/runloop';
+import { getCurrentRunLoop } from '@ember/runloop';
 import {
   subscribe as instrumentationSubscribe,
   reset as instrumentationReset,
@@ -420,12 +420,15 @@ moduleFor(
     constructor() {
       super(...arguments);
 
-      let dispatcher = this.owner.lookup('event_dispatcher:main');
-      run(dispatcher, 'destroy');
-      this.owner.__container__.reset('event_dispatcher:main');
       this.dispatcher = this.owner.lookup('event_dispatcher:main');
     }
 
+    getBootOptions() {
+      return {
+        skipEventDispatcher: true,
+      };
+    }
+
     ['@test additional events can be specified'](assert) {
       this.dispatcher.setup({ myevent: 'myEvent' });
 
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.js
index 2be75933b24..b29f6ffdad3 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.js
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.js
@@ -31,7 +31,10 @@ export default class RenderingTestCase extends AbstractTestCase {
     this.element = document.querySelector('#qunit-fixture');
     this.component = null;
 
-    if (!bootOptions || bootOptions.isInteractive !== false) {
+    if (
+      !bootOptions ||
+      (bootOptions.isInteractive !== false && bootOptions.skipEventDispatcher !== true)
+    ) {
       owner.lookup('event_dispatcher:main').setup(this.getCustomDispatcherEvents(), this.element);
     }
   }

From d53070f2389109aa17a0dde87dbc0d90d607fcea Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 14:47:50 +0100
Subject: [PATCH 0241/1405] Added EventDispatcher typings

---
 .../glimmer/lib/component-managers/curly.ts   | 11 +++++++---
 .../-internals/glimmer/lib/component.ts       |  5 +++--
 .../glimmer/lib/components/link-to.ts         |  9 +++++----
 .../-internals/glimmer/lib/environment.ts     |  2 +-
 .../glimmer/lib/modifiers/action.ts           |  8 ++++----
 packages/@ember/-internals/views/index.d.ts   | 12 +++++++++++
 .../views/lib/system/event_dispatcher.js      | 20 +++++++++----------
 7 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 40e271a49f9..6fcc3bf2028 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,7 +1,12 @@
 import { privatize as P } from '@ember/-internals/container';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
-import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
+import {
+  addChildView,
+  EventDispatcher,
+  setElementView,
+  setViewElement,
+} from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
 import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
 import { _instrumentStart } from '@ember/instrumentation';
@@ -114,13 +119,13 @@ const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
-function _setupLazyEventsForComponent(dispatcher: any, component: object) {
+function _setupLazyEventsForComponent(dispatcher: EventDispatcher | undefined, component: object) {
   // non-interactive rendering (e.g. SSR) has no event dispatcher
   if (dispatcher === undefined) {
     return;
   }
 
-  let lazyEvents = dispatcher._lazyEvents;
+  let lazyEvents = dispatcher.lazyEvents;
 
   lazyEvents.forEach((mappedEventName: string, event: string) => {
     if (mappedEventName !== null && typeof component[mappedEventName] === 'function') {
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index efe4c349f99..ce9101c237b 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -7,6 +7,7 @@ import {
   ChildViewsSupport,
   ClassNamesSupport,
   CoreView,
+  EventDispatcher,
   getViewElement,
   ViewMixin,
   ViewStateSupport,
@@ -726,8 +727,8 @@ const Component = CoreView.extend(
 
       if (DEBUG && this.renderer._destinedForDOM && this.tagName === '') {
         let eventNames = [];
-        let eventDispatcher = getOwner(this).lookup<any | undefined>('event_dispatcher:main');
-        let events = (eventDispatcher && eventDispatcher._finalEventNameMapping) || {};
+        let eventDispatcher = getOwner(this).lookup<EventDispatcher>('event_dispatcher:main');
+        let events = (eventDispatcher && eventDispatcher.finalEventNameMapping) || {};
 
         // tslint:disable-next-line:forin
         for (let key in events) {
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 00c0ba3595b..eda06e13ce0 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -5,7 +5,7 @@
 import { alias, computed } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import RouterState from '@ember/-internals/routing/lib/system/router_state';
-import { isSimpleClick } from '@ember/-internals/views';
+import { EventDispatcher, isSimpleClick } from '@ember/-internals/views';
 import { assert, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
@@ -13,7 +13,6 @@ import { inject as injectService } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberComponent, { HAS_BLOCK } from '../component';
 import layout from '../templates/link-to';
-import { getOwner } from '@ember/-internals/owner';
 
 /**
   The `LinkTo` component renders a link to the supplied `routeName` passing an optionally
@@ -504,8 +503,10 @@ const LinkComponent = EmberComponent.extend({
 
     // As our EventDispatcher adds event listeners lazily, and does not recognize the dynamic event pattern here,
     // we must tell it explicitly that we need to listen to `eventName` events
-    let eventDispatcher = getOwner(this).lookup('event_dispatcher:main') as any;
-    eventDispatcher.setupHandlerForEmberEvent(eventName);
+    let eventDispatcher = getOwner(this).lookup<EventDispatcher>('event_dispatcher:main');
+    if (eventDispatcher) {
+      eventDispatcher.setupHandlerForEmberEvent(eventName);
+    }
   },
 
   _routing: injectService('-routing'),
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 506ccca2eec..e1415696f8d 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -2,7 +2,7 @@ import { ENV } from '@ember/-internals/environment';
 import { _getProp, get, set } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
-import { constructStyleDeprecationMessage } from '@ember/-internals/views';
+import { constructStyleDeprecationMessage, EventDispatcher } from '@ember/-internals/views';
 import { assert, deprecate, warn } from '@ember/debug';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index c6e3ccd40bc..3c18b311980 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -1,5 +1,6 @@
+import { Owner } from '@ember/-internals/owner';
 import { uuid } from '@ember/-internals/utils';
-import { ActionManager, isSimpleClick } from '@ember/-internals/views';
+import { ActionManager, EventDispatcher, isSimpleClick } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
@@ -17,7 +18,6 @@ import { registerDestructor } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { INVOKE } from '../helpers/action';
-import { Owner } from '@ember/-internals/owner';
 
 const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl'];
 const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
@@ -214,8 +214,8 @@ export default class ActionModifierManager
 
   get setupEventHandler(): (eventName: string) => void {
     if (this._setupEventHandler === undefined) {
-      let dispatcher = this.owner.lookup('event_dispatcher:main') as any; // @todo
-      this._setupEventHandler = (eventName) => dispatcher.setupHandlerForEmberEvent(eventName);
+      let dispatcher = this.owner.lookup<EventDispatcher>('event_dispatcher:main');
+      this._setupEventHandler = (eventName) => dispatcher?.setupHandlerForEmberEvent(eventName);
     }
 
     return this._setupEventHandler;
diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts
index b495f196b3e..de6e4673dde 100644
--- a/packages/@ember/-internals/views/index.d.ts
+++ b/packages/@ember/-internals/views/index.d.ts
@@ -1,5 +1,6 @@
 import { Option } from '@glimmer/interfaces';
 import { SimpleElement } from '@simple-dom/interface';
+import { Object as EmberObject } from '@ember/-internals/runtime';
 
 export const ActionSupport: any;
 export const ChildViewsSupport: any;
@@ -31,3 +32,14 @@ export const ActionManager: {
     [id: string]: any | undefined;
   };
 };
+
+export declare class EventDispatcher extends EmberObject {
+  events: Record<string, string>;
+  finalEventNameMapping: Record<string, string>;
+  rootElement: string | HTMLElement;
+  lazyEvents: Map<string, string>;
+
+  setup(addedEvents: object, rootElement?: string | HTMLElement): void;
+  setupHandlerForBrowserEvent(event: string): void;
+  setupHandlerForEmberEvent(event: string): void;
+}
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 08c5fec0e03..c38d7be0aec 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -133,9 +133,9 @@ export default EmberObject.extend({
     );
 
     this._eventHandlers = Object.create(null);
-    this._finalEventNameMapping = null;
+    this.finalEventNameMapping = null;
     this._sanitizedRootElement = null;
-    this._lazyEvents = new Map();
+    this.lazyEvents = new Map();
   },
 
   /**
@@ -151,12 +151,12 @@ export default EmberObject.extend({
     @param addedEvents {Object}
   */
   setup(addedEvents, _rootElement) {
-    let events = (this._finalEventNameMapping = assign({}, get(this, 'events'), addedEvents));
+    let events = (this.finalEventNameMapping = assign({}, get(this, 'events'), addedEvents));
     this._reverseEventNameMapping = Object.keys(events).reduce(
       (result, key) => assign(result, { [events[key]]: key }),
       {}
     );
-    let lazyEvents = this._lazyEvents;
+    let lazyEvents = this.lazyEvents;
 
     if (_rootElement !== undefined && _rootElement !== null) {
       set(this, 'rootElement', _rootElement);
@@ -252,7 +252,7 @@ export default EmberObject.extend({
     @param event the name of the event in the browser
   */
   setupHandlerForBrowserEvent(event) {
-    this.setupHandler(this._sanitizedRootElement, event, this._finalEventNameMapping[event]);
+    this._setupHandler(this._sanitizedRootElement, event, this.finalEventNameMapping[event]);
   },
 
   /**
@@ -263,7 +263,7 @@ export default EmberObject.extend({
     @param eventName
   */
   setupHandlerForEmberEvent(eventName) {
-    this.setupHandler(
+    this._setupHandler(
       this._sanitizedRootElement,
       this._reverseEventNameMapping[eventName],
       eventName
@@ -279,13 +279,13 @@ export default EmberObject.extend({
     bubble to each successive parent view until it reaches the top.
 
     @private
-    @method setupHandler
+    @method _setupHandler
     @param {Element} rootElement
     @param {String} event the name of the event in the browser
     @param {String} eventName the name of the method to call on the view
   */
-  setupHandler(rootElement, event, eventName) {
-    if (eventName === null || !this._lazyEvents.has(event)) {
+  _setupHandler(rootElement, event, eventName) {
+    if (eventName === null || !this.lazyEvents.has(event)) {
       return; // nothing to do
     }
 
@@ -468,7 +468,7 @@ export default EmberObject.extend({
       });
     }
 
-    this._lazyEvents.delete(event);
+    this.lazyEvents.delete(event);
   },
 
   destroy() {

From 1393ab777d0a2511228b4e9a1eeee066288483db Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 14:52:30 +0100
Subject: [PATCH 0242/1405] Fix docs coverage

---
 .../-internals/views/lib/system/event_dispatcher.js       | 8 ++++----
 tests/docs/expected.js                                    | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index c38d7be0aec..5ba648ef43a 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -252,7 +252,7 @@ export default EmberObject.extend({
     @param event the name of the event in the browser
   */
   setupHandlerForBrowserEvent(event) {
-    this._setupHandler(this._sanitizedRootElement, event, this.finalEventNameMapping[event]);
+    this.setupHandler(this._sanitizedRootElement, event, this.finalEventNameMapping[event]);
   },
 
   /**
@@ -263,7 +263,7 @@ export default EmberObject.extend({
     @param eventName
   */
   setupHandlerForEmberEvent(eventName) {
-    this._setupHandler(
+    this.setupHandler(
       this._sanitizedRootElement,
       this._reverseEventNameMapping[eventName],
       eventName
@@ -279,12 +279,12 @@ export default EmberObject.extend({
     bubble to each successive parent view until it reaches the top.
 
     @private
-    @method _setupHandler
+    @method setupHandler
     @param {Element} rootElement
     @param {String} event the name of the event in the browser
     @param {String} eventName the name of the method to call on the view
   */
-  _setupHandler(rootElement, event, eventName) {
+  setupHandler(rootElement, event, eventName) {
     if (eventName === null || !this.lazyEvents.has(event)) {
       return; // nothing to do
     }
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index ee4e360480a..583a156a286 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -528,6 +528,8 @@ module.exports = {
     'setupController',
     'setupForTesting',
     'setupHandler',
+    'setupHandlerForBrowserEvent',
+    'setupHandlerForEmberEvent',
     'setupRegistry',
     'shiftObject',
     'shouldRender',

From 71bed424b934ff6927f6f29b551863817158c13a Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 25 Oct 2020 15:50:00 +0100
Subject: [PATCH 0243/1405] Add FastBoot guard to LinkComponent's
 EventDispatcher lookup

---
 .../-internals/glimmer/lib/components/link-to.ts       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index eda06e13ce0..d93dc5c2c4f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -12,6 +12,7 @@ import { flaggedInstrument } from '@ember/instrumentation';
 import { inject as injectService } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberComponent, { HAS_BLOCK } from '../component';
+import { EmberVMEnvironment } from '../environment';
 import layout from '../templates/link-to';
 
 /**
@@ -503,9 +504,12 @@ const LinkComponent = EmberComponent.extend({
 
     // As our EventDispatcher adds event listeners lazily, and does not recognize the dynamic event pattern here,
     // we must tell it explicitly that we need to listen to `eventName` events
-    let eventDispatcher = getOwner(this).lookup<EventDispatcher>('event_dispatcher:main');
-    if (eventDispatcher) {
-      eventDispatcher.setupHandlerForEmberEvent(eventName);
+    let owner = getOwner(this);
+    if (owner.lookup<EmberVMEnvironment>('-environment:main')!.isInteractive) {
+      let eventDispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
+      if (eventDispatcher) {
+        eventDispatcher.setupHandlerForEmberEvent(eventName);
+      }
     }
   },
 

From dd429e34de7ec1ae70905ec40bb3f43e2ff1ffa6 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 30 Oct 2020 10:01:06 +0100
Subject: [PATCH 0244/1405] Add lazy events support for `Evented` event
 listeners, and better test coverage

---
 .../-internals/glimmer/lib/component.ts       | 22 +++++
 .../glimmer/lib/components/link-to.ts         | 13 +--
 .../integration/event-dispatcher-test.js      | 99 +++++++++++++++++++
 .../internal-test-helpers/lib/node-query.js   |  6 +-
 4 files changed, 127 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index ce9101c237b..981bf476677 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -18,6 +18,7 @@ import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
 import { createTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
+import { EmberVMEnvironment } from './environment';
 
 export const ARGS = enumerableSymbol('ARGS');
 export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
@@ -787,6 +788,27 @@ const Component = CoreView.extend(
       );
     },
 
+    get setupEventHandler(): (eventName: string) => void | null {
+      if (this._setupEventHandler === undefined) {
+        let owner = getOwner(this);
+        if (owner.lookup<EmberVMEnvironment>('-environment:main')!.isInteractive) {
+          let dispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
+          this._setupEventHandler = (eventName: string) =>
+            dispatcher!.setupHandlerForEmberEvent(eventName);
+        } else {
+          // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
+          this._setupEventHandler = null;
+        }
+      }
+
+      return this._setupEventHandler;
+    },
+
+    on(eventName: string) {
+      this.setupEventHandler?.(eventName);
+      return this._super(...arguments);
+    },
+
     rerender() {
       dirtyTag(this[DIRTY_TAG]);
       this._super();
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index d93dc5c2c4f..b3442b0473a 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -5,14 +5,13 @@
 import { alias, computed } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import RouterState from '@ember/-internals/routing/lib/system/router_state';
-import { EventDispatcher, isSimpleClick } from '@ember/-internals/views';
+import { isSimpleClick } from '@ember/-internals/views';
 import { assert, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { inject as injectService } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberComponent, { HAS_BLOCK } from '../component';
-import { EmberVMEnvironment } from '../environment';
 import layout from '../templates/link-to';
 
 /**
@@ -501,16 +500,6 @@ const LinkComponent = EmberComponent.extend({
     // Map desired event name to invoke function
     let { eventName } = this;
     this.on(eventName, this, this._invoke);
-
-    // As our EventDispatcher adds event listeners lazily, and does not recognize the dynamic event pattern here,
-    // we must tell it explicitly that we need to listen to `eventName` events
-    let owner = getOwner(this);
-    if (owner.lookup<EmberVMEnvironment>('-environment:main')!.isInteractive) {
-      let eventDispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
-      if (eventDispatcher) {
-        eventDispatcher.setupHandlerForEmberEvent(eventName);
-      }
-    }
   },
 
   _routing: injectService('-routing'),
diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index 1db813b3050..2720e92ed03 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -20,9 +20,108 @@ function fireNativeWithDataTransfer(node, type, dataTransfer) {
   node.dispatchEvent(event);
 }
 
+function triggerEvent(node, event) {
+  switch (event) {
+    case 'focusin':
+      return node.focus();
+    case 'focusout':
+      return node.blur();
+    default:
+      return node.trigger(event);
+  }
+}
+
+const SUPPORTED_EMBER_EVENTS = {
+  touchstart: 'touchStart',
+  touchmove: 'touchMove',
+  touchend: 'touchEnd',
+  touchcancel: 'touchCancel',
+  keydown: 'keyDown',
+  keyup: 'keyUp',
+  keypress: 'keyPress',
+  mousedown: 'mouseDown',
+  mouseup: 'mouseUp',
+  contextmenu: 'contextMenu',
+  click: 'click',
+  dblclick: 'doubleClick',
+  focusin: 'focusIn',
+  focusout: 'focusOut',
+  submit: 'submit',
+  input: 'input',
+  change: 'change',
+  dragstart: 'dragStart',
+  drag: 'drag',
+  dragenter: 'dragEnter',
+  dragleave: 'dragLeave',
+  dragover: 'dragOver',
+  drop: 'drop',
+  dragend: 'dragEnd',
+};
+
 moduleFor(
   'EventDispatcher',
   class extends RenderingTestCase {
+    ['@test event handler methods are called when event is triggered'](assert) {
+      let receivedEvent;
+      let browserEvent;
+
+      this.registerComponent('x-button', {
+        ComponentClass: Component.extend(
+          {
+            tagName: 'button',
+          },
+          Object.keys(SUPPORTED_EMBER_EVENTS)
+            .map((browerEvent) => ({
+              [SUPPORTED_EMBER_EVENTS[browerEvent]](event) {
+                receivedEvent = event;
+              },
+            }))
+            .reduce((result, singleEventHandler) => ({ ...result, ...singleEventHandler }), {})
+        ),
+      });
+
+      this.render(`{{x-button}}`);
+
+      let elementNode = this.$('button');
+      let element = elementNode[0];
+
+      for (browserEvent in SUPPORTED_EMBER_EVENTS) {
+        receivedEvent = null;
+        runTask(() => triggerEvent(elementNode, browserEvent));
+        assert.ok(receivedEvent, `${browserEvent} event was triggered`);
+        assert.strictEqual(receivedEvent.target, element);
+      }
+    }
+
+    ['@test event listeners are called when event is triggered'](assert) {
+      let receivedEvent;
+      let browserEvent;
+
+      this.registerComponent('x-button', {
+        ComponentClass: Component.extend({
+          tagName: 'button',
+          init() {
+            this._super();
+            Object.keys(SUPPORTED_EMBER_EVENTS).forEach((browserEvent) => {
+              this.on(SUPPORTED_EMBER_EVENTS[browserEvent], (event) => (receivedEvent = event));
+            });
+          },
+        }),
+      });
+
+      this.render(`{{x-button}}`);
+
+      let elementNode = this.$('button');
+      let element = elementNode[0];
+
+      for (browserEvent in SUPPORTED_EMBER_EVENTS) {
+        receivedEvent = null;
+        runTask(() => triggerEvent(elementNode, browserEvent));
+        assert.ok(receivedEvent, `${browserEvent} event was triggered`);
+        assert.strictEqual(receivedEvent.target, element);
+      }
+    }
+
     ['@test events bubble view hierarchy for form elements'](assert) {
       let receivedEvent;
 
diff --git a/packages/internal-test-helpers/lib/node-query.js b/packages/internal-test-helpers/lib/node-query.js
index 493675cf895..50c78b1a8ea 100644
--- a/packages/internal-test-helpers/lib/node-query.js
+++ b/packages/internal-test-helpers/lib/node-query.js
@@ -1,7 +1,7 @@
 /* global Node */
 
 import { assert } from '@ember/debug';
-import { fireEvent, focus, matches } from './system/synthetic-events';
+import { blur, fireEvent, focus, matches } from './system/synthetic-events';
 
 export default class NodeQuery {
   static query(selector, context = document) {
@@ -54,6 +54,10 @@ export default class NodeQuery {
     this.nodes.forEach(focus);
   }
 
+  blur() {
+    this.nodes.forEach(blur);
+  }
+
   text() {
     return this.nodes.map((node) => node.textContent).join('');
   }

From 229e3cb3b8fa634b4d48d3237ca3c36b4d7e5d7c Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Tue, 17 Nov 2020 22:53:46 +0100
Subject: [PATCH 0245/1405] Move lazy event setup from component manager to
 component class after rebase

---
 .../glimmer/lib/component-managers/curly.ts   | 24 +------------
 .../-internals/glimmer/lib/component.ts       | 34 ++++++++++++-------
 .../-internals/glimmer/lib/environment.ts     |  2 +-
 3 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 6fcc3bf2028..2bffb2280dd 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,12 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
-import {
-  addChildView,
-  EventDispatcher,
-  setElementView,
-  setViewElement,
-} from '@ember/-internals/views';
+import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
 import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
 import { _instrumentStart } from '@ember/instrumentation';
@@ -119,21 +114,6 @@ const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
-function _setupLazyEventsForComponent(dispatcher: EventDispatcher | undefined, component: object) {
-  // non-interactive rendering (e.g. SSR) has no event dispatcher
-  if (dispatcher === undefined) {
-    return;
-  }
-
-  let lazyEvents = dispatcher.lazyEvents;
-
-  lazyEvents.forEach((mappedEventName: string, event: string) => {
-    if (mappedEventName !== null && typeof component[mappedEventName] === 'function') {
-      dispatcher.setupHandlerForBrowserEvent(event);
-    }
-  });
-}
-
 export default class CurlyComponentManager
   extends BaseInternalComponentManager<ComponentStateBucket, DefinitionState>
   implements
@@ -338,8 +318,6 @@ export default class CurlyComponentManager
       }
     }
 
-    _setupLazyEventsForComponent(environment.extra.eventDispatcher, component);
-
     // Track additional lifecycle metadata about this component in a state bucket.
     // Essentially we're saving off all the state we'll need in the future.
     let bucket = new ComponentStateBucket(
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 981bf476677..91008d540d5 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -14,11 +14,11 @@ import {
 } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+import { Environment } from '@glimmer/interfaces';
 import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
 import { createTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
-import { EmberVMEnvironment } from './environment';
 
 export const ARGS = enumerableSymbol('ARGS');
 export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
@@ -726,10 +726,20 @@ const Component = CoreView.extend(
       this[DIRTY_TAG] = createTag();
       this[BOUNDS] = null;
 
-      if (DEBUG && this.renderer._destinedForDOM && this.tagName === '') {
+      let eventDispatcher = this._dispatcher;
+      if (eventDispatcher) {
+        let lazyEvents = eventDispatcher.lazyEvents;
+
+        lazyEvents.forEach((mappedEventName: string, event: string) => {
+          if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
+            eventDispatcher.setupHandlerForBrowserEvent(event);
+          }
+        });
+      }
+
+      if (DEBUG && eventDispatcher && this.tagName === '') {
         let eventNames = [];
-        let eventDispatcher = getOwner(this).lookup<EventDispatcher>('event_dispatcher:main');
-        let events = (eventDispatcher && eventDispatcher.finalEventNameMapping) || {};
+        let events = eventDispatcher.finalEventNameMapping;
 
         // tslint:disable-next-line:forin
         for (let key in events) {
@@ -788,24 +798,22 @@ const Component = CoreView.extend(
       );
     },
 
-    get setupEventHandler(): (eventName: string) => void | null {
-      if (this._setupEventHandler === undefined) {
+    get _dispatcher(): EventDispatcher | null {
+      if (this.__dispatcher === undefined) {
         let owner = getOwner(this);
-        if (owner.lookup<EmberVMEnvironment>('-environment:main')!.isInteractive) {
-          let dispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
-          this._setupEventHandler = (eventName: string) =>
-            dispatcher!.setupHandlerForEmberEvent(eventName);
+        if (owner.lookup<Environment>('-environment:main')!.isInteractive) {
+          this.__dispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
         } else {
           // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
-          this._setupEventHandler = null;
+          this.__dispatcher = null;
         }
       }
 
-      return this._setupEventHandler;
+      return this.__dispatcher;
     },
 
     on(eventName: string) {
-      this.setupEventHandler?.(eventName);
+      this._dispatcher?.setupHandlerForEmberEvent(eventName);
       return this._super(...arguments);
     },
 
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index e1415696f8d..506ccca2eec 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -2,7 +2,7 @@ import { ENV } from '@ember/-internals/environment';
 import { _getProp, get, set } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
-import { constructStyleDeprecationMessage, EventDispatcher } from '@ember/-internals/views';
+import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { assert, deprecate, warn } from '@ember/debug';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';

From 4b5c19db6160da058967aad134f4b4c05775ec01 Mon Sep 17 00:00:00 2001
From: Aleksandr Kanunnikov <lifeart92@gmail.com>
Date: Wed, 18 Nov 2020 21:36:03 +0300
Subject: [PATCH 0246/1405] broken test for 19279

---
 .../-internals/metal/tests/alias_test.js      | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js
index 4410748bf89..2d2c7ed1bc4 100644
--- a/packages/@ember/-internals/metal/tests/alias_test.js
+++ b/packages/@ember/-internals/metal/tests/alias_test.js
@@ -8,7 +8,7 @@ import {
   removeObserver,
   tagForProperty,
 } from '..';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import { Object as EmberObject, A } from '@ember/-internals/runtime';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { destroy } from '@glimmer/runtime';
 import { valueForTag, validateTag } from '@glimmer/validator';
@@ -68,6 +68,27 @@ moduleFor(
       assert.equal(count, 1);
     }
 
+    ['@test nested aliases should trigger computed property invalidation [GH#19279]'](assert) {
+      const AttributeModel = EmberObject.extend({
+        countAdditives: alias('additives.length'),
+        additives: A()
+      });
+
+      const RootModel = EmberObject.extend({
+        allAdditives: computed('metaAttributes.@each.countAdditives', function(){
+          return this.metaAttributes.reduce((acc, el)=>{
+            return acc.concat(el.additives);
+          }, []);
+        }),
+        metaAttributes: A([AttributeModel.create()])
+      });
+
+      let model = RootModel.create();
+      assert.equal(model.allAdditives.length, 0);
+      model.metaAttributes[0].additives.pushObject('foo');
+      assert.equal(model.allAdditives.length, 1);
+    }
+
     async [`@test inheriting an observer of the alias from the prototype then
     redefining the alias on the instance to another property dependent on same key
     does not call the observer twice`](assert) {

From 315e1a3460745cd61462805a20c46ecd56ea405f Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 18 Nov 2020 10:46:33 -0800
Subject: [PATCH 0247/1405] [BUGFIX lts] Ensure aliases are bootstrapped when
 using @each

---
 packages/@ember/-internals/metal/lib/chain-tags.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index ca4ebf91cce..816f9420620 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -150,6 +150,15 @@ function getChainTags(
           );
 
           chainTags.push(tagForProperty(item, segment, true));
+
+          currentMeta = peekMeta(item);
+          descriptor = currentMeta !== null ? currentMeta.peekDescriptors(segment) : undefined;
+
+          // If the key is an alias, we need to bootstrap it
+          if (descriptor !== undefined && typeof descriptor.altKey === 'string') {
+            // tslint:disable-next-line: no-unused-expression
+            item[segment];
+          }
         }
       }
 

From 5ee78e9b0498b5c211d0c05d62662664b4d8e3bb Mon Sep 17 00:00:00 2001
From: Aleksandr Kanunnikov <lifeart92@gmail.com>
Date: Wed, 18 Nov 2020 21:49:36 +0300
Subject: [PATCH 0248/1405] linting fixes

---
 packages/@ember/-internals/metal/tests/alias_test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js
index 2d2c7ed1bc4..14bd45036f5 100644
--- a/packages/@ember/-internals/metal/tests/alias_test.js
+++ b/packages/@ember/-internals/metal/tests/alias_test.js
@@ -69,18 +69,18 @@ moduleFor(
     }
 
     ['@test nested aliases should trigger computed property invalidation [GH#19279]'](assert) {
-      const AttributeModel = EmberObject.extend({
+      let AttributeModel = EmberObject.extend({
         countAdditives: alias('additives.length'),
-        additives: A()
+        additives: A(),
       });
 
-      const RootModel = EmberObject.extend({
-        allAdditives: computed('metaAttributes.@each.countAdditives', function(){
-          return this.metaAttributes.reduce((acc, el)=>{
+      let RootModel = EmberObject.extend({
+        allAdditives: computed('metaAttributes.@each.countAdditives', function () {
+          return this.metaAttributes.reduce((acc, el) => {
             return acc.concat(el.additives);
           }, []);
         }),
-        metaAttributes: A([AttributeModel.create()])
+        metaAttributes: A([AttributeModel.create()]),
       });
 
       let model = RootModel.create();

From f4c84c7e17bd6cf23edbfe2ff9a2b56065e3716e Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 19 Nov 2020 10:14:48 +0100
Subject: [PATCH 0249/1405] Performance optimization for lazy events checking

This skips over components whose class (prototype) has already been checked.
---
 .../-internals/glimmer/lib/component.ts       | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 91008d540d5..b7279b800b6 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -27,6 +27,8 @@ export const DIRTY_TAG = symbol('DIRTY_TAG');
 export const IS_DISPATCHING_ATTRS = symbol('IS_DISPATCHING_ATTRS');
 export const BOUNDS = symbol('BOUNDS');
 
+let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<any>>();
+
 /**
 @module @ember/component
 */
@@ -728,13 +730,26 @@ const Component = CoreView.extend(
 
       let eventDispatcher = this._dispatcher;
       if (eventDispatcher) {
-        let lazyEvents = eventDispatcher.lazyEvents;
+        let lazyEventsProcessedForComponentClass:
+          | WeakSet<any>
+          | undefined = lazyEventsProcessed.get(eventDispatcher);
+        if (!lazyEventsProcessedForComponentClass) {
+          lazyEventsProcessedForComponentClass = new WeakSet();
+          lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
+        }
 
-        lazyEvents.forEach((mappedEventName: string, event: string) => {
-          if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
-            eventDispatcher.setupHandlerForBrowserEvent(event);
-          }
-        });
+        let proto = Object.getPrototypeOf(this);
+        if (!lazyEventsProcessedForComponentClass.has(proto)) {
+          let lazyEvents = eventDispatcher.lazyEvents;
+
+          lazyEvents.forEach((mappedEventName: string, event: string) => {
+            if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
+              eventDispatcher.setupHandlerForBrowserEvent(event);
+            }
+          });
+
+          lazyEventsProcessedForComponentClass.add(proto);
+        }
       }
 
       if (DEBUG && eventDispatcher && this.tagName === '') {

From 7166b74c456fdcf7da822825b2a139d7963a87ea Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 18 Nov 2020 16:31:28 -0500
Subject: [PATCH 0250/1405] Fixup `any` warnings for
 `@ember/-internals/browser-environment`.

---
 packages/@ember/-internals/browser-environment/index.ts     | 6 ++++--
 .../@ember/-internals/browser-environment/lib/has-dom.ts    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/browser-environment/index.ts b/packages/@ember/-internals/browser-environment/index.ts
index 4a6a3c68b62..b4122c67d15 100644
--- a/packages/@ember/-internals/browser-environment/index.ts
+++ b/packages/@ember/-internals/browser-environment/index.ts
@@ -1,11 +1,13 @@
 import hasDom from './lib/has-dom';
 
-declare const InstallTrigger: any;
+declare const InstallTrigger: unknown;
+declare const chrome: unknown;
+declare const opera: unknown;
 
 export { default as hasDOM } from './lib/has-dom';
 export const window = hasDom ? self : null;
 export const location = hasDom ? self.location : null;
 export const history = hasDom ? self.history : null;
 export const userAgent = hasDom ? self.navigator.userAgent : 'Lynx (textmode)';
-export const isChrome = hasDom ? Boolean((window as any).chrome) && !(window as any).opera : false;
+export const isChrome = hasDom ? typeof chrome === 'object' && !(typeof opera === 'object') : false;
 export const isFirefox = hasDom ? typeof InstallTrigger !== 'undefined' : false;
diff --git a/packages/@ember/-internals/browser-environment/lib/has-dom.ts b/packages/@ember/-internals/browser-environment/lib/has-dom.ts
index e5ae0a12405..7928623e8c3 100644
--- a/packages/@ember/-internals/browser-environment/lib/has-dom.ts
+++ b/packages/@ember/-internals/browser-environment/lib/has-dom.ts
@@ -1,7 +1,7 @@
 // check if window exists and actually is the global
 export default typeof self === 'object' &&
   self !== null &&
-  (self as any).Object === Object &&
+  (self as Window['self']).Object === Object &&
   typeof Window !== 'undefined' &&
   self.constructor === Window &&
   typeof document === 'object' &&

From 92477044dec1ec014838e7ce321815be37619e48 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 18 Nov 2020 16:32:02 -0500
Subject: [PATCH 0251/1405] Fixup `any` warnings for `@ember/console`.

---
 packages/@ember/-internals/console/index.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/console/index.d.ts b/packages/@ember/-internals/console/index.d.ts
index 440243f64c3..bf03766f40b 100644
--- a/packages/@ember/-internals/console/index.d.ts
+++ b/packages/@ember/-internals/console/index.d.ts
@@ -1,10 +1,10 @@
 declare const Logger: {
-  log(...args: any[]): void;
-  warn(...args: any[]): void;
-  error(...args: any[]): void;
-  info(...args: any[]): void;
-  debug(...args: any[]): void;
-  assert(...args: any[]): void;
+  log(...args: string[]): void;
+  warn(...args: string[]): void;
+  error(...args: string[]): void;
+  info(...args: string[]): void;
+  debug(...args: string[]): void;
+  assert(...args: string[]): void;
 };
 
 export default Logger;

From 199334292abb71ca92b27621c5bea20050ab4945 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 18 Nov 2020 16:32:18 -0500
Subject: [PATCH 0252/1405] Fixup `any` warnings for `@ember/runloop`.

Embrace the types from `backburner.js`
---
 .../routing/lib/location/hash_location.ts     |  2 +-
 packages/@ember/runloop/index.d.ts            | 37 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index b5331d8cde4..440af9817e5 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -136,7 +136,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
       callback(path);
     });
 
-    window.addEventListener('hashchange', this._hashchangeHandler!);
+    window.addEventListener('hashchange', this._hashchangeHandler);
   }
 
   /**
diff --git a/packages/@ember/runloop/index.d.ts b/packages/@ember/runloop/index.d.ts
index 4a6fc0bb2db..16dc7237d7e 100644
--- a/packages/@ember/runloop/index.d.ts
+++ b/packages/@ember/runloop/index.d.ts
@@ -1,18 +1,21 @@
-interface IBackburner {
-  join(...args: any[]): void;
-  on(...args: any[]): void;
-  scheduleOnce(...args: any[]): void;
-  schedule(queueName: string, target: Object | null, method: Function | string): void;
-  ensureInstance(): void;
-}
+import { Backburner, DeferredActionQueues, Timer } from 'backburner.js';
 
-export function run(...args: any[]): any;
-export function schedule(...args: any[]): void;
-export function later(...args: any[]): void;
-export function join(...args: any[]): void;
-export const backburner: IBackburner;
-export function getCurrentRunLoop(): boolean;
-export function bind(...args: any[]): any;
-export function cancel(...args: any[]): any;
-export function once(...args: any[]): any;
-export function scheduleOnce(...args: any[]): any;
+export const backburner: Backburner;
+
+export const run = Backburner.run;
+export const schedule = Backburner.schedule;
+export const later = Backburner.later;
+export const join = Backburner.join;
+export const cancel = Backburner.cancel;
+export const scheduleOnce = Backburner.scheduleOnce;
+
+export function getCurrentRunLoop(): DeferredActionQueues;
+
+export function once(method: Function): Timer;
+export function once<T, U extends keyof T>(target: T, method: U, ...args): Timer;
+export function once(target: unknown, method: unknown | Function, ...args): Timer;
+
+export function bind<T extends Function>(target: T): T;
+export function bind<T extends Function, U>(target: unknown, method?: T, ...args: U): T;
+export function bind<T>(target: unknown, method?: string, ...args: T): Function;
+export function bind<T>(target: unknown, method?: T, ...args: unknown[]): T;

From b810b19e1ec91cae0766585a7ac9f97e2e179edf Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 18 Nov 2020 18:45:35 -0500
Subject: [PATCH 0253/1405] Fixup TypeScript warnings in
 @ember/-internals/routing/lib/location.

---
 .../-internals/routing/lib/location/api.ts    |  3 +-
 .../routing/lib/location/auto_location.ts     | 40 ++++++++++---------
 .../routing/lib/location/hash_location.ts     | 18 ++++-----
 .../routing/lib/location/history_location.ts  | 24 +++++------
 .../routing/lib/location/none_location.ts     | 12 +++---
 .../-internals/routing/lib/location/util.ts   | 23 ++++++-----
 6 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index cf12a61afd5..2412c4d0098 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -96,11 +96,12 @@ export default {
     need.
     @private
   */
-  create(options: { implementation: string }) {
+  create(options: { implementation: string }): EmberLocation {
     let implementation = options && options.implementation;
     assert("Location.create: you must specify a 'implementation' option", Boolean(implementation));
 
     let implementationClass = this.implementations[implementation];
+
     assert(
       `Location.create: ${implementation} is not a valid implementation`,
       Boolean(implementationClass)
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 76a10fbc048..8122bdc623e 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -76,7 +76,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
 
    @private
   */
-  detect() {
+  detect(): void {
     let rootURL = this.rootURL;
 
     assert(
@@ -101,11 +101,11 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     let concrete = getOwner(this).lookup<EmberLocation>(`location:${implementation}`);
     assert(`Could not find location '${implementation}'.`, concrete !== undefined);
 
-    set(concrete!, 'rootURL', rootURL);
-    set(this, 'concreteImplementation', concrete!);
+    set(concrete, 'rootURL', rootURL);
+    set(this, 'concreteImplementation', concrete);
   }
 
-  willDestroy() {
+  willDestroy(): void {
     let { concreteImplementation } = this;
 
     if (concreteImplementation) {
@@ -192,7 +192,7 @@ AutoLocation.reopen({
 });
 
 function delegateToConcreteImplementation(methodName: string) {
-  return function (this: AutoLocation, ...args: any[]) {
+  return function (this: AutoLocation, ...args: unknown[]) {
     let { concreteImplementation } = this;
     assert(
       "AutoLocation's detect() method should be called before calling any other hooks.",
@@ -217,8 +217,8 @@ function delegateToConcreteImplementation(methodName: string) {
 */
 
 interface DetectionOptions {
-  location: Location | null;
-  history: History | null;
+  location: Location;
+  history: History;
   userAgent: string;
   rootURL: string;
   documentMode: number | undefined;
@@ -230,24 +230,24 @@ function detectImplementation(options: DetectionOptions) {
 
   let implementation = 'none';
   let cancelRouterSetup = false;
-  let currentPath = getFullPath(location!);
+  let currentPath = getFullPath(location);
 
-  if (supportsHistory(userAgent, history!)) {
-    let historyPath = getHistoryPath(rootURL, location!);
+  if (supportsHistory(userAgent, history)) {
+    let historyPath = getHistoryPath(rootURL, location);
 
     // If the browser supports history and we have a history path, we can use
     // the history location with no redirects.
     if (currentPath === historyPath) {
       implementation = 'history';
     } else if (currentPath.substr(0, 2) === '/#') {
-      history!.replaceState({ path: historyPath }, '', historyPath);
+      history.replaceState({ path: historyPath }, '', historyPath);
       implementation = 'history';
     } else {
       cancelRouterSetup = true;
-      replacePath(location!, historyPath);
+      replacePath(location, historyPath);
     }
   } else if (supportsHashChange(documentMode, global)) {
-    let hashPath = getHashPath(rootURL, location!);
+    let hashPath = getHashPath(rootURL, location);
 
     // Be sure we're using a hashed path, otherwise let's switch over it to so
     // we start off clean and consistent. We'll count an index path with no
@@ -258,7 +258,7 @@ function detectImplementation(options: DetectionOptions) {
       // Our URL isn't in the expected hash-supported format, so we want to
       // cancel the router setup and replace the URL to start off clean
       cancelRouterSetup = true;
-      replacePath(location!, hashPath);
+      replacePath(location, hashPath);
     }
   }
 
@@ -276,12 +276,14 @@ function detectImplementation(options: DetectionOptions) {
   browsers. This may very well differ from the real current path (e.g. if it
   starts off as a hashed URL)
 */
-export function getHistoryPath(rootURL: string, location: Location) {
+export function getHistoryPath(rootURL: string, location: Location): string {
   let path = getPath(location);
   let hash = getHash(location);
   let query = getQuery(location);
   let rootURLIndex = path.indexOf(rootURL);
-  let routeHash, hashParts;
+
+  let routeHash: string;
+  let hashParts;
 
   assert(`Path ${path} does not start with the provided rootURL ${rootURL}`, rootURLIndex === 0);
 
@@ -292,12 +294,12 @@ export function getHistoryPath(rootURL: string, location: Location) {
     // There could be extra hash segments after the route
     hashParts = hash.substr(1).split('#');
     // The first one is always the route url
-    routeHash = hashParts.shift();
+    routeHash = hashParts.shift() as string;
 
     // If the path already has a trailing slash, remove the one
     // from the hashed route so we don't double up.
     if (path.charAt(path.length - 1) === '/') {
-      routeHash = routeHash!.substr(1);
+      routeHash = routeHash.substr(1);
     }
 
     // This is the "expected" final order
@@ -321,7 +323,7 @@ export function getHistoryPath(rootURL: string, location: Location) {
 
   @method _getHashPath
 */
-export function getHashPath(rootURL: string, location: Location) {
+export function getHashPath(rootURL: string, location: Location): string {
   let path = rootURL;
   let historyPath = getHistoryPath(rootURL, location);
   let routePath = historyPath.substr(rootURL.length);
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index 440af9817e5..2ced27940bd 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -40,7 +40,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
   implementation = 'hash';
   _hashchangeHandler?: EventListener;
 
-  init() {
+  init(): void {
     set(this, 'location', this._location || window.location);
     this._hashchangeHandler = undefined;
   }
@@ -53,7 +53,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @since 1.5.1
     @method getHash
   */
-  getHash() {
+  getHash(): string {
     return getHash(this.location);
   }
 
@@ -68,7 +68,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @private
     @method getURL
   */
-  getURL() {
+  getURL(): string {
     let originalPath = this.getHash().substr(1);
     let outPath = originalPath;
 
@@ -96,7 +96,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @method setURL
     @param path {String}
   */
-  setURL(path: string) {
+  setURL(path: string): void {
     this.location.hash = path;
     set(this, 'lastSetURL', path);
   }
@@ -109,7 +109,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @method replaceURL
     @param path {String}
   */
-  replaceURL(path: string) {
+  replaceURL(path: string): void {
     this.location.replace(`#${path}`);
     set(this, 'lastSetURL', path);
   }
@@ -123,7 +123,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @method onUpdateURL
     @param callback {Function}
   */
-  onUpdateURL(callback: UpdateCallback) {
+  onUpdateURL(callback: UpdateCallback): void {
     this._removeEventListener();
     this._hashchangeHandler = bind(this, function (this: HashLocation) {
       let path = this.getURL();
@@ -150,7 +150,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @method formatURL
     @param url {String}
   */
-  formatURL(url: string) {
+  formatURL(url: string): string {
     return `#${url}`;
   }
 
@@ -160,11 +160,11 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @private
     @method willDestroy
   */
-  willDestroy() {
+  willDestroy(): void {
     this._removeEventListener();
   }
 
-  _removeEventListener() {
+  _removeEventListener(): void {
     if (this._hashchangeHandler) {
       window.removeEventListener('hashchange', this._hashchangeHandler);
     }
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index 2f87266f1c4..7747f06b74b 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -78,11 +78,11 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
 
     @method getHash
   */
-  getHash() {
+  getHash(): string {
     return getHash(this.location);
   }
 
-  init() {
+  init(): void {
     this._super(...arguments);
 
     let base = document.querySelector('base');
@@ -103,7 +103,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @private
     @method initState
   */
-  initState() {
+  initState(): void {
     let history = this.history || window.history;
     set(this, 'history', history);
 
@@ -125,7 +125,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @method getURL
     @return url {String}
   */
-  getURL() {
+  getURL(): string {
     let { location, rootURL, baseURL } = this;
     let path = location.pathname;
 
@@ -152,7 +152,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @method setURL
     @param path {String}
   */
-  setURL(path: string) {
+  setURL(path: string): void {
     let { state } = this.history;
     path = this.formatURL(path);
 
@@ -169,7 +169,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @method replaceURL
     @param path {String}
   */
-  replaceURL(path: string) {
+  replaceURL(path: string): void {
     let { state } = this.history;
     path = this.formatURL(path);
 
@@ -185,7 +185,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
    @method pushState
    @param path {String}
   */
-  pushState(path: string) {
+  pushState(path: string): void {
     let state = { path, uuid: _uuid() };
 
     this.history.pushState(state, null, path);
@@ -201,7 +201,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
    @method replaceState
    @param path {String}
   */
-  replaceState(path: string) {
+  replaceState(path: string): void {
     let state = { path, uuid: _uuid() };
 
     this.history.replaceState(state, null, path);
@@ -218,7 +218,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @method onUpdateURL
     @param callback {Function}
   */
-  onUpdateURL(callback: UpdateCallback) {
+  onUpdateURL(callback: UpdateCallback): void {
     this._removeEventListener();
 
     this._popstateHandler = () => {
@@ -243,7 +243,7 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @param url {String}
     @return formatted url {String}
   */
-  formatURL(url: string) {
+  formatURL(url: string): string {
     let { rootURL, baseURL } = this;
 
     if (url !== '') {
@@ -265,11 +265,11 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     @private
     @method willDestroy
   */
-  willDestroy() {
+  willDestroy(): void {
     this._removeEventListener();
   }
 
-  _removeEventListener() {
+  _removeEventListener(): void {
     if (this._popstateHandler) {
       window.removeEventListener('popstate', this._popstateHandler);
     }
diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
index d8f3d258db5..5ee44089909 100644
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -25,7 +25,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
   updateCallback!: UpdateCallback;
   implementation = 'none';
 
-  detect() {
+  detect(): void {
     let { rootURL } = this;
 
     assert(
@@ -41,7 +41,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
     @method getURL
     @return {String} path
   */
-  getURL() {
+  getURL(): string {
     let { path, rootURL } = this;
 
     // remove trailing slashes if they exists
@@ -59,7 +59,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
     @method setURL
     @param path {String}
   */
-  setURL(path: string) {
+  setURL(path: string): void {
     set(this, 'path', path);
   }
 
@@ -72,7 +72,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
     @method onUpdateURL
     @param callback {Function}
   */
-  onUpdateURL(callback: (url: string) => void) {
+  onUpdateURL(callback: (url: string) => void): void {
     this.updateCallback = callback;
   }
 
@@ -83,7 +83,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
     @method handleURL
     @param url {String}
   */
-  handleURL(url: string) {
+  handleURL(url: string): void {
     set(this, 'path', url);
     this.updateCallback(url);
   }
@@ -100,7 +100,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
     @param url {String}
     @return {String} url
   */
-  formatURL(url: string) {
+  formatURL(url: string): string {
     let { rootURL } = this;
 
     if (url !== '') {
diff --git a/packages/@ember/-internals/routing/lib/location/util.ts b/packages/@ember/-internals/routing/lib/location/util.ts
index 599c67158fa..7dd1be322a7 100644
--- a/packages/@ember/-internals/routing/lib/location/util.ts
+++ b/packages/@ember/-internals/routing/lib/location/util.ts
@@ -3,7 +3,7 @@
 
   Returns the current `location.pathname`, normalized for IE inconsistencies.
 */
-export function getPath(location: Location) {
+export function getPath(location: Location): string {
   let pathname = location.pathname;
   // Various versions of IE/Opera don't always return a leading slash
   if (pathname[0] !== '/') {
@@ -18,7 +18,7 @@ export function getPath(location: Location) {
 
   Returns the current `location.search`.
 */
-export function getQuery(location: Location) {
+export function getQuery(location: Location): string {
   return location.search;
 }
 
@@ -27,7 +27,7 @@ export function getQuery(location: Location) {
 
   Returns the hash or empty string
 */
-export function getHash(location: Location) {
+export function getHash(location: Location): string {
   if (location.hash !== undefined) {
     return location.hash.substr(0);
   }
@@ -35,11 +35,11 @@ export function getHash(location: Location) {
   return '';
 }
 
-export function getFullPath(location: Location) {
+export function getFullPath(location: Location): string {
   return getPath(location) + getQuery(location) + getHash(location);
 }
 
-export function getOrigin(location: Location) {
+export function getOrigin(location: Location): string {
   let origin = location.origin;
 
   // Older browsers, especially IE, don't have origin
@@ -63,8 +63,13 @@ export function getOrigin(location: Location) {
   @private
   @function supportsHashChange
 */
-export function supportsHashChange(documentMode: number | undefined, global: Window | null) {
-  return global && 'onhashchange' in global && (documentMode === undefined || documentMode > 7);
+export function supportsHashChange(
+  documentMode: number | undefined,
+  global: Window | null
+): boolean {
+  return Boolean(
+    global && 'onhashchange' in global && (documentMode === undefined || documentMode > 7)
+  );
 }
 
 /*
@@ -75,7 +80,7 @@ export function supportsHashChange(documentMode: number | undefined, global: Win
   @private
   @function supportsHistory
 */
-export function supportsHistory(userAgent: string, history: History) {
+export function supportsHistory(userAgent: string, history: History): boolean {
   // Boosted from Modernizr: https://github.com/Modernizr/Modernizr/blob/master/feature-detects/history.js
   // The stock browser on Android 2.2 & 2.3, and 4.0.x returns positive on history support
   // Unfortunately support is really buggy and there is no clean way to detect
@@ -101,6 +106,6 @@ export function supportsHistory(userAgent: string, history: History) {
 
   @private
 */
-export function replacePath(location: Location, path: string) {
+export function replacePath(location: Location, path: string): void {
   location.replace(getOrigin(location) + path);
 }

From 5da2bc7d3e1ac8f374d711d5b33b245bbdd64f75 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Fri, 20 Nov 2020 09:30:08 -0500
Subject: [PATCH 0254/1405] Update GlimmerVM to 0.66.1.

Includes the following bugfixes:

* [#1209](https://github.com/glimmerjs/glimmer-vm/pull/1209) Ensure `<output form="some-value">` works properly
* [#1205](https://github.com/glimmerjs/glimmer-vm/pull/1205) Ensure `@tracked` assertion can be made a deprecation
* [#1204](https://github.com/glimmerjs/glimmer-vm/pull/1204) Ensure `loc` is populated by `build ers.element(...)`

Changelog here:

https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.66.1
---
 package.json |  18 ++---
 yarn.lock    | 210 +++++++++++++++++++++++++--------------------------
 2 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/package.json b/package.json
index 5224ed3feb1..797ace52b26 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.66.0",
+    "@glimmer/compiler": "0.66.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.66.0",
-    "@glimmer/interfaces": "0.66.0",
-    "@glimmer/node": "0.66.0",
-    "@glimmer/opcode-compiler": "0.66.0",
-    "@glimmer/program": "0.66.0",
-    "@glimmer/reference": "0.66.0",
-    "@glimmer/runtime": "0.66.0",
-    "@glimmer/validator": "0.66.0",
+    "@glimmer/global-context": "0.66.1",
+    "@glimmer/interfaces": "0.66.1",
+    "@glimmer/node": "0.66.1",
+    "@glimmer/opcode-compiler": "0.66.1",
+    "@glimmer/program": "0.66.1",
+    "@glimmer/reference": "0.66.1",
+    "@glimmer/runtime": "0.66.1",
+    "@glimmer/validator": "0.66.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 7ccf7568185..e393a8819c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,152 +1657,152 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.66.0.tgz#90df75c35a1a708192b8349294ca9aeddb45bb0e"
-  integrity sha512-AlD1VFHfI9RmHajGwJgBKlPVUFowu7meseQY+HH1uA5LpHNrTm/v0Sa2wBTNhCYMZ21WcwdnXehYMHA4n8Ywug==
-  dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/syntax" "0.66.0"
-    "@glimmer/util" "0.66.0"
-    "@glimmer/wire-format" "0.66.0"
+"@glimmer/compiler@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.66.1.tgz#cfb988634d12038f41b2323ba19b1b9cf2b5cc28"
+  integrity sha512-O0spaPhowm88nncLut7p5pRm0ZTFzpGQFqGtQfSvqdAr/+i8KwMd515f5lqv/dJobXSzqP0ocXDZVoBKYd8Zkw==
+  dependencies:
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/syntax" "0.66.1"
+    "@glimmer/util" "0.66.1"
+    "@glimmer/wire-format" "0.66.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.66.0.tgz#8deede076db1c4ff0047069bc802585ed16e63f6"
-  integrity sha512-cxwuyEqX/lsHWB1CR7hJgoIX+LWRKhz2LPbwwunGOG2wiBFOO6629hs/FcfT84BJcBz1Plmit8t3IHWk2vgOzQ==
+"@glimmer/encoder@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.66.1.tgz#ee15bbdd58e14872915db037b9ed7bbcee844378"
+  integrity sha512-noItjxOjKO/3KEgViqGZEfslSKOo9sjdHtxxMimQuvDP+ApjhA7sFjWLX+zJCS1fIsZGM0hzEWaNKEB1Pjg9Mw==
   dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/vm" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/vm" "0.66.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.0.tgz#4efc0d90ffc33a07e2f86b1462e71541f4e36cdd"
-  integrity sha512-3kaSDZptEF3dmCO/rcQptJ0qZQub8ax1C19+IkuBnTbeYOEgdW61rPFdApqAzY/EydMjBmxZRLhS/IMRx4wJcQ==
+"@glimmer/global-context@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.1.tgz#3be91232e225bc0cac4920159f6f73c8761bc98d"
+  integrity sha512-dWdr6XUsVoZ8XXLYqaYFrz9O6amogb2q9QMDnrxjqurfhcc2Va7qaUM9e3qRyICwph6MsUgrDtX3SRA6dyRwJw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.0.tgz#f281e1985d6b7f63648d960cc2745c68562fdb92"
-  integrity sha512-fw1pO6oyczSKeTPR6anrSI4OarLlaAR0SSDAhsYrINXfW7Xd/U/es7i6VE1JjLSZqfnsAxjNOFDe0lA5lmV/dw==
+"@glimmer/interfaces@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.1.tgz#5b50b0dd6bcae19e7848d70b42f9466a184979be"
+  integrity sha512-opcDbSID3YqkUgOR15+IePfkoiJKRJh5pfxPXNw3xcwkptmbiSXNkfZGnPk4FZr4g+Jpem1CIGUDejtyaTTk3Q==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.66.0.tgz#fa21f48c12d77ec765039e30027cbe701ec94081"
-  integrity sha512-9voF9pO6i+4nLi+h1ix8S/nhqYLUQBV+wlZpcmhDPnvaiCJlNF2ocH4ZjtrTfgg9mKl8vA8JI+xMzuagFvc/aw==
+"@glimmer/low-level@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.66.1.tgz#f6d74845ba51e8090033d01a571699f15e35dd0c"
+  integrity sha512-IaIgcd0sJBaF5N6bnOB6MQKB8ObJQJ98CRcFfTf8sw9DvGp8DGL+M/QmOnERUSc28pk76k+z4JOtcbVCaA1NxA==
 
-"@glimmer/node@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.66.0.tgz#d28a374a935829449ec386de310e7d89369abca4"
-  integrity sha512-tRlc1wHB9hD4ByLlc4CxDsO/GxaSVhKRJNLP7RBn74dQhywvz4y/q3qxgQngieX8RM29YmQRGMFYKpqkMhr2ZQ==
+"@glimmer/node@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.66.1.tgz#572477e89db8884b437cc2b080dde6c2529e7c19"
+  integrity sha512-/KLJ3Dal0rCHDkliS6sYUGmmkr1RlpLjhUIJvaKCXJMckKpiq+b1dkLdiqf+CGYShi2+vDDvSqiQbIAPzoMo1A==
   dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/runtime" "0.66.0"
-    "@glimmer/util" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/runtime" "0.66.1"
+    "@glimmer/util" "0.66.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.66.0.tgz#bce49e98f6028d2e29dd4f48ea13197c2836bc18"
-  integrity sha512-Ei43PvD3FyZEMt3dC7HcQ/Ewl6cyFpLQb1+lWL+feMvs7wYPtzUgTXNa+bLKhrEVI4DEqIb+iVKiNiRZlqGsYg==
-  dependencies:
-    "@glimmer/encoder" "0.66.0"
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/program" "0.66.0"
-    "@glimmer/reference" "0.66.0"
-    "@glimmer/util" "0.66.0"
-    "@glimmer/vm" "0.66.0"
-    "@glimmer/wire-format" "0.66.0"
-
-"@glimmer/program@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.66.0.tgz#30073786cd4938dc21d8a9628fbdb16ba38f6ab8"
-  integrity sha512-r3KuQK9QFADg8Dho/UvGXCB1+ubKeQToVQDaBL+GKQ3w/GGDfkzixxccSNhxOygwSDi/3pm2TWSlV1t5+IyOeg==
-  dependencies:
-    "@glimmer/encoder" "0.66.0"
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
-
-"@glimmer/reference@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.0.tgz#3d1acb1755fe6c1660275aec7482cbc9935a656c"
-  integrity sha512-HNY2bxx+2/i5jEDQO5tVX3TZGVzCfpvVE5whkNxS+vDTV+E3KACWvxNz4e3cKbA98tYoZJjGw/jWOhgak3Bbvg==
+"@glimmer/opcode-compiler@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.66.1.tgz#38c676abdef62181d5a027e8240baeff71360871"
+  integrity sha512-ZgsP7WAW5+NR/FrTdC88Ejw9+ChiazGUUHNVF0WWwvaMzY9YuG3re1OHUdYFx8M7An4IRYd+8XgvqQb+9pi3pA==
+  dependencies:
+    "@glimmer/encoder" "0.66.1"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/program" "0.66.1"
+    "@glimmer/reference" "0.66.1"
+    "@glimmer/util" "0.66.1"
+    "@glimmer/vm" "0.66.1"
+    "@glimmer/wire-format" "0.66.1"
+
+"@glimmer/program@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.66.1.tgz#b0387586819977ed4464db7219d76c116d51ff40"
+  integrity sha512-9fpiZqNcRqLXyBAbIP+mM+WSiMaeYmP6vT3bGrBTBMTnsK+5ZbdhqOS16bANsB+5V4qridr8RDXf7OEBJz+Msw==
+  dependencies:
+    "@glimmer/encoder" "0.66.1"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
+
+"@glimmer/reference@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.1.tgz#b61d44d78d44eb3b4bbf62cdb0dc0e4ea9600302"
+  integrity sha512-ifd2g614YzrDfHcZWTiglHVFv/x9lym79hB92GSYCiK73sl5oGUBodsbur084MfAMc1cNJEp06bXxTAoiguwLg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.0"
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
-    "@glimmer/validator" "0.66.0"
+    "@glimmer/global-context" "0.66.1"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
+    "@glimmer/validator" "0.66.1"
 
-"@glimmer/runtime@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.66.0.tgz#d47eb495a07e8154cb08c120b594dbc05bf2eece"
-  integrity sha512-ZzuVmXe1CBB3vEzKYBpSZRlMh8AIGmbYjTwqxebokdSMbypCVN96VrKgswheEvWwQXx4EGphO+3Wm027f0SFAQ==
+"@glimmer/runtime@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.66.1.tgz#5a628db0fb1af63b898b73fa47c30f5aae44ac55"
+  integrity sha512-c6OFkPl4FSM3lAqjHx3V/bQwjW/SBvzrh5kmbul6YC+yod9+V5cI8HND35ZFelAandEpzxcqe5MclnYDBNJ2Sg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.66.0"
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/low-level" "0.66.0"
-    "@glimmer/program" "0.66.0"
-    "@glimmer/reference" "0.66.0"
-    "@glimmer/util" "0.66.0"
-    "@glimmer/validator" "0.66.0"
-    "@glimmer/vm" "0.66.0"
-    "@glimmer/wire-format" "0.66.0"
+    "@glimmer/global-context" "0.66.1"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/low-level" "0.66.1"
+    "@glimmer/program" "0.66.1"
+    "@glimmer/reference" "0.66.1"
+    "@glimmer/util" "0.66.1"
+    "@glimmer/validator" "0.66.1"
+    "@glimmer/vm" "0.66.1"
+    "@glimmer/wire-format" "0.66.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.0.tgz#d38561be48f6c4deeb94c24a1344a3426bb7e925"
-  integrity sha512-sgGQvoLprHjGV/TW2WY5wTmJaUjkHHgXhRJp+nLL5+JVC1zoR/mbGJk2Wfbj/R5D3pKzPln08HsSdXKj9Dl36g==
+"@glimmer/syntax@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.1.tgz#901b9d0253ad5ac1f7f8199de0ef43c98c209a63"
+  integrity sha512-hzYhlfWzu5c8K7ZtTh3bSdpT5a6efxN1NsKUvGE5p1TC9XGOZuKogq/fRtlK2UGBUazEh5fvTu7qmQ8dTU1dWA==
   dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.0.tgz#c457951951f4ea1d5a1d63fa11c9ffeae8efa4f6"
-  integrity sha512-4J3sihRKZ7N4igk2BZGryC/E6qIy+20d3Dl9+jYhsM8SdviPm+PtFy7tdJsb3E+u/yITqHnvzt7+Cr+VtlT7KA==
+"@glimmer/util@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.1.tgz#53c5e12f121011f44c018dba6bcaa936133ffd24"
+  integrity sha512-pB7VEpCmC5hmehQdED7HJJEKFdGPsO6LHGl4LtRHHQptlyKTxotTxevDbzGuIxbsDpGPT+4e3g1rlEAfnC51/Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.0.tgz#a127e6f9e36a41665f6bbb8d6635412db8160824"
-  integrity sha512-9xZK3Z8kIbTa3UoDU3lxel5AeQvr9bI6hQSbx21E2sO7R7dnozWM0GQjvnjCeyU5JLGJH/YKpeItZFhHhbDvtQ==
+"@glimmer/validator@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.1.tgz#46bf25b2a8b819570d9fca0a248185ca07b8ec2a"
+  integrity sha512-9mhSCfe9R8TgTnHtOZuVTzsO9/Ej0gwRun1SQtQu5WK7Lamg0XPhluWVV46GcFv6w6NkopStCfoHIrounXTnpA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.0"
+    "@glimmer/global-context" "0.66.1"
 
-"@glimmer/vm@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.66.0.tgz#6d476a4e8ce69fde71a2f9bab651ce156ce9f1b3"
-  integrity sha512-5pFMob++8bDJU99w0GztPc8HvUSthDRiW2pwScBGmyU0UNJVYRhGHAq0aVktbNKNzAoLh2u9IjNdul4N5fA1uQ==
+"@glimmer/vm@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.66.1.tgz#c6c6e248b3ed574a3bfb21208f8e5afa8f9fe7f6"
+  integrity sha512-VmesyuROi29KGycLe2vzaTnMU74kirCEPCHbTVTxxvFkJHY3ljtpZVpS0OIl9kMnbFQRWcR5X6sPIdPVdebySA==
   dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
 
-"@glimmer/wire-format@0.66.0":
-  version "0.66.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.66.0.tgz#aa359256b82febde4179a26da3d9164c64fb89da"
-  integrity sha512-7niSIcxAz0aWhhKuwi11y/0MrJAeiIO0NX6zv0IMFXu9Ul0ywM2UOxni2hNdpqD2XNn2z5O47QcqG2bdVq8fnA==
+"@glimmer/wire-format@0.66.1":
+  version "0.66.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.66.1.tgz#ad63764c3231e97397617d3e2c6a02a6fcff5047"
+  integrity sha512-TyffGOCJ/LykKev3G7IMEzicpvgip5+XZi3Shr/silMEtncrbDV9ryYkyOalfjWHHWa/XIHz+KAEXVJG3tYq1g==
   dependencies:
-    "@glimmer/interfaces" "0.66.0"
-    "@glimmer/util" "0.66.0"
+    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/util" "0.66.1"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 3a613d6ca657bd94c5c30b3aceaa2144cd93f676 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 19 Nov 2020 10:52:56 -0500
Subject: [PATCH 0255/1405] [BUGFIX release] Use deprecation for mutation in
 constructor during rendering

During recent refactors that landed in glimmer-vm@0.57 (Glimmer VM
version that landed in Ember 3.22) we moved the internal infrastructure
to ensure **everything** was in a tracking frame. This greatly increased
the number of locations that would now fall under the standard read +
write assertions.

For example, in glimmer-vm@0.56 the following would run without error:

```js
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

export default class extends Component {
  @tracked counter = 0;

    constructor() {
      super(...arguments);

      this.counter++;
    }
}
```

Now, obviously this is a bit contrived, but the point is that since
component construction was not previously within a tracking frame it
would **not** error due to the read then write of a tracked property.

As of glimmer-vm@0.60+ we **do** run this within a tracking frame
(because nearly everything is automatically within a tracking frame).

---

This change ensures that the (previously untracked) construction of
components, modifiers, and helpers trigger a deprecation **not** an
assertion when mutating a previously read value within the constructor.
---
 .../glimmer/lib/component-managers/custom.ts  | 14 ++++-
 .../glimmer/lib/modifiers/custom.ts           | 31 ++++++++---
 .../components/curly-components-test.js       | 25 +++++++++
 .../custom-component-manager-test.js          | 32 ++++++++++-
 .../custom-modifier-manager-test.js           | 44 +++++++++++++++
 .../integration/helpers/custom-helper-test.js |  4 +-
 .../helpers/helper-manager-test.js            | 54 +++++++++++++++++++
 .../tests/integration/helpers/tracked-test.js |  4 +-
 .../metal/tests/tracked/validation_test.js    |  4 +-
 9 files changed, 196 insertions(+), 16 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
index 02f1093e39b..f55e5c03c9c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
@@ -1,5 +1,6 @@
 import { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
 import {
   Arguments,
   ComponentCapabilities,
@@ -24,6 +25,7 @@ import {
   buildCapabilities,
   registerDestructor,
 } from '@glimmer/runtime';
+import { deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
 import { argsProxyFor } from '../utils/args-proxy';
 
 const CAPABILITIES = {
@@ -136,11 +138,19 @@ export default class CustomComponentManager<ComponentInstance>
     let { delegate } = definition;
     let args = argsProxyFor(vmArgs.capture(), 'component');
 
-    let component = delegate.createComponent(definition.ComponentClass.class!, args);
+    let component;
+
+    if (DEBUG && deprecateMutationsInTrackingTransaction !== undefined) {
+      deprecateMutationsInTrackingTransaction(() => {
+        component = delegate.createComponent(definition.ComponentClass.class!, args);
+      });
+    } else {
+      component = delegate.createComponent(definition.ComponentClass.class!, args);
+    }
 
     let bucket = new CustomComponentState(delegate, component, args, env);
 
-    return bucket;
+    return bucket as CustomComponentState<ComponentInstance>;
   }
 
   getDebugName({ name }: CustomComponentDefinitionState<ComponentInstance>): string {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
index 88a12791e69..9ba2a1154e1 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
@@ -10,7 +10,12 @@ import {
   VMArguments,
 } from '@glimmer/interfaces';
 import { buildCapabilities, registerDestructor, reifyArgs } from '@glimmer/runtime';
-import { createUpdatableTag, untrack, UpdatableTag } from '@glimmer/validator';
+import {
+  createUpdatableTag,
+  deprecateMutationsInTrackingTransaction,
+  untrack,
+  UpdatableTag,
+} from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { argsProxyFor } from '../utils/args-proxy';
 
@@ -111,10 +116,22 @@ class InteractiveCustomModifierManager<ModifierInstance>
     let { useArgsProxy, passFactoryToCreate } = delegate.capabilities;
 
     let args = useArgsProxy ? argsProxyFor(capturedArgs, 'modifier') : reifyArgs(capturedArgs);
-    let instance = delegate.createModifier(
-      passFactoryToCreate ? ModifierClass : ModifierClass.class,
-      args
-    );
+
+    let instance: ModifierInstance;
+
+    if (DEBUG && deprecateMutationsInTrackingTransaction !== undefined) {
+      deprecateMutationsInTrackingTransaction(() => {
+        instance = delegate.createModifier(
+          passFactoryToCreate ? ModifierClass : ModifierClass.class,
+          args
+        );
+      });
+    } else {
+      instance = delegate.createModifier(
+        passFactoryToCreate ? ModifierClass : ModifierClass.class,
+        args
+      );
+    }
 
     let tag = createUpdatableTag();
     let state: CustomModifierState<ModifierInstance>;
@@ -124,14 +141,14 @@ class InteractiveCustomModifierManager<ModifierInstance>
         element,
         delegate,
         args,
-        modifier: instance,
+        modifier: instance!,
       };
     } else {
       state = {
         tag,
         element,
         delegate,
-        modifier: instance,
+        modifier: instance!,
         get args() {
           return reifyArgs(capturedArgs);
         },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index d7ef5142163..614380f0492 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3801,6 +3801,31 @@ moduleFor(
 
       runTask(() => set(this.context, 'cond', false));
     }
+
+    '@test tracked property mutation in init does not error'() {
+      // TODO: this should issue a deprecation, but since the curly manager
+      // uses an untracked frame for construction we don't (yet)
+      this.registerComponent('foo-bar', {
+        template: `{{this.itemCount}}`,
+        ComponentClass: class extends Component {
+          @tracked itemCount = 0;
+
+          init() {
+            super.init(...arguments);
+
+            // first read the tracked property
+            let { itemCount } = this;
+
+            // then attempt to update the tracked property
+            this.itemCount = itemCount + 1;
+          }
+        },
+      });
+
+      this.render('<FooBar />');
+
+      this.assertComponentElement(this.firstChild, { content: '1' });
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 36fe9447b60..b8d014e071c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -2,7 +2,7 @@ import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { set, setProperties, computed } from '@ember/-internals/metal';
+import { set, setProperties, computed, tracked } from '@ember/-internals/metal';
 import { setComponentManager, capabilities } from '@ember/-internals/glimmer';
 
 const BasicComponentManager = EmberObject.extend({
@@ -897,5 +897,35 @@ moduleFor(
 
       assert.verifySteps([]);
     }
+
+    '@test tracked property mutation in constructor issues a deprecation'() {
+      let ComponentClass = setComponentManager(
+        createBasicManager,
+        class extends EmberObject {
+          @tracked itemCount = 0;
+
+          init() {
+            super.init(...arguments);
+
+            // first read the tracked property
+            let { itemCount } = this;
+
+            // then attempt to update the tracked property
+            this.itemCount = itemCount + 1;
+          }
+        }
+      );
+
+      this.registerComponent('foo-bar', {
+        template: `{{this.itemCount}}`,
+        ComponentClass,
+      });
+
+      expectDeprecation(() => {
+        this.render('<FooBar />');
+      }, /You attempted to update `itemCount` on `<.*>`, but it had already been used previously in the same computation/);
+
+      this.assertHTML(`1`);
+    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 32752394b11..8a9b5aac686 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -235,6 +235,50 @@ class ModifierManagerTest extends RenderingTestCase {
     assert.equal(updateCount, 2);
   }
 
+  '@test provides a helpful deprecation when mutating a tracked value that was consumed already within constructor'(
+    assert
+  ) {
+    let ModifierClass = setModifierManager(
+      (owner) => {
+        return new this.CustomModifierManager(owner);
+      },
+      class {
+        static create() {
+          return new this();
+        }
+
+        @tracked foo = 123;
+
+        constructor() {
+          // first read the tracked property
+          this.foo;
+
+          // then attempt to update the tracked property
+          this.foo = 456;
+        }
+
+        didInsertElement() {}
+        didUpdate() {}
+        willDestroyElement() {}
+      }
+    );
+
+    this.registerModifier(
+      'foo-bar',
+      class extends ModifierClass {
+        didInsertElement() {
+          assert.ok(true, 'modifiers didInsertElement was called');
+        }
+      }
+    );
+
+    let expectedMessage = backtrackingMessageFor('foo');
+
+    expectDeprecation(() => {
+      this.render('<h1 {{foo-bar}}>hello world</h1>');
+    }, expectedMessage);
+  }
+
   '@test provides a helpful assertion when mutating a value that was consumed already'() {
     class Person {
       @tracked name = 'bob';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 74d5d4e3553..a11cea0e794 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -729,7 +729,7 @@ moduleFor(
       }, expectedMessage);
     }
 
-    ['@test class-based helper gives helpful assertion when mutating a tracked property that was tracked already']() {
+    ['@test class-based helper gives helpful deprecation when mutating a tracked property that was tracked already']() {
       this.add(
         'helper:hello-world',
         class HelloWorld extends Helper {
@@ -746,7 +746,7 @@ moduleFor(
         renderTree: ['\\(result of a `<HelloWorld.*?>` helper\\)'],
       });
 
-      expectAssertion(() => {
+      expectDeprecation(() => {
         this.render('{{hello-world}}');
       }, expectedMessage);
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 8b48cb65819..06d71be24f5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -319,6 +319,60 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
 
         assert.verifySteps([]);
       }
+
+      '@test custom helpers gives helpful assertion when reading then mutating a tracked value within constructor'() {
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            @tracked foo = 123;
+
+            constructor() {
+              super(...arguments);
+
+              // first read the tracked property
+              this.foo;
+
+              // then attempt to update the tracked property
+              this.foo = 456;
+            }
+
+            value() {
+              return this.foo;
+            }
+          }
+        );
+
+        let expectedMessage = backtrackingMessageFor('foo');
+
+        expectAssertion(() => {
+          this.render('{{hello}}');
+        }, expectedMessage);
+      }
+
+      '@test custom helpers gives helpful assertion when reading then mutating a tracked value within value'() {
+        this.registerCustomHelper(
+          'hello',
+          class extends TestHelper {
+            @tracked foo = 123;
+
+            value() {
+              // first read the tracked property
+              this.foo;
+
+              // then attempt to update the tracked property
+              this.foo = 456;
+            }
+          }
+        );
+
+        let expectedMessage = backtrackingMessageFor('foo', '.*', {
+          renderTree: ['\\(result of a `TEST_HELPER` helper\\)'],
+        });
+
+        expectAssertion(() => {
+          this.render('{{hello}}');
+        }, expectedMessage);
+      }
     }
   );
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index b0a44ffeb31..d21570e7ca4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -429,7 +429,7 @@ moduleFor(
       }, expectedMessage);
     }
 
-    '@test simple helper gives helpful assertion when mutating a tracked property that was tracked already'() {
+    '@test simple helper gives helpful deprecation when mutating a tracked property that was tracked already'() {
       class Person {
         @tracked name = 'bob';
       }
@@ -443,7 +443,7 @@ moduleFor(
         renderTree: ['\\(result of a `\\(unknown function\\)` helper\\)'],
       });
 
-      expectAssertion(() => {
+      expectDeprecation(() => {
         this.render('{{hello-world this.model}}', { model: new Person() });
       }, expectedMessage);
     }
diff --git a/packages/@ember/-internals/metal/tests/tracked/validation_test.js b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
index e240efb1916..1aa090cd903 100644
--- a/packages/@ember/-internals/metal/tests/tracked/validation_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
@@ -378,7 +378,7 @@ moduleFor(
       }, /You attempted to update `value` on `EmberObject`, but it had already been used previously in the same computation/);
     }
 
-    ['@test gives helpful assertion when a tracked property is mutated after access within unknownProperty within an autotracking transaction']() {
+    ['@test gives helpful deprecation when a tracked property is mutated after access within unknownProperty within an autotracking transaction']() {
       class EmberObject {
         @tracked foo;
 
@@ -390,7 +390,7 @@ moduleFor(
 
       let obj = new EmberObject();
 
-      expectAssertion(() => {
+      expectDeprecation(() => {
         track(() => {
           get(obj, 'bar');
         });

From f1f7342774b7e4ba2ccc4266f8e4bfcc2120af88 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 23 Nov 2020 13:54:07 -0500
Subject: [PATCH 0256/1405] Add v3.23.1 to CHANGELOG.md.

(cherry picked from commit 2a89d9a1a6692f4c58545810cd355e2f866b3284)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57931b29860..815f30eaf6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.23.1 (November 23, 2020)
+
+- [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
+
 ### v3.24.0-beta.1 (November 16, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 

From 1ab7655311bfba8f9d329273292b2650346930e0 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 24 Nov 2020 00:39:25 -0500
Subject: [PATCH 0257/1405] Fixup, put beta after point release in CHANGELOG

(cherry picked from commit 587bd3aa992193a279c2c447a8c2c30d5a3a1871)
---
 CHANGELOG.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 815f30eaf6e..f481848e303 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,5 @@
 # Ember Changelog
 
-### v3.23.1 (November 23, 2020)
-
-- [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
-
 ### v3.24.0-beta.1 (November 16, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 
@@ -21,6 +17,10 @@
 - [#19238](https://github.com/emberjs/ember.js/pull/19238) [CLEANUP] Removes the `expandLocalLookup` API
 - [#19258](https://github.com/emberjs/ember.js/pull/19258) / [#19261](https://github.com/emberjs/ember.js/pull/19261) / [#19267](https://github.com/emberjs/ember.js/pull/19267) Update rendering engine to 0.65.0
 
+### v3.23.1 (November 23, 2020)
+
+- [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
+
 ### v3.23.0 (November 16, 2020)
 
 - [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).

From 6d01209f8a7c9ecdaacc18d06e8e5e304f027244 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 25 Nov 2020 17:24:19 -0500
Subject: [PATCH 0258/1405] Add v3.22.2 to CHANGELOG.md.

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f481848e303..17a353a8cfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,11 @@
 - [#19221](https://github.com/emberjs/ember.js/pull/19221) [BUGFIX] Ensure fn and (mut) work with falsy values
 - [#19213](https://github.com/emberjs/ember.js/pull/19213) [BUGFIX] Update rendering engine to improve error ergonomics.
 
+### v3.22.2 (November 25, 2020)
+
+- [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
+- [#19263](https://github.com/emberjs/ember.js/pull/19263) [BUGFIX] Remove `@dependentKeyCompat` assertion
+
 ### v3.22.1 (November 10, 2020)
 
 - [#19193](https://github.com/emberjs/ember.js/pull/19193) [BUGFIX] Ensure `@ember/component` user lifecycle hooks are untracked

From 1ae3f13e5be1dc949045e7061b924fc0fa3ec47a Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 24 Nov 2020 00:40:42 -0500
Subject: [PATCH 0259/1405] Add v3.24.0-beta.2 to CHANGELOG

(cherry picked from commit 46d27a0194009d39eb22b4f62e7033b8498bdef0)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17a353a8cfd..c3351fafa68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.24.0-beta.2 (November 24, 2020)
+
+- [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
+
 ### v3.24.0-beta.1 (November 16, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 

From 0c2f1f8961b62d13c82aaa65574a2ee2864592b7 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 17 Oct 2020 07:55:25 -0700
Subject: [PATCH 0260/1405] Update to Glimmer VM 0.67.0, integrate opcode
 compiler refactors

[Release notes](https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.67.0)
---
 package.json                                  |  18 +-
 packages/@ember/-internals/glimmer/index.ts   |   4 -
 .../@ember/-internals/glimmer/lib/renderer.ts |  18 +-
 .../@ember/-internals/glimmer/lib/syntax.ts   |  85 -------
 .../integration/helpers/custom-helper-test.js |  43 +++-
 .../syntax/experimental-syntax-test.js        |  41 ----
 .../tests/component_registration_test.js      |   8 +-
 yarn.lock                                     | 212 +++++++++---------
 8 files changed, 161 insertions(+), 268 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/syntax.ts
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js

diff --git a/package.json b/package.json
index 797ace52b26..19d4aa53742 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,16 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.66.1",
+    "@glimmer/compiler": "0.67.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.66.1",
-    "@glimmer/interfaces": "0.66.1",
-    "@glimmer/node": "0.66.1",
-    "@glimmer/opcode-compiler": "0.66.1",
-    "@glimmer/program": "0.66.1",
-    "@glimmer/reference": "0.66.1",
-    "@glimmer/runtime": "0.66.1",
-    "@glimmer/validator": "0.66.1",
+    "@glimmer/global-context": "0.67.0",
+    "@glimmer/interfaces": "0.67.0",
+    "@glimmer/node": "0.67.0",
+    "@glimmer/opcode-compiler": "0.67.0",
+    "@glimmer/program": "0.67.0",
+    "@glimmer/reference": "0.67.0",
+    "@glimmer/runtime": "0.67.0",
+    "@glimmer/validator": "0.67.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index eee2fdb43cc..bfc142eedbb 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -387,10 +387,6 @@ export {
 } from './lib/template_registry';
 export { setupEngineRegistry, setupApplicationRegistry } from './lib/setup-registry';
 export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/dom';
-export {
-  registerMacros as _registerMacros,
-  experimentalMacros as _experimentalMacros,
-} from './lib/syntax';
 
 // needed for test
 // TODO just test these through public API
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 76f7e309144..3d59fcafc18 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -6,6 +6,7 @@ import { backburner, getCurrentRunLoop } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
+  CompileTimeCompilationContext,
   Cursor,
   DebugRenderTree,
   DynamicScope as GlimmerDynamicScope,
@@ -14,11 +15,10 @@ import {
   Option,
   RenderResult,
   RuntimeContext,
-  SyntaxCompilationContext,
   Template,
   TemplateFactory,
 } from '@glimmer/interfaces';
-import { syntaxCompilationContext } from '@glimmer/opcode-compiler';
+import { programCompilationContext } from '@glimmer/opcode-compiler';
 import { artifacts } from '@glimmer/program';
 import { createConstRef, Reference, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
 import {
@@ -32,7 +32,7 @@ import {
   renderMain,
   runtimeContext,
 } from '@glimmer/runtime';
-import { unwrapHandle, unwrapTemplate } from '@glimmer/util';
+import { unwrapTemplate } from '@glimmer/util';
 import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
 import { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
 import RSVP from 'rsvp';
@@ -43,7 +43,6 @@ import { RootComponentDefinition } from './component-managers/root';
 import { NodeDOMTreeConstruction } from './dom';
 import { EmberEnvironmentDelegate } from './environment';
 import RuntimeResolver from './resolver';
-import { populateMacros } from './syntax';
 import { Component } from './utils/curly-component-state-bucket';
 import { OutletState } from './utils/outlet';
 import OutletView from './views/outlet';
@@ -117,7 +116,7 @@ class RootState {
   constructor(
     public root: Component | OutletView,
     public runtime: RuntimeContext,
-    context: SyntaxCompilationContext,
+    context: CompileTimeCompilationContext,
     template: Template,
     self: Reference<unknown>,
     parentElement: SimpleElement,
@@ -135,14 +134,13 @@ class RootState {
 
     this.render = errorLoopTransaction(() => {
       let layout = unwrapTemplate(template).asLayout();
-      let handle = layout.compile(context);
 
       let iterator = renderMain(
         runtime,
         context,
         self,
         builder(runtime.env, { element: parentElement, nextSibling: null }),
-        unwrapHandle(handle),
+        layout,
         dynamicScope
       );
 
@@ -281,7 +279,7 @@ export abstract class Renderer {
   private _builder: IBuilder;
   private _inRenderTransaction = false;
 
-  private _context: SyntaxCompilationContext;
+  private _context: CompileTimeCompilationContext;
   private _runtime: RuntimeContext;
 
   private _lastRevision = -1;
@@ -311,9 +309,7 @@ export abstract class Renderer {
 
     let sharedArtifacts = artifacts();
 
-    let context = (this._context = syntaxCompilationContext(sharedArtifacts, compileTimeResolver));
-
-    populateMacros(context.macros);
+    this._context = programCompilationContext(sharedArtifacts, compileTimeResolver);
 
     let runtimeEnvironmentDelegate = new EmberEnvironmentDelegate(owner, env.isInteractive);
     this._runtime = runtimeContext(
diff --git a/packages/@ember/-internals/glimmer/lib/syntax.ts b/packages/@ember/-internals/glimmer/lib/syntax.ts
deleted file mode 100644
index b18c22354f1..00000000000
--- a/packages/@ember/-internals/glimmer/lib/syntax.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Owner } from '@ember/-internals/owner';
-import { assert } from '@ember/debug';
-import {
-  Core,
-  MacroContext,
-  Macros,
-  NamedBlocks,
-  Option,
-  StatementCompileActions,
-  Unhandled,
-} from '@glimmer/interfaces';
-import { EMPTY_BLOCKS, NONE, staticComponent, UNHANDLED } from '@glimmer/opcode-compiler';
-import { hashToArgs } from './syntax/utils';
-
-export const experimentalMacros: any[] = [];
-
-// This is a private API to allow for experimental macros
-// to be created in user space. Registering a macro should
-// should be done in an initializer.
-export function registerMacros(macro: any) {
-  experimentalMacros.push(macro);
-}
-
-function refineInlineSyntax(
-  name: string,
-  params: Option<Core.Params>,
-  hash: Option<Core.Hash>,
-  context: MacroContext
-): StatementCompileActions | Unhandled {
-  let component = context.resolver.lookupComponent(name, context.meta.owner!);
-
-  if (component !== null) {
-    return staticComponent(component, [params, hashToArgs(hash), EMPTY_BLOCKS]);
-  }
-
-  return UNHANDLED;
-}
-
-function refineBlockSyntax(
-  name: string,
-  params: Core.Params,
-  hash: Core.Hash,
-  blocks: NamedBlocks,
-  context: MacroContext
-): StatementCompileActions {
-  let handle = context.resolver.lookupComponent(name, context.meta.owner!);
-
-  if (handle !== null) {
-    return staticComponent(handle, [params, hashToArgs(hash), blocks]);
-  }
-
-  assert(
-    `A component or helper named "${name}" could not be found`,
-    (context.meta.owner as Owner).hasRegistration(`helper:${name}`)
-  );
-
-  assert(
-    `Helpers may not be used in the block form, for example {{#${name}}}{{/${name}}}. Please use a component, or alternatively use the helper in combination with a built-in Ember helper, for example {{#if (${name})}}{{/if}}.`,
-    !(() => {
-      const resolver = context.resolver['resolver'];
-      const owner = context.meta.owner as Owner;
-
-      if (name === 'component' || resolver['builtInHelpers'][name]) {
-        return true;
-      }
-      return owner.hasRegistration(`helper:${name}`);
-    })()
-  );
-
-  return NONE;
-}
-
-export function populateMacros(macros: Macros) {
-  let { inlines, blocks } = macros;
-
-  inlines.addMissing(refineInlineSyntax);
-  blocks.addMissing(refineBlockSyntax);
-
-  for (let i = 0; i < experimentalMacros.length; i++) {
-    let macro = experimentalMacros[i];
-    macro(blocks, inlines);
-  }
-
-  return { blocks, inlines };
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index a11cea0e794..83cb108e001 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -460,40 +460,59 @@ moduleFor(
       this.assertHTML('<div data-foo-bar="baz"></div>');
     }
 
-    ['@test simple helper not usable with a block']() {
+    ['@test simple helper not usable with a block'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
       this.registerHelper('some-helper', () => {});
 
-      expectAssertion(() => {
+      assert.throws(() => {
         this.render(`{{#some-helper}}{{/some-helper}}`);
-      }, /Helpers may not be used in the block form/);
+      }, /Attempted to resolve `some-helper`, which was expected to be a component, but nothing was found./);
     }
 
-    ['@test class-based helper not usable with a block']() {
+    ['@test class-based helper not usable with a block'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
       this.registerHelper('some-helper', {
         compute() {},
       });
 
-      expectAssertion(() => {
+      assert.throws(() => {
         this.render(`{{#some-helper}}{{/some-helper}}`);
-      }, /Helpers may not be used in the block form/);
+      }, /Attempted to resolve `some-helper`, which was expected to be a component, but nothing was found./);
     }
 
-    ['@test simple helper not usable within element']() {
+    ['@test simple helper not usable within element'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
       this.registerHelper('some-helper', () => {});
 
-      this.assert.throws(() => {
+      assert.throws(() => {
         this.render(`<div {{some-helper}}></div>`);
-      }, /Error: Compile Error: Unexpected Modifier some-helper @ 0..0/);
+      }, /Attempted to resolve `some-helper`, which was expected to be a modifier, but nothing was found./);
     }
 
-    ['@test class-based helper not usable within element']() {
+    ['@test class-based helper not usable within element'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
       this.registerHelper('some-helper', {
         compute() {},
       });
 
-      this.assert.throws(() => {
+      assert.throws(() => {
         this.render(`<div {{some-helper}}></div>`);
-      }, /Error: Compile Error: Unexpected Modifier some-helper @ 0..0/);
+      }, /Attempted to resolve `some-helper`, which was expected to be a modifier, but nothing was found./);
     }
 
     ['@test class-based helper is torn down'](assert) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js
deleted file mode 100644
index 6c1d793b2d1..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/experimental-syntax-test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { moduleFor, RenderingTestCase, strip } from 'internal-test-helpers';
-
-import { _registerMacros, _experimentalMacros } from '@ember/-internals/glimmer';
-import { invokeStaticBlockWithStack } from '@glimmer/opcode-compiler';
-
-moduleFor(
-  'registerMacros',
-  class extends RenderingTestCase {
-    constructor() {
-      let originalMacros = _experimentalMacros.slice();
-
-      _registerMacros((blocks) => {
-        blocks.add('-test-block', (params, _hash, blocks) => {
-          return invokeStaticBlockWithStack(blocks.get('default'));
-        });
-      });
-
-      super(...arguments);
-      this.originalMacros = originalMacros;
-    }
-
-    teardown() {
-      _experimentalMacros.length = 0;
-      this.originalMacros.forEach((macro) => _experimentalMacros.push(macro));
-
-      super.teardown();
-    }
-
-    ['@test allows registering custom syntax via private API']() {
-      this.render(
-        strip`
-          {{#-test-block}}
-            hello world!
-          {{/-test-block}}
-        `
-      );
-
-      this.assertText('hello world!');
-    }
-  }
-);
diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
index a7215de7fce..d823efa1f51 100644
--- a/packages/ember/tests/component_registration_test.js
+++ b/packages/ember/tests/component_registration_test.js
@@ -4,6 +4,7 @@ import { Component } from '@ember/-internals/glimmer';
 import { compile } from 'ember-template-compiler';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { ENV } from '@ember/-internals/environment';
+import { DEBUG } from '@glimmer/env';
 
 moduleFor(
   'Application Lifecycle - Component Registration',
@@ -240,7 +241,12 @@ moduleFor(
     async ['@test Using name of component that does not exist'](assert) {
       this.addTemplate('application', `<div id='wrapper'>{{#no-good}} {{/no-good}}</div>`);
 
-      await assert.rejectsAssertion(this.visit('/'), /.* named "no-good" .*/);
+      if (DEBUG) {
+        await assert.rejectsAssertion(this.visit('/'), /Attempted to resolve `no-good`/);
+      } else {
+        // Rejects with a worse error message in production
+        await assert.rejects(this.visit('/'));
+      }
     }
   }
 );
diff --git a/yarn.lock b/yarn.lock
index e393a8819c9..170e3bac8c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,152 +1657,154 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.66.1.tgz#cfb988634d12038f41b2323ba19b1b9cf2b5cc28"
-  integrity sha512-O0spaPhowm88nncLut7p5pRm0ZTFzpGQFqGtQfSvqdAr/+i8KwMd515f5lqv/dJobXSzqP0ocXDZVoBKYd8Zkw==
-  dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/syntax" "0.66.1"
-    "@glimmer/util" "0.66.1"
-    "@glimmer/wire-format" "0.66.1"
+"@glimmer/compiler@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.67.0.tgz#fed033c725b73be7fa4f5200fe15616758bc6ca4"
+  integrity sha512-CCw31F1XYGm73iy2lrsowV9yr+aXAGauLaNWrO5N+ciEfFyIu21OZ8+/H79bYdJLisJILeCBKvy0hsYpmvCzHw==
+  dependencies:
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/syntax" "0.67.0"
+    "@glimmer/util" "0.67.0"
+    "@glimmer/wire-format" "0.67.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.66.1.tgz#ee15bbdd58e14872915db037b9ed7bbcee844378"
-  integrity sha512-noItjxOjKO/3KEgViqGZEfslSKOo9sjdHtxxMimQuvDP+ApjhA7sFjWLX+zJCS1fIsZGM0hzEWaNKEB1Pjg9Mw==
+"@glimmer/encoder@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.67.0.tgz#e7d8dff4a70734126ae47b5f923198253efbde2d"
+  integrity sha512-ryEDTyenOpuuiOc1mwQNPKE9rAVTZ/RNtVhhNJPSq/3q6aHL5/6/wHUUkHaZOZbG0T9EG0V0nCqPPCqZhq3IwQ==
   dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/vm" "0.66.1"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/vm" "0.67.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.66.1.tgz#3be91232e225bc0cac4920159f6f73c8761bc98d"
-  integrity sha512-dWdr6XUsVoZ8XXLYqaYFrz9O6amogb2q9QMDnrxjqurfhcc2Va7qaUM9e3qRyICwph6MsUgrDtX3SRA6dyRwJw==
+"@glimmer/global-context@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.67.0.tgz#041103738b6ec503d929684e342942023351b123"
+  integrity sha512-eeMwi+lQK8GbK2m/+HJSQaGKJogGEqJEZn8hGxHbG7zvHXA7TBQ5+c4vR2QXNWTMrOI7qDzCX9XnF3tlaxQPjQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.66.1.tgz#5b50b0dd6bcae19e7848d70b42f9466a184979be"
-  integrity sha512-opcDbSID3YqkUgOR15+IePfkoiJKRJh5pfxPXNw3xcwkptmbiSXNkfZGnPk4FZr4g+Jpem1CIGUDejtyaTTk3Q==
+"@glimmer/interfaces@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.67.0.tgz#fc68db956028f0ab9c655a53bb882d54fd34c24b"
+  integrity sha512-1yNs8kt8k4tzA6r9lO3ScX4zR6Jg9ymRqIFvDtam1twNoRQBFHNwfpTqPU4X5mq/4tOcgtWA8FNv5/jBIOaOew==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.66.1.tgz#f6d74845ba51e8090033d01a571699f15e35dd0c"
-  integrity sha512-IaIgcd0sJBaF5N6bnOB6MQKB8ObJQJ98CRcFfTf8sw9DvGp8DGL+M/QmOnERUSc28pk76k+z4JOtcbVCaA1NxA==
+"@glimmer/low-level@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.67.0.tgz#d70383ed93f63feb1710f03ad8b09dff83b1f08a"
+  integrity sha512-rgBNMz9iTaIrJJ1TUyOoiWzQv3CH7TxYuApSMrZ6tlXh7QpZ7Wfsnd44M+zLaJB7VAmRG4QfLwDee+I9OfTyeQ==
 
-"@glimmer/node@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.66.1.tgz#572477e89db8884b437cc2b080dde6c2529e7c19"
-  integrity sha512-/KLJ3Dal0rCHDkliS6sYUGmmkr1RlpLjhUIJvaKCXJMckKpiq+b1dkLdiqf+CGYShi2+vDDvSqiQbIAPzoMo1A==
+"@glimmer/node@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.67.0.tgz#7a34e3d215721f425e48007f656528c52c008341"
+  integrity sha512-bkfyuEkbanKdUfIdDi/1Pj/Swbg4Q0G0T7JvbTMN0L2tbj3NJSQNiBOPeN4FL2OZlRCt0ylGdWBKmeOgvyo2lQ==
   dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/runtime" "0.66.1"
-    "@glimmer/util" "0.66.1"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/runtime" "0.67.0"
+    "@glimmer/util" "0.67.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.66.1.tgz#38c676abdef62181d5a027e8240baeff71360871"
-  integrity sha512-ZgsP7WAW5+NR/FrTdC88Ejw9+ChiazGUUHNVF0WWwvaMzY9YuG3re1OHUdYFx8M7An4IRYd+8XgvqQb+9pi3pA==
-  dependencies:
-    "@glimmer/encoder" "0.66.1"
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/program" "0.66.1"
-    "@glimmer/reference" "0.66.1"
-    "@glimmer/util" "0.66.1"
-    "@glimmer/vm" "0.66.1"
-    "@glimmer/wire-format" "0.66.1"
-
-"@glimmer/program@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.66.1.tgz#b0387586819977ed4464db7219d76c116d51ff40"
-  integrity sha512-9fpiZqNcRqLXyBAbIP+mM+WSiMaeYmP6vT3bGrBTBMTnsK+5ZbdhqOS16bANsB+5V4qridr8RDXf7OEBJz+Msw==
-  dependencies:
-    "@glimmer/encoder" "0.66.1"
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
-
-"@glimmer/reference@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.66.1.tgz#b61d44d78d44eb3b4bbf62cdb0dc0e4ea9600302"
-  integrity sha512-ifd2g614YzrDfHcZWTiglHVFv/x9lym79hB92GSYCiK73sl5oGUBodsbur084MfAMc1cNJEp06bXxTAoiguwLg==
+"@glimmer/opcode-compiler@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.67.0.tgz#0d855ab06a8936bf1fcf4683f7b157e7b7fe4087"
+  integrity sha512-mlLMa5N/uLEc13NU9AAUJjG4IU/5GZb0pXzYQY2Y37hCpGqsJLyoVcyuEseSlSGbyd9tkOrIl3mIZvxcE7IClg==
+  dependencies:
+    "@glimmer/encoder" "0.67.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/program" "0.67.0"
+    "@glimmer/reference" "0.67.0"
+    "@glimmer/util" "0.67.0"
+    "@glimmer/vm" "0.67.0"
+    "@glimmer/wire-format" "0.67.0"
+
+"@glimmer/program@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.67.0.tgz#1f36062df5cc6718334fe4d88bb7ae50f44f8ce4"
+  integrity sha512-fdZSl+eabrj/kXO5el1xt8HNuLRRUDUN3Yu4qWLScm8qGw+b4iZIiajQCFNTXzn0mz6lvNW0XyQ6a76URLmk9A==
+  dependencies:
+    "@glimmer/encoder" "0.67.0"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
+
+"@glimmer/reference@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.67.0.tgz#2983167fcb90e5f7a24e00a5eb13c50bf266cf3d"
+  integrity sha512-Qopa+sNhIvAZ4lb4hlAUPrPx7h19yOLlfqho3zgwTJoEQAyhUqalqeH5lr+xIC4r2uV6yCcLd3C27BLYxN342Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.1"
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
-    "@glimmer/validator" "0.66.1"
+    "@glimmer/global-context" "0.67.0"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
+    "@glimmer/validator" "0.67.0"
 
-"@glimmer/runtime@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.66.1.tgz#5a628db0fb1af63b898b73fa47c30f5aae44ac55"
-  integrity sha512-c6OFkPl4FSM3lAqjHx3V/bQwjW/SBvzrh5kmbul6YC+yod9+V5cI8HND35ZFelAandEpzxcqe5MclnYDBNJ2Sg==
+"@glimmer/runtime@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.67.0.tgz#188ad893e1fade94879d6814ddd5b953eba1a2f8"
+  integrity sha512-xslPdm+OIC57xQ3fUdIPM2wj/sG1OtoIWLq0C2gJw6cR1wQ5zSi6Az79AD5oUQdeiUzEr5BfTaEgsvXHhoHs+w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.66.1"
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/low-level" "0.66.1"
-    "@glimmer/program" "0.66.1"
-    "@glimmer/reference" "0.66.1"
-    "@glimmer/util" "0.66.1"
-    "@glimmer/validator" "0.66.1"
-    "@glimmer/vm" "0.66.1"
-    "@glimmer/wire-format" "0.66.1"
+    "@glimmer/global-context" "0.67.0"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/low-level" "0.67.0"
+    "@glimmer/program" "0.67.0"
+    "@glimmer/reference" "0.67.0"
+    "@glimmer/util" "0.67.0"
+    "@glimmer/validator" "0.67.0"
+    "@glimmer/vm" "0.67.0"
+    "@glimmer/wire-format" "0.67.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.66.1.tgz#901b9d0253ad5ac1f7f8199de0ef43c98c209a63"
-  integrity sha512-hzYhlfWzu5c8K7ZtTh3bSdpT5a6efxN1NsKUvGE5p1TC9XGOZuKogq/fRtlK2UGBUazEh5fvTu7qmQ8dTU1dWA==
+"@glimmer/syntax@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.67.0.tgz#2aaa5ba451671ee869285463b9711dbec1c843e2"
+  integrity sha512-9eRjAF3oD0RyWzptincQT/ucWxxgMhYrhumizxCJDGWTpk8GCpAMoKjEK2D1eryVEaF3KknGS9ba3/oakGkpzg==
   dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.66.1.tgz#53c5e12f121011f44c018dba6bcaa936133ffd24"
-  integrity sha512-pB7VEpCmC5hmehQdED7HJJEKFdGPsO6LHGl4LtRHHQptlyKTxotTxevDbzGuIxbsDpGPT+4e3g1rlEAfnC51/Q==
+"@glimmer/util@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.67.0.tgz#7f19320826e926a2fe80abb44512f9898f6df6d8"
+  integrity sha512-iDio1mKJgdtvo9GT/d4QL/pvUzAxQOM7m/3fAY3pX2CAa25jwEwpUh7fNN+F3iEFkJWiDJusSPY/K3RPMfAoXg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.66.1"
+    "@glimmer/interfaces" "0.67.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.66.1.tgz#46bf25b2a8b819570d9fca0a248185ca07b8ec2a"
-  integrity sha512-9mhSCfe9R8TgTnHtOZuVTzsO9/Ej0gwRun1SQtQu5WK7Lamg0XPhluWVV46GcFv6w6NkopStCfoHIrounXTnpA==
+"@glimmer/validator@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.67.0.tgz#9d50db47152786c4e7d4304a73c498c53afc7886"
+  integrity sha512-PQsTPU1N0erGtWVoHwkQ9N/jMb3iMoclyaBe3rVbxs6RSjYeafaxAqwN8rJ+Gd+OWQscD4tjPPguTW/iGQVlYQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.66.1"
+    "@glimmer/global-context" "0.67.0"
 
-"@glimmer/vm@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.66.1.tgz#c6c6e248b3ed574a3bfb21208f8e5afa8f9fe7f6"
-  integrity sha512-VmesyuROi29KGycLe2vzaTnMU74kirCEPCHbTVTxxvFkJHY3ljtpZVpS0OIl9kMnbFQRWcR5X6sPIdPVdebySA==
+"@glimmer/vm@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.67.0.tgz#c31d7a2ea70ddd0da30fd5ce624311baef173942"
+  integrity sha512-tqAxnPKwSAFYW1y4vpTSnsRR/F3sJ3GSMx2lzgc5YaWElYI9JcPBIM0sobqnoheca7wABLTWdFZXbnW9N0n0TQ==
   dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
 
-"@glimmer/wire-format@0.66.1":
-  version "0.66.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.66.1.tgz#ad63764c3231e97397617d3e2c6a02a6fcff5047"
-  integrity sha512-TyffGOCJ/LykKev3G7IMEzicpvgip5+XZi3Shr/silMEtncrbDV9ryYkyOalfjWHHWa/XIHz+KAEXVJG3tYq1g==
+"@glimmer/wire-format@0.67.0":
+  version "0.67.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.67.0.tgz#a29eda6fac008509a2aa312209dc128611834ef5"
+  integrity sha512-YbRASQFsyKmVWgFF8SeAdoFSbrN9Zq8cfCvIjsx6JiiIelCgQ5fUtU8qZ9ww++5AYK6tQtVhkqM6DXyVMRVRjg==
   dependencies:
-    "@glimmer/interfaces" "0.66.1"
-    "@glimmer/util" "0.66.1"
+    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/util" "0.67.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From 49d5291600a0b6d70ff9913e10ff9f2f23e2eb7b Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 28 Nov 2020 12:56:43 -0800
Subject: [PATCH 0261/1405] Update Glimmer VM

Updates the VM to the latest version, which includes a number of major
changes:

- Refactors the resolver to not cache values, as this is unnecessary
- Refactors the resolver to return helper/modifier definitions directly
- Refactors the resolver to return ResolvedComponentDefinitions
- Updates various component definitions
- Removes custom helper, modifier, and component managers
- Updates built-in helpers to be based on objects with associated
  helpers/helper managers.
---
 broccoli/packages.js                          |   3 +
 package.json                                  |  21 +-
 packages/@ember/-internals/glimmer/index.ts   |   5 +-
 .../glimmer/lib/compile-time-lookup.ts        |  73 ----
 .../glimmer/lib/component-managers/curly.ts   | 137 ++-----
 .../glimmer/lib/component-managers/custom.ts  | 242 ------------
 .../component-managers/definition-state.ts    |  13 -
 .../lib/component-managers/internal.ts        |  47 +--
 .../glimmer/lib/component-managers/mount.ts   |  29 +-
 .../glimmer/lib/component-managers/outlet.ts  |  44 ++-
 .../glimmer/lib/component-managers/root.ts    |  34 +-
 .../lib/component-managers/template-only.ts   |  74 ----
 .../-internals/glimmer/lib/component.ts       |  18 +-
 .../glimmer/lib/components/input.ts           |   4 +-
 .../glimmer/lib/components/link-to.ts         |   3 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  26 +-
 ...sert-implicit-component-helper-argument.ts |   3 +-
 .../lib/helpers/-in-element-null-check.ts     |   3 +-
 .../glimmer/lib/helpers/-normalize-class.ts   |   5 +-
 .../glimmer/lib/helpers/-track-array.ts       |   5 +-
 .../-internals/glimmer/lib/helpers/action.ts  |  61 +--
 .../-internals/glimmer/lib/helpers/array.ts   |  11 +-
 .../-internals/glimmer/lib/helpers/concat.ts  |  11 +-
 .../-internals/glimmer/lib/helpers/each-in.ts |   5 +-
 .../-internals/glimmer/lib/helpers/fn.ts      |   5 +-
 .../-internals/glimmer/lib/helpers/get.ts     |   5 +-
 .../-internals/glimmer/lib/helpers/hash.ts    |  11 +-
 .../glimmer/lib/helpers/if-unless.ts          |   9 +-
 .../glimmer/lib/helpers/internal-helper.ts    |   6 +
 .../-internals/glimmer/lib/helpers/log.ts     |   5 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |   5 +-
 .../glimmer/lib/helpers/query-param.ts        |   5 +-
 .../glimmer/lib/helpers/readonly.ts           |   5 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |   5 +-
 .../glimmer/lib/modifiers/action.ts           |  13 +-
 .../glimmer/lib/modifiers/custom.ts           | 227 ------------
 .../glimmer/lib/modifiers/internal.ts         |   7 +-
 .../-internals/glimmer/lib/modifiers/on.ts    |  35 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |  26 +-
 .../@ember/-internals/glimmer/lib/resolver.ts | 346 ++++++------------
 .../-internals/glimmer/lib/setup-registry.ts  |   3 -
 .../-internals/glimmer/lib/syntax/mount.ts    | 117 +++---
 .../-internals/glimmer/lib/syntax/outlet.ts   |   5 +-
 .../glimmer/lib/templates/component.d.ts      |   3 -
 .../glimmer/lib/templates/component.hbs       |   1 -
 .../glimmer/lib/utils/args-proxy.ts           | 210 -----------
 .../lib/utils/curly-component-state-bucket.ts |   2 +-
 .../-internals/glimmer/lib/utils/managers.ts  |   2 +-
 .../glimmer/lib/utils/process-args.ts         |   2 +-
 .../application/debug-render-tree-test.ts     |  16 +-
 .../angle-bracket-invocation-test.js          |   3 +-
 .../components/component-template-test.js     |   2 +-
 .../components/contextual-components-test.js  |  19 +-
 .../components/dynamic-components-test.js     |  23 +-
 .../template-only-components-test.js          |  15 +-
 .../custom-component-manager-test.js          |  23 +-
 .../custom-modifier-manager-test.js           |   3 +-
 .../helpers/helper-manager-test.js            |  40 +-
 .../integration/helpers/invoke-helper-test.js |  41 ++-
 .../tests/integration/modifiers/on-test.js    |   6 +-
 .../tests/unit/runtime-resolver-cache-test.js |   2 +-
 .../tests/utils/glimmerish-component.js       |   5 +-
 packages/@ember/-internals/meta/lib/meta.ts   |   2 +-
 packages/@ember/-internals/metal/index.ts     |   2 +-
 .../@ember/-internals/metal/lib/computed.ts   |   2 +-
 .../@ember/-internals/metal/lib/observer.ts   |   2 +-
 packages/@ember/-internals/metal/lib/tags.ts  |  13 +-
 .../metal/tests/accessors/get_test.js         |   2 +-
 .../-internals/metal/tests/alias_test.js      |   2 +-
 .../-internals/metal/tests/computed_test.js   |   2 +-
 .../metal/tests/mixin/observer_test.js        |   2 +-
 .../-internals/metal/tests/observer_test.js   |   2 +-
 .../metal/tests/performance_test.js           |   2 +-
 packages/@ember/-internals/owner/index.ts     |   2 +-
 .../tests/location/auto_location_test.js      |   2 +-
 .../-internals/runtime/lib/mixins/-proxy.js   |   2 +-
 .../runtime/lib/system/array_proxy.js         |   2 +-
 .../runtime/lib/system/core_object.js         |   3 +-
 .../runtime/tests/ext/function_test.js        |   2 +-
 .../tests/mixins/container_proxy_test.js      |   2 +-
 .../tests/mutable-array/removeObjects-test.js |   2 +-
 .../runtime/tests/system/core_object_test.js  |   2 +-
 .../tests/system/object/create_test.js        |   2 +-
 .../application/tests/application_test.js     |   1 -
 packages/@ember/component/template-only.ts    |  17 +-
 packages/@ember/destroyable/index.ts          |   4 +-
 packages/@ember/engine/tests/engine_test.js   |   1 -
 .../lib/helpers/custom.ts => helper/index.ts} | 167 +--------
 packages/@ember/modifier/index.ts             |   3 +-
 packages/ember/index.js                       |  13 +-
 packages/ember/tests/reexports_test.js        |  18 +-
 yarn.lock                                     | 241 ++++++------
 92 files changed, 780 insertions(+), 1874 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/templates/component.d.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/templates/component.hbs
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
 rename packages/@ember/{-internals/glimmer/lib/helpers/custom.ts => helper/index.ts} (69%)

diff --git a/broccoli/packages.js b/broccoli/packages.js
index e8d97866e0a..db25d4d7712 100644
--- a/broccoli/packages.js
+++ b/broccoli/packages.js
@@ -273,6 +273,9 @@ module.exports.glimmerES = function glimmerES(environment) {
   let glimmerEntries = [
     '@glimmer/node',
     '@simple-dom/document',
+    '@glimmer/manager',
+    '@glimmer/destroyable',
+    '@glimmer/owner',
     '@glimmer/opcode-compiler',
     '@glimmer/runtime',
   ];
diff --git a/package.json b/package.json
index 19d4aa53742..0b31bdcd78f 100644
--- a/package.json
+++ b/package.json
@@ -74,16 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.67.0",
+    "@glimmer/compiler": "0.68.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.67.0",
-    "@glimmer/interfaces": "0.67.0",
-    "@glimmer/node": "0.67.0",
-    "@glimmer/opcode-compiler": "0.67.0",
-    "@glimmer/program": "0.67.0",
-    "@glimmer/reference": "0.67.0",
-    "@glimmer/runtime": "0.67.0",
-    "@glimmer/validator": "0.67.0",
+    "@glimmer/global-context": "0.68.0",
+    "@glimmer/interfaces": "0.68.0",
+    "@glimmer/manager": "0.68.0",
+    "@glimmer/destroyable": "0.68.0",
+    "@glimmer/owner": "0.68.0",
+    "@glimmer/node": "0.68.0",
+    "@glimmer/opcode-compiler": "0.68.0",
+    "@glimmer/program": "0.68.0",
+    "@glimmer/reference": "0.68.0",
+    "@glimmer/runtime": "0.68.0",
+    "@glimmer/validator": "0.68.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index bfc142eedbb..7729ebecc57 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -361,7 +361,6 @@
 */
 
 export { templateFactory as template, templateCacheCounters } from '@glimmer/opcode-compiler';
-export { setComponentTemplate, getComponentTemplate } from '@glimmer/runtime';
 
 export { default as RootTemplate } from './lib/templates/root';
 export { default as Checkbox } from './lib/components/checkbox';
@@ -393,10 +392,8 @@ export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
 export { INVOKE } from './lib/helpers/action';
+export { default as on } from './lib/modifiers/on';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export { setComponentManager } from './lib/utils/managers';
-export { capabilities } from './lib/component-managers/custom';
-export { capabilities as modifierCapabilities } from './lib/modifiers/custom';
-export { helperCapabilities, invokeHelper } from './lib/helpers/custom';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
diff --git a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts b/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
deleted file mode 100644
index e62cf9ec0e5..00000000000
--- a/packages/@ember/-internals/glimmer/lib/compile-time-lookup.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Owner } from '@ember/-internals/owner';
-import {
-  CompileTimeComponent,
-  CompileTimeResolver,
-  ComponentDefinition,
-  InternalComponentCapabilities,
-  InternalComponentManager,
-  Option,
-  WithStaticLayout,
-} from '@glimmer/interfaces';
-import { unwrapTemplate } from '@glimmer/util';
-import RuntimeResolver from './resolver';
-
-interface StaticComponentManager
-  extends WithStaticLayout<unknown, unknown>,
-    InternalComponentManager<unknown, unknown> {}
-
-function isStaticComponentManager(
-  _manager: InternalComponentManager,
-  capabilities: InternalComponentCapabilities
-): _manager is StaticComponentManager {
-  return !capabilities.dynamicLayout;
-}
-
-export default class CompileTimeResolverImpl implements CompileTimeResolver<Owner> {
-  constructor(private resolver: RuntimeResolver) {}
-
-  lookupHelper(name: string, owner: Owner): Option<number> {
-    return this.resolver.lookupHelper(name, owner);
-  }
-
-  lookupModifier(name: string, owner: Owner): Option<number> {
-    return this.resolver.lookupModifier(name, owner);
-  }
-
-  lookupComponent(name: string, owner: Owner): Option<CompileTimeComponent> {
-    let definitionHandle = this.resolver.lookupComponentHandle(name, owner);
-
-    if (definitionHandle === null) {
-      return null;
-    }
-
-    const { manager, state } = this.resolver.resolve<ComponentDefinition<unknown, unknown>>(
-      definitionHandle
-    );
-    const capabilities = manager.getCapabilities(state);
-
-    if (!isStaticComponentManager(manager, capabilities)) {
-      return {
-        handle: definitionHandle,
-        capabilities,
-        compilable: null,
-      };
-    }
-
-    let template = unwrapTemplate(manager.getStaticLayout(state));
-    let layout = capabilities.wrapped ? template.asWrappedLayout() : template.asLayout();
-
-    return {
-      handle: definitionHandle,
-      capabilities,
-      compilable: layout,
-    };
-  }
-
-  lookupPartial(name: string, owner: Owner): Option<number> {
-    return this.resolver.lookupPartial(name, owner);
-  }
-
-  resolve(): null {
-    return null;
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 2bffb2280dd..05ec993483d 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,6 +1,5 @@
-import { privatize as P } from '@ember/-internals/container';
-import { getOwner } from '@ember/-internals/owner';
-import { guidFor } from '@ember/-internals/utils';
+import { Factory, getOwner } from '@ember/-internals/owner';
+import { enumerableSymbol, guidFor, symbol } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
 import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
@@ -9,16 +8,16 @@ import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
-  ComponentDefinition,
+  CompilableProgram,
   Destroyable,
   ElementOperations,
   Environment,
   InternalComponentCapabilities,
   Option,
   PreparedArguments,
-  Template,
   TemplateFactory,
   VMArguments,
+  WithCreateInstance,
   WithDynamicLayout,
   WithDynamicTagName,
 } from '@glimmer/interfaces';
@@ -29,8 +28,8 @@ import {
   Reference,
   valueForRef,
 } from '@glimmer/reference';
-import { BaseInternalComponentManager, reifyPositional } from '@glimmer/runtime';
-import { EMPTY_ARRAY } from '@glimmer/util';
+import { reifyPositional } from '@glimmer/runtime';
+import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
 import {
   beginTrackFrame,
   beginUntrackFrame,
@@ -41,7 +40,6 @@ import {
   valueForTag,
 } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
-import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS } from '../component';
 import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
 import { isTemplateFactory } from '../template';
@@ -55,7 +53,13 @@ import {
 
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
-import DefinitionState from './definition-state';
+
+export const ARGS = enumerableSymbol('ARGS');
+export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
+
+export const DIRTY_TAG = symbol('DIRTY_TAG');
+export const IS_DISPATCHING_ATTRS = symbol('IS_DISPATCHING_ATTRS');
+export const BOUNDS = symbol('BOUNDS');
 
 const EMBER_VIEW_REF = createPrimitiveRef('ember-view');
 
@@ -109,17 +113,25 @@ function applyAttributeBindings(
   }
 }
 
-const DEFAULT_LAYOUT = P`template:components/-default`;
 const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
+type ComponentFactory = Factory<
+  Component,
+  {
+    create(props?: any): Component;
+    positionalParams: string | string[] | undefined | null;
+    name: string;
+  }
+>;
+
 export default class CurlyComponentManager
-  extends BaseInternalComponentManager<ComponentStateBucket, DefinitionState>
   implements
+    WithCreateInstance<ComponentStateBucket, Environment>,
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket> {
-  protected templateFor(component: Component): Template {
+  protected templateFor(component: Component): CompilableProgram | null {
     let { layout, layoutName } = component;
     let owner = getOwner(component);
 
@@ -129,21 +141,21 @@ export default class CurlyComponentManager
       if (layoutName !== undefined) {
         let _factory = owner.lookup<TemplateFactory>(`template:${layoutName}`);
         assert(`Layout \`${layoutName}\` not found!`, _factory !== undefined);
-        factory = _factory!;
+        factory = _factory;
       } else {
-        factory = owner.lookup<TemplateFactory>(DEFAULT_LAYOUT)!;
+        return null;
       }
     } else if (isTemplateFactory(layout)) {
       factory = layout;
     } else {
-      // we were provided an instance already
-      return layout;
+      // no layout was found, use the default layout
+      return null;
     }
 
-    return factory(owner);
+    return unwrapTemplate(factory(owner)).asWrappedLayout();
   }
 
-  getDynamicLayout(bucket: ComponentStateBucket): Template {
+  getDynamicLayout(bucket: ComponentStateBucket): CompilableProgram | null {
     return this.templateFor(bucket.component);
   }
 
@@ -157,11 +169,11 @@ export default class CurlyComponentManager
     return (component && component.tagName) || 'div';
   }
 
-  getCapabilities(state: DefinitionState): InternalComponentCapabilities {
-    return state.capabilities;
+  getCapabilities(): InternalComponentCapabilities {
+    return CURLY_CAPABILITIES;
   }
 
-  prepareArgs(state: DefinitionState, args: VMArguments): Option<PreparedArguments> {
+  prepareArgs(ComponentClass: ComponentFactory, args: VMArguments): Option<PreparedArguments> {
     if (args.named.has('__ARGS__')) {
       let { __ARGS__, ...rest } = args.named.capture();
 
@@ -176,7 +188,7 @@ export default class CurlyComponentManager
       return prepared;
     }
 
-    const { positionalParams } = state.ComponentClass.class!;
+    const { positionalParams } = ComponentClass.class!;
 
     // early exits
     if (
@@ -236,7 +248,7 @@ export default class CurlyComponentManager
    */
   create(
     environment: Environment,
-    state: DefinitionState,
+    ComponentClass: ComponentFactory,
     args: VMArguments,
     dynamicScope: DynamicScope,
     callerSelfRef: Reference,
@@ -246,9 +258,6 @@ export default class CurlyComponentManager
     // components will be skipped.
     let parentView = dynamicScope.view;
 
-    // Get the Ember.Component subclass to instantiate for this component.
-    let factory = state.ComponentClass;
-
     // Capture the arguments, which tells Glimmer to give us our own, stable
     // copy of the Arguments object that is safe to hold on to between renders.
     let capturedArgs = args.named.capture();
@@ -273,11 +282,6 @@ export default class CurlyComponentManager
     // `_target`, so bubbled actions are routed to the right place.
     props._target = valueForRef(callerSelfRef);
 
-    // static layout asserts CurriedDefinition
-    if (state.template) {
-      props.layout = state.template;
-    }
-
     // caller:
     // <FaIcon @name="bug" />
     //
@@ -287,7 +291,7 @@ export default class CurlyComponentManager
     // Now that we've built up all of the properties to set on the component instance,
     // actually create it.
     beginUntrackFrame();
-    let component = factory.create(props);
+    let component = ComponentClass.create(props);
 
     let finalizer = _instrumentStart('render.component', initialRenderInstrumentDetails, component);
 
@@ -350,8 +354,8 @@ export default class CurlyComponentManager
     return bucket;
   }
 
-  getDebugName({ name }: DefinitionState): string {
-    return name;
+  getDebugName(definition: ComponentFactory): string {
+    return definition.fullName || definition.normalizedName || definition.class!.name;
   }
 
   getSelf({ rootRef }: ComponentStateBucket): Reference {
@@ -471,42 +475,7 @@ export default class CurlyComponentManager
   }
 }
 
-export function validatePositionalParameters(
-  named: { has(name: string): boolean },
-  positional: { length: number },
-  positionalParamsDefinition: any
-) {
-  if (DEBUG) {
-    if (!named || !positional || !positional.length) {
-      return;
-    }
-
-    let paramType = typeof positionalParamsDefinition;
-
-    if (paramType === 'string') {
-      // tslint:disable-next-line:max-line-length
-      assert(
-        `You cannot specify positional parameters and the hash argument \`${positionalParamsDefinition}\`.`,
-        !named.has(positionalParamsDefinition)
-      );
-    } else {
-      if (positional.length < positionalParamsDefinition.length) {
-        positionalParamsDefinition = positionalParamsDefinition.slice(0, positional.length);
-      }
-
-      for (let i = 0; i < positionalParamsDefinition.length; i++) {
-        let name = positionalParamsDefinition[i];
-
-        assert(
-          `You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`,
-          !named.has(name)
-        );
-      }
-    }
-  }
-}
-
-export function processComponentInitializationAssertions(component: Component, props: any) {
+export function processComponentInitializationAssertions(component: Component, props: any): void {
   assert(
     `classNameBindings must be non-empty strings: ${component}`,
     (() => {
@@ -566,14 +535,6 @@ export function rerenderInstrumentDetails(component: any): any {
   return component.instrumentDetails({ initialRender: false });
 }
 
-// This is not any of glimmer-vm's proper Argument types because we
-// don't have sufficient public constructors to conveniently
-// reassemble one after we mangle the various arguments.
-interface CurriedArgs {
-  positional: any[];
-  named: any;
-}
-
 export const CURLY_CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: true,
   dynamicTag: true,
@@ -589,22 +550,4 @@ export const CURLY_CAPABILITIES: InternalComponentCapabilities = {
   willDestroy: true,
 };
 
-const CURLY_COMPONENT_MANAGER = new CurlyComponentManager();
-export class CurlyComponentDefinition implements ComponentDefinition {
-  public state: DefinitionState;
-  public manager: CurlyComponentManager = CURLY_COMPONENT_MANAGER;
-
-  constructor(
-    public name: string,
-    public ComponentClass: any,
-    public template?: Template,
-    public args?: CurriedArgs
-  ) {
-    this.state = {
-      name,
-      ComponentClass,
-      template,
-      capabilities: CURLY_CAPABILITIES,
-    };
-  }
-}
+export const CURLY_COMPONENT_MANAGER = new CurlyComponentManager();
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts b/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
deleted file mode 100644
index f55e5c03c9c..00000000000
--- a/packages/@ember/-internals/glimmer/lib/component-managers/custom.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import { Factory } from '@ember/-internals/owner';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import {
-  Arguments,
-  ComponentCapabilities,
-  ComponentCapabilitiesVersions,
-  ComponentDefinition,
-  ComponentManager,
-  ComponentManagerWithAsyncLifeCycleCallbacks,
-  ComponentManagerWithAsyncUpdateHook,
-  ComponentManagerWithDestructors,
-  ComponentManagerWithUpdateHook,
-  Destroyable,
-  Environment,
-  InternalComponentCapabilities,
-  Option,
-  Template,
-  VMArguments,
-  WithStaticLayout,
-} from '@glimmer/interfaces';
-import { createConstRef, Reference } from '@glimmer/reference';
-import {
-  BaseInternalComponentManager,
-  buildCapabilities,
-  registerDestructor,
-} from '@glimmer/runtime';
-import { deprecateMutationsInTrackingTransaction } from '@glimmer/validator';
-import { argsProxyFor } from '../utils/args-proxy';
-
-const CAPABILITIES = {
-  dynamicLayout: false,
-  dynamicTag: false,
-  prepareArgs: false,
-  createArgs: true,
-  attributeHook: false,
-  elementHook: false,
-  createCaller: false,
-  dynamicScope: true,
-  updateHook: true,
-  createInstance: true,
-  wrapped: false,
-  willDestroy: false,
-};
-
-export function capabilities<Version extends keyof ComponentCapabilitiesVersions>(
-  managerAPI: Version,
-  options: ComponentCapabilitiesVersions[Version] = {}
-): ComponentCapabilities {
-  assert(
-    'Invalid component manager compatibility specified',
-    managerAPI === '3.4' || managerAPI === '3.13'
-  );
-
-  let updateHook = true;
-
-  if (managerAPI === '3.13') {
-    updateHook = Boolean((options as ComponentCapabilitiesVersions['3.13']).updateHook);
-  }
-
-  return buildCapabilities({
-    asyncLifeCycleCallbacks: Boolean(options.asyncLifecycleCallbacks),
-    destructor: Boolean(options.destructor),
-    updateHook,
-  });
-}
-
-export interface DefinitionState<ComponentInstance> {
-  name: string;
-  ComponentClass: Factory<ComponentInstance>;
-  template: Template;
-}
-
-export function hasAsyncLifeCycleCallbacks<ComponentInstance>(
-  delegate: ComponentManager<ComponentInstance>
-): delegate is ComponentManagerWithAsyncLifeCycleCallbacks<ComponentInstance> {
-  return delegate.capabilities.asyncLifeCycleCallbacks;
-}
-
-export function hasUpdateHook<ComponentInstance>(
-  delegate: ComponentManager<ComponentInstance>
-): delegate is ComponentManagerWithUpdateHook<ComponentInstance> {
-  return delegate.capabilities.updateHook;
-}
-
-export function hasAsyncUpdateHook<ComponentInstance>(
-  delegate: ComponentManager<ComponentInstance>
-): delegate is ComponentManagerWithAsyncUpdateHook<ComponentInstance> {
-  return hasAsyncLifeCycleCallbacks(delegate) && hasUpdateHook(delegate);
-}
-
-export function hasDestructors<ComponentInstance>(
-  delegate: ComponentManager<ComponentInstance>
-): delegate is ComponentManagerWithDestructors<ComponentInstance> {
-  return delegate.capabilities.destructor;
-}
-
-/**
-  The CustomComponentManager allows addons to provide custom component
-  implementations that integrate seamlessly into Ember. This is accomplished
-  through a delegate, registered with the custom component manager, which
-  implements a set of hooks that determine component behavior.
-
-  To create a custom component manager, instantiate a new CustomComponentManager
-  class and pass the delegate as the first argument:
-
-  ```js
-  let manager = new CustomComponentManager({
-    // ...delegate implementation...
-  });
-  ```
-
-  ## Delegate Hooks
-
-  Throughout the lifecycle of a component, the component manager will invoke
-  delegate hooks that are responsible for surfacing those lifecycle changes to
-  the end developer.
-
-  * `create()` - invoked when a new instance of a component should be created
-  * `update()` - invoked when the arguments passed to a component change
-  * `getContext()` - returns the object that should be
-*/
-export default class CustomComponentManager<ComponentInstance>
-  extends BaseInternalComponentManager<
-    CustomComponentState<ComponentInstance>,
-    CustomComponentDefinitionState<ComponentInstance>
-  >
-  implements
-    WithStaticLayout<
-      CustomComponentState<ComponentInstance>,
-      CustomComponentDefinitionState<ComponentInstance>
-    > {
-  create(
-    env: Environment,
-    definition: CustomComponentDefinitionState<ComponentInstance>,
-    vmArgs: VMArguments
-  ): CustomComponentState<ComponentInstance> {
-    let { delegate } = definition;
-    let args = argsProxyFor(vmArgs.capture(), 'component');
-
-    let component;
-
-    if (DEBUG && deprecateMutationsInTrackingTransaction !== undefined) {
-      deprecateMutationsInTrackingTransaction(() => {
-        component = delegate.createComponent(definition.ComponentClass.class!, args);
-      });
-    } else {
-      component = delegate.createComponent(definition.ComponentClass.class!, args);
-    }
-
-    let bucket = new CustomComponentState(delegate, component, args, env);
-
-    return bucket as CustomComponentState<ComponentInstance>;
-  }
-
-  getDebugName({ name }: CustomComponentDefinitionState<ComponentInstance>): string {
-    return name;
-  }
-
-  update(bucket: CustomComponentState<ComponentInstance>): void {
-    if (hasUpdateHook(bucket.delegate)) {
-      let { delegate, component, args } = bucket;
-
-      delegate.updateComponent(component, args);
-    }
-  }
-
-  didCreate({ delegate, component }: CustomComponentState<ComponentInstance>): void {
-    if (hasAsyncLifeCycleCallbacks(delegate)) {
-      delegate.didCreateComponent(component);
-    }
-  }
-
-  didUpdate({ delegate, component }: CustomComponentState<ComponentInstance>): void {
-    if (hasAsyncUpdateHook(delegate)) {
-      delegate.didUpdateComponent(component);
-    }
-  }
-
-  didRenderLayout(): void {}
-
-  didUpdateLayout(): void {}
-
-  getSelf({ delegate, component }: CustomComponentState<ComponentInstance>): Reference {
-    return createConstRef(delegate.getContext(component), 'this');
-  }
-
-  getDestroyable(bucket: CustomComponentState<ComponentInstance>): Option<Destroyable> {
-    return bucket;
-  }
-
-  getCapabilities(): InternalComponentCapabilities {
-    return CAPABILITIES;
-  }
-
-  getStaticLayout(state: DefinitionState<ComponentInstance>): Template {
-    return state.template;
-  }
-}
-const CUSTOM_COMPONENT_MANAGER = new CustomComponentManager();
-
-/**
- * Stores internal state about a component instance after it's been created.
- */
-export class CustomComponentState<ComponentInstance> {
-  constructor(
-    public delegate: ComponentManager<ComponentInstance>,
-    public component: ComponentInstance,
-    public args: Arguments,
-    public env: Environment
-  ) {
-    if (hasDestructors(delegate)) {
-      registerDestructor(this, () => delegate.destroyComponent(component));
-    }
-  }
-}
-
-export interface CustomComponentDefinitionState<ComponentInstance>
-  extends DefinitionState<ComponentInstance> {
-  delegate: ComponentManager<ComponentInstance>;
-}
-
-export class CustomManagerDefinition<ComponentInstance> implements ComponentDefinition {
-  public state: CustomComponentDefinitionState<ComponentInstance>;
-  public manager: CustomComponentManager<
-    ComponentInstance
-  > = CUSTOM_COMPONENT_MANAGER as CustomComponentManager<ComponentInstance>;
-
-  constructor(
-    public name: string,
-    public ComponentClass: Factory<ComponentInstance>,
-    public delegate: ComponentManager<ComponentInstance>,
-    public template: Template
-  ) {
-    this.state = {
-      name,
-      ComponentClass,
-      template,
-      delegate,
-    };
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts b/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
deleted file mode 100644
index 156fee126d9..00000000000
--- a/packages/@ember/-internals/glimmer/lib/component-managers/definition-state.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Factory } from '@ember/-internals/owner';
-import { InternalComponentCapabilities, Template } from '@glimmer/interfaces';
-import { Component } from '../utils/curly-component-state-bucket';
-
-export default interface DefinitionState {
-  capabilities: InternalComponentCapabilities;
-  name: string;
-  ComponentClass: Factory<
-    Component,
-    { create(props?: any): Component; positionalParams: string | string[] | undefined | null }
-  >;
-  template?: Template;
-}
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index b56161631c6..aa30f4f9e5c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -1,19 +1,16 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import {
-  ComponentDefinition,
+  CapturedNamedArguments,
   Destroyable,
   DynamicScope,
   Environment,
   InternalComponentCapabilities,
   InternalComponentManager,
-  Template,
   VMArguments,
-  WithStaticLayout,
+  WithCreateInstance,
 } from '@glimmer/interfaces';
 import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { BaseInternalComponentManager } from '@glimmer/runtime';
-import InternalComponent from '../components/internal';
 
 const CAPABILITIES: InternalComponentCapabilities = {
   dynamicLayout: false,
@@ -30,40 +27,24 @@ const CAPABILITIES: InternalComponentCapabilities = {
   willDestroy: false,
 };
 
-export interface InternalDefinitionState {
-  ComponentClass: typeof InternalComponent;
-  layout: Template;
-}
-
 export interface InternalComponentState {
   env: Environment;
   instance: Destroyable;
 }
 
-export class InternalComponentDefinition
-  implements
-    ComponentDefinition<InternalDefinitionState, InternalComponentState, InternalComponentManager> {
-  public state: InternalDefinitionState;
-
-  constructor(
-    public manager: InternalComponentManager,
-    ComponentClass: typeof InternalComponent,
-    layout: Template
-  ) {
-    this.state = { ComponentClass, layout };
-  }
+export interface EmberInternalComponentConstructor {
+  new (owner: Owner, args: CapturedNamedArguments, caller: unknown): Destroyable;
 }
 
 export default class InternalManager
-  extends BaseInternalComponentManager<InternalComponentState, InternalDefinitionState>
-  implements WithStaticLayout<InternalComponentState, InternalDefinitionState> {
+  implements
+    InternalComponentManager<InternalComponentState, EmberInternalComponentConstructor>,
+    WithCreateInstance {
   static for(name: string): (owner: Owner) => InternalManager {
     return (owner: Owner) => new InternalManager(owner, name);
   }
 
-  constructor(private owner: Owner, private name: string) {
-    super();
-  }
+  constructor(private owner: Owner, private name: string) {}
 
   getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
@@ -71,7 +52,7 @@ export default class InternalManager
 
   create(
     env: Environment,
-    { ComponentClass }: InternalDefinitionState,
+    ComponentClass: EmberInternalComponentConstructor,
     args: VMArguments,
     _dynamicScope: DynamicScope,
     caller: Reference
@@ -90,6 +71,12 @@ export default class InternalManager
     return state;
   }
 
+  didCreate(): void {}
+  didUpdate(): void {}
+
+  didRenderLayout(): void {}
+  didUpdateLayout(): void {}
+
   getDebugName(): string {
     return this.name;
   }
@@ -101,8 +88,4 @@ export default class InternalManager
   getDestroyable(state: InternalComponentState): Destroyable {
     return state.instance;
   }
-
-  getStaticLayout({ layout: template }: InternalDefinitionState): Template {
-    return template;
-  }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 9d5e3a97a48..cf526e4ccd9 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,6 +1,7 @@
 import { Owner } from '@ember/-internals/owner';
 import { generateControllerFactory } from '@ember/-internals/routing';
 import EngineInstance from '@ember/engine/instance';
+import { associateDestroyableChild } from '@glimmer/destroyable';
 import {
   CapturedArguments,
   ComponentDefinition,
@@ -9,14 +10,15 @@ import {
   Environment,
   InternalComponentCapabilities,
   Option,
-  Template,
   TemplateFactory,
   VMArguments,
+  WithCreateInstance,
   WithCustomDebugRenderTree,
   WithDynamicLayout,
 } from '@glimmer/interfaces';
+import { capabilityFlagsFrom } from '@glimmer/manager';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { associateDestroyableChild, BaseInternalComponentManager } from '@glimmer/runtime';
+import { unwrapTemplate } from '@glimmer/util';
 import RuntimeResolver from '../resolver';
 
 interface EngineState {
@@ -46,13 +48,13 @@ const CAPABILITIES = {
 };
 
 class MountManager
-  extends BaseInternalComponentManager<EngineState, EngineDefinitionState>
   implements
+    WithCreateInstance<EngineState, Environment>,
     WithDynamicLayout<EngineState, RuntimeResolver>,
     WithCustomDebugRenderTree<EngineState, EngineDefinitionState> {
   getDynamicLayout(state: EngineState) {
     let templateFactory = state.engine.lookup('template:application') as TemplateFactory;
-    return templateFactory(state.engine);
+    return unwrapTemplate(templateFactory(state.engine)).asLayout();
   }
 
   getCapabilities(): InternalComponentCapabilities {
@@ -106,7 +108,7 @@ class MountManager
     definition: EngineDefinitionState,
     state: EngineState,
     args: CapturedArguments,
-    template?: Template
+    templateModuleName?: string
   ): CustomRenderNode[] {
     return [
       {
@@ -122,7 +124,7 @@ class MountManager
         type: 'route-template',
         name: 'application',
         args,
-        template,
+        template: templateModuleName,
       },
     ];
   }
@@ -135,7 +137,11 @@ class MountManager
     return bucket.engine;
   }
 
+  didCreate() {}
+  didUpdate() {}
+
   didRenderLayout(): void {}
+  didUpdateLayout(): void {}
 
   update(bucket: EngineState): void {
     let { controller, modelRef } = bucket;
@@ -144,17 +150,20 @@ class MountManager
       controller.set('model', valueForRef(modelRef!));
     }
   }
-
-  didUpdateLayout(): void {}
 }
 
 const MOUNT_MANAGER = new MountManager();
 
 export class MountDefinition implements ComponentDefinition {
+  // handle is not used by this custom definition
+  public handle = -1;
+
   public state: EngineDefinitionState;
   public manager = MOUNT_MANAGER;
+  public compilable = null;
+  public capabilities = capabilityFlagsFrom(CAPABILITIES);
 
-  constructor(name: string) {
-    this.state = { name };
+  constructor(public resolvedName: string) {
+    this.state = { name: resolvedName };
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index c0f53fb409e..abdee7e3517 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -6,20 +6,24 @@ import { _instrumentStart } from '@ember/instrumentation';
 import { assign } from '@ember/polyfills';
 import {
   CapturedArguments,
+  CompilableProgram,
   ComponentDefinition,
   CustomRenderNode,
   Destroyable,
   Environment,
   InternalComponentCapabilities,
+  InternalComponentCapability,
   Option,
   Template,
   VMArguments,
+  WithCreateInstance,
   WithCustomDebugRenderTree,
   WithDynamicTagName,
-  WithStaticLayout,
 } from '@glimmer/interfaces';
+import { capabilityFlagsFrom } from '@glimmer/manager';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
-import { BaseInternalComponentManager, EMPTY_ARGS } from '@glimmer/runtime';
+import { EMPTY_ARGS } from '@glimmer/runtime';
+import { unwrapTemplate } from '@glimmer/util';
 
 import { SimpleElement } from '@simple-dom/interface';
 import { DynamicScope } from '../renderer';
@@ -63,9 +67,8 @@ const CAPABILITIES: InternalComponentCapabilities = {
 };
 
 class OutletComponentManager
-  extends BaseInternalComponentManager<OutletInstanceState, OutletDefinitionState>
   implements
-    WithStaticLayout<OutletInstanceState, OutletDefinitionState>,
+    WithCreateInstance<OutletInstanceState, Environment>,
     WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState> {
   create(
     env: Environment,
@@ -144,17 +147,12 @@ class OutletComponentManager
       name: definition.name,
       args: args,
       instance: definition.controller,
-      template: definition.template,
+      template: unwrapTemplate(definition.template).moduleName,
     });
 
     return nodes;
   }
 
-  getStaticLayout({ template }: OutletDefinitionState) {
-    // The router has already resolved the template
-    return template;
-  }
-
   getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
@@ -163,10 +161,15 @@ class OutletComponentManager
     return self;
   }
 
+  didCreate() {}
+  didUpdate() {}
+
   didRenderLayout(state: OutletInstanceState): void {
     state.finalize();
   }
 
+  didUpdateLayout() {}
+
   getDestroyable(): Option<Destroyable> {
     return null;
   }
@@ -177,10 +180,24 @@ const OUTLET_MANAGER = new OutletComponentManager();
 export class OutletComponentDefinition
   implements
     ComponentDefinition<OutletDefinitionState, OutletInstanceState, OutletComponentManager> {
+  // handle is not used by this custom definition
+  public handle = -1;
+
+  public resolvedName: string;
+  public compilable: CompilableProgram;
+  public capabilities: InternalComponentCapability;
+
   constructor(
     public state: OutletDefinitionState,
     public manager: OutletComponentManager = OUTLET_MANAGER
-  ) {}
+  ) {
+    let capabilities = manager.getCapabilities();
+    this.capabilities = capabilityFlagsFrom(capabilities);
+    this.compilable = capabilities.wrapped
+      ? unwrapTemplate(state.template).asWrappedLayout()
+      : unwrapTemplate(state.template).asLayout();
+    this.resolvedName = state.name;
+  }
 }
 
 export function createRootOutlet(outletView: OutletView): OutletComponentDefinition {
@@ -198,11 +215,6 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
         return 'div';
       }
 
-      getStaticLayout({ template }: OutletDefinitionState) {
-        // The router has already resolved the template
-        return template;
-      }
-
       getCapabilities(): InternalComponentCapabilities {
         return WRAPPED_CAPABILITIES;
       }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index d8ae5774223..bf829e89786 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -1,5 +1,4 @@
 import { getFactoryFor } from '@ember/-internals/container';
-import { Factory } from '@ember/-internals/owner';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -7,18 +6,17 @@ import {
   Environment,
   InternalComponentCapabilities,
   Option,
-  Template,
   VMArguments,
 } from '@glimmer/interfaces';
+import { capabilityFlagsFrom } from '@glimmer/manager';
 import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
-import { DIRTY_TAG } from '../component';
 import { DynamicScope } from '../renderer';
 import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
 import CurlyComponentManager, {
+  DIRTY_TAG,
   initialRenderInstrumentDetails,
   processComponentInitializationAssertions,
 } from './curly';
-import DefinitionState from './definition-state';
 
 class RootComponentManager extends CurlyComponentManager {
   component: Component;
@@ -28,13 +26,9 @@ class RootComponentManager extends CurlyComponentManager {
     this.component = component;
   }
 
-  getStaticLayout(): Template {
-    return this.templateFor(this.component);
-  }
-
   create(
     environment: Environment,
-    _state: DefinitionState,
+    _state: unknown,
     _args: Option<VMArguments>,
     dynamicScope: DynamicScope
   ) {
@@ -81,7 +75,7 @@ class RootComponentManager extends CurlyComponentManager {
 // ROOT is the top-level template it has nothing but one yield.
 // it is supposed to have a dummy element
 export const ROOT_CAPABILITIES: InternalComponentCapabilities = {
-  dynamicLayout: false,
+  dynamicLayout: true,
   dynamicTag: true,
   prepareArgs: false,
   createArgs: false,
@@ -96,17 +90,17 @@ export const ROOT_CAPABILITIES: InternalComponentCapabilities = {
 };
 
 export class RootComponentDefinition implements ComponentDefinition {
-  state: DefinitionState;
+  // handle is not used by this custom definition
+  handle = -1;
+
+  resolvedName = '-top-level';
+  state: object;
   manager: RootComponentManager;
+  capabilities = capabilityFlagsFrom(ROOT_CAPABILITIES);
+  compilable = null;
 
-  constructor(public component: Component) {
-    let manager = new RootComponentManager(component);
-    this.manager = manager;
-    let factory = getFactoryFor(component);
-    this.state = {
-      name: factory!.fullName.slice(10),
-      capabilities: ROOT_CAPABILITIES,
-      ComponentClass: factory as Factory<any, any>,
-    };
+  constructor(component: Component) {
+    this.manager = new RootComponentManager(component);
+    this.state = getFactoryFor(component);
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts b/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
deleted file mode 100644
index 9aa36c1dd1e..00000000000
--- a/packages/@ember/-internals/glimmer/lib/component-managers/template-only.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import {
-  ComponentDefinition,
-  Environment,
-  InternalComponentCapabilities,
-  Option,
-  Template,
-  WithStaticLayout,
-} from '@glimmer/interfaces';
-import { NULL_REFERENCE, Reference } from '@glimmer/reference';
-
-const CAPABILITIES: InternalComponentCapabilities = {
-  dynamicLayout: false,
-  dynamicTag: false,
-  prepareArgs: false,
-  createArgs: false,
-  attributeHook: false,
-  elementHook: false,
-  createCaller: false,
-  dynamicScope: false,
-  updateHook: false,
-  createInstance: false,
-  wrapped: false,
-  willDestroy: false,
-};
-
-export interface DebugStateBucket {
-  environment: Environment;
-}
-
-export default class TemplateOnlyComponentManager
-  implements WithStaticLayout<Option<DebugStateBucket>, TemplateOnlyComponentDefinitionState> {
-  getStaticLayout({ template }: TemplateOnlyComponentDefinitionState): Template {
-    return template;
-  }
-
-  getCapabilities(): InternalComponentCapabilities {
-    return CAPABILITIES;
-  }
-
-  getDebugName({ name }: TemplateOnlyComponentDefinitionState): string {
-    return name;
-  }
-
-  getSelf(): Reference {
-    return NULL_REFERENCE;
-  }
-
-  getDestroyable(): null {
-    return null;
-  }
-}
-
-const MANAGER = new TemplateOnlyComponentManager();
-
-export interface TemplateOnlyComponentDefinitionState {
-  name: string;
-  template: Template;
-}
-
-export class TemplateOnlyComponentDefinition
-  implements
-    TemplateOnlyComponentDefinitionState,
-    ComponentDefinition<
-      TemplateOnlyComponentDefinitionState,
-      Option<DebugStateBucket>,
-      TemplateOnlyComponentManager
-    > {
-  manager = MANAGER;
-  constructor(public name: string, public template: Template) {}
-
-  get state(): TemplateOnlyComponentDefinitionState {
-    return this;
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index abe9d409e95..49e2b50189e 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,7 +1,6 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
-import { enumerableSymbol, symbol } from '@ember/-internals/utils';
 import {
   ActionSupport,
   ChildViewsSupport,
@@ -13,17 +12,18 @@ import {
 } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+import { setInternalComponentManager } from '@glimmer/manager';
 import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
 import { createTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
-
-export const ARGS = enumerableSymbol('ARGS');
-export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
-
-export const DIRTY_TAG = symbol('DIRTY_TAG');
-export const IS_DISPATCHING_ATTRS = symbol('IS_DISPATCHING_ATTRS');
-export const BOUNDS = symbol('BOUNDS');
+import {
+  ARGS,
+  BOUNDS,
+  CURLY_COMPONENT_MANAGER,
+  DIRTY_TAG,
+  IS_DISPATCHING_ATTRS,
+} from './component-managers/curly';
 
 /**
 @module @ember/component
@@ -1128,4 +1128,6 @@ Component.reopenClass({
   positionalParams: [],
 });
 
+setInternalComponentManager(() => CURLY_COMPONENT_MANAGER, Component);
+
 export default Component;
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index c74e0e6545d..e56943537dc 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -1,7 +1,7 @@
 /**
 @module @ember/component
 */
-import { setComponentManager } from '@glimmer/runtime';
+import { setInternalComponentManager } from '@glimmer/manager';
 import InternalManager from '../component-managers/internal';
 import InternalComponent from './internal';
 
@@ -117,6 +117,6 @@ export default class Input extends InternalComponent {
   }
 }
 
-setComponentManager(InternalManager.for('input'), Input);
+setInternalComponentManager(InternalManager.for('input'), Input);
 
 Input.toString = () => '@ember/component/input';
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index b3442b0473a..1ca712aac1c 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -11,7 +11,8 @@ import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { inject as injectService } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import EmberComponent, { HAS_BLOCK } from '../component';
+import EmberComponent from '../component';
+import { HAS_BLOCK } from '../component-managers/curly';
 import layout from '../templates/link-to';
 
 /**
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index a35978fefa6..215aa20882f 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -8,15 +8,13 @@ import { getDebugName, symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
-import { setHelperManager } from '@glimmer/runtime';
-import { _WeakSet as WeakSet } from '@glimmer/util';
+import { helperCapabilities, setHelperManager } from '@glimmer/manager';
 import {
   consumeTag,
   createTag,
   deprecateMutationsInTrackingTransaction,
   dirtyTag,
 } from '@glimmer/validator';
-import { helperCapabilities } from './helpers/custom';
 
 export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
 
@@ -39,12 +37,6 @@ export interface SimpleHelper<T = unknown> {
   compute: HelperFunction<T>;
 }
 
-const CLASSIC_HELPER_MANAGERS = new WeakSet();
-
-export function isClassicHelperManager(obj: object) {
-  return CLASSIC_HELPER_MANAGERS.has(obj);
-}
-
 /**
   Ember Helpers are functions that can compute values, and are used in templates.
   For example, this code calls a helper named `format-currency`:
@@ -139,7 +131,14 @@ let Helper = FrameworkObject.extend({
   */
 });
 
+const IS_CLASSIC_HELPER = symbol('IS_CLASSIC_HELPER');
+
 Helper.isHelperFactory = true;
+Helper[IS_CLASSIC_HELPER] = true;
+
+export function isClassicHelper(obj: object): boolean {
+  return obj[IS_CLASSIC_HELPER] === true;
+}
 
 interface ClassicHelperStateBucket {
   instance: HelperInstance;
@@ -155,13 +154,12 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   private ownerInjection: object;
 
   constructor(owner: Owner | undefined) {
-    CLASSIC_HELPER_MANAGERS.add(this);
     let ownerInjection = {};
     setOwner(ownerInjection, owner!);
     this.ownerInjection = ownerInjection;
   }
 
-  createHelper(definition: ClassHelperFactory | typeof Helper, args: Arguments) {
+  createHelper(definition: typeof Helper, args: Arguments) {
     let instance =
       definition.class === undefined ? definition.create(this.ownerInjection) : definition.create();
 
@@ -197,7 +195,11 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
-setHelperManager((owner: Owner | undefined) => new ClassicHelperManager(owner), Helper);
+export const CLASSIC_HELPER_MANAGER_FACTORY = (owner: Owner | undefined): ClassicHelperManager => {
+  return new ClassicHelperManager(owner);
+};
+
+setHelperManager(CLASSIC_HELPER_MANAGER_FACTORY, Helper);
 
 ///////////
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
index ad86606eb6e..b7879daa2c5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
@@ -2,6 +2,7 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Helper, VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 let helper: Helper;
 
@@ -22,4 +23,4 @@ if (DEBUG) {
   helper = (args: VMArguments) => args.positional.at(0);
 }
 
-export default helper;
+export default internalHelper(helper);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
index 111c8099a71..97cd913abe3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -2,6 +2,7 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Helper, VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 let helper: Helper;
 
@@ -24,4 +25,4 @@ if (DEBUG) {
   helper = (args: VMArguments) => args.positional.at(0);
 }
 
-export default helper;
+export default internalHelper(helper);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 0aa1bde5a6b..940524cf7fb 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,8 +1,9 @@
 import { dasherize } from '@ember/string';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let positional = args.positional.capture();
 
   return createComputeRef(() => {
@@ -18,4 +19,4 @@ export default function (args: VMArguments) {
       return String(value);
     }
   });
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index 04c444ca6c1..f91c576259b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -6,13 +6,14 @@ import { isObject } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
+import { internalHelper } from './internal-helper';
 
 /**
   This reference is used to get the `[]` tag of iterables, so we can trigger
   updates to `{{each}}` when it changes. It is put into place by a template
   transform at build time, similar to the (-each-in) helper
 */
-export default function trackArray(args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let inner = args.positional.at(0);
 
   return createComputeRef(() => {
@@ -24,4 +25,4 @@ export default function trackArray(args: VMArguments) {
 
     return iterable;
   });
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 5f7aa791e94..d5e9d59a248 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -16,6 +16,7 @@ import {
   valueForRef,
 } from '@glimmer/reference';
 import { _WeakSet } from '@glimmer/util';
+import { internalHelper } from './internal-helper';
 
 export const ACTIONS = new _WeakSet();
 export const INVOKE: unique symbol = symbol('INVOKE') as any;
@@ -283,40 +284,48 @@ export const INVOKE: unique symbol = symbol('INVOKE') as any;
   @for Ember.Templates.helpers
   @public
 */
-export default function (args: VMArguments): Reference<Function> {
-  let { named, positional } = args;
+export default internalHelper(
+  (args: VMArguments): Reference<Function> => {
+    let { named, positional } = args;
 
-  let capturedArgs = positional.capture();
+    let capturedArgs = positional.capture();
 
-  // The first two argument slots are reserved.
-  // pos[0] is the context (or `this`)
-  // pos[1] is the action name or function
-  // Anything else is an action argument.
-  let [context, action, ...restArgs] = capturedArgs;
+    // The first two argument slots are reserved.
+    // pos[0] is the context (or `this`)
+    // pos[1] is the action name or function
+    // Anything else is an action argument.
+    let [context, action, ...restArgs] = capturedArgs;
 
-  let debugKey: string = action.debugLabel!;
+    let debugKey: string = action.debugLabel!;
 
-  let target = named.has('target') ? named.get('target') : context;
-  let processArgs = makeArgsProcessor(named.has('value') && named.get('value'), restArgs);
+    let target = named.has('target') ? named.get('target') : context;
+    let processArgs = makeArgsProcessor(named.has('value') && named.get('value'), restArgs);
 
-  let fn: Function;
+    let fn: Function;
 
-  if (isInvokableRef(action)) {
-    fn = makeClosureAction(action, action as MaybeActionHandler, invokeRef, processArgs, debugKey);
-  } else {
-    fn = makeDynamicClosureAction(
-      valueForRef(context) as object,
-      target,
-      action,
-      processArgs,
-      debugKey
-    );
-  }
+    if (isInvokableRef(action)) {
+      fn = makeClosureAction(
+        action,
+        action as MaybeActionHandler,
+        invokeRef,
+        processArgs,
+        debugKey
+      );
+    } else {
+      fn = makeDynamicClosureAction(
+        valueForRef(context) as object,
+        target,
+        action,
+        processArgs,
+        debugKey
+      );
+    }
 
-  ACTIONS.add(fn);
+    ACTIONS.add(fn);
 
-  return createUnboundRef(fn, '(result of an `action` helper)');
-}
+    return createUnboundRef(fn, '(result of an `action` helper)');
+  }
+);
 
 function NOOP(args: unknown[]) {
   return args;
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index 80a1cc6e57e..1805777fb7d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -1,6 +1,7 @@
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, Reference } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
+import { internalHelper } from './internal-helper';
 
 /**
 @module ember
@@ -42,8 +43,10 @@ import { reifyPositional } from '@glimmer/runtime';
    @public
  */
 
-export default function (args: VMArguments): Reference<unknown[]> {
-  let captured = args.positional.capture();
+export default internalHelper(
+  (args: VMArguments): Reference<unknown[]> => {
+    let captured = args.positional.capture();
 
-  return createComputeRef(() => reifyPositional(captured), null, 'array');
-}
+    return createComputeRef(() => reifyPositional(captured), null, 'array');
+  }
+);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index e21cfe8c25b..7af9ef8b5c3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -1,12 +1,13 @@
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
+import { internalHelper } from './internal-helper';
 
-const isEmpty = (value: any): boolean => {
-  return value === null || value === undefined || typeof value.toString !== 'function';
+const isEmpty = (value: unknown): boolean => {
+  return value === null || value === undefined || typeof (value as object).toString !== 'function';
 };
 
-const normalizeTextValue = (value: any): string => {
+const normalizeTextValue = (value: unknown): string => {
   if (isEmpty(value)) {
     return '';
   }
@@ -39,7 +40,7 @@ const normalizeTextValue = (value: any): string => {
   @for Ember.Templates.helpers
   @since 1.13.0
 */
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let captured = args.positional.capture();
 
   return createComputeRef(
@@ -47,4 +48,4 @@ export default function (args: VMArguments) {
     null,
     'concat'
   );
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 98505a89cb0..64143fa99c4 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -7,6 +7,7 @@ import { isProxy } from '@ember/-internals/utils';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
+import { internalHelper } from './internal-helper';
 
 /**
   The `{{#each}}` helper loops over elements in a collection. It is an extension
@@ -158,7 +159,7 @@ export class EachInWrapper {
   constructor(public inner: unknown) {}
 }
 
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let inner = args.positional.at(0);
 
   return createComputeRef(() => {
@@ -174,4 +175,4 @@ export default function (args: VMArguments) {
 
     return new EachInWrapper(iterable);
   });
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 7c4dca12077..46a67a70f94 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -10,6 +10,7 @@ import {
 } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 import buildUntouchableThis from '../utils/untouchable-this';
+import { internalHelper } from './internal-helper';
 
 const context = buildUntouchableThis('`fn` helper');
 
@@ -84,7 +85,7 @@ const context = buildUntouchableThis('`fn` helper');
   @public
   @since 3.11.0
 */
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let positional = args.positional.capture();
   let callbackRef = positional[0];
 
@@ -108,7 +109,7 @@ export default function (args: VMArguments) {
     null,
     'fn'
   );
-}
+});
 
 function assertCallbackIsFn(callbackRef: Reference) {
   assert(
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 163533acc96..26131c7cfd3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -9,6 +9,7 @@ import {
   NULL_REFERENCE,
   valueForRef,
 } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 /**
 @module ember
@@ -94,7 +95,7 @@ import {
   @for Ember.Templates.helpers
   @since 2.1.0
  */
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let sourceRef = args.positional.at(0);
   let pathRef = args.positional.at(1);
 
@@ -130,4 +131,4 @@ export default function (args: VMArguments) {
       'get'
     );
   }
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
index 1ce8fbb6893..2de7eecc059 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
@@ -1,6 +1,7 @@
 import { Dict, VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, Reference } from '@glimmer/reference';
 import { reifyNamed } from '@glimmer/runtime';
+import { internalHelper } from './internal-helper';
 
 /**
 @module ember
@@ -44,8 +45,10 @@ import { reifyNamed } from '@glimmer/runtime';
    @since 2.3.0
    @public
  */
-export default function (args: VMArguments): Reference<Dict<unknown>> {
-  let positional = args.named.capture();
+export default internalHelper(
+  (args: VMArguments): Reference<Dict<unknown>> => {
+    let positional = args.named.capture();
 
-  return createComputeRef(() => reifyNamed(positional), null, 'hash');
-}
+    return createComputeRef(() => reifyNamed(positional), null, 'hash');
+  }
+);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
index 70ddb97980a..47ac572ffc9 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
@@ -6,6 +6,7 @@ import { assert } from '@ember/debug';
 import { toBool } from '@glimmer/global-context';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 /**
   The `if` helper allows you to conditionally render one of two branches,
@@ -98,7 +99,7 @@ import { createComputeRef, valueForRef } from '@glimmer/reference';
   @for Ember.Templates.helpers
   @public
 */
-export function inlineIf(args: VMArguments) {
+export const inlineIf = internalHelper((args: VMArguments) => {
   let positional = args.positional.capture();
 
   return createComputeRef(
@@ -119,7 +120,7 @@ export function inlineIf(args: VMArguments) {
     null,
     'if'
   );
-}
+});
 
 /**
   The `unless` helper is the inverse of the `if` helper. It displays if a value
@@ -206,7 +207,7 @@ export function inlineIf(args: VMArguments) {
   @for Ember.Templates.helpers
   @public
 */
-export function inlineUnless(args: VMArguments) {
+export const inlineUnless = internalHelper((args: VMArguments) => {
   let positional = args.positional.capture();
 
   return createComputeRef(
@@ -227,4 +228,4 @@ export function inlineUnless(args: VMArguments) {
     null,
     'unless'
   );
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
new file mode 100644
index 00000000000..1152a6bf541
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
@@ -0,0 +1,6 @@
+import { Helper, HelperDefinitionState } from '@glimmer/interfaces';
+import { setInternalHelperManager } from '@glimmer/manager';
+
+export function internalHelper(helper: Helper): HelperDefinitionState {
+  return setInternalHelperManager(() => helper, {});
+}
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
index 3e3cf2a2031..758b298be2c 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
@@ -1,6 +1,7 @@
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
+import { internalHelper } from './internal-helper';
 
 /**
 @module ember
@@ -19,7 +20,7 @@ import { reifyPositional } from '@glimmer/runtime';
   @param {Array} params
   @public
 */
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let positional = args.positional.capture();
 
   return createComputeRef(() => {
@@ -27,4 +28,4 @@ export default function (args: VMArguments) {
     console.log(...reifyPositional(positional));
     /* eslint-enable no-console */
   });
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index 63dd959b60b..b7c7c2a9fee 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -4,6 +4,7 @@
 import { assert } from '@ember/debug';
 import { VMArguments } from '@glimmer/interfaces';
 import { createInvokableRef, isUpdatableRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 /**
   The `mut` helper lets you __clearly specify__ that a child `Component` can update the
@@ -79,7 +80,7 @@ import { createInvokableRef, isUpdatableRef } from '@glimmer/reference';
   @public
 */
 
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let ref = args.positional.at(0);
 
   // TODO: Improve this error message. This covers at least two distinct
@@ -97,4 +98,4 @@ export default function (args: VMArguments) {
   assert('You can only pass a path to mut', isUpdatableRef(ref));
 
   return createInvokableRef(ref);
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index 291c8c935be..a13b7efee16 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -7,6 +7,7 @@ import { assign } from '@ember/polyfills';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef } from '@glimmer/reference';
 import { reifyNamed } from '@glimmer/runtime';
+import { internalHelper } from './internal-helper';
 
 /**
   This is a helper to be used in conjunction with the link-to helper.
@@ -29,7 +30,7 @@ import { reifyNamed } from '@glimmer/runtime';
   @return {Object} A `QueryParams` object for `{{link-to}}`
   @public
 */
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   let { positional, named } = args.capture();
 
   return createComputeRef(() => {
@@ -40,4 +41,4 @@ export default function (args: VMArguments) {
 
     return new QueryParams(assign({}, reifyNamed(named) as any));
   });
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index 85229007796..f2f6b53b333 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -3,6 +3,7 @@
 */
 import { VMArguments } from '@glimmer/interfaces';
 import { createReadOnlyRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 /**
   The `readonly` helper let's you specify that a binding is one-way only,
@@ -119,6 +120,6 @@ import { createReadOnlyRef } from '@glimmer/reference';
   @for Ember.Templates.helpers
   @private
 */
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   return createReadOnlyRef(args.positional.at(0));
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index b02e4959feb..474c39b1f00 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -5,6 +5,7 @@
 import { assert } from '@ember/debug';
 import { VMArguments } from '@glimmer/interfaces';
 import { createUnboundRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
 
 /**
   The `{{unbound}}` helper disconnects the one-way binding of a property,
@@ -34,11 +35,11 @@ import { createUnboundRef, valueForRef } from '@glimmer/reference';
   @public
 */
 
-export default function (args: VMArguments) {
+export default internalHelper((args: VMArguments) => {
   assert(
     'unbound helper cannot be called with multiple params or hash params',
     args.positional.length === 1 && args.named.length === 0
   );
 
   return createUnboundRef(valueForRef(args.positional.at(0)), '(resurt of an `unbound` helper)');
-}
+});
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 81fb377262c..dfb67e406d2 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -3,6 +3,7 @@ import { ActionManager, isSimpleClick } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
+import { registerDestructor } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import {
   CapturedNamedArguments,
@@ -12,8 +13,8 @@ import {
   InternalModifierManager,
   VMArguments,
 } from '@glimmer/interfaces';
+import { setInternalModifierManager } from '@glimmer/manager';
 import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { INVOKE } from '../helpers/action';
@@ -201,12 +202,10 @@ export class ActionState {
   }
 }
 
-// implements ModifierManager<Action>
-export default class ActionModifierManager
-  implements InternalModifierManager<ActionState, unknown> {
+class ActionModifierManager implements InternalModifierManager<ActionState, object> {
   create(
     element: SimpleElement,
-    _state: unknown,
+    _state: object,
     args: VMArguments,
     _dynamicScope: DynamicScope,
     dom: GlimmerTreeChanges
@@ -310,3 +309,7 @@ export default class ActionModifierManager
     return actionState;
   }
 }
+
+const ACTION_MODIFIER_MANAGER = new ActionModifierManager();
+
+export default setInternalModifierManager(() => ACTION_MODIFIER_MANAGER, {});
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts b/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
deleted file mode 100644
index 9ba2a1154e1..00000000000
--- a/packages/@ember/-internals/glimmer/lib/modifiers/custom.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-import { Factory } from '@ember/-internals/owner';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import {
-  Arguments,
-  InternalModifierManager,
-  ModifierCapabilities,
-  ModifierCapabilitiesVersions,
-  ModifierManager,
-  VMArguments,
-} from '@glimmer/interfaces';
-import { buildCapabilities, registerDestructor, reifyArgs } from '@glimmer/runtime';
-import {
-  createUpdatableTag,
-  deprecateMutationsInTrackingTransaction,
-  untrack,
-  UpdatableTag,
-} from '@glimmer/validator';
-import { SimpleElement } from '@simple-dom/interface';
-import { argsProxyFor } from '../utils/args-proxy';
-
-export interface CustomModifierDefinitionState<ModifierInstance> {
-  ModifierClass: Factory<ModifierInstance>;
-  name: string;
-  delegate: ModifierManager<ModifierInstance>;
-}
-
-export function capabilities<Version extends keyof ModifierCapabilitiesVersions>(
-  managerAPI: Version,
-  optionalFeatures: ModifierCapabilitiesVersions[Version] = {}
-): ModifierCapabilities {
-  assert(
-    'Invalid modifier manager compatibility specified',
-    managerAPI === '3.13' || managerAPI === '3.22'
-  );
-
-  return buildCapabilities({
-    disableAutoTracking: Boolean(optionalFeatures.disableAutoTracking),
-    useArgsProxy: managerAPI === '3.13' ? false : true,
-    passFactoryToCreate: managerAPI === '3.13',
-  });
-}
-
-export class CustomModifierDefinition<ModifierInstance> {
-  public state: CustomModifierDefinitionState<ModifierInstance>;
-  public manager: InternalModifierManager<
-    unknown | null,
-    CustomModifierDefinitionState<ModifierInstance>
-  >;
-
-  constructor(
-    public name: string,
-    public ModifierClass: Factory<ModifierInstance>,
-    public delegate: ModifierManager<ModifierInstance>,
-    isInteractive: boolean
-  ) {
-    this.state = {
-      ModifierClass,
-      name,
-      delegate,
-    };
-
-    this.manager = isInteractive
-      ? CUSTOM_INTERACTIVE_MODIFIER_MANAGER
-      : CUSTOM_NON_INTERACTIVE_MODIFIER_MANAGER;
-  }
-}
-
-export interface CustomModifierState<ModifierInstance> {
-  tag: UpdatableTag;
-  element: SimpleElement;
-  delegate: ModifierManager<ModifierInstance>;
-  modifier: ModifierInstance;
-  args: Arguments;
-  debugName?: string;
-}
-
-/**
-  The CustomModifierManager allows addons to provide custom modifier
-  implementations that integrate seamlessly into Ember. This is accomplished
-  through a delegate, registered with the custom modifier manager, which
-  implements a set of hooks that determine modifier behavior.
-  To create a custom modifier manager, instantiate a new CustomModifierManager
-  class and pass the delegate as the first argument:
-
-  ```js
-  let manager = new CustomModifierManager({
-    // ...delegate implementation...
-  });
-  ```
-
-  ## Delegate Hooks
-
-  Throughout the lifecycle of a modifier, the modifier manager will invoke
-  delegate hooks that are responsible for surfacing those lifecycle changes to
-  the end developer.
-  * `createModifier()` - invoked when a new instance of a modifier should be created
-  * `installModifier()` - invoked when the modifier is installed on the element
-  * `updateModifier()` - invoked when the arguments passed to a modifier change
-  * `destroyModifier()` - invoked when the modifier is about to be destroyed
-*/
-class InteractiveCustomModifierManager<ModifierInstance>
-  implements
-    InternalModifierManager<
-      CustomModifierState<ModifierInstance>,
-      CustomModifierDefinitionState<ModifierInstance>
-    > {
-  create(
-    element: SimpleElement,
-    definition: CustomModifierDefinitionState<ModifierInstance>,
-    vmArgs: VMArguments
-  ) {
-    let { delegate, ModifierClass } = definition;
-    let capturedArgs = vmArgs.capture();
-
-    let { useArgsProxy, passFactoryToCreate } = delegate.capabilities;
-
-    let args = useArgsProxy ? argsProxyFor(capturedArgs, 'modifier') : reifyArgs(capturedArgs);
-
-    let instance: ModifierInstance;
-
-    if (DEBUG && deprecateMutationsInTrackingTransaction !== undefined) {
-      deprecateMutationsInTrackingTransaction(() => {
-        instance = delegate.createModifier(
-          passFactoryToCreate ? ModifierClass : ModifierClass.class,
-          args
-        );
-      });
-    } else {
-      instance = delegate.createModifier(
-        passFactoryToCreate ? ModifierClass : ModifierClass.class,
-        args
-      );
-    }
-
-    let tag = createUpdatableTag();
-    let state: CustomModifierState<ModifierInstance>;
-    if (useArgsProxy) {
-      state = {
-        tag,
-        element,
-        delegate,
-        args,
-        modifier: instance!,
-      };
-    } else {
-      state = {
-        tag,
-        element,
-        delegate,
-        modifier: instance!,
-        get args() {
-          return reifyArgs(capturedArgs);
-        },
-      };
-    }
-
-    if (DEBUG) {
-      state.debugName = definition.name;
-    }
-
-    registerDestructor(state, () => delegate.destroyModifier(instance, state.args));
-
-    return state;
-  }
-
-  getDebugName({ debugName }: CustomModifierState<ModifierInstance>) {
-    return debugName!;
-  }
-
-  getTag({ tag }: CustomModifierState<ModifierInstance>) {
-    return tag;
-  }
-
-  install(state: CustomModifierState<ModifierInstance>) {
-    let { element, args, delegate, modifier } = state;
-
-    let { capabilities } = delegate;
-
-    if (capabilities.disableAutoTracking === true) {
-      untrack(() => delegate.installModifier(modifier, element, args));
-    } else {
-      delegate.installModifier(modifier, element, args);
-    }
-  }
-
-  update(state: CustomModifierState<ModifierInstance>) {
-    let { args, delegate, modifier } = state;
-    let { capabilities } = delegate;
-
-    if (capabilities.disableAutoTracking === true) {
-      untrack(() => delegate.updateModifier(modifier, args));
-    } else {
-      delegate.updateModifier(modifier, args);
-    }
-  }
-
-  getDestroyable(state: CustomModifierState<ModifierInstance>) {
-    return state;
-  }
-}
-
-class NonInteractiveCustomModifierManager<ModifierInstance>
-  implements InternalModifierManager<null, CustomModifierDefinitionState<ModifierInstance>> {
-  create() {
-    return null;
-  }
-
-  getDebugName() {
-    return '';
-  }
-
-  getTag() {
-    return null;
-  }
-
-  install() {}
-
-  update() {}
-
-  getDestroyable() {
-    return null;
-  }
-}
-
-const CUSTOM_INTERACTIVE_MODIFIER_MANAGER = new InteractiveCustomModifierManager();
-const CUSTOM_NON_INTERACTIVE_MODIFIER_MANAGER = new NonInteractiveCustomModifierManager();
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index 7c8e7928583..0fcdbcd83b6 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -1,14 +1,15 @@
 import { Owner, setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
+import { registerDestructor } from '@glimmer/destroyable';
 import {
   CapturedArguments,
   Destroyable,
   InternalModifierManager as ModifierManager,
   VMArguments,
 } from '@glimmer/interfaces';
+import { setInternalModifierManager } from '@glimmer/manager';
 import { valueForRef } from '@glimmer/reference';
-import { registerDestructor, setModifierManager } from '@glimmer/runtime';
 import { SimpleElement } from '@simple-dom/interface';
 
 export default class InternalModifier {
@@ -86,7 +87,7 @@ class InternalModifierManager
     return null;
   }
 
-  getDebugName({ name }: InternalModifierState): string {
+  getDebugName({ name }: typeof InternalModifier): string {
     return name;
   }
 
@@ -104,4 +105,4 @@ class InternalModifierManager
   }
 }
 
-setModifierManager((owner: Owner) => new InternalModifierManager(owner), InternalModifier);
+setInternalModifierManager((owner: Owner) => new InternalModifierManager(owner), InternalModifier);
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 596d01be855..aaee250600d 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -1,9 +1,10 @@
-import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
+import { registerDestructor } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import { CapturedArguments, InternalModifierManager, VMArguments } from '@glimmer/interfaces';
+import { setInternalModifierManager } from '@glimmer/manager';
 import { valueForRef } from '@glimmer/reference';
-import { registerDestructor, reifyNamed } from '@glimmer/runtime';
+import { reifyNamed } from '@glimmer/runtime';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import buildUntouchableThis from '../utils/untouchable-this';
@@ -51,7 +52,6 @@ const SUPPORTS_EVENT_OPTIONS = (() => {
 
 export class OnModifierState {
   public tag = createUpdatableTag();
-  public owner: Owner;
   public element: Element;
   public args: CapturedArguments;
   public eventName!: string;
@@ -63,8 +63,7 @@ export class OnModifierState {
   public options?: AddEventListenerOptions;
   public shouldUpdate = true;
 
-  constructor(owner: Owner, element: Element, args: CapturedArguments) {
-    this.owner = owner;
+  constructor(element: Element, args: CapturedArguments) {
     this.element = element;
     this.args = args;
   }
@@ -311,16 +310,8 @@ function addEventListener(
   @public
   @since 3.11.0
 */
-export default class OnModifierManager
-  implements InternalModifierManager<OnModifierState | null, unknown> {
+class OnModifierManager implements InternalModifierManager<OnModifierState | null, object> {
   public SUPPORTS_EVENT_OPTIONS: boolean = SUPPORTS_EVENT_OPTIONS;
-  public isInteractive: boolean;
-  private owner: Owner;
-
-  constructor(owner: Owner, isInteractive: boolean) {
-    this.isInteractive = isInteractive;
-    this.owner = owner;
-  }
 
   getDebugName(): string {
     return 'on';
@@ -332,16 +323,12 @@ export default class OnModifierManager
 
   create(
     element: SimpleElement | Element,
-    _state: unknown,
+    _state: object,
     args: VMArguments
   ): OnModifierState | null {
-    if (!this.isInteractive) {
-      return null;
-    }
-
     const capturedArgs = args.capture();
 
-    return new OnModifierState(this.owner, <Element>element, capturedArgs);
+    return new OnModifierState(<Element>element, capturedArgs);
   }
 
   getTag(state: OnModifierState | null): UpdatableTag | null {
@@ -395,3 +382,11 @@ export default class OnModifierManager
     return state;
   }
 }
+
+const ON_MODIFIER_MANAGER = new OnModifierManager();
+
+const on = {};
+
+setInternalModifierManager(() => ON_MODIFIER_MANAGER, on);
+
+export default on;
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 3d59fcafc18..672876cae14 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -3,6 +3,7 @@ import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { backburner, getCurrentRunLoop } from '@ember/runloop';
+import { destroy } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
@@ -25,7 +26,6 @@ import {
   clientBuilder,
   CurriedComponentDefinition,
   curry,
-  destroy,
   DOMChanges,
   DOMTreeConstruction,
   inTransaction,
@@ -36,13 +36,12 @@ import { unwrapTemplate } from '@glimmer/util';
 import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
 import { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
 import RSVP from 'rsvp';
-import CompileTimeResolverImpl from './compile-time-lookup';
-import { BOUNDS } from './component';
+import { BOUNDS } from './component-managers/curly';
 import { createRootOutlet } from './component-managers/outlet';
 import { RootComponentDefinition } from './component-managers/root';
 import { NodeDOMTreeConstruction } from './dom';
 import { EmberEnvironmentDelegate } from './environment';
-import RuntimeResolver from './resolver';
+import ResolverImpl from './resolver';
 import { Component } from './utils/curly-component-state-bucket';
 import { OutletState } from './utils/outlet';
 import OutletView from './views/outlet';
@@ -285,7 +284,7 @@ export abstract class Renderer {
   private _lastRevision = -1;
   private _destroyed = false;
 
-  readonly _runtimeResolver: RuntimeResolver;
+  readonly _runtimeResolver: ResolverImpl;
 
   constructor(
     owner: Owner,
@@ -304,12 +303,11 @@ export abstract class Renderer {
     this._builder = builder;
 
     // resolver is exposed for tests
-    let runtimeResolver = (this._runtimeResolver = new RuntimeResolver(owner, env.isInteractive));
-    let compileTimeResolver = new CompileTimeResolverImpl(runtimeResolver);
+    let resolver = (this._runtimeResolver = new ResolverImpl());
 
     let sharedArtifacts = artifacts();
 
-    this._context = programCompilationContext(sharedArtifacts, compileTimeResolver);
+    this._context = programCompilationContext(sharedArtifacts, resolver);
 
     let runtimeEnvironmentDelegate = new EmberEnvironmentDelegate(owner, env.isInteractive);
     this._runtime = runtimeContext(
@@ -321,7 +319,7 @@ export abstract class Renderer {
       },
       runtimeEnvironmentDelegate,
       sharedArtifacts,
-      runtimeResolver
+      resolver
     );
   }
 
@@ -333,19 +331,19 @@ export abstract class Renderer {
       debugRenderTree
     );
 
-    return debugRenderTree!;
+    return debugRenderTree;
   }
 
   // renderer HOOKS
 
-  appendOutletView(view: OutletView, target: SimpleElement) {
+  appendOutletView(view: OutletView, target: SimpleElement): void {
     let definition = createRootOutlet(view);
-    this._appendDefinition(view, curry(definition), target);
+    this._appendDefinition(view, curry(definition, null), target);
   }
 
-  appendTo(view: Component, target: SimpleElement) {
+  appendTo(view: Component, target: SimpleElement): void {
     let definition = new RootComponentDefinition(view);
-    this._appendDefinition(view, curry(definition), target);
+    this._appendDefinition(view, curry(definition, null), target);
   }
 
   _appendDefinition(
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 4ca1d316245..1f7eec6f6c0 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,43 +1,40 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
-import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
-import { isTemplateOnlyComponent } from '@ember/component/template-only';
 import { assert, deprecate } from '@ember/debug';
 import { PARTIALS } from '@ember/deprecated-features';
 import EmberError from '@ember/error';
 import { _instrumentStart } from '@ember/instrumentation';
+import { DEBUG } from '@glimmer/env';
 import {
-  ComponentDefinition,
-  Helper,
+  CompileTimeResolver,
+  HelperDefinitionState,
+  ModifierDefinitionState,
   Option,
   PartialDefinition,
+  ResolvedComponentDefinition,
   RuntimeResolver,
   Template,
   TemplateFactory,
 } from '@glimmer/interfaces';
-import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
 import {
-  getComponentManager,
   getComponentTemplate,
+  getInternalComponentManager,
+  setInternalHelperManager,
+} from '@glimmer/manager';
+import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
+import {
   getDynamicVar,
-  getHelperManager,
-  getModifierManager,
-  isInternalComponentManager,
-  isInternalHelper,
-  isInternalModifierManager,
-  ModifierDefinition,
+  TEMPLATE_ONLY_COMPONENT_MANAGER,
+  templateOnlyComponent,
 } from '@glimmer/runtime';
-import { CurlyComponentDefinition } from './component-managers/curly';
-import { CustomManagerDefinition } from './component-managers/custom';
-import { InternalComponentDefinition } from './component-managers/internal';
-import { TemplateOnlyComponentDefinition } from './component-managers/template-only';
-import InternalComponent from './components/internal';
+import { _WeakSet } from '@glimmer/util';
+import { CURLY_COMPONENT_MANAGER } from './component-managers/curly';
 import {
+  CLASSIC_HELPER_MANAGER_FACTORY,
   HelperFactory,
   HelperInstance,
-  isClassicHelperManager,
-  SIMPLE_CLASSIC_HELPER_MANAGER,
+  isClassicHelper,
   SimpleHelper,
 } from './helper';
 import { default as componentAssertionHelper } from './helpers/-assert-implicit-component-helper-argument';
@@ -47,20 +44,19 @@ import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
 import { default as array } from './helpers/array';
 import { default as concat } from './helpers/concat';
-import customHelper from './helpers/custom';
 import { default as eachIn } from './helpers/each-in';
 import { default as fn } from './helpers/fn';
 import { default as get } from './helpers/get';
 import { default as hash } from './helpers/hash';
 import { inlineIf, inlineUnless } from './helpers/if-unless';
+import { internalHelper } from './helpers/internal-helper';
 import { default as log } from './helpers/log';
 import { default as mut } from './helpers/mut';
 import { default as queryParams } from './helpers/query-param';
 import { default as readonly } from './helpers/readonly';
 import { default as unbound } from './helpers/unbound';
-import ActionModifierManager from './modifiers/action';
-import { CustomModifierDefinition } from './modifiers/custom';
-import OnModifierManager from './modifiers/on';
+import actionModifier from './modifiers/action';
+import onModifier from './modifiers/on';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
 
@@ -181,11 +177,7 @@ if (PARTIALS) {
   };
 }
 
-interface IBuiltInHelpers {
-  [name: string]: Helper | undefined;
-}
-
-const BUILTINS_HELPERS: IBuiltInHelpers = {
+const BUILTINS_HELPERS = {
   if: inlineIf,
   action,
   array,
@@ -203,226 +195,114 @@ const BUILTINS_HELPERS: IBuiltInHelpers = {
   '-each-in': eachIn,
   '-normalize-class': normalizeClassHelper,
   '-track-array': trackArray,
-  '-get-dynamic-var': getDynamicVar,
+  '-get-dynamic-var': internalHelper(getDynamicVar),
   '-mount': mountHelper,
   '-outlet': outletHelper,
   '-assert-implicit-component-helper-argument': componentAssertionHelper,
   '-in-el-null': inElementNullCheckHelper,
 };
 
-interface IBuiltInModifiers {
-  [name: string]: ModifierDefinition | undefined;
-}
-
-export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
-  public isInteractive: boolean;
-
-  private handles: any[] = [
-    undefined, // ensure no falsy handle
-  ];
-  private objToHandle = new WeakMap<any, number>();
-
-  private builtInHelpers: IBuiltInHelpers = BUILTINS_HELPERS;
-
-  private builtInModifiers: IBuiltInModifiers;
-
-  private componentDefinitionCache: Map<object, ComponentDefinition | null> = new Map();
-
-  public componentDefinitionCount = 0;
-  public helperDefinitionCount = 0;
-
-  constructor(owner: Owner, isInteractive: boolean) {
-    this.isInteractive = isInteractive;
-
-    this.builtInModifiers = {
-      action: { manager: new ActionModifierManager(), state: null },
-      on: { manager: new OnModifierManager(owner, isInteractive), state: null },
-    };
-  }
-
-  /***  IRuntimeResolver ***/
-
-  /**
-   * public componentDefHandleCount = 0;
-   * Called while executing Append Op.PushDynamicComponentManager if string
-   */
-  lookupComponent(name: string, owner: Owner): Option<ComponentDefinition> {
-    let handle = this.lookupComponentHandle(name, owner);
-    if (handle === null) {
-      assert(
-        `Could not find component named "${name}" (no component or template with that name was found)`
-      );
-      return null;
-    }
-    return this.resolve(handle);
-  }
-
-  lookupComponentHandle(name: string, owner: Owner) {
-    let nextHandle = this.handles.length;
-    let handle = this.handle(this._lookupComponentDefinition(name, owner));
-
-    assert(
-      'Could not find component `<TextArea />` (did you mean `<Textarea />`?)',
-      !(name === 'text-area' && handle === null)
-    );
-
-    if (nextHandle === handle) {
-      this.componentDefinitionCount++;
-    }
-    return handle;
-  }
+const BUILTINS_MODIFIERS = {
+  action: actionModifier,
+  on: onModifier,
+};
 
-  /**
-   * Called by RuntimeConstants to lookup unresolved handles.
-   */
-  resolve<U>(handle: number): U {
-    return this.handles[handle];
-  }
-  // End IRuntimeResolver
-
-  /**
-   * Called by CompileTimeLookup compiling Unknown or Helper OpCode
-   */
-  lookupHelper(name: string, owner: Owner): Option<number> {
-    let nextHandle = this.handles.length;
-    let helper = this._lookupHelper(name, owner);
-    if (helper !== null) {
-      let handle = this.handle(helper);
-
-      if (nextHandle === handle) {
-        this.helperDefinitionCount++;
-      }
-      return handle;
-    }
-    return null;
-  }
+const CLASSIC_HELPER_MANAGER_ASSOCIATED = new _WeakSet();
 
-  /**
-   * Called by CompileTimeLookup compiling the
-   */
-  lookupModifier(name: string, owner: Owner): Option<number> {
-    return this.handle(this._lookupModifier(name, owner));
-  }
+export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTimeResolver<Owner> {
+  private componentDefinitionCache: Map<object, ResolvedComponentDefinition | null> = new Map();
 
-  /**
-   * Called by CompileTimeLookup to lookup partial
-   */
-  lookupPartial(name: string, owner: Owner): Option<number> {
+  lookupPartial(name: string, owner: Owner): Option<PartialDefinition> {
     if (PARTIALS) {
-      let partial = this._lookupPartial(name, owner);
-      return this.handle(partial);
-    } else {
-      return null;
-    }
-  }
-
-  // TODO: This isn't necessary in all embedding environments, we should likely
-  // make it optional within Glimmer-VM
-  compilable(): any {}
+      let templateFactory = lookupPartial(name, owner);
+      let template = templateFactory(owner);
 
-  // end CompileTimeLookup
-
-  // needed for lazy compile time lookup
-  private handle(obj: unknown) {
-    if (obj === undefined || obj === null) {
+      return new PartialDefinitionImpl(name, template);
+    } else {
       return null;
     }
-    let handle: number | undefined = this.objToHandle.get(obj);
-    if (handle === undefined) {
-      handle = this.handles.push(obj) - 1;
-      this.objToHandle.set(obj, handle);
-    }
-    return handle;
   }
 
-  private _lookupHelper(_name: string, owner: Owner): Option<Helper> {
+  lookupHelper(name: string, owner: Owner): Option<HelperDefinitionState> {
     assert(
-      `You attempted to overwrite the built-in helper "${_name}" which is not allowed. Please rename the helper.`,
-      !(this.builtInHelpers[_name] && owner.hasRegistration(`helper:${_name}`))
+      `You attempted to overwrite the built-in helper "${name}" which is not allowed. Please rename the helper.`,
+      !(BUILTINS_HELPERS[name] && owner.hasRegistration(`helper:${name}`))
     );
 
-    const helper = this.builtInHelpers[_name];
+    const helper = BUILTINS_HELPERS[name];
     if (helper !== undefined) {
       return helper;
     }
 
-    let name = _name;
-
-    const factory =
-      owner.factoryFor<SimpleHelper | HelperInstance, HelperFactory<SimpleHelper | HelperInstance>>(
-        `helper:${name}`
-      ) || owner.factoryFor(`helper:${name}`);
+    const factory = owner.factoryFor<
+      SimpleHelper | HelperInstance,
+      HelperFactory<SimpleHelper | HelperInstance>
+    >(`helper:${name}`);
 
-    if (factory === undefined || factory.class === undefined) {
+    if (factory === undefined) {
       return null;
     }
 
-    const manager = getHelperManager(owner, factory.class);
+    let definition = factory.class;
 
-    if (manager === undefined) {
+    if (definition === undefined) {
       return null;
     }
 
-    assert(
-      'helper managers have not been enabled yet, you must use classic helpers',
-      EMBER_GLIMMER_HELPER_MANAGER ||
-        isClassicHelperManager(manager) ||
-        manager === SIMPLE_CLASSIC_HELPER_MANAGER
-    );
-
-    assert(
-      `internal helpers are not supported via \`getHelperManager\` yet, found an internal manager for ${name}`,
-      !isInternalHelper(manager)
-    );
-
-    // For classic class based helpers, we need to pass the factoryFor result itself rather
-    // than the raw value (`factoryFor(...).class`). This is because injections are already
-    // bound in the factoryFor result, including type-based injections
-    return customHelper(manager, isClassicHelperManager(manager) ? factory : factory.class);
-  }
+    if (typeof definition === 'function' && isClassicHelper(definition)) {
+      // For classic class based helpers, we need to pass the factoryFor result itself rather
+      // than the raw value (`factoryFor(...).class`). This is because injections are already
+      // bound in the factoryFor result, including type-based injections
+
+      if (DEBUG) {
+        // In DEBUG we need to only set the associated value once, otherwise
+        // we'll trigger an assertion
+        if (!CLASSIC_HELPER_MANAGER_ASSOCIATED.has(factory)) {
+          CLASSIC_HELPER_MANAGER_ASSOCIATED.add(factory);
+          setInternalHelperManager(CLASSIC_HELPER_MANAGER_FACTORY, factory);
+        }
+      } else {
+        setInternalHelperManager(CLASSIC_HELPER_MANAGER_FACTORY, factory);
+      }
 
-  private _lookupPartial(name: string, owner: Owner): PartialDefinition {
-    let templateFactory = lookupPartial(name, owner);
-    let template = templateFactory(owner);
+      return factory;
+    }
 
-    return new PartialDefinitionImpl(name, template);
+    return definition;
   }
 
-  private _lookupModifier(name: string, owner: Owner) {
-    let builtin = this.builtInModifiers[name];
+  lookupModifier(name: string, owner: Owner): Option<ModifierDefinitionState> {
+    let builtin = BUILTINS_MODIFIERS[name];
 
-    if (builtin === undefined) {
-      let modifier = owner.factoryFor<unknown, FactoryClass>(`modifier:${name}`);
-      if (modifier !== undefined) {
-        let manager = getModifierManager(owner, modifier.class!);
+    if (builtin !== undefined) {
+      return builtin;
+    }
 
-        assert(`Expected a modifier manager to exist, but did not find one for ${name}`, manager);
+    let modifier = owner.factoryFor<unknown, FactoryClass>(`modifier:${name}`);
 
-        assert(
-          `Internal modifier managers are not supported via \`getModifierManager\` yet, found an internal manager for ${name}`,
-          !isInternalModifierManager(manager)
-        );
-
-        return new CustomModifierDefinition(name, modifier, manager, this.isInteractive);
-      }
+    if (modifier === undefined) {
+      return null;
     }
 
-    return builtin;
+    return modifier.class || null;
   }
 
-  private _lookupComponentDefinition(_name: string, owner: Owner): Option<ComponentDefinition> {
-    let name = _name;
-
+  lookupComponent(name: string, owner: Owner): ResolvedComponentDefinition | null {
     let pair = lookupComponentPair(owner, name);
+
     if (pair === null) {
+      assert(
+        'Could not find component `<TextArea />` (did you mean `<Textarea />`?)',
+        name !== 'text-area'
+      );
       return null;
     }
 
-    let layout: Template | undefined;
+    let template: Template | null = null;
     let key: object;
 
     if (pair.component === null) {
-      key = layout = pair.layout!(owner);
+      key = template = pair.layout!(owner);
     } else {
       key = pair.component;
     }
@@ -432,60 +312,50 @@ export default class RuntimeResolverImpl implements RuntimeResolver<Owner> {
       return cachedComponentDefinition;
     }
 
-    if (layout === undefined && pair.layout !== null) {
-      layout = pair.layout(owner);
+    if (template === null && pair.layout !== null) {
+      template = pair.layout(owner);
     }
 
     let finalizer = _instrumentStart('render.getComponentDefinition', instrumentationPayload, name);
 
-    let definition: Option<ComponentDefinition> = null;
+    let definition: Option<ResolvedComponentDefinition> = null;
 
     if (pair.component === null) {
       if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
-        definition = new TemplateOnlyComponentDefinition(name, layout!);
+        definition = {
+          state: templateOnlyComponent(undefined, name),
+          manager: TEMPLATE_ONLY_COMPONENT_MANAGER,
+          template,
+        };
+      } else {
+        definition = {
+          state: owner.factoryFor(P`component:-default`)!,
+          manager: CURLY_COMPONENT_MANAGER,
+          template,
+        };
       }
-    } else if (isTemplateOnlyComponent(pair.component.class)) {
-      definition = new TemplateOnlyComponentDefinition(name, layout!);
-    }
-
-    if (pair.component !== null) {
+    } else {
       assert(`missing component class ${name}`, pair.component.class !== undefined);
 
-      let ComponentClass = pair.component.class!;
-      let manager = getComponentManager(owner, ComponentClass);
-
-      if (manager !== undefined) {
-        if (isInternalComponentManager(manager)) {
-          assert(`missing layout for internal component ${name}`, pair.layout !== null);
-
-          definition = new InternalComponentDefinition(
-            manager,
-            ComponentClass as typeof InternalComponent,
-            layout!
-          );
-        } else {
-          definition = new CustomManagerDefinition(
-            name,
-            pair.component,
-            manager,
-            layout !== undefined
-              ? layout
-              : owner.lookup<TemplateFactory>(P`template:components/-default`)!(owner)
-          );
-        }
-      }
-    }
+      let factory = pair.component;
+      let ComponentClass = factory.class!;
+      let manager = getInternalComponentManager(owner, ComponentClass);
 
-    if (definition === null) {
-      definition = new CurlyComponentDefinition(
-        name,
-        pair.component || owner.factoryFor(P`component:-default`),
-        layout
-      );
+      definition = {
+        state: manager === CURLY_COMPONENT_MANAGER ? factory : ComponentClass,
+        manager,
+        template,
+      };
     }
 
     finalizer();
     this.componentDefinitionCache.set(key, definition);
+
+    assert(
+      'Could not find component `<TextArea />` (did you mean `<Textarea />`?)',
+      !(definition === null && name === 'text-area')
+    );
+
     return definition;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 45546875f0c..5d4b384e30e 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -9,7 +9,6 @@ import TextArea from './components/textarea';
 import { clientBuilder, rehydrationBuilder, serializeBuilder } from './dom';
 import loc from './helpers/loc';
 import { InertRenderer, InteractiveRenderer } from './renderer';
-import ComponentTemplate from './templates/component';
 import InputTemplate from './templates/input';
 import OutletTemplate from './templates/outlet';
 import RootTemplate from './templates/root';
@@ -54,8 +53,6 @@ export function setupEngineRegistry(registry: Registry) {
   registry.register('template:-outlet', OutletTemplate as any);
   registry.injection('view:-outlet', 'template', 'template:-outlet');
 
-  registry.register(P`template:components/-default`, ComponentTemplate as any);
-
   registry.optionsForType('helper', { instantiate: false });
 
   registry.register('helper:loc', loc);
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 4099315fd5b..67ce039f346 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -13,6 +13,7 @@ import {
   EMPTY_POSITIONAL,
 } from '@glimmer/runtime';
 import { MountDefinition } from '../component-managers/mount';
+import { internalHelper } from '../helpers/internal-helper';
 
 /**
   The `{{mount}}` helper lets you embed a routeless engine in a template.
@@ -54,73 +55,75 @@ import { MountDefinition } from '../component-managers/mount';
   @for Ember.Templates.helpers
   @public
 */
-export function mountHelper(
-  args: VMArguments,
-  vm: VM
-): Reference<CurriedComponentDefinition | null> {
-  let env = vm.env as Environment<Owner>;
-  let nameRef = args.positional.at(0) as Reference<Option<string>>;
-  let captured: Option<CapturedArguments> = null;
-
-  assert(
-    'You can only pass a single positional argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.',
-    args.positional.length === 1
-  );
-
-  if (DEBUG && args.named) {
-    let keys = args.named.names;
-    let extra = keys.filter((k) => k !== 'model');
+export const mountHelper = internalHelper(
+  (args: VMArguments, vm: VM): Reference<CurriedComponentDefinition | null> => {
+    let env = vm.env as Environment<Owner>;
+    let nameRef = args.positional.at(0) as Reference<Option<string>>;
+    let captured: Option<CapturedArguments> = null;
 
     assert(
-      'You can only pass a `model` argument to the {{mount}} helper, ' +
-        'e.g. {{mount "profile-engine" model=this.profile}}. ' +
-        `You passed ${extra.join(',')}.`,
-      extra.length === 0
+      'You can only pass a single positional argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.',
+      args.positional.length === 1
     );
-  }
 
-  // TODO: the functionality to create a proper CapturedArgument should be
-  // exported by glimmer, or that it should provide an overload for `curry`
-  // that takes `PreparedArguments`
-  if (args.named.has('model')) {
-    assert('[BUG] this should already be checked by the macro', args.named.length === 1);
+    if (DEBUG && args.named) {
+      let keys = args.named.names;
+      let extra = keys.filter((k) => k !== 'model');
 
-    let named = args.named.capture();
+      assert(
+        'You can only pass a `model` argument to the {{mount}} helper, ' +
+          'e.g. {{mount "profile-engine" model=this.profile}}. ' +
+          `You passed ${extra.join(',')}.`,
+        extra.length === 0
+      );
+    }
 
-    captured = createCapturedArgs(named, EMPTY_POSITIONAL);
-  }
+    // TODO: the functionality to create a proper CapturedArgument should be
+    // exported by glimmer, or that it should provide an overload for `curry`
+    // that takes `PreparedArguments`
+    if (args.named.has('model')) {
+      assert(
+        '[BUG] this should already be checked by the template transform',
+        args.named.length === 1
+      );
 
-  let lastName: Option<string>, lastDef: Option<CurriedComponentDefinition>;
+      let named = args.named.capture();
 
-  return createComputeRef(() => {
-    let name = valueForRef(nameRef);
+      captured = createCapturedArgs(named, EMPTY_POSITIONAL);
+    }
 
-    if (typeof name === 'string') {
-      if (lastName === name) {
-        return lastDef;
-      }
+    let lastName: Option<string>, lastDef: Option<CurriedComponentDefinition>;
 
-      assert(
-        `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`,
-        env.owner.hasRegistration(`engine:${name}`)
-      );
+    return createComputeRef(() => {
+      let name = valueForRef(nameRef);
 
-      if (!env.owner.hasRegistration(`engine:${name}`)) {
-        return null;
-      }
+      if (typeof name === 'string') {
+        if (lastName === name) {
+          return lastDef;
+        }
 
-      lastName = name;
-      lastDef = curry(new MountDefinition(name), captured);
+        assert(
+          `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`,
+          env.owner.hasRegistration(`engine:${name}`)
+        );
 
-      return lastDef;
-    } else {
-      assert(
-        `Invalid engine name '${name}' specified, engine name must be either a string, null or undefined.`,
-        name === null || name === undefined
-      );
-      lastDef = null;
-      lastName = null;
-      return null;
-    }
-  });
-}
+        if (!env.owner.hasRegistration(`engine:${name}`)) {
+          return null;
+        }
+
+        lastName = name;
+        lastDef = curry(new MountDefinition(name), captured);
+
+        return lastDef;
+      } else {
+        assert(
+          `Invalid engine name '${name}' specified, engine name must be either a string, null or undefined.`,
+          name === null || name === undefined
+        );
+        lastDef = null;
+        lastName = null;
+        return null;
+      }
+    });
+  }
+);
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 799ec366d71..f7a5c131bc5 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -16,6 +16,7 @@ import {
 } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
 import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
+import { internalHelper } from '../helpers/internal-helper';
 import { DynamicScope } from '../renderer';
 import { isTemplateFactory } from '../template';
 import { OutletState } from '../utils/outlet';
@@ -67,7 +68,7 @@ import { OutletState } from '../utils/outlet';
   @for Ember.Templates.helpers
   @public
 */
-export function outletHelper(args: VMArguments, vm: VM) {
+export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
   let scope = vm.dynamicScope() as DynamicScope;
   let nameRef: Reference<string>;
 
@@ -110,7 +111,7 @@ export function outletHelper(args: VMArguments, vm: VM) {
 
     return definition;
   });
-}
+});
 
 function stateFor(ref: Reference<OutletState | undefined>): OutletDefinitionState | null {
   let outlet = valueForRef(ref);
diff --git a/packages/@ember/-internals/glimmer/lib/templates/component.d.ts b/packages/@ember/-internals/glimmer/lib/templates/component.d.ts
deleted file mode 100644
index 30e2f374432..00000000000
--- a/packages/@ember/-internals/glimmer/lib/templates/component.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { TemplateFactory } from '@glimmer/interfaces';
-declare const TEMPLATE: TemplateFactory;
-export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/component.hbs b/packages/@ember/-internals/glimmer/lib/templates/component.hbs
deleted file mode 100644
index fb5c4b157d1..00000000000
--- a/packages/@ember/-internals/glimmer/lib/templates/component.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield}}
\ No newline at end of file
diff --git a/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts b/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
deleted file mode 100644
index 154ce71999b..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/args-proxy.ts
+++ /dev/null
@@ -1,210 +0,0 @@
-import { CUSTOM_TAG_FOR } from '@ember/-internals/metal';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import {
-  Arguments,
-  CapturedArguments,
-  CapturedNamedArguments,
-  CapturedPositionalArguments,
-} from '@glimmer/interfaces';
-import { Reference, valueForRef } from '@glimmer/reference';
-import { Tag, track } from '@glimmer/validator';
-
-function convertToInt(prop: number | string | symbol): number | null {
-  if (typeof prop === 'symbol') return null;
-
-  const num = Number(prop);
-
-  if (isNaN(num)) return null;
-
-  return num % 1 === 0 ? num : null;
-}
-
-function tagForNamedArg(namedArgs: CapturedNamedArguments, key: string): Tag {
-  return track(() => {
-    if (key in namedArgs) {
-      valueForRef(namedArgs[key]);
-    }
-  });
-}
-
-function tagForPositionalArg(positionalArgs: CapturedPositionalArguments, key: string): Tag {
-  return track(() => {
-    if (key === '[]') {
-      // consume all of the tags in the positional array
-      positionalArgs.forEach(valueForRef);
-    }
-
-    const parsed = convertToInt(key);
-
-    if (parsed !== null && parsed < positionalArgs.length) {
-      // consume the tag of the referenced index
-      valueForRef(positionalArgs[parsed]);
-    }
-  });
-}
-
-export let argsProxyFor: (
-  capturedArgs: CapturedArguments,
-  type: 'component' | 'helper' | 'modifier'
-) => Arguments;
-
-if (HAS_NATIVE_PROXY) {
-  argsProxyFor = (capturedArgs, type) => {
-    const { named, positional } = capturedArgs;
-
-    let getNamedTag = (key: string) => tagForNamedArg(named, key);
-    let getPositionalTag = (key: string) => tagForPositionalArg(positional, key);
-
-    const namedHandler: ProxyHandler<{}> = {
-      get(_target, prop) {
-        const ref = named[prop as string];
-
-        if (ref !== undefined) {
-          return valueForRef(ref);
-        } else if (prop === CUSTOM_TAG_FOR) {
-          return getNamedTag;
-        }
-      },
-
-      has(_target, prop) {
-        return prop in named;
-      },
-
-      ownKeys(_target) {
-        return Object.keys(named);
-      },
-
-      isExtensible() {
-        return false;
-      },
-
-      getOwnPropertyDescriptor(_target, prop) {
-        assert(
-          'args proxies do not have real property descriptors, so you should never need to call getOwnPropertyDescriptor yourself. This code exists for enumerability, such as in for-in loops and Object.keys()',
-          prop in named
-        );
-
-        return {
-          enumerable: true,
-          configurable: true,
-        };
-      },
-    };
-
-    const positionalHandler: ProxyHandler<[]> = {
-      get(target, prop) {
-        if (prop === 'length') {
-          return positional.length;
-        }
-
-        const parsed = convertToInt(prop);
-
-        if (parsed !== null && parsed < positional.length) {
-          return valueForRef(positional[parsed]);
-        }
-
-        if (prop === CUSTOM_TAG_FOR) {
-          return getPositionalTag;
-        }
-
-        return (target as any)[prop];
-      },
-
-      isExtensible() {
-        return false;
-      },
-
-      has(_target, prop) {
-        const parsed = convertToInt(prop);
-
-        return parsed !== null && parsed < positional.length;
-      },
-    };
-
-    const namedTarget = Object.create(null);
-    const positionalTarget: unknown[] = [];
-
-    if (DEBUG) {
-      const setHandler = function (_target: unknown, prop: symbol | string | number): never {
-        throw new Error(
-          `You attempted to set ${String(
-            prop
-          )} on the arguments of a component, helper, or modifier. Arguments are immutable and cannot be updated directly, they always represent the values that is passed down. If you want to set default values, you should use a getter and local tracked state instead.`
-        );
-      };
-
-      const forInDebugHandler = (): never => {
-        throw new Error(
-          `Object.keys() was called on the positional arguments array for a ${type}, which is not supported. This function is a low-level function that should not need to be called for positional argument arrays. You may be attempting to iterate over the array using for...in instead of for...of.`
-        );
-      };
-
-      namedHandler.set = setHandler;
-      positionalHandler.set = setHandler;
-      positionalHandler.ownKeys = forInDebugHandler;
-    }
-
-    return {
-      named: new Proxy(namedTarget, namedHandler),
-      positional: new Proxy(positionalTarget, positionalHandler),
-    };
-  };
-} else {
-  argsProxyFor = (capturedArgs, _type) => {
-    const { named, positional } = capturedArgs;
-
-    let getNamedTag = (key: string) => tagForNamedArg(named, key);
-    let getPositionalTag = (key: string) => tagForPositionalArg(positional, key);
-
-    let namedProxy = {};
-
-    Object.defineProperty(namedProxy, CUSTOM_TAG_FOR, {
-      configurable: false,
-      enumerable: false,
-      value: getNamedTag,
-    });
-
-    Object.keys(named).forEach((name) => {
-      Object.defineProperty(namedProxy, name, {
-        enumerable: true,
-        configurable: true,
-        get() {
-          return valueForRef(named[name]);
-        },
-      });
-    });
-
-    let positionalProxy: unknown[] = [];
-
-    Object.defineProperty(positionalProxy, CUSTOM_TAG_FOR, {
-      configurable: false,
-      enumerable: false,
-      value: getPositionalTag,
-    });
-
-    positional.forEach((ref: Reference, index: number) => {
-      Object.defineProperty(positionalProxy, index, {
-        enumerable: true,
-        configurable: true,
-        get() {
-          return valueForRef(ref);
-        },
-      });
-    });
-
-    if (DEBUG) {
-      // Prevent mutations in development mode. This will not prevent the
-      // proxy from updating, but will prevent assigning new values or pushing
-      // for instance.
-      Object.freeze(namedProxy);
-      Object.freeze(positionalProxy);
-    }
-
-    return {
-      named: namedProxy,
-      positional: positionalProxy,
-    };
-  };
-}
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 72d89abc7b2..3e1e1aebef0 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,4 +1,5 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
+import { registerDestructor } from '@glimmer/destroyable';
 import {
   CapturedNamedArguments,
   Environment,
@@ -6,7 +7,6 @@ import {
   TemplateFactory,
 } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
-import { registerDestructor } from '@glimmer/runtime';
 import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
 import { Renderer } from '../renderer';
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 0ef126cc1b6..4d327384699 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -2,7 +2,7 @@ import { Owner } from '@ember/-internals/owner';
 import { deprecate } from '@ember/debug';
 import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
 import { ComponentManager } from '@glimmer/interfaces';
-import { setComponentManager as glimmerSetComponentManager } from '@glimmer/runtime';
+import { setComponentManager as glimmerSetComponentManager } from '@glimmer/manager';
 
 export function setComponentManager(
   stringOrFunction: string | ((owner: Owner) => ComponentManager<unknown>),
diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
index a1d357e67ef..e7c09a85d33 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
@@ -2,7 +2,7 @@ import { symbol } from '@ember/-internals/utils';
 import { MUTABLE_CELL } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
 import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
-import { ARGS } from '../component';
+import { ARGS } from '../component-managers/curly';
 import { ACTIONS } from '../helpers/action';
 
 // ComponentArgs takes EvaluatedNamedArgs and converts them into the
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index e9fde80104c..bc28ca70b9d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -6,20 +6,16 @@ import {
 } from 'internal-test-helpers';
 
 import { ENV } from '@ember/-internals/environment';
-import {
-  capabilities,
-  Component,
-  setComponentManager,
-  setComponentTemplate,
-} from '@ember/-internals/glimmer';
+import { Component, setComponentManager } from '@ember/-internals/glimmer';
 import { EngineInstanceOptions, Owner } from '@ember/-internals/owner';
 import { Route } from '@ember/-internals/routing';
-import templateOnly from '@ember/component/template-only';
 import Controller from '@ember/controller';
 import { captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { CapturedRenderNode } from '@glimmer/interfaces';
+import { componentCapabilities, setComponentTemplate } from '@glimmer/manager';
+import { templateOnlyComponent } from '@glimmer/runtime';
 import { expect } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
 import { compile } from 'ember-template-compiler';
@@ -957,7 +953,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         );
 
         this.addComponent('hello-world', {
-          ComponentClass: templateOnly(),
+          ComponentClass: templateOnlyComponent(),
           template: '{{@name}}',
         });
 
@@ -1032,7 +1028,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         this.addComponent('hello-world', {
           ComponentClass: setComponentTemplate(
             compile('{{@name}}', { moduleName: 'my-app/components/hello-world.hbs' }),
-            templateOnly()
+            templateOnlyComponent()
           ),
         });
 
@@ -1180,7 +1176,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         this.addComponent('hello-world', {
           ComponentClass: setComponentManager((_owner) => {
             return {
-              capabilities: capabilities('3.13', {}),
+              capabilities: componentCapabilities('3.13', {}),
 
               createComponent(_, { named: { name } }) {
                 return { name };
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index c5a36aed550..d8deb91f577 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -1,7 +1,6 @@
 import { moduleFor, RenderingTestCase, strip, classes, runTask } from 'internal-test-helpers';
-import { setModifierManager } from '@glimmer/runtime';
+import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
 import { ENV } from '@ember/-internals/environment';
-import { modifierCapabilities } from '@ember/-internals/glimmer';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 
 import { set, setProperties } from '@ember/-internals/metal';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
index 52041e5efe0..5948a096b64 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -3,8 +3,8 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 
+import { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
 import { Component, compile } from '../../utils/helpers';
-import { setComponentTemplate, getComponentTemplate } from '../../..';
 
 moduleFor(
   'Components test: setComponentTemplate',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index a39ef69fead..e6b868efdbc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1,3 +1,4 @@
+import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
 
 import { assign } from '@ember/polyfills';
@@ -584,14 +585,24 @@ moduleFor(
       this.assertText('hello Alex');
     }
 
-    ['@test raises an assertion when component path is not a component name (static)']() {
-      expectAssertion(() => {
+    ['@test raises an assertion when component path is not a component name (static)'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
+      assert.throws(() => {
         this.render('{{component (component "not-a-component")}}');
       }, 'Could not find component named "not-a-component" (no component or template with that name was found)');
     }
 
-    ['@test raises an assertion when component path is not a component name (dynamic)']() {
-      expectAssertion(() => {
+    ['@test raises an assertion when component path is not a component name (dynamic)'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
+      assert.throws(() => {
         this.render('{{component (component compName)}}', {
           compName: 'not-a-component',
         });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index 2f537033da0..d0d3c0aaa04 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -1,3 +1,4 @@
+import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
 import { set, computed } from '@ember/-internals/metal';
@@ -517,18 +518,28 @@ moduleFor(
       this.assertText('yippie! Caracas yummy Caracas arepas!');
     }
 
-    ['@test component with dynamic name argument resolving to non-existent component']() {
-      expectAssertion(() => {
+    ['@test component with dynamic name argument resolving to non-existent component'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
+      assert.throws(() => {
         this.render('{{component componentName}}', {
           componentName: 'does-not-exist',
         });
-      }, /Could not find component named "does-not-exist"/);
+      }, /Attempted to resolve `does-not-exist`, which was expected to be a component, but nothing was found./);
     }
 
-    ['@test component with static name argument for non-existent component']() {
-      expectAssertion(() => {
+    ['@test component with static name argument for non-existent component'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
+
+      assert.throws(() => {
         this.render('{{component "does-not-exist"}}');
-      }, /Could not find component named "does-not-exist"/);
+      }, /Attempted to resolve `does-not-exist`, which was expected to be a component, but nothing was found./);
     }
 
     ['@test component with dynamic component name resolving to a component, then non-existent component']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 6c5354248fe..d018536a50e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -1,7 +1,7 @@
 import { moduleFor, RenderingTestCase, classes, runTask } from 'internal-test-helpers';
 import { ENV } from '@ember/-internals/environment';
-import { setComponentTemplate } from '@ember/-internals/glimmer';
-import templateOnly from '@ember/component/template-only';
+import { setComponentTemplate } from '@glimmer/manager';
+import { templateOnlyComponent } from '@glimmer/runtime';
 import { compile } from 'ember-template-compiler';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { Component } from '../../utils/helpers';
@@ -268,7 +268,10 @@ moduleFor(
   'Components test: template-only components (using `templateOnlyComponent()`)',
   class extends RenderingTestCase {
     ['@test it can render a component']() {
-      this.registerComponent('foo-bar', { ComponentClass: templateOnly(), template: 'hello' });
+      this.registerComponent('foo-bar', {
+        ComponentClass: templateOnlyComponent(),
+        template: 'hello',
+      });
 
       this.render('{{foo-bar}}');
 
@@ -278,7 +281,7 @@ moduleFor(
     }
 
     ['@test it can render a component when template was not registered']() {
-      let ComponentClass = templateOnly();
+      let ComponentClass = templateOnlyComponent();
       setComponentTemplate(compile('hello'), ComponentClass);
 
       this.registerComponent('foo-bar', { ComponentClass });
@@ -291,7 +294,7 @@ moduleFor(
     }
 
     ['@test setComponentTemplate takes precedence over registered layout']() {
-      let ComponentClass = templateOnly();
+      let ComponentClass = templateOnlyComponent();
       setComponentTemplate(compile('hello'), ComponentClass);
 
       this.registerComponent('foo-bar', {
@@ -309,7 +312,7 @@ moduleFor(
     ['@test templateOnly accepts a moduleName to be used for debugging / toString purposes'](
       assert
     ) {
-      let ComponentClass = templateOnly('my-app/components/foo');
+      let ComponentClass = templateOnlyComponent('my-app/components/foo');
 
       assert.equal(`${ComponentClass}`, 'my-app/components/foo');
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index b8d014e071c..a69fd286096 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -1,12 +1,13 @@
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
+import { componentCapabilities } from '@glimmer/manager';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { set, setProperties, computed, tracked } from '@ember/-internals/metal';
-import { setComponentManager, capabilities } from '@ember/-internals/glimmer';
+import { setComponentManager } from '@ember/-internals/glimmer';
 
 const BasicComponentManager = EmberObject.extend({
-  capabilities: capabilities('3.4'),
+  capabilities: componentCapabilities('3.4'),
 
   createComponent(factory, args) {
     return factory.create({ args });
@@ -38,7 +39,7 @@ class ComponentManagerTest extends RenderingTestCase {
     super(...arguments);
 
     InstrumentedComponentManager = EmberObject.extend({
-      capabilities: capabilities('3.4', {
+      capabilities: componentCapabilities('3.4', {
         destructor: true,
         asyncLifecycleCallbacks: true,
       }),
@@ -129,7 +130,7 @@ moduleFor(
     ['@test it can have no template context']() {
       let ComponentClass = setComponentManager(() => {
         return EmberObject.create({
-          capabilities: capabilities('3.4'),
+          capabilities: componentCapabilities('3.4'),
 
           createComponent() {
             return null;
@@ -157,7 +158,7 @@ moduleFor(
       class Base {}
       setComponentManager(() => {
         return EmberObject.create({
-          capabilities: capabilities('3.4'),
+          capabilities: componentCapabilities('3.4'),
 
           createComponent(Factory, args) {
             return new Factory(args);
@@ -216,7 +217,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
-            capabilities: capabilities('3.4'),
+            capabilities: componentCapabilities('3.4'),
 
             createComponent(factory) {
               return factory.create();
@@ -421,7 +422,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
-            capabilities: capabilities('3.4', {
+            capabilities: componentCapabilities('3.4', {
               destructor: true,
             }),
 
@@ -471,7 +472,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
-            capabilities: capabilities('3.4', {
+            capabilities: componentCapabilities('3.4', {
               asyncLifecycleCallbacks: true,
             }),
 
@@ -675,7 +676,7 @@ moduleFor(
 
     ['@test updating attributes triggers updateComponent and didUpdateComponent'](assert) {
       let TestManager = EmberObject.extend({
-        capabilities: capabilities('3.4', {
+        capabilities: componentCapabilities('3.4', {
           destructor: true,
           asyncLifecycleCallbacks: true,
         }),
@@ -742,7 +743,7 @@ moduleFor(
           return new TestManager();
         }
 
-        capabilities = capabilities('3.13', {
+        capabilities = componentCapabilities('3.13', {
           updateHook: true,
         });
 
@@ -798,7 +799,7 @@ moduleFor(
       assert
     ) {
       class TestManager {
-        capabilities = capabilities('3.13', {
+        capabilities = componentCapabilities('3.13', {
           /* implied: updateHook: false */
         });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 8a9b5aac686..5589ba8a56b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -1,9 +1,8 @@
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { setModifierManager } from '@glimmer/runtime';
+import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { modifierCapabilities } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../utils/debug-stack';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 06d71be24f5..e205204760d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -1,12 +1,12 @@
 import { DEBUG } from '@glimmer/env';
+import { helperCapabilities, setHelperManager, setModifierManager } from '@glimmer/manager';
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
-import { helperCapabilities } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
 import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { inject as service } from '@ember/service';
+import { registerDestructor } from '@glimmer/destroyable';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
-import { registerDestructor, setHelperManager, setModifierManager } from '@glimmer/runtime';
 
 class TestHelperManager {
   capabilities = helperCapabilities('3.23', {
@@ -235,8 +235,13 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
         }, expectedMessage);
       }
 
-      ['@test asserts against using both `hasValue` and `hasScheduledEffect`']() {
-        expectAssertion(() => {
+      ['@test asserts against using both `hasValue` and `hasScheduledEffect`'](assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           helperCapabilities('3.23', {
             hasValue: true,
             hasScheduledEffect: true,
@@ -244,22 +249,37 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
         }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
       }
 
-      ['@test asserts requiring either `hasValue` or `hasScheduledEffect`']() {
-        expectAssertion(() => {
+      ['@test asserts requiring either `hasValue` or `hasScheduledEffect`'](assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           helperCapabilities('3.23', {});
         }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
       }
 
-      ['@test asserts against using `hasScheduledEffect`']() {
-        expectAssertion(() => {
+      ['@test asserts against using `hasScheduledEffect`'](assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           helperCapabilities('3.23', {
             hasScheduledEffect: true,
           });
         }, /The `hasScheduledEffect` capability has not yet been implemented for helper managers. Please pass `hasValue` instead/);
       }
 
-      ['@test asserts against using incorrect version for capabilities']() {
-        expectAssertion(() => {
+      ['@test asserts against using incorrect version for capabilities'](assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           helperCapabilities('aoeu', {
             hasScheduledEffect: true,
           });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index 2fe738c0d74..d5212959fbd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -1,18 +1,14 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
-import {
-  invokeHelper,
-  Helper,
-  helper,
-  Component as EmberComponent,
-  helperCapabilities,
-} from '@ember/-internals/glimmer';
+import { helperCapabilities, setHelperManager } from '@glimmer/manager';
+import { Helper, helper, Component as EmberComponent } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { EMBER_GLIMMER_INVOKE_HELPER, EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { inject as service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
-import { destroy, isDestroyed, registerDestructor, setHelperManager } from '@glimmer/runtime';
+import { destroy, isDestroyed, registerDestructor } from '@glimmer/destroyable';
+import { invokeHelper } from '@glimmer/runtime';
 
 if (EMBER_GLIMMER_INVOKE_HELPER) {
   moduleFor(
@@ -413,8 +409,13 @@ if (EMBER_GLIMMER_INVOKE_HELPER) {
         assert.verifySteps(['cache', 'context'], 'destructors ran in correct order');
       }
 
-      '@test throws an error if value is accessed after it is destroyed'() {
-        expectAssertion(() => {
+      '@test throws an error if value is accessed after it is destroyed'(assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           let helper = invokeHelper({}, class extends Helper {});
 
           runTask(() => destroy(helper));
@@ -423,16 +424,26 @@ if (EMBER_GLIMMER_INVOKE_HELPER) {
         }, /You attempted to get the value of a helper after the helper was destroyed, which is not allowed/);
       }
 
-      '@test asserts if no context object is passed'() {
-        expectAssertion(() => {
+      '@test asserts if no context object is passed'(assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           invokeHelper(undefined, class extends Helper {});
         }, /Expected a context object to be passed as the first parameter to invokeHelper, got undefined/);
       }
 
-      '@test asserts if no manager exists for the helper definition'() {
-        expectAssertion(() => {
+      '@test asserts if no manager exists for the helper definition'(assert) {
+        if (!DEBUG) {
+          assert.expect(0);
+          return;
+        }
+
+        assert.throws(() => {
           invokeHelper({}, class {});
-        }, /Expected a helper definition to be passed as the second parameter to invokeHelper, but no helper manager was found. The definition value that was passed was `.*`. Did you use setHelperManager to associate a helper manager with this value?/);
+        }, /Attempted to load a helper, but there wasn't a manager associated with the definition. The definition was:/);
       }
     }
   );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
index 990f679209d..14204334a60 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
@@ -1,6 +1,8 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
 import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
+import { getInternalModifierManager } from '@glimmer/manager';
+import { on } from '@ember/-internals/glimmer';
 
 import { Component } from '../../utils/helpers';
 
@@ -17,7 +19,7 @@ moduleFor(
     getOnManagerInstance() {
       // leveraging private APIs, this can be deleted if these APIs change
       // but it has been useful to verify some internal details
-      return this.renderer._runtimeResolver.builtInModifiers.on.manager;
+      return getInternalModifierManager(this.owner, on);
     }
 
     assertCounts(expected) {
@@ -388,7 +390,7 @@ moduleFor(
     getOnManagerInstance() {
       // leveraging private APIs, this can be deleted if these APIs change
       // but it has been useful to verify some internal details
-      return this.renderer._runtimeResolver.builtInModifiers.on.manager;
+      return getInternalModifierManager(this.owner, on);
     }
 
     assertCounts(expected) {
diff --git a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
index 836bb3d448a..641cdcdf643 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
@@ -224,7 +224,7 @@ moduleFor(
     }
 
     getCacheCounters() {
-      let { componentDefinitionCount, helperDefinitionCount } = this.renderer._runtimeResolver;
+      let { componentDefinitionCount, helperDefinitionCount } = this.renderer._context.constants;
 
       return (this._counters = {
         templateCacheHits: templateCacheCounters.cacheHit || 0,
diff --git a/packages/@ember/-internals/glimmer/tests/utils/glimmerish-component.js b/packages/@ember/-internals/glimmer/tests/utils/glimmerish-component.js
index 26f11211a5d..2e5793a556f 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/glimmerish-component.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/glimmerish-component.js
@@ -1,9 +1,10 @@
-import { setComponentManager, capabilities } from '@ember/-internals/glimmer';
+import { componentCapabilities } from '@glimmer/manager';
+import { setComponentManager } from '@ember/-internals/glimmer';
 import { setOwner } from '@ember/-internals/owner';
 
 class GlimmerishComponentManager {
   constructor(owner) {
-    this.capabilities = capabilities('3.13', { updateHook: false });
+    this.capabilities = componentCapabilities('3.13', { updateHook: false });
     this.owner = owner;
   }
 
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 43e76ef9320..0c97fda893f 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -1,7 +1,7 @@
 import { symbol, toString } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
+import { isDestroyed, isDestroying } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import { isDestroyed, isDestroying } from '@glimmer/runtime';
 import { Revision, UpdatableTag } from '@glimmer/validator';
 
 type ObjMap<T> = { [key: string]: T };
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index a54b8b9604e..c82a97c8d45 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -58,7 +58,7 @@ export {
 } from './lib/observer';
 export { Mixin, aliasMethod, mixin, observer, applyMixin } from './lib/mixin';
 export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
-export { tagForProperty, tagForObject, markObjectAsDirty, CUSTOM_TAG_FOR } from './lib/tags';
+export { tagForProperty, tagForObject, markObjectAsDirty } from './lib/tags';
 export { tracked } from './lib/tracked';
 export { createCache, getValue, isConst } from './lib/cache';
 
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index b8a30554681..066c07ba7f5 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -2,8 +2,8 @@ import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect, toString } from '@ember/-internals/utils';
 import { assert, deprecate, warn } from '@ember/debug';
 import EmberError from '@ember/error';
+import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import { isDestroyed } from '@glimmer/runtime';
 import {
   ALLOW_CYCLES,
   consumeTag,
diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts
index 98f8035d9a8..2de6b2887f1 100644
--- a/packages/@ember/-internals/metal/lib/observer.ts
+++ b/packages/@ember/-internals/metal/lib/observer.ts
@@ -1,7 +1,7 @@
 import { ENV } from '@ember/-internals/environment';
 import { peekMeta } from '@ember/-internals/meta';
 import { schedule } from '@ember/runloop';
-import { registerDestructor } from '@glimmer/runtime';
+import { registerDestructor } from '@glimmer/destroyable';
 import { CURRENT_TAG, Tag, tagMetaFor, validateTag, valueForTag } from '@glimmer/validator';
 import { getChainTagsForKey } from './chain-tags';
 import changeEvent from './change_event';
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
index 98dfb1324d6..25678185f47 100644
--- a/packages/@ember/-internals/metal/lib/tags.ts
+++ b/packages/@ember/-internals/metal/lib/tags.ts
@@ -1,19 +1,12 @@
-import {
-  enumerableSymbol,
-  isObject,
-  setupMandatorySetter,
-  symbol,
-  toString,
-} from '@ember/-internals/utils';
+import { isObject, setupMandatorySetter, symbol, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
+import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import { isDestroyed } from '@glimmer/runtime';
+import { CUSTOM_TAG_FOR } from '@glimmer/manager';
 import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor, TagMeta } from '@glimmer/validator';
 
 /////////
 
-export const CUSTOM_TAG_FOR = enumerableSymbol('CUSTOM_TAG_FOR');
-
 // This is exported for `@tracked`, but should otherwise be avoided. Use `tagForObject`.
 export const SELF_TAG: string | symbol = symbol('SELF_TAG');
 
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index ca92740ea82..6e2d4ccdcc2 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -3,7 +3,7 @@ import { Object as EmberObject } from '@ember/-internals/runtime';
 import { get, set, getWithDefault, Mixin, observer, computed } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 import { track } from '@glimmer/validator';
 
 function aget(x, y) {
diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js
index 4410748bf89..16f4c2b574f 100644
--- a/packages/@ember/-internals/metal/tests/alias_test.js
+++ b/packages/@ember/-internals/metal/tests/alias_test.js
@@ -10,7 +10,7 @@ import {
 } from '..';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 import { valueForTag, validateTag } from '@glimmer/validator';
 
 let obj, count;
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index f2078a24c02..4269fc49db4 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -11,7 +11,7 @@ import {
 } from '..';
 import { run } from '@ember/runloop';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 let obj, objA, objB, count, func;
 
diff --git a/packages/@ember/-internals/metal/tests/mixin/observer_test.js b/packages/@ember/-internals/metal/tests/mixin/observer_test.js
index 21016807ac3..10926e467ff 100644
--- a/packages/@ember/-internals/metal/tests/mixin/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/observer_test.js
@@ -1,6 +1,6 @@
 import { set, get, observer, mixin, Mixin } from '../..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 let obj;
 
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index 135db852675..161a535df06 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -16,7 +16,7 @@ import {
 } from '..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 import { meta as metaFor } from '@ember/-internals/meta';
 
 function K() {}
diff --git a/packages/@ember/-internals/metal/tests/performance_test.js b/packages/@ember/-internals/metal/tests/performance_test.js
index 2de7fbb9afb..0f05aea2b3a 100644
--- a/packages/@ember/-internals/metal/tests/performance_test.js
+++ b/packages/@ember/-internals/metal/tests/performance_test.js
@@ -9,7 +9,7 @@ import {
   addObserver,
 } from '..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 let obj;
 
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 565ad7c1615..367a99bf8a1 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,4 +1,4 @@
-import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/runtime';
+import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner';
 
 /**
 @module @ember/application
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index fc5e779f97a..45b44c88bc1 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -2,7 +2,7 @@ import { assign } from '@ember/polyfills';
 import { window } from '@ember/-internals/browser-environment';
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
-import { setOwner } from '@glimmer/runtime';
+import { setOwner } from '@glimmer/owner';
 import AutoLocation from '../../lib/location/auto_location';
 import { getHistoryPath, getHashPath } from '../../lib/location/auto_location';
 import HistoryLocation from '../../lib/location/history_location';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
index 9184a071e11..c1d53e46263 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
@@ -10,12 +10,12 @@ import {
   Mixin,
   tagForObject,
   computed,
-  CUSTOM_TAG_FOR,
   tagForProperty,
 } from '@ember/-internals/metal';
 import { setProxy, setupMandatorySetter, isObject } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+import { CUSTOM_TAG_FOR } from '@glimmer/manager';
 import { combine, updateTag, tagFor, tagMetaFor } from '@glimmer/validator';
 
 export function contentFor(proxy) {
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
index 3546446f10a..e1122d5aedf 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
@@ -10,7 +10,6 @@ import {
   addArrayObserver,
   removeArrayObserver,
   replace,
-  CUSTOM_TAG_FOR,
   arrayContentDidChange,
   tagForProperty,
 } from '@ember/-internals/metal';
@@ -18,6 +17,7 @@ import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
 import { isArray, MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
+import { CUSTOM_TAG_FOR } from '@glimmer/manager';
 import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
 
 const ARRAY_OBSERVER_MAPPING = {
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index affd39636e9..4496fcc7194 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -31,7 +31,8 @@ import ActionHandler from '../mixins/action_handler';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
-import { destroy, isDestroying, isDestroyed, registerDestructor, OWNER } from '@glimmer/runtime';
+import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
+import { OWNER } from '@glimmer/owner';
 
 const reopen = Mixin.prototype.reopen;
 
diff --git a/packages/@ember/-internals/runtime/tests/ext/function_test.js b/packages/@ember/-internals/runtime/tests/ext/function_test.js
index 139a0268508..f4a4b22c2f4 100644
--- a/packages/@ember/-internals/runtime/tests/ext/function_test.js
+++ b/packages/@ember/-internals/runtime/tests/ext/function_test.js
@@ -4,7 +4,7 @@ import EmberObject from '../../lib/system/object';
 import Evented from '../../lib/mixins/evented';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 moduleFor(
   'Function.prototype.observes() helper',
diff --git a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
index ed2b6c17680..0b45a5e65a9 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
@@ -4,7 +4,7 @@ import ContainerProxy from '../../lib/mixins/container_proxy';
 import EmberObject from '../../lib/system/object';
 import { run, schedule } from '@ember/runloop';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 moduleFor(
   '@ember/-internals/runtime/mixins/container_proxy',
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
index 6d6c38b1dca..a8b0dba4ee8 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
@@ -2,7 +2,7 @@ import { get } from '@ember/-internals/metal';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture, newObjectsFixture } from '../helpers/array';
 import { A as emberA } from '../../lib/mixins/array';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 class RemoveObjectsTests extends AbstractTestCase {
   '@test should return receiver'() {
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index d5072dbe2aa..9dd0687b498 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -3,7 +3,7 @@ import { get, set, observer } from '@ember/-internals/metal';
 import CoreObject from '../../lib/system/core_object';
 import { moduleFor, AbstractTestCase, buildOwner, runLoopSettled } from 'internal-test-helpers';
 import { track } from '@glimmer/validator';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 import { run } from '@ember/runloop';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 76719f327ae..32d30dbca73 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -4,7 +4,7 @@ import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { destroy } from '@glimmer/runtime';
+import { destroy } from '@glimmer/destroyable';
 
 moduleFor(
   'EmberObject.create',
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index d80ad44e827..85bd31b6852 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -180,7 +180,6 @@ moduleFor(
       verifyRegistration(assert, application, 'view:-outlet');
       verifyRegistration(assert, application, 'renderer:-dom');
       verifyRegistration(assert, application, 'renderer:-inert');
-      verifyRegistration(assert, application, P`template:components/-default`);
       verifyRegistration(assert, application, 'template:-outlet');
       verifyInjection(assert, application, 'view:-outlet', 'template', 'template:-outlet');
 
diff --git a/packages/@ember/component/template-only.ts b/packages/@ember/component/template-only.ts
index 6b123603b8c..4fda1e66fe8 100644
--- a/packages/@ember/component/template-only.ts
+++ b/packages/@ember/component/template-only.ts
@@ -1,12 +1,3 @@
-// This is only exported for types, don't use this class directly
-export class TemplateOnlyComponent {
-  constructor(public moduleName = '@ember/component/template-only') {}
-
-  toString(): string {
-    return this.moduleName;
-  }
-}
-
 /**
   @module @ember/component/template-only
   @public
@@ -36,10 +27,4 @@ export class TemplateOnlyComponent {
   @param {String} moduleName the module name that the template only component represents, this will be used for debugging purposes
   @category EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 */
-export default function templateOnlyComponent(moduleName?: string): TemplateOnlyComponent {
-  return new TemplateOnlyComponent(moduleName);
-}
-
-export function isTemplateOnlyComponent(component: unknown): component is TemplateOnlyComponent {
-  return component instanceof TemplateOnlyComponent;
-}
+export { templateOnlyComponent as default } from '@glimmer/runtime';
diff --git a/packages/@ember/destroyable/index.ts b/packages/@ember/destroyable/index.ts
index 62ddaee7e50..d2fbf8c280f 100644
--- a/packages/@ember/destroyable/index.ts
+++ b/packages/@ember/destroyable/index.ts
@@ -5,12 +5,12 @@ export {
   enableDestroyableTracking,
   isDestroying,
   isDestroyed,
-} from '@glimmer/runtime';
+} from '@glimmer/destroyable';
 
 import {
   registerDestructor as _registerDestructor,
   unregisterDestructor as _unregisterDestructor,
-} from '@glimmer/runtime';
+} from '@glimmer/destroyable';
 
 /**
   Ember manages the lifecycles and lifetimes of many built in constructs, such
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 4dd6b754f1f..428ea1f0d87 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -103,7 +103,6 @@ moduleFor(
       verifyRegistration(assert, engine, 'component-lookup:main');
 
       verifyRegistration(assert, engine, 'view:-outlet');
-      verifyRegistration(assert, engine, P`template:components/-default`);
       verifyRegistration(assert, engine, 'template:-outlet');
       verifyInjection(assert, engine, 'view:-outlet', 'template', 'template:-outlet');
       assert.deepEqual(
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts b/packages/@ember/helper/index.ts
similarity index 69%
rename from packages/@ember/-internals/glimmer/lib/helpers/custom.ts
rename to packages/@ember/helper/index.ts
index cd15a76e759..2d0ed33ce44 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/custom.ts
+++ b/packages/@ember/helper/index.ts
@@ -1,30 +1,3 @@
-import { getOwner } from '@ember/-internals/owner';
-import { getDebugName } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import {
-  Arguments,
-  Helper as GlimmerHelper,
-  HelperCapabilities,
-  HelperManager,
-  HelperManagerWithDestroyable,
-  HelperManagerWithValue,
-} from '@glimmer/interfaces';
-import { createComputeRef, UNDEFINED_REFERENCE } from '@glimmer/reference';
-import {
-  associateDestroyableChild,
-  buildCapabilities,
-  EMPTY_ARGS,
-  EMPTY_NAMED,
-  EMPTY_POSITIONAL,
-  getHelperManager,
-  isDestroyed,
-  isDestroying,
-  isInternalHelper,
-} from '@glimmer/runtime';
-import { Cache, createCache, getValue } from '@glimmer/validator';
-import { argsProxyFor } from '../utils/args-proxy';
-
 /**
 @module @ember/helper
 */
@@ -81,29 +54,6 @@ import { argsProxyFor } from '../utils/args-proxy';
   @return {Capabilities} The capabilities object instance
   @public
 */
-export function helperCapabilities(
-  managerAPI: string,
-  options: Partial<HelperCapabilities> = {}
-): HelperCapabilities {
-  assert('Invalid helper manager compatibility specified', managerAPI === '3.23');
-
-  assert(
-    'You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted.',
-    (options.hasValue || options.hasScheduledEffect) &&
-      !(options.hasValue && options.hasScheduledEffect)
-  );
-
-  assert(
-    'The `hasScheduledEffect` capability has not yet been implemented for helper managers. Please pass `hasValue` instead',
-    !options.hasScheduledEffect
-  );
-
-  return buildCapabilities({
-    hasValue: Boolean(options.hasValue),
-    hasDestroyable: Boolean(options.hasDestroyable),
-    hasScheduledEffect: Boolean(options.hasScheduledEffect),
-  });
-}
 
 /**
   Sets the helper manager for an object or function.
@@ -297,47 +247,6 @@ export function helperCapabilities(
   @return {object} The definition passed into setHelperManager
   @public
 */
-function hasValue(manager: HelperManager<unknown>): manager is HelperManagerWithValue<unknown> {
-  return manager.capabilities.hasValue;
-}
-
-function hasDestroyable(
-  manager: HelperManager<unknown>
-): manager is HelperManagerWithDestroyable<unknown> {
-  return manager.capabilities.hasDestroyable;
-}
-
-let ARGS_CACHES = DEBUG ? new WeakMap<SimpleArgsProxy, Cache<Partial<Arguments>>>() : undefined;
-
-function getArgs(proxy: SimpleArgsProxy): Partial<Arguments> {
-  return getValue(DEBUG ? ARGS_CACHES!.get(proxy)! : proxy.argsCache!)!;
-}
-
-class SimpleArgsProxy {
-  argsCache?: Cache<Partial<Arguments>>;
-
-  constructor(
-    context: object,
-    computeArgs: (context: object) => Partial<Arguments> = () => EMPTY_ARGS
-  ) {
-    let argsCache = createCache(() => computeArgs(context));
-
-    if (DEBUG) {
-      ARGS_CACHES!.set(this, argsCache);
-      Object.freeze(this);
-    } else {
-      this.argsCache = argsCache;
-    }
-  }
-
-  get named() {
-    return getArgs(this).named || EMPTY_NAMED;
-  }
-
-  get positional() {
-    return getArgs(this).positional || EMPTY_POSITIONAL;
-  }
-}
 
 /**
   The `invokeHelper` function can be used to create a helper instance in
@@ -394,78 +303,6 @@ class SimpleArgsProxy {
   @returns
   @public
 */
-export function invokeHelper(
-  context: object,
-  definition: object,
-  computeArgs?: (context: object) => Partial<Arguments>
-): Cache<unknown> {
-  assert(
-    `Expected a context object to be passed as the first parameter to invokeHelper, got ${context}`,
-    context !== null && typeof context === 'object'
-  );
-
-  const owner = getOwner(context);
-  const manager = getHelperManager(owner, definition)!;
-
-  // TODO: figure out why assert isn't using the TS assert thing
-  assert(
-    `Expected a helper definition to be passed as the second parameter to invokeHelper, but no helper manager was found. The definition value that was passed was \`${getDebugName!(
-      definition
-    )}\`. Did you use setHelperManager to associate a helper manager with this value?`,
-    manager
-  );
-
-  assert('Invoke helper does not support internal helpers yet', !isInternalHelper(manager));
-
-  let args = new SimpleArgsProxy(context, computeArgs);
-  let bucket = manager.createHelper(definition, args);
-
-  let cache: Cache<unknown>;
-
-  if (hasValue(manager)) {
-    cache = createCache(() => {
-      assert(
-        `You attempted to get the value of a helper after the helper was destroyed, which is not allowed`,
-        !isDestroying(cache) && !isDestroyed(cache)
-      );
-
-      return manager.getValue(bucket);
-    });
 
-    associateDestroyableChild(context, cache);
-  } else {
-    throw new Error('TODO: unreachable, to be implemented with hasScheduledEffect');
-  }
-
-  if (hasDestroyable(manager)) {
-    let destroyable = manager.getDestroyable(bucket);
-
-    associateDestroyableChild(cache, destroyable);
-  }
-
-  return cache;
-}
-
-export default function customHelper(
-  manager: HelperManager<unknown>,
-  definition: object
-): GlimmerHelper {
-  return (vmArgs, vm) => {
-    const args = argsProxyFor(vmArgs.capture(), 'helper');
-    const bucket = manager.createHelper(definition, args);
-
-    if (hasDestroyable(manager)) {
-      vm.associateDestroyable(manager.getDestroyable(bucket));
-    }
-
-    if (hasValue(manager)) {
-      return createComputeRef(
-        () => manager.getValue(bucket),
-        null,
-        DEBUG && manager.getDebugName && manager.getDebugName(definition)
-      );
-    } else {
-      return UNDEFINED_REFERENCE;
-    }
-  };
-}
+export { setHelperManager, helperCapabilities as capabilties } from '@glimmer/manager';
+export { invokeHelper } from '@glimmer/runtime';
diff --git a/packages/@ember/modifier/index.ts b/packages/@ember/modifier/index.ts
index 1610a1f1f6f..ff0e90a5180 100644
--- a/packages/@ember/modifier/index.ts
+++ b/packages/@ember/modifier/index.ts
@@ -1,2 +1 @@
-export { setModifierManager } from '@glimmer/runtime';
-export { modifierCapabilities as capabilties } from '@ember/-internals/glimmer';
+export { setModifierManager, modifierCapabilities as capabilties } from '@glimmer/manager';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 2e9bac501a2..a619ae7142e 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -103,14 +103,11 @@ import {
   Checkbox,
   Component,
   setComponentManager,
-  capabilities,
   escapeExpression,
   getTemplates,
   Helper,
   helper,
-  helperCapabilities,
   htmlSafe,
-  invokeHelper,
   isHTMLSafe,
   LinkComponent,
   setTemplates,
@@ -118,7 +115,6 @@ import {
   TextField,
   TextArea,
   isSerializationFirstNode,
-  modifierCapabilities,
 } from '@ember/-internals/glimmer';
 // eslint-disable-next-line import/no-unresolved
 import VERSION from './version';
@@ -136,14 +132,17 @@ import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
 import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
-import templateOnlyComponent from '@ember/component/template-only';
+import { templateOnlyComponent, invokeHelper } from '@glimmer/runtime';
 
 import {
+  componentCapabilities,
+  modifierCapabilities,
+  helperCapabilities,
   setModifierManager,
   setComponentTemplate,
   getComponentTemplate,
   setHelperManager,
-} from '@glimmer/runtime';
+} from '@glimmer/manager';
 
 import {
   assertDestroyablesDestroyed,
@@ -590,7 +589,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   Ember.TextSupport = views.TextSupport;
 }
 Ember._setComponentManager = setComponentManager;
-Ember._componentManagerCapabilities = capabilities;
+Ember._componentManagerCapabilities = componentCapabilities;
 Ember._setModifierManager = setModifierManager;
 Ember._modifierManagerCapabilities = modifierCapabilities;
 
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 0e61faba05d..2f026aa75bb 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -220,7 +220,7 @@ let allExports = [
   ['platform.defineProperty', null, { value: true }],
   ['platform.hasPropertyAccessors', null, { value: true }],
   ['defineProperty', '@ember/-internals/metal'],
-  ['destroy', '@glimmer/runtime', 'destroy'],
+  ['destroy', '@glimmer/destroyable', 'destroy'],
   ['libraries', '@ember/-internals/metal'],
   ['getProperties', '@ember/-internals/metal'],
   ['setProperties', '@ember/-internals/metal'],
@@ -263,19 +263,17 @@ let allExports = [
   ['Handlebars.Utils.escapeExpression', '@ember/-internals/glimmer', 'escapeExpression'],
   ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
   ['_setComponentManager', '@ember/-internals/glimmer', 'setComponentManager'],
-  ['_componentManagerCapabilities', '@ember/-internals/glimmer', 'capabilities'],
-  ['_setComponentTemplate', '@ember/-internals/glimmer', 'setComponentTemplate'],
-  ['_getComponentTemplate', '@ember/-internals/glimmer', 'getComponentTemplate'],
-  ['_templateOnlyComponent', '@ember/component/template-only', 'default'],
+  ['_componentManagerCapabilities', '@glimmer/manager', 'componentCapabilities'],
+  ['_setComponentTemplate', '@glimmer/manager', 'setComponentTemplate'],
+  ['_getComponentTemplate', '@glimmer/manager', 'getComponentTemplate'],
+  ['_templateOnlyComponent', '@glimmer/runtime', 'templateOnlyComponent'],
   EMBER_GLIMMER_HELPER_MANAGER
-    ? ['_setHelperManager', '@glimmer/runtime', 'setHelperManager']
+    ? ['_setHelperManager', '@glimmer/manager', 'setHelperManager']
     : null,
   EMBER_GLIMMER_HELPER_MANAGER
-    ? ['_helperManagerCapabilities', '@ember/-internals/glimmer', 'helperCapabilities']
-    : null,
-  EMBER_GLIMMER_INVOKE_HELPER
-    ? ['_invokeHelper', '@ember/-internals/glimmer', 'invokeHelper']
+    ? ['_helperManagerCapabilities', '@glimmer/manager', 'helperCapabilities']
     : null,
+  EMBER_GLIMMER_INVOKE_HELPER ? ['_invokeHelper', '@glimmer/runtime', 'invokeHelper'] : null,
   ['_captureRenderTree', '@ember/debug', 'captureRenderTree'],
 
   // @ember/-internals/runtime
diff --git a/yarn.lock b/yarn.lock
index 170e3bac8c4..bc13ad84d62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,154 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.67.0.tgz#fed033c725b73be7fa4f5200fe15616758bc6ca4"
-  integrity sha512-CCw31F1XYGm73iy2lrsowV9yr+aXAGauLaNWrO5N+ciEfFyIu21OZ8+/H79bYdJLisJILeCBKvy0hsYpmvCzHw==
-  dependencies:
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/syntax" "0.67.0"
-    "@glimmer/util" "0.67.0"
-    "@glimmer/wire-format" "0.67.0"
+"@glimmer/compiler@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.68.0.tgz#4ed5fd40a94dcf6fa89326a8008569d458db0b4b"
+  integrity sha512-cJMX5VvDyWEhT+YtfgZr84+G0BVWf41FQ0I1txw2bFiy1XA0Ny8CtFNTbHAQFplNluMYkfehDQc6cKab6VDKOw==
+  dependencies:
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/syntax" "0.68.0"
+    "@glimmer/util" "0.68.0"
+    "@glimmer/wire-format" "0.68.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/encoder@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.67.0.tgz#e7d8dff4a70734126ae47b5f923198253efbde2d"
-  integrity sha512-ryEDTyenOpuuiOc1mwQNPKE9rAVTZ/RNtVhhNJPSq/3q6aHL5/6/wHUUkHaZOZbG0T9EG0V0nCqPPCqZhq3IwQ==
+"@glimmer/destroyable@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.68.0.tgz#43a0342cf85e1b24b4dd868b658a4e6a32983795"
+  integrity sha512-Ac5AS+m6uRvPL55fmlUxAvtYD1AsggNyweyq/cR+/VzOuKSXj9xXIRABfwPsYu+Rr854aNICSy96T8IeO1FveA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/vm" "0.67.0"
+    "@glimmer/global-context" "0.68.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
+
+"@glimmer/encoder@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.68.0.tgz#7ec098c0927750d12afb9c279e67c1ce5a8b872e"
+  integrity sha512-8Omzpco9XfYZaGkrHuXS/g88zNGBMbvIjKU363zo7um7RQv2roWoRB8kQxSQlKZbJSGK8BCaPR7TneK0O9ZNjQ==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/vm" "0.68.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.67.0.tgz#041103738b6ec503d929684e342942023351b123"
-  integrity sha512-eeMwi+lQK8GbK2m/+HJSQaGKJogGEqJEZn8hGxHbG7zvHXA7TBQ5+c4vR2QXNWTMrOI7qDzCX9XnF3tlaxQPjQ==
+"@glimmer/global-context@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.0.tgz#92fe8a2b641b02bec682b670eb3d2a24d683e490"
+  integrity sha512-qaYUOP2PF9JmOXiAULzR/5J0py0YNsBVx0wFbPhbhAfrY5LTmVx5Aunbhbc6tHNY8IjgoW4v1k0GpG86YZ+4Mw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.67.0.tgz#fc68db956028f0ab9c655a53bb882d54fd34c24b"
-  integrity sha512-1yNs8kt8k4tzA6r9lO3ScX4zR6Jg9ymRqIFvDtam1twNoRQBFHNwfpTqPU4X5mq/4tOcgtWA8FNv5/jBIOaOew==
+"@glimmer/interfaces@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.0.tgz#451e12d9b74cfd0778fbf6ae0374323b726d7a79"
+  integrity sha512-GvR8ke9XZK0qupJmHcUHVzy6Y5gLsBIzi0h769xoA6l6VrtRCQJC1GF95KNj1z3jlhVCUw3OLnqVFantCEONaQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.67.0.tgz#d70383ed93f63feb1710f03ad8b09dff83b1f08a"
-  integrity sha512-rgBNMz9iTaIrJJ1TUyOoiWzQv3CH7TxYuApSMrZ6tlXh7QpZ7Wfsnd44M+zLaJB7VAmRG4QfLwDee+I9OfTyeQ==
+"@glimmer/low-level@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.68.0.tgz#c19c8330232dc01fc4de57d233e9240e961d5ee8"
+  integrity sha512-u/+VqcFbAVJd506KEEwmJ8u0yHSsTfSoiklpGEk+FdyE5vKCvnNo+7onEB6GlizofL7kzq+yLBiR0mqz/Q4evA==
 
-"@glimmer/node@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.67.0.tgz#7a34e3d215721f425e48007f656528c52c008341"
-  integrity sha512-bkfyuEkbanKdUfIdDi/1Pj/Swbg4Q0G0T7JvbTMN0L2tbj3NJSQNiBOPeN4FL2OZlRCt0ylGdWBKmeOgvyo2lQ==
+"@glimmer/manager@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.68.0.tgz#abea96d30a67cc6a7f8ace97470e9292e6ef2a82"
+  integrity sha512-/dAY8DzfvY+CdNnTaVFuUZf8BvIyLzbrf8jncdp6B5jG7bWsCM7Y+uzvC1sIj22QUoT6qrQe5+h2FlsELzKMAg==
   dependencies:
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/runtime" "0.67.0"
-    "@glimmer/util" "0.67.0"
+    "@glimmer/destroyable" "0.68.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/reference" "0.68.0"
+    "@glimmer/util" "0.68.0"
+    "@glimmer/validator" "0.68.0"
+
+"@glimmer/node@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.68.0.tgz#693d0a079e9525991118b926dff6eab009fe7e21"
+  integrity sha512-r/Z5ppsEJb/RVHAJCqp6nX3KybSr4x4VLTunTDgQQA8pXGPaGeIaGrkEU1rAOAXwbtOA1Ak6MLll/BGaAP3bRA==
+  dependencies:
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/runtime" "0.68.0"
+    "@glimmer/util" "0.68.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.67.0.tgz#0d855ab06a8936bf1fcf4683f7b157e7b7fe4087"
-  integrity sha512-mlLMa5N/uLEc13NU9AAUJjG4IU/5GZb0pXzYQY2Y37hCpGqsJLyoVcyuEseSlSGbyd9tkOrIl3mIZvxcE7IClg==
+"@glimmer/opcode-compiler@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.68.0.tgz#1bc523bbb8451bcdc5b46cf71d53dc6a5ec36bd4"
+  integrity sha512-c9O7+xJqWfzLVBxQwZNHwsUV5oOLUh2K7FcInjjn+gbzW7qBkl4mBwJ3VcAMd1rv/USbLyvd+DcSdpbS4H1ZAw==
+  dependencies:
+    "@glimmer/encoder" "0.68.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/reference" "0.68.0"
+    "@glimmer/util" "0.68.0"
+    "@glimmer/vm" "0.68.0"
+    "@glimmer/wire-format" "0.68.0"
+
+"@glimmer/owner@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.68.0.tgz#7168e327e70584c6c95935b7d4b8ed8a3ea7347d"
+  integrity sha512-KeETHPBqmSjzyLVNyMP4XPzOcYOUAdb70IdRxaRNjDOveHP++MgrIxAiQ/danlqI2HzHg9Eb8CqlsyY/j3cH/A==
   dependencies:
-    "@glimmer/encoder" "0.67.0"
+    "@glimmer/util" "0.68.0"
+
+"@glimmer/program@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.68.0.tgz#0bf3d81db277eacd9d1e1e92262486b2837ef0ba"
+  integrity sha512-p/2CH4R+qEq2qLSKIH1gsCo0yHt5cLdj4Wtsg74GzBdrRjYxRcwRCOF7kkHOTovuqiBGvkSzc+g+Rzp8rs9ueQ==
+  dependencies:
+    "@glimmer/encoder" "0.68.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/program" "0.67.0"
-    "@glimmer/reference" "0.67.0"
-    "@glimmer/util" "0.67.0"
-    "@glimmer/vm" "0.67.0"
-    "@glimmer/wire-format" "0.67.0"
-
-"@glimmer/program@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.67.0.tgz#1f36062df5cc6718334fe4d88bb7ae50f44f8ce4"
-  integrity sha512-fdZSl+eabrj/kXO5el1xt8HNuLRRUDUN3Yu4qWLScm8qGw+b4iZIiajQCFNTXzn0mz6lvNW0XyQ6a76URLmk9A==
-  dependencies:
-    "@glimmer/encoder" "0.67.0"
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
-
-"@glimmer/reference@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.67.0.tgz#2983167fcb90e5f7a24e00a5eb13c50bf266cf3d"
-  integrity sha512-Qopa+sNhIvAZ4lb4hlAUPrPx7h19yOLlfqho3zgwTJoEQAyhUqalqeH5lr+xIC4r2uV6yCcLd3C27BLYxN342Q==
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/manager" "0.68.0"
+    "@glimmer/opcode-compiler" "0.68.0"
+    "@glimmer/util" "0.68.0"
+
+"@glimmer/reference@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.0.tgz#91e85cd881b0d9ee7e108879cd56e1ec374f9b59"
+  integrity sha512-b66jSLLitKvt0d7yi/+5M6XE+vWrorwsjYk3eCTE+cdMEG/T8n0d2j3P2TRL7opSnn8Pjj4o5ZZc4tOPyw7Sug==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.67.0"
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
-    "@glimmer/validator" "0.67.0"
+    "@glimmer/global-context" "0.68.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
+    "@glimmer/validator" "0.68.0"
 
-"@glimmer/runtime@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.67.0.tgz#188ad893e1fade94879d6814ddd5b953eba1a2f8"
-  integrity sha512-xslPdm+OIC57xQ3fUdIPM2wj/sG1OtoIWLq0C2gJw6cR1wQ5zSi6Az79AD5oUQdeiUzEr5BfTaEgsvXHhoHs+w==
+"@glimmer/runtime@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.68.0.tgz#965209a95b81ac9fcae907bfa995108f294decb4"
+  integrity sha512-/D029QjHfTkh+op5GNj46/dFJfyh/HvXeDTKRnjslDuRUrtOS9986/TmRISf8xWRfYQaVvDutF/xAK/KKIIm3A==
   dependencies:
+    "@glimmer/destroyable" "0.68.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.67.0"
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/low-level" "0.67.0"
-    "@glimmer/program" "0.67.0"
-    "@glimmer/reference" "0.67.0"
-    "@glimmer/util" "0.67.0"
-    "@glimmer/validator" "0.67.0"
-    "@glimmer/vm" "0.67.0"
-    "@glimmer/wire-format" "0.67.0"
+    "@glimmer/global-context" "0.68.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/low-level" "0.68.0"
+    "@glimmer/owner" "0.68.0"
+    "@glimmer/program" "0.68.0"
+    "@glimmer/reference" "0.68.0"
+    "@glimmer/util" "0.68.0"
+    "@glimmer/validator" "0.68.0"
+    "@glimmer/vm" "0.68.0"
+    "@glimmer/wire-format" "0.68.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.67.0.tgz#2aaa5ba451671ee869285463b9711dbec1c843e2"
-  integrity sha512-9eRjAF3oD0RyWzptincQT/ucWxxgMhYrhumizxCJDGWTpk8GCpAMoKjEK2D1eryVEaF3KknGS9ba3/oakGkpzg==
+"@glimmer/syntax@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.0.tgz#8dc25dbe8332ecc288ed5e02c721b19fc1e856e4"
+  integrity sha512-nidrNS1xf/cTQsoRyCj1VeCHGj4/dgRBBd3fbIig5KumOx7W5UQF4/cXJi24hA0/vvd0MEUMqo2DPpCMsPV7PQ==
   dependencies:
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.67.0.tgz#7f19320826e926a2fe80abb44512f9898f6df6d8"
-  integrity sha512-iDio1mKJgdtvo9GT/d4QL/pvUzAxQOM7m/3fAY3pX2CAa25jwEwpUh7fNN+F3iEFkJWiDJusSPY/K3RPMfAoXg==
+"@glimmer/util@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.0.tgz#16fec2fb54a9cda6ceef8c3cbc2c47346704cefc"
+  integrity sha512-YUIcItWFkHilVwllZnkJggoBm7xDvN+VyMgcPk4jsmUlMrt3zy0C9XGgmDmnPqJ1Bl0gMCf5JUf59RByw8TNHQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.67.0"
+    "@glimmer/interfaces" "0.68.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.67.0.tgz#9d50db47152786c4e7d4304a73c498c53afc7886"
-  integrity sha512-PQsTPU1N0erGtWVoHwkQ9N/jMb3iMoclyaBe3rVbxs6RSjYeafaxAqwN8rJ+Gd+OWQscD4tjPPguTW/iGQVlYQ==
+"@glimmer/validator@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.0.tgz#a9cab4a3eb6fdc432002e97d51fc07ec9fb144f4"
+  integrity sha512-KtDOCN1LxJW4/GRfhXZsHNsg3V0xHFklVhcXBdNjM/3mQDs5MIyaWJ+HduyLrFPC9I25/vjyH1zryBrD4+taiQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.67.0"
+    "@glimmer/global-context" "0.68.0"
 
-"@glimmer/vm@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.67.0.tgz#c31d7a2ea70ddd0da30fd5ce624311baef173942"
-  integrity sha512-tqAxnPKwSAFYW1y4vpTSnsRR/F3sJ3GSMx2lzgc5YaWElYI9JcPBIM0sobqnoheca7wABLTWdFZXbnW9N0n0TQ==
+"@glimmer/vm@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.68.0.tgz#190da75b1ba7a717276976a0aceebf76cccc73c5"
+  integrity sha512-URAwgRiL2koR8OgWjDynYAvmefdqBo8oWbskWtazYivs+IJ341i8CA/YGo7L1XZcaXJY+lrdEZzhOmaLTMlAZA==
   dependencies:
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
 
-"@glimmer/wire-format@0.67.0":
-  version "0.67.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.67.0.tgz#a29eda6fac008509a2aa312209dc128611834ef5"
-  integrity sha512-YbRASQFsyKmVWgFF8SeAdoFSbrN9Zq8cfCvIjsx6JiiIelCgQ5fUtU8qZ9ww++5AYK6tQtVhkqM6DXyVMRVRjg==
+"@glimmer/wire-format@0.68.0":
+  version "0.68.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.68.0.tgz#456753d7d7f88a59287d6d0b68a348625c933bb1"
+  integrity sha512-Tb2oiJTw3qB91oV98xP0g5fu75u+A6lf46wCAPGXdfDRhK4qAteypeCy5wz6+1pFucPP1Mn3nZ9OUVGnnQOPTQ==
   dependencies:
-    "@glimmer/interfaces" "0.67.0"
-    "@glimmer/util" "0.67.0"
+    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/util" "0.68.0"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From f94de89706a27e55095dc3c1a7736036dee9f775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= <jan@buschtoens.me>
Date: Wed, 26 Jun 2019 18:58:08 +0200
Subject: [PATCH 0262/1405] [BUGFIX beta] fix(glimmer/utils/to-bool):
 `htmlSafe`

Fixes #17486.
---
 packages/@ember/-internals/glimmer/lib/utils/to-bool.ts        | 3 +++
 .../-internals/glimmer/tests/utils/shared-conditional-tests.js | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
index 455e3bfeb58..a85d85310a9 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
@@ -1,3 +1,4 @@
+import { isHTMLSafe } from '@ember/-internals/glimmer';
 import { get, tagForProperty } from '@ember/-internals/metal';
 import { isArray } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
@@ -12,6 +13,8 @@ export default function toBool(predicate: unknown): boolean {
     consumeTag(tagForProperty(predicate as object, '[]'));
 
     return (predicate as { length: number }).length !== 0;
+  } else if (isHTMLSafe(predicate)) {
+    return Boolean(predicate.toString());
   } else {
     return Boolean(predicate);
   }
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 5c2c08ec71f..f5e0eab3063 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -3,6 +3,7 @@
 import { RenderingTestCase, applyMixins, runTask } from 'internal-test-helpers';
 
 import { assign } from '@ember/polyfills';
+import { htmlSafe } from '@ember/-internals/glimmer';
 import { get, set } from '@ember/-internals/metal';
 import {
   Object as EmberObject,
@@ -408,6 +409,7 @@ const IfUnlessWithTestCases = [
     new Boolean(true),
     new Boolean(false),
     new Date(),
+    htmlSafe(' '),
   ]),
 
   new StableFalsyGenerator([
@@ -419,6 +421,7 @@ const IfUnlessWithTestCases = [
     [],
     emberA(),
     ObjectProxy.create({ content: undefined }),
+    htmlSafe(''),
   ]),
 
   new ObjectProxyGenerator([

From f61af5ee720f6e53b97ec9851ad09a45d888682b Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 4 Dec 2020 21:40:46 +0100
Subject: [PATCH 0263/1405] Work around IE11 not supported WeakSet by
 (mis-)using a WeakMap for lazy event setup

---
 .../@ember/-internals/glimmer/lib/component.ts    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index c2fb416cb79..f0dc183355a 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -13,8 +13,8 @@ import {
 } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { setInternalComponentManager } from '@glimmer/manager';
 import { Environment } from '@glimmer/interfaces';
+import { setInternalComponentManager } from '@glimmer/manager';
 import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
 import { createTag, dirtyTag } from '@glimmer/validator';
@@ -27,7 +27,10 @@ import {
   IS_DISPATCHING_ATTRS,
 } from './component-managers/curly';
 
-let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<any>>();
+// Keep track of which component classes have already been processed for lazy event setup.
+// Using a WeakSet would be more appropriate here, but this can only be used when IE11 support is dropped.
+// Thus the workaround using a WeakMap<object, true>
+let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakMap<object, true>>();
 
 /**
 @module @ember/component
@@ -730,11 +733,9 @@ const Component = CoreView.extend(
 
       let eventDispatcher = this._dispatcher;
       if (eventDispatcher) {
-        let lazyEventsProcessedForComponentClass:
-          | WeakSet<any>
-          | undefined = lazyEventsProcessed.get(eventDispatcher);
+        let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
         if (!lazyEventsProcessedForComponentClass) {
-          lazyEventsProcessedForComponentClass = new WeakSet();
+          lazyEventsProcessedForComponentClass = new WeakMap<object, true>();
           lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
         }
 
@@ -748,7 +749,7 @@ const Component = CoreView.extend(
             }
           });
 
-          lazyEventsProcessedForComponentClass.add(proto);
+          lazyEventsProcessedForComponentClass.set(proto, true);
         }
       }
 

From 2c0874f723deaf9e6636704dec517cfdaa80b706 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 5 Dec 2020 09:28:31 -0800
Subject: [PATCH 0264/1405] [BUGFIX] Updates to fix the CUSTOM_TAG_FOR
 enumerability bug

Updates to the latest Glimmer VM, using the WeakMap based custom tag
system instead of the symbol based one.
---
 package.json                                  |  24 +-
 packages/@ember/-internals/metal/lib/tags.ts  |  14 +-
 .../-internals/runtime/lib/mixins/-proxy.js   |  59 ++--
 .../runtime/lib/system/array_proxy.js         |  32 +--
 yarn.lock                                     | 254 +++++++++---------
 5 files changed, 197 insertions(+), 186 deletions(-)

diff --git a/package.json b/package.json
index 0b31bdcd78f..5e133f5d93f 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.68.0",
+    "@glimmer/compiler": "0.68.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.68.0",
-    "@glimmer/interfaces": "0.68.0",
-    "@glimmer/manager": "0.68.0",
-    "@glimmer/destroyable": "0.68.0",
-    "@glimmer/owner": "0.68.0",
-    "@glimmer/node": "0.68.0",
-    "@glimmer/opcode-compiler": "0.68.0",
-    "@glimmer/program": "0.68.0",
-    "@glimmer/reference": "0.68.0",
-    "@glimmer/runtime": "0.68.0",
-    "@glimmer/validator": "0.68.0",
+    "@glimmer/global-context": "0.68.1",
+    "@glimmer/interfaces": "0.68.1",
+    "@glimmer/manager": "0.68.1",
+    "@glimmer/destroyable": "0.68.1",
+    "@glimmer/owner": "0.68.1",
+    "@glimmer/node": "0.68.1",
+    "@glimmer/opcode-compiler": "0.68.1",
+    "@glimmer/program": "0.68.1",
+    "@glimmer/reference": "0.68.1",
+    "@glimmer/runtime": "0.68.1",
+    "@glimmer/validator": "0.68.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
index 25678185f47..3514d9ea0e0 100644
--- a/packages/@ember/-internals/metal/lib/tags.ts
+++ b/packages/@ember/-internals/metal/lib/tags.ts
@@ -2,11 +2,17 @@ import { isObject, setupMandatorySetter, symbol, toString } from '@ember/-intern
 import { assert } from '@ember/debug';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import { CUSTOM_TAG_FOR } from '@glimmer/manager';
+import { getCustomTagFor } from '@glimmer/manager';
 import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor, TagMeta } from '@glimmer/validator';
 
 /////////
 
+type CustomTagFnWithMandatorySetter = (
+  obj: object,
+  key: string | symbol,
+  addMandatorySetter: boolean
+) => Tag;
+
 // This is exported for `@tracked`, but should otherwise be avoided. Use `tagForObject`.
 export const SELF_TAG: string | symbol = symbol('SELF_TAG');
 
@@ -16,8 +22,10 @@ export function tagForProperty(
   addMandatorySetter = false,
   meta?: TagMeta
 ): Tag {
-  if (typeof obj[CUSTOM_TAG_FOR] === 'function') {
-    return obj[CUSTOM_TAG_FOR](propertyKey, addMandatorySetter);
+  let customTagFor = getCustomTagFor(obj);
+
+  if (customTagFor !== undefined) {
+    return (customTagFor as CustomTagFnWithMandatorySetter)(obj, propertyKey, addMandatorySetter);
   }
 
   let tag = tagFor(obj, propertyKey, meta);
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
index c1d53e46263..6b8c070ccbc 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
@@ -15,7 +15,7 @@ import {
 import { setProxy, setupMandatorySetter, isObject } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CUSTOM_TAG_FOR } from '@glimmer/manager';
+import { setCustomTagFor } from '@glimmer/manager';
 import { combine, updateTag, tagFor, tagMetaFor } from '@glimmer/validator';
 
 export function contentFor(proxy) {
@@ -24,6 +24,34 @@ export function contentFor(proxy) {
   return content;
 }
 
+function customTagForProxy(proxy, key, addMandatorySetter) {
+  let meta = tagMetaFor(proxy);
+  let tag = tagFor(proxy, key, meta);
+
+  if (DEBUG) {
+    // TODO: Replace this with something more first class for tracking tags in DEBUG
+    tag._propertyKey = key;
+  }
+
+  if (key in proxy) {
+    if (DEBUG && addMandatorySetter) {
+      setupMandatorySetter(tag, proxy, key);
+    }
+
+    return tag;
+  } else {
+    let tags = [tag, tagFor(proxy, 'content', meta)];
+
+    let content = contentFor(proxy);
+
+    if (isObject(content)) {
+      tags.push(tagForProperty(content, key, addMandatorySetter));
+    }
+
+    return combine(tags);
+  }
+}
+
 /**
   `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
   to a proxied `content` object.  See ObjectProxy for more details.
@@ -47,6 +75,7 @@ export default Mixin.create({
     this._super(...arguments);
     setProxy(this);
     tagForObject(this);
+    setCustomTagFor(this, customTagForProxy);
   },
 
   willDestroy() {
@@ -58,34 +87,6 @@ export default Mixin.create({
     return Boolean(get(this, 'content'));
   }),
 
-  [CUSTOM_TAG_FOR](key, addMandatorySetter) {
-    let meta = tagMetaFor(this);
-    let tag = tagFor(this, key, meta);
-
-    if (DEBUG) {
-      // TODO: Replace this with something more first class for tracking tags in DEBUG
-      tag._propertyKey = key;
-    }
-
-    if (key in this) {
-      if (DEBUG && addMandatorySetter) {
-        setupMandatorySetter(tag, this, key);
-      }
-
-      return tag;
-    } else {
-      let tags = [tag, tagFor(this, 'content', meta)];
-
-      let content = contentFor(this);
-
-      if (isObject(content)) {
-        tags.push(tagForProperty(content, key, addMandatorySetter));
-      }
-
-      return combine(tags);
-    }
-  },
-
   unknownProperty(key) {
     let content = contentFor(this);
     if (content) {
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
index e1122d5aedf..dee23f09437 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
@@ -17,7 +17,7 @@ import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
 import { isArray, MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
-import { CUSTOM_TAG_FOR } from '@glimmer/manager';
+import { setCustomTagFor } from '@glimmer/manager';
 import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
 
 const ARRAY_OBSERVER_MAPPING = {
@@ -25,6 +25,20 @@ const ARRAY_OBSERVER_MAPPING = {
   didChange: '_arrangedContentArrayDidChange',
 };
 
+function customTagForArrayProxy(proxy, key) {
+  if (key === '[]') {
+    proxy._revalidate();
+
+    return proxy._arrTag;
+  } else if (key === 'length') {
+    proxy._revalidate();
+
+    return proxy._lengthTag;
+  }
+
+  return tagFor(proxy, key);
+}
+
 /**
   An ArrayProxy wraps any other object that implements `Array` and/or
   `MutableArray,` forwarding all requests. This makes it very useful for
@@ -111,26 +125,14 @@ export default class ArrayProxy extends EmberObject {
     this._arrangedContentRevision = null;
     this._lengthTag = null;
     this._arrTag = null;
+
+    setCustomTagFor(this, customTagForArrayProxy);
   }
 
   [PROPERTY_DID_CHANGE]() {
     this._revalidate();
   }
 
-  [CUSTOM_TAG_FOR](key) {
-    if (key === '[]') {
-      this._revalidate();
-
-      return this._arrTag;
-    } else if (key === 'length') {
-      this._revalidate();
-
-      return this._lengthTag;
-    }
-
-    return tagFor(this, key);
-  }
-
   willDestroy() {
     this._removeArrangedContentArrayObserver();
   }
diff --git a/yarn.lock b/yarn.lock
index bc13ad84d62..98e3fa0d1de 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.68.0.tgz#4ed5fd40a94dcf6fa89326a8008569d458db0b4b"
-  integrity sha512-cJMX5VvDyWEhT+YtfgZr84+G0BVWf41FQ0I1txw2bFiy1XA0Ny8CtFNTbHAQFplNluMYkfehDQc6cKab6VDKOw==
-  dependencies:
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/syntax" "0.68.0"
-    "@glimmer/util" "0.68.0"
-    "@glimmer/wire-format" "0.68.0"
+"@glimmer/compiler@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.68.1.tgz#7f99f2ca3cd4fece0ee280b2a7a5baf6b557e1df"
+  integrity sha512-SCjjFiwd0H9221ewErc0cGJLDiDb0GOSIv2z+kuR3pA+b13w+jEZHvnzwRHaJgKAdmDFdBZeHhI1Jt5AyTwBJA==
+  dependencies:
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/syntax" "0.68.1"
+    "@glimmer/util" "0.68.1"
+    "@glimmer/wire-format" "0.68.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.68.0.tgz#43a0342cf85e1b24b4dd868b658a4e6a32983795"
-  integrity sha512-Ac5AS+m6uRvPL55fmlUxAvtYD1AsggNyweyq/cR+/VzOuKSXj9xXIRABfwPsYu+Rr854aNICSy96T8IeO1FveA==
+"@glimmer/destroyable@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.68.1.tgz#44b296138db33fa8e98812a7da5a29f7cace2bf7"
+  integrity sha512-xF/L7KCGMvJhwiqY8mhF991VixCoTi5QLfsxJIR7gesjXZh3FqMDOoSmuv35rQE0gsFTtaFhEXGFsJSBLbzjVg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.68.0"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/global-context" "0.68.1"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
 
-"@glimmer/encoder@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.68.0.tgz#7ec098c0927750d12afb9c279e67c1ce5a8b872e"
-  integrity sha512-8Omzpco9XfYZaGkrHuXS/g88zNGBMbvIjKU363zo7um7RQv2roWoRB8kQxSQlKZbJSGK8BCaPR7TneK0O9ZNjQ==
+"@glimmer/encoder@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.68.1.tgz#41ea9640f18cd1013aa26fb455dbd8847a42aca6"
+  integrity sha512-ez+fvlDePeIIN+ucBckorgZm18W9rjst4+ABrw4sO4ylvNaZ5nZFmJh6g0hfrT5gD+FnyveiImyB3tIIzp2mtQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/vm" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/vm" "0.68.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.0.tgz#92fe8a2b641b02bec682b670eb3d2a24d683e490"
-  integrity sha512-qaYUOP2PF9JmOXiAULzR/5J0py0YNsBVx0wFbPhbhAfrY5LTmVx5Aunbhbc6tHNY8IjgoW4v1k0GpG86YZ+4Mw==
+"@glimmer/global-context@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.1.tgz#b5e84883a2449075a0618e33641d94e7442a0b31"
+  integrity sha512-nwZeoaBJWxEqT3tubPFI1lyUIO8UhkcdGAo+8rranrASJ0oQddldYhaDGO863Gnre+5I2MWUps4jVAg7MFBkSg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.0.tgz#451e12d9b74cfd0778fbf6ae0374323b726d7a79"
-  integrity sha512-GvR8ke9XZK0qupJmHcUHVzy6Y5gLsBIzi0h769xoA6l6VrtRCQJC1GF95KNj1z3jlhVCUw3OLnqVFantCEONaQ==
+"@glimmer/interfaces@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.1.tgz#a4d4b0380f0094c7f5901c26b54ccf40ddef521e"
+  integrity sha512-QNsWfMe5Aob++aM+OBJOUAn6DXwNK84p7ISkzxKZYdNNgLavjI5Coo2N577I95x42h1k9fdUoIxBKKC7aCSx4g==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.68.0.tgz#c19c8330232dc01fc4de57d233e9240e961d5ee8"
-  integrity sha512-u/+VqcFbAVJd506KEEwmJ8u0yHSsTfSoiklpGEk+FdyE5vKCvnNo+7onEB6GlizofL7kzq+yLBiR0mqz/Q4evA==
+"@glimmer/low-level@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.68.1.tgz#a3b3cb1b3b2c9b5fa5b09952bd99fa538b0cc209"
+  integrity sha512-8iI5WRXSQDj0w1K3kgaNzxPmW/YxobSryvpuk6ZwB4tUCzt+1pNwdxKH/43k5khyjXMISoe0WTnKIJrnCsTgSw==
 
-"@glimmer/manager@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.68.0.tgz#abea96d30a67cc6a7f8ace97470e9292e6ef2a82"
-  integrity sha512-/dAY8DzfvY+CdNnTaVFuUZf8BvIyLzbrf8jncdp6B5jG7bWsCM7Y+uzvC1sIj22QUoT6qrQe5+h2FlsELzKMAg==
+"@glimmer/manager@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.68.1.tgz#eabc833307d8dc93d21c1e77a5094ecd177e8812"
+  integrity sha512-l7TB3rVIQwuYJt0lo9/vT+ie8hN4ZHbtSNRl+DxzS7FpVva3oAxtG3/JbSwq2W1i9VpC+l3ne6yBobxkuXwSyg==
   dependencies:
-    "@glimmer/destroyable" "0.68.0"
+    "@glimmer/destroyable" "0.68.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/reference" "0.68.0"
-    "@glimmer/util" "0.68.0"
-    "@glimmer/validator" "0.68.0"
-
-"@glimmer/node@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.68.0.tgz#693d0a079e9525991118b926dff6eab009fe7e21"
-  integrity sha512-r/Z5ppsEJb/RVHAJCqp6nX3KybSr4x4VLTunTDgQQA8pXGPaGeIaGrkEU1rAOAXwbtOA1Ak6MLll/BGaAP3bRA==
-  dependencies:
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/runtime" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/reference" "0.68.1"
+    "@glimmer/util" "0.68.1"
+    "@glimmer/validator" "0.68.1"
+
+"@glimmer/node@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.68.1.tgz#d9db3651eebb6cb65aada574aa00133d21093af2"
+  integrity sha512-o38/HJNpbB+8VuTcQUtItZxAwcHHGZUqXFvBrJ8l0x7HjFRs6u7kLTHpPnHoLtV1w7CHL3hESHr6su9SotkbYg==
+  dependencies:
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/runtime" "0.68.1"
+    "@glimmer/util" "0.68.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.68.0.tgz#1bc523bbb8451bcdc5b46cf71d53dc6a5ec36bd4"
-  integrity sha512-c9O7+xJqWfzLVBxQwZNHwsUV5oOLUh2K7FcInjjn+gbzW7qBkl4mBwJ3VcAMd1rv/USbLyvd+DcSdpbS4H1ZAw==
+"@glimmer/opcode-compiler@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.68.1.tgz#ec1ea91f26e44057e9980880fba227c66c9c7e88"
+  integrity sha512-b5G/hPBHpnILAwY8/F/djLVJLCQPeCGmosic4IkWaLzxdmUpy2Ay7Y2fLAIzC7BfHP6NC23o4aGzepqAw6H1Uw==
   dependencies:
-    "@glimmer/encoder" "0.68.0"
+    "@glimmer/encoder" "0.68.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/reference" "0.68.0"
-    "@glimmer/util" "0.68.0"
-    "@glimmer/vm" "0.68.0"
-    "@glimmer/wire-format" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/reference" "0.68.1"
+    "@glimmer/util" "0.68.1"
+    "@glimmer/vm" "0.68.1"
+    "@glimmer/wire-format" "0.68.1"
 
-"@glimmer/owner@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.68.0.tgz#7168e327e70584c6c95935b7d4b8ed8a3ea7347d"
-  integrity sha512-KeETHPBqmSjzyLVNyMP4XPzOcYOUAdb70IdRxaRNjDOveHP++MgrIxAiQ/danlqI2HzHg9Eb8CqlsyY/j3cH/A==
+"@glimmer/owner@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.68.1.tgz#bd1b02cb4d02954edb29e8679546f23d5cb0dd6d"
+  integrity sha512-BnI8Y8jj+66gZRe3ct1z912dZlMAbbP5JTrbzAvnMJ6nUqGPGEEuIfU5gqPdtxDbv6uzHXxS/71ENTtOZ0zSfw==
   dependencies:
-    "@glimmer/util" "0.68.0"
+    "@glimmer/util" "0.68.1"
 
-"@glimmer/program@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.68.0.tgz#0bf3d81db277eacd9d1e1e92262486b2837ef0ba"
-  integrity sha512-p/2CH4R+qEq2qLSKIH1gsCo0yHt5cLdj4Wtsg74GzBdrRjYxRcwRCOF7kkHOTovuqiBGvkSzc+g+Rzp8rs9ueQ==
+"@glimmer/program@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.68.1.tgz#690c50c2f63f03f929fee21b55f9ea032c690316"
+  integrity sha512-eT3Jl68J6e60bQZddcMD2Khq0l8Un0EDwc/nPx6HCdJIN/sm22dJfDHXapQy9/Y+qw7qcb+eCuNdprbdvWdVuA==
   dependencies:
-    "@glimmer/encoder" "0.68.0"
+    "@glimmer/encoder" "0.68.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/manager" "0.68.0"
-    "@glimmer/opcode-compiler" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/manager" "0.68.1"
+    "@glimmer/opcode-compiler" "0.68.1"
+    "@glimmer/util" "0.68.1"
 
-"@glimmer/reference@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.0.tgz#91e85cd881b0d9ee7e108879cd56e1ec374f9b59"
-  integrity sha512-b66jSLLitKvt0d7yi/+5M6XE+vWrorwsjYk3eCTE+cdMEG/T8n0d2j3P2TRL7opSnn8Pjj4o5ZZc4tOPyw7Sug==
+"@glimmer/reference@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.1.tgz#0adb39a452e1c82c28c27f082135b5698e529a18"
+  integrity sha512-qXF0SAyA34oeATkLT95St8gUdImRG52VjcDax9TbkW4fIjf5geQnyfsMP00VKFxWa7TUBFvPSapdhvWCfOu0LQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.0"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
-    "@glimmer/validator" "0.68.0"
+    "@glimmer/global-context" "0.68.1"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
+    "@glimmer/validator" "0.68.1"
 
-"@glimmer/runtime@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.68.0.tgz#965209a95b81ac9fcae907bfa995108f294decb4"
-  integrity sha512-/D029QjHfTkh+op5GNj46/dFJfyh/HvXeDTKRnjslDuRUrtOS9986/TmRISf8xWRfYQaVvDutF/xAK/KKIIm3A==
+"@glimmer/runtime@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.68.1.tgz#67c2d9a49618e345af576b03693faeea4d40b377"
+  integrity sha512-8nqKxEoJ+ursrGfMT3CuQIBMeXy2dSY3oxCcG1b5qcWER4n+dSNIQOREj8hB/i6T090WhboZIU9eDpNepiOjfQ==
   dependencies:
-    "@glimmer/destroyable" "0.68.0"
+    "@glimmer/destroyable" "0.68.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.68.0"
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/low-level" "0.68.0"
-    "@glimmer/owner" "0.68.0"
-    "@glimmer/program" "0.68.0"
-    "@glimmer/reference" "0.68.0"
-    "@glimmer/util" "0.68.0"
-    "@glimmer/validator" "0.68.0"
-    "@glimmer/vm" "0.68.0"
-    "@glimmer/wire-format" "0.68.0"
+    "@glimmer/global-context" "0.68.1"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/low-level" "0.68.1"
+    "@glimmer/owner" "0.68.1"
+    "@glimmer/program" "0.68.1"
+    "@glimmer/reference" "0.68.1"
+    "@glimmer/util" "0.68.1"
+    "@glimmer/validator" "0.68.1"
+    "@glimmer/vm" "0.68.1"
+    "@glimmer/wire-format" "0.68.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.0.tgz#8dc25dbe8332ecc288ed5e02c721b19fc1e856e4"
-  integrity sha512-nidrNS1xf/cTQsoRyCj1VeCHGj4/dgRBBd3fbIig5KumOx7W5UQF4/cXJi24hA0/vvd0MEUMqo2DPpCMsPV7PQ==
+"@glimmer/syntax@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.1.tgz#e7bebdc26b2b4586ca27ae2d577a712b5bf9a6c3"
+  integrity sha512-c1XXV6Oy2ogYQSef3CYvlv/YRz1O5nZ71UadpUYtkchfQdgbwEQgCtIXKIvet5eMuvoYudnXHidSi91QEWaLOA==
   dependencies:
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
     "@handlebars/parser" "^1.1.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.0.tgz#16fec2fb54a9cda6ceef8c3cbc2c47346704cefc"
-  integrity sha512-YUIcItWFkHilVwllZnkJggoBm7xDvN+VyMgcPk4jsmUlMrt3zy0C9XGgmDmnPqJ1Bl0gMCf5JUf59RByw8TNHQ==
+"@glimmer/util@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.1.tgz#d522ff4b91f0a59a23327f336bb90ddc55685ca1"
+  integrity sha512-eg1etiyeaxXL63ZONvl4+AVPN64dl84hFYXJCngb4qRXCXuAzSH+lepkJtKwhzJUEMlASwqk75Au9CyoGM4SOg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.0.tgz#a9cab4a3eb6fdc432002e97d51fc07ec9fb144f4"
-  integrity sha512-KtDOCN1LxJW4/GRfhXZsHNsg3V0xHFklVhcXBdNjM/3mQDs5MIyaWJ+HduyLrFPC9I25/vjyH1zryBrD4+taiQ==
+"@glimmer/validator@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.1.tgz#7052fde18b5fcb4e1c726edf7b215c99fd68c36b"
+  integrity sha512-J5NmaltZl7Dpja3HvfDD3rITKIHaXlsRQoMHM6d4jqHTRkRCGpqm+x+BHMUiOXkm3vDwb0+t6bRTgQ8/hDGgSw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.0"
+    "@glimmer/global-context" "0.68.1"
 
-"@glimmer/vm@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.68.0.tgz#190da75b1ba7a717276976a0aceebf76cccc73c5"
-  integrity sha512-URAwgRiL2koR8OgWjDynYAvmefdqBo8oWbskWtazYivs+IJ341i8CA/YGo7L1XZcaXJY+lrdEZzhOmaLTMlAZA==
+"@glimmer/vm@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.68.1.tgz#3ac351df1a2e4478d94c9cd062beffd0d46d625e"
+  integrity sha512-5eg77qizunggRsX368XMDzPJ827OwqbfvSkwsXROPe8yvI26DmYGa2BL9o7r263FLQCoh27m/ZGkJY94Vmc9RQ==
   dependencies:
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
 
-"@glimmer/wire-format@0.68.0":
-  version "0.68.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.68.0.tgz#456753d7d7f88a59287d6d0b68a348625c933bb1"
-  integrity sha512-Tb2oiJTw3qB91oV98xP0g5fu75u+A6lf46wCAPGXdfDRhK4qAteypeCy5wz6+1pFucPP1Mn3nZ9OUVGnnQOPTQ==
+"@glimmer/wire-format@0.68.1":
+  version "0.68.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.68.1.tgz#c8c494425065e9280ab5768c34f9d2f68a905678"
+  integrity sha512-meKdL/eMOuXcLrxtZBYmS4cjULr1R+qUtJ8XvpzHfMXJk5eqCBbOL0k6Axr8ccSCmMC0vPztIQa/QCoddejGTw==
   dependencies:
-    "@glimmer/interfaces" "0.68.0"
-    "@glimmer/util" "0.68.0"
+    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/util" "0.68.1"
 
 "@handlebars/parser@^1.1.0":
   version "1.1.0"

From e6b16935cf3a683fa29e5802bbbb228a8e602ecd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 10 Dec 2020 19:25:55 +0000
Subject: [PATCH 0265/1405] [Security] Bump ini from 1.3.5 to 1.3.7

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. **This update includes a security fix.**
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 98e3fa0d1de..20a050dfc2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6213,9 +6213,9 @@ inherits@2.0.3:
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
 ini@^1.3.4, ini@~1.3.0:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
-  integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
+  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
 
 inline-source-map-comment@^1.0.5:
   version "1.0.5"

From 998243e35279ea8042179af07f78bdf9e12b1e4c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 9 Dec 2020 21:30:55 -0800
Subject: [PATCH 0266/1405] [FEATURE strict-mode] Update VM for Strict Mode

Updates the Glimmer VM to the latest version, which includes strict
mode. Strict mode is currently guarded behind a canary flag, but for the
most part only involves changes to the VM. The biggest changes are to
the template compiler's `compile` function, which has to change in order
to still be functional as scope values must be provided in some way, and
the resolver, which needs to provide keyword built-ins now in strict
templates.

Release notes for the VM: https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.69.0
---
 package.json                                  |  24 +-
 packages/@ember/-internals/glimmer/index.ts   |   9 +-
 .../glimmer/lib/component-managers/curly.ts   |  15 +-
 .../lib/component-managers/internal.ts        |  18 +-
 .../glimmer/lib/components/input.ts           |  16 +-
 .../glimmer/lib/components/internal.ts        |   6 -
 .../@ember/-internals/glimmer/lib/resolver.ts |  51 ++--
 .../-internals/glimmer/lib/setup-registry.ts  |  10 +-
 .../application/debug-render-tree-test.ts     |  22 +-
 .../components/strict-mode-test.js            | 217 ++++++++++++++
 .../integration/helpers/invoke-helper-test.js |   2 +-
 .../-internals/glimmer/tests/utils/helpers.js |   3 +-
 packages/@ember/canary-features/index.ts      |   2 +
 packages/ember-template-compiler/index.ts     |   1 +
 ...al-variable-shadowing-helper-invocation.ts |   7 +
 .../lib/system/bootstrap.ts                   |   3 +-
 .../lib/system/compile-options.ts             |  16 +-
 .../lib/system/compile.ts                     |   9 +-
 .../lib/system/precompile.ts                  |  13 +-
 .../ember-template-compiler/lib/types.d.ts    |  14 +-
 .../tests/utils/transform-test-case.ts        |   2 +-
 packages/ember/index.js                       |  15 +
 packages/internal-test-helpers/index.js       |   6 +
 packages/internal-test-helpers/lib/compile.ts |  39 +++
 .../lib/define-template-values.ts             | 113 ++++++++
 yarn.lock                                     | 264 +++++++++---------
 26 files changed, 676 insertions(+), 221 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
 create mode 100644 packages/internal-test-helpers/lib/compile.ts
 create mode 100644 packages/internal-test-helpers/lib/define-template-values.ts

diff --git a/package.json b/package.json
index 5e133f5d93f..d166b52da72 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.68.1",
+    "@glimmer/compiler": "0.69.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.68.1",
-    "@glimmer/interfaces": "0.68.1",
-    "@glimmer/manager": "0.68.1",
-    "@glimmer/destroyable": "0.68.1",
-    "@glimmer/owner": "0.68.1",
-    "@glimmer/node": "0.68.1",
-    "@glimmer/opcode-compiler": "0.68.1",
-    "@glimmer/program": "0.68.1",
-    "@glimmer/reference": "0.68.1",
-    "@glimmer/runtime": "0.68.1",
-    "@glimmer/validator": "0.68.1",
+    "@glimmer/global-context": "0.69.3",
+    "@glimmer/interfaces": "0.69.3",
+    "@glimmer/manager": "0.69.3",
+    "@glimmer/destroyable": "0.69.3",
+    "@glimmer/owner": "0.69.3",
+    "@glimmer/node": "0.69.3",
+    "@glimmer/opcode-compiler": "0.69.3",
+    "@glimmer/program": "0.69.3",
+    "@glimmer/reference": "0.69.3",
+    "@glimmer/runtime": "0.69.3",
+    "@glimmer/validator": "0.69.3",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 7729ebecc57..72e3fc4362d 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -367,6 +367,7 @@ export { default as Checkbox } from './lib/components/checkbox';
 export { default as TextField } from './lib/components/text-field';
 export { default as TextArea } from './lib/components/textarea';
 export { default as LinkComponent } from './lib/components/link-to';
+export { InputComponent as Input } from './lib/components/input';
 export { default as Component } from './lib/component';
 export { default as Helper, helper } from './lib/helper';
 export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
@@ -387,12 +388,18 @@ export {
 export { setupEngineRegistry, setupApplicationRegistry } from './lib/setup-registry';
 export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/dom';
 
+export { default as array } from './lib/helpers/array';
+export { default as hash } from './lib/helpers/hash';
+export { default as concat } from './lib/helpers/concat';
+export { default as get } from './lib/helpers/get';
+export { default as fn } from './lib/helpers/fn';
+export { default as on } from './lib/modifiers/on';
+
 // needed for test
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
 export { INVOKE } from './lib/helpers/action';
-export { default as on } from './lib/modifiers/on';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export { setComponentManager } from './lib/utils/managers';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 05ec993483d..a78ed8c84c1 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -124,7 +124,10 @@ type ComponentFactory = Factory<
     positionalParams: string | string[] | undefined | null;
     name: string;
   }
->;
+> & {
+  name: string;
+  positionalParams: string | string[] | undefined | null;
+};
 
 export default class CurlyComponentManager
   implements
@@ -188,7 +191,7 @@ export default class CurlyComponentManager
       return prepared;
     }
 
-    const { positionalParams } = ComponentClass.class!;
+    const { positionalParams } = ComponentClass.class ?? ComponentClass;
 
     // early exits
     if (
@@ -355,7 +358,9 @@ export default class CurlyComponentManager
   }
 
   getDebugName(definition: ComponentFactory): string {
-    return definition.fullName || definition.normalizedName || definition.class!.name;
+    return (
+      definition.fullName || definition.normalizedName || definition.class?.name || definition.name
+    );
   }
 
   getSelf({ rootRef }: ComponentStateBucket): Reference {
@@ -551,3 +556,7 @@ export const CURLY_CAPABILITIES: InternalComponentCapabilities = {
 };
 
 export const CURLY_COMPONENT_MANAGER = new CurlyComponentManager();
+
+export function isCurlyManager(manager: object): boolean {
+  return manager === CURLY_COMPONENT_MANAGER;
+}
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index aa30f4f9e5c..c29ea9f99ef 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -40,11 +40,18 @@ export default class InternalManager
   implements
     InternalComponentManager<InternalComponentState, EmberInternalComponentConstructor>,
     WithCreateInstance {
-  static for(name: string): (owner: Owner) => InternalManager {
-    return (owner: Owner) => new InternalManager(owner, name);
+  static for(
+    definition: EmberInternalComponentConstructor,
+    name: string
+  ): (owner: Owner) => InternalManager {
+    return (owner: Owner) => new InternalManager(owner, definition, name);
   }
 
-  constructor(private owner: Owner, private name: string) {}
+  constructor(
+    private owner: Owner,
+    private ComponentClass: EmberInternalComponentConstructor,
+    private name: string
+  ) {}
 
   getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
@@ -52,7 +59,7 @@ export default class InternalManager
 
   create(
     env: Environment,
-    ComponentClass: EmberInternalComponentConstructor,
+    _definition: unknown,
     args: VMArguments,
     _dynamicScope: DynamicScope,
     caller: Reference
@@ -64,7 +71,8 @@ export default class InternalManager
       args.positional.length === 0
     );
 
-    let instance = new ComponentClass(this.owner, args.named.capture(), valueForRef(caller));
+    let { ComponentClass, owner } = this;
+    let instance = new ComponentClass(owner, args.named.capture(), valueForRef(caller));
 
     let state = { env, instance };
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index e56943537dc..eb2c7c3c4f3 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -1,10 +1,11 @@
 /**
 @module @ember/component
 */
-import { setInternalComponentManager } from '@glimmer/manager';
+import { assert } from '@ember/debug';
+import { setComponentTemplate, setInternalComponentManager } from '@glimmer/manager';
 import InternalManager from '../component-managers/internal';
+import InputTemplate from '../templates/input';
 import InternalComponent from './internal';
-
 /**
   See [Ember.Templates.components.Input](/ember/release/classes/Ember.Templates.components/methods/Input?anchor=Input).
 
@@ -117,6 +118,15 @@ export default class Input extends InternalComponent {
   }
 }
 
-setInternalComponentManager(InternalManager.for('input'), Input);
+// Use an opaque handle so implementation details are
+export const InputComponent = {
+  // Factory interface
+  create(): never {
+    throw assert('Use constructor instead of create');
+  },
+};
+
+setInternalComponentManager(InternalManager.for(Input, 'input'), InputComponent);
+setComponentTemplate(InputTemplate, InputComponent);
 
 Input.toString = () => '@ember/component/input';
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index b6b41f4d911..406985a14ca 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -1,14 +1,8 @@
 import { Owner, setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
 import { Reference, valueForRef } from '@glimmer/reference';
 
 export default class InternalComponent {
-  // Factory interface
-  static create(): never {
-    throw assert('Use constructor instead of create');
-  }
-
   static get class(): typeof InternalComponent {
     return this;
   }
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 1f7eec6f6c0..529601e1ddd 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -29,7 +29,7 @@ import {
   templateOnlyComponent,
 } from '@glimmer/runtime';
 import { _WeakSet } from '@glimmer/util';
-import { CURLY_COMPONENT_MANAGER } from './component-managers/curly';
+import { isCurlyManager } from './component-managers/curly';
 import {
   CLASSIC_HELPER_MANAGER_FACTORY,
   HelperFactory,
@@ -177,20 +177,15 @@ if (PARTIALS) {
   };
 }
 
-const BUILTINS_HELPERS = {
-  if: inlineIf,
+const BUILTIN_KEYWORD_HELPERS = {
   action,
-  array,
-  concat,
-  fn,
-  get,
-  hash,
+  if: inlineIf,
   log,
   mut,
-  'query-params': queryParams,
   readonly,
   unbound,
   unless: inlineUnless,
+  'query-params': queryParams,
   '-hash': hash,
   '-each-in': eachIn,
   '-normalize-class': normalizeClassHelper,
@@ -202,8 +197,21 @@ const BUILTINS_HELPERS = {
   '-in-el-null': inElementNullCheckHelper,
 };
 
-const BUILTINS_MODIFIERS = {
+const BUILTIN_HELPERS = {
+  ...BUILTIN_KEYWORD_HELPERS,
+  array,
+  concat,
+  fn,
+  get,
+  hash,
+};
+
+const BUILTIN_KEYWORD_MODIFIERS = {
   action: actionModifier,
+};
+
+const BUILTIN_MODIFIERS = {
+  ...BUILTIN_KEYWORD_MODIFIERS,
   on: onModifier,
 };
 
@@ -226,10 +234,10 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
   lookupHelper(name: string, owner: Owner): Option<HelperDefinitionState> {
     assert(
       `You attempted to overwrite the built-in helper "${name}" which is not allowed. Please rename the helper.`,
-      !(BUILTINS_HELPERS[name] && owner.hasRegistration(`helper:${name}`))
+      !(BUILTIN_HELPERS[name] && owner.hasRegistration(`helper:${name}`))
     );
 
-    const helper = BUILTINS_HELPERS[name];
+    const helper = BUILTIN_HELPERS[name];
     if (helper !== undefined) {
       return helper;
     }
@@ -271,8 +279,12 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     return definition;
   }
 
+  lookupBuiltInHelper(name: string): HelperDefinitionState | null {
+    return BUILTIN_KEYWORD_HELPERS[name] ?? null;
+  }
+
   lookupModifier(name: string, owner: Owner): Option<ModifierDefinitionState> {
-    let builtin = BUILTINS_MODIFIERS[name];
+    let builtin = BUILTIN_MODIFIERS[name];
 
     if (builtin !== undefined) {
       return builtin;
@@ -287,6 +299,10 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     return modifier.class || null;
   }
 
+  lookupBuiltInModifier(name: string): ModifierDefinitionState | null {
+    return BUILTIN_KEYWORD_MODIFIERS[name] ?? null;
+  }
+
   lookupComponent(name: string, owner: Owner): ResolvedComponentDefinition | null {
     let pair = lookupComponentPair(owner, name);
 
@@ -328,9 +344,12 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
           template,
         };
       } else {
+        let factory = owner.factoryFor(P`component:-default`)!;
+        let manager = getInternalComponentManager(owner, factory.class as object);
+
         definition = {
-          state: owner.factoryFor(P`component:-default`)!,
-          manager: CURLY_COMPONENT_MANAGER,
+          state: factory,
+          manager,
           template,
         };
       }
@@ -342,7 +361,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
       let manager = getInternalComponentManager(owner, ComponentClass);
 
       definition = {
-        state: manager === CURLY_COMPONENT_MANAGER ? factory : ComponentClass,
+        state: isCurlyManager(manager) ? factory : ComponentClass,
         manager,
         template,
       };
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 5d4b384e30e..58bf4ae8f27 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -2,19 +2,18 @@ import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import Component from './component';
 import Checkbox from './components/checkbox';
-import Input from './components/input';
+import { InputComponent } from './components/input';
 import LinkToComponent from './components/link-to';
 import TextField from './components/text-field';
 import TextArea from './components/textarea';
 import { clientBuilder, rehydrationBuilder, serializeBuilder } from './dom';
 import loc from './helpers/loc';
 import { InertRenderer, InteractiveRenderer } from './renderer';
-import InputTemplate from './templates/input';
 import OutletTemplate from './templates/outlet';
 import RootTemplate from './templates/root';
 import OutletView from './views/outlet';
 
-export function setupApplicationRegistry(registry: Registry) {
+export function setupApplicationRegistry(registry: Registry): void {
   registry.injection('renderer', 'env', '-environment:main');
 
   // because we are using injections we can't use instantiate false
@@ -46,7 +45,7 @@ export function setupApplicationRegistry(registry: Registry) {
   registry.injection('renderer', 'document', 'service:-document');
 }
 
-export function setupEngineRegistry(registry: Registry) {
+export function setupEngineRegistry(registry: Registry): void {
   registry.optionsForType('template', { instantiate: false });
 
   registry.register('view:-outlet', OutletView);
@@ -61,8 +60,7 @@ export function setupEngineRegistry(registry: Registry) {
   registry.register('component:-checkbox', Checkbox);
   registry.register('component:link-to', LinkToComponent);
 
-  registry.register('component:input', Input);
-  registry.register('template:components/input', InputTemplate as any);
+  registry.register('component:input', InputComponent);
 
   registry.register('component:textarea', TextArea);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index bc28ca70b9d..21c866e5266 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -18,7 +18,7 @@ import { componentCapabilities, setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
 import { expect } from '@glimmer/util';
 import { SimpleElement, SimpleNode } from '@simple-dom/interface';
-import { compile } from 'ember-template-compiler';
+import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
 import { runTask } from 'internal-test-helpers/lib/run';
 
 interface CapturedBounds {
@@ -27,6 +27,10 @@ interface CapturedBounds {
   lastNode: SimpleNode;
 }
 
+function compileTemplate(templateSource: string, options: Partial<EmberPrecompileOptions>) {
+  return compile(templateSource, options) as any;
+}
+
 type Expected<T> = T | ((actual: T) => boolean);
 
 function isExpectedFunc<T>(expected: Expected<T>): expected is (actual: T) => boolean {
@@ -301,7 +305,7 @@ if (ENV._DEBUG_RENDER_TREE) {
               super.init(...arguments);
               this.register(
                 'template:application',
-                compile(
+                compileTemplate(
                   strip`
                     {{#if @model}}
                       <InspectModel @model={{@model}} />
@@ -314,7 +318,7 @@ if (ENV._DEBUG_RENDER_TREE) {
               );
               this.register(
                 'template:components/inspect-model',
-                compile('{{@model}}', {
+                compileTemplate('{{@model}}', {
                   moduleName: 'foo/components/inspect-model.hbs',
                 })
               );
@@ -337,7 +341,7 @@ if (ENV._DEBUG_RENDER_TREE) {
               super.init(...arguments);
               this.register(
                 'template:application',
-                compile(
+                compileTemplate(
                   strip`
                     {{#if @model}}
                       <InspectModel @model={{@model}} />
@@ -350,7 +354,7 @@ if (ENV._DEBUG_RENDER_TREE) {
               );
               this.register(
                 'template:components/inspect-model',
-                compile('{{@model}}', {
+                compileTemplate('{{@model}}', {
                   moduleName: 'bar/components/inspect-model.hbs',
                 })
               );
@@ -682,7 +686,7 @@ if (ENV._DEBUG_RENDER_TREE) {
               super.init(...arguments);
               this.register(
                 'template:application',
-                compile(
+                compileTemplate(
                   strip`
                     {{outlet}}
 
@@ -697,13 +701,13 @@ if (ENV._DEBUG_RENDER_TREE) {
               );
               this.register(
                 'template:index',
-                compile('Foo', {
+                compileTemplate('Foo', {
                   moduleName: 'foo/templates/index.hbs',
                 })
               );
               this.register(
                 'template:components/hello',
-                compile('<span>Hello {{@message}}</span>', {
+                compileTemplate('<span>Hello {{@message}}</span>', {
                   moduleName: 'foo/components/hello.hbs',
                 })
               );
@@ -1027,7 +1031,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         this.addComponent('hello-world', {
           ComponentClass: setComponentTemplate(
-            compile('{{@name}}', { moduleName: 'my-app/components/hello-world.hbs' }),
+            compileTemplate('{{@name}}', { moduleName: 'my-app/components/hello-world.hbs' }),
             templateOnlyComponent()
           ),
         });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
new file mode 100644
index 00000000000..d6587280288
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -0,0 +1,217 @@
+import {
+  moduleFor,
+  ApplicationTestCase,
+  RenderingTestCase,
+  defineComponent,
+  defineSimpleHelper,
+  defineSimpleModifier,
+} from 'internal-test-helpers';
+import { EMBER_STRICT_MODE } from '@ember/canary-features';
+
+import {
+  Input,
+  LinkComponent as LinkTo,
+  TextArea,
+  hash,
+  array,
+  concat,
+  get,
+  on,
+  fn,
+} from '@ember/-internals/glimmer';
+
+if (EMBER_STRICT_MODE) {
+  moduleFor(
+    'Strict Mode',
+    class extends RenderingTestCase {
+      '@test Can use a component in scope'() {
+        let Foo = defineComponent({}, 'Hello, world!');
+        let Bar = defineComponent({ Foo }, '<Foo/>');
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use a custom helper in scope (in append position)'() {
+        let foo = defineSimpleHelper(() => 'Hello, world!');
+        let Bar = defineComponent({ foo }, '{{foo}}');
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use a custom modifier in scope'() {
+        let foo = defineSimpleModifier((element) => (element.innerHTML = 'Hello, world!'));
+        let Bar = defineComponent({ foo }, '<div {{foo}}></div>');
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('<div>Hello, world!</div>');
+        this.assertStableRerender();
+      }
+
+      '@test Can shadow keywords'() {
+        let ifComponent = defineComponent({}, 'Hello, world!');
+        let Bar = defineComponent({ if: ifComponent }, '{{#if}}{{/if}}');
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use constant values in ambiguous helper/component position'() {
+        let value = 'Hello, world!';
+
+        let Foo = defineComponent({ value }, '{{value}}');
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use inline if and unless in strict mode templates'() {
+        let Foo = defineComponent({}, '{{if true "foo" "bar"}}{{unless true "foo" "bar"}}');
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertHTML('foobar');
+        this.assertStableRerender();
+      }
+    }
+  );
+
+  moduleFor(
+    'Strict Mode - built ins',
+    class extends RenderingTestCase {
+      '@test Can use Input'() {
+        let Foo = defineComponent({ Input }, '<Input/>');
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertComponentElement(this.firstChild, {
+          tagName: 'input',
+          attrs: {
+            type: 'text',
+            class: 'ember-text-field ember-view',
+          },
+        });
+        this.assertStableRerender();
+      }
+
+      '@skip Can use TextArea'() {
+        let Foo = defineComponent({ TextArea }, '<TextArea/>');
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertComponentElement(this.firstChild, {
+          tagName: 'textarea',
+          attrs: {
+            class: 'ember-text-area ember-view',
+          },
+        });
+        this.assertStableRerender();
+      }
+
+      '@test Can use hash'() {
+        let Foo = defineComponent(
+          { hash },
+          '{{#let (hash value="Hello, world!") as |hash|}}{{hash.value}}{{/let}}'
+        );
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use array'() {
+        let Foo = defineComponent(
+          { array },
+          '{{#each (array "Hello, world!") as |value|}}{{value}}{{/each}}'
+        );
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use concat'() {
+        let Foo = defineComponent({ concat }, '{{(concat "Hello" ", " "world!")}}');
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use get'() {
+        let Foo = defineComponent(
+          { hash, get },
+          '{{#let (hash value="Hello, world!") as |hash|}}{{(get hash "value")}}{{/let}}'
+        );
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use on and fn'(assert) {
+        assert.expect(1);
+
+        let handleClick = (value) => {
+          assert.equal(value, 123);
+        };
+
+        let Foo = defineComponent(
+          { on, fn, handleClick },
+          '<button {{on "click" (fn handleClick 123)}}>Click</button>'
+        );
+
+        this.registerComponent('foo', { ComponentClass: Foo });
+
+        this.render('<Foo/>');
+        this.click('button');
+      }
+    }
+  );
+
+  moduleFor(
+    'Strict Mode - LinkTo',
+    class extends ApplicationTestCase {
+      '@skip Can use LinkTo'() {
+        let Foo = defineComponent({ LinkTo }, '<LinkTo @route="index">Index</LinkTo>');
+
+        this.addComponent('foo', { ComponentClass: Foo });
+        this.addTemplate('index', `<Foo/>`);
+
+        return this.visit('/').then(() => {
+          this.assertComponentElement(this.firstChild, {
+            tagName: 'a',
+            attrs: { href: '/', class: 'active ember-view' },
+            content: 'Index',
+          });
+        });
+      }
+    }
+  );
+}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index d5212959fbd..ad77d25c2ba 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -443,7 +443,7 @@ if (EMBER_GLIMMER_INVOKE_HELPER) {
 
         assert.throws(() => {
           invokeHelper({}, class {});
-        }, /Attempted to load a helper, but there wasn't a manager associated with the definition. The definition was:/);
+        }, /Attempted to load a helper, but there wasn't a helper manager associated with the definition. The definition was:/);
       }
     }
   );
diff --git a/packages/@ember/-internals/glimmer/tests/utils/helpers.js b/packages/@ember/-internals/glimmer/tests/utils/helpers.js
index 143b4aa77a9..eef7528b308 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/helpers.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/helpers.js
@@ -1,4 +1,5 @@
-export { compile, precompile } from 'ember-template-compiler';
+export { precompile } from 'ember-template-compiler';
+export { compile } from 'internal-test-helpers';
 
 export {
   INVOKE,
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 9bf0601351f..13458920d71 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -19,6 +19,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
+  EMBER_STRICT_MODE: null,
 };
 
 /**
@@ -75,3 +76,4 @@ export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_I
 export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
   FEATURES.EMBER_MODERNIZED_BUILT_IN_COMPONENTS
 );
+export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
diff --git a/packages/ember-template-compiler/index.ts b/packages/ember-template-compiler/index.ts
index f3cffa39c68..fc69a458b97 100644
--- a/packages/ember-template-compiler/index.ts
+++ b/packages/ember-template-compiler/index.ts
@@ -28,6 +28,7 @@ export {
   unregisterPlugin,
 } from './lib/system/compile-options';
 export { default as defaultPlugins } from './lib/plugins/index';
+export { EmberPrecompileOptions } from './lib/types';
 
 // used to bootstrap templates
 import './lib/system/bootstrap';
diff --git a/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts b/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
index fdbe1fd93c4..0022edf624a 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
@@ -10,6 +10,13 @@ export default function assertLocalVariableShadowingHelperInvocation(
   let { moduleName } = env.meta;
   let { hasLocal, node } = trackLocals();
 
+  if (env.strictMode) {
+    return {
+      name: 'assert-local-variable-shadowing-helper-invocation',
+      visitor: {},
+    };
+  }
+
   return {
     name: 'assert-local-variable-shadowing-helper-invocation',
 
diff --git a/packages/ember-template-compiler/lib/system/bootstrap.ts b/packages/ember-template-compiler/lib/system/bootstrap.ts
index 1c0108c487a..1800e56ce1a 100644
--- a/packages/ember-template-compiler/lib/system/bootstrap.ts
+++ b/packages/ember-template-compiler/lib/system/bootstrap.ts
@@ -2,12 +2,13 @@
 @module ember
 */
 
+import { TemplateFactory } from '@glimmer/interfaces';
 import compile from './compile';
 
 export interface BootstrapOptions {
   context?: Document | HTMLElement;
   hasTemplate(templateName: string): boolean;
-  setTemplate(templateName: string, template: string): void;
+  setTemplate(templateName: string, template: TemplateFactory): void;
 }
 
 /**
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 5844d0b50d5..9002d6e2fd7 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,14 +1,16 @@
+import { EMBER_STRICT_MODE } from '@ember/canary-features';
 import { assign } from '@ember/polyfills';
+import { PrecompileOptions } from '@glimmer/compiler';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
 import PLUGINS from '../plugins/index';
-import { CompileOptions, EmberPrecompileOptions, PluginFunc } from '../types';
+import { EmberPrecompileOptions, PluginFunc } from '../types';
 import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
 
 let USER_PLUGINS: PluginFunc[] = [];
 
 export default function compileOptions(
-  _options: Partial<CompileOptions> = {}
-): EmberPrecompileOptions {
+  _options: Partial<EmberPrecompileOptions> = {}
+): PrecompileOptions {
   let options: EmberPrecompileOptions = assign(
     { meta: {}, isProduction: false, plugins: { ast: [] } },
     _options,
@@ -19,6 +21,11 @@ export default function compileOptions(
     }
   );
 
+  if (!EMBER_STRICT_MODE) {
+    options.strictMode = false;
+    options.locals = undefined;
+  }
+
   // move `moduleName` into `meta` property
   if (options.moduleName) {
     let meta = options.meta;
@@ -36,7 +43,8 @@ export default function compileOptions(
     options.plugins.ast = providedPlugins.concat(pluginsToAdd);
   }
 
-  return options;
+  // TODO: Fix the types here so that this conversion isn't necessary
+  return (options as unknown) as PrecompileOptions;
 }
 
 interface LegacyPlugin {
diff --git a/packages/ember-template-compiler/lib/system/compile.ts b/packages/ember-template-compiler/lib/system/compile.ts
index 87241d904e9..02a693e8faf 100644
--- a/packages/ember-template-compiler/lib/system/compile.ts
+++ b/packages/ember-template-compiler/lib/system/compile.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import require, { has } from 'require';
-import { CompileOptions } from '../types';
+import { EmberPrecompileOptions } from '../types';
 import precompile from './precompile';
 
 // FIXME
@@ -13,15 +13,16 @@ let template: (templateJS: StaticTemplate) => Factory;
 
 /**
   Uses HTMLBars `compile` function to process a string into a compiled template.
-
   This is not present in production builds.
-
   @private
   @method compile
   @param {String} templateString This is the string to be compiled by HTMLBars.
   @param {Object} options This is an options hash to augment the compiler options.
 */
-export default function compile(templateString: string, options: CompileOptions = {}): Factory {
+export default function compile(
+  templateString: string,
+  options: Partial<EmberPrecompileOptions> = {}
+): Factory {
   if (!template && has('@ember/-internals/glimmer')) {
     // tslint:disable-next-line:no-require-imports
     template = require('@ember/-internals/glimmer').template;
diff --git a/packages/ember-template-compiler/lib/system/precompile.ts b/packages/ember-template-compiler/lib/system/precompile.ts
index 691a6036017..3be8208feb5 100644
--- a/packages/ember-template-compiler/lib/system/precompile.ts
+++ b/packages/ember-template-compiler/lib/system/precompile.ts
@@ -2,8 +2,8 @@
 @module ember
 */
 
-import { precompile as glimmerPrecompile, PrecompileOptions } from '@glimmer/compiler';
-import { CompileOptions } from '../types';
+import { precompile as glimmerPrecompile } from '@glimmer/compiler';
+import { EmberPrecompileOptions } from '../types';
 import compileOptions from './compile-options';
 
 /**
@@ -16,8 +16,9 @@ import compileOptions from './compile-options';
   @method precompile
   @param {String} templateString This is the string to be compiled by HTMLBars.
 */
-export default function precompile(templateString: string, _options: CompileOptions = {}): string {
-  let options: PrecompileOptions = compileOptions(_options) as any;
-
-  return glimmerPrecompile(templateString, options);
+export default function precompile(
+  templateString: string,
+  options: Partial<EmberPrecompileOptions> = {}
+): string {
+  return glimmerPrecompile(templateString, compileOptions(options));
 }
diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts
index 016fa37827f..e211cb9442a 100644
--- a/packages/ember-template-compiler/lib/types.d.ts
+++ b/packages/ember-template-compiler/lib/types.d.ts
@@ -1,4 +1,4 @@
-import { ASTPlugin, ASTPluginEnvironment, builders } from '@glimmer/syntax';
+import { ASTPlugin, ASTPluginEnvironment, builders, PrecompileOptions } from '@glimmer/syntax';
 import { StaticTemplateMeta } from '@ember/-internals/views';
 
 export type Builders = typeof builders;
@@ -12,15 +12,9 @@ interface Plugins {
   ast: PluginFunc[];
 }
 
-export interface CompileOptions {
-  meta?: any;
-  contents?: string;
-  moduleName?: string;
-  plugins?: Plugins;
-  isProduction?: boolean;
-}
-
-export interface EmberPrecompileOptions {
+export interface EmberPrecompileOptions extends PrecompileOptions {
+  strictMode?: boolean;
+  locals?: string[];
   customizeComponentName(tag: string): string;
   isProduction: boolean;
   contents?: string;
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 8d2983c27e2..605fad79bac 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -31,7 +31,7 @@ function ast(template: string): AST.Program {
     moduleName: '-top-level',
   });
 
-  if (options.plugins.ast) {
+  if (options.plugins?.ast) {
     options.plugins.ast.push(extractProgram);
   }
 
diff --git a/packages/ember/index.js b/packages/ember/index.js
index a619ae7142e..fd2d5640a92 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -114,6 +114,13 @@ import {
   template,
   TextField,
   TextArea,
+  Input,
+  hash,
+  array,
+  concat,
+  get,
+  on,
+  fn,
   isSerializationFirstNode,
 } from '@ember/-internals/glimmer';
 // eslint-disable-next-line import/no-unresolved
@@ -597,6 +604,14 @@ Ember._getComponentTemplate = getComponentTemplate;
 Ember._setComponentTemplate = setComponentTemplate;
 Ember._templateOnlyComponent = templateOnlyComponent;
 
+Ember._Input = Input;
+Ember._hash = hash;
+Ember._array = array;
+Ember._concat = concat;
+Ember._get = get;
+Ember._on = on;
+Ember._fn = fn;
+
 if (EMBER_GLIMMER_HELPER_MANAGER) {
   Ember._helperManagerCapabilities = helperCapabilities;
   Ember._setHelperManager = setHelperManager;
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index ca57769a58d..3379d35400d 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -7,6 +7,12 @@ export { default as moduleFor, setupTestClass } from './lib/module-for';
 export { default as strip } from './lib/strip';
 export { default as applyMixins } from './lib/apply-mixins';
 export { default as getTextOf } from './lib/get-text-of';
+export {
+  defineComponent,
+  defineSimpleHelper,
+  defineSimpleModifier,
+} from './lib/define-template-values';
+export { default as compile } from './lib/compile';
 export { equalsElement, classes, styles, regex } from './lib/matchers';
 export { runAppend, runDestroy, runTask, runTaskNext, runLoopSettled } from './lib/run';
 export { getContext, setContext, unsetContext } from './lib/test-context';
diff --git a/packages/internal-test-helpers/lib/compile.ts b/packages/internal-test-helpers/lib/compile.ts
new file mode 100644
index 00000000000..c2c55601d99
--- /dev/null
+++ b/packages/internal-test-helpers/lib/compile.ts
@@ -0,0 +1,39 @@
+/**
+@module ember
+*/
+import { precompileJSON } from '@glimmer/compiler';
+import { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces';
+import { templateFactory } from '@glimmer/opcode-compiler';
+import { compileOptions, EmberPrecompileOptions } from 'ember-template-compiler';
+
+let templateId = 0;
+
+/**
+  Uses HTMLBars `compile` function to process a string into a compiled template.
+
+  This is not present in production builds.
+
+  @private
+  @method compile
+  @param {String} templateString This is the string to be compiled by HTMLBars.
+  @param {Object} options This is an options hash to augment the compiler options.
+*/
+export default function compile(
+  templateSource: string,
+  options: Partial<EmberPrecompileOptions> = {},
+  scopeValues: Record<string, unknown> = {}
+): TemplateFactory {
+  options.locals = options.locals ?? Object.keys(scopeValues ?? {});
+  let [block, usedLocals] = precompileJSON(templateSource, compileOptions(options));
+  let reifiedScopeValues = usedLocals.map((key) => scopeValues[key]);
+
+  let templateBlock: SerializedTemplateWithLazyBlock = {
+    id: String(templateId++),
+    block: JSON.stringify(block),
+    moduleName: options.moduleName ?? options.meta?.moduleName ?? '(unknown template module)',
+    scope: reifiedScopeValues.length > 0 ? () => reifiedScopeValues : null,
+    isStrictMode: options.strictMode ?? false,
+  };
+
+  return templateFactory(templateBlock);
+}
diff --git a/packages/internal-test-helpers/lib/define-template-values.ts b/packages/internal-test-helpers/lib/define-template-values.ts
new file mode 100644
index 00000000000..1dc1afb09c7
--- /dev/null
+++ b/packages/internal-test-helpers/lib/define-template-values.ts
@@ -0,0 +1,113 @@
+import {
+  helperCapabilities,
+  modifierCapabilities,
+  setComponentTemplate,
+  setHelperManager,
+  setModifierManager,
+} from '@glimmer/manager';
+import { templateOnlyComponent } from '@glimmer/runtime';
+
+import {
+  Arguments,
+  ComponentDefinitionState,
+  HelperManager,
+  ModifierManager,
+} from '@glimmer/interfaces';
+import { SimpleElement } from '@simple-dom/interface';
+import compile from './compile';
+
+interface SimpleHelperState {
+  fn: (...args: unknown[]) => unknown;
+  args: Arguments;
+}
+
+class FunctionalHelperManager implements HelperManager<SimpleHelperState> {
+  capabilities = helperCapabilities('3.23', {
+    hasValue: true,
+  });
+
+  createHelper(fn: () => unknown, args: Arguments) {
+    return { fn, args };
+  }
+
+  getValue({ fn, args }: SimpleHelperState) {
+    return fn(...args.positional);
+  }
+
+  getDebugName(fn: Function) {
+    return fn.name || '(anonymous function)';
+  }
+}
+
+const FUNCTIONAL_HELPER_MANAGER = new FunctionalHelperManager();
+const FUNCTIONAL_HELPER_MANAGER_FACTORY = () => FUNCTIONAL_HELPER_MANAGER;
+
+type SimpleModifierFn = (...args: unknown[]) => (() => void) | undefined;
+
+interface SimpleModifierState {
+  fn: SimpleModifierFn;
+  args: Arguments;
+  element: SimpleElement | undefined;
+  destructor: (() => void) | undefined;
+}
+
+class FunctionalModifierManager implements ModifierManager<SimpleModifierState> {
+  capabilities = modifierCapabilities('3.22');
+
+  createModifier(fn: SimpleModifierFn, args: Arguments) {
+    return { fn, args, element: undefined, destructor: undefined };
+  }
+
+  installModifier(state: SimpleModifierState, element: SimpleElement) {
+    state.element = element;
+    this.setupModifier(state);
+  }
+
+  updateModifier(state: SimpleModifierState) {
+    this.destroyModifier(state);
+    this.setupModifier(state);
+  }
+
+  setupModifier(state: SimpleModifierState) {
+    let { fn, args, element } = state;
+
+    state.destructor = fn(element, args.positional, args.named);
+  }
+
+  destroyModifier(state: SimpleModifierState) {
+    if (typeof state.destructor === 'function') {
+      state.destructor();
+    }
+  }
+
+  getDebugName(fn: Function) {
+    return fn.name || '(anonymous function)';
+  }
+}
+
+const FUNCTIONAL_MODIFIER_MANAGER = new FunctionalModifierManager();
+const FUNCTIONAL_MODIFIER_MANAGER_FACTORY = () => FUNCTIONAL_MODIFIER_MANAGER;
+
+export function defineComponent(
+  scopeValues: Record<string, unknown> | null,
+  templateSource: string,
+  definition: object = templateOnlyComponent()
+): ComponentDefinitionState {
+  let templateFactory = compile(
+    templateSource,
+    { strictMode: scopeValues !== null },
+    scopeValues ?? {}
+  );
+
+  setComponentTemplate(templateFactory, definition);
+
+  return definition;
+}
+
+export function defineSimpleHelper<T extends Function>(helperFn: T): T {
+  return setHelperManager(FUNCTIONAL_HELPER_MANAGER_FACTORY, helperFn);
+}
+
+export function defineSimpleModifier<T extends Function>(modifierFn: T): T {
+  return setModifierManager(FUNCTIONAL_MODIFIER_MANAGER_FACTORY, modifierFn);
+}
diff --git a/yarn.lock b/yarn.lock
index 98e3fa0d1de..c2304654147 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,192 +1657,192 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.68.1.tgz#7f99f2ca3cd4fece0ee280b2a7a5baf6b557e1df"
-  integrity sha512-SCjjFiwd0H9221ewErc0cGJLDiDb0GOSIv2z+kuR3pA+b13w+jEZHvnzwRHaJgKAdmDFdBZeHhI1Jt5AyTwBJA==
-  dependencies:
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/syntax" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@glimmer/wire-format" "0.68.1"
+"@glimmer/compiler@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.69.3.tgz#bd81e3c83d6c28872d97c1e2ce85db38f039feb3"
+  integrity sha512-iawhFPrHZyDTkPTjhSonjqVEutGSfC0Ixar/vxqpn2cEddl/6zlfVfgb1UBRn/yl/pQ5ZfHiRFUMc8+4aNRA6A==
+  dependencies:
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/syntax" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@glimmer/wire-format" "0.69.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.68.1.tgz#44b296138db33fa8e98812a7da5a29f7cace2bf7"
-  integrity sha512-xF/L7KCGMvJhwiqY8mhF991VixCoTi5QLfsxJIR7gesjXZh3FqMDOoSmuv35rQE0gsFTtaFhEXGFsJSBLbzjVg==
+"@glimmer/destroyable@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.69.3.tgz#57e71d151a8e7745438d9c72de21c549023d34b8"
+  integrity sha512-ZzS1196nxEa1zDRmcoCn5Q/HHnAKe0w2HFpS1fJYwUahiggBD3O8XzI99T/+JIdCbgAHUh6N6GfTX1MpwIr3qA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.68.1"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
+    "@glimmer/global-context" "0.69.3"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
 
-"@glimmer/encoder@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.68.1.tgz#41ea9640f18cd1013aa26fb455dbd8847a42aca6"
-  integrity sha512-ez+fvlDePeIIN+ucBckorgZm18W9rjst4+ABrw4sO4ylvNaZ5nZFmJh6g0hfrT5gD+FnyveiImyB3tIIzp2mtQ==
+"@glimmer/encoder@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.69.3.tgz#326d68eafdc53d00b9873f8d98930469f79a1f37"
+  integrity sha512-5cuMu+07OVxazjswXBiATGFGwDGKqjWXAZ/e7DKlHu30qRHmEEuMPmQ8AjlT3WXQPceT+iD6yRoHlVDDo3N3Dg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/vm" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/vm" "0.69.3"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.68.1.tgz#b5e84883a2449075a0618e33641d94e7442a0b31"
-  integrity sha512-nwZeoaBJWxEqT3tubPFI1lyUIO8UhkcdGAo+8rranrASJ0oQddldYhaDGO863Gnre+5I2MWUps4jVAg7MFBkSg==
+"@glimmer/global-context@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.69.3.tgz#d38bae41e6dcc248f264fecbce99f997f57a88d7"
+  integrity sha512-QFkVRGVaduy9yQwaN/oB54M5wpLXLuIOhcrcfT9cBDwAOuMO5EWT+jffQ958RH6XNg8dpnL5ut233v7SxM9SJg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.68.1.tgz#a4d4b0380f0094c7f5901c26b54ccf40ddef521e"
-  integrity sha512-QNsWfMe5Aob++aM+OBJOUAn6DXwNK84p7ISkzxKZYdNNgLavjI5Coo2N577I95x42h1k9fdUoIxBKKC7aCSx4g==
+"@glimmer/interfaces@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.3.tgz#7d99db1a328ab6cd95b7235360780ed28d27b0e5"
+  integrity sha512-0h19o+PNdw5wO5aLbX/96jhT3wZA9zKYap7B1pAjcZiHYwtvhuGLSqR+zvr4Dq4oSXrNU/kbk1WWmoHm7Hkehw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.68.1.tgz#a3b3cb1b3b2c9b5fa5b09952bd99fa538b0cc209"
-  integrity sha512-8iI5WRXSQDj0w1K3kgaNzxPmW/YxobSryvpuk6ZwB4tUCzt+1pNwdxKH/43k5khyjXMISoe0WTnKIJrnCsTgSw==
+"@glimmer/low-level@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.69.3.tgz#95763f0eb821891525a3f050b14a635ce4a04a9e"
+  integrity sha512-tHI6CXnwYpBKAXaR2t+5pqqOZveQRXvrFSlCMR2iohBmCSVqAR4be+ERLDzROHawP4ypN+cArfPqlC/4DN1zWw==
 
-"@glimmer/manager@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.68.1.tgz#eabc833307d8dc93d21c1e77a5094ecd177e8812"
-  integrity sha512-l7TB3rVIQwuYJt0lo9/vT+ie8hN4ZHbtSNRl+DxzS7FpVva3oAxtG3/JbSwq2W1i9VpC+l3ne6yBobxkuXwSyg==
+"@glimmer/manager@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.69.3.tgz#896995df36dba99db06d021bb1b4d4e1674956ea"
+  integrity sha512-vhnNtT7Pz1tveOBI/LN4p/CG7lBve9rJtib0Qyh28QLBAT8m/YnblAIRePt8HbPkgSL+3a85YxyjEp4+mnd37Q==
   dependencies:
-    "@glimmer/destroyable" "0.68.1"
+    "@glimmer/destroyable" "0.69.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/reference" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@glimmer/validator" "0.68.1"
-
-"@glimmer/node@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.68.1.tgz#d9db3651eebb6cb65aada574aa00133d21093af2"
-  integrity sha512-o38/HJNpbB+8VuTcQUtItZxAwcHHGZUqXFvBrJ8l0x7HjFRs6u7kLTHpPnHoLtV1w7CHL3hESHr6su9SotkbYg==
-  dependencies:
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/runtime" "0.68.1"
-    "@glimmer/util" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/reference" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@glimmer/validator" "0.69.3"
+
+"@glimmer/node@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.69.3.tgz#a5aca72185af9267a223d6b7d07e0709804a3747"
+  integrity sha512-9el1kJjgQNoDYoWc/jbI1j+ywJA69ZU5yy7XDLTq42ooR31+rY2gY3v6110s3h18kfS21C79WzRd+UDAlD0cfg==
+  dependencies:
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/runtime" "0.69.3"
+    "@glimmer/util" "0.69.3"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.68.1.tgz#ec1ea91f26e44057e9980880fba227c66c9c7e88"
-  integrity sha512-b5G/hPBHpnILAwY8/F/djLVJLCQPeCGmosic4IkWaLzxdmUpy2Ay7Y2fLAIzC7BfHP6NC23o4aGzepqAw6H1Uw==
+"@glimmer/opcode-compiler@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.69.3.tgz#c97b27396b088482af0a443a15e5596615d8a639"
+  integrity sha512-m2LMBZ7rfoQo1TOKoz2coUzCLjTkLZhgCkPA3ub8i7SJrWP2coxCGuHZ+yoW3X72wlY3Zu8DM/AdzgrCABNwVQ==
   dependencies:
-    "@glimmer/encoder" "0.68.1"
+    "@glimmer/encoder" "0.69.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/reference" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@glimmer/vm" "0.68.1"
-    "@glimmer/wire-format" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/reference" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@glimmer/vm" "0.69.3"
+    "@glimmer/wire-format" "0.69.3"
 
-"@glimmer/owner@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.68.1.tgz#bd1b02cb4d02954edb29e8679546f23d5cb0dd6d"
-  integrity sha512-BnI8Y8jj+66gZRe3ct1z912dZlMAbbP5JTrbzAvnMJ6nUqGPGEEuIfU5gqPdtxDbv6uzHXxS/71ENTtOZ0zSfw==
+"@glimmer/owner@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.69.3.tgz#71a97d5877b72a7a7a3d740dd00ecdfe2595824f"
+  integrity sha512-Ua3IvfQ2NAldqNVU03C4dboqjXxT16N807IgiNFB1Ec4QGCJ9dTYx8p98EgmrTqfBe4AbCqmhQKSVWugXAGU7A==
   dependencies:
-    "@glimmer/util" "0.68.1"
+    "@glimmer/util" "0.69.3"
 
-"@glimmer/program@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.68.1.tgz#690c50c2f63f03f929fee21b55f9ea032c690316"
-  integrity sha512-eT3Jl68J6e60bQZddcMD2Khq0l8Un0EDwc/nPx6HCdJIN/sm22dJfDHXapQy9/Y+qw7qcb+eCuNdprbdvWdVuA==
+"@glimmer/program@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.69.3.tgz#5a2b8a02d76322fb6b4f280ce0f39d9ebaaba292"
+  integrity sha512-HrZe6RDI1ra9uy/84H+T7Toh1YyuD9Zg0KtWRx26Cc30WrAk1CG597Y25OhJTrGMTYrKol86kS6Lv+97VrqEmA==
   dependencies:
-    "@glimmer/encoder" "0.68.1"
+    "@glimmer/encoder" "0.69.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/manager" "0.68.1"
-    "@glimmer/opcode-compiler" "0.68.1"
-    "@glimmer/util" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/manager" "0.69.3"
+    "@glimmer/opcode-compiler" "0.69.3"
+    "@glimmer/util" "0.69.3"
 
-"@glimmer/reference@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.68.1.tgz#0adb39a452e1c82c28c27f082135b5698e529a18"
-  integrity sha512-qXF0SAyA34oeATkLT95St8gUdImRG52VjcDax9TbkW4fIjf5geQnyfsMP00VKFxWa7TUBFvPSapdhvWCfOu0LQ==
+"@glimmer/reference@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.3.tgz#b229bfa44a0506e89f19fa23468de82908c78695"
+  integrity sha512-JoHGFPPv8S5VO3wXSZ7dMIdCPEvkzdvRUG412nQp6M3KdXZUKy4ouAYFJy4iTpFWvPaIi4BI1Exo1HVtliuvZA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.1"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@glimmer/validator" "0.68.1"
+    "@glimmer/global-context" "0.69.3"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@glimmer/validator" "0.69.3"
 
-"@glimmer/runtime@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.68.1.tgz#67c2d9a49618e345af576b03693faeea4d40b377"
-  integrity sha512-8nqKxEoJ+ursrGfMT3CuQIBMeXy2dSY3oxCcG1b5qcWER4n+dSNIQOREj8hB/i6T090WhboZIU9eDpNepiOjfQ==
+"@glimmer/runtime@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.69.3.tgz#be5c448dd1b2a35cd68b2a32799730dc01eef8b5"
+  integrity sha512-Yy37O+Gbwdh3sYrM9TACXgu1LRVAom6sc3yZqmXBfACCVE0hPXGjSiFtSwqU7gBjM4xti0Hg7qZO0nro118KHQ==
   dependencies:
-    "@glimmer/destroyable" "0.68.1"
+    "@glimmer/destroyable" "0.69.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.68.1"
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/low-level" "0.68.1"
-    "@glimmer/owner" "0.68.1"
-    "@glimmer/program" "0.68.1"
-    "@glimmer/reference" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@glimmer/validator" "0.68.1"
-    "@glimmer/vm" "0.68.1"
-    "@glimmer/wire-format" "0.68.1"
+    "@glimmer/global-context" "0.69.3"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/low-level" "0.69.3"
+    "@glimmer/owner" "0.69.3"
+    "@glimmer/program" "0.69.3"
+    "@glimmer/reference" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@glimmer/validator" "0.69.3"
+    "@glimmer/vm" "0.69.3"
+    "@glimmer/wire-format" "0.69.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.68.1.tgz#e7bebdc26b2b4586ca27ae2d577a712b5bf9a6c3"
-  integrity sha512-c1XXV6Oy2ogYQSef3CYvlv/YRz1O5nZ71UadpUYtkchfQdgbwEQgCtIXKIvet5eMuvoYudnXHidSi91QEWaLOA==
+"@glimmer/syntax@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.3.tgz#3613ef244935cd4f3aaac31f4ad8ca08a1c38a97"
+  integrity sha512-7LKqqnBdSFlWUh5+BfND4bS9LzCgezAYG3axHWIXZcPYuUadbnBe+0ugq8FFhIAsMF3TXk3rHHLseYo95OqwYA==
   dependencies:
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
-    "@handlebars/parser" "^1.1.0"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
+    "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.68.1.tgz#d522ff4b91f0a59a23327f336bb90ddc55685ca1"
-  integrity sha512-eg1etiyeaxXL63ZONvl4+AVPN64dl84hFYXJCngb4qRXCXuAzSH+lepkJtKwhzJUEMlASwqk75Au9CyoGM4SOg==
+"@glimmer/util@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.3.tgz#1d822a8f971a9a1e24385c4b46c3a48ab5cdf20d"
+  integrity sha512-bu3vMBPfWqGBRjQb4Hj81XYa8DWKdA+0HRxVCVqKlov3py8TSUyuGHKcbVB/bB0kKxuZp8nxW2UZJO3WA4V08A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.68.1.tgz#7052fde18b5fcb4e1c726edf7b215c99fd68c36b"
-  integrity sha512-J5NmaltZl7Dpja3HvfDD3rITKIHaXlsRQoMHM6d4jqHTRkRCGpqm+x+BHMUiOXkm3vDwb0+t6bRTgQ8/hDGgSw==
+"@glimmer/validator@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.3.tgz#488e56463337297f85e671e575d61e7c493ef144"
+  integrity sha512-nDHLaEY/CzNfKWk7rV1+eL+JAq11O3IM/FKAp/Uuson5HB2yEzxrM8rFHQCbZDkxzBgtPKuUtpTWQyxyNYgUJQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.68.1"
+    "@glimmer/global-context" "0.69.3"
 
-"@glimmer/vm@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.68.1.tgz#3ac351df1a2e4478d94c9cd062beffd0d46d625e"
-  integrity sha512-5eg77qizunggRsX368XMDzPJ827OwqbfvSkwsXROPe8yvI26DmYGa2BL9o7r263FLQCoh27m/ZGkJY94Vmc9RQ==
+"@glimmer/vm@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.69.3.tgz#8a9a62cc4545bbf56f4f900dc9981a6de9eaaf78"
+  integrity sha512-FSvI6rMTVcZwtSmmLE+638iCcFbNCOez6bn56mxmyX8dXoQzJajGxXMOm2hnkhlqpoAWGWeCxCUsyeQ8pQ6E1A==
   dependencies:
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
 
-"@glimmer/wire-format@0.68.1":
-  version "0.68.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.68.1.tgz#c8c494425065e9280ab5768c34f9d2f68a905678"
-  integrity sha512-meKdL/eMOuXcLrxtZBYmS4cjULr1R+qUtJ8XvpzHfMXJk5eqCBbOL0k6Axr8ccSCmMC0vPztIQa/QCoddejGTw==
+"@glimmer/wire-format@0.69.3":
+  version "0.69.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.69.3.tgz#f7328a32b71ada0eb31f00f4592e4541ba04f30c"
+  integrity sha512-RJlLZYNVHMxjA/hLp5baML/UqTWgBRYSLcTnvmzmvwStLAC9kOm2IRoAvjYInW8XbsbAgNAtJSmVMiL3oSIuEw==
   dependencies:
-    "@glimmer/interfaces" "0.68.1"
-    "@glimmer/util" "0.68.1"
+    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/util" "0.69.3"
 
-"@handlebars/parser@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
-  integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==
+"@handlebars/parser@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
+  integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"

From 8072096ae3da646ae9fc839e1a42167391a8bb66 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sun, 13 Dec 2020 20:18:22 -0800
Subject: [PATCH 0267/1405] [FEATURE strict-mode] Enable classic component
 usage in strict mode

Previously classic components were not possible to use in strict mode,
since there was no way to pass the owner to them as they were not
resolved with the factory system. This refactor fixes this by using the
new owner API, which passes the owner into the `create` hook of
component managers. In addition, makes the `renderer` property of views
a standard injection that is lazy, so we are no longer injecting it via
the implicit injection API.
---
 package.json                                  |  24 +-
 packages/@ember/-internals/glimmer/index.ts   |   8 +-
 .../glimmer/lib/component-managers/curly.ts   |  36 +--
 .../lib/component-managers/internal.ts        |  19 +-
 .../glimmer/lib/component-managers/mount.ts   |  15 +-
 .../glimmer/lib/component-managers/outlet.ts  |   7 +-
 .../glimmer/lib/component-managers/root.ts    |  13 +-
 .../-internals/glimmer/lib/component.ts       |   2 +-
 .../@ember/-internals/glimmer/lib/renderer.ts | 101 +++----
 .../-internals/glimmer/lib/setup-registry.ts  |   6 +-
 .../-internals/glimmer/lib/syntax/mount.ts    |  12 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   |  10 +-
 .../lib/utils/curly-component-state-bucket.ts |  15 +-
 .../-internals/glimmer/lib/views/outlet.ts    |  24 +-
 .../components/strict-mode-test.js            |   4 +-
 .../glimmer/tests/unit/outlet-test.js         |   9 +-
 .../-internals/views/lib/views/core_view.js   |   9 +-
 .../tests/application_instance_test.js        |   3 +-
 .../application/tests/application_test.js     |   1 -
 .../@ember/debug/lib/capture-render-tree.ts   |  12 +-
 packages/@ember/engine/instance.js            |  10 +-
 yarn.lock                                     | 254 +++++++++---------
 22 files changed, 281 insertions(+), 313 deletions(-)

diff --git a/package.json b/package.json
index d166b52da72..f41e06be8fd 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.69.3",
+    "@glimmer/compiler": "0.70.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.69.3",
-    "@glimmer/interfaces": "0.69.3",
-    "@glimmer/manager": "0.69.3",
-    "@glimmer/destroyable": "0.69.3",
-    "@glimmer/owner": "0.69.3",
-    "@glimmer/node": "0.69.3",
-    "@glimmer/opcode-compiler": "0.69.3",
-    "@glimmer/program": "0.69.3",
-    "@glimmer/reference": "0.69.3",
-    "@glimmer/runtime": "0.69.3",
-    "@glimmer/validator": "0.69.3",
+    "@glimmer/global-context": "0.70.0",
+    "@glimmer/interfaces": "0.70.0",
+    "@glimmer/manager": "0.70.0",
+    "@glimmer/destroyable": "0.70.0",
+    "@glimmer/owner": "0.70.0",
+    "@glimmer/node": "0.70.0",
+    "@glimmer/opcode-compiler": "0.70.0",
+    "@glimmer/program": "0.70.0",
+    "@glimmer/reference": "0.70.0",
+    "@glimmer/runtime": "0.70.0",
+    "@glimmer/validator": "0.70.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 72e3fc4362d..e0dc4e836ae 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -371,13 +371,7 @@ export { InputComponent as Input } from './lib/components/input';
 export { default as Component } from './lib/component';
 export { default as Helper, helper } from './lib/helper';
 export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
-export {
-  Renderer,
-  InertRenderer,
-  InteractiveRenderer,
-  _resetRenderers,
-  renderSettled,
-} from './lib/renderer';
+export { Renderer, _resetRenderers, renderSettled } from './lib/renderer';
 export {
   getTemplate,
   setTemplate,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index a78ed8c84c1..88ec920ca62 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,4 +1,4 @@
-import { Factory, getOwner } from '@ember/-internals/owner';
+import { Factory, getOwner, Owner, setOwner } from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor, symbol } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
@@ -131,7 +131,7 @@ type ComponentFactory = Factory<
 
 export default class CurlyComponentManager
   implements
-    WithCreateInstance<ComponentStateBucket, Environment>,
+    WithCreateInstance<ComponentStateBucket>,
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
     WithDynamicTagName<ComponentStateBucket> {
   protected templateFor(component: Component): CompilableProgram | null {
@@ -250,9 +250,10 @@ export default class CurlyComponentManager
    * etc.
    */
   create(
-    environment: Environment,
+    owner: Owner,
     ComponentClass: ComponentFactory,
     args: VMArguments,
+    { isInteractive }: Environment,
     dynamicScope: DynamicScope,
     callerSelfRef: Reference,
     hasBlock: boolean
@@ -285,6 +286,8 @@ export default class CurlyComponentManager
     // `_target`, so bubbled actions are routed to the right place.
     props._target = valueForRef(callerSelfRef);
 
+    setOwner(props, owner);
+
     // caller:
     // <FaIcon @name="bug" />
     //
@@ -314,13 +317,13 @@ export default class CurlyComponentManager
 
     // We usually do this in the `didCreateElement`, but that hook doesn't fire for tagless components
     if (!hasWrappedElement) {
-      if (environment.isInteractive) {
+      if (isInteractive) {
         component.trigger('willRender');
       }
 
       component._transitionTo('hasElement');
 
-      if (environment.isInteractive) {
+      if (isInteractive) {
         component.trigger('willInsertElement');
       }
     }
@@ -328,12 +331,12 @@ export default class CurlyComponentManager
     // Track additional lifecycle metadata about this component in a state bucket.
     // Essentially we're saving off all the state we'll need in the future.
     let bucket = new ComponentStateBucket(
-      environment,
       component,
       capturedArgs,
       argsTag,
       finalizer,
-      hasWrappedElement
+      hasWrappedElement,
+      isInteractive
     );
 
     if (args.named.has('class')) {
@@ -344,7 +347,7 @@ export default class CurlyComponentManager
       processComponentInitializationAssertions(component, props);
     }
 
-    if (environment.isInteractive && hasWrappedElement) {
+    if (isInteractive && hasWrappedElement) {
       component.trigger('willRender');
     }
 
@@ -368,7 +371,7 @@ export default class CurlyComponentManager
   }
 
   didCreateElement(
-    { component, classRef, environment, rootRef }: ComponentStateBucket,
+    { component, classRef, isInteractive, rootRef }: ComponentStateBucket,
     element: SimpleElement,
     operations: ElementOperations
   ): void {
@@ -411,7 +414,7 @@ export default class CurlyComponentManager
 
     component._transitionTo('hasElement');
 
-    if (environment.isInteractive) {
+    if (isInteractive) {
       beginUntrackFrame();
       component.trigger('willInsertElement');
       endUntrackFrame();
@@ -423,8 +426,8 @@ export default class CurlyComponentManager
     bucket.finalize();
   }
 
-  didCreate({ component, environment }: ComponentStateBucket): void {
-    if (environment.isInteractive) {
+  didCreate({ component, isInteractive }: ComponentStateBucket): void {
+    if (isInteractive) {
       component._transitionTo('inDOM');
       component.trigger('didInsertElement');
       component.trigger('didRender');
@@ -432,7 +435,7 @@ export default class CurlyComponentManager
   }
 
   update(bucket: ComponentStateBucket): void {
-    let { component, args, argsTag, argsRevision, environment } = bucket;
+    let { component, args, argsTag, argsRevision, isInteractive } = bucket;
 
     bucket.finalizer = _instrumentStart('render.component', rerenderInstrumentDetails, component);
 
@@ -453,7 +456,7 @@ export default class CurlyComponentManager
       component.trigger('didReceiveAttrs');
     }
 
-    if (environment.isInteractive) {
+    if (isInteractive) {
       component.trigger('willUpdate');
       component.trigger('willRender');
     }
@@ -468,8 +471,8 @@ export default class CurlyComponentManager
     bucket.finalize();
   }
 
-  didUpdate({ component, environment }: ComponentStateBucket): void {
-    if (environment.isInteractive) {
+  didUpdate({ component, isInteractive }: ComponentStateBucket): void {
+    if (isInteractive) {
       component.trigger('didUpdate');
       component.trigger('didRender');
     }
@@ -553,6 +556,7 @@ export const CURLY_CAPABILITIES: InternalComponentCapabilities = {
   createInstance: true,
   wrapped: true,
   willDestroy: true,
+  hasSubOwner: false,
 };
 
 export const CURLY_COMPONENT_MANAGER = new CurlyComponentManager();
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index c29ea9f99ef..ac2e9ddcc02 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -25,6 +25,7 @@ const CAPABILITIES: InternalComponentCapabilities = {
   createInstance: true,
   wrapped: false,
   willDestroy: false,
+  hasSubOwner: false,
 };
 
 export interface InternalComponentState {
@@ -40,27 +41,21 @@ export default class InternalManager
   implements
     InternalComponentManager<InternalComponentState, EmberInternalComponentConstructor>,
     WithCreateInstance {
-  static for(
-    definition: EmberInternalComponentConstructor,
-    name: string
-  ): (owner: Owner) => InternalManager {
-    return (owner: Owner) => new InternalManager(owner, definition, name);
+  static for(definition: EmberInternalComponentConstructor, name: string): () => InternalManager {
+    return () => new InternalManager(definition, name);
   }
 
-  constructor(
-    private owner: Owner,
-    private ComponentClass: EmberInternalComponentConstructor,
-    private name: string
-  ) {}
+  constructor(private ComponentClass: EmberInternalComponentConstructor, private name: string) {}
 
   getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
 
   create(
-    env: Environment,
+    owner: Owner,
     _definition: unknown,
     args: VMArguments,
+    env: Environment,
     _dynamicScope: DynamicScope,
     caller: Reference
   ): InternalComponentState {
@@ -71,7 +66,7 @@ export default class InternalManager
       args.positional.length === 0
     );
 
-    let { ComponentClass, owner } = this;
+    let { ComponentClass } = this;
     let instance = new ComponentClass(owner, args.named.capture(), valueForRef(caller));
 
     let state = { env, instance };
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index cf526e4ccd9..d712c739327 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -15,6 +15,7 @@ import {
   WithCreateInstance,
   WithCustomDebugRenderTree,
   WithDynamicLayout,
+  WithSubOwner,
 } from '@glimmer/interfaces';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
@@ -45,13 +46,15 @@ const CAPABILITIES = {
   createInstance: true,
   wrapped: false,
   willDestroy: false,
+  hasSubOwner: true,
 };
 
 class MountManager
   implements
-    WithCreateInstance<EngineState, Environment>,
+    WithCreateInstance<EngineState>,
     WithDynamicLayout<EngineState, RuntimeResolver>,
-    WithCustomDebugRenderTree<EngineState, EngineDefinitionState> {
+    WithCustomDebugRenderTree<EngineState, EngineDefinitionState>,
+    WithSubOwner<EngineState> {
   getDynamicLayout(state: EngineState) {
     let templateFactory = state.engine.lookup('template:application') as TemplateFactory;
     return unwrapTemplate(templateFactory(state.engine)).asLayout();
@@ -61,13 +64,17 @@ class MountManager
     return CAPABILITIES;
   }
 
-  create(env: Environment<Owner>, { name }: EngineDefinitionState, args: VMArguments) {
+  getOwner(state: EngineState) {
+    return state.engine;
+  }
+
+  create(owner: Owner, { name }: EngineDefinitionState, args: VMArguments, env: Environment) {
     // TODO
     // mount is a runtime helper, this shouldn't use dynamic layout
     // we should resolve the engine app template in the helper
     // it also should use the owner that looked up the mount helper.
 
-    let engine = env.owner.buildChildEngineInstance(name);
+    let engine = owner.buildChildEngineInstance(name);
 
     engine.boot();
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index abdee7e3517..65a8cf17d17 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -1,4 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
+import { Owner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
@@ -64,16 +65,18 @@ const CAPABILITIES: InternalComponentCapabilities = {
   createInstance: true,
   wrapped: false,
   willDestroy: false,
+  hasSubOwner: false,
 };
 
 class OutletComponentManager
   implements
-    WithCreateInstance<OutletInstanceState, Environment>,
+    WithCreateInstance<OutletInstanceState>,
     WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState> {
   create(
-    env: Environment,
+    _owner: Owner,
     definition: OutletDefinitionState,
     _args: VMArguments,
+    env: Environment,
     dynamicScope: DynamicScope
   ): OutletInstanceState {
     let parentStateRef = dynamicScope.get('outletState');
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index bf829e89786..afbfe4c0ca8 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -6,6 +6,7 @@ import {
   Environment,
   InternalComponentCapabilities,
   Option,
+  Owner,
   VMArguments,
 } from '@glimmer/interfaces';
 import { capabilityFlagsFrom } from '@glimmer/manager';
@@ -27,9 +28,10 @@ class RootComponentManager extends CurlyComponentManager {
   }
 
   create(
-    environment: Environment,
+    _owner: Owner,
     _state: unknown,
     _args: Option<VMArguments>,
+    { isInteractive }: Environment,
     dynamicScope: DynamicScope
   ) {
     let component = this.component;
@@ -42,13 +44,13 @@ class RootComponentManager extends CurlyComponentManager {
 
     // We usually do this in the `didCreateElement`, but that hook doesn't fire for tagless components
     if (!hasWrappedElement) {
-      if (environment.isInteractive) {
+      if (isInteractive) {
         component.trigger('willRender');
       }
 
       component._transitionTo('hasElement');
 
-      if (environment.isInteractive) {
+      if (isInteractive) {
         component.trigger('willInsertElement');
       }
     }
@@ -58,12 +60,12 @@ class RootComponentManager extends CurlyComponentManager {
     }
 
     let bucket = new ComponentStateBucket(
-      environment,
       component,
       null,
       CONSTANT_TAG,
       finalizer,
-      hasWrappedElement
+      hasWrappedElement,
+      isInteractive
     );
 
     consumeTag(component[DIRTY_TAG]);
@@ -87,6 +89,7 @@ export const ROOT_CAPABILITIES: InternalComponentCapabilities = {
   createInstance: true,
   wrapped: true,
   willDestroy: false,
+  hasSubOwner: false,
 };
 
 export class RootComponentDefinition implements ComponentDefinition {
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 49e2b50189e..81f97092df5 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -724,7 +724,7 @@ const Component = CoreView.extend(
       this[DIRTY_TAG] = createTag();
       this[BOUNDS] = null;
 
-      if (DEBUG && this.renderer._destinedForDOM && this.tagName === '') {
+      if (DEBUG && this.renderer._isInteractive && this.tagName === '') {
         let eventNames = [];
         let eventDispatcher = getOwner(this).lookup<any | undefined>('event_dispatcher:main');
         let events = (eventDispatcher && eventDispatcher._finalEvents) || {};
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 672876cae14..67b65d84db3 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -116,6 +116,7 @@ class RootState {
     public root: Component | OutletView,
     public runtime: RuntimeContext,
     context: CompileTimeCompilationContext,
+    owner: Owner,
     template: Template,
     self: Reference<unknown>,
     parentElement: SimpleElement,
@@ -137,6 +138,7 @@ class RootState {
       let iterator = renderMain(
         runtime,
         context,
+        owner,
         self,
         builder(runtime.env, { element: parentElement, nextSibling: null }),
         layout,
@@ -269,38 +271,50 @@ interface ViewRegistry {
   [viewId: string]: unknown;
 }
 
-export abstract class Renderer {
+export class Renderer {
   private _rootTemplate: Template;
   private _viewRegistry: ViewRegistry;
-  private _destinedForDOM: boolean;
   private _roots: RootState[];
   private _removedRoots: RootState[];
   private _builder: IBuilder;
   private _inRenderTransaction = false;
 
+  private _owner: Owner;
   private _context: CompileTimeCompilationContext;
   private _runtime: RuntimeContext;
 
   private _lastRevision = -1;
   private _destroyed = false;
+  private _isInteractive: boolean;
 
   readonly _runtimeResolver: ResolverImpl;
 
+  static create(props: {
+    document: SimpleDocument;
+    env: { isInteractive: boolean; hasDOM: boolean };
+    rootTemplate: TemplateFactory;
+    _viewRegistry: any;
+    builder: any;
+  }): Renderer {
+    let { document, env, rootTemplate, _viewRegistry, builder } = props;
+    return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, builder);
+  }
+
   constructor(
     owner: Owner,
     document: SimpleDocument,
     env: { isInteractive: boolean; hasDOM: boolean },
     rootTemplate: TemplateFactory,
     viewRegistry: ViewRegistry,
-    destinedForDOM = false,
     builder = clientBuilder
   ) {
+    this._owner = owner;
     this._rootTemplate = rootTemplate(owner);
     this._viewRegistry = viewRegistry;
-    this._destinedForDOM = destinedForDOM;
     this._roots = [];
     this._removedRoots = [];
     this._builder = builder;
+    this._isInteractive = env.isInteractive;
 
     // resolver is exposed for tests
     let resolver = (this._runtimeResolver = new ResolverImpl());
@@ -338,25 +352,26 @@ export abstract class Renderer {
 
   appendOutletView(view: OutletView, target: SimpleElement): void {
     let definition = createRootOutlet(view);
-    this._appendDefinition(view, curry(definition, null), target);
+    this._appendDefinition(view, curry(definition, view.owner, null), target);
   }
 
   appendTo(view: Component, target: SimpleElement): void {
     let definition = new RootComponentDefinition(view);
-    this._appendDefinition(view, curry(definition, null), target);
+    this._appendDefinition(view, curry(definition, this._owner, null), target);
   }
 
   _appendDefinition(
     root: OutletView | Component,
     definition: CurriedComponentDefinition,
     target: SimpleElement
-  ) {
+  ): void {
     let self = createConstRef(definition, 'this');
     let dynamicScope = new DynamicScope(null, UNDEFINED_REFERENCE);
     let rootState = new RootState(
       root,
       this._runtime,
       this._context,
+      this._owner,
       this._rootTemplate,
       self,
       target,
@@ -366,11 +381,11 @@ export abstract class Renderer {
     this._renderRoot(rootState);
   }
 
-  rerender() {
+  rerender(): void {
     this._scheduleRevalidate();
   }
 
-  register(view: any) {
+  register(view: any): void {
     let id = getViewId(view);
     assert(
       'Attempted to register a view with an id already in use: ' + id,
@@ -379,21 +394,21 @@ export abstract class Renderer {
     this._viewRegistry[id] = view;
   }
 
-  unregister(view: any) {
+  unregister(view: any): void {
     delete this._viewRegistry[getViewId(view)];
   }
 
-  remove(view: Component) {
+  remove(view: Component): void {
     view._transitionTo('destroying');
 
     this.cleanupRootFor(view);
 
-    if (this._destinedForDOM) {
+    if (this._isInteractive) {
       view.trigger('didDestroyElement');
     }
   }
 
-  cleanupRootFor(view: unknown) {
+  cleanupRootFor(view: unknown): void {
     // no need to cleanup roots if we have already been destroyed
     if (this._destroyed) {
       return;
@@ -421,7 +436,15 @@ export abstract class Renderer {
     this._clearAllRoots();
   }
 
-  abstract getElement(view: unknown): Option<SimpleElement>;
+  getElement(view: unknown): Option<SimpleElement> {
+    if (this._isInteractive) {
+      return getViewElement(view);
+    } else {
+      throw new Error(
+        'Accessing `this.element` is not allowed in non-interactive environments (such as FastBoot).'
+      );
+    }
+  }
 
   getBounds(
     view: object
@@ -441,7 +464,7 @@ export abstract class Renderer {
     return this._runtime.env.getAppendOperations().createElement(tagName);
   }
 
-  _renderRoot(root: RootState) {
+  _renderRoot(root: RootState): void {
     let { _roots: roots } = this;
 
     roots.push(root);
@@ -453,7 +476,7 @@ export abstract class Renderer {
     this._renderRootsTransaction();
   }
 
-  _renderRoots() {
+  _renderRoots(): void {
     let { _roots: roots, _runtime: runtime, _removedRoots: removedRoots } = this;
     let initialRootsLength: number;
 
@@ -501,7 +524,7 @@ export abstract class Renderer {
     }
   }
 
-  _renderRootsTransaction() {
+  _renderRootsTransaction(): void {
     if (this._inRenderTransaction) {
       // currently rendering roots, a new root was added and will
       // be processed by the existing _renderRoots invocation
@@ -524,7 +547,7 @@ export abstract class Renderer {
     }
   }
 
-  _clearAllRoots() {
+  _clearAllRoots(): void {
     let roots = this._roots;
     for (let i = 0; i < roots.length; i++) {
       let root = roots[i];
@@ -541,56 +564,20 @@ export abstract class Renderer {
     }
   }
 
-  _scheduleRevalidate() {
+  _scheduleRevalidate(): void {
     backburner.scheduleOnce('render', this, this._revalidate);
   }
 
-  _isValid() {
+  _isValid(): boolean {
     return (
       this._destroyed || this._roots.length === 0 || validateTag(CURRENT_TAG, this._lastRevision)
     );
   }
 
-  _revalidate() {
+  _revalidate(): void {
     if (this._isValid()) {
       return;
     }
     this._renderRootsTransaction();
   }
 }
-
-export class InertRenderer extends Renderer {
-  static create(props: {
-    document: SimpleDocument;
-    env: { isInteractive: boolean; hasDOM: boolean };
-    rootTemplate: TemplateFactory;
-    _viewRegistry: any;
-    builder: any;
-  }) {
-    let { document, env, rootTemplate, _viewRegistry, builder } = props;
-    return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, false, builder);
-  }
-
-  getElement(_view: unknown): Option<SimpleElement> {
-    throw new Error(
-      'Accessing `this.element` is not allowed in non-interactive environments (such as FastBoot).'
-    );
-  }
-}
-
-export class InteractiveRenderer extends Renderer {
-  static create(props: {
-    document: SimpleDocument;
-    env: { isInteractive: boolean; hasDOM: boolean };
-    rootTemplate: TemplateFactory;
-    _viewRegistry: any;
-    builder: any;
-  }) {
-    let { document, env, rootTemplate, _viewRegistry, builder } = props;
-    return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, true, builder);
-  }
-
-  getElement(view: unknown): Option<SimpleElement> {
-    return getViewElement(view);
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 58bf4ae8f27..fc11783ffda 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -8,7 +8,7 @@ import TextField from './components/text-field';
 import TextArea from './components/textarea';
 import { clientBuilder, rehydrationBuilder, serializeBuilder } from './dom';
 import loc from './helpers/loc';
-import { InertRenderer, InteractiveRenderer } from './renderer';
+import { Renderer } from './renderer';
 import OutletTemplate from './templates/outlet';
 import RootTemplate from './templates/root';
 import OutletView from './views/outlet';
@@ -39,9 +39,7 @@ export function setupApplicationRegistry(registry: Registry): void {
   registry.register(P`template:-root`, RootTemplate as any);
   registry.injection('renderer', 'rootTemplate', P`template:-root`);
 
-  registry.register('renderer:-dom', InteractiveRenderer);
-  registry.register('renderer:-inert', InertRenderer);
-
+  registry.register('renderer:-dom', Renderer);
   registry.injection('renderer', 'document', 'service:-document');
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 67ce039f346..fbb761295ce 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -4,7 +4,7 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Environment, Option, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, Reference, valueForRef } from '@glimmer/reference';
 import {
   createCapturedArgs,
@@ -57,7 +57,7 @@ import { internalHelper } from '../helpers/internal-helper';
 */
 export const mountHelper = internalHelper(
   (args: VMArguments, vm: VM): Reference<CurriedComponentDefinition | null> => {
-    let env = vm.env as Environment<Owner>;
+    let owner = vm.getOwner() as Owner;
     let nameRef = args.positional.at(0) as Reference<Option<string>>;
     let captured: Option<CapturedArguments> = null;
 
@@ -104,15 +104,11 @@ export const mountHelper = internalHelper(
 
         assert(
           `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`,
-          env.owner.hasRegistration(`engine:${name}`)
+          owner.hasRegistration(`engine:${name}`)
         );
 
-        if (!env.owner.hasRegistration(`engine:${name}`)) {
-          return null;
-        }
-
         lastName = name;
-        lastDef = curry(new MountDefinition(name), captured);
+        lastDef = curry(new MountDefinition(name), owner, captured);
 
         return lastDef;
       } else {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index f7a5c131bc5..3cc8d2c443f 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -89,7 +89,8 @@ export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
   let definition: Option<CurriedComponentDefinition> = null;
 
   return createComputeRef(() => {
-    let state = stateFor(outletRef);
+    let outletState = valueForRef(outletRef);
+    let state = stateFor(outletRef, outletState);
 
     if (!validate(state, lastState)) {
       lastState = state;
@@ -102,8 +103,10 @@ export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
           named.model = createDebugAliasRef!('@model', named.model);
         }
 
+        let owner = outletState?.render?.owner ?? vm.getOwner();
+
         let args = createCapturedArgs(named, EMPTY_POSITIONAL);
-        definition = curry(new OutletComponentDefinition(state), args);
+        definition = curry(new OutletComponentDefinition(state), owner, args);
       } else {
         definition = null;
       }
@@ -113,8 +116,7 @@ export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
   });
 });
 
-function stateFor(ref: Reference<OutletState | undefined>): OutletDefinitionState | null {
-  let outlet = valueForRef(ref);
+function stateFor(ref: Reference, outlet: OutletState | undefined): OutletDefinitionState | null {
   if (outlet === undefined) return null;
   let render = outlet.render;
   if (render === undefined) return null;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 3e1e1aebef0..0801e30d83c 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,11 +1,6 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
 import { registerDestructor } from '@glimmer/destroyable';
-import {
-  CapturedNamedArguments,
-  Environment,
-  Template,
-  TemplateFactory,
-} from '@glimmer/interfaces';
+import { CapturedNamedArguments, Template, TemplateFactory } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
 import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
 import { Renderer } from '../renderer';
@@ -48,12 +43,12 @@ export default class ComponentStateBucket {
   public argsRevision: Revision;
 
   constructor(
-    public environment: Environment,
     public component: Component,
     public args: CapturedNamedArguments | null,
     public argsTag: Tag,
     public finalizer: Finalizer,
-    public hasWrappedElement: boolean
+    public hasWrappedElement: boolean,
+    public isInteractive: boolean
   ) {
     this.classRef = null;
     this.argsRevision = args === null ? 0 : valueForTag(argsTag);
@@ -64,9 +59,9 @@ export default class ComponentStateBucket {
   }
 
   willDestroy(): void {
-    let { component, environment } = this;
+    let { component, isInteractive } = this;
 
-    if (environment.isInteractive) {
+    if (isInteractive) {
       beginUntrackFrame();
       component.trigger('willDestroyElement');
       component.trigger('willClearRender');
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 7f762113471..4feb93abe9c 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -6,7 +6,6 @@ import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
 import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { OutletDefinitionState } from '../component-managers/outlet';
-import { Renderer } from '../renderer';
 import { OutletState } from '../utils/outlet';
 
 export interface BootEnvironment {
@@ -19,7 +18,7 @@ const TOP_LEVEL_NAME = '-top-level';
 const TOP_LEVEL_OUTLET = 'main';
 
 export default class OutletView {
-  static extend(injections: any) {
+  static extend(injections: any): typeof OutletView {
     return class extends OutletView {
       static create(options: any) {
         if (options) {
@@ -31,15 +30,15 @@ export default class OutletView {
     };
   }
 
-  static reopenClass(injections: any) {
+  static reopenClass(injections: any): void {
     assign(this, injections);
   }
 
-  static create(options: any) {
-    let { _environment, renderer, template: templateFactory } = options;
+  static create(options: any): OutletView {
+    let { _environment, template: templateFactory } = options;
     let owner = getOwner(options);
     let template = templateFactory(owner);
-    return new OutletView(_environment, renderer, owner, template);
+    return new OutletView(_environment, owner, template);
   }
 
   private ref: Reference;
@@ -47,7 +46,6 @@ export default class OutletView {
 
   constructor(
     private _environment: BootEnvironment,
-    public renderer: Renderer,
     public owner: Owner,
     public template: Template
   ) {
@@ -86,7 +84,7 @@ export default class OutletView {
     };
   }
 
-  appendTo(selector: string | SimpleElement) {
+  appendTo(selector: string | SimpleElement): void {
     let target;
 
     if (this._environment.hasDOM) {
@@ -95,18 +93,20 @@ export default class OutletView {
       target = selector;
     }
 
-    schedule('render', this.renderer, 'appendOutletView', this, target);
+    let renderer = this.owner.lookup('renderer:-dom');
+
+    schedule('render', renderer, 'appendOutletView', this, target);
   }
 
-  rerender() {
+  rerender(): void {
     /**/
   }
 
-  setOutletState(state: OutletState) {
+  setOutletState(state: OutletState): void {
     updateRef(this.ref, state);
   }
 
-  destroy() {
+  destroy(): void {
     /**/
   }
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index d6587280288..934b4496453 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -111,7 +111,7 @@ if (EMBER_STRICT_MODE) {
         this.assertStableRerender();
       }
 
-      '@skip Can use TextArea'() {
+      '@test Can use TextArea'() {
         let Foo = defineComponent({ TextArea }, '<TextArea/>');
 
         this.registerComponent('foo', { ComponentClass: Foo });
@@ -198,7 +198,7 @@ if (EMBER_STRICT_MODE) {
   moduleFor(
     'Strict Mode - LinkTo',
     class extends ApplicationTestCase {
-      '@skip Can use LinkTo'() {
+      '@test Can use LinkTo'() {
         let Foo = defineComponent({ LinkTo }, '<LinkTo @route="index">Index</LinkTo>');
 
         this.addComponent('foo', { ComponentClass: Foo });
diff --git a/packages/@ember/-internals/glimmer/tests/unit/outlet-test.js b/packages/@ember/-internals/glimmer/tests/unit/outlet-test.js
index 3a33bf03dff..f694df1c07a 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/outlet-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/outlet-test.js
@@ -18,7 +18,14 @@ moduleFor(
         },
       };
 
-      let outletView = new OutletView({}, renderer);
+      let outletView = new OutletView(
+        {},
+        {
+          lookup() {
+            return renderer;
+          },
+        }
+      );
 
       run(() => {
         assert.equal(
diff --git a/packages/@ember/-internals/views/lib/views/core_view.js b/packages/@ember/-internals/views/lib/views/core_view.js
index 1dff54ba394..7ba99b29f21 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.js
+++ b/packages/@ember/-internals/views/lib/views/core_view.js
@@ -1,3 +1,4 @@
+import { inject } from '@ember/-internals/metal';
 import { ActionHandler, Evented, FrameworkObject } from '@ember/-internals/runtime';
 import states from './states';
 
@@ -26,14 +27,10 @@ const CoreView = FrameworkObject.extend(Evented, ActionHandler, {
     this._super(...arguments);
     this._state = 'preRender';
     this._currentState = this._states.preRender;
-
-    if (!this.renderer) {
-      throw new Error(
-        `Cannot instantiate a component without a renderer. Please ensure that you are creating ${this} with a proper container/registry.`
-      );
-    }
   },
 
+  renderer: inject('renderer', '-dom'),
+
   /**
     If the view is currently inserted into the DOM of a parent view, this
     property will point to the parent of the view.
diff --git a/packages/@ember/application/tests/application_instance_test.js b/packages/@ember/application/tests/application_instance_test.js
index a8a8adc9ce5..db7e438f0c7 100644
--- a/packages/@ember/application/tests/application_instance_test.js
+++ b/packages/@ember/application/tests/application_instance_test.js
@@ -194,8 +194,7 @@ moduleFor(
           'event_dispatcher:main',
         ];
 
-        let env = appInstance.lookup('-environment:main');
-        singletons.push(env.isInteractive ? 'renderer:-dom' : 'renderer:-inert');
+        singletons.push('renderer:-dom');
 
         singletons.forEach((key) => {
           assert.strictEqual(
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 85bd31b6852..9b2601e4664 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -179,7 +179,6 @@ moduleFor(
 
       verifyRegistration(assert, application, 'view:-outlet');
       verifyRegistration(assert, application, 'renderer:-dom');
-      verifyRegistration(assert, application, 'renderer:-inert');
       verifyRegistration(assert, application, 'template:-outlet');
       verifyInjection(assert, application, 'view:-outlet', 'template', 'template:-outlet');
 
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 642ef24a2af..7a58e68be7c 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -20,17 +20,7 @@ import { expect } from '@glimmer/util';
   @since 3.14.0
 */
 export default function captureRenderTree(app: Owner): CapturedRenderNode[] {
-  let env = expect(
-    app.lookup<{ isInteractive: boolean }>('-environment:main'),
-    'BUG: owner is missing -environment:main'
-  );
-
-  let rendererType = env.isInteractive ? 'renderer:-dom' : 'renderer:-inert';
-
-  let renderer = expect(
-    app.lookup<Renderer>(rendererType),
-    `BUG: owner is missing ${rendererType}`
-  );
+  let renderer = expect(app.lookup<Renderer>('renderer:-dom'), `BUG: owner is missing renderer`);
 
   return renderer.debugRenderTree.capture();
 }
diff --git a/packages/@ember/engine/instance.js b/packages/@ember/engine/instance.js
index 2718d18e03b..3a0693eef08 100644
--- a/packages/@ember/engine/instance.js
+++ b/packages/@ember/engine/instance.js
@@ -184,7 +184,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
       'router:main',
       P`-bucket-cache:main`,
       '-view-registry:main',
-      `renderer:-${env.isInteractive ? 'dom' : 'inert'}`,
+      `renderer:-dom`,
       'service:-document',
     ];
 
@@ -214,14 +214,6 @@ EngineInstance.reopenClass({
 
     registry.injection('view', '_environment', '-environment:main');
     registry.injection('route', '_environment', '-environment:main');
-
-    if (options.isInteractive) {
-      registry.injection('view', 'renderer', 'renderer:-dom');
-      registry.injection('component', 'renderer', 'renderer:-dom');
-    } else {
-      registry.injection('view', 'renderer', 'renderer:-inert');
-      registry.injection('component', 'renderer', 'renderer:-inert');
-    }
   },
 });
 
diff --git a/yarn.lock b/yarn.lock
index c4736af85cf..979ae5125af 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.69.3.tgz#bd81e3c83d6c28872d97c1e2ce85db38f039feb3"
-  integrity sha512-iawhFPrHZyDTkPTjhSonjqVEutGSfC0Ixar/vxqpn2cEddl/6zlfVfgb1UBRn/yl/pQ5ZfHiRFUMc8+4aNRA6A==
-  dependencies:
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/syntax" "0.69.3"
-    "@glimmer/util" "0.69.3"
-    "@glimmer/wire-format" "0.69.3"
+"@glimmer/compiler@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.70.0.tgz#ded74455db50bf1a0b5ef36428ab619fcf88d32a"
+  integrity sha512-rSuLbqr128lwbNl8lPrfc6lJCPiCA36yGEQq9cqIydAjSolrcdxHploM01InA5f4Sh4rPxl+M22HnYU1irna0A==
+  dependencies:
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/syntax" "0.70.0"
+    "@glimmer/util" "0.70.0"
+    "@glimmer/wire-format" "0.70.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.69.3.tgz#57e71d151a8e7745438d9c72de21c549023d34b8"
-  integrity sha512-ZzS1196nxEa1zDRmcoCn5Q/HHnAKe0w2HFpS1fJYwUahiggBD3O8XzI99T/+JIdCbgAHUh6N6GfTX1MpwIr3qA==
+"@glimmer/destroyable@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.70.0.tgz#767c5de933a0dc9d4a41199443d88e0adb2d1a9f"
+  integrity sha512-A2ndHW9bFkGz4JJNG9kgWw1qXXrCTiIeUawDp0eatnSvRSePn4gggtsOWRuqU+zdNXpWUSH8VyvmJGByEYrDYw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.69.3"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/global-context" "0.70.0"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
 
-"@glimmer/encoder@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.69.3.tgz#326d68eafdc53d00b9873f8d98930469f79a1f37"
-  integrity sha512-5cuMu+07OVxazjswXBiATGFGwDGKqjWXAZ/e7DKlHu30qRHmEEuMPmQ8AjlT3WXQPceT+iD6yRoHlVDDo3N3Dg==
+"@glimmer/encoder@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.70.0.tgz#156d01f5d41afdc63418891466da8cf5a7b4b420"
+  integrity sha512-iOjvfdJWCbnrQb9ymCgUcnzB/cDVY5mVXM0zqi89D/AI0jYWUQzqIOPd6UJiWZPJv5OfiD1yQP17+hnnoeQQsg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/vm" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/vm" "0.70.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.69.3.tgz#d38bae41e6dcc248f264fecbce99f997f57a88d7"
-  integrity sha512-QFkVRGVaduy9yQwaN/oB54M5wpLXLuIOhcrcfT9cBDwAOuMO5EWT+jffQ958RH6XNg8dpnL5ut233v7SxM9SJg==
+"@glimmer/global-context@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.70.0.tgz#1212b34a92955107458ffe03976175ed6a2f7a37"
+  integrity sha512-uszWyrUI8AntyfMJFQc41CbsbNV3byiz2sknvQh2XE9vDEI1tKmSPp8Gcvuq3xZwV1Ou0eE2ZwXAM9bGJniYsA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.69.3.tgz#7d99db1a328ab6cd95b7235360780ed28d27b0e5"
-  integrity sha512-0h19o+PNdw5wO5aLbX/96jhT3wZA9zKYap7B1pAjcZiHYwtvhuGLSqR+zvr4Dq4oSXrNU/kbk1WWmoHm7Hkehw==
+"@glimmer/interfaces@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.70.0.tgz#1a5782a12ebca787e55930db2ec310ffc23d5c9c"
+  integrity sha512-HT3Yv97f353LW2TuEJnBhyg5Ebt9Mbp0s7uedb5mOJQbUxhGG24yy0HjOHUV+HRI0yCQPZO/q7ojJgX3MAknQg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.69.3.tgz#95763f0eb821891525a3f050b14a635ce4a04a9e"
-  integrity sha512-tHI6CXnwYpBKAXaR2t+5pqqOZveQRXvrFSlCMR2iohBmCSVqAR4be+ERLDzROHawP4ypN+cArfPqlC/4DN1zWw==
+"@glimmer/low-level@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.70.0.tgz#b086435edf2a88c2fb37d835afb970d896ed73e2"
+  integrity sha512-w8BEjOowKAg//pBrQppcPgX0uRD2E03QXcLH4nttznsqpQVt0TzqMf3ilNZkcKU5tAp2HjxY+RPGrTauZmiFhw==
 
-"@glimmer/manager@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.69.3.tgz#896995df36dba99db06d021bb1b4d4e1674956ea"
-  integrity sha512-vhnNtT7Pz1tveOBI/LN4p/CG7lBve9rJtib0Qyh28QLBAT8m/YnblAIRePt8HbPkgSL+3a85YxyjEp4+mnd37Q==
+"@glimmer/manager@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.70.0.tgz#b113974f54c74df55e700dac5dd205317c92b605"
+  integrity sha512-bJJVPXecCISaVi9cRS9DHRHO2Ly1UzPJQ8UjU7uuTamY5X/JCt4GTL9jXSRB0lV4NQCc80RIcDFam3NnlPkz+w==
   dependencies:
-    "@glimmer/destroyable" "0.69.3"
+    "@glimmer/destroyable" "0.70.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/reference" "0.69.3"
-    "@glimmer/util" "0.69.3"
-    "@glimmer/validator" "0.69.3"
-
-"@glimmer/node@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.69.3.tgz#a5aca72185af9267a223d6b7d07e0709804a3747"
-  integrity sha512-9el1kJjgQNoDYoWc/jbI1j+ywJA69ZU5yy7XDLTq42ooR31+rY2gY3v6110s3h18kfS21C79WzRd+UDAlD0cfg==
-  dependencies:
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/runtime" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/reference" "0.70.0"
+    "@glimmer/util" "0.70.0"
+    "@glimmer/validator" "0.70.0"
+
+"@glimmer/node@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.70.0.tgz#8e7a879733e6d5e02148e10b5599b64c0261a8f2"
+  integrity sha512-2lV9WQJOGiq8bFAyKb52fsyt+iu7KMgShu5vnpKGQXZGR66Gsn5Re5tiy0YnIFYxklZCvkQeJDuDiYx+GhS2aw==
+  dependencies:
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/runtime" "0.70.0"
+    "@glimmer/util" "0.70.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.69.3.tgz#c97b27396b088482af0a443a15e5596615d8a639"
-  integrity sha512-m2LMBZ7rfoQo1TOKoz2coUzCLjTkLZhgCkPA3ub8i7SJrWP2coxCGuHZ+yoW3X72wlY3Zu8DM/AdzgrCABNwVQ==
+"@glimmer/opcode-compiler@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.70.0.tgz#532ce4c31b1cce1715259287c791ad087699d39f"
+  integrity sha512-cRtsR9aTl5+1ctzGoz8oMUufkmWjkZEuQWJJgJVmv7fJGK+63XcVjA2utySoQp3cm/c5g99hWzLdsHZyQPLAFQ==
   dependencies:
-    "@glimmer/encoder" "0.69.3"
+    "@glimmer/encoder" "0.70.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/reference" "0.69.3"
-    "@glimmer/util" "0.69.3"
-    "@glimmer/vm" "0.69.3"
-    "@glimmer/wire-format" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/reference" "0.70.0"
+    "@glimmer/util" "0.70.0"
+    "@glimmer/vm" "0.70.0"
+    "@glimmer/wire-format" "0.70.0"
 
-"@glimmer/owner@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.69.3.tgz#71a97d5877b72a7a7a3d740dd00ecdfe2595824f"
-  integrity sha512-Ua3IvfQ2NAldqNVU03C4dboqjXxT16N807IgiNFB1Ec4QGCJ9dTYx8p98EgmrTqfBe4AbCqmhQKSVWugXAGU7A==
+"@glimmer/owner@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.70.0.tgz#9746c91e1f5e552a099629a9552ea888e2de3d5f"
+  integrity sha512-i54xmibwBLg0zC5rN4EkXnCv3Ny7zGZzOlUmUyi15WxPkSy9V9d8ZsyO5ORhsg79KTHnhM/DKalWDjyBEwNPYA==
   dependencies:
-    "@glimmer/util" "0.69.3"
+    "@glimmer/util" "0.70.0"
 
-"@glimmer/program@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.69.3.tgz#5a2b8a02d76322fb6b4f280ce0f39d9ebaaba292"
-  integrity sha512-HrZe6RDI1ra9uy/84H+T7Toh1YyuD9Zg0KtWRx26Cc30WrAk1CG597Y25OhJTrGMTYrKol86kS6Lv+97VrqEmA==
+"@glimmer/program@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.70.0.tgz#3282f5caa420487a13d5296c5c392da4227beb37"
+  integrity sha512-NkXKIiqX1oB6VV87GpiWJBbX2t58ra+oyABf2NrL67vui4rMC0VZWpwH7U6OzAMnW8kjjz9z02+ER9L9I5bduA==
   dependencies:
-    "@glimmer/encoder" "0.69.3"
+    "@glimmer/encoder" "0.70.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/manager" "0.69.3"
-    "@glimmer/opcode-compiler" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/manager" "0.70.0"
+    "@glimmer/opcode-compiler" "0.70.0"
+    "@glimmer/util" "0.70.0"
 
-"@glimmer/reference@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.69.3.tgz#b229bfa44a0506e89f19fa23468de82908c78695"
-  integrity sha512-JoHGFPPv8S5VO3wXSZ7dMIdCPEvkzdvRUG412nQp6M3KdXZUKy4ouAYFJy4iTpFWvPaIi4BI1Exo1HVtliuvZA==
+"@glimmer/reference@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.70.0.tgz#2031e8bf0c3281e7d457fc52b151b66449822cf6"
+  integrity sha512-GcyUw/KeIChdzj2z6zf3jFhl0J6gBhHd1wNbcCClR9a3ufQl6GJ7rtV2JFoc9AGEQMWytYfeFVrggerP39POFg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.69.3"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
-    "@glimmer/validator" "0.69.3"
+    "@glimmer/global-context" "0.70.0"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
+    "@glimmer/validator" "0.70.0"
 
-"@glimmer/runtime@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.69.3.tgz#be5c448dd1b2a35cd68b2a32799730dc01eef8b5"
-  integrity sha512-Yy37O+Gbwdh3sYrM9TACXgu1LRVAom6sc3yZqmXBfACCVE0hPXGjSiFtSwqU7gBjM4xti0Hg7qZO0nro118KHQ==
+"@glimmer/runtime@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.70.0.tgz#254ce45f84a165c9c0b0fa6b571f401a730edc69"
+  integrity sha512-9Um3E82gsTE6ozcSqQ6BoVwEaGRya5zwuE9zMSDrN2GxYTIRhlG4Ox89s4wO5izcXWd3PmrFPCBQDsO0iz7NYQ==
   dependencies:
-    "@glimmer/destroyable" "0.69.3"
+    "@glimmer/destroyable" "0.70.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.69.3"
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/low-level" "0.69.3"
-    "@glimmer/owner" "0.69.3"
-    "@glimmer/program" "0.69.3"
-    "@glimmer/reference" "0.69.3"
-    "@glimmer/util" "0.69.3"
-    "@glimmer/validator" "0.69.3"
-    "@glimmer/vm" "0.69.3"
-    "@glimmer/wire-format" "0.69.3"
+    "@glimmer/global-context" "0.70.0"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/low-level" "0.70.0"
+    "@glimmer/owner" "0.70.0"
+    "@glimmer/program" "0.70.0"
+    "@glimmer/reference" "0.70.0"
+    "@glimmer/util" "0.70.0"
+    "@glimmer/validator" "0.70.0"
+    "@glimmer/vm" "0.70.0"
+    "@glimmer/wire-format" "0.70.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.69.3.tgz#3613ef244935cd4f3aaac31f4ad8ca08a1c38a97"
-  integrity sha512-7LKqqnBdSFlWUh5+BfND4bS9LzCgezAYG3axHWIXZcPYuUadbnBe+0ugq8FFhIAsMF3TXk3rHHLseYo95OqwYA==
+"@glimmer/syntax@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.70.0.tgz#3b10023b84a02af7bf0ba4f3308946a5a932e603"
+  integrity sha512-1SFC2hbSfeV2IUwS2tMFljYCdZCq/CC+hw1S2boHWHG7I4yq3NdSQeYytLDB5yOuWAFE4ZGc4XRRntWjDRgGuQ==
   dependencies:
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.69.3.tgz#1d822a8f971a9a1e24385c4b46c3a48ab5cdf20d"
-  integrity sha512-bu3vMBPfWqGBRjQb4Hj81XYa8DWKdA+0HRxVCVqKlov3py8TSUyuGHKcbVB/bB0kKxuZp8nxW2UZJO3WA4V08A==
+"@glimmer/util@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.70.0.tgz#55cac3330cecb19a12fae21de918f49fe46d9f8b"
+  integrity sha512-h16boov87CGlXgu9c2O2XBx4xDMu/fEAHJh3YGUnfyPB/Tqebf4K9wUVKl5yl8AzhBeRT0+n/+vvyQhcl8vEmg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.69.3.tgz#488e56463337297f85e671e575d61e7c493ef144"
-  integrity sha512-nDHLaEY/CzNfKWk7rV1+eL+JAq11O3IM/FKAp/Uuson5HB2yEzxrM8rFHQCbZDkxzBgtPKuUtpTWQyxyNYgUJQ==
+"@glimmer/validator@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.70.0.tgz#21279efb0f07a9bd8493d2c03c168951da6af8ea"
+  integrity sha512-DcQwH3mjHMMqID9j7wKtRAeL1oVm+X1VAFE+RGQuRXzUxbLzYEPFDYE1XnXsbMG96KM+SJoF9yAuqzojprqNpw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.69.3"
+    "@glimmer/global-context" "0.70.0"
 
-"@glimmer/vm@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.69.3.tgz#8a9a62cc4545bbf56f4f900dc9981a6de9eaaf78"
-  integrity sha512-FSvI6rMTVcZwtSmmLE+638iCcFbNCOez6bn56mxmyX8dXoQzJajGxXMOm2hnkhlqpoAWGWeCxCUsyeQ8pQ6E1A==
+"@glimmer/vm@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.70.0.tgz#344abe18e290c3b10f68013baf7b232ec3e4a0b7"
+  integrity sha512-c21anP1sBKExaLoIYPLn1BAJBjkXb9wrw9EaIjEzQLh6REn2aGbFiVmYjH0bP0i23n7ilc9fZTw/IyF0AqSjew==
   dependencies:
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
 
-"@glimmer/wire-format@0.69.3":
-  version "0.69.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.69.3.tgz#f7328a32b71ada0eb31f00f4592e4541ba04f30c"
-  integrity sha512-RJlLZYNVHMxjA/hLp5baML/UqTWgBRYSLcTnvmzmvwStLAC9kOm2IRoAvjYInW8XbsbAgNAtJSmVMiL3oSIuEw==
+"@glimmer/wire-format@0.70.0":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.70.0.tgz#e261b9bb866cf32f355697968954424ff095ae3a"
+  integrity sha512-gRjq5cNHrilj/Bqb778+4LWhvOYyaI1UH6A0COgYBMXYiY1XHDKNPG26QZ/uc3OUtG8lTST2R1h071oScOf2Hw==
   dependencies:
-    "@glimmer/interfaces" "0.69.3"
-    "@glimmer/util" "0.69.3"
+    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/util" "0.70.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 3336180aa3352a3455c98480ddddf3a448e9d992 Mon Sep 17 00:00:00 2001
From: mrloop <ewan@mrloop.com>
Date: Tue, 15 Dec 2020 14:50:14 +0000
Subject: [PATCH 0268/1405] [DOC release] Use correct class declaration

Use `extends` when extending `Route` class.
---
 packages/@ember/-internals/routing/lib/system/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 6e45a2722b4..cf8fc6a3148 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -231,7 +231,7 @@ class Route extends EmberObject implements IRoute {
     ```app/routes/member/interest.js
     import Route from '@ember/routing/route';
 
-    export default class MemberInterestRoute Route {
+    export default class MemberInterestRoute extends Route {
       queryParams = {
         interestQp: { refreshModel: true }
       }

From f8339c3346875334affa46557666caf7c36fa5fa Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 15 Dec 2020 11:05:01 -0800
Subject: [PATCH 0269/1405] [FEATURE dynamic-helper-and-modifier] Enable
 dynamic helper usage

Enables dynamic helper usage based on either helper definitions
directly, or currying helpers with the (helper) keyword.
---
 package.json                                  |  24 +-
 .../lib/component-managers/internal.ts        |   4 -
 .../-internals/glimmer/lib/component.ts       |   2 +-
 .../glimmer/lib/components/input.ts           |   2 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |   8 +-
 ...sert-implicit-component-helper-argument.ts |  26 -
 .../glimmer/lib/helpers/internal-helper.ts    |   2 +-
 .../glimmer/lib/modifiers/action.ts           |   4 +-
 .../glimmer/lib/modifiers/internal.ts         |  12 +-
 .../-internals/glimmer/lib/modifiers/on.ts    |   4 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  12 +-
 .../components/contextual-components-test.js  |  14 -
 .../components/strict-mode-test.js            |  64 ++
 .../integration/helpers/custom-helper-test.js |  35 +-
 .../tests/integration/modifiers/on-test.js    |   4 +-
 packages/@ember/canary-features/index.ts      |   4 +
 packages/ember-template-compiler/index.ts     |   2 +-
 ...ssert-against-dynamic-helpers-modifiers.ts |  56 ++
 ...al-variable-shadowing-helper-invocation.ts |  81 ---
 .../lib/plugins/index.ts                      |  68 +-
 .../plugins/transform-component-invocation.ts | 232 -------
 .../lib/system/compile-options.ts             |   8 +-
 ...riable-shadowing-helper-invocation-test.js | 651 ------------------
 .../transform-component-invocation-test.js    |  17 +-
 .../tests/system/compile_options_test.js      |  22 +-
 yarn.lock                                     | 254 +++----
 26 files changed, 384 insertions(+), 1228 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
 create mode 100644 packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
 delete mode 100644 packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
 delete mode 100644 packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
 delete mode 100644 packages/ember-template-compiler/tests/plugins/assert-local-variable-shadowing-helper-invocation-test.js

diff --git a/package.json b/package.json
index f41e06be8fd..3c01bbfdd19 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.70.0",
+    "@glimmer/compiler": "0.71.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.70.0",
-    "@glimmer/interfaces": "0.70.0",
-    "@glimmer/manager": "0.70.0",
-    "@glimmer/destroyable": "0.70.0",
-    "@glimmer/owner": "0.70.0",
-    "@glimmer/node": "0.70.0",
-    "@glimmer/opcode-compiler": "0.70.0",
-    "@glimmer/program": "0.70.0",
-    "@glimmer/reference": "0.70.0",
-    "@glimmer/runtime": "0.70.0",
-    "@glimmer/validator": "0.70.0",
+    "@glimmer/global-context": "0.71.1",
+    "@glimmer/interfaces": "0.71.1",
+    "@glimmer/manager": "0.71.1",
+    "@glimmer/destroyable": "0.71.1",
+    "@glimmer/owner": "0.71.1",
+    "@glimmer/node": "0.71.1",
+    "@glimmer/opcode-compiler": "0.71.1",
+    "@glimmer/program": "0.71.1",
+    "@glimmer/reference": "0.71.1",
+    "@glimmer/runtime": "0.71.1",
+    "@glimmer/validator": "0.71.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index ac2e9ddcc02..3fda28fee7f 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -41,10 +41,6 @@ export default class InternalManager
   implements
     InternalComponentManager<InternalComponentState, EmberInternalComponentConstructor>,
     WithCreateInstance {
-  static for(definition: EmberInternalComponentConstructor, name: string): () => InternalManager {
-    return () => new InternalManager(definition, name);
-  }
-
   constructor(private ComponentClass: EmberInternalComponentConstructor, private name: string) {}
 
   getCapabilities(): InternalComponentCapabilities {
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 81f97092df5..f7f65e7c123 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1128,6 +1128,6 @@ Component.reopenClass({
   positionalParams: [],
 });
 
-setInternalComponentManager(() => CURLY_COMPONENT_MANAGER, Component);
+setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
 
 export default Component;
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index eb2c7c3c4f3..bd0e4da0393 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -126,7 +126,7 @@ export const InputComponent = {
   },
 };
 
-setInternalComponentManager(InternalManager.for(Input, 'input'), InputComponent);
+setInternalComponentManager(new InternalManager(Input, 'input'), InputComponent);
 setComponentTemplate(InputTemplate, InputComponent);
 
 Input.toString = () => '@ember/component/input';
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 215aa20882f..b1888d6dac1 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -8,7 +8,7 @@ import { getDebugName, symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
-import { helperCapabilities, setHelperManager } from '@glimmer/manager';
+import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager';
 import {
   consumeTag,
   createTag,
@@ -195,11 +195,11 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
-export const CLASSIC_HELPER_MANAGER_FACTORY = (owner: Owner | undefined): ClassicHelperManager => {
+setHelperManager((owner: Owner | undefined): ClassicHelperManager => {
   return new ClassicHelperManager(owner);
-};
+}, Helper);
 
-setHelperManager(CLASSIC_HELPER_MANAGER_FACTORY, Helper);
+export const CLASSIC_HELPER_MANAGER = getInternalHelperManager(Helper);
 
 ///////////
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts b/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
deleted file mode 100644
index b7879daa2c5..00000000000
--- a/packages/@ember/-internals/glimmer/lib/helpers/-assert-implicit-component-helper-argument.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import { Helper, VMArguments } from '@glimmer/interfaces';
-import { createComputeRef, valueForRef } from '@glimmer/reference';
-import { internalHelper } from './internal-helper';
-
-let helper: Helper;
-
-if (DEBUG) {
-  helper = (args: VMArguments) => {
-    let inner = args.positional.at(0);
-    let messageRef = args.positional.at(1);
-
-    return createComputeRef(() => {
-      let value = valueForRef(inner);
-
-      assert(valueForRef(messageRef) as string, typeof value !== 'string');
-
-      return value;
-    });
-  };
-} else {
-  helper = (args: VMArguments) => args.positional.at(0);
-}
-
-export default internalHelper(helper);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
index 1152a6bf541..99645339afc 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
@@ -2,5 +2,5 @@ import { Helper, HelperDefinitionState } from '@glimmer/interfaces';
 import { setInternalHelperManager } from '@glimmer/manager';
 
 export function internalHelper(helper: Helper): HelperDefinitionState {
-  return setInternalHelperManager(() => helper, {});
+  return setInternalHelperManager(helper, {});
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index dfb67e406d2..165df09fa1e 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -1,3 +1,4 @@
+import { Owner } from '@ember/-internals/owner';
 import { uuid } from '@ember/-internals/utils';
 import { ActionManager, isSimpleClick } from '@ember/-internals/views';
 import { assert, deprecate } from '@ember/debug';
@@ -204,6 +205,7 @@ export class ActionState {
 
 class ActionModifierManager implements InternalModifierManager<ActionState, object> {
   create(
+    _owner: Owner,
     element: SimpleElement,
     _state: object,
     args: VMArguments,
@@ -312,4 +314,4 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
 
 const ACTION_MODIFIER_MANAGER = new ActionModifierManager();
 
-export default setInternalModifierManager(() => ACTION_MODIFIER_MANAGER, {});
+export default setInternalModifierManager(ACTION_MODIFIER_MANAGER, {});
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index 0fcdbcd83b6..886728732b0 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -63,23 +63,19 @@ class InternalModifierState implements Destroyable {
 
 class InternalModifierManager
   implements ModifierManager<InternalModifierState, typeof InternalModifier> {
-  constructor(private readonly owner: Owner) {}
-
   create(
+    owner: Owner,
     element: SimpleElement,
     factory: typeof InternalModifier,
     args: VMArguments
   ): InternalModifierState {
     assert('element must be an HTMLElement', element instanceof HTMLElement);
 
-    let instance = new factory(this.owner, element, args.capture());
+    let instance = new factory(owner, element, args.capture());
 
     registerDestructor(instance, (modifier) => modifier.remove());
 
-    return new InternalModifierState(
-      factory.name,
-      new factory(this.owner, element, args.capture())
-    );
+    return new InternalModifierState(factory.name, instance);
   }
 
   // not needed for now, but feel free to implement this
@@ -105,4 +101,4 @@ class InternalModifierManager
   }
 }
 
-setInternalModifierManager((owner: Owner) => new InternalModifierManager(owner), InternalModifier);
+setInternalModifierManager(new InternalModifierManager(), InternalModifier);
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index aaee250600d..c6e696a0b72 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -1,3 +1,4 @@
+import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { registerDestructor } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
@@ -322,6 +323,7 @@ class OnModifierManager implements InternalModifierManager<OnModifierState | nul
   }
 
   create(
+    _owner: Owner,
     element: SimpleElement | Element,
     _state: object,
     args: VMArguments
@@ -387,6 +389,6 @@ const ON_MODIFIER_MANAGER = new OnModifierManager();
 
 const on = {};
 
-setInternalModifierManager(() => ON_MODIFIER_MANAGER, on);
+setInternalModifierManager(ON_MODIFIER_MANAGER, on);
 
 export default on;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 529601e1ddd..cda2a83ff0b 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -31,13 +31,12 @@ import {
 import { _WeakSet } from '@glimmer/util';
 import { isCurlyManager } from './component-managers/curly';
 import {
-  CLASSIC_HELPER_MANAGER_FACTORY,
+  CLASSIC_HELPER_MANAGER,
   HelperFactory,
   HelperInstance,
   isClassicHelper,
   SimpleHelper,
 } from './helper';
-import { default as componentAssertionHelper } from './helpers/-assert-implicit-component-helper-argument';
 import { default as inElementNullCheckHelper } from './helpers/-in-element-null-check';
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
 import { default as trackArray } from './helpers/-track-array';
@@ -193,7 +192,6 @@ const BUILTIN_KEYWORD_HELPERS = {
   '-get-dynamic-var': internalHelper(getDynamicVar),
   '-mount': mountHelper,
   '-outlet': outletHelper,
-  '-assert-implicit-component-helper-argument': componentAssertionHelper,
   '-in-el-null': inElementNullCheckHelper,
 };
 
@@ -267,10 +265,10 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
         // we'll trigger an assertion
         if (!CLASSIC_HELPER_MANAGER_ASSOCIATED.has(factory)) {
           CLASSIC_HELPER_MANAGER_ASSOCIATED.add(factory);
-          setInternalHelperManager(CLASSIC_HELPER_MANAGER_FACTORY, factory);
+          setInternalHelperManager(CLASSIC_HELPER_MANAGER, factory);
         }
       } else {
-        setInternalHelperManager(CLASSIC_HELPER_MANAGER_FACTORY, factory);
+        setInternalHelperManager(CLASSIC_HELPER_MANAGER, factory);
       }
 
       return factory;
@@ -345,7 +343,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
         };
       } else {
         let factory = owner.factoryFor(P`component:-default`)!;
-        let manager = getInternalComponentManager(owner, factory.class as object);
+        let manager = getInternalComponentManager(factory.class as object);
 
         definition = {
           state: factory,
@@ -358,7 +356,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
 
       let factory = pair.component;
       let ComponentClass = factory.class!;
-      let manager = getInternalComponentManager(owner, ComponentClass);
+      let manager = getInternalComponentManager(ComponentClass);
 
       definition = {
         state: isCurlyManager(manager) ? factory : ComponentClass,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index e6b868efdbc..efdaea036a6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1319,20 +1319,6 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test GH#17121 implicit component invocations should not perform string lookup']() {
-      this.registerComponent('foo-bar', { template: 'foo-bar component' });
-
-      expectAssertion(
-        () =>
-          this.render(strip`
-          {{#let 'foo-bar' as |foo|}}
-            {{foo 1 2 3}}
-          {{/let}}
-        `),
-        "expected `foo` to be a contextual component but found a string. Did you mean `(component foo)`? ('-top-level' @ L1:C29) "
-      );
-    }
-
     ['@test RFC#311 invoking named args (without arguments)']() {
       this.registerComponent('x-outer', { template: '{{@inner}}' });
       this.registerComponent('x-inner', { template: 'inner' });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index 934b4496453..df70247e557 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -19,6 +19,7 @@ import {
   on,
   fn,
 } from '@ember/-internals/glimmer';
+import GlimmerishComponent from '../../utils/glimmerish-component';
 
 if (EMBER_STRICT_MODE) {
   moduleFor(
@@ -89,6 +90,69 @@ if (EMBER_STRICT_MODE) {
         this.assertHTML('foobar');
         this.assertStableRerender();
       }
+
+      '@test Can use a dynamic component definition'() {
+        let Foo = defineComponent({}, 'Hello, world!');
+        let Bar = defineComponent(
+          {},
+          '<this.Foo/>',
+          class extends GlimmerishComponent {
+            Foo = Foo;
+          }
+        );
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use a dynamic component definition (curly)'() {
+        let Foo = defineComponent({}, 'Hello, world!');
+        let Bar = defineComponent(
+          {},
+          '{{this.Foo}}',
+          class extends GlimmerishComponent {
+            Foo = Foo;
+          }
+        );
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@test Can use a dynamic helper definition'() {
+        let foo = defineSimpleHelper(() => 'Hello, world!');
+        let Bar = defineComponent(
+          {},
+          '{{this.foo}}',
+          class extends GlimmerishComponent {
+            foo = foo;
+          }
+        );
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
+
+      '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
+        let foo = defineSimpleHelper((value) => value);
+        let Foo = defineComponent({}, '{{@value}}');
+        let Bar = defineComponent({ Foo, foo }, '<Foo @value={{foo "Hello, world!"}}/>');
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('Hello, world!');
+        this.assertStableRerender();
+      }
     }
   );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 83cb108e001..b8c884c0a72 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -1,7 +1,13 @@
 import { DEBUG } from '@glimmer/env';
 
-import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
-import { Helper } from '@ember/-internals/glimmer';
+import {
+  RenderingTestCase,
+  moduleFor,
+  runDestroy,
+  runTask,
+  defineSimpleHelper,
+} from 'internal-test-helpers';
+import { Helper, Component } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
 
@@ -769,6 +775,31 @@ moduleFor(
         this.render('{{hello-world}}');
       }, expectedMessage);
     }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
+      let val = defineSimpleHelper((value) => value);
+
+      this.registerComponent('foo', {
+        template: '{{@value}}',
+      });
+
+      this.registerComponent('bar', {
+        template: '<Foo @value={{helper this.val "Hello, world!"}}/>',
+        ComponentClass: Component.extend({ val }),
+      });
+
+      this.render('<Bar/>');
+      this.assertText('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@feature(!EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
+      expectAssertion(() => {
+        this.registerComponent('bar', {
+          template: '<Foo @value={{helper this.val "Hello, world!"}}/>',
+        });
+      }, /Cannot use the \(helper\) keyword yet, as it has not been implemented/);
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
index 14204334a60..f10186b6a61 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
@@ -19,7 +19,7 @@ moduleFor(
     getOnManagerInstance() {
       // leveraging private APIs, this can be deleted if these APIs change
       // but it has been useful to verify some internal details
-      return getInternalModifierManager(this.owner, on);
+      return getInternalModifierManager(on);
     }
 
     assertCounts(expected) {
@@ -390,7 +390,7 @@ moduleFor(
     getOnManagerInstance() {
       // leveraging private APIs, this can be deleted if these APIs change
       // but it has been useful to verify some internal details
-      return getInternalModifierManager(this.owner, on);
+      return getInternalModifierManager(on);
     }
 
     assertCounts(expected) {
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 13458920d71..8ba141bd5d0 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -20,6 +20,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
   EMBER_STRICT_MODE: null,
+  EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: null,
 };
 
 /**
@@ -77,3 +78,6 @@ export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
   FEATURES.EMBER_MODERNIZED_BUILT_IN_COMPONENTS
 );
 export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
+export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
+  FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
+);
diff --git a/packages/ember-template-compiler/index.ts b/packages/ember-template-compiler/index.ts
index fc69a458b97..3cdea8978d9 100644
--- a/packages/ember-template-compiler/index.ts
+++ b/packages/ember-template-compiler/index.ts
@@ -27,7 +27,7 @@ export {
   registerPlugin,
   unregisterPlugin,
 } from './lib/system/compile-options';
-export { default as defaultPlugins } from './lib/plugins/index';
+export { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from './lib/plugins/index';
 export { EmberPrecompileOptions } from './lib/types';
 
 // used to bootstrap templates
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
new file mode 100644
index 00000000000..5596042bae9
--- /dev/null
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
@@ -0,0 +1,56 @@
+import { assert } from '@ember/debug';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
+import { isPath, trackLocals } from './utils';
+
+export default function assertAgainstDynamicHelpersModifiers(
+  env: EmberASTPluginEnvironment
+): ASTPlugin {
+  let { moduleName } = env.meta;
+  let { hasLocal, node } = trackLocals();
+
+  return {
+    name: 'assert-against-dynamic-helpers-modifiers',
+
+    visitor: {
+      Program: node,
+
+      ElementNode: {
+        keys: {
+          children: node,
+        },
+      },
+
+      MustacheStatement(node: AST.MustacheStatement) {
+        if (isPath(node.path)) {
+          let name = node.path.parts[0];
+
+          assert(
+            `${messageFor(name)} ${calculateLocationDisplay(moduleName, node.loc)}`,
+            (name !== 'helper' && name !== 'modifier') || isLocalVariable(node.path, hasLocal)
+          );
+        }
+      },
+
+      SubExpression(node: AST.SubExpression) {
+        if (isPath(node.path)) {
+          let name = node.path.parts[0];
+
+          assert(
+            `${messageFor(name)} ${calculateLocationDisplay(moduleName, node.loc)}`,
+            (name !== 'helper' && name !== 'modifier') || isLocalVariable(node.path, hasLocal)
+          );
+        }
+      },
+    },
+  };
+}
+
+function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
+  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]);
+}
+
+function messageFor(name: string): string {
+  return `Cannot use the (${name}) keyword yet, as it has not been implemented.`;
+}
diff --git a/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts b/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
deleted file mode 100644
index 0022edf624a..00000000000
--- a/packages/ember-template-compiler/lib/plugins/assert-local-variable-shadowing-helper-invocation.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-import { isPath, trackLocals } from './utils';
-
-export default function assertLocalVariableShadowingHelperInvocation(
-  env: EmberASTPluginEnvironment
-): ASTPlugin {
-  let { moduleName } = env.meta;
-  let { hasLocal, node } = trackLocals();
-
-  if (env.strictMode) {
-    return {
-      name: 'assert-local-variable-shadowing-helper-invocation',
-      visitor: {},
-    };
-  }
-
-  return {
-    name: 'assert-local-variable-shadowing-helper-invocation',
-
-    visitor: {
-      Program: node,
-
-      ElementNode: {
-        keys: {
-          children: node,
-        },
-      },
-
-      MustacheStatement(node: AST.MustacheStatement) {
-        if (isPath(node.path) && hasArguments(node)) {
-          let name = node.path.parts[0];
-          let type = 'helper';
-
-          assert(
-            `${messageFor(name, type)} ${calculateLocationDisplay(moduleName, node.loc)}`,
-            !isLocalVariable(node.path, hasLocal)
-          );
-        }
-      },
-
-      SubExpression(node: AST.SubExpression) {
-        if (isPath(node.path)) {
-          let name = node.path.parts[0];
-          let type = 'helper';
-
-          assert(
-            `${messageFor(name, type)} ${calculateLocationDisplay(moduleName, node.loc)}`,
-            !isLocalVariable(node.path, hasLocal)
-          );
-        }
-      },
-
-      ElementModifierStatement(node: AST.ElementModifierStatement) {
-        if (isPath(node.path)) {
-          let name = node.path.parts[0];
-          let type = 'modifier';
-
-          assert(
-            `${messageFor(name, type)} ${calculateLocationDisplay(moduleName, node.loc)}`,
-            !isLocalVariable(node.path, hasLocal)
-          );
-        }
-      },
-    },
-  };
-}
-
-function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
-  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]);
-}
-
-function messageFor(name: string, type: string): string {
-  return `Cannot invoke the \`${name}\` ${type} because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict.`;
-}
-
-function hasArguments(node: AST.MustacheStatement): boolean {
-  return node.params.length > 0 || node.hash.pairs.length > 0;
-}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index a882a0e4dce..ead78cda876 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -1,13 +1,12 @@
+import AssertAgainstDynamicHelpersModifiers from './assert-against-dynamic-helpers-modifiers';
 import AssertAgainstNamedBlocks from './assert-against-named-blocks';
 import AssertIfHelperWithoutArguments from './assert-if-helper-without-arguments';
 import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
-import AssertLocalVariableShadowingHelperInvocation from './assert-local-variable-shadowing-helper-invocation';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
 import DeprecateSendAction from './deprecate-send-action';
 import TransformActionSyntax from './transform-action-syntax';
 import TransformAttrsIntoArgs from './transform-attrs-into-args';
-import TransformComponentInvocation from './transform-component-invocation';
 import TransformEachInIntoEach from './transform-each-in-into-each';
 import TransformEachTrackArray from './transform-each-track-array';
 import TransformHasBlockSyntax from './transform-has-block-syntax';
@@ -17,35 +16,48 @@ import TransformOldClassBindingSyntax from './transform-old-class-binding-syntax
 import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings-into-just-bindings';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
-import { EMBER_NAMED_BLOCKS } from '@ember/canary-features';
+import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS, EMBER_NAMED_BLOCKS } from '@ember/canary-features';
 import { SEND_ACTION } from '@ember/deprecated-features';
 
 // order of plugins is important
-const transforms = [
-  TransformComponentInvocation,
-  TransformOldClassBindingSyntax,
-  TransformQuotedBindingsIntoJustBindings,
-  AssertReservedNamedArguments,
-  TransformActionSyntax,
-  TransformAttrsIntoArgs,
-  TransformEachInIntoEach,
-  TransformHasBlockSyntax,
-  AssertLocalVariableShadowingHelperInvocation,
-  TransformLinkTo,
-  AssertInputHelperWithoutBlock,
-  TransformInElement,
-  AssertIfHelperWithoutArguments,
-  AssertSplattributeExpressions,
-  TransformEachTrackArray,
-  TransformWrapMountAndOutlet,
-];
+export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
+  [
+    TransformOldClassBindingSyntax,
+    TransformQuotedBindingsIntoJustBindings,
+    AssertReservedNamedArguments,
+    TransformActionSyntax,
+    TransformAttrsIntoArgs,
+    TransformEachInIntoEach,
+    TransformHasBlockSyntax,
+    TransformLinkTo,
+    AssertInputHelperWithoutBlock,
+    TransformInElement,
+    AssertIfHelperWithoutArguments,
+    AssertSplattributeExpressions,
+    TransformEachTrackArray,
+    TransformWrapMountAndOutlet,
+    SEND_ACTION ? DeprecateSendAction : null,
+    !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
+    !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
+  ].filter(notNull)
+);
 
-if (SEND_ACTION) {
-  transforms.push(DeprecateSendAction);
-}
+export const STRICT_MODE_TRANSFORMS = Object.freeze(
+  [
+    TransformQuotedBindingsIntoJustBindings,
+    AssertReservedNamedArguments,
+    TransformActionSyntax,
+    TransformEachInIntoEach,
+    TransformInElement,
+    AssertSplattributeExpressions,
+    TransformEachTrackArray,
+    TransformWrapMountAndOutlet,
+    SEND_ACTION ? DeprecateSendAction : null,
+    !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
+    !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
+  ].filter(notNull)
+);
 
-if (!EMBER_NAMED_BLOCKS) {
-  transforms.push(AssertAgainstNamedBlocks);
+function notNull<TValue>(value: TValue | null): value is TValue {
+  return value !== null;
 }
-
-export default Object.freeze(transforms);
diff --git a/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts b/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
deleted file mode 100644
index 103a1f28e4a..00000000000
--- a/packages/ember-template-compiler/lib/plugins/transform-component-invocation.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { Builders, EmberASTPluginEnvironment } from '../types';
-import { isPath, trackLocals } from './utils';
-
-/**
-  Transforms unambigious invocations of closure components to be wrapped with
-  the component helper. Once these syntaxes are fully supported by Glimmer VM
-  natively, this transform can be removed.
-
-  ```handlebars
-  {{!-- this.foo is not a legal helper/component name --}}
-  {{this.foo "with" some="args"}}
-  ```
-
-  with
-
-  ```handlebars
-  {{component this.foo "with" some="args"}}
-  ```
-
-  and
-
-  ```handlebars
-  {{!-- this.foo is not a legal helper/component name --}}
-  {{#this.foo}}...{{/this.foo}}
-  ```
-
-  with
-
-  ```handlebars
-  {{#component this.foo}}...{{/component}}
-  ```
-
-  and
-
-  ```handlebars
-  {{!-- foo.bar is not a legal helper/component name --}}
-  {{foo.bar "with" some="args"}}
-  ```
-
-  with
-
-  ```handlebars
-  {{component foo.bar "with" some="args"}}
-  ```
-
-  and
-
-  ```handlebars
-  {{!-- foo.bar is not a legal helper/component name --}}
-  {{#foo.bar}}...{{/foo.bar}}
-  ```
-
-  with
-
-  ```handlebars
-  {{#component foo.bar}}...{{/component}}
-  ```
-
-  and
-
-  ```handlebars
-  {{!-- @foo is not a legal helper/component name --}}
-  {{@foo "with" some="args"}}
-  ```
-
-  with
-
-  ```handlebars
-  {{component @foo "with" some="args"}}
-  ```
-
-  and
-
-  ```handlebars
-  {{!-- @foo is not a legal helper/component name --}}
-  {{#@foo}}...{{/@foo}}
-  ```
-
-  with
-
-  ```handlebars
-  {{#component @foo}}...{{/component}}
-  ```
-
-  and
-
-  ```handlebars
-  {{#let ... as |foo|}}
-    {{!-- foo is a local variable --}}
-    {{foo "with" some="args"}}
-  {{/let}}
-  ```
-
-  with
-
-  ```handlebars
-  {{#let ... as |foo|}}
-    {{component foo "with" some="args"}}
-  {{/let}}
-  ```
-
-  and
-
-  ```handlebars
-  {{#let ... as |foo|}}
-    {{!-- foo is a local variable --}}
-    {{#foo}}...{{/foo}}
-  {{/let}}
-  ```
-
-  with
-
-  ```handlebars
-  {{#let ... as |foo|}}
-    {{#component foo}}...{{/component}}
-  {{/let}}
-  ```
-
-  @private
-  @class TransFormComponentInvocation
-*/
-export default function transformComponentInvocation(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { hasLocal, node } = trackLocals();
-
-  let isAttrs = false;
-
-  return {
-    name: 'transform-component-invocation',
-
-    visitor: {
-      Program: node,
-
-      ElementNode: {
-        keys: {
-          attributes: {
-            enter() {
-              isAttrs = true;
-            },
-
-            exit() {
-              isAttrs = false;
-            },
-          },
-
-          children: node,
-        },
-      },
-
-      BlockStatement(node: AST.BlockStatement) {
-        if (isBlockInvocation(node, hasLocal)) {
-          wrapInComponent(env, node);
-        }
-      },
-
-      MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
-        if (!isAttrs && isInlineInvocation(node, hasLocal)) {
-          wrapInComponent(env, node);
-        }
-      },
-    },
-  };
-}
-
-function isInlineInvocation(
-  node: AST.MustacheStatement,
-  hasLocal: (k: string) => boolean
-): boolean {
-  let { path } = node;
-  return isPath(path) && isIllegalName(path, hasLocal) && hasArguments(node);
-}
-
-function isIllegalName(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
-  return isThisPath(node) || isDotPath(node) || isNamedArg(node) || isLocalVariable(node, hasLocal);
-}
-
-function isThisPath(node: AST.PathExpression): boolean {
-  return node.this === true;
-}
-
-function isDotPath(node: AST.PathExpression): boolean {
-  return node.parts.length > 1;
-}
-
-function isNamedArg(node: AST.PathExpression): boolean {
-  return node.data === true;
-}
-
-function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
-  return !node.this && hasLocal(node.parts[0]);
-}
-
-function hasArguments(node: AST.MustacheStatement): boolean {
-  return node.params.length > 0 || node.hash.pairs.length > 0;
-}
-
-function isBlockInvocation(node: AST.BlockStatement, hasLocal: (k: string) => boolean): boolean {
-  return isPath(node.path) && isIllegalName(node.path, hasLocal);
-}
-
-function wrapInAssertion(moduleName: string, node: AST.PathExpression, b: Builders) {
-  let error = b.string(
-    `expected \`${
-      node.original
-    }\` to be a contextual component but found a string. Did you mean \`(component ${
-      node.original
-    })\`? ${calculateLocationDisplay(moduleName, node.loc)}`
-  );
-
-  return b.sexpr(
-    b.path('-assert-implicit-component-helper-argument'),
-    [node, error],
-    b.hash(),
-    node.loc
-  );
-}
-
-function wrapInComponent(
-  env: EmberASTPluginEnvironment,
-  node: AST.MustacheStatement | AST.BlockStatement
-) {
-  let { moduleName } = env.meta;
-  let { builders: b } = env.syntax;
-
-  let component = env.isProduction
-    ? node.path
-    : wrapInAssertion(moduleName, node.path as AST.PathExpression, b);
-
-  node.path = b.path('component');
-  node.params.unshift(component);
-}
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 9002d6e2fd7..1e9e2129cfc 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -2,7 +2,7 @@ import { EMBER_STRICT_MODE } from '@ember/canary-features';
 import { assign } from '@ember/polyfills';
 import { PrecompileOptions } from '@glimmer/compiler';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
-import PLUGINS from '../plugins/index';
+import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index';
 import { EmberPrecompileOptions, PluginFunc } from '../types';
 import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
 
@@ -32,10 +32,12 @@ export default function compileOptions(
     meta.moduleName = options.moduleName;
   }
 
+  let builtInPlugins = options.strictMode ? STRICT_MODE_TRANSFORMS : RESOLUTION_MODE_TRANSFORMS;
+
   if (!_options.plugins) {
-    options.plugins = { ast: [...USER_PLUGINS, ...PLUGINS] };
+    options.plugins = { ast: [...USER_PLUGINS, ...builtInPlugins] };
   } else {
-    let potententialPugins = [...USER_PLUGINS, ...PLUGINS];
+    let potententialPugins = [...USER_PLUGINS, ...builtInPlugins];
     let providedPlugins = options.plugins.ast.map((plugin) => wrapLegacyPluginIfNeeded(plugin));
     let pluginsToAdd = potententialPugins.filter((plugin) => {
       return options.plugins.ast.indexOf(plugin) === -1;
diff --git a/packages/ember-template-compiler/tests/plugins/assert-local-variable-shadowing-helper-invocation-test.js b/packages/ember-template-compiler/tests/plugins/assert-local-variable-shadowing-helper-invocation-test.js
deleted file mode 100644
index 313334fe2b0..00000000000
--- a/packages/ember-template-compiler/tests/plugins/assert-local-variable-shadowing-helper-invocation-test.js
+++ /dev/null
@@ -1,651 +0,0 @@
-import { compile } from '../../index';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  'ember-template-compiler: assert-local-variable-shadowing-helper-invocation',
-  class extends AbstractTestCase {
-    [`@test block statements shadowing sub-expression invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            {{concat (foo)}}
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C21) `);
-
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            {{concat (foo bar baz)}}
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C21) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}{{/let}}
-        {{concat (foo)}}
-        {{concat (foo bar baz)}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          {{concat foo}}
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let (concat foo) as |concat|}}
-          {{input value=concat}}
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test element nodes shadowing sub-expression invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          <Foo as |foo|>
-            {{concat (foo)}}
-          </Foo>`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C21) `);
-
-      expectAssertion(() => {
-        compile(
-          `
-          <Foo as |foo|>
-            {{concat (foo bar baz)}}
-          </Foo>`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C21) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        <Foo as |foo|></Foo>
-        {{concat (foo)}}
-        {{concat (foo bar baz)}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        <Foo as |foo|>
-          {{concat foo}}
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        <Foo foo={{concat foo}} as |concat|>
-          {{input value=concat}}
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test deeply nested sub-expression invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <FooBar as |bar|>
-              {{#each items as |baz|}}
-                {{concat (foo)}}
-              {{/each}}
-            </FooBar>
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L5:C25) `);
-
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <FooBar as |bar|>
-              {{#each items as |baz|}}
-                {{concat (foo bar baz)}}
-              {{/each}}
-            </FooBar>
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L5:C25) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-            {{/each}}
-            {{concat (baz)}}
-            {{concat (baz bat)}}
-          </FooBar>
-          {{concat (bar)}}
-          {{concat (bar baz bat)}}
-        {{/let}}
-        {{concat (foo)}}
-        {{concat (foo bar baz bat)}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-              {{concat foo}}
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let (foo foo) as |foo|}}
-          <FooBar bar=(bar bar) as |bar|>
-            {{#each (baz baz) as |baz|}}
-              {{concat foo bar baz}}
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test block statements shadowing attribute sub-expression invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <div class={{concat (foo bar baz)}} />
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C32) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}{{/let}}
-        <div class={{concat (foo)}} />
-        <div class={{concat (foo bar baz)}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <div class={{concat foo}} />
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let (foo foo) as |foo|}}
-          <div class={{concat foo}} />
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test element nodes shadowing attribute sub-expression invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          <Foo as |foo|>
-            <div class={{concat (foo bar baz)}} />
-          </Foo>`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C32) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        <Foo as |foo|></Foo>
-        <div class={{concat (foo)}} />
-        <div class={{concat (foo bar baz)}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        <Foo as |foo|>
-          <div class={{concat foo}} />
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        <Foo foo={{foo foo}} as |foo|>
-          <div class={{concat foo}} />
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test deeply nested attribute sub-expression invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <FooBar as |bar|>
-              {{#each items as |baz|}}
-                <div class={{concat (foo bar baz)}} />
-              {{/each}}
-            </FooBar>
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L5:C36) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-            {{/each}}
-            <div class={{concat (baz)}} />
-            <div class={{concat (baz bat)}} />
-          </FooBar>
-          <div class={{concat (bar)}} />
-          <div class={{concat (bar baz bat)}} />
-        {{/let}}
-        <div class={{concat (foo)}} />
-        <div class={{concat (foo bar baz bat)}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-              <div class={{concat foo}} />
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let (foo foo) as |foo|}}
-          <FooBar bar=(bar bar) as |bar|>
-            {{#each (baz baz) as |baz|}}
-              <div class={{concat foo bar baz}} />
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test block statements shadowing attribute mustache invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <div class={{foo bar baz}} />
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C23) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}{{/let}}
-        <div class={{foo}} />
-        <div class={{foo bar baz}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <div class={{foo}} />
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let (concat foo) as |concat|}}
-          <div class={{concat}} />
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test element nodes shadowing attribute mustache invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          <Foo as |foo|>
-            <div class={{foo bar baz}} />
-          </Foo>`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C23) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        <Foo as |foo|></Foo>
-        <div class={{foo}} />
-        <div class={{foo bar baz}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        <Foo as |foo|>
-          <div class={{foo}} />
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        <Foo foo={{concat foo}} as |concat|>
-          <div class={{concat}} />
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test deeply nested attribute mustache invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <FooBar as |bar|>
-              {{#each items as |baz|}}
-                <div class={{foo bar baz}} />
-              {{/each}}
-            </FooBar>
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` helper because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L5:C27) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-            {{/each}}
-            <div class={{baz}} />
-            <div class={{baz bat}} />
-          </FooBar>
-          <div class={{bar}} />
-          <div class={{bar baz bat}} />
-        {{/let}}
-        <div class={{foo}} />
-        <div class={{foo bar baz bat}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      // Not invocations
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-              <div class={{foo}} />
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let (foo foo) as |foo|}}
-          <FooBar bar=(bar bar) as |bar|>
-            {{#each (baz baz) as |baz|}}
-              <div foo={{foo}} bar={{bar}} baz={{baz}} />
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test block statements shadowing mustache invocations`](assert) {
-      // These are fine, because they should already be considered contextual
-      // component invocations, not helper invocations
-      assert.expect(0);
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          {{foo}}
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          {{foo bar baz}}
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test element nodes shadowing mustache invocations`](assert) {
-      // These are fine, because they should already be considered contextual
-      // component invocations, not helper invocations
-      assert.expect(0);
-
-      compile(
-        `
-        <Foo as |foo|>
-          {{foo}}
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        <Foo as |foo|>
-          {{foo bar baz}}
-        </Foo>`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test deeply nested mustache invocations`](assert) {
-      // These are fine, because they should already be considered contextual
-      // component invocations, not helper invocations
-      assert.expect(0);
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-              {{foo}}
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-              {{foo bar baz}}
-            {{/each}}
-          </FooBar>
-        {{/let}}`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test block statements shadowing modifier invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <div {{foo}} />
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` modifier because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C17) `);
-
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <div {{foo bar baz}} />
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` modifier because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C17) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}{{/let}}
-        <div {{foo}} />
-        <div {{foo bar baz}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test element nodes shadowing modifier invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          <Foo as |foo|>
-            <div {{foo}} />
-          </Foo>`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` modifier because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C17) `);
-
-      expectAssertion(() => {
-        compile(
-          `
-          <Foo as |foo|>
-            <div {{foo bar baz}} />
-          </Foo>`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` modifier because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L3:C17) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        <Foo as |foo|></Foo>
-        <div {{foo}} />
-        <div {{foo bar baz}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-
-    [`@test deeply nested modifier invocations`]() {
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <FooBar as |bar|>
-              {{#each items as |baz|}}
-                <div {{foo}} />
-              {{/each}}
-            </FooBar>
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` modifier because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L5:C21) `);
-
-      expectAssertion(() => {
-        compile(
-          `
-          {{#let foo as |foo|}}
-            <FooBar as |bar|>
-              {{#each items as |baz|}}
-                <div {{foo bar baz}} />
-              {{/each}}
-            </FooBar>
-          {{/let}}`,
-          { moduleName: 'baz/foo-bar' }
-        );
-      }, `Cannot invoke the \`foo\` modifier because it was shadowed by a local variable (i.e. a block param) with the same name. Please rename the local variable to resolve the conflict. ('baz/foo-bar' @ L5:C21) `);
-
-      // Not shadowed
-
-      compile(
-        `
-        {{#let foo as |foo|}}
-          <FooBar as |bar|>
-            {{#each items as |baz|}}
-            {{/each}}
-            <div {{baz}} />
-            <div {{baz bat}} />
-          </FooBar>
-          <div {{bar}} />
-          <div {{bar baz bat}} />
-        {{/let}}
-        <div {{foo}} />
-        <div {{foo bar baz bat}} />`,
-        { moduleName: 'baz/foo-bar' }
-      );
-    }
-  }
-);
diff --git a/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js b/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js
index b693cec4030..c91857cb088 100644
--- a/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js
+++ b/packages/ember-template-compiler/tests/plugins/transform-component-invocation-test.js
@@ -1,4 +1,4 @@
-import { compile, precompile } from '../../index';
+import { compile } from '../../index';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -26,20 +26,5 @@ moduleFor(
         compile(layout, { moduleName: `example-${i}` });
       });
     }
-
-    '@test production compilation results in smaller template size'(assert) {
-      let layout = `{{this.modal open}}`;
-
-      let debugOutput = precompile(layout, { moduleName: `example.hbs` });
-      let prodOutput = precompile(layout, { isProduction: true, moduleName: `example.hbs` });
-
-      assert.notStrictEqual(
-        prodOutput,
-        debugOutput,
-        'expected output to differ between prod and non-prod'
-      );
-
-      assert.ok(prodOutput.length < debugOutput.length, 'prod output is smaller');
-    }
   }
 );
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index c49297f0b59..1ee2968adf8 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -1,7 +1,8 @@
 import {
   compile,
   compileOptions,
-  defaultPlugins,
+  RESOLUTION_MODE_TRANSFORMS,
+  STRICT_MODE_TRANSFORMS,
   registerPlugin,
   unregisterPlugin,
 } from '../../index';
@@ -14,13 +15,24 @@ moduleFor(
       assert.notEqual(compileOptions(), compileOptions());
     }
 
-    ['@test has default AST plugins'](assert) {
-      assert.expect(defaultPlugins.length);
+    ['@test has default AST plugins in resolution mode'](assert) {
+      assert.expect(RESOLUTION_MODE_TRANSFORMS.length);
 
       let plugins = compileOptions().plugins.ast;
 
-      for (let i = 0; i < defaultPlugins.length; i++) {
-        let plugin = defaultPlugins[i];
+      for (let i = 0; i < RESOLUTION_MODE_TRANSFORMS.length; i++) {
+        let plugin = RESOLUTION_MODE_TRANSFORMS[i];
+        assert.ok(plugins.indexOf(plugin) > -1, `includes ${plugin}`);
+      }
+    }
+
+    ['@test has default AST plugins in strict mode'](assert) {
+      assert.expect(STRICT_MODE_TRANSFORMS.length);
+
+      let plugins = compileOptions({ strictMode: true }).plugins.ast;
+
+      for (let i = 0; i < STRICT_MODE_TRANSFORMS.length; i++) {
+        let plugin = STRICT_MODE_TRANSFORMS[i];
         assert.ok(plugins.indexOf(plugin) > -1, `includes ${plugin}`);
       }
     }
diff --git a/yarn.lock b/yarn.lock
index 979ae5125af..306490c572f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.70.0.tgz#ded74455db50bf1a0b5ef36428ab619fcf88d32a"
-  integrity sha512-rSuLbqr128lwbNl8lPrfc6lJCPiCA36yGEQq9cqIydAjSolrcdxHploM01InA5f4Sh4rPxl+M22HnYU1irna0A==
-  dependencies:
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/syntax" "0.70.0"
-    "@glimmer/util" "0.70.0"
-    "@glimmer/wire-format" "0.70.0"
+"@glimmer/compiler@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.71.1.tgz#9404db2743102b23778d2d2f6a451fc1bb858e29"
+  integrity sha512-SnRjlAfOCeijHufJMuHQ2mtat5GX71NCOswVoHRkiL9BiU2qmUBwqyiUmSIw25XE9ub27ya3BpZNEkXalRyR1g==
+  dependencies:
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/syntax" "0.71.1"
+    "@glimmer/util" "0.71.1"
+    "@glimmer/wire-format" "0.71.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.70.0.tgz#767c5de933a0dc9d4a41199443d88e0adb2d1a9f"
-  integrity sha512-A2ndHW9bFkGz4JJNG9kgWw1qXXrCTiIeUawDp0eatnSvRSePn4gggtsOWRuqU+zdNXpWUSH8VyvmJGByEYrDYw==
+"@glimmer/destroyable@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.71.1.tgz#8dc70b3126abfae2a55d4d3d613e2eb1817241f0"
+  integrity sha512-IQkEYsP7Bn5ibkVfufTLZIqs/txKqMUxYY120m+TQC8/1ZxzQd7SW1UyUSYJ/wgk0j2FuUPqRc1nuyS1MrpbQQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.70.0"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/global-context" "0.71.1"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/util" "0.71.1"
 
-"@glimmer/encoder@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.70.0.tgz#156d01f5d41afdc63418891466da8cf5a7b4b420"
-  integrity sha512-iOjvfdJWCbnrQb9ymCgUcnzB/cDVY5mVXM0zqi89D/AI0jYWUQzqIOPd6UJiWZPJv5OfiD1yQP17+hnnoeQQsg==
+"@glimmer/encoder@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.71.1.tgz#b48ff5e6830ab5ac4d9f9b4a0dae18493701b6df"
+  integrity sha512-GacjjgpxmKFClTXdIJWYufXGifTww2fYoqj7nwLCJUauA3vw0QEtojaiRwqPoq4CFbqfCQ0TH9kPp3T2BVambQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/vm" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/vm" "0.71.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.70.0.tgz#1212b34a92955107458ffe03976175ed6a2f7a37"
-  integrity sha512-uszWyrUI8AntyfMJFQc41CbsbNV3byiz2sknvQh2XE9vDEI1tKmSPp8Gcvuq3xZwV1Ou0eE2ZwXAM9bGJniYsA==
+"@glimmer/global-context@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.71.1.tgz#95fd8716e0310bf23df3a5f922418f69fcf0b7a8"
+  integrity sha512-reIeczp/TvCPM9KaCXdQG+eGZwvQ/FuINe6yNNb1XtxFyAI9oPt6G5OYFd+2ZPpe4GDmoeI4d2hJedpV/4L9SQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.70.0.tgz#1a5782a12ebca787e55930db2ec310ffc23d5c9c"
-  integrity sha512-HT3Yv97f353LW2TuEJnBhyg5Ebt9Mbp0s7uedb5mOJQbUxhGG24yy0HjOHUV+HRI0yCQPZO/q7ojJgX3MAknQg==
+"@glimmer/interfaces@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.71.1.tgz#97f7d08fcae102724ab8a6db643ec5c2ac767383"
+  integrity sha512-7rQMdPUBvrqpr7V/0T+JScTCPL1cMUGswhNa9agdmWz7MKlj+5tVfcNF8l0Ur3ykqC+sYuTHhXCt6ij+T6dClQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.70.0.tgz#b086435edf2a88c2fb37d835afb970d896ed73e2"
-  integrity sha512-w8BEjOowKAg//pBrQppcPgX0uRD2E03QXcLH4nttznsqpQVt0TzqMf3ilNZkcKU5tAp2HjxY+RPGrTauZmiFhw==
+"@glimmer/low-level@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.71.1.tgz#ce557e61df88f5525a6da0aebfb3d6df780b449f"
+  integrity sha512-hnxHQEXXeu/seRHrGmwIdUfUyk/q+zLzgcYNw968qm87aOvo5gc4G4Hx9AZNV0vg7rnD4ZE/wo0zJid3igrTbA==
 
-"@glimmer/manager@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.70.0.tgz#b113974f54c74df55e700dac5dd205317c92b605"
-  integrity sha512-bJJVPXecCISaVi9cRS9DHRHO2Ly1UzPJQ8UjU7uuTamY5X/JCt4GTL9jXSRB0lV4NQCc80RIcDFam3NnlPkz+w==
+"@glimmer/manager@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.71.1.tgz#76f51efe8517de4506380b639add4bd1d2ec1900"
+  integrity sha512-0ggU6ao703VmXIgKmWTvY4XI+MUKmSsqE8TgkGH/30gy+GAfdk2EGreV+NlZMuJbSYL9QaG6BAiGv81OJ9gsHA==
   dependencies:
-    "@glimmer/destroyable" "0.70.0"
+    "@glimmer/destroyable" "0.71.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/reference" "0.70.0"
-    "@glimmer/util" "0.70.0"
-    "@glimmer/validator" "0.70.0"
-
-"@glimmer/node@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.70.0.tgz#8e7a879733e6d5e02148e10b5599b64c0261a8f2"
-  integrity sha512-2lV9WQJOGiq8bFAyKb52fsyt+iu7KMgShu5vnpKGQXZGR66Gsn5Re5tiy0YnIFYxklZCvkQeJDuDiYx+GhS2aw==
-  dependencies:
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/runtime" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/reference" "0.71.1"
+    "@glimmer/util" "0.71.1"
+    "@glimmer/validator" "0.71.1"
+
+"@glimmer/node@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.71.1.tgz#aad61512254a24e8737f36251d3f7b53a4e8d0cb"
+  integrity sha512-Ksb70sOgB+VBRz6sO3dcGx+awWtgP7W+qOyXonoMVUA5ZmRom0QSTPQnrdV46DFtzdv+QZXS3vHTmXhAwOzeLw==
+  dependencies:
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/runtime" "0.71.1"
+    "@glimmer/util" "0.71.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.70.0.tgz#532ce4c31b1cce1715259287c791ad087699d39f"
-  integrity sha512-cRtsR9aTl5+1ctzGoz8oMUufkmWjkZEuQWJJgJVmv7fJGK+63XcVjA2utySoQp3cm/c5g99hWzLdsHZyQPLAFQ==
+"@glimmer/opcode-compiler@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.71.1.tgz#b61a109b17f1ffb62cab3c7fad3513ebac3d76c8"
+  integrity sha512-xnNDdnklzud5FrQKctUq8W95amF+AX/3ZIyYxzmXF9V+iCncM6QDb97AcgERWGbIKcFpqvsg9fe0tjPgJyBwow==
   dependencies:
-    "@glimmer/encoder" "0.70.0"
+    "@glimmer/encoder" "0.71.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/reference" "0.70.0"
-    "@glimmer/util" "0.70.0"
-    "@glimmer/vm" "0.70.0"
-    "@glimmer/wire-format" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/reference" "0.71.1"
+    "@glimmer/util" "0.71.1"
+    "@glimmer/vm" "0.71.1"
+    "@glimmer/wire-format" "0.71.1"
 
-"@glimmer/owner@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.70.0.tgz#9746c91e1f5e552a099629a9552ea888e2de3d5f"
-  integrity sha512-i54xmibwBLg0zC5rN4EkXnCv3Ny7zGZzOlUmUyi15WxPkSy9V9d8ZsyO5ORhsg79KTHnhM/DKalWDjyBEwNPYA==
+"@glimmer/owner@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.71.1.tgz#6ad6a4a9c11002d71b8d4d9d630a28280c52ce7f"
+  integrity sha512-wBkK++p2UgZjV6tX5ECKddf7V2uU6i/gJfSPiKAwWe/anT37bhCa6+KJxF3mQaJIIHXSX5ue0JrOPIr4tTHc0Q==
   dependencies:
-    "@glimmer/util" "0.70.0"
+    "@glimmer/util" "0.71.1"
 
-"@glimmer/program@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.70.0.tgz#3282f5caa420487a13d5296c5c392da4227beb37"
-  integrity sha512-NkXKIiqX1oB6VV87GpiWJBbX2t58ra+oyABf2NrL67vui4rMC0VZWpwH7U6OzAMnW8kjjz9z02+ER9L9I5bduA==
+"@glimmer/program@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.71.1.tgz#2eca5b6d1d853a918db92d1635835c22d435736b"
+  integrity sha512-RQA0PwwkEFRWp48g3AQLg2vmgSu+88pwxX4uE+00qI7I6Rr3wu65S0W48EiVtSKYzT/FdGRGoXMUVlCcWW40Hw==
   dependencies:
-    "@glimmer/encoder" "0.70.0"
+    "@glimmer/encoder" "0.71.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/manager" "0.70.0"
-    "@glimmer/opcode-compiler" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/manager" "0.71.1"
+    "@glimmer/opcode-compiler" "0.71.1"
+    "@glimmer/util" "0.71.1"
 
-"@glimmer/reference@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.70.0.tgz#2031e8bf0c3281e7d457fc52b151b66449822cf6"
-  integrity sha512-GcyUw/KeIChdzj2z6zf3jFhl0J6gBhHd1wNbcCClR9a3ufQl6GJ7rtV2JFoc9AGEQMWytYfeFVrggerP39POFg==
+"@glimmer/reference@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.71.1.tgz#496ecacd3b80ff0c44b0b17c08a1285c32c40a52"
+  integrity sha512-9E15EgzG3ZK05Jg4w6lR0xSCKrEGcYyCKwE2Lf9/CanOpairH7gqRmwqWSaTSGVqxsm2CUSDs7u9xgJ+KF1Pww==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.70.0"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
-    "@glimmer/validator" "0.70.0"
+    "@glimmer/global-context" "0.71.1"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/util" "0.71.1"
+    "@glimmer/validator" "0.71.1"
 
-"@glimmer/runtime@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.70.0.tgz#254ce45f84a165c9c0b0fa6b571f401a730edc69"
-  integrity sha512-9Um3E82gsTE6ozcSqQ6BoVwEaGRya5zwuE9zMSDrN2GxYTIRhlG4Ox89s4wO5izcXWd3PmrFPCBQDsO0iz7NYQ==
+"@glimmer/runtime@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.71.1.tgz#9166965b1eda5632d9379b1ae2d475463d77c106"
+  integrity sha512-MDC+8K/Mg5t3eIhsmkP3FHKPFtxPWU6cJXpeFuZTbJge/+KxUCUJC+pA4Lfuyqo6U0whrOAczZbrHI6JFuNxnw==
   dependencies:
-    "@glimmer/destroyable" "0.70.0"
+    "@glimmer/destroyable" "0.71.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.70.0"
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/low-level" "0.70.0"
-    "@glimmer/owner" "0.70.0"
-    "@glimmer/program" "0.70.0"
-    "@glimmer/reference" "0.70.0"
-    "@glimmer/util" "0.70.0"
-    "@glimmer/validator" "0.70.0"
-    "@glimmer/vm" "0.70.0"
-    "@glimmer/wire-format" "0.70.0"
+    "@glimmer/global-context" "0.71.1"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/low-level" "0.71.1"
+    "@glimmer/owner" "0.71.1"
+    "@glimmer/program" "0.71.1"
+    "@glimmer/reference" "0.71.1"
+    "@glimmer/util" "0.71.1"
+    "@glimmer/validator" "0.71.1"
+    "@glimmer/vm" "0.71.1"
+    "@glimmer/wire-format" "0.71.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.70.0.tgz#3b10023b84a02af7bf0ba4f3308946a5a932e603"
-  integrity sha512-1SFC2hbSfeV2IUwS2tMFljYCdZCq/CC+hw1S2boHWHG7I4yq3NdSQeYytLDB5yOuWAFE4ZGc4XRRntWjDRgGuQ==
+"@glimmer/syntax@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.71.1.tgz#1ec478ca4d014669a5e82c8a15e88ab491d6024c"
+  integrity sha512-etDJPRS2IS4RwtyoFZGG7BRsMLfXZ/9YjjZOwRqeuLxmWhI5DoEqlCVSU1GiIljG0PPZwXZUeN38OTr4vag65Q==
   dependencies:
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/util" "0.71.1"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.70.0.tgz#55cac3330cecb19a12fae21de918f49fe46d9f8b"
-  integrity sha512-h16boov87CGlXgu9c2O2XBx4xDMu/fEAHJh3YGUnfyPB/Tqebf4K9wUVKl5yl8AzhBeRT0+n/+vvyQhcl8vEmg==
+"@glimmer/util@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.71.1.tgz#ea071269d5b32c3762890f2a3fd46f3259c68857"
+  integrity sha512-gYI8XmPqYO4FFn/MBcnIJ/EpcigpHfXN8F4YWB4VsqHRfZlM6bIsFx1LNrt5gXcStY2tbDnEN6LxJhSbnPf4RA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.70.0.tgz#21279efb0f07a9bd8493d2c03c168951da6af8ea"
-  integrity sha512-DcQwH3mjHMMqID9j7wKtRAeL1oVm+X1VAFE+RGQuRXzUxbLzYEPFDYE1XnXsbMG96KM+SJoF9yAuqzojprqNpw==
+"@glimmer/validator@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.71.1.tgz#fc7840aa266d39dd23b655f4eaaecaf59f8b3bec"
+  integrity sha512-Z6UcCoHeJTPmzFYpDn2W4+AlthPI+pffmjyaeVDVexieLhRodJNQu+8Wj6aCvEGezR4pHe3er9bdoDWH4HFKzA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.70.0"
+    "@glimmer/global-context" "0.71.1"
 
-"@glimmer/vm@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.70.0.tgz#344abe18e290c3b10f68013baf7b232ec3e4a0b7"
-  integrity sha512-c21anP1sBKExaLoIYPLn1BAJBjkXb9wrw9EaIjEzQLh6REn2aGbFiVmYjH0bP0i23n7ilc9fZTw/IyF0AqSjew==
+"@glimmer/vm@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.71.1.tgz#024f8471f300f26e75627bedb2a1dfb09f1e979f"
+  integrity sha512-3kBbyXi54x68xUgiFecBY6LwDYLnYx8jMWoq17hJGliIU+QMK2EVChwuCDxeOcG3Vqm4jI2H/kcWZIup58xnBQ==
   dependencies:
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/util" "0.71.1"
 
-"@glimmer/wire-format@0.70.0":
-  version "0.70.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.70.0.tgz#e261b9bb866cf32f355697968954424ff095ae3a"
-  integrity sha512-gRjq5cNHrilj/Bqb778+4LWhvOYyaI1UH6A0COgYBMXYiY1XHDKNPG26QZ/uc3OUtG8lTST2R1h071oScOf2Hw==
+"@glimmer/wire-format@0.71.1":
+  version "0.71.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.71.1.tgz#e9ab892b218873e206ddecafb0f6ad5548665f1c"
+  integrity sha512-BiugiphqQSz7l2/t7tfw8lX9pTG4y0qZk3w3ZCmghPF1J5iF5PSjx2LEeX2i5gkOt06gTCqKjAtMkO7GHnh8ag==
   dependencies:
-    "@glimmer/interfaces" "0.70.0"
-    "@glimmer/util" "0.70.0"
+    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/util" "0.71.1"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 574fcb41086f2b5be270bcb1b8afdba0019151a9 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 16 Dec 2020 20:14:49 -0800
Subject: [PATCH 0270/1405] [FEATURE dynamic-helper-and-modifier] Update VM for
 dynamic modifiers

Adds the ability to use dynamic modifiers, and the `modifier` keyword
(behind a feature flag).
---
 package.json                                  |  24 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |  17 +-
 .../-internals/glimmer/lib/syntax/mount.ts    |  15 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   |  21 +-
 .../components/strict-mode-test.js            |  14 +-
 .../custom-modifier-manager-test.js           |  28 +-
 yarn.lock                                     | 254 +++++++++---------
 7 files changed, 208 insertions(+), 165 deletions(-)

diff --git a/package.json b/package.json
index 3c01bbfdd19..da057585c89 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.71.1",
+    "@glimmer/compiler": "0.72.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.71.1",
-    "@glimmer/interfaces": "0.71.1",
-    "@glimmer/manager": "0.71.1",
-    "@glimmer/destroyable": "0.71.1",
-    "@glimmer/owner": "0.71.1",
-    "@glimmer/node": "0.71.1",
-    "@glimmer/opcode-compiler": "0.71.1",
-    "@glimmer/program": "0.71.1",
-    "@glimmer/reference": "0.71.1",
-    "@glimmer/runtime": "0.71.1",
-    "@glimmer/validator": "0.71.1",
+    "@glimmer/global-context": "0.72.0",
+    "@glimmer/interfaces": "0.72.0",
+    "@glimmer/manager": "0.72.0",
+    "@glimmer/destroyable": "0.72.0",
+    "@glimmer/owner": "0.72.0",
+    "@glimmer/node": "0.72.0",
+    "@glimmer/opcode-compiler": "0.72.0",
+    "@glimmer/program": "0.72.0",
+    "@glimmer/reference": "0.72.0",
+    "@glimmer/runtime": "0.72.0",
+    "@glimmer/validator": "0.72.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 67b65d84db3..0dff6d095da 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -8,6 +8,7 @@ import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
   CompileTimeCompilationContext,
+  CurriedType,
   Cursor,
   DebugRenderTree,
   DynamicScope as GlimmerDynamicScope,
@@ -24,7 +25,7 @@ import { artifacts } from '@glimmer/program';
 import { createConstRef, Reference, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
 import {
   clientBuilder,
-  CurriedComponentDefinition,
+  CurriedValue,
   curry,
   DOMChanges,
   DOMTreeConstruction,
@@ -352,17 +353,25 @@ export class Renderer {
 
   appendOutletView(view: OutletView, target: SimpleElement): void {
     let definition = createRootOutlet(view);
-    this._appendDefinition(view, curry(definition, view.owner, null), target);
+    this._appendDefinition(
+      view,
+      curry(CurriedType.Component, definition, view.owner, null, true),
+      target
+    );
   }
 
   appendTo(view: Component, target: SimpleElement): void {
     let definition = new RootComponentDefinition(view);
-    this._appendDefinition(view, curry(definition, this._owner, null), target);
+    this._appendDefinition(
+      view,
+      curry(CurriedType.Component, definition, this._owner, null, true),
+      target
+    );
   }
 
   _appendDefinition(
     root: OutletView | Component,
-    definition: CurriedComponentDefinition,
+    definition: CurriedValue,
     target: SimpleElement
   ): void {
     let self = createConstRef(definition, 'this');
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index fbb761295ce..86ef25421f5 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -4,14 +4,9 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Option, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, CurriedType, Option, VM, VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, Reference, valueForRef } from '@glimmer/reference';
-import {
-  createCapturedArgs,
-  CurriedComponentDefinition,
-  curry,
-  EMPTY_POSITIONAL,
-} from '@glimmer/runtime';
+import { createCapturedArgs, CurriedValue, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
 import { MountDefinition } from '../component-managers/mount';
 import { internalHelper } from '../helpers/internal-helper';
 
@@ -56,7 +51,7 @@ import { internalHelper } from '../helpers/internal-helper';
   @public
 */
 export const mountHelper = internalHelper(
-  (args: VMArguments, vm: VM): Reference<CurriedComponentDefinition | null> => {
+  (args: VMArguments, vm: VM): Reference<CurriedValue | null> => {
     let owner = vm.getOwner() as Owner;
     let nameRef = args.positional.at(0) as Reference<Option<string>>;
     let captured: Option<CapturedArguments> = null;
@@ -92,7 +87,7 @@ export const mountHelper = internalHelper(
       captured = createCapturedArgs(named, EMPTY_POSITIONAL);
     }
 
-    let lastName: Option<string>, lastDef: Option<CurriedComponentDefinition>;
+    let lastName: string | null, lastDef: CurriedValue | null;
 
     return createComputeRef(() => {
       let name = valueForRef(nameRef);
@@ -108,7 +103,7 @@ export const mountHelper = internalHelper(
         );
 
         lastName = name;
-        lastDef = curry(new MountDefinition(name), owner, captured);
+        lastDef = curry(CurriedType.Component, new MountDefinition(name), owner, captured, true);
 
         return lastDef;
       } else {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 3cc8d2c443f..3e09e025253 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,5 +1,5 @@
 import { DEBUG } from '@glimmer/env';
-import { Option, VM, VMArguments } from '@glimmer/interfaces';
+import { CurriedType, VM, VMArguments } from '@glimmer/interfaces';
 import {
   childRefFromParts,
   createComputeRef,
@@ -8,12 +8,7 @@ import {
   Reference,
   valueForRef,
 } from '@glimmer/reference';
-import {
-  createCapturedArgs,
-  CurriedComponentDefinition,
-  curry,
-  EMPTY_POSITIONAL,
-} from '@glimmer/runtime';
+import { createCapturedArgs, CurriedValue, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
 import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
 import { internalHelper } from '../helpers/internal-helper';
@@ -85,8 +80,8 @@ export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
     return outlets !== undefined ? outlets[valueForRef(nameRef)] : undefined;
   });
 
-  let lastState: Option<OutletDefinitionState> = null;
-  let definition: Option<CurriedComponentDefinition> = null;
+  let lastState: OutletDefinitionState | null = null;
+  let definition: CurriedValue | null = null;
 
   return createComputeRef(() => {
     let outletState = valueForRef(outletRef);
@@ -106,7 +101,13 @@ export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
         let owner = outletState?.render?.owner ?? vm.getOwner();
 
         let args = createCapturedArgs(named, EMPTY_POSITIONAL);
-        definition = curry(new OutletComponentDefinition(state), owner, args);
+        definition = curry(
+          CurriedType.Component,
+          new OutletComponentDefinition(state),
+          owner,
+          args,
+          true
+        );
       } else {
         definition = null;
       }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index df70247e557..f88b6eab1c7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -145,7 +145,7 @@ if (EMBER_STRICT_MODE) {
       '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
         let foo = defineSimpleHelper((value) => value);
         let Foo = defineComponent({}, '{{@value}}');
-        let Bar = defineComponent({ Foo, foo }, '<Foo @value={{foo "Hello, world!"}}/>');
+        let Bar = defineComponent({ Foo, foo }, '<Foo @value={{helper foo "Hello, world!"}}/>');
 
         this.registerComponent('bar', { ComponentClass: Bar });
 
@@ -153,6 +153,18 @@ if (EMBER_STRICT_MODE) {
         this.assertHTML('Hello, world!');
         this.assertStableRerender();
       }
+
+      '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic modifier'() {
+        let foo = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
+        let Foo = defineComponent({}, '<div {{@value}}></div>');
+        let Bar = defineComponent({ Foo, foo }, '<Foo @value={{modifier foo "Hello, world!"}}/>');
+
+        this.registerComponent('bar', { ComponentClass: Bar });
+
+        this.render('<Bar/>');
+        this.assertHTML('<div>Hello, world!</div>');
+        this.assertStableRerender();
+      }
     }
   );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 5589ba8a56b..9dac683ac4a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -1,6 +1,7 @@
 import { DEBUG } from '@glimmer/env';
-import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
+import { moduleFor, RenderingTestCase, runTask, defineSimpleModifier } from 'internal-test-helpers';
 
+import { Component } from '@ember/-internals/glimmer';
 import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { set, tracked } from '@ember/-internals/metal';
@@ -579,6 +580,31 @@ moduleFor(
       runTask(() => set(this.context, 'qux', 'quuuuxxxxxx'));
       assert.equal(updateCount, 1);
     }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can be curried'() {
+      let val = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
+
+      this.registerComponent('foo', {
+        template: '<div {{@value}}></div>',
+      });
+
+      this.registerComponent('bar', {
+        template: '<Foo @value={{modifier this.val "Hello, world!"}}/>',
+        ComponentClass: Component.extend({ val }),
+      });
+
+      this.render('<Bar/>');
+      this.assertText('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@feature(!EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Cannot be curried when flag is not enabled'() {
+      expectAssertion(() => {
+        this.registerComponent('bar', {
+          template: '<Foo @value={{modifier this.val "Hello, world!"}}/>',
+        });
+      }, /Cannot use the \(modifier\) keyword yet, as it has not been implemented/);
+    }
   }
 );
 
diff --git a/yarn.lock b/yarn.lock
index 306490c572f..ec4a3f52f97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.71.1.tgz#9404db2743102b23778d2d2f6a451fc1bb858e29"
-  integrity sha512-SnRjlAfOCeijHufJMuHQ2mtat5GX71NCOswVoHRkiL9BiU2qmUBwqyiUmSIw25XE9ub27ya3BpZNEkXalRyR1g==
-  dependencies:
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/syntax" "0.71.1"
-    "@glimmer/util" "0.71.1"
-    "@glimmer/wire-format" "0.71.1"
+"@glimmer/compiler@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.72.0.tgz#71a7d0983ca7193bfee487519d76e2c70e02841d"
+  integrity sha512-nm9yNFIzilzfKrrtgJpCJeLxBFL3Iyt+FvBgFfyhOKl1O43YXTLBOK/19QhLZriq0jQGARzIIhvhuUstZpXs5A==
+  dependencies:
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/syntax" "0.72.0"
+    "@glimmer/util" "0.72.0"
+    "@glimmer/wire-format" "0.72.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.71.1.tgz#8dc70b3126abfae2a55d4d3d613e2eb1817241f0"
-  integrity sha512-IQkEYsP7Bn5ibkVfufTLZIqs/txKqMUxYY120m+TQC8/1ZxzQd7SW1UyUSYJ/wgk0j2FuUPqRc1nuyS1MrpbQQ==
+"@glimmer/destroyable@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.72.0.tgz#68713e78294fd83f49ecaa39a7eb98e512c4e89e"
+  integrity sha512-Ku+plbghbGLT4cXqLAyG9GJiGRQ5QT+imGdnafqDY5GhWYu8d1lv/oTcSsZiYpMi0G+TG1bZmH3HgZqW4juBTA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.71.1"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/util" "0.71.1"
+    "@glimmer/global-context" "0.72.0"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
 
-"@glimmer/encoder@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.71.1.tgz#b48ff5e6830ab5ac4d9f9b4a0dae18493701b6df"
-  integrity sha512-GacjjgpxmKFClTXdIJWYufXGifTww2fYoqj7nwLCJUauA3vw0QEtojaiRwqPoq4CFbqfCQ0TH9kPp3T2BVambQ==
+"@glimmer/encoder@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.72.0.tgz#76b3c243bffefdd0f2ec0938cc28cfdff466dde2"
+  integrity sha512-Pi7unh9ZGGig7WZbOpARYgAxN7h1i8EB5DNLeDE46fAK+zxZ6Fh5JOqgiv6dMIP3VF1plJ0Xft1FTZJSVjfQ9w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/vm" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/vm" "0.72.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.71.1.tgz#95fd8716e0310bf23df3a5f922418f69fcf0b7a8"
-  integrity sha512-reIeczp/TvCPM9KaCXdQG+eGZwvQ/FuINe6yNNb1XtxFyAI9oPt6G5OYFd+2ZPpe4GDmoeI4d2hJedpV/4L9SQ==
+"@glimmer/global-context@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.72.0.tgz#258d10b3e8185e148ee7235fc00005a781b12317"
+  integrity sha512-OGKHFNLPYnWFr+B+seYpPGJDnXUlq7wBnFe/+ThGbe0gB411uKxAbrhdBFMx/lwjVY8U2xJzglomtGfGXHWj6A==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.71.1.tgz#97f7d08fcae102724ab8a6db643ec5c2ac767383"
-  integrity sha512-7rQMdPUBvrqpr7V/0T+JScTCPL1cMUGswhNa9agdmWz7MKlj+5tVfcNF8l0Ur3ykqC+sYuTHhXCt6ij+T6dClQ==
+"@glimmer/interfaces@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.72.0.tgz#34817afba6736f68974cfbd14825a88032d60a63"
+  integrity sha512-o5zLnfca4FogcO4wfmerLGHpmJHz5mfUUB7uxabnLHBI53ABu+Gfmeaaye24lgQI9NyaHY/eSJlz+GtRtvMnSg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.71.1.tgz#ce557e61df88f5525a6da0aebfb3d6df780b449f"
-  integrity sha512-hnxHQEXXeu/seRHrGmwIdUfUyk/q+zLzgcYNw968qm87aOvo5gc4G4Hx9AZNV0vg7rnD4ZE/wo0zJid3igrTbA==
+"@glimmer/low-level@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.72.0.tgz#77da0900f1e06b55a8a6ec230928c5fc3f561a89"
+  integrity sha512-453Cm/yZmh4HCWQJzTuNQDYdggnJcyJfH/T1OT21MqqjoL0qyGLYBuOoKav+B+Z6fd4EgRJLOL8ceLd0pcEnGQ==
 
-"@glimmer/manager@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.71.1.tgz#76f51efe8517de4506380b639add4bd1d2ec1900"
-  integrity sha512-0ggU6ao703VmXIgKmWTvY4XI+MUKmSsqE8TgkGH/30gy+GAfdk2EGreV+NlZMuJbSYL9QaG6BAiGv81OJ9gsHA==
+"@glimmer/manager@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.72.0.tgz#6629e59664c9c535f050327cb54d1bcf2c4376ec"
+  integrity sha512-X6AMzRHHWCRTrlbeuZk7+T81ItGrcp6rG9dPv9kp0/gt80m52Mf/pS+uQekS5ItMSzUpQ+LZnlXHHQHNuokKYQ==
   dependencies:
-    "@glimmer/destroyable" "0.71.1"
+    "@glimmer/destroyable" "0.72.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/reference" "0.71.1"
-    "@glimmer/util" "0.71.1"
-    "@glimmer/validator" "0.71.1"
-
-"@glimmer/node@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.71.1.tgz#aad61512254a24e8737f36251d3f7b53a4e8d0cb"
-  integrity sha512-Ksb70sOgB+VBRz6sO3dcGx+awWtgP7W+qOyXonoMVUA5ZmRom0QSTPQnrdV46DFtzdv+QZXS3vHTmXhAwOzeLw==
-  dependencies:
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/runtime" "0.71.1"
-    "@glimmer/util" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/reference" "0.72.0"
+    "@glimmer/util" "0.72.0"
+    "@glimmer/validator" "0.72.0"
+
+"@glimmer/node@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.72.0.tgz#1ae8f3b9cf7405cef111c9b49b2795fa1a899488"
+  integrity sha512-dl2ax+CWFelwQrqnRWzCbM/+9RBj0KcS+JtV52Pt3Gq3/kdbAont50e/YlGu0AE2vJvPvg2s9kVqlDQ5MTKQ8Q==
+  dependencies:
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/runtime" "0.72.0"
+    "@glimmer/util" "0.72.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.71.1.tgz#b61a109b17f1ffb62cab3c7fad3513ebac3d76c8"
-  integrity sha512-xnNDdnklzud5FrQKctUq8W95amF+AX/3ZIyYxzmXF9V+iCncM6QDb97AcgERWGbIKcFpqvsg9fe0tjPgJyBwow==
+"@glimmer/opcode-compiler@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.72.0.tgz#bce10a2bfc65da6aab4d50f7b14b3cce970bf09d"
+  integrity sha512-hUjNG1KzspeHigFRyagKQr512o8k8JHBED1sdpRAn5WPNzl8g73sJpFYofRJrobUaDnKq0u0onxlXAuSwSf96g==
   dependencies:
-    "@glimmer/encoder" "0.71.1"
+    "@glimmer/encoder" "0.72.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/reference" "0.71.1"
-    "@glimmer/util" "0.71.1"
-    "@glimmer/vm" "0.71.1"
-    "@glimmer/wire-format" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/reference" "0.72.0"
+    "@glimmer/util" "0.72.0"
+    "@glimmer/vm" "0.72.0"
+    "@glimmer/wire-format" "0.72.0"
 
-"@glimmer/owner@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.71.1.tgz#6ad6a4a9c11002d71b8d4d9d630a28280c52ce7f"
-  integrity sha512-wBkK++p2UgZjV6tX5ECKddf7V2uU6i/gJfSPiKAwWe/anT37bhCa6+KJxF3mQaJIIHXSX5ue0JrOPIr4tTHc0Q==
+"@glimmer/owner@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.72.0.tgz#87adc14fb576a3d0dbc6ead1d47d8cda30dff4bc"
+  integrity sha512-P2bB/0oE44PfgfVv/isPsKikVWbyzdfTtRxJKMqmtIDW0F1oZ5FaLJqT3P7TehfThSl45f3RyWcpQFTxiHOcbQ==
   dependencies:
-    "@glimmer/util" "0.71.1"
+    "@glimmer/util" "0.72.0"
 
-"@glimmer/program@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.71.1.tgz#2eca5b6d1d853a918db92d1635835c22d435736b"
-  integrity sha512-RQA0PwwkEFRWp48g3AQLg2vmgSu+88pwxX4uE+00qI7I6Rr3wu65S0W48EiVtSKYzT/FdGRGoXMUVlCcWW40Hw==
+"@glimmer/program@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.72.0.tgz#2b29943b7fc176a1ee2b39522b797ed8579dacd4"
+  integrity sha512-IGg0FXPNAGnGYWKpFjpYrRfRfHvK6DvxW/BZuNaPR4ZUqvlYnJ5YXlKKBJQ5v4AGwXOgqDwZ/SL+fNAcAKkTOw==
   dependencies:
-    "@glimmer/encoder" "0.71.1"
+    "@glimmer/encoder" "0.72.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/manager" "0.71.1"
-    "@glimmer/opcode-compiler" "0.71.1"
-    "@glimmer/util" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/manager" "0.72.0"
+    "@glimmer/opcode-compiler" "0.72.0"
+    "@glimmer/util" "0.72.0"
 
-"@glimmer/reference@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.71.1.tgz#496ecacd3b80ff0c44b0b17c08a1285c32c40a52"
-  integrity sha512-9E15EgzG3ZK05Jg4w6lR0xSCKrEGcYyCKwE2Lf9/CanOpairH7gqRmwqWSaTSGVqxsm2CUSDs7u9xgJ+KF1Pww==
+"@glimmer/reference@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.72.0.tgz#2b0e3fcd7385c663dcda3525e85b2eefd9b6f8a4"
+  integrity sha512-rae42xIBYM6F8ht0KDmiQ+ycOX32umQBRNaGgCrbe1i84w/hkuqzBFyp/pO47IxE0Ob5TXjU8BBxAWQZKVdiJQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.71.1"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/util" "0.71.1"
-    "@glimmer/validator" "0.71.1"
+    "@glimmer/global-context" "0.72.0"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
+    "@glimmer/validator" "0.72.0"
 
-"@glimmer/runtime@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.71.1.tgz#9166965b1eda5632d9379b1ae2d475463d77c106"
-  integrity sha512-MDC+8K/Mg5t3eIhsmkP3FHKPFtxPWU6cJXpeFuZTbJge/+KxUCUJC+pA4Lfuyqo6U0whrOAczZbrHI6JFuNxnw==
+"@glimmer/runtime@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.72.0.tgz#4df28a0472f45ab8ccf59560306a621cdd03dbdb"
+  integrity sha512-jsGuhKALuNQLUCBEdmBcLeDJPvSgNuQpukIYttt5cnvPNsLa5oInzUIoP4A9XZ9bYG0HqMiWBPOCyqjH2mFfPQ==
   dependencies:
-    "@glimmer/destroyable" "0.71.1"
+    "@glimmer/destroyable" "0.72.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.71.1"
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/low-level" "0.71.1"
-    "@glimmer/owner" "0.71.1"
-    "@glimmer/program" "0.71.1"
-    "@glimmer/reference" "0.71.1"
-    "@glimmer/util" "0.71.1"
-    "@glimmer/validator" "0.71.1"
-    "@glimmer/vm" "0.71.1"
-    "@glimmer/wire-format" "0.71.1"
+    "@glimmer/global-context" "0.72.0"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/low-level" "0.72.0"
+    "@glimmer/owner" "0.72.0"
+    "@glimmer/program" "0.72.0"
+    "@glimmer/reference" "0.72.0"
+    "@glimmer/util" "0.72.0"
+    "@glimmer/validator" "0.72.0"
+    "@glimmer/vm" "0.72.0"
+    "@glimmer/wire-format" "0.72.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.71.1.tgz#1ec478ca4d014669a5e82c8a15e88ab491d6024c"
-  integrity sha512-etDJPRS2IS4RwtyoFZGG7BRsMLfXZ/9YjjZOwRqeuLxmWhI5DoEqlCVSU1GiIljG0PPZwXZUeN38OTr4vag65Q==
+"@glimmer/syntax@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.72.0.tgz#a7c22b8d1d7fb2c307d0df3ad68f826905a81794"
+  integrity sha512-HOA+dsI+tsqEvTZDZZWdnsV9wjAfCoKzmkYnzWOM+5RXOU9muRfRVp0wdu1cYF7J50QKp7gCmHLxzdLG7XcpDg==
   dependencies:
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/util" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.71.1.tgz#ea071269d5b32c3762890f2a3fd46f3259c68857"
-  integrity sha512-gYI8XmPqYO4FFn/MBcnIJ/EpcigpHfXN8F4YWB4VsqHRfZlM6bIsFx1LNrt5gXcStY2tbDnEN6LxJhSbnPf4RA==
+"@glimmer/util@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.72.0.tgz#77fdce5c14649651117d5e795b2870c48158b2c9"
+  integrity sha512-OlVmdMaV1o7UxWqhmuGXOlgpXgtynwp3zD5ypdWuf6IzNDeFf2OAsHaZY+GYqE+uDjx1u6xb+Q9xTXk7U7Bhow==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.71.1.tgz#fc7840aa266d39dd23b655f4eaaecaf59f8b3bec"
-  integrity sha512-Z6UcCoHeJTPmzFYpDn2W4+AlthPI+pffmjyaeVDVexieLhRodJNQu+8Wj6aCvEGezR4pHe3er9bdoDWH4HFKzA==
+"@glimmer/validator@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.72.0.tgz#1c2f4b0702c82584f9ea1f5675b4aa00bb0464c7"
+  integrity sha512-Je1zk5iJjStjV3acgQ3Fl2lVnLyhvh+0eyJ/8+FIHp3M3IyR32D/yShYCHMIQhTppXuSV9WZwxif3KsrGxlPqA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.71.1"
+    "@glimmer/global-context" "0.72.0"
 
-"@glimmer/vm@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.71.1.tgz#024f8471f300f26e75627bedb2a1dfb09f1e979f"
-  integrity sha512-3kBbyXi54x68xUgiFecBY6LwDYLnYx8jMWoq17hJGliIU+QMK2EVChwuCDxeOcG3Vqm4jI2H/kcWZIup58xnBQ==
+"@glimmer/vm@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.72.0.tgz#132d94fc5bd663e066419a0895412561847fdfd8"
+  integrity sha512-gaMcw0uQUwEzIl9vPKLkbtu+icuT1zQcsavCmjHiV1yWqM8Hv8JZqqEvErwrsxQUFEBvJ76CUG/lDDUgd3+B8w==
   dependencies:
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/util" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
 
-"@glimmer/wire-format@0.71.1":
-  version "0.71.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.71.1.tgz#e9ab892b218873e206ddecafb0f6ad5548665f1c"
-  integrity sha512-BiugiphqQSz7l2/t7tfw8lX9pTG4y0qZk3w3ZCmghPF1J5iF5PSjx2LEeX2i5gkOt06gTCqKjAtMkO7GHnh8ag==
+"@glimmer/wire-format@0.72.0":
+  version "0.72.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.72.0.tgz#cde189a6a7813dd378033b3e967b1cb73b0edee5"
+  integrity sha512-15WjtP9sxMh6R4eujxf1JtZGrHpgIym1aD7XrgEt+048K2en5vOdjsHV5R3zxhhbu9tXxCVwZuVJMGfits8n3Q==
   dependencies:
-    "@glimmer/interfaces" "0.71.1"
-    "@glimmer/util" "0.71.1"
+    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/util" "0.72.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 5725182b88fcb0011f0ae3b64e0d7be1e73cdc24 Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Thu, 17 Dec 2020 19:38:37 -0500
Subject: [PATCH 0271/1405] add input action example using the {{on}} modifier
 with information on casing convention

---
 .../-internals/glimmer/lib/components/input.ts       | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index bd0e4da0393..1d3ff0b5056 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -57,6 +57,18 @@ import InternalComponent from './internal';
   <Input @value={{this.searchWord}} @enter={{this.query}} />
   ```
 
+  Starting with Ember Octane, we recommend using the {{on}} modifier to call actions 
+  on specific events, such as the input event.
+
+  <label for="input-name">Name:</label>
+  <Input
+    @id="input-name"
+    @value={{this.name}}
+    {{on "input" this.validateName}}
+  />
+
+  The event name (e.g. "focusout", "input", "keydown") always follows the casing that the HTML standard uses.
+
   ### `<input>` HTML Attributes to Avoid
 
   In most cases, if you want to pass an attribute to the underlying HTML `<input>` element, you

From ecce98931314bed6af08369eca7edaa75b764cb3 Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Thu, 17 Dec 2020 20:35:43 -0500
Subject: [PATCH 0272/1405] yarn install/yarn build/yarn test, fixing issue
 19201

---
 packages/@ember/-internals/glimmer/lib/components/input.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 1d3ff0b5056..6d3ffcd4109 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -67,7 +67,8 @@ import InternalComponent from './internal';
     {{on "input" this.validateName}}
   />
 
-  The event name (e.g. "focusout", "input", "keydown") always follows the casing that the HTML standard uses.
+  The event name (e.g. "focusout", "input", "keydown") always follows the casing 
+  that the HTML standard uses.
 
   ### `<input>` HTML Attributes to Avoid
 

From 186703a5860f2e30c2794656cffaee5a3573d65c Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Thu, 17 Dec 2020 22:20:09 -0500
Subject: [PATCH 0273/1405] wrap input example in triple backticks to tender
 code block

---
 packages/@ember/-internals/glimmer/lib/components/input.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 6d3ffcd4109..510c5c265f8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -60,12 +60,14 @@ import InternalComponent from './internal';
   Starting with Ember Octane, we recommend using the {{on}} modifier to call actions 
   on specific events, such as the input event.
 
+  ```
   <label for="input-name">Name:</label>
   <Input
     @id="input-name"
     @value={{this.name}}
     {{on "input" this.validateName}}
   />
+  ```
 
   The event name (e.g. "focusout", "input", "keydown") always follows the casing 
   that the HTML standard uses.

From e9bf71b485f01eb6da26a66b7d06fa362261de76 Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Thu, 17 Dec 2020 22:26:00 -0500
Subject: [PATCH 0274/1405] delete trailing whitespace in input.ts lines 60 and
 72

---
 packages/@ember/-internals/glimmer/lib/components/input.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 510c5c265f8..d7d3140ec77 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -57,7 +57,7 @@ import InternalComponent from './internal';
   <Input @value={{this.searchWord}} @enter={{this.query}} />
   ```
 
-  Starting with Ember Octane, we recommend using the {{on}} modifier to call actions 
+  Starting with Ember Octane, we recommend using the {{on}} modifier to call actions
   on specific events, such as the input event.
 
   ```
@@ -69,7 +69,7 @@ import InternalComponent from './internal';
   />
   ```
 
-  The event name (e.g. "focusout", "input", "keydown") always follows the casing 
+  The event name (e.g. "focusout", "input", "keydown") always follows the casing
   that the HTML standard uses.
 
   ### `<input>` HTML Attributes to Avoid

From 6458381303c02af4e89b4369e8277ff7c201640c Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Fri, 18 Dec 2020 08:23:32 -0500
Subject: [PATCH 0275/1405] Update
 packages/@ember/-internals/glimmer/lib/components/input.ts

add handlebars commit suggestion

Co-authored-by: Ricardo Mendes <rokusu@gmail.com>
---
 packages/@ember/-internals/glimmer/lib/components/input.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index d7d3140ec77..abff5446311 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -60,7 +60,7 @@ import InternalComponent from './internal';
   Starting with Ember Octane, we recommend using the {{on}} modifier to call actions
   on specific events, such as the input event.
 
-  ```
+  ```handlebars
   <label for="input-name">Name:</label>
   <Input
     @id="input-name"

From 5169e5c74d5c9868becd44a8d64ef9e1fe8e425f Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Fri, 18 Dec 2020 08:25:30 -0500
Subject: [PATCH 0276/1405] Update
 packages/@ember/-internals/glimmer/lib/components/input.ts

add backticks around {{on}} modifier to make it render like code

Co-authored-by: Ricardo Mendes <rokusu@gmail.com>
---
 packages/@ember/-internals/glimmer/lib/components/input.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index abff5446311..f397f623a83 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -57,7 +57,7 @@ import InternalComponent from './internal';
   <Input @value={{this.searchWord}} @enter={{this.query}} />
   ```
 
-  Starting with Ember Octane, we recommend using the {{on}} modifier to call actions
+  Starting with Ember Octane, we recommend using the `{{on}}` modifier to call actions
   on specific events, such as the input event.
 
   ```handlebars

From f38ddd98e6435bb1d615ff30e5a089ab231473c0 Mon Sep 17 00:00:00 2001
From: Brennan Romance <brennan.romance@gmail.com>
Date: Fri, 18 Dec 2020 08:29:31 -0500
Subject: [PATCH 0277/1405] Update
 packages/@ember/-internals/glimmer/lib/components/input.ts

add backticks around other input actions so they render like code

Co-authored-by: Ricardo Mendes <rokusu@gmail.com>
---
 packages/@ember/-internals/glimmer/lib/components/input.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index f397f623a83..eb3141cd4d8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -69,7 +69,7 @@ import InternalComponent from './internal';
   />
   ```
 
-  The event name (e.g. "focusout", "input", "keydown") always follows the casing
+  The event name (e.g. `focusout`, `input`, `keydown`) always follows the casing
   that the HTML standard uses.
 
   ### `<input>` HTML Attributes to Avoid

From d0673c4af1fa52f23b58448f232e7a25f3974c12 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:04:35 +0000
Subject: [PATCH 0278/1405] enable tryInvoke deprecation

---
 packages/@ember/-internals/utils/lib/invoke.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/utils/lib/invoke.ts b/packages/@ember/-internals/utils/lib/invoke.ts
index 16a5e458cb9..2581527280a 100644
--- a/packages/@ember/-internals/utils/lib/invoke.ts
+++ b/packages/@ember/-internals/utils/lib/invoke.ts
@@ -63,7 +63,7 @@ export function tryInvoke(
       until: '4.0.0',
       for: 'ember-source',
       since: {
-        available: '3.24.0',
+        enabled: '3.24.0',
       },
       url: 'https://deprecations.emberjs.com/v3.x#toc_ember-utils-try-invoke',
     }

From 056aef1abf19f7c20db0c6eaeb173b8585259d99 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:05:11 +0000
Subject: [PATCH 0279/1405] enable Ember.String prototype extension deprecation

---
 packages/@ember/string/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 6edcc044445..98ddb8c5a4b 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -305,7 +305,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
         id: 'ember-string.prototype-extensions',
         for: 'ember-source',
         since: {
-          available: '3.24',
+          enabled: '3.24',
         },
         until: '4.0.0',
         url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-prototype_extensions',

From 047ae62ae79963962a5f80a6d0f581bfdd18defe Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:05:22 +0000
Subject: [PATCH 0280/1405] enable Ember.String.loc deprecation

---
 packages/@ember/string/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 98ddb8c5a4b..c2cedcdd6be 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -122,7 +122,7 @@ export function loc(str: string, formats: any[]): string {
       for: 'ember-source',
       url: 'https://deprecations.emberjs.com/v3.x#toc_ember-string-loc',
       since: {
-        available: '3.24',
+        enabled: '3.24',
       },
     }
   );

From 4984045459bc9f5f34f1ae8b51fc6522fb72cbf4 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:05:44 +0000
Subject: [PATCH 0281/1405] enable deprecate without for deprecation

---
 packages/@ember/debug/lib/deprecate.ts   |  4 ++--
 packages/@ember/debug/tests/main_test.js | 28 ++++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 0b351c2ac6a..d9f99a69b52 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -213,7 +213,7 @@ if (DEBUG) {
         until: '4.0.0',
         for: 'ember-source',
         since: {
-          available: '3.24.0',
+          enabled: '3.24.0',
         },
       });
     }
@@ -226,7 +226,7 @@ if (DEBUG) {
         until: '4.0.0',
         for: 'ember-source',
         since: {
-          available: '3.24.0',
+          enabled: '3.24.0',
         },
       });
     }
diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 42213281502..6123941223c 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -65,7 +65,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         });
         assert.ok(true, 'deprecate did not throw');
       } catch (e) {
@@ -86,7 +86,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         });
         assert.ok(true, 'deprecate did not throw');
       } catch (e) {
@@ -100,7 +100,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         });
       }, /Should throw/);
     }
@@ -122,7 +122,7 @@ moduleFor(
           id: 'my-deprecation',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         });
         assert.ok(true, 'Did not throw when level is set by id');
       } catch (e) {
@@ -134,7 +134,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         });
       }, /Should throw with no matching id/);
 
@@ -143,7 +143,7 @@ moduleFor(
           id: 'other-id',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         });
       }, /Should throw with non-matching id/);
     }
@@ -156,7 +156,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         })
       );
       assert.throws(() =>
@@ -164,7 +164,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         })
       );
       assert.throws(() =>
@@ -172,7 +172,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { available: '1.0.0' },
+          since: { enabled: '1.0.0' },
         })
       );
     }
@@ -185,7 +185,7 @@ moduleFor(
         function () {
           assert.ok(false, 'this function should not be invoked');
         },
-        { id: 'test', until: 'forever', for: 'me', since: { available: '1.0.0' } }
+        { id: 'test', until: 'forever', for: 'me', since: { enabled: '1.0.0' } }
       );
 
       assert.ok(true, 'deprecations were not thrown');
@@ -198,19 +198,19 @@ moduleFor(
         id: 'test',
         until: 'forever',
         for: 'me',
-        since: { available: '1.0.0' },
+        since: { enabled: '1.0.0' },
       });
       deprecate('Deprecation is thrown', '1', {
         id: 'test',
         until: 'forever',
         for: 'me',
-        since: { available: '1.0.0' },
+        since: { enabled: '1.0.0' },
       });
       deprecate('Deprecation is thrown', 1, {
         id: 'test',
         until: 'forever',
         for: 'me',
-        since: { available: '1.0.0' },
+        since: { enabled: '1.0.0' },
       });
 
       assert.ok(true, 'deprecations were not thrown');
@@ -312,7 +312,7 @@ moduleFor(
 
       assert.throws(
         () =>
-          deprecate('foo', false, { until: 'forever', for: 'me', since: { available: '1.0.0' } }),
+          deprecate('foo', false, { until: 'forever', for: 'me', since: { enabled: '1.0.0' } }),
         new RegExp(missingOptionsIdDeprecation),
         'proper assertion is triggered when options.id is missing'
       );

From b6ffd7ca91f66cb99cd038ddcfdfec73150ac233 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:11:20 +0000
Subject: [PATCH 0282/1405] enable deprecation

---
 packages/@ember/-internals/routing/lib/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index ccdb2dd197f..225f8ddf86c 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -252,7 +252,7 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
       id: 'routing.transition-methods',
       for: 'ember-source',
       since: {
-        available: '3.24.0',
+        enabled: '3.24.0',
       },
       until: '4.0.0',
       url: 'https://deprecations.emberjs.com/v3.x/#toc_routing-transition-methods',

From 49d4a4bb396ac9ef3c7ecd8a597a468c12f17322 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:11:36 +0000
Subject: [PATCH 0283/1405] update deprecation target to 3.25

---
 packages/@ember/-internals/routing/lib/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 225f8ddf86c..f216f60b9e5 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -252,7 +252,7 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
       id: 'routing.transition-methods',
       for: 'ember-source',
       since: {
-        enabled: '3.24.0',
+        enabled: '3.25.0',
       },
       until: '4.0.0',
       url: 'https://deprecations.emberjs.com/v3.x/#toc_routing-transition-methods',

From 7cfa6a2541ecdaa4775434f337e0742110b05f65 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 18 Dec 2020 21:16:21 +0000
Subject: [PATCH 0284/1405] reformat debug main_test.js

---
 packages/@ember/debug/tests/main_test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 6123941223c..3089cb8f6a7 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -311,8 +311,7 @@ moduleFor(
       assert.expect(1);
 
       assert.throws(
-        () =>
-          deprecate('foo', false, { until: 'forever', for: 'me', since: { enabled: '1.0.0' } }),
+        () => deprecate('foo', false, { until: 'forever', for: 'me', since: { enabled: '1.0.0' } }),
         new RegExp(missingOptionsIdDeprecation),
         'proper assertion is triggered when options.id is missing'
       );

From 2b20b053c07546da5096a948f18da7919d9d4537 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 18 Dec 2020 15:06:07 -0800
Subject: [PATCH 0285/1405] Updates the VM in order to upstream built-ins

Updates to to the latest VM version, and upstreams various built-in
keywords and modifiers. The majority of tests have been kept, but tests
which tested assertions have been removed as equivalent tests exist in
Glimmer VM now, and they introduce extra overhead without increasing
test coverage.
---
 package.json                                  |  24 +-
 packages/@ember/-internals/glimmer/index.ts   |   7 -
 .../-internals/glimmer/lib/environment.ts     |   5 +-
 .../-internals/glimmer/lib/helpers/array.ts   |  13 -
 .../-internals/glimmer/lib/helpers/concat.ts  |  25 --
 .../-internals/glimmer/lib/helpers/fn.ts      |  50 ---
 .../-internals/glimmer/lib/helpers/get.ts     |  50 ---
 .../-internals/glimmer/lib/helpers/hash.ts    |  12 -
 .../glimmer/lib/helpers/if-unless.ts          |  50 ---
 .../-internals/glimmer/lib/helpers/log.ts     |  14 -
 .../-internals/glimmer/lib/modifiers/on.ts    | 288 ------------------
 .../@ember/-internals/glimmer/lib/resolver.ts |  22 +-
 .../glimmer/lib/utils/untouchable-this.ts     |  39 ---
 .../components/strict-mode-test.js            |  13 +-
 .../integration/helpers/custom-helper-test.js |   6 +-
 .../tests/integration/helpers/fn-test.js      |  52 ----
 .../integration/helpers/if-unless-test.js     |  42 ---
 .../tests/integration/modifiers/on-test.js    | 107 +------
 packages/@ember/-internals/metal/index.ts     |   2 +-
 .../-internals/metal/lib/property_set.ts      |   8 +-
 .../assert-if-helper-without-arguments.ts     |  66 ----
 .../lib/plugins/index.ts                      |   2 -
 ...assert-if-helper-without-arguments-test.js |  51 ----
 packages/ember/index.js                       |  18 +-
 yarn.lock                                     | 254 +++++++--------
 25 files changed, 171 insertions(+), 1049 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/utils/untouchable-this.ts
 delete mode 100644 packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts
 delete mode 100644 packages/ember-template-compiler/tests/plugins/assert-if-helper-without-arguments-test.js

diff --git a/package.json b/package.json
index da057585c89..12af37b4494 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.72.0",
+    "@glimmer/compiler": "0.73.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.72.0",
-    "@glimmer/interfaces": "0.72.0",
-    "@glimmer/manager": "0.72.0",
-    "@glimmer/destroyable": "0.72.0",
-    "@glimmer/owner": "0.72.0",
-    "@glimmer/node": "0.72.0",
-    "@glimmer/opcode-compiler": "0.72.0",
-    "@glimmer/program": "0.72.0",
-    "@glimmer/reference": "0.72.0",
-    "@glimmer/runtime": "0.72.0",
-    "@glimmer/validator": "0.72.0",
+    "@glimmer/global-context": "0.73.0",
+    "@glimmer/interfaces": "0.73.0",
+    "@glimmer/manager": "0.73.0",
+    "@glimmer/destroyable": "0.73.0",
+    "@glimmer/owner": "0.73.0",
+    "@glimmer/node": "0.73.0",
+    "@glimmer/opcode-compiler": "0.73.0",
+    "@glimmer/program": "0.73.0",
+    "@glimmer/reference": "0.73.0",
+    "@glimmer/runtime": "0.73.0",
+    "@glimmer/validator": "0.73.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index e0dc4e836ae..6361a67283d 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -382,13 +382,6 @@ export {
 export { setupEngineRegistry, setupApplicationRegistry } from './lib/setup-registry';
 export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/dom';
 
-export { default as array } from './lib/helpers/array';
-export { default as hash } from './lib/helpers/hash';
-export { default as concat } from './lib/helpers/concat';
-export { default as get } from './lib/helpers/get';
-export { default as fn } from './lib/helpers/fn';
-export { default as on } from './lib/modifiers/on';
-
 // needed for test
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 506ccca2eec..bd47e5f7929 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import { _getProp, get, set } from '@ember/-internals/metal';
+import { _getProp, _setProp, get, set } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
@@ -26,8 +26,9 @@ setGlobalContext({
   toIterator,
 
   getProp: _getProp,
-  setProp: set,
+  setProp: _setProp,
   getPath: get,
+  setPath: set,
 
   scheduleDestroy(destroyable, destructor) {
     schedule('actions', null, destructor, destroyable);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index 1805777fb7d..6d8816ddc15 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -1,8 +1,3 @@
-import { VMArguments } from '@glimmer/interfaces';
-import { createComputeRef, Reference } from '@glimmer/reference';
-import { reifyPositional } from '@glimmer/runtime';
-import { internalHelper } from './internal-helper';
-
 /**
 @module ember
 */
@@ -42,11 +37,3 @@ import { internalHelper } from './internal-helper';
    @since 3.8.0
    @public
  */
-
-export default internalHelper(
-  (args: VMArguments): Reference<unknown[]> => {
-    let captured = args.positional.capture();
-
-    return createComputeRef(() => reifyPositional(captured), null, 'array');
-  }
-);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index 7af9ef8b5c3..bcf81909712 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -1,19 +1,3 @@
-import { VMArguments } from '@glimmer/interfaces';
-import { createComputeRef } from '@glimmer/reference';
-import { reifyPositional } from '@glimmer/runtime';
-import { internalHelper } from './internal-helper';
-
-const isEmpty = (value: unknown): boolean => {
-  return value === null || value === undefined || typeof (value as object).toString !== 'function';
-};
-
-const normalizeTextValue = (value: unknown): string => {
-  if (isEmpty(value)) {
-    return '';
-  }
-  return String(value);
-};
-
 /**
 @module ember
 */
@@ -40,12 +24,3 @@ const normalizeTextValue = (value: unknown): string => {
   @for Ember.Templates.helpers
   @since 1.13.0
 */
-export default internalHelper((args: VMArguments) => {
-  let captured = args.positional.capture();
-
-  return createComputeRef(
-    () => reifyPositional(captured).map(normalizeTextValue).join(''),
-    null,
-    'concat'
-  );
-});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 46a67a70f94..8723cfa91c3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -1,19 +1,3 @@
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import { VMArguments } from '@glimmer/interfaces';
-import {
-  createComputeRef,
-  isInvokableRef,
-  Reference,
-  updateRef,
-  valueForRef,
-} from '@glimmer/reference';
-import { reifyPositional } from '@glimmer/runtime';
-import buildUntouchableThis from '../utils/untouchable-this';
-import { internalHelper } from './internal-helper';
-
-const context = buildUntouchableThis('`fn` helper');
-
 /**
 @module ember
 */
@@ -85,37 +69,3 @@ const context = buildUntouchableThis('`fn` helper');
   @public
   @since 3.11.0
 */
-export default internalHelper((args: VMArguments) => {
-  let positional = args.positional.capture();
-  let callbackRef = positional[0];
-
-  if (DEBUG) assertCallbackIsFn(callbackRef);
-
-  return createComputeRef(
-    () => {
-      return (...invocationArgs: unknown[]) => {
-        let [fn, ...args] = reifyPositional(positional);
-
-        if (DEBUG) assertCallbackIsFn(callbackRef);
-
-        if (isInvokableRef(callbackRef)) {
-          let value = args.length > 0 ? args[0] : invocationArgs[0];
-          return updateRef(callbackRef, value);
-        } else {
-          return (fn as Function).call(context, ...args, ...invocationArgs);
-        }
-      };
-    },
-    null,
-    'fn'
-  );
-});
-
-function assertCallbackIsFn(callbackRef: Reference) {
-  assert(
-    `You must pass a function as the \`fn\` helpers first argument, you passed ${
-      callbackRef ? valueForRef(callbackRef) : callbackRef
-    }. While rendering:\n\n${callbackRef?.debugLabel}`,
-    callbackRef && (isInvokableRef(callbackRef) || typeof valueForRef(callbackRef) === 'function')
-  );
-}
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 26131c7cfd3..b91fa69dd26 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -1,16 +1,3 @@
-import { get, set } from '@ember/-internals/metal';
-import { isObject } from '@ember/-internals/utils';
-import { VMArguments } from '@glimmer/interfaces';
-import {
-  childRefFor,
-  childRefFromParts,
-  createComputeRef,
-  isConstRef,
-  NULL_REFERENCE,
-  valueForRef,
-} from '@glimmer/reference';
-import { internalHelper } from './internal-helper';
-
 /**
 @module ember
 */
@@ -95,40 +82,3 @@ import { internalHelper } from './internal-helper';
   @for Ember.Templates.helpers
   @since 2.1.0
  */
-export default internalHelper((args: VMArguments) => {
-  let sourceRef = args.positional.at(0);
-  let pathRef = args.positional.at(1);
-
-  if (isConstRef(pathRef)) {
-    // Since the path is constant, we can create a normal chain of property
-    // references. The source reference will update like normal, and all of the
-    // child references will update accordingly.
-    let path = valueForRef(pathRef);
-
-    if (path === undefined || path === null || path === '') {
-      return NULL_REFERENCE;
-    } else if (typeof path === 'string' && path.indexOf('.') > -1) {
-      return childRefFromParts(sourceRef, path.split('.'));
-    } else {
-      return childRefFor(sourceRef, String(path));
-    }
-  } else {
-    return createComputeRef(
-      () => {
-        let source = valueForRef(sourceRef);
-
-        if (isObject(source)) {
-          return get(source, String(valueForRef(pathRef)));
-        }
-      },
-      (value) => {
-        let source = valueForRef(sourceRef);
-
-        if (isObject(source)) {
-          return set(source, String(valueForRef(pathRef)), value);
-        }
-      },
-      'get'
-    );
-  }
-});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
index 2de7eecc059..b4872d84f49 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
@@ -1,8 +1,3 @@
-import { Dict, VMArguments } from '@glimmer/interfaces';
-import { createComputeRef, Reference } from '@glimmer/reference';
-import { reifyNamed } from '@glimmer/runtime';
-import { internalHelper } from './internal-helper';
-
 /**
 @module ember
 */
@@ -45,10 +40,3 @@ import { internalHelper } from './internal-helper';
    @since 2.3.0
    @public
  */
-export default internalHelper(
-  (args: VMArguments): Reference<Dict<unknown>> => {
-    let positional = args.named.capture();
-
-    return createComputeRef(() => reifyNamed(positional), null, 'hash');
-  }
-);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
index 47ac572ffc9..59e3532903f 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/if-unless.ts
@@ -2,12 +2,6 @@
 @module ember
 */
 
-import { assert } from '@ember/debug';
-import { toBool } from '@glimmer/global-context';
-import { VMArguments } from '@glimmer/interfaces';
-import { createComputeRef, valueForRef } from '@glimmer/reference';
-import { internalHelper } from './internal-helper';
-
 /**
   The `if` helper allows you to conditionally render one of two branches,
   depending on the "truthiness" of a property.
@@ -99,28 +93,6 @@ import { internalHelper } from './internal-helper';
   @for Ember.Templates.helpers
   @public
 */
-export const inlineIf = internalHelper((args: VMArguments) => {
-  let positional = args.positional.capture();
-
-  return createComputeRef(
-    () => {
-      assert(
-        'The inline form of the `if` helper expects two or three arguments, e.g. `{{if trialExpired "Expired" expiryDate}}`.',
-        positional.length === 3 || positional.length === 2
-      );
-
-      let [condition, truthyValue, falsyValue] = positional;
-
-      if (toBool(valueForRef(condition)) === true) {
-        return valueForRef(truthyValue);
-      } else {
-        return falsyValue !== undefined ? valueForRef(falsyValue) : undefined;
-      }
-    },
-    null,
-    'if'
-  );
-});
 
 /**
   The `unless` helper is the inverse of the `if` helper. It displays if a value
@@ -207,25 +179,3 @@ export const inlineIf = internalHelper((args: VMArguments) => {
   @for Ember.Templates.helpers
   @public
 */
-export const inlineUnless = internalHelper((args: VMArguments) => {
-  let positional = args.positional.capture();
-
-  return createComputeRef(
-    () => {
-      assert(
-        'The inline form of the `unless` helper expects two or three arguments, e.g. `{{unless isFirstLogin "Welcome back!"}}`.',
-        positional.length === 3 || positional.length === 2
-      );
-
-      let [condition, falsyValue, truthyValue] = positional;
-
-      if (toBool(valueForRef(condition)) === true) {
-        return truthyValue !== undefined ? valueForRef(truthyValue) : undefined;
-      } else {
-        return valueForRef(falsyValue);
-      }
-    },
-    null,
-    'unless'
-  );
-});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/log.ts b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
index 758b298be2c..14e3f783f79 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/log.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/log.ts
@@ -1,8 +1,3 @@
-import { VMArguments } from '@glimmer/interfaces';
-import { createComputeRef } from '@glimmer/reference';
-import { reifyPositional } from '@glimmer/runtime';
-import { internalHelper } from './internal-helper';
-
 /**
 @module ember
 */
@@ -20,12 +15,3 @@ import { internalHelper } from './internal-helper';
   @param {Array} params
   @public
 */
-export default internalHelper((args: VMArguments) => {
-  let positional = args.positional.capture();
-
-  return createComputeRef(() => {
-    /* eslint-disable no-console */
-    console.log(...reifyPositional(positional));
-    /* eslint-enable no-console */
-  });
-});
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index c6e696a0b72..06f3beb0fa2 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -1,17 +1,3 @@
-import { Owner } from '@ember/-internals/owner';
-import { assert } from '@ember/debug';
-import { registerDestructor } from '@glimmer/destroyable';
-import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, InternalModifierManager, VMArguments } from '@glimmer/interfaces';
-import { setInternalModifierManager } from '@glimmer/manager';
-import { valueForRef } from '@glimmer/reference';
-import { reifyNamed } from '@glimmer/runtime';
-import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
-import { SimpleElement } from '@simple-dom/interface';
-import buildUntouchableThis from '../utils/untouchable-this';
-
-const untouchableContext = buildUntouchableThis('`on` modifier');
-
 /**
 @module ember
 */
@@ -28,199 +14,6 @@ const untouchableContext = buildUntouchableThis('`on` modifier');
   This flag determines, whether `{ once: true }` and thus also event options in
   general are supported.
 */
-const SUPPORTS_EVENT_OPTIONS = (() => {
-  try {
-    const div = document.createElement('div');
-    let counter = 0;
-    div.addEventListener('click', () => counter++, { once: true });
-
-    let event;
-    if (typeof Event === 'function') {
-      event = new Event('click');
-    } else {
-      event = document.createEvent('Event');
-      event.initEvent('click', true, true);
-    }
-
-    div.dispatchEvent(event);
-    div.dispatchEvent(event);
-
-    return counter === 1;
-  } catch (error) {
-    return false;
-  }
-})();
-
-export class OnModifierState {
-  public tag = createUpdatableTag();
-  public element: Element;
-  public args: CapturedArguments;
-  public eventName!: string;
-  public callback!: EventListener;
-  private userProvidedCallback!: EventListener;
-  public once?: boolean;
-  public passive?: boolean;
-  public capture?: boolean;
-  public options?: AddEventListenerOptions;
-  public shouldUpdate = true;
-
-  constructor(element: Element, args: CapturedArguments) {
-    this.element = element;
-    this.args = args;
-  }
-
-  updateFromArgs(): void {
-    let { args } = this;
-
-    let { once, passive, capture }: AddEventListenerOptions = reifyNamed(args.named);
-    if (once !== this.once) {
-      this.once = once;
-      this.shouldUpdate = true;
-    }
-
-    if (passive !== this.passive) {
-      this.passive = passive;
-      this.shouldUpdate = true;
-    }
-
-    if (capture !== this.capture) {
-      this.capture = capture;
-      this.shouldUpdate = true;
-    }
-
-    let options: AddEventListenerOptions;
-    if (once || passive || capture) {
-      options = this.options = { once, passive, capture };
-    } else {
-      this.options = undefined;
-    }
-
-    assert(
-      'You must pass a valid DOM event name as the first argument to the `on` modifier',
-      args.positional[0] !== undefined && typeof valueForRef(args.positional[0]) === 'string'
-    );
-    let eventName = valueForRef(args.positional[0]) as string;
-    if (eventName !== this.eventName) {
-      this.eventName = eventName;
-      this.shouldUpdate = true;
-    }
-
-    let userProvidedCallbackReference = args.positional[1];
-
-    if (DEBUG) {
-      assert(
-        `You must pass a function as the second argument to the \`on\` modifier.`,
-        args.positional[1] !== undefined
-      );
-
-      let value = valueForRef(userProvidedCallbackReference);
-      assert(
-        `You must pass a function as the second argument to the \`on\` modifier, you passed ${
-          value === null ? 'null' : typeof value
-        }. While rendering:\n\n${userProvidedCallbackReference.debugLabel}`,
-        typeof value === 'function'
-      );
-    }
-
-    let userProvidedCallback = valueForRef(userProvidedCallbackReference) as EventListener;
-    if (userProvidedCallback !== this.userProvidedCallback) {
-      this.userProvidedCallback = userProvidedCallback;
-      this.shouldUpdate = true;
-    }
-
-    assert(
-      `You can only pass two positional arguments (event name and callback) to the \`on\` modifier, but you provided ${args.positional.length}. Consider using the \`fn\` helper to provide additional arguments to the \`on\` callback.`,
-      args.positional.length === 2
-    );
-
-    let needsCustomCallback =
-      (SUPPORTS_EVENT_OPTIONS === false && once) /* needs manual once implementation */ ||
-      (DEBUG && passive); /* needs passive enforcement */
-
-    if (this.shouldUpdate) {
-      if (needsCustomCallback) {
-        let callback = (this.callback = function (this: Element, event) {
-          if (DEBUG && passive) {
-            event.preventDefault = () => {
-              assert(
-                `You marked this listener as 'passive', meaning that you must not call 'event.preventDefault()': \n\n${userProvidedCallback}`
-              );
-            };
-          }
-
-          if (!SUPPORTS_EVENT_OPTIONS && once) {
-            removeEventListener(this, eventName, callback, options);
-          }
-          return userProvidedCallback.call(untouchableContext, event);
-        });
-      } else if (DEBUG) {
-        // prevent the callback from being bound to the element
-        this.callback = userProvidedCallback.bind(untouchableContext);
-      } else {
-        this.callback = userProvidedCallback;
-      }
-    }
-  }
-}
-
-let adds = 0;
-let removes = 0;
-
-function removeEventListener(
-  element: Element,
-  eventName: string,
-  callback: EventListener,
-  options?: AddEventListenerOptions
-): void {
-  removes++;
-
-  if (SUPPORTS_EVENT_OPTIONS) {
-    // when options are supported, use them across the board
-    element.removeEventListener(eventName, callback, options);
-  } else if (options !== undefined && options.capture) {
-    // used only in the following case:
-    //
-    // `{ once: true | false, passive: true | false, capture: true }
-    //
-    // `once` is handled via a custom callback that removes after first
-    // invocation so we only care about capture here as a boolean
-    element.removeEventListener(eventName, callback, true);
-  } else {
-    // used only in the following cases:
-    //
-    // * where there is no options
-    // * `{ once: true | false, passive: true | false, capture: false }
-    element.removeEventListener(eventName, callback);
-  }
-}
-
-function addEventListener(
-  element: Element,
-  eventName: string,
-  callback: EventListener,
-  options?: AddEventListenerOptions
-): void {
-  adds++;
-
-  if (SUPPORTS_EVENT_OPTIONS) {
-    // when options are supported, use them across the board
-    element.addEventListener(eventName, callback, options);
-  } else if (options !== undefined && options.capture) {
-    // used only in the following case:
-    //
-    // `{ once: true | false, passive: true | false, capture: true }
-    //
-    // `once` is handled via a custom callback that removes after first
-    // invocation so we only care about capture here as a boolean
-    element.addEventListener(eventName, callback, true);
-  } else {
-    // used only in the following cases:
-    //
-    // * where there is no options
-    // * `{ once: true | false, passive: true | false, capture: false }
-    element.addEventListener(eventName, callback);
-  }
-}
 
 /**
   The `{{on}}` modifier lets you easily add event listeners (it uses
@@ -311,84 +104,3 @@ function addEventListener(
   @public
   @since 3.11.0
 */
-class OnModifierManager implements InternalModifierManager<OnModifierState | null, object> {
-  public SUPPORTS_EVENT_OPTIONS: boolean = SUPPORTS_EVENT_OPTIONS;
-
-  getDebugName(): string {
-    return 'on';
-  }
-
-  get counters(): { adds: number; removes: number } {
-    return { adds, removes };
-  }
-
-  create(
-    _owner: Owner,
-    element: SimpleElement | Element,
-    _state: object,
-    args: VMArguments
-  ): OnModifierState | null {
-    const capturedArgs = args.capture();
-
-    return new OnModifierState(<Element>element, capturedArgs);
-  }
-
-  getTag(state: OnModifierState | null): UpdatableTag | null {
-    if (state === null) {
-      return null;
-    }
-
-    return state.tag;
-  }
-
-  install(state: OnModifierState | null): void {
-    if (state === null) {
-      return;
-    }
-
-    state.updateFromArgs();
-
-    let { element, eventName, callback, options } = state;
-
-    addEventListener(element, eventName, callback, options);
-
-    registerDestructor(state, () => removeEventListener(element, eventName, callback, options));
-
-    state.shouldUpdate = false;
-  }
-
-  update(state: OnModifierState | null): void {
-    if (state === null) {
-      return;
-    }
-
-    // stash prior state for el.removeEventListener
-    let { element, eventName, callback, options } = state;
-
-    state.updateFromArgs();
-
-    if (!state.shouldUpdate) {
-      return;
-    }
-
-    // use prior state values for removal
-    removeEventListener(element, eventName, callback, options);
-
-    // read updated values from the state object
-    addEventListener(state.element, state.eventName, state.callback, state.options);
-
-    state.shouldUpdate = false;
-  }
-
-  getDestroyable(state: OnModifierState | null): OnModifierState | null {
-    return state;
-  }
-}
-
-const ON_MODIFIER_MANAGER = new OnModifierManager();
-
-const on = {};
-
-setInternalModifierManager(ON_MODIFIER_MANAGER, on);
-
-export default on;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index cda2a83ff0b..8c87ec67c64 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -24,7 +24,12 @@ import {
 } from '@glimmer/manager';
 import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
 import {
-  getDynamicVar,
+  array,
+  concat,
+  fn,
+  get,
+  hash,
+  on,
   TEMPLATE_ONLY_COMPONENT_MANAGER,
   templateOnlyComponent,
 } from '@glimmer/runtime';
@@ -41,21 +46,12 @@ import { default as inElementNullCheckHelper } from './helpers/-in-element-null-
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
 import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
-import { default as array } from './helpers/array';
-import { default as concat } from './helpers/concat';
 import { default as eachIn } from './helpers/each-in';
-import { default as fn } from './helpers/fn';
-import { default as get } from './helpers/get';
-import { default as hash } from './helpers/hash';
-import { inlineIf, inlineUnless } from './helpers/if-unless';
-import { internalHelper } from './helpers/internal-helper';
-import { default as log } from './helpers/log';
 import { default as mut } from './helpers/mut';
 import { default as queryParams } from './helpers/query-param';
 import { default as readonly } from './helpers/readonly';
 import { default as unbound } from './helpers/unbound';
 import actionModifier from './modifiers/action';
-import onModifier from './modifiers/on';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
 
@@ -178,18 +174,14 @@ if (PARTIALS) {
 
 const BUILTIN_KEYWORD_HELPERS = {
   action,
-  if: inlineIf,
-  log,
   mut,
   readonly,
   unbound,
-  unless: inlineUnless,
   'query-params': queryParams,
   '-hash': hash,
   '-each-in': eachIn,
   '-normalize-class': normalizeClassHelper,
   '-track-array': trackArray,
-  '-get-dynamic-var': internalHelper(getDynamicVar),
   '-mount': mountHelper,
   '-outlet': outletHelper,
   '-in-el-null': inElementNullCheckHelper,
@@ -210,7 +202,7 @@ const BUILTIN_KEYWORD_MODIFIERS = {
 
 const BUILTIN_MODIFIERS = {
   ...BUILTIN_KEYWORD_MODIFIERS,
-  on: onModifier,
+  on,
 };
 
 const CLASSIC_HELPER_MANAGER_ASSOCIATED = new _WeakSet();
diff --git a/packages/@ember/-internals/glimmer/lib/utils/untouchable-this.ts b/packages/@ember/-internals/glimmer/lib/utils/untouchable-this.ts
deleted file mode 100644
index c58d61b5cc5..00000000000
--- a/packages/@ember/-internals/glimmer/lib/utils/untouchable-this.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-
-export default function buildUntouchableThis(source: string): null | object {
-  let context: null | object = null;
-  if (DEBUG && HAS_NATIVE_PROXY) {
-    let assertOnProperty = (property: string | number | symbol) => {
-      assert(
-        `You accessed \`this.${String(
-          property
-        )}\` from a function passed to the ${source}, but the function itself was not bound to a valid \`this\` context. Consider updating to usage of \`@action\`.`
-      );
-    };
-
-    context = new Proxy(
-      {},
-      {
-        get(_target: {}, property: string | symbol) {
-          assertOnProperty(property);
-        },
-
-        set(_target: {}, property: string | symbol) {
-          assertOnProperty(property);
-
-          return false;
-        },
-
-        has(_target: {}, property: string | symbol) {
-          assertOnProperty(property);
-
-          return false;
-        },
-      }
-    );
-  }
-
-  return context;
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index f88b6eab1c7..888c33cd088 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -8,17 +8,8 @@ import {
 } from 'internal-test-helpers';
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
 
-import {
-  Input,
-  LinkComponent as LinkTo,
-  TextArea,
-  hash,
-  array,
-  concat,
-  get,
-  on,
-  fn,
-} from '@ember/-internals/glimmer';
+import { Input, LinkComponent as LinkTo, TextArea } from '@ember/-internals/glimmer';
+import { hash, array, concat, get, on, fn } from '@glimmer/runtime';
 import GlimmerishComponent from '../../utils/glimmerish-component';
 
 if (EMBER_STRICT_MODE) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index b8c884c0a72..c7b5a3c1b4c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -15,10 +15,10 @@ moduleFor(
   'Helpers test: custom helpers',
   class extends RenderingTestCase {
     ['@test it cannot override built-in syntax']() {
-      this.registerHelper('if', () => 'Nope');
+      this.registerHelper('array', () => 'Nope');
       expectAssertion(() => {
-        this.render(`{{if foo 'LOL'}}`, { foo: true });
-      }, /You attempted to overwrite the built-in helper "if" which is not allowed. Please rename the helper./);
+        this.render(`{{array foo 'LOL'}}`, { foo: true });
+      }, /You attempted to overwrite the built-in helper "array" which is not allowed. Please rename the helper./);
     }
 
     ['@test it can resolve custom simple helpers with or without dashes']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
index 6b9986d3547..7136480865a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
@@ -120,58 +120,6 @@ moduleFor(
       assert.equal(this.stashedFn(), 'arg1: foo, arg2: bar');
     }
 
-    '@test asserts if no argument given'() {
-      expectAssertion(() => {
-        this.render(`{{fn}}`, {
-          myFunc: null,
-          arg1: 'foo',
-          arg2: 'bar',
-        });
-      }, /You must pass a function as the `fn` helpers first argument./);
-    }
-
-    '@test asserts if the first argument is undefined'() {
-      expectAssertion(() => {
-        this.render(`{{fn this.myFunc this.arg1 this.arg2}}`, {
-          myFunc: undefined,
-          arg1: 'foo',
-          arg2: 'bar',
-        });
-      }, /You must pass a function as the `fn` helpers first argument, you passed undefined. While rendering:\n\nthis.myFunc/);
-    }
-
-    '@test asserts if the first argument is null'() {
-      expectAssertion(() => {
-        this.render(`{{fn this.myFunc this.arg1 this.arg2}}`, {
-          myFunc: null,
-          arg1: 'foo',
-          arg2: 'bar',
-        });
-      }, /You must pass a function as the `fn` helpers first argument, you passed null. While rendering:\n\nthis.myFunc/);
-    }
-
-    '@test asserts if the provided function accesses `this` without being bound prior to passing to fn'(
-      assert
-    ) {
-      if (!HAS_NATIVE_PROXY) {
-        assert.expect(0);
-        return;
-      }
-
-      this.render(`{{stash stashedFn=(fn this.myFunc this.arg1)}}`, {
-        myFunc(arg1) {
-          return `arg1: ${arg1}, arg2: ${this.arg2}`;
-        },
-
-        arg1: 'foo',
-        arg2: 'bar',
-      });
-
-      expectAssertion(() => {
-        this.stashedFn();
-      }, /You accessed `this.arg2` from a function passed to the `fn` helper, but the function itself was not bound to a valid `this` context. Consider updating to usage of `@action`./);
-    }
-
     '@test there is no `this` context within the callback'(assert) {
       if (DEBUG && HAS_NATIVE_PROXY) {
         assert.expect(0);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/if-unless-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/if-unless-test.js
index c68084309b5..499c06730e5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/if-unless-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/if-unless-test.js
@@ -2,27 +2,6 @@ import { moduleFor } from 'internal-test-helpers';
 
 import { IfUnlessHelperTest } from '../../utils/shared-conditional-tests';
 
-moduleFor(
-  'Helpers test: inline {{if}}',
-  class extends IfUnlessHelperTest {
-    templateFor({ cond, truthy, falsy }) {
-      return `{{if ${cond} ${truthy} ${falsy}}}`;
-    }
-
-    ['@test it raises when there are more than three arguments']() {
-      expectAssertion(() => {
-        this.render(`{{if condition 'a' 'b' 'c'}}`, { condition: true });
-      }, `The inline form of the 'if' helper expects two or three arguments. ('-top-level' @ L1:C0) `);
-    }
-
-    ['@test it raises when there are less than two arguments']() {
-      expectAssertion(() => {
-        this.render(`{{if condition}}`, { condition: true });
-      }, `The inline form of the 'if' helper expects two or three arguments. ('-top-level' @ L1:C0) `);
-    }
-  }
-);
-
 moduleFor(
   'Helpers test: nested {{if}} helpers (returning truthy values)',
   class extends IfUnlessHelperTest {
@@ -80,27 +59,6 @@ moduleFor(
   }
 );
 
-moduleFor(
-  'Helpers test: inline {{unless}}',
-  class extends IfUnlessHelperTest {
-    templateFor({ cond, truthy, falsy }) {
-      return `{{unless ${cond} ${falsy} ${truthy}}}`;
-    }
-
-    ['@test it raises when there are more than three arguments']() {
-      expectAssertion(() => {
-        this.render(`{{unless condition 'a' 'b' 'c'}}`, { condition: true });
-      }, /The inline form of the `unless` helper expects two or three arguments/);
-    }
-
-    ['@test it raises when there are less than two arguments']() {
-      expectAssertion(() => {
-        this.render(`{{unless condition}}`, { condition: true });
-      }, /The inline form of the `unless` helper expects two or three arguments/);
-    }
-  }
-);
-
 moduleFor(
   'Helpers test: nested {{unless}} helpers (returning truthy values)',
   class extends IfUnlessHelperTest {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
index f10186b6a61..fa40faf7a87 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
@@ -1,8 +1,7 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import { getInternalModifierManager } from '@glimmer/manager';
-import { on } from '@ember/-internals/glimmer';
+import { on } from '@glimmer/runtime';
 
 import { Component } from '../../utils/helpers';
 
@@ -177,19 +176,6 @@ moduleFor(
       }
     }
 
-    '@test setting passive named argument prevents calling preventDefault'() {
-      let matcher = /You marked this listener as 'passive', meaning that you must not call 'event.preventDefault\(\)'/;
-      this.render('<button {{on "click" this.callback passive=true}}>Click Me</button>', {
-        callback(event) {
-          expectAssertion(() => {
-            event.preventDefault();
-          }, matcher);
-        },
-      });
-
-      runTask(() => this.$('button').click());
-    }
-
     '@test by default bubbling is used (capture: false)'(assert) {
       this.render(
         `
@@ -259,97 +245,6 @@ moduleFor(
       assert.verifySteps(['inner clicked'], 'once works');
     }
 
-    '@test unrelated updates to `this` context does not result in removing + re-adding'(assert) {
-      let called = false;
-
-      this.render('<button {{on "click" this.callback}}>Click Me</button>', {
-        callback() {
-          called = true;
-        },
-        otherThing: 0,
-      });
-
-      this.assertCounts({ adds: 1, removes: 0 });
-
-      runTask(() => this.$('button').click());
-      assert.equal(called, 1, 'callback is being invoked');
-
-      runTask(() => this.context.set('otherThing', 1));
-      this.assertCounts({ adds: 1, removes: 0 });
-    }
-
-    '@test asserts when eventName is missing'() {
-      expectAssertion(() => {
-        this.render(`<button {{on undefined this.callback}}>Click Me</button>`, {
-          callback() {},
-        });
-      }, /You must pass a valid DOM event name as the first argument to the `on` modifier/);
-    }
-
-    '@test asserts when eventName is a bound undefined value'() {
-      expectAssertion(() => {
-        this.render(`<button {{on this.someUndefinedThing this.callback}}>Click Me</button>`, {
-          callback() {},
-        });
-      }, /You must pass a valid DOM event name as the first argument to the `on` modifier/);
-    }
-
-    '@test asserts when eventName is a function'() {
-      expectAssertion(() => {
-        this.render(`<button {{on this.callback}}>Click Me</button>`, {
-          callback() {},
-        });
-      }, /You must pass a valid DOM event name as the first argument to the `on` modifier/);
-    }
-
-    '@test asserts when callback is missing'() {
-      expectAssertion(() => {
-        this.render(`<button {{on 'click'}}>Click Me</button>`);
-      }, /You must pass a function as the second argument to the `on` modifier/);
-    }
-
-    '@test asserts when callback is undefined'() {
-      expectAssertion(() => {
-        this.render(`<button {{on 'click' this.foo}}>Click Me</button>`);
-      }, /You must pass a function as the second argument to the `on` modifier, you passed undefined. While rendering:\n\nthis.foo/);
-    }
-
-    '@test asserts when callback is null'() {
-      expectAssertion(() => {
-        this.render(`<button {{on 'click' this.foo}}>Click Me</button>`, { foo: null });
-      }, /You must pass a function as the second argument to the `on` modifier, you passed null. While rendering:\n\nthis.foo/);
-    }
-
-    '@test asserts if the provided callback accesses `this` without being bound prior to passing to on'(
-      assert
-    ) {
-      this.render(`<button {{on 'click' this.myFunc}}>Click Me</button>`, {
-        myFunc() {
-          if (HAS_NATIVE_PROXY) {
-            expectAssertion(() => {
-              this.arg1;
-            }, /You accessed `this.arg1` from a function passed to the `on` modifier, but the function itself was not bound to a valid `this` context. Consider updating to usage of `@action`./);
-          } else {
-            // IE11
-            assert.strictEqual(this, null, 'this is null on browsers without native proxy support');
-          }
-        },
-
-        arg1: 'foo',
-      });
-
-      runTask(() => this.$('button').click());
-    }
-
-    '@test asserts if more than 2 positional parameters are provided'() {
-      expectAssertion(() => {
-        this.render(`<button {{on 'click' this.callback this.someArg}}>Click Me</button>`, {
-          callback() {},
-          someArg: 'foo',
-        });
-      }, /You can only pass two positional arguments \(event name and callback\) to the `on` modifier, but you provided 3. Consider using the `fn` helper to provide additional arguments to the `on` callback./);
-    }
-
     '@test it removes the modifier when the element is removed'(assert) {
       let count = 0;
 
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index c82a97c8d45..64018eba48b 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -9,7 +9,7 @@ export { getCachedValueFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
 export { PROXY_CONTENT, _getPath, get, getWithDefault, _getProp } from './lib/property_get';
-export { set, trySet } from './lib/property_set';
+export { set, _setProp, trySet } from './lib/property_set';
 export {
   objectAt,
   replace,
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index e78e2b22037..908f59cc8c5 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -68,10 +68,10 @@ export function set<T = unknown>(obj: object, keyName: string, value: T, toleran
     return value;
   }
 
-  if (isPath(keyName)) {
-    return setPath(obj, keyName, value, tolerant);
-  }
+  return isPath(keyName) ? _setPath(obj, keyName, value, tolerant) : _setProp(obj, keyName, value);
+}
 
+export function _setProp(obj: object, keyName: string, value: any) {
   let descriptor = lookupDescriptor(obj, keyName);
 
   if (descriptor !== null && COMPUTED_SETTERS.has(descriptor.set!)) {
@@ -109,7 +109,7 @@ export function set<T = unknown>(obj: object, keyName: string, value: T, toleran
   return value;
 }
 
-function setPath(root: object, path: string, value: any, tolerant?: boolean): any {
+function _setPath(root: object, path: string, value: any, tolerant?: boolean): any {
   let parts = path.split('.');
   let keyName = parts.pop()!;
 
diff --git a/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts
deleted file mode 100644
index 15f3e642f34..00000000000
--- a/packages/ember-template-compiler/lib/plugins/assert-if-helper-without-arguments.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-import { isPath } from './utils';
-
-export default function assertIfHelperWithoutArguments(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
-
-  return {
-    name: 'assert-if-helper-without-arguments',
-
-    visitor: {
-      BlockStatement(node: AST.BlockStatement) {
-        if (isPath(node.path) && isInvalidBlockIf(node.path, node.params)) {
-          assert(
-            `${blockAssertMessage(node.path.original)} ${calculateLocationDisplay(
-              moduleName,
-              node.loc
-            )}`
-          );
-        }
-      },
-
-      MustacheStatement(node: AST.MustacheStatement) {
-        if (isPath(node.path) && isInvalidInlineIf(node.path, node.params)) {
-          assert(
-            `${inlineAssertMessage(node.path.original as string)} ${calculateLocationDisplay(
-              moduleName,
-              node.loc
-            )}`
-          );
-        }
-      },
-
-      SubExpression(node: AST.SubExpression) {
-        if (isPath(node.path) && isInvalidInlineIf(node.path, node.params)) {
-          assert(
-            `${inlineAssertMessage(node.path.original)} ${calculateLocationDisplay(
-              moduleName,
-              node.loc
-            )}`
-          );
-        }
-      },
-    },
-  };
-}
-
-function blockAssertMessage(original: string) {
-  return `#${original} requires a single argument.`;
-}
-
-function inlineAssertMessage(original: string) {
-  return `The inline form of the '${original}' helper expects two or three arguments.`;
-}
-
-function isInvalidInlineIf(path: AST.PathExpression, params: AST.Expression[]) {
-  return (
-    isPath(path) && path.original === 'if' && (!params || params.length < 2 || params.length > 3)
-  );
-}
-
-function isInvalidBlockIf(path: AST.PathExpression, params: AST.Expression[]) {
-  return isPath(path) && path.original === 'if' && (!params || params.length !== 1);
-}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index ead78cda876..756d528d0f1 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -1,6 +1,5 @@
 import AssertAgainstDynamicHelpersModifiers from './assert-against-dynamic-helpers-modifiers';
 import AssertAgainstNamedBlocks from './assert-against-named-blocks';
-import AssertIfHelperWithoutArguments from './assert-if-helper-without-arguments';
 import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
@@ -32,7 +31,6 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformLinkTo,
     AssertInputHelperWithoutBlock,
     TransformInElement,
-    AssertIfHelperWithoutArguments,
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
diff --git a/packages/ember-template-compiler/tests/plugins/assert-if-helper-without-arguments-test.js b/packages/ember-template-compiler/tests/plugins/assert-if-helper-without-arguments-test.js
deleted file mode 100644
index 5f726a7b32d..00000000000
--- a/packages/ember-template-compiler/tests/plugins/assert-if-helper-without-arguments-test.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { compile } from '../../index';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  'ember-template-compiler: assert-if-helper-without-argument',
-  class extends AbstractTestCase {
-    [`@test block if helper expects one argument`]() {
-      expectAssertion(() => {
-        compile(`{{#if}}aVal{{/if}}`, {
-          moduleName: 'baz/foo-bar',
-        });
-      }, `#if requires a single argument. ('baz/foo-bar' @ L1:C0) `);
-
-      expectAssertion(() => {
-        compile(`{{#if val1 val2}}aVal{{/if}}`, {
-          moduleName: 'baz/foo-bar',
-        });
-      }, `#if requires a single argument. ('baz/foo-bar' @ L1:C0) `);
-
-      expectAssertion(() => {
-        compile(`{{#if}}aVal{{/if}}`, {
-          moduleName: 'baz/foo-bar',
-        });
-      }, `#if requires a single argument. ('baz/foo-bar' @ L1:C0) `);
-    }
-
-    [`@test inline if helper expects between one and three arguments`]() {
-      expectAssertion(() => {
-        compile(`{{if}}`, {
-          moduleName: 'baz/foo-bar',
-        });
-      }, `The inline form of the 'if' helper expects two or three arguments. ('baz/foo-bar' @ L1:C0) `);
-
-      compile(`{{if foo bar baz}}`, {
-        moduleName: 'baz/foo-bar',
-      });
-    }
-
-    ['@test subexpression if helper expects between one and three arguments']() {
-      expectAssertion(() => {
-        compile(`{{input foo=(if)}}`, {
-          moduleName: 'baz/foo-bar',
-        });
-      }, `The inline form of the 'if' helper expects two or three arguments. ('baz/foo-bar' @ L1:C12) `);
-
-      compile(`{{some-thing foo=(if foo bar baz)}}`, {
-        moduleName: 'baz/foo-bar',
-      });
-    }
-  }
-);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index fd2d5640a92..474e88a7b3a 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -115,12 +115,6 @@ import {
   TextField,
   TextArea,
   Input,
-  hash,
-  array,
-  concat,
-  get,
-  on,
-  fn,
   isSerializationFirstNode,
 } from '@ember/-internals/glimmer';
 // eslint-disable-next-line import/no-unresolved
@@ -139,7 +133,17 @@ import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
 import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
-import { templateOnlyComponent, invokeHelper } from '@glimmer/runtime';
+
+import {
+  templateOnlyComponent,
+  invokeHelper,
+  hash,
+  array,
+  concat,
+  get,
+  on,
+  fn,
+} from '@glimmer/runtime';
 
 import {
   componentCapabilities,
diff --git a/yarn.lock b/yarn.lock
index ec4a3f52f97..a6671cbd632 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.72.0.tgz#71a7d0983ca7193bfee487519d76e2c70e02841d"
-  integrity sha512-nm9yNFIzilzfKrrtgJpCJeLxBFL3Iyt+FvBgFfyhOKl1O43YXTLBOK/19QhLZriq0jQGARzIIhvhuUstZpXs5A==
-  dependencies:
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/syntax" "0.72.0"
-    "@glimmer/util" "0.72.0"
-    "@glimmer/wire-format" "0.72.0"
+"@glimmer/compiler@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.0.tgz#206d3b3bf5de07bfa95591bc6aa9c43493e52bce"
+  integrity sha512-vBq4CNPdA1wdKysOshbkjUgy2YHc8IfPIdish4qIx7S3g2ibfH9+EfcFHwb+CrXnijG7dUrVMu/AUmuurbvTNQ==
+  dependencies:
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/syntax" "0.73.0"
+    "@glimmer/util" "0.73.0"
+    "@glimmer/wire-format" "0.73.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.72.0.tgz#68713e78294fd83f49ecaa39a7eb98e512c4e89e"
-  integrity sha512-Ku+plbghbGLT4cXqLAyG9GJiGRQ5QT+imGdnafqDY5GhWYu8d1lv/oTcSsZiYpMi0G+TG1bZmH3HgZqW4juBTA==
+"@glimmer/destroyable@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.0.tgz#04a0ce1d31c6325c13f85831e63d392ad103646e"
+  integrity sha512-yx2Ci2s7Q0zY6A934a/eJBVofBg/YsuLv9et6FXVYgQFjb45V3Pm+lklitKCZ401kXKJqozTC08jHgka40U3rA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.72.0"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/global-context" "0.73.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
 
-"@glimmer/encoder@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.72.0.tgz#76b3c243bffefdd0f2ec0938cc28cfdff466dde2"
-  integrity sha512-Pi7unh9ZGGig7WZbOpARYgAxN7h1i8EB5DNLeDE46fAK+zxZ6Fh5JOqgiv6dMIP3VF1plJ0Xft1FTZJSVjfQ9w==
+"@glimmer/encoder@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.0.tgz#5ad9ebcdca8fc7952367ab4b0d77c8452cda96e7"
+  integrity sha512-v2jcMem2TFLP/VJF4HI+GPX9PEwkmcussyLjNG65ZMCcsqOKHcmGcXULtMxeQR4Y7PpjaZRwWCMpuGgL9QLo5Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/vm" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/vm" "0.73.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.72.0.tgz#258d10b3e8185e148ee7235fc00005a781b12317"
-  integrity sha512-OGKHFNLPYnWFr+B+seYpPGJDnXUlq7wBnFe/+ThGbe0gB411uKxAbrhdBFMx/lwjVY8U2xJzglomtGfGXHWj6A==
+"@glimmer/global-context@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.0.tgz#273f757779a17595cb4cb76685c17087dc619bb8"
+  integrity sha512-DnatUdDcF6STNhN4aOFjSW5cn1lmgMpjaauwIKZSy9O45Eo8uqNCMpYRCKf4fkVmYVDRwg6N6ua0Sv0q6OlWSw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.72.0.tgz#34817afba6736f68974cfbd14825a88032d60a63"
-  integrity sha512-o5zLnfca4FogcO4wfmerLGHpmJHz5mfUUB7uxabnLHBI53ABu+Gfmeaaye24lgQI9NyaHY/eSJlz+GtRtvMnSg==
+"@glimmer/interfaces@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.0.tgz#ea926b2542cf666a9a479e8aa67224cc11f7710d"
+  integrity sha512-DagAc0Ul+lrid54QKrUVctlKfloIZMRhaz/oaEJ3nVf4Nqz/6YtT3tOrJ+fOxLYjsDy3Dq0uJMDOHzdd6IqS2g==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.72.0.tgz#77da0900f1e06b55a8a6ec230928c5fc3f561a89"
-  integrity sha512-453Cm/yZmh4HCWQJzTuNQDYdggnJcyJfH/T1OT21MqqjoL0qyGLYBuOoKav+B+Z6fd4EgRJLOL8ceLd0pcEnGQ==
+"@glimmer/low-level@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.0.tgz#70e42e35954ed07c544413bd5064cdd4aa2f6ce9"
+  integrity sha512-n52STqtO54R/1GUv+oe7TXjwIdLBaZ1/+DqWPsh5XlzIH/MY6RipNeCpaIKJDYdSshJYZEp6i/7x0NBfzmocdQ==
 
-"@glimmer/manager@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.72.0.tgz#6629e59664c9c535f050327cb54d1bcf2c4376ec"
-  integrity sha512-X6AMzRHHWCRTrlbeuZk7+T81ItGrcp6rG9dPv9kp0/gt80m52Mf/pS+uQekS5ItMSzUpQ+LZnlXHHQHNuokKYQ==
+"@glimmer/manager@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.0.tgz#7af1c290e5ad5ce0d38517367996452346b776d6"
+  integrity sha512-Sjn2eTBbDxS7fdr3tY2nfHQ34DTGmobNDUIwNGBv7RgNWJ6yCcgM3HYxfynK6AoCrzQyNcHkthefNtFRZOQJSQ==
   dependencies:
-    "@glimmer/destroyable" "0.72.0"
+    "@glimmer/destroyable" "0.73.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/reference" "0.72.0"
-    "@glimmer/util" "0.72.0"
-    "@glimmer/validator" "0.72.0"
-
-"@glimmer/node@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.72.0.tgz#1ae8f3b9cf7405cef111c9b49b2795fa1a899488"
-  integrity sha512-dl2ax+CWFelwQrqnRWzCbM/+9RBj0KcS+JtV52Pt3Gq3/kdbAont50e/YlGu0AE2vJvPvg2s9kVqlDQ5MTKQ8Q==
-  dependencies:
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/runtime" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/reference" "0.73.0"
+    "@glimmer/util" "0.73.0"
+    "@glimmer/validator" "0.73.0"
+
+"@glimmer/node@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.0.tgz#ad1fb21423044b78781c2a0a522ca74b7655312d"
+  integrity sha512-IVQuV+jezP5L81KwswnyW8vT+M+ef+KhgMtW3gI8+6D5Msdx06QUrLzPjbcFyLwHUZ6AHO3IOydEAsk8JclgCg==
+  dependencies:
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/runtime" "0.73.0"
+    "@glimmer/util" "0.73.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.72.0.tgz#bce10a2bfc65da6aab4d50f7b14b3cce970bf09d"
-  integrity sha512-hUjNG1KzspeHigFRyagKQr512o8k8JHBED1sdpRAn5WPNzl8g73sJpFYofRJrobUaDnKq0u0onxlXAuSwSf96g==
+"@glimmer/opcode-compiler@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.0.tgz#302b3f2d3ca0c8fa6b4dded1230aa63e53007208"
+  integrity sha512-5RTVLx1CpdTeTNeNw9Nrbc8FKeTACrptacfL5pBD/3hWkj2XqaXIpsuMv6rXm1oGrr79KhFqpSimPM1qcdPGAg==
   dependencies:
-    "@glimmer/encoder" "0.72.0"
+    "@glimmer/encoder" "0.73.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/reference" "0.72.0"
-    "@glimmer/util" "0.72.0"
-    "@glimmer/vm" "0.72.0"
-    "@glimmer/wire-format" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/reference" "0.73.0"
+    "@glimmer/util" "0.73.0"
+    "@glimmer/vm" "0.73.0"
+    "@glimmer/wire-format" "0.73.0"
 
-"@glimmer/owner@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.72.0.tgz#87adc14fb576a3d0dbc6ead1d47d8cda30dff4bc"
-  integrity sha512-P2bB/0oE44PfgfVv/isPsKikVWbyzdfTtRxJKMqmtIDW0F1oZ5FaLJqT3P7TehfThSl45f3RyWcpQFTxiHOcbQ==
+"@glimmer/owner@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.0.tgz#a76378812f5def9cc47bcecb09caf0838111fcc7"
+  integrity sha512-fJ/ZzGNbGZiHwTlohqvPOXLdStmlm57iNuKg3PmqXYOpOfe4Ga/l7qbwDeat/+vBskVT7ZWitawM6lsyRtuVlg==
   dependencies:
-    "@glimmer/util" "0.72.0"
+    "@glimmer/util" "0.73.0"
 
-"@glimmer/program@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.72.0.tgz#2b29943b7fc176a1ee2b39522b797ed8579dacd4"
-  integrity sha512-IGg0FXPNAGnGYWKpFjpYrRfRfHvK6DvxW/BZuNaPR4ZUqvlYnJ5YXlKKBJQ5v4AGwXOgqDwZ/SL+fNAcAKkTOw==
+"@glimmer/program@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.0.tgz#a6a368e0c9d7e5a47375577a93f5773fbace8d8c"
+  integrity sha512-P631EYGtkOJ+05oNy4taxh1G+D9Hd12uc5STUB9jRutxN/6U4WJy2+V935Vyac2disuKTj7RVQuWI0EE6BAXgQ==
   dependencies:
-    "@glimmer/encoder" "0.72.0"
+    "@glimmer/encoder" "0.73.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/manager" "0.72.0"
-    "@glimmer/opcode-compiler" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/manager" "0.73.0"
+    "@glimmer/opcode-compiler" "0.73.0"
+    "@glimmer/util" "0.73.0"
 
-"@glimmer/reference@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.72.0.tgz#2b0e3fcd7385c663dcda3525e85b2eefd9b6f8a4"
-  integrity sha512-rae42xIBYM6F8ht0KDmiQ+ycOX32umQBRNaGgCrbe1i84w/hkuqzBFyp/pO47IxE0Ob5TXjU8BBxAWQZKVdiJQ==
+"@glimmer/reference@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.0.tgz#77d421254c0d58dd0bdcb341bdcb76744d0b28ba"
+  integrity sha512-m2vWCAD0bYLI03EvvJo4ow8a2cmfpLi7mHT+s9tMER7c7/TNenLmh6/5A7NKzbwCb6onqXQGOT4Sb/vAZqFgQw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.72.0"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
-    "@glimmer/validator" "0.72.0"
+    "@glimmer/global-context" "0.73.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
+    "@glimmer/validator" "0.73.0"
 
-"@glimmer/runtime@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.72.0.tgz#4df28a0472f45ab8ccf59560306a621cdd03dbdb"
-  integrity sha512-jsGuhKALuNQLUCBEdmBcLeDJPvSgNuQpukIYttt5cnvPNsLa5oInzUIoP4A9XZ9bYG0HqMiWBPOCyqjH2mFfPQ==
+"@glimmer/runtime@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.0.tgz#621a354ed7040afd29fedd8acd78ba3eb7cd8b52"
+  integrity sha512-O7YJSDbw5zRSdAcGBSi1YIWtoFmDqYR1HK7eSyLpobHOyhNLOYajdK0QLFreB9RZSELHACMWUbHpEQa3NPo5RA==
   dependencies:
-    "@glimmer/destroyable" "0.72.0"
+    "@glimmer/destroyable" "0.73.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.72.0"
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/low-level" "0.72.0"
-    "@glimmer/owner" "0.72.0"
-    "@glimmer/program" "0.72.0"
-    "@glimmer/reference" "0.72.0"
-    "@glimmer/util" "0.72.0"
-    "@glimmer/validator" "0.72.0"
-    "@glimmer/vm" "0.72.0"
-    "@glimmer/wire-format" "0.72.0"
+    "@glimmer/global-context" "0.73.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/low-level" "0.73.0"
+    "@glimmer/owner" "0.73.0"
+    "@glimmer/program" "0.73.0"
+    "@glimmer/reference" "0.73.0"
+    "@glimmer/util" "0.73.0"
+    "@glimmer/validator" "0.73.0"
+    "@glimmer/vm" "0.73.0"
+    "@glimmer/wire-format" "0.73.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.72.0.tgz#a7c22b8d1d7fb2c307d0df3ad68f826905a81794"
-  integrity sha512-HOA+dsI+tsqEvTZDZZWdnsV9wjAfCoKzmkYnzWOM+5RXOU9muRfRVp0wdu1cYF7J50QKp7gCmHLxzdLG7XcpDg==
+"@glimmer/syntax@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.0.tgz#f45f820d19fba8e7d87054f4bb87b7ce9edd1aac"
+  integrity sha512-dgxEUocjkbtlfkDPLFDkJO+RhZigffnOeDkdDAR4lbsEFgm0Pd3zNvnFhYyXSg/UUzioLdknyuixlwihG9OGow==
   dependencies:
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.72.0.tgz#77fdce5c14649651117d5e795b2870c48158b2c9"
-  integrity sha512-OlVmdMaV1o7UxWqhmuGXOlgpXgtynwp3zD5ypdWuf6IzNDeFf2OAsHaZY+GYqE+uDjx1u6xb+Q9xTXk7U7Bhow==
+"@glimmer/util@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.0.tgz#21c93fd7f822ba641485953c3ad4d7e929ec17c1"
+  integrity sha512-S8DfVvNAIOUxSawKjSSxa8U6yu2VVcZjaMVy4yoJR0QKpo++V6x1HDBjDOQU0xKgr98lCJqoAnPKZT6t1/eahg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.72.0.tgz#1c2f4b0702c82584f9ea1f5675b4aa00bb0464c7"
-  integrity sha512-Je1zk5iJjStjV3acgQ3Fl2lVnLyhvh+0eyJ/8+FIHp3M3IyR32D/yShYCHMIQhTppXuSV9WZwxif3KsrGxlPqA==
+"@glimmer/validator@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.0.tgz#d523904f4faff0a3af570d215d679bc7c2148e29"
+  integrity sha512-fAs3XREHTw/ePYkAM8lKkNeo0//d/TJYWn2iM5SuPPglRJGATg/8p1Nk2iw31BofPvsT3WAnFbr0aWGGZF9paQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.72.0"
+    "@glimmer/global-context" "0.73.0"
 
-"@glimmer/vm@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.72.0.tgz#132d94fc5bd663e066419a0895412561847fdfd8"
-  integrity sha512-gaMcw0uQUwEzIl9vPKLkbtu+icuT1zQcsavCmjHiV1yWqM8Hv8JZqqEvErwrsxQUFEBvJ76CUG/lDDUgd3+B8w==
+"@glimmer/vm@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.0.tgz#286b7fd3049bd922e6e61293ff040e3a4a392210"
+  integrity sha512-DokPu8ls8akbQcGwPpm1Z4I9m81de4PqkC8hhkMFQ9qj8BAA/4LRoJ5nxaJFJTq4Ub+kKIZ5owzGosSnucGZEg==
   dependencies:
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
 
-"@glimmer/wire-format@0.72.0":
-  version "0.72.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.72.0.tgz#cde189a6a7813dd378033b3e967b1cb73b0edee5"
-  integrity sha512-15WjtP9sxMh6R4eujxf1JtZGrHpgIym1aD7XrgEt+048K2en5vOdjsHV5R3zxhhbu9tXxCVwZuVJMGfits8n3Q==
+"@glimmer/wire-format@0.73.0":
+  version "0.73.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.0.tgz#2069aa68763dc409a3ea28b3819298376b4de5be"
+  integrity sha512-I3iLdUXClTDUuusq+/FiYA3g6Crr8KW4VmX6qgOxE4aG8kWqnlmDZNX73RvWJVDS0t7t/Cjrv+YwOf51DA75pg==
   dependencies:
-    "@glimmer/interfaces" "0.72.0"
-    "@glimmer/util" "0.72.0"
+    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/util" "0.73.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From b2dfc54f1d93a722c0f3c94eb73812fa038dac65 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 18 Dec 2020 15:10:27 -0800
Subject: [PATCH 0286/1405] [FEATURE named-blocks] Enable Named Blocks

Enables named blocks. As a language feature, this does not include any
extra documentation.
---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 8ba141bd5d0..13fb1360125 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -15,7 +15,7 @@ import { assign } from '@ember/polyfills';
 export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
-  EMBER_NAMED_BLOCKS: null,
+  EMBER_NAMED_BLOCKS: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,

From c9840c0d96e3701a6191856ecf379e13a6c18388 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 19 Dec 2020 08:34:28 -0800
Subject: [PATCH 0287/1405] add docs

---
 .../-internals/glimmer/lib/component.ts       | 105 ++-----
 .../glimmer/lib/glimmer-component-docs.ts     | 269 +++++++++++++++++-
 2 files changed, 278 insertions(+), 96 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index f7f65e7c123..83a3130c338 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -30,95 +30,30 @@ import {
 */
 
 /**
-  A component is an isolated piece of UI, represented by a template and an
-  optional class. When a component has a class, its template's `this` value
-  is an instance of the component class.
+  A component is a reusable UI element that consists of a `.hbs` template and an
+  optional JavaScript class that defines its behavior. For example, someone
+  might make a `button` in the template and handle the click behavior in the
+  JavaScript file that shares the same name as the template.
 
-  ## Template-only Components
+  Components are broken down into two categories:
 
-  The simplest way to create a component is to create a template file in
-  `app/templates/components`. For example, if you name a template
-  `app/templates/components/person-profile.hbs`:
+  - Components _without_ JavaScript, that are based only on a template. These
+    are called Template-only or TO components.
+  - Components _with_ JavaScript, which consist of a template and a backing
+    class.
 
-  ```app/templates/components/person-profile.hbs
-  <h1>{{@person.name}}</h1>
-  <img src={{@person.avatar}}>
-  <p class='signature'>{{@person.signature}}</p>
-  ```
-
-  You will be able to use `<PersonProfile />` to invoke this component elsewhere
-  in your application:
-
-  ```app/templates/application.hbs
-  <PersonProfile @person={{this.currentUser}} />
-  ```
-
-  Note that component names are capitalized here in order to distinguish them
-  from regular HTML elements, but they are dasherized in the file system.
-
-  While the angle bracket invocation form is generally preferred, it is also
-  possible to invoke the same component with the `{{person-profile}}` syntax:
-
-  ```app/templates/application.hbs
-  {{person-profile person=this.currentUser}}
-  ```
-
-  Note that with this syntax, you use dashes in the component name and
-  arguments are passed without the `@` sign.
-
-  In both cases, Ember will render the content of the component template we
-  created above. The end result will be something like this:
-
-  ```html
-  <h1>Tomster</h1>
-  <img src="https://emberjs.com/tomster.jpg">
-  <p class='signature'>Out of office this week</p>
-  ```
-
-  ## File System Nesting
-
-  Components can be nested inside sub-folders for logical groupping. For
-  example, if we placed our template in
-  `app/templates/components/person/short-profile.hbs`, we can invoke it as
-  `<Person::ShortProfile />`:
-
-  ```app/templates/application.hbs
-  <Person::ShortProfile @person={{this.currentUser}} />
-  ```
+  Ember ships with two types of JavaScript classes for components:
 
-  Or equivalently, `{{person/short-profile}}`:
+  1. Glimmer components, imported from `@glimmer/component`, which are the
+     default component's for Ember Octane (3.15) and more recent editions.
+  2. Classic components, imported from `@ember/component`, which were the
+     default for older editions of Ember (pre 3.15).
 
-  ```app/templates/application.hbs
-  {{person/short-profile person=this.currentUser}}
-  ```
-
-  ## Yielding Contents
-
-  You can use `yield` inside a template to include the **contents** of any block
-  attached to the component. The block will be executed in its original context:
-
-  ```handlebars
-  <PersonProfile @person={{this.currentUser}}>
-    <p>Admin mode</p>
-    {{! Executed in the current context. }}
-  </PersonProfile>
-  ```
-
-  or
-
-  ```handlebars
-  {{#person-profile person=this.currentUser}}
-    <p>Admin mode</p>
-    {{! Executed in the current context. }}
-  {{/person-profile}}
-  ```
-
-  ```app/templates/components/person-profile.hbs
-  <h1>{{@person.name}}</h1>
-  {{yield}}
-  ```
+  Below is the documentation for Classic components. If you are looking for the
+  API documentation for Template-only or Glimmer components, it is
+  [available here](/ember/release/modules/@glimmer%2Fcomponent).
 
-  ## Customizing Components With JavaScript
+  ## Defining a Classic Component
 
   If you want to customize the component in order to handle events, transform
   arguments or maintain internal state, you implement a subclass of `Component`.
@@ -130,7 +65,7 @@ import {
 
   export default Component.extend({
     displayName: computed('person.title', 'person.firstName', 'person.lastName', function() {
-      let { title, firstName, lastName } = this;
+      let { title, firstName, lastName } = this.person;
 
       if (title) {
         return `${title} ${lastName}`;
@@ -148,7 +83,7 @@ import {
   {{yield}}
   ```
 
-  ## Customizing a Component's HTML Element in JavaScript
+  ## Customizing a Classic Component's HTML Element in JavaScript
 
   ### HTML Tag
 
diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index 2b09c1fec54..f2bc9aa09ea 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -4,25 +4,272 @@
   might make a `button` in the template and handle the click behavior in the
   JavaScript file that shares the same name as the template.
 
-  The APIs available in a component vary depending on whether they import from
-  `@glimmer/component` or the older "classic" type, `@ember/component`. The
-  documentation below covers 100% of the available methods, hooks, and
-  properties of `@glimmer/component`. The source code can be found in
-  [`@glimmer/component`](https://github.com/glimmerjs/glimmer.js/tree/master/packages/%40glimmer/component).
+  Components are broken down into two categories:
 
-  ## Defining a component
+  - Components _without_ JavaScript, that are based only on a template. These
+    are called Template-only or TO components.
+  - Components _with_ JavaScript, which consist of a template and a backing
+    class.
 
-  To define a component, subclass `Component` and add your own properties,
-  methods and lifecycle hooks:
+  Ember ships with two types of JavaScript classes for components:
 
-  ```javascript
+  1. Glimmer components, imported from `@glimmer/component`, which are the
+     default component's for Ember Octane (3.15) and more recent editions.
+  2. Classic components, imported from `@ember/component`, which were the
+     default for older editions of Ember (pre 3.15).
+
+  Below is the documentation for Template-only and Glimmer components. If you
+  are looking for the API documentation for Classic components, it is
+  [available here](/ember/release/classes/Component). The source code for
+  Glimmer components can be found in [`@glimmer/component`](https://github.com/glimmerjs/glimmer.js/tree/master/packages/%40glimmer/component).
+
+  ## Defining a Template-only Component
+
+  The simplest way to create a component is to create a template file in
+  `app/templates/components`. For example, if you name a template
+  `app/templates/components/person-profile.hbs`:
+
+  ```app/templates/components/person-profile.hbs
+  <h1>{{@person.name}}</h1>
+  <img src={{@person.avatar}}>
+  <p class='signature'>{{@person.signature}}</p>
+  ```
+
+  You will be able to use `<PersonProfile />` to invoke this component elsewhere
+  in your application:
+
+  ```app/templates/application.hbs
+  <PersonProfile @person={{this.currentUser}} />
+  ```
+
+  Note that component names are capitalized here in order to distinguish them
+  from regular HTML elements, but they are dasherized in the file system.
+
+  While the angle bracket invocation form is generally preferred, it is also
+  possible to invoke the same component with the `{{person-profile}}` syntax:
+
+  ```app/templates/application.hbs
+  {{person-profile person=this.currentUser}}
+  ```
+
+  Note that with this syntax, you use dashes in the component name and
+  arguments are passed without the `@` sign.
+
+  In both cases, Ember will render the content of the component template we
+  created above. The end result will be something like this:
+
+  ```html
+  <h1>Tomster</h1>
+  <img src="https://emberjs.com/tomster.jpg">
+  <p class='signature'>Out of office this week</p>
+  ```
+
+  ## File System Nesting
+
+  Components can be nested inside sub-folders for logical groupping. For
+  example, if we placed our template in
+  `app/templates/components/person/short-profile.hbs`, we can invoke it as
+  `<Person::ShortProfile />`:
+
+  ```app/templates/application.hbs
+  <Person::ShortProfile @person={{this.currentUser}} />
+  ```
+
+  Or equivalently, `{{person/short-profile}}`:
+
+  ```app/templates/application.hbs
+  {{person/short-profile person=this.currentUser}}
+  ```
+
+  ## Using Blocks
+
+  You can use `yield` inside a template to include the **contents** of any block
+  attached to the component. For instance, if we added a `{{yield}}` to our
+  component like so:
+
+  ```app/templates/components/person-profile.hbs
+  <h1>{{@person.name}}</h1>
+  {{yield}}
+  ```
+
+  We could then invoke it like this:
+
+  ```handlebars
+  <PersonProfile @person={{this.currentUser}}>
+    <p>Admin mode</p>
+  </PersonProfile>
+  ```
+
+  or with curly syntax like this:
+
+  ```handlebars
+  {{#person-profile person=this.currentUser}}
+    <p>Admin mode</p>
+  {{/person-profile}}
+  ```
+
+  And the content passed in between the brackets of the component would be
+  rendered in the same place as the `{{yield}}` within it, replacing it.
+
+  Blocks are executed in their original context, meaning they have access to the
+  scope and any in-scope variables where they were defined.
+
+  ### Passing parameters to blocks
+
+  You can also pass positional parameters to `{{yield}}`, which are then made
+  available in the block:
+
+  ```app/templates/components/person-profile.hbs
+  <h1>{{@person.name}}</h1>
+  {{yield @person.signature}}
+  ```
+
+  We can then use this value in the block like so:
+
+  ```handlebars
+  <PersonProfile @person={{this.currentUser}} as |signature|>
+    {{signature}}
+  </PersonProfile>
+  ```
+
+  ### Passing multiple blocks
+
+  You can pass multiple blocks to a component by giving them names, and
+  specifying which block you are yielding to with `{{yield}}`. For instance, if
+  we wanted to add a way for users to customize the title of our
+  `<PersonProfile>` component, we could add a named block inside of the header:
+
+  ```app/templates/components/person-profile.hbs
+  <h1>{{yield to="title"}}</h1>
+  {{yield}}
+  ```
+
+  This component could then be invoked like so:
+
+  ```handlebars
+  <PersonProfile @person={{this.currentUser}}>
+    <:title>{{this.currentUser.name}}</:title>
+    <:default>{{this.currentUser.siganture}}</:default>
+  </PersonProfile>
+  ```
+
+  When passing named blocks, you must name every block, including the `default`
+  block, which is the block that is defined if you do not pass a `to` parameter
+  to `{{yield}}`. Whenever you invoke a component without passing explicitly
+  named blocks, the passed block is considered the `default` block.
+
+  ### Passing parameters to named bxlocks
+
+  You can also pass parameters to named blocks:
+
+  ```app/templates/components/person-profile.hbs
+  <h1>{{yield to="title" @person.name}}</h1>
+  {{yield @person.signature}}
+  ```
+
+  These parameters can then be used like so:
+
+  ```handlebars
+  <PersonProfile @person={{this.currentUser}}>
+    <:title as |name|>{{name}}</:title>
+    <:default as |signature|>{{siganture}}</:default>
+  </PersonProfile>
+  ```
+
+  ### Checking to see if a block exists
+
+  You can also check to see if a block exists using the `(has-block)` keyword,
+  and conditionally use it, or provide a default template instead.
+
+  ```app/templates/components/person-profile.hbs
+  <h1>
+    {{#if (has-block "title")}}
+      {{yield to="title" @person.name}}
+    {{else}}
+      {{@person.name}}
+    {{/if}}
+  </h1>
+
+  {{#if (has-block)}}
+    {{yield @person.signature}}
+  {{else}}
+    {{@person.signature}}
+  {{/if}}
+  ```
+
+  With this template, we can then optionally pass in one block, both blocks, or
+  none at all:
+
+  ```handlebars
+  {{! passing both blocks }}
+  <PersonProfile @person={{this.currentUser}}>
+    <:title as |name|>{{name}}</:title>
+    <:default as |signature|>{{siganture}}</:default>
+  </PersonProfile>
+
+  {{! passing just the title block }}
+  <PersonProfile @person={{this.currentUser}}>
+    <:title as |name|>{{name}}</:title>
+  </PersonProfile>
+
+  {{! passing just the default block }}
+  <PersonProfile @person={{this.currentUser}} as |signature|>
+    {{signature}}
+  </PersonProfile>
+
+  {{! not passing any blocks }}
+  <PersonProfile @person={{this.currentUser}}/>
+  ```
+
+  ### Checking to see if a block has parameters
+
+  We can also check if a block receives parameters using the `(has-block-params)`
+  keyword, and conditionally yield different values if so.
+
+  ```app/templates/components/person-profile.hbs
+  {{#if (has-block-params)}}
+    {{yield @person.signature}}
+  {{else}}
+    {{yield}}
+  {{/if}}
+  ```
+
+  ## Customizing Components With JavaScript
+
+  To add JavaScript to a component, create a JavaScript file in the same
+  location as the template file, with the same name, and export a subclass
+  of `Component` as the default value. For example, to add Javascript to the
+  `PersonProfile` component which we defined above, we would create
+  `app/comopnents/person-profile.js` and export our class as the default, like
+  so:
+
+  ```app/components/person-profile.js
   import Component from '@glimmer/component';
 
-  export default class SomeComponent extends Component {
-    // your code here
+  export default class PersonProfileComponent extends Component {
+    get displayName() {
+      let { title, firstName, lastName } = this.args.person;
+
+      if (title) {
+        return `${title} ${lastName}`;
+      } else {
+        return `${firstName} ${lastName}`;
+      }
+    })
   }
   ```
 
+  You can add your own properties, methods, and lifecycle hooks to this
+  subclass to customize its behavior, and you can reference the instance of the
+  class in your template using `{{this}}`. For instance, we could access the
+  `displayName` property of our `PersonProfile` component instance in the
+  template like this:
+
+  ```app/templates/components/person-profile.hbs
+  <h1>{{this.displayName}}</h1>
+  {{yield}}
+  ```
+
   ## `constructor`
 
   params: `owner` object and `args` object

From d7b96212733a2a6f264b8c35510395f1cb9b9128 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 21 Dec 2020 11:33:21 -0800
Subject: [PATCH 0288/1405] [FEATURE strict-mode] Enable Template Strict Mode

Enables strict mode, allowing the options for strict to be passed to the
Ember template compiler. Also adds some additional exported values,
`LinkTo` and `Textarea` to the global, as these have been deprecated on
their normal export paths.
---
 packages/@ember/canary-features/index.ts |  2 +-
 packages/ember/tests/reexports_test.js   | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 13fb1360125..730e9360b16 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -19,7 +19,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
-  EMBER_STRICT_MODE: null,
+  EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: null,
 };
 
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 2f026aa75bb..55e67962571 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -127,6 +127,15 @@ if (!jQueryDisabled) {
 }
 
 let allExports = [
+  // @glimmer/runtime
+  ['_templateOnlyComponent', '@glimmer/runtime', 'templateOnlyComponent'],
+  ['_on', '@glimmer/runtime', 'on'],
+  ['_fn', '@glimmer/runtime', 'fn'],
+  ['_array', '@glimmer/runtime', 'array'],
+  ['_hash', '@glimmer/runtime', 'hash'],
+  ['_get', '@glimmer/runtime', 'get'],
+  ['_concat', '@glimmer/runtime', 'concat'],
+
   // @ember/-internals/environment
   ['ENV', '@ember/-internals/environment', { get: 'getENV' }],
   ['lookup', '@ember/-internals/environment', { get: 'getLookup', set: 'setLookup' }],
@@ -266,7 +275,6 @@ let allExports = [
   ['_componentManagerCapabilities', '@glimmer/manager', 'componentCapabilities'],
   ['_setComponentTemplate', '@glimmer/manager', 'setComponentTemplate'],
   ['_getComponentTemplate', '@glimmer/manager', 'getComponentTemplate'],
-  ['_templateOnlyComponent', '@glimmer/runtime', 'templateOnlyComponent'],
   EMBER_GLIMMER_HELPER_MANAGER
     ? ['_setHelperManager', '@glimmer/manager', 'setHelperManager']
     : null,
@@ -275,6 +283,7 @@ let allExports = [
     : null,
   EMBER_GLIMMER_INVOKE_HELPER ? ['_invokeHelper', '@glimmer/runtime', 'invokeHelper'] : null,
   ['_captureRenderTree', '@ember/debug', 'captureRenderTree'],
+  ['_Input', '@ember/-internals/glimmer', 'Input'],
 
   // @ember/-internals/runtime
   ['A', '@ember/-internals/runtime'],

From 56f639ca82df3c57a9fbd2e64dc0597f21aab487 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 21 Dec 2020 18:58:33 -0500
Subject: [PATCH 0289/1405] Ensure `{{component.name}}` works with implicit
 this fallback

---
 package.json                                  |  24 +-
 .../components/curly-components-test.js       |  28 ++
 yarn.lock                                     | 254 +++++++++---------
 3 files changed, 167 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 12af37b4494..c5e807a82b2 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.73.0",
+    "@glimmer/compiler": "0.73.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.73.0",
-    "@glimmer/interfaces": "0.73.0",
-    "@glimmer/manager": "0.73.0",
-    "@glimmer/destroyable": "0.73.0",
-    "@glimmer/owner": "0.73.0",
-    "@glimmer/node": "0.73.0",
-    "@glimmer/opcode-compiler": "0.73.0",
-    "@glimmer/program": "0.73.0",
-    "@glimmer/reference": "0.73.0",
-    "@glimmer/runtime": "0.73.0",
-    "@glimmer/validator": "0.73.0",
+    "@glimmer/global-context": "0.73.1",
+    "@glimmer/interfaces": "0.73.1",
+    "@glimmer/manager": "0.73.1",
+    "@glimmer/destroyable": "0.73.1",
+    "@glimmer/owner": "0.73.1",
+    "@glimmer/node": "0.73.1",
+    "@glimmer/opcode-compiler": "0.73.1",
+    "@glimmer/program": "0.73.1",
+    "@glimmer/reference": "0.73.1",
+    "@glimmer/runtime": "0.73.1",
+    "@glimmer/validator": "0.73.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 614380f0492..fc951fea778 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3733,6 +3733,34 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'hello' });
     }
 
+    ['@test can use `{{component.foo}}` in a template GH#19313']() {
+      this.registerComponent('foo-bar', {
+        template: '{{component.foo}}',
+      });
+
+      this.render('{{foo-bar component=(hash foo="bar")}}');
+
+      this.assertComponentElement(this.firstChild, { content: 'bar' });
+
+      runTask(() => this.rerender());
+
+      this.assertComponentElement(this.firstChild, { content: 'bar' });
+    }
+
+    ['@test can use `{{@component.foo}}` in a template GH#19313']() {
+      this.registerComponent('foo-bar', {
+        template: '{{@component.foo}}',
+      });
+
+      this.render('{{foo-bar component=(hash foo="bar")}}');
+
+      this.assertComponentElement(this.firstChild, { content: 'bar' });
+
+      runTask(() => this.rerender());
+
+      this.assertComponentElement(this.firstChild, { content: 'bar' });
+    }
+
     '@test lifecycle hooks are not tracked'() {
       this.registerComponent('foo-bar', {
         ComponentClass: class extends Component {
diff --git a/yarn.lock b/yarn.lock
index a6671cbd632..ef6c9d334f9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.0.tgz#206d3b3bf5de07bfa95591bc6aa9c43493e52bce"
-  integrity sha512-vBq4CNPdA1wdKysOshbkjUgy2YHc8IfPIdish4qIx7S3g2ibfH9+EfcFHwb+CrXnijG7dUrVMu/AUmuurbvTNQ==
-  dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/syntax" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/wire-format" "0.73.0"
+"@glimmer/compiler@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.1.tgz#44b5a7a833f9502f9a71ecf201d37abdc4a80008"
+  integrity sha512-wsRZphwSxgc8uffDsBP5Rc0SfJPyXNirhq9YCEymWgu0Diy+aXV/valWFakD1r6remu+0MH9plRHoezWk5WYeA==
+  dependencies:
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/syntax" "0.73.1"
+    "@glimmer/util" "0.73.1"
+    "@glimmer/wire-format" "0.73.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.0.tgz#04a0ce1d31c6325c13f85831e63d392ad103646e"
-  integrity sha512-yx2Ci2s7Q0zY6A934a/eJBVofBg/YsuLv9et6FXVYgQFjb45V3Pm+lklitKCZ401kXKJqozTC08jHgka40U3rA==
+"@glimmer/destroyable@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.1.tgz#eded700bb925c14622e6a58ab30b599e7e90110d"
+  integrity sha512-xm8XH4Yy55N5P/9RWnmeJM7LfrHyTZe/q81KgoQgIuxMxC8ABq+V068Fyx0VKB49y1RPc4OcMS65aFSIOy9c7w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/global-context" "0.73.1"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
 
-"@glimmer/encoder@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.0.tgz#5ad9ebcdca8fc7952367ab4b0d77c8452cda96e7"
-  integrity sha512-v2jcMem2TFLP/VJF4HI+GPX9PEwkmcussyLjNG65ZMCcsqOKHcmGcXULtMxeQR4Y7PpjaZRwWCMpuGgL9QLo5Q==
+"@glimmer/encoder@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.1.tgz#33c7eb42d249bde041a4c7b513a0b384a6175fee"
+  integrity sha512-yXBccW9ayWby+G6cSzYgqDqc/OIfgJsFrpRqTDqjdFPG97pl9UMXu8/97l+318KH+gMNVLYBdu0xBFyk8Mbd1g==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/vm" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/vm" "0.73.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.0.tgz#273f757779a17595cb4cb76685c17087dc619bb8"
-  integrity sha512-DnatUdDcF6STNhN4aOFjSW5cn1lmgMpjaauwIKZSy9O45Eo8uqNCMpYRCKf4fkVmYVDRwg6N6ua0Sv0q6OlWSw==
+"@glimmer/global-context@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.1.tgz#34f7ccabd2656c8d4a19581557593b6bac761a4b"
+  integrity sha512-jilS1HXMf/bzVQETCetlggAFLMYukvOxxGVi5FokL23g3jfWjQncEFf3p3OR17I3HDsEa1FmrZc4iuOp/i2gGQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.0.tgz#ea926b2542cf666a9a479e8aa67224cc11f7710d"
-  integrity sha512-DagAc0Ul+lrid54QKrUVctlKfloIZMRhaz/oaEJ3nVf4Nqz/6YtT3tOrJ+fOxLYjsDy3Dq0uJMDOHzdd6IqS2g==
+"@glimmer/interfaces@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.1.tgz#ad1dffb635c19b66230c45894e15f3a34d90e5b0"
+  integrity sha512-MttMIyWGZ+IbiJJpr4q9dwMmn+7eOMdxjMiuaEYeLBN/DXe8T9VePqgapURkSL9CEmKByB/pLvcaVTSYfm0RYg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.0.tgz#70e42e35954ed07c544413bd5064cdd4aa2f6ce9"
-  integrity sha512-n52STqtO54R/1GUv+oe7TXjwIdLBaZ1/+DqWPsh5XlzIH/MY6RipNeCpaIKJDYdSshJYZEp6i/7x0NBfzmocdQ==
+"@glimmer/low-level@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.1.tgz#aaf67687d4a06835163e71d3b2535934ef3968a2"
+  integrity sha512-ps/jqQnBobpucOmylX47GaFRaFUwcTm+a8b5sLJQZ9tfc+rIDfqyT1x79ZF7SjLt0tOC0HBancRl4OgzBIONvA==
 
-"@glimmer/manager@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.0.tgz#7af1c290e5ad5ce0d38517367996452346b776d6"
-  integrity sha512-Sjn2eTBbDxS7fdr3tY2nfHQ34DTGmobNDUIwNGBv7RgNWJ6yCcgM3HYxfynK6AoCrzQyNcHkthefNtFRZOQJSQ==
+"@glimmer/manager@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.1.tgz#0ca52dcdfe358df6f8f4f0a0d6b601397fdf22c5"
+  integrity sha512-hrynFmYCcR1C8bJk3bM9GahBQnB3+Uo1ibEGBGSueCLd5ncLYDcvSg94GGU552tKe5TJ/QCi+v78ahKAvjervw==
   dependencies:
-    "@glimmer/destroyable" "0.73.0"
+    "@glimmer/destroyable" "0.73.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
-
-"@glimmer/node@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.0.tgz#ad1fb21423044b78781c2a0a522ca74b7655312d"
-  integrity sha512-IVQuV+jezP5L81KwswnyW8vT+M+ef+KhgMtW3gI8+6D5Msdx06QUrLzPjbcFyLwHUZ6AHO3IOydEAsk8JclgCg==
-  dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/runtime" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/reference" "0.73.1"
+    "@glimmer/util" "0.73.1"
+    "@glimmer/validator" "0.73.1"
+
+"@glimmer/node@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.1.tgz#3ad623a6701fe9d160cea27bc6ab5ff24124841c"
+  integrity sha512-bVAR0MK1LfKvxwgn5hQlkYzo8R0247lB80H23G7iP+PiBbkM2nOW7cykoYxewToQN948aMObYKOqXMdDCo0XyQ==
+  dependencies:
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/runtime" "0.73.1"
+    "@glimmer/util" "0.73.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.0.tgz#302b3f2d3ca0c8fa6b4dded1230aa63e53007208"
-  integrity sha512-5RTVLx1CpdTeTNeNw9Nrbc8FKeTACrptacfL5pBD/3hWkj2XqaXIpsuMv6rXm1oGrr79KhFqpSimPM1qcdPGAg==
+"@glimmer/opcode-compiler@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.1.tgz#85427f9331307df27d3d40e647c81b7ed7e3b4f7"
+  integrity sha512-bcQyMPkuJrnyyWuodu/bfj7UZItbwrrRQAbLYi+0EeH/zLorA4+D9OD1snaY2FYIwwH28t/Wfm3o9OE7dyFJHQ==
   dependencies:
-    "@glimmer/encoder" "0.73.0"
+    "@glimmer/encoder" "0.73.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/vm" "0.73.0"
-    "@glimmer/wire-format" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/reference" "0.73.1"
+    "@glimmer/util" "0.73.1"
+    "@glimmer/vm" "0.73.1"
+    "@glimmer/wire-format" "0.73.1"
 
-"@glimmer/owner@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.0.tgz#a76378812f5def9cc47bcecb09caf0838111fcc7"
-  integrity sha512-fJ/ZzGNbGZiHwTlohqvPOXLdStmlm57iNuKg3PmqXYOpOfe4Ga/l7qbwDeat/+vBskVT7ZWitawM6lsyRtuVlg==
+"@glimmer/owner@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.1.tgz#2659d078cae3c517473ff3e2aa751dd8c3ca999f"
+  integrity sha512-0bP+NHg1Y97kPGZtdAlyXCTtRnWOqUjWd4cPnZC6kvqlLrQtJnxKEN7rTW7N+McNdaFWbqoTIhw8y3+qghWANg==
   dependencies:
-    "@glimmer/util" "0.73.0"
+    "@glimmer/util" "0.73.1"
 
-"@glimmer/program@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.0.tgz#a6a368e0c9d7e5a47375577a93f5773fbace8d8c"
-  integrity sha512-P631EYGtkOJ+05oNy4taxh1G+D9Hd12uc5STUB9jRutxN/6U4WJy2+V935Vyac2disuKTj7RVQuWI0EE6BAXgQ==
+"@glimmer/program@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.1.tgz#e012e596a33685744313dd2a1a090e982b01121c"
+  integrity sha512-JT3b07CPGmU+UYRBUFLWkRZgGxPo+ZwP1o1wDuIhAKmit0Jo5TXd/V1jhI2PRbW2DdHHE5EUYPu8qbosIc0JdQ==
   dependencies:
-    "@glimmer/encoder" "0.73.0"
+    "@glimmer/encoder" "0.73.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/manager" "0.73.0"
-    "@glimmer/opcode-compiler" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/manager" "0.73.1"
+    "@glimmer/opcode-compiler" "0.73.1"
+    "@glimmer/util" "0.73.1"
 
-"@glimmer/reference@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.0.tgz#77d421254c0d58dd0bdcb341bdcb76744d0b28ba"
-  integrity sha512-m2vWCAD0bYLI03EvvJo4ow8a2cmfpLi7mHT+s9tMER7c7/TNenLmh6/5A7NKzbwCb6onqXQGOT4Sb/vAZqFgQw==
+"@glimmer/reference@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.1.tgz#5f3634fb780018d2aace753ed512b909d50c85bf"
+  integrity sha512-0sUebIjfNGuv6XJyC/f0HsFzNQf7/vNgeg+7/qg8NxDrrDfWeLzcaejWkReP/hxAmqLgidHnYju6IqmWciWcFw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
+    "@glimmer/global-context" "0.73.1"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
+    "@glimmer/validator" "0.73.1"
 
-"@glimmer/runtime@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.0.tgz#621a354ed7040afd29fedd8acd78ba3eb7cd8b52"
-  integrity sha512-O7YJSDbw5zRSdAcGBSi1YIWtoFmDqYR1HK7eSyLpobHOyhNLOYajdK0QLFreB9RZSELHACMWUbHpEQa3NPo5RA==
+"@glimmer/runtime@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.1.tgz#b579ce5480d80f8ff901763d156ca55e626d6ad8"
+  integrity sha512-gcmxywB5/kFssK8lLuh2PZrmuNaCaTTgtT0U1UbsEvvksXIH6hOMeTKU97Jxnar5yNI7LVAl7pnyXOqfQ/65ow==
   dependencies:
-    "@glimmer/destroyable" "0.73.0"
+    "@glimmer/destroyable" "0.73.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.0"
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/low-level" "0.73.0"
-    "@glimmer/owner" "0.73.0"
-    "@glimmer/program" "0.73.0"
-    "@glimmer/reference" "0.73.0"
-    "@glimmer/util" "0.73.0"
-    "@glimmer/validator" "0.73.0"
-    "@glimmer/vm" "0.73.0"
-    "@glimmer/wire-format" "0.73.0"
+    "@glimmer/global-context" "0.73.1"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/low-level" "0.73.1"
+    "@glimmer/owner" "0.73.1"
+    "@glimmer/program" "0.73.1"
+    "@glimmer/reference" "0.73.1"
+    "@glimmer/util" "0.73.1"
+    "@glimmer/validator" "0.73.1"
+    "@glimmer/vm" "0.73.1"
+    "@glimmer/wire-format" "0.73.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.0.tgz#f45f820d19fba8e7d87054f4bb87b7ce9edd1aac"
-  integrity sha512-dgxEUocjkbtlfkDPLFDkJO+RhZigffnOeDkdDAR4lbsEFgm0Pd3zNvnFhYyXSg/UUzioLdknyuixlwihG9OGow==
+"@glimmer/syntax@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.1.tgz#9e3c898ba91ddb1d4e6f413452b0b84700910c83"
+  integrity sha512-TpTK9yAaoDOzdo+5itoJPRxrVWacYlGuHtJvATi96RJUTAxPz9b9M3AcVm0atcZW7WiA8X8J/weQ2KcIVgAYmw==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.0.tgz#21c93fd7f822ba641485953c3ad4d7e929ec17c1"
-  integrity sha512-S8DfVvNAIOUxSawKjSSxa8U6yu2VVcZjaMVy4yoJR0QKpo++V6x1HDBjDOQU0xKgr98lCJqoAnPKZT6t1/eahg==
+"@glimmer/util@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.1.tgz#f89bb7adba18315e00fbdb5a7c5a4913bbdebc6e"
+  integrity sha512-zFXY9OgR6wx7Cy4yYJkmgoUsdx3MQYAmZytuEDTghLXJyUoSh5Jcvner+qhFkqLSzj2pvE4btn3yUNnx3QOBtg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.0.tgz#d523904f4faff0a3af570d215d679bc7c2148e29"
-  integrity sha512-fAs3XREHTw/ePYkAM8lKkNeo0//d/TJYWn2iM5SuPPglRJGATg/8p1Nk2iw31BofPvsT3WAnFbr0aWGGZF9paQ==
+"@glimmer/validator@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.1.tgz#8d87e502e84d468bb7d1695fdc85e1cfc3d9de29"
+  integrity sha512-DGodNSpf1v9Xsu7l7GSitVhNnESVx9qn6RFQ/zVwvptSXaPvLh5RIxsvYqJwkhBsxyPCVqnjz1p+MwqtfJukDA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.0"
+    "@glimmer/global-context" "0.73.1"
 
-"@glimmer/vm@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.0.tgz#286b7fd3049bd922e6e61293ff040e3a4a392210"
-  integrity sha512-DokPu8ls8akbQcGwPpm1Z4I9m81de4PqkC8hhkMFQ9qj8BAA/4LRoJ5nxaJFJTq4Ub+kKIZ5owzGosSnucGZEg==
+"@glimmer/vm@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.1.tgz#b9b38f819ef351490852807c0679f1e531f2e71c"
+  integrity sha512-8vMH0rSeEkjsFWcMaowTac8nBT7WtHvIX9hKx6qtCvkVNljWTFcNq4IXVZxCfUmx4UFopMZwYTIQR1QfHV282w==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
 
-"@glimmer/wire-format@0.73.0":
-  version "0.73.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.0.tgz#2069aa68763dc409a3ea28b3819298376b4de5be"
-  integrity sha512-I3iLdUXClTDUuusq+/FiYA3g6Crr8KW4VmX6qgOxE4aG8kWqnlmDZNX73RvWJVDS0t7t/Cjrv+YwOf51DA75pg==
+"@glimmer/wire-format@0.73.1":
+  version "0.73.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.1.tgz#a3ac1d42cc421d2dd651a68d99a16d146cc5a08f"
+  integrity sha512-GeNGsaaVm+4Rg+cssDiPxqDH+cpq8xYtnDVNoiO+ABUU6nkgwqmc6aoJrGD2fb4myDIIqdAVdCLYlhVWrP52NQ==
   dependencies:
-    "@glimmer/interfaces" "0.73.0"
-    "@glimmer/util" "0.73.0"
+    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/util" "0.73.1"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From f7888670d31ad69df2f7fb50947e4c76896c4e89 Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Tue, 22 Dec 2020 14:37:09 -0800
Subject: [PATCH 0290/1405] Fix description of issue around toggleProperty

The original description was unclear, but implied a totally different problem was at hand.
---
 .../-internals/routing/lib/ext/controller.ts      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 4e840e56a3d..58e29527d05 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -14,12 +14,13 @@ ControllerMixin.reopen({
     If you give the names `['category','page']` it will bind
     the values of these query parameters to the variables
     `this.category` and `this.page`.
-    By default, Ember coerces query parameter values using `toggleProperty`.
-    This behavior may lead to unexpected results.
-    Available queryParam types: `boolean`, `number`, `array`.
-    If query param type not specified, it will be `string`.
-    To explicitly configure a query parameter property so it coerces as expected, you must define a type property:
 
+    By default, query parameters are parsed and treated as strings. This
+    may cause unexpected behavior if a query parameter is used with `toggleProperty`,
+    because the initial value set for `param=false` will be the string `"false"`, which is truthy.
+    
+    To avoid this, you may explicitly set how a query parameter by using the following verbose
+    form with a `type` property:
     ```javascript
       queryParams: [{
         category: {
@@ -27,7 +28,9 @@ ControllerMixin.reopen({
         }
       }]
     ```
-
+    Available values for the `type` parameter are `boolean`, `number`, `array`, and `string`.
+    If query param type is not specified, it will default to `string`.
+    
     @for Ember.ControllerMixin
     @property queryParams
     @public

From f4bd2ef61b00f36e486892a58fa8d219a8eac1fd Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Tue, 22 Dec 2020 14:38:44 -0800
Subject: [PATCH 0291/1405] Remove unnecessary words

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 58e29527d05..7ffed6258fb 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -15,7 +15,7 @@ ControllerMixin.reopen({
     the values of these query parameters to the variables
     `this.category` and `this.page`.
 
-    By default, query parameters are parsed and treated as strings. This
+    By default, query parameters are parsed as strings. This
     may cause unexpected behavior if a query parameter is used with `toggleProperty`,
     because the initial value set for `param=false` will be the string `"false"`, which is truthy.
     

From 57bd58f46c42afdedfd3cce7f1675b080d7fac55 Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Tue, 22 Dec 2020 14:51:17 -0800
Subject: [PATCH 0292/1405] More copyediting

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 7ffed6258fb..131fafa5f03 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -19,8 +19,8 @@ ControllerMixin.reopen({
     may cause unexpected behavior if a query parameter is used with `toggleProperty`,
     because the initial value set for `param=false` will be the string `"false"`, which is truthy.
     
-    To avoid this, you may explicitly set how a query parameter by using the following verbose
-    form with a `type` property:
+    To avoid this, you may specify that the query parameter should be parsed as a boolean
+    by using the following verbose form with a `type` property:
     ```javascript
       queryParams: [{
         category: {
@@ -28,8 +28,8 @@ ControllerMixin.reopen({
         }
       }]
     ```
-    Available values for the `type` parameter are `boolean`, `number`, `array`, and `string`.
-    If query param type is not specified, it will default to `string`.
+    Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
+    If query param type is not specified, it will default to `'string'`.
     
     @for Ember.ControllerMixin
     @property queryParams

From 6bd1e1025afc3ab944961e868485f557649e5a31 Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Tue, 22 Dec 2020 14:55:33 -0800
Subject: [PATCH 0293/1405] Add option to specify a boolean default value

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 131fafa5f03..5d247c231b7 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -19,7 +19,8 @@ ControllerMixin.reopen({
     may cause unexpected behavior if a query parameter is used with `toggleProperty`,
     because the initial value set for `param=false` will be the string `"false"`, which is truthy.
     
-    To avoid this, you may specify that the query parameter should be parsed as a boolean
+    To avoid this, you may specify a boolean default value for the parameter, or
+    specify that the query parameter should be parsed as a boolean
     by using the following verbose form with a `type` property:
     ```javascript
       queryParams: [{

From 9f3f74f230cde0526080cb7726ec347a91bf4903 Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Tue, 22 Dec 2020 15:07:19 -0800
Subject: [PATCH 0294/1405] Scratch that, I don't think that works at all

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 5d247c231b7..131fafa5f03 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -19,8 +19,7 @@ ControllerMixin.reopen({
     may cause unexpected behavior if a query parameter is used with `toggleProperty`,
     because the initial value set for `param=false` will be the string `"false"`, which is truthy.
     
-    To avoid this, you may specify a boolean default value for the parameter, or
-    specify that the query parameter should be parsed as a boolean
+    To avoid this, you may specify that the query parameter should be parsed as a boolean
     by using the following verbose form with a `type` property:
     ```javascript
       queryParams: [{

From c1087f50d69593cfc84b737ec4e4f03586fa5bbe Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Tue, 22 Dec 2020 15:09:42 -0800
Subject: [PATCH 0295/1405] Fix whitespace

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 131fafa5f03..5f302ada2e7 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -18,7 +18,7 @@ ControllerMixin.reopen({
     By default, query parameters are parsed as strings. This
     may cause unexpected behavior if a query parameter is used with `toggleProperty`,
     because the initial value set for `param=false` will be the string `"false"`, which is truthy.
-    
+
     To avoid this, you may specify that the query parameter should be parsed as a boolean
     by using the following verbose form with a `type` property:
     ```javascript
@@ -30,7 +30,7 @@ ControllerMixin.reopen({
     ```
     Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
     If query param type is not specified, it will default to `'string'`.
-    
+
     @for Ember.ControllerMixin
     @property queryParams
     @public

From 5364bed35d44777a9c671906619f0cda1d5b75cd Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 21 Dec 2020 12:45:28 -0500
Subject: [PATCH 0296/1405] Add v3.24.0-beta.3 to CHANGELOG

(cherry picked from commit f803ecabd09786f6035c13f49695686c78495153)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3351fafa68..39a818d47c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.24.0-beta.3 (December 21, 2020)
+
+- [#19280](https://github.com/emberjs/ember.js/pull/19280) [BUGFIX] Ensure aliases cause recompute of a computed property when used with `@each` in the dependent keys of that property
+
 ### v3.24.0-beta.2 (November 24, 2020)
 
 - [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering

From df3c7a65d14822155c9876f50849fa123edc1219 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 28 Dec 2020 13:55:33 -0500
Subject: [PATCH 0297/1405] Add v3.24.0 to CHANGELOG

(cherry picked from commit 5f70d5518b3a8b9107abfaf38408c0c51e7f998d)
---
 CHANGELOG.md | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39a818d47c4..3fdd2ffc25e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,6 @@
 # Ember Changelog
 
-### v3.24.0-beta.3 (December 21, 2020)
-
-- [#19280](https://github.com/emberjs/ember.js/pull/19280) [BUGFIX] Ensure aliases cause recompute of a computed property when used with `@each` in the dependent keys of that property
-
-### v3.24.0-beta.2 (November 24, 2020)
-
-- [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
-
-### v3.24.0-beta.1 (November 16, 2020)
+### v3.24.0 (December 28, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 
 - [#19133](https://github.com/emberjs/ember.js/pull/19133) [FEATURE / DEPRECATION] Add new options to `deprecate()` for `for` and `since` and deprecate using `deprecate()` without those options per the [Deprecation Staging RFC](https://github.com/emberjs/rfcs/blob/master/text/0649-deprecation-staging.md).
@@ -18,6 +10,7 @@
 - [#19080](https://github.com/emberjs/ember.js/pull/19080) [BUGFIX] Lazily setup the router in non-application tests
 - [#19253](https://github.com/emberjs/ember.js/pull/19253) [BUGFIX] Correct return of getComponentTemplate from null to undefined to align with original RFC (#481)
 - [#19223](https://github.com/emberjs/ember.js/pull/19223) [BUGFIX] `<LinkTo>` should link within the engine when used inside one
+- [#19280](https://github.com/emberjs/ember.js/pull/19280) [BUGFIX] Ensure aliases cause recompute of a computed property when used with `@each` in the dependent keys of that property
 - [#19196](https://github.com/emberjs/ember.js/pull/19196) [CLEANUP] Remove EMBER_GLIMMER_IN_ELEMENT feature flag
 - [#19204](https://github.com/emberjs/ember.js/pull/19204) [CLEANUP] Remove EMBER_CACHE_API feature flag
 - [#19206](https://github.com/emberjs/ember.js/pull/19206) [CLEANUP] Remove EMBER_ROUTING_MODEL_ARG feature flag

From 2bb644532d407d4b4700a81f510c5aed4caf5d84 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 28 Dec 2020 14:22:43 -0500
Subject: [PATCH 0298/1405] Add v3.25.0-beta.1 to CHANGELOG

(cherry picked from commit 54830f5c35364a3001d469e9bf741725342d9f3d)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fdd2ffc25e..9980832875d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Ember Changelog
 
+### v3.25.0-beta.1 (December 28, 2020)
+
+- [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).
+- [#19318](https://github.com/emberjs/ember.js/pull/19318) [FEATURE] Implement the [Named Blocks RFC](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md).
+- [#18148](https://github.com/emberjs/ember.js/pull/18148) [BUGFIX] Fix empty `htmlSafe` string to be treated as falsy
+- [#19320](https://github.com/emberjs/ember.js/pull/19320) / [#19317](https://github.com/emberjs/ember.js/pull/19317) / [#19297](https://github.com/emberjs/ember.js/pull/19297) / [#19293](https://github.com/emberjs/ember.js/pull/19293) / [#19278](https://github.com/emberjs/ember.js/pull/19278) / [#19275](https://github.com/emberjs/ember.js/pull/19275) Update rendering engine to `@glimmer/*` 0.73.1 for various features and bugfixes including ensuring `{{component.name}}` works with implicit this fallback
+
 ### v3.24.0 (December 28, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 

From e751cb0090aa7eae96ca92bbd43ded745fc040d6 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Tue, 29 Dec 2020 11:42:39 -0800
Subject: [PATCH 0299/1405] Lazily setup the router in non-application tests
 for <LinkTo> component

PR #19080 fixed the issue where accessing public router service throwing
error, however, the PR did not support LinkTo component which uses the
internal -routing service. This PR adds similar lazy setup to
-routing.router.
---
 .../components/link-to/rendering-angle-test.js   |  9 +++++++--
 .../-internals/routing/lib/services/routing.ts   | 16 +++++++++++++++-
 packages/@ember/engine/index.js                  |  2 --
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 220c9eaed2f..99e4c072f7b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -1,4 +1,9 @@
-import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'internal-test-helpers';
+import {
+  moduleFor,
+  ApplicationTestCase,
+  RenderingTestCase,
+  runTask,
+} from 'internal-test-helpers';
 
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
@@ -101,7 +106,7 @@ moduleFor(
     ['@test should be able to be inserted in DOM when the router is not present - block']() {
       this.render(`<LinkTo @route='index'>Go to Index</LinkTo>`);
 
-      this.assertText('Go to Index');
+      this.assertComponentElement(this.element.firstChild, { tagName: 'a', attrs: { href: '#/' }, content: 'Go to Index' });
     }
   }
 );
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 8321daadbe4..457cf3c7f03 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -2,12 +2,16 @@
 @module ember
 */
 
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
+import { symbol } from '@ember/-internals/utils';
 import EmberRouter, { QueryParam } from '../system/router';
 import RouterState from '../system/router_state';
 
+const ROUTER = symbol('ROUTER') as string;
+
 /**
   The Routing service is used by LinkComponent, and provides facilities for
   the component/view layer to interact with the router.
@@ -19,7 +23,17 @@ import RouterState from '../system/router_state';
   @class RoutingService
 */
 export default class RoutingService extends Service {
-  router!: EmberRouter;
+  get router(): EmberRouter {
+    let router = this[ROUTER];
+    if (router !== undefined) {
+      return router;
+    }
+    const owner = getOwner(this) as Owner;
+    router = owner.lookup('router:main') as EmberRouter;
+    router.setupRouter();
+    return (this[ROUTER] = router);
+  }
+
   hasRoute(routeName: string) {
     return this.router.hasRoute(routeName);
   }
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 62844532a9e..0ab30e9b50e 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -511,8 +511,6 @@ function commonSetupRegistry(registry) {
 
   // Register the routing service...
   registry.register('service:-routing', RoutingService);
-  // Then inject the app router into it
-  registry.injection('service:-routing', 'router', 'router:main');
 
   // DEBUGGING
   registry.register('resolver-for-debugging:main', registry.resolver, {

From 52e62350d46e852f85c2eadf15069d54a7bd70eb Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Tue, 29 Dec 2020 11:50:48 -0800
Subject: [PATCH 0300/1405] fix linting

---
 .../components/link-to/rendering-angle-test.js      | 13 ++++++-------
 .../-internals/routing/lib/services/routing.ts      |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 99e4c072f7b..fd6aa02f5bc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -1,9 +1,4 @@
-import {
-  moduleFor,
-  ApplicationTestCase,
-  RenderingTestCase,
-  runTask,
-} from 'internal-test-helpers';
+import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
@@ -106,7 +101,11 @@ moduleFor(
     ['@test should be able to be inserted in DOM when the router is not present - block']() {
       this.render(`<LinkTo @route='index'>Go to Index</LinkTo>`);
 
-      this.assertComponentElement(this.element.firstChild, { tagName: 'a', attrs: { href: '#/' }, content: 'Go to Index' });
+      this.assertComponentElement(this.element.firstChild, {
+        tagName: 'a',
+        attrs: { href: '#/' },
+        content: 'Go to Index',
+      });
     }
   }
 );
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 457cf3c7f03..d459c07bacd 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -3,10 +3,10 @@
 */
 
 import { getOwner, Owner } from '@ember/-internals/owner';
+import { symbol } from '@ember/-internals/utils';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
-import { symbol } from '@ember/-internals/utils';
 import EmberRouter, { QueryParam } from '../system/router';
 import RouterState from '../system/router_state';
 

From 763e756362c7cdc48d6bd91b0ef4920af225a93e Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Tue, 29 Dec 2020 12:13:25 -0800
Subject: [PATCH 0301/1405] fix injection test

---
 packages/@ember/application/tests/application_test.js | 1 -
 packages/@ember/engine/tests/engine_test.js           | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 9b2601e4664..2bce001fcba 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -156,7 +156,6 @@ moduleFor(
       verifyRegistration(assert, application, 'component:textarea');
 
       verifyRegistration(assert, application, 'service:-routing');
-      verifyInjection(assert, application, 'service:-routing', 'router', 'router:main');
 
       // DEBUGGING
       verifyRegistration(assert, application, 'resolver-for-debugging:main');
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 428ea1f0d87..018b342a4e8 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -81,7 +81,6 @@ moduleFor(
       verifyRegistration(assert, engine, 'component:textarea');
 
       verifyRegistration(assert, engine, 'service:-routing');
-      verifyInjection(assert, engine, 'service:-routing', 'router', 'router:main');
 
       // DEBUGGING
       verifyRegistration(assert, engine, 'resolver-for-debugging:main');

From a2dbcd444d6cf55353fbfe161fa301d7e6a1a1b9 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Tue, 29 Dec 2020 15:01:00 -0800
Subject: [PATCH 0302/1405] fix async get handler test

---
 .../query_param_async_get_handler_test.js     | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index b2f64ec5ee6..629cb4777b5 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -21,28 +21,31 @@ moduleFor(
         },
 
         setupRouter() {
-          this._super(...arguments);
-          let { _handlerPromises: handlerPromises, _seenHandlers: seenHandlers } = this;
-          let getRoute = this._routerMicrolib.getRoute;
-
-          this._routerMicrolib.getRoute = function (routeName) {
-            fetchedHandlers.push(routeName);
-
-            // Cache the returns so we don't have more than one Promise for a
-            // given handler.
-            return (
-              handlerPromises[routeName] ||
-              (handlerPromises[routeName] = new RSVP.Promise((resolve) => {
-                setTimeout(() => {
-                  let handler = getRoute(routeName);
-
-                  seenHandlers[routeName] = handler;
-
-                  resolve(handler);
-                }, 10);
-              }))
-            );
-          };
+          let isNewSetup = this._super(...arguments);
+          if (isNewSetup) {
+            let { _handlerPromises: handlerPromises, _seenHandlers: seenHandlers } = this;
+            let getRoute = this._routerMicrolib.getRoute;
+
+            this._routerMicrolib.getRoute = function (routeName) {
+              fetchedHandlers.push(routeName);
+
+              // Cache the returns so we don't have more than one Promise for a
+              // given handler.
+              return (
+                handlerPromises[routeName] ||
+                (handlerPromises[routeName] = new RSVP.Promise((resolve) => {
+                  setTimeout(() => {
+                    let handler = getRoute(routeName);
+
+                    seenHandlers[routeName] = handler;
+
+                    resolve(handler);
+                  }, 10);
+                }))
+              );
+            };
+          }
+          return isNewSetup;
         },
 
         _getQPMeta(routeInfo) {

From 9825d231d4ca51542011baccdf7b4a39af59d580 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 08:34:54 +0000
Subject: [PATCH 0303/1405] Bump semver from 6.3.0 to 7.3.4

Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 7.3.4.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/master/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v7.3.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index c5e807a82b2..88b3bcb20da 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "inflection": "^1.12.0",
     "jquery": "^3.5.0",
     "resolve": "^1.17.0",
-    "semver": "^6.1.1",
+    "semver": "^7.3.4",
     "silent-error": "^1.1.1"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index ef6c9d334f9..3c26211e645 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7296,6 +7296,13 @@ lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
   integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 magic-string@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.0.tgz#1b396d26406188f1fa3730a68229562d36a1c2f2"
@@ -9092,15 +9099,17 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
+  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
+  dependencies:
+    lru-cache "^6.0.0"
 
 send@0.17.1:
   version "0.17.1"
@@ -10558,6 +10567,11 @@ yallist@^3.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
 yam@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"

From c5a0a594d6586f0ea4a4bae1fa97af7626c3c569 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 7 Jan 2021 00:46:44 -0800
Subject: [PATCH 0304/1405] [DOC lts] Remove mention on `transition-to` helper

The `transition-to` helper does not exists.

I suppose we could mention how to do this with the `{{on}}` modifier along with
a custom action, but that would still be inappropiate for accessibility reasons
in most cases. We should probably just deprecate this functionality, but in the
mean time, we can probably just leave it at this.
---
 packages/@ember/-internals/glimmer/lib/components/link-to.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 1ca712aac1c..1376eba4ba3 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -231,8 +231,7 @@ import layout from '../templates/link-to';
   </li>
   ```
 
-  In general, this is not recommended. Instead, you can use the `transition-to` helper together
-  with a click event handler on the HTML tag of your choosing.
+  In general, this is not recommended.
 
   ### Supplying query parameters
 

From ba57d78d1b655097cba9e7437dd051269ee82419 Mon Sep 17 00:00:00 2001
From: Chad Hietala <chadhietala@gmail.com>
Date: Tue, 12 Jan 2021 16:01:27 -0500
Subject: [PATCH 0305/1405] bugfix: Ensure Component Lookup Is Well Formed

This PR introduces an assertion during the component name refinement to
assert that the lookup syntax is well formed. If a developer
accidentally types ":" instead of "::" you will end up with a runtime
erorr that looks like:

```
Uncaught Error: Assertion Failed: fullName must be a proper full name
    at assert (vendor.js:52729)
    at Container.lookup (vendor.js:16581)
    at Class.lookup (vendor.js:43950)
    at layoutFor (vendor.js:28680)
    at lookupComponentPair (vendor.js:28697)
    at lookupComponent (vendor.js:28711)
    at RuntimeResolver._lookupComponentDefinition (vendor.js:28992)
    at RuntimeResolver.lookupComponentHandle (vendor.js:28837)
    at CompileTimeLookup.lookupComponentDefinition (vendor.js:25065)
    at LazyCompiler.resolveLayoutForTag (vendor.js:60366)
```

This message is not actionable for developers. This PR will causes a
compile time error to occur with the following information:

```
Malformed component lookup in "test.js". Got <Foo:Bar \/> but you must use \"::\" to indicate a lookup
```
---
 .../lib/system/compile-options.ts                      | 10 ++++++++++
 .../tests/system/compile_options_test.js               | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 1e9e2129cfc..6a3d6cccfc4 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,4 +1,5 @@
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
+import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { PrecompileOptions } from '@glimmer/compiler';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
@@ -8,6 +9,10 @@ import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
 
 let USER_PLUGINS: PluginFunc[] = [];
 
+function malformedComponentLookup(string: string) {
+  return string.indexOf('::') === -1 && string.indexOf(':') > -1;
+}
+
 export default function compileOptions(
   _options: Partial<EmberPrecompileOptions> = {}
 ): PrecompileOptions {
@@ -16,6 +21,11 @@ export default function compileOptions(
     _options,
     {
       customizeComponentName(tagname: string): string {
+        assert(
+          `Malformed component lookup in "${_options.moduleName}". Got <${tagname} /> but you must use "::" to indicate a lookup`,
+          !malformedComponentLookup(tagname)
+        );
+
         return COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE.get(tagname);
       },
     }
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index 1ee2968adf8..cfbccbe8317 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -15,6 +15,16 @@ moduleFor(
       assert.notEqual(compileOptions(), compileOptions());
     }
 
+    ['@test customizeComponentName asserts name is well formed'](assert) {
+      let options = compileOptions({ moduleName: 'test.js' });
+
+      expectAssertion(() => {
+        options.customizeComponentName('Foo:Bar');
+      }, /Malformed component lookup in "test.js". Got <Foo:Bar \/> but you must use "::" to indicate a lookup/);
+
+      assert.ok(options.customizeComponentName('Foo::Bar'));
+    }
+
     ['@test has default AST plugins in resolution mode'](assert) {
       assert.expect(RESOLUTION_MODE_TRANSFORMS.length);
 

From a0580d2d382b8c790e90059adcc44ce9671faa40 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 13 Jan 2021 19:46:27 -0500
Subject: [PATCH 0306/1405] [BUGFIX release] Ensure query param only <LinkTo />
 are properly scoped in engines.

Prior to this change, the test would fail with the following:

```
Assertion Failed: You attempted to generate a link for the "UNDEFINED" route, but did not pass the models required for generating its dynamic segments. There is no route named blog.blog.category
    at assert (http://localhost:7020/tests/ember.js:32996:15)
    at Class.computeLinkToComponentHref (http://localhost:7020/tests/ember.js:5808:50)
    at http://localhost:7020/tests/ember.js:11860:25
    at untrack (http://localhost:7020/tests/ember.js:54650:14)
    at ComputedProperty.get (http://localhost:7020/tests/ember.js:11859:32)
    at Class.getter [as href] (http://localhost:7020/tests/ember.js:10949:25)
    at getPossibleMandatoryProxyValue (http://localhost:7020/tests/ember.js:11250:19)
    at _getProp (http://localhost:7020/tests/ember.js:11315:17)
    at http://localhost:7020/tests/ember.js:45192:45
    at http://localhost:7020/tests/ember.js:45140:37
```

This is because inside a QP only transition we always use
`_currentRoute` which has **already been namespaced**.
---
 .../glimmer/lib/components/link-to.ts         |  3 ++-
 .../integration/application/engine-test.js    | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 1376eba4ba3..a1d8267bb60 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -517,7 +517,8 @@ const LinkComponent = EmberComponent.extend({
 
   _route: computed('route', '_currentRouterState', function computeLinkToComponentRoute(this: any) {
     let { route } = this;
-    return this._namespaceRoute(route === UNDEFINED ? this._currentRoute : route);
+
+    return route === UNDEFINED ? this._currentRoute : this._namespaceRoute(route);
   }),
 
   _models: computed('model', 'models', function computeLinkToComponentModels(this: any) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 5104cc5591d..2ceadc86064 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -890,6 +890,25 @@ moduleFor(
       });
     }
 
+    '@test query params only transitions work properly'(assert) {
+      assert.expect(1);
+
+      let tmpl = '<LinkTo @query={{hash type="news"}}>News</LinkTo>';
+
+      this.setupAppAndRoutableEngine();
+      this.additionalEngineRegistrations(function () {
+        this.register('template:category', compile(tmpl));
+      });
+
+      return this.visit('/blog/category/1').then(() => {
+        let suffix = '/blog/category/1?type=news';
+        let href = this.element.querySelector('a').href;
+
+        // check if link ends with the suffix
+        assert.ok(this.stringsEndWith(href, suffix));
+      });
+    }
+
     async ['@test query params in customized controllerName have stickiness by default between model'](
       assert
     ) {

From b18f67eb526108f328df624f1f8c51994ef556d3 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 14 Jan 2021 10:14:39 -0500
Subject: [PATCH 0307/1405] Add v3.24.1 to CHANGELOG.md.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9980832875d..19ecaf3a543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - [#18148](https://github.com/emberjs/ember.js/pull/18148) [BUGFIX] Fix empty `htmlSafe` string to be treated as falsy
 - [#19320](https://github.com/emberjs/ember.js/pull/19320) / [#19317](https://github.com/emberjs/ember.js/pull/19317) / [#19297](https://github.com/emberjs/ember.js/pull/19297) / [#19293](https://github.com/emberjs/ember.js/pull/19293) / [#19278](https://github.com/emberjs/ember.js/pull/19278) / [#19275](https://github.com/emberjs/ember.js/pull/19275) Update rendering engine to `@glimmer/*` 0.73.1 for various features and bugfixes including ensuring `{{component.name}}` works with implicit this fallback
 
+### v3.24.1 (January 14, 2021)
+
+- [#19337](https://github.com/emberjs/ember.js/pull/19337) [BUGFIX] Ensure query param only `<LinkTo />` are properly scoped in engines
+
 ### v3.24.0 (December 28, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 

From c874f1599045e2ac6e6cccd1701a02e66ae4d43b Mon Sep 17 00:00:00 2001
From: Chad Hietala <chadhietala@gmail.com>
Date: Thu, 14 Jan 2021 10:38:32 -0500
Subject: [PATCH 0308/1405] Update
 packages/ember-template-compiler/lib/system/compile-options.ts

Co-authored-by: Godfrey Chan <godfreykfc@gmail.com>
---
 packages/ember-template-compiler/lib/system/compile-options.ts  | 2 +-
 .../tests/system/compile_options_test.js                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 6a3d6cccfc4..36059842997 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -22,7 +22,7 @@ export default function compileOptions(
     {
       customizeComponentName(tagname: string): string {
         assert(
-          `Malformed component lookup in "${_options.moduleName}". Got <${tagname} /> but you must use "::" to indicate a lookup`,
+          `You tried to invoke a component named <${tagname} /> in "${_options.moduleName}", but that is not a valid name for a component. Did you mean to use the "::" syntax for nested components?`,
           !malformedComponentLookup(tagname)
         );
 
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index cfbccbe8317..d093f9d84da 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -20,7 +20,7 @@ moduleFor(
 
       expectAssertion(() => {
         options.customizeComponentName('Foo:Bar');
-      }, /Malformed component lookup in "test.js". Got <Foo:Bar \/> but you must use "::" to indicate a lookup/);
+      }, /You tried to invoke a component named <Foo:Bar \/> in "test.js", but that is not a valid name for a component. Did you mean to use the "::" syntax for nested components\?/);
 
       assert.ok(options.customizeComponentName('Foo::Bar'));
     }

From f79f226b778b10372216e4693106d1375970eff4 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 14 Jan 2021 13:33:32 -0500
Subject: [PATCH 0309/1405] [BUGFIX release] Add missing `deprecate` options
 (`for` + `since`)

---
 packages/@ember/-internals/console/index.js   | 24 +++++++++++++++++++
 .../@ember/-internals/runtime/lib/copy.js     |  4 ++++
 .../-internals/runtime/lib/ext/function.js    | 12 ++++++++++
 .../views/lib/mixins/action_support.js        |  4 ++++
 .../views/lib/mixins/text_support.js          |  4 ++++
 .../views/lib/mixins/view_support.js          |  4 ++++
 .../lib/system/jquery_event_deprecation.js    |  4 ++++
 .../@ember/application/globals-resolver.js    |  4 ++++
 packages/ember/index.js                       | 16 +++++++++++++
 9 files changed, 76 insertions(+)

diff --git a/packages/@ember/-internals/console/index.js b/packages/@ember/-internals/console/index.js
index a5d8b83e57a..41b97ec62c5 100644
--- a/packages/@ember/-internals/console/index.js
+++ b/packages/@ember/-internals/console/index.js
@@ -45,6 +45,10 @@ if (LOGGER) {
         id: DEPRECATION_ID,
         until: '4.0.0',
         url: DEPRECATION_URL,
+        for: 'ember-source',
+        since: {
+          enabled: '3.2.0',
+        },
       });
       return console.log(...arguments); // eslint-disable-line no-console
     },
@@ -68,6 +72,10 @@ if (LOGGER) {
         id: DEPRECATION_ID,
         until: '4.0.0',
         url: DEPRECATION_URL,
+        for: 'ember-source',
+        since: {
+          enabled: '3.2.0',
+        },
       });
       return console.warn(...arguments); // eslint-disable-line no-console
     },
@@ -91,6 +99,10 @@ if (LOGGER) {
         id: DEPRECATION_ID,
         until: '4.0.0',
         url: DEPRECATION_URL,
+        for: 'ember-source',
+        since: {
+          enabled: '3.2.0',
+        },
       });
       return console.error(...arguments); // eslint-disable-line no-console
     },
@@ -115,6 +127,10 @@ if (LOGGER) {
         id: DEPRECATION_ID,
         until: '4.0.0',
         url: DEPRECATION_URL,
+        for: 'ember-source',
+        since: {
+          enabled: '3.2.0',
+        },
       });
       return console.info(...arguments); // eslint-disable-line no-console
     },
@@ -139,6 +155,10 @@ if (LOGGER) {
         id: DEPRECATION_ID,
         until: '4.0.0',
         url: DEPRECATION_URL,
+        for: 'ember-source',
+        since: {
+          enabled: '3.2.0',
+        },
       });
       /* eslint-disable no-console */
       if (console.debug) {
@@ -168,6 +188,10 @@ if (LOGGER) {
         id: DEPRECATION_ID,
         until: '4.0.0',
         url: DEPRECATION_URL,
+        for: 'ember-source',
+        since: {
+          enabled: '3.2.0',
+        },
       });
       return console.assert(...arguments); // eslint-disable-line no-console
     },
diff --git a/packages/@ember/-internals/runtime/lib/copy.js b/packages/@ember/-internals/runtime/lib/copy.js
index 5a439ea6ed2..ea5add693ff 100644
--- a/packages/@ember/-internals/runtime/lib/copy.js
+++ b/packages/@ember/-internals/runtime/lib/copy.js
@@ -101,6 +101,10 @@ export default function copy(obj, deep) {
     id: 'ember-runtime.deprecate-copy-copyable',
     until: '4.0.0',
     url: 'https://emberjs.com/deprecations/v3.x/#toc_ember-runtime-deprecate-copy-copyable',
+    for: 'ember-source',
+    since: {
+      enabled: '3.3.0',
+    },
   });
 
   // fast paths
diff --git a/packages/@ember/-internals/runtime/lib/ext/function.js b/packages/@ember/-internals/runtime/lib/ext/function.js
index 93ced397442..be2ae54d18e 100644
--- a/packages/@ember/-internals/runtime/lib/ext/function.js
+++ b/packages/@ember/-internals/runtime/lib/ext/function.js
@@ -86,6 +86,10 @@ if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
             id: 'function-prototype-extensions.property',
             until: '4.0.0',
             url: 'https://deprecations.emberjs.com/v3.x#toc_function-prototype-extensions-property',
+            for: 'ember-source',
+            since: {
+              enabled: '3.11.0',
+            },
           }
         );
         return computed(...arguments, this);
@@ -131,6 +135,10 @@ if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
             id: 'function-prototype-extensions.observes',
             until: '4.0.0',
             url: 'https://deprecations.emberjs.com/v3.x#toc_function-prototype-extensions-observes',
+            for: 'ember-source',
+            since: {
+              enabled: '3.11.0',
+            },
           }
         );
 
@@ -175,6 +183,10 @@ if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
             id: 'function-prototype-extensions.on',
             until: '4.0.0',
             url: 'https://deprecations.emberjs.com/v3.x#toc_function-prototype-extensions-on',
+            for: 'ember-source',
+            since: {
+              enabled: '3.11.0',
+            },
           }
         );
 
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.js b/packages/@ember/-internals/views/lib/mixins/action_support.js
index 86a0400b055..159f6cc5b8b 100644
--- a/packages/@ember/-internals/views/lib/mixins/action_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.js
@@ -136,6 +136,10 @@ if (SEND_ACTION) {
         id: 'ember-component.send-action',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+        for: 'ember-source',
+        since: {
+          enabled: '3.4.0',
+        },
       }
     );
 
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index ea7ff261614..ecfdcc2054a 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -324,6 +324,10 @@ function sendAction(eventName, view, event) {
       id: 'ember-component.send-action',
       until: '4.0.0',
       url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+      for: 'ember-source',
+      since: {
+        enabled: '3.4.0',
+      },
     });
 
     view.triggerAction({
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.js
index e6fc6a4f977..9e8867c5c98 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.js
@@ -450,6 +450,10 @@ if (JQUERY_INTEGRATION) {
         id: 'ember-views.curly-components.jquery-element',
         until: '4.0.0',
         url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-apis',
+        for: 'ember-source',
+        since: {
+          enabled: '3.9.0',
+        },
       }
     );
     if (this.element) {
diff --git a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
index a9d6db70ee7..f86cf84ae55 100644
--- a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
+++ b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
@@ -31,6 +31,10 @@ export default function addJQueryEventDeprecation(jqEvent) {
                 id: 'ember-views.event-dispatcher.jquery-event',
                 until: '4.0.0',
                 url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-event',
+                for: 'ember-source',
+                since: {
+                  enabled: '3.9.0',
+                },
               }
             );
             return target[name];
diff --git a/packages/@ember/application/globals-resolver.js b/packages/@ember/application/globals-resolver.js
index 848438bae3c..6cb9987131b 100644
--- a/packages/@ember/application/globals-resolver.js
+++ b/packages/@ember/application/globals-resolver.js
@@ -109,6 +109,10 @@ if (GLOBALS_RESOLVER) {
           until: '4.0.0',
           id: 'globals-resolver',
           url: 'https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
+          for: 'ember-source',
+          since: {
+            enabled: '3.16.0',
+          },
         }
       );
 
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 474e88a7b3a..9a5c4cce448 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -196,6 +196,10 @@ if (EMBER_EXTEND_PROTOTYPES) {
         {
           id: 'ember-env.old-extend-prototypes',
           until: '4.0.0',
+          for: 'ember-source',
+          since: {
+            enabled: '3.3.0',
+          },
         }
       );
 
@@ -219,6 +223,10 @@ Object.defineProperty(Ember, 'Resolver', {
         id: 'ember.globals-resolver',
         until: '4.0.0',
         url: 'https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
+        for: 'ember-source',
+        since: {
+          enabled: '3.16.0',
+        },
       }
     );
 
@@ -579,6 +587,10 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.legacy-built-in-components',
             until: '4.0.0',
+            for: 'ember-source',
+            since: {
+              // TODO: update this when enabling the feature
+            },
           }
         );
 
@@ -679,6 +691,10 @@ if (JQUERY_INTEGRATION && !views.jQueryDisabled) {
           id: 'ember-views.curly-components.jquery-element',
           until: '4.0.0',
           url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-apis',
+          for: 'ember-source',
+          since: {
+            enabled: '3.9.0',
+          },
         }
       );
 

From e49285a34d634c297ebac2d88ad4b1e82e0020c5 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Mon, 18 Jan 2021 13:47:22 -0500
Subject: [PATCH 0310/1405] Fix misleading LinkTo error message

This fixes #18640.
---
 .../@ember/-internals/glimmer/lib/components/link-to.ts    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index a1d8267bb60..f3e3af24bc2 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -811,11 +811,8 @@ const LinkComponent = EmberComponent.extend({
           return routing.generateURL(route, models, query);
         } catch (e) {
           // tslint:disable-next-line:max-line-length
-          assert(
-            `You attempted to generate a link for the "${this.route}" route, but did not ` +
-              `pass the models required for generating its dynamic segments. ` +
-              e.message
-          );
+          e.message = `While generating link to route "${this.route}": ${e.message}`;
+          throw e;
         }
       } else {
         return routing.generateURL(route, models, query);

From cd603738478cd76f68bb559b787d646ebf6f091d Mon Sep 17 00:00:00 2001
From: "James C. Davis" <jdavis@salsify.com>
Date: Sun, 17 Jan 2021 14:31:33 -0500
Subject: [PATCH 0311/1405] deprecate htmlSafe/isHTMLSafe reexports on
 Ember.String

---
 packages/ember/index.js | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index 9a5c4cce448..24dff7aeccf 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -651,8 +651,36 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     return htmlSafe(this);
   };
 }
-Ember.String.htmlSafe = htmlSafe;
-Ember.String.isHTMLSafe = isHTMLSafe;
+const deprecateImportFromString = function (
+  name,
+  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
+) {
+  deprecate(message, false, {
+    id: 'ember-string.htmlsafe-ishtmlsafe',
+    for: 'ember-source',
+    since: {
+      enabled: '3.25',
+    },
+    until: '4.0.0',
+    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
+  });
+};
+Object.defineProperty(Ember.String, 'htmlSafe', {
+  enumerable: true,
+  configurable: true,
+  get() {
+    deprecateImportFromString('htmlSafe');
+    return htmlSafe;
+  },
+});
+Object.defineProperty(Ember.String, 'isHTMLSafe', {
+  enumerable: true,
+  configurable: true,
+  get() {
+    deprecateImportFromString('isHTMLSafe');
+    return isHTMLSafe;
+  },
+});
 
 /**
   Global hash of shared templates. This will automatically be populated

From d9ec17a07aaa34fe4942929b0e3072f5a965785d Mon Sep 17 00:00:00 2001
From: "James C. Davis" <jdavis@salsify.com>
Date: Sun, 17 Jan 2021 14:32:27 -0500
Subject: [PATCH 0312/1405] update tests for htmlSafe/isHTMLSafe Ember.String
 deprecation

---
 packages/ember/tests/reexports_test.js | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 55e67962571..9e072eac926 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -68,8 +68,28 @@ moduleFor(
       });
     }
 
-    ['@test Ember.String.isHTMLSafe exports correctly'](assert) {
-      confirmExport(Ember, assert, 'String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe');
+    ['@test Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
+      let glimmer = require('@ember/-internals/glimmer');
+      expectDeprecation(() => {
+        assert.equal(
+          Ember.String.htmlSafe,
+          glimmer.htmlSafe,
+          'Ember.String.htmlSafe is exported correctly'
+        );
+      }, /Importing htmlSafe from '@ember\/string' is deprecated/);
+      assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
+    }
+
+    ['@test Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
+      let glimmer = require('@ember/-internals/glimmer');
+      expectDeprecation(() => {
+        assert.equal(
+          Ember.String.isHTMLSafe,
+          glimmer.isHTMLSafe,
+          'Ember.String.isHTMLSafe is exported correctly'
+        );
+      }, /Importing isHTMLSafe from '@ember\/string' is deprecated/);
+      assert.notEqual(glimmer.isHTMLSafe, undefined, 'Ember.String.isHTMLSafe is not `undefined`');
     }
 
     ['@test Ember.EXTEND_PROTOTYPES is present (but deprecated)'](assert) {
@@ -270,7 +290,6 @@ let allExports = [
   ['Handlebars.template', '@ember/-internals/glimmer', 'template'],
   ['HTMLBars.template', '@ember/-internals/glimmer', 'template'],
   ['Handlebars.Utils.escapeExpression', '@ember/-internals/glimmer', 'escapeExpression'],
-  ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
   ['_setComponentManager', '@ember/-internals/glimmer', 'setComponentManager'],
   ['_componentManagerCapabilities', '@glimmer/manager', 'componentCapabilities'],
   ['_setComponentTemplate', '@glimmer/manager', 'setComponentTemplate'],

From 6488cb3ba75739d08a9e896d72f9c63647791c31 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Tue, 19 Jan 2021 09:20:42 +0000
Subject: [PATCH 0313/1405] update deprecation enabled target to 3.26.0

---
 packages/@ember/-internals/routing/lib/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index f216f60b9e5..a4c82de6b52 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -252,7 +252,7 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
       id: 'routing.transition-methods',
       for: 'ember-source',
       since: {
-        enabled: '3.25.0',
+        enabled: '3.26.0',
       },
       until: '4.0.0',
       url: 'https://deprecations.emberjs.com/v3.x/#toc_routing-transition-methods',

From ce0b37a81fb7eb0b4f43f8728a8ea4288ff5be57 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 19 Jan 2021 17:14:15 -0500
Subject: [PATCH 0314/1405] Add v3.25.0-beta.2 to CHANGELOG

(cherry picked from commit 761580686c2c2b6e812f5fc0893c305bcf9b95d2)
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19ecaf3a543..76058455642 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Ember Changelog
 
+### v3.25.0-beta.2 (January 19, 2020)
+
+- [#19339](https://github.com/emberjs/ember.js/pull/19339) [DEPRECATION] Deprecate importing `htmlSafe` and `isHTMLSafe` from `@ember/string` per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
+- [#19336](https://github.com/emberjs/ember.js/pull/19336) [BUGFIX] Ensure Component Lookup Is Well Formed
+- [#19337](https://github.com/emberjs/ember.js/pull/19337) [BUGFIX] Ensure query param only <LinkTo /> are properly scoped in engines.
+- [#19338](https://github.com/emberjs/ember.js/pull/19338) [BUGFIX] Add missing `deprecate` options (`for` + `since`)
+- [#19342](https://github.com/emberjs/ember.js/pull/19342) [BUGFIX] Fix misleading LinkTo error message
+
 ### v3.25.0-beta.1 (December 28, 2020)
 
 - [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).

From 446267c8d217741af34740730c2aef7a7d009b87 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 20 Jan 2021 00:37:11 -0800
Subject: [PATCH 0315/1405] [RFC 445] Deprecate `{{#with}}`

Also transforms `{{#with}}` into the equivalent combination of
`{{#let}}` and/or `{{#if}}` to allow removing the legacy upstream
code on the Glimmer VM side.

See [RFC 445](https://github.com/emberjs/rfcs/blob/master/text/0445-deprecate-with.md).
---
 packages/@ember/-internals/glimmer/index.ts   |   1 +
 .../angle-bracket-invocation-test.js          |   4 +-
 .../components/contextual-components-test.js  |  46 ++---
 .../tests/integration/helpers/array-test.js   |  20 +-
 .../helpers/element-action-test.js            |   4 +-
 .../tests/integration/helpers/hash-test.js    |  10 +-
 .../tests/integration/helpers/partial-test.js |  72 +++++--
 .../tests/integration/helpers/yield-test.js   |   6 +-
 .../tests/integration/refinements-test.js     |  28 +--
 .../tests/integration/syntax/with-test.js     |  12 ++
 .../lib/plugins/deprecate-with.ts             | 189 ++++++++++++++++++
 .../lib/plugins/index.ts                      |   3 +
 12 files changed, 315 insertions(+), 80 deletions(-)
 create mode 100644 packages/ember-template-compiler/lib/plugins/deprecate-with.ts

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 6361a67283d..d3e2baac667 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -112,6 +112,7 @@
   @for Ember.Templates.helpers
   @param {Object} options
   @return {String} HTML string
+  @deprecated Use '{{#let}}' instead
   @public
  */
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index d8deb91f577..73f4591cc96 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -569,9 +569,9 @@ moduleFor(
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render(strip`
-        {{#with (component 'foo-bar') as |Other|}}
+        {{#let (component 'foo-bar') as |Other|}}
           <Other />
-        {{/with}}
+        {{/let}}
       `);
 
       this.assertComponentElement(this.firstChild, { content: 'hello' });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index efdaea036a6..b4d9541177e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -272,9 +272,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash comp=(component "-looked-up" greeting=this.model.greeting)) as |my|}}
+      {{#let (hash comp=(component "-looked-up" greeting=this.model.greeting)) as |my|}}
         {{#my.comp}}{{/my.comp}}
-      {{/with}}`,
+      {{/let}}`,
         {
           model: {
             greeting: 'Hodi',
@@ -340,11 +340,11 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (component "-looked-up" greeting="Hola" name="Dolores" age=33) as |first|}}
-        {{#with (component first greeting="Hej" name="Sigmundur") as |second|}}
+      {{#let (component "-looked-up" greeting="Hola" name="Dolores" age=33) as |first|}}
+        {{#let (component first greeting="Hej" name="Sigmundur") as |second|}}
           {{component second greeting=this.model.greeting}}
-        {{/with}}
-      {{/with}}`,
+        {{/let}}
+      {{/let}}`,
         {
           model: {
             greeting: 'Hodi',
@@ -616,9 +616,9 @@ moduleFor(
       });
 
       this.render(strip`
-      {{#with (hash lookedup=(component "-looked-up")) as |object|}}
+      {{#let (hash lookedup=(component "-looked-up")) as |object|}}
         {{object.lookedup}}
-      {{/with}}`);
+      {{/let}}`);
 
       this.assertText(expectedText);
 
@@ -635,9 +635,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash lookedup=(component "-looked-up")) as |object|}}
+      {{#let (hash lookedup=(component "-looked-up")) as |object|}}
         {{object.lookedup expectedText=this.model.expectedText}}
-      {{/with}}`,
+      {{/let}}`,
         {
           model: {
             expectedText,
@@ -668,9 +668,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash lookedup=(component "-looked-up" expectedText=this.model.expectedText)) as |object|}}
+      {{#let (hash lookedup=(component "-looked-up" expectedText=this.model.expectedText)) as |object|}}
         {{object.lookedup}}
-      {{/with}}`,
+      {{/let}}`,
         {
           model: {
             expectedText,
@@ -705,9 +705,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash lookedup=(component "-looked-up")) as |object|}}
+      {{#let (hash lookedup=(component "-looked-up")) as |object|}}
         {{object.lookedup this.model.expectedText "Hola"}}
-      {{/with}}`,
+      {{/let}}`,
         {
           model: {
             expectedText,
@@ -748,9 +748,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash my-component=(component 'my-component' first)) as |c|}}
+      {{#let (hash my-component=(component 'my-component' first)) as |c|}}
         {{c.my-component}}
-      {{/with}}`,
+      {{/let}}`,
         { first: 'first' }
       );
 
@@ -946,9 +946,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash ctxCmp=(component "my-comp" isOpen=isOpen)) as |thing|}}
+      {{#let (hash ctxCmp=(component "my-comp" isOpen=isOpen)) as |thing|}}
         {{#thing.ctxCmp}}This is a contextual component{{/thing.ctxCmp}}
-      {{/with}}
+      {{/let}}
     `,
         {
           isOpen: true,
@@ -1010,9 +1010,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash ctxCmp=(component compName isOpen=isOpen)) as |thing|}}
+      {{#let (hash ctxCmp=(component compName isOpen=isOpen)) as |thing|}}
         {{#thing.ctxCmp}}This is a contextual component{{/thing.ctxCmp}}
-      {{/with}}
+      {{/let}}
     `,
         {
           compName: 'my-comp',
@@ -1088,9 +1088,9 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with (hash ctxCmp=(component compName isOpen=isOpen)) as |thing|}}
+      {{#let (hash ctxCmp=(component compName isOpen=isOpen)) as |thing|}}
         {{#thing.ctxCmp}}This is a contextual component{{/thing.ctxCmp}}
-      {{/with}}
+      {{/let}}
     `,
         {
           compName: 'my-comp',
@@ -1198,7 +1198,7 @@ moduleFor(
       });
 
       this.render(
-        '{{#with (hash link=(component "my-link")) as |c|}}{{c.link params=allParams}}{{/with}}',
+        '{{#let (hash link=(component "my-link")) as |c|}}{{c.link params=allParams}}{{/let}}',
         {
           allParams: emberA(['a', 'b']),
         }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
index fa0b5fa0e03..c3957d04c30 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
@@ -9,11 +9,11 @@ moduleFor(
   class extends RenderingTestCase {
     ['@test returns an array']() {
       this.render(strip`
-      {{#with (array "Sergio") as |people|}}
+      {{#let (array "Sergio") as |people|}}
         {{#each people as |personName|}}
           {{personName}}
         {{/each}}
-      {{/with}}`);
+      {{/let}}`);
 
       this.assertText('Sergio');
 
@@ -22,11 +22,11 @@ moduleFor(
 
     ['@test can have more than one value']() {
       this.render(strip`
-      {{#with (array "Sergio" "Robert") as |people|}}
+      {{#let (array "Sergio" "Robert") as |people|}}
         {{#each people as |personName|}}
           {{personName}},
         {{/each}}
-      {{/with}}`);
+      {{/let}}`);
 
       this.assertText('Sergio,Robert,');
 
@@ -35,11 +35,11 @@ moduleFor(
 
     ['@test binds values when variables are used']() {
       this.render(
-        strip`{{#with (array personOne) as |people|}}
+        strip`{{#let (array personOne) as |people|}}
               {{#each people as |personName|}}
                 {{personName}}
               {{/each}}
-            {{/with}}`,
+            {{/let}}`,
         {
           personOne: 'Tom',
         }
@@ -58,11 +58,11 @@ moduleFor(
 
     ['@test binds multiple values when variables are used']() {
       this.render(
-        strip`{{#with (array personOne personTwo) as |people|}}
+        strip`{{#let (array personOne personTwo) as |people|}}
               {{#each people as |personName|}}
                 {{personName}},
               {{/each}}
-            {{/with}}`,
+            {{/let}}`,
         {
           personOne: 'Tom',
           personTwo: 'Yehuda',
@@ -91,14 +91,14 @@ moduleFor(
 
     ['@test array helpers can be nested']() {
       this.render(
-        strip`{{#with (array (array personOne personTwo)) as |listOfPeople|}}
+        strip`{{#let (array (array personOne personTwo)) as |listOfPeople|}}
               {{#each listOfPeople as |people|}}
                 List:
                 {{#each people as |personName|}}
                   {{personName}},
                 {{/each}}
               {{/each}}
-            {{/with}}`,
+            {{/let}}`,
         {
           personOne: 'Tom',
           personTwo: 'Yehuda',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 2719f227280..a52abc9c7b0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -777,7 +777,7 @@ moduleFor(
       this.assert.equal(editHandlerWasCalled, true, 'the event handler was called');
     }
 
-    ['@test it should work properly in a {{#with foo as |bar|}} block']() {
+    ['@test it should work properly in a {{#let foo as |bar|}} block']() {
       let editHandlerWasCalled = false;
 
       let ExampleComponent = Component.extend({
@@ -792,7 +792,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '{{#with something as |somethingElse|}}<a href="#" {{action "edit"}}>click me</a>{{/with}}',
+          '{{#let something as |somethingElse|}}<a href="#" {{action "edit"}}>click me</a>{{/let}}',
       });
 
       this.render('{{example-component}}');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index 1329b91fb4e..bb78e043ee9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -8,7 +8,7 @@ moduleFor(
   'Helpers test: {{hash}}',
   class extends RenderingTestCase {
     ['@test returns a hash with the right key-value']() {
-      this.render(`{{#with (hash name="Sergio") as |person|}}{{person.name}}{{/with}}`);
+      this.render(`{{#let (hash name="Sergio") as |person|}}{{person.name}}{{/let}}`);
 
       this.assertText('Sergio');
 
@@ -19,7 +19,7 @@ moduleFor(
 
     ['@test can have more than one key-value']() {
       this.render(
-        `{{#with (hash name="Sergio" lastName="Arbeo") as |person|}}{{person.name}} {{person.lastName}}{{/with}}`
+        `{{#let (hash name="Sergio" lastName="Arbeo") as |person|}}{{person.name}} {{person.lastName}}{{/let}}`
       );
 
       this.assertText('Sergio Arbeo');
@@ -31,7 +31,7 @@ moduleFor(
 
     ['@test binds values when variables are used']() {
       this.render(
-        `{{#with (hash name=this.model.firstName lastName="Arbeo") as |person|}}{{person.name}} {{person.lastName}}{{/with}}`,
+        `{{#let (hash name=this.model.firstName lastName="Arbeo") as |person|}}{{person.name}} {{person.lastName}}{{/let}}`,
         {
           model: {
             firstName: 'Marisa',
@@ -56,7 +56,7 @@ moduleFor(
 
     ['@test binds multiple values when variables are used']() {
       this.render(
-        `{{#with (hash name=this.model.firstName lastName=this.model.lastName) as |person|}}{{person.name}} {{person.lastName}}{{/with}}`,
+        `{{#let (hash name=this.model.firstName lastName=this.model.lastName) as |person|}}{{person.name}} {{person.lastName}}{{/let}}`,
         {
           model: {
             firstName: 'Marisa',
@@ -91,7 +91,7 @@ moduleFor(
 
     ['@test hash helpers can be nested']() {
       this.render(
-        `{{#with (hash person=(hash name=this.model.firstName)) as |ctx|}}{{ctx.person.name}}{{/with}}`,
+        `{{#let (hash person=(hash name=this.model.firstName)) as |ctx|}}{{ctx.person.name}}{{/let}}`,
         {
           model: { firstName: 'Balint' },
         }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
index 82f119ea77d..96e44c0514b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
@@ -125,15 +125,15 @@ moduleFor(
       this.assertText('apple: apple |orange: orange |banana: banana |');
     }
 
-    ['@test partial using `{{get` on data from {{#with}}']() {
+    ['@test partial using `{{get` on data from {{#let}}']() {
       this.registerPartial('show-id', '{{get item "id"}}');
 
       expectDeprecation(() => {
         this.render(
           strip`
-          {{#with this.model as |item|}}
+          {{#let this.model as |item|}}
             {{item.name}}: {{partial 'show-id'}}
-          {{/with}}`,
+          {{/let}}`,
           {
             model: { id: 1, name: 'foo' },
           }
@@ -258,40 +258,40 @@ moduleFor(
       this.assertText('0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]');
     }
 
-    ['@test nested partials within nested `{{#with}}` blocks']() {
+    ['@test nested partials within nested `{{#let}}` blocks']() {
       this.registerPartial(
         '_person2-partial',
         strip`
-      {{#with 'Ben' as |person2|}}
+      {{#let 'Ben' as |person2|}}
         Hi {{person1}} (aged {{age}}) and {{person2}}. {{partial 'person3-partial'}}
-      {{/with}}
+      {{/let}}
     `
       );
 
       this.registerPartial(
         '_person3-partial',
         strip`
-      {{#with 'Alex' as |person3|}}
+      {{#let 'Alex' as |person3|}}
         Hi {{person1}} (aged {{age}}), {{person2}} and {{person3}}. {{partial 'person4-partial'}}
-      {{/with}}
+      {{/let}}
     `
       );
 
       this.registerPartial(
         '_person4-partial',
         strip`
-      {{#with 'Sarah' as |person4|}}
+      {{#let 'Sarah' as |person4|}}
         Hi {{person1}} (aged {{age}}), {{person2}}, {{person3}} and {{person4}}.
-      {{/with}}
+      {{/let}}
     `
       );
 
       expectDeprecation(() => {
         this.render(
           strip`
-        {{#with 'Sophie' as |person1|}}
+        {{#let 'Sophie' as |person1|}}
           Hi {{person1}} (aged {{age}}). {{partial 'person2-partial'}}
-        {{/with}}`,
+        {{/let}}`,
           { age: 0 }
         );
       }, /The use of `{{partial}}` is deprecated, please refactor the "person(2|3|4)-partial" partial to a component/);
@@ -352,24 +352,54 @@ moduleFor(
       this.assertText('number: EVEN0number: ODD1number: EVEN2number: ODD3');
     }
 
-    ['@test dynamic partials in {{#with}}']() {
+    ['@test [DEPRECATED] dynamic partials in {{#with}}']() {
+      this.registerPartial('_thing', '{{t}}');
+
+      expectDeprecation(() => {
+        this.render(
+          strip`
+        {{#with item.thing as |t|}}
+          {{partial t}}
+        {{else}}
+          Nothing!
+        {{/with}}`,
+          {
+            item: { thing: false },
+          }
+        );
+      }, /`{{#with}}` is deprecated\./);
+
+      this.assertStableRerender();
+
+      this.assertText('Nothing!');
+
+      expectDeprecation(() => {
+        runTask(() => set(this.context, 'item.thing', 'thing'));
+      }, 'The use of `{{partial}}` is deprecated, please refactor the "thing" partial to a component');
+
+      this.assertText('thing');
+
+      runTask(() => set(this.context, 'item', { thing: false }));
+
+      this.assertText('Nothing!');
+    }
+
+    ['@test dynamic partials in {{#let}}']() {
       this.registerPartial('_thing', '{{t}}');
 
       this.render(
         strip`
-      {{#with item.thing as |t|}}
+      {{#let item.thing as |t|}}
         {{partial t}}
-      {{else}}
-        Nothing!
-      {{/with}}`,
+      {{/let}}`,
         {
-          item: { thing: false },
+          item: { thing: null },
         }
       );
 
       this.assertStableRerender();
 
-      this.assertText('Nothing!');
+      this.assertText('');
 
       expectDeprecation(() => {
         runTask(() => set(this.context, 'item.thing', 'thing'));
@@ -377,9 +407,9 @@ moduleFor(
 
       this.assertText('thing');
 
-      runTask(() => set(this.context, 'item', { thing: false }));
+      runTask(() => set(this.context, 'item', { thing: null }));
 
-      this.assertText('Nothing!');
+      this.assertText('');
     }
 
     ['@test partials which contain contextual components']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
index 51b13c6730f..6efa12652e7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
@@ -203,7 +203,7 @@ moduleFor(
         template: '<p>{{boundText}}</p><p>{{yield}}</p>',
       });
 
-      this.render('{{#with boundText as |item|}}{{#kiwi-comp}}{{item}}{{/kiwi-comp}}{{/with}}', {
+      this.render('{{#let boundText as |item|}}{{#kiwi-comp}}{{item}}{{/kiwi-comp}}{{/let}}', {
         boundText: 'Outer',
       });
       this.assertText('InnerOuter');
@@ -222,7 +222,7 @@ moduleFor(
 
       this.registerComponent('kiwi-comp', {
         ComponentClass: KiwiCompComponent,
-        template: '{{#with boundText as |item|}}<p>{{item}}</p><p>{{yield}}</p>{{/with}}',
+        template: '{{#let boundText as |item|}}<p>{{item}}</p><p>{{yield}}</p>{{/let}}',
       });
 
       this.render('{{#kiwi-comp}}{{item}}{{/kiwi-comp}}', { item: 'Outer' });
@@ -243,7 +243,7 @@ moduleFor(
       });
 
       this.render(
-        '{{#with boundText as |item|}}{{#kiwi-comp content=item}}{{item}}{{/kiwi-comp}}{{/with}}',
+        '{{#let boundText as |item|}}{{#kiwi-comp content=item}}{{item}}{{/kiwi-comp}}{{/let}}',
         { boundText: 'Outer' }
       );
       this.assertText('OuterOuter');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js b/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
index d97364e0046..3626311f848 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
@@ -10,45 +10,45 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with var as |foo|}}
+      {{#let var as |foo|}}
         {{foo}}
-      {{/with}}
+      {{/let}}
 
       ---
 
-      {{#with var as |outlet|}}
+      {{#let var as |outlet|}}
         {{outlet}}
-      {{/with}}
+      {{/let}}
 
       ---
 
-      {{#with var as |mount|}}
+      {{#let var as |mount|}}
         {{mount}}
-      {{/with}}
+      {{/let}}
 
       ---
 
-      {{#with var as |component|}}
+      {{#let var as |component|}}
         {{component}}
-      {{/with}}
+      {{/let}}
 
       ---
 
-      {{#with var as |input|}}
+      {{#let var as |input|}}
         {{input}}
-      {{/with}}
+      {{/let}}
 
       ---
 
-      {{#with var as |-with-dynamic-vars|}}
+      {{#let var as |-with-dynamic-vars|}}
         {{-with-dynamic-vars}}
-      {{/with}}
+      {{/let}}
 
       ---
 
-      {{#with var as |-in-element|}}
+      {{#let var as |-in-element|}}
         {{-in-element}}
-      {{/with}}`,
+      {{/let}}`,
         { var: 'var' }
       );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
index 5943f61f02e..a841ba07c99 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
@@ -8,6 +8,10 @@ import { IfUnlessWithSyntaxTest } from '../../utils/shared-conditional-tests';
 moduleFor(
   'Syntax test: {{#with}}',
   class extends IfUnlessWithSyntaxTest {
+    beforeEach() {
+      expectDeprecation(/^`{{#with}}` is deprecated\./);
+    }
+
     templateFor({ cond, truthy, falsy }) {
       return `{{#with ${cond}}}${truthy}{{else}}${falsy}{{/with}}`;
     }
@@ -17,6 +21,10 @@ moduleFor(
 moduleFor(
   'Syntax test: {{#with as}}',
   class extends IfUnlessWithSyntaxTest {
+    beforeEach() {
+      expectDeprecation(/^`{{#with}}` is deprecated\./);
+    }
+
     templateFor({ cond, truthy, falsy }) {
       return `{{#with ${cond} as |test|}}${truthy}{{else}}${falsy}{{/with}}`;
     }
@@ -247,6 +255,10 @@ moduleFor(
 moduleFor(
   'Syntax test: Multiple {{#with as}} helpers',
   class extends RenderingTestCase {
+    beforeEach() {
+      expectDeprecation(/^`{{#with}}` is deprecated\./);
+    }
+
     ['@test re-using the same variable with different {{#with}} blocks does not override each other']() {
       this.render(
         `Admin: {{#with admin as |person|}}{{person.name}}{{/with}} User: {{#with user as |person|}}{{person.name}}{{/with}}`,
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
new file mode 100644
index 00000000000..f4452652057
--- /dev/null
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
@@ -0,0 +1,189 @@
+import { assert, deprecate } from '@ember/debug';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
+import { isPath } from './utils';
+
+/**
+ @module ember
+*/
+
+/**
+  A Glimmer2 AST transformation that deprecates `{{#with}}` and replace it
+  with `{{#let}}` and `{{#if}}` as per RFC 445.
+
+  Transforms:
+
+  ```handlebars
+  {{#with this.foo as |bar|}}
+    ...
+  {{/with}}
+  ```
+
+  Into:
+
+  ```handlebars
+  {{#let this.foo as |bar|}}
+    {{#if bar}}
+      ...
+    {{/if}}
+  {{/let}}
+  ```
+
+  And:
+
+  ```handlebars
+  {{#with this.foo as |bar|}}
+    ...
+  {{else}}
+    ...
+  {{/with}}
+  ```
+
+  Into:
+
+  ```handlebars
+  {{#let this.foo as |bar|}}
+    {{#if bar}}
+      ...
+    {{else}}
+      ...
+    {{/if}}
+  {{/let}}
+  ```
+
+  And issues a deprecation message.
+
+  @private
+  @class DeprecateWith
+*/
+export default function deprecateWith(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { moduleName } = env.meta;
+  let { builders: b } = env.syntax;
+
+  return {
+    name: 'deprecate-with',
+
+    visitor: {
+      BlockStatement(node: AST.BlockStatement) {
+        if (!isPath(node.path) || node.path.original !== 'with') return;
+
+        let { params, hash, program, inverse, loc, openStrip, inverseStrip, closeStrip } = node;
+
+        let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
+
+        assert(
+          `\`{{#with}}\` takes a single positional argument (the path to alias), received ${displayParams(
+            params
+          )}. ${sourceInformation}`,
+          params.length === 1
+        );
+
+        assert(
+          `\`{{#with}}\` does not take any named arguments, received ${displayHash(
+            hash
+          )}. ${sourceInformation}`,
+          hash.pairs.length === 0
+        );
+
+        assert(
+          `\`{{#with}}\` yields a single block param, received ${displayBlockParams(
+            program.blockParams
+          )}. ${sourceInformation}`,
+          program.blockParams.length <= 1
+        );
+
+        let recommendation;
+
+        if (program.blockParams.length === 0) {
+          recommendation = 'Use `{{#if}}` instead.';
+        } else if (inverse) {
+          recommendation = 'Use `{{#let}}` together with `{{#if}} instead.';
+        } else {
+          recommendation =
+            'If you always want the block to render, replace `{{#with}}` with `{{#let}}`. ' +
+            'If you want to conditionally render the block, use `{{#let}}` together with `{{#if}} instead.';
+        }
+
+        deprecate(`\`{{#with}}\` is deprecated. ${recommendation} ${sourceInformation}`, false, {
+          id: 'ember-glimmer.with-syntax',
+          until: '4.0.0',
+          for: 'ember-source',
+          since: {
+            enabled: '3.26.0-beta.1',
+          },
+        });
+
+        if (program.blockParams.length === 0) {
+          return b.block(
+            'if',
+            params,
+            null,
+            program,
+            inverse,
+            loc,
+            openStrip,
+            inverseStrip,
+            closeStrip
+          );
+        } else {
+          return b.block(
+            'let',
+            params,
+            null,
+            b.blockItself(
+              [
+                b.block(
+                  'if',
+                  [b.path(program.blockParams[0])],
+                  null,
+                  b.blockItself(program.body, [], program.chained, program.loc),
+                  inverse,
+                  loc,
+                  openStrip,
+                  inverseStrip,
+                  closeStrip
+                ),
+              ],
+              program.blockParams,
+              false,
+              loc
+            ),
+            null,
+            loc,
+            openStrip,
+            inverseStrip,
+            closeStrip
+          );
+        }
+      },
+    },
+  };
+}
+
+function displayParams(params: AST.Expression[]): string {
+  if (params.length === 0) {
+    return 'no positional arguments';
+  } else {
+    let display = params.map((param) => `\`${JSON.stringify(param)}\``).join(', ');
+    return `${params.length} positional arguments: ${display}`;
+  }
+}
+
+function displayHash({ pairs }: AST.Hash): string {
+  if (pairs.length === 0) {
+    return 'no named arguments';
+  } else {
+    let display = pairs.map((pair) => `\`${pair.key}\``).join(', ');
+    return `${pairs.length} named arguments: ${display}`;
+  }
+}
+
+function displayBlockParams(blockParams: string[]): string {
+  if (blockParams.length === 0) {
+    return 'no block params';
+  } else {
+    let display = blockParams.map((param) => `\`${param}\``).join(', ');
+    return `${blockParams.length} block params: ${display}`;
+  }
+}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 756d528d0f1..4b8ac4fe831 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -4,6 +4,7 @@ import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
 import DeprecateSendAction from './deprecate-send-action';
+import DeprecateWith from './deprecate-with';
 import TransformActionSyntax from './transform-action-syntax';
 import TransformAttrsIntoArgs from './transform-attrs-into-args';
 import TransformEachInIntoEach from './transform-each-in-into-each';
@@ -34,6 +35,7 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
+    DeprecateWith,
     SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
@@ -50,6 +52,7 @@ export const STRICT_MODE_TRANSFORMS = Object.freeze(
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
+    DeprecateWith,
     SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,

From 99804d0217144bf0a1cd0b9a486515857ac9f60f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 20 Jan 2021 21:30:24 +0000
Subject: [PATCH 0316/1405] [Security] Bump socket.io from 2.1.0 to 2.4.1

Bumps [socket.io](https://github.com/socketio/socket.io) from 2.1.0 to 2.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.1/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/2.1.0...2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 234 ++++++++++++++++++++++++++----------------------------
 1 file changed, 111 insertions(+), 123 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3c26211e645..b8097915b4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2384,11 +2384,6 @@ async-disk-cache@^1.2.1:
     rsvp "^3.0.18"
     username-sync "1.0.1"
 
-async-limiter@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
-  integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
-
 async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.5.tgz#cb23bce9fce903a133946a700cc85f27f09ea49d"
@@ -2595,20 +2590,20 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-arraybuffer@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8"
-  integrity sha1-c5JncZI7Whl0etZmqlzUv5xunOg=
+base64-arraybuffer@0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
+  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
 
-base64id@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
-  integrity sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=
+base64id@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
 base@^0.11.1:
   version "0.11.2"
@@ -2630,13 +2625,6 @@ basic-auth@~2.0.0:
   dependencies:
     safe-buffer "5.1.1"
 
-better-assert@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
-  integrity sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=
-  dependencies:
-    callsite "1.0.0"
-
 binary-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
@@ -2661,10 +2649,10 @@ blank-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
   integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
 
-blob@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
-  integrity sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=
+blob@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
+  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
 bluebird@^3.1.1, bluebird@^3.4.6:
   version "3.5.1"
@@ -3428,11 +3416,6 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
-callsite@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
-  integrity sha1-KAOY5dZkvXQDi28JBRU+borxvCA=
-
 callsites@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
@@ -3793,6 +3776,11 @@ component-emitter@1.2.1, component-emitter@^1.2.1:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
   integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
 
+component-emitter@~1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
@@ -3902,16 +3890,16 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
-
 cookie@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
 
+cookie@~0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
+  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -4019,7 +4007,7 @@ debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -4549,45 +4537,45 @@ end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36"
-  integrity sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==
+engine.io-client@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7"
+  integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==
   dependencies:
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     component-inherit "0.0.3"
     debug "~3.1.0"
-    engine.io-parser "~2.1.1"
+    engine.io-parser "~2.2.0"
     has-cors "1.1.0"
     indexof "0.0.1"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    ws "~3.3.1"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
+    ws "~7.4.2"
     xmlhttprequest-ssl "~1.5.4"
     yeast "0.1.2"
 
-engine.io-parser@~2.1.0, engine.io-parser@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz#4c0f4cff79aaeecbbdcfdea66a823c6085409196"
-  integrity sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==
+engine.io-parser@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
+  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.5"
-    blob "0.0.4"
+    base64-arraybuffer "0.1.4"
+    blob "0.0.5"
     has-binary2 "~1.0.2"
 
-engine.io@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz#54332506f42f2edc71690d2f2a42349359f3bf7d"
-  integrity sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==
+engine.io@~3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
+  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
   dependencies:
     accepts "~1.3.4"
-    base64id "1.0.0"
-    cookie "0.3.1"
-    debug "~3.1.0"
-    engine.io-parser "~2.1.0"
-    ws "~3.3.1"
+    base64id "2.0.0"
+    cookie "~0.4.1"
+    debug "~4.1.0"
+    engine.io-parser "~2.2.0"
+    ws "~7.4.2"
 
 enquirer@^2.3.5:
   version "2.3.6"
@@ -5888,9 +5876,9 @@ has-ansi@^2.0.0:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz#e83dba49f0b9be4d026d27365350d9f03f54be98"
-  integrity sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
+  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
   dependencies:
     isarray "2.0.1"
 
@@ -7522,12 +7510,17 @@ mime-db@1.44.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
+mime-db@1.45.0:
+  version "1.45.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
+  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+
 "mime-db@>= 1.40.0 < 2":
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
-mime-types@^2.1.18, mime-types@^2.1.19, mime-types@~2.1.24:
+mime-types@^2.1.18, mime-types@^2.1.19:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
   integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
@@ -7539,6 +7532,13 @@ mime-types@~1.0.1:
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce"
   integrity sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4=
 
+mime-types@~2.1.24:
+  version "2.1.28"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
+  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+  dependencies:
+    mime-db "1.45.0"
+
 mime@1.6.0, mime@^1.2.11:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -7689,9 +7689,9 @@ ms@2.1.1:
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
 ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 mustache@^3.0.0:
   version "3.0.1"
@@ -7883,11 +7883,6 @@ object-assign@4.1.1, object-assign@^4.1.0:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
-object-component@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
-  integrity sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=
-
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
@@ -8152,19 +8147,15 @@ parse5@1.1.3:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.1.3.tgz#8bab58d06525f00e4e37d755116eb82e7241f142"
   integrity sha1-i6tY0GUl8A5ON9dVEW64LnJB8UI=
 
-parseqs@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
-  integrity sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=
-  dependencies:
-    better-assert "~1.0.0"
+parseqs@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
+  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
 
-parseuri@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz#80204a50d4dbb779bfdc6ebe2778d90e4bce320a"
-  integrity sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=
-  dependencies:
-    better-assert "~1.0.0"
+parseuri@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
+  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
 
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
@@ -9291,50 +9282,56 @@ sntp@0.2.x:
     hoek "0.9.x"
 
 socket.io-adapter@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz#2a805e8a14d6372124dd9159ad4502f8cb07f06b"
-  integrity sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
+  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
 
-socket.io-client@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.0.tgz#0d0b21d460dc4ed36e57085136f2be0137ff20ff"
-  integrity sha512-TvKPpL0cBON5LduQfR8Rxrr+ktj70bLXGvqHCL3er5avBXruB3gpnbaud5ikFYVfANH1gCABAvo0qN8Axpg2ew==
+socket.io-client@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
+  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
   dependencies:
     backo2 "1.0.2"
-    base64-arraybuffer "0.1.5"
     component-bind "1.0.0"
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     debug "~3.1.0"
-    engine.io-client "~3.2.0"
+    engine.io-client "~3.5.0"
     has-binary2 "~1.0.2"
-    has-cors "1.1.0"
     indexof "0.0.1"
-    object-component "0.0.3"
-    parseqs "0.0.5"
-    parseuri "0.0.5"
-    socket.io-parser "~3.2.0"
+    parseqs "0.0.6"
+    parseuri "0.0.6"
+    socket.io-parser "~3.3.0"
     to-array "0.1.4"
 
-socket.io-parser@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz#e7c6228b6aa1f814e6148aea325b51aa9499e077"
-  integrity sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==
+socket.io-parser@~3.3.0:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
+  integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
   dependencies:
-    component-emitter "1.2.1"
+    component-emitter "~1.3.0"
     debug "~3.1.0"
     isarray "2.0.1"
 
+socket.io-parser@~3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
+  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
+  dependencies:
+    component-emitter "1.2.1"
+    debug "~4.1.0"
+    isarray "2.0.1"
+
 socket.io@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.0.tgz#de77161795b6303e7aefc982ea04acb0cec17395"
-  integrity sha512-KS+3CNWWNtLbVN5j0/B+1hjxRzey+oTK6ejpAOoxMZis6aXeB8cUtfuvjHl97tuZx+t/qD/VyqFMjuzu2Js6uQ==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
+  integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==
   dependencies:
-    debug "~3.1.0"
-    engine.io "~3.2.0"
+    debug "~4.1.0"
+    engine.io "~3.5.0"
     has-binary2 "~1.0.2"
     socket.io-adapter "~1.1.0"
-    socket.io-client "2.1.0"
-    socket.io-parser "~3.2.0"
+    socket.io-client "2.4.0"
+    socket.io-parser "~3.4.0"
 
 sort-keys@^2.0.0:
   version "2.0.0"
@@ -10124,11 +10121,6 @@ uglify-js@^3.1.4:
   dependencies:
     commander "~2.20.3"
 
-ultron@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
-  integrity sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==
-
 unbzip2-stream@^1.3.3:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
@@ -10515,14 +10507,10 @@ ws@^7.2.3:
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
   integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
 
-ws@~3.3.1:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz#f1cf84fe2d5e901ebce94efaece785f187a228f2"
-  integrity sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==
-  dependencies:
-    async-limiter "~1.0.0"
-    safe-buffer "~5.1.0"
-    ultron "~1.1.0"
+ws@~7.4.2:
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
+  integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
 
 xdg-basedir@^3.0.0:
   version "3.0.0"

From f2ff13b2793e3790726454f70ad6a181f1a046b8 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 21 Jan 2021 08:24:02 +0100
Subject: [PATCH 0317/1405] [DOC] Call super in Glimmer component willDestroy
 hook example

---
 .../@ember/-internals/glimmer/lib/glimmer-component-docs.ts     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index f2bc9aa09ea..27cfcccd2be 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -325,6 +325,8 @@
     @service myAnimations;
 
     willDestroy() {
+      super.willDestroy(...arguments);
+
       this.myAnimations.unregister(this);
     }
   }

From 432c2ec8e1e248ec9137fc830fda767ae6d593a4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 21 Jan 2021 16:37:49 -0800
Subject: [PATCH 0318/1405] [CLEANUP] Some misc cleanup for the internal
 classes

---
 packages/@ember/-internals/glimmer/index.ts   |  2 +-
 .../lib/component-managers/internal.ts        |  4 +-
 .../glimmer/lib/components/input.ts           | 12 +++--
 .../glimmer/lib/components/internal.ts        | 13 ++----
 .../glimmer/lib/modifiers/internal.ts         | 44 ++++++++-----------
 .../-internals/glimmer/lib/setup-registry.ts  |  2 +-
 6 files changed, 33 insertions(+), 44 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index d3e2baac667..042748c699b 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -368,7 +368,7 @@ export { default as Checkbox } from './lib/components/checkbox';
 export { default as TextField } from './lib/components/text-field';
 export { default as TextArea } from './lib/components/textarea';
 export { default as LinkComponent } from './lib/components/link-to';
-export { InputComponent as Input } from './lib/components/input';
+export { default as Input } from './lib/components/input';
 export { default as Component } from './lib/component';
 export { default as Helper, helper } from './lib/helper';
 export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
index 3fda28fee7f..d6636a3ee5e 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
@@ -65,9 +65,7 @@ export default class InternalManager
     let { ComponentClass } = this;
     let instance = new ComponentClass(owner, args.named.capture(), valueForRef(caller));
 
-    let state = { env, instance };
-
-    return state;
+    return { env, instance };
   }
 
   didCreate(): void {}
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index eb3141cd4d8..612da87b8bb 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -127,21 +127,27 @@ import InternalComponent from './internal';
   @param {Hash} options
   @public
 */
-export default class Input extends InternalComponent {
+class Input extends InternalComponent {
   get isCheckbox(): boolean {
     return this.arg('type') === 'checkbox';
   }
 }
 
 // Use an opaque handle so implementation details are
-export const InputComponent = {
+const InputComponent = {
   // Factory interface
   create(): never {
     throw assert('Use constructor instead of create');
   },
+
+  toString(): string {
+    return '@ember/component/input';
+  },
 };
 
 setInternalComponentManager(new InternalManager(Input, 'input'), InputComponent);
 setComponentTemplate(InputTemplate, InputComponent);
 
-Input.toString = () => '@ember/component/input';
+Input.toString = InputComponent.toString;
+
+export default InputComponent;
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 406985a14ca..264e69d7884 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -3,16 +3,9 @@ import { guidFor } from '@ember/-internals/utils';
 import { Reference, valueForRef } from '@glimmer/reference';
 
 export default class InternalComponent {
-  static get class(): typeof InternalComponent {
-    return this;
-  }
-
-  static get fullName(): string {
-    return this.name;
-  }
-
-  static get normalizedName(): string {
-    return this.name;
+  // Override this
+  static toString(): string {
+    return 'internal component';
   }
 
   constructor(
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index 886728732b0..35f0755546a 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -8,26 +8,13 @@ import {
   InternalModifierManager as ModifierManager,
   VMArguments,
 } from '@glimmer/interfaces';
-import { setInternalModifierManager } from '@glimmer/manager';
 import { valueForRef } from '@glimmer/reference';
 import { SimpleElement } from '@simple-dom/interface';
 
 export default class InternalModifier {
-  // Factory interface
-  static create(): never {
-    throw assert('Use constructor instead of create');
-  }
-
-  static get class(): typeof InternalModifier {
-    return this;
-  }
-
-  static get fullName(): string {
-    return this.name;
-  }
-
-  static get normalizedName(): string {
-    return this.name;
+  // Override this
+  static toString(): string {
+    return 'internal modifier';
   }
 
   constructor(
@@ -57,25 +44,32 @@ export default class InternalModifier {
   }
 }
 
+function destructor(modifier: InternalModifier): void {
+  modifier.remove();
+}
+
 class InternalModifierState implements Destroyable {
-  constructor(readonly name: string, readonly instance: InternalModifier) {}
+  constructor(readonly instance: InternalModifier) {}
 }
 
-class InternalModifierManager
+export class InternalModifierManager
   implements ModifierManager<InternalModifierState, typeof InternalModifier> {
+  constructor(private ModifierClass: typeof InternalModifier, private name: string) {}
+
   create(
     owner: Owner,
     element: SimpleElement,
-    factory: typeof InternalModifier,
+    _definition: unknown,
     args: VMArguments
   ): InternalModifierState {
     assert('element must be an HTMLElement', element instanceof HTMLElement);
 
-    let instance = new factory(owner, element, args.capture());
+    let { ModifierClass } = this;
+    let instance = new ModifierClass(owner, element, args.capture());
 
-    registerDestructor(instance, (modifier) => modifier.remove());
+    registerDestructor(instance, destructor);
 
-    return new InternalModifierState(factory.name, instance);
+    return new InternalModifierState(instance);
   }
 
   // not needed for now, but feel free to implement this
@@ -83,8 +77,8 @@ class InternalModifierManager
     return null;
   }
 
-  getDebugName({ name }: typeof InternalModifier): string {
-    return name;
+  getDebugName(): string {
+    return this.name;
   }
 
   install({ instance }: InternalModifierState): void {
@@ -100,5 +94,3 @@ class InternalModifierManager
     return instance;
   }
 }
-
-setInternalModifierManager(new InternalModifierManager(), InternalModifier);
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index fc11783ffda..4b922158d2c 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -2,7 +2,7 @@ import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import Component from './component';
 import Checkbox from './components/checkbox';
-import { InputComponent } from './components/input';
+import InputComponent from './components/input';
 import LinkToComponent from './components/link-to';
 import TextField from './components/text-field';
 import TextArea from './components/textarea';

From e6cf1766f8e02ddb24bf67833c148e7d7c93182f Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 19 Oct 2020 23:39:49 -0700
Subject: [PATCH 0319/1405] [FEATURE modernized-built-in-components] First-pass
 implementation

First-pass implementation for converting the `<Input>` component
into an internal (not classic) component compatibly. This passes
all the existing tests.

Some follow-up work before this is ready for prime time:

- Implement any remaining classic component features not covered
  by the existing tests.

- Detect any unimplementable classic component features and deopt
  into the previous implementation.

- Write the second deprecation RFC and get the proposal merged.
---
 .../glimmer/lib/components/input.ts           | 661 +++++++++++++++++-
 .../glimmer/lib/templates/input.hbs           |  98 ++-
 .../application/debug-render-tree-test.ts     |  97 +--
 .../components/input-angle-test.js            |  36 +-
 .../components/input-curly-test.js            |  23 +-
 .../@ember/-internals/metal/lib/tracked.ts    |   1 +
 packages/@ember/-internals/views/index.d.ts   |   2 +
 packages/@ember/object/index.d.ts             |   1 +
 8 files changed, 863 insertions(+), 56 deletions(-)
 create mode 100644 packages/@ember/object/index.d.ts

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 612da87b8bb..f51eb6680fe 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -1,11 +1,168 @@
 /**
 @module @ember/component
 */
-import { assert } from '@ember/debug';
+import { hasDOM } from '@ember/-internals/browser-environment';
+import { tracked } from '@ember/-internals/metal';
+import { guidFor } from '@ember/-internals/utils';
+import { jQuery, jQueryDisabled } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, deprecate, warn } from '@ember/debug';
+import {
+  JQUERY_INTEGRATION,
+  MOUSE_ENTER_LEAVE_MOVE_EVENTS,
+  SEND_ACTION,
+} from '@ember/deprecated-features';
+import { action } from '@ember/object';
 import { setComponentTemplate, setInternalComponentManager } from '@glimmer/manager';
+import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
+import { untrack } from '@glimmer/validator';
 import InternalManager from '../component-managers/internal';
 import InputTemplate from '../templates/input';
 import InternalComponent from './internal';
+
+let isValidInputType: (type: string) => boolean;
+
+if (hasDOM && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  const INPUT_TYPES: Record<string, boolean | undefined> = Object.create(null);
+  const INPUT_ELEMENT = document.createElement('input');
+
+  INPUT_TYPES[''] = false;
+  INPUT_TYPES['text'] = true;
+  INPUT_TYPES['checkbox'] = true;
+
+  isValidInputType = (type: string) => {
+    let isValid = INPUT_TYPES[type];
+
+    if (isValid === undefined) {
+      try {
+        INPUT_ELEMENT.type = type;
+        isValid = INPUT_ELEMENT.type === type;
+      } catch (e) {
+        isValid = false;
+      } finally {
+        INPUT_ELEMENT.type = 'text';
+      }
+
+      INPUT_TYPES[type] = isValid;
+    }
+
+    return isValid;
+  };
+} else {
+  isValidInputType = (type: string) => type !== '';
+}
+
+function NOOP() {}
+
+const UNINITIALIZED: unknown = Object.freeze({});
+
+/**
+ * This interface paves over the differences between these three cases:
+ *
+ * 1. `<Input />` or `<Input @value="some string" />`
+ * 2. `<Input @value={{this.value}} />`
+ * 3. `<Input @value={{to-upper-case this.value}} />`
+ *
+ * For the first set of cases (any const reference in general), the semantics
+ * are that `@value` is treated as an initial value only, just like the `value`
+ * attribute. Perhaps using the `value` attribute would have been more Correct™
+ * here, but that would make a pretty confusing API, and the user's intent is
+ * pretty clear, so we support it.
+ *
+ * The second case is the most common. `{{this.value}}` is an updatable
+ * reference here so the value is fully owned and bound to the "upstream" value
+ * and we don't store a copy of it in the component.
+ *
+ * The last case is the most tricky. There are a lot of different ways for this
+ * to happen, but the end result is that we have a non-const and non-updatable
+ * reference in our hands. The semantics here is a mix of the first two cases.
+ * We take the computed value as the initial value, but hold a copy of it and
+ * allow it to diverge from upstream. However, when the upstream recomputes to
+ * a value different than what we originally had, we would reconcile with the
+ * new upstream value and throw away the local copy.
+ *
+ * It's not clear that we intended to support the last case, or that it is used
+ * intentionally in the real world, but it's a fallout of the two-way binding
+ * system and `Ember.Component` semantics from before.
+ *
+ * This interface paves over the differences so the component doesn't have to
+ * worry about it.
+ *
+ * All of the above applies to `@checked` as well.
+ */
+function valueFrom(reference?: Reference<unknown>): Value {
+  if (reference === undefined) {
+    return new LocalValue(undefined);
+  } else if (isConstRef(reference)) {
+    return new LocalValue(valueForRef(reference));
+  } else if (isUpdatableRef(reference)) {
+    return new UpstreamValue(reference);
+  } else {
+    return new ForkedValue(reference);
+  }
+}
+
+interface Value {
+  get(): unknown;
+  set(value: unknown): void;
+}
+
+class LocalValue implements Value {
+  @tracked private value: unknown;
+
+  constructor(value: unknown) {
+    this.value = value;
+  }
+
+  get(): unknown {
+    return this.value;
+  }
+
+  set(value: unknown): void {
+    this.value = value;
+  }
+}
+
+class UpstreamValue implements Value {
+  constructor(private reference: Reference<unknown>) {}
+
+  get(): unknown {
+    return valueForRef(this.reference);
+  }
+
+  set(value: unknown): void {
+    updateRef(this.reference, value);
+  }
+}
+
+class ForkedValue implements Value {
+  private local?: Value;
+  private upstream: Value;
+
+  private lastUpstreamValue = UNINITIALIZED;
+
+  constructor(reference: Reference<unknown>) {
+    this.upstream = new UpstreamValue(reference);
+  }
+
+  get(): unknown {
+    let upstreamValue = this.upstream.get();
+
+    if (upstreamValue !== this.lastUpstreamValue) {
+      this.lastUpstreamValue = upstreamValue;
+      this.local = new LocalValue(upstreamValue);
+    }
+
+    assert('[BUG] this.local must have been initialized at this point', this.local);
+    return this.local.get();
+  }
+
+  set(value: unknown): void {
+    assert('[BUG] this.local must have been initialized at this point', this.local);
+    this.local.set(value);
+  }
+}
+
 /**
   See [Ember.Templates.components.Input](/ember/release/classes/Ember.Templates.components/methods/Input?anchor=Input).
 
@@ -128,9 +285,511 @@ import InternalComponent from './internal';
   @public
 */
 class Input extends InternalComponent {
+  modernized = Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS);
+
+  /**
+   * The default HTML id attribute. We don't really _need_ one, this is just
+   * added for compatibility as it's hard to tell if people rely on it being
+   * present, and it doens't really hurt.
+   *
+   * However, don't rely on this internally, like passing it to `getElementId`.
+   * This can be (and often is) overriden by passing an `id` attribute on the
+   * invocation, which shadows this default id via `...attributes`.
+   */
+  get id(): string {
+    return guidFor(this);
+  }
+
+  /**
+   * The default HTML class attribute. Similar to the above, we don't _need_
+   * them, they are just added for compatibility as it's similarly hard to tell
+   * if people rely on it in their CSS etc, and it doens't really hurt.
+   */
+  get class(): string {
+    if (this.isCheckbox) {
+      return 'ember-checkbox ember-view';
+    } else {
+      return 'ember-text-field ember-view';
+    }
+  }
+
+  /**
+   * The HTML type attribute.
+   */
+  get type(): string {
+    let type = this.arg('type');
+
+    if (type === null || type === undefined) {
+      return 'text';
+    }
+
+    assert(
+      'The `@type` argument to the <Input> component must be a string',
+      typeof type === 'string'
+    );
+
+    return isValidInputType(type) ? type : 'text';
+  }
+
   get isCheckbox(): boolean {
     return this.arg('type') === 'checkbox';
   }
+
+  _checked = valueFrom(this.args.checked);
+
+  get checked(): unknown {
+    if (this.isCheckbox) {
+      warn(
+        '`<Input @type="checkbox" />` reflects its checked state via the `@checked` argument. ' +
+          'You wrote `<Input @type="checkbox" @value={{...}} />` which is likely not what you intended. ' +
+          'Did you mean `<Input @type="checkbox" @checked={{...}} />`?',
+        untrack(
+          () =>
+            this.args.checked !== undefined ||
+            this.args.value === undefined ||
+            typeof valueForRef(this.args.value) === 'string'
+        ),
+        { id: 'ember.built-in-components.input-checkbox-value' }
+      );
+
+      return this._checked.get();
+    } else {
+      return undefined;
+    }
+  }
+
+  set checked(checked: unknown) {
+    warn(
+      '`<Input @type="checkbox" />` reflects its checked state via the `@checked` argument. ' +
+        'You wrote `<Input @type="checkbox" @value={{...}} />` which is likely not what you intended. ' +
+        'Did you mean `<Input @type="checkbox" @checked={{...}} />`?',
+      untrack(
+        () =>
+          this.args.checked !== undefined ||
+          this.args.value === undefined ||
+          typeof valueForRef(this.args.value) === 'string'
+      ),
+      { id: 'ember.built-in-components.input-checkbox-value' }
+    );
+
+    this._checked.set(checked);
+  }
+
+  _value = valueFrom(this.args.value);
+
+  get value(): unknown {
+    return this._value.get();
+  }
+
+  set value(value: unknown) {
+    this._value.set(value);
+  }
+
+  @action checkedDidChange(event: Event): void {
+    this.checked = this.elementFor(event).checked;
+  }
+
+  @action valueDidChange(event: Event): void {
+    this.value = this.valueFor(event);
+  }
+
+  @action change(event: Event): void {
+    if (this.isCheckbox) {
+      this.checkedDidChange(event);
+    } else {
+      this.valueDidChange(event);
+    }
+  }
+
+  @action input(event: Event): void {
+    if (!this.isCheckbox) {
+      this.valueDidChange(event);
+    }
+  }
+
+  @action keyUp(event: KeyboardEvent): void {
+    let value = this.valueFor(event);
+
+    switch (event.key) {
+      case 'Enter':
+        this.callbackFor('enter')(value, event);
+        this.callbackFor('insert-newline')(value, event);
+        break;
+
+      case 'Escape':
+        this.callbackFor('escape-press')(value, event);
+        break;
+    }
+  }
+
+  private elementFor(event: Event): HTMLInputElement {
+    assert(
+      '[BUG] Event target must be the <input> element',
+      event.target instanceof HTMLInputElement
+    );
+
+    return event.target;
+  }
+
+  private valueFor(event: Event): string {
+    return this.elementFor(event).value;
+  }
+
+  private callbackFor(type: string): (value: string, event: Event) => void {
+    let callback = this.arg(type);
+
+    if (callback) {
+      assert(
+        `The \`@${type}\` argument to the <Input> component must be a function`,
+        typeof callback === 'function'
+      );
+      return callback as (value: string, event: Event) => void;
+    } else {
+      return NOOP;
+    }
+  }
+}
+
+// Deprecated features
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  // Attribute bindings
+  {
+    let defineGetterForDeprecatedAttributeBinding = (
+      attribute: string,
+      argument = attribute
+    ): void => {
+      assert(
+        `[BUG] There is already a getter for _${argument} on Input`,
+        !Object.getOwnPropertyDescriptor(Input.prototype, `_${argument}`)
+      );
+
+      Object.defineProperty(Input.prototype, `_${argument}`, {
+        get(this: Input): unknown {
+          deprecate(
+            `Passing the \`@${argument}\` argument to <Input> is deprecated. ` +
+              `Instead, please pass the attribute directly, i.e. \`<Input ${attribute}={{...}} />\` ` +
+              `instead of \`<Input @${argument}={{...}} />\` or \`{{input ${argument}=...}}\`.`,
+            true /* TODO !(argument in this.args) */,
+            {
+              id: 'ember.built-in-components.legacy-attribute-arguments',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          return this.arg(argument);
+        },
+      });
+
+      let descriptor = Object.getOwnPropertyDescriptor(Input.prototype, argument);
+
+      if (descriptor) {
+        const superGetter = descriptor.get;
+        assert(`Expecting ${argument} to be a getter on Input`, typeof superGetter === 'function');
+
+        Object.defineProperty(Input.prototype, argument, {
+          ...descriptor,
+          get(this: Input): unknown {
+            // The `class` attribute is concatenated/merged instead of clobbered
+            if (attribute === 'class' && argument in this.args) {
+              let arg = this[`_${argument}`];
+
+              if (arg) {
+                return `${superGetter.call(this)} ${this[`_${argument}`]}`;
+              } else {
+                return superGetter.call(this);
+              }
+            } else if (argument in this.args) {
+              return this[`_${argument}`];
+            } else {
+              return superGetter.call(this);
+            }
+          },
+        });
+      }
+    };
+
+    let deprecatedAttributeBindings: Array<
+      string | Parameters<typeof defineGetterForDeprecatedAttributeBinding>
+    > = [
+      // Component
+      'id',
+      'class',
+      ['class', 'classNames'],
+
+      // TextSupport
+      'autocapitalize',
+      'autocorrect',
+      'autofocus',
+      'disabled',
+      'form',
+      'maxlength',
+      'minlength',
+      'placeholder',
+      'readonly',
+      'required',
+      'selectionDirection',
+      'spellcheck',
+      'tabindex',
+      'title',
+
+      // TextField
+      'accept',
+      'autocomplete',
+      'autosave',
+      'dir',
+      'formaction',
+      'formenctype',
+      'formmethod',
+      'formnovalidate',
+      'formtarget',
+      'height',
+      'inputmode',
+      'lang',
+      'list',
+      'max',
+      'min',
+      'multiple',
+      'name',
+      'pattern',
+      'size',
+      'step',
+      'width',
+
+      // Checkbox
+      'indeterminate',
+    ];
+
+    deprecatedAttributeBindings.forEach((args) => {
+      if (Array.isArray(args)) {
+        defineGetterForDeprecatedAttributeBinding(...args);
+      } else {
+        defineGetterForDeprecatedAttributeBinding(args);
+      }
+    });
+  }
+
+  // Event callbacks
+  {
+    let defineGetterForDeprecatedEventCallback = (
+      eventName: string,
+      methodName: string = eventName,
+      virtualEvent?: string
+    ): void => {
+      assert(
+        `[BUG] There is already a getter for _${methodName} on Input`,
+        !Object.getOwnPropertyDescriptor(Input.prototype, `_${methodName}`)
+      );
+
+      let descriptor = Object.getOwnPropertyDescriptor(Input.prototype, methodName);
+
+      Object.defineProperty(Input.prototype, `_${methodName}`, {
+        get(this: Input): unknown {
+          return (event: Event): void => {
+            let value = this['valueFor'].call(this, event);
+
+            if (methodName in this.args) {
+              deprecate(
+                `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
+                  `This would have overwritten the internal \`${methodName}\` method on ` +
+                  `the <Input> component and prevented it from functioning properly. ` +
+                  `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
+                  `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
+                true /* TODO !descriptor */,
+                {
+                  id: 'ember.built-in-components.legacy-attribute-arguments',
+                  for: 'ember-source',
+                  since: {},
+                  until: '4.0.0',
+                }
+              );
+
+              deprecate(
+                `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
+                  `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
+                  `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
+                true /* TODO descriptor */,
+                {
+                  id: 'ember.built-in-components.legacy-attribute-arguments',
+                  for: 'ember-source',
+                  since: {},
+                  until: '4.0.0',
+                }
+              );
+
+              let callback = this['callbackFor'].call(this, methodName);
+              callback(value, event);
+            } else if (virtualEvent && virtualEvent in this.args) {
+              deprecate(
+                `Passing the \`@${virtualEvent}\` argument to <Input> is deprecated. ` +
+                  `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
+                  `instead of \`<Input @${virtualEvent}={{...}} />\` or \`{{input ${virtualEvent}=...}}\`.`,
+                true /* TODO false */,
+                {
+                  id: 'ember.built-in-components.legacy-attribute-arguments',
+                  for: 'ember-source',
+                  since: {},
+                  until: '4.0.0',
+                }
+              );
+
+              this['callbackFor'].call(this, virtualEvent)(value, event);
+            }
+          };
+        },
+      });
+
+      if (descriptor) {
+        const superGetter = descriptor.get;
+
+        assert(
+          `[BUG] Expecting ${methodName} on Input to be a getter`,
+          typeof superGetter === 'function'
+        );
+
+        Object.defineProperty(Input.prototype, methodName, {
+          get(this: Input): unknown {
+            if (methodName in this.args) {
+              return this[`_${methodName}`];
+            } else if (virtualEvent && virtualEvent in this.args) {
+              let superCallback = superGetter.call(this);
+              let virtualCallback = this[`_${methodName}`];
+
+              return (event: Event) => {
+                superCallback(event);
+                virtualCallback(event);
+              };
+            } else {
+              return superGetter.call(this);
+            }
+          },
+        });
+      }
+    };
+
+    let deprecatedEventCallbacks: Array<
+      string | Parameters<typeof defineGetterForDeprecatedEventCallback>
+    > = [
+      // EventDispatcher
+      ['touchstart', 'touchStart'],
+      ['touchmove', 'touchMove'],
+      ['touchend', 'touchEnd'],
+      ['touchcancel', 'touchCancel'],
+      ['keydown', 'keyDown', 'key-down'],
+      ['keyup', 'keyUp', 'key-up'],
+      ['keypress', 'keyPress', 'key-press'],
+      ['mousedown', 'mouseDown'],
+      ['mouseup', 'mouseUp'],
+      ['contextmenu', 'contextMenu'],
+      'click',
+      ['dblclick', 'doubleClick'],
+      ['focusin', 'focusIn', 'focus-in'],
+      ['focusout', 'focusOut', 'focus-out'],
+      'submit',
+      'input',
+      'change',
+      ['dragstart', 'dragStart'],
+      'drag',
+      ['dragenter', 'dragEnter'],
+      ['dragleave', 'dragLeave'],
+      ['dragover', 'dragOver'],
+      'drop',
+      ['dragend', 'dragEnd'],
+    ];
+
+    if (MOUSE_ENTER_LEAVE_MOVE_EVENTS) {
+      deprecatedEventCallbacks.push(
+        ['mouseenter', 'mouseEnter'],
+        ['mouseleave', 'mouseLeave'],
+        ['mousemove', 'mouseMove']
+      );
+    } else {
+      Object.assign(Input.prototype, {
+        _mouseEnter: NOOP,
+        _mouseLeave: NOOP,
+        _mouseMove: NOOP,
+      });
+    }
+
+    deprecatedEventCallbacks.forEach((args) => {
+      if (Array.isArray(args)) {
+        defineGetterForDeprecatedEventCallback(...args);
+      } else {
+        defineGetterForDeprecatedEventCallback(args);
+      }
+    });
+  }
+
+  // String actions
+  if (SEND_ACTION) {
+    interface View {
+      send(action: string, value: string, event: Event): void;
+    }
+
+    let isView = (target: {}): target is View => {
+      return typeof (target as Partial<View>).send === 'function';
+    };
+
+    let superCallbackFor = Input.prototype['callbackFor'];
+
+    Object.assign(Input.prototype, {
+      callbackFor(this: Input, type: string): (value: string, event: Event) => void {
+        const actionName = this.arg(type);
+
+        if (typeof actionName === 'string') {
+          deprecate(
+            `Passing actions to components as strings (like \`<Input @${type}="${actionName}" />\`) is deprecated. ` +
+              `Please use closure actions instead (\`<Input @${type}={{action "${actionName}"}} />\`).`,
+            false,
+            {
+              id: 'ember-component.send-action',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+              url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+            }
+          );
+
+          const { caller } = this;
+
+          assert('[BUG] Missing caller', caller && typeof caller === 'object');
+
+          if (isView(caller)) {
+            return (value: string, event: Event) => caller.send(actionName, value, event);
+          } else {
+            assert(
+              `The action '${actionName}' did not exist on ${caller}`,
+              typeof caller[actionName] === 'function'
+            );
+
+            return caller[actionName];
+          }
+        } else {
+          return superCallbackFor.call(this, type);
+        }
+      },
+    });
+  }
+
+  // jQuery Events
+  if (JQUERY_INTEGRATION) {
+    let superCallbackFor = Input.prototype['callbackFor'];
+
+    Object.assign(Input.prototype, {
+      callbackFor(this: Input, type: string): (value: string, event: Event) => void {
+        let callback = superCallbackFor.call(this, type);
+
+        if (jQuery && !jQueryDisabled) {
+          return (value: string, event: Event) => {
+            callback(value, new jQuery.Event(event));
+          };
+        } else {
+          return callback;
+        }
+      },
+    });
+  }
 }
 
 // Use an opaque handle so implementation details are
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index 5097a8ebc6f..348633c84b3 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -1,7 +1,91 @@
-{{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}
-  {{~#if this.isCheckbox~}}
-    <Checkbox @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
-  {{~else~}}
-    <TextField @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
-  {{~/if~}}
-{{~/let~}}
+{{~#if this.modernized ~}}
+  <input
+    {{!-- for compatibility --}}
+    id={{this.id}}
+    class={{this.class}}
+
+    {{!-- deprecated attribute bindings --}}
+    autocapitalize={{this._autocapitalize}}
+    autocorrect={{this._autocorrect}}
+    autofocus={{this._autofocus}}
+    disabled={{this._disabled}}
+    form={{this._form}}
+    maxlength={{this._maxlength}}
+    minlength={{this._minlength}}
+    placeholder={{this._placeholder}}
+    readonly={{this._readonly}}
+    required={{this._required}}
+    selectionDirection={{this._selectionDirection}}
+    spellcheck={{this._spellcheck}}
+    tabindex={{this._tabindex}}
+    title={{this._title}}
+    accept={{this._accept}}
+    autocomplete={{this._autocomplete}}
+    autosave={{this._autosave}}
+    dir={{this._dir}}
+    formaction={{this._formaction}}
+    formenctype={{this._formenctype}}
+    formmethod={{this._formmethod}}
+    formnovalidate={{this._formnovalidate}}
+    formtarget={{this._formtarget}}
+    height={{this._height}}
+    inputmode={{this._inputmode}}
+    lang={{this._lang}}
+    list={{this._list}}
+    max={{this._max}}
+    min={{this._min}}
+    multiple={{this._multiple}}
+    name={{this._name}}
+    pattern={{this._pattern}}
+    size={{this._size}}
+    step={{this._step}}
+    width={{this._width}}
+    indeterminate={{this._indeterminate}}
+
+    ...attributes
+
+    type={{this.type}}
+    checked={{this.checked}}
+    value={{this.value}}
+
+    {{on "change" this.change}}
+    {{on "input" this.input}}
+    {{on "keyup" this.keyUp}}
+    {{on "paste" this.valueDidChange}}
+    {{on "cut" this.valueDidChange}}
+
+    {{!-- deprecated native event callbacks --}}
+    {{on "touchstart" this._touchStart}}
+    {{on "touchmove" this._touchMove}}
+    {{on "touchend" this._touchEnd}}
+    {{on "touchcancel" this._touchCancel}}
+    {{on "keydown" this._keyDown}}
+    {{on "keypress" this._keyPress}}
+    {{on "mousedown" this._mouseDown}}
+    {{on "mouseup" this._mouseUp}}
+    {{on "contextmenu" this._contextMenu}}
+    {{on "click" this._click}}
+    {{on "dblclick" this._doubleClick}}
+    {{on "focusin" this._focusIn}}
+    {{on "focusout" this._focusOut}}
+    {{on "submit" this._submit}}
+    {{on "dragstart" this._dragStart}}
+    {{on "drag" this._drag}}
+    {{on "dragenter" this._dragEnter}}
+    {{on "dragleave" this._dragLeave}}
+    {{on "dragover" this._dragOver}}
+    {{on "drop" this._drop}}
+    {{on "dragend" this._dragEnd}}
+    {{on "mouseenter" this._mouseEnter}}
+    {{on "mouseleave" this._mouseLeave}}
+    {{on "mousemove" this._mouseMove}}
+  />
+{{~else~}}
+  {{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}
+    {{~#if this.isCheckbox~}}
+      <Checkbox @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
+    {{~else~}}
+      <TextField @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
+    {{~/if~}}
+  {{~/let~}}
+{{/if}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 21c866e5266..2a2d1c68364 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -9,6 +9,7 @@ import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
 import { EngineInstanceOptions, Owner } from '@ember/-internals/owner';
 import { Route } from '@ember/-internals/routing';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Controller from '@ember/controller';
 import { captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
@@ -1276,17 +1277,19 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
-            children: [
-              {
-                type: 'component',
-                name: '-text-field',
-                args: { positional: [], named: { target, type: 'text', value: 'first' } },
-                instance: (instance: object) => instance['value'] === 'first',
-                template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                bounds: this.nodeBounds(this.element.firstChild),
-                children: [],
-              },
-            ],
+            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+              ? []
+              : [
+                  {
+                    type: 'component',
+                    name: '-text-field',
+                    args: { positional: [], named: { target, type: 'text', value: 'first' } },
+                    instance: (instance: object) => instance['value'] === 'first',
+                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
+                    bounds: this.nodeBounds(this.element.firstChild),
+                    children: [],
+                  },
+                ],
           },
         ]);
 
@@ -1300,17 +1303,19 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
-            children: [
-              {
-                type: 'component',
-                name: '-text-field',
-                args: { positional: [], named: { target, type: 'text', value: 'first' } },
-                instance: (instance: object) => instance['value'] === 'first',
-                template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                bounds: this.nodeBounds(this.element.firstChild),
-                children: [],
-              },
-            ],
+            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+              ? []
+              : [
+                  {
+                    type: 'component',
+                    name: '-text-field',
+                    args: { positional: [], named: { target, type: 'text', value: 'first' } },
+                    instance: (instance: object) => instance['value'] === 'first',
+                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
+                    bounds: this.nodeBounds(this.element.firstChild),
+                    children: [],
+                  },
+                ],
           },
           {
             type: 'component',
@@ -1319,17 +1324,19 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.lastChild),
-            children: [
-              {
-                type: 'component',
-                name: '-checkbox',
-                args: { positional: [], named: { target, type: 'checkbox', checked: false } },
-                instance: (instance: object) => instance['checked'] === false,
-                template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                bounds: this.nodeBounds(this.element.lastChild),
-                children: [],
-              },
-            ],
+            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+              ? []
+              : [
+                  {
+                    type: 'component',
+                    name: '-checkbox',
+                    args: { positional: [], named: { target, type: 'checkbox', checked: false } },
+                    instance: (instance: object) => instance['checked'] === false,
+                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
+                    bounds: this.nodeBounds(this.element.lastChild),
+                    children: [],
+                  },
+                ],
           },
         ]);
 
@@ -1343,17 +1350,19 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
-            children: [
-              {
-                type: 'component',
-                name: '-text-field',
-                args: { positional: [], named: { target, type: 'text', value: 'first' } },
-                instance: (instance: object) => instance['value'] === 'first',
-                template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                bounds: this.nodeBounds(this.element.firstChild),
-                children: [],
-              },
-            ],
+            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+              ? []
+              : [
+                  {
+                    type: 'component',
+                    name: '-text-field',
+                    args: { positional: [], named: { target, type: 'text', value: 'first' } },
+                    instance: (instance: object) => instance['value'] === 'first',
+                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
+                    bounds: this.nodeBounds(this.element.firstChild),
+                    children: [],
+                  },
+                ],
           },
         ]);
       }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 27806cfb8c0..0ff8a1268c3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -153,10 +153,19 @@ class InputRenderingTest extends RenderingTestCase {
     this.assert.equal($standard.type, $custom.type);
 
     Object.keys(events).forEach((event) => {
-      this.triggerEvent(event, null, '#standard');
-      this.triggerEvent(event, null, '#custom');
+      // triggerEvent does not seem to work with focusin and focusout events
+      if (event !== 'focusin' && event !== 'focusout') {
+        this.triggerEvent(event, null, '#standard');
+        this.triggerEvent(event, null, '#custom');
+      }
     });
 
+    // test focusin and focusout by actually moving focus
+    $standard[0].focus();
+    $standard[0].blur();
+    $custom[0].focus();
+    $custom[0].blur();
+
     this.assert.ok(
       triggered.standard.length > 10,
       'sanity check that most events are triggered (standard)'
@@ -958,7 +967,7 @@ moduleFor(
       this.assertAttr('tabindex', '10');
     }
 
-    ['@test `value` property assertion']() {
+    ['@feature(!EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property assertion']() {
       expectAssertion(() => {
         this.render(`<Input @type="checkbox" @value={{value}} />`, {
           value: 'value',
@@ -966,6 +975,27 @@ moduleFor(
       }, /checkbox.+@value.+not supported.+use.+@checked.+instead/);
     }
 
+    ['@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property warning']() {
+      let message =
+        '`<Input @type="checkbox" />` reflects its checked state via the `@checked` argument. ' +
+        'You wrote `<Input @type="checkbox" @value={{...}} />` which is likely not what you intended. ' +
+        'Did you mean `<Input @type="checkbox" @checked={{...}} />`?';
+
+      expectWarning(() => {
+        this.render(`<Input @type="checkbox" @value={{value}} />`, {
+          value: true,
+        });
+      }, message);
+
+      this.assert.strictEqual(this.context.value, true);
+      this.assertCheckboxIsNotChecked();
+
+      expectWarning(() => this.$input()[0].click(), message);
+
+      this.assert.strictEqual(this.context.value, true);
+      this.assertCheckboxIsChecked();
+    }
+
     ['@test with a bound type']() {
       this.render(`<Input @type={{inputType}} @checked={{isChecked}} />`, {
         inputType: 'checkbox',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 4211c09386a..f53bc62347d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -761,7 +761,7 @@ moduleFor(
       this.assertAttr('tabindex', '10');
     }
 
-    ['@test `value` property assertion']() {
+    ['@feature(!EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property assertion']() {
       expectAssertion(() => {
         this.render(`{{input type="checkbox" value=value}}`, {
           value: 'value',
@@ -769,6 +769,27 @@ moduleFor(
       }, /checkbox.+value.+not supported.+use.+checked.+instead/);
     }
 
+    ['@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property warning']() {
+      let message =
+        '`<Input @type="checkbox" />` reflects its checked state via the `@checked` argument. ' +
+        'You wrote `<Input @type="checkbox" @value={{...}} />` which is likely not what you intended. ' +
+        'Did you mean `<Input @type="checkbox" @checked={{...}} />`?';
+
+      expectWarning(() => {
+        this.render(`{{input type="checkbox" value=value}}`, {
+          value: true,
+        });
+      }, message);
+
+      this.assert.strictEqual(this.context.value, true);
+      this.assertCheckboxIsNotChecked();
+
+      expectWarning(() => this.$input()[0].click(), message);
+
+      this.assert.strictEqual(this.context.value, true);
+      this.assertCheckboxIsChecked();
+    }
+
     ['@test with a bound type']() {
       this.render(`{{input type=inputType checked=isChecked}}`, {
         inputType: 'checkbox',
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 6a375adacf7..56329d0b404 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -75,6 +75,7 @@ import { SELF_TAG } from './tags';
   @param dependencies Optional dependents to be tracked.
 */
 export function tracked(propertyDesc: { value: any; initializer: () => any }): Decorator;
+export function tracked(target: object, key: string): void;
 export function tracked(
   target: object,
   key: string,
diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts
index b495f196b3e..81e9823b1a9 100644
--- a/packages/@ember/-internals/views/index.d.ts
+++ b/packages/@ember/-internals/views/index.d.ts
@@ -1,6 +1,8 @@
 import { Option } from '@glimmer/interfaces';
 import { SimpleElement } from '@simple-dom/interface';
 
+export { jQuery, jQueryDisabled } from './lib/system/jquery';
+
 export const ActionSupport: any;
 export const ChildViewsSupport: any;
 export const ClassNamesSupport: any;
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
new file mode 100644
index 00000000000..edc356417e7
--- /dev/null
+++ b/packages/@ember/object/index.d.ts
@@ -0,0 +1 @@
+export let action: MethodDecorator;

From 27a413f6006fc9eba8f92e7960a57f889e1b56a4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 21 Jan 2021 15:22:22 -0800
Subject: [PATCH 0320/1405] Skip strict mode input test for now

---
 .../glimmer/tests/integration/components/strict-mode-test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index 888c33cd088..a8e5fd9368c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -162,7 +162,7 @@ if (EMBER_STRICT_MODE) {
   moduleFor(
     'Strict Mode - built ins',
     class extends RenderingTestCase {
-      '@test Can use Input'() {
+      '@skip Can use Input'() {
         let Foo = defineComponent({ Input }, '<Input/>');
 
         this.registerComponent('foo', { ComponentClass: Foo });

From c4c53c7b06a88541d0781de2925da055552f45be Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 21 Jan 2021 08:12:30 +0100
Subject: [PATCH 0321/1405] [DOC] Correctly mark public link-to component named
 arguments

---
 .../glimmer/lib/components/link-to.ts         | 39 +++++++++++--------
 tests/docs/expected.js                        |  1 +
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index f3e3af24bc2..4ecd873bb83 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -199,19 +199,6 @@ import layout from '../templates/link-to';
   When transitioning into the linked route, the `model` hook will
   be triggered with parameters including this passed identifier.
 
-  ### Allowing Default Action
-
-  By default the `<LinkTo>` component prevents the default browser action by calling
-  `preventDefault()` to avoid reloading the browser page.
-
-  If you need to trigger a full browser reload pass `@preventDefault={{false}}`:
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @model={{this.aPhotoId}} @preventDefault={{false}}>
-    {{this.aPhotoId.title}}
-  </LinkTo>
-  ```
-
   ### Supplying a `tagName`
 
   By default `<LinkTo>` renders an `<a>` element. This can be overridden for a single use of
@@ -380,7 +367,7 @@ const LinkComponent = EmberComponent.extend({
     @property loadingClass
     @type String
     @default loading
-    @private
+    @public
   **/
   loadingClass: 'loading',
 
@@ -391,7 +378,7 @@ const LinkComponent = EmberComponent.extend({
     @property disabledClass
     @type String
     @default disabled
-    @private
+    @public
   **/
   disabledClass: 'disabled',
 
@@ -406,6 +393,26 @@ const LinkComponent = EmberComponent.extend({
   **/
   replace: false,
 
+  /**
+    Determines whether the `LinkComponent` will prevent the default
+    browser action by calling preventDefault() to avoid reloading
+    the browser page.
+
+    If you need to trigger a full browser reload pass `@preventDefault={{false}}`:
+
+    ```handlebars
+    <LinkTo @route='photoGallery' @model={{this.aPhotoId}} @preventDefault={{false}}>
+      {{this.aPhotoId.title}}
+    </LinkTo>
+    ```
+
+    @property preventDefault
+    @type Boolean
+    @default true
+    @private
+  **/
+  preventDefault: true,
+
   /**
     By default this component will forward `href`, `title`, `rel`, `tabindex`, and `target`
     arguments to attributes on the component's element. When invoked with `{{link-to}}`, you can
@@ -555,7 +562,7 @@ const LinkComponent = EmberComponent.extend({
 
     When `true`, interactions with the element will not trigger route changes.
     @property disabled
-    @private
+    @public
   */
   disabled: computed({
     get(_key: string): boolean {
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index ee4e360480a..5841b904937 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -418,6 +418,7 @@ module.exports = {
     'pauseTest',
     'popObject',
     'positionalParams',
+    'preventDefault',
     'promise',
     'property',
     'pushObject',

From a1b70d10cdc47302b6a59c4926169147476a9b9e Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 21 Jan 2021 11:48:42 -0500
Subject: [PATCH 0322/1405] [BUGFIX beta] Ensure locals do not clobber
 components of the same name

Updates glimmer-vm to include https://github.com/glimmerjs/glimmer-vm/pull/1253.
---
 package.json                                  |  24 +-
 .../components/curly-components-test.js       |  15 ++
 yarn.lock                                     | 254 +++++++++---------
 3 files changed, 154 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 88b3bcb20da..0107945faed 100644
--- a/package.json
+++ b/package.json
@@ -74,19 +74,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.73.1",
+    "@glimmer/compiler": "0.73.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.73.1",
-    "@glimmer/interfaces": "0.73.1",
-    "@glimmer/manager": "0.73.1",
-    "@glimmer/destroyable": "0.73.1",
-    "@glimmer/owner": "0.73.1",
-    "@glimmer/node": "0.73.1",
-    "@glimmer/opcode-compiler": "0.73.1",
-    "@glimmer/program": "0.73.1",
-    "@glimmer/reference": "0.73.1",
-    "@glimmer/runtime": "0.73.1",
-    "@glimmer/validator": "0.73.1",
+    "@glimmer/global-context": "0.73.2",
+    "@glimmer/interfaces": "0.73.2",
+    "@glimmer/manager": "0.73.2",
+    "@glimmer/destroyable": "0.73.2",
+    "@glimmer/owner": "0.73.2",
+    "@glimmer/node": "0.73.2",
+    "@glimmer/opcode-compiler": "0.73.2",
+    "@glimmer/program": "0.73.2",
+    "@glimmer/reference": "0.73.2",
+    "@glimmer/runtime": "0.73.2",
+    "@glimmer/validator": "0.73.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index fc951fea778..268ef8a691a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3854,6 +3854,21 @@ moduleFor(
 
       this.assertComponentElement(this.firstChild, { content: '1' });
     }
+
+    '@test `{{#let blah as |foo|}}` does not affect `<Foo />` resolution'() {
+      this.registerComponent('foo', {
+        ComponentClass: null,
+        template: 'foo component',
+      });
+
+      this.render('{{#let "foo block param" as |foo|}}<Foo />{{/let}}');
+
+      this.assertText('foo component');
+
+      runTask(() => this.rerender());
+
+      this.assertText('foo component');
+    }
   }
 );
 
diff --git a/yarn.lock b/yarn.lock
index b8097915b4a..9eafddf6642 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,187 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.1.tgz#44b5a7a833f9502f9a71ecf201d37abdc4a80008"
-  integrity sha512-wsRZphwSxgc8uffDsBP5Rc0SfJPyXNirhq9YCEymWgu0Diy+aXV/valWFakD1r6remu+0MH9plRHoezWk5WYeA==
-  dependencies:
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/syntax" "0.73.1"
-    "@glimmer/util" "0.73.1"
-    "@glimmer/wire-format" "0.73.1"
+"@glimmer/compiler@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.2.tgz#1fb64b8e0002eca3d994a6ceb64fff4fa640f6e9"
+  integrity sha512-0snZO8VGtp0T41NK+zGyE/KSn/fgSu0aDNKuEoKULfAWNE4evgHdGkv4YtClnRimmE9W6KaTyVWEmLfPdRmSWg==
+  dependencies:
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/syntax" "0.73.2"
+    "@glimmer/util" "0.73.2"
+    "@glimmer/wire-format" "0.73.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.1.tgz#eded700bb925c14622e6a58ab30b599e7e90110d"
-  integrity sha512-xm8XH4Yy55N5P/9RWnmeJM7LfrHyTZe/q81KgoQgIuxMxC8ABq+V068Fyx0VKB49y1RPc4OcMS65aFSIOy9c7w==
+"@glimmer/destroyable@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.2.tgz#e0b97d21ef0452efb20adb170104cf526aa7e59d"
+  integrity sha512-9MZSB1G4PRsUh6hlO+gE2cSk9W84d1vz1smDqFCRwxzQchqpO7g8HPJd9vJno2Ke17PbyxkZGK0F94CLib8fXw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.1"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/util" "0.73.1"
+    "@glimmer/global-context" "0.73.2"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/util" "0.73.2"
 
-"@glimmer/encoder@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.1.tgz#33c7eb42d249bde041a4c7b513a0b384a6175fee"
-  integrity sha512-yXBccW9ayWby+G6cSzYgqDqc/OIfgJsFrpRqTDqjdFPG97pl9UMXu8/97l+318KH+gMNVLYBdu0xBFyk8Mbd1g==
+"@glimmer/encoder@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.2.tgz#40cf82779b84d3cf28c2e21938ceed9e9f999536"
+  integrity sha512-De+yYyemfm2q9E6C6oRQWaLOP/Wc1+7YZe9Ab+BYwLjWNryRlfqqCqSrp+88lskx7iXxmInbmvdBs/Ep5tv6vA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/vm" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/vm" "0.73.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.1.tgz#34f7ccabd2656c8d4a19581557593b6bac761a4b"
-  integrity sha512-jilS1HXMf/bzVQETCetlggAFLMYukvOxxGVi5FokL23g3jfWjQncEFf3p3OR17I3HDsEa1FmrZc4iuOp/i2gGQ==
+"@glimmer/global-context@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.2.tgz#34fc51dc5c320f067b912478e077fb3f55ff38f2"
+  integrity sha512-a/q6E27JMvF5oqKRYG5RFoTH0PrHaLp/Ix6W5OZ1TqvpiiuEgd4Olb55Ehxw2jH+wvmQHQtTxFKDyv0iDJYZ1Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.1.tgz#ad1dffb635c19b66230c45894e15f3a34d90e5b0"
-  integrity sha512-MttMIyWGZ+IbiJJpr4q9dwMmn+7eOMdxjMiuaEYeLBN/DXe8T9VePqgapURkSL9CEmKByB/pLvcaVTSYfm0RYg==
+"@glimmer/interfaces@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.2.tgz#03c769208bf705760800f3f64774b074bf04f738"
+  integrity sha512-SjV0/TtFiv+Sxl3WJ2I5oR6hH+EabTfk3qvllU8WAYBqf6LnNPSMjaFv2Fucn7bIvOqZ8zHl36q6HboAychD/A==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.1.tgz#aaf67687d4a06835163e71d3b2535934ef3968a2"
-  integrity sha512-ps/jqQnBobpucOmylX47GaFRaFUwcTm+a8b5sLJQZ9tfc+rIDfqyT1x79ZF7SjLt0tOC0HBancRl4OgzBIONvA==
+"@glimmer/low-level@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.2.tgz#2200efc8bdd5224cdb98662a1244016bd2aeca99"
+  integrity sha512-37Vbmv/wVKkPvj9/vw9qmIuJRecDkjOkyblUvLFZ7ePp/+pAH3/7Nxdv17QuH77EOa015pAe8vhTkHTRk+Oi6A==
 
-"@glimmer/manager@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.1.tgz#0ca52dcdfe358df6f8f4f0a0d6b601397fdf22c5"
-  integrity sha512-hrynFmYCcR1C8bJk3bM9GahBQnB3+Uo1ibEGBGSueCLd5ncLYDcvSg94GGU552tKe5TJ/QCi+v78ahKAvjervw==
+"@glimmer/manager@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.2.tgz#26c20824f766d71aa33d5bb7c940b827dd8d0ed5"
+  integrity sha512-OP0MC+neeD6dZZ8SrNT0LqS8rKCWjvrUkP24G573LIOXkwdsUhzU7nYnHovk9CQ64mEBlAbxAb1nCi20eWA3Lw==
   dependencies:
-    "@glimmer/destroyable" "0.73.1"
+    "@glimmer/destroyable" "0.73.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/reference" "0.73.1"
-    "@glimmer/util" "0.73.1"
-    "@glimmer/validator" "0.73.1"
-
-"@glimmer/node@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.1.tgz#3ad623a6701fe9d160cea27bc6ab5ff24124841c"
-  integrity sha512-bVAR0MK1LfKvxwgn5hQlkYzo8R0247lB80H23G7iP+PiBbkM2nOW7cykoYxewToQN948aMObYKOqXMdDCo0XyQ==
-  dependencies:
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/runtime" "0.73.1"
-    "@glimmer/util" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/reference" "0.73.2"
+    "@glimmer/util" "0.73.2"
+    "@glimmer/validator" "0.73.2"
+
+"@glimmer/node@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.2.tgz#d2bbee79f05ebd16b7c999b6d7594078c566ea61"
+  integrity sha512-bZNAYDhTAPBgmZAqmUWDNRusOT8BtBa2CixuEy3e99gu1BrKna3v7sB2DzAjPxU/QwUOgQHF+hbPwLIUqC3ZSA==
+  dependencies:
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/runtime" "0.73.2"
+    "@glimmer/util" "0.73.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.1.tgz#85427f9331307df27d3d40e647c81b7ed7e3b4f7"
-  integrity sha512-bcQyMPkuJrnyyWuodu/bfj7UZItbwrrRQAbLYi+0EeH/zLorA4+D9OD1snaY2FYIwwH28t/Wfm3o9OE7dyFJHQ==
+"@glimmer/opcode-compiler@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.2.tgz#7c3517be060eb8823e8d8ffbcc1e3cf76b195b8a"
+  integrity sha512-md1NEsRs77zqsqMOHNPPIBuIgbEQe1TBsA1UOWmDAt4sdYJTFJwMroBQVmLdOv9of/nlrcXsLHz/utXTblbEdQ==
   dependencies:
-    "@glimmer/encoder" "0.73.1"
+    "@glimmer/encoder" "0.73.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/reference" "0.73.1"
-    "@glimmer/util" "0.73.1"
-    "@glimmer/vm" "0.73.1"
-    "@glimmer/wire-format" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/reference" "0.73.2"
+    "@glimmer/util" "0.73.2"
+    "@glimmer/vm" "0.73.2"
+    "@glimmer/wire-format" "0.73.2"
 
-"@glimmer/owner@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.1.tgz#2659d078cae3c517473ff3e2aa751dd8c3ca999f"
-  integrity sha512-0bP+NHg1Y97kPGZtdAlyXCTtRnWOqUjWd4cPnZC6kvqlLrQtJnxKEN7rTW7N+McNdaFWbqoTIhw8y3+qghWANg==
+"@glimmer/owner@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.2.tgz#ab10c134bff38e3db475c072ce695f9886b0d989"
+  integrity sha512-Gj2fdw5Od99kyVQIALT2sXEsNY+upJXvJpXPU0JwDXdRoq0n6t3mnG2dL5vXqS0MnUJs8s09XloTLi65lZILSQ==
   dependencies:
-    "@glimmer/util" "0.73.1"
+    "@glimmer/util" "0.73.2"
 
-"@glimmer/program@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.1.tgz#e012e596a33685744313dd2a1a090e982b01121c"
-  integrity sha512-JT3b07CPGmU+UYRBUFLWkRZgGxPo+ZwP1o1wDuIhAKmit0Jo5TXd/V1jhI2PRbW2DdHHE5EUYPu8qbosIc0JdQ==
+"@glimmer/program@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.2.tgz#72929423a5e65239dae56c7158d6b51be94f0008"
+  integrity sha512-pGMG8vW262+Zl6nlmAHPpEQXNWKfapJ5l1WMNrtl7PL4Hbhd/oYiXGJnd8aBRsYeFb0Jii/a6d8dahkS6+We9A==
   dependencies:
-    "@glimmer/encoder" "0.73.1"
+    "@glimmer/encoder" "0.73.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/manager" "0.73.1"
-    "@glimmer/opcode-compiler" "0.73.1"
-    "@glimmer/util" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/manager" "0.73.2"
+    "@glimmer/opcode-compiler" "0.73.2"
+    "@glimmer/util" "0.73.2"
 
-"@glimmer/reference@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.1.tgz#5f3634fb780018d2aace753ed512b909d50c85bf"
-  integrity sha512-0sUebIjfNGuv6XJyC/f0HsFzNQf7/vNgeg+7/qg8NxDrrDfWeLzcaejWkReP/hxAmqLgidHnYju6IqmWciWcFw==
+"@glimmer/reference@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.2.tgz#85bbf60e5491b93fcc2f4d883fd277ae9f0d5ed0"
+  integrity sha512-v/arQjBPvMpbVwGuCXCr7rxDteqIhnu91cu2K/7QcqmodzGC7ZhoVKWHtak3A11U1/1/6F2DznK8yHPKC/gEwg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.1"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/util" "0.73.1"
-    "@glimmer/validator" "0.73.1"
+    "@glimmer/global-context" "0.73.2"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/util" "0.73.2"
+    "@glimmer/validator" "0.73.2"
 
-"@glimmer/runtime@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.1.tgz#b579ce5480d80f8ff901763d156ca55e626d6ad8"
-  integrity sha512-gcmxywB5/kFssK8lLuh2PZrmuNaCaTTgtT0U1UbsEvvksXIH6hOMeTKU97Jxnar5yNI7LVAl7pnyXOqfQ/65ow==
+"@glimmer/runtime@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.2.tgz#fb93a2d86f58febec21f88d05fea63e05d4aea75"
+  integrity sha512-Cp7JFlRGnPnbh/0MLYGh1aV639a0UxP+lsca5w6qpUEKo+HvD3V2BppqE8Wwc9XKU0E2nSYQ9il4UaSpikNAhA==
   dependencies:
-    "@glimmer/destroyable" "0.73.1"
+    "@glimmer/destroyable" "0.73.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.1"
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/low-level" "0.73.1"
-    "@glimmer/owner" "0.73.1"
-    "@glimmer/program" "0.73.1"
-    "@glimmer/reference" "0.73.1"
-    "@glimmer/util" "0.73.1"
-    "@glimmer/validator" "0.73.1"
-    "@glimmer/vm" "0.73.1"
-    "@glimmer/wire-format" "0.73.1"
+    "@glimmer/global-context" "0.73.2"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/low-level" "0.73.2"
+    "@glimmer/owner" "0.73.2"
+    "@glimmer/program" "0.73.2"
+    "@glimmer/reference" "0.73.2"
+    "@glimmer/util" "0.73.2"
+    "@glimmer/validator" "0.73.2"
+    "@glimmer/vm" "0.73.2"
+    "@glimmer/wire-format" "0.73.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.1.tgz#9e3c898ba91ddb1d4e6f413452b0b84700910c83"
-  integrity sha512-TpTK9yAaoDOzdo+5itoJPRxrVWacYlGuHtJvATi96RJUTAxPz9b9M3AcVm0atcZW7WiA8X8J/weQ2KcIVgAYmw==
+"@glimmer/syntax@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.2.tgz#76438633f26b3fccb86bd7d25390a901737aa530"
+  integrity sha512-neZvKpfJETtUxnZMdpmD9qi4E9WaKhnQt63H+0iHkz1APriIZM5rsq12oiG9MSCvEiF5iP3auwJMU22XKPtyeQ==
   dependencies:
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/util" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/util" "0.73.2"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.1.tgz#f89bb7adba18315e00fbdb5a7c5a4913bbdebc6e"
-  integrity sha512-zFXY9OgR6wx7Cy4yYJkmgoUsdx3MQYAmZytuEDTghLXJyUoSh5Jcvner+qhFkqLSzj2pvE4btn3yUNnx3QOBtg==
+"@glimmer/util@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.2.tgz#32ca1cec339a91f12f0359711f1a86fc1dcc13ca"
+  integrity sha512-ng726SZl/o2NKOLeHdqU9LTH4tP9FW7H1CveZGE8HMTgTDpXA7NCF7TVHqccOMmJNXqspkegtGQFGOLi10HArg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.1.tgz#8d87e502e84d468bb7d1695fdc85e1cfc3d9de29"
-  integrity sha512-DGodNSpf1v9Xsu7l7GSitVhNnESVx9qn6RFQ/zVwvptSXaPvLh5RIxsvYqJwkhBsxyPCVqnjz1p+MwqtfJukDA==
+"@glimmer/validator@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.2.tgz#63bdeecda9904ace565063eedc7916ffb86b2981"
+  integrity sha512-Bk4xLmZ6tj46yEZzeOqpPla7KHRQP2QiHLo941ieZawc8vP/tZSO0znvuA+SXbqpSjxPPyjMtsXfYiUK7rLfZg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.1"
+    "@glimmer/global-context" "0.73.2"
 
-"@glimmer/vm@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.1.tgz#b9b38f819ef351490852807c0679f1e531f2e71c"
-  integrity sha512-8vMH0rSeEkjsFWcMaowTac8nBT7WtHvIX9hKx6qtCvkVNljWTFcNq4IXVZxCfUmx4UFopMZwYTIQR1QfHV282w==
+"@glimmer/vm@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.2.tgz#d670ae43ada48b4c11ff51159540c6ccdcf83e41"
+  integrity sha512-WpG0WS9u9BAxP5LOT4fR0z8Gn5tiJgUjTfRMWPlHI5j7T6lIQMeY+gLiPN5CKCuGDSI/dZLnzMobTIEXR8ZcIw==
   dependencies:
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/util" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/util" "0.73.2"
 
-"@glimmer/wire-format@0.73.1":
-  version "0.73.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.1.tgz#a3ac1d42cc421d2dd651a68d99a16d146cc5a08f"
-  integrity sha512-GeNGsaaVm+4Rg+cssDiPxqDH+cpq8xYtnDVNoiO+ABUU6nkgwqmc6aoJrGD2fb4myDIIqdAVdCLYlhVWrP52NQ==
+"@glimmer/wire-format@0.73.2":
+  version "0.73.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.2.tgz#cb39577e63aee1d2ac1e856b15f251778209cf71"
+  integrity sha512-l8bG39JyqG4W6sQIQtEteBoDuvMFQAOfNTcQJcVyno6D+oMvOQgSH4BRblQPocdXzha1i/7yqICuew/Iz18ryA==
   dependencies:
-    "@glimmer/interfaces" "0.73.1"
-    "@glimmer/util" "0.73.1"
+    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/util" "0.73.2"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From f2be19507f0742a9471fa4fe0ce22ccf3104967d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 25 Jan 2021 13:37:08 -0500
Subject: [PATCH 0323/1405] Add v3.25.0-beta.3 to CHANGELOG

(cherry picked from commit 25e17f0ea31c01239fc8b4fd8bdb52f003f2dea0)
---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76058455642..18d33e5b8cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Ember Changelog
 
-### v3.25.0-beta.2 (January 19, 2020)
+### v3.25.0-beta.3 (January 25, 2021)
+
+- [#19351](https://github.com/emberjs/ember.js/pull/19351) [BUGFIX] Ensure locals do not clobber components of the same name
+
+### v3.25.0-beta.2 (January 19, 2021)
 
 - [#19339](https://github.com/emberjs/ember.js/pull/19339) [DEPRECATION] Deprecate importing `htmlSafe` and `isHTMLSafe` from `@ember/string` per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
 - [#19336](https://github.com/emberjs/ember.js/pull/19336) [BUGFIX] Ensure Component Lookup Is Well Formed

From 3ad915e5cf1f622e51d186b8ae910ed3b4fedca0 Mon Sep 17 00:00:00 2001
From: Alex Kanunnikov <lifeart92@gmail.com>
Date: Mon, 25 Jan 2021 22:34:44 +0300
Subject: [PATCH 0324/1405] update license to 2021

---
 generators/license.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/license.js b/generators/license.js
index a22609bbb47..d19e9983d6d 100644
--- a/generators/license.js
+++ b/generators/license.js
@@ -1,6 +1,6 @@
 /*!
  * @overview  Ember - JavaScript Application Framework
- * @copyright Copyright 2011-2020 Tilde Inc. and contributors
+ * @copyright Copyright 2011-2021 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license

From 07357ed691575a70be9b0d23fc3891c65d156efa Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 26 Jan 2021 15:45:26 -0800
Subject: [PATCH 0325/1405] [DEPRECATION] Deprecates old browser support policy

* Adds the deprecation specified in
  https://github.com/emberjs/rfcs/blob/master/text/0685-new-browser-support-policy.md
* Updates the test harness to avoid failing CI for deprecations issued
  on IE11
---
 lib/index.js                                     |  6 ++++++
 .../-internals/browser-environment/index.ts      |  5 +++++
 packages/ember/index.js                          | 16 ++++++++++++++++
 tests/index.html                                 |  8 +++++++-
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 866bb7fed7c..5e747132c6c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -246,6 +246,12 @@ module.exports = {
     let ember;
     let targets = (this.project && this.project.targets && this.project.targets.browsers) || [];
 
+    if (targets.includes('ie 11')) {
+      this.ui.writeWarnLine(
+        'Internet Explorer 11 is listed in your compilation targets, but it will no longer be supported in the next major version of Ember. Please update your targets to remove IE 11 and include new targets that are within the updated support policy. For details on the new browser support policy, see:\n\n - The official documentation: http://emberjs.com/browser-support\n - the deprecation guide: https://emberjs.com/deprecations/v3.x#toc_3-0-browser-support-policy\n'
+      );
+    }
+
     const isProduction = process.env.EMBER_ENV === 'production';
 
     if (
diff --git a/packages/@ember/-internals/browser-environment/index.ts b/packages/@ember/-internals/browser-environment/index.ts
index b4122c67d15..29bb5ed3154 100644
--- a/packages/@ember/-internals/browser-environment/index.ts
+++ b/packages/@ember/-internals/browser-environment/index.ts
@@ -3,6 +3,8 @@ import hasDom from './lib/has-dom';
 declare const InstallTrigger: unknown;
 declare const chrome: unknown;
 declare const opera: unknown;
+declare const MSInputMethodContext: unknown;
+declare const documentMode: unknown;
 
 export { default as hasDOM } from './lib/has-dom';
 export const window = hasDom ? self : null;
@@ -11,3 +13,6 @@ export const history = hasDom ? self.history : null;
 export const userAgent = hasDom ? self.navigator.userAgent : 'Lynx (textmode)';
 export const isChrome = hasDom ? typeof chrome === 'object' && !(typeof opera === 'object') : false;
 export const isFirefox = hasDom ? typeof InstallTrigger !== 'undefined' : false;
+export const isIE = hasDom
+  ? typeof MSInputMethodContext !== 'undefined' && typeof documentMode !== 'undefined'
+  : false;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 24dff7aeccf..4522eb0b5e6 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -170,6 +170,22 @@ import {
 
 const Ember = (typeof context.imports.Ember === 'object' && context.imports.Ember) || {};
 
+import { isIE } from '@ember/-internals/browser-environment';
+
+deprecate(
+  'Internet Explorer 11 will no longer be supported in the next major version of Ember. For details on the new browser support policy, see the official documentation: http://emberjs.com/browser-support',
+  !isIE,
+  {
+    id: '3-0-browser-support-policy',
+    url: 'https://emberjs.com/deprecations/v3.x#toc_3-0-browser-support-policy',
+    until: '4.0.0',
+    for: 'ember-source',
+    since: {
+      enabled: '3.26.0',
+    },
+  }
+);
+
 Ember.isNamespace = true;
 Ember.toString = function () {
   return 'Ember';
diff --git a/tests/index.html b/tests/index.html
index 75d60d93bc4..57bf6b6b84d 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -66,7 +66,13 @@
           EmberENV.ENABLE_OPTIONAL_FEATURES = true;
         }
 
-        EmberENV['RAISE_ON_DEPRECATION'] = true;
+        var isIE = Boolean(window.MSInputMethodContext) && Boolean(document.documentMode);
+
+        // ignore deprecations for IE11 specifically (due to browser support
+        // policy deprecation, which happens before we can `expectDeprecation`)
+        if (!isIE) {
+          EmberENV['RAISE_ON_DEPRECATION'] = true;
+        }
 
         if (QUnit.urlParams.debugrendertree) {
           EmberENV['_DEBUG_RENDER_TREE'] = true;

From 9a01c4e8f468dea57dad9dba074a01515e38caf4 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 28 Jan 2021 17:39:22 -0800
Subject: [PATCH 0326/1405] [CLEANUP] Remove usages of property fallback lookup
 from tests

Removes all usages of property fallback from tests, except where the
tests are actually testing fallback lookup.
---
 .../-internals/glimmer/lib/environment.ts     |   2 +
 .../integration/application/engine-test.js    |   6 +-
 .../application/helper-registration-test.js   |   2 +-
 .../integration/application/rendering-test.js |   8 +-
 .../angle-bracket-invocation-test.js          |  39 ++--
 .../integration/components/append-test.js     |  17 +-
 .../components/attribute-bindings-test.js     |  40 ++--
 .../components/attrs-lookup-test.js           |  14 +-
 .../components/class-bindings-test.js         |  16 +-
 .../components/contextual-components-test.js  | 106 +++++-----
 .../components/curly-components-test.js       | 198 +++++++++---------
 .../components/dynamic-components-test.js     |  74 +++----
 .../components/error-handling-test.js         |   8 +-
 .../components/fragment-components-test.js    |  14 +-
 .../components/input-angle-test.js            | 105 +++++-----
 .../components/input-curly-test.js            |  58 ++---
 .../instrumentation-compile-test.js           |   4 +-
 .../components/instrumentation-test.js        |   8 +-
 .../integration/components/life-cycle-test.js |  28 +--
 .../link-to/query-params-angle-test.js        |  14 +-
 .../link-to/query-params-curly-test.js        |  16 +-
 .../link-to/rendering-angle-test.js           |   6 +-
 .../link-to/rendering-curly-test.js           |  15 +-
 .../components/link-to/routing-angle-test.js  |  59 +++---
 .../components/link-to/routing-curly-test.js  |  64 +++---
 .../components/target-action-test.js          |  14 +-
 .../template-only-components-test.js          |   6 +-
 .../components/textarea-angle-test.js         |  18 +-
 .../components/textarea-curly-test.js         |  10 +-
 .../integration/components/tracked-test.js    |   6 +-
 .../integration/components/utils-test.js      |   8 +-
 .../components/web-component-fallback-test.js |   2 +-
 .../will-destroy-element-hook-test.js         |   2 +-
 .../glimmer/tests/integration/content-test.js |  84 ++++----
 .../custom-component-manager-test.js          |  52 ++---
 .../custom-modifier-manager-test.js           |  12 +-
 .../integration/event-dispatcher-test.js      |   4 +-
 .../tests/integration/helpers/array-test.js   |  18 +-
 .../helpers/closure-action-test.js            |  46 ++--
 .../integration/helpers/custom-helper-test.js |  12 +-
 .../helpers/element-action-test.js            |  47 +++--
 .../tests/integration/helpers/get-test.js     |  55 ++---
 .../tests/integration/helpers/hash-test.js    |   2 +-
 .../helpers/helper-manager-test.js            |   4 +-
 .../tests/integration/helpers/loc-test.js     |   6 +-
 .../tests/integration/helpers/log-test.js     |   4 +-
 .../tests/integration/helpers/mut-test.js     |  50 ++---
 .../tests/integration/helpers/partial-test.js |  20 +-
 .../integration/helpers/readonly-test.js      |  24 +--
 .../tests/integration/helpers/unbound-test.js |  31 +--
 .../tests/integration/helpers/yield-test.js   |  48 ++---
 .../glimmer/tests/integration/input-test.js   |  12 +-
 .../tests/integration/modifiers/on-test.js    |   2 +-
 .../glimmer/tests/integration/mount-test.js   |  14 +-
 .../glimmer/tests/integration/outlet-test.js  |   4 +-
 .../tests/integration/refinements-test.js     |  14 +-
 .../tests/integration/render-settled-test.js  |   6 +-
 .../syntax/deprecated-in-element-test.js      |  28 +--
 .../tests/integration/syntax/each-in-test.js  |  26 +--
 .../tests/integration/syntax/each-test.js     |  79 ++++---
 .../integration/syntax/if-unless-test.js      |   8 +-
 .../tests/integration/syntax/let-test.js      |  30 +--
 .../syntax/public-in-element-test.js          |  32 +--
 .../tests/integration/syntax/with-test.js     |  30 +--
 .../tests/unit/runtime-resolver-cache-test.js |   6 +-
 .../tests/unit/template-factory-test.js       |   2 +-
 .../tests/utils/shared-conditional-tests.js   |  54 ++---
 .../application/tests/application_test.js     |   2 +-
 .../tests/system/bootstrap-test.js            |   8 +-
 .../tests/system/compile_options_test.js      |   2 +-
 .../ember/tests/component_context_test.js     |  12 +-
 .../tests/component_registration_test.js      |   8 +-
 .../tests/routing/decoupled_basic_test.js     |   5 +-
 .../ember/tests/routing/model_loading_test.js |  18 +-
 .../ember/tests/routing/query_params_test.js  |   4 +-
 ..._dependent_state_with_query_params_test.js |   6 +-
 .../query_params_test/shared_state_test.js    |   2 +-
 .../currenturl_lifecycle_test.js              |   2 +-
 .../tests/routing/template_rendering_test.js  |   8 +-
 79 files changed, 988 insertions(+), 942 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index bd47e5f7929..70e09876215 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -17,6 +17,8 @@ import toBool from './utils/to-bool';
 
 // Setup global context
 
+window._deprecationMap = {};
+
 setGlobalContext({
   scheduleRevalidate() {
     backburner.ensureInstance();
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 2ceadc86064..f842c27ca98 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -108,7 +108,7 @@ moduleFor(
                 queryParams: ['official'],
               })
             );
-            this.register('template:application', compile('Engine{{lang}}{{outlet}}'));
+            this.register('template:application', compile('Engine{{this.lang}}{{outlet}}'));
             this.register(
               'route:application',
               Route.extend({
@@ -255,7 +255,7 @@ moduleFor(
                 contextType: 'Engine',
               })
             );
-            this.register('template:application', compile('Engine {{foo-bar wat=contextType}}'));
+            this.register('template:application', compile('Engine {{foo-bar wat=this.contextType}}'));
           },
         })
       );
@@ -281,7 +281,7 @@ moduleFor(
       this.assert.expect(1);
 
       let sharedTemplate = compile(strip`
-      <h1>{{contextType}}</h1>
+      <h1>{{this.contextType}}</h1>
       {{ambiguous-curlies}}
 
       {{outlet}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
index 1c13a041754..4afc9828bf3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
@@ -22,7 +22,7 @@ moduleFor(
     }
 
     ['@test Bound helpers registered on the container can be late-invoked'](assert) {
-      this.addTemplate('application', `<div id='wrapper'>{{x-reverse}} {{x-reverse foo}}</div>`);
+      this.addTemplate('application', `<div id='wrapper'>{{x-reverse}} {{x-reverse this.foo}}</div>`);
 
       this.add(
         'controller:application',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 73ba28c8a83..2c204b9b7c7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -567,8 +567,8 @@ moduleFor(
         })
       );
 
-      this.addTemplate('a', '{{value}}');
-      this.addTemplate('b', '{{value}}');
+      this.addTemplate('a', '{{this.value}}');
+      this.addTemplate('b', '{{this.value}}');
 
       return this.visit('/a')
         .then(() => {
@@ -610,7 +610,7 @@ moduleFor(
         })
       );
 
-      this.addTemplate('color', 'model color: {{@model.color}}, controller color: {{color}}');
+      this.addTemplate('color', 'model color: {{@model.color}}, controller color: {{this.color}}');
 
       return this.visit('/colors/red')
         .then(() => {
@@ -661,7 +661,7 @@ moduleFor(
         })
       );
 
-      this.addTemplate('common', '{{prefix}} {{@model}}');
+      this.addTemplate('common', '{{this.prefix}} {{@model}}');
 
       return this.visit('/a')
         .then(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 73f4591cc96..c12dc2e57e6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -84,7 +84,7 @@ moduleFor(
 
     '@test it can render a basic component with template and javascript'() {
       this.registerComponent('foo-bar', {
-        template: 'FIZZ BAR {{local}}',
+        template: 'FIZZ BAR {{this.local}}',
         ComponentClass: Component.extend({ local: 'hey' }),
       });
 
@@ -120,9 +120,9 @@ moduleFor(
     }
 
     '@test it can have a custom id and it is not bound'() {
-      this.registerComponent('foo-bar', { template: '{{id}} {{elementId}}' });
+      this.registerComponent('foo-bar', { template: '{{this.id}} {{this.elementId}}' });
 
-      this.render('<FooBar @id={{customId}} />', {
+      this.render('<FooBar @id={{this.customId}} />', {
         customId: 'bizz',
       });
 
@@ -154,7 +154,7 @@ moduleFor(
     '@test it can have a custom id attribute and it is bound'() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('<FooBar id={{customId}} />', {
+      this.render('<FooBar id={{this.customId}} />', {
         customId: 'bizz',
       });
 
@@ -256,7 +256,7 @@ moduleFor(
     '@test class property on components can be dynamic'() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('<FooBar @class={{if fooBar "foo-bar"}} />', {
+      this.render('<FooBar @class={{if this.fooBar "foo-bar"}} />', {
         fooBar: true,
       });
 
@@ -441,7 +441,7 @@ moduleFor(
 
     '@test it reflects named arguments as properties'() {
       this.registerComponent('foo-bar', {
-        template: '{{foo}}',
+        template: '{{this.foo}}',
       });
 
       this.render('<FooBar @foo={{this.model.bar}} />', {
@@ -496,11 +496,11 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{yield greeting greetee.firstName}}',
+        template: '{{yield this.greeting this.greetee.firstName}}',
       });
 
       this.render(
-        '<FooBar @greetee={{person}} as |greeting name|>{{name}} {{person.lastName}}, {{greeting}}</FooBar>',
+        '<FooBar @greetee={{this.person}} as |greeting name|>{{name}} {{this.person.lastName}}, {{greeting}}</FooBar>',
         {
           person: {
             firstName: 'Joel',
@@ -554,7 +554,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['first', 'second'],
         }),
-        template: '{{first}}{{second}}',
+        template: '{{this.first}}{{this.second}}',
       });
 
       // this is somewhat silly as the browser "corrects" for these as
@@ -646,7 +646,10 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('<FooBar data-foo={{foo}} data-bar={{bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', {
+        foo: 'foo',
+        bar: 'bar',
+      });
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -725,7 +728,7 @@ moduleFor(
         template: '<div ...attributes>hello</div>',
       });
 
-      this.render('<FooBar data-foo={{foo}} data-bar={{bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', { foo: 'foo', bar: 'bar' });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
@@ -775,10 +778,10 @@ moduleFor(
             this.localProp = 'qux';
           },
         }),
-        template: '<div data-derp={{localProp}} ...attributes>hello</div>',
+        template: '<div data-derp={{this.localProp}} ...attributes>hello</div>',
       });
 
-      this.render('<FooBar data-foo={{foo}} data-bar={{bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', { foo: 'foo', bar: 'bar' });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
@@ -830,10 +833,10 @@ moduleFor(
             this.localProp = 'qux';
           },
         }),
-        template: '<div class={{localProp}} ...attributes>hello</div>',
+        template: '<div class={{this.localProp}} ...attributes>hello</div>',
       });
 
-      this.render('<FooBar class={{bar}} />', { bar: 'bar' });
+      this.render('<FooBar class={{this.bar}} />', { bar: 'bar' });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
@@ -883,10 +886,10 @@ moduleFor(
             this.localProp = 'qux';
           },
         }),
-        template: '<div ...attributes class={{localProp}}>hello</div>',
+        template: '<div ...attributes class={{this.localProp}}>hello</div>',
       });
 
-      this.render('<FooBar class={{bar}} />', { bar: 'bar' });
+      this.render('<FooBar class={{this.bar}} />', { bar: 'bar' });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
@@ -1052,7 +1055,7 @@ moduleFor(
         template: '<div ...attributes>hello</div><p ...attributes>world</p>',
       });
 
-      this.render('<FooBar data-foo={{foo}} data-bar={{bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', { foo: 'foo', bar: 'bar' });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
index ff587db155c..dc9e8f58290 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -121,7 +121,8 @@ class AbstractAppendTest extends RenderingTestCase {
         layoutName: 'components/x-parent',
       }),
 
-      template: '[parent: {{foo}}]{{#x-child bar=foo}}[yielded: {{foo}}]{{/x-child}}',
+      template:
+        '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
     });
 
     this.registerComponent('x-child', {
@@ -129,7 +130,7 @@ class AbstractAppendTest extends RenderingTestCase {
         tagName: '',
       }),
 
-      template: '[child: {{bar}}]{{yield}}',
+      template: '[child: {{this.bar}}]{{yield}}',
     });
 
     let XParent;
@@ -293,7 +294,7 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template: '[parent: {{foo}}]{{#x-child bar=foo}}[yielded: {{foo}}]{{/x-child}}',
+      template: '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
     });
 
     this.registerComponent('x-child', {
@@ -301,7 +302,7 @@ class AbstractAppendTest extends RenderingTestCase {
         tagName: '',
       }),
 
-      template: '[child: {{bar}}]{{yield}}',
+      template: '[child: {{this.bar}}]{{yield}}',
     });
 
     let XParent;
@@ -399,7 +400,7 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template: 'x-first {{foo}}!',
+      template: 'x-first {{this.foo}}!',
     });
 
     this.registerComponent('x-second', {
@@ -411,7 +412,7 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template: 'x-second {{bar}}!',
+      template: 'x-second {{this.bar}}!',
     });
 
     let First, Second;
@@ -630,7 +631,7 @@ class AbstractAppendTest extends RenderingTestCase {
     let destroyedRoots = 0;
     this.registerComponent('other-root', {
       ComponentClass: Component.extend({
-        layout: compile(`fake-thing: {{counter}}`),
+        layout: compile(`fake-thing: {{this.counter}}`),
         init() {
           this._super(...arguments);
           this.counter = instantiatedRoots++;
@@ -644,7 +645,7 @@ class AbstractAppendTest extends RenderingTestCase {
 
     this.render(
       strip`
-      {{#if showFooBar}}
+      {{#if this.showFooBar}}
         {{foo-bar}}
       {{else}}
         {{baz-qux}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
index 025d03b0ad1..fcd5e9e10eb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
@@ -17,7 +17,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar foo=foo bar=bar}}', { foo: 'foo', bar: 'bar' });
+      this.render('{{foo-bar foo=this.foo bar=this.bar}}', { foo: 'foo', bar: 'bar' });
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -119,7 +119,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar foo=foo}}', { foo: { bar: 'foo-bar' } });
+      this.render('{{foo-bar foo=this.foo}}', { foo: { bar: 'foo-bar' } });
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -178,7 +178,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar type=submit}}', {
+      this.render('{{foo-bar type=this.submit}}', {
         submit: 'submit',
       });
 
@@ -232,7 +232,7 @@ moduleFor(
       });
 
       expectAssertion(() => {
-        this.render('{{foo-bar foo=foo}}', { foo: { bar: 'foo-bar' } });
+        this.render('{{foo-bar foo=this.foo}}', { foo: { bar: 'foo-bar' } });
       }, /Illegal attributeBinding: 'foo.bar' is not a valid attribute name./);
     }
 
@@ -246,7 +246,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar tiTLe=name}}', {
+      this.render('{{foo-bar tiTLe=this.name}}', {
         name: 'qux',
       });
 
@@ -285,7 +285,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar foo=foo}}', {
+      this.render('{{foo-bar foo=this.foo}}', {
         foo: 'qux',
       });
 
@@ -325,7 +325,7 @@ moduleFor(
         template: '',
       });
 
-      this.render('{{foo-bar viewBox=foo}}', {
+      this.render('{{foo-bar viewBox=this.foo}}', {
         foo: '0 0 100 100',
       });
 
@@ -360,7 +360,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar fizz=fizz bar=bar}}', {
+      this.render('{{foo-bar fizz=this.fizz bar=this.bar}}', {
         fizz: null,
         bar: undefined,
       });
@@ -412,7 +412,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar size=size}}', {
+      this.render('{{foo-bar size=this.size}}', {
         size: 21,
       });
 
@@ -504,7 +504,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
-      this.render('{{foo-bar type=type isDisabled=disabled}}', {
+      this.render('{{foo-bar type=this.type isDisabled=this.disabled}}', {
         type: 'password',
         disabled: false,
       });
@@ -549,7 +549,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
-      this.render('{{foo-bar type=type xlinkHref=xlinkHref}}', {
+      this.render('{{foo-bar type=this.type xlinkHref=this.xlinkHref}}', {
         xlinkHref: '/foo.png',
       });
 
@@ -590,7 +590,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
-      this.render('{{foo-bar foo=foo}}', {
+      this.render('{{foo-bar foo=this.foo}}', {
         foo: function () {
           return this;
         }.call('bar'),
@@ -646,7 +646,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
-      this.render('{{foo-bar specialSauce=sauce}}', {
+      this.render('{{foo-bar specialSauce=this.sauce}}', {
         sauce: 'special-sauce',
       });
 
@@ -689,7 +689,7 @@ moduleFor(
 
       this.registerComponent('fizz-bar', { ComponentClass: FizzBarComponent });
 
-      this.render('{{fizz-bar newHref=href}}', {
+      this.render('{{fizz-bar newHref=this.href}}', {
         href: 'dog.html',
       });
 
@@ -739,10 +739,10 @@ moduleFor(
 
       this.render(
         strip`
-      {{foo-bar hasFoo=true foo=foo hasBar=false bar=bar}}
-      {{foo-bar hasFoo=false foo=foo hasBar=true bar=bar}}
-      {{foo-bar hasFoo=true foo=foo hasBar=true bar=bar}}
-      {{foo-bar hasFoo=false foo=foo hasBar=false bar=bar}}
+      {{foo-bar hasFoo=true foo=this.foo hasBar=false bar=this.bar}}
+      {{foo-bar hasFoo=false foo=this.foo hasBar=true bar=this.bar}}
+      {{foo-bar hasFoo=true foo=this.foo hasBar=true bar=this.bar}}
+      {{foo-bar hasFoo=false foo=this.foo hasBar=false bar=this.bar}}
     `,
         { foo: 'foo', bar: 'bar' }
       );
@@ -893,7 +893,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar href=xss}}', {
+      this.render('{{foo-bar href=this.xss}}', {
         xss: "javascript:alert('foo')",
       });
 
@@ -911,7 +911,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar role=role}}', { role: 'button' });
+      this.render('{{foo-bar role=this.role}}', { role: 'button' });
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
index ece6ac6955f..fc5b5519f6f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
@@ -8,9 +8,9 @@ moduleFor(
   'Components test: attrs lookup',
   class extends RenderingTestCase {
     ['@test it should be able to lookup attrs without `attrs.` - template access']() {
-      this.registerComponent('foo-bar', { template: '{{first}}' });
+      this.registerComponent('foo-bar', { template: '{{this.first}}' });
 
-      this.render(`{{foo-bar first=firstAttr}}`, {
+      this.render(`{{foo-bar first=this.firstAttr}}`, {
         firstAttr: 'first attr',
       });
 
@@ -40,10 +40,10 @@ moduleFor(
       });
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{first}}',
+        template: '{{this.first}}',
       });
 
-      this.render(`{{foo-bar first=firstAttr}}`, {
+      this.render(`{{foo-bar first=this.firstAttr}}`, {
         firstAttr: 'first attr',
       });
 
@@ -76,7 +76,7 @@ moduleFor(
       });
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{first}}',
+        template: '{{this.first}}',
       });
 
       this.render(`{{foo-bar first="first attr"}}`);
@@ -113,7 +113,7 @@ moduleFor(
       });
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
-      this.render(`{{foo-bar woot=woot}}`, {
+      this.render(`{{foo-bar woot=this.woot}}`, {
         woot: wootVal,
       });
 
@@ -172,7 +172,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
-      this.render(`{{foo-bar firstPositional first=first second=second}}`, {
+      this.render(`{{foo-bar this.firstPositional first=this.first second=this.second}}`, {
         firstPositional: 'firstPositional',
         first: 'first',
         second: 'second',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
index e8480ea0728..a2388f668f6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
@@ -17,7 +17,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar foo=foo isEnabled=isEnabled isHappy=isHappy}}', {
+      this.render('{{foo-bar foo=this.foo isEnabled=this.isEnabled isHappy=this.isHappy}}', {
         foo: 'foo',
         isEnabled: true,
         isHappy: false,
@@ -207,7 +207,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar foo=foo is=is}}', {
+      this.render('{{foo-bar foo=this.foo is=this.is}}', {
         foo: { bar: 'foo-bar' },
         is: { enabled: true, happy: false },
       });
@@ -281,7 +281,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar fooBar=fooBar nested=nested}}', {
+      this.render('{{foo-bar fooBar=this.fooBar nested=this.nested}}', {
         fooBar: true,
         nested: { fooBarBaz: false },
       });
@@ -389,7 +389,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar isEnabled=enabled}}', {
+      this.render('{{foo-bar isEnabled=this.enabled}}', {
         enabled: false,
       });
 
@@ -520,10 +520,10 @@ moduleFor(
 
       this.render(
         strip`
-      {{foo-bar foo=foo bindIsEnabled=true isEnabled=isEnabled bindIsHappy=false isHappy=isHappy}}
-      {{foo-bar foo=foo bindIsEnabled=false isEnabled=isEnabled bindIsHappy=true isHappy=isHappy}}
-      {{foo-bar foo=foo bindIsEnabled=true isEnabled=isEnabled bindIsHappy=true isHappy=isHappy}}
-      {{foo-bar foo=foo bindIsEnabled=false isEnabled=isEnabled bindIsHappy=false isHappy=isHappy}}
+      {{foo-bar foo=this.foo bindIsEnabled=true isEnabled=this.isEnabled bindIsHappy=false isHappy=this.isHappy}}
+      {{foo-bar foo=this.foo bindIsEnabled=false isEnabled=this.isEnabled bindIsHappy=true isHappy=this.isHappy}}
+      {{foo-bar foo=this.foo bindIsEnabled=true isEnabled=this.isEnabled bindIsHappy=true isHappy=this.isHappy}}
+      {{foo-bar foo=this.foo bindIsEnabled=false isEnabled=this.isEnabled bindIsHappy=false isHappy=this.isHappy}}
     `,
         { foo: 'foo', isEnabled: true, isHappy: false }
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index b4d9541177e..ae9a3991f4f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -31,7 +31,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name'],
         }),
-        template: '{{greeting}} {{name}}',
+        template: '{{this.greeting}} {{this.name}}',
       });
 
       this.render(strip`
@@ -49,7 +49,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{#each params as |p|}}{{p}}{{/each}}',
+        template: '{{#each this.params as |p|}}{{p}}{{/each}}',
       });
 
       this.render('{{component (component "-looked-up" this.model.greeting this.model.name)}}', {
@@ -84,7 +84,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{#each params as |p|}}{{p}}{{/each}}',
+        template: '{{#each this.params as |p|}}{{p}}{{/each}}',
       });
 
       this.render(
@@ -121,7 +121,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{#each params as |p|}}{{p}}{{/each}}',
+        template: '{{#each this.params as |p|}}{{p}}{{/each}}',
       });
 
       this.render(
@@ -158,7 +158,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{#each params as |p|}}{{p}}{{/each}}',
+        template: '{{#each this.params as |p|}}{{p}}{{/each}}',
       });
 
       this.render(
@@ -195,7 +195,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name'],
         }),
-        template: '{{greeting}} {{name}}',
+        template: '{{this.greeting}} {{this.name}}',
       });
 
       this.render(strip`
@@ -241,7 +241,7 @@ moduleFor(
 
     ['@test updates when curried hash argument is bound']() {
       this.registerComponent('-looked-up', {
-        template: '{{greeting}}',
+        template: '{{this.greeting}}',
       });
 
       this.render(`{{component (component "-looked-up" greeting=this.model.greeting)}}`, {
@@ -267,7 +267,7 @@ moduleFor(
 
     ['@test updates when curried hash arguments is bound in block form']() {
       this.registerComponent('-looked-up', {
-        template: '{{greeting}}',
+        template: '{{this.greeting}}',
       });
 
       this.render(
@@ -302,7 +302,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name', 'age'],
         }),
-        template: '{{name}} {{age}}',
+        template: '{{this.name}} {{this.age}}',
       });
 
       this.render(
@@ -321,7 +321,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['greeting', 'name', 'age'],
         }),
-        template: '{{greeting}} {{name}} {{age}}',
+        template: '{{this.greeting}} {{this.name}} {{this.age}}',
       });
 
       this.render('{{component (component (component "-looked-up" "Hi") "Max") 9}}');
@@ -335,7 +335,7 @@ moduleFor(
 
     ['@test nested components overwrite hash parameters']() {
       this.registerComponent('-looked-up', {
-        template: '{{greeting}} {{name}} {{age}}',
+        template: '{{this.greeting}} {{this.name}} {{this.age}}',
       });
 
       this.render(
@@ -372,14 +372,14 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['comp'],
         }),
-        template: '{{component comp "Inner"}}',
+        template: '{{component this.comp "Inner"}}',
       });
 
       this.registerComponent('-looked-up', {
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name', 'age'],
         }),
-        template: '{{name}} {{age}}',
+        template: '{{this.name}} {{this.age}}',
       });
 
       this.render(
@@ -421,11 +421,11 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['comp'],
         }),
-        template: '{{component comp name="Inner"}}',
+        template: '{{component this.comp name="Inner"}}',
       });
 
       this.registerComponent('-looked-up', {
-        template: '{{name}} {{age}}',
+        template: '{{this.name}} {{this.age}}',
       });
 
       this.render(
@@ -469,7 +469,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name'],
         }),
-        template: '{{greeting}} {{name}}',
+        template: '{{this.greeting}} {{this.name}}',
       });
 
       this.render('{{component (component "-looked-up" this.model.name greeting="Hodi")}}', {
@@ -494,9 +494,9 @@ moduleFor(
     }
 
     ['@test component with dynamic component name resolving to undefined, then an existing component']() {
-      this.registerComponent('foo-bar', { template: 'hello {{name}}' });
+      this.registerComponent('foo-bar', { template: 'hello {{this.name}}' });
 
-      this.render('{{component (component componentName name=name)}}', {
+      this.render('{{component (component this.componentName name=this.name)}}', {
         componentName: undefined,
         name: 'Alex',
       });
@@ -517,9 +517,9 @@ moduleFor(
     }
 
     ['@test component with dynamic component name resolving to a component, then undefined']() {
-      this.registerComponent('foo-bar', { template: 'hello {{name}}' });
+      this.registerComponent('foo-bar', { template: 'hello {{this.name}}' });
 
-      this.render('{{component (component componentName name=name)}}', {
+      this.render('{{component (component this.componentName name=this.name)}}', {
         componentName: 'foo-bar',
         name: 'Alex',
       });
@@ -540,9 +540,9 @@ moduleFor(
     }
 
     ['@test component with dynamic component name resolving to null, then an existing component']() {
-      this.registerComponent('foo-bar', { template: 'hello {{name}}' });
+      this.registerComponent('foo-bar', { template: 'hello {{this.name}}' });
 
-      this.render('{{component (component componentName name=name)}}', {
+      this.render('{{component (component this.componentName name=this.name)}}', {
         componentName: null,
         name: 'Alex',
       });
@@ -563,9 +563,9 @@ moduleFor(
     }
 
     ['@test component with dynamic component name resolving to a component, then null']() {
-      this.registerComponent('foo-bar', { template: 'hello {{name}}' });
+      this.registerComponent('foo-bar', { template: 'hello {{this.name}}' });
 
-      this.render('{{component (component componentName name=name)}}', {
+      this.render('{{component (component this.componentName name=this.name)}}', {
         componentName: 'foo-bar',
         name: 'Alex',
       });
@@ -603,7 +603,7 @@ moduleFor(
       }
 
       assert.throws(() => {
-        this.render('{{component (component compName)}}', {
+        this.render('{{component (component this.compName)}}', {
           compName: 'not-a-component',
         });
       }, 'Could not find component named "not-a-component" (no component or template with that name was found)');
@@ -630,7 +630,7 @@ moduleFor(
     ['@test renders with dot path and attr']() {
       let expectedText = 'Hodi';
       this.registerComponent('-looked-up', {
-        template: '{{expectedText}}',
+        template: '{{this.expectedText}}',
       });
 
       this.render(
@@ -663,7 +663,7 @@ moduleFor(
     ['@test renders with dot path and curried over attr']() {
       let expectedText = 'Hodi';
       this.registerComponent('-looked-up', {
-        template: '{{expectedText}}',
+        template: '{{this.expectedText}}',
       });
 
       this.render(
@@ -698,7 +698,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{params}}',
+        template: '{{this.params}}',
       });
 
       let expectedText = 'Hodi';
@@ -748,7 +748,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#let (hash my-component=(component 'my-component' first)) as |c|}}
+      {{#let (hash my-component=(component 'my-component' this.first)) as |c|}}
         {{c.my-component}}
       {{/let}}`,
         { first: 'first' }
@@ -764,12 +764,12 @@ moduleFor(
             this.set('myProp', this.getAttr('my-parent-attr'));
           },
         }),
-        template: '<span id="nested-prop">{{myProp}}</span>',
+        template: '<span id="nested-prop">{{this.myProp}}</span>',
       });
 
       this.registerComponent('my-component', {
         template:
-          '{{yield (hash my-nested-component=(component "my-nested-component" my-parent-attr=my-attr))}}',
+          '{{yield (hash my-nested-component=(component "my-nested-component" my-parent-attr=this.my-attr))}}',
       });
 
       this.registerComponent('my-action-component', {
@@ -781,7 +781,7 @@ moduleFor(
           },
         }),
         template: strip`
-        {{#my-component my-attr=myProp as |api|}}
+        {{#my-component my-attr=this.myProp as |api|}}
           {{api.my-nested-component}}
         {{/my-component}}
         <br>
@@ -821,7 +821,7 @@ moduleFor(
       });
 
       this.registerComponent('select-box-option', {
-        template: '{{label}}',
+        template: '{{this.label}}',
       });
 
       this.render(strip`
@@ -846,7 +846,7 @@ moduleFor(
           positionalParams: ['val'],
         }),
         template: strip`
-        <button {{action (action (mut val) 10)}} class="my-button">
+        <button {{action (action (mut this.val) 10)}} class="my-button">
           Change to 10
         </button>`,
       });
@@ -900,7 +900,7 @@ moduleFor(
           },
         }),
         template: strip`
-        message: {{message}}{{inner-component message=message}}
+        message: {{this.message}}{{inner-component message=this.message}}
         <button onclick={{action "change"}} />`,
       });
 
@@ -941,12 +941,12 @@ moduleFor(
           },
           isOpen: undefined,
         }),
-        template: '{{if isOpen "open" "closed"}}',
+        template: '{{if this.isOpen "open" "closed"}}',
       });
 
       this.render(
         strip`
-      {{#let (hash ctxCmp=(component "my-comp" isOpen=isOpen)) as |thing|}}
+      {{#let (hash ctxCmp=(component "my-comp" isOpen=this.isOpen)) as |thing|}}
         {{#thing.ctxCmp}}This is a contextual component{{/thing.ctxCmp}}
       {{/let}}
     `,
@@ -1005,12 +1005,12 @@ moduleFor(
           },
           isOpen: undefined,
         }),
-        template: '{{if isOpen "open" "closed"}}',
+        template: '{{if this.isOpen "open" "closed"}}',
       });
 
       this.render(
         strip`
-      {{#let (hash ctxCmp=(component compName isOpen=isOpen)) as |thing|}}
+      {{#let (hash ctxCmp=(component this.compName isOpen=this.isOpen)) as |thing|}}
         {{#thing.ctxCmp}}This is a contextual component{{/thing.ctxCmp}}
       {{/let}}
     `,
@@ -1070,7 +1070,7 @@ moduleFor(
           },
           isOpen: undefined,
         }),
-        template: 'my-comp: {{if isOpen "open" "closed"}}',
+        template: 'my-comp: {{if this.isOpen "open" "closed"}}',
       });
 
       this.registerComponent('your-comp', {
@@ -1083,12 +1083,12 @@ moduleFor(
           },
           isOpen: undefined,
         }),
-        template: 'your-comp: {{if isOpen "open" "closed"}}',
+        template: 'your-comp: {{if this.isOpen "open" "closed"}}',
       });
 
       this.render(
         strip`
-      {{#let (hash ctxCmp=(component compName isOpen=isOpen)) as |thing|}}
+      {{#let (hash ctxCmp=(component this.compName isOpen=this.isOpen)) as |thing|}}
         {{#thing.ctxCmp}}This is a contextual component{{/thing.ctxCmp}}
       {{/let}}
     `,
@@ -1155,10 +1155,10 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{#each params as |p|}}{{p}}{{/each}}',
+        template: '{{#each this.params as |p|}}{{p}}{{/each}}',
       });
 
-      this.render('{{component (component "my-link") params=allParams}}', {
+      this.render('{{component (component "my-link") params=this.allParams}}', {
         allParams: emberA(['a', 'b']),
       });
 
@@ -1194,11 +1194,11 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: '{{#each params as |p|}}{{p}}{{/each}}',
+        template: '{{#each this.params as |p|}}{{p}}{{/each}}',
       });
 
       this.render(
-        '{{#let (hash link=(component "my-link")) as |c|}}{{c.link params=allParams}}{{/let}}',
+        '{{#let (hash link=(component "my-link")) as |c|}}{{c.link params=this.allParams}}{{/let}}',
         {
           allParams: emberA(['a', 'b']),
         }
@@ -1232,7 +1232,7 @@ moduleFor(
     }
 
     ['@test it can invoke input component']() {
-      this.render('{{component (component "input" type="text" value=value)}}', {
+      this.render('{{component (component "input" type="text" value=this.value)}}', {
         value: 'foo',
       });
 
@@ -1258,7 +1258,7 @@ moduleFor(
     }
 
     ['@test it can invoke textarea component']() {
-      this.render('{{component (component "textarea" value=value)}}', {
+      this.render('{{component (component "textarea" value=this.value)}}', {
         value: 'foo',
       });
 
@@ -1305,7 +1305,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: 'foo-bar component:{{#each params as |param|}} {{param}}{{/each}}',
+        template: 'foo-bar component:{{#each this.params as |param|}} {{param}}{{/each}}',
       });
 
       this.render(strip`
@@ -1337,7 +1337,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: 'params',
         }),
-        template: 'inner:{{#each params as |param|}} {{param}}{{/each}}',
+        template: 'inner:{{#each this.params as |param|}} {{param}}{{/each}}',
       });
 
       this.render('{{x-outer inner=(component "x-inner")}}');
@@ -1448,7 +1448,7 @@ class MutableParamTestGenerator {
             positionalParams: ['val'],
           }),
           template: strip`
-          <button {{action (action (mut val) 10)}} class="my-button">
+          <button {{action (action (mut this.val) 10)}} class="my-button">
             Change to 10
           </button>`,
         });
@@ -1490,7 +1490,7 @@ applyMixins(
           ComponentClass: Component.extend().reopenClass({
             positionalParams: ['components'],
           }),
-          template: '{{component components.comp}}',
+          template: '{{component this.components.comp}}',
         });
 
         this.render('{{my-comp (hash comp=(component "change-button" this.model.val2))}}');
@@ -1512,7 +1512,7 @@ applyMixins(
       title: 'nested hash value',
       setup() {
         this.registerComponent('my-comp', {
-          template: '{{component components.button}}',
+          template: '{{component this.components.button}}',
         });
 
         this.render(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 268ef8a691a..4fce8afba94 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -36,9 +36,9 @@ moduleFor(
     }
 
     ['@test it can have a custom id and it is not bound']() {
-      this.registerComponent('foo-bar', { template: '{{id}} {{elementId}}' });
+      this.registerComponent('foo-bar', { template: '{{this.id}} {{this.elementId}}' });
 
-      this.render('{{foo-bar id=customId}}', {
+      this.render('{{foo-bar id=this.customId}}', {
         customId: 'bizz',
       });
 
@@ -85,7 +85,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{elementId}}',
+        template: '{{this.elementId}}',
       });
 
       this.render('{{foo-bar}}');
@@ -125,7 +125,7 @@ moduleFor(
 
       this.registerComponent('quux-baz', {
         ComponentClass: Component.extend({}),
-        template: '{{changingArg}}',
+        template: '{{this.changingArg}}',
       });
 
       this.render('{{foo-bar}}');
@@ -152,7 +152,7 @@ moduleFor(
         },
       });
 
-      this.registerTemplate('fizz-bar', `FIZZ BAR {{local}}`);
+      this.registerTemplate('fizz-bar', `FIZZ BAR {{this.local}}`);
 
       this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
 
@@ -165,7 +165,7 @@ moduleFor(
       let FooBarComponent = Component.extend({
         elementId: 'blahzorz',
         layout: computed(function () {
-          return compile('so much layout wat {{lulz}}');
+          return compile('so much layout wat {{this.lulz}}');
         }),
         init() {
           this._super(...arguments);
@@ -190,7 +190,7 @@ moduleFor(
         template: 'something',
       });
 
-      this.render('{{foo-bar id=somethingUndefined}}');
+      this.render('{{foo-bar id=this.somethingUndefined}}');
 
       let foundId = this.$('h1').attr('id');
       assert.ok(
@@ -376,7 +376,7 @@ moduleFor(
     ['@test should not apply falsy class name']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar class=somethingFalsy}}', {
+      this.render('{{foo-bar class=this.somethingFalsy}}', {
         somethingFalsy: false,
       });
 
@@ -398,7 +398,7 @@ moduleFor(
     ['@test should update class using inline if, initially false, no alternate']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar class=(if predicate "thing") }}', {
+      this.render('{{foo-bar class=(if this.predicate "thing") }}', {
         predicate: false,
       });
 
@@ -430,7 +430,7 @@ moduleFor(
     ['@test should update class using inline if, initially true, no alternate']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar class=(if predicate "thing") }}', {
+      this.render('{{foo-bar class=(if this.predicate "thing") }}', {
         predicate: true,
       });
 
@@ -462,7 +462,7 @@ moduleFor(
     ['@test class property on components can be dynamic']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar class=(if fooBar "foo-bar")}}', {
+      this.render('{{foo-bar class=(if this.fooBar "foo-bar")}}', {
         fooBar: true,
       });
 
@@ -706,7 +706,7 @@ moduleFor(
 
     ['@test it reflects named arguments as properties']() {
       this.registerComponent('foo-bar', {
-        template: '{{foo}}',
+        template: '{{this.foo}}',
       });
 
       this.render('{{foo-bar foo=this.model.bar}}', {
@@ -805,7 +805,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{message}}',
+        template: '{{this.message}}',
       });
 
       this.render('{{foo-bar}}');
@@ -828,7 +828,7 @@ moduleFor(
     ['@test it preserves the outer context when yielding']() {
       this.registerComponent('foo-bar', { template: '{{yield}}' });
 
-      this.render('{{#foo-bar}}{{message}}{{/foo-bar}}', { message: 'hello' });
+      this.render('{{#foo-bar}}{{this.message}}{{/foo-bar}}', { message: 'hello' });
 
       this.assertComponentElement(this.firstChild, { content: 'hello' });
 
@@ -890,11 +890,11 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{yield greeting greetee.firstName}}',
+        template: '{{yield this.greeting this.greetee.firstName}}',
       });
 
       this.render(
-        '{{#foo-bar greetee=person as |greeting name|}}{{name}} {{person.lastName}}, {{greeting}}{{/foo-bar}}',
+        '{{#foo-bar greetee=this.person as |greeting name|}}{{name}} {{this.person.lastName}}, {{greeting}}{{/foo-bar}}',
         {
           person: {
             firstName: 'Joel',
@@ -955,7 +955,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{danger}}{{yield danger}}',
+        template: '{{this.danger}}{{yield this.danger}}',
       });
 
       // On initial render, create streams. The bug will not have manifested yet, but at this point
@@ -987,7 +987,7 @@ moduleFor(
       let destroyed = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0 };
 
       this.registerComponent('foo-bar', {
-        template: '{{id}} {{yield}}',
+        template: '{{this.id}} {{yield}}',
         ComponentClass: Component.extend({
           willDestroy() {
             this._super();
@@ -998,15 +998,15 @@ moduleFor(
 
       this.render(
         strip`
-      {{#if cond1}}
+      {{#if this.cond1}}
         {{#foo-bar id=1}}
-          {{#if cond2}}
+          {{#if this.cond2}}
             {{#foo-bar id=2}}{{/foo-bar}}
-            {{#if cond3}}
+            {{#if this.cond3}}
               {{#foo-bar id=3}}
-                {{#if cond4}}
+                {{#if this.cond4}}
                   {{#foo-bar id=4}}
-                    {{#if cond5}}
+                    {{#if this.cond5}}
                       {{#foo-bar id=5}}{{/foo-bar}}
                       {{#foo-bar id=6}}{{/foo-bar}}
                       {{#foo-bar id=7}}{{/foo-bar}}
@@ -1104,7 +1104,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{output}}',
+        template: '{{this.output}}',
       });
 
       this.render('{{foo-bar}}');
@@ -1136,7 +1136,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{{output}}}',
+        template: '{{{this.output}}}',
       });
 
       this.render('{{foo-bar}}');
@@ -1170,7 +1170,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{output}}',
+        template: '{{this.output}}',
       });
 
       this.render('{{foo-bar}}');
@@ -1239,7 +1239,7 @@ moduleFor(
         ComponentClass: FooBarComponent,
 
         template: strip`
-        {{#if isStream}}
+        {{#if this.isStream}}
           true
         {{else}}
           false
@@ -1268,7 +1268,7 @@ moduleFor(
         template: 'some-component',
       });
 
-      this.render('{{some-prop}} {{some-component}}', {
+      this.render('{{this.some-prop}} {{some-component}}', {
         'some-component': 'not-some-component',
         'some-prop': 'some-prop',
       });
@@ -1307,7 +1307,7 @@ moduleFor(
         template: 'In layout - someProp: {{attrs.someProp}}',
       });
 
-      this.render('{{non-block someProp=prop}}', {
+      this.render('{{non-block someProp=this.prop}}', {
         prop: 'something here',
       });
 
@@ -1331,7 +1331,7 @@ moduleFor(
         template: 'In layout - someProp: {{@someProp}}',
       });
 
-      this.render('{{non-block someProp=prop}}', {
+      this.render('{{non-block someProp=this.prop}}', {
         prop: 'something here',
       });
 
@@ -1360,10 +1360,10 @@ moduleFor(
             this.someProp = 'value set in instance';
           },
         }),
-        template: 'In layout - someProp: {{someProp}}',
+        template: 'In layout - someProp: {{this.someProp}}',
       });
 
-      this.render('{{non-block someProp=prop}}', {
+      this.render('{{non-block someProp=this.prop}}', {
         prop: 'something passed when invoked',
       });
 
@@ -1420,11 +1420,11 @@ moduleFor(
             willUpdateCount++;
           },
         }),
-        template: 'In layout - someProp: {{someProp}}',
+        template: 'In layout - someProp: {{this.someProp}}',
       });
 
       expectHooks({ willUpdate: false, didReceiveAttrs: true }, () => {
-        this.render('{{non-block someProp=someProp}}', {
+        this.render('{{non-block someProp=this.someProp}}', {
           someProp: 'wycats',
         });
       });
@@ -1498,7 +1498,7 @@ moduleFor(
         `,
       });
 
-      this.render(`{{non-block counter=counter}}`, {
+      this.render(`{{non-block counter=this.counter}}`, {
         counter: 0,
       });
 
@@ -1514,7 +1514,7 @@ moduleFor(
     ['@test this.attrs.foo === attrs.foo === @foo === foo']() {
       this.registerComponent('foo-bar', {
         template: strip`
-        Args: {{this.attrs.value}} | {{attrs.value}} | {{@value}} | {{value}}
+        Args: {{this.attrs.value}} | {{attrs.value}} | {{@value}} | {{this.value}}
         {{#each this.attrs.items as |item|}}
           {{item}}
         {{/each}}
@@ -1524,7 +1524,7 @@ moduleFor(
         {{#each @items as |item|}}
           {{item}}
         {{/each}}
-        {{#each items as |item|}}
+        {{#each this.items as |item|}}
           {{item}}
         {{/each}}
       `,
@@ -1553,10 +1553,10 @@ moduleFor(
 
     ['@test non-block with properties on self']() {
       this.registerComponent('non-block', {
-        template: 'In layout - someProp: {{someProp}}',
+        template: 'In layout - someProp: {{this.someProp}}',
       });
 
-      this.render('{{non-block someProp=prop}}', {
+      this.render('{{non-block someProp=this.prop}}', {
         prop: 'something here',
       });
 
@@ -1577,12 +1577,12 @@ moduleFor(
 
     ['@test block with properties on self']() {
       this.registerComponent('with-block', {
-        template: 'In layout - someProp: {{someProp}} - {{yield}}',
+        template: 'In layout - someProp: {{this.someProp}} - {{yield}}',
       });
 
       this.render(
         strip`
-      {{#with-block someProp=prop}}
+      {{#with-block someProp=this.prop}}
         In template
       {{/with-block}}`,
         {
@@ -1612,7 +1612,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with-block someProp=prop}}
+      {{#with-block someProp=this.prop}}
         In template
       {{/with-block}}`,
         {
@@ -1642,7 +1642,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#with-block someProp=prop}}
+      {{#with-block someProp=this.prop}}
         In template
       {{/with-block}}`,
         {
@@ -1671,7 +1671,7 @@ moduleFor(
           positionalParams: 'names',
         }),
         template: strip`
-        {{#each names as |name|}}
+        {{#each this.names as |name|}}
           {{name}}
         {{/each}}`,
       });
@@ -1695,13 +1695,13 @@ moduleFor(
           positionalParams: 'names',
         }),
         template: strip`
-        {{#each names as |name|}}
+        {{#each this.names as |name|}}
           {{name}}
         {{/each}}`,
       });
 
       expectAssertion(() => {
-        this.render(`{{sample-component "Foo" 4 "Bar" names=numbers id="args-3"}}`, {
+        this.render(`{{sample-component "Foo" 4 "Bar" names=this.numbers id="args-3"}}`, {
           numbers: [1, 2, 3],
         });
       }, 'You cannot specify positional parameters and the hash argument `names`.');
@@ -1713,12 +1713,12 @@ moduleFor(
           positionalParams: 'names',
         }),
         template: strip`
-        {{#each names as |name|}}
+        {{#each this.names as |name|}}
           {{name}}
         {{/each}}`,
       });
 
-      this.render('{{sample-component names=things}}', {
+      this.render('{{sample-component names=this.things}}', {
         things: emberA(['Foo', 4, 'Bar']),
       });
 
@@ -1750,7 +1750,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['first', 'second'],
         }),
-        template: '{{first}} - {{second}}',
+        template: '{{this.first}} - {{this.second}}',
       });
 
       // TODO: Fix when id is implemented
@@ -1776,12 +1776,12 @@ moduleFor(
           positionalParams: 'n',
         }),
         template: strip`
-        {{#each n as |name|}}
+        {{#each this.n as |name|}}
           {{name}}
         {{/each}}`,
       });
 
-      this.render(`{{sample-component user1 user2}}`, {
+      this.render(`{{sample-component this.user1 this.user2}}`, {
         user1: 'Foo',
         user2: 4,
       });
@@ -1813,7 +1813,7 @@ moduleFor(
         template: 'Here!',
       });
 
-      this.render('{{aria-test ariaRole=role}}', {
+      this.render('{{aria-test ariaRole=this.role}}', {
         role: 'main',
       });
 
@@ -1839,7 +1839,7 @@ moduleFor(
         template: 'Here!',
       });
 
-      this.render('{{aria-test ariaRole=role}}', {
+      this.render('{{aria-test ariaRole=this.role}}', {
         role: undefined,
       });
 
@@ -1892,13 +1892,13 @@ moduleFor(
         ComponentClass: Component.extend({
           template: compile('Should not be used'),
         }),
-        template: '[In layout - {{name}}] {{yield}}',
+        template: '[In layout - {{this.name}}] {{yield}}',
       });
 
       this.render(
         strip`
       {{#with-template name="with-block"}}
-        [In block - {{name}}]
+        [In block - {{this.name}}]
       {{/with-template}}
       {{with-template name="without-block"}}`,
         {
@@ -2017,7 +2017,7 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name', 'age'],
         }),
-        template: '{{name}}{{age}}',
+        template: '{{this.name}}{{this.age}}',
       });
 
       this.render('{{sample-component "Quint" 4}}');
@@ -2034,10 +2034,10 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name', 'age'],
         }),
-        template: '{{name}}{{age}}',
+        template: '{{this.name}}{{this.age}}',
       });
 
-      this.render('{{sample-component myName myAge}}', {
+      this.render('{{sample-component this.myName this.myAge}}', {
         myName: 'Quint',
         myAge: 4,
       });
@@ -2069,11 +2069,11 @@ moduleFor(
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name'],
         }),
-        template: '{{name}}',
+        template: '{{this.name}}',
       });
 
       expectAssertion(() => {
-        this.render('{{sample-component notMyName name=myName}}', {
+        this.render('{{sample-component this.notMyName name=this.myName}}', {
           myName: 'Quint',
           notMyName: 'Sergio',
         });
@@ -2083,8 +2083,8 @@ moduleFor(
     ['@test yield to inverse']() {
       this.registerComponent('my-if', {
         template: strip`
-        {{#if predicate}}
-          Yes:{{yield someValue}}
+        {{#if this.predicate}}
+          Yes:{{yield this.someValue}}
         {{else}}
           No:{{yield to="inverse"}}
         {{/if}}`,
@@ -2092,7 +2092,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#my-if predicate=activated someValue=42 as |result|}}
+      {{#my-if predicate=this.activated someValue=42 as |result|}}
         Hello{{result}}
       {{else}}
         Goodbye
@@ -2509,7 +2509,7 @@ moduleFor(
       this.render(
         strip`
       {{#x-outer}}
-        {{#if showInner}}
+        {{#if this.showInner}}
           {{x-inner}}
         {{/if}}
       {{/x-outer}}`,
@@ -2561,7 +2561,7 @@ moduleFor(
         ComponentClass: Component.extend({
           value: 1,
         }),
-        template: '{{#x-middle}}{{x-inner value=value}}{{/x-middle}}',
+        template: '{{#x-middle}}{{x-inner value=this.value}}{{/x-middle}}',
       });
 
       this.registerComponent('x-middle', {
@@ -2572,7 +2572,7 @@ moduleFor(
           },
           value: null,
         }),
-        template: '<div id="middle-value">{{value}}</div>{{yield}}',
+        template: '<div id="middle-value">{{this.value}}</div>{{yield}}',
       });
 
       this.registerComponent('x-inner', {
@@ -2601,7 +2601,7 @@ moduleFor(
           wrapper: EmberObject.create({ content: null }),
         }),
         template:
-          '<div id="outer-value">{{wrapper.content}}</div> {{x-inner value=value wrapper=wrapper}}',
+          '<div id="outer-value">{{this.wrapper.content}}</div> {{x-inner value=this.value wrapper=this.wrapper}}',
       });
 
       this.registerComponent('x-inner', {
@@ -2626,18 +2626,18 @@ moduleFor(
     ['@test non-block with each rendering child components']() {
       this.registerComponent('non-block', {
         template: strip`
-        In layout. {{#each items as |item|}}
+        In layout. {{#each this.items as |item|}}
           [{{child-non-block item=item}}]
         {{/each}}`,
       });
 
       this.registerComponent('child-non-block', {
-        template: 'Child: {{item}}.',
+        template: 'Child: {{this.item}}.',
       });
 
       let items = emberA(['Tom', 'Dick', 'Harry']);
 
-      this.render('{{non-block items=items}}', { items });
+      this.render('{{non-block items=this.items}}', { items });
 
       this.assertText('In layout. [Child: Tom.][Child: Dick.][Child: Harry.]');
 
@@ -2707,7 +2707,7 @@ moduleFor(
           blahzz: ['blark', 'pory'],
         }),
         template: strip`
-        {{#each blahzz as |p|}}
+        {{#each this.blahzz as |p|}}
           {{p}}
         {{/each}}
         - {{yield}}`,
@@ -2737,10 +2737,10 @@ moduleFor(
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
 
-        template: '{{bar}}',
+        template: '{{this.bar}}',
       });
 
-      this.render('{{localBar}} - {{foo-bar bar=localBar}}', {
+      this.render('{{this.localBar}} - {{foo-bar bar=this.localBar}}', {
         localBar: 'initial value',
       });
 
@@ -2792,10 +2792,10 @@ moduleFor(
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
 
-        template: '{{bar}}',
+        template: '{{this.bar}}',
       });
 
-      this.render('{{localBar}} - {{foo-bar bar=localBar}}', {
+      this.render('{{this.localBar}} - {{foo-bar bar=this.localBar}}', {
         localBar: 'initial value',
       });
 
@@ -2843,7 +2843,7 @@ moduleFor(
         template: '',
       });
 
-      this.render('{{localBar}}{{foo-bar bar=localBar}}', {
+      this.render('{{this.localBar}}{{foo-bar bar=this.localBar}}', {
         localBar: 'initial value',
       });
 
@@ -2878,9 +2878,9 @@ moduleFor(
 
       this.registerComponent('parent', {
         ComponentClass: ParentComponent,
-        template: `{{child value=string}}
+        template: `{{child value=this.string}}
 
-        Parent String=<span data-test-parent-value>{{string}}</span>`,
+        Parent String=<span data-test-parent-value>{{this.string}}</span>`,
       });
 
       let ChildComponent = Component.extend({
@@ -2908,7 +2908,7 @@ moduleFor(
 
       this.registerComponent('child', {
         ComponentClass: ChildComponent,
-        template: '{{value}}',
+        template: '{{this.value}}',
       });
 
       this.render('{{parent}}');
@@ -2961,7 +2961,7 @@ moduleFor(
         ComponentClass: Component.extend({
           name: injectService(),
         }),
-        template: '{{name.last}}',
+        template: '{{this.name.last}}',
       });
 
       this.render('{{foo-bar}}');
@@ -3027,7 +3027,7 @@ moduleFor(
       });
 
       expectDeprecation(() => {
-        this.render(`{{foo-bar id="foo-bar" isVisible=visible}}`, {
+        this.render(`{{foo-bar id="foo-bar" isVisible=this.visible}}`, {
           visible: false,
         });
       }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
@@ -3064,7 +3064,7 @@ moduleFor(
       });
 
       expectDeprecation(() => {
-        this.render(`{{foo-bar id="foo-bar" isVisible=visible}}`, {
+        this.render(`{{foo-bar id="foo-bar" isVisible=this.visible}}`, {
           visible: false,
         });
       }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
@@ -3123,7 +3123,7 @@ moduleFor(
       });
 
       expectDeprecation(() => {
-        this.render(`{{foo-bar id="foo-bar" foo=foo isVisible=visible}}`, {
+        this.render(`{{foo-bar id="foo-bar" foo=this.foo isVisible=this.visible}}`, {
           visible: false,
           foo: 'baz',
         });
@@ -3182,7 +3182,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{one-way-input value=value}}', {
+      this.render('{{one-way-input value=this.value}}', {
         value: 'foo',
       });
 
@@ -3272,7 +3272,7 @@ moduleFor(
       });
 
       this.render(strip`
-      {{#x-select value=value as |select|}}
+      {{#x-select value=this.value as |select|}}
         {{#x-option value="1" select=select}}1{{/x-option}}
         {{#x-option value="2" select=select}}2{{/x-option}}
       {{/x-select}}
@@ -3300,7 +3300,7 @@ moduleFor(
           },
         }),
 
-        template: `{{#if showFoo}}things{{/if}}`,
+        template: `{{#if this.showFoo}}things{{/if}}`,
       });
 
       this.render(`{{foo-bar}}`);
@@ -3328,10 +3328,10 @@ moduleFor(
           }),
         }),
 
-        template: '{{bar}}-{{barCopy}}',
+        template: '{{this.bar}}-{{this.barCopy}}',
       });
 
-      await this.render(`{{foo-bar bar=bar}}`, { bar: 3 });
+      await this.render(`{{foo-bar bar=this.bar}}`, { bar: 3 });
 
       this.assertText('3-4');
 
@@ -3354,10 +3354,10 @@ moduleFor(
           },
         }),
 
-        template: '{{foo}}-{{fooCopy}}-{{bar}}-{{barCopy}}',
+        template: '{{this.foo}}-{{this.fooCopy}}-{{this.bar}}-{{this.barCopy}}',
       });
 
-      this.render(`{{foo-bar foo=foo bar=bar}}`, { foo: 1, bar: 3 });
+      this.render(`{{foo-bar foo=this.foo bar=this.bar}}`, { foo: 1, bar: 3 });
     }
 
     ['@test overriding didUpdateAttrs does not trigger deprecation'](assert) {
@@ -3368,10 +3368,10 @@ moduleFor(
           },
         }),
 
-        template: '{{foo}}-{{fooCopy}}-{{bar}}-{{barCopy}}',
+        template: '{{this.foo}}-{{this.fooCopy}}-{{this.bar}}-{{this.barCopy}}',
       });
 
-      this.render(`{{foo-bar foo=foo bar=bar}}`, { foo: 1, bar: 3 });
+      this.render(`{{foo-bar foo=this.foo bar=this.bar}}`, { foo: 1, bar: 3 });
 
       runTask(() => set(this.context, 'foo', 5));
     }
@@ -3479,15 +3479,15 @@ moduleFor(
 
     ['@test component yielding in an {{#each}} has correct block values after rerendering (GH#14284)']() {
       this.registerComponent('list-items', {
-        template: `{{#each items as |item|}}{{yield item}}{{/each}}`,
+        template: `{{#each this.items as |item|}}{{yield item}}{{/each}}`,
       });
 
       this.render(
         strip`
-      {{#list-items items=items as |thing|}}
+      {{#list-items items=this.items as |thing|}}
         |{{thing}}|
 
-        {{#if editMode}}
+        {{#if this.editMode}}
           Remove {{thing}}
         {{/if}}
       {{/list-items}}
@@ -3516,7 +3516,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{foo-bar wat}}');
+      this.render('{{foo-bar this.wat}}');
       this.assertText('hello');
     }
 
@@ -3527,7 +3527,7 @@ moduleFor(
         ComponentClass: MyComponent.reopenClass({
           positionalParams: ['myVar'],
         }),
-        template: 'MyVar1: {{attrs.myVar}} {{myVar}} MyVar2: {{myVar2}} {{attrs.myVar2}}',
+        template: 'MyVar1: {{attrs.myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{attrs.myVar2}}',
       });
 
       this.render('{{foo-bar 1 myVar2=2}}');
@@ -3542,7 +3542,7 @@ moduleFor(
         ComponentClass: MyComponent.reopenClass({
           positionalParams: ['myVar'],
         }),
-        template: 'MyVar1: {{@myVar}} {{myVar}} MyVar2: {{myVar2}} {{@myVar2}}',
+        template: 'MyVar1: {{@myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{@myVar2}}',
       });
 
       this.render('{{foo-bar 1 myVar2=2}}');
@@ -3819,7 +3819,7 @@ moduleFor(
         template: '{{this.baz}}',
       });
 
-      this.render('{{#if cond}}{{foo-bar baz=this.value}}{{/if}}', { cond: true, value: 'hello' });
+      this.render('{{#if this.cond}}{{foo-bar baz=this.value}}{{/if}}', { cond: true, value: 'hello' });
 
       this.assertComponentElement(this.firstChild, { content: 'hello' });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index d0d3c0aaa04..6b98567099c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -11,9 +11,9 @@ moduleFor(
   'Components test: dynamic components',
   class extends RenderingTestCase {
     ['@test it can render a basic component with a static component name argument']() {
-      this.registerComponent('foo-bar', { template: 'hello {{name}}' });
+      this.registerComponent('foo-bar', { template: 'hello {{this.name}}' });
 
-      this.render('{{component "foo-bar" name=name}}', { name: 'Sarah' });
+      this.render('{{component "foo-bar" name=this.name}}', { name: 'Sarah' });
 
       this.assertComponentElement(this.firstChild, { content: 'hello Sarah' });
 
@@ -32,13 +32,13 @@ moduleFor(
 
     ['@test it can render a basic component with a dynamic component name argument']() {
       this.registerComponent('foo-bar', {
-        template: 'hello {{name}} from foo-bar',
+        template: 'hello {{this.name}} from foo-bar',
       });
       this.registerComponent('foo-bar-baz', {
-        template: 'hello {{name}} from foo-bar-baz',
+        template: 'hello {{this.name}} from foo-bar-baz',
       });
 
-      this.render('{{component componentName name=name}}', {
+      this.render('{{component this.componentName name=this.name}}', {
         componentName: 'foo-bar',
         name: 'Alex',
       });
@@ -175,7 +175,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: '{{message}}',
+        template: '{{this.message}}',
       });
 
       this.render('{{component "foo-bar"}}');
@@ -198,7 +198,7 @@ moduleFor(
     ['@test it preserves the outer context when yielding']() {
       this.registerComponent('foo-bar', { template: '{{yield}}' });
 
-      this.render('{{#component "foo-bar"}}{{message}}{{/component}}', {
+      this.render('{{#component "foo-bar"}}{{this.message}}{{/component}}', {
         message: 'hello',
       });
 
@@ -221,7 +221,7 @@ moduleFor(
       let destroyed = { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0 };
 
       this.registerComponent('foo-bar', {
-        template: '{{id}} {{yield}}',
+        template: '{{this.id}} {{yield}}',
         ComponentClass: Component.extend({
           willDestroy() {
             this._super();
@@ -232,15 +232,15 @@ moduleFor(
 
       this.render(
         strip`
-      {{#if cond1}}
+      {{#if this.cond1}}
         {{#component "foo-bar" id=1}}
-          {{#if cond2}}
+          {{#if this.cond2}}
             {{#component "foo-bar" id=2}}{{/component}}
-            {{#if cond3}}
+            {{#if this.cond3}}
               {{#component "foo-bar" id=3}}
-                {{#if cond4}}
+                {{#if this.cond4}}
                   {{#component "foo-bar" id=4}}
-                    {{#if cond5}}
+                    {{#if this.cond5}}
                       {{#component "foo-bar" id=5}}{{/component}}
                       {{#component "foo-bar" id=6}}{{/component}}
                       {{#component "foo-bar" id=7}}{{/component}}
@@ -358,7 +358,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{component componentName name=name}}', {
+      this.render('{{component this.componentName name=this.name}}', {
         componentName: 'foo-bar',
       });
 
@@ -379,7 +379,7 @@ moduleFor(
 
     ['@test component helper with bound properties are updating correctly in init of component']() {
       this.registerComponent('foo-bar', {
-        template: 'foo-bar {{location}} {{locationCopy}} {{yield}}',
+        template: 'foo-bar {{this.location}} {{this.locationCopy}} {{yield}}',
         ComponentClass: Component.extend({
           init: function () {
             this._super(...arguments);
@@ -389,7 +389,7 @@ moduleFor(
       });
 
       this.registerComponent('foo-bar-baz', {
-        template: 'foo-bar-baz {{location}} {{locationCopy}} {{yield}}',
+        template: 'foo-bar-baz {{this.location}} {{this.locationCopy}} {{yield}}',
         ComponentClass: Component.extend({
           init: function () {
             this._super(...arguments);
@@ -399,7 +399,7 @@ moduleFor(
       });
 
       this.registerComponent('outer-component', {
-        template: '{{#component componentName location=location}}arepas!{{/component}}',
+        template: '{{#component this.componentName location=this.location}}arepas!{{/component}}',
         ComponentClass: Component.extend({
           componentName: computed('location', function () {
             if (this.get('location') === 'Caracas') {
@@ -411,7 +411,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{outer-component location=location}}', {
+      this.render('{{outer-component location=this.location}}', {
         location: 'Caracas',
       });
 
@@ -453,7 +453,7 @@ moduleFor(
       let actionTriggered = 0;
       this.registerComponent('outer-component', {
         template:
-          '{{#component componentName somethingClicked=(action "mappedAction")}}arepas!{{/component}}',
+          '{{#component this.componentName somethingClicked=(action "mappedAction")}}arepas!{{/component}}',
         ComponentClass: Component.extend({
           classNames: 'outer-component',
           componentName: 'inner-component',
@@ -488,7 +488,7 @@ moduleFor(
       });
 
       this.render(
-        '{{#component componentName1 location=location}}{{#component componentName2 location=location}}arepas!{{/component}}{{/component}}',
+        '{{#component this.componentName1 location=this.location}}{{#component this.componentName2 location=this.location}}arepas!{{/component}}{{/component}}',
         {
           componentName1: 'foo-bar',
           componentName2: 'baz-qux',
@@ -525,7 +525,7 @@ moduleFor(
       }
 
       assert.throws(() => {
-        this.render('{{component componentName}}', {
+        this.render('{{component this.componentName}}', {
           componentName: 'does-not-exist',
         });
       }, /Attempted to resolve `does-not-exist`, which was expected to be a component, but nothing was found./);
@@ -543,9 +543,9 @@ moduleFor(
     }
 
     ['@test component with dynamic component name resolving to a component, then non-existent component']() {
-      this.registerComponent('foo-bar', { template: 'hello {{name}}' });
+      this.registerComponent('foo-bar', { template: 'hello {{this.name}}' });
 
-      this.render('{{component componentName name=name}}', {
+      this.render('{{component this.componentName name=this.name}}', {
         componentName: 'foo-bar',
         name: 'Alex',
       });
@@ -567,7 +567,7 @@ moduleFor(
 
     ['@test component helper properly invalidates hash params inside an {{each}} invocation #11044']() {
       this.registerComponent('foo-bar', {
-        template: '[{{internalName}} - {{name}}]',
+        template: '[{{this.internalName}} - {{this.name}}]',
         ComponentClass: Component.extend({
           willRender() {
             // store internally available name to ensure that the name available in `this.attrs.name`
@@ -577,7 +577,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{#each items as |item|}}{{component "foo-bar" name=item.name}}{{/each}}', {
+      this.render('{{#each this.items as |item|}}{{component "foo-bar" name=item.name}}{{/each}}', {
         items: [{ name: 'Robert' }, { name: 'Jacquie' }],
       });
 
@@ -598,20 +598,20 @@ moduleFor(
 
     ['@test positional parameters does not clash when rendering different components']() {
       this.registerComponent('foo-bar', {
-        template: 'hello {{name}} ({{age}}) from foo-bar',
+        template: 'hello {{this.name}} ({{this.age}}) from foo-bar',
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name', 'age'],
         }),
       });
 
       this.registerComponent('foo-bar-baz', {
-        template: 'hello {{name}} ({{age}}) from foo-bar-baz',
+        template: 'hello {{this.name}} ({{this.age}}) from foo-bar-baz',
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['name', 'age'],
         }),
       });
 
-      this.render('{{component componentName name age}}', {
+      this.render('{{component this.componentName this.name this.age}}', {
         componentName: 'foo-bar',
         name: 'Alex',
         age: 29,
@@ -658,14 +658,14 @@ moduleFor(
 
     ['@test positional parameters does not pollute the attributes when changing components']() {
       this.registerComponent('normal-message', {
-        template: 'Normal: {{something}}!',
+        template: 'Normal: {{this.something}}!',
         ComponentClass: Component.extend().reopenClass({
           positionalParams: ['something'],
         }),
       });
 
       this.registerComponent('alternative-message', {
-        template: 'Alternative: {{something}} {{somethingElse}}!',
+        template: 'Alternative: {{this.something}} {{this.somethingElse}}!',
         ComponentClass: Component.extend({
           something: 'Another',
         }).reopenClass({
@@ -673,7 +673,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{component componentName message}}', {
+      this.render('{{component this.componentName this.message}}', {
         componentName: 'normal-message',
         message: 'Hello',
       });
@@ -716,7 +716,7 @@ moduleFor(
           positionalParams: 'names',
         }),
         template: strip`
-        {{#each names as |name|}}
+        {{#each this.names as |name|}}
           {{name}}
         {{/each}}`,
       });
@@ -736,12 +736,12 @@ moduleFor(
           positionalParams: 'n',
         }),
         template: strip`
-        {{#each n as |name|}}
+        {{#each this.n as |name|}}
           {{name}}
         {{/each}}`,
       });
 
-      this.render(`{{component "sample-component" user1 user2}}`, {
+      this.render(`{{component "sample-component" this.user1 this.user2}}`, {
         user1: 'Foo',
         user2: 4,
       });
@@ -781,7 +781,7 @@ moduleFor(
             });
           },
         }),
-        template: `Hi {{person.name}}! {{component "error-component" person=person}}`,
+        template: `Hi {{this.person.name}}! {{component "error-component" person=this.person}}`,
       });
 
       this.registerComponent('error-component', {
@@ -791,7 +791,7 @@ moduleFor(
             this.set('person.name', 'Ben');
           },
         }),
-        template: '{{person.name}}',
+        template: '{{this.person.name}}',
       });
 
       let expectedBacktrackingMessage = backtrackingMessageFor('name', 'Person \\(Ben\\)', {
@@ -799,7 +799,7 @@ moduleFor(
       });
 
       expectAssertion(() => {
-        this.render('{{component componentName}}', {
+        this.render('{{component this.componentName}}', {
           componentName: 'outer-component',
         });
       }, expectedBacktrackingMessage);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
index b50ee890339..e29a27f44b4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
@@ -28,7 +28,7 @@ moduleFor(
       });
 
       assert.throws(() => {
-        this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+        this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
       }, /silly mistake in init/);
 
       assert.equal(
@@ -70,7 +70,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', {
+      this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', {
         switch: true,
       });
 
@@ -123,7 +123,7 @@ moduleFor(
       });
 
       assert.throws(() => {
-        this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+        this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
       }, /silly mistake/);
 
       assert.equal(
@@ -155,7 +155,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', {
+      this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', {
         switch: true,
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
index c450adb304a..31d868a155f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
@@ -25,7 +25,7 @@ moduleFor(
         },
       });
 
-      let template = `{{#if foo}}<div>Hey</div>{{/if}}{{yield bar}}`;
+      let template = `{{#if this.foo}}<div>Hey</div>{{/if}}{{yield this.bar}}`;
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
@@ -153,7 +153,7 @@ moduleFor(
     }
 
     ['@test does not throw an error if `tagName` is an empty string and `id` is specified via JS']() {
-      let template = `{{id}}`;
+      let template = `{{this.id}}`;
       let FooBarComponent = Component.extend({
         tagName: '',
         id: 'baz',
@@ -168,7 +168,7 @@ moduleFor(
     }
 
     ['@test does not throw an error if `tagName` is an empty string and `id` is specified via template']() {
-      let template = `{{id}}`;
+      let template = `{{this.id}}`;
       let FooBarComponent = Component.extend({
         tagName: '',
       });
@@ -182,7 +182,7 @@ moduleFor(
     }
 
     ['@test does not throw an error if `tagName` is an empty string and `id` is bound property specified via template']() {
-      let template = `{{id}}`;
+      let template = `{{this.id}}`;
       let FooBarComponent = Component.extend({
         tagName: '',
       });
@@ -192,7 +192,7 @@ moduleFor(
         template,
       });
 
-      this.render(`{{#foo-bar id=fooBarId}}{{/foo-bar}}`, { fooBarId: 'baz' });
+      this.render(`{{#foo-bar id=this.fooBarId}}{{/foo-bar}}`, { fooBarId: 'baz' });
 
       this.assertText('baz');
 
@@ -208,12 +208,12 @@ moduleFor(
     }
 
     ['@test does not throw an error if `tagName` is an empty string and `id` is specified via template and passed to child component']() {
-      let fooBarTemplate = `{{#baz-child id=id}}{{/baz-child}}`;
+      let fooBarTemplate = `{{#baz-child id=this.id}}{{/baz-child}}`;
       let FooBarComponent = Component.extend({
         tagName: '',
       });
       let BazChildComponent = Component.extend();
-      let bazChildTemplate = `{{id}}`;
+      let bazChildTemplate = `{{this.id}}`;
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 0ff8a1268c3..8b95dc9e0c5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -184,7 +184,7 @@ moduleFor(
   'Components test: <Input />',
   class extends InputRenderingTest {
     ['@test a single text field is inserted into the DOM']() {
-      this.render(`<Input @type="text" @value={{value}} />`, { value: 'hello' });
+      this.render(`<Input @type="text" @value={{this.value}} />`, { value: 'hello' });
 
       let id = this.inputID();
 
@@ -223,14 +223,14 @@ moduleFor(
     ['@test dynamic attributes (HTML attribute)']() {
       this.render(
         `
-      <Input @type="text" @value={{value}}
-        disabled={{disabled}}
-        placeholder={{placeholder}}
-        name={{name}}
-        maxlength={{maxlength}}
-        minlength={{minlength}}
-        size={{size}}
-        tabindex={{tabindex}}
+      <Input @type="text" @value={{this.value}}
+        disabled={{this.disabled}}
+        placeholder={{this.placeholder}}
+        name={{this.name}}
+        maxlength={{this.maxlength}}
+        minlength={{this.minlength}}
+        size={{this.size}}
+        tabindex={{this.tabindex}}
       />`,
         {
           value: 'Original value',
@@ -308,14 +308,14 @@ moduleFor(
     ['@test dynamic attributes (named argument)']() {
       this.render(
         `
-      <Input @type="text" @value={{value}}
-        @disabled={{disabled}}
-        @placeholder={{placeholder}}
-        @name={{name}}
-        @maxlength={{maxlength}}
-        @minlength={{minlength}}
-        @size={{size}}
-        @tabindex={{tabindex}}
+      <Input @type="text" @value={{this.value}}
+        @disabled={{this.disabled}}
+        @placeholder={{this.placeholder}}
+        @name={{this.name}}
+        @maxlength={{this.maxlength}}
+        @minlength={{this.minlength}}
+        @size={{this.size}}
+        @tabindex={{this.tabindex}}
       />`,
         {
           value: 'Original value',
@@ -461,7 +461,7 @@ moduleFor(
       // causes an event in Safari.
       runDestroy(this.owner.lookup('event_dispatcher:main'));
 
-      this.render(`<Input @type="text" @value={{value}} />`, { value: 'original' });
+      this.render(`<Input @type="text" @value={{this.value}} />`, { value: 'original' });
 
       let input = this.$input()[0];
 
@@ -544,7 +544,7 @@ moduleFor(
       assert.expect(4);
 
       expectDeprecation(() => {
-        this.render(`<Input @value={{value}} @key-press='foo' />`, {
+        this.render(`<Input @value={{this.value}} @key-press='foo' />`, {
           value: 'initial',
 
           actions: {
@@ -568,7 +568,7 @@ moduleFor(
     ['@test sends an action with `<Input @key-press={{action "foo"}} />` is pressed'](assert) {
       assert.expect(2);
 
-      this.render(`<Input @value={{value}} @key-press={{action 'foo'}} />`, {
+      this.render(`<Input @value={{this.value}} @key-press={{action 'foo'}} />`, {
         value: 'initial',
 
         actions: {
@@ -807,7 +807,7 @@ moduleFor(
   'Components test: <Input /> with dynamic type',
   class extends InputRenderingTest {
     ['@test a bound property can be used to determine type']() {
-      this.render(`<Input @type={{type}} />`, { type: 'password' });
+      this.render(`<Input @type={{this.type}} />`, { type: 'password' });
 
       this.assertAttr('type', 'password');
 
@@ -825,7 +825,7 @@ moduleFor(
     }
 
     ['@test a subexpression can be used to determine type']() {
-      this.render(`<Input @type={{if isTruthy trueType falseType}} />`, {
+      this.render(`<Input @type={{if this.isTruthy this.trueType this.falseType}} />`, {
         isTruthy: true,
         trueType: 'text',
         falseType: 'password',
@@ -848,13 +848,16 @@ moduleFor(
 
     ['@test GH16256 input macro does not modify params in place']() {
       this.registerComponent('my-input', {
-        template: `<Input @type={{inputType}} />`,
+        template: `<Input @type={{this.inputType}} />`,
       });
 
-      this.render(`<MyInput @inputType={{firstType}} /><MyInput @inputType={{secondType}} />`, {
-        firstType: 'password',
-        secondType: 'email',
-      });
+      this.render(
+        `<MyInput @inputType={{this.firstType}} /><MyInput @inputType={{this.secondType}} />`,
+        {
+          firstType: 'password',
+          secondType: 'email',
+        }
+      );
 
       let inputs = this.element.querySelectorAll('input');
       this.assert.equal(inputs.length, 2, 'there are two inputs');
@@ -869,10 +872,10 @@ moduleFor(
   class extends InputRenderingTest {
     ['@test dynamic attributes (HTML attribute)']() {
       this.render(
-        `<Input @type='checkbox' @checked={{checked}}
-          disabled={{disabled}}
-          name={{name}}
-          tabindex={{tabindex}}
+        `<Input @type='checkbox' @checked={{this.checked}}
+          disabled={{this.disabled}}
+          name={{this.name}}
+          tabindex={{this.tabindex}}
         />`,
         {
           disabled: false,
@@ -919,10 +922,10 @@ moduleFor(
 
     ['@test dynamic attributes (named argument)']() {
       this.render(
-        `<Input @type='checkbox' @checked={{checked}}
-          @disabled={{disabled}}
-          @name={{name}}
-          @tabindex={{tabindex}}
+        `<Input @type='checkbox' @checked={{this.checked}}
+          @disabled={{this.disabled}}
+          @name={{this.name}}
+          @tabindex={{this.tabindex}}
         />`,
         {
           disabled: false,
@@ -969,7 +972,7 @@ moduleFor(
 
     ['@feature(!EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property assertion']() {
       expectAssertion(() => {
-        this.render(`<Input @type="checkbox" @value={{value}} />`, {
+        this.render(`<Input @type="checkbox" @value={{this.value}} />`, {
           value: 'value',
         });
       }, /checkbox.+@value.+not supported.+use.+@checked.+instead/);
@@ -997,7 +1000,7 @@ moduleFor(
     }
 
     ['@test with a bound type']() {
-      this.render(`<Input @type={{inputType}} @checked={{isChecked}} />`, {
+      this.render(`<Input @type={{this.inputType}} @checked={{this.isChecked}} />`, {
         inputType: 'checkbox',
         isChecked: true,
       });
@@ -1083,13 +1086,13 @@ moduleFor(
 
       this.render(
         `
-      <Input @type="text" @value={{value}}
-        disabled={{disabled}}
-        placeholder={{placeholder}}
-        name={{name}}
-        maxlength={{maxlength}}
-        size={{size}}
-        tabindex={{tabindex}}
+      <Input @type="text" @value={{this.value}}
+        disabled={{this.disabled}}
+        placeholder={{this.placeholder}}
+        name={{this.name}}
+        maxlength={{this.maxlength}}
+        size={{this.size}}
+        tabindex={{this.tabindex}}
       />`,
         {
           value: null,
@@ -1152,13 +1155,13 @@ moduleFor(
 
       this.render(
         `
-      <Input @type="text" @value={{value}}
-        @disabled={{disabled}}
-        @placeholder={{placeholder}}
-        @name={{name}}
-        @maxlength={{maxlength}}
-        @size={{size}}
-        @tabindex={{tabindex}}
+      <Input @type="text" @value={{this.value}}
+        @disabled={{this.disabled}}
+        @placeholder={{this.placeholder}}
+        @name={{this.name}}
+        @maxlength={{this.maxlength}}
+        @size={{this.size}}
+        @tabindex={{this.tabindex}}
       />`,
         {
           value: null,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index f53bc62347d..d48e1b9a4a2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -144,7 +144,7 @@ moduleFor(
   'Components test: {{input}}',
   class extends InputRenderingTest {
     ['@test a single text field is inserted into the DOM']() {
-      this.render(`{{input type="text" value=value}}`, { value: 'hello' });
+      this.render(`{{input type="text" value=this.value}}`, { value: 'hello' });
 
       let id = this.inputID();
 
@@ -184,14 +184,14 @@ moduleFor(
       this.render(
         `
       {{input type="text"
-        disabled=disabled
-        value=value
-        placeholder=placeholder
-        name=name
-        maxlength=maxlength
-        minlength=minlength
-        size=size
-        tabindex=tabindex
+        disabled=this.disabled
+        value=this.value
+        placeholder=this.placeholder
+        name=this.name
+        maxlength=this.maxlength
+        minlength=this.minlength
+        size=this.size
+        tabindex=this.tabindex
       }}`,
         {
           disabled: false,
@@ -305,7 +305,7 @@ moduleFor(
       // causes an event in Safari.
       runDestroy(this.owner.lookup('event_dispatcher:main'));
 
-      this.render(`{{input type="text" value=value}}`, { value: 'original' });
+      this.render(`{{input type="text" value=this.value}}`, { value: 'original' });
 
       let input = this.$input()[0];
 
@@ -388,7 +388,7 @@ moduleFor(
       assert.expect(4);
 
       expectDeprecation(() => {
-        this.render(`{{input value=value key-press='foo'}}`, {
+        this.render(`{{input value=this.value key-press='foo'}}`, {
           value: 'initial',
 
           actions: {
@@ -412,7 +412,7 @@ moduleFor(
     ['@test sends an action with `{{input key-press=(action "foo")}}` is pressed'](assert) {
       assert.expect(2);
 
-      this.render(`{{input value=value key-press=(action 'foo')}}`, {
+      this.render(`{{input value=this.value key-press=(action 'foo')}}`, {
         value: 'initial',
 
         actions: {
@@ -649,7 +649,7 @@ moduleFor(
   'Components test: {{input}} with dynamic type',
   class extends InputRenderingTest {
     ['@test a bound property can be used to determine type']() {
-      this.render(`{{input type=type}}`, { type: 'password' });
+      this.render(`{{input type=this.type}}`, { type: 'password' });
 
       this.assertAttr('type', 'password');
 
@@ -667,7 +667,7 @@ moduleFor(
     }
 
     ['@test a subexpression can be used to determine type']() {
-      this.render(`{{input type=(if isTruthy trueType falseType)}}`, {
+      this.render(`{{input type=(if this.isTruthy this.trueType this.falseType)}}`, {
         isTruthy: true,
         trueType: 'text',
         falseType: 'password',
@@ -690,10 +690,10 @@ moduleFor(
 
     ['@test GH16256 input macro does not modify params in place']() {
       this.registerComponent('my-input', {
-        template: `{{input type=inputType}}`,
+        template: `{{input type=this.inputType}}`,
       });
 
-      this.render(`{{my-input inputType=firstType}}{{my-input inputType=secondType}}`, {
+      this.render(`{{my-input inputType=this.firstType}}{{my-input inputType=this.secondType}}`, {
         firstType: 'password',
         secondType: 'email',
       });
@@ -713,10 +713,10 @@ moduleFor(
       this.render(
         `{{input
       type='checkbox'
-      disabled=disabled
-      name=name
-      checked=checked
-      tabindex=tabindex
+      disabled=this.disabled
+      name=this.name
+      checked=this.checked
+      tabindex=this.tabindex
     }}`,
         {
           disabled: false,
@@ -763,7 +763,7 @@ moduleFor(
 
     ['@feature(!EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property assertion']() {
       expectAssertion(() => {
-        this.render(`{{input type="checkbox" value=value}}`, {
+        this.render(`{{input type="checkbox" value=this.value}}`, {
           value: 'value',
         });
       }, /checkbox.+value.+not supported.+use.+checked.+instead/);
@@ -791,7 +791,7 @@ moduleFor(
     }
 
     ['@test with a bound type']() {
-      this.render(`{{input type=inputType checked=isChecked}}`, {
+      this.render(`{{input type=this.inputType checked=this.isChecked}}`, {
         inputType: 'checkbox',
         isChecked: true,
       });
@@ -858,13 +858,13 @@ moduleFor(
       this.render(
         `
       {{input type="text"
-        disabled=disabled
-        value=value
-        placeholder=placeholder
-        name=name
-        maxlength=maxlength
-        size=size
-        tabindex=tabindex
+        disabled=this.disabled
+        value=this.value
+        placeholder=this.placeholder
+        name=this.name
+        maxlength=this.maxlength
+        size=this.size
+        tabindex=this.tabindex
       }}`,
         {
           disabled: null,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-compile-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-compile-test.js
index 8113e3a417f..c83d4664179 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-compile-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-compile-test.js
@@ -61,11 +61,11 @@ moduleFor(
       });
 
       this.registerComponent('x-bar', {
-        template: '[x-bar: {{bar}}]',
+        template: '[x-bar: {{this.bar}}]',
         ComponentClass: BaseClass.extend(),
       });
 
-      this.render(`[-top-level: {{foo}}] {{x-bar bar=bar}}`, {
+      this.render(`[-top-level: {{this.foo}}] {{x-bar bar=this.bar}}`, {
         foo: 'foo',
         bar: 'bar',
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js
index 4ff195030e8..2b925614848 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js
@@ -66,22 +66,22 @@ moduleFor(
       });
 
       this.registerComponent('x-bar', {
-        template: '[x-bar: {{bar}}] {{yield}}',
+        template: '[x-bar: {{this.bar}}] {{yield}}',
         ComponentClass: BaseClass.extend(),
       });
 
       this.registerComponent('x-baz', {
-        template: '[x-baz: {{baz}}]',
+        template: '[x-baz: {{this.baz}}]',
         ComponentClass: BaseClass.extend(),
       });
 
       this.registerComponent('x-bat', {
-        template: '[x-bat: {{bat}}]',
+        template: '[x-bat: {{this.bat}}]',
         ComponentClass: BaseClass.extend(),
       });
 
       this.render(
-        `[-top-level: {{foo}}] {{#x-bar bar=bar}}{{x-baz baz=baz}}{{/x-bar}} {{x-bat bat=bat}}`,
+        `[-top-level: {{this.foo}}] {{#x-bar bar=this.bar}}{{x-baz baz=this.baz}}{{/x-bar}} {{x-bat bat=this.bat}}`,
         {
           foo: 'foo',
           bar: 'bar',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index c0ea57ff659..7e5c2717e59 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -329,7 +329,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
       </div>`,
     });
 
-    this.render(invoke('the-top', { twitter: expr('twitter') }), {
+    this.render(invoke('the-top', { twitter: expr(attr('twitter')) }), {
       twitter: '@tomdale',
     });
 
@@ -562,9 +562,9 @@ class LifeCycleHooksTest extends RenderingTestCase {
 
     this.render(
       invoke('the-parent', {
-        twitter: expr('twitter'),
-        name: expr('name'),
-        website: expr('website'),
+        twitter: expr(attr('twitter')),
+        name: expr(attr('name')),
+        website: expr(attr('website')),
       }),
       {
         twitter: '@tomdale',
@@ -883,7 +883,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
       </div>`,
     });
 
-    this.render(invoke('the-top', { twitter: expr('twitter') }), {
+    this.render(invoke('the-top', { twitter: expr(attr('twitter')) }), {
       twitter: '@tomdale',
     });
 
@@ -1049,7 +1049,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
 
     this.registerComponent('an-item', {
       template: strip`
-      {{#nested-item}}Item: {{count}}{{/nested-item}}
+      {{#nested-item}}Item: {{this.count}}{{/nested-item}}
     `,
     });
 
@@ -1061,7 +1061,7 @@ class LifeCycleHooksTest extends RenderingTestCase {
 
     this.render(
       strip`
-      {{#each items as |item|}}
+      {{#each this.items as |item|}}
         ${invoke('an-item', { count: expr('item') })}
       {{else}}
         ${invoke('no-items')}
@@ -1286,7 +1286,7 @@ class CurlyComponentsTest extends LifeCycleHooksTest {
   }
 
   attrFor(name) {
-    return `${name}`;
+    return `this.${name}`;
   }
 
   /* private */
@@ -1358,7 +1358,7 @@ moduleFor(
         },
       });
 
-      let template = `{{width}}`;
+      let template = `{{this.width}}`;
       this.registerComponent('foo-bar', { ComponentClass, template });
 
       this.render('{{foo-bar}}');
@@ -1380,11 +1380,11 @@ moduleFor(
         },
       });
 
-      let template = `{{foo}}`;
+      let template = `{{this.foo}}`;
 
       this.registerComponent('foo-bar', { ComponentClass, template });
 
-      this.render('{{foo-bar parent=this foo=foo}}');
+      this.render('{{foo-bar parent=this foo=this.foo}}');
 
       this.assertText('wat');
 
@@ -1438,8 +1438,8 @@ moduleFor(
       let PartentTemplate = strip`
       {{yield}}
       <ul>
-        {{#nested-component nestedId=(concat itemId '-A')}}A{{/nested-component}}
-        {{#nested-component nestedId=(concat itemId '-B')}}B{{/nested-component}}
+        {{#nested-component nestedId=(concat this.itemId '-A')}}A{{/nested-component}}
+        {{#nested-component nestedId=(concat this.itemId '-B')}}B{{/nested-component}}
       </ul>
     `;
 
@@ -1471,7 +1471,7 @@ moduleFor(
 
       this.render(
         strip`
-        {{#each items as |item|}}
+        {{#each this.items as |item|}}
           {{#parent-component itemId=item.id}}{{item.id}}{{/parent-component}}
         {{/each}}
         {{#if this.model.shouldShow}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index cdd65314641..76f07edfdc5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -308,7 +308,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        <LinkTo id="the-link" @query={{hash foo=boundThing}}>
+        <LinkTo id="the-link" @query={{hash foo=this.boundThing}}>
           Index
         </LinkTo>
         `
@@ -330,7 +330,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        <LinkTo id="the-link" @query={{hash abool=boundThing}}>
+        <LinkTo id="the-link" @query={{hash abool=this.boundThing}}>
           Index
         </LinkTo>
         `
@@ -547,7 +547,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        <LinkTo id='page-link' @query={{hash page=pageNumber}}>
+        <LinkTo id='page-link' @query={{hash page=this.pageNumber}}>
           Index
         </LinkTo>
         `
@@ -576,9 +576,9 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        <LinkTo id='array-link' @query={{hash pages=pagesArray}}>Index</LinkTo>
-        <LinkTo id='bigger-link' @query={{hash pages=biggerArray}}>Index</LinkTo>
-        <LinkTo id='empty-link' @query={{hash pages=emptyArray}}>Index</LinkTo>
+        <LinkTo id='array-link' @query={{hash pages=this.pagesArray}}>Index</LinkTo>
+        <LinkTo id='bigger-link' @query={{hash pages=this.biggerArray}}>Index</LinkTo>
+        <LinkTo id='empty-link' @query={{hash pages=this.emptyArray}}>Index</LinkTo>
         `
       );
 
@@ -631,7 +631,7 @@ moduleFor(
         `
         <LinkTo id='parent-link' @route='parent'>Parent</LinkTo>
         <LinkTo id='parent-child-link' @route='parent.child'>Child</LinkTo>
-        <LinkTo id='parent-link-qp' @route='parent' @query={{hash foo=cat}}>Parent</LinkTo>
+        <LinkTo id='parent-link-qp' @route='parent' @query={{hash foo=this.cat}}>Parent</LinkTo>
         {{outlet}}
         `
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index f6903e4cf32..730eb806f15 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -274,7 +274,7 @@ moduleFor(
     ['@test supplied QP properties can be bound'](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to (query-params foo=boundThing) id='the-link'}}Index{{/link-to}}`
+        `{{#link-to (query-params foo=this.boundThing) id='the-link'}}Index{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -293,7 +293,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params abool=boundThing) id='the-link'}}
+        {{#link-to (query-params abool=this.boundThing) id='the-link'}}
           Index
         {{/link-to}}
         `
@@ -505,7 +505,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params page=pageNumber) id='page-link'}}
+        {{#link-to (query-params page=this.pageNumber) id='page-link'}}
           Index
         {{/link-to}}
         `
@@ -534,9 +534,9 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params pages=pagesArray) id='array-link'}}Index{{/link-to}}
-        {{#link-to (query-params pages=biggerArray) id='bigger-link'}}Index{{/link-to}}
-        {{#link-to (query-params pages=emptyArray) id='empty-link'}}Index{{/link-to}}
+        {{#link-to (query-params pages=this.pagesArray) id='array-link'}}Index{{/link-to}}
+        {{#link-to (query-params pages=this.biggerArray) id='bigger-link'}}Index{{/link-to}}
+        {{#link-to (query-params pages=this.emptyArray) id='empty-link'}}Index{{/link-to}}
         `
       );
 
@@ -589,7 +589,7 @@ moduleFor(
         `
         {{#link-to 'parent' id='parent-link'}}Parent{{/link-to}}
         {{#link-to 'parent.child' id='parent-child-link'}}Child{{/link-to}}
-        {{#link-to 'parent' (query-params foo=cat) id='parent-link-qp'}}Parent{{/link-to}}
+        {{#link-to 'parent' (query-params foo=this.cat) id='parent-link-qp'}}Parent{{/link-to}}
         {{outlet}}
         `
       );
@@ -771,7 +771,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params page=pageNumber) id='page-link'}}
+        {{#link-to (query-params page=this.pageNumber) id='page-link'}}
           Index
         {{/link-to}}
         `
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index fd6aa02f5bc..230b65a5adf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -27,7 +27,7 @@ moduleFor(
     ['@test re-renders when title changes']() {
       let controller;
 
-      this.addTemplate('application', `<LinkTo @route='index'>{{title}}</LinkTo>`);
+      this.addTemplate('application', `<LinkTo @route='index'>{{this.title}}</LinkTo>`);
 
       this.add(
         'controller:application',
@@ -50,7 +50,7 @@ moduleFor(
     ['@test re-computes active class when params change'](assert) {
       let controller;
 
-      this.addTemplate('application', '<LinkTo @route={{routeName}}>foo</LinkTo>');
+      this.addTemplate('application', '<LinkTo @route={{this.routeName}}>foo</LinkTo>');
 
       this.add(
         'controller:application',
@@ -79,7 +79,7 @@ moduleFor(
         ComponentClass: LinkComponent.extend(),
       });
 
-      this.addTemplate('application', `<CustomLinkTo @route='index'>{{title}}</CustomLinkTo>`);
+      this.addTemplate('application', `<CustomLinkTo @route='index'>{{this.title}}</CustomLinkTo>`);
 
       this.add(
         'controller:application',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index e2e834389ef..ab11e4f2a69 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -26,7 +26,7 @@ moduleFor(
     ['@test re-renders when title changes']() {
       let controller;
 
-      this.addTemplate('application', `{{link-to title 'index'}}`);
+      this.addTemplate('application', `{{link-to this.title 'index'}}`);
 
       this.add(
         'controller:application',
@@ -49,7 +49,7 @@ moduleFor(
     ['@test re-computes active class when params change'](assert) {
       let controller;
 
-      this.addTemplate('application', '{{link-to "foo" routeName}}');
+      this.addTemplate('application', '{{link-to "foo" this.routeName}}');
 
       this.add(
         'controller:application',
@@ -74,7 +74,7 @@ moduleFor(
     }
 
     ['@test escaped inline form (double curlies) escapes link title']() {
-      this.addTemplate('application', `{{link-to title 'index'}}`);
+      this.addTemplate('application', `{{link-to this.title 'index'}}`);
       this.add(
         'controller:application',
         Controller.extend({
@@ -88,7 +88,7 @@ moduleFor(
     }
 
     ['@test unescaped inline form (triple curlies) does not escape link title'](assert) {
-      this.addTemplate('application', `{{{link-to title 'index'}}}`);
+      this.addTemplate('application', `{{{link-to this.title 'index'}}}`);
       this.add(
         'controller:application',
         Controller.extend({
@@ -106,7 +106,10 @@ moduleFor(
       this.addComponent('custom-link-to', {
         ComponentClass: LinkComponent.extend(),
       });
-      this.addTemplate('application', `{{#custom-link-to 'index'}}{{title}}{{/custom-link-to}}`);
+      this.addTemplate(
+        'application',
+        `{{#custom-link-to 'index'}}{{this.title}}{{/custom-link-to}}`
+      );
       this.add(
         'controller:application',
         Controller.extend({
@@ -123,7 +126,7 @@ moduleFor(
       this.addComponent('custom-link-to', {
         ComponentClass: LinkComponent.extend(),
       });
-      this.addTemplate('application', `{{custom-link-to title 'index'}}`);
+      this.addTemplate('application', `{{custom-link-to this.title 'index'}}`);
       this.add(
         'controller:application',
         Controller.extend({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 4ff9a9db99a..9ef1407a36f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -109,7 +109,7 @@ moduleFor(
         'index',
         `
         <LinkTo id="about-link-static" @route="about" @disabledWhen="shouldDisable">About</LinkTo>
-        <LinkTo id="about-link-dynamic" @route="about" @disabledWhen={{dynamicDisabledWhen}}>About</LinkTo>
+        <LinkTo id="about-link-dynamic" @route="about" @disabledWhen={{this.dynamicDisabledWhen}}>About</LinkTo>
         `
       );
 
@@ -175,7 +175,7 @@ moduleFor(
     [`@test the <LinkTo /> component supports a custom disabledClass set via bound param`](assert) {
       this.addTemplate(
         'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}} @disabledClass={{disabledClass}}>About</LinkTo>`
+        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}} @disabledClass={{this.disabledClass}}>About</LinkTo>`
       );
 
       this.add(
@@ -229,7 +229,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{disabledWhen}}>About</LinkTo>`
+        `<LinkTo id="about-link" @route="about" @disabledWhen={{this.disabledWhen}}>About</LinkTo>`
       );
 
       this.add(
@@ -294,7 +294,7 @@ moduleFor(
         `
         <h3 class="home">Home</h3>
         <LinkTo id='about-link' @route='about'>About</LinkTo>
-        <LinkTo id='self-link' @route='index' @activeClass={{activeClass}}>Self</LinkTo>
+        <LinkTo id='self-link' @route='index' @activeClass={{this.activeClass}}>Self</LinkTo>
         `
       );
 
@@ -645,7 +645,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        <LinkTo id='about-link' @route='about' @replace={{boundTruthyThing}}>About</LinkTo>
+        <LinkTo id='about-link' @route='about' @replace={{this.boundTruthyThing}}>About</LinkTo>
         `
       );
 
@@ -675,7 +675,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        <LinkTo id='about-link' @route='about' replace={{boundFalseyThing}}>About</LinkTo>
+        <LinkTo id='about-link' @route='about' replace={{this.boundFalseyThing}}>About</LinkTo>
         `
       );
 
@@ -887,7 +887,7 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `<LinkTo id='other-link' @route='items' @current-when={{currentWhen}}>ITEM</LinkTo>`
+        `<LinkTo id='other-link' @route='items' @current-when={{this.currentWhen}}>ITEM</LinkTo>`
       );
 
       return this.visit('/about').then(() => {
@@ -961,7 +961,7 @@ moduleFor(
       this.addTemplate(
         'index.about',
         `
-        <LinkTo id='index-link' @route='index' @current-when={{isCurrent}}>ITEM</LinkTo>
+        <LinkTo id='index-link' @route='index' @current-when={{this.isCurrent}}>ITEM</LinkTo>
         <LinkTo id='about-link' @route='item' @current-when={{true}}>ITEM</LinkTo>
         `
       );
@@ -1081,7 +1081,7 @@ moduleFor(
         'about',
         `
         <div {{action 'hide'}}>
-          <LinkTo id='about-contact' @route='about.contact' @bubbles={{boundFalseyThing}}>
+          <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
             About
           </LinkTo>
         </div>
@@ -1249,7 +1249,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        <LinkTo id='self-link' @route='index' target={{boundLinkTarget}}>Self</LinkTo>
+        <LinkTo id='self-link' @route='index' target={{this.boundLinkTarget}}>Self</LinkTo>
         `
       );
 
@@ -1295,7 +1295,7 @@ moduleFor(
       });
     }
 
-    [`@test the <LinkTo /> component does not call preventDefault if '@preventDefault={{boundFalseyThing}}' is passed as an option`](
+    [`@test the <LinkTo /> component does not call preventDefault if '@preventDefault={{this.boundFalseyThing}}' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1304,7 +1304,7 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `<LinkTo id='about-link' @route='about' @preventDefault={{boundFalseyThing}}>About</LinkTo>`
+        `<LinkTo id='about-link' @route='about' @preventDefault={{this.boundFalseyThing}}>About</LinkTo>`
       );
 
       this.add(
@@ -1400,12 +1400,12 @@ moduleFor(
       this.addTemplate(
         'filter',
         `
-        <p>{{filter}}</p>
+        <p>{{this.filter}}</p>
         <LinkTo id="link" @route="filter" @model="unpopular">Unpopular</LinkTo>
-        <LinkTo id="path-link" @route="filter" @model={{filter}}>Unpopular</LinkTo>
-        <LinkTo id="post-path-link" @route="post" @model={{post_id}}>Post</LinkTo>
+        <LinkTo id="path-link" @route="filter" @model={{this.filter}}>Unpopular</LinkTo>
+        <LinkTo id="post-path-link" @route="post" @model={{this.post_id}}>Post</LinkTo>
         <LinkTo id="post-number-link" @route="post" @model={{123}}>Post</LinkTo>
-        <LinkTo id="repo-object-link" @route="repo" @model={{repo}}>Repo</LinkTo>
+        <LinkTo id="repo-object-link" @route="repo" @model={{this.repo}}>Repo</LinkTo>
         `
       );
 
@@ -1466,7 +1466,7 @@ moduleFor(
         'index',
         `
         <LinkTo id='string-link' @route='index'>string</LinkTo>
-        <LinkTo id='path-link' @route={{foo}}>path</LinkTo>
+        <LinkTo id='path-link' @route={{this.foo}}>path</LinkTo>
         `
       );
 
@@ -1500,7 +1500,10 @@ moduleFor(
       let post = { id: '1' };
       let secondPost = { id: '2' };
 
-      this.addTemplate('index', `<LinkTo id="post" @route="post" @model={{post}}>post</LinkTo>`);
+      this.addTemplate(
+        'index',
+        `<LinkTo id="post" @route="post" @model={{this.post}}>post</LinkTo>`
+      );
 
       this.add('controller:index', Controller.extend());
 
@@ -1582,14 +1585,14 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#each routeNames as |routeName|}}
+        {{#each this.routeNames as |routeName|}}
           <LinkTo @route={{routeName}}>{{routeName}}</LinkTo>
         {{/each}}
-        {{#each routeNames as |r|}}
+        {{#each this.routeNames as |r|}}
           <LinkTo @route={{r}}>{{r}}</LinkTo>
         {{/each}}
-        <LinkTo @route={{route1}}>a</LinkTo>
-        <LinkTo @route={{route2}}>b</LinkTo>
+        <LinkTo @route={{this.route1}}>a</LinkTo>
+        <LinkTo @route={{this.route2}}>b</LinkTo>
         `
       );
 
@@ -1651,9 +1654,9 @@ moduleFor(
         'application',
         `
         <LinkTo id='home-link' @route='index'>Home</LinkTo>
-        <LinkTo id='default-post-link' @route='post' @model={{defaultPost}}>Default Post</LinkTo>
-        {{#if currentPost}}
-          <LinkTo id='current-post-link' @route='post' @model={{currentPost}}>Current Post</LinkTo>
+        <LinkTo id='default-post-link' @route='post' @model={{this.defaultPost}}>Default Post</LinkTo>
+        {{#if this.currentPost}}
+          <LinkTo id='current-post-link' @route='post' @model={{this.currentPost}}>Current Post</LinkTo>
         {{/if}}
         `
       );
@@ -1855,7 +1858,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        <LinkTo id="dynamic-link" @params={{dynamicLinkParams}}>Dynamic</LinkTo>
+        <LinkTo id="dynamic-link" @params={{this.dynamicLinkParams}}>Dynamic</LinkTo>
         `
       );
 
@@ -1924,10 +1927,10 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        <LinkTo id='context-link' @route={{destinationRoute}} @model={{routeContext}} @loadingClass='i-am-loading'>
+        <LinkTo id='context-link' @route={{this.destinationRoute}} @model={{this.routeContext}} @loadingClass='i-am-loading'>
           string
         </LinkTo>
-        <LinkTo id='static-link' @route={{secondRoute}} @loadingClass={{loadingClass}}>
+        <LinkTo id='static-link' @route={{this.secondRoute}} @loadingClass={{this.loadingClass}}>
           string
         </LinkTo>
         `
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index fe54123819a..06f162c2917 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -109,7 +109,7 @@ moduleFor(
         'index',
         `
         {{#link-to "about" id="about-link-static" disabledWhen="shouldDisable"}}About{{/link-to}}
-        {{#link-to "about" id="about-link-dynamic" disabledWhen=dynamicDisabledWhen}}About{{/link-to}}
+        {{#link-to "about" id="about-link-dynamic" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}
         `
       );
 
@@ -177,7 +177,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabledWhen=true disabledClass=disabledClass}}About{{/link-to}}`
+        `{{#link-to "about" id="about-link" disabledWhen=true disabledClass=this.disabledClass}}About{{/link-to}}`
       );
 
       this.add(
@@ -231,7 +231,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabledWhen=disabledWhen}}About{{/link-to}}`
+        `{{#link-to "about" id="about-link" disabledWhen=this.disabledWhen}}About{{/link-to}}`
       );
 
       this.add(
@@ -296,7 +296,7 @@ moduleFor(
         `
         <h3 class="home">Home</h3>
         {{#link-to 'about' id='about-link'}}About{{/link-to}}
-        {{#link-to 'index' id='self-link' activeClass=activeClass}}Self{{/link-to}}
+        {{#link-to 'index' id='self-link' activeClass=this.activeClass}}Self{{/link-to}}
         `
       );
 
@@ -646,7 +646,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' replace=boundTruthyThing}}About{{/link-to}}
+        {{#link-to 'about' id='about-link' replace=this.boundTruthyThing}}About{{/link-to}}
         `
       );
 
@@ -671,12 +671,12 @@ moduleFor(
         });
     }
 
-    ['@test The {{link-to}} component supports setting replace=boundFalseyThing'](assert) {
+    ['@test The {{link-to}} component supports setting replace=this.boundFalseyThing'](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' replace=boundFalseyThing}}About{{/link-to}}
+        {{#link-to 'about' id='about-link' replace=this.boundFalseyThing}}About{{/link-to}}
         `
       );
 
@@ -888,7 +888,7 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to 'items' id='other-link' current-when=currentWhen}}ITEM{{/link-to}}`
+        `{{#link-to 'items' id='other-link' current-when=this.currentWhen}}ITEM{{/link-to}}`
       );
 
       return this.visit('/about').then(() => {
@@ -962,7 +962,7 @@ moduleFor(
       this.addTemplate(
         'index.about',
         `
-        {{#link-to 'index' id='index-link' current-when=isCurrent}}index{{/link-to}}
+        {{#link-to 'index' id='index-link' current-when=this.isCurrent}}index{{/link-to}}
         {{#link-to 'item' id='about-link' current-when=true}}ITEM{{/link-to}}
         `
       );
@@ -1081,7 +1081,7 @@ moduleFor(
         'about',
         `
         <div {{action 'hide'}}>
-          {{#link-to 'about.contact' id='about-contact' bubbles=boundFalseyThing}}
+          {{#link-to 'about.contact' id='about-contact' bubbles=this.boundFalseyThing}}
             About
           {{/link-to}}
         </div>
@@ -1247,7 +1247,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `<h3 class="home">Home</h3>{{#link-to 'index' id='self-link' target=boundLinkTarget}}Self{{/link-to}}`
+        `<h3 class="home">Home</h3>{{#link-to 'index' id='self-link' target=this.boundLinkTarget}}Self{{/link-to}}`
       );
 
       this.add(
@@ -1292,7 +1292,7 @@ moduleFor(
       });
     }
 
-    [`@test the {{link-to}} component does not call preventDefault if 'preventDefault=boundFalseyThing' is passed as an option`](
+    [`@test the {{link-to}} component does not call preventDefault if 'preventDefault=this.boundFalseyThing' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1301,7 +1301,7 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to 'about' id='about-link' preventDefault=boundFalseyThing}}About{{/link-to}}`
+        `{{#link-to 'about' id='about-link' preventDefault=this.boundFalseyThing}}About{{/link-to}}`
       );
 
       this.add(
@@ -1397,12 +1397,12 @@ moduleFor(
       this.addTemplate(
         'filter',
         `
-        <p>{{filter}}</p>
+        <p>{{this.filter}}</p>
         {{#link-to "filter" "unpopular" id="link"}}Unpopular{{/link-to}}
-        {{#link-to "filter" filter id="path-link"}}Unpopular{{/link-to}}
-        {{#link-to "post" post_id id="post-path-link"}}Post{{/link-to}}
+        {{#link-to "filter" this.filter id="path-link"}}Unpopular{{/link-to}}
+        {{#link-to "post" this.post_id id="post-path-link"}}Post{{/link-to}}
         {{#link-to "post" 123 id="post-number-link"}}Post{{/link-to}}
-        {{#link-to "repo" repo id="repo-object-link"}}Repo{{/link-to}}
+        {{#link-to "repo" this.repo id="repo-object-link"}}Repo{{/link-to}}
         `
       );
 
@@ -1463,7 +1463,7 @@ moduleFor(
         'index',
         `
         {{#link-to 'index' id='string-link'}}string{{/link-to}}
-        {{#link-to foo id='path-link'}}path{{/link-to}}
+        {{#link-to this.foo id='path-link'}}path{{/link-to}}
         `
       );
 
@@ -1497,7 +1497,7 @@ moduleFor(
       let post = { id: '1' };
       let secondPost = { id: '2' };
 
-      this.addTemplate('index', `{{#link-to "post" post id="post"}}post{{/link-to}}`);
+      this.addTemplate('index', `{{#link-to "post" this.post id="post"}}post{{/link-to}}`);
 
       this.add('controller:index', Controller.extend());
 
@@ -1579,14 +1579,14 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#each routeNames as |routeName|}}
+        {{#each this.routeNames as |routeName|}}
           {{#link-to routeName}}{{routeName}}{{/link-to}}
         {{/each}}
-        {{#each routeNames as |r|}}
+        {{#each this.routeNames as |r|}}
           {{#link-to r}}{{r}}{{/link-to}}
         {{/each}}
-        {{#link-to route1}}a{{/link-to}}
-        {{#link-to route2}}b{{/link-to}}
+        {{#link-to this.route1}}a{{/link-to}}
+        {{#link-to this.route2}}b{{/link-to}}
         `
       );
 
@@ -1680,7 +1680,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{link-to contactName 'contact' id='contact-link'}}
+        {{link-to this.contactName 'contact' id='contact-link'}}
         {{#link-to 'index' id='self-link'}}Self{{/link-to}}
         `
       );
@@ -1812,7 +1812,7 @@ moduleFor(
         'index',
         `
         {{link-to 'string' 'index' id='string-link'}}
-        {{link-to path foo id='path-link'}}
+        {{link-to this.path this.foo id='path-link'}}
         `
       );
 
@@ -1839,7 +1839,7 @@ moduleFor(
     }
 
     [`@test The non-block form {{link-to}} protects against XSS`](assert) {
-      this.addTemplate('application', `{{link-to display 'index' id='link'}}`);
+      this.addTemplate('application', `{{link-to this.display 'index' id='link'}}`);
 
       this.add(
         'controller:application',
@@ -1888,9 +1888,9 @@ moduleFor(
         'application',
         `
         {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        {{#link-to 'post' defaultPost id='default-post-link'}}Default Post{{/link-to}}
-        {{#if currentPost}}
-          {{#link-to 'post' currentPost id='current-post-link'}}Current Post{{/link-to}}
+        {{#link-to 'post' this.defaultPost id='default-post-link'}}Default Post{{/link-to}}
+        {{#if this.currentPost}}
+          {{#link-to 'post' this.currentPost id='current-post-link'}}Current Post{{/link-to}}
         {{/if}}
         `
       );
@@ -2122,7 +2122,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to params=dynamicLinkParams id="dynamic-link"}}Dynamic{{/link-to}}
+        {{#link-to params=this.dynamicLinkParams id="dynamic-link"}}Dynamic{{/link-to}}
         `
       );
 
@@ -2193,10 +2193,10 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to destinationRoute routeContext loadingClass='i-am-loading' id='context-link'}}
+        {{#link-to this.destinationRoute this.routeContext loadingClass='i-am-loading' id='context-link'}}
           string
         {{/link-to}}
-        {{#link-to secondRoute loadingClass=loadingClass id='static-link'}}
+        {{#link-to this.secondRoute loadingClass=this.loadingClass id='static-link'}}
           string
         {{/link-to}}
         `
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index 5637727aa98..e6f1a7ba792 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -126,7 +126,7 @@ moduleFor(
 
     // TODO consolidate these next 2 tests
     ['@test Calling sendAction on a component with a reference attr calls the function with arguments']() {
-      this.renderDelegate('{{action-delegate playing=playing}}', {
+      this.renderDelegate('{{action-delegate playing=this.playing}}', {
         playing: null,
       });
 
@@ -150,7 +150,7 @@ moduleFor(
     }
 
     ['@test Calling sendAction on a component with a {{mut}} attr calls the function with arguments']() {
-      this.renderDelegate('{{action-delegate playing=(mut playing)}}', {
+      this.renderDelegate('{{action-delegate playing=(mut this.playing)}}', {
         playing: null,
       });
 
@@ -323,7 +323,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{#if shouldRender}}{{rip-alley}}{{/if}}', {
+      this.render('{{#if this.shouldRender}}{{rip-alley}}{{/if}}', {
         shouldRender: true,
       });
 
@@ -364,7 +364,7 @@ moduleFor(
             component = this;
           },
         }),
-        template: `{{val}}`,
+        template: `{{this.val}}`,
       });
 
       this.add(
@@ -546,7 +546,7 @@ moduleFor(
             assert.ok(true, 'outerSubmit called');
           },
         }),
-        template: '{{inner-component submitAction=(action outerSubmit)}}',
+        template: '{{inner-component submitAction=(action this.outerSubmit)}}',
       });
 
       this.render('{{outer-component}}');
@@ -583,7 +583,7 @@ moduleFor(
             },
           },
         }),
-        template: `{{inner-component innerSubmit=(action (action "outerSubmit" "${first}") "${second}" third)}}`,
+        template: `{{inner-component innerSubmit=(action (action "outerSubmit" "${first}") "${second}" this.third)}}`,
       });
 
       this.render('{{outer-component}}');
@@ -770,7 +770,7 @@ moduleFor(
         }),
       });
 
-      this.render('{{#if shouldRender}}{{rip-alley}}{{/if}}', {
+      this.render('{{#if this.shouldRender}}{{rip-alley}}{{/if}}', {
         shouldRender: true,
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index d018536a50e..887ed93a064 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -30,7 +30,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       ['@test it can render named arguments']() {
         this.registerTemplateOnlyComponent('foo-bar', '|{{@foo}}|{{@bar}}|');
 
-        this.render('{{foo-bar foo=foo bar=bar}}', {
+        this.render('{{foo-bar foo=this.foo bar=this.bar}}', {
           foo: 'foo',
           bar: 'bar',
         });
@@ -53,7 +53,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       }
 
       ['@test it does not reflected arguments as properties']() {
-        this.registerTemplateOnlyComponent('foo-bar', '|{{foo}}|{{this.bar}}|');
+        this.registerTemplateOnlyComponent('foo-bar', '|{{this.foo}}|{{this.bar}}|');
 
         this.render('{{foo-bar foo=foo bar=bar}}', {
           foo: 'foo',
@@ -132,7 +132,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
             wrapper: EmberObject.create({ content: null }),
           }),
           template:
-            '<div id="outer-value">{{x-inner-template-only value=this.wrapper.content wrapper=wrapper}}</div>{{x-inner value=value wrapper=wrapper}}',
+            '<div id="outer-value">{{x-inner-template-only value=this.wrapper.content wrapper=wrapper}}</div>{{x-inner value=this.value wrapper=this.wrapper}}',
         });
 
         this.registerComponent('x-inner', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index fae5b50ab5c..d2f57824174 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -34,7 +34,7 @@ class BoundTextAreaAttributes {
   generate({ attribute, first, second }) {
     return {
       [`@test ${attribute} (HTML attribute)`]() {
-        this.render(`<Textarea ${attribute}={{value}} />`, {
+        this.render(`<Textarea ${attribute}={{this.value}} />`, {
           value: first,
         });
         this.assertTextArea({ attrs: { [attribute]: first } });
@@ -49,7 +49,7 @@ class BoundTextAreaAttributes {
       },
 
       [`@test @${attribute} (named argument)`]() {
-        this.render(`<Textarea @${attribute}={{value}} />`, {
+        this.render(`<Textarea @${attribute}={{this.value}} />`, {
           value: first,
         });
         this.assertTextArea({ attrs: { [attribute]: first } });
@@ -97,35 +97,35 @@ moduleFor(
     }
 
     ['@test Should respect disabled (HTML attribute)'](assert) {
-      this.render('<Textarea disabled={{disabled}} />', {
+      this.render('<Textarea disabled={{this.disabled}} />', {
         disabled: true,
       });
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
     ['@test Should respect @disabled (named argument)'](assert) {
-      this.render('<Textarea @disabled={{disabled}} />', {
+      this.render('<Textarea @disabled={{this.disabled}} />', {
         disabled: true,
       });
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
     ['@test Should respect disabled (HTML attribute) when false'](assert) {
-      this.render('<Textarea disabled={{disabled}} />', {
+      this.render('<Textarea disabled={{this.disabled}} />', {
         disabled: false,
       });
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
     ['@test Should respect @disabled (named argument) when false'](assert) {
-      this.render('<Textarea @disabled={{disabled}} />', {
+      this.render('<Textarea @disabled={{this.disabled}} />', {
         disabled: false,
       });
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
     ['@test Should become disabled (HTML attribute) when the context changes'](assert) {
-      this.render('<Textarea disabled={{disabled}} />');
+      this.render('<Textarea disabled={{this.disabled}} />');
       assert.ok(this.$('textarea').is(':not(:disabled)'));
 
       this.assertStableRerender();
@@ -138,7 +138,7 @@ moduleFor(
     }
 
     ['@test Should become @disabled (named argument) when the context changes'](assert) {
-      this.render('<Textarea @disabled={{disabled}} />');
+      this.render('<Textarea @disabled={{this.disabled}} />');
       assert.ok(this.$('textarea').is(':not(:disabled)'));
 
       this.assertStableRerender();
@@ -166,7 +166,7 @@ moduleFor(
     }
 
     ['@test GH#14001 Should correctly handle an empty string bound value']() {
-      this.render('<Textarea @value={{message}} />', { message: '' });
+      this.render('<Textarea @value={{this.message}} />', { message: '' });
 
       this.assert.strictEqual(this.firstChild.value, '');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 1efac177d9c..9542ade811f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -34,7 +34,7 @@ class BoundTextAreaAttributes {
   generate({ attribute, first, second }) {
     return {
       [`@test ${attribute}`]() {
-        this.render(`{{textarea ${attribute}=value}}`, {
+        this.render(`{{textarea ${attribute}=this.value}}`, {
           value: first,
         });
         this.assertTextArea({ attrs: { [attribute]: first } });
@@ -76,21 +76,21 @@ moduleFor(
     }
 
     ['@test Should respect disabled'](assert) {
-      this.render('{{textarea disabled=disabled}}', {
+      this.render('{{textarea disabled=this.disabled}}', {
         disabled: true,
       });
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
     ['@test Should respect disabled when false'](assert) {
-      this.render('{{textarea disabled=disabled}}', {
+      this.render('{{textarea disabled=this.disabled}}', {
         disabled: false,
       });
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
     ['@test Should become disabled when the context changes'](assert) {
-      this.render('{{textarea disabled=disabled}}');
+      this.render('{{textarea disabled=this.disabled}}');
       assert.ok(this.$('textarea').is(':not(:disabled)'));
 
       this.assertStableRerender();
@@ -118,7 +118,7 @@ moduleFor(
     }
 
     ['@test GH#14001 Should correctly handle an empty string bound value']() {
-      this.render('{{textarea value=message}}', { message: '' });
+      this.render('{{textarea value=this.message}}', { message: '' });
 
       this.assert.strictEqual(this.firstChild.value, '');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 48a1f0d5352..2c75b46cd0e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -41,7 +41,7 @@ moduleFor(
         template: '{{@first}} {{@last}} | {{this.person.first}} {{this.person.last}}',
       });
 
-      this.render('<PersonWrapper @first={{first}} @last={{last}} />', {
+      this.render('<PersonWrapper @first={{this.first}} @last={{this.last}} />', {
         first: 'robert',
         last: 'jackson',
       });
@@ -76,7 +76,7 @@ moduleFor(
         template: '{{@first}} {{@last}} | {{this.person.first}} {{this.person.last}}',
       });
 
-      this.render('<PersonWrapper @first={{first}} @last={{last}} />', {
+      this.render('<PersonWrapper @first={{this.first}} @last={{this.last}} />', {
         first: 'robert',
         last: 'jackson',
       });
@@ -526,7 +526,7 @@ moduleFor(
         template: '{{this.person.first}} {{this.person.last}}',
       });
 
-      this.render('<PersonWrapper @first={{first}} @last={{last}} />', {
+      this.render('<PersonWrapper @first={{this.first}} @last={{this.last}} />', {
         first: 'robert',
         last: 'jackson',
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
index 09f79dc9f05..03bcbdaf99e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
@@ -22,7 +22,7 @@ moduleFor(
           tagName: '',
         }),
 
-        template: '<div id="{{id}}">[{{id}}] {{#if isShowing}}{{yield}}{{/if}}</div>',
+        template: '<div id="{{this.id}}">[{{this.id}}] {{#if this.isShowing}}{{yield}}{{/if}}</div>',
       });
 
       this.addComponent('x-toggle', {
@@ -35,7 +35,7 @@ moduleFor(
           },
         }),
 
-        template: '[{{id}}] {{#if isExpanded}}{{yield}}{{/if}}',
+        template: '[{{this.id}}] {{#if this.isExpanded}}{{yield}}{{/if}}',
       });
 
       let ToggleController = Controller.extend({
@@ -65,7 +65,7 @@ moduleFor(
 
       <button id="toggle-application" {{action "toggle"}}>Toggle</button>
 
-      {{#if isExpanded}}
+      {{#if this.isExpanded}}
         {{x-toggle id="root-3"}}
       {{/if}}
 
@@ -95,7 +95,7 @@ moduleFor(
 
       <button id="toggle-index" {{action "toggle"}}>Toggle</button>
 
-      {{#if isExpanded}}
+      {{#if this.isExpanded}}
         {{x-toggle id="root-6"}}
       {{/if}}
     `
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js
index 3f2d5cca6ce..18421b2951d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js
@@ -16,7 +16,7 @@ moduleFor(
     }
 
     ['@test custom elements can have bound attributes']() {
-      let template = `<foo-bar some-attr="{{name}}">hello</foo-bar>`;
+      let template = `<foo-bar some-attr="{{this.name}}">hello</foo-bar>`;
 
       this.render(template, { name: 'Robert' });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js
index 3f5b8eb5707..b6d026aa1c6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js
@@ -26,7 +26,7 @@ moduleFor(
         template: 'hello',
       });
 
-      this.render('{{#if switch}}{{foo-bar}}{{/if}}', { switch: true });
+      this.render('{{#if this.switch}}{{foo-bar}}{{/if}}', { switch: true });
 
       assert.equal(didInsertElementCount, 1, 'didInsertElement was called once');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index de917770878..126fd4ecf87 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -170,7 +170,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can render a dynamic path']() {
-    this.renderPath('message', { message: 'hello' });
+    this.renderPath('this.message', { message: 'hello' });
 
     this.assertContent('hello');
 
@@ -188,7 +188,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test resolves the string length properly']() {
-    this.render('<p>{{foo.length}}</p>', { foo: undefined });
+    this.render('<p>{{this.foo.length}}</p>', { foo: undefined });
 
     this.assertHTML('<p></p>');
 
@@ -208,7 +208,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test resolves the array length properly']() {
-    this.render('<p>{{foo.length}}</p>', { foo: undefined });
+    this.render('<p>{{this.foo.length}}</p>', { foo: undefined });
 
     this.assertHTML('<p></p>');
 
@@ -230,7 +230,7 @@ class DynamicContentTest extends RenderingTestCase {
   ['@test it can render a capitalized path with no deprecation']() {
     expectNoDeprecation();
 
-    this.renderPath('CaptializedPath', { CaptializedPath: 'no deprecation' });
+    this.renderPath('this.CaptializedPath', { CaptializedPath: 'no deprecation' });
 
     this.assertContent('no deprecation');
 
@@ -248,7 +248,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can render undefined dynamic paths']() {
-    this.renderPath('name', {});
+    this.renderPath('this.name', {});
 
     this.assertIsEmpty();
 
@@ -264,7 +264,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can render a deeply nested dynamic path']() {
-    this.renderPath('a.b.c.d.e.f', {
+    this.renderPath('this.a.b.c.d.e.f', {
       a: { b: { c: { d: { e: { f: 'hello' } } } } },
     });
 
@@ -299,7 +299,7 @@ class DynamicContentTest extends RenderingTestCase {
 
     let m = Formatter.create({ message: 'hello' });
 
-    this.renderPath('m.formattedMessage', { m });
+    this.renderPath('this.m.formattedMessage', { m });
 
     this.assertContent('HELLO');
 
@@ -325,7 +325,7 @@ class DynamicContentTest extends RenderingTestCase {
 
     let m = Formatter.create({ messenger: { message: 'hello' } });
 
-    this.renderPath('m.formattedMessage', { m });
+    this.renderPath('this.m.formattedMessage', { m });
 
     this.assertContent('HELLO');
 
@@ -343,7 +343,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can read from a proxy object']() {
-    this.renderPath('proxy.name', {
+    this.renderPath('this.proxy.name', {
       proxy: ObjectProxy.create({ content: { name: 'Tom Dale' } }),
     });
 
@@ -379,7 +379,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can read from a nested path in a proxy object']() {
-    this.renderPath('proxy.name.last', {
+    this.renderPath('this.proxy.name.last', {
       proxy: ObjectProxy.create({
         content: { name: { first: 'Tom', last: 'Dale' } },
       }),
@@ -436,7 +436,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can read from a path flipping between a proxy and a real object']() {
-    this.renderPath('proxyOrObject.name.last', {
+    this.renderPath('this.proxyOrObject.name.last', {
       proxyOrObject: ObjectProxy.create({
         content: { name: { first: 'Tom', last: 'Dale' } },
       }),
@@ -514,7 +514,7 @@ class DynamicContentTest extends RenderingTestCase {
   }
 
   ['@test it can read from a path flipping between a real object and a proxy']() {
-    this.renderPath('objectOrProxy.name.last', {
+    this.renderPath('this.objectOrProxy.name.last', {
       objectOrProxy: { name: { first: 'Tom', last: 'Dale' } },
     });
 
@@ -589,7 +589,7 @@ class DynamicContentTest extends RenderingTestCase {
     let nullObject = Object.create(null);
     nullObject['message'] = 'hello';
 
-    this.renderPath('nullObject.message', { nullObject });
+    this.renderPath('this.nullObject.message', { nullObject });
 
     this.assertContent('hello');
 
@@ -622,7 +622,7 @@ class DynamicContentTest extends RenderingTestCase {
       },
     });
 
-    this.renderPath('messenger.message', { messenger });
+    this.renderPath('this.messenger.message', { messenger });
 
     this.assertContent('hello');
 
@@ -656,7 +656,7 @@ class DynamicContentTest extends RenderingTestCase {
     let func = () => {};
     func.aProp = 'this is a property on a function';
 
-    this.renderPath('func.aProp', { func });
+    this.renderPath('this.func.aProp', { func });
 
     this.assertContent('this is a property on a function');
 
@@ -689,7 +689,7 @@ class DynamicContentTestGenerator {
     if (expected === EMPTY) {
       return {
         [`${tag} rendering ${label}`]() {
-          this.renderPath('value', { value });
+          this.renderPath('this.value', { value });
 
           this.assertIsEmpty();
 
@@ -705,7 +705,7 @@ class DynamicContentTestGenerator {
     } else {
       return {
         [`${tag} rendering ${label}`]() {
-          this.renderPath('value', { value });
+          this.renderPath('this.value', { value });
 
           // NaN is unstable, not worth optimizing for in the VM
           let wasNaN = typeof value === 'number' && isNaN(value);
@@ -790,7 +790,7 @@ moduleFor(
     }
 
     ['@test it can render empty safe strings [GH#16314]']() {
-      this.render('before {{value}} after', { value: htmlSafe('hello') });
+      this.render('before {{this.value}} after', { value: htmlSafe('hello') });
 
       this.assertHTML('before hello after');
 
@@ -894,7 +894,7 @@ moduleFor(
     }
 
     ['@test updating trusted curlies']() {
-      this.render('{{{htmlContent}}}{{{nested.htmlContent}}}', {
+      this.render('{{{this.htmlContent}}}{{{this.nested.htmlContent}}}', {
         htmlContent: '<b>Max</b>',
         nested: { htmlContent: '<b>James</b>' },
       });
@@ -922,7 +922,7 @@ moduleFor(
     }
 
     ['@test empty content in trusted curlies [GH#14978]']() {
-      this.render('before {{{value}}} after', {
+      this.render('before {{{this.value}}} after', {
         value: 'hello',
       });
 
@@ -973,18 +973,18 @@ moduleFor(
     ['@test it can render a dynamic template']() {
       let template = `
       <div class="header">
-        <h1>Welcome to {{framework}}</h1>
+        <h1>Welcome to {{this.framework}}</h1>
       </div>
       <div class="body">
-        <h2>Why you should use {{framework}}?</h2>
+        <h2>Why you should use {{this.framework}}?</h2>
         <ol>
           <li>It's great</li>
           <li>It's awesome</li>
-          <li>It's {{framework}}</li>
+          <li>It's {{this.framework}}</li>
         </ol>
       </div>
       <div class="footer">
-        {{framework}} is free, open source and always will be.
+        {{this.framework}} is free, open source and always will be.
       </div>
     `;
 
@@ -1041,7 +1041,7 @@ moduleFor(
     }
 
     ['@test it should evaluate to nothing if part of the path is `undefined`']() {
-      this.render('{{foo.bar.baz.bizz}}', {
+      this.render('{{this.foo.bar.baz.bizz}}', {
         foo: {},
       });
 
@@ -1077,7 +1077,7 @@ moduleFor(
     }
 
     ['@test it should evaluate to nothing if part of the path is a primative']() {
-      this.render('{{foo.bar.baz.bizz}}', {
+      this.render('{{this.foo.bar.baz.bizz}}', {
         foo: { bar: true },
       });
 
@@ -1183,7 +1183,7 @@ moduleFor(
     }
 
     ['@test quoteless class attributes update correctly']() {
-      this.render('<div class={{if fooBar "foo-bar"}}>hello</div>', {
+      this.render('<div class={{if this.fooBar "foo-bar"}}>hello</div>', {
         fooBar: true,
       });
 
@@ -1215,7 +1215,7 @@ moduleFor(
     }
 
     ['@test quoted class attributes update correctly'](assert) {
-      this.render('<div class="{{if fooBar "foo-bar"}}">hello</div>', {
+      this.render('<div class="{{if this.fooBar "foo-bar"}}">hello</div>', {
         fooBar: true,
       });
 
@@ -1698,9 +1698,9 @@ if (DEBUG) {
   moduleFor(
     'Inline style tests - warnings',
     class extends StyleTest {
-      ['@test specifying <div style={{userValue}}></div> generates a warning']() {
+      ['@test specifying <div style={{this.userValue}}></div> generates a warning']() {
         let userValue = 'width: 42px';
-        this.render('<div style={{userValue}}></div>', {
+        this.render('<div style={{this.userValue}}></div>', {
           userValue,
         });
 
@@ -1717,23 +1717,23 @@ if (DEBUG) {
           template: 'hello',
         });
         let userValue = 'width: 42px';
-        this.render('{{foo-bar style=userValue}}', {
+        this.render('{{foo-bar style=this.userValue}}', {
           userValue,
         });
 
         this.assertStyleWarning(userValue);
       }
 
-      ['@test specifying `<div style={{{userValue}}}></div>` works properly without a warning']() {
-        this.render('<div style={{{userValue}}}></div>', {
+      ['@test specifying `<div style={{{this.userValue}}}></div>` works properly without a warning']() {
+        this.render('<div style={{{this.userValue}}}></div>', {
           userValue: 'width: 42px',
         });
 
         this.assertNoWarning();
       }
 
-      ['@test specifying `<div style={{userValue}}></div>` works properly with a SafeString']() {
-        this.render('<div style={{userValue}}></div>', {
+      ['@test specifying `<div style={{this.userValue}}></div>` works properly with a SafeString']() {
+        this.render('<div style={{this.userValue}}></div>', {
           userValue: new SafeString('width: 42px'),
         });
 
@@ -1741,7 +1741,7 @@ if (DEBUG) {
       }
 
       ['@test null value do not generate htmlsafe warning']() {
-        this.render('<div style={{userValue}}></div>', {
+        this.render('<div style={{this.userValue}}></div>', {
           userValue: null,
         });
 
@@ -1749,13 +1749,13 @@ if (DEBUG) {
       }
 
       ['@test undefined value do not generate htmlsafe warning']() {
-        this.render('<div style={{userValue}}></div>');
+        this.render('<div style={{this.userValue}}></div>');
 
         this.assertNoWarning();
       }
 
       ['@test no warnings are triggered when a safe string is quoted']() {
-        this.render('<div style="{{userValue}}"></div>', {
+        this.render('<div style="{{this.userValue}}"></div>', {
           userValue: new SafeString('width: 42px'),
         });
 
@@ -1764,7 +1764,7 @@ if (DEBUG) {
 
       ['@test binding warning is triggered when an unsafe string is quoted']() {
         let userValue = 'width: 42px';
-        this.render('<div style="{{userValue}}"></div>', {
+        this.render('<div style="{{this.userValue}}"></div>', {
           userValue,
         });
 
@@ -1773,7 +1773,7 @@ if (DEBUG) {
 
       ['@test binding warning is triggered when a safe string for a complete property is concatenated in place']() {
         let userValue = 'width: 42px';
-        this.render('<div style="color: green; {{userValue}}"></div>', {
+        this.render('<div style="color: green; {{this.userValue}}"></div>', {
           userValue: new SafeString('width: 42px'),
         });
 
@@ -1782,7 +1782,7 @@ if (DEBUG) {
 
       ['@test binding warning is triggered when a safe string for a value is concatenated in place']() {
         let userValue = '42px';
-        this.render('<div style="color: green; width: {{userValue}}"></div>', {
+        this.render('<div style="color: green; width: {{this.userValue}}"></div>', {
           userValue: new SafeString(userValue),
         });
 
@@ -1791,7 +1791,7 @@ if (DEBUG) {
 
       ['@test binding warning is triggered when a safe string for a property name is concatenated in place']() {
         let userValue = 'width';
-        this.render('<div style="color: green; {{userProperty}}: 42px"></div>', {
+        this.render('<div style="color: green; {{this.userProperty}}: 42px"></div>', {
           userProperty: new SafeString(userValue),
         });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index a69fd286096..24b6cfe7ee4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -100,7 +100,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} world</p>`,
+        template: `<p>{{this.greeting}} world</p>`,
         ComponentClass,
       });
 
@@ -118,7 +118,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} world</p>`,
+        template: `<p>{{this.greeting}} world</p>`,
         ComponentClass,
       });
 
@@ -237,7 +237,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} world {{count}}</p>`,
+        template: `<p>{{this.greeting}} world {{this.count}}</p>`,
         ComponentClass,
       });
 
@@ -261,7 +261,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
@@ -281,11 +281,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
-      this.render('{{foo-bar firstName=firstName lastName=lastName}}', {
+      this.render('{{foo-bar firstName=this.firstName lastName=this.lastName}}', {
         firstName: 'Yehuda',
         lastName: 'Katz',
       });
@@ -313,7 +313,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
@@ -333,11 +333,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
-      this.render('{{foo-bar firstName lastName}}', {
+      this.render('{{foo-bar this.firstName this.lastName}}', {
         firstName: 'Yehuda',
         lastName: 'Katz',
       });
@@ -365,11 +365,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
-      this.render('{{foo-bar firstName lastName}}', {
+      this.render('{{foo-bar this.firstName this.lastName}}', {
         firstName: 'Yehuda',
         lastName: 'Katz',
       });
@@ -397,11 +397,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
-      this.render('{{foo-bar firstName lastName}}', {
+      this.render('{{foo-bar this.firstName this.lastName}}', {
         firstName: 'Yehuda',
         lastName: 'Katz',
       });
@@ -453,11 +453,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} world</p>`,
+        template: `<p>{{this.greeting}} world</p>`,
         ComponentClass,
       });
 
-      this.render('{{#if show}}{{foo-bar}}{{/if}}', { show: true });
+      this.render('{{#if this.show}}{{foo-bar}}{{/if}}', { show: true });
 
       this.assertHTML(`<p>hello world</p>`);
 
@@ -511,11 +511,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} {{@name}}</p>`,
+        template: `<p>{{this.greeting}} {{@name}}</p>`,
         ComponentClass,
       });
 
-      this.render('{{foo-bar name=name}}', { name: 'world' });
+      this.render('{{foo-bar name=this.name}}', { name: 'world' });
 
       this.assertHTML(`<p>hello world</p>`);
       assert.verifySteps(['createComponent', 'getContext', 'didCreateComponent']);
@@ -575,12 +575,12 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} {{@name}}</p>`,
+        template: `<p>{{this.greeting}} {{@name}}</p>`,
         ComponentClass,
       });
 
       assert.throws(() => {
-        this.render('{{foo-bar name=name}}', { name: 'world' });
+        this.render('{{foo-bar name=this.name}}', { name: 'world' });
       }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
 
       assert.verifySteps([]);
@@ -600,7 +600,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} world</p>`,
+        template: `<p>{{this.greeting}} world</p>`,
         ComponentClass,
       });
 
@@ -620,7 +620,7 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
@@ -653,11 +653,11 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{salutation}}</p>`,
+        template: `<p>{{this.salutation}}</p>`,
         ComponentClass,
       });
 
-      this.render('<FooBar @firstName={{firstName}} @lastName={{lastName}} />', {
+      this.render('<FooBar @firstName={{this.firstName}} @lastName={{this.lastName}} />', {
         firstName: 'Yehuda',
         lastName: 'Katz',
       });
@@ -726,7 +726,7 @@ moduleFor(
         ComponentClass,
       });
 
-      this.render('<FooBar data-test={{value}} />', { value: 'foo' });
+      this.render('<FooBar data-test={{this.value}} />', { value: 'foo' });
 
       this.assertHTML(`<p data-test="foo">Hello world!</p>`);
       assert.verifySteps(['createComponent', 'getContext', 'didCreateComponent']);
@@ -888,12 +888,12 @@ moduleFor(
       );
 
       this.registerComponent('foo-bar', {
-        template: `<p>{{greeting}} {{@name}}</p>`,
+        template: `<p>{{this.greeting}} {{@name}}</p>`,
         ComponentClass,
       });
 
       assert.throws(() => {
-        this.render('<FooBar @name={{name}} />', { name: 'world' });
+        this.render('<FooBar @name={{this.name}} />', { name: 'world' });
       }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
 
       assert.verifySteps([]);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 9dac683ac4a..dd92643ce33 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -86,7 +86,7 @@ class ModifierManagerTest extends RenderingTestCase {
       })
     );
 
-    this.render('{{#if truthy}}<h1 {{foo-bar truthy}}>hello world</h1>{{/if}}', {
+    this.render('{{#if this.truthy}}<h1 {{foo-bar this.truthy}}>hello world</h1>{{/if}}', {
       truthy: true,
     });
     this.assertHTML(`<h1>hello world</h1>`);
@@ -130,7 +130,7 @@ class ModifierManagerTest extends RenderingTestCase {
       })
     );
 
-    this.render('<h1 {{foo-bar truthy}}>hello world</h1>', {
+    this.render('<h1 {{foo-bar this.truthy}}>hello world</h1>', {
       truthy: true,
     });
     this.assertHTML(`<h1>hello world</h1>`);
@@ -169,7 +169,7 @@ class ModifierManagerTest extends RenderingTestCase {
       })
     );
 
-    this.render('<h1 {{foo-bar truthy}}>hello world</h1>', {
+    this.render('<h1 {{foo-bar this.truthy}}>hello world</h1>', {
       truthy: true,
     });
     this.assertHTML(`<h1>hello world</h1>`);
@@ -216,7 +216,7 @@ class ModifierManagerTest extends RenderingTestCase {
       })
     );
 
-    this.render('<h1 {{foo-bar truthy}}>hello world</h1>');
+    this.render('<h1 {{foo-bar this.truthy}}>hello world</h1>');
     this.assertHTML(`<h1>hello world</h1>`);
 
     assert.equal(insertCount, 1);
@@ -663,7 +663,7 @@ moduleFor(
 
       this.registerModifier('foo-bar', ModifierClass);
 
-      this.render('<h1 {{foo-bar baz}}>hello world</h1>');
+      this.render('<h1 {{foo-bar this.baz}}>hello world</h1>');
       runTask(() => this.context.set('baz', 'Hello'));
 
       this.assertHTML('<h1>hello world</h1>');
@@ -717,7 +717,7 @@ moduleFor(
 
       this.registerModifier('foo-bar', ModifierClass);
 
-      this.render('<h1 {{foo-bar baz}}>hello world</h1>');
+      this.render('<h1 {{foo-bar this.baz}}>hello world</h1>');
       runTask(() => this.context.set('baz', 'Hello'));
 
       this.assertHTML('<h1>hello world</h1>');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index 8f1cce38c5c..bcd370ca59b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -51,7 +51,7 @@ moduleFor(
             receivedEvent = event;
           },
         }),
-        template: `<button id="is-done" onclick={{action clicked}}>my button</button>`,
+        template: `<button id="is-done" onclick={{action this.clicked}}>my button</button>`,
       });
 
       this.render(`{{x-bar}}`);
@@ -70,7 +70,7 @@ moduleFor(
             receivedEvent = event;
           },
         }),
-        template: `<button id="is-done" onClick={{action clicked}}>my button</button>`,
+        template: `<button id="is-done" onClick={{action this.clicked}}>my button</button>`,
       });
 
       this.render(`{{x-bar}}`);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
index c3957d04c30..fd16448b8bd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
@@ -35,7 +35,7 @@ moduleFor(
 
     ['@test binds values when variables are used']() {
       this.render(
-        strip`{{#let (array personOne) as |people|}}
+        strip`{{#let (array this.personOne) as |people|}}
               {{#each people as |personName|}}
                 {{personName}}
               {{/each}}
@@ -58,7 +58,7 @@ moduleFor(
 
     ['@test binds multiple values when variables are used']() {
       this.render(
-        strip`{{#let (array personOne personTwo) as |people|}}
+        strip`{{#let (array this.personOne this.personTwo) as |people|}}
               {{#each people as |personName|}}
                 {{personName}},
               {{/each}}
@@ -91,7 +91,7 @@ moduleFor(
 
     ['@test array helpers can be nested']() {
       this.render(
-        strip`{{#let (array (array personOne personTwo)) as |listOfPeople|}}
+        strip`{{#let (array (array this.personOne this.personTwo)) as |listOfPeople|}}
               {{#each listOfPeople as |people|}}
                 List:
                 {{#each people as |personName|}}
@@ -176,7 +176,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: `{{yield (hash people=(array this.model.personOne personTwo))}}`,
+        template: `{{yield (hash people=(array this.model.personOne this.personTwo))}}`,
       });
 
       this.render(
@@ -216,12 +216,12 @@ moduleFor(
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
         template: strip`
-        {{#each people as |personName|}}
+        {{#each this.people as |personName|}}
           {{personName}},
         {{/each}}`,
       });
 
-      this.render(strip`{{foo-bar people=(array "Tom" personTwo)}}`, { personTwo: 'Chad' });
+      this.render(strip`{{foo-bar people=(array "Tom" this.personTwo)}}`, { personTwo: 'Chad' });
 
       this.assertText('Tom,Chad,');
 
@@ -248,12 +248,12 @@ moduleFor(
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
         template: strip`
-        {{#each people as |personName|}}
+        {{#each this.people as |personName|}}
           {{personName}},
         {{/each}}`,
       });
 
-      this.render(strip`{{foo-bar people=(array "Tom" personTwo)}}`, { personTwo: 'Chad' });
+      this.render(strip`{{foo-bar people=(array "Tom" this.personTwo)}}`, { personTwo: 'Chad' });
 
       let firstArray = fooBarInstance.people;
 
@@ -273,7 +273,7 @@ moduleFor(
         return 'captured';
       });
 
-      this.render(`{{capture (array 'Tom' personTwo)}}`, { personTwo: 'Godfrey' });
+      this.render(`{{capture (array 'Tom' this.personTwo)}}`, { personTwo: 'Godfrey' });
 
       this.assert.deepEqual(captured, ['Tom', 'Godfrey']);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index fd85e1a03f1..af72049cccd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -50,7 +50,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
 
         this.registerComponent('outer-component', {
           ComponentClass: OuterComponent,
-          template: '{{inner-component submit=(action outerSubmit)}}',
+          template: '{{inner-component submit=(action this.outerSubmit)}}',
         });
 
         this.subscribe('interaction.ember-action', {
@@ -105,7 +105,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
 
         this.registerComponent('outer-component', {
           ComponentClass: OuterComponent,
-          template: '{{inner-component submit=(action outerSubmit)}}',
+          template: '{{inner-component submit=(action this.outerSubmit)}}',
         });
 
         this.subscribe('interaction.ember-action', {
@@ -160,7 +160,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
 
         this.registerComponent('outer-component', {
           ComponentClass: OuterComponent,
-          template: '{{inner-component submit=(action outerSubmit)}}',
+          template: '{{inner-component submit=(action this.outerSubmit)}}',
         });
 
         this.subscribe('interaction.ember-action', {
@@ -209,7 +209,7 @@ moduleFor(
       });
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: '{{inner-component submit=(action outerSubmit)}}',
+        template: '{{inner-component submit=(action this.outerSubmit)}}',
       });
 
       this.render('{{outer-component}}');
@@ -226,7 +226,7 @@ moduleFor(
         template: 'inner',
       });
       this.registerComponent('outer-component', {
-        template: '{{inner-component submit=(action somethingThatIsUndefined)}}',
+        template: '{{inner-component submit=(action this.somethingThatIsUndefined)}}',
       });
 
       expectAssertion(() => {
@@ -242,7 +242,7 @@ moduleFor(
         ComponentClass: Component.extend({
           nonFunctionThing: {},
         }),
-        template: '{{inner-component submit=(action nonFunctionThing)}}',
+        template: '{{inner-component submit=(action this.nonFunctionThing)}}',
       });
 
       expectAssertion(() => {
@@ -293,7 +293,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: '{{inner-component submit=(action outerSubmit)}}',
+        template: '{{inner-component submit=(action this.outerSubmit)}}',
       });
 
       this.render('{{outer-component}}');
@@ -338,7 +338,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: '{{inner-component submit=(action outerSubmit)}}',
+        template: '{{inner-component submit=(action this.outerSubmit)}}',
       });
 
       this.render('{{outer-component}}');
@@ -385,7 +385,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action (action outerSubmit "${first}") "${second}" third)}}`,
+        template: `{{inner-component submit=(action (action this.outerSubmit "${first}") "${second}" this.third)}}`,
       });
 
       this.render('{{outer-component}}');
@@ -481,7 +481,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action outerSubmit value)}}`,
+        template: `{{inner-component submit=(action this.outerSubmit this.value)}}`,
       });
 
       this.render('{{outer-component}}');
@@ -544,7 +544,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action outerSubmit first)}}`,
+        template: `{{inner-component submit=(action this.outerSubmit this.first)}}`,
       });
 
       this.render('{{outer-component}}');
@@ -594,7 +594,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action (mut outerMut))}}`,
+        template: `{{inner-component submit=(action (mut this.outerMut))}}`,
       });
 
       this.render('{{outer-component}}');
@@ -637,7 +637,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action (mut outerMut) '${newValue}')}}`,
+        template: `{{inner-component submit=(action (mut this.outerMut) '${newValue}')}}`,
       });
 
       this.render('{{outer-component}}');
@@ -782,7 +782,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action 'outerAction' target=otherComponent)}}`,
+        template: `{{inner-component submit=(action 'outerAction' target=this.otherComponent)}}`,
       });
 
       this.render('{{outer-component}}');
@@ -873,7 +873,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action outerAction value="readProp")}}`,
+        template: `{{inner-component submit=(action this.outerAction value="readProp")}}`,
       });
 
       this.render('{{outer-component}}');
@@ -917,7 +917,7 @@ moduleFor(
 
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
-        template: `{{inner-component submit=(action outerAction objectArgument value="readProp")}}`,
+        template: `{{inner-component submit=(action this.outerAction this.objectArgument value="readProp")}}`,
       });
 
       this.render('{{outer-component}}');
@@ -979,7 +979,7 @@ moduleFor(
 
       this.registerComponent('middle-component', {
         ComponentClass: MiddleComponent,
-        template: `{{inner-component attrs-submit=attrs.submit submit=submit}}`,
+        template: `{{inner-component attrs-submit=@submit submit=this.submit}}`,
       });
 
       this.registerComponent('outer-component', {
@@ -1075,7 +1075,7 @@ moduleFor(
 
         this.registerComponent('outer-component', {
           ComponentClass: OuterComponent,
-          template: `{{inner-component submit=(action submitTask 1 2 3)}}`,
+          template: `{{inner-component submit=(action this.submitTask 1 2 3)}}`,
         });
 
         this.render('{{outer-component}}');
@@ -1103,7 +1103,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '<button onclick={{action (mut label) "Clicked!"}}>{{if label label "Click me"}}</button>',
+          '<button onclick={{action (mut this.label) "Clicked!"}}>{{if this.label this.label "Click me"}}</button>',
       });
 
       this.render('{{example-component}}');
@@ -1180,15 +1180,15 @@ moduleFor(
       this.registerComponent('outer-component', {
         ComponentClass: OuterComponent,
         template: strip`
-        <div id="counter">clicked: {{clicked}}; foo: {{foo}}</div>
+        <div id="counter">clicked: {{this.clicked}}; foo: {{this.foo}}</div>
 
         {{click-me id="string-action" onClick=(action "on-click")}}
-        {{click-me id="function-action" onClick=(action onClick)}}
-        {{click-me id="mut-action" onClick=(action (mut clicked))}}
+        {{click-me id="function-action" onClick=(action this.onClick)}}
+        {{click-me id="mut-action" onClick=(action (mut this.clicked))}}
       `,
       });
 
-      this.render('{{outer-component foo=foo}}', { foo: 1 });
+      this.render('{{outer-component foo=this.foo}}', { foo: 1 });
 
       this.assertText('clicked: 0; foo: 1');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index c7b5a3c1b4c..4693cb4057e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -17,7 +17,7 @@ moduleFor(
     ['@test it cannot override built-in syntax']() {
       this.registerHelper('array', () => 'Nope');
       expectAssertion(() => {
-        this.render(`{{array foo 'LOL'}}`, { foo: true });
+        this.render(`{{array this.foo 'LOL'}}`, { foo: true });
       }, /You attempted to overwrite the built-in helper "array" which is not allowed. Please rename the helper./);
     }
 
@@ -246,7 +246,7 @@ moduleFor(
         return values;
       });
 
-      this.render('{{#each (hello-world model) as |item|}}({{item}}){{/each}}', {
+      this.render('{{#each (hello-world this.model) as |item|}}({{item}}){{/each}}', {
         model: ['bob'],
       });
 
@@ -609,7 +609,7 @@ moduleFor(
       });
 
       this.registerComponent('some-component', {
-        template: '{{first}} {{second}} {{third}} {{fourth}} {{fifth}}',
+        template: '{{@first}} {{@second}} {{@third}} {{@fourth}} {{@fifth}}',
       });
 
       this.render(
@@ -828,15 +828,15 @@ if (DEBUG) {
     }
 
     ['@test cannot mutate params - no positional specified / named specified']() {
-      this.render('{{test-helper foo=bar}}', { bar: 'derp' });
+      this.render('{{test-helper foo=this.bar}}', { bar: 'derp' });
     }
 
     ['@test cannot mutate params - positional specified / no named specified']() {
-      this.render('{{test-helper bar}}', { bar: 'derp' });
+      this.render('{{test-helper this.bar}}', { bar: 'derp' });
     }
 
     ['@test cannot mutate params - positional specified / named specified']() {
-      this.render('{{test-helper bar foo=qux}}', { bar: 'derp', qux: 'baz' });
+      this.render('{{test-helper this.bar foo=this.qux}}', { bar: 'derp', qux: 'baz' });
     }
 
     ['@test cannot mutate params - no positional specified / no named specified']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index a52abc9c7b0..cc095a37d76 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -146,7 +146,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<button {{action "foo" member}}>Click me</button>',
+        template: '<button {{action "foo" this.member}}>Click me</button>',
       });
 
       this.render('{{example-component}}');
@@ -280,7 +280,7 @@ moduleFor(
 
       this.registerComponent('other-component', {
         ComponentClass: OtherComponent,
-        template: '<a {{action "wat" target=anotherTarget}}>Wat?</a>',
+        template: '<a {{action "wat" target=this.anotherTarget}}>Wat?</a>',
       });
 
       this.render(strip`
@@ -323,7 +323,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<a {{action "edit" target=theTarget}}>Edit</a>',
+        template: '<a {{action "edit" target=this.theTarget}}>Edit</a>',
       });
 
       this.render('{{example-component}}');
@@ -406,7 +406,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '<a href="#" {{action "edit" allowedKeys=altKey}}>click me</a> <div {{action "shortcut" allowedKeys=anyKey}}>click me too</div>',
+          '<a href="#" {{action "edit" allowedKeys=this.altKey}}>click me</a> <div {{action "shortcut" allowedKeys=this.anyKey}}>click me too</div>',
       });
 
       this.render('{{example-component}}');
@@ -447,7 +447,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<a href="#" {{action "edit" allowedKeys=acceptedKeys}}>click me</a>',
+        template: '<a href="#" {{action "edit" allowedKeys=this.acceptedKeys}}>click me</a>',
       });
 
       this.render('{{example-component}}');
@@ -629,7 +629,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '<a id="edit" href="#" {{action "edit" bubbles=isFalse}}>edit</a><a id="delete" href="#" {{action "delete" bubbles=isFalse}}>delete</a>',
+          '<a id="edit" href="#" {{action "edit" bubbles=this.isFalse}}>edit</a><a id="delete" href="#" {{action "delete" bubbles=this.isFalse}}>delete</a>',
       });
 
       this.render('{{example-component}}');
@@ -686,7 +686,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<a id="edit" href="#" {{action "edit" bubbles=shouldBubble}}>edit</a>',
+        template: '<a id="edit" href="#" {{action "edit" bubbles=this.shouldBubble}}>edit</a>',
       });
 
       this.render('{{example-component}}');
@@ -765,7 +765,8 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '{{#each items as |item|}}<a href="#" {{action "edit"}}>click me</a>{{/each}}',
+        template:
+          '{{#each this.items as |item|}}<a href="#" {{action "edit"}}>click me</a>{{/each}}',
       });
 
       this.render('{{example-component}}');
@@ -792,7 +793,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '{{#let something as |somethingElse|}}<a href="#" {{action "edit"}}>click me</a>{{/let}}',
+          '{{#let this.something as |somethingElse|}}<a href="#" {{action "edit"}}>click me</a>{{/let}}',
       });
 
       this.render('{{example-component}}');
@@ -813,10 +814,10 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '{{#if isActive}}<a href="#" {{action "edit"}}>click me</a>{{/if}}',
+        template: '{{#if this.isActive}}<a href="#" {{action "edit"}}>click me</a>{{/if}}',
       });
 
-      this.render('{{example-component isActive=isActive}}', {
+      this.render('{{example-component isActive=this.isActive}}', {
         isActive: true,
       });
 
@@ -1064,7 +1065,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<button {{action "edit" modelA modelB}}>click me</button>',
+        template: '<button {{action "edit" this.modelA this.modelB}}>click me</button>',
       });
 
       this.render('{{example-component}}');
@@ -1220,7 +1221,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<a id="bound-param" {{action hookMeUp}}>Whistle tips go woop woooop</a>',
+        template: '<a id="bound-param" {{action this.hookMeUp}}>Whistle tips go woop woooop</a>',
       });
 
       this.render('{{example-component}}');
@@ -1284,7 +1285,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '{{#each allactions as |allaction|}}<a id="{{allaction.name}}" {{action allaction.name}}>{{allaction.title}}</a>{{/each}}',
+          '{{#each this.allactions as |allaction|}}<a id="{{allaction.name}}" {{action allaction.name}}>{{allaction.title}}</a>{{/each}}',
       });
 
       this.render('{{example-component}}');
@@ -1325,7 +1326,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: `<a {{action submit '${arg}'}}>Hi</a>`,
+        template: `<a {{action this.submit '${arg}'}}>Hi</a>`,
       });
 
       this.render('{{example-component}}');
@@ -1347,7 +1348,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<a id="oops-bound-param" {{action ohNoeNotValid}}>Hi</a>',
+        template: '<a id="oops-bound-param" {{action this.ohNoeNotValid}}>Hi</a>',
       });
 
       expectAssertion(() => {
@@ -1467,7 +1468,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<a {{action "show" preventDefault=shouldPreventDefault}}>Hi</a>',
+        template: '<a {{action "show" preventDefault=this.shouldPreventDefault}}>Hi</a>',
       });
 
       this.render('{{example-component}}');
@@ -1560,7 +1561,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '<button {{action (mut label) "Clicked!"}}>{{if label label "Click me"}}</button>',
+          '<button {{action (mut this.label) "Clicked!"}}>{{if this.label this.label "Click me"}}</button>',
       });
 
       this.render('{{example-component}}');
@@ -1597,9 +1598,9 @@ moduleFor(
     ['@test it supports non-registered actions [GH#14888]']() {
       this.render(
         `
-      {{#if show}}
-        <button id='ddButton' {{action (mut show) false}}>
-          Show ({{show}})
+      {{#if this.show}}
+        <button id='ddButton' {{action (mut this.show) false}}>
+          Show ({{this.show}})
         </button>
       {{/if}}
     `,
@@ -1629,7 +1630,7 @@ moduleFor(
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
         template:
-          '<button class="{{if selected \'selected\'}}" {{action "toggleSelected"}}>Toggle Selected</button>',
+          '<button class="{{if this.selected \'selected\'}}" {{action "toggleSelected"}}>Toggle Selected</button>',
       });
 
       this.render('{{example-component}}');
@@ -1765,7 +1766,7 @@ moduleFor(
 
       this.registerComponent('example-component', {
         ComponentClass: ExampleComponent,
-        template: '<div id="inner" {{action "show" on=eventType}}></div>',
+        template: '<div id="inner" {{action "show" on=this.eventType}}></div>',
       });
 
       expectDeprecation(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
index c47797e467b..abb608426fd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
@@ -9,7 +9,7 @@ moduleFor(
   'Helpers test: {{get}}',
   class extends RenderingTestCase {
     ['@test should be able to get an object value with a static key']() {
-      this.render(`[{{get colors 'apple'}}] [{{if true (get colors 'apple')}}]`, {
+      this.render(`[{{get this.colors 'apple'}}] [{{if true (get this.colors 'apple')}}]`, {
         colors: { apple: 'red' },
       });
 
@@ -33,13 +33,16 @@ moduleFor(
     }
 
     ['@test should be able to get an object value with nested static key']() {
-      this.render(`[{{get colors "apple.gala"}}] [{{if true (get colors "apple.gala")}}]`, {
-        colors: {
-          apple: {
-            gala: 'red and yellow',
+      this.render(
+        `[{{get this.colors "apple.gala"}}] [{{if true (get this.colors "apple.gala")}}]`,
+        {
+          colors: {
+            apple: {
+              gala: 'red and yellow',
+            },
           },
-        },
-      });
+        }
+      );
 
       this.assertText('[red and yellow] [red and yellow]');
 
@@ -57,7 +60,7 @@ moduleFor(
     }
 
     ['@test should be able to get an object value with a number']() {
-      this.render(`[{{get items 1}}][{{get items 2}}][{{get items 3}}]`, {
+      this.render(`[{{get this.items 1}}][{{get this.items 2}}][{{get this.items 3}}]`, {
         indexes: [1, 2, 3],
         items: {
           1: 'First',
@@ -82,7 +85,7 @@ moduleFor(
     }
 
     ['@test should be able to get an array value with a number']() {
-      this.render(`[{{get numbers 0}}][{{get numbers 1}}][{{get numbers 2}}]`, {
+      this.render(`[{{get this.numbers 0}}][{{get this.numbers 1}}][{{get this.numbers 2}}]`, {
         numbers: [1, 2, 3],
       });
 
@@ -102,7 +105,7 @@ moduleFor(
     }
 
     ['@test should be able to get an object value with a path evaluating to a number']() {
-      this.render(`{{#each indexes as |index|}}[{{get items index}}]{{/each}}`, {
+      this.render(`{{#each this.indexes as |index|}}[{{get this.items index}}]{{/each}}`, {
         indexes: [1, 2, 3],
         items: {
           1: 'First',
@@ -127,7 +130,7 @@ moduleFor(
     }
 
     ['@test should be able to get an array value with a path evaluating to a number']() {
-      this.render(`{{#each numbers as |num index|}}[{{get numbers index}}]{{/each}}`, {
+      this.render(`{{#each this.numbers as |num index|}}[{{get this.numbers index}}]{{/each}}`, {
         numbers: [1, 2, 3],
       });
 
@@ -143,7 +146,7 @@ moduleFor(
     }
 
     ['@test should be able to get an object value with a bound/dynamic key']() {
-      this.render(`[{{get colors key}}] [{{if true (get colors key)}}]`, {
+      this.render(`[{{get this.colors this.key}}] [{{if true (get this.colors this.key)}}]`, {
         colors: { apple: 'red', banana: 'yellow' },
         key: 'apple',
       });
@@ -175,7 +178,7 @@ moduleFor(
     }
 
     ['@test should be able to get an object value with nested dynamic key']() {
-      this.render(`[{{get colors key}}] [{{if true (get colors key)}}]`, {
+      this.render(`[{{get this.colors this.key}}] [{{if true (get this.colors this.key)}}]`, {
         colors: {
           apple: {
             gala: 'red and yellow',
@@ -207,7 +210,7 @@ moduleFor(
 
     ['@test should be able to get an object value with subexpression returning nested key']() {
       this.render(
-        `[{{get colors (concat 'apple' '.' 'gala')}}] [{{if true (get colors (concat 'apple' '.' 'gala'))}}]`,
+        `[{{get this.colors (concat 'apple' '.' 'gala')}}] [{{if true (get this.colors (concat 'apple' '.' 'gala'))}}]`,
         {
           colors: {
             apple: {
@@ -247,7 +250,7 @@ moduleFor(
 
     ['@test should be able to get an object value with a get helper as the key']() {
       this.render(
-        `[{{get colors (get possibleKeys key)}}] [{{if true (get colors (get possibleKeys key))}}]`,
+        `[{{get this.colors (get this.possibleKeys this.key)}}] [{{if true (get this.colors (get this.possibleKeys this.key))}}]`,
         {
           colors: { apple: 'red', banana: 'yellow' },
           key: 'key1',
@@ -283,7 +286,7 @@ moduleFor(
 
     ['@test should be able to get an object value with a get helper value as a bound/dynamic key']() {
       this.render(
-        `[{{get (get possibleValues objectKey) key}}] [{{if true (get (get possibleValues objectKey) key)}}]`,
+        `[{{get (get this.possibleValues this.objectKey) this.key}}] [{{if true (get (get this.possibleValues this.objectKey) this.key)}}]`,
         {
           possibleValues: {
             colors1: { apple: 'red', banana: 'yellow' },
@@ -325,7 +328,7 @@ moduleFor(
 
     ['@test should be able to get an object value with a get helper as the value and a get helper as the key']() {
       this.render(
-        `[{{get (get possibleValues objectKey) (get possibleKeys key)}}] [{{if true (get (get possibleValues objectKey) (get possibleKeys key))}}]`,
+        `[{{get (get this.possibleValues this.objectKey) (get this.possibleKeys this.key)}}] [{{if true (get (get this.possibleValues this.objectKey) (get this.possibleKeys this.key))}}]`,
         {
           possibleValues: {
             colors1: { apple: 'red', banana: 'yellow' },
@@ -382,10 +385,10 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: `{{yield (get colors mcintosh)}}`,
+        template: `{{yield (get this.colors this.mcintosh)}}`,
       });
 
-      this.render(`{{#foo-bar colors=colors as |value|}}{{value}}{{/foo-bar}}`, {
+      this.render(`{{#foo-bar colors=this.colors as |value|}}{{value}}{{/foo-bar}}`, {
         colors: {
           red: 'banana',
         },
@@ -413,7 +416,7 @@ moduleFor(
     }
 
     ['@test should handle object values as nulls']() {
-      this.render(`[{{get colors 'apple'}}] [{{if true (get colors 'apple')}}]`, {
+      this.render(`[{{get this.colors 'apple'}}] [{{if true (get this.colors 'apple')}}]`, {
         colors: null,
       });
 
@@ -433,7 +436,7 @@ moduleFor(
     }
 
     ['@test should handle object keys as nulls']() {
-      this.render(`[{{get colors key}}] [{{if true (get colors key)}}]`, {
+      this.render(`[{{get this.colors this.key}}] [{{if true (get this.colors this.key)}}]`, {
         colors: {
           apple: 'red',
           banana: 'yellow',
@@ -457,7 +460,7 @@ moduleFor(
     }
 
     ['@test should handle object values and keys as nulls']() {
-      this.render(`[{{get colors 'apple'}}] [{{if true (get colors key)}}]`, {
+      this.render(`[{{get this.colors 'apple'}}] [{{if true (get this.colors this.key)}}]`, {
         colors: null,
         key: null,
       });
@@ -466,7 +469,7 @@ moduleFor(
     }
 
     ['@test get helper value should be updatable using {{input}} and (mut) - static key'](assert) {
-      this.render(`{{input type='text' value=(mut (get source 'banana')) id='get-input'}}`, {
+      this.render(`{{input type='text' value=(mut (get this.source 'banana')) id='get-input'}}`, {
         source: {
           banana: 'banana',
         },
@@ -493,7 +496,7 @@ moduleFor(
     }
 
     ['@test get helper value should be updatable using {{input}} and (mut) - dynamic key'](assert) {
-      this.render(`{{input type='text' value=(mut (get source key)) id='get-input'}}`, {
+      this.render(`{{input type='text' value=(mut (get this.source this.key)) id='get-input'}}`, {
         source: {
           apple: 'apple',
           banana: 'banana',
@@ -536,7 +539,7 @@ moduleFor(
     ['@test get helper value should be updatable using {{input}} and (mut) - dynamic nested key'](
       assert
     ) {
-      this.render(`{{input type='text' value=(mut (get source key)) id='get-input'}}`, {
+      this.render(`{{input type='text' value=(mut (get this.source this.key)) id='get-input'}}`, {
         source: {
           apple: {
             gala: 'gala',
@@ -604,7 +607,7 @@ moduleFor(
         template: '{{#each this.options as |option|}}{{get this.args option}}{{/each}}',
       });
 
-      this.render('<PersonWrapper @first={{first}} @last={{last}} @age={{age}}/>', {
+      this.render('<PersonWrapper @first={{this.first}} @last={{this.last}} @age={{this.age}}/>', {
         first: 'miguel',
         last: 'andrade',
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index bb78e043ee9..c827f9694df 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -156,7 +156,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: FooBarComponent,
-        template: `{{yield (hash firstName=this.model.firstName lastName=lastName)}}`,
+        template: `{{yield (hash firstName=this.model.firstName lastName=this.lastName)}}`,
       });
 
       this.render(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index e205204760d..2a6b15ad250 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -84,7 +84,7 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
           }
         );
 
-        this.render('{{hello foo=foo}}', {
+        this.render('{{hello foo=this.foo}}', {
           foo: 123,
         });
 
@@ -115,7 +115,7 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
           }
         );
 
-        this.render('{{hello foo}}', {
+        this.render('{{hello this.foo}}', {
           foo: 123,
         });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
index c1e1fbb5d9c..247020114b0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
@@ -44,7 +44,7 @@ moduleFor(
 
     ['@test it updates when bound params change']() {
       expectDeprecation(() => {
-        this.render(`{{loc simple}} - {{loc personal 'Mr. Pitkin'}}`, {
+        this.render(`{{loc this.simple}} - {{loc this.personal 'Mr. Pitkin'}}`, {
           simple: 'Hello Friend',
           personal: 'Hello',
         });
@@ -76,7 +76,7 @@ moduleFor(
 
     ['@test it updates when nested bound params change']() {
       expectDeprecation(() => {
-        this.render(`{{loc greetings.simple}} - {{loc greetings.personal 'Mr. Pitkin'}}`, {
+        this.render(`{{loc this.greetings.simple}} - {{loc this.greetings.personal 'Mr. Pitkin'}}`, {
           greetings: {
             simple: 'Hello Friend',
             personal: 'Hello',
@@ -115,7 +115,7 @@ moduleFor(
 
     ['@test it can be overriden']() {
       this.registerHelper('loc', () => 'Yup');
-      this.render(`{{loc greeting}}`, {
+      this.render(`{{loc this.greeting}}`, {
         greeting: 'Hello Friend',
       });
       this.assertText('Yup', 'the localized string is correct');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/log-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/log-test.js
index 5d5e687d3e6..4f665af7baf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/log-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/log-test.js
@@ -37,7 +37,7 @@ moduleFor(
     }
 
     ['@test correctly logs a property']() {
-      this.render(`{{log value}}`, {
+      this.render(`{{log this.value}}`, {
         value: 'one',
       });
 
@@ -45,7 +45,7 @@ moduleFor(
     }
 
     ['@test correctly logs multiple arguments']() {
-      this.render(`{{log "my variable:" value}}`, {
+      this.render(`{{log "my variable:" this.value}}`, {
         value: 'one',
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
index e8bc1014692..78ca70f0d7c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
@@ -16,14 +16,14 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{setMe}}',
+        template: '{{this.setMe}}',
       });
 
       this.registerComponent('middle-mut', {
-        template: '{{bottom-mut setMe=value}}',
+        template: '{{bottom-mut setMe=this.value}}',
       });
 
-      this.render('{{middle-mut value=(mut val)}}', {
+      this.render('{{middle-mut value=(mut this.val)}}', {
         val: 12,
       });
 
@@ -59,7 +59,7 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{setMe}}',
+        template: '{{this.setMe}}',
       });
 
       this.registerComponent('middle-mut', {
@@ -68,10 +68,10 @@ moduleFor(
             middle = this;
           },
         }),
-        template: '{{bottom-mut setMe=(mut value)}}',
+        template: '{{bottom-mut setMe=(mut this.value)}}',
       });
 
-      this.render('{{middle-mut value=(mut val)}}', {
+      this.render('{{middle-mut value=(mut this.val)}}', {
         val: 12,
       });
 
@@ -103,7 +103,7 @@ moduleFor(
     }
 
     ['@test passing a literal results in a assertion']() {
-      this.registerComponent('bottom-mut', { template: '{{setMe}}' });
+      this.registerComponent('bottom-mut', { template: '{{this.setMe}}' });
 
       expectAssertion(() => {
         this.render('{{bottom-mut setMe=(mut "foo bar")}}');
@@ -111,7 +111,7 @@ moduleFor(
     }
 
     ['@test passing the result of a helper invocation results in an assertion']() {
-      this.registerComponent('bottom-mut', { template: '{{setMe}}' });
+      this.registerComponent('bottom-mut', { template: '{{this.setMe}}' });
 
       expectAssertion(() => {
         this.render('{{bottom-mut setMe=(mut (concat "foo" " " "bar"))}}');
@@ -128,11 +128,11 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{stuff}}',
+        template: '{{this.stuff}}',
       });
 
       this.registerComponent('middle-mut', {
-        template: '{{bottom-mut stuff=value}}',
+        template: '{{bottom-mut stuff=this.value}}',
       });
 
       this.render('{{middle-mut value="foo"}}');
@@ -154,7 +154,7 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{setMe}}',
+        template: '{{this.setMe}}',
       });
 
       this.registerComponent('middle-mut', {
@@ -163,10 +163,10 @@ moduleFor(
             middle = this;
           },
         }),
-        template: '{{bottom-mut setMe=(readonly value)}}',
+        template: '{{bottom-mut setMe=(readonly this.value)}}',
       });
 
-      this.render('{{middle-mut value=(mut val)}}', {
+      this.render('{{middle-mut value=(mut this.val)}}', {
         val: 12,
       });
 
@@ -237,14 +237,14 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{setMe}}',
+        template: '{{this.setMe}}',
       });
 
       this.registerComponent('middle-mut', {
-        template: '{{bottom-mut setMe=(mut value)}}',
+        template: '{{bottom-mut setMe=(mut this.value)}}',
       });
 
-      this.render('{{middle-mut value=(mut val)}}', {
+      this.render('{{middle-mut value=(mut this.val)}}', {
         val: 12,
       });
 
@@ -285,7 +285,7 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{thingy}}',
+        template: '{{this.thingy}}',
       });
 
       this.registerComponent('middle-mut', {
@@ -298,7 +298,7 @@ moduleFor(
             middle = this;
           },
         }),
-        template: '{{bottom-mut thingy=(mut val)}}',
+        template: '{{bottom-mut thingy=(mut this.val)}}',
       });
 
       this.render('{{middle-mut}}');
@@ -337,14 +337,14 @@ moduleFor(
             inner = this;
           },
         }),
-        template: '{{foo}}',
+        template: '{{this.foo}}',
       });
 
       this.registerComponent('x-outer', {
-        template: '{{x-inner foo=bar}}',
+        template: '{{x-inner foo=this.bar}}',
       });
 
-      this.render('{{x-outer bar=baz}}', { baz: 'foo' });
+      this.render('{{x-outer bar=this.baz}}', { baz: 'foo' });
 
       this.assertText('foo');
 
@@ -458,10 +458,10 @@ moduleFor(
           }),
           height: 20,
         }),
-        template: '{{height}}',
+        template: '{{this.height}}',
       });
 
-      this.render('{{x-output height=height}}{{x-input height=(mut height)}}', {
+      this.render('{{x-output height=this.height}}{{x-input height=(mut this.height)}}', {
         height: 60,
       });
 
@@ -536,10 +536,10 @@ moduleFor(
             },
           }),
         }),
-        template: '{{width}}x{{height}}',
+        template: '{{this.width}}x{{this.height}}',
       });
 
-      this.render('{{x-output width=width}}{{x-input width=(mut width)}}', {
+      this.render('{{x-output width=this.width}}{{x-input width=(mut this.width)}}', {
         width: 70,
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
index 96e44c0514b..825b3cf8042 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
@@ -61,7 +61,7 @@ moduleFor(
 
       expectDeprecation(() => {
         this.render(
-          'This {{partial templates.partialName}} is pretty {{partial nonexistent}}great.',
+          'This {{partial this.templates.partialName}} is pretty {{partial this.nonexistent}}great.',
           {
             templates: { partialName: 'subTemplate' },
           }
@@ -163,7 +163,7 @@ moduleFor(
       expectDeprecation(() => {
         this.render(
           strip`
-        {{#each items as |item|}}
+        {{#each this.items as |item|}}
           {{item.id}}: {{partial 'show-item'}} |
         {{/each}}`,
           {
@@ -195,7 +195,7 @@ moduleFor(
       expectDeprecation(() => {
         this.render(
           strip`
-        {{#each items as |item|}}
+        {{#each this.items as |item|}}
           {{item}}: {{partial 'show-item'}} |
         {{/each}}`,
           {
@@ -232,7 +232,7 @@ moduleFor(
       expectDeprecation(() => {
         this.render(
           strip`
-        {{#each names as |name i|}}
+        {{#each this.names as |name i|}}
           {{i}}: {{partial 'outer-partial'}}
         {{/each}}`,
           {
@@ -290,7 +290,7 @@ moduleFor(
         this.render(
           strip`
         {{#let 'Sophie' as |person1|}}
-          Hi {{person1}} (aged {{age}}). {{partial 'person2-partial'}}
+          Hi {{person1}} (aged {{this.age}}). {{partial 'person2-partial'}}
         {{/let}}`,
           { age: 0 }
         );
@@ -358,7 +358,7 @@ moduleFor(
       expectDeprecation(() => {
         this.render(
           strip`
-        {{#with item.thing as |t|}}
+        {{#with this.item.thing as |t|}}
           {{partial t}}
         {{else}}
           Nothing!
@@ -389,7 +389,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#let item.thing as |t|}}
+      {{#let this.item.thing as |t|}}
         {{partial t}}
       {{/let}}`,
         {
@@ -414,11 +414,11 @@ moduleFor(
 
     ['@test partials which contain contextual components']() {
       this.registerComponent('outer-component', {
-        template: '{{yield (hash inner=(component "inner-component" name=name))}}',
+        template: '{{yield (hash inner=(component "inner-component" name=this.name))}}',
       });
 
       this.registerComponent('inner-component', {
-        template: '{{yield (hash name=name)}}',
+        template: '{{yield (hash name=this.name)}}',
       });
 
       this.registerPartial(
@@ -433,7 +433,7 @@ moduleFor(
       expectDeprecation(() => {
         this.render(
           strip`
-        {{#outer-component name=name as |outer|}}
+        {{#outer-component name=this.name as |outer|}}
           {{partial 'some-partial'}}
         {{/outer-component}}`,
           { name: 'Sophie' }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js
index c8eb5448ba8..842b354fdb7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js
@@ -16,10 +16,10 @@ moduleFor(
             component = this;
           },
         }),
-        template: '{{value}}',
+        template: '{{this.value}}',
       });
 
-      this.render('{{foo-bar value=(readonly val)}}', {
+      this.render('{{foo-bar value=(readonly this.val)}}', {
         val: 12,
       });
 
@@ -56,10 +56,10 @@ moduleFor(
             outer = this;
           },
         }),
-        template: '{{x-inner onClick=(readonly onClick)}}',
+        template: '{{x-inner onClick=(readonly this.onClick)}}',
       });
 
-      this.render('{{x-outer onClick=(action doIt)}}', {
+      this.render('{{x-outer onClick=(action this.doIt)}}', {
         doIt() {
           assert.ok(true, 'action was called');
         },
@@ -90,10 +90,10 @@ moduleFor(
             component = this;
           },
         }),
-        template: '{{value}}',
+        template: '{{this.value}}',
       });
 
-      this.render('{{foo-bar value=(readonly thing)}}', {
+      this.render('{{foo-bar value=(readonly this.thing)}}', {
         thing: 'initial',
       });
 
@@ -125,10 +125,10 @@ moduleFor(
             component = this;
           },
         }),
-        template: '{{value.prop}}',
+        template: '{{this.value.prop}}',
       });
 
-      this.render('{{foo-bar value=(readonly thing)}}', {
+      this.render('{{foo-bar value=(readonly this.thing)}}', {
         thing: {
           prop: 'initial',
         },
@@ -162,7 +162,7 @@ moduleFor(
             component = this;
           },
         }),
-        template: '{{value}}',
+        template: '{{this.value}}',
       });
 
       this.render('{{foo-bar value=(readonly "12")}}');
@@ -193,7 +193,7 @@ moduleFor(
             bottom = this;
           },
         }),
-        template: '{{bar}}',
+        template: '{{this.bar}}',
       });
 
       this.registerComponent('x-middle', {
@@ -202,10 +202,10 @@ moduleFor(
             middle = this;
           },
         }),
-        template: '{{foo}} {{x-bottom bar=(mut foo)}}',
+        template: '{{this.foo}} {{x-bottom bar=(mut this.foo)}}',
       });
 
-      this.render('{{x-middle foo=(readonly val)}}', {
+      this.render('{{x-middle foo=(readonly this.val)}}', {
         val: 12,
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
index 0891c1b94df..9ec93c88307 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
@@ -15,7 +15,7 @@ moduleFor(
   'Helpers test: {{unbound}}',
   class extends RenderingTestCase {
     ['@test should be able to output a property without binding']() {
-      this.render(`<div id="first">{{unbound content.anUnboundString}}</div>`, {
+      this.render(`<div id="first">{{unbound this.content.anUnboundString}}</div>`, {
         content: {
           anUnboundString: 'No spans here, son.',
         },
@@ -41,7 +41,7 @@ moduleFor(
     }
 
     ['@test should be able to use unbound helper in #each helper']() {
-      this.render(`<ul>{{#each items as |item|}}<li>{{unbound item}}</li>{{/each}}</ul>`, {
+      this.render(`<ul>{{#each this.items as |item|}}<li>{{unbound item}}</li>{{/each}}</ul>`, {
         items: emberA(['a', 'b', 'c', 1, 2, 3]),
       });
 
@@ -53,9 +53,12 @@ moduleFor(
     }
 
     ['@test should be able to use unbound helper in #each helper (with objects)']() {
-      this.render(`<ul>{{#each items as |item|}}<li>{{unbound item.wham}}</li>{{/each}}</ul>`, {
-        items: emberA([{ wham: 'bam' }, { wham: 1 }]),
-      });
+      this.render(
+        `<ul>{{#each this.items as |item|}}<li>{{unbound item.wham}}</li>{{/each}}</ul>`,
+        {
+          items: emberA([{ wham: 'bam' }, { wham: 1 }]),
+        }
+      );
 
       this.assertText('bam1');
 
@@ -74,7 +77,7 @@ moduleFor(
 
     ['@test it should assert unbound cannot be called with multiple arguments']() {
       let willThrow = () => {
-        this.render(`{{unbound foo bar}}`, {
+        this.render(`{{unbound this.foo this.bar}}`, {
           foo: 'BORK',
           bar: 'BLOOP',
         });
@@ -123,7 +126,7 @@ moduleFor(
       ]);
 
       this.render(
-        `<ul>{{#each people as |person|}}<li><a href="{{unbound person.url}}">{{person.name}}</a></li>{{/each}}</ul>`,
+        `<ul>{{#each this.people as |person|}}<li><a href="{{unbound person.url}}">{{person.name}}</a></li>{{/each}}</ul>`,
         {
           people: unsafeUrls,
         }
@@ -159,7 +162,7 @@ moduleFor(
     }
 
     ['@skip helper form updates on parent re-render']() {
-      this.render(`{{unbound foo}}`, {
+      this.render(`{{unbound this.foo}}`, {
         foo: 'BORK',
       });
 
@@ -192,7 +195,7 @@ moduleFor(
     ['@test sexpr form does not update no matter what']() {
       this.registerHelper('capitalize', (args) => args[0].toUpperCase());
 
-      this.render(`{{capitalize (unbound foo)}}`, {
+      this.render(`{{capitalize (unbound this.foo)}}`, {
         foo: 'bork',
       });
 
@@ -226,7 +229,7 @@ moduleFor(
 
       this.registerHelper('doublize', (params) => `${params[0]} ${params[0]}`);
 
-      this.render(`{{capitalize (unbound (doublize foo))}}`, {
+      this.render(`{{capitalize (unbound (doublize this.foo))}}`, {
         foo: 'bork',
       });
 
@@ -265,7 +268,7 @@ moduleFor(
       });
 
       this.render(
-        `{{unbound (repeat foo count=bar)}} {{repeat foo count=bar}} {{unbound (repeat foo count=2)}} {{repeat foo count=4}}`,
+        `{{unbound (repeat this.foo count=this.bar)}} {{repeat this.foo count=this.bar}} {{unbound (repeat this.foo count=2)}} {{repeat this.foo count=4}}`,
         {
           foo: 'X',
           bar: 5,
@@ -404,7 +407,7 @@ moduleFor(
       });
 
       this.render(
-        `{{capitalizeName person}} {{unbound (capitalizeName person)}} {{concatNames person}} {{unbound (concatNames person)}}`,
+        `{{capitalizeName this.person}} {{unbound (capitalizeName this.person)}} {{concatNames this.person}} {{unbound (concatNames this.person)}}`,
         {
           person: {
             firstName: 'shooby',
@@ -440,7 +443,7 @@ moduleFor(
       this.registerHelper('capitalize', (params) => params[0].toUpperCase());
 
       this.render(
-        `{{#each people as |person|}}{{capitalize person.firstName}} {{unbound (capitalize person.firstName)}}{{/each}}`,
+        `{{#each this.people as |person|}}{{capitalize person.firstName}} {{unbound (capitalize person.firstName)}}{{/each}}`,
         {
           people: emberA([
             {
@@ -523,7 +526,7 @@ moduleFor(
       });
 
       this.render(
-        `{{capitalizeName person}} {{unbound (capitalizeName person)}} {{concatNames person}} {{unbound (concatNames person)}}`,
+        `{{capitalizeName this.person}} {{unbound (capitalizeName this.person)}} {{concatNames this.person}} {{unbound (concatNames this.person)}}`,
         {
           person: {
             firstName: 'shooby',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
index 6efa12652e7..82a4d2f7d35 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
@@ -12,7 +12,7 @@ moduleFor(
         template: '[In layout:] {{yield}}',
       });
 
-      this.render('{{#yield-comp}}[In Block:] {{object.title}}{{/yield-comp}}', {
+      this.render('{{#yield-comp}}[In Block:] {{this.object.title}}{{/yield-comp}}', {
         object: { title: 'Seattle' },
       });
       this.assertText('[In layout:] [In Block:] Seattle');
@@ -38,7 +38,7 @@ moduleFor(
         // ComponentClass: require('../../utils/glimmerish-component').default,
       });
 
-      this.render('<YieldComp><:block>[In block:] {{object.title}}</:block></YieldComp>', {
+      this.render('<YieldComp><:block>[In block:] {{this.object.title}}</:block></YieldComp>', {
         object: { title: 'Seattle' },
       });
 
@@ -58,10 +58,10 @@ moduleFor(
         template: '<div>[In layout:] {{yield}}</div>',
       });
       this.registerComponent('inner-comp', {
-        template: '{{#outer-comp}}[In Block:] {{object.title}}{{/outer-comp}}',
+        template: '{{#outer-comp}}[In Block:] {{this.object.title}}{{/outer-comp}}',
       });
 
-      this.render('{{inner-comp object=object}}', {
+      this.render('{{inner-comp object=this.object}}', {
         object: { title: 'Seattle' },
       });
       this.assertText('[In layout:] [In Block:] Seattle');
@@ -79,10 +79,10 @@ moduleFor(
       let list = [1, 2, 3];
 
       this.registerComponent('outer-comp', {
-        template: '{{#each list as |item|}}{{yield}}{{/each}}',
+        template: '{{#each this.list as |item|}}{{yield}}{{/each}}',
       });
 
-      this.render('{{#outer-comp list=list}}Hello{{/outer-comp}}', {
+      this.render('{{#outer-comp list=this.list}}Hello{{/outer-comp}}', {
         list: list,
       });
       this.assertText('HelloHelloHello');
@@ -98,10 +98,10 @@ moduleFor(
 
     ['@test templates should yield to block, when the yield is embedded in a if helper']() {
       this.registerComponent('outer-comp', {
-        template: '{{#if boolean}}{{yield}}{{/if}}',
+        template: '{{#if this.boolean}}{{yield}}{{/if}}',
       });
 
-      this.render('{{#outer-comp boolean=boolean}}Hello{{/outer-comp}}', {
+      this.render('{{#outer-comp boolean=this.boolean}}Hello{{/outer-comp}}', {
         boolean: true,
       });
       this.assertText('Hello');
@@ -117,10 +117,10 @@ moduleFor(
 
     ['@test simple curlies inside of a yielded block should work when the yield is nested inside of another view']() {
       this.registerComponent('kiwi-comp', {
-        template: '{{#if falsy}}{{else}}{{yield}}{{/if}}',
+        template: '{{#if this.falsy}}{{else}}{{yield}}{{/if}}',
       });
 
-      this.render('{{#kiwi-comp}}{{text}}{{/kiwi-comp}}', { text: 'ohai' });
+      this.render('{{#kiwi-comp}}{{this.text}}{{/kiwi-comp}}', { text: 'ohai' });
       this.assertText('ohai');
 
       this.assertStableRerender();
@@ -134,13 +134,13 @@ moduleFor(
 
     ['@test nested simple curlies inside of a yielded block should work when the yield is nested inside of another view']() {
       this.registerComponent('parent-comp', {
-        template: '{{#if falsy}}{{else}}{{yield}}{{/if}}',
+        template: '{{#if this.falsy}}{{else}}{{yield}}{{/if}}',
       });
       this.registerComponent('child-comp', {
-        template: '{{#if falsy}}{{else}}{{text}}{{/if}}',
+        template: '{{#if this.falsy}}{{else}}{{this.text}}{{/if}}',
       });
 
-      this.render('{{#parent-comp}}{{child-comp text=text}}{{/parent-comp}}', {
+      this.render('{{#parent-comp}}{{child-comp text=this.text}}{{/parent-comp}}', {
         text: 'ohai',
       });
       this.assertText('ohai');
@@ -157,10 +157,10 @@ moduleFor(
     ['@test yielding to a non-existent block is not an error']() {
       this.registerComponent('yielding-comp', { template: 'Hello:{{yield}}' });
       this.registerComponent('outer-comp', {
-        template: '{{yielding-comp}} {{title}}',
+        template: '{{yielding-comp}} {{this.title}}',
       });
 
-      this.render('{{outer-comp title=title}}', { title: 'Mr. Selden' });
+      this.render('{{outer-comp title=this.title}}', { title: 'Mr. Selden' });
 
       this.assertText('Hello: Mr. Selden');
 
@@ -178,10 +178,10 @@ moduleFor(
 
       this.registerComponent('kiwi-comp', {
         ComponentClass: KiwiCompComponent,
-        template: '<p>{{boundText}}</p><p>{{yield}}</p>',
+        template: '<p>{{this.boundText}}</p><p>{{yield}}</p>',
       });
 
-      this.render('{{#kiwi-comp}}{{boundText}}{{/kiwi-comp}}', {
+      this.render('{{#kiwi-comp}}{{this.boundText}}{{/kiwi-comp}}', {
         boundText: 'Original',
       });
       this.assertText('InnerOriginal');
@@ -200,10 +200,10 @@ moduleFor(
 
       this.registerComponent('kiwi-comp', {
         ComponentClass: KiwiCompComponent,
-        template: '<p>{{boundText}}</p><p>{{yield}}</p>',
+        template: '<p>{{this.boundText}}</p><p>{{yield}}</p>',
       });
 
-      this.render('{{#let boundText as |item|}}{{#kiwi-comp}}{{item}}{{/kiwi-comp}}{{/let}}', {
+      this.render('{{#let this.boundText as |item|}}{{#kiwi-comp}}{{item}}{{/kiwi-comp}}{{/let}}', {
         boundText: 'Outer',
       });
       this.assertText('InnerOuter');
@@ -222,10 +222,10 @@ moduleFor(
 
       this.registerComponent('kiwi-comp', {
         ComponentClass: KiwiCompComponent,
-        template: '{{#let boundText as |item|}}<p>{{item}}</p><p>{{yield}}</p>{{/let}}',
+        template: '{{#let this.boundText as |item|}}<p>{{item}}</p><p>{{yield}}</p>{{/let}}',
       });
 
-      this.render('{{#kiwi-comp}}{{item}}{{/kiwi-comp}}', { item: 'Outer' });
+      this.render('{{#kiwi-comp}}{{this.item}}{{/kiwi-comp}}', { item: 'Outer' });
       this.assertText('InnerOuter');
 
       this.assertStableRerender();
@@ -239,11 +239,11 @@ moduleFor(
 
     ['@test can bind a block param to a component and use it in yield']() {
       this.registerComponent('kiwi-comp', {
-        template: '<p>{{content}}</p><p>{{yield}}</p>',
+        template: '<p>{{this.content}}</p><p>{{yield}}</p>',
       });
 
       this.render(
-        '{{#let boundText as |item|}}{{#kiwi-comp content=item}}{{item}}{{/kiwi-comp}}{{/let}}',
+        '{{#let this.boundText as |item|}}{{#kiwi-comp content=item}}{{item}}{{/kiwi-comp}}{{/let}}',
         { boundText: 'Outer' }
       );
       this.assertText('OuterOuter');
@@ -287,7 +287,7 @@ moduleFor(
         template: '{{#inner-component}}<span>{{yield}}</span>{{/inner-component}}',
       });
 
-      this.render('{{#outer-component}}Hello {{boundText}}{{/outer-component}}', {
+      this.render('{{#outer-component}}Hello {{this.boundText}}{{/outer-component}}', {
         boundText: 'world',
       });
       this.assertText('Hello world');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/input-test.js b/packages/@ember/-internals/glimmer/tests/integration/input-test.js
index 24e8392706e..9244468c0fe 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/input-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/input-test.js
@@ -6,7 +6,7 @@ moduleFor(
   'Input element tests',
   class extends RenderingTestCase {
     runAttributeTest(attributeName, values) {
-      let template = `<input ${attributeName}={{value}}>`;
+      let template = `<input ${attributeName}={{this.value}}>`;
       this.render(template, { value: values[0] });
       this.assertAttributeHasValue(
         attributeName,
@@ -34,7 +34,7 @@ moduleFor(
 
     runPropertyTest(propertyName, values) {
       let attributeName = propertyName;
-      let template = `<input ${attributeName}={{value}}>`;
+      let template = `<input ${attributeName}={{this.value}}>`;
       this.render(template, { value: values[0] });
       this.assertPropertyHasValue(
         propertyName,
@@ -62,7 +62,7 @@ moduleFor(
 
     runFalsyValueProperty(values) {
       let value = 'value';
-      let template = `<input value={{value}}>`;
+      let template = `<input value={{this.value}}>`;
       this.render(template, { value: values[0] });
       this.assertPropertyHasValue(value, '', `${value} is set on initial render`);
 
@@ -140,7 +140,7 @@ moduleFor(
     }
 
     ['@test cursor position is not lost when updating content']() {
-      let template = `<input value={{value}}>`;
+      let template = `<input value={{this.value}}>`;
       this.render(template, { value: 'hola' });
 
       this.setDOMValue('hello');
@@ -156,7 +156,7 @@ moduleFor(
     }
 
     ['@test input can be updated multiple times']() {
-      let template = `<input value={{value}}>`;
+      let template = `<input value={{this.value}}>`;
       this.render(template, { value: 'hola' });
 
       this.assertValue('hola', 'Value is initialised');
@@ -173,7 +173,7 @@ moduleFor(
     }
 
     ['@test DOM is SSOT if value is set']() {
-      let template = `<input value={{value}}>`;
+      let template = `<input value={{this.value}}>`;
       this.render(template, { value: 'hola' });
 
       this.assertValue('hola', 'Value is initialised');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
index fa40faf7a87..7d9556715a8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
@@ -148,7 +148,7 @@ moduleFor(
     ) {
       let count = 0;
 
-      this.render('<button {{on "click" this.callback once=once}}>Click Me</button>', {
+      this.render('<button {{on "click" this.callback once=this.once}}>Click Me</button>', {
         callback() {
           count++;
         },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 8b9604462e6..fd223eaccd6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -30,7 +30,7 @@ moduleFor(
   class extends RenderingTestCase {
     ['@test it asserts when an invalid engine name is provided']() {
       expectAssertion(() => {
-        this.render('{{mount engineName}}', { engineName: {} });
+        this.render('{{mount this.engineName}}', { engineName: {} });
       }, /Invalid engine name '\[object Object\]' specified, engine name must be either a string, null or undefined./i);
     }
 
@@ -73,8 +73,10 @@ moduleFor(
       assert
     ) {
       this.engineRegistrations['template:application'] = compile(
-        '<h2>Chat here, {{username}}</h2>',
-        { moduleName: 'my-app/templates/application.hbs' }
+        '<h2>Chat here, {{this.username}}</h2>',
+        {
+          moduleName: 'my-app/templates/application.hbs',
+        }
       );
 
       let controller;
@@ -119,7 +121,7 @@ moduleFor(
       this.addTemplate('route-with-mount', '{{mount "chat"}}');
 
       this.engineRegistrations['template:application'] = compile(
-        'hi {{person.name}} [{{component-with-backtracking-set person=person}}]',
+        'hi {{this.person.name}} [{{component-with-backtracking-set person=this.person}}]',
         {
           moduleName: 'my-app/templates/application.hbs',
         }
@@ -170,7 +172,7 @@ moduleFor(
           },
         })
       );
-      this.addTemplate('bound-engine-name', '{{mount engineName}}');
+      this.addTemplate('bound-engine-name', '{{mount this.engineName}}');
 
       this.add(
         'engine:foo',
@@ -359,7 +361,7 @@ moduleFor(
       );
       this.addTemplate(
         'engine-params-bound',
-        '{{mount "paramEngine" model=(hash foo=boundParamValue)}}'
+        '{{mount "paramEngine" model=(hash foo=this.boundParamValue)}}'
       );
 
       return this.visit('/engine-params-bound').then(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js b/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
index 49d15bb6d26..71d4311963b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
@@ -172,7 +172,7 @@ moduleFor(
     }
 
     ['@test does not default outlet name when positional argument is present']() {
-      this.registerTemplate('application', '<h1>HI</h1>{{outlet someUndefinedThing}}');
+      this.registerTemplate('application', '<h1>HI</h1>{{outlet this.someUndefinedThing}}');
       let outletState = {
         render: {
           owner: this.owner,
@@ -213,7 +213,7 @@ moduleFor(
 
     ['@test should support bound outlet name']() {
       let controller = { outletName: 'foo' };
-      this.registerTemplate('application', '<h1>HI</h1>{{outlet outletName}}');
+      this.registerTemplate('application', '<h1>HI</h1>{{outlet this.outletName}}');
       let outletState = {
         render: {
           owner: this.owner,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js b/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
index 3626311f848..241b5806c0b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
@@ -10,43 +10,43 @@ moduleFor(
 
       this.render(
         strip`
-      {{#let var as |foo|}}
+      {{#let this.var as |foo|}}
         {{foo}}
       {{/let}}
 
       ---
 
-      {{#let var as |outlet|}}
+      {{#let this.var as |outlet|}}
         {{outlet}}
       {{/let}}
 
       ---
 
-      {{#let var as |mount|}}
+      {{#let this.var as |mount|}}
         {{mount}}
       {{/let}}
 
       ---
 
-      {{#let var as |component|}}
+      {{#let this.var as |component|}}
         {{component}}
       {{/let}}
 
       ---
 
-      {{#let var as |input|}}
+      {{#let this.var as |input|}}
         {{input}}
       {{/let}}
 
       ---
 
-      {{#let var as |-with-dynamic-vars|}}
+      {{#let this.var as |-with-dynamic-vars|}}
         {{-with-dynamic-vars}}
       {{/let}}
 
       ---
 
-      {{#let var as |-in-element|}}
+      {{#let this.var as |-in-element|}}
         {{-in-element}}
       {{/let}}`,
         { var: 'var' }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/render-settled-test.js b/packages/@ember/-internals/glimmer/tests/integration/render-settled-test.js
index 94e4f374344..f17d201dc5b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/render-settled-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/render-settled-test.js
@@ -15,7 +15,7 @@ moduleFor(
     }
 
     ['@test resolves renderers exist but no runloops are triggered'](assert) {
-      this.render(strip`{{foo}}`, { foo: 'bar' });
+      this.render(strip`{{this.foo}}`, { foo: 'bar' });
 
       return renderSettled().then(() => {
         assert.ok(true, 'resolved even without runloops');
@@ -32,7 +32,7 @@ moduleFor(
     }
 
     ['@test resolves when rendering has completed (after property update)']() {
-      this.render(strip`{{foo}}`, { foo: 'bar' });
+      this.render(strip`{{this.foo}}`, { foo: 'bar' });
 
       this.assertText('bar');
       this.component.set('foo', 'baz');
@@ -46,7 +46,7 @@ moduleFor(
     ['@test resolves in run loop when renderer has settled'](assert) {
       assert.expect(3);
 
-      this.render(strip`{{foo}}`, { foo: 'bar' });
+      this.render(strip`{{this.foo}}`, { foo: 'bar' });
 
       this.assertText('bar');
       let promise;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
index b88e4f522aa..84a6a5de9bb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
@@ -14,8 +14,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#-in-element someElement}}
-            {{text}}
+          {{#-in-element this.someElement}}
+            {{this.text}}
           {{/-in-element}}
         `,
         {
@@ -48,8 +48,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#-in-element someElement}}
-            {{text}}
+          {{#-in-element this.someElement}}
+            {{this.text}}
           {{/-in-element}}
         `,
         {
@@ -82,8 +82,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#-in-element someElement insertBefore=null}}
-            {{text}}
+          {{#-in-element this.someElement insertBefore=null}}
+            {{this.text}}
           {{/-in-element}}
         `,
         {
@@ -116,8 +116,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#-in-element someElement insertBefore=undefined}}
-            {{text}}
+          {{#-in-element this.someElement insertBefore=undefined}}
+            {{this.text}}
           {{/-in-element}}
         `,
         {
@@ -150,8 +150,8 @@ moduleFor(
       expectAssertion(() => {
         this.render(
           strip`
-            {{#-in-element someElement insertBefore=".foo"}}
-              {{text}}
+            {{#-in-element this.someElement insertBefore=".foo"}}
+              {{this.text}}
             {{/-in-element}}
           `,
           {
@@ -180,14 +180,14 @@ moduleFor(
           },
         }),
 
-        template: `{{text}}`,
+        template: `{{this.text}}`,
       });
 
       this.render(
         strip`
-          {{#if showModal}}
-            {{#-in-element someElement}}
-              {{modal-display text=text}}
+          {{#if this.showModal}}
+            {{#-in-element this.someElement}}
+              {{modal-display text=this.text}}
             {{/-in-element}}
           {{/if}}
         `,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index 071ff353502..5b66875c135 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -143,7 +143,7 @@ class EachInTest extends AbstractEachInTest {
     this.makeHash({ Smartphones: 8203, 'JavaScript Frameworks': Infinity });
 
     this.render(
-      `<ul>{{#each-in hash as |category count|}}<li>{{category}}: {{count}}</li>{{else}}Empty!{{/each-in}}</ul>`
+      `<ul>{{#each-in this.hash as |category count|}}<li>{{category}}: {{count}}</li>{{else}}Empty!{{/each-in}}</ul>`
     );
 
     this.assertText('Smartphones: 8203JavaScript Frameworks: Infinity');
@@ -169,7 +169,7 @@ class EachInTest extends AbstractEachInTest {
     });
 
     this.render(
-      `<ul>{{#each-in hash as |category data|}}<li>{{category}}: {{data.reports.unitsSold}}</li>{{else}}Empty!{{/each-in}}</ul>`
+      `<ul>{{#each-in this.hash as |category data|}}<li>{{category}}: {{data.reports.unitsSold}}</li>{{else}}Empty!{{/each-in}}</ul>`
     );
 
     this.assertText('Smartphones: 8203JavaScript Frameworks: Infinity');
@@ -200,7 +200,7 @@ class EachInTest extends AbstractEachInTest {
     });
 
     this.render(
-      `<ul>{{#each-in hash key='@identity' as |category count|}}<li>{{category}}: {{count}}</li>{{/each-in}}</ul>`
+      `<ul>{{#each-in this.hash key='@identity' as |category count|}}<li>{{category}}: {{count}}</li>{{/each-in}}</ul>`
     );
 
     this.assertText('Smartphones: 8203Tablets: 8203JavaScript Frameworks: InfinityBugs: Infinity');
@@ -237,7 +237,7 @@ class EachInTest extends AbstractEachInTest {
       },
     };
     this.render(
-      `<ul>{{#each-in (get hashes hashes.type) as |category count|}}<li>{{category}}: {{count}}</li>{{else}}Empty!{{/each-in}}</ul>`,
+      `<ul>{{#each-in (get this.hashes this.hashes.type) as |category count|}}<li>{{category}}: {{count}}</li>{{else}}Empty!{{/each-in}}</ul>`,
       context
     );
 
@@ -267,7 +267,7 @@ class EachInTest extends AbstractEachInTest {
   ['@test keying off of `undefined` does not render']() {
     this.makeHash({});
 
-    this.render(`{{#each-in hash as |key value|}}{{key}}: {{value.baz}}{{else}}Empty!{{/each-in}}`);
+    this.render(`{{#each-in this.hash as |key value|}}{{key}}: {{value.baz}}{{else}}Empty!{{/each-in}}`);
 
     this.assertText('Empty!');
 
@@ -286,7 +286,7 @@ class EachInTest extends AbstractEachInTest {
     this.makeHash({ '': 'empty-string', a: 'a' });
 
     this.render(
-      `<ul>{{#each-in hash as |key value|}}<li>{{key}}: {{value}}</li>{{else}}Empty!{{/each-in}}</ul>`
+      `<ul>{{#each-in this.hash as |key value|}}<li>{{key}}: {{value}}</li>{{else}}Empty!{{/each-in}}</ul>`
     );
 
     this.assertText(': empty-stringa: a');
@@ -302,7 +302,7 @@ class EachInTest extends AbstractEachInTest {
     this.makeHash({ 'period.key': 'a', 'other.period.key': 'b' });
 
     this.render(
-      `<ul>{{#each-in hash as |key value|}}<li>{{key}}: {{value}}</li>{{else}}Empty!{{/each-in}}</ul>`
+      `<ul>{{#each-in this.hash as |key value|}}<li>{{key}}: {{value}}</li>{{else}}Empty!{{/each-in}}</ul>`
     );
 
     this.assertText('period.key: aother.period.key: b');
@@ -349,7 +349,7 @@ moduleFor(
       categories['Alarm Clocks'] = 999;
 
       this.render(
-        `<ul>{{#each-in categories as |category count|}}<li>{{category}}: {{count}}</li>{{else}}Empty!{{/each-in}}</ul>`,
+        `<ul>{{#each-in this.categories as |category count|}}<li>{{category}}: {{count}}</li>{{else}}Empty!{{/each-in}}</ul>`,
         { categories }
       );
 
@@ -373,7 +373,7 @@ moduleFor(
       this.render(
         strip`
       <ul>
-        {{#each-in categories as |category count|}}
+        {{#each-in this.categories as |category count|}}
           <li>{{category}}: {{count}}</li>
         {{/each-in}}
       </ul>
@@ -443,7 +443,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#each-in arr as |key value|}}
+      {{#each-in this.arr as |key value|}}
         [{{key}}:{{value}}]
       {{/each-in}}`,
         { arr }
@@ -460,7 +460,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#each-in arr as |key value|}}
+      {{#each-in this.arr as |key value|}}
         [{{key}}:{{value}}]
       {{/each-in}}`,
         { arr }
@@ -550,7 +550,7 @@ moduleFor(
       this.render(
         strip`
       <ul>
-        {{#each-in categories as |category count|}}
+        {{#each-in this.categories as |category count|}}
           <li>{{category}}: {{count}}</li>
         {{/each-in}}
       </ul>
@@ -644,7 +644,7 @@ moduleFor(
       this.render(
         strip`
       <ul>
-        {{#each-in map key="@identity" as |key value|}}
+        {{#each-in this.map key="@identity" as |key value|}}
           <li>{{key.name}}: {{value}}</li>
         {{/each-in}}
       </ul>`,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 50e73c05057..3e32e0d30a1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -325,7 +325,7 @@ class EachTest extends AbstractEachTest {
   ['@test it repeats the given block for each item in the array']() {
     this.makeList([{ text: 'hello' }]);
 
-    this.render(`{{#each list as |item|}}{{item.text}}{{else}}Empty{{/each}}`);
+    this.render(`{{#each this.list as |item|}}{{item.text}}{{else}}Empty{{/each}}`);
 
     this.assertText('hello');
 
@@ -390,7 +390,7 @@ class EachTest extends AbstractEachTest {
   ['@test it receives the index as the second parameter']() {
     this.makeList([{ text: 'hello' }, { text: 'world' }]);
 
-    this.render(`{{#each list as |item index|}}[{{index}}. {{item.text}}]{{/each}}`);
+    this.render(`{{#each this.list as |item index|}}[{{index}}. {{item.text}}]{{/each}}`);
 
     this.assertText('[0. hello][1. world]');
 
@@ -408,7 +408,7 @@ class EachTest extends AbstractEachTest {
   ['@test it accepts a string key']() {
     this.makeList([{ text: 'hello' }, { text: 'world' }]);
 
-    this.render(`{{#each list key='text' as |item|}}{{item.text}}{{/each}}`);
+    this.render(`{{#each this.list key='text' as |item|}}{{item.text}}{{/each}}`);
 
     this.assertText('helloworld');
 
@@ -426,7 +426,7 @@ class EachTest extends AbstractEachTest {
   ['@test it accepts a numeric key']() {
     this.makeList([{ id: 1 }, { id: 2 }]);
 
-    this.render(`{{#each list key='id' as |item|}}{{item.id}}{{/each}}`);
+    this.render(`{{#each this.list key='id' as |item|}}{{item.id}}{{/each}}`);
 
     this.assertText('12');
 
@@ -444,7 +444,7 @@ class EachTest extends AbstractEachTest {
   ['@test it can specify @index as the key']() {
     this.makeList([{ id: 1 }, { id: 2 }]);
 
-    this.render(`{{#each list key='@index' as |item|}}{{item.id}}{{/each}}`);
+    this.render(`{{#each this.list key='@index' as |item|}}{{item.id}}{{/each}}`);
 
     this.assertText('12');
 
@@ -462,7 +462,7 @@ class EachTest extends AbstractEachTest {
   ['@test it can specify @identity as the key for arrays of primitives']() {
     this.makeList([1, 2]);
 
-    this.render(`{{#each list key='@identity' as |item|}}{{item}}{{/each}}`);
+    this.render(`{{#each this.list key='@identity' as |item|}}{{item}}{{/each}}`);
 
     this.assertText('12');
 
@@ -480,7 +480,9 @@ class EachTest extends AbstractEachTest {
   ['@test it can specify @identity as the key for mixed arrays of objects and primitives']() {
     this.makeList([1, { id: 2 }, 3]);
 
-    this.render(`{{#each list key='@identity' as |item|}}{{if item.id item.id item}}{{/each}}`);
+    this.render(
+      `{{#each this.list key='@identity' as |item|}}{{if item.id item.id item}}{{/each}}`
+    );
 
     this.assertText('123');
 
@@ -498,7 +500,7 @@ class EachTest extends AbstractEachTest {
   ['@test it can render duplicate primitive items']() {
     this.makeList(['a', 'a', 'a']);
 
-    this.render(`{{#each list as |item|}}{{item}}{{/each}}`);
+    this.render(`{{#each this.list as |item|}}{{item}}{{/each}}`);
 
     this.assertText('aaa');
 
@@ -538,11 +540,11 @@ class EachTest extends AbstractEachTest {
 
     this.registerComponent('foo-bar', {
       ComponentClass: FooBarComponent,
-      template: '{{#if isEven}}{{item.value}}{{/if}}',
+      template: '{{#if this.isEven}}{{this.item.value}}{{/if}}',
     });
 
     this.render(strip`
-      {{#each list as |item|}}
+      {{#each this.list as |item|}}
         <li>Prev</li>
         {{foo-bar item=item}}
         <li>Next</li>
@@ -567,7 +569,7 @@ class EachTest extends AbstractEachTest {
 
     this.makeList([duplicateItem, duplicateItem, { text: 'bar' }, { text: 'baz' }]);
 
-    this.render(`{{#each list as |item|}}{{item.text}}{{/each}}`);
+    this.render(`{{#each this.list as |item|}}{{item.text}}{{/each}}`);
 
     this.assertText('foofoobarbaz');
 
@@ -589,7 +591,7 @@ class EachTest extends AbstractEachTest {
   [`@test it maintains DOM stability when condition changes between objects with the same keys`]() {
     this.makeList([{ text: 'Hello' }, { text: ' ' }, { text: 'world' }]);
 
-    this.render(`{{#each list key="text" as |item|}}{{item.text}}{{/each}}`);
+    this.render(`{{#each this.list key="text" as |item|}}{{item.text}}{{/each}}`);
 
     this.assertText('Hello world');
 
@@ -616,7 +618,7 @@ class EachTest extends AbstractEachTest {
   [`@test it maintains DOM stability for stable keys when list is updated`]() {
     this.makeList([{ text: 'Hello' }, { text: ' ' }, { text: 'world' }]);
 
-    this.render(`{{#each list key="text" as |item|}}{{item.text}}{{/each}}`);
+    this.render(`{{#each this.list key="text" as |item|}}{{item.text}}{{/each}}`);
 
     this.assertText('Hello world');
 
@@ -645,7 +647,7 @@ class EachTest extends AbstractEachTest {
   [`@test it renders all items with duplicate key values`]() {
     this.makeList([{ text: 'Hello' }, { text: 'Hello' }, { text: 'Hello' }]);
 
-    this.render(`{{#each list key="text" as |item|}}{{item.text}}{{/each}}`);
+    this.render(`{{#each this.list key="text" as |item|}}{{item.text}}{{/each}}`);
 
     this.assertText('HelloHelloHello');
 
@@ -663,9 +665,12 @@ class EachTest extends AbstractEachTest {
   ['@test context is not changed to the inner scope inside an {{#each as}} block']() {
     this.makeList([{ name: 'Chad' }, { name: 'Zack' }, { name: 'Asa' }]);
 
-    this.render(`{{name}}-{{#each list as |person|}}{{name}}{{/each}}-{{name}}`, {
-      name: 'Joel',
-    });
+    this.render(
+      `{{this.name}}-{{#each this.list as |person|}}{{this.name}}{{/each}}-{{this.name}}`,
+      {
+        name: 'Joel',
+      }
+    );
 
     this.assertText('Joel-JoelJoelJoel-Joel');
 
@@ -688,9 +693,12 @@ class EachTest extends AbstractEachTest {
   ['@test can access the item and the original scope']() {
     this.makeList([{ name: 'Tom Dale' }, { name: 'Yehuda Katz' }, { name: 'Godfrey Chan' }]);
 
-    this.render(`{{#each list key="name" as |person|}}[{{title}}: {{person.name}}]{{/each}}`, {
-      title: 'Señor Engineer',
-    });
+    this.render(
+      `{{#each this.list key="name" as |person|}}[{{this.title}}: {{person.name}}]{{/each}}`,
+      {
+        title: 'Señor Engineer',
+      }
+    );
 
     this.assertText(
       '[Señor Engineer: Tom Dale][Señor Engineer: Yehuda Katz][Señor Engineer: Godfrey Chan]'
@@ -725,7 +733,7 @@ class EachTest extends AbstractEachTest {
   ['@test the scoped variable is not available outside the {{#each}} block.']() {
     this.makeList(['Yehuda']);
 
-    this.render(`{{name}}-{{#each list as |name|}}{{name}}{{/each}}-{{name}}`, {
+    this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`, {
       name: 'Stef',
     });
 
@@ -752,9 +760,12 @@ class EachTest extends AbstractEachTest {
   ['@test inverse template is displayed with context']() {
     this.makeList([]);
 
-    this.render(`{{#each list as |thing|}}Has Thing{{else}}No Thing {{otherThing}}{{/each}}`, {
-      otherThing: 'bar',
-    });
+    this.render(
+      `{{#each this.list as |thing|}}Has Thing{{else}}No Thing {{this.otherThing}}{{/each}}`,
+      {
+        otherThing: 'bar',
+      }
+    );
 
     this.assertText('No Thing bar');
 
@@ -790,7 +801,7 @@ class EachTest extends AbstractEachTest {
 
     this.makeList([]);
 
-    this.render(`{{#x-wrapper}}{{#each list as |obj|}}[{{obj.text}}]{{/each}}{{/x-wrapper}}`);
+    this.render(`{{#x-wrapper}}{{#each this.list as |obj|}}[{{obj.text}}]{{/each}}{{/x-wrapper}}`);
 
     this.assertText('');
 
@@ -830,7 +841,7 @@ class EachTest extends AbstractEachTest {
   ['@test empty trusted content clears properly [GH#16314]']() {
     this.makeList(['hello']);
 
-    this.render(`before {{#each list as |value|}}{{{value}}}{{/each}} after`);
+    this.render(`before {{#each this.list as |value|}}{{{value}}}{{/each}} after`);
 
     this.assertText('before hello after');
 
@@ -860,7 +871,7 @@ class EachTest extends AbstractEachTest {
     let users = this.createList([{ name: 'Yehuda Katz' }]);
 
     this.render(
-      `Admin: {{#each admins key="name" as |person|}}[{{person.name}}]{{/each}} User: {{#each users key="name" as |person|}}[{{person.name}}]{{/each}}`,
+      `Admin: {{#each this.admins key="name" as |person|}}[{{person.name}}]{{/each}} User: {{#each this.users key="name" as |person|}}[{{person.name}}]{{/each}}`,
       {
         admins: admins.list,
         users: users.list,
@@ -897,9 +908,9 @@ class EachTest extends AbstractEachTest {
 
     this.render(
       strip`
-      {{#each content as |value|}}
+      {{#each this.content as |value|}}
         {{value}}-
-        {{#each options as |option|}}
+        {{#each this.options as |option|}}
           {{option.value}}:{{option.label}}
         {{/each}}
       {{/each}}
@@ -942,7 +953,7 @@ class EachTest extends AbstractEachTest {
     let ninth = this.createList(['Treachery']);
 
     this.render(
-      `{{ring}}-{{#each first as |ring|}}{{ring}}-{{#each fifth as |ring|}}{{ring}}-{{#each ninth as |ring|}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}`,
+      `{{ring}}-{{#each this.first as |ring|}}{{ring}}-{{#each this.fifth as |ring|}}{{ring}}-{{#each this.ninth as |ring|}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}`,
       {
         ring: 'Greed',
         first: first.list,
@@ -981,12 +992,12 @@ class EachTest extends AbstractEachTest {
     this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
   }
 
-  ['@test it should support {{#each name as |foo|}}, then {{#each foo as |bar|}}']() {
+  ['@test it should support {{#each this.name as |foo|}}, then {{#each foo as |bar|}}']() {
     let inner = this.createList(['caterpillar']);
     let outer = this.createList([inner.list]);
 
     this.render(
-      `{{#each name key="@index" as |foo|}}{{#each foo as |bar|}}{{bar}}{{/each}}{{/each}}`,
+      `{{#each this.name key="@index" as |foo|}}{{#each foo as |bar|}}{{bar}}{{/each}}{{/each}}`,
       {
         name: outer.list,
       }
@@ -1136,7 +1147,7 @@ moduleFor(
     ['@test keying off of `undefined` does not render']() {
       this.render(
         strip`
-      {{#each foo.bar.baz as |thing|}}
+      {{#each this.foo.bar.baz as |thing|}}
         {{thing}}
       {{/each}}`,
         { foo: {} }
@@ -1169,7 +1180,7 @@ moduleFor(
 
       this.render(
         strip`
-      {{#each list as |value key|}}
+      {{#each this.list as |value key|}}
         [{{key}}:{{value}}]
       {{/each}}`,
         { list: emberA(sparseArray) }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
index 3431370d3c3..7834913b13f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
@@ -42,7 +42,7 @@ moduleFor(
       let destroyedChildrenCount = 0;
 
       this.registerComponent('foo-bar', {
-        template: '{{number}}',
+        template: '{{this.number}}',
         ComponentClass: Component.extend({
           willDestroy() {
             this._super();
@@ -53,8 +53,8 @@ moduleFor(
 
       this.render(
         strip`
-      {{#if cond}}
-        {{#each numbers as |number|}}
+      {{#if this.cond}}
+        {{#each this.numbers as |number|}}
           {{foo-bar number=number}}
         {{/each}}
       {{else}}
@@ -82,7 +82,7 @@ moduleFor(
     ['@test looking up `undefined` property defaults to false']() {
       this.render(
         strip`
-      {{#if foo.bar.baz}}
+      {{#if this.foo.bar.baz}}
         Here!
       {{else}}
         Nothing Here!
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index 01ef991187e..57cfa003298 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -13,7 +13,7 @@ moduleFor(
     ['@test it renders the block if `undefined` is passed as an argument']() {
       this.render(
         strip`
-        {{#let foo.bar.baz as |thing|}}
+        {{#let this.foo.bar.baz as |thing|}}
           value: "{{thing}}"
         {{/let}}`,
         { foo: {} }
@@ -35,7 +35,7 @@ moduleFor(
     }
 
     ['@test it renders the block if arguments are falsey']() {
-      this.render(`{{#let cond1 cond2 as |cond|}}value: "{{cond1}}"{{/let}}`, {
+      this.render(`{{#let this.cond1 this.cond2 as |cond|}}value: "{{this.cond1}}"{{/let}}`, {
         cond1: false,
       });
 
@@ -55,7 +55,7 @@ moduleFor(
     }
 
     ['@test it yields multiple arguments in order']() {
-      this.render(`{{#let foo bar baz.name as |a b c|}}{{a}} {{b}} {{c}}{{/let}}`, {
+      this.render(`{{#let this.foo this.bar this.baz.name as |a b c|}}{{a}} {{b}} {{c}}{{/let}}`, {
         foo: 'Señor Engineer',
         bar: '',
         baz: { name: 'Dale' },
@@ -69,7 +69,7 @@ moduleFor(
     }
 
     ['@test can access alias and original scope']() {
-      this.render(`{{#let person as |tom|}}{{title}}: {{tom.name}}{{/let}}`, {
+      this.render(`{{#let this.person as |tom|}}{{this.title}}: {{tom.name}}{{/let}}`, {
         title: 'Señor Engineer',
         person: { name: 'Tom Dale' },
       });
@@ -96,7 +96,7 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block.']() {
-      this.render(`{{name}}-{{#let other as |name|}}{{name}}{{/let}}-{{name}}`, {
+      this.render(`{{name}}-{{#let this.other as |name|}}{{name}}{{/let}}-{{name}}`, {
         name: 'Stef',
         other: 'Yehuda',
       });
@@ -124,7 +124,7 @@ moduleFor(
     }
 
     ['@test can access alias of a proxy']() {
-      this.render(`{{#let proxy as |person|}}{{person.name}}{{/let}}`, {
+      this.render(`{{#let this.proxy as |person|}}{{person.name}}{{/let}}`, {
         proxy: ObjectProxy.create({ content: { name: 'Tom Dale' } }),
       });
 
@@ -159,7 +159,7 @@ moduleFor(
 
     ['@test can access alias of an array']() {
       this.render(
-        `{{#let arrayThing as |words|}}{{#each words as |word|}}{{word}}{{/each}}{{/let}}`,
+        `{{#let this.arrayThing as |words|}}{{#each words as |word|}}{{word}}{{/each}}{{/let}}`,
         {
           arrayThing: emberA(['Hello', ' ', 'world']),
         }
@@ -187,7 +187,7 @@ moduleFor(
     }
 
     ['@test `attrs` can be used as a block param [GH#14678]']() {
-      this.render('{{#let hash as |attrs|}}[{{hash.foo}}-{{attrs.foo}}]{{/let}}', {
+      this.render('{{#let this.hash as |attrs|}}[{{this.hash.foo}}-{{attrs.foo}}]{{/let}}', {
         hash: { foo: 'foo' },
       });
 
@@ -213,7 +213,7 @@ moduleFor(
   class extends RenderingTestCase {
     ['@test re-using the same variable with different {{#let}} blocks does not override each other']() {
       this.render(
-        `Admin: {{#let admin as |person|}}{{person.name}}{{/let}} User: {{#let user as |person|}}{{person.name}}{{/let}}`,
+        `Admin: {{#let this.admin as |person|}}{{person.name}}{{/let}} User: {{#let this.user as |person|}}{{person.name}}{{/let}}`,
         {
           admin: { name: 'Tom Dale' },
           user: { name: 'Yehuda Katz' },
@@ -243,7 +243,7 @@ moduleFor(
 
     ['@test the scoped variable is not available outside the {{#let}} block']() {
       this.render(
-        `{{ring}}-{{#let first as |ring|}}{{ring}}-{{#let fifth as |ring|}}{{ring}}-{{#let ninth as |ring|}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}`,
+        `{{ring}}-{{#let this.first as |ring|}}{{ring}}-{{#let this.fifth as |ring|}}{{ring}}-{{#let this.ninth as |ring|}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}`,
         {
           ring: 'Greed',
           first: 'Limbo',
@@ -283,7 +283,7 @@ moduleFor(
     }
 
     ['@test it should support {{#let name as |foo|}}, then {{#let foo as |bar|}}']() {
-      this.render(`{{#let name as |foo|}}{{#let foo as |bar|}}{{bar}}{{/let}}{{/let}}`, {
+      this.render(`{{#let this.name as |foo|}}{{#let foo as |bar|}}{{bar}}{{/let}}{{/let}}`, {
         name: 'caterpillar',
       });
 
@@ -326,17 +326,17 @@ moduleFor(
       this.render(
         strip`
         {{name}}
-        {{#let committer1.name as |name|}}
+        {{#let this.committer1.name as |name|}}
           [{{name}}
-          {{#let committer2.name as |name|}}
+          {{#let this.committer2.name as |name|}}
             [{{name}}]
           {{/let}}
           {{name}}]
         {{/let}}
         {{name}}
-        {{#let committer2.name as |name|}}
+        {{#let this.committer2.name as |name|}}
           [{{name}}
-          {{#let committer1.name as |name|}}
+          {{#let this.committer1.name as |name|}}
             [{{name}}]
           {{/let}}
           {{name}}]
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
index 3179b289c3d..610f8adb597 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
@@ -11,8 +11,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#in-element someElement}}
-            {{text}}
+          {{#in-element this.someElement}}
+            {{this.text}}
           {{/in-element}}
         `,
         {
@@ -43,8 +43,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#in-element someElement insertBefore=undefined}}
-            {{text}}
+          {{#in-element this.someElement insertBefore=undefined}}
+            {{this.text}}
           {{/in-element}}
         `,
         {
@@ -75,8 +75,8 @@ moduleFor(
 
       this.render(
         strip`
-          {{#in-element someElement insertBefore=null}}
-            {{text}}
+          {{#in-element this.someElement insertBefore=null}}
+            {{this.text}}
           {{/in-element}}
         `,
         {
@@ -107,8 +107,8 @@ moduleFor(
       expectAssertion(() => {
         this.render(
           strip`
-            {{#in-element someElement insertBefore=".foo"}}
-              {{text}}
+            {{#in-element this.someElement insertBefore=".foo"}}
+              {{this.text}}
             {{/in-element}}
           `,
           {
@@ -125,8 +125,8 @@ moduleFor(
       expectAssertion(() => {
         this.render(
           strip`
-            {{#in-element someElement}}
-              {{text}}
+            {{#in-element this.someElement}}
+              {{this.text}}
             {{/in-element}}
           `,
           {
@@ -143,8 +143,8 @@ moduleFor(
       expectAssertion(() => {
         this.render(
           strip`
-            {{#in-element someElement}}
-              {{text}}
+            {{#in-element this.someElement}}
+              {{this.text}}
             {{/in-element}}
           `,
           {
@@ -171,14 +171,14 @@ moduleFor(
           },
         }),
 
-        template: `{{text}}`,
+        template: `{{this.text}}`,
       });
 
       this.render(
         strip`
-          {{#if showModal}}
-            {{#in-element someElement}}
-              {{modal-display text=text}}
+          {{#if this.showModal}}
+            {{#in-element this.someElement}}
+              {{modal-display text=this.text}}
             {{/in-element}}
           {{/if}}
         `,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
index a841ba07c99..e24d7b5f97b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
@@ -32,7 +32,7 @@ moduleFor(
     ['@test keying off of `undefined` does not render']() {
       this.render(
         strip`
-      {{#with foo.bar.baz as |thing|}}
+      {{#with this.foo.bar.baz as |thing|}}
         {{thing}}
       {{/with}}`,
         { foo: {} }
@@ -54,7 +54,7 @@ moduleFor(
     }
 
     ['@test it renders and hides the given block based on the conditional']() {
-      this.render(`{{#with cond1 as |cond|}}{{cond.greeting}}{{else}}False{{/with}}`, {
+      this.render(`{{#with this.cond1 as |cond|}}{{cond.greeting}}{{else}}False{{/with}}`, {
         cond1: { greeting: 'Hello' },
       });
 
@@ -78,7 +78,7 @@ moduleFor(
     }
 
     ['@test can access alias and original scope']() {
-      this.render(`{{#with person as |tom|}}{{title}}: {{tom.name}}{{/with}}`, {
+      this.render(`{{#with this.person as |tom|}}{{this.title}}: {{tom.name}}{{/with}}`, {
         title: 'Señor Engineer',
         person: { name: 'Tom Dale' },
       });
@@ -105,7 +105,7 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#with}} block.']() {
-      this.render(`{{name}}-{{#with other as |name|}}{{name}}{{/with}}-{{name}}`, {
+      this.render(`{{name}}-{{#with this.other as |name|}}{{name}}{{/with}}-{{name}}`, {
         name: 'Stef',
         other: 'Yehuda',
       });
@@ -134,7 +134,7 @@ moduleFor(
 
     ['@test inverse template is displayed with context']() {
       this.render(
-        `{{#with falsyThing as |thing|}}Has Thing{{else}}No Thing {{otherThing}}{{/with}}`,
+        `{{#with this.falsyThing as |thing|}}Has Thing{{else}}No Thing {{this.otherThing}}{{/with}}`,
         {
           falsyThing: null,
           otherThing: 'bar',
@@ -168,7 +168,7 @@ moduleFor(
     }
 
     ['@test can access alias of a proxy']() {
-      this.render(`{{#with proxy as |person|}}{{person.name}}{{/with}}`, {
+      this.render(`{{#with this.proxy as |person|}}{{person.name}}{{/with}}`, {
         proxy: ObjectProxy.create({ content: { name: 'Tom Dale' } }),
       });
 
@@ -203,7 +203,7 @@ moduleFor(
 
     ['@test can access alias of an array']() {
       this.render(
-        `{{#with arrayThing as |words|}}{{#each words as |word|}}{{word}}{{/each}}{{/with}}`,
+        `{{#with this.arrayThing as |words|}}{{#each words as |word|}}{{word}}{{/each}}{{/with}}`,
         {
           arrayThing: emberA(['Hello', ' ', 'world']),
         }
@@ -231,7 +231,7 @@ moduleFor(
     }
 
     ['@test `attrs` can be used as a block param [GH#14678]']() {
-      this.render('{{#with hash as |attrs|}}[{{hash.foo}}-{{attrs.foo}}]{{/with}}', {
+      this.render('{{#with this.hash as |attrs|}}[{{this.hash.foo}}-{{attrs.foo}}]{{/with}}', {
         hash: { foo: 'foo' },
       });
 
@@ -261,7 +261,7 @@ moduleFor(
 
     ['@test re-using the same variable with different {{#with}} blocks does not override each other']() {
       this.render(
-        `Admin: {{#with admin as |person|}}{{person.name}}{{/with}} User: {{#with user as |person|}}{{person.name}}{{/with}}`,
+        `Admin: {{#with this.admin as |person|}}{{person.name}}{{/with}} User: {{#with this.user as |person|}}{{person.name}}{{/with}}`,
         {
           admin: { name: 'Tom Dale' },
           user: { name: 'Yehuda Katz' },
@@ -291,7 +291,7 @@ moduleFor(
 
     ['@test the scoped variable is not available outside the {{#with}} block']() {
       this.render(
-        `{{ring}}-{{#with first as |ring|}}{{ring}}-{{#with fifth as |ring|}}{{ring}}-{{#with ninth as |ring|}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}`,
+        `{{ring}}-{{#with this.first as |ring|}}{{ring}}-{{#with this.fifth as |ring|}}{{ring}}-{{#with this.ninth as |ring|}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}`,
         {
           ring: 'Greed',
           first: 'Limbo',
@@ -331,7 +331,7 @@ moduleFor(
     }
 
     ['@test it should support {{#with name as |foo|}}, then {{#with foo as |bar|}}']() {
-      this.render(`{{#with name as |foo|}}{{#with foo as |bar|}}{{bar}}{{/with}}{{/with}}`, {
+      this.render(`{{#with this.name as |foo|}}{{#with foo as |bar|}}{{bar}}{{/with}}{{/with}}`, {
         name: 'caterpillar',
       });
 
@@ -374,17 +374,17 @@ moduleFor(
       this.render(
         strip`
       {{name}}
-      {{#with committer1.name as |name|}}
+      {{#with this.committer1.name as |name|}}
         [{{name}}
-        {{#with committer2.name as |name|}}
+        {{#with this.committer2.name as |name|}}
           [{{name}}]
         {{/with}}
         {{name}}]
       {{/with}}
       {{name}}
-      {{#with committer2.name as |name|}}
+      {{#with this.committer2.name as |name|}}
         [{{name}}
-        {{#with committer1.name as |name|}}
+        {{#with this.committer1.name as |name|}}
           [{{name}}]
         {{/with}}
         {{name}}]
diff --git a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
index 641cdcdf643..e9e29dacf62 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
@@ -23,7 +23,7 @@ moduleFor(
 
       this.render(
         `
-          {{~#if cond~}}
+          {{~#if this.cond~}}
             {{foo-bar}}
           {{~else~}}
             {{baz-qux}}
@@ -81,7 +81,7 @@ moduleFor(
       this.getCacheCounters();
 
       // show component-one for the first time
-      this.render(`{{component componentName}}`, {
+      this.render(`{{component this.componentName}}`, {
         componentName: 'component-one',
       });
 
@@ -145,7 +145,7 @@ moduleFor(
       // show component-one for the first time
       this.render(
         `
-    {{~#if cond~}}
+    {{~#if this.cond~}}
       {{component-one}}
     {{~else~}}
       {{component-two}}
diff --git a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
index cf773fb78e5..00ace707813 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
@@ -15,7 +15,7 @@ moduleFor(
 
       let { owner } = this;
 
-      let templateStr = 'Hello {{name}}';
+      let templateStr = 'Hello {{this.name}}';
       let options = { moduleName: 'my-app/templates/some-module.hbs' };
 
       let spec = precompile(templateStr, options);
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index f5e0eab3063..08f8550a229 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -472,7 +472,9 @@ export class TogglingHelperConditionalsTest extends TogglingConditionalsTest {
     let context = {};
 
     for (let i = 1; i <= values.length; i++) {
-      templates.push(this.templateFor({ cond: `cond${i}`, truthy: `t${i}`, falsy: `f${i}` }));
+      templates.push(
+        this.templateFor({ cond: `this.cond${i}`, truthy: `this.t${i}`, falsy: `this.f${i}` })
+      );
       context[`t${i}`] = `T${i}`;
       context[`f${i}`] = `F${i}`;
       context[`cond${i}`] = values[i - 1];
@@ -484,8 +486,8 @@ export class TogglingHelperConditionalsTest extends TogglingConditionalsTest {
 
   ['@test it has access to the outer scope from both templates']() {
     let template = this.wrapperFor([
-      this.templateFor({ cond: 'cond1', truthy: 'truthy', falsy: 'falsy' }),
-      this.templateFor({ cond: 'cond2', truthy: 'truthy', falsy: 'falsy' }),
+      this.templateFor({ cond: 'this.cond1', truthy: 'this.truthy', falsy: 'this.falsy' }),
+      this.templateFor({ cond: 'this.cond2', truthy: 'this.truthy', falsy: 'this.falsy' }),
     ]);
 
     this.render(template, {
@@ -528,12 +530,12 @@ export class TogglingHelperConditionalsTest extends TogglingConditionalsTest {
   ['@test it does not update when the unbound helper is used']() {
     let template = this.wrapperFor([
       this.templateFor({
-        cond: '(unbound cond1)',
+        cond: '(unbound this.cond1)',
         truthy: '"T1"',
         falsy: '"F1"',
       }),
       this.templateFor({
-        cond: '(unbound cond2)',
+        cond: '(unbound this.cond2)',
         truthy: '"T2"',
         falsy: '"F2"',
       }),
@@ -597,7 +599,7 @@ export class TogglingHelperConditionalsTest extends TogglingConditionalsTest {
     });
 
     let template = this.wrappedTemplateFor({
-      cond: 'cond',
+      cond: 'this.cond',
 
       // pass values so the helpers don't eagerly compute
       truthy: '(x-truthy this.foo)',
@@ -640,9 +642,9 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
     for (let i = 1; i <= values.length; i++) {
       templates.push(
         this.templateFor({
-          cond: `cond${i}`,
-          truthy: `{{t}}${i}`,
-          falsy: `{{f}}${i}`,
+          cond: `this.cond${i}`,
+          truthy: `{{this.t}}${i}`,
+          falsy: `{{this.f}}${i}`,
         })
       );
       context[`cond${i}`] = values[i - 1];
@@ -654,11 +656,11 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
 
   ['@test it does not update when the unbound helper is used']() {
     let template = `${this.templateFor({
-      cond: '(unbound cond1)',
+      cond: '(unbound this.cond1)',
       truthy: 'T1',
       falsy: 'F1',
     })}${this.templateFor({
-      cond: '(unbound cond2)',
+      cond: '(unbound this.cond2)',
       truthy: 'T2',
       falsy: 'F2',
     })}`;
@@ -693,14 +695,14 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
   ['@test it has access to the outer scope from both templates']() {
     let template = this.wrapperFor([
       this.templateFor({
-        cond: 'cond1',
-        truthy: '{{truthy}}',
-        falsy: '{{falsy}}',
+        cond: 'this.cond1',
+        truthy: '{{this.truthy}}',
+        falsy: '{{this.falsy}}',
       }),
       this.templateFor({
-        cond: 'cond2',
-        truthy: '{{truthy}}',
-        falsy: '{{falsy}}',
+        cond: 'this.cond2',
+        truthy: '{{this.truthy}}',
+        falsy: '{{this.falsy}}',
       }),
     ]);
 
@@ -744,12 +746,12 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
   ['@test it updates correctly when enclosing another conditional']() {
     // This tests whether the outer conditional tracks its bounds correctly as its inner bounds changes
     let inner = this.templateFor({
-      cond: 'inner',
+      cond: 'this.inner',
       truthy: 'T-inner',
       falsy: 'F-inner',
     });
     let template = this.wrappedTemplateFor({
-      cond: 'outer',
+      cond: 'this.outer',
       truthy: inner,
       falsy: 'F-outer',
     });
@@ -776,8 +778,8 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
   ['@test it updates correctly when enclosing #each']() {
     // This tests whether the outer conditional tracks its bounds correctly as its inner bounds changes
     let template = this.wrappedTemplateFor({
-      cond: 'outer',
-      truthy: '{{#each inner as |text|}}{{text}}{{/each}}',
+      cond: 'this.outer',
+      truthy: '{{#each this.inner as |text|}}{{text}}{{/each}}',
       falsy: 'F-outer',
     });
 
@@ -824,8 +826,8 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
   ['@test it updates correctly when enclosing triple-curlies']() {
     // This tests whether the outer conditional tracks its bounds correctly as its inner bounds changes
     let template = this.wrappedTemplateFor({
-      cond: 'outer',
-      truthy: '{{{inner}}}',
+      cond: 'this.outer',
+      truthy: '{{{this.inner}}}',
       falsy: 'F-outer',
     });
 
@@ -867,12 +869,12 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
     });
 
     let innerTemplate = this.templateFor({
-      cond: 'cond2',
+      cond: 'this.cond2',
       truthy: '{{foo-bar}}',
       falsy: '',
     });
     let wrappedTemplate = this.wrappedTemplateFor({
-      cond: 'cond1',
+      cond: 'this.cond1',
       truthy: innerTemplate,
       falsy: '',
     });
@@ -938,7 +940,7 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
     });
 
     let template = this.wrappedTemplateFor({
-      cond: 'cond',
+      cond: 'this.cond',
       truthy: '{{x-truthy}}',
       falsy: '{{x-falsy}}',
     });
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 2bce001fcba..5b35db87b15 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -320,7 +320,7 @@ moduleFor(
     [`@test Application Controller backs the appplication template`]() {
       runTask(() => {
         this.createApplication();
-        this.addTemplate('application', '<h1>{{greeting}}</h1>');
+        this.addTemplate('application', '<h1>{{this.greeting}}</h1>');
         this.add(
           'controller:application',
           Controller.extend({
diff --git a/packages/ember-template-compiler/tests/system/bootstrap-test.js b/packages/ember-template-compiler/tests/system/bootstrap-test.js
index 52ad8caa06a..67e45f0e373 100644
--- a/packages/ember-template-compiler/tests/system/bootstrap-test.js
+++ b/packages/ember-template-compiler/tests/system/bootstrap-test.js
@@ -62,7 +62,7 @@ moduleFor(
       assert
     ) {
       fixture.innerHTML =
-        '<script type="text/x-handlebars" data-template-name="funkyTemplate">{{firstName}} takes {{drug}}</script>';
+        '<script type="text/x-handlebars" data-template-name="funkyTemplate">{{this.firstName}} takes {{this.drug}}</script>';
 
       checkTemplate('funkyTemplate', assert);
     }
@@ -71,13 +71,13 @@ moduleFor(
       assert
     ) {
       fixture.innerHTML =
-        '<script type="text/x-handlebars" id="funkyTemplate" >{{firstName}} takes {{drug}}</script>';
+        '<script type="text/x-handlebars" id="funkyTemplate" >{{this.firstName}} takes {{this.drug}}</script>';
 
       checkTemplate('funkyTemplate', assert);
     }
 
     ['@test template without data-template-name or id should default to application'](assert) {
-      fixture.innerHTML = '<script type="text/x-handlebars">{{firstName}} takes {{drug}}</script>';
+      fixture.innerHTML = '<script type="text/x-handlebars">{{this.firstName}} takes {{this.drug}}</script>';
 
       checkTemplate('application', assert);
     }
@@ -87,7 +87,7 @@ moduleFor(
       typeof Handlebars === 'object' ? '@test' : '@skip'
     } template with type text/x-raw-handlebars should be parsed`](assert) {
       fixture.innerHTML =
-        '<script type="text/x-raw-handlebars" data-template-name="funkyTemplate">{{name}}</script>';
+        '<script type="text/x-raw-handlebars" data-template-name="funkyTemplate">{{this.name}}</script>';
 
       run(() => bootstrap({ context: fixture, hasTemplate, setTemplate }));
 
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index d093f9d84da..e662f747183 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -114,7 +114,7 @@ class CustomPluginsTests extends RenderingTestCase {
   }
 
   ['@test wrapped plugins are only invoked once per template'](assert) {
-    this.render('<div>{{#if falsey}}nope{{/if}}</div>');
+    this.render('<div>{{#if this.falsey}}nope{{/if}}</div>');
     assert.equal(customTransformCounter, 1, 'transform should only be instantiated once');
   }
 }
diff --git a/packages/ember/tests/component_context_test.js b/packages/ember/tests/component_context_test.js
index dad0dd69151..fa88436a09e 100644
--- a/packages/ember/tests/component_context_test.js
+++ b/packages/ember/tests/component_context_test.js
@@ -12,7 +12,7 @@ moduleFor(
         'application',
         `
       <div id='wrapper'>
-        {{#my-component}}{{text}}{{/my-component}}
+        {{#my-component}}{{this.text}}{{/my-component}}
       </div>
     `
       );
@@ -27,7 +27,7 @@ moduleFor(
         ComponentClass: Component.extend({
           text: 'inner',
         }),
-        template: `{{text}}-{{yield}}`,
+        template: `{{this.text}}-{{yield}}`,
       });
 
       return this.visit('/').then(() => {
@@ -43,7 +43,7 @@ moduleFor(
         'application',
         `
       <div id='wrapper'>
-        {{#my-component}}{{text}}{{/my-component}}
+        {{#my-component}}{{this.text}}{{/my-component}}
       </div>
     `
       );
@@ -85,7 +85,7 @@ moduleFor(
         ComponentClass: Component.extend({
           text: 'inner',
         }),
-        template: '{{text}}',
+        template: '{{this.text}}',
       });
 
       return this.visit('/').then(() => {
@@ -128,7 +128,7 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-      <div id='wrapper'>{{my-component data=foo}}</div>`
+      <div id='wrapper'>{{my-component data=this.foo}}</div>`
       );
 
       this.add(
@@ -158,7 +158,7 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-      <div id='wrapper'>{{my-component attrs=foo}}</div>
+      <div id='wrapper'>{{my-component attrs=this.foo}}</div>
     `
       );
 
diff --git a/packages/ember/tests/component_registration_test.js b/packages/ember/tests/component_registration_test.js
index d823efa1f51..1495ad74d95 100644
--- a/packages/ember/tests/component_registration_test.js
+++ b/packages/ember/tests/component_registration_test.js
@@ -164,9 +164,9 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        `<div id='wrapper'>{{#my-component}}{{text}}{{/my-component}}</div>`
+        `<div id='wrapper'>{{#my-component}}{{this.text}}{{/my-component}}</div>`
       );
-      this.addTemplate('foo-bar-baz', '{{text}}-{{yield}}');
+      this.addTemplate('foo-bar-baz', '{{this.text}}-{{yield}}');
 
       this.application.instanceInitializer({
         name: 'application-controller',
@@ -203,7 +203,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        `<div id='wrapper'>{{#my-component}}{{text}}{{/my-component}}</div>`
+        `<div id='wrapper'>{{#my-component}}{{this.text}}{{/my-component}}</div>`
       );
       this.addTemplate('foo-bar-baz', 'No way!');
 
@@ -226,7 +226,7 @@ moduleFor(
             Component.extend({
               text: 'inner',
               layoutName: 'foo-bar-baz',
-              layout: compile('{{text}}-{{yield}}'),
+              layout: compile('{{this.text}}-{{yield}}'),
             })
           );
         },
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index a9e4bd03723..8e5e13a6c26 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -551,7 +551,10 @@ moduleFor(
         })
       );
 
-      this.addTemplate('root.index', '<a {{action "showStuff" model1 model2}}>{{model1.name}}</a>');
+      this.addTemplate(
+        'root.index',
+        '<a {{action "showStuff" this.model1 this.model2}}>{{this.model1.name}}</a>'
+      );
 
       await this.visit('/');
 
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index e0b0fd629fa..09dac8dbf6a 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -115,7 +115,7 @@ moduleFor(
     ['@test The Homepage with a `setupController` hook'](assert) {
       this.addTemplate(
         'home',
-        `<ul>{{#each hours as |entry|}}
+        `<ul>{{#each this.hours as |entry|}}
         <li>{{entry}}</li>
       {{/each}}
       </ul>
@@ -171,7 +171,7 @@ moduleFor(
     }
 
     ['@test the route controller can be specified via controllerName'](assert) {
-      this.addTemplate('home', '<p>{{myValue}}</p>');
+      this.addTemplate('home', '<p>{{this.myValue}}</p>');
       this.add(
         'route:home',
         Route.extend({
@@ -225,7 +225,7 @@ moduleFor(
         })
       );
 
-      this.addTemplate('alternative_home', '<p>alternative home: {{myValue}}</p>');
+      this.addTemplate('alternative_home', '<p>alternative home: {{this.myValue}}</p>');
 
       return this.visit('/').then(() => {
         let homeRoute = this.applicationInstance.lookup('route:home');
@@ -253,7 +253,7 @@ moduleFor(
         this.route('home', { path: '/' });
       });
 
-      this.addTemplate('home', '<p>home: {{myValue}}</p>');
+      this.addTemplate('home', '<p>home: {{this.myValue}}</p>');
 
       this.add(
         'route:home',
@@ -313,7 +313,10 @@ moduleFor(
         })
       );
 
-      this.addTemplate('home', '<ul>{{#each hours as |entry|}}<li>{{entry}}</li>{{/each}}</ul>');
+      this.addTemplate(
+        'home',
+        '<ul>{{#each this.hours as |entry|}}<li>{{entry}}</li>{{/each}}</ul>'
+      );
 
       return this.visit('/').then(() => {
         let text = this.$('ul li:nth-child(3)').text();
@@ -384,7 +387,10 @@ moduleFor(
         })
       );
 
-      this.addTemplate('home', '<ul>{{#each hours as |entry|}}<li>{{entry}}</li>{{/each}}</ul>');
+      this.addTemplate(
+        'home',
+        '<ul>{{#each this.hours as |entry|}}<li>{{entry}}</li>{{/each}}</ul>'
+      );
 
       return this.visit('/').then(() => {
         let text = this.$('ul li:nth-child(3)').text();
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index cc84d2cf095..a5cf01d99a1 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -744,7 +744,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'application',
-        '<button id="test-button" {{action \'increment\'}}>Increment</button><span id="test-value">{{foo}}</span>{{outlet}}'
+        '<button id="test-button" {{action \'increment\'}}>Increment</button><span id="test-value">{{this.foo}}</span>{{outlet}}'
       );
 
       this.setSingleQPController('application', 'foo', 1, {
@@ -1447,7 +1447,7 @@ moduleFor(
 
       this.addTemplate(
         'home',
-        "{{link-to 'Home' 'home' (query-params foo=nullValue) id='null-link'}}{{link-to 'Home' 'home' (query-params foo=undefinedValue) id='undefined-link'}}"
+        "{{link-to 'Home' 'home' (query-params foo=this.nullValue) id='null-link'}}{{link-to 'Home' 'home' (query-params foo=this.undefinedValue) id='undefined-link'}}"
       );
 
       this.router.map(function () {
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index fa49a5028df..37f7c12c8f6 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -334,7 +334,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each articles as |a|}} 1{{link-to 'Article' 'article' a id=a.id}} {{/each}} {{outlet}}"
+        "{{#each this.articles as |a|}} 1{{link-to 'Article' 'article' a id=a.id}} {{/each}} {{outlet}}"
       );
     }
 
@@ -440,7 +440,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each articles as |a|}} {{link-to 'Article' 'site.article' a id=a.id}} {{/each}} {{outlet}}"
+        "{{#each this.articles as |a|}} {{link-to 'Article' 'site.article' a id=a.id}} {{/each}} {{outlet}}"
       );
     }
 
@@ -591,7 +591,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each allSitesAllArticles as |a|}} {{#link-to 'site.article' a.site_id a.article_id id=a.id}}Article [{{a.site_id}}] [{{a.article_id}}]{{/link-to}} {{/each}} {{outlet}}"
+        "{{#each this.allSitesAllArticles as |a|}} {{#link-to 'site.article' a.site_id a.article_id id=a.id}}Article [{{a.site_id}}] [{{a.article_id}}]{{/link-to}} {{/each}} {{outlet}}"
       );
     }
 
diff --git a/packages/ember/tests/routing/query_params_test/shared_state_test.js b/packages/ember/tests/routing/query_params_test/shared_state_test.js
index d111cffc42f..0b09bc31310 100644
--- a/packages/ember/tests/routing/query_params_test/shared_state_test.js
+++ b/packages/ember/tests/routing/query_params_test/shared_state_test.js
@@ -42,7 +42,7 @@ moduleFor(
       this.addTemplate('application', `{{link-to 'Home' 'home' }} <div> {{outlet}} </div>`);
       this.addTemplate(
         'home',
-        `{{link-to 'Dashboard' 'dashboard' }}{{input type="checkbox" id='filters-checkbox' checked=(mut filters.shared) }}`
+        `{{link-to 'Dashboard' 'dashboard' }}{{input type="checkbox" id='filters-checkbox' checked=(mut this.filters.shared) }}`
       );
       this.addTemplate('dashboard', `{{link-to 'Home' 'home' }}`);
     }
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index a89cf13b808..dcba7155853 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -130,7 +130,7 @@ moduleFor(
 
       this.addComponent('current-url', {
         ComponentClass: CurrenURLComponent,
-        template: '{{currentURL}}-{{currentRouteName}}-{{currentRoute.name}}',
+        template: '{{this.currentURL}}-{{this.currentRouteName}}-{{this.currentRoute.name}}',
       });
     }
 
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 84b284af7d9..3caef796bde 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -311,7 +311,7 @@ moduleFor(
       this.addTemplate('application', "<h1>Home</h1><div class='main'>{{outlet}}</div>");
       this.addTemplate('foo', "<div class='middle'>{{outlet}}</div>");
       this.addTemplate('bar', "<div class='bottom'>{{outlet}}</div>");
-      this.addTemplate('bar.baz', '<p>{{name}}Bottom!</p>');
+      this.addTemplate('bar.baz', '<p>{{this.name}}Bottom!</p>');
 
       this.router.map(function () {
         this.route('foo', { path: '/top' }, function () {
@@ -637,7 +637,7 @@ moduleFor(
 
       this.add('controller:shared', Controller.extend());
 
-      this.addTemplate('shared', '<p>{{message}}{{x-input}}</p>');
+      this.addTemplate('shared', '<p>{{this.message}}{{x-input}}</p>');
 
       let rootElement = document.getElementById('qunit-fixture');
       return this.visit('/first')
@@ -1005,7 +1005,7 @@ moduleFor(
     }
 
     ['@test {{outlet}} works when created after initial render'](assert) {
-      this.addTemplate('sample', 'Hi{{#if showTheThing}}{{outlet}}{{/if}}Bye');
+      this.addTemplate('sample', 'Hi{{#if this.showTheThing}}{{outlet}}{{/if}}Bye');
       this.addTemplate('sample.inner', 'Yay');
       this.addTemplate('sample.inner2', 'Boo');
       this.router.map(function () {
@@ -1354,7 +1354,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        '{{#if showFirst}}{{my-component}}{{else}}{{other-component}}{{/if}}'
+        '{{#if this.showFirst}}{{my-component}}{{else}}{{other-component}}{{/if}}'
       );
 
       let myComponentCounter = 0;

From 7252371c0b2d5145a88d907c38d31f09e8495eb3 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 29 Jan 2021 14:14:42 -0800
Subject: [PATCH 0327/1405] fix lint

---
 .../@ember/-internals/glimmer/lib/environment.ts  |  2 --
 .../tests/integration/application/engine-test.js  |  5 ++++-
 .../application/helper-registration-test.js       |  5 ++++-
 .../components/angle-bracket-invocation-test.js   | 15 ++++++++++++---
 .../tests/integration/components/append-test.js   |  3 ++-
 .../components/curly-components-test.js           |  5 ++++-
 .../integration/components/error-handling-test.js |  8 ++++++--
 .../tests/integration/components/utils-test.js    |  3 ++-
 .../glimmer/tests/integration/helpers/loc-test.js | 15 +++++++++------
 .../tests/integration/syntax/each-in-test.js      |  4 +++-
 .../tests/system/bootstrap-test.js                |  3 ++-
 11 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 70e09876215..bd47e5f7929 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -17,8 +17,6 @@ import toBool from './utils/to-bool';
 
 // Setup global context
 
-window._deprecationMap = {};
-
 setGlobalContext({
   scheduleRevalidate() {
     backburner.ensureInstance();
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index f842c27ca98..8c719b1878b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -255,7 +255,10 @@ moduleFor(
                 contextType: 'Engine',
               })
             );
-            this.register('template:application', compile('Engine {{foo-bar wat=this.contextType}}'));
+            this.register(
+              'template:application',
+              compile('Engine {{foo-bar wat=this.contextType}}')
+            );
           },
         })
       );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
index 4afc9828bf3..deb0e45f838 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
@@ -22,7 +22,10 @@ moduleFor(
     }
 
     ['@test Bound helpers registered on the container can be late-invoked'](assert) {
-      this.addTemplate('application', `<div id='wrapper'>{{x-reverse}} {{x-reverse this.foo}}</div>`);
+      this.addTemplate(
+        'application',
+        `<div id='wrapper'>{{x-reverse}} {{x-reverse this.foo}}</div>`
+      );
 
       this.add(
         'controller:application',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index c12dc2e57e6..883dc285295 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -728,7 +728,10 @@ moduleFor(
         template: '<div ...attributes>hello</div>',
       });
 
-      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', {
+        foo: 'foo',
+        bar: 'bar',
+      });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
@@ -781,7 +784,10 @@ moduleFor(
         template: '<div data-derp={{this.localProp}} ...attributes>hello</div>',
       });
 
-      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', {
+        foo: 'foo',
+        bar: 'bar',
+      });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
@@ -1055,7 +1061,10 @@ moduleFor(
         template: '<div ...attributes>hello</div><p ...attributes>world</p>',
       });
 
-      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', { foo: 'foo', bar: 'bar' });
+      this.render('<FooBar data-foo={{this.foo}} data-bar={{this.bar}} />', {
+        foo: 'foo',
+        bar: 'bar',
+      });
 
       this.assertElement(this.firstChild, {
         tagName: 'div',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
index dc9e8f58290..3534464a556 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -294,7 +294,8 @@ class AbstractAppendTest extends RenderingTestCase {
         },
       }),
 
-      template: '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
+      template:
+        '[parent: {{this.foo}}]{{#x-child bar=this.foo}}[yielded: {{this.foo}}]{{/x-child}}',
     });
 
     this.registerComponent('x-child', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 4fce8afba94..c498dfd4495 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3819,7 +3819,10 @@ moduleFor(
         template: '{{this.baz}}',
       });
 
-      this.render('{{#if this.cond}}{{foo-bar baz=this.value}}{{/if}}', { cond: true, value: 'hello' });
+      this.render('{{#if this.cond}}{{foo-bar baz=this.value}}{{/if}}', {
+        cond: true,
+        value: 'hello',
+      });
 
       this.assertComponentElement(this.firstChild, { content: 'hello' });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
index e29a27f44b4..0e7e2cb78a1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
@@ -28,7 +28,9 @@ moduleFor(
       });
 
       assert.throws(() => {
-        this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+        this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', {
+          switch: true,
+        });
       }, /silly mistake in init/);
 
       assert.equal(
@@ -123,7 +125,9 @@ moduleFor(
       });
 
       assert.throws(() => {
-        this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+        this.render('{{#if this.switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', {
+          switch: true,
+        });
       }, /silly mistake/);
 
       assert.equal(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
index 03bcbdaf99e..af536c1d7b7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/utils-test.js
@@ -22,7 +22,8 @@ moduleFor(
           tagName: '',
         }),
 
-        template: '<div id="{{this.id}}">[{{this.id}}] {{#if this.isShowing}}{{yield}}{{/if}}</div>',
+        template:
+          '<div id="{{this.id}}">[{{this.id}}] {{#if this.isShowing}}{{yield}}{{/if}}</div>',
       });
 
       this.addComponent('x-toggle', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
index 247020114b0..b5536b06c82 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
@@ -76,12 +76,15 @@ moduleFor(
 
     ['@test it updates when nested bound params change']() {
       expectDeprecation(() => {
-        this.render(`{{loc this.greetings.simple}} - {{loc this.greetings.personal 'Mr. Pitkin'}}`, {
-          greetings: {
-            simple: 'Hello Friend',
-            personal: 'Hello',
-          },
-        });
+        this.render(
+          `{{loc this.greetings.simple}} - {{loc this.greetings.personal 'Mr. Pitkin'}}`,
+          {
+            greetings: {
+              simple: 'Hello Friend',
+              personal: 'Hello',
+            },
+          }
+        );
       }, /loc is deprecated/);
       this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index 5b66875c135..944116e7242 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -267,7 +267,9 @@ class EachInTest extends AbstractEachInTest {
   ['@test keying off of `undefined` does not render']() {
     this.makeHash({});
 
-    this.render(`{{#each-in this.hash as |key value|}}{{key}}: {{value.baz}}{{else}}Empty!{{/each-in}}`);
+    this.render(
+      `{{#each-in this.hash as |key value|}}{{key}}: {{value.baz}}{{else}}Empty!{{/each-in}}`
+    );
 
     this.assertText('Empty!');
 
diff --git a/packages/ember-template-compiler/tests/system/bootstrap-test.js b/packages/ember-template-compiler/tests/system/bootstrap-test.js
index 67e45f0e373..96cac8c12fc 100644
--- a/packages/ember-template-compiler/tests/system/bootstrap-test.js
+++ b/packages/ember-template-compiler/tests/system/bootstrap-test.js
@@ -77,7 +77,8 @@ moduleFor(
     }
 
     ['@test template without data-template-name or id should default to application'](assert) {
-      fixture.innerHTML = '<script type="text/x-handlebars">{{this.firstName}} takes {{this.drug}}</script>';
+      fixture.innerHTML =
+        '<script type="text/x-handlebars">{{this.firstName}} takes {{this.drug}}</script>';
 
       checkTemplate('application', assert);
     }

From 74e0f60d573a6981ccf5aed2f36372ff46035ad6 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Sat, 30 Jan 2021 00:46:22 +0000
Subject: [PATCH 0328/1405] add url for with helper deprecation

---
 packages/ember-template-compiler/lib/plugins/deprecate-with.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
index f4452652057..1420b72d9cc 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
@@ -109,6 +109,7 @@ export default function deprecateWith(env: EmberASTPluginEnvironment): ASTPlugin
           id: 'ember-glimmer.with-syntax',
           until: '4.0.0',
           for: 'ember-source',
+          url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-glimmer-with-syntax',
           since: {
             enabled: '3.26.0-beta.1',
           },

From 7aa82336dca3dbee789cf54115e31d797fc51809 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sat, 30 Jan 2021 18:29:50 +0100
Subject: [PATCH 0329/1405] Remove non-existing re-export from helper-addon
 blueprint

The blueprint for an addon's `app/helpers/foo.js` contains a re-export of a named export of `addon/helpers/foo.js` which does not exist, as it only has a default export.

FWIW, Embroider is constantly complaining about this (rightly).
---
 blueprints/helper-addon/files/__root__/__path__/__name__.js | 2 +-
 node-tests/fixtures/helper/helper-addon.js                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprints/helper-addon/files/__root__/__path__/__name__.js b/blueprints/helper-addon/files/__root__/__path__/__name__.js
index a34b84552a1..83aac86a6a1 100644
--- a/blueprints/helper-addon/files/__root__/__path__/__name__.js
+++ b/blueprints/helper-addon/files/__root__/__path__/__name__.js
@@ -1 +1 @@
-export { default, <%= camelizedModuleName %> } from '<%= modulePath %>';
+export { default } from '<%= modulePath %>';
diff --git a/node-tests/fixtures/helper/helper-addon.js b/node-tests/fixtures/helper/helper-addon.js
index 0d7257ad656..59f5ca352ea 100644
--- a/node-tests/fixtures/helper/helper-addon.js
+++ b/node-tests/fixtures/helper/helper-addon.js
@@ -1 +1 @@
-export { default, fooBarBaz } from 'my-addon/helpers/foo/bar-baz';
+export { default } from 'my-addon/helpers/foo/bar-baz';

From 9e51960a0e0126f5007ef2e1af06dceac9699bcd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 10:19:18 +0000
Subject: [PATCH 0330/1405] Bump jquery from 3.5.0 to 3.5.1

Bumps [jquery](https://github.com/jquery/jquery) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.5.0...3.5.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0107945faed..a90b951c047 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ember-cli-version-checker": "^5.1.1",
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.12.0",
-    "jquery": "^3.5.0",
+    "jquery": "^3.5.1",
     "resolve": "^1.17.0",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1"
diff --git a/yarn.lock b/yarn.lock
index 9eafddf6642..212755386a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6602,10 +6602,10 @@ jmespath@0.15.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
   integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
 
-jquery@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
-  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
+jquery@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
+  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
 js-reporters@1.2.1:
   version "1.2.1"

From e77cf5a643198cc602ab73b28061306ace8e5346 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 10:36:14 +0000
Subject: [PATCH 0331/1405] Bump broccoli-babel-transpiler from 7.4.0 to 7.8.0

Bumps [broccoli-babel-transpiler](https://github.com/babel/broccoli-babel-transpiler) from 7.4.0 to 7.8.0.
- [Release notes](https://github.com/babel/broccoli-babel-transpiler/releases)
- [Changelog](https://github.com/babel/broccoli-babel-transpiler/blob/v7.8.0/CHANGELOG.md)
- [Commits](https://github.com/babel/broccoli-babel-transpiler/compare/v7.4.0...v7.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 90 ++--------------------------------------------------
 2 files changed, 3 insertions(+), 89 deletions(-)

diff --git a/package.json b/package.json
index 0107945faed..0730a3eca8c 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "aws-sdk": "^2.686.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.6.0",
-    "broccoli-babel-transpiler": "^7.4.0",
+    "broccoli-babel-transpiler": "^7.8.0",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-persistent-filter": "^2.3.1",
     "broccoli-plugin": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 9eafddf6642..c9713e1b008 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -30,7 +30,7 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.12.0":
+"@babel/core@^7.12.0", "@babel/core@^7.3.4", "@babel/core@^7.4.3":
   version "7.12.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
   integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
@@ -52,28 +52,6 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.3.4", "@babel/core@^7.4.3", "@babel/core@^7.8.3":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.6.tgz#d9aa1f580abf3b2286ef40b6904d390904c63376"
-  integrity sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.6"
-    "@babel/parser" "^7.9.6"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.12.1", "@babel/generator@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
@@ -93,16 +71,6 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
-  integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
-  dependencies:
-    "@babel/types" "^7.9.6"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
 "@babel/helper-annotate-as-pure@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
@@ -490,15 +458,6 @@
     "@babel/traverse" "^7.12.5"
     "@babel/types" "^7.12.5"
 
-"@babel/helpers@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
-  integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.6"
-    "@babel/types" "^7.9.6"
-
 "@babel/highlight@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
@@ -527,11 +486,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
   integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
 
-"@babel/parser@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
-  integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
-
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
@@ -1362,14 +1316,6 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/polyfill@^7.8.3":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.8.7.tgz#151ec24c7135481336168c3bd8b8bf0cf91c032f"
-  integrity sha512-LeSfP9bNZH2UOZgcGcZ0PIHUt1ZuHub1L3CVmEyqLxCeDLm4C5Gi8jRH8ZX2PNpDhQCo0z6y/+DIs2JlliXW8w==
-  dependencies:
-    core-js "^2.6.5"
-    regenerator-runtime "^0.13.4"
-
 "@babel/preset-env@^7.12.0":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
@@ -1581,21 +1527,6 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/traverse@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.6.tgz#5540d7577697bf619cc57b92aa0f1c231a94f442"
-  integrity sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.6"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.6"
-    "@babel/types" "^7.9.6"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
 "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5":
   version "7.12.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
@@ -2754,24 +2685,7 @@ broccoli-amd-funnel@^2.0.1:
     broccoli-plugin "^1.3.0"
     symlink-or-copy "^1.2.0"
 
-broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.4.0.tgz#f3069f0f77e8017aa17e1e757dfb4a30de044182"
-  integrity sha512-DzPXQr1C+zOgzXG40wqPjtjSSa6wRKb+Ls45Qtq7Pn+GxL3/jIvQOBZi0/irZ5dlYVbRMEZiUnaIBIOha2ygIw==
-  dependencies:
-    "@babel/core" "^7.8.3"
-    "@babel/polyfill" "^7.8.3"
-    broccoli-funnel "^2.0.2"
-    broccoli-merge-trees "^3.0.2"
-    broccoli-persistent-filter "^2.2.1"
-    clone "^2.1.2"
-    hash-for-dep "^1.4.7"
-    heimdalljs-logger "^0.1.9"
-    json-stable-stringify "^1.0.1"
-    rsvp "^4.8.4"
-    workerpool "^3.1.1"
-
-broccoli-babel-transpiler@^7.8.0:
+broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.8.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
   integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==

From d635e024a360c0fa676c8e633613ce5af5f7c767 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 28 Jan 2021 10:25:51 -0800
Subject: [PATCH 0332/1405] [BUGFIX] Update VM, fix component name
 preprocessing

---
 lib/index.js                                  |   2 +
 package.json                                  |  25 +-
 .../-internals/glimmer/lib/environment.ts     |  63 ++--
 yarn.lock                                     | 268 +++++++++---------
 4 files changed, 200 insertions(+), 158 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5e747132c6c..14d4ce4d617 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -9,6 +9,7 @@ const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
 const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
+const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -150,6 +151,7 @@ module.exports = {
         plugins: [
           babelHelperPlugin,
           buildDebugMacroPlugin(!isProduction),
+          ...vmBabelPlugins({ isDebug: !isProduction }),
           [
             require.resolve('@babel/plugin-transform-block-scoping'),
             { throwIfClosureRequired: true },
diff --git a/package.json b/package.json
index 0107945faed..1ca10dd658c 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
+    "@glimmer/vm-babel-plugins": "0.74.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -74,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.73.2",
+    "@glimmer/compiler": "0.74.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.73.2",
-    "@glimmer/interfaces": "0.73.2",
-    "@glimmer/manager": "0.73.2",
-    "@glimmer/destroyable": "0.73.2",
-    "@glimmer/owner": "0.73.2",
-    "@glimmer/node": "0.73.2",
-    "@glimmer/opcode-compiler": "0.73.2",
-    "@glimmer/program": "0.73.2",
-    "@glimmer/reference": "0.73.2",
-    "@glimmer/runtime": "0.73.2",
-    "@glimmer/validator": "0.73.2",
+    "@glimmer/global-context": "0.74.0",
+    "@glimmer/interfaces": "0.74.0",
+    "@glimmer/manager": "0.74.0",
+    "@glimmer/destroyable": "0.74.0",
+    "@glimmer/owner": "0.74.0",
+    "@glimmer/node": "0.74.0",
+    "@glimmer/opcode-compiler": "0.74.0",
+    "@glimmer/program": "0.74.0",
+    "@glimmer/reference": "0.74.0",
+    "@glimmer/runtime": "0.74.0",
+    "@glimmer/validator": "0.74.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index bd47e5f7929..b4f1aa4431d 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -4,6 +4,7 @@ import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { assert, deprecate, warn } from '@ember/debug';
+import { DeprecationOptions } from '@ember/debug/lib/deprecate';
 import { backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
@@ -50,29 +51,36 @@ setGlobalContext({
       { id: 'ember-htmlbars.style-xss-warning' }
     );
   },
-});
 
-if (DEBUG) {
-  setTrackingTransactionEnv!({
-    assert(message) {
-      assert(message, false);
-    },
+  assert(test: unknown, msg: string, options?: { id: string }) {
+    if (DEBUG) {
+      let id = options?.id;
 
-    deprecate(message) {
-      deprecate(message, false, {
-        id: 'autotracking.mutation-after-consumption',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.21.0',
-        },
-      });
-    },
+      let override = VM_ASSERTION_OVERRIDES.filter((o) => o.id === id)[0];
+
+      assert(override?.message ?? msg, test);
+    }
+  },
+
+  deprecate(msg: string, test: unknown, options: { id: string }) {
+    if (DEBUG) {
+      let { id } = options;
+
+      let override = VM_DEPRECATION_OVERRIDES.filter((o) => o.id === id)[0];
+
+      if (!override) throw new Error(`deprecation override for ${id} not found`);
+
+      deprecate(override.message ?? msg, Boolean(test), override);
+    }
+  },
+});
 
+if (DEBUG) {
+  setTrackingTransactionEnv?.({
     debugMessage(obj, keyName) {
       let dirtyString = keyName
-        ? `\`${keyName}\` on \`${getDebugName!(obj)}\``
-        : `\`${getDebugName!(obj)}\``;
+        ? `\`${keyName}\` on \`${getDebugName?.(obj)}\``
+        : `\`${getDebugName?.(obj)}\``;
 
       return `You attempted to update ${dirtyString}, but it had already been used previously in the same computation.  Attempting to update a value after using it in a computation can cause logical errors, infinite revalidation bugs, and performance issues, and is not supported.`;
     },
@@ -81,6 +89,23 @@ if (DEBUG) {
 
 ///////////
 
+// VM Assertion/Deprecation overrides
+
+const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & { message?: string })[] = [
+  {
+    id: 'autotracking.mutation-after-consumption',
+    until: '4.0.0',
+    for: 'ember-source',
+    since: {
+      enabled: '3.21.0',
+    },
+  },
+];
+
+const VM_ASSERTION_OVERRIDES: { id: string; message: string }[] = [];
+
+///////////
+
 // Define environment delegate
 
 export class EmberEnvironmentDelegate implements EnvironmentDelegate {
@@ -88,5 +113,5 @@ export class EmberEnvironmentDelegate implements EnvironmentDelegate {
 
   constructor(public owner: Owner, public isInteractive: boolean) {}
 
-  onTransactionCommit() {}
+  onTransactionCommit(): void {}
 }
diff --git a/yarn.lock b/yarn.lock
index 9eafddf6642..2bf5b809886 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1657,187 +1657,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.73.2.tgz#1fb64b8e0002eca3d994a6ceb64fff4fa640f6e9"
-  integrity sha512-0snZO8VGtp0T41NK+zGyE/KSn/fgSu0aDNKuEoKULfAWNE4evgHdGkv4YtClnRimmE9W6KaTyVWEmLfPdRmSWg==
-  dependencies:
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/syntax" "0.73.2"
-    "@glimmer/util" "0.73.2"
-    "@glimmer/wire-format" "0.73.2"
+"@glimmer/compiler@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.74.0.tgz#5490a6c7f7b060ca1774a5f82a8c04f594ee9e77"
+  integrity sha512-D57vPGEeLS+mfmsCqyJ+7ywUFPIOp8PeNmk++Bg+OGFxu3sGYc/IKNNarTfuos14KKs1we4QLn9NND/vk2hu4g==
+  dependencies:
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/syntax" "0.74.0"
+    "@glimmer/util" "0.74.0"
+    "@glimmer/wire-format" "0.74.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.73.2.tgz#e0b97d21ef0452efb20adb170104cf526aa7e59d"
-  integrity sha512-9MZSB1G4PRsUh6hlO+gE2cSk9W84d1vz1smDqFCRwxzQchqpO7g8HPJd9vJno2Ke17PbyxkZGK0F94CLib8fXw==
+"@glimmer/destroyable@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.74.0.tgz#0dc76beba702ade91aee4ff53a2469c995175c48"
+  integrity sha512-cfDHILKRt3skTz13irox7pc5ofu1g0XiPqOr+PgztGFZ0RMusSQHMlG/jSXViZuER5j44CBkuwP15E3M36mz8w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.2"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/util" "0.73.2"
+    "@glimmer/global-context" "0.74.0"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/util" "0.74.0"
 
-"@glimmer/encoder@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.73.2.tgz#40cf82779b84d3cf28c2e21938ceed9e9f999536"
-  integrity sha512-De+yYyemfm2q9E6C6oRQWaLOP/Wc1+7YZe9Ab+BYwLjWNryRlfqqCqSrp+88lskx7iXxmInbmvdBs/Ep5tv6vA==
+"@glimmer/encoder@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.74.0.tgz#799014207feb6edea4d42f64811d0a2222664da2"
+  integrity sha512-XFWC7yO2wybOlO4i/8ptqolktpCsnqgSxZ6X9AV17Djh0MhFK4nnHw3xqrUA41NdZmHL+U4FRSBrqy0taeYBbw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/vm" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/vm" "0.74.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.73.2.tgz#34fc51dc5c320f067b912478e077fb3f55ff38f2"
-  integrity sha512-a/q6E27JMvF5oqKRYG5RFoTH0PrHaLp/Ix6W5OZ1TqvpiiuEgd4Olb55Ehxw2jH+wvmQHQtTxFKDyv0iDJYZ1Q==
+"@glimmer/global-context@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.74.0.tgz#af7135fba958b38d0505b0e22af1d07c215ee68c"
+  integrity sha512-cR7gUiEeGuOJenVYoM3uHLIwIg+L0elvuBjeuq2y+vksaiMJy3f0LxEM3RsgPAe9AouphOF7zFec9iSxH/ploA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.73.2.tgz#03c769208bf705760800f3f64774b074bf04f738"
-  integrity sha512-SjV0/TtFiv+Sxl3WJ2I5oR6hH+EabTfk3qvllU8WAYBqf6LnNPSMjaFv2Fucn7bIvOqZ8zHl36q6HboAychD/A==
+"@glimmer/interfaces@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.74.0.tgz#b0d79068ee085beacf3c96593d6d69f1ba4218df"
+  integrity sha512-MBmRJ9w6hnek39+YmCQik2MTqzWJkPGtBdQSg3j+qj7J4noiTP2v6H8SAuk+eTa1zuNRd875lIoaFroiPg6EqQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.73.2.tgz#2200efc8bdd5224cdb98662a1244016bd2aeca99"
-  integrity sha512-37Vbmv/wVKkPvj9/vw9qmIuJRecDkjOkyblUvLFZ7ePp/+pAH3/7Nxdv17QuH77EOa015pAe8vhTkHTRk+Oi6A==
+"@glimmer/low-level@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.74.0.tgz#8a93799146acd7eb40c8fa6abe789d44a7311f3d"
+  integrity sha512-xST8zoW9RFOQc2Lx5bezIKZQ64jPAuyDbzbTnEPh+VnXDrXU8Gt0reqkfs67JM2R+usbZOy7zDpnzGoPeI5YVw==
 
-"@glimmer/manager@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.73.2.tgz#26c20824f766d71aa33d5bb7c940b827dd8d0ed5"
-  integrity sha512-OP0MC+neeD6dZZ8SrNT0LqS8rKCWjvrUkP24G573LIOXkwdsUhzU7nYnHovk9CQ64mEBlAbxAb1nCi20eWA3Lw==
+"@glimmer/manager@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.74.0.tgz#8da1b55aecb9fa19c6d8eba9b55a05d33eb97cb4"
+  integrity sha512-3XxWD07pN8HvrPiZJxk7CSjl6f+heMg1q+SUx8qr17aMPkHztZi66KvxgXKnczN5lXOC3Qm96q8x+oRh5867fg==
   dependencies:
-    "@glimmer/destroyable" "0.73.2"
+    "@glimmer/destroyable" "0.74.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/reference" "0.73.2"
-    "@glimmer/util" "0.73.2"
-    "@glimmer/validator" "0.73.2"
-
-"@glimmer/node@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.73.2.tgz#d2bbee79f05ebd16b7c999b6d7594078c566ea61"
-  integrity sha512-bZNAYDhTAPBgmZAqmUWDNRusOT8BtBa2CixuEy3e99gu1BrKna3v7sB2DzAjPxU/QwUOgQHF+hbPwLIUqC3ZSA==
-  dependencies:
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/runtime" "0.73.2"
-    "@glimmer/util" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/reference" "0.74.0"
+    "@glimmer/util" "0.74.0"
+    "@glimmer/validator" "0.74.0"
+
+"@glimmer/node@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.74.0.tgz#a208fd4bed2ba4949c97e6f44a3ac01912e3dfd5"
+  integrity sha512-+eRFfcoxECARO0YcGX6bRPuwWhcxsy4+bOFlAw4j9jWfs6HD5nnbrM44kyEOLkziz5mXa/UvqLoTBkvVlcVdEg==
+  dependencies:
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/runtime" "0.74.0"
+    "@glimmer/util" "0.74.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.73.2.tgz#7c3517be060eb8823e8d8ffbcc1e3cf76b195b8a"
-  integrity sha512-md1NEsRs77zqsqMOHNPPIBuIgbEQe1TBsA1UOWmDAt4sdYJTFJwMroBQVmLdOv9of/nlrcXsLHz/utXTblbEdQ==
+"@glimmer/opcode-compiler@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.74.0.tgz#8986895827c81db36d7b96d413a667629bccf824"
+  integrity sha512-9A3LMqJhYFWUWi3WjerPDmr9Ghd1eAku0KtlldIisj7pTUckxuosUXsEPuDbX9xv1g9Sp0rFyf2tmQDwQplCOQ==
   dependencies:
-    "@glimmer/encoder" "0.73.2"
+    "@glimmer/encoder" "0.74.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/reference" "0.73.2"
-    "@glimmer/util" "0.73.2"
-    "@glimmer/vm" "0.73.2"
-    "@glimmer/wire-format" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/reference" "0.74.0"
+    "@glimmer/util" "0.74.0"
+    "@glimmer/vm" "0.74.0"
+    "@glimmer/wire-format" "0.74.0"
 
-"@glimmer/owner@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.73.2.tgz#ab10c134bff38e3db475c072ce695f9886b0d989"
-  integrity sha512-Gj2fdw5Od99kyVQIALT2sXEsNY+upJXvJpXPU0JwDXdRoq0n6t3mnG2dL5vXqS0MnUJs8s09XloTLi65lZILSQ==
+"@glimmer/owner@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.74.0.tgz#55aeeda766340e8223373d5f510afbc5825ddb45"
+  integrity sha512-2SVYzcKrQ4iTv0P1ZIbxgIs3DOSVISt6gK3wKdOED6MMH6ORCB8H6ajjYgEChdHb0crhClE3U+3QcW+tkuQYEA==
   dependencies:
-    "@glimmer/util" "0.73.2"
+    "@glimmer/util" "0.74.0"
 
-"@glimmer/program@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.73.2.tgz#72929423a5e65239dae56c7158d6b51be94f0008"
-  integrity sha512-pGMG8vW262+Zl6nlmAHPpEQXNWKfapJ5l1WMNrtl7PL4Hbhd/oYiXGJnd8aBRsYeFb0Jii/a6d8dahkS6+We9A==
+"@glimmer/program@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.74.0.tgz#c64c5923f605f9c0fcc65210c0539a4897596200"
+  integrity sha512-Ov+zSu0IiPp0SigTpVQrg8jW2XQp/RD/59eAc5tUq0Byp7jRU6Y5oXHAlaiAU0NksWpWUudHW48PjFhCA0nqog==
   dependencies:
-    "@glimmer/encoder" "0.73.2"
+    "@glimmer/encoder" "0.74.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/manager" "0.73.2"
-    "@glimmer/opcode-compiler" "0.73.2"
-    "@glimmer/util" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/manager" "0.74.0"
+    "@glimmer/opcode-compiler" "0.74.0"
+    "@glimmer/util" "0.74.0"
 
-"@glimmer/reference@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.73.2.tgz#85bbf60e5491b93fcc2f4d883fd277ae9f0d5ed0"
-  integrity sha512-v/arQjBPvMpbVwGuCXCr7rxDteqIhnu91cu2K/7QcqmodzGC7ZhoVKWHtak3A11U1/1/6F2DznK8yHPKC/gEwg==
+"@glimmer/reference@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.74.0.tgz#5f14762043cfdc41ed511fca2f40ace19482de63"
+  integrity sha512-cV9+JCLXMm5RK8jSVTlsUPjFB5JwCxskFJshOKiIv11NhrYzJCzQ1vvilazfDn8xpEcQngDKr+08egYVC9aQAQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.2"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/util" "0.73.2"
-    "@glimmer/validator" "0.73.2"
+    "@glimmer/global-context" "0.74.0"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/util" "0.74.0"
+    "@glimmer/validator" "0.74.0"
 
-"@glimmer/runtime@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.73.2.tgz#fb93a2d86f58febec21f88d05fea63e05d4aea75"
-  integrity sha512-Cp7JFlRGnPnbh/0MLYGh1aV639a0UxP+lsca5w6qpUEKo+HvD3V2BppqE8Wwc9XKU0E2nSYQ9il4UaSpikNAhA==
+"@glimmer/runtime@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.74.0.tgz#590a498a378372f6465cbbed9d0174a44e649b87"
+  integrity sha512-qUecT6RdSXv/7NMLczpPodB+TT9Pr0gBX7/y4TPI/SAqYglBXTJi2UF0kUbZIqcN8Oy8BvM3833SnBRU11acnQ==
   dependencies:
-    "@glimmer/destroyable" "0.73.2"
+    "@glimmer/destroyable" "0.74.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.73.2"
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/low-level" "0.73.2"
-    "@glimmer/owner" "0.73.2"
-    "@glimmer/program" "0.73.2"
-    "@glimmer/reference" "0.73.2"
-    "@glimmer/util" "0.73.2"
-    "@glimmer/validator" "0.73.2"
-    "@glimmer/vm" "0.73.2"
-    "@glimmer/wire-format" "0.73.2"
+    "@glimmer/global-context" "0.74.0"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/low-level" "0.74.0"
+    "@glimmer/owner" "0.74.0"
+    "@glimmer/program" "0.74.0"
+    "@glimmer/reference" "0.74.0"
+    "@glimmer/util" "0.74.0"
+    "@glimmer/validator" "0.74.0"
+    "@glimmer/vm" "0.74.0"
+    "@glimmer/wire-format" "0.74.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.73.2.tgz#76438633f26b3fccb86bd7d25390a901737aa530"
-  integrity sha512-neZvKpfJETtUxnZMdpmD9qi4E9WaKhnQt63H+0iHkz1APriIZM5rsq12oiG9MSCvEiF5iP3auwJMU22XKPtyeQ==
+"@glimmer/syntax@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.74.0.tgz#4f0536c1f07c2cacd0a53056c62403e2618860b8"
+  integrity sha512-kpDEnZHx+cxE1U/MimymavIH6a2PXF5klzIIEgge5dPEgi3pP+MkimyHMe5XDGBJId75CwgKV85cotJ8Pobg1g==
   dependencies:
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/util" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/util" "0.74.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.73.2.tgz#32ca1cec339a91f12f0359711f1a86fc1dcc13ca"
-  integrity sha512-ng726SZl/o2NKOLeHdqU9LTH4tP9FW7H1CveZGE8HMTgTDpXA7NCF7TVHqccOMmJNXqspkegtGQFGOLi10HArg==
+"@glimmer/util@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.74.0.tgz#bf0939db3e145d2107c35fcba1ce593982716d58"
+  integrity sha512-O6AI6vOgXOUCUZJOTQSc578Tkt9W0Qtft4wPwsxjdG6L2hm2gm+yxIJ1Mv+ZOphm2FP05dOfT18gjB5AOA4WbA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.73.2.tgz#63bdeecda9904ace565063eedc7916ffb86b2981"
-  integrity sha512-Bk4xLmZ6tj46yEZzeOqpPla7KHRQP2QiHLo941ieZawc8vP/tZSO0znvuA+SXbqpSjxPPyjMtsXfYiUK7rLfZg==
+"@glimmer/validator@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.74.0.tgz#43d7ae1bcbca086dacb9d33a3f8cfb2284821810"
+  integrity sha512-Z8gyFX4fRWzVEJlWs/iolRIepOAXlJs2zORpxFO6Htb2gKOfFy1rlxH+kXBtayXt7cE59xyr1aqrHHIMMMKz2Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.73.2"
+    "@glimmer/global-context" "0.74.0"
 
-"@glimmer/vm@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.73.2.tgz#d670ae43ada48b4c11ff51159540c6ccdcf83e41"
-  integrity sha512-WpG0WS9u9BAxP5LOT4fR0z8Gn5tiJgUjTfRMWPlHI5j7T6lIQMeY+gLiPN5CKCuGDSI/dZLnzMobTIEXR8ZcIw==
+"@glimmer/vm-babel-plugins@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.74.0.tgz#e68e41fae4c7785bab4473c017f3f8edc3ec5755"
+  integrity sha512-XSjbszdVdcMI5WyZ4dMMw1hac/o0GMyeQ26kfLp1nqhx1MEApCluBN6myhD50DcYyRke/O7PKSCwP6fCeud0Xw==
   dependencies:
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/util" "0.73.2"
+    babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/wire-format@0.73.2":
-  version "0.73.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.73.2.tgz#cb39577e63aee1d2ac1e856b15f251778209cf71"
-  integrity sha512-l8bG39JyqG4W6sQIQtEteBoDuvMFQAOfNTcQJcVyno6D+oMvOQgSH4BRblQPocdXzha1i/7yqICuew/Iz18ryA==
+"@glimmer/vm@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.74.0.tgz#ebf2ff78d29fba15223870aeefe84ba52363dea3"
+  integrity sha512-fokJ06gZOG3tx3mVlRXiq5RqO4xo5f9rgB9ElYre/5SmmeJrNAxw/foBHRI350xeMutyjkk26MMi1isZk3MmUw==
   dependencies:
-    "@glimmer/interfaces" "0.73.2"
-    "@glimmer/util" "0.73.2"
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/util" "0.74.0"
+
+"@glimmer/wire-format@0.74.0":
+  version "0.74.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.74.0.tgz#04ca04f6c32900ab0ccd377140dc7e05bbf2f0b3"
+  integrity sha512-72J0H4Ht6BjXEGqszWmD0mx+ZhL/UNt1a4sk5ORZZUs75sbzxXVHTYUleQCSSX0NlIqPhC1ebDNEIzDDbC+jeg==
+  dependencies:
+    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/util" "0.74.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"
@@ -2479,6 +2486,13 @@ babel-plugin-debug-macros@^0.3.3:
   dependencies:
     semver "^5.3.0"
 
+babel-plugin-debug-macros@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
+  integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
+  dependencies:
+    semver "^5.3.0"
+
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"

From 8959f88b8678fe03660eba203af9b58220a4c053 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 1 Feb 2021 16:19:57 -0500
Subject: [PATCH 0333/1405] Add v3.25.0-beta.4 to CHANGELOG

(cherry picked from commit 2dc1242d4ff7ba70cdcc1c4abebb4325e9bc973f)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18d33e5b8cb..40938b2ef62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.25.0-beta.4 (February 01, 2021)
+
+- [#19363](https://github.com/emberjs/ember.js/pull/19363) [BUGFIX] Update VM, fix component name preprocessing
+
 ### v3.25.0-beta.3 (January 25, 2021)
 
 - [#19351](https://github.com/emberjs/ember.js/pull/19351) [BUGFIX] Ensure locals do not clobber components of the same name

From 40d519547ee7ff43df9ea1c75d793a1fee1d5ad9 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 6 Dec 2020 12:40:56 -0800
Subject: [PATCH 0334/1405] [Bug]: route serialize does not extract param off
 proxy

---
 packages/@ember/-internals/routing/lib/system/route.ts     | 4 +++-
 .../@ember/-internals/routing/tests/system/route_test.js   | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index e035cac83b6..f19ae455eeb 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -18,7 +18,7 @@ import {
   Object as EmberObject,
   typeOf,
 } from '@ember/-internals/runtime';
-import { lookupDescriptor } from '@ember/-internals/utils';
+import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
 import { assert, deprecate, info, isTesting } from '@ember/debug';
 import { ROUTER_EVENTS } from '@ember/deprecated-features';
@@ -63,6 +63,8 @@ export function defaultSerialize(
       object[name] = get(model, name);
     } else if (/_id$/.test(name)) {
       object[name] = get(model, 'id');
+    } else if (isProxy(model)) {
+      object[name] = get(model, name);
     }
   } else {
     object = getProperties(model, params);
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 1a0d00fbf9c..537a57e0454 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -4,6 +4,7 @@ import Service, { inject as injectService } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import EmberRoute from '../../lib/system/route';
 import { defineProperty } from '../../../metal';
+import ObjectProxy from '@ember/-internals/runtime/lib/system/object_proxy';
 
 let route, routeOne, routeTwo, lookupHash;
 
@@ -280,6 +281,12 @@ moduleFor(
       assert.deepEqual(route.serialize(model, ['post_id']), { post_id: 3 }, 'serialized correctly');
     }
 
+    ['@test returns model.id if model is a Proxy'](assert) {
+      let model = ObjectProxy.create({ content: { id: 3 } });
+
+      assert.deepEqual(route.serialize(model, ['id']), { id: 3 }, 'serialized Proxy correctly');
+    }
+
     ['@test returns undefined if model is not set'](assert) {
       assert.equal(route.serialize(undefined, ['post_id']), undefined, 'serialized correctly');
     }

From 7b628fc857b5e04fc977e2f4ba00206581b50c02 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 2 Feb 2021 10:38:06 -0500
Subject: [PATCH 0335/1405] Deprecate implicit `this` property lookup fallback

Lands the deprecation proposed in
[emberjs/rfcs#308](https://github.com/emberjs/rfcs/blob/master/text/0308-deprecate-property-lookup-fallback.md):

The
[no-implicit-this](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-implicit-this.md)
template linting rule has been enabled for Ember applications by default
since around Ember 3.16 (included in the `octane` preset).

This PR will take that a step further and issue a deprecation for
templates that are still using `{{foo}}` to mean `{{this.foo}}`.

Note: It does provide for an easy way to temporarily disable the
deprecation messages (e.g. to reduce console output to hone in on other
issues). This is intended for sporadic usage while debugging **not** as
a way to mitigate the deprecation (the fallback behavior will be
removed in 4.0.0).
---
 package.json                                  |  26 +-
 .../@ember/-internals/environment/lib/env.ts  |  17 ++
 .../-internals/glimmer/lib/environment.ts     |  20 +-
 .../integration/application/engine-test.js    |  12 +-
 .../integration/application/rendering-test.js |  20 ++
 .../components/class-bindings-test.js         |  18 +-
 .../components/contextual-components-test.js  |   2 +-
 .../components/curly-components-test.js       |   4 +
 .../components/input-angle-test.js            |   2 +-
 .../components/input-curly-test.js            |   2 +-
 .../components/link-to/routing-curly-test.js  |   2 +-
 .../template-only-components-test.js          |  10 +-
 .../integration/helpers/custom-helper-test.js |   4 +
 .../tests/integration/syntax/each-test.js     |   8 +
 .../tests/integration/syntax/let-test.js      |  12 +
 .../tests/integration/syntax/with-test.js     |  12 +
 tests/docs/expected.js                        |   1 +
 yarn.lock                                     | 262 +++++++++---------
 18 files changed, 270 insertions(+), 164 deletions(-)

diff --git a/package.json b/package.json
index 2b838ee0532..34f798a5604 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.74.0",
+    "@glimmer/vm-babel-plugins": "0.74.1",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.74.0",
+    "@glimmer/compiler": "0.74.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.74.0",
-    "@glimmer/interfaces": "0.74.0",
-    "@glimmer/manager": "0.74.0",
-    "@glimmer/destroyable": "0.74.0",
-    "@glimmer/owner": "0.74.0",
-    "@glimmer/node": "0.74.0",
-    "@glimmer/opcode-compiler": "0.74.0",
-    "@glimmer/program": "0.74.0",
-    "@glimmer/reference": "0.74.0",
-    "@glimmer/runtime": "0.74.0",
-    "@glimmer/validator": "0.74.0",
+    "@glimmer/global-context": "0.74.1",
+    "@glimmer/interfaces": "0.74.1",
+    "@glimmer/manager": "0.74.1",
+    "@glimmer/destroyable": "0.74.1",
+    "@glimmer/owner": "0.74.1",
+    "@glimmer/node": "0.74.1",
+    "@glimmer/opcode-compiler": "0.74.1",
+    "@glimmer/program": "0.74.1",
+    "@glimmer/reference": "0.74.1",
+    "@glimmer/runtime": "0.74.1",
+    "@glimmer/validator": "0.74.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index 615aeccad45..5de3bf19eb8 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -172,6 +172,23 @@ export const ENV = {
    */
   _RERENDER_LOOP_LIMIT: 1000,
 
+  /**
+    Allows disabling the implicit this property fallback deprecation. This could be useful
+    as a way to control the volume of deprecations that are issued by temporarily disabling
+    the implicit this fallback deprecations, which would allow the other deprecations to be more easily
+    identified in the console).
+
+    NOTE: The fallback behavior **will be removed** in Ember 4.0.0, disabling **_IS NOT_**
+    a viable strategy for handling this deprecation.
+
+    @property _DISABLE_PROPERTY_FALLBACK_DEPRECATION
+    @for EmberENV
+    @type boolean
+    @default false
+    @private
+   */
+  _DISABLE_PROPERTY_FALLBACK_DEPRECATION: false,
+
   EMBER_LOAD_HOOKS: {} as {
     [hook: string]: Function[];
   },
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index b4f1aa4431d..e77ff4fb192 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -70,7 +70,10 @@ setGlobalContext({
 
       if (!override) throw new Error(`deprecation override for ${id} not found`);
 
-      deprecate(override.message ?? msg, Boolean(test), override);
+      // allow deprecations to be disabled in the VM_DEPRECATION_OVERRIDES array below
+      if (!override.disabled) {
+        deprecate(override.message ?? msg, Boolean(test), override);
+      }
     }
   },
 });
@@ -91,7 +94,10 @@ if (DEBUG) {
 
 // VM Assertion/Deprecation overrides
 
-const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & { message?: string })[] = [
+const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
+  disabled?: boolean;
+  message?: string;
+})[] = [
   {
     id: 'autotracking.mutation-after-consumption',
     until: '4.0.0',
@@ -100,6 +106,16 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & { message?: string })[] =
       enabled: '3.21.0',
     },
   },
+  {
+    id: 'this-property-fallback',
+    disabled: ENV._DISABLE_PROPERTY_FALLBACK_DEPRECATION,
+    url: 'https://deprecations.emberjs.com/v3.x#toc_this-property-fallback',
+    until: '4.0.0',
+    for: 'ember-source',
+    since: {
+      enabled: '3.26.0',
+    },
+  },
 ];
 
 const VM_ASSERTION_OVERRIDES: { id: string; message: string }[] = [];
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 8c719b1878b..c5bc0f463bd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -281,7 +281,7 @@ moduleFor(
     }
 
     ['@test sharing a template between engine and application has separate refinements']() {
-      this.assert.expect(1);
+      this.assert.expect(2);
 
       let sharedTemplate = compile(strip`
       <h1>{{this.contextType}}</h1>
@@ -290,6 +290,10 @@ moduleFor(
       {{outlet}}
     `);
 
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.add('template:application', sharedTemplate);
       this.add(
         'controller:application',
@@ -335,7 +339,11 @@ moduleFor(
     }
 
     ['@test sharing a layout between engine and application has separate refinements']() {
-      this.assert.expect(1);
+      this.assert.expect(2);
+
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
 
       let sharedLayout = compile(strip`
         {{ambiguous-curlies}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 2c204b9b7c7..687cfdc252e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -106,6 +106,10 @@ moduleFor(
     }
 
     ['@test it can access the model provided by the route via implicit this fallback']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.add(
         'route:application',
         Route.extend({
@@ -138,6 +142,10 @@ moduleFor(
     }
 
     async ['@test interior mutations on the model with set'](assert) {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -195,6 +203,10 @@ moduleFor(
     }
 
     async ['@test interior mutations on the model with tracked properties'](assert) {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       class Model {
         @tracked color;
 
@@ -259,6 +271,10 @@ moduleFor(
     }
 
     async ['@test exterior mutations on the model with set'](assert) {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -316,6 +332,10 @@ moduleFor(
     }
 
     async ['@test exterior mutations on the model with tracked properties'](assert) {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
index a2388f668f6..578bc8bce77 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
@@ -129,7 +129,7 @@ moduleFor(
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render(
-        '{{foo-bar classNameBindings="model.someInitiallyTrueProperty model.someInitiallyFalseProperty model.someInitiallyUndefinedProperty :static model.isBig:big model.isOpen:open:closed model.isUp::down model.bar:isTruthy:isFalsy"}}',
+        '{{foo-bar classNameBindings="this.model.someInitiallyTrueProperty this.model.someInitiallyFalseProperty this.model.someInitiallyUndefinedProperty :static this.model.isBig:big this.model.isOpen:open:closed this.model.isUp::down this.model.bar:isTruthy:isFalsy"}}',
         {
           model: {
             someInitiallyTrueProperty: true,
@@ -344,7 +344,7 @@ moduleFor(
 
     ['@test const bindings can be set as attrs']() {
       this.registerComponent('foo-bar', { template: 'hello' });
-      this.render('{{foo-bar classNameBindings="foo:enabled:disabled"}}', {
+      this.render('{{foo-bar classNameBindings="this.foo:enabled:disabled"}}', {
         foo: true,
       });
 
@@ -697,7 +697,7 @@ moduleFor(
     ['@test it should merge classBinding with class']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="birdman:respeck" class="myName"}}', {
+      this.render('{{foo-bar classBinding="this.birdman:respeck" class="myName"}}', {
         birdman: true,
       });
 
@@ -719,7 +719,7 @@ moduleFor(
     ['@test it should apply classBinding with only truthy condition']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="myName:respeck"}}', {
+      this.render('{{foo-bar classBinding="this.myName:respeck"}}', {
         myName: true,
       });
 
@@ -741,7 +741,7 @@ moduleFor(
     ['@test it should apply classBinding with only falsy condition']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="myName::shade"}}', {
+      this.render('{{foo-bar classBinding="this.myName::shade"}}', {
         myName: false,
       });
 
@@ -763,7 +763,7 @@ moduleFor(
     ['@test it should apply nothing when classBinding is falsy but only supplies truthy class']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="myName:respeck"}}', {
+      this.render('{{foo-bar classBinding="this.myName:respeck"}}', {
         myName: false,
       });
 
@@ -785,7 +785,7 @@ moduleFor(
     ['@test it should apply nothing when classBinding is truthy but only supplies falsy class']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="myName::shade"}}', { myName: true });
+      this.render('{{foo-bar classBinding="this.myName::shade"}}', { myName: true });
 
       this.assertComponentElement(this.firstChild, {
         tagName: 'div',
@@ -805,7 +805,7 @@ moduleFor(
     ['@test it should apply classBinding with falsy condition']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="swag:fresh:scrub"}}', {
+      this.render('{{foo-bar classBinding="this.swag:fresh:scrub"}}', {
         swag: false,
       });
 
@@ -827,7 +827,7 @@ moduleFor(
     ['@test it should apply classBinding with truthy condition']() {
       this.registerComponent('foo-bar', { template: 'hello' });
 
-      this.render('{{foo-bar classBinding="swag:fresh:scrub"}}', {
+      this.render('{{foo-bar classBinding="this.swag:fresh:scrub"}}', {
         swag: true,
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index ae9a3991f4f..60b18b65fa7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1501,7 +1501,7 @@ applyMixins(
       title: 'hash value',
       setup() {
         this.registerComponent('my-comp', {
-          template: '{{component component}}',
+          template: '{{component this.component}}',
         });
 
         this.render('{{my-comp component=(component "change-button" val=this.model.val2)}}');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index c498dfd4495..7b9f65c8f69 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3734,6 +3734,10 @@ moduleFor(
     }
 
     ['@test can use `{{component.foo}}` in a template GH#19313']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.registerComponent('foo-bar', {
         template: '{{component.foo}}',
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 8b95dc9e0c5..69f8a44fe92 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -985,7 +985,7 @@ moduleFor(
         'Did you mean `<Input @type="checkbox" @checked={{...}} />`?';
 
       expectWarning(() => {
-        this.render(`<Input @type="checkbox" @value={{value}} />`, {
+        this.render(`<Input @type="checkbox" @value={{this.value}} />`, {
           value: true,
         });
       }, message);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index d48e1b9a4a2..6984869f43b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -776,7 +776,7 @@ moduleFor(
         'Did you mean `<Input @type="checkbox" @checked={{...}} />`?';
 
       expectWarning(() => {
-        this.render(`{{input type="checkbox" value=value}}`, {
+        this.render(`{{input type="checkbox" value=this.value}}`, {
           value: true,
         });
       }, message);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 06f162c2917..0ad3ac328ac 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -329,7 +329,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' classNameBindings='foo:foo-is-true:foo-is-false'}}About{{/link-to}}
+        {{#link-to 'about' id='about-link' classNameBindings='this.foo:foo-is-true:foo-is-false'}}About{{/link-to}}
         `
       );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 887ed93a064..494072aa523 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -174,7 +174,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       ['@test it can render named arguments']() {
         this.registerTemplateOnlyComponent('foo-bar', '|{{@foo}}|{{@bar}}|');
 
-        this.render('{{foo-bar foo=foo bar=bar}}', {
+        this.render('{{foo-bar foo=this.foo bar=this.bar}}', {
           foo: 'foo',
           bar: 'bar',
         });
@@ -197,9 +197,13 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       }
 
       ['@test it renders named arguments as reflected properties']() {
+        expectDeprecation(
+          /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        );
+
         this.registerTemplateOnlyComponent('foo-bar', '|{{foo}}|{{this.bar}}|');
 
-        this.render('{{foo-bar foo=foo bar=bar}}', {
+        this.render('{{foo-bar foo=this.foo bar=this.bar}}', {
           foo: 'foo',
           bar: 'bar',
         });
@@ -224,7 +228,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       ['@test it has curly component features']() {
         this.registerTemplateOnlyComponent('foo-bar', 'hello');
 
-        this.render('{{foo-bar tagName="p" class=class}}', {
+        this.render('{{foo-bar tagName="p" class=this.class}}', {
           class: 'foo bar',
         });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 4693cb4057e..254125e7803 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -35,6 +35,10 @@ moduleFor(
     }
 
     ['@test it does not resolve helpers with a `.` (period)']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.registerHelper('hello.world', () => 'hello world');
 
       this.render('{{hello.world}}', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 3e32e0d30a1..33bac1c5f01 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -731,6 +731,10 @@ class EachTest extends AbstractEachTest {
   }
 
   ['@test the scoped variable is not available outside the {{#each}} block.']() {
+    expectDeprecation(
+      /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+    );
+
     this.makeList(['Yehuda']);
 
     this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`, {
@@ -948,6 +952,10 @@ class EachTest extends AbstractEachTest {
   }
 
   ['@test the scoped variable is not available outside the {{#each}} block']() {
+    expectDeprecation(
+      /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+    );
+
     let first = this.createList(['Limbo']);
     let fifth = this.createList(['Wrath']);
     let ninth = this.createList(['Treachery']);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index 57cfa003298..1bb3d50eed6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -96,6 +96,10 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block.']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.render(`{{name}}-{{#let this.other as |name|}}{{name}}{{/let}}-{{name}}`, {
         name: 'Stef',
         other: 'Yehuda',
@@ -242,6 +246,10 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.render(
         `{{ring}}-{{#let this.first as |ring|}}{{ring}}-{{#let this.fifth as |ring|}}{{ring}}-{{#let this.ninth as |ring|}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}`,
         {
@@ -323,6 +331,10 @@ moduleFor(
     }
 
     ['@test nested {{#let}} blocks should have access to root context']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.render(
         strip`
         {{name}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
index e24d7b5f97b..a99458c9c43 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
@@ -105,6 +105,10 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#with}} block.']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.render(`{{name}}-{{#with this.other as |name|}}{{name}}{{/with}}-{{name}}`, {
         name: 'Stef',
         other: 'Yehuda',
@@ -290,6 +294,10 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#with}} block']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.render(
         `{{ring}}-{{#with this.first as |ring|}}{{ring}}-{{#with this.fifth as |ring|}}{{ring}}-{{#with this.ninth as |ring|}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}`,
         {
@@ -371,6 +379,10 @@ moduleFor(
     }
 
     ['@test nested {{#with}} blocks should have access to root context']() {
+      expectDeprecation(
+        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      );
+
       this.render(
         strip`
       {{name}}
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index ee4e360480a..7656fc6bd92 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -9,6 +9,7 @@ module.exports = {
     'LOG_VERSION',
     '[]',
     '_APPLICATION_TEMPLATE_WRAPPER',
+    '_DISABLE_PROPERTY_FALLBACK_DEPRECATION',
     '_DEBUG_RENDER_TREE',
     '_JQUERY_INTEGRATION',
     '_DEFAULT_ASYNC_OBSERVERS',
diff --git a/yarn.lock b/yarn.lock
index b9ae4c8f0e6..cb82fd19e73 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.74.0.tgz#5490a6c7f7b060ca1774a5f82a8c04f594ee9e77"
-  integrity sha512-D57vPGEeLS+mfmsCqyJ+7ywUFPIOp8PeNmk++Bg+OGFxu3sGYc/IKNNarTfuos14KKs1we4QLn9NND/vk2hu4g==
-  dependencies:
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/syntax" "0.74.0"
-    "@glimmer/util" "0.74.0"
-    "@glimmer/wire-format" "0.74.0"
+"@glimmer/compiler@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.74.1.tgz#7eaeae31e66ce34194343d380293fe7d204aec3d"
+  integrity sha512-/v+5TjoKN5u5F38ofGgMYzUASmuLR7L+0X6tF7yfgudPVOL2JegxQmidu5Z57LapjKndKKkfzxbHfHO5ePJkEw==
+  dependencies:
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/syntax" "0.74.1"
+    "@glimmer/util" "0.74.1"
+    "@glimmer/wire-format" "0.74.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.74.0.tgz#0dc76beba702ade91aee4ff53a2469c995175c48"
-  integrity sha512-cfDHILKRt3skTz13irox7pc5ofu1g0XiPqOr+PgztGFZ0RMusSQHMlG/jSXViZuER5j44CBkuwP15E3M36mz8w==
+"@glimmer/destroyable@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.74.1.tgz#346ee1e965479abf33f8873be78ec184918dc084"
+  integrity sha512-2seuMXHFfbFPikE0G/DbN+JTSNmlDYJ/d0ZFFs3AmdWILS5uhDcdeoaZ0qywqTe+K3NBEN5o+7zk8n0KlcmzRg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.74.0"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/util" "0.74.0"
+    "@glimmer/global-context" "0.74.1"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/util" "0.74.1"
 
-"@glimmer/encoder@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.74.0.tgz#799014207feb6edea4d42f64811d0a2222664da2"
-  integrity sha512-XFWC7yO2wybOlO4i/8ptqolktpCsnqgSxZ6X9AV17Djh0MhFK4nnHw3xqrUA41NdZmHL+U4FRSBrqy0taeYBbw==
+"@glimmer/encoder@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.74.1.tgz#fa0f01708f6f760bc14bd86ad7b2257e37f1f5d6"
+  integrity sha512-n9YSPFCQ0alNdayk84tUmQiOZMl0F5n1Xk8V6e1/LL6Olv1wHILG7g2MqeODpi5t35ch8aGJQ1VexQO5gCwM4g==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/vm" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/vm" "0.74.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.74.0.tgz#af7135fba958b38d0505b0e22af1d07c215ee68c"
-  integrity sha512-cR7gUiEeGuOJenVYoM3uHLIwIg+L0elvuBjeuq2y+vksaiMJy3f0LxEM3RsgPAe9AouphOF7zFec9iSxH/ploA==
+"@glimmer/global-context@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.74.1.tgz#622ec6aca58e195c588b96756fda65386f479046"
+  integrity sha512-VWvYcAPYbEYNTPf6+k+JfZ0VAXE1SWRe1eSLmerthIp8ph6iyu/mzJzImshXMyKgFr3i8erk20lPKLVGWgbeQg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.74.0.tgz#b0d79068ee085beacf3c96593d6d69f1ba4218df"
-  integrity sha512-MBmRJ9w6hnek39+YmCQik2MTqzWJkPGtBdQSg3j+qj7J4noiTP2v6H8SAuk+eTa1zuNRd875lIoaFroiPg6EqQ==
+"@glimmer/interfaces@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.74.1.tgz#f1152a00ef3d57d59f7e126896e113ffc8affad8"
+  integrity sha512-eQnJkWYaWV2FTJxakcGrTYvBNwB7cYaCemepdxik2ioclcJ123voxMvbeMk+ZAUxTt2M7a7YI01Kbfhn6KXaOQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.74.0.tgz#8a93799146acd7eb40c8fa6abe789d44a7311f3d"
-  integrity sha512-xST8zoW9RFOQc2Lx5bezIKZQ64jPAuyDbzbTnEPh+VnXDrXU8Gt0reqkfs67JM2R+usbZOy7zDpnzGoPeI5YVw==
+"@glimmer/low-level@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.74.1.tgz#da68af19b8b263b4f0d5da561235e04baddd8da4"
+  integrity sha512-/Kf6H7l35JCZfDK9BwgE078AF7SZapDJyr7JIZsa1VvLvWpBeFsV/NS1ntE9eK4AL1U1/VQx0R4ihg/g9txMuQ==
 
-"@glimmer/manager@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.74.0.tgz#8da1b55aecb9fa19c6d8eba9b55a05d33eb97cb4"
-  integrity sha512-3XxWD07pN8HvrPiZJxk7CSjl6f+heMg1q+SUx8qr17aMPkHztZi66KvxgXKnczN5lXOC3Qm96q8x+oRh5867fg==
+"@glimmer/manager@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.74.1.tgz#91e806eb7ae4d8bf857241e401e54105f99b6331"
+  integrity sha512-K25I+lbfAPtJKyJvsQc0mgOm6kEhSvMupV653PSdxLx1Eqr8hGt7pTRfkXaDxx2o7rBL/2IsunN8tbkkDTQ8Ag==
   dependencies:
-    "@glimmer/destroyable" "0.74.0"
+    "@glimmer/destroyable" "0.74.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/reference" "0.74.0"
-    "@glimmer/util" "0.74.0"
-    "@glimmer/validator" "0.74.0"
-
-"@glimmer/node@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.74.0.tgz#a208fd4bed2ba4949c97e6f44a3ac01912e3dfd5"
-  integrity sha512-+eRFfcoxECARO0YcGX6bRPuwWhcxsy4+bOFlAw4j9jWfs6HD5nnbrM44kyEOLkziz5mXa/UvqLoTBkvVlcVdEg==
-  dependencies:
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/runtime" "0.74.0"
-    "@glimmer/util" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/reference" "0.74.1"
+    "@glimmer/util" "0.74.1"
+    "@glimmer/validator" "0.74.1"
+
+"@glimmer/node@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.74.1.tgz#d4cc63f8e7bef63f67cf39eb866187644d9cfb93"
+  integrity sha512-ZeTZ0fYhtfAAcvC6vrHKQoMCeVQXZO8Bp8gsUXoQTJjfgN5/hVsCVh/BskZ88I4URlR96KoK3jXp9qa1E51UlQ==
+  dependencies:
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/runtime" "0.74.1"
+    "@glimmer/util" "0.74.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.74.0.tgz#8986895827c81db36d7b96d413a667629bccf824"
-  integrity sha512-9A3LMqJhYFWUWi3WjerPDmr9Ghd1eAku0KtlldIisj7pTUckxuosUXsEPuDbX9xv1g9Sp0rFyf2tmQDwQplCOQ==
+"@glimmer/opcode-compiler@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.74.1.tgz#e97bae3db4003e81e33b7f6a1a8707fb230d63da"
+  integrity sha512-Vj+BaHz9ha9oSSh3ikrU5LgBjNR610MlYxt4fTB98qYxTooCIJg1NqaJYi8Rt5UmEEGC5Ht8L9DP4JqyR/RE4g==
   dependencies:
-    "@glimmer/encoder" "0.74.0"
+    "@glimmer/encoder" "0.74.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/reference" "0.74.0"
-    "@glimmer/util" "0.74.0"
-    "@glimmer/vm" "0.74.0"
-    "@glimmer/wire-format" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/reference" "0.74.1"
+    "@glimmer/util" "0.74.1"
+    "@glimmer/vm" "0.74.1"
+    "@glimmer/wire-format" "0.74.1"
 
-"@glimmer/owner@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.74.0.tgz#55aeeda766340e8223373d5f510afbc5825ddb45"
-  integrity sha512-2SVYzcKrQ4iTv0P1ZIbxgIs3DOSVISt6gK3wKdOED6MMH6ORCB8H6ajjYgEChdHb0crhClE3U+3QcW+tkuQYEA==
+"@glimmer/owner@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.74.1.tgz#3351e022c90c853f21dbf8ef2278fa3d41bc04c0"
+  integrity sha512-H5bVCJ7z+qdlUTHPrTiksLlL255wmVt5SvsWpNyU0JuL0YNCIHW/T6iuKbnTjRizM4zDh4Wm3kjEeWePlrIjMQ==
   dependencies:
-    "@glimmer/util" "0.74.0"
+    "@glimmer/util" "0.74.1"
 
-"@glimmer/program@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.74.0.tgz#c64c5923f605f9c0fcc65210c0539a4897596200"
-  integrity sha512-Ov+zSu0IiPp0SigTpVQrg8jW2XQp/RD/59eAc5tUq0Byp7jRU6Y5oXHAlaiAU0NksWpWUudHW48PjFhCA0nqog==
+"@glimmer/program@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.74.1.tgz#e80c024793a94a4e39e4162ee4b4df75c91f8816"
+  integrity sha512-N9wrHObXQeEm7r8fbtaqWodGplAPmYNu7VJZ3fvhd6C+TxhZ9WJOQoS6OKsW5V92l1Y/zfeQac31//Z/CqDvXg==
   dependencies:
-    "@glimmer/encoder" "0.74.0"
+    "@glimmer/encoder" "0.74.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/manager" "0.74.0"
-    "@glimmer/opcode-compiler" "0.74.0"
-    "@glimmer/util" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/manager" "0.74.1"
+    "@glimmer/opcode-compiler" "0.74.1"
+    "@glimmer/util" "0.74.1"
 
-"@glimmer/reference@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.74.0.tgz#5f14762043cfdc41ed511fca2f40ace19482de63"
-  integrity sha512-cV9+JCLXMm5RK8jSVTlsUPjFB5JwCxskFJshOKiIv11NhrYzJCzQ1vvilazfDn8xpEcQngDKr+08egYVC9aQAQ==
+"@glimmer/reference@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.74.1.tgz#b5b299ada5bb1881cdcd334ca874a49d7aec0adf"
+  integrity sha512-b2onVAg3EaAe1cxDKN3dzETym+6yvwAXuUQ/TJ4t9UEMR5gAEv8FGw1a7v/19ZAtQNzWQYxEYaT2GgiQVkiNqw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.74.0"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/util" "0.74.0"
-    "@glimmer/validator" "0.74.0"
+    "@glimmer/global-context" "0.74.1"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/util" "0.74.1"
+    "@glimmer/validator" "0.74.1"
 
-"@glimmer/runtime@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.74.0.tgz#590a498a378372f6465cbbed9d0174a44e649b87"
-  integrity sha512-qUecT6RdSXv/7NMLczpPodB+TT9Pr0gBX7/y4TPI/SAqYglBXTJi2UF0kUbZIqcN8Oy8BvM3833SnBRU11acnQ==
+"@glimmer/runtime@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.74.1.tgz#efe9e9d630e111940cdc82699bd3d4d796d4ba19"
+  integrity sha512-RSdobmo7FuwimrGyaLwNb1gLamscKmizbRALekOO9kAWErjdi/gDyaI2Qn8P41JcgLuPX50dQC744KvaBwHsdA==
   dependencies:
-    "@glimmer/destroyable" "0.74.0"
+    "@glimmer/destroyable" "0.74.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.74.0"
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/low-level" "0.74.0"
-    "@glimmer/owner" "0.74.0"
-    "@glimmer/program" "0.74.0"
-    "@glimmer/reference" "0.74.0"
-    "@glimmer/util" "0.74.0"
-    "@glimmer/validator" "0.74.0"
-    "@glimmer/vm" "0.74.0"
-    "@glimmer/wire-format" "0.74.0"
+    "@glimmer/global-context" "0.74.1"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/low-level" "0.74.1"
+    "@glimmer/owner" "0.74.1"
+    "@glimmer/program" "0.74.1"
+    "@glimmer/reference" "0.74.1"
+    "@glimmer/util" "0.74.1"
+    "@glimmer/validator" "0.74.1"
+    "@glimmer/vm" "0.74.1"
+    "@glimmer/wire-format" "0.74.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.74.0.tgz#4f0536c1f07c2cacd0a53056c62403e2618860b8"
-  integrity sha512-kpDEnZHx+cxE1U/MimymavIH6a2PXF5klzIIEgge5dPEgi3pP+MkimyHMe5XDGBJId75CwgKV85cotJ8Pobg1g==
+"@glimmer/syntax@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.74.1.tgz#86aa5961bc576140066192970a87477d9d9c8c16"
+  integrity sha512-E4ucWNOvBA9z/oOyIaj0CboDa8Ed2JxZCIbZwwIVyjBLy8O/VHodSHiODXw28B6eCSx6v7OlajO4a3mskKRhDQ==
   dependencies:
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/util" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/util" "0.74.1"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.74.0.tgz#bf0939db3e145d2107c35fcba1ce593982716d58"
-  integrity sha512-O6AI6vOgXOUCUZJOTQSc578Tkt9W0Qtft4wPwsxjdG6L2hm2gm+yxIJ1Mv+ZOphm2FP05dOfT18gjB5AOA4WbA==
+"@glimmer/util@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.74.1.tgz#ea4586f1c35f33aff30e6f16ca835dbfd8cfcf7a"
+  integrity sha512-bblwiorOqVC+hGqCHX4TNAIMrZMzDYN9F7X7hZ4UGkLvWQFUWO2s43hvdL434t8lb+jrPg+RQRaPOuzSqNCrmw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.74.0.tgz#43d7ae1bcbca086dacb9d33a3f8cfb2284821810"
-  integrity sha512-Z8gyFX4fRWzVEJlWs/iolRIepOAXlJs2zORpxFO6Htb2gKOfFy1rlxH+kXBtayXt7cE59xyr1aqrHHIMMMKz2Q==
+"@glimmer/validator@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.74.1.tgz#6aa2d9baf35e0eedf04baa6ead631028db7ae4be"
+  integrity sha512-8lNbUREyywnInCFUxSO0UHCS24GxOYP2J/kRWCDKkbaXqXHXz+ZESLkB9kXG4CMerFffLuPBN+RdE5KufzCIVQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.74.0"
+    "@glimmer/global-context" "0.74.1"
 
-"@glimmer/vm-babel-plugins@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.74.0.tgz#e68e41fae4c7785bab4473c017f3f8edc3ec5755"
-  integrity sha512-XSjbszdVdcMI5WyZ4dMMw1hac/o0GMyeQ26kfLp1nqhx1MEApCluBN6myhD50DcYyRke/O7PKSCwP6fCeud0Xw==
+"@glimmer/vm-babel-plugins@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.74.1.tgz#da8a13ff75445148cfd644705eae5e298987d559"
+  integrity sha512-meWJwt/vIAvunu5M9tAAvdI3CJO2kc3V7OdIYCCVjFfYnBrnotSXkFgpIYmadq9rrz0LRemH5nkXa0epThVkqQ==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.74.0.tgz#ebf2ff78d29fba15223870aeefe84ba52363dea3"
-  integrity sha512-fokJ06gZOG3tx3mVlRXiq5RqO4xo5f9rgB9ElYre/5SmmeJrNAxw/foBHRI350xeMutyjkk26MMi1isZk3MmUw==
+"@glimmer/vm@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.74.1.tgz#269fc003a4d01493b7e4736f7c5d2310c3b0e4af"
+  integrity sha512-N7hriIEPELPOWVUkiEHG+/hqrrzLLCHfSYo+s4pE8o3R0D6Ih8NnnbY+hhNxPF0Zw7PJAnYq4UBNwzZlcAk17w==
   dependencies:
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/util" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/util" "0.74.1"
 
-"@glimmer/wire-format@0.74.0":
-  version "0.74.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.74.0.tgz#04ca04f6c32900ab0ccd377140dc7e05bbf2f0b3"
-  integrity sha512-72J0H4Ht6BjXEGqszWmD0mx+ZhL/UNt1a4sk5ORZZUs75sbzxXVHTYUleQCSSX0NlIqPhC1ebDNEIzDDbC+jeg==
+"@glimmer/wire-format@0.74.1":
+  version "0.74.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.74.1.tgz#9cf12ccdaccdd3d1cdadfcfe90bd9cbcb77a15c2"
+  integrity sha512-JXCMdSAzoheYpO/DMDv7zzxfYFp64cXmkgNUoeD2xtfSumUDrB6FTcNsi76JJOussEIlY0L52RK6GJn8MnS08w==
   dependencies:
-    "@glimmer/interfaces" "0.74.0"
-    "@glimmer/util" "0.74.0"
+    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/util" "0.74.1"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 9bc0b49e94374456c8433c37109a7cd3b42d561e Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 2 Feb 2021 09:53:14 -0500
Subject: [PATCH 0336/1405] Update glimmer-vm to prevent errors for older
 inline precompilation

This updates glimmer-vm to avoid emitting the `scope` property on
precompiled template blocks when not using strict mode (when using
strict mode `scope` will either be `null` or a function).

This is specifically to work around a bug in older versions of
babel-plugin-htmlbars-inline-precompile (versions from v2.0.0 through
v4.0.1) where they would (incorrectly) attempt to build an
`ObjectExpression` when a `null` value is found in the template
precompilation result (D'oh!).

Note: those versions of babel-plugin-htmlbars-inline-precompile should
still be migrated away from (they are quite old, and will definitely not
work for newer features like strict mode).
---
 package.json |  26 ++---
 yarn.lock    | 262 +++++++++++++++++++++++++--------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/package.json b/package.json
index 34f798a5604..6d69733afa8 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.74.1",
+    "@glimmer/vm-babel-plugins": "0.74.2",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.74.1",
+    "@glimmer/compiler": "0.74.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.74.1",
-    "@glimmer/interfaces": "0.74.1",
-    "@glimmer/manager": "0.74.1",
-    "@glimmer/destroyable": "0.74.1",
-    "@glimmer/owner": "0.74.1",
-    "@glimmer/node": "0.74.1",
-    "@glimmer/opcode-compiler": "0.74.1",
-    "@glimmer/program": "0.74.1",
-    "@glimmer/reference": "0.74.1",
-    "@glimmer/runtime": "0.74.1",
-    "@glimmer/validator": "0.74.1",
+    "@glimmer/global-context": "0.74.2",
+    "@glimmer/interfaces": "0.74.2",
+    "@glimmer/manager": "0.74.2",
+    "@glimmer/destroyable": "0.74.2",
+    "@glimmer/owner": "0.74.2",
+    "@glimmer/node": "0.74.2",
+    "@glimmer/opcode-compiler": "0.74.2",
+    "@glimmer/program": "0.74.2",
+    "@glimmer/reference": "0.74.2",
+    "@glimmer/runtime": "0.74.2",
+    "@glimmer/validator": "0.74.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index cb82fd19e73..26b1e3ee23b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.74.1.tgz#7eaeae31e66ce34194343d380293fe7d204aec3d"
-  integrity sha512-/v+5TjoKN5u5F38ofGgMYzUASmuLR7L+0X6tF7yfgudPVOL2JegxQmidu5Z57LapjKndKKkfzxbHfHO5ePJkEw==
-  dependencies:
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/syntax" "0.74.1"
-    "@glimmer/util" "0.74.1"
-    "@glimmer/wire-format" "0.74.1"
+"@glimmer/compiler@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.74.2.tgz#4e6297463bb5dc59c38c80e9c5d7df5146f0c26b"
+  integrity sha512-FglR7LsDDfwwybqBJo6k2KyccZ0hsNU1HLkVH8BbO4Nw27wjG8pfULraR00ZL2hOXtj2/ACyR69MK6/7VOW5NA==
+  dependencies:
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/syntax" "0.74.2"
+    "@glimmer/util" "0.74.2"
+    "@glimmer/wire-format" "0.74.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.74.1.tgz#346ee1e965479abf33f8873be78ec184918dc084"
-  integrity sha512-2seuMXHFfbFPikE0G/DbN+JTSNmlDYJ/d0ZFFs3AmdWILS5uhDcdeoaZ0qywqTe+K3NBEN5o+7zk8n0KlcmzRg==
+"@glimmer/destroyable@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.74.2.tgz#d6b8d564b94c71e9b33fb29fee7609702db0f30b"
+  integrity sha512-YG49D5REon65H/a8f0MM7Vh/oThyYPEjt47GV+nQtUlqFnbmY0jc8wqceLeVYcWElBqRt0Mpw9N3qyZI08Nxmw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.74.1"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/util" "0.74.1"
+    "@glimmer/global-context" "0.74.2"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/util" "0.74.2"
 
-"@glimmer/encoder@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.74.1.tgz#fa0f01708f6f760bc14bd86ad7b2257e37f1f5d6"
-  integrity sha512-n9YSPFCQ0alNdayk84tUmQiOZMl0F5n1Xk8V6e1/LL6Olv1wHILG7g2MqeODpi5t35ch8aGJQ1VexQO5gCwM4g==
+"@glimmer/encoder@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.74.2.tgz#5a4b13478f5e8f06a836ffa82aa9ab30940668ed"
+  integrity sha512-frkmdTyKi7whdNTHCGGV+eXPVbaHwAnmOuWUOWGoMf5/I7xCoy5oLeYAJQ31LgoVx9Mh6rYI9ftx2f6pnN6hSg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/vm" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/vm" "0.74.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.74.1.tgz#622ec6aca58e195c588b96756fda65386f479046"
-  integrity sha512-VWvYcAPYbEYNTPf6+k+JfZ0VAXE1SWRe1eSLmerthIp8ph6iyu/mzJzImshXMyKgFr3i8erk20lPKLVGWgbeQg==
+"@glimmer/global-context@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.74.2.tgz#8005d63c47ead669f9246f516a0d68ce6e52896c"
+  integrity sha512-ecD254DqF3HWrML1YAU0WThrGfjFvJ17JFSb486zEMQk4DPFWhjEr5DaFSB/YEw6Vz7NtnC31VS0guW3ct/r7A==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.74.1.tgz#f1152a00ef3d57d59f7e126896e113ffc8affad8"
-  integrity sha512-eQnJkWYaWV2FTJxakcGrTYvBNwB7cYaCemepdxik2ioclcJ123voxMvbeMk+ZAUxTt2M7a7YI01Kbfhn6KXaOQ==
+"@glimmer/interfaces@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.74.2.tgz#0a6571b67153d6c31b248ab8ddf59b4f16a4fec5"
+  integrity sha512-iemaya221twVsOEUD7McNWjHRQ7hij7rosgQI6hHQQyi8/R50f8ZevXo3MVWhni6Gkb9HKReP4Fkru7TpBjySw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.74.1.tgz#da68af19b8b263b4f0d5da561235e04baddd8da4"
-  integrity sha512-/Kf6H7l35JCZfDK9BwgE078AF7SZapDJyr7JIZsa1VvLvWpBeFsV/NS1ntE9eK4AL1U1/VQx0R4ihg/g9txMuQ==
+"@glimmer/low-level@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.74.2.tgz#b04378567eeec2c73a0e3d1947f86a9f0f80f59f"
+  integrity sha512-dzHA/6DB4LSI6SWaHNkDJiJvEErbMAKNQO8ErfkjF39fLIn0n6t3bXsTtwai3urkrvgZp1pJg/RpYJtUx0QTMg==
 
-"@glimmer/manager@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.74.1.tgz#91e806eb7ae4d8bf857241e401e54105f99b6331"
-  integrity sha512-K25I+lbfAPtJKyJvsQc0mgOm6kEhSvMupV653PSdxLx1Eqr8hGt7pTRfkXaDxx2o7rBL/2IsunN8tbkkDTQ8Ag==
+"@glimmer/manager@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.74.2.tgz#e1cfe7e3cd88ee37fc4202d154ce9cfe3a135d0b"
+  integrity sha512-2RHzMuL4zeX8byINugYs/N6Iv6xp1ZahfkxVoTYvxwJL9jKNV3dRKXTPbG90WlfHvx3K+AuvVD4RiicAODt4vQ==
   dependencies:
-    "@glimmer/destroyable" "0.74.1"
+    "@glimmer/destroyable" "0.74.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/reference" "0.74.1"
-    "@glimmer/util" "0.74.1"
-    "@glimmer/validator" "0.74.1"
-
-"@glimmer/node@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.74.1.tgz#d4cc63f8e7bef63f67cf39eb866187644d9cfb93"
-  integrity sha512-ZeTZ0fYhtfAAcvC6vrHKQoMCeVQXZO8Bp8gsUXoQTJjfgN5/hVsCVh/BskZ88I4URlR96KoK3jXp9qa1E51UlQ==
-  dependencies:
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/runtime" "0.74.1"
-    "@glimmer/util" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/reference" "0.74.2"
+    "@glimmer/util" "0.74.2"
+    "@glimmer/validator" "0.74.2"
+
+"@glimmer/node@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.74.2.tgz#5b13306ef8715c6ecf02eeeecd9c105ccbe0ee13"
+  integrity sha512-ypNHY6IdngYUr2WfE1OwYCOqlYoQcOmBvGlf9QydT3uaO1GLxw5KoZTPYTE7cejkj+IVM0t8eY6wk+LSwh4Vrw==
+  dependencies:
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/runtime" "0.74.2"
+    "@glimmer/util" "0.74.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.74.1.tgz#e97bae3db4003e81e33b7f6a1a8707fb230d63da"
-  integrity sha512-Vj+BaHz9ha9oSSh3ikrU5LgBjNR610MlYxt4fTB98qYxTooCIJg1NqaJYi8Rt5UmEEGC5Ht8L9DP4JqyR/RE4g==
+"@glimmer/opcode-compiler@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.74.2.tgz#3038c57b9a879c53a89bb3ba3fb69d71bee61cd3"
+  integrity sha512-bTqKGvebEHeqPpKhhzoSVQu7sLpZ9t5AnZKat/xtYWAFrIzT1RNUpy6GFtZbwjKcFc96Z2UkW9WVRi11gC1jIg==
   dependencies:
-    "@glimmer/encoder" "0.74.1"
+    "@glimmer/encoder" "0.74.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/reference" "0.74.1"
-    "@glimmer/util" "0.74.1"
-    "@glimmer/vm" "0.74.1"
-    "@glimmer/wire-format" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/reference" "0.74.2"
+    "@glimmer/util" "0.74.2"
+    "@glimmer/vm" "0.74.2"
+    "@glimmer/wire-format" "0.74.2"
 
-"@glimmer/owner@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.74.1.tgz#3351e022c90c853f21dbf8ef2278fa3d41bc04c0"
-  integrity sha512-H5bVCJ7z+qdlUTHPrTiksLlL255wmVt5SvsWpNyU0JuL0YNCIHW/T6iuKbnTjRizM4zDh4Wm3kjEeWePlrIjMQ==
+"@glimmer/owner@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.74.2.tgz#5bc41db61c9cded179403c4b8f81cd82ebecab10"
+  integrity sha512-51PVprX7XnkNZBIuc45xkZf+kw24V0Z9vXsKwc9F/lQzldkmDTnF3djJsj0JRpPX4VOaqVY/URVV6/Jp8Q3Tkw==
   dependencies:
-    "@glimmer/util" "0.74.1"
+    "@glimmer/util" "0.74.2"
 
-"@glimmer/program@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.74.1.tgz#e80c024793a94a4e39e4162ee4b4df75c91f8816"
-  integrity sha512-N9wrHObXQeEm7r8fbtaqWodGplAPmYNu7VJZ3fvhd6C+TxhZ9WJOQoS6OKsW5V92l1Y/zfeQac31//Z/CqDvXg==
+"@glimmer/program@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.74.2.tgz#bdc5d9239e771011a0dda408002cffc8f098eb68"
+  integrity sha512-1ZuOt/typ9Dhw5iM1YdJPikT13lUZhmZNaSnAbbbyBFtRijPksOHN1JX1qIFzxLqaIz20AvrOtdeCZ9NoLRZfA==
   dependencies:
-    "@glimmer/encoder" "0.74.1"
+    "@glimmer/encoder" "0.74.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/manager" "0.74.1"
-    "@glimmer/opcode-compiler" "0.74.1"
-    "@glimmer/util" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/manager" "0.74.2"
+    "@glimmer/opcode-compiler" "0.74.2"
+    "@glimmer/util" "0.74.2"
 
-"@glimmer/reference@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.74.1.tgz#b5b299ada5bb1881cdcd334ca874a49d7aec0adf"
-  integrity sha512-b2onVAg3EaAe1cxDKN3dzETym+6yvwAXuUQ/TJ4t9UEMR5gAEv8FGw1a7v/19ZAtQNzWQYxEYaT2GgiQVkiNqw==
+"@glimmer/reference@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.74.2.tgz#368520445b931769bf3624591b18a2680d36aacd"
+  integrity sha512-NVuI4k55SVSOcRkhM4qKPMNFaVmPnC7pIew0MufFZuPjsvCQm68ovtsJJkHo84BgtY4foy+9Q33cBhQz1BKK0Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.74.1"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/util" "0.74.1"
-    "@glimmer/validator" "0.74.1"
+    "@glimmer/global-context" "0.74.2"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/util" "0.74.2"
+    "@glimmer/validator" "0.74.2"
 
-"@glimmer/runtime@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.74.1.tgz#efe9e9d630e111940cdc82699bd3d4d796d4ba19"
-  integrity sha512-RSdobmo7FuwimrGyaLwNb1gLamscKmizbRALekOO9kAWErjdi/gDyaI2Qn8P41JcgLuPX50dQC744KvaBwHsdA==
+"@glimmer/runtime@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.74.2.tgz#a4a6007532e988ba4b4f3180b3b5e21b8f88577e"
+  integrity sha512-xtUEtpU+44JHENaTX8PopFTRj+1aavwhVBrV22Iu+uHzFsid9gX2jckbr2OspPoMDmkqBx3tP4Q0xdkfxThhbg==
   dependencies:
-    "@glimmer/destroyable" "0.74.1"
+    "@glimmer/destroyable" "0.74.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.74.1"
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/low-level" "0.74.1"
-    "@glimmer/owner" "0.74.1"
-    "@glimmer/program" "0.74.1"
-    "@glimmer/reference" "0.74.1"
-    "@glimmer/util" "0.74.1"
-    "@glimmer/validator" "0.74.1"
-    "@glimmer/vm" "0.74.1"
-    "@glimmer/wire-format" "0.74.1"
+    "@glimmer/global-context" "0.74.2"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/low-level" "0.74.2"
+    "@glimmer/owner" "0.74.2"
+    "@glimmer/program" "0.74.2"
+    "@glimmer/reference" "0.74.2"
+    "@glimmer/util" "0.74.2"
+    "@glimmer/validator" "0.74.2"
+    "@glimmer/vm" "0.74.2"
+    "@glimmer/wire-format" "0.74.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.74.1.tgz#86aa5961bc576140066192970a87477d9d9c8c16"
-  integrity sha512-E4ucWNOvBA9z/oOyIaj0CboDa8Ed2JxZCIbZwwIVyjBLy8O/VHodSHiODXw28B6eCSx6v7OlajO4a3mskKRhDQ==
+"@glimmer/syntax@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.74.2.tgz#84efc2555356118a4a275bb8310e261afcf9b048"
+  integrity sha512-G+E2eL0xeo81zBMSkrfobejL/V4YjlAv6Uu8qubwYu/QIHj/UiyxHEMZzN1H88rWcu8iPLzTC4GzFr9Chiu2Jw==
   dependencies:
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/util" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/util" "0.74.2"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.74.1.tgz#ea4586f1c35f33aff30e6f16ca835dbfd8cfcf7a"
-  integrity sha512-bblwiorOqVC+hGqCHX4TNAIMrZMzDYN9F7X7hZ4UGkLvWQFUWO2s43hvdL434t8lb+jrPg+RQRaPOuzSqNCrmw==
+"@glimmer/util@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.74.2.tgz#11781773f17e7dfbc15b9e28966563557dd8630e"
+  integrity sha512-miWIwAPJ3i3/7qq4ycI/yJw3mKeN4woUn1ev3/ESTMmELKUNBeIXAnVjlANDTseoTCetgHVw6PFqy/WS6qdtVw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.74.1.tgz#6aa2d9baf35e0eedf04baa6ead631028db7ae4be"
-  integrity sha512-8lNbUREyywnInCFUxSO0UHCS24GxOYP2J/kRWCDKkbaXqXHXz+ZESLkB9kXG4CMerFffLuPBN+RdE5KufzCIVQ==
+"@glimmer/validator@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.74.2.tgz#e60f165345c7eb9e2ee3b4ed021d10ce6cbd262f"
+  integrity sha512-mRRjY5lcpD5IQvPGpAiuqS3EOOaC3xMYby70McH6lzH62tQffFDlqDV4uB6Z+OYVq0q+xUVvHTsLJ5ixo+BfAA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.74.1"
+    "@glimmer/global-context" "0.74.2"
 
-"@glimmer/vm-babel-plugins@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.74.1.tgz#da8a13ff75445148cfd644705eae5e298987d559"
-  integrity sha512-meWJwt/vIAvunu5M9tAAvdI3CJO2kc3V7OdIYCCVjFfYnBrnotSXkFgpIYmadq9rrz0LRemH5nkXa0epThVkqQ==
+"@glimmer/vm-babel-plugins@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.74.2.tgz#479774d5885201538245f4cba76cabd4b0dee3a5"
+  integrity sha512-DLIKzim7Fg3o54EPgz/wsEiLOUcg24P4WJ9AAv4xsXfBmFndkEDzq1oJ3SPhB167Vp1m+GKOlfKzFm9mxX5rdA==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.74.1.tgz#269fc003a4d01493b7e4736f7c5d2310c3b0e4af"
-  integrity sha512-N7hriIEPELPOWVUkiEHG+/hqrrzLLCHfSYo+s4pE8o3R0D6Ih8NnnbY+hhNxPF0Zw7PJAnYq4UBNwzZlcAk17w==
+"@glimmer/vm@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.74.2.tgz#8734b95865f97cf327ebb662c8051389ccffe708"
+  integrity sha512-h4TSHjQtP94yHMdInL5PdhKyQ6jCcWGf54wfMXaFPGw3iPoN/yc9hbUpk4TuVyqxOUL44xcYm0k6bxKBMxGWSg==
   dependencies:
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/util" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/util" "0.74.2"
 
-"@glimmer/wire-format@0.74.1":
-  version "0.74.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.74.1.tgz#9cf12ccdaccdd3d1cdadfcfe90bd9cbcb77a15c2"
-  integrity sha512-JXCMdSAzoheYpO/DMDv7zzxfYFp64cXmkgNUoeD2xtfSumUDrB6FTcNsi76JJOussEIlY0L52RK6GJn8MnS08w==
+"@glimmer/wire-format@0.74.2":
+  version "0.74.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.74.2.tgz#8d682d6ed123dc2176a3a9ee0a78577c74ab1819"
+  integrity sha512-K70PX8vb3RMElP9bRmqHzCE1xAaktOj/xGwlliEiXlRA5lJHwDQJJ5WPC4a4gUL2BsVYhLc65Og4J0zuYGDfhQ==
   dependencies:
-    "@glimmer/interfaces" "0.74.1"
-    "@glimmer/util" "0.74.1"
+    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/util" "0.74.2"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 8e9d375b2da27e04dce1fa931419fb3e0da62ece Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 2 Feb 2021 12:24:23 -0800
Subject: [PATCH 0337/1405] [DEPRECATION] Deprecate Old Manager capabilities

Adds the deprecations for older manager capabilities versions.
---
 packages/@ember/-internals/glimmer/index.ts   |  6 ++-
 .../-internals/glimmer/lib/utils/managers.ts  | 48 ++++++++++++++++++-
 packages/ember/index.js                       |  4 +-
 packages/ember/tests/reexports_test.js        |  4 +-
 4 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 042748c699b..2003e0ec9cd 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -390,5 +390,9 @@ export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/
 export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
-export { setComponentManager } from './lib/utils/managers';
+export {
+  componentCapabilities,
+  modifierCapabilities,
+  setComponentManager,
+} from './lib/utils/managers';
 export { isSerializationFirstNode } from './lib/utils/serialization-first-node-helpers';
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 4d327384699..d437227f0db 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,8 +1,13 @@
 import { Owner } from '@ember/-internals/owner';
 import { deprecate } from '@ember/debug';
 import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
+import { DEBUG } from '@glimmer/env';
 import { ComponentManager } from '@glimmer/interfaces';
-import { setComponentManager as glimmerSetComponentManager } from '@glimmer/manager';
+import {
+  componentCapabilities as glimmerComponentCapabilities,
+  modifierCapabilities as glimmerModifierCapabilities,
+  setComponentManager as glimmerSetComponentManager,
+} from '@glimmer/manager';
 
 export function setComponentManager(
   stringOrFunction: string | ((owner: Owner) => ComponentManager<unknown>),
@@ -33,3 +38,44 @@ export function setComponentManager(
 
   return glimmerSetComponentManager(factory, obj);
 }
+
+export let componentCapabilities = glimmerComponentCapabilities;
+export let modifierCapabilities = glimmerModifierCapabilities;
+
+if (DEBUG) {
+  componentCapabilities = (version, options) => {
+    deprecate(
+      'Versions of component manager capabilities prior to 3.13 have been deprecated. You must update to the 3.13 capabilities.',
+      version === '3.13',
+      {
+        id: 'manager-capabilities.components-3-4',
+        url: 'https://emberjs.com/deprecations/v3.x#toc_manager-capabilities-components-3-4',
+        until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.26.0',
+        },
+      }
+    );
+
+    return glimmerComponentCapabilities(version, options);
+  };
+
+  modifierCapabilities = (version, options) => {
+    deprecate(
+      'Versions of modifier manager capabilities prior to 3.22 have been deprecated. You must update to the 3.22 capabilities.',
+      version === '3.22',
+      {
+        id: 'manager-capabilities.modifiers-3-13',
+        url: 'https://emberjs.com/deprecations/v3.x#toc_manager-capabilities-modifiers-3-13',
+        until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.26.0',
+        },
+      }
+    );
+
+    return glimmerModifierCapabilities(version, options);
+  };
+}
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 4522eb0b5e6..4c7ff4c1262 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -102,6 +102,8 @@ import {
 import {
   Checkbox,
   Component,
+  componentCapabilities,
+  modifierCapabilities,
   setComponentManager,
   escapeExpression,
   getTemplates,
@@ -146,8 +148,6 @@ import {
 } from '@glimmer/runtime';
 
 import {
-  componentCapabilities,
-  modifierCapabilities,
   helperCapabilities,
   setModifierManager,
   setComponentTemplate,
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 9e072eac926..6c6562769b2 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -291,7 +291,9 @@ let allExports = [
   ['HTMLBars.template', '@ember/-internals/glimmer', 'template'],
   ['Handlebars.Utils.escapeExpression', '@ember/-internals/glimmer', 'escapeExpression'],
   ['_setComponentManager', '@ember/-internals/glimmer', 'setComponentManager'],
-  ['_componentManagerCapabilities', '@glimmer/manager', 'componentCapabilities'],
+  ['_componentManagerCapabilities', '@ember/-internals/glimmer', 'componentCapabilities'],
+  ['_setModifierManager', '@glimmer/manager', 'setModifierManager'],
+  ['_modifierManagerCapabilities', '@ember/-internals/glimmer', 'modifierCapabilities'],
   ['_setComponentTemplate', '@glimmer/manager', 'setComponentTemplate'],
   ['_getComponentTemplate', '@glimmer/manager', 'getComponentTemplate'],
   EMBER_GLIMMER_HELPER_MANAGER

From 44b4d359a080c544e7fe59a53ab4389af4175149 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 2 Feb 2021 11:08:40 -0800
Subject: [PATCH 0338/1405] Adds deprecations for Classic edition and optional
 features

Adds the deprecations outlined in [RFC 704](https://github.com/emberjs/rfcs/blob/master/text/0704-deprecate-octane-optional-features.md)
and [RFC 705](https://github.com/emberjs/rfcs/blob/master/text/0705-deprecate-jquery-optional-feature.md)
---
 lib/index.js | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 14d4ce4d617..6b13ac35ebc 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -70,9 +70,10 @@ module.exports = {
 
     const { has } = require('@ember/edition-utils');
 
+    let optionalFeatures = this.project.addons.find((a) => a.name === '@ember/optional-features');
+    let optionalFeaturesMissing = optionalFeatures === undefined;
+
     if (has('octane')) {
-      let optionalFeatures = this.project.addons.find((a) => a.name === '@ember/optional-features');
-      let optionalFeaturesMissing = optionalFeatures === undefined;
       let message = [];
 
       if (optionalFeaturesMissing) {
@@ -126,6 +127,34 @@ module.exports = {
         const SilentError = require('silent-error');
         throw new SilentError(message.join('\n\t'));
       }
+    } else {
+      this.ui.writeWarnLine(
+        'The Ember Classic edition has been deprecated. Speciying "classic" in your package.json, or not specifying a value at all, will no longer be supported. You must explicitly set the "ember.edition" property to "octane". This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
+      );
+
+      if (
+        optionalFeaturesMissing ||
+        optionalFeatures.isFeatureEnabled('application-template-wrapper')
+      ) {
+        this.ui.writeWarnLine(
+          'Setting the `application-template-wrapper` optional feature flag to `true`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `false`. You can also run `npx @ember/octanify` to do this. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-application-template-wrapper'
+        );
+      }
+
+      if (
+        optionalFeaturesMissing ||
+        !optionalFeatures.isFeatureEnabled('template-only-glimmer-compoents')
+      ) {
+        this.ui.writeWarnLine(
+          'Setting the `template-only-glimmer-components` optional feature flag to `false`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `true`. You can also run `npx @ember/octanify` to do this. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-template-only-glimmer-components'
+        );
+      }
+    }
+
+    if (optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration')) {
+      this.ui.writeWarnLine(
+        'Setting the `jquery-integration` optional feature flag to `true`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `false`. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
+      );
     }
   },
 

From 002e4e86a763c6814e8035b411d41e384d76f61f Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 2 Feb 2021 17:40:15 -0500
Subject: [PATCH 0339/1405] Add v3.25.0-beta.5 to CHANGELOG

(cherry picked from commit fc823791afc3d0e4b4508a751efe127ce46330b5)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40938b2ef62..7ea7e7495ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.25.0-beta.5 (February 02, 2021)
+
+- [#19370](https://github.com/emberjs/ember.js/pull/19370) [BUGFIX] Update glimmer-vm to prevent errors for older inline precompilation
+
 ### v3.25.0-beta.4 (February 01, 2021)
 
 - [#19363](https://github.com/emberjs/ember.js/pull/19363) [BUGFIX] Update VM, fix component name preprocessing

From 65cceb36e1f95ff89311900c06fdd52ea4364b47 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 2 Feb 2021 15:49:45 -0800
Subject: [PATCH 0340/1405] [DEPRECATION] Deprecate old class binding syntax
 and {{attrs}}

Adds deprecations for the old class binding syntax, and accessing args
via {{attrs}}.
---
 .../integration/application/engine-test.js    |  3 ++
 .../components/class-bindings-test.js         | 40 +++++++++++++++++++
 .../components/curly-components-test.js       | 31 ++++++++++++++
 .../components/dynamic-components-test.js     |  6 +--
 .../components/link-to/routing-angle-test.js  | 37 -----------------
 .../components/link-to/routing-curly-test.js  |  4 ++
 .../helpers/closure-action-test.js            |  4 ++
 .../lib/plugins/transform-attrs-into-args.ts  | 23 +++++++++++
 .../transform-old-class-binding-syntax.ts     | 31 ++++++++++++--
 9 files changed, 136 insertions(+), 43 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 8c719b1878b..bed3b718032 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -272,6 +272,9 @@ moduleFor(
       expectDeprecation(
         `The use of \`{{partial}}\` is deprecated, please refactor the "troll" partial to a component`
       );
+      expectDeprecation(
+        'Using {{attrs}} to reference named arguments has been deprecated. {{attrs.wat}} should be updated to {{@wat}}. (L1:C2) '
+      );
 
       this.setupEngineWithAttrs([]);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
index a2388f668f6..8ea37af3657 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
@@ -126,6 +126,10 @@ moduleFor(
     }
 
     ['@test it can have class name bindings in the template']() {
+      expectDeprecation(
+        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render(
@@ -343,6 +347,10 @@ moduleFor(
     }
 
     ['@test const bindings can be set as attrs']() {
+      expectDeprecation(
+        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
       this.render('{{foo-bar classNameBindings="foo:enabled:disabled"}}', {
         foo: true,
@@ -675,6 +683,10 @@ moduleFor(
   'ClassBinding integration',
   class extends RenderingTestCase {
     ['@test it should apply classBinding without condition always']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding=":foo"}}');
@@ -695,6 +707,10 @@ moduleFor(
     }
 
     ['@test it should merge classBinding with class']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="birdman:respeck" class="myName"}}', {
@@ -717,6 +733,10 @@ moduleFor(
     }
 
     ['@test it should apply classBinding with only truthy condition']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="myName:respeck"}}', {
@@ -739,6 +759,10 @@ moduleFor(
     }
 
     ['@test it should apply classBinding with only falsy condition']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="myName::shade"}}', {
@@ -761,6 +785,10 @@ moduleFor(
     }
 
     ['@test it should apply nothing when classBinding is falsy but only supplies truthy class']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="myName:respeck"}}', {
@@ -783,6 +811,10 @@ moduleFor(
     }
 
     ['@test it should apply nothing when classBinding is truthy but only supplies falsy class']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="myName::shade"}}', { myName: true });
@@ -803,6 +835,10 @@ moduleFor(
     }
 
     ['@test it should apply classBinding with falsy condition']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="swag:fresh:scrub"}}', {
@@ -825,6 +861,10 @@ moduleFor(
     }
 
     ['@test it should apply classBinding with truthy condition']() {
+      expectDeprecation(
+        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
+      );
+
       this.registerComponent('foo-bar', { template: 'hello' });
 
       this.render('{{foo-bar classBinding="swag:fresh:scrub"}}', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index c498dfd4495..23f8fafe780 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -1303,6 +1303,10 @@ moduleFor(
     }
 
     ['@test non-block with properties on attrs']() {
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.someProp}} should be updated to {{@someProp}}. ('my-app/templates/components/non-block.hbs' @ L1:C24) "
+      );
+
       this.registerComponent('non-block', {
         template: 'In layout - someProp: {{attrs.someProp}}',
       });
@@ -1512,6 +1516,22 @@ moduleFor(
     }
 
     ['@test this.attrs.foo === attrs.foo === @foo === foo']() {
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.value}} should be updated to {{@value}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C8) "
+      );
+
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.value}} should be updated to {{@value}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C31) "
+      );
+
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.items}} should be updated to {{@items}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C82) "
+      );
+
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.items}} should be updated to {{@items}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C135) "
+      );
+
       this.registerComponent('foo-bar', {
         template: strip`
         Args: {{this.attrs.value}} | {{attrs.value}} | {{@value}} | {{this.value}}
@@ -1606,6 +1626,10 @@ moduleFor(
     }
 
     ['@test block with properties on attrs']() {
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.someProp}} should be updated to {{@someProp}}. ('my-app/templates/components/with-block.hbs' @ L1:C24) "
+      );
+
       this.registerComponent('with-block', {
         template: 'In layout - someProp: {{attrs.someProp}} - {{yield}}',
       });
@@ -3521,6 +3545,13 @@ moduleFor(
     }
 
     ['@test using attrs for positional params']() {
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.myVar}} should be updated to {{@myVar}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C10) "
+      );
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.myVar2}} should be updated to {{@myVar2}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C65) "
+      );
+
       let MyComponent = Component.extend();
 
       this.registerComponent('foo-bar', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index 6b98567099c..6fbcb798bf8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -478,13 +478,13 @@ moduleFor(
 
     ['@test nested component helpers']() {
       this.registerComponent('foo-bar', {
-        template: 'yippie! {{attrs.location}} {{yield}}',
+        template: 'yippie! {{@location}} {{yield}}',
       });
       this.registerComponent('baz-qux', {
-        template: 'yummy {{attrs.location}} {{yield}}',
+        template: 'yummy {{@location}} {{yield}}',
       });
       this.registerComponent('corge-grault', {
-        template: 'delicious {{attrs.location}} {{yield}}',
+        template: 'delicious {{@location}} {{yield}}',
       });
 
       this.render(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 9ef1407a36f..829ef19c71a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -320,43 +320,6 @@ moduleFor(
       });
     }
 
-    // See https://github.com/emberjs/ember.js/issues/17771
-    [`@skip The <LinkTo /> component supports 'classNameBindings' with custom values [GH #11699]`](
-      assert
-    ) {
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <LinkTo id='about-link' @route='about' @classNameBindings='foo:foo-is-true:foo-is-false'>About</LinkTo>
-        `
-      );
-
-      this.add(
-        'controller:index',
-        Controller.extend({
-          foo: false,
-        })
-      );
-
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link.foo-is-false').length,
-          1,
-          'The about-link was rendered with the falsy class'
-        );
-
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('foo', true));
-
-        assert.equal(
-          this.$('#about-link.foo-is-true').length,
-          1,
-          'The about-link was rendered with the truthy class after toggling the property'
-        );
-      });
-    }
-
     async ['@test Using <LinkTo> inside a non-routable engine errors'](assert) {
       this.add(
         'engine:not-routable',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 06f162c2917..3e96ddf5e6a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -325,6 +325,10 @@ moduleFor(
     [`@test The {{link-to}} component supports 'classNameBindings' with custom values [GH #11699]`](
       assert
     ) {
+      expectDeprecation(
+        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('my-app/templates/index.hbs' @ L3:C8) "
+      );
+
       this.addTemplate(
         'index',
         `
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index af72049cccd..b08c701407f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -251,6 +251,10 @@ moduleFor(
     }
 
     ['@test [#12718] a nice error is shown when a bound action function is undefined and it is passed as attrs.foo']() {
+      expectDeprecation(
+        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.external-action}} should be updated to {{@external-action}}. ('my-app/templates/components/inner-component.hbs' @ L1:C43) "
+      );
+
       this.registerComponent('inner-component', {
         template:
           '<button id="inner-button" {{action (action attrs.external-action)}}>Click me</button>',
diff --git a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
index 2981c52e2e7..8f7ea8c50ad 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
@@ -1,4 +1,6 @@
+import { deprecate } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
 import { EmberASTPluginEnvironment } from '../types';
 
 /**
@@ -27,6 +29,7 @@ import { EmberASTPluginEnvironment } from '../types';
 
 export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
+  let { moduleName } = env.meta;
 
   let stack: string[][] = [[]];
 
@@ -47,6 +50,26 @@ export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment):
       PathExpression(node: AST.PathExpression): AST.Node | void {
         if (isAttrs(node, stack[stack.length - 1])) {
           let path = b.path(node.original.substr(6)) as AST.PathExpression;
+
+          deprecate(
+            `Using {{attrs}} to reference named arguments has been deprecated. {{attrs.${
+              path.original
+            }}} should be updated to {{@${path.original}}}. ${calculateLocationDisplay(
+              moduleName,
+              node.loc
+            )}`,
+            false,
+            {
+              id: 'attrs-arg-access',
+              url: 'https://deprecations.emberjs.com/v3.x/#toc_attrs-arg-access',
+              until: '4.0.0',
+              for: 'ember-source',
+              since: {
+                enabled: '3.26.0',
+              },
+            }
+          );
+
           path.original = `@${path.original}`;
           path.data = true;
           return path;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
index b18447583fc..805b0cecfad 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
@@ -1,25 +1,32 @@
+import { deprecate } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
 import { Builders, EmberASTPluginEnvironment } from '../types';
 
 export default function transformOldClassBindingSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
   let b = env.syntax.builders;
+  let { moduleName } = env.meta;
 
   return {
     name: 'transform-old-class-binding-syntax',
 
     visitor: {
       MustacheStatement(node: AST.MustacheStatement) {
-        process(b, node);
+        process(b, node, moduleName);
       },
 
       BlockStatement(node: AST.BlockStatement) {
-        process(b, node);
+        process(b, node, moduleName);
       },
     },
   };
 }
 
-function process(b: Builders, node: AST.BlockStatement | AST.MustacheStatement) {
+function process(
+  b: Builders,
+  node: AST.BlockStatement | AST.MustacheStatement,
+  moduleName: string
+) {
   let allOfTheMicrosyntaxes: AST.HashPair[] = [];
   let allOfTheMicrosyntaxIndexes: number[] = [];
   let classPair: AST.HashPair | undefined;
@@ -28,6 +35,24 @@ function process(b: Builders, node: AST.BlockStatement | AST.MustacheStatement)
     let { key } = pair;
 
     if (key === 'classBinding' || key === 'classNameBindings') {
+      deprecate(
+        `Passing the \`${key}\` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ${calculateLocationDisplay(
+          moduleName,
+          node.loc
+        )}`,
+        false,
+        {
+          id: 'class-binding-and-class-name-bindings-in-templates',
+          url:
+            'https://deprecations.emberjs.com/v3.x/#toc_class-binding-and-class-name-bindings-in-templates',
+          until: '4.0.0',
+          for: 'ember-source',
+          since: {
+            enabled: '3.26.0',
+          },
+        }
+      );
+
       allOfTheMicrosyntaxIndexes.push(index);
       allOfTheMicrosyntaxes.push(pair);
     } else if (key === 'class') {

From b9e19460ea30e5e214863aa8edf27194dda0865a Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Tue, 2 Feb 2021 23:22:00 +0000
Subject: [PATCH 0341/1405] Add hasBlock and hasBlockParams deprecation
 messages

---
 .../components/contextual-components-test.js  | 11 +++
 .../components/curly-components-test.js       | 84 +++++++++++++++++++
 .../lib/plugins/transform-has-block-syntax.ts | 25 +++++-
 3 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index 60b18b65fa7..3920ae482c2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1359,6 +1359,9 @@ moduleFor(
     }
 
     ['@test GH#18732 hasBlock works within a yielded curried component invoked within mustaches']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
+      );
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
         template: '<div>{{hasBlock}}</div>',
@@ -1381,6 +1384,10 @@ moduleFor(
     }
 
     ['@test GH#18732 has-block works within a yielded curried component invoked with angle bracket invocation (falsy)']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
         template: '<div>{{hasBlock}}</div>',
@@ -1403,6 +1410,10 @@ moduleFor(
     }
 
     ['@test GH#18732 has-block works within a yielded curried component invoked with angle bracket invocation (truthy)']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
         template: '<div>{{hasBlock}}</div>',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 7b9f65c8f69..c2ae8cbd9bb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -1928,6 +1928,10 @@ moduleFor(
     }
 
     ['@test hasBlock is true when block supplied']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('with-block', {
         template: strip`
         {{#if hasBlock}}
@@ -1950,6 +1954,10 @@ moduleFor(
     }
 
     ['@test hasBlock is false when no block supplied']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('with-block', {
         template: strip`
         {{#if hasBlock}}
@@ -1969,6 +1977,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams is true when block param supplied']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('with-block', {
         template: strip`
         {{#if hasBlockParams}}
@@ -1991,6 +2003,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams is false when no block param supplied']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('with-block', {
         template: strip`
         {{#if hasBlockParams}}
@@ -2118,6 +2134,10 @@ moduleFor(
     }
 
     ['@test expression hasBlock inverse']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-inverse.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-inverse', {
         template: strip`
         {{#if (hasBlock "inverse")}}
@@ -2138,6 +2158,10 @@ moduleFor(
     }
 
     ['@test expression hasBlock default']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-block', {
         template: strip`
         {{#if (hasBlock)}}
@@ -2158,6 +2182,10 @@ moduleFor(
     }
 
     ['@test expression hasBlockParams inverse']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-inverse.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-inverse', {
         template: strip`
         {{#if (hasBlockParams "inverse")}}
@@ -2178,6 +2206,10 @@ moduleFor(
     }
 
     ['@test expression hasBlockParams default']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-block', {
         template: strip`
         {{#if (hasBlockParams)}}
@@ -2198,6 +2230,10 @@ moduleFor(
     }
 
     ['@test non-expression hasBlock']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-block.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-block', {
         template: strip`
         {{#if hasBlock}}
@@ -2218,6 +2254,10 @@ moduleFor(
     }
 
     ['@test expression hasBlockParams']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-params.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-params', {
         template: strip`
         {{#if (hasBlockParams)}}
@@ -2238,6 +2278,10 @@ moduleFor(
     }
 
     ['@test non-expression hasBlockParams']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-params.hbs' @ L1:C6) `
+      );
+
       this.registerComponent('check-params', {
         template: strip`
         {{#if hasBlockParams}}
@@ -2258,6 +2302,10 @@ moduleFor(
     }
 
     ['@test hasBlock expression in an attribute'](assert) {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
+      );
+
       this.registerComponent('check-attr', {
         template: '<button name={{hasBlock}}></button>',
       });
@@ -2273,6 +2321,10 @@ moduleFor(
     }
 
     ['@test hasBlock inverse expression in an attribute'](assert) {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
+      );
+
       this.registerComponent(
         'check-attr',
         {
@@ -2292,6 +2344,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams expression in an attribute'](assert) {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
+      );
+
       this.registerComponent('check-attr', {
         template: '<button name={{hasBlockParams}}></button>',
       });
@@ -2307,6 +2363,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams inverse expression in an attribute'](assert) {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
+      );
+
       this.registerComponent(
         'check-attr',
         {
@@ -2326,6 +2386,10 @@ moduleFor(
     }
 
     ['@test hasBlock as a param to a helper']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('check-helper', {
         template: '{{if hasBlock "true" "false"}}',
       });
@@ -2341,6 +2405,10 @@ moduleFor(
     }
 
     ['@test hasBlock as an expression param to a helper']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('check-helper', {
         template: '{{if (hasBlock) "true" "false"}}',
       });
@@ -2356,6 +2424,10 @@ moduleFor(
     }
 
     ['@test hasBlock inverse as a param to a helper']() {
+      expectDeprecation(
+        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('check-helper', {
         template: '{{if (hasBlock "inverse") "true" "false"}}',
       });
@@ -2371,6 +2443,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams as a param to a helper']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('check-helper', {
         template: '{{if hasBlockParams "true" "false"}}',
       });
@@ -2386,6 +2462,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams as an expression param to a helper']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('check-helper', {
         template: '{{if (hasBlockParams) "true" "false"}}',
       });
@@ -2401,6 +2481,10 @@ moduleFor(
     }
 
     ['@test hasBlockParams inverse as a param to a helper']() {
+      expectDeprecation(
+        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
+      );
+
       this.registerComponent('check-helper', {
         template: '{{if (hasBlockParams "inverse") "true" "false"}}',
       });
diff --git a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
index 0a9a4e090b7..5bf41da1fa3 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
@@ -1,4 +1,6 @@
+import { deprecate } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
 import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
@@ -23,13 +25,31 @@ import { isPath } from './utils';
   @class TransformHasBlockSyntax
 */
 
-const TRANSFORMATIONS = {
+const TRANSFORMATIONS: { [key: string]: string } = {
   hasBlock: 'has-block',
   hasBlockParams: 'has-block-params',
 };
 
 export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
+  let { moduleName } = env.meta;
+
+  function emitDeprecationMessage(node: AST.Node, name: string) {
+    let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
+    deprecate(
+      `\`${name}\` is deprecated. Use \`${TRANSFORMATIONS[name]}\` instead. ${sourceInformation}`,
+      false,
+      {
+        id: 'has-block-and-has-block-params',
+        until: '4.0.0',
+        url: 'https://emberjs.com/deprecations/v3.x#toc_has-block-and-has-block-params',
+        for: 'ember-source',
+        since: {
+          enabled: '3.25.0',
+        },
+      }
+    );
+  }
 
   return {
     name: 'transform-has-block-syntax',
@@ -37,11 +57,13 @@ export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment):
     visitor: {
       PathExpression(node: AST.PathExpression): AST.Node | void {
         if (TRANSFORMATIONS[node.original]) {
+          emitDeprecationMessage(node, node.original);
           return b.sexpr(b.path(TRANSFORMATIONS[node.original]));
         }
       },
       MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
         if (isPath(node.path) && TRANSFORMATIONS[node.path.original]) {
+          emitDeprecationMessage(node, node.path.original);
           return b.mustache(
             b.path(TRANSFORMATIONS[node.path.original]),
             node.params,
@@ -53,6 +75,7 @@ export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment):
       },
       SubExpression(node: AST.SubExpression): AST.Node | void {
         if (isPath(node.path) && TRANSFORMATIONS[node.path.original]) {
+          emitDeprecationMessage(node, node.path.original);
           return b.sexpr(b.path(TRANSFORMATIONS[node.path.original]), node.params, node.hash);
         }
       },

From bd7833770f03dc3be95ec945013e3d2976d2317f Mon Sep 17 00:00:00 2001
From: sandstrom <mail+github@a16m.se>
Date: Wed, 3 Feb 2021 18:08:29 +0100
Subject: [PATCH 0342/1405] ES6 property syntax in Location example

---
 packages/@ember/-internals/routing/lib/location/api.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index 2412c4d0098..208f0756b59 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -58,13 +58,16 @@ export type UpdateCallback = (url: string) => void;
   import HistoryLocation from '@ember/routing/history-location';
 
   export default class MyHistory {
-    implementation: 'my-custom-history',
+    implementation = 'my-custom-history';
+
     constructor() {
       this._history = HistoryLocation.create(...arguments);
     }
+
     create() {
       return new this(...arguments);
     }
+
     pushState(path) {
        this._history.pushState(path);
     }

From bf78b4e18cf407aa323375f32d4514c283f25fda Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Wed, 3 Feb 2021 14:59:08 -0500
Subject: [PATCH 0343/1405] Fix typo in template-only-glimmer-components
 feature detection

Fixes #19377
---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 6b13ac35ebc..3af916860e7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -143,7 +143,7 @@ module.exports = {
 
       if (
         optionalFeaturesMissing ||
-        !optionalFeatures.isFeatureEnabled('template-only-glimmer-compoents')
+        !optionalFeatures.isFeatureEnabled('template-only-glimmer-components')
       ) {
         this.ui.writeWarnLine(
           'Setting the `template-only-glimmer-components` optional feature flag to `false`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `true`. You can also run `npx @ember/octanify` to do this. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-template-only-glimmer-components'

From c43bd612d1b8c001389b68b4d4aef1b4a08de727 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 3 Feb 2021 16:20:34 -0800
Subject: [PATCH 0344/1405] [CLEANUP] Refactor DataAdapter to not use observers
 or array observers

The DataAdapter class is exposed specifically for the Ember Inspector to
support Ember Data. Currently, the adapter relies on both array
observers and standard observers. This PR refactors the adapter to use
autotracking-based methods for tracking changes instead, with minimal
API churn.

The main change is to introduce a regular poll that checks for changes
after each backburner runloop. There are two types of polling done:

1. `TypeWatcher`, which checks to see if a record array has changed at
   all (e.g. contents have changed)
2. `RecordsWatcher`, which watches the array as a whole _and_ the
   individual records within it. Whenever any changes occur, it
   reiterates the records array, and looks for new records, updated
   records, and removed records, and notifies of any changes.

This removes the need for both array observers _and_ standard observers.
Standard observers were previously used to detect changes on the model
instances, but now we autotrack _serializing_ them, and that
autotracking is used to detect if they've been updated.

\## Breaking Changes

- The `recordsRemoved` callback from `watchRecords` has changed. It now
  receives an array of removed records, _not_ an index and count. On the
  consuming side in Ember Inspector, we'll have to update the code to
  remove the items passed via id explicitly.
- The `observeRecord` method has been removed. Because serializing the
  object _is_ observing it (via autotracking) there is no need to
  manually observe it. Users who are still implementing this method
  (e.g. Ember Data) can still keep it, and it shouldn't cause issues, it
  just will no longer be called.
---
 .../extension-support/lib/data_adapter.js     | 277 +++++++++++++-----
 .../tests/data_adapter_test.js                |  51 +---
 tests/docs/expected.js                        |  52 ++--
 3 files changed, 239 insertions(+), 141 deletions(-)

diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.js
index eedb6e92d4b..19ce87ceb13 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.js
@@ -1,8 +1,123 @@
 import { getOwner } from '@ember/-internals/owner';
-import { scheduleOnce } from '@ember/runloop';
-import { get, objectAt, addArrayObserver, removeArrayObserver } from '@ember/-internals/metal';
+import { backburner } from '@ember/runloop';
+import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
+import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
+
+function iterate(arr, fn) {
+  if (HAS_NATIVE_SYMBOL && Symbol.iterator in arr) {
+    for (let item of arr) {
+      fn(item);
+    }
+  } else {
+    arr.forEach(fn);
+  }
+}
+
+class RecordsWatcher {
+  recordCaches = new Map();
+
+  added = [];
+  updated = [];
+  removed = [];
+
+  getCacheForItem(record) {
+    let recordCache = this.recordCaches.get(record);
+
+    if (!recordCache) {
+      let hasBeenAdded = false;
+
+      recordCache = createCache(() => {
+        if (!hasBeenAdded) {
+          this.added.push(this.wrapRecord(record));
+          hasBeenAdded = true;
+        } else {
+          this.updated.push(this.wrapRecord(record));
+        }
+      });
+
+      this.recordCaches.set(record, recordCache);
+    }
+
+    return recordCache;
+  }
+
+  constructor(records, recordsAdded, recordsUpdated, recordsRemoved, wrapRecord, release) {
+    this.release = release;
+    this.wrapRecord = wrapRecord;
+
+    this.recordArrayCache = createCache(() => {
+      let seen = new Set();
+
+      // Track `[]` for legacy support
+      consumeTag(tagFor(records, '[]'));
+
+      iterate(records, (record) => {
+        getValue(this.getCacheForItem(record));
+        seen.add(record);
+      });
+
+      // Untrack this operation because these records are being removed, they
+      // should not be polled again in the future
+      untrack(() => {
+        this.recordCaches.forEach((cache, record) => {
+          if (!seen.has(record)) {
+            this.removed.push(wrapRecord(record));
+            this.recordCaches.delete(record);
+          }
+        });
+      });
+
+      if (this.added.length > 0) {
+        recordsAdded(this.added);
+        this.added = [];
+      }
+
+      if (this.updated.length > 0) {
+        recordsUpdated(this.updated);
+        this.updated = [];
+      }
+
+      if (this.removed.length > 0) {
+        recordsRemoved(this.removed);
+        this.removed = [];
+      }
+    });
+  }
+
+  revalidate() {
+    getValue(this.recordArrayCache);
+  }
+}
+
+class TypeWatcher {
+  constructor(records, onChange, release) {
+    let hasBeenAccessed = false;
+
+    this.cache = createCache(() => {
+      // Empty iteration, we're doing this just
+      // to track changes to the records array
+      iterate(records, () => {});
+
+      // Also track `[]` for legacy support
+      consumeTag(tagFor(records, '[]'));
+
+      if (hasBeenAccessed === true) {
+        onChange();
+      } else {
+        hasBeenAccessed = true;
+      }
+    });
+
+    this.release = release;
+  }
+
+  revalidate() {
+    getValue(this.cache);
+  }
+}
 
 /**
 @module @ember/debug
@@ -28,7 +143,6 @@ import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals
   * `getRecordKeywords`
   * `getRecordFilterValues`
   * `getRecordColor`
-  * `observeRecord`
 
   The adapter will need to be registered
   in the application's container as `dataAdapter:main`.
@@ -53,6 +167,9 @@ export default EmberObject.extend({
   init() {
     this._super(...arguments);
     this.releaseMethods = emberA();
+    this.recordsWatchers = new Map();
+    this.typeWatchers = new Map();
+    this.flushWatchers = null;
   },
 
   /**
@@ -92,6 +209,31 @@ export default EmberObject.extend({
    */
   acceptsModelName: true,
 
+  /**
+     Map from records arrays to RecordsWatcher instances
+
+     @private
+     @property recordsWatchers
+     @since 3.26.0
+   */
+
+  /**
+    Map from records arrays to TypeWatcher instances
+
+    @private
+    @property typeWatchers
+    @since 3.26.0
+   */
+
+  /**
+    Callback that is currently scheduled on backburner end to flush and check
+    all active watchers.
+
+    @private
+    @property flushWatchers
+    @since 3.26.0
+   */
+
   /**
     Stores all methods that clear observers.
     These methods will be called on destruction.
@@ -100,7 +242,6 @@ export default EmberObject.extend({
     @property releaseMethods
     @since 1.3.0
   */
-  releaseMethods: emberA(),
 
   /**
     Specifies how records can be filtered.
@@ -179,58 +320,53 @@ export default EmberObject.extend({
     Takes an array of objects containing wrapped records.
 
     @param {Function} recordsRemoved Callback to call when a record has removed.
-    Takes the following parameters:
-      index: The array index where the records were removed.
-      count: The number of records removed.
+    Takes an array of objects containing wrapped records.
 
     @return {Function} Method to call to remove all observers.
   */
   watchRecords(modelName, recordsAdded, recordsUpdated, recordsRemoved) {
-    let releaseMethods = emberA();
     let klass = this._nameToClass(modelName);
     let records = this.getRecords(klass, modelName);
-    let release;
+    let { recordsWatchers } = this;
+
+    let recordsWatcher = recordsWatchers.get(records);
+
+    if (!recordsWatcher) {
+      recordsWatcher = new RecordsWatcher(
+        records,
+        recordsAdded,
+        recordsUpdated,
+        recordsRemoved,
+        (record) => this.wrapRecord(record),
+        () => {
+          recordsWatchers.delete(records);
+          this.updateFlushWatchers();
+        }
+      );
+
+      recordsWatchers.set(records, recordsWatcher);
+      this.updateFlushWatchers();
 
-    function recordUpdated(updatedRecord) {
-      recordsUpdated([updatedRecord]);
+      recordsWatcher.revalidate();
     }
 
-    let recordsToSend = records.map((record) => {
-      releaseMethods.push(this.observeRecord(record, recordUpdated));
-      return this.wrapRecord(record);
-    });
+    return recordsWatcher.release;
+  },
 
-    let contentDidChange = (array, idx, removedCount, addedCount) => {
-      for (let i = idx; i < idx + addedCount; i++) {
-        let record = objectAt(array, i);
-        let wrapped = this.wrapRecord(record);
-        releaseMethods.push(this.observeRecord(record, recordUpdated));
-        recordsAdded([wrapped]);
-      }
+  updateFlushWatchers() {
+    if (this.flushWatchers === null) {
+      if (this.typeWatchers.size > 0 || this.recordsWatchers.size > 0) {
+        this.flushWatchers = () => {
+          this.typeWatchers.forEach((watcher) => watcher.revalidate());
+          this.recordsWatchers.forEach((watcher) => watcher.revalidate());
+        };
 
-      if (removedCount) {
-        recordsRemoved(idx, removedCount);
+        backburner.on('end', this.flushWatchers);
       }
-    };
-
-    let observer = {
-      didChange: contentDidChange,
-      willChange() {
-        return this;
-      },
-    };
-    addArrayObserver(records, this, observer);
-
-    release = () => {
-      releaseMethods.forEach((fn) => fn());
-      removeArrayObserver(records, this, observer);
-      this.releaseMethods.removeObject(release);
-    };
-
-    recordsAdded(recordsToSend);
-
-    this.releaseMethods.pushObject(release);
-    return release;
+    } else if (this.typeWatchers.size === 0 && this.recordsWatchers.size === 0) {
+      backburner.off('end', this.flushWatchers);
+      this.flushWatchers = null;
+    }
   },
 
   /**
@@ -240,7 +376,15 @@ export default EmberObject.extend({
   */
   willDestroy() {
     this._super(...arguments);
+
+    this.typeWatchers.forEach((watcher) => watcher.release());
+    this.recordsWatchers.forEach((watcher) => watcher.release());
+
     this.releaseMethods.forEach((fn) => fn());
+
+    if (this.flushWatchers) {
+      backburner.off('end', this.flushWatchers);
+    }
   },
 
   /**
@@ -284,28 +428,27 @@ export default EmberObject.extend({
     let klass = this._nameToClass(modelName);
     let records = this.getRecords(klass, modelName);
 
-    function onChange() {
+    let onChange = () => {
       typesUpdated([this.wrapModelType(klass, modelName)]);
-    }
-
-    let observer = {
-      didChange(array, idx, removedCount, addedCount) {
-        // Only re-fetch records if the record count changed
-        // (which is all we care about as far as model types are concerned).
-        if (removedCount > 0 || addedCount > 0) {
-          scheduleOnce('actions', this, onChange);
-        }
-      },
-      willChange() {
-        return this;
-      },
     };
 
-    addArrayObserver(records, this, observer);
+    let { typeWatchers } = this;
 
-    let release = () => removeArrayObserver(records, this, observer);
+    let typeWatcher = typeWatchers.get(records);
 
-    return release;
+    if (!typeWatcher) {
+      typeWatcher = new TypeWatcher(records, onChange, () => {
+        typeWatchers.delete(records);
+        this.updateFlushWatchers();
+      });
+
+      typeWatchers.set(records, typeWatcher);
+      this.updateFlushWatchers();
+
+      typeWatcher.revalidate();
+    }
+
+    return typeWatcher.release;
   },
 
   /**
@@ -478,16 +621,4 @@ export default EmberObject.extend({
   getRecordColor() {
     return null;
   },
-
-  /**
-    Observes all relevant properties and re-sends the wrapped record
-    when a change occurs.
-
-    @public
-    @method observerRecord
-    @return {Function} The function to call to remove all observers.
-  */
-  observeRecord() {
-    return function () {};
-  },
 });
diff --git a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
index a6ae1f0b28b..9dabc566616 100644
--- a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
+++ b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
@@ -1,5 +1,5 @@
 import { run } from '@ember/runloop';
-import { get, set, addObserver, removeObserver } from '@ember/-internals/metal';
+import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 import EmberDataAdapter from '../lib/data_adapter';
 import { moduleFor, ApplicationTestCase, runLoopSettled } from 'internal-test-helpers';
@@ -159,36 +159,6 @@ moduleFor(
       });
     }
 
-    ['@test Model Types Updated but Unchanged Do not Trigger Callbacks'](assert) {
-      assert.expect(0);
-      let records = emberA([1, 2, 3]);
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords() {
-            return records;
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(() => {
-        adapter = this.applicationInstance.lookup('data-adapter:main');
-
-        function modelTypesAdded() {
-          run(() => {
-            records.arrayContentDidChange(0, 0, 0);
-          });
-        }
-
-        function modelTypesUpdated() {
-          assert.ok(false, "modelTypesUpdated should not be triggered if the array didn't change");
-        }
-
-        adapter.watchModelTypes(modelTypesAdded, modelTypesUpdated);
-      });
-    }
-
     ['@test Records Added'](assert) {
       let countAdded = 1;
       let post = PostClass.create();
@@ -250,16 +220,6 @@ moduleFor(
           getRecords() {
             return recordList;
           },
-          observeRecord(record, recordUpdated) {
-            let self = this;
-            function callback() {
-              recordUpdated(self.wrapRecord(record));
-            }
-            addObserver(record, 'title', callback);
-            return function () {
-              removeObserver(record, 'title', callback);
-            };
-          },
           getRecordColumnValues(record) {
             return { title: get(record, 'title') };
           },
@@ -273,8 +233,8 @@ moduleFor(
         .then(() => {
           adapter = this.applicationInstance.lookup('data-adapter:main');
 
-          function recordsAdded() {
-            set(post, 'title', 'Post Modified');
+          function recordsAdded(records) {
+            assert.equal(records[0].columnValues.title, 'Post', 'Post added correctly');
           }
 
           function recordsUpdated(records) {
@@ -286,6 +246,11 @@ moduleFor(
 
           return runLoopSettled();
         })
+        .then(() => {
+          set(post, 'title', 'Post Modified');
+
+          return runLoopSettled();
+        })
         .then(() => {
           release();
           set(post, 'title', 'New Title');
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 7656fc6bd92..71a48b47911 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -115,9 +115,9 @@ module.exports = {
     'cacheFor',
     'camelize',
     'canCatalogEntriesByType',
-    'canInvoke',
     'cancel',
     'cancelRouterSetup',
+    'canInvoke',
     'capabilities',
     'capitalize',
     'captureRenderTree',
@@ -127,9 +127,9 @@ module.exports = {
     'checkWaiters',
     'child',
     'childViews',
+    'classify',
     'classNameBindings',
     'classNames',
-    'classify',
     'clear',
     'click',
     'cloneParentDependencies',
@@ -151,6 +151,7 @@ module.exports = {
     'controllerName',
     'copy',
     'create',
+    'createCache',
     'current-when',
     'currentPath',
     'currentRoute',
@@ -195,8 +196,8 @@ module.exports = {
     'disconnectOutlet',
     'document',
     'domReady',
-    'each',
     'each-in',
+    'each',
     'eachComputedProperty',
     'element',
     'elementId',
@@ -228,6 +229,7 @@ module.exports = {
     'findModel',
     'findWithAssert',
     'firstObject',
+    'flushWatchers',
     'fn',
     'focusIn',
     'focusOut',
@@ -255,6 +257,7 @@ module.exports = {
     'getRecords',
     'getRootViews',
     'getURL',
+    'getValue',
     'getViewBoundingClientRect',
     'getViewBounds',
     'getViewClientRects',
@@ -272,12 +275,12 @@ module.exports = {
     'hasArrayObservers',
     'hasBlock',
     'hasBlockParams',
+    'hash',
+    'hashSettled',
     'hasListeners',
     'hasObserverFor',
     'hasRegistration',
     'hasRoute',
-    'hash',
-    'hashSettled',
     'helper',
     'helperContainer',
     'history',
@@ -290,11 +293,11 @@ module.exports = {
     'indexOf',
     'info',
     'init',
-    'initState',
     'initializer',
+    'initState',
     'inject',
-    'injectTestHelpers',
     'injection',
+    'injectTestHelpers',
     'input',
     'insertAt',
     'insertNewline',
@@ -313,6 +316,7 @@ module.exports = {
     'isBrowser',
     'isClassicDecorator',
     'isComputed',
+    'isConst',
     'isDestroyed',
     'isDestroying',
     'isEmpty',
@@ -329,8 +333,8 @@ module.exports = {
     'isRejected',
     'isSettled',
     'isVisible',
-    'jQuery',
     'join',
+    'jQuery',
     'keyDown',
     'keyEvent',
     'keyPress',
@@ -391,16 +395,15 @@ module.exports = {
     'objectsAt',
     'observeModelType',
     'observer',
-    'observerRecord',
     'observes',
     'off',
     'on',
-    'onInjectHelpers',
-    'onLoad',
-    'onUpdateURL',
     'once',
     'one',
     'oneWay',
+    'onInjectHelpers',
+    'onLoad',
+    'onUpdateURL',
     'options',
     'optionsForType',
     'or',
@@ -431,14 +434,15 @@ module.exports = {
     'queues',
     'race',
     'readDOMAttr',
-    'readOnly',
     'readonly',
+    'readOnly',
     'reads',
     'ready',
     'reason',
     'recognize',
     'recognizeAndLoad',
     'recompute',
+    'recordsWatchers',
     'redirect',
     'reduce',
     'refresh',
@@ -446,15 +450,15 @@ module.exports = {
     'registerAsyncHelper',
     'registerDeprecationHandler',
     'registerDestructor',
+    'registeredActions',
+    'registeredOption',
+    'registeredOptions',
+    'registeredOptionsForType',
     'registerHelper',
     'registerOptions',
     'registerOptionsForType',
     'registerWaiter',
     'registerWarnHandler',
-    'registeredActions',
-    'registeredOption',
-    'registeredOptions',
-    'registeredOptionsForType',
     'registrations',
     'registry',
     'reject',
@@ -486,12 +490,12 @@ module.exports = {
     'resolveHelper',
     'resolveModel',
     'resolveOther',
+    'resolver',
     'resolveRegistration',
+    'resolverFor',
     'resolveRoute',
     'resolveTemplate',
     'resolveView',
-    'resolver',
-    'resolverFor',
     'resumeTest',
     'rethrow',
     'retry',
@@ -524,12 +528,12 @@ module.exports = {
     'setObjects',
     'setOwner',
     'setProperties',
-    'setURL',
     'setup',
     'setupController',
     'setupForTesting',
     'setupHandler',
     'setupRegistry',
+    'setURL',
     'shiftObject',
     'shouldRender',
     'size',
@@ -555,8 +559,8 @@ module.exports = {
     'title',
     'to',
     'toArray',
-    'toString',
     'toggleProperty',
+    'toString',
     'tracked',
     'transitionTo',
     'transitionToRoute',
@@ -569,6 +573,7 @@ module.exports = {
     'type',
     'typeInjection',
     'typeOf',
+    'typeWatchers',
     'unbound',
     'underscore',
     'union',
@@ -584,8 +589,8 @@ module.exports = {
     'unsubscribe',
     'url',
     'urlFor',
-    'useRouterNaming',
     'userAgent',
+    'useRouterNaming',
     'validationCache',
     'value',
     'visit',
@@ -609,8 +614,5 @@ module.exports = {
     'wrapModelType',
     'wrapRecord',
     'yield',
-    'createCache',
-    'getValue',
-    'isConst',
   ],
 };

From 71f9cd0c2212cbce988a6056bac08bf2c6c9db6c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 3 Feb 2021 16:31:18 -0800
Subject: [PATCH 0345/1405] [DEPRECATION] Add Array Observers deprecation

Adds the array observers deprecation specified in RFC 692: https://github.com/emberjs/rfcs/blob/master/text/0692-deprecate-array-observers.md
---
 packages/@ember/-internals/metal/lib/array.ts | 43 ++++++++++++++++---
 .../runtime/lib/system/array_proxy.js         |  4 +-
 .../runtime/tests/mixins/array_test.js        |  2 +
 .../tests/mutable-array/replace-test.js       |  2 +
 .../system/array_proxy/array_observer_test.js |  8 +++-
 5 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index 69142a5d2bc..92043a6128e 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -1,4 +1,5 @@
-import { EmberArray } from '@ember/-internals/utils';
+import { EmberArray, getDebugName } from '@ember/-internals/utils';
+import { deprecate } from '@ember/debug';
 import { arrayContentDidChange, arrayContentWillChange } from './array_events';
 import { addListener, removeListener } from './events';
 import { notifyPropertyChange } from './property_events';
@@ -91,16 +92,48 @@ function arrayObserversHelper(
 
 export function addArrayObserver<T>(
   array: EmberArray<T>,
-  target: any,
-  opts?: ArrayObserverOptions | undefined
+  target: object | Function | null,
+  opts?: ArrayObserverOptions | undefined,
+  suppress = false
 ): ObjectHasArrayObservers {
+  deprecate(
+    `Array observers have been deprecated. Added an array observer to ${getDebugName?.(array)}.`,
+    suppress,
+    {
+      id: 'array-observers',
+      url: 'https://deprecations.emberjs.com/v3.x#toc_array-observers',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.26.0-beta.1',
+      },
+    }
+  );
+
   return arrayObserversHelper(array, target, opts, addListener, false);
 }
 
 export function removeArrayObserver<T>(
   array: EmberArray<T>,
-  target: any,
-  opts?: ArrayObserverOptions | undefined
+  target: object | Function | null,
+  opts?: ArrayObserverOptions | undefined,
+  suppress = false
 ): ObjectHasArrayObservers {
+  deprecate(
+    `Array observers have been deprecated. Removed an array observer from ${getDebugName?.(
+      array
+    )}.`,
+    suppress,
+    {
+      id: 'array-observers',
+      url: 'https://deprecations.emberjs.com/v3.x#toc_array-observers',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.26.0-beta.1',
+      },
+    }
+  );
+
   return arrayObserversHelper(array, target, opts, removeListener, true);
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
index dee23f09437..8fed955c0a9 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
@@ -272,7 +272,7 @@ export default class ArrayProxy extends EmberObject {
         isArray(arrangedContent) || arrangedContent.isDestroyed
       );
 
-      addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING);
+      addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING, true);
 
       this._arrangedContent = arrangedContent;
     }
@@ -280,7 +280,7 @@ export default class ArrayProxy extends EmberObject {
 
   _removeArrangedContentArrayObserver() {
     if (this._arrangedContent) {
-      removeArrayObserver(this._arrangedContent, this, ARRAY_OBSERVER_MAPPING);
+      removeArrayObserver(this._arrangedContent, this, ARRAY_OBSERVER_MAPPING, true);
     }
   }
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index ca46d2af4e5..49b158919ae 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -196,6 +196,8 @@ moduleFor(
   'notify array observers',
   class extends AbstractTestCase {
     beforeEach(assert) {
+      expectDeprecation(/Array observers have been deprecated/);
+
       obj = DummyArray.create();
 
       observer = EmberObject.extend({
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
index 8d684149895..afa44afd6f2 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
@@ -241,6 +241,8 @@ class ReplaceTests extends AbstractTestCase {
   }
 
   async '@test Adding object should notify array observer'() {
+    expectDeprecation(/Array observers have been deprecated/);
+
     let fixtures = newFixture(4);
     let obj = this.newObject(fixtures);
     let observer = this.newObserver(obj).observeArray(obj);
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js
index 21d7cebf268..8515d192521 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js
@@ -7,7 +7,9 @@ moduleFor(
   'ArrayProxy - array observers',
   class extends AbstractTestCase {
     ['@test mutating content'](assert) {
-      assert.expect(4);
+      expectDeprecation(/Array observers have been deprecated/);
+
+      assert.expect(5);
 
       let content = A(['x', 'y', 'z']);
       let proxy = ArrayProxy.create({ content });
@@ -28,7 +30,9 @@ moduleFor(
     }
 
     ['@test assigning content'](assert) {
-      assert.expect(4);
+      expectDeprecation(/Array observers have been deprecated/);
+
+      assert.expect(5);
 
       let content = A(['x', 'y', 'z']);
       let proxy = ArrayProxy.create({ content });

From a5ea5f969ceea31b98d51cdeca9705d75894eb14 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 5 Feb 2021 13:55:50 -0800
Subject: [PATCH 0346/1405] RFC: 680 - Deprecate Implicit Injection on
 arbitrary Ember Framework objects

---
 .../extension-support/lib/data_adapter.js     |   4 +-
 .../tests/data_adapter_test.js                |  18 +-
 .../-internals/routing/lib/ext/controller.ts  |  10 +
 .../-internals/routing/lib/system/route.ts    |  17 +-
 .../-internals/routing/lib/system/router.ts   |   7 +
 .../runtime/lib/system/core_object.js         |  78 ++++++-
 .../tests/system/object/create_test.js        | 214 +++++++++++++++++-
 .../@ember/-internals/utils/lib/inspect.ts    |   3 +
 .../@ember/application/lib/application.js     |   4 +-
 .../application/tests/application_test.js     |  18 --
 .../controller/tests/controller_test.js       |   8 +
 packages/@ember/engine/index.js               |  11 -
 packages/@ember/engine/instance.js            |   3 +-
 packages/@ember/engine/tests/engine_test.js   |  16 --
 14 files changed, 345 insertions(+), 66 deletions(-)

diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.js
index 19ce87ceb13..24956cd2d26 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.js
@@ -166,6 +166,9 @@ class TypeWatcher {
 export default EmberObject.extend({
   init() {
     this._super(...arguments);
+
+    this.containerDebugAdapter = getOwner(this).lookup('container-debug-adapter:main');
+
     this.releaseMethods = emberA();
     this.recordsWatchers = new Map();
     this.typeWatchers = new Map();
@@ -181,7 +184,6 @@ export default EmberObject.extend({
     @since 1.5.0
     @public
   **/
-  containerDebugAdapter: undefined,
 
   /**
     The number of attributes to send
diff --git a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
index 9dabc566616..c71287a126e 100644
--- a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
+++ b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
@@ -15,13 +15,17 @@ const DataAdapter = EmberDataAdapter.extend({
   },
   init() {
     this._super(...arguments);
-    this.set('containerDebugAdapter', {
-      canCatalogEntriesByType() {
-        return true;
-      },
-      catalogEntriesByType() {
-        return emberA(['post']);
-      },
+    Object.defineProperty(this, 'containerDebugAdapter', {
+      get() {
+        return {
+          canCatalogEntriesByType() {
+            return true;
+          },
+          catalogEntriesByType() {
+            return emberA(['post']);
+          },
+        }
+      }
     });
   },
 });
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index f56c36cf6e5..c25eae563eb 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -1,4 +1,5 @@
 import { get } from '@ember/-internals/metal';
+import { getOwner } from '@ember/-internals/owner';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
 import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
 
@@ -9,6 +10,15 @@ import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
 ControllerMixin.reopen({
   concatenatedProperties: ['queryParams'],
 
+  init() {
+    this._super(...arguments);
+    let owner = getOwner(this);
+    if (owner) {
+      this.namespace = owner.lookup('application:main');
+      this.target = owner.lookup('router:main');
+    }
+  }
+
   /**
     Defines which query parameters the controller accepts.
     If you give the names `['category','page']` it will bind
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index f19ae455eeb..a05eb124214 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -11,6 +11,7 @@ import {
   setProperties,
 } from '@ember/-internals/metal';
 import { getOwner, Owner } from '@ember/-internals/owner';
+import { BucketCache } from '@ember/-internals/routing';
 import {
   A as emberA,
   ActionHandler,
@@ -100,8 +101,22 @@ class Route extends EmberObject implements IRoute {
   controller!: Controller;
   currentModel: unknown;
 
+  _bucketCache: BucketCache | undefined;
   _internalName!: string;
   _names: unknown;
+  _router: EmberRouter | undefined;
+
+  constructor() {
+    super(...arguments);
+
+    let owner = getOwner(this);
+    if (owner) {
+      this._router = owner.lookup('router:main');
+      this._bucketCache = owner.lookup('-bucket-cache:main');
+      this._topLevelViewTemplate = owner.lookup('template:-outlet');
+      this._environment = owner.lookup('-environment:main');
+    }
+  }
 
   serialize!: (
     model: {},
@@ -112,8 +127,6 @@ class Route extends EmberObject implements IRoute {
       }
     | undefined;
 
-  _router!: EmberRouter;
-
   /**
     The name of the route, dot-delimited.
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 2a18c8e317d..dff3aa175f8 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1,5 +1,6 @@
 import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
 import { computed, get, notifyPropertyChange, set } from '@ember/-internals/metal';
+import { BucketCache } from '@ember/-internals/routing';
 import { FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
@@ -138,6 +139,7 @@ class EmberRouter extends EmberObject {
   _qpUpdates = new Set();
   _queuedQPChanges: { [key: string]: unknown } = {};
 
+  _bucketCache: BucketCache | undefined;
   _toplevelView: OutletView | null = null;
   _handledErrors = new Set();
   _engineInstances: { [name: string]: { [id: string]: EngineInstance } } = Object.create(null);
@@ -149,6 +151,11 @@ class EmberRouter extends EmberObject {
     super(...arguments);
 
     this._resetQueuedQueryParameterChanges();
+    let owner = getOwner(this);
+    if (owner) {
+      this.namespace = owner.lookup('application:main');
+      this._bucketCache = owner.lookup('-bucket-cache:main');
+    }
   }
 
   _initRouterJs() {
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 4496fcc7194..9fd8dc244fa 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -9,6 +9,8 @@ import {
   guidFor,
   getName,
   setName,
+  lookupDescriptor,
+  inspect,
   makeArray,
   HAS_NATIVE_PROXY,
   HAS_NATIVE_SYMBOL,
@@ -28,7 +30,7 @@ import {
   DEBUG_INJECTION_FUNCTIONS,
 } from '@ember/-internals/metal';
 import ActionHandler from '../mixins/action_handler';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
 import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
@@ -64,6 +66,21 @@ function initialize(obj, properties) {
       !(properties instanceof Mixin)
     );
 
+    let injectedProperties;
+    if (DEBUG) {
+      // these are all the implicit injectinos
+      injectedProperties = [];
+
+      let factory = getFactoryFor(obj);
+      if (factory) {
+        for (let injection in factory.injections) {
+          if (factory.injections[injection] === properties[injection]) {
+            injectedProperties.push(injection);
+          }
+        }
+      }
+    }
+
     let concatenatedProperties = obj.concatenatedProperties;
     let mergedProperties = obj.mergedProperties;
     let hasConcatenatedProps =
@@ -73,8 +90,8 @@ function initialize(obj, properties) {
     let keyNames = Object.keys(properties);
 
     for (let i = 0; i < keyNames.length; i++) {
-      let keyName = keyNames[i];
-      let value = properties[keyName];
+      var keyName = keyNames[i];
+      var value = properties[keyName];
 
       assert(
         'EmberObject.create no longer supports defining computed ' +
@@ -112,12 +129,48 @@ function initialize(obj, properties) {
       }
 
       if (isDescriptor) {
+        if (DEBUG) {
+          // need to check if implicit injection owner.inject('component:my-component', 'foo', 'service:bar') does not match explicit injection @service foo
+          // implicit injection takes precedence so need to tell user to rename property on obj
+          let isInjectedProperty = DEBUG_INJECTION_FUNCTIONS.has(possibleDesc._getter);
+          if (isInjectedProperty && value !== possibleDesc.get(obj, keyName)) {
+            implicitInjectionDeprecation(keyName, `You have explicitly defined '${keyName}' for ${inspect(obj)} that does not match the implicit injection for '${keyName}'.  Please ensure you are explicitly defining '${keyName}' on ${inspect(obj)}.`);
+          }
+        }
+
         possibleDesc.set(obj, keyName, value);
       } else if (typeof obj.setUnknownProperty === 'function' && !(keyName in obj)) {
         obj.setUnknownProperty(keyName, value);
       } else {
         if (DEBUG) {
-          defineProperty(obj, keyName, null, value, m); // setup mandatory setter
+          // If deprecation, either 1) an accessor descriptor or 2) class field declaration 3) only an implicit injection
+          let desc = lookupDescriptor(obj, keyName);
+          if (!injectedProperties.includes(keyName)) {
+            defineProperty(obj, keyName, null, value, m); // setup mandatory setter
+          } else if (desc && desc.get) {
+            if (value !== desc.get.call(obj)) {
+              implicitInjectionDeprecation(keyName, `You have defined '${keyName}' for ${inspect(obj)} as a getter which does not match the implicit injection for '${keyName}'.  Please migrate to '@service ${keyName}'.`);
+            }
+          } else if (desc && desc.value) {
+            if (desc.value !== value) {
+              // implicit injection does not match value descriptor set on object
+              implicitInjectionDeprecation(keyName, `You have defined '${keyName}' for ${inspect(obj)} as a value which does not match the implicit injection for '${keyName}'.  Please migrate to '@service ${keyName}'.`);
+            }
+          } else {
+            // wrapper getter for original adding one time deprecation
+            // TODO add setter
+            Object.defineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: false,
+              get() {
+                // only want to deprecate on first access
+                Object.defineProperty(obj, keyName, { value });
+
+                implicitInjectionDeprecation(keyName, `Implicit injection for property '${keyName}' is now deprecated. Please add an explicit injection for '${keyName}' to ${inspect(obj)}`);
+                return value;
+              }
+            });
+          }
         } else {
           obj[keyName] = value;
         }
@@ -1120,4 +1173,21 @@ if (!HAS_NATIVE_SYMBOL) {
   });
 }
 
+// TODO: customize messages and add more debugging info like obj and mismatch information
+function implicitInjectionDeprecation(keyName, msg = null) {
+  deprecate(
+    msg,
+    false,
+    {
+      id: 'ember-object.implicit-injection',
+      until: '4.0.0',
+      url: 'https://',
+      for: 'ember-source',
+      since: {
+        enabled: '3.24.0',
+      },
+    }
+  );
+}
+
 export default CoreObject;
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 32d30dbca73..47f79e83f6c 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -1,19 +1,229 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
+import { inspect } from '@ember/-internals/utils';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
+import Service, { inject as service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
 moduleFor(
   'EmberObject.create',
   class extends AbstractTestCase {
     ['@test simple properties are set'](assert) {
+      expectNoDeprecation();
+
       let o = EmberObject.create({ ohai: 'there' });
       assert.equal(o.get('ohai'), 'there');
     }
 
+    ['@test explicit injection does not raise deprecation'](assert) {
+      expectNoDeprecation();
+
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class FooObject extends EmberObject {
+        @service foo;
+      }
+      owner.register('service:foo', FooService);
+      owner.register('foo:main', FooObject);
+
+      let obj = owner.lookup('foo:main');
+      assert.equal(obj.foo.bar, 'foo');
+    }
+
+    ['@test implicit injections raises deprecation'](assert) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class FooObject extends EmberObject {}
+      owner.register('service:foo', FooService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let obj = owner.lookup('foo:main');
+      let result;
+      expectDeprecation(
+        () => result = obj.foo,
+        `Implicit injection for property 'foo' is now deprecated. Please add an explicit injection for 'foo' to ${inspect(obj)}`
+      );
+
+      assert.equal(result.bar, 'foo');
+      assert.equal(obj.foo.bar, 'foo');
+    }
+
+    ['@test implicit injections raises deprecation for old style EmberObject'](assert) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      const FooObject = EmberObject.extend();
+      owner.register('service:foo', FooService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let obj = owner.lookup('foo:main');
+      let result;
+      expectDeprecation(
+        () => result = obj.foo,
+        `Implicit injection for property 'foo' is now deprecated. Please add an explicit injection for 'foo' to ${inspect(obj)}`
+      );
+
+      assert.equal(result.bar, 'foo');
+      assert.equal(obj.foo.bar, 'foo');
+    }
+
+    ['@test implicit injections does not raise a deprecation if explicit injection present'](assert) {
+      expectNoDeprecation();
+
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class FooObject extends EmberObject {
+        @service foo;
+      }
+      owner.register('service:foo', FooService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let obj = owner.lookup('foo:main');
+      assert.equal(obj.foo.bar, 'foo');
+    }
+
+    ['@test raises deprecation if explicit injection is not the same as the implicit injection'](assert) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        @service foo;
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:bar');
+
+      let result;
+      expectDeprecation(
+        () => result = owner.lookup('foo:main'),
+        `You have explicitly defined 'foo' for FooObject that does not match the implicit injection for 'foo'.  Please ensure you are explicitly defining 'foo' on FooObject.`
+      );
+      assert.equal(result.foo.bar, 'bar');
+    }
+
+    ['@test does not raise deprecation if descriptor is a value and equal to the implicit deprecation'](assert) {
+      expectNoDeprecation();
+
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        foo = getOwner(this).lookup('service:foo');
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let result = owner.lookup('foo:main');
+      assert.equal(result.foo.bar, 'foo');
+    }
+
+    ['@test does raise deprecation if descriptor is a value and not equal to the implicit deprecation'](assert) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        foo = getOwner(this).lookup('service:foo');
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:bar');
+
+      let result;
+      expectDeprecation(
+        () => result = owner.lookup('foo:main'),
+        `You have defined 'foo' for FooObject as a value which does not match the implicit injection for 'foo'.  Please migrate to '@service foo'.`
+      );
+      assert.equal(result.foo.bar, 'foo');
+    }
+
+    ['@test does not raise deprecation if descriptor is a getter and equal to the implicit deprecation'](assert) {
+      expectNoDeprecation();
+
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        get foo() {
+          return getOwner(this).lookup('service:foo');
+        }
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let result = owner.lookup('foo:main');
+      assert.equal(result.foo.bar, 'foo');
+    }
+
+    ['@test does raise deprecation if descriptor is a getter and not equal to the implicit deprecation'](assert) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        get foo() {
+          return getOwner(this).lookup('service:foo');
+        }
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:bar');
+
+      let result;
+      expectDeprecation(
+        () => result = owner.lookup('foo:main'),
+        `You have defined 'foo' for FooObject as a getter which does not match the implicit injection for 'foo'.  Please migrate to '@service foo'.`
+      );
+      assert.equal(result.foo.bar, 'foo');
+    }
+
     ['@test calls computed property setters'](assert) {
       let MyClass = EmberObject.extend({
         foo: computed({
@@ -138,7 +348,7 @@ moduleFor(
       }
     }
 
-    ['@test calls setUnknownProperty if defined'](assert) {
+    ['@test calls setUnknownProperty if undefined'](assert) {
       let setUnknownPropertyCalled = false;
 
       let MyClass = EmberObject.extend({
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index b03bd695338..376ac6d0a43 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -49,6 +49,9 @@ function inspectValue(value: any | null | undefined, depth: number, seen?: WeakS
       if (value.toString === objectToString || value.toString === undefined) {
         break;
       }
+      if (value.constructor && value.constructor.name !== 'Class') {
+        return value.constructor.name;
+      }
       // custom toString
       return value.toString();
     case 'function':
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 9a7ecf82604..a819ea1eefc 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -1167,14 +1167,12 @@ function commonSetupRegistry(registry) {
   registry.register('route:basic', Route);
   registry.register('event_dispatcher:main', EventDispatcher);
 
-  registry.injection('router:main', 'namespace', 'application:main');
-
   registry.register('location:auto', AutoLocation);
   registry.register('location:hash', HashLocation);
   registry.register('location:history', HistoryLocation);
   registry.register('location:none', NoneLocation);
 
-  registry.register(P`-bucket-cache:main`, {
+  registry.register(`-bucket-cache:main`, {
     create() {
       return new BucketCache();
     },
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 5b35db87b15..bef0819bc7d 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -129,10 +129,8 @@ moduleFor(
 
       verifyRegistration(assert, application, 'controller:basic');
       verifyRegistration(assert, application, '-view-registry:main');
-      verifyInjection(assert, application, 'route', '_topLevelViewTemplate', 'template:-outlet');
       verifyRegistration(assert, application, 'route:basic');
       verifyRegistration(assert, application, 'event_dispatcher:main');
-      verifyInjection(assert, application, 'router:main', 'namespace', 'application:main');
       verifyInjection(assert, application, 'view:-outlet', 'namespace', 'application:main');
 
       verifyRegistration(assert, application, 'location:auto');
@@ -140,15 +138,6 @@ moduleFor(
       verifyRegistration(assert, application, 'location:history');
       verifyRegistration(assert, application, 'location:none');
 
-      verifyInjection(assert, application, 'controller', 'target', 'router:main');
-      verifyInjection(assert, application, 'controller', 'namespace', 'application:main');
-
-      verifyRegistration(assert, application, P`-bucket-cache:main`);
-      verifyInjection(assert, application, 'router', '_bucketCache', P`-bucket-cache:main`);
-      verifyInjection(assert, application, 'route', '_bucketCache', P`-bucket-cache:main`);
-
-      verifyInjection(assert, application, 'route', '_router', 'router:main');
-
       verifyRegistration(assert, application, 'component:-text-field');
       verifyRegistration(assert, application, 'component:-checkbox');
       verifyRegistration(assert, application, 'component:link-to');
@@ -166,13 +155,6 @@ moduleFor(
         'resolver',
         'resolver-for-debugging:main'
       );
-      verifyInjection(
-        assert,
-        application,
-        'data-adapter:main',
-        'containerDebugAdapter',
-        'container-debug-adapter:main'
-      );
       verifyRegistration(assert, application, 'container-debug-adapter:main');
       verifyRegistration(assert, application, 'component-lookup:main');
 
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index 1d456422f6e..3bf7a15441b 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -2,6 +2,7 @@ import Controller, { inject as injectController } from '@ember/controller';
 import Service, { inject as injectService } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { Mixin, get } from '@ember/-internals/metal';
+import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner } from 'internal-test-helpers';
 import { moduleFor, ApplicationTestCase, AbstractTestCase, runTask } from 'internal-test-helpers';
 import { action } from '@ember/object';
@@ -86,6 +87,8 @@ moduleFor(
 
     ['@test A handled action can be bubbled to the target for continued processing'](assert) {
       assert.expect(2);
+      let owner = buildOwner();
+
       let TestController = Controller.extend({
         actions: {
           poke() {
@@ -95,6 +98,8 @@ moduleFor(
         },
       });
 
+      owner.register('controller:index', TestController);
+
       let controller = TestController.create({
         target: Controller.extend({
           actions: {
@@ -104,6 +109,9 @@ moduleFor(
           },
         }).create(),
       });
+
+      setOwner(controller, owner);
+
       controller.send('poke');
     }
 
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 0ab30e9b50e..73aa2da4914 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -497,18 +497,8 @@ function commonSetupRegistry(registry) {
 
   registry.injection('renderer', '_viewRegistry', '-view-registry:main');
 
-  registry.injection('route', '_topLevelViewTemplate', 'template:-outlet');
-
   registry.injection('view:-outlet', 'namespace', 'application:main');
 
-  registry.injection('controller', 'target', 'router:main');
-  registry.injection('controller', 'namespace', 'application:main');
-
-  registry.injection('router', '_bucketCache', P`-bucket-cache:main`);
-  registry.injection('route', '_bucketCache', P`-bucket-cache:main`);
-
-  registry.injection('route', '_router', 'router:main');
-
   // Register the routing service...
   registry.register('service:-routing', RoutingService);
 
@@ -517,7 +507,6 @@ function commonSetupRegistry(registry) {
     instantiate: false,
   });
   registry.injection('container-debug-adapter:main', 'resolver', 'resolver-for-debugging:main');
-  registry.injection('data-adapter:main', 'containerDebugAdapter', 'container-debug-adapter:main');
   // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
 
   registry.register('container-debug-adapter:main', ContainerDebugAdapter);
diff --git a/packages/@ember/engine/instance.js b/packages/@ember/engine/instance.js
index 3a0693eef08..6a63c058ab7 100644
--- a/packages/@ember/engine/instance.js
+++ b/packages/@ember/engine/instance.js
@@ -182,7 +182,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
 
     let singletons = [
       'router:main',
-      P`-bucket-cache:main`,
+      '-bucket-cache:main',
       '-view-registry:main',
       `renderer:-dom`,
       'service:-document',
@@ -213,7 +213,6 @@ EngineInstance.reopenClass({
     }
 
     registry.injection('view', '_environment', '-environment:main');
-    registry.injection('route', '_environment', '-environment:main');
   },
 });
 
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 018b342a4e8..9186d40997e 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -63,17 +63,8 @@ moduleFor(
       );
       verifyRegistration(assert, engine, 'controller:basic');
       verifyInjection(assert, engine, 'renderer', '_viewRegistry', '-view-registry:main');
-      verifyInjection(assert, engine, 'route', '_topLevelViewTemplate', 'template:-outlet');
       verifyInjection(assert, engine, 'view:-outlet', 'namespace', 'application:main');
 
-      verifyInjection(assert, engine, 'controller', 'target', 'router:main');
-      verifyInjection(assert, engine, 'controller', 'namespace', 'application:main');
-
-      verifyInjection(assert, engine, 'router', '_bucketCache', P`-bucket-cache:main`);
-      verifyInjection(assert, engine, 'route', '_bucketCache', P`-bucket-cache:main`);
-
-      verifyInjection(assert, engine, 'route', '_router', 'router:main');
-
       verifyRegistration(assert, engine, 'component:-text-field');
       verifyRegistration(assert, engine, 'component:-checkbox');
       verifyRegistration(assert, engine, 'component:link-to');
@@ -91,13 +82,6 @@ moduleFor(
         'resolver',
         'resolver-for-debugging:main'
       );
-      verifyInjection(
-        assert,
-        engine,
-        'data-adapter:main',
-        'containerDebugAdapter',
-        'container-debug-adapter:main'
-      );
       verifyRegistration(assert, engine, 'container-debug-adapter:main');
       verifyRegistration(assert, engine, 'component-lookup:main');
 

From b06d98a118b3a49fd4ac200c37c2bc67d3a40296 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Mon, 1 Feb 2021 20:57:10 -0600
Subject: [PATCH 0347/1405] Address some feedback

---
 .../extension-support/lib/data_adapter.js      |  1 +
 .../tests/data_adapter_test.js                 | 18 +++++++-----------
 .../-internals/routing/lib/ext/controller.ts   |  2 +-
 .../-internals/routing/lib/system/route.ts     |  6 +++---
 .../-internals/routing/lib/system/router.ts    |  6 +++---
 .../runtime/lib/system/core_object.js          |  8 ++++----
 .../@ember/-internals/utils/lib/inspect.ts     |  2 +-
 packages/@ember/application/lib/application.js |  2 +-
 packages/@ember/engine/instance.js             |  2 +-
 9 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.js
index 24956cd2d26..d95eece596c 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.js
@@ -234,6 +234,7 @@ export default EmberObject.extend({
     @private
     @property flushWatchers
     @since 3.26.0
+
    */
 
   /**
diff --git a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
index c71287a126e..9dabc566616 100644
--- a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
+++ b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
@@ -15,17 +15,13 @@ const DataAdapter = EmberDataAdapter.extend({
   },
   init() {
     this._super(...arguments);
-    Object.defineProperty(this, 'containerDebugAdapter', {
-      get() {
-        return {
-          canCatalogEntriesByType() {
-            return true;
-          },
-          catalogEntriesByType() {
-            return emberA(['post']);
-          },
-        }
-      }
+    this.set('containerDebugAdapter', {
+      canCatalogEntriesByType() {
+        return true;
+      },
+      catalogEntriesByType() {
+        return emberA(['post']);
+      },
     });
   },
 });
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index c25eae563eb..74a86faa2b9 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -17,7 +17,7 @@ ControllerMixin.reopen({
       this.namespace = owner.lookup('application:main');
       this.target = owner.lookup('router:main');
     }
-  }
+  },
 
   /**
     Defines which query parameters the controller accepts.
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index a05eb124214..418d3d8528c 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1,3 +1,4 @@
+import { privatize as P } from '@ember/-internals/container';
 import {
   addObserver,
   computed,
@@ -106,13 +107,12 @@ class Route extends EmberObject implements IRoute {
   _names: unknown;
   _router: EmberRouter | undefined;
 
-  constructor() {
+  constructor(owner: Owner) {
     super(...arguments);
 
-    let owner = getOwner(this);
     if (owner) {
       this._router = owner.lookup('router:main');
-      this._bucketCache = owner.lookup('-bucket-cache:main');
+      this._bucketCache = owner.lookup(P`-bucket-cache:main`);
       this._topLevelViewTemplate = owner.lookup('template:-outlet');
       this._environment = owner.lookup('-environment:main');
     }
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index dff3aa175f8..d796bb86827 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1,3 +1,4 @@
+import { privatize as P } from '@ember/-internals/container';
 import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
 import { computed, get, notifyPropertyChange, set } from '@ember/-internals/metal';
 import { BucketCache } from '@ember/-internals/routing';
@@ -147,14 +148,13 @@ class EmberRouter extends EmberObject {
 
   _slowTransitionTimer: unknown;
 
-  constructor() {
+  constructor(owner: Owner) {
     super(...arguments);
 
     this._resetQueuedQueryParameterChanges();
-    let owner = getOwner(this);
     if (owner) {
       this.namespace = owner.lookup('application:main');
-      this._bucketCache = owner.lookup('-bucket-cache:main');
+      this._bucketCache = owner.lookup(P`-bucket-cache:main`);
     }
   }
 
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 9fd8dc244fa..441c53d4a05 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -90,8 +90,9 @@ function initialize(obj, properties) {
     let keyNames = Object.keys(properties);
 
     for (let i = 0; i < keyNames.length; i++) {
-      var keyName = keyNames[i];
-      var value = properties[keyName];
+      // Hot path so 'var' to avoid closure, which may cause perf issues
+      let keyName = keyNames[i];
+      let value = properties[keyName];
 
       assert(
         'EmberObject.create no longer supports defining computed ' +
@@ -161,9 +162,8 @@ function initialize(obj, properties) {
             // TODO add setter
             Object.defineProperty(obj, keyName, {
               configurable: true,
-              enumerable: false,
               get() {
-                // only want to deprecate on first access
+                // only want to deprecate on first access so we make this self destructing
                 Object.defineProperty(obj, keyName, { value });
 
                 implicitInjectionDeprecation(keyName, `Implicit injection for property '${keyName}' is now deprecated. Please add an explicit injection for '${keyName}' to ${inspect(obj)}`);
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index 376ac6d0a43..aed2ad6c482 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -49,7 +49,7 @@ function inspectValue(value: any | null | undefined, depth: number, seen?: WeakS
       if (value.toString === objectToString || value.toString === undefined) {
         break;
       }
-      if (value.constructor && value.constructor.name !== 'Class') {
+      if (value.constructor && typeof value.constructor === 'function' && value.constructor.name !== 'Class') {
         return value.constructor.name;
       }
       // custom toString
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index a819ea1eefc..978a55d48d3 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -1172,7 +1172,7 @@ function commonSetupRegistry(registry) {
   registry.register('location:history', HistoryLocation);
   registry.register('location:none', NoneLocation);
 
-  registry.register(`-bucket-cache:main`, {
+  registry.register(P`-bucket-cache:main`, {
     create() {
       return new BucketCache();
     },
diff --git a/packages/@ember/engine/instance.js b/packages/@ember/engine/instance.js
index 6a63c058ab7..5ae670a72b2 100644
--- a/packages/@ember/engine/instance.js
+++ b/packages/@ember/engine/instance.js
@@ -182,7 +182,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
 
     let singletons = [
       'router:main',
-      '-bucket-cache:main',
+      P`-bucket-cache:main`,
       '-view-registry:main',
       `renderer:-dom`,
       'service:-document',

From 79698e4c2a82abbff30110816cd28b0224ba9ac1 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 4 Feb 2021 16:43:25 -0800
Subject: [PATCH 0348/1405] polish and address feedback

---
 .../tests/unit/runtime-resolver-cache-test.js |  7 +-
 .../-internals/routing/lib/system/route.ts    | 13 ++-
 .../-internals/routing/lib/system/router.ts   | 13 ++-
 .../runtime/lib/system/core_object.js         | 97 ++++++++++++-------
 .../tests/system/object/create_test.js        | 62 +++++++-----
 .../@ember/-internals/utils/lib/inspect.ts    |  3 -
 .../application/tests/application_test.js     |  1 -
 .../tests/dependency_injection_test.js        |  4 +
 packages/@ember/engine/index.js               |  2 +-
 packages/@ember/engine/tests/engine_test.js   |  1 -
 10 files changed, 128 insertions(+), 75 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
index e9e29dacf62..5d90edc2ebf 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
@@ -133,8 +133,11 @@ moduleFor(
       this.registerComponent('component-two', { ComponentClass: Two });
 
       // inject layout onto component, share layout with component-one
-      this.registerComponent('root-component', { ComponentClass: Component });
-      this.owner.inject('component:root-component', 'layout', 'template:components/component-one');
+      let Root = Component.extend({
+        layout: this.owner.lookup('template:components/component-one'),
+      });
+
+      this.registerComponent('root-component', { ComponentClass: Root });
 
       // template instance shared between to template managers
       let rootFactory = this.owner.factoryFor('component:root-component');
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 418d3d8528c..afcf44cb7df 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -102,17 +102,22 @@ class Route extends EmberObject implements IRoute {
   controller!: Controller;
   currentModel: unknown;
 
-  _bucketCache: BucketCache | undefined;
+  _bucketCache!: BucketCache;
   _internalName!: string;
   _names: unknown;
-  _router: EmberRouter | undefined;
+  _router!: EmberRouter;
 
   constructor(owner: Owner) {
     super(...arguments);
 
     if (owner) {
-      this._router = owner.lookup('router:main');
-      this._bucketCache = owner.lookup(P`-bucket-cache:main`);
+      let router = owner.lookup<EmberRouter>('router:main');
+      let bucketCache = owner.lookup<BucketCache>(P`-bucket-cache:main`);
+
+      assert('Expected route injections to be defined', router && bucketCache);
+
+      this._router = router;
+      this._bucketCache = bucketCache;
       this._topLevelViewTemplate = owner.lookup('template:-outlet');
       this._environment = owner.lookup('-environment:main');
     }
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index d796bb86827..7d1dd84764a 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1,8 +1,8 @@
 import { privatize as P } from '@ember/-internals/container';
 import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
 import { computed, get, notifyPropertyChange, set } from '@ember/-internals/metal';
-import { BucketCache } from '@ember/-internals/routing';
 import { FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
+import { BucketCache } from '@ember/-internals/routing';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
 import { assert, deprecate, info } from '@ember/debug';
@@ -1053,7 +1053,7 @@ class EmberRouter extends EmberObject {
     state: TransitionState<Route>,
     queryParams: {},
     _fromRouterService: boolean
-  ) {
+  ): void {
     let routeInfos = state.routeInfos;
     let appCache = this._bucketCache;
     let qpMeta;
@@ -1100,6 +1100,9 @@ class EmberRouter extends EmberObject {
           }
         } else {
           let cacheKey = calculateCacheKey(qp.route.fullRouteName, qp.parts, state.params);
+
+          assert('expected appCache to be defined', appCache);
+
           queryParams[qp.scopedPropertyName] = appCache.lookup(cacheKey, qp.prop, qp.defaultValue);
         }
       }
@@ -1404,7 +1407,7 @@ export function triggerEvent(
   ignoreFailure: boolean,
   name: string,
   args: any[]
-) {
+): void {
   if (!routeInfos) {
     if (ignoreFailure) {
       return;
@@ -1427,7 +1430,9 @@ export function triggerEvent(
       } else {
         // Should only hit here if a non-bubbling error action is triggered on a route.
         if (name === 'error') {
-          handler!._router._markErrorAsHandled(args[0] as Error);
+          assert('expected handler and handler router to exist', handler && handler._router);
+
+          handler._router._markErrorAsHandled(args[0] as Error);
         }
         return;
       }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 441c53d4a05..3043ec66828 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -135,7 +135,12 @@ function initialize(obj, properties) {
           // implicit injection takes precedence so need to tell user to rename property on obj
           let isInjectedProperty = DEBUG_INJECTION_FUNCTIONS.has(possibleDesc._getter);
           if (isInjectedProperty && value !== possibleDesc.get(obj, keyName)) {
-            implicitInjectionDeprecation(keyName, `You have explicitly defined '${keyName}' for ${inspect(obj)} that does not match the implicit injection for '${keyName}'.  Please ensure you are explicitly defining '${keyName}' on ${inspect(obj)}.`);
+            implicitInjectionDeprecation(
+              keyName,
+              `You have explicitly defined a service injection for the '${keyName}' property on ${inspect(
+                obj
+              )}. However, a different service or value was injected via implicit injections which overrode your explicit injection. Implicit injections have been deprecated, and will be removed in the near future. In order to prevent breakage, you should inject the same value explicitly that is currently being injected implicitly.`
+            );
           }
         }
 
@@ -146,30 +151,43 @@ function initialize(obj, properties) {
         if (DEBUG) {
           // If deprecation, either 1) an accessor descriptor or 2) class field declaration 3) only an implicit injection
           let desc = lookupDescriptor(obj, keyName);
-          if (!injectedProperties.includes(keyName)) {
+
+          if (injectedProperties.indexOf(keyName) === -1) {
+            // Value was not an injected property, define in like normal
             defineProperty(obj, keyName, null, value, m); // setup mandatory setter
-          } else if (desc && desc.get) {
-            if (value !== desc.get.call(obj)) {
-              implicitInjectionDeprecation(keyName, `You have defined '${keyName}' for ${inspect(obj)} as a getter which does not match the implicit injection for '${keyName}'.  Please migrate to '@service ${keyName}'.`);
-            }
-          } else if (desc && desc.value) {
-            if (desc.value !== value) {
+          } else if (desc) {
+            // If the property is a value prop, and it isn't the expected value,
+            // then we can warn the user when they attempt to use the value
+            if ('value' in desc && desc.value !== value) {
               // implicit injection does not match value descriptor set on object
-              implicitInjectionDeprecation(keyName, `You have defined '${keyName}' for ${inspect(obj)} as a value which does not match the implicit injection for '${keyName}'.  Please migrate to '@service ${keyName}'.`);
+              defineSelfDestructingImplicitInjectionGetter(
+                obj,
+                keyName,
+                value,
+                `A value was injected implicitly on the '${keyName}' property of an instance of ${inspect(
+                  obj
+                )}, overwriting the original value which was ${inspect(
+                  desc.value
+                )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
+              );
+            } else {
+              // Otherwise, the value is either a getter/setter, or it is the correct value.
+              // If it is a getter/setter, then we don't know what activating it might do - it could
+              // be that the user only defined a getter, and so the value will not be set at all. It
+              // could be that the setter is a no-op that does nothing. Both of these are valid ways
+              // to "override" an implicit injection, so we can't really warn here. So, assign the
+              // value like we would normally.
+              obj[keyName] = value;
             }
           } else {
-            // wrapper getter for original adding one time deprecation
-            // TODO add setter
-            Object.defineProperty(obj, keyName, {
-              configurable: true,
-              get() {
-                // only want to deprecate on first access so we make this self destructing
-                Object.defineProperty(obj, keyName, { value });
-
-                implicitInjectionDeprecation(keyName, `Implicit injection for property '${keyName}' is now deprecated. Please add an explicit injection for '${keyName}' to ${inspect(obj)}`);
-                return value;
-              }
-            });
+            defineSelfDestructingImplicitInjectionGetter(
+              obj,
+              keyName,
+              value,
+              `A value was injected implicitly on the '${keyName}' property of an instance of ${inspect(
+                obj
+              )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
+            );
           }
         } else {
           obj[keyName] = value;
@@ -197,6 +215,20 @@ function initialize(obj, properties) {
   sendEvent(obj, 'init', undefined, undefined, undefined, m);
 }
 
+function defineSelfDestructingImplicitInjectionGetter(obj, keyName, value, message) {
+  Object.defineProperty(obj, keyName, {
+    configurable: true,
+    enumerable: true,
+    get() {
+      // only want to deprecate on first access so we make this self destructing
+      Object.defineProperty(obj, keyName, { value });
+
+      implicitInjectionDeprecation(keyName, message);
+      return value;
+    },
+  });
+}
+
 /**
   `CoreObject` is the base class for all Ember constructs. It establishes a
   class system based on Ember's Mixin system, and provides the basis for the
@@ -1173,21 +1205,16 @@ if (!HAS_NATIVE_SYMBOL) {
   });
 }
 
-// TODO: customize messages and add more debugging info like obj and mismatch information
 function implicitInjectionDeprecation(keyName, msg = null) {
-  deprecate(
-    msg,
-    false,
-    {
-      id: 'ember-object.implicit-injection',
-      until: '4.0.0',
-      url: 'https://',
-      for: 'ember-source',
-      since: {
-        enabled: '3.24.0',
-      },
-    }
-  );
+  deprecate(msg, false, {
+    id: 'implicit-injections',
+    until: '4.0.0',
+    url: 'https://deprecations.emberjs.com/v3.x#toc_implicit-injections',
+    for: 'ember-source',
+    since: {
+      enabled: '3.26.0',
+    },
+  });
 }
 
 export default CoreObject;
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 47f79e83f6c..adbf7ae0c48 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -50,8 +50,10 @@ moduleFor(
       let obj = owner.lookup('foo:main');
       let result;
       expectDeprecation(
-        () => result = obj.foo,
-        `Implicit injection for property 'foo' is now deprecated. Please add an explicit injection for 'foo' to ${inspect(obj)}`
+        () => (result = obj.foo),
+        `A value was injected implicitly on the 'foo' property of an instance of ${inspect(
+          obj
+        )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
       );
 
       assert.equal(result.bar, 'foo');
@@ -64,7 +66,7 @@ moduleFor(
       class FooService extends Service {
         bar = 'foo';
       }
-      const FooObject = EmberObject.extend();
+      let FooObject = EmberObject.extend();
       owner.register('service:foo', FooService);
       owner.register('foo:main', FooObject);
       owner.inject('foo:main', 'foo', 'service:foo');
@@ -72,15 +74,19 @@ moduleFor(
       let obj = owner.lookup('foo:main');
       let result;
       expectDeprecation(
-        () => result = obj.foo,
-        `Implicit injection for property 'foo' is now deprecated. Please add an explicit injection for 'foo' to ${inspect(obj)}`
+        () => (result = obj.foo),
+        `A value was injected implicitly on the 'foo' property of an instance of ${inspect(
+          obj
+        )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
       );
 
       assert.equal(result.bar, 'foo');
       assert.equal(obj.foo.bar, 'foo');
     }
 
-    ['@test implicit injections does not raise a deprecation if explicit injection present'](assert) {
+    ['@test implicit injections does not raise a deprecation if explicit injection present'](
+      assert
+    ) {
       expectNoDeprecation();
 
       let owner = buildOwner();
@@ -99,7 +105,9 @@ moduleFor(
       assert.equal(obj.foo.bar, 'foo');
     }
 
-    ['@test raises deprecation if explicit injection is not the same as the implicit injection'](assert) {
+    ['@test raises deprecation if explicit injection is not the same as the implicit injection'](
+      assert
+    ) {
       let owner = buildOwner();
 
       class FooService extends Service {
@@ -118,13 +126,15 @@ moduleFor(
 
       let result;
       expectDeprecation(
-        () => result = owner.lookup('foo:main'),
-        `You have explicitly defined 'foo' for FooObject that does not match the implicit injection for 'foo'.  Please ensure you are explicitly defining 'foo' on FooObject.`
+        () => (result = owner.lookup('foo:main')),
+        /You have explicitly defined a service injection for the 'foo' property on <.*>. However, a different service or value was injected via implicit injections which overrode your explicit injection. Implicit injections have been deprecated, and will be removed in the near future. In order to prevent breakage, you should inject the same value explicitly that is currently being injected implicitly./
       );
       assert.equal(result.foo.bar, 'bar');
     }
 
-    ['@test does not raise deprecation if descriptor is a value and equal to the implicit deprecation'](assert) {
+    ['@test does not raise deprecation if descriptor is a value and equal to the implicit deprecation'](
+      assert
+    ) {
       expectNoDeprecation();
 
       let owner = buildOwner();
@@ -147,7 +157,9 @@ moduleFor(
       assert.equal(result.foo.bar, 'foo');
     }
 
-    ['@test does raise deprecation if descriptor is a value and not equal to the implicit deprecation'](assert) {
+    ['@test does raise deprecation if descriptor is a value and not equal to the implicit deprecation'](
+      assert
+    ) {
       let owner = buildOwner();
 
       class FooService extends Service {
@@ -164,15 +176,15 @@ moduleFor(
       owner.register('foo:main', FooObject);
       owner.inject('foo:main', 'foo', 'service:bar');
 
-      let result;
-      expectDeprecation(
-        () => result = owner.lookup('foo:main'),
-        `You have defined 'foo' for FooObject as a value which does not match the implicit injection for 'foo'.  Please migrate to '@service foo'.`
-      );
-      assert.equal(result.foo.bar, 'foo');
+      expectDeprecation(() => {
+        let result = owner.lookup('foo:main');
+        assert.equal(result.foo.bar, 'bar');
+      }, /A value was injected implicitly on the 'foo' property of an instance of <.*>, overwriting the original value which was <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/);
     }
 
-    ['@test does not raise deprecation if descriptor is a getter and equal to the implicit deprecation'](assert) {
+    ['@test does not raise deprecation if descriptor is a getter and equal to the implicit deprecation'](
+      assert
+    ) {
       expectNoDeprecation();
 
       let owner = buildOwner();
@@ -187,6 +199,8 @@ moduleFor(
         get foo() {
           return getOwner(this).lookup('service:foo');
         }
+
+        set foo(_) {}
       }
       owner.register('service:foo', FooService);
       owner.register('service:bar', BarService);
@@ -197,7 +211,9 @@ moduleFor(
       assert.equal(result.foo.bar, 'foo');
     }
 
-    ['@test does raise deprecation if descriptor is a getter and not equal to the implicit deprecation'](assert) {
+    ['@test does not raise deprecation if descriptor is a getter and not equal to the implicit deprecation'](
+      assert
+    ) {
       let owner = buildOwner();
 
       class FooService extends Service {
@@ -210,17 +226,15 @@ moduleFor(
         get foo() {
           return getOwner(this).lookup('service:foo');
         }
+
+        set foo(_) {}
       }
       owner.register('service:foo', FooService);
       owner.register('service:bar', BarService);
       owner.register('foo:main', FooObject);
       owner.inject('foo:main', 'foo', 'service:bar');
 
-      let result;
-      expectDeprecation(
-        () => result = owner.lookup('foo:main'),
-        `You have defined 'foo' for FooObject as a getter which does not match the implicit injection for 'foo'.  Please migrate to '@service foo'.`
-      );
+      let result = owner.lookup('foo:main');
       assert.equal(result.foo.bar, 'foo');
     }
 
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index aed2ad6c482..b03bd695338 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -49,9 +49,6 @@ function inspectValue(value: any | null | undefined, depth: number, seen?: WeakS
       if (value.toString === objectToString || value.toString === undefined) {
         break;
       }
-      if (value.constructor && typeof value.constructor === 'function' && value.constructor.name !== 'Class') {
-        return value.constructor.name;
-      }
       // custom toString
       return value.toString();
     case 'function':
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index bef0819bc7d..713d8a78bae 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -9,7 +9,6 @@ import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { setTemplates } from '@ember/-internals/glimmer';
-import { privatize as P } from '@ember/-internals/container';
 import { assign } from '@ember/polyfills';
 import {
   moduleFor,
diff --git a/packages/@ember/application/tests/dependency_injection_test.js b/packages/@ember/application/tests/dependency_injection_test.js
index e146032512d..aecc515b091 100644
--- a/packages/@ember/application/tests/dependency_injection_test.js
+++ b/packages/@ember/application/tests/dependency_injection_test.js
@@ -73,6 +73,10 @@ moduleFor(
     }
 
     ['@test injections'](assert) {
+      expectDeprecation(
+        /A value was injected implicitly on the 'fruit' property of an instance of <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/
+      );
+
       application.inject('model', 'fruit', 'fruit:favorite');
       application.inject('model:user', 'communication', 'communication:main');
 
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 73aa2da4914..7901e14908e 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -3,7 +3,7 @@ export { getEngineParent, setEngineParent } from './lib/engine-parent';
 import { canInvoke } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
 import { Namespace, RegistryProxyMixin } from '@ember/-internals/runtime';
-import { Registry, privatize as P } from '@ember/-internals/container';
+import { Registry } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 9186d40997e..d5c5d1c0dfa 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -2,7 +2,6 @@ import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import Engine from '@ember/engine';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { privatize as P } from '@ember/-internals/container';
 import {
   moduleFor,
   AbstractTestCase as TestCase,

From e924821746b65237fbb6a775b503298094334453 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 4 Feb 2021 19:30:09 -0800
Subject: [PATCH 0349/1405] address feedback

---
 packages/@ember/-internals/routing/lib/system/route.ts   | 5 ++++-
 packages/@ember/-internals/routing/lib/system/router.ts  | 9 +++++----
 .../@ember/-internals/runtime/lib/system/core_object.js  | 1 -
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index afcf44cb7df..4e6ead0fc03 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -114,7 +114,10 @@ class Route extends EmberObject implements IRoute {
       let router = owner.lookup<EmberRouter>('router:main');
       let bucketCache = owner.lookup<BucketCache>(P`-bucket-cache:main`);
 
-      assert('Expected route injections to be defined', router && bucketCache);
+      assert(
+        'ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!',
+        router && bucketCache
+      );
 
       this._router = router;
       this._bucketCache = bucketCache;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 7d1dd84764a..a9439cb8643 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1101,7 +1101,10 @@ class EmberRouter extends EmberObject {
         } else {
           let cacheKey = calculateCacheKey(qp.route.fullRouteName, qp.parts, state.params);
 
-          assert('expected appCache to be defined', appCache);
+          assert(
+            'ROUTER BUG: expected appCache to be defined. This is an internal bug, please open an issue on Github if you see this message!',
+            appCache
+          );
 
           queryParams[qp.scopedPropertyName] = appCache.lookup(cacheKey, qp.prop, qp.defaultValue);
         }
@@ -1430,9 +1433,7 @@ export function triggerEvent(
       } else {
         // Should only hit here if a non-bubbling error action is triggered on a route.
         if (name === 'error') {
-          assert('expected handler and handler router to exist', handler && handler._router);
-
-          handler._router._markErrorAsHandled(args[0] as Error);
+          handler!._router._markErrorAsHandled(args[0] as Error);
         }
         return;
       }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 3043ec66828..fec0361cfaf 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -90,7 +90,6 @@ function initialize(obj, properties) {
     let keyNames = Object.keys(properties);
 
     for (let i = 0; i < keyNames.length; i++) {
-      // Hot path so 'var' to avoid closure, which may cause perf issues
       let keyName = keyNames[i];
       let value = properties[keyName];
 

From bb607647f107a5046a19e67042bab33ba75f6e62 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 5 Feb 2021 14:29:53 -0800
Subject: [PATCH 0350/1405] add more cases and tests

---
 packages/@ember/-internals/metal/index.ts     |   2 +-
 .../@ember/-internals/metal/lib/tracked.ts    |   6 +-
 .../runtime/lib/system/core_object.js         |  23 +++-
 .../tests/system/object/create_test.js        | 114 +++++++++++++++++-
 4 files changed, 139 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 64018eba48b..60ee9db0618 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -59,7 +59,7 @@ export {
 export { Mixin, aliasMethod, mixin, observer, applyMixin } from './lib/mixin';
 export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
 export { tagForProperty, tagForObject, markObjectAsDirty } from './lib/tags';
-export { tracked } from './lib/tracked';
+export { tracked, TrackedDescriptor } from './lib/tracked';
 export { createCache, getValue, isConst } from './lib/cache';
 
 export {
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 56329d0b404..3fd57b71338 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -191,16 +191,16 @@ function descriptorForField([target, key, desc]: [
   return newDesc;
 }
 
-class TrackedDescriptor {
+export class TrackedDescriptor {
   constructor(private _get: () => unknown, private _set: (value: unknown) => void) {
     CHAIN_PASS_THROUGH.add(this);
   }
 
-  get(obj: object) {
+  get(obj: object): unknown {
     return this._get.call(obj);
   }
 
-  set(obj: object, _key: string, value: unknown) {
+  set(obj: object, _key: string, value: unknown): void {
     this._set.call(obj, value);
   }
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index fec0361cfaf..bc24e5dfbfa 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -28,6 +28,7 @@ import {
   classToString,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
+  TrackedDescriptor,
 } from '@ember/-internals/metal';
 import ActionHandler from '../mixins/action_handler';
 import { assert, deprecate } from '@ember/debug';
@@ -129,7 +130,7 @@ function initialize(obj, properties) {
       }
 
       if (isDescriptor) {
-        if (DEBUG) {
+        if (DEBUG && injectedProperties.indexOf(keyName) !== -1) {
           // need to check if implicit injection owner.inject('component:my-component', 'foo', 'service:bar') does not match explicit injection @service foo
           // implicit injection takes precedence so need to tell user to rename property on obj
           let isInjectedProperty = DEBUG_INJECTION_FUNCTIONS.has(possibleDesc._getter);
@@ -140,6 +141,26 @@ function initialize(obj, properties) {
                 obj
               )}. However, a different service or value was injected via implicit injections which overrode your explicit injection. Implicit injections have been deprecated, and will be removed in the near future. In order to prevent breakage, you should inject the same value explicitly that is currently being injected implicitly.`
             );
+          } else if (possibleDesc instanceof TrackedDescriptor) {
+            let descValue = possibleDesc.get(obj, keyName);
+
+            if (value !== descValue) {
+              implicitInjectionDeprecation(
+                keyName,
+                `A value was injected implicitly on the '${keyName}' tracked property of an instance of ${inspect(
+                  obj
+                )}, overwriting the original value which was ${inspect(
+                  descValue
+                )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
+              );
+            }
+          } else if (possibleDesc._setter === undefined) {
+            implicitInjectionDeprecation(
+              keyName,
+              `A value was injected implicitly on the '${keyName}' computed property of an instance of ${inspect(
+                obj
+              )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
+            );
           }
         }
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index adbf7ae0c48..2936f30215c 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -1,7 +1,7 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
 import { inspect } from '@ember/-internals/utils';
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
+import { computed, Mixin, observer, addObserver, alias, tracked } from '@ember/-internals/metal';
 import Service, { inject as service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
@@ -182,6 +182,118 @@ moduleFor(
       }, /A value was injected implicitly on the 'foo' property of an instance of <.*>, overwriting the original value which was <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/);
     }
 
+    ['@test does not raise deprecation if descriptor is a tracked property and equal to the implicit deprecation'](
+      assert
+    ) {
+      expectNoDeprecation();
+
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        @tracked foo = getOwner(this).lookup('service:foo');
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let result = owner.lookup('foo:main');
+      assert.equal(result.foo.bar, 'foo');
+    }
+
+    ['@test does raise deprecation if descriptor is a tracked property and not equal to the implicit deprecation'](
+      assert
+    ) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        @tracked foo = getOwner(this).lookup('service:foo');
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:bar');
+
+      expectDeprecation(() => {
+        let result = owner.lookup('foo:main');
+        assert.equal(result.foo.bar, 'bar');
+      }, /A value was injected implicitly on the 'foo' tracked property of an instance of <.*>, overwriting the original value which was <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/);
+    }
+
+    ['@test does not raise deprecation if descriptor is a computed property with a setter'](
+      assert
+    ) {
+      expectNoDeprecation();
+
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        @computed
+        get foo() {
+          return getOwner(this).lookup('service:foo');
+        }
+
+        set foo(val) {}
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:foo');
+
+      let result = owner.lookup('foo:main');
+      assert.equal(result.foo.bar, 'foo');
+    }
+
+    ['@test does raise deprecation if descriptor is a computed property without a setter'](assert) {
+      let owner = buildOwner();
+
+      class FooService extends Service {
+        bar = 'foo';
+      }
+      class BarService extends Service {
+        bar = 'bar';
+      }
+      class FooObject extends EmberObject {
+        @computed
+        get foo() {
+          return getOwner(this).lookup('service:foo');
+        }
+      }
+      owner.register('service:foo', FooService);
+      owner.register('service:bar', BarService);
+      owner.register('foo:main', FooObject);
+      owner.inject('foo:main', 'foo', 'service:bar');
+
+      expectDeprecation(
+        /The <.*>#foo computed property was just overridden. This removes the computed property and replaces it with a plain value, and has been deprecated. If you want this behavior, consider defining a setter which does it manually./
+      );
+
+      expectDeprecation(
+        /A value was injected implicitly on the 'foo' computed property of an instance of <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/
+      );
+
+      let result = owner.lookup('foo:main');
+      assert.equal(result.foo.bar, 'bar');
+    }
+
     ['@test does not raise deprecation if descriptor is a getter and equal to the implicit deprecation'](
       assert
     ) {

From ce8c28ba49149776be182ba03f23cfa592e86203 Mon Sep 17 00:00:00 2001
From: Dianne Eramo <dianne.eramo@gmail.com>
Date: Wed, 3 Feb 2021 16:48:40 -0800
Subject: [PATCH 0351/1405] [FEATURE modernized-built-in-components] Implement
 input attrs deprecation

Tracking issue: https://github.com/emberjs/ember.js/issues/19270

More specifically, it enables the <Input> attribute deprecations introduced
in https://github.com/emberjs/ember.js/pull/19218, fixes broken tests, and
updates all test {{input}} invocations to use <Input> instead.
---
 .../glimmer/lib/components/input.ts           |   2 +-
 .../components/input-angle-test.js            | 374 +++++++++++-------
 .../components/input-curly-test.js            | 322 +++++++++------
 .../tests/integration/helpers/get-test.js     |  57 +--
 packages/ember-testing/tests/helpers_test.js  |  47 +--
 .../query_params_test/shared_state_test.js    |   2 +-
 packages/internal-test-helpers/index.js       |   1 +
 .../lib/ember-dev/deprecation.ts              |   2 +-
 .../lib/maybe-expect-deprecation.ts           |  16 +
 9 files changed, 500 insertions(+), 323 deletions(-)
 create mode 100644 packages/internal-test-helpers/lib/maybe-expect-deprecation.ts

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index f51eb6680fe..f12a777d083 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -469,7 +469,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
             `Passing the \`@${argument}\` argument to <Input> is deprecated. ` +
               `Instead, please pass the attribute directly, i.e. \`<Input ${attribute}={{...}} />\` ` +
               `instead of \`<Input @${argument}={{...}} />\` or \`{{input ${argument}=...}}\`.`,
-            true /* TODO !(argument in this.args) */,
+            !(argument in this.args),
             {
               id: 'ember.built-in-components.legacy-attribute-arguments',
               for: 'ember-source',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 69f8a44fe92..bd80189f94d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,4 +1,11 @@
-import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
+import {
+  RenderingTestCase,
+  maybeExpectDeprecation,
+  moduleFor,
+  runDestroy,
+  runTask,
+} from 'internal-test-helpers';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 
 import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
@@ -305,28 +312,32 @@ moduleFor(
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
     }
 
-    ['@test dynamic attributes (named argument)']() {
-      this.render(
-        `
-      <Input @type="text" @value={{this.value}}
-        @disabled={{this.disabled}}
-        @placeholder={{this.placeholder}}
-        @name={{this.name}}
-        @maxlength={{this.maxlength}}
-        @minlength={{this.minlength}}
-        @size={{this.size}}
-        @tabindex={{this.tabindex}}
-      />`,
-        {
-          value: 'Original value',
-          disabled: false,
-          placeholder: 'Original placeholder',
-          name: 'original-name',
-          maxlength: 10,
-          minlength: 5,
-          size: 20,
-          tabindex: 30,
-        }
+    ['@test [DEPRECATED] dynamic attributes (named argument)']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `<Input @type="text" @value={{this.value}}
+              @disabled={{this.disabled}}
+              @placeholder={{this.placeholder}}
+              @name={{this.name}}
+              @maxlength={{this.maxlength}}
+              @minlength={{this.minlength}}
+              @size={{this.size}}
+              @tabindex={{this.tabindex}}/>`,
+            {
+              value: 'Original value',
+              disabled: false,
+              placeholder: 'Original placeholder',
+              name: 'original-name',
+              maxlength: 10,
+              minlength: 5,
+              size: 20,
+              tabindex: 30,
+            }
+          );
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
       );
 
       this.assertNotDisabled();
@@ -349,16 +360,22 @@ moduleFor(
       // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      runTask(() => {
-        set(this.context, 'value', 'Updated value');
-        set(this.context, 'disabled', true);
-        set(this.context, 'placeholder', 'Updated placeholder');
-        set(this.context, 'name', 'updated-name');
-        set(this.context, 'maxlength', 11);
-        set(this.context, 'minlength', 6);
-        // set(this.context, 'size', 21); //NOTE: failing in IE (TEST_SUITE=sauce)
-        // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'value', 'Updated value');
+            set(this.context, 'disabled', true);
+            set(this.context, 'placeholder', 'Updated placeholder');
+            set(this.context, 'name', 'updated-name');
+            set(this.context, 'maxlength', 11);
+            set(this.context, 'minlength', 6);
+            // set(this.context, 'size', 21); //NOTE: failing in IE (TEST_SUITE=sauce)
+            // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertDisabled();
       this.assertValue('Updated value');
@@ -369,16 +386,22 @@ moduleFor(
       // this.assertAttr('size', '21'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '31'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      runTask(() => {
-        set(this.context, 'value', 'Original value');
-        set(this.context, 'disabled', false);
-        set(this.context, 'placeholder', 'Original placeholder');
-        set(this.context, 'name', 'original-name');
-        set(this.context, 'maxlength', 10);
-        set(this.context, 'minlength', 5);
-        // set(this.context, 'size', 20); //NOTE: failing in IE (TEST_SUITE=sauce)
-        // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'value', 'Original value');
+            set(this.context, 'disabled', false);
+            set(this.context, 'placeholder', 'Original placeholder');
+            set(this.context, 'name', 'original-name');
+            set(this.context, 'maxlength', 10);
+            set(this.context, 'minlength', 5);
+            // set(this.context, 'size', 20); //NOTE: failing in IE (TEST_SUITE=sauce)
+            // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
@@ -423,17 +446,23 @@ moduleFor(
       // this.assertAttr('tabindex', '30');  //NOTE: failing in IE (TEST_SUITE=sauce)
     }
 
-    ['@test static attributes (named argument)']() {
-      this.render(`
-      <Input @type="text" @value="Original value"
-        @disabled={{true}}
-        @placeholder="Original placeholder"
-        @name="original-name"
-        @maxlength={{10}}
-        @minlength={{5}}
-        @size={{20}}
-        @tabindex={{30}}
-      />`);
+    ['@test [DEPRECATED] static attributes (named argument)']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `<Input @type="text" @value="Original value"
+              @disabled={{true}}
+              @placeholder="Original placeholder"
+              @name="original-name"
+              @maxlength={{10}}
+              @minlength={{5}}
+              @size={{20}}
+              @tabindex={{30}}/>`
+          );
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertDisabled();
       this.assertValue('Original value');
@@ -920,19 +949,24 @@ moduleFor(
       this.assertAttr('tabindex', '10');
     }
 
-    ['@test dynamic attributes (named argument)']() {
-      this.render(
-        `<Input @type='checkbox' @checked={{this.checked}}
-          @disabled={{this.disabled}}
-          @name={{this.name}}
-          @tabindex={{this.tabindex}}
-        />`,
-        {
-          disabled: false,
-          name: 'original-name',
-          checked: false,
-          tabindex: 10,
-        }
+    ['@test [DEPRECATED] dynamic attributes (named argument)']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `<Input @type='checkbox' @checked={{this.checked}}
+              @disabled={{this.disabled}}
+              @name={{this.name}}
+              @tabindex={{this.tabindex}}/>`,
+            {
+              disabled: false,
+              name: 'original-name',
+              checked: false,
+              tabindex: 10,
+            }
+          );
+        },
+        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./
       );
 
       this.assertSingleCheckbox();
@@ -947,22 +981,34 @@ moduleFor(
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
-      runTask(() => {
-        set(this.context, 'disabled', true);
-        set(this.context, 'name', 'updated-name');
-        set(this.context, 'tabindex', 11);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', true);
+            set(this.context, 'name', 'updated-name');
+            set(this.context, 'tabindex', 11);
+          });
+        },
+        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertSingleCheckbox();
       this.assertDisabled();
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
-      runTask(() => {
-        set(this.context, 'disabled', false);
-        set(this.context, 'name', 'original-name');
-        set(this.context, 'tabindex', 10);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', false);
+            set(this.context, 'name', 'original-name');
+            set(this.context, 'tabindex', 10);
+          });
+        },
+        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
@@ -1052,9 +1098,15 @@ moduleFor(
       this.assertAttr('name', 'original-name');
     }
 
-    ['@test with static values (named argument)']() {
-      this.render(
-        `<Input @type="checkbox" @checked={{false}} @disabled={{false}} @tabindex={{10}} @name="original-name" />`
+    ['@test [DEPRECATED] with static values (named argument)']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `<Input @type="checkbox" @checked={{false}} @disabled={{false}} @tabindex={{10}} @name="original-name" />`
+          );
+        },
+        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./
       );
 
       this.assertSingleCheckbox();
@@ -1150,28 +1202,32 @@ moduleFor(
       this.assertAttr('tabindex', undefined);
     }
 
-    ['@test null values (named argument)']() {
+    ['@test [DEPRECATED] null values (named argument)']() {
       let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
-      this.render(
-        `
-      <Input @type="text" @value={{this.value}}
-        @disabled={{this.disabled}}
-        @placeholder={{this.placeholder}}
-        @name={{this.name}}
-        @maxlength={{this.maxlength}}
-        @size={{this.size}}
-        @tabindex={{this.tabindex}}
-      />`,
-        {
-          value: null,
-          disabled: null,
-          placeholder: null,
-          name: null,
-          maxlength: null,
-          size: null,
-          tabindex: null,
-        }
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `<Input @type="text" @value={{this.value}}
+              @disabled={{this.disabled}}
+              @placeholder={{this.placeholder}}
+              @name={{this.name}}
+              @maxlength={{this.maxlength}}
+              @size={{this.size}}
+              @tabindex={{this.tabindex}}/>`,
+            {
+              value: null,
+              disabled: null,
+              placeholder: null,
+              name: null,
+              maxlength: null,
+              size: null,
+              tabindex: null,
+            }
+          );
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
       );
 
       this.assertValue('');
@@ -1182,15 +1238,21 @@ moduleFor(
       this.assertValue('');
       this.assertAllAttrs(attributes, undefined);
 
-      runTask(() => {
-        set(this.context, 'disabled', true);
-        set(this.context, 'value', 'Updated value');
-        set(this.context, 'placeholder', 'Updated placeholder');
-        set(this.context, 'name', 'updated-name');
-        set(this.context, 'maxlength', 11);
-        set(this.context, 'size', 21);
-        set(this.context, 'tabindex', 31);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', true);
+            set(this.context, 'value', 'Updated value');
+            set(this.context, 'placeholder', 'Updated placeholder');
+            set(this.context, 'name', 'updated-name');
+            set(this.context, 'maxlength', 11);
+            set(this.context, 'size', 21);
+            set(this.context, 'tabindex', 31);
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertDisabled();
       this.assertValue('Updated value');
@@ -1200,15 +1262,21 @@ moduleFor(
       this.assertAttr('size', '21');
       this.assertAttr('tabindex', '31');
 
-      runTask(() => {
-        set(this.context, 'disabled', null);
-        set(this.context, 'value', null);
-        set(this.context, 'placeholder', null);
-        set(this.context, 'name', null);
-        set(this.context, 'maxlength', null);
-        // set(this.context, 'size', null); //NOTE: this fails with `Error: Failed to set the 'size' property on 'HTMLInputElement': The value provided is 0, which is an invalid size.` (TEST_SUITE=sauce)
-        set(this.context, 'tabindex', null);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', null);
+            set(this.context, 'value', null);
+            set(this.context, 'placeholder', null);
+            set(this.context, 'name', null);
+            set(this.context, 'maxlength', null);
+            // set(this.context, 'size', null); //NOTE: this fails with `Error: Failed to set the 'size' property on 'HTMLInputElement': The value provided is 0, which is an invalid size.` (TEST_SUITE=sauce)
+            set(this.context, 'tabindex', null);
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertAttr('disabled', undefined);
       this.assertValue('');
@@ -1221,6 +1289,39 @@ moduleFor(
   }
 );
 
+function InputAttributesTest(attrs) {
+  return class extends InputRenderingTest {
+    renderInput(value = 25) {
+      this.render(`<Input ${attrs.replace('%x', value)} />`);
+    }
+
+    ['@test value over default max but below set max is kept']() {
+      this.renderInput('25');
+      this.assertValue('25');
+    }
+
+    ['@test value below default min but above set min is kept']() {
+      this.renderInput('-2');
+      this.assertValue('-2');
+    }
+
+    ['@test in the valid default range is kept']() {
+      this.renderInput('5');
+      this.assertValue('5');
+    }
+
+    ['@test value above max is reset to max']() {
+      this.renderInput('55');
+      this.assertValue('50');
+    }
+
+    ['@test value below min is reset to min']() {
+      this.renderInput('-10');
+      this.assertValue('-5');
+    }
+  };
+}
+
 // These are the permutations of the set:
 // ['type="range"', 'min="-5" max="50"', value="%x"']
 [
@@ -1231,7 +1332,11 @@ moduleFor(
   'min="-5" max="50" @value="%x" @type="range"',
   '@value="%x" min="-5" max="50" @type="range"',
   '@value="%x" @type="range" min="-5" max="50"',
+].forEach((attrs) => {
+  moduleFor(`[GH#15675] Components test: <Input ${attrs} />`, InputAttributesTest(attrs));
+});
 
+[
   // Named argument
   '@type="range" @min="-5" @max="50" @value="%x"',
   '@type="range" @value="%x" @min="-5" @max="50"',
@@ -1242,34 +1347,13 @@ moduleFor(
 ].forEach((attrs) => {
   moduleFor(
     `[GH#15675] Components test: <Input ${attrs} />`,
-    class extends InputRenderingTest {
+    class extends InputAttributesTest(attrs) {
       renderInput(value = 25) {
-        this.render(`<Input ${attrs.replace('%x', value)} />`);
-      }
-
-      ['@test value over default max but below set max is kept']() {
-        this.renderInput('25');
-        this.assertValue('25');
-      }
-
-      ['@test value below default min but above set min is kept']() {
-        this.renderInput('-2');
-        this.assertValue('-2');
-      }
-
-      ['@test in the valid default range is kept']() {
-        this.renderInput('5');
-        this.assertValue('5');
-      }
-
-      ['@test value above max is reset to max']() {
-        this.renderInput('55');
-        this.assertValue('50');
-      }
-
-      ['@test value below min is reset to min']() {
-        this.renderInput('-10');
-        this.assertValue('-5');
+        maybeExpectDeprecation(
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+          () => super.renderInput(value),
+          /Passing the `@(min|max)` argument to <Input> is deprecated\./
+        );
       }
     }
   );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 6984869f43b..45a4464be0a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -1,5 +1,7 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { maybeExpectDeprecation } from 'internal-test-helpers';
 import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
@@ -180,29 +182,35 @@ moduleFor(
       this.assertAttr('type', 'text');
     }
 
-    ['@test dynamic attributes']() {
-      this.render(
-        `
-      {{input type="text"
-        disabled=this.disabled
-        value=this.value
-        placeholder=this.placeholder
-        name=this.name
-        maxlength=this.maxlength
-        minlength=this.minlength
-        size=this.size
-        tabindex=this.tabindex
-      }}`,
-        {
-          disabled: false,
-          value: 'Original value',
-          placeholder: 'Original placeholder',
-          name: 'original-name',
-          maxlength: 10,
-          minlength: 5,
-          size: 20,
-          tabindex: 30,
-        }
+    ['@test [DEPRECATED] dynamic attributes']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `
+            {{input type="text"
+              disabled=this.disabled
+              value=this.value
+              placeholder=this.placeholder
+              name=this.name
+              maxlength=this.maxlength
+              minlength=this.minlength
+              size=this.size
+              tabindex=this.tabindex
+            }}`,
+            {
+              disabled: false,
+              value: 'Original value',
+              placeholder: 'Original placeholder',
+              name: 'original-name',
+              maxlength: 10,
+              minlength: 5,
+              size: 20,
+              tabindex: 30,
+            }
+          );
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
       );
 
       this.assertNotDisabled();
@@ -225,16 +233,22 @@ moduleFor(
       // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      runTask(() => {
-        set(this.context, 'value', 'Updated value');
-        set(this.context, 'disabled', true);
-        set(this.context, 'placeholder', 'Updated placeholder');
-        set(this.context, 'name', 'updated-name');
-        set(this.context, 'maxlength', 11);
-        set(this.context, 'minlength', 6);
-        // set(this.context, 'size', 21); //NOTE: failing in IE (TEST_SUITE=sauce)
-        // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'value', 'Updated value');
+            set(this.context, 'disabled', true);
+            set(this.context, 'placeholder', 'Updated placeholder');
+            set(this.context, 'name', 'updated-name');
+            set(this.context, 'maxlength', 11);
+            set(this.context, 'minlength', 6);
+            // set(this.context, 'size', 21); //NOTE: failing in IE (TEST_SUITE=sauce)
+            // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertDisabled();
       this.assertValue('Updated value');
@@ -245,16 +259,22 @@ moduleFor(
       // this.assertAttr('size', '21'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '31'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      runTask(() => {
-        set(this.context, 'value', 'Original value');
-        set(this.context, 'disabled', false);
-        set(this.context, 'placeholder', 'Original placeholder');
-        set(this.context, 'name', 'original-name');
-        set(this.context, 'maxlength', 10);
-        set(this.context, 'minlength', 5);
-        // set(this.context, 'size', 20); //NOTE: failing in IE (TEST_SUITE=sauce)
-        // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'value', 'Original value');
+            set(this.context, 'disabled', false);
+            set(this.context, 'placeholder', 'Original placeholder');
+            set(this.context, 'name', 'original-name');
+            set(this.context, 'maxlength', 10);
+            set(this.context, 'minlength', 5);
+            // set(this.context, 'size', 20); //NOTE: failing in IE (TEST_SUITE=sauce)
+            // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
@@ -266,18 +286,24 @@ moduleFor(
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
     }
 
-    ['@test static attributes']() {
-      this.render(`
-      {{input type="text"
-        disabled=true
-        value="Original value"
-        placeholder="Original placeholder"
-        name="original-name"
-        maxlength=10
-        minlength=5
-        size=20
-        tabindex=30
-      }}`);
+    ['@test [DEPRECATED] static attributes']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(`
+            {{input type="text"
+              disabled=true
+              value="Original value"
+              placeholder="Original placeholder"
+              name="original-name"
+              maxlength=10
+              minlength=5
+              size=20
+              tabindex=30
+            }}`);
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertDisabled();
       this.assertValue('Original value');
@@ -709,21 +735,27 @@ moduleFor(
 moduleFor(
   `Components test: {{input type='checkbox'}}`,
   class extends InputRenderingTest {
-    ['@test dynamic attributes']() {
-      this.render(
-        `{{input
-      type='checkbox'
-      disabled=this.disabled
-      name=this.name
-      checked=this.checked
-      tabindex=this.tabindex
-    }}`,
-        {
-          disabled: false,
-          name: 'original-name',
-          checked: false,
-          tabindex: 10,
-        }
+    ['@test [DEPRECATED] dynamic attributes']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `{{input
+              type='checkbox'
+              disabled=this.disabled
+              name=this.name
+              checked=this.checked
+              tabindex=this.tabindex
+            }}`,
+            {
+              disabled: false,
+              name: 'original-name',
+              checked: false,
+              tabindex: 10,
+            }
+          );
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
       );
 
       this.assertSingleCheckbox();
@@ -738,22 +770,34 @@ moduleFor(
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
-      runTask(() => {
-        set(this.context, 'disabled', true);
-        set(this.context, 'name', 'updated-name');
-        set(this.context, 'tabindex', 11);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', true);
+            set(this.context, 'name', 'updated-name');
+            set(this.context, 'tabindex', 11);
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertSingleCheckbox();
       this.assertDisabled();
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
-      runTask(() => {
-        set(this.context, 'disabled', false);
-        set(this.context, 'name', 'original-name');
-        set(this.context, 'tabindex', 10);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', false);
+            set(this.context, 'name', 'original-name');
+            set(this.context, 'tabindex', 10);
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
@@ -823,9 +867,19 @@ moduleFor(
       this.assertCheckboxIsNotChecked();
     }
 
-    ['@test with static values']() {
-      this.render(
-        `{{input type="checkbox" disabled=false tabindex=10 name="original-name" checked=false}}`
+    ['@test [DEPRECATED] with static values']() {
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `{{input type="checkbox"
+              disabled=false
+              tabindex=10
+              name="original-name"
+              checked=false}}`
+          );
+        },
+        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./
       );
 
       this.assertSingleCheckbox();
@@ -852,29 +906,33 @@ moduleFor(
 moduleFor(
   `Components test: {{input type='text'}}`,
   class extends InputRenderingTest {
-    ['@test null values']() {
+    ['@test [DEPRECATED] null values']() {
       let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
-      this.render(
-        `
-      {{input type="text"
-        disabled=this.disabled
-        value=this.value
-        placeholder=this.placeholder
-        name=this.name
-        maxlength=this.maxlength
-        size=this.size
-        tabindex=this.tabindex
-      }}`,
-        {
-          disabled: null,
-          value: null,
-          placeholder: null,
-          name: null,
-          maxlength: null,
-          size: null,
-          tabindex: null,
-        }
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          this.render(
+            `{{input type="text"
+              disabled=this.disabled
+              value=this.value
+              placeholder=this.placeholder
+              name=this.name
+              maxlength=this.maxlength
+              size=this.size
+              tabindex=this.tabindex}}`,
+            {
+              disabled: null,
+              value: null,
+              placeholder: null,
+              name: null,
+              maxlength: null,
+              size: null,
+              tabindex: null,
+            }
+          );
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
       );
 
       this.assertValue('');
@@ -885,15 +943,21 @@ moduleFor(
       this.assertValue('');
       this.assertAllAttrs(attributes, undefined);
 
-      runTask(() => {
-        set(this.context, 'disabled', true);
-        set(this.context, 'value', 'Updated value');
-        set(this.context, 'placeholder', 'Updated placeholder');
-        set(this.context, 'name', 'updated-name');
-        set(this.context, 'maxlength', 11);
-        set(this.context, 'size', 21);
-        set(this.context, 'tabindex', 31);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', true);
+            set(this.context, 'value', 'Updated value');
+            set(this.context, 'placeholder', 'Updated placeholder');
+            set(this.context, 'name', 'updated-name');
+            set(this.context, 'maxlength', 11);
+            set(this.context, 'size', 21);
+            set(this.context, 'tabindex', 31);
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertDisabled();
       this.assertValue('Updated value');
@@ -903,15 +967,21 @@ moduleFor(
       this.assertAttr('size', '21');
       this.assertAttr('tabindex', '31');
 
-      runTask(() => {
-        set(this.context, 'disabled', null);
-        set(this.context, 'value', null);
-        set(this.context, 'placeholder', null);
-        set(this.context, 'name', null);
-        set(this.context, 'maxlength', null);
-        // set(this.context, 'size', null); //NOTE: this fails with `Error: Failed to set the 'size' property on 'HTMLInputElement': The value provided is 0, which is an invalid size.` (TEST_SUITE=sauce)
-        set(this.context, 'tabindex', null);
-      });
+      maybeExpectDeprecation(
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        () => {
+          runTask(() => {
+            set(this.context, 'disabled', null);
+            set(this.context, 'value', null);
+            set(this.context, 'placeholder', null);
+            set(this.context, 'name', null);
+            set(this.context, 'maxlength', null);
+            // set(this.context, 'size', null); //NOTE: this fails with `Error: Failed to set the 'size' property on 'HTMLInputElement': The value provided is 0, which is an invalid size.` (TEST_SUITE=sauce)
+            set(this.context, 'tabindex', null);
+          });
+        },
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+      );
 
       this.assertAttr('disabled', undefined);
       this.assertValue('');
@@ -935,10 +1005,14 @@ moduleFor(
   'value="%x" type="range" min="-5" max="50"',
 ].forEach((attrs) => {
   moduleFor(
-    `[GH#15675] Components test: {{input ${attrs}}}`,
+    `[GH#15675] Components test [DEPRECATED]: {{input ${attrs}}}`,
     class extends InputRenderingTest {
       renderInput(value = 25) {
-        this.render(`{{input ${attrs.replace('%x', value)}}}`);
+        maybeExpectDeprecation(
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+          () => this.render(`{{input ${attrs.replace('%x', value)}}}`),
+          /Passing the `@(min|max)` argument to <Input> is deprecated\./
+        );
       }
 
       ['@test value over default max but below set max is kept']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
index abb608426fd..9854393608f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
@@ -468,12 +468,15 @@ moduleFor(
       this.assertText('[] []');
     }
 
-    ['@test get helper value should be updatable using {{input}} and (mut) - static key'](assert) {
-      this.render(`{{input type='text' value=(mut (get this.source 'banana')) id='get-input'}}`, {
-        source: {
-          banana: 'banana',
-        },
-      });
+    ['@test get helper value should be updatable using <Input> and (mut) - static key'](assert) {
+      this.render(
+        `<Input @type='text' @value={{mut (get this.source 'banana')}} id='get-input'/>`,
+        {
+          source: {
+            banana: 'banana',
+          },
+        }
+      );
 
       assert.strictEqual(this.$('#get-input').val(), 'banana');
 
@@ -495,14 +498,17 @@ moduleFor(
       assert.strictEqual(this.$('#get-input').val(), 'banana');
     }
 
-    ['@test get helper value should be updatable using {{input}} and (mut) - dynamic key'](assert) {
-      this.render(`{{input type='text' value=(mut (get this.source this.key)) id='get-input'}}`, {
-        source: {
-          apple: 'apple',
-          banana: 'banana',
-        },
-        key: 'banana',
-      });
+    ['@test get helper value should be updatable using <Input> and (mut) - dynamic key'](assert) {
+      this.render(
+        `<Input @type='text' @value={{mut (get this.source this.key)}} id='get-input'/>`,
+        {
+          source: {
+            apple: 'apple',
+            banana: 'banana',
+          },
+          key: 'banana',
+        }
+      );
 
       assert.strictEqual(this.$('#get-input').val(), 'banana');
 
@@ -536,19 +542,22 @@ moduleFor(
       assert.strictEqual(this.$('#get-input').val(), 'banana');
     }
 
-    ['@test get helper value should be updatable using {{input}} and (mut) - dynamic nested key'](
+    ['@test get helper value should be updatable using <Input> and (mut) - dynamic nested key'](
       assert
     ) {
-      this.render(`{{input type='text' value=(mut (get this.source this.key)) id='get-input'}}`, {
-        source: {
-          apple: {
-            gala: 'gala',
-            mcintosh: 'mcintosh',
+      this.render(
+        `<Input @type='text' @value={{mut (get this.source this.key)}} id='get-input'/>`,
+        {
+          source: {
+            apple: {
+              gala: 'gala',
+              mcintosh: 'mcintosh',
+            },
+            banana: 'banana',
           },
-          banana: 'banana',
-        },
-        key: 'apple.mcintosh',
-      });
+          key: 'apple.mcintosh',
+        }
+      );
 
       assert.strictEqual(this.$('#get-input').val(), 'mcintosh');
 
diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
index 33457f189d5..f2902095bb5 100644
--- a/packages/ember-testing/tests/helpers_test.js
+++ b/packages/ember-testing/tests/helpers_test.js
@@ -3,6 +3,7 @@ import { moduleFor, AutobootApplicationTestCase, isIE11, runTask } from 'interna
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { RSVP } from '@ember/-internals/runtime';
+import { action } from '@ember/object';
 import { later } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
@@ -379,7 +380,7 @@ if (!jQueryDisabled) {
           'index',
           `
         {{#index-wrapper}}
-          {{input type="text"}}
+          <Input @type="text"/>
           {{x-checkbox type="checkbox"}}
           {{textarea}}
           <div contenteditable="true"> </div>
@@ -626,7 +627,7 @@ if (!jQueryDisabled) {
         this.addTemplate(
           'components/index-wrapper',
           `
-        {{input type="text" id="scope" class="input"}}
+        <Input @type="text" id="scope" class="input"/>
       `
         );
 
@@ -675,9 +676,9 @@ if (!jQueryDisabled) {
         this.addTemplate(
           'components/index-wrapper',
           `
-        {{input type="text" id="outside-scope" class="input"}}
+        <Input @type="text" id="outside-scope" class="input"/>
         <div id="limited">
-          {{input type="text" id="inside-scope" class="input"}}
+          <Input @type="text" id="inside-scope" class="input"/>
         </div>
       `
         );
@@ -724,7 +725,7 @@ if (!jQueryDisabled) {
         this.addTemplate(
           'components/index-wrapper',
           `
-        {{input type="text" id="foo"}}
+        <Input @type="text" id="foo"/>
       `
         );
         this.addTemplate('index', `{{index-wrapper}}`);
@@ -757,12 +758,10 @@ if (!jQueryDisabled) {
 
         this.addTemplate(
           'index',
-          `
-        <div id="parent">
-          {{input type="text" id="first" class="current"}}
-        </div>
-        {{input type="text" id="second" class="current"}}
-      `
+          `<div id="parent">
+            <Input @type="text" id="first" class="current"/>
+          </div>
+          <Input @type="text" id="second" class="current"/>`
         );
 
         runTask(() => {
@@ -789,21 +788,17 @@ if (!jQueryDisabled) {
         this.add(
           'controller:index',
           Controller.extend({
-            actions: {
-              wasFocused() {
-                wasFocused = true;
-              },
-            },
+            wasFocused: action(function () {
+              wasFocused = true;
+            }),
           })
         );
 
         this.addTemplate(
           'index',
-          `
-        <div id="parent">
-          {{input type="text" id="first" focus-in=(action "wasFocused")}}
-        </div>'
-      `
+          `<div id="parent">
+            <Input @type="text" id="first" {{on "focusin" this.wasFocused}}/>
+          </div>'`
         );
 
         runTask(() => {
@@ -846,11 +841,9 @@ if (!jQueryDisabled) {
 
         this.addTemplate(
           'index',
-          `
-        <input type="text" id="first"
+          `<input type="text" id="first"
             oninput={{action "oninputHandler"}}
-            onchange={{action "onchangeHandler"}}>
-      `
+            onchange={{action "onchangeHandler"}}>`
         );
 
         runTask(() => {
@@ -926,9 +919,9 @@ if (!jQueryDisabled) {
         this.addTemplate(
           'components/index-wrapper',
           `
-        {{input type="text" id="outside-scope" class="input"}}
+        <Input @type="text" id="outside-scope" class="input"/>
         <div id="limited">
-          {{input type="text" id="inside-scope" class="input"}}
+          <Input @type="text" id="inside-scope" class="input"/>
         </div>
       `
         );
diff --git a/packages/ember/tests/routing/query_params_test/shared_state_test.js b/packages/ember/tests/routing/query_params_test/shared_state_test.js
index 0b09bc31310..c78b0e036b2 100644
--- a/packages/ember/tests/routing/query_params_test/shared_state_test.js
+++ b/packages/ember/tests/routing/query_params_test/shared_state_test.js
@@ -42,7 +42,7 @@ moduleFor(
       this.addTemplate('application', `{{link-to 'Home' 'home' }} <div> {{outlet}} </div>`);
       this.addTemplate(
         'home',
-        `{{link-to 'Dashboard' 'dashboard' }}{{input type="checkbox" id='filters-checkbox' checked=(mut this.filters.shared) }}`
+        `{{link-to 'Dashboard' 'dashboard' }}<Input @type="checkbox" id='filters-checkbox' checked={{mut this.filters.shared}} />`
       );
       this.addTemplate('dashboard', `{{link-to 'Home' 'home' }}`);
     }
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index 3379d35400d..e4ac00e41e0 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -7,6 +7,7 @@ export { default as moduleFor, setupTestClass } from './lib/module-for';
 export { default as strip } from './lib/strip';
 export { default as applyMixins } from './lib/apply-mixins';
 export { default as getTextOf } from './lib/get-text-of';
+export { default as maybeExpectDeprecation } from './lib/maybe-expect-deprecation';
 export {
   defineComponent,
   defineSimpleHelper,
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index 2ab1784f168..57daa3e9ad3 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -6,7 +6,7 @@ type ExpectDeprecationAsyncFunc = (
   func: () => void | undefined | Message | Promise<any>,
   expectedMessage: Message
 ) => Promise<any>;
-type ExpectDeprecationFunc = (
+export type ExpectDeprecationFunc = (
   func: () => void | undefined | Message,
   expectedMessage: Message
 ) => void;
diff --git a/packages/internal-test-helpers/lib/maybe-expect-deprecation.ts b/packages/internal-test-helpers/lib/maybe-expect-deprecation.ts
new file mode 100644
index 00000000000..1c73cf35de6
--- /dev/null
+++ b/packages/internal-test-helpers/lib/maybe-expect-deprecation.ts
@@ -0,0 +1,16 @@
+import { ExpectDeprecationFunc } from './ember-dev/deprecation';
+import { Message } from './ember-dev/utils';
+
+declare let expectDeprecation: ExpectDeprecationFunc;
+
+export default function maybeExpectDeprecation(
+  featureFlag: boolean | null,
+  callback: () => void,
+  message: Message
+): void {
+  if (featureFlag) {
+    expectDeprecation(callback, message);
+  } else {
+    callback();
+  }
+}

From a1225751dd3029fc4f038ee8919e7bcc67f0afb5 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 19 Jan 2021 16:11:22 -0800
Subject: [PATCH 0352/1405] [RFC 698] Deprecate `<LinkTo>` positional arguments

Implement [RFC 698](https://github.com/emberjs/rfcs/blob/master/text/0698-deprecate-link-to-positional-arguments.md)
---
 .../glimmer/lib/components/link-to.ts         |  71 ++-
 .../glimmer/lib/helpers/query-param.ts        |  18 +-
 .../integration/application/engine-test.js    |   6 +-
 .../link-to/query-params-curly-test.js        | 142 ++---
 .../link-to/rendering-curly-test.js           |  41 +-
 .../components/link-to/routing-angle-test.js  |  20 +-
 .../components/link-to/routing-curly-test.js  | 369 ++++++------
 .../transitioning-classes-curly-test.js       |  20 +-
 .../lib/plugins/transform-link-to.ts          |  49 +-
 .../tests/plugins/transform-link-to-test.js   | 556 ++++++++++--------
 .../ember-testing/tests/acceptance_test.js    |   2 +-
 .../ember/tests/routing/query_params_test.js  |  10 +-
 ..._dependent_state_with_query_params_test.js |  10 +-
 .../query_param_async_get_handler_test.js     |   6 +-
 .../query_params_paramless_link_to_test.js    |   2 +-
 .../query_params_test/shared_state_test.js    |   9 +-
 16 files changed, 807 insertions(+), 524 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index f3e3af24bc2..c1de5940e84 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -6,7 +6,7 @@ import { alias, computed } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import RouterState from '@ember/-internals/routing/lib/system/router_state';
 import { isSimpleClick } from '@ember/-internals/views';
-import { assert, warn } from '@ember/debug';
+import { assert, deprecate, runInDebug, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { inject as injectService } from '@ember/service';
@@ -890,11 +890,13 @@ const LinkComponent = EmberComponent.extend({
       return;
     }
 
+    let hasBlock = this[HAS_BLOCK];
+
     params = params.slice();
 
     // Process the positional arguments, in order.
     // 1. Inline link title comes first, if present.
-    if (!this[HAS_BLOCK]) {
+    if (!hasBlock) {
       this.set('linkTitle', params.shift());
     }
 
@@ -917,6 +919,71 @@ const LinkComponent = EmberComponent.extend({
     // 4. Any remaining indices (if any) are `models`.
     this.set('model', UNDEFINED);
     this.set('models', params);
+
+    runInDebug(() => {
+      params = this.params.slice();
+
+      let equivalentNamedArgs = [];
+      let hasQueryParams = false;
+
+      // Process the positional arguments, in order.
+      // 1. Inline link title comes first, if present.
+      if (!hasBlock) {
+        params.shift();
+      }
+
+      // 2. The last argument is possibly the `query` object.
+      let query = params[params.length - 1];
+
+      if (query && query.isQueryParams) {
+        params.pop();
+        hasQueryParams = true;
+      }
+
+      // 3. If there is a `route`, it is now at index 0.
+      if (params.length > 0) {
+        params.shift();
+        equivalentNamedArgs.push('`@route`');
+      }
+
+      // 4. Any remaining params (if any) are `models`.
+      if (params.length === 1) {
+        equivalentNamedArgs.push('`@model`');
+      } else if (params.length > 1) {
+        equivalentNamedArgs.push('`@models`');
+      }
+
+      if (hasQueryParams) {
+        equivalentNamedArgs.push('`@query`');
+      }
+
+      if (equivalentNamedArgs.length > 0) {
+        let message = 'Invoking the `<LinkTo>` component with positional arguments is deprecated.';
+
+        message += `Please use the equivalent named arguments (${equivalentNamedArgs.join(', ')})`;
+
+        if (hasQueryParams) {
+          message += ' along with the `hash` helper';
+        }
+
+        if (!hasBlock) {
+          message += " and pass a block for the link's content.";
+        }
+
+        message += '.';
+
+        deprecate(message, false, {
+          id: 'ember-glimmer.link-to.positional-arguments',
+          until: '4.0.0',
+          for: 'ember-source',
+          url:
+            'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
+          since: {
+            enabled: '3.26.0-beta.1',
+          },
+        });
+      }
+    });
   },
 });
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index a13b7efee16..98f4d047dbb 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { QueryParams } from '@ember/-internals/routing';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef } from '@glimmer/reference';
@@ -35,10 +35,24 @@ export default internalHelper((args: VMArguments) => {
 
   return createComputeRef(() => {
     assert(
-      "The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='foo') as opposed to just (query-params 'foo')",
+      "The `query-params` helper only accepts named arguments, e.g. (query-params queryParamPropertyName='foo') as opposed to (query-params 'foo')",
       positional.length === 0
     );
 
+    deprecate(
+      'The `query-params` helper is deprecated. Invoke `<LinkTo>` with the `@query` named argument and the `hash` helper instead.',
+      false,
+      {
+        id: 'ember-glimmer.link-to.positional-arguments',
+        until: '4.0.0',
+        for: 'ember-source',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
+        since: {
+          enabled: '3.26.0-beta.1',
+        },
+      }
+    );
+
     return new QueryParams(assign({}, reifyNamed(named) as any));
   });
 });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index e62f6cd86cb..b0e8c891186 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -889,7 +889,9 @@ moduleFor(
 
     ["@test query params don't have stickiness by default between model"](assert) {
       assert.expect(1);
-      let tmpl = '{{#link-to "category" 1337}}Category 1337{{/link-to}}';
+
+      let tmpl = '<LinkTo @route="category" @model={{1337}}>Category 1337</LinkTo>';
+
       this.setupAppAndRoutableEngine();
       this.additionalEngineRegistrations(function () {
         this.register('template:category', compile(tmpl));
@@ -928,7 +930,7 @@ moduleFor(
     ) {
       assert.expect(2);
       let tmpl =
-        '{{#link-to "author" 1337 class="author-1337"}}Author 1337{{/link-to}}{{#link-to "author" 1 class="author-1"}}Author 1{{/link-to}}';
+        '<LinkTo @route="author" @model={{1337}} class="author-1337">Author 1337</LinkTo><LinkTo @route="author" @model=1 class="author-1">Author 1</LinkTo>';
       this.setupAppAndRoutableEngine();
       this.additionalEngineRegistrations(function () {
         this.register('template:author', compile(tmpl));
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index 730eb806f15..cbb84437ebd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -29,7 +29,7 @@ moduleFor(
     ['@test populates href with fully supplied query param values']() {
       this.addTemplate(
         'index',
-        `{{#link-to 'index' (query-params foo='456' bar='NAW')}}Index{{/link-to}}`
+        `{{#link-to route='index' query=(hash foo='456' bar='NAW')}}Index{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -44,7 +44,7 @@ moduleFor(
     ['@test populates href with fully supplied query param values, but without @route param']() {
       this.addTemplate(
         'index',
-        `{{#link-to (query-params foo='2' bar='NAW')}}QueryParams{{/link-to}}`
+        `{{#link-to query=(hash foo='2' bar='NAW')}}QueryParams{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -57,7 +57,10 @@ moduleFor(
     }
 
     ['@test populates href with partially supplied query param values, but omits if value is default value']() {
-      this.addTemplate('index', `{{#link-to 'index' (query-params foo='123')}}Index{{/link-to}}`);
+      this.addTemplate(
+        'index',
+        `{{#link-to route='index' query=(hash foo='123')}}Index{{/link-to}}`
+      );
 
       return this.visit('/').then(() => {
         this.assertComponentElement(this.firstChild, {
@@ -68,23 +71,27 @@ moduleFor(
       });
     }
 
-    ['@test `(query-params)` can be used outside of `{{link-to}}'](assert) {
+    async ['@test [DEPRECATED] `query-params` can be used outside of `{{link-to}}'](assert) {
       if (!DEBUG) {
         assert.expect(0);
         return;
       }
 
-      this.addTemplate(
-        'index',
-        `{{#let (query-params foo='456' alon='BUKAI') as |qp|}}{{link-to 'Index' 'index' qp}}{{/let}}`
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'index',
+          `{{#let (query-params foo='456' alon='BUKAI') as |qp|}}{{#link-to 'index' qp}}Index{{/link-to}}{{/let}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-      return this.visit('/').then(() => {
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'a',
-          attrs: { href: '/?alon=BUKAI&foo=456', class: classMatcher('ember-view') },
-          content: 'Index',
-        });
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /The `query-params` helper is deprecated/
+      );
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/?alon=BUKAI&foo=456', class: classMatcher('ember-view') },
+        content: 'Index',
       });
     }
   }
@@ -142,7 +149,7 @@ moduleFor(
     }
 
     [`@test doesn't update controller QP properties on current route when invoked`](assert) {
-      this.addTemplate('index', `{{#link-to 'index' id='the-link'}}Index{{/link-to}}`);
+      this.addTemplate('index', `{{#link-to route='index' id='the-link'}}Index{{/link-to}}`);
 
       return this.visit('/').then(() => {
         this.click('#the-link');
@@ -161,7 +168,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `{{#link-to 'index' (query-params) id='the-link'}}Index{{/link-to}}`
+        `{{#link-to route='index' query=(hash) id='the-link'}}Index{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -179,7 +186,7 @@ moduleFor(
     [`@test doesn't update controller QP properties on current route when invoked (empty query-params obj, inferred route)`](
       assert
     ) {
-      this.addTemplate('index', `{{#link-to (query-params) id='the-link'}}Index{{/link-to}}`);
+      this.addTemplate('index', `{{#link-to query=(hash) id='the-link'}}Index{{/link-to}}`);
 
       return this.visit('/').then(() => {
         this.click('#the-link');
@@ -197,7 +204,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to 'index' (query-params foo='456') id="the-link"}}
+        {{#link-to route='index' query=(hash foo='456') id="the-link"}}
           Index
         {{/link-to}}
         `
@@ -221,7 +228,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params foo='456') id="the-link"}}
+        {{#link-to query=(hash foo='456') id="the-link"}}
           Index
         {{/link-to}}
         `
@@ -249,7 +256,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to 'about' (query-params baz='lol') id='the-link'}}
+        {{#link-to route='about' query=(hash baz='lol') id='the-link'}}
           About
         {{/link-to}}
         `
@@ -274,7 +281,7 @@ moduleFor(
     ['@test supplied QP properties can be bound'](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to (query-params foo=this.boundThing) id='the-link'}}Index{{/link-to}}`
+        `{{#link-to query=(hash foo=this.boundThing) id='the-link'}}Index{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -293,7 +300,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params abool=this.boundThing) id='the-link'}}
+        {{#link-to query=(hash abool=this.boundThing) id='the-link'}}
           Index
         {{/link-to}}
         `
@@ -322,7 +329,7 @@ moduleFor(
     async ['@test href updates when unsupplied controller QP props change'](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to (query-params foo='lol') id='the-link'}}Index{{/link-to}}`
+        `{{#link-to query=(hash foo='lol') id='the-link'}}Index{{/link-to}}`
       );
 
       await this.visit('/');
@@ -350,15 +357,15 @@ moduleFor(
       this.addTemplate(
         'cars',
         `
-        {{#link-to 'cars.create' id='create-link'}}Create new car{{/link-to}}
-        {{#link-to (query-params page='2') id='page2-link'}}Page 2{{/link-to}}
+        {{#link-to route='cars.create' id='create-link'}}Create new car{{/link-to}}
+        {{#link-to query=(hash page='2') id='page2-link'}}Page 2{{/link-to}}
         {{outlet}}
         `
       );
 
       this.addTemplate(
         'cars.create',
-        `{{#link-to 'cars' id='close-link'}}Close create form{{/link-to}}`
+        `{{#link-to route='cars' id='close-link'}}Close create form{{/link-to}}`
       );
 
       this.router.map(function () {
@@ -399,22 +406,22 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params foo='cat') id='cat-link'}}Index{{/link-to}}
-        {{#link-to (query-params foo='dog') id='dog-link'}}Index{{/link-to}}
-        {{#link-to 'index' id='change-nothing'}}Index{{/link-to}}
+        {{#link-to query=(hash foo='cat') id='cat-link'}}Index{{/link-to}}
+        {{#link-to query=(hash foo='dog') id='dog-link'}}Index{{/link-to}}
+        {{#link-to route='index' id='change-nothing'}}Index{{/link-to}}
         `
       );
 
       this.addTemplate(
         'search',
         `
-        {{#link-to (query-params search='same') id='same-search'}}Index{{/link-to}}
-        {{#link-to (query-params search='change') id='change-search'}}Index{{/link-to}}
-        {{#link-to (query-params search='same' archive=true) id='same-search-add-archive'}}Index{{/link-to}}
-        {{#link-to (query-params archive=true) id='only-add-archive'}}Index{{/link-to}}
-        {{#link-to (query-params search='same' archive=true) id='both-same'}}Index{{/link-to}}
-        {{#link-to (query-params search='different' archive=true) id='change-one'}}Index{{/link-to}}
-        {{#link-to (query-params search='different' archive=false) id='remove-one'}}Index{{/link-to}}
+        {{#link-to query=(hash search='same') id='same-search'}}Index{{/link-to}}
+        {{#link-to query=(hash search='change') id='change-search'}}Index{{/link-to}}
+        {{#link-to query=(hash search='same' archive=true) id='same-search-add-archive'}}Index{{/link-to}}
+        {{#link-to query=(hash archive=true) id='only-add-archive'}}Index{{/link-to}}
+        {{#link-to query=(hash search='same' archive=true) id='both-same'}}Index{{/link-to}}
+        {{#link-to query=(hash search='different' archive=true) id='change-one'}}Index{{/link-to}}
+        {{#link-to query=(hash search='different' archive=false) id='remove-one'}}Index{{/link-to}}
         {{outlet}}
         `
       );
@@ -422,13 +429,13 @@ moduleFor(
       this.addTemplate(
         'search.results',
         `
-        {{#link-to (query-params sort='title') id='same-sort-child-only'}}Index{{/link-to}}
-        {{#link-to (query-params search='same') id='same-search-parent-only'}}Index{{/link-to}}
-        {{#link-to (query-params search='change') id='change-search-parent-only'}}Index{{/link-to}}
-        {{#link-to (query-params search='same' sort='title') id='same-search-same-sort-child-and-parent'}}Index{{/link-to}}
-        {{#link-to (query-params search='same' sort='author') id='same-search-different-sort-child-and-parent'}}Index{{/link-to}}
-        {{#link-to (query-params search='change' sort='title') id='change-search-same-sort-child-and-parent'}}Index{{/link-to}}
-        {{#link-to (query-params foo='dog') id='dog-link'}}Index{{/link-to}}
+        {{#link-to query=(hash sort='title') id='same-sort-child-only'}}Index{{/link-to}}
+        {{#link-to query=(hash search='same') id='same-search-parent-only'}}Index{{/link-to}}
+        {{#link-to query=(hash search='change') id='change-search-parent-only'}}Index{{/link-to}}
+        {{#link-to query=(hash search='same' sort='title') id='same-search-same-sort-child-and-parent'}}Index{{/link-to}}
+        {{#link-to query=(hash search='same' sort='author') id='same-search-different-sort-child-and-parent'}}Index{{/link-to}}
+        {{#link-to query=(hash search='change' sort='title') id='change-search-same-sort-child-and-parent'}}Index{{/link-to}}
+        {{#link-to query=(hash foo='dog') id='dog-link'}}Index{{/link-to}}
         `
       );
 
@@ -505,7 +512,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params page=this.pageNumber) id='page-link'}}
+        {{#link-to query=(hash page=this.pageNumber) id='page-link'}}
           Index
         {{/link-to}}
         `
@@ -534,9 +541,9 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params pages=this.pagesArray) id='array-link'}}Index{{/link-to}}
-        {{#link-to (query-params pages=this.biggerArray) id='bigger-link'}}Index{{/link-to}}
-        {{#link-to (query-params pages=this.emptyArray) id='empty-link'}}Index{{/link-to}}
+        {{#link-to query=(hash pages=this.pagesArray) id='array-link'}}Index{{/link-to}}
+        {{#link-to query=(hash pages=this.biggerArray) id='bigger-link'}}Index{{/link-to}}
+        {{#link-to query=(hash pages=this.emptyArray) id='empty-link'}}Index{{/link-to}}
         `
       );
 
@@ -587,9 +594,9 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to 'parent' id='parent-link'}}Parent{{/link-to}}
-        {{#link-to 'parent.child' id='parent-child-link'}}Child{{/link-to}}
-        {{#link-to 'parent' (query-params foo=this.cat) id='parent-link-qp'}}Parent{{/link-to}}
+        {{#link-to route='parent' id='parent-link'}}Parent{{/link-to}}
+        {{#link-to route='parent.child' id='parent-child-link'}}Child{{/link-to}}
+        {{#link-to route='parent' query=(hash foo=this.cat) id='parent-link-qp'}}Parent{{/link-to}}
         {{outlet}}
         `
       );
@@ -627,7 +634,7 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to 'parent' (query-params page=1) current-when='parent' id='app-link'}}
+        {{#link-to route='parent' query=(hash page=1) current-when='parent' id='app-link'}}
           Parent
         {{/link-to}}
         {{outlet}}
@@ -637,7 +644,7 @@ moduleFor(
       this.addTemplate(
         'parent',
         `
-        {{#link-to 'parent' (query-params page=1) current-when='parent' id='parent-link'}}
+        {{#link-to route='parent' query=(hash page=1) current-when='parent' id='parent-link'}}
           Parent
         {{/link-to}}
         {{outlet}}
@@ -698,9 +705,9 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{link-to 'Foos' 'foos' id='foos-link'}}
-        {{link-to 'Baz Foos' 'foos' (query-params baz=true) id='baz-foos-link'}}
-        {{link-to 'Quux Bars' 'bars' (query-params quux=true) id='bars-link'}}
+        {{#link-to route='foos' id='foos-link'}}Foos{{/link-to}}
+        {{#link-to route='foos' query=(hash baz=true) id='baz-foos-link'}}Baz Foos{{/link-to}}
+        {{#link-to route='bars' query=(hash quux=true) id='bars-link'}}Quux Bars{{/link-to}}
         `
       );
 
@@ -771,7 +778,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to (query-params page=this.pageNumber) id='page-link'}}
+        {{#link-to query=(hash page=this.pageNumber) id='page-link'}}
           Index
         {{/link-to}}
         `
@@ -809,7 +816,7 @@ moduleFor(
         });
     }
 
-    ['@test [GH#17869] it does not cause shadowing assertion with `hash` local variable']() {
+    ['@test [DEPRECATED] [GH#17869] it does not cause shadowing assertion with `hash` local variable']() {
       this.router.map(function () {
         this.route('post', { path: '/post/:id' });
       });
@@ -822,14 +829,16 @@ moduleFor(
         })
       );
 
-      this.addTemplate(
-        'index',
-        `
-        {{#let (hash id="1" title="Hello World!" body="Lorem ipsum dolor sit amet...") as |hash|}}
-          {{#link-to "post" hash (query-params showComments=false)}}View Post{{/link-to}}
-        {{/let}}
-        `
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'index',
+          `
+          {{#let (hash id="1" title="Hello World!" body="Lorem ipsum dolor sit amet...") as |hash|}}
+            {{#link-to "post" hash (query-params showComments=false)}}View Post{{/link-to}}
+          {{/let}}
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       return this.visit('/').then(() => {
         this.assertComponentElement(this.element.firstElementChild, {
@@ -851,8 +860,7 @@ moduleFor(
         });
       });
 
-      this.addTemplate('foo.bar', `{{link-to 'Baz' 'foo.bar.baz' id='baz-link'}}`);
-
+      this.addTemplate('foo.bar', `{{#link-to route='foo.bar.baz' id='baz-link'}}Baz{{/link-to}}`);
       this.addTemplate('foo.bar.loading', 'Loading');
 
       this.add(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index ab11e4f2a69..d3bda9c19c5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -16,7 +16,7 @@ moduleFor(
     }
 
     ['@test should be able to be inserted in DOM when the router is not present']() {
-      this.addTemplate('application', `{{#link-to 'index'}}Go to Index{{/link-to}}`);
+      this.addTemplate('application', `{{#link-to route='index'}}Go to Index{{/link-to}}`);
 
       return this.visit('/').then(() => {
         this.assertText('Go to Index');
@@ -26,7 +26,7 @@ moduleFor(
     ['@test re-renders when title changes']() {
       let controller;
 
-      this.addTemplate('application', `{{link-to this.title 'index'}}`);
+      this.addTemplate('application', `{{#link-to route='index'}}{{this.title}}{{/link-to}}`);
 
       this.add(
         'controller:application',
@@ -49,7 +49,7 @@ moduleFor(
     ['@test re-computes active class when params change'](assert) {
       let controller;
 
-      this.addTemplate('application', '{{link-to "foo" this.routeName}}');
+      this.addTemplate('application', '{{#link-to route=this.routeName}}foo{{/link-to}}');
 
       this.add(
         'controller:application',
@@ -73,8 +73,10 @@ moduleFor(
       });
     }
 
-    ['@test escaped inline form (double curlies) escapes link title']() {
-      this.addTemplate('application', `{{link-to this.title 'index'}}`);
+    ['@test [DEPRECATED] escaped inline form (double curlies) escapes link title']() {
+      expectDeprecation(() => {
+        this.addTemplate('application', `{{link-to this.title 'index'}}`);
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
       this.add(
         'controller:application',
         Controller.extend({
@@ -87,8 +89,12 @@ moduleFor(
       });
     }
 
-    ['@test unescaped inline form (triple curlies) does not escape link title'](assert) {
-      this.addTemplate('application', `{{{link-to this.title 'index'}}}`);
+    ['@test [DEPRECATED] unescaped inline form (triple curlies) does not escape link title'](
+      assert
+    ) {
+      expectDeprecation(() => {
+        this.addTemplate('application', `{{{link-to this.title 'index'}}}`);
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
       this.add(
         'controller:application',
         Controller.extend({
@@ -108,7 +114,7 @@ moduleFor(
       });
       this.addTemplate(
         'application',
-        `{{#custom-link-to 'index'}}{{this.title}}{{/custom-link-to}}`
+        `{{#custom-link-to route='index'}}{{this.title}}{{/custom-link-to}}`
       );
       this.add(
         'controller:application',
@@ -122,7 +128,7 @@ moduleFor(
       });
     }
 
-    ['@test [GH#13432] able to safely extend the built-in component and invoke it inline']() {
+    async ['@test [DEPRECATED] [GH#13432] able to safely extend the built-in component and invoke it inline']() {
       this.addComponent('custom-link-to', {
         ComponentClass: LinkComponent.extend(),
       });
@@ -134,9 +140,12 @@ moduleFor(
         })
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('Hello');
-      });
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
+      );
+
+      this.assertText('Hello');
     }
   }
 );
@@ -145,13 +154,15 @@ moduleFor(
   '{{link-to}} component (rendering tests, without router)',
   class extends RenderingTestCase {
     ['@test should be able to be inserted in DOM when the router is not present - block']() {
-      this.render(`{{#link-to 'index'}}Go to Index{{/link-to}}`);
+      this.render(`{{#link-to route='index'}}Go to Index{{/link-to}}`);
 
       this.assertText('Go to Index');
     }
 
-    ['@test should be able to be inserted in DOM when the router is not present - inline']() {
-      this.render(`{{link-to 'Go to Index' 'index'}}`);
+    ['@test [DEPRECATED] should be able to be inserted in DOM when the router is not present - inline']() {
+      expectDeprecation(() => {
+        this.render(`{{link-to 'Go to Index' 'index'}}`);
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       this.assertText('Go to Index');
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 829ef19c71a..91ea9d91b1b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -1801,7 +1801,7 @@ moduleFor(
         });
     }
 
-    [`@test The <LinkTo /> component can use dynamic params`](assert) {
+    async [`@test [DEPRECATED] The <LinkTo /> component can use dynamic params`](assert) {
       this.router.map(function () {
         this.route('foo', { path: 'foo/:some/:thing' });
         this.route('bar', { path: 'bar/:some/:thing/:else' });
@@ -1825,18 +1825,24 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#dynamic-link');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
+      );
 
-        assert.equal(link.attr('href'), '/foo/one/two');
+      let link = this.$('#dynamic-link');
 
-        let controller = this.applicationInstance.lookup('controller:index');
+      assert.equal(link.attr('href'), '/foo/one/two');
+
+      let controller = this.applicationInstance.lookup('controller:index');
+
+      expectDeprecation(() => {
         runTask(() => {
           controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three']);
         });
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-        assert.equal(link.attr('href'), '/bar/one/two/three');
-      });
+      assert.equal(link.attr('href'), '/bar/one/two/three');
     }
 
     [`@test GJ: <LinkTo /> to a parent root model hook which performs a 'transitionTo' has correct active class #13256`](
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 3e6a431564d..5a02c7758cf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -47,16 +47,16 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link'}}About{{/link-to}}
-        {{#link-to 'index' id='self-link'}}Self{{/link-to}}
+        {{#link-to route='about' id='about-link'}}About{{/link-to}}
+        {{#link-to route='index' id='self-link'}}Self{{/link-to}}
         `
       );
       this.addTemplate(
         'about',
         `
         <h3 class="about">About</h3>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        {{#link-to 'about' id='self-link'}}Self{{/link-to}}
+        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+        {{#link-to route='about' id='self-link'}}Self{{/link-to}}
         `
       );
     }
@@ -96,7 +96,7 @@ moduleFor(
     [`@test the {{link-to}} component doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to 'about' id='about-link' tagName='div'}}About{{/link-to}}`
+        `{{#link-to route='about' id='about-link' tagName='div'}}About{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -108,8 +108,8 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to "about" id="about-link-static" disabledWhen="shouldDisable"}}About{{/link-to}}
-        {{#link-to "about" id="about-link-dynamic" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}
+        {{#link-to route="about" id="about-link-static" disabledWhen="shouldDisable"}}About{{/link-to}}
+        {{#link-to route="about" id="about-link-dynamic" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}
         `
       );
 
@@ -147,7 +147,7 @@ moduleFor(
     [`@test the {{link-to}} component doesn't apply a 'disabled' class if disabledWhen is not provided`](
       assert
     ) {
-      this.addTemplate('index', `{{#link-to "about" id="about-link"}}About{{/link-to}}`);
+      this.addTemplate('index', `{{#link-to route="about" id="about-link"}}About{{/link-to}}`);
 
       return this.visit('/').then(() => {
         assert.ok(
@@ -160,7 +160,7 @@ moduleFor(
     [`@test the {{link-to}} component supports a custom disabledClass`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabledWhen=true disabledClass="do-not-want"}}About{{/link-to}}`
+        `{{#link-to route="about" id="about-link" disabledWhen=true disabledClass="do-not-want"}}About{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -177,7 +177,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabledWhen=true disabledClass=this.disabledClass}}About{{/link-to}}`
+        `{{#link-to route="about" id="about-link" disabledWhen=true disabledClass=this.disabledClass}}About{{/link-to}}`
       );
 
       this.add(
@@ -199,7 +199,7 @@ moduleFor(
     [`@test the {{link-to}} component does not respond to clicks when disabledWhen`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabledWhen=true}}About{{/link-to}}`
+        `{{#link-to route="about" id="about-link" disabledWhen=true}}About{{/link-to}}`
       );
 
       return this.visit('/')
@@ -214,7 +214,7 @@ moduleFor(
     [`@test the {{link-to}} component does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabled=true}}About{{/link-to}}`
+        `{{#link-to route="about" id="about-link" disabled=true}}About{{/link-to}}`
       );
 
       return this.visit('/')
@@ -231,7 +231,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `{{#link-to "about" id="about-link" disabledWhen=this.disabledWhen}}About{{/link-to}}`
+        `{{#link-to route="about" id="about-link" disabledWhen=this.disabledWhen}}About{{/link-to}}`
       );
 
       this.add(
@@ -270,8 +270,8 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link'}}About{{/link-to}}
-        {{#link-to 'index' id='self-link' activeClass='zomg-active'}}Self{{/link-to}}
+        {{#link-to route='about' id='about-link'}}About{{/link-to}}
+        {{#link-to route='index' id='self-link' activeClass='zomg-active'}}Self{{/link-to}}
         `
       );
 
@@ -295,8 +295,8 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link'}}About{{/link-to}}
-        {{#link-to 'index' id='self-link' activeClass=this.activeClass}}Self{{/link-to}}
+        {{#link-to route='about' id='about-link'}}About{{/link-to}}
+        {{#link-to route='index' id='self-link' activeClass=this.activeClass}}Self{{/link-to}}
         `
       );
 
@@ -333,7 +333,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' classNameBindings='this.foo:foo-is-true:foo-is-false'}}About{{/link-to}}
+        {{#link-to route='about' id='about-link' classNameBindings='this.foo:foo-is-true:foo-is-false'}}About{{/link-to}}
         `
       );
 
@@ -372,7 +372,7 @@ moduleFor(
             super.init(...arguments);
             this.register(
               'template:application',
-              compile(`{{#link-to 'about'}}About{{/link-to}}`, {
+              compile(`{{#link-to route='about'}}About{{/link-to}}`, {
                 moduleName: 'non-routable/templates/application.hbs',
               })
             );
@@ -404,7 +404,7 @@ moduleFor(
                 `
                 <h2 id='engine-layout'>Routable Engine</h2>
                 {{outlet}}
-                {{#link-to 'application' id='engine-application-link'}}Engine Appliction{{/link-to}}
+                {{#link-to route='application' id='engine-application-link'}}Engine Application{{/link-to}}
                 `,
                 {
                   moduleName: 'routable/templates/application.hbs',
@@ -416,8 +416,8 @@ moduleFor(
               compile(
                 `
                 <h3 class='engine-home'>Engine Home</h3>
-                {{#link-to 'about' id='engine-about-link'}}Engine About{{/link-to}}
-                {{#link-to 'index' id='engine-self-link'}}Engine Self{{/link-to}}
+                {{#link-to route='about' id='engine-about-link'}}Engine About{{/link-to}}
+                {{#link-to route='index' id='engine-self-link'}}Engine Self{{/link-to}}
                 `,
                 {
                   moduleName: 'routable/templates/index.hbs',
@@ -429,8 +429,8 @@ moduleFor(
               compile(
                 `
                 <h3 class='engine-about'>Engine About</h3>
-                {{#link-to 'index' id='engine-home-link'}}Engine Home{{/link-to}}
-                {{#link-to 'about' id='engine-self-link'}}Engine Self{{/link-to}}
+                {{#link-to route='index' id='engine-home-link'}}Engine Home{{/link-to}}
+                {{#link-to route='about' id='engine-self-link'}}Engine Self{{/link-to}}
                 `,
                 {
                   moduleName: 'routable/templates/about.hbs',
@@ -454,8 +454,8 @@ moduleFor(
         `
         <h1 id="application-layout">Application</h1>
         {{outlet}}
-        {{#link-to 'application' id='application-link'}}Appliction{{/link-to}}
-        {{#link-to 'routable' id='engine-link'}}Engine{{/link-to}}
+        {{#link-to route='application' id='application-link'}}Appliction{{/link-to}}
+        {{#link-to route='routable' id='engine-link'}}Engine{{/link-to}}
         `
       );
 
@@ -599,16 +599,16 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link'}}About{{/link-to}}
-        {{#link-to 'index' id='self-link'}}Self{{/link-to}}
+        {{#link-to route='about' id='about-link'}}About{{/link-to}}
+        {{#link-to route='index' id='self-link'}}Self{{/link-to}}
         `
       );
       this.addTemplate(
         'about',
         `
         <h3 class="about">About</h3>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        {{#link-to 'about' id='self-link'}}Self{{/link-to}}
+        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+        {{#link-to route='about' id='self-link'}}Self{{/link-to}}
         `
       );
     }
@@ -625,7 +625,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' replace=true}}About{{/link-to}}
+        {{#link-to route='about' id='about-link' replace=true}}About{{/link-to}}
         `
       );
 
@@ -650,7 +650,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' replace=this.boundTruthyThing}}About{{/link-to}}
+        {{#link-to route='about' id='about-link' replace=this.boundTruthyThing}}About{{/link-to}}
         `
       );
 
@@ -680,7 +680,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link' replace=this.boundFalseyThing}}About{{/link-to}}
+        {{#link-to route='about' id='about-link' replace=this.boundFalseyThing}}About{{/link-to}}
         `
       );
 
@@ -722,16 +722,16 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
           'index',
           `
           <h3 class="home">Home</h3>
-          {{#link-to 'about' id='about-link'}}About{{/link-to}}
-          {{#link-to 'index' id='self-link'}}Self{{/link-to}}
+          {{#link-to route='about' id='about-link'}}About{{/link-to}}
+          {{#link-to route='index' id='self-link'}}Self{{/link-to}}
           `
         );
         this.addTemplate(
           'about',
           `
           <h3 class="about">About</h3>
-          {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-          {{#link-to 'about' id='self-link'}}Self{{/link-to}}
+          {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+          {{#link-to route='about' id='self-link'}}Self{{/link-to}}
           `
         );
       }
@@ -810,7 +810,10 @@ moduleFor(
 
       this.addTemplate('about', `<h1>About</h1>{{outlet}}`);
       this.addTemplate('about.index', `<div id='index'>Index</div>`);
-      this.addTemplate('about.item', `<div id='item'>{{#link-to 'about'}}About{{/link-to}}</div>`);
+      this.addTemplate(
+        'about.item',
+        `<div id='item'>{{#link-to route='about'}}About{{/link-to}}</div>`
+      );
 
       return this.visit('/about/item').then(() => {
         assert.equal(normalizeUrl(this.$('#item a').attr('href')), '/about');
@@ -829,7 +832,7 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to 'item' id='other-link' current-when='index'}}ITEM{{/link-to}}`
+        `{{#link-to route='item' id='other-link' current-when='index'}}ITEM{{/link-to}}`
       );
 
       return this.visit('/about').then(() => {
@@ -857,7 +860,7 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to 'items' id='other-link' current-when='index'}}ITEM{{/link-to}}`
+        `{{#link-to route='items' id='other-link' current-when='index'}}ITEM{{/link-to}}`
       );
 
       return this.visit('/about').then(() => {
@@ -892,7 +895,7 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to 'items' id='other-link' current-when=this.currentWhen}}ITEM{{/link-to}}`
+        `{{#link-to route='items' id='other-link' current-when=this.currentWhen}}ITEM{{/link-to}}`
       );
 
       return this.visit('/about').then(() => {
@@ -916,15 +919,15 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to 'item' id='link1' current-when='item index'}}ITEM{{/link-to}}`
+        `{{#link-to route='item' id='link1' current-when='item index'}}ITEM{{/link-to}}`
       );
       this.addTemplate(
         'item',
-        `{{#link-to 'item' id='link2' current-when='item index'}}ITEM{{/link-to}}`
+        `{{#link-to route='item' id='link2' current-when='item index'}}ITEM{{/link-to}}`
       );
       this.addTemplate(
         'foo',
-        `{{#link-to 'item' id='link3' current-when='item index'}}ITEM{{/link-to}}`
+        `{{#link-to route='item' id='link3' current-when='item index'}}ITEM{{/link-to}}`
       );
 
       return this.visit('/about')
@@ -966,8 +969,8 @@ moduleFor(
       this.addTemplate(
         'index.about',
         `
-        {{#link-to 'index' id='index-link' current-when=this.isCurrent}}index{{/link-to}}
-        {{#link-to 'item' id='about-link' current-when=true}}ITEM{{/link-to}}
+        {{#link-to route='index' id='index-link' current-when=this.isCurrent}}index{{/link-to}}
+        {{#link-to route='item' id='about-link' current-when=true}}ITEM{{/link-to}}
         `
       );
 
@@ -998,7 +1001,7 @@ moduleFor(
         'about',
         `
         <div {{action 'hide'}}>
-          {{#link-to 'about.contact' id='about-contact'}}About{{/link-to}}
+          {{#link-to route='about.contact' id='about-contact'}}About{{/link-to}}
         </div>
         {{outlet}}
         `
@@ -1041,7 +1044,7 @@ moduleFor(
         'about',
         `
         <div {{action 'hide'}}>
-          {{#link-to 'about.contact' id='about-contact' bubbles=false}}
+          {{#link-to route='about.contact' id='about-contact' bubbles=false}}
             About
           {{/link-to}}
         </div>
@@ -1085,7 +1088,7 @@ moduleFor(
         'about',
         `
         <div {{action 'hide'}}>
-          {{#link-to 'about.contact' id='about-contact' bubbles=this.boundFalseyThing}}
+          {{#link-to route='about.contact' id='about-contact' bubbles=this.boundFalseyThing}}
             About
           {{/link-to}}
         </div>
@@ -1144,13 +1147,13 @@ moduleFor(
         <ul>
           {{#each @model as |person|}}
             <li>
-              {{#link-to 'item' person id=person.id}}
+              {{#link-to route='item' model=person id=person.id}}
                 {{person.name}}
               {{/link-to}}
             </li>
           {{/each}}
         </ul>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
+        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
         `
       );
 
@@ -1159,7 +1162,7 @@ moduleFor(
         `
         <h3 class="item">Item</h3>
         <p>{{@model.name}}</p>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
+        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
         `
       );
 
@@ -1167,7 +1170,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'about' id='about-link'}}About{{/link-to}}
+        {{#link-to route='about' id='about-link'}}About{{/link-to}}
         `
       );
 
@@ -1217,7 +1220,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'index' id='self-link' title='title-attr' rel='rel-attr' tabindex='-1'}}
+        {{#link-to route='index' id='self-link' title='title-attr' rel='rel-attr' tabindex='-1'}}
           Self
         {{/link-to}}
         `
@@ -1236,7 +1239,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'index' id='self-link' target='_blank'}}Self{{/link-to}}
+        {{#link-to route='index' id='self-link' target='_blank'}}Self{{/link-to}}
         `
       );
 
@@ -1251,7 +1254,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `<h3 class="home">Home</h3>{{#link-to 'index' id='self-link' target=this.boundLinkTarget}}Self{{/link-to}}`
+        `<h3 class="home">Home</h3>{{#link-to route='index' id='self-link' target=this.boundLinkTarget}}Self{{/link-to}}`
       );
 
       this.add(
@@ -1272,7 +1275,7 @@ moduleFor(
         this.route('about');
       });
 
-      this.addTemplate('index', `{{#link-to 'about' id='about-link'}}About{{/link-to}}`);
+      this.addTemplate('index', `{{#link-to route='about' id='about-link'}}About{{/link-to}}`);
 
       return this.visit('/').then(() => {
         assertNav({ prevented: true }, () => this.$('#about-link').click(), assert);
@@ -1288,7 +1291,7 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to 'about' id='about-link' preventDefault=false}}About{{/link-to}}`
+        `{{#link-to route='about' id='about-link' preventDefault=false}}About{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -1305,7 +1308,7 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to 'about' id='about-link' preventDefault=this.boundFalseyThing}}About{{/link-to}}`
+        `{{#link-to route='about' id='about-link' preventDefault=this.boundFalseyThing}}About{{/link-to}}`
       );
 
       this.add(
@@ -1327,7 +1330,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'index' id='self-link' target='_blank'}}Self{{/link-to}}
+        {{#link-to route='index' id='self-link' target='_blank'}}Self{{/link-to}}
         `
       );
 
@@ -1341,7 +1344,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to 'index' id='self-link' target='_self'}}Self{{/link-to}}
+        {{#link-to route='index' id='self-link' target='_self'}}Self{{/link-to}}
         `
       );
 
@@ -1356,7 +1359,7 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to 'about' id='about-link' replace=true target='_blank'}}
+        {{#link-to route='about' id='about-link' replace=true target='_blank'}}
           About
         {{/link-to}}
         `
@@ -1402,11 +1405,11 @@ moduleFor(
         'filter',
         `
         <p>{{this.filter}}</p>
-        {{#link-to "filter" "unpopular" id="link"}}Unpopular{{/link-to}}
-        {{#link-to "filter" this.filter id="path-link"}}Unpopular{{/link-to}}
-        {{#link-to "post" this.post_id id="post-path-link"}}Post{{/link-to}}
-        {{#link-to "post" 123 id="post-number-link"}}Post{{/link-to}}
-        {{#link-to "repo" this.repo id="repo-object-link"}}Repo{{/link-to}}
+        {{#link-to route="filter" model="unpopular" id="link"}}Unpopular{{/link-to}}
+        {{#link-to route="filter" model=this.filter id="path-link"}}Unpopular{{/link-to}}
+        {{#link-to route="post" model=this.post_id id="post-path-link"}}Post{{/link-to}}
+        {{#link-to route="post" model=123 id="post-number-link"}}Post{{/link-to}}
+        {{#link-to route="repo" model=this.repo id="repo-object-link"}}Repo{{/link-to}}
         `
       );
 
@@ -1445,12 +1448,12 @@ moduleFor(
 
       this.addTemplate(
         'lobby.index',
-        `{{#link-to 'lobby' 'foobar' id='lobby-link'}}Lobby{{/link-to}}`
+        `{{#link-to route='lobby' model='foobar' id='lobby-link'}}Lobby{{/link-to}}`
       );
 
       this.addTemplate(
         'lobby.list',
-        `{{#link-to 'lobby' 'foobar' id='lobby-link'}}Lobby{{/link-to}}`
+        `{{#link-to route='lobby' model='foobar' id='lobby-link'}}Lobby{{/link-to}}`
       );
 
       return this.visit('/lobby/list')
@@ -1466,8 +1469,8 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to 'index' id='string-link'}}string{{/link-to}}
-        {{#link-to this.foo id='path-link'}}path{{/link-to}}
+        {{#link-to route='index' id='string-link'}}string{{/link-to}}
+        {{#link-to route=this.foo id='path-link'}}path{{/link-to}}
         `
       );
 
@@ -1501,7 +1504,10 @@ moduleFor(
       let post = { id: '1' };
       let secondPost = { id: '2' };
 
-      this.addTemplate('index', `{{#link-to "post" this.post id="post"}}post{{/link-to}}`);
+      this.addTemplate(
+        'index',
+        `{{#link-to route="post" model=this.post id="post"}}post{{/link-to}}`
+      );
 
       this.add('controller:index', Controller.extend());
 
@@ -1544,8 +1550,8 @@ moduleFor(
         'about',
         `
         <div id='about'>
-          {{#link-to 'about' id='about-link'}}About{{/link-to}}
-          {{#link-to 'about.item' id='item-link'}}Item{{/link-to}}
+          {{#link-to route='about' id='about-link'}}About{{/link-to}}
+          {{#link-to route='about.item' id='item-link'}}Item{{/link-to}}
           {{outlet}}
         </div>
         `
@@ -1584,13 +1590,13 @@ moduleFor(
         'index',
         `
         {{#each this.routeNames as |routeName|}}
-          {{#link-to routeName}}{{routeName}}{{/link-to}}
+          {{#link-to route=routeName}}{{routeName}}{{/link-to}}
         {{/each}}
         {{#each this.routeNames as |r|}}
-          {{#link-to r}}{{r}}{{/link-to}}
+          {{#link-to route=r}}{{r}}{{/link-to}}
         {{/each}}
-        {{#link-to this.route1}}a{{/link-to}}
-        {{#link-to this.route2}}b{{/link-to}}
+        {{#link-to route=this.route1}}a{{/link-to}}
+        {{#link-to route=this.route2}}b{{/link-to}}
         `
       );
 
@@ -1623,28 +1629,34 @@ moduleFor(
       });
     }
 
-    [`@test The non-block form {{link-to}} component moves into the named route`](assert) {
-      assert.expect(3);
+    [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route`](
+      assert
+    ) {
+      assert.expect(5);
       this.router.map(function () {
         this.route('contact');
       });
 
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        {{link-to 'Contact us' 'contact' id='contact-link'}}
-        {{#link-to 'index' id='self-link'}}Self{{/link-to}}
-        `
-      );
-      this.addTemplate(
-        'contact',
-        `
-        <h3 class="contact">Contact</h3>
-        {{link-to 'Home' 'index' id='home-link'}}
-        {{link-to 'Self' 'contact' id='self-link'}}
-        `
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'index',
+          `
+          <h3 class="home">Home</h3>
+          {{link-to 'Contact us' 'contact' id='contact-link'}}
+          {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+      expectDeprecation(() => {
+        this.addTemplate(
+          'contact',
+          `
+          <h3 class="contact">Contact</h3>
+          {{link-to 'Home' 'index' id='home-link'}}
+          {{link-to 'Self' 'contact' id='self-link'}}
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       return this.visit('/')
         .then(() => {
@@ -1665,10 +1677,10 @@ moduleFor(
         });
     }
 
-    [`@test The non-block form {{link-to}} component updates the link text when it is a binding`](
+    [`@test [DEPRECATED] The non-block form {{link-to}} component updates the link text when it is a binding`](
       assert
     ) {
-      assert.expect(8);
+      assert.expect(10);
       this.router.map(function () {
         this.route('contact');
       });
@@ -1680,22 +1692,26 @@ moduleFor(
         })
       );
 
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        {{link-to this.contactName 'contact' id='contact-link'}}
-        {{#link-to 'index' id='self-link'}}Self{{/link-to}}
-        `
-      );
-      this.addTemplate(
-        'contact',
-        `
-        <h3 class="contact">Contact</h3>
-        {{link-to 'Home' 'index' id='home-link'}}
-        {{link-to 'Self' 'contact' id='self-link'}}
-        `
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'index',
+          `
+          <h3 class="home">Home</h3>
+          {{link-to this.contactName 'contact' id='contact-link'}}
+          {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+      expectDeprecation(() => {
+        this.addTemplate(
+          'contact',
+          `
+          <h3 class="contact">Contact</h3>
+          {{link-to 'Home' 'index' id='home-link'}}
+          {{link-to 'Self' 'contact' id='self-link'}}
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       return this.visit('/')
         .then(() => {
@@ -1749,10 +1765,10 @@ moduleFor(
         });
     }
 
-    async [`@test The non-block form {{link-to}} component moves into the named route with context`](
+    async [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route with context`](
       assert
     ) {
-      assert.expect(5);
+      assert.expect(6);
 
       this.router.map(function () {
         this.route('item', { path: '/item/:id' });
@@ -1771,25 +1787,27 @@ moduleFor(
         })
       );
 
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <ul>
-          {{#each @model as |person|}}
-            <li>
-              {{link-to person.name 'item' person id=person.id}}
-            </li>
-          {{/each}}
-        </ul>
-        `
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'index',
+          `
+          <h3 class="home">Home</h3>
+          <ul>
+            {{#each @model as |person|}}
+              <li>
+                {{link-to person.name 'item' person id=person.id}}
+              </li>
+            {{/each}}
+          </ul>
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
       this.addTemplate(
         'item',
         `
         <h3 class="item">Item</h3>
         <p>{{@model.name}}</p>
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
+        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
         `
       );
 
@@ -1807,18 +1825,20 @@ moduleFor(
       assert.equal(normalizeUrl(this.$('li a#erik').attr('href')), '/item/erik');
     }
 
-    [`@test The non-block form {{link-to}} performs property lookup`](assert) {
+    [`@test [DEPRECATED] The non-block form {{link-to}} performs property lookup`](assert) {
       this.router.map(function () {
         this.route('about');
       });
 
-      this.addTemplate(
-        'index',
-        `
-        {{link-to 'string' 'index' id='string-link'}}
-        {{link-to this.path this.foo id='path-link'}}
-        `
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'index',
+          `
+          {{link-to 'string' 'index' id='string-link'}}
+          {{link-to this.path this.foo id='path-link'}}
+          `
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       this.add(
         'controller:index',
@@ -1842,8 +1862,10 @@ moduleFor(
       });
     }
 
-    [`@test The non-block form {{link-to}} protects against XSS`](assert) {
-      this.addTemplate('application', `{{link-to this.display 'index' id='link'}}`);
+    [`@test [DEPRECATED] The non-block form {{link-to}} protects against XSS`](assert) {
+      expectDeprecation(() => {
+        this.addTemplate('application', `{{link-to this.display 'index' id='link'}}`);
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       this.add(
         'controller:application',
@@ -1873,7 +1895,7 @@ moduleFor(
         this.route('post', { path: 'post/:post_id' });
       });
 
-      this.addTemplate('application', `{{#link-to 'post'}}Post{{/link-to}}`);
+      this.addTemplate('application', `{{#link-to route='post'}}Post{{/link-to}}`);
 
       return assert.rejectsAssertion(
         this.visit('/'),
@@ -1891,10 +1913,10 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to 'index' id='home-link'}}Home{{/link-to}}
-        {{#link-to 'post' this.defaultPost id='default-post-link'}}Default Post{{/link-to}}
+        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+        {{#link-to route='post' model=this.defaultPost id='default-post-link'}}Default Post{{/link-to}}
         {{#if this.currentPost}}
-          {{#link-to 'post' this.currentPost id='current-post-link'}}Current Post{{/link-to}}
+          {{#link-to route='post' model=this.currentPost id='current-post-link'}}Current Post{{/link-to}}
         {{/if}}
         `
       );
@@ -1939,8 +1961,8 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{link-to 'OMG' 'things' 'omg' id='omg-link'}}
-        {{link-to 'LOL' 'things' 'lol' id='lol-link'}}
+        {{#link-to route='things' model='omg' id='omg-link'}}OMG{{/link-to}}
+        {{#link-to route='things' model='lol' id='lol-link'}}LOL{{/link-to}}
         `
       );
 
@@ -1968,7 +1990,7 @@ moduleFor(
         })
       );
 
-      this.addTemplate('index', `{{#link-to 'index' id='the-link'}}Index{{/link-to}}`);
+      this.addTemplate('index', `{{#link-to route='index' id='the-link'}}Index{{/link-to}}`);
 
       return this.visit('/').then(() => {
         assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
@@ -1988,7 +2010,7 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to 'index' (query-params) id='the-link'}}Index{{/link-to}}`
+        `{{#link-to route='index' query=(hash) id='the-link'}}Index{{/link-to}}`
       );
 
       return this.visit('/').then(() => {
@@ -2012,7 +2034,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        `{{#link-to (query-params foo='456' bar='NAW') id='the-link'}}Index{{/link-to}}`
+        `{{#link-to query=(hash foo='456' bar='NAW') id='the-link'}}Index{{/link-to}}`
       );
 
       return this.visit('/')
@@ -2034,7 +2056,9 @@ moduleFor(
         });
     }
 
-    [`@test Block-less {{link-to}} with only query-params updates when route changes`](assert) {
+    [`@test [DEPRECATED] Block-less {{link-to}} with only query-params updates when route changes`](
+      assert
+    ) {
       this.router.map(function () {
         this.route('about');
       });
@@ -2048,10 +2072,12 @@ moduleFor(
         })
       );
 
-      this.addTemplate(
-        'application',
-        `{{link-to "Index" (query-params foo='456' bar='NAW') id='the-link'}}`
-      );
+      expectDeprecation(() => {
+        this.addTemplate(
+          'application',
+          `{{link-to "Index" (query-params foo='456' bar='NAW') id='the-link'}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       return this.visit('/')
         .then(() => {
@@ -2088,7 +2114,10 @@ moduleFor(
         })
       );
 
-      this.addTemplate('index', `{{link-to 'Post' 'post' (hash id="someId" user=@model.user)}}`);
+      this.addTemplate(
+        'index',
+        `{{#link-to route='post' model=(hash id="someId" user=@model.user)}}Post{{/link-to}}`
+      );
       this.addTemplate('post', 'Post: {{@model.user.name}}');
 
       return this.visit('/')
@@ -2106,7 +2135,7 @@ moduleFor(
         });
     }
 
-    [`@test The {{link-to}} component can use dynamic params`](assert) {
+    async [`@test [DEPRECATED] The {{link-to}} component can use dynamic params`](assert) {
       this.router.map(function () {
         this.route('foo', { path: 'foo/:some/:thing' });
         this.route('bar', { path: 'bar/:some/:thing/:else' });
@@ -2130,18 +2159,24 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#dynamic-link');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
+      );
 
-        assert.equal(link.attr('href'), '/foo/one/two');
+      let link = this.$('#dynamic-link');
 
-        let controller = this.applicationInstance.lookup('controller:index');
+      assert.equal(link.attr('href'), '/foo/one/two');
+
+      let controller = this.applicationInstance.lookup('controller:index');
+
+      expectDeprecation(() => {
         runTask(() => {
           controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three']);
         });
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-        assert.equal(link.attr('href'), '/bar/one/two/three');
-      });
+      assert.equal(link.attr('href'), '/bar/one/two/three');
     }
 
     [`@test GJ: {{link-to}} to a parent root model hook which performs a 'transitionTo' has correct active class #13256`](
@@ -2165,8 +2200,10 @@ moduleFor(
           },
         })
       );
-
-      this.addTemplate('application', `{{link-to 'Parent' 'parent' id='parent-link'}}`);
+      this.addTemplate(
+        'application',
+        `{{#link-to route='parent' id='parent-link'}}Parent{{/link-to}}`
+      );
 
       return this.visit('/')
         .then(() => {
@@ -2197,10 +2234,10 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to this.destinationRoute this.routeContext loadingClass='i-am-loading' id='context-link'}}
+        {{#link-to route=this.destinationRoute model=this.routeContext loadingClass='i-am-loading' id='context-link'}}
           string
         {{/link-to}}
-        {{#link-to this.secondRoute loadingClass=this.loadingClass id='static-link'}}
+        {{#link-to route=this.secondRoute loadingClass=this.loadingClass id='static-link'}}
           string
         {{/link-to}}
         `
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
index a54c5b76137..745e31356a5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
@@ -62,10 +62,10 @@ moduleFor(
         'application',
         `
         {{outlet}}
-        {{link-to 'Index' 'index' id='index-link'}}
-        {{link-to 'About' 'about' id='about-link'}}
-        {{link-to 'Other' 'other' id='other-link'}}
-        {{link-to 'News' 'news' activeClass=false id='news-link'}}
+        {{#link-to route='index' id='index-link'}}Index{{/link-to}}
+        {{#link-to route='about' id='about-link'}}About{{/link-to}}
+        {{#link-to route='other' id='other-link'}}Other{{/link-to}}
+        {{#link-to route='news' activeClass=false id='news-link'}}News{{/link-to}}
         `
       );
     }
@@ -188,14 +188,14 @@ moduleFor(
         'application',
         `
         {{outlet}}
-        {{#link-to 'index' tagName='li'}}
-          {{link-to 'Index' 'index' id='index-link'}}
+        {{#link-to route='index' tagName='li'}}
+          {{#link-to route='index' id='index-link'}}Index{{/link-to}}
         {{/link-to}}
-        {{#link-to 'parent-route.about' tagName='li'}}
-          {{link-to 'About' 'parent-route.about' id='about-link'}}
+        {{#link-to route='parent-route.about' tagName='li'}}
+          {{#link-to route='parent-route.about' tagName='li' id='about-link'}}About{{/link-to}}
         {{/link-to}}
-        {{#link-to 'parent-route.other' tagName='li'}}
-          {{link-to 'Other' 'parent-route.other' id='other-link'}}
+        {{#link-to route='parent-route.other' tagName='li'}}
+          {{#link-to route='parent-route.other' id='other-link'}}Other{{/link-to}}
         {{/link-to}}
         `
       );
diff --git a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
index dce5af89144..5de93bfdbc3 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
@@ -1,4 +1,4 @@
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
 import { Builders, EmberASTPluginEnvironment } from '../types';
@@ -39,7 +39,8 @@ function transformInlineLinkToIntoBlockForm(
 
 function transformPositionalLinkToIntoNamedArguments(
   env: EmberASTPluginEnvironment,
-  node: AST.BlockStatement
+  node: AST.BlockStatement,
+  hasBlock = true
 ): AST.BlockStatement {
   let { builders: b } = env.syntax;
   let { moduleName } = env.meta;
@@ -114,6 +115,9 @@ function transformPositionalLinkToIntoNamedArguments(
     params.length > 0
   );
 
+  let equivalentNamedArgs = [];
+  let hasQueryParams = false;
+
   // 1. The last argument is possibly the `query` object.
 
   let query = params[params.length - 1];
@@ -136,6 +140,8 @@ function transformPositionalLinkToIntoNamedArguments(
         query.loc
       )
     );
+
+    hasQueryParams = true;
   }
 
   // 2. If there is a `route`, it is now at index 0.
@@ -144,16 +150,53 @@ function transformPositionalLinkToIntoNamedArguments(
 
   if (route) {
     pairs.push(b.pair('route', route, route.loc));
+    equivalentNamedArgs.push('`@route`');
   }
 
   // 3. Any remaining indices (if any) are `models`.
 
   if (params.length === 1) {
     pairs.push(b.pair('model', params[0], params[0].loc));
+    equivalentNamedArgs.push('`@model`');
   } else if (params.length > 1) {
     pairs.push(
       b.pair('models', b.sexpr(b.path('array', node.loc), params, undefined, node.loc), node.loc)
     );
+    equivalentNamedArgs.push('`@models`');
+  }
+
+  if (hasQueryParams) {
+    equivalentNamedArgs.push('`@query`');
+  }
+
+  if (equivalentNamedArgs.length > 0) {
+    let message = 'Invoking the `<LinkTo>` component with positional arguments is deprecated.';
+
+    message += `Please use the equivalent named arguments (${equivalentNamedArgs.join(', ')})`;
+
+    if (hasQueryParams) {
+      message += ' along with the `hash` helper';
+    }
+
+    if (!hasBlock) {
+      message += " and pass a block for the link's content.";
+    }
+
+    message += '.';
+
+    if (node.loc?.source) {
+      message += ` ${calculateLocationDisplay(moduleName, node.loc)}`;
+    }
+
+    deprecate(message, false, {
+      id: 'ember-glimmer.link-to.positional-arguments',
+      until: '4.0.0',
+      for: 'ember-source',
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
+      since: {
+        enabled: '3.26.0-beta.1',
+      },
+    });
   }
 
   return b.block(
@@ -188,7 +231,7 @@ export default function transformLinkTo(env: EmberASTPluginEnvironment): ASTPlug
       MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
         if (isInlineLinkTo(node)) {
           let block = transformInlineLinkToIntoBlockForm(env, node);
-          return transformPositionalLinkToIntoNamedArguments(env, block);
+          return transformPositionalLinkToIntoNamedArguments(env, block, false);
         }
       },
 
diff --git a/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js b/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js
index 087a72d35f7..01a9d8185a3 100644
--- a/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js
+++ b/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js
@@ -5,50 +5,66 @@ import { moduleFor } from 'internal-test-helpers';
 moduleFor(
   'ember-template-compiler: transforming inline {{link-to}} into the block form',
   class extends TransformTestCase {
-    ['@test it transforms an inline {{link-to}} into its block form']() {
-      this.assertTransformed(
-        `{{link-to 'foo' 'index'}}`,
-        `{{#link-to route='index'}}foo{{/link-to}}`
-      );
+    ['@test [DEPRECATED] it transforms an inline {{link-to}} into its block form']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to 'foo' 'index'}}`,
+          `{{#link-to route='index'}}foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test bound link title']() {
-      this.assertTransformed(
-        `{{link-to foo 'index'}}`,
-        `{{#link-to route='index'}}{{foo}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{link-to this.foo 'index'}}`,
-        `{{#link-to route='index'}}{{this.foo}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{link-to foo.bar.baz 'index'}}`,
-        `{{#link-to route='index'}}{{foo.bar.baz}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{link-to @foo 'index'}}`,
-        `{{#link-to route='index'}}{{@foo}}{{/link-to}}`
-      );
+    ['@test [DEPRECATED] bound link title']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to foo 'index'}}`,
+          `{{#link-to route='index'}}{{foo}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to this.foo 'index'}}`,
+          `{{#link-to route='index'}}{{this.foo}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to foo.bar.baz 'index'}}`,
+          `{{#link-to route='index'}}{{foo.bar.baz}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to @foo 'index'}}`,
+          `{{#link-to route='index'}}{{@foo}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test sexp link title']() {
-      this.assertTransformed(
-        `{{link-to (foo) 'index'}}`,
-        `{{#link-to route='index'}}{{foo}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{link-to (foo bar) 'index'}}`,
-        `{{#link-to route='index'}}{{foo bar}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{link-to (foo bar baz=bat) 'index'}}`,
-        `{{#link-to route='index'}}{{foo bar baz=bat}}{{/link-to}}`
-      );
+    ['@test [DEPRECATED] sexp link title']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to (foo) 'index'}}`,
+          `{{#link-to route='index'}}{{foo}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to (foo bar) 'index'}}`,
+          `{{#link-to route='index'}}{{foo bar}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{link-to (foo bar baz=bat) 'index'}}`,
+          `{{#link-to route='index'}}{{foo bar baz=bat}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
   }
 );
@@ -56,50 +72,66 @@ moduleFor(
 moduleFor(
   'ember-template-compiler: transforming inline {{{link-to}}} into the block form',
   class extends TransformTestCase {
-    ['@test it transforms an inline {{{link-to}}} into its block form']() {
-      this.assertTransformed(
-        `{{{link-to 'foo' 'index'}}}`,
-        `{{#link-to route='index'}}foo{{/link-to}}`
-      );
+    ['@test [DEPRECATED] it transforms an inline {{{link-to}}} into its block form']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to 'foo' 'index'}}}`,
+          `{{#link-to route='index'}}foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test bound link title']() {
-      this.assertTransformed(
-        `{{{link-to foo 'index'}}}`,
-        `{{#link-to route='index'}}{{{foo}}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{{link-to this.foo 'index'}}}`,
-        `{{#link-to route='index'}}{{{this.foo}}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{{link-to foo.bar.baz 'index'}}}`,
-        `{{#link-to route='index'}}{{{foo.bar.baz}}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{{link-to @foo 'index'}}}`,
-        `{{#link-to route='index'}}{{{@foo}}}{{/link-to}}`
-      );
+    ['@test [DEPRECATED] bound link title']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to foo 'index'}}}`,
+          `{{#link-to route='index'}}{{{foo}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to this.foo 'index'}}}`,
+          `{{#link-to route='index'}}{{{this.foo}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to foo.bar.baz 'index'}}}`,
+          `{{#link-to route='index'}}{{{foo.bar.baz}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to @foo 'index'}}}`,
+          `{{#link-to route='index'}}{{{@foo}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test sexp link title']() {
-      this.assertTransformed(
-        `{{{link-to (foo) 'index'}}}`,
-        `{{#link-to route='index'}}{{{foo}}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{{link-to (foo bar) 'index'}}}`,
-        `{{#link-to route='index'}}{{{foo bar}}}{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{{link-to (foo bar baz=bat) 'index'}}}`,
-        `{{#link-to route='index'}}{{{foo bar baz=bat}}}{{/link-to}}`
-      );
+    ['@test [DEPRECATED] sexp link title']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to (foo) 'index'}}}`,
+          `{{#link-to route='index'}}{{{foo}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to (foo bar) 'index'}}}`,
+          `{{#link-to route='index'}}{{{foo bar}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{{link-to (foo bar baz=bat) 'index'}}}`,
+          `{{#link-to route='index'}}{{{foo bar baz=bat}}}{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
   }
 );
@@ -107,7 +139,7 @@ moduleFor(
 moduleFor(
   'ember-template-compiler: transforming positional arguments into named arguments',
   class extends TransformTestCase {
-    ['@test no arguments']() {
+    ['@test [DEPRECATED] no arguments']() {
       expectAssertion(
         () => compile('{{#link-to}}zomg{{/link-to}}', { moduleName: '-top-level' }),
         /You must provide one or more parameters to the `{{link-to}}` component. \('-top-level' @ L1:C0\)/
@@ -127,7 +159,7 @@ moduleFor(
       compile('{{#link-to query=foo}}zomg{{/link-to}}', { moduleName: '-top-level' });
     }
 
-    ['@test mixing positional and named arguments']() {
+    ['@test [DEPRECATED] mixing positional and named arguments']() {
       expectAssertion(
         () => compile('{{#link-to foo params=bar}}zomg{{/link-to}}', { moduleName: '-top-level' }),
         /cannot pass positional parameters and the `params` argument to the `{{link-to}}` component at the same time. \('-top-level' @ L1:C0\)/
@@ -154,164 +186,224 @@ moduleFor(
       );
     }
 
-    ['@test route only']() {
-      this.assertTransformed(
-        `{{#link-to 'foo'}}Foo{{/link-to}}`,
-        `{{#link-to route='foo'}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to foo}}Foo{{/link-to}}`,
-        `{{#link-to route=foo}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to this.foo}}Foo{{/link-to}}`,
-        `{{#link-to route=this.foo}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to foo.bar.baz}}Foo{{/link-to}}`,
-        `{{#link-to route=foo.bar.baz}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to @foo}}Foo{{/link-to}}`,
-        `{{#link-to route=@foo}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to @foo}}Foo{{/link-to}}`,
-        `{{#link-to route=@foo}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to (foo)}}Foo{{/link-to}}`,
-        `{{#link-to route=(foo)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to (foo bar)}}Foo{{/link-to}}`,
-        `{{#link-to route=(foo bar)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to (foo bar baz=bat)}}Foo{{/link-to}}`,
-        `{{#link-to route=(foo bar baz=bat)}}Foo{{/link-to}}`
-      );
+    ['@test [DEPRECATED] route only']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo'}}Foo{{/link-to}}`,
+          `{{#link-to route='foo'}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to foo}}Foo{{/link-to}}`,
+          `{{#link-to route=foo}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to this.foo}}Foo{{/link-to}}`,
+          `{{#link-to route=this.foo}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to foo.bar.baz}}Foo{{/link-to}}`,
+          `{{#link-to route=foo.bar.baz}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to @foo}}Foo{{/link-to}}`,
+          `{{#link-to route=@foo}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to @foo}}Foo{{/link-to}}`,
+          `{{#link-to route=@foo}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to (foo)}}Foo{{/link-to}}`,
+          `{{#link-to route=(foo)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to (foo bar)}}Foo{{/link-to}}`,
+          `{{#link-to route=(foo bar)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to (foo bar baz=bat)}}Foo{{/link-to}}`,
+          `{{#link-to route=(foo bar baz=bat)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test single model']() {
-      this.assertTransformed(
-        `{{#link-to 'foo' 'bar'}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model='bar'}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' bar}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=bar}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' this.bar}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=this.bar}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' bar.baz.bat}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=bar.baz.bat}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' @bar}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=@bar}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (bar)}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=(bar)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (bar baz)}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=(bar baz)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (bar baz bat=wat)}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' model=(bar baz bat=wat)}}Foo{{/link-to}}`
-      );
+    ['@test [DEPRECATED] single model']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' 'bar'}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model='bar'}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' bar}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=bar}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' this.bar}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=this.bar}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' bar.baz.bat}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=bar.baz.bat}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' @bar}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=@bar}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (bar)}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=(bar)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (bar baz)}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=(bar baz)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (bar baz bat=wat)}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' model=(bar baz bat=wat)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test multi models']() {
-      this.assertTransformed(
-        `{{#link-to 'foo' 'bar' 'baz' 'bat'}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array 'bar' 'baz' 'bat')}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' bar baz bat}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array bar baz bat)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' this.bar this.baz this.bat}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array this.bar this.baz this.bat)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' bar.baz.bat baz.bat.bar bat.bar.baz}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array bar.baz.bat baz.bat.bar bat.bar.baz)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' @bar @baz @bat}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array @bar @baz @bat)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (bar) (baz) (bat)}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array (bar) (baz) (bat))}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (bar baz) (baz bat) (bat bar)}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array (bar baz) (baz bat) (bat bar))}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (bar baz bat=wat) (baz bat wat=bar) (bat wat bar=baz)}}Foo{{/link-to}}`,
-        `{{#link-to route='foo' models=(array (bar baz bat=wat) (baz bat wat=bar) (bat wat bar=baz))}}Foo{{/link-to}}`
-      );
+    ['@test [DEPRECATED] multi models']() {
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' 'bar' 'baz' 'bat'}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array 'bar' 'baz' 'bat')}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' bar baz bat}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array bar baz bat)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' this.bar this.baz this.bat}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array this.bar this.baz this.bat)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' bar.baz.bat baz.bat.bar bat.bar.baz}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array bar.baz.bat baz.bat.bar bat.bar.baz)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' @bar @baz @bat}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array @bar @baz @bat)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (bar) (baz) (bat)}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array (bar) (baz) (bat))}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (bar baz) (baz bat) (bat bar)}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array (bar baz) (baz bat) (bat bar))}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (bar baz bat=wat) (baz bat wat=bar) (bat wat bar=baz)}}Foo{{/link-to}}`,
+          `{{#link-to route='foo' models=(array (bar baz bat=wat) (baz bat wat=bar) (bat wat bar=baz))}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
 
-    ['@test query params']() {
+    ['@test [DEPRECATED] query params']() {
       QUnit.dump.maxDepth = 100;
 
-      this.assertTransformed(
-        `{{#link-to (query-params)}}Foo{{/link-to}}`,
-        `{{#link-to query=(-hash)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-        `{{#link-to query=(-hash foo='bar' baz=bat)}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-        `{{#link-to query=(-hash foo='bar' baz=bat) route='foo'}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' 'bar' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-        `{{#link-to query=(-hash foo='bar' baz=bat) route='foo' model='bar'}}Foo{{/link-to}}`
-      );
-
-      this.assertTransformed(
-        `{{#link-to 'foo' 'bar' 'baz' 'bat' 'wat' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-        `{{#link-to query=(-hash foo='bar' baz=bat) route='foo' models=(array 'bar' 'baz' 'bat' 'wat')}}Foo{{/link-to}}`
-      );
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to (query-params)}}Foo{{/link-to}}`,
+          `{{#link-to query=(-hash)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
+          `{{#link-to query=(-hash foo='bar' baz=bat)}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
+          `{{#link-to query=(-hash foo='bar' baz=bat) route='foo'}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' 'bar' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
+          `{{#link-to query=(-hash foo='bar' baz=bat) route='foo' model='bar'}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
+      expectDeprecation(() => {
+        this.assertTransformed(
+          `{{#link-to 'foo' 'bar' 'baz' 'bat' 'wat' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
+          `{{#link-to query=(-hash foo='bar' baz=bat) route='foo' models=(array 'bar' 'baz' 'bat' 'wat')}}Foo{{/link-to}}`
+        );
+      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
     }
   }
 );
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index 682beae36bd..6ed764cb5e0 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -63,7 +63,7 @@ if (!jQueryDisabled) {
           <div class="posts-view">
             <a class="dummy-link"></a>
             <div id="comments-link">
-              {{#link-to 'comments'}}Comments{{/link-to}}
+              {{#link-to route='comments'}}Comments{{/link-to}}
             </div>
           </div>
         `
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index a5cf01d99a1..342d4141d6f 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -972,7 +972,7 @@ moduleFor(
       this.addTemplate('parent', '{{outlet}}');
       this.addTemplate(
         'parent.child',
-        "{{link-to 'Parent' 'parent' (query-params foo='change') id='parent-link'}}"
+        "{{#link-to route='parent' query=(hash foo='change') id='parent-link'}}Parent{{/link-to}}"
       );
 
       this.router.map(function () {
@@ -1116,7 +1116,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{link-to 'A' 'abc.def' (query-params foo='123') id='one'}}{{link-to 'B' 'abc.def.zoo' (query-params foo='123' bar='456') id='two'}}{{outlet}}"
+        "{{#link-to route='abc.def' query=(hash foo='123') id='one'}}A{{/link-to}}{{#link-to route='abc.def.zoo' query=(hash foo='123' bar='456') id='two'}}B{{/link-to}}{{outlet}}"
       );
 
       this.setSingleQPController('abc.def', 'foo', 'lol');
@@ -1447,7 +1447,7 @@ moduleFor(
 
       this.addTemplate(
         'home',
-        "{{link-to 'Home' 'home' (query-params foo=this.nullValue) id='null-link'}}{{link-to 'Home' 'home' (query-params foo=this.undefinedValue) id='undefined-link'}}"
+        "{{#link-to route='home' query=(hash foo=this.nullValue) id='null-link'}}Home{{/link-to}}{{#link-to route='home' query=(hash foo=this.undefinedValue) id='undefined-link'}}Home{{/link-to}}"
       );
 
       this.router.map(function () {
@@ -1504,7 +1504,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{link-to 'Foo' 'foo' id='foo-link'}}{{link-to 'Bar' 'bar' id='bar-no-qp-link'}}{{link-to 'Bar' 'bar' (query-params raytiley='isthebest') id='bar-link'}}{{outlet}}"
+        "{{#link-to route='foo' id='foo-link'}}Foo{{/link-to}}{{#link-to route='bar' id='bar-no-qp-link'}}Bar{{/link-to}}{{#link-to route='bar' query=(hash raytiley='isthebest') id='bar-link'}}Bar{{/link-to}}{{outlet}}"
       );
 
       this.router.map(function () {
@@ -1553,7 +1553,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{link-to 'Example' 'example' (query-params foo=undefined) id='the-link'}}"
+        "{{#link-to route='example' query=(hash foo=undefined) id='the-link'}}Example{{/link-to}}"
       );
 
       this.setSingleQPController('example', 'foo', undefined, {
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index 37f7c12c8f6..590a86de02c 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -104,7 +104,7 @@ class ModelDependentQPTestCase extends QueryParamTestCase {
 
     this.addTemplate(
       'application',
-      `{{#each articles as |a|}} {{link-to 'Article' '${articleLookup}' a.id id=a.id}} {{/each}}`
+      `{{#each articles as |a|}} {{#link-to route='${articleLookup}' model=a.id id=a.id}}Article{{/link-to}} {{/each}}`
     );
 
     await this.boot();
@@ -246,7 +246,7 @@ class ModelDependentQPTestCase extends QueryParamTestCase {
 
     this.addTemplate(
       'about',
-      `{{link-to 'A' '${commentsLookup}' 'a-1' id='one'}} {{link-to 'B' '${commentsLookup}' 'a-2' id='two'}}`
+      `{{#link-to route='${commentsLookup}' model='a-1' id='one'}}A{{/link-to}} {{#link-to route='${commentsLookup}' model='a-2' id='two'}}B{{/link-to}}`
     );
 
     await this.visitApplication();
@@ -334,7 +334,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each this.articles as |a|}} 1{{link-to 'Article' 'article' a id=a.id}} {{/each}} {{outlet}}"
+        "{{#each this.articles as |a|}} 1{{#link-to route='article' model=a id=a.id}}Article{{/link-to}} {{/each}} {{outlet}}"
       );
     }
 
@@ -440,7 +440,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each this.articles as |a|}} {{link-to 'Article' 'site.article' a id=a.id}} {{/each}} {{outlet}}"
+        "{{#each this.articles as |a|}} {{#link-to route='site.article' model=a id=a.id}}Article{{/link-to}} {{/each}} {{outlet}}"
       );
     }
 
@@ -591,7 +591,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each this.allSitesAllArticles as |a|}} {{#link-to 'site.article' a.site_id a.article_id id=a.id}}Article [{{a.site_id}}] [{{a.article_id}}]{{/link-to}} {{/each}} {{outlet}}"
+        "{{#each this.allSitesAllArticles as |a|}} {{#link-to route='site.article' models=(array a.site_id a.article_id) id=a.id}}Article [{{a.site_id}}] [{{a.article_id}}]{{/link-to}} {{/each}} {{outlet}}"
       );
     }
 
diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index 629cb4777b5..71fb2e84a6f 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -72,8 +72,8 @@ moduleFor(
         this.addTemplate(
           'application',
           `
-        {{link-to 'Post' 'post' 1337 (query-params foo='bar') class='post-link is-1337'}}
-        {{link-to 'Post' 'post' 7331 (query-params foo='boo') class='post-link is-7331'}}
+        {{#link-to route='post' model=1337 query=(hash foo='bar') class='post-link is-1337'}}Post{{/link-to}}
+        {{#link-to route='post' model=7331 query=(hash foo='boo') class='post-link is-7331'}}Post{{/link-to}}
         {{outlet}}
       `
         );
@@ -296,7 +296,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{link-to 'Example' 'example' (query-params foo=undefined) id='the-link'}}"
+        "{{#link-to route='example' query=(hash foo=undefined) id='the-link'}}Example{{/link-to}}"
       );
 
       this.setSingleQPController('example', 'foo', undefined, {
diff --git a/packages/ember/tests/routing/query_params_test/query_params_paramless_link_to_test.js b/packages/ember/tests/routing/query_params_test/query_params_paramless_link_to_test.js
index 9ce6e77452a..b68be96ff5f 100644
--- a/packages/ember/tests/routing/query_params_test/query_params_paramless_link_to_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_params_paramless_link_to_test.js
@@ -7,7 +7,7 @@ moduleFor(
     testParamlessLinks(assert, routeName) {
       assert.expect(1);
 
-      this.addTemplate(routeName, "{{link-to 'index' 'index' id='index-link'}}");
+      this.addTemplate(routeName, `<LinkTo @route="index" id="index-link">index</LinkTo>`);
 
       this.add(
         `controller:${routeName}`,
diff --git a/packages/ember/tests/routing/query_params_test/shared_state_test.js b/packages/ember/tests/routing/query_params_test/shared_state_test.js
index c78b0e036b2..8bcc144d985 100644
--- a/packages/ember/tests/routing/query_params_test/shared_state_test.js
+++ b/packages/ember/tests/routing/query_params_test/shared_state_test.js
@@ -39,12 +39,15 @@ moduleFor(
         })
       );
 
-      this.addTemplate('application', `{{link-to 'Home' 'home' }} <div> {{outlet}} </div>`);
+      this.addTemplate(
+        'application',
+        `<LinkTo @route="home">Home</LinkTo> <div> {{outlet}} </div>`
+      );
       this.addTemplate(
         'home',
-        `{{link-to 'Dashboard' 'dashboard' }}<Input @type="checkbox" id='filters-checkbox' checked={{mut this.filters.shared}} />`
+        `<LinkTo @route='dashboard'>Dashboard</LinkTo><Input @type="checkbox" id='filters-checkbox' checked={{mut this.filters.shared}} />`
       );
-      this.addTemplate('dashboard', `{{link-to 'Home' 'home' }}`);
+      this.addTemplate('dashboard', `<LinkTo @route="home">Home</LinkTo>`);
     }
     visitApplication() {
       return this.visit('/');

From bc2a38c6051aeb0f6037853958da34b439d0c6d6 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sun, 7 Feb 2021 20:36:36 +0100
Subject: [PATCH 0353/1405] Use qunit-dom in helper and component test
 blueprints

---
 .../__root__/__testType__/__path__/__test__.js                | 4 ++--
 .../__root__/__testType__/__collection__/__name__-test.js     | 2 +-
 node-tests/fixtures/component-test/rfc232.js                  | 4 ++--
 node-tests/fixtures/helper-test/rfc232.js                     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index e7fcd4d3f08..3684ab5f6eb 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -12,7 +12,7 @@ module('<%= friendlyTestDescription %>', function(hooks) {
 
     await render(hbs`<%= selfCloseComponent(componentName) %>`);
 
-    assert.equal(this.element.textContent.trim(), '');
+    assert.dom(this.element).hasText('');
 
     // Template block usage:
     await render(hbs`
@@ -21,7 +21,7 @@ module('<%= friendlyTestDescription %>', function(hooks) {
       <%= closeComponent(componentName) %>
     `);
 
-    assert.equal(this.element.textContent.trim(), 'template block text');
+    assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 96970ee27bc..4ba1b477266 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -12,7 +12,7 @@ module('<%= friendlyTestName %>', function(hooks) {
 
     await render(hbs`{{<%= dasherizedModuleName %> inputValue}}`);
 
-    assert.equal(this.element.textContent.trim(), '1234');
+    assert.dom(this.element).hasText('1234');
   });
 });<% } else if (testType === 'unit') { %>import { <%= camelizedModuleName %> } from '<%= dasherizedModulePrefix %>/helpers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
diff --git a/node-tests/fixtures/component-test/rfc232.js b/node-tests/fixtures/component-test/rfc232.js
index cfb910ec002..1cd0d54a48c 100644
--- a/node-tests/fixtures/component-test/rfc232.js
+++ b/node-tests/fixtures/component-test/rfc232.js
@@ -12,7 +12,7 @@ module('Integration | Component | x-foo', function(hooks) {
 
     await render(hbs`<XFoo />`);
 
-    assert.equal(this.element.textContent.trim(), '');
+    assert.dom(this.element).hasText('');
 
     // Template block usage:
     await render(hbs`
@@ -21,6 +21,6 @@ module('Integration | Component | x-foo', function(hooks) {
       </XFoo>
     `);
 
-    assert.equal(this.element.textContent.trim(), 'template block text');
+    assert.dom(this.element).hasText('template block text');
   });
 });
diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/rfc232.js
index d3c10cc68a6..e1b7290a2f3 100644
--- a/node-tests/fixtures/helper-test/rfc232.js
+++ b/node-tests/fixtures/helper-test/rfc232.js
@@ -12,6 +12,6 @@ module('Integration | Helper | foo/bar-baz', function(hooks) {
 
     await render(hbs`{{foo/bar-baz inputValue}}`);
 
-    assert.equal(this.element.textContent.trim(), '1234');
+    assert.dom(this.element).hasText('1234');
   });
 });

From d58886db594226e954b8c5e4a94a5e392b72facd Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 8 Feb 2021 17:17:03 -0500
Subject: [PATCH 0354/1405] Add v3.25.0 to CHANGELOG

(cherry picked from commit fca5ef67c756b5fbcaf96c374631b878fcdd34ec)
---
 CHANGELOG.md | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ea7e7495ee..ef0809317aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,32 +1,19 @@
 # Ember Changelog
 
-### v3.25.0-beta.5 (February 02, 2021)
+### v3.25.0 (February 08, 2021)
 
+- [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).
+- [#19318](https://github.com/emberjs/ember.js/pull/19318) [FEATURE] Implement the [Named Blocks RFC](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md).
+- [#19339](https://github.com/emberjs/ember.js/pull/19339) [DEPRECATION] Deprecate importing `htmlSafe` and `isHTMLSafe` from `@ember/string` per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
+- [#19320](https://github.com/emberjs/ember.js/pull/19320) / [#19317](https://github.com/emberjs/ember.js/pull/19317) / [#19297](https://github.com/emberjs/ember.js/pull/19297) / [#19293](https://github.com/emberjs/ember.js/pull/19293) / [#19278](https://github.com/emberjs/ember.js/pull/19278) / [#19275](https://github.com/emberjs/ember.js/pull/19275) / [#19363](https://github.com/emberjs/ember.js/pull/19363) Update rendering engine to `@glimmer/*` 0.74.2 for various features and bugfixes including ensuring `{{component.name}}` works with implicit this fallback
+- [#18148](https://github.com/emberjs/ember.js/pull/18148) [BUGFIX] Fix empty `htmlSafe` string to be treated as falsy
+- [#19365](https://github.com/emberjs/ember.js/pull/19365) [BUGFIX] Remove non-existing re-export from helper-addon blueprint
 - [#19370](https://github.com/emberjs/ember.js/pull/19370) [BUGFIX] Update glimmer-vm to prevent errors for older inline precompilation
-
-### v3.25.0-beta.4 (February 01, 2021)
-
-- [#19363](https://github.com/emberjs/ember.js/pull/19363) [BUGFIX] Update VM, fix component name preprocessing
-
-### v3.25.0-beta.3 (January 25, 2021)
-
 - [#19351](https://github.com/emberjs/ember.js/pull/19351) [BUGFIX] Ensure locals do not clobber components of the same name
-
-### v3.25.0-beta.2 (January 19, 2021)
-
-- [#19339](https://github.com/emberjs/ember.js/pull/19339) [DEPRECATION] Deprecate importing `htmlSafe` and `isHTMLSafe` from `@ember/string` per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
 - [#19336](https://github.com/emberjs/ember.js/pull/19336) [BUGFIX] Ensure Component Lookup Is Well Formed
-- [#19337](https://github.com/emberjs/ember.js/pull/19337) [BUGFIX] Ensure query param only <LinkTo /> are properly scoped in engines.
 - [#19338](https://github.com/emberjs/ember.js/pull/19338) [BUGFIX] Add missing `deprecate` options (`for` + `since`)
 - [#19342](https://github.com/emberjs/ember.js/pull/19342) [BUGFIX] Fix misleading LinkTo error message
 
-### v3.25.0-beta.1 (December 28, 2020)
-
-- [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).
-- [#19318](https://github.com/emberjs/ember.js/pull/19318) [FEATURE] Implement the [Named Blocks RFC](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md).
-- [#18148](https://github.com/emberjs/ember.js/pull/18148) [BUGFIX] Fix empty `htmlSafe` string to be treated as falsy
-- [#19320](https://github.com/emberjs/ember.js/pull/19320) / [#19317](https://github.com/emberjs/ember.js/pull/19317) / [#19297](https://github.com/emberjs/ember.js/pull/19297) / [#19293](https://github.com/emberjs/ember.js/pull/19293) / [#19278](https://github.com/emberjs/ember.js/pull/19278) / [#19275](https://github.com/emberjs/ember.js/pull/19275) Update rendering engine to `@glimmer/*` 0.73.1 for various features and bugfixes including ensuring `{{component.name}}` works with implicit this fallback
-
 ### v3.24.1 (January 14, 2021)
 
 - [#19337](https://github.com/emberjs/ember.js/pull/19337) [BUGFIX] Ensure query param only `<LinkTo />` are properly scoped in engines

From 5e6b193367308ffb3ec13bde8c947149edfb5500 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 8 Feb 2021 17:55:09 -0500
Subject: [PATCH 0355/1405] Add v3.26.0-beta.1 to CHANGELOG

(cherry picked from commit 63df7b58dceecf4d79e1a8f94e4fdd590fdf7395)
---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef0809317aa..dc491a7d05b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # Ember Changelog
 
+### v3.26.0-beta.1 (February 08, 2021)
+
+- [#19255](https://github.com/emberjs/ember.js/pull/19255) [DEPRECATION] Deprecate transition methods of controller and route per [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).
+- [#19345](https://github.com/emberjs/ember.js/pull/19345) [DEPRECATION] Deprecate `<LinkTo>` positional arguments per [RFC #698](https://github.com/emberjs/rfcs/blob/master/text/0698-deprecate-link-to-positional-arguments.md).
+- [#19346](https://github.com/emberjs/ember.js/pull/19346) [DEPRECATION] Deprecate `{{#with}}` per [RFC #445](https://github.com/emberjs/rfcs/blob/master/text/0445-deprecate-with.md)
+- [#19358](https://github.com/emberjs/ember.js/pull/19358) [DEPRECATION] Deprecate implicit injections per [RFC #680](https://github.com/emberjs/rfcs/blob/master/text/0680-implicit-injection-deprecation.md)
+- [#19359](https://github.com/emberjs/ember.js/pull/19359) [DEPRECATION] Deprecates old browser support policy per [RFC #685 New Browser Support Policy](https://github.com/emberjs/rfcs/blob/master/text/0685-new-browser-support-policy.md).
+- [#19371](https://github.com/emberjs/ember.js/pull/19371) [DEPRECATION] Deprecate implicit `this` property lookup fallback per [RFC #308]https://github.com/emberjs/rfcs/blob/master/text/0308-deprecate-property-lookup-fallback.md
+- [#19372](https://github.com/emberjs/ember.js/pull/19372) [DEPRECATION] Adds deprecations for Classic edition and optional features per [RFC #704](https://github.com/emberjs/rfcs/blob/master/text/0704-deprecate-octane-optional-features.md) and [RFC #705](https://github.com/emberjs/rfcs/blob/master/text/0705-deprecate-jquery-optional-feature.md).
+- [#19373](https://github.com/emberjs/ember.js/pull/19373) [DEPRECATION] Deprecate old manager capabilities per [RFC #686](https://github.com/emberjs/rfcs/blob/master/text/0686-deprecate-old-manager-capabilities-versions.md)
+- [#19374](https://github.com/emberjs/ember.js/pull/19374) [DEPRECATION] Deprecate `hasBlock` and `hasBlockParams` per [RFC #689](https://github.com/emberjs/rfcs/blob/master/text/0689-deprecate-has-block.md).
+- [#19375](https://github.com/emberjs/ember.js/pull/19375) [DEPRECATION] Deprecate old class binding syntax and {{attrs}} per [RFC #691](https://github.com/emberjs/rfcs/blob/master/text/0691-deprecate-class-binding-and-class-name-bindings.md) and [RFC #690](https://github.com/emberjs/rfcs/blob/master/text/0690-deprecate-attrs-in-templates.md).
+- [#19381](https://github.com/emberjs/ember.js/pull/19381) [DEPRECATION] Deprecate Array Observers per [RFC #692](https://github.com/emberjs/rfcs/blob/master/text/0692-deprecate-array-observers.md).
+- [#19379](https://github.com/emberjs/ember.js/pull/19379) [CLEANUP] Refactor DataAdapter to not use observers or array observers
+- [#19378](https://github.com/emberjs/ember.js/pull/19378) [BUGFIX] Fix typo in template-only-glimmer-components feature detection
+- [#19298](https://github.com/emberjs/ember.js/pull/19298) [BUGFIX] Route serialize did not extract param off proxy
+- [#19326](https://github.com/emberjs/ember.js/pull/19326) [BUGFIX] Lazily setup the router in non-application tests for <LinkTo> component
+
 ### v3.25.0 (February 08, 2021)
 
 - [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).

From 4b082999c9d523f2a1dfb9daf7d8725da8f4297b Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 8 Feb 2021 17:57:04 -0500
Subject: [PATCH 0356/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6d69733afa8..3a605a83d6f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.25.0",
+  "version": "3.27.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 6802d0d2413104f11208adc24e9847e602418145 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Mon, 8 Feb 2021 16:33:25 -0800
Subject: [PATCH 0357/1405] add failing test

While generating link to route "dynamicWithChild.child": can't access
property "shouldSupercede", newHandlerInfo is undefined
---
 .../link-to/rendering-angle-test.js           | 76 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 230b65a5adf..abe67a01630 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -1,5 +1,11 @@
-import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'internal-test-helpers';
-
+import {
+  moduleFor,
+  ApplicationTestCase,
+  RenderingTestCase,
+  RouterNonApplicationTestCase,
+  runTask,
+} from 'internal-test-helpers';
+import { Router, Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
 import { LinkComponent } from '@ember/-internals/glimmer';
@@ -92,6 +98,40 @@ moduleFor(
         this.assertText('Hello');
       });
     }
+
+    ['@test able to pupolate innermost dynamic segment when immediate parent route is active']() {
+      this.addTemplate('application', '{{outlet}}');
+      this.addTemplate('parents', '{{outlet}}');
+      this.addTemplate(
+        'parents.parent',
+        '<LinkTo @route="parents.parent.child" @model=1>Link To Child</LinkTo>'
+      );
+      this.addTemplate(
+        'parents.parent.child',
+        '<LinkTo @route="parents.parent">Link To Parent</LinkTo>'
+      );
+      this.add(
+        'route:parents.parent',
+        class extends Route {
+          async model({ id }) {
+            return { value: id };
+          }
+        }
+      );
+      this.router.map(function () {
+        this.route('parents', function () {
+          this.route('parent', { path: '/:parent_id' }, function () {
+            this.route('children');
+            this.route('child', { path: '/child/:child_id' });
+          });
+        });
+      });
+      debugger;
+      return this.visit('/parents/1').then(() => {
+        debugger;
+        this.assertText('Link To Child');
+      });
+    }
   }
 );
 
@@ -109,3 +149,35 @@ moduleFor(
     }
   }
 );
+
+moduleFor(
+  '<LinkTo /> component (rendering tests, with router not started)',
+  class extends RouterNonApplicationTestCase {
+    constructor() {
+      super(...arguments);
+      this.resolver.add('router:main', Router.extend(this.routerOptions));
+      this.router.map(function () {
+        this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function () {
+          this.route('child');
+        });
+      });
+    }
+    get routerOptions() {
+      return {
+        location: 'none',
+      };
+    }
+    get router() {
+      return this.owner.resolveRegistration('router:main');
+    }
+
+    ['@test should be able to be inserted in DOM when router is setup but not started']() {
+      this.render(`<LinkTo @route="dynamicWithChild.child">Link</LinkTo>`);
+      debugger;
+      this.assertComponentElement(this.element.firstChild, {
+        tagName: 'a',
+        content: 'Link',
+      });
+    }
+  }
+);

From 441931a548c9b7be28d13fcd9aad4a3eea02523a Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Mon, 8 Feb 2021 21:12:13 -0800
Subject: [PATCH 0358/1405] fix: LinkTo with incomplete model failing in
 rendering tests

LinkTo needs route context to allow omitting model from current active
route. Without the guard, tests where LinkTo rendered in tests without
routing transition started will break. See issues/19364
---
 .../integration/components/link-to/rendering-angle-test.js  | 5 +----
 packages/@ember/-internals/routing/lib/services/routing.ts  | 6 ++++--
 packages/@ember/-internals/routing/lib/system/router.ts     | 5 +++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index abe67a01630..535d4897f0f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -126,9 +126,7 @@ moduleFor(
           });
         });
       });
-      debugger;
       return this.visit('/parents/1').then(() => {
-        debugger;
         this.assertText('Link To Child');
       });
     }
@@ -143,7 +141,7 @@ moduleFor(
 
       this.assertComponentElement(this.element.firstChild, {
         tagName: 'a',
-        attrs: { href: '#/' },
+        attrs: { href: null },
         content: 'Go to Index',
       });
     }
@@ -173,7 +171,6 @@ moduleFor(
 
     ['@test should be able to be inserted in DOM when router is setup but not started']() {
       this.render(`<LinkTo @route="dynamicWithChild.child">Link</LinkTo>`);
-      debugger;
       this.assertComponentElement(this.element.firstChild, {
         tagName: 'a',
         content: 'Link',
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index d459c07bacd..ee0a472a331 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -54,8 +54,10 @@ export default class RoutingService extends Service {
 
   generateURL(routeName: string, models: {}[], queryParams: {}) {
     let router = this.router;
-    // return early when the router microlib is not present, which is the case for {{link-to}} in integration tests
-    if (!router._routerMicrolib) {
+    // return early when the router microlib is not present, which is the case for <LinkTo/> in integration tests
+    // also return early when transition has not started, when rendering in tests without visit(),
+    // we cannot infer the route context which <LinkTo/> needs be aware of
+    if (!router._routerMicrolib || !router._initialTransitionStarted) {
       return;
     }
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index a9439cb8643..1fa016d866a 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -130,6 +130,7 @@ class EmberRouter extends EmberObject {
   rootURL!: string;
   _routerMicrolib!: Router<Route>;
   _didSetupRouter = false;
+  _initialTransitionStarted = false;
 
   currentURL: string | null = null;
   currentRouteName: string | null = null;
@@ -507,6 +508,7 @@ class EmberRouter extends EmberObject {
   }
 
   _doURLTransition(routerJsMethod: string, url: string) {
+    this._initialTransitionStarted = true;
     let transition = this._routerMicrolib[routerJsMethod](url || '/');
     didBeginTransition(transition, this);
     return transition;
@@ -621,6 +623,7 @@ class EmberRouter extends EmberObject {
    */
   reset() {
     this._didSetupRouter = false;
+    this._initialTransitionStarted = false;
     if (this._routerMicrolib) {
       this._routerMicrolib.reset();
     }
@@ -842,6 +845,8 @@ class EmberRouter extends EmberObject {
       Boolean(targetRouteName) && this._routerMicrolib.hasRoute(targetRouteName)
     );
 
+    this._initialTransitionStarted = true;
+
     let queryParams = {};
 
     this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);

From 74e1b93e809eb59ed5ad3e2b1c412d170cc1ff1d Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Tue, 9 Feb 2021 07:54:16 -0800
Subject: [PATCH 0359/1405] remove redundant comment and scenario

---
 packages/@ember/-internals/routing/lib/services/routing.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index ee0a472a331..23d850e855d 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -54,10 +54,9 @@ export default class RoutingService extends Service {
 
   generateURL(routeName: string, models: {}[], queryParams: {}) {
     let router = this.router;
-    // return early when the router microlib is not present, which is the case for <LinkTo/> in integration tests
-    // also return early when transition has not started, when rendering in tests without visit(),
+    // Return early when transition has not started, when rendering in tests without visit(),
     // we cannot infer the route context which <LinkTo/> needs be aware of
-    if (!router._routerMicrolib || !router._initialTransitionStarted) {
+    if (!router._initialTransitionStarted) {
       return;
     }
 

From 82cb1ab3ec190f6ebbc017ea03e1304fcdfd47ce Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 9 Feb 2021 10:10:11 -0800
Subject: [PATCH 0360/1405] Removes template ids

Upgrades Glimmer VM, removing template ids
---
 package.json                                  |  26 +-
 .../tests/unit/template-factory-test.js       |   3 -
 packages/internal-test-helpers/lib/compile.ts |   3 -
 tests/node/template-compiler-test.js          |   6 -
 yarn.lock                                     | 262 +++++++++---------
 5 files changed, 144 insertions(+), 156 deletions(-)

diff --git a/package.json b/package.json
index 6d69733afa8..8c278d68d6a 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.74.2",
+    "@glimmer/vm-babel-plugins": "0.75.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.74.2",
+    "@glimmer/compiler": "0.75.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.74.2",
-    "@glimmer/interfaces": "0.74.2",
-    "@glimmer/manager": "0.74.2",
-    "@glimmer/destroyable": "0.74.2",
-    "@glimmer/owner": "0.74.2",
-    "@glimmer/node": "0.74.2",
-    "@glimmer/opcode-compiler": "0.74.2",
-    "@glimmer/program": "0.74.2",
-    "@glimmer/reference": "0.74.2",
-    "@glimmer/runtime": "0.74.2",
-    "@glimmer/validator": "0.74.2",
+    "@glimmer/global-context": "0.75.0",
+    "@glimmer/interfaces": "0.75.0",
+    "@glimmer/manager": "0.75.0",
+    "@glimmer/destroyable": "0.75.0",
+    "@glimmer/owner": "0.75.0",
+    "@glimmer/node": "0.75.0",
+    "@glimmer/opcode-compiler": "0.75.0",
+    "@glimmer/program": "0.75.0",
+    "@glimmer/reference": "0.75.0",
+    "@glimmer/runtime": "0.75.0",
+    "@glimmer/validator": "0.75.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
index 00ace707813..59d3e75c0bb 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/template-factory-test.js
@@ -27,10 +27,7 @@ moduleFor(
       let Compiled = compile(templateStr, options);
 
       assert.equal(typeof Precompiled, 'function', 'precompiled is a factory');
-      assert.ok(Precompiled.__id, 'precompiled has id');
-
       assert.equal(typeof Compiled, 'function', 'compiled is a factory');
-      assert.ok(Compiled.__id, 'compiled has id');
 
       this.expectCacheChanges({}, 'no changes');
 
diff --git a/packages/internal-test-helpers/lib/compile.ts b/packages/internal-test-helpers/lib/compile.ts
index c2c55601d99..29edda0e8de 100644
--- a/packages/internal-test-helpers/lib/compile.ts
+++ b/packages/internal-test-helpers/lib/compile.ts
@@ -6,8 +6,6 @@ import { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/inter
 import { templateFactory } from '@glimmer/opcode-compiler';
 import { compileOptions, EmberPrecompileOptions } from 'ember-template-compiler';
 
-let templateId = 0;
-
 /**
   Uses HTMLBars `compile` function to process a string into a compiled template.
 
@@ -28,7 +26,6 @@ export default function compile(
   let reifiedScopeValues = usedLocals.map((key) => scopeValues[key]);
 
   let templateBlock: SerializedTemplateWithLazyBlock = {
-    id: String(templateId++),
     block: JSON.stringify(block),
     moduleName: options.moduleName ?? options.meta?.moduleName ?? '(unknown template module)',
     scope: reifiedScopeValues.length > 0 ? () => reifiedScopeValues : null,
diff --git a/tests/node/template-compiler-test.js b/tests/node/template-compiler-test.js
index df471e7be0e..dca37d6ca12 100644
--- a/tests/node/template-compiler-test.js
+++ b/tests/node/template-compiler-test.js
@@ -46,11 +46,5 @@ QUnit.module('ember-template-compiler.js', function () {
     ) {
       assert.equal(typeof templateCompiler._Ember.VERSION, 'string', '_Ember.VERSION is present');
     });
-
-    QUnit.test('can generate a template with a server side generated `id`', function (assert) {
-      let TemplateJSON = JSON.parse(templateCompiler.precompile('<div>simple text</div>'));
-
-      assert.ok(TemplateJSON.id, 'an `id` was generated');
-    });
   });
 });
diff --git a/yarn.lock b/yarn.lock
index 26b1e3ee23b..2778b55669f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.74.2.tgz#4e6297463bb5dc59c38c80e9c5d7df5146f0c26b"
-  integrity sha512-FglR7LsDDfwwybqBJo6k2KyccZ0hsNU1HLkVH8BbO4Nw27wjG8pfULraR00ZL2hOXtj2/ACyR69MK6/7VOW5NA==
-  dependencies:
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/syntax" "0.74.2"
-    "@glimmer/util" "0.74.2"
-    "@glimmer/wire-format" "0.74.2"
+"@glimmer/compiler@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.75.0.tgz#6b4c91274221641aaaae21f3e1a60fc349a398e3"
+  integrity sha512-gWpcmLc5nE8UYgOE7NHyE5x4lUzg6Xm1aJJn7aConewtqA6LgvLTGlN3LwDL8ga2gN17oG1+NzGgS5SUpliZLA==
+  dependencies:
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/syntax" "0.75.0"
+    "@glimmer/util" "0.75.0"
+    "@glimmer/wire-format" "0.75.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.74.2.tgz#d6b8d564b94c71e9b33fb29fee7609702db0f30b"
-  integrity sha512-YG49D5REon65H/a8f0MM7Vh/oThyYPEjt47GV+nQtUlqFnbmY0jc8wqceLeVYcWElBqRt0Mpw9N3qyZI08Nxmw==
+"@glimmer/destroyable@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.75.0.tgz#3fd1a3b60a73e5d656d1f4dbe2000c3c7940b526"
+  integrity sha512-qQluByha2/Rls397xkDgG0XyFbVx6eWtG0R/mfvkvIK3pGShVjfHS9AqPVGDguRudU+gia0mFAfc7JKvVVAWRQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.74.2"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/util" "0.74.2"
+    "@glimmer/global-context" "0.75.0"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/util" "0.75.0"
 
-"@glimmer/encoder@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.74.2.tgz#5a4b13478f5e8f06a836ffa82aa9ab30940668ed"
-  integrity sha512-frkmdTyKi7whdNTHCGGV+eXPVbaHwAnmOuWUOWGoMf5/I7xCoy5oLeYAJQ31LgoVx9Mh6rYI9ftx2f6pnN6hSg==
+"@glimmer/encoder@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.75.0.tgz#065bd2a1fc77f31eb6d8c7a244f79002c0f97378"
+  integrity sha512-u3/olw85aczhuho00ZoXdJwEdGcx0R/GXWnd3CerVXYRxfPBmZJQ7NUEk+IDStzG9hTqlnrmNfRHBrhZfEvoYA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/vm" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/vm" "0.75.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.74.2.tgz#8005d63c47ead669f9246f516a0d68ce6e52896c"
-  integrity sha512-ecD254DqF3HWrML1YAU0WThrGfjFvJ17JFSb486zEMQk4DPFWhjEr5DaFSB/YEw6Vz7NtnC31VS0guW3ct/r7A==
+"@glimmer/global-context@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.75.0.tgz#04367c4c05b66f69f77323463ed2ed38ec888031"
+  integrity sha512-uPGWl7ThQTWF+tn2jocSPCQcLWiSlQRVwVWq8zq3D1J6hVgK/QtWiCPZGNzHPb6F4UzDrNGgzSBMuNK9DyTuSw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.74.2.tgz#0a6571b67153d6c31b248ab8ddf59b4f16a4fec5"
-  integrity sha512-iemaya221twVsOEUD7McNWjHRQ7hij7rosgQI6hHQQyi8/R50f8ZevXo3MVWhni6Gkb9HKReP4Fkru7TpBjySw==
+"@glimmer/interfaces@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.75.0.tgz#ae8559a2ab906d7ab131741398c27f0c6dd1b0f7"
+  integrity sha512-vyIXi/e2yf3C0AfYMJQXdqwmnGOH7GxDRZ2c70UNYHoSCUtjvgyGWKc6rAXzmhRVG1YFyDzoc2wYxGYdx+MMmA==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.74.2.tgz#b04378567eeec2c73a0e3d1947f86a9f0f80f59f"
-  integrity sha512-dzHA/6DB4LSI6SWaHNkDJiJvEErbMAKNQO8ErfkjF39fLIn0n6t3bXsTtwai3urkrvgZp1pJg/RpYJtUx0QTMg==
+"@glimmer/low-level@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.75.0.tgz#87f0210293e4a6ff5101e554ac7580991a6db792"
+  integrity sha512-I1T+Wj6NBLnFPFxPurzw2f/V8DymWWBwTlGgbMvDpAEIkUnSK7I3Lvxjly0qARD7YH3Jzdso1hkv5Sxbt/WseA==
 
-"@glimmer/manager@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.74.2.tgz#e1cfe7e3cd88ee37fc4202d154ce9cfe3a135d0b"
-  integrity sha512-2RHzMuL4zeX8byINugYs/N6Iv6xp1ZahfkxVoTYvxwJL9jKNV3dRKXTPbG90WlfHvx3K+AuvVD4RiicAODt4vQ==
+"@glimmer/manager@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.75.0.tgz#7f0375f6f08d6afab2a89c53eb0a089e728c6ca8"
+  integrity sha512-AUf4jvFAO7Uz+KUbBZgkrlV3BU+1SxTkk336URkX2HSsiEBaC8bl9iBaPpMhJ0pqo7QSxuFobZJ0R5q+WPCXOw==
   dependencies:
-    "@glimmer/destroyable" "0.74.2"
+    "@glimmer/destroyable" "0.75.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/reference" "0.74.2"
-    "@glimmer/util" "0.74.2"
-    "@glimmer/validator" "0.74.2"
-
-"@glimmer/node@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.74.2.tgz#5b13306ef8715c6ecf02eeeecd9c105ccbe0ee13"
-  integrity sha512-ypNHY6IdngYUr2WfE1OwYCOqlYoQcOmBvGlf9QydT3uaO1GLxw5KoZTPYTE7cejkj+IVM0t8eY6wk+LSwh4Vrw==
-  dependencies:
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/runtime" "0.74.2"
-    "@glimmer/util" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/reference" "0.75.0"
+    "@glimmer/util" "0.75.0"
+    "@glimmer/validator" "0.75.0"
+
+"@glimmer/node@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.75.0.tgz#5d7decbe6744bdc4e4d0d61ec019f56e9e2ac8d7"
+  integrity sha512-Ig3xppLvpq6UmbwOPNJY3eXIz1mIoJriBtJpFlBonEdHtRrYmB1D7XoOBulOWLR+iqD2dx9Q5bjW/xeRusMgQw==
+  dependencies:
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/runtime" "0.75.0"
+    "@glimmer/util" "0.75.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.74.2.tgz#3038c57b9a879c53a89bb3ba3fb69d71bee61cd3"
-  integrity sha512-bTqKGvebEHeqPpKhhzoSVQu7sLpZ9t5AnZKat/xtYWAFrIzT1RNUpy6GFtZbwjKcFc96Z2UkW9WVRi11gC1jIg==
+"@glimmer/opcode-compiler@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.75.0.tgz#f751d05190257f36bb9912e7f41589906bb76dd2"
+  integrity sha512-6DoMdzSBNv6An+d43+ApUxHjJZAZIHQNE74T0eysPULStZXLyNhOLHZXy4lnLT8VQyqcfWMaTIK3NVc3AGApSQ==
   dependencies:
-    "@glimmer/encoder" "0.74.2"
+    "@glimmer/encoder" "0.75.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/reference" "0.74.2"
-    "@glimmer/util" "0.74.2"
-    "@glimmer/vm" "0.74.2"
-    "@glimmer/wire-format" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/reference" "0.75.0"
+    "@glimmer/util" "0.75.0"
+    "@glimmer/vm" "0.75.0"
+    "@glimmer/wire-format" "0.75.0"
 
-"@glimmer/owner@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.74.2.tgz#5bc41db61c9cded179403c4b8f81cd82ebecab10"
-  integrity sha512-51PVprX7XnkNZBIuc45xkZf+kw24V0Z9vXsKwc9F/lQzldkmDTnF3djJsj0JRpPX4VOaqVY/URVV6/Jp8Q3Tkw==
+"@glimmer/owner@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.75.0.tgz#ced2b5df2ba4b0c2578f2c4b17118e06c572a368"
+  integrity sha512-E9wbOMCMErFi3bTWf4TbHm75yo1xe3aBCGRCetb23C1RWG8SVVQqCVwur0pj3vhcsBdvCFJPzDXBxj95/OmyHw==
   dependencies:
-    "@glimmer/util" "0.74.2"
+    "@glimmer/util" "0.75.0"
 
-"@glimmer/program@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.74.2.tgz#bdc5d9239e771011a0dda408002cffc8f098eb68"
-  integrity sha512-1ZuOt/typ9Dhw5iM1YdJPikT13lUZhmZNaSnAbbbyBFtRijPksOHN1JX1qIFzxLqaIz20AvrOtdeCZ9NoLRZfA==
+"@glimmer/program@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.75.0.tgz#8a6f73ba6a00447b5911ff86b444f3fbf043b20f"
+  integrity sha512-o7B1lXVmPlqB1louIdHovud6tgH9crzdvcNeNKE/w7382oKukTE4tdVRtOh17MKTjX26LS5xQZlryG9ZglCcbQ==
   dependencies:
-    "@glimmer/encoder" "0.74.2"
+    "@glimmer/encoder" "0.75.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/manager" "0.74.2"
-    "@glimmer/opcode-compiler" "0.74.2"
-    "@glimmer/util" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/manager" "0.75.0"
+    "@glimmer/opcode-compiler" "0.75.0"
+    "@glimmer/util" "0.75.0"
 
-"@glimmer/reference@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.74.2.tgz#368520445b931769bf3624591b18a2680d36aacd"
-  integrity sha512-NVuI4k55SVSOcRkhM4qKPMNFaVmPnC7pIew0MufFZuPjsvCQm68ovtsJJkHo84BgtY4foy+9Q33cBhQz1BKK0Q==
+"@glimmer/reference@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.75.0.tgz#f8feb086a34399d224fc1c4ddcfc16061b9d13c6"
+  integrity sha512-stYpNfRxHGlzbVbxp9qN1n0GbxIKgCraYDb13E7bI430FmX0zjwtiL5wuDJo/WPAIa6g6VORqJ5tDRV9j584tw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.74.2"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/util" "0.74.2"
-    "@glimmer/validator" "0.74.2"
+    "@glimmer/global-context" "0.75.0"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/util" "0.75.0"
+    "@glimmer/validator" "0.75.0"
 
-"@glimmer/runtime@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.74.2.tgz#a4a6007532e988ba4b4f3180b3b5e21b8f88577e"
-  integrity sha512-xtUEtpU+44JHENaTX8PopFTRj+1aavwhVBrV22Iu+uHzFsid9gX2jckbr2OspPoMDmkqBx3tP4Q0xdkfxThhbg==
+"@glimmer/runtime@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.75.0.tgz#d81c0c26e62a4bb7fc7beea698c2d0876cc9f368"
+  integrity sha512-hCEOB1g+sNU63jUW0H/TpKqm6suUwvXAcFPdO4t/tnF/c7LzQZ2HphhZXfCfIVuoPi5XJSHM/g8eX6VRjdrKNA==
   dependencies:
-    "@glimmer/destroyable" "0.74.2"
+    "@glimmer/destroyable" "0.75.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.74.2"
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/low-level" "0.74.2"
-    "@glimmer/owner" "0.74.2"
-    "@glimmer/program" "0.74.2"
-    "@glimmer/reference" "0.74.2"
-    "@glimmer/util" "0.74.2"
-    "@glimmer/validator" "0.74.2"
-    "@glimmer/vm" "0.74.2"
-    "@glimmer/wire-format" "0.74.2"
+    "@glimmer/global-context" "0.75.0"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/low-level" "0.75.0"
+    "@glimmer/owner" "0.75.0"
+    "@glimmer/program" "0.75.0"
+    "@glimmer/reference" "0.75.0"
+    "@glimmer/util" "0.75.0"
+    "@glimmer/validator" "0.75.0"
+    "@glimmer/vm" "0.75.0"
+    "@glimmer/wire-format" "0.75.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.74.2.tgz#84efc2555356118a4a275bb8310e261afcf9b048"
-  integrity sha512-G+E2eL0xeo81zBMSkrfobejL/V4YjlAv6Uu8qubwYu/QIHj/UiyxHEMZzN1H88rWcu8iPLzTC4GzFr9Chiu2Jw==
+"@glimmer/syntax@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.75.0.tgz#eeefe5f27ba56aebce2ee09bd91de847a610dd8f"
+  integrity sha512-v+sK7lv8eAoTJmFM8MjRsUG7/8NxhrtN8F0PTUZKIpgfBBWQ5JxtWOypbFNJR3cAo8gggRduEOoELCc7b9e4/g==
   dependencies:
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/util" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/util" "0.75.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.74.2.tgz#11781773f17e7dfbc15b9e28966563557dd8630e"
-  integrity sha512-miWIwAPJ3i3/7qq4ycI/yJw3mKeN4woUn1ev3/ESTMmELKUNBeIXAnVjlANDTseoTCetgHVw6PFqy/WS6qdtVw==
+"@glimmer/util@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.75.0.tgz#412956227c08e1a1e11500c7bd746947056924e5"
+  integrity sha512-dngZXP0TsGPyJ2kj40TJHcVhWpkBecH6BD93pZKUEsHuXMPxQQeyCuEQBKRPcG3PMi/iHjzOqSMXROh8kyiY/Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.74.2.tgz#e60f165345c7eb9e2ee3b4ed021d10ce6cbd262f"
-  integrity sha512-mRRjY5lcpD5IQvPGpAiuqS3EOOaC3xMYby70McH6lzH62tQffFDlqDV4uB6Z+OYVq0q+xUVvHTsLJ5ixo+BfAA==
+"@glimmer/validator@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.75.0.tgz#aee57df8a64a0701462333def6f69bc2c3937156"
+  integrity sha512-6L782LD8aS7V5zSuFliZiY2zlEIMkuyFjsCoFotpaEkU0km/ywTxciW2JthYTQW5vqRmQ9wv96JNDsN1GUhj+Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.74.2"
+    "@glimmer/global-context" "0.75.0"
 
-"@glimmer/vm-babel-plugins@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.74.2.tgz#479774d5885201538245f4cba76cabd4b0dee3a5"
-  integrity sha512-DLIKzim7Fg3o54EPgz/wsEiLOUcg24P4WJ9AAv4xsXfBmFndkEDzq1oJ3SPhB167Vp1m+GKOlfKzFm9mxX5rdA==
+"@glimmer/vm-babel-plugins@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.75.0.tgz#d4022200323f3caf27e11ad2e4af424e253e73f7"
+  integrity sha512-TONyzG4+SVHIw9zZZa0sZvNRq7IJTxVesKax+53akb8ZhRra0xht2F/JJen6fKv95qHjGHs0kj3Z7Ajgk9gOlw==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.74.2.tgz#8734b95865f97cf327ebb662c8051389ccffe708"
-  integrity sha512-h4TSHjQtP94yHMdInL5PdhKyQ6jCcWGf54wfMXaFPGw3iPoN/yc9hbUpk4TuVyqxOUL44xcYm0k6bxKBMxGWSg==
+"@glimmer/vm@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.75.0.tgz#5041b658bd42c6624304258b23c246a1b996808e"
+  integrity sha512-cCxMdi1qsX6zS+3Rb5WDdi3oz10QbHd6P7DTJKtZsy/S6v+1QWuHaFxAY+FemARi87jnLZb5/4lNDcGbjjNO7g==
   dependencies:
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/util" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/util" "0.75.0"
 
-"@glimmer/wire-format@0.74.2":
-  version "0.74.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.74.2.tgz#8d682d6ed123dc2176a3a9ee0a78577c74ab1819"
-  integrity sha512-K70PX8vb3RMElP9bRmqHzCE1xAaktOj/xGwlliEiXlRA5lJHwDQJJ5WPC4a4gUL2BsVYhLc65Og4J0zuYGDfhQ==
+"@glimmer/wire-format@0.75.0":
+  version "0.75.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.75.0.tgz#9deb087e9233cffb31686a8321063066e2bd3944"
+  integrity sha512-itfNHPrMN1pLV2KbWjjlk3YCGw9qQHQqa1uk+gU+Sr7lrwJ6/UJqLUyey40924RN9z5bqkiLnFlVaSJP6/w59w==
   dependencies:
-    "@glimmer/interfaces" "0.74.2"
-    "@glimmer/util" "0.74.2"
+    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/util" "0.75.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From be324d1f1a3fb6d33476e0b58d9fc6508a821f33 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Mon, 25 Jan 2021 16:33:36 -0500
Subject: [PATCH 0361/1405] Refactor the internal Ember loader to use the
 standard Ember CLI loader

This PR refactors the internal Ember loader so that it uses the standard
Ember CLI loader instead for modules. This means that modules will be
defined in the main namespace, and importable from there, instead of in
a hidden namespace that only Ember can use.

Notes:

- Code is still loaded and built via `treeForVendor` and included as a
  vendor file. This needs to be the case for the time being for
  bootstrapping.
- Loader code is still included for Node support. If `define` and
  `require` are not already defined, then a backup shim is used instead.
- Modules are now exposed from Ember, but `ember-cli-babel` still
  transpiles them to global references. This unblocks us from being able
  to make all modules work normally, however.
- `require` shim module is no longer defined, we reference `define` and
  `require` as globals instead (which is more accurate). In the future
  we should update this to use Embroider's conventions.
- `__loader` is still exposed on the Ember object, referencing the same
  values as before.
---
 broccoli/packages.js                          |  15 +--
 broccoli/transforms/inject-node-globals.js    |  52 --------
 ember-cli-build.js                            |  13 +-
 lib/index.js                                  |  10 +-
 packages/@ember/-internals/bootstrap/index.js |  31 +++++
 .../-internals/environment/lib/global.ts      |   2 +-
 packages/ember-template-compiler/index.ts     |  34 +++---
 .../ember-template-compiler/lib/compat.ts     |  19 ---
 .../require.d.ts => ember/index.d.ts}         |   6 +
 packages/ember/index.js                       | 111 +++++++++++++----
 .../lib/confirm-export.js                     |   3 +-
 .../lib/ember-dev/setup-qunit.ts              |   2 +
 packages/loader/lib/index.js                  | 112 ++++++++----------
 packages/node-module/index.d.ts               |   3 -
 packages/node-module/index.js                 |  16 ---
 tests/index.html                              |   9 +-
 16 files changed, 215 insertions(+), 223 deletions(-)
 delete mode 100644 broccoli/transforms/inject-node-globals.js
 create mode 100644 packages/@ember/-internals/bootstrap/index.js
 delete mode 100644 packages/ember-template-compiler/lib/compat.ts
 rename packages/{node-module/require.d.ts => ember/index.d.ts} (61%)
 delete mode 100644 packages/node-module/index.d.ts
 delete mode 100644 packages/node-module/index.js

diff --git a/broccoli/packages.js b/broccoli/packages.js
index db25d4d7712..ab8f37c035f 100644
--- a/broccoli/packages.js
+++ b/broccoli/packages.js
@@ -5,7 +5,6 @@ const path = require('path');
 const Rollup = require('broccoli-rollup');
 const Funnel = require('broccoli-funnel');
 const MergeTrees = require('broccoli-merge-trees');
-const Babel = require('broccoli-babel-transpiler');
 const typescript = require('broccoli-typescript-compiler').default;
 const BroccoliDebug = require('broccoli-debug');
 const findLib = require('./find-lib');
@@ -18,7 +17,6 @@ const StringReplace = require('broccoli-string-replace');
 const GlimmerTemplatePrecompiler = require('./glimmer-template-compiler');
 const VERSION_PLACEHOLDER = /VERSION_STRING_PLACEHOLDER/g;
 const canaryFeatures = require('./canary-features');
-const injectNodeGlobals = require('./transforms/inject-node-globals');
 
 const debugTree = BroccoliDebug.buildDebugCallback('ember-source');
 
@@ -44,7 +42,7 @@ module.exports.jquery = function _jquery() {
   });
 };
 
-module.exports.internalLoader = function _internalLoader() {
+module.exports.loader = function _loader() {
   return new Funnel('packages/loader/lib', {
     files: ['index.js'],
     getDestinationPath() {
@@ -234,6 +232,7 @@ function glimmerTrees(entries) {
   let trees = [];
   let queue = Array.isArray(entries) ? entries.slice() : [entries];
   let name;
+
   while ((name = queue.pop()) !== undefined) {
     if (seen.has(name)) {
       continue;
@@ -255,14 +254,8 @@ function glimmerTrees(entries) {
       queue.push(...dependencies);
     }
   }
-  return new Babel(new MergeTrees(trees), {
-    sourceMaps: true,
-    plugins: [
-      // ensures `@glimmer/compiler` requiring `crypto` works properly
-      // in both browser and node-land
-      injectNodeGlobals,
-    ],
-  });
+
+  return new MergeTrees(trees);
 }
 
 module.exports.glimmerCompilerES = () => {
diff --git a/broccoli/transforms/inject-node-globals.js b/broccoli/transforms/inject-node-globals.js
deleted file mode 100644
index b5bba89fc1e..00000000000
--- a/broccoli/transforms/inject-node-globals.js
+++ /dev/null
@@ -1,52 +0,0 @@
-function injectNodeGlobals({ types: t }) {
-  let requireId;
-  let importDecl;
-  let moduleId;
-  return {
-    name: 'inject require',
-    visitor: {
-      Program: {
-        enter(path, state) {
-          if (state.file.opts.filename.match(/node-module\/index.js/)) return;
-
-          requireId = path.scope.globals.require;
-          moduleId = path.scope.globals.module;
-
-          if (requireId || moduleId) {
-            let specifiers = [];
-            let source = t.stringLiteral('node-module');
-
-            if (requireId) {
-              delete path.scope.globals.require;
-              specifiers.push(t.importSpecifier(requireId, t.identifier('require')));
-            }
-
-            if (moduleId) {
-              delete path.scope.globals.module;
-              specifiers.push(t.importSpecifier(moduleId, t.identifier('module')));
-            }
-
-            importDecl = t.importDeclaration(specifiers, source);
-            path.unshiftContainer('body', importDecl);
-          }
-        },
-        exit(path) {
-          if (requireId) {
-            path.scope.rename('require');
-          }
-        },
-      },
-      ImportDeclaration(path) {
-        if (path.node === importDecl) {
-          path.scope.registerDeclaration(path);
-        }
-      },
-    },
-  };
-}
-
-injectNodeGlobals.baseDir = function () {
-  return 'babel-plugin-transform-es2015-modules-amd';
-};
-
-module.exports = injectNodeGlobals;
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 8c0254be9bc..77b3aa5c9e3 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -15,7 +15,7 @@ Error.stackTraceLimit = Infinity;
 const {
   routerES,
   jquery,
-  internalLoader,
+  loader,
   qunit,
   handlebarsES,
   rsvpES,
@@ -246,7 +246,14 @@ function templateCompilerBundle(emberPackages, transpileTree) {
 }
 
 function testHarness() {
-  return new MergeTrees([emptyTestem(), testPolyfills(), testIndexHTML(), qunit(), jquery()]);
+  return new MergeTrees([
+    emptyTestem(),
+    testPolyfills(),
+    testIndexHTML(),
+    loader(),
+    qunit(),
+    jquery(),
+  ]);
 }
 
 function emptyTestem() {
@@ -262,5 +269,5 @@ function templateCompilerDependencies() {
 }
 
 function emberHeaderFiles() {
-  return new MergeTrees([emberLicense(), internalLoader()]);
+  return new MergeTrees([emberLicense(), loader()]);
 }
diff --git a/lib/index.js b/lib/index.js
index 3af916860e7..2205c530bda 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -237,18 +237,12 @@ module.exports = {
     return new MergeTrees([
       concatBundle(emberFiles, {
         outputFile: 'ember.js',
-        footer: "require('ember');",
+        footer: "require('@ember/-internals/bootstrap');",
       }),
 
       concatBundle(emberTestingFiles, {
         outputFile: 'ember-testing.js',
-        footer: `
-          var testing = require('ember-testing');
-          Ember.Test = testing.Test;
-          Ember.Test.Adapter = testing.Adapter;
-          Ember.Test.QUnitAdapter = testing.QUnitAdapter;
-          Ember.setupForTesting = testing.setupForTesting;
-        `,
+        footer: "require('ember-testing');",
       }),
     ]);
   },
diff --git a/packages/@ember/-internals/bootstrap/index.js b/packages/@ember/-internals/bootstrap/index.js
new file mode 100644
index 00000000000..d74aee1c358
--- /dev/null
+++ b/packages/@ember/-internals/bootstrap/index.js
@@ -0,0 +1,31 @@
+import require from 'require';
+import { context } from '@ember/-internals/environment';
+
+(function () {
+  let Ember;
+
+  function defineEmber(key) {
+    Object.defineProperty(context.exports, key, {
+      enumerable: true,
+      configurable: true,
+      get() {
+        if (!Ember) {
+          Ember = require('ember').default;
+        }
+
+        return Ember;
+      },
+    });
+  }
+
+  // Bootstrap the global
+  defineEmber('Ember');
+  defineEmber('Em');
+
+  // Bootstrap Node module
+  // eslint-disable-next-line no-undef
+  if (typeof module === 'object' && typeof module.require === 'function') {
+    // eslint-disable-next-line no-undef
+    module.exports = Ember = require('ember').default;
+  }
+})();
diff --git a/packages/@ember/-internals/environment/lib/global.ts b/packages/@ember/-internals/environment/lib/global.ts
index ceaff0c112c..99cbbd76dc0 100644
--- a/packages/@ember/-internals/environment/lib/global.ts
+++ b/packages/@ember/-internals/environment/lib/global.ts
@@ -1,4 +1,4 @@
-/* globals global, window, self, mainContext */
+/* globals global, window, self */
 declare const mainContext: object | undefined;
 
 // from lodash to catch fake globals
diff --git a/packages/ember-template-compiler/index.ts b/packages/ember-template-compiler/index.ts
index 3cdea8978d9..007f45f27fe 100644
--- a/packages/ember-template-compiler/index.ts
+++ b/packages/ember-template-compiler/index.ts
@@ -1,24 +1,28 @@
-import { context, ENV } from '@ember/-internals/environment';
+import { ENV } from '@ember/-internals/environment';
 import { FEATURES } from '@ember/canary-features';
 import VERSION from 'ember/version';
+import require from 'require';
 
-export const _Ember =
-  (typeof (context.imports as any).Ember === 'object' && (context.imports as any).Ember) || {};
+declare global {
+  interface NodeRequire {
+    has(name: string): boolean;
+  }
 
-// private API used by ember-cli-htmlbars to setup ENV and FEATURES
-if (!_Ember.ENV) {
-  _Ember.ENV = ENV;
-}
-if (!_Ember.FEATURES) {
-  _Ember.FEATURES = FEATURES;
-}
-if (!_Ember.VERSION) {
-  _Ember.VERSION = VERSION;
+  function define(path: string, deps: string[], module: () => void): void;
 }
 
-// used for adding Ember.Handlebars.compile for backwards compat
-import setupGlobal from './lib/compat';
-setupGlobal(_Ember);
+export let _Ember: unknown;
+
+try {
+  // tslint:disable-next-line: no-require-imports
+  _Ember = require('ember');
+} catch (e) {
+  _Ember = {
+    ENV,
+    FEATURES,
+    VERSION,
+  };
+}
 
 export { default as precompile } from './lib/system/precompile';
 export { default as compile } from './lib/system/compile';
diff --git a/packages/ember-template-compiler/lib/compat.ts b/packages/ember-template-compiler/lib/compat.ts
deleted file mode 100644
index bee025ac1cc..00000000000
--- a/packages/ember-template-compiler/lib/compat.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import compile from './system/compile';
-import { registerPlugin } from './system/compile-options';
-import precompile from './system/precompile';
-
-export default function setupGlobal(Ember: any) {
-  let EmberHandlebars = Ember.Handlebars;
-  if (!EmberHandlebars) {
-    Ember.Handlebars = EmberHandlebars = {};
-  }
-
-  let EmberHTMLBars = Ember.HTMLBars;
-  if (!EmberHTMLBars) {
-    Ember.HTMLBars = EmberHTMLBars = {};
-  }
-
-  EmberHTMLBars.precompile = EmberHandlebars.precompile = precompile;
-  EmberHTMLBars.compile = EmberHandlebars.compile = compile;
-  EmberHTMLBars.registerPlugin = registerPlugin;
-}
diff --git a/packages/node-module/require.d.ts b/packages/ember/index.d.ts
similarity index 61%
rename from packages/node-module/require.d.ts
rename to packages/ember/index.d.ts
index 58443c7f54c..46c2fa636e0 100644
--- a/packages/node-module/require.d.ts
+++ b/packages/ember/index.d.ts
@@ -1,3 +1,9 @@
+declare module 'ember' {
+  declare const Ember: any;
+
+  export default Ember;
+}
+
 declare module 'require' {
   export function has(path: string): boolean;
   export default function require(path: string): any;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 4c7ff4c1262..d31aeb1bca1 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -1,7 +1,6 @@
 import require, { has } from 'require';
 
-import { getENV, getLookup, setLookup, ENV, context } from '@ember/-internals/environment';
-import { IS_NODE, module } from 'node-module';
+import { getENV, getLookup, setLookup, ENV } from '@ember/-internals/environment';
 import * as utils from '@ember/-internals/utils';
 import { Registry, Container } from '@ember/-internals/container';
 import * as instrumentation from '@ember/instrumentation';
@@ -168,7 +167,7 @@ import {
 
 // ****@ember/-internals/environment****
 
-const Ember = (typeof context.imports.Ember === 'object' && context.imports.Ember) || {};
+const Ember = {};
 
 import { isIE } from '@ember/-internals/browser-environment';
 
@@ -652,15 +651,6 @@ if (EMBER_GLIMMER_INVOKE_HELPER) {
   Ember._invokeHelper = invokeHelper;
 }
 Ember._captureRenderTree = captureRenderTree;
-Ember.Handlebars = {
-  template,
-  Utils: {
-    escapeExpression,
-  },
-};
-Ember.HTMLBars = {
-  template,
-};
 
 if (ENV.EXTEND_PROTOTYPES.String) {
   String.prototype.htmlSafe = function () {
@@ -782,30 +772,99 @@ runLoadHooks('Ember.Application', Application);
 Ember.DataAdapter = extensionSupport.DataAdapter;
 Ember.ContainerDebugAdapter = extensionSupport.ContainerDebugAdapter;
 
-if (has('ember-template-compiler')) {
-  require('ember-template-compiler');
+let EmberHandlebars = {
+  template,
+  Utils: {
+    escapeExpression,
+  },
+};
+
+let EmberHTMLBars = {
+  template,
+};
+
+function defineEmberTemplateCompilerLazyLoad(key) {
+  Object.defineProperty(Ember, key, {
+    configurable: true,
+    enumerable: true,
+    get() {
+      if (require.has('ember-template-compiler')) {
+        let templateCompiler = require('ember-template-compiler');
+
+        EmberHTMLBars.precompile = EmberHandlebars.precompile = templateCompiler.precompile;
+        EmberHTMLBars.compile = EmberHandlebars.compile = templateCompiler.compile;
+        EmberHTMLBars.registerPlugin = templateCompiler.registerPlugin;
+
+        Object.defineProperty(Ember, 'HTMLBars', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: EmberHTMLBars,
+        });
+        Object.defineProperty(Ember, 'Handlebars', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: EmberHandlebars,
+        });
+      }
+
+      return key === 'Handlebars' ? EmberHandlebars : EmberHTMLBars;
+    },
+  });
 }
 
+defineEmberTemplateCompilerLazyLoad('HTMLBars');
+defineEmberTemplateCompilerLazyLoad('Handlebars');
+
 // do this to ensure that Ember.Test is defined properly on the global
 // if it is present.
-if (has('ember-testing')) {
-  let testing = require('ember-testing');
+function defineEmberTestingLazyLoad(key) {
+  Object.defineProperty(Ember, key, {
+    configurable: true,
+    enumerable: true,
+    get() {
+      if (has('ember-testing')) {
+        let testing = require('ember-testing');
+
+        let { Test, Adapter, QUnitAdapter, setupForTesting } = testing;
+        Test.Adapter = Adapter;
+        Test.QUnitAdapter = QUnitAdapter;
+
+        Object.defineProperty(Ember, 'Test', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: Test,
+        });
+        Object.defineProperty(Ember, 'setupForTesting', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: setupForTesting,
+        });
+
+        return key === 'Test' ? Test : setupForTesting;
+      }
 
-  Ember.Test = testing.Test;
-  Ember.Test.Adapter = testing.Adapter;
-  Ember.Test.QUnitAdapter = testing.QUnitAdapter;
-  Ember.setupForTesting = testing.setupForTesting;
+      return undefined;
+    },
+  });
 }
 
+defineEmberTestingLazyLoad('Test');
+defineEmberTestingLazyLoad('setupForTesting');
+
 runLoadHooks('Ember');
 
-export default Ember;
+Ember.__loader = {
+  require,
+  // eslint-disable-next-line no-undef
+  define,
+  registry: require._eak_seen,
+};
 
-if (IS_NODE) {
-  module.exports = Ember;
-} else {
-  context.exports.Ember = context.exports.Em = Ember;
-}
+export default Ember;
 
 /**
  @module jquery
diff --git a/packages/internal-test-helpers/lib/confirm-export.js b/packages/internal-test-helpers/lib/confirm-export.js
index 2f0be668fd4..7e5eb68e2cb 100644
--- a/packages/internal-test-helpers/lib/confirm-export.js
+++ b/packages/internal-test-helpers/lib/confirm-export.js
@@ -21,7 +21,8 @@ export default function confirmExport(Ember, assert, path, moduleId, exportName)
 
     if (typeof exportName === 'string') {
       let mod = require(moduleId);
-      assert.equal(desc.value, mod[exportName], `Ember.${path} is exported correctly`);
+      let value = 'value' in desc ? desc.value : desc.get.call(Ember);
+      assert.equal(value, mod[exportName], `Ember.${path} is exported correctly`);
       assert.notEqual(mod[exportName], undefined, `Ember.${path} is not \`undefined\``);
     } else if ('value' in desc) {
       assert.equal(desc.value, exportName.value, `Ember.${path} is exported correctly`);
diff --git a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
index bcc6c785ab7..5142e42d09d 100644
--- a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
@@ -1,3 +1,5 @@
+import Ember from 'ember';
+
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
diff --git a/packages/loader/lib/index.js b/packages/loader/lib/index.js
index dcb6c7c4594..3c125722870 100644
--- a/packages/loader/lib/index.js
+++ b/packages/loader/lib/index.js
@@ -1,12 +1,32 @@
-/*globals process */
-let define, require, Ember;
-
-// Used in @ember/-internals/environment/lib/global.js
-mainContext = this; // eslint-disable-line no-undef
+/* eslint-disable no-var */
+/* globals global globalThis self */
+var define, require;
 
 (function () {
-  let registry;
-  let seen;
+  var globalObj =
+    typeof globalThis !== 'undefined'
+      ? globalThis
+      : typeof self !== 'undefined'
+      ? self
+      : typeof window !== 'undefined'
+      ? window
+      : typeof global !== 'undefined'
+      ? global
+      : null;
+
+  if (globalObj === null) {
+    throw new Error('unable to locate global object');
+  }
+
+  if (typeof globalObj.define === 'function' && typeof globalObj.require === 'function') {
+    define = globalObj.define;
+    require = globalObj.require;
+
+    return;
+  }
+
+  var registry = Object.create(null);
+  var seen = Object.create(null);
 
   function missingModule(name, referrerName) {
     if (referrerName) {
@@ -17,15 +37,15 @@ mainContext = this; // eslint-disable-line no-undef
   }
 
   function internalRequire(_name, referrerName) {
-    let name = _name;
-    let mod = registry[name];
+    var name = _name;
+    var mod = registry[name];
 
     if (!mod) {
       name = name + '/index';
       mod = registry[name];
     }
 
-    let exports = seen[name];
+    var exports = seen[name];
 
     if (exports !== undefined) {
       return exports;
@@ -37,17 +57,17 @@ mainContext = this; // eslint-disable-line no-undef
       missingModule(_name, referrerName);
     }
 
-    let deps = mod.deps;
-    let callback = mod.callback;
-    let reified = new Array(deps.length);
+    var deps = mod.deps;
+    var callback = mod.callback;
+    var reified = new Array(deps.length);
 
-    for (let i = 0; i < deps.length; i++) {
+    for (var i = 0; i < deps.length; i++) {
       if (deps[i] === 'exports') {
         reified[i] = exports;
       } else if (deps[i] === 'require') {
         reified[i] = require;
       } else {
-        reified[i] = internalRequire(deps[i], name);
+        reified[i] = require(deps[i], name);
       }
     }
 
@@ -56,57 +76,21 @@ mainContext = this; // eslint-disable-line no-undef
     return exports;
   }
 
-  let isNode =
-    typeof window === 'undefined' &&
-    typeof process !== 'undefined' &&
-    {}.toString.call(process) === '[object process]';
-
-  if (!isNode) {
-    Ember = this.Ember = this.Ember || {};
-  }
-
-  if (typeof Ember === 'undefined') {
-    Ember = {};
-  }
-
-  if (typeof Ember.__loader === 'undefined') {
-    registry = Object.create(null);
-    seen = Object.create(null);
-
-    define = function (name, deps, callback) {
-      let value = {};
+  require = function (name) {
+    return internalRequire(name, null);
+  };
 
-      if (!callback) {
-        value.deps = [];
-        value.callback = deps;
-      } else {
-        value.deps = deps;
-        value.callback = callback;
-      }
+  // eslint-disable-next-line no-unused-vars
+  define = function (name, deps, callback) {
+    registry[name] = { deps: deps, callback: callback };
+  };
 
-      registry[name] = value;
-    };
+  // setup `require` module
+  require['default'] = require;
 
-    require = function (name) {
-      return internalRequire(name, null);
-    };
+  require.has = function registryHas(moduleName) {
+    return Boolean(registry[moduleName]) || Boolean(registry[moduleName + '/index']);
+  };
 
-    // setup `require` module
-    require['default'] = require;
-
-    require.has = function registryHas(moduleName) {
-      return Boolean(registry[moduleName]) || Boolean(registry[moduleName + '/index']);
-    };
-
-    require._eak_seen = registry;
-
-    Ember.__loader = {
-      define: define,
-      require: require,
-      registry: registry,
-    };
-  } else {
-    define = Ember.__loader.define;
-    require = Ember.__loader.require;
-  }
+  require._eak_seen = registry;
 })();
diff --git a/packages/node-module/index.d.ts b/packages/node-module/index.d.ts
deleted file mode 100644
index 249e58d812f..00000000000
--- a/packages/node-module/index.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const IS_NODE: boolean;
-
-export function require(url: string): string;
diff --git a/packages/node-module/index.js b/packages/node-module/index.js
deleted file mode 100644
index cad5138a421..00000000000
--- a/packages/node-module/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*global module */
-
-const IS_NODE = typeof module === 'object' && typeof module.require === 'function';
-
-let exportModule;
-let exportRequire;
-
-if (IS_NODE) {
-  exportModule = module;
-  exportRequire = module.require;
-} else {
-  exportModule = null;
-  exportRequire = null;
-}
-
-export { IS_NODE, exportModule as module, exportRequire as require };
diff --git a/tests/index.html b/tests/index.html
index 57bf6b6b84d..9046533ef85 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -10,6 +10,7 @@
       }
     </style>
     <script src="./polyfill.js"></script>
+    <script src="./loader.js"></script>
     <script src="./qunit/qunit.js"></script>
     <script src="/testem.js"></script>
 
@@ -90,7 +91,7 @@
     </script>
 
     <script type="text/javascript">
-      var setTesting = Ember.__loader.require('@ember/debug')['setTesting'];
+      var setTesting = require('@ember/debug')['setTesting'];
       setTesting(true);
     </script>
 
@@ -114,7 +115,7 @@
           }
         }
 
-        var setupQUnit = window.Ember.__loader.require('internal-test-helpers/lib/ember-dev/setup-qunit')['default'];
+        var setupQUnit = require('internal-test-helpers/lib/ember-dev/setup-qunit')['default'];
         setupQUnit();
 
         // Tests should time out after 15 seconds
@@ -180,11 +181,11 @@
       skipPackages = (skipPackages && skipPackages.split(',')) || [];
       var skipPackageRegexp   = new RegExp('^('+skipPackages.join('|')+')/');
 
-      for (var moduleName in Ember.__loader.registry) {
+      for (var moduleName in require._eak_seen) {
         if (!moduleName.match(packageRegexp))   { continue; }
         if (moduleName.match(skipPackageRegexp)) { continue; }
 
-        if (moduleName.match(/[_-]test$/)) { Ember.__loader.require(moduleName); }
+        if (moduleName.match(/[_-]test$/)) { require(moduleName); }
       }
     </script>
 

From b71943e223ed340c97507af2099601eaa45b053f Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Sat, 23 Nov 2019 09:05:12 -0800
Subject: [PATCH 0362/1405] [BUGFIX] Adds extra test for new rerender assertion

---
 .../components/curly-components-test.js       | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 23455c1bd75..032cfa50f03 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -2731,6 +2731,39 @@ moduleFor(
       }, expectedBacktrackingMessage);
     }
 
+    ["@test when a shared dependency is changed during children's rendering (tracked)"]() {
+      class Wrapper {
+        @tracked content = null;
+      }
+
+      this.registerComponent('x-outer', {
+        ComponentClass: Component.extend({
+          value: 1,
+          wrapper: new Wrapper(),
+        }),
+        template:
+          '<div id="outer-value">{{this.wrapper.content}}</div> {{x-inner value=this.value wrapper=this.wrapper}}',
+      });
+
+      this.registerComponent('x-inner', {
+        ComponentClass: Component.extend({
+          didReceiveAttrs() {
+            this.get('wrapper').content = this.get('value');
+          },
+          value: null,
+        }),
+        template: '<div id="inner-value">{{this.wrapper.content}}</div>',
+      });
+
+      let expectedBacktrackingMessage = backtrackingMessageFor('content', 'Wrapper', {
+        renderTree: ['x-outer', 'this.wrapper.content'],
+      });
+
+      expectAssertion(() => {
+        this.render('{{x-outer}}');
+      }, expectedBacktrackingMessage);
+    }
+
     ['@test non-block with each rendering child components']() {
       this.registerComponent('non-block', {
         template: strip`

From f8eb312923ae25333eaef327e1848ae270ac5276 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 10 Feb 2021 14:11:51 -0800
Subject: [PATCH 0363/1405] update to use require.entries

---
 packages/ember/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index d31aeb1bca1..74a8f145b3b 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -861,7 +861,7 @@ Ember.__loader = {
   require,
   // eslint-disable-next-line no-undef
   define,
-  registry: require._eak_seen,
+  registry: require.entries,
 };
 
 export default Ember;

From 9dbcb7d182d9b78c2569aa96cdef25ab73862205 Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Wed, 10 Feb 2021 14:35:12 -0800
Subject: [PATCH 0364/1405] fix: only return empty href when LinkTo href
 generation throws error

In 3.24.0-3.24.2 we made changes to let LinkTo href generation returns
empty when initial transition is not started. This is not true and
causing regression on the super-rental tutorial.

In previous tutorials, the LinkTo component will return empty href when
`this.owner.setupRouter()` is not called. It generates valid href if
`setupRouter()` is called and complete model are passed for dynamic
segments.

In our previous changes, we removed the requirement to call
`setupRouter`, and always return empty href when initial transition is
not started. This is not expected when passing complete dynamic segments
without initial transition.
---
 .../link-to/rendering-angle-test.js           | 18 +++++++++--
 .../routing/lib/services/routing.ts           | 32 +++++++++++--------
 2 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 535d4897f0f..9e688cf1236 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -141,7 +141,7 @@ moduleFor(
 
       this.assertComponentElement(this.element.firstChild, {
         tagName: 'a',
-        attrs: { href: null },
+        attrs: { href: '#/' },
         content: 'Go to Index',
       });
     }
@@ -169,10 +169,24 @@ moduleFor(
       return this.owner.resolveRegistration('router:main');
     }
 
-    ['@test should be able to be inserted in DOM when router is setup but not started']() {
+    ['@test should be able to be inserted in DOM when initial transition not started']() {
       this.render(`<LinkTo @route="dynamicWithChild.child">Link</LinkTo>`);
       this.assertComponentElement(this.element.firstChild, {
         tagName: 'a',
+        attrs: {
+          href: null,
+        },
+        content: 'Link',
+      });
+    }
+
+    ['@test should be able to be inserted in DOM with valid href when complete models are passed even if initial transition is not started']() {
+      this.render(`<LinkTo @route="dynamicWithChild.child" @model="1">Link</LinkTo>`);
+      this.assertComponentElement(this.element.firstChild, {
+        tagName: 'a',
+        attrs: {
+          href: '/dynamic-with-child/1/child',
+        },
         content: 'Link',
       });
     }
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 23d850e855d..03c87879633 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -54,21 +54,25 @@ export default class RoutingService extends Service {
 
   generateURL(routeName: string, models: {}[], queryParams: {}) {
     let router = this.router;
-    // Return early when transition has not started, when rendering in tests without visit(),
-    // we cannot infer the route context which <LinkTo/> needs be aware of
-    if (!router._initialTransitionStarted) {
-      return;
+    try {
+      let visibleQueryParams = {};
+      if (queryParams) {
+        assign(visibleQueryParams, queryParams);
+        this.normalizeQueryParams(routeName, models, visibleQueryParams as QueryParam);
+      }
+
+      return router.generate(routeName, ...models, {
+        queryParams: visibleQueryParams,
+      });
+    } catch (e) {
+      // Swallow error when transition has not started.
+      // When rendering in tests without visit(), we cannot infer the route context which <LinkTo/> needs be aware of
+      if (!router._initialTransitionStarted) {
+        return;
+      } else {
+        throw e;
+      }
     }
-
-    let visibleQueryParams = {};
-    if (queryParams) {
-      assign(visibleQueryParams, queryParams);
-      this.normalizeQueryParams(routeName, models, visibleQueryParams as QueryParam);
-    }
-
-    return router.generate(routeName, ...models, {
-      queryParams: visibleQueryParams,
-    });
   }
 
   isActiveForRoute(

From af4a1b4cfd3e5dbc52e5df597579d9579d5fb1eb Mon Sep 17 00:00:00 2001
From: Thomas Wang <wangxgwxg@gmail.com>
Date: Wed, 10 Feb 2021 15:16:19 -0800
Subject: [PATCH 0365/1405] avoid try/catch when transition started

---
 .../routing/lib/services/routing.ts           | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 03c87879633..da2cf9ed5b8 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -52,25 +52,28 @@ export default class RoutingService extends Service {
     this.router._prepareQueryParams(routeName, models, queryParams);
   }
 
-  generateURL(routeName: string, models: {}[], queryParams: {}) {
-    let router = this.router;
-    try {
-      let visibleQueryParams = {};
-      if (queryParams) {
-        assign(visibleQueryParams, queryParams);
-        this.normalizeQueryParams(routeName, models, visibleQueryParams as QueryParam);
-      }
+  _generateURL(routeName: string, models: {}[], queryParams: {}) {
+    let visibleQueryParams = {};
+    if (queryParams) {
+      assign(visibleQueryParams, queryParams);
+      this.normalizeQueryParams(routeName, models, visibleQueryParams as QueryParam);
+    }
 
-      return router.generate(routeName, ...models, {
-        queryParams: visibleQueryParams,
-      });
-    } catch (e) {
+    return this.router.generate(routeName, ...models, {
+      queryParams: visibleQueryParams,
+    });
+  }
+
+  generateURL(routeName: string, models: {}[], queryParams: {}) {
+    if (this.router._initialTransitionStarted) {
+      return this._generateURL(routeName, models, queryParams);
+    } else {
       // Swallow error when transition has not started.
       // When rendering in tests without visit(), we cannot infer the route context which <LinkTo/> needs be aware of
-      if (!router._initialTransitionStarted) {
+      try {
+        return this._generateURL(routeName, models, queryParams);
+      } catch (_e) {
         return;
-      } else {
-        throw e;
       }
     }
   }

From 4ee3d4cc62294704dcf4c47443b3151d2b2e468c Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Thu, 11 Feb 2021 02:20:35 +0000
Subject: [PATCH 0366/1405] disable deprecation for htmlSafe and isHTMLSafe

---
 packages/ember/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index 74a8f145b3b..7831af19907 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -598,7 +598,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           `Using Ember.${name} or importing from '${path}' has been deprecated, install the ` +
             `\`ember-legacy-built-in-components\` addon and use \`import { ${name} } from ` +
             `'ember-legacy-built-in-components';\` instead`,
-          false,
+          true,
           {
             id: 'ember.legacy-built-in-components',
             until: '4.0.0',
@@ -661,7 +661,9 @@ const deprecateImportFromString = function (
   name,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
 ) {
-  deprecate(message, false, {
+  // Disabling this deprecation due to unintended errors in 3.25
+  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
+  deprecate(message, true, {
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {

From 7f70b81643dd40077f0eed93243133cb587505b8 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Thu, 11 Feb 2021 03:54:55 +0000
Subject: [PATCH 0367/1405] skip htmlSafe and isHTMLSafe exports tests

---
 packages/ember/index.js                | 2 +-
 packages/ember/tests/reexports_test.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index 7831af19907..a6f0f03f856 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -598,7 +598,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           `Using Ember.${name} or importing from '${path}' has been deprecated, install the ` +
             `\`ember-legacy-built-in-components\` addon and use \`import { ${name} } from ` +
             `'ember-legacy-built-in-components';\` instead`,
-          true,
+          false,
           {
             id: 'ember.legacy-built-in-components',
             until: '4.0.0',
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 6c6562769b2..1f83024f2b8 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -68,7 +68,7 @@ moduleFor(
       });
     }
 
-    ['@test Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
+    ['@skip Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
       let glimmer = require('@ember/-internals/glimmer');
       expectDeprecation(() => {
         assert.equal(
@@ -80,7 +80,7 @@ moduleFor(
       assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
     }
 
-    ['@test Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
+    ['@skip Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
       let glimmer = require('@ember/-internals/glimmer');
       expectDeprecation(() => {
         assert.equal(

From e3d2c67dc60b46edb7e9242e030c93de75ac5979 Mon Sep 17 00:00:00 2001
From: Chris Manson <chris@manson.ie>
Date: Thu, 11 Feb 2021 12:00:11 +0000
Subject: [PATCH 0368/1405] force building Ember bundles when targets.node is
 defined

---
 lib/index.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index 2205c530bda..5bdcaeac716 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -270,6 +270,7 @@ module.exports = {
 
     let ember;
     let targets = (this.project && this.project.targets && this.project.targets.browsers) || [];
+    let targetNode = (this.project && this.project.targets && this.project.targets.node) || false;
 
     if (targets.includes('ie 11')) {
       this.ui.writeWarnLine(
@@ -282,7 +283,9 @@ module.exports = {
     if (
       !isProduction &&
       PRE_BUILT_TARGETS.every((target) => targets.includes(target)) &&
-      targets.length === PRE_BUILT_TARGETS.length
+      targets.length === PRE_BUILT_TARGETS.length &&
+      // if node is defined in targets we can't reliably use the prebuilt bundles
+      !targetNode
     ) {
       ember = new Funnel(tree, {
         destDir: 'ember',

From 63a24db2083ace28e7df960bf44cd71384ff491a Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 11 Feb 2021 10:07:20 -0800
Subject: [PATCH 0369/1405] [BUGFIX] Ensure entries are properly defined on
 loader

Ensures the `registry` field on `Ember.__loader` is setup properly, and
that the shim loader has `entries` defined on it correctly.
---
 packages/ember/index.js      | 5 +++--
 packages/loader/lib/index.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index a6f0f03f856..6f76ddc8109 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -790,7 +790,7 @@ function defineEmberTemplateCompilerLazyLoad(key) {
     configurable: true,
     enumerable: true,
     get() {
-      if (require.has('ember-template-compiler')) {
+      if (has('ember-template-compiler')) {
         let templateCompiler = require('ember-template-compiler');
 
         EmberHTMLBars.precompile = EmberHandlebars.precompile = templateCompiler.precompile;
@@ -863,7 +863,8 @@ Ember.__loader = {
   require,
   // eslint-disable-next-line no-undef
   define,
-  registry: require.entries,
+  // eslint-disable-next-line no-undef
+  registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries,
 };
 
 export default Ember;
diff --git a/packages/loader/lib/index.js b/packages/loader/lib/index.js
index 3c125722870..5f31ddd344d 100644
--- a/packages/loader/lib/index.js
+++ b/packages/loader/lib/index.js
@@ -92,5 +92,5 @@ var define, require;
     return Boolean(registry[moduleName]) || Boolean(registry[moduleName + '/index']);
   };
 
-  require._eak_seen = registry;
+  require._eak_seen = require.entries = registry;
 })();

From 7f6cd8f743a7cc2f762a69f44455a7f169ac7bac Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 15 Feb 2021 14:38:02 -0500
Subject: [PATCH 0370/1405] Add v3.16.0-beta.2 to CHANGELOG

(cherry picked from commit dd26c4edd3659a314cc7419899e4b6933b9df013)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc491a7d05b..4a1fd9128a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Ember Changelog
 
+### v3.26.0-beta.2 (February 15, 2021)
+
+- [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] LinkTo with incomplete model failing in rendering tests
+- [#19395](https://github.com/emberjs/ember.js/pull/19395) [BUGFIX] Only return empty href when LinkTo href generation throws error
+- [#19396](https://github.com/emberjs/ember.js/pull/19396) [BUGFIX] Revert deprecation of htmlSafe and isHTMLSafe
+- [#19397](https://github.com/emberjs/ember.js/pull/19397) [BUGFIX] Force building Ember bundles when `targets.node` is defined
+
 ### v3.26.0-beta.1 (February 08, 2021)
 
 - [#19255](https://github.com/emberjs/ember.js/pull/19255) [DEPRECATION] Deprecate transition methods of controller and route per [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).

From aa2594b09b8ce8e2df794aa46a1f86d03442ca43 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 10 Feb 2021 10:53:55 -0500
Subject: [PATCH 0371/1405] Add v3.24.2 to CHANGELOG.md.

(cherry picked from commit 98745fbf3f9feb17d5fe32a8dcbb7c2c2b41bd06)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a1fd9128a6..7cb72e90d6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,10 @@
 - [#19338](https://github.com/emberjs/ember.js/pull/19338) [BUGFIX] Add missing `deprecate` options (`for` + `since`)
 - [#19342](https://github.com/emberjs/ember.js/pull/19342) [BUGFIX] Fix misleading LinkTo error message
 
+### v3.24.2 (February 10, 2021)
+
+- [#19326](https://github.com/emberjs/ember.js/pull/19326) / [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] Fix usage of `<LinkTo />` prior to routing (e.g. component rendering tests)
+
 ### v3.24.1 (January 14, 2021)
 
 - [#19337](https://github.com/emberjs/ember.js/pull/19337) [BUGFIX] Ensure query param only `<LinkTo />` are properly scoped in engines

From 3a7c034cdc81c3ed05508f64c630e2041995d2f8 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 10 Feb 2021 10:20:46 -0500
Subject: [PATCH 0372/1405] Add v3.25.1 to CHANGELOG.

(cherry picked from commit 647279b71c15eb2de8c0ac68d078ed2c583d41dd)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cb72e90d6c..4f5ab31e6ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,10 @@
 - [#19298](https://github.com/emberjs/ember.js/pull/19298) [BUGFIX] Route serialize did not extract param off proxy
 - [#19326](https://github.com/emberjs/ember.js/pull/19326) [BUGFIX] Lazily setup the router in non-application tests for <LinkTo> component
 
+### v3.25.1 (February 10, 2021)
+
+- [#19326](https://github.com/emberjs/ember.js/pull/19326) / [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] Fix usage of `<LinkTo />` prior to routing (e.g. component rendering tests)
+
 ### v3.25.0 (February 08, 2021)
 
 - [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).

From e2054547fd2807293e7352386169af5c9f40ac82 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 16 Feb 2021 14:10:55 -0800
Subject: [PATCH 0373/1405] Updates Glimmer VM to 0.76.0

---
 package.json |  26 ++---
 yarn.lock    | 262 +++++++++++++++++++++++++--------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)

diff --git a/package.json b/package.json
index c80e0023e2d..ea4586d80cd 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.75.0",
+    "@glimmer/vm-babel-plugins": "0.76.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.75.0",
+    "@glimmer/compiler": "0.76.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.75.0",
-    "@glimmer/interfaces": "0.75.0",
-    "@glimmer/manager": "0.75.0",
-    "@glimmer/destroyable": "0.75.0",
-    "@glimmer/owner": "0.75.0",
-    "@glimmer/node": "0.75.0",
-    "@glimmer/opcode-compiler": "0.75.0",
-    "@glimmer/program": "0.75.0",
-    "@glimmer/reference": "0.75.0",
-    "@glimmer/runtime": "0.75.0",
-    "@glimmer/validator": "0.75.0",
+    "@glimmer/global-context": "0.76.0",
+    "@glimmer/interfaces": "0.76.0",
+    "@glimmer/manager": "0.76.0",
+    "@glimmer/destroyable": "0.76.0",
+    "@glimmer/owner": "0.76.0",
+    "@glimmer/node": "0.76.0",
+    "@glimmer/opcode-compiler": "0.76.0",
+    "@glimmer/program": "0.76.0",
+    "@glimmer/reference": "0.76.0",
+    "@glimmer/runtime": "0.76.0",
+    "@glimmer/validator": "0.76.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 2778b55669f..5018fea3faa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.75.0.tgz#6b4c91274221641aaaae21f3e1a60fc349a398e3"
-  integrity sha512-gWpcmLc5nE8UYgOE7NHyE5x4lUzg6Xm1aJJn7aConewtqA6LgvLTGlN3LwDL8ga2gN17oG1+NzGgS5SUpliZLA==
-  dependencies:
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/syntax" "0.75.0"
-    "@glimmer/util" "0.75.0"
-    "@glimmer/wire-format" "0.75.0"
+"@glimmer/compiler@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.76.0.tgz#669036cdbdb4c69049661d35c3520b740c0ef211"
+  integrity sha512-GFLsuOngd64VWT+kn9JQQSx9QdYy7JCMQ1whrnwsaNGjIIL8USXQs8Oif9b4ex1vcS1wz0E2KbxgYUvvgTssmg==
+  dependencies:
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/syntax" "0.76.0"
+    "@glimmer/util" "0.76.0"
+    "@glimmer/wire-format" "0.76.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.75.0.tgz#3fd1a3b60a73e5d656d1f4dbe2000c3c7940b526"
-  integrity sha512-qQluByha2/Rls397xkDgG0XyFbVx6eWtG0R/mfvkvIK3pGShVjfHS9AqPVGDguRudU+gia0mFAfc7JKvVVAWRQ==
+"@glimmer/destroyable@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.76.0.tgz#0512bcd474fcab2ddfbc3ca55ca77deb8b577858"
+  integrity sha512-DeIXL0pcR/Zz0mMYm2KM4kpI0cz/xY8IykB4EuP+TyP2T45aKl2xbaHGqEi72h7kSgFUJTQ8GTG1VxGeHOSurQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.75.0"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/util" "0.75.0"
+    "@glimmer/global-context" "0.76.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/util" "0.76.0"
 
-"@glimmer/encoder@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.75.0.tgz#065bd2a1fc77f31eb6d8c7a244f79002c0f97378"
-  integrity sha512-u3/olw85aczhuho00ZoXdJwEdGcx0R/GXWnd3CerVXYRxfPBmZJQ7NUEk+IDStzG9hTqlnrmNfRHBrhZfEvoYA==
+"@glimmer/encoder@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.76.0.tgz#496c611d4d4ac288486a9a4d0958858872d249d2"
+  integrity sha512-QA01veEQfz6YAa7pISPaxMpjZAZdePzmC0+52ICgmHrAO8jOegvOTZo/g7VZsK5mylY7MYSYssWCm0Iwkk95nw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/vm" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/vm" "0.76.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.75.0.tgz#04367c4c05b66f69f77323463ed2ed38ec888031"
-  integrity sha512-uPGWl7ThQTWF+tn2jocSPCQcLWiSlQRVwVWq8zq3D1J6hVgK/QtWiCPZGNzHPb6F4UzDrNGgzSBMuNK9DyTuSw==
+"@glimmer/global-context@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.76.0.tgz#7608cbd9d509e3c34c17422b7c7d2a134e987310"
+  integrity sha512-BXh+jRId8kTmtOW6BmwlyrQBfNUDgheikSPYUNBRz8zRVr5Lkgk1sQCdqmh7UQs3LgJbMzTAb44Far51w+Iriw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.75.0.tgz#ae8559a2ab906d7ab131741398c27f0c6dd1b0f7"
-  integrity sha512-vyIXi/e2yf3C0AfYMJQXdqwmnGOH7GxDRZ2c70UNYHoSCUtjvgyGWKc6rAXzmhRVG1YFyDzoc2wYxGYdx+MMmA==
+"@glimmer/interfaces@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.76.0.tgz#0ca0f375a441f2ccd33733252aae030acbff05fa"
+  integrity sha512-n44NPbeovuiTl1Nce/Pu9A137cHKH9TcRZVNzpFLIY3AvDSKeGemAYmiX9H43ZqX4jm3am6cB9TQwheNfcNJpg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.75.0.tgz#87f0210293e4a6ff5101e554ac7580991a6db792"
-  integrity sha512-I1T+Wj6NBLnFPFxPurzw2f/V8DymWWBwTlGgbMvDpAEIkUnSK7I3Lvxjly0qARD7YH3Jzdso1hkv5Sxbt/WseA==
+"@glimmer/low-level@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.76.0.tgz#07900b3564aae49258c85bd3dd6c936fb2e34e37"
+  integrity sha512-yWSOM9G0BwdHsZA/QlmXbbsOXQUzn8HBBeBqdeCGqLnNWNL6Bj87HpCH7dQRXS7E9F14V+eqq2Pj5y658UcQ/Q==
 
-"@glimmer/manager@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.75.0.tgz#7f0375f6f08d6afab2a89c53eb0a089e728c6ca8"
-  integrity sha512-AUf4jvFAO7Uz+KUbBZgkrlV3BU+1SxTkk336URkX2HSsiEBaC8bl9iBaPpMhJ0pqo7QSxuFobZJ0R5q+WPCXOw==
+"@glimmer/manager@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.76.0.tgz#a23a3f662daec6d3d67f453cf1c07294d7afa325"
+  integrity sha512-G5vBPcoExkL6gBZy9507AS/IMYv1+oJqxIOSsdMM/4y3JAuAdC5UvEep54HnKPZI0UPXHF4AqOoiBaQjk3z9ag==
   dependencies:
-    "@glimmer/destroyable" "0.75.0"
+    "@glimmer/destroyable" "0.76.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/reference" "0.75.0"
-    "@glimmer/util" "0.75.0"
-    "@glimmer/validator" "0.75.0"
-
-"@glimmer/node@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.75.0.tgz#5d7decbe6744bdc4e4d0d61ec019f56e9e2ac8d7"
-  integrity sha512-Ig3xppLvpq6UmbwOPNJY3eXIz1mIoJriBtJpFlBonEdHtRrYmB1D7XoOBulOWLR+iqD2dx9Q5bjW/xeRusMgQw==
-  dependencies:
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/runtime" "0.75.0"
-    "@glimmer/util" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/reference" "0.76.0"
+    "@glimmer/util" "0.76.0"
+    "@glimmer/validator" "0.76.0"
+
+"@glimmer/node@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.76.0.tgz#14b72eafef52f0c3c7afa75ba4a2f3ab61532b97"
+  integrity sha512-o23nL6WPtMYqD5wjZizlFC0sd3F0tEY/eOMFV8Qc1cbWrOmtxkt5ayeW4vv5DEWy3t8/JSAIEybJUTQo2JyNFA==
+  dependencies:
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/runtime" "0.76.0"
+    "@glimmer/util" "0.76.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.75.0.tgz#f751d05190257f36bb9912e7f41589906bb76dd2"
-  integrity sha512-6DoMdzSBNv6An+d43+ApUxHjJZAZIHQNE74T0eysPULStZXLyNhOLHZXy4lnLT8VQyqcfWMaTIK3NVc3AGApSQ==
+"@glimmer/opcode-compiler@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.76.0.tgz#8ffdc09a7cfa30bd50aff41fb5c68595a42cad41"
+  integrity sha512-NnVCaqBG3vBU8ZSD5taqlZ6dbglXLSL0/0J7hGI1abwDT9vOriFu0T3s+DDTfY5KjhA7/dD+IqladypYS59Y3w==
   dependencies:
-    "@glimmer/encoder" "0.75.0"
+    "@glimmer/encoder" "0.76.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/reference" "0.75.0"
-    "@glimmer/util" "0.75.0"
-    "@glimmer/vm" "0.75.0"
-    "@glimmer/wire-format" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/reference" "0.76.0"
+    "@glimmer/util" "0.76.0"
+    "@glimmer/vm" "0.76.0"
+    "@glimmer/wire-format" "0.76.0"
 
-"@glimmer/owner@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.75.0.tgz#ced2b5df2ba4b0c2578f2c4b17118e06c572a368"
-  integrity sha512-E9wbOMCMErFi3bTWf4TbHm75yo1xe3aBCGRCetb23C1RWG8SVVQqCVwur0pj3vhcsBdvCFJPzDXBxj95/OmyHw==
+"@glimmer/owner@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.76.0.tgz#c5664d051bad2683ac60e4672989ccacc99d2ade"
+  integrity sha512-VSW29iPLuhmZz4cpfkMGp9HJYG9JcKAqAlHTkW6Abap+hryXUn4xFXLOEjvzs6UxCqRyTUfWd6YVyYHPtwERIw==
   dependencies:
-    "@glimmer/util" "0.75.0"
+    "@glimmer/util" "0.76.0"
 
-"@glimmer/program@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.75.0.tgz#8a6f73ba6a00447b5911ff86b444f3fbf043b20f"
-  integrity sha512-o7B1lXVmPlqB1louIdHovud6tgH9crzdvcNeNKE/w7382oKukTE4tdVRtOh17MKTjX26LS5xQZlryG9ZglCcbQ==
+"@glimmer/program@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.76.0.tgz#3ea7de6227ecd95fb6d5ab4a9a18465d26fb5fae"
+  integrity sha512-7c07eKiwipG1waeEyZv6PI2lB0XmyvjG86dAkZj8W2sYkCGcvfNU8qpqXMHfMPkox7efcshID6nSHBslLVBS8w==
   dependencies:
-    "@glimmer/encoder" "0.75.0"
+    "@glimmer/encoder" "0.76.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/manager" "0.75.0"
-    "@glimmer/opcode-compiler" "0.75.0"
-    "@glimmer/util" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/manager" "0.76.0"
+    "@glimmer/opcode-compiler" "0.76.0"
+    "@glimmer/util" "0.76.0"
 
-"@glimmer/reference@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.75.0.tgz#f8feb086a34399d224fc1c4ddcfc16061b9d13c6"
-  integrity sha512-stYpNfRxHGlzbVbxp9qN1n0GbxIKgCraYDb13E7bI430FmX0zjwtiL5wuDJo/WPAIa6g6VORqJ5tDRV9j584tw==
+"@glimmer/reference@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.76.0.tgz#c16fe4d027a3e84e8f3f80c6cd08564855cba9be"
+  integrity sha512-zdGs42sdD/0YU04vKYU+j7jqLeJyD/IfPULTPv35TOo/fCidvidNZqpF3AVQk4CnTViedDD0DZMUrtCSJ0hhjQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.75.0"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/util" "0.75.0"
-    "@glimmer/validator" "0.75.0"
+    "@glimmer/global-context" "0.76.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/util" "0.76.0"
+    "@glimmer/validator" "0.76.0"
 
-"@glimmer/runtime@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.75.0.tgz#d81c0c26e62a4bb7fc7beea698c2d0876cc9f368"
-  integrity sha512-hCEOB1g+sNU63jUW0H/TpKqm6suUwvXAcFPdO4t/tnF/c7LzQZ2HphhZXfCfIVuoPi5XJSHM/g8eX6VRjdrKNA==
+"@glimmer/runtime@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.76.0.tgz#cef863f2d068d91acc6778d423569ac0365977b0"
+  integrity sha512-pc8U1/pezN5EHCDYHvSfPLQLCRgMG7V45dMuF7CTr2BuP/3XuZFQzQPCKDFzF1IZxy/FdXFO0paL+oWvfACRKA==
   dependencies:
-    "@glimmer/destroyable" "0.75.0"
+    "@glimmer/destroyable" "0.76.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.75.0"
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/low-level" "0.75.0"
-    "@glimmer/owner" "0.75.0"
-    "@glimmer/program" "0.75.0"
-    "@glimmer/reference" "0.75.0"
-    "@glimmer/util" "0.75.0"
-    "@glimmer/validator" "0.75.0"
-    "@glimmer/vm" "0.75.0"
-    "@glimmer/wire-format" "0.75.0"
+    "@glimmer/global-context" "0.76.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/low-level" "0.76.0"
+    "@glimmer/owner" "0.76.0"
+    "@glimmer/program" "0.76.0"
+    "@glimmer/reference" "0.76.0"
+    "@glimmer/util" "0.76.0"
+    "@glimmer/validator" "0.76.0"
+    "@glimmer/vm" "0.76.0"
+    "@glimmer/wire-format" "0.76.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.75.0.tgz#eeefe5f27ba56aebce2ee09bd91de847a610dd8f"
-  integrity sha512-v+sK7lv8eAoTJmFM8MjRsUG7/8NxhrtN8F0PTUZKIpgfBBWQ5JxtWOypbFNJR3cAo8gggRduEOoELCc7b9e4/g==
+"@glimmer/syntax@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.76.0.tgz#18dd5c997b140f749a929fcedf323dbad2e20a12"
+  integrity sha512-ayURhGAFo9LMh0xm4KHs1TYSpCt0H37w7CSj3Oi8sgOCoiZWM716JaXhBdL/ew0IVZQIg4bJ5x+wfDmGZ+5jGA==
   dependencies:
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/util" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/util" "0.76.0"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.75.0.tgz#412956227c08e1a1e11500c7bd746947056924e5"
-  integrity sha512-dngZXP0TsGPyJ2kj40TJHcVhWpkBecH6BD93pZKUEsHuXMPxQQeyCuEQBKRPcG3PMi/iHjzOqSMXROh8kyiY/Q==
+"@glimmer/util@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.76.0.tgz#fc2c5dafb6a45b3e30f48c39e79fc2a75ed6c916"
+  integrity sha512-afJ0WcztA2eo9uwBgKxRq6fNxiT+i/xKxYfWGc2Rr9tKiZr+zniiUHa5n44e+wQmwZi0BM0IbLdUsd5s4iEkfg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.75.0.tgz#aee57df8a64a0701462333def6f69bc2c3937156"
-  integrity sha512-6L782LD8aS7V5zSuFliZiY2zlEIMkuyFjsCoFotpaEkU0km/ywTxciW2JthYTQW5vqRmQ9wv96JNDsN1GUhj+Q==
+"@glimmer/validator@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.76.0.tgz#127e4e0b61a545e25cd14928ec68d994428e66bb"
+  integrity sha512-orpvoqWxrMyMr2B/8I2S1YVU63Sdx0O0yLfYp/DrQxtlLZNujYOcVJBejR+X/uDfl7ryDBQOg/bY36iLhP/VcQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.75.0"
+    "@glimmer/global-context" "0.76.0"
 
-"@glimmer/vm-babel-plugins@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.75.0.tgz#d4022200323f3caf27e11ad2e4af424e253e73f7"
-  integrity sha512-TONyzG4+SVHIw9zZZa0sZvNRq7IJTxVesKax+53akb8ZhRra0xht2F/JJen6fKv95qHjGHs0kj3Z7Ajgk9gOlw==
+"@glimmer/vm-babel-plugins@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.76.0.tgz#e69afbb9ea62b31cba824147f23e7ba6f674e66e"
+  integrity sha512-arIbSbnVc274B6PFfvNH+gQDxHJmY8mdR1yJNXD3P0zRIzr6xw3lMvph5nV3V4t8KiE06+wAQ/HS7JI39+fuTQ==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.75.0.tgz#5041b658bd42c6624304258b23c246a1b996808e"
-  integrity sha512-cCxMdi1qsX6zS+3Rb5WDdi3oz10QbHd6P7DTJKtZsy/S6v+1QWuHaFxAY+FemARi87jnLZb5/4lNDcGbjjNO7g==
+"@glimmer/vm@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.76.0.tgz#84107bbe15ec14dae508bcda73cf1f2620c12186"
+  integrity sha512-TCfNXeYwVjWfKvwRXsyic6CmKIM80781/62kY4xy/6G7sVTVMkRV++nO0yVIa2RKGL+TFNM7dJFIuRMQzugCiA==
   dependencies:
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/util" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/util" "0.76.0"
 
-"@glimmer/wire-format@0.75.0":
-  version "0.75.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.75.0.tgz#9deb087e9233cffb31686a8321063066e2bd3944"
-  integrity sha512-itfNHPrMN1pLV2KbWjjlk3YCGw9qQHQqa1uk+gU+Sr7lrwJ6/UJqLUyey40924RN9z5bqkiLnFlVaSJP6/w59w==
+"@glimmer/wire-format@0.76.0":
+  version "0.76.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.76.0.tgz#1092c1864255ffd85dc5f67d68ca73e660703e11"
+  integrity sha512-v+G1KHNpQ7xAVsp9N62PIcuE9Cjw5LWUw10+peiXDS/V3QoX4frwApY1j8VinmlnTYn69OekEU7LVCzu41gAsg==
   dependencies:
-    "@glimmer/interfaces" "0.75.0"
-    "@glimmer/util" "0.75.0"
+    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/util" "0.76.0"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 4daccb827dffb1e4494219ca831ccb7613f5294c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 16 Feb 2021 14:14:15 -0800
Subject: [PATCH 0374/1405] unskip strict mode test

---
 .../glimmer/tests/integration/components/strict-mode-test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index a8e5fd9368c..888c33cd088 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -162,7 +162,7 @@ if (EMBER_STRICT_MODE) {
   moduleFor(
     'Strict Mode - built ins',
     class extends RenderingTestCase {
-      '@skip Can use Input'() {
+      '@test Can use Input'() {
         let Foo = defineComponent({ Input }, '<Input/>');
 
         this.registerComponent('foo', { ComponentClass: Foo });

From 1f385ba6422301b69386527c5cb68ee898ed57c6 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 17 Feb 2021 13:49:53 -0800
Subject: [PATCH 0375/1405] Add test to ensure helpers are computed lazily
 (when used)

From #19406
---
 .../tests/integration/helpers/custom-helper-test.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 254125e7803..08d55ef94b9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -804,6 +804,19 @@ moduleFor(
         });
       }, /Cannot use the \(helper\) keyword yet, as it has not been implemented/);
     }
+
+    ['@test helpers are not computed eagerly when used with if expressions'](assert) {
+      this.registerHelper('is-ok', () => 'hello');
+      this.registerHelper('throws-error', () => assert.ok(false, 'helper was computed eagerly'));
+
+      this.render('{{if true (is-ok) (throws-error)}}');
+
+      this.assertText('hello');
+
+      runTask(() => this.rerender());
+
+      this.assertText('hello');
+    }
   }
 );
 

From e37a265c2b428d4010069a465d100691f022a401 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 17 Feb 2021 14:11:55 -0800
Subject: [PATCH 0376/1405] [BUGFIX release] Update Glimmer VM to 0.77, fix
 dynamic helpers/modifiers

Updates the VM, which includes a fix for dynamic helper and modifier usage.

Release notes: https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.77.0
---
 package.json                                  |  26 +-
 .../lib/helpers/-in-element-null-check.ts     |   8 +-
 .../glimmer/lib/helpers/-normalize-class.ts   |   6 +-
 .../glimmer/lib/helpers/-track-array.ts       |   6 +-
 .../-internals/glimmer/lib/helpers/action.ts  |  13 +-
 .../-internals/glimmer/lib/helpers/each-in.ts |   6 +-
 .../glimmer/lib/helpers/internal-helper.ts    |   3 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |   6 +-
 .../glimmer/lib/helpers/query-param.ts        |   6 +-
 .../glimmer/lib/helpers/readonly.ts           |   6 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |   8 +-
 .../glimmer/lib/modifiers/action.ts           |  23 +-
 .../glimmer/lib/modifiers/internal.ts         |   5 +-
 .../-internals/glimmer/lib/syntax/mount.ts    |  28 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   | 107 +++----
 .../lib/define-template-values.ts             |   5 +-
 yarn.lock                                     | 262 +++++++++---------
 17 files changed, 250 insertions(+), 274 deletions(-)

diff --git a/package.json b/package.json
index ea4586d80cd..758fd597fdf 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.76.0",
+    "@glimmer/vm-babel-plugins": "0.77.1",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.76.0",
+    "@glimmer/compiler": "0.77.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.76.0",
-    "@glimmer/interfaces": "0.76.0",
-    "@glimmer/manager": "0.76.0",
-    "@glimmer/destroyable": "0.76.0",
-    "@glimmer/owner": "0.76.0",
-    "@glimmer/node": "0.76.0",
-    "@glimmer/opcode-compiler": "0.76.0",
-    "@glimmer/program": "0.76.0",
-    "@glimmer/reference": "0.76.0",
-    "@glimmer/runtime": "0.76.0",
-    "@glimmer/validator": "0.76.0",
+    "@glimmer/global-context": "0.77.1",
+    "@glimmer/interfaces": "0.77.1",
+    "@glimmer/manager": "0.77.1",
+    "@glimmer/destroyable": "0.77.1",
+    "@glimmer/owner": "0.77.1",
+    "@glimmer/node": "0.77.1",
+    "@glimmer/opcode-compiler": "0.77.1",
+    "@glimmer/program": "0.77.1",
+    "@glimmer/reference": "0.77.1",
+    "@glimmer/runtime": "0.77.1",
+    "@glimmer/validator": "0.77.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
index 97cd913abe3..dfb7b7aa178 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -1,14 +1,14 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { Helper, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, Helper } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
 let helper: Helper;
 
 if (DEBUG) {
-  helper = (args: VMArguments) => {
-    let inner = args.positional.at(0);
+  helper = (args: CapturedArguments) => {
+    let inner = args.positional[0];
 
     return createComputeRef(() => {
       let value = valueForRef(inner);
@@ -22,7 +22,7 @@ if (DEBUG) {
     });
   };
 } else {
-  helper = (args: VMArguments) => args.positional.at(0);
+  helper = (args: CapturedArguments) => args.positional[0];
 }
 
 export default internalHelper(helper);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 940524cf7fb..9db32be2b00 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,11 +1,9 @@
 import { dasherize } from '@ember/string';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
-export default internalHelper((args: VMArguments) => {
-  let positional = args.positional.capture();
-
+export default internalHelper(({ positional }: CapturedArguments) => {
   return createComputeRef(() => {
     let classNameParts = (valueForRef(positional[0]) as string).split('.');
     let className = classNameParts[classNameParts.length - 1];
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index f91c576259b..a4c91c38848 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -3,7 +3,7 @@
 */
 import { tagForProperty } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
 import { internalHelper } from './internal-helper';
@@ -13,8 +13,8 @@ import { internalHelper } from './internal-helper';
   updates to `{{each}}` when it changes. It is put into place by a template
   transform at build time, similar to the (-each-in) helper
 */
-export default internalHelper((args: VMArguments) => {
-  let inner = args.positional.at(0);
+export default internalHelper(({ positional }: CapturedArguments) => {
+  let inner = positional[0];
 
   return createComputeRef(() => {
     let iterable = valueForRef(inner);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index d5e9d59a248..e27ed4e11cc 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -7,7 +7,7 @@ import { assert, deprecate } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import {
   createUnboundRef,
   isInvokableRef,
@@ -285,21 +285,18 @@ export const INVOKE: unique symbol = symbol('INVOKE') as any;
   @public
 */
 export default internalHelper(
-  (args: VMArguments): Reference<Function> => {
+  (args: CapturedArguments): Reference<Function> => {
     let { named, positional } = args;
-
-    let capturedArgs = positional.capture();
-
     // The first two argument slots are reserved.
     // pos[0] is the context (or `this`)
     // pos[1] is the action name or function
     // Anything else is an action argument.
-    let [context, action, ...restArgs] = capturedArgs;
+    let [context, action, ...restArgs] = positional;
 
     let debugKey: string = action.debugLabel!;
 
-    let target = named.has('target') ? named.get('target') : context;
-    let processArgs = makeArgsProcessor(named.has('value') && named.get('value'), restArgs);
+    let target = 'target' in named ? named.target : context;
+    let processArgs = makeArgsProcessor('value' in named && named.value, restArgs);
 
     let fn: Function;
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 64143fa99c4..cff217d855f 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -4,7 +4,7 @@
 import { tagForObject } from '@ember/-internals/metal';
 import { _contentFor } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
 import { internalHelper } from './internal-helper';
@@ -159,8 +159,8 @@ export class EachInWrapper {
   constructor(public inner: unknown) {}
 }
 
-export default internalHelper((args: VMArguments) => {
-  let inner = args.positional.at(0);
+export default internalHelper(({ positional }: CapturedArguments) => {
+  let inner = positional[0];
 
   return createComputeRef(() => {
     let iterable = valueForRef(inner);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
index 99645339afc..deecefd3fe3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
@@ -1,6 +1,7 @@
+import { Owner } from '@ember/-internals/owner';
 import { Helper, HelperDefinitionState } from '@glimmer/interfaces';
 import { setInternalHelperManager } from '@glimmer/manager';
 
-export function internalHelper(helper: Helper): HelperDefinitionState {
+export function internalHelper(helper: Helper<Owner>): HelperDefinitionState {
   return setInternalHelperManager(helper, {});
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index b7c7c2a9fee..3c073fc6ae6 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { assert } from '@ember/debug';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createInvokableRef, isUpdatableRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
@@ -80,8 +80,8 @@ import { internalHelper } from './internal-helper';
   @public
 */
 
-export default internalHelper((args: VMArguments) => {
-  let ref = args.positional.at(0);
+export default internalHelper(({ positional }: CapturedArguments) => {
+  let ref = positional[0];
 
   // TODO: Improve this error message. This covers at least two distinct
   // cases:
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index 98f4d047dbb..a0bb4b22a4e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -4,7 +4,7 @@
 import { QueryParams } from '@ember/-internals/routing';
 import { assert, deprecate } from '@ember/debug';
 import { assign } from '@ember/polyfills';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef } from '@glimmer/reference';
 import { reifyNamed } from '@glimmer/runtime';
 import { internalHelper } from './internal-helper';
@@ -30,9 +30,7 @@ import { internalHelper } from './internal-helper';
   @return {Object} A `QueryParams` object for `{{link-to}}`
   @public
 */
-export default internalHelper((args: VMArguments) => {
-  let { positional, named } = args.capture();
-
+export default internalHelper(({ positional, named }: CapturedArguments) => {
   return createComputeRef(() => {
     assert(
       "The `query-params` helper only accepts named arguments, e.g. (query-params queryParamPropertyName='foo') as opposed to (query-params 'foo')",
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index f2f6b53b333..98328c11145 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createReadOnlyRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
@@ -120,6 +120,6 @@ import { internalHelper } from './internal-helper';
   @for Ember.Templates.helpers
   @private
 */
-export default internalHelper((args: VMArguments) => {
-  return createReadOnlyRef(args.positional.at(0));
+export default internalHelper(({ positional }: CapturedArguments) => {
+  return createReadOnlyRef(positional[0]);
 });
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index 474c39b1f00..e119f0c3903 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -3,7 +3,7 @@
 */
 
 import { assert } from '@ember/debug';
-import { VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments } from '@glimmer/interfaces';
 import { createUnboundRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
@@ -35,11 +35,11 @@ import { internalHelper } from './internal-helper';
   @public
 */
 
-export default internalHelper((args: VMArguments) => {
+export default internalHelper(({ positional, named }: CapturedArguments) => {
   assert(
     'unbound helper cannot be called with multiple params or hash params',
-    args.positional.length === 1 && args.named.length === 0
+    positional.length === 1 && Object.keys(named).length === 0
   );
 
-  return createUnboundRef(valueForRef(args.positional.at(0)), '(resurt of an `unbound` helper)');
+  return createUnboundRef(valueForRef(positional[0]), '(resurt of an `unbound` helper)');
 });
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 165df09fa1e..f3678a76b96 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -7,12 +7,10 @@ import { join } from '@ember/runloop';
 import { registerDestructor } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import {
+  CapturedArguments,
   CapturedNamedArguments,
   CapturedPositionalArguments,
-  DynamicScope,
-  GlimmerTreeChanges,
   InternalModifierManager,
-  VMArguments,
 } from '@glimmer/interfaces';
 import { setInternalModifierManager } from '@glimmer/manager';
 import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
@@ -73,7 +71,6 @@ export class ActionState {
   public namedArgs: CapturedNamedArguments;
   public positional: CapturedPositionalArguments;
   public implicitTarget: any;
-  public dom: GlimmerTreeChanges;
   public eventName: any;
   public tag = createUpdatableTag();
 
@@ -82,15 +79,13 @@ export class ActionState {
     actionId: number,
     actionArgs: any[],
     namedArgs: CapturedNamedArguments,
-    positionalArgs: CapturedPositionalArguments,
-    dom: GlimmerTreeChanges
+    positionalArgs: CapturedPositionalArguments
   ) {
     this.element = element;
     this.actionId = actionId;
     this.actionArgs = actionArgs;
     this.namedArgs = namedArgs;
     this.positional = positionalArgs;
-    this.dom = dom;
     this.eventName = this.getEventName();
 
     registerDestructor(this, () => ActionHelper.unregisterAction(this));
@@ -208,12 +203,8 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
     _owner: Owner,
     element: SimpleElement,
     _state: object,
-    args: VMArguments,
-    _dynamicScope: DynamicScope,
-    dom: GlimmerTreeChanges
+    { named, positional }: CapturedArguments
   ): ActionState {
-    let { named, positional } = args.capture();
-
     let actionArgs: any[] = [];
     // The first two arguments are (1) `this` and (2) the action name.
     // Everything else is a param.
@@ -222,7 +213,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
     }
 
     let actionId = uuid();
-    let actionState = new ActionState(element, actionId, actionArgs, named, positional, dom);
+    let actionState = new ActionState(element, actionId, actionArgs, named, positional);
 
     deprecate(
       `Using the \`{{action}}\` modifier with \`${actionState.eventName}\` events has been deprecated.`,
@@ -248,7 +239,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
   }
 
   install(actionState: ActionState): void {
-    let { dom, element, actionId, positional } = actionState;
+    let { element, actionId, positional } = actionState;
 
     let actionName;
     let actionNameRef: any;
@@ -288,8 +279,8 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
 
     ActionHelper.registerAction(actionState);
 
-    dom.setAttribute(element, 'data-ember-action', '');
-    dom.setAttribute(element, `data-ember-action-${actionId}`, String(actionId));
+    element.setAttribute('data-ember-action', '');
+    element.setAttribute(`data-ember-action-${actionId}`, String(actionId));
   }
 
   update(actionState: ActionState): void {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index 35f0755546a..04fb84b54b2 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -6,7 +6,6 @@ import {
   CapturedArguments,
   Destroyable,
   InternalModifierManager as ModifierManager,
-  VMArguments,
 } from '@glimmer/interfaces';
 import { valueForRef } from '@glimmer/reference';
 import { SimpleElement } from '@simple-dom/interface';
@@ -60,12 +59,12 @@ export class InternalModifierManager
     owner: Owner,
     element: SimpleElement,
     _definition: unknown,
-    args: VMArguments
+    args: CapturedArguments
   ): InternalModifierState {
     assert('element must be an HTMLElement', element instanceof HTMLElement);
 
     let { ModifierClass } = this;
-    let instance = new ModifierClass(owner, element, args.capture());
+    let instance = new ModifierClass(owner, element, args);
 
     registerDestructor(instance, destructor);
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 86ef25421f5..ad56720a0ea 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -4,7 +4,7 @@
 import { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, CurriedType, Option, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, CurriedType, Option } from '@glimmer/interfaces';
 import { createComputeRef, Reference, valueForRef } from '@glimmer/reference';
 import { createCapturedArgs, CurriedValue, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
 import { MountDefinition } from '../component-managers/mount';
@@ -51,10 +51,10 @@ import { internalHelper } from '../helpers/internal-helper';
   @public
 */
 export const mountHelper = internalHelper(
-  (args: VMArguments, vm: VM): Reference<CurriedValue | null> => {
-    let owner = vm.getOwner() as Owner;
-    let nameRef = args.positional.at(0) as Reference<Option<string>>;
-    let captured: Option<CapturedArguments> = null;
+  (args: CapturedArguments, owner?: Owner): Reference<CurriedValue | null> => {
+    assert('{{mount}} must be used within a component that has an owner', owner);
+    let nameRef = args.positional[0] as Reference<Option<string>>;
+    let captured: CapturedArguments | null;
 
     assert(
       'You can only pass a single positional argument to the {{mount}} helper, e.g. {{mount "chat-engine"}}.',
@@ -62,7 +62,7 @@ export const mountHelper = internalHelper(
     );
 
     if (DEBUG && args.named) {
-      let keys = args.named.names;
+      let keys = Object.keys(args.named);
       let extra = keys.filter((k) => k !== 'model');
 
       assert(
@@ -73,19 +73,7 @@ export const mountHelper = internalHelper(
       );
     }
 
-    // TODO: the functionality to create a proper CapturedArgument should be
-    // exported by glimmer, or that it should provide an overload for `curry`
-    // that takes `PreparedArguments`
-    if (args.named.has('model')) {
-      assert(
-        '[BUG] this should already be checked by the template transform',
-        args.named.length === 1
-      );
-
-      let named = args.named.capture();
-
-      captured = createCapturedArgs(named, EMPTY_POSITIONAL);
-    }
+    captured = createCapturedArgs(args.named, EMPTY_POSITIONAL);
 
     let lastName: string | null, lastDef: CurriedValue | null;
 
@@ -99,7 +87,7 @@ export const mountHelper = internalHelper(
 
         assert(
           `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`,
-          owner.hasRegistration(`engine:${name}`)
+          (owner as Owner).hasRegistration(`engine:${name}`)
         );
 
         lastName = name;
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 3e09e025253..d5050b03a3a 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,5 +1,7 @@
+import { Owner } from '@ember/-internals/owner';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CurriedType, VM, VMArguments } from '@glimmer/interfaces';
+import { CapturedArguments, CurriedType, DynamicScope } from '@glimmer/interfaces';
 import {
   childRefFromParts,
   createComputeRef,
@@ -12,7 +14,6 @@ import { createCapturedArgs, CurriedValue, curry, EMPTY_POSITIONAL } from '@glim
 import { dict } from '@glimmer/util';
 import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
 import { internalHelper } from '../helpers/internal-helper';
-import { DynamicScope } from '../renderer';
 import { isTemplateFactory } from '../template';
 import { OutletState } from '../utils/outlet';
 
@@ -63,59 +64,63 @@ import { OutletState } from '../utils/outlet';
   @for Ember.Templates.helpers
   @public
 */
-export const outletHelper = internalHelper((args: VMArguments, vm: VM) => {
-  let scope = vm.dynamicScope() as DynamicScope;
-  let nameRef: Reference<string>;
-
-  if (args.positional.length === 0) {
-    nameRef = createPrimitiveRef('main');
-  } else {
-    nameRef = args.positional.at(0);
-  }
-
-  let outletRef = createComputeRef(() => {
-    let state = valueForRef(scope.get('outletState'));
-    let outlets = state !== undefined ? state.outlets : undefined;
-
-    return outlets !== undefined ? outlets[valueForRef(nameRef)] : undefined;
-  });
-
-  let lastState: OutletDefinitionState | null = null;
-  let definition: CurriedValue | null = null;
-
-  return createComputeRef(() => {
-    let outletState = valueForRef(outletRef);
-    let state = stateFor(outletRef, outletState);
-
-    if (!validate(state, lastState)) {
-      lastState = state;
-
-      if (state !== null) {
-        let named = dict<Reference>();
-        named.model = childRefFromParts(outletRef, ['render', 'model']);
+export const outletHelper = internalHelper(
+  (args: CapturedArguments, owner?: Owner, scope?: DynamicScope) => {
+    assert('Expected owner to be present, {{outlet}} requires an owner', owner);
+    assert(
+      'Expected dynamic scope to be present. You may have attempted to use the {{outlet}} keyword dynamically. This keyword cannot be used dynamically.',
+      scope
+    );
+    let nameRef: Reference<string>;
+
+    if (args.positional.length === 0) {
+      nameRef = createPrimitiveRef('main');
+    } else {
+      nameRef = args.positional[0];
+    }
 
-        if (DEBUG) {
-          named.model = createDebugAliasRef!('@model', named.model);
+    let outletRef = createComputeRef(() => {
+      let state = valueForRef(scope.get('outletState') as Reference<OutletState | undefined>);
+      let outlets = state !== undefined ? state.outlets : undefined;
+
+      return outlets !== undefined ? outlets[valueForRef(nameRef)] : undefined;
+    });
+
+    let lastState: OutletDefinitionState | null = null;
+    let definition: CurriedValue | null = null;
+
+    return createComputeRef(() => {
+      let outletState = valueForRef(outletRef);
+      let state = stateFor(outletRef, outletState);
+
+      if (!validate(state, lastState)) {
+        lastState = state;
+
+        if (state !== null) {
+          let named = dict<Reference>();
+          named.model = childRefFromParts(outletRef, ['render', 'model']);
+
+          if (DEBUG) {
+            named.model = createDebugAliasRef!('@model', named.model);
+          }
+
+          let args = createCapturedArgs(named, EMPTY_POSITIONAL);
+          definition = curry(
+            CurriedType.Component,
+            new OutletComponentDefinition(state),
+            outletState?.render?.owner ?? owner,
+            args,
+            true
+          );
+        } else {
+          definition = null;
         }
-
-        let owner = outletState?.render?.owner ?? vm.getOwner();
-
-        let args = createCapturedArgs(named, EMPTY_POSITIONAL);
-        definition = curry(
-          CurriedType.Component,
-          new OutletComponentDefinition(state),
-          owner,
-          args,
-          true
-        );
-      } else {
-        definition = null;
       }
-    }
 
-    return definition;
-  });
-});
+      return definition;
+    });
+  }
+);
 
 function stateFor(ref: Reference, outlet: OutletState | undefined): OutletDefinitionState | null {
   if (outlet === undefined) return null;
diff --git a/packages/internal-test-helpers/lib/define-template-values.ts b/packages/internal-test-helpers/lib/define-template-values.ts
index 1dc1afb09c7..49ee1752567 100644
--- a/packages/internal-test-helpers/lib/define-template-values.ts
+++ b/packages/internal-test-helpers/lib/define-template-values.ts
@@ -13,7 +13,6 @@ import {
   HelperManager,
   ModifierManager,
 } from '@glimmer/interfaces';
-import { SimpleElement } from '@simple-dom/interface';
 import compile from './compile';
 
 interface SimpleHelperState {
@@ -47,7 +46,7 @@ type SimpleModifierFn = (...args: unknown[]) => (() => void) | undefined;
 interface SimpleModifierState {
   fn: SimpleModifierFn;
   args: Arguments;
-  element: SimpleElement | undefined;
+  element: Element | undefined;
   destructor: (() => void) | undefined;
 }
 
@@ -58,7 +57,7 @@ class FunctionalModifierManager implements ModifierManager<SimpleModifierState>
     return { fn, args, element: undefined, destructor: undefined };
   }
 
-  installModifier(state: SimpleModifierState, element: SimpleElement) {
+  installModifier(state: SimpleModifierState, element: Element) {
     state.element = element;
     this.setupModifier(state);
   }
diff --git a/yarn.lock b/yarn.lock
index 5018fea3faa..d26911ac90a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.76.0.tgz#669036cdbdb4c69049661d35c3520b740c0ef211"
-  integrity sha512-GFLsuOngd64VWT+kn9JQQSx9QdYy7JCMQ1whrnwsaNGjIIL8USXQs8Oif9b4ex1vcS1wz0E2KbxgYUvvgTssmg==
-  dependencies:
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/syntax" "0.76.0"
-    "@glimmer/util" "0.76.0"
-    "@glimmer/wire-format" "0.76.0"
+"@glimmer/compiler@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.1.tgz#1d31c5c695ee7cd1ee6c1ccad6e96fa11e334f63"
+  integrity sha512-gb2qFUtrnjeFm/JWmKzhXfHiQ3hzrgvIQMomh1CWyPz1e5oyw04UsOjBJCFcr0/xgpu9p8UMmEeKTkLCyROrTw==
+  dependencies:
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/syntax" "0.77.1"
+    "@glimmer/util" "0.77.1"
+    "@glimmer/wire-format" "0.77.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.76.0.tgz#0512bcd474fcab2ddfbc3ca55ca77deb8b577858"
-  integrity sha512-DeIXL0pcR/Zz0mMYm2KM4kpI0cz/xY8IykB4EuP+TyP2T45aKl2xbaHGqEi72h7kSgFUJTQ8GTG1VxGeHOSurQ==
+"@glimmer/destroyable@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.1.tgz#201308ac284a3466e46bad904526dd1dbf21ae72"
+  integrity sha512-E0kIvBbaLM36Wvvqt7LticXSTesTi2jQnXEXIr2u4dS128aaHIGlmpn6b/ITiJEVjJNFffaKqpfY1YuLjMaKpA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.76.0"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/util" "0.76.0"
+    "@glimmer/global-context" "0.77.1"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/util" "0.77.1"
 
-"@glimmer/encoder@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.76.0.tgz#496c611d4d4ac288486a9a4d0958858872d249d2"
-  integrity sha512-QA01veEQfz6YAa7pISPaxMpjZAZdePzmC0+52ICgmHrAO8jOegvOTZo/g7VZsK5mylY7MYSYssWCm0Iwkk95nw==
+"@glimmer/encoder@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.1.tgz#520de1d5fce5d4bd1b300db8e41485ef58e6380d"
+  integrity sha512-MGn1khRJB1euNNYOY+f7qsxhTFJqQH5y+98CUiCsIwtuqdlBfaVW09xOIcdlpEjkoPzFJJysvzGJURKKdmaq2g==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/vm" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/vm" "0.77.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.76.0.tgz#7608cbd9d509e3c34c17422b7c7d2a134e987310"
-  integrity sha512-BXh+jRId8kTmtOW6BmwlyrQBfNUDgheikSPYUNBRz8zRVr5Lkgk1sQCdqmh7UQs3LgJbMzTAb44Far51w+Iriw==
+"@glimmer/global-context@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.1.tgz#3af524269ee6de77ee1236f3650747774c026470"
+  integrity sha512-ncHfREo4zQC8XGFf1zQuQ+2T8THUIZtcGMm+Aj0k80TUb9PgE5oJPNeY7hhbYHJV531o5cuEX/SuTlCTrLm9wg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.76.0.tgz#0ca0f375a441f2ccd33733252aae030acbff05fa"
-  integrity sha512-n44NPbeovuiTl1Nce/Pu9A137cHKH9TcRZVNzpFLIY3AvDSKeGemAYmiX9H43ZqX4jm3am6cB9TQwheNfcNJpg==
+"@glimmer/interfaces@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.1.tgz#845a62ff6dc6a3646642cfbeec84b13a8a66ea1c"
+  integrity sha512-Dp0hebviZpcqEPjuNA5kGa/gl5nfYv+XEI0e9ozF5d1FD5yGPdvwQ9D+sQ4Dn888XCCmTWzKME4iRsVHK5aJoA==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.76.0.tgz#07900b3564aae49258c85bd3dd6c936fb2e34e37"
-  integrity sha512-yWSOM9G0BwdHsZA/QlmXbbsOXQUzn8HBBeBqdeCGqLnNWNL6Bj87HpCH7dQRXS7E9F14V+eqq2Pj5y658UcQ/Q==
+"@glimmer/low-level@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.1.tgz#e6ab4a2dce3d1c33bc88ac01cf1a0943dd8e8e4d"
+  integrity sha512-YWoq+XtSBbFwMtyaRXqGlNgx2Nk3bnqpP43GXwfu/KeI36or14UpLmIvhB7tbzSc7F0MLMu5yW1GRELfop2S7A==
 
-"@glimmer/manager@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.76.0.tgz#a23a3f662daec6d3d67f453cf1c07294d7afa325"
-  integrity sha512-G5vBPcoExkL6gBZy9507AS/IMYv1+oJqxIOSsdMM/4y3JAuAdC5UvEep54HnKPZI0UPXHF4AqOoiBaQjk3z9ag==
+"@glimmer/manager@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.1.tgz#3816c1679c7ad98e10b0d6ea0080e24559ae64ef"
+  integrity sha512-Yj68aKLsjVrPmd1XXxZEVIuclp3x1IgZ9c1f6f9wdxbX+YyExfERR2x6yR+jZLZPMq6fwYgHiSfzWc9tkoE6gQ==
   dependencies:
-    "@glimmer/destroyable" "0.76.0"
+    "@glimmer/destroyable" "0.77.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/reference" "0.76.0"
-    "@glimmer/util" "0.76.0"
-    "@glimmer/validator" "0.76.0"
-
-"@glimmer/node@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.76.0.tgz#14b72eafef52f0c3c7afa75ba4a2f3ab61532b97"
-  integrity sha512-o23nL6WPtMYqD5wjZizlFC0sd3F0tEY/eOMFV8Qc1cbWrOmtxkt5ayeW4vv5DEWy3t8/JSAIEybJUTQo2JyNFA==
-  dependencies:
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/runtime" "0.76.0"
-    "@glimmer/util" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/reference" "0.77.1"
+    "@glimmer/util" "0.77.1"
+    "@glimmer/validator" "0.77.1"
+
+"@glimmer/node@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.1.tgz#fc2e09a02ad1df6f8d72436c95735d8bb960057f"
+  integrity sha512-iJS3z6Ut3+ZOaUnqaaEYTsQkm4LPT41GK+Tm9HbU0PXtQ3OVMWgTbrER7jwJekeZkcufXhhh7bUcioHGSqp03w==
+  dependencies:
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/runtime" "0.77.1"
+    "@glimmer/util" "0.77.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.76.0.tgz#8ffdc09a7cfa30bd50aff41fb5c68595a42cad41"
-  integrity sha512-NnVCaqBG3vBU8ZSD5taqlZ6dbglXLSL0/0J7hGI1abwDT9vOriFu0T3s+DDTfY5KjhA7/dD+IqladypYS59Y3w==
+"@glimmer/opcode-compiler@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.1.tgz#6f42aaeb39aa21edb4081d34f0393d466139bfb9"
+  integrity sha512-AJryxdVxxtzHVTI9Dj/mCP9IKbngOaOv79j6NwnY41a2GrDsoAYpgloW0HlUNRKeCKYXT0zRBQwP3VxhArHR5w==
   dependencies:
-    "@glimmer/encoder" "0.76.0"
+    "@glimmer/encoder" "0.77.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/reference" "0.76.0"
-    "@glimmer/util" "0.76.0"
-    "@glimmer/vm" "0.76.0"
-    "@glimmer/wire-format" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/reference" "0.77.1"
+    "@glimmer/util" "0.77.1"
+    "@glimmer/vm" "0.77.1"
+    "@glimmer/wire-format" "0.77.1"
 
-"@glimmer/owner@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.76.0.tgz#c5664d051bad2683ac60e4672989ccacc99d2ade"
-  integrity sha512-VSW29iPLuhmZz4cpfkMGp9HJYG9JcKAqAlHTkW6Abap+hryXUn4xFXLOEjvzs6UxCqRyTUfWd6YVyYHPtwERIw==
+"@glimmer/owner@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.1.tgz#11bcdda63ba2064fcd733e3bd9f71025532ca95f"
+  integrity sha512-KiKQN9JkyjXymfDvqPpzzm3O5YtssqbtlzGYgd8uJfAXMnNoAHBAGJr+T/dg+cZw1iOSDbb64PPXUU853/WyyQ==
   dependencies:
-    "@glimmer/util" "0.76.0"
+    "@glimmer/util" "0.77.1"
 
-"@glimmer/program@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.76.0.tgz#3ea7de6227ecd95fb6d5ab4a9a18465d26fb5fae"
-  integrity sha512-7c07eKiwipG1waeEyZv6PI2lB0XmyvjG86dAkZj8W2sYkCGcvfNU8qpqXMHfMPkox7efcshID6nSHBslLVBS8w==
+"@glimmer/program@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.1.tgz#9329640b0404021411c2e1c5d82016ebb5c12a0a"
+  integrity sha512-xTEnlsYMAyNQ6R8grtj2KA+nAQq9gvvOpxohSxDdrqzOtLFJGHLJ3lwUCq6gvw3IWz81t7G97encp7EA0rbT1A==
   dependencies:
-    "@glimmer/encoder" "0.76.0"
+    "@glimmer/encoder" "0.77.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/manager" "0.76.0"
-    "@glimmer/opcode-compiler" "0.76.0"
-    "@glimmer/util" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/manager" "0.77.1"
+    "@glimmer/opcode-compiler" "0.77.1"
+    "@glimmer/util" "0.77.1"
 
-"@glimmer/reference@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.76.0.tgz#c16fe4d027a3e84e8f3f80c6cd08564855cba9be"
-  integrity sha512-zdGs42sdD/0YU04vKYU+j7jqLeJyD/IfPULTPv35TOo/fCidvidNZqpF3AVQk4CnTViedDD0DZMUrtCSJ0hhjQ==
+"@glimmer/reference@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.1.tgz#2bf591a1766efb58361333fa66d30175c6090733"
+  integrity sha512-bqlO+kOzTLHs24OpPeJWk/D14TTJImntMxVDr9XWj4VLWlH3QRISPg6ArtrJdI30MBESXHdzScaAyv7c8rN6yA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.76.0"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/util" "0.76.0"
-    "@glimmer/validator" "0.76.0"
+    "@glimmer/global-context" "0.77.1"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/util" "0.77.1"
+    "@glimmer/validator" "0.77.1"
 
-"@glimmer/runtime@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.76.0.tgz#cef863f2d068d91acc6778d423569ac0365977b0"
-  integrity sha512-pc8U1/pezN5EHCDYHvSfPLQLCRgMG7V45dMuF7CTr2BuP/3XuZFQzQPCKDFzF1IZxy/FdXFO0paL+oWvfACRKA==
+"@glimmer/runtime@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.1.tgz#b499ad1f6c1fc555082af0da8d837ba79c82042d"
+  integrity sha512-UXQgLHI1cxAGV8i1oPrmCp9pMwLLIRyKJ0S0kgW8DDsRYrtUVyFmxP1vbfpfNgnxhAt/G5ZH2LG2pGePM+ZjHg==
   dependencies:
-    "@glimmer/destroyable" "0.76.0"
+    "@glimmer/destroyable" "0.77.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.76.0"
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/low-level" "0.76.0"
-    "@glimmer/owner" "0.76.0"
-    "@glimmer/program" "0.76.0"
-    "@glimmer/reference" "0.76.0"
-    "@glimmer/util" "0.76.0"
-    "@glimmer/validator" "0.76.0"
-    "@glimmer/vm" "0.76.0"
-    "@glimmer/wire-format" "0.76.0"
+    "@glimmer/global-context" "0.77.1"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/low-level" "0.77.1"
+    "@glimmer/owner" "0.77.1"
+    "@glimmer/program" "0.77.1"
+    "@glimmer/reference" "0.77.1"
+    "@glimmer/util" "0.77.1"
+    "@glimmer/validator" "0.77.1"
+    "@glimmer/vm" "0.77.1"
+    "@glimmer/wire-format" "0.77.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.76.0.tgz#18dd5c997b140f749a929fcedf323dbad2e20a12"
-  integrity sha512-ayURhGAFo9LMh0xm4KHs1TYSpCt0H37w7CSj3Oi8sgOCoiZWM716JaXhBdL/ew0IVZQIg4bJ5x+wfDmGZ+5jGA==
+"@glimmer/syntax@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.1.tgz#155109c2e62a3dc94cf0ae7ccf2e840fe8875c7c"
+  integrity sha512-Jbfr34s0D70OlXeGzHzzK0aTRoXR0KtC6klVw5IQQlxvJIrHlZuRDpIueByL5sxhyYh9KQc13lMcHXUFaIPEtA==
   dependencies:
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/util" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/util" "0.77.1"
     "@handlebars/parser" "^2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.76.0.tgz#fc2c5dafb6a45b3e30f48c39e79fc2a75ed6c916"
-  integrity sha512-afJ0WcztA2eo9uwBgKxRq6fNxiT+i/xKxYfWGc2Rr9tKiZr+zniiUHa5n44e+wQmwZi0BM0IbLdUsd5s4iEkfg==
+"@glimmer/util@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.1.tgz#9dfa721a3e3d06d7ec84488ef2e1a0107ea7cf3f"
+  integrity sha512-9BHDbmc/z7wzre+esFI+UPR2bx2Z+NYS5SxH10zgdYMDaN7qAQ63lIt+20AasQjC49JH4GxoPTettSknMQ6F1A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.76.0.tgz#127e4e0b61a545e25cd14928ec68d994428e66bb"
-  integrity sha512-orpvoqWxrMyMr2B/8I2S1YVU63Sdx0O0yLfYp/DrQxtlLZNujYOcVJBejR+X/uDfl7ryDBQOg/bY36iLhP/VcQ==
+"@glimmer/validator@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.1.tgz#8ff2c2e2ef67db5b6e6f2a13586852f1150b6ca9"
+  integrity sha512-iGaSkBdcWQRxoEd2XFTH8jieKZBMwztIPP1/Y4Y62nArj+gQJjJb59c6t9uiUKxwGMURLBsyMY3+rrzVfFB7xQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.76.0"
+    "@glimmer/global-context" "0.77.1"
 
-"@glimmer/vm-babel-plugins@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.76.0.tgz#e69afbb9ea62b31cba824147f23e7ba6f674e66e"
-  integrity sha512-arIbSbnVc274B6PFfvNH+gQDxHJmY8mdR1yJNXD3P0zRIzr6xw3lMvph5nV3V4t8KiE06+wAQ/HS7JI39+fuTQ==
+"@glimmer/vm-babel-plugins@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.1.tgz#80c8b5476ccff68191bc42ebb29928a9b8d22d69"
+  integrity sha512-amkBPV3H/3OhYIeXo03sU1VzqmUl8TUxHhjfVJwRy+vQV22S5saZCiUCyOYUsUkxdEG5sU8qooooBY8VomkkBg==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.76.0.tgz#84107bbe15ec14dae508bcda73cf1f2620c12186"
-  integrity sha512-TCfNXeYwVjWfKvwRXsyic6CmKIM80781/62kY4xy/6G7sVTVMkRV++nO0yVIa2RKGL+TFNM7dJFIuRMQzugCiA==
+"@glimmer/vm@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.1.tgz#a33776f6496d478e24a58771fa06b5ee7b6b39c3"
+  integrity sha512-H6XcYxwV1pBUXtOuGMiJ9px0smTvob38nIyio/XEHAZtl4+CshqmRwuGGNvvIuSpxVuCr9+TbrBMEGi4iazk7g==
   dependencies:
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/util" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/util" "0.77.1"
 
-"@glimmer/wire-format@0.76.0":
-  version "0.76.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.76.0.tgz#1092c1864255ffd85dc5f67d68ca73e660703e11"
-  integrity sha512-v+G1KHNpQ7xAVsp9N62PIcuE9Cjw5LWUw10+peiXDS/V3QoX4frwApY1j8VinmlnTYn69OekEU7LVCzu41gAsg==
+"@glimmer/wire-format@0.77.1":
+  version "0.77.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.1.tgz#f726314f6ef8868042b982ed85c8d5e3b7bbe08a"
+  integrity sha512-s85mr7n76c21HeV+r9xFpYCHmc3qFE2T8uu4acfIF+KNG8ZSDFg8cpGC5Mc51FoO5naMM56uH6ZzYohM7ubp4w==
   dependencies:
-    "@glimmer/interfaces" "0.76.0"
-    "@glimmer/util" "0.76.0"
+    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/util" "0.77.1"
 
 "@handlebars/parser@^2.0.0":
   version "2.0.0"

From 23efbe8db1c9146af80360a287b7c2ab37e6f5fe Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 18 Feb 2021 00:10:44 -0800
Subject: [PATCH 0377/1405] [INTERNAL] refactor <LinkTo> tests

* use async functions
* use native class syntax
* shortern the test names
* avoid `assert.expect`
* avoid soon-to-be-deprecated `@id` argument
---
 .../link-to/query-params-angle-test.js        |  669 +++---
 .../link-to/query-params-curly-test.js        |  818 +++----
 .../link-to/rendering-angle-test.js           |  112 +-
 .../link-to/rendering-curly-test.js           |  130 +-
 .../components/link-to/routing-angle-test.js  | 1394 ++++++------
 .../components/link-to/routing-curly-test.js  | 2022 +++++++++--------
 6 files changed, 2658 insertions(+), 2487 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 76f07edfdc5..ab8467d9007 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -25,30 +25,42 @@ moduleFor(
       );
     }
 
-    ['@test populates href with fully supplied query param values']() {
+    async ['@test it populates href with fully supplied query param values']() {
       this.addTemplate(
         'index',
         `<LinkTo @route='index' @query={{hash foo='456' bar='NAW'}}>Index</LinkTo>`
       );
 
-      return this.visit('/').then(() => {
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'a',
-          attrs: { href: '/?bar=NAW&foo=456' },
-          content: 'Index',
-        });
+      await this.visit('/');
+
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/?bar=NAW&foo=456' },
+        content: 'Index',
+      });
+    }
+
+    async ['@test it populates href with fully supplied query param values, but without @route param']() {
+      this.addTemplate('index', `<LinkTo @query={{hash foo='2' bar='NAW'}}>QueryParams</LinkTo>`);
+
+      await this.visit('/');
+
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/?bar=NAW&foo=2' },
+        content: 'QueryParams',
       });
     }
 
-    ['@test populates href with partially supplied query param values, but omits if value is default value']() {
+    async ['@test it populates href with partially supplied query param values, but omits if value is default value']() {
       this.addTemplate('index', `<LinkTo @route='index' @query={{hash foo='123'}}>Index</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'a',
-          attrs: { href: '/', class: classMatcher('ember-view active') },
-          content: 'Index',
-        });
+      await this.visit('/');
+
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/', class: classMatcher('ember-view active') },
+        content: 'Index',
       });
     }
   }
@@ -57,30 +69,34 @@ moduleFor(
 moduleFor(
   '<LinkTo /> component with query params (routing)',
   class extends ApplicationTestCase {
-    constructor() {
-      super();
+    constructor(...args) {
+      super(...args);
+
       let indexProperties = {
         foo: '123',
         bar: 'abc',
       };
+
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['foo', 'bar', 'abool'],
-          foo: indexProperties.foo,
-          bar: indexProperties.bar,
-          boundThing: 'OMG',
-          abool: true,
-        })
+        class extends Controller {
+          queryParams = ['foo', 'bar', 'abool'];
+          foo = indexProperties.foo;
+          bar = indexProperties.bar;
+          boundThing = 'OMG';
+          abool = true;
+        }
       );
+
       this.add(
         'controller:about',
-        Controller.extend({
-          queryParams: ['baz', 'bat'],
-          baz: 'alex',
-          bat: 'borf',
-        })
+        class extends Controller {
+          queryParams = ['baz', 'bat'];
+          baz = 'alex';
+          bat = 'borf';
+        }
       );
+
       this.indexProperties = indexProperties;
     }
 
@@ -105,22 +121,25 @@ moduleFor(
       );
     }
 
-    [`@test doesn't update controller QP properties on current route when invoked`](assert) {
+    async [`@test it doesn't update controller QP properties on current route when invoked`](
+      assert
+    ) {
       this.addTemplate('index', `<LinkTo id='the-link' @route='index'>Index</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          this.indexProperties,
-          'controller QP properties do not update'
-        );
-      });
+      await this.click('#the-link');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        this.indexProperties,
+        'controller QP properties do not update'
+      );
     }
 
-    [`@test doesn't update controller QP properties on current route when invoked (empty query-params obj)`](
+    async [`@test it doesn't update controller QP properties on current route when invoked (empty query-params obj)`](
       assert
     ) {
       this.addTemplate(
@@ -128,36 +147,38 @@ moduleFor(
         `<LinkTo id='the-link' @route='index' @query={{hash}}>Index</LinkTo>`
       );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          this.indexProperties,
-          'controller QP properties do not update'
-        );
-      });
+      await this.click('#the-link');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        this.indexProperties,
+        'controller QP properties do not update'
+      );
     }
 
-    [`@test doesn't update controller QP properties on current route when invoked (empty query-params obj, inferred route)`](
+    async [`@test it doesn't update controller QP properties on current route when invoked (empty query-params obj, inferred route)`](
       assert
     ) {
       this.addTemplate('index', `<LinkTo id='the-link' @query={{hash}}>Index</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          this.indexProperties,
-          'controller QP properties do not update'
-        );
-      });
+      await this.click('#the-link');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        this.indexProperties,
+        'controller QP properties do not update'
+      );
     }
 
-    ['@test updates controller QP properties on current route when invoked'](assert) {
+    async ['@test it updates controller QP properties on current route when invoked'](assert) {
       this.addTemplate(
         'index',
         `
@@ -167,19 +188,20 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
+
+      await this.click('#the-link');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          { foo: '456', bar: 'abc' },
-          'controller QP properties updated'
-        );
-      });
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        { foo: '456', bar: 'abc' },
+        'controller QP properties updated'
+      );
     }
 
-    ['@test updates controller QP properties on current route when invoked (inferred route)'](
+    async ['@test it updates controller QP properties on current route when invoked (inferred route)'](
       assert
     ) {
       this.addTemplate(
@@ -191,19 +213,20 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          { foo: '456', bar: 'abc' },
-          'controller QP properties updated'
-        );
-      });
+      await this.click('#the-link');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        { foo: '456', bar: 'abc' },
+        'controller QP properties updated'
+      );
     }
 
-    ['@test updates controller QP properties on other route after transitioning to that route'](
+    async ['@test it updates controller QP properties on other route after transitioning to that route'](
       assert
     ) {
       this.router.map(function () {
@@ -219,23 +242,24 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let theLink = this.$('#the-link');
-        assert.equal(theLink.attr('href'), '/about?baz=lol');
+      await this.visit('/');
+
+      let theLink = this.$('#the-link');
 
-        runTask(() => this.click('#the-link'));
+      assert.equal(theLink.attr('href'), '/about?baz=lol');
 
-        let aboutController = this.getController('about');
+      runTask(() => this.click('#the-link'));
 
-        assert.deepEqual(
-          aboutController.getProperties('baz', 'bat'),
-          { baz: 'lol', bat: 'borf' },
-          'about controller QP properties updated'
-        );
-      });
+      let aboutController = this.getController('about');
+
+      assert.deepEqual(
+        aboutController.getProperties('baz', 'bat'),
+        { baz: 'lol', bat: 'borf' },
+        'about controller QP properties updated'
+      );
     }
 
-    async ['@test generates proper href for `LinkTo` with no @route after transitioning to an error route GH#17963'](
+    async ['@test it generates proper href for `LinkTo` with no @route after transitioning to an error route [GH#17963]'](
       assert
     ) {
       this.router.map(function () {
@@ -244,18 +268,18 @@ moduleFor(
 
       this.add(
         'controller:application',
-        Controller.extend({
-          queryParams: ['baz'],
-        })
+        class extends Controller {
+          queryParams = ['baz'];
+        }
       );
 
       this.add(
         'route:bad',
-        Route.extend({
+        class extends Route {
           model() {
             throw new Error('bad!');
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate('error', `Error: {{@model.message}}`);
@@ -304,7 +328,7 @@ moduleFor(
       );
     }
 
-    ['@test supplied QP properties can be bound'](assert) {
+    async ['@test supplied QP properties can be bound'](assert) {
       this.addTemplate(
         'index',
         `
@@ -314,19 +338,19 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let indexController = this.getController('index');
-        let theLink = this.$('#the-link');
+      await this.visit('/');
+
+      let indexController = this.getController('index');
+      let theLink = this.$('#the-link');
 
-        assert.equal(theLink.attr('href'), '/?foo=OMG');
+      assert.equal(theLink.attr('href'), '/?foo=OMG');
 
-        runTask(() => indexController.set('boundThing', 'ASL'));
+      runTask(() => indexController.set('boundThing', 'ASL'));
 
-        assert.equal(theLink.attr('href'), '/?foo=ASL');
-      });
+      assert.equal(theLink.attr('href'), '/?foo=ASL');
     }
 
-    ['@test supplied QP properties can be bound (booleans)'](assert) {
+    async ['@test supplied QP properties can be bound (booleans)'](assert) {
       this.addTemplate(
         'index',
         `
@@ -336,25 +360,26 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let indexController = this.getController('index');
-        let theLink = this.$('#the-link');
+      await this.visit('/');
 
-        assert.equal(theLink.attr('href'), '/?abool=OMG');
+      let indexController = this.getController('index');
+      let theLink = this.$('#the-link');
 
-        runTask(() => indexController.set('boundThing', false));
+      assert.equal(theLink.attr('href'), '/?abool=OMG');
 
-        assert.equal(theLink.attr('href'), '/?abool=false');
+      runTask(() => indexController.set('boundThing', false));
 
-        this.click('#the-link');
+      assert.equal(theLink.attr('href'), '/?abool=false');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar', 'abool'),
-          { foo: '123', bar: 'abc', abool: false },
-          'bound bool QP properties update'
-        );
-      });
+      await this.click('#the-link');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar', 'abool'),
+        { foo: '123', bar: 'abc', abool: false },
+        'bound bool QP properties update'
+      );
     }
+
     async ['@test href updates when unsupplied controller QP props change'](assert) {
       this.addTemplate(
         'index',
@@ -372,21 +397,20 @@ moduleFor(
 
       assert.equal(theLink.attr('href'), '/?foo=lol');
 
-      indexController.set('bar', 'BORF');
+      runTask(() => indexController.set('bar', 'BORF'));
       await runLoopSettled();
 
       assert.equal(theLink.attr('href'), '/?bar=BORF&foo=lol');
 
-      indexController.set('foo', 'YEAH');
+      runTask(() => indexController.set('foo', 'YEAH'));
       await runLoopSettled();
 
       assert.equal(theLink.attr('href'), '/?bar=BORF&foo=lol');
     }
 
-    ['@test The <LinkTo /> component with only query params always transitions to the current route with the query params applied'](
+    async ['@test [GH#12033] with only query params, it always transitions to the current route with the query params applied'](
       assert
     ) {
-      // Test harness for bug #12033
       this.addTemplate(
         'cars',
         `
@@ -409,35 +433,33 @@ moduleFor(
 
       this.add(
         'controller:cars',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+        }
       );
 
-      return this.visit('/cars/create').then(() => {
-        let router = this.appRouter;
-        let carsController = this.getController('cars');
+      await this.visit('/cars/create');
 
-        assert.equal(router.currentRouteName, 'cars.create');
+      let router = this.appRouter;
+      let carsController = this.getController('cars');
 
-        runTask(() => this.click('#close-link'));
+      assert.equal(router.currentRouteName, 'cars.create');
 
-        assert.equal(router.currentRouteName, 'cars.index');
-        assert.equal(router.get('url'), '/cars');
-        assert.equal(carsController.get('page'), 1, 'The page query-param is 1');
+      runTask(() => this.click('#close-link'));
 
-        runTask(() => this.click('#page2-link'));
+      assert.equal(router.currentRouteName, 'cars.index');
+      assert.equal(router.get('url'), '/cars');
+      assert.equal(carsController.get('page'), 1, 'The page query-param is 1');
 
-        assert.equal(router.currentRouteName, 'cars.index', 'The active route is still cars');
-        assert.equal(router.get('url'), '/cars?page=2', 'The url has been updated');
-        assert.equal(carsController.get('page'), 2, 'The query params have been updated');
-      });
+      runTask(() => this.click('#page2-link'));
+
+      assert.equal(router.currentRouteName, 'cars.index', 'The active route is still cars');
+      assert.equal(router.get('url'), '/cars?page=2', 'The url has been updated');
+      assert.equal(carsController.get('page'), 2, 'The query params have been updated');
     }
 
-    ['@test the <LinkTo /> component applies activeClass when query params are not changed'](
-      assert
-    ) {
+    async ['@test it applies activeClass when query params are not changed'](assert) {
       this.addTemplate(
         'index',
         `
@@ -482,68 +504,62 @@ moduleFor(
 
       this.add(
         'controller:search',
-        Controller.extend({
-          queryParams: ['search', 'archive'],
-          search: '',
-          archive: false,
-        })
+        class extends Controller {
+          queryParams = ['search', 'archive'];
+          search = '';
+          archive = false;
+        }
       );
 
       this.add(
         'controller:search.results',
-        Controller.extend({
-          queryParams: ['sort', 'showDetails'],
-          sort: 'title',
-          showDetails: true,
-        })
+        class extends Controller {
+          queryParams = ['sort', 'showDetails'];
+          sort = 'title';
+          showDetails = true;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#cat-link');
-          this.shouldNotBeActive(assert, '#dog-link');
+      await this.visit('/');
 
-          return this.visit('/?foo=cat');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#cat-link');
-          this.shouldNotBeActive(assert, '#dog-link');
+      this.shouldNotBeActive(assert, '#cat-link');
+      this.shouldNotBeActive(assert, '#dog-link');
 
-          return this.visit('/?foo=dog');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#dog-link');
-          this.shouldNotBeActive(assert, '#cat-link');
-          this.shouldBeActive(assert, '#change-nothing');
+      await this.visit('/?foo=cat');
 
-          return this.visit('/search?search=same');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#same-search');
-          this.shouldNotBeActive(assert, '#change-search');
-          this.shouldNotBeActive(assert, '#same-search-add-archive');
-          this.shouldNotBeActive(assert, '#only-add-archive');
-          this.shouldNotBeActive(assert, '#remove-one');
-
-          return this.visit('/search?search=same&archive=true');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#both-same');
-          this.shouldNotBeActive(assert, '#change-one');
+      this.shouldBeActive(assert, '#cat-link');
+      this.shouldNotBeActive(assert, '#dog-link');
 
-          return this.visit('/search/results?search=same&sort=title&showDetails=true');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#same-sort-child-only');
-          this.shouldBeActive(assert, '#same-search-parent-only');
-          this.shouldNotBeActive(assert, '#change-search-parent-only');
-          this.shouldBeActive(assert, '#same-search-same-sort-child-and-parent');
-          this.shouldNotBeActive(assert, '#same-search-different-sort-child-and-parent');
-          this.shouldNotBeActive(assert, '#change-search-same-sort-child-and-parent');
-        });
+      await this.visit('/?foo=dog');
+
+      this.shouldBeActive(assert, '#dog-link');
+      this.shouldNotBeActive(assert, '#cat-link');
+      this.shouldBeActive(assert, '#change-nothing');
+
+      await this.visit('/search?search=same');
+
+      this.shouldBeActive(assert, '#same-search');
+      this.shouldNotBeActive(assert, '#change-search');
+      this.shouldNotBeActive(assert, '#same-search-add-archive');
+      this.shouldNotBeActive(assert, '#only-add-archive');
+      this.shouldNotBeActive(assert, '#remove-one');
+
+      await this.visit('/search?search=same&archive=true');
+
+      this.shouldBeActive(assert, '#both-same');
+      this.shouldNotBeActive(assert, '#change-one');
+
+      await this.visit('/search/results?search=same&sort=title&showDetails=true');
+
+      this.shouldBeActive(assert, '#same-sort-child-only');
+      this.shouldBeActive(assert, '#same-search-parent-only');
+      this.shouldNotBeActive(assert, '#change-search-parent-only');
+      this.shouldBeActive(assert, '#same-search-same-sort-child-and-parent');
+      this.shouldNotBeActive(assert, '#same-search-different-sort-child-and-parent');
+      this.shouldNotBeActive(assert, '#change-search-same-sort-child-and-parent');
     }
 
-    ['@test the <LinkTo /> component applies active class when query-param is a number'](assert) {
+    async ['@test it applies active class when query-param is a number'](assert) {
       this.addTemplate(
         'index',
         `
@@ -555,24 +571,23 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-          pageNumber: 5,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+          pageNumber = 5;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#page-link');
-          return this.visit('/?page=5');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#page-link');
-        });
+      await this.visit('/');
+
+      this.shouldNotBeActive(assert, '#page-link');
+
+      await this.visit('/?page=5');
+
+      this.shouldBeActive(assert, '#page-link');
     }
 
-    ['@test the <LinkTo /> component applies active class when query-param is an array'](assert) {
+    async ['@test it applies active class when query-param is an array'](assert) {
       this.addTemplate(
         'index',
         `
@@ -584,42 +599,39 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['pages'],
-          pages: [],
-          pagesArray: [1, 2],
-          biggerArray: [1, 2, 3],
-          emptyArray: [],
-        })
+        class extends Controller {
+          queryParams = ['pages'];
+          pages = [];
+          pagesArray = [1, 2];
+          biggerArray = [1, 2, 3];
+          emptyArray = [];
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#array-link');
+      await this.visit('/');
 
-          return this.visit('/?pages=%5B1%2C2%5D');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#array-link');
-          this.shouldNotBeActive(assert, '#bigger-link');
-          this.shouldNotBeActive(assert, '#empty-link');
+      this.shouldNotBeActive(assert, '#array-link');
 
-          return this.visit('/?pages=%5B2%2C1%5D');
-        })
-        .then(() => {
-          this.shouldNotBeActive(assert, '#array-link');
-          this.shouldNotBeActive(assert, '#bigger-link');
-          this.shouldNotBeActive(assert, '#empty-link');
+      await this.visit('/?pages=%5B1%2C2%5D');
 
-          return this.visit('/?pages=%5B1%2C2%2C3%5D');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#bigger-link');
-          this.shouldNotBeActive(assert, '#array-link');
-          this.shouldNotBeActive(assert, '#empty-link');
-        });
+      this.shouldBeActive(assert, '#array-link');
+      this.shouldNotBeActive(assert, '#bigger-link');
+      this.shouldNotBeActive(assert, '#empty-link');
+
+      await this.visit('/?pages=%5B2%2C1%5D');
+
+      this.shouldNotBeActive(assert, '#array-link');
+      this.shouldNotBeActive(assert, '#bigger-link');
+      this.shouldNotBeActive(assert, '#empty-link');
+
+      await this.visit('/?pages=%5B1%2C2%2C3%5D');
+
+      this.shouldBeActive(assert, '#bigger-link');
+      this.shouldNotBeActive(assert, '#array-link');
+      this.shouldNotBeActive(assert, '#empty-link');
     }
-    ['@test the <LinkTo /> component applies active class to the parent route'](assert) {
+
+    async ['@test it applies active class to the parent route'](assert) {
       this.router.map(function () {
         this.route('parent', function () {
           this.route('child');
@@ -638,26 +650,25 @@ moduleFor(
 
       this.add(
         'controller:parent.child',
-        Controller.extend({
-          queryParams: ['foo'],
-          foo: 'bar',
-        })
+        class extends Controller {
+          queryParams = ['foo'];
+          foo = 'bar';
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#parent-link');
-          this.shouldNotBeActive(assert, '#parent-child-link');
-          this.shouldNotBeActive(assert, '#parent-link-qp');
-          return this.visit('/parent/child?foo=dog');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#parent-link');
-          this.shouldNotBeActive(assert, '#parent-link-qp');
-        });
+      await this.visit('/');
+
+      this.shouldNotBeActive(assert, '#parent-link');
+      this.shouldNotBeActive(assert, '#parent-child-link');
+      this.shouldNotBeActive(assert, '#parent-link-qp');
+
+      await this.visit('/parent/child?foo=dog');
+
+      this.shouldBeActive(assert, '#parent-link');
+      this.shouldNotBeActive(assert, '#parent-link-qp');
     }
 
-    async ['@test The <LinkTo /> component disregards query-params in activeness computation when current-when is specified'](
+    async ['@test it disregards query-params in activeness computation when current-when is specified'](
       assert
     ) {
       let appLink;
@@ -688,10 +699,10 @@ moduleFor(
 
       this.add(
         'controller:parent',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+        }
       );
 
       await this.visit('/');
@@ -715,22 +726,19 @@ moduleFor(
 
       assert.equal(parentController.get('page'), 2);
 
-      parentController.set('page', 3);
+      runTask(() => parentController.set('page', 3));
       await runLoopSettled();
 
       assert.equal(router.get('location.path'), '/parent?page=3');
       this.shouldBeActive(assert, '#app-link');
       this.shouldBeActive(assert, '#parent-link');
 
-      this.click('#app-link');
-      await runLoopSettled();
+      await this.click('#app-link');
 
       assert.equal(router.get('location.path'), '/parent');
     }
 
-    ['@test the <LinkTo /> component default query params while in active transition regression test'](
-      assert
-    ) {
+    async ['@test it defaults query params while in active transition regression test'](assert) {
       this.router.map(function () {
         this.route('foos');
         this.route('bars');
@@ -750,66 +758,109 @@ moduleFor(
 
       this.add(
         'controller:foos',
-        Controller.extend({
-          queryParams: ['status'],
-          baz: false,
-        })
+        class extends Controller {
+          queryParams = ['status'];
+          baz = false;
+        }
       );
 
       this.add(
         'route:foos',
-        Route.extend({
+        class extends Route {
           model() {
             return foos.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'controller:bars',
-        Controller.extend({
-          queryParams: ['status'],
-          quux: false,
-        })
+        class extends Controller {
+          queryParams = ['status'];
+          quux = false;
+        }
       );
 
       this.add(
         'route:bars',
-        Route.extend({
+        class extends Route {
           model() {
             return bars.promise;
-          },
-        })
+          }
+        }
       );
 
-      return this.visit('/').then(() => {
-        let router = this.appRouter;
-        let foosLink = this.$('#foos-link');
-        let barsLink = this.$('#bars-link');
-        let bazLink = this.$('#baz-foos-link');
+      await this.visit('/');
 
-        assert.equal(foosLink.attr('href'), '/foos');
-        assert.equal(bazLink.attr('href'), '/foos?baz=true');
-        assert.equal(barsLink.attr('href'), '/bars?quux=true');
-        assert.equal(router.get('location.path'), '/');
-        this.shouldNotBeActive(assert, '#foos-link');
-        this.shouldNotBeActive(assert, '#baz-foos-link');
-        this.shouldNotBeActive(assert, '#bars-link');
+      let router = this.appRouter;
+      let foosLink = this.$('#foos-link');
+      let barsLink = this.$('#bars-link');
+      let bazLink = this.$('#baz-foos-link');
 
-        runTask(() => barsLink.click());
-        this.shouldNotBeActive(assert, '#bars-link');
+      assert.equal(foosLink.attr('href'), '/foos');
+      assert.equal(bazLink.attr('href'), '/foos?baz=true');
+      assert.equal(barsLink.attr('href'), '/bars?quux=true');
+      assert.equal(router.get('location.path'), '/');
+      this.shouldNotBeActive(assert, '#foos-link');
+      this.shouldNotBeActive(assert, '#baz-foos-link');
+      this.shouldNotBeActive(assert, '#bars-link');
 
-        runTask(() => foosLink.click());
-        this.shouldNotBeActive(assert, '#foos-link');
+      runTask(() => barsLink.click());
+      this.shouldNotBeActive(assert, '#bars-link');
 
-        runTask(() => foos.resolve());
+      runTask(() => foosLink.click());
+      this.shouldNotBeActive(assert, '#foos-link');
 
-        assert.equal(router.get('location.path'), '/foos');
-        this.shouldBeActive(assert, '#foos-link');
-      });
+      runTask(() => foos.resolve());
+
+      assert.equal(router.get('location.path'), '/foos');
+      this.shouldBeActive(assert, '#foos-link');
     }
 
-    ['@test the <LinkTo /> component with dynamic segment and loading route should preserve query parameters'](
+    async ['@test it does not throw an error if called without a @route argument, but with a @query argument'](
+      assert
+    ) {
+      this.addTemplate(
+        'index',
+        `
+        <LinkTo @query={{hash page=this.pageNumber}} id="page-link">
+          Index
+        </LinkTo>
+        `
+      );
+
+      this.add(
+        'route:index',
+        class extends Route {
+          model() {
+            return [
+              { id: 'yehuda', name: 'Yehuda Katz' },
+              { id: 'tom', name: 'Tom Dale' },
+              { id: 'erik', name: 'Erik Brynroflsson' },
+            ];
+          }
+        }
+      );
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+          pageNumber = 5;
+        }
+      );
+
+      await this.visit('/');
+
+      this.shouldNotBeActive(assert, '#page-link');
+
+      await this.visit('/?page=5');
+
+      this.shouldBeActive(assert, '#page-link');
+    }
+
+    async ['@test with dynamic segment and loading route, it should preserve query parameters'](
       assert
     ) {
       this.router.map(function () {
@@ -826,27 +877,27 @@ moduleFor(
 
       this.add(
         'controller:foo.bar',
-        Controller.extend({
-          queryParams: ['qux'],
-          qux: null,
-        })
+        class extends Controller {
+          queryParams = ['qux'];
+          qux = null;
+        }
       );
 
       this.add(
         'route:foo.bar.baz',
-        Route.extend({
+        class extends Route {
           model() {
             return new RSVP.Promise((resolve) => {
               setTimeout(resolve, 1);
             });
-          },
-        })
+          }
+        }
       );
 
-      return this.visit('/foo/bar/baz?qux=abc').then(() => {
-        let bazLink = this.$('#baz-link');
-        assert.equal(bazLink.attr('href'), '/foo/bar/baz?qux=abc');
-      });
+      await this.visit('/foo/bar/baz?qux=abc');
+
+      let bazLink = this.$('#baz-link');
+      assert.equal(bazLink.attr('href'), '/foo/bar/baz?qux=abc');
     }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index cbb84437ebd..605a8c51c7e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -26,37 +26,37 @@ moduleFor(
       );
     }
 
-    ['@test populates href with fully supplied query param values']() {
+    async ['@test populates href with fully supplied query param values']() {
       this.addTemplate(
         'index',
         `{{#link-to route='index' query=(hash foo='456' bar='NAW')}}Index{{/link-to}}`
       );
 
-      return this.visit('/').then(() => {
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'a',
-          attrs: { href: '/?bar=NAW&foo=456' },
-          content: 'Index',
-        });
+      await this.visit('/');
+
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/?bar=NAW&foo=456' },
+        content: 'Index',
       });
     }
 
-    ['@test populates href with fully supplied query param values, but without @route param']() {
+    async ['@test it populates href with fully supplied query param values, but without @route param']() {
       this.addTemplate(
         'index',
         `{{#link-to query=(hash foo='2' bar='NAW')}}QueryParams{{/link-to}}`
       );
 
-      return this.visit('/').then(() => {
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'a',
-          attrs: { href: '/?bar=NAW&foo=2' },
-          content: 'QueryParams',
-        });
+      await this.visit('/');
+
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/?bar=NAW&foo=2' },
+        content: 'QueryParams',
       });
     }
 
-    ['@test populates href with partially supplied query param values, but omits if value is default value']() {
+    async ['@test populates href with partially supplied query param values, but omits if value is default value']() {
       this.addTemplate(
         'index',
         `{{#link-to route='index' query=(hash foo='123')}}Index{{/link-to}}`
@@ -88,6 +88,7 @@ moduleFor(
         () => this.visit('/'),
         /The `query-params` helper is deprecated/
       );
+
       this.assertComponentElement(this.firstChild, {
         tagName: 'a',
         attrs: { href: '/?alon=BUKAI&foo=456', class: classMatcher('ember-view') },
@@ -100,30 +101,34 @@ moduleFor(
 moduleFor(
   '{{link-to}} component with query params (routing)',
   class extends ApplicationTestCase {
-    constructor() {
-      super(...arguments);
+    constructor(...args) {
+      super(...args);
+
       let indexProperties = {
         foo: '123',
         bar: 'abc',
       };
+
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['foo', 'bar', 'abool'],
-          foo: indexProperties.foo,
-          bar: indexProperties.bar,
-          boundThing: 'OMG',
-          abool: true,
-        })
+        class extends Controller {
+          queryParams = ['foo', 'bar', 'abool'];
+          foo = indexProperties.foo;
+          bar = indexProperties.bar;
+          boundThing = 'OMG';
+          abool = true;
+        }
       );
+
       this.add(
         'controller:about',
-        Controller.extend({
-          queryParams: ['baz', 'bat'],
-          baz: 'alex',
-          bat: 'borf',
-        })
+        class extends Controller {
+          queryParams = ['baz', 'bat'];
+          baz = 'alex';
+          bat = 'borf';
+        }
       );
+
       this.indexProperties = indexProperties;
     }
 
@@ -148,105 +153,122 @@ moduleFor(
       );
     }
 
-    [`@test doesn't update controller QP properties on current route when invoked`](assert) {
-      this.addTemplate('index', `{{#link-to route='index' id='the-link'}}Index{{/link-to}}`);
+    async [`@test it doesn't update controller QP properties on current route when invoked`](
+      assert
+    ) {
+      this.addTemplate(
+        'index',
+        `<div id='the-link'>{{#link-to route='index'}}Index{{/link-to}}</div>`
+      );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          this.indexProperties,
-          'controller QP properties do not update'
-        );
-      });
+      await this.click('#the-link > a');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        this.indexProperties,
+        'controller QP properties do not update'
+      );
     }
 
-    [`@test doesn't update controller QP properties on current route when invoked (empty query-params obj)`](
+    async [`@test doesn't update controller QP properties on current route when invoked (empty query-params obj)`](
       assert
     ) {
       this.addTemplate(
         'index',
-        `{{#link-to route='index' query=(hash) id='the-link'}}Index{{/link-to}}`
+        `<div id='the-link'>{{#link-to route='index' query=(hash)}}Index{{/link-to}}</div>`
       );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          this.indexProperties,
-          'controller QP properties do not update'
-        );
-      });
+      await this.click('#the-link > a');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        this.indexProperties,
+        'controller QP properties do not update'
+      );
     }
 
-    [`@test doesn't update controller QP properties on current route when invoked (empty query-params obj, inferred route)`](
+    async [`@test it doesn't update controller QP properties on current route when invoked (empty query-params obj, inferred route)`](
       assert
     ) {
-      this.addTemplate('index', `{{#link-to query=(hash) id='the-link'}}Index{{/link-to}}`);
+      this.addTemplate(
+        'index',
+        `<div id='the-link'>{{#link-to query=(hash)}}Index{{/link-to}}</div>`
+      );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          this.indexProperties,
-          'controller QP properties do not update'
-        );
-      });
+      await this.click('#the-link > a');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        this.indexProperties,
+        'controller QP properties do not update'
+      );
     }
 
-    ['@test updates controller QP properties on current route when invoked'](assert) {
+    async ['@test it updates controller QP properties on current route when invoked'](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to route='index' query=(hash foo='456') id="the-link"}}
-          Index
-        {{/link-to}}
+        <div id="the-link">
+          {{#link-to route='index' query=(hash foo='456')}}
+            Index
+          {{/link-to}}
+        </div>
         `
       );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          { foo: '456', bar: 'abc' },
-          'controller QP properties updated'
-        );
-      });
+      await this.click('#the-link > a');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        { foo: '456', bar: 'abc' },
+        'controller QP properties updated'
+      );
     }
 
-    ['@test updates controller QP properties on current route when invoked (inferred route)'](
+    async ['@test it updates controller QP properties on current route when invoked (inferred route)'](
       assert
     ) {
       this.addTemplate(
         'index',
         `
-        {{#link-to query=(hash foo='456') id="the-link"}}
-          Index
-        {{/link-to}}
+        <div id="the-link">
+          {{#link-to query=(hash foo='456')}}
+            Index
+          {{/link-to}}
+        </div>
         `
       );
 
-      return this.visit('/').then(() => {
-        this.click('#the-link');
-        let indexController = this.getController('index');
+      await this.visit('/');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar'),
-          { foo: '456', bar: 'abc' },
-          'controller QP properties updated'
-        );
-      });
+      await this.click('#the-link > a');
+
+      let indexController = this.getController('index');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar'),
+        { foo: '456', bar: 'abc' },
+        'controller QP properties updated'
+      );
     }
 
-    ['@test updates controller QP properties on other route after transitioning to that route'](
+    async ['@test it updates controller QP properties on other route after transitioning to that route'](
       assert
     ) {
       this.router.map(function () {
@@ -256,116 +278,124 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to route='about' query=(hash baz='lol') id='the-link'}}
-          About
-        {{/link-to}}
+        <div id='the-link'>
+          {{#link-to route='about' query=(hash baz='lol')}}
+            About
+          {{/link-to}}
+        </div>
         `
       );
 
-      return this.visit('/').then(() => {
-        let theLink = this.$('#the-link');
-        assert.equal(theLink.attr('href'), '/about?baz=lol');
+      await this.visit('/');
 
-        runTask(() => this.click('#the-link'));
+      let theLink = this.$('#the-link > a');
 
-        let aboutController = this.getController('about');
+      assert.equal(theLink.attr('href'), '/about?baz=lol');
 
-        assert.deepEqual(
-          aboutController.getProperties('baz', 'bat'),
-          { baz: 'lol', bat: 'borf' },
-          'about controller QP properties updated'
-        );
-      });
+      runTask(() => this.click('#the-link > a'));
+
+      let aboutController = this.getController('about');
+
+      assert.deepEqual(
+        aboutController.getProperties('baz', 'bat'),
+        { baz: 'lol', bat: 'borf' },
+        'about controller QP properties updated'
+      );
     }
 
-    ['@test supplied QP properties can be bound'](assert) {
+    async ['@test supplied QP properties can be bound'](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to query=(hash foo=this.boundThing) id='the-link'}}Index{{/link-to}}`
+        `<div id='the-link'>{{#link-to query=(hash foo=this.boundThing)}}Index{{/link-to}}</div>`
       );
 
-      return this.visit('/').then(() => {
-        let indexController = this.getController('index');
-        let theLink = this.$('#the-link');
+      await this.visit('/');
 
-        assert.equal(theLink.attr('href'), '/?foo=OMG');
+      let indexController = this.getController('index');
+      let theLink = this.$('#the-link > a');
 
-        runTask(() => indexController.set('boundThing', 'ASL'));
+      assert.equal(theLink.attr('href'), '/?foo=OMG');
 
-        assert.equal(theLink.attr('href'), '/?foo=ASL');
-      });
+      runTask(() => indexController.set('boundThing', 'ASL'));
+
+      assert.equal(theLink.attr('href'), '/?foo=ASL');
     }
 
-    ['@test supplied QP properties can be bound (booleans)'](assert) {
+    async ['@test supplied QP properties can be bound (booleans)'](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to query=(hash abool=this.boundThing) id='the-link'}}
-          Index
-        {{/link-to}}
+        <div id='the-link'>
+          {{#link-to query=(hash abool=this.boundThing)}}
+            Index
+          {{/link-to}}
+        </div>
         `
       );
 
-      return this.visit('/').then(() => {
-        let indexController = this.getController('index');
-        let theLink = this.$('#the-link');
+      await this.visit('/');
 
-        assert.equal(theLink.attr('href'), '/?abool=OMG');
+      let indexController = this.getController('index');
+      let theLink = this.$('#the-link > a');
 
-        runTask(() => indexController.set('boundThing', false));
+      assert.equal(theLink.attr('href'), '/?abool=OMG');
 
-        assert.equal(theLink.attr('href'), '/?abool=false');
+      runTask(() => indexController.set('boundThing', false));
 
-        this.click('#the-link');
+      assert.equal(theLink.attr('href'), '/?abool=false');
 
-        assert.deepEqual(
-          indexController.getProperties('foo', 'bar', 'abool'),
-          { foo: '123', bar: 'abc', abool: false },
-          'bound bool QP properties update'
-        );
-      });
+      await this.click('#the-link > a');
+
+      assert.deepEqual(
+        indexController.getProperties('foo', 'bar', 'abool'),
+        { foo: '123', bar: 'abc', abool: false },
+        'bound bool QP properties update'
+      );
     }
 
     async ['@test href updates when unsupplied controller QP props change'](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to query=(hash foo='lol') id='the-link'}}Index{{/link-to}}`
+        `
+        <div id='the-link'>
+          {{#link-to query=(hash foo='lol')}}Index{{/link-to}}
+        </div>
+        `
       );
 
       await this.visit('/');
 
       let indexController = this.getController('index');
-      let theLink = this.$('#the-link');
+      let theLink = this.$('#the-link > a');
 
       assert.equal(theLink.attr('href'), '/?foo=lol');
 
-      indexController.set('bar', 'BORF');
+      runTask(() => indexController.set('bar', 'BORF'));
       await runLoopSettled();
 
       assert.equal(theLink.attr('href'), '/?bar=BORF&foo=lol');
 
-      indexController.set('foo', 'YEAH');
+      runTask(() => indexController.set('foo', 'YEAH'));
       await runLoopSettled();
 
       assert.equal(theLink.attr('href'), '/?bar=BORF&foo=lol');
     }
 
-    ['@test The {{link-to}} with only query params always transitions to the current route with the query params applied'](
+    async ['@test [GH#12033] with only query params, it always transitions to the current route with the query params applied'](
       assert
     ) {
-      // Test harness for bug #12033
       this.addTemplate(
         'cars',
         `
-        {{#link-to route='cars.create' id='create-link'}}Create new car{{/link-to}}
-        {{#link-to query=(hash page='2') id='page2-link'}}Page 2{{/link-to}}
+        <div id='create-link'>{{#link-to route='cars.create'}}Create new car{{/link-to}}</div>
+        <div id='page2-link'>{{#link-to query=(hash page='2')}}Page 2{{/link-to}}</div>
         {{outlet}}
         `
       );
 
       this.addTemplate(
         'cars.create',
-        `{{#link-to route='cars' id='close-link'}}Close create form{{/link-to}}`
+        `<div id='close-link'>{{#link-to route='cars'}}Close create form{{/link-to}}</div>`
       );
 
       this.router.map(function () {
@@ -376,52 +406,52 @@ moduleFor(
 
       this.add(
         'controller:cars',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+        }
       );
 
-      return this.visit('/cars/create').then(() => {
-        let router = this.appRouter;
-        let carsController = this.getController('cars');
+      await this.visit('/cars/create');
 
-        assert.equal(router.currentRouteName, 'cars.create');
+      let router = this.appRouter;
+      let carsController = this.getController('cars');
 
-        runTask(() => this.click('#close-link'));
+      assert.equal(router.currentRouteName, 'cars.create');
 
-        assert.equal(router.currentRouteName, 'cars.index');
-        assert.equal(router.get('url'), '/cars');
-        assert.equal(carsController.get('page'), 1, 'The page query-param is 1');
+      runTask(() => this.click('#close-link > a'));
 
-        runTask(() => this.click('#page2-link'));
+      assert.equal(router.currentRouteName, 'cars.index');
+      assert.equal(router.get('url'), '/cars');
+      assert.equal(carsController.get('page'), 1, 'The page query-param is 1');
 
-        assert.equal(router.currentRouteName, 'cars.index', 'The active route is still cars');
-        assert.equal(router.get('url'), '/cars?page=2', 'The url has been updated');
-        assert.equal(carsController.get('page'), 2, 'The query params have been updated');
-      });
+      runTask(() => this.click('#page2-link > a'));
+
+      assert.equal(router.currentRouteName, 'cars.index', 'The active route is still cars');
+      assert.equal(router.get('url'), '/cars?page=2', 'The url has been updated');
+      assert.equal(carsController.get('page'), 2, 'The query params have been updated');
     }
 
-    ['@test the {{link-to}} applies activeClass when query params are not changed'](assert) {
+    async ['@test it applies activeClass when query params are not changed'](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to query=(hash foo='cat') id='cat-link'}}Index{{/link-to}}
-        {{#link-to query=(hash foo='dog') id='dog-link'}}Index{{/link-to}}
-        {{#link-to route='index' id='change-nothing'}}Index{{/link-to}}
+        <div id='cat-link'>{{#link-to query=(hash foo='cat')}}Index{{/link-to}}</div>
+        <div id='dog-link'>{{#link-to query=(hash foo='dog')}}Index{{/link-to}}</div>
+        <div id='change-nothing'>{{#link-to route='index'}}Index{{/link-to}}</div>
         `
       );
 
       this.addTemplate(
         'search',
         `
-        {{#link-to query=(hash search='same') id='same-search'}}Index{{/link-to}}
-        {{#link-to query=(hash search='change') id='change-search'}}Index{{/link-to}}
-        {{#link-to query=(hash search='same' archive=true) id='same-search-add-archive'}}Index{{/link-to}}
-        {{#link-to query=(hash archive=true) id='only-add-archive'}}Index{{/link-to}}
-        {{#link-to query=(hash search='same' archive=true) id='both-same'}}Index{{/link-to}}
-        {{#link-to query=(hash search='different' archive=true) id='change-one'}}Index{{/link-to}}
-        {{#link-to query=(hash search='different' archive=false) id='remove-one'}}Index{{/link-to}}
+        <div id='same-search'>{{#link-to query=(hash search='same')}}Index{{/link-to}}</div>
+        <div id='change-search'>{{#link-to query=(hash search='change')}}Index{{/link-to}}</div>
+        <div id='same-search-add-archive'>{{#link-to query=(hash search='same' archive=true)}}Index{{/link-to}}</div>
+        <div id='only-add-archive'>{{#link-to query=(hash archive=true)}}Index{{/link-to}}</div>
+        <div id='both-same'>{{#link-to query=(hash search='same' archive=true)}}Index{{/link-to}}</div>
+        <div id='change-one'>{{#link-to query=(hash search='different' archive=true)}}Index{{/link-to}}</div>
+        <div id='remove-one'>{{#link-to query=(hash search='different' archive=false)}}Index{{/link-to}}</div>
         {{outlet}}
         `
       );
@@ -429,13 +459,13 @@ moduleFor(
       this.addTemplate(
         'search.results',
         `
-        {{#link-to query=(hash sort='title') id='same-sort-child-only'}}Index{{/link-to}}
-        {{#link-to query=(hash search='same') id='same-search-parent-only'}}Index{{/link-to}}
-        {{#link-to query=(hash search='change') id='change-search-parent-only'}}Index{{/link-to}}
-        {{#link-to query=(hash search='same' sort='title') id='same-search-same-sort-child-and-parent'}}Index{{/link-to}}
-        {{#link-to query=(hash search='same' sort='author') id='same-search-different-sort-child-and-parent'}}Index{{/link-to}}
-        {{#link-to query=(hash search='change' sort='title') id='change-search-same-sort-child-and-parent'}}Index{{/link-to}}
-        {{#link-to query=(hash foo='dog') id='dog-link'}}Index{{/link-to}}
+        <div id='same-sort-child-only'>{{#link-to query=(hash sort='title')}}Index{{/link-to}}</div>
+        <div id='same-search-parent-only'>{{#link-to query=(hash search='same')}}Index{{/link-to}}</div>
+        <div id='change-search-parent-only'>{{#link-to query=(hash search='change')}}Index{{/link-to}}</div>
+        <div id='same-search-same-sort-child-and-parent'>{{#link-to query=(hash search='same' sort='title')}}Index{{/link-to}}</div>
+        <div id='same-search-different-sort-child-and-parent'>{{#link-to query=(hash search='same' sort='author')}}Index{{/link-to}}</div>
+        <div id='change-search-same-sort-child-and-parent'>{{#link-to query=(hash search='change' sort='title')}}Index{{/link-to}}</div>
+        <div id='dog-link'>{{#link-to query=(hash foo='dog')}}Index{{/link-to}}</div>
         `
       );
 
@@ -447,144 +477,136 @@ moduleFor(
 
       this.add(
         'controller:search',
-        Controller.extend({
-          queryParams: ['search', 'archive'],
-          search: '',
-          archive: false,
-        })
+        class extends Controller {
+          queryParams = ['search', 'archive'];
+          search = '';
+          archive = false;
+        }
       );
 
       this.add(
         'controller:search.results',
-        Controller.extend({
-          queryParams: ['sort', 'showDetails'],
-          sort: 'title',
-          showDetails: true,
-        })
+        class extends Controller {
+          queryParams = ['sort', 'showDetails'];
+          sort = 'title';
+          showDetails = true;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#cat-link');
-          this.shouldNotBeActive(assert, '#dog-link');
+      await this.visit('/');
 
-          return this.visit('/?foo=cat');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#cat-link');
-          this.shouldNotBeActive(assert, '#dog-link');
+      this.shouldNotBeActive(assert, '#cat-link > a');
+      this.shouldNotBeActive(assert, '#dog-link > a');
 
-          return this.visit('/?foo=dog');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#dog-link');
-          this.shouldNotBeActive(assert, '#cat-link');
-          this.shouldBeActive(assert, '#change-nothing');
+      await this.visit('/?foo=cat');
 
-          return this.visit('/search?search=same');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#same-search');
-          this.shouldNotBeActive(assert, '#change-search');
-          this.shouldNotBeActive(assert, '#same-search-add-archive');
-          this.shouldNotBeActive(assert, '#only-add-archive');
-          this.shouldNotBeActive(assert, '#remove-one');
-
-          return this.visit('/search?search=same&archive=true');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#both-same');
-          this.shouldNotBeActive(assert, '#change-one');
+      this.shouldBeActive(assert, '#cat-link > a');
+      this.shouldNotBeActive(assert, '#dog-link > a');
 
-          return this.visit('/search/results?search=same&sort=title&showDetails=true');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#same-sort-child-only');
-          this.shouldBeActive(assert, '#same-search-parent-only');
-          this.shouldNotBeActive(assert, '#change-search-parent-only');
-          this.shouldBeActive(assert, '#same-search-same-sort-child-and-parent');
-          this.shouldNotBeActive(assert, '#same-search-different-sort-child-and-parent');
-          this.shouldNotBeActive(assert, '#change-search-same-sort-child-and-parent');
-        });
+      await this.visit('/?foo=dog');
+
+      this.shouldBeActive(assert, '#dog-link > a');
+      this.shouldNotBeActive(assert, '#cat-link > a');
+      this.shouldBeActive(assert, '#change-nothing > a');
+
+      await this.visit('/search?search=same');
+
+      this.shouldBeActive(assert, '#same-search > a');
+      this.shouldNotBeActive(assert, '#change-search > a');
+      this.shouldNotBeActive(assert, '#same-search-add-archive > a');
+      this.shouldNotBeActive(assert, '#only-add-archive > a');
+      this.shouldNotBeActive(assert, '#remove-one > a');
+
+      await this.visit('/search?search=same&archive=true');
+
+      this.shouldBeActive(assert, '#both-same > a');
+      this.shouldNotBeActive(assert, '#change-one > a');
+
+      await this.visit('/search/results?search=same&sort=title&showDetails=true');
+
+      this.shouldBeActive(assert, '#same-sort-child-only > a');
+      this.shouldBeActive(assert, '#same-search-parent-only > a');
+      this.shouldNotBeActive(assert, '#change-search-parent-only > a');
+      this.shouldBeActive(assert, '#same-search-same-sort-child-and-parent > a');
+      this.shouldNotBeActive(assert, '#same-search-different-sort-child-and-parent > a');
+      this.shouldNotBeActive(assert, '#change-search-same-sort-child-and-parent > a');
     }
 
-    ['@test the {{link-to}} applies active class when query-param is a number'](assert) {
+    async ['@test it applies active class when query-param is a number'](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to query=(hash page=this.pageNumber) id='page-link'}}
-          Index
-        {{/link-to}}
+        <div id='page-link'>
+          {{#link-to query=(hash page=this.pageNumber)}}
+            Index
+          {{/link-to}}
+        </div>
         `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-          pageNumber: 5,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+          pageNumber = 5;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#page-link');
-          return this.visit('/?page=5');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#page-link');
-        });
+      await this.visit('/');
+
+      this.shouldNotBeActive(assert, '#page-link > a');
+
+      await this.visit('/?page=5');
+
+      this.shouldBeActive(assert, '#page-link > a');
     }
 
-    ['@test the {{link-to}} applies active class when query-param is an array'](assert) {
+    async ['@test it applies active class when query-param is an array'](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to query=(hash pages=this.pagesArray) id='array-link'}}Index{{/link-to}}
-        {{#link-to query=(hash pages=this.biggerArray) id='bigger-link'}}Index{{/link-to}}
-        {{#link-to query=(hash pages=this.emptyArray) id='empty-link'}}Index{{/link-to}}
+        <div id='array-link'>{{#link-to query=(hash pages=this.pagesArray)}}Index{{/link-to}}</div>
+        <div id='bigger-link'>{{#link-to query=(hash pages=this.biggerArray)}}Index{{/link-to}}</div>
+        <div id='empty-link'>{{#link-to query=(hash pages=this.emptyArray)}}Index{{/link-to}}</div>
         `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['pages'],
-          pages: [],
-          pagesArray: [1, 2],
-          biggerArray: [1, 2, 3],
-          emptyArray: [],
-        })
+        class extends Controller {
+          queryParams = ['pages'];
+          pages = [];
+          pagesArray = [1, 2];
+          biggerArray = [1, 2, 3];
+          emptyArray = [];
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#array-link');
+      await this.visit('/');
 
-          return this.visit('/?pages=%5B1%2C2%5D');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#array-link');
-          this.shouldNotBeActive(assert, '#bigger-link');
-          this.shouldNotBeActive(assert, '#empty-link');
+      this.shouldNotBeActive(assert, '#array-link > a');
 
-          return this.visit('/?pages=%5B2%2C1%5D');
-        })
-        .then(() => {
-          this.shouldNotBeActive(assert, '#array-link');
-          this.shouldNotBeActive(assert, '#bigger-link');
-          this.shouldNotBeActive(assert, '#empty-link');
+      await this.visit('/?pages=%5B1%2C2%5D');
 
-          return this.visit('/?pages=%5B1%2C2%2C3%5D');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#bigger-link');
-          this.shouldNotBeActive(assert, '#array-link');
-          this.shouldNotBeActive(assert, '#empty-link');
-        });
+      this.shouldBeActive(assert, '#array-link > a');
+      this.shouldNotBeActive(assert, '#bigger-link > a');
+      this.shouldNotBeActive(assert, '#empty-link > a');
+
+      await this.visit('/?pages=%5B2%2C1%5D');
+
+      this.shouldNotBeActive(assert, '#array-link > a');
+      this.shouldNotBeActive(assert, '#bigger-link > a');
+      this.shouldNotBeActive(assert, '#empty-link > a');
+
+      await this.visit('/?pages=%5B1%2C2%2C3%5D');
+
+      this.shouldBeActive(assert, '#bigger-link > a');
+      this.shouldNotBeActive(assert, '#array-link > a');
+      this.shouldNotBeActive(assert, '#empty-link > a');
     }
-    ['@test the {{link-to}} component applies active class to the parent route'](assert) {
+
+    async ['@test it applies active class to the parent route'](assert) {
       this.router.map(function () {
         this.route('parent', function () {
           this.route('child');
@@ -594,35 +616,34 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to route='parent' id='parent-link'}}Parent{{/link-to}}
-        {{#link-to route='parent.child' id='parent-child-link'}}Child{{/link-to}}
-        {{#link-to route='parent' query=(hash foo=this.cat) id='parent-link-qp'}}Parent{{/link-to}}
+        <div id='parent-link'>{{#link-to route='parent'}}Parent{{/link-to}}</div>
+        <div id='parent-child-link'>{{#link-to route='parent.child'}}P}}Child{{/link-to}}</div>
+        <div id='parent-link-qp'>{{#link-to route='parent' query=(hash foo=this.cat)}}P}}Parent{{/link-to}}</div>
         {{outlet}}
         `
       );
 
       this.add(
         'controller:parent.child',
-        Controller.extend({
-          queryParams: ['foo'],
-          foo: 'bar',
-        })
+        class extends Controller {
+          queryParams = ['foo'];
+          foo = 'bar';
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#parent-link');
-          this.shouldNotBeActive(assert, '#parent-child-link');
-          this.shouldNotBeActive(assert, '#parent-link-qp');
-          return this.visit('/parent/child?foo=dog');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#parent-link');
-          this.shouldNotBeActive(assert, '#parent-link-qp');
-        });
+      await this.visit('/');
+
+      this.shouldNotBeActive(assert, '#parent-link > a');
+      this.shouldNotBeActive(assert, '#parent-child-link > a');
+      this.shouldNotBeActive(assert, '#parent-link-qp > a');
+
+      await this.visit('/parent/child?foo=dog');
+
+      this.shouldBeActive(assert, '#parent-link > a');
+      this.shouldNotBeActive(assert, '#parent-link-qp > a');
     }
 
-    async ['@test The {{link-to}} component disregards query-params in activeness computation when current-when is specified'](
+    async ['@test it disregards query-params in activeness computation when current-when is specified'](
       assert
     ) {
       let appLink;
@@ -634,9 +655,11 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to route='parent' query=(hash page=1) current-when='parent' id='app-link'}}
-          Parent
-        {{/link-to}}
+        <div id='app-link'>
+          {{#link-to route='parent' query=(hash page=1) current-when='parent'}}
+            Parent
+          {{/link-to}}
+        </div>
         {{outlet}}
         `
       );
@@ -644,56 +667,57 @@ moduleFor(
       this.addTemplate(
         'parent',
         `
-        {{#link-to route='parent' query=(hash page=1) current-when='parent' id='parent-link'}}
-          Parent
-        {{/link-to}}
+        <div id='parent-link'>
+          {{#link-to route='parent' query=(hash page=1) current-when='parent'}}
+            Parent
+          {{/link-to}}
+        </div>
         {{outlet}}
         `
       );
 
       this.add(
         'controller:parent',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+        }
       );
 
       await this.visit('/');
 
-      appLink = this.$('#app-link');
+      appLink = this.$('#app-link > a');
 
       assert.equal(appLink.attr('href'), '/parent');
-      this.shouldNotBeActive(assert, '#app-link');
+      this.shouldNotBeActive(assert, '#app-link > a');
 
       await this.visit('/parent?page=2');
 
-      appLink = this.$('#app-link');
+      appLink = this.$('#app-link > a');
       let router = this.appRouter;
 
       assert.equal(appLink.attr('href'), '/parent');
-      this.shouldBeActive(assert, '#app-link');
-      assert.equal(this.$('#parent-link').attr('href'), '/parent');
-      this.shouldBeActive(assert, '#parent-link');
+      this.shouldBeActive(assert, '#app-link > a');
+      assert.equal(this.$('#parent-link > a').attr('href'), '/parent');
+      this.shouldBeActive(assert, '#parent-link > a');
 
       let parentController = this.getController('parent');
 
       assert.equal(parentController.get('page'), 2);
 
-      parentController.set('page', 3);
+      runTask(() => parentController.set('page', 3));
       await runLoopSettled();
 
       assert.equal(router.get('location.path'), '/parent?page=3');
-      this.shouldBeActive(assert, '#app-link');
-      this.shouldBeActive(assert, '#parent-link');
+      this.shouldBeActive(assert, '#app-link > a');
+      this.shouldBeActive(assert, '#parent-link > a');
 
-      this.click('#app-link');
-      await runLoopSettled();
+      await this.click('#app-link > a');
 
       assert.equal(router.get('location.path'), '/parent');
     }
 
-    ['@test {{link-to}} default query params while in active transition regression test'](assert) {
+    async ['@test it defaults query params while in active transition regression test'](assert) {
       this.router.map(function () {
         this.route('foos');
         this.route('bars');
@@ -705,128 +729,129 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to route='foos' id='foos-link'}}Foos{{/link-to}}
-        {{#link-to route='foos' query=(hash baz=true) id='baz-foos-link'}}Baz Foos{{/link-to}}
-        {{#link-to route='bars' query=(hash quux=true) id='bars-link'}}Quux Bars{{/link-to}}
+        <div id='foos-link'>{{#link-to route='foos'}}Foos{{/link-to}}</div>
+        <div id='baz-foos-link'>{{#link-to route='foos' query=(hash baz=true)}}Baz Foos{{/link-to}}</div>
+        <div id='bars-link'>{{#link-to route='bars' query=(hash quux=true)}}Quux Bars{{/link-to}}</div>
         `
       );
 
       this.add(
         'controller:foos',
-        Controller.extend({
-          queryParams: ['status'],
-          baz: false,
-        })
+        class extends Controller {
+          queryParams = ['status'];
+          baz = false;
+        }
       );
 
       this.add(
         'route:foos',
-        Route.extend({
+        class extends Route {
           model() {
             return foos.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'controller:bars',
-        Controller.extend({
-          queryParams: ['status'],
-          quux: false,
-        })
+        class extends Controller {
+          queryParams = ['status'];
+          quux = false;
+        }
       );
 
       this.add(
         'route:bars',
-        Route.extend({
+        class extends Route {
           model() {
             return bars.promise;
-          },
-        })
+          }
+        }
       );
 
-      return this.visit('/').then(() => {
-        let router = this.appRouter;
-        let foosLink = this.$('#foos-link');
-        let barsLink = this.$('#bars-link');
-        let bazLink = this.$('#baz-foos-link');
+      await this.visit('/');
+
+      let router = this.appRouter;
+      let foosLink = this.$('#foos-link > a');
+      let barsLink = this.$('#bars-link > a');
+      let bazLink = this.$('#baz-foos-link > a');
 
-        assert.equal(foosLink.attr('href'), '/foos');
-        assert.equal(bazLink.attr('href'), '/foos?baz=true');
-        assert.equal(barsLink.attr('href'), '/bars?quux=true');
-        assert.equal(router.get('location.path'), '/');
-        this.shouldNotBeActive(assert, '#foos-link');
-        this.shouldNotBeActive(assert, '#baz-foos-link');
-        this.shouldNotBeActive(assert, '#bars-link');
+      assert.equal(foosLink.attr('href'), '/foos');
+      assert.equal(bazLink.attr('href'), '/foos?baz=true');
+      assert.equal(barsLink.attr('href'), '/bars?quux=true');
+      assert.equal(router.get('location.path'), '/');
+      this.shouldNotBeActive(assert, '#foos-link > a');
+      this.shouldNotBeActive(assert, '#baz-foos-link > a');
+      this.shouldNotBeActive(assert, '#bars-link > a');
 
-        runTask(() => barsLink.click());
-        this.shouldNotBeActive(assert, '#bars-link');
+      runTask(() => barsLink.click());
+      this.shouldNotBeActive(assert, '#bars-link > a');
 
-        runTask(() => foosLink.click());
-        this.shouldNotBeActive(assert, '#foos-link');
+      runTask(() => foosLink.click());
+      this.shouldNotBeActive(assert, '#foos-link > a');
 
-        runTask(() => foos.resolve());
+      runTask(() => foos.resolve());
 
-        assert.equal(router.get('location.path'), '/foos');
-        this.shouldBeActive(assert, '#foos-link');
-      });
+      assert.equal(router.get('location.path'), '/foos');
+      this.shouldBeActive(assert, '#foos-link > a');
     }
 
-    ['@test the {{link-to}} does not throw an error if called without a @route argument, but with a @query argument'](
+    async ['@test it does not throw an error if called without a @route argument, but with a @query argument'](
       assert
     ) {
       this.addTemplate(
         'index',
         `
-        {{#link-to query=(hash page=this.pageNumber) id='page-link'}}
-          Index
-        {{/link-to}}
+        <div id='page-link'>
+          {{#link-to query=(hash page=this.pageNumber)}}
+            Index
+          {{/link-to}}
+        </div>
         `
       );
 
       this.add(
         'route:index',
-        Route.extend({
+        class extends Route {
           model() {
             return [
               { id: 'yehuda', name: 'Yehuda Katz' },
               { id: 'tom', name: 'Tom Dale' },
               { id: 'erik', name: 'Erik Brynroflsson' },
             ];
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['page'],
-          page: 1,
-          pageNumber: 5,
-        })
+        class extends Controller {
+          queryParams = ['page'];
+          page = 1;
+          pageNumber = 5;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          this.shouldNotBeActive(assert, '#page-link');
-          return this.visit('/?page=5');
-        })
-        .then(() => {
-          this.shouldBeActive(assert, '#page-link');
-        });
+      await this.visit('/');
+
+      this.shouldNotBeActive(assert, '#page-link > a');
+
+      await this.visit('/?page=5');
+
+      this.shouldBeActive(assert, '#page-link > a');
     }
 
-    ['@test [DEPRECATED] [GH#17869] it does not cause shadowing assertion with `hash` local variable']() {
+    async ['@test [DEPRECATED] [GH#17869] it does not cause shadowing assertion with `hash` local variable']() {
       this.router.map(function () {
         this.route('post', { path: '/post/:id' });
       });
 
       this.add(
         'controller:post',
-        Controller.extend({
-          queryParams: ['showComments'],
-          showComments: true,
-        })
+        class extends Controller {
+          queryParams = ['showComments'];
+          showComments = true;
+        }
       );
 
       expectDeprecation(() => {
@@ -840,16 +865,16 @@ moduleFor(
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-      return this.visit('/').then(() => {
-        this.assertComponentElement(this.element.firstElementChild, {
-          tagName: 'a',
-          attrs: { href: '/post/1?showComments=false', class: classMatcher('ember-view') },
-          content: 'View Post',
-        });
+      await this.visit('/');
+
+      this.assertComponentElement(this.element.firstElementChild, {
+        tagName: 'a',
+        attrs: { href: '/post/1?showComments=false', class: classMatcher('ember-view') },
+        content: 'View Post',
       });
     }
 
-    ['@test the {{link-to}} component with dynamic segment and loading route should preserve query parameters'](
+    async ['@test with dynamic segment and loading route, it should preserve query parameters'](
       assert
     ) {
       this.router.map(function () {
@@ -860,32 +885,35 @@ moduleFor(
         });
       });
 
-      this.addTemplate('foo.bar', `{{#link-to route='foo.bar.baz' id='baz-link'}}Baz{{/link-to}}`);
+      this.addTemplate(
+        'foo.bar',
+        `<div id='baz-link'>{{#link-to route='foo.bar.baz'}}Baz{{/link-to}}</div>`
+      );
       this.addTemplate('foo.bar.loading', 'Loading');
 
       this.add(
         'controller:foo.bar',
-        Controller.extend({
-          queryParams: ['qux'],
-          qux: null,
-        })
+        class extends Controller {
+          queryParams = ['qux'];
+          qux = null;
+        }
       );
 
       this.add(
         'route:foo.bar.baz',
-        Route.extend({
+        class extends Route {
           model() {
             return new RSVP.Promise((resolve) => {
               setTimeout(resolve, 1);
             });
-          },
-        })
+          }
+        }
       );
 
-      return this.visit('/foo/bar/baz?qux=abc').then(() => {
-        let bazLink = this.$('#baz-link');
-        assert.equal(bazLink.attr('href'), '/foo/bar/baz?qux=abc');
-      });
+      await this.visit('/foo/bar/baz?qux=abc');
+
+      let bazLink = this.$('#baz-link > a');
+      assert.equal(bazLink.attr('href'), '/foo/bar/baz?qux=abc');
     }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 9e688cf1236..3932e4c573a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -13,8 +13,8 @@ import { LinkComponent } from '@ember/-internals/glimmer';
 moduleFor(
   '<LinkTo /> component (rendering tests)',
   class extends ApplicationTestCase {
-    async [`@test throws a useful error if you invoke it wrong`](assert) {
-      this.addTemplate('application', `<LinkTo id='the-link'>Index</LinkTo>`);
+    async [`@test it throws a useful error if you invoke it wrong`](assert) {
+      this.addTemplate('application', `<LinkTo>Index</LinkTo>`);
 
       return assert.rejectsAssertion(
         this.visit('/'),
@@ -22,94 +22,104 @@ moduleFor(
       );
     }
 
-    ['@test should be able to be inserted in DOM when the router is not present']() {
+    async ['@test it should be able to be inserted in DOM when the router is not present']() {
       this.addTemplate('application', `<LinkTo @route='index'>Go to Index</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        this.assertText('Go to Index');
-      });
+      await this.visit('/');
+
+      this.assertText('Go to Index');
     }
 
-    ['@test re-renders when title changes']() {
+    async ['@test it re-renders when title changes']() {
       let controller;
 
       this.addTemplate('application', `<LinkTo @route='index'>{{this.title}}</LinkTo>`);
 
       this.add(
         'controller:application',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
             controller = this;
-          },
-          title: 'foo',
-        })
+          }
+
+          title = 'foo';
+        }
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('foo');
-        runTask(() => set(controller, 'title', 'bar'));
-        this.assertText('bar');
-      });
+      await this.visit('/');
+
+      this.assertText('foo');
+
+      runTask(() => set(controller, 'title', 'bar'));
+
+      this.assertText('bar');
     }
 
-    ['@test re-computes active class when params change'](assert) {
+    async ['@test it re-computes active class when params change'](assert) {
       let controller;
 
       this.addTemplate('application', '<LinkTo @route={{this.routeName}}>foo</LinkTo>');
 
       this.add(
         'controller:application',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
             controller = this;
-          },
-          routeName: 'index',
-        })
+          }
+
+          routeName = 'index';
+        }
       );
 
       this.router.map(function () {
         this.route('bar', { path: '/bar' });
       });
 
-      return this.visit('/bar').then(() => {
-        assert.equal(this.firstChild.classList.contains('active'), false);
-        runTask(() => set(controller, 'routeName', 'bar'));
-        assert.equal(this.firstChild.classList.contains('active'), true);
-      });
+      await this.visit('/bar');
+
+      assert.equal(this.firstChild.classList.contains('active'), false);
+
+      runTask(() => set(controller, 'routeName', 'bar'));
+
+      assert.equal(this.firstChild.classList.contains('active'), true);
     }
 
-    ['@test able to safely extend the built-in component and use the normal path']() {
+    async ['@test able to safely extend the built-in component and use the normal path']() {
       this.addComponent('custom-link-to', {
-        ComponentClass: LinkComponent.extend(),
+        ComponentClass: class extends LinkComponent {},
       });
 
       this.addTemplate('application', `<CustomLinkTo @route='index'>{{this.title}}</CustomLinkTo>`);
 
       this.add(
         'controller:application',
-        Controller.extend({
-          title: 'Hello',
-        })
+        class extends Controller {
+          title = 'Hello';
+        }
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('Hello');
-      });
+      await this.visit('/');
+
+      this.assertText('Hello');
     }
 
-    ['@test able to pupolate innermost dynamic segment when immediate parent route is active']() {
+    async ['@test able to pupolate innermost dynamic segment when immediate parent route is active']() {
       this.addTemplate('application', '{{outlet}}');
+
       this.addTemplate('parents', '{{outlet}}');
+
       this.addTemplate(
         'parents.parent',
         '<LinkTo @route="parents.parent.child" @model=1>Link To Child</LinkTo>'
       );
+
       this.addTemplate(
         'parents.parent.child',
         '<LinkTo @route="parents.parent">Link To Parent</LinkTo>'
       );
+
       this.add(
         'route:parents.parent',
         class extends Route {
@@ -118,6 +128,7 @@ moduleFor(
           }
         }
       );
+
       this.router.map(function () {
         this.route('parents', function () {
           this.route('parent', { path: '/:parent_id' }, function () {
@@ -126,9 +137,10 @@ moduleFor(
           });
         });
       });
-      return this.visit('/parents/1').then(() => {
-        this.assertText('Link To Child');
-      });
+
+      await this.visit('/parents/1');
+
+      this.assertText('Link To Child');
     }
   }
 );
@@ -136,7 +148,7 @@ moduleFor(
 moduleFor(
   '<LinkTo /> component (rendering tests, without router)',
   class extends RenderingTestCase {
-    ['@test should be able to be inserted in DOM when the router is not present - block']() {
+    ['@test it should be able to be inserted in DOM when the router is not present - block']() {
       this.render(`<LinkTo @route='index'>Go to Index</LinkTo>`);
 
       this.assertComponentElement(this.element.firstChild, {
@@ -151,26 +163,31 @@ moduleFor(
 moduleFor(
   '<LinkTo /> component (rendering tests, with router not started)',
   class extends RouterNonApplicationTestCase {
-    constructor() {
-      super(...arguments);
+    constructor(...args) {
+      super(...args);
+
       this.resolver.add('router:main', Router.extend(this.routerOptions));
+
       this.router.map(function () {
         this.route('dynamicWithChild', { path: '/dynamic-with-child/:dynamic_id' }, function () {
           this.route('child');
         });
       });
     }
+
     get routerOptions() {
       return {
         location: 'none',
       };
     }
+
     get router() {
       return this.owner.resolveRegistration('router:main');
     }
 
-    ['@test should be able to be inserted in DOM when initial transition not started']() {
+    ['@test it should be able to be inserted in DOM when initial transition not started']() {
       this.render(`<LinkTo @route="dynamicWithChild.child">Link</LinkTo>`);
+
       this.assertComponentElement(this.element.firstChild, {
         tagName: 'a',
         attrs: {
@@ -180,8 +197,9 @@ moduleFor(
       });
     }
 
-    ['@test should be able to be inserted in DOM with valid href when complete models are passed even if initial transition is not started']() {
+    ['@test it should be able to be inserted in DOM with valid href when complete models are passed even if initial transition is not started']() {
       this.render(`<LinkTo @route="dynamicWithChild.child" @model="1">Link</LinkTo>`);
+
       this.assertComponentElement(this.element.firstChild, {
         tagName: 'a',
         attrs: {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index d3bda9c19c5..7115e81ec21 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -7,137 +7,149 @@ import { LinkComponent } from '@ember/-internals/glimmer';
 moduleFor(
   '{{link-to}} component (rendering tests)',
   class extends ApplicationTestCase {
-    [`@test throws a useful error if you invoke it wrong`](assert) {
+    [`@test it throws a useful error if you invoke it wrong`](assert) {
       assert.expect(1);
 
       expectAssertion(() => {
-        this.addTemplate('application', `{{#link-to id='the-link'}}Index{{/link-to}}`);
+        this.addTemplate('application', `{{#link-to}}Index{{/link-to}}`);
       }, /You must provide one or more parameters to the `{{link-to}}` component\. \('my-app\/templates\/application\.hbs' @ L1:C0\)/);
     }
 
-    ['@test should be able to be inserted in DOM when the router is not present']() {
+    async ['@test it should be able to be inserted in DOM when the router is not present']() {
       this.addTemplate('application', `{{#link-to route='index'}}Go to Index{{/link-to}}`);
 
-      return this.visit('/').then(() => {
-        this.assertText('Go to Index');
-      });
+      await this.visit('/');
+
+      this.assertText('Go to Index');
     }
 
-    ['@test re-renders when title changes']() {
+    async ['@test it re-renders when title changes']() {
       let controller;
 
       this.addTemplate('application', `{{#link-to route='index'}}{{this.title}}{{/link-to}}`);
 
       this.add(
         'controller:application',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
             controller = this;
-          },
-          title: 'foo',
-        })
+          }
+
+          title = 'foo';
+        }
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('foo');
-        runTask(() => set(controller, 'title', 'bar'));
-        this.assertText('bar');
-      });
+      await this.visit('/');
+
+      this.assertText('foo');
+
+      runTask(() => set(controller, 'title', 'bar'));
+
+      this.assertText('bar');
     }
 
-    ['@test re-computes active class when params change'](assert) {
+    async ['@test it re-computes active class when params change'](assert) {
       let controller;
 
       this.addTemplate('application', '{{#link-to route=this.routeName}}foo{{/link-to}}');
 
       this.add(
         'controller:application',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
             controller = this;
-          },
-          routeName: 'index',
-        })
+          }
+
+          routeName = 'index';
+        }
       );
 
       this.router.map(function () {
         this.route('bar', { path: '/bar' });
       });
 
-      return this.visit('/bar').then(() => {
-        assert.equal(this.firstChild.classList.contains('active'), false);
-        runTask(() => set(controller, 'routeName', 'bar'));
-        assert.equal(this.firstChild.classList.contains('active'), true);
-      });
+      await this.visit('/bar');
+
+      assert.equal(this.firstChild.classList.contains('active'), false);
+
+      runTask(() => set(controller, 'routeName', 'bar'));
+
+      assert.equal(this.firstChild.classList.contains('active'), true);
     }
 
-    ['@test [DEPRECATED] escaped inline form (double curlies) escapes link title']() {
+    async ['@test [DEPRECATED] escaped inline form (double curlies) escapes link title']() {
       expectDeprecation(() => {
         this.addTemplate('application', `{{link-to this.title 'index'}}`);
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
       this.add(
         'controller:application',
-        Controller.extend({
-          title: '<b>blah</b>',
-        })
+        class extends Controller {
+          title = '<b>blah</b>';
+        }
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('<b>blah</b>');
-      });
+      await this.visit('/');
+
+      this.assertText('<b>blah</b>');
     }
 
-    ['@test [DEPRECATED] unescaped inline form (triple curlies) does not escape link title'](
+    async ['@test [DEPRECATED] unescaped inline form (triple curlies) does not escape link title'](
       assert
     ) {
       expectDeprecation(() => {
         this.addTemplate('application', `{{{link-to this.title 'index'}}}`);
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
       this.add(
         'controller:application',
-        Controller.extend({
-          title: '<b>blah</b>',
-        })
+        class extends Controller {
+          title = '<b>blah</b>';
+        }
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('blah');
-        assert.equal(this.$('b').length, 1);
-      });
+      await this.visit('/');
+
+      this.assertText('blah');
+      assert.equal(this.$('b').length, 1);
     }
 
-    ['@test able to safely extend the built-in component and use the normal path']() {
+    async ['@test able to safely extend the built-in component and use the normal path']() {
       this.addComponent('custom-link-to', {
-        ComponentClass: LinkComponent.extend(),
+        ComponentClass: class extends LinkComponent {},
       });
+
       this.addTemplate(
         'application',
         `{{#custom-link-to route='index'}}{{this.title}}{{/custom-link-to}}`
       );
+
       this.add(
         'controller:application',
-        Controller.extend({
-          title: 'Hello',
-        })
+        class extends Controller {
+          title = 'Hello';
+        }
       );
 
-      return this.visit('/').then(() => {
-        this.assertText('Hello');
-      });
+      await this.visit('/');
+
+      this.assertText('Hello');
     }
 
     async ['@test [DEPRECATED] [GH#13432] able to safely extend the built-in component and invoke it inline']() {
       this.addComponent('custom-link-to', {
-        ComponentClass: LinkComponent.extend(),
+        ComponentClass: class extends LinkComponent {},
       });
+
       this.addTemplate('application', `{{custom-link-to this.title 'index'}}`);
+
       this.add(
         'controller:application',
-        Controller.extend({
-          title: 'Hello',
-        })
+        class extends Controller {
+          title = 'Hello';
+        }
       );
 
       await expectDeprecationAsync(
@@ -153,13 +165,13 @@ moduleFor(
 moduleFor(
   '{{link-to}} component (rendering tests, without router)',
   class extends RenderingTestCase {
-    ['@test should be able to be inserted in DOM when the router is not present - block']() {
+    ['@test it should be able to be inserted in DOM when the router is not present - block']() {
       this.render(`{{#link-to route='index'}}Go to Index{{/link-to}}`);
 
       this.assertText('Go to Index');
     }
 
-    ['@test [DEPRECATED] should be able to be inserted in DOM when the router is not present - inline']() {
+    ['@test [DEPRECATED] it should be able to be inserted in DOM when the router is not present - inline']() {
       expectDeprecation(() => {
         this.render(`{{link-to 'Go to Index' 'index'}}`);
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 91ea9d91b1b..7feb4c54ecd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -2,12 +2,10 @@ import {
   ApplicationTestCase,
   ModuleBasedTestResolver,
   moduleFor,
-  runLoopSettled,
   runTask,
 } from 'internal-test-helpers';
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
-import { alias } from '@ember/-internals/metal';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
@@ -61,50 +59,48 @@ moduleFor(
       );
     }
 
-    ['@test The <LinkTo /> component navigates into the named route'](assert) {
-      return this.visit('/')
-        .then(() => {
-          assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
-          assert.equal(
-            this.$('#self-link.active').length,
-            1,
-            'The self-link was rendered with active class'
-          );
-          assert.equal(
-            this.$('#about-link:not(.active)').length,
-            1,
-            'The other link was rendered without active class'
-          );
+    async ['@test it navigates into the named route'](assert) {
+      await this.visit('/');
 
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 1, 'The about template was rendered');
-          assert.equal(
-            this.$('#self-link.active').length,
-            1,
-            'The self-link was rendered with active class'
-          );
-          assert.equal(
-            this.$('#home-link:not(.active)').length,
-            1,
-            'The other link was rendered without active class'
-          );
-        });
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+
+      await this.click('#about-link');
+
+      assert.equal(this.$('h3.about').length, 1, 'The about template was rendered');
+      assert.equal(
+        this.$('#self-link.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#home-link:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
-    [`@test the <LinkTo /> component doesn't add an href when the tagName isn't 'a'`](assert) {
+    async [`@test it doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo @route='about' id='about-link' @tagName='div'>About</LinkTo>`
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#about-link').attr('href'), undefined, 'there is no href attribute');
-      });
+      await this.visit('/');
+
+      assert.strictEqual(this.$('#about-link').attr('href'), null, 'there is no href attribute');
     }
 
-    [`@test the <LinkTo /> component applies a 'disabled' class when disabled`](assert) {
+    async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
         `
@@ -113,66 +109,70 @@ moduleFor(
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          shouldDisable: true,
-          dynamicDisabledWhen: 'shouldDisable',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          shouldDisable = true;
+          dynamicDisabledWhen = 'shouldDisable';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link-static.disabled').length,
-          1,
-          'The static link is disabled when its disabledWhen is true'
-        );
-        assert.equal(
-          this.$('#about-link-dynamic.disabled').length,
-          1,
-          'The dynamic link is disabled when its disabledWhen is true'
-        );
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link-static.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.equal(
+        this.$('#about-link-dynamic.disabled').length,
+        1,
+        'The dynamic link is disabled when its disabledWhen is true'
+      );
 
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('dynamicDisabledWhen', false));
+      runTask(() => controller.set('dynamicDisabledWhen', false));
 
-        assert.equal(
-          this.$('#about-link-dynamic.disabled').length,
-          0,
-          'The dynamic link is re-enabled when its disabledWhen becomes false'
-        );
-      });
+      assert.equal(
+        this.$('#about-link-dynamic.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabledWhen becomes false'
+      );
     }
 
-    [`@test the <LinkTo /> component doesn't apply a 'disabled' class if disabledWhen is not provided`](
-      assert
-    ) {
+    async [`@test it doesn't apply a 'disabled' class if disabledWhen is not provided`](assert) {
       this.addTemplate('index', `<LinkTo id="about-link" @route="about">About</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        assert.ok(
-          !this.$('#about-link').hasClass('disabled'),
-          'The link is not disabled if disabledWhen not provided'
-        );
-      });
+      await this.visit('/');
+
+      assert.ok(
+        !this.$('#about-link').hasClass('disabled'),
+        'The link is not disabled if disabledWhen not provided'
+      );
     }
 
-    [`@test the <LinkTo /> component supports a custom disabledClass`](assert) {
+    async [`@test it supports a custom disabledClass`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo id="about-link" @route="about" @disabledWhen={{true}} @disabledClass="do-not-want">About</LinkTo>`
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link.do-not-want').length,
-          1,
-          'The link can apply a custom disabled class'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link.do-not-want').length,
+        1,
+        'The link can apply a custom disabled class'
+      );
     }
 
-    [`@test the <LinkTo /> component supports a custom disabledClass set via bound param`](assert) {
+    async [`@test it supports a custom disabledClass set via bound param`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo id="about-link" @route="about" @disabledWhen={{true}} @disabledClass={{this.disabledClass}}>About</LinkTo>`
@@ -180,144 +180,138 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          disabledClass: 'do-not-want',
-        })
+        class extends Controller {
+          disabledClass = 'do-not-want';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link.do-not-want').length,
-          1,
-          'The link can apply a custom disabled class via bound param'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link.do-not-want').length,
+        1,
+        'The link can apply a custom disabled class via bound param'
+      );
     }
 
-    [`@test the <LinkTo /> component does not respond to clicks when disabledWhen`](assert) {
+    async [`@test it does not respond to clicks when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo id="about-link" @route="about" @disabledWhen={{true}}>About</LinkTo>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 0, 'Transitioning did not occur');
-        });
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
 
-    [`@test the <LinkTo /> component does not respond to clicks when disabled`](assert) {
+    async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo id="about-link" @route="about" @disabled={{true}}>About</LinkTo>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 0, 'Transitioning did not occur');
-        });
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
 
-    [`@test the <LinkTo /> component responds to clicks according to its disabledWhen bound param`](
-      assert
-    ) {
+    async [`@test it responds to clicks according to its disabledWhen bound param`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo id="about-link" @route="about" @disabledWhen={{this.disabledWhen}}>About</LinkTo>`
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          disabledWhen: true,
-        })
-      );
-
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 0, 'Transitioning did not occur');
-
-          let controller = this.applicationInstance.lookup('controller:index');
-          controller.set('disabledWhen', false);
-
-          return runLoopSettled();
-        })
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('h3.about').length,
-            1,
-            'Transitioning did occur when disabledWhen became false'
-          );
-        });
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          disabledWhen = true;
+        }
+      );
+
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
+
+      runTask(() => controller.set('disabledWhen', false));
+
+      await this.click('#about-link');
+
+      assert.equal(
+        this.$('h3.about').length,
+        1,
+        'Transitioning did occur when disabledWhen became false'
+      );
     }
 
-    [`@test The <LinkTo /> component supports a custom activeClass`](assert) {
+    async [`@test it supports a custom activeClass`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        <LinkTo id='about-link' @route='about'>About</LinkTo>
+        <LinkTo id='about-link' @route='about' @activeClass='zomg-active'>About</LinkTo>
         <LinkTo id='self-link' @route='index' @activeClass='zomg-active'>Self</LinkTo>
         `
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
-        assert.equal(
-          this.$('#self-link.zomg-active').length,
-          1,
-          'The self-link was rendered with active class'
-        );
-        assert.equal(
-          this.$('#about-link:not(.active)').length,
-          1,
-          'The other link was rendered without active class'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link.zomg-active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link:not(.zomg-active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
-    [`@test The <LinkTo /> component supports a custom activeClass from a bound param`](assert) {
+    async [`@test it supports a custom activeClass from a bound param`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        <LinkTo id='about-link' @route='about'>About</LinkTo>
+        <LinkTo id='about-link' @route='about' @activeClass={{this.activeClass}}>About</LinkTo>
         <LinkTo id='self-link' @route='index' @activeClass={{this.activeClass}}>Self</LinkTo>
         `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          activeClass: 'zomg-active',
-        })
+        class extends Controller {
+          activeClass = 'zomg-active';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
-        assert.equal(
-          this.$('#self-link.zomg-active').length,
-          1,
-          'The self-link was rendered with active class'
-        );
-        assert.equal(
-          this.$('#about-link:not(.active)').length,
-          1,
-          'The other link was rendered without active class'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link.zomg-active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link:not(.zomg-active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
     async ['@test Using <LinkTo> inside a non-routable engine errors'](assert) {
@@ -535,18 +529,19 @@ moduleFor(
       this.replaceCount = 0;
 
       let testContext = this;
+
       this.add(
         'location:none',
-        NoneLocation.extend({
-          setURL() {
+        class extends NoneLocation {
+          setURL(...args) {
             testContext.updateCount++;
-            return this._super(...arguments);
-          },
-          replaceURL() {
+            return super.setURL(...args);
+          }
+          replaceURL(...args) {
             testContext.replaceCount++;
-            return this._super(...arguments);
-          },
-        })
+            return super.setURL(...args);
+          }
+        }
       );
 
       this.router.map(function () {
@@ -571,14 +566,14 @@ moduleFor(
       );
     }
 
-    visit() {
-      return super.visit(...arguments).then(() => {
-        this.updateCountAfterVisit = this.updateCount;
-        this.replaceCountAfterVisit = this.replaceCount;
-      });
+    async visit(...args) {
+      await super.visit(...args);
+
+      this.updateCountAfterVisit = this.updateCount;
+      this.replaceCountAfterVisit = this.replaceCount;
     }
 
-    ['@test The <LinkTo /> component supports URL replacement'](assert) {
+    async ['@test it supports URL replacement'](assert) {
       this.addTemplate(
         'index',
         `
@@ -587,23 +582,19 @@ moduleFor(
         `
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-          assert.equal(
-            this.replaceCount,
-            this.replaceCountAfterVisit + 1,
-            'replaceURL should be called once'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
+      assert.equal(
+        this.replaceCount,
+        this.replaceCountAfterVisit + 1,
+        'replaceURL should be called once'
+      );
     }
 
-    ['@test The <LinkTo /> component supports URL replacement via replace=boundTruthyThing'](
-      assert
-    ) {
+    async ['@test it supports URL replacement via replace=boundTruthyThing'](assert) {
       this.addTemplate(
         'index',
         `
@@ -614,26 +605,24 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundTruthyThing: true,
-        })
+        class extends Controller {
+          boundTruthyThing = true;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-          assert.equal(
-            this.replaceCount,
-            this.replaceCountAfterVisit + 1,
-            'replaceURL should be called once'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
+      assert.equal(
+        this.replaceCount,
+        this.replaceCountAfterVisit + 1,
+        'replaceURL should be called once'
+      );
     }
 
-    ['@test The <LinkTo /> component supports setting replace=boundFalseyThing'](assert) {
+    async ['@test it supports setting replace=boundFalseyThing'](assert) {
       this.addTemplate(
         'index',
         `
@@ -644,23 +633,21 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundFalseyThing: false,
-        })
+        class extends Controller {
+          boundFalseyThing = false;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.updateCount, this.updateCountAfterVisit + 1, 'setURL should be called');
-          assert.equal(
-            this.replaceCount,
-            this.replaceCountAfterVisit,
-            'replaceURL should not be called'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      assert.equal(this.updateCount, this.updateCountAfterVisit + 1, 'setURL should be called');
+      assert.equal(
+        this.replaceCount,
+        this.replaceCountAfterVisit,
+        'replaceURL should not be called'
+      );
     }
   }
 );
@@ -704,53 +691,55 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
         return super.afterEach();
       }
 
-      ['@test The <LinkTo /> component fires an interaction event'](assert) {
-        assert.expect(2);
+      async ['@test it fires an interaction event'](assert) {
+        let before = 0;
+        let after = 0;
 
         subscribe('interaction.link-to', {
           before() {
-            assert.ok(true, 'instrumentation subscriber was called');
+            before++;
           },
           after() {
-            assert.ok(true, 'instrumentation subscriber was called');
+            after++;
           },
         });
 
-        return this.click('#about-link');
+        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
+        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
+
+        await this.click('#about-link');
+
+        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
+        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
       }
 
-      ['@test The <LinkTo /> component interaction event includes the route name'](assert) {
-        assert.expect(2);
+      async ['@test it interaction event includes the route name and transition object'](assert) {
+        let before = 0;
+        let after = 0;
 
         subscribe('interaction.link-to', {
           before(name, timestamp, { routeName }) {
+            before++;
             assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
           },
-          after(name, timestamp, { routeName }) {
+          after(name, timestamp, { routeName, transition }) {
+            after++;
             assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
-          },
-        });
-
-        return this.click('#about-link');
-      }
-
-      ['@test The <LinkTo /> component interaction event includes the transition in the after hook'](
-        assert
-      ) {
-        assert.expect(1);
-
-        subscribe('interaction.link-to', {
-          before() {},
-          after(name, timestamp, { transition }) {
             assert.equal(
               transition.targetName,
               'about',
-              'instrumentation subscriber was passed route name'
+              'instrumentation subscriber was passed transition object in the after hook'
             );
           },
         });
 
-        return this.click('#about-link');
+        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
+        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
+
+        await this.click('#about-link');
+
+        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
+        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
       }
     }
   );
@@ -759,7 +748,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
 moduleFor(
   'The <LinkTo /> component - nested routes and link-to arguments',
   class extends ApplicationTestCase {
-    ['@test The <LinkTo /> component supports leaving off .index for nested routes'](assert) {
+    async ['@test it supports leaving off .index for nested routes'](assert) {
       this.router.map(function () {
         this.route('about', function () {
           this.route('item');
@@ -770,12 +759,12 @@ moduleFor(
       this.addTemplate('about.index', `<div id='index'>Index</div>`);
       this.addTemplate('about.item', `<div id='item'><LinkTo @route='about'>About</LinkTo></div>`);
 
-      return this.visit('/about/item').then(() => {
-        assert.equal(normalizeUrl(this.$('#item a').attr('href')), '/about');
-      });
+      await this.visit('/about/item');
+
+      assert.equal(normalizeUrl(this.$('#item a').attr('href')), '/about');
     }
 
-    [`@test The <LinkTo /> component supports custom, nested, current-when`](assert) {
+    async [`@test it supports custom, nested, current-when`](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -790,16 +779,16 @@ moduleFor(
         `<LinkTo id='other-link' @route='item' @current-when='index'>ITEM</LinkTo>`
       );
 
-      return this.visit('/about').then(() => {
-        assert.equal(
-          this.$('#other-link.active').length,
-          1,
-          'The link is active since current-when is a parent route'
-        );
-      });
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#other-link.active').length,
+        1,
+        'The link is active since current-when is a parent route'
+      );
     }
 
-    [`@test The <LinkTo /> component does not disregard current-when when it is given explicitly for a route`](
+    async [`@test it does not disregard current-when when it is given explicitly for a route`](
       assert
     ) {
       this.router.map(function () {
@@ -818,18 +807,16 @@ moduleFor(
         `<LinkTo id='other-link' @route='items' @current-when='index'>ITEM</LinkTo>`
       );
 
-      return this.visit('/about').then(() => {
-        assert.equal(
-          this.$('#other-link.active').length,
-          1,
-          'The link is active when current-when is given for explicitly for a route'
-        );
-      });
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#other-link.active').length,
+        1,
+        'The link is active when current-when is given for explicitly for a route'
+      );
     }
 
-    ['@test The <LinkTo /> component does not disregard current-when when it is set via a bound param'](
-      assert
-    ) {
+    async ['@test it does not disregard current-when when it is set via a bound param'](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -842,9 +829,9 @@ moduleFor(
 
       this.add(
         'controller:index.about',
-        Controller.extend({
-          currentWhen: 'index',
-        })
+        class extends Controller {
+          currentWhen = 'index';
+        }
       );
 
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
@@ -853,16 +840,16 @@ moduleFor(
         `<LinkTo id='other-link' @route='items' @current-when={{this.currentWhen}}>ITEM</LinkTo>`
       );
 
-      return this.visit('/about').then(() => {
-        assert.equal(
-          this.$('#other-link.active').length,
-          1,
-          'The link is active when current-when is given for explicitly for a route'
-        );
-      });
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#other-link.active').length,
+        1,
+        'The link is active when current-when is given for explicitly for a route'
+      );
     }
 
-    ['@test The <LinkTo /> component supports multiple current-when routes'](assert) {
+    async ['@test it supports multiple current-when routes'](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -885,35 +872,32 @@ moduleFor(
         `<LinkTo id='link3' @route='item' @current-when='item index'>ITEM</LinkTo>`
       );
 
-      return this.visit('/about')
-        .then(() => {
-          assert.equal(
-            this.$('#link1.active').length,
-            1,
-            'The link is active since current-when contains the parent route'
-          );
+      await this.visit('/about');
 
-          return this.visit('/item');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#link2.active').length,
-            1,
-            'The link is active since you are on the active route'
-          );
+      assert.equal(
+        this.$('#link1.active').length,
+        1,
+        'The link is active since current-when contains the parent route'
+      );
 
-          return this.visit('/foo');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#link3.active').length,
-            0,
-            'The link is not active since current-when does not contain the active route'
-          );
-        });
+      await this.visit('/item');
+
+      assert.equal(
+        this.$('#link2.active').length,
+        1,
+        'The link is active since you are on the active route'
+      );
+
+      await this.visit('/foo');
+
+      assert.equal(
+        this.$('#link3.active').length,
+        0,
+        'The link is not active since current-when does not contain the active route'
+      );
     }
 
-    ['@test The <LinkTo /> component supports boolean values for current-when'](assert) {
+    async ['@test it supports boolean values for current-when'](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -929,33 +913,44 @@ moduleFor(
         `
       );
 
-      this.add('controller:index.about', Controller.extend({ isCurrent: false }));
+      let controller;
 
-      return this.visit('/about').then(() => {
-        assert.ok(
-          this.$('#about-link').hasClass('active'),
-          'The link is active since current-when is true'
-        );
-        assert.notOk(
-          this.$('#index-link').hasClass('active'),
-          'The link is not active since current-when is false'
-        );
+      this.add(
+        'controller:index.about',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
 
-        let controller = this.applicationInstance.lookup('controller:index.about');
-        runTask(() => controller.set('isCurrent', true));
+          isCurrent = false;
+        }
+      );
 
-        assert.ok(
-          this.$('#index-link').hasClass('active'),
-          'The link is active since current-when is true'
-        );
-      });
+      await this.visit('/about');
+
+      assert.ok(
+        this.$('#about-link').hasClass('active'),
+        'The link is active since current-when is true'
+      );
+      assert.notOk(
+        this.$('#index-link').hasClass('active'),
+        'The link is not active since current-when is false'
+      );
+
+      runTask(() => controller.set('isCurrent', true));
+
+      assert.ok(
+        this.$('#index-link').hasClass('active'),
+        'The link is active since current-when is true'
+      );
     }
 
-    ['@test The <LinkTo /> component defaults to bubbling'](assert) {
+    async ['@test it defaults to bubbling'](assert) {
       this.addTemplate(
         'about',
         `
-        <div {{action 'hide'}}>
+        <div {{action this.hide}}>
           <LinkTo id='about-contact' @route='about.contact'>About</LinkTo>
         </div>
         {{outlet}}
@@ -973,32 +968,28 @@ moduleFor(
       let hidden = 0;
 
       this.add(
-        'route:about',
-        Route.extend({
-          actions: {
-            hide() {
-              hidden++;
-            },
-          },
-        })
+        'controller:about',
+        class extends Controller {
+          hide() {
+            hidden++;
+          }
+        }
       );
 
-      return this.visit('/about')
-        .then(() => {
-          return this.click('#about-contact');
-        })
-        .then(() => {
-          assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      await this.visit('/about');
 
-          assert.equal(hidden, 1, 'The link bubbles');
-        });
+      await this.click('#about-contact');
+
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+
+      assert.equal(hidden, 1, 'The link bubbles');
     }
 
-    [`@test The <LinkTo /> component supports bubbles=false`](assert) {
+    async [`@test it supports bubbles=false`](assert) {
       this.addTemplate(
         'about',
         `
-        <div {{action 'hide'}}>
+        <div {{action this.hide}}>
           <LinkTo id='about-contact' @route='about.contact' @bubbles={{false}}>
             About
           </LinkTo>
@@ -1018,32 +1009,28 @@ moduleFor(
       let hidden = 0;
 
       this.add(
-        'route:about',
-        Route.extend({
-          actions: {
-            hide() {
-              hidden++;
-            },
-          },
-        })
+        'controller:about',
+        class extends Controller {
+          hide() {
+            hidden++;
+          }
+        }
       );
 
-      return this.visit('/about')
-        .then(() => {
-          return this.click('#about-contact');
-        })
-        .then(() => {
-          assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      await this.visit('/about');
+
+      await this.click('#about-contact');
 
-          assert.equal(hidden, 0, "The link didn't bubble");
-        });
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+
+      assert.strictEqual(hidden, 0, "The link didn't bubble");
     }
 
-    [`@test The <LinkTo /> component supports bubbles=boundFalseyThing`](assert) {
+    async [`@test it supports bubbles=boundFalseyThing`](assert) {
       this.addTemplate(
         'about',
         `
-        <div {{action 'hide'}}>
+        <div {{action this.hide}}>
           <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
             About
           </LinkTo>
@@ -1054,11 +1041,17 @@ moduleFor(
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
+      let hidden = 0;
+
       this.add(
         'controller:about',
-        Controller.extend({
-          boundFalseyThing: false,
-        })
+        class extends Controller {
+          boundFalseyThing = false;
+
+          hide() {
+            hidden++;
+          }
+        }
       );
 
       this.router.map(function () {
@@ -1067,30 +1060,15 @@ moduleFor(
         });
       });
 
-      let hidden = 0;
+      await this.visit('/about');
 
-      this.add(
-        'route:about',
-        Route.extend({
-          actions: {
-            hide() {
-              hidden++;
-            },
-          },
-        })
-      );
+      await this.click('#about-contact');
 
-      return this.visit('/about')
-        .then(() => {
-          return this.click('#about-contact');
-        })
-        .then(() => {
-          assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-          assert.equal(hidden, 0, "The link didn't bubble");
-        });
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      assert.strictEqual(hidden, 0, "The link didn't bubble");
     }
 
-    async [`@test The <LinkTo /> component moves into the named route with context`](assert) {
+    async [`@test it moves into the named route with context`](assert) {
       this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
@@ -1132,15 +1110,15 @@ moduleFor(
 
       this.add(
         'route:about',
-        Route.extend({
+        class extends Route {
           model() {
             return [
               { id: 'yehuda', name: 'Yehuda Katz' },
               { id: 'tom', name: 'Tom Dale' },
               { id: 'erik', name: 'Erik Brynroflsson' },
             ];
-          },
-        })
+          }
+        }
       );
 
       await this.visit('/about');
@@ -1171,7 +1149,7 @@ moduleFor(
       assert.equal(this.$('p').text(), 'Erik Brynroflsson', 'The name is correct');
     }
 
-    [`@test The <LinkTo /> component binds some anchor html tag common attributes`](assert) {
+    async [`@test it binds some anchor html tag common attributes`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1182,15 +1160,15 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#self-link');
-        assert.equal(link.attr('title'), 'title-attr', 'The self-link contains title attribute');
-        assert.equal(link.attr('rel'), 'rel-attr', 'The self-link contains rel attribute');
-        assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
-      });
+      await this.visit('/');
+
+      let link = this.$('#self-link');
+      assert.equal(link.attr('title'), 'title-attr', 'The self-link contains title attribute');
+      assert.equal(link.attr('rel'), 'rel-attr', 'The self-link contains rel attribute');
+      assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
     }
 
-    [`@test The <LinkTo /> component supports 'target' attribute`](assert) {
+    async [`@test it supports 'target' attribute`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1199,15 +1177,13 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#self-link');
-        assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
-      });
+      await this.visit('/');
+
+      let link = this.$('#self-link');
+      assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
     }
 
-    [`@test The <LinkTo /> component supports 'target' attribute specified as a bound param`](
-      assert
-    ) {
+    async [`@test it supports 'target' attribute specified as a bound param`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1218,30 +1194,30 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundLinkTarget: '_blank',
-        })
+        class extends Controller {
+          boundLinkTarget = '_blank';
+        }
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#self-link');
-        assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
-      });
+      await this.visit('/');
+
+      let link = this.$('#self-link');
+      assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
     }
 
-    [`@test the <LinkTo /> component calls preventDefault`](assert) {
+    async [`@test it calls preventDefault`](assert) {
       this.router.map(function () {
         this.route('about');
       });
 
       this.addTemplate('index', `<LinkTo @route='about' id='about-link'>About</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: true }, () => this.$('#about-link').click(), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#about-link').click(), assert);
     }
 
-    [`@test the <LinkTo /> component does not call preventDefault if '@preventDefault={{false}}' is passed as an option`](
+    async [`@test it does not call preventDefault if '@preventDefault={{false}}' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1253,12 +1229,12 @@ moduleFor(
         `<LinkTo id='about-link' @route='about' @preventDefault={{false}}>About</LinkTo>`
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
     }
 
-    [`@test the <LinkTo /> component does not call preventDefault if '@preventDefault={{this.boundFalseyThing}}' is passed as an option`](
+    async [`@test it does not call preventDefault if '@preventDefault={{this.boundFalseyThing}}' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1272,19 +1248,17 @@ moduleFor(
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundFalseyThing: false,
-        })
+        class extends Controller {
+          boundFalseyThing = false;
+        }
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
     }
 
-    [`@test The <LinkTo /> component does not call preventDefault if 'target' attribute is provided`](
-      assert
-    ) {
+    async [`@test it does not call preventDefault if 'target' attribute is provided`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1293,12 +1267,12 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: false }, () => this.$('#self-link').click(), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: false }, () => this.$('#self-link').click(), assert);
     }
 
-    [`@test The <LinkTo /> component should preventDefault when 'target = _self'`](assert) {
+    async [`@test it should preventDefault when 'target = _self'`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1307,14 +1281,12 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: true }, () => this.$('#self-link').click(), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#self-link').click(), assert);
     }
 
-    [`@test The <LinkTo /> component should not transition if target is not equal to _self or empty`](
-      assert
-    ) {
+    async [`@test it should not transition if target is not equal to _self or empty`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1328,23 +1300,23 @@ moduleFor(
         this.route('about');
       });
 
-      return this.visit('/')
-        .then(() => this.click('#about-link'))
-        .then(() => {
-          expectDeprecation(() => {
-            let currentRouteName = this.applicationInstance
-              .lookup('controller:application')
-              .get('currentRouteName');
-            assert.notEqual(
-              currentRouteName,
-              'about',
-              'link-to should not transition if target is not equal to _self or empty'
-            );
-          }, 'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.');
-        });
+      await this.visit('/');
+
+      await this.click('#about-link');
+
+      expectDeprecation(() => {
+        let currentRouteName = this.applicationInstance
+          .lookup('controller:application')
+          .get('currentRouteName');
+        assert.notEqual(
+          currentRouteName,
+          'about',
+          'link-to should not transition if target is not equal to _self or empty'
+        );
+      }, 'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.');
     }
 
-    [`@test The <LinkTo /> component accepts string/numeric arguments`](assert) {
+    async [`@test it accepts string/numeric arguments`](assert) {
       this.router.map(function () {
         this.route('filter', { path: '/filters/:filter' });
         this.route('post', { path: '/post/:post_id' });
@@ -1353,11 +1325,11 @@ moduleFor(
 
       this.add(
         'controller:filter',
-        Controller.extend({
-          filter: 'unpopular',
-          repo: { owner: 'ember', name: 'ember.js' },
-          post_id: 123,
-        })
+        class extends Controller {
+          filter = 'unpopular';
+          repo = { owner: 'ember', name: 'ember.js' };
+          post_id = 123;
+        }
       );
 
       this.addTemplate(
@@ -1372,22 +1344,18 @@ moduleFor(
         `
       );
 
-      return this.visit('/filters/popular').then(() => {
-        assert.equal(normalizeUrl(this.$('#link').attr('href')), '/filters/unpopular');
-        assert.equal(normalizeUrl(this.$('#path-link').attr('href')), '/filters/unpopular');
-        assert.equal(normalizeUrl(this.$('#post-path-link').attr('href')), '/post/123');
-        assert.equal(normalizeUrl(this.$('#post-number-link').attr('href')), '/post/123');
-        assert.equal(
-          normalizeUrl(this.$('#repo-object-link').attr('href')),
-          '/repo/ember/ember.js'
-        );
-      });
+      await this.visit('/filters/popular');
+
+      assert.equal(normalizeUrl(this.$('#link').attr('href')), '/filters/unpopular');
+      assert.equal(normalizeUrl(this.$('#path-link').attr('href')), '/filters/unpopular');
+      assert.equal(normalizeUrl(this.$('#post-path-link').attr('href')), '/post/123');
+      assert.equal(normalizeUrl(this.$('#post-number-link').attr('href')), '/post/123');
+      assert.equal(normalizeUrl(this.$('#repo-object-link').attr('href')), '/repo/ember/ember.js');
     }
 
-    [`@test Issue 4201 - Shorthand for route.index shouldn't throw errors about context arguments`](
+    async [`@test [GH#4201] Shorthand for route.index shouldn't throw errors about context arguments`](
       assert
     ) {
-      assert.expect(2);
       this.router.map(function () {
         this.route('lobby', function () {
           this.route('index', { path: ':lobby_id' });
@@ -1397,12 +1365,12 @@ moduleFor(
 
       this.add(
         'route:lobby.index',
-        Route.extend({
+        class extends Route {
           model(params) {
             assert.equal(params.lobby_id, 'foobar');
             return params.lobby_id;
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
@@ -1415,12 +1383,14 @@ moduleFor(
         `<LinkTo id='lobby-link' @route='lobby' @model='foobar'>Lobby</LinkTo>`
       );
 
-      return this.visit('/lobby/list')
-        .then(() => this.click('#lobby-link'))
-        .then(() => shouldBeActive(assert, this.$('#lobby-link')));
+      await this.visit('/lobby/list');
+
+      await this.click('#lobby-link');
+
+      shouldBeActive(assert, this.$('#lobby-link'));
     }
 
-    [`@test Quoteless route param performs property lookup`](assert) {
+    async [`@test Quoteless route param performs property lookup`](assert) {
       this.router.map(function () {
         this.route('about');
       });
@@ -1433,11 +1403,18 @@ moduleFor(
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          foo: 'index',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          foo = 'index';
+        }
       );
 
       let assertEquality = (href) => {
@@ -1445,17 +1422,16 @@ moduleFor(
         assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
       };
 
-      return this.visit('/').then(() => {
-        assertEquality('/');
+      await this.visit('/');
 
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('foo', 'about'));
+      assertEquality('/');
 
-        assertEquality('/about');
-      });
+      runTask(() => controller.set('foo', 'about'));
+
+      assertEquality('/about');
     }
 
-    [`@test The <LinkTo /> component refreshes href element when one of params changes`](assert) {
+    async [`@test it refreshes href element when one of params changes`](assert) {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
@@ -1468,37 +1444,46 @@ moduleFor(
         `<LinkTo id="post" @route="post" @model={{this.post}}>post</LinkTo>`
       );
 
-      this.add('controller:index', Controller.extend());
+      let controller;
 
-      return this.visit('/').then(() => {
-        let indexController = this.applicationInstance.lookup('controller:index');
-        runTask(() => indexController.set('post', post));
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+        }
+      );
 
-        assert.equal(
-          normalizeUrl(this.$('#post').attr('href')),
-          '/posts/1',
-          'precond - Link has rendered href attr properly'
-        );
+      await this.visit('/');
 
-        runTask(() => indexController.set('post', secondPost));
+      runTask(() => controller.set('post', post));
 
-        assert.equal(
-          this.$('#post').attr('href'),
-          '/posts/2',
-          'href attr was updated after one of the params had been changed'
-        );
+      assert.equal(
+        normalizeUrl(this.$('#post').attr('href')),
+        '/posts/1',
+        'precond - Link has rendered href attr properly'
+      );
 
-        runTask(() => indexController.set('post', null));
+      runTask(() => controller.set('post', secondPost));
 
-        assert.equal(
-          this.$('#post').attr('href'),
-          '#',
-          'href attr becomes # when one of the arguments in nullified'
-        );
-      });
+      assert.equal(
+        this.$('#post').attr('href'),
+        '/posts/2',
+        'href attr was updated after one of the params had been changed'
+      );
+
+      runTask(() => controller.set('post', null));
+
+      assert.equal(
+        this.$('#post').attr('href'),
+        '#',
+        'href attr becomes # when one of the arguments in nullified'
+      );
     }
 
-    [`@test The <LinkTo /> component is active when a route is active`](assert) {
+    async [`@test it is active when a route is active`](assert) {
       this.router.map(function () {
         this.route('about', function () {
           this.route('item');
@@ -1516,33 +1501,38 @@ moduleFor(
         `
       );
 
-      return this.visit('/about')
-        .then(() => {
-          assert.equal(this.$('#about-link.active').length, 1, 'The about route link is active');
-          assert.equal(this.$('#item-link.active').length, 0, 'The item route link is inactive');
+      await this.visit('/about');
 
-          return this.visit('/about/item');
-        })
-        .then(() => {
-          assert.equal(this.$('#about-link.active').length, 1, 'The about route link is active');
-          assert.equal(this.$('#item-link.active').length, 1, 'The item route link is active');
-        });
+      assert.equal(this.$('#about-link.active').length, 1, 'The about route link is active');
+      assert.equal(this.$('#item-link.active').length, 0, 'The item route link is inactive');
+
+      await this.visit('/about/item');
+
+      assert.equal(this.$('#about-link.active').length, 1, 'The about route link is active');
+      assert.equal(this.$('#item-link.active').length, 1, 'The item route link is active');
     }
 
-    [`@test The <LinkTo /> component works in an #each'd array of string route names`](assert) {
+    async [`@test it works in an #each'd array of string route names`](assert) {
       this.router.map(function () {
         this.route('foo');
         this.route('bar');
         this.route('rar');
       });
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          routeNames: emberA(['foo', 'bar', 'rar']),
-          route1: 'bar',
-          route2: 'foo',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          routeNames = emberA(['foo', 'bar', 'rar']);
+          route1 = 'bar';
+          route2 = 'foo';
+        }
       );
 
       this.addTemplate(
@@ -1574,21 +1564,20 @@ moduleFor(
         }
       };
 
-      return this.visit('/').then(() => {
-        linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/bar', '/foo']);
+      await this.visit('/');
 
-        let indexController = this.applicationInstance.lookup('controller:index');
-        runTask(() => indexController.set('route1', 'rar'));
+      linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/bar', '/foo']);
 
-        linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/rar', '/foo']);
+      runTask(() => controller.set('route1', 'rar'));
 
-        runTask(() => indexController.routeNames.shiftObject());
+      linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/rar', '/foo']);
 
-        linksEqual(this.$('a'), ['/bar', '/rar', '/bar', '/rar', '/rar', '/foo']);
-      });
+      runTask(() => controller.routeNames.shiftObject());
+
+      linksEqual(this.$('a'), ['/bar', '/rar', '/bar', '/rar', '/rar', '/foo']);
     }
 
-    async [`@test the <LinkTo /> component throws a useful error if you invoke it wrong`](assert) {
+    async [`@test it throws a useful error if you invoke it wrong`](assert) {
       if (!DEBUG) {
         assert.expect(0);
         return;
@@ -1606,7 +1595,7 @@ moduleFor(
       );
     }
 
-    [`@test the <LinkTo /> component does not throw an error if its route has exited`](assert) {
+    async [`@test it does not throw an error if its route has exited`](assert) {
       assert.expect(0);
 
       this.router.map(function () {
@@ -1626,37 +1615,39 @@ moduleFor(
 
       this.add(
         'controller:application',
-        Controller.extend({
-          defaultPost: { id: 1 },
-          postController: injectController('post'),
-          currentPost: alias('postController.model'),
-        })
+        class extends Controller {
+          defaultPost = { id: 1 };
+
+          @injectController('post') postController;
+
+          get currentPost() {
+            return this.postController.model;
+          }
+        }
       );
 
-      this.add('controller:post', Controller.extend());
+      this.add('controller:post', class extends Controller {});
 
       this.add(
         'route:post',
-        Route.extend({
+        class extends Route {
           model() {
             return { id: 2 };
-          },
+          }
           serialize(model) {
             return { post_id: model.id };
-          },
-        })
+          }
+        }
       );
 
-      return this.visit('/')
-        .then(() => this.click('#default-post-link'))
-        .then(() => this.click('#home-link'))
-        .then(() => this.click('#current-post-link'))
-        .then(() => this.click('#home-link'));
+      await this.visit('/');
+      await this.click('#default-post-link');
+      await this.click('#home-link');
+      await this.click('#current-post-link');
+      await this.click('#home-link');
     }
 
-    [`@test the <LinkTo /> component's active property respects changing parent route context`](
-      assert
-    ) {
+    async [`@test its active property respects changing parent route context`](assert) {
       this.router.map(function () {
         this.route('things', { path: '/things/:name' }, function () {
           this.route('other');
@@ -1671,46 +1662,44 @@ moduleFor(
         `
       );
 
-      return this.visit('/things/omg')
-        .then(() => {
-          shouldBeActive(assert, this.$('#omg-link'));
-          shouldNotBeActive(assert, this.$('#lol-link'));
+      await this.visit('/things/omg');
 
-          return this.visit('/things/omg/other');
-        })
-        .then(() => {
-          shouldBeActive(assert, this.$('#omg-link'));
-          shouldNotBeActive(assert, this.$('#lol-link'));
-        });
+      shouldBeActive(assert, this.$('#omg-link'));
+      shouldNotBeActive(assert, this.$('#lol-link'));
+
+      await this.visit('/things/omg/other');
+
+      shouldBeActive(assert, this.$('#omg-link'));
+      shouldNotBeActive(assert, this.$('#lol-link'));
     }
 
-    [`@test the <LinkTo /> component populates href with default query param values even without query-params object`](
+    async [`@test it populates href with default query param values even without query-params object`](
       assert
     ) {
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['foo'],
-          foo: '123',
-        })
+        class extends Controller {
+          queryParams = ['foo'];
+          foo = '123';
+        }
       );
 
       this.addTemplate('index', `<LinkTo id='the-link' @route='index'>Index</LinkTo>`);
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
     }
 
-    [`@test the <LinkTo /> component populates href with default query param values with empty query-params object`](
+    async [`@test it populates href with default query param values with empty query-params object`](
       assert
     ) {
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['foo'],
-          foo: '123',
-        })
+        class extends Controller {
+          queryParams = ['foo'];
+          foo = '123';
+        }
       );
 
       this.addTemplate(
@@ -1718,25 +1707,23 @@ moduleFor(
         `<LinkTo id='the-link' @route='index' @query={{hash}}>Index</LinkTo>`
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
     }
 
-    [`@test the <LinkTo /> component with only query-params and a block updates when route changes`](
-      assert
-    ) {
+    async [`@test it updates when route changes with only query-params and a block`](assert) {
       this.router.map(function () {
         this.route('about');
       });
 
       this.add(
         'controller:application',
-        Controller.extend({
-          queryParams: ['foo', 'bar'],
-          foo: '123',
-          bar: 'yes',
-        })
+        class extends Controller {
+          queryParams = ['foo', 'bar'];
+          foo = '123';
+          bar = 'yes';
+        }
       );
 
       this.addTemplate(
@@ -1744,39 +1731,33 @@ moduleFor(
         `<LinkTo id='the-link' @query={{hash foo='456' bar='NAW'}}>Index</LinkTo>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          assert.equal(
-            this.$('#the-link').attr('href'),
-            '/?bar=NAW&foo=456',
-            'link has right href'
-          );
+      await this.visit('/');
 
-          return this.visit('/about');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#the-link').attr('href'),
-            '/about?bar=NAW&foo=456',
-            'link has right href'
-          );
-        });
+      assert.equal(this.$('#the-link').attr('href'), '/?bar=NAW&foo=456', 'link has right href');
+
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#the-link').attr('href'),
+        '/about?bar=NAW&foo=456',
+        'link has right href'
+      );
     }
 
-    ['@test [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
+    async ['@test [GH#17018] passing model to <LinkTo /> with `hash` helper works']() {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
       this.add(
         'route:index',
-        Route.extend({
+        class extends Route {
           model() {
             return RSVP.hash({
               user: { name: 'Papa Smurf' },
             });
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
@@ -1786,19 +1767,17 @@ moduleFor(
 
       this.addTemplate('post', 'Post: {{@model.user.name}}');
 
-      return this.visit('/')
-        .then(() => {
-          this.assertComponentElement(this.firstChild, {
-            tagName: 'a',
-            attrs: { href: '/posts/someId' },
-            content: 'Post',
-          });
-
-          return this.click('a');
-        })
-        .then(() => {
-          this.assertText('Post: Papa Smurf');
-        });
+      await this.visit('/');
+
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/posts/someId' },
+        content: 'Post',
+      });
+
+      await this.click('a');
+
+      this.assertText('Post: Papa Smurf');
     }
 
     async [`@test [DEPRECATED] The <LinkTo /> component can use dynamic params`](assert) {
@@ -1807,14 +1786,18 @@ moduleFor(
         this.route('bar', { path: 'bar/:some/:thing/:else' });
       });
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.dynamicLinkParams = ['foo', 'one', 'two'];
-          },
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicLinkParams = ['foo', 'one', 'two'];
+        }
       );
 
       this.addTemplate(
@@ -1834,22 +1817,17 @@ moduleFor(
 
       assert.equal(link.attr('href'), '/foo/one/two');
 
-      let controller = this.applicationInstance.lookup('controller:index');
-
-      expectDeprecation(() => {
-        runTask(() => {
-          controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three']);
-        });
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+      expectDeprecation(
+        () => runTask(() => controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three'])),
+        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
+      );
 
       assert.equal(link.attr('href'), '/bar/one/two/three');
     }
 
-    [`@test GJ: <LinkTo /> to a parent root model hook which performs a 'transitionTo' has correct active class #13256`](
+    async [`@test [GH#13256]: <LinkTo /> to a parent root model hook which performs a 'transitionTo' has correct active class`](
       assert
     ) {
-      assert.expect(3);
-
       this.router.map(function () {
         this.route('parent', function () {
           this.route('child');
@@ -1858,24 +1836,22 @@ moduleFor(
 
       this.add(
         'route:parent',
-        Route.extend({
+        class extends Route {
           afterModel() {
             expectDeprecation(() => {
               this.transitionTo('parent.child');
             }, /Calling transitionTo on a route is deprecated/);
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate('application', `<LinkTo id='parent-link' @route='parent'>Parent</LinkTo>`);
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#parent-link');
-        })
-        .then(() => {
-          shouldBeActive(assert, this.$('#parent-link'));
-        });
+      await this.visit('/');
+
+      await this.click('#parent-link');
+
+      shouldBeActive(assert, this.$('#parent-link'));
     }
   }
 );
@@ -1883,8 +1859,9 @@ moduleFor(
 moduleFor(
   'The <LinkTo /> component - loading states and warnings',
   class extends ApplicationTestCase {
-    [`@test <LinkTo /> with null/undefined dynamic parameters are put in a loading state`](assert) {
-      assert.expect(19);
+    async [`@test <LinkTo /> with null/undefined dynamic parameters are put in a loading state`](
+      assert
+    ) {
       let warningMessage =
         'This link is in an inactive loading state because at least one of its models currently has a null/undefined value, or the provided route name is invalid.';
 
@@ -1905,22 +1882,31 @@ moduleFor(
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          destinationRoute: null,
-          routeContext: null,
-          loadingClass: 'i-am-loading',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          destinationRoute = null;
+          routeContext = null;
+          loadingClass = 'i-am-loading';
+        }
       );
 
+      let activate = 0;
+
       this.add(
         'route:about',
-        Route.extend({
+        class extends Route {
           activate() {
-            assert.ok(true, 'About was entered');
-          },
-        })
+            activate++;
+          }
+        }
       );
 
       function assertLinkStatus(link, url) {
@@ -1933,55 +1919,45 @@ moduleFor(
         }
       }
 
-      let contextLink, staticLink, controller;
-
-      return this.visit('/')
-        .then(() => {
-          contextLink = this.$('#context-link');
-          staticLink = this.$('#static-link');
-          controller = this.applicationInstance.lookup('controller:index');
-
-          assertLinkStatus(contextLink);
-          assertLinkStatus(staticLink);
-
-          return expectWarning(() => {
-            return this.click(contextLink[0]);
-          }, warningMessage);
-        })
-        .then(() => {
-          // Set the destinationRoute (context is still null).
-          runTask(() => controller.set('destinationRoute', 'thing'));
-          assertLinkStatus(contextLink);
-
-          // Set the routeContext to an id
-          runTask(() => controller.set('routeContext', '456'));
-          assertLinkStatus(contextLink, '/thing/456');
-
-          // Test that 0 isn't interpreted as falsy.
-          runTask(() => controller.set('routeContext', 0));
-          assertLinkStatus(contextLink, '/thing/0');
-
-          // Set the routeContext to an object
-          runTask(() => {
-            controller.set('routeContext', { id: 123 });
-          });
-          assertLinkStatus(contextLink, '/thing/123');
-
-          // Set the destinationRoute back to null.
-          runTask(() => controller.set('destinationRoute', null));
-          assertLinkStatus(contextLink);
-
-          return expectWarning(() => {
-            return this.click(staticLink[0]);
-          }, warningMessage);
-        })
-        .then(() => {
-          runTask(() => controller.set('secondRoute', 'about'));
-          assertLinkStatus(staticLink, '/about');
-
-          // Click the now-active link
-          return this.click(staticLink[0]);
-        });
+      await this.visit('/');
+
+      let contextLink = this.$('#context-link');
+      let staticLink = this.$('#static-link');
+
+      assertLinkStatus(contextLink);
+      assertLinkStatus(staticLink);
+
+      await expectWarning(() => this.click(contextLink[0]), warningMessage);
+
+      // Set the destinationRoute (context is still null).
+      runTask(() => controller.set('destinationRoute', 'thing'));
+      assertLinkStatus(contextLink);
+
+      // Set the routeContext to an id
+      runTask(() => controller.set('routeContext', '456'));
+      assertLinkStatus(contextLink, '/thing/456');
+
+      // Test that 0 isn't interpreted as falsy.
+      runTask(() => controller.set('routeContext', 0));
+      assertLinkStatus(contextLink, '/thing/0');
+
+      // Set the routeContext to an object
+      runTask(() => controller.set('routeContext', { id: 123 }));
+      assertLinkStatus(contextLink, '/thing/123');
+
+      // Set the destinationRoute back to null.
+      runTask(() => controller.set('destinationRoute', null));
+      assertLinkStatus(contextLink);
+
+      await expectWarning(() => this.click(staticLink[0]), warningMessage);
+
+      runTask(() => controller.set('secondRoute', 'about'));
+      assertLinkStatus(staticLink, '/about');
+
+      // Click the now-active link
+      await this.click(staticLink[0]);
+
+      assert.equal(activate, 1, 'About route was entered');
     }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 5a02c7758cf..53eafd36b3e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -2,12 +2,10 @@ import {
   ApplicationTestCase,
   ModuleBasedTestResolver,
   moduleFor,
-  runLoopSettled,
   runTask,
 } from 'internal-test-helpers';
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
-import { alias } from '@ember/-internals/metal';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
@@ -47,319 +45,326 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link'}}About{{/link-to}}
-        {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+        <div id="about-link">{{#link-to route='about'}}About{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='index'}}Self{{/link-to}}</div>
         `
       );
       this.addTemplate(
         'about',
         `
         <h3 class="about">About</h3>
-        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
-        {{#link-to route='about' id='self-link'}}Self{{/link-to}}
+        <div id="home-link">{{#link-to route='index'}}Home{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='about'}}Self{{/link-to}}</div>
         `
       );
     }
 
-    ['@test The {{link-to}} component navigates into the named route'](assert) {
-      return this.visit('/')
-        .then(() => {
-          assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
-          assert.equal(
-            this.$('#self-link.active').length,
-            1,
-            'The self-link was rendered with active class'
-          );
-          assert.equal(
-            this.$('#about-link:not(.active)').length,
-            1,
-            'The other link was rendered without active class'
-          );
+    async ['@test it navigates into the named route'](assert) {
+      await this.visit('/');
 
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 1, 'The about template was rendered');
-          assert.equal(
-            this.$('#self-link.active').length,
-            1,
-            'The self-link was rendered with active class'
-          );
-          assert.equal(
-            this.$('#home-link:not(.active)').length,
-            1,
-            'The other link was rendered without active class'
-          );
-        });
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link a.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+
+      await this.click('#about-link > a');
+
+      assert.equal(this.$('h3.about').length, 1, 'The about template was rendered');
+      assert.equal(
+        this.$('#self-link > a.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#home-link > a:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
-    [`@test the {{link-to}} component doesn't add an href when the tagName isn't 'a'`](assert) {
+    async [`@test it doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to route='about' id='about-link' tagName='div'}}About{{/link-to}}`
+        `<div id='about-link'>{{#link-to route='about' tagName='div'}}About{{/link-to}}</div>`
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#about-link').attr('href'), undefined, 'there is no href attribute');
-      });
+      await this.visit('/');
+
+      assert.strictEqual(
+        this.$('#about-link > div').attr('href'),
+        null,
+        'there is no href attribute'
+      );
     }
 
-    [`@test the {{link-to}} component applies a 'disabled' class when disabled`](assert) {
+    async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to route="about" id="about-link-static" disabledWhen="shouldDisable"}}About{{/link-to}}
-        {{#link-to route="about" id="about-link-dynamic" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}
+        <div id="about-link-static">{{#link-to route="about" disabledWhen="shouldDisable"}}About{{/link-to}}</div>
+        <div id="about-link-dynamic">{{#link-to route="about" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}</div>
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          shouldDisable: true,
-          dynamicDisabledWhen: 'shouldDisable',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          shouldDisable = true;
+          dynamicDisabledWhen = 'shouldDisable';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link-static.disabled').length,
-          1,
-          'The static link is disabled when its disabledWhen is true'
-        );
-        assert.equal(
-          this.$('#about-link-dynamic.disabled').length,
-          1,
-          'The dynamic link is disabled when its disabledWhen is true'
-        );
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link-static > a.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.equal(
+        this.$('#about-link-dynamic > a.disabled').length,
+        1,
+        'The dynamic link is disabled when its disabledWhen is true'
+      );
 
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('dynamicDisabledWhen', false));
+      runTask(() => controller.set('dynamicDisabledWhen', false));
 
-        assert.equal(
-          this.$('#about-link-dynamic.disabled').length,
-          0,
-          'The dynamic link is re-enabled when its disabledWhen becomes false'
-        );
-      });
+      assert.equal(
+        this.$('#about-link-dynamic > a.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabledWhen becomes false'
+      );
     }
 
-    [`@test the {{link-to}} component doesn't apply a 'disabled' class if disabledWhen is not provided`](
-      assert
-    ) {
-      this.addTemplate('index', `{{#link-to route="about" id="about-link"}}About{{/link-to}}`);
+    async [`@test it doesn't apply a 'disabled' class if disabledWhen is not provided`](assert) {
+      this.addTemplate(
+        'index',
+        `<div id="about-link">{{#link-to route="about"}}About{{/link-to}}</div>`
+      );
 
-      return this.visit('/').then(() => {
-        assert.ok(
-          !this.$('#about-link').hasClass('disabled'),
-          'The link is not disabled if disabledWhen not provided'
-        );
-      });
+      await this.visit('/');
+
+      assert.ok(
+        !this.$('#about-link > a').hasClass('disabled'),
+        'The link is not disabled if disabledWhen not provided'
+      );
     }
 
-    [`@test the {{link-to}} component supports a custom disabledClass`](assert) {
+    async [`@test it supports a custom disabledClass`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to route="about" id="about-link" disabledWhen=true disabledClass="do-not-want"}}About{{/link-to}}`
+        `<div id="about-link">{{#link-to route="about" disabledWhen=true disabledClass="do-not-want"}}About{{/link-to}}</div>`
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link.do-not-want').length,
-          1,
-          'The link can apply a custom disabled class'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link > a.do-not-want').length,
+        1,
+        'The link can apply a custom disabled class'
+      );
     }
 
-    [`@test the {{link-to}} component supports a custom disabledClass set via bound param`](
-      assert
-    ) {
+    async [`@test it supports a custom disabledClass set via bound param`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to route="about" id="about-link" disabledWhen=true disabledClass=this.disabledClass}}About{{/link-to}}`
+        `<div id="about-link">{{#link-to route="about" disabledWhen=true disabledClass=this.disabledClass}}About{{/link-to}}</div>`
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          disabledClass: 'do-not-want',
-        })
+        class extends Controller {
+          disabledClass = 'do-not-want';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link.do-not-want').length,
-          1,
-          'The link can apply a custom disabled class via bound param'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link > a.do-not-want').length,
+        1,
+        'The link can apply a custom disabled class via bound param'
+      );
     }
 
-    [`@test the {{link-to}} component does not respond to clicks when disabledWhen`](assert) {
+    async [`@test it does not respond to clicks when disabledWhen`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to route="about" id="about-link" disabledWhen=true}}About{{/link-to}}`
+        `<div id="about-link">{{#link-to route="about" disabledWhen=true}}About{{/link-to}}</div>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 0, 'Transitioning did not occur');
-        });
+      await this.visit('/');
+
+      await this.click('#about-link > a');
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
 
-    [`@test the {{link-to}} component does not respond to clicks when disabled`](assert) {
+    async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to route="about" id="about-link" disabled=true}}About{{/link-to}}`
+        `<div id="about-link">{{#link-to route="about" disabled=true}}About{{/link-to}}</div>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 0, 'Transitioning did not occur');
-        });
+      await this.visit('/');
+
+      await this.click('#about-link > a');
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
 
-    [`@test the {{link-to}} component responds to clicks according to its disabledWhen bound param`](
-      assert
-    ) {
+    async [`@test it responds to clicks according to its disabledWhen bound param`](assert) {
       this.addTemplate(
         'index',
-        `{{#link-to route="about" id="about-link" disabledWhen=this.disabledWhen}}About{{/link-to}}`
+        `<div id="about-link">{{#link-to route="about" disabledWhen=this.disabledWhen}}About{{/link-to}}</div>`
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          disabledWhen: true,
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          disabledWhen = true;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.about').length, 0, 'Transitioning did not occur');
+      await this.visit('/');
 
-          let controller = this.applicationInstance.lookup('controller:index');
-          controller.set('disabledWhen', false);
+      await this.click('#about-link > a');
 
-          return runLoopSettled();
-        })
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('h3.about').length,
-            1,
-            'Transitioning did occur when disabledWhen became false'
-          );
-        });
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
+
+      runTask(() => controller.set('disabledWhen', false));
+
+      await this.click('#about-link > a');
+
+      assert.equal(
+        this.$('h3.about').length,
+        1,
+        'Transitioning did occur when disabledWhen became false'
+      );
     }
 
-    [`@test The {{link-to}} component supports a custom activeClass`](assert) {
+    async [`@test it supports a custom activeClass`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link'}}About{{/link-to}}
-        {{#link-to route='index' id='self-link' activeClass='zomg-active'}}Self{{/link-to}}
+        <div id="about-link">{{#link-to route='about' activeClass='zomg-active'}}About{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='index' activeClass='zomg-active'}}Self{{/link-to}}</div>
         `
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
-        assert.equal(
-          this.$('#self-link.zomg-active').length,
-          1,
-          'The self-link was rendered with active class'
-        );
-        assert.equal(
-          this.$('#about-link:not(.active)').length,
-          1,
-          'The other link was rendered without active class'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link > a.zomg-active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.zomg-active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
-    [`@test The {{link-to}} component supports a custom activeClass from a bound param`](assert) {
+    async [`@test it supports a custom activeClass from a bound param`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link'}}About{{/link-to}}
-        {{#link-to route='index' id='self-link' activeClass=this.activeClass}}Self{{/link-to}}
+        <div id="about-link">{{#link-to route='about' activeClass=this.activeClass}}About{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='index' activeClass=this.activeClass}}Self{{/link-to}}</div>
         `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          activeClass: 'zomg-active',
-        })
+        class extends Controller {
+          activeClass = 'zomg-active';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
-        assert.equal(
-          this.$('#self-link.zomg-active').length,
-          1,
-          'The self-link was rendered with active class'
-        );
-        assert.equal(
-          this.$('#about-link:not(.active)').length,
-          1,
-          'The other link was rendered without active class'
-        );
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link > a.zomg-active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.zomg-active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
-    [`@test The {{link-to}} component supports 'classNameBindings' with custom values [GH #11699]`](
+    async [`@test [DEPRECATED] it supports 'classNameBindings' with custom values [GH #11699]`](
       assert
     ) {
       expectDeprecation(
-        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('my-app/templates/index.hbs' @ L3:C8) "
+        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('my-app/templates/index.hbs' @ L3:C29) "
       );
 
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link' classNameBindings='this.foo:foo-is-true:foo-is-false'}}About{{/link-to}}
+        <div id="about-link">{{#link-to route='about' classNameBindings='this.foo:foo-is-true:foo-is-false'}}About{{/link-to}}</div>
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          foo: false,
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          foo = false;
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(
-          this.$('#about-link.foo-is-false').length,
-          1,
-          'The about-link was rendered with the falsy class'
-        );
+      await this.visit('/');
 
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('foo', true));
+      assert.equal(
+        this.$('#about-link > a.foo-is-false').length,
+        1,
+        'The about-link was rendered with the falsy class'
+      );
 
-        assert.equal(
-          this.$('#about-link.foo-is-true').length,
-          1,
-          'The about-link was rendered with the truthy class after toggling the property'
-        );
-      });
+      runTask(() => controller.set('foo', true));
+
+      assert.equal(
+        this.$('#about-link > a.foo-is-true').length,
+        1,
+        'The about-link was rendered with the truthy class after toggling the property'
+      );
     }
 
     async ['@test Using {{link-to}} inside a non-routable engine errors'](assert) {
@@ -404,7 +409,7 @@ moduleFor(
                 `
                 <h2 id='engine-layout'>Routable Engine</h2>
                 {{outlet}}
-                {{#link-to route='application' id='engine-application-link'}}Engine Application{{/link-to}}
+                <div id="engine-application-link">{{#link-to route='application'}}Engine Application{{/link-to}}</div>
                 `,
                 {
                   moduleName: 'routable/templates/application.hbs',
@@ -416,8 +421,8 @@ moduleFor(
               compile(
                 `
                 <h3 class='engine-home'>Engine Home</h3>
-                {{#link-to route='about' id='engine-about-link'}}Engine About{{/link-to}}
-                {{#link-to route='index' id='engine-self-link'}}Engine Self{{/link-to}}
+                <div id="engine-about-link">{{#link-to route='about'}}Engine About{{/link-to}}</div>
+                <div id="engine-self-link">{{#link-to route='index'}}Engine Self{{/link-to}}</div>
                 `,
                 {
                   moduleName: 'routable/templates/index.hbs',
@@ -429,8 +434,8 @@ moduleFor(
               compile(
                 `
                 <h3 class='engine-about'>Engine About</h3>
-                {{#link-to route='index' id='engine-home-link'}}Engine Home{{/link-to}}
-                {{#link-to route='about' id='engine-self-link'}}Engine Self{{/link-to}}
+                <div id="engine-home-link">{{#link-to route='index'}}Engine Home{{/link-to}}</div>
+                <div id="engine-self-link">{{#link-to route='about'}}Engine Self{{/link-to}}</div>
                 `,
                 {
                   moduleName: 'routable/templates/about.hbs',
@@ -454,8 +459,8 @@ moduleFor(
         `
         <h1 id="application-layout">Application</h1>
         {{outlet}}
-        {{#link-to route='application' id='application-link'}}Appliction{{/link-to}}
-        {{#link-to route='routable' id='engine-link'}}Engine{{/link-to}}
+        <div id="application-link">{{#link-to route='application'}}Appliction{{/link-to}}</div>
+        <div id="engine-link">{{#link-to route='routable'}}Engine{{/link-to}}</div>
         `
       );
 
@@ -463,103 +468,163 @@ moduleFor(
 
       assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
       assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
-      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
-      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+      assert.equal(
+        this.$('#application-link > a.active').length,
+        1,
+        'The application link is active'
+      );
+      assert.equal(
+        this.$('#engine-link > a:not(.active)').length,
+        1,
+        'The engine link is not active'
+      );
 
       assert.equal(this.$('h3.home').length, 1, 'The application index page is rendered');
-      assert.equal(this.$('#self-link.active').length, 1, 'The application index link is active');
       assert.equal(
-        this.$('#about-link:not(.active)').length,
+        this.$('#self-link > a.active').length,
+        1,
+        'The application index link is active'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.active)').length,
         1,
         'The application about link is not active'
       );
 
-      await this.click('#about-link');
+      await this.click('#about-link > a');
 
       assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
       assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
-      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
-      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+      assert.equal(
+        this.$('#application-link > a.active').length,
+        1,
+        'The application link is active'
+      );
+      assert.equal(
+        this.$('#engine-link > a:not(.active)').length,
+        1,
+        'The engine link is not active'
+      );
 
       assert.equal(this.$('h3.about').length, 1, 'The application about page is rendered');
-      assert.equal(this.$('#self-link.active').length, 1, 'The application about link is active');
       assert.equal(
-        this.$('#home-link:not(.active)').length,
+        this.$('#self-link > a.active').length,
+        1,
+        'The application about link is active'
+      );
+      assert.equal(
+        this.$('#home-link > a:not(.active)').length,
         1,
         'The application home link is not active'
       );
 
-      await this.click('#engine-link');
+      await this.click('#engine-link > a');
 
       assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
       assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
-      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
-      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
       assert.equal(
-        this.$('#engine-application-link.active').length,
+        this.$('#application-link > a.active').length,
+        1,
+        'The application link is active'
+      );
+      assert.equal(this.$('#engine-link > a.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link > a.active').length,
         1,
         'The engine application link is active'
       );
 
       assert.equal(this.$('h3.engine-home').length, 1, 'The engine index page is rendered');
-      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine index link is active');
       assert.equal(
-        this.$('#engine-about-link:not(.active)').length,
+        this.$('#engine-self-link > a.active').length,
+        1,
+        'The engine index link is active'
+      );
+      assert.equal(
+        this.$('#engine-about-link > a:not(.active)').length,
         1,
         'The engine about link is not active'
       );
 
-      await this.click('#engine-about-link');
+      await this.click('#engine-about-link > a');
 
       assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
       assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
-      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
-      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
       assert.equal(
-        this.$('#engine-application-link.active').length,
+        this.$('#application-link > a.active').length,
+        1,
+        'The application link is active'
+      );
+      assert.equal(this.$('#engine-link > a.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link > a.active').length,
         1,
         'The engine application link is active'
       );
 
       assert.equal(this.$('h3.engine-about').length, 1, 'The engine about page is rendered');
-      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine about link is active');
       assert.equal(
-        this.$('#engine-home-link:not(.active)').length,
+        this.$('#engine-self-link > a.active').length,
+        1,
+        'The engine about link is active'
+      );
+      assert.equal(
+        this.$('#engine-home-link > a:not(.active)').length,
         1,
         'The engine home link is not active'
       );
 
-      await this.click('#engine-application-link');
+      await this.click('#engine-application-link > a');
 
       assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
       assert.equal(this.$('#engine-layout').length, 1, 'The engine layout was rendered');
-      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
-      assert.equal(this.$('#engine-link.active').length, 1, 'The engine link is active');
       assert.equal(
-        this.$('#engine-application-link.active').length,
+        this.$('#application-link > a.active').length,
+        1,
+        'The application link is active'
+      );
+      assert.equal(this.$('#engine-link > a.active').length, 1, 'The engine link is active');
+      assert.equal(
+        this.$('#engine-application-link > a.active').length,
         1,
         'The engine application link is active'
       );
 
       assert.equal(this.$('h3.engine-home').length, 1, 'The engine index page is rendered');
-      assert.equal(this.$('#engine-self-link.active').length, 1, 'The engine index link is active');
       assert.equal(
-        this.$('#engine-about-link:not(.active)').length,
+        this.$('#engine-self-link > a.active').length,
+        1,
+        'The engine index link is active'
+      );
+      assert.equal(
+        this.$('#engine-about-link > a:not(.active)').length,
         1,
         'The engine about link is not active'
       );
 
-      await this.click('#application-link');
+      await this.click('#application-link > a');
 
       assert.equal(this.$('#application-layout').length, 1, 'The application layout was rendered');
       assert.strictEqual(this.$('#engine-layout').length, 0, 'The engine layout was not rendered');
-      assert.equal(this.$('#application-link.active').length, 1, 'The application link is active');
-      assert.equal(this.$('#engine-link:not(.active)').length, 1, 'The engine link is not active');
+      assert.equal(
+        this.$('#application-link > a.active').length,
+        1,
+        'The application link is active'
+      );
+      assert.equal(
+        this.$('#engine-link > a:not(.active)').length,
+        1,
+        'The engine link is not active'
+      );
 
       assert.equal(this.$('h3.home').length, 1, 'The application index page is rendered');
-      assert.equal(this.$('#self-link.active').length, 1, 'The application index link is active');
       assert.equal(
-        this.$('#about-link:not(.active)').length,
+        this.$('#self-link > a.active').length,
+        1,
+        'The application index link is active'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.active)').length,
         1,
         'The application about link is not active'
       );
@@ -577,18 +642,19 @@ moduleFor(
       this.replaceCount = 0;
 
       let testContext = this;
+
       this.add(
         'location:none',
-        NoneLocation.extend({
-          setURL() {
+        class extends NoneLocation {
+          setURL(...args) {
             testContext.updateCount++;
-            return this._super(...arguments);
-          },
-          replaceURL() {
+            return super.setURL(...args);
+          }
+          replaceURL(...args) {
             testContext.replaceCount++;
-            return this._super(...arguments);
-          },
-        })
+            return super.setURL(...args);
+          }
+        }
       );
 
       this.router.map(function () {
@@ -599,110 +665,102 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link'}}About{{/link-to}}
-        {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+        <div id="about-link">{{#link-to route='about'}}About{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='index'}}Self{{/link-to}}</div>
         `
       );
       this.addTemplate(
         'about',
         `
         <h3 class="about">About</h3>
-        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
-        {{#link-to route='about' id='self-link'}}Self{{/link-to}}
+        <div id="home-link">{{#link-to route='index'}}Home{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='about'}}Self{{/link-to}}</div>
         `
       );
     }
 
-    visit() {
-      return super.visit(...arguments).then(() => {
-        this.updateCountAfterVisit = this.updateCount;
-        this.replaceCountAfterVisit = this.replaceCount;
-      });
+    async visit(...args) {
+      await super.visit(...args);
+
+      this.updateCountAfterVisit = this.updateCount;
+      this.replaceCountAfterVisit = this.replaceCount;
     }
 
-    ['@test The {{link-to}} component supports URL replacement'](assert) {
+    async ['@test it supports URL replacement'](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link' replace=true}}About{{/link-to}}
+        <div id="about-link">{{#link-to route='about' replace=true}}About{{/link-to}}</div>
         `
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-          assert.equal(
-            this.replaceCount,
-            this.replaceCountAfterVisit + 1,
-            'replaceURL should be called once'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#about-link > a');
+
+      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
+      assert.equal(
+        this.replaceCount,
+        this.replaceCountAfterVisit + 1,
+        'replaceURL should be called once'
+      );
     }
 
-    ['@test The {{link-to}} component supports URL replacement via replace=boundTruthyThing'](
-      assert
-    ) {
+    async ['@test it supports URL replacement via replace=boundTruthyThing'](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link' replace=this.boundTruthyThing}}About{{/link-to}}
+        <div id="about-link">{{#link-to route='about' replace=this.boundTruthyThing}}About{{/link-to}}</div>
         `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundTruthyThing: true,
-        })
+        class extends Controller {
+          boundTruthyThing = true;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-          assert.equal(
-            this.replaceCount,
-            this.replaceCountAfterVisit + 1,
-            'replaceURL should be called once'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#about-link > a');
+
+      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
+      assert.equal(
+        this.replaceCount,
+        this.replaceCountAfterVisit + 1,
+        'replaceURL should be called once'
+      );
     }
 
-    ['@test The {{link-to}} component supports setting replace=this.boundFalseyThing'](assert) {
+    async ['@test it supports setting replace=boundFalseyThing'](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link' replace=this.boundFalseyThing}}About{{/link-to}}
+        <div id="about-link">{{#link-to route='about' replace=this.boundFalseyThing}}About{{/link-to}}</div>
         `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundFalseyThing: false,
-        })
+        class extends Controller {
+          boundFalseyThing = false;
+        }
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#about-link');
-        })
-        .then(() => {
-          assert.equal(this.updateCount, this.updateCountAfterVisit + 1, 'setURL should be called');
-          assert.equal(
-            this.replaceCount,
-            this.replaceCountAfterVisit,
-            'replaceURL should not be called'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#about-link > a');
+
+      assert.equal(this.updateCount, this.updateCountAfterVisit + 1, 'setURL should be called');
+      assert.equal(
+        this.replaceCount,
+        this.replaceCountAfterVisit,
+        'replaceURL should not be called'
+      );
     }
   }
 );
@@ -722,16 +780,16 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
           'index',
           `
           <h3 class="home">Home</h3>
-          {{#link-to route='about' id='about-link'}}About{{/link-to}}
-          {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+          <div id="about-link">{{#link-to route='about'}}About{{/link-to}}</div>
+          <div id="self-link">{{#link-to route='index'}}Self{{/link-to}}</div>
           `
         );
         this.addTemplate(
           'about',
           `
           <h3 class="about">About</h3>
-          {{#link-to route='index' id='home-link'}}Home{{/link-to}}
-          {{#link-to route='about' id='self-link'}}Self{{/link-to}}
+          <div id="home-link">{{#link-to route='index'}}Home{{/link-to}}</div>
+          <div id="self-link">{{#link-to route='about'}}Self{{/link-to}}</div>
           `
         );
       }
@@ -746,53 +804,55 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
         return super.afterEach();
       }
 
-      ['@test The {{link-to}} component fires an interaction event'](assert) {
-        assert.expect(2);
+      async ['@test it fires an interaction event'](assert) {
+        let before = 0;
+        let after = 0;
 
         subscribe('interaction.link-to', {
           before() {
-            assert.ok(true, 'instrumentation subscriber was called');
+            before++;
           },
           after() {
-            assert.ok(true, 'instrumentation subscriber was called');
+            after++;
           },
         });
 
-        return this.click('#about-link');
+        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
+        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
+
+        await this.click('#about-link > a');
+
+        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
+        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
       }
 
-      ['@test The {{link-to}} component interaction event includes the route name'](assert) {
-        assert.expect(2);
+      async ['@test it interaction event includes the route name and transition object'](assert) {
+        let before = 0;
+        let after = 0;
 
         subscribe('interaction.link-to', {
           before(name, timestamp, { routeName }) {
+            before++;
             assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
           },
-          after(name, timestamp, { routeName }) {
+          after(name, timestamp, { routeName, transition }) {
+            after++;
             assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
-          },
-        });
-
-        return this.click('#about-link');
-      }
-
-      ['@test The {{link-to}} component interaction event includes the transition in the after hook'](
-        assert
-      ) {
-        assert.expect(1);
-
-        subscribe('interaction.link-to', {
-          before() {},
-          after(name, timestamp, { transition }) {
             assert.equal(
               transition.targetName,
               'about',
-              'instrumentation subscriber was passed route name'
+              'instrumentation subscriber was passed transition object in the after hook'
             );
           },
         });
 
-        return this.click('#about-link');
+        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
+        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
+
+        await this.click('#about-link > a');
+
+        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
+        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
       }
     }
   );
@@ -801,7 +861,7 @@ if (EMBER_IMPROVED_INSTRUMENTATION) {
 moduleFor(
   'The {{link-to}} component - nested routes and link-to arguments',
   class extends ApplicationTestCase {
-    ['@test The {{link-to}} component supports leaving off .index for nested routes'](assert) {
+    async ['@test it supports leaving off .index for nested routes'](assert) {
       this.router.map(function () {
         this.route('about', function () {
           this.route('item');
@@ -815,12 +875,12 @@ moduleFor(
         `<div id='item'>{{#link-to route='about'}}About{{/link-to}}</div>`
       );
 
-      return this.visit('/about/item').then(() => {
-        assert.equal(normalizeUrl(this.$('#item a').attr('href')), '/about');
-      });
+      await this.visit('/about/item');
+
+      assert.equal(normalizeUrl(this.$('#item a').attr('href')), '/about');
     }
 
-    [`@test The {{link-to}} component supports custom, nested, current-when`](assert) {
+    async [`@test it supports custom, nested, current-when`](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -832,19 +892,19 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to route='item' id='other-link' current-when='index'}}ITEM{{/link-to}}`
+        `<div id="other-link">{{#link-to route='item' current-when='index'}}ITEM{{/link-to}}</div>`
       );
 
-      return this.visit('/about').then(() => {
-        assert.equal(
-          this.$('#other-link.active').length,
-          1,
-          'The link is active since current-when is a parent route'
-        );
-      });
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#other-link > a.active').length,
+        1,
+        'The link is active since current-when is a parent route'
+      );
     }
 
-    [`@test The {{link-to}} component does not disregard current-when when it is given explicitly for a route`](
+    async [`@test it does not disregard current-when when it is given explicitly for a route`](
       assert
     ) {
       this.router.map(function () {
@@ -860,21 +920,19 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to route='items' id='other-link' current-when='index'}}ITEM{{/link-to}}`
+        `<div id="other-link">{{#link-to route='items' current-when='index'}}ITEM{{/link-to}}</div>`
       );
 
-      return this.visit('/about').then(() => {
-        assert.equal(
-          this.$('#other-link.active').length,
-          1,
-          'The link is active when current-when is given for explicitly for a route'
-        );
-      });
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#other-link > a.active').length,
+        1,
+        'The link is active when current-when is given for explicitly for a route'
+      );
     }
 
-    ['@test The {{link-to}} component does not disregard current-when when it is set via a bound param'](
-      assert
-    ) {
+    async ['@test it does not disregard current-when when it is set via a bound param'](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -887,27 +945,27 @@ moduleFor(
 
       this.add(
         'controller:index.about',
-        Controller.extend({
-          currentWhen: 'index',
-        })
+        class extends Controller {
+          currentWhen = 'index';
+        }
       );
 
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to route='items' id='other-link' current-when=this.currentWhen}}ITEM{{/link-to}}`
+        `<div id="other-link">{{#link-to route='items' current-when=this.currentWhen}}ITEM{{/link-to}}</div>`
       );
 
-      return this.visit('/about').then(() => {
-        assert.equal(
-          this.$('#other-link.active').length,
-          1,
-          'The link is active when current-when is given for explicitly for a route'
-        );
-      });
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#other-link > a.active').length,
+        1,
+        'The link is active when current-when is given for explicitly for a route'
+      );
     }
 
-    ['@test The {{link-to}} component supports multiple current-when routes'](assert) {
+    async ['@test it supports multiple current-when routes'](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -919,46 +977,43 @@ moduleFor(
       this.addTemplate('index', `<h3 class="home">Home</h3>{{outlet}}`);
       this.addTemplate(
         'index.about',
-        `{{#link-to route='item' id='link1' current-when='item index'}}ITEM{{/link-to}}`
+        `<div id="link1">{{#link-to route='item' current-when='item index'}}ITEM{{/link-to}}</div>`
       );
       this.addTemplate(
         'item',
-        `{{#link-to route='item' id='link2' current-when='item index'}}ITEM{{/link-to}}`
+        `<div id="link2">{{#link-to route='item' current-when='item index'}}ITEM{{/link-to}}</div>`
       );
       this.addTemplate(
         'foo',
-        `{{#link-to route='item' id='link3' current-when='item index'}}ITEM{{/link-to}}`
+        `<div id="link3">{{#link-to route='item' current-when='item index'}}ITEM{{/link-to}}</div>`
       );
 
-      return this.visit('/about')
-        .then(() => {
-          assert.equal(
-            this.$('#link1.active').length,
-            1,
-            'The link is active since current-when contains the parent route'
-          );
+      await this.visit('/about');
 
-          return this.visit('/item');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#link2.active').length,
-            1,
-            'The link is active since you are on the active route'
-          );
+      assert.equal(
+        this.$('#link1 > a.active').length,
+        1,
+        'The link is active since current-when contains the parent route'
+      );
 
-          return this.visit('/foo');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#link3.active').length,
-            0,
-            'The link is not active since current-when does not contain the active route'
-          );
-        });
+      await this.visit('/item');
+
+      assert.equal(
+        this.$('#link2 > a.active').length,
+        1,
+        'The link is active since you are on the active route'
+      );
+
+      await this.visit('/foo');
+
+      assert.equal(
+        this.$('#link3 > a.active').length,
+        0,
+        'The link is not active since current-when does not contain the active route'
+      );
     }
 
-    ['@test The {{link-to}} component supports boolean values for current-when'](assert) {
+    async ['@test it supports boolean values for current-when'](assert) {
       this.router.map(function () {
         this.route('index', { path: '/' }, function () {
           this.route('about');
@@ -969,39 +1024,50 @@ moduleFor(
       this.addTemplate(
         'index.about',
         `
-        {{#link-to route='index' id='index-link' current-when=this.isCurrent}}index{{/link-to}}
-        {{#link-to route='item' id='about-link' current-when=true}}ITEM{{/link-to}}
+        <div id="index-link">{{#link-to route='index' current-when=this.isCurrent}}index{{/link-to}}</div>
+        <div id="about-link">{{#link-to route='item' current-when=true}}ITEM{{/link-to}}</div>
         `
       );
 
-      this.add('controller:index.about', Controller.extend({ isCurrent: false }));
+      let controller;
 
-      return this.visit('/about').then(() => {
-        assert.ok(
-          this.$('#about-link').hasClass('active'),
-          'The link is active since current-when is true'
-        );
-        assert.notOk(
-          this.$('#index-link').hasClass('active'),
-          'The link is not active since current-when is false'
-        );
+      this.add(
+        'controller:index.about',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
 
-        let controller = this.applicationInstance.lookup('controller:index.about');
-        runTask(() => controller.set('isCurrent', true));
+          isCurrent = false;
+        }
+      );
 
-        assert.ok(
-          this.$('#index-link').hasClass('active'),
-          'The link is active since current-when is true'
-        );
-      });
+      await this.visit('/about');
+
+      assert.ok(
+        this.$('#about-link > a').hasClass('active'),
+        'The link is active since current-when is true'
+      );
+      assert.notOk(
+        this.$('#index-link > a').hasClass('active'),
+        'The link is not active since current-when is false'
+      );
+
+      runTask(() => controller.set('isCurrent', true));
+
+      assert.ok(
+        this.$('#index-link > a').hasClass('active'),
+        'The link is active since current-when is true'
+      );
     }
 
-    ['@test The {{link-to}} component defaults to bubbling'](assert) {
+    async ['@test it defaults to bubbling'](assert) {
       this.addTemplate(
         'about',
         `
-        <div {{action 'hide'}}>
-          {{#link-to route='about.contact' id='about-contact'}}About{{/link-to}}
+        <div {{action this.hide}}>
+          <div id="about-contact">{{#link-to route='about.contact'}}About{{/link-to}}</div>
         </div>
         {{outlet}}
         `
@@ -1018,39 +1084,36 @@ moduleFor(
       let hidden = 0;
 
       this.add(
-        'route:about',
-        Route.extend({
-          actions: {
-            hide() {
-              hidden++;
-            },
-          },
-        })
+        'controller:about',
+        class extends Controller {
+          hide() {
+            hidden++;
+          }
+        }
       );
 
-      return this.visit('/about')
-        .then(() => {
-          return this.click('#about-contact');
-        })
-        .then(() => {
-          assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      await this.visit('/about');
 
-          assert.equal(hidden, 1, 'The link bubbles');
-        });
+      await this.click('#about-contact > a');
+
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+
+      assert.equal(hidden, 1, 'The link bubbles');
     }
 
-    [`@test The {{link-to}} component supports bubbles=false`](assert) {
+    async [`@test it supports bubbles=false`](assert) {
       this.addTemplate(
         'about',
         `
-        <div {{action 'hide'}}>
-          {{#link-to route='about.contact' id='about-contact' bubbles=false}}
+        <div id='about-contact' {{action this.hide}}>
+          {{#link-to route='about.contact' bubbles=false}}
             About
           {{/link-to}}
         </div>
         {{outlet}}
         `
       );
+
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
       this.router.map(function () {
@@ -1062,33 +1125,29 @@ moduleFor(
       let hidden = 0;
 
       this.add(
-        'route:about',
-        Route.extend({
-          actions: {
-            hide() {
-              hidden++;
-            },
-          },
-        })
+        'controller:about',
+        class extends Controller {
+          hide() {
+            hidden++;
+          }
+        }
       );
 
-      return this.visit('/about')
-        .then(() => {
-          return this.click('#about-contact');
-        })
-        .then(() => {
-          assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      await this.visit('/about');
 
-          assert.equal(hidden, 0, "The link didn't bubble");
-        });
+      await this.click('#about-contact > a');
+
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+
+      assert.strictEqual(hidden, 0, "The link didn't bubble");
     }
 
-    [`@test The {{link-to}} component supports bubbles=boundFalseyThing`](assert) {
+    async [`@test it supports bubbles=boundFalseyThing`](assert) {
       this.addTemplate(
         'about',
         `
-        <div {{action 'hide'}}>
-          {{#link-to route='about.contact' id='about-contact' bubbles=this.boundFalseyThing}}
+        <div id='about-contact' {{action this.hide}}>
+          {{#link-to route='about.contact' bubbles=this.boundFalseyThing}}
             About
           {{/link-to}}
         </div>
@@ -1098,11 +1157,17 @@ moduleFor(
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
+      let hidden = 0;
+
       this.add(
         'controller:about',
-        Controller.extend({
-          boundFalseyThing: false,
-        })
+        class extends Controller {
+          boundFalseyThing = false;
+
+          hide() {
+            hidden++;
+          }
+        }
       );
 
       this.router.map(function () {
@@ -1111,30 +1176,15 @@ moduleFor(
         });
       });
 
-      let hidden = 0;
+      await this.visit('/about');
 
-      this.add(
-        'route:about',
-        Route.extend({
-          actions: {
-            hide() {
-              hidden++;
-            },
-          },
-        })
-      );
+      await this.click('#about-contact > a');
 
-      return this.visit('/about')
-        .then(() => {
-          return this.click('#about-contact');
-        })
-        .then(() => {
-          assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-          assert.equal(hidden, 0, "The link didn't bubble");
-        });
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      assert.strictEqual(hidden, 0, "The link didn't bubble");
     }
 
-    async [`@test The {{link-to}} component moves into the named route with context`](assert) {
+    async [`@test it moves into the named route with context`](assert) {
       this.router.map(function () {
         this.route('about');
         this.route('item', { path: '/item/:id' });
@@ -1146,14 +1196,14 @@ moduleFor(
         <h3 class="list">List</h3>
         <ul>
           {{#each @model as |person|}}
-            <li>
-              {{#link-to route='item' model=person id=person.id}}
+            <li id={{person.id}}>
+              {{#link-to route='item' model=person}}
                 {{person.name}}
               {{/link-to}}
             </li>
           {{/each}}
         </ul>
-        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+        <div id='home-link'>{{#link-to route='index'}}Home{{/link-to}}</div>
         `
       );
 
@@ -1162,7 +1212,7 @@ moduleFor(
         `
         <h3 class="item">Item</h3>
         <p>{{@model.name}}</p>
-        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+        <div id='home-link'>{{#link-to route='index'}}Home{{/link-to}}</div>
         `
       );
 
@@ -1170,7 +1220,7 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='about' id='about-link'}}About{{/link-to}}
+        <div id='about-link'>{{#link-to route='about'}}About{{/link-to}}</div>
         `
       );
 
@@ -1191,31 +1241,31 @@ moduleFor(
 
       assert.equal(this.$('h3.list').length, 1, 'The home template was rendered');
       assert.equal(
-        normalizeUrl(this.$('#home-link').attr('href')),
+        normalizeUrl(this.$('#home-link > a').attr('href')),
         '/',
         'The home link points back at /'
       );
 
-      await this.click('#yehuda');
+      await this.click('#yehuda > a');
 
       assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
       assert.equal(this.$('p').text(), 'Yehuda Katz', 'The name is correct');
 
-      await this.click('#home-link');
+      await this.click('#home-link > a');
 
-      await this.click('#about-link');
+      await this.click('#about-link > a');
 
-      assert.equal(normalizeUrl(this.$('li a#yehuda').attr('href')), '/item/yehuda');
-      assert.equal(normalizeUrl(this.$('li a#tom').attr('href')), '/item/tom');
-      assert.equal(normalizeUrl(this.$('li a#erik').attr('href')), '/item/erik');
+      assert.equal(normalizeUrl(this.$('li#yehuda > a').attr('href')), '/item/yehuda');
+      assert.equal(normalizeUrl(this.$('li#tom > a').attr('href')), '/item/tom');
+      assert.equal(normalizeUrl(this.$('li#erik > a').attr('href')), '/item/erik');
 
-      await this.click('#erik');
+      await this.click('#erik > a');
 
       assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
       assert.equal(this.$('p').text(), 'Erik Brynroflsson', 'The name is correct');
     }
 
-    [`@test The {{link-to}} component binds some anchor html tag common attributes`](assert) {
+    async [`@test it binds some anchor html tag common attributes`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1226,63 +1276,67 @@ moduleFor(
         `
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#self-link');
-        assert.equal(link.attr('title'), 'title-attr', 'The self-link contains title attribute');
-        assert.equal(link.attr('rel'), 'rel-attr', 'The self-link contains rel attribute');
-        assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
-      });
+      await this.visit('/');
+
+      let link = this.$('#self-link');
+      assert.equal(link.attr('title'), 'title-attr', 'The self-link contains title attribute');
+      assert.equal(link.attr('rel'), 'rel-attr', 'The self-link contains rel attribute');
+      assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
     }
 
-    [`@test The {{link-to}} component supports 'target' attribute`](assert) {
+    async [`@test it supports 'target' attribute`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='index' id='self-link' target='_blank'}}Self{{/link-to}}
+        <div id='self-link'>{{#link-to route='index' target='_blank'}}Self{{/link-to}}</div>
         `
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#self-link');
-        assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
-      });
+      await this.visit('/');
+
+      let link = this.$('#self-link > a');
+      assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
     }
 
-    [`@test The {{link-to}} component supports 'target' attribute specified as a bound param`](
-      assert
-    ) {
+    async [`@test it supports 'target' attribute specified as a bound param`](assert) {
       this.addTemplate(
         'index',
-        `<h3 class="home">Home</h3>{{#link-to route='index' id='self-link' target=this.boundLinkTarget}}Self{{/link-to}}`
+        `
+        <h3 class="home">Home</h3>
+        <div id='self-link'>{{#link-to route='index' target=this.boundLinkTarget}}Self{{/link-to}}</div>
+        `
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundLinkTarget: '_blank',
-        })
+        class extends Controller {
+          boundLinkTarget = '_blank';
+        }
       );
 
-      return this.visit('/').then(() => {
-        let link = this.$('#self-link');
-        assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
-      });
+      await this.visit('/');
+
+      let link = this.$('#self-link > a');
+      assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
     }
 
-    [`@test the {{link-to}} component calls preventDefault`](assert) {
+    async [`@test it calls preventDefault`](assert) {
       this.router.map(function () {
         this.route('about');
       });
 
-      this.addTemplate('index', `{{#link-to route='about' id='about-link'}}About{{/link-to}}`);
+      this.addTemplate(
+        'index',
+        `<div id='about-link'>{{#link-to route='about'}}About{{/link-to}}</div>`
+      );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: true }, () => this.$('#about-link').click(), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#about-link > a').click(), assert);
     }
 
-    [`@test the {{link-to}} component does not call preventDefault if 'preventDefault=false' is passed as an option`](
+    async [`@test it does not call preventDefault if 'preventDefault=false' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1291,15 +1345,15 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to route='about' id='about-link' preventDefault=false}}About{{/link-to}}`
+        `<div id='about-link'>{{#link-to route='about' preventDefault=false}}About{{/link-to}}</div>`
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: false }, () => this.$('#about-link > a').trigger('click'), assert);
     }
 
-    [`@test the {{link-to}} component does not call preventDefault if 'preventDefault=this.boundFalseyThing' is passed as an option`](
+    async [`@test it does not call preventDefault if 'preventDefault=this.boundFalseyThing' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1308,19 +1362,19 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to route='about' id='about-link' preventDefault=this.boundFalseyThing}}About{{/link-to}}`
+        `<div id='about-link'>{{#link-to route='about' preventDefault=this.boundFalseyThing}}About{{/link-to}}</div>`
       );
 
       this.add(
         'controller:index',
-        Controller.extend({
-          boundFalseyThing: false,
-        })
+        class extends Controller {
+          boundFalseyThing = false;
+        }
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: false }, () => this.$('#about-link > a').trigger('click'), assert);
     }
 
     [`@test The {{link-to}} component does not call preventDefault if 'target' attribute is provided`](
@@ -1353,15 +1407,15 @@ moduleFor(
       });
     }
 
-    [`@test The {{link-to}} component should not transition if target is not equal to _self or empty`](
-      assert
-    ) {
+    async [`@test it should not transition if target is not equal to _self or empty`](assert) {
       this.addTemplate(
         'index',
         `
-        {{#link-to route='about' id='about-link' replace=true target='_blank'}}
-          About
-        {{/link-to}}
+        <div id='about-link'>
+          {{#link-to route='about' replace=true target='_blank'}}
+            About
+          {{/link-to}}
+        </div>
         `
       );
 
@@ -1369,23 +1423,23 @@ moduleFor(
         this.route('about');
       });
 
-      return this.visit('/')
-        .then(() => this.click('#about-link'))
-        .then(() => {
-          expectDeprecation(() => {
-            let currentRouteName = this.applicationInstance
-              .lookup('controller:application')
-              .get('currentRouteName');
-            assert.notEqual(
-              currentRouteName,
-              'about',
-              'link-to should not transition if target is not equal to _self or empty'
-            );
-          }, 'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.');
-        });
+      await this.visit('/');
+
+      await this.click('#about-link > a');
+
+      expectDeprecation(() => {
+        let currentRouteName = this.applicationInstance
+          .lookup('controller:application')
+          .get('currentRouteName');
+        assert.notEqual(
+          currentRouteName,
+          'about',
+          'link-to should not transition if target is not equal to _self or empty'
+        );
+      }, 'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.');
     }
 
-    [`@test The {{link-to}} component accepts string/numeric arguments`](assert) {
+    async [`@test it accepts string/numeric arguments`](assert) {
       this.router.map(function () {
         this.route('filter', { path: '/filters/:filter' });
         this.route('post', { path: '/post/:post_id' });
@@ -1394,41 +1448,40 @@ moduleFor(
 
       this.add(
         'controller:filter',
-        Controller.extend({
-          filter: 'unpopular',
-          repo: { owner: 'ember', name: 'ember.js' },
-          post_id: 123,
-        })
+        class extends Controller {
+          filter = 'unpopular';
+          repo = { owner: 'ember', name: 'ember.js' };
+          post_id = 123;
+        }
       );
 
       this.addTemplate(
         'filter',
         `
         <p>{{this.filter}}</p>
-        {{#link-to route="filter" model="unpopular" id="link"}}Unpopular{{/link-to}}
-        {{#link-to route="filter" model=this.filter id="path-link"}}Unpopular{{/link-to}}
-        {{#link-to route="post" model=this.post_id id="post-path-link"}}Post{{/link-to}}
-        {{#link-to route="post" model=123 id="post-number-link"}}Post{{/link-to}}
-        {{#link-to route="repo" model=this.repo id="repo-object-link"}}Repo{{/link-to}}
-        `
-      );
-
-      return this.visit('/filters/popular').then(() => {
-        assert.equal(normalizeUrl(this.$('#link').attr('href')), '/filters/unpopular');
-        assert.equal(normalizeUrl(this.$('#path-link').attr('href')), '/filters/unpopular');
-        assert.equal(normalizeUrl(this.$('#post-path-link').attr('href')), '/post/123');
-        assert.equal(normalizeUrl(this.$('#post-number-link').attr('href')), '/post/123');
-        assert.equal(
-          normalizeUrl(this.$('#repo-object-link').attr('href')),
-          '/repo/ember/ember.js'
-        );
-      });
+        <div id="link">{{#link-to route="filter" model="unpopular"}}Unpopular{{/link-to}}</div>
+        <div id="path-link">{{#link-to route="filter" model=this.filter}}Unpopular{{/link-to}}</div>
+        <div id="post-path-link">{{#link-to route="post" model=this.post_id}}Post{{/link-to}}</div>
+        <div id="post-number-link">{{#link-to route="post" model=123}}Post{{/link-to}}</div>
+        <div id="repo-object-link">{{#link-to route="repo" model=this.repo}}Repo{{/link-to}}</div>
+        `
+      );
+
+      await this.visit('/filters/popular');
+
+      assert.equal(normalizeUrl(this.$('#link > a').attr('href')), '/filters/unpopular');
+      assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), '/filters/unpopular');
+      assert.equal(normalizeUrl(this.$('#post-path-link > a').attr('href')), '/post/123');
+      assert.equal(normalizeUrl(this.$('#post-number-link > a').attr('href')), '/post/123');
+      assert.equal(
+        normalizeUrl(this.$('#repo-object-link > a').attr('href')),
+        '/repo/ember/ember.js'
+      );
     }
 
-    [`@test Issue 4201 - Shorthand for route.index shouldn't throw errors about context arguments`](
+    async [`@test [GH#4201] Shorthand for route.index shouldn't throw errors about context arguments`](
       assert
     ) {
-      assert.expect(2);
       this.router.map(function () {
         this.route('lobby', function () {
           this.route('index', { path: ':lobby_id' });
@@ -1438,30 +1491,32 @@ moduleFor(
 
       this.add(
         'route:lobby.index',
-        Route.extend({
+        class extends Route {
           model(params) {
             assert.equal(params.lobby_id, 'foobar');
             return params.lobby_id;
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
         'lobby.index',
-        `{{#link-to route='lobby' model='foobar' id='lobby-link'}}Lobby{{/link-to}}`
+        `<div id='lobby-link'>{{#link-to route='lobby' model='foobar'}}Lobby{{/link-to}}</div>`
       );
 
       this.addTemplate(
         'lobby.list',
-        `{{#link-to route='lobby' model='foobar' id='lobby-link'}}Lobby{{/link-to}}`
+        `<div id='lobby-link'>{{#link-to route='lobby' model='foobar'}}Lobby{{/link-to}}</div>`
       );
 
-      return this.visit('/lobby/list')
-        .then(() => this.click('#lobby-link'))
-        .then(() => shouldBeActive(assert, this.$('#lobby-link')));
+      await this.visit('/lobby/list');
+
+      await this.click('#lobby-link > a');
+
+      shouldBeActive(assert, this.$('#lobby-link > a'));
     }
 
-    [`@test Quoteless route param performs property lookup`](assert) {
+    async [`@test Quoteless route param performs property lookup`](assert) {
       this.router.map(function () {
         this.route('about');
       });
@@ -1469,34 +1524,40 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to route='index' id='string-link'}}string{{/link-to}}
-        {{#link-to route=this.foo id='path-link'}}path{{/link-to}}
+        <div id='string-link'>{{#link-to route='index'}}string{{/link-to}}</div>
+        <div id='path-link'>{{#link-to route=this.foo}}path{{/link-to}}</div>
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          foo: 'index',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          foo = 'index';
+        }
       );
 
       let assertEquality = (href) => {
-        assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
-        assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
+        assert.equal(normalizeUrl(this.$('#string-link > a').attr('href')), '/');
+        assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), href);
       };
 
-      return this.visit('/').then(() => {
-        assertEquality('/');
+      await this.visit('/');
 
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('foo', 'about'));
+      assertEquality('/');
 
-        assertEquality('/about');
-      });
+      runTask(() => controller.set('foo', 'about'));
+
+      assertEquality('/about');
     }
 
-    [`@test The {{link-to}} component refreshes href element when one of params changes`](assert) {
+    async [`@test it refreshes href element when one of params changes`](assert) {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
@@ -1506,40 +1567,49 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `{{#link-to route="post" model=this.post id="post"}}post{{/link-to}}`
+        `<div id="post">{{#link-to route="post" model=this.post}}post{{/link-to}}</div>`
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+        }
       );
 
-      this.add('controller:index', Controller.extend());
+      await this.visit('/');
 
-      return this.visit('/').then(() => {
-        let indexController = this.applicationInstance.lookup('controller:index');
-        runTask(() => indexController.set('post', post));
+      runTask(() => controller.set('post', post));
 
-        assert.equal(
-          normalizeUrl(this.$('#post').attr('href')),
-          '/posts/1',
-          'precond - Link has rendered href attr properly'
-        );
+      assert.equal(
+        normalizeUrl(this.$('#post > a').attr('href')),
+        '/posts/1',
+        'precond - Link has rendered href attr properly'
+      );
 
-        runTask(() => indexController.set('post', secondPost));
+      runTask(() => controller.set('post', secondPost));
 
-        assert.equal(
-          this.$('#post').attr('href'),
-          '/posts/2',
-          'href attr was updated after one of the params had been changed'
-        );
+      assert.equal(
+        this.$('#post > a').attr('href'),
+        '/posts/2',
+        'href attr was updated after one of the params had been changed'
+      );
 
-        runTask(() => indexController.set('post', null));
+      runTask(() => controller.set('post', null));
 
-        assert.equal(
-          this.$('#post').attr('href'),
-          '#',
-          'href attr becomes # when one of the arguments in nullified'
-        );
-      });
+      assert.equal(
+        this.$('#post > a').attr('href'),
+        '#',
+        'href attr becomes # when one of the arguments in nullified'
+      );
     }
 
-    [`@test The {{link-to}} component is active when a route is active`](assert) {
+    async [`@test it is active when a route is active`](assert) {
       this.router.map(function () {
         this.route('about', function () {
           this.route('item');
@@ -1550,40 +1620,45 @@ moduleFor(
         'about',
         `
         <div id='about'>
-          {{#link-to route='about' id='about-link'}}About{{/link-to}}
-          {{#link-to route='about.item' id='item-link'}}Item{{/link-to}}
+          <div id='about-link'>{{#link-to route='about'}}About{{/link-to}}</div>
+          <div id='item-link'>{{#link-to route='about.item'}}Item{{/link-to}}</div>
           {{outlet}}
         </div>
         `
       );
 
-      return this.visit('/about')
-        .then(() => {
-          assert.equal(this.$('#about-link.active').length, 1, 'The about route link is active');
-          assert.equal(this.$('#item-link.active').length, 0, 'The item route link is inactive');
+      await this.visit('/about');
 
-          return this.visit('/about/item');
-        })
-        .then(() => {
-          assert.equal(this.$('#about-link.active').length, 1, 'The about route link is active');
-          assert.equal(this.$('#item-link.active').length, 1, 'The item route link is active');
-        });
+      assert.equal(this.$('#about-link > a.active').length, 1, 'The about route link is active');
+      assert.equal(this.$('#item-link > a.active').length, 0, 'The item route link is inactive');
+
+      await this.visit('/about/item');
+
+      assert.equal(this.$('#about-link > a.active').length, 1, 'The about route link is active');
+      assert.equal(this.$('#item-link > a.active').length, 1, 'The item route link is active');
     }
 
-    [`@test The {{link-to}} component works in an #each'd array of string route names`](assert) {
+    async [`@test it works in an #each'd array of string route names`](assert) {
       this.router.map(function () {
         this.route('foo');
         this.route('bar');
         this.route('rar');
       });
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          routeNames: emberA(['foo', 'bar', 'rar']),
-          route1: 'bar',
-          route2: 'foo',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          routeNames = emberA(['foo', 'bar', 'rar']);
+          route1 = 'bar';
+          route2 = 'foo';
+        }
       );
 
       this.addTemplate(
@@ -1615,24 +1690,22 @@ moduleFor(
         }
       };
 
-      return this.visit('/').then(() => {
-        linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/bar', '/foo']);
+      await this.visit('/');
 
-        let indexController = this.applicationInstance.lookup('controller:index');
-        runTask(() => indexController.set('route1', 'rar'));
+      linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/bar', '/foo']);
 
-        linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/rar', '/foo']);
+      runTask(() => controller.set('route1', 'rar'));
 
-        runTask(() => indexController.routeNames.shiftObject());
+      linksEqual(this.$('a'), ['/foo', '/bar', '/rar', '/foo', '/bar', '/rar', '/rar', '/foo']);
 
-        linksEqual(this.$('a'), ['/bar', '/rar', '/bar', '/rar', '/rar', '/foo']);
-      });
+      runTask(() => controller.routeNames.shiftObject());
+
+      linksEqual(this.$('a'), ['/bar', '/rar', '/bar', '/rar', '/rar', '/foo']);
     }
 
-    [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route`](
+    async [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route`](
       assert
     ) {
-      assert.expect(5);
       this.router.map(function () {
         this.route('contact');
       });
@@ -1642,54 +1715,59 @@ moduleFor(
           'index',
           `
           <h3 class="home">Home</h3>
-          {{link-to 'Contact us' 'contact' id='contact-link'}}
-          {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+          <div id='contact-link'>{{link-to 'Contact us' 'contact'}}</div>
+          <div id='self-link'>{{#link-to route='index'}}Self{{/link-to}}</div>
           `
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
       expectDeprecation(() => {
         this.addTemplate(
           'contact',
           `
           <h3 class="contact">Contact</h3>
-          {{link-to 'Home' 'index' id='home-link'}}
-          {{link-to 'Self' 'contact' id='self-link'}}
+          <div id='home-link'>{{link-to 'Home' 'index'}}</div>
+          <div id='self-link'>{{link-to 'Self' 'contact'}}</div>
           `
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#contact-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.contact').length, 1, 'The contact template was rendered');
-          assert.equal(
-            this.$('#self-link.active').length,
-            1,
-            'The self-link was rendered with active class'
-          );
-          assert.equal(
-            this.$('#home-link:not(.active)').length,
-            1,
-            'The other link was rendered without active class'
-          );
-        });
+      await this.visit('/');
+
+      await this.click('#contact-link > a');
+
+      assert.equal(this.$('h3.contact').length, 1, 'The contact template was rendered');
+      assert.equal(
+        this.$('#self-link > a.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#home-link > a:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
     }
 
-    [`@test [DEPRECATED] The non-block form {{link-to}} component updates the link text when it is a binding`](
+    async [`@test [DEPRECATED] The non-block form {{link-to}} component updates the link text when it is a binding`](
       assert
     ) {
-      assert.expect(10);
       this.router.map(function () {
         this.route('contact');
       });
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          contactName: 'Jane',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          contactName = 'Jane';
+        }
       );
 
       expectDeprecation(() => {
@@ -1697,94 +1775,89 @@ moduleFor(
           'index',
           `
           <h3 class="home">Home</h3>
-          {{link-to this.contactName 'contact' id='contact-link'}}
-          {{#link-to route='index' id='self-link'}}Self{{/link-to}}
+          <div id='contact-link'>{{link-to this.contactName 'contact'}}</div>
+          <div id='self-link'>{{#link-to route='index'}}Self{{/link-to}}</div>
           `
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
       expectDeprecation(() => {
         this.addTemplate(
           'contact',
           `
           <h3 class="contact">Contact</h3>
-          {{link-to 'Home' 'index' id='home-link'}}
-          {{link-to 'Self' 'contact' id='self-link'}}
+          <div id='home-link'>{{link-to 'Home' 'index'}}</div>
+          <div id='self-link'>{{link-to 'Self' 'contact'}}</div>
           `
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-      return this.visit('/')
-        .then(() => {
-          assert.equal(
-            this.$('#contact-link').text(),
-            'Jane',
-            'The link title is correctly resolved'
-          );
+      await this.visit('/');
 
-          let controller = this.applicationInstance.lookup('controller:index');
-          runTask(() => controller.set('contactName', 'Joe'));
+      assert.equal(
+        this.$('#contact-link > a').text(),
+        'Jane',
+        'The link title is correctly resolved'
+      );
 
-          assert.equal(
-            this.$('#contact-link').text(),
-            'Joe',
-            'The link title is correctly updated when the bound property changes'
-          );
+      runTask(() => controller.set('contactName', 'Joe'));
 
-          runTask(() => controller.set('contactName', 'Robert'));
+      assert.equal(
+        this.$('#contact-link > a').text(),
+        'Joe',
+        'The link title is correctly updated when the bound property changes'
+      );
 
-          assert.equal(
-            this.$('#contact-link').text(),
-            'Robert',
-            'The link title is correctly updated when the bound property changes a second time'
-          );
+      runTask(() => controller.set('contactName', 'Robert'));
 
-          return this.click('#contact-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.contact').length, 1, 'The contact template was rendered');
-          assert.equal(
-            this.$('#self-link.active').length,
-            1,
-            'The self-link was rendered with active class'
-          );
-          assert.equal(
-            this.$('#home-link:not(.active)').length,
-            1,
-            'The other link was rendered without active class'
-          );
+      assert.equal(
+        this.$('#contact-link > a').text(),
+        'Robert',
+        'The link title is correctly updated when the bound property changes a second time'
+      );
 
-          return this.click('#home-link');
-        })
-        .then(() => {
-          assert.equal(this.$('h3.home').length, 1, 'The index template was rendered');
-          assert.equal(
-            this.$('#contact-link').text(),
-            'Robert',
-            'The link title is correctly updated when the route changes'
-          );
-        });
+      await this.click('#contact-link > a');
+
+      assert.equal(this.$('h3.contact').length, 1, 'The contact template was rendered');
+      assert.equal(
+        this.$('#self-link > a.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#home-link > a:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+
+      await this.click('#home-link > a');
+
+      assert.equal(this.$('h3.home').length, 1, 'The index template was rendered');
+      assert.equal(
+        this.$('#contact-link > a').text(),
+        'Robert',
+        'The link title is correctly updated when the route changes'
+      );
     }
 
     async [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route with context`](
       assert
     ) {
-      assert.expect(6);
-
       this.router.map(function () {
         this.route('item', { path: '/item/:id' });
       });
 
       this.add(
         'route:index',
-        Route.extend({
+        class extends Route {
           model() {
             return [
               { id: 'yehuda', name: 'Yehuda Katz' },
               { id: 'tom', name: 'Tom Dale' },
               { id: 'erik', name: 'Erik Brynroflsson' },
             ];
-          },
-        })
+          }
+        }
       );
 
       expectDeprecation(() => {
@@ -1794,38 +1867,39 @@ moduleFor(
           <h3 class="home">Home</h3>
           <ul>
             {{#each @model as |person|}}
-              <li>
-                {{link-to person.name 'item' person id=person.id}}
+              <li id={{person.id}}>
+                {{link-to person.name 'item' person}}
               </li>
             {{/each}}
           </ul>
           `
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+
       this.addTemplate(
         'item',
         `
         <h3 class="item">Item</h3>
         <p>{{@model.name}}</p>
-        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
+        <div id='home-link'>{{#link-to route='index'}}Home{{/link-to}}</div>
         `
       );
 
       await this.visit('/');
 
-      await this.click('#yehuda');
+      await this.click('#yehuda > a');
 
       assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
       assert.equal(this.$('p').text(), 'Yehuda Katz', 'The name is correct');
 
-      await this.click('#home-link');
+      await this.click('#home-link > a');
 
-      assert.equal(normalizeUrl(this.$('li a#yehuda').attr('href')), '/item/yehuda');
-      assert.equal(normalizeUrl(this.$('li a#tom').attr('href')), '/item/tom');
-      assert.equal(normalizeUrl(this.$('li a#erik').attr('href')), '/item/erik');
+      assert.equal(normalizeUrl(this.$('li#yehuda > a').attr('href')), '/item/yehuda');
+      assert.equal(normalizeUrl(this.$('li#tom > a').attr('href')), '/item/tom');
+      assert.equal(normalizeUrl(this.$('li#erik > a').attr('href')), '/item/erik');
     }
 
-    [`@test [DEPRECATED] The non-block form {{link-to}} performs property lookup`](assert) {
+    async [`@test [DEPRECATED] The non-block form {{link-to}} performs property lookup`](assert) {
       this.router.map(function () {
         this.route('about');
       });
@@ -1840,52 +1914,64 @@ moduleFor(
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          foo: 'index',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          foo = 'index';
+        }
       );
 
-      return this.visit('/').then(() => {
-        let assertEquality = (href) => {
-          assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
-          assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
-        };
+      await this.visit('/');
+
+      let assertEquality = (href) => {
+        assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
+        assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
+      };
 
-        assertEquality('/');
+      assertEquality('/');
 
-        let controller = this.applicationInstance.lookup('controller:index');
-        runTask(() => controller.set('foo', 'about'));
+      runTask(() => controller.set('foo', 'about'));
 
-        assertEquality('/about');
-      });
+      assertEquality('/about');
     }
 
-    [`@test [DEPRECATED] The non-block form {{link-to}} protects against XSS`](assert) {
+    async [`@test [DEPRECATED] The non-block form {{link-to}} protects against XSS`](assert) {
       expectDeprecation(() => {
         this.addTemplate('application', `{{link-to this.display 'index' id='link'}}`);
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
+      let controller;
+
       this.add(
         'controller:application',
-        Controller.extend({
-          display: 'blahzorz',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          display = 'blahzorz';
+        }
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#link').text(), 'blahzorz');
+      await this.visit('/');
 
-        let controller = this.applicationInstance.lookup('controller:application');
-        runTask(() => controller.set('display', '<b>BLAMMO</b>'));
+      assert.equal(this.$('#link').text(), 'blahzorz');
 
-        assert.equal(this.$('#link').text(), '<b>BLAMMO</b>');
-        assert.equal(this.$('b').length, 0);
-      });
+      runTask(() => controller.set('display', '<b>BLAMMO</b>'));
+
+      assert.equal(this.$('#link').text(), '<b>BLAMMO</b>');
+      assert.strictEqual(this.$('b').length, 0);
     }
 
-    async [`@test the {{link-to}} component throws a useful error if you invoke it wrong`](assert) {
+    async [`@test it throws a useful error if you invoke it wrong`](assert) {
       if (!DEBUG) {
         assert.expect(0);
         return;
@@ -1903,7 +1989,7 @@ moduleFor(
       );
     }
 
-    [`@test the {{link-to}} component does not throw an error if its route has exited`](assert) {
+    async [`@test it does not throw an error if its route has exited`](assert) {
       assert.expect(0);
 
       this.router.map(function () {
@@ -1913,45 +1999,49 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to route='index' id='home-link'}}Home{{/link-to}}
-        {{#link-to route='post' model=this.defaultPost id='default-post-link'}}Default Post{{/link-to}}
+        <div id='home-link'>{{#link-to route='index'}}Home{{/link-to}}</div>
+        <div id='default-post-link'>{{#link-to route='post' model=this.defaultPost}}Default Post{{/link-to}}</div>
         {{#if this.currentPost}}
-          {{#link-to route='post' model=this.currentPost id='current-post-link'}}Current Post{{/link-to}}
+          <div id='current-post-link'>{{#link-to route='post' model=this.currentPost}}Current Post{{/link-to}}</div>
         {{/if}}
         `
       );
 
       this.add(
         'controller:application',
-        Controller.extend({
-          defaultPost: { id: 1 },
-          postController: injectController('post'),
-          currentPost: alias('postController.model'),
-        })
+        class extends Controller {
+          defaultPost = { id: 1 };
+
+          @injectController('post') postController;
+
+          get currentPost() {
+            return this.postController.model;
+          }
+        }
       );
 
-      this.add('controller:post', Controller.extend());
+      this.add('controller:post', class extends Controller {});
 
       this.add(
         'route:post',
-        Route.extend({
+        class extends Route {
           model() {
             return { id: 2 };
-          },
+          }
           serialize(model) {
             return { post_id: model.id };
-          },
-        })
+          }
+        }
       );
 
-      return this.visit('/')
-        .then(() => this.click('#default-post-link'))
-        .then(() => this.click('#home-link'))
-        .then(() => this.click('#current-post-link'))
-        .then(() => this.click('#home-link'));
+      await this.visit('/');
+      await this.click('#default-post-link > a');
+      await this.click('#home-link > a');
+      await this.click('#current-post-link > a');
+      await this.click('#home-link > a');
     }
 
-    [`@test {{link-to}} active property respects changing parent route context`](assert) {
+    async [`@test its active property respects changing parent route context`](assert) {
       this.router.map(function () {
         this.route('things', { path: '/things/:name' }, function () {
           this.route('other');
@@ -1961,102 +2051,101 @@ moduleFor(
       this.addTemplate(
         'application',
         `
-        {{#link-to route='things' model='omg' id='omg-link'}}OMG{{/link-to}}
-        {{#link-to route='things' model='lol' id='lol-link'}}LOL{{/link-to}}
+        <div id='omg-link'>{{#link-to route='things' model='omg'}}OMG{{/link-to}}</div>
+        <div id='lol-link'>{{#link-to route='things' model='lol'}}LOL{{/link-to}}</div>
         `
       );
 
-      return this.visit('/things/omg')
-        .then(() => {
-          shouldBeActive(assert, this.$('#omg-link'));
-          shouldNotBeActive(assert, this.$('#lol-link'));
+      await this.visit('/things/omg');
 
-          return this.visit('/things/omg/other');
-        })
-        .then(() => {
-          shouldBeActive(assert, this.$('#omg-link'));
-          shouldNotBeActive(assert, this.$('#lol-link'));
-        });
+      shouldBeActive(assert, this.$('#omg-link > a'));
+      shouldNotBeActive(assert, this.$('#lol-link > a'));
+
+      await this.visit('/things/omg/other');
+
+      shouldBeActive(assert, this.$('#omg-link > a'));
+      shouldNotBeActive(assert, this.$('#lol-link > a'));
     }
 
-    [`@test {{link-to}} populates href with default query param values even without query-params object`](
+    async [`@test it populates href with default query param values even without query-params object`](
       assert
     ) {
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['foo'],
-          foo: '123',
-        })
+        class extends Controller {
+          queryParams = ['foo'];
+          foo = '123';
+        }
       );
 
-      this.addTemplate('index', `{{#link-to route='index' id='the-link'}}Index{{/link-to}}`);
+      this.addTemplate(
+        'index',
+        `<div id='the-link'>{{#link-to route='index'}}Index{{/link-to}}</div>`
+      );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('#the-link > a').attr('href'), '/', 'link has right href');
     }
 
-    [`@test {{link-to}} populates href with default query param values with empty query-params object`](
+    async [`@test it populates href with default query param values with empty query-params object`](
       assert
     ) {
       this.add(
         'controller:index',
-        Controller.extend({
-          queryParams: ['foo'],
-          foo: '123',
-        })
+        class extends Controller {
+          queryParams = ['foo'];
+          foo = '123';
+        }
       );
 
       this.addTemplate(
         'index',
-        `{{#link-to route='index' query=(hash) id='the-link'}}Index{{/link-to}}`
+        `<div id='the-link'>{{#link-to route='index' query=(hash)}}Index{{/link-to}}</div>`
       );
 
-      return this.visit('/').then(() => {
-        assert.equal(this.$('#the-link').attr('href'), '/', 'link has right href');
-      });
+      await this.visit('/');
+
+      assert.equal(this.$('#the-link > a').attr('href'), '/', 'link has right href');
     }
 
-    [`@test {{link-to}} with only query-params and a block updates when route changes`](assert) {
+    async [`@test it updates when route changes with only query-params and a block`](assert) {
       this.router.map(function () {
         this.route('about');
       });
 
       this.add(
         'controller:application',
-        Controller.extend({
-          queryParams: ['foo', 'bar'],
-          foo: '123',
-          bar: 'yes',
-        })
+        class extends Controller {
+          queryParams = ['foo', 'bar'];
+          foo = '123';
+          bar = 'yes';
+        }
       );
 
       this.addTemplate(
         'application',
-        `{{#link-to query=(hash foo='456' bar='NAW') id='the-link'}}Index{{/link-to}}`
+        `<div id='the-link'>{{#link-to query=(hash foo='456' bar='NAW')}}Index{{/link-to}}</div>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          assert.equal(
-            this.$('#the-link').attr('href'),
-            '/?bar=NAW&foo=456',
-            'link has right href'
-          );
+      await this.visit('/');
 
-          return this.visit('/about');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#the-link').attr('href'),
-            '/about?bar=NAW&foo=456',
-            'link has right href'
-          );
-        });
+      assert.equal(
+        this.$('#the-link > a').attr('href'),
+        '/?bar=NAW&foo=456',
+        'link has right href'
+      );
+
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#the-link > a').attr('href'),
+        '/about?bar=NAW&foo=456',
+        'link has right href'
+      );
     }
 
-    [`@test [DEPRECATED] Block-less {{link-to}} with only query-params updates when route changes`](
+    async [`@test [DEPRECATED] it updates when route changes with only query-params but without a block`](
       assert
     ) {
       this.router.map(function () {
@@ -2075,64 +2164,61 @@ moduleFor(
       expectDeprecation(() => {
         this.addTemplate(
           'application',
-          `{{link-to "Index" (query-params foo='456' bar='NAW') id='the-link'}}`
+          `<div id='the-link'>{{link-to "Index" (query-params foo='456' bar='NAW')}}</div>`
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
-      return this.visit('/')
-        .then(() => {
-          assert.equal(
-            this.$('#the-link').attr('href'),
-            '/?bar=NAW&foo=456',
-            'link has right href'
-          );
+      await this.visit('/');
 
-          return this.visit('/about');
-        })
-        .then(() => {
-          assert.equal(
-            this.$('#the-link').attr('href'),
-            '/about?bar=NAW&foo=456',
-            'link has right href'
-          );
-        });
+      assert.equal(
+        this.$('#the-link > a').attr('href'),
+        '/?bar=NAW&foo=456',
+        'link has right href'
+      );
+
+      await this.visit('/about');
+
+      assert.equal(
+        this.$('#the-link > a').attr('href'),
+        '/about?bar=NAW&foo=456',
+        'link has right href'
+      );
     }
 
-    ['@test [GH#17018] passing model to link-to with `hash` helper works']() {
+    async ['@test [GH#17018] passing model to {{link-to}} with `hash` helper works']() {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
       });
 
       this.add(
         'route:index',
-        Route.extend({
+        class extends Route {
           model() {
             return RSVP.hash({
               user: { name: 'Papa Smurf' },
             });
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
         'index',
         `{{#link-to route='post' model=(hash id="someId" user=@model.user)}}Post{{/link-to}}`
       );
+
       this.addTemplate('post', 'Post: {{@model.user.name}}');
 
-      return this.visit('/')
-        .then(() => {
-          this.assertComponentElement(this.firstChild, {
-            tagName: 'a',
-            attrs: { href: '/posts/someId' },
-            content: 'Post',
-          });
+      await this.visit('/');
 
-          return this.click('a');
-        })
-        .then(() => {
-          this.assertText('Post: Papa Smurf');
-        });
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'a',
+        attrs: { href: '/posts/someId' },
+        content: 'Post',
+      });
+
+      await this.click('a');
+
+      this.assertText('Post: Papa Smurf');
     }
 
     async [`@test [DEPRECATED] The {{link-to}} component can use dynamic params`](assert) {
@@ -2141,21 +2227,25 @@ moduleFor(
         this.route('bar', { path: 'bar/:some/:thing/:else' });
       });
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.dynamicLinkParams = ['foo', 'one', 'two'];
-          },
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicLinkParams = ['foo', 'one', 'two'];
+        }
       );
 
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to params=this.dynamicLinkParams id="dynamic-link"}}Dynamic{{/link-to}}
+        <div id="dynamic-link">{{#link-to params=this.dynamicLinkParams}}Dynamic{{/link-to}}</div>
         `
       );
 
@@ -2164,26 +2254,21 @@ moduleFor(
         /Invoking the `<LinkTo>` component with positional arguments is deprecated/
       );
 
-      let link = this.$('#dynamic-link');
+      let link = this.$('#dynamic-link > a');
 
       assert.equal(link.attr('href'), '/foo/one/two');
 
-      let controller = this.applicationInstance.lookup('controller:index');
-
-      expectDeprecation(() => {
-        runTask(() => {
-          controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three']);
-        });
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
+      expectDeprecation(
+        () => runTask(() => controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three'])),
+        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
+      );
 
       assert.equal(link.attr('href'), '/bar/one/two/three');
     }
 
-    [`@test GJ: {{link-to}} to a parent root model hook which performs a 'transitionTo' has correct active class #13256`](
+    async [`@test [GH#13256]: {{link-to}} to a parent root model hook which performs a 'transitionTo' has correct active class`](
       assert
     ) {
-      assert.expect(3);
-
       this.router.map(function () {
         this.route('parent', function () {
           this.route('child');
@@ -2192,26 +2277,25 @@ moduleFor(
 
       this.add(
         'route:parent',
-        Route.extend({
+        class extends Route {
           afterModel() {
             expectDeprecation(() => {
               this.transitionTo('parent.child');
             }, /Calling transitionTo on a route is deprecated/);
-          },
-        })
+          }
+        }
       );
+
       this.addTemplate(
         'application',
-        `{{#link-to route='parent' id='parent-link'}}Parent{{/link-to}}`
+        `<div id='parent-link'>{{#link-to route='parent'}}Parent{{/link-to}}</div>`
       );
 
-      return this.visit('/')
-        .then(() => {
-          return this.click('#parent-link');
-        })
-        .then(() => {
-          shouldBeActive(assert, this.$('#parent-link'));
-        });
+      await this.visit('/');
+
+      await this.click('#parent-link > a');
+
+      shouldBeActive(assert, this.$('#parent-link > a'));
     }
   }
 );
@@ -2219,10 +2303,9 @@ moduleFor(
 moduleFor(
   'The {{link-to}} component - loading states and warnings',
   class extends ApplicationTestCase {
-    [`@test {{link-to}} with null/undefined dynamic parameters are put in a loading state`](
+    async [`@test {{link-to}} with null/undefined dynamic parameters are put in a loading state`](
       assert
     ) {
-      assert.expect(19);
       let warningMessage =
         'This link is in an inactive loading state because at least one of its models currently has a null/undefined value, or the provided route name is invalid.';
 
@@ -2234,31 +2317,44 @@ moduleFor(
       this.addTemplate(
         'index',
         `
-        {{#link-to route=this.destinationRoute model=this.routeContext loadingClass='i-am-loading' id='context-link'}}
-          string
-        {{/link-to}}
-        {{#link-to route=this.secondRoute loadingClass=this.loadingClass id='static-link'}}
-          string
-        {{/link-to}}
+        <div id='context-link'>
+          {{#link-to route=this.destinationRoute model=this.routeContext loadingClass='i-am-loading'}}
+            string
+          {{/link-to}}
+        </div>
+        <div id='static-link'>
+          {{#link-to route=this.secondRoute loadingClass=this.loadingClass}}
+            string
+          {{/link-to}}
+        </div>
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
-        Controller.extend({
-          destinationRoute: null,
-          routeContext: null,
-          loadingClass: 'i-am-loading',
-        })
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          destinationRoute = null;
+          routeContext = null;
+          loadingClass = 'i-am-loading';
+        }
       );
 
+      let activate = 0;
+
       this.add(
         'route:about',
-        Route.extend({
+        class extends Route {
           activate() {
-            assert.ok(true, 'About was entered');
-          },
-        })
+            activate++;
+          }
+        }
       );
 
       function assertLinkStatus(link, url) {
@@ -2271,55 +2367,45 @@ moduleFor(
         }
       }
 
-      let contextLink, staticLink, controller;
+      await this.visit('/');
 
-      return this.visit('/')
-        .then(() => {
-          contextLink = this.$('#context-link');
-          staticLink = this.$('#static-link');
-          controller = this.applicationInstance.lookup('controller:index');
+      let contextLink = this.$('#context-link > a');
+      let staticLink = this.$('#static-link > a');
 
-          assertLinkStatus(contextLink);
-          assertLinkStatus(staticLink);
+      assertLinkStatus(contextLink);
+      assertLinkStatus(staticLink);
 
-          return expectWarning(() => {
-            return this.click(contextLink[0]);
-          }, warningMessage);
-        })
-        .then(() => {
-          // Set the destinationRoute (context is still null).
-          runTask(() => controller.set('destinationRoute', 'thing'));
-          assertLinkStatus(contextLink);
-
-          // Set the routeContext to an id
-          runTask(() => controller.set('routeContext', '456'));
-          assertLinkStatus(contextLink, '/thing/456');
-
-          // Test that 0 isn't interpreted as falsy.
-          runTask(() => controller.set('routeContext', 0));
-          assertLinkStatus(contextLink, '/thing/0');
-
-          // Set the routeContext to an object
-          runTask(() => {
-            controller.set('routeContext', { id: 123 });
-          });
-          assertLinkStatus(contextLink, '/thing/123');
-
-          // Set the destinationRoute back to null.
-          runTask(() => controller.set('destinationRoute', null));
-          assertLinkStatus(contextLink);
-
-          return expectWarning(() => {
-            return this.click(staticLink[0]);
-          }, warningMessage);
-        })
-        .then(() => {
-          runTask(() => controller.set('secondRoute', 'about'));
-          assertLinkStatus(staticLink, '/about');
+      await expectWarning(() => this.click(contextLink[0]), warningMessage);
 
-          // Click the now-active link
-          return this.click(staticLink[0]);
-        });
+      // Set the destinationRoute (context is still null).
+      runTask(() => controller.set('destinationRoute', 'thing'));
+      assertLinkStatus(contextLink);
+
+      // Set the routeContext to an id
+      runTask(() => controller.set('routeContext', '456'));
+      assertLinkStatus(contextLink, '/thing/456');
+
+      // Test that 0 isn't interpreted as falsy.
+      runTask(() => controller.set('routeContext', 0));
+      assertLinkStatus(contextLink, '/thing/0');
+
+      // Set the routeContext to an object
+      runTask(() => controller.set('routeContext', { id: 123 }));
+      assertLinkStatus(contextLink, '/thing/123');
+
+      // Set the destinationRoute back to null.
+      runTask(() => controller.set('destinationRoute', null));
+      assertLinkStatus(contextLink);
+
+      await expectWarning(() => this.click(staticLink[0]), warningMessage);
+
+      runTask(() => controller.set('secondRoute', 'about'));
+      assertLinkStatus(staticLink, '/about');
+
+      // Click the now-active link
+      await this.click(staticLink[0]);
+
+      assert.equal(activate, 1, 'About route was entered');
     }
   }
 );

From 3ce48a43a36083dd14615a018dd6fb53d953c669 Mon Sep 17 00:00:00 2001
From: "Andrey Mikhaylov (lolmaus)" <lolmaus@gmail.com>
Date: Wed, 24 Feb 2021 09:37:56 +0300
Subject: [PATCH 0378/1405] Fix glimmer-component-docs.ts typo in Markdown

Was also affecting a heading anchor link. Kudos to @kaermorchen.
---
 .../@ember/-internals/glimmer/lib/glimmer-component-docs.ts     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index 27cfcccd2be..2b8e8dfaa15 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -158,7 +158,7 @@
   to `{{yield}}`. Whenever you invoke a component without passing explicitly
   named blocks, the passed block is considered the `default` block.
 
-  ### Passing parameters to named bxlocks
+  ### Passing parameters to named blocks
 
   You can also pass parameters to named blocks:
 

From c360235492c4a34c12854464242f9f8a6b58b89b Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 23 Feb 2021 23:25:20 -0800
Subject: [PATCH 0379/1405] Refactor link-to transitioning-classes tests

---
 .../transitioning-classes-angle-test.js       |  39 +++----
 .../transitioning-classes-curly-test.js       | 103 +++++++++---------
 2 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
index 32e1f304438..fcfde192fc4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
@@ -17,8 +17,8 @@ function assertHasNoClass(assert, selector, label) {
 moduleFor(
   '<LinkTo /> component: .transitioning-in .transitioning-out CSS classes',
   class extends ApplicationTestCase {
-    constructor() {
-      super();
+    constructor(...args) {
+      super(...args);
 
       this.aboutDefer = RSVP.defer();
       this.otherDefer = RSVP.defer();
@@ -33,29 +33,29 @@ moduleFor(
 
       this.add(
         'route:about',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.aboutDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'route:other',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.otherDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'route:news',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.newsDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
@@ -154,8 +154,9 @@ moduleFor(
 moduleFor(
   `<LinkTo /> component: .transitioning-in .transitioning-out CSS classes - nested link-to's`,
   class extends ApplicationTestCase {
-    constructor() {
-      super();
+    constructor(...args) {
+      super(...args);
+
       this.aboutDefer = RSVP.defer();
       this.otherDefer = RSVP.defer();
       let _this = this;
@@ -168,20 +169,20 @@ moduleFor(
       });
       this.add(
         'route:parent-route.about',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.aboutDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'route:parent-route.other',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.otherDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
index 745e31356a5..c32ab6ee15e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
@@ -17,8 +17,8 @@ function assertHasNoClass(assert, selector, label) {
 moduleFor(
   '{{link-to}} component: .transitioning-in .transitioning-out CSS classes',
   class extends ApplicationTestCase {
-    constructor() {
-      super();
+    constructor(...args) {
+      super(...args);
 
       this.aboutDefer = RSVP.defer();
       this.otherDefer = RSVP.defer();
@@ -33,39 +33,39 @@ moduleFor(
 
       this.add(
         'route:about',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.aboutDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'route:other',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.otherDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'route:news',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.newsDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
         'application',
         `
         {{outlet}}
-        {{#link-to route='index' id='index-link'}}Index{{/link-to}}
-        {{#link-to route='about' id='about-link'}}About{{/link-to}}
-        {{#link-to route='other' id='other-link'}}Other{{/link-to}}
-        {{#link-to route='news' activeClass=false id='news-link'}}News{{/link-to}}
+        <div id='index-link'>{{#link-to route='index'}}Index{{/link-to}}</div>
+        <div id='about-link'>{{#link-to route='about'}}About{{/link-to}}</div>
+        <div id='other-link'>{{#link-to route='other'}}Other{{/link-to}}</div>
+        <div id='news-link'>{{#link-to route='news' activeClass=false}}News{{/link-to}}</div>
         `
       );
     }
@@ -82,9 +82,9 @@ moduleFor(
     }
 
     ['@test while a transition is underway'](assert) {
-      let $index = this.$('#index-link');
-      let $about = this.$('#about-link');
-      let $other = this.$('#other-link');
+      let $index = this.$('#index-link > a');
+      let $about = this.$('#about-link > a');
+      let $other = this.$('#other-link > a');
 
       $about.click();
 
@@ -116,9 +116,9 @@ moduleFor(
     }
 
     ['@test while a transition is underway with activeClass is false'](assert) {
-      let $index = this.$('#index-link');
-      let $news = this.$('#news-link');
-      let $other = this.$('#other-link');
+      let $index = this.$('#index-link > a');
+      let $news = this.$('#news-link > a');
+      let $other = this.$('#other-link > a');
 
       $news.click();
 
@@ -154,8 +154,9 @@ moduleFor(
 moduleFor(
   `{{link-to}} component: .transitioning-in .transitioning-out CSS classes - nested link-to's`,
   class extends ApplicationTestCase {
-    constructor() {
-      super();
+    constructor(...args) {
+      super(...args);
+
       this.aboutDefer = RSVP.defer();
       this.otherDefer = RSVP.defer();
       let _this = this;
@@ -168,20 +169,20 @@ moduleFor(
       });
       this.add(
         'route:parent-route.about',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.aboutDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.add(
         'route:parent-route.other',
-        Route.extend({
+        class extends Route {
           model() {
             return _this.otherDefer.promise;
-          },
-        })
+          }
+        }
       );
 
       this.addTemplate(
@@ -189,13 +190,13 @@ moduleFor(
         `
         {{outlet}}
         {{#link-to route='index' tagName='li'}}
-          {{#link-to route='index' id='index-link'}}Index{{/link-to}}
+          <div id='index-link'>{{#link-to route='index'}}Index{{/link-to}}</div>
         {{/link-to}}
         {{#link-to route='parent-route.about' tagName='li'}}
-          {{#link-to route='parent-route.about' tagName='li' id='about-link'}}About{{/link-to}}
+          <div id='about-link'>{{#link-to route='parent-route.about'}}About{{/link-to}}</div>
         {{/link-to}}
         {{#link-to route='parent-route.other' tagName='li'}}
-          {{#link-to route='parent-route.other' id='other-link'}}Other{{/link-to}}
+          <div id='other-link'>{{#link-to route='parent-route.other'}}Other{{/link-to}}</div>
         {{/link-to}}
         `
       );
@@ -228,13 +229,13 @@ moduleFor(
     [`@test while a transition is underway with nested link-to's`](assert) {
       // TODO undo changes to this test but currently this test navigates away if navigation
       // outlet is not stable and the second $about.click() is triggered.
-      let $about = this.$('#about-link');
+      let $about = this.$('#about-link > a');
 
       $about.click();
 
-      let $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      let $other = this.$('#other-link');
+      let $index = this.$('#index-link > a');
+      $about = this.$('#about-link > a');
+      let $other = this.$('#other-link > a');
 
       assertHasClass(assert, $index, 'active');
       assertHasNoClass(assert, $about, 'active');
@@ -250,9 +251,9 @@ moduleFor(
 
       this.resolveAbout();
 
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
+      $index = this.$('#index-link > a');
+      $about = this.$('#about-link > a');
+      $other = this.$('#other-link > a');
 
       assertHasNoClass(assert, $index, 'active');
       assertHasClass(assert, $about, 'active');
@@ -268,9 +269,9 @@ moduleFor(
 
       $other.click();
 
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
+      $index = this.$('#index-link > a');
+      $about = this.$('#about-link > a');
+      $other = this.$('#other-link > a');
 
       assertHasNoClass(assert, $index, 'active');
       assertHasClass(assert, $about, 'active');
@@ -286,9 +287,9 @@ moduleFor(
 
       this.resolveOther();
 
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
+      $index = this.$('#index-link > a');
+      $about = this.$('#about-link > a');
+      $other = this.$('#other-link > a');
 
       assertHasNoClass(assert, $index, 'active');
       assertHasNoClass(assert, $about, 'active');
@@ -304,9 +305,9 @@ moduleFor(
 
       $about.click();
 
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
+      $index = this.$('#index-link > a');
+      $about = this.$('#about-link > a');
+      $other = this.$('#other-link > a');
 
       assertHasNoClass(assert, $index, 'active');
       assertHasNoClass(assert, $about, 'active');
@@ -322,9 +323,9 @@ moduleFor(
 
       this.resolveAbout();
 
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
+      $index = this.$('#index-link > a');
+      $about = this.$('#about-link > a');
+      $other = this.$('#other-link > a');
 
       assertHasNoClass(assert, $index, 'active');
       assertHasClass(assert, $about, 'active');

From acaea6266220dba2782d9b24077c1fe3e95219af Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 24 Feb 2021 01:05:40 -0800
Subject: [PATCH 0380/1405] [INTERNAL] Refactor `expectDeprecation` and friends

* Cleanup TypeScript
* Add `expectNoDeprecationAsync`
* Add `isEnabled` flag to replace `maybeExpectDeprecation`
---
 .../components/input-angle-test.js            |  80 +++----
 .../components/input-curly-test.js            |  73 +++---
 packages/internal-test-helpers/index.js       |   1 -
 .../lib/ember-dev/debug.ts                    |  39 +++-
 .../lib/ember-dev/deprecation.ts              | 214 +++++++++++-------
 .../lib/ember-dev/method-call-tracker.ts      |   2 +-
 .../lib/maybe-expect-deprecation.ts           |  16 --
 7 files changed, 236 insertions(+), 189 deletions(-)
 delete mode 100644 packages/internal-test-helpers/lib/maybe-expect-deprecation.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index bd80189f94d..b37eaf8166f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,10 +1,4 @@
-import {
-  RenderingTestCase,
-  maybeExpectDeprecation,
-  moduleFor,
-  runDestroy,
-  runTask,
-} from 'internal-test-helpers';
+import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 
 import { action } from '@ember/object';
@@ -313,8 +307,7 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] dynamic attributes (named argument)']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `<Input @type="text" @value={{this.value}}
@@ -337,7 +330,8 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
@@ -360,8 +354,7 @@ moduleFor(
       // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'value', 'Updated value');
@@ -374,7 +367,8 @@ moduleFor(
             // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
@@ -386,8 +380,7 @@ moduleFor(
       // this.assertAttr('size', '21'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '31'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'value', 'Original value');
@@ -400,7 +393,8 @@ moduleFor(
             // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
@@ -447,8 +441,7 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] static attributes (named argument)']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `<Input @type="text" @value="Original value"
@@ -461,7 +454,8 @@ moduleFor(
               @tabindex={{30}}/>`
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
@@ -950,8 +944,7 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] dynamic attributes (named argument)']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `<Input @type='checkbox' @checked={{this.checked}}
@@ -966,7 +959,8 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -981,8 +975,7 @@ moduleFor(
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', true);
@@ -990,7 +983,8 @@ moduleFor(
             set(this.context, 'tabindex', 11);
           });
         },
-        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -998,8 +992,7 @@ moduleFor(
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', false);
@@ -1007,7 +1000,8 @@ moduleFor(
             set(this.context, 'tabindex', 10);
           });
         },
-        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -1099,14 +1093,14 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] with static values (named argument)']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `<Input @type="checkbox" @checked={{false}} @disabled={{false}} @tabindex={{10}} @name="original-name" />`
           );
         },
-        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -1205,8 +1199,7 @@ moduleFor(
     ['@test [DEPRECATED] null values (named argument)']() {
       let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `<Input @type="text" @value={{this.value}}
@@ -1227,7 +1220,8 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertValue('');
@@ -1238,8 +1232,7 @@ moduleFor(
       this.assertValue('');
       this.assertAllAttrs(attributes, undefined);
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', true);
@@ -1251,7 +1244,8 @@ moduleFor(
             set(this.context, 'tabindex', 31);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
@@ -1262,8 +1256,7 @@ moduleFor(
       this.assertAttr('size', '21');
       this.assertAttr('tabindex', '31');
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', null);
@@ -1275,7 +1268,8 @@ moduleFor(
             set(this.context, 'tabindex', null);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertAttr('disabled', undefined);
@@ -1349,10 +1343,10 @@ function InputAttributesTest(attrs) {
     `[GH#15675] Components test: <Input ${attrs} />`,
     class extends InputAttributesTest(attrs) {
       renderInput(value = 25) {
-        maybeExpectDeprecation(
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        expectDeprecation(
           () => super.renderInput(value),
-          /Passing the `@(min|max)` argument to <Input> is deprecated\./
+          /Passing the `@(min|max)` argument to <Input> is deprecated\./,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
         );
       }
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 45a4464be0a..5e9c2925e23 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -1,7 +1,6 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { maybeExpectDeprecation } from 'internal-test-helpers';
 import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
@@ -183,8 +182,7 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] dynamic attributes']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `
@@ -210,7 +208,8 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
@@ -233,8 +232,7 @@ moduleFor(
       // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'value', 'Updated value');
@@ -247,7 +245,8 @@ moduleFor(
             // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
@@ -259,8 +258,7 @@ moduleFor(
       // this.assertAttr('size', '21'); //NOTE: failing in IE (TEST_SUITE=sauce)
       // this.assertAttr('tabindex', '31'); //NOTE: failing in IE (TEST_SUITE=sauce)
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'value', 'Original value');
@@ -273,7 +271,8 @@ moduleFor(
             // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
@@ -287,8 +286,7 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] static attributes']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(`
             {{input type="text"
@@ -302,7 +300,8 @@ moduleFor(
               tabindex=30
             }}`);
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
@@ -736,8 +735,7 @@ moduleFor(
   `Components test: {{input type='checkbox'}}`,
   class extends InputRenderingTest {
     ['@test [DEPRECATED] dynamic attributes']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `{{input
@@ -755,7 +753,8 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -770,8 +769,7 @@ moduleFor(
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', true);
@@ -779,7 +777,8 @@ moduleFor(
             set(this.context, 'tabindex', 11);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -787,8 +786,7 @@ moduleFor(
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', false);
@@ -796,7 +794,8 @@ moduleFor(
             set(this.context, 'tabindex', 10);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -868,8 +867,7 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] with static values']() {
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `{{input type="checkbox"
@@ -879,7 +877,8 @@ moduleFor(
               checked=false}}`
           );
         },
-        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
@@ -909,8 +908,7 @@ moduleFor(
     ['@test [DEPRECATED] null values']() {
       let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           this.render(
             `{{input type="text"
@@ -932,7 +930,8 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertValue('');
@@ -943,8 +942,7 @@ moduleFor(
       this.assertValue('');
       this.assertAllAttrs(attributes, undefined);
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', true);
@@ -956,7 +954,8 @@ moduleFor(
             set(this.context, 'tabindex', 31);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
@@ -967,8 +966,7 @@ moduleFor(
       this.assertAttr('size', '21');
       this.assertAttr('tabindex', '31');
 
-      maybeExpectDeprecation(
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+      expectDeprecation(
         () => {
           runTask(() => {
             set(this.context, 'disabled', null);
@@ -980,7 +978,8 @@ moduleFor(
             set(this.context, 'tabindex', null);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./
+        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertAttr('disabled', undefined);
@@ -1008,10 +1007,10 @@ moduleFor(
     `[GH#15675] Components test [DEPRECATED]: {{input ${attrs}}}`,
     class extends InputRenderingTest {
       renderInput(value = 25) {
-        maybeExpectDeprecation(
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+        expectDeprecation(
           () => this.render(`{{input ${attrs.replace('%x', value)}}}`),
-          /Passing the `@(min|max)` argument to <Input> is deprecated\./
+          /Passing the `@(min|max)` argument to <Input> is deprecated\./,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
         );
       }
 
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index e4ac00e41e0..3379d35400d 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -7,7 +7,6 @@ export { default as moduleFor, setupTestClass } from './lib/module-for';
 export { default as strip } from './lib/strip';
 export { default as applyMixins } from './lib/apply-mixins';
 export { default as getTextOf } from './lib/get-text-of';
-export { default as maybeExpectDeprecation } from './lib/maybe-expect-deprecation';
 export {
   defineComponent,
   defineSimpleHelper,
diff --git a/packages/internal-test-helpers/lib/ember-dev/debug.ts b/packages/internal-test-helpers/lib/ember-dev/debug.ts
index ee04360741f..1850683ed5a 100644
--- a/packages/internal-test-helpers/lib/ember-dev/debug.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/debug.ts
@@ -35,10 +35,19 @@ class DebugAssert {
   // Run an expectation callback within the context of a new tracker, optionally
   // accepting a function to run, which asserts immediately
   runExpectation(
-    func: (() => any) | undefined,
+    func: (() => void) | undefined,
+    callback: (tracker: MethodCallTracker) => void
+  ): void;
+  runExpectation(
+    func: () => Promise<void>,
+    callback: (tracker: MethodCallTracker) => void,
+    async: true
+  ): Promise<void>;
+  runExpectation(
+    func: (() => void) | (() => Promise<void>) | undefined,
     callback: (tracker: MethodCallTracker) => void,
     async = false
-  ): void {
+  ): void | Promise<void> {
     let originalTracker: MethodCallTracker | null = null;
 
     // When helpers are passed a callback, they get a new tracker context
@@ -57,20 +66,26 @@ class DebugAssert {
     // Once the given callback is invoked, the pending assertions should be
     // flushed immediately
     if (func) {
-      let maybePromise = func();
-
-      if (async && typeof maybePromise.then === 'function') {
-        return maybePromise.then(() => {
+      if (async) {
+        return (async () => {
+          try {
+            await func();
+          } finally {
+            this.assert();
+            this.reset();
+
+            this.tracker = originalTracker;
+          }
+        })();
+      } else {
+        try {
+          func();
+        } finally {
           this.assert();
           this.reset();
 
           this.tracker = originalTracker;
-        });
-      } else {
-        this.assert();
-        this.reset();
-
-        this.tracker = originalTracker;
+        }
       }
     }
   }
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index 57daa3e9ad3..9cc95ecab89 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -1,23 +1,13 @@
+import { assert } from '@ember/debug';
 import DebugAssert from './debug';
 import { callWithStub, DebugEnv, Message } from './utils';
-
-type ExpectNoDeprecationFunc = (func?: () => void) => void;
-type ExpectDeprecationAsyncFunc = (
-  func: () => void | undefined | Message | Promise<any>,
-  expectedMessage: Message
-) => Promise<any>;
-export type ExpectDeprecationFunc = (
-  func: () => void | undefined | Message,
-  expectedMessage: Message
-) => void;
-type IgnoreDeprecationFunc = (func: () => void) => void;
-
 declare global {
   interface Window {
-    expectNoDeprecation: ExpectNoDeprecationFunc | null;
-    expectDeprecation: ExpectDeprecationFunc | null;
-    expectDeprecationAsync: ExpectDeprecationAsyncFunc | null;
-    ignoreDeprecation: IgnoreDeprecationFunc | null;
+    expectNoDeprecation: DeprecationAssert['expectNoDeprecation'] | undefined;
+    expectNoDeprecationAsync: DeprecationAssert['expectNoDeprecationAsync'] | undefined;
+    expectDeprecation: DeprecationAssert['expectDeprecation'] | undefined;
+    expectDeprecationAsync: DeprecationAssert['expectDeprecationAsync'] | undefined;
+    ignoreDeprecation: DeprecationAssert['ignoreDeprecation'] | undefined;
   }
 }
 
@@ -41,71 +31,148 @@ class DeprecationAssert extends DebugAssert {
   }
 
   inject(): void {
-    // Expects no deprecation to happen within a function, or if no function is
-    // passed, from the time of calling until the end of the test.
-    //
-    // expectNoDeprecation(function() {
-    //   fancyNewThing();
-    // });
-    //
-    // expectNoDeprecation();
-    // Ember.deprecate("Old And Busted");
-    //
-    let expectNoDeprecation: ExpectNoDeprecationFunc = (func) => {
-      if (typeof func !== 'function') {
-        func = undefined;
+    window.expectNoDeprecation = this.expectNoDeprecation.bind(this);
+    window.expectNoDeprecationAsync = this.expectNoDeprecationAsync.bind(this);
+    window.expectDeprecation = this.expectDeprecation.bind(this);
+    window.expectDeprecationAsync = this.expectDeprecationAsync.bind(this);
+    window.ignoreDeprecation = this.ignoreDeprecation.bind(this);
+    super.inject();
+  }
+
+  restore(): void {
+    super.restore();
+    window.expectNoDeprecation = undefined;
+    window.expectNoDeprecationAsync = undefined;
+    window.expectDeprecation = undefined;
+    window.expectDeprecationAsync = undefined;
+    window.ignoreDeprecation = undefined;
+  }
+
+  // Expects no deprecation to happen within a function, or if no function is
+  // passed, from the time of calling until the end of the test.
+  //
+  // expectNoDeprecation(function() {
+  //   fancyNewThing();
+  // });
+  //
+  // expectNoDeprecation();
+  // Ember.deprecate("Old And Busted");
+  //
+  private expectNoDeprecation(func?: () => void): void {
+    this.runExpectation(func, (tracker) => {
+      if (tracker.isExpectingCalls()) {
+        throw new Error('expectNoDeprecation was called after expectDeprecation was called!');
       }
 
-      this.runExpectation(func, (tracker) => {
+      tracker.expectNoCalls();
+    });
+  }
+
+  // Expects no deprecation to happen within an async function.
+  //
+  // expectNoDeprecationAsync(async function() {
+  //   await fancyAsyncThing();
+  // });
+  //
+  private async expectNoDeprecationAsync(func: () => Promise<void>): Promise<void> {
+    await this.runExpectation(
+      func,
+      (tracker) => {
         if (tracker.isExpectingCalls()) {
           throw new Error('expectNoDeprecation was called after expectDeprecation was called!');
         }
 
         tracker.expectNoCalls();
-      });
-    };
-
-    // Expect a deprecation to happen within a function, or if no function
-    // is pass, from the time of calling until the end of the test. Can be called
-    // multiple times to assert deprecations with different specific messages
-    // were fired.
-    //
-    // expectDeprecation(function() {
-    //   Ember.deprecate("Old And Busted");
-    // }, /* optionalStringOrRegex */);
-    //
-    // expectDeprecation(/* optionalStringOrRegex */);
-    // Ember.deprecate("Old And Busted");
-    //
-    let expectDeprecation: ExpectDeprecationFunc = (func, message) => {
-      let actualFunc: (() => void) | undefined;
-      if (typeof func !== 'function') {
-        message = func as Message;
-        actualFunc = undefined;
+      },
+      true
+    );
+  }
+
+  // Expect a deprecation to happen within a function, or if no function
+  // is pass, from the time of calling until the end of the test. Can be called
+  // multiple times to assert deprecations with different specific messages
+  // were fired.
+  //
+  // expectDeprecation(function() {
+  //   Ember.deprecate("Old And Busted");
+  // }, /* optionalStringOrRegex */);
+  //
+  // expectDeprecation(/* optionalStringOrRegex */);
+  // Ember.deprecate("Old And Busted");
+  //
+  private expectDeprecation(isEnabled?: boolean): void;
+  private expectDeprecation(message: Message, isEnabled?: boolean): void;
+  private expectDeprecation(func: () => void, message?: Message): void;
+  private expectDeprecation(func: () => void, isEnabled?: boolean): void;
+  private expectDeprecation(func: () => void, message: Message, isEnabled: boolean): void;
+  private expectDeprecation(
+    messageOrFuncOrIsEnabled: boolean | Message | (() => void) = true,
+    messageOrIsEnabled: Message | boolean = true,
+    isEnabled = true
+  ): void {
+    let func: (() => void) | undefined;
+    let message: Message | undefined;
+
+    if (typeof messageOrFuncOrIsEnabled === 'boolean') {
+      func = undefined;
+      isEnabled = messageOrFuncOrIsEnabled;
+    } else if (typeof messageOrFuncOrIsEnabled === 'function') {
+      func = messageOrFuncOrIsEnabled;
+
+      if (typeof messageOrIsEnabled === 'boolean') {
+        isEnabled = messageOrIsEnabled;
       } else {
-        actualFunc = func;
+        message = messageOrIsEnabled;
       }
+    } else {
+      assert(
+        `second argument must be isEnabled flag, got ${messageOrIsEnabled}`,
+        typeof messageOrIsEnabled === 'boolean'
+      );
+
+      message = messageOrFuncOrIsEnabled;
+      isEnabled = messageOrIsEnabled;
+    }
 
-      this.runExpectation(actualFunc, (tracker) => {
+    if (isEnabled) {
+      this.runExpectation(func, (tracker) => {
         if (tracker.isExpectingNoCalls()) {
           throw new Error('expectDeprecation was called after expectNoDeprecation was called!');
         }
 
         tracker.expectCall(message, ['id', 'until']);
       });
-    };
-
-    let expectDeprecationAsync: ExpectDeprecationAsyncFunc = async (func, message) => {
-      let actualFunc: (() => void) | undefined;
-      if (typeof func !== 'function') {
-        message = func as Message;
-        actualFunc = undefined;
-      } else {
-        actualFunc = func;
-      }
+    } else {
+      this.expectNoDeprecation(func);
+    }
+  }
 
+  private async expectDeprecationAsync(func: () => Promise<void>, message?: Message): Promise<void>;
+  private async expectDeprecationAsync(
+    func: () => Promise<void>,
+    isEnabled?: boolean
+  ): Promise<void>;
+  private async expectDeprecationAsync(
+    func: () => Promise<void>,
+    message: Message,
+    isEnabled: boolean
+  ): Promise<void>;
+  private async expectDeprecationAsync(
+    func: () => Promise<void>,
+    messageOrIsEnabled: Message | boolean = true,
+    isEnabled = true
+  ): Promise<void> {
+    let message: Message | undefined;
+
+    if (typeof messageOrIsEnabled === 'boolean') {
+      isEnabled = messageOrIsEnabled;
+    } else {
+      message = messageOrIsEnabled;
+    }
+
+    if (isEnabled) {
       await this.runExpectation(
-        actualFunc,
+        func,
         (tracker) => {
           if (tracker.isExpectingNoCalls()) {
             throw new Error('expectDeprecation was called after expectNoDeprecation was called!');
@@ -115,24 +182,13 @@ class DeprecationAssert extends DebugAssert {
         },
         true
       );
-    };
-
-    let ignoreDeprecation: IgnoreDeprecationFunc = (func) => {
-      callWithStub(this.env, 'deprecate', func);
-    };
-
-    window.expectNoDeprecation = expectNoDeprecation;
-    window.expectDeprecation = expectDeprecation;
-    window.expectDeprecationAsync = expectDeprecationAsync;
-    window.ignoreDeprecation = ignoreDeprecation;
+    } else {
+      this.expectNoDeprecationAsync(func);
+    }
   }
 
-  restore(): void {
-    super.restore();
-    window.expectDeprecation = null;
-    window.expectDeprecationAsync = null;
-    window.expectNoDeprecation = null;
-    window.ignoreDeprecation = null;
+  private ignoreDeprecation(func: () => void): void {
+    callWithStub(this.env, 'deprecate', func);
   }
 }
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
index 149ee4b0c63..206ccc3c7b2 100644
--- a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
@@ -48,7 +48,7 @@ export default class MethodCallTracker {
     }
   }
 
-  expectCall(message: Message, options?: OptionList): void {
+  expectCall(message?: Message, options?: OptionList): void {
     this.stubMethod();
     this._expectedMessages.push(message || /.*/);
     this._expectedOptionLists.push(options);
diff --git a/packages/internal-test-helpers/lib/maybe-expect-deprecation.ts b/packages/internal-test-helpers/lib/maybe-expect-deprecation.ts
deleted file mode 100644
index 1c73cf35de6..00000000000
--- a/packages/internal-test-helpers/lib/maybe-expect-deprecation.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ExpectDeprecationFunc } from './ember-dev/deprecation';
-import { Message } from './ember-dev/utils';
-
-declare let expectDeprecation: ExpectDeprecationFunc;
-
-export default function maybeExpectDeprecation(
-  featureFlag: boolean | null,
-  callback: () => void,
-  message: Message
-): void {
-  if (featureFlag) {
-    expectDeprecation(callback, message);
-  } else {
-    callback();
-  }
-}

From e522fdc6192a45251d44dcb35deb8be1ab87294f Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Tue, 9 Feb 2021 23:07:21 +0000
Subject: [PATCH 0381/1405] Add deprecation method to disconnectOutlet

---
 .../application/debug-render-tree-test.ts     |  7 +-
 .../-internals/routing/lib/system/route.ts    |  9 ++
 .../tests/routing/template_rendering_test.js  | 89 +++++++++++++------
 3 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 2a2d1c68364..60cfa1c49fa 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -4,6 +4,8 @@ import {
   moduleFor,
   strip,
 } from 'internal-test-helpers';
+import { ExpectDeprecationFunc } from '../../../../../../internal-test-helpers/lib/ember-dev/deprecation';
+declare let expectDeprecation: ExpectDeprecationFunc;
 
 import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
@@ -225,7 +227,10 @@ if (ENV._DEBUG_RENDER_TREE) {
               if (showHeader) {
                 this.render('header', { outlet: 'header' });
               } else {
-                this.disconnectOutlet('header');
+                expectDeprecation(
+                  () => this.disconnectOutlet('header'),
+                  'The usage of `disconnectOutlet` is deprecated.'
+                );
               }
             }
           }
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 4e6ead0fc03..30169a18520 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1705,6 +1705,15 @@ class Route extends EmberObject implements IRoute {
     @public
   */
   disconnectOutlet(options: string | { outlet: string; parentView?: string }) {
+    deprecate('The usage of `disconnectOutlet` is deprecated.', false, {
+      id: 'route-disconnect-outlet',
+      until: '4.0.0',
+      url: 'https://deprecations.emberjs.com/v3.x/#toc_route-disconnect-outlet',
+      for: 'ember-source',
+      since: {
+        enabled: '3.27.0',
+      },
+    });
     let outletName;
     let parentView;
     if (options) {
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 3caef796bde..b1da5207607 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -775,10 +775,14 @@ moduleFor(
               });
             },
             hideModal() {
-              this.disconnectOutlet({
-                outlet: 'modal',
-                parentView: 'application',
-              });
+              expectDeprecation(
+                () =>
+                  this.disconnectOutlet({
+                    outlet: 'modal',
+                    parentView: 'application',
+                  }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -794,7 +798,10 @@ moduleFor(
               });
             },
             hideExtra() {
-              this.disconnectOutlet({ parentView: 'posts/index' });
+              expectDeprecation(
+                () => this.disconnectOutlet({ parentView: 'posts/index' }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -898,7 +905,10 @@ moduleFor(
               });
             },
             hideModal() {
-              this.disconnectOutlet('modal');
+              expectDeprecation(
+                () => this.disconnectOutlet('modal'),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -942,7 +952,7 @@ moduleFor(
     }
 
     ['@test Route silently fails when cleaning an outlet from an inactive view'](assert) {
-      assert.expect(1); // handleURL
+      assert.expect(3); // handleURL
 
       this.addTemplate('application', '{{outlet}}');
       this.addTemplate('posts', "{{outlet 'modal'}}");
@@ -957,16 +967,23 @@ moduleFor(
         Route.extend({
           actions: {
             hideSelf() {
-              this.disconnectOutlet({
-                outlet: 'main',
-                parentView: 'application',
-              });
+              expectDeprecation(
+                () =>
+                  this.disconnectOutlet({
+                    outlet: 'main',
+                    parentView: 'application',
+                  }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
             showModal() {
               this.render('modal', { into: 'posts', outlet: 'modal' });
             },
             hideModal() {
-              this.disconnectOutlet({ outlet: 'modal', parentView: 'posts' });
+              expectDeprecation(
+                () => this.disconnectOutlet({ outlet: 'modal', parentView: 'posts' }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -1080,10 +1097,14 @@ moduleFor(
           },
           actions: {
             banish() {
-              this.disconnectOutlet({
-                parentView: 'application',
-                outlet: 'other',
-              });
+              expectDeprecation(
+                () =>
+                  this.disconnectOutlet({
+                    parentView: 'application',
+                    outlet: 'other',
+                  }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -1249,10 +1270,14 @@ moduleFor(
               });
             },
             close() {
-              this.disconnectOutlet({
-                outlet: 'modal',
-                parentView: 'application',
-              });
+              expectDeprecation(
+                () =>
+                  this.disconnectOutlet({
+                    outlet: 'modal',
+                    parentView: 'application',
+                  }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -1329,10 +1354,14 @@ moduleFor(
         Route.extend({
           actions: {
             close() {
-              this.disconnectOutlet({
-                parentView: 'application',
-                outlet: 'modal',
-              });
+              expectDeprecation(
+                () =>
+                  this.disconnectOutlet({
+                    parentView: 'application',
+                    outlet: 'modal',
+                  }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })
@@ -1438,10 +1467,14 @@ moduleFor(
               });
             },
             hideModal() {
-              this.disconnectOutlet({
-                outlet: undefined,
-                parentView: 'application',
-              });
+              expectDeprecation(
+                () =>
+                  this.disconnectOutlet({
+                    outlet: undefined,
+                    parentView: 'application',
+                  }),
+                'The usage of `disconnectOutlet` is deprecated.'
+              );
             },
           },
         })

From 67e336402f15a1037737398509bb8c1339cb3264 Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Tue, 23 Feb 2021 21:31:18 +0000
Subject: [PATCH 0382/1405] Fix TS lint errors with deprecation helpers

---
 .../tests/integration/application/debug-render-tree-test.ts | 3 +--
 packages/internal-test-helpers/index.js                     | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 60cfa1c49fa..7dc947c1547 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1,11 +1,10 @@
 import {
   ApplicationTestCase,
+  expectDeprecation,
   ModuleBasedTestResolver,
   moduleFor,
   strip,
 } from 'internal-test-helpers';
-import { ExpectDeprecationFunc } from '../../../../../../internal-test-helpers/lib/ember-dev/deprecation';
-declare let expectDeprecation: ExpectDeprecationFunc;
 
 import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index 3379d35400d..bad3852df84 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -7,6 +7,12 @@ export { default as moduleFor, setupTestClass } from './lib/module-for';
 export { default as strip } from './lib/strip';
 export { default as applyMixins } from './lib/apply-mixins';
 export { default as getTextOf } from './lib/get-text-of';
+export {
+  expectDeprecation,
+  expectNoDeprecation,
+  expectDeprecationAsync,
+  ignoreDeprecation,
+} from './lib/ember-dev/deprecation';
 export {
   defineComponent,
   defineSimpleHelper,

From 33979b813cdf5289a7db19658fdc271d717efb84 Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Wed, 24 Feb 2021 15:25:27 +0000
Subject: [PATCH 0383/1405] Refactor to account for conflict

---
 .../lib/ember-dev/deprecation.ts              | 42 ++++++++++++++++---
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index 9cc95ecab89..bd1a637858e 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -25,17 +25,49 @@ export function setupDeprecationHelpers(hooks: NestedHooks, env: DebugEnv): void
   });
 }
 
+export let expectDeprecation: DeprecationAssert['expectDeprecation'] = () => {
+  throw new Error(
+    'DeprecationAssert: To use `expectDeprecation` in a test you must call `setupDeprecationHelpers` first'
+  );
+};
+
+export let ignoreDeprecation: DeprecationAssert['ignoreDeprecation'] = () => {
+  throw new Error(
+    'DeprecationAssert: To use `ignoreDeprecation` in a test you must call `setupDeprecationHelpers` first'
+  );
+};
+
+export let expectDeprecationAsync: DeprecationAssert['expectDeprecationAsync'] = () => {
+  throw new Error(
+    'DeprecationAssert: To use `expectDeprecationAsync` in a test you must call `setupDeprecationHelpers` first'
+  );
+};
+
+export let expectNoDeprecation: DeprecationAssert['expectNoDeprecation'] = () => {
+  throw new Error(
+    'DeprecationAssert: To use `expectNoDeprecation` in a test you must call `setupDeprecationHelpers` first'
+  );
+};
+
+export let expectNoDeprecationAsync: DeprecationAssert['expectNoDeprecationAsync'] = () => {
+  throw new Error(
+    'DeprecationAssert: To use `expectNoDeprecationAsync` in a test you must call `setupDeprecationHelpers` first'
+  );
+};
+
 class DeprecationAssert extends DebugAssert {
   constructor(env: DebugEnv) {
     super('deprecate', env);
   }
 
   inject(): void {
-    window.expectNoDeprecation = this.expectNoDeprecation.bind(this);
-    window.expectNoDeprecationAsync = this.expectNoDeprecationAsync.bind(this);
-    window.expectDeprecation = this.expectDeprecation.bind(this);
-    window.expectDeprecationAsync = this.expectDeprecationAsync.bind(this);
-    window.ignoreDeprecation = this.ignoreDeprecation.bind(this);
+    window.expectNoDeprecation = expectNoDeprecation = this.expectNoDeprecation.bind(this);
+    window.expectNoDeprecationAsync = expectNoDeprecationAsync = this.expectNoDeprecationAsync.bind(
+      this
+    );
+    window.expectDeprecation = expectDeprecation = this.expectDeprecation.bind(this);
+    window.expectDeprecationAsync = expectDeprecationAsync = this.expectDeprecationAsync.bind(this);
+    window.ignoreDeprecation = ignoreDeprecation = this.ignoreDeprecation.bind(this);
     super.inject();
   }
 

From 59cedc9f3b2b6855cfa40fe30c0154eca5b759a9 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 24 Feb 2021 19:48:49 -0800
Subject: [PATCH 0384/1405] [INTERNAL] Some more improvements to link-to tests

---
 .../components/link-to/routing-angle-test.js  | 275 +++++++++++++--
 .../components/link-to/routing-curly-test.js  | 326 +++++++++++++++---
 2 files changed, 532 insertions(+), 69 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 7feb4c54ecd..4b1f8f266c2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -100,11 +100,11 @@ moduleFor(
       assert.strictEqual(this.$('#about-link').attr('href'), null, 'there is no href attribute');
     }
 
-    async [`@test it applies a 'disabled' class when disabled`](assert) {
+    async [`@test it applies a 'disabled' class when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `
-        <LinkTo id="about-link-static" @route="about" @disabledWhen="shouldDisable">About</LinkTo>
+        <LinkTo id="about-link-static" @route="about" @disabledWhen="truthy">About</LinkTo>
         <LinkTo id="about-link-dynamic" @route="about" @disabledWhen={{this.dynamicDisabledWhen}}>About</LinkTo>
         `
       );
@@ -119,8 +119,7 @@ moduleFor(
             controller = this;
           }
 
-          shouldDisable = true;
-          dynamicDisabledWhen = 'shouldDisable';
+          dynamicDisabledWhen = true;
         }
       );
 
@@ -140,47 +139,164 @@ moduleFor(
       runTask(() => controller.set('dynamicDisabledWhen', false));
 
       assert.equal(
+        this.$('#about-link-static.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.strictEqual(
         this.$('#about-link-dynamic.disabled').length,
         0,
         'The dynamic link is re-enabled when its disabledWhen becomes false'
       );
     }
 
-    async [`@test it doesn't apply a 'disabled' class if disabledWhen is not provided`](assert) {
+    async [`@test it applies a 'disabled' class when disabled`](assert) {
+      this.addTemplate(
+        'index',
+        `
+        <LinkTo id="about-link-static" @route="about" @disabled="truthy">About</LinkTo>
+        <LinkTo id="about-link-dynamic" @route="about" @disabled={{this.dynamicDisabled}}>About</LinkTo>
+        `
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicDisabled = true;
+        }
+      );
+
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link-static.disabled').length,
+        1,
+        'The static link is disabled when its disabled is true'
+      );
+      assert.equal(
+        this.$('#about-link-dynamic.disabled').length,
+        1,
+        'The dynamic link is disabled when its disabled is true'
+      );
+
+      runTask(() => controller.set('dynamicDisabled', false));
+
+      assert.equal(
+        this.$('#about-link-static.disabled').length,
+        1,
+        'The static link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabled becomes false'
+      );
+    }
+
+    async [`@test it doesn't apply a 'disabled' class when not disabled`](assert) {
       this.addTemplate('index', `<LinkTo id="about-link" @route="about">About</LinkTo>`);
 
       await this.visit('/');
 
       assert.ok(
         !this.$('#about-link').hasClass('disabled'),
-        'The link is not disabled if disabledWhen not provided'
+        'The link is not disabled if disabled was not provided'
       );
     }
 
     async [`@test it supports a custom disabledClass`](assert) {
       this.addTemplate(
         'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}} @disabledClass="do-not-want">About</LinkTo>`
+        `
+        <LinkTo id="about-link-static" @route="about" @disabledClass="do-not-want" @disabled={{true}}>About</LinkTo>
+        <LinkTo id="about-link-dynamic" @route="about" @disabledClass="do-not-want" @disabled={{this.dynamicDisabled}}>About</LinkTo>
+        `
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicDisabled = true;
+        }
       );
 
       await this.visit('/');
 
       assert.equal(
-        this.$('#about-link.do-not-want').length,
+        this.$('#about-link-static.do-not-want').length,
         1,
-        'The link can apply a custom disabled class'
+        'The static link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic.do-not-want').length,
+        1,
+        'The dynamic link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-static.disabled').length,
+        0,
+        'The default disabled class is not added on the static link'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic.disabled').length,
+        0,
+        'The default disabled class is not added on the dynamic link'
+      );
+
+      runTask(() => controller.set('dynamicDisabled', false));
+
+      assert.equal(
+        this.$('#about-link-static.do-not-want').length,
+        1,
+        'The static link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabled becomes false'
+      );
+      assert.strictEqual(
+        this.$('#about-link-static.disabled').length,
+        0,
+        'The default disabled class is not added on the static link'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic.disabled').length,
+        0,
+        'The default disabled class is not added on the dynamic link'
       );
     }
 
     async [`@test it supports a custom disabledClass set via bound param`](assert) {
       this.addTemplate(
         'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}} @disabledClass={{this.disabledClass}}>About</LinkTo>`
+        `<LinkTo id="about-link" @route="about" @disabledClass={{this.disabledClass}} @disabled={{true}}>About</LinkTo>`
       );
 
+      let controller;
+
       this.add(
         'controller:index',
         class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
           disabledClass = 'do-not-want';
         }
       );
@@ -192,6 +308,25 @@ moduleFor(
         1,
         'The link can apply a custom disabled class via bound param'
       );
+      assert.strictEqual(
+        this.$('#about-link.disabled').length,
+        0,
+        'The default disabled class is not added'
+      );
+
+      runTask(() => controller.set('disabledClass', 'can-not-use'));
+
+      assert.equal(
+        this.$('#about-link.can-not-use').length,
+        1,
+        'The link can apply a custom disabled class via bound param'
+      );
+      assert.strictEqual(this.$('#about-link.do-not-want').length, 0, 'The old class is removed');
+      assert.strictEqual(
+        this.$('#about-link.disabled').length,
+        0,
+        'The default disabled class is not added'
+      );
     }
 
     async [`@test it does not respond to clicks when disabledWhen`](assert) {
@@ -220,10 +355,10 @@ moduleFor(
       assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
 
-    async [`@test it responds to clicks according to its disabledWhen bound param`](assert) {
+    async [`@test it responds to clicks according to its disabled bound param`](assert) {
       this.addTemplate(
         'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{this.disabledWhen}}>About</LinkTo>`
+        `<LinkTo id="about-link" @route="about" @disabled={{this.dynamicDisabled}}>About</LinkTo>`
       );
 
       let controller;
@@ -236,7 +371,7 @@ moduleFor(
             controller = this;
           }
 
-          disabledWhen = true;
+          dynamicDisabled = true;
         }
       );
 
@@ -246,7 +381,7 @@ moduleFor(
 
       assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
 
-      runTask(() => controller.set('disabledWhen', false));
+      runTask(() => controller.set('dynamicDisabled', false));
 
       await this.click('#about-link');
 
@@ -280,6 +415,16 @@ moduleFor(
         1,
         'The other link was rendered without active class'
       );
+      assert.strictEqual(
+        this.$('#self-link.active').length,
+        0,
+        'The self-link was rendered without the default active class'
+      );
+      assert.strictEqual(
+        this.$('#about-link.active').length,
+        0,
+        'The other link was rendered without the default active class'
+      );
     }
 
     async [`@test it supports a custom activeClass from a bound param`](assert) {
@@ -292,9 +437,16 @@ moduleFor(
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
         class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
           activeClass = 'zomg-active';
         }
       );
@@ -312,6 +464,44 @@ moduleFor(
         1,
         'The other link was rendered without active class'
       );
+      assert.strictEqual(
+        this.$('#self-link.active').length,
+        0,
+        'The self-link was rendered without the default active class'
+      );
+      assert.strictEqual(
+        this.$('#about-link.active').length,
+        0,
+        'The other link was rendered without the default active class'
+      );
+
+      runTask(() => controller.set('activeClass', 'wow-active'));
+
+      assert.equal(
+        this.$('#self-link.wow-active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link:not(.wow-active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+      assert.strictEqual(
+        this.$('#self-link.zomg-active').length,
+        0,
+        'The self-link was rendered without the previous active class'
+      );
+      assert.strictEqual(
+        this.$('#self-link.active').length,
+        0,
+        'The self-link was rendered without the default active class'
+      );
+      assert.strictEqual(
+        this.$('#about-link.active').length,
+        0,
+        'The other link was rendered without the default active class'
+      );
     }
 
     async ['@test Using <LinkTo> inside a non-routable engine errors'](assert) {
@@ -586,8 +776,13 @@ moduleFor(
 
       await this.click('#about-link');
 
-      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-      assert.equal(
+      assert.strictEqual(
+        this.updateCount,
+        this.updateCountAfterVisit,
+        'setURL should not be called'
+      );
+
+      assert.strictEqual(
         this.replaceCount,
         this.replaceCountAfterVisit + 1,
         'replaceURL should be called once'
@@ -614,8 +809,13 @@ moduleFor(
 
       await this.click('#about-link');
 
-      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-      assert.equal(
+      assert.strictEqual(
+        this.updateCount,
+        this.updateCountAfterVisit,
+        'setURL should not be called'
+      );
+
+      assert.strictEqual(
         this.replaceCount,
         this.replaceCountAfterVisit + 1,
         'replaceURL should be called once'
@@ -642,8 +842,13 @@ moduleFor(
 
       await this.click('#about-link');
 
-      assert.equal(this.updateCount, this.updateCountAfterVisit + 1, 'setURL should be called');
-      assert.equal(
+      assert.strictEqual(
+        this.updateCount,
+        this.updateCountAfterVisit + 1,
+        'setURL should be called'
+      );
+
+      assert.strictEqual(
         this.replaceCount,
         this.replaceCountAfterVisit,
         'replaceURL should not be called'
@@ -1192,9 +1397,16 @@ moduleFor(
         `
       );
 
+      let controller = this;
+
       this.add(
         'controller:index',
         class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
           boundLinkTarget = '_blank';
         }
       );
@@ -1203,6 +1415,10 @@ moduleFor(
 
       let link = this.$('#self-link');
       assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
+
+      runTask(() => controller.set('boundLinkTarget', '_self'));
+
+      assert.equal(link.attr('target'), '_self', 'The self-link contains `target` attribute');
     }
 
     async [`@test it calls preventDefault`](assert) {
@@ -1234,7 +1450,7 @@ moduleFor(
       assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
     }
 
-    async [`@test it does not call preventDefault if '@preventDefault={{this.boundFalseyThing}}' is passed as an option`](
+    async [`@test it does not call preventDefault if '@preventDefault={{this.boundThing}}' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1243,19 +1459,32 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `<LinkTo id='about-link' @route='about' @preventDefault={{this.boundFalseyThing}}>About</LinkTo>`
+        `<LinkTo id='about-link' @route='about' @preventDefault={{this.boundThing}}>About</LinkTo>`
       );
 
+      let controller;
+
       this.add(
         'controller:index',
         class extends Controller {
-          boundFalseyThing = false;
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          boundThing = false;
         }
       );
 
       await this.visit('/');
 
       assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
+
+      runTask(() => controller.set('boundThing', true));
+
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#about-link').trigger('click'), assert);
     }
 
     async [`@test it does not call preventDefault if 'target' attribute is provided`](assert) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 53eafd36b3e..0431098d342 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -104,11 +104,11 @@ moduleFor(
       );
     }
 
-    async [`@test it applies a 'disabled' class when disabled`](assert) {
+    async [`@test it applies a 'disabled' class when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `
-        <div id="about-link-static">{{#link-to route="about" disabledWhen="shouldDisable"}}About{{/link-to}}</div>
+        <div id="about-link-static">{{#link-to route="about" disabledWhen="truthy"}}About{{/link-to}}</div>
         <div id="about-link-dynamic">{{#link-to route="about" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}</div>
         `
       );
@@ -123,8 +123,7 @@ moduleFor(
             controller = this;
           }
 
-          shouldDisable = true;
-          dynamicDisabledWhen = 'shouldDisable';
+          dynamicDisabledWhen = true;
         }
       );
 
@@ -144,13 +143,68 @@ moduleFor(
       runTask(() => controller.set('dynamicDisabledWhen', false));
 
       assert.equal(
+        this.$('#about-link-static > a.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.strictEqual(
         this.$('#about-link-dynamic > a.disabled').length,
         0,
         'The dynamic link is re-enabled when its disabledWhen becomes false'
       );
     }
 
-    async [`@test it doesn't apply a 'disabled' class if disabledWhen is not provided`](assert) {
+    async [`@test it applies a 'disabled' class when disabled`](assert) {
+      this.addTemplate(
+        'index',
+        `
+        <div id="about-link-static">{{#link-to route="about" disabled="truthy"}}About{{/link-to}}</div>
+        <div id="about-link-dynamic">{{#link-to route="about" disabled=this.dynamicDisabled}}About{{/link-to}}</div>
+        `
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicDisabled = true;
+        }
+      );
+
+      await this.visit('/');
+
+      assert.equal(
+        this.$('#about-link-static > a.disabled').length,
+        1,
+        'The static link is disabled when its disabled is true'
+      );
+      assert.equal(
+        this.$('#about-link-dynamic > a.disabled').length,
+        1,
+        'The dynamic link is disabled when its disabled is true'
+      );
+
+      runTask(() => controller.set('dynamicDisabled', false));
+
+      assert.equal(
+        this.$('#about-link-static > a.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic > a.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabled becomes false'
+      );
+    }
+
+    async [`@test it doesn't apply a 'disabled' class when not disabled`](assert) {
       this.addTemplate(
         'index',
         `<div id="about-link">{{#link-to route="about"}}About{{/link-to}}</div>`
@@ -160,34 +214,96 @@ moduleFor(
 
       assert.ok(
         !this.$('#about-link > a').hasClass('disabled'),
-        'The link is not disabled if disabledWhen not provided'
+        'The link is not disabled if disabled was not provided'
       );
     }
 
     async [`@test it supports a custom disabledClass`](assert) {
       this.addTemplate(
         'index',
-        `<div id="about-link">{{#link-to route="about" disabledWhen=true disabledClass="do-not-want"}}About{{/link-to}}</div>`
+        `
+        <div id="about-link-static">{{#link-to route="about" disabledClass="do-not-want" disabled="truthy"}}About{{/link-to}}</div>
+        <div id="about-link-dynamic">{{#link-to route="about" disabledClass="do-not-want" disabled=this.dynamicDisabled}}About{{/link-to}}</div>
+        `
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicDisabled = true;
+        }
       );
 
       await this.visit('/');
 
       assert.equal(
-        this.$('#about-link > a.do-not-want').length,
+        this.$('#about-link-static > a.do-not-want').length,
+        1,
+        'The static link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic > a.do-not-want').length,
+        1,
+        'The dynamic link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-static > a.disabled').length,
+        0,
+        'The default disabled class is not added on the static link'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic > a.disabled').length,
+        0,
+        'The default disabled class is not added on the dynamic link'
+      );
+
+      runTask(() => controller.set('dynamicDisabled', false));
+
+      assert.equal(
+        this.$('#about-link-static > a.do-not-want').length,
         1,
-        'The link can apply a custom disabled class'
+        'The static link is disabled when its disabled is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic > a.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabled becomes false'
+      );
+      assert.strictEqual(
+        this.$('#about-link-static > a.disabled').length,
+        0,
+        'The default disabled class is not added on the static link'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic > a.disabled').length,
+        0,
+        'The default disabled class is not added on the dynamic link'
       );
     }
 
     async [`@test it supports a custom disabledClass set via bound param`](assert) {
       this.addTemplate(
         'index',
-        `<div id="about-link">{{#link-to route="about" disabledWhen=true disabledClass=this.disabledClass}}About{{/link-to}}</div>`
+        `<div id="about-link">{{#link-to route="about" disabledClass=this.disabledClass disabled=true}}About{{/link-to}}</div>`
       );
 
+      let controller;
+
       this.add(
         'controller:index',
         class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
           disabledClass = 'do-not-want';
         }
       );
@@ -199,6 +315,29 @@ moduleFor(
         1,
         'The link can apply a custom disabled class via bound param'
       );
+      assert.strictEqual(
+        this.$('#about-link > a.disabled').length,
+        0,
+        'The default disabled class is not added'
+      );
+
+      runTask(() => controller.set('disabledClass', 'can-not-use'));
+
+      assert.equal(
+        this.$('#about-link > a.can-not-use').length,
+        1,
+        'The link can apply a custom disabled class via bound param'
+      );
+      assert.strictEqual(
+        this.$('#about-link > a.do-not-want').length,
+        0,
+        'The old class is removed'
+      );
+      assert.strictEqual(
+        this.$('#about-link > a.disabled').length,
+        0,
+        'The default disabled class is not added'
+      );
     }
 
     async [`@test it does not respond to clicks when disabledWhen`](assert) {
@@ -227,10 +366,10 @@ moduleFor(
       assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
 
-    async [`@test it responds to clicks according to its disabledWhen bound param`](assert) {
+    async [`@test it responds to clicks according to its disabled bound param`](assert) {
       this.addTemplate(
         'index',
-        `<div id="about-link">{{#link-to route="about" disabledWhen=this.disabledWhen}}About{{/link-to}}</div>`
+        `<div id="about-link">{{#link-to route="about" disabled=this.dynamicDisabled}}About{{/link-to}}</div>`
       );
 
       let controller;
@@ -243,7 +382,7 @@ moduleFor(
             controller = this;
           }
 
-          disabledWhen = true;
+          dynamicDisabled = true;
         }
       );
 
@@ -253,7 +392,7 @@ moduleFor(
 
       assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
 
-      runTask(() => controller.set('disabledWhen', false));
+      runTask(() => controller.set('dynamicDisabled', false));
 
       await this.click('#about-link > a');
 
@@ -287,6 +426,16 @@ moduleFor(
         1,
         'The other link was rendered without active class'
       );
+      assert.strictEqual(
+        this.$('#self-link > a.active').length,
+        0,
+        'The self-link was rendered without the default active class'
+      );
+      assert.strictEqual(
+        this.$('#about-link > a.active').length,
+        0,
+        'The other link was rendered without the default active class'
+      );
     }
 
     async [`@test it supports a custom activeClass from a bound param`](assert) {
@@ -299,9 +448,16 @@ moduleFor(
         `
       );
 
+      let controller;
+
       this.add(
         'controller:index',
         class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
           activeClass = 'zomg-active';
         }
       );
@@ -319,6 +475,44 @@ moduleFor(
         1,
         'The other link was rendered without active class'
       );
+      assert.strictEqual(
+        this.$('#self-link > a.active').length,
+        0,
+        'The self-link was rendered without the default active class'
+      );
+      assert.strictEqual(
+        this.$('#about-link > a.active').length,
+        0,
+        'The other link was rendered without the default active class'
+      );
+
+      runTask(() => controller.set('activeClass', 'wow-active'));
+
+      assert.equal(
+        this.$('#self-link > a.wow-active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.wow-active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+      assert.strictEqual(
+        this.$('#self-link > a.zomg-active').length,
+        0,
+        'The self-link was rendered without the previous active class'
+      );
+      assert.strictEqual(
+        this.$('#self-link > a.active').length,
+        0,
+        'The self-link was rendered without the default active class'
+      );
+      assert.strictEqual(
+        this.$('#about-link > a.active').length,
+        0,
+        'The other link was rendered without the default active class'
+      );
     }
 
     async [`@test [DEPRECATED] it supports 'classNameBindings' with custom values [GH #11699]`](
@@ -699,8 +893,13 @@ moduleFor(
 
       await this.click('#about-link > a');
 
-      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-      assert.equal(
+      assert.strictEqual(
+        this.updateCount,
+        this.updateCountAfterVisit,
+        'setURL should not be called'
+      );
+
+      assert.strictEqual(
         this.replaceCount,
         this.replaceCountAfterVisit + 1,
         'replaceURL should be called once'
@@ -727,8 +926,13 @@ moduleFor(
 
       await this.click('#about-link > a');
 
-      assert.equal(this.updateCount, this.updateCountAfterVisit, 'setURL should not be called');
-      assert.equal(
+      assert.strictEqual(
+        this.updateCount,
+        this.updateCountAfterVisit,
+        'setURL should not be called'
+      );
+
+      assert.strictEqual(
         this.replaceCount,
         this.replaceCountAfterVisit + 1,
         'replaceURL should be called once'
@@ -755,8 +959,13 @@ moduleFor(
 
       await this.click('#about-link > a');
 
-      assert.equal(this.updateCount, this.updateCountAfterVisit + 1, 'setURL should be called');
-      assert.equal(
+      assert.strictEqual(
+        this.updateCount,
+        this.updateCountAfterVisit + 1,
+        'setURL should be called'
+      );
+
+      assert.strictEqual(
         this.replaceCount,
         this.replaceCountAfterVisit,
         'replaceURL should not be called'
@@ -1270,15 +1479,18 @@ moduleFor(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='index' id='self-link' title='title-attr' rel='rel-attr' tabindex='-1'}}
-          Self
-        {{/link-to}}
+        <div id='self-link'>
+          {{#link-to route='index' title='title-attr' rel='rel-attr' tabindex='-1'}}
+            Self
+          {{/link-to}}
+        </div>
         `
       );
 
       await this.visit('/');
 
-      let link = this.$('#self-link');
+      let link = this.$('#self-link > a');
+
       assert.equal(link.attr('title'), 'title-attr', 'The self-link contains title attribute');
       assert.equal(link.attr('rel'), 'rel-attr', 'The self-link contains rel attribute');
       assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
@@ -1308,9 +1520,16 @@ moduleFor(
         `
       );
 
+      let controller = this;
+
       this.add(
         'controller:index',
         class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
           boundLinkTarget = '_blank';
         }
       );
@@ -1319,6 +1538,10 @@ moduleFor(
 
       let link = this.$('#self-link > a');
       assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
+
+      runTask(() => controller.set('boundLinkTarget', '_self'));
+
+      assert.equal(link.attr('target'), '_self', 'The self-link contains `target` attribute');
     }
 
     async [`@test it calls preventDefault`](assert) {
@@ -1353,7 +1576,7 @@ moduleFor(
       assertNav({ prevented: false }, () => this.$('#about-link > a').trigger('click'), assert);
     }
 
-    async [`@test it does not call preventDefault if 'preventDefault=this.boundFalseyThing' is passed as an option`](
+    async [`@test it does not call preventDefault if 'preventDefault=this.boundThing' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1362,49 +1585,60 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `<div id='about-link'>{{#link-to route='about' preventDefault=this.boundFalseyThing}}About{{/link-to}}</div>`
+        `<div id='about-link'>{{#link-to route='about' preventDefault=this.boundThing}}About{{/link-to}}</div>`
       );
 
+      let controller;
+
       this.add(
         'controller:index',
         class extends Controller {
-          boundFalseyThing = false;
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          boundThing = false;
         }
       );
 
       await this.visit('/');
 
       assertNav({ prevented: false }, () => this.$('#about-link > a').trigger('click'), assert);
+
+      runTask(() => controller.set('boundThing', true));
+
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#about-link > a').trigger('click'), assert);
     }
 
-    [`@test The {{link-to}} component does not call preventDefault if 'target' attribute is provided`](
-      assert
-    ) {
+    async [`@test it does not call preventDefault if 'target' attribute is provided`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='index' id='self-link' target='_blank'}}Self{{/link-to}}
+        <div id='self-link'>{{#link-to route='index' target='_blank'}}Self{{/link-to}}</div>
         `
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: false }, () => this.$('#self-link').click(), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: false }, () => this.$('#self-link > a').click(), assert);
     }
 
-    [`@test The {{link-to}} component should preventDefault when 'target = _self'`](assert) {
+    async [`@test it should preventDefault when 'target = _self'`](assert) {
       this.addTemplate(
         'index',
         `
         <h3 class="home">Home</h3>
-        {{#link-to route='index' id='self-link' target='_self'}}Self{{/link-to}}
+        <div id='self-link'>{{#link-to route='index' target='_self'}}Self{{/link-to}}</div>
         `
       );
 
-      return this.visit('/').then(() => {
-        assertNav({ prevented: true }, () => this.$('#self-link').click(), assert);
-      });
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#self-link > a').click(), assert);
     }
 
     async [`@test it should not transition if target is not equal to _self or empty`](assert) {
@@ -1908,8 +2142,8 @@ moduleFor(
         this.addTemplate(
           'index',
           `
-          {{link-to 'string' 'index' id='string-link'}}
-          {{link-to this.path this.foo id='path-link'}}
+          <div id='string-link'>{{link-to 'string' 'index'}}</div>
+          <div id='path-link'>{{link-to this.path this.foo}}</div>
           `
         );
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
@@ -1931,8 +2165,8 @@ moduleFor(
       await this.visit('/');
 
       let assertEquality = (href) => {
-        assert.equal(normalizeUrl(this.$('#string-link').attr('href')), '/');
-        assert.equal(normalizeUrl(this.$('#path-link').attr('href')), href);
+        assert.equal(normalizeUrl(this.$('#string-link > a').attr('href')), '/');
+        assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), href);
       };
 
       assertEquality('/');
@@ -1944,7 +2178,7 @@ moduleFor(
 
     async [`@test [DEPRECATED] The non-block form {{link-to}} protects against XSS`](assert) {
       expectDeprecation(() => {
-        this.addTemplate('application', `{{link-to this.display 'index' id='link'}}`);
+        this.addTemplate('application', `<div id='link'>{{link-to this.display 'index'}}</div>`);
       }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
 
       let controller;
@@ -1963,11 +2197,11 @@ moduleFor(
 
       await this.visit('/');
 
-      assert.equal(this.$('#link').text(), 'blahzorz');
+      assert.equal(this.$('#link > a').text(), 'blahzorz');
 
       runTask(() => controller.set('display', '<b>BLAMMO</b>'));
 
-      assert.equal(this.$('#link').text(), '<b>BLAMMO</b>');
+      assert.equal(this.$('#link > a').text(), '<b>BLAMMO</b>');
       assert.strictEqual(this.$('b').length, 0);
     }
 

From a591c00a9137dd118c8d3e3c1ba4e6a6fb4629a7 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 25 Feb 2021 02:37:52 -0800
Subject: [PATCH 0385/1405] [INTERNAL] Refactor some query params test

Mainly to avoid using the soon-to-be-deprecated `@id` argument.
---
 .../ember/tests/routing/query_params_test.js  | 108 ++++++++++--------
 ..._dependent_state_with_query_params_test.js |  34 +++++-
 .../query_param_async_get_handler_test.js     |   2 +-
 3 files changed, 88 insertions(+), 56 deletions(-)

diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 342d4141d6f..dc9b423cd2f 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -966,13 +966,13 @@ moduleFor(
       await this.setAndFlush(appController, 'alex', 'sriracha');
     }
 
-    ['@test can opt into full transition by setting refreshModel in route queryParams when transitioning from child to parent'](
+    async ['@test can opt into full transition by setting refreshModel in route queryParams when transitioning from child to parent'](
       assert
     ) {
       this.addTemplate('parent', '{{outlet}}');
       this.addTemplate(
         'parent.child',
-        "{{#link-to route='parent' query=(hash foo='change') id='parent-link'}}Parent{{/link-to}}"
+        "<LinkTo @route='parent' @query={{hash foo='change'}} id='parent-link'>Parent</LinkTo>"
       );
 
       this.router.map(function () {
@@ -984,26 +984,26 @@ moduleFor(
       let parentModelCount = 0;
       this.add(
         'route:parent',
-        Route.extend({
+        class extends Route {
           model() {
             parentModelCount++;
-          },
-          queryParams: {
+          }
+          queryParams = {
             foo: {
               refreshModel: true,
             },
-          },
-        })
+          };
+        }
       );
 
       this.setSingleQPController('parent', 'foo', 'abc');
 
-      return this.visit('/parent/child?foo=lol').then(() => {
-        assert.equal(parentModelCount, 1);
+      await this.visit('/parent/child?foo=lol');
 
-        run(document.getElementById('parent-link'), 'click');
-        assert.equal(parentModelCount, 2);
-      });
+      assert.equal(parentModelCount, 1);
+
+      run(document.getElementById('parent-link'), 'click');
+      assert.equal(parentModelCount, 2);
     }
 
     async ["@test Use Ember.get to retrieve query params 'replace' configuration"](assert) {
@@ -1105,9 +1105,7 @@ moduleFor(
       });
     }
 
-    ['@test Subresource naming style is supported'](assert) {
-      assert.expect(5);
-
+    async ['@test Subresource naming style is supported'](assert) {
       this.router.map(function () {
         this.route('abc.def', { path: '/abcdef' }, function () {
           this.route('zoo');
@@ -1116,22 +1114,26 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#link-to route='abc.def' query=(hash foo='123') id='one'}}A{{/link-to}}{{#link-to route='abc.def.zoo' query=(hash foo='123' bar='456') id='two'}}B{{/link-to}}{{outlet}}"
+        `
+        <LinkTo @route='abc.def' @query={{hash foo='123'}} id='one'>A</LinkTo>
+        <LinkTo @route='abc.def.zoo' @query={{hash foo='123' bar='456'}} id='two'>B</LinkTo>
+        {{outlet}}
+        `
       );
 
       this.setSingleQPController('abc.def', 'foo', 'lol');
       this.setSingleQPController('abc.def.zoo', 'bar', 'haha');
 
-      return this.visitAndAssert('/').then(() => {
-        assert.equal(this.$('#one').attr('href'), '/abcdef?foo=123');
-        assert.equal(this.$('#two').attr('href'), '/abcdef/zoo?bar=456&foo=123');
+      await this.visitAndAssert('/');
 
-        run(this.$('#one'), 'click');
-        this.assertCurrentPath('/abcdef?foo=123');
+      assert.equal(this.$('#one').attr('href'), '/abcdef?foo=123');
+      assert.equal(this.$('#two').attr('href'), '/abcdef/zoo?bar=456&foo=123');
 
-        run(this.$('#two'), 'click');
-        this.assertCurrentPath('/abcdef/zoo?bar=456&foo=123');
-      });
+      run(this.$('#one'), 'click');
+      this.assertCurrentPath('/abcdef?foo=123');
+
+      run(this.$('#two'), 'click');
+      this.assertCurrentPath('/abcdef/zoo?bar=456&foo=123');
     }
 
     async ['@test transitionTo supports query params']() {
@@ -1499,12 +1501,15 @@ moduleFor(
       return this.visitAndAssert('/');
     }
 
-    async ['@test opting into replace does not affect transitions between routes'](assert) {
-      assert.expect(5);
-
+    async ['@test opting into replace does not affect transitions between routes']() {
       this.addTemplate(
         'application',
-        "{{#link-to route='foo' id='foo-link'}}Foo{{/link-to}}{{#link-to route='bar' id='bar-no-qp-link'}}Bar{{/link-to}}{{#link-to route='bar' query=(hash raytiley='isthebest') id='bar-link'}}Bar{{/link-to}}{{outlet}}"
+        `
+        <LinkTo @route='foo' id='foo-link'>Foo</LinkTo>
+        <LinkTo @route='bar' id='bar-no-qp-link'>Bar</LinkTo>
+        <LinkTo @route='bar' @query={{hash raytiley='isthebest'}} id='bar-link'>Bar</LinkTo>
+        {{outlet}}
+        `
       );
 
       this.router.map(function () {
@@ -1516,13 +1521,13 @@ moduleFor(
 
       this.add(
         'route:bar',
-        Route.extend({
-          queryParams: {
+        class extends Route {
+          queryParams = {
             raytiley: {
               replace: true,
             },
-          },
-        })
+          };
+        }
       );
 
       await this.visit('/');
@@ -1544,44 +1549,47 @@ moduleFor(
       run(document.getElementById('bar-link'), 'click');
     }
 
-    ["@test undefined isn't serialized or deserialized into a string"](assert) {
-      assert.expect(4);
-
+    async ["@test undefined isn't serialized or deserialized into a string"](assert) {
       this.router.map(function () {
         this.route('example');
       });
 
       this.addTemplate(
         'application',
-        "{{#link-to route='example' query=(hash foo=undefined) id='the-link'}}Example{{/link-to}}"
+        "<LinkTo @route='example' @query={{hash foo=undefined}} id='the-link'>Example</LinkTo>"
       );
 
       this.setSingleQPController('example', 'foo', undefined, {
         foo: undefined,
       });
 
+      let entered = 0;
+
       this.add(
         'route:example',
-        Route.extend({
+        class extends Route {
           model(params) {
+            entered++;
             assert.deepEqual(params, { foo: undefined });
-          },
-        })
+          }
+        }
       );
 
-      return this.visitAndAssert('/').then(() => {
-        assert.equal(
-          this.$('#the-link').attr('href'),
-          '/example',
-          'renders without undefined qp serialized'
-        );
+      await this.visitAndAssert('/');
 
-        return this.transitionTo('example', {
-          queryParams: { foo: undefined },
-        }).then(() => {
-          this.assertCurrentPath('/example');
-        });
+      assert.equal(
+        this.$('#the-link').attr('href'),
+        '/example',
+        'renders without undefined qp serialized'
+      );
+
+      await this.transitionTo('example', {
+        queryParams: { foo: undefined },
       });
+
+      assert.equal(entered, 1, 'Should have entered example route');
+
+      this.assertCurrentPath('/example');
     }
 
     ['@test when refreshModel is true and loading hook is undefined, model hook will rerun when QPs change even if previous did not finish']() {
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index 590a86de02c..ad99d04f6fa 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -104,7 +104,11 @@ class ModelDependentQPTestCase extends QueryParamTestCase {
 
     this.addTemplate(
       'application',
-      `{{#each articles as |a|}} {{#link-to route='${articleLookup}' model=a.id id=a.id}}Article{{/link-to}} {{/each}}`
+      `
+      {{#each articles as |a|}}
+        <LinkTo @route='${articleLookup}' @model={{a.id}} id={{a.id}}>Article</LinkTo>
+      {{/each}}
+      `
     );
 
     await this.boot();
@@ -246,7 +250,10 @@ class ModelDependentQPTestCase extends QueryParamTestCase {
 
     this.addTemplate(
       'about',
-      `{{#link-to route='${commentsLookup}' model='a-1' id='one'}}A{{/link-to}} {{#link-to route='${commentsLookup}' model='a-2' id='two'}}B{{/link-to}}`
+      `
+      <LinkTo @route='${commentsLookup}' @model='a-1' id='one'>A</LinkTo>
+      <LinkTo @route='${commentsLookup}' @model='a-2' id='two'>B</LinkTo>
+      `
     );
 
     await this.visitApplication();
@@ -334,7 +341,12 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each this.articles as |a|}} 1{{#link-to route='article' model=a id=a.id}}Article{{/link-to}} {{/each}} {{outlet}}"
+        `
+        {{#each this.articles as |a|}}
+          <LinkTo @route='article' @model={{a}} id={{a.id}}>Article</LinkTo>
+        {{/each}}
+        {{outlet}}
+        `
       );
     }
 
@@ -440,7 +452,12 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each this.articles as |a|}} {{#link-to route='site.article' model=a id=a.id}}Article{{/link-to}} {{/each}} {{outlet}}"
+        `
+        {{#each this.articles as |a|}}
+          <LinkTo @route='site.article' @model={{a}} id={{a.id}}>Article</LinkTo>
+        {{/each}}
+        {{outlet}}
+        `
       );
     }
 
@@ -591,7 +608,14 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#each this.allSitesAllArticles as |a|}} {{#link-to route='site.article' models=(array a.site_id a.article_id) id=a.id}}Article [{{a.site_id}}] [{{a.article_id}}]{{/link-to}} {{/each}} {{outlet}}"
+        `
+        {{#each this.allSitesAllArticles as |a|}}
+          <LinkTo @route='site.article' @models={{array a.site_id a.article_id}} id={{a.id}}>
+            Article [{{a.site_id}}] [{{a.article_id}}]
+          </LinkTo>
+        {{/each}}
+        {{outlet}}
+        `
       );
     }
 
diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index 71fb2e84a6f..afa1058f619 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -296,7 +296,7 @@ moduleFor(
 
       this.addTemplate(
         'application',
-        "{{#link-to route='example' query=(hash foo=undefined) id='the-link'}}Example{{/link-to}}"
+        "<LinkTo @route='example' @query={{hash foo=undefined}} id='the-link'>Example</LinkTo>"
       );
 
       this.setSingleQPController('example', 'foo', undefined, {

From 87212305899d1bcb8ed62601fd5ea2c0f843829e Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 4 Feb 2021 23:39:58 -0800
Subject: [PATCH 0386/1405] [FEATURE modernized-built-in-components] Get events
 from dispatcher
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of hard-coding a list of events to bind (copied from the
`EventDispatcher` – which could be reopened and modified), this
refactor uses a modifier to dynamically read the list from the
`EventDispatcher` at runtime instead.

Part of #19270
---
 .../glimmer/lib/components/input.ts           | 390 +++++++++---------
 .../glimmer/lib/templates/input.hbs           |  26 +-
 2 files changed, 207 insertions(+), 209 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index f12a777d083..50b1328d62f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -3,20 +3,23 @@
 */
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { tracked } from '@ember/-internals/metal';
+import { Owner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { jQuery, jQueryDisabled } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate, warn } from '@ember/debug';
-import {
-  JQUERY_INTEGRATION,
-  MOUSE_ENTER_LEAVE_MOVE_EVENTS,
-  SEND_ACTION,
-} from '@ember/deprecated-features';
+import { JQUERY_INTEGRATION, SEND_ACTION } from '@ember/deprecated-features';
 import { action } from '@ember/object';
-import { setComponentTemplate, setInternalComponentManager } from '@glimmer/manager';
+import { Maybe, Option } from '@glimmer/interfaces';
+import {
+  setComponentTemplate,
+  setInternalComponentManager,
+  setInternalModifierManager,
+} from '@glimmer/manager';
 import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
 import { untrack } from '@glimmer/validator';
 import InternalManager from '../component-managers/internal';
+import InternalModifier, { InternalModifierManager } from '../modifiers/internal';
 import InputTemplate from '../templates/input';
 import InternalComponent from './internal';
 
@@ -52,10 +55,30 @@ if (hasDOM && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   isValidInputType = (type: string) => type !== '';
 }
 
+type EventListener = (event: Event) => void;
+type VirtualEventListener = (value: string, event: Event) => void;
+
 function NOOP() {}
 
 const UNINITIALIZED: unknown = Object.freeze({});
 
+function elementForEvent(event: Event): HTMLInputElement {
+  assert(
+    '[BUG] Event target must be the <input> element',
+    event.target instanceof HTMLInputElement
+  );
+
+  return event.target;
+}
+
+function valueForEvent(event: Event): string {
+  return elementForEvent(event).value;
+}
+
+function devirtualize(callback: VirtualEventListener): EventListener {
+  return (event: Event) => callback(valueForEvent(event), event);
+}
+
 /**
  * This interface paves over the differences between these three cases:
  *
@@ -386,11 +409,11 @@ class Input extends InternalComponent {
   }
 
   @action checkedDidChange(event: Event): void {
-    this.checked = this.elementFor(event).checked;
+    this.checked = elementForEvent(event).checked;
   }
 
   @action valueDidChange(event: Event): void {
-    this.value = this.valueFor(event);
+    this.value = valueForEvent(event);
   }
 
   @action change(event: Event): void {
@@ -408,34 +431,19 @@ class Input extends InternalComponent {
   }
 
   @action keyUp(event: KeyboardEvent): void {
-    let value = this.valueFor(event);
-
     switch (event.key) {
       case 'Enter':
-        this.callbackFor('enter')(value, event);
-        this.callbackFor('insert-newline')(value, event);
+        this.callbackFor('enter')(event);
+        this.callbackFor('insert-newline')(event);
         break;
 
       case 'Escape':
-        this.callbackFor('escape-press')(value, event);
+        this.callbackFor('escape-press')(event);
         break;
     }
   }
 
-  private elementFor(event: Event): HTMLInputElement {
-    assert(
-      '[BUG] Event target must be the <input> element',
-      event.target instanceof HTMLInputElement
-    );
-
-    return event.target;
-  }
-
-  private valueFor(event: Event): string {
-    return this.elementFor(event).value;
-  }
-
-  private callbackFor(type: string): (value: string, event: Event) => void {
+  private callbackFor(type: string, shouldDevirtualize = true): EventListener {
     let callback = this.arg(type);
 
     if (callback) {
@@ -443,7 +451,12 @@ class Input extends InternalComponent {
         `The \`@${type}\` argument to the <Input> component must be a function`,
         typeof callback === 'function'
       );
-      return callback as (value: string, event: Event) => void;
+
+      if (shouldDevirtualize) {
+        return devirtualize(callback as VirtualEventListener);
+      } else {
+        return callback as EventListener;
+      }
     } else {
       return NOOP;
     }
@@ -570,161 +583,145 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     });
   }
 
-  // Event callbacks
-  {
-    let defineGetterForDeprecatedEventCallback = (
-      eventName: string,
-      methodName: string = eventName,
-      virtualEvent?: string
-    ): void => {
+  type EventsMap = Record<string, string>;
+
+  const EVENTS = new WeakMap<object, EventsMap>();
+
+  const getEventsMap = (owner: Owner): EventsMap => {
+    let events = EVENTS.get(owner);
+
+    if (events === undefined) {
+      let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
+        'event_dispatcher:main'
+      );
+
       assert(
-        `[BUG] There is already a getter for _${methodName} on Input`,
-        !Object.getOwnPropertyDescriptor(Input.prototype, `_${methodName}`)
+        'missing event dispatcher',
+        eventDispatcher !== null && typeof eventDispatcher === 'object'
       );
 
-      let descriptor = Object.getOwnPropertyDescriptor(Input.prototype, methodName);
+      assert(
+        'missing _finalEvents on event dispatcher',
+        '_finalEvents' in eventDispatcher &&
+          eventDispatcher?._finalEvents !== null &&
+          typeof eventDispatcher?._finalEvents === 'object'
+      );
 
-      Object.defineProperty(Input.prototype, `_${methodName}`, {
-        get(this: Input): unknown {
-          return (event: Event): void => {
-            let value = this['valueFor'].call(this, event);
-
-            if (methodName in this.args) {
-              deprecate(
-                `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
-                  `This would have overwritten the internal \`${methodName}\` method on ` +
-                  `the <Input> component and prevented it from functioning properly. ` +
-                  `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
-                  `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
-                true /* TODO !descriptor */,
-                {
-                  id: 'ember.built-in-components.legacy-attribute-arguments',
-                  for: 'ember-source',
-                  since: {},
-                  until: '4.0.0',
-                }
-              );
-
-              deprecate(
-                `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
-                  `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
-                  `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
-                true /* TODO descriptor */,
-                {
-                  id: 'ember.built-in-components.legacy-attribute-arguments',
-                  for: 'ember-source',
-                  since: {},
-                  until: '4.0.0',
-                }
-              );
-
-              let callback = this['callbackFor'].call(this, methodName);
-              callback(value, event);
-            } else if (virtualEvent && virtualEvent in this.args) {
-              deprecate(
-                `Passing the \`@${virtualEvent}\` argument to <Input> is deprecated. ` +
-                  `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
-                  `instead of \`<Input @${virtualEvent}={{...}} />\` or \`{{input ${virtualEvent}=...}}\`.`,
-                true /* TODO false */,
-                {
-                  id: 'ember.built-in-components.legacy-attribute-arguments',
-                  for: 'ember-source',
-                  since: {},
-                  until: '4.0.0',
-                }
-              );
-
-              this['callbackFor'].call(this, virtualEvent)(value, event);
-            }
-          };
-        },
-      });
+      EVENTS.set(owner, (events = eventDispatcher._finalEvents));
+    }
 
-      if (descriptor) {
-        const superGetter = descriptor.get;
+    return events;
+  };
 
-        assert(
-          `[BUG] Expecting ${methodName} on Input to be a getter`,
-          typeof superGetter === 'function'
-        );
+  class DeprecatedInputEventHandlersModifier extends InternalModifier {
+    static toString(): string {
+      return '@ember/component/input/deprecated-events-handler';
+    }
 
-        Object.defineProperty(Input.prototype, methodName, {
-          get(this: Input): unknown {
-            if (methodName in this.args) {
-              return this[`_${methodName}`];
-            } else if (virtualEvent && virtualEvent in this.args) {
-              let superCallback = superGetter.call(this);
-              let virtualCallback = this[`_${methodName}`];
-
-              return (event: Event) => {
-                superCallback(event);
-                virtualCallback(event);
-              };
-            } else {
-              return superGetter.call(this);
-            }
-          },
-        });
+    private listeners = new Map<string, EventListener>();
+
+    install(): void {
+      let { element, eventsMap, input, listenerFor, listeners } = this;
+
+      let entries: [eventName: string, methodName: string, isVirtualEvent?: boolean][] = [
+        ...Object.entries(eventsMap),
+        ['focusin', 'focus-in', true],
+        ['focusout', 'focus-out', true],
+        ['keypress', 'key-press', true],
+        ['keyup', 'key-up', true],
+        ['keydown', 'key-down', true],
+      ];
+
+      for (let [eventName, methodName, isVirtualEvent] of entries) {
+        let listener = listenerFor.call(input, eventName, methodName, isVirtualEvent);
+
+        if (listener) {
+          listeners.set(eventName, listener);
+          element.addEventListener(eventName, listener);
+        }
       }
-    };
 
-    let deprecatedEventCallbacks: Array<
-      string | Parameters<typeof defineGetterForDeprecatedEventCallback>
-    > = [
-      // EventDispatcher
-      ['touchstart', 'touchStart'],
-      ['touchmove', 'touchMove'],
-      ['touchend', 'touchEnd'],
-      ['touchcancel', 'touchCancel'],
-      ['keydown', 'keyDown', 'key-down'],
-      ['keyup', 'keyUp', 'key-up'],
-      ['keypress', 'keyPress', 'key-press'],
-      ['mousedown', 'mouseDown'],
-      ['mouseup', 'mouseUp'],
-      ['contextmenu', 'contextMenu'],
-      'click',
-      ['dblclick', 'doubleClick'],
-      ['focusin', 'focusIn', 'focus-in'],
-      ['focusout', 'focusOut', 'focus-out'],
-      'submit',
-      'input',
-      'change',
-      ['dragstart', 'dragStart'],
-      'drag',
-      ['dragenter', 'dragEnter'],
-      ['dragleave', 'dragLeave'],
-      ['dragover', 'dragOver'],
-      'drop',
-      ['dragend', 'dragEnd'],
-    ];
+      Object.freeze(listeners);
+    }
 
-    if (MOUSE_ENTER_LEAVE_MOVE_EVENTS) {
-      deprecatedEventCallbacks.push(
-        ['mouseenter', 'mouseEnter'],
-        ['mouseleave', 'mouseLeave'],
-        ['mousemove', 'mouseMove']
-      );
-    } else {
-      Object.assign(Input.prototype, {
-        _mouseEnter: NOOP,
-        _mouseLeave: NOOP,
-        _mouseMove: NOOP,
-      });
+    remove(): void {
+      let { element, listeners } = this;
+
+      for (let [event, listener] of Object.entries(listeners)) {
+        element.removeEventListener(event, listener);
+      }
+
+      this.listeners = new Map();
     }
 
-    deprecatedEventCallbacks.forEach((args) => {
-      if (Array.isArray(args)) {
-        defineGetterForDeprecatedEventCallback(...args);
+    private get eventsMap(): EventsMap {
+      return getEventsMap(this.owner);
+    }
+
+    private get input(): Input {
+      let input = this.positional(0);
+      assert('must pass the <Input /> component as first argument', input instanceof Input);
+      return input;
+    }
+
+    private listenerFor(
+      this: Input,
+      eventName: string,
+      methodName: string,
+      isVirtualEvent = false
+    ): Option<EventListener> {
+      assert('must be called with the <Input /> component as this', this instanceof Input);
+
+      if (methodName in this.args) {
+        deprecate(
+          `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
+            `This would have overwritten the internal \`${methodName}\` method on ` +
+            `the <Input> component and prevented it from functioning properly. ` +
+            `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
+            `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
+          true, // !(methodName in this),
+          {
+            id: 'ember.built-in-components.legacy-attribute-arguments',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        deprecate(
+          `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
+            `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
+            `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
+          true, // methodName in this,
+          {
+            id: 'ember.built-in-components.legacy-attribute-arguments',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        return this['callbackFor'].call(this, methodName, isVirtualEvent);
       } else {
-        defineGetterForDeprecatedEventCallback(args);
+        return null;
       }
-    });
+    }
   }
 
+  setInternalModifierManager(
+    new InternalModifierManager(
+      DeprecatedInputEventHandlersModifier,
+      'deprecated-input-event-handlers'
+    ),
+    DeprecatedInputEventHandlersModifier
+  );
+
+  Input.prototype['DeprecatedInputEventHandlersModifier'] = DeprecatedInputEventHandlersModifier;
+
   // String actions
   if (SEND_ACTION) {
     interface View {
-      send(action: string, value: string, event: Event): void;
+      send(action: string, ...args: unknown[]): void;
     }
 
     let isView = (target: {}): target is View => {
@@ -734,36 +731,63 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     let superCallbackFor = Input.prototype['callbackFor'];
 
     Object.assign(Input.prototype, {
-      callbackFor(this: Input, type: string): (value: string, event: Event) => void {
+      callbackFor(this: Input, type: string, shouldDevirtualize = true): EventListener {
         const actionName = this.arg(type);
 
         if (typeof actionName === 'string') {
-          deprecate(
-            `Passing actions to components as strings (like \`<Input @${type}="${actionName}" />\`) is deprecated. ` +
-              `Please use closure actions instead (\`<Input @${type}={{action "${actionName}"}} />\`).`,
-            false,
-            {
-              id: 'ember-component.send-action',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-              url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
-            }
-          );
+          // TODO: eagerly issue a deprecation for this as well (need to fix tests)
+          //
+          // deprecate(
+          //   `Passing actions to components as strings (like \`<Input @${type}="${actionName}" />\`) is deprecated. ` +
+          //     `Please use closure actions instead (\`<Input @${type}={{action "${actionName}"}} />\`).`,
+          //   false,
+          //   {
+          //     id: 'ember-component.send-action',
+          //     for: 'ember-source',
+          //     since: {},
+          //     until: '4.0.0',
+          //     url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+          //   }
+          // );
 
           const { caller } = this;
 
           assert('[BUG] Missing caller', caller && typeof caller === 'object');
 
+          let callback: Function;
+
           if (isView(caller)) {
-            return (value: string, event: Event) => caller.send(actionName, value, event);
+            callback = (...args: unknown[]) => caller.send(actionName, ...args);
           } else {
             assert(
               `The action '${actionName}' did not exist on ${caller}`,
               typeof caller[actionName] === 'function'
             );
 
-            return caller[actionName];
+            callback = caller[actionName];
+          }
+
+          let deprecated = (...args: unknown[]) => {
+            deprecate(
+              `Passing actions to components as strings (like \`<Input @${type}="${actionName}" />\`) is deprecated. ` +
+                `Please use closure actions instead (\`<Input @${type}={{action "${actionName}"}} />\`).`,
+              false,
+              {
+                id: 'ember-component.send-action',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+                url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+              }
+            );
+
+            return callback(...args);
+          };
+
+          if (shouldDevirtualize) {
+            return devirtualize(deprecated as VirtualEventListener);
+          } else {
+            return deprecated as EventListener;
           }
         } else {
           return superCallbackFor.call(this, type);
@@ -777,13 +801,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     let superCallbackFor = Input.prototype['callbackFor'];
 
     Object.assign(Input.prototype, {
-      callbackFor(this: Input, type: string): (value: string, event: Event) => void {
-        let callback = superCallbackFor.call(this, type);
+      callbackFor(this: Input, type: string, shouldDevirtualize = true): EventListener {
+        let callback = superCallbackFor.call(this, type, shouldDevirtualize);
 
         if (jQuery && !jQueryDisabled) {
-          return (value: string, event: Event) => {
-            callback(value, new jQuery.Event(event));
-          };
+          return (event: Event) => callback(new jQuery.Event(event));
         } else {
           return callback;
         }
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index 348633c84b3..08e7ef864df 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -54,31 +54,7 @@
     {{on "paste" this.valueDidChange}}
     {{on "cut" this.valueDidChange}}
 
-    {{!-- deprecated native event callbacks --}}
-    {{on "touchstart" this._touchStart}}
-    {{on "touchmove" this._touchMove}}
-    {{on "touchend" this._touchEnd}}
-    {{on "touchcancel" this._touchCancel}}
-    {{on "keydown" this._keyDown}}
-    {{on "keypress" this._keyPress}}
-    {{on "mousedown" this._mouseDown}}
-    {{on "mouseup" this._mouseUp}}
-    {{on "contextmenu" this._contextMenu}}
-    {{on "click" this._click}}
-    {{on "dblclick" this._doubleClick}}
-    {{on "focusin" this._focusIn}}
-    {{on "focusout" this._focusOut}}
-    {{on "submit" this._submit}}
-    {{on "dragstart" this._dragStart}}
-    {{on "drag" this._drag}}
-    {{on "dragenter" this._dragEnter}}
-    {{on "dragleave" this._dragLeave}}
-    {{on "dragover" this._dragOver}}
-    {{on "drop" this._drop}}
-    {{on "dragend" this._dragEnd}}
-    {{on "mouseenter" this._mouseEnter}}
-    {{on "mouseleave" this._mouseLeave}}
-    {{on "mousemove" this._mouseMove}}
+    {{this.DeprecatedInputEventHandlersModifier this}}
   />
 {{~else~}}
   {{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}

From 8b7adf13609d6cb3df257fd929d740d2415dbdde Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 5 Feb 2021 02:15:32 -0800
Subject: [PATCH 0387/1405] [FEATURE modernized-built-in-components] Modernize
 <Textarea />

Switches the <Textarea /> component to use the new implementation
as well. Passes all existing tests.

Part of #19270
---
 packages/@ember/-internals/glimmer/index.ts   |   2 +-
 .../glimmer/lib/components/input.ts           | 275 ++++++++++++------
 .../-internals/glimmer/lib/setup-registry.ts  |  13 +-
 .../glimmer/lib/templates/input.hbs           |   2 +-
 .../glimmer/lib/templates/textarea.d.ts       |   3 +
 .../glimmer/lib/templates/textarea.hbs        |  48 +++
 .../application/debug-render-tree-test.ts     |  70 ++---
 .../components/textarea-angle-test.js         |  69 +++--
 .../components/textarea-curly-test.js         |  67 +++--
 9 files changed, 382 insertions(+), 167 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/templates/textarea.hbs

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 2003e0ec9cd..d756909be67 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -368,7 +368,7 @@ export { default as Checkbox } from './lib/components/checkbox';
 export { default as TextField } from './lib/components/text-field';
 export { default as TextArea } from './lib/components/textarea';
 export { default as LinkComponent } from './lib/components/link-to';
-export { default as Input } from './lib/components/input';
+export { default as Input, TextareaComponent as Textarea } from './lib/components/input';
 export { default as Component } from './lib/component';
 export { default as Helper, helper } from './lib/helper';
 export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 50b1328d62f..14e08b1138a 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -21,6 +21,7 @@ import { untrack } from '@glimmer/validator';
 import InternalManager from '../component-managers/internal';
 import InternalModifier, { InternalModifierManager } from '../modifiers/internal';
 import InputTemplate from '../templates/input';
+import TextareaTemplate from '../templates/textarea';
 import InternalComponent from './internal';
 
 let isValidInputType: (type: string) => boolean;
@@ -62,10 +63,10 @@ function NOOP() {}
 
 const UNINITIALIZED: unknown = Object.freeze({});
 
-function elementForEvent(event: Event): HTMLInputElement {
+function elementForEvent(event: Event): HTMLInputElement | HTMLTextAreaElement {
   assert(
-    '[BUG] Event target must be the <input> element',
-    event.target instanceof HTMLInputElement
+    '[BUG] Event target must be the <input> or <textarea> element',
+    event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement
   );
 
   return event.target;
@@ -307,7 +308,7 @@ class ForkedValue implements Value {
   @param {Hash} options
   @public
 */
-class Input extends InternalComponent {
+abstract class AbstractInput extends InternalComponent {
   modernized = Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS);
 
   /**
@@ -331,34 +332,18 @@ class Input extends InternalComponent {
   get class(): string {
     if (this.isCheckbox) {
       return 'ember-checkbox ember-view';
+    } else if (this.isTextarea) {
+      return 'ember-text-area ember-view';
     } else {
       return 'ember-text-field ember-view';
     }
   }
 
-  /**
-   * The HTML type attribute.
-   */
-  get type(): string {
-    let type = this.arg('type');
-
-    if (type === null || type === undefined) {
-      return 'text';
-    }
-
-    assert(
-      'The `@type` argument to the <Input> component must be a string',
-      typeof type === 'string'
-    );
+  abstract type: string;
+  abstract isCheckbox: boolean;
+  abstract isTextarea: boolean;
 
-    return isValidInputType(type) ? type : 'text';
-  }
-
-  get isCheckbox(): boolean {
-    return this.arg('type') === 'checkbox';
-  }
-
-  _checked = valueFrom(this.args.checked);
+  private _checked = valueFrom(this.args.checked);
 
   get checked(): unknown {
     if (this.isCheckbox) {
@@ -398,7 +383,7 @@ class Input extends InternalComponent {
     this._checked.set(checked);
   }
 
-  _value = valueFrom(this.args.value);
+  private _value = valueFrom(this.args.value);
 
   get value(): unknown {
     return this._value.get();
@@ -409,7 +394,9 @@ class Input extends InternalComponent {
   }
 
   @action checkedDidChange(event: Event): void {
-    this.checked = elementForEvent(event).checked;
+    let element = elementForEvent(event);
+    assert('[BUG] element must be an <input>', element instanceof HTMLInputElement);
+    this.checked = element.checked;
   }
 
   @action valueDidChange(event: Event): void {
@@ -448,7 +435,7 @@ class Input extends InternalComponent {
 
     if (callback) {
       assert(
-        `The \`@${type}\` argument to the <Input> component must be a function`,
+        `The \`@${type}\` argument to the <${this.constructor}> component must be a function`,
         typeof callback === 'function'
       );
 
@@ -463,25 +450,80 @@ class Input extends InternalComponent {
   }
 }
 
+class Input extends AbstractInput {
+  static toString(): string {
+    return 'Input';
+  }
+
+  /**
+   * The HTML type attribute.
+   */
+  get type(): string {
+    let type = this.arg('type');
+
+    if (type === null || type === undefined) {
+      return 'text';
+    }
+
+    assert(
+      'The `@type` argument to the <Input> component must be a string',
+      typeof type === 'string'
+    );
+
+    return isValidInputType(type) ? type : 'text';
+  }
+
+  get isCheckbox(): boolean {
+    return this.arg('type') === 'checkbox';
+  }
+
+  get isTextarea(): false {
+    return false;
+  }
+}
+
+class Textarea extends AbstractInput {
+  static toString(): string {
+    return 'Textarea';
+  }
+
+  get type(): never {
+    throw assert(`[BUG] type getter should never be called on <Textarea />`);
+  }
+
+  get isCheckbox(): false {
+    return false;
+  }
+
+  get isTextarea(): true {
+    return true;
+  }
+}
+
 // Deprecated features
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   // Attribute bindings
   {
     let defineGetterForDeprecatedAttributeBinding = (
+      component: typeof AbstractInput,
       attribute: string,
       argument = attribute
     ): void => {
+      let name = component.toString();
+      let curlyName = name.toLowerCase();
+      let { prototype } = component;
+
       assert(
-        `[BUG] There is already a getter for _${argument} on Input`,
-        !Object.getOwnPropertyDescriptor(Input.prototype, `_${argument}`)
+        `[BUG] There is already a getter for _${argument} on ${name}`,
+        !(`_${argument}` in prototype)
       );
 
-      Object.defineProperty(Input.prototype, `_${argument}`, {
-        get(this: Input): unknown {
+      Object.defineProperty(prototype, `_${argument}`, {
+        get(this: AbstractInput): unknown {
           deprecate(
-            `Passing the \`@${argument}\` argument to <Input> is deprecated. ` +
-              `Instead, please pass the attribute directly, i.e. \`<Input ${attribute}={{...}} />\` ` +
-              `instead of \`<Input @${argument}={{...}} />\` or \`{{input ${argument}=...}}\`.`,
+            `Passing the \`@${argument}\` argument to <${name}> is deprecated. ` +
+              `Instead, please pass the attribute directly, i.e. \`<${name} ${attribute}={{...}} />\` ` +
+              `instead of \`<${name} @${argument}={{...}} />\` or \`{{${curlyName} ${argument}=...}}\`.`,
             !(argument in this.args),
             {
               id: 'ember.built-in-components.legacy-attribute-arguments',
@@ -495,15 +537,24 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         },
       });
 
-      let descriptor = Object.getOwnPropertyDescriptor(Input.prototype, argument);
+      let target = prototype;
+      let descriptor: PropertyDescriptor | undefined;
+
+      while (target && !(descriptor = Object.getOwnPropertyDescriptor(target, argument))) {
+        target = Object.getPrototypeOf(target);
+      }
 
       if (descriptor) {
         const superGetter = descriptor.get;
-        assert(`Expecting ${argument} to be a getter on Input`, typeof superGetter === 'function');
 
-        Object.defineProperty(Input.prototype, argument, {
+        assert(
+          `Expecting ${argument} to be a getter on <${name}>`,
+          typeof superGetter === 'function'
+        );
+
+        Object.defineProperty(prototype, argument, {
           ...descriptor,
-          get(this: Input): unknown {
+          get(this: AbstractInput): unknown {
             // The `class` attribute is concatenated/merged instead of clobbered
             if (attribute === 'class' && argument in this.args) {
               let arg = this[`_${argument}`];
@@ -523,9 +574,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       }
     };
 
-    let deprecatedAttributeBindings: Array<
-      string | Parameters<typeof defineGetterForDeprecatedAttributeBinding>
-    > = [
+    let deprecatedInputAttributeBindings: Array<string | [string, string]> = [
       // Component
       'id',
       'class',
@@ -574,11 +623,53 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       'indeterminate',
     ];
 
-    deprecatedAttributeBindings.forEach((args) => {
+    deprecatedInputAttributeBindings.forEach((args) => {
+      if (Array.isArray(args)) {
+        defineGetterForDeprecatedAttributeBinding(Input, ...args);
+      } else {
+        defineGetterForDeprecatedAttributeBinding(Input, args);
+      }
+    });
+
+    let deprecatedTextareaAttributeBindings: Array<string | [string, string]> = [
+      // Component
+      'id',
+      'class',
+      ['class', 'classNames'],
+
+      // TextSupport
+      'autocapitalize',
+      'autocorrect',
+      'autofocus',
+      'disabled',
+      'form',
+      'maxlength',
+      'minlength',
+      'placeholder',
+      'readonly',
+      'required',
+      'selectionDirection',
+      'spellcheck',
+      'tabindex',
+      'title',
+
+      // TextField
+      'rows',
+      'cols',
+      'name',
+      'selectionEnd',
+      'selectionStart',
+      'autocomplete',
+      'wrap',
+      'lang',
+      'dir',
+    ];
+
+    deprecatedTextareaAttributeBindings.forEach((args) => {
       if (Array.isArray(args)) {
-        defineGetterForDeprecatedAttributeBinding(...args);
+        defineGetterForDeprecatedAttributeBinding(Textarea, ...args);
       } else {
-        defineGetterForDeprecatedAttributeBinding(args);
+        defineGetterForDeprecatedAttributeBinding(Textarea, args);
       }
     });
   }
@@ -613,15 +704,15 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     return events;
   };
 
-  class DeprecatedInputEventHandlersModifier extends InternalModifier {
+  class DeprecatedEventHandlersModifier extends InternalModifier {
     static toString(): string {
-      return '@ember/component/input/deprecated-events-handler';
+      return 'DeprecatedEventHandlersModifier';
     }
 
     private listeners = new Map<string, EventListener>();
 
     install(): void {
-      let { element, eventsMap, input, listenerFor, listeners } = this;
+      let { element, eventsMap, component, listenerFor, listeners } = this;
 
       let entries: [eventName: string, methodName: string, isVirtualEvent?: boolean][] = [
         ...Object.entries(eventsMap),
@@ -633,7 +724,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       ];
 
       for (let [eventName, methodName, isVirtualEvent] of entries) {
-        let listener = listenerFor.call(input, eventName, methodName, isVirtualEvent);
+        let listener = listenerFor.call(component, eventName, methodName, isVirtualEvent);
 
         if (listener) {
           listeners.set(eventName, listener);
@@ -658,27 +749,38 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       return getEventsMap(this.owner);
     }
 
-    private get input(): Input {
-      let input = this.positional(0);
-      assert('must pass the <Input /> component as first argument', input instanceof Input);
-      return input;
+    private get component(): AbstractInput {
+      let component = this.positional(0);
+
+      assert(
+        'must pass the <Input /> or <Textarea /> component as first argument',
+        component instanceof AbstractInput
+      );
+
+      return component;
     }
 
     private listenerFor(
-      this: Input,
+      this: AbstractInput,
       eventName: string,
       methodName: string,
       isVirtualEvent = false
     ): Option<EventListener> {
-      assert('must be called with the <Input /> component as this', this instanceof Input);
+      assert(
+        'must be called with the <Input /> or <Textarea /> component as this',
+        this instanceof AbstractInput
+      );
+
+      let name = this.constructor.toString();
+      let curlyName = name.toLowerCase();
 
       if (methodName in this.args) {
         deprecate(
-          `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
+          `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
             `This would have overwritten the internal \`${methodName}\` method on ` +
-            `the <Input> component and prevented it from functioning properly. ` +
-            `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
-            `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
+            `the <${name}> component and prevented it from functioning properly. ` +
+            `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
+            `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
           true, // !(methodName in this),
           {
             id: 'ember.built-in-components.legacy-attribute-arguments',
@@ -689,9 +791,9 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         );
 
         deprecate(
-          `Passing the \`@${methodName}\` argument to <Input> is deprecated. ` +
-            `Instead, please use the {{on}} modifier, i.e. \`<Input {{on "${eventName}" ...}} />\` ` +
-            `instead of \`<Input @${methodName}={{...}} />\` or \`{{input ${methodName}=...}}\`.`,
+          `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
+            `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
+            `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
           true, // methodName in this,
           {
             id: 'ember.built-in-components.legacy-attribute-arguments',
@@ -709,14 +811,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   }
 
   setInternalModifierManager(
-    new InternalModifierManager(
-      DeprecatedInputEventHandlersModifier,
-      'deprecated-input-event-handlers'
-    ),
-    DeprecatedInputEventHandlersModifier
+    new InternalModifierManager(DeprecatedEventHandlersModifier, 'deprecated-event-handlers'),
+    DeprecatedEventHandlersModifier
   );
 
-  Input.prototype['DeprecatedInputEventHandlersModifier'] = DeprecatedInputEventHandlersModifier;
+  AbstractInput.prototype['DeprecatedEventHandlersModifier'] = DeprecatedEventHandlersModifier;
 
   // String actions
   if (SEND_ACTION) {
@@ -728,18 +827,18 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       return typeof (target as Partial<View>).send === 'function';
     };
 
-    let superCallbackFor = Input.prototype['callbackFor'];
+    let superCallbackFor = AbstractInput.prototype['callbackFor'];
 
-    Object.assign(Input.prototype, {
-      callbackFor(this: Input, type: string, shouldDevirtualize = true): EventListener {
+    Object.assign(AbstractInput.prototype, {
+      callbackFor(this: AbstractInput, type: string, shouldDevirtualize = true): EventListener {
         const actionName = this.arg(type);
 
         if (typeof actionName === 'string') {
           // TODO: eagerly issue a deprecation for this as well (need to fix tests)
           //
           // deprecate(
-          //   `Passing actions to components as strings (like \`<Input @${type}="${actionName}" />\`) is deprecated. ` +
-          //     `Please use closure actions instead (\`<Input @${type}={{action "${actionName}"}} />\`).`,
+          //   `Passing actions to components as strings (like \`<${this.constructor} @${type}="${actionName}" />\`) is deprecated. ` +
+          //     `Please use closure actions instead (\`<${this.constructor} @${type}={{action "${actionName}"}} />\`).`,
           //   false,
           //   {
           //     id: 'ember-component.send-action',
@@ -769,8 +868,8 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
 
           let deprecated = (...args: unknown[]) => {
             deprecate(
-              `Passing actions to components as strings (like \`<Input @${type}="${actionName}" />\`) is deprecated. ` +
-                `Please use closure actions instead (\`<Input @${type}={{action "${actionName}"}} />\`).`,
+              `Passing actions to components as strings (like \`<${this.constructor} @${type}="${actionName}" />\`) is deprecated. ` +
+                `Please use closure actions instead (\`<${this.constructor} @${type}={{action "${actionName}"}} />\`).`,
               false,
               {
                 id: 'ember-component.send-action',
@@ -798,10 +897,10 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
 
   // jQuery Events
   if (JQUERY_INTEGRATION) {
-    let superCallbackFor = Input.prototype['callbackFor'];
+    let superCallbackFor = AbstractInput.prototype['callbackFor'];
 
-    Object.assign(Input.prototype, {
-      callbackFor(this: Input, type: string, shouldDevirtualize = true): EventListener {
+    Object.assign(AbstractInput.prototype, {
+      callbackFor(this: AbstractInput, type: string, shouldDevirtualize = true): EventListener {
         let callback = superCallbackFor.call(this, type, shouldDevirtualize);
 
         if (jQuery && !jQueryDisabled) {
@@ -821,14 +920,22 @@ const InputComponent = {
     throw assert('Use constructor instead of create');
   },
 
-  toString(): string {
-    return '@ember/component/input';
-  },
+  toString: Input.toString,
 };
 
 setInternalComponentManager(new InternalManager(Input, 'input'), InputComponent);
 setComponentTemplate(InputTemplate, InputComponent);
 
-Input.toString = InputComponent.toString;
-
 export default InputComponent;
+
+export const TextareaComponent = {
+  // Factory interface
+  create(): never {
+    throw assert('Use constructor instead of create');
+  },
+
+  toString: Textarea.toString,
+};
+
+setInternalComponentManager(new InternalManager(Textarea, 'textarea'), TextareaComponent);
+setComponentTemplate(TextareaTemplate, TextareaComponent);
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 4b922158d2c..f4bed62a3b0 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -1,8 +1,9 @@
 import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Component from './component';
 import Checkbox from './components/checkbox';
-import InputComponent from './components/input';
+import InputComponent, { TextareaComponent } from './components/input';
 import LinkToComponent from './components/link-to';
 import TextField from './components/text-field';
 import TextArea from './components/textarea';
@@ -56,11 +57,15 @@ export function setupEngineRegistry(registry: Registry): void {
 
   registry.register('component:-text-field', TextField);
   registry.register('component:-checkbox', Checkbox);
-  registry.register('component:link-to', LinkToComponent);
-
   registry.register('component:input', InputComponent);
+  registry.register('component:link-to', LinkToComponent);
 
-  registry.register('component:textarea', TextArea);
+  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+    registry.register('component:-textarea', TextArea);
+    registry.register('component:textarea', TextareaComponent);
+  } else {
+    registry.register('component:textarea', TextArea);
+  }
 
   if (!ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
     registry.register(P`component:-default`, Component);
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index 08e7ef864df..b5481699aa3 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -54,7 +54,7 @@
     {{on "paste" this.valueDidChange}}
     {{on "cut" this.valueDidChange}}
 
-    {{this.DeprecatedInputEventHandlersModifier this}}
+    {{this.DeprecatedEventHandlersModifier this}}
   />
 {{~else~}}
   {{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts b/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts
new file mode 100644
index 00000000000..30e2f374432
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts
@@ -0,0 +1,3 @@
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
+export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
new file mode 100644
index 00000000000..11cd37107ef
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
@@ -0,0 +1,48 @@
+{{~#if this.modernized ~}}
+  <textarea
+    {{!-- for compatibility --}}
+    id={{this.id}}
+    class={{this.class}}
+
+    {{!-- deprecated attribute bindings --}}
+    autocapitalize={{this._autocapitalize}}
+    autocorrect={{this._autocorrect}}
+    autofocus={{this._autofocus}}
+    disabled={{this._disabled}}
+    form={{this._form}}
+    maxlength={{this._maxlength}}
+    minlength={{this._minlength}}
+    placeholder={{this._placeholder}}
+    readonly={{this._readonly}}
+    required={{this._required}}
+    selectionDirection={{this._selectionDirection}}
+    spellcheck={{this._spellcheck}}
+    tabindex={{this._tabindex}}
+    title={{this._title}}
+    rows={{this._rows}}
+    cols={{this._cols}}
+    name={{this._name}}
+    selectionEnd={{this._selectionEnd}}
+    selectionStart={{this._selectionStart}}
+    autocomplete={{this._autocomplete}}
+    wrap={{this._wrap}}
+    lang={{this._lang}}
+    dir={{this._dir}}
+
+    ...attributes
+
+    value={{this.value}}
+
+    {{on "change" this.change}}
+    {{on "input" this.input}}
+    {{on "keyup" this.keyUp}}
+    {{on "paste" this.valueDidChange}}
+    {{on "cut" this.valueDidChange}}
+
+    {{this.DeprecatedEventHandlersModifier this}}
+  />
+{{~else~}}
+  {{~#let (component '-textarea')  as |Textarea|~}}
+    <Textarea @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
+  {{~/let~}}
+{{/if}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 7dc947c1547..5b959e641f9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1271,7 +1271,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         let target = this.controllerFor('application');
 
-        let inputToString = /<@ember\/component\/input:ember[0-9]+>/;
+        let inputToString = /<Input:ember[0-9]+>/;
 
         this.assertRenderTree([
           {
@@ -1385,58 +1385,46 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         await this.visit('/');
 
-        this.assertRenderTree([
-          {
-            type: 'component',
-            name: 'textarea',
-            args: { positional: [], named: { value: 'first' } },
-            instance: (instance: object) => instance['value'] === 'first',
-            bounds: this.nodeBounds(this.element.firstChild),
-            template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-            children: [],
-          },
-        ]);
+        let textareaNode = (value: string, node: Node): ExpectedRenderNode => {
+          if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+            return {
+              type: 'component',
+              name: 'textarea',
+              args: { positional: [], named: { value } },
+              instance: (instance: object) => instance['value'] === value,
+              bounds: this.nodeBounds(node),
+              template: 'packages/@ember/-internals/glimmer/lib/templates/textarea.hbs',
+              children: [],
+            };
+          } else {
+            return {
+              type: 'component',
+              name: 'textarea',
+              args: { positional: [], named: { value } },
+              instance: (instance: object) => instance['value'] === value,
+              bounds: this.nodeBounds(node),
+              template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
+              children: [],
+            };
+          }
+        };
+
+        this.assertRenderTree([textareaNode('first', this.element.firstChild)]);
 
         runTask(() => {
           this.controllerFor('application').set('showSecond', true);
         });
 
         this.assertRenderTree([
-          {
-            type: 'component',
-            name: 'textarea',
-            args: { positional: [], named: { value: 'first' } },
-            instance: (instance: object) => instance['value'] === 'first',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
-            children: [],
-          },
-          {
-            type: 'component',
-            name: 'textarea',
-            args: { positional: [], named: { value: 'second' } },
-            instance: (instance: object) => instance['value'] === 'second',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
-            children: [],
-          },
+          textareaNode('first', this.element.firstChild),
+          textareaNode('second', this.element.lastChild),
         ]);
 
         runTask(() => {
           this.controllerFor('application').set('showSecond', false);
         });
 
-        this.assertRenderTree([
-          {
-            type: 'component',
-            name: 'textarea',
-            args: { positional: [], named: { value: 'first' } },
-            instance: (instance: object) => instance['value'] === 'first',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
-            children: [],
-          },
-        ]);
+        this.assertRenderTree([textareaNode('first', this.element.firstChild)]);
       }
 
       async '@test <LinkTo> components'() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index d2f57824174..40ff6ac7df0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -1,5 +1,6 @@
 import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
 
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
@@ -48,18 +49,32 @@ class BoundTextAreaAttributes {
         this.assertTextArea({ attrs: { [attribute]: first } });
       },
 
-      [`@test @${attribute} (named argument)`]() {
-        this.render(`<Textarea @${attribute}={{this.value}} />`, {
-          value: first,
-        });
+      [`@test [DEPRECATED] @${attribute} (named argument)`]() {
+        let deprecation = new RegExp(
+          `Passing the \`@${attribute}\` argument to <Textarea> is deprecated\\.`
+        );
+
+        expectDeprecation(
+          () => this.render(`<Textarea @${attribute}={{this.value}} />`, { value: first }),
+          deprecation,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+        );
         this.assertTextArea({ attrs: { [attribute]: first } });
 
         this.assertStableRerender();
 
-        runTask(() => set(this.context, 'value', second));
+        expectDeprecation(
+          () => runTask(() => set(this.context, 'value', second)),
+          deprecation,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+        );
         this.assertTextArea({ attrs: { [attribute]: second } });
 
-        runTask(() => set(this.context, 'value', first));
+        expectDeprecation(
+          () => runTask(() => set(this.context, 'value', first)),
+          deprecation,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+        );
         this.assertTextArea({ attrs: { [attribute]: first } });
       },
     };
@@ -103,10 +118,12 @@ moduleFor(
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
-    ['@test Should respect @disabled (named argument)'](assert) {
-      this.render('<Textarea @disabled={{this.disabled}} />', {
-        disabled: true,
-      });
+    ['@test [DEPRECATED] Should respect @disabled (named argument)'](assert) {
+      expectDeprecation(
+        () => this.render('<Textarea @disabled={{this.disabled}} />', { disabled: true }),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
@@ -117,10 +134,12 @@ moduleFor(
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
-    ['@test Should respect @disabled (named argument) when false'](assert) {
-      this.render('<Textarea @disabled={{this.disabled}} />', {
-        disabled: false,
-      });
+    ['@test [DEPRECATED] Should respect @disabled (named argument) when false'](assert) {
+      expectDeprecation(
+        () => this.render('<Textarea @disabled={{this.disabled}} />', { disabled: false }),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
@@ -137,16 +156,30 @@ moduleFor(
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
-    ['@test Should become @disabled (named argument) when the context changes'](assert) {
-      this.render('<Textarea @disabled={{this.disabled}} />');
+    ['@test [DEPRECATED] Should become @disabled (named argument) when the context changes'](
+      assert
+    ) {
+      expectDeprecation(
+        () => this.render('<Textarea @disabled={{this.disabled}} />'),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':not(:disabled)'));
 
       this.assertStableRerender();
 
-      runTask(() => set(this.context, 'disabled', true));
+      expectDeprecation(
+        () => runTask(() => set(this.context, 'disabled', true)),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':disabled'));
 
-      runTask(() => set(this.context, 'disabled', false));
+      expectDeprecation(
+        () => runTask(() => set(this.context, 'disabled', false)),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 9542ade811f..8804c9620ed 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -1,5 +1,6 @@
 import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
 
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
@@ -33,18 +34,32 @@ class BoundTextAreaAttributes {
 
   generate({ attribute, first, second }) {
     return {
-      [`@test ${attribute}`]() {
-        this.render(`{{textarea ${attribute}=this.value}}`, {
-          value: first,
-        });
+      [`@test [DEPRECATED] ${attribute}`]() {
+        let deprecation = new RegExp(
+          `Passing the \`@${attribute}\` argument to <Textarea> is deprecated\\.`
+        );
+
+        expectDeprecation(
+          () => this.render(`{{textarea ${attribute}=this.value}}`, { value: first }),
+          deprecation,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+        );
         this.assertTextArea({ attrs: { [attribute]: first } });
 
         this.assertStableRerender();
 
-        runTask(() => set(this.context, 'value', second));
+        expectDeprecation(
+          () => runTask(() => set(this.context, 'value', second)),
+          deprecation,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+        );
         this.assertTextArea({ attrs: { [attribute]: second } });
 
-        runTask(() => set(this.context, 'value', first));
+        expectDeprecation(
+          () => runTask(() => set(this.context, 'value', first)),
+          deprecation,
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+        );
         this.assertTextArea({ attrs: { [attribute]: first } });
       },
     };
@@ -75,30 +90,46 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test Should respect disabled'](assert) {
-      this.render('{{textarea disabled=this.disabled}}', {
-        disabled: true,
-      });
+    ['@test [DEPRECATED] Should respect disabled'](assert) {
+      expectDeprecation(
+        () => this.render('{{textarea disabled=this.disabled}}', { disabled: true }),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
-    ['@test Should respect disabled when false'](assert) {
-      this.render('{{textarea disabled=this.disabled}}', {
-        disabled: false,
-      });
+    ['@test [DEPRECATED] Should respect disabled when false'](assert) {
+      expectDeprecation(
+        () => this.render('{{textarea disabled=this.disabled}}', { disabled: false }),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
-    ['@test Should become disabled when the context changes'](assert) {
-      this.render('{{textarea disabled=this.disabled}}');
+    ['@test [DEPRECATED] Should become disabled when the context changes'](assert) {
+      expectDeprecation(
+        () => this.render('{{textarea disabled=this.disabled}}'),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':not(:disabled)'));
 
       this.assertStableRerender();
 
-      runTask(() => set(this.context, 'disabled', true));
+      expectDeprecation(
+        () => runTask(() => set(this.context, 'disabled', true)),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':disabled'));
 
-      runTask(() => set(this.context, 'disabled', false));
+      expectDeprecation(
+        () => runTask(() => set(this.context, 'disabled', false)),
+        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 

From e6a20d7441adad0ed5a8fc54f9b6d7e97ecb8045 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 5 Feb 2021 11:03:03 -0800
Subject: [PATCH 0388/1405] [FEATURE modernized-built-in-components] Blanket
 deprecation

Deprecate all unsupported args (and "deopt" the component for now)
according to RFC 707.

Part of #19270
---
 .../glimmer/lib/components/input.ts           | 315 +++++++++++-------
 .../components/input-angle-test.js            |  13 +-
 .../components/input-curly-test.js            |  13 +-
 3 files changed, 223 insertions(+), 118 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 14e08b1138a..4a168ea8a46 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -7,7 +7,7 @@ import { Owner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { jQuery, jQueryDisabled } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate, warn } from '@ember/debug';
+import { assert, deprecate, runInDebug, warn } from '@ember/debug';
 import { JQUERY_INTEGRATION, SEND_ACTION } from '@ember/deprecated-features';
 import { action } from '@ember/object';
 import { Maybe, Option } from '@glimmer/interfaces';
@@ -311,6 +311,20 @@ class ForkedValue implements Value {
 abstract class AbstractInput extends InternalComponent {
   modernized = Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS);
 
+  constructor(owner: Owner, args: Record<string, Reference | undefined>, caller: unknown) {
+    super(owner, args, caller);
+
+    runInDebug(() => {
+      untrack(() => {
+        for (let name in args) {
+          if (!this.isSupportedArgument(name)) {
+            this.onUnsupportedArgument(name);
+          }
+        }
+      });
+    });
+  }
+
   /**
    * The default HTML id attribute. We don't really _need_ one, this is just
    * added for compatibility as it's hard to tell if people rely on it being
@@ -430,7 +444,15 @@ abstract class AbstractInput extends InternalComponent {
     }
   }
 
-  private callbackFor(type: string, shouldDevirtualize = true): EventListener {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  protected isSupportedArgument(_name: string): boolean {
+    return false;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  protected onUnsupportedArgument(_name: string): void {}
+
+  protected callbackFor(type: string, shouldDevirtualize = true): EventListener {
     let callback = this.arg(type);
 
     if (callback) {
@@ -480,6 +502,19 @@ class Input extends AbstractInput {
   get isTextarea(): false {
     return false;
   }
+
+  protected isSupportedArgument(name: string): boolean {
+    let supportedArguments = [
+      'type',
+      'value',
+      'checked',
+      'insert-newline',
+      'enter',
+      'escape-press',
+    ];
+
+    return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
+  }
 }
 
 class Textarea extends AbstractInput {
@@ -498,10 +533,34 @@ class Textarea extends AbstractInput {
   get isTextarea(): true {
     return true;
   }
+
+  protected isSupportedArgument(name: string): boolean {
+    let supportedArguments = ['type', 'value', 'insert-newline', 'enter', 'escape-press'];
+    return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
+  }
 }
 
 // Deprecated features
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  // Unsupported arguments
+  {
+    AbstractInput.prototype['onUnsupportedArgument'] = function (
+      this: AbstractInput,
+      argument: string
+    ): void {
+      let name = this.constructor.toString();
+
+      deprecate(`Passing the \`@${argument}\` argument to <${name}> is deprecated.`, false, {
+        id: 'ember.built-in-components.legacy-arguments',
+        for: 'ember-source',
+        since: {},
+        until: '4.0.0',
+      });
+
+      this.modernized = false;
+    };
+  }
+
   // Attribute bindings
   {
     let defineGetterForDeprecatedAttributeBinding = (
@@ -518,6 +577,15 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         !(`_${argument}` in prototype)
       );
 
+      let superIsSupportedArgument = prototype['isSupportedArgument'];
+
+      prototype['isSupportedArgument'] = function isSupportedArgument(
+        this: AbstractInput,
+        name: string
+      ): boolean {
+        return (this.modernized && name === argument) || superIsSupportedArgument.call(this, name);
+      };
+
       Object.defineProperty(prototype, `_${argument}`, {
         get(this: AbstractInput): unknown {
           deprecate(
@@ -674,148 +742,171 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     });
   }
 
-  type EventsMap = Record<string, string>;
+  // Deprecated event arguments
+  {
+    type EventsMap = Record<string, string>;
 
-  const EVENTS = new WeakMap<object, EventsMap>();
+    const EVENTS = new WeakMap<object, EventsMap>();
 
-  const getEventsMap = (owner: Owner): EventsMap => {
-    let events = EVENTS.get(owner);
+    const getEventsMap = (owner: Owner): EventsMap => {
+      let events = EVENTS.get(owner);
 
-    if (events === undefined) {
-      let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
-        'event_dispatcher:main'
-      );
+      if (events === undefined) {
+        let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
+          'event_dispatcher:main'
+        );
 
-      assert(
-        'missing event dispatcher',
-        eventDispatcher !== null && typeof eventDispatcher === 'object'
-      );
+        assert(
+          'missing event dispatcher',
+          eventDispatcher !== null && typeof eventDispatcher === 'object'
+        );
 
-      assert(
-        'missing _finalEvents on event dispatcher',
-        '_finalEvents' in eventDispatcher &&
-          eventDispatcher?._finalEvents !== null &&
-          typeof eventDispatcher?._finalEvents === 'object'
-      );
+        assert(
+          'missing _finalEvents on event dispatcher',
+          '_finalEvents' in eventDispatcher &&
+            eventDispatcher?._finalEvents !== null &&
+            typeof eventDispatcher?._finalEvents === 'object'
+        );
 
-      EVENTS.set(owner, (events = eventDispatcher._finalEvents));
-    }
+        EVENTS.set(owner, (events = eventDispatcher._finalEvents));
+      }
 
-    return events;
-  };
+      return events;
+    };
 
-  class DeprecatedEventHandlersModifier extends InternalModifier {
-    static toString(): string {
-      return 'DeprecatedEventHandlersModifier';
-    }
+    let superIsSupportedArgument = AbstractInput.prototype['isSupportedArgument'];
 
-    private listeners = new Map<string, EventListener>();
+    AbstractInput.prototype['isSupportedArgument'] = function isSupportedArgument(
+      this: AbstractInput,
+      name: string
+    ): boolean {
+      let events = [
+        ...Object.values(getEventsMap(this.owner)),
+        'focus-in',
+        'focus-out',
+        'key-press',
+        'key-up',
+        'key-down',
+      ];
 
-    install(): void {
-      let { element, eventsMap, component, listenerFor, listeners } = this;
+      return (
+        (this.modernized && events.indexOf(name) !== -1) ||
+        superIsSupportedArgument.call(this, name)
+      );
+    };
+    class DeprecatedEventHandlersModifier extends InternalModifier {
+      static toString(): string {
+        return 'DeprecatedEventHandlersModifier';
+      }
 
-      let entries: [eventName: string, methodName: string, isVirtualEvent?: boolean][] = [
-        ...Object.entries(eventsMap),
-        ['focusin', 'focus-in', true],
-        ['focusout', 'focus-out', true],
-        ['keypress', 'key-press', true],
-        ['keyup', 'key-up', true],
-        ['keydown', 'key-down', true],
-      ];
+      private listeners = new Map<string, EventListener>();
 
-      for (let [eventName, methodName, isVirtualEvent] of entries) {
-        let listener = listenerFor.call(component, eventName, methodName, isVirtualEvent);
+      install(): void {
+        let { element, eventsMap, component, listenerFor, listeners } = this;
 
-        if (listener) {
-          listeners.set(eventName, listener);
-          element.addEventListener(eventName, listener);
-        }
-      }
+        let entries: [eventName: string, methodName: string, isVirtualEvent?: boolean][] = [
+          ...Object.entries(eventsMap),
+          ['focusin', 'focus-in', true],
+          ['focusout', 'focus-out', true],
+          ['keypress', 'key-press', true],
+          ['keyup', 'key-up', true],
+          ['keydown', 'key-down', true],
+        ];
 
-      Object.freeze(listeners);
-    }
+        for (let [eventName, methodName, isVirtualEvent] of entries) {
+          let listener = listenerFor.call(component, eventName, methodName, isVirtualEvent);
 
-    remove(): void {
-      let { element, listeners } = this;
+          if (listener) {
+            listeners.set(eventName, listener);
+            element.addEventListener(eventName, listener);
+          }
+        }
 
-      for (let [event, listener] of Object.entries(listeners)) {
-        element.removeEventListener(event, listener);
+        Object.freeze(listeners);
       }
 
-      this.listeners = new Map();
-    }
+      remove(): void {
+        let { element, listeners } = this;
 
-    private get eventsMap(): EventsMap {
-      return getEventsMap(this.owner);
-    }
+        for (let [event, listener] of Object.entries(listeners)) {
+          element.removeEventListener(event, listener);
+        }
 
-    private get component(): AbstractInput {
-      let component = this.positional(0);
+        this.listeners = new Map();
+      }
 
-      assert(
-        'must pass the <Input /> or <Textarea /> component as first argument',
-        component instanceof AbstractInput
-      );
+      private get eventsMap(): EventsMap {
+        return getEventsMap(this.owner);
+      }
 
-      return component;
-    }
+      private get component(): AbstractInput {
+        let component = this.positional(0);
 
-    private listenerFor(
-      this: AbstractInput,
-      eventName: string,
-      methodName: string,
-      isVirtualEvent = false
-    ): Option<EventListener> {
-      assert(
-        'must be called with the <Input /> or <Textarea /> component as this',
-        this instanceof AbstractInput
-      );
+        assert(
+          'must pass the <Input /> or <Textarea /> component as first argument',
+          component instanceof AbstractInput
+        );
 
-      let name = this.constructor.toString();
-      let curlyName = name.toLowerCase();
+        return component;
+      }
 
-      if (methodName in this.args) {
-        deprecate(
-          `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
-            `This would have overwritten the internal \`${methodName}\` method on ` +
-            `the <${name}> component and prevented it from functioning properly. ` +
-            `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
-            `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
-          true, // !(methodName in this),
-          {
-            id: 'ember.built-in-components.legacy-attribute-arguments',
-            for: 'ember-source',
-            since: {},
-            until: '4.0.0',
-          }
+      private listenerFor(
+        this: AbstractInput,
+        eventName: string,
+        methodName: string,
+        isVirtualEvent = false
+      ): Option<EventListener> {
+        assert(
+          'must be called with the <Input /> or <Textarea /> component as this',
+          this instanceof AbstractInput
         );
 
-        deprecate(
-          `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
-            `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
-            `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
-          true, // methodName in this,
-          {
-            id: 'ember.built-in-components.legacy-attribute-arguments',
-            for: 'ember-source',
-            since: {},
-            until: '4.0.0',
-          }
-        );
+        let name = this.constructor.toString();
+        let curlyName = name.toLowerCase();
 
-        return this['callbackFor'].call(this, methodName, isVirtualEvent);
-      } else {
-        return null;
+        if (methodName in this.args) {
+          deprecate(
+            `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
+              `This would have overwritten the internal \`${methodName}\` method on ` +
+              `the <${name}> component and prevented it from functioning properly. ` +
+              `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
+              `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
+            true, // !(methodName in this),
+            {
+              id: 'ember.built-in-components.legacy-attribute-arguments',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          deprecate(
+            `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
+              `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
+              `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
+            true, // methodName in this,
+            {
+              id: 'ember.built-in-components.legacy-attribute-arguments',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          return this['callbackFor'].call(this, methodName, isVirtualEvent);
+        } else {
+          return null;
+        }
       }
     }
-  }
 
-  setInternalModifierManager(
-    new InternalModifierManager(DeprecatedEventHandlersModifier, 'deprecated-event-handlers'),
-    DeprecatedEventHandlersModifier
-  );
+    setInternalModifierManager(
+      new InternalModifierManager(DeprecatedEventHandlersModifier, 'deprecated-event-handlers'),
+      DeprecatedEventHandlersModifier
+    );
 
-  AbstractInput.prototype['DeprecatedEventHandlersModifier'] = DeprecatedEventHandlersModifier;
+    AbstractInput.prototype['DeprecatedEventHandlersModifier'] = DeprecatedEventHandlersModifier;
+  }
 
   // String actions
   if (SEND_ACTION) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index b37eaf8166f..34016cc5f92 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -610,11 +610,11 @@ moduleFor(
     }
 
     ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
-      assert.expect(1);
+      let bubbled = 0;
 
       let ParentComponent = Component.extend({
         change() {
-          assert.ok(true, 'bubbled upwards');
+          bubbled++;
         },
       });
 
@@ -622,9 +622,16 @@ moduleFor(
         ComponentClass: ParentComponent,
         template: `<Input @bubbles={{true}} />`,
       });
-      this.render(`<Parent />`);
+
+      expectDeprecation(
+        () => this.render(`<Parent />`),
+        'Passing the `@bubbles` argument to <Input> is deprecated.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('change');
+
+      assert.strictEqual(bubbled, 1, 'bubbled upwards');
     }
 
     ['@test triggers `focus-in` when focused'](assert) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 5e9c2925e23..c9cc14e9154 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -456,11 +456,11 @@ moduleFor(
     }
 
     ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
-      assert.expect(1);
+      let bubbled = 0;
 
       let ParentComponent = Component.extend({
         change() {
-          assert.ok(true, 'bubbled upwards');
+          bubbled++;
         },
       });
 
@@ -468,9 +468,16 @@ moduleFor(
         ComponentClass: ParentComponent,
         template: `{{input bubbles=true}}`,
       });
-      this.render(`{{x-parent}}`);
+
+      expectDeprecation(
+        () => this.render(`{{x-parent}}`),
+        'Passing the `@bubbles` argument to <Input> is deprecated.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('change');
+
+      assert.strictEqual(bubbled, 1, 'bubbled upwards');
     }
 
     ['@test triggers `focus-in` when focused'](assert) {

From a7f48dbe5a2d9d268385ca11373064f66dfa101e Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 5 Feb 2021 20:59:17 -0800
Subject: [PATCH 0389/1405] [FEATURE modernized-built-in-components] Support
 `@ariaRole`

Part of #19270
---
 .../glimmer/lib/components/input.ts           |  2 +
 .../glimmer/lib/templates/input.hbs           |  1 +
 .../glimmer/lib/templates/textarea.hbs        |  1 +
 .../components/input-angle-test.js            | 86 +++++++++++++++----
 .../components/input-curly-test.js            | 52 ++++++++---
 .../components/textarea-angle-test.js         |  9 +-
 .../components/textarea-curly-test.js         |  9 +-
 7 files changed, 124 insertions(+), 36 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 4a168ea8a46..9d7892fbd31 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -647,6 +647,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       'id',
       'class',
       ['class', 'classNames'],
+      ['role', 'ariaRole'],
 
       // TextSupport
       'autocapitalize',
@@ -704,6 +705,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       'id',
       'class',
       ['class', 'classNames'],
+      ['role', 'ariaRole'],
 
       // TextSupport
       'autocapitalize',
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index b5481699aa3..6800489fb56 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -5,6 +5,7 @@
     class={{this.class}}
 
     {{!-- deprecated attribute bindings --}}
+    role={{this._ariaRole}}
     autocapitalize={{this._autocapitalize}}
     autocorrect={{this._autocorrect}}
     autofocus={{this._autofocus}}
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
index 11cd37107ef..ef884136b36 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
@@ -5,6 +5,7 @@
     class={{this.class}}
 
     {{!-- deprecated attribute bindings --}}
+    role={{this._ariaRole}}
     autocapitalize={{this._autocapitalize}}
     autocorrect={{this._autocorrect}}
     autofocus={{this._autofocus}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 34016cc5f92..477ae797c1e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -225,6 +225,7 @@ moduleFor(
       this.render(
         `
       <Input @type="text" @value={{this.value}}
+        role={{this.role}}
         disabled={{this.disabled}}
         placeholder={{this.placeholder}}
         name={{this.name}}
@@ -235,6 +236,7 @@ moduleFor(
       />`,
         {
           value: 'Original value',
+          role: 'textbox',
           disabled: false,
           placeholder: 'Original placeholder',
           name: 'original-name',
@@ -247,6 +249,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -258,6 +261,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -267,6 +271,7 @@ moduleFor(
 
       runTask(() => {
         set(this.context, 'value', 'Updated value');
+        set(this.context, 'role', 'search');
         set(this.context, 'disabled', true);
         set(this.context, 'placeholder', 'Updated placeholder');
         set(this.context, 'name', 'updated-name');
@@ -278,6 +283,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('maxlength', '11');
@@ -287,6 +293,7 @@ moduleFor(
 
       runTask(() => {
         set(this.context, 'value', 'Original value');
+        set(this.context, 'role', 'textbox');
         set(this.context, 'disabled', false);
         set(this.context, 'placeholder', 'Original placeholder');
         set(this.context, 'name', 'original-name');
@@ -298,6 +305,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -311,6 +319,7 @@ moduleFor(
         () => {
           this.render(
             `<Input @type="text" @value={{this.value}}
+              @ariaRole={{this.role}}
               @disabled={{this.disabled}}
               @placeholder={{this.placeholder}}
               @name={{this.name}}
@@ -320,6 +329,7 @@ moduleFor(
               @tabindex={{this.tabindex}}/>`,
             {
               value: 'Original value',
+              role: 'textbox',
               disabled: false,
               placeholder: 'Original placeholder',
               name: 'original-name',
@@ -330,12 +340,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -347,6 +358,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -358,6 +370,7 @@ moduleFor(
         () => {
           runTask(() => {
             set(this.context, 'value', 'Updated value');
+            set(this.context, 'role', 'search');
             set(this.context, 'disabled', true);
             set(this.context, 'placeholder', 'Updated placeholder');
             set(this.context, 'name', 'updated-name');
@@ -367,12 +380,13 @@ moduleFor(
             // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('maxlength', '11');
@@ -384,6 +398,7 @@ moduleFor(
         () => {
           runTask(() => {
             set(this.context, 'value', 'Original value');
+            set(this.context, 'role', 'textbox');
             set(this.context, 'disabled', false);
             set(this.context, 'placeholder', 'Original placeholder');
             set(this.context, 'name', 'original-name');
@@ -393,12 +408,13 @@ moduleFor(
             // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -410,6 +426,7 @@ moduleFor(
     ['@test static attributes (HTML attribute)']() {
       this.render(`
       <Input @type="text" @value="Original value"
+        role="search"
         disabled="disabled"
         placeholder="Original placeholder"
         name="original-name"
@@ -421,6 +438,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -432,6 +450,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -445,6 +464,7 @@ moduleFor(
         () => {
           this.render(
             `<Input @type="text" @value="Original value"
+              @ariaRole="search"
               @disabled={{true}}
               @placeholder="Original placeholder"
               @name="original-name"
@@ -454,12 +474,13 @@ moduleFor(
               @tabindex={{30}}/>`
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -471,6 +492,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -903,11 +925,13 @@ moduleFor(
     ['@test dynamic attributes (HTML attribute)']() {
       this.render(
         `<Input @type='checkbox' @checked={{this.checked}}
+          role={{this.role}}
           disabled={{this.disabled}}
           name={{this.name}}
           tabindex={{this.tabindex}}
         />`,
         {
+          role: 'checkbox',
           disabled: false,
           name: 'original-name',
           checked: false,
@@ -917,6 +941,7 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
@@ -924,10 +949,12 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
       runTask(() => {
+        set(this.context, 'role', 'radio');
         set(this.context, 'disabled', true);
         set(this.context, 'name', 'updated-name');
         set(this.context, 'tabindex', 11);
@@ -935,10 +962,12 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
       runTask(() => {
+        set(this.context, 'role', 'checkbox');
         set(this.context, 'disabled', false);
         set(this.context, 'name', 'original-name');
         set(this.context, 'tabindex', 10);
@@ -946,6 +975,7 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
     }
@@ -955,10 +985,13 @@ moduleFor(
         () => {
           this.render(
             `<Input @type='checkbox' @checked={{this.checked}}
+              @ariaRole={{this.role}}
               @disabled={{this.disabled}}
               @name={{this.name}}
-              @tabindex={{this.tabindex}}/>`,
+              @tabindex={{this.tabindex}}
+            />`,
             {
+              role: 'checkbox',
               disabled: false,
               name: 'original-name',
               checked: false,
@@ -966,12 +999,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
@@ -979,40 +1013,45 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'radio');
             set(this.context, 'disabled', true);
             set(this.context, 'name', 'updated-name');
             set(this.context, 'tabindex', 11);
           });
         },
-        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'checkbox');
             set(this.context, 'disabled', false);
             set(this.context, 'name', 'original-name');
             set(this.context, 'tabindex', 10);
           });
         },
-        /Passing the `@(disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
     }
@@ -1081,12 +1120,13 @@ moduleFor(
 
     ['@test with static values (HTML attribute)']() {
       this.render(
-        `<Input @type="checkbox" @checked={{false}} disabled={{false}} tabindex="10" name="original-name" />`
+        `<Input @type="checkbox" @checked={{false}} role="radio" disabled={{false}} tabindex="10" name="original-name" />`
       );
 
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
 
@@ -1103,16 +1143,17 @@ moduleFor(
       expectDeprecation(
         () => {
           this.render(
-            `<Input @type="checkbox" @checked={{false}} @disabled={{false}} @tabindex={{10}} @name="original-name" />`
+            `<Input @type="checkbox" @checked={{false}} @ariaRole="radio" @disabled={{false}} @tabindex={{10}} @name="original-name" />`
           );
         },
-        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
 
@@ -1121,6 +1162,7 @@ moduleFor(
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
     }
@@ -1135,11 +1177,12 @@ moduleFor(
   `Components test: <Input @type='text' />`,
   class extends InputRenderingTest {
     ['@test null values (HTML attribute)']() {
-      let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
+      let attributes = ['role', 'disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
       this.render(
         `
       <Input @type="text" @value={{this.value}}
+        role={{this.role}}
         disabled={{this.disabled}}
         placeholder={{this.placeholder}}
         name={{this.name}}
@@ -1149,6 +1192,7 @@ moduleFor(
       />`,
         {
           value: null,
+          role: null,
           disabled: null,
           placeholder: null,
           name: null,
@@ -1167,6 +1211,7 @@ moduleFor(
       this.assertAllAttrs(attributes, undefined);
 
       runTask(() => {
+        set(this.context, 'role', 'search');
         set(this.context, 'disabled', true);
         set(this.context, 'value', 'Updated value');
         set(this.context, 'placeholder', 'Updated placeholder');
@@ -1178,6 +1223,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('maxlength', '11');
@@ -1185,6 +1231,7 @@ moduleFor(
       this.assertAttr('tabindex', '31');
 
       runTask(() => {
+        set(this.context, 'role', null);
         set(this.context, 'disabled', null);
         set(this.context, 'value', null);
         set(this.context, 'placeholder', null);
@@ -1196,6 +1243,7 @@ moduleFor(
 
       this.assertAttr('disabled', undefined);
       this.assertValue('');
+      this.assertAttr('role', undefined);
       // this.assertAttr('placeholder', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       // this.assertAttr('name', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       this.assertAttr('maxlength', undefined);
@@ -1204,12 +1252,13 @@ moduleFor(
     }
 
     ['@test [DEPRECATED] null values (named argument)']() {
-      let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
+      let attributes = ['role', 'disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
       expectDeprecation(
         () => {
           this.render(
             `<Input @type="text" @value={{this.value}}
+              @ariaRole={{this.role}}
               @disabled={{this.disabled}}
               @placeholder={{this.placeholder}}
               @name={{this.name}}
@@ -1218,6 +1267,7 @@ moduleFor(
               @tabindex={{this.tabindex}}/>`,
             {
               value: null,
+              role: null,
               disabled: null,
               placeholder: null,
               name: null,
@@ -1227,7 +1277,7 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1242,6 +1292,7 @@ moduleFor(
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'search');
             set(this.context, 'disabled', true);
             set(this.context, 'value', 'Updated value');
             set(this.context, 'placeholder', 'Updated placeholder');
@@ -1251,12 +1302,13 @@ moduleFor(
             set(this.context, 'tabindex', 31);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('maxlength', '11');
@@ -1266,6 +1318,7 @@ moduleFor(
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', null);
             set(this.context, 'disabled', null);
             set(this.context, 'value', null);
             set(this.context, 'placeholder', null);
@@ -1275,12 +1328,13 @@ moduleFor(
             set(this.context, 'tabindex', null);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertAttr('disabled', undefined);
       this.assertValue('');
+      this.assertAttr('role', undefined);
       // this.assertAttr('placeholder', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       // this.assertAttr('name', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       this.assertAttr('maxlength', undefined);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index c9cc14e9154..28fee3d20ac 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -187,6 +187,7 @@ moduleFor(
           this.render(
             `
             {{input type="text"
+              ariaRole=this.role
               disabled=this.disabled
               value=this.value
               placeholder=this.placeholder
@@ -197,6 +198,7 @@ moduleFor(
               tabindex=this.tabindex
             }}`,
             {
+              role: 'textbox',
               disabled: false,
               value: 'Original value',
               placeholder: 'Original placeholder',
@@ -208,12 +210,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -225,6 +228,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -235,6 +239,7 @@ moduleFor(
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'search');
             set(this.context, 'value', 'Updated value');
             set(this.context, 'disabled', true);
             set(this.context, 'placeholder', 'Updated placeholder');
@@ -245,12 +250,13 @@ moduleFor(
             // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('maxlength', '11');
@@ -261,6 +267,7 @@ moduleFor(
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'textbox');
             set(this.context, 'value', 'Original value');
             set(this.context, 'disabled', false);
             set(this.context, 'placeholder', 'Original placeholder');
@@ -271,12 +278,13 @@ moduleFor(
             // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -290,6 +298,7 @@ moduleFor(
         () => {
           this.render(`
             {{input type="text"
+              ariaRole="search"
               disabled=true
               value="Original value"
               placeholder="Original placeholder"
@@ -300,12 +309,13 @@ moduleFor(
               tabindex=30
             }}`);
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -317,6 +327,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
       this.assertAttr('maxlength', '10');
@@ -747,12 +758,14 @@ moduleFor(
           this.render(
             `{{input
               type='checkbox'
+              ariaRole=this.role
               disabled=this.disabled
               name=this.name
               checked=this.checked
               tabindex=this.tabindex
             }}`,
             {
+              role: 'radio',
               disabled: false,
               name: 'original-name',
               checked: false,
@@ -760,12 +773,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
@@ -773,40 +787,45 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
 
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'checkbox');
             set(this.context, 'disabled', true);
             set(this.context, 'name', 'updated-name');
             set(this.context, 'tabindex', 11);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertDisabled();
+      this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
 
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'radio');
             set(this.context, 'disabled', false);
             set(this.context, 'name', 'original-name');
             set(this.context, 'tabindex', 10);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
     }
@@ -878,19 +897,21 @@ moduleFor(
         () => {
           this.render(
             `{{input type="checkbox"
+              ariaRole="radio"
               disabled=false
               tabindex=10
               name="original-name"
               checked=false}}`
           );
         },
-        /Passing the `@(disabled|tabindex|name)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
 
@@ -899,6 +920,7 @@ moduleFor(
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
     }
@@ -913,12 +935,13 @@ moduleFor(
   `Components test: {{input type='text'}}`,
   class extends InputRenderingTest {
     ['@test [DEPRECATED] null values']() {
-      let attributes = ['disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
+      let attributes = ['role', 'disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
 
       expectDeprecation(
         () => {
           this.render(
             `{{input type="text"
+              ariaRole=this.role
               disabled=this.disabled
               value=this.value
               placeholder=this.placeholder
@@ -927,6 +950,7 @@ moduleFor(
               size=this.size
               tabindex=this.tabindex}}`,
             {
+              role: null,
               disabled: null,
               value: null,
               placeholder: null,
@@ -937,7 +961,7 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -952,6 +976,7 @@ moduleFor(
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', 'search');
             set(this.context, 'disabled', true);
             set(this.context, 'value', 'Updated value');
             set(this.context, 'placeholder', 'Updated placeholder');
@@ -961,12 +986,13 @@ moduleFor(
             set(this.context, 'tabindex', 31);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('maxlength', '11');
@@ -976,6 +1002,7 @@ moduleFor(
       expectDeprecation(
         () => {
           runTask(() => {
+            set(this.context, 'role', null);
             set(this.context, 'disabled', null);
             set(this.context, 'value', null);
             set(this.context, 'placeholder', null);
@@ -985,12 +1012,13 @@ moduleFor(
             set(this.context, 'tabindex', null);
           });
         },
-        /Passing the `@(disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertAttr('disabled', undefined);
       this.assertValue('');
+      this.assertAttr('role', undefined);
       // this.assertAttr('placeholder', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       // this.assertAttr('name', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       this.assertAttr('maxlength', undefined);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index 40ff6ac7df0..ab409e9d5f9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -32,7 +32,7 @@ class BoundTextAreaAttributes {
     this.cases = cases;
   }
 
-  generate({ attribute, first, second }) {
+  generate({ attribute, argument = attribute, first, second }) {
     return {
       [`@test ${attribute} (HTML attribute)`]() {
         this.render(`<Textarea ${attribute}={{this.value}} />`, {
@@ -49,13 +49,13 @@ class BoundTextAreaAttributes {
         this.assertTextArea({ attrs: { [attribute]: first } });
       },
 
-      [`@test [DEPRECATED] @${attribute} (named argument)`]() {
+      [`@test [DEPRECATED] @${argument} (named argument)`]() {
         let deprecation = new RegExp(
-          `Passing the \`@${attribute}\` argument to <Textarea> is deprecated\\.`
+          `Passing the \`@${argument}\` argument to <Textarea> is deprecated\\.`
         );
 
         expectDeprecation(
-          () => this.render(`<Textarea @${attribute}={{this.value}} />`, { value: first }),
+          () => this.render(`<Textarea @${argument}={{this.value}} />`, { value: first }),
           deprecation,
           EMBER_MODERNIZED_BUILT_IN_COMPONENTS
         );
@@ -84,6 +84,7 @@ class BoundTextAreaAttributes {
 applyMixins(
   TextAreaRenderingTest,
   new BoundTextAreaAttributes([
+    { attribute: 'role', argument: 'ariaRole', first: 'textbox', second: 'search' },
     { attribute: 'placeholder', first: 'Stuff here', second: 'Other stuff' },
     { attribute: 'name', first: 'Stuff here', second: 'Other stuff' },
     { attribute: 'title', first: 'Stuff here', second: 'Other stuff' },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 8804c9620ed..339816d2447 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -32,15 +32,15 @@ class BoundTextAreaAttributes {
     this.cases = cases;
   }
 
-  generate({ attribute, first, second }) {
+  generate({ attribute, argument = attribute, first, second }) {
     return {
-      [`@test [DEPRECATED] ${attribute}`]() {
+      [`@test [DEPRECATED] ${argument}`]() {
         let deprecation = new RegExp(
-          `Passing the \`@${attribute}\` argument to <Textarea> is deprecated\\.`
+          `Passing the \`@${argument}\` argument to <Textarea> is deprecated\\.`
         );
 
         expectDeprecation(
-          () => this.render(`{{textarea ${attribute}=this.value}}`, { value: first }),
+          () => this.render(`{{textarea ${argument}=this.value}}`, { value: first }),
           deprecation,
           EMBER_MODERNIZED_BUILT_IN_COMPONENTS
         );
@@ -69,6 +69,7 @@ class BoundTextAreaAttributes {
 applyMixins(
   TextAreaRenderingTest,
   new BoundTextAreaAttributes([
+    { attribute: 'role', argument: 'ariaRole', first: 'textbox', second: 'search' },
     { attribute: 'placeholder', first: 'Stuff here', second: 'Other stuff' },
     { attribute: 'name', first: 'Stuff here', second: 'Other stuff' },
     { attribute: 'title', first: 'Stuff here', second: 'Other stuff' },

From 1f403db18a0229218f7e509c6cd6ef380d81a437 Mon Sep 17 00:00:00 2001
From: Dianne Eramo <dianne.eramo@gmail.com>
Date: Mon, 8 Feb 2021 15:31:14 -0800
Subject: [PATCH 0390/1405] [FEATURE modernized-built-in-components] Deprecate
 input actions as strings

Tracking issue: #19270
Get tests passing for no actions passed to inputs as strings deprecation
---
 .../glimmer/lib/components/input.ts           | 26 +++++++++----------
 .../components/input-angle-test.js            |  8 +++---
 .../components/input-curly-test.js            |  8 +++---
 3 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 9d7892fbd31..235f4ba84cc 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -927,20 +927,18 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         const actionName = this.arg(type);
 
         if (typeof actionName === 'string') {
-          // TODO: eagerly issue a deprecation for this as well (need to fix tests)
-          //
-          // deprecate(
-          //   `Passing actions to components as strings (like \`<${this.constructor} @${type}="${actionName}" />\`) is deprecated. ` +
-          //     `Please use closure actions instead (\`<${this.constructor} @${type}={{action "${actionName}"}} />\`).`,
-          //   false,
-          //   {
-          //     id: 'ember-component.send-action',
-          //     for: 'ember-source',
-          //     since: {},
-          //     until: '4.0.0',
-          //     url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
-          //   }
-          // );
+          deprecate(
+            `Passing actions to components as strings (like \`<${this.constructor} @${type}="${actionName}" />\`) is deprecated. ` +
+              `Please use closure actions instead (\`<${this.constructor} @${type}={{action "${actionName}"}} />\`).`,
+            false,
+            {
+              id: 'ember-component.send-action',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+              url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+            }
+          );
 
           const { caller } = this;
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 477ae797c1e..f0060e6fb64 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -603,11 +603,11 @@ moduleFor(
             },
           },
         });
-      }, 'Passing actions to components as strings (like `<Input @key-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-press={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
+      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keypress', { key: 'A' });
-      }, 'Passing actions to components as strings (like `<Input @key-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-press={{action "foo"}} />`).');
+      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
     }
 
     ['@test sends an action with `<Input @key-press={{action "foo"}} />` is pressed'](assert) {
@@ -759,7 +759,7 @@ moduleFor(
             },
           },
         });
-      }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
+      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keydown', { key: 'A' });
@@ -805,7 +805,7 @@ moduleFor(
             },
           },
         });
-      }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
+      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keyup', { key: 'A' });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 28fee3d20ac..1b4852b7e92 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -438,11 +438,11 @@ moduleFor(
             },
           },
         });
-      }, 'Passing actions to components as strings (like `{{input key-press="foo"}}`) is deprecated. Please use closure actions instead (`{{input key-press=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
+      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keypress', { key: 'A' });
-      }, 'Passing actions to components as strings (like `<Input @key-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-press={{action "foo"}} />`).');
+      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
     }
 
     ['@test sends an action with `{{input key-press=(action "foo")}}` is pressed'](assert) {
@@ -594,7 +594,7 @@ moduleFor(
             },
           },
         });
-      }, 'Passing actions to components as strings (like `{{input key-down="foo"}}`) is deprecated. Please use closure actions instead (`{{input key-down=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
+      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keydown', { key: 'A' });
@@ -640,7 +640,7 @@ moduleFor(
             },
           },
         });
-      }, 'Passing actions to components as strings (like `{{input key-up="foo"}}`) is deprecated. Please use closure actions instead (`{{input key-up=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
+      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keyup', { key: 'A' });

From d854377e757b47927d2ef55e7e297d83a23cf9e4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 8 Feb 2021 18:39:39 -0800
Subject: [PATCH 0391/1405] [FEATURE modernized-built-in-components] Deprecate
 TargetActionSupport

Implements https://github.com/emberjs/rfcs/pull/720

Part of #19270
---
 .../views/lib/mixins/text_support.js          |  3 +-
 packages/ember/index.js                       | 51 +++++++++++--------
 packages/ember/tests/reexports_test.js        | 25 +++++----
 3 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index ecfdcc2054a..bac7b4a481e 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -3,7 +3,6 @@
 */
 
 import { get, set, Mixin } from '@ember/-internals/metal';
-import { TargetActionSupport } from '@ember/-internals/runtime';
 import { deprecate } from '@ember/debug';
 import { SEND_ACTION } from '@ember/deprecated-features';
 import { MUTABLE_CELL } from '@ember/-internals/views';
@@ -113,7 +112,7 @@ const KEY_EVENTS = {
   @extends Mixin
   @private
 */
-export default Mixin.create(TargetActionSupport, {
+export default Mixin.create({
   value: '',
 
   attributeBindings: [
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 6f76ddc8109..4c4187dd456 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -490,7 +490,6 @@ Ember.NativeArray = NativeArray;
 Ember.Copyable = Copyable;
 Ember.MutableEnumerable = MutableEnumerable;
 Ember.MutableArray = MutableArray;
-Ember.TargetActionSupport = TargetActionSupport;
 Ember.Evented = Evented;
 Ember.PromiseProxyMixin = PromiseProxyMixin;
 Ember.Observable = Observable;
@@ -586,28 +585,37 @@ Helper.helper = helper;
 Ember.Helper = Helper;
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   [
-    ['Checkbox', '@ember/component/checkbox', Checkbox],
-    ['TextField', '@ember/component/text-field', TextField],
-    ['TextArea', '@ember/component/text-area', TextArea],
-    ['LinkComponent', '@ember/routing/link-component', LinkComponent],
-    ['TextSupport', '@ember/-internals/views', views.TextSupport],
-  ].forEach(([name, path, value]) => {
+    ['Checkbox', '@ember/component/checkbox', Checkbox, true],
+    ['TextField', '@ember/component/text-field', TextField, true],
+    ['TextArea', '@ember/component/text-area', TextArea, true],
+    ['LinkComponent', '@ember/routing/link-component', LinkComponent, true],
+    ['TextSupport', null, views.TextSupport, false],
+    ['TargetActionSupport', null, TargetActionSupport, false],
+  ].forEach(([name, path, value, availableInLegacyAddon]) => {
     Object.defineProperty(Ember, name, {
       get() {
-        deprecate(
-          `Using Ember.${name} or importing from '${path}' has been deprecated, install the ` +
-            `\`ember-legacy-built-in-components\` addon and use \`import { ${name} } from ` +
-            `'ember-legacy-built-in-components';\` instead`,
-          false,
-          {
-            id: 'ember.legacy-built-in-components',
-            until: '4.0.0',
-            for: 'ember-source',
-            since: {
-              // TODO: update this when enabling the feature
-            },
-          }
-        );
+        let message = `Using Ember.${name}`;
+
+        if (path !== null) {
+          message += ` or importing from '${path}'`;
+        }
+
+        message += ` is deprecated.`;
+
+        if (availableInLegacyAddon) {
+          message +=
+            ` Install the \`ember-legacy-built-in-components\` addon and use ` +
+            `\`import { ${name} } from 'ember-legacy-built-in-components';\` instead.`;
+        }
+
+        deprecate(message, false, {
+          id: 'ember.built-in-components.legacy-import',
+          until: '4.0.0',
+          for: 'ember-source',
+          since: {
+            // TODO: update this when enabling the feature
+          },
+        });
 
         return value;
       },
@@ -625,6 +633,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   Ember.TextArea = TextArea;
   Ember.LinkComponent = LinkComponent;
   Ember.TextSupport = views.TextSupport;
+  Ember.TargetActionSupport = TargetActionSupport;
 }
 Ember._setComponentManager = setComponentManager;
 Ember._componentManagerCapabilities = componentCapabilities;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 1f83024f2b8..c58ecb7b782 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -33,7 +33,8 @@ moduleFor(
         ['TextField', '@ember/component/text-field', '@ember/-internals/glimmer'],
         ['TextArea', '@ember/component/text-area', '@ember/-internals/glimmer'],
         ['LinkComponent', '@ember/routing/link-component', '@ember/-internals/glimmer'],
-        ['TextSupport', '@ember/-internals/views', '@ember/-internals/views'],
+        ['TextSupport', null, '@ember/-internals/views'],
+        ['TargetActionSupport', null, '@ember/-internals/runtime'],
       ].forEach(([name, publicPath, privatePath]) => {
         // loosely based on confirmExport
         try {
@@ -51,13 +52,17 @@ moduleFor(
             `Ember._Legacy${name} has the correct value and does not trigger a deprecation`
           );
 
-          expectDeprecation(() => {
-            assert.strictEqual(
-              Ember[name],
-              value,
-              `Ember.${name} has the correct value triggers a deprecation`
-            );
-          }, `Using Ember.${name} or importing from '${publicPath}' has been deprecated, install the \`ember-legacy-built-in-components\` addon and use \`import { ${name} } from 'ember-legacy-built-in-components';\` instead`);
+          expectDeprecation(
+            () =>
+              assert.strictEqual(
+                Ember[name],
+                value,
+                `Ember.${name} has the correct value triggers a deprecation`
+              ),
+            publicPath === null
+              ? `Using Ember.${name} is deprecated.`
+              : `Using Ember.${name} or importing from '${publicPath}' is deprecated. Install the \`ember-legacy-built-in-components\` addon and use \`import { ${name} } from 'ember-legacy-built-in-components';\` instead.`
+          );
         } catch (error) {
           assert.pushResult({
             result: false,
@@ -336,7 +341,9 @@ let allExports = [
   ['Copyable', '@ember/-internals/runtime'],
   ['MutableEnumerable', '@ember/-internals/runtime'],
   ['MutableArray', '@ember/-internals/runtime'],
-  ['TargetActionSupport', '@ember/-internals/runtime'],
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+    ? null
+    : ['TargetActionSupport', '@ember/-internals/runtime'],
   ['Evented', '@ember/-internals/runtime'],
   ['PromiseProxyMixin', '@ember/-internals/runtime'],
   ['Observable', '@ember/-internals/runtime'],

From 98b70da5c8efd7807e1f640ada5035e8097b28ae Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 8 Feb 2021 21:59:51 -0800
Subject: [PATCH 0392/1405] [FEATURE modernized-built-in-components] Implements
 reopen deopt

Part of #19270
---
 .../-internals/glimmer/lib/component.ts       |  64 +++++++-
 .../glimmer/lib/components/checkbox.ts        |  63 +++++++-
 .../glimmer/lib/components/input.ts           |  67 ++++++---
 .../glimmer/lib/components/text-field.ts      |  62 ++++++++
 .../glimmer/lib/components/textarea.ts        |  62 ++++++++
 .../components/input-angle-test.js            | 139 +++++++++++++++++-
 packages/@ember/-internals/metal/lib/mixin.ts |  17 ++-
 packages/@ember/-internals/runtime/index.d.ts |   1 +
 .../lib/mixins/target_action_support.js       |  47 +++++-
 .../views/lib/mixins/text_support.js          |  44 +++++-
 10 files changed, 541 insertions(+), 25 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 83a3130c338..369b69a94ab 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,6 +1,6 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { TargetActionSupport } from '@ember/-internals/runtime';
+import { CoreObject, TargetActionSupport } from '@ember/-internals/runtime';
 import {
   ActionSupport,
   ChildViewsSupport,
@@ -10,6 +10,7 @@ import {
   ViewMixin,
   ViewStateSupport,
 } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { setInternalComponentManager } from '@glimmer/manager';
@@ -1065,4 +1066,65 @@ Component.reopenClass({
 
 setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
 
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(Component, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(Component, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(this: typeof Component, ...args: unknown[]): unknown {
+      if (this === Component) {
+        deprecate(
+          'Reopening the Ember.Component super class itself is deprecated. ' +
+            'Consider alternatives such as installing event listeners on ' +
+            'the document or add the customizations to specific subclasses.',
+          false,
+          {
+            id: 'ember.component.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        Component._wasReopened = true;
+      }
+
+      return CoreObject.reopen.call(this, ...args);
+    },
+  });
+
+  Object.defineProperty(Component, 'reopenClass', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopenClass(this: typeof Component, ...args: unknown[]): unknown {
+      if (this === Component) {
+        deprecate(
+          'Reopening the Ember.Component super class itself is deprecated. ' +
+            'Consider alternatives such as installing event listeners on ' +
+            'the document or add the customizations to specific subclasses.',
+          false,
+          {
+            id: 'ember.component.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        Component._wasReopened = true;
+      }
+
+      return CoreObject.reopenClass.call(this, ...args);
+    },
+  });
+}
+
 export default Component;
diff --git a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
index 307ef011eb9..31d42f17da2 100644
--- a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
@@ -1,5 +1,7 @@
 import { set } from '@ember/-internals/metal';
-import { assert } from '@ember/debug';
+import { FrameworkObject } from '@ember/-internals/runtime';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import EmberComponent from '../component';
 import layout from '../templates/empty';
@@ -158,4 +160,63 @@ if (DEBUG) {
 
 Checkbox.toString = () => '@ember/component/checkbox';
 
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(Checkbox, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(Checkbox, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(this: typeof Checkbox, ...args: unknown[]): unknown {
+      if (this === Checkbox) {
+        deprecate(
+          'Reopening Ember.Checkbox is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        Checkbox._wasReopened = true;
+      }
+
+      return FrameworkObject.reopen.call(this, ...args);
+    },
+  });
+
+  Object.defineProperty(Checkbox, 'reopenClass', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopenClass(this: typeof Checkbox, ...args: unknown[]): unknown {
+      if (this === Checkbox) {
+        deprecate(
+          'Reopening Ember.Checkbox is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        Checkbox._wasReopened = true;
+      }
+
+      return FrameworkObject.reopenClass.call(this, ...args);
+    },
+  });
+}
+
 export default Checkbox;
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 235f4ba84cc..52361f69bfb 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -4,8 +4,9 @@
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { tracked } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
+import { TargetActionSupport } from '@ember/-internals/runtime';
 import { guidFor } from '@ember/-internals/utils';
-import { jQuery, jQueryDisabled } from '@ember/-internals/views';
+import { jQuery, jQueryDisabled, TextSupport } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate, runInDebug, warn } from '@ember/debug';
 import { JQUERY_INTEGRATION, SEND_ACTION } from '@ember/deprecated-features';
@@ -18,11 +19,15 @@ import {
 } from '@glimmer/manager';
 import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
 import { untrack } from '@glimmer/validator';
+import Component from '../component';
 import InternalManager from '../component-managers/internal';
 import InternalModifier, { InternalModifierManager } from '../modifiers/internal';
 import InputTemplate from '../templates/input';
 import TextareaTemplate from '../templates/textarea';
+import Checkbox from './checkbox';
 import InternalComponent from './internal';
+import TextField from './text-field';
+import TextArea from './textarea';
 
 let isValidInputType: (type: string) => boolean;
 
@@ -309,22 +314,6 @@ class ForkedValue implements Value {
   @public
 */
 abstract class AbstractInput extends InternalComponent {
-  modernized = Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS);
-
-  constructor(owner: Owner, args: Record<string, Reference | undefined>, caller: unknown) {
-    super(owner, args, caller);
-
-    runInDebug(() => {
-      untrack(() => {
-        for (let name in args) {
-          if (!this.isSupportedArgument(name)) {
-            this.onUnsupportedArgument(name);
-          }
-        }
-      });
-    });
-  }
-
   /**
    * The default HTML id attribute. We don't really _need_ one, this is just
    * added for compatibility as it's hard to tell if people rely on it being
@@ -353,6 +342,7 @@ abstract class AbstractInput extends InternalComponent {
     }
   }
 
+  abstract modernized: boolean;
   abstract type: string;
   abstract isCheckbox: boolean;
   abstract isTextarea: boolean;
@@ -477,6 +467,28 @@ class Input extends AbstractInput {
     return 'Input';
   }
 
+  constructor(owner: Owner, args: Record<string, Reference | undefined>, caller: unknown) {
+    super(owner, args, caller);
+
+    runInDebug(() => {
+      untrack(() => {
+        for (let name in args) {
+          if (!this.isSupportedArgument(name)) {
+            this.onUnsupportedArgument(name);
+          }
+        }
+      });
+    });
+  }
+
+  modernized =
+    Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
+    Component._wasReopened === false &&
+    TextField._wasReopened === false &&
+    Checkbox._wasReopened === false &&
+    TextSupport._wasReopened === false &&
+    TargetActionSupport._wasReopened === false;
+
   /**
    * The HTML type attribute.
    */
@@ -522,6 +534,27 @@ class Textarea extends AbstractInput {
     return 'Textarea';
   }
 
+  constructor(owner: Owner, args: Record<string, Reference | undefined>, caller: unknown) {
+    super(owner, args, caller);
+
+    runInDebug(() => {
+      untrack(() => {
+        for (let name in args) {
+          if (!this.isSupportedArgument(name)) {
+            this.onUnsupportedArgument(name);
+          }
+        }
+      });
+    });
+  }
+
+  modernized =
+    Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
+    Component._wasReopened === false &&
+    TextArea._wasReopened === false &&
+    TextSupport._wasReopened === false &&
+    TargetActionSupport._wasReopened === false;
+
   get type(): never {
     throw assert(`[BUG] type getter should never be called on <Textarea />`);
   }
diff --git a/packages/@ember/-internals/glimmer/lib/components/text-field.ts b/packages/@ember/-internals/glimmer/lib/components/text-field.ts
index 3b2e340e7e6..1db0db7bf3f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/text-field.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/text-field.ts
@@ -3,7 +3,10 @@
 */
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { computed } from '@ember/-internals/metal';
+import { CoreObject } from '@ember/-internals/runtime';
 import { TextSupport } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
 import Component from '../component';
 import layout from '../templates/empty';
 
@@ -201,4 +204,63 @@ const TextField = Component.extend(TextSupport, {
 
 TextField.toString = () => '@ember/component/text-field';
 
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(TextField, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(TextField, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(this: typeof TextField, ...args: unknown[]): unknown {
+      if (this === TextField) {
+        deprecate(
+          'Reopening Ember.TextField is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        TextField._wasReopened = true;
+      }
+
+      return CoreObject.reopen.call(this, ...args);
+    },
+  });
+
+  Object.defineProperty(TextField, 'reopenClass', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopenClass(this: typeof TextField, ...args: unknown[]): unknown {
+      if (this === TextField) {
+        deprecate(
+          'Reopening Ember.TextField is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        TextField._wasReopened = true;
+      }
+
+      return CoreObject.reopenClass.call(this, ...args);
+    },
+  });
+}
+
 export default TextField;
diff --git a/packages/@ember/-internals/glimmer/lib/components/textarea.ts b/packages/@ember/-internals/glimmer/lib/components/textarea.ts
index a9e300d1ae9..750280c9f59 100644
--- a/packages/@ember/-internals/glimmer/lib/components/textarea.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/textarea.ts
@@ -1,7 +1,10 @@
 /**
 @module @ember/component
 */
+import { CoreObject } from '@ember/-internals/runtime';
 import { TextSupport } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
 import Component from '../component';
 import layout from '../templates/empty';
 
@@ -161,4 +164,63 @@ const TextArea = Component.extend(TextSupport, {
 
 TextArea.toString = () => '@ember/component/text-area';
 
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(TextArea, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(TextArea, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(this: typeof TextArea, ...args: unknown[]): unknown {
+      if (this === TextArea) {
+        deprecate(
+          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        TextArea._wasReopened = true;
+      }
+
+      return CoreObject.reopen.call(this, ...args);
+    },
+  });
+
+  Object.defineProperty(TextArea, 'reopenClass', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopenClass(this: typeof TextArea, ...args: unknown[]): unknown {
+      if (this === TextArea) {
+        deprecate(
+          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        TextArea._wasReopened = true;
+      }
+
+      return CoreObject.reopenClass.call(this, ...args);
+    },
+  });
+}
+
 export default TextArea;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index f0060e6fb64..76074fc7df1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,10 +1,11 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-
 import { action } from '@ember/object';
 import { assign } from '@ember/polyfills';
+import { Checkbox, TextArea, TextField } from '@ember/-internals/glimmer';
 import { set } from '@ember/-internals/metal';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
+import { TargetActionSupport } from '@ember/-internals/runtime';
+import { getElementView, jQueryDisabled, jQuery, TextSupport } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
 
@@ -1413,3 +1414,137 @@ function InputAttributesTest(attrs) {
     }
   );
 });
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  [
+    ['Ember.Component', Component, true, true],
+    ['Ember.Checkbox', Checkbox, true, false],
+    ['Ember.TextArea', TextArea, false, true],
+    ['Ember.TextField', TextField, true, false],
+    ['Ember.TextSupport', TextSupport, true, true],
+    ['Ember.TargetActionSupport', TargetActionSupport, true, true],
+  ].forEach(([label, ClassOrMixin, shouldDeoptInput, shouldDeoptTextArea]) => {
+    let message =
+      ClassOrMixin === Component
+        ? /Reopening the Ember\.Component super class itself is deprecated\./
+        : new RegExp(`Reopening ${label.replace(/\./g, '\\.')} is deprecated\\.`);
+
+    class DeoptTest extends RenderingTestCase {
+      constructor() {
+        super(...arguments);
+        this.assertDidNotReopen();
+      }
+
+      teardown() {
+        super.teardown();
+        ClassOrMixin._wasReopened = false;
+      }
+
+      assertDidReopen() {
+        this.assert.strictEqual(ClassOrMixin._wasReopened, true, `${label} was marked as reopened`);
+      }
+
+      assertDidNotReopen() {
+        this.assert.strictEqual(
+          ClassOrMixin._wasReopened,
+          false,
+          `${label} was not marked as reopened`
+        );
+      }
+
+      assertDeopt(
+        _shouldDeoptInput = shouldDeoptInput,
+        _shouldDeoptTextArea = shouldDeoptTextArea
+      ) {
+        this.render(`
+          <Input id="test-textbox" @value="hello" />
+          <Input id="test-checkbox" @type="checkbox" @checked={{true}} />
+          <Textarea id="test-textarea" @value="hello world" />
+        `);
+
+        let textbox = this.$('#test-textbox')[0];
+        let checkbox = this.$('#test-checkbox')[0];
+        let textarea = this.$('#test-textarea')[0];
+
+        this.assert.ok(textbox, 'a textbox was rendered');
+        this.assert.ok(checkbox, 'a checkbox was rendered');
+        this.assert.ok(textarea, 'a textarea was rendered');
+
+        this.assert.strictEqual(
+          this.isDeopted(textbox),
+          _shouldDeoptInput,
+          `<Input @type="text" /> ${_shouldDeoptInput ? 'was' : 'was not'} deopted`
+        );
+
+        this.assert.strictEqual(
+          this.isDeopted(checkbox),
+          _shouldDeoptInput,
+          `<Input @type="checkbox" /> ${_shouldDeoptInput ? 'was' : 'was not'} deopted`
+        );
+
+        this.assert.strictEqual(
+          this.isDeopted(textarea),
+          _shouldDeoptTextArea,
+          `<Textarea /> ${_shouldDeoptTextArea ? 'was' : 'was not'} deopted`
+        );
+      }
+
+      isDeopted(element) {
+        return getElementView(element) !== null;
+      }
+
+      [`@test ${label}.reopen()`]() {
+        expectDeprecation(
+          () =>
+            ClassOrMixin.reopen({
+              /* noop */
+            }),
+          message
+        );
+
+        this.assertDidReopen();
+        this.assertDeopt();
+      }
+    }
+
+    if (typeof ClassOrMixin.extend === 'function') {
+      DeoptTest.prototype[`@test ${label}.extend().reopen()`] = function () {
+        ClassOrMixin.extend().reopen({
+          /* noop */
+        });
+
+        this.assertDidNotReopen();
+        this.assertDeopt(false, false);
+      };
+    }
+
+    if (typeof ClassOrMixin.reopenClass === 'function') {
+      DeoptTest.prototype[`@test ${label}.reopenClass()`] = function () {
+        expectDeprecation(
+          () =>
+            ClassOrMixin.reopenClass({
+              /* noop */
+            }),
+          message
+        );
+
+        this.assertDidReopen();
+        this.assertDeopt();
+      };
+
+      DeoptTest.prototype[`@test ${label}.extend().reopenClass()`] = function () {
+        ClassOrMixin.extend().reopenClass({
+          /* noop */
+        });
+
+        this.assertDidNotReopen();
+        this.assertDeopt(false, false);
+      };
+    }
+
+    moduleFor(
+      `Components test: [DEPRECATED] <Input /> and <Textarea /> deopt (${label})`,
+      DeoptTest
+    );
+  });
+}
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index c3e98de5df1..c52c31e6640 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -11,6 +11,7 @@ import {
   setObservers,
   wrap,
 } from '@ember/-internals/utils';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
 import { ALIAS_METHOD } from '@ember/deprecated-features';
 import { assign } from '@ember/polyfills';
@@ -560,6 +561,8 @@ const MIXINS = new _WeakSet();
   @public
 */
 export default class Mixin {
+  declare static _disableDebugSeal?: boolean;
+
   mixins: Mixin[] | undefined;
   properties: { [key: string]: any } | undefined;
   ownerConstructor: any;
@@ -581,7 +584,10 @@ export default class Mixin {
         weak maps in `guidFor`, so we need to prime the guid cache weak map.
       */
       guidFor(this);
-      Object.seal(this);
+
+      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS && Mixin._disableDebugSeal !== true) {
+        Object.seal(this);
+      }
     }
   }
 
@@ -693,6 +699,15 @@ export default class Mixin {
   }
 }
 
+if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(Mixin, '_disableDebugSeal', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+}
+
 function buildMixinsArray(mixins: MixinLike[] | undefined): Mixin[] | undefined {
   let length = (mixins && mixins.length) || 0;
   let m: Mixin[] | undefined = undefined;
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index b3a044c855c..9b80d3da7d7 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -10,6 +10,7 @@ export function deprecatingAlias(
   }
 ): any;
 
+export const CoreObject: any;
 export const FrameworkObject: any;
 export const Object: any;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
index 963328915c1..6c46433fa6c 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
@@ -4,7 +4,14 @@
 
 import { context } from '@ember/-internals/environment';
 import { get, Mixin, computed } from '@ember/-internals/metal';
-import { assert } from '@ember/debug';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, deprecate } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+
+if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Mixin._disableDebugSeal = true;
+}
+
 /**
 `Ember.TargetActionSupport` is a mixin that can be included in a class
 to add a `triggerAction` method with semantics similar to the Handlebars
@@ -17,7 +24,7 @@ doing more complex event handling in Components.
 @extends Mixin
 @private
 */
-export default Mixin.create({
+const TargetActionSupport = Mixin.create({
   target: null,
   action: null,
   actionContext: null,
@@ -145,3 +152,39 @@ function getTarget(instance) {
 
   return null;
 }
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(TargetActionSupport, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(TargetActionSupport, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(...args) {
+      if (this === TargetActionSupport) {
+        deprecate('Reopening Ember.TargetActionSupport is deprecated.', false, {
+          id: 'ember.built-in-components.reopen',
+          for: 'ember-source',
+          since: {},
+          until: '4.0.0',
+        });
+
+        TargetActionSupport._wasReopened = true;
+      }
+
+      return Mixin.prototype.reopen.call(this, ...args);
+    },
+  });
+
+  if (DEBUG) {
+    Object.seal(TargetActionSupport);
+    Mixin._disableDebugSeal = false;
+  }
+}
+
+export default TargetActionSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index bac7b4a481e..e7e8b197a17 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -3,9 +3,15 @@
 */
 
 import { get, set, Mixin } from '@ember/-internals/metal';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { deprecate } from '@ember/debug';
 import { SEND_ACTION } from '@ember/deprecated-features';
 import { MUTABLE_CELL } from '@ember/-internals/views';
+import { DEBUG } from '@glimmer/env';
+
+if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Mixin._disableDebugSeal = true;
+}
 
 const KEY_EVENTS = {
   Enter: 'insertNewline',
@@ -112,7 +118,7 @@ const KEY_EVENTS = {
   @extends Mixin
   @private
 */
-export default Mixin.create({
+const TextSupport = Mixin.create({
   value: '',
 
   attributeBindings: [
@@ -341,3 +347,39 @@ function sendAction(eventName, view, event) {
     event.stopPropagation();
   }
 }
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(TextSupport, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(TextSupport, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(...args) {
+      if (this === TextSupport) {
+        deprecate('Reopening Ember.TextSupport is deprecated.', false, {
+          id: 'ember.built-in-components.reopen',
+          for: 'ember-source',
+          since: {},
+          until: '4.0.0',
+        });
+
+        TextSupport._wasReopened = true;
+      }
+
+      return Mixin.prototype.reopen.call(this, ...args);
+    },
+  });
+
+  if (DEBUG) {
+    Object.seal(TextSupport);
+    Mixin._disableDebugSeal = false;
+  }
+}
+
+export default TextSupport;

From f81ba3ac465395950b60308c82dd0dfab1b1cb9d Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 9 Feb 2021 12:08:36 -0800
Subject: [PATCH 0393/1405] [FEATURE modernized-built-in-components] Support
 `@elementId`

Part of #19270
---
 .../glimmer/lib/components/input.ts           | 97 +++++++++----------
 .../glimmer/lib/templates/input.hbs           | 74 +++++++-------
 .../glimmer/lib/templates/textarea.hbs        | 48 ++++-----
 .../components/input-angle-test.js            | 33 ++++---
 .../components/input-curly-test.js            | 43 +++++---
 .../components/textarea-angle-test.js         |  9 ++
 .../components/textarea-curly-test.js         |  9 ++
 7 files changed, 179 insertions(+), 134 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 52361f69bfb..4aabde97da8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -596,6 +596,17 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
 
   // Attribute bindings
   {
+    let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
+      if (target) {
+        return (
+          Object.getOwnPropertyDescriptor(target, property) ||
+          descriptorFor(Object.getPrototypeOf(target), property)
+        );
+      } else {
+        return null;
+      }
+    };
+
     let defineGetterForDeprecatedAttributeBinding = (
       component: typeof AbstractInput,
       attribute: string,
@@ -605,11 +616,6 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       let curlyName = name.toLowerCase();
       let { prototype } = component;
 
-      assert(
-        `[BUG] There is already a getter for _${argument} on ${name}`,
-        !(`_${argument}` in prototype)
-      );
-
       let superIsSupportedArgument = prototype['isSupportedArgument'];
 
       prototype['isSupportedArgument'] = function isSupportedArgument(
@@ -619,65 +625,53 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         return (this.modernized && name === argument) || superIsSupportedArgument.call(this, name);
       };
 
-      Object.defineProperty(prototype, `_${argument}`, {
-        get(this: AbstractInput): unknown {
-          deprecate(
-            `Passing the \`@${argument}\` argument to <${name}> is deprecated. ` +
-              `Instead, please pass the attribute directly, i.e. \`<${name} ${attribute}={{...}} />\` ` +
-              `instead of \`<${name} @${argument}={{...}} />\` or \`{{${curlyName} ${argument}=...}}\`.`,
-            !(argument in this.args),
-            {
-              id: 'ember.built-in-components.legacy-attribute-arguments',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-            }
-          );
-
-          return this.arg(argument);
-        },
-      });
-
-      let target = prototype;
-      let descriptor: PropertyDescriptor | undefined;
-
-      while (target && !(descriptor = Object.getOwnPropertyDescriptor(target, argument))) {
-        target = Object.getPrototypeOf(target);
-      }
-
-      if (descriptor) {
-        const superGetter = descriptor.get;
+      let superDescriptor = descriptorFor(prototype, attribute);
+      let superGetter: (this: AbstractInput) => unknown = () => undefined;
 
+      if (superDescriptor) {
         assert(
-          `Expecting ${argument} to be a getter on <${name}>`,
-          typeof superGetter === 'function'
+          `Expecting ${attribute} to be a getter on <${name}>`,
+          typeof superDescriptor.get === 'function'
         );
 
-        Object.defineProperty(prototype, argument, {
-          ...descriptor,
-          get(this: AbstractInput): unknown {
-            // The `class` attribute is concatenated/merged instead of clobbered
-            if (attribute === 'class' && argument in this.args) {
-              let arg = this[`_${argument}`];
+        superGetter = superDescriptor.get;
+      }
 
-              if (arg) {
-                return `${superGetter.call(this)} ${this[`_${argument}`]}`;
-              } else {
-                return superGetter.call(this);
+      Object.defineProperty(prototype, attribute, {
+        configurable: true,
+        enumerable: true,
+        get(this: AbstractInput): unknown {
+          if (argument in this.args) {
+            deprecate(
+              `Passing the \`@${argument}\` argument to <${name}> is deprecated. ` +
+                `Instead, please pass the attribute directly, i.e. \`<${name} ${attribute}={{...}} />\` ` +
+                `instead of \`<${name} @${argument}={{...}} />\` or \`{{${curlyName} ${argument}=...}}\`.`,
+              false,
+              {
+                id: 'ember.built-in-components.legacy-attribute-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
               }
-            } else if (argument in this.args) {
-              return this[`_${argument}`];
+            );
+
+            // The `class` attribute is concatenated/merged instead of clobbered
+            if (attribute === 'class' && superDescriptor) {
+              return `${superGetter.call(this)} ${this.arg(argument)}`;
             } else {
-              return superGetter.call(this);
+              return this.arg(argument);
             }
-          },
-        });
-      }
+          } else {
+            return superGetter.call(this);
+          }
+        },
+      });
     };
 
     let deprecatedInputAttributeBindings: Array<string | [string, string]> = [
       // Component
       'id',
+      ['id', 'elementId'],
       'class',
       ['class', 'classNames'],
       ['role', 'ariaRole'],
@@ -736,6 +730,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     let deprecatedTextareaAttributeBindings: Array<string | [string, string]> = [
       // Component
       'id',
+      ['id', 'elementId'],
       'class',
       ['class', 'classNames'],
       ['role', 'ariaRole'],
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index 6800489fb56..a9f16a6e2a8 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -5,43 +5,43 @@
     class={{this.class}}
 
     {{!-- deprecated attribute bindings --}}
-    role={{this._ariaRole}}
-    autocapitalize={{this._autocapitalize}}
-    autocorrect={{this._autocorrect}}
-    autofocus={{this._autofocus}}
-    disabled={{this._disabled}}
-    form={{this._form}}
-    maxlength={{this._maxlength}}
-    minlength={{this._minlength}}
-    placeholder={{this._placeholder}}
-    readonly={{this._readonly}}
-    required={{this._required}}
-    selectionDirection={{this._selectionDirection}}
-    spellcheck={{this._spellcheck}}
-    tabindex={{this._tabindex}}
-    title={{this._title}}
-    accept={{this._accept}}
-    autocomplete={{this._autocomplete}}
-    autosave={{this._autosave}}
-    dir={{this._dir}}
-    formaction={{this._formaction}}
-    formenctype={{this._formenctype}}
-    formmethod={{this._formmethod}}
-    formnovalidate={{this._formnovalidate}}
-    formtarget={{this._formtarget}}
-    height={{this._height}}
-    inputmode={{this._inputmode}}
-    lang={{this._lang}}
-    list={{this._list}}
-    max={{this._max}}
-    min={{this._min}}
-    multiple={{this._multiple}}
-    name={{this._name}}
-    pattern={{this._pattern}}
-    size={{this._size}}
-    step={{this._step}}
-    width={{this._width}}
-    indeterminate={{this._indeterminate}}
+    role={{this.role}}
+    autocapitalize={{this.autocapitalize}}
+    autocorrect={{this.autocorrect}}
+    autofocus={{this.autofocus}}
+    disabled={{this.disabled}}
+    form={{this.form}}
+    maxlength={{this.maxlength}}
+    minlength={{this.minlength}}
+    placeholder={{this.placeholder}}
+    readonly={{this.readonly}}
+    required={{this.required}}
+    selectionDirection={{this.selectionDirection}}
+    spellcheck={{this.spellcheck}}
+    tabindex={{this.tabindex}}
+    title={{this.title}}
+    accept={{this.accept}}
+    autocomplete={{this.autocomplete}}
+    autosave={{this.autosave}}
+    dir={{this.dir}}
+    formaction={{this.formaction}}
+    formenctype={{this.formenctype}}
+    formmethod={{this.formmethod}}
+    formnovalidate={{this.formnovalidate}}
+    formtarget={{this.formtarget}}
+    height={{this.height}}
+    inputmode={{this.inputmode}}
+    lang={{this.lang}}
+    list={{this.list}}
+    max={{this.max}}
+    min={{this.min}}
+    multiple={{this.multiple}}
+    name={{this.name}}
+    pattern={{this.pattern}}
+    size={{this.size}}
+    step={{this.step}}
+    width={{this.width}}
+    indeterminate={{this.indeterminate}}
 
     ...attributes
 
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
index ef884136b36..aa101f4e21e 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
@@ -5,30 +5,30 @@
     class={{this.class}}
 
     {{!-- deprecated attribute bindings --}}
-    role={{this._ariaRole}}
-    autocapitalize={{this._autocapitalize}}
-    autocorrect={{this._autocorrect}}
-    autofocus={{this._autofocus}}
-    disabled={{this._disabled}}
-    form={{this._form}}
-    maxlength={{this._maxlength}}
-    minlength={{this._minlength}}
-    placeholder={{this._placeholder}}
-    readonly={{this._readonly}}
-    required={{this._required}}
-    selectionDirection={{this._selectionDirection}}
-    spellcheck={{this._spellcheck}}
-    tabindex={{this._tabindex}}
-    title={{this._title}}
-    rows={{this._rows}}
-    cols={{this._cols}}
-    name={{this._name}}
-    selectionEnd={{this._selectionEnd}}
-    selectionStart={{this._selectionStart}}
-    autocomplete={{this._autocomplete}}
-    wrap={{this._wrap}}
-    lang={{this._lang}}
-    dir={{this._dir}}
+    role={{this.role}}
+    autocapitalize={{this.autocapitalize}}
+    autocorrect={{this.autocorrect}}
+    autofocus={{this.autofocus}}
+    disabled={{this.disabled}}
+    form={{this.form}}
+    maxlength={{this.maxlength}}
+    minlength={{this.minlength}}
+    placeholder={{this.placeholder}}
+    readonly={{this.readonly}}
+    required={{this.required}}
+    selectionDirection={{this.selectionDirection}}
+    spellcheck={{this.spellcheck}}
+    tabindex={{this.tabindex}}
+    title={{this.title}}
+    rows={{this.rows}}
+    cols={{this.cols}}
+    name={{this.name}}
+    selectionEnd={{this.selectionEnd}}
+    selectionStart={{this.selectionStart}}
+    autocomplete={{this.autocomplete}}
+    wrap={{this.wrap}}
+    lang={{this.lang}}
+    dir={{this.dir}}
 
     ...attributes
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 76074fc7df1..ce985f8ec91 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -320,6 +320,7 @@ moduleFor(
         () => {
           this.render(
             `<Input @type="text" @value={{this.value}}
+              @elementId="test-input"
               @ariaRole={{this.role}}
               @disabled={{this.disabled}}
               @placeholder={{this.placeholder}}
@@ -341,12 +342,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -359,6 +361,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -381,12 +384,13 @@ moduleFor(
             // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
@@ -409,12 +413,13 @@ moduleFor(
             // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -427,6 +432,7 @@ moduleFor(
     ['@test static attributes (HTML attribute)']() {
       this.render(`
       <Input @type="text" @value="Original value"
+        id="test-input"
         role="search"
         disabled="disabled"
         placeholder="Original placeholder"
@@ -439,6 +445,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -451,6 +458,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -465,6 +473,7 @@ moduleFor(
         () => {
           this.render(
             `<Input @type="text" @value="Original value"
+              @elementId="test-input"
               @ariaRole="search"
               @disabled={{true}}
               @placeholder="Original placeholder"
@@ -475,12 +484,13 @@ moduleFor(
               @tabindex={{30}}/>`
           );
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -493,6 +503,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -1000,7 +1011,7 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1027,7 +1038,7 @@ moduleFor(
             set(this.context, 'tabindex', 11);
           });
         },
-        /Passing the `@(ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1046,7 +1057,7 @@ moduleFor(
             set(this.context, 'tabindex', 10);
           });
         },
-        /Passing the `@(ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1147,7 +1158,7 @@ moduleFor(
             `<Input @type="checkbox" @checked={{false}} @ariaRole="radio" @disabled={{false}} @tabindex={{10}} @name="original-name" />`
           );
         },
-        /Passing the `@(ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1278,7 +1289,7 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1303,7 +1314,7 @@ moduleFor(
             set(this.context, 'tabindex', 31);
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
@@ -1329,7 +1340,7 @@ moduleFor(
             set(this.context, 'tabindex', null);
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 1b4852b7e92..82da229d672 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -187,6 +187,7 @@ moduleFor(
           this.render(
             `
             {{input type="text"
+              elementId="test-input"
               ariaRole=this.role
               disabled=this.disabled
               value=this.value
@@ -210,12 +211,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -228,6 +230,7 @@ moduleFor(
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -250,12 +253,13 @@ moduleFor(
             // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
@@ -278,12 +282,13 @@ moduleFor(
             // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertNotDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'textbox');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -298,6 +303,7 @@ moduleFor(
         () => {
           this.render(`
             {{input type="text"
+              elementId="test-input"
               ariaRole="search"
               disabled=true
               value="Original value"
@@ -309,12 +315,13 @@ moduleFor(
               tabindex=30
             }}`);
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -327,6 +334,7 @@ moduleFor(
 
       this.assertDisabled();
       this.assertValue('Original value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Original placeholder');
       this.assertAttr('name', 'original-name');
@@ -758,6 +766,7 @@ moduleFor(
           this.render(
             `{{input
               type='checkbox'
+              elementId="test-input"
               ariaRole=this.role
               disabled=this.disabled
               name=this.name
@@ -773,12 +782,13 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'radio');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
@@ -787,6 +797,7 @@ moduleFor(
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'radio');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
@@ -800,12 +811,13 @@ moduleFor(
             set(this.context, 'tabindex', 11);
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertDisabled();
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'checkbox');
       this.assertAttr('name', 'updated-name');
       this.assertAttr('tabindex', '11');
@@ -819,12 +831,13 @@ moduleFor(
             set(this.context, 'tabindex', 10);
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertNotDisabled();
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'radio');
       this.assertAttr('name', 'original-name');
       this.assertAttr('tabindex', '10');
@@ -897,6 +910,7 @@ moduleFor(
         () => {
           this.render(
             `{{input type="checkbox"
+              elementId="test-input"
               ariaRole="radio"
               disabled=false
               tabindex=10
@@ -904,13 +918,14 @@ moduleFor(
               checked=false}}`
           );
         },
-        /Passing the `@(ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
@@ -920,6 +935,7 @@ moduleFor(
       this.assertSingleCheckbox();
       this.assertCheckboxIsNotChecked();
       this.assertNotDisabled();
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'radio');
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
@@ -941,6 +957,7 @@ moduleFor(
         () => {
           this.render(
             `{{input type="text"
+              elementId="test-input"
               ariaRole=this.role
               disabled=this.disabled
               value=this.value
@@ -961,16 +978,18 @@ moduleFor(
             }
           );
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertValue('');
+      this.assertAttr('id', 'test-input');
       this.assertAllAttrs(attributes, undefined);
 
       runTask(() => this.rerender());
 
       this.assertValue('');
+      this.assertAttr('id', 'test-input');
       this.assertAllAttrs(attributes, undefined);
 
       expectDeprecation(
@@ -986,12 +1005,13 @@ moduleFor(
             set(this.context, 'tabindex', 31);
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertDisabled();
       this.assertValue('Updated value');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', 'search');
       this.assertAttr('placeholder', 'Updated placeholder');
       this.assertAttr('name', 'updated-name');
@@ -1012,12 +1032,13 @@ moduleFor(
             set(this.context, 'tabindex', null);
           });
         },
-        /Passing the `@(ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
+        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
         EMBER_MODERNIZED_BUILT_IN_COMPONENTS
       );
 
       this.assertAttr('disabled', undefined);
       this.assertValue('');
+      this.assertAttr('id', 'test-input');
       this.assertAttr('role', undefined);
       // this.assertAttr('placeholder', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
       // this.assertAttr('name', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index ab409e9d5f9..a66cfbc03a3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -112,6 +112,15 @@ moduleFor(
       this.assertStableRerender();
     }
 
+    ['@test [DEPRECATED] Supports @elementId (named argument)'](assert) {
+      expectDeprecation(
+        () => this.render('<Textarea @elementId="test-textarea" />'),
+        /Passing the `@elementId` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+      assert.equal(this.$('textarea').attr('id'), 'test-textarea');
+    }
+
     ['@test Should respect disabled (HTML attribute)'](assert) {
       this.render('<Textarea disabled={{this.disabled}} />', {
         disabled: true,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 339816d2447..2dc9a9d78f1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -91,6 +91,15 @@ moduleFor(
       this.assertStableRerender();
     }
 
+    ['@test [DEPRECATED] Supports elementId'](assert) {
+      expectDeprecation(
+        () => this.render('{{textarea elementId="test-textarea"}}'),
+        /Passing the `@elementId` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+      assert.equal(this.$('textarea').attr('id'), 'test-textarea');
+    }
+
     ['@test [DEPRECATED] Should respect disabled'](assert) {
       expectDeprecation(
         () => this.render('{{textarea disabled=this.disabled}}', { disabled: true }),

From b9d999b2ba972e58b3c01c862cc931c1dc2634ba Mon Sep 17 00:00:00 2001
From: Dianne Eramo <dianne.eramo@gmail.com>
Date: Tue, 9 Feb 2021 12:47:12 -0800
Subject: [PATCH 0394/1405] [FEATURE modernized-built-in-components] deprecate
 input/textarea event handlers

Tracking issue: #19270
Enables the input and textarea  event handlers deprecation introduced in #19218
and fixes resultant failing tests
---
 .../glimmer/lib/components/input.ts           |   4 +-
 .../components/input-angle-test.js            | 160 +++++++++++-------
 .../components/input-curly-test.js            | 153 +++++++++++------
 .../components/textarea-angle-test.js         |  16 +-
 .../components/textarea-curly-test.js         |  16 +-
 5 files changed, 224 insertions(+), 125 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 4aabde97da8..cb1e899ef1a 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -901,7 +901,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               `the <${name}> component and prevented it from functioning properly. ` +
               `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
               `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
-            true, // !(methodName in this),
+            !(methodName in this),
             {
               id: 'ember.built-in-components.legacy-attribute-arguments',
               for: 'ember-source',
@@ -914,7 +914,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
             `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
               `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
               `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
-            true, // methodName in this,
+            methodName in this,
             {
               id: 'ember.built-in-components.legacy-attribute-arguments',
               for: 'ember-source',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index ce985f8ec91..35b3362de0a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -145,7 +145,13 @@ class InputRenderingTest extends RenderingTestCase {
       <TestComponent ${argsFor('custom')} />
     `;
 
-    this.render(template, { actions });
+    expectDeprecation(
+      () => {
+        this.render(template, { actions });
+      },
+      /Passing the `@(touchStart|touchMove|touchEnd|touchCancel|keyDown|keyUp|keyPress|mouseDown|mouseUp|contextMenu|click|doubleClick|focusIn|focusOut|submit|input|change|dragStart|drag|dragEnter|dragLeave|dragOver|drop|dragEnd|mouseEnter|mouseLeave|mouseMove|focus-in|focus-out|key-press|key-up|key-down)` argument to <Input> is deprecated\./,
+      EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+    );
 
     this.assert.ok(this.$('input').length === 2);
 
@@ -615,7 +621,7 @@ moduleFor(
             },
           },
         });
-      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
+      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\.|Passing the `@key-press` argument to <Input> is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keypress', { key: 'A' });
@@ -623,24 +629,33 @@ moduleFor(
     }
 
     ['@test sends an action with `<Input @key-press={{action "foo"}} />` is pressed'](assert) {
-      assert.expect(2);
-
-      this.render(`<Input @value={{this.value}} @key-press={{action 'foo'}} />`, {
-        value: 'initial',
+      let triggered = 0;
 
-        actions: {
-          foo(value, event) {
-            assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
-          },
+      expectDeprecation(
+        () => {
+          this.render(`<Input @value={{this.value}} @key-press={{action 'foo'}} />`, {
+            value: 'initial',
+
+            actions: {
+              foo(value, event) {
+                triggered++;
+                assert.ok(true, 'action was triggered');
+                if (jQueryDisabled) {
+                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
+                } else {
+                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
+                }
+              },
+            },
+          });
         },
-      });
+        /Passing the `@key-press` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keypress', { key: 'A' });
+
+      assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
     ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
@@ -668,16 +683,22 @@ moduleFor(
       assert.strictEqual(bubbled, 1, 'bubbled upwards');
     }
 
-    ['@test triggers `focus-in` when focused'](assert) {
+    ['@test [DEPRECATED] triggers `focus-in` when focused'](assert) {
       let wasFocused = false;
 
-      this.render(`<Input @focus-in={{action 'foo'}} />`, {
-        actions: {
-          foo() {
-            wasFocused = true;
-          },
+      expectDeprecation(
+        () => {
+          this.render(`<Input @focus-in={{action 'foo'}} />`, {
+            actions: {
+              foo() {
+                wasFocused = true;
+              },
+            },
+          });
         },
-      });
+        /Passing the `@focus-in` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       runTask(() => {
         this.$input().focus();
@@ -771,32 +792,41 @@ moduleFor(
             },
           },
         });
-      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\./);
+      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\.|Passing the `@key-down` argument to <Input> is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keydown', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`).');
     }
 
-    ['@test sends an action with `<Input @key-down={{action "foo"}} />` when a key is pressed'](
+    ['@test [DEPRECATED] sends an action with `<Input @key-down={{action "foo"}} />` when a key is pressed'](
       assert
     ) {
-      assert.expect(2);
+      let triggered = 0;
 
-      this.render(`<Input @key-down={{action 'foo'}} />`, {
-        actions: {
-          foo(value, event) {
-            assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
-          },
+      expectDeprecation(
+        () => {
+          this.render(`<Input @key-down={{action 'foo'}} />`, {
+            actions: {
+              foo(value, event) {
+                triggered++;
+                assert.ok(true, 'action was triggered');
+                if (jQueryDisabled) {
+                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
+                } else {
+                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
+                }
+              },
+            },
+          });
         },
-      });
+        /Passing the `@key-down` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keydown', { key: 'A' });
+
+      assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
     ['@test [DEPRECATED] sends an action with `<Input @key-up="foo" />` when a key is pressed'](
@@ -817,31 +847,41 @@ moduleFor(
             },
           },
         });
-      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\./);
+      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\.|Passing the `@key-up` argument to <Input> is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keyup', { key: 'A' });
       }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`).');
     }
 
-    ['@test sends an action with `<Input @key-up={{action "foo"}} />` when a key is pressed'](
+    ['@test [DEPRECATED] sends an action with `<Input @key-up={{action "foo"}} />` when a key is pressed'](
       assert
     ) {
-      assert.expect(2);
+      let triggered = 0;
 
-      this.render(`<Input @key-up={{action 'foo'}} />`, {
-        actions: {
-          foo(value, event) {
-            assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
-          },
+      expectDeprecation(
+        () => {
+          this.render(`<Input @key-up={{action 'foo'}} />`, {
+            actions: {
+              foo(value, event) {
+                triggered++;
+                assert.ok(true, 'action was triggered');
+                if (jQueryDisabled) {
+                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
+                } else {
+                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
+                }
+              },
+            },
+          });
         },
-      });
+        /Passing the `@key-up` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
       this.triggerEvent('keyup', { key: 'A' });
+
+      assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
     ['@test GH#14727 can render a file input after having had render an input of other type']() {
@@ -855,12 +895,18 @@ moduleFor(
       this.assertTriggersNativeDOMEvents();
     }
 
-    ['@test triggers a method with `<Input @key-up={{this.didTrigger}} />`'](assert) {
-      this.render(`<Input @key-up={{this.didTrigger}} />`, {
-        didTrigger: action(function () {
-          assert.ok(true, 'action was triggered');
-        }),
-      });
+    ['@test [DEPRECATED] triggers a method with `<Input @key-up={{this.didTrigger}} />`'](assert) {
+      expectDeprecation(
+        () => {
+          this.render(`<Input @key-up={{this.didTrigger}} />`, {
+            didTrigger: action(function () {
+              assert.ok(true, 'action was triggered');
+            }),
+          });
+        },
+        /Passing the `@key-up` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keyup', { key: 'A' });
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 82da229d672..30d51c4e209 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -124,7 +124,13 @@ class InputRenderingTest extends RenderingTestCase {
       .join(' ');
     let template = `{{test-component ${typeAttr}${actionAttrs}}}{{input ${typeAttr}${actionAttrs}}}`;
 
-    this.render(template, { actions });
+    expectDeprecation(
+      () => {
+        this.render(template, { actions });
+      },
+      /Passing the `@(touchStart|touchMove|touchEnd|touchCancel|keyDown|keyUp|keyPress|mouseDown|mouseUp|contextMenu|click|doubleClick|focusIn|focusOut|submit|input|change|dragStart|drag|dragEnter|dragLeave|dragOver|drop|dragEnd|mouseEnter|mouseLeave|mouseMove|focus-in|focus-out|key-press|key-up|key-down)` argument to <Input> is deprecated\./,
+      EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+    );
 
     Object.keys(events).forEach((evt) => this.triggerEvent(evt, null, 'input:first-of-type'));
     let normallyTriggeredEvents = [].concat(triggeredEvents);
@@ -446,7 +452,7 @@ moduleFor(
             },
           },
         });
-      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
+      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\.|Passing the `@key-press` argument to <Input> is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keypress', { key: 'A' });
@@ -454,24 +460,33 @@ moduleFor(
     }
 
     ['@test sends an action with `{{input key-press=(action "foo")}}` is pressed'](assert) {
-      assert.expect(2);
+      let triggered = 0;
 
-      this.render(`{{input value=this.value key-press=(action 'foo')}}`, {
-        value: 'initial',
-
-        actions: {
-          foo(value, event) {
-            assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
-          },
+      expectDeprecation(
+        () => {
+          this.render(`{{input value=this.value key-press=(action 'foo')}}`, {
+            value: 'initial',
+
+            actions: {
+              foo(value, event) {
+                triggered++;
+                assert.ok(true, 'action was triggered');
+                if (jQueryDisabled) {
+                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
+                } else {
+                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
+                }
+              },
+            },
+          });
         },
-      });
+        /Passing the `@key-press` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keypress', { key: 'A' });
+
+      assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
     ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
@@ -502,13 +517,19 @@ moduleFor(
     ['@test triggers `focus-in` when focused'](assert) {
       let wasFocused = false;
 
-      this.render(`{{input focus-in=(action 'foo')}}`, {
-        actions: {
-          foo() {
-            wasFocused = true;
-          },
+      expectDeprecation(
+        () => {
+          this.render(`{{input focus-in=(action 'foo')}}`, {
+            actions: {
+              foo() {
+                wasFocused = true;
+              },
+            },
+          });
         },
-      });
+        /Passing the `@focus-in` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       runTask(() => {
         this.$input().focus();
@@ -602,7 +623,7 @@ moduleFor(
             },
           },
         });
-      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\./);
+      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\.|Passing the `@key-down` argument to <Input> is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keydown', { key: 'A' });
@@ -612,22 +633,31 @@ moduleFor(
     ['@test sends an action with `{{input key-down=(action "foo")}}` when a key is pressed'](
       assert
     ) {
-      assert.expect(2);
+      let triggered = 0;
 
-      this.render(`{{input key-down=(action 'foo')}}`, {
-        actions: {
-          foo(value, event) {
-            assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
-          },
+      expectDeprecation(
+        () => {
+          this.render(`{{input key-down=(action 'foo')}}`, {
+            actions: {
+              foo(value, event) {
+                triggered++;
+                assert.ok(true, 'action was triggered');
+                if (jQueryDisabled) {
+                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
+                } else {
+                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
+                }
+              },
+            },
+          });
         },
-      });
+        /Passing the `@key-down` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keydown', { key: 'A' });
+
+      assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
     ['@test [DEPRECATED] sends an action with `{{input key-up="foo"}}` when a key is pressed'](
@@ -648,7 +678,7 @@ moduleFor(
             },
           },
         });
-      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\./);
+      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\.|Passing the `@key-up` argument to <Input> is deprecated\./);
 
       expectDeprecation(() => {
         this.triggerEvent('keyup', { key: 'A' });
@@ -656,20 +686,25 @@ moduleFor(
     }
 
     ['@test sends an action with `{{input key-up=(action "foo")}}` when a key is pressed'](assert) {
-      assert.expect(2);
-
-      this.render(`{{input key-up=(action 'foo')}}`, {
-        actions: {
-          foo(value, event) {
-            assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
-          },
+      expectDeprecation(
+        () => {
+          this.render(`{{input key-up=(action 'foo')}}`, {
+            actions: {
+              foo(value, event) {
+                assert.ok(true, 'action was triggered');
+                if (jQueryDisabled) {
+                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
+                } else {
+                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
+                }
+              },
+            },
+          });
         },
-      });
+        /Passing the `@key-up` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
       this.triggerEvent('keyup', { key: 'A' });
     }
 
@@ -680,16 +715,22 @@ moduleFor(
       this.assert.equal(this.$input()[1].type, 'file');
     }
 
-    ['@test sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
+    ['@test [DEPRECATED] sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
       this.assertTriggersNativeDOMEvents();
     }
 
     ['@test triggers a method with `{{input key-up=this.didTrigger}}`'](assert) {
-      this.render(`{{input key-up=this.didTrigger}}`, {
-        didTrigger: action(function () {
-          assert.ok(true, 'action was triggered');
-        }),
-      });
+      expectDeprecation(
+        () => {
+          this.render(`{{input key-up=this.didTrigger}}`, {
+            didTrigger: action(function () {
+              assert.ok(true, 'action was triggered');
+            }),
+          });
+        },
+        /Passing the `@key-up` argument to <Input> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keyup', { key: 'A' });
     }
@@ -941,7 +982,7 @@ moduleFor(
       this.assertAttr('name', 'original-name');
     }
 
-    ['@test sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
+    ['@test [DEPRECATED] sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
       this.assertTriggersNativeDOMEvents('checkbox');
     }
   }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index a66cfbc03a3..2d728f7190f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -255,11 +255,17 @@ moduleFor(
     }
 
     ['@test triggers a method with `<Textarea @key-up={{this.didTrigger}} />`'](assert) {
-      this.render(`<Textarea @key-up={{this.didTrigger}} />`, {
-        didTrigger: action(function () {
-          assert.ok(true, 'action was triggered');
-        }),
-      });
+      expectDeprecation(
+        () => {
+          this.render(`<Textarea @key-up={{this.didTrigger}} />`, {
+            didTrigger: action(function () {
+              assert.ok(true, 'action was triggered');
+            }),
+          });
+        },
+        /Passing the `@key-up` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keyup', { key: 'A' });
     }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 2dc9a9d78f1..50aa67adc1b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -205,11 +205,17 @@ moduleFor(
     }
 
     ['@test triggers a method with `{{textarea key-up=this.didTrigger}}`'](assert) {
-      this.render(`{{textarea key-up=this.didTrigger}}`, {
-        didTrigger: action(function () {
-          assert.ok(true, 'action was triggered');
-        }),
-      });
+      expectDeprecation(
+        () => {
+          this.render(`{{textarea key-up=this.didTrigger}}`, {
+            didTrigger: action(function () {
+              assert.ok(true, 'action was triggered');
+            }),
+          });
+        },
+        /Passing the `@key-up` argument to <Textarea> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       this.triggerEvent('keyup', { key: 'A' });
     }

From 06e434e389e63dcbf29d43b3bbb4775755b76cd3 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 11 Feb 2021 03:03:49 -0800
Subject: [PATCH 0395/1405] [FEATURE modernized-built-in-components] Extract
 shared code

Refactor to extra shared code into internal component to pave way
for implementing <LinkTo> with the new infrastructure.

Part of #19270
---
 packages/@ember/-internals/glimmer/index.ts   |   5 +-
 .../lib/component-managers/internal.ts        |  88 --
 .../glimmer/lib/components/-textarea.ts       | 103 ++
 .../glimmer/lib/components/abstract-input.ts  | 321 +++++++
 .../glimmer/lib/components/input.ts           | 900 ++----------------
 .../glimmer/lib/components/internal.ts        | 530 ++++++++++-
 .../glimmer/lib/components/textarea.ts        | 143 ++-
 .../-internals/glimmer/lib/setup-registry.ts  |  17 +-
 .../glimmer/lib/templates/input.hbs           |   2 +-
 .../glimmer/lib/templates/textarea.hbs        |   2 +-
 10 files changed, 1114 insertions(+), 997 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/components/-textarea.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/components/abstract-input.ts

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index d756909be67..c8a801895ed 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -366,9 +366,10 @@ export { templateFactory as template, templateCacheCounters } from '@glimmer/opc
 export { default as RootTemplate } from './lib/templates/root';
 export { default as Checkbox } from './lib/components/checkbox';
 export { default as TextField } from './lib/components/text-field';
-export { default as TextArea } from './lib/components/textarea';
+export { default as TextArea } from './lib/components/-textarea';
 export { default as LinkComponent } from './lib/components/link-to';
-export { default as Input, TextareaComponent as Textarea } from './lib/components/input';
+export { default as Input } from './lib/components/input';
+export { default as Textarea } from './lib/components/textarea';
 export { default as Component } from './lib/component';
 export { default as Helper, helper } from './lib/helper';
 export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts b/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
deleted file mode 100644
index d6636a3ee5e..00000000000
--- a/packages/@ember/-internals/glimmer/lib/component-managers/internal.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { Owner } from '@ember/-internals/owner';
-import { assert } from '@ember/debug';
-import {
-  CapturedNamedArguments,
-  Destroyable,
-  DynamicScope,
-  Environment,
-  InternalComponentCapabilities,
-  InternalComponentManager,
-  VMArguments,
-  WithCreateInstance,
-} from '@glimmer/interfaces';
-import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
-
-const CAPABILITIES: InternalComponentCapabilities = {
-  dynamicLayout: false,
-  dynamicTag: false,
-  prepareArgs: false,
-  createArgs: true,
-  attributeHook: false,
-  elementHook: false,
-  createCaller: true,
-  dynamicScope: false,
-  updateHook: false,
-  createInstance: true,
-  wrapped: false,
-  willDestroy: false,
-  hasSubOwner: false,
-};
-
-export interface InternalComponentState {
-  env: Environment;
-  instance: Destroyable;
-}
-
-export interface EmberInternalComponentConstructor {
-  new (owner: Owner, args: CapturedNamedArguments, caller: unknown): Destroyable;
-}
-
-export default class InternalManager
-  implements
-    InternalComponentManager<InternalComponentState, EmberInternalComponentConstructor>,
-    WithCreateInstance {
-  constructor(private ComponentClass: EmberInternalComponentConstructor, private name: string) {}
-
-  getCapabilities(): InternalComponentCapabilities {
-    return CAPABILITIES;
-  }
-
-  create(
-    owner: Owner,
-    _definition: unknown,
-    args: VMArguments,
-    env: Environment,
-    _dynamicScope: DynamicScope,
-    caller: Reference
-  ): InternalComponentState {
-    assert('caller must be const', isConstRef(caller));
-
-    assert(
-      `The ${this.name} component does not take any positional arguments`,
-      args.positional.length === 0
-    );
-
-    let { ComponentClass } = this;
-    let instance = new ComponentClass(owner, args.named.capture(), valueForRef(caller));
-
-    return { env, instance };
-  }
-
-  didCreate(): void {}
-  didUpdate(): void {}
-
-  didRenderLayout(): void {}
-  didUpdateLayout(): void {}
-
-  getDebugName(): string {
-    return this.name;
-  }
-
-  getSelf({ instance }: InternalComponentState): Reference {
-    return createConstRef(instance, 'this');
-  }
-
-  getDestroyable(state: InternalComponentState): Destroyable {
-    return state.instance;
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/components/-textarea.ts b/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
new file mode 100644
index 00000000000..00473ea09b7
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
@@ -0,0 +1,103 @@
+/**
+@module @ember/component
+*/
+import { CoreObject } from '@ember/-internals/runtime';
+import { TextSupport } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+import Component from '../component';
+import layout from '../templates/empty';
+
+/**
+  The internal representation used for `Textarea` invocations.
+
+  @class TextArea
+  @extends Component
+  @see {Ember.Templates.components.Textarea}
+  @uses Ember.TextSupport
+  @public
+*/
+const TextArea = Component.extend(TextSupport, {
+  classNames: ['ember-text-area'],
+
+  layout,
+
+  tagName: 'textarea',
+  attributeBindings: [
+    'rows',
+    'cols',
+    'name',
+    'selectionEnd',
+    'selectionStart',
+    'autocomplete',
+    'wrap',
+    'lang',
+    'dir',
+    'value',
+  ],
+  rows: null,
+  cols: null,
+});
+
+TextArea.toString = () => '@ember/component/text-area';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(TextArea, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(TextArea, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(this: typeof TextArea, ...args: unknown[]): unknown {
+      if (this === TextArea) {
+        deprecate(
+          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        TextArea._wasReopened = true;
+      }
+
+      return CoreObject.reopen.call(this, ...args);
+    },
+  });
+
+  Object.defineProperty(TextArea, 'reopenClass', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopenClass(this: typeof TextArea, ...args: unknown[]): unknown {
+      if (this === TextArea) {
+        deprecate(
+          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        TextArea._wasReopened = true;
+      }
+
+      return CoreObject.reopenClass.call(this, ...args);
+    },
+  });
+}
+
+export default TextArea;
diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
new file mode 100644
index 00000000000..cc08b53de5e
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -0,0 +1,321 @@
+import { tracked } from '@ember/-internals/metal';
+import { TargetActionSupport } from '@ember/-internals/runtime';
+import { TextSupport } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, deprecate } from '@ember/debug';
+import { JQUERY_INTEGRATION, SEND_ACTION } from '@ember/deprecated-features';
+import { action } from '@ember/object';
+import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
+import Component from '../component';
+import InternalComponent, {
+  DeprecatingInternalComponent,
+  EventListener,
+  handleDeprecatedArguments,
+  handleDeprecatedAttributeArguments,
+  handleDeprecatedEventArguments,
+  InternalComponentConstructor,
+  jQueryEventShim,
+} from './internal';
+
+const UNINITIALIZED: unknown = Object.freeze({});
+
+type VirtualEventListener = (value: string, event: Event) => void;
+
+function elementForEvent(event: Event): HTMLInputElement | HTMLTextAreaElement {
+  assert(
+    '[BUG] event target must be an <input> or <textarea> element',
+    event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement
+  );
+
+  return event.target;
+}
+
+function valueForEvent(event: Event): string {
+  return elementForEvent(event).value;
+}
+
+function devirtualize(callback: VirtualEventListener): EventListener {
+  return (event: Event) => callback(valueForEvent(event), event);
+}
+
+export function valueFrom(reference?: Reference<unknown>): Value {
+  if (reference === undefined) {
+    return new LocalValue(undefined);
+  } else if (isConstRef(reference)) {
+    return new LocalValue(valueForRef(reference));
+  } else if (isUpdatableRef(reference)) {
+    return new UpstreamValue(reference);
+  } else {
+    return new ForkedValue(reference);
+  }
+}
+
+interface Value {
+  get(): unknown;
+  set(value: unknown): void;
+}
+
+class LocalValue implements Value {
+  @tracked private value: unknown;
+
+  constructor(value: unknown) {
+    this.value = value;
+  }
+
+  get(): unknown {
+    return this.value;
+  }
+
+  set(value: unknown): void {
+    this.value = value;
+  }
+}
+
+class UpstreamValue implements Value {
+  constructor(private reference: Reference<unknown>) {}
+
+  get(): unknown {
+    return valueForRef(this.reference);
+  }
+
+  set(value: unknown): void {
+    updateRef(this.reference, value);
+  }
+}
+
+class ForkedValue implements Value {
+  private local?: Value;
+  private upstream: Value;
+
+  private lastUpstreamValue = UNINITIALIZED;
+
+  constructor(reference: Reference<unknown>) {
+    this.upstream = new UpstreamValue(reference);
+  }
+
+  get(): unknown {
+    let upstreamValue = this.upstream.get();
+
+    if (upstreamValue !== this.lastUpstreamValue) {
+      this.lastUpstreamValue = upstreamValue;
+      this.local = new LocalValue(upstreamValue);
+    }
+
+    assert('[BUG] this.local must have been initialized at this point', this.local);
+    return this.local.get();
+  }
+
+  set(value: unknown): void {
+    assert('[BUG] this.local must have been initialized at this point', this.local);
+    this.local.set(value);
+  }
+}
+
+export default abstract class AbstractInput
+  extends InternalComponent
+  implements DeprecatingInternalComponent {
+  modernized = this.shouldModernize();
+
+  protected shouldModernize(): boolean {
+    return (
+      Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
+      Component._wasReopened === false &&
+      TextSupport._wasReopened === false &&
+      TargetActionSupport._wasReopened === false
+    );
+  }
+
+  private _value = valueFrom(this.args.value);
+
+  get value(): unknown {
+    return this._value.get();
+  }
+
+  set value(value: unknown) {
+    this._value.set(value);
+  }
+
+  @action valueDidChange(event: Event): void {
+    this.value = valueForEvent(event);
+  }
+
+  /**
+   * The `change` and `input` actions need to be overridden in the `Input`
+   * subclass. Unfortunately, some ember-source builds currently uses babel
+   * loose mode to transpile its classes. Having the `@action` decorator on the
+   * super class creates a getter on the prototype, and when the subclass
+   * overrides the method, the loose mode transpilation would emit something
+   * like `Subclass.prototype['change'] = function change() { ... }`, which
+   * fails because `prototype['change']` is getter-only/readonly. The correct
+   * solution is to use `Object.defineProperty(prototype, 'change', ...)` but
+   * that requires disabling loose mode. For now, the workaround is to add the
+   * decorator only on the subclass. This is more of a configuration issue on
+   * our own builds and doesn't really affect apps.
+   */
+
+  /* @action */ change(event: Event): void {
+    this.valueDidChange(event);
+  }
+
+  /* @action */ input(event: Event): void {
+    this.valueDidChange(event);
+  }
+
+  @action keyUp(event: KeyboardEvent): void {
+    switch (event.key) {
+      case 'Enter':
+        this.listenerFor('enter')(event);
+        this.listenerFor('insert-newline')(event);
+        break;
+
+      case 'Escape':
+        this.listenerFor('escape-press')(event);
+        break;
+    }
+  }
+
+  protected listenerFor(name: string): EventListener {
+    let listener = super.listenerFor(name);
+
+    if (this.isVirtualEventListener(name, listener)) {
+      return devirtualize(listener);
+    } else {
+      return listener;
+    }
+  }
+
+  protected isVirtualEventListener(
+    name: string,
+    _listener: Function
+  ): _listener is VirtualEventListener {
+    let virtualEvents = ['enter', 'insert-newline', 'escape-press'];
+
+    return virtualEvents.indexOf(name) !== -1;
+  }
+}
+
+export function handleDeprecatedFeatures(
+  target: InternalComponentConstructor<AbstractInput>,
+  attributeBindings: Array<string | [attribute: string, argument: string]>
+): void {
+  if (SEND_ACTION) {
+    let angle = target.toString();
+    let { prototype } = target;
+
+    interface View {
+      send(action: string, ...args: unknown[]): void;
+    }
+
+    let isView = (target: {}): target is View => {
+      return typeof (target as Partial<View>).send === 'function';
+    };
+
+    let superListenerFor = prototype['listenerFor'];
+
+    Object.defineProperty(prototype, 'listenerFor', {
+      configurable: true,
+      enumerable: false,
+      value: function listenerFor(this: AbstractInput, name: string): EventListener {
+        const actionName = this.arg(name);
+
+        if (typeof actionName === 'string') {
+          deprecate(
+            `Passing actions to components as strings (like \`<${angle} @${name}="${actionName}" />\`) is deprecated. ` +
+              `Please use closure actions instead (\`<${angle} @${name}={{action "${actionName}"}} />\`).`,
+            false,
+            {
+              id: 'ember-component.send-action',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+              url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+            }
+          );
+
+          const { caller } = this;
+
+          assert('[BUG] missing caller', caller && typeof caller === 'object');
+
+          let listener: Function;
+
+          if (isView(caller)) {
+            listener = (...args: unknown[]) => caller.send(actionName, ...args);
+          } else {
+            assert(
+              `The action '${actionName}' did not exist on ${caller}`,
+              typeof caller[actionName] === 'function'
+            );
+
+            listener = caller[actionName];
+          }
+
+          let deprecatedListener = (...args: unknown[]) => {
+            deprecate(
+              `Passing actions to components as strings (like \`<${angle} @${name}="${actionName}" />\`) is deprecated. ` +
+                `Please use closure actions instead (\`<${angle} @${name}={{action "${actionName}"}} />\`).`,
+              false,
+              {
+                id: 'ember-component.send-action',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+                url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+              }
+            );
+
+            return listener(...args);
+          };
+
+          if (this.isVirtualEventListener(name, deprecatedListener)) {
+            return devirtualize(deprecatedListener);
+          } else {
+            return deprecatedListener as EventListener;
+          }
+        } else {
+          return superListenerFor.call(this, name);
+        }
+      },
+    });
+  }
+
+  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+    let { prototype } = target;
+
+    let virtualEvents = {
+      focusin: 'focus-in',
+      focusout: 'focus-out',
+      keypress: 'key-press',
+      keyup: 'key-up',
+      keydown: 'key-down',
+    };
+
+    handleDeprecatedArguments(target);
+
+    handleDeprecatedAttributeArguments(target, attributeBindings);
+
+    handleDeprecatedEventArguments(target, Object.entries(virtualEvents));
+
+    {
+      let superIsVirtualEventListener = prototype['isVirtualEventListener'];
+
+      Object.defineProperty(prototype, 'isVirtualEventListener', {
+        configurable: true,
+        enumerable: false,
+        value: function isVirtualEventListener(
+          this: AbstractInput,
+          name: string,
+          listener: Function
+        ): listener is VirtualEventListener {
+          return (
+            Object.values(virtualEvents).indexOf(name) !== -1 ||
+            superIsVirtualEventListener.call(this, name, listener)
+          );
+        },
+      });
+    }
+  }
+
+  if (JQUERY_INTEGRATION) {
+    jQueryEventShim(target);
+  }
+}
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index cb1e899ef1a..b01be4a3793 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -2,32 +2,16 @@
 @module @ember/component
 */
 import { hasDOM } from '@ember/-internals/browser-environment';
-import { tracked } from '@ember/-internals/metal';
-import { Owner } from '@ember/-internals/owner';
-import { TargetActionSupport } from '@ember/-internals/runtime';
-import { guidFor } from '@ember/-internals/utils';
-import { jQuery, jQueryDisabled, TextSupport } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate, runInDebug, warn } from '@ember/debug';
-import { JQUERY_INTEGRATION, SEND_ACTION } from '@ember/deprecated-features';
+import { assert, warn } from '@ember/debug';
 import { action } from '@ember/object';
-import { Maybe, Option } from '@glimmer/interfaces';
-import {
-  setComponentTemplate,
-  setInternalComponentManager,
-  setInternalModifierManager,
-} from '@glimmer/manager';
-import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
+import { valueForRef } from '@glimmer/reference';
 import { untrack } from '@glimmer/validator';
-import Component from '../component';
-import InternalManager from '../component-managers/internal';
-import InternalModifier, { InternalModifierManager } from '../modifiers/internal';
 import InputTemplate from '../templates/input';
-import TextareaTemplate from '../templates/textarea';
+import AbstractInput, { handleDeprecatedFeatures, valueFrom } from './abstract-input';
 import Checkbox from './checkbox';
-import InternalComponent from './internal';
+import { opaquify } from './internal';
 import TextField from './text-field';
-import TextArea from './textarea';
 
 let isValidInputType: (type: string) => boolean;
 
@@ -61,137 +45,6 @@ if (hasDOM && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   isValidInputType = (type: string) => type !== '';
 }
 
-type EventListener = (event: Event) => void;
-type VirtualEventListener = (value: string, event: Event) => void;
-
-function NOOP() {}
-
-const UNINITIALIZED: unknown = Object.freeze({});
-
-function elementForEvent(event: Event): HTMLInputElement | HTMLTextAreaElement {
-  assert(
-    '[BUG] Event target must be the <input> or <textarea> element',
-    event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement
-  );
-
-  return event.target;
-}
-
-function valueForEvent(event: Event): string {
-  return elementForEvent(event).value;
-}
-
-function devirtualize(callback: VirtualEventListener): EventListener {
-  return (event: Event) => callback(valueForEvent(event), event);
-}
-
-/**
- * This interface paves over the differences between these three cases:
- *
- * 1. `<Input />` or `<Input @value="some string" />`
- * 2. `<Input @value={{this.value}} />`
- * 3. `<Input @value={{to-upper-case this.value}} />`
- *
- * For the first set of cases (any const reference in general), the semantics
- * are that `@value` is treated as an initial value only, just like the `value`
- * attribute. Perhaps using the `value` attribute would have been more Correct™
- * here, but that would make a pretty confusing API, and the user's intent is
- * pretty clear, so we support it.
- *
- * The second case is the most common. `{{this.value}}` is an updatable
- * reference here so the value is fully owned and bound to the "upstream" value
- * and we don't store a copy of it in the component.
- *
- * The last case is the most tricky. There are a lot of different ways for this
- * to happen, but the end result is that we have a non-const and non-updatable
- * reference in our hands. The semantics here is a mix of the first two cases.
- * We take the computed value as the initial value, but hold a copy of it and
- * allow it to diverge from upstream. However, when the upstream recomputes to
- * a value different than what we originally had, we would reconcile with the
- * new upstream value and throw away the local copy.
- *
- * It's not clear that we intended to support the last case, or that it is used
- * intentionally in the real world, but it's a fallout of the two-way binding
- * system and `Ember.Component` semantics from before.
- *
- * This interface paves over the differences so the component doesn't have to
- * worry about it.
- *
- * All of the above applies to `@checked` as well.
- */
-function valueFrom(reference?: Reference<unknown>): Value {
-  if (reference === undefined) {
-    return new LocalValue(undefined);
-  } else if (isConstRef(reference)) {
-    return new LocalValue(valueForRef(reference));
-  } else if (isUpdatableRef(reference)) {
-    return new UpstreamValue(reference);
-  } else {
-    return new ForkedValue(reference);
-  }
-}
-
-interface Value {
-  get(): unknown;
-  set(value: unknown): void;
-}
-
-class LocalValue implements Value {
-  @tracked private value: unknown;
-
-  constructor(value: unknown) {
-    this.value = value;
-  }
-
-  get(): unknown {
-    return this.value;
-  }
-
-  set(value: unknown): void {
-    this.value = value;
-  }
-}
-
-class UpstreamValue implements Value {
-  constructor(private reference: Reference<unknown>) {}
-
-  get(): unknown {
-    return valueForRef(this.reference);
-  }
-
-  set(value: unknown): void {
-    updateRef(this.reference, value);
-  }
-}
-
-class ForkedValue implements Value {
-  private local?: Value;
-  private upstream: Value;
-
-  private lastUpstreamValue = UNINITIALIZED;
-
-  constructor(reference: Reference<unknown>) {
-    this.upstream = new UpstreamValue(reference);
-  }
-
-  get(): unknown {
-    let upstreamValue = this.upstream.get();
-
-    if (upstreamValue !== this.lastUpstreamValue) {
-      this.lastUpstreamValue = upstreamValue;
-      this.local = new LocalValue(upstreamValue);
-    }
-
-    assert('[BUG] this.local must have been initialized at this point', this.local);
-    return this.local.get();
-  }
-
-  set(value: unknown): void {
-    assert('[BUG] this.local must have been initialized at this point', this.local);
-    this.local.set(value);
-  }
-}
-
 /**
   See [Ember.Templates.components.Input](/ember/release/classes/Ember.Templates.components/methods/Input?anchor=Input).
 
@@ -313,39 +166,43 @@ class ForkedValue implements Value {
   @param {Hash} options
   @public
 */
-abstract class AbstractInput extends InternalComponent {
-  /**
-   * The default HTML id attribute. We don't really _need_ one, this is just
-   * added for compatibility as it's hard to tell if people rely on it being
-   * present, and it doens't really hurt.
-   *
-   * However, don't rely on this internally, like passing it to `getElementId`.
-   * This can be (and often is) overriden by passing an `id` attribute on the
-   * invocation, which shadows this default id via `...attributes`.
-   */
-  get id(): string {
-    return guidFor(this);
+class Input extends AbstractInput {
+  static toString(): string {
+    return 'Input';
   }
 
   /**
-   * The default HTML class attribute. Similar to the above, we don't _need_
-   * them, they are just added for compatibility as it's similarly hard to tell
-   * if people rely on it in their CSS etc, and it doens't really hurt.
+   * The HTML class attribute.
    */
   get class(): string {
     if (this.isCheckbox) {
       return 'ember-checkbox ember-view';
-    } else if (this.isTextarea) {
-      return 'ember-text-area ember-view';
     } else {
       return 'ember-text-field ember-view';
     }
   }
 
-  abstract modernized: boolean;
-  abstract type: string;
-  abstract isCheckbox: boolean;
-  abstract isTextarea: boolean;
+  /**
+   * The HTML type attribute.
+   */
+  get type(): string {
+    let type = this.arg('type');
+
+    if (type === null || type === undefined) {
+      return 'text';
+    }
+
+    assert(
+      'The `@type` argument to the <Input> component must be a string',
+      typeof type === 'string'
+    );
+
+    return isValidInputType(type) ? type : 'text';
+  }
+
+  get isCheckbox(): boolean {
+    return this.arg('type') === 'checkbox';
+  }
 
   private _checked = valueFrom(this.args.checked);
 
@@ -387,132 +244,30 @@ abstract class AbstractInput extends InternalComponent {
     this._checked.set(checked);
   }
 
-  private _value = valueFrom(this.args.value);
-
-  get value(): unknown {
-    return this._value.get();
-  }
-
-  set value(value: unknown) {
-    this._value.set(value);
-  }
-
-  @action checkedDidChange(event: Event): void {
-    let element = elementForEvent(event);
-    assert('[BUG] element must be an <input>', element instanceof HTMLInputElement);
-    this.checked = element.checked;
-  }
-
-  @action valueDidChange(event: Event): void {
-    this.value = valueForEvent(event);
-  }
-
   @action change(event: Event): void {
     if (this.isCheckbox) {
       this.checkedDidChange(event);
     } else {
-      this.valueDidChange(event);
+      super.change(event);
     }
   }
 
   @action input(event: Event): void {
     if (!this.isCheckbox) {
-      this.valueDidChange(event);
-    }
-  }
-
-  @action keyUp(event: KeyboardEvent): void {
-    switch (event.key) {
-      case 'Enter':
-        this.callbackFor('enter')(event);
-        this.callbackFor('insert-newline')(event);
-        break;
-
-      case 'Escape':
-        this.callbackFor('escape-press')(event);
-        break;
-    }
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected isSupportedArgument(_name: string): boolean {
-    return false;
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  protected onUnsupportedArgument(_name: string): void {}
-
-  protected callbackFor(type: string, shouldDevirtualize = true): EventListener {
-    let callback = this.arg(type);
-
-    if (callback) {
-      assert(
-        `The \`@${type}\` argument to the <${this.constructor}> component must be a function`,
-        typeof callback === 'function'
-      );
-
-      if (shouldDevirtualize) {
-        return devirtualize(callback as VirtualEventListener);
-      } else {
-        return callback as EventListener;
-      }
-    } else {
-      return NOOP;
+      super.input(event);
     }
   }
-}
 
-class Input extends AbstractInput {
-  static toString(): string {
-    return 'Input';
-  }
-
-  constructor(owner: Owner, args: Record<string, Reference | undefined>, caller: unknown) {
-    super(owner, args, caller);
-
-    runInDebug(() => {
-      untrack(() => {
-        for (let name in args) {
-          if (!this.isSupportedArgument(name)) {
-            this.onUnsupportedArgument(name);
-          }
-        }
-      });
-    });
+  @action checkedDidChange(event: Event): void {
+    let element = event.target;
+    assert('[BUG] element must be an <input>', element instanceof HTMLInputElement);
+    this.checked = element.checked;
   }
 
-  modernized =
-    Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
-    Component._wasReopened === false &&
-    TextField._wasReopened === false &&
-    Checkbox._wasReopened === false &&
-    TextSupport._wasReopened === false &&
-    TargetActionSupport._wasReopened === false;
-
-  /**
-   * The HTML type attribute.
-   */
-  get type(): string {
-    let type = this.arg('type');
-
-    if (type === null || type === undefined) {
-      return 'text';
-    }
-
-    assert(
-      'The `@type` argument to the <Input> component must be a string',
-      typeof type === 'string'
+  protected shouldModernize(): boolean {
+    return (
+      super.shouldModernize() && TextField._wasReopened === false && Checkbox._wasReopened === false
     );
-
-    return isValidInputType(type) ? type : 'text';
-  }
-
-  get isCheckbox(): boolean {
-    return this.arg('type') === 'checkbox';
-  }
-
-  get isTextarea(): false {
-    return false;
   }
 
   protected isSupportedArgument(name: string): boolean {
@@ -520,8 +275,8 @@ class Input extends AbstractInput {
       'type',
       'value',
       'checked',
-      'insert-newline',
       'enter',
+      'insert-newline',
       'escape-press',
     ];
 
@@ -529,532 +284,57 @@ class Input extends AbstractInput {
   }
 }
 
-class Textarea extends AbstractInput {
-  static toString(): string {
-    return 'Textarea';
-  }
-
-  constructor(owner: Owner, args: Record<string, Reference | undefined>, caller: unknown) {
-    super(owner, args, caller);
-
-    runInDebug(() => {
-      untrack(() => {
-        for (let name in args) {
-          if (!this.isSupportedArgument(name)) {
-            this.onUnsupportedArgument(name);
-          }
-        }
-      });
-    });
-  }
-
-  modernized =
-    Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
-    Component._wasReopened === false &&
-    TextArea._wasReopened === false &&
-    TextSupport._wasReopened === false &&
-    TargetActionSupport._wasReopened === false;
-
-  get type(): never {
-    throw assert(`[BUG] type getter should never be called on <Textarea />`);
-  }
-
-  get isCheckbox(): false {
-    return false;
-  }
-
-  get isTextarea(): true {
-    return true;
-  }
-
-  protected isSupportedArgument(name: string): boolean {
-    let supportedArguments = ['type', 'value', 'insert-newline', 'enter', 'escape-press'];
-    return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
-  }
-}
-
-// Deprecated features
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  // Unsupported arguments
-  {
-    AbstractInput.prototype['onUnsupportedArgument'] = function (
-      this: AbstractInput,
-      argument: string
-    ): void {
-      let name = this.constructor.toString();
-
-      deprecate(`Passing the \`@${argument}\` argument to <${name}> is deprecated.`, false, {
-        id: 'ember.built-in-components.legacy-arguments',
-        for: 'ember-source',
-        since: {},
-        until: '4.0.0',
-      });
-
-      this.modernized = false;
-    };
-  }
-
-  // Attribute bindings
-  {
-    let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
-      if (target) {
-        return (
-          Object.getOwnPropertyDescriptor(target, property) ||
-          descriptorFor(Object.getPrototypeOf(target), property)
-        );
-      } else {
-        return null;
-      }
-    };
-
-    let defineGetterForDeprecatedAttributeBinding = (
-      component: typeof AbstractInput,
-      attribute: string,
-      argument = attribute
-    ): void => {
-      let name = component.toString();
-      let curlyName = name.toLowerCase();
-      let { prototype } = component;
-
-      let superIsSupportedArgument = prototype['isSupportedArgument'];
-
-      prototype['isSupportedArgument'] = function isSupportedArgument(
-        this: AbstractInput,
-        name: string
-      ): boolean {
-        return (this.modernized && name === argument) || superIsSupportedArgument.call(this, name);
-      };
-
-      let superDescriptor = descriptorFor(prototype, attribute);
-      let superGetter: (this: AbstractInput) => unknown = () => undefined;
-
-      if (superDescriptor) {
-        assert(
-          `Expecting ${attribute} to be a getter on <${name}>`,
-          typeof superDescriptor.get === 'function'
-        );
-
-        superGetter = superDescriptor.get;
-      }
-
-      Object.defineProperty(prototype, attribute, {
-        configurable: true,
-        enumerable: true,
-        get(this: AbstractInput): unknown {
-          if (argument in this.args) {
-            deprecate(
-              `Passing the \`@${argument}\` argument to <${name}> is deprecated. ` +
-                `Instead, please pass the attribute directly, i.e. \`<${name} ${attribute}={{...}} />\` ` +
-                `instead of \`<${name} @${argument}={{...}} />\` or \`{{${curlyName} ${argument}=...}}\`.`,
-              false,
-              {
-                id: 'ember.built-in-components.legacy-attribute-arguments',
-                for: 'ember-source',
-                since: {},
-                until: '4.0.0',
-              }
-            );
-
-            // The `class` attribute is concatenated/merged instead of clobbered
-            if (attribute === 'class' && superDescriptor) {
-              return `${superGetter.call(this)} ${this.arg(argument)}`;
-            } else {
-              return this.arg(argument);
-            }
-          } else {
-            return superGetter.call(this);
-          }
-        },
-      });
-    };
-
-    let deprecatedInputAttributeBindings: Array<string | [string, string]> = [
-      // Component
-      'id',
-      ['id', 'elementId'],
-      'class',
-      ['class', 'classNames'],
-      ['role', 'ariaRole'],
-
-      // TextSupport
-      'autocapitalize',
-      'autocorrect',
-      'autofocus',
-      'disabled',
-      'form',
-      'maxlength',
-      'minlength',
-      'placeholder',
-      'readonly',
-      'required',
-      'selectionDirection',
-      'spellcheck',
-      'tabindex',
-      'title',
-
-      // TextField
-      'accept',
-      'autocomplete',
-      'autosave',
-      'dir',
-      'formaction',
-      'formenctype',
-      'formmethod',
-      'formnovalidate',
-      'formtarget',
-      'height',
-      'inputmode',
-      'lang',
-      'list',
-      'max',
-      'min',
-      'multiple',
-      'name',
-      'pattern',
-      'size',
-      'step',
-      'width',
-
-      // Checkbox
-      'indeterminate',
-    ];
-
-    deprecatedInputAttributeBindings.forEach((args) => {
-      if (Array.isArray(args)) {
-        defineGetterForDeprecatedAttributeBinding(Input, ...args);
-      } else {
-        defineGetterForDeprecatedAttributeBinding(Input, args);
-      }
-    });
-
-    let deprecatedTextareaAttributeBindings: Array<string | [string, string]> = [
-      // Component
-      'id',
-      ['id', 'elementId'],
-      'class',
-      ['class', 'classNames'],
-      ['role', 'ariaRole'],
-
-      // TextSupport
-      'autocapitalize',
-      'autocorrect',
-      'autofocus',
-      'disabled',
-      'form',
-      'maxlength',
-      'minlength',
-      'placeholder',
-      'readonly',
-      'required',
-      'selectionDirection',
-      'spellcheck',
-      'tabindex',
-      'title',
-
-      // TextField
-      'rows',
-      'cols',
-      'name',
-      'selectionEnd',
-      'selectionStart',
-      'autocomplete',
-      'wrap',
-      'lang',
-      'dir',
-    ];
-
-    deprecatedTextareaAttributeBindings.forEach((args) => {
-      if (Array.isArray(args)) {
-        defineGetterForDeprecatedAttributeBinding(Textarea, ...args);
-      } else {
-        defineGetterForDeprecatedAttributeBinding(Textarea, args);
-      }
-    });
-  }
-
-  // Deprecated event arguments
-  {
-    type EventsMap = Record<string, string>;
-
-    const EVENTS = new WeakMap<object, EventsMap>();
-
-    const getEventsMap = (owner: Owner): EventsMap => {
-      let events = EVENTS.get(owner);
-
-      if (events === undefined) {
-        let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
-          'event_dispatcher:main'
-        );
-
-        assert(
-          'missing event dispatcher',
-          eventDispatcher !== null && typeof eventDispatcher === 'object'
-        );
-
-        assert(
-          'missing _finalEvents on event dispatcher',
-          '_finalEvents' in eventDispatcher &&
-            eventDispatcher?._finalEvents !== null &&
-            typeof eventDispatcher?._finalEvents === 'object'
-        );
-
-        EVENTS.set(owner, (events = eventDispatcher._finalEvents));
-      }
-
-      return events;
-    };
-
-    let superIsSupportedArgument = AbstractInput.prototype['isSupportedArgument'];
-
-    AbstractInput.prototype['isSupportedArgument'] = function isSupportedArgument(
-      this: AbstractInput,
-      name: string
-    ): boolean {
-      let events = [
-        ...Object.values(getEventsMap(this.owner)),
-        'focus-in',
-        'focus-out',
-        'key-press',
-        'key-up',
-        'key-down',
-      ];
-
-      return (
-        (this.modernized && events.indexOf(name) !== -1) ||
-        superIsSupportedArgument.call(this, name)
-      );
-    };
-    class DeprecatedEventHandlersModifier extends InternalModifier {
-      static toString(): string {
-        return 'DeprecatedEventHandlersModifier';
-      }
-
-      private listeners = new Map<string, EventListener>();
-
-      install(): void {
-        let { element, eventsMap, component, listenerFor, listeners } = this;
-
-        let entries: [eventName: string, methodName: string, isVirtualEvent?: boolean][] = [
-          ...Object.entries(eventsMap),
-          ['focusin', 'focus-in', true],
-          ['focusout', 'focus-out', true],
-          ['keypress', 'key-press', true],
-          ['keyup', 'key-up', true],
-          ['keydown', 'key-down', true],
-        ];
-
-        for (let [eventName, methodName, isVirtualEvent] of entries) {
-          let listener = listenerFor.call(component, eventName, methodName, isVirtualEvent);
-
-          if (listener) {
-            listeners.set(eventName, listener);
-            element.addEventListener(eventName, listener);
-          }
-        }
-
-        Object.freeze(listeners);
-      }
-
-      remove(): void {
-        let { element, listeners } = this;
-
-        for (let [event, listener] of Object.entries(listeners)) {
-          element.removeEventListener(event, listener);
-        }
-
-        this.listeners = new Map();
-      }
-
-      private get eventsMap(): EventsMap {
-        return getEventsMap(this.owner);
-      }
-
-      private get component(): AbstractInput {
-        let component = this.positional(0);
-
-        assert(
-          'must pass the <Input /> or <Textarea /> component as first argument',
-          component instanceof AbstractInput
-        );
-
-        return component;
-      }
-
-      private listenerFor(
-        this: AbstractInput,
-        eventName: string,
-        methodName: string,
-        isVirtualEvent = false
-      ): Option<EventListener> {
-        assert(
-          'must be called with the <Input /> or <Textarea /> component as this',
-          this instanceof AbstractInput
-        );
-
-        let name = this.constructor.toString();
-        let curlyName = name.toLowerCase();
-
-        if (methodName in this.args) {
-          deprecate(
-            `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
-              `This would have overwritten the internal \`${methodName}\` method on ` +
-              `the <${name}> component and prevented it from functioning properly. ` +
-              `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
-              `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
-            !(methodName in this),
-            {
-              id: 'ember.built-in-components.legacy-attribute-arguments',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-            }
-          );
-
-          deprecate(
-            `Passing the \`@${methodName}\` argument to <${name}> is deprecated. ` +
-              `Instead, please use the {{on}} modifier, i.e. \`<${name} {{on "${eventName}" ...}} />\` ` +
-              `instead of \`<${name} @${methodName}={{...}} />\` or \`{{${curlyName} ${methodName}=...}}\`.`,
-            methodName in this,
-            {
-              id: 'ember.built-in-components.legacy-attribute-arguments',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-            }
-          );
-
-          return this['callbackFor'].call(this, methodName, isVirtualEvent);
-        } else {
-          return null;
-        }
-      }
-    }
-
-    setInternalModifierManager(
-      new InternalModifierManager(DeprecatedEventHandlersModifier, 'deprecated-event-handlers'),
-      DeprecatedEventHandlersModifier
-    );
-
-    AbstractInput.prototype['DeprecatedEventHandlersModifier'] = DeprecatedEventHandlersModifier;
-  }
-
-  // String actions
-  if (SEND_ACTION) {
-    interface View {
-      send(action: string, ...args: unknown[]): void;
-    }
-
-    let isView = (target: {}): target is View => {
-      return typeof (target as Partial<View>).send === 'function';
-    };
-
-    let superCallbackFor = AbstractInput.prototype['callbackFor'];
-
-    Object.assign(AbstractInput.prototype, {
-      callbackFor(this: AbstractInput, type: string, shouldDevirtualize = true): EventListener {
-        const actionName = this.arg(type);
-
-        if (typeof actionName === 'string') {
-          deprecate(
-            `Passing actions to components as strings (like \`<${this.constructor} @${type}="${actionName}" />\`) is deprecated. ` +
-              `Please use closure actions instead (\`<${this.constructor} @${type}={{action "${actionName}"}} />\`).`,
-            false,
-            {
-              id: 'ember-component.send-action',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-              url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
-            }
-          );
-
-          const { caller } = this;
-
-          assert('[BUG] Missing caller', caller && typeof caller === 'object');
-
-          let callback: Function;
-
-          if (isView(caller)) {
-            callback = (...args: unknown[]) => caller.send(actionName, ...args);
-          } else {
-            assert(
-              `The action '${actionName}' did not exist on ${caller}`,
-              typeof caller[actionName] === 'function'
-            );
-
-            callback = caller[actionName];
-          }
-
-          let deprecated = (...args: unknown[]) => {
-            deprecate(
-              `Passing actions to components as strings (like \`<${this.constructor} @${type}="${actionName}" />\`) is deprecated. ` +
-                `Please use closure actions instead (\`<${this.constructor} @${type}={{action "${actionName}"}} />\`).`,
-              false,
-              {
-                id: 'ember-component.send-action',
-                for: 'ember-source',
-                since: {},
-                until: '4.0.0',
-                url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
-              }
-            );
-
-            return callback(...args);
-          };
-
-          if (shouldDevirtualize) {
-            return devirtualize(deprecated as VirtualEventListener);
-          } else {
-            return deprecated as EventListener;
-          }
-        } else {
-          return superCallbackFor.call(this, type);
-        }
-      },
-    });
-  }
-
-  // jQuery Events
-  if (JQUERY_INTEGRATION) {
-    let superCallbackFor = AbstractInput.prototype['callbackFor'];
-
-    Object.assign(AbstractInput.prototype, {
-      callbackFor(this: AbstractInput, type: string, shouldDevirtualize = true): EventListener {
-        let callback = superCallbackFor.call(this, type, shouldDevirtualize);
-
-        if (jQuery && !jQueryDisabled) {
-          return (event: Event) => callback(new jQuery.Event(event));
-        } else {
-          return callback;
-        }
-      },
-    });
-  }
+  handleDeprecatedFeatures(Input, [
+    // Component
+    'id',
+    ['id', 'elementId'],
+    'class',
+    ['class', 'classNames'],
+    ['role', 'ariaRole'],
+
+    // TextSupport
+    'autocapitalize',
+    'autocorrect',
+    'autofocus',
+    'disabled',
+    'form',
+    'maxlength',
+    'minlength',
+    'placeholder',
+    'readonly',
+    'required',
+    'selectionDirection',
+    'spellcheck',
+    'tabindex',
+    'title',
+
+    // TextField
+    'accept',
+    'autocomplete',
+    'autosave',
+    'dir',
+    'formaction',
+    'formenctype',
+    'formmethod',
+    'formnovalidate',
+    'formtarget',
+    'height',
+    'inputmode',
+    'lang',
+    'list',
+    'max',
+    'min',
+    'multiple',
+    'name',
+    'pattern',
+    'size',
+    'step',
+    'width',
+
+    // Checkbox
+    'indeterminate',
+  ]);
 }
 
-// Use an opaque handle so implementation details are
-const InputComponent = {
-  // Factory interface
-  create(): never {
-    throw assert('Use constructor instead of create');
-  },
-
-  toString: Input.toString,
-};
-
-setInternalComponentManager(new InternalManager(Input, 'input'), InputComponent);
-setComponentTemplate(InputTemplate, InputComponent);
-
-export default InputComponent;
-
-export const TextareaComponent = {
-  // Factory interface
-  create(): never {
-    throw assert('Use constructor instead of create');
-  },
-
-  toString: Textarea.toString,
-};
-
-setInternalComponentManager(new InternalManager(Textarea, 'textarea'), TextareaComponent);
-setComponentTemplate(TextareaTemplate, TextareaComponent);
+export default opaquify(Input, InputTemplate);
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 264e69d7884..1643892ab47 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -1,6 +1,34 @@
 import { Owner, setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
-import { Reference, valueForRef } from '@glimmer/reference';
+import { jQuery, jQueryDisabled } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, deprecate } from '@ember/debug';
+import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
+import {
+  CapturedNamedArguments,
+  Destroyable,
+  DynamicScope,
+  Environment,
+  InternalComponentCapabilities,
+  InternalComponentManager,
+  Maybe,
+  Option,
+  TemplateFactory,
+  VMArguments,
+  WithCreateInstance,
+} from '@glimmer/interfaces';
+import {
+  setComponentTemplate,
+  setInternalComponentManager,
+  setInternalModifierManager,
+} from '@glimmer/manager';
+import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
+import { untrack } from '@glimmer/validator';
+import InternalModifier, { InternalModifierManager } from '../modifiers/internal';
+
+function NOOP(): void {}
+
+export type EventListener = (event: Event) => void;
 
 export default class InternalComponent {
   // Override this
@@ -16,12 +44,508 @@ export default class InternalComponent {
     setOwner(this, owner);
   }
 
-  protected arg(key: string): unknown {
-    let ref = this.args[key];
+  /**
+   * The default HTML id attribute. We don't really _need_ one, this is just
+   * added for compatibility as it's hard to tell if people rely on it being
+   * present, and it doens't really hurt.
+   *
+   * However, don't rely on this internally, like passing it to `getElementId`.
+   * This can be (and often is) overriden by passing an `id` attribute on the
+   * invocation, which shadows this default id via `...attributes`.
+   */
+  get id(): string {
+    return guidFor(this);
+  }
+
+  /**
+   * The default HTML class attribute. Similar to the above, we don't _need_
+   * them, they are just added for compatibility as it's similarly hard to tell
+   * if people rely on it in their CSS etc, and it doens't really hurt.
+   */
+  get class(): string {
+    return 'ember-view';
+  }
+
+  protected arg(name: string): unknown {
+    let ref = this.args[name];
     return ref ? valueForRef(ref) : undefined;
   }
 
+  protected listenerFor(name: string): EventListener {
+    let listener = this.arg(name);
+
+    if (listener) {
+      assert(
+        `The \`@${name}\` argument to the <${this.constructor}> component must be a function`,
+        typeof listener === 'function'
+      );
+
+      return listener as EventListener;
+    } else {
+      return NOOP;
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  protected isSupportedArgument(_name: string): boolean {
+    return false;
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  protected onUnsupportedArgument(_name: string): void {}
+
   toString(): string {
     return `<${this.constructor.toString()}:${guidFor(this)}>`;
   }
 }
+
+export interface InternalComponentConstructor<T extends InternalComponent = InternalComponent> {
+  new (owner: Owner, args: CapturedNamedArguments, caller: unknown): T;
+  prototype: T;
+  toString(): string;
+}
+
+declare const OPAQUE_INTERNAL_COMPONENT_CONSTRUCTOR: unique symbol;
+
+export interface OpaqueInternalComponentConstructor {
+  create(): never;
+  toString(): string;
+  [OPAQUE_INTERNAL_COMPONENT_CONSTRUCTOR]: true;
+}
+
+const OPAQUE_CONSTRUCTOR_MAP = new WeakMap<
+  OpaqueInternalComponentConstructor,
+  InternalComponentConstructor
+>();
+
+export function opaquify(
+  constructor: InternalComponentConstructor,
+  template: TemplateFactory
+): OpaqueInternalComponentConstructor {
+  let _opaque: Omit<
+    OpaqueInternalComponentConstructor,
+    typeof OPAQUE_INTERNAL_COMPONENT_CONSTRUCTOR
+  > = {
+    // Factory interface
+    create(): never {
+      throw assert('Use constructor instead of create');
+    },
+
+    toString() {
+      return constructor.toString();
+    },
+  };
+
+  let opaque = _opaque as OpaqueInternalComponentConstructor;
+
+  OPAQUE_CONSTRUCTOR_MAP.set(opaque, constructor);
+
+  setInternalComponentManager(INTERNAL_COMPONENT_MANAGER, opaque);
+  setComponentTemplate(template, opaque);
+
+  return opaque;
+}
+
+function deopaquify(opaque: OpaqueInternalComponentConstructor): InternalComponentConstructor {
+  let constructor = OPAQUE_CONSTRUCTOR_MAP.get(opaque);
+  assert(`[BUG] Invalid internal component constructor: ${opaque}`, constructor);
+  return constructor;
+}
+
+const CAPABILITIES: InternalComponentCapabilities = {
+  dynamicLayout: false,
+  dynamicTag: false,
+  prepareArgs: false,
+  createArgs: true,
+  attributeHook: false,
+  elementHook: false,
+  createCaller: true,
+  dynamicScope: false,
+  updateHook: false,
+  createInstance: true,
+  wrapped: false,
+  willDestroy: false,
+  hasSubOwner: false,
+};
+
+class InternalManager
+  implements
+    InternalComponentManager<InternalComponent, OpaqueInternalComponentConstructor>,
+    WithCreateInstance {
+  getCapabilities(): InternalComponentCapabilities {
+    return CAPABILITIES;
+  }
+
+  create(
+    owner: Owner,
+    definition: OpaqueInternalComponentConstructor,
+    args: VMArguments,
+    _env: Environment,
+    _dynamicScope: DynamicScope,
+    caller: Reference
+  ): InternalComponent {
+    assert('caller must be const', isConstRef(caller));
+
+    let ComponentClass = deopaquify(definition);
+
+    assert(
+      `The ${definition.toString()} component does not take any positional arguments`,
+      args.positional.length === 0
+    );
+
+    let instance = new ComponentClass(owner, args.named.capture(), valueForRef(caller));
+
+    untrack(
+      function (this: InternalComponent): void {
+        for (let name of args.named.names) {
+          if (!this.isSupportedArgument(name)) {
+            this.onUnsupportedArgument(name);
+          }
+        }
+      }.bind(instance)
+    );
+
+    return instance;
+  }
+
+  didCreate(): void {}
+  didUpdate(): void {}
+
+  didRenderLayout(): void {}
+  didUpdateLayout(): void {}
+
+  getDebugName(definition: OpaqueInternalComponentConstructor): string {
+    return definition.toString();
+  }
+
+  getSelf(instance: InternalComponent): Reference {
+    return createConstRef(instance, 'this');
+  }
+
+  getDestroyable(instance: InternalComponent): Destroyable {
+    return instance;
+  }
+}
+
+const INTERNAL_COMPONENT_MANAGER = new InternalManager();
+
+// Deprecated features
+
+export interface DeprecatingInternalComponent extends InternalComponent {
+  modernized: boolean;
+}
+
+export type DeprecatingInternalComponentConstructor = InternalComponentConstructor<
+  DeprecatingInternalComponent
+>;
+
+export function handleDeprecatedArguments(target: DeprecatingInternalComponentConstructor): void {
+  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+    let angle = target.toString();
+    let { prototype } = target;
+
+    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
+
+    Object.defineProperty(prototype, 'onUnsupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function onUnsupportedArgument(
+        this: DeprecatingInternalComponent,
+        name: string
+      ): void {
+        deprecate(`Passing the \`@${name}\` argument to <${angle}> is deprecated.`, false, {
+          id: 'ember.built-in-components.legacy-arguments',
+          for: 'ember-source',
+          since: {},
+          until: '4.0.0',
+        });
+
+        this.modernized = false;
+
+        superOnUnsupportedArgument.call(this, name);
+      },
+    });
+  }
+}
+
+export function handleDeprecatedAttributeArguments(
+  target: DeprecatingInternalComponentConstructor,
+  bindings: Array<string | [attribute: string, argument: string]>
+): void {
+  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+    let angle = target.toString();
+    let curly = angle.toLowerCase();
+    let { prototype } = target;
+
+    let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
+      if (target) {
+        return (
+          Object.getOwnPropertyDescriptor(target, property) ||
+          descriptorFor(Object.getPrototypeOf(target), property)
+        );
+      } else {
+        return null;
+      }
+    };
+
+    bindings.forEach((binding) => {
+      let attribute: string;
+      let argument: string;
+
+      if (Array.isArray(binding)) {
+        [attribute, argument] = binding;
+      } else {
+        attribute = argument = binding;
+      }
+
+      let superIsSupportedArgument = prototype['isSupportedArgument'];
+
+      Object.defineProperty(prototype, 'isSupportedArgument', {
+        configurable: true,
+        enumerable: false,
+        value: function isSupportedArgument(
+          this: DeprecatingInternalComponent,
+          name: string
+        ): boolean {
+          return (
+            (this.modernized && name === argument) || superIsSupportedArgument.call(this, name)
+          );
+        },
+      });
+
+      let superDescriptor = descriptorFor(prototype, attribute);
+      let superGetter: (this: DeprecatingInternalComponent) => unknown = () => undefined;
+
+      if (superDescriptor) {
+        assert(
+          `[BUG] expecting ${attribute} to be a getter on <${angle}>`,
+          typeof superDescriptor.get === 'function'
+        );
+
+        superGetter = superDescriptor.get;
+      }
+
+      Object.defineProperty(prototype, attribute, {
+        configurable: true,
+        enumerable: true,
+        get(this: DeprecatingInternalComponent): unknown {
+          if (argument in this.args) {
+            deprecate(
+              `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
+                `Instead, please pass the attribute directly, i.e. \`<${angle} ${attribute}={{...}} />\` ` +
+                `instead of \`<${angle} @${argument}={{...}} />\` or \`{{${curly} ${argument}=...}}\`.`,
+              false,
+              {
+                id: 'ember.built-in-components.legacy-attribute-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            // The `class` attribute is concatenated/merged instead of clobbered
+            if (attribute === 'class' && superDescriptor) {
+              return `${superGetter.call(this)} ${this.arg(argument)}`;
+            } else {
+              return this.arg(argument);
+            }
+          } else {
+            return superGetter.call(this);
+          }
+        },
+      });
+    });
+  }
+}
+
+export let handleDeprecatedEventArguments: (
+  target: DeprecatingInternalComponentConstructor,
+  extraEvents: Array<[event: string, argument: string]>
+) => void = NOOP;
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  type EventsMap = Record<string, string>;
+
+  const EVENTS = new WeakMap<object, EventsMap>();
+
+  const getEventsMap = (owner: Owner): EventsMap => {
+    let events = EVENTS.get(owner);
+
+    if (events === undefined) {
+      let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
+        'event_dispatcher:main'
+      );
+
+      assert(
+        '[BUG] missing event dispatcher',
+        eventDispatcher !== null && typeof eventDispatcher === 'object'
+      );
+
+      assert(
+        '[BUG] missing _finalEvents on event dispatcher',
+        '_finalEvents' in eventDispatcher &&
+          eventDispatcher?._finalEvents !== null &&
+          typeof eventDispatcher?._finalEvents === 'object'
+      );
+
+      EVENTS.set(owner, (events = eventDispatcher._finalEvents));
+    }
+
+    return events;
+  };
+
+  handleDeprecatedEventArguments = (target, extraEvents) => {
+    let angle = target.toString();
+    let curly = angle.toLowerCase();
+    let { prototype } = target;
+
+    let superIsSupportedArgument = prototype['isSupportedArgument'];
+
+    Object.defineProperty(prototype, 'isSupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function isSupportedArgument(
+        this: DeprecatingInternalComponent,
+        name: string
+      ): boolean {
+        let events = [
+          ...Object.values(getEventsMap(this.owner)),
+          'focus-in',
+          'focus-out',
+          'key-press',
+          'key-up',
+          'key-down',
+        ];
+
+        return (
+          (this.modernized && events.indexOf(name) !== -1) ||
+          superIsSupportedArgument.call(this, name)
+        );
+      },
+    });
+
+    class DeprecatedEventHandlersModifier extends InternalModifier {
+      static toString(): string {
+        return 'DeprecatedEventHandlersModifier';
+      }
+
+      private listeners = new Map<string, EventListener>();
+
+      install(): void {
+        let { element, component, listenerFor, listeners } = this;
+
+        let entries: [event: string, argument: string][] = [
+          ...Object.entries(getEventsMap(this.owner)),
+          ...extraEvents,
+        ];
+
+        for (let [event, argument] of entries) {
+          let listener = listenerFor.call(component, event, argument);
+
+          if (listener) {
+            listeners.set(event, listener);
+            element.addEventListener(event, listener);
+          }
+        }
+
+        Object.freeze(listeners);
+      }
+
+      remove(): void {
+        let { element, listeners } = this;
+
+        for (let [event, listener] of Object.entries(listeners)) {
+          element.removeEventListener(event, listener);
+        }
+
+        this.listeners = new Map();
+      }
+
+      private get component(): DeprecatingInternalComponent {
+        let component = this.positional(0);
+
+        assert(
+          `[BUG] must pass <${angle}> component as first argument`,
+          component instanceof target
+        );
+
+        return component;
+      }
+
+      private listenerFor(
+        this: DeprecatingInternalComponent,
+        event: string,
+        argument: string
+      ): Option<EventListener> {
+        assert(`[BUG] must be called with <${angle}> component as this`, this instanceof target);
+
+        if (argument in this.args) {
+          deprecate(
+            `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
+              `This would have overwritten the internal \`${argument}\` method on ` +
+              `the <${angle}> component and prevented it from functioning properly. ` +
+              `Instead, please use the {{on}} modifier, i.e. \`<${angle} {{on "${event}" ...}} />\` ` +
+              `instead of \`<${angle} @${argument}={{...}} />\` or \`{{${curly} ${argument}=...}}\`.`,
+            !(argument in this),
+            {
+              id: 'ember.built-in-components.legacy-attribute-arguments',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          deprecate(
+            `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
+              `Instead, please use the {{on}} modifier, i.e. \`<${angle} {{on "${event}" ...}} />\` ` +
+              `instead of \`<${angle} @${argument}={{...}} />\` or \`{{${curly} ${argument}=...}}\`.`,
+            argument in this,
+            {
+              id: 'ember.built-in-components.legacy-attribute-arguments',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          return this['listenerFor'].call(this, argument);
+        } else {
+          return null;
+        }
+      }
+    }
+
+    setInternalModifierManager(
+      new InternalModifierManager(DeprecatedEventHandlersModifier, 'deprecated-event-handlers'),
+      DeprecatedEventHandlersModifier
+    );
+
+    Object.defineProperty(prototype, 'handleDeprecatedEvents', {
+      configurable: true,
+      enumerable: true,
+      value: DeprecatedEventHandlersModifier,
+    });
+  };
+}
+
+export function jQueryEventShim(target: DeprecatingInternalComponentConstructor): void {
+  if (JQUERY_INTEGRATION) {
+    let { prototype } = target;
+
+    let superListenerFor = prototype['listenerFor'];
+
+    Object.defineProperty(prototype, 'listenerFor', {
+      configurable: true,
+      enumerable: false,
+      value: function listenerFor(this: InternalComponent, name: string): EventListener {
+        let listener = superListenerFor.call(this, name);
+
+        if (jQuery && !jQueryDisabled) {
+          return (event: Event) => listener(new jQuery.Event(event));
+        } else {
+          return listener;
+        }
+      },
+    });
+  }
+}
diff --git a/packages/@ember/-internals/glimmer/lib/components/textarea.ts b/packages/@ember/-internals/glimmer/lib/components/textarea.ts
index 750280c9f59..3c38ee9332e 100644
--- a/packages/@ember/-internals/glimmer/lib/components/textarea.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/textarea.ts
@@ -1,12 +1,12 @@
 /**
 @module @ember/component
 */
-import { CoreObject } from '@ember/-internals/runtime';
-import { TextSupport } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-import Component from '../component';
-import layout from '../templates/empty';
+import { action } from '@ember/object';
+import TextareaTemplate from '../templates/textarea';
+import LegacyTextArea from './-textarea';
+import AbstractInput, { handleDeprecatedFeatures } from './abstract-input';
+import { opaquify } from './internal';
 
 /**
   The `Textarea` component inserts a new instance of `<textarea>` tag into the template.
@@ -130,23 +130,62 @@ import layout from '../templates/empty';
   @see {Ember.Templates.components.textarea}
   @public
 */
+class Textarea extends AbstractInput {
+  static toString(): string {
+    return 'Textarea';
+  }
 
-/**
-  The internal representation used for `Textarea` invocations.
+  get class(): string {
+    return 'ember-text-area ember-view';
+  }
 
-  @class TextArea
-  @extends Component
-  @see {Ember.Templates.components.Textarea}
-  @uses Ember.TextSupport
-  @public
-*/
-const TextArea = Component.extend(TextSupport, {
-  classNames: ['ember-text-area'],
+  // See abstract-input.ts for why these are needed
 
-  layout,
+  @action change(event: Event): void {
+    super.change(event);
+  }
+
+  @action input(event: Event): void {
+    super.input(event);
+  }
 
-  tagName: 'textarea',
-  attributeBindings: [
+  protected shouldModernize(): boolean {
+    return super.shouldModernize() && LegacyTextArea._wasReopened === false;
+  }
+
+  protected isSupportedArgument(name: string): boolean {
+    let supportedArguments = ['type', 'value', 'enter', 'insert-newline', 'escape-press'];
+    return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
+  }
+}
+
+// Deprecated features
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  handleDeprecatedFeatures(Textarea, [
+    // Component
+    'id',
+    ['id', 'elementId'],
+    'class',
+    ['class', 'classNames'],
+    ['role', 'ariaRole'],
+
+    // TextSupport
+    'autocapitalize',
+    'autocorrect',
+    'autofocus',
+    'disabled',
+    'form',
+    'maxlength',
+    'minlength',
+    'placeholder',
+    'readonly',
+    'required',
+    'selectionDirection',
+    'spellcheck',
+    'tabindex',
+    'title',
+
+    // TextField
     'rows',
     'cols',
     'name',
@@ -156,71 +195,7 @@ const TextArea = Component.extend(TextSupport, {
     'wrap',
     'lang',
     'dir',
-    'value',
-  ],
-  rows: null,
-  cols: null,
-});
-
-TextArea.toString = () => '@ember/component/text-area';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(TextArea, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(TextArea, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(this: typeof TextArea, ...args: unknown[]): unknown {
-      if (this === TextArea) {
-        deprecate(
-          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {},
-            until: '4.0.0',
-          }
-        );
-
-        TextArea._wasReopened = true;
-      }
-
-      return CoreObject.reopen.call(this, ...args);
-    },
-  });
-
-  Object.defineProperty(TextArea, 'reopenClass', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopenClass(this: typeof TextArea, ...args: unknown[]): unknown {
-      if (this === TextArea) {
-        deprecate(
-          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {},
-            until: '4.0.0',
-          }
-        );
-
-        TextArea._wasReopened = true;
-      }
-
-      return CoreObject.reopenClass.call(this, ...args);
-    },
-  });
+  ]);
 }
 
-export default TextArea;
+export default opaquify(Textarea, TextareaTemplate);
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index f4bed62a3b0..696585a6273 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -2,11 +2,12 @@ import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Component from './component';
+import LegacyTextArea from './components/-textarea';
 import Checkbox from './components/checkbox';
-import InputComponent, { TextareaComponent } from './components/input';
-import LinkToComponent from './components/link-to';
+import Input from './components/input';
+import LinkTo from './components/link-to';
 import TextField from './components/text-field';
-import TextArea from './components/textarea';
+import Textarea from './components/textarea';
 import { clientBuilder, rehydrationBuilder, serializeBuilder } from './dom';
 import loc from './helpers/loc';
 import { Renderer } from './renderer';
@@ -57,14 +58,14 @@ export function setupEngineRegistry(registry: Registry): void {
 
   registry.register('component:-text-field', TextField);
   registry.register('component:-checkbox', Checkbox);
-  registry.register('component:input', InputComponent);
-  registry.register('component:link-to', LinkToComponent);
+  registry.register('component:input', Input);
+  registry.register('component:link-to', LinkTo);
 
   if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-    registry.register('component:-textarea', TextArea);
-    registry.register('component:textarea', TextareaComponent);
+    registry.register('component:-textarea', LegacyTextArea);
+    registry.register('component:textarea', Textarea);
   } else {
-    registry.register('component:textarea', TextArea);
+    registry.register('component:textarea', LegacyTextArea);
   }
 
   if (!ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index a9f16a6e2a8..eada41c6e5e 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -55,7 +55,7 @@
     {{on "paste" this.valueDidChange}}
     {{on "cut" this.valueDidChange}}
 
-    {{this.DeprecatedEventHandlersModifier this}}
+    {{this.handleDeprecatedEvents this}}
   />
 {{~else~}}
   {{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
index aa101f4e21e..103a4dcd9b6 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
@@ -40,7 +40,7 @@
     {{on "paste" this.valueDidChange}}
     {{on "cut" this.valueDidChange}}
 
-    {{this.DeprecatedEventHandlersModifier this}}
+    {{this.handleDeprecatedEvents this}}
   />
 {{~else~}}
   {{~#let (component '-textarea')  as |Textarea|~}}

From 1b0e21aeec91a97789fb3106ae834cdc4715e2b0 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 25 Feb 2021 10:31:22 -0500
Subject: [PATCH 0396/1405] [DEPRECATE] `registerPlugin` / `unregisterPlugin`
 and legacy class based AST plugins

The usage of `registerPlugin`/`unregisterPlugin` **requires** global
state mutation which leaks AST plugins between addon's and applications.
Tools like Embroider and ember-cli-htmlbars have avoided this by
ensuring that we purge the Node module caching system between each
attempt at using the template compiler. This results in _massive_ memory
growth (the entire `ember-template-compiler.js` source string is
included in memory for each addon in the build, as well as any JIT
artificats).

This is **very _bad_**.

This PR deprecates using `registerPlugin`/`unregisterPlugin` along with
the legacy AST transform API. All of these APIs are private APIs (as is
anything to do with the template compilation AST), but they are used
fairly often so a proper deprecation cycle is useful.
---
 .../lib/system/compile-options.ts             | 41 ++++++++++++++++++-
 .../tests/system/compile_options_test.js      | 38 ++++++++++++++---
 2 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 36059842997..8a803b3aaaa 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,5 +1,5 @@
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { PrecompileOptions } from '@glimmer/compiler';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
@@ -68,6 +68,19 @@ type LegacyPluginClass = new (env: ASTPluginEnvironment) => LegacyPlugin;
 function wrapLegacyPluginIfNeeded(_plugin: PluginFunc | LegacyPluginClass): PluginFunc {
   let plugin = _plugin;
   if (_plugin.prototype && _plugin.prototype.transform) {
+    deprecate(
+      'Using class based template compilation plugins is deprecated, please update to the functional style',
+      false,
+      {
+        id: 'template-compiler.registerPlugin',
+        until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.27.0',
+        },
+      }
+    );
+
     const pluginFunc: PluginFunc = (env: ASTPluginEnvironment): ASTPlugin => {
       let pluginInstantiated = false;
 
@@ -97,6 +110,19 @@ function wrapLegacyPluginIfNeeded(_plugin: PluginFunc | LegacyPluginClass): Plug
 }
 
 export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginClass): void {
+  deprecate(
+    'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.',
+    false,
+    {
+      id: 'template-compiler.registerPlugin',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.27.0',
+      },
+    }
+  );
+
   if (type !== 'ast') {
     throw new Error(
       `Attempting to register ${_plugin} as "${type}" which is not a valid Glimmer plugin type.`
@@ -116,6 +142,19 @@ export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginC
 }
 
 export function unregisterPlugin(type: string, PluginClass: PluginFunc | LegacyPluginClass): void {
+  deprecate(
+    'unregisterPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.',
+    false,
+    {
+      id: 'template-compiler.registerPlugin',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.27.0',
+      },
+    }
+  );
+
   if (type !== 'ast') {
     throw new Error(
       `Attempting to unregister ${PluginClass} as "${type}" which is not a valid Glimmer plugin type.`
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index e662f747183..921d3f2387a 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -120,19 +120,34 @@ class CustomPluginsTests extends RenderingTestCase {
 }
 
 moduleFor(
-  'ember-template-compiler: registerPlugin with a custom plugins in legacy format',
+  'ember-template-compiler: [DEPRECATED] registerPlugin with a custom plugins in legacy format',
   class extends CustomPluginsTests {
     beforeEach() {
+      expectDeprecation(
+        'Using class based template compilation plugins is deprecated, please update to the functional style'
+      );
+      expectDeprecation(
+        'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.'
+      );
       registerPlugin('ast', LegacyCustomTransform);
     }
 
     afterEach() {
-      unregisterPlugin('ast', LegacyCustomTransform);
+      expectDeprecation(() => {
+        unregisterPlugin('ast', LegacyCustomTransform);
+      }, /unregisterPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
       return super.afterEach();
     }
 
     ['@test custom registered plugins are deduplicated'](assert) {
+      expectDeprecation(
+        'Using class based template compilation plugins is deprecated, please update to the functional style'
+      );
+      expectDeprecation(
+        'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.'
+      );
       registerPlugin('ast', LegacyCustomTransform);
+
       this.registerTemplate(
         'application',
         '<div data-test="foo" data-blah="derp" class="hahaha"></div>'
@@ -143,19 +158,27 @@ moduleFor(
 );
 
 moduleFor(
-  'ember-template-compiler: registerPlugin with a custom plugins',
+  'ember-template-compiler: [DEPRECATED] registerPlugin with a custom plugins',
   class extends CustomPluginsTests {
     beforeEach() {
-      registerPlugin('ast', customTransform);
+      expectDeprecation(() => {
+        registerPlugin('ast', customTransform);
+      }, /registerPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
     }
 
     afterEach() {
-      unregisterPlugin('ast', customTransform);
+      expectDeprecation(() => {
+        unregisterPlugin('ast', customTransform);
+      }, /unregisterPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
+
       return super.afterEach();
     }
 
     ['@test custom registered plugins are deduplicated'](assert) {
-      registerPlugin('ast', customTransform);
+      expectDeprecation(() => {
+        registerPlugin('ast', customTransform);
+      }, /registerPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
+
       this.registerTemplate(
         'application',
         '<div data-test="foo" data-blah="derp" class="hahaha"></div>'
@@ -170,6 +193,9 @@ moduleFor(
   class extends RenderingTestCase {
     // override so that we can provide custom AST plugins to compile
     compile(templateString) {
+      expectDeprecation(
+        'Using class based template compilation plugins is deprecated, please update to the functional style'
+      );
       return compile(templateString, {
         plugins: {
           ast: [LegacyCustomTransform],

From 3d027841b30660dbaf136b0590f0c09a6e1317ce Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 17 Feb 2021 20:52:33 -0800
Subject: [PATCH 0397/1405] [FEATURE modernized-built-in-components] Implement
 <LinkTo>

Part of #19270
---
 packages/@ember/-internals/glimmer/index.ts   |    2 +-
 .../glimmer/lib/component-managers/curly.ts   |   16 +-
 .../glimmer/lib/components/-link-to.ts        | 1064 ++++++++++++
 .../glimmer/lib/components/abstract-input.ts  |   13 +-
 .../glimmer/lib/components/input.ts           |   18 +-
 .../glimmer/lib/components/internal.ts        |   89 +-
 .../glimmer/lib/components/link-to.ts         | 1516 +++++++----------
 .../-internals/glimmer/lib/setup-registry.ts  |    5 +-
 .../glimmer/lib/templates/-link-to.d.ts       |    3 +
 .../glimmer/lib/templates/-link-to.hbs        |    5 +
 .../glimmer/lib/templates/link-to.hbs         |   25 +-
 .../application/debug-render-tree-test.ts     |   37 +-
 .../components/link-to/routing-angle-test.js  |  240 ++-
 .../components/link-to/routing-curly-test.js  |  266 ++-
 .../transitioning-classes-angle-test.js       |   21 +-
 .../transitioning-classes-curly-test.js       |   21 +-
 packages/@ember/-internals/routing/index.ts   |    3 +-
 .../ember/tests/routing/query_params_test.js  |   17 +-
 .../query_param_async_get_handler_test.js     |   46 +-
 .../lib/ember-dev/deprecation.ts              |    2 +-
 20 files changed, 2291 insertions(+), 1118 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/lib/components/-link-to.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index c8a801895ed..f29f23a4a77 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -367,7 +367,7 @@ export { default as RootTemplate } from './lib/templates/root';
 export { default as Checkbox } from './lib/components/checkbox';
 export { default as TextField } from './lib/components/text-field';
 export { default as TextArea } from './lib/components/-textarea';
-export { default as LinkComponent } from './lib/components/link-to';
+export { default as LinkComponent } from './lib/components/-link-to';
 export { default as Input } from './lib/components/input';
 export { default as Textarea } from './lib/components/textarea';
 export { default as Component } from './lib/component';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 88ec920ca62..d2cb69a1c26 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -8,6 +8,7 @@ import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
+  CapturedArguments,
   CompilableProgram,
   Destroyable,
   ElementOperations,
@@ -178,14 +179,19 @@ export default class CurlyComponentManager
 
   prepareArgs(ComponentClass: ComponentFactory, args: VMArguments): Option<PreparedArguments> {
     if (args.named.has('__ARGS__')) {
+      assert(
+        '[BUG] cannot pass both __ARGS__ and positional arguments',
+        args.positional.length === 0
+      );
+
       let { __ARGS__, ...rest } = args.named.capture();
 
+      // does this need to be untracked?
+      let __args__ = valueForRef(__ARGS__) as CapturedArguments;
+
       let prepared = {
-        positional: EMPTY_POSITIONAL_ARGS,
-        named: {
-          ...rest,
-          ...(valueForRef(__ARGS__) as { [key: string]: Reference }),
-        },
+        positional: __args__.positional,
+        named: { ...rest, ...__args__.named },
       };
 
       return prepared;
diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
new file mode 100644
index 00000000000..60eeea301cb
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -0,0 +1,1064 @@
+/**
+@module ember
+*/
+
+import { alias, computed } from '@ember/-internals/metal';
+import { getOwner } from '@ember/-internals/owner';
+import RouterState from '@ember/-internals/routing/lib/system/router_state';
+import { CoreObject } from '@ember/-internals/runtime';
+import { isSimpleClick } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, deprecate, runInDebug, warn } from '@ember/debug';
+import { EngineInstance, getEngineParent } from '@ember/engine';
+import { flaggedInstrument } from '@ember/instrumentation';
+import { inject as injectService } from '@ember/service';
+import { DEBUG } from '@glimmer/env';
+import EmberComponent from '../component';
+import { HAS_BLOCK } from '../component-managers/curly';
+import layout from '../templates/-link-to';
+
+/**
+  The `LinkTo` component renders a link to the supplied `routeName` passing an optionally
+  supplied model to the route as its `model` context of the route. The block for `LinkTo`
+  becomes the contents of the rendered element:
+
+  ```handlebars
+  <LinkTo @route='photoGallery'>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  This will result in:
+
+  ```html
+  <a href="/hamster-photos">
+    Great Hamster Photos
+  </a>
+  ```
+
+  ### Disabling the `LinkTo` component
+
+  The `LinkTo` component can be disabled by using the `disabled` argument. A disabled link
+  doesn't result in a transition when activated, and adds the `disabled` class to the `<a>`
+  element.
+
+  (The class name to apply to the element can be overridden by using the `disabledClass`
+  argument)
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @disabled={{true}}>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  ### Handling `href`
+
+  `<LinkTo>` will use your application's Router to fill the element's `href` property with a URL
+  that matches the path to the supplied `routeName`.
+
+  ### Handling current route
+
+  The `LinkTo` component will apply a CSS class name of 'active' when the application's current
+  route matches the supplied routeName. For example, if the application's current route is
+  'photoGallery.recent', then the following invocation of `LinkTo`:
+
+  ```handlebars
+  <LinkTo @route='photoGallery.recent'>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  will result in
+
+  ```html
+  <a href="/hamster-photos/this-week" class="active">
+    Great Hamster Photos
+  </a>
+  ```
+
+  The CSS class used for active classes can be customized by passing an `activeClass` argument:
+
+  ```handlebars
+  <LinkTo @route='photoGallery.recent' @activeClass="current-url">
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/this-week" class="current-url">
+    Great Hamster Photos
+  </a>
+  ```
+
+  ### Keeping a link active for other routes
+
+  If you need a link to be 'active' even when it doesn't match the current route, you can use the
+  `current-when` argument.
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @current-when='photos'>
+    Photo Gallery
+  </LinkTo>
+  ```
+
+  This may be helpful for keeping links active for:
+
+  * non-nested routes that are logically related
+  * some secondary menu approaches
+  * 'top navigation' with 'sub navigation' scenarios
+
+  A link will be active if `current-when` is `true` or the current
+  route is the route this link would transition to.
+
+  To match multiple routes 'space-separate' the routes:
+
+  ```handlebars
+  <LinkTo @route='gallery' @current-when='photos drawings paintings'>
+    Art Gallery
+  </LinkTo>
+  ```
+
+  ### Supplying a model
+
+  An optional `model` argument can be used for routes whose
+  paths contain dynamic segments. This argument will become
+  the model context of the linked route:
+
+  ```javascript
+  Router.map(function() {
+    this.route("photoGallery", {path: "hamster-photos/:photo_id"});
+  });
+  ```
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @model={{this.aPhoto}}>
+    {{aPhoto.title}}
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/42">
+    Tomster
+  </a>
+  ```
+
+  ### Supplying multiple models
+
+  For deep-linking to route paths that contain multiple
+  dynamic segments, the `models` argument can be used.
+
+  As the router transitions through the route path, each
+  supplied model argument will become the context for the
+  route with the dynamic segments:
+
+  ```javascript
+  Router.map(function() {
+    this.route("photoGallery", { path: "hamster-photos/:photo_id" }, function() {
+      this.route("comment", {path: "comments/:comment_id"});
+    });
+  });
+  ```
+
+  This argument will become the model context of the linked route:
+
+  ```handlebars
+  <LinkTo @route='photoGallery.comment' @models={{array this.aPhoto this.comment}}>
+    {{comment.body}}
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/42/comments/718">
+    A+++ would snuggle again.
+  </a>
+  ```
+
+  ### Supplying an explicit dynamic segment value
+
+  If you don't have a model object available to pass to `LinkTo`,
+  an optional string or integer argument can be passed for routes whose
+  paths contain dynamic segments. This argument will become the value
+  of the dynamic segment:
+
+  ```javascript
+  Router.map(function() {
+    this.route("photoGallery", { path: "hamster-photos/:photo_id" });
+  });
+  ```
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @model={{aPhotoId}}>
+    {{this.aPhoto.title}}
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/42">
+    Tomster
+  </a>
+  ```
+
+  When transitioning into the linked route, the `model` hook will
+  be triggered with parameters including this passed identifier.
+
+  ### Supplying a `tagName`
+
+  By default `<LinkTo>` renders an `<a>` element. This can be overridden for a single use of
+  `<LinkTo>` by supplying a `tagName` argument:
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @tagName='li'>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  This produces:
+
+  ```html
+  <li>
+    Great Hamster Photos
+  </li>
+  ```
+
+  In general, this is not recommended.
+
+  ### Supplying query parameters
+
+  If you need to add optional key-value pairs that appear to the right of the ? in a URL,
+  you can use the `query` argument.
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @query={{hash page=1 per_page=20}}>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  This will result in:
+
+  ```html
+  <a href="/hamster-photos?page=1&per_page=20">
+    Great Hamster Photos
+  </a>
+  ```
+
+  @for Ember.Templates.components
+  @method LinkTo
+  @see {LinkComponent}
+  @public
+*/
+
+/**
+  @module @ember/routing
+*/
+
+/**
+  See [Ember.Templates.components.LinkTo](/ember/release/classes/Ember.Templates.components/methods/input?anchor=LinkTo).
+
+  @for Ember.Templates.helpers
+  @method link-to
+  @see {Ember.Templates.components.LinkTo}
+  @public
+**/
+
+/**
+  `LinkComponent` is the internal component invoked with `<LinkTo>` or `{{link-to}}`.
+
+  @class LinkComponent
+  @extends Component
+  @see {Ember.Templates.components.LinkTo}
+  @public
+**/
+
+const UNDEFINED = Object.freeze({
+  toString() {
+    return 'UNDEFINED';
+  },
+});
+
+const EMPTY_QUERY_PARAMS = Object.freeze({});
+
+const LinkComponent = EmberComponent.extend({
+  layout,
+
+  tagName: 'a',
+
+  /**
+    @property route
+    @public
+  */
+  route: UNDEFINED,
+
+  /**
+    @property model
+    @public
+  */
+  model: UNDEFINED,
+
+  /**
+    @property models
+    @public
+  */
+  models: UNDEFINED,
+
+  /**
+    @property query
+    @public
+  */
+  query: UNDEFINED,
+
+  /**
+    Used to determine when this `LinkComponent` is active.
+
+    @property current-when
+    @public
+  */
+  'current-when': null,
+
+  /**
+    Sets the `title` attribute of the `LinkComponent`'s HTML element.
+
+    @property title
+    @default null
+    @public
+  **/
+  title: null,
+
+  /**
+    Sets the `rel` attribute of the `LinkComponent`'s HTML element.
+
+    @property rel
+    @default null
+    @public
+  **/
+  rel: null,
+
+  /**
+    Sets the `tabindex` attribute of the `LinkComponent`'s HTML element.
+
+    @property tabindex
+    @default null
+    @public
+  **/
+  tabindex: null,
+
+  /**
+    Sets the `target` attribute of the `LinkComponent`'s HTML element.
+
+    @since 1.8.0
+    @property target
+    @default null
+    @public
+  **/
+  target: null,
+
+  /**
+    The CSS class to apply to `LinkComponent`'s element when its `active`
+    property is `true`.
+
+    @property activeClass
+    @type String
+    @default active
+    @public
+  **/
+  activeClass: 'active',
+
+  /**
+    The CSS class to apply to `LinkComponent`'s element when its `loading`
+    property is `true`.
+
+    @property loadingClass
+    @type String
+    @default loading
+    @public
+  **/
+  loadingClass: 'loading',
+
+  /**
+    The CSS class to apply to a `LinkComponent`'s element when its `disabled`
+    property is `true`.
+
+    @property disabledClass
+    @type String
+    @default disabled
+    @public
+  **/
+  disabledClass: 'disabled',
+
+  /**
+    Determines whether the `LinkComponent` will trigger routing via
+    the `replaceWith` routing strategy.
+
+    @property replace
+    @type Boolean
+    @default false
+    @public
+  **/
+  replace: false,
+
+  /**
+    Determines whether the `LinkComponent` will prevent the default
+    browser action by calling preventDefault() to avoid reloading
+    the browser page.
+
+    If you need to trigger a full browser reload pass `@preventDefault={{false}}`:
+
+    ```handlebars
+    <LinkTo @route='photoGallery' @model={{this.aPhotoId}} @preventDefault={{false}}>
+      {{this.aPhotoId.title}}
+    </LinkTo>
+    ```
+
+    @property preventDefault
+    @type Boolean
+    @default true
+    @private
+  **/
+  preventDefault: true,
+
+  /**
+    By default this component will forward `href`, `title`, `rel`, `tabindex`, and `target`
+    arguments to attributes on the component's element. When invoked with `{{link-to}}`, you can
+    only customize these attributes. When invoked with `<LinkTo>`, you can just use HTML
+    attributes directly.
+
+    @property attributeBindings
+    @type Array | String
+    @default ['title', 'rel', 'tabindex', 'target']
+    @public
+  */
+  attributeBindings: ['href', 'title', 'rel', 'tabindex', 'target'],
+
+  /**
+    By default this component will set classes on its element when any of the following arguments
+    are truthy:
+
+    * active
+    * loading
+    * disabled
+
+    When these arguments are truthy, a class with the same name will be set on the element. When
+    falsy, the associated class will not be on the element.
+
+    @property classNameBindings
+    @type Array
+    @default ['active', 'loading', 'disabled', 'ember-transitioning-in', 'ember-transitioning-out']
+    @public
+  */
+  classNameBindings: ['active', 'loading', 'disabled', 'transitioningIn', 'transitioningOut'],
+
+  /**
+    By default this component responds to the `click` event. When the component element is an
+    `<a>` element, activating the link in another way, such as using the keyboard, triggers the
+    click event.
+
+    @property eventName
+    @type String
+    @default click
+    @private
+  */
+  eventName: 'click',
+
+  // this is doc'ed here so it shows up in the events
+  // section of the API documentation, which is where
+  // people will likely go looking for it.
+  /**
+    Triggers the `LinkComponent`'s routing behavior. If
+    `eventName` is changed to a value other than `click`
+    the routing behavior will trigger on that custom event
+    instead.
+
+    @event click
+    @private
+  */
+
+  /**
+    An overridable method called when `LinkComponent` objects are instantiated.
+
+    Example:
+
+    ```app/components/my-link.js
+    import LinkComponent from '@ember/routing/link-component';
+
+    export default LinkComponent.extend({
+      init() {
+        this._super(...arguments);
+        console.log('Event is ' + this.get('eventName'));
+      }
+    });
+    ```
+
+    NOTE: If you do override `init` for a framework class like `Component`,
+    be sure to call `this._super(...arguments)` in your
+    `init` declaration! If you don't, Ember may not have an opportunity to
+    do important setup work, and you'll see strange behavior in your
+    application.
+
+    @method init
+    @private
+  */
+  init() {
+    this._super(...arguments);
+
+    assert(
+      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
+        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
+        'See https://ember-engines.com/docs/links for more info.',
+      !this._isEngine || this._engineMountPoint !== undefined
+    );
+
+    // Map desired event name to invoke function
+    let { eventName } = this;
+    this.on(eventName, this, this._invoke);
+  },
+
+  _routing: injectService('-routing'),
+  _currentRoute: alias('_routing.currentRouteName'),
+  _currentRouterState: alias('_routing.currentState'),
+  _targetRouterState: alias('_routing.targetState'),
+
+  _isEngine: computed(function (this: any) {
+    return getEngineParent(getOwner(this) as EngineInstance) !== undefined;
+  }),
+
+  _engineMountPoint: computed(function (this: any) {
+    return (getOwner(this) as EngineInstance).mountPoint;
+  }),
+
+  _route: computed('route', '_currentRouterState', function computeLinkToComponentRoute(this: any) {
+    let { route } = this;
+
+    return route === UNDEFINED ? this._currentRoute : this._namespaceRoute(route);
+  }),
+
+  _models: computed('model', 'models', function computeLinkToComponentModels(this: any) {
+    let { model, models } = this;
+
+    assert(
+      'You cannot provide both the `@model` and `@models` arguments to the <LinkTo> component.',
+      model === UNDEFINED || models === UNDEFINED
+    );
+
+    if (model !== UNDEFINED) {
+      return [model];
+    } else if (models !== UNDEFINED) {
+      assert('The `@models` argument must be an array.', Array.isArray(models));
+      return models;
+    } else {
+      return [];
+    }
+  }),
+
+  _query: computed('query', function computeLinkToComponentQuery(this: any) {
+    let { query } = this;
+
+    if (query === UNDEFINED) {
+      return EMPTY_QUERY_PARAMS;
+    } else {
+      return Object.assign({}, query);
+    }
+  }),
+
+  /**
+    Accessed as a classname binding to apply the component's `disabledClass`
+    CSS `class` to the element when the link is disabled.
+
+    When `true`, interactions with the element will not trigger route changes.
+    @property disabled
+    @private
+  */
+  disabled: computed({
+    get(_key: string): boolean {
+      // always returns false for `get` because (due to the `set` just below)
+      // the cached return value from the set will prevent this getter from _ever_
+      // being called after a set has occurred
+      return false;
+    },
+
+    set(this: any, _key: string, value: any): boolean {
+      this._isDisabled = value;
+
+      return value ? this.disabledClass : false;
+    },
+  }),
+
+  /**
+    Accessed as a classname binding to apply the component's `activeClass`
+    CSS `class` to the element when the link is active.
+
+    This component is considered active when its `currentWhen` property is `true`
+    or the application's current route is the route this component would trigger
+    transitions into.
+
+    The `currentWhen` property can match against multiple routes by separating
+    route names using the ` ` (space) character.
+
+    @property active
+    @private
+  */
+  active: computed('activeClass', '_active', function computeLinkToComponentActiveClass(this: any) {
+    return this._active ? this.activeClass : false;
+  }),
+
+  _active: computed(
+    '_currentRouterState',
+    '_route',
+    '_models',
+    '_query',
+    'loading',
+    'current-when',
+    function computeLinkToComponentActive(this: any) {
+      let { _currentRouterState: state } = this;
+
+      if (state) {
+        return this._isActive(state);
+      } else {
+        return false;
+      }
+    }
+  ),
+
+  willBeActive: computed(
+    '_currentRouterState',
+    '_targetRouterState',
+    '_route',
+    '_models',
+    '_query',
+    'loading',
+    'current-when',
+    function computeLinkToComponentWillBeActive(this: any) {
+      let { _currentRouterState: current, _targetRouterState: target } = this;
+
+      if (current === target) {
+        return;
+      }
+
+      return this._isActive(target);
+    }
+  ),
+
+  _isActive(routerState: RouterState): boolean {
+    if (this.loading) {
+      return false;
+    }
+
+    let currentWhen = this['current-when'];
+
+    if (typeof currentWhen === 'boolean') {
+      return currentWhen;
+    }
+
+    let { _models: models, _routing: routing } = this;
+
+    if (typeof currentWhen === 'string') {
+      return currentWhen
+        .split(' ')
+        .some((route) =>
+          routing.isActiveForRoute(models, undefined, this._namespaceRoute(route), routerState)
+        );
+    } else {
+      return routing.isActiveForRoute(models, this._query, this._route, routerState);
+    }
+  },
+
+  transitioningIn: computed(
+    '_active',
+    'willBeActive',
+    function computeLinkToComponentTransitioningIn(this: any) {
+      if (this.willBeActive === true && !this._active) {
+        return 'ember-transitioning-in';
+      } else {
+        return false;
+      }
+    }
+  ),
+
+  transitioningOut: computed(
+    '_active',
+    'willBeActive',
+    function computeLinkToComponentTransitioningOut(this: any) {
+      if (this.willBeActive === false && this._active) {
+        return 'ember-transitioning-out';
+      } else {
+        return false;
+      }
+    }
+  ),
+
+  _namespaceRoute(route: string): string {
+    let { _engineMountPoint: mountPoint } = this;
+
+    if (mountPoint === undefined) {
+      return route;
+    } else if (route === 'application') {
+      return mountPoint;
+    } else {
+      return `${mountPoint}.${route}`;
+    }
+  },
+
+  /**
+    Event handler that invokes the link, activating the associated route.
+
+    @method _invoke
+    @param {Event} event
+    @private
+  */
+  _invoke(this: any, event: Event): boolean {
+    if (!isSimpleClick(event)) {
+      return true;
+    }
+
+    let { bubbles, preventDefault } = this;
+    let target = this.element.target;
+    let isSelf = !target || target === '_self';
+
+    if (preventDefault !== false && isSelf) {
+      event.preventDefault();
+    }
+
+    if (bubbles === false) {
+      event.stopPropagation();
+    }
+
+    if (this._isDisabled) {
+      return false;
+    }
+
+    if (this.loading) {
+      // tslint:disable-next-line:max-line-length
+      warn(
+        'This link is in an inactive loading state because at least one of its models ' +
+          'currently has a null/undefined value, or the provided route name is invalid.',
+        false,
+        {
+          id: 'ember-glimmer.link-to.inactive-loading-state',
+        }
+      );
+      return false;
+    }
+
+    if (!isSelf) {
+      return false;
+    }
+
+    let { _route: routeName, _models: models, _query: queryParams, replace: shouldReplace } = this;
+
+    let payload = {
+      queryParams,
+      routeName,
+    };
+
+    flaggedInstrument(
+      'interaction.link-to',
+      payload,
+      this._generateTransition(payload, routeName, models, queryParams, shouldReplace)
+    );
+    return false;
+  },
+
+  _generateTransition(
+    payload: any,
+    qualifiedRouteName: string,
+    models: any[],
+    queryParams: any[],
+    shouldReplace: boolean
+  ) {
+    let { _routing: routing } = this;
+
+    return () => {
+      payload.transition = routing.transitionTo(
+        qualifiedRouteName,
+        models,
+        queryParams,
+        shouldReplace
+      );
+    };
+  },
+
+  /**
+    Sets the element's `href` attribute to the url for
+    the `LinkComponent`'s targeted route.
+
+    If the `LinkComponent`'s `tagName` is changed to a value other
+    than `a`, this property will be ignored.
+
+    @property href
+    @private
+  */
+  href: computed(
+    '_currentRouterState',
+    '_route',
+    '_models',
+    '_query',
+    'tagName',
+    'loading',
+    'loadingHref',
+    function computeLinkToComponentHref(this: any) {
+      if (this.tagName !== 'a') {
+        return;
+      }
+
+      if (this.loading) {
+        return this.loadingHref;
+      }
+
+      let { _route: route, _models: models, _query: query, _routing: routing } = this;
+
+      if (DEBUG) {
+        /*
+         * Unfortunately, to get decent error messages, we need to do this.
+         * In some future state we should be able to use a "feature flag"
+         * which allows us to strip this without needing to call it twice.
+         *
+         * if (isDebugBuild()) {
+         *   // Do the useful debug thing, probably including try/catch.
+         * } else {
+         *   // Do the performant thing.
+         * }
+         */
+        try {
+          return routing.generateURL(route, models, query);
+        } catch (e) {
+          // tslint:disable-next-line:max-line-length
+          e.message = `While generating link to route "${this.route}": ${e.message}`;
+          throw e;
+        }
+      } else {
+        return routing.generateURL(route, models, query);
+      }
+    }
+  ),
+
+  loading: computed(
+    '_route',
+    '_modelsAreLoaded',
+    'loadingClass',
+    function computeLinkToComponentLoading(this: any) {
+      let { _route: route, _modelsAreLoaded: loaded } = this;
+
+      if (!loaded || route === null || route === undefined) {
+        return this.loadingClass;
+      }
+    }
+  ),
+
+  _modelsAreLoaded: computed('_models', function computeLinkToComponentModelsAreLoaded(this: any) {
+    let { _models: models } = this;
+
+    for (let i = 0; i < models.length; i++) {
+      let model = models[i];
+      if (model === null || model === undefined) {
+        return false;
+      }
+    }
+
+    return true;
+  }),
+
+  /**
+    The default href value to use while a link-to is loading.
+    Only applies when tagName is 'a'
+
+    @property loadingHref
+    @type String
+    @default #
+    @private
+  */
+  loadingHref: '#',
+
+  didReceiveAttrs() {
+    let { disabledWhen } = this;
+
+    if (disabledWhen !== undefined) {
+      this.set('disabled', disabledWhen);
+    }
+
+    let { params } = this;
+
+    if (!params || params.length === 0) {
+      assert(
+        'You must provide at least one of the `@route`, `@model`, `@models` or `@query` argument to `<LinkTo>`.',
+        !(
+          this.route === UNDEFINED &&
+          this.model === UNDEFINED &&
+          this.models === UNDEFINED &&
+          this.query === UNDEFINED
+        )
+      );
+
+      let { _models: models } = this;
+      if (models.length > 0) {
+        let lastModel = models[models.length - 1];
+
+        if (typeof lastModel === 'object' && lastModel !== null && lastModel.isQueryParams) {
+          this.query = lastModel.values;
+          models.pop();
+        }
+      }
+
+      return;
+    }
+
+    let hasBlock = this[HAS_BLOCK];
+
+    params = params.slice();
+
+    // Process the positional arguments, in order.
+    // 1. Inline link title comes first, if present.
+    if (!hasBlock) {
+      this.set('linkTitle', params.shift());
+    }
+
+    // 2. The last argument is possibly the `query` object.
+    let queryParams = params[params.length - 1];
+
+    if (queryParams && queryParams.isQueryParams) {
+      this.set('query', params.pop().values);
+    } else {
+      this.set('query', UNDEFINED);
+    }
+
+    // 3. If there is a `route`, it is now at index 0.
+    if (params.length === 0) {
+      this.set('route', UNDEFINED);
+    } else {
+      this.set('route', params.shift());
+    }
+
+    // 4. Any remaining indices (if any) are `models`.
+    this.set('model', UNDEFINED);
+    this.set('models', params);
+
+    runInDebug(() => {
+      params = this.params.slice();
+
+      let equivalentNamedArgs = [];
+      let hasQueryParams = false;
+
+      // Process the positional arguments, in order.
+      // 1. Inline link title comes first, if present.
+      if (!hasBlock) {
+        params.shift();
+      }
+
+      // 2. The last argument is possibly the `query` object.
+      let query = params[params.length - 1];
+
+      if (query && query.isQueryParams) {
+        params.pop();
+        hasQueryParams = true;
+      }
+
+      // 3. If there is a `route`, it is now at index 0.
+      if (params.length > 0) {
+        params.shift();
+        equivalentNamedArgs.push('`@route`');
+      }
+
+      // 4. Any remaining params (if any) are `models`.
+      if (params.length === 1) {
+        equivalentNamedArgs.push('`@model`');
+      } else if (params.length > 1) {
+        equivalentNamedArgs.push('`@models`');
+      }
+
+      if (hasQueryParams) {
+        equivalentNamedArgs.push('`@query`');
+      }
+
+      if (equivalentNamedArgs.length > 0) {
+        let message = 'Invoking the `<LinkTo>` component with positional arguments is deprecated.';
+
+        message += `Please use the equivalent named arguments (${equivalentNamedArgs.join(', ')})`;
+
+        if (hasQueryParams) {
+          message += ' along with the `hash` helper';
+        }
+
+        if (!hasBlock) {
+          message += " and pass a block for the link's content.";
+        }
+
+        message += '.';
+
+        deprecate(message, false, {
+          id: 'ember-glimmer.link-to.positional-arguments',
+          until: '4.0.0',
+          for: 'ember-source',
+          url:
+            'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
+          since: {
+            enabled: '3.26.0-beta.1',
+          },
+        });
+      }
+    });
+  },
+});
+
+LinkComponent.toString = () => '@ember/routing/link-component';
+
+LinkComponent.reopenClass({
+  positionalParams: 'params',
+});
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  Object.defineProperty(LinkComponent, '_wasReopened', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+
+  Object.defineProperty(LinkComponent, 'reopen', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopen(this: typeof LinkComponent, ...args: unknown[]): unknown {
+      if (this === LinkComponent) {
+        deprecate(
+          'Reopening Ember.LinkComponent is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        LinkComponent._wasReopened = true;
+      }
+
+      return CoreObject.reopen.call(this, ...args);
+    },
+  });
+
+  Object.defineProperty(LinkComponent, 'reopenClass', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: function reopenClass(this: typeof LinkComponent, ...args: unknown[]): unknown {
+      if (this === LinkComponent) {
+        deprecate(
+          'Reopening Ember.LinkComponent is deprecated. Consider implementing your own ' +
+            'wrapper component or create a custom subclass.',
+          false,
+          {
+            id: 'ember.built-in-components.reopen',
+            for: 'ember-source',
+            since: {},
+            until: '4.0.0',
+          }
+        );
+
+        LinkComponent._wasReopened = true;
+      }
+
+      return CoreObject.reopenClass.call(this, ...args);
+    },
+  });
+}
+
+export default LinkComponent;
diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index cc08b53de5e..0e8ad503e2f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -116,6 +116,15 @@ export default abstract class AbstractInput
   implements DeprecatingInternalComponent {
   modernized = this.shouldModernize();
 
+  validateArguments(): void {
+    assert(
+      `The ${this.constructor} component does not take any positional arguments`,
+      this.args.positional.length === 0
+    );
+
+    super.validateArguments();
+  }
+
   protected shouldModernize(): boolean {
     return (
       Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
@@ -125,7 +134,7 @@ export default abstract class AbstractInput
     );
   }
 
-  private _value = valueFrom(this.args.value);
+  private _value = valueFrom(this.args.named.value);
 
   get value(): unknown {
     return this._value.get();
@@ -216,7 +225,7 @@ export function handleDeprecatedFeatures(
       configurable: true,
       enumerable: false,
       value: function listenerFor(this: AbstractInput, name: string): EventListener {
-        const actionName = this.arg(name);
+        const actionName = this.named(name);
 
         if (typeof actionName === 'string') {
           deprecate(
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index b01be4a3793..b977bc5c6a8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -186,7 +186,7 @@ class Input extends AbstractInput {
    * The HTML type attribute.
    */
   get type(): string {
-    let type = this.arg('type');
+    let type = this.named('type');
 
     if (type === null || type === undefined) {
       return 'text';
@@ -201,10 +201,10 @@ class Input extends AbstractInput {
   }
 
   get isCheckbox(): boolean {
-    return this.arg('type') === 'checkbox';
+    return this.named('type') === 'checkbox';
   }
 
-  private _checked = valueFrom(this.args.checked);
+  private _checked = valueFrom(this.args.named.checked);
 
   get checked(): unknown {
     if (this.isCheckbox) {
@@ -214,9 +214,9 @@ class Input extends AbstractInput {
           'Did you mean `<Input @type="checkbox" @checked={{...}} />`?',
         untrack(
           () =>
-            this.args.checked !== undefined ||
-            this.args.value === undefined ||
-            typeof valueForRef(this.args.value) === 'string'
+            this.args.named.checked !== undefined ||
+            this.args.named.value === undefined ||
+            typeof valueForRef(this.args.named.value) === 'string'
         ),
         { id: 'ember.built-in-components.input-checkbox-value' }
       );
@@ -234,9 +234,9 @@ class Input extends AbstractInput {
         'Did you mean `<Input @type="checkbox" @checked={{...}} />`?',
       untrack(
         () =>
-          this.args.checked !== undefined ||
-          this.args.value === undefined ||
-          typeof valueForRef(this.args.value) === 'string'
+          this.args.named.checked !== undefined ||
+          this.args.named.value === undefined ||
+          typeof valueForRef(this.args.named.value) === 'string'
       ),
       { id: 'ember.built-in-components.input-checkbox-value' }
     );
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 1643892ab47..b30bc75812c 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -5,7 +5,7 @@ import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
 import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import {
-  CapturedNamedArguments,
+  CapturedArguments,
   Destroyable,
   DynamicScope,
   Environment,
@@ -38,7 +38,7 @@ export default class InternalComponent {
 
   constructor(
     protected owner: Owner,
-    protected readonly args: Record<string, Reference | undefined>,
+    protected readonly args: CapturedArguments,
     protected readonly caller: unknown
   ) {
     setOwner(this, owner);
@@ -66,13 +66,26 @@ export default class InternalComponent {
     return 'ember-view';
   }
 
-  protected arg(name: string): unknown {
-    let ref = this.args[name];
+  protected validateArguments(): void {
+    for (let name of Object.keys(this.args.named)) {
+      if (!this.isSupportedArgument(name)) {
+        this.onUnsupportedArgument(name);
+      }
+    }
+  }
+
+  protected named(name: string): unknown {
+    let ref = this.args.named[name];
+    return ref ? valueForRef(ref) : undefined;
+  }
+
+  protected positional(index: number): unknown {
+    let ref = this.args.positional[index];
     return ref ? valueForRef(ref) : undefined;
   }
 
   protected listenerFor(name: string): EventListener {
-    let listener = this.arg(name);
+    let listener = this.named(name);
 
     if (listener) {
       assert(
@@ -95,12 +108,12 @@ export default class InternalComponent {
   protected onUnsupportedArgument(_name: string): void {}
 
   toString(): string {
-    return `<${this.constructor.toString()}:${guidFor(this)}>`;
+    return `<${this.constructor}:${guidFor(this)}>`;
   }
 }
 
 export interface InternalComponentConstructor<T extends InternalComponent = InternalComponent> {
-  new (owner: Owner, args: CapturedNamedArguments, caller: unknown): T;
+  new (owner: Owner, args: CapturedArguments, caller: unknown): T;
   prototype: T;
   toString(): string;
 }
@@ -188,22 +201,9 @@ class InternalManager
 
     let ComponentClass = deopaquify(definition);
 
-    assert(
-      `The ${definition.toString()} component does not take any positional arguments`,
-      args.positional.length === 0
-    );
-
-    let instance = new ComponentClass(owner, args.named.capture(), valueForRef(caller));
+    let instance = new ComponentClass(owner, args.capture(), valueForRef(caller));
 
-    untrack(
-      function (this: InternalComponent): void {
-        for (let name of args.named.names) {
-          if (!this.isSupportedArgument(name)) {
-            this.onUnsupportedArgument(name);
-          }
-        }
-      }.bind(instance)
-    );
+    untrack(instance['validateArguments'].bind(instance));
 
     return instance;
   }
@@ -274,7 +274,7 @@ export function handleDeprecatedAttributeArguments(
 ): void {
   if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     let angle = target.toString();
-    let curly = angle.toLowerCase();
+    let curly = angle.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
     let { prototype } = target;
 
     let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
@@ -329,7 +329,7 @@ export function handleDeprecatedAttributeArguments(
         configurable: true,
         enumerable: true,
         get(this: DeprecatingInternalComponent): unknown {
-          if (argument in this.args) {
+          if (argument in this.args.named) {
             deprecate(
               `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
                 `Instead, please pass the attribute directly, i.e. \`<${angle} ${attribute}={{...}} />\` ` +
@@ -345,9 +345,9 @@ export function handleDeprecatedAttributeArguments(
 
             // The `class` attribute is concatenated/merged instead of clobbered
             if (attribute === 'class' && superDescriptor) {
-              return `${superGetter.call(this)} ${this.arg(argument)}`;
+              return `${superGetter.call(this)} ${this.named(argument)}`;
             } else {
-              return this.arg(argument);
+              return this.named(argument);
             }
           } else {
             return superGetter.call(this);
@@ -360,7 +360,7 @@ export function handleDeprecatedAttributeArguments(
 
 export let handleDeprecatedEventArguments: (
   target: DeprecatingInternalComponentConstructor,
-  extraEvents: Array<[event: string, argument: string]>
+  extraEvents?: Array<[event: string, argument: string]>
 ) => void = NOOP;
 
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
@@ -368,33 +368,42 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
 
   const EVENTS = new WeakMap<object, EventsMap>();
 
+  const EMPTY_EVENTS = Object.freeze({}) as EventsMap;
+
   const getEventsMap = (owner: Owner): EventsMap => {
     let events = EVENTS.get(owner);
 
     if (events === undefined) {
+      events = EMPTY_EVENTS;
+
       let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
         'event_dispatcher:main'
       );
 
-      assert(
-        '[BUG] missing event dispatcher',
-        eventDispatcher !== null && typeof eventDispatcher === 'object'
-      );
+      if (eventDispatcher !== null && eventDispatcher !== undefined) {
+        assert('[BUG] invalid event dispatcher', typeof eventDispatcher === 'object');
+
+        if (
+          '_finalEvents' in eventDispatcher &&
+          eventDispatcher._finalEvents !== null &&
+          eventDispatcher._finalEvents !== undefined
+        ) {
+          assert(
+            '[BUG] invalid _finalEvents on event dispatcher',
+            typeof eventDispatcher._finalEvents === 'object'
+          );
 
-      assert(
-        '[BUG] missing _finalEvents on event dispatcher',
-        '_finalEvents' in eventDispatcher &&
-          eventDispatcher?._finalEvents !== null &&
-          typeof eventDispatcher?._finalEvents === 'object'
-      );
+          events = eventDispatcher._finalEvents;
+        }
+      }
 
-      EVENTS.set(owner, (events = eventDispatcher._finalEvents));
+      EVENTS.set(owner, events);
     }
 
     return events;
   };
 
-  handleDeprecatedEventArguments = (target, extraEvents) => {
+  handleDeprecatedEventArguments = (target, extraEvents = []) => {
     let angle = target.toString();
     let curly = angle.toLowerCase();
     let { prototype } = target;
@@ -479,7 +488,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       ): Option<EventListener> {
         assert(`[BUG] must be called with <${angle}> component as this`, this instanceof target);
 
-        if (argument in this.args) {
+        if (argument in this.args.named) {
           deprecate(
             `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
               `This would have overwritten the internal \`${argument}\` method on ` +
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index f9117580d39..32b69ea997b 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,1003 +1,741 @@
-/**
-@module ember
-*/
-
-import { alias, computed } from '@ember/-internals/metal';
-import { getOwner } from '@ember/-internals/owner';
-import RouterState from '@ember/-internals/routing/lib/system/router_state';
+import { Owner } from '@ember/-internals/owner';
+import { RouterState, RoutingService } from '@ember/-internals/routing';
+import { QueryParam } from '@ember/-internals/routing/lib/system/router';
+import { TargetActionSupport } from '@ember/-internals/runtime';
 import { isSimpleClick } from '@ember/-internals/views';
-import { assert, deprecate, runInDebug, warn } from '@ember/debug';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { assert, debugFreeze, deprecate, warn } from '@ember/debug';
+import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
-import { inject as injectService } from '@ember/service';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import EmberComponent from '../component';
-import { HAS_BLOCK } from '../component-managers/curly';
-import layout from '../templates/link-to';
-
-/**
-  The `LinkTo` component renders a link to the supplied `routeName` passing an optionally
-  supplied model to the route as its `model` context of the route. The block for `LinkTo`
-  becomes the contents of the rendered element:
-
-  ```handlebars
-  <LinkTo @route='photoGallery'>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  This will result in:
-
-  ```html
-  <a href="/hamster-photos">
-    Great Hamster Photos
-  </a>
-  ```
-
-  ### Disabling the `LinkTo` component
-
-  The `LinkTo` component can be disabled by using the `disabled` argument. A disabled link
-  doesn't result in a transition when activated, and adds the `disabled` class to the `<a>`
-  element.
+import { Maybe, Option } from '@glimmer/interfaces';
+import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
+import { Transition } from 'router_js';
+import Component from '../component';
+import LinkToTemplate from '../templates/link-to';
+import LegacyLinkTo from './-link-to';
+import InternalComponent, {
+  DeprecatingInternalComponent,
+  handleDeprecatedArguments,
+  handleDeprecatedAttributeArguments,
+  handleDeprecatedEventArguments,
+  jQueryEventShim,
+  opaquify,
+} from './internal';
+
+const EMPTY_ARRAY: {}[] = [];
+const EMPTY_QUERY_PARAMS = {};
+
+debugFreeze(EMPTY_ARRAY);
+debugFreeze(EMPTY_QUERY_PARAMS);
+
+function isMissing<T>(value: Maybe<T>): value is null | undefined {
+  return value === null || value === undefined;
+}
+
+function isPresent<T>(value: Maybe<T>): value is T {
+  return !isMissing(value);
+}
+
+interface QueryParams {
+  isQueryParams: true;
+  values: Option<{}>;
+}
+
+function isQueryParams(value: unknown): value is QueryParams {
+  return typeof value === 'object' && value !== null && value['isQueryParams'] === true;
+}
+
+class LinkTo extends InternalComponent implements DeprecatingInternalComponent {
+  static toString(): string {
+    return 'LinkTo';
+  }
+
+  modernized = this.shouldModernize();
+
+  @service('-routing') private declare routing: RoutingService;
+
+  validateArguments(): void {
+    assert(
+      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
+        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
+        'See https://ember-engines.com/docs/links for more info.',
+      !this.modernized || !this.isEngine || this.engineMountPoint !== undefined
+    );
 
-  (The class name to apply to the element can be overridden by using the `disabledClass`
-  argument)
+    assert(
+      'You must provide at least one of the `@route`, `@model`, `@models` or `@query` argument to `<LinkTo>`.',
+      !this.modernized ||
+        'route' in this.args.named ||
+        'model' in this.args.named ||
+        'models' in this.args.named ||
+        'query' in this.args.named
+    );
 
-  ```handlebars
-  <LinkTo @route='photoGallery' @disabled={{true}}>
-    Great Hamster Photos
-  </LinkTo>
-  ```
+    assert(
+      'You cannot provide both the `@model` and `@models` arguments to the <LinkTo> component.',
+      !('model' in this.args.named && 'models' in this.args.named)
+    );
 
-  ### Handling `href`
+    super.validateArguments();
+  }
 
-  `<LinkTo>` will use your application's Router to fill the element's `href` property with a URL
-  that matches the path to the supplied `routeName`.
+  get class(): string {
+    let classes = 'ember-view';
 
-  ### Handling current route
+    if (this.isActive) {
+      classes += this.classFor('active');
 
-  The `LinkTo` component will apply a CSS class name of 'active' when the application's current
-  route matches the supplied routeName. For example, if the application's current route is
-  'photoGallery.recent', then the following invocation of `LinkTo`:
+      if (this.willBeActive === false) {
+        classes += ' ember-transitioning-out';
+      }
+    } else if (this.willBeActive) {
+      classes += ' ember-transitioning-in';
+    }
 
-  ```handlebars
-  <LinkTo @route='photoGallery.recent'>
-    Great Hamster Photos
-  </LinkTo>
-  ```
+    if (this.isLoading) {
+      classes += this.classFor('loading');
+    }
 
-  will result in
+    if (this.isDisabled) {
+      classes += this.classFor('disabled');
+    }
 
-  ```html
-  <a href="/hamster-photos/this-week" class="active">
-    Great Hamster Photos
-  </a>
-  ```
+    return classes;
+  }
 
-  The CSS class used for active classes can be customized by passing an `activeClass` argument:
+  get href() {
+    if (this.isLoading) {
+      return '#';
+    }
 
-  ```handlebars
-  <LinkTo @route='photoGallery.recent' @activeClass="current-url">
-    Great Hamster Photos
-  </LinkTo>
-  ```
+    let { routing, route, models, query } = this;
 
-  ```html
-  <a href="/hamster-photos/this-week" class="current-url">
-    Great Hamster Photos
-  </a>
-  ```
+    assert('[BUG] route can only be missing if isLoading is true', isPresent(route));
 
-  ### Keeping a link active for other routes
+    // consume the current router state so we invalidate when QP changes
+    // TODO: can we narrow this down to QP changes only?
+    consumeTag(tagFor(routing, 'currentState'));
 
-  If you need a link to be 'active' even when it doesn't match the current route, you can use the
-  `current-when` argument.
+    if (DEBUG) {
+      try {
+        return routing.generateURL(route, models, query);
+      } catch (e) {
+        // tslint:disable-next-line:max-line-length
+        e.message = `While generating link to route "${route}": ${e.message}`;
+        throw e;
+      }
+    } else {
+      return routing.generateURL(route, models, query);
+    }
+  }
 
-  ```handlebars
-  <LinkTo @route='photoGallery' @current-when='photos'>
-    Photo Gallery
-  </LinkTo>
-  ```
+  @action click(event: Event): void {
+    if (!isSimpleClick(event)) {
+      return;
+    }
 
-  This may be helpful for keeping links active for:
+    let element = event.target;
+    assert('[BUG] must be an <a> element', element instanceof HTMLAnchorElement);
 
-  * non-nested routes that are logically related
-  * some secondary menu approaches
-  * 'top navigation' with 'sub navigation' scenarios
+    let isSelf = element.target === '' || element.target === '_self';
 
-  A link will be active if `current-when` is `true` or the current
-  route is the route this link would transition to.
+    if (isSelf) {
+      this.preventDefault(event);
+    } else {
+      return;
+    }
 
-  To match multiple routes 'space-separate' the routes:
+    if (this.isDisabled) {
+      return;
+    }
 
-  ```handlebars
-  <LinkTo @route='gallery' @current-when='photos drawings paintings'>
-    Art Gallery
-  </LinkTo>
-  ```
+    if (this.isLoading) {
+      warn(
+        'This link is in an inactive loading state because at least one of its models ' +
+          'currently has a null/undefined value, or the provided route name is invalid.',
+        false,
+        {
+          id: 'ember-glimmer.link-to.inactive-loading-state',
+        }
+      );
 
-  ### Supplying a model
+      return;
+    }
 
-  An optional `model` argument can be used for routes whose
-  paths contain dynamic segments. This argument will become
-  the model context of the linked route:
+    let { routing, route, models, query, replace } = this;
 
-  ```javascript
-  Router.map(function() {
-    this.route("photoGallery", {path: "hamster-photos/:photo_id"});
-  });
-  ```
+    let payload = {
+      routeName: route,
+      queryParams: query,
+      transition: undefined as Transition | undefined,
+    };
 
-  ```handlebars
-  <LinkTo @route='photoGallery' @model={{this.aPhoto}}>
-    {{aPhoto.title}}
-  </LinkTo>
-  ```
+    flaggedInstrument('interaction.link-to', payload, () => {
+      assert('[BUG] route can only be missing if isLoading is true', isPresent(route));
 
-  ```html
-  <a href="/hamster-photos/42">
-    Tomster
-  </a>
-  ```
+      // TODO: is the signature wrong? this.query is definitely NOT a QueryParam!
+      payload.transition = routing.transitionTo(route, models, query as QueryParam, replace);
+    });
+  }
 
-  ### Supplying multiple models
+  private get route(): Maybe<string> {
+    if ('route' in this.args.named) {
+      let route = this.named('route');
 
-  For deep-linking to route paths that contain multiple
-  dynamic segments, the `models` argument can be used.
+      assert(
+        'The `@route` argument to the <LinkTo> component must be a string',
+        isMissing(route) || typeof route === 'string'
+      );
 
-  As the router transitions through the route path, each
-  supplied model argument will become the context for the
-  route with the dynamic segments:
+      return route && this.namespaceRoute(route);
+    } else {
+      return this.currentRoute;
+    }
+  }
 
-  ```javascript
-  Router.map(function() {
-    this.route("photoGallery", { path: "hamster-photos/:photo_id" }, function() {
-      this.route("comment", {path: "comments/:comment_id"});
-    });
+  // GH #17963
+  private currentRouteCache = createCache<Maybe<string>>(() => {
+    consumeTag(tagFor(this.routing, 'currentState'));
+    return untrack(() => this.routing.currentRouteName);
   });
-  ```
 
-  This argument will become the model context of the linked route:
+  private get currentRoute(): Maybe<string> {
+    return getValue(this.currentRouteCache);
+  }
 
-  ```handlebars
-  <LinkTo @route='photoGallery.comment' @models={{array this.aPhoto this.comment}}>
-    {{comment.body}}
-  </LinkTo>
-  ```
+  // TODO: not sure why generateURL takes {}[] instead of unknown[]
+  private get models(): {}[] {
+    if ('models' in this.args.named) {
+      let models = this.named('models');
 
-  ```html
-  <a href="/hamster-photos/42/comments/718">
-    A+++ would snuggle again.
-  </a>
-  ```
+      assert(
+        'The `@models` argument to the <LinkTo> component must be an array.',
+        Array.isArray(models)
+      );
 
-  ### Supplying an explicit dynamic segment value
+      return models;
+    } else if ('model' in this.args.named) {
+      return [this.named('model') as {}];
+    } else {
+      return EMPTY_ARRAY;
+    }
+  }
 
-  If you don't have a model object available to pass to `LinkTo`,
-  an optional string or integer argument can be passed for routes whose
-  paths contain dynamic segments. This argument will become the value
-  of the dynamic segment:
+  // TODO: this should probably be Record<string, unknown> or something
+  private get query(): {} {
+    if ('query' in this.args.named) {
+      let query = this.named('query');
 
-  ```javascript
-  Router.map(function() {
-    this.route("photoGallery", { path: "hamster-photos/:photo_id" });
-  });
-  ```
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @model={{aPhotoId}}>
-    {{this.aPhoto.title}}
-  </LinkTo>
-  ```
-
-  ```html
-  <a href="/hamster-photos/42">
-    Tomster
-  </a>
-  ```
-
-  When transitioning into the linked route, the `model` hook will
-  be triggered with parameters including this passed identifier.
-
-  ### Supplying a `tagName`
-
-  By default `<LinkTo>` renders an `<a>` element. This can be overridden for a single use of
-  `<LinkTo>` by supplying a `tagName` argument:
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @tagName='li'>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  This produces:
-
-  ```html
-  <li>
-    Great Hamster Photos
-  </li>
-  ```
-
-  In general, this is not recommended.
-
-  ### Supplying query parameters
-
-  If you need to add optional key-value pairs that appear to the right of the ? in a URL,
-  you can use the `query` argument.
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @query={{hash page=1 per_page=20}}>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  This will result in:
-
-  ```html
-  <a href="/hamster-photos?page=1&per_page=20">
-    Great Hamster Photos
-  </a>
-  ```
-
-  @for Ember.Templates.components
-  @method LinkTo
-  @see {LinkComponent}
-  @public
-*/
-
-/**
-  @module @ember/routing
-*/
-
-/**
-  See [Ember.Templates.components.LinkTo](/ember/release/classes/Ember.Templates.components/methods/input?anchor=LinkTo).
-
-  @for Ember.Templates.helpers
-  @method link-to
-  @see {Ember.Templates.components.LinkTo}
-  @public
-**/
-
-/**
-  `LinkComponent` is the internal component invoked with `<LinkTo>` or `{{link-to}}`.
-
-  @class LinkComponent
-  @extends Component
-  @see {Ember.Templates.components.LinkTo}
-  @public
-**/
-
-const UNDEFINED = Object.freeze({
-  toString() {
-    return 'UNDEFINED';
-  },
-});
-
-const EMPTY_QUERY_PARAMS = Object.freeze({});
-
-const LinkComponent = EmberComponent.extend({
-  layout,
-
-  tagName: 'a',
-
-  /**
-    @property route
-    @public
-  */
-  route: UNDEFINED,
-
-  /**
-    @property model
-    @public
-  */
-  model: UNDEFINED,
-
-  /**
-    @property models
-    @public
-  */
-  models: UNDEFINED,
-
-  /**
-    @property query
-    @public
-  */
-  query: UNDEFINED,
-
-  /**
-    Used to determine when this `LinkComponent` is active.
-
-    @property current-when
-    @public
-  */
-  'current-when': null,
-
-  /**
-    Sets the `title` attribute of the `LinkComponent`'s HTML element.
-
-    @property title
-    @default null
-    @public
-  **/
-  title: null,
-
-  /**
-    Sets the `rel` attribute of the `LinkComponent`'s HTML element.
-
-    @property rel
-    @default null
-    @public
-  **/
-  rel: null,
-
-  /**
-    Sets the `tabindex` attribute of the `LinkComponent`'s HTML element.
-
-    @property tabindex
-    @default null
-    @public
-  **/
-  tabindex: null,
-
-  /**
-    Sets the `target` attribute of the `LinkComponent`'s HTML element.
-
-    @since 1.8.0
-    @property target
-    @default null
-    @public
-  **/
-  target: null,
-
-  /**
-    The CSS class to apply to `LinkComponent`'s element when its `active`
-    property is `true`.
-
-    @property activeClass
-    @type String
-    @default active
-    @public
-  **/
-  activeClass: 'active',
-
-  /**
-    The CSS class to apply to `LinkComponent`'s element when its `loading`
-    property is `true`.
-
-    @property loadingClass
-    @type String
-    @default loading
-    @public
-  **/
-  loadingClass: 'loading',
-
-  /**
-    The CSS class to apply to a `LinkComponent`'s element when its `disabled`
-    property is `true`.
-
-    @property disabledClass
-    @type String
-    @default disabled
-    @public
-  **/
-  disabledClass: 'disabled',
-
-  /**
-    Determines whether the `LinkComponent` will trigger routing via
-    the `replaceWith` routing strategy.
-
-    @property replace
-    @type Boolean
-    @default false
-    @public
-  **/
-  replace: false,
-
-  /**
-    Determines whether the `LinkComponent` will prevent the default
-    browser action by calling preventDefault() to avoid reloading
-    the browser page.
-
-    If you need to trigger a full browser reload pass `@preventDefault={{false}}`:
-
-    ```handlebars
-    <LinkTo @route='photoGallery' @model={{this.aPhotoId}} @preventDefault={{false}}>
-      {{this.aPhotoId.title}}
-    </LinkTo>
-    ```
-
-    @property preventDefault
-    @type Boolean
-    @default true
-    @private
-  **/
-  preventDefault: true,
-
-  /**
-    By default this component will forward `href`, `title`, `rel`, `tabindex`, and `target`
-    arguments to attributes on the component's element. When invoked with `{{link-to}}`, you can
-    only customize these attributes. When invoked with `<LinkTo>`, you can just use HTML
-    attributes directly.
-
-    @property attributeBindings
-    @type Array | String
-    @default ['title', 'rel', 'tabindex', 'target']
-    @public
-  */
-  attributeBindings: ['href', 'title', 'rel', 'tabindex', 'target'],
-
-  /**
-    By default this component will set classes on its element when any of the following arguments
-    are truthy:
-
-    * active
-    * loading
-    * disabled
-
-    When these arguments are truthy, a class with the same name will be set on the element. When
-    falsy, the associated class will not be on the element.
-
-    @property classNameBindings
-    @type Array
-    @default ['active', 'loading', 'disabled', 'ember-transitioning-in', 'ember-transitioning-out']
-    @public
-  */
-  classNameBindings: ['active', 'loading', 'disabled', 'transitioningIn', 'transitioningOut'],
-
-  /**
-    By default this component responds to the `click` event. When the component element is an
-    `<a>` element, activating the link in another way, such as using the keyboard, triggers the
-    click event.
-
-    @property eventName
-    @type String
-    @default click
-    @private
-  */
-  eventName: 'click',
-
-  // this is doc'ed here so it shows up in the events
-  // section of the API documentation, which is where
-  // people will likely go looking for it.
-  /**
-    Triggers the `LinkComponent`'s routing behavior. If
-    `eventName` is changed to a value other than `click`
-    the routing behavior will trigger on that custom event
-    instead.
-
-    @event click
-    @private
-  */
-
-  /**
-    An overridable method called when `LinkComponent` objects are instantiated.
-
-    Example:
-
-    ```app/components/my-link.js
-    import LinkComponent from '@ember/routing/link-component';
-
-    export default LinkComponent.extend({
-      init() {
-        this._super(...arguments);
-        console.log('Event is ' + this.get('eventName'));
-      }
-    });
-    ```
+      assert(
+        'The `@query` argument to the <LinkTo> component must be an object.',
+        query !== null && typeof query === 'object'
+      );
 
-    NOTE: If you do override `init` for a framework class like `Component`,
-    be sure to call `this._super(...arguments)` in your
-    `init` declaration! If you don't, Ember may not have an opportunity to
-    do important setup work, and you'll see strange behavior in your
-    application.
+      return { ...query };
+    } else {
+      return EMPTY_QUERY_PARAMS;
+    }
+  }
 
-    @method init
-    @private
-  */
-  init() {
-    this._super(...arguments);
+  private get replace(): boolean {
+    return this.named('replace') === true;
+  }
 
-    assert(
-      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
-        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
-        'See https://ember-engines.com/docs/links for more info.',
-      !this._isEngine || this._engineMountPoint !== undefined
-    );
+  private get isActive(): boolean {
+    return this.isActiveForState(this.routing.currentState as Maybe<RouterState>);
+  }
 
-    // Map desired event name to invoke function
-    let { eventName } = this;
-    this.on(eventName, this, this._invoke);
-  },
+  private get willBeActive(): Option<boolean> {
+    let current = this.routing.currentState as Maybe<RouterState>;
+    let target = this.routing.targetState as Maybe<RouterState>;
 
-  _routing: injectService('-routing'),
-  _currentRoute: alias('_routing.currentRouteName'),
-  _currentRouterState: alias('_routing.currentState'),
-  _targetRouterState: alias('_routing.targetState'),
+    if (current === target) {
+      return null;
+    } else {
+      return this.isActiveForState(target);
+    }
+  }
 
-  _isEngine: computed(function (this: any) {
-    return getEngineParent(getOwner(this) as EngineInstance) !== undefined;
-  }),
+  private get isLoading(): boolean {
+    return isMissing(this.route) || this.models.some((model) => isMissing(model));
+  }
 
-  _engineMountPoint: computed(function (this: any) {
-    return (getOwner(this) as EngineInstance).mountPoint;
-  }),
+  private get isDisabled(): boolean {
+    return Boolean(this.named('disabled'));
+  }
 
-  _route: computed('route', '_currentRouterState', function computeLinkToComponentRoute(this: any) {
-    let { route } = this;
+  private get isEngine(): boolean {
+    return getEngineParent(this.owner as EngineInstance) !== undefined;
+  }
 
-    return route === UNDEFINED ? this._currentRoute : this._namespaceRoute(route);
-  }),
+  private get engineMountPoint(): string | undefined {
+    return (this.owner as Owner | EngineInstance).mountPoint;
+  }
 
-  _models: computed('model', 'models', function computeLinkToComponentModels(this: any) {
-    let { model, models } = this;
+  private classFor(state: 'active' | 'loading' | 'disabled'): string {
+    let className = this.named(`${state}Class`);
 
     assert(
-      'You cannot provide both the `@model` and `@models` arguments to the <LinkTo> component.',
-      model === UNDEFINED || models === UNDEFINED
+      `The \`@${state}Class\` argument to the <LinkTo> component must be a string or boolean`,
+      isMissing(className) || typeof className === 'string' || typeof className === 'boolean'
     );
 
-    if (model !== UNDEFINED) {
-      return [model];
-    } else if (models !== UNDEFINED) {
-      assert('The `@models` argument must be an array.', Array.isArray(models));
-      return models;
+    if (className === true || isMissing(className)) {
+      return ` ${state}`;
+    } else if (className) {
+      return ` ${className}`;
     } else {
-      return [];
+      return '';
     }
-  }),
+  }
 
-  _query: computed('query', function computeLinkToComponentQuery(this: any) {
-    let { query } = this;
+  private namespaceRoute(route: string): string {
+    let { engineMountPoint } = this;
 
-    if (query === UNDEFINED) {
-      return EMPTY_QUERY_PARAMS;
+    if (engineMountPoint === undefined) {
+      return route;
+    } else if (route === 'application') {
+      return engineMountPoint;
     } else {
-      return Object.assign({}, query);
-    }
-  }),
-
-  /**
-    Accessed as a classname binding to apply the component's `disabledClass`
-    CSS `class` to the element when the link is disabled.
-
-    When `true`, interactions with the element will not trigger route changes.
-    @property disabled
-    @public
-  */
-  disabled: computed({
-    get(_key: string): boolean {
-      // always returns false for `get` because (due to the `set` just below)
-      // the cached return value from the set will prevent this getter from _ever_
-      // being called after a set has occurred
-      return false;
-    },
-
-    set(this: any, _key: string, value: any): boolean {
-      this._isDisabled = value;
-
-      return value ? this.disabledClass : false;
-    },
-  }),
-
-  /**
-    Accessed as a classname binding to apply the component's `activeClass`
-    CSS `class` to the element when the link is active.
-
-    This component is considered active when its `currentWhen` property is `true`
-    or the application's current route is the route this component would trigger
-    transitions into.
-
-    The `currentWhen` property can match against multiple routes by separating
-    route names using the ` ` (space) character.
-
-    @property active
-    @private
-  */
-  active: computed('activeClass', '_active', function computeLinkToComponentActiveClass(this: any) {
-    return this._active ? this.activeClass : false;
-  }),
-
-  _active: computed(
-    '_currentRouterState',
-    '_route',
-    '_models',
-    '_query',
-    'loading',
-    'current-when',
-    function computeLinkToComponentActive(this: any) {
-      let { _currentRouterState: state } = this;
-
-      if (state) {
-        return this._isActive(state);
-      } else {
-        return false;
-      }
+      return `${engineMountPoint}.${route}`;
     }
-  ),
-
-  willBeActive: computed(
-    '_currentRouterState',
-    '_targetRouterState',
-    '_route',
-    '_models',
-    '_query',
-    'loading',
-    'current-when',
-    function computeLinkToComponentWillBeActive(this: any) {
-      let { _currentRouterState: current, _targetRouterState: target } = this;
-
-      if (current === target) {
-        return;
-      }
+  }
 
-      return this._isActive(target);
+  private isActiveForState(state: Maybe<RouterState>): boolean {
+    if (!isPresent(state)) {
+      return false;
     }
-  ),
 
-  _isActive(routerState: RouterState): boolean {
-    if (this.loading) {
+    if (this.isLoading) {
       return false;
     }
 
-    let currentWhen = this['current-when'];
+    let currentWhen = this.named('current-when');
 
     if (typeof currentWhen === 'boolean') {
       return currentWhen;
-    }
+    } else if (typeof currentWhen === 'string') {
+      let { models, routing } = this;
 
-    let { _models: models, _routing: routing } = this;
-
-    if (typeof currentWhen === 'string') {
       return currentWhen
         .split(' ')
         .some((route) =>
-          routing.isActiveForRoute(models, undefined, this._namespaceRoute(route), routerState)
+          routing.isActiveForRoute(models, undefined, this.namespaceRoute(route), state)
         );
     } else {
-      return routing.isActiveForRoute(models, this._query, this._route, routerState);
-    }
-  },
-
-  transitioningIn: computed(
-    '_active',
-    'willBeActive',
-    function computeLinkToComponentTransitioningIn(this: any) {
-      if (this.willBeActive === true && !this._active) {
-        return 'ember-transitioning-in';
-      } else {
-        return false;
-      }
-    }
-  ),
-
-  transitioningOut: computed(
-    '_active',
-    'willBeActive',
-    function computeLinkToComponentTransitioningOut(this: any) {
-      if (this.willBeActive === false && this._active) {
-        return 'ember-transitioning-out';
-      } else {
-        return false;
-      }
-    }
-  ),
+      let { route, models, query, routing } = this;
 
-  _namespaceRoute(route: string): string {
-    let { _engineMountPoint: mountPoint } = this;
+      assert('[BUG] route can only be missing if isLoading is true', isPresent(route));
 
-    if (mountPoint === undefined) {
-      return route;
-    } else if (route === 'application') {
-      return mountPoint;
-    } else {
-      return `${mountPoint}.${route}`;
+      // TODO: is the signature wrong? this.query is definitely NOT a QueryParam!
+      return routing.isActiveForRoute(models, query as QueryParam, route, state);
     }
-  },
-
-  /**
-    Event handler that invokes the link, activating the associated route.
-
-    @method _invoke
-    @param {Event} event
-    @private
-  */
-  _invoke(this: any, event: Event): boolean {
-    if (!isSimpleClick(event)) {
-      return true;
+  }
+
+  private preventDefault(event: Event): void {
+    event.preventDefault();
+  }
+
+  private shouldModernize(): boolean {
+    return (
+      Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
+      Component._wasReopened === false &&
+      TargetActionSupport._wasReopened === false &&
+      LegacyLinkTo._wasReopened === false
+    );
+  }
+
+  protected isSupportedArgument(name: string): boolean {
+    let supportedArguments = [
+      'route',
+      'model',
+      'models',
+      'query',
+      'replace',
+      'disabled',
+      'current-when',
+      'activeClass',
+      'loadingClass',
+      'disabledClass',
+    ];
+
+    return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
+  }
+}
+
+// Deprecated features
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  let { prototype } = LinkTo;
+
+  let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
+    if (target) {
+      return (
+        Object.getOwnPropertyDescriptor(target, property) ||
+        descriptorFor(Object.getPrototypeOf(target), property)
+      );
+    } else {
+      return null;
     }
+  };
+
+  handleDeprecatedArguments(LinkTo);
+
+  handleDeprecatedAttributeArguments(LinkTo, [
+    // Component
+    'id',
+    ['id', 'elementId'],
+    'class',
+    ['class', 'classNames'],
+    ['role', 'ariaRole'],
+
+    // LinkTo
+    'href',
+    'title',
+    'rel',
+    'tabindex',
+    'target',
+  ]);
+
+  handleDeprecatedEventArguments(LinkTo);
+
+  // @tagName
+  {
+    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
+
+    Object.defineProperty(prototype, 'onUnsupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function onUnsupportedArgument(this: LinkTo, name: string): void {
+        if (name === 'tagName') {
+          let tagName = this.named('tagName');
+
+          deprecate(
+            `Passing the \`@tagName\` argument to <LinkTo> is deprecated. Using a <${tagName}> ` +
+              'element for navigation is not recommended as it creates issues with assistive ' +
+              'technologies. Remove this argument to use the default <a> element. In the rare ' +
+              'cases that calls for using a different element, refactor to use the router ' +
+              'service inside a custom event handler instead.',
+            false,
+            {
+              id: 'ember.link-to.tag-name',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          this.modernized = false;
+        } else {
+          superOnUnsupportedArgument.call(this, name);
+        }
+      },
+    });
+  }
+
+  // @bubbles & @preventDefault
+  {
+    let superIsSupportedArgument = prototype['isSupportedArgument'];
+
+    Object.defineProperty(prototype, 'isSupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function isSupportedArgument(this: LinkTo, name: string): boolean {
+        if (this.modernized) {
+          if (name === 'bubbles') {
+            deprecate(
+              'Passing the `@bubbles` argument to <LinkTo> is deprecated. ' +
+                'Use the {{on}} modifier to attach a custom event handler to ' +
+                'control event propagation.',
+              false,
+              {
+                id: 'ember.built-in-components.legacy-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            return true;
+          }
+
+          if (name === 'preventDefault') {
+            deprecate(
+              'Passing the `@preventDefault` argument to <LinkTo> is deprecated. ' +
+                '`preventDefault()` is called automatically on events that are ' +
+                'handled by the <LinkTo> component to prevent the browser from ' +
+                'navigating away from the page.',
+              false,
+              {
+                id: 'ember.built-in-components.legacy-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            return true;
+          }
+        }
 
-    let { bubbles, preventDefault } = this;
-    let target = this.element.target;
-    let isSelf = !target || target === '_self';
-
-    if (preventDefault !== false && isSelf) {
-      event.preventDefault();
-    }
+        return superIsSupportedArgument.call(this, name);
+      },
+    });
 
-    if (bubbles === false) {
-      event.stopPropagation();
-    }
+    Object.defineProperty(prototype, 'preventDefault', {
+      configurable: true,
+      enumerable: false,
+      value: function preventDefault(this: LinkTo, event: Event): void {
+        let shouldPreventDefault = true;
+        let shouldStopPropagation = false;
+
+        if ('preventDefault' in this.args.named) {
+          let value = this.named('preventDefault');
+
+          if (isMissing(value) || value) {
+            deprecate(
+              'Passing the `@preventDefault` argument to <LinkTo> is deprecated. ' +
+                '`preventDefault()` is called automatically on events that are ' +
+                'handled by the <LinkTo> component to prevent the browser from ' +
+                'navigating away from the page.',
+              false,
+              {
+                id: 'ember.built-in-components.legacy-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+          } else {
+            deprecate(
+              'Passing the `@preventDefault` argument to <LinkTo> is deprecated. ' +
+                '`preventDefault()` should always be called on events that are ' +
+                'handled by the <LinkTo> component to prevent the browser from ' +
+                'navigating away from the page.',
+              false,
+              {
+                id: 'ember.built-in-components.legacy-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            shouldPreventDefault = false;
+          }
+        }
 
-    if (this._isDisabled) {
-      return false;
-    }
+        if ('bubbles' in this.args.named) {
+          let value = this.named('bubbles');
+
+          if (value === false) {
+            deprecate(
+              'Passing the `@bubbles` argument to <LinkTo> is deprecated. ' +
+                'Use the {{on}} modifier to attach a custom event handler to ' +
+                'control event propagation.',
+              false,
+              {
+                id: 'ember.built-in-components.legacy-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            shouldStopPropagation = true;
+          } else {
+            deprecate(
+              'Passing the `@bubbles` argument to <LinkTo> is deprecated. ' +
+                '`stopPropagation()` is not automatically called so there is ' +
+                'no need to pass this argument when you DO want the event to ' +
+                'propagate normally',
+              false,
+              {
+                id: 'ember.built-in-components.legacy-arguments',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+          }
+        }
 
-    if (this.loading) {
-      // tslint:disable-next-line:max-line-length
-      warn(
-        'This link is in an inactive loading state because at least one of its models ' +
-          'currently has a null/undefined value, or the provided route name is invalid.',
-        false,
-        {
-          id: 'ember-glimmer.link-to.inactive-loading-state',
+        if (shouldPreventDefault) {
+          event.preventDefault();
         }
-      );
-      return false;
-    }
 
-    if (!isSelf) {
-      return false;
-    }
+        if (shouldStopPropagation) {
+          event.stopPropagation();
+        }
+      },
+    });
+  }
+
+  // @disabledWhen
+  {
+    let superIsSupportedArgument = prototype['isSupportedArgument'];
+
+    Object.defineProperty(prototype, 'isSupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function isSupportedArgument(this: LinkTo, name: string): boolean {
+        if (this.modernized) {
+          if (name === 'disabledWhen') {
+            deprecate(
+              'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
+                'Use the `@disabled` argument instead.',
+              false,
+              {
+                id: 'ember.link-to.disabled-when',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            return true;
+          }
+        }
 
-    let { _route: routeName, _models: models, _query: queryParams, replace: shouldReplace } = this;
+        return superIsSupportedArgument.call(this, name);
+      },
+    });
 
-    let payload = {
-      queryParams,
-      routeName,
-    };
+    let superDescriptor = descriptorFor(prototype, 'isDisabled');
 
-    flaggedInstrument(
-      'interaction.link-to',
-      payload,
-      this._generateTransition(payload, routeName, models, queryParams, shouldReplace)
+    assert(
+      `[BUG] expecting isDisabled to be a getter on <LinkTo>`,
+      superDescriptor && typeof superDescriptor.get === 'function'
     );
-    return false;
-  },
-
-  _generateTransition(
-    payload: any,
-    qualifiedRouteName: string,
-    models: any[],
-    queryParams: any[],
-    shouldReplace: boolean
-  ) {
-    let { _routing: routing } = this;
-
-    return () => {
-      payload.transition = routing.transitionTo(
-        qualifiedRouteName,
-        models,
-        queryParams,
-        shouldReplace
-      );
-    };
-  },
-
-  /**
-    Sets the element's `href` attribute to the url for
-    the `LinkComponent`'s targeted route.
-
-    If the `LinkComponent`'s `tagName` is changed to a value other
-    than `a`, this property will be ignored.
-
-    @property href
-    @private
-  */
-  href: computed(
-    '_currentRouterState',
-    '_route',
-    '_models',
-    '_query',
-    'tagName',
-    'loading',
-    'loadingHref',
-    function computeLinkToComponentHref(this: any) {
-      if (this.tagName !== 'a') {
-        return;
-      }
 
-      if (this.loading) {
-        return this.loadingHref;
-      }
-
-      let { _route: route, _models: models, _query: query, _routing: routing } = this;
-
-      if (DEBUG) {
-        /*
-         * Unfortunately, to get decent error messages, we need to do this.
-         * In some future state we should be able to use a "feature flag"
-         * which allows us to strip this without needing to call it twice.
-         *
-         * if (isDebugBuild()) {
-         *   // Do the useful debug thing, probably including try/catch.
-         * } else {
-         *   // Do the performant thing.
-         * }
-         */
-        try {
-          return routing.generateURL(route, models, query);
-        } catch (e) {
-          // tslint:disable-next-line:max-line-length
-          e.message = `While generating link to route "${this.route}": ${e.message}`;
-          throw e;
+    let superGetter = superDescriptor.get as (this: LinkTo) => boolean;
+
+    Object.defineProperty(prototype, 'isDisabled', {
+      configurable: true,
+      enumerable: false,
+      get: function isDisabled(this: LinkTo): boolean {
+        if ('disabledWhen' in this.args.named) {
+          deprecate(
+            'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
+              'Use the `@disabled` argument instead.',
+            false,
+            {
+              id: 'ember.link-to.disabled-when',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          return Boolean(this.named('disabledWhen'));
         }
-      } else {
-        return routing.generateURL(route, models, query);
-      }
-    }
-  ),
-
-  loading: computed(
-    '_route',
-    '_modelsAreLoaded',
-    'loadingClass',
-    function computeLinkToComponentLoading(this: any) {
-      let { _route: route, _modelsAreLoaded: loaded } = this;
 
-      if (!loaded || route === null || route === undefined) {
-        return this.loadingClass;
-      }
-    }
-  ),
-
-  _modelsAreLoaded: computed('_models', function computeLinkToComponentModelsAreLoaded(this: any) {
-    let { _models: models } = this;
-
-    for (let i = 0; i < models.length; i++) {
-      let model = models[i];
-      if (model === null || model === undefined) {
-        return false;
-      }
-    }
-
-    return true;
-  }),
-
-  /**
-    The default href value to use while a link-to is loading.
-    Only applies when tagName is 'a'
+        return superGetter.call(this);
+      },
+    });
+  }
 
-    @property loadingHref
-    @type String
-    @default #
-    @private
-  */
-  loadingHref: '#',
+  // QP
+  {
+    let superModelsDescriptor = descriptorFor(prototype, 'models');
 
-  didReceiveAttrs() {
-    let { disabledWhen } = this;
+    assert(
+      `[BUG] expecting models to be a getter on <LinkTo>`,
+      superModelsDescriptor && typeof superModelsDescriptor.get === 'function'
+    );
 
-    if (disabledWhen !== undefined) {
-      this.set('disabled', disabledWhen);
-    }
+    let superModelsGetter = superModelsDescriptor.get as (this: LinkTo) => {}[];
 
-    let { params } = this;
+    Object.defineProperty(prototype, 'models', {
+      configurable: true,
+      enumerable: false,
+      get: function models(this: LinkTo): {}[] {
+        let models = superModelsGetter.call(this);
 
-    if (!params || params.length === 0) {
-      assert(
-        'You must provide at least one of the `@route`, `@model`, `@models` or `@query` argument to `<LinkTo>`.',
-        !(
-          this.route === UNDEFINED &&
-          this.model === UNDEFINED &&
-          this.models === UNDEFINED &&
-          this.query === UNDEFINED
-        )
-      );
-
-      let { _models: models } = this;
-      if (models.length > 0) {
-        let lastModel = models[models.length - 1];
-
-        if (typeof lastModel === 'object' && lastModel !== null && lastModel.isQueryParams) {
-          this.query = lastModel.values;
-          models.pop();
+        if (models.length > 0 && !('query' in this.args.named)) {
+          if (isQueryParams(models[models.length - 1])) {
+            models = models.slice(0, -1);
+          }
         }
-      }
-
-      return;
-    }
-
-    let hasBlock = this[HAS_BLOCK];
-
-    params = params.slice();
-
-    // Process the positional arguments, in order.
-    // 1. Inline link title comes first, if present.
-    if (!hasBlock) {
-      this.set('linkTitle', params.shift());
-    }
-
-    // 2. The last argument is possibly the `query` object.
-    let queryParams = params[params.length - 1];
 
-    if (queryParams && queryParams.isQueryParams) {
-      this.set('query', params.pop().values);
-    } else {
-      this.set('query', UNDEFINED);
-    }
-
-    // 3. If there is a `route`, it is now at index 0.
-    if (params.length === 0) {
-      this.set('route', UNDEFINED);
-    } else {
-      this.set('route', params.shift());
-    }
-
-    // 4. Any remaining indices (if any) are `models`.
-    this.set('model', UNDEFINED);
-    this.set('models', params);
-
-    runInDebug(() => {
-      params = this.params.slice();
-
-      let equivalentNamedArgs = [];
-      let hasQueryParams = false;
-
-      // Process the positional arguments, in order.
-      // 1. Inline link title comes first, if present.
-      if (!hasBlock) {
-        params.shift();
-      }
+        return models;
+      },
+    });
 
-      // 2. The last argument is possibly the `query` object.
-      let query = params[params.length - 1];
+    let superQueryDescriptor = descriptorFor(prototype, 'query');
 
-      if (query && query.isQueryParams) {
-        params.pop();
-        hasQueryParams = true;
-      }
+    assert(
+      `[BUG] expecting query to be a getter on <LinkTo>`,
+      superQueryDescriptor && typeof superQueryDescriptor.get === 'function'
+    );
 
-      // 3. If there is a `route`, it is now at index 0.
-      if (params.length > 0) {
-        params.shift();
-        equivalentNamedArgs.push('`@route`');
-      }
+    let superQueryGetter = superQueryDescriptor.get as (this: LinkTo) => {};
 
-      // 4. Any remaining params (if any) are `models`.
-      if (params.length === 1) {
-        equivalentNamedArgs.push('`@model`');
-      } else if (params.length > 1) {
-        equivalentNamedArgs.push('`@models`');
-      }
+    Object.defineProperty(prototype, 'query', {
+      configurable: true,
+      enumerable: false,
+      get: function query(this: LinkTo): {} {
+        if ('query' in this.args.named) {
+          let qp = superQueryGetter.call(this);
 
-      if (hasQueryParams) {
-        equivalentNamedArgs.push('`@query`');
-      }
+          if (isQueryParams(qp)) {
+            return qp.values ?? EMPTY_QUERY_PARAMS;
+          } else {
+            return qp;
+          }
+        } else {
+          let models = superModelsGetter.call(this);
 
-      if (equivalentNamedArgs.length > 0) {
-        let message = 'Invoking the `<LinkTo>` component with positional arguments is deprecated.';
+          if (models.length > 0) {
+            let qp = models[models.length - 1];
 
-        message += `Please use the equivalent named arguments (${equivalentNamedArgs.join(', ')})`;
+            if (isQueryParams(qp) && qp.values !== null) {
+              return qp.values;
+            }
+          }
 
-        if (hasQueryParams) {
-          message += ' along with the `hash` helper';
+          return EMPTY_QUERY_PARAMS;
         }
-
-        if (!hasBlock) {
-          message += " and pass a block for the link's content.";
+      },
+    });
+  }
+
+  // Positional Arguments
+  {
+    let superValidateArguments = prototype['validateArguments'];
+
+    Object.defineProperty(prototype, 'validateArguments', {
+      configurable: true,
+      enumerable: false,
+      value: function validateArguments(this: LinkTo): void {
+        if (this.args.positional.length !== 0 || 'params' in this.args.named) {
+          // Already deprecated in the legacy implementation
+          this.modernized = false;
         }
 
-        message += '.';
-
-        deprecate(message, false, {
-          id: 'ember-glimmer.link-to.positional-arguments',
-          until: '4.0.0',
-          for: 'ember-source',
-          url:
-            'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
-          since: {
-            enabled: '3.26.0-beta.1',
-          },
-        });
-      }
+        superValidateArguments.call(this);
+      },
     });
-  },
-});
 
-LinkComponent.toString = () => '@ember/routing/link-component';
+    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
+
+    Object.defineProperty(prototype, 'onUnsupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function onUnsupportedArgument(this: LinkTo, name: string): void {
+        if (name !== 'params') {
+          superOnUnsupportedArgument.call(this, name);
+        }
+      },
+    });
+  }
+}
 
-LinkComponent.reopenClass({
-  positionalParams: 'params',
-});
+if (JQUERY_INTEGRATION) {
+  jQueryEventShim(LinkTo);
+}
 
-export default LinkComponent;
+export default opaquify(LinkTo, LinkToTemplate);
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 696585a6273..7eb9588f2d6 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -2,6 +2,7 @@ import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Component from './component';
+import LegacyLinkTo from './components/-link-to';
 import LegacyTextArea from './components/-textarea';
 import Checkbox from './components/checkbox';
 import Input from './components/input';
@@ -59,12 +60,14 @@ export function setupEngineRegistry(registry: Registry): void {
   registry.register('component:-text-field', TextField);
   registry.register('component:-checkbox', Checkbox);
   registry.register('component:input', Input);
-  registry.register('component:link-to', LinkTo);
 
   if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+    registry.register('component:link-to', LinkTo);
+    registry.register('component:-link-to', LegacyLinkTo);
     registry.register('component:-textarea', LegacyTextArea);
     registry.register('component:textarea', Textarea);
   } else {
+    registry.register('component:link-to', LegacyLinkTo);
     registry.register('component:textarea', LegacyTextArea);
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts b/packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts
new file mode 100644
index 00000000000..30e2f374432
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts
@@ -0,0 +1,3 @@
+import { TemplateFactory } from '@glimmer/interfaces';
+declare const TEMPLATE: TemplateFactory;
+export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs b/packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs
new file mode 100644
index 00000000000..e67d811c27e
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs
@@ -0,0 +1,5 @@
+{{~#if (has-block)~}}
+  {{yield}}
+{{~else~}}
+  {{this.linkTitle}}
+{{~/if~}}
diff --git a/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs b/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs
index e67d811c27e..9e018d66388 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs
@@ -1,5 +1,24 @@
-{{~#if (has-block)~}}
-  {{yield}}
+{{~#if this.modernized~}}
+  <a
+    {{!-- for compatibility --}}
+    id={{this.id}}
+    class={{this.class}}
+
+    {{!-- deprecated attribute bindings --}}
+    role={{this.role}}
+    title={{this.title}}
+    rel={{this.rel}}
+    tabindex={{this.tabindex}}
+    target={{this.target}}
+
+    ...attributes
+
+    href={{this.href}}
+
+    {{on 'click' this.click}}
+  >{{yield}}</a>
 {{~else~}}
-  {{this.linkTitle}}
+  {{~#let (component '-link-to') as |LegacyLinkTo|~}}
+    <LegacyLinkTo @__ARGS__={{this.args}} ...attributes>{{yield}}</LegacyLinkTo>
+  {{~/let~}}
 {{~/if~}}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 5b959e641f9..0b7adb9c781 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1428,26 +1428,35 @@ if (ENV._DEBUG_RENDER_TREE) {
       }
 
       async '@test <LinkTo> components'() {
+        this.router.map(function (this: any) {
+          this.route('foo');
+          this.route('bar');
+        });
+
         this.addTemplate(
           'application',
           strip`
-            <LinkTo @id="first" @route="index">Hello World</LinkTo>
+            <LinkTo @route="foo">Foo</LinkTo>
 
             {{#if this.showSecond}}
-              <LinkTo @id="second" @route="index">Hello World</LinkTo>
+              <LinkTo @route="bar">Bar</LinkTo>
             {{/if}}
           `
         );
 
         await this.visit('/');
 
+        let template = `packages/@ember/-internals/glimmer/lib/templates/${
+          EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? 'link-to' : '-link-to'
+        }.hbs`;
+
         this.assertRenderTree([
           {
             type: 'component',
             name: 'link-to',
-            args: { positional: [], named: { id: 'first', route: 'index' } },
-            instance: (instance: object) => instance['id'] === 'first',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/link-to.hbs',
+            args: { positional: [], named: { route: 'foo' } },
+            instance: (instance: object) => instance['route'] === 'foo',
+            template,
             bounds: this.nodeBounds(this.element.firstChild),
             children: [],
           },
@@ -1461,18 +1470,18 @@ if (ENV._DEBUG_RENDER_TREE) {
           {
             type: 'component',
             name: 'link-to',
-            args: { positional: [], named: { id: 'first', route: 'index' } },
-            instance: (instance: object) => instance['id'] === 'first',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/link-to.hbs',
+            args: { positional: [], named: { route: 'foo' } },
+            instance: (instance: object) => instance['route'] === 'foo',
+            template,
             bounds: this.nodeBounds(this.element.firstChild),
             children: [],
           },
           {
             type: 'component',
             name: 'link-to',
-            args: { positional: [], named: { id: 'second', route: 'index' } },
-            instance: (instance: object) => instance['id'] === 'second',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/link-to.hbs',
+            args: { positional: [], named: { route: 'bar' } },
+            instance: (instance: object) => instance['route'] === 'bar',
+            template,
             bounds: this.nodeBounds(this.element.lastChild),
             children: [],
           },
@@ -1486,9 +1495,9 @@ if (ENV._DEBUG_RENDER_TREE) {
           {
             type: 'component',
             name: 'link-to',
-            args: { positional: [], named: { id: 'first', route: 'index' } },
-            instance: (instance: object) => instance['id'] === 'first',
-            template: 'packages/@ember/-internals/glimmer/lib/templates/link-to.hbs',
+            args: { positional: [], named: { route: 'foo' } },
+            instance: (instance: object) => instance['route'] === 'foo',
+            template,
             bounds: this.nodeBounds(this.element.firstChild),
             children: [],
           },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 4b1f8f266c2..65eec9a144e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -8,7 +8,10 @@ import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
+import {
+  EMBER_IMPROVED_INSTRUMENTATION,
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+} from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
 import { compile } from '../../../utils/helpers';
@@ -89,18 +92,21 @@ moduleFor(
       );
     }
 
-    async [`@test it doesn't add an href when the tagName isn't 'a'`](assert) {
+    async [`@test [DEPRECATED] it doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo @route='about' id='about-link' @tagName='div'>About</LinkTo>`
       );
 
-      await this.visit('/');
-
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
       assert.strictEqual(this.$('#about-link').attr('href'), null, 'there is no href attribute');
     }
 
-    async [`@test it applies a 'disabled' class when disabledWhen`](assert) {
+    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `
@@ -123,7 +129,11 @@ moduleFor(
         }
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(
         this.$('#about-link-static.disabled').length,
@@ -136,7 +146,11 @@ moduleFor(
         'The dynamic link is disabled when its disabledWhen is true'
       );
 
-      runTask(() => controller.set('dynamicDisabledWhen', false));
+      expectDeprecation(
+        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(
         this.$('#about-link-static.disabled').length,
@@ -329,15 +343,23 @@ moduleFor(
       );
     }
 
-    async [`@test it does not respond to clicks when disabledWhen`](assert) {
+    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `<LinkTo id="about-link" @route="about" @disabledWhen={{true}}>About</LinkTo>`
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      await this.click('#about-link');
+      await expectDeprecationAsync(
+        () => this.click('#about-link'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
@@ -1190,18 +1212,32 @@ moduleFor(
       assert.equal(hidden, 1, 'The link bubbles');
     }
 
-    async [`@test it supports bubbles=false`](assert) {
-      this.addTemplate(
-        'about',
-        `
-        <div {{action this.hide}}>
-          <LinkTo id='about-contact' @route='about.contact' @bubbles={{false}}>
-            About
-          </LinkTo>
-        </div>
-        {{outlet}}
-        `
-      );
+    async [`@test [DEPRECATED] it supports bubbles=false`](assert) {
+      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+        this.addTemplate(
+          'about',
+          `
+          <div {{on 'click' this.hide}}>
+            <LinkTo id='about-contact' @route='about.contact' @bubbles={{false}}>
+              About
+            </LinkTo>
+          </div>
+          {{outlet}}
+          `
+        );
+      } else {
+        this.addTemplate(
+          'about',
+          `
+          <div {{action this.hide}}>
+            <LinkTo id='about-contact' @route='about.contact' @bubbles={{false}}>
+              About
+            </LinkTo>
+          </div>
+          {{outlet}}
+          `
+        );
+      }
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
@@ -1222,21 +1258,95 @@ moduleFor(
         }
       );
 
-      await this.visit('/about');
+      await expectDeprecationAsync(
+        () => this.visit('/about'),
+        'Passing the `@bubbles` argument to <LinkTo> is deprecated. Use the {{on}} modifier to attach a custom event handler to control event propagation.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      await this.click('#about-contact');
+      await expectDeprecationAsync(
+        () => this.click('#about-contact'),
+        'Passing the `@bubbles` argument to <LinkTo> is deprecated. Use the {{on}} modifier to attach a custom event handler to control event propagation.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
 
       assert.strictEqual(hidden, 0, "The link didn't bubble");
     }
 
-    async [`@test it supports bubbles=boundFalseyThing`](assert) {
+    async [`@test [DEPRECATED] it supports bubbles=boundFalseyThing`](assert) {
+      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+        this.addTemplate(
+          'about',
+          `
+          <div {{on 'click' this.hide}}>
+            <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
+              About
+            </LinkTo>
+          </div>
+          {{outlet}}
+          `
+        );
+      } else {
+        this.addTemplate(
+          'about',
+          `
+          <div {{action this.hide}}>
+            <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
+              About
+            </LinkTo>
+          </div>
+          {{outlet}}
+          `
+        );
+      }
+
+      this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
+
+      let hidden = 0;
+
+      this.add(
+        'controller:about',
+        class extends Controller {
+          boundFalseyThing = false;
+
+          hide() {
+            hidden++;
+          }
+        }
+      );
+
+      this.router.map(function () {
+        this.route('about', function () {
+          this.route('contact');
+        });
+      });
+
+      await expectDeprecationAsync(
+        () => this.visit('/about'),
+        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      await expectDeprecationAsync(
+        () => this.click('#about-contact'),
+        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
+      assert.strictEqual(hidden, 0, "The link didn't bubble");
+    }
+
+    async [`@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) The propagation of the click event can be stopped`](
+      assert
+    ) {
       this.addTemplate(
         'about',
         `
-        <div {{action this.hide}}>
-          <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
+        <div {{on 'click' this.hide}}>
+          <LinkTo id='about-contact' @route='about.contact' {{on 'click' this.stopPropagation}}>
             About
           </LinkTo>
         </div>
@@ -1246,31 +1356,34 @@ moduleFor(
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
+      this.router.map(function () {
+        this.route('about', function () {
+          this.route('contact');
+        });
+      });
+
       let hidden = 0;
 
       this.add(
         'controller:about',
         class extends Controller {
-          boundFalseyThing = false;
-
           hide() {
             hidden++;
           }
+
+          stopPropagation(event) {
+            event.stopPropagation();
+          }
         }
       );
 
-      this.router.map(function () {
-        this.route('about', function () {
-          this.route('contact');
-        });
-      });
-
       await this.visit('/about');
 
       await this.click('#about-contact');
 
       assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-      assert.strictEqual(hidden, 0, "The link didn't bubble");
+
+      assert.equal(hidden, 0, "The link didn't bubble");
     }
 
     async [`@test it moves into the named route with context`](assert) {
@@ -1433,7 +1546,7 @@ moduleFor(
       assertNav({ prevented: true }, () => this.$('#about-link').click(), assert);
     }
 
-    async [`@test it does not call preventDefault if '@preventDefault={{false}}' is passed as an option`](
+    async [`@test [DEPRECATED] it does not call preventDefault if '@preventDefault={{false}}]' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1445,12 +1558,25 @@ moduleFor(
         `<LinkTo id='about-link' @route='about' @preventDefault={{false}}>About</LinkTo>`
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
+      assertNav(
+        { prevented: false },
+        () =>
+          expectDeprecation(
+            () => this.$('#about-link').trigger('click'),
+            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+          ),
+        assert
+      );
     }
 
-    async [`@test it does not call preventDefault if '@preventDefault={{this.boundThing}}' is passed as an option`](
+    async [`@test [DEPRECATED] it does not call preventDefault if '@preventDefault={{this.boundThing}}' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1476,15 +1602,41 @@ moduleFor(
         }
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      assertNav({ prevented: false }, () => this.$('#about-link').trigger('click'), assert);
+      assertNav(
+        { prevented: false },
+        () =>
+          expectDeprecation(
+            () => this.$('#about-link').trigger('click'),
+            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+          ),
+        assert
+      );
 
       runTask(() => controller.set('boundThing', true));
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      assertNav({ prevented: true }, () => this.$('#about-link').trigger('click'), assert);
+      assertNav(
+        { prevented: true },
+        () =>
+          expectDeprecation(
+            () => this.$('#about-link').trigger('click'),
+            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+          ),
+        assert
+      );
     }
 
     async [`@test it does not call preventDefault if 'target' attribute is provided`](assert) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 0431098d342..138a66f7068 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -8,7 +8,10 @@ import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
+import {
+  EMBER_IMPROVED_INSTRUMENTATION,
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
+} from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
 import { compile } from '../../../utils/helpers';
@@ -89,13 +92,17 @@ moduleFor(
       );
     }
 
-    async [`@test it doesn't add an href when the tagName isn't 'a'`](assert) {
+    async [`@test [DEPRECATED] it doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',
         `<div id='about-link'>{{#link-to route='about' tagName='div'}}About{{/link-to}}</div>`
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.strictEqual(
         this.$('#about-link > div').attr('href'),
@@ -104,7 +111,7 @@ moduleFor(
       );
     }
 
-    async [`@test it applies a 'disabled' class when disabledWhen`](assert) {
+    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `
@@ -127,7 +134,11 @@ moduleFor(
         }
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(
         this.$('#about-link-static > a.disabled').length,
@@ -140,7 +151,11 @@ moduleFor(
         'The dynamic link is disabled when its disabledWhen is true'
       );
 
-      runTask(() => controller.set('dynamicDisabledWhen', false));
+      expectDeprecation(
+        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(
         this.$('#about-link-static > a.disabled').length,
@@ -340,15 +355,23 @@ moduleFor(
       );
     }
 
-    async [`@test it does not respond to clicks when disabledWhen`](assert) {
+    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
       this.addTemplate(
         'index',
         `<div id="about-link">{{#link-to route="about" disabledWhen=true}}About{{/link-to}}</div>`
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      await this.click('#about-link > a');
+      await expectDeprecationAsync(
+        () => this.click('#about-link > a'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
     }
@@ -544,7 +567,11 @@ moduleFor(
         }
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@class` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(
         this.$('#about-link > a.foo-is-false').length,
@@ -552,7 +579,11 @@ moduleFor(
         'The about-link was rendered with the falsy class'
       );
 
-      runTask(() => controller.set('foo', true));
+      await expectDeprecation(
+        () => runTask(() => controller.set('foo', true)),
+        /Passing the `@class` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(
         this.$('#about-link > a.foo-is-true').length,
@@ -1310,18 +1341,32 @@ moduleFor(
       assert.equal(hidden, 1, 'The link bubbles');
     }
 
-    async [`@test it supports bubbles=false`](assert) {
-      this.addTemplate(
-        'about',
-        `
-        <div id='about-contact' {{action this.hide}}>
-          {{#link-to route='about.contact' bubbles=false}}
-            About
-          {{/link-to}}
-        </div>
-        {{outlet}}
-        `
-      );
+    async [`@test [DEPRECATED] it supports bubbles=false`](assert) {
+      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+        this.addTemplate(
+          'about',
+          `
+          <div id='about-contact' {{on 'click' this.hide}}>
+            {{#link-to route='about.contact' bubbles=false}}
+              About
+            {{/link-to}}
+          </div>
+          {{outlet}}
+          `
+        );
+      } else {
+        this.addTemplate(
+          'about',
+          `
+          <div id='about-contact' {{action this.hide}}>
+            {{#link-to route='about.contact' bubbles=false}}
+              About
+            {{/link-to}}
+          </div>
+          {{outlet}}
+          `
+        );
+      }
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
@@ -1342,27 +1387,49 @@ moduleFor(
         }
       );
 
-      await this.visit('/about');
+      await expectDeprecationAsync(
+        () => this.visit('/about'),
+        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      await this.click('#about-contact > a');
+      await expectDeprecationAsync(
+        () => this.click('#about-contact > a'),
+        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
 
       assert.strictEqual(hidden, 0, "The link didn't bubble");
     }
 
-    async [`@test it supports bubbles=boundFalseyThing`](assert) {
-      this.addTemplate(
-        'about',
-        `
-        <div id='about-contact' {{action this.hide}}>
-          {{#link-to route='about.contact' bubbles=this.boundFalseyThing}}
-            About
-          {{/link-to}}
-        </div>
-        {{outlet}}
-        `
-      );
+    async [`@test [DEPRECATED] it supports bubbles=boundFalseyThing`](assert) {
+      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+        this.addTemplate(
+          'about',
+          `
+          <div id='about-contact' {{on 'click' this.hide}}>
+            {{#link-to route='about.contact' bubbles=this.boundFalseyThing}}
+              About
+            {{/link-to}}
+          </div>
+          {{outlet}}
+          `
+        );
+      } else {
+        this.addTemplate(
+          'about',
+          `
+          <div id='about-contact' {{action this.hide}}>
+            {{#link-to route='about.contact' bubbles=this.boundFalseyThing}}
+              About
+            {{/link-to}}
+          </div>
+          {{outlet}}
+          `
+        );
+      }
 
       this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
 
@@ -1385,9 +1452,17 @@ moduleFor(
         });
       });
 
-      await this.visit('/about');
+      await expectDeprecationAsync(
+        () => this.visit('/about'),
+        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      await this.click('#about-contact > a');
+      await expectDeprecationAsync(
+        () => this.click('#about-contact > a'),
+        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
       assert.strictEqual(hidden, 0, "The link didn't bubble");
@@ -1474,7 +1549,7 @@ moduleFor(
       assert.equal(this.$('p').text(), 'Erik Brynroflsson', 'The name is correct');
     }
 
-    async [`@test it binds some anchor html tag common attributes`](assert) {
+    async [`@test [DEPRECATED] it binds some anchor html tag common attributes`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1487,7 +1562,11 @@ moduleFor(
         `
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@(id|title|rel|tabindex)` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       let link = this.$('#self-link > a');
 
@@ -1496,7 +1575,7 @@ moduleFor(
       assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
     }
 
-    async [`@test it supports 'target' attribute`](assert) {
+    async [`@test [DEPRECATED] it supports 'target' attribute`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1505,13 +1584,17 @@ moduleFor(
         `
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@target` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       let link = this.$('#self-link > a');
       assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
     }
 
-    async [`@test it supports 'target' attribute specified as a bound param`](assert) {
+    async [`@test [DEPRECATED] it supports 'target' attribute specified as a bound param`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1534,12 +1617,20 @@ moduleFor(
         }
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@target` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       let link = this.$('#self-link > a');
       assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
 
-      runTask(() => controller.set('boundLinkTarget', '_self'));
+      expectDeprecation(
+        () => runTask(() => controller.set('boundLinkTarget', '_self')),
+        /Passing the `@target` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assert.equal(link.attr('target'), '_self', 'The self-link contains `target` attribute');
     }
@@ -1559,7 +1650,7 @@ moduleFor(
       assertNav({ prevented: true }, () => this.$('#about-link > a').click(), assert);
     }
 
-    async [`@test it does not call preventDefault if 'preventDefault=false' is passed as an option`](
+    async [`@test [DEPRECATED] it does not call preventDefault if 'preventDefault=false' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1571,12 +1662,25 @@ moduleFor(
         `<div id='about-link'>{{#link-to route='about' preventDefault=false}}About{{/link-to}}</div>`
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      assertNav({ prevented: false }, () => this.$('#about-link > a').trigger('click'), assert);
+      assertNav(
+        { prevented: false },
+        () =>
+          expectDeprecation(
+            () => this.$('#about-link > a').trigger('click'),
+            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+          ),
+        assert
+      );
     }
 
-    async [`@test it does not call preventDefault if 'preventDefault=this.boundThing' is passed as an option`](
+    async [`@test [DEPRECATED] it does not call preventDefault if 'preventDefault=this.boundThing' is passed as an option`](
       assert
     ) {
       this.router.map(function () {
@@ -1602,18 +1706,46 @@ moduleFor(
         }
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      assertNav({ prevented: false }, () => this.$('#about-link > a').trigger('click'), assert);
+      assertNav(
+        { prevented: false },
+        () =>
+          expectDeprecation(
+            () => this.$('#about-link > a').trigger('click'),
+            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+          ),
+        assert
+      );
 
       runTask(() => controller.set('boundThing', true));
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
-      assertNav({ prevented: true }, () => this.$('#about-link > a').trigger('click'), assert);
+      assertNav(
+        { prevented: true },
+        () =>
+          expectDeprecation(
+            () => this.$('#about-link > a').trigger('click'),
+            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
+            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+          ),
+        assert
+      );
     }
 
-    async [`@test it does not call preventDefault if 'target' attribute is provided`](assert) {
+    async [`@test [DEPRECATED] it does not call preventDefault if 'target' attribute is provided`](
+      assert
+    ) {
       this.addTemplate(
         'index',
         `
@@ -1622,12 +1754,16 @@ moduleFor(
         `
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@target` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assertNav({ prevented: false }, () => this.$('#self-link > a').click(), assert);
     }
 
-    async [`@test it should preventDefault when 'target = _self'`](assert) {
+    async [`@test [DEPRECATED] it should preventDefault when 'target = _self'`](assert) {
       this.addTemplate(
         'index',
         `
@@ -1636,12 +1772,18 @@ moduleFor(
         `
       );
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@target` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       assertNav({ prevented: true }, () => this.$('#self-link > a').click(), assert);
     }
 
-    async [`@test it should not transition if target is not equal to _self or empty`](assert) {
+    async [`@test [DEPRECATED] it should not transition if target is not equal to _self or empty`](
+      assert
+    ) {
       this.addTemplate(
         'index',
         `
@@ -1657,7 +1799,11 @@ moduleFor(
         this.route('about');
       });
 
-      await this.visit('/');
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@target` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
 
       await this.click('#about-link > a');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
index fcfde192fc4..03395293b97 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
@@ -1,5 +1,6 @@
 import { RSVP } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 function assertHasClass(assert, selector, label) {
@@ -86,7 +87,7 @@ moduleFor(
       let $about = this.$('#about-link');
       let $other = this.$('#other-link');
 
-      $about.click();
+      runTask(() => $about.click());
 
       assertHasClass(assert, $index, 'active');
       assertHasNoClass(assert, $about, 'active');
@@ -120,7 +121,7 @@ moduleFor(
       let $news = this.$('#news-link');
       let $other = this.$('#other-link');
 
-      $news.click();
+      runTask(() => $news.click());
 
       assertHasClass(assert, $index, 'active');
       assertHasNoClass(assert, $news, 'active');
@@ -152,7 +153,7 @@ moduleFor(
 );
 
 moduleFor(
-  `<LinkTo /> component: .transitioning-in .transitioning-out CSS classes - nested link-to's`,
+  `<LinkTo /> component: [DEPRECATED] .transitioning-in .transitioning-out CSS classes - nested link-to's`,
   class extends ApplicationTestCase {
     constructor(...args) {
       super(...args);
@@ -202,8 +203,12 @@ moduleFor(
       );
     }
 
-    beforeEach() {
-      return this.visit('/');
+    async beforeEach() {
+      return expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
     }
 
     resolveAbout() {
@@ -231,7 +236,7 @@ moduleFor(
       // outlet is not stable and the second $about.click() is triggered.
       let $about = this.$('#about-link');
 
-      $about.click();
+      runTask(() => $about.click());
 
       let $index = this.$('#index-link');
       $about = this.$('#about-link');
@@ -267,7 +272,7 @@ moduleFor(
       assertHasNoClass(assert, $about, 'ember-transitioning-out');
       assertHasNoClass(assert, $other, 'ember-transitioning-out');
 
-      $other.click();
+      runTask(() => $other.click());
 
       $index = this.$('#index-link');
       $about = this.$('#about-link');
@@ -303,7 +308,7 @@ moduleFor(
       assertHasNoClass(assert, $about, 'ember-transitioning-out');
       assertHasNoClass(assert, $other, 'ember-transitioning-out');
 
-      $about.click();
+      runTask(() => $about.click());
 
       $index = this.$('#index-link');
       $about = this.$('#about-link');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
index c32ab6ee15e..8724c4ee335 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
@@ -1,5 +1,6 @@
 import { RSVP } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 function assertHasClass(assert, selector, label) {
@@ -86,7 +87,7 @@ moduleFor(
       let $about = this.$('#about-link > a');
       let $other = this.$('#other-link > a');
 
-      $about.click();
+      runTask(() => $about.click());
 
       assertHasClass(assert, $index, 'active');
       assertHasNoClass(assert, $about, 'active');
@@ -120,7 +121,7 @@ moduleFor(
       let $news = this.$('#news-link > a');
       let $other = this.$('#other-link > a');
 
-      $news.click();
+      runTask(() => $news.click());
 
       assertHasClass(assert, $index, 'active');
       assertHasNoClass(assert, $news, 'active');
@@ -152,7 +153,7 @@ moduleFor(
 );
 
 moduleFor(
-  `{{link-to}} component: .transitioning-in .transitioning-out CSS classes - nested link-to's`,
+  `{{link-to}} component: [DEPRECATED] .transitioning-in .transitioning-out CSS classes - nested link-to's`,
   class extends ApplicationTestCase {
     constructor(...args) {
       super(...args);
@@ -202,8 +203,12 @@ moduleFor(
       );
     }
 
-    beforeEach() {
-      return this.visit('/');
+    async beforeEach() {
+      return expectDeprecationAsync(
+        () => this.visit('/'),
+        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
     }
 
     resolveAbout() {
@@ -231,7 +236,7 @@ moduleFor(
       // outlet is not stable and the second $about.click() is triggered.
       let $about = this.$('#about-link > a');
 
-      $about.click();
+      runTask(() => $about.click());
 
       let $index = this.$('#index-link > a');
       $about = this.$('#about-link > a');
@@ -267,7 +272,7 @@ moduleFor(
       assertHasNoClass(assert, $about, 'ember-transitioning-out');
       assertHasNoClass(assert, $other, 'ember-transitioning-out');
 
-      $other.click();
+      runTask(() => $other.click());
 
       $index = this.$('#index-link > a');
       $about = this.$('#about-link > a');
@@ -303,7 +308,7 @@ moduleFor(
       assertHasNoClass(assert, $about, 'ember-transitioning-out');
       assertHasNoClass(assert, $other, 'ember-transitioning-out');
 
-      $about.click();
+      runTask(() => $about.click());
 
       $index = this.$('#index-link > a');
       $about = this.$('#about-link > a');
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index c262f054674..ba9956e5375 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -13,9 +13,10 @@ export {
 } from './lib/system/generate_controller';
 export { default as controllerFor } from './lib/system/controller_for';
 export { default as RouterDSL } from './lib/system/dsl';
-export { default as Router } from './lib/system/router';
+export { default as Router, QueryParam } from './lib/system/router';
 export { default as Route } from './lib/system/route';
 export { default as QueryParams } from './lib/system/query_params';
 export { default as RoutingService } from './lib/services/routing';
 export { default as RouterService } from './lib/services/router';
+export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index dc9b423cd2f..66f07ea319b 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1444,12 +1444,13 @@ moduleFor(
       this.assertCurrentPath('/home', 'Setting property to undefined');
     }
 
-    ['@test {{link-to}} with null or undefined QPs does not get serialized into url'](assert) {
-      assert.expect(3);
-
+    async ['@test <LinkTo> with null or undefined QPs does not get serialized into url'](assert) {
       this.addTemplate(
         'home',
-        "{{#link-to route='home' query=(hash foo=this.nullValue) id='null-link'}}Home{{/link-to}}{{#link-to route='home' query=(hash foo=this.undefinedValue) id='undefined-link'}}Home{{/link-to}}"
+        `
+        <LinkTo @route='home' @query={{hash foo=this.nullValue}} id='null-link'>Home</LinkTo>
+        <LinkTo @route='home' @query={{hash foo=this.undefinedValue}} id='undefined-link'>Home</LinkTo>
+        `
       );
 
       this.router.map(function () {
@@ -1461,10 +1462,10 @@ moduleFor(
         undefinedValue: undefined,
       });
 
-      return this.visitAndAssert('/home').then(() => {
-        assert.equal(this.$('#null-link').attr('href'), '/home');
-        assert.equal(this.$('#undefined-link').attr('href'), '/home');
-      });
+      await this.visitAndAssert('/home');
+
+      assert.equal(this.$('#null-link').attr('href'), '/home');
+      assert.equal(this.$('#undefined-link').attr('href'), '/home');
     }
 
     ["@test A child of a resource route still defaults to parent route's model even if the child route has a query param"](
diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index afa1058f619..7c78124c955 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -57,11 +57,9 @@ moduleFor(
       };
     }
 
-    ['@test can render a link to an asynchronously loaded route without fetching the route'](
+    async ['@test can render a link to an asynchronously loaded route without fetching the route'](
       assert
     ) {
-      assert.expect(4);
-
       this.router.map(function () {
         this.route('post', { path: '/post/:id' });
       });
@@ -72,32 +70,32 @@ moduleFor(
         this.addTemplate(
           'application',
           `
-        {{#link-to route='post' model=1337 query=(hash foo='bar') class='post-link is-1337'}}Post{{/link-to}}
-        {{#link-to route='post' model=7331 query=(hash foo='boo') class='post-link is-7331'}}Post{{/link-to}}
-        {{outlet}}
-      `
+          <LinkTo @route='post' @model={{1337}} @query={{hash foo='bar'}} class='post-link is-1337'>Post</LinkTo>
+          <LinkTo @route='post' @model={{7331}} @query={{hash foo='boo'}} class='post-link is-7331'>Post</LinkTo>
+          {{outlet}}
+          `
         );
       };
 
       setupAppTemplate();
 
-      return this.visitAndAssert('/').then(() => {
-        assert.equal(
-          this.$('.post-link.is-1337').attr('href'),
-          '/post/1337?foo=bar',
-          'renders correctly with default QP value'
-        );
-        assert.equal(
-          this.$('.post-link.is-7331').attr('href'),
-          '/post/7331?foo=boo',
-          'renders correctly with non-default QP value'
-        );
-        assert.deepEqual(
-          this.fetchedHandlers,
-          ['application', 'index'],
-          `only fetched the handlers for the route we're on`
-        );
-      });
+      await this.visitAndAssert('/');
+
+      assert.equal(
+        this.$('.post-link.is-1337').attr('href'),
+        '/post/1337?foo=bar',
+        'renders correctly with default QP value'
+      );
+      assert.equal(
+        this.$('.post-link.is-7331').attr('href'),
+        '/post/7331?foo=boo',
+        'renders correctly with non-default QP value'
+      );
+      assert.deepEqual(
+        this.fetchedHandlers,
+        ['application', 'index'],
+        `only fetched the handlers for the route we're on`
+      );
     }
 
     ['@test can transitionTo to an asynchronously loaded route with simple query params'](assert) {
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index bd1a637858e..cf2a60b5df7 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -215,7 +215,7 @@ class DeprecationAssert extends DebugAssert {
         true
       );
     } else {
-      this.expectNoDeprecationAsync(func);
+      await this.expectNoDeprecationAsync(func);
     }
   }
 

From b46eee7764d7007bbc55c18a5f3053266d88a335 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 24 Feb 2021 18:07:39 -0500
Subject: [PATCH 0398/1405] [BUGFIX release] Expose `@glimmer/syntax` from
 template compiler privately for use in Embroider.

This enables Embroider to remove some gnarly hacks (or at least only
resort to them when operating on older Ember).
---
 packages/ember-template-compiler/index.ts     |  8 ++
 .../lib/system/compile-options.ts             | 21 ++++-
 .../tests/basic-usage-test.js                 | 92 +++++++++++++++++++
 3 files changed, 117 insertions(+), 4 deletions(-)
 create mode 100644 packages/ember-template-compiler/tests/basic-usage-test.js

diff --git a/packages/ember-template-compiler/index.ts b/packages/ember-template-compiler/index.ts
index 007f45f27fe..85baf317ec0 100644
--- a/packages/ember-template-compiler/index.ts
+++ b/packages/ember-template-compiler/index.ts
@@ -1,5 +1,6 @@
 import { ENV } from '@ember/-internals/environment';
 import { FEATURES } from '@ember/canary-features';
+import * as _GlimmerSyntax from '@glimmer/syntax';
 import VERSION from 'ember/version';
 import require from 'require';
 
@@ -28,12 +29,19 @@ export { default as precompile } from './lib/system/precompile';
 export { default as compile } from './lib/system/compile';
 export {
   default as compileOptions,
+  buildCompileOptions as _buildCompileOptions,
+  transformsFor as _transformsFor,
   registerPlugin,
   unregisterPlugin,
 } from './lib/system/compile-options';
 export { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from './lib/plugins/index';
 export { EmberPrecompileOptions } from './lib/types';
 
+export { preprocess as _preprocess, print as _print } from '@glimmer/syntax';
+export { precompile as _precompile } from '@glimmer/compiler';
+
+export { _GlimmerSyntax, VERSION };
+
 // used to bootstrap templates
 import './lib/system/bootstrap';
 
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 8a803b3aaaa..1c15d6a19fa 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -13,9 +13,9 @@ function malformedComponentLookup(string: string) {
   return string.indexOf('::') === -1 && string.indexOf(':') > -1;
 }
 
-export default function compileOptions(
-  _options: Partial<EmberPrecompileOptions> = {}
-): PrecompileOptions {
+export function buildCompileOptions(
+  _options: Partial<EmberPrecompileOptions>
+): EmberPrecompileOptions {
   let options: EmberPrecompileOptions = assign(
     { meta: {}, isProduction: false, plugins: { ast: [] } },
     _options,
@@ -42,7 +42,20 @@ export default function compileOptions(
     meta.moduleName = options.moduleName;
   }
 
-  let builtInPlugins = options.strictMode ? STRICT_MODE_TRANSFORMS : RESOLUTION_MODE_TRANSFORMS;
+  return options;
+}
+
+export function transformsFor(options: EmberPrecompileOptions): readonly PluginFunc[] {
+  return EMBER_STRICT_MODE && options.strictMode
+    ? STRICT_MODE_TRANSFORMS
+    : RESOLUTION_MODE_TRANSFORMS;
+}
+
+export default function compileOptions(
+  _options: Partial<EmberPrecompileOptions> = {}
+): PrecompileOptions {
+  let options = buildCompileOptions(_options);
+  let builtInPlugins = transformsFor(options);
 
   if (!_options.plugins) {
     options.plugins = { ast: [...USER_PLUGINS, ...builtInPlugins] };
diff --git a/packages/ember-template-compiler/tests/basic-usage-test.js b/packages/ember-template-compiler/tests/basic-usage-test.js
new file mode 100644
index 00000000000..4626b599048
--- /dev/null
+++ b/packages/ember-template-compiler/tests/basic-usage-test.js
@@ -0,0 +1,92 @@
+import {
+  _buildCompileOptions,
+  _preprocess,
+  _print,
+  registerPlugin,
+  unregisterPlugin,
+} from '../index';
+import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
+
+function reverseElementNodeTag() {
+  return {
+    name: 'reverse-element-node-tag',
+    visitor: {
+      ElementNode(node) {
+        node.tag = node.tag.split('').reverse().join('');
+      },
+    },
+  };
+}
+
+function removeDataTest() {
+  return {
+    name: 'remove-data-test',
+
+    visitor: {
+      ElementNode(node) {
+        for (let i = 0; i < node.attributes.length; i++) {
+          let attribute = node.attributes[i];
+
+          if (attribute.name === 'data-test') {
+            node.attributes.splice(i, 1);
+          }
+        }
+      },
+    },
+  };
+}
+
+moduleFor(
+  'ember-template-compiler: Embroider-like compilation',
+  class extends RenderingTestCase {
+    afterEach() {
+      expectDeprecation(() => {
+        unregisterPlugin('ast', removeDataTest);
+      }, /unregisterPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
+      return super.afterEach();
+    }
+
+    '@test can process a subset of AST plugins and print'(assert) {
+      let template = '<div data-test="foo" data-blah="derp" class="hahaha">&nbsp;</div>';
+
+      // build up options including strictMode default values, customizeComponentName, meta.moduleName, etc
+      let options = _buildCompileOptions({
+        mode: 'codemod',
+        moduleName: 'components/foo',
+        plugins: { ast: [removeDataTest] },
+      });
+
+      let transformedTemplateAST = _preprocess(template, options);
+
+      // print back to a handlebars string
+      let result = _print(transformedTemplateAST, { entityEncoding: 'raw' });
+
+      assert.equal(result, '<div data-blah="derp" class="hahaha">&nbsp;</div>');
+    }
+
+    '@test registerPlugin based transforms can be avoided'(assert) {
+      expectDeprecation(() => {
+        registerPlugin('ast', removeDataTest);
+      }, /registerPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
+
+      let template = '<div data-test="foo" data-blah="derp" class="hahaha">&nbsp;</div>';
+
+      // build up options including strictMode default values, customizeComponentName, meta.moduleName, etc
+      let options = _buildCompileOptions({
+        mode: 'codemod',
+        moduleName: 'components/foo',
+        plugins: {
+          ast: [reverseElementNodeTag],
+        },
+      });
+
+      let transformedTemplateAST = _preprocess(template, options);
+
+      // print back to a handlebars string
+      let result = _print(transformedTemplateAST, { entityEncoding: 'raw' });
+
+      // only reverseElementNodeTag has ran, **not** removeDataTest
+      assert.equal(result, '<vid data-test="foo" data-blah="derp" class="hahaha">&nbsp;</vid>');
+    }
+  }
+);

From 97bd0a2600bb5cb7f4317a3b368201f0cb83493b Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 25 Feb 2021 23:37:03 -0800
Subject: [PATCH 0399/1405] Fix IE11: Object.entries is not available

---
 .../glimmer/lib/components/abstract-input.ts  |  6 +++--
 .../glimmer/lib/components/internal.ts        | 24 ++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index 0e8ad503e2f..13096945949 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -15,6 +15,8 @@ import InternalComponent, {
   handleDeprecatedEventArguments,
   InternalComponentConstructor,
   jQueryEventShim,
+  ObjectEntries,
+  ObjectValues,
 } from './internal';
 
 const UNINITIALIZED: unknown = Object.freeze({});
@@ -302,7 +304,7 @@ export function handleDeprecatedFeatures(
 
     handleDeprecatedAttributeArguments(target, attributeBindings);
 
-    handleDeprecatedEventArguments(target, Object.entries(virtualEvents));
+    handleDeprecatedEventArguments(target, ObjectEntries(virtualEvents));
 
     {
       let superIsVirtualEventListener = prototype['isVirtualEventListener'];
@@ -316,7 +318,7 @@ export function handleDeprecatedFeatures(
           listener: Function
         ): listener is VirtualEventListener {
           return (
-            Object.values(virtualEvents).indexOf(name) !== -1 ||
+            ObjectValues(virtualEvents).indexOf(name) !== -1 ||
             superIsVirtualEventListener.call(this, name, listener)
           );
         },
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index b30bc75812c..1942dbe344f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -28,6 +28,24 @@ import InternalModifier, { InternalModifierManager } from '../modifiers/internal
 
 function NOOP(): void {}
 
+// TODO: remove me when IE11 support is EOL
+export let ObjectEntries = ((): typeof Object['entries'] => {
+  if (typeof Object.entries === 'function') {
+    return Object.entries;
+  } else {
+    return (obj: {}) => Object.keys(obj).map((key) => [key, obj[key]] as [string, unknown]);
+  }
+})();
+
+// TODO: remove me when IE11 support is EOL
+export let ObjectValues = ((): typeof Object['values'] => {
+  if (typeof Object.values === 'function') {
+    return Object.values;
+  } else {
+    return (obj: {}) => Object.keys(obj).map((key) => obj[key]);
+  }
+})();
+
 export type EventListener = (event: Event) => void;
 
 export default class InternalComponent {
@@ -418,7 +436,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         name: string
       ): boolean {
         let events = [
-          ...Object.values(getEventsMap(this.owner)),
+          ...ObjectValues(getEventsMap(this.owner)),
           'focus-in',
           'focus-out',
           'key-press',
@@ -444,7 +462,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         let { element, component, listenerFor, listeners } = this;
 
         let entries: [event: string, argument: string][] = [
-          ...Object.entries(getEventsMap(this.owner)),
+          ...ObjectEntries(getEventsMap(this.owner)),
           ...extraEvents,
         ];
 
@@ -463,7 +481,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       remove(): void {
         let { element, listeners } = this;
 
-        for (let [event, listener] of Object.entries(listeners)) {
+        for (let [event, listener] of ObjectEntries(listeners)) {
           element.removeEventListener(event, listener);
         }
 

From 9973c42b37cd9b8a9ba62137f6b4cb9e15b811e1 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Fri, 26 Feb 2021 00:25:28 -0800
Subject: [PATCH 0400/1405] Fix node: EventDispatcher references `document`
 global

---
 .../views/lib/system/event_dispatcher.js      | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 176a4b34356..39b5798fda7 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -121,18 +121,8 @@ export default EmberObject.extend({
 
   init() {
     this._super();
-
-    assert(
-      'EventDispatcher should never be instantiated in fastboot mode. Please report this as an Ember bug.',
-      (() => {
-        let owner = getOwner(this);
-        let environment = owner.lookup('-environment:main');
-
-        return environment.isInteractive;
-      })()
-    );
-
     this._eventHandlers = Object.create(null);
+    this._didSetup = false;
   },
 
   /**
@@ -148,6 +138,16 @@ export default EmberObject.extend({
     @param addedEvents {Object}
   */
   setup(addedEvents, _rootElement) {
+    assert(
+      'EventDispatcher should never be setup in fastboot mode. Please report this as an Ember bug.',
+      (() => {
+        let owner = getOwner(this);
+        let environment = owner.lookup('-environment:main');
+
+        return environment.isInteractive;
+      })()
+    );
+
     let events = (this._finalEvents = assign({}, get(this, 'events'), addedEvents));
 
     if (_rootElement !== undefined && _rootElement !== null) {
@@ -230,6 +230,8 @@ export default EmberObject.extend({
         this.setupHandler(rootElement, event, events[event]);
       }
     }
+
+    this._didSetup = true;
   },
 
   /**
@@ -432,6 +434,10 @@ export default EmberObject.extend({
   },
 
   destroy() {
+    if (this._didSetup === false) {
+      return;
+    }
+
     let rootElementSelector = get(this, 'rootElement');
     let rootElement;
     if (rootElementSelector.nodeType) {

From 7222cc54e62b53984d8c35b7527d9fff3ede0da8 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 25 Feb 2021 22:41:23 -0800
Subject: [PATCH 0401/1405] [FEATURE modernized-built-in-components] Enable
 feature

---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 730e9360b16..710f28132b7 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -18,7 +18,7 @@ export const DEFAULT_FEATURES = {
   EMBER_NAMED_BLOCKS: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS: null,
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: null,
 };

From 499bd1299f7903928cde46f5f2523ec311497d99 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sun, 28 Feb 2021 11:33:58 +0100
Subject: [PATCH 0402/1405] [DOC] Fix typo in glimmer component docs

---
 .../@ember/-internals/glimmer/lib/glimmer-component-docs.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index 2b8e8dfaa15..ec4399d774b 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -149,7 +149,7 @@
   ```handlebars
   <PersonProfile @person={{this.currentUser}}>
     <:title>{{this.currentUser.name}}</:title>
-    <:default>{{this.currentUser.siganture}}</:default>
+    <:default>{{this.currentUser.signature}}</:default>
   </PersonProfile>
   ```
 
@@ -172,7 +172,7 @@
   ```handlebars
   <PersonProfile @person={{this.currentUser}}>
     <:title as |name|>{{name}}</:title>
-    <:default as |signature|>{{siganture}}</:default>
+    <:default as |signature|>{{signature}}</:default>
   </PersonProfile>
   ```
 
@@ -204,7 +204,7 @@
   {{! passing both blocks }}
   <PersonProfile @person={{this.currentUser}}>
     <:title as |name|>{{name}}</:title>
-    <:default as |signature|>{{siganture}}</:default>
+    <:default as |signature|>{{signature}}</:default>
   </PersonProfile>
 
   {{! passing just the title block }}

From 09b767d870b3da84d2892929ac69e1556cdc1b7c Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sun, 28 Feb 2021 14:52:45 +0100
Subject: [PATCH 0403/1405] [BUGFIX beta] Support observer keys with colons

---
 packages/@ember/-internals/metal/lib/observer.ts  |  2 +-
 .../-internals/metal/tests/observer_test.js       | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts
index 2de6b2887f1..67b5fb678d8 100644
--- a/packages/@ember/-internals/metal/lib/observer.ts
+++ b/packages/@ember/-internals/metal/lib/observer.ts
@@ -96,7 +96,7 @@ export function activateObserver(target: object, eventName: string, sync = false
   if (activeObservers.has(eventName)) {
     activeObservers.get(eventName)!.count++;
   } else {
-    let [path] = eventName.split(':');
+    let path = eventName.substring(0, eventName.lastIndexOf(':'));
     let tag = getChainTagsForKey(target, path, tagMetaFor(target), peekMeta(target));
 
     activeObservers.set(eventName, {
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index 161a535df06..1a78e8ea0c7 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -87,6 +87,21 @@ moduleFor(
       assert.equal(count, 1, 'should have invoked observer');
     }
 
+    async ['@test observer supports keys with colons'](assert) {
+      obj = {};
+      let count = 0;
+
+      addObserver(obj, 'foo:bar:baz', function () {
+        assert.equal(get(obj, 'foo:bar:baz'), 'bar', 'should invoke AFTER value changed');
+        count++;
+      });
+
+      set(obj, 'foo:bar:baz', 'bar');
+      await runLoopSettled();
+
+      assert.equal(count, 1, 'should have invoked observer');
+    }
+
     async ['@test observer should fire when dependent property is modified'](assert) {
       obj = { bar: 'bar' };
       defineProperty(

From b98abf7199f203d9e3e4df41618ef27463dcacd3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 13:45:42 +0000
Subject: [PATCH 0404/1405] Bump eslint-plugin-prettier from 3.1.4 to 3.3.1

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.4 to 3.3.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v3.1.4...v3.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 758fd597fdf..62c020b1ea5 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "eslint-plugin-ember-internal": "^1.1.1",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-qunit": "^4.0.0",
     "execa": "^2.0.4",
     "express": "^4.17.1",
diff --git a/yarn.lock b/yarn.lock
index d26911ac90a..9a67697f481 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4753,10 +4753,10 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
-  integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
+eslint-plugin-prettier@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
+  integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 

From 256c49bf4c3d995a445abc01a5574614b394dce1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 1 Mar 2021 14:05:32 +0000
Subject: [PATCH 0405/1405] Bump qunit from 2.10.0 to 2.14.0

Bumps [qunit](https://github.com/qunitjs/qunit) from 2.10.0 to 2.14.0.
- [Release notes](https://github.com/qunitjs/qunit/releases)
- [Changelog](https://github.com/qunitjs/qunit/blob/master/History.md)
- [Commits](https://github.com/qunitjs/qunit/compare/2.10.0...2.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 68 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 62c020b1ea5..053ffe9cbaf 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
     "mocha": "^7.1.2",
     "prettier": "^2.1.2",
     "puppeteer": "^3.0.4",
-    "qunit": "^2.10.0",
+    "qunit": "^2.14.0",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
diff --git a/yarn.lock b/yarn.lock
index 9a67697f481..2f5c015cb4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3672,11 +3672,6 @@ combined-stream@~0.0.4:
   dependencies:
     delayed-stream "0.0.5"
 
-commander@2.12.2:
-  version "2.12.2"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
-  integrity sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==
-
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -3684,6 +3679,11 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
+  integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
+
 commander@^2.12.1, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -5721,6 +5721,11 @@ globals@^9.18.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
+globalyzer@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
+  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
+
 globby@^11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
@@ -5733,6 +5738,11 @@ globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globrex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+
 got@^8.0.1, got@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
@@ -6535,10 +6545,10 @@ jquery@^3.5.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
   integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
-js-reporters@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.1.tgz#f88c608e324a3373a95bcc45ad305e5c979c459b"
-  integrity sha1-+IxgjjJKM3OpW8xFrTBeXJecRZs=
+js-reporters@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.3.tgz#8febcab370539df62e09b95da133da04b11f6168"
+  integrity sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A==
 
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
@@ -7719,10 +7729,10 @@ node-uuid@~1.4.0:
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
   integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
 
-node-watch@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.6.1.tgz#b9874111ce9f5841b1c7596120206c7b825be0e9"
-  integrity sha512-gwQiR7weFRV8mAtT0x0kXkZ18dfRLB45xH7q0hCOVQMLfLb2f1ZaSvR57q4/b/Vj6B0RwMNJYbvb69e1yM7qEA==
+node-watch@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.1.tgz#0caaa6a6833b0d533487f953c52a6c787769ba7c"
+  integrity sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g==
 
 nopt@^3.0.6:
   version "3.0.6"
@@ -8440,16 +8450,15 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.10.0.tgz#c467b7d558928539a13f8461c4fe41922333ae7b"
-  integrity sha512-EP9Q9Kf45z4l/X02ZJtyTQU9DBc82pEWAncSNx7Weo/73BDpX71xqbsdDAQrtEeeilK70cib7CY/lniJV6Cwwg==
+qunit@^2.14.0:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.14.0.tgz#6f913903e71ebe24ef4a4dada2b796fb52285051"
+  integrity sha512-CYfenbgdpmhl2Ql2rDrrj0felY4h8k6lYhtWwGBCLL4qQC33YOj0psV8MWo85L1i0SIOmEDRXkFopWnGCLmf7g==
   dependencies:
-    commander "2.12.2"
-    js-reporters "1.2.1"
-    minimatch "3.0.4"
-    node-watch "0.6.1"
-    resolve "1.9.0"
+    commander "6.2.0"
+    js-reporters "1.2.3"
+    node-watch "0.7.1"
+    tiny-glob "0.2.8"
 
 range-parser@~1.2.1:
   version "1.2.1"
@@ -8788,13 +8797,6 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
-  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
-  dependencies:
-    path-parse "^1.0.6"
-
 resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
@@ -9828,6 +9830,14 @@ timed-out@^4.0.1:
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
   integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
+tiny-glob@0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.8.tgz#b2792c396cc62db891ffa161fe8b33e76123e531"
+  integrity sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w==
+  dependencies:
+    globalyzer "0.1.0"
+    globrex "^0.1.2"
+
 tiny-lr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"

From 2676ee3b90c269a9b6606ec082dc66945317092d Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Fri, 26 Feb 2021 22:16:44 +0000
Subject: [PATCH 0406/1405] Add renderTemplate deprecation

---
 .../@ember/-internals/routing/lib/system/route.ts     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 30169a18520..d2156b10217 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1507,6 +1507,17 @@ class Route extends EmberObject implements IRoute {
     @public
   */
   renderTemplate(_controller: any, _model: {}) {
+    if (this.renderTemplate !== Route.prototype.renderTemplate) {
+      deprecate('Usage of `renderTemplate` is deprecated.', false, {
+        id: 'route-render-template',
+        until: '4.0.0',
+        url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
+        for: 'ember-source',
+        since: {
+          enabled: '3.27.0',
+        },
+      });
+    }
     // eslint-disable-line no-unused-vars
     this.render();
   }

From 21350a5d8b9aa886390045701125d97143e682a0 Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Mon, 1 Mar 2021 14:26:22 +0000
Subject: [PATCH 0407/1405] Fix failing tests

---
 .../ember-testing/tests/acceptance_test.js    | 24 ++++++++++---------
 .../tests/routing/template_rendering_test.js  |  3 ++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index 6ed764cb5e0..b43a0d13785 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -51,6 +51,7 @@ if (!jQueryDisabled) {
             'route:posts',
             Route.extend({
               renderTemplate() {
+                expectDeprecation('Usage of `renderTemplate` is deprecated.');
                 testContext.currentRoute = 'posts';
                 this._super(...arguments);
               },
@@ -73,6 +74,7 @@ if (!jQueryDisabled) {
             'route:comments',
             Route.extend({
               renderTemplate() {
+                expectDeprecation('Usage of `renderTemplate` is deprecated.');
                 testContext.currentRoute = 'comments';
                 this._super(...arguments);
               },
@@ -125,7 +127,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers can be chained with then`](assert) {
-        assert.expect(6);
+        assert.expect(8);
 
         window
           .visit('/posts')
@@ -164,7 +166,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers can be chained to each other (legacy)`](assert) {
-        assert.expect(7);
+        assert.expect(10);
 
         window
           .visit('/posts')
@@ -192,7 +194,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers don't need to be chained`](assert) {
-        assert.expect(5);
+        assert.expect(8);
 
         window.visit('/posts');
 
@@ -219,7 +221,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Nested async helpers`](assert) {
-        assert.expect(5);
+        assert.expect(8);
 
         window.visit('/posts');
 
@@ -247,7 +249,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Multiple nested async helpers`](assert) {
-        assert.expect(3);
+        assert.expect(5);
 
         window.visit('/posts');
 
@@ -270,7 +272,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Helpers nested in thens`](assert) {
-        assert.expect(5);
+        assert.expect(8);
 
         window.visit('/posts').then(() => {
           window.click('a:first', '#comments-link');
@@ -311,7 +313,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Unhandled exceptions are logged via Ember.Test.adapter#exception`](assert) {
-        assert.expect(2);
+        assert.expect(3);
 
         console.error = () => {}; // eslint-disable-line no-console
         let asyncHandled;
@@ -343,7 +345,7 @@ if (!jQueryDisabled) {
       [`@test Unhandled exceptions in 'andThen' are logged via Ember.Test.adapter#exception`](
         assert
       ) {
-        assert.expect(1);
+        assert.expect(2);
 
         console.error = () => {}; // eslint-disable-line no-console
         Test.adapter = QUnitAdapter.create({
@@ -364,7 +366,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test should not start routing on the root URL when visiting another`](assert) {
-        assert.expect(4);
+        assert.expect(5);
 
         window.visit('/posts');
 
@@ -427,7 +429,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test visiting a URL that causes another transition should yield the correct URL`](assert) {
-        assert.expect(2);
+        assert.expect(3);
 
         window.visit('/redirect');
 
@@ -439,7 +441,7 @@ if (!jQueryDisabled) {
       [`@test visiting a URL and then visiting a second URL with a transition should yield the correct URL`](
         assert
       ) {
-        assert.expect(3);
+        assert.expect(5);
 
         window.visit('/posts');
 
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index b1da5207607..7f8a4cebb78 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -305,7 +305,7 @@ moduleFor(
     }
 
     ['@test Generated names can be customized when providing routes with dot notation'](assert) {
-      assert.expect(4);
+      assert.expect(5);
 
       this.addTemplate('index', '<div>Index</div>');
       this.addTemplate('application', "<h1>Home</h1><div class='main'>{{outlet}}</div>");
@@ -325,6 +325,7 @@ moduleFor(
         'route:foo',
         Route.extend({
           renderTemplate() {
+            expectDeprecation('Usage of `renderTemplate` is deprecated.');
             assert.ok(true, 'FooBarRoute was called');
             return this._super(...arguments);
           },

From b44adfee09f25d7dae36f8c831517f904798eb73 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 1 Mar 2021 10:12:21 -0500
Subject: [PATCH 0408/1405] Update version to `3.27.0-alpha.0`.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 053ffe9cbaf..234abd5e771 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.27.0",
+  "version": "3.27.0-alpha.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From f66ac4fc199be0c078cf27b24d6c2b8e52c51cba Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 1 Mar 2021 10:12:44 -0500
Subject: [PATCH 0409/1405] 3.27.0-alpha.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 234abd5e771..639f7feb92c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.27.0-alpha.0",
+  "version": "3.27.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 2f6e493a77c6516af99c6702421429c43a1bed01 Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Mon, 1 Mar 2021 15:07:58 +0000
Subject: [PATCH 0410/1405] Refactor based on PR feedback and fix more tests

---
 .../application/debug-render-tree-test.ts     |  1 +
 .../integration/application/rendering-test.js |  3 +++
 .../-internals/routing/lib/system/route.ts    | 24 +++++++++--------
 .../ember-testing/tests/acceptance_test.js    | 27 ++++++++++++-------
 .../tests/routing/decoupled_basic_test.js     |  1 +
 .../ember/tests/routing/model_loading_test.js |  2 ++
 .../tests/routing/template_rendering_test.js  | 22 +++++++++++++--
 7 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 0b7adb9c781..904990bbb2b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -181,6 +181,7 @@ if (ENV._DEBUG_RENDER_TREE) {
       }
 
       async '@test named outlets'() {
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
         this.addTemplate(
           'application',
           strip`
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 687cfdc252e..7efd7402d5b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -440,6 +440,7 @@ moduleFor(
     }
 
     ['@test it can render into named outlets']() {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.router.map(function () {
         this.route('colors');
       });
@@ -599,6 +600,7 @@ moduleFor(
     }
 
     ['@test it should update correctly when the controller changes']() {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.router.map(function () {
         this.route('color', { path: '/colors/:color' });
       });
@@ -643,6 +645,7 @@ moduleFor(
     }
 
     ['@test it should produce a stable DOM when two routes render the same template']() {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.router.map(function () {
         this.route('a');
         this.route('b');
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index d2156b10217..f57c581ef8c 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -988,6 +988,19 @@ class Route extends EmberObject implements IRoute {
     this.setupController(controller, context, transition);
 
     if (this._environment.options.shouldRender) {
+      deprecate(
+        'Usage of `renderTemplate` is deprecated.',
+        this.renderTemplate === Route.prototype.renderTemplate,
+        {
+          id: 'route-render-template',
+          until: '4.0.0',
+          url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
+          for: 'ember-source',
+          since: {
+            enabled: '3.27.0',
+          },
+        }
+      );
       this.renderTemplate(controller, context);
     }
 
@@ -1507,17 +1520,6 @@ class Route extends EmberObject implements IRoute {
     @public
   */
   renderTemplate(_controller: any, _model: {}) {
-    if (this.renderTemplate !== Route.prototype.renderTemplate) {
-      deprecate('Usage of `renderTemplate` is deprecated.', false, {
-        id: 'route-render-template',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
-        for: 'ember-source',
-        since: {
-          enabled: '3.27.0',
-        },
-      });
-    }
     // eslint-disable-line no-unused-vars
     this.render();
   }
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index b43a0d13785..c58f7ecac6a 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -51,7 +51,6 @@ if (!jQueryDisabled) {
             'route:posts',
             Route.extend({
               renderTemplate() {
-                expectDeprecation('Usage of `renderTemplate` is deprecated.');
                 testContext.currentRoute = 'posts';
                 this._super(...arguments);
               },
@@ -74,7 +73,6 @@ if (!jQueryDisabled) {
             'route:comments',
             Route.extend({
               renderTemplate() {
-                expectDeprecation('Usage of `renderTemplate` is deprecated.');
                 testContext.currentRoute = 'comments';
                 this._super(...arguments);
               },
@@ -127,7 +125,8 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers can be chained with then`](assert) {
-        assert.expect(8);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(7);
 
         window
           .visit('/posts')
@@ -166,7 +165,8 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers can be chained to each other (legacy)`](assert) {
-        assert.expect(10);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(8);
 
         window
           .visit('/posts')
@@ -194,7 +194,8 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers don't need to be chained`](assert) {
-        assert.expect(8);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(6);
 
         window.visit('/posts');
 
@@ -221,7 +222,8 @@ if (!jQueryDisabled) {
       }
 
       [`@test Nested async helpers`](assert) {
-        assert.expect(8);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(6);
 
         window.visit('/posts');
 
@@ -249,7 +251,8 @@ if (!jQueryDisabled) {
       }
 
       [`@test Multiple nested async helpers`](assert) {
-        assert.expect(5);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(4);
 
         window.visit('/posts');
 
@@ -272,7 +275,8 @@ if (!jQueryDisabled) {
       }
 
       [`@test Helpers nested in thens`](assert) {
-        assert.expect(8);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(6);
 
         window.visit('/posts').then(() => {
           window.click('a:first', '#comments-link');
@@ -313,6 +317,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Unhandled exceptions are logged via Ember.Test.adapter#exception`](assert) {
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
         assert.expect(3);
 
         console.error = () => {}; // eslint-disable-line no-console
@@ -345,6 +350,7 @@ if (!jQueryDisabled) {
       [`@test Unhandled exceptions in 'andThen' are logged via Ember.Test.adapter#exception`](
         assert
       ) {
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
         assert.expect(2);
 
         console.error = () => {}; // eslint-disable-line no-console
@@ -366,6 +372,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test should not start routing on the root URL when visiting another`](assert) {
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
         assert.expect(5);
 
         window.visit('/posts');
@@ -429,6 +436,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test visiting a URL that causes another transition should yield the correct URL`](assert) {
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
         assert.expect(3);
 
         window.visit('/redirect');
@@ -441,7 +449,8 @@ if (!jQueryDisabled) {
       [`@test visiting a URL and then visiting a second URL with a transition should yield the correct URL`](
         assert
       ) {
-        assert.expect(5);
+        expectDeprecation('Usage of `renderTemplate` is deprecated.');
+        assert.expect(4);
 
         window.visit('/posts');
 
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 8e5e13a6c26..9851ff0ccf5 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -919,6 +919,7 @@ moduleFor(
     }
 
     ['@test Router accounts for rootURL on page load when using history location'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       let rootURL = window.location.pathname + '/app';
       let postsTemplateRendered = false;
       let setHistory;
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 09dac8dbf6a..9a9151286e8 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -204,6 +204,7 @@ moduleFor(
     }
 
     [`@test The route controller specified via controllerName is used in render`](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.router.map(function () {
         this.route('home', { path: '/' });
       });
@@ -484,6 +485,7 @@ moduleFor(
     }
 
     ['@test Nested callbacks are not exited when moving to siblings'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       let rootSetup = 0;
       let rootRender = 0;
       let rootModel = 0;
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 7f8a4cebb78..df0f00a8ea1 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -71,6 +71,7 @@ moduleFor(
     }
 
     [`@test The Homepage with explicit template name in renderTemplate`](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.add(
         'route:home',
         Route.extend({
@@ -87,6 +88,7 @@ moduleFor(
     }
 
     async [`@test an alternate template will pull in an alternate controller`](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.add(
         'route:home',
         Route.extend({
@@ -113,6 +115,7 @@ moduleFor(
     async [`@test An alternate template will pull in an alternate controller instead of controllerName`](
       assert
     ) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.add(
         'route:home',
         Route.extend({
@@ -147,6 +150,7 @@ moduleFor(
     }
 
     async [`@test The template will pull in an alternate controller via key/value`](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.router.map(function () {
         this.route('homepage', { path: '/' });
       });
@@ -181,6 +185,7 @@ moduleFor(
     async [`@test The Homepage with explicit template name in renderTemplate and controller`](
       assert
     ) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.add(
         'controller:home',
         Controller.extend({
@@ -205,6 +210,7 @@ moduleFor(
     }
 
     async [`@test Model passed via renderTemplate model is set as controller's model`](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate(
         'bio',
         '<p>Model: {{@model.name}}</p><p>Controller: {{this.model.name}}</p>'
@@ -284,6 +290,7 @@ moduleFor(
     }
 
     ['@test templateName is still used when calling render with no name and options'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('alert', `<div class='alert-box'>Invader!</div>`);
       this.addTemplate('home', `<p>THIS IS THE REAL HOME</p>{{outlet 'alert'}}`);
 
@@ -305,6 +312,7 @@ moduleFor(
     }
 
     ['@test Generated names can be customized when providing routes with dot notation'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       assert.expect(5);
 
       this.addTemplate('index', '<div>Index</div>');
@@ -325,7 +333,6 @@ moduleFor(
         'route:foo',
         Route.extend({
           renderTemplate() {
-            expectDeprecation('Usage of `renderTemplate` is deprecated.');
             assert.ok(true, 'FooBarRoute was called');
             return this._super(...arguments);
           },
@@ -394,6 +401,7 @@ moduleFor(
     }
 
     ['@test Child routes render into specified template'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('index', '<div>Index</div>');
       this.addTemplate('application', "<h1>Home</h1><div class='main'>{{outlet}}</div>");
       this.addTemplate('top', "<div class='middle'>{{outlet}}</div>");
@@ -434,6 +442,7 @@ moduleFor(
     }
 
     ['@test Rendering into specified template with slash notation'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('person.profile', 'profile {{outlet}}');
       this.addTemplate('person.details', 'details!');
 
@@ -462,6 +471,7 @@ moduleFor(
     }
 
     ['@test Only use route rendered into main outlet for default into property on child'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', "{{outlet 'menu'}}{{outlet}}");
       this.addTemplate('posts', '{{outlet}}');
       this.addTemplate('posts.index', '<p class="posts-index">postsIndex</p>');
@@ -601,6 +611,7 @@ moduleFor(
     ['@test The template is not re-rendered when two routes present the exact same template & controller'](
       assert
     ) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.router.map(function () {
         this.route('first');
         this.route('second');
@@ -679,6 +690,7 @@ moduleFor(
     }
 
     ['@test Route should tear down multiple outlets'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', "{{outlet 'menu'}}{{outlet}}{{outlet 'footer'}}");
       this.addTemplate('posts', '{{outlet}}');
       this.addTemplate('users', 'users');
@@ -1000,7 +1012,8 @@ moduleFor(
     }
 
     ['@test Specifying non-existent controller name in route#render throws'](assert) {
-      assert.expect(1);
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
+      assert.expect(2);
 
       this.router.map(function () {
         this.route('home', { path: '/' });
@@ -1050,6 +1063,7 @@ moduleFor(
     }
 
     ['@test Can render into a named outlet at the top level'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
       this.addTemplate('index', 'The index');
@@ -1080,6 +1094,7 @@ moduleFor(
     }
 
     ['@test Can disconnect a named outlet at the top level'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
       this.addTemplate('index', 'The index');
@@ -1126,6 +1141,7 @@ moduleFor(
     }
 
     ['@test Can render into a named outlet at the top level, with empty main outlet'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
       this.addTemplate('modal', 'Hello world');
 
@@ -1186,6 +1202,7 @@ moduleFor(
     }
 
     ["@test Can render routes with no 'main' outlet and their children"](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', '<div id="application">{{outlet "app"}}</div>');
       this.addTemplate(
         'app',
@@ -1298,6 +1315,7 @@ moduleFor(
     }
 
     ['@test Renders child into parent with non-default template name'](assert) {
+      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       this.addTemplate('application', '<div class="a">{{outlet}}</div>');
       this.addTemplate('exports.root', '<div class="b">{{outlet}}</div>');
       this.addTemplate('exports.index', '<div class="c"></div>');

From 0079b11d0aaec9980aa5e24d165653faf942a791 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 1 Mar 2021 09:48:02 -0500
Subject: [PATCH 0411/1405] Add automated publishing of weekly alpha releases
 to NPM

By default the ember-cli blueprint uses ember-try to download the `npm
pack` result of the most recent caanry build from Amazon S3 (this is
usually setup to run in that addon's CI configuration). Unfortunately,
some organizations have security restrictions **preventing** access to
the internet during CI jobs. They often have customized NPM mirrors that
do work (otherwise how would they ever build / test JS code), but block
access to the rest of the internet. Up until this change, those
organizations simply **could not** be early testers of our canary
builds.

This change adds a new CI job to auto-publish a new `-alpha.x` release
to NPM once a week (on Mondays). This will allow folks to leverage their
normal `npm install` infrastructure to be able to test canary Ember
builds once a week (though we could in theory decide to make more
publish). However, since the process is automated these alphas will not
include changelog entries. It is theoretically possible that we would
prefer to leverage this infrastructure for testing addons against
published tags (instead of using `ember-source-channel-url`), but that
would reduce our speed of identifiying regressions.
---
 .github/workflows/alpha-releases.yml | 60 ++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 .github/workflows/alpha-releases.yml

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
new file mode 100644
index 00000000000..e89f8514cae
--- /dev/null
+++ b/.github/workflows/alpha-releases.yml
@@ -0,0 +1,60 @@
+name: Alpha Releases
+
+on:
+  schedule:
+    - cron:  '0 20 * * 1' # weekly (Monday)
+
+jobs:
+  test:
+    name: Basic Test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        env:
+          DISABLE_SOURCE_MAPS: true
+          BROCCOLI_ENV: production
+        run: yarn ember build
+      - name: test
+        env:
+          TEST_SUITE: each-package
+        run: yarn test
+
+  release:
+    name: Tag + Release
+    runs-on: ubuntu-latest
+    needs: [test]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+          registry-url: 'https://registry.npmjs.org'
+      - uses: actions/cache@v2
+        with:
+          path: '**/node_modules'
+          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: tag the next alpha
+        run: npm version prerelease --preid alpha
+      - name: build for publish
+        env:
+          BUILD_TYPE: alpha
+          OVERRIDE_FEATURES: ''
+        run: node bin/build-for-publishing.js
+      - name: publish to npm
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
+      - name: push branch + tag
+        run: git push origin HEAD --follow-tags

From 51d3614d0c9eef9d2161b54f743caae9b9007a7c Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Mon, 1 Mar 2021 20:26:44 +0000
Subject: [PATCH 0412/1405] Add deprecation for `render` method

---
 .../application/debug-render-tree-test.ts     |   7 +-
 .../integration/application/rendering-test.js |  27 +-
 .../-internals/routing/lib/system/route.ts    |  38 ++-
 .../ember/tests/routing/model_loading_test.js |   5 +-
 .../tests/routing/template_rendering_test.js  | 233 +++++++++++-------
 tests/docs/expected.js                        |   1 +
 6 files changed, 206 insertions(+), 105 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 904990bbb2b..06dad4a0d4c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -222,10 +222,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             }
 
             renderTemplate(_: Controller, { showHeader }: Model): void {
-              this.render();
+              expectDeprecation(() => this.render(), 'Usage of `render` is deprecated.');
 
               if (showHeader) {
-                this.render('header', { outlet: 'header' });
+                expectDeprecation(
+                  () => this.render('header', { outlet: 'header' }),
+                  'Usage of `render` is deprecated.'
+                );
               } else {
                 expectDeprecation(
                   () => this.disconnectOutlet('header'),
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 7efd7402d5b..9dd92db4210 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -464,11 +464,13 @@ moduleFor(
         'route:application',
         Route.extend({
           renderTemplate() {
-            this.render();
-            this.render('nav', {
-              into: 'application',
-              outlet: 'nav',
-            });
+            expectDeprecation(() => {
+              this.render();
+              this.render('nav', {
+                into: 'application',
+                outlet: 'nav',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -613,7 +615,10 @@ moduleFor(
           },
 
           renderTemplate(controller, model) {
-            this.render({ controller: model.color, model });
+            expectDeprecation(
+              () => this.render({ controller: model.color, model }),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
@@ -659,7 +664,10 @@ moduleFor(
           },
 
           renderTemplate(controller, model) {
-            this.render('common', { controller: 'common', model });
+            expectDeprecation(
+              () => this.render('common', { controller: 'common', model }),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
@@ -672,7 +680,10 @@ moduleFor(
           },
 
           renderTemplate(controller, model) {
-            this.render('common', { controller: 'common', model });
+            expectDeprecation(
+              () => this.render('common', { controller: 'common', model }),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index f57c581ef8c..f50dc5a9d72 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1485,6 +1485,29 @@ class Route extends EmberObject implements IRoute {
     return route && route.currentModel;
   }
 
+  /**
+    `_render` is used to render a template into a region of another template
+    (indicated by an `{{outlet}}`).
+
+    @method _render
+    @param {String} name the name of the template to render
+    @param {Object} [options] the options
+    @param {String} [options.into] the template to render into,
+                    referenced by name. Defaults to the parent template
+    @param {String} [options.outlet] the outlet inside `options.into` to render into.
+                    Defaults to 'main'
+    @param {String|Object} [options.controller] the controller to use for this template,
+                    referenced by name or as a controller instance. Defaults to the Route's paired controller
+    @param {Object} [options.model] the model object to set on `options.controller`.
+                    Defaults to the return value of the Route's model hook
+    @private
+   */
+  _render(name?: string, options?: PartialRenderOptions) {
+    let renderOptions = buildRenderOptions(this, name, options);
+    ROUTE_CONNECTIONS.get(this).push(renderOptions);
+    once(this._router, '_setOutlets');
+  }
+
   /**
     A hook you can use to render the template for the current route.
 
@@ -1521,7 +1544,7 @@ class Route extends EmberObject implements IRoute {
   */
   renderTemplate(_controller: any, _model: {}) {
     // eslint-disable-line no-unused-vars
-    this.render();
+    this._render();
   }
 
   /**
@@ -1652,9 +1675,16 @@ class Route extends EmberObject implements IRoute {
     @public
   */
   render(name?: string, options?: PartialRenderOptions) {
-    let renderOptions = buildRenderOptions(this, name, options);
-    ROUTE_CONNECTIONS.get(this).push(renderOptions);
-    once(this._router, '_setOutlets');
+    deprecate('Usage of `render` is deprecated.', false, {
+      id: 'route-render-template',
+      until: '4.0.0',
+      url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
+      for: 'ember-source',
+      since: {
+        enabled: '3.27.0',
+      },
+    });
+    this._render(name, options);
   }
 
   /**
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 9a9151286e8..ca93c5717cb 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -214,7 +214,10 @@ moduleFor(
         Route.extend({
           controllerName: 'myController',
           renderTemplate() {
-            this.render('alternative_home');
+            expectDeprecation(
+              () => this.render('alternative_home'),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index df0f00a8ea1..34cff663e5f 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -76,7 +76,7 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            this.render('homepage');
+            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -93,7 +93,7 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            this.render('homepage');
+            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -121,7 +121,7 @@ moduleFor(
         Route.extend({
           controllerName: 'foo',
           renderTemplate() {
-            this.render('homepage');
+            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -159,7 +159,10 @@ moduleFor(
         'route:homepage',
         Route.extend({
           renderTemplate() {
-            this.render({ controller: 'home' });
+            expectDeprecation(
+              () => this.render({ controller: 'home' }),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
@@ -199,7 +202,7 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            this.render('homepage');
+            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -219,9 +222,11 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            this.render('bio', {
-              model: { name: 'emberjs' },
-            });
+            expectDeprecation(() => {
+              this.render('bio', {
+                model: { name: 'emberjs' },
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -266,10 +271,12 @@ moduleFor(
           templateName: 'the_real_home_template',
           actions: {
             showAlert() {
-              this.render('alert', {
-                into: 'home',
-                outlet: 'alert',
-              });
+              expectDeprecation(() => {
+                this.render('alert', {
+                  into: 'home',
+                  outlet: 'alert',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
           },
         })
@@ -299,7 +306,7 @@ moduleFor(
         Route.extend({
           templateName: 'alert',
           renderTemplate() {
-            this.render({});
+            expectDeprecation(() => this.render({}), 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -420,7 +427,10 @@ moduleFor(
         'route:middle.bottom',
         Route.extend({
           renderTemplate() {
-            this.render('middle/bottom', { into: 'top' });
+            expectDeprecation(
+              () => this.render('middle/bottom', { into: 'top' }),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
@@ -454,8 +464,10 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            this.render('person/profile');
-            this.render('person/details', { into: 'person/profile' });
+            expectDeprecation(() => {
+              this.render('person/profile');
+              this.render('person/details', { into: 'person/profile' });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -485,11 +497,13 @@ moduleFor(
         'route:posts',
         Route.extend({
           renderTemplate() {
-            this.render();
-            this.render('posts/menu', {
-              into: 'application',
-              outlet: 'menu',
-            });
+            expectDeprecation(() => {
+              this.render();
+              this.render('posts/menu', {
+                into: 'application',
+                outlet: 'menu',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -637,7 +651,10 @@ moduleFor(
         },
 
         renderTemplate() {
-          this.render('shared', { controller: 'shared' });
+          expectDeprecation(
+            () => this.render('shared', { controller: 'shared' }),
+            'Usage of `render` is deprecated.'
+          );
         },
       });
 
@@ -707,17 +724,19 @@ moduleFor(
         'route:posts',
         Route.extend({
           renderTemplate() {
-            this.render('posts/menu', {
-              into: 'application',
-              outlet: 'menu',
-            });
+            expectDeprecation(() => {
+              this.render('posts/menu', {
+                into: 'application',
+                outlet: 'menu',
+              });
 
-            this.render();
+              this.render();
 
-            this.render('posts/footer', {
-              into: 'application',
-              outlet: 'footer',
-            });
+              this.render('posts/footer', {
+                into: 'application',
+                outlet: 'footer',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -782,10 +801,12 @@ moduleFor(
         Route.extend({
           actions: {
             showModal() {
-              this.render('posts/modal', {
-                into: 'application',
-                outlet: 'modal',
-              });
+              expectDeprecation(() => {
+                this.render('posts/modal', {
+                  into: 'application',
+                  outlet: 'modal',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
             hideModal() {
               expectDeprecation(
@@ -806,9 +827,11 @@ moduleFor(
         Route.extend({
           actions: {
             showExtra() {
-              this.render('posts/extra', {
-                into: 'posts/index',
-              });
+              expectDeprecation(() => {
+                this.render('posts/extra', {
+                  into: 'posts/index',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
             hideExtra() {
               expectDeprecation(
@@ -912,10 +935,12 @@ moduleFor(
         Route.extend({
           actions: {
             showModal() {
-              this.render('posts/modal', {
-                into: 'application',
-                outlet: 'modal',
-              });
+              expectDeprecation(() => {
+                this.render('posts/modal', {
+                  into: 'application',
+                  outlet: 'modal',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
             hideModal() {
               expectDeprecation(
@@ -965,7 +990,7 @@ moduleFor(
     }
 
     ['@test Route silently fails when cleaning an outlet from an inactive view'](assert) {
-      assert.expect(3); // handleURL
+      assert.expect(4); // handleURL
 
       this.addTemplate('application', '{{outlet}}');
       this.addTemplate('posts', "{{outlet 'modal'}}");
@@ -990,7 +1015,10 @@ moduleFor(
               );
             },
             showModal() {
-              this.render('modal', { into: 'posts', outlet: 'modal' });
+              expectDeprecation(
+                () => this.render('modal', { into: 'posts', outlet: 'modal' }),
+                'Usage of `render` is deprecated.'
+              );
             },
             hideModal() {
               expectDeprecation(
@@ -1013,7 +1041,8 @@ moduleFor(
 
     ['@test Specifying non-existent controller name in route#render throws'](assert) {
       expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      assert.expect(2);
+      expectDeprecation('Usage of `render` is deprecated.');
+      assert.expect(3);
 
       this.router.map(function () {
         this.route('home', { path: '/' });
@@ -1074,11 +1103,13 @@ moduleFor(
         'route:application',
         Route.extend({
           renderTemplate() {
-            this.render();
-            this.render('modal', {
-              into: 'application',
-              outlet: 'other',
-            });
+            expectDeprecation(() => {
+              this.render();
+              this.render('modal', {
+                into: 'application',
+                outlet: 'other',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -1105,11 +1136,13 @@ moduleFor(
         'route:application',
         Route.extend({
           renderTemplate() {
-            this.render();
-            this.render('modal', {
-              into: 'application',
-              outlet: 'other',
-            });
+            expectDeprecation(() => {
+              this.render();
+              this.render('modal', {
+                into: 'application',
+                outlet: 'other',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
           actions: {
             banish() {
@@ -1153,11 +1186,13 @@ moduleFor(
         'route:application',
         Route.extend({
           renderTemplate() {
-            this.render();
-            this.render('modal', {
-              into: 'application',
-              outlet: 'other',
-            });
+            expectDeprecation(() => {
+              this.render();
+              this.render('modal', {
+                into: 'application',
+                outlet: 'other',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -1180,10 +1215,12 @@ moduleFor(
         Route.extend({
           actions: {
             launch() {
-              this.render('modal', {
-                into: 'application',
-                outlet: 'other',
-              });
+              expectDeprecation(() => {
+                this.render('modal', {
+                  into: 'application',
+                  outlet: 'other',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
           },
         })
@@ -1221,14 +1258,16 @@ moduleFor(
         'route:app',
         Route.extend({
           renderTemplate() {
-            this.render('app', {
-              outlet: 'app',
-              into: 'application',
-            });
-            this.render('common', {
-              outlet: 'common',
-              into: 'app',
-            });
+            expectDeprecation(() => {
+              this.render('app', {
+                outlet: 'app',
+                into: 'application',
+              });
+              this.render('common', {
+                outlet: 'common',
+                into: 'app',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -1237,10 +1276,12 @@ moduleFor(
         'route:sub',
         Route.extend({
           renderTemplate() {
-            this.render('sub', {
-              outlet: 'sub',
-              into: 'app',
-            });
+            expectDeprecation(() => {
+              this.render('sub', {
+                outlet: 'sub',
+                into: 'app',
+              });
+            }, 'Usage of `render` is deprecated.');
           },
         })
       );
@@ -1282,10 +1323,12 @@ moduleFor(
         Route.extend({
           actions: {
             openLayer() {
-              this.render('layer', {
-                into: 'application',
-                outlet: 'modal',
-              });
+              expectDeprecation(() => {
+                this.render('layer', {
+                  into: 'application',
+                  outlet: 'modal',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
             close() {
               expectDeprecation(
@@ -1328,7 +1371,10 @@ moduleFor(
         'route:root',
         Route.extend({
           renderTemplate() {
-            this.render('exports/root');
+            expectDeprecation(
+              () => this.render('exports/root'),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
@@ -1337,7 +1383,10 @@ moduleFor(
         'route:root.index',
         Route.extend({
           renderTemplate() {
-            this.render('exports/index');
+            expectDeprecation(
+              () => this.render('exports/index'),
+              'Usage of `render` is deprecated.'
+            );
           },
         })
       );
@@ -1360,10 +1409,12 @@ moduleFor(
         Route.extend({
           actions: {
             openLayer() {
-              this.render('layer', {
-                into: 'application',
-                outlet: 'modal',
-              });
+              expectDeprecation(() => {
+                this.render('layer', {
+                  into: 'application',
+                  outlet: 'modal',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
           },
         })
@@ -1480,10 +1531,12 @@ moduleFor(
         Route.extend({
           actions: {
             showModal() {
-              this.render({
-                outlet: undefined,
-                parentView: 'application',
-              });
+              expectDeprecation(() => {
+                this.render({
+                  outlet: undefined,
+                  parentView: 'application',
+                });
+              }, 'Usage of `render` is deprecated.');
             },
             hideModal() {
               expectDeprecation(
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 6b265de0ec7..fc22bb4f85a 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -49,6 +49,7 @@ module.exports = {
     '_qpChanged',
     '_qpDelegate',
     '_queryParamsFor',
+    '_render',
     '_renderMode',
     '_resolveCache',
     '_serializeQueryParam',

From 36dce7270e0c8868cbcf9b989ebc8f98dfbe50da Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 2 Mar 2021 16:05:54 -0500
Subject: [PATCH 0413/1405] Setup git user in alpha publishing script.

---
 .github/workflows/alpha-releases.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index e89f8514cae..53b4133bef5 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -2,7 +2,7 @@ name: Alpha Releases
 
 on:
   schedule:
-    - cron:  '0 20 * * 1' # weekly (Monday)
+    - cron:  '0 20 * * 3' # weekly (Wednesday)
 
 jobs:
   test:
@@ -45,6 +45,10 @@ jobs:
           key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
+      - name: setup git
+        run: |
+          git config --local user.email 'tomster@emberjs.com'
+          git config --local user.name 'Ember.js Alpha Releaser'
       - name: tag the next alpha
         run: npm version prerelease --preid alpha
       - name: build for publish

From 7765a6758be8b8473f06d41bd02914b904485d70 Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Tue, 2 Mar 2021 21:24:48 +0000
Subject: [PATCH 0414/1405] Use symbol to create private render method

---
 .../application/debug-render-tree-test.ts     |  4 +-
 .../integration/application/rendering-test.js |  8 +--
 .../-internals/routing/lib/system/route.ts    | 15 +++--
 .../ember/tests/routing/model_loading_test.js |  2 +-
 .../tests/routing/template_rendering_test.js  | 66 +++++++++----------
 tests/docs/expected.js                        |  2 +-
 6 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 06dad4a0d4c..85f9683711c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -222,12 +222,12 @@ if (ENV._DEBUG_RENDER_TREE) {
             }
 
             renderTemplate(_: Controller, { showHeader }: Model): void {
-              expectDeprecation(() => this.render(), 'Usage of `render` is deprecated.');
+              expectDeprecation(() => this.render(), /Usage of `render` is deprecated/);
 
               if (showHeader) {
                 expectDeprecation(
                   () => this.render('header', { outlet: 'header' }),
-                  'Usage of `render` is deprecated.'
+                  /Usage of `render` is deprecated/
                 );
               } else {
                 expectDeprecation(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 9dd92db4210..2198da8943c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -470,7 +470,7 @@ moduleFor(
                 into: 'application',
                 outlet: 'nav',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -617,7 +617,7 @@ moduleFor(
           renderTemplate(controller, model) {
             expectDeprecation(
               () => this.render({ controller: model.color, model }),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
@@ -666,7 +666,7 @@ moduleFor(
           renderTemplate(controller, model) {
             expectDeprecation(
               () => this.render('common', { controller: 'common', model }),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
@@ -682,7 +682,7 @@ moduleFor(
           renderTemplate(controller, model) {
             expectDeprecation(
               () => this.render('common', { controller: 'common', model }),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index f50dc5a9d72..7e2c3474173 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -20,7 +20,7 @@ import {
   Object as EmberObject,
   typeOf,
 } from '@ember/-internals/runtime';
-import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
+import { isProxy, lookupDescriptor, symbol } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
 import { assert, deprecate, info, isTesting } from '@ember/debug';
 import { ROUTER_EVENTS } from '@ember/deprecated-features';
@@ -49,6 +49,7 @@ import generateController from './generate_controller';
 import EmberRouter, { QueryParam } from './router';
 
 export const ROUTE_CONNECTIONS = new WeakMap();
+const RENDER = symbol('render') as string;
 
 export function defaultSerialize(
   model: {},
@@ -1486,10 +1487,10 @@ class Route extends EmberObject implements IRoute {
   }
 
   /**
-    `_render` is used to render a template into a region of another template
+    `this[RENDER]` is used to render a template into a region of another template
     (indicated by an `{{outlet}}`).
 
-    @method _render
+    @method this[RENDER]
     @param {String} name the name of the template to render
     @param {Object} [options] the options
     @param {String} [options.into] the template to render into,
@@ -1502,7 +1503,7 @@ class Route extends EmberObject implements IRoute {
                     Defaults to the return value of the Route's model hook
     @private
    */
-  _render(name?: string, options?: PartialRenderOptions) {
+  [RENDER](name?: string, options?: PartialRenderOptions) {
     let renderOptions = buildRenderOptions(this, name, options);
     ROUTE_CONNECTIONS.get(this).push(renderOptions);
     once(this._router, '_setOutlets');
@@ -1544,7 +1545,7 @@ class Route extends EmberObject implements IRoute {
   */
   renderTemplate(_controller: any, _model: {}) {
     // eslint-disable-line no-unused-vars
-    this._render();
+    this[RENDER]();
   }
 
   /**
@@ -1675,7 +1676,7 @@ class Route extends EmberObject implements IRoute {
     @public
   */
   render(name?: string, options?: PartialRenderOptions) {
-    deprecate('Usage of `render` is deprecated.', false, {
+    deprecate(`Usage of \`render\` is deprecated. Route: \`${this.routeName}\``, false, {
       id: 'route-render-template',
       until: '4.0.0',
       url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
@@ -1684,7 +1685,7 @@ class Route extends EmberObject implements IRoute {
         enabled: '3.27.0',
       },
     });
-    this._render(name, options);
+    this[RENDER](name, options);
   }
 
   /**
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index ca93c5717cb..0f71d5c5fe1 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -216,7 +216,7 @@ moduleFor(
           renderTemplate() {
             expectDeprecation(
               () => this.render('alternative_home'),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 34cff663e5f..f33f0c72dfc 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -76,7 +76,7 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
+            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
           },
         })
       );
@@ -93,7 +93,7 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
+            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
           },
         })
       );
@@ -121,7 +121,7 @@ moduleFor(
         Route.extend({
           controllerName: 'foo',
           renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
+            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
           },
         })
       );
@@ -161,7 +161,7 @@ moduleFor(
           renderTemplate() {
             expectDeprecation(
               () => this.render({ controller: 'home' }),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
@@ -202,7 +202,7 @@ moduleFor(
         'route:home',
         Route.extend({
           renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), 'Usage of `render` is deprecated.');
+            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
           },
         })
       );
@@ -226,7 +226,7 @@ moduleFor(
               this.render('bio', {
                 model: { name: 'emberjs' },
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -276,7 +276,7 @@ moduleFor(
                   into: 'home',
                   outlet: 'alert',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
           },
         })
@@ -306,7 +306,7 @@ moduleFor(
         Route.extend({
           templateName: 'alert',
           renderTemplate() {
-            expectDeprecation(() => this.render({}), 'Usage of `render` is deprecated.');
+            expectDeprecation(() => this.render({}), /Usage of `render` is deprecated/);
           },
         })
       );
@@ -429,7 +429,7 @@ moduleFor(
           renderTemplate() {
             expectDeprecation(
               () => this.render('middle/bottom', { into: 'top' }),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
@@ -467,7 +467,7 @@ moduleFor(
             expectDeprecation(() => {
               this.render('person/profile');
               this.render('person/details', { into: 'person/profile' });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -503,7 +503,7 @@ moduleFor(
                 into: 'application',
                 outlet: 'menu',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -653,7 +653,7 @@ moduleFor(
         renderTemplate() {
           expectDeprecation(
             () => this.render('shared', { controller: 'shared' }),
-            'Usage of `render` is deprecated.'
+            /Usage of `render` is deprecated/
           );
         },
       });
@@ -736,7 +736,7 @@ moduleFor(
                 into: 'application',
                 outlet: 'footer',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -806,7 +806,7 @@ moduleFor(
                   into: 'application',
                   outlet: 'modal',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
             hideModal() {
               expectDeprecation(
@@ -831,7 +831,7 @@ moduleFor(
                 this.render('posts/extra', {
                   into: 'posts/index',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
             hideExtra() {
               expectDeprecation(
@@ -940,7 +940,7 @@ moduleFor(
                   into: 'application',
                   outlet: 'modal',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
             hideModal() {
               expectDeprecation(
@@ -1017,7 +1017,7 @@ moduleFor(
             showModal() {
               expectDeprecation(
                 () => this.render('modal', { into: 'posts', outlet: 'modal' }),
-                'Usage of `render` is deprecated.'
+                /Usage of `render` is deprecated/
               );
             },
             hideModal() {
@@ -1040,9 +1040,10 @@ moduleFor(
     }
 
     ['@test Specifying non-existent controller name in route#render throws'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      expectDeprecation('Usage of `render` is deprecated.');
-      assert.expect(3);
+      expectDeprecation(
+        /(Usage of `renderTemplate` is deprecated|Usage of `render` is deprecated)/
+      );
+      assert.expect(2);
 
       this.router.map(function () {
         this.route('home', { path: '/' });
@@ -1109,7 +1110,7 @@ moduleFor(
                 into: 'application',
                 outlet: 'other',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -1142,7 +1143,7 @@ moduleFor(
                 into: 'application',
                 outlet: 'other',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
           actions: {
             banish() {
@@ -1192,7 +1193,7 @@ moduleFor(
                 into: 'application',
                 outlet: 'other',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -1220,7 +1221,7 @@ moduleFor(
                   into: 'application',
                   outlet: 'other',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
           },
         })
@@ -1267,7 +1268,7 @@ moduleFor(
                 outlet: 'common',
                 into: 'app',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -1281,7 +1282,7 @@ moduleFor(
                 outlet: 'sub',
                 into: 'app',
               });
-            }, 'Usage of `render` is deprecated.');
+            }, /Usage of `render` is deprecated/);
           },
         })
       );
@@ -1328,7 +1329,7 @@ moduleFor(
                   into: 'application',
                   outlet: 'modal',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
             close() {
               expectDeprecation(
@@ -1371,10 +1372,7 @@ moduleFor(
         'route:root',
         Route.extend({
           renderTemplate() {
-            expectDeprecation(
-              () => this.render('exports/root'),
-              'Usage of `render` is deprecated.'
-            );
+            expectDeprecation(() => this.render('exports/root'), /Usage of `render` is deprecated/);
           },
         })
       );
@@ -1385,7 +1383,7 @@ moduleFor(
           renderTemplate() {
             expectDeprecation(
               () => this.render('exports/index'),
-              'Usage of `render` is deprecated.'
+              /Usage of `render` is deprecated/
             );
           },
         })
@@ -1414,7 +1412,7 @@ moduleFor(
                   into: 'application',
                   outlet: 'modal',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
           },
         })
@@ -1536,7 +1534,7 @@ moduleFor(
                   outlet: undefined,
                   parentView: 'application',
                 });
-              }, 'Usage of `render` is deprecated.');
+              }, /Usage of `render` is deprecated/);
             },
             hideModal() {
               expectDeprecation(
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index fc22bb4f85a..33df88a6323 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -49,7 +49,6 @@ module.exports = {
     '_qpChanged',
     '_qpDelegate',
     '_queryParamsFor',
-    '_render',
     '_renderMode',
     '_resolveCache',
     '_serializeQueryParam',
@@ -557,6 +556,7 @@ module.exports = {
     'testing',
     'textarea',
     'then',
+    'this[RENDER]',
     'throttle',
     'title',
     'to',

From 0b84bc8207472f271210b0503a811c3c4b3d6dd9 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Wed, 3 Mar 2021 10:12:45 +0000
Subject: [PATCH 0415/1405] add rendered output of each-in

---
 .../@ember/-internals/glimmer/lib/helpers/each-in.ts     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index cff217d855f..7ff18fabf92 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -148,7 +148,14 @@ import { internalHelper } from './internal-helper';
   </ul>
   ```
 
-  Outputting their name and age.
+  Outputting their name and age:
+  
+  ```html
+  <ul>
+    <li>name: Shelly Sails</li>
+    <li>age: 42</li>
+  </ul>
+  ```
 
   @method each-in
   @for Ember.Templates.helpers

From d54e0cddfe2655c5a31062ccba13c57d0f50d72c Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Wed, 3 Mar 2021 10:16:16 +0000
Subject: [PATCH 0416/1405] Update each-in.ts

---
 packages/@ember/-internals/glimmer/lib/helpers/each-in.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 7ff18fabf92..30c9b0e0dda 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -149,7 +149,7 @@ import { internalHelper } from './internal-helper';
   ```
 
   Outputting their name and age:
-  
+
   ```html
   <ul>
     <li>name: Shelly Sails</li>

From 7dbeded1db214814040d987df8b40fc95e8badd6 Mon Sep 17 00:00:00 2001
From: sma01 <sylvain.mina@erdil.fr>
Date: Thu, 4 Mar 2021 12:02:47 +0100
Subject: [PATCH 0417/1405] add tests to highlight #19307

---
 .../ember/tests/routing/substates_test.js     | 151 ++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index 4bbf2b8a77b..13330e7d0c1 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -1,5 +1,7 @@
 import { RSVP } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
+import Controller from '@ember/controller';
+
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 let counter;
@@ -193,6 +195,155 @@ moduleFor(
       });
     }
 
+    ['@test Enter loading route with correct query parameters'](assert) {
+      let deferred = RSVP.defer();
+
+      this.router.map(function () {
+        this.route('dummy');
+      });
+
+      this.add(
+        'route:dummy',
+        Route.extend({
+          model() {
+            step(assert, 1, 'DummyRoute#model');
+            return deferred.promise;
+          },
+        })
+      );
+
+      this.add(
+        'controller:application',
+        class extends Controller {
+          queryParams = ['qux'];
+
+          qux = 'initial';
+        }
+      );
+
+      this.add(
+        'route:loading',
+        Route.extend({
+          setupController() {
+            step(assert, 2, 'LoadingRoute#setupController');
+          },
+        })
+      );
+      this.addTemplate('dummy', 'DUMMY');
+
+      return this.visit('/?qux=updated').then(() => {
+        assert.equal(
+          this.getController('application').qux,
+          'updated',
+          'the application controller has the correct qp value'
+        );
+
+        let promise = this.visit('/dummy?qux=updated').then(() => {
+          let text = this.$('#app').text();
+
+          assert.equal(text, 'DUMMY', `dummy template has been rendered`);
+          assert.equal(
+            this.getController('application').qux,
+            'updated',
+            'the application controller has the correct qp value'
+          );
+        });
+
+        assert.equal(this.currentPath, 'loading', `loading state entered`);
+        assert.equal(
+          this.currentURL,
+          '/dummy?qux=updated',
+          `during loading url reflect the correct state`
+        );
+        assert.equal(
+          this.getController('application').qux,
+          'updated',
+          'the application controller has the correct qp value'
+        );
+
+        deferred.resolve();
+
+        return promise;
+      });
+    }
+
+    ['@test Enter child-loading route with correct query parameters'](assert) {
+      assert.expect(9);
+      let deferred = RSVP.defer();
+
+      this.router.map(function () {
+        this.route('parent', function () {
+          this.route('child');
+        });
+      });
+
+      this.add(
+        'route:parent.child',
+        Route.extend({
+          model() {
+            step(assert, 1, 'ChildRoute#model');
+            return deferred.promise;
+          },
+        })
+      );
+
+      this.add(
+        'controller:parent',
+        class extends Controller {
+          queryParams = ['qux'];
+
+          qux = 'initial';
+        }
+      );
+
+      this.add(
+        'route:parent.child_loading',
+        Route.extend({
+          setupController() {
+            step(assert, 2, 'ChildLoadingRoute#setupController');
+          },
+        })
+      );
+      this.addTemplate('parent', 'PARENT {{outlet}}');
+
+      this.addTemplate('parent.child', 'CHILD');
+
+      return this.visit('/parent?qux=updated').then(() => {
+        assert.equal(
+          this.getController('parent').qux,
+          'updated',
+          'in the parent route, the parent controller has the correct qp value'
+        );
+
+        let promise = this.visit('/parent/child?qux=updated').then(() => {
+          let text = this.$('#app').text();
+
+          assert.equal(text, 'PARENT CHILD', `child template has been rendered`);
+          assert.equal(
+            this.getController('parent').qux,
+            'updated',
+            'after entered in the parent.child route, the parent controller has the correct qp value'
+          );
+        });
+
+        assert.equal(this.currentPath, 'parent.child_loading', `child loading state entered`);
+        assert.equal(
+          this.currentURL,
+          '/parent/child?qux=updated',
+          `during child loading, url reflect the correct state`
+        );
+        assert.equal(
+          this.getController('parent').qux,
+          'updated',
+          'in the child_loading route, the parent controller has the correct qp value'
+        );
+
+        deferred.resolve();
+
+        return promise;
+      });
+    }
+
     ['@test Slow promises returned from ApplicationRoute#model enter ApplicationLoadingRoute if present'](
       assert
     ) {

From f512bfeefd14b63976c5bc90adb65956e0ec4153 Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Sun, 7 Mar 2021 14:43:03 -0500
Subject: [PATCH 0418/1405] [BUGFIX lts] Update router_js to fix QP stickiness
 through loading states

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 639f7feb92c..774512b78f9 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^7.1.1",
+    "router_js": "^7.2.0",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index 2f5c015cb4f..f9928a93155 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8907,10 +8907,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-router_js@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.1.1.tgz#cb7614a96cfb6bc65c066668b2dd32e3ad7ca38d"
-  integrity sha512-kOdKqBj7aj9GusG0umtWgkTtNtDspT9EfJNnJN9B8g0DDNp9CdIwpO+2Qnmf/fNos38Pj9jlfU44l/oycn5goQ==
+router_js@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.2.0.tgz#a7168155fe494f85f1e5058802a3a633c29ea243"
+  integrity sha512-kZBOqD/kRMDymmVbiVrX6OK3cGBoG1c9tO8egxkoxX2TgC78sBwFhvFqkAJLvK8oTEXYNcjk8+FbNIn9hg9VMA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 

From 42477dccfc03638fccd66a71bf2f04a64fdfa77c Mon Sep 17 00:00:00 2001
From: sly7-7 <sylvain.mina@gmail.com>
Date: Sun, 7 Mar 2021 12:25:14 +0100
Subject: [PATCH 0419/1405] set current route in routeWillChange during an
 intermediate transition Fixes #19449

---
 .../-internals/routing/lib/system/router.ts   |   6 +
 .../currenturl_lifecycle_test.js              | 122 ++++++++++++------
 2 files changed, 89 insertions(+), 39 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 1fa016d866a..a31c86797cd 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -286,6 +286,12 @@ class EmberRouter extends EmberObject {
 
       routeWillChange(transition: Transition) {
         router.trigger('routeWillChange', transition);
+        // in case of intermediate transition we update the current route
+        // to make router.currentRoute.name consistent with router.currentRouteName
+        // see https://github.com/emberjs/ember.js/issues/19449
+        if (transition.isIntermediate) {
+          router.set('currentRoute', transition.to);
+        }
       }
 
       routeDidChange(transition: Transition) {
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index dcba7155853..36fb5c2598f 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -17,7 +17,7 @@ let InstrumentedRoute = Route.extend({
     let service = get(this, 'routerService');
     service.on('routeWillChange', (transition) => {
       results.push([
-        service.get('currentRouteName'),
+        `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
         `${this.routeName} routeWillChange: ${transition.from && transition.from.name} - ${
           transition.to.name
         }`,
@@ -26,7 +26,7 @@ let InstrumentedRoute = Route.extend({
     });
     service.on('routeDidChange', (transition) => {
       results.push([
-        service.get('currentRouteName'),
+        `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
         `${this.routeName} routeDidChange: ${transition.from && transition.from.name} - ${
           transition.to.name
         }`,
@@ -38,7 +38,7 @@ let InstrumentedRoute = Route.extend({
   activate() {
     let service = get(this, 'routerService');
     results.push([
-      service.get('currentRouteName'),
+      `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
       `${this.routeName} activate`,
       service.get('currentURL'),
     ]);
@@ -47,7 +47,7 @@ let InstrumentedRoute = Route.extend({
   redirect() {
     let service = get(this, 'routerService');
     results.push([
-      service.get('currentRouteName'),
+      `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
       `${this.routeName} redirect`,
       service.get('currentURL'),
     ]);
@@ -56,7 +56,7 @@ let InstrumentedRoute = Route.extend({
   beforeModel() {
     let service = get(this, 'routerService');
     results.push([
-      service.get('currentRouteName'),
+      `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
       `${this.routeName} beforeModel`,
       service.get('currentURL'),
     ]);
@@ -65,7 +65,7 @@ let InstrumentedRoute = Route.extend({
   model() {
     let service = get(this, 'routerService');
     results.push([
-      service.get('currentRouteName'),
+      `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
       `${this.routeName} model`,
       service.get('currentURL'),
     ]);
@@ -77,7 +77,7 @@ let InstrumentedRoute = Route.extend({
   afterModel() {
     let service = get(this, 'routerService');
     results.push([
-      service.get('currentRouteName'),
+      `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
       `${this.routeName} afterModel`,
       service.get('currentURL'),
     ]);
@@ -87,7 +87,7 @@ let InstrumentedRoute = Route.extend({
     willTransition(transition) {
       let service = get(this, 'routerService');
       results.push([
-        service.get('currentRouteName'),
+        `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
         `${this.routeName} willTransition: ${transition.from && transition.from.name} - ${
           transition.to.name
         }`,
@@ -98,7 +98,7 @@ let InstrumentedRoute = Route.extend({
     didTransition() {
       let service = get(this, 'routerService');
       results.push([
-        service.get('currentRouteName'),
+        `${service.get('currentRouteName')} - ${service.get('currentRoute.name')}`,
         `${this.routeName} didTransition`,
         service.get('currentURL'),
       ]);
@@ -108,7 +108,7 @@ let InstrumentedRoute = Route.extend({
 });
 
 moduleFor(
-  'Router Service - currentURL | currentRouteName',
+  'Router Service - currentURL | currentRouteName | currentRoute.name',
   class extends RouterTestCase {
     constructor() {
       super(...arguments);
@@ -189,18 +189,26 @@ moduleFor(
       return this.visit('/')
         .then(() => {
           assert.deepEqual(results, [
-            [null, 'parent.index routeWillChange: null - parent.index', null],
-            [null, 'parent.index beforeModel', null],
-            [null, 'parent.index model', null],
-            [null, 'parent.loading activate', null],
-            [null, 'parent.loading routeWillChange: null - parent.loading', null],
-            [null, 'parent.index routeWillChange: null - parent.loading', null],
-            ['parent.loading', 'parent.index afterModel', '/'],
-            ['parent.loading', 'parent.index redirect', '/'],
-            ['parent.loading', 'parent.index activate', '/'],
-            ['parent.loading', 'parent.index didTransition', '/'],
-            ['parent.index', 'parent.loading routeDidChange: null - parent.index', '/'],
-            ['parent.index', 'parent.index routeDidChange: null - parent.index', '/'],
+            ['null - undefined', 'parent.index routeWillChange: null - parent.index', null],
+            ['null - undefined', 'parent.index beforeModel', null],
+            ['null - undefined', 'parent.index model', null],
+            ['null - undefined', 'parent.loading activate', null],
+            ['null - undefined', 'parent.loading routeWillChange: null - parent.loading', null],
+            ['null - undefined', 'parent.index routeWillChange: null - parent.loading', null],
+            ['parent.loading - parent.loading', 'parent.index afterModel', '/'],
+            ['parent.loading - parent.loading', 'parent.index redirect', '/'],
+            ['parent.loading - parent.loading', 'parent.index activate', '/'],
+            ['parent.loading - parent.loading', 'parent.index didTransition', '/'],
+            [
+              'parent.index - parent.index',
+              'parent.loading routeDidChange: null - parent.index',
+              '/',
+            ],
+            [
+              'parent.index - parent.index',
+              'parent.index routeDidChange: null - parent.index',
+              '/',
+            ],
           ]);
 
           results = [];
@@ -209,27 +217,63 @@ moduleFor(
         })
         .then(() => {
           assert.deepEqual(results, [
-            ['parent.index', 'parent.index willTransition: parent.index - parent.child', '/'],
-            ['parent.index', 'parent.child routeWillChange: parent.index - parent.child', '/'],
-            ['parent.index', 'parent.loading routeWillChange: parent.index - parent.child', '/'],
-            ['parent.index', 'parent.index routeWillChange: parent.index - parent.child', '/'],
-            ['parent.index', 'parent.child beforeModel', '/'],
-            ['parent.index', 'parent.child model', '/'],
-            ['parent.index', 'parent.loading activate', '/'],
-            ['parent.index', 'parent.child routeWillChange: parent.index - parent.loading', '/'],
-            ['parent.index', 'parent.loading routeWillChange: parent.index - parent.loading', '/'],
-            ['parent.index', 'parent.index routeWillChange: parent.index - parent.loading', '/'],
-            ['parent.loading', 'parent.child afterModel', '/child'],
-            ['parent.loading', 'parent.child redirect', '/child'],
-            ['parent.loading', 'parent.child activate', '/child'],
-            ['parent.loading', 'parent.child didTransition', '/child'],
-            ['parent.child', 'parent.child routeDidChange: parent.index - parent.child', '/child'],
             [
-              'parent.child',
+              'parent.index - parent.index',
+              'parent.index willTransition: parent.index - parent.child',
+              '/',
+            ],
+            [
+              'parent.index - parent.index',
+              'parent.child routeWillChange: parent.index - parent.child',
+              '/',
+            ],
+            [
+              'parent.index - parent.index',
+              'parent.loading routeWillChange: parent.index - parent.child',
+              '/',
+            ],
+            [
+              'parent.index - parent.index',
+              'parent.index routeWillChange: parent.index - parent.child',
+              '/',
+            ],
+            ['parent.index - parent.index', 'parent.child beforeModel', '/'],
+            ['parent.index - parent.index', 'parent.child model', '/'],
+            ['parent.index - parent.index', 'parent.loading activate', '/'],
+            [
+              'parent.index - parent.index',
+              'parent.child routeWillChange: parent.index - parent.loading',
+              '/',
+            ],
+            [
+              'parent.index - parent.index',
+              'parent.loading routeWillChange: parent.index - parent.loading',
+              '/',
+            ],
+            [
+              'parent.index - parent.index',
+              'parent.index routeWillChange: parent.index - parent.loading',
+              '/',
+            ],
+            ['parent.loading - parent.loading', 'parent.child afterModel', '/child'],
+            ['parent.loading - parent.loading', 'parent.child redirect', '/child'],
+            ['parent.loading - parent.loading', 'parent.child activate', '/child'],
+            ['parent.loading - parent.loading', 'parent.child didTransition', '/child'],
+            [
+              'parent.child - parent.child',
+              'parent.child routeDidChange: parent.index - parent.child',
+              '/child',
+            ],
+            [
+              'parent.child - parent.child',
               'parent.loading routeDidChange: parent.index - parent.child',
               '/child',
             ],
-            ['parent.child', 'parent.index routeDidChange: parent.index - parent.child', '/child'],
+            [
+              'parent.child - parent.child',
+              'parent.index routeDidChange: parent.index - parent.child',
+              '/child',
+            ],
           ]);
         });
     }

From d9380050f5b24b99d8e4ebe618ae875941089675 Mon Sep 17 00:00:00 2001
From: sly7-7 <sylvain.mina@gmail.com>
Date: Sun, 7 Mar 2021 23:32:26 +0100
Subject: [PATCH 0420/1405] bump router.js dep

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 774512b78f9..405f56553e0 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^7.2.0",
+    "router_js": "^7.3.0",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index f9928a93155..57650be1ab2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8907,10 +8907,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
 
-router_js@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.2.0.tgz#a7168155fe494f85f1e5058802a3a633c29ea243"
-  integrity sha512-kZBOqD/kRMDymmVbiVrX6OK3cGBoG1c9tO8egxkoxX2TgC78sBwFhvFqkAJLvK8oTEXYNcjk8+FbNIn9hg9VMA==
+router_js@^7.3.0:
+  version "7.3.0"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.3.0.tgz#6c061b6b097cfec537fa0d6c5a5c6e317730799f"
+  integrity sha512-A+iVTfG03XNks7oC/KGXq+EKp9kAac9BOYuomq2KouXUM4U57Io20/tuQq1kx+OwHB4gEY0XaRQjuHwljkbRHg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 

From 56c3520b0e52e5bc7f357b5865c34a23eefd98e7 Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Sun, 7 Mar 2021 21:54:59 -0500
Subject: [PATCH 0421/1405] Add v3.24.3, v3.25.2, and v3.25.3 to CHANGELOG.md.

---
 CHANGELOG.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f5ab31e6ec..ac4e02cde69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,23 @@
 - [#19298](https://github.com/emberjs/ember.js/pull/19298) [BUGFIX] Route serialize did not extract param off proxy
 - [#19326](https://github.com/emberjs/ember.js/pull/19326) [BUGFIX] Lazily setup the router in non-application tests for <LinkTo> component
 
+
+### v3.25.3 (March 7, 2021)
+
+- [#19448](https://github.com/emberjs/ember.js/pull/19448) Ensure query params are preserved through an intermediate loading state transition
+- [#19450](https://github.com/emberjs/ember.js/pull/19450) Ensure `routerService.currentRoute.name` and `routerService.currentRouteName` match during loading states
+
+
+### v3.25.2 (March 7, 2021)
+
+- [#19389](https://github.com/emberjs/ember.js/pull/19389) Removes template ids
+- [#19395](https://github.com/emberjs/ember.js/pull/19395) [BUGFIX] Ensure `<LinkTo>` can return a valid `href` most of the time
+- [#19396](https://github.com/emberjs/ember.js/pull/19396) [BUGFIX] Revert deprecation of htmlSafe and isHTMLSafe
+- [#19397](https://github.com/emberjs/ember.js/pull/19397) [BUGFIX] Force building Ember bundles when `targets.node` is defined
+- [#19399](https://github.com/emberjs/ember.js/pull/19399) [DOC] Update ArrayProxy Documentation
+- [#19412](https://github.com/emberjs/ember.js/pull/19412) / [#19416](https://github.com/emberjs/ember.js/pull/19416) [BUGFIX] Update Glimmer VM to 0.77 (fix dynamic helpers/modifiers)
+
+
 ### v3.25.1 (February 10, 2021)
 
 - [#19326](https://github.com/emberjs/ember.js/pull/19326) / [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] Fix usage of `<LinkTo />` prior to routing (e.g. component rendering tests)
@@ -43,6 +60,15 @@
 - [#19338](https://github.com/emberjs/ember.js/pull/19338) [BUGFIX] Add missing `deprecate` options (`for` + `since`)
 - [#19342](https://github.com/emberjs/ember.js/pull/19342) [BUGFIX] Fix misleading LinkTo error message
 
+
+### v3.24.3 (March 7, 2021)
+
+- [#19448](https://github.com/emberjs/ember.js/pull/19448) Ensure query params are preserved through an intermediate loading state transition
+- [#19450](https://github.com/emberjs/ember.js/pull/19450) Ensure `routerService.currentRoute.name` and `routerService.currentRouteName` match during loading states
+- [#19395](https://github.com/emberjs/ember.js/pull/19395) [BUGFIX] Ensure `<LinkTo>` can return a valid `href` most of the time
+- [#19397](https://github.com/emberjs/ember.js/pull/19397) [BUGFIX] Force building Ember bundles when `targets.node` is defined
+
+
 ### v3.24.2 (February 10, 2021)
 
 - [#19326](https://github.com/emberjs/ember.js/pull/19326) / [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] Fix usage of `<LinkTo />` prior to routing (e.g. component rendering tests)

From 891fc1bd25b9736e0d645bda01155d3023f7fab1 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 2 Mar 2021 14:04:45 -0500
Subject: [PATCH 0422/1405] Add v3.26.0-beta.3 to CHANGELOG

(cherry picked from commit b91e6f37ee917bccf535fffd3459ee443c037dd5)
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac4e02cde69..fd74c4258d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Ember Changelog
 
+### v3.26.0-beta.3 (March 02, 2021)
+
+- [#19412](https://github.com/emberjs/ember.js/pull/19412) [BUGFIX] Updates Glimmer VM to 0.76.0, fix:
+  - `if` helper returns `null` instead of `undefined`
+  - Using `get` helper with key `length` on a string in templates
+  - Value of input not updating if it had previously updated with the same string
+- [#19416](https://github.com/emberjs/ember.js/pull/19416) [BUGFIX] Update Glimmer VM to 0.77, fix dynamic helpers/modifiers
+
 ### v3.26.0-beta.2 (February 15, 2021)
 
 - [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] LinkTo with incomplete model failing in rendering tests

From 75fa7e35aadf5d260e5e9a14fe28634da0fccd82 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 8 Mar 2021 14:09:57 -0500
Subject: [PATCH 0423/1405] Add v3.26.0-beta.4 to CHANGELOG

(cherry picked from commit 4d85839ca69cace64f6185ab184fc24f3f5c02d8)
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd74c4258d4..f716eca8ba3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v3.26.0-beta.4 (March 08, 2021)
+
+- [#19436](https://github.com/emberjs/ember.js/pull/19436) [BUGFIX] Support observer keys with colons
+- [#19448](https://github.com/emberjs/ember.js/pull/19448) [BUGFIX] Ensure query params are preserved through an intermediate loading state transition
+- [#19450](https://github.com/emberjs/ember.js/pull/19450) [BUGFIX] Ensure `routerService.currentRoute.name` and `routerService.currentRouteName` match during loading states
+
 ### v3.26.0-beta.3 (March 02, 2021)
 
 - [#19412](https://github.com/emberjs/ember.js/pull/19412) [BUGFIX] Updates Glimmer VM to 0.76.0, fix:

From aab891ceef45cfaa7f35cd3afe5065a4dc1361a9 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 8 Mar 2021 14:17:54 -0500
Subject: [PATCH 0424/1405] Prevent changelog script from erroring when the
 commitInfo object has no author value

---
 bin/changelog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/changelog.js b/bin/changelog.js
index 69dcadfdce6..6902f18c911 100755
--- a/bin/changelog.js
+++ b/bin/changelog.js
@@ -152,7 +152,7 @@ async function getCommitMessage(commitInfo) {
 }
 
 function excludeDependabot(commitInfo) {
-  let author = commitInfo.author.login;
+  let author = commitInfo.author && commitInfo.author.login;
   return author !== 'dependabot-preview[bot]' && author !== 'dependabot[bot]';
 }
 

From cf4d7d104e1067b49a30145e1e28022b68453fe8 Mon Sep 17 00:00:00 2001
From: Ten Bitcomb <tenbitcomb@gmail.com>
Date: Fri, 12 Feb 2021 09:55:21 -0800
Subject: [PATCH 0425/1405] Make router service passive

---
 .../-internals/routing/lib/services/router.ts | 37 -------------------
 .../-internals/routing/lib/system/router.ts   | 29 +++++++++++++++
 .../routing/router_service_test/basic_test.js | 16 ++++++++
 .../currenturl_lifecycle_test.js              | 14 ++++---
 .../non_application_test_test.js              | 19 ++++++++++
 5 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 14739d18fb7..1982ea5e32a 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -5,27 +5,12 @@ import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
-import { DEBUG } from '@glimmer/env';
 import { consumeTag, tagFor } from '@glimmer/validator';
-import { Transition } from 'router_js';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
 const ROUTER = symbol('ROUTER') as string;
 
-let freezeRouteInfo: Function;
-if (DEBUG) {
-  freezeRouteInfo = (transition: Transition) => {
-    if (transition.from !== null && !Object.isFrozen(transition.from)) {
-      Object.freeze(transition.from);
-    }
-
-    if (transition.to !== null && !Object.isFrozen(transition.to)) {
-      Object.freeze(transition.to);
-    }
-  };
-}
-
 function cleanURL(url: string, rootURL: string) {
   if (rootURL === '/') {
     return url;
@@ -73,31 +58,9 @@ export default class RouterService extends Service {
     }
     const owner = getOwner(this) as Owner;
     router = owner.lookup('router:main') as EmberRouter;
-    router.setupRouter();
     return (this[ROUTER] = router);
   }
 
-  constructor(owner: Owner) {
-    super(owner);
-
-    const router = owner.lookup('router:main') as EmberRouter;
-
-    router.on('routeWillChange', (transition: Transition) => {
-      if (DEBUG) {
-        freezeRouteInfo(transition);
-      }
-      this.trigger('routeWillChange', transition);
-    });
-
-    router.on('routeDidChange', (transition: Transition) => {
-      if (DEBUG) {
-        freezeRouteInfo(transition);
-      }
-
-      this.trigger('routeDidChange', transition);
-    });
-  }
-
   /**
      Transition the application into another route. The route may
      be either a single route or route path:
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index a31c86797cd..52a4807fbb6 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -3,6 +3,7 @@ import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals
 import { computed, get, notifyPropertyChange, set } from '@ember/-internals/metal';
 import { FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
+import RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
 import { assert, deprecate, info } from '@ember/debug';
@@ -23,6 +24,7 @@ import Route, {
   ROUTER_EVENT_DEPRECATIONS,
 } from './route';
 import RouterState from './router_state';
+
 /**
 @module @ember/routing
 */
@@ -78,6 +80,19 @@ function defaultWillTransition(
   }
 }
 
+let freezeRouteInfo: Function;
+if (DEBUG) {
+  freezeRouteInfo = (transition: Transition) => {
+    if (transition.from !== null && !Object.isFrozen(transition.from)) {
+      Object.freeze(transition.from);
+    }
+
+    if (transition.to !== null && !Object.isFrozen(transition.to)) {
+      Object.freeze(transition.to);
+    }
+  };
+}
+
 interface RenderOutletState {
   name: string;
   outlet: string;
@@ -146,6 +161,7 @@ class EmberRouter extends EmberObject {
   _handledErrors = new Set();
   _engineInstances: { [name: string]: { [id: string]: EngineInstance } } = Object.create(null);
   _engineInfoByRoute = Object.create(null);
+  _routerService: RouterService | undefined;
 
   _slowTransitionTimer: unknown;
 
@@ -156,6 +172,7 @@ class EmberRouter extends EmberObject {
     if (owner) {
       this.namespace = owner.lookup('application:main');
       this._bucketCache = owner.lookup(P`-bucket-cache:main`);
+      this._routerService = owner.lookup('service:router');
     }
   }
 
@@ -292,12 +309,24 @@ class EmberRouter extends EmberObject {
         if (transition.isIntermediate) {
           router.set('currentRoute', transition.to);
         }
+        if (DEBUG) {
+          freezeRouteInfo(transition);
+        }
+        if (router._routerService) {
+          router._routerService.trigger('routeWillChange', transition);
+        }
       }
 
       routeDidChange(transition: Transition) {
         router.set('currentRoute', transition.to);
         once(() => {
           router.trigger('routeDidChange', transition);
+          if (DEBUG) {
+            freezeRouteInfo(transition);
+          }
+          if (router._routerService) {
+            router._routerService.trigger('routeDidChange', transition);
+          }
         });
       }
 
diff --git a/packages/ember/tests/routing/router_service_test/basic_test.js b/packages/ember/tests/routing/router_service_test/basic_test.js
index c8407929de9..818b5fbe5a3 100644
--- a/packages/ember/tests/routing/router_service_test/basic_test.js
+++ b/packages/ember/tests/routing/router_service_test/basic_test.js
@@ -1,6 +1,7 @@
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import { set } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
+import { inject as injectService } from '@ember/service';
 
 moduleFor(
   'Router Service - main',
@@ -150,5 +151,20 @@ moduleFor(
         assert.ok(location instanceof NoneLocation);
       });
     }
+
+    ['@test RouterService can be injected into router and accessed on init'](assert) {
+      assert.expect(1);
+
+      this.router.reopen({
+        routerService: injectService('router'),
+        init() {
+          this.routerService.one('routeDidChange', () => {
+            assert.ok(true, 'routeDidChange event listener called');
+          });
+        },
+      });
+
+      return this.visit('/');
+    }
   }
 );
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index 36fb5c2598f..da987f6dfa4 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -193,8 +193,12 @@ moduleFor(
             ['null - undefined', 'parent.index beforeModel', null],
             ['null - undefined', 'parent.index model', null],
             ['null - undefined', 'parent.loading activate', null],
-            ['null - undefined', 'parent.loading routeWillChange: null - parent.loading', null],
-            ['null - undefined', 'parent.index routeWillChange: null - parent.loading', null],
+            [
+              'null - parent.loading',
+              'parent.loading routeWillChange: null - parent.loading',
+              null,
+            ],
+            ['null - parent.loading', 'parent.index routeWillChange: null - parent.loading', null],
             ['parent.loading - parent.loading', 'parent.index afterModel', '/'],
             ['parent.loading - parent.loading', 'parent.index redirect', '/'],
             ['parent.loading - parent.loading', 'parent.index activate', '/'],
@@ -241,17 +245,17 @@ moduleFor(
             ['parent.index - parent.index', 'parent.child model', '/'],
             ['parent.index - parent.index', 'parent.loading activate', '/'],
             [
-              'parent.index - parent.index',
+              'parent.index - parent.loading',
               'parent.child routeWillChange: parent.index - parent.loading',
               '/',
             ],
             [
-              'parent.index - parent.index',
+              'parent.index - parent.loading',
               'parent.loading routeWillChange: parent.index - parent.loading',
               '/',
             ],
             [
-              'parent.index - parent.index',
+              'parent.index - parent.loading',
               'parent.index routeWillChange: parent.index - parent.loading',
               '/',
             ],
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index ffaf14b3c10..add81994bdd 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -47,12 +47,27 @@ moduleFor(
       assert.expect(5);
       assert.equal(this.routerService.get('currentRouteName'), null);
       assert.equal(this.routerService.get('currentURL'), null);
+      assert.equal(this.routerService.get('location'), 'none');
+      assert.equal(this.routerService.get('rootURL'), '/');
+      assert.equal(this.routerService.get('currentRoute'), null);
+    }
+
+    ['@test RouterService properties of router can be accessed with default when router is present'](
+      assert
+    ) {
+      assert.expect(5);
+      let router = this.owner.lookup('router:main');
+      router.setupRouter();
+      assert.equal(this.routerService.get('currentRouteName'), null);
+      assert.equal(this.routerService.get('currentURL'), null);
       assert.ok(this.routerService.get('location') instanceof NoneLocation);
       assert.equal(this.routerService.get('rootURL'), '/');
       assert.equal(this.routerService.get('currentRoute'), null);
     }
 
     ['@test RouterService#urlFor returns url'](assert) {
+      let router = this.owner.lookup('router:main');
+      router.setupRouter();
       assert.equal(this.routerService.urlFor('parent.child'), '/child');
     }
 
@@ -60,6 +75,8 @@ moduleFor(
       assert.expect(2);
 
       let componentInstance;
+      let router = this.owner.lookup('router:main');
+      router.setupRouter();
 
       this.addTemplate('parent.index', '{{foo-bar}}');
 
@@ -90,6 +107,8 @@ moduleFor(
     }
 
     ['@test RouterService#recognize recognize returns routeInfo'](assert) {
+      let router = this.owner.lookup('router:main');
+      router.setupRouter();
       let routeInfo = this.routerService.recognize('/dynamic-with-child/123/1?a=b');
       assert.ok(routeInfo);
       let { name, localName, parent, child, params, queryParams, paramNames } = routeInfo;

From 56774c366ff79f8276b0dd40e234880b587cb29f Mon Sep 17 00:00:00 2001
From: Ten Bitcomb <tenbitcomb@gmail.com>
Date: Thu, 11 Mar 2021 20:19:15 -0800
Subject: [PATCH 0426/1405] Fix order and revert test

---
 .../-internals/routing/lib/system/router.ts    | 18 +++++++++---------
 .../currenturl_lifecycle_test.js               | 14 +++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 52a4807fbb6..351d8d84d40 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -303,28 +303,28 @@ class EmberRouter extends EmberObject {
 
       routeWillChange(transition: Transition) {
         router.trigger('routeWillChange', transition);
+        if (router._routerService) {
+          if (DEBUG) {
+            freezeRouteInfo(transition);
+          }
+          router._routerService.trigger('routeWillChange', transition);
+        }
         // in case of intermediate transition we update the current route
         // to make router.currentRoute.name consistent with router.currentRouteName
         // see https://github.com/emberjs/ember.js/issues/19449
         if (transition.isIntermediate) {
           router.set('currentRoute', transition.to);
         }
-        if (DEBUG) {
-          freezeRouteInfo(transition);
-        }
-        if (router._routerService) {
-          router._routerService.trigger('routeWillChange', transition);
-        }
       }
 
       routeDidChange(transition: Transition) {
         router.set('currentRoute', transition.to);
         once(() => {
           router.trigger('routeDidChange', transition);
-          if (DEBUG) {
-            freezeRouteInfo(transition);
-          }
           if (router._routerService) {
+            if (DEBUG) {
+              freezeRouteInfo(transition);
+            }
             router._routerService.trigger('routeDidChange', transition);
           }
         });
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index da987f6dfa4..36fb5c2598f 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -193,12 +193,8 @@ moduleFor(
             ['null - undefined', 'parent.index beforeModel', null],
             ['null - undefined', 'parent.index model', null],
             ['null - undefined', 'parent.loading activate', null],
-            [
-              'null - parent.loading',
-              'parent.loading routeWillChange: null - parent.loading',
-              null,
-            ],
-            ['null - parent.loading', 'parent.index routeWillChange: null - parent.loading', null],
+            ['null - undefined', 'parent.loading routeWillChange: null - parent.loading', null],
+            ['null - undefined', 'parent.index routeWillChange: null - parent.loading', null],
             ['parent.loading - parent.loading', 'parent.index afterModel', '/'],
             ['parent.loading - parent.loading', 'parent.index redirect', '/'],
             ['parent.loading - parent.loading', 'parent.index activate', '/'],
@@ -245,17 +241,17 @@ moduleFor(
             ['parent.index - parent.index', 'parent.child model', '/'],
             ['parent.index - parent.index', 'parent.loading activate', '/'],
             [
-              'parent.index - parent.loading',
+              'parent.index - parent.index',
               'parent.child routeWillChange: parent.index - parent.loading',
               '/',
             ],
             [
-              'parent.index - parent.loading',
+              'parent.index - parent.index',
               'parent.loading routeWillChange: parent.index - parent.loading',
               '/',
             ],
             [
-              'parent.index - parent.loading',
+              'parent.index - parent.index',
               'parent.index routeWillChange: parent.index - parent.loading',
               '/',
             ],

From 537c34f3d8c884408631ffb021744a282a7c9c52 Mon Sep 17 00:00:00 2001
From: sly7-7 <sylvain.mina@gmail.com>
Date: Fri, 12 Mar 2021 07:25:37 +0100
Subject: [PATCH 0427/1405] Refactor router: remove owner presence checks

---
 .../-internals/routing/lib/system/router.ts   |  53 ++++---
 .../routing/tests/system/dsl_test.js          | 131 +++++++-----------
 .../routing/tests/system/router_test.js       |  53 +++----
 3 files changed, 106 insertions(+), 131 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 351d8d84d40..b2466ece517 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -53,7 +53,7 @@ function defaultDidTransition(this: EmberRouter, infos: PrivateRouteInfo[]) {
   once(this, this.trigger, 'didTransition');
 
   if (DEBUG) {
-    if (get(this, 'namespace').LOG_TRANSITIONS) {
+    if (this.namespace.LOG_TRANSITIONS) {
       // eslint-disable-next-line no-console
       console.log(`Transitioned into '${EmberRouter._routePath(infos)}'`);
     }
@@ -69,7 +69,7 @@ function defaultWillTransition(
   once(this, this.trigger, 'willTransition', transition);
 
   if (DEBUG) {
-    if (get(this, 'namespace').LOG_TRANSITIONS) {
+    if (this.namespace.LOG_TRANSITIONS) {
       // eslint-disable-next-line no-console
       console.log(
         `Preparing to transition from '${EmberRouter._routePath(
@@ -156,12 +156,12 @@ class EmberRouter extends EmberObject {
   _qpUpdates = new Set();
   _queuedQPChanges: { [key: string]: unknown } = {};
 
-  _bucketCache: BucketCache | undefined;
+  _bucketCache: BucketCache;
   _toplevelView: OutletView | null = null;
   _handledErrors = new Set();
   _engineInstances: { [name: string]: { [id: string]: EngineInstance } } = Object.create(null);
   _engineInfoByRoute = Object.create(null);
-  _routerService: RouterService | undefined;
+  _routerService: RouterService;
 
   _slowTransitionTimer: unknown;
 
@@ -169,11 +169,15 @@ class EmberRouter extends EmberObject {
     super(...arguments);
 
     this._resetQueuedQueryParameterChanges();
-    if (owner) {
-      this.namespace = owner.lookup('application:main');
-      this._bucketCache = owner.lookup(P`-bucket-cache:main`);
-      this._routerService = owner.lookup('service:router');
-    }
+    this.namespace = owner.lookup('application:main');
+
+    let bucketCache: BucketCache | undefined = owner.lookup(P`-bucket-cache:main`);
+    assert('BUG: BucketCache should always be present', bucketCache !== undefined);
+    this._bucketCache = bucketCache;
+
+    let routerService: RouterService | undefined = owner.lookup('service:router');
+    assert('BUG: RouterService should always be present', routerService !== undefined);
+    this._routerService = routerService;
   }
 
   _initRouterJs() {
@@ -211,7 +215,7 @@ class EmberRouter extends EmberObject {
           route = routeOwner.lookup(fullRouteName);
 
           if (DEBUG) {
-            if (get(router, 'namespace.LOG_ACTIVE_GENERATION')) {
+            if (router.namespace.LOG_ACTIVE_GENERATION) {
               info(`generated -> ${fullRouteName}`, { fullName: fullRouteName });
             }
           }
@@ -303,12 +307,12 @@ class EmberRouter extends EmberObject {
 
       routeWillChange(transition: Transition) {
         router.trigger('routeWillChange', transition);
-        if (router._routerService) {
-          if (DEBUG) {
-            freezeRouteInfo(transition);
-          }
-          router._routerService.trigger('routeWillChange', transition);
+
+        if (DEBUG) {
+          freezeRouteInfo(transition);
         }
+        router._routerService.trigger('routeWillChange', transition);
+
         // in case of intermediate transition we update the current route
         // to make router.currentRoute.name consistent with router.currentRouteName
         // see https://github.com/emberjs/ember.js/issues/19449
@@ -321,12 +325,11 @@ class EmberRouter extends EmberObject {
         router.set('currentRoute', transition.to);
         once(() => {
           router.trigger('routeDidChange', transition);
-          if (router._routerService) {
-            if (DEBUG) {
-              freezeRouteInfo(transition);
-            }
-            router._routerService.trigger('routeDidChange', transition);
+
+          if (DEBUG) {
+            freezeRouteInfo(transition);
           }
+          router._routerService.trigger('routeDidChange', transition);
         });
       }
 
@@ -384,7 +387,7 @@ class EmberRouter extends EmberObject {
     );
 
     if (DEBUG) {
-      if (get(this, 'namespace.LOG_TRANSITIONS_INTERNAL')) {
+      if (this.namespace.LOG_TRANSITIONS_INTERNAL) {
         routerMicrolib.log = console.log.bind(console); // eslint-disable-line no-console
       }
     }
@@ -422,10 +425,6 @@ class EmberRouter extends EmberObject {
 
   _hasModuleBasedResolver() {
     let owner = getOwner(this);
-    if (!owner) {
-      return false;
-    }
-
     let resolver = get(owner, 'application.__registry__.resolver.moduleBasedResolver');
     return Boolean(resolver);
   }
@@ -588,7 +587,7 @@ class EmberRouter extends EmberObject {
 
     if (DEBUG) {
       let infos = this._routerMicrolib.currentRouteInfos;
-      if (get(this, 'namespace').LOG_TRANSITIONS) {
+      if (this.namespace.LOG_TRANSITIONS) {
         // eslint-disable-next-line no-console
         console.log(`Intermediate-transitioned into '${EmberRouter._routePath(infos)}'`);
       }
@@ -722,7 +721,7 @@ class EmberRouter extends EmberObject {
     let rootURL = this.rootURL;
     let owner = getOwner(this);
 
-    if ('string' === typeof location && owner) {
+    if ('string' === typeof location) {
       let resolvedLocation = owner.lookup<IEmberLocation>(`location:${location}`);
 
       if (resolvedLocation !== undefined) {
diff --git a/packages/@ember/-internals/routing/tests/system/dsl_test.js b/packages/@ember/-internals/routing/tests/system/dsl_test.js
index 970dadc387d..ad57892e99e 100644
--- a/packages/@ember/-internals/routing/tests/system/dsl_test.js
+++ b/packages/@ember/-internals/routing/tests/system/dsl_test.js
@@ -1,19 +1,23 @@
-import { setOwner } from '@ember/-internals/owner';
 import EmberRouter from '../../lib/system/router';
 import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
-let Router;
-
 moduleFor(
   'Ember Router DSL',
   class extends AbstractTestCase {
     constructor() {
       super();
-      Router = EmberRouter.extend();
+      this.Router = class extends EmberRouter {};
+
+      this.routerInstance = new this.Router(
+        buildOwner({
+          ownerOptions: { routable: true },
+        })
+      );
     }
 
     teardown() {
-      Router = null;
+      this.Router = null;
+      this.routerInstance = null;
     }
 
     ['@test should fail when using a reserved route name'](assert) {
@@ -23,33 +27,29 @@ moduleFor(
 
       reservedNames.forEach((reservedName) => {
         expectAssertion(() => {
-          Router = EmberRouter.extend();
+          let Router = class extends this.Router {};
 
           Router.map(function () {
             this.route(reservedName);
           });
 
-          let router = Router.create();
-          router._initRouterJs();
+          new Router(buildOwner())._initRouterJs();
         }, "'" + reservedName + "' cannot be used as a route name.");
       });
     }
 
     ['@test [GH#16642] better error when using a colon in a route name']() {
       expectAssertion(() => {
-        Router = EmberRouter.extend();
-
-        Router.map(function () {
+        this.Router.map(function () {
           this.route('resource/:id');
         });
 
-        let router = Router.create();
-        router._initRouterJs();
+        this.routerInstance._initRouterJs();
       }, "'resource/:id' is not a valid route name. It cannot contain a ':'. You may want to use the 'path' option instead.");
     }
 
     ['@test should retain resource namespace if nested with routes'](assert) {
-      Router = Router.map(function () {
+      this.Router.map(function () {
         this.route('bleep', function () {
           this.route('bloop', function () {
             this.route('blork');
@@ -57,7 +57,7 @@ moduleFor(
         });
       });
 
-      let router = Router.create();
+      let router = this.routerInstance;
       router._initRouterJs();
 
       assert.ok(
@@ -75,16 +75,17 @@ moduleFor(
     }
 
     ['@test should add loading and error routes if _isRouterMapResult is true'](assert) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.route('blork');
       });
 
-      let router = Router.create({
+      this.routerInstance.reopen({
         _hasModuleBasedResolver() {
           return true;
         },
       });
 
+      let router = this.routerInstance;
       router._initRouterJs();
 
       assert.ok(router._routerMicrolib.recognizer.names['blork'], 'main route was created');
@@ -96,11 +97,11 @@ moduleFor(
     }
 
     ['@test should not add loading and error routes if _isRouterMapResult is false'](assert) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.route('blork');
       });
 
-      let router = Router.create();
+      let router = this.routerInstance;
       router._initRouterJs(false);
 
       assert.ok(router._routerMicrolib.recognizer.names['blork'], 'main route was created');
@@ -117,19 +118,20 @@ moduleFor(
     ['@test should reset namespace of loading and error routes for routes with resetNamespace'](
       assert
     ) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.route('blork', function () {
           this.route('blorp');
           this.route('bleep', { resetNamespace: true });
         });
       });
 
-      let router = Router.create({
+      this.routerInstance.reopen({
         _hasModuleBasedResolver() {
           return true;
         },
       });
 
+      let router = this.routerInstance;
       router._initRouterJs();
 
       assert.ok(router._routerMicrolib.recognizer.names['blork.blorp'], 'nested route was created');
@@ -167,13 +169,13 @@ moduleFor(
     }
 
     ['@test should throw an error when defining a route serializer outside an engine'](assert) {
-      Router.map(function () {
+      this.Router.map(function () {
         assert.throws(() => {
           this.route('posts', { serialize: function () {} });
         }, /Defining a route serializer on route 'posts' outside an Engine is not allowed/);
       });
 
-      Router.create()._initRouterJs();
+      this.routerInstance._initRouterJs();
     }
   }
 );
@@ -183,17 +185,23 @@ moduleFor(
   class extends AbstractTestCase {
     constructor() {
       super();
-      Router = EmberRouter.extend();
+      this.Router = class extends EmberRouter {};
+      this.routerInstance = new this.Router(
+        buildOwner({
+          ownerOptions: { routable: true },
+        })
+      );
     }
 
     teardown() {
-      Router = null;
+      this.Router = null;
+      this.routerInstance = null;
     }
 
     ['@test should allow mounting of engines'](assert) {
       assert.expect(3);
 
-      Router = Router.map(function () {
+      this.Router.map(function () {
         this.route('bleep', function () {
           this.route('bloop', function () {
             this.mount('chat');
@@ -201,12 +209,7 @@ moduleFor(
         });
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create();
-      setOwner(router, engineInstance);
+      let router = this.routerInstance;
       router._initRouterJs();
 
       assert.ok(
@@ -226,7 +229,7 @@ moduleFor(
     ['@test should allow mounting of engines at a custom path'](assert) {
       assert.expect(1);
 
-      Router = Router.map(function () {
+      this.Router.map(function () {
         this.route('bleep', function () {
           this.route('bloop', function () {
             this.mount('chat', { path: 'custom-chat' });
@@ -234,12 +237,7 @@ moduleFor(
         });
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create();
-      setOwner(router, engineInstance);
+      let router = this.routerInstance;
       router._initRouterJs();
 
       assert.deepEqual(
@@ -254,7 +252,7 @@ moduleFor(
     ['@test should allow aliasing of engine names with `as`'](assert) {
       assert.expect(1);
 
-      Router = Router.map(function () {
+      this.Router.map(function () {
         this.route('bleep', function () {
           this.route('bloop', function () {
             this.mount('chat', { as: 'blork' });
@@ -262,12 +260,7 @@ moduleFor(
         });
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create();
-      setOwner(router, engineInstance);
+      let router = this.routerInstance;
       router._initRouterJs();
 
       assert.deepEqual(
@@ -280,22 +273,17 @@ moduleFor(
     }
 
     ['@test should add loading and error routes to a mount if _isRouterMapResult is true'](assert) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.mount('chat');
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create({
+      this.routerInstance.reopen({
         _hasModuleBasedResolver() {
           return true;
         },
       });
-      setOwner(router, engineInstance);
-      router._initRouterJs();
-
+      this.routerInstance._initRouterJs();
+      let router = this.routerInstance;
       assert.ok(router._routerMicrolib.recognizer.names['chat'], 'main route was created');
       assert.ok(router._routerMicrolib.recognizer.names['chat_loading'], 'loading route was added');
       assert.ok(router._routerMicrolib.recognizer.names['chat_error'], 'error route was added');
@@ -304,21 +292,17 @@ moduleFor(
     ['@test should add loading and error routes to a mount alias if _isRouterMapResult is true'](
       assert
     ) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.mount('chat', { as: 'shoutbox' });
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create({
+      this.routerInstance.reopen({
         _hasModuleBasedResolver() {
           return true;
         },
       });
-      setOwner(router, engineInstance);
-      router._initRouterJs();
+      this.routerInstance._initRouterJs();
+      let router = this.routerInstance;
 
       assert.ok(router._routerMicrolib.recognizer.names['shoutbox'], 'main route was created');
       assert.ok(
@@ -331,16 +315,11 @@ moduleFor(
     ['@test should not add loading and error routes to a mount if _isRouterMapResult is false'](
       assert
     ) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.mount('chat');
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create();
-      setOwner(router, engineInstance);
+      let router = this.routerInstance;
       router._initRouterJs(false);
 
       assert.ok(router._routerMicrolib.recognizer.names['chat'], 'main route was created');
@@ -357,24 +336,20 @@ moduleFor(
     ['@test should reset namespace of loading and error routes for mounts with resetNamespace'](
       assert
     ) {
-      Router.map(function () {
+      this.Router.map(function () {
         this.route('news', function () {
           this.mount('chat');
           this.mount('blog', { resetNamespace: true });
         });
       });
 
-      let engineInstance = buildOwner({
-        ownerOptions: { routable: true },
-      });
-
-      let router = Router.create({
+      this.routerInstance.reopen({
         _hasModuleBasedResolver() {
           return true;
         },
       });
-      setOwner(router, engineInstance);
-      router._initRouterJs();
+      this.routerInstance._initRouterJs();
+      let router = this.routerInstance;
 
       assert.ok(router._routerMicrolib.recognizer.names['news.chat'], 'nested route was created');
       assert.ok(
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index 544e8dc2fc2..8a82387e405 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -1,4 +1,3 @@
-import { setOwner } from '@ember/-internals/owner';
 import HashLocation from '../../lib/location/hash_location';
 import HistoryLocation from '../../lib/location/history_location';
 import AutoLocation from '../../lib/location/auto_location';
@@ -8,12 +7,11 @@ import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-te
 
 let owner;
 
-function createRouter(settings, options = {}) {
-  let CustomRouter = Router.extend();
-  let router = CustomRouter.create(settings);
-
-  if (!options.skipOwner) {
-    setOwner(router, owner);
+function createRouter({ settings = {}, options = {} } = {}) {
+  let CustomRouter = class extends Router {};
+  let router = new CustomRouter(owner);
+  for (let setting in settings) {
+    router[setting] = settings[setting];
   }
 
   if (!options.disableSetup) {
@@ -42,12 +40,6 @@ moduleFor(
       owner = null;
     }
 
-    ['@test can create a router without an owner'](assert) {
-      createRouter(undefined, { disableSetup: true, skipOwner: true });
-
-      assert.ok(true, 'no errors were thrown when creating without a container');
-    }
-
     ['@test [GH#15237] EmberError is imported correctly'](assert) {
       // If we get the right message it means Error is being imported correctly.
       assert.throws(function () {
@@ -56,27 +48,27 @@ moduleFor(
     }
 
     ['@test should not create a router.js instance upon init'](assert) {
-      let router = createRouter(undefined, { disableSetup: true });
+      let router = createRouter({ options: { disableSetup: true } });
 
       assert.ok(!router._routerMicrolib);
     }
 
     ['@test should create a router.js instance after setupRouter'](assert) {
-      let router = createRouter(undefined, { disableSetup: false });
+      let router = createRouter({ options: { disableSetup: false } });
 
       assert.ok(router._didSetupRouter);
       assert.ok(router._routerMicrolib);
     }
 
     ['@test should return false if setupRouter is called multiple times'](assert) {
-      let router = createRouter(undefined, { disableSetup: true });
+      let router = createRouter({ options: { disableSetup: true } });
 
       assert.ok(router.setupRouter());
       assert.notOk(router.setupRouter());
     }
 
     ['@test should not reify location until setupRouter is called'](assert) {
-      let router = createRouter(undefined, { disableSetup: true });
+      let router = createRouter({ options: { disableSetup: true } });
       assert.equal(typeof router.location, 'string', 'location is specified as a string');
 
       router.setupRouter();
@@ -95,8 +87,11 @@ moduleFor(
 
     ['@test should instantiate its location with its `rootURL`'](assert) {
       let router = createRouter({
-        rootURL: '/rootdir/',
+        settings: {
+          rootURL: '/rootdir/',
+        },
       });
+
       let location = router.get('location');
 
       assert.equal(location.get('rootURL'), '/rootdir/');
@@ -123,8 +118,10 @@ moduleFor(
       location.history = null;
 
       createRouter({
-        location: 'auto',
-        rootURL: '/rootdir/',
+        settings: {
+          location: 'auto',
+          rootURL: '/rootdir/',
+        },
       });
     }
 
@@ -200,8 +197,10 @@ moduleFor(
       };
 
       createRouter({
-        location: 'auto',
-        rootURL: '/rootdir/',
+        settings: {
+          location: 'auto',
+          rootURL: '/rootdir/',
+        },
       });
     }
 
@@ -209,9 +208,11 @@ moduleFor(
       assert.expect(2);
 
       let router = createRouter({
-        _doURLTransition(routerJsMethod, url) {
-          assert.equal(routerJsMethod, 'handleURL');
-          assert.equal(url, '/foo/bar?time=morphin');
+        settings: {
+          _doURLTransition(routerJsMethod, url) {
+            assert.equal(routerJsMethod, 'handleURL');
+            assert.equal(url, '/foo/bar?time=morphin');
+          },
         },
       });
 
@@ -299,7 +300,7 @@ moduleFor(
     }
 
     ['@test computed url when location is a string should not crash'](assert) {
-      let router = createRouter(undefined, { disableSetup: true });
+      let router = createRouter({ options: { disableSetup: true } });
       assert.equal(router.url, undefined);
     }
   }

From a61143b5a7dc5cb0f2cb331c227de5539b139791 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 15 Mar 2021 18:10:08 -0700
Subject: [PATCH 0428/1405] [FEATURE] Add remaining Ember modules

Adds all of the remaining Ember modules so that we can remove the
API polyfill. Also updates the tests for re-exporting modules so they
are organized by exported module and also test re-exporting the external
module and not any internal one.
---
 lib/index.js                                  |  11 +-
 .../-internals/glimmer/lib/utils/string.ts    |   2 +-
 packages/@ember/application/deprecations.ts   |  39 ++
 packages/@ember/application/namespace.js      |   1 +
 packages/@ember/application/resolver.js       |   1 +
 packages/@ember/array/index.js                |   2 +
 packages/@ember/array/mutable.js              |   1 +
 packages/@ember/array/proxy.js                |   1 +
 packages/@ember/component/checkbox.ts         |  21 +
 packages/@ember/component/helper.ts           |   1 +
 packages/@ember/component/index.ts            |   7 +-
 packages/@ember/component/text-area.ts        |  21 +
 packages/@ember/component/text-field.ts       |  21 +
 .../@ember/debug/container-debug-adapter.js   |   1 +
 packages/@ember/debug/data-adapter.js         |   1 +
 packages/@ember/debug/index.ts                |   2 +
 packages/@ember/enumerable/index.js           |   1 +
 packages/@ember/helper/index.ts               |   4 +-
 packages/@ember/modifier/index.ts             |   3 +-
 packages/@ember/object/computed.js            |   3 +
 packages/@ember/object/core.js                |   1 +
 packages/@ember/object/evented.js             |   2 +
 packages/@ember/object/events.js              |   1 +
 packages/@ember/object/index.js               |  16 +
 packages/@ember/object/internals.js           |   3 +
 packages/@ember/object/mixin.js               |   1 +
 packages/@ember/object/observable.js          |   1 +
 packages/@ember/object/observers.js           |   1 +
 packages/@ember/object/promise-proxy-mixin.js |   1 +
 packages/@ember/object/proxy.js               |   1 +
 packages/@ember/polyfills/index.ts            |   2 +
 packages/@ember/routing/auto-location.js      |   1 +
 packages/@ember/routing/hash-location.js      |   1 +
 packages/@ember/routing/history-location.js   |   1 +
 packages/@ember/routing/index.ts              |   1 +
 packages/@ember/routing/link-component.ts     |  21 +
 packages/@ember/routing/location.js           |   1 +
 packages/@ember/routing/none-location.js      |   1 +
 packages/@ember/routing/route.js              |   1 +
 packages/@ember/routing/router.js             |   1 +
 packages/@ember/string/index.ts               |  35 ++
 packages/@ember/template-compilation/index.js |  13 +
 packages/@ember/template-factory/index.js     |   1 +
 packages/@ember/template/index.ts             |   1 +
 packages/@ember/test/adapter.js               |   3 +
 packages/@ember/test/index.js                 |  11 +
 packages/@ember/utils/index.js                |   3 +
 packages/@ember/version/index.js              |   1 +
 packages/@glimmer/tracking/index.ts           |   1 +
 .../@glimmer/tracking/primitives/cache.ts     |   1 +
 packages/ember/index.js                       |   1 -
 packages/ember/tests/reexports_test.js        | 545 +++++++++++-------
 .../lib/confirm-export.js                     |  15 +-
 packages/jquery/index.js                      |   3 +
 54 files changed, 631 insertions(+), 206 deletions(-)
 create mode 100644 packages/@ember/application/deprecations.ts
 create mode 100644 packages/@ember/application/namespace.js
 create mode 100644 packages/@ember/application/resolver.js
 create mode 100644 packages/@ember/array/index.js
 create mode 100644 packages/@ember/array/mutable.js
 create mode 100644 packages/@ember/array/proxy.js
 create mode 100644 packages/@ember/component/checkbox.ts
 create mode 100644 packages/@ember/component/helper.ts
 create mode 100644 packages/@ember/component/text-area.ts
 create mode 100644 packages/@ember/component/text-field.ts
 create mode 100644 packages/@ember/debug/container-debug-adapter.js
 create mode 100644 packages/@ember/debug/data-adapter.js
 create mode 100644 packages/@ember/enumerable/index.js
 create mode 100644 packages/@ember/object/core.js
 create mode 100644 packages/@ember/object/evented.js
 create mode 100644 packages/@ember/object/events.js
 create mode 100644 packages/@ember/object/internals.js
 create mode 100644 packages/@ember/object/mixin.js
 create mode 100644 packages/@ember/object/observable.js
 create mode 100644 packages/@ember/object/observers.js
 create mode 100644 packages/@ember/object/promise-proxy-mixin.js
 create mode 100644 packages/@ember/object/proxy.js
 create mode 100644 packages/@ember/routing/auto-location.js
 create mode 100644 packages/@ember/routing/hash-location.js
 create mode 100644 packages/@ember/routing/history-location.js
 create mode 100644 packages/@ember/routing/index.ts
 create mode 100644 packages/@ember/routing/link-component.ts
 create mode 100644 packages/@ember/routing/location.js
 create mode 100644 packages/@ember/routing/none-location.js
 create mode 100644 packages/@ember/routing/route.js
 create mode 100644 packages/@ember/routing/router.js
 create mode 100644 packages/@ember/template-compilation/index.js
 create mode 100644 packages/@ember/template-factory/index.js
 create mode 100644 packages/@ember/template/index.ts
 create mode 100644 packages/@ember/test/adapter.js
 create mode 100644 packages/@ember/test/index.js
 create mode 100644 packages/@ember/utils/index.js
 create mode 100644 packages/@ember/version/index.js
 create mode 100644 packages/@glimmer/tracking/index.ts
 create mode 100644 packages/@glimmer/tracking/primitives/cache.ts
 create mode 100644 packages/jquery/index.js

diff --git a/lib/index.js b/lib/index.js
index 5bdcaeac716..6be64ec350e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -64,6 +64,7 @@ module.exports = {
   name: 'ember-source',
   paths,
   absolutePaths,
+  _jqueryIntegrationEnabled: true,
 
   included() {
     this._super.included.apply(this, arguments);
@@ -151,7 +152,10 @@ module.exports = {
       }
     }
 
-    if (optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration')) {
+    this._jqueryIntegrationEnabled =
+      optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration');
+
+    if (this._jqueryIntegrationEnabled) {
       this.ui.writeWarnLine(
         'Setting the `jquery-integration` optional feature flag to `true`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `false`. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
       );
@@ -218,7 +222,10 @@ module.exports = {
       false
     );
 
-    let exclude = isProduction ? ['ember-testing/**'] : [];
+    let exclude = [
+      isProduction ? 'ember-testing/**' : null,
+      !this._jqueryIntegrationEnabled ? 'jquery' : null,
+    ].filter((value) => value !== null);
 
     let emberFiles = new MergeTrees([new Funnel(packages, { exclude }), dependencies, headerFiles]);
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/string.ts b/packages/@ember/-internals/glimmer/lib/utils/string.ts
index 586a5daa373..3f9f137dbe0 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/string.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/string.ts
@@ -75,7 +75,7 @@ export function escapeExpression(string: any): string {
   @return {SafeString} A string that will not be HTML escaped by Handlebars.
   @public
 */
-export function htmlSafe(str: string) {
+export function htmlSafe(str: string): SafeString {
   if (str === null || str === undefined) {
     str = '';
   } else if (typeof str !== 'string') {
diff --git a/packages/@ember/application/deprecations.ts b/packages/@ember/application/deprecations.ts
new file mode 100644
index 00000000000..6a8e9bb4ea0
--- /dev/null
+++ b/packages/@ember/application/deprecations.ts
@@ -0,0 +1,39 @@
+import {
+  deprecate as _deprecate,
+  deprecateFunc as _deprecateFunc,
+  DeprecationOptions,
+} from '@ember/debug';
+
+export function deprecate(message: string, condition: boolean, options: DeprecationOptions): void {
+  deprecate(
+    "`import { deprecate } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecate } from '@ember/debug';`",
+    false,
+    {
+      id: 'old-deprecate-method-paths',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.0.0',
+      },
+    }
+  );
+
+  _deprecate(message, condition, options);
+}
+
+export function deprecateFunc(message: string, options: DeprecationOptions, func: Function): void {
+  deprecate(
+    "`import { deprecateFunc } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecateFunc } from '@ember/debug';`",
+    false,
+    {
+      id: 'old-deprecate-method-paths',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.0.0',
+      },
+    }
+  );
+
+  _deprecateFunc(message, options, func);
+}
diff --git a/packages/@ember/application/namespace.js b/packages/@ember/application/namespace.js
new file mode 100644
index 00000000000..94eb9dd4a54
--- /dev/null
+++ b/packages/@ember/application/namespace.js
@@ -0,0 +1 @@
+export { Namespace as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/application/resolver.js b/packages/@ember/application/resolver.js
new file mode 100644
index 00000000000..731dbc19767
--- /dev/null
+++ b/packages/@ember/application/resolver.js
@@ -0,0 +1 @@
+export { default } from './globals-resolver';
diff --git a/packages/@ember/array/index.js b/packages/@ember/array/index.js
new file mode 100644
index 00000000000..a7ab583fc86
--- /dev/null
+++ b/packages/@ember/array/index.js
@@ -0,0 +1,2 @@
+export { Array as default, isArray, A } from '@ember/-internals/runtime';
+export { makeArray } from '@ember/-internals/utils';
diff --git a/packages/@ember/array/mutable.js b/packages/@ember/array/mutable.js
new file mode 100644
index 00000000000..b0c602bb11c
--- /dev/null
+++ b/packages/@ember/array/mutable.js
@@ -0,0 +1 @@
+export { MutableArray as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/array/proxy.js b/packages/@ember/array/proxy.js
new file mode 100644
index 00000000000..d59edcba733
--- /dev/null
+++ b/packages/@ember/array/proxy.js
@@ -0,0 +1 @@
+export { ArrayProxy as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/component/checkbox.ts b/packages/@ember/component/checkbox.ts
new file mode 100644
index 00000000000..374d4fb53cb
--- /dev/null
+++ b/packages/@ember/component/checkbox.ts
@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.Checkbox or importing from 'Checkbox' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { Checkbox } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { Checkbox as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/component/helper.ts b/packages/@ember/component/helper.ts
new file mode 100644
index 00000000000..616baeeb9e5
--- /dev/null
+++ b/packages/@ember/component/helper.ts
@@ -0,0 +1 @@
+export { Helper as default, helper } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/component/index.ts b/packages/@ember/component/index.ts
index 4a85c81bf0c..9f04047bb49 100644
--- a/packages/@ember/component/index.ts
+++ b/packages/@ember/component/index.ts
@@ -1 +1,6 @@
-export { Component } from '@ember/-internals/glimmer';
+export { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
+export { Component as default, Input } from '@ember/-internals/glimmer';
+export {
+  componentCapabilities as capabilities,
+  setComponentManager,
+} from '@ember/-internals/glimmer';
diff --git a/packages/@ember/component/text-area.ts b/packages/@ember/component/text-area.ts
new file mode 100644
index 00000000000..10aaf051c0a
--- /dev/null
+++ b/packages/@ember/component/text-area.ts
@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.TextArea or importing from 'TextArea' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { TextArea } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { TextArea as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/component/text-field.ts b/packages/@ember/component/text-field.ts
new file mode 100644
index 00000000000..119f91bb2b3
--- /dev/null
+++ b/packages/@ember/component/text-field.ts
@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.TextField or importing from 'TextField' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { TextField } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { TextField as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/debug/container-debug-adapter.js b/packages/@ember/debug/container-debug-adapter.js
new file mode 100644
index 00000000000..b5b9ae0b62a
--- /dev/null
+++ b/packages/@ember/debug/container-debug-adapter.js
@@ -0,0 +1 @@
+export { ContainerDebugAdapter as default } from '@ember/-internals/extension-support';
diff --git a/packages/@ember/debug/data-adapter.js b/packages/@ember/debug/data-adapter.js
new file mode 100644
index 00000000000..8e7b38defc6
--- /dev/null
+++ b/packages/@ember/debug/data-adapter.js
@@ -0,0 +1 @@
+export { DataAdapter as default } from '@ember/-internals/extension-support';
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 005f637cc42..514006ce305 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -5,10 +5,12 @@ import _deprecate, { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
 import { isTesting } from './lib/testing';
 import _warn, { WarnFunc } from './lib/warn';
 
+export { inspect } from '@ember/-internals/utils';
 export { registerHandler as registerWarnHandler } from './lib/warn';
 export { registerHandler as registerDeprecationHandler } from './lib/deprecate';
 export { isTesting, setTesting } from './lib/testing';
 export { default as captureRenderTree } from './lib/capture-render-tree';
+export { DeprecationOptions } from './lib/deprecate';
 
 export type DebugFunctionType =
   | 'assert'
diff --git a/packages/@ember/enumerable/index.js b/packages/@ember/enumerable/index.js
new file mode 100644
index 00000000000..804b96ff035
--- /dev/null
+++ b/packages/@ember/enumerable/index.js
@@ -0,0 +1 @@
+export { Enumerable as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/helper/index.ts b/packages/@ember/helper/index.ts
index 2d0ed33ce44..e3e0d580880 100644
--- a/packages/@ember/helper/index.ts
+++ b/packages/@ember/helper/index.ts
@@ -304,5 +304,5 @@
   @public
 */
 
-export { setHelperManager, helperCapabilities as capabilties } from '@glimmer/manager';
-export { invokeHelper } from '@glimmer/runtime';
+export { setHelperManager, helperCapabilities as capabilities } from '@glimmer/manager';
+export { invokeHelper, hash, array, concat, get, on, fn } from '@glimmer/runtime';
diff --git a/packages/@ember/modifier/index.ts b/packages/@ember/modifier/index.ts
index ff0e90a5180..341a37d2ef4 100644
--- a/packages/@ember/modifier/index.ts
+++ b/packages/@ember/modifier/index.ts
@@ -1 +1,2 @@
-export { setModifierManager, modifierCapabilities as capabilties } from '@glimmer/manager';
+export { setModifierManager } from '@glimmer/manager';
+export { modifierCapabilities as capabilities } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/object/computed.js b/packages/@ember/object/computed.js
index 2c49bdf379e..9949474f786 100644
--- a/packages/@ember/object/computed.js
+++ b/packages/@ember/object/computed.js
@@ -1,3 +1,5 @@
+export { ComputedProperty as default, expandProperties, alias } from '@ember/-internals/metal';
+
 export {
   empty,
   notEmpty,
@@ -11,6 +13,7 @@ export {
   lt,
   lte,
   oneWay,
+  oneWay as reads,
   readOnly,
   deprecatingAlias,
   and,
diff --git a/packages/@ember/object/core.js b/packages/@ember/object/core.js
new file mode 100644
index 00000000000..b8ed9e14a82
--- /dev/null
+++ b/packages/@ember/object/core.js
@@ -0,0 +1 @@
+export { CoreObject as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/evented.js b/packages/@ember/object/evented.js
new file mode 100644
index 00000000000..6078d7b5766
--- /dev/null
+++ b/packages/@ember/object/evented.js
@@ -0,0 +1,2 @@
+export { Evented as default } from '@ember/-internals/runtime';
+export { on } from '@ember/-internals/metal';
diff --git a/packages/@ember/object/events.js b/packages/@ember/object/events.js
new file mode 100644
index 00000000000..3f4559266fc
--- /dev/null
+++ b/packages/@ember/object/events.js
@@ -0,0 +1 @@
+export { addListener, removeListener, sendEvent } from '@ember/-internals/metal';
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index 461b6d6f8a6..4207c312993 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -2,6 +2,22 @@ import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
 
+export { Object as default } from '@ember/-internals/runtime';
+
+export {
+  notifyPropertyChange,
+  defineProperty,
+  get,
+  set,
+  getProperties,
+  setProperties,
+  getWithDefault,
+  observer,
+  computed,
+  trySet,
+  aliasMethod,
+} from '@ember/-internals/metal';
+
 /**
   Decorator that turns the target function into an Action which can be accessed
   directly by reference.
diff --git a/packages/@ember/object/internals.js b/packages/@ember/object/internals.js
new file mode 100644
index 00000000000..1c709857059
--- /dev/null
+++ b/packages/@ember/object/internals.js
@@ -0,0 +1,3 @@
+export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
+export { copy } from '@ember/-internals/runtime';
+export { guidFor } from '@ember/-internals/utils';
diff --git a/packages/@ember/object/mixin.js b/packages/@ember/object/mixin.js
new file mode 100644
index 00000000000..0ffc8e5ed78
--- /dev/null
+++ b/packages/@ember/object/mixin.js
@@ -0,0 +1 @@
+export { Mixin as default } from '@ember/-internals/metal';
diff --git a/packages/@ember/object/observable.js b/packages/@ember/object/observable.js
new file mode 100644
index 00000000000..4bbad9b0fd5
--- /dev/null
+++ b/packages/@ember/object/observable.js
@@ -0,0 +1 @@
+export { Observable as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/observers.js b/packages/@ember/object/observers.js
new file mode 100644
index 00000000000..6c2f616cdeb
--- /dev/null
+++ b/packages/@ember/object/observers.js
@@ -0,0 +1 @@
+export { addObserver, removeObserver } from '@ember/-internals/metal';
diff --git a/packages/@ember/object/promise-proxy-mixin.js b/packages/@ember/object/promise-proxy-mixin.js
new file mode 100644
index 00000000000..ecf044def98
--- /dev/null
+++ b/packages/@ember/object/promise-proxy-mixin.js
@@ -0,0 +1 @@
+export { PromiseProxyMixin as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/proxy.js b/packages/@ember/object/proxy.js
new file mode 100644
index 00000000000..ce3fbabc7ec
--- /dev/null
+++ b/packages/@ember/object/proxy.js
@@ -0,0 +1 @@
+export { ObjectProxy as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/polyfills/index.ts b/packages/@ember/polyfills/index.ts
index cb6526e1ed3..25ed10d0302 100644
--- a/packages/@ember/polyfills/index.ts
+++ b/packages/@ember/polyfills/index.ts
@@ -6,3 +6,5 @@ let merge = MERGE ? deprecatedMerge : undefined;
 // Export `assignPolyfill` for testing
 export { default as assign, assign as assignPolyfill } from './lib/assign';
 export { merge };
+
+export const hasPropertyAccessors = true;
diff --git a/packages/@ember/routing/auto-location.js b/packages/@ember/routing/auto-location.js
new file mode 100644
index 00000000000..e6aa00cd8dd
--- /dev/null
+++ b/packages/@ember/routing/auto-location.js
@@ -0,0 +1 @@
+export { AutoLocation as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/hash-location.js b/packages/@ember/routing/hash-location.js
new file mode 100644
index 00000000000..9ec62be5373
--- /dev/null
+++ b/packages/@ember/routing/hash-location.js
@@ -0,0 +1 @@
+export { HashLocation as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/history-location.js b/packages/@ember/routing/history-location.js
new file mode 100644
index 00000000000..61668339a68
--- /dev/null
+++ b/packages/@ember/routing/history-location.js
@@ -0,0 +1 @@
+export { HistoryLocation as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/index.ts b/packages/@ember/routing/index.ts
new file mode 100644
index 00000000000..f0e6ccd093d
--- /dev/null
+++ b/packages/@ember/routing/index.ts
@@ -0,0 +1 @@
+export { LinkComponent as LinkTo } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/routing/link-component.ts b/packages/@ember/routing/link-component.ts
new file mode 100644
index 00000000000..e419425d424
--- /dev/null
+++ b/packages/@ember/routing/link-component.ts
@@ -0,0 +1,21 @@
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
+import { deprecate } from '@ember/debug';
+
+if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+  deprecate(
+    `Using Ember.LinkComponent or importing from 'LinkComponent' has been deprecated, install the ` +
+      `\`ember-legacy-built-in-components\` addon and use \`import { LinkComponent } from ` +
+      `'ember-legacy-built-in-components';\` instead`,
+    false,
+    {
+      id: 'ember.legacy-built-in-components',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        // TODO: update this when enabling the feature
+      },
+    }
+  );
+}
+
+export { LinkComponent as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/routing/location.js b/packages/@ember/routing/location.js
new file mode 100644
index 00000000000..c36fb225f94
--- /dev/null
+++ b/packages/@ember/routing/location.js
@@ -0,0 +1 @@
+export { Location as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/none-location.js b/packages/@ember/routing/none-location.js
new file mode 100644
index 00000000000..2934ac9b8a8
--- /dev/null
+++ b/packages/@ember/routing/none-location.js
@@ -0,0 +1 @@
+export { NoneLocation as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/route.js b/packages/@ember/routing/route.js
new file mode 100644
index 00000000000..35b65594a65
--- /dev/null
+++ b/packages/@ember/routing/route.js
@@ -0,0 +1 @@
+export { Route as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/router.js b/packages/@ember/routing/router.js
new file mode 100644
index 00000000000..f009a436959
--- /dev/null
+++ b/packages/@ember/routing/router.js
@@ -0,0 +1 @@
+export { Router as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index c2cedcdd6be..ce14383b106 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -9,6 +9,12 @@ import { Cache } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
 import { getString } from './lib/string_registry';
 
+import {
+  htmlSafe as internalHtmlSafe,
+  isHTMLSafe as internalIsHtmlSafe,
+  SafeString,
+} from '@ember/-internals/glimmer';
+
 const STRING_DASHERIZE_REGEXP = /[ _]/g;
 
 const STRING_DASHERIZE_CACHE = new Cache<string, string>(1000, (key) =>
@@ -294,6 +300,35 @@ export function capitalize(str: string): string {
   return CAPITALIZE_CACHE.get(str);
 }
 
+function deprecateImportFromString(
+  name: string,
+  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
+) {
+  // Disabling this deprecation due to unintended errors in 3.25
+  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
+  deprecate(message, true, {
+    id: 'ember-string.htmlsafe-ishtmlsafe',
+    for: 'ember-source',
+    since: {
+      enabled: '3.25',
+    },
+    until: '4.0.0',
+    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
+  });
+}
+
+export function htmlSafe(str: string): SafeString {
+  deprecateImportFromString('htmlSafe');
+
+  return internalHtmlSafe(str);
+}
+
+export function isHTMLSafe(str: any | null | undefined): str is SafeString {
+  deprecateImportFromString('isHTMLSafe');
+
+  return internalIsHtmlSafe(str);
+}
+
 if (ENV.EXTEND_PROTOTYPES.String) {
   let deprecateEmberStringPrototypeExtension = function (
     name: string,
diff --git a/packages/@ember/template-compilation/index.js b/packages/@ember/template-compilation/index.js
new file mode 100644
index 00000000000..9fdd95c01b3
--- /dev/null
+++ b/packages/@ember/template-compilation/index.js
@@ -0,0 +1,13 @@
+import { DEBUG } from '@glimmer/env';
+
+export { compile as compileTemplate } from 'ember-template-compiler';
+
+export let precompileTemplate;
+
+if (DEBUG) {
+  precompileTemplate = () => {
+    throw new Error(
+      'Attempted to call `precompileTemplate` at runtime, but this API is meant to be used at compile time. You should use `compileTemplate` instead.'
+    );
+  };
+}
diff --git a/packages/@ember/template-factory/index.js b/packages/@ember/template-factory/index.js
new file mode 100644
index 00000000000..e05f7f33cf2
--- /dev/null
+++ b/packages/@ember/template-factory/index.js
@@ -0,0 +1 @@
+export { templateFactory as createTemplateFactory } from '@glimmer/opcode-compiler';
diff --git a/packages/@ember/template/index.ts b/packages/@ember/template/index.ts
new file mode 100644
index 00000000000..052d24c9789
--- /dev/null
+++ b/packages/@ember/template/index.ts
@@ -0,0 +1 @@
+export { htmlSafe, isHTMLSafe } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/test/adapter.js b/packages/@ember/test/adapter.js
new file mode 100644
index 00000000000..e0f19949e64
--- /dev/null
+++ b/packages/@ember/test/adapter.js
@@ -0,0 +1,3 @@
+import { Test } from 'ember-testing';
+
+export default Test.Adapter;
diff --git a/packages/@ember/test/index.js b/packages/@ember/test/index.js
new file mode 100644
index 00000000000..2c5d3ae272d
--- /dev/null
+++ b/packages/@ember/test/index.js
@@ -0,0 +1,11 @@
+import { Test } from 'ember-testing';
+
+const {
+  registerAsyncHelper,
+  registerHelper,
+  registerWaiter,
+  unregisterHelper,
+  unregisterWaiter,
+} = Test;
+
+export { registerAsyncHelper, registerHelper, registerWaiter, unregisterHelper, unregisterWaiter };
diff --git a/packages/@ember/utils/index.js b/packages/@ember/utils/index.js
new file mode 100644
index 00000000000..5049a59886e
--- /dev/null
+++ b/packages/@ember/utils/index.js
@@ -0,0 +1,3 @@
+export { isNone, isBlank, isEmpty, isPresent } from '@ember/-internals/metal';
+export { tryInvoke } from '@ember/-internals/utils';
+export { compare, isEqual, typeOf } from '@ember/-internals/runtime';
diff --git a/packages/@ember/version/index.js b/packages/@ember/version/index.js
new file mode 100644
index 00000000000..70ef6f1b8d9
--- /dev/null
+++ b/packages/@ember/version/index.js
@@ -0,0 +1 @@
+export { default as VERSION } from 'ember/version';
diff --git a/packages/@glimmer/tracking/index.ts b/packages/@glimmer/tracking/index.ts
new file mode 100644
index 00000000000..f84c6ca5b85
--- /dev/null
+++ b/packages/@glimmer/tracking/index.ts
@@ -0,0 +1 @@
+export { tracked } from '@ember/-internals/metal';
diff --git a/packages/@glimmer/tracking/primitives/cache.ts b/packages/@glimmer/tracking/primitives/cache.ts
new file mode 100644
index 00000000000..29d6d20a0a5
--- /dev/null
+++ b/packages/@glimmer/tracking/primitives/cache.ts
@@ -0,0 +1 @@
+export { createCache, getValue, isConst } from '@ember/-internals/metal';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 4c4187dd456..980f6fb21bd 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -336,7 +336,6 @@ Object.defineProperty(Ember.run, 'currentRunLoop', {
 
 // ****@ember/-internals/metal****
 
-// Using _globalsComputed here so that mutating the function is only available
 // in globals builds
 const computed = metal._globalsComputed;
 Ember.computed = computed;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index c58ecb7b782..e4a0dc4ebf4 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,15 +1,12 @@
 import Ember from '../index';
 import require from 'require';
-import {
-  FEATURES,
-  EMBER_GLIMMER_HELPER_MANAGER,
-  EMBER_GLIMMER_INVOKE_HELPER,
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
-} from '@ember/canary-features';
+import { FEATURES, EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { confirmExport } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
 import Resolver from '@ember/application/globals-resolver';
+import { DEBUG } from '@glimmer/env';
+import { ENV } from '@ember/-internals/environment';
 
 moduleFor(
   'ember reexports',
@@ -152,84 +149,250 @@ if (!jQueryDisabled) {
 }
 
 let allExports = [
-  // @glimmer/runtime
-  ['_templateOnlyComponent', '@glimmer/runtime', 'templateOnlyComponent'],
-  ['_on', '@glimmer/runtime', 'on'],
-  ['_fn', '@glimmer/runtime', 'fn'],
-  ['_array', '@glimmer/runtime', 'array'],
-  ['_hash', '@glimmer/runtime', 'hash'],
-  ['_get', '@glimmer/runtime', 'get'],
-  ['_concat', '@glimmer/runtime', 'concat'],
-
-  // @ember/-internals/environment
-  ['ENV', '@ember/-internals/environment', { get: 'getENV' }],
-  ['lookup', '@ember/-internals/environment', { get: 'getLookup', set: 'setLookup' }],
-
+  // @ember/application
+  ['Application', '@ember/application', 'default'],
   ['getOwner', '@ember/application', 'getOwner'],
+  ['onLoad', '@ember/application', 'onLoad'],
+  ['runLoadHooks', '@ember/application', 'runLoadHooks'],
   ['setOwner', '@ember/application', 'setOwner'],
-  ['assign', '@ember/polyfills'],
 
-  // @ember/-internals/utils
-  ['GUID_KEY', '@ember/-internals/utils'],
-  ['uuid', '@ember/-internals/utils'],
-  ['generateGuid', '@ember/-internals/utils'],
-  ['guidFor', '@ember/-internals/utils'],
-  ['inspect', '@ember/-internals/utils'],
-  ['makeArray', '@ember/-internals/utils'],
-  ['canInvoke', '@ember/-internals/utils'],
-  ['tryInvoke', '@ember/-internals/utils'],
-  ['wrap', '@ember/-internals/utils'],
+  // @ember/application/deprecations
+  [null, '@ember/application/deprecations', 'deprecate'],
+  [null, '@ember/application/deprecations', 'deprecateFunc'],
 
-  // @ember/-internals/container
-  ['Registry', '@ember/-internals/container', 'Registry'],
-  ['Container', '@ember/-internals/container', 'Container'],
+  // @ember/application/instance
+  ['ApplicationInstance', '@ember/application/instance', 'default'],
+
+  // @ember/application/namespace
+  ['Namespace', '@ember/application/namespace', 'default'],
+
+  // @ember/array
+  ['Array', '@ember/array', 'default'],
+  ['A', '@ember/array', 'A'],
+  ['isArray', '@ember/array', 'isArray'],
+  ['makeArray', '@ember/array', 'makeArray'],
+
+  // @ember/array/mutable
+  ['MutableArray', '@ember/array/mutable', 'default'],
+
+  // @ember/array/proxy
+  ['ArrayProxy', '@ember/array/proxy', 'default'],
+
+  // @ember/canary-features
+  ['FEATURES.isEnabled', '@ember/canary-features', 'isEnabled'],
+
+  // @ember/component
+  ['Component', '@ember/component', 'default'],
+  ['_Input', '@ember/component', 'Input'],
+  ['_componentManagerCapabilities', '@ember/component', 'capabilities'],
+  ['_getComponentTemplate', '@ember/component', 'getComponentTemplate'],
+  ['_setComponentManager', '@ember/component', 'setComponentManager'],
+  ['_setComponentTemplate', '@ember/component', 'setComponentTemplate'],
+
+  // @ember/component/checkbox
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['Checkbox', '@ember/component/checkbox'],
+
+  // @ember/component/helper
+  ['Helper', '@ember/component/helper', 'default'],
+  ['Helper.helper', '@ember/component/helper', 'helper'],
+
+  // @ember/component/template-only
+  ['_templateOnlyComponent', '@ember/component/template-only', 'default'],
+
+  // @ember/component/text-area
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextArea', '@ember/-component/text-area'],
+
+  // @ember/component/text-field
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextField', '@ember/component/text-field'],
+
+  // @ember/controller
+  ['Controller', '@ember/controller', 'default'],
+  ['inject.controller', '@ember/controller', 'inject'],
 
   // @ember/debug
-  ['deprecateFunc', '@ember/debug'],
-  ['deprecate', '@ember/debug'],
-  ['assert', '@ember/debug'],
-  ['warn', '@ember/debug'],
-  ['debug', '@ember/debug'],
-  ['runInDebug', '@ember/debug'],
+  ['deprecateFunc', '@ember/debug', 'deprecateFunc'],
+  ['deprecate', '@ember/debug', 'deprecate'],
+  ['assert', '@ember/debug', 'assert'],
+  ['debug', '@ember/debug', 'debug'],
+  ['inspect', '@ember/debug', 'inspect'],
   ['Debug.registerDeprecationHandler', '@ember/debug', 'registerDeprecationHandler'],
   ['Debug.registerWarnHandler', '@ember/debug', 'registerWarnHandler'],
+  ['runInDebug', '@ember/debug', 'runInDebug'],
+  ['warn', '@ember/debug', 'warn'],
+  ['testing', '@ember/debug', { get: 'isTesting', set: 'setTesting' }],
+  ['_captureRenderTree', '@ember/debug', 'captureRenderTree'],
+
+  // @ember/debug/container-debug-adapter
+  ['ContainerDebugAdapter', '@ember/debug/container-debug-adapter', 'default'],
+
+  // @ember/debug/data-adapter
+  ['DataAdapter', '@ember/debug/data-adapter', 'default'],
+
+  // @ember/destroyable
+  DEBUG
+    ? ['_assertDestroyablesDestroyed', '@ember/destroyable', 'assertDestroyablesDestroyed']
+    : null,
+  ['_associateDestroyableChild', '@ember/destroyable', 'associateDestroyableChild'],
+  ['destroy', '@ember/destroyable', 'destroy'],
+  DEBUG ? ['_enableDestroyableTracking', '@ember/destroyable', 'enableDestroyableTracking'] : null,
+  ['_isDestroyed', '@ember/destroyable', 'isDestroyed'],
+  ['_isDestroying', '@ember/destroyable', 'isDestroying'],
+  ['_registerDestructor', '@ember/destroyable', 'registerDestructor'],
+  ['_unregisterDestructor', '@ember/destroyable', 'unregisterDestructor'],
+
+  // @ember/engine
+  ['Engine', '@ember/engine', 'default'],
+
+  // @ember/engine/instance
+  ['EngineInstance', '@ember/engine/instance', 'default'],
+
+  // @ember/enumerable
+  ['Enumerable', '@ember/enumerable', 'default'],
+
+  // @ember/error
   ['Error', '@ember/error', 'default'],
 
-  // @ember/-internals/metal
-  ['computed', '@ember/-internals/metal', '_globalsComputed'],
-  ['_descriptor', '@ember/-internals/metal', 'nativeDescDecorator'],
-  ['_tracked', '@ember/-internals/metal', 'tracked'],
-  ['computed.alias', '@ember/-internals/metal', 'alias'],
-  ['ComputedProperty', '@ember/-internals/metal'],
-  ['_setClassicDecorator', '@ember/-internals/metal', 'setClassicDecorator'],
-  ['cacheFor', '@ember/-internals/metal', 'getCachedValueFor'],
-  ['merge', '@ember/polyfills'],
-  ['instrument', '@ember/instrumentation'],
+  // @ember/instrumentation
+  ['instrument', '@ember/instrumentation', 'instrument'],
   ['subscribe', '@ember/instrumentation', 'subscribe'],
   ['Instrumentation.instrument', '@ember/instrumentation', 'instrument'],
+  ['Instrumentation.reset', '@ember/instrumentation', 'reset'],
   ['Instrumentation.subscribe', '@ember/instrumentation', 'subscribe'],
   ['Instrumentation.unsubscribe', '@ember/instrumentation', 'unsubscribe'],
-  ['Instrumentation.reset', '@ember/instrumentation', 'reset'],
-  ['testing', '@ember/debug', { get: 'isTesting', set: 'setTesting' }],
-  ['onerror', '@ember/-internals/error-handling', { get: 'getOnerror', set: 'setOnerror' }],
-  ['FEATURES.isEnabled', '@ember/canary-features', 'isEnabled'],
-  ['meta', '@ember/-internals/meta'],
-  ['get', '@ember/-internals/metal'],
-  ['set', '@ember/-internals/metal'],
-  ['_getPath', '@ember/-internals/metal'],
-  ['getWithDefault', '@ember/-internals/metal'],
-  ['trySet', '@ember/-internals/metal'],
-  ['_Cache', '@ember/-internals/utils', 'Cache'],
-  ['on', '@ember/-internals/metal'],
-  ['addListener', '@ember/-internals/metal'],
-  ['removeListener', '@ember/-internals/metal'],
-  ['sendEvent', '@ember/-internals/metal'],
-  ['hasListeners', '@ember/-internals/metal'],
-  ['isNone', '@ember/-internals/metal'],
-  ['isEmpty', '@ember/-internals/metal'],
-  ['isBlank', '@ember/-internals/metal'],
-  ['isPresent', '@ember/-internals/metal'],
-  ['_Backburner', 'backburner', 'default'],
+
+  // @ember/modifier
+  ['_modifierManagerCapabilities', '@ember/modifier', 'capabilities'],
+  ['_setModifierManager', '@ember/modifier', 'setModifierManager'],
+
+  // @ember/helper
+  ['_helperManagerCapabilities', '@ember/helper', 'capabilities'],
+  ['_setHelperManager', '@ember/helper', 'setHelperManager'],
+  ['_invokeHelper', '@ember/helper', 'invokeHelper'],
+  ['_on', '@ember/helper', 'on'],
+  ['_fn', '@ember/helper', 'fn'],
+  ['_array', '@ember/helper', 'array'],
+  ['_hash', '@ember/helper', 'hash'],
+  ['_get', '@ember/helper', 'get'],
+  ['_concat', '@ember/helper', 'concat'],
+
+  // @ember/object
+  ['Object', '@ember/object', 'default'],
+  ['_action', '@ember/object', 'action'],
+  ['aliasMethod', '@ember/object', 'aliasMethod'],
+  [null, '@ember/object', 'computed'],
+  ['defineProperty', '@ember/object', 'defineProperty'],
+  ['get', '@ember/object', 'get'],
+  ['getProperties', '@ember/object', 'getProperties'],
+  ['getWithDefault', '@ember/object', 'getWithDefault'],
+  ['notifyPropertyChange', '@ember/object', 'notifyPropertyChange'],
+  ['observer', '@ember/object', 'observer'],
+  ['set', '@ember/object', 'set'],
+  ['setProperties', '@ember/object', 'setProperties'],
+  ['trySet', '@ember/object', 'trySet'],
+
+  // @ember/object/compat
+  ['_dependentKeyCompat', '@ember/object/compat', 'dependentKeyCompat'],
+
+  // @ember/object/computed
+  ['ComputedProperty', '@ember/object/computed', 'default'],
+  ['computed.alias', '@ember/object/computed', 'alias'],
+  ['computed.and', '@ember/object/computed', 'and'],
+  ['computed.bool', '@ember/object/computed', 'bool'],
+  ['computed.collect', '@ember/object/computed', 'collect'],
+  ['computed.deprecatingAlias', '@ember/object/computed', 'deprecatingAlias'],
+  ['computed.empty', '@ember/object/computed', 'empty'],
+  ['computed.equal', '@ember/object/computed', 'equal'],
+  ['expandProperties', '@ember/object/computed', 'expandProperties'],
+  ['computed.filter', '@ember/object/computed', 'filter'],
+  ['computed.filterBy', '@ember/object/computed', 'filterBy'],
+  ['computed.gt', '@ember/object/computed', 'gt'],
+  ['computed.gte', '@ember/object/computed', 'gte'],
+  ['computed.intersect', '@ember/object/computed', 'intersect'],
+  ['computed.lt', '@ember/object/computed', 'lt'],
+  ['computed.lte', '@ember/object/computed', 'lte'],
+  ['computed.map', '@ember/object/computed', 'map'],
+  ['computed.mapBy', '@ember/object/computed', 'mapBy'],
+  ['computed.match', '@ember/object/computed', 'match'],
+  ['computed.max', '@ember/object/computed', 'max'],
+  ['computed.min', '@ember/object/computed', 'min'],
+  ['computed.none', '@ember/object/computed', 'none'],
+  ['computed.not', '@ember/object/computed', 'not'],
+  ['computed.notEmpty', '@ember/object/computed', 'notEmpty'],
+  ['computed.oneWay', '@ember/object/computed', 'oneWay'],
+  ['computed.or', '@ember/object/computed', 'or'],
+  ['computed.readOnly', '@ember/object/computed', 'readOnly'],
+  ['computed.reads', '@ember/object/computed', 'reads'],
+  ['computed.setDiff', '@ember/object/computed', 'setDiff'],
+  ['computed.sort', '@ember/object/computed', 'sort'],
+  ['computed.sum', '@ember/object/computed', 'sum'],
+  ['computed.union', '@ember/object/computed', 'union'],
+  ['computed.uniq', '@ember/object/computed', 'uniq'],
+  ['computed.uniqBy', '@ember/object/computed', 'uniqBy'],
+
+  // @ember/object/core
+  ['CoreObject', '@ember/object/core', 'default'],
+
+  // @ember/object/evented
+  ['Evented', '@ember/object/evented', 'default'],
+  ['on', '@ember/object/evented', 'on'],
+
+  // @ember/object/events
+  ['addListener', '@ember/object/events', 'addListener'],
+  ['removeListener', '@ember/object/events', 'removeListener'],
+  ['sendEvent', '@ember/object/events', 'sendEvent'],
+
+  // @ember/object/internals
+  ['cacheFor', '@ember/object/internals', 'cacheFor'],
+  ['copy', '@ember/object/internals', 'copy'],
+  ['guidFor', '@ember/object/internals', 'guidFor'],
+
+  // @ember/object/mixin
+  ['Mixin', '@ember/object/mixin', 'default'],
+
+  // @ember/object/observable
+  ['Observable', '@ember/object/observable', 'default'],
+
+  // @ember/object/observers
+  ['addObserver', '@ember/object/observers', 'addObserver'],
+  ['removeObserver', '@ember/object/observers', 'removeObserver'],
+
+  // @ember/object/promise-proxy-mixin
+  ['PromiseProxyMixin', '@ember/object/promise-proxy-mixin', 'default'],
+
+  // @ember/object/proxy
+  ['ObjectProxy', '@ember/object/proxy', 'default'],
+
+  // @ember/polyfills
+  ['assign', '@ember/polyfills', 'assign'],
+  ['platform.hasPropertyAccessors', '@ember/polyfills', 'hasPropertyAccessors'],
+  ['merge', '@ember/polyfills', 'merge'],
+
+  // @ember/routing/auto-location
+  ['AutoLocation', '@ember/routing/auto-location', 'default'],
+
+  // @ember/routing/hash-location
+  ['HashLocation', '@ember/routing/hash-location', 'default'],
+
+  // @ember/routing/history-location
+  ['HistoryLocation', '@ember/routing/history-location', 'default'],
+
+  // @ember/routing/link-component
+  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['LinkComponent', '@ember/-internals/glimmer'],
+
+  // @ember/routing/location
+  ['Location', '@ember/routing/location', 'default'],
+
+  // @ember/routing/none-location
+  ['NoneLocation', '@ember/routing/none-location', 'default'],
+
+  // @ember/routing/route
+  ['Route', '@ember/routing/route', 'default'],
+
+  // @ember/routing/router
+  ['Router', '@ember/routing/router', 'default'],
+
+  // @ember/runloop
+  [null, '@ember/runloop', 'run'],
   ['run', '@ember/runloop', '_globalsRun'],
   ['run.backburner', '@ember/runloop', 'backburner'],
   ['run.begin', '@ember/runloop', 'begin'],
@@ -247,24 +410,103 @@ let allExports = [
   ['run.throttle', '@ember/runloop', 'throttle'],
   ['run.currentRunLoop', '@ember/runloop', { get: 'getCurrentRunLoop' }],
   ['run.cancelTimers', '@ember/runloop', 'cancelTimers'],
-  ['notifyPropertyChange', '@ember/-internals/metal'],
+
+  // @ember/service
+  ['Service', '@ember/service', 'default'],
+  ['inject.service', '@ember/service', 'inject'],
+
+  // @ember/string
+  ['String.camelize', '@ember/string', 'camelize'],
+  ['String.capitalize', '@ember/string', 'capitalize'],
+  ['String.classify', '@ember/string', 'classify'],
+  ['String.dasherize', '@ember/string', 'dasherize'],
+  ['String.decamelize', '@ember/string', 'decamelize'],
+  ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
+  ['String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe'],
+  ['String.loc', '@ember/string', 'loc'],
+  ['String.underscore', '@ember/string', 'underscore'],
+  ['String.w', '@ember/string', 'w'],
+  ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],
+
+  // @ember/template
+  ['String.htmlSafe', '@ember/template', 'htmlSafe'],
+  ['String.isHTMLSafe', '@ember/template', 'isHTMLSafe'],
+
+  // @ember/template-compilation
+  ['HTMLBars.compile', '@ember/template-compilation', 'compileTemplate'],
+
+  // @ember/template-factory
+  ['Handlebars.template', '@ember/template-factory', 'createTemplateFactory'],
+  ['HTMLBars.template', '@ember/template-factory', 'createTemplateFactory'],
+
+  // @ember/test
+  ['Test.registerAsyncHelper', '@ember/test', 'registerAsyncHelper'],
+  ['Test.registerHelper', '@ember/test', 'registerHelper'],
+  ['Test.registerWaiter', '@ember/test', 'registerWaiter'],
+  ['Test.unregisterHelper', '@ember/test', 'unregisterHelper'],
+  ['Test.unregisterWaiter', '@ember/test', 'unregisterWaiter'],
+
+  // @ember/test/adapter
+  ['Test.Adapter', '@ember/test/adapter', 'default'],
+
+  // @ember/utils
+  ['compare', '@ember/utils', 'compare'],
+  ['isBlank', '@ember/utils', 'isBlank'],
+  ['isEmpty', '@ember/utils', 'isEmpty'],
+  ['isEqual', '@ember/utils', 'isEqual'],
+  ['isNone', '@ember/utils', 'isNone'],
+  ['isPresent', '@ember/utils', 'isPresent'],
+  ['tryInvoke', '@ember/utils', 'tryInvoke'],
+  ['typeOf', '@ember/utils', 'typeOf'],
+
+  // @ember/version
+  ['VERSION', '@ember/version', 'VERSION'],
+
+  // @glimmer/tracking
+  ['_tracked', '@glimmer/tracking', 'tracked'],
+
+  // @glimmer/tracking/primitives/cache
+  ['_createCache', '@glimmer/tracking/primitives/cache', 'createCache'],
+  ['_cacheGetValue', '@glimmer/tracking/primitives/cache', 'getValue'],
+  ['_cacheIsConst', '@glimmer/tracking/primitives/cache', 'isConst'],
+
+  // @ember/-internals/environment
+  ['ENV', '@ember/-internals/environment', { get: 'getENV' }],
+  ['lookup', '@ember/-internals/environment', { get: 'getLookup', set: 'setLookup' }],
+
+  // @ember/-internals/utils
+  ['GUID_KEY', '@ember/-internals/utils'],
+  ['uuid', '@ember/-internals/utils'],
+  ['generateGuid', '@ember/-internals/utils'],
+  ['canInvoke', '@ember/-internals/utils'],
+  ['wrap', '@ember/-internals/utils'],
+  ['_Cache', '@ember/-internals/utils', 'Cache'],
+
+  // @ember/-internals/container
+  ['Registry', '@ember/-internals/container', 'Registry'],
+  ['Container', '@ember/-internals/container', 'Container'],
+
+  // @ember/-internals/metal
+  ['computed', '@ember/-internals/metal', '_globalsComputed'],
+  ['_descriptor', '@ember/-internals/metal', 'nativeDescDecorator'],
+  ['_setClassicDecorator', '@ember/-internals/metal', 'setClassicDecorator'],
+  ['_getPath', '@ember/-internals/metal'],
+  ['hasListeners', '@ember/-internals/metal'],
   ['beginPropertyChanges', '@ember/-internals/metal'],
   ['endPropertyChanges', '@ember/-internals/metal'],
   ['changeProperties', '@ember/-internals/metal'],
-  ['platform.defineProperty', null, { value: true }],
-  ['platform.hasPropertyAccessors', null, { value: true }],
-  ['defineProperty', '@ember/-internals/metal'],
-  ['destroy', '@glimmer/destroyable', 'destroy'],
   ['libraries', '@ember/-internals/metal'],
-  ['getProperties', '@ember/-internals/metal'],
-  ['setProperties', '@ember/-internals/metal'],
-  ['expandProperties', '@ember/-internals/metal'],
-  ['addObserver', '@ember/-internals/metal'],
-  ['removeObserver', '@ember/-internals/metal'],
-  ['aliasMethod', '@ember/-internals/metal'],
-  ['observer', '@ember/-internals/metal'],
-  ['mixin', '@ember/-internals/metal'],
-  ['Mixin', '@ember/-internals/metal'],
+  [
+    'BOOTED',
+    '@ember/-internals/metal',
+    { get: 'isNamespaceSearchDisabled', set: 'setNamespaceSearchDisabled' },
+  ],
+
+  // @ember/-internals/error-handling
+  ['onerror', '@ember/-internals/error-handling', { get: 'getOnerror', set: 'setOnerror' }],
+
+  // @ember/-internals/meta
+  ['meta', '@ember/-internals/meta'],
 
   // @ember/-internals/console
   ['Logger', '@ember/-internals/console', 'default'],
@@ -284,139 +526,52 @@ let allExports = [
   ['EventDispatcher', '@ember/-internals/views'],
 
   // @ember/-internals/glimmer
-  ['Component', '@ember/-internals/glimmer', 'Component'],
-  ['Helper', '@ember/-internals/glimmer', 'Helper'],
-  ['Helper.helper', '@ember/-internals/glimmer', 'helper'],
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['Checkbox', '@ember/-internals/glimmer'],
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['LinkComponent', '@ember/-internals/glimmer'],
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextArea', '@ember/-internals/glimmer'],
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextField', '@ember/-internals/glimmer'],
   ['TEMPLATES', '@ember/-internals/glimmer', { get: 'getTemplates', set: 'setTemplates' }],
-  ['Handlebars.template', '@ember/-internals/glimmer', 'template'],
-  ['HTMLBars.template', '@ember/-internals/glimmer', 'template'],
   ['Handlebars.Utils.escapeExpression', '@ember/-internals/glimmer', 'escapeExpression'],
-  ['_setComponentManager', '@ember/-internals/glimmer', 'setComponentManager'],
-  ['_componentManagerCapabilities', '@ember/-internals/glimmer', 'componentCapabilities'],
-  ['_setModifierManager', '@glimmer/manager', 'setModifierManager'],
-  ['_modifierManagerCapabilities', '@ember/-internals/glimmer', 'modifierCapabilities'],
-  ['_setComponentTemplate', '@glimmer/manager', 'setComponentTemplate'],
-  ['_getComponentTemplate', '@glimmer/manager', 'getComponentTemplate'],
-  EMBER_GLIMMER_HELPER_MANAGER
-    ? ['_setHelperManager', '@glimmer/manager', 'setHelperManager']
-    : null,
-  EMBER_GLIMMER_HELPER_MANAGER
-    ? ['_helperManagerCapabilities', '@glimmer/manager', 'helperCapabilities']
-    : null,
-  EMBER_GLIMMER_INVOKE_HELPER ? ['_invokeHelper', '@glimmer/runtime', 'invokeHelper'] : null,
-  ['_captureRenderTree', '@ember/debug', 'captureRenderTree'],
-  ['_Input', '@ember/-internals/glimmer', 'Input'],
 
   // @ember/-internals/runtime
-  ['A', '@ember/-internals/runtime'],
   ['_RegistryProxyMixin', '@ember/-internals/runtime', 'RegistryProxyMixin'],
   ['_ContainerProxyMixin', '@ember/-internals/runtime', 'ContainerProxyMixin'],
-  ['Object', '@ember/-internals/runtime'],
-  ['String.loc', '@ember/string', 'loc'],
-  ['String.w', '@ember/string', 'w'],
-  ['String.dasherize', '@ember/string', 'dasherize'],
-  ['String.decamelize', '@ember/string', 'decamelize'],
-  ['String.camelize', '@ember/string', 'camelize'],
-  ['String.classify', '@ember/string', 'classify'],
-  ['String.underscore', '@ember/string', 'underscore'],
-  ['String.capitalize', '@ember/string', 'capitalize'],
-  ['compare', '@ember/-internals/runtime'],
-  ['copy', '@ember/-internals/runtime'],
-  ['isEqual', '@ember/-internals/runtime'],
-  ['inject.controller', '@ember/controller', 'inject'],
-  ['inject.service', '@ember/service', 'inject'],
-  ['Array', '@ember/-internals/runtime'],
   ['Comparable', '@ember/-internals/runtime'],
-  ['Namespace', '@ember/-internals/runtime'],
-  ['Enumerable', '@ember/-internals/runtime'],
-  ['ArrayProxy', '@ember/-internals/runtime'],
-  ['ObjectProxy', '@ember/-internals/runtime'],
   ['ActionHandler', '@ember/-internals/runtime'],
-  ['CoreObject', '@ember/-internals/runtime'],
   ['NativeArray', '@ember/-internals/runtime'],
   ['Copyable', '@ember/-internals/runtime'],
   ['MutableEnumerable', '@ember/-internals/runtime'],
-  ['MutableArray', '@ember/-internals/runtime'],
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS
     ? null
     : ['TargetActionSupport', '@ember/-internals/runtime'],
-  ['Evented', '@ember/-internals/runtime'],
-  ['PromiseProxyMixin', '@ember/-internals/runtime'],
-  ['Observable', '@ember/-internals/runtime'],
-  ['typeOf', '@ember/-internals/runtime'],
-  ['isArray', '@ember/-internals/runtime'],
-  ['Object', '@ember/-internals/runtime'],
-  ['onLoad', '@ember/application'],
-  ['runLoadHooks', '@ember/application'],
-  ['Controller', '@ember/controller', 'default'],
   ['ControllerMixin', '@ember/controller/lib/controller_mixin', 'default'],
-  ['Service', '@ember/service', 'default'],
   ['_ProxyMixin', '@ember/-internals/runtime'],
-  ['RSVP', '@ember/-internals/runtime'],
-  ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],
-  [
-    'BOOTED',
-    '@ember/-internals/metal',
-    { get: 'isNamespaceSearchDisabled', set: 'setNamespaceSearchDisabled' },
-  ],
-  ['_action', '@ember/object', 'action'],
-  ['_dependentKeyCompat', '@ember/object/compat', 'dependentKeyCompat'],
-  ['computed.empty', '@ember/object/computed', 'empty'],
-  ['computed.notEmpty', '@ember/object/computed', 'notEmpty'],
-  ['computed.none', '@ember/object/computed', 'none'],
-  ['computed.not', '@ember/object/computed', 'not'],
-  ['computed.bool', '@ember/object/computed', 'bool'],
-  ['computed.match', '@ember/object/computed', 'match'],
-  ['computed.equal', '@ember/object/computed', 'equal'],
-  ['computed.gt', '@ember/object/computed', 'gt'],
-  ['computed.gte', '@ember/object/computed', 'gte'],
-  ['computed.lt', '@ember/object/computed', 'lt'],
-  ['computed.lte', '@ember/object/computed', 'lte'],
-  ['computed.oneWay', '@ember/object/computed', 'oneWay'],
-  ['computed.reads', '@ember/object/computed', 'oneWay'],
-  ['computed.readOnly', '@ember/object/computed', 'readOnly'],
-  ['computed.deprecatingAlias', '@ember/object/computed', 'deprecatingAlias'],
-  ['computed.and', '@ember/object/computed', 'and'],
-  ['computed.or', '@ember/object/computed', 'or'],
-  ['computed.sum', '@ember/object/computed', 'sum'],
-  ['computed.min', '@ember/object/computed', 'min'],
-  ['computed.max', '@ember/object/computed', 'max'],
-  ['computed.map', '@ember/object/computed', 'map'],
-  ['computed.sort', '@ember/object/computed', 'sort'],
-  ['computed.setDiff', '@ember/object/computed', 'setDiff'],
-  ['computed.mapBy', '@ember/object/computed', 'mapBy'],
-  ['computed.filter', '@ember/object/computed', 'filter'],
-  ['computed.filterBy', '@ember/object/computed', 'filterBy'],
-  ['computed.uniq', '@ember/object/computed', 'uniq'],
-  ['computed.uniqBy', '@ember/object/computed', 'uniqBy'],
-  ['computed.union', '@ember/object/computed', 'union'],
-  ['computed.intersect', '@ember/object/computed', 'intersect'],
-  ['computed.collect', '@ember/object/computed', 'collect'],
 
   // @ember/-internals/routing
-  ['Location', '@ember/-internals/routing'],
-  ['AutoLocation', '@ember/-internals/routing'],
-  ['HashLocation', '@ember/-internals/routing'],
-  ['HistoryLocation', '@ember/-internals/routing'],
-  ['NoneLocation', '@ember/-internals/routing'],
   ['controllerFor', '@ember/-internals/routing'],
   ['generateControllerFactory', '@ember/-internals/routing'],
   ['generateController', '@ember/-internals/routing'],
   ['RouterDSL', '@ember/-internals/routing'],
-  ['Router', '@ember/-internals/routing'],
-  ['Route', '@ember/-internals/routing'],
 
-  // ember-application
-  ['Application', '@ember/application', 'default'],
-  ['ApplicationInstance', '@ember/application/instance', 'default'],
-  ['Engine', '@ember/engine', 'default'],
-  ['EngineInstance', '@ember/engine/instance', 'default'],
+  // backburner
+  ['_Backburner', 'backburner', 'default'],
 
-  // @ember/-internals/extension-support
-  ['DataAdapter', '@ember/-internals/extension-support'],
-  ['ContainerDebugAdapter', '@ember/-internals/extension-support'],
+  // jquery
+  ENV._JQUERY_INTEGRATION ? [null, 'jquery', 'default'] : null,
+
+  // rsvp
+  [null, 'rsvp', 'default'],
+  [null, 'rsvp', 'Promise'],
+  [null, 'rsvp', 'all'],
+  [null, 'rsvp', 'allSettled'],
+  [null, 'rsvp', 'defer'],
+  [null, 'rsvp', 'denodeify'],
+  [null, 'rsvp', 'filter'],
+  [null, 'rsvp', 'hash'],
+  [null, 'rsvp', 'hashSettled'],
+  [null, 'rsvp', 'map'],
+  [null, 'rsvp', 'off'],
+  [null, 'rsvp', 'on'],
+  [null, 'rsvp', 'race'],
+  [null, 'rsvp', 'reject'],
+  [null, 'rsvp', 'resolve'],
+
+  // misc.
+  ['platform.defineProperty', null, { value: true }],
 ].filter(Boolean);
diff --git a/packages/internal-test-helpers/lib/confirm-export.js b/packages/internal-test-helpers/lib/confirm-export.js
index 7e5eb68e2cb..beb549f6ddf 100644
--- a/packages/internal-test-helpers/lib/confirm-export.js
+++ b/packages/internal-test-helpers/lib/confirm-export.js
@@ -16,10 +16,19 @@ function getDescriptor(obj, path) {
 
 export default function confirmExport(Ember, assert, path, moduleId, exportName) {
   try {
-    let desc = getDescriptor(Ember, path);
-    assert.ok(desc, `the ${path} property exists on the Ember global`);
+    let desc;
 
-    if (typeof exportName === 'string') {
+    if (path !== null) {
+      desc = getDescriptor(Ember, path);
+      assert.ok(desc, `the ${path} property exists on the Ember global`);
+    } else {
+      desc = null;
+    }
+
+    if (desc === null) {
+      let mod = require(moduleId);
+      assert.notEqual(mod[exportName], undefined, `${moduleId}#${exportName} is not \`undefined\``);
+    } else if (typeof exportName === 'string') {
       let mod = require(moduleId);
       let value = 'value' in desc ? desc.value : desc.get.call(Ember);
       assert.equal(value, mod[exportName], `Ember.${path} is exported correctly`);
diff --git a/packages/jquery/index.js b/packages/jquery/index.js
new file mode 100644
index 00000000000..c8317ec057c
--- /dev/null
+++ b/packages/jquery/index.js
@@ -0,0 +1,3 @@
+import { jQuery } from '@ember/-internals/views';
+
+export default jQuery;

From e25282f6e854a1c9e4fb318b7aa162542b964804 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 16 Mar 2021 20:40:04 -0400
Subject: [PATCH 0429/1405] Add v3.26.0-beta.5 to CHANGELOG

(cherry picked from commit 9c0ab229425ac239cf402b277dea530e93fc54e8)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f716eca8ba3..34a3bb085bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.26.0-beta.5 (March 16, 2021)
+
+- [#19405](https://github.com/emberjs/ember.js/pull/19405) [BUGFIX] Avoid instantiation errors when `app/router.js` injects the router service.
+
 ### v3.26.0-beta.4 (March 08, 2021)
 
 - [#19436](https://github.com/emberjs/ember.js/pull/19436) [BUGFIX] Support observer keys with colons

From bf750e7f0862bc42b25040773be7ed6cdc47ccce Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 16 Mar 2021 17:55:08 -0700
Subject: [PATCH 0430/1405] [BUGFIX] Restore nested paths on run and computed

These values were previously nested on `run` and `computed`, and were
accessible from the _imported_ versions of those values due to the fact
that they transformed to be the same as globals. They were used by a few
different consumers, but were not intended to be used this way.

This PR restores the previous behavior, but also deprecates it.
---
 packages/@ember/-internals/metal/index.ts     |   8 +-
 .../@ember/-internals/metal/lib/computed.ts   |   2 -
 packages/@ember/object/index.js               | 129 +++++++++++++++++-
 packages/@ember/runloop/index.js              |  66 ++++++++-
 packages/ember/index.js                       |  96 +------------
 packages/ember/tests/reexports_test.js        | 116 ++++++++--------
 .../lib/confirm-export.js                     |   6 +-
 7 files changed, 260 insertions(+), 163 deletions(-)

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 60ee9db0618..ab62c3cae84 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -1,10 +1,4 @@
-export {
-  default as computed,
-  autoComputed,
-  isComputed,
-  _globalsComputed,
-  ComputedProperty,
-} from './lib/computed';
+export { default as computed, autoComputed, isComputed, ComputedProperty } from './lib/computed';
 export { getCachedValueFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 066c07ba7f5..630f1eade01 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1079,6 +1079,4 @@ export function isComputed(obj: object, key: string): boolean {
   return Boolean(descriptorForProperty(obj, key));
 }
 
-export const _globalsComputed = computed.bind(null);
-
 export default computed;
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index 4207c312993..9c6bb11faed 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -1,4 +1,5 @@
-import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { assert, deprecate } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
 
@@ -18,6 +19,132 @@ export {
   aliasMethod,
 } from '@ember/-internals/metal';
 
+import { computed } from '@ember/-internals/metal';
+
+import {
+  alias,
+  and,
+  bool,
+  collect,
+  deprecatingAlias,
+  empty,
+  equal,
+  filterBy,
+  filter,
+  gte,
+  gt,
+  intersect,
+  lte,
+  lt,
+  mapBy,
+  map,
+  match,
+  max,
+  min,
+  none,
+  notEmpty,
+  not,
+  oneWay,
+  or,
+  readOnly,
+  setDiff,
+  sort,
+  sum,
+  union,
+  uniqBy,
+  uniq,
+} from '@ember/object/computed';
+
+// eslint-disable-next-line no-undef
+if (DEBUG) {
+  let defineDeprecatedComputedFunc = (key, func) => {
+    Object.defineProperty(computed, key, {
+      get() {
+        deprecate(
+          `Using \`computed.${key}\` has been deprecated. Instead, import the value directly from @ember/object/computed:\n\n  import { ${key} } from '@ember/runloop';`,
+          false,
+          {
+            id: 'deprecated-run-loop-and-computed-dot-access',
+            until: '4.0.0',
+            for: 'ember-source',
+            since: {
+              enabled: '3.27.0',
+            },
+          }
+        );
+
+        return func;
+      },
+    });
+  };
+
+  defineDeprecatedComputedFunc('alias', alias);
+  defineDeprecatedComputedFunc('and', and);
+  defineDeprecatedComputedFunc('bool', bool);
+  defineDeprecatedComputedFunc('collect', collect);
+  defineDeprecatedComputedFunc('deprecatingAlias', deprecatingAlias);
+  defineDeprecatedComputedFunc('empty', empty);
+  defineDeprecatedComputedFunc('equal', equal);
+  defineDeprecatedComputedFunc('filterBy', filterBy);
+  defineDeprecatedComputedFunc('filter', filter);
+  defineDeprecatedComputedFunc('gte', gte);
+  defineDeprecatedComputedFunc('gt', gt);
+  defineDeprecatedComputedFunc('intersect', intersect);
+  defineDeprecatedComputedFunc('lte', lte);
+  defineDeprecatedComputedFunc('lt', lt);
+  defineDeprecatedComputedFunc('mapBy', mapBy);
+  defineDeprecatedComputedFunc('map', map);
+  defineDeprecatedComputedFunc('match', match);
+  defineDeprecatedComputedFunc('max', max);
+  defineDeprecatedComputedFunc('min', min);
+  defineDeprecatedComputedFunc('none', none);
+  defineDeprecatedComputedFunc('notEmpty', notEmpty);
+  defineDeprecatedComputedFunc('not', not);
+  defineDeprecatedComputedFunc('oneWay', oneWay);
+  defineDeprecatedComputedFunc('reads', oneWay);
+  defineDeprecatedComputedFunc('or', or);
+  defineDeprecatedComputedFunc('readOnly', readOnly);
+  defineDeprecatedComputedFunc('setDiff', setDiff);
+  defineDeprecatedComputedFunc('sort', sort);
+  defineDeprecatedComputedFunc('sum', sum);
+  defineDeprecatedComputedFunc('union', union);
+  defineDeprecatedComputedFunc('uniqBy', uniqBy);
+  defineDeprecatedComputedFunc('uniq', uniq);
+} else {
+  computed.alias = alias;
+  computed.and = and;
+  computed.bool = bool;
+  computed.collect = collect;
+  computed.deprecatingAlias = deprecatingAlias;
+  computed.empty = empty;
+  computed.equal = equal;
+  computed.filterBy = filterBy;
+  computed.filter = filter;
+  computed.gte = gte;
+  computed.gt = gt;
+  computed.intersect = intersect;
+  computed.lte = lte;
+  computed.lt = lt;
+  computed.mapBy = mapBy;
+  computed.map = map;
+  computed.match = match;
+  computed.max = max;
+  computed.min = min;
+  computed.none = none;
+  computed.notEmpty = notEmpty;
+  computed.not = not;
+  computed.oneWay = oneWay;
+  computed.reads = oneWay;
+  computed.or = or;
+  computed.readOnly = readOnly;
+  computed.setDiff = setDiff;
+  computed.sort = sort;
+  computed.sum = sum;
+  computed.union = union;
+  computed.uniqBy = uniqBy;
+  computed.uniq = uniq;
+}
+
 /**
   Decorator that turns the target function into an Action which can be accessed
   directly by reference.
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index caadd6c4a2d..f1be5573c61 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -1,4 +1,5 @@
-import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { assert, deprecate } from '@ember/debug';
 import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
 import Backburner from 'backburner';
@@ -103,9 +104,6 @@ export function run() {
   return backburner.run(...arguments);
 }
 
-// used for the Ember.run global only
-export const _globalsRun = run.bind(null);
-
 /**
   If no run-loop is present, it creates a new one. If a run loop is
   present it will queue itself to run on the existing run-loops action
@@ -742,3 +740,63 @@ export function debounce() {
 export function throttle() {
   return backburner.throttle(...arguments);
 }
+
+// eslint-disable-next-line no-undef
+if (DEBUG) {
+  let defineDeprecatedRunloopFunc = (key, func, alt) => {
+    Object.defineProperty(run, key, {
+      get() {
+        deprecate(
+          `Using \`run.${key}\` has been deprecated. Instead, import the value directly from @ember/runloop:\n\n  import { ${
+            alt || key
+          } } from '@ember/runloop';`,
+          false,
+          {
+            id: 'deprecated-run-loop-and-computed-dot-access',
+            until: '4.0.0',
+            for: 'ember-source',
+            since: {
+              enabled: '3.27.0',
+            },
+          }
+        );
+
+        return func;
+      },
+    });
+  };
+
+  defineDeprecatedRunloopFunc('backburner', backburner);
+  defineDeprecatedRunloopFunc('begin', begin);
+  defineDeprecatedRunloopFunc('bind', bind);
+  defineDeprecatedRunloopFunc('cancel', cancel);
+  defineDeprecatedRunloopFunc('debounce', debounce);
+  defineDeprecatedRunloopFunc('end', end);
+  defineDeprecatedRunloopFunc('hasScheduledTimers', hasScheduledTimers);
+  defineDeprecatedRunloopFunc('join', join);
+  defineDeprecatedRunloopFunc('later', later);
+  defineDeprecatedRunloopFunc('next', next);
+  defineDeprecatedRunloopFunc('once', once);
+  defineDeprecatedRunloopFunc('schedule', schedule);
+  defineDeprecatedRunloopFunc('scheduleOnce', scheduleOnce);
+  defineDeprecatedRunloopFunc('throttle', throttle);
+  defineDeprecatedRunloopFunc('cancelTimers', cancelTimers);
+  defineDeprecatedRunloopFunc('currentRunLoop', getCurrentRunLoop, 'getCurrentRunLoop');
+} else {
+  run.backburner = backburner;
+  run.begin = begin;
+  run.bind = bind;
+  run.cancel = cancel;
+  run.debounce = debounce;
+  run.end = end;
+  run.hasScheduledTimers = hasScheduledTimers;
+  run.join = join;
+  run.later = later;
+  run.next = next;
+  run.once = once;
+  run.schedule = schedule;
+  run.scheduleOnce = scheduleOnce;
+  run.throttle = throttle;
+  run.cancelTimers = cancelTimers;
+  run.currentRunLoop = getCurrentRunLoop;
+}
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 980f6fb21bd..43543fdb462 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -33,42 +33,9 @@ import {
 } from '@ember/string';
 import Service, { inject as injectService } from '@ember/service';
 
-import { action } from '@ember/object';
+import { action, computed } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 
-import {
-  and,
-  bool,
-  collect,
-  deprecatingAlias,
-  empty,
-  equal,
-  filterBy,
-  filter,
-  gte,
-  gt,
-  intersect,
-  lte,
-  lt,
-  mapBy,
-  map,
-  match,
-  max,
-  min,
-  none,
-  notEmpty,
-  not,
-  oneWay,
-  or,
-  readOnly,
-  setDiff,
-  sort,
-  sum,
-  union,
-  uniqBy,
-  uniq,
-} from '@ember/object/computed';
-
 import {
   Object as EmberObject,
   RegistryProxyMixin,
@@ -124,7 +91,7 @@ import * as views from '@ember/-internals/views';
 import * as routing from '@ember/-internals/routing';
 import * as extensionSupport from '@ember/-internals/extension-support';
 import EmberError from '@ember/error';
-import * as runloop from '@ember/runloop';
+import { run } from '@ember/runloop';
 import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import Application, { onLoad, runLoadHooks } from '@ember/application';
@@ -311,37 +278,14 @@ Ember.Instrumentation = {
 
 // ****@ember/runloop****
 
-// Using _globalsRun here so that mutating the function (adding
-// `next`, `later`, etc to it) is only available in globals builds
-Ember.run = runloop._globalsRun;
-Ember.run.backburner = runloop.backburner;
-Ember.run.begin = runloop.begin;
-Ember.run.bind = runloop.bind;
-Ember.run.cancel = runloop.cancel;
-Ember.run.debounce = runloop.debounce;
-Ember.run.end = runloop.end;
-Ember.run.hasScheduledTimers = runloop.hasScheduledTimers;
-Ember.run.join = runloop.join;
-Ember.run.later = runloop.later;
-Ember.run.next = runloop.next;
-Ember.run.once = runloop.once;
-Ember.run.schedule = runloop.schedule;
-Ember.run.scheduleOnce = runloop.scheduleOnce;
-Ember.run.throttle = runloop.throttle;
-Ember.run.cancelTimers = runloop.cancelTimers;
-Object.defineProperty(Ember.run, 'currentRunLoop', {
-  get: runloop.getCurrentRunLoop,
-  enumerable: false,
-});
+Ember.run = run;
 
 // ****@ember/-internals/metal****
 
 // in globals builds
-const computed = metal._globalsComputed;
 Ember.computed = computed;
 Ember._descriptor = metal.nativeDescDecorator;
 Ember._tracked = metal.tracked;
-computed.alias = metal.alias;
 Ember.cacheFor = metal.getCachedValueFor;
 Ember.ComputedProperty = metal.ComputedProperty;
 Ember._setClassicDecorator = metal.setClassicDecorator;
@@ -507,40 +451,6 @@ Ember.Namespace = Namespace;
 Ember._action = action;
 Ember._dependentKeyCompat = dependentKeyCompat;
 
-computed.empty = empty;
-computed.notEmpty = notEmpty;
-computed.none = none;
-computed.not = not;
-computed.bool = bool;
-computed.match = match;
-computed.equal = equal;
-computed.gt = gt;
-computed.gte = gte;
-computed.lt = lt;
-computed.lte = lte;
-computed.oneWay = oneWay;
-computed.reads = oneWay;
-computed.readOnly = readOnly;
-computed.deprecatingAlias = deprecatingAlias;
-computed.and = and;
-computed.or = or;
-
-computed.sum = sum;
-computed.min = min;
-computed.max = max;
-computed.map = map;
-computed.sort = sort;
-computed.setDiff = setDiff;
-computed.mapBy = mapBy;
-computed.filter = filter;
-computed.filterBy = filterBy;
-computed.uniq = uniq;
-
-computed.uniqBy = uniqBy;
-computed.union = union;
-computed.intersect = intersect;
-computed.collect = collect;
-
 /**
   Defines the hash of localized strings for the current language. Used by
   the `String.loc` helper. To localize, add string values to this
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index e4a0dc4ebf4..3d928f78705 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -13,14 +13,22 @@ moduleFor(
   class extends AbstractTestCase {
     [`@test Ember exports correctly`](assert) {
       allExports.forEach((reexport) => {
-        let [path, moduleId, exportName] = reexport;
+        let [path, moduleId, exportName, isDeprecated] = reexport;
 
         // default path === exportName if none present
         if (!exportName) {
           exportName = path;
         }
 
-        confirmExport(Ember, assert, path, moduleId, exportName, `Ember.${path} exports correctly`);
+        confirmExport(
+          Ember,
+          assert,
+          path,
+          moduleId,
+          exportName,
+          isDeprecated,
+          `Ember.${path} exports correctly`
+        );
       });
     }
 
@@ -279,7 +287,7 @@ let allExports = [
   ['Object', '@ember/object', 'default'],
   ['_action', '@ember/object', 'action'],
   ['aliasMethod', '@ember/object', 'aliasMethod'],
-  [null, '@ember/object', 'computed'],
+  ['computed', '@ember/object', 'computed'],
   ['defineProperty', '@ember/object', 'defineProperty'],
   ['get', '@ember/object', 'get'],
   ['getProperties', '@ember/object', 'getProperties'],
@@ -295,39 +303,39 @@ let allExports = [
 
   // @ember/object/computed
   ['ComputedProperty', '@ember/object/computed', 'default'],
-  ['computed.alias', '@ember/object/computed', 'alias'],
-  ['computed.and', '@ember/object/computed', 'and'],
-  ['computed.bool', '@ember/object/computed', 'bool'],
-  ['computed.collect', '@ember/object/computed', 'collect'],
-  ['computed.deprecatingAlias', '@ember/object/computed', 'deprecatingAlias'],
-  ['computed.empty', '@ember/object/computed', 'empty'],
-  ['computed.equal', '@ember/object/computed', 'equal'],
-  ['expandProperties', '@ember/object/computed', 'expandProperties'],
-  ['computed.filter', '@ember/object/computed', 'filter'],
-  ['computed.filterBy', '@ember/object/computed', 'filterBy'],
-  ['computed.gt', '@ember/object/computed', 'gt'],
-  ['computed.gte', '@ember/object/computed', 'gte'],
-  ['computed.intersect', '@ember/object/computed', 'intersect'],
-  ['computed.lt', '@ember/object/computed', 'lt'],
-  ['computed.lte', '@ember/object/computed', 'lte'],
-  ['computed.map', '@ember/object/computed', 'map'],
-  ['computed.mapBy', '@ember/object/computed', 'mapBy'],
-  ['computed.match', '@ember/object/computed', 'match'],
-  ['computed.max', '@ember/object/computed', 'max'],
-  ['computed.min', '@ember/object/computed', 'min'],
-  ['computed.none', '@ember/object/computed', 'none'],
-  ['computed.not', '@ember/object/computed', 'not'],
-  ['computed.notEmpty', '@ember/object/computed', 'notEmpty'],
-  ['computed.oneWay', '@ember/object/computed', 'oneWay'],
-  ['computed.or', '@ember/object/computed', 'or'],
-  ['computed.readOnly', '@ember/object/computed', 'readOnly'],
-  ['computed.reads', '@ember/object/computed', 'reads'],
-  ['computed.setDiff', '@ember/object/computed', 'setDiff'],
-  ['computed.sort', '@ember/object/computed', 'sort'],
-  ['computed.sum', '@ember/object/computed', 'sum'],
-  ['computed.union', '@ember/object/computed', 'union'],
-  ['computed.uniq', '@ember/object/computed', 'uniq'],
-  ['computed.uniqBy', '@ember/object/computed', 'uniqBy'],
+  ['computed.alias', '@ember/object/computed', 'alias', true],
+  ['computed.and', '@ember/object/computed', 'and', true],
+  ['computed.bool', '@ember/object/computed', 'bool', true],
+  ['computed.collect', '@ember/object/computed', 'collect', true],
+  ['computed.deprecatingAlias', '@ember/object/computed', 'deprecatingAlias', true],
+  ['computed.empty', '@ember/object/computed', 'empty', true],
+  ['computed.equal', '@ember/object/computed', 'equal', true],
+  ['expandProperties', '@ember/object/computed', 'expandProperties', true],
+  ['computed.filter', '@ember/object/computed', 'filter', true],
+  ['computed.filterBy', '@ember/object/computed', 'filterBy', true],
+  ['computed.gt', '@ember/object/computed', 'gt', true],
+  ['computed.gte', '@ember/object/computed', 'gte', true],
+  ['computed.intersect', '@ember/object/computed', 'intersect', true],
+  ['computed.lt', '@ember/object/computed', 'lt', true],
+  ['computed.lte', '@ember/object/computed', 'lte', true],
+  ['computed.map', '@ember/object/computed', 'map', true],
+  ['computed.mapBy', '@ember/object/computed', 'mapBy', true],
+  ['computed.match', '@ember/object/computed', 'match', true],
+  ['computed.max', '@ember/object/computed', 'max', true],
+  ['computed.min', '@ember/object/computed', 'min', true],
+  ['computed.none', '@ember/object/computed', 'none', true],
+  ['computed.not', '@ember/object/computed', 'not', true],
+  ['computed.notEmpty', '@ember/object/computed', 'notEmpty', true],
+  ['computed.oneWay', '@ember/object/computed', 'oneWay', true],
+  ['computed.or', '@ember/object/computed', 'or', true],
+  ['computed.readOnly', '@ember/object/computed', 'readOnly', true],
+  ['computed.reads', '@ember/object/computed', 'reads', true],
+  ['computed.setDiff', '@ember/object/computed', 'setDiff', true],
+  ['computed.sort', '@ember/object/computed', 'sort', true],
+  ['computed.sum', '@ember/object/computed', 'sum', true],
+  ['computed.union', '@ember/object/computed', 'union', true],
+  ['computed.uniq', '@ember/object/computed', 'uniq', true],
+  ['computed.uniqBy', '@ember/object/computed', 'uniqBy', true],
 
   // @ember/object/core
   ['CoreObject', '@ember/object/core', 'default'],
@@ -392,24 +400,23 @@ let allExports = [
   ['Router', '@ember/routing/router', 'default'],
 
   // @ember/runloop
-  [null, '@ember/runloop', 'run'],
-  ['run', '@ember/runloop', '_globalsRun'],
-  ['run.backburner', '@ember/runloop', 'backburner'],
-  ['run.begin', '@ember/runloop', 'begin'],
-  ['run.bind', '@ember/runloop', 'bind'],
-  ['run.cancel', '@ember/runloop', 'cancel'],
-  ['run.debounce', '@ember/runloop', 'debounce'],
-  ['run.end', '@ember/runloop', 'end'],
-  ['run.hasScheduledTimers', '@ember/runloop', 'hasScheduledTimers'],
-  ['run.join', '@ember/runloop', 'join'],
-  ['run.later', '@ember/runloop', 'later'],
-  ['run.next', '@ember/runloop', 'next'],
-  ['run.once', '@ember/runloop', 'once'],
-  ['run.schedule', '@ember/runloop', 'schedule'],
-  ['run.scheduleOnce', '@ember/runloop', 'scheduleOnce'],
-  ['run.throttle', '@ember/runloop', 'throttle'],
-  ['run.currentRunLoop', '@ember/runloop', { get: 'getCurrentRunLoop' }],
-  ['run.cancelTimers', '@ember/runloop', 'cancelTimers'],
+  ['run', '@ember/runloop', 'run'],
+  ['run.backburner', '@ember/runloop', 'backburner', true],
+  ['run.begin', '@ember/runloop', 'begin', true],
+  ['run.bind', '@ember/runloop', 'bind', true],
+  ['run.cancel', '@ember/runloop', 'cancel', true],
+  ['run.debounce', '@ember/runloop', 'debounce', true],
+  ['run.end', '@ember/runloop', 'end', true],
+  ['run.hasScheduledTimers', '@ember/runloop', 'hasScheduledTimers', true],
+  ['run.join', '@ember/runloop', 'join', true],
+  ['run.later', '@ember/runloop', 'later', true],
+  ['run.next', '@ember/runloop', 'next', true],
+  ['run.once', '@ember/runloop', 'once', true],
+  ['run.schedule', '@ember/runloop', 'schedule', true],
+  ['run.scheduleOnce', '@ember/runloop', 'scheduleOnce', true],
+  ['run.throttle', '@ember/runloop', 'throttle', true],
+  ['run.currentRunLoop', '@ember/runloop', 'getCurrentRunLoop', true],
+  ['run.cancelTimers', '@ember/runloop', 'cancelTimers', true],
 
   // @ember/service
   ['Service', '@ember/service', 'default'],
@@ -487,7 +494,6 @@ let allExports = [
   ['Container', '@ember/-internals/container', 'Container'],
 
   // @ember/-internals/metal
-  ['computed', '@ember/-internals/metal', '_globalsComputed'],
   ['_descriptor', '@ember/-internals/metal', 'nativeDescDecorator'],
   ['_setClassicDecorator', '@ember/-internals/metal', 'setClassicDecorator'],
   ['_getPath', '@ember/-internals/metal'],
diff --git a/packages/internal-test-helpers/lib/confirm-export.js b/packages/internal-test-helpers/lib/confirm-export.js
index beb549f6ddf..20a87a0cf52 100644
--- a/packages/internal-test-helpers/lib/confirm-export.js
+++ b/packages/internal-test-helpers/lib/confirm-export.js
@@ -14,7 +14,7 @@ function getDescriptor(obj, path) {
   return Object.getOwnPropertyDescriptor(value, last);
 }
 
-export default function confirmExport(Ember, assert, path, moduleId, exportName) {
+export default function confirmExport(Ember, assert, path, moduleId, exportName, isDeprecated) {
   try {
     let desc;
 
@@ -25,6 +25,10 @@ export default function confirmExport(Ember, assert, path, moduleId, exportName)
       desc = null;
     }
 
+    if (isDeprecated) {
+      expectDeprecation();
+    }
+
     if (desc === null) {
       let mod = require(moduleId);
       assert.notEqual(mod[exportName], undefined, `${moduleId}#${exportName} is not \`undefined\``);

From 877154c1eca44ac1ec6eb3c229de2572cee6eed4 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 16 Mar 2021 21:01:21 -0700
Subject: [PATCH 0431/1405] [BUGFIX] Use getter for `currentRunLoop`

The `currentRunLoop` property on the global run was a getter, not a
value. I missed this when doing the conversion, and it doesn't appear
that we had a test for the behavior of that property, other than the
re-export test (which I also changed, mistakenly). This restores
the previous behavior, which deprecating it.
---
 packages/@ember/runloop/index.js       | 35 +++++++++++++++++++++-----
 packages/ember/tests/reexports_test.js |  7 +++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index f1be5573c61..c2f848f1546 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -741,15 +741,15 @@ export function throttle() {
   return backburner.throttle(...arguments);
 }
 
+export let _deprecatedGlobalGetCurrentRunLoop;
+
 // eslint-disable-next-line no-undef
 if (DEBUG) {
-  let defineDeprecatedRunloopFunc = (key, func, alt) => {
+  let defineDeprecatedRunloopFunc = (key, func) => {
     Object.defineProperty(run, key, {
       get() {
         deprecate(
-          `Using \`run.${key}\` has been deprecated. Instead, import the value directly from @ember/runloop:\n\n  import { ${
-            alt || key
-          } } from '@ember/runloop';`,
+          `Using \`run.${key}\` has been deprecated. Instead, import the value directly from @ember/runloop:\n\n  import { ${key} } from '@ember/runloop';`,
           false,
           {
             id: 'deprecated-run-loop-and-computed-dot-access',
@@ -766,6 +766,23 @@ if (DEBUG) {
     });
   };
 
+  _deprecatedGlobalGetCurrentRunLoop = () => {
+    deprecate(
+      `Using \`run.currentRunLoop\` has been deprecated. Instead, import the getCurrentRunLoop() directly from @ember/runloop:\n\n  import { getCurrentRunLoop } from '@ember/runloop';`,
+      false,
+      {
+        id: 'deprecated-run-loop-and-computed-dot-access',
+        until: '4.0.0',
+        for: 'ember-source',
+        since: {
+          enabled: '3.27.0',
+        },
+      }
+    );
+
+    return getCurrentRunLoop();
+  };
+
   defineDeprecatedRunloopFunc('backburner', backburner);
   defineDeprecatedRunloopFunc('begin', begin);
   defineDeprecatedRunloopFunc('bind', bind);
@@ -781,7 +798,10 @@ if (DEBUG) {
   defineDeprecatedRunloopFunc('scheduleOnce', scheduleOnce);
   defineDeprecatedRunloopFunc('throttle', throttle);
   defineDeprecatedRunloopFunc('cancelTimers', cancelTimers);
-  defineDeprecatedRunloopFunc('currentRunLoop', getCurrentRunLoop, 'getCurrentRunLoop');
+  Object.defineProperty(run, 'currentRunLoop', {
+    get: _deprecatedGlobalGetCurrentRunLoop,
+    enumerable: false,
+  });
 } else {
   run.backburner = backburner;
   run.begin = begin;
@@ -798,5 +818,8 @@ if (DEBUG) {
   run.scheduleOnce = scheduleOnce;
   run.throttle = throttle;
   run.cancelTimers = cancelTimers;
-  run.currentRunLoop = getCurrentRunLoop;
+  Object.defineProperty(run, 'currentRunLoop', {
+    get: getCurrentRunLoop,
+    enumerable: false,
+  });
 }
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 3d928f78705..720f95939cf 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -415,7 +415,12 @@ let allExports = [
   ['run.schedule', '@ember/runloop', 'schedule', true],
   ['run.scheduleOnce', '@ember/runloop', 'scheduleOnce', true],
   ['run.throttle', '@ember/runloop', 'throttle', true],
-  ['run.currentRunLoop', '@ember/runloop', 'getCurrentRunLoop', true],
+  [
+    'run.currentRunLoop',
+    '@ember/runloop',
+    { get: DEBUG ? '_deprecatedGlobalGetCurrentRunLoop' : 'getCurrentRunLoop' },
+    true,
+  ],
   ['run.cancelTimers', '@ember/runloop', 'cancelTimers', true],
 
   // @ember/service

From 9edaec34327bd0e5ec0f5bdf5300c4c15d2298be Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Tue, 16 Mar 2021 17:43:43 +0100
Subject: [PATCH 0432/1405] Rename helper arguments in blueprints

---
 blueprints/helper/files/__root__/__collection__/__name__.js   | 4 ++--
 .../helper/mu-files/__root__/__collection__/__name__.js       | 4 ++--
 node-tests/fixtures/helper/helper.js                          | 4 ++--
 node-tests/fixtures/helper/mu-helper.js                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/blueprints/helper/files/__root__/__collection__/__name__.js b/blueprints/helper/files/__root__/__collection__/__name__.js
index c127f0fc431..4a8d40d6799 100644
--- a/blueprints/helper/files/__root__/__collection__/__name__.js
+++ b/blueprints/helper/files/__root__/__collection__/__name__.js
@@ -1,5 +1,5 @@
 import { helper } from '@ember/component/helper';
 
-export default helper(function <%= camelizedModuleName %>(params/*, hash*/) {
-  return params;
+export default helper(function <%= camelizedModuleName %>(positional/*, named*/) {
+  return positional;
 });
diff --git a/blueprints/helper/mu-files/__root__/__collection__/__name__.js b/blueprints/helper/mu-files/__root__/__collection__/__name__.js
index 28a6eb4764f..dcfd120c8f6 100644
--- a/blueprints/helper/mu-files/__root__/__collection__/__name__.js
+++ b/blueprints/helper/mu-files/__root__/__collection__/__name__.js
@@ -1,7 +1,7 @@
 import { helper as buildHelper } from '@ember/component/helper';
 
-export function <%= camelizedModuleName %>(params/*, hash*/) {
-  return params;
+export function <%= camelizedModuleName %>(positional/*, named*/) {
+  return positional;
 }
 
 export const helper = buildHelper(<%= camelizedModuleName %>);
diff --git a/node-tests/fixtures/helper/helper.js b/node-tests/fixtures/helper/helper.js
index 9d72f6faf61..a28d3cabcd6 100644
--- a/node-tests/fixtures/helper/helper.js
+++ b/node-tests/fixtures/helper/helper.js
@@ -1,5 +1,5 @@
 import { helper } from '@ember/component/helper';
 
-export default helper(function fooBarBaz(params/*, hash*/) {
-  return params;
+export default helper(function fooBarBaz(positional/*, named*/) {
+  return positional;
 });
diff --git a/node-tests/fixtures/helper/mu-helper.js b/node-tests/fixtures/helper/mu-helper.js
index 316750779c1..e4fe6b2b4c5 100644
--- a/node-tests/fixtures/helper/mu-helper.js
+++ b/node-tests/fixtures/helper/mu-helper.js
@@ -1,7 +1,7 @@
 import { helper as buildHelper } from '@ember/component/helper';
 
-export function fooBarBaz(params/*, hash*/) {
-  return params;
+export function fooBarBaz(positional/*, named*/) {
+  return positional;
 }
 
 export const helper = buildHelper(fooBarBaz);

From aece1dc771b8d85ec7ae45fc9353ce98d4f4918e Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 17 Mar 2021 11:41:25 -0700
Subject: [PATCH 0433/1405] [BUGFIX] Rename private runloop functions

We currently export a few private functions from `@ember/runloop` for
packages like `@ember/test-helpers`. These functions are not public API,
but need to be accessible for these core packages. Previously they were
exposed on the private APIs of the global `run`, but now that we're
getting rid of the the modules transform these are now exposed directly,
so underscoring them should help make users aware that they are not
meant for public consumption.
---
 .../extension-support/lib/data_adapter.js     |  8 +--
 .../-internals/glimmer/lib/environment.ts     |  4 +-
 .../@ember/-internals/glimmer/lib/renderer.ts | 16 +++---
 .../integration/event-dispatcher-test.js      |  4 +-
 .../helpers/closure-action-test.js            |  4 +-
 .../@ember/-internals/runtime/lib/ext/rsvp.js |  6 +--
 packages/@ember/runloop/index.d.ts            |  4 +-
 packages/@ember/runloop/index.js              | 54 +++++++++----------
 packages/@ember/runloop/tests/later_test.js   | 24 ++++-----
 packages/@ember/runloop/tests/next_test.js    | 10 ++--
 packages/@ember/runloop/tests/once_test.js    |  4 +-
 .../@ember/runloop/tests/run_bind_test.js     |  6 +--
 .../@ember/runloop/tests/schedule_test.js     | 14 ++---
 packages/@ember/runloop/tests/unwind_test.js  | 10 ++--
 packages/ember-testing/lib/ext/rsvp.js        |  8 +--
 packages/ember-testing/lib/helpers/wait.js    |  4 +-
 packages/ember-testing/lib/test/run.js        |  4 +-
 packages/ember-testing/tests/ext/rsvp_test.js |  4 +-
 .../ember/tests/ember-test-helpers-test.js    |  4 +-
 packages/ember/tests/reexports_test.js        |  8 +--
 .../lib/ember-dev/run-loop.ts                 | 12 ++---
 packages/internal-test-helpers/lib/run.ts     |  6 +--
 22 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.js
index d95eece596c..ba39906d6e5 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.js
@@ -1,5 +1,5 @@
 import { getOwner } from '@ember/-internals/owner';
-import { backburner } from '@ember/runloop';
+import { _backburner } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
 import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
@@ -364,10 +364,10 @@ export default EmberObject.extend({
           this.recordsWatchers.forEach((watcher) => watcher.revalidate());
         };
 
-        backburner.on('end', this.flushWatchers);
+        _backburner.on('end', this.flushWatchers);
       }
     } else if (this.typeWatchers.size === 0 && this.recordsWatchers.size === 0) {
-      backburner.off('end', this.flushWatchers);
+      _backburner.off('end', this.flushWatchers);
       this.flushWatchers = null;
     }
   },
@@ -386,7 +386,7 @@ export default EmberObject.extend({
     this.releaseMethods.forEach((fn) => fn());
 
     if (this.flushWatchers) {
-      backburner.off('end', this.flushWatchers);
+      _backburner.off('end', this.flushWatchers);
     }
   },
 
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index e77ff4fb192..5e420176c3a 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -5,7 +5,7 @@ import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { assert, deprecate, warn } from '@ember/debug';
 import { DeprecationOptions } from '@ember/debug/lib/deprecate';
-import { backburner, schedule } from '@ember/runloop';
+import { _backburner, schedule } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
 import { EnvironmentDelegate } from '@glimmer/runtime';
@@ -20,7 +20,7 @@ import toBool from './utils/to-bool';
 
 setGlobalContext({
   scheduleRevalidate() {
-    backburner.ensureInstance();
+    _backburner.ensureInstance();
   },
 
   toBool,
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 0dff6d095da..e4c5fe0be4d 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -2,7 +2,7 @@ import { ENV } from '@ember/-internals/environment';
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
-import { backburner, getCurrentRunLoop } from '@ember/runloop';
+import { _backburner, _getCurrentRunLoop } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -229,9 +229,9 @@ export function renderSettled() {
     renderSettledDeferred = RSVP.defer();
     // if there is no current runloop, the promise created above will not have
     // a chance to resolve (because its resolved in backburner's "end" event)
-    if (!getCurrentRunLoop()) {
+    if (!_getCurrentRunLoop()) {
       // ensure a runloop has been kicked off
-      backburner.schedule('actions', null, K);
+      _backburner.schedule('actions', null, K);
     }
   }
 
@@ -243,7 +243,7 @@ function resolveRenderPromise() {
     let resolve = renderSettledDeferred.resolve;
     renderSettledDeferred = null;
 
-    backburner.join(null, resolve);
+    _backburner.join(null, resolve);
   }
 }
 
@@ -258,15 +258,15 @@ function loopEnd() {
         throw new Error('infinite rendering invalidation detected');
       }
       loops++;
-      return backburner.join(null, K);
+      return _backburner.join(null, K);
     }
   }
   loops = 0;
   resolveRenderPromise();
 }
 
-backburner.on('begin', loopBegin);
-backburner.on('end', loopEnd);
+_backburner.on('begin', loopBegin);
+_backburner.on('end', loopEnd);
 
 interface ViewRegistry {
   [viewId: string]: unknown;
@@ -574,7 +574,7 @@ export class Renderer {
   }
 
   _scheduleRevalidate(): void {
-    backburner.scheduleOnce('render', this, this._revalidate);
+    _backburner.scheduleOnce('render', this, this._revalidate);
   }
 
   _isValid(): boolean {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index bcd370ca59b..a661fe1e590 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -1,7 +1,7 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
 import { Component } from '../utils/helpers';
-import { getCurrentRunLoop, run } from '@ember/runloop';
+import { _getCurrentRunLoop, run } from '@ember/runloop';
 import {
   subscribe as instrumentationSubscribe,
   reset as instrumentationReset,
@@ -164,7 +164,7 @@ moduleFor(
       this.registerComponent('x-foo', {
         ComponentClass: Component.extend({
           change() {
-            assert.ok(getCurrentRunLoop(), 'a run loop should have started');
+            assert.ok(_getCurrentRunLoop(), 'a run loop should have started');
           },
         }),
         template: `<input id="is-done" type="checkbox">`,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index b08c701407f..dc097913c40 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -4,7 +4,7 @@ import {
   subscribe as instrumentationSubscribe,
   unsubscribe as instrumentationUnsubscribe,
 } from '@ember/instrumentation';
-import { getCurrentRunLoop } from '@ember/runloop';
+import { _getCurrentRunLoop } from '@ember/runloop';
 import { set, computed } from '@ember/-internals/metal';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 
@@ -1019,7 +1019,7 @@ moduleFor(
       let OuterComponent = Component.extend({
         actions: {
           submit() {
-            capturedRunLoop = getCurrentRunLoop();
+            capturedRunLoop = _getCurrentRunLoop();
           },
         },
       });
diff --git a/packages/@ember/-internals/runtime/lib/ext/rsvp.js b/packages/@ember/-internals/runtime/lib/ext/rsvp.js
index e4cc58389a0..e6bbfc241e5 100644
--- a/packages/@ember/-internals/runtime/lib/ext/rsvp.js
+++ b/packages/@ember/-internals/runtime/lib/ext/rsvp.js
@@ -1,14 +1,14 @@
 import * as RSVP from 'rsvp';
-import { backburner, _rsvpErrorQueue } from '@ember/runloop';
+import { _backburner, _rsvpErrorQueue } from '@ember/runloop';
 import { getDispatchOverride } from '@ember/-internals/error-handling';
 import { assert } from '@ember/debug';
 
 RSVP.configure('async', (callback, promise) => {
-  backburner.schedule('actions', null, callback, promise);
+  _backburner.schedule('actions', null, callback, promise);
 });
 
 RSVP.configure('after', (cb) => {
-  backburner.schedule(_rsvpErrorQueue, null, cb);
+  _backburner.schedule(_rsvpErrorQueue, null, cb);
 });
 
 RSVP.on('error', onerrorDefault);
diff --git a/packages/@ember/runloop/index.d.ts b/packages/@ember/runloop/index.d.ts
index 16dc7237d7e..b7b9da7e5f7 100644
--- a/packages/@ember/runloop/index.d.ts
+++ b/packages/@ember/runloop/index.d.ts
@@ -1,6 +1,6 @@
 import { Backburner, DeferredActionQueues, Timer } from 'backburner.js';
 
-export const backburner: Backburner;
+export const _backburner: Backburner;
 
 export const run = Backburner.run;
 export const schedule = Backburner.schedule;
@@ -9,7 +9,7 @@ export const join = Backburner.join;
 export const cancel = Backburner.cancel;
 export const scheduleOnce = Backburner.scheduleOnce;
 
-export function getCurrentRunLoop(): DeferredActionQueues;
+export function _getCurrentRunLoop(): DeferredActionQueues;
 
 export function once(method: Function): Timer;
 export function once<T, U extends keyof T>(target: T, method: U, ...args): Timer;
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index c2f848f1546..d3ae2d1e780 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -5,7 +5,7 @@ import { flushAsyncObservers } from '@ember/-internals/metal';
 import Backburner from 'backburner';
 
 let currentRunLoop = null;
-export function getCurrentRunLoop() {
+export function _getCurrentRunLoop() {
   return currentRunLoop;
 }
 
@@ -40,7 +40,7 @@ export const _rsvpErrorQueue = `${Math.random()}${Date.now()}`.replace('.', '');
   @default ['actions', 'destroy']
   @private
 */
-export const queues = [
+export const _queues = [
   'actions',
 
   // used in router transitions to prevent unnecessary loading state entry
@@ -56,7 +56,7 @@ export const queues = [
   _rsvpErrorQueue,
 ];
 
-export const backburner = new Backburner(queues, {
+export const _backburner = new Backburner(_queues, {
   defaultQueue: 'actions',
   onBegin,
   onEnd,
@@ -101,7 +101,7 @@ export const backburner = new Backburner(queues, {
   @public
 */
 export function run() {
-  return backburner.run(...arguments);
+  return _backburner.run(...arguments);
 }
 
 /**
@@ -149,7 +149,7 @@ export function run() {
   @public
 */
 export function join() {
-  return backburner.join(...arguments);
+  return _backburner.join(...arguments);
 }
 
 /**
@@ -259,7 +259,7 @@ export const bind = (...curried) => {
   @public
 */
 export function begin() {
-  backburner.begin();
+  _backburner.begin();
 }
 
 /**
@@ -282,7 +282,7 @@ export function begin() {
   @public
 */
 export function end() {
-  backburner.end();
+  _backburner.end();
 }
 
 /**
@@ -327,17 +327,17 @@ export function end() {
   @public
 */
 export function schedule(/* queue, target, method */) {
-  return backburner.schedule(...arguments);
+  return _backburner.schedule(...arguments);
 }
 
 // Used by global test teardown
-export function hasScheduledTimers() {
-  return backburner.hasTimers();
+export function _hasScheduledTimers() {
+  return _backburner.hasTimers();
 }
 
 // Used by global test teardown
-export function cancelTimers() {
-  backburner.cancelTimers();
+export function _cancelTimers() {
+  _backburner.cancelTimers();
 }
 
 /**
@@ -371,7 +371,7 @@ export function cancelTimers() {
   @public
 */
 export function later(/*target, method*/) {
-  return backburner.later(...arguments);
+  return _backburner.later(...arguments);
 }
 
 /**
@@ -391,7 +391,7 @@ export function later(/*target, method*/) {
 */
 export function once(...args) {
   args.unshift('actions');
-  return backburner.scheduleOnce(...args);
+  return _backburner.scheduleOnce(...args);
 }
 
 /**
@@ -467,7 +467,7 @@ export function once(...args) {
   @public
 */
 export function scheduleOnce(/* queue, target, method*/) {
-  return backburner.scheduleOnce(...arguments);
+  return _backburner.scheduleOnce(...arguments);
 }
 
 /**
@@ -542,7 +542,7 @@ export function scheduleOnce(/* queue, target, method*/) {
 */
 export function next(...args) {
   args.push(1);
-  return backburner.later(...args);
+  return _backburner.later(...args);
 }
 
 /**
@@ -613,7 +613,7 @@ export function next(...args) {
   @public
 */
 export function cancel(timer) {
-  return backburner.cancel(timer);
+  return _backburner.cancel(timer);
 }
 
 /**
@@ -691,7 +691,7 @@ export function cancel(timer) {
   @public
 */
 export function debounce() {
-  return backburner.debounce(...arguments);
+  return _backburner.debounce(...arguments);
 }
 
 /**
@@ -738,7 +738,7 @@ export function debounce() {
   @public
 */
 export function throttle() {
-  return backburner.throttle(...arguments);
+  return _backburner.throttle(...arguments);
 }
 
 export let _deprecatedGlobalGetCurrentRunLoop;
@@ -780,16 +780,16 @@ if (DEBUG) {
       }
     );
 
-    return getCurrentRunLoop();
+    return _getCurrentRunLoop();
   };
 
-  defineDeprecatedRunloopFunc('backburner', backburner);
+  defineDeprecatedRunloopFunc('backburner', _backburner);
   defineDeprecatedRunloopFunc('begin', begin);
   defineDeprecatedRunloopFunc('bind', bind);
   defineDeprecatedRunloopFunc('cancel', cancel);
   defineDeprecatedRunloopFunc('debounce', debounce);
   defineDeprecatedRunloopFunc('end', end);
-  defineDeprecatedRunloopFunc('hasScheduledTimers', hasScheduledTimers);
+  defineDeprecatedRunloopFunc('hasScheduledTimers', _hasScheduledTimers);
   defineDeprecatedRunloopFunc('join', join);
   defineDeprecatedRunloopFunc('later', later);
   defineDeprecatedRunloopFunc('next', next);
@@ -797,19 +797,19 @@ if (DEBUG) {
   defineDeprecatedRunloopFunc('schedule', schedule);
   defineDeprecatedRunloopFunc('scheduleOnce', scheduleOnce);
   defineDeprecatedRunloopFunc('throttle', throttle);
-  defineDeprecatedRunloopFunc('cancelTimers', cancelTimers);
+  defineDeprecatedRunloopFunc('cancelTimers', _cancelTimers);
   Object.defineProperty(run, 'currentRunLoop', {
     get: _deprecatedGlobalGetCurrentRunLoop,
     enumerable: false,
   });
 } else {
-  run.backburner = backburner;
+  run.backburner = _backburner;
   run.begin = begin;
   run.bind = bind;
   run.cancel = cancel;
   run.debounce = debounce;
   run.end = end;
-  run.hasScheduledTimers = hasScheduledTimers;
+  run.hasScheduledTimers = _hasScheduledTimers;
   run.join = join;
   run.later = later;
   run.next = next;
@@ -817,9 +817,9 @@ if (DEBUG) {
   run.schedule = schedule;
   run.scheduleOnce = scheduleOnce;
   run.throttle = throttle;
-  run.cancelTimers = cancelTimers;
+  run.cancelTimers = _cancelTimers;
   Object.defineProperty(run, 'currentRunLoop', {
-    get: getCurrentRunLoop,
+    get: _getCurrentRunLoop,
     enumerable: false,
   });
 }
diff --git a/packages/@ember/runloop/tests/later_test.js b/packages/@ember/runloop/tests/later_test.js
index 5a5181545cd..89f19ead224 100644
--- a/packages/@ember/runloop/tests/later_test.js
+++ b/packages/@ember/runloop/tests/later_test.js
@@ -1,14 +1,14 @@
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { assign } from '@ember/polyfills';
-import { run, later, backburner, hasScheduledTimers, getCurrentRunLoop } from '..';
+import { run, later, _backburner, _hasScheduledTimers, _getCurrentRunLoop } from '..';
 
 const originalSetTimeout = window.setTimeout;
 const originalDateValueOf = Date.prototype.valueOf;
-const originalPlatform = backburner._platform;
+const originalPlatform = _backburner._platform;
 
 function wait(callback, maxWaitCount = 100) {
   originalSetTimeout(() => {
-    if (maxWaitCount > 0 && (hasScheduledTimers() || getCurrentRunLoop())) {
+    if (maxWaitCount > 0 && (_hasScheduledTimers() || _getCurrentRunLoop())) {
       wait(callback, maxWaitCount - 1);
 
       return;
@@ -35,7 +35,7 @@ moduleFor(
   'run.later',
   class extends AbstractTestCase {
     teardown() {
-      backburner._platform = originalPlatform;
+      _backburner._platform = originalPlatform;
       window.setTimeout = originalSetTimeout;
       Date.prototype.valueOf = originalDateValueOf;
     }
@@ -101,13 +101,13 @@ moduleFor(
       let firstRunLoop, secondRunLoop;
 
       run(() => {
-        firstRunLoop = getCurrentRunLoop();
+        firstRunLoop = _getCurrentRunLoop();
 
         later(
           obj,
           function (amt) {
             this.invoked += amt;
-            secondRunLoop = getCurrentRunLoop();
+            secondRunLoop = _getCurrentRunLoop();
           },
           10,
           1
@@ -117,7 +117,7 @@ moduleFor(
       });
 
       assert.ok(firstRunLoop, 'first run loop captured');
-      assert.ok(!getCurrentRunLoop(), "shouldn't be in a run loop after flush");
+      assert.ok(!_getCurrentRunLoop(), "shouldn't be in a run loop after flush");
       assert.equal(obj.invoked, 0, "shouldn't have invoked later item yet");
 
       wait(() => {
@@ -191,19 +191,19 @@ moduleFor(
       let runLoop, finished;
 
       run(() => {
-        runLoop = getCurrentRunLoop();
+        runLoop = _getCurrentRunLoop();
         assert.ok(runLoop);
 
         later(() => {
           assert.ok(
-            getCurrentRunLoop() && getCurrentRunLoop() !== runLoop,
+            _getCurrentRunLoop() && _getCurrentRunLoop() !== runLoop,
             'first later callback has own run loop'
           );
-          runLoop = getCurrentRunLoop();
+          runLoop = _getCurrentRunLoop();
 
           later(() => {
             assert.ok(
-              getCurrentRunLoop() && getCurrentRunLoop() !== runLoop,
+              _getCurrentRunLoop() && _getCurrentRunLoop() !== runLoop,
               'second later callback has own run loop'
             );
             finished = true;
@@ -226,7 +226,7 @@ moduleFor(
       // happens when an expired timer callback takes a while to run,
       // which is what we simulate here.
       let newSetTimeoutUsed;
-      backburner._platform = assign({}, originalPlatform, {
+      _backburner._platform = assign({}, originalPlatform, {
         setTimeout() {
           let wait = arguments[arguments.length - 1];
           newSetTimeoutUsed = true;
diff --git a/packages/@ember/runloop/tests/next_test.js b/packages/@ember/runloop/tests/next_test.js
index f05e8897091..124b822ba2f 100644
--- a/packages/@ember/runloop/tests/next_test.js
+++ b/packages/@ember/runloop/tests/next_test.js
@@ -1,4 +1,4 @@
-import { run, next, getCurrentRunLoop } from '..';
+import { run, next, _getCurrentRunLoop } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -22,8 +22,8 @@ moduleFor(
       let done = assert.async();
       let firstRunLoop, secondRunLoop;
       run(() => {
-        firstRunLoop = getCurrentRunLoop();
-        next(() => (secondRunLoop = getCurrentRunLoop()));
+        firstRunLoop = _getCurrentRunLoop();
+        next(() => (secondRunLoop = _getCurrentRunLoop()));
       });
 
       setTimeout(() => {
@@ -40,8 +40,8 @@ moduleFor(
       let done = assert.async();
       let secondRunLoop, thirdRunLoop;
       run(() => {
-        next(() => (secondRunLoop = getCurrentRunLoop()));
-        next(() => (thirdRunLoop = getCurrentRunLoop()));
+        next(() => (secondRunLoop = _getCurrentRunLoop()));
+        next(() => (thirdRunLoop = _getCurrentRunLoop()));
       });
 
       setTimeout(() => {
diff --git a/packages/@ember/runloop/tests/once_test.js b/packages/@ember/runloop/tests/once_test.js
index 8392c781fbe..484e182b94a 100644
--- a/packages/@ember/runloop/tests/once_test.js
+++ b/packages/@ember/runloop/tests/once_test.js
@@ -1,4 +1,4 @@
-import { run, getCurrentRunLoop, once } from '..';
+import { run, _getCurrentRunLoop, once } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -55,7 +55,7 @@ moduleFor(
 
     ['@test should be inside of a runloop when running'](assert) {
       run(() => {
-        once(() => assert.ok(Boolean(getCurrentRunLoop()), 'should have a runloop'));
+        once(() => assert.ok(Boolean(_getCurrentRunLoop()), 'should have a runloop'));
       });
     }
   }
diff --git a/packages/@ember/runloop/tests/run_bind_test.js b/packages/@ember/runloop/tests/run_bind_test.js
index 505c9bd4ab8..62af01434e2 100644
--- a/packages/@ember/runloop/tests/run_bind_test.js
+++ b/packages/@ember/runloop/tests/run_bind_test.js
@@ -1,4 +1,4 @@
-import { bind, getCurrentRunLoop } from '..';
+import { bind, _getCurrentRunLoop } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -10,7 +10,7 @@ moduleFor(
       let obj = {
         value: 0,
         increment(increment) {
-          assert.ok(getCurrentRunLoop(), 'expected a run-loop');
+          assert.ok(_getCurrentRunLoop(), 'expected a run-loop');
           return (this.value += increment);
         },
       };
@@ -24,7 +24,7 @@ moduleFor(
       assert.expect(4);
 
       function asyncCallback(increment, increment2, increment3) {
-        assert.ok(getCurrentRunLoop(), 'expected a run-loop');
+        assert.ok(_getCurrentRunLoop(), 'expected a run-loop');
         assert.equal(increment, 1);
         assert.equal(increment2, 2);
         assert.equal(increment3, 3);
diff --git a/packages/@ember/runloop/tests/schedule_test.js b/packages/@ember/runloop/tests/schedule_test.js
index 2368c5314f3..a712263b3b3 100644
--- a/packages/@ember/runloop/tests/schedule_test.js
+++ b/packages/@ember/runloop/tests/schedule_test.js
@@ -1,4 +1,4 @@
-import { run, cancel, schedule, getCurrentRunLoop } from '..';
+import { run, cancel, schedule, _getCurrentRunLoop } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -47,32 +47,32 @@ moduleFor(
       let order = [];
 
       run(() => {
-        let runLoop = getCurrentRunLoop();
+        let runLoop = _getCurrentRunLoop();
         assert.ok(runLoop, 'run loop present');
 
         schedule('actions', () => {
           order.push('actions');
-          assert.equal(runLoop, getCurrentRunLoop(), 'same run loop used');
+          assert.equal(runLoop, _getCurrentRunLoop(), 'same run loop used');
         });
 
         schedule('afterRender', () => {
           order.push('afterRender');
-          assert.equal(runLoop, getCurrentRunLoop(), 'same run loop used');
+          assert.equal(runLoop, _getCurrentRunLoop(), 'same run loop used');
 
           schedule('afterRender', () => {
             order.push('afterRender');
-            assert.equal(runLoop, getCurrentRunLoop(), 'same run loop used');
+            assert.equal(runLoop, _getCurrentRunLoop(), 'same run loop used');
           });
 
           schedule('actions', () => {
             order.push('actions');
-            assert.equal(runLoop, getCurrentRunLoop(), 'same run loop used');
+            assert.equal(runLoop, _getCurrentRunLoop(), 'same run loop used');
           });
         });
 
         schedule('destroy', () => {
           order.push('destroy');
-          assert.equal(runLoop, getCurrentRunLoop(), 'same run loop used');
+          assert.equal(runLoop, _getCurrentRunLoop(), 'same run loop used');
         });
       });
 
diff --git a/packages/@ember/runloop/tests/unwind_test.js b/packages/@ember/runloop/tests/unwind_test.js
index d551a355356..06a7f87da42 100644
--- a/packages/@ember/runloop/tests/unwind_test.js
+++ b/packages/@ember/runloop/tests/unwind_test.js
@@ -1,4 +1,4 @@
-import { run, schedule, getCurrentRunLoop } from '..';
+import { run, schedule, _getCurrentRunLoop } from '..';
 import EmberError from '@ember/error';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
@@ -6,7 +6,7 @@ moduleFor(
   'system/run_loop/unwind_test',
   class extends AbstractTestCase {
     ['@test RunLoop unwinds despite unhandled exception'](assert) {
-      let initialRunLoop = getCurrentRunLoop();
+      let initialRunLoop = _getCurrentRunLoop();
 
       assert.throws(
         () => {
@@ -25,14 +25,14 @@ moduleFor(
       // flushed. I can't easily demonstrate this in a unit test because
       // autorun explicitly doesn't work in test mode. - ef4
       assert.equal(
-        getCurrentRunLoop(),
+        _getCurrentRunLoop(),
         initialRunLoop,
         'Previous run loop should be cleaned up despite exception'
       );
     }
 
     ['@test run unwinds despite unhandled exception'](assert) {
-      let initialRunLoop = getCurrentRunLoop();
+      let initialRunLoop = _getCurrentRunLoop();
 
       assert.throws(
         () => {
@@ -45,7 +45,7 @@ moduleFor(
       );
 
       assert.equal(
-        getCurrentRunLoop(),
+        _getCurrentRunLoop(),
         initialRunLoop,
         'Previous run loop should be cleaned up despite exception'
       );
diff --git a/packages/ember-testing/lib/ext/rsvp.js b/packages/ember-testing/lib/ext/rsvp.js
index 1c67abfb2b2..814a40a5f0f 100644
--- a/packages/ember-testing/lib/ext/rsvp.js
+++ b/packages/ember-testing/lib/ext/rsvp.js
@@ -1,18 +1,18 @@
 import { RSVP } from '@ember/-internals/runtime';
-import { backburner } from '@ember/runloop';
+import { _backburner } from '@ember/runloop';
 import { isTesting } from '@ember/debug';
 import { asyncStart, asyncEnd } from '../test/adapter';
 
 RSVP.configure('async', function (callback, promise) {
   // if schedule will cause autorun, we need to inform adapter
-  if (isTesting() && !backburner.currentInstance) {
+  if (isTesting() && !_backburner.currentInstance) {
     asyncStart();
-    backburner.schedule('actions', () => {
+    _backburner.schedule('actions', () => {
       asyncEnd();
       callback(promise);
     });
   } else {
-    backburner.schedule('actions', () => callback(promise));
+    _backburner.schedule('actions', () => callback(promise));
   }
 });
 
diff --git a/packages/ember-testing/lib/helpers/wait.js b/packages/ember-testing/lib/helpers/wait.js
index 9ae293cf586..232a76ab9ce 100644
--- a/packages/ember-testing/lib/helpers/wait.js
+++ b/packages/ember-testing/lib/helpers/wait.js
@@ -3,7 +3,7 @@
 */
 import { checkWaiters } from '../test/waiters';
 import { RSVP } from '@ember/-internals/runtime';
-import { getCurrentRunLoop, hasScheduledTimers, run } from '@ember/runloop';
+import { _getCurrentRunLoop, _hasScheduledTimers, run } from '@ember/runloop';
 import { pendingRequests } from '../test/pending_requests';
 
 /**
@@ -55,7 +55,7 @@ export default function wait(app, value) {
       }
 
       // 3. If there are scheduled timers or we are inside of a run loop, keep polling
-      if (hasScheduledTimers() || getCurrentRunLoop()) {
+      if (_hasScheduledTimers() || _getCurrentRunLoop()) {
         return;
       }
 
diff --git a/packages/ember-testing/lib/test/run.js b/packages/ember-testing/lib/test/run.js
index e721f3fdd46..d8bcd0592f4 100644
--- a/packages/ember-testing/lib/test/run.js
+++ b/packages/ember-testing/lib/test/run.js
@@ -1,7 +1,7 @@
-import { getCurrentRunLoop, run as emberRun } from '@ember/runloop';
+import { _getCurrentRunLoop, run as emberRun } from '@ember/runloop';
 
 export default function run(fn) {
-  if (!getCurrentRunLoop()) {
+  if (!_getCurrentRunLoop()) {
     return emberRun(fn);
   } else {
     return fn();
diff --git a/packages/ember-testing/tests/ext/rsvp_test.js b/packages/ember-testing/tests/ext/rsvp_test.js
index 9c5e5267383..2e6482a94a0 100644
--- a/packages/ember-testing/tests/ext/rsvp_test.js
+++ b/packages/ember-testing/tests/ext/rsvp_test.js
@@ -1,7 +1,7 @@
 import RSVP from '../../lib/ext/rsvp';
 import { getAdapter, setAdapter } from '../../lib/test/adapter';
 import TestPromise, { getLastPromise } from '../../lib/test/promise';
-import { getCurrentRunLoop } from '@ember/runloop';
+import { _getCurrentRunLoop } from '@ember/runloop';
 import { isTesting, setTesting } from '@ember/debug';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
@@ -40,7 +40,7 @@ moduleFor(
       let done = assert.async();
       assert.expect(19);
 
-      assert.ok(!getCurrentRunLoop(), 'expect no run-loop');
+      assert.ok(!_getCurrentRunLoop(), 'expect no run-loop');
 
       setTesting(true);
 
diff --git a/packages/ember/tests/ember-test-helpers-test.js b/packages/ember/tests/ember-test-helpers-test.js
index a6b16625a4d..67d0769490e 100644
--- a/packages/ember/tests/ember-test-helpers-test.js
+++ b/packages/ember/tests/ember-test-helpers-test.js
@@ -1,6 +1,6 @@
 import { Promise } from 'rsvp';
 import Application from '@ember/application';
-import { run, hasScheduledTimers, getCurrentRunLoop } from '@ember/runloop';
+import { run, _hasScheduledTimers, _getCurrentRunLoop } from '@ember/runloop';
 import { compile } from 'ember-template-compiler';
 import { ModuleBasedTestResolver } from 'internal-test-helpers';
 
@@ -22,7 +22,7 @@ module('@ember/test-helpers emulation test', function () {
     function settled() {
       return new Promise(function (resolve) {
         let watcher = setInterval(() => {
-          if (getCurrentRunLoop() || hasScheduledTimers()) {
+          if (_getCurrentRunLoop() || _hasScheduledTimers()) {
             return;
           }
 
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 720f95939cf..ae0520e23d9 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -401,13 +401,13 @@ let allExports = [
 
   // @ember/runloop
   ['run', '@ember/runloop', 'run'],
-  ['run.backburner', '@ember/runloop', 'backburner', true],
+  ['run.backburner', '@ember/runloop', '_backburner', true],
   ['run.begin', '@ember/runloop', 'begin', true],
   ['run.bind', '@ember/runloop', 'bind', true],
   ['run.cancel', '@ember/runloop', 'cancel', true],
   ['run.debounce', '@ember/runloop', 'debounce', true],
   ['run.end', '@ember/runloop', 'end', true],
-  ['run.hasScheduledTimers', '@ember/runloop', 'hasScheduledTimers', true],
+  ['run.hasScheduledTimers', '@ember/runloop', '_hasScheduledTimers', true],
   ['run.join', '@ember/runloop', 'join', true],
   ['run.later', '@ember/runloop', 'later', true],
   ['run.next', '@ember/runloop', 'next', true],
@@ -418,10 +418,10 @@ let allExports = [
   [
     'run.currentRunLoop',
     '@ember/runloop',
-    { get: DEBUG ? '_deprecatedGlobalGetCurrentRunLoop' : 'getCurrentRunLoop' },
+    { get: DEBUG ? '_deprecatedGlobalGetCurrentRunLoop' : '_getCurrentRunLoop' },
     true,
   ],
-  ['run.cancelTimers', '@ember/runloop', 'cancelTimers', true],
+  ['run.cancelTimers', '@ember/runloop', '_cancelTimers', true],
 
   // @ember/service
   ['Service', '@ember/service', 'default'],
diff --git a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
index 3eee140c732..95ee33ef5d6 100644
--- a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
@@ -1,9 +1,9 @@
 // @ts-ignore
-import { cancelTimers, end, getCurrentRunLoop, hasScheduledTimers } from '@ember/runloop';
+import { _cancelTimers, _getCurrentRunLoop, _hasScheduledTimers, end } from '@ember/runloop';
 
 export function setupRunLoopCheck(hooks: NestedHooks) {
   hooks.afterEach(function (assert) {
-    if (getCurrentRunLoop() || hasScheduledTimers()) {
+    if (_getCurrentRunLoop() || _hasScheduledTimers()) {
       let done = assert.async();
       // use a setTimeout to allow the current run loop to flush via autorun
       setTimeout(() => {
@@ -14,16 +14,16 @@ export function setupRunLoopCheck(hooks: NestedHooks) {
 
         // if it is _still_ not completed, we have a problem and the test should be fixed
         assert.ok(
-          !hasScheduledTimers(),
+          !_hasScheduledTimers(),
           'Ember run should not have scheduled timers at end of test'
         );
-        assert.ok(!getCurrentRunLoop(), 'Should not be in a run loop at end of test');
+        assert.ok(!_getCurrentRunLoop(), 'Should not be in a run loop at end of test');
 
         // attempt to recover so the rest of the tests can run
-        while (getCurrentRunLoop()) {
+        while (_getCurrentRunLoop()) {
           end();
         }
-        cancelTimers();
+        _cancelTimers();
 
         done();
       }, 0);
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index f8f7e93874f..5c5db9d074a 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -1,7 +1,7 @@
 import {
-  getCurrentRunLoop,
+  _getCurrentRunLoop,
   // @ts-ignore
-  hasScheduledTimers,
+  _hasScheduledTimers,
   // @ts-ignore
   next,
   run,
@@ -35,7 +35,7 @@ export function runLoopSettled(event?: any): Promise<void> {
     // Every 5ms, poll for the async thing to have finished
     let watcher = setInterval(() => {
       // If there are scheduled timers or we are inside of a run loop, keep polling
-      if (hasScheduledTimers() || getCurrentRunLoop()) {
+      if (_hasScheduledTimers() || _getCurrentRunLoop()) {
         return;
       }
 

From a80b54ebbb28ef746abbd0e332d34fe6e93001b8 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 17 Mar 2021 17:01:02 -0700
Subject: [PATCH 0434/1405] [FEATURE] Remove globals namespace based toString

Removes the legacy `toString` behavior and replaces it with using the
factory for/container system for classes when possible, and just
`unknown` when not.
---
 .../-internals/container/lib/container.ts     |  8 +-
 .../-internals/container/lib/registry.ts      |  2 +-
 packages/@ember/-internals/metal/index.ts     |  1 -
 packages/@ember/-internals/metal/lib/mixin.ts |  4 +-
 .../-internals/metal/lib/namespace_search.ts  | 43 +--------
 .../metal/tests/namespace_search_test.js      |  2 +-
 packages/@ember/-internals/owner/index.ts     |  1 +
 .../routing/tests/system/route_test.js        |  2 +-
 .../runtime/lib/system/core_object.js         | 28 +++---
 .../-internals/runtime/lib/system/object.js   |  4 +-
 .../tests/system/namespace/base_test.js       | 28 +++---
 .../tests/system/object/toString_test.js      | 95 +------------------
 .../@ember/application/globals-resolver.js    |  9 +-
 .../application/tests/application_test.js     |  6 +-
 .../dependency_injection/to_string_test.js    | 72 --------------
 packages/@ember/engine/tests/engine_test.js   |  9 +-
 16 files changed, 61 insertions(+), 253 deletions(-)
 delete mode 100644 packages/@ember/application/tests/dependency_injection/to_string_test.js

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 5d10fb8f106..464cee719f6 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,5 +1,5 @@
 import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
-import { dictionary, HAS_NATIVE_PROXY, symbol } from '@ember/-internals/utils';
+import { dictionary, HAS_NATIVE_PROXY, HAS_NATIVE_SYMBOL, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
@@ -521,7 +521,7 @@ export function getFactoryFor(obj: any): FactoryManager<any, any> {
   return obj[INIT_FACTORY];
 }
 
-export function setFactoryFor(obj: any, factory: FactoryManager<any, any>) {
+export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void {
   obj[INIT_FACTORY] = factory;
 }
 
@@ -548,6 +548,10 @@ class FactoryManager<T, C> {
     this.madeToString = undefined;
     this.injections = undefined;
     setFactoryFor(this, this);
+
+    if (factory && (HAS_NATIVE_SYMBOL || INIT_FACTORY in factory)) {
+      setFactoryFor(factory, this);
+    }
   }
 
   toString(): string {
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 4e657e5544e..8659ac9e2f1 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -362,7 +362,7 @@ export default class Registry implements IRegistry {
     } else if (this.fallback !== null) {
       return this.fallback.makeToString(factory, fullName);
     } else {
-      return factory.toString();
+      return typeof factory === 'string' ? factory : factory.name ?? '(unknown class)';
     }
   }
 
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index ab62c3cae84..37fba150cb2 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -60,7 +60,6 @@ export {
   NAMESPACES,
   NAMESPACES_BY_ID,
   addNamespace,
-  classToString,
   findNamespace,
   findNamespaces,
   processNamespace,
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index c52c31e6640..e2f54685001 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -32,7 +32,7 @@ import {
 } from './decorator';
 import { addListener, removeListener } from './events';
 import expandProperties from './expand_properties';
-import { classToString, setUnprocessedMixins } from './namespace_search';
+import { setUnprocessedMixins } from './namespace_search';
 import { addObserver, removeObserver, revalidateObservers } from './observer';
 import { defineDecorator, defineValue } from './properties';
 
@@ -736,8 +736,6 @@ function buildMixinsArray(mixins: MixinLike[] | undefined): Mixin[] | undefined
 
 type MixinLike = Mixin | { [key: string]: any };
 
-Mixin.prototype.toString = classToString;
-
 if (DEBUG) {
   Object.seal(Mixin.prototype);
 }
diff --git a/packages/@ember/-internals/metal/lib/namespace_search.ts b/packages/@ember/-internals/metal/lib/namespace_search.ts
index 2d076c10c0f..356cb85dc77 100644
--- a/packages/@ember/-internals/metal/lib/namespace_search.ts
+++ b/packages/@ember/-internals/metal/lib/namespace_search.ts
@@ -1,11 +1,6 @@
 import { context } from '@ember/-internals/environment';
 import { getName, setName } from '@ember/-internals/utils';
 
-// TODO, this only depends on context, otherwise it could be in utils
-// move into its own package
-// it is needed by Mixin for classToString
-// maybe move it into environment
-
 const hasOwnProperty = Object.prototype.hasOwnProperty;
 
 let searchDisabled = false;
@@ -94,16 +89,6 @@ export function processAllNamespaces(): void {
   }
 }
 
-export function classToString(this: object): string {
-  let name = getName(this);
-  if (name !== void 0) {
-    return name;
-  }
-  name = calculateToString(this);
-  setName(this, name);
-  return name;
-}
-
 export function isSearchDisabled(): boolean {
   return searchDisabled;
 }
@@ -139,7 +124,7 @@ function _processNamespace(paths: string[], root: Namespace, seen: Set<Namespace
     paths[idx] = key;
 
     // If we have found an unprocessed class
-    if (obj && obj.toString === classToString && getName(obj) === void 0) {
+    if (obj && getName(obj) === void 0) {
       // Replace the class' `toString` with the dot-separated path
       setName(obj, paths.join('.'));
       // Support nested namespaces
@@ -175,29 +160,3 @@ function tryIsNamespace(lookup: { [k: string]: any }, prop: string): Namespace |
     // continue
   }
 }
-
-function calculateToString(target: object): string {
-  let str;
-
-  if (!searchDisabled) {
-    processAllNamespaces();
-
-    str = getName(target);
-    if (str !== void 0) {
-      return str;
-    }
-    let superclass = target;
-    do {
-      superclass = Object.getPrototypeOf(superclass);
-      if (superclass === Function.prototype || superclass === Object.prototype) {
-        break;
-      }
-      str = getName(target);
-      if (str !== void 0) {
-        str = `(subclass of ${str})`;
-        break;
-      }
-    } while (str === void 0);
-  }
-  return str || '(unknown)';
-}
diff --git a/packages/@ember/-internals/metal/tests/namespace_search_test.js b/packages/@ember/-internals/metal/tests/namespace_search_test.js
index bb158f163d2..0e60cf4758a 100644
--- a/packages/@ember/-internals/metal/tests/namespace_search_test.js
+++ b/packages/@ember/-internals/metal/tests/namespace_search_test.js
@@ -8,7 +8,7 @@ moduleFor(
       let mixin = Mixin.create();
       assert.equal(
         mixin.toString(),
-        '(unknown)',
+        '(unknown mixin)',
         'this = null should be handled on Mixin.toString() call'
       );
     }
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 367a99bf8a1..79034ed59ee 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -15,6 +15,7 @@ export interface FactoryClass {
 
 export interface Factory<T, C extends FactoryClass | object = FactoryClass> {
   class?: C;
+  name?: string;
   fullName?: string;
   normalizedName?: string;
   create(props?: { [prop: string]: any }): T;
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 537a57e0454..bcf4bfa32a5 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -124,7 +124,7 @@ moduleFor(
 
       expectAssertion(function () {
         route.model({ post_id: 1 });
-      }, /You used the dynamic segment post_id in your route undefined, but <Ember.Object:ember\d+>.Post did not exist and you did not override your route's `model` hook./);
+      }, /You used the dynamic segment post_id in your route undefined, but <.*:ember\d+>.Post did not exist and you did not override your route's `model` hook./);
 
       runDestroy(owner);
     }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index bc24e5dfbfa..c2262dbb450 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -7,8 +7,6 @@ import { getOwner, LEGACY_OWNER } from '@ember/-internals/owner';
 import { assign } from '@ember/polyfills';
 import {
   guidFor,
-  getName,
-  setName,
   lookupDescriptor,
   inspect,
   makeArray,
@@ -25,7 +23,6 @@ import {
   applyMixin,
   defineProperty,
   descriptorForProperty,
-  classToString,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
   TrackedDescriptor,
@@ -691,11 +688,7 @@ class CoreObject {
     let hasToStringExtension = typeof this.toStringExtension === 'function';
     let extension = hasToStringExtension ? `:${this.toStringExtension()}` : '';
 
-    let ret = `<${getName(this) || getFactoryFor(this) || this.constructor.toString()}:${guidFor(
-      this
-    )}${extension}>`;
-
-    return ret;
+    return `<${getFactoryFor(this) || '(unknown)'}:${guidFor(this)}${extension}>`;
   }
 
   /**
@@ -1092,10 +1085,11 @@ class CoreObject {
     }
     return p;
   }
-}
 
-CoreObject.toString = classToString;
-setName(CoreObject, 'Ember.CoreObject');
+  static toString() {
+    return `<${getFactoryFor(this) || '(unknown)'}:constructor>`;
+  }
+}
 
 CoreObject.isClass = true;
 CoreObject.isMethod = false;
@@ -1223,6 +1217,18 @@ if (!HAS_NATIVE_SYMBOL) {
       instanceFactory.set(this, value);
     },
   });
+
+  Object.defineProperty(CoreObject, INIT_FACTORY, {
+    get() {
+      return instanceFactory.get(this);
+    },
+
+    set(value) {
+      instanceFactory.set(this, value);
+    },
+
+    enumerable: false,
+  });
 }
 
 function implicitInjectionDeprecation(keyName, msg = null) {
diff --git a/packages/@ember/-internals/runtime/lib/system/object.js b/packages/@ember/-internals/runtime/lib/system/object.js
index e789731c3fc..5f29bc2bf06 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.js
+++ b/packages/@ember/-internals/runtime/lib/system/object.js
@@ -3,7 +3,7 @@
 */
 
 import { getFactoryFor } from '@ember/-internals/container';
-import { symbol, setName } from '@ember/-internals/utils';
+import { symbol } from '@ember/-internals/utils';
 import { addListener } from '@ember/-internals/metal';
 import CoreObject from './core_object';
 import Observable from '../mixins/observable';
@@ -27,8 +27,6 @@ export default class EmberObject extends CoreObject {
   }
 }
 
-setName(EmberObject, 'Ember.Object');
-
 Observable.apply(EmberObject.prototype);
 
 export let FrameworkObject;
diff --git a/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js b/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
index c791f2bd173..5c721d6b3a5 100644
--- a/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
@@ -1,7 +1,7 @@
 import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import { get, setNamespaceSearchDisabled } from '@ember/-internals/metal';
-import { guidFor } from '@ember/-internals/utils';
+import { guidFor, getName } from '@ember/-internals/utils';
 import EmberObject from '../../../lib/system/object';
 import Namespace from '../../../lib/system/namespace';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
@@ -62,19 +62,18 @@ moduleFor(
     ['@test Classes under an Namespace are properly named'](assert) {
       let nsA = (lookup.NamespaceA = Namespace.create());
       nsA.Foo = EmberObject.extend();
-      assert.equal(nsA.Foo.toString(), 'NamespaceA.Foo', 'Classes pick up their parent namespace');
+      Namespace.processAll();
+      assert.equal(getName(nsA.Foo), 'NamespaceA.Foo', 'Classes pick up their parent namespace');
 
       nsA.Bar = EmberObject.extend();
-      assert.equal(
-        nsA.Bar.toString(),
-        'NamespaceA.Bar',
-        'New Classes get the naming treatment too'
-      );
+      Namespace.processAll();
+      assert.equal(getName(nsA.Bar), 'NamespaceA.Bar', 'New Classes get the naming treatment too');
 
       let nsB = (lookup.NamespaceB = Namespace.create());
       nsB.Foo = EmberObject.extend();
+      Namespace.processAll();
       assert.equal(
-        nsB.Foo.toString(),
+        getName(nsB.Foo),
         'NamespaceB.Foo',
         'Classes in new namespaces get the naming treatment'
       );
@@ -88,7 +87,8 @@ moduleFor(
 
     ['@test Lowercase namespaces are no longer supported'](assert) {
       let nsC = (lookup.namespaceC = Namespace.create());
-      assert.equal(nsC.toString(), guidFor(nsC));
+      Namespace.processAll();
+      assert.equal(getName(nsC), guidFor(nsC));
     }
 
     ['@test A namespace can be assigned a custom name'](assert) {
@@ -104,13 +104,15 @@ moduleFor(
         nsA.Foo = EmberObject.extend();
         nsB.Foo = EmberObject.extend();
 
+        Namespace.processAll();
+
         assert.equal(
-          nsA.Foo.toString(),
+          getName(nsA.Foo),
           'NamespaceA.Foo',
           "The namespace's name is used when the namespace is not in the lookup object"
         );
         assert.equal(
-          nsB.Foo.toString(),
+          getName(nsB.Foo),
           'CustomNamespaceB.Foo',
           "The namespace's name is used when the namespace is in the lookup object"
         );
@@ -129,8 +131,8 @@ moduleFor(
 
       Namespace.processAll();
 
-      assert.equal(namespace.ClassA.toString(), 'NS.ClassA');
-      assert.equal(namespace.ClassB.toString(), 'NS.ClassB');
+      assert.equal(getName(namespace.ClassA), 'NS.ClassA');
+      assert.equal(getName(namespace.ClassB), 'NS.ClassB');
     }
 
     ['@test A namespace can be looked up by its name'](assert) {
diff --git a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js b/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
index 1e612de956e..65d6ac5deba 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
@@ -1,101 +1,10 @@
-import { run } from '@ember/runloop';
 import { guidFor, setName } from '@ember/-internals/utils';
-import { context } from '@ember/-internals/environment';
 import EmberObject from '../../../lib/system/object';
-import Namespace from '../../../lib/system/namespace';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
-let originalLookup = context.lookup;
-let lookup;
-
 moduleFor(
   'system/object/toString',
   class extends AbstractTestCase {
-    beforeEach() {
-      context.lookup = lookup = {};
-    }
-
-    afterEach() {
-      context.lookup = originalLookup;
-    }
-
-    ['@test toString() returns the same value if called twice'](assert) {
-      let Foo = Namespace.create();
-      Foo.toString = function () {
-        return 'Foo';
-      };
-
-      Foo.Bar = EmberObject.extend();
-
-      assert.equal(Foo.Bar.toString(), 'Foo.Bar');
-      assert.equal(Foo.Bar.toString(), 'Foo.Bar');
-
-      let obj = Foo.Bar.create();
-
-      assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
-      assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
-
-      assert.equal(Foo.Bar.toString(), 'Foo.Bar');
-
-      run(Foo, 'destroy');
-    }
-
-    ['@test toString on a class returns a useful value when nested in a namespace'](assert) {
-      let obj;
-
-      let Foo = Namespace.create();
-      Foo.toString = function () {
-        return 'Foo';
-      };
-
-      Foo.Bar = EmberObject.extend();
-      assert.equal(Foo.Bar.toString(), 'Foo.Bar');
-
-      obj = Foo.Bar.create();
-      assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
-
-      Foo.Baz = Foo.Bar.extend();
-      assert.equal(Foo.Baz.toString(), 'Foo.Baz');
-
-      obj = Foo.Baz.create();
-      assert.equal(obj.toString(), '<Foo.Baz:' + guidFor(obj) + '>');
-
-      obj = Foo.Bar.create();
-      assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
-
-      run(Foo, 'destroy');
-    }
-
-    ['@test toString on a namespace finds the namespace in lookup'](assert) {
-      let Foo = (lookup.Foo = Namespace.create());
-
-      assert.equal(Foo.toString(), 'Foo');
-
-      run(Foo, 'destroy');
-    }
-
-    ['@test toString on a nested namespace finds the namespace in lookup'](assert) {
-      let Foo = (lookup.Foo = Namespace.create());
-      let obj;
-
-      Foo.Bar = EmberObject.extend();
-
-      assert.equal(Foo.Bar.toString(), 'Foo.Bar');
-
-      obj = Foo.Bar.create();
-      assert.equal(obj.toString(), '<Foo.Bar:' + guidFor(obj) + '>');
-
-      run(Foo, 'destroy');
-    }
-
-    ['@test toString on a namespace falls back to modulePrefix, if defined'](assert) {
-      let Foo = Namespace.create({ modulePrefix: 'foo' });
-
-      assert.equal(Foo.toString(), 'foo');
-
-      run(Foo, 'destroy');
-    }
-
     ['@test toString includes toStringExtension if defined'](assert) {
       let Foo = EmberObject.extend({
         toStringExtension() {
@@ -112,12 +21,12 @@ moduleFor(
 
       assert.equal(
         bar.toString(),
-        '<Bar:' + guidFor(bar) + '>',
+        '<(unknown):' + guidFor(bar) + '>',
         'does not include toStringExtension part'
       );
       assert.equal(
         foo.toString(),
-        '<Foo:' + guidFor(foo) + ':fooey>',
+        '<(unknown):' + guidFor(foo) + ':fooey>',
         'Includes toStringExtension result'
       );
     }
diff --git a/packages/@ember/application/globals-resolver.js b/packages/@ember/application/globals-resolver.js
index 6cb9987131b..67cad755c4d 100644
--- a/packages/@ember/application/globals-resolver.js
+++ b/packages/@ember/application/globals-resolver.js
@@ -2,7 +2,7 @@
 @module @ember/application
 */
 
-import { dictionary } from '@ember/-internals/utils';
+import { dictionary, getName } from '@ember/-internals/utils';
 import { get, findNamespace } from '@ember/-internals/metal';
 import { assert, info, deprecate } from '@ember/debug';
 import { capitalize, classify, dasherize, decamelize } from '@ember/string';
@@ -10,6 +10,7 @@ import { Object as EmberObject } from '@ember/-internals/runtime';
 import { getTemplate } from '@ember/-internals/glimmer';
 import { DEBUG } from '@glimmer/env';
 import { GLOBALS_RESOLVER } from '@ember/deprecated-features';
+import { processAllNamespaces } from '@ember/-internals/metal';
 
 /**
   The DefaultResolver defines the default lookup rules to resolve
@@ -177,9 +178,11 @@ if (GLOBALS_RESOLVER) {
           if (validationAttributes) {
             let [factoryFlag, expectedType] = validationAttributes;
 
+            processAllNamespaces();
+
             assert(
               `Expected ${parsedName.fullName} to resolve to an ${expectedType} but ` +
-                `instead it was ${resolved}.`,
+                `instead it was ${getName(resolved)}.`,
               Boolean(resolved[factoryFlag])
             );
           }
@@ -274,7 +277,7 @@ if (GLOBALS_RESOLVER) {
     }
 
     makeToString(factory) {
-      return factory.toString();
+      return typeof factory === 'string' ? factory : factory.name ?? '(unknown class)';
     }
 
     /**
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 713d8a78bae..ee39c6eb58a 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -1,7 +1,8 @@
 import { DEBUG } from '@glimmer/env';
 import VERSION from 'ember/version';
 import { ENV, context } from '@ember/-internals/environment';
-import { libraries } from '@ember/-internals/metal';
+import { libraries, processAllNamespaces } from '@ember/-internals/metal';
+import { getName } from '@ember/-internals/utils';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { Router, NoneLocation, Route as EmberRoute } from '@ember/-internals/routing';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
@@ -194,7 +195,8 @@ moduleFor(
     [`@test acts like a namespace`](assert) {
       this.application = runTask(() => this.createApplication());
       let Foo = (this.application.Foo = EmberObject.extend());
-      assert.equal(Foo.toString(), 'TestApp.Foo', 'Classes pick up their parent namespace');
+      processAllNamespaces();
+      assert.equal(getName(Foo), 'TestApp.Foo', 'Classes pick up their parent namespace');
     }
 
     [`@test can specify custom router`](assert) {
diff --git a/packages/@ember/application/tests/dependency_injection/to_string_test.js b/packages/@ember/application/tests/dependency_injection/to_string_test.js
deleted file mode 100644
index b1e27d3a6bb..00000000000
--- a/packages/@ember/application/tests/dependency_injection/to_string_test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { assign } from '@ember/polyfills';
-import { guidFor } from '@ember/-internals/utils';
-import { Object as EmberObject } from '@ember/-internals/runtime';
-import {
-  moduleFor,
-  ApplicationTestCase,
-  ModuleBasedTestResolver,
-  DefaultResolverApplicationTestCase,
-  runTask,
-} from 'internal-test-helpers';
-
-moduleFor(
-  'Application Dependency Injection - DefaultResolver#toString',
-  class extends DefaultResolverApplicationTestCase {
-    constructor() {
-      super();
-      runTask(() => this.createApplication());
-      this.application.Post = EmberObject.extend();
-    }
-
-    beforeEach() {
-      return this.visit('/');
-    }
-
-    ['@test factories'](assert) {
-      let PostFactory = this.applicationInstance.factoryFor('model:post').class;
-      assert.equal(PostFactory.toString(), 'TestApp.Post', 'expecting the model to be post');
-    }
-
-    ['@test instances'](assert) {
-      let post = this.applicationInstance.lookup('model:post');
-      let guid = guidFor(post);
-
-      assert.equal(
-        post.toString(),
-        '<TestApp.Post:' + guid + '>',
-        'expecting the model to be post'
-      );
-    }
-  }
-);
-
-moduleFor(
-  'Application Dependency Injection - Resolver#toString',
-  class extends ApplicationTestCase {
-    beforeEach() {
-      return this.visit('/');
-    }
-
-    get applicationOptions() {
-      return assign(super.applicationOptions, {
-        Resolver: class extends ModuleBasedTestResolver {
-          makeToString(_, fullName) {
-            return fullName;
-          }
-        },
-      });
-    }
-
-    ['@test toString called on a resolver'](assert) {
-      this.add('model:peter', EmberObject.extend());
-
-      let peter = this.applicationInstance.lookup('model:peter');
-      let guid = guidFor(peter);
-      assert.equal(
-        peter.toString(),
-        `<model:peter:${guid}>`,
-        'expecting the supermodel to be peter'
-      );
-    }
-  }
-);
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index d5c5d1c0dfa..8507fcc4d0d 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -2,6 +2,8 @@ import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import Engine from '@ember/engine';
 import { Object as EmberObject } from '@ember/-internals/runtime';
+import { processAllNamespaces } from '@ember/-internals/metal';
+import { getName } from '@ember/-internals/utils';
 import {
   moduleFor,
   AbstractTestCase as TestCase,
@@ -37,11 +39,8 @@ moduleFor(
 
     ['@test acts like a namespace'](assert) {
       engine.Foo = EmberObject.extend();
-      assert.equal(
-        engine.Foo.toString(),
-        'TestEngine.Foo',
-        'Classes pick up their parent namespace'
-      );
+      processAllNamespaces();
+      assert.equal(getName(engine.Foo), 'TestEngine.Foo', 'Classes pick up their parent namespace');
     }
 
     ['@test builds a registry'](assert) {

From 04f28b234bd990e56bd3a93d7bb0485719f065e4 Mon Sep 17 00:00:00 2001
From: Pat O'Callaghan <pat@intercom.io>
Date: Wed, 10 Mar 2021 21:38:30 +0000
Subject: [PATCH 0435/1405] Add deprecation for the Ember Global

---
 packages/@ember/-internals/bootstrap/index.js     | 15 +++++++++++++++
 .../test-cases/default-resolver-application.js    |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/bootstrap/index.js b/packages/@ember/-internals/bootstrap/index.js
index d74aee1c358..431992b2e55 100644
--- a/packages/@ember/-internals/bootstrap/index.js
+++ b/packages/@ember/-internals/bootstrap/index.js
@@ -1,5 +1,6 @@
 import require from 'require';
 import { context } from '@ember/-internals/environment';
+import { deprecate } from '@ember/debug';
 
 (function () {
   let Ember;
@@ -13,6 +14,20 @@ import { context } from '@ember/-internals/environment';
           Ember = require('ember').default;
         }
 
+        deprecate(
+          'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.',
+          false,
+          {
+            id: 'ember-global',
+            until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global',
+            for: 'ember-source',
+            since: {
+              enabled: '3.27.0',
+            },
+          }
+        );
+
         return Ember;
       },
     });
diff --git a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
index e67cc76d7c5..24d678a5bf6 100644
--- a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
@@ -12,7 +12,7 @@ export default class DefaultResolverApplicationTestCase extends AbstractApplicat
     let application;
     expectDeprecation(() => {
       application = this.application = Application.create(this.applicationOptions);
-    }, /Using the globals resolver is deprecated/);
+    }, /(Using the globals resolver is deprecated|Usage of the Ember Global is deprecated)/);
 
     // If the test expects a certain number of assertions, increment that number
     let { assert } = QUnit.config.current;

From dac1628ea30ce7bc9bb4405ace8ee990e2a86398 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 19 Mar 2021 08:40:56 -0700
Subject: [PATCH 0436/1405] [BUGFIX] Prevent eager argument consumption on
 modifier destruction

Upgrades the VM to include the fix for eager argument consumption on
modifier destruction.

Fixes #19131
---
 package.json |  26 ++---
 yarn.lock    | 266 +++++++++++++++++++++++++--------------------------
 2 files changed, 146 insertions(+), 146 deletions(-)

diff --git a/package.json b/package.json
index 405f56553e0..125614acb39 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.77.1",
+    "@glimmer/vm-babel-plugins": "0.77.3",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.77.1",
+    "@glimmer/compiler": "0.77.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.77.1",
-    "@glimmer/interfaces": "0.77.1",
-    "@glimmer/manager": "0.77.1",
-    "@glimmer/destroyable": "0.77.1",
-    "@glimmer/owner": "0.77.1",
-    "@glimmer/node": "0.77.1",
-    "@glimmer/opcode-compiler": "0.77.1",
-    "@glimmer/program": "0.77.1",
-    "@glimmer/reference": "0.77.1",
-    "@glimmer/runtime": "0.77.1",
-    "@glimmer/validator": "0.77.1",
+    "@glimmer/global-context": "0.77.3",
+    "@glimmer/interfaces": "0.77.3",
+    "@glimmer/manager": "0.77.3",
+    "@glimmer/destroyable": "0.77.3",
+    "@glimmer/owner": "0.77.3",
+    "@glimmer/node": "0.77.3",
+    "@glimmer/opcode-compiler": "0.77.3",
+    "@glimmer/program": "0.77.3",
+    "@glimmer/reference": "0.77.3",
+    "@glimmer/runtime": "0.77.3",
+    "@glimmer/validator": "0.77.3",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index 57650be1ab2..ab9a1766849 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,196 +1588,196 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.1.tgz#1d31c5c695ee7cd1ee6c1ccad6e96fa11e334f63"
-  integrity sha512-gb2qFUtrnjeFm/JWmKzhXfHiQ3hzrgvIQMomh1CWyPz1e5oyw04UsOjBJCFcr0/xgpu9p8UMmEeKTkLCyROrTw==
-  dependencies:
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/syntax" "0.77.1"
-    "@glimmer/util" "0.77.1"
-    "@glimmer/wire-format" "0.77.1"
+"@glimmer/compiler@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.3.tgz#f021dcb7a7c0a475584287c7008261b68081ca1b"
+  integrity sha512-mNYdwRBqgoGC4IF0WyGOpI2L34hZjyrTOdbOBttAllhMlHCBxvheLjlki4W3DU/824knAyJkwIP7vTgnAWe3eQ==
+  dependencies:
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/syntax" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/wire-format" "0.77.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.1.tgz#201308ac284a3466e46bad904526dd1dbf21ae72"
-  integrity sha512-E0kIvBbaLM36Wvvqt7LticXSTesTi2jQnXEXIr2u4dS128aaHIGlmpn6b/ITiJEVjJNFffaKqpfY1YuLjMaKpA==
+"@glimmer/destroyable@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.3.tgz#e4f11a8b02e6ba21940e368f9a64078c72596ca5"
+  integrity sha512-2ft+Q2xaZ20vdIitdPgb+ngneK3L4zhS7NrGSXGvAtCVaF7hX/W91PDsKmyfxUl6DB+lW7Bw/pERfFdH9XRLMw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.77.1"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/util" "0.77.1"
+    "@glimmer/global-context" "0.77.3"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
 
-"@glimmer/encoder@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.1.tgz#520de1d5fce5d4bd1b300db8e41485ef58e6380d"
-  integrity sha512-MGn1khRJB1euNNYOY+f7qsxhTFJqQH5y+98CUiCsIwtuqdlBfaVW09xOIcdlpEjkoPzFJJysvzGJURKKdmaq2g==
+"@glimmer/encoder@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.3.tgz#db80319d8e4aa7e8957c82987a81aa3c8fe250ff"
+  integrity sha512-wjPPAa2jlc2GhAOups3XFaYwC+tTgw4+4xD65iQEeOCfbuad7qhFxz+yK6TGujrhZL4dsDE0oXuUjDgW6RYxeA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/vm" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/vm" "0.77.3"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.1.tgz#3af524269ee6de77ee1236f3650747774c026470"
-  integrity sha512-ncHfREo4zQC8XGFf1zQuQ+2T8THUIZtcGMm+Aj0k80TUb9PgE5oJPNeY7hhbYHJV531o5cuEX/SuTlCTrLm9wg==
+"@glimmer/global-context@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.3.tgz#b83f2c9d2d0720fdbd49d1ecf33d6836d06c3af2"
+  integrity sha512-bNPwdoW0/+bwSAR3Ek5C+xo+xkIlUxR4LljfRuwDOXlTebm7YPVDNLN+Vb2XUGNZfMgyNDRPkMO9P3CxW1wDTA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.1.tgz#845a62ff6dc6a3646642cfbeec84b13a8a66ea1c"
-  integrity sha512-Dp0hebviZpcqEPjuNA5kGa/gl5nfYv+XEI0e9ozF5d1FD5yGPdvwQ9D+sQ4Dn888XCCmTWzKME4iRsVHK5aJoA==
+"@glimmer/interfaces@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.3.tgz#cd0523147da72d8901950a24c3be7aa4e38d8d09"
+  integrity sha512-i/2YmyjFKhKNheEfvajQbbQr9AWbahNV71oakipz8b+qWx0nni5cjM/m/Z0nhnwrsa2cNFIt5kNknD6rh18AHg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.1.tgz#e6ab4a2dce3d1c33bc88ac01cf1a0943dd8e8e4d"
-  integrity sha512-YWoq+XtSBbFwMtyaRXqGlNgx2Nk3bnqpP43GXwfu/KeI36or14UpLmIvhB7tbzSc7F0MLMu5yW1GRELfop2S7A==
+"@glimmer/low-level@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.3.tgz#b2da42839bbe05b437baa985b8fad1c73deed828"
+  integrity sha512-3Yo3GYP1Cqh63T2v57LFrsb+7bgMDrnUkbQJ5gZbTmaDTHSegTJRRFB5TbxHUDJ5YYqb7/5psilCg56NlDD78Q==
 
-"@glimmer/manager@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.1.tgz#3816c1679c7ad98e10b0d6ea0080e24559ae64ef"
-  integrity sha512-Yj68aKLsjVrPmd1XXxZEVIuclp3x1IgZ9c1f6f9wdxbX+YyExfERR2x6yR+jZLZPMq6fwYgHiSfzWc9tkoE6gQ==
+"@glimmer/manager@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.3.tgz#68bf2f8f2410f79a88e4c401f0dd7aed47741534"
+  integrity sha512-NSKXUkQsjaGyWdtjGQAeeiilZ+Q3WPuM0EC/9yCt4hVEXTpyS0bcLv4nuXCNZXPygTiBNYOA4+c7X93TTx+sUQ==
   dependencies:
-    "@glimmer/destroyable" "0.77.1"
+    "@glimmer/destroyable" "0.77.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/reference" "0.77.1"
-    "@glimmer/util" "0.77.1"
-    "@glimmer/validator" "0.77.1"
-
-"@glimmer/node@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.1.tgz#fc2e09a02ad1df6f8d72436c95735d8bb960057f"
-  integrity sha512-iJS3z6Ut3+ZOaUnqaaEYTsQkm4LPT41GK+Tm9HbU0PXtQ3OVMWgTbrER7jwJekeZkcufXhhh7bUcioHGSqp03w==
-  dependencies:
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/runtime" "0.77.1"
-    "@glimmer/util" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/reference" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/validator" "0.77.3"
+
+"@glimmer/node@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.3.tgz#45f146feb6c1e08b320c2527d90eebdb3ccd8101"
+  integrity sha512-p0XDUGbB18v7RDMEBZSJPJY6fyLiZA9x8rsm5NE6aIis0UxKb7cW6+oRdkUESowf0cxCwyIdZaPZCjkpUvv6Ow==
+  dependencies:
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/runtime" "0.77.3"
+    "@glimmer/util" "0.77.3"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.1.tgz#6f42aaeb39aa21edb4081d34f0393d466139bfb9"
-  integrity sha512-AJryxdVxxtzHVTI9Dj/mCP9IKbngOaOv79j6NwnY41a2GrDsoAYpgloW0HlUNRKeCKYXT0zRBQwP3VxhArHR5w==
+"@glimmer/opcode-compiler@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.3.tgz#89302f138350f59811b715f4c93114143eb7013a"
+  integrity sha512-doHr7a0xwZoo6Giva5bRMqPGLn34V3xCiDsshZPt7SLDyRXB0kFdoyTNBR/moPM0tUmrZMvsure1+qhfeSAPwA==
   dependencies:
-    "@glimmer/encoder" "0.77.1"
+    "@glimmer/encoder" "0.77.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/reference" "0.77.1"
-    "@glimmer/util" "0.77.1"
-    "@glimmer/vm" "0.77.1"
-    "@glimmer/wire-format" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/reference" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/vm" "0.77.3"
+    "@glimmer/wire-format" "0.77.3"
 
-"@glimmer/owner@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.1.tgz#11bcdda63ba2064fcd733e3bd9f71025532ca95f"
-  integrity sha512-KiKQN9JkyjXymfDvqPpzzm3O5YtssqbtlzGYgd8uJfAXMnNoAHBAGJr+T/dg+cZw1iOSDbb64PPXUU853/WyyQ==
+"@glimmer/owner@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.3.tgz#f5367c4a11b400c237e3cd2115e731831205d53b"
+  integrity sha512-5rhUhT0IbMngGuZpOGgDQEJKL05YDmVrMiu8N6PNhW9PNWq88iTbmKdYHr0EzP5nZnX4tTMbqXwXwjeh0nib9w==
   dependencies:
-    "@glimmer/util" "0.77.1"
+    "@glimmer/util" "0.77.3"
 
-"@glimmer/program@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.1.tgz#9329640b0404021411c2e1c5d82016ebb5c12a0a"
-  integrity sha512-xTEnlsYMAyNQ6R8grtj2KA+nAQq9gvvOpxohSxDdrqzOtLFJGHLJ3lwUCq6gvw3IWz81t7G97encp7EA0rbT1A==
+"@glimmer/program@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.3.tgz#cb8c7493754dd506cbd4bc8c1400ea60c4212854"
+  integrity sha512-GUX+XF5CDsbAVHog5sJkd2EfM80WKZE1AlK/p3tQVJ6lmR8QrbctXM+eGay9UbKOpYnIEGc56hp2y+6hrsIxlQ==
   dependencies:
-    "@glimmer/encoder" "0.77.1"
+    "@glimmer/encoder" "0.77.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/manager" "0.77.1"
-    "@glimmer/opcode-compiler" "0.77.1"
-    "@glimmer/util" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/manager" "0.77.3"
+    "@glimmer/opcode-compiler" "0.77.3"
+    "@glimmer/util" "0.77.3"
 
-"@glimmer/reference@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.1.tgz#2bf591a1766efb58361333fa66d30175c6090733"
-  integrity sha512-bqlO+kOzTLHs24OpPeJWk/D14TTJImntMxVDr9XWj4VLWlH3QRISPg6ArtrJdI30MBESXHdzScaAyv7c8rN6yA==
+"@glimmer/reference@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.3.tgz#8bf252da20aacd444ab8b7fd4b35d3d56d71a235"
+  integrity sha512-g9XsW/ZqJ2/6htZYegYoSY4vl43E5KsN2xSNw2sy4Hk901tzvsvjsiLtdH7CvzxZI+s5AUJNQNc2D+/WSppQIQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.77.1"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/util" "0.77.1"
-    "@glimmer/validator" "0.77.1"
+    "@glimmer/global-context" "0.77.3"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/validator" "0.77.3"
 
-"@glimmer/runtime@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.1.tgz#b499ad1f6c1fc555082af0da8d837ba79c82042d"
-  integrity sha512-UXQgLHI1cxAGV8i1oPrmCp9pMwLLIRyKJ0S0kgW8DDsRYrtUVyFmxP1vbfpfNgnxhAt/G5ZH2LG2pGePM+ZjHg==
+"@glimmer/runtime@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.3.tgz#8c6cc50d542c7b37a3890f8664d3e6e2872e7e60"
+  integrity sha512-5ltqnZefpExIt/Dhxt5z0kUvHwa+uxpRDdo1YuUgtlDYfpY3Ialaot9RvRehMmrocc7qf26gG5ko/ulEVKXZ4w==
   dependencies:
-    "@glimmer/destroyable" "0.77.1"
+    "@glimmer/destroyable" "0.77.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.77.1"
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/low-level" "0.77.1"
-    "@glimmer/owner" "0.77.1"
-    "@glimmer/program" "0.77.1"
-    "@glimmer/reference" "0.77.1"
-    "@glimmer/util" "0.77.1"
-    "@glimmer/validator" "0.77.1"
-    "@glimmer/vm" "0.77.1"
-    "@glimmer/wire-format" "0.77.1"
+    "@glimmer/global-context" "0.77.3"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/low-level" "0.77.3"
+    "@glimmer/owner" "0.77.3"
+    "@glimmer/program" "0.77.3"
+    "@glimmer/reference" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@glimmer/validator" "0.77.3"
+    "@glimmer/vm" "0.77.3"
+    "@glimmer/wire-format" "0.77.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.1.tgz#155109c2e62a3dc94cf0ae7ccf2e840fe8875c7c"
-  integrity sha512-Jbfr34s0D70OlXeGzHzzK0aTRoXR0KtC6klVw5IQQlxvJIrHlZuRDpIueByL5sxhyYh9KQc13lMcHXUFaIPEtA==
+"@glimmer/syntax@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.3.tgz#219bd46687147f10cf3893f81ebfd6ac7733ac07"
+  integrity sha512-C5sMmRyiDnhYHkdogcEpBuSbiFrClAwGg1tBk61dMkYmXlInjlwpAj5SfgtSzcgXjUM/60uZo+DvMacyZsx9Nw==
   dependencies:
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/util" "0.77.1"
-    "@handlebars/parser" "^2.0.0"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
+    "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.1.tgz#9dfa721a3e3d06d7ec84488ef2e1a0107ea7cf3f"
-  integrity sha512-9BHDbmc/z7wzre+esFI+UPR2bx2Z+NYS5SxH10zgdYMDaN7qAQ63lIt+20AasQjC49JH4GxoPTettSknMQ6F1A==
+"@glimmer/util@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.3.tgz#c91fc3b61743ddea3e4470cf1ed8378f88cc863f"
+  integrity sha512-pqkU2b4BOkmSehRPSbS4bIw1zk8K6dVkVbXdXRqVz4oKqM7c0zYR/5fV2Sjayd3gEElt71lAef5uBr+7WddDlA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.1.tgz#8ff2c2e2ef67db5b6e6f2a13586852f1150b6ca9"
-  integrity sha512-iGaSkBdcWQRxoEd2XFTH8jieKZBMwztIPP1/Y4Y62nArj+gQJjJb59c6t9uiUKxwGMURLBsyMY3+rrzVfFB7xQ==
+"@glimmer/validator@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.3.tgz#bbbd802742983ad5deed66c02d636e0faa520c65"
+  integrity sha512-e/eUJszfBrr0wQkW1+vsiP8Sa+S7oBuSa1XPh1b7maGUNkWpk49THERfyULsWYGzrl5iYHWmM+Cl6proAXdI6g==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.77.1"
+    "@glimmer/global-context" "0.77.3"
 
-"@glimmer/vm-babel-plugins@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.1.tgz#80c8b5476ccff68191bc42ebb29928a9b8d22d69"
-  integrity sha512-amkBPV3H/3OhYIeXo03sU1VzqmUl8TUxHhjfVJwRy+vQV22S5saZCiUCyOYUsUkxdEG5sU8qooooBY8VomkkBg==
+"@glimmer/vm-babel-plugins@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.3.tgz#0671fa09828ba0e2c204e4ca2586651928c32ace"
+  integrity sha512-m1RUfiTlxPSRGML1QkRl5VSjkLHIaFPjeRaz3NzT+B3mjTlEjusCm9q9fQS6doQRGgz4Rwl3vXi9hZHmMJal+Q==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.1.tgz#a33776f6496d478e24a58771fa06b5ee7b6b39c3"
-  integrity sha512-H6XcYxwV1pBUXtOuGMiJ9px0smTvob38nIyio/XEHAZtl4+CshqmRwuGGNvvIuSpxVuCr9+TbrBMEGi4iazk7g==
+"@glimmer/vm@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.3.tgz#5132d65ef1910beeb300253a3a8b7ed892c12a3f"
+  integrity sha512-GXBO30Wb0RpAMxT2f7b0bli2VNFky9WI1JKZArueZqmxvPmt7cr90pMuNy5lGy7iFpATSwQ+KOaADUu7f8lmBA==
   dependencies:
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/util" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
 
-"@glimmer/wire-format@0.77.1":
-  version "0.77.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.1.tgz#f726314f6ef8868042b982ed85c8d5e3b7bbe08a"
-  integrity sha512-s85mr7n76c21HeV+r9xFpYCHmc3qFE2T8uu4acfIF+KNG8ZSDFg8cpGC5Mc51FoO5naMM56uH6ZzYohM7ubp4w==
+"@glimmer/wire-format@0.77.3":
+  version "0.77.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.3.tgz#688352e67c3e4a20e7665de9d8547cb024525f17"
+  integrity sha512-JA5Y2h+5vjsavXdeprHLhE2gE3oW1JU5qkluNfL2Wa2HV7omLH3Nha7U5xFoWdpndKzhxvfxhqgxtCfAD0YI0w==
   dependencies:
-    "@glimmer/interfaces" "0.77.1"
-    "@glimmer/util" "0.77.1"
+    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/util" "0.77.3"
 
-"@handlebars/parser@^2.0.0":
+"@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==

From 9dd69e8183c13f4ec81d6f20a7b706bb9acfa0a9 Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Fri, 19 Mar 2021 15:30:01 -0500
Subject: [PATCH 0437/1405] [Bug]: set symbol on factory objects only in Prod
 for sealed objects

---
 .../@ember/-internals/container/lib/container.ts  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 464cee719f6..43abb2cdcb2 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -517,12 +517,23 @@ declare interface DebugFactory<T, C> extends Factory<T, C> {
 
 export const INIT_FACTORY = symbol('INIT_FACTORY');
 
+// This exists for objects that `Object.seal` or `Object.freeze` in DEBUG only
+const factoryStore = new WeakMap();
+
 export function getFactoryFor(obj: any): FactoryManager<any, any> {
-  return obj[INIT_FACTORY];
+  if (DEBUG) {
+    return factoryStore.get(obj);
+  } else {
+    return obj[INIT_FACTORY];
+  }
 }
 
 export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void {
-  obj[INIT_FACTORY] = factory;
+  if (DEBUG) {
+    factoryStore.set(obj, factory);
+  } else {
+    obj[INIT_FACTORY] = factory;
+  }
 }
 
 class FactoryManager<T, C> {

From b05ac4dd331f4b6196a5d27521df17294e43f3bf Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Fri, 19 Mar 2021 16:06:14 -0500
Subject: [PATCH 0438/1405] Set INIT_FACTORY on create

---
 .../@ember/-internals/container/lib/container.ts  | 15 ++-------------
 packages/@ember/-internals/metal/lib/mixin.ts     |  4 ++++
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 43abb2cdcb2..464cee719f6 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -517,23 +517,12 @@ declare interface DebugFactory<T, C> extends Factory<T, C> {
 
 export const INIT_FACTORY = symbol('INIT_FACTORY');
 
-// This exists for objects that `Object.seal` or `Object.freeze` in DEBUG only
-const factoryStore = new WeakMap();
-
 export function getFactoryFor(obj: any): FactoryManager<any, any> {
-  if (DEBUG) {
-    return factoryStore.get(obj);
-  } else {
-    return obj[INIT_FACTORY];
-  }
+  return obj[INIT_FACTORY];
 }
 
 export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void {
-  if (DEBUG) {
-    factoryStore.set(obj, factory);
-  } else {
-    obj[INIT_FACTORY] = factory;
-  }
+  obj[INIT_FACTORY] = factory;
 }
 
 class FactoryManager<T, C> {
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index e2f54685001..db48911e5e3 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -1,6 +1,7 @@
 /**
 @module @ember/object
 */
+import { INIT_FACTORY } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import {
@@ -575,6 +576,9 @@ export default class Mixin {
     this.ownerConstructor = undefined;
     this._without = undefined;
 
+    // This exists for objects that `Object.seal` or `Object.freeze` in DEBUG only
+    Object.defineProperty(this, INIT_FACTORY, { value: null });
+
     if (DEBUG) {
       /*
         In debug builds, we seal mixins to help avoid performance pitfalls.

From 22bfcfdac0aeefcf333fb2d6697772934201b43b Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 19 Mar 2021 14:23:11 -0700
Subject: [PATCH 0439/1405] [BUGFIX] Prevent infinite recursion

---
 packages/@ember/application/deprecations.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/application/deprecations.ts b/packages/@ember/application/deprecations.ts
index 6a8e9bb4ea0..61895f3da8c 100644
--- a/packages/@ember/application/deprecations.ts
+++ b/packages/@ember/application/deprecations.ts
@@ -5,7 +5,7 @@ import {
 } from '@ember/debug';
 
 export function deprecate(message: string, condition: boolean, options: DeprecationOptions): void {
-  deprecate(
+  _deprecate(
     "`import { deprecate } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecate } from '@ember/debug';`",
     false,
     {
@@ -22,7 +22,7 @@ export function deprecate(message: string, condition: boolean, options: Deprecat
 }
 
 export function deprecateFunc(message: string, options: DeprecationOptions, func: Function): void {
-  deprecate(
+  _deprecate(
     "`import { deprecateFunc } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecateFunc } from '@ember/debug';`",
     false,
     {

From 955e34db29ba3ff076daa3846f5b7de6e26d47cb Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Fri, 19 Mar 2021 16:43:05 -0500
Subject: [PATCH 0440/1405] improve comment

---
 packages/@ember/-internals/metal/lib/mixin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index db48911e5e3..c871733cdfb 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -576,7 +576,7 @@ export default class Mixin {
     this.ownerConstructor = undefined;
     this._without = undefined;
 
-    // This exists for objects that `Object.seal` or `Object.freeze` in DEBUG only
+    // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
     Object.defineProperty(this, INIT_FACTORY, { value: null });
 
     if (DEBUG) {

From 4151d39d07ec850d37e80524ca7031e4c3392dc5 Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Sat, 20 Mar 2021 07:46:38 -0500
Subject: [PATCH 0441/1405] This should probably be writable

---
 packages/@ember/-internals/metal/lib/mixin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index c871733cdfb..997aec83f01 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -577,7 +577,7 @@ export default class Mixin {
     this._without = undefined;
 
     // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
-    Object.defineProperty(this, INIT_FACTORY, { value: null });
+    Object.defineProperty(this, INIT_FACTORY, { value: null, writable: true });
 
     if (DEBUG) {
       /*

From df4fa7d8796cbfaaaed80c237797086a17d419df Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Sat, 20 Mar 2021 14:26:37 -0500
Subject: [PATCH 0442/1405] simpler

---
 packages/@ember/-internals/metal/lib/mixin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 997aec83f01..58e63a30c2b 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -577,7 +577,7 @@ export default class Mixin {
     this._without = undefined;
 
     // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
-    Object.defineProperty(this, INIT_FACTORY, { value: null, writable: true });
+    this[INIT_FACTORY] = null;
 
     if (DEBUG) {
       /*

From aae3b9036b1a02e5cb085e38c11635a9f2e644a2 Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Sat, 20 Mar 2021 15:34:40 -0500
Subject: [PATCH 0443/1405] debug only

---
 packages/@ember/-internals/metal/lib/mixin.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 58e63a30c2b..f02f5346055 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -576,8 +576,10 @@ export default class Mixin {
     this.ownerConstructor = undefined;
     this._without = undefined;
 
-    // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
-    this[INIT_FACTORY] = null;
+    if (DEBUG) {
+      // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
+      this[INIT_FACTORY] = null;
+    }
 
     if (DEBUG) {
       /*

From 938c64f4b75bbad9ab1cf382005381f9a5c9c59f Mon Sep 17 00:00:00 2001
From: scott-newcomer <snewcomer24@gmail.com>
Date: Sat, 20 Mar 2021 22:56:44 -0500
Subject: [PATCH 0444/1405] merge two debugs

---
 packages/@ember/-internals/metal/lib/mixin.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index f02f5346055..7073f79f8c6 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -579,9 +579,6 @@ export default class Mixin {
     if (DEBUG) {
       // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
       this[INIT_FACTORY] = null;
-    }
-
-    if (DEBUG) {
       /*
         In debug builds, we seal mixins to help avoid performance pitfalls.
 

From 67da4197b699411c1d70403d2071a864edb60def Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Mon, 22 Mar 2021 23:35:29 +0100
Subject: [PATCH 0445/1405] [BUGFIX LTS] Prevent transformation of block params
 called `attrs`

This prevents the `transform-attrs-into-args` transform plugin from transforming block params that are named "attrs" and are yielded by components.
---
 .../lib/plugins/transform-attrs-into-args.ts  | 17 ++++-
 .../plugins/transform-attrs-into-args-test.js | 62 +++++++++++++++++++
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js

diff --git a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
index 8f7ea8c50ad..b04932d28a8 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
@@ -33,14 +33,27 @@ export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment):
 
   let stack: string[][] = [[]];
 
+  function updateBlockParamsStack(blockParams: string[]) {
+    let parent = stack[stack.length - 1];
+    stack.push(parent.concat(blockParams));
+  }
+
   return {
     name: 'transform-attrs-into-args',
 
     visitor: {
       Program: {
         enter(node: AST.Program) {
-          let parent = stack[stack.length - 1];
-          stack.push(parent.concat(node.blockParams));
+          updateBlockParamsStack(node.blockParams);
+        },
+        exit() {
+          stack.pop();
+        },
+      },
+
+      ElementNode: {
+        enter(node: AST.ElementNode) {
+          updateBlockParamsStack(node.blockParams);
         },
         exit() {
           stack.pop();
diff --git a/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js b/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
new file mode 100644
index 00000000000..3db58637b56
--- /dev/null
+++ b/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
@@ -0,0 +1,62 @@
+import TransformTestCase from '../utils/transform-test-case';
+import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
+
+moduleFor(
+  'ember-template-compiler: transforming attrs into @args',
+  class extends TransformTestCase {
+    ['@test it transforms attrs into @args']() {
+      expectDeprecation(() => {
+        this.assertTransformed(`{{attrs.foo}}`, `{{@foo}}`);
+      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+
+      expectDeprecation(() => {
+        this.assertTransformed(`{{attrs.foo.bar}}`, `{{@foo.bar}}`);
+      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
+
+      expectDeprecation(() => {
+        this.assertTransformed(`{{if attrs.foo "foo"}}`, `{{if @foo "foo"}}`);
+      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+
+      expectDeprecation(() => {
+        this.assertTransformed(`{{#if attrs.foo}}{{/if}}`, `{{#if @foo}}{{/if}}`);
+      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+
+      expectDeprecation(() => {
+        this.assertTransformed(`{{deeply (nested attrs.foo.bar)}}`, `{{deeply (nested @foo.bar)}}`);
+      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
+
+      expectDeprecation(() => {
+        this.assertTransformed(`{{this.attrs.foo}}`, `{{@foo}}`);
+      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+    }
+  }
+);
+
+moduleFor(
+  'ember-template-compiler: not transforming block params named "attrs" into @args',
+  class extends RenderingTestCase {
+    ["@test it doesn't transform block params"]() {
+      this.registerComponent('foo', {
+        template: '{{#let "foo" as |attrs|}}{{attrs}}{{/let}}',
+      });
+      this.render('<Foo />');
+      this.assertComponentElement(this.firstChild, { content: 'foo' });
+    }
+
+    ["@test it doesn't transform component block params"]() {
+      this.registerComponent('foo', {
+        template: '{{yield "foo"}}',
+      });
+      this.render('<Foo as |attrs|>{{attrs}}</Foo>');
+      this.assertComponentElement(this.firstChild, { content: 'foo' });
+    }
+
+    ["@test it doesn't transform block params with nested keys"]() {
+      this.registerComponent('foo', {
+        template: '{{yield (hash bar="baz")}}',
+      });
+      this.render('<Foo as |attrs|>{{attrs.bar}}</Foo>');
+      this.assertComponentElement(this.firstChild, { content: 'baz' });
+    }
+  }
+);

From d622b7c4282dcdae57d389a01e889afbd0ff93fc Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 22 Mar 2021 18:46:56 -0400
Subject: [PATCH 0446/1405] Add v3.26.0 to CHANGELOG

(cherry picked from commit 8cebe0a3b87292434c440489edf4cae44cdd2119)
---
 CHANGELOG.md | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34a3bb085bd..adee6319193 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,31 +1,6 @@
 # Ember Changelog
 
-### v3.26.0-beta.5 (March 16, 2021)
-
-- [#19405](https://github.com/emberjs/ember.js/pull/19405) [BUGFIX] Avoid instantiation errors when `app/router.js` injects the router service.
-
-### v3.26.0-beta.4 (March 08, 2021)
-
-- [#19436](https://github.com/emberjs/ember.js/pull/19436) [BUGFIX] Support observer keys with colons
-- [#19448](https://github.com/emberjs/ember.js/pull/19448) [BUGFIX] Ensure query params are preserved through an intermediate loading state transition
-- [#19450](https://github.com/emberjs/ember.js/pull/19450) [BUGFIX] Ensure `routerService.currentRoute.name` and `routerService.currentRouteName` match during loading states
-
-### v3.26.0-beta.3 (March 02, 2021)
-
-- [#19412](https://github.com/emberjs/ember.js/pull/19412) [BUGFIX] Updates Glimmer VM to 0.76.0, fix:
-  - `if` helper returns `null` instead of `undefined`
-  - Using `get` helper with key `length` on a string in templates
-  - Value of input not updating if it had previously updated with the same string
-- [#19416](https://github.com/emberjs/ember.js/pull/19416) [BUGFIX] Update Glimmer VM to 0.77, fix dynamic helpers/modifiers
-
-### v3.26.0-beta.2 (February 15, 2021)
-
-- [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] LinkTo with incomplete model failing in rendering tests
-- [#19395](https://github.com/emberjs/ember.js/pull/19395) [BUGFIX] Only return empty href when LinkTo href generation throws error
-- [#19396](https://github.com/emberjs/ember.js/pull/19396) [BUGFIX] Revert deprecation of htmlSafe and isHTMLSafe
-- [#19397](https://github.com/emberjs/ember.js/pull/19397) [BUGFIX] Force building Ember bundles when `targets.node` is defined
-
-### v3.26.0-beta.1 (February 08, 2021)
+### v3.26.0 (March 22, 2021)
 
 - [#19255](https://github.com/emberjs/ember.js/pull/19255) [DEPRECATION] Deprecate transition methods of controller and route per [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).
 - [#19345](https://github.com/emberjs/ember.js/pull/19345) [DEPRECATION] Deprecate `<LinkTo>` positional arguments per [RFC #698](https://github.com/emberjs/rfcs/blob/master/text/0698-deprecate-link-to-positional-arguments.md).
@@ -41,8 +16,9 @@
 - [#19379](https://github.com/emberjs/ember.js/pull/19379) [CLEANUP] Refactor DataAdapter to not use observers or array observers
 - [#19378](https://github.com/emberjs/ember.js/pull/19378) [BUGFIX] Fix typo in template-only-glimmer-components feature detection
 - [#19298](https://github.com/emberjs/ember.js/pull/19298) [BUGFIX] Route serialize did not extract param off proxy
-- [#19326](https://github.com/emberjs/ember.js/pull/19326) [BUGFIX] Lazily setup the router in non-application tests for <LinkTo> component
-
+- [#19469](https://github.com/emberjs/ember.js/pull/19469) [BUGFIX] Prevent eager argument consumption on modifier destruction
+- [#19405](https://github.com/emberjs/ember.js/pull/19405) [BUGFIX] Avoid instantiation errors when `app/router.js` injects the router service.
+- [#19436](https://github.com/emberjs/ember.js/pull/19436) [BUGFIX] Support observer keys with colons
 
 ### v3.25.3 (March 7, 2021)
 

From e503e67adcb7bc86f8876d81c0e3d9e3110422bf Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 22 Mar 2021 19:13:59 -0400
Subject: [PATCH 0447/1405] Add v3.27.0-beta.1 to CHANGELOG

(cherry picked from commit 19ffb4993c28301f6321b347e3a887ab64e5fa44)
---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adee6319193..d55ae6a95c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Ember Changelog
 
+### v3.27.0 (March 22, 2021)
+
+- [#19382](https://github.com/emberjs/ember.js/pull/19382) / [#19430](https://github.com/emberjs/ember.js/pull/19430) [FEATURE] Remaining implementation work per [RFC #671](https://github.com/emberjs/rfcs/blob/master/text/0671-modernize-built-in-components-1.md).
+- [#19457](https://github.com/emberjs/ember.js/pull/19457) / [#19463](https://github.com/emberjs/ember.js/pull/19463) / [#19464](https://github.com/emberjs/ember.js/pull/19464) / [#19467](https://github.com/emberjs/ember.js/pull/19467) [DEPRECATION] Add deprecation for the Ember Global per [RFC #706](https://github.com/emberjs/rfcs/blob/master/text/0706-deprecate-ember-global.md).
+- [#19407](https://github.com/emberjs/ember.js/pull/19407) [DEPRECATION] Add deprecation for `Route#disconnectOutlet` per [RFC #491](https://github.com/emberjs/rfcs/blob/master/text/0491-deprecate-disconnect-outlet.md).
+- [#19433](https://github.com/emberjs/ember.js/pull/19433) [DEPRECATION] Add deprecation for `Route#renderTemplate` per [RFC #418](https://github.com/emberjs/rfcs/blob/master/text/0418-deprecate-route-render-methods.md).
+- [#19442](https://github.com/emberjs/ember.js/pull/19442) [DEPRECATION] Add deprecation for `Route#render` method per [RFC #418](https://github.com/emberjs/rfcs/blob/master/text/0418-deprecate-route-render-methods.md).
+- [#19429](https://github.com/emberjs/ember.js/pull/19429) [DEPRECATION] `registerPlugin` / `unregisterPlugin` and legacy class based AST plugins (private APIs)
+- [#19466](https://github.com/emberjs/ember.js/pull/19466) [BUGFIX] Rename private runloop functions
+- [#19384](https://github.com/emberjs/ember.js/pull/19384) Use qunit-dom in helper and component test blueprints
+- [#19390](https://github.com/emberjs/ember.js/pull/19390) Refactor the internal Ember loader to use the standard Ember CLI loader
+- [#19441](https://github.com/emberjs/ember.js/pull/19441) Add automated publishing of weekly alpha releases to NPM
+- [#19462](https://github.com/emberjs/ember.js/pull/19462) Use `positional` and `named` as the argument names in `ember g helper` blueprint
+
 ### v3.26.0 (March 22, 2021)
 
 - [#19255](https://github.com/emberjs/ember.js/pull/19255) [DEPRECATION] Deprecate transition methods of controller and route per [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).

From 89c34a40bf5b9229cee06f569de6e299fd23d093 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 22 Mar 2021 19:15:35 -0400
Subject: [PATCH 0448/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 125614acb39..72a6914219b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.27.0-alpha.1",
+  "version": "3.28.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 9d230329a46d64e4311b52495d4de485cc95aecb Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 23 Mar 2021 10:08:31 -0400
Subject: [PATCH 0449/1405] [FEATURE] Enable `(helper` and `(modifier` helpers

---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 710f28132b7..c6afc535d6f 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -20,7 +20,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: true,
   EMBER_STRICT_MODE: true,
-  EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: null,
+  EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
 };
 
 /**

From dde1661efdacb41c48e43e3fb2b54059b67403a3 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 22 Mar 2021 17:20:59 -0700
Subject: [PATCH 0450/1405] [BUGFIX release] Exposes getTemplateLocals utility
 from Glimmer VM

Exposes the `getTemplateLocals` utility from Glimmer VM so that it can
be used for strict mode template compilation.
---
 package.json |   26 +-
 yarn.lock    | 2142 +++++++++++++++++++++++++-------------------------
 2 files changed, 1084 insertions(+), 1084 deletions(-)

diff --git a/package.json b/package.json
index 72a6914219b..cc05ff66278 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.77.3",
+    "@glimmer/vm-babel-plugins": "0.77.5",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.77.3",
+    "@glimmer/compiler": "0.77.5",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.77.3",
-    "@glimmer/interfaces": "0.77.3",
-    "@glimmer/manager": "0.77.3",
-    "@glimmer/destroyable": "0.77.3",
-    "@glimmer/owner": "0.77.3",
-    "@glimmer/node": "0.77.3",
-    "@glimmer/opcode-compiler": "0.77.3",
-    "@glimmer/program": "0.77.3",
-    "@glimmer/reference": "0.77.3",
-    "@glimmer/runtime": "0.77.3",
-    "@glimmer/validator": "0.77.3",
+    "@glimmer/global-context": "0.77.5",
+    "@glimmer/interfaces": "0.77.5",
+    "@glimmer/manager": "0.77.5",
+    "@glimmer/destroyable": "0.77.5",
+    "@glimmer/owner": "0.77.5",
+    "@glimmer/node": "0.77.5",
+    "@glimmer/opcode-compiler": "0.77.5",
+    "@glimmer/program": "0.77.5",
+    "@glimmer/reference": "0.77.5",
+    "@glimmer/runtime": "0.77.5",
+    "@glimmer/validator": "0.77.5",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/yarn.lock b/yarn.lock
index ab9a1766849..4becb232b82 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1557,7 +1557,7 @@
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
-  integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+  integrity "sha1-CZE56ux+vweifBeGo/9k85Rk0u8= sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA=="
   dependencies:
     exec-sh "^0.3.2"
     minimist "^1.2.0"
@@ -1575,7 +1575,7 @@
 "@eslint/eslintrc@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
-  integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==
+  integrity "sha1-fRorI1hVLMBINMCXm9QnU2LjcIU= sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.3.tgz#f021dcb7a7c0a475584287c7008261b68081ca1b"
-  integrity sha512-mNYdwRBqgoGC4IF0WyGOpI2L34hZjyrTOdbOBttAllhMlHCBxvheLjlki4W3DU/824knAyJkwIP7vTgnAWe3eQ==
+"@glimmer/compiler@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.5.tgz#f12cf9cff8b8a8c94e8edffa6f967caf3ff92776"
+  integrity sha512-WXNfEtqmoAur2+aU0qZnE1cK6GVucwUlCHJd6756FrFxTcayl/Zj6+Ti5yfTSnqXnYo2rRWn0FCc/WZ0wGlTGw==
   dependencies:
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/syntax" "0.77.3"
-    "@glimmer/util" "0.77.3"
-    "@glimmer/wire-format" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/syntax" "0.77.5"
+    "@glimmer/util" "0.77.5"
+    "@glimmer/wire-format" "0.77.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.3.tgz#e4f11a8b02e6ba21940e368f9a64078c72596ca5"
-  integrity sha512-2ft+Q2xaZ20vdIitdPgb+ngneK3L4zhS7NrGSXGvAtCVaF7hX/W91PDsKmyfxUl6DB+lW7Bw/pERfFdH9XRLMw==
+"@glimmer/destroyable@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.5.tgz#c55089f2007a42a59058784d75b30784ed138bc7"
+  integrity sha512-s8cVbb+WlE6tTpwRhzOhlwO9PSokjC3s7wzkD6gHCQIPQivc8BHqZ2czUWfQFhHZdYVk4dg04pFMq+y8m3qC0Q==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.77.3"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/util" "0.77.3"
+    "@glimmer/global-context" "0.77.5"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/util" "0.77.5"
 
-"@glimmer/encoder@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.3.tgz#db80319d8e4aa7e8957c82987a81aa3c8fe250ff"
-  integrity sha512-wjPPAa2jlc2GhAOups3XFaYwC+tTgw4+4xD65iQEeOCfbuad7qhFxz+yK6TGujrhZL4dsDE0oXuUjDgW6RYxeA==
+"@glimmer/encoder@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.5.tgz#40dd91417998c7f1c6b1fa947fa881a598250bc3"
+  integrity sha512-BJpuFi78T9U8g5ix5R99kYhB4m5hQRfB0femrvGhECyhtOZJ+Y797uuOaSqmGTYTY8VIhvxEao6YRaKly0K3mw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/vm" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/vm" "0.77.5"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.3.tgz#b83f2c9d2d0720fdbd49d1ecf33d6836d06c3af2"
-  integrity sha512-bNPwdoW0/+bwSAR3Ek5C+xo+xkIlUxR4LljfRuwDOXlTebm7YPVDNLN+Vb2XUGNZfMgyNDRPkMO9P3CxW1wDTA==
+"@glimmer/global-context@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.5.tgz#ff72f216cd39f7e7923d54f3bb0862910070a9cc"
+  integrity sha512-kWHYjOyhYeyBEEuu3gMJsLO9WxFlXFFeWmtk2raWkJ37TndZNUFMQt6C0yOyT/AkXUJH5+1W7XSia1P3TB6CKw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.3.tgz#cd0523147da72d8901950a24c3be7aa4e38d8d09"
-  integrity sha512-i/2YmyjFKhKNheEfvajQbbQr9AWbahNV71oakipz8b+qWx0nni5cjM/m/Z0nhnwrsa2cNFIt5kNknD6rh18AHg==
+"@glimmer/interfaces@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.5.tgz#74c791ba4712588f2e7b65669d90e8d349eee30a"
+  integrity sha512-ahiZX2EG2w1DrXmIxjzmkRrAeRJS+y35YTXhP82/NSyLiS2g7NTgYbqXpsS+VfvYRZ2+EbeXzY7cTe8mN4OUxg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.3.tgz#b2da42839bbe05b437baa985b8fad1c73deed828"
-  integrity sha512-3Yo3GYP1Cqh63T2v57LFrsb+7bgMDrnUkbQJ5gZbTmaDTHSegTJRRFB5TbxHUDJ5YYqb7/5psilCg56NlDD78Q==
+"@glimmer/low-level@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.5.tgz#f198acd9c6b5f39da07756db32f11cf0f8714f7e"
+  integrity sha512-A+bNz17vBcTe0qn38q0sdDldCj4gKdFllw8lRHms2Xn50xc+e0uQ00sFFVBT51XDrKiX6u+U72sVnBrUYCbGXg==
 
-"@glimmer/manager@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.3.tgz#68bf2f8f2410f79a88e4c401f0dd7aed47741534"
-  integrity sha512-NSKXUkQsjaGyWdtjGQAeeiilZ+Q3WPuM0EC/9yCt4hVEXTpyS0bcLv4nuXCNZXPygTiBNYOA4+c7X93TTx+sUQ==
+"@glimmer/manager@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.5.tgz#dfbd94a2f47640f8d6fcdf67bb8cc8e995c835f8"
+  integrity sha512-neURL3qGaDuiq/8YYE4F2reGnS42vMjgYcJjP00eY/pBHfOY6icPR1oPwGmTt8Qr6topGc3FmUaUWDXPt0Lnkg==
   dependencies:
-    "@glimmer/destroyable" "0.77.3"
+    "@glimmer/destroyable" "0.77.5"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/reference" "0.77.3"
-    "@glimmer/util" "0.77.3"
-    "@glimmer/validator" "0.77.3"
-
-"@glimmer/node@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.3.tgz#45f146feb6c1e08b320c2527d90eebdb3ccd8101"
-  integrity sha512-p0XDUGbB18v7RDMEBZSJPJY6fyLiZA9x8rsm5NE6aIis0UxKb7cW6+oRdkUESowf0cxCwyIdZaPZCjkpUvv6Ow==
-  dependencies:
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/runtime" "0.77.3"
-    "@glimmer/util" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/reference" "0.77.5"
+    "@glimmer/util" "0.77.5"
+    "@glimmer/validator" "0.77.5"
+
+"@glimmer/node@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.5.tgz#6bb693744d612a770d106b69d2803c2423c15868"
+  integrity sha512-BBM32C5GldOFxUbV2XljwoNmOGP9YobJF9WEW1zVkbggDZcGH090VwbTErrXVv8aw987fGXqei0UCFGleOXu1A==
+  dependencies:
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/runtime" "0.77.5"
+    "@glimmer/util" "0.77.5"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.3.tgz#89302f138350f59811b715f4c93114143eb7013a"
-  integrity sha512-doHr7a0xwZoo6Giva5bRMqPGLn34V3xCiDsshZPt7SLDyRXB0kFdoyTNBR/moPM0tUmrZMvsure1+qhfeSAPwA==
+"@glimmer/opcode-compiler@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.5.tgz#088f946587c905fcb37a6516df5cb858fc177d7c"
+  integrity sha512-qJYdDeJFch2BGpYWmZ0klExsBvu6bZYoNyRtzUmuA0+xzT2I1HdwrTpekkAHVDfB0rfHArHmcimTxgFF15o4Mg==
   dependencies:
-    "@glimmer/encoder" "0.77.3"
+    "@glimmer/encoder" "0.77.5"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/reference" "0.77.3"
-    "@glimmer/util" "0.77.3"
-    "@glimmer/vm" "0.77.3"
-    "@glimmer/wire-format" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/reference" "0.77.5"
+    "@glimmer/util" "0.77.5"
+    "@glimmer/vm" "0.77.5"
+    "@glimmer/wire-format" "0.77.5"
 
-"@glimmer/owner@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.3.tgz#f5367c4a11b400c237e3cd2115e731831205d53b"
-  integrity sha512-5rhUhT0IbMngGuZpOGgDQEJKL05YDmVrMiu8N6PNhW9PNWq88iTbmKdYHr0EzP5nZnX4tTMbqXwXwjeh0nib9w==
+"@glimmer/owner@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.5.tgz#d81933f3d6c4c0feafcf3d972cc7edca00532a5b"
+  integrity sha512-0jPDb63qBNN20QkVprIuennHP1Vf3fWCQNtuVOYsDOjyV2RIlrOwTVLuFIpua86nSBRQq7gH411ZyEpoq6H3Cg==
   dependencies:
-    "@glimmer/util" "0.77.3"
+    "@glimmer/util" "0.77.5"
 
-"@glimmer/program@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.3.tgz#cb8c7493754dd506cbd4bc8c1400ea60c4212854"
-  integrity sha512-GUX+XF5CDsbAVHog5sJkd2EfM80WKZE1AlK/p3tQVJ6lmR8QrbctXM+eGay9UbKOpYnIEGc56hp2y+6hrsIxlQ==
+"@glimmer/program@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.5.tgz#53ce8da78377b255a22eb1d86eb5e6a837393305"
+  integrity sha512-19rWpeqqK7UF6CT9G+A7TOnWeoIlT8wCF4gKQNRbp2sbUugJ0PyTn7VzZTLAc110F0ohFlv17yKIrDBoPytHDw==
   dependencies:
-    "@glimmer/encoder" "0.77.3"
+    "@glimmer/encoder" "0.77.5"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/manager" "0.77.3"
-    "@glimmer/opcode-compiler" "0.77.3"
-    "@glimmer/util" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/manager" "0.77.5"
+    "@glimmer/opcode-compiler" "0.77.5"
+    "@glimmer/util" "0.77.5"
 
-"@glimmer/reference@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.3.tgz#8bf252da20aacd444ab8b7fd4b35d3d56d71a235"
-  integrity sha512-g9XsW/ZqJ2/6htZYegYoSY4vl43E5KsN2xSNw2sy4Hk901tzvsvjsiLtdH7CvzxZI+s5AUJNQNc2D+/WSppQIQ==
+"@glimmer/reference@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.5.tgz#54eac6b00bd06cb84ff8c9f854d9a7811f2c298f"
+  integrity sha512-L432i/VD4Kud8qsvPs3bY12hjkKOjfqH1tyGnjfdNAip/k6Z7GIuFDi+T/lJOLWLFONh4414KDopTysBXx9USw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.77.3"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/util" "0.77.3"
-    "@glimmer/validator" "0.77.3"
+    "@glimmer/global-context" "0.77.5"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/util" "0.77.5"
+    "@glimmer/validator" "0.77.5"
 
-"@glimmer/runtime@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.3.tgz#8c6cc50d542c7b37a3890f8664d3e6e2872e7e60"
-  integrity sha512-5ltqnZefpExIt/Dhxt5z0kUvHwa+uxpRDdo1YuUgtlDYfpY3Ialaot9RvRehMmrocc7qf26gG5ko/ulEVKXZ4w==
+"@glimmer/runtime@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.5.tgz#6b936da4e2f37cd3994626efa672b15c715ae0f8"
+  integrity sha512-rLzXY2IFw7yzsvOwy/3eLxoza9Y9vx52bivlZJ9+8AWCtn4ywNGOKwvv4i8Mf1EMXtvo3nZHC9yIwfpUJg8NLg==
   dependencies:
-    "@glimmer/destroyable" "0.77.3"
+    "@glimmer/destroyable" "0.77.5"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.77.3"
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/low-level" "0.77.3"
-    "@glimmer/owner" "0.77.3"
-    "@glimmer/program" "0.77.3"
-    "@glimmer/reference" "0.77.3"
-    "@glimmer/util" "0.77.3"
-    "@glimmer/validator" "0.77.3"
-    "@glimmer/vm" "0.77.3"
-    "@glimmer/wire-format" "0.77.3"
+    "@glimmer/global-context" "0.77.5"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/low-level" "0.77.5"
+    "@glimmer/owner" "0.77.5"
+    "@glimmer/program" "0.77.5"
+    "@glimmer/reference" "0.77.5"
+    "@glimmer/util" "0.77.5"
+    "@glimmer/validator" "0.77.5"
+    "@glimmer/vm" "0.77.5"
+    "@glimmer/wire-format" "0.77.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.3.tgz#219bd46687147f10cf3893f81ebfd6ac7733ac07"
-  integrity sha512-C5sMmRyiDnhYHkdogcEpBuSbiFrClAwGg1tBk61dMkYmXlInjlwpAj5SfgtSzcgXjUM/60uZo+DvMacyZsx9Nw==
+"@glimmer/syntax@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.5.tgz#b841803dd54ea86de7e8ae8850b3760000033bf2"
+  integrity sha512-FRb1onDsP9P2CnbwTyKF91QYIbRJ0svALG7TnAJlUjQU9E4lWdI5lf7vPRh45A4W1rjcAcIcuiIS6oGrdEkhuQ==
   dependencies:
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/util" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/util" "0.77.5"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.3.tgz#c91fc3b61743ddea3e4470cf1ed8378f88cc863f"
-  integrity sha512-pqkU2b4BOkmSehRPSbS4bIw1zk8K6dVkVbXdXRqVz4oKqM7c0zYR/5fV2Sjayd3gEElt71lAef5uBr+7WddDlA==
+"@glimmer/util@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.5.tgz#b4e2909d34eb7db34c63fd9d942e0ffa458d4c90"
+  integrity sha512-Y78NnJClpz7sBks3q+ZNNVfCjy8ALcCQOG5GEIm/P9O3+eXMBsx2ac9Umu4LBZqmeINQ9CtFz10u2BiyxOtSQg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.3.tgz#bbbd802742983ad5deed66c02d636e0faa520c65"
-  integrity sha512-e/eUJszfBrr0wQkW1+vsiP8Sa+S7oBuSa1XPh1b7maGUNkWpk49THERfyULsWYGzrl5iYHWmM+Cl6proAXdI6g==
+"@glimmer/validator@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.5.tgz#a5e272d700f661aa0b2f350670974792b7785a49"
+  integrity sha512-LluyvxWTqys5ulkYA24sFDQ/obwOTwbLDakNBOlHvKdh814h+scz4y8bckx6qY7AsJObQgZVAg00r1Nlhfs6fQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.77.3"
+    "@glimmer/global-context" "0.77.5"
 
-"@glimmer/vm-babel-plugins@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.3.tgz#0671fa09828ba0e2c204e4ca2586651928c32ace"
-  integrity sha512-m1RUfiTlxPSRGML1QkRl5VSjkLHIaFPjeRaz3NzT+B3mjTlEjusCm9q9fQS6doQRGgz4Rwl3vXi9hZHmMJal+Q==
+"@glimmer/vm-babel-plugins@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.5.tgz#daffb6507aa6b08ec36f69d652897d339fdd0007"
+  integrity sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.3.tgz#5132d65ef1910beeb300253a3a8b7ed892c12a3f"
-  integrity sha512-GXBO30Wb0RpAMxT2f7b0bli2VNFky9WI1JKZArueZqmxvPmt7cr90pMuNy5lGy7iFpATSwQ+KOaADUu7f8lmBA==
+"@glimmer/vm@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.5.tgz#ff244acb0ce4a0076df01da8fdd37d690833e478"
+  integrity sha512-SsG/BEnM+ySk236UlHHoxYufdWwMSmr2RiapQp6O4pDzy7npkRebTYOzXCXpYrFkjDcTwPaygYCnr7RRFJXEUA==
   dependencies:
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/util" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/util" "0.77.5"
 
-"@glimmer/wire-format@0.77.3":
-  version "0.77.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.3.tgz#688352e67c3e4a20e7665de9d8547cb024525f17"
-  integrity sha512-JA5Y2h+5vjsavXdeprHLhE2gE3oW1JU5qkluNfL2Wa2HV7omLH3Nha7U5xFoWdpndKzhxvfxhqgxtCfAD0YI0w==
+"@glimmer/wire-format@0.77.5":
+  version "0.77.5"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.5.tgz#326ae0e09d81182096c0e4efef7cc197d96081d4"
+  integrity sha512-/FyjStQtyHkCS8dOp7t79e+PIgEAF0yo9rxmazexl3Ie3ePE9qRxOQi/GKIxi1V1YGpxxv8Aq6wP8kteUzCDaQ==
   dependencies:
-    "@glimmer/interfaces" "0.77.3"
-    "@glimmer/util" "0.77.3"
+    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/util" "0.77.5"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
@@ -1785,7 +1785,7 @@
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  integrity "sha1-Olgr21OATGum0UZXnEblITDPSjs= sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="
   dependencies:
     "@nodelib/fs.stat" "2.0.3"
     run-parallel "^1.1.9"
@@ -1793,12 +1793,12 @@
 "@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+  integrity "sha1-NNxfTKu8cg9OYPdadH5+zWwXW9M= sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
 
 "@nodelib/fs.walk@^1.2.3":
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  integrity "sha1-ARuSAqcKY2bkNspcBlhEUoqwSXY= sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="
   dependencies:
     "@nodelib/fs.scandir" "2.1.3"
     fastq "^1.6.0"
@@ -1806,7 +1806,7 @@
 "@simple-dom/document@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/document/-/document-1.4.0.tgz#af60855f957f284d436983798ef1006cca1a1678"
-  integrity sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg==
+  integrity "sha1-r2CFX5V/KE1DaYN5jvEAbMoaFng= sha512-/RUeVH4kuD3rzo5/91+h4Z1meLSLP66eXqpVAw/4aZmYozkeqUkMprq0znL4psX/adEed5cBgiNJcfMz/eKZLg=="
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1818,31 +1818,31 @@
 "@simple-dom/parser@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/parser/-/parser-1.4.0.tgz#b1fee1a23f48a37d6bdd98f5242db0cab5b67abc"
-  integrity sha512-TNjDkOehueRIKr1df416qk9ELj+qWuVVJNIT25y1aZg3pQvxv4UPGrgaDFte7dsWBTbF3V8NYPNQ5FDUZQ8Wlg==
+  integrity "sha1-sf7hoj9Io31r3Zj1JC2wyrW2erw= sha512-TNjDkOehueRIKr1df416qk9ELj+qWuVVJNIT25y1aZg3pQvxv4UPGrgaDFte7dsWBTbF3V8NYPNQ5FDUZQ8Wlg=="
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
 "@simple-dom/serializer@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/serializer/-/serializer-1.4.0.tgz#98470f357f418d72b1a1ec78d68191e60aefe215"
-  integrity sha512-mI1yRahsVs8atXLiQksineDsFEFqeG7RHwnnBTDOK6inbzl4tZQgjR+Z7edjgIJq5j5RhZvwPI6EuCji9B3eQw==
+  integrity "sha1-mEcPNX9BjXKxoex41oGR5grv4hU= sha512-mI1yRahsVs8atXLiQksineDsFEFqeG7RHwnnBTDOK6inbzl4tZQgjR+Z7edjgIJq5j5RhZvwPI6EuCji9B3eQw=="
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
 "@simple-dom/void-map@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@simple-dom/void-map/-/void-map-1.4.0.tgz#f15f07568fe1076740407266aa5e6eac249bc78c"
-  integrity sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw==
+  integrity "sha1-8V8HVo/hB2dAQHJmql5urCSbx4w= sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw=="
 
 "@sindresorhus/is@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+  integrity "sha1-mgb08TfuhNffBGDB/bETX/psUP0= sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
 
 "@types/acorn@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd"
-  integrity sha512-gou/kWQkGPMZjdCKNZGDpqxLm9+ErG/pFZKPX4tvCjr0Xf4FCYYX3nAsu7aDVKJV3KUe27+mvqqyWT/9VZoM/A==
+  integrity "sha1-0fPnON3lJTb5qtPTOA0U5EiCCv0= sha512-gou/kWQkGPMZjdCKNZGDpqxLm9+ErG/pFZKPX4tvCjr0Xf4FCYYX3nAsu7aDVKJV3KUe27+mvqqyWT/9VZoM/A=="
   dependencies:
     "@types/estree" "*"
 
@@ -1854,7 +1854,7 @@
 "@types/estree@*", "@types/estree@0.0.38":
   version "0.0.38"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
-  integrity sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA==
+  integrity "sha1-wb5AqpM3I8YIggqZo3OhbSFaHKI= sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA=="
 
 "@types/events@*":
   version "3.0.0"
@@ -1880,12 +1880,12 @@
 "@types/json-schema@^7.0.3":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+  integrity "sha1-9MfsQ+gbMZqYFRFQMXCfJph4kfA= sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
 
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+  integrity "sha1-7ihweulOEdK4J7y+UnC86n8+ce4= sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
 
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
@@ -1900,17 +1900,17 @@
 "@types/node@^9.6.0":
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
-  integrity sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg==
+  integrity "sha1-00gO5mbfl4SxABoYcqL2zO+2wtc= sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg=="
 
 "@types/qunit@^2.9.1":
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.9.1.tgz#6083a42907ae6c9eecece794844bc3f8659e6c03"
-  integrity sha512-v51Fz/orMOkBGzrRvskky3UN0I81ka6rokAxkcuVyLHAh0qNKp+Roqympg/gTia8vGOIEbeSykevI0VKiIF13Q==
+  integrity "sha1-YIOkKQeubJ7s7OeUhEvD+GWebAM= sha512-v51Fz/orMOkBGzrRvskky3UN0I81ka6rokAxkcuVyLHAh0qNKp+Roqympg/gTia8vGOIEbeSykevI0VKiIF13Q=="
 
 "@types/resolve@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
-  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  integrity "sha1-8mB00jjgJlnjI84aE9BB7uKA4ZQ= sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ=="
   dependencies:
     "@types/node" "*"
 
@@ -1925,7 +1925,7 @@
 "@types/rsvp@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.3.tgz#4a1223158453257bce09d42b9eef7cfa6d257482"
-  integrity sha512-OpRwxbgx16nL/0/7ol0WoLLyLaMXBvtPOHjqLljnzAB/E7Qk1wtjytxgBhOTBMZvuLXnJUqfnjb4W/QclNFvSA==
+  integrity "sha1-ShIjFYRTJXvOCdQrnu98+m0ldII= sha512-OpRwxbgx16nL/0/7ol0WoLLyLaMXBvtPOHjqLljnzAB/E7Qk1wtjytxgBhOTBMZvuLXnJUqfnjb4W/QclNFvSA=="
 
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"
@@ -1935,14 +1935,14 @@
 "@types/yauzl@^2.9.1":
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
-  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
+  integrity "sha1-0Q9p+fUi7vPPmOMK+2hKHh7JI68= sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="
   dependencies:
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa"
-  integrity sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g==
+  integrity "sha1-GiPZBL+OokjQncN2GvUw2Q85yPo= sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g=="
   dependencies:
     "@typescript-eslint/experimental-utils" "4.3.0"
     "@typescript-eslint/scope-manager" "4.3.0"
@@ -1955,7 +1955,7 @@
 "@typescript-eslint/experimental-utils@4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87"
-  integrity sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ==
+  integrity "sha1-PzxsUI4BuAUNUbAW5/faDjrvy4c= sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ=="
   dependencies:
     "@types/json-schema" "^7.0.3"
     "@typescript-eslint/scope-manager" "4.3.0"
@@ -1967,7 +1967,7 @@
 "@typescript-eslint/parser@^4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3"
-  integrity sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g==
+  integrity "sha1-aE/AvmVRor/LJTmR7sPHhqjAY6M= sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g=="
   dependencies:
     "@typescript-eslint/scope-manager" "4.3.0"
     "@typescript-eslint/types" "4.3.0"
@@ -1977,7 +1977,7 @@
 "@typescript-eslint/scope-manager@4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
-  integrity sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig==
+  integrity "sha1-x0Mifgh1RZaAgNI2LPsSc4Qstqc= sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig=="
   dependencies:
     "@typescript-eslint/types" "4.3.0"
     "@typescript-eslint/visitor-keys" "4.3.0"
@@ -1985,12 +1985,12 @@
 "@typescript-eslint/types@4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
-  integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==
+  integrity "sha1-HwstXhQFQ+JhTwbUj7OulRk8bd8= sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw=="
 
 "@typescript-eslint/typescript-estree@4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
-  integrity sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw==
+  integrity "sha1-DtwQaOay5Mf9xU1h4yn852JBzug= sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw=="
   dependencies:
     "@typescript-eslint/types" "4.3.0"
     "@typescript-eslint/visitor-keys" "4.3.0"
@@ -2004,7 +2004,7 @@
 "@typescript-eslint/visitor-keys@4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"
-  integrity sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw==
+  integrity "sha1-DlqwoJVSkD7eriBZguhSHhdjWuA= sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw=="
   dependencies:
     "@typescript-eslint/types" "4.3.0"
     eslint-visitor-keys "^2.0.0"
@@ -2012,12 +2012,12 @@
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+  integrity "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg= sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+  integrity "sha1-UxvHJlF6OytB+FACHGzBXqq1B80= sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="
   dependencies:
     mime-types "~2.1.24"
     negotiator "0.6.2"
@@ -2025,46 +2025,46 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
+  integrity "sha1-kBzu5Mf6rvfgetKkfokGddpQong= sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg=="
   dependencies:
     acorn "^5.0.0"
 
 acorn-jsx@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+  integrity "sha1-TGYGkXPW/daO2FI5/CViJhgrLr4= sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="
 
 acorn@^5.0.0, acorn@^5.5.3:
   version "5.7.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
-  integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
+  integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
 
 acorn@^7.4.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
+  integrity "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw= sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="
 
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+  integrity "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA=="
 
 agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+  integrity "sha1-6Ps/JClZ20TWO+Zl23qOc5U3oyw= sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
 
 agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  integrity "sha1-gWXwHENgCbzK0LHRIvBe13Dvxu4= sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="
   dependencies:
     es6-promisify "^5.0.0"
 
 ajv@^6.10.0, ajv@^6.9.1:
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
+  integrity "sha1-BtYLlth7hFSlrauobnhU2mKdtLc= sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2074,7 +2074,7 @@ ajv@^6.10.0, ajv@^6.9.1:
 ajv@^6.12.4:
   version "6.12.5"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
-  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  integrity "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo= sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -2097,52 +2097,52 @@ amdefine@>=0.0.4:
 ansi-colors@3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+  integrity "sha1-V9NbhoboUeLMBMQD8cACA5dqGBM= sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="
 
 ansi-colors@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+  integrity "sha1-y7muJWv3UK8eqzRPIpqif+lLo0g= sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+  integrity "sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s= sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
 
 ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
-  integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
+  integrity "sha1-gTWEAhliqenm/QOflA0S9WynhZ4= sha512-JoAxEa1DfP9m2xfB/y2r/aKcwXNlltr4+0QSBC4TrLfcxyvepX2Pv0t/xpgGV5bGsDzCYV8SzjWgyCW0T9yYbA=="
 
 ansi-regex@^1.0.0, ansi-regex@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d"
-  integrity sha1-QchHGUZGN15qGl0Qw8oFTvn8mA0=
+  integrity "sha1-QchHGUZGN15qGl0Qw8oFTvn8mA0= sha512-q5i8bFLg2wDfsuR56c1NzlJFPzVD+9mxhDrhqOGigEFa87OZHlF+9dWeGWzVTP/0ECiA/JUGzfzRr2t3eYORRw=="
 
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  integrity "sha1-w7M6te42DYbg5ijwRorn7yfWVN8= sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="
 
 ansi-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  integrity "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= sha512-wFUFA5bg5dviipbQQ32yOQhl6gcJaJXiHE7dvR8VYPG97+J/GNC5FKGepKdEDUFeXRzDxPF1X/Btc8L+v7oqIQ=="
 
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  integrity "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc= sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
 
 ansi-regex@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+  integrity "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U= sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
 
 ansi-styles@^2.0.1, ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+  integrity "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="
 
 ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
@@ -2162,12 +2162,12 @@ ansi-styles@^4.1.0:
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
-  integrity sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8=
+  integrity "sha1-vgiVmQl7dKXJxKhKDNvNtivYeu8= sha512-tOIuy1/SK/dr94ZA0ckDohKXNeBNqZ4us6PjMVLs5h1w2GBB6uPtOknp2+VF4F/zcy9LI70W+Z+pE2Soajky1w=="
 
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+  integrity "sha1-vLJLTzeTTZqnrBe0ra+J58du8us= sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="
   dependencies:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
@@ -2175,7 +2175,7 @@ anymatch@^2.0.0:
 anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  integrity "sha1-xV7PAhheJGklk5kxDBc84xIzsUI= sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -2183,12 +2183,12 @@ anymatch@~3.1.1:
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+  integrity "sha1-aALmJk79GMeQobDVF/DyYnvyyUo= sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
 
 are-we-there-yet@~1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-  integrity sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=
+  integrity "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= sha512-QbMPI8teYlZBIBqDgmIWfDKO149dGtQV2ium8WniCaARFFRd1e+IES1LA4sSGcVTFdVL628+163WUbxev7R/aQ=="
   dependencies:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
@@ -2196,24 +2196,24 @@ are-we-there-yet@~1.1.2:
 argparse@^1.0.7, argparse@~1.0.2:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  integrity "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE= sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="
   dependencies:
     sprintf-js "~1.0.2"
 
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+  integrity "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="
 
 arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
+  integrity "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE= sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
 
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+  integrity "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="
 
 array-equal@^1.0.0:
   version "1.0.0"
@@ -2223,17 +2223,17 @@ array-equal@^1.0.0:
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+  integrity "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="
 
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+  integrity "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 
 array-includes@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
+  integrity "sha1-zdZ+aFK9+cEhVGB4ZzIlXtJFk0g= sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.0"
@@ -2242,29 +2242,29 @@ array-includes@^3.1.1:
 array-to-error@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-to-error/-/array-to-error-1.1.1.tgz#d68812926d14097a205579a667eeaf1856a44c07"
-  integrity sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc=
+  integrity "sha1-1ogSkm0UCXogVXmmZ+6vGFakTAc= sha512-kqcQ8s7uQfg3UViYON3kCMcck3A9exxgq+riVuKy08Mx00VN4EJhK30L2VpjE58LQHKhcE/GRpvbVUhqTvqzGQ=="
   dependencies:
     array-to-sentence "^1.1.0"
 
 array-to-sentence@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/array-to-sentence/-/array-to-sentence-1.1.0.tgz#c804956dafa53232495b205a9452753a258d39fc"
-  integrity sha1-yASVba+lMjJJWyBalFJ1OiWNOfw=
+  integrity "sha1-yASVba+lMjJJWyBalFJ1OiWNOfw= sha512-YkwkMmPA2+GSGvXj1s9NZ6cc2LBtR+uSeWTy2IGi5MR1Wag4DdrcjTxA/YV/Fw+qKlBeXomneZgThEbm/wvZbw=="
 
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
-  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+  integrity "sha1-t5hCCtvrHego2ErNii4j0+/oXo0= sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
 
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+  integrity "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
 
 array.prototype.flat@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
+  integrity "sha1-DegrQmsDGNv9uUAInjiwQ9N/bHs= sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
@@ -2272,32 +2272,32 @@ array.prototype.flat@^1.2.3:
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+  integrity "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU= sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
 
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+  integrity "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="
 
 asn1@0.1.11:
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
-  integrity sha1-VZvhg3bQik7E2+gId9J4GGObLfc=
+  integrity "sha1-VZvhg3bQik7E2+gId9J4GGObLfc= sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA=="
 
 assert-plus@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-  integrity sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=
+  integrity "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA= sha512-brU24g7ryhRwGCI2y+1dGQmQXiZF7TtIj583S96y0jjdajIe6wn8BuXyELYhvD22dtIxDQVFk04YTJwwdwOYJw=="
 
 assertion-error@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
-  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
+  integrity "sha1-5gtrDo8wG9l+U3UhW9pAbIURjAs= sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+  integrity "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="
 
 ast-types@0.13.2:
   version "0.13.2"
@@ -2307,7 +2307,7 @@ ast-types@0.13.2:
 astral-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+  integrity "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k= sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
 
 async-disk-cache@^1.2.1:
   version "1.3.3"
@@ -2333,7 +2333,7 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
 async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
+  integrity "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w=="
 
 async@^2.4.1:
   version "2.6.1"
@@ -2345,27 +2345,27 @@ async@^2.4.1:
 async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-  integrity sha1-trvgsGdLnXGXCMo43owjfLUmw9E=
+  integrity "sha1-trvgsGdLnXGXCMo43owjfLUmw9E= sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ=="
 
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+  integrity "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= sha512-l6ToIJIotphWahxxHyzK9bnLR6kM4jJIIgLShZeqLY7iboHoGkdgFl7W2/Ivi4SkMJYGKqW8vSuk0uKUj6qsSw=="
 
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+  integrity "sha1-YCzUtG6EStTv/JKoARo8RuAjjcI= sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
 
 atob@^2.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+  integrity "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k= sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
 
 auto-dist-tag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/auto-dist-tag/-/auto-dist-tag-1.0.0.tgz#ded651a2802c74dc268c49352a573344a6d52fd6"
-  integrity sha512-URcE69HrQNgcYNHhhTFSoOk7g5tzjF33x1ToD37nU5BcuN/ehC5r3fmMYTRNvfDoJlxBOWy+dt5Ru4ex+Q/orQ==
+  integrity "sha1-3tZRooAsdNwmjEk1KlczRKbVL9Y= sha512-URcE69HrQNgcYNHhhTFSoOk7g5tzjF33x1ToD37nU5BcuN/ehC5r3fmMYTRNvfDoJlxBOWy+dt5Ru4ex+Q/orQ=="
   dependencies:
     debug "^3.1.0"
     fs-extra "^6.0.1"
@@ -2377,7 +2377,7 @@ auto-dist-tag@^1.0.0:
 aws-sdk@^2.0.9, aws-sdk@^2.686.0:
   version "2.686.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.686.0.tgz#c58c3874eff4c76c763d137df617e87971321eb7"
-  integrity sha512-QhYhJ5y8tUG5SlmY3CSf9RBaa3EFbta28oarOyiwceHKmY80cMCafRI1YypT6CVDx/q91dbnSNQfWhs0cZPbBQ==
+  integrity "sha1-xYw4dO/0x2x2PRN99hfoeXEyHrc= sha512-QhYhJ5y8tUG5SlmY3CSf9RBaa3EFbta28oarOyiwceHKmY80cMCafRI1YypT6CVDx/q91dbnSNQfWhs0cZPbBQ=="
   dependencies:
     buffer "4.9.1"
     events "1.1.1"
@@ -2392,12 +2392,12 @@ aws-sdk@^2.0.9, aws-sdk@^2.686.0:
 aws-sign2@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz#c57103f7a17fc037f02d7c2e64b602ea223f7d63"
-  integrity sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=
+  integrity "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM= sha512-oqUX0DM5j7aPWPCnpWebiyNIj2wiNI87ZxnOMoGv0aE4TGlBy2N+5iWc6dQ/NOKZaBD2W6PVz8jtOGkWzSC5EA=="
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  integrity "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g=="
   dependencies:
     chalk "^1.1.3"
     esutils "^2.0.2"
@@ -2406,7 +2406,7 @@ babel-code-frame@^6.26.0:
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
+  integrity "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4= sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w=="
   dependencies:
     babel-runtime "^6.22.0"
 
@@ -2467,7 +2467,7 @@ babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  integrity "sha1-llxwWGaOgrVde/4E/yM3vItWR/4= sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
@@ -2475,7 +2475,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0:
 babel-template@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
+  integrity "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg=="
   dependencies:
     babel-runtime "^6.26.0"
     babel-traverse "^6.26.0"
@@ -2486,7 +2486,7 @@ babel-template@^6.26.0:
 babel-traverse@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
+  integrity "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4= sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA=="
   dependencies:
     babel-code-frame "^6.26.0"
     babel-messages "^6.23.0"
@@ -2501,7 +2501,7 @@ babel-traverse@^6.26.0:
 babel-types@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
+  integrity "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g=="
   dependencies:
     babel-runtime "^6.26.0"
     esutils "^2.0.2"
@@ -2511,24 +2511,24 @@ babel-types@^6.26.0:
 babylon@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
+  integrity "sha1-ry87iPpvXB5MY00aD46sT1WzleM= sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
 
 backbone@^1.1.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999"
-  integrity sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=
+  integrity "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk= sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow=="
   dependencies:
     underscore ">=1.8.3"
 
 backburner.js@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/backburner.js/-/backburner.js-2.6.0.tgz#ff3315c38026cc52eb4447ce8de80ca71dd4cff0"
-  integrity sha512-mN3OPIffal2CgTisLaJ4yaMOvZukD9PJYJBQ+5gg1WoSPVAjctvmmX+7qb9N6SIQHt0ONcZC99laWA+Ol/IIEw==
+  integrity "sha1-/zMVw4AmzFLrREfOjegMpx3Uz/A= sha512-mN3OPIffal2CgTisLaJ4yaMOvZukD9PJYJBQ+5gg1WoSPVAjctvmmX+7qb9N6SIQHt0ONcZC99laWA+Ol/IIEw=="
 
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+  integrity "sha1-MasayLEpNjRj41s+u2n038+6eUc= sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -2538,22 +2538,22 @@ balanced-match@^1.0.0:
 base64-arraybuffer@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
+  integrity "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg=="
 
 base64-js@^1.0.2:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
-  integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
+  integrity "sha1-WOzoy3XdB+ce0IxzarxfrE2/jfE= sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
 
 base64id@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
-  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+  integrity "sha1-J3Csa8R9MSr5eov5pjQ0LgzSXLY= sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="
 
 base@^0.11.1:
   version "0.11.2"
   resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  integrity "sha1-e95c7RRbbVUakNuH+DxVi060io8= sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="
   dependencies:
     cache-base "^1.0.1"
     class-utils "^0.3.5"
@@ -2566,14 +2566,14 @@ base@^0.11.1:
 basic-auth@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"
-  integrity sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o=
+  integrity "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o= sha512-BNzMKPNNIV3+C02TSO9oILCAPS/htf/upL+TRV2gOnPwSQbFKuL249fwVozDNbSq/AeyoRoVeQgJcK4sN77aHg=="
   dependencies:
     safe-buffer "5.1.1"
 
 binary-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
-  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+  integrity "sha1-I8DfFPaogHf1+YbA0WfsA8PVU3w= sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="
 
 "binaryextensions@1 || 2":
   version "2.0.0"
@@ -2583,7 +2583,7 @@ binary-extensions@^2.0.0:
 bl@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
-  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
+  integrity "sha1-EtYoetwpCA4ipwXldksqlSLNxIk= sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"
@@ -2597,22 +2597,22 @@ blank-object@^1.0.1:
 blob@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
+  integrity "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM= sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
 
 bluebird@^3.1.1, bluebird@^3.4.6:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-  integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
+  integrity "sha1-2VUfnemPH82h5oPRfukaBgLuLrk= sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
 
 blueimp-md5@^2.10.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935"
-  integrity sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q==
+  integrity "sha1-EVK+EzXwxrORHtnjbbVPPmrFKTU= sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
 
 body-parser@1.19.0:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+  integrity "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io= sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="
   dependencies:
     bytes "3.1.0"
     content-type "~1.0.4"
@@ -2628,7 +2628,7 @@ body-parser@1.19.0:
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
-  integrity sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=
+  integrity "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk= sha512-chUsBxGRtuElD6fmw1gHLpvnKdVLK302peeFa9ZqAEk8TyzZ3fygLyUEDDPTJvL9+Bor0dIwn6ePOsRM2y0zQQ=="
   dependencies:
     continuable-cache "^0.3.1"
     error "^7.0.0"
@@ -2638,14 +2638,14 @@ body@^5.1.0:
 boom@0.4.x:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz#7a636e9ded4efcefb19cef4947a3c67dfaee911b"
-  integrity sha1-emNune1O/O+xnO9JR6PGffrukRs=
+  integrity "sha1-emNune1O/O+xnO9JR6PGffrukRs= sha512-OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g=="
   dependencies:
     hoek "0.9.x"
 
 bower-config@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc"
-  integrity sha1-hf2d82fCuNu9DKpMXyutQM2Ewsw=
+  integrity "sha1-hf2d82fCuNu9DKpMXyutQM2Ewsw= sha512-9k12aae2vBdIIbzJlRKta8qNMCM6V1cs0xutPBBrSrvhQk3iDuYCM/ICFpAafjfgeNFKa9HMJGSW/2Nt3gG7Yw=="
   dependencies:
     graceful-fs "^4.1.3"
     mout "^1.0.0"
@@ -2656,7 +2656,7 @@ bower-config@^1.4.1:
 bower-endpoint-parser@0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz#00b565adbfab6f2d35addde977e97962acbcb3f6"
-  integrity sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=
+  integrity "sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y= sha512-YWZHhWkPdXtIfH3VRu3QIV95sa75O9vrQWBOHjexWCLBCTy5qJvRr36LXTqFwTchSXVlzy5piYJOjzHr7qhsNg=="
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -2669,7 +2669,7 @@ brace-expansion@^1.1.7:
 braces@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
-  integrity sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==
+  integrity "sha1-cIbJE7TloI2+N6wO5qJQDEumkbs= sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ=="
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
@@ -2687,14 +2687,14 @@ braces@^2.3.1:
 braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  integrity "sha1-NFThpGLujVmeI23zNs2epPiv4Qc= sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="
   dependencies:
     fill-range "^7.0.1"
 
 broccoli-amd-funnel@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-amd-funnel/-/broccoli-amd-funnel-2.0.1.tgz#dbdbfd28841731342d538126567c25bea3f15310"
-  integrity sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ==
+  integrity "sha1-29v9KIQXMTQtU4EmVnwlvqPxUxA= sha512-VRE+0PYAN4jQfkIq3GKRj4U/4UV9rVpLan5ll6fVYV4ziVg4OEfR5GUnILEg++QtR4xSaugRxCPU5XJLDy3bNQ=="
   dependencies:
     broccoli-plugin "^1.3.0"
     symlink-or-copy "^1.2.0"
@@ -2720,7 +2720,7 @@ broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.8.0:
 broccoli-builder@^0.18.14:
   version "0.18.14"
   resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d"
-  integrity sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0=
+  integrity "sha1-S3ni+ETeEaThuBbD9Jxt9HdsMS0= sha512-YoUHeKnPi4xIGZ2XDVN9oHNA9k3xF5f5vlA+1wvrxIIDXqQU97gp2FxVAF503Zxdtt0C5CRB5n+47k2hlkaBzA=="
   dependencies:
     broccoli-node-info "^1.1.0"
     heimdalljs "^0.2.0"
@@ -2733,7 +2733,7 @@ broccoli-builder@^0.18.14:
 broccoli-caching-writer@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-3.0.3.tgz#0bd2c96a9738d6a6ab590f07ba35c5157d7db476"
-  integrity sha1-C9LJapc41qarWQ8HujXFFX19tHY=
+  integrity "sha1-C9LJapc41qarWQ8HujXFFX19tHY= sha512-g644Kb5uBPsy+6e2DvO3sOc+/cXZQQNgQt64QQzjA9TSdP0dl5qvetpoNIx4sy/XIjrPYG1smEidq9Z9r61INw=="
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     broccoli-plugin "^1.2.1"
@@ -2745,7 +2745,7 @@ broccoli-caching-writer@^3.0.3:
 broccoli-caching-writer@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/broccoli-caching-writer/-/broccoli-caching-writer-2.0.4.tgz#d995d7d1977292e498f78df05887230fcb4a5e2c"
-  integrity sha1-2ZXX0ZdykuSY943wWIcjD8tKXiw=
+  integrity "sha1-2ZXX0ZdykuSY943wWIcjD8tKXiw= sha512-+68OQpkriDc3b6tNgZmCCgE1UpfSKhMktXHrRYyJFcEc+g4T5dJe0N2vNUx96HwHo4FKmpReSanXoaXOgjQ/fA=="
   dependencies:
     broccoli-kitchen-sink-helpers "^0.2.5"
     broccoli-plugin "1.1.0"
@@ -2759,7 +2759,7 @@ broccoli-caching-writer@~2.0.4:
 broccoli-clean-css@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-clean-css/-/broccoli-clean-css-1.1.0.tgz#9db143d9af7e0ae79c26e3ac5a9bb2d720ea19fa"
-  integrity sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo=
+  integrity "sha1-nbFD2a9+CuecJuOsWpuy1yDqGfo= sha512-S7/RWWX+lL42aGc5+fXVLnwDdMtS0QEWUFalDp03gJ9Na7zj1rWa351N2HZ687E2crM9g+eDWXKzD17cbcTepg=="
   dependencies:
     broccoli-persistent-filter "^1.1.6"
     clean-css-promise "^0.1.0"
@@ -2769,7 +2769,7 @@ broccoli-clean-css@^1.1.0:
 broccoli-concat@^3.7.3:
   version "3.7.4"
   resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.4.tgz#7371e846eb7a97cb44ccff10f68582bcadcafacd"
-  integrity sha512-9gRv1tyCQuq2+48DT9DQyxRNLOuwDtHybDeYuWA3g26HFqZd0PGAOeXcLXHpKRhxzrEbU6Gm28dZ/KolMr04cQ==
+  integrity "sha1-c3HoRut6l8tEzP8Q9oWCvK3K+s0= sha512-9gRv1tyCQuq2+48DT9DQyxRNLOuwDtHybDeYuWA3g26HFqZd0PGAOeXcLXHpKRhxzrEbU6Gm28dZ/KolMr04cQ=="
   dependencies:
     broccoli-debug "^0.6.5"
     broccoli-kitchen-sink-helpers "^0.3.1"
@@ -2804,14 +2804,14 @@ broccoli-concat@^4.2.4:
 broccoli-config-loader@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-config-loader/-/broccoli-config-loader-1.0.1.tgz#d10aaf8ebc0cb45c1da5baa82720e1d88d28c80a"
-  integrity sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg==
+  integrity "sha1-0QqvjrwMtFwdpbqoJyDh2I0oyAo= sha512-MDKYQ50rxhn+g17DYdfzfEM9DjTuSGu42Db37A8TQHQe8geYEcUZ4SQqZRgzdAI3aRQNlA1yBHJfOeGmOjhLIg=="
   dependencies:
     broccoli-caching-writer "^3.0.3"
 
 broccoli-config-replace@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-config-replace/-/broccoli-config-replace-1.1.2.tgz#6ea879d92a5bad634d11329b51fc5f4aafda9c00"
-  integrity sha1-bqh52SpbrWNNETKbUfxfSq/anAA=
+  integrity "sha1-bqh52SpbrWNNETKbUfxfSq/anAA= sha512-qLlEY3V7p3ZWJNRPdPgwIM77iau1qR03S9BupMMFngjzBr7S6RSzcg96HbCYXmW9gfTbjRm9FC4CQT81SBusZg=="
   dependencies:
     broccoli-kitchen-sink-helpers "^0.3.1"
     broccoli-plugin "^1.2.0"
@@ -2833,7 +2833,7 @@ broccoli-debug@^0.6.4, broccoli-debug@^0.6.5:
 broccoli-file-creator@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-2.1.1.tgz#7351dd2496c762cfce7736ce9b49e3fce0c7b7db"
-  integrity sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw==
+  integrity "sha1-c1HdJJbHYs/OdzbOm0nj/ODHt9s= sha512-YpjOExWr92C5vhnK0kmD81kM7U09kdIRZk9w4ZDCDHuHXW+VE/x6AGEOQQW3loBQQ6Jk+k+TSm8dESy4uZsnjw=="
   dependencies:
     broccoli-plugin "^1.1.0"
     mkdirp "^0.5.1"
@@ -2841,7 +2841,7 @@ broccoli-file-creator@^2.1.1:
 broccoli-funnel-reducer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea"
-  integrity sha1-ETZbKnha7JsXlyo234fu8kxcwOo=
+  integrity "sha1-ETZbKnha7JsXlyo234fu8kxcwOo= sha512-SaOCEdh+wnt2jFUV2Qb32m7LXyElvFwW3NKNaEJyi5PGQNwxfqpkc0KI6AbQANKgdj/40U2UC0WuGThFwuEUaA=="
 
 broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
   version "2.0.2"
@@ -2865,7 +2865,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
 broccoli-funnel@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
-  integrity sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ==
+  integrity "sha1-Jv1CYyRx9nqR9HcNGYcRgIchmTc= sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ=="
   dependencies:
     array-equal "^1.0.0"
     blank-object "^1.0.1"
@@ -2881,7 +2881,7 @@ broccoli-funnel@^3.0.3:
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
-  integrity sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw=
+  integrity "sha1-peCYbtjXb7WYS2jD8EUNOpbjbsw= sha512-C+oEqivDofZv/h80rgN4WJkbZkbfwkrIeu8vFn4bb4m4jPd3ICNNplhkXGl3ps439pzc2yjZ1qIwz0yy8uHcQg=="
   dependencies:
     glob "^5.0.10"
     mkdirp "^0.5.1"
@@ -2897,7 +2897,7 @@ broccoli-kitchen-sink-helpers@^0.3.1:
 broccoli-merge-trees@^1.1.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
-  integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
+  integrity "sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU= sha512-RXJAleytlED0dxXGEo2EXwrg5cCesY8LQzzGRogwGQmluoz+ijzxajpyWAW6wu/AyuQZj1vgnIqnld8jvuuXtQ=="
   dependencies:
     broccoli-plugin "^1.3.0"
     can-symlink "^1.0.0"
@@ -2927,7 +2927,7 @@ broccoli-merge-trees@^4.2.0:
 broccoli-middleware@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.0.1.tgz#093314f13e52fad7fa8c4254a4e4a4560c857a65"
-  integrity sha512-V/K5uozcEH/XJ09ZAL8aJt/W2UwJU8I8fA2FAg3u9gzs5dQrehHDtgSoKS2QjPjurRC1GSiYLcsMp36sezaQQg==
+  integrity "sha1-CTMU8T5S+tf6jEJUpOSkVgyFemU= sha512-V/K5uozcEH/XJ09ZAL8aJt/W2UwJU8I8fA2FAg3u9gzs5dQrehHDtgSoKS2QjPjurRC1GSiYLcsMp36sezaQQg=="
   dependencies:
     handlebars "^4.0.4"
     mime-types "^2.1.18"
@@ -2935,7 +2935,7 @@ broccoli-middleware@^2.0.1:
 broccoli-module-normalizer@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz#f9982d9cbb776b4ed754161cc6547784d3eb19de"
-  integrity sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ==
+  integrity "sha1-+ZgtnLt3a07XVBYcxlR3hNPrGd4= sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ=="
   dependencies:
     broccoli-plugin "^1.3.0"
     merge-trees "^1.0.1"
@@ -2945,7 +2945,7 @@ broccoli-module-normalizer@^1.3.0:
 broccoli-module-unification-reexporter@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz#031909c5d3f159ec11d5f9e2346f2861db8acb3e"
-  integrity sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A==
+  integrity "sha1-AxkJxdPxWewR1fniNG8oYduKyz4= sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A=="
   dependencies:
     broccoli-plugin "^1.3.0"
     mkdirp "^0.5.1"
@@ -2959,12 +2959,12 @@ broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
 broccoli-node-info@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
-  integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI=
+  integrity "sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI= sha512-DUohSZCdfXli/3iN6SmxPbck1OVG8xCkrLx47R25his06xVc1ZmmrOsrThiM8BsCWirwyocODiYJqNP5W2Hg1A=="
 
 broccoli-node-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.0.0.tgz#652a7940ede40630b84ad009c6236f4bc548b556"
-  integrity sha512-xfnzPYdf8Uu3mfhEPkh3CX1suGHNNW4k3f730llzr4Dl7UXvI5T8RUb7X04BSvJfvqYTekM/JTmYrjB01WAsCg==
+  integrity "sha1-ZSp5QO3kBjC4StAJxiNvS8VItVY= sha512-xfnzPYdf8Uu3mfhEPkh3CX1suGHNNW4k3f730llzr4Dl7UXvI5T8RUb7X04BSvJfvqYTekM/JTmYrjB01WAsCg=="
 
 broccoli-node-info@^2.1.0:
   version "2.1.0"
@@ -2983,7 +2983,7 @@ broccoli-output-wrapper@^3.2.1:
 broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1"
-  integrity sha512-JwNLDvvXJlhUmr+CHcbVhCyp33NbCIAITjQZmJY9e8QzANXh3jpFWlhSFvkWghwKA8rTAKcXkW12agtiZjxr4g==
+  integrity "sha1-NRG8UvxTdAzaUWIfWKKBUtmRG8E= sha512-JwNLDvvXJlhUmr+CHcbVhCyp33NbCIAITjQZmJY9e8QzANXh3jpFWlhSFvkWghwKA8rTAKcXkW12agtiZjxr4g=="
   dependencies:
     async-disk-cache "^1.2.1"
     async-promise-queue "^1.0.3"
@@ -3022,7 +3022,7 @@ broccoli-persistent-filter@^2.1.1, broccoli-persistent-filter@^2.2.1, broccoli-p
 broccoli-plugin@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.1.0.tgz#73e2cfa05f8ea1e3fc1420c40c3d9e7dc724bf02"
-  integrity sha1-c+LPoF+OoeP8FCDEDD2efcckvwI=
+  integrity "sha1-c+LPoF+OoeP8FCDEDD2efcckvwI= sha512-dY1QsA20of9wWEto8yhN7JQjpfjySmgeIMsvnQ9aBAv1wEJJCe04B0ekdgq7Bduyx9yWXdoC5CngGy81swmp2w=="
   dependencies:
     promise-map-series "^0.2.1"
     quick-temp "^0.1.3"
@@ -3055,7 +3055,7 @@ broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
 broccoli-rollup@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d"
-  integrity sha512-aky/Ovg5DbsrsJEx2QCXxHLA6ZR+9u1TNVTf85soP4gL8CjGGKQ/JU8R3BZ2ntkWzo6/83RCKzX6O+nlNKR5MQ==
+  integrity "sha1-C3fcS3VgpT6ZjqhfO1Z3JhLUmI0= sha512-aky/Ovg5DbsrsJEx2QCXxHLA6ZR+9u1TNVTf85soP4gL8CjGGKQ/JU8R3BZ2ntkWzo6/83RCKzX6O+nlNKR5MQ=="
   dependencies:
     "@types/node" "^9.6.0"
     amd-name-resolver "^1.2.0"
@@ -3072,7 +3072,7 @@ broccoli-rollup@^2.1.1:
 broccoli-slow-trees@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz#9bf2a9e2f8eb3ed3a3f2abdde988da437ccdc9b4"
-  integrity sha1-m/Kp4vjrPtOj8qvd6YjaQ3zNybQ=
+  integrity "sha1-m/Kp4vjrPtOj8qvd6YjaQ3zNybQ= sha512-YSziKLG9j0aKZBIO0u10DbCOlsVV6EEFWcY0W8rZdTwBS1eG3RSEyLYHhJhVMJTUZYYjphpDhedDMrdxUPm39A=="
   dependencies:
     heimdalljs "^0.2.1"
 
@@ -3084,14 +3084,14 @@ broccoli-source@^1.1.0:
 broccoli-source@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
-  integrity sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww==
+  integrity "sha1-x8m6JFBZQbcqAkRWgoW8hZ9p370= sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww=="
   dependencies:
     broccoli-node-api "^1.6.0"
 
 broccoli-stew@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.1.0.tgz#ba73add17fda3b9b01d8cfb343a8b613b7136a0a"
-  integrity sha512-tgCkuTWYl4uf7k7ib2D79KFEj2hCgnTUNPMnrCoAha0/4bywcNccmaZVWtL9Ex37yX5h5eAbnM/ak2ULoMwSSw==
+  integrity "sha1-unOt0X/aO5sB2M+zQ6i2E7cTago= sha512-tgCkuTWYl4uf7k7ib2D79KFEj2hCgnTUNPMnrCoAha0/4bywcNccmaZVWtL9Ex37yX5h5eAbnM/ak2ULoMwSSw=="
   dependencies:
     broccoli-debug "^0.6.5"
     broccoli-funnel "^2.0.0"
@@ -3111,7 +3111,7 @@ broccoli-stew@^2.1.0:
 broccoli-string-replace@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-string-replace/-/broccoli-string-replace-0.1.2.tgz#1ed92f85680af8d503023925e754e4e33676b91f"
-  integrity sha1-HtkvhWgK+NUDAjkl51Tk4zZ2uR8=
+  integrity "sha1-HtkvhWgK+NUDAjkl51Tk4zZ2uR8= sha512-QHESTrrrPlKuXQNWsvXawSQbV2g34wCZ5oKgd6bntdOuN8VHxbg1BCBHqVY5HxXJhWelimgGxj3vI7ECkyij8g=="
   dependencies:
     broccoli-persistent-filter "^1.1.5"
     minimatch "^3.0.3"
@@ -3119,7 +3119,7 @@ broccoli-string-replace@^0.1.2:
 broccoli-typescript-compiler@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-7.0.0.tgz#a7792ceb8db2ddb3d57e91e429750b4ce9568626"
-  integrity sha512-9BSZc9tVdm3SEbR7uyMQ6XqYMQWkdCvp2dPlZYnENEqbUToCIVOJuOZ24nrenR6N4eTZPnY3R99DkgyoxmRp5A==
+  integrity "sha1-p3ks642y3bPVfpHkKXULTOlWhiY= sha512-9BSZc9tVdm3SEbR7uyMQ6XqYMQWkdCvp2dPlZYnENEqbUToCIVOJuOZ24nrenR6N4eTZPnY3R99DkgyoxmRp5A=="
   dependencies:
     broccoli-funnel "^3.0.3"
     broccoli-merge-trees "^4.2.0"
@@ -3133,7 +3133,7 @@ broccoli-typescript-compiler@^7.0.0:
 broccoli-uglify-sourcemap@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
-  integrity sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g==
+  integrity "sha1-2W8dQfbBjppdSa8aWrlInNysHGw= sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g=="
   dependencies:
     async-promise-queue "^1.0.5"
     broccoli-plugin "^1.2.1"
@@ -3150,7 +3150,7 @@ broccoli-uglify-sourcemap@^3.2.0:
 broccoli@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.1.2.tgz#31a8758aa087a26d62f1dab65c1d0af87cbced73"
-  integrity sha512-lSQB5sReBO1yPnWvQEqrAtLomK1BB1lsFQjc/whszK9j37v0tvvuCOeHX40x7iw3D2V4CyiBrYUUPY4pBjwdzA==
+  integrity "sha1-Mah1iqCHom1i8dq2XB0K+Hy87XM= sha512-lSQB5sReBO1yPnWvQEqrAtLomK1BB1lsFQjc/whszK9j37v0tvvuCOeHX40x7iw3D2V4CyiBrYUUPY4pBjwdzA=="
   dependencies:
     ansi-html "^0.0.7"
     broccoli-node-info "^2.0.0"
@@ -3177,7 +3177,7 @@ broccoli@^3.1.1:
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
-  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+  integrity "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA= sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
 
 browserslist@^4.11.1:
   version "4.12.0"
@@ -3213,7 +3213,7 @@ browserslist@^4.8.3:
 browserstack-local@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.2.tgz#5d2248384b8aa0fc521df32001127f010a92458d"
-  integrity sha512-fRaynjF0MvtyyfPRy2NFnVwxLyNtD28K/v9xRsIjUVf7xLc80NIm7Nfr3KXlFmWizhG91PL/UAOXlHkoxQjaNw==
+  integrity "sha1-XSJIOEuKoPxSHfMgARJ/AQqSRY0= sha512-fRaynjF0MvtyyfPRy2NFnVwxLyNtD28K/v9xRsIjUVf7xLc80NIm7Nfr3KXlFmWizhG91PL/UAOXlHkoxQjaNw=="
   dependencies:
     https-proxy-agent "^2.2.1"
     is-running "^2.0.0"
@@ -3223,26 +3223,26 @@ browserstack-local@^1.4.2:
 browserstack@^1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.3.tgz#93ab48799a12ef99dbd074dd595410ddb196a7ac"
-  integrity sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==
+  integrity "sha1-k6tIeZoS75nb0HTdWVQQ3bGWp6w= sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg=="
   dependencies:
     https-proxy-agent "^2.2.1"
 
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
-  integrity sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=
+  integrity "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= sha512-FozP+z0rEpi3AywbeT1QnOrGFJDbC0986aFDR2NlNLF+/WEYdv/7/qb1FVtla+KBWswkQBOA7okWd+85ThWlCQ=="
   dependencies:
     node-int64 "^0.4.0"
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+  integrity "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA= sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
 
 buffer-alloc@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  integrity "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow= sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="
   dependencies:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
@@ -3250,22 +3250,22 @@ buffer-alloc@^1.2.0:
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+  integrity "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
 
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+  integrity "sha1-+PeLdniYiO858gXNY39o5wISKyw= sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
 
 buffer-from@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-  integrity sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==
+  integrity "sha1-TLiDLSNhJYmwQG6eKVbBfwb99TE= sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
 
 buffer@4.9.1:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
+  integrity "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg= sha512-DNK4ruAqtyHaN8Zne7PkBTO+dD1Lr0YfTduMqlIyjvQIoztBkUxrvL+hKeLW8NXFKHOq/2upkxuoS9znQ9bW9A=="
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -3274,7 +3274,7 @@ buffer@4.9.1:
 buffer@^5.2.1, buffer@^5.5.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  integrity "sha1-oxdJ3H2B2E2wir+Te2uMQDP2J4Y= sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw=="
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
@@ -3282,37 +3282,37 @@ buffer@^5.2.1, buffer@^5.5.0:
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
+  integrity "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ=="
 
 builtin-modules@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
-  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+  integrity "sha1-qtl8FRMet2tltQ7yCOdYTNdqdIQ= sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="
 
 builtins@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+  integrity "sha1-y5T662HIaWRR2zZTThQi+U8K7og= sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="
 
 bytes@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
-  integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
+  integrity "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g= sha512-/x68VkHLeTl3/Ll8IvxdwzhrT+IyKc52e/oyHhA2RwqPqswSnjVbSddfPRwAsJtbilMAPSRWwAlpxdYsSWOTKQ=="
 
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+  integrity "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
 
 bytes@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+  integrity "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
 
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  integrity "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI= sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="
   dependencies:
     collection-visit "^1.0.0"
     component-emitter "^1.2.1"
@@ -3327,7 +3327,7 @@ cache-base@^1.0.1:
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+  integrity "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0= sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ=="
   dependencies:
     clone-response "1.0.2"
     get-stream "3.0.0"
@@ -3340,19 +3340,19 @@ cacheable-request@^2.1.1:
 calculate-cache-key-for-tree@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-2.0.0.tgz#7ac57f149a4188eacb0a45b210689215d3fef8d6"
-  integrity sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ==
+  integrity "sha1-esV/FJpBiOrLCkWyEGiSFdP++NY= sha512-Quw8a6y8CPmRd6eU+mwypktYCwUcf8yVFIRbNZ6tPQEckX9yd+EBVEPC/GSZZrMWH9e7Vz4pT7XhpmyApRByLQ=="
   dependencies:
     json-stable-stringify "^1.0.1"
 
 callsites@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
-  integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
+  integrity "sha1-+361abcq16RYEvk/2UMKPkELPdM= sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw=="
 
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
+  integrity "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= sha512-Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q=="
   dependencies:
     camelcase "^4.1.0"
     map-obj "^2.0.0"
@@ -3361,12 +3361,12 @@ camelcase-keys@^4.0.0:
 camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+  integrity "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="
 
 camelcase@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
+  integrity "sha1-AylVJ9WL081Kp1Nj81sujZe+L0I= sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
 
 can-symlink@^1.0.0:
   version "1.0.0"
@@ -3393,14 +3393,14 @@ caniuse-lite@^1.0.30001157:
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  integrity "sha1-+5U7+uvreB9iiYI52rtCbQilCaQ= sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g=="
   dependencies:
     rsvp "^4.8.4"
 
 cardinal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
-  integrity sha1-UOIcGwqjdyn5N33vGWtanOyTLuk=
+  integrity "sha1-UOIcGwqjdyn5N33vGWtanOyTLuk= sha512-INsuF4GyiFLk8C91FPokbKTc/rwHqV4JnfatVZ6GPhguP1qmkRWX2dp5tepYboYdPpGWisLVLI+KsXoXFPRSMg=="
   dependencies:
     ansicolors "~0.2.1"
     redeyed "~1.0.0"
@@ -3408,28 +3408,28 @@ cardinal@^1.0.0:
 chai-as-promised@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-6.0.0.tgz#1a02a433a6f24dafac63b9c96fa1684db1aa8da6"
-  integrity sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=
+  integrity "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY= sha512-Zf5Dq6p4d0pApi662BtRe95oKYbEyNb+TLbIdwVSlewYxVhtMYwrTD3TAmcaf1XanuBw7egusnLxLXlMnv0myw=="
   dependencies:
     check-error "^1.0.2"
 
 chai-as-promised@^7.0.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/chai-as-promised/-/chai-as-promised-7.1.1.tgz#08645d825deb8696ee61725dbf590c012eb00ca0"
-  integrity sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==
+  integrity "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA= sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA=="
   dependencies:
     check-error "^1.0.2"
 
 chai-files@^1.0.0, chai-files@^1.1.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/chai-files/-/chai-files-1.4.0.tgz#0e25610fadc551b1eae79c2f4ee79faf2f842296"
-  integrity sha1-DiVhD63FUbHq55wvTuefry+EIpY=
+  integrity "sha1-DiVhD63FUbHq55wvTuefry+EIpY= sha512-tPTx7H2kpR+wILWHRx8RxpXcRUdc2uH8su505C9R3p5GA+eYbZBXuxWC0RZbyElYi7X7Fp/V/S2PQjkakrT1mQ=="
   dependencies:
     assertion-error "^1.0.1"
 
 chai@^3.3.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-3.5.0.tgz#4d02637b067fe958bdbfdd3a40ec56fef7373247"
-  integrity sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=
+  integrity "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc= sha512-eRYY0vPS2a9zt5w5Z0aCeWbrXTEyvk7u/Xf71EzNObrjSCPgMm1Nku/D/u2tiqHBX5j40wWhj54YJLtgn8g55A=="
   dependencies:
     assertion-error "^1.0.1"
     deep-eql "^0.1.3"
@@ -3438,7 +3438,7 @@ chai@^3.3.0:
 chai@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.2.tgz#0f64584ba642f0f2ace2806279f4f06ca23ad73c"
-  integrity sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=
+  integrity "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw= sha512-YTHf80rJ8M5/cJoFKEV1y3PnexbGs0vSHjouRRU8gLM05Nc3Mqq9zor/P4SCqB/sgvKRLvya7wHLC1XQ9pTjgQ=="
   dependencies:
     assertion-error "^1.0.1"
     check-error "^1.0.1"
@@ -3450,7 +3450,7 @@ chai@^4.1.0:
 chalk@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.0.0.tgz#b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"
-  integrity sha1-s89O0P9Tl8mcdbj2edsvUoMfltw=
+  integrity "sha1-s89O0P9Tl8mcdbj2edsvUoMfltw= sha512-1TE3hpADga5iWinlcCpyhC7fTl9uQumLD8i2jJoJeVg7UbveY5jj7F6uCq8w0hQpSeLhaPn5QFe8e56toMVP1A=="
   dependencies:
     ansi-styles "^2.0.1"
     escape-string-regexp "^1.0.2"
@@ -3461,7 +3461,7 @@ chalk@1.0.0:
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  integrity "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -3489,24 +3489,24 @@ chalk@^4.0.0:
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+  integrity "sha1-kAlISfCTfy7twkJdDSip5fDLrZ4= sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
 
 charm@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/charm/-/charm-1.0.2.tgz#8add367153a6d9a581331052c4090991da995e35"
-  integrity sha1-it02cVOm2aWBMxBSxAkJkdqZXjU=
+  integrity "sha1-it02cVOm2aWBMxBSxAkJkdqZXjU= sha512-wqW3VdPnlSWT4eRiYX+hcs+C6ViBPUWk1qTCd+37qw9kEm/a5n2qcyQDMBWvSYKN/ctqZzeXNQaeBjOetJJUkw=="
   dependencies:
     inherits "^2.0.1"
 
 check-error@^1.0.1, check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
+  integrity "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA=="
 
 chokidar@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
+  integrity "sha1-EsBxRmjFWAD2WeJi1JYql/r1VKY= sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -3521,17 +3521,17 @@ chokidar@3.3.0:
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
+  integrity "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs= sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
 
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+  integrity "sha1-Z6npZL4xpR4V5QENWObxKDQAL0Y= sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
 
 class-utils@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
-  integrity sha1-F+eTEDdQ+WJ7IXbqNM/RtWWQPIA=
+  integrity "sha1-F+eTEDdQ+WJ7IXbqNM/RtWWQPIA= sha512-AXkeIVJMVzRmd6wDGCdtEfFRaE56r+UdBHn1v9gMof4lNs0fnQ2+/l2l3pKCf0x727Ce4a+xQr/psrMotjy0wA=="
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
@@ -3542,12 +3542,12 @@ class-utils@^0.3.5:
 clean-base-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clean-base-url/-/clean-base-url-1.0.0.tgz#c901cf0a20b972435b0eccd52d056824a4351b7b"
-  integrity sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s=
+  integrity "sha1-yQHPCiC5ckNbDszVLQVoJKQ1G3s= sha512-9q6ZvUAhbKOSRFY7A/irCQ/rF0KIpa3uXpx6izm8+fp7b2H4hLeUJ+F1YYk9+gDQ/X8Q0MEyYs+tG3cht//HTg=="
 
 clean-css-promise@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/clean-css-promise/-/clean-css-promise-0.1.1.tgz#43f3d2c8dfcb2bf071481252cd9b76433c08eecb"
-  integrity sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss=
+  integrity "sha1-Q/PSyN/LK/BxSBJSzZt2QzwI7ss= sha512-tzWkANXMD70ETa/wAu2TXAAxYWS0ZjVUFM2dVik8RQBoAbGMFJv4iVluz3RpcoEbo++fX4RV/BXfgGoOjp8o3Q=="
   dependencies:
     array-to-error "^1.0.0"
     clean-css "^3.4.5"
@@ -3556,7 +3556,7 @@ clean-css-promise@^0.1.0:
 clean-css@^3.4.5:
   version "3.4.28"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.28.tgz#bf1945e82fc808f55695e6ddeaec01400efd03ff"
-  integrity sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=
+  integrity "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8= sha512-aTWyttSdI2mYi07kWqHi24NUU9YlELFKGOAgFzZjDN1064DMAOy2FBuoyGmkKRlXkbpXd0EVHmiVkbKhKoirTw=="
   dependencies:
     commander "2.8.x"
     source-map "0.4.x"
@@ -3569,31 +3569,31 @@ clean-up-path@^1.0.0:
 cli-cursor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  integrity "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw=="
   dependencies:
     restore-cursor "^2.0.0"
 
 cli-spinners@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.1.0.tgz#22c34b4d51f573240885b201efda4e4ec9fff3c7"
-  integrity sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==
+  integrity "sha1-IsNLTVH1cyQIhbIB79pOTsn/88c= sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA=="
 
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
-  integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM=
+  integrity "sha1-9TsFJmqLGguTSz0IIebi3FkUriM= sha512-h/TzJrgwzVV+W6laITBZAxAWfBjX4T0x+LF5XJdS1AzDkXqmraMNnKQ/O/f3AHJKVR85fOglUEdS/B0P1wS7Aw=="
   dependencies:
     colors "1.0.3"
 
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+  integrity "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= sha512-EJLbKSuvHTrVRynOXCYFTbQKZOFXWNe3/6DN1yrEH3TuuZT1x4dMQnCHnfCrBUUiGjO63enEIfaB17VaRl2d4A=="
 
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  integrity "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U= sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="
   dependencies:
     string-width "^3.1.0"
     strip-ansi "^5.2.0"
@@ -3602,14 +3602,14 @@ cliui@^5.0.0:
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
+  integrity "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="
   dependencies:
     mimic-response "^1.0.0"
 
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  integrity "sha1-2jCcwmPfFZlMaIypAheco8fNfH4= sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
 
 clone@^2.1.2:
   version "2.1.2"
@@ -3619,19 +3619,19 @@ clone@^2.1.2:
 coa@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/coa/-/coa-0.4.0.tgz#252bc1be9740af15d826e490e8b1393c2fe2a062"
-  integrity sha1-JSvBvpdArxXYJuSQ6LE5PC/ioGI=
+  integrity "sha1-JSvBvpdArxXYJuSQ6LE5PC/ioGI= sha512-rGWmDcp/wV2gZZ40pbN8Jo9OHuDUYPF45X5pfPgIiGmfp4xCKCyb+7/iamd764XkDbf5nQBj3zboOCdOf1T5Ww=="
   dependencies:
     q "~0.9.6"
 
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
+  integrity "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="
 
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  integrity "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="
   dependencies:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
@@ -3663,68 +3663,68 @@ colorette@^1.2.1:
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-  integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
+  integrity "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="
 
 combined-stream@~0.0.4:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"
-  integrity sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=
+  integrity "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8= sha512-qfexlmLp9MyrkajQVyjEDb0Vj+KhRgR/rxLiVhaihlT+ZkX0lReqtH6Ack40CvMDERR4b5eFp3CreskpBs1Pig=="
   dependencies:
     delayed-stream "0.0.5"
 
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
+  integrity "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ= sha512-+pJLBFVk+9ZZdlAOB5WuIElVPPth47hILFkmGym57aq8kwxsowvByvB0DHs1vQAhyMZzdcpTtF0VDKGkSDR4ZQ=="
   dependencies:
     graceful-readlink ">= 1.0.0"
 
 commander@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
-  integrity sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==
+  integrity "sha1-uZC/uKwDCu3G0RvATRSI/+9W23U= sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="
 
 commander@^2.12.1, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+  integrity "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
 
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+  integrity "sha1-jjFT5ULUo56bEFVENK+q+YlWqTc= sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="
 
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
+  integrity "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw=="
 
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
+  integrity "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA=="
 
 component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+  integrity "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A= sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
 
 component-inherit@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+  integrity "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA=="
 
 compressible@~2.0.16:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
-  integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
+  integrity "sha1-bowQihatWDhKl386SCyiC/8vOME= sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw=="
   dependencies:
     mime-db ">= 1.40.0 < 2"
 
 compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
-  integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
+  integrity "sha1-lVI+/xcMpXwpoMpB5v4TH0Hlu48= sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="
   dependencies:
     accepts "~1.3.5"
     bytes "3.0.0"
@@ -3742,7 +3742,7 @@ concat-map@0.0.1:
 configstore@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
-  integrity sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==
+  integrity "sha1-WTMxHpXTaH77WSxSi5ItkmLSJ+c= sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ=="
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -3754,7 +3754,7 @@ configstore@^4.0.0:
 connect@^3.6.6:
   version "3.6.6"
   resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
+  integrity "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ= sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ=="
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -3764,12 +3764,12 @@ connect@^3.6.6:
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+  integrity "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
 
 console-ui@^3.0.2, console-ui@^3.0.4:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171"
-  integrity sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ==
+  integrity "sha1-aBoEFOiwoj7WedCigC452SCAEXE= sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ=="
   dependencies:
     chalk "^2.1.0"
     inquirer "^6"
@@ -3780,31 +3780,31 @@ console-ui@^3.0.2, console-ui@^3.0.4:
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
-  integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
+  integrity "sha1-IasEMjXHGgfUXZqtmFk7DbpWurc= sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="
   dependencies:
     bluebird "^3.1.1"
 
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+  integrity "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= sha512-OKZnPGeMQy2RPaUIBPFFd71iNf4791H12MCRuVQDnzGRwCYNYmTDy5pdafo2SLAcEMKzTOQnLWG4QdcjeJUMEg=="
 
 content-disposition@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  integrity "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70= sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="
   dependencies:
     safe-buffer "5.1.2"
 
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+  integrity "sha1-4TjMdeBAxyexlm/l5fjJruJW/js= sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
 
 continuable-cache@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
-  integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
+  integrity "sha1-vXJ6f67XfnH/OYWskzUakSczrQ8= sha512-TF30kpKhTH8AGCG3dut0rdd/19B7Z+qCnrMoBLpyQu/2drZdNrrpcjPEoJeSVsQM+8KmWG5O56oPDjSSUsuTyA=="
 
 convert-source-map@^1.7.0:
   version "1.7.0"
@@ -3816,22 +3816,22 @@ convert-source-map@^1.7.0:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  integrity "sha1-4wOogrNCzD7oylE6eZmXNNqzriw= sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
 
 cookie@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+  integrity "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo= sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
 
 cookie@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
+  integrity "sha1-r9cT/ibr0hupXOth+agRblClN9E= sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
+  integrity "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
 
 core-js-compat@^3.6.2:
   version "3.6.4"
@@ -3849,7 +3849,7 @@ core-js@^2.4.0, core-js@^2.6.5:
 core-object@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"
-  integrity sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg==
+  integrity "sha1-+mJ7h1Aq3JgEXkRnjpqOw7nA0qk= sha512-sA2/4+/PZ/KV6CKgjrVrrUVBKCkdDO02CUlQ0YKTQoYUwPYNOtOAcWlbYhd5v/1JqYaA6oZ4sDlOU4ppVw6Wbg=="
   dependencies:
     chalk "^2.0.0"
 
@@ -3861,7 +3861,7 @@ core-util-is@~1.0.0:
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  integrity "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q= sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -3872,7 +3872,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
 cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  integrity "sha1-9zqFudXUHQRVUcF34ogtSshXKKY= sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -3881,43 +3881,43 @@ cross-spawn@^7.0.2:
 cryptiles@0.2.x:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
-  integrity sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=
+  integrity "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw= sha512-gvWSbgqP+569DdslUiCelxIv3IYK5Lgmq1UrRnk+s1WxQOQ16j3GPDcjdtgL5Au65DU/xQi6q3xPtf5Kta+3IQ=="
   dependencies:
     boom "0.4.x"
 
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
+  integrity "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg=="
 
 ctype@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
-  integrity sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=
+  integrity "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8= sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg=="
 
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+  integrity "sha1-mI3zP+qxke95mmE2nddsF635V+o= sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="
   dependencies:
     array-find-index "^1.0.1"
 
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+  integrity "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8= sha512-9x1NruMD5YQ7xccKbGEy/bjitRfn5LEIhJIXIOAXC8I1laA5gfezUMVES1/vjLxfGzZjirLLBzEqxMO2/LzGxQ=="
   dependencies:
     es5-ext "^0.10.9"
 
 dag-map@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68"
-  integrity sha1-lxS0ct6CoYQ94vuptodpOMq0TGg=
+  integrity "sha1-lxS0ct6CoYQ94vuptodpOMq0TGg= sha512-xnsprIzYuDeiyu5zSKwilV/ajRHxnoMlAhEREfyfTgTSViMVY2fGP1ZcHJbtwup26oCkofySU/m6oKJ3HrkW7w=="
 
 date-time@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2"
-  integrity sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g==
+  integrity "sha1-AobRtMdpYzs8oT4eYlWNLb3C66I= sha512-/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g=="
   dependencies:
     time-zone "^1.0.0"
 
@@ -3931,7 +3931,7 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
 debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  integrity "sha1-6D0X3hbYp++3cX7b5fsQE17uYps= sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="
   dependencies:
     ms "^2.1.1"
 
@@ -3945,14 +3945,14 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
+  integrity "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE= sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="
   dependencies:
     ms "2.0.0"
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  integrity "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -3960,48 +3960,48 @@ decamelize-keys@^1.0.0:
 decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
 
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  integrity "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
 
 decompress-response@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
+  integrity "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="
   dependencies:
     mimic-response "^1.0.0"
 
 deep-eql@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-0.1.3.tgz#ef558acab8de25206cd713906d74e56930eb69f2"
-  integrity sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=
+  integrity "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI= sha512-6sEotTRGBFiNcqVoeHwnfopbSpi5NbH1VWJmYCVkmxMmaVTT0bUTrNaGyBwhgP4MZL012W/mkzIn3Da+iDYweg=="
   dependencies:
     type-detect "0.1.1"
 
 deep-eql@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
+  integrity "sha1-38lARACtHI/gI+faHfHBR8S0RN8= sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw=="
   dependencies:
     type-detect "^4.0.0"
 
 deep-extend@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+  integrity "sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw= sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
 
 deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
-  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+  integrity "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= sha512-GtxAN4HvBachZzm4OnWqc45ESpUCMwkYcsjnsPs23FwJbsO+k4t0k9bQCgOmzIlpHO28+WPK/KRbRk0DDHuuDw=="
 
 defaults@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  integrity "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="
   dependencies:
     clone "^1.0.2"
 
@@ -4015,21 +4015,21 @@ define-properties@^1.1.2, define-properties@^1.1.3:
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  integrity "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA=="
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  integrity "sha1-dp66rz9KY6rTr56NMEybvnm/sOY= sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  integrity "sha1-1Flono1lS6d+AqgX+HENcCyxbp0= sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="
   dependencies:
     is-descriptor "^1.0.2"
     isobject "^3.0.1"
@@ -4037,59 +4037,59 @@ define-property@^2.0.2:
 delayed-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
-  integrity sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=
+  integrity "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8= sha512-v+7uBd1pqe5YtgPacIIbZ8HuHeLFVNe4mUEyFDXL6KiqzEykjbw+5mXZXpGFgNVasdL4jWKgaKIXrEHiynN1LA=="
 
 delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  integrity "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
 
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  integrity "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
 
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+  integrity "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg=="
 
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+  integrity "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q=="
 
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-  integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
+  integrity "sha1-OHHMCmoALow+Wzz38zYmRnXwa50= sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g=="
 
 diff@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.0.8.tgz#343276308ec991b7bc82267ed55bc1411f971666"
-  integrity sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY=
+  integrity "sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY= sha512-1zEb73vemXFpUmfh3fsta4YHz3lwebxXvaWmPbFv9apujQBWDnkrPDLXLQs1gZo4RCWMDsT89r0Pf/z8/02TGA=="
 
 diff@3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+  integrity "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI= sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
 
 diff@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
-  integrity sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==
+  integrity "sha1-DGZ8tGfru1zqfxTxNcwtuneAqP8= sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="
 
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
-  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  integrity "sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8= sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="
   dependencies:
     path-type "^4.0.0"
 
 doctrine@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
+  integrity "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg=="
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
@@ -4097,26 +4097,26 @@ doctrine@1.5.0:
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  integrity "sha1-rd6+rXKmV023g2OdyHoSF3OXOWE= sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="
   dependencies:
     esutils "^2.0.2"
 
 dot-prop@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==
+  integrity "sha1-RYhBlKcfws2nHLtLzrOk3S9DO6Q= sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ=="
   dependencies:
     is-obj "^1.0.0"
 
 duplexer3@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+  integrity "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="
 
 duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
+  integrity "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E= sha512-sxNZ+ljy+RA1maXoUReeqBBpBC6RLKmg5ewzV+x+mSETmWNoKdZN6vcQjpFROemza23hGFskJtFNoUWUaQ+R4Q=="
 
 editions@^1.1.1:
   version "1.3.3"
@@ -4126,7 +4126,7 @@ editions@^1.1.1:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 
 electron-to-chromium@^1.3.378:
   version "1.3.380"
@@ -4183,7 +4183,7 @@ ember-cli-babel@^7.23.0:
 ember-cli-blueprint-test-helpers@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/ember-cli-blueprint-test-helpers/-/ember-cli-blueprint-test-helpers-0.19.2.tgz#9e563cd81ab39931253ced0982c5d02475895401"
-  integrity sha512-otCKdGcNFK0+MkQo+LLjYbRD9EerApH6Z/odvvlL1hxrN+owHMV5E+jI2rbtdvNEH0/6w5ZqjH4kS232fvtCxQ==
+  integrity "sha1-nlY82BqzmTElPO0JgsXQJHWJVAE= sha512-otCKdGcNFK0+MkQo+LLjYbRD9EerApH6Z/odvvlL1hxrN+owHMV5E+jI2rbtdvNEH0/6w5ZqjH4kS232fvtCxQ=="
   dependencies:
     chai "^4.1.0"
     chai-as-promised "^7.0.0"
@@ -4197,7 +4197,7 @@ ember-cli-blueprint-test-helpers@^0.19.2:
 ember-cli-broccoli-sane-watcher@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe"
-  integrity sha512-sLn+wy6FJpGMHtSwAGUjQK3nJFvw2b6H8bR2EgMIXxkUI3DYFLi6Xnyxm02XlMTcfTxF10yHFhHJe0O+PcJM7A==
+  integrity "sha1-3BgSwEfhzuxEE9PEG1Gp/8YbTP4= sha512-sLn+wy6FJpGMHtSwAGUjQK3nJFvw2b6H8bR2EgMIXxkUI3DYFLi6Xnyxm02XlMTcfTxF10yHFhHJe0O+PcJM7A=="
   dependencies:
     broccoli-slow-trees "^3.0.1"
     heimdalljs "^0.2.1"
@@ -4208,7 +4208,7 @@ ember-cli-broccoli-sane-watcher@^3.0.0:
 ember-cli-browserstack@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-browserstack/-/ember-cli-browserstack-1.1.0.tgz#1d2bcf84370c196dc0c091ee65d54193072dadfc"
-  integrity sha512-nSYHa5YP0RjthfMBpasLJt4bnodV2AgKR4KZ4DaFrboiW+FVfqNZ8MRLBrTfaH3NqDWofcnCQTfqriByAcqbRA==
+  integrity "sha1-HSvPhDcMGW3AwJHuZdVBkwctrfw= sha512-nSYHa5YP0RjthfMBpasLJt4bnodV2AgKR4KZ4DaFrboiW+FVfqNZ8MRLBrTfaH3NqDWofcnCQTfqriByAcqbRA=="
   dependencies:
     browserstack "^1.5.3"
     browserstack-local "^1.4.2"
@@ -4218,7 +4218,7 @@ ember-cli-browserstack@^1.1.0:
 ember-cli-dependency-checker@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
-  integrity sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q==
+  integrity "sha1-kgKtnhTW/aM8/8IqEcNDwqiIUzA= sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q=="
   dependencies:
     chalk "^2.3.0"
     find-yarn-workspace-root "^1.1.0"
@@ -4234,7 +4234,7 @@ ember-cli-get-component-path-option@^1.0.0:
 ember-cli-internal-test-helpers@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/ember-cli-internal-test-helpers/-/ember-cli-internal-test-helpers-0.9.1.tgz#d54a9124bb6408ceba83f049ba8479f4b96cdd19"
-  integrity sha1-1UqRJLtkCM66g/BJuoR59Lls3Rk=
+  integrity "sha1-1UqRJLtkCM66g/BJuoR59Lls3Rk= sha512-ia+p7LrAe2tENG+Vewdi93kGlsI7OkjB7tEakTtCELkIvZpmPX+uYGhIi5nVOynLiej2M81MQmNqB8jX93ejqQ=="
   dependencies:
     chai "^3.3.0"
     chai-as-promised "^6.0.0"
@@ -4257,7 +4257,7 @@ ember-cli-is-package-missing@^1.0.0:
 ember-cli-lodash-subset@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2"
-  integrity sha1-IMtop5D+D94kiN39jvu332/nZvI=
+  integrity "sha1-IMtop5D+D94kiN39jvu332/nZvI= sha512-QkLGcYv1WRK35g4MWu/uIeJ5Suk2eJXKtZ+8s+qE7C9INmpCPyPxzaqZABquYzcWNzIdw6kYwz3NWAFdKYFxwg=="
 
 ember-cli-normalize-entity-name@^1.0.0:
   version "1.0.0"
@@ -4274,7 +4274,7 @@ ember-cli-path-utils@^1.0.0:
 ember-cli-preprocess-registry@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.3.0.tgz#685837a314fbe57224bd54b189f4b9c23907a2de"
-  integrity sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA==
+  integrity "sha1-aFg3oxT75XIkvVSxifS5wjkHot4= sha512-60GYpw7VPeB7TvzTLZTuLTlHdOXvayxjAQ+IxM2T04Xkfyu75O2ItbWlftQW7NZVGkaCsXSRAmn22PG03VpLMA=="
   dependencies:
     broccoli-clean-css "^1.1.0"
     broccoli-funnel "^2.0.1"
@@ -4307,7 +4307,7 @@ ember-cli-version-checker@^5.1.1:
 ember-cli-yuidoc@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/ember-cli-yuidoc/-/ember-cli-yuidoc-0.9.1.tgz#bc2171eb160b02ad5f4078e83e3648b95628ced9"
-  integrity sha512-4pb3OKXhHCeUux6a7SDKziLDWdDciJwzmUld3Fumt60RLcH/nIk5lPdI0o+UXJ9NfP+WcSvvpWWroFmWqWAWWA==
+  integrity "sha1-vCFx6xYLAq1fQHjoPjZIuVYoztk= sha512-4pb3OKXhHCeUux6a7SDKziLDWdDciJwzmUld3Fumt60RLcH/nIk5lPdI0o+UXJ9NfP+WcSvvpWWroFmWqWAWWA=="
   dependencies:
     broccoli-caching-writer "~2.0.4"
     broccoli-merge-trees "^1.1.1"
@@ -4318,7 +4318,7 @@ ember-cli-yuidoc@^0.9.1:
 ember-cli@^3.12.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.12.0.tgz#e6d27e4c57fc44eb7963fe4611b3b0cfb9d9558d"
-  integrity sha512-hON3/thKAIcwzHX9SWIvf+UR2sQTWyXzyECYw20NDvUSydZMVtggK4GQncu7LSiUs+5zIxT8ZPzanpUZMINuCg==
+  integrity "sha1-5tJ+TFf8ROt5Y/5GEbOwz7nZVY0= sha512-hON3/thKAIcwzHX9SWIvf+UR2sQTWyXzyECYw20NDvUSydZMVtggK4GQncu7LSiUs+5zIxT8ZPzanpUZMINuCg=="
   dependencies:
     "@babel/core" "^7.4.3"
     "@babel/plugin-transform-modules-amd" "^7.2.0"
@@ -4416,7 +4416,7 @@ ember-cli@^3.12.0:
 ember-publisher@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ember-publisher/-/ember-publisher-0.0.7.tgz#865ca69ef47bafb38120a84244aa58b950ca4850"
-  integrity sha1-hlymnvR7r7OBIKhCRKpYuVDKSFA=
+  integrity "sha1-hlymnvR7r7OBIKhCRKpYuVDKSFA= sha512-3RenUmcmXaiNbQ/IxnkBM6sWFfYz/uWoyVecHeJIuur2VRj4sJucEJbO0XKYRM3wDonbMMs9VsMJ/wtGBqQ62Q=="
   dependencies:
     aws-sdk "^2.0.9"
 
@@ -4437,38 +4437,38 @@ ember-router-generator@^2.0.0:
 ember-source-channel-url@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.1.0.tgz#73de5cc6ebc25b2120e932ec1d8f82677bfaf6ef"
-  integrity sha512-y1RVXmyqrdX6zq9ZejpPt7ohKNGuLMBEKaOUyxFWcYAM5gvLuo6xFerwNmXEBbu4e3//GaoasjodXi6Cl+ddUQ==
+  integrity "sha1-c95cxuvCWyEg6TLsHY+CZ3v69u8= sha512-y1RVXmyqrdX6zq9ZejpPt7ohKNGuLMBEKaOUyxFWcYAM5gvLuo6xFerwNmXEBbu4e3//GaoasjodXi6Cl+ddUQ=="
   dependencies:
     got "^8.0.1"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+  integrity "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY= sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
 
 end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
+  integrity "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM= sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="
   dependencies:
     once "^1.4.0"
 
 end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+  integrity "sha1-WuZKX0UFe682JuwU2gyl5LJDHrA= sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="
   dependencies:
     once "^1.4.0"
 
 engine.io-client@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7"
-  integrity sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA==
+  integrity "sha1-/BtNlhYojOTy2vBtz2EkE97JQcc= sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA=="
   dependencies:
     component-emitter "~1.3.0"
     component-inherit "0.0.3"
@@ -4485,7 +4485,7 @@ engine.io-client@~3.5.0:
 engine.io-parser@~2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
+  integrity "sha1-V85WEdk3DulPmWQbWJ+UyX5PXac= sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="
   dependencies:
     after "0.8.2"
     arraybuffer.slice "~0.0.7"
@@ -4496,7 +4496,7 @@ engine.io-parser@~2.2.0:
 engine.io@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
-  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
+  integrity "sha1-nWuYXIo5sf6HzZHrAU3gVSJZghs= sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA=="
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
@@ -4508,7 +4508,7 @@ engine.io@~3.5.0:
 enquirer@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  integrity "sha1-Kn/l3WNKHkElqXXsmU/1RW3Dc00= sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="
   dependencies:
     ansi-colors "^4.1.1"
 
@@ -4520,19 +4520,19 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, en
 entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+  integrity "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  integrity "sha1-tKxAZIEH/c3PriQvQovqihTU8b8= sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="
   dependencies:
     is-arrayish "^0.2.1"
 
 error@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz#a5f75fff4d9926126ddac0ea5dc38e689153cb02"
-  integrity sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=
+  integrity "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI= sha512-UtVv4l5MhijsYUxPJo4390gzfZvAnTHreNnDjnTZaKIiZ/SemXxAhBkYSKtWa5RtBXbLP8tMgn/n0RUa/H7jXw=="
   dependencies:
     string-template "~0.2.1"
     xtend "~4.0.0"
@@ -4540,7 +4540,7 @@ error@^7.0.0:
 es-abstract@^1.17.0:
   version "1.17.6"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==
+  integrity "sha1-kUIHFweFeyysx7iey2cDFsPi1So= sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
@@ -4557,7 +4557,7 @@ es-abstract@^1.17.0:
 es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
   version "1.17.5"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==
+  integrity "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk= sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="
   dependencies:
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
@@ -4574,7 +4574,7 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
 es-abstract@^1.5.1, es-abstract@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  integrity "sha1-rIYUX91QmdjdSVWMy6Lq+biOJOk= sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="
   dependencies:
     es-to-primitive "^1.2.0"
     function-bind "^1.1.1"
@@ -4586,7 +4586,7 @@ es-abstract@^1.5.1, es-abstract@^1.9.0:
 es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
+  integrity "sha1-7fckeAM0VujdqO8J4ArZZQcH83c= sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
@@ -4595,7 +4595,7 @@ es-to-primitive@^1.2.0:
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+  integrity "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo= sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
@@ -4604,7 +4604,7 @@ es-to-primitive@^1.2.1:
 es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
   version "0.10.37"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
-  integrity sha1-DudB0Ui4AGm6J9AgOTdWryV978M=
+  integrity "sha1-DudB0Ui4AGm6J9AgOTdWryV978M= sha512-jHOXRZFanQfL9vs1ElGxs3tPryyA9uZjx9tbzx5ENbckINqG8noAUy12UUgeyvY8Md8s8LrlCmbVuVLpCijNNw=="
   dependencies:
     es6-iterator "~2.0.1"
     es6-symbol "~3.1.1"
@@ -4612,7 +4612,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
 es6-iterator@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
+  integrity "sha1-p96IkUGgWpSwhUQDstCg+/qY87c= sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g=="
   dependencies:
     d "1"
     es5-ext "^0.10.35"
@@ -4621,7 +4621,7 @@ es6-iterator@~2.0.1:
 es6-map@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
-  integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
+  integrity "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA= sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A=="
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4633,19 +4633,19 @@ es6-map@^0.1.5:
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+  integrity "sha1-TrIVlMlyvEBVPSduUQU5FD21Pgo= sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
 
 es6-promisify@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
+  integrity "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM= sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ=="
   dependencies:
     es6-promise "^4.0.3"
 
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
-  integrity sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=
+  integrity "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE= sha512-7S8YXIcUfPMOr3rqJBVMePAbRsD1nWeSMQ86K/lDI76S3WKXz+KWILvTIPbTroubOkZTGh+b+7/xIIphZXNYbA=="
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4656,7 +4656,7 @@ es6-set@~0.1.5:
 es6-symbol@3.1.1, es6-symbol@^3.1.1, es6-symbol@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+  integrity "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc= sha512-exfuQY8UGtn/N+gL1iKkH8fpNd5sJ760nJq6mmZAHldfxMD5kX07lbQuYlspoXsuknXNv9Fb7y2GsPOnQIbxHg=="
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4669,7 +4669,7 @@ escalade@^3.1.1:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
 
 escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
@@ -4679,14 +4679,14 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
 eslint-config-prettier@^6.11.0:
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
-  integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==
+  integrity "sha1-nrK8z/cn2xxSEE8LSeh+pGYFoNI= sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw=="
   dependencies:
     get-stdin "^6.0.0"
 
 eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
+  integrity "sha1-hf+oGULCUBLYIxCW3fZ5wDBCxxc= sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="
   dependencies:
     debug "^2.6.9"
     resolve "^1.13.1"
@@ -4694,7 +4694,7 @@ eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
 eslint-module-utils@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+  integrity "sha1-V569CU9Wr3eX0ZyYZsnJSGYpv6Y= sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="
   dependencies:
     debug "^2.6.9"
     pkg-dir "^2.0.0"
@@ -4702,14 +4702,14 @@ eslint-module-utils@^2.6.0:
 eslint-plugin-disable-features@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/eslint-plugin-disable-features/-/eslint-plugin-disable-features-0.1.3.tgz#f093418c860d7be41ed46519eedf3f70eb7e29f2"
-  integrity sha512-7Cq7aNz9gI38oCLc2RxCgC8OtQyg5thnY++zuJ0V2dCKN8FhfLz4S5c4ubtzoywvdS7HDWC3J0cVRkhEGniLOA==
+  integrity "sha1-8JNBjIYNe+Qe1GUZ7t8/cOt+KfI= sha512-7Cq7aNz9gI38oCLc2RxCgC8OtQyg5thnY++zuJ0V2dCKN8FhfLz4S5c4ubtzoywvdS7HDWC3J0cVRkhEGniLOA=="
   dependencies:
     requireindex "~1.1.0"
 
 eslint-plugin-ember-internal@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-ember-internal/-/eslint-plugin-ember-internal-1.1.1.tgz#5327f709799eac010bfcf0dd1be8d0acbc917d34"
-  integrity sha512-Uqf0fu9NOXIj5mR9pjMW2s+Wb6gXNQpzDvDOje2IAYQVwrX1Fuh/noAsgAHgVKwa3oPiAe4jCKfqaW2j1BHn9w==
+  integrity "sha1-Uyf3CXmerAEL/PDdG+jQrLyRfTQ= sha512-Uqf0fu9NOXIj5mR9pjMW2s+Wb6gXNQpzDvDOje2IAYQVwrX1Fuh/noAsgAHgVKwa3oPiAe4jCKfqaW2j1BHn9w=="
   dependencies:
     line-column "^1.0.2"
     requireindex "~1.1.0"
@@ -4717,7 +4717,7 @@ eslint-plugin-ember-internal@^1.1.1:
 eslint-plugin-es@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b"
-  integrity sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng==
+  integrity "sha1-mMsbyKsKqAeXeFXhGtnRyUItAUs= sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng=="
   dependencies:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
@@ -4725,7 +4725,7 @@ eslint-plugin-es@^3.0.0:
 eslint-plugin-import@^2.22.0:
   version "2.22.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
+  integrity "sha1-CJbH5qDPRBCaLZe5WQPCu2iddwI= sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="
   dependencies:
     array-includes "^3.1.1"
     array.prototype.flat "^1.2.3"
@@ -4744,7 +4744,7 @@ eslint-plugin-import@^2.22.0:
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
-  integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==
+  integrity "sha1-yVVEQW7kraJnQKMEdO78VALcZx0= sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g=="
   dependencies:
     eslint-plugin-es "^3.0.0"
     eslint-utils "^2.0.0"
@@ -4756,19 +4756,19 @@ eslint-plugin-node@^11.1.0:
 eslint-plugin-prettier@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
-  integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ==
+  integrity "sha1-cHnPoklweJBQEeb4Lo3YRT0Tcbc= sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ=="
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
 eslint-plugin-qunit@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-4.0.0.tgz#5945ba3434bfe8879bea195192e906701051cf01"
-  integrity sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ==
+  integrity "sha1-WUW6NDS/6Ieb6hlRkukGcBBRzwE= sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ=="
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  integrity "sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
@@ -4776,36 +4776,36 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
 eslint-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
-  integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==
+  integrity "sha1-e+HMcPJ6cqds0UqmmLyr7WiQ4c0= sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
 eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
-  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  integrity "sha1-0t5eA0JOcH3BDHQGjd7a5wh0Gyc= sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
 eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+  integrity "sha1-4qgs6oT/JGrW+1f5veW0ZiFFnsI= sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
 
 eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+  integrity "sha1-MOvR73wv3/AcOk8VEESvJfqwUj4= sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
 
 eslint-visitor-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+  integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
 eslint@^7.9.0:
   version "7.10.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9"
-  integrity sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA==
+  integrity "sha1-SU7bPkdQ+3kRM8o3nnhqj2SMcrk= sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="
   dependencies:
     "@babel/code-frame" "^7.0.0"
     "@eslint/eslintrc" "^0.1.3"
@@ -4848,12 +4848,12 @@ eslint@^7.9.0:
 esm@^3.2.4:
   version "3.2.22"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
-  integrity sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA==
+  integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
 
 espree@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
+  integrity "sha1-3DBDfPZ5R89XYSHr14DxXurHI0g= sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="
   dependencies:
     acorn "^7.4.0"
     acorn-jsx "^5.2.0"
@@ -4867,36 +4867,36 @@ esprima@^4.0.0, esprima@~4.0.0:
 esprima@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
-  integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
+  integrity "sha1-U88kes2ncxPlUcOqLnM0LT+099k= sha512-xoBq/MIShSydNZOkjkoCEjqod963yHNXTLC40ypBhop6yPqflPz/vTinmCfSrGcywVLnSftRf6a0kJLdFdzemw=="
 
 esquery@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+  integrity "sha1-t4tYKKqOIU4p+3TE1bdS4cAz2lc= sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
-  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  integrity "sha1-eteWTWeauyi+5yzsY3WLHF0smSE= sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-  integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
+  integrity "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= sha512-VHvyaGnJy+FuGfcfaM7W7OZw4mQiKW73jPHwQXx2VnMSUBajYmytOT5sKEfsBvNPtGX6YDwcrGDz2eocoHg0JA=="
 
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+  integrity "sha1-MH30JUfmzHMk088DwVXVzbjFOIA= sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
 
 estree-walker@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
-  integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
+  integrity "sha1-XYZTJ8RKYY3eVpn3Y4ka4x8lfa4= sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw=="
 
 esutils@^2.0.2:
   version "2.0.2"
@@ -4906,12 +4906,12 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
 
 event-emitter@~0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
-  integrity sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=
+  integrity "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk= sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="
   dependencies:
     d "1"
     es5-ext "~0.10.14"
@@ -4919,7 +4919,7 @@ event-emitter@~0.3.5:
 event-stream@=3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"
-  integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=
+  integrity "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g=="
   dependencies:
     duplexer "~0.1.1"
     from "~0"
@@ -4932,27 +4932,27 @@ event-stream@=3.3.4:
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
-  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+  integrity "sha1-Lem2j2Uo1WRO9cWVJqG0oHMGFp8= sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
 
 events-to-array@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"
-  integrity sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y=
+  integrity "sha1-LUH1Y+H+QA7Uli/hpNXGp1Od9/Y= sha512-inRWzRY7nG+aXZxBzEqYKB3HPgwflZRopAjDCHv0whhRx+MTUr1ei0ICZUypdyE0HRm4L2d5VEcIqLD6yl+BFA=="
 
 events@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
-  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
+  integrity "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="
 
 exec-sh@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
-  integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
+  integrity "sha1-ZzjeLrfI5nHQNmrqCw24xvfXORs= sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
 
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  integrity "sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg= sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="
   dependencies:
     cross-spawn "^6.0.0"
     get-stream "^4.0.0"
@@ -4965,7 +4965,7 @@ execa@^1.0.0:
 execa@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e"
-  integrity sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ==
+  integrity "sha1-L1zFicgdsxZihicATqTje5M5HY4= sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ=="
   dependencies:
     cross-spawn "^6.0.5"
     get-stream "^5.0.0"
@@ -4980,17 +4980,17 @@ execa@^2.0.4:
 exists-sync@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/exists-sync/-/exists-sync-0.0.3.tgz#b910000bedbb113b378b82f5f5a7638107622dcf"
-  integrity sha1-uRAAC+27ETs3i4L19adjgQdiLc8=
+  integrity "sha1-uRAAC+27ETs3i4L19adjgQdiLc8= sha512-/qPB5E0cRuA/Cs5vHrmKYSfhIBCPJs9Vm3e9aIejMwwbe6idMeNbGu1g5stvr/bXT6HywHckLPEkmY7HK6FlwA=="
 
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
+  integrity "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ=="
 
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  integrity "sha1-t3c14xXOMPa27/D4OwQVGiJEliI= sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA=="
   dependencies:
     debug "^2.3.3"
     define-property "^0.2.5"
@@ -5003,14 +5003,14 @@ expand-brackets@^2.1.4:
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  integrity "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="
   dependencies:
     homedir-polyfill "^1.0.1"
 
 express@^4.10.7, express@^4.13.1, express@^4.16.4, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  integrity "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="
   dependencies:
     accepts "~1.3.7"
     array-flatten "1.1.1"
@@ -5046,14 +5046,14 @@ express@^4.10.7, express@^4.13.1, express@^4.16.4, express@^4.17.1:
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
+  integrity "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  integrity "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
@@ -5061,7 +5061,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 external-editor@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  integrity "sha1-WGbbKal4Jtvkvzr9JAcOrZ6kOic= sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA=="
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
@@ -5070,7 +5070,7 @@ external-editor@^3.0.3:
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
+  integrity "sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM= sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -5084,7 +5084,7 @@ extglob@^2.0.4:
 extract-zip@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz#f53b71d44f4ff5a4527a2259ade000fb8b303492"
-  integrity sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==
+  integrity "sha1-9Ttx1E9P9aRSeiJZreAA+4swNJI= sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg=="
   dependencies:
     debug "^4.1.1"
     get-stream "^5.1.0"
@@ -5095,17 +5095,17 @@ extract-zip@^2.0.0:
 fast-deep-equal@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
+  integrity "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ= sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
 
 fast-diff@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+  integrity "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
 
 fast-glob@^3.1.1:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
-  integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
+  integrity "sha1-0grvv5lXk4Pn88xmUpFYybmFVNM= sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5117,12 +5117,12 @@ fast-glob@^3.1.1:
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
-  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+  integrity "sha1-1RQsDK7msRifh9OnYREGT4bIu/I= sha512-eIgZvM9C3P05kg0qxfqaVU6Tma4QedCPIByQOcemV0vju8ot3cS2DpHi4m2G2JvbSMI152rjfLX0p1pkSdyPlQ=="
 
 fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
 
 fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
   version "1.0.3"
@@ -5134,7 +5134,7 @@ fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
 fast-sourcemap-concat@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.4.0.tgz#122c330d4a2afaff16ad143bc9674b87cd76c8ad"
-  integrity sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA==
+  integrity "sha1-EiwzDUoq+v8WrRQ7yWdLh812yK0= sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA=="
   dependencies:
     chalk "^2.0.0"
     fs-extra "^5.0.0"
@@ -5162,54 +5162,54 @@ fast-sourcemap-concat@^2.1.0:
 fastq@^1.6.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  integrity "sha1-VQ4fn1m7xl/hhctqm02VNXEH9IE= sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="
   dependencies:
     reusify "^1.0.4"
 
 faye-websocket@~0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
+  integrity "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="
   dependencies:
     websocket-driver ">=0.5.1"
 
 fb-watchman@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
-  integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
+  integrity "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= sha512-+6dk4acfiWsbMc8pH0boQDeQprOM4mO/kS4IAvZVJZk4B6CZYLg4DkTGbL82vhglUXDtkJPnLfO0WXv3uxGNfA=="
   dependencies:
     bser "^2.0.0"
 
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  integrity "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="
   dependencies:
     pend "~1.2.0"
 
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  integrity "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  integrity "sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w= sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="
   dependencies:
     flat-cache "^2.0.1"
 
 filesize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.1.2.tgz#fcd570af1353cea97897be64f56183adb995994b"
-  integrity sha512-iSWteWtfNcrWQTkQw8ble2bnonSl7YJImsn9OZKpE2E4IHhXI78eASpDYUljXZZdYj36QsEKjOs/CsiDqmKMJw==
+  integrity "sha1-/NVwrxNTzql4l75k9WGDrbmVmUs= sha512-iSWteWtfNcrWQTkQw8ble2bnonSl7YJImsn9OZKpE2E4IHhXI78eASpDYUljXZZdYj36QsEKjOs/CsiDqmKMJw=="
 
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  integrity "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="
   dependencies:
     extend-shallow "^2.0.1"
     is-number "^3.0.0"
@@ -5219,14 +5219,14 @@ fill-range@^4.0.0:
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  integrity "sha1-GRmmp8df44ssfHflGYU12prN2kA= sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="
   dependencies:
     to-regex-range "^5.0.1"
 
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
+  integrity "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U= sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw=="
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -5239,7 +5239,7 @@ finalhandler@1.1.0:
 finalhandler@^1.1.2, finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  integrity "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
@@ -5279,7 +5279,7 @@ find-up@^2.0.0, find-up@^2.1.0:
 find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
-  integrity sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==
+  integrity "sha1-QOuObnwlAt36old8F28iFCL4YNs= sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q=="
   dependencies:
     fs-extra "^4.0.3"
     micromatch "^3.1.4"
@@ -5287,7 +5287,7 @@ find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
+  integrity "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g=="
   dependencies:
     detect-file "^1.0.0"
     is-glob "^3.1.0"
@@ -5297,7 +5297,7 @@ findup-sync@^2.0.0:
 fireworm@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/fireworm/-/fireworm-0.7.1.tgz#ccf20f7941f108883fcddb99383dbe6e1861c758"
-  integrity sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g=
+  integrity "sha1-zPIPeUHxCIg/zduZOD2+bhhhx1g= sha512-YzO26m9tb1/0WNss4brWxCJH6L37+mAPDXYsncFt8PKSh4M7AnhFRQrCQ2Kv7hwF14xXsSE8Px8i/8fBalpUiA=="
   dependencies:
     async "~0.2.9"
     is-type "0.0.1"
@@ -5327,7 +5327,7 @@ fixturify@^1.2.0:
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  integrity "sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA= sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="
   dependencies:
     flatted "^2.0.0"
     rimraf "2.6.3"
@@ -5336,34 +5336,34 @@ flat-cache@^2.0.1:
 flat@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  integrity "sha1-CQvsiwXjnLowl0fx1YjwTbr5jbI= sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="
   dependencies:
     is-buffer "~2.0.3"
 
 flatted@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
-  integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
+  integrity "sha1-VRIrZTbqSWtLRIk+4mCBQdENmRY= sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg=="
 
 follow-redirects@^1.0.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
+  integrity "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs= sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
 
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  integrity "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="
 
 forever-agent@~0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.5.2.tgz#6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"
-  integrity sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=
+  integrity "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA= sha512-PDG5Ef0Dob/JsZUxUltJOhm/Y9mlteAE+46y3M9RBz/Rd3QVENJ75aGRhN56yekTUboaBIkd8KVWX2NjF6+91A=="
 
 form-data@~0.1.0:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.1.4.tgz#91abd788aba9702b1aabfa8bc01031a2ac9e3b12"
-  integrity sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=
+  integrity "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI= sha512-x8eE+nzFtAMA0YYlSxf/Qhq6vP1f8wSoZ7Aw1GuctBcmudCNuTUmmx45TfEplyb6cjsZO/jvh6+1VpZn24ez+w=="
   dependencies:
     async "~0.9.0"
     combined-stream "~0.0.4"
@@ -5372,24 +5372,24 @@ form-data@~0.1.0:
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+  integrity "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= sha512-Ua9xNhH0b8pwE3yRbFfXJvfdWF0UHNCdeyb2sbi9Ul/M+r3PTdrz7Cv4SCfZRMjmzEM9PhraqfZFbGTIg3OMyA=="
 
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  integrity "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA=="
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
 
 from2@^2.1.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  integrity "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="
   dependencies:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
@@ -5397,17 +5397,17 @@ from2@^2.1.1:
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
-  integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
+  integrity "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
 
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
+  integrity "sha1-a+Dem+mYzhavivwkSXue6bfM2a0= sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
 
 fs-extra@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
-  integrity sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=
+  integrity "sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI= sha512-w1RvhdLZdU9V3vQdL+RooGlo6b9R9WVoBanOfoJvosWlqSKvrjFlci2oVhwvLwZXBtM7khyPvZ8r3fwsim3o0A=="
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -5417,7 +5417,7 @@ fs-extra@^0.24.0:
 fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
-  integrity sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=
+  integrity "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A= sha512-UvSPKyhMn6LEd/WpUaV9C9t3zATuqoqfWc3QdPhPLb58prN9tqYPlPWi8Krxi44loBoUzlobqZ3+8tGpxxSzwA=="
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^2.1.0"
@@ -5428,7 +5428,7 @@ fs-extra@^0.30.0:
 fs-extra@^4.0.2, fs-extra@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
+  integrity "sha1-DYUhIuW8W+tFP7Ao6cDJvzY0DJQ= sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg=="
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -5446,7 +5446,7 @@ fs-extra@^5.0.0:
 fs-extra@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
-  integrity sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==
+  integrity "sha1-irwSj3lG4xATXdyTuYvdtBDno0s= sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -5473,7 +5473,7 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
 fs-extra@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
-  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
+  integrity "sha1-kQ2gBiQ3ukw5/t2GPxZ1zP78ufw= sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="
   dependencies:
     at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
@@ -5495,7 +5495,7 @@ fs-merger@^3.1.0:
 fs-sync@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/fs-sync/-/fs-sync-1.0.4.tgz#2f94eade31862ec0a9f33a1c2546dfb1a3f3d1ae"
-  integrity sha1-L5Tq3jGGLsCp8zocJUbfsaPz0a4=
+  integrity "sha1-L5Tq3jGGLsCp8zocJUbfsaPz0a4= sha512-oqOAIF0x91teulyqiIQzSvFZqLQPO11qLZyUPqwkGRpkqWBMngnQIhKEfFKeJo9vUng7YtKIbr8cdoPR89Y9lA=="
   dependencies:
     glob "^7.1.0"
     iconv-lite "^0.4.13"
@@ -5543,7 +5543,7 @@ fs.realpath@^1.0.0:
 fsevents@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+  integrity "sha1-TAofs0vGjlQ7S4Kp7Dkr+9qECAU= sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -5553,12 +5553,12 @@ function-bind@^1.1.1:
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+  integrity "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
 
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  integrity "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -5577,82 +5577,82 @@ gensync@^1.0.0-beta.1:
 get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
-  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+  integrity "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34= sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
 
 get-func-name@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
+  integrity "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+  integrity "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="
 
 get-stdin@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+  integrity "sha1-ngm/cSs2CrkiXoEgSPcf3pyJZXs= sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
 
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
+  integrity "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="
 
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  integrity "sha1-wbJVV189wh1Zv8ec09K0axw6VLU= sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="
   dependencies:
     pump "^3.0.0"
 
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==
+  integrity "sha1-ASA83JJZf5uQkGfD5lbMH008Tck= sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="
   dependencies:
     pump "^3.0.0"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+  integrity "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="
 
 git-repo-info@^1.0.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
-  integrity sha1-KgcoIyVKr2L88HZgB9e2ZRvUGUM=
+  integrity "sha1-KgcoIyVKr2L88HZgB9e2ZRvUGUM= sha512-oqzBH6cNvE8Cq3p61ps4m0POZrVMKlARntc2BxLnuqTK+HeWpKfUMJQ7H1CvescHRINj+0a7TKA+Pp/bOq5F1Q=="
 
 git-repo-info@^2.1.0, git-repo-info@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
-  integrity sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg==
+  integrity "sha1-Ig/+2MuudO+KgOMFLyzLUXmu0Fg= sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="
 
 git-repo-version@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.2.0.tgz#9a1d0019a50fc9e623c43d1c0fcc437391207d0d"
-  integrity sha1-mh0AGaUPyeYjxD0cD8xDc5EgfQ0=
+  integrity "sha1-mh0AGaUPyeYjxD0cD8xDc5EgfQ0= sha512-kwlddnFSaoKRN/zjGUrfN2BsbARG+dJRNYFGDrmlQgJN7IHNQJwj11mS+9qQL4oVzQBf+ESblanxp5oESI5AeA=="
   dependencies:
     git-repo-info "^1.0.4"
 
 github@^0.2.3:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/github/-/github-0.2.4.tgz#24fa7f0e13fa11b946af91134c51982a91ce538b"
-  integrity sha1-JPp/DhP6EblGr5ETTFGYKpHOU4s=
+  integrity "sha1-JPp/DhP6EblGr5ETTFGYKpHOU4s= sha512-dKaFVLM/jg6vZV6vGw8scyFF+1pl9QGqk4k72au1jQvFg9zhyIdi0XbP2NOsdYQth44Nez74m3pPb5yIzuAD0w=="
   dependencies:
     mime "^1.2.11"
 
 glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+  integrity "sha1-tsHvQXxOVmPqSY8cRa+saRa7wik= sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="
   dependencies:
     is-glob "^4.0.1"
 
 glob@7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  integrity "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE= sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5687,7 +5687,7 @@ glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, gl
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
-  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  integrity "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o= sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg=="
   dependencies:
     global-prefix "^1.0.1"
     is-windows "^1.0.1"
@@ -5696,7 +5696,7 @@ global-modules@^1.0.0:
 global-prefix@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  integrity "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg=="
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -5712,24 +5712,24 @@ globals@^11.1.0:
 globals@^12.1.0:
   version "12.4.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  integrity "sha1-oYgTV2pBsAokqX5/gVkYwuGZJfg= sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="
   dependencies:
     type-fest "^0.8.1"
 
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+  integrity "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo= sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
 
 globalyzer@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
-  integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
+  integrity "sha1-y3baeVVWaaFRnVqO3wk6+qC/FGU= sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="
 
 globby@^11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
+  integrity "sha1-mivxB6Bo8//qvEmtcCx57ejP01c= sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -5741,12 +5741,12 @@ globby@^11.0.1:
 globrex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
-  integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
+  integrity "sha1-3V2eyCYjJzDNZ5Ol4zqTApheYJg= sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
 
 got@^8.0.1, got@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+  integrity "sha1-HSP2Q5Dpf3dsrFLluTbl9RTS6Tc= sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="
   dependencies:
     "@sindresorhus/is" "^0.7.0"
     cacheable-request "^2.1.1"
@@ -5774,22 +5774,22 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6,
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
+  integrity "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="
 
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+  integrity "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4= sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="
 
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-  integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
+  integrity "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="
 
 handlebars@^4.0.11, handlebars@^4.0.4:
   version "4.7.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
-  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
+  integrity "sha1-1MBcG6+Q6ZRfd6pop6IZqkp9904= sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="
   dependencies:
     minimist "^1.2.5"
     neo-async "^2.6.0"
@@ -5801,7 +5801,7 @@ handlebars@^4.0.11, handlebars@^4.0.4:
 has-ansi@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-1.0.3.tgz#c0b5b1615d9e382b0ff67169d967b425e48ca538"
-  integrity sha1-wLWxYV2eOCsP9nFp2We0JeSMpTg=
+  integrity "sha1-wLWxYV2eOCsP9nFp2We0JeSMpTg= sha512-XwLzIec2hoj/LW9F3nCcQpEwZ5fDJ1LOc6SAgc0pz79CGiY9zmZhIkbf7OnK+tC36UhpQBa03HPt13QavGoF6Q=="
   dependencies:
     ansi-regex "^1.1.0"
     get-stdin "^4.0.1"
@@ -5809,21 +5809,21 @@ has-ansi@^1.0.3:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  integrity "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="
   dependencies:
     ansi-regex "^2.0.0"
 
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
+  integrity "sha1-d3asYn8+p3JQz8My2rfd9eT10R0= sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="
   dependencies:
     isarray "2.0.1"
 
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+  integrity "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="
 
 has-flag@^3.0.0:
   version "3.0.0"
@@ -5838,7 +5838,7 @@ has-flag@^4.0.0:
 has-symbol-support-x@^1.4.1:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
+  integrity "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU= sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
 
 has-symbols@^1.0.0:
   version "1.0.0"
@@ -5848,24 +5848,24 @@ has-symbols@^1.0.0:
 has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+  integrity "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg= sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
 
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+  integrity "sha1-oEWrOD17SyASoAFIqwql8pAETU0= sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="
   dependencies:
     has-symbol-support-x "^1.4.1"
 
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+  integrity "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
 
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  integrity "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q=="
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -5874,7 +5874,7 @@ has-value@^0.3.1:
 has-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  integrity "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw=="
   dependencies:
     get-value "^2.0.6"
     has-values "^1.0.0"
@@ -5883,12 +5883,12 @@ has-value@^1.0.0:
 has-values@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+  integrity "sha1-bWHeldkd/Km5oCCJrThL/49it3E= sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="
 
 has-values@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  integrity "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
@@ -5896,7 +5896,7 @@ has-values@^1.0.0:
 has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  integrity "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
   dependencies:
     function-bind "^1.1.1"
 
@@ -5915,7 +5915,7 @@ hash-for-dep@^1.0.2, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0:
 hawk@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-1.1.1.tgz#87cd491f9b46e4e2aeaca335416766885d2d1ed9"
-  integrity sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=
+  integrity "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk= sha512-am8sVA2bCJIw8fuuVcKvmmNnGFUGW8spTkVtj2fXTEZVkfN42bwFZFtDem57eFi+NSxurJB8EQ7Jd3uCHLn8Vw=="
   dependencies:
     boom "0.4.x"
     cryptiles "0.2.x"
@@ -5925,12 +5925,12 @@ hawk@1.1.1:
 he@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+  integrity "sha1-hK5l+n6vsWX922FWauFLrwVmTw8= sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
 
 heimdalljs-fs-monitor@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.2.2.tgz#a76d98f52dbf3aa1b7c20cebb0132e2f5eeb9204"
-  integrity sha512-R/VhkWs8tm4x+ekLIp+oieR8b3xYK0oFDumEraGnwNMixpiKwO3+Ms5MJzDP5W5Ui1+H/57nGW5L3lHbxi20GA==
+  integrity "sha1-p22Y9S2/OqG3wgzrsBMuL17rkgQ= sha512-R/VhkWs8tm4x+ekLIp+oieR8b3xYK0oFDumEraGnwNMixpiKwO3+Ms5MJzDP5W5Ui1+H/57nGW5L3lHbxi20GA=="
   dependencies:
     heimdalljs "^0.2.3"
     heimdalljs-logger "^0.1.7"
@@ -5938,7 +5938,7 @@ heimdalljs-fs-monitor@^0.2.2:
 heimdalljs-graph@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-0.3.5.tgz#420fbbc8fc3aec5963ddbbf1a5fb47921c4a5927"
-  integrity sha512-szOy9WZUc7eUInEBQEsoa1G2d+oYHrn6ndZPf76eh8A9ID1zWUCEEsxP3F+CvQx9+EDrg1srdyLUmfVAr8EB4g==
+  integrity "sha1-Qg+7yPw67Flj3bvxpftHkhxKWSc= sha512-szOy9WZUc7eUInEBQEsoa1G2d+oYHrn6ndZPf76eh8A9ID1zWUCEEsxP3F+CvQx9+EDrg1srdyLUmfVAr8EB4g=="
 
 heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
   version "0.1.10"
@@ -5951,7 +5951,7 @@ heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
 heimdalljs@0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.3.3.tgz#e92d2c6f77fd46d5bf50b610d28ad31755054d0b"
-  integrity sha1-6S0sb3f9RtW/ULYQ0orTF1UFTQs=
+  integrity "sha1-6S0sb3f9RtW/ULYQ0orTF1UFTQs= sha512-xRlqDhgaXW4WccsiQlv6avDMKVN9Jk+FyMopDRPkmdf92TqfGSd2Osd/PKrK9sbM1AKcj8OpPlCzNlCWaLagCw=="
   dependencies:
     rsvp "~3.2.1"
 
@@ -5965,24 +5965,24 @@ heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5, heim
 hoek@0.9.x:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505"
-  integrity sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=
+  integrity "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU= sha512-ZZ6eGyzGjyMTmpSPYVECXy9uNfqBR7x5CavhUaLOeD6W0vWK1mp/b7O3f86XE0Mtfo9rZ6Bh3fnuw9Xr8MF9zA=="
 
 homedir-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  integrity sha1-TCu8inWJmP7r9e1oWA921GdotLw=
+  integrity "sha1-TCu8inWJmP7r9e1oWA921GdotLw= sha512-vyB97wSHuFP0FIQmu1H5RZCEUS0D11Dk9OFpXYo4D6HLFmIa5rbXh28ZGBWBe8LQjrw5fz8aoVRW09vP50XqCg=="
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
+  integrity "sha1-l/I2l3vW4SVAiTD/bePuxigewEc= sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
 
 html-differ@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/html-differ/-/html-differ-1.4.0.tgz#bb95a74d54d8f107b75ad5ada166a6924093b828"
-  integrity sha512-7kW2niHCIVOsRaligGdwV4B44YsVxKrOaRNec+u7Ab2r1sBziXcaWxWJ5lj0apIGaTZprprQAg2t2SUkGoPaUw==
+  integrity "sha1-u5WnTVTY8Qe3WtWtoWamkkCTuCg= sha512-7kW2niHCIVOsRaligGdwV4B44YsVxKrOaRNec+u7Ab2r1sBziXcaWxWJ5lj0apIGaTZprprQAg2t2SUkGoPaUw=="
   dependencies:
     chalk "1.0.0"
     coa "0.4.0"
@@ -5995,12 +5995,12 @@ html-differ@^1.4.0:
 http-cache-semantics@3.8.1:
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+  integrity "sha1-ObDhat2bYFvwqe89nar0hDtMrNI= sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
 
 http-errors@1.7.2, http-errors@~1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+  integrity "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8= sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -6011,7 +6011,7 @@ http-errors@1.7.2, http-errors@~1.7.2:
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  integrity "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0= sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -6021,12 +6021,12 @@ http-errors@~1.6.2:
 http-parser-js@>=0.4.0:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
-  integrity sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE=
+  integrity "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE= sha512-gmzoCd68gAuhyr4mOLSm4loH3Pv9fn0+YL7lItcK4BbGaxc9g+lQ7As4LhU8ZMqaPcSt4nSquIaUVbcXF/adqw=="
 
 http-proxy@^1.13.1, http-proxy@^1.17.0:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
-  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  integrity "sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="
   dependencies:
     eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
@@ -6035,7 +6035,7 @@ http-proxy@^1.13.1, http-proxy@^1.17.0:
 http-signature@~0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz#4fbdac132559aa8323121e540779c0a012b27e66"
-  integrity sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=
+  integrity "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY= sha512-coK8uR5rq2IMj+Hen+sKPA5ldgbCc1/spPdKCL1Fw6h+D0s/2LzMcRK0Cqufs1h0ryx/niwBHGFu8HC3hwU+lA=="
   dependencies:
     asn1 "0.1.11"
     assert-plus "^0.1.5"
@@ -6044,7 +6044,7 @@ http-signature@~0.10.0:
 https-proxy-agent@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
+  integrity "sha1-TuenN6vZJniik9mzShr00NCMeHs= sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg=="
   dependencies:
     agent-base "^4.3.0"
     debug "^3.1.0"
@@ -6052,7 +6052,7 @@ https-proxy-agent@^2.2.1:
 https-proxy-agent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
+  integrity "sha1-cCtx+1UgoTKmbeH2dUHZ5iFU2Cs= sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg=="
   dependencies:
     agent-base "5"
     debug "4"
@@ -6060,34 +6060,34 @@ https-proxy-agent@^4.0.0:
 iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  integrity "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 ieee754@1.1.13, ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+  integrity "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q= sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+  integrity "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw= sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
 
 ignore@^5.1.1:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+  integrity "sha1-hLez2+ZFUrbvDsqZ9nQ9vsbZet8= sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="
 
 ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+  integrity "sha1-8VCotQo0KJsz4i9YiavU2AFvDlc= sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
 
 import-fresh@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
-  integrity sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ==
+  integrity "sha1-o9iX9CDKsOZxI2iX91vBS0iFw5A= sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ=="
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -6095,7 +6095,7 @@ import-fresh@^3.0.0:
 import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  integrity "sha1-Yz/2GFBueTr1rJG/SLcmd+FcvmY= sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -6103,17 +6103,17 @@ import-fresh@^3.2.1:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
 
 indent-string@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
+  integrity "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ=="
 
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
+  integrity "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
 
 inflection@^1.12.0:
   version "1.12.0"
@@ -6136,17 +6136,17 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1,
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  integrity "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
 
 ini@^1.3.4, ini@~1.3.0:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84"
-  integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==
+  integrity "sha1-oJNj4ZEZcuoW16iFEAXYTPCamoQ= sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="
 
 inline-source-map-comment@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/inline-source-map-comment/-/inline-source-map-comment-1.0.5.tgz#50a8a44c2a790dfac441b5c94eccd5462635faf6"
-  integrity sha1-UKikTCp5DfrEQbXJTszVRiY1+vY=
+  integrity "sha1-UKikTCp5DfrEQbXJTszVRiY1+vY= sha512-a3/m6XgooVCXkZCduOb7pkuvUtNKt4DaqaggKKJrMQHQsqt6JcJXEreExeZiiK4vWL/cM/uF6+chH05pz2/TdQ=="
   dependencies:
     chalk "^1.0.0"
     get-stdin "^4.0.1"
@@ -6157,7 +6157,7 @@ inline-source-map-comment@^1.0.5:
 inquirer@^6:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.2.tgz#46941176f65c9eb20804627149b743a218f25406"
-  integrity sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA==
+  integrity "sha1-RpQRdvZcnrIIBGJxSbdDohjyVAY= sha512-Z2rREiXA6cHRR9KBOarR3WuLlFzlIfAEIiB45ll5SSadMg7WqOh1MKEjjndfuH5ewXdixWCxqnVfGOQzPeiztA=="
   dependencies:
     ansi-escapes "^3.2.0"
     chalk "^2.4.2"
@@ -6176,7 +6176,7 @@ inquirer@^6:
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
+  integrity "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ=="
   dependencies:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
@@ -6191,99 +6191,99 @@ invariant@^2.2.2, invariant@^2.2.4:
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
+  integrity "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
 
 ipaddr.js@1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
+  integrity "sha1-N9905DCg5HVQ/lSi3v4w2KzZX2U= sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
 
 irregular-plurals@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
-  integrity sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y=
+  integrity "sha1-LKmwM2UREYVUEvFr5dd8YqRYp2Y= sha512-kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q=="
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+  integrity "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  integrity "sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY= sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="
   dependencies:
     kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
 
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
-  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  integrity "sha1-6h9/O4DwZCNug0cPhsCcJU+0Wwk= sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="
   dependencies:
     binary-extensions "^2.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
+  integrity "sha1-76ouqdqg16suoTqXsritUf776L4= sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
 
 is-buffer@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
+  integrity "sha1-Ts8/z3ScvR5HJonhCaxmJhol5yU= sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
+  integrity "sha1-VAVy0096wxGfj3bDDLwbHgN6/74= sha512-C2wz7Juo5pUZTFQVer9c+9b4qw3I5T/CHQxQyhVu7BJel6C22FmsLIWsdseYyOw6xz9Pqy9eJWSkQ7+3iN1HVw=="
   dependencies:
     builtin-modules "^1.0.0"
 
 is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
+  integrity "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU= sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
 
 is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
+  integrity "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs= sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
 
 is-callable@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
+  integrity "sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk= sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  integrity "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  integrity "sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc= sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-  integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
+  integrity "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= sha512-P5rExV1phPi42ppoMWy7V63N3i173RY921l4JJ7zonMSxK+OWGPj76GD+cUKUb68l4vQXcJp2SsG+r/A4ABVzg=="
 
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  integrity "sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco= sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="
   dependencies:
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
@@ -6292,7 +6292,7 @@ is-descriptor@^0.1.0:
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  integrity "sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw= sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="
   dependencies:
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
@@ -6301,183 +6301,183 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+  integrity "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="
 
 is-extendable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
+  integrity "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ= sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
+  integrity "sha1-754xOG8DGn8NZDr4L95QxFfvAMs= sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  integrity "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
 
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
-  integrity sha1-U/aEzRQyhbUsMkS05vKCU1J69ms=
+  integrity "sha1-U/aEzRQyhbUsMkS05vKCU1J69ms= sha512-UCFta9F9rWFSavp9H3zHEHrARUfZbdJvmHKeEpds4BK3v7W2LdXoNypMtXXi5w5YBDEBCTYmbI+vsSwI8LYJaQ=="
 
 is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
+  integrity "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  integrity "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw= sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="
   dependencies:
     is-extglob "^2.1.1"
 
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+  integrity "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
 
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  integrity "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+  integrity "sha1-ACbjf1RU1z41bf5lZGmYZ8an8P8= sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
 
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+  integrity "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss= sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
 
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
+  integrity "sha1-PkcprB9f3gJc19g6iW2rn09n2w8= sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
 
 is-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+  integrity "sha1-iVJojF7C/9awPsyF52ngKQMINHA= sha512-+XzmTRB/JXoIdK20Ge8K8PRsP5UlthLaVhIRxzIwQ73jRgER8iRw98DilvERx/tSjOHLy9JM4sKUfLRMB5ui0Q=="
 
 is-odd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
-  integrity sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==
+  integrity "sha1-dkZiRnH9fqVYzNmieVGC8pWPGyQ= sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ=="
   dependencies:
     is-number "^4.0.0"
 
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+  integrity "sha1-caUMhCnfync8kqOQpKA7OfzVHT4= sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
-  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  integrity "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc= sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="
   dependencies:
     isobject "^3.0.1"
 
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
+  integrity "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= sha512-NECAi6wp6CgMesHuVUEK8JwjCvm/tvnn5pCbB42JOHp3mgUizN0nagXu4HEqQZBkieGEQ+jVcMKWqoVd6CDbLQ=="
 
 is-reference@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.0.tgz#50e6ef3f64c361e2c53c0416cdc9420037f2685b"
-  integrity sha512-h37O/IX4efe56o9k41II1ECMqKwtqHa7/12dLDEzJIFux2x15an4WCDb0/eKdmUgRpLJ3bR0DrzDc7vOrVgRDw==
+  integrity "sha1-UObvP2TDYeLFPAQWzclCADfyaFs= sha512-h37O/IX4efe56o9k41II1ECMqKwtqHa7/12dLDEzJIFux2x15an4WCDb0/eKdmUgRpLJ3bR0DrzDc7vOrVgRDw=="
   dependencies:
     "@types/estree" "0.0.38"
 
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
+  integrity "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= sha512-WQgPrEkb1mPCWLSlLFuN1VziADSixANugwSkJfPRR73FNWIQQN+tR/t1zWfyES/Y9oag/XBtVsahFdfBku3Kyw=="
   dependencies:
     has "^1.0.1"
 
 is-regex@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
+  integrity "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4= sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="
   dependencies:
     has "^1.0.3"
 
 is-regex@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
+  integrity "sha1-xvmKrMVG9s7FRooHt7FTq1ZKV7k= sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="
   dependencies:
     has-symbols "^1.0.1"
 
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
-  integrity sha1-/S2INUXEa6xaYz57mgnof6LLUGk=
+  integrity "sha1-/S2INUXEa6xaYz57mgnof6LLUGk= sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
 
 is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
+  integrity "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= sha512-leC1bcIRBHjXtaZSM2gAXNeZsIOdDMgq/kHKAVKQ05JTwvb7hnvrHBEm6mnnMRyE7yu+ljNlcG8YUmALCevSxg=="
 
 is-running@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
-  integrity sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=
+  integrity "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA= sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w=="
 
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-  integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
+  integrity "sha1-EtSj3U5o4Lec6428hBc66A2RykQ= sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="
 
 is-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
-  integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
+  integrity "sha1-venDJoDW+uBBKdasnZIc54FfeOM= sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
 
 is-string@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+  integrity "sha1-QEk+0ZjvP/R3uMf5L2ROyCpc06Y= sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
 
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
+  integrity "sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg= sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="
   dependencies:
     has-symbols "^1.0.0"
 
 is-type@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
-  integrity sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w=
+  integrity "sha1-9lHYXDZdRJVdFKUdjXBh8/a0d5w= sha512-YwJh/zBVrcJ90aAnPBM0CbHvm7lG9ao7lIFeqTZ1UQj4iFLpM5CikdaU+dGGesrMJwxLqPGmjjrUrQ6Kn3Zh+w=="
   dependencies:
     core-util-is "~1.0.0"
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+  integrity "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0= sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 
 isarray@0.0.1:
   version "0.0.1"
@@ -6487,36 +6487,36 @@ isarray@0.0.1:
 isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  integrity "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
 
 isarray@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+  integrity "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ=="
 
 isbinaryfile@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==
+  integrity "sha1-XW3vPt6/boyoyunDAYOoBLX4voA= sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="
   dependencies:
     buffer-alloc "^1.2.0"
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
 
 isobject@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
+  integrity "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity "sha1-TkMekrEalzFjaqH5yNHMvP2reN8= sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="
 
 istextorbinary@2.1.0:
   version "2.1.0"
@@ -6530,7 +6530,7 @@ istextorbinary@2.1.0:
 isurl@^1.0.0-alpha5:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
+  integrity "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc= sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="
   dependencies:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
@@ -6538,7 +6538,7 @@ isurl@^1.0.0-alpha5:
 jmespath@0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
-  integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
+  integrity "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="
 
 jquery@^3.5.1:
   version "3.5.1"
@@ -6548,7 +6548,7 @@ jquery@^3.5.1:
 js-reporters@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.3.tgz#8febcab370539df62e09b95da133da04b11f6168"
-  integrity sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A==
+  integrity "sha1-j+vKs3BTnfYuCbldoTPaBLEfYWg= sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A=="
 
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
@@ -6563,7 +6563,7 @@ js-tokens@^4.0.0:
 js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+  integrity "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc= sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -6586,22 +6586,22 @@ jsesc@~0.5.0:
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+  integrity "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="
 
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+  integrity "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
-  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+  integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
 
 json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   version "1.0.1"
@@ -6613,7 +6613,7 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
 json-stringify-safe@~5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+  integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
 json5@^0.5.1:
   version "0.5.1"
@@ -6623,7 +6623,7 @@ json5@^0.5.1:
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  integrity "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4= sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="
   dependencies:
     minimist "^1.2.0"
 
@@ -6637,7 +6637,7 @@ json5@^2.1.2:
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
+  integrity "sha1-NzaitCi4e72gzIO1P6PWM6NcKug= sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw=="
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -6651,7 +6651,7 @@ jsonfile@^4.0.0:
 jsonfile@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
-  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+  integrity "sha1-mJZsuiFDeMjIS4LghZB7QL9hQXk= sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="
   dependencies:
     universalify "^1.0.0"
   optionalDependencies:
@@ -6665,52 +6665,52 @@ jsonify@~0.0.0:
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+  integrity "sha1-RJI7o55osSp87H32wyaMAx8u83M= sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="
   dependencies:
     json-buffer "3.0.0"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
+  integrity "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  integrity "sha1-IIE989cSkosgc3hpGkUGb65y3Vc= sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+  integrity "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0= sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
+  integrity "sha1-ARRrNqYhjmTljzqNZt5df8b20FE= sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  integrity sha1-QIhDO0azsbolnXh4XY6W9zugJDk=
+  integrity "sha1-QIhDO0azsbolnXh4XY6W9zugJDk= sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw=="
   optionalDependencies:
     graceful-fs "^4.1.9"
 
 lazy-cache@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-2.0.2.tgz#b9190a4f913354694840859f8a8f7084d8822264"
-  integrity sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=
+  integrity "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ= sha512-7vp2Acd2+Kz4XkzxGxaB1FWOi8KjWIWsgdfD5MCb86DWvlLqhRPM+d6Pro3iNEL5VT9mstz5hKAlcd+QR6H3aA=="
   dependencies:
     set-getter "^0.1.0"
 
 leek@0.0.24:
   version "0.0.24"
   resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
-  integrity sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo=
+  integrity "sha1-5ADlfw5g2O8r1NBo3EKKVDRdvNo= sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ=="
   dependencies:
     debug "^2.1.0"
     lodash.assign "^3.2.0"
@@ -6731,7 +6731,7 @@ levenary@^1.1.1:
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
-  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  integrity "sha1-rkViwAdHO5MqYgDUAyaN0v/8at4= sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="
   dependencies:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
@@ -6739,7 +6739,7 @@ levn@^0.4.1:
 line-column@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/line-column/-/line-column-1.0.2.tgz#d25af2936b6f4849172b312e4792d1d987bc34a2"
-  integrity sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI=
+  integrity "sha1-0lryk2tvSEkXKzEuR5LR2Ye8NKI= sha512-Ktrjk5noGYlHsVnYWh62FLVs4hTb8A3e+vucNZMgPeAOITdshMSgv4cCZQeRDjm7+goqmo6+liZwTXo+U3sVww=="
   dependencies:
     isarray "^1.0.0"
     isobject "^2.0.0"
@@ -6747,26 +6747,26 @@ line-column@^1.0.2:
 linkify-it@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
-  integrity sha1-2UpGSPmxwXnWT6lykSaL22zpQ08=
+  integrity "sha1-2UpGSPmxwXnWT6lykSaL22zpQ08= sha512-eMNKghlRbOz74oeCO61NHixBXtKifyBAxs3YQRLthhViT8T/9reBq00NIWYEC1CdwQmn/xShUl8JqgWFYxo6gw=="
   dependencies:
     uc.micro "^1.0.1"
 
 linkify-it@~1.2.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
-  integrity sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo=
+  integrity "sha1-B3NSbDF8j9E71TTuHRgP+Iq/iBo= sha512-eGHwtlABkp1NOJSiKUNqBf3SYAS5jPHtvRXPAgNaQwTqmkTahjtiLH9NtxdR5IOPhNvwNMN/diswSfZKzUkhGg=="
   dependencies:
     uc.micro "^1.0.1"
 
 livereload-js@^2.3.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
-  integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
+  integrity "sha1-RHwxzx6pq1L8INthXF3fZ494AJw= sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
 
 load-json-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  integrity "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ=="
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^2.2.0"
@@ -6776,7 +6776,7 @@ load-json-file@^2.0.0:
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
+  integrity "sha1-L19Fq5HjMhYjT9U62rZo607AmTs= sha512-Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw=="
   dependencies:
     graceful-fs "^4.1.2"
     parse-json "^4.0.0"
@@ -6786,7 +6786,7 @@ load-json-file@^4.0.0:
 locate-character@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
-  integrity sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg==
+  integrity "sha1-8tJhTUmCDss8ktgNGTuNt1X3TA8= sha512-n2GmejDXtOPBAZdIiEFy5dJ5N38xBCXLNOtw2WpB9kGh6pnrEuKlwYI+Tkpofc4wDtVXHtoAOJaMRlYG/oYaxg=="
 
 locate-path@^2.0.0:
   version "2.0.0"
@@ -6807,12 +6807,12 @@ locate-path@^3.0.0:
 lodash-node@^3.2.0:
   version "3.10.2"
   resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7"
-  integrity sha1-JZjVsbVOami0y1ROXHMJU8v2Mvc=
+  integrity "sha1-JZjVsbVOami0y1ROXHMJU8v2Mvc= sha512-2voC/VK0CVYUYOpA91EsHiTuPbJUbuaLlykWHK3skyCba+Ps6e+LqjY06UEhan6y7jB2Oz1oaFFifJrg18vO1w=="
 
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+  integrity "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4= sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ=="
   dependencies:
     lodash._basecopy "^3.0.0"
     lodash.keys "^3.0.0"
@@ -6829,7 +6829,7 @@ lodash._basebind@~2.3.0:
 lodash._basecopy@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
+  integrity "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY= sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ=="
 
 lodash._basecreate@~2.3.0:
   version "2.3.0"
@@ -6863,7 +6863,7 @@ lodash._basecreatewrapper@~2.3.0:
 lodash._baseflatten@^3.0.0:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz#0770ff80131af6e34f3b511796a7ba5214e65ff7"
-  integrity sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c=
+  integrity "sha1-B3D/gBMa9uNPO1EXlqe6UhTmX/c= sha512-fESngZd+X4k+GbTxdMutf8ohQa0s3sJEHIcwtu4/LsIQ2JTDzdRxDCMQjW+ezzwRitLmHnacVVmosCbxifefbw=="
   dependencies:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
@@ -6871,12 +6871,12 @@ lodash._baseflatten@^3.0.0:
 lodash._bindcallback@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
+  integrity "sha1-5THCdkTPi1epnhftlbNcdIeJOS4= sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ=="
 
 lodash._createassigner@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
-  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
+  integrity "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE= sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw=="
   dependencies:
     lodash._bindcallback "^3.0.0"
     lodash._isiterateecall "^3.0.0"
@@ -6906,7 +6906,7 @@ lodash._escapestringchar@~2.3.0:
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
+  integrity "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA=="
 
 lodash._htmlescapes@~2.3.0:
   version "2.3.0"
@@ -6916,7 +6916,7 @@ lodash._htmlescapes@~2.3.0:
 lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
+  integrity "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw= sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ=="
 
 lodash._objecttypes@~2.3.0:
   version "2.3.0"
@@ -6931,7 +6931,7 @@ lodash._reinterpolate@~2.3.0:
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+  integrity "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="
 
 lodash._renative@~2.3.0:
   version "2.3.0"
@@ -6969,7 +6969,7 @@ lodash._slice@~2.3.0:
 lodash.assign@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
-  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
+  integrity "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo= sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA=="
   dependencies:
     lodash._baseassign "^3.0.0"
     lodash._createassigner "^3.0.0"
@@ -6978,7 +6978,7 @@ lodash.assign@^3.2.0:
 lodash.assignin@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
+  integrity "sha1-uo31+4QesKPoBEIysOJjqNxqKKI= sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg=="
 
 lodash.bind@~2.3.0:
   version "2.3.0"
@@ -6992,17 +6992,17 @@ lodash.bind@~2.3.0:
 lodash.castarray@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
-  integrity sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=
+  integrity "sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="
 
 lodash.clonedeep@^4.4.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
-  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+  integrity "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
 
 lodash.debounce@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5"
-  integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=
+  integrity "sha1-gSIRw3ipTMKdWqTjNGzwv846ffU= sha512-lcmJwMpdPAtChA4hfiwxTtgFeNAaow701wWUgVUqeD0XJF7vMXIN+bu/2FJSGxT0NUbZy9g9VFrlOFfPjl+0Ew=="
   dependencies:
     lodash._getnative "^3.0.0"
 
@@ -7017,7 +7017,7 @@ lodash.defaults@~2.3.0:
 lodash.defaultsdeep@^4.6.1:
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6"
-  integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==
+  integrity "sha1-US6b1yHSctlOPTpjZT+hdRZ0HKY= sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="
 
 lodash.escape@~2.3.0:
   version "2.3.0"
@@ -7031,12 +7031,12 @@ lodash.escape@~2.3.0:
 lodash.find@^4.5.1:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
-  integrity sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E=
+  integrity "sha1-ywcE1Hq3F4n/oN6Ll92Sb7iLE7E= sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg=="
 
 lodash.flatten@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-3.0.2.tgz#de1cf57758f8f4479319d35c3e9cc60c4501938c"
-  integrity sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w=
+  integrity "sha1-3hz1d1j49EeTGdNcPpzGDEUBk4w= sha512-jCXLoNcqQRbnT/KWZq2fIREHWeczrzpTR0vsycm96l/pu5hGeAntVBG0t7GuM/2wFqmnZs3d1eGptnAH2E8+xQ=="
   dependencies:
     lodash._baseflatten "^3.0.0"
     lodash._isiterateecall "^3.0.0"
@@ -7066,12 +7066,12 @@ lodash.identity@~2.3.0:
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
+  integrity "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="
 
 lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
+  integrity "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ=="
 
 lodash.isfunction@~2.3.0:
   version "2.3.0"
@@ -7088,7 +7088,7 @@ lodash.isobject@~2.3.0:
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
+  integrity "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ=="
   dependencies:
     lodash._getnative "^3.0.0"
     lodash.isarguments "^3.0.0"
@@ -7121,7 +7121,7 @@ lodash.omit@^4.1.0:
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
+  integrity "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw=="
 
 lodash.support@~2.3.0:
   version "2.3.0"
@@ -7133,7 +7133,7 @@ lodash.support@~2.3.0:
 lodash.template@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
+  integrity "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A= sha512-ZYuOnfoFp8NM7NfIO3rF2ZqXObtxfW1KAyBED68MLXJs6LizTeS6JD6od8HT3CDWkxrsUnxAF0DViyhjKkxy9g=="
   dependencies:
     lodash._reinterpolate "~3.0.0"
     lodash.templatesettings "^4.0.0"
@@ -7154,7 +7154,7 @@ lodash.template@~2.3.x:
 lodash.templatesettings@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
-  integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
+  integrity "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY= sha512-UYY4Eo4BJ1E3WDldMjTqqnRBOEhcOqEz8sD1CkxOX2jsOC2qrj4WNt/3hBgB8pg9Ta6T5fpuKE0C+HfymYdT9g=="
   dependencies:
     lodash._reinterpolate "~3.0.0"
 
@@ -7174,7 +7174,7 @@ lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
 lodash.uniqby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
-  integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+  integrity "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww=="
 
 lodash.values@~2.3.0:
   version "2.3.0"
@@ -7191,14 +7191,14 @@ lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13
 log-symbols@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==
+  integrity "sha1-86CFFqXeqJMzan3uFNGKHP2rd8Q= sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="
   dependencies:
     chalk "^2.4.2"
 
 log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
-  integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
+  integrity "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo= sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="
   dependencies:
     chalk "^2.0.1"
 
@@ -7212,7 +7212,7 @@ loose-envify@^1.0.0:
 loud-rejection@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+  integrity "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ=="
   dependencies:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
@@ -7220,7 +7220,7 @@ loud-rejection@^1.0.0:
 lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+  integrity "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="
 
 lru-cache@^6.0.0:
   version "6.0.0"
@@ -7232,62 +7232,62 @@ lru-cache@^6.0.0:
 magic-string@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.0.tgz#1b396d26406188f1fa3730a68229562d36a1c2f2"
-  integrity sha512-BhLyoHHzjhXGXuTHQW9odsmdkoBtBGorgElhMVlXP1fmM5xAk+Oe9wXwD6TAnm6Fjuq8ItQOePf2H1jLzor7CQ==
+  integrity "sha1-GzltJkBhiPH6NzCmgilWLTahwvI= sha512-BhLyoHHzjhXGXuTHQW9odsmdkoBtBGorgElhMVlXP1fmM5xAk+Oe9wXwD6TAnm6Fjuq8ItQOePf2H1jLzor7CQ=="
   dependencies:
     sourcemap-codec "^1.4.1"
 
 magic-string@^0.25.2:
   version "0.25.2"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg==
+  integrity "sha1-E5w6cpUV7FXpbmnoKhH+iQopOtk= sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg=="
   dependencies:
     sourcemap-codec "^1.4.4"
 
 make-dir@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
-  integrity sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==
+  integrity "sha1-GbQ2n+SMEW9Twq+VrRAsDjnoXVE= sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA=="
   dependencies:
     pify "^3.0.0"
 
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
-  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  integrity "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= sha512-M/XvMZ6oK4edXjvg/ZYyzByg8kjpVrF/m0x3wbhOlzJfsQgFkqP1rJnLnJExOcslmLSSeLiN6NmF+cBoKJHGTg=="
   dependencies:
     tmpl "1.0.x"
 
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+  integrity "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="
 
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+  integrity "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="
 
 map-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
+  integrity "sha1-plzSkIepJZi4eRJXpSPgISIqwfk= sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ=="
 
 map-stream@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
-  integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=
+  integrity "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
 
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  integrity "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="
   dependencies:
     object-visit "^1.0.0"
 
 markdown-it-terminal@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
-  integrity sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k=
+  integrity "sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k= sha512-Pq9BTUtEzuO6ZxNU7xYczEUHWkkCS6mE5FjpV6VnmbT56re1RCnO5nAE2ZehzY5H+uvVSNuwiqvoHaJj8+tssA=="
   dependencies:
     ansi-styles "^3.0.0"
     cardinal "^1.0.0"
@@ -7298,7 +7298,7 @@ markdown-it-terminal@0.1.0:
 markdown-it@^4.3.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414"
-  integrity sha1-PfNz2+pYepp/7z5WMRtokI91xBQ=
+  integrity "sha1-PfNz2+pYepp/7z5WMRtokI91xBQ= sha512-Rl8dHHeLuAh3E72OPY0tY7CLvlxgHiLhlshIYswAAabAg4YDBLa6e/LTgNkkxBO2K61ESzoquPQFMw/iMrT1PA=="
   dependencies:
     argparse "~1.0.2"
     entities "~1.1.1"
@@ -7309,7 +7309,7 @@ markdown-it@^4.3.0:
 markdown-it@^8.3.1, markdown-it@^8.4.2:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
-  integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==
+  integrity "sha1-OG+YmY3BWjdyKqdyIIT0Agvdm1Q= sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ=="
   dependencies:
     argparse "^1.0.7"
     entities "~1.1.1"
@@ -7335,24 +7335,24 @@ matcher-collection@^2.0.0:
 md5-hex@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-3.0.1.tgz#be3741b510591434b2784d79e556eefc2c9a8e5c"
-  integrity sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==
+  integrity "sha1-vjdBtRBZFDSyeE155Vbu/Cyajlw= sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw=="
   dependencies:
     blueimp-md5 "^2.10.0"
 
 mdn-links@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/mdn-links/-/mdn-links-0.1.0.tgz#e24c83b97cb4c5886cc39f2f780705fbfe273aa5"
-  integrity sha1-4kyDuXy0xYhsw58veAcF+/4nOqU=
+  integrity "sha1-4kyDuXy0xYhsw58veAcF+/4nOqU= sha512-m+gI2Hrgro1O0SwqHd9cFkqN8VGzP56eprB63gxu6z9EFQDMeaR083wcNqMVADIbgiMP/TOCCe0ZIXHLBv2tUg=="
 
 mdurl@^1.0.1, mdurl@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
+  integrity "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
 
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  integrity "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
 
 memory-streams@^0.1.3:
   version "0.1.3"
@@ -7364,7 +7364,7 @@ memory-streams@^0.1.3:
 meow@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
-  integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
+  integrity "sha1-38c9Y6mvxxSl43F2DrXIi5EHiqQ= sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="
   dependencies:
     camelcase-keys "^4.0.0"
     decamelize-keys "^1.0.0"
@@ -7379,17 +7379,17 @@ meow@^5.0.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+  integrity "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
 
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+  integrity "sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
 
 merge-trees@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
-  integrity sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=
+  integrity "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4= sha512-O7TWwipLHhc9tErjq3WBvNP7I1g7Wgudl1ZkLqpT7F2MZy1yEdgnI9cpZZxBaqk+wJZu+2b9FE7D3ubUmGFHFA=="
   dependencies:
     can-symlink "^1.0.0"
     fs-tree-diff "^0.5.4"
@@ -7409,17 +7409,17 @@ merge-trees@^2.0.0:
 merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+  integrity "sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+  integrity "sha1-cIWbyVyYQJUvNZoGij/En57PrCM= sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7438,7 +7438,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
 micromatch@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  integrity "sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk= sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="
   dependencies:
     braces "^3.0.1"
     picomatch "^2.0.5"
@@ -7446,66 +7446,66 @@ micromatch@^4.0.2:
 mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
+  integrity "sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I= sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
 
 mime-db@1.45.0:
   version "1.45.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
+  integrity "sha1-zO7aIczXw6dF66LezVXUtz54eeo= sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="
 
 "mime-db@>= 1.40.0 < 2":
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
+  integrity "sha1-plBX6ZjbCQ9zKmj2wnbTh9QSbDI= sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
 
 mime-types@^2.1.18, mime-types@^2.1.19:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==
+  integrity "sha1-R5SfmOJ56lMRn1ci4PNOUpvsAJ8= sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="
   dependencies:
     mime-db "1.44.0"
 
 mime-types@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce"
-  integrity sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4=
+  integrity "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4= sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw=="
 
 mime-types@~2.1.24:
   version "2.1.28"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+  integrity "sha1-EWDEdX6rLFNjiI4AUnPs950qDs0= sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="
   dependencies:
     mime-db "1.45.0"
 
 mime@1.6.0, mime@^1.2.11:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+  integrity "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE= sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
 
 mime@^2.0.3:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
+  integrity "sha1-4FH9iBNYWF8yed8zP+aU2gvP/dY= sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="
 
 mime@~1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-  integrity sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=
+  integrity "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA= sha512-Ysa2F/nqTNGHhhm9MV8ure4+Hc+Y8AWiqUdHxsO7xu8zc92ND9f3kpALHjaP026Ft17UfxrMt95c50PLUeynBw=="
 
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-  integrity sha1-5md4PZLonb00KBi1IwudYqZyrRg=
+  integrity "sha1-5md4PZLonb00KBi1IwudYqZyrRg= sha512-h1HSEmsL/ggPjnixiDrEdt2YmXDpeSQlT26BMutTYBxJ46L3nOybRl/aNh/i623y6suDlbgF+m1dqX5V1eCBBQ=="
 
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+  integrity "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
 
 mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
+  integrity "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs= sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
 
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
@@ -7517,7 +7517,7 @@ mimic-response@^1.0.0:
 minimist-options@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
+  integrity "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ= sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
@@ -7530,12 +7530,12 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
 minimist@~0.0.1:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+  integrity "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw=="
 
 minipass@^2.2.0:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
-  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
+  integrity "sha1-ys6+SSAiSX9law8PUeJoKp7S2Eg= sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
@@ -7543,7 +7543,7 @@ minipass@^2.2.0:
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  integrity "sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY= sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -7551,7 +7551,7 @@ mixin-deep@^1.2.0:
 mkdirp-classic@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
-  integrity sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g==
+  integrity "sha1-VMRBzkyWzXeQ4QtBqHqlEGjsqys= sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
 
 mkdirp@0.5.5, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.5"
@@ -7563,7 +7563,7 @@ mkdirp@0.5.5, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
 mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+  integrity "sha1-PrXtYmInVteaXw4qIh3+utdcL34= sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
 
 mktemp@~0.4.0:
   version "0.4.0"
@@ -7573,7 +7573,7 @@ mktemp@~0.4.0:
 mocha@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6"
-  integrity sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA==
+  integrity "sha1-jkDRmKz5GlKs4SLNdZnJq4V7KeY= sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="
   dependencies:
     ansi-colors "3.2.3"
     browser-stdout "1.3.1"
@@ -7603,7 +7603,7 @@ mocha@^7.1.2:
 morgan@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
-  integrity sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==
+  integrity "sha1-Co0Wc0odmvvIJLmd+H5zjlji2lk= sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="
   dependencies:
     basic-auth "~2.0.0"
     debug "2.6.9"
@@ -7614,7 +7614,7 @@ morgan@^1.9.1:
 mout@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mout/-/mout-1.1.0.tgz#0b29d41e6a80fa9e2d4a5be9d602e1d9d02177f6"
-  integrity sha512-XsP0vf4As6BfqglxZqbqQ8SR6KQot2AgxvR0gG+WtUkf90vUXchMOZQtPf/Hml1rEffJupqL/tIrU6EYhsUQjw==
+  integrity "sha1-CynUHmqA+p4tSlvp1gLh2dAhd/Y= sha512-XsP0vf4As6BfqglxZqbqQ8SR6KQot2AgxvR0gG+WtUkf90vUXchMOZQtPf/Hml1rEffJupqL/tIrU6EYhsUQjw=="
 
 ms@2.0.0:
   version "2.0.0"
@@ -7624,7 +7624,7 @@ ms@2.0.0:
 ms@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+  integrity "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
 
 ms@^2.1.1:
   version "2.1.3"
@@ -7634,17 +7634,17 @@ ms@^2.1.1:
 mustache@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a"
-  integrity sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA==
+  integrity "sha1-hzhV8jqoqVsVD7ltmDbtvFodJIo= sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA=="
 
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+  integrity "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="
 
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
-  integrity sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==
+  integrity "sha1-h59xUMstq3pHElkGbBBO7m4Pp8I= sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA=="
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7662,27 +7662,27 @@ nanomatch@^1.2.9:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
 
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+  integrity "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs= sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
 
 neo-async@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+  integrity "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw= sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
 
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+  integrity "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y= sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
 
 node-environment-flags@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
+  integrity "sha1-owrBNiH299Z0JgpU3t4EjDmCwIg= sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="
   dependencies:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
@@ -7690,17 +7690,17 @@ node-environment-flags@1.0.6:
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
-  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+  integrity "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
 
 node-modules-path@^1.0.0, node-modules-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
-  integrity sha1-QAlrCM560OoUaAhjr0ScfHWl0cg=
+  integrity "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg= sha512-DQTUnpUBWdRcLWJ/dKuYAXoTwofrIi2khgiwpNJ6Ce8JwLpcBWrm9ypOY307ta0o8nzcWwJf1RX7UWys6ahFlQ=="
 
 node-notifier@^5.0.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"
-  integrity sha1-L6nhJgX6EACdRFSdb82KY93g5P8=
+  integrity "sha1-L6nhJgX6EACdRFSdb82KY93g5P8= sha512-HJp4p6fq5IlsFsjQFfhaZWfbUMfDiaSDZ5Wr/9g9Huwh+KFk0FdW8sjBLjk1bReQc4KPr9xUd/KBcsluCY8L/A=="
   dependencies:
     growly "^1.3.0"
     semver "^5.3.0"
@@ -7727,24 +7727,24 @@ node-releases@^1.1.66:
 node-uuid@~1.4.0:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
+  integrity "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc= sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="
 
 node-watch@0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.1.tgz#0caaa6a6833b0d533487f953c52a6c787769ba7c"
-  integrity sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g==
+  integrity "sha1-DKqmpoM7DVM0h/lTxSpseHdpunw= sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g=="
 
 nopt@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
-  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  integrity "sha1-xkZdvwirzU2zWTF/eaxopkayj/k= sha512-4GUt3kSEYmk4ITxzB/b9vaIDfUVWN/Ml1Fwl11IlnIG2iaJ9O6WXZ9SrYM9NLI8OCBieN2Y8SWC2oJV0RQ7qYg=="
   dependencies:
     abbrev "1"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
+  integrity "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8= sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -7754,19 +7754,19 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
+  integrity "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
-  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+  integrity "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
 
 normalize-url@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
+  integrity "sha1-g1qdoVUfom9w6SMpBpojqmV01+Y= sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="
   dependencies:
     prepend-http "^2.0.0"
     query-string "^5.0.1"
@@ -7775,7 +7775,7 @@ normalize-url@2.0.1:
 npm-package-arg@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
+  integrity "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME= sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="
   dependencies:
     hosted-git-info "^2.6.0"
     osenv "^0.1.5"
@@ -7785,21 +7785,21 @@ npm-package-arg@^6.1.0:
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
+  integrity "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="
   dependencies:
     path-key "^2.0.0"
 
 npm-run-path@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
-  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  integrity "sha1-f5G+MX9qRm7+08nymArYpO6LD6U= sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="
   dependencies:
     path-key "^3.0.0"
 
 npmlog@^4.0.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  integrity "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs= sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -7809,12 +7809,12 @@ npmlog@^4.0.0:
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
+  integrity "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="
 
 oauth-sign@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz#cb540f93bb2b22a7d5941691a288d60e8ea9386e"
-  integrity sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=
+  integrity "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4= sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ=="
 
 object-assign@4.1.1, object-assign@^4.1.0:
   version "4.1.1"
@@ -7824,7 +7824,7 @@ object-assign@4.1.1, object-assign@^4.1.0:
 object-copy@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  integrity "sha1-fn2Fi3gb18mRpBupde04EnVOmYw= sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="
   dependencies:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
@@ -7838,7 +7838,7 @@ object-hash@^1.3.1:
 object-inspect@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+  integrity "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc= sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
 
 object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.0"
@@ -7848,12 +7848,12 @@ object-keys@^1.0.11, object-keys@^1.0.12:
 object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
+  integrity "sha1-HEfyct8nfzsdrwYWd9nILiMixg4= sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  integrity "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="
   dependencies:
     isobject "^3.0.0"
 
@@ -7870,7 +7870,7 @@ object.assign@4.1.0, object.assign@^4.1.0:
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
+  integrity "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= sha512-NwrpYtu1CSNWdNgcEvLmHOHjhMeglj22YJpg/ezASfIFYqNK4F94iUxKRPnRNbOuOMoQb5JS+6Ebi16xtYZbqQ=="
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
@@ -7878,14 +7878,14 @@ object.getownpropertydescriptors@^2.0.3:
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  integrity "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="
   dependencies:
     isobject "^3.0.1"
 
 object.values@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
+  integrity "sha1-aKmezeNWt+kpWjxeDOMdyMlT3l4= sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
@@ -7895,14 +7895,14 @@ object.values@^1.1.1:
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  integrity "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.1, on-headers@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+  integrity "sha1-dysK5qqlJcOZ5Imt+tkMQD6zwo8= sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
@@ -7914,21 +7914,21 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  integrity "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="
   dependencies:
     mimic-fn "^1.0.0"
 
 onetime@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  integrity "sha1-//DzyRYX/mK7UBiWNumayKbfe+U= sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="
   dependencies:
     mimic-fn "^2.1.0"
 
 optimist@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
+  integrity "sha1-2j6nRob6IaGaERwybpDrFaAZZoY= sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g=="
   dependencies:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
@@ -7936,7 +7936,7 @@ optimist@^0.6.1:
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  integrity "sha1-TyNqY3Pa4FZqbUPhMmZ09QwpFJk= sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="
   dependencies:
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
@@ -7948,7 +7948,7 @@ optionator@^0.9.1:
 ora@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
-  integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
+  integrity "sha1-vwdSSRBZo+8+1MhQl1Md6f280xg= sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="
   dependencies:
     chalk "^2.4.2"
     cli-cursor "^2.1.0"
@@ -7960,7 +7960,7 @@ ora@^3.4.0:
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+  integrity "sha1-/7xJiDNuDoM94MFox+8VISGqf7M= sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="
 
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
@@ -7970,7 +7970,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
 osenv@^0.1.0, osenv@^0.1.3, osenv@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
-  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  integrity "sha1-hc36+uso6Gd/QW4odZK18/SepBA= sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="
   dependencies:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
@@ -7978,27 +7978,27 @@ osenv@^0.1.0, osenv@^0.1.3, osenv@^0.1.5:
 p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+  integrity "sha1-NfNj1n1SCByNlYXje8zrfgu8sqA= sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
 
 p-defer@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-2.1.0.tgz#d9c97b40f8fb5c256a70b4aabec3c1c8c42f1fae"
-  integrity sha512-xMwL9id1bHn/UfNGFEMFwlULOprQUEOg6vhqSfr6oKxPFB0oSh0zhGq/9/tPSE+cyij2+RW6H8+0Ke4xsPdZ7Q==
+  integrity "sha1-2cl7QPj7XCVqcLSqvsPByMQvH64= sha512-xMwL9id1bHn/UfNGFEMFwlULOprQUEOg6vhqSfr6oKxPFB0oSh0zhGq/9/tPSE+cyij2+RW6H8+0Ke4xsPdZ7Q=="
 
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
-  integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+  integrity "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
 
 p-finally@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
-  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+  integrity "sha1-vW/KqcVZoJa2gIBvTWV7Pw8kBWE= sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
 
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+  integrity "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg=="
 
 p-limit@^1.1.0:
   version "1.1.0"
@@ -8029,7 +8029,7 @@ p-locate@^3.0.0:
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
+  integrity "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg= sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="
   dependencies:
     p-finally "^1.0.0"
 
@@ -8041,7 +8041,7 @@ p-try@^2.0.0:
 package-json@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-5.0.0.tgz#a7dbe2725edcc7dc9bcee627672275e323882433"
-  integrity sha512-EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg==
+  integrity "sha1-p9vicl7cx9ybzuYnZyJ14yOIJDM= sha512-EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="
   dependencies:
     got "^8.3.1"
     registry-auth-token "^3.3.2"
@@ -8051,21 +8051,21 @@ package-json@^5.0.0:
 parent-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.0.tgz#df250bdc5391f4a085fb589dad761f5ad6b865b5"
-  integrity sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA==
+  integrity "sha1-3yUL3FOR9KCF+1idrXYfWta4ZbU= sha512-8Mf5juOMmiE4FcmzYc4IaiS9L3+9paz2KOiXzkRviCP6aDmN49Hz6EMWz0lGNp9pX80GvvAuLADtyGfW/Em3TA=="
   dependencies:
     callsites "^3.0.0"
 
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  integrity "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  integrity "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw=="
   dependencies:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
@@ -8073,37 +8073,37 @@ parse-json@^4.0.0:
 parse-ms@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
-  integrity sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0=
+  integrity "sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= sha512-LpH1Cf5EYuVjkBvCDBYvkUPh+iv2bk3FHflxHkpCYT0/FZ1d3N3uJaLiHr4yGuMcFUhv6eAivitTvWZI4B/chg=="
 
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
+  integrity "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="
 
 parse5@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.1.3.tgz#8bab58d06525f00e4e37d755116eb82e7241f142"
-  integrity sha1-i6tY0GUl8A5ON9dVEW64LnJB8UI=
+  integrity "sha1-i6tY0GUl8A5ON9dVEW64LnJB8UI= sha512-Dh9KTpTUsDvI4Ny44C+cmvGOltwG730iupD8e2Fr7mCQv8WxXdb6twa1IKgc7/IkRrtrjTB1p4YtsHbeyhfsYA=="
 
 parseqs@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
+  integrity "sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU= sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
 
 parseuri@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+  integrity "sha1-4Ulugp46wv9H85pN0ESzKCPEolo= sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
 
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
-  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+  integrity "sha1-naGee+6NEt/wUT7Vt2lXeTvC6NQ= sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
 
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
+  integrity "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="
 
 path-exists@^3.0.0:
   version "3.0.0"
@@ -8118,17 +8118,17 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  integrity "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
 
 path-key@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
-  integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
+  integrity "sha1-maENhwqAO91e5vBHDljfzS+aVNM= sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="
 
 path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+  integrity "sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
 
 path-parse@^1.0.6:
   version "1.0.6"
@@ -8155,80 +8155,80 @@ path-root@^0.1.1:
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  integrity "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+  integrity "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ=="
   dependencies:
     pify "^2.0.0"
 
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
-  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  integrity "sha1-zvMdyOCho7sNEFwM2Xzzv0f0428= sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg=="
   dependencies:
     pify "^3.0.0"
 
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
-  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+  integrity "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
 
 pathval@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
+  integrity "sha1-uULm1L3mUwBe9rcTYd74cn0GReA= sha512-qZ181q3ICkag/+lv1X6frDUF84pqCm30qild3LGbD84n0AC75CYwnWsQRDlpz7zDkU5NVcmhHh4LjXK0goLYZA=="
 
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
-  integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=
+  integrity "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="
   dependencies:
     through "~2.3"
 
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+  integrity "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
 
 picomatch@^2.0.4:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+  integrity "sha1-IbrIiLbthgH4Mc54FuM1vHefCko= sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA=="
 
 picomatch@^2.0.5, picomatch@^2.2.1:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+  integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
 
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity "sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
 
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+  integrity "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  integrity "sha1-ITXW36ejWMBprJsXh3YogihFD/o= sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+  integrity "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="
 
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  integrity "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw=="
   dependencies:
     find-up "^2.1.0"
 
@@ -8249,14 +8249,14 @@ pkg-up@^3.1.0:
 plur@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
-  integrity sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=
+  integrity "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo= sha512-WhcHk576xg9y/iv6RWOuroZgsqvCbJN+XGvAypCJwLAYs2iWDp5LUmvaCdV6JR2O0SMBf8l6p7A94AyLCFVMlQ=="
   dependencies:
     irregular-plurals "^1.0.0"
 
 portfinder@^1.0.20:
   version "1.0.20"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
-  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
+  integrity "sha1-vqaGMuVLLhOrewxHdem0G/Jw5Eo= sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw=="
   dependencies:
     async "^1.5.2"
     debug "^2.2.0"
@@ -8265,34 +8265,34 @@ portfinder@^1.0.20:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+  integrity "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
 
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
-  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+  integrity "sha1-3rxkidem5rDnYRiIzsiAM30xY5Y= sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
 
 prepend-http@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+  integrity "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="
 
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+  integrity "sha1-0j1B/hN1ZG3i0BBNNFSjAIgCz3s= sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="
   dependencies:
     fast-diff "^1.1.2"
 
 prettier@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
-  integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==
+  integrity "sha1-MFBwDa4uTItnxMP2Zs24r0BeHOU= sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="
 
 pretty-ms@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881"
-  integrity sha1-6crJx2v27lL+lC3ZxsQhMVOxKIE=
+  integrity "sha1-6crJx2v27lL+lC3ZxsQhMVOxKIE= sha512-FJaxC6hH16dU94eKInsMe372pWwzO+zQsRD+faBmn8TgbEE5gBepVuplIoTN9ZUDaZ9RdRNsfiplEmT6PjR2Ng=="
   dependencies:
     parse-ms "^1.0.0"
     plur "^2.1.2"
@@ -8300,7 +8300,7 @@ pretty-ms@^3.1.0:
 printf@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.1.tgz#e0466788260859ed153006dc6867f09ddf240cf3"
-  integrity sha512-UaE/jO0hNsrvPGQEb4LyNzcrJv9Z00tsreBduOSxMtrebvoUhxiEJ4YCHX8YHf6akwfKsC2Gyv5zv47UXhMiLg==
+  integrity "sha1-4EZniCYIWe0VMAbcaGfwnd8kDPM= sha512-UaE/jO0hNsrvPGQEb4LyNzcrJv9Z00tsreBduOSxMtrebvoUhxiEJ4YCHX8YHf6akwfKsC2Gyv5zv47UXhMiLg=="
 
 private@^0.1.8:
   version "0.1.8"
@@ -8310,19 +8310,19 @@ private@^0.1.8:
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+  integrity "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o= sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 
 process-relative-require@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
-  integrity sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo=
+  integrity "sha1-FZDfz1uPKYO6U+OYRGtoJAtMxoo= sha512-r8G5WJPozMJAiv8sDdVWKgJ4In/zBXqwJdMCGAXQt2Kd3HdbAuJVzWYM4JW150hWoaI9DjhtbjcsCCHIMxm8RA=="
   dependencies:
     node-modules-path "^1.0.0"
 
 progress@^2.0.0, progress@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+  integrity "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg= sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
 
 promise-map-series@^0.2.1, promise-map-series@^0.2.3:
   version "0.2.3"
@@ -8334,7 +8334,7 @@ promise-map-series@^0.2.1, promise-map-series@^0.2.3:
 promise.prototype.finally@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.0.tgz#66f161b1643636e50e7cf201dc1b84a857f3864e"
-  integrity sha512-7p/K2f6dI+dM8yjRQEGrTQs5hTQixUAdOGpMEA3+pVxpX5oHKRSKAXyLw9Q9HUWDTdwtoo39dSHGQtN90HcEwQ==
+  integrity "sha1-ZvFhsWQ2NuUOfPIB3BuEqFfzhk4= sha512-7p/K2f6dI+dM8yjRQEGrTQs5hTQixUAdOGpMEA3+pVxpX5oHKRSKAXyLw9Q9HUWDTdwtoo39dSHGQtN90HcEwQ=="
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.9.0"
@@ -8343,7 +8343,7 @@ promise.prototype.finally@^3.1.0:
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
+  integrity "sha1-NMvWSi2B9LH9IedvnwbIpFKZ7jQ= sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="
   dependencies:
     forwarded "~0.1.2"
     ipaddr.js "1.9.0"
@@ -8351,24 +8351,24 @@ proxy-addr@~2.0.5:
 proxy-from-env@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+  integrity "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A=="
 
 ps-tree@=1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.1.tgz#5f1ba35455b8c25eeb718d04c37de1555d96d3db"
-  integrity sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A==
+  integrity "sha1-XxujVFW4wl7rcY0Ew33hVV2W09s= sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A=="
   dependencies:
     event-stream "=3.3.4"
 
 psl@^1.1.28:
   version "1.1.31"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
-  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
+  integrity "sha1-6aqG0BAbWxBcvpOsa3hM1UcnYYQ= sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
 
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  integrity "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
@@ -8376,17 +8376,17 @@ pump@^3.0.0:
 punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+  integrity "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  integrity "sha1-tYsBCsQMIsVldhbI0sLALHv0eew= sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 
 puppeteer@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz#f445aae0a6732c65bbb90e963dcd6fd8fde0d780"
-  integrity sha512-1QEb4tJXXbNId7WSHlcDkS3B4GklTIebKn8Y9D6B7tAdUjQncb+8QlTjbQsAgGX5dhRG32Qycuk5XKzJgLs0sg==
+  integrity "sha1-9EWq4KZzLGW7uQ6WPc1v2P3g14A= sha512-1QEb4tJXXbNId7WSHlcDkS3B4GklTIebKn8Y9D6B7tAdUjQncb+8QlTjbQsAgGX5dhRG32Qycuk5XKzJgLs0sg=="
   dependencies:
     debug "^4.1.0"
     extract-zip "^2.0.0"
@@ -8402,22 +8402,22 @@ puppeteer@^3.0.4:
 q@~0.9.6:
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz#4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"
-  integrity sha1-TeLmyzspCIyeTLwDv51C+5bOL3U=
+  integrity "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U= sha512-ijt0LhxWClXBtc1RCt8H0WhlZLAdVX26nWbpsJy+Hblmp81d2F/pFsvlrJhJDDruFHM+ECtxP0H0HzGSrARkwg=="
 
 qs@6.7.0, qs@^6.4.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+  integrity "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
 
 qs@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768"
-  integrity sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g=
+  integrity "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g= sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg=="
 
 query-string@^5.0.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
+  integrity "sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s= sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="
   dependencies:
     decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
@@ -8426,12 +8426,12 @@ query-string@^5.0.1:
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+  integrity "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
 
 quibble@^0.5.1:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/quibble/-/quibble-0.5.3.tgz#3dfd53206fc6873f61c96f3bece63b69747b4d0c"
-  integrity sha512-HL+gtKkDOo1HlxDpWaBd2xbkVg3sQeP0mS39kdF1CzkdNcY0bOVxzjGOs35oEjbDTbL8DtgP24UGgrd0cr9x8w==
+  integrity "sha1-Pf1TIG/Ghz9hyW877OY7aXR7TQw= sha512-HL+gtKkDOo1HlxDpWaBd2xbkVg3sQeP0mS39kdF1CzkdNcY0bOVxzjGOs35oEjbDTbL8DtgP24UGgrd0cr9x8w=="
   dependencies:
     lodash "^4.17.2"
     resolve "^1.5.0"
@@ -8439,7 +8439,7 @@ quibble@^0.5.1:
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
+  integrity "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= sha512-tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA=="
 
 quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
   version "0.1.8"
@@ -8453,7 +8453,7 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
 qunit@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.14.0.tgz#6f913903e71ebe24ef4a4dada2b796fb52285051"
-  integrity sha512-CYfenbgdpmhl2Ql2rDrrj0felY4h8k6lYhtWwGBCLL4qQC33YOj0psV8MWo85L1i0SIOmEDRXkFopWnGCLmf7g==
+  integrity "sha1-b5E5A+ceviTvSk2toreW+1IoUFE= sha512-CYfenbgdpmhl2Ql2rDrrj0felY4h8k6lYhtWwGBCLL4qQC33YOj0psV8MWo85L1i0SIOmEDRXkFopWnGCLmf7g=="
   dependencies:
     commander "6.2.0"
     js-reporters "1.2.3"
@@ -8463,12 +8463,12 @@ qunit@^2.14.0:
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
-  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+  integrity "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
 
 raw-body@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+  integrity "sha1-oc5vucm8NWylLoklarWQWeE9AzI= sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="
   dependencies:
     bytes "3.1.0"
     http-errors "1.7.2"
@@ -8478,7 +8478,7 @@ raw-body@2.4.0:
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
-  integrity sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=
+  integrity "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU= sha512-WmJJU2e9Y6M5UzTOkHaM7xJGAPQD8PNzx3bAd2+uhZAim6wDk6dAZxPVYLF67XhbR4hmKGh33Lpmh4XWrCH5Mg=="
   dependencies:
     bytes "1"
     string_decoder "0.10"
@@ -8486,7 +8486,7 @@ raw-body@~1.1.0:
 rc@^1.0.1, rc@^1.1.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  integrity "sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
@@ -8496,7 +8496,7 @@ rc@^1.0.1, rc@^1.1.6:
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+  integrity "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w=="
   dependencies:
     find-up "^2.0.0"
     read-pkg "^2.0.0"
@@ -8504,7 +8504,7 @@ read-pkg-up@^2.0.0:
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
+  integrity "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw=="
   dependencies:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
@@ -8512,7 +8512,7 @@ read-pkg-up@^3.0.0:
 read-pkg@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+  integrity "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA=="
   dependencies:
     load-json-file "^2.0.0"
     normalize-package-data "^2.3.2"
@@ -8521,7 +8521,7 @@ read-pkg@^2.0.0:
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
-  integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
+  integrity "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= sha512-BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA=="
   dependencies:
     load-json-file "^4.0.0"
     normalize-package-data "^2.3.2"
@@ -8530,7 +8530,7 @@ read-pkg@^3.0.0:
 "readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  integrity "sha1-M3u9o63AcGvT4CRCaihtS0sskZg= sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -8539,7 +8539,7 @@ read-pkg@^3.0.0:
 readable-stream@^2.0.0, readable-stream@^2.0.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  integrity "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8= sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -8562,7 +8562,7 @@ readable-stream@~1.0.2:
 readdirp@~3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+  integrity "sha1-wwwzNSsSyW37S4lUIaSf1alZODk= sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="
   dependencies:
     picomatch "^2.0.4"
 
@@ -8579,7 +8579,7 @@ recast@^0.18.1:
 redent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
+  integrity "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= sha512-XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw=="
   dependencies:
     indent-string "^3.0.0"
     strip-indent "^2.0.0"
@@ -8587,7 +8587,7 @@ redent@^2.0.0:
 redeyed@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a"
-  integrity sha1-6WwZO0DAgWsArshCaY5hGF5VSYo=
+  integrity "sha1-6WwZO0DAgWsArshCaY5hGF5VSYo= sha512-8eEWsNCkV2rvwKLS1Cvp5agNjMhwRe2um+y32B2+3LqOzg4C9BBPs6vzAfV16Ivb8B9HPNKIqd8OrdBws8kNlQ=="
   dependencies:
     esprima "~3.0.0"
 
@@ -8606,7 +8606,7 @@ regenerate@^1.4.0:
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+  integrity "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk= sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
 
 regenerator-runtime@^0.13.4:
   version "0.13.5"
@@ -8624,7 +8624,7 @@ regenerator-transform@^0.14.2:
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
+  integrity "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw= sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="
   dependencies:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
@@ -8632,12 +8632,12 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 regexpp@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
-  integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
+  integrity "sha1-3WOYLuMwDme0HBlW+FCqaA2dMw4= sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g=="
 
 regexpp@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+  integrity "sha1-IG0K0KVkjP+9uK5GQ489xRyfeOI= sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
 
 regexpu-core@^4.7.0:
   version "4.7.0"
@@ -8666,7 +8666,7 @@ regexpu-core@^4.7.1:
 registry-auth-token@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==
+  integrity "sha1-hR/UkDjuy1hpERFa+EUmDuyYPyA= sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="
   dependencies:
     rc "^1.1.6"
     safe-buffer "^5.0.1"
@@ -8674,7 +8674,7 @@ registry-auth-token@^3.3.2:
 registry-url@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity sha1-PU74cPc93h138M+aOBQyRE4XSUI=
+  integrity "sha1-PU74cPc93h138M+aOBQyRE4XSUI= sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA=="
   dependencies:
     rc "^1.0.1"
 
@@ -8693,22 +8693,22 @@ regjsparser@^0.6.4:
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
+  integrity "sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
 
 repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
-  integrity sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=
+  integrity "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo= sha512-PJn5P/wQgXwp0Bpmzv9JU693QYky9P5bwntpuw8SsMXgUZHlcEyr9Vajgp/zhGSFX56/lv9Bz2k9mKrkpxLI4A=="
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  integrity "sha1-jcrkcOHIirwtYA//Sndihtp15jc= sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="
 
 request@~2.40.0:
   version "2.40.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.40.0.tgz#4dd670f696f1e6e842e66b4b5e839301ab9beb67"
-  integrity sha1-TdZw9pbx5uhC5mtLXoOTAaub62c=
+  integrity "sha1-TdZw9pbx5uhC5mtLXoOTAaub62c= sha512-waNoGB4Z7bPn+lgqPk7l7hhze4Vd68jKccnwLeS7vr9GMxz0iWQbYTbBNWzfIk87Urx7V44pu29qjF/omej+Fw=="
   dependencies:
     forever-agent "~0.5.0"
     json-stringify-safe "~5.0.0"
@@ -8728,27 +8728,27 @@ request@~2.40.0:
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+  integrity "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs= sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
 
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
-  integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4=
+  integrity "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4= sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg=="
 
 requireindex@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"
-  integrity sha1-5UBLgVV+91225JxacgBIk/4D4WI=
+  integrity "sha1-5UBLgVV+91225JxacgBIk/4D4WI= sha512-LBnkqsDE7BZKvqylbmn7lTIVdpx4K/QCduRATpO5R+wtPmky/a8pN1bO2D6wXppn1497AJF9mNjqAXr6bdl9jg=="
 
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  integrity "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
 
 reselect@^3.0.1:
   version "3.0.1"
@@ -8758,7 +8758,7 @@ reselect@^3.0.1:
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  integrity "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
@@ -8766,7 +8766,7 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+  integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
 resolve-package-path@^1.0.11, resolve-package-path@^1.2.7:
   version "1.2.7"
@@ -8787,7 +8787,7 @@ resolve-package-path@^2.0.0:
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
-  integrity sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc=
+  integrity "sha1-xL2p9e+y/OZSR4c6s2u02DT+Fvc= sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w=="
   dependencies:
     http-errors "~1.6.2"
     path-is-absolute "1.0.1"
@@ -8795,7 +8795,7 @@ resolve-path@^1.4.0:
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+  integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
 resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.17.0"
@@ -8807,14 +8807,14 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  integrity "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="
   dependencies:
     lowercase-keys "^1.0.0"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  integrity "sha1-n37ih/gv0ybU/RYpI9YhKe7g368= sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="
   dependencies:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
@@ -8822,17 +8822,17 @@ restore-cursor@^2.0.0:
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+  integrity "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w= sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
 
 reusify@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+  integrity "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
 
 rimraf@2.6.3, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
+  integrity "sha1-stEE/g2Psnz54KHNqCYt04M8bKs= sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="
   dependencies:
     glob "^7.1.3"
 
@@ -8853,14 +8853,14 @@ rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
 rimraf@~2.5.2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
-  integrity sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ=
+  integrity "sha1-loAAk8vxoMhr2VtGJUZ1NcKd+gQ= sha512-Lw7SHMjssciQb/rRz7JyPIy9+bbUshEucPoLRvWqy09vC5zQixl8Uet+Zl+SROBB/JMWHJRdCk1qdxNWHNMvlQ=="
   dependencies:
     glob "^7.0.5"
 
 rollup-plugin-commonjs@^9.3.4:
   version "9.3.4"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.3.4.tgz#2b3dddbbbded83d45c36ff101cdd29e924fd23bc"
-  integrity sha512-DTZOvRoiVIHHLFBCL4pFxOaJt8pagxsVldEXBOn6wl3/V21wVaj17HFfyzTsQUuou3sZL3lEJZVWKPFblJfI6w==
+  integrity "sha1-Kz3du73tg9RcNv8QHN0p6ST9I7w= sha512-DTZOvRoiVIHHLFBCL4pFxOaJt8pagxsVldEXBOn6wl3/V21wVaj17HFfyzTsQUuou3sZL3lEJZVWKPFblJfI6w=="
   dependencies:
     estree-walker "^0.6.0"
     magic-string "^0.25.2"
@@ -8870,7 +8870,7 @@ rollup-plugin-commonjs@^9.3.4:
 rollup-plugin-node-resolve@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.4.tgz#7d370f8d6fd3031006a0032c38262dd9be3c6250"
-  integrity sha512-t/64I6l7fZ9BxqD3XlX4ZeO6+5RLKyfpwE2CiPNUKa+GocPlQhf/C208ou8y3AwtNsc6bjSk/8/6y/YAyxCIvw==
+  integrity "sha1-fTcPjW/TAxAGoAMsOCYt2b48YlA= sha512-t/64I6l7fZ9BxqD3XlX4ZeO6+5RLKyfpwE2CiPNUKa+GocPlQhf/C208ou8y3AwtNsc6bjSk/8/6y/YAyxCIvw=="
   dependencies:
     "@types/resolve" "0.0.8"
     builtin-modules "^3.1.0"
@@ -8880,7 +8880,7 @@ rollup-plugin-node-resolve@^4.2.4:
 rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
-  integrity sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ==
+  integrity "sha1-IDcG7dQ9+v6uvDVdc1ERlAL8g60= sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="
   dependencies:
     estree-walker "^0.6.0"
     micromatch "^3.1.10"
@@ -8888,7 +8888,7 @@ rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.6.0:
 rollup@^0.57.1:
   version "0.57.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.57.1.tgz#0bb28be6151d253f67cf4a00fea48fb823c74027"
-  integrity sha512-I18GBqP0qJoJC1K1osYjreqA8VAKovxuI3I81RSk0Dmr4TgloI0tAULjZaox8OsJ+n7XRrhH6i0G2By/pj1LCA==
+  integrity "sha1-C7KL5hUdJT9nz0oA/qSPuCPHQCc= sha512-I18GBqP0qJoJC1K1osYjreqA8VAKovxuI3I81RSk0Dmr4TgloI0tAULjZaox8OsJ+n7XRrhH6i0G2By/pj1LCA=="
   dependencies:
     "@types/acorn" "^4.0.3"
     acorn "^5.5.3"
@@ -8905,19 +8905,19 @@ rollup@^0.57.1:
 route-recognizer@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
-  integrity sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g==
+  integrity "sha1-Oasf+84cWebSvcpBbwkyYR5PPKM= sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g=="
 
 router_js@^7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.3.0.tgz#6c061b6b097cfec537fa0d6c5a5c6e317730799f"
-  integrity sha512-A+iVTfG03XNks7oC/KGXq+EKp9kAac9BOYuomq2KouXUM4U57Io20/tuQq1kx+OwHB4gEY0XaRQjuHwljkbRHg==
+  integrity "sha1-bAYbawl8/sU3+g1sWlxuMXcweZ8= sha512-A+iVTfG03XNks7oC/KGXq+EKp9kAac9BOYuomq2KouXUM4U57Io20/tuQq1kx+OwHB4gEY0XaRQjuHwljkbRHg=="
   dependencies:
     "@glimmer/env" "^0.1.7"
 
 rsvp@3.0.14:
   version "3.0.14"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.14.tgz#9d2968cf36d878d3bb9a9a5a4b8e1ff55a76dd31"
-  integrity sha1-nSlozzbYeNO7mppaS44f9Vp23TE=
+  integrity "sha1-nSlozzbYeNO7mppaS44f9Vp23TE= sha512-T7zXcTEXXuYZsscu5yaJtMP7T0axBAIXjX6+mZMtWaem3EM8mTOoAdQ4qAmYStw9QNlonwfwI+I70zB66ME1Eg=="
 
 rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21:
   version "3.6.2"
@@ -8937,26 +8937,26 @@ rsvp@~3.2.1:
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
+  integrity "sha1-A3GrSuC91yDUFm19/aZP96RFpsA= sha512-Fx+QT3fGtS0jk8OvKyKgAB2YHPsrmqBRcMeTC5AZ+lp4vzXKPPrFSY3iLdgvjA3HVBkIvJeM6J80LRjx8bQwhA=="
   dependencies:
     is-promise "^2.1.0"
 
 run-parallel@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+  integrity "sha1-yd06fPn0ssS2JE4XOm7YZuYd1nk= sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
 
 rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
-  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  integrity "sha1-87sP572n+2nerAwW8XtQsLh5BQQ= sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw=="
   dependencies:
     tslib "^1.9.0"
 
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==
+  integrity "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM= sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
@@ -8966,29 +8966,29 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, s
 safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
-  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+  integrity "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
 
 safe-json-parse@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
-  integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
+  integrity "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c= sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A=="
 
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  integrity "sha1-QKNmnzsHfR6UPURinhV91IAjvy4= sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="
   dependencies:
     ret "~0.1.10"
 
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+  integrity "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 
 sane@^4.0.0, sane@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
-  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  integrity "sha1-7Ygf2SJzOmxGG8GJ3CtsAG8//e0= sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="
   dependencies:
     "@cnakazawa/watch" "^1.0.3"
     anymatch "^2.0.0"
@@ -9003,12 +9003,12 @@ sane@^4.0.0, sane@^4.1.0:
 sax@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
-  integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o=
+  integrity "sha1-e45lYZCyKOgaZq6nSEgNgozS03o= sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="
 
 sax@>=0.6.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  integrity "sha1-KBYjTiN4vdxOU1T6tcqold9xANk= sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
 
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.7.0:
   version "5.7.0"
@@ -9035,7 +9035,7 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+  integrity "sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg= sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -9054,7 +9054,7 @@ send@0.17.1:
 serve-static@1.14.1, serve-static@^1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+  integrity "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk= sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -9064,19 +9064,19 @@ serve-static@1.14.1, serve-static@^1.14.1:
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity "sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
 
 set-getter@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376"
-  integrity sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=
+  integrity "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y= sha512-lIj6AWViymAQLQyq1qehP44w4iGbSv6pYOKRQCDzqlmxctLyCrecuge0bxRPrNSnV8EeMHKR2fVTRl3LniQLNg=="
   dependencies:
     to-object-path "^0.3.0"
 
 set-value@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
-  integrity sha1-fbCPnT0i3H945Trzw79GZuzfzPE=
+  integrity "sha1-fbCPnT0i3H945Trzw79GZuzfzPE= sha512-2Z0LRUUvYeF7gIFFep48ksPq0NR09e5oKoFXznaMGNcu+EZAfGnyL0K6xno2gCqX6dZYEZRjrcn04/gvZzcKhQ=="
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -9086,7 +9086,7 @@ set-value@^0.4.3:
 set-value@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
-  integrity sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==
+  integrity "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ= sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg=="
   dependencies:
     extend-shallow "^2.0.1"
     is-extendable "^0.1.1"
@@ -9096,46 +9096,46 @@ set-value@^2.0.0:
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+  integrity "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 
 setprototypeof@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+  integrity "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
 
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  integrity "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  integrity "sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  integrity "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="
 
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+  integrity "sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
 
 shellwords@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
-  integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
+  integrity "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
 
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
+  integrity "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA=="
 
 silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
   version "1.1.1"
@@ -9147,7 +9147,7 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1
 simple-dom@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.4.0.tgz#78ad1f41b8b70d16f82b7e0d458441c9262565b7"
-  integrity sha512-TnBPkmOyjdaOqyBMb4ick+n8c0Xv9Iwg1PykFV7hz9Se3UCiacTbRb+25cPmvozFNJLBUNvUzX/KsPfXF14ivA==
+  integrity "sha1-eK0fQbi3DRb4K34NRYRBySYlZbc= sha512-TnBPkmOyjdaOqyBMb4ick+n8c0Xv9Iwg1PykFV7hz9Se3UCiacTbRb+25cPmvozFNJLBUNvUzX/KsPfXF14ivA=="
   dependencies:
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
@@ -9163,12 +9163,12 @@ simple-html-tokenizer@^0.5.10:
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
-  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+  integrity "sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
 
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  integrity "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY= sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="
   dependencies:
     ansi-styles "^3.2.0"
     astral-regex "^1.0.0"
@@ -9177,7 +9177,7 @@ slice-ansi@^2.1.0:
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  integrity "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs= sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="
   dependencies:
     define-property "^1.0.0"
     isobject "^3.0.0"
@@ -9186,14 +9186,14 @@ snapdragon-node@^2.0.1:
 snapdragon-util@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  integrity "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI= sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.1.tgz#e12b5487faded3e3dea0ac91e9400bf75b401370"
-  integrity sha1-4StUh/re0+PeoKyR6UAL91tAE3A=
+  integrity "sha1-4StUh/re0+PeoKyR6UAL91tAE3A= sha512-fdVXpAHhS009K1+ldH0ZNPLgRK8TNw6KyOMohBhzufiYrVI2v/zIhQ16/W9mdKB7vrAJhYCtvmdSjnZGbG7/Zg=="
   dependencies:
     base "^0.11.1"
     debug "^2.2.0"
@@ -9207,19 +9207,19 @@ snapdragon@^0.8.1:
 sntp@0.2.x:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz#fb885f18b0f3aad189f824862536bceeec750900"
-  integrity sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=
+  integrity "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA= sha512-bDLrKa/ywz65gCl+LmOiIhteP1bhEsAAzhfMedPoiHP3dyYnAevlaJshdqb9Yu0sRifyP/fRqSt8t+5qGIWlGQ=="
   dependencies:
     hoek "0.9.x"
 
 socket.io-adapter@~1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
+  integrity "sha1-qz8Nb2a4/H/KOVmrWZH4IiF4m+k= sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="
 
 socket.io-client@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
-  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
+  integrity "sha1-qvtdWUo8VaNDVVYvyK6iLtkRmjU= sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="
   dependencies:
     backo2 "1.0.2"
     component-bind "1.0.0"
@@ -9236,7 +9236,7 @@ socket.io-client@2.4.0:
 socket.io-parser@~3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
-  integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
+  integrity "sha1-74cgCdCtz3BPL76DAZGhR1KtULY= sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg=="
   dependencies:
     component-emitter "~1.3.0"
     debug "~3.1.0"
@@ -9245,7 +9245,7 @@ socket.io-parser@~3.3.0:
 socket.io-parser@~3.4.0:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
-  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
+  integrity "sha1-sGr4ODApdYN+qy3JgAN9okBU1ko= sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="
   dependencies:
     component-emitter "1.2.1"
     debug "~4.1.0"
@@ -9254,7 +9254,7 @@ socket.io-parser@~3.4.0:
 socket.io@^2.1.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
-  integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w==
+  integrity "sha1-la2GHJpSNp1/Gmis8NShsW2kUdI= sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w=="
   dependencies:
     debug "~4.1.0"
     engine.io "~3.5.0"
@@ -9266,19 +9266,19 @@ socket.io@^2.1.0:
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  integrity "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg=="
   dependencies:
     is-plain-obj "^1.0.0"
 
 sort-object-keys@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.2.tgz#d3a6c48dc2ac97e6bc94367696e03f6d09d37952"
-  integrity sha1-06bEjcKsl+a8lDZ2luA/bQnTeVI=
+  integrity "sha1-06bEjcKsl+a8lDZ2luA/bQnTeVI= sha512-IWz4OstR6UZsK9dEhw/J99r+LYbm6TNSY6yPvldttFJkFj/1vUvzCmw82CeeCS/aHxdm1QUL+5K96Q2ssplnFw=="
 
 sort-package-json@^1.22.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.22.1.tgz#384ce7a098cd13be4109800d5ce2f0cf7826052e"
-  integrity sha512-uVINQraFQvnlzNHFnQOT4MYy0qonIEzKwhrI2yrTiQjNo5QF4h3ffrnCk7a95QAwoK/RdkO/w8W9tJIcaOWC7g==
+  integrity "sha1-OEznoJjNE75BCYANXOLwz3gmBS4= sha512-uVINQraFQvnlzNHFnQOT4MYy0qonIEzKwhrI2yrTiQjNo5QF4h3ffrnCk7a95QAwoK/RdkO/w8W9tJIcaOWC7g=="
   dependencies:
     detect-indent "^5.0.0"
     sort-object-keys "^1.1.2"
@@ -9286,7 +9286,7 @@ sort-package-json@^1.22.1:
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
-  integrity sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==
+  integrity "sha1-etD1k/IoFZjoVN+A8ZquS5LXoRo= sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A=="
   dependencies:
     atob "^2.0.0"
     decode-uri-component "^0.2.0"
@@ -9297,7 +9297,7 @@ source-map-resolve@^0.5.0:
 source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  integrity "sha1-CuBp5/47p1OMZMmFFeNTOerFoEI= sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -9310,7 +9310,7 @@ source-map-url@^0.3.0:
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+  integrity "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= sha512-liJwHPI9x9d9w5WSIjM58MqGmmb7XzNqwdUA3kSBQ4lmDngexlKwawGzK3J1mKXi6+sysoMDlpVyZh9sv5vRfw=="
 
 source-map@0.4.x, source-map@^0.4.2:
   version "0.4.4"
@@ -9339,7 +9339,7 @@ source-map@~0.1.x:
 sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
-  integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg==
+  integrity "sha1-xj6pJ8Ap3WvZorf6A7P+wCrVbp8= sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="
 
 sourcemap-validator@^1.1.0:
   version "1.1.0"
@@ -9354,36 +9354,36 @@ sourcemap-validator@^1.1.0:
 spawn-args@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb"
-  integrity sha1-+30L0dcP1DFr2ePew4nmX51jYbs=
+  integrity "sha1-+30L0dcP1DFr2ePew4nmX51jYbs= sha512-73BoniQDcRWgnLAf/suKH6V5H54gd1KLzwYN9FB6J/evqTV33htH9xwV/4BHek+++jzxpVlZQKKZkqstPQPmQg=="
 
 spdx-correct@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz#4b3073d933ff51f3912f03ac5519498a4150db40"
-  integrity sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=
+  integrity "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A= sha512-A6UuuDdsSvKK2bqmUetv33zJVv0iczyaQZ536YL9+GAvbC4HceGKvXDtptnU9YZ/zGgryaFFsR4YaUCq+N/53g=="
   dependencies:
     spdx-license-ids "^1.0.2"
 
 spdx-expression-parse@~1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz#9bdf2f20e1f40ed447fbe273266191fced51626c"
-  integrity sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=
+  integrity "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw= sha512-xMXXC4eLKaIskvZm89nZi/MstVv1UtGk3nJz9BBKjreMVyoWisWFKfboH+kJS97+wUyBLpO/8ghV9M5VvrwwrA=="
 
 spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
-  integrity sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=
+  integrity "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc= sha512-qIBFhkh6ILCWNeWEe3ODFPKDYhPJrZpqdNCI2Z+w9lNdH5hoVEkfRLLbRfoIi8fb4xRYmpEOaaMH4G2pwYp/iQ=="
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  integrity "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I= sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="
   dependencies:
     extend-shallow "^3.0.0"
 
 split@0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
-  integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=
+  integrity "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA=="
   dependencies:
     through "2"
 
@@ -9395,12 +9395,12 @@ sprintf-js@^1.0.3:
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
 
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  integrity "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g=="
   dependencies:
     define-property "^0.2.5"
     object-copy "^0.1.0"
@@ -9408,34 +9408,34 @@ static-extend@^0.1.1:
 "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+  integrity "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="
 
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
+  integrity "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4= sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg=="
 
 stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=
+  integrity "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw=="
   dependencies:
     duplexer "~0.1.1"
 
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
+  integrity "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
 
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
-  integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
+  integrity "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw=="
 
 string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+  integrity "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
@@ -9444,7 +9444,7 @@ string-width@^1.0.1:
 "string-width@^1.0.2 || 2", string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+  integrity "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4= sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="
   dependencies:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
@@ -9452,7 +9452,7 @@ string-width@^1.0.1:
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  integrity "sha1-InZ74htirxCBV0MG9prFG2IgOWE= sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
@@ -9461,7 +9461,7 @@ string-width@^3.0.0, string-width@^3.1.0:
 string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
+  integrity "sha1-hYEqa4R6wAInD1gIFGBkyZX7aRM= sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -9469,7 +9469,7 @@ string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
 string.prototype.trimleft@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==
+  integrity "sha1-RAiqLl1t3QyagHObCH+8BnwDs8w= sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -9478,7 +9478,7 @@ string.prototype.trimleft@^2.1.1:
 string.prototype.trimright@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==
+  integrity "sha1-x28c7zDyG7rYr+uNsVEUls+w8qM= sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -9487,7 +9487,7 @@ string.prototype.trimright@^2.1.1:
 string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
+  integrity "sha1-FK9tnzSwU/fPyJty+PLuFLkDmlQ= sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="
   dependencies:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
@@ -9500,21 +9500,21 @@ string_decoder@0.10, string_decoder@~0.10.x:
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  integrity "sha1-QvEUWUpGzxqOMLCoT1bHjD7awh4= sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
   dependencies:
     safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  integrity "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g= sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="
   dependencies:
     safe-buffer "~5.1.0"
 
 stringify-object-es5@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/stringify-object-es5/-/stringify-object-es5-2.5.0.tgz#057c3c9a90a127339bb9d1704a290bb7bd0a1ec5"
-  integrity sha1-BXw8mpChJzObudFwSikLt70KHsU=
+  integrity "sha1-BXw8mpChJzObudFwSikLt70KHsU= sha512-vE7Xdx9ylG4JI16zy7/ObKUB+MtxuMcWlj/WHHr3+yAlQoN6sst2stU9E+2Qs3OrlJw/Pf3loWxL1GauEHf6MA=="
   dependencies:
     is-plain-obj "^1.0.0"
     is-regexp "^1.0.0"
@@ -9522,101 +9522,101 @@ stringify-object-es5@^2.5.0:
 stringstream@~0.0.4:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
-  integrity sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==
+  integrity "sha1-eIAiWw1K0Q4wkn0Weh1vL9OzOnI= sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA=="
 
 strip-ansi@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-2.0.1.tgz#df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"
-  integrity sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4=
+  integrity "sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4= sha512-2h8q2CP3EeOhDJ+jd932PRMpa3/pOJFGoF22J1U/DNbEK2gSW2DqeF46VjCXsSQXhC+k/l8/gaaRBQKL6hUPfQ=="
   dependencies:
     ansi-regex "^1.0.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  integrity "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  integrity "sha1-qEeQIusaw2iocTibY1JixQXuNo8= sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+  integrity "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4= sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
   dependencies:
     ansi-regex "^4.1.0"
 
 strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  integrity "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI= sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="
   dependencies:
     ansi-regex "^5.0.0"
 
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  integrity "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="
 
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
+  integrity "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+  integrity "sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
 
 strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
+  integrity "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="
 
 strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  integrity "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
-  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+  integrity "sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY= sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
 
 styled_string@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
-  integrity sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko=
+  integrity "sha1-0ieCvYEpVFm8Tx3xjEutjpTdEko= sha512-DU2KZiB6VbPkO2tGSqQ9n96ZstUPjW7X4sGO6V2m1myIQluX0p1Ol8BrA/l6/EesqhMqXOIXs3cJNOy1UuU2BA=="
 
 sum-up@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
-  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+  integrity "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4= sha512-zw5P8gnhiqokJUWRdR6F4kIIIke0+ubQSGyYUY506GCbJWtV7F6Xuy0j6S125eSX2oF+a8KdivsZ8PlVEH0Mcw=="
   dependencies:
     chalk "^1.0.0"
 
 supports-color@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
+  integrity "sha1-ds/nQs8fQbubHCmtAwaMBbTA5Ao= sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="
   dependencies:
     has-flag "^3.0.0"
 
 supports-color@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-1.3.1.tgz#15758df09d8ff3b4acc307539fabe27095e1042d"
-  integrity sha1-FXWN8J2P87SswwdTn6vicJXhBC0=
+  integrity "sha1-FXWN8J2P87SswwdTn6vicJXhBC0= sha512-OHbMkscHFRcNWEcW80fYhCrzAjheSIBwJChpFaBqA6zEz53nxumqi6ukciRb/UA0/v2nDNMk28ce/uBbYRDsng=="
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  integrity "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="
 
 supports-color@^5.3.0:
   version "5.4.0"
@@ -9651,7 +9651,7 @@ sync-disk-cache@^1.3.3:
 table@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"
-  integrity sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ==
+  integrity "sha1-zeDMbrBnUcAJ76sn6Mggyltnt/I= sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ=="
   dependencies:
     ajv "^6.9.1"
     lodash "^4.17.11"
@@ -9661,7 +9661,7 @@ table@^5.2.3:
 tap-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
-  integrity sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA==
+  integrity "sha1-VNs1MC/aLCzMIZVK074issukJyE= sha512-05G8/LrzqOOFvZhhAk32wsGiPZ1lfUrl+iV7+OkKgfofZxiceZWMHkKmow71YsyVQ8IvGBP2EjcIjE5gL4l5lA=="
   dependencies:
     events-to-array "^1.0.1"
     js-yaml "^3.2.7"
@@ -9670,7 +9670,7 @@ tap-parser@^7.0.0:
 tar-fs@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz#e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"
-  integrity sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==
+  integrity "sha1-5ECGwcYNMaTwz4k7HE4VXav66eI= sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA=="
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
@@ -9680,7 +9680,7 @@ tar-fs@^2.0.0:
 tar-stream@^2.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325"
-  integrity sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==
+  integrity "sha1-bV7xp+V4OpX/cLabl0VaWWjcEyU= sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q=="
   dependencies:
     bl "^4.0.1"
     end-of-stream "^1.4.1"
@@ -9691,21 +9691,21 @@ tar-stream@^2.0.0:
 temp-fs@^0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/temp-fs/-/temp-fs-0.9.9.tgz#8071730437870720e9431532fe2814364f8803d7"
-  integrity sha1-gHFzBDeHByDpQxUy/igUNk+IA9c=
+  integrity "sha1-gHFzBDeHByDpQxUy/igUNk+IA9c= sha512-WfecDCR1xC9b0nsrzSaxPf3ZuWeWLUWblW4vlDQAa1biQaKHiImHnJfeQocQe/hXKMcolRzgkcVX/7kK4zoWbw=="
   dependencies:
     rimraf "~2.5.2"
 
 temp@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
-  integrity sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ==
+  integrity "sha1-YTkXlaEb2XONTE1/VfASy49V7ao= sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="
   dependencies:
     rimraf "~2.6.2"
 
 terser@^4.3.9:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.2.tgz#cb1cf055e7f70caa5863f00ba3e67dc3c97b5150"
-  integrity sha512-6FUjJdY2i3WZAtYBtnV06OOcOfzl+4hSKYE9wgac8rkLRBToPDDrBB2AcHwQD/OKDxbnvhVy2YgOPWO2SsKWqg==
+  integrity "sha1-yxzwVef3DKpYY/ALo+Z9w8l7UVA= sha512-6FUjJdY2i3WZAtYBtnV06OOcOfzl+4hSKYE9wgac8rkLRBToPDDrBB2AcHwQD/OKDxbnvhVy2YgOPWO2SsKWqg=="
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -9714,7 +9714,7 @@ terser@^4.3.9:
 testdouble@^3.2.6:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/testdouble/-/testdouble-3.3.1.tgz#efa90ed6a3cca22252aebb4354e42027b218d53d"
-  integrity sha512-CzW7QFp1K3aFly3cIYBMwX7j+Eue8NkYSqElJSjBqZzYuTzaKKhphVChBcGlKjJXzoGx4Vxz8U2HeNqPTGw/7A==
+  integrity "sha1-76kO1qPMoiJSrrtDVOQgJ7IY1T0= sha512-CzW7QFp1K3aFly3cIYBMwX7j+Eue8NkYSqElJSjBqZzYuTzaKKhphVChBcGlKjJXzoGx4Vxz8U2HeNqPTGw/7A=="
   dependencies:
     es6-map "^0.1.5"
     lodash "^4.17.4"
@@ -9724,14 +9724,14 @@ testdouble@^3.2.6:
 testem-failure-only-reporter@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/testem-failure-only-reporter/-/testem-failure-only-reporter-0.0.1.tgz#d096a22b3c78b4d4bdc74d4f8727d75ef8c57b7a"
-  integrity sha512-a3bquFhuguXcI244mAzt8ByCIEoAOsI7NVihNafi8PTYDVCnpgxm73JluduR9GITXopdOeyLAJnlI3pavY7x3w==
+  integrity "sha1-0JaiKzx4tNS9x01PhyfXXvjFe3o= sha512-a3bquFhuguXcI244mAzt8ByCIEoAOsI7NVihNafi8PTYDVCnpgxm73JluduR9GITXopdOeyLAJnlI3pavY7x3w=="
   dependencies:
     testem "^2.9.2"
 
 testem@^2.14.0, testem@^2.9.2:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
-  integrity sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ==
+  integrity "sha1-HLSiqQUkoIiAPf5S+/GXpv1zyIM= sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ=="
   dependencies:
     backbone "^1.1.2"
     bluebird "^3.4.6"
@@ -9766,7 +9766,7 @@ testem@^2.14.0, testem@^2.9.2:
 testem@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-3.1.0.tgz#d27ec0b5593706c5cb005d8829b5abd329c86c16"
-  integrity sha512-wmPMqwocl9sU7kk32+fRpYFQVwL2XO6PszYF3IPIi6exw3zXb879Ulw4NQrkybdNtTS8yj9yv2lEuvYgpulbaw==
+  integrity "sha1-0n7AtVk3BsXLAF2IKbWr0ynIbBY= sha512-wmPMqwocl9sU7kk32+fRpYFQVwL2XO6PszYF3IPIi6exw3zXb879Ulw4NQrkybdNtTS8yj9yv2lEuvYgpulbaw=="
   dependencies:
     backbone "^1.1.2"
     bluebird "^3.4.6"
@@ -9801,7 +9801,7 @@ testem@^3.1.0:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  integrity "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
 
 "textextensions@1 || 2":
   version "2.1.0"
@@ -9811,29 +9811,29 @@ text-table@^0.2.0:
 through2@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
-  integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+  integrity "sha1-OSducTwzAu3544jdnIEt07glvVo= sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="
   dependencies:
     readable-stream "2 || 3"
 
 through@2, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  integrity "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
 
 time-zone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
-  integrity sha1-mcW/VZWJZq9tBtg73zgA3IL67F0=
+  integrity "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0= sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA=="
 
 timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
+  integrity "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="
 
 tiny-glob@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.8.tgz#b2792c396cc62db891ffa161fe8b33e76123e531"
-  integrity sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w==
+  integrity "sha1-snksOWzGLbiR/6Fh/osz52Ej5TE= sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w=="
   dependencies:
     globalyzer "0.1.0"
     globrex "^0.1.2"
@@ -9841,7 +9841,7 @@ tiny-glob@0.2.8:
 tiny-lr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
-  integrity sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==
+  integrity "sha1-n6VHQS8jj+2waO4pWvi2gsmLKqs= sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA=="
   dependencies:
     body "^5.1.0"
     debug "^3.1.0"
@@ -9853,7 +9853,7 @@ tiny-lr@^1.1.1:
 tmp-sync@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/tmp-sync/-/tmp-sync-1.1.2.tgz#ba04d94a8ed9c0f35a54739970792f997a6cc1c8"
-  integrity sha1-ugTZSo7ZwPNaVHOZcHkvmXpswcg=
+  integrity "sha1-ugTZSo7ZwPNaVHOZcHkvmXpswcg= sha512-npRDYJiMaPWhcLf6q06v/vA3o/ZG4hfHDiBuj1N3Yeh3GTkFQb1YLFs6inDGMWIHjGidl4Oc1+oXHNKKj5vkDQ=="
   dependencies:
     fs-sync "^1.0.4"
     osenv "^0.1.0"
@@ -9875,17 +9875,17 @@ tmp@0.0.33, tmp@^0.0.33:
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+  integrity "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= sha512-9tP427gQBl7Mx3vzr3mquZ+Rq+1sAqIJb5dPSYEjWMYsqitxARsFCHkZS3sDptHAmrUPCZfzXNZqSuBIHdpV5A=="
 
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
+  integrity "sha1-F+bBH3PdTz10zaek/zI46a2b+JA= sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="
 
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
+  integrity "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc= sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og=="
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
@@ -9895,14 +9895,14 @@ to-fast-properties@^2.0.0:
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
+  integrity "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  integrity "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg=="
   dependencies:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
@@ -9910,14 +9910,14 @@ to-regex-range@^2.1.0:
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  integrity "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ= sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="
   dependencies:
     is-number "^7.0.0"
 
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  integrity "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4= sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="
   dependencies:
     define-property "^2.0.2"
     extend-shallow "^3.0.2"
@@ -9927,12 +9927,12 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 toidentifier@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+  integrity "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
 
 tough-cookie@>=0.12.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  integrity "sha1-nfT1fnOcJpMKAYGEiH9K233Kc7I= sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="
   dependencies:
     ip-regex "^2.1.0"
     psl "^1.1.28"
@@ -9952,12 +9952,12 @@ tree-sync@^1.2.2, tree-sync@^1.4.0:
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
+  integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
 
 tsconfig-paths@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+  integrity "sha1-CYVHpsREiAfo/Ljq4IEGTumjyQs= sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"
@@ -9967,12 +9967,12 @@ tsconfig-paths@^3.9.0:
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
-  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+  integrity "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY= sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 
 tslint@^5.20.1:
   version "5.20.1"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
-  integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
+  integrity "sha1-5AHortoBUrxE3QfmFANPP4DGe30= sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -9991,53 +9991,53 @@ tslint@^5.20.1:
 tsutils@^2.29.0:
   version "2.29.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+  integrity "sha1-MrSIUBRnrL7dS4VJhnOggSrKC5k= sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="
   dependencies:
     tslib "^1.8.1"
 
 tsutils@^3.17.1:
   version "3.17.1"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
-  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
+  integrity "sha1-7XGZF/EcoN7lhicrKsSeAVot11k= sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="
   dependencies:
     tslib "^1.8.1"
 
 tunnel-agent@~0.4.0:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
+  integrity "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us= sha512-e0IoVDWx8SDHc/hwFTqJDQ7CCDTEeGhmcT9jkWJjoGQSpgBz20nAMr80E3Tpk7PatJ1b37DQDgJR3CNSzcMOZQ=="
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
-  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  integrity "sha1-B7ggO/pwVsBlcFDjzNLDdzC6uPE= sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="
   dependencies:
     prelude-ls "^1.2.1"
 
 type-detect@0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
-  integrity sha1-C6XsKohWQORw6k6FBZcZANrFiCI=
+  integrity "sha1-C6XsKohWQORw6k6FBZcZANrFiCI= sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA=="
 
 type-detect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-1.0.0.tgz#762217cc06db258ec48908a1298e8b95121e8ea2"
-  integrity sha1-diIXzAbbJY7EiQihKY6LlRIejqI=
+  integrity "sha1-diIXzAbbJY7EiQihKY6LlRIejqI= sha512-f9Uv6ezcpvCQjJU0Zqbg+65qdcszv3qUQsZfjdRbWiZ7AMenrX1u0lNk9EoWWX6e1F+NULyg27mtdeZ5WhpljA=="
 
 type-detect@^4.0.0:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
-  integrity sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ==
+  integrity "sha1-1w5byB223io4G8rKDG4MvcdjXeI= sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ=="
 
 type-fest@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+  integrity "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0= sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
 
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  integrity "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE= sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="
   dependencies:
     media-typer "0.3.0"
     mime-types "~2.1.24"
@@ -10045,24 +10045,24 @@ type-is@~1.6.17, type-is@~1.6.18:
 typescript@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
-  integrity sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==
+  integrity "sha1-FTu9Ro7wdyXB35x36LRT+NNqu6U= sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
+  integrity "sha1-nEEagCpAmpH8bPdAgbq6NLJEmaw= sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
 
 uglify-js@^3.1.4:
   version "3.9.3"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.3.tgz#4a285d1658b8a2ebaef9e51366b3a0f7acd79ec2"
-  integrity sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA==
+  integrity "sha1-SihdFli4ouuu+eUTZrOg96zXnsI= sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA=="
   dependencies:
     commander "~2.20.3"
 
 unbzip2-stream@^1.3.3:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
-  integrity sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==
+  integrity "sha1-hOueeDsYbY+zl1Ffu2VvMS8afb8= sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg=="
   dependencies:
     buffer "^5.2.1"
     through "^2.3.8"
@@ -10078,7 +10078,7 @@ underscore.string@^3.2.2, underscore.string@~3.3.4:
 underscore@>=1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
+  integrity "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg=="
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
@@ -10106,7 +10106,7 @@ unicode-property-aliases-ecmascript@^1.0.4:
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
-  integrity sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=
+  integrity "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ= sha512-gKXL/GYJJ6/EUcUoTJ0wvupGylrP1Q0QhkgTMixasTn8J5mEZY3fbcj25gOL3opWToztz7/BUHGm78npw7J57Q=="
   dependencies:
     arr-union "^3.1.0"
     get-value "^2.0.6"
@@ -10116,7 +10116,7 @@ union-value@^1.0.0:
 unique-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
+  integrity "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg=="
   dependencies:
     crypto-random-string "^1.0.0"
 
@@ -10128,17 +10128,17 @@ universalify@^0.1.0:
 universalify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
-  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+  integrity "sha1-thodoXPoQ1sv48Z9Kbmt+FlL0W0= sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  integrity "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="
 
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  integrity "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
@@ -10146,38 +10146,38 @@ unset-value@^1.0.0:
 untildify@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-2.1.0.tgz#17eb2807987f76952e9c0485fc311d06a826a2e0"
-  integrity sha1-F+soB5h/dpUunASF/DEdBqgmouA=
+  integrity "sha1-F+soB5h/dpUunASF/DEdBqgmouA= sha512-sJjbDp2GodvkB0FZZcn7k6afVisqX5BZD7Yq3xp4nN2O15BBK0cLm3Vwn2vQaF7UDS0UUsrQMkkplmDI5fskig=="
   dependencies:
     os-homedir "^1.0.0"
 
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  integrity "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA= sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+  integrity "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="
 
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  integrity "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="
   dependencies:
     prepend-http "^2.0.0"
 
 url-to-options@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+  integrity "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="
 
 url@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
-  integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=
+  integrity "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ=="
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
@@ -10185,7 +10185,7 @@ url@0.10.3:
 use@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/use/-/use-2.0.2.tgz#ae28a0d72f93bf22422a18a2e379993112dec8e8"
-  integrity sha1-riig1y+TvyJCKhii43mZMRLeyOg=
+  integrity "sha1-riig1y+TvyJCKhii43mZMRLeyOg= sha512-RrhWfFWkNCz3djfSFZh7uSwu491QRhwNaHyAgB2sGl4kmmznb5ZUuuHpiWLVEsXOdpDakYK/x5+9o4lgg41UMw=="
   dependencies:
     define-property "^0.2.5"
     isobject "^3.0.0"
@@ -10209,27 +10209,27 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+  integrity "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
 
 uuid@3.3.2, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+  integrity "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE= sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
 
 uuid@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
+  integrity "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg=="
 
 v8-compile-cache@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
+  integrity "sha1-4U3jezGm0ZT1aQ1n78Tn9vxqsw4= sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
-  integrity sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=
+  integrity "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w= sha512-VD0zBfAttoSxzPa+I+rF6ckOEEPSbifYNTSgRW5BsyfaD7gSE/uge00r2Xqa0d/yhF1MyHnMPHqLUdQRNimR2A=="
   dependencies:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
@@ -10237,19 +10237,19 @@ validate-npm-package-license@^3.0.1:
 validate-npm-package-name@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+  integrity "sha1-X6kS2B630MdK/BQN5zF/DKffQ34= sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw=="
   dependencies:
     builtins "^1.0.3"
 
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+  integrity "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
 
 vow-fs@0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/vow-fs/-/vow-fs-0.3.6.tgz#2d4c59be22e2bf2618ddf597ab4baa923be7200d"
-  integrity sha1-LUxZviLivyYY3fWXq0uqkjvnIA0=
+  integrity "sha1-LUxZviLivyYY3fWXq0uqkjvnIA0= sha512-oK9rtqJSHy7ZQAhAtVU0HiF/oVhm0A4Qx2l2DyyFBUsXbTXUg258EsQGLLIXYZnE5MYaInZLgA6l/10je/EamA=="
   dependencies:
     glob "^7.0.5"
     uuid "^2.0.2"
@@ -10259,24 +10259,24 @@ vow-fs@0.3.6:
 vow-queue@^0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/vow-queue/-/vow-queue-0.4.3.tgz#4ba8f64b56e9212c0dbe57f1405aeebd54cce78d"
-  integrity sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw==
+  integrity "sha1-S6j2S1bpISwNvlfxQFruvVTM540= sha512-/poAKDTFL3zYbeQg7cl4BGcfP4sGgXKrHnRFSKj97dteUFu8oyXMwIcdwu8NSx/RmPGIuYx1Bik/y5vU4H/VKw=="
   dependencies:
     vow "^0.4.17"
 
 vow@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.13.tgz#e7c14f1bd9c8be0e7359a4597fe2d1ef6d1a7e88"
-  integrity sha1-58FPG9nIvg5zWaRZf+LR720afog=
+  integrity "sha1-58FPG9nIvg5zWaRZf+LR720afog= sha512-Gs7ajGdpeaQiJJC44xeeKDQXfstKWdMnlfebyqo2FD0PDyfYqPxr37JoU1xQSTLwrESD8P/Zb2LOQBr927t21A=="
 
 vow@^0.4.17, vow@^0.4.7:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/vow/-/vow-0.4.18.tgz#18a77994ce30790ccd22d57a3a25cf5e131d8d1b"
-  integrity sha512-7QGozxlOhour77BCQbbyW5XFP8ioIz/DPK67IyO3DnJtF0WXrXueMwqrYFM9yqyfgENcyxL+vktz2oJeZfdWtw==
+  integrity "sha1-GKd5lM4weQzNItV6OiXPXhMdjRs= sha512-7QGozxlOhour77BCQbbyW5XFP8ioIz/DPK67IyO3DnJtF0WXrXueMwqrYFM9yqyfgENcyxL+vktz2oJeZfdWtw=="
 
 walk-sync@^0.2.0:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969"
-  integrity sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk=
+  integrity "sha1-tJvk7mhnZXrrc2l4tWop0Q+jmWk= sha512-OH8GdRMowEFr0XSHQeX5fGweO6zSVHo7bG/0yJQx6LAj9Oukz0C8heI3/FYectT66gY0IPGe89kOvU410/UNpg=="
   dependencies:
     ensure-posix-path "^1.0.0"
     matcher-collection "^1.0.0"
@@ -10310,7 +10310,7 @@ walk-sync@^2.0.2:
 walk-sync@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
-  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
+  integrity "sha1-gHhrBlf8yMDhwLGgQqCerilmOHo= sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg=="
   dependencies:
     "@types/minimatch" "^3.0.3"
     ensure-posix-path "^1.1.0"
@@ -10320,14 +10320,14 @@ walk-sync@^2.1.0:
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
-  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  integrity "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= sha512-cF4je9Fgt6sj1PKfuFt9jpQPeHosM+Ryma/hfY9U7uXGKM7pJCsF0v2r55o+Il54+i77SyYWetB4tD1dEygRkw=="
   dependencies:
     makeerror "1.0.x"
 
 watch-detector@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-0.1.0.tgz#e37b410d149e2a8bf263a4f8b71e2f667633dbf8"
-  integrity sha512-vfzMMfpjQc88xjETwl2HuE6PjEuxCBeyC4bQmqrHrofdfYWi/4mEJklYbNgSzpqM9PxubsiPIrE5SZ1FDyiQ2w==
+  integrity "sha1-43tBDRSeKovyY6T4tx4vZnYz2/g= sha512-vfzMMfpjQc88xjETwl2HuE6PjEuxCBeyC4bQmqrHrofdfYWi/4mEJklYbNgSzpqM9PxubsiPIrE5SZ1FDyiQ2w=="
   dependencies:
     heimdalljs-logger "^0.1.9"
     quick-temp "^0.1.8"
@@ -10338,14 +10338,14 @@ watch-detector@^0.1.0:
 wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  integrity "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="
   dependencies:
     defaults "^1.0.3"
 
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
-  integrity sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=
+  integrity "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs= sha512-0alHnh9Shp5baNrZpTDA0Y20qqB46BHNCNIlQazhaTjMY7gAHZXOIg1yzVI7GoNhw8PFPt9N5Iwu4XhoiMn9QQ=="
   dependencies:
     http-parser-js ">=0.4.0"
     websocket-extensions ">=0.1.1"
@@ -10353,48 +10353,48 @@ websocket-driver@>=0.5.1:
 websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  integrity "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk= sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
 
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+  integrity "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
 
 which@1.3.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  integrity "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="
   dependencies:
     isexe "^2.0.0"
 
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  integrity "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
   dependencies:
     isexe "^2.0.0"
 
 wide-align@1.1.3, wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  integrity "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc= sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="
   dependencies:
     string-width "^1.0.2 || 2"
 
 word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  integrity "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w= sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
 
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+  integrity "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="
 
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+  integrity "sha1-o9XabNXAvAAI03I0u68b7WMFkQc= sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="
 
 workerpool@^3.1.1:
   version "3.1.2"
@@ -10408,12 +10408,12 @@ workerpool@^3.1.1:
 workerpool@^5.0.1:
   version "5.0.4"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
-  integrity sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ==
+  integrity "sha1-T2fLcP91UKJ6uU3iWwuEPNkgWaI= sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ=="
 
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  integrity "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk= sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="
   dependencies:
     ansi-styles "^3.2.0"
     string-width "^3.0.0"
@@ -10427,7 +10427,7 @@ wrappy@1:
 write-file-atomic@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==
+  integrity "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas= sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA=="
   dependencies:
     graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
@@ -10436,29 +10436,29 @@ write-file-atomic@^2.0.0:
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  integrity "sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM= sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="
   dependencies:
     mkdirp "^0.5.1"
 
 ws@^7.2.3:
   version "7.2.5"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
-  integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==
+  integrity "sha1-q7E3DUYmpanNedjeQEqhizRl0Q0= sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="
 
 ws@~7.4.2:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
-  integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
+  integrity "sha1-eCEABI5U6zb+mEM2OrHGhnKyYd0= sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
 
 xdg-basedir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=
+  integrity "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ=="
 
 xml2js@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  integrity "sha1-aGwg8hMgnpSr8NG88e+qKRx4J6c= sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
@@ -10466,32 +10466,32 @@ xml2js@0.4.19:
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+  integrity "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="
 
 xmldom@^0.1.19:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity sha1-1QH5ezvbQDr4757MIFcxh6rawOk=
+  integrity "sha1-1QH5ezvbQDr4757MIFcxh6rawOk= sha512-7WpJBYwyhvsddFJA51SOIU0Be9W44sbGGjc6Z3ly8Wx/Wl7nriMPZ5xf6Np9ASlJ6gACfXcTLukm4DtX372lFw=="
 
 xmlhttprequest-ssl@~1.5.4:
   version "1.5.5"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
+  integrity "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= sha512-/bFPLUgJrfGUL10AIv4Y7/CUt6so9CLtB/oFxQSHseSDNNCdC6vwwKEqwLN6wNPBg9YWXAiMu8jkf6RPRS/75Q=="
 
 xtend@^4.0.0, xtend@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-  integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
+  integrity "sha1-pcbVMr5lbiPbgg77lDofBJmNY68= sha512-iTwvhNBRetXWe81+VcIw5YeadVSWyze7uA7nVnpP13ulrpnJ3UfQm5ApGnrkmxDJFdrblRdZs0EvaTCIfei5oQ=="
 
 y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
+  integrity "sha1-le+U+F7MgdAHwmThkKEg8KPIVms= sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
 
 yallist@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
-  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
+  integrity "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek= sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 
 yallist@^4.0.0:
   version "4.0.0"
@@ -10501,7 +10501,7 @@ yallist@^4.0.0:
 yam@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
-  integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
+  integrity "sha1-f2yR3A9d51oDHm2ms5B8PSWrDeU= sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg=="
   dependencies:
     fs-extra "^4.0.2"
     lodash.merge "^4.6.0"
@@ -10509,7 +10509,7 @@ yam@^1.0.0:
 yargs-parser@13.1.2, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
+  integrity "sha1-Ew8JcC667vJlDVTObj5XBvek+zg= sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -10517,14 +10517,14 @@ yargs-parser@13.1.2, yargs-parser@^13.1.2:
 yargs-parser@^10.0.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+  integrity "sha1-cgImW4n36eny5XZeD+c1qQXtuqg= sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="
   dependencies:
     camelcase "^4.1.0"
 
 yargs-parser@^15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
-  integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ==
+  integrity "sha1-zdepdJDsg2GV9Z8/Tb5eqej3Xwg= sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ=="
   dependencies:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
@@ -10532,7 +10532,7 @@ yargs-parser@^15.0.0:
 yargs-unparser@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
+  integrity "sha1-7yXCx2n/a9CeSw+dfGBfsnhG6p8= sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="
   dependencies:
     flat "^4.1.0"
     lodash "^4.17.15"
@@ -10541,7 +10541,7 @@ yargs-unparser@1.6.0:
 yargs@13.3.2, yargs@^13.3.0:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  integrity "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0= sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="
   dependencies:
     cliui "^5.0.0"
     find-up "^3.0.0"
@@ -10557,7 +10557,7 @@ yargs@13.3.2, yargs@^13.3.0:
 yargs@^14.2.0:
   version "14.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"
-  integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg==
+  integrity "sha1-8RapJCxO2GaHkLQHWbSQbCdudsM= sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg=="
   dependencies:
     cliui "^5.0.0"
     decamelize "^1.2.0"
@@ -10574,7 +10574,7 @@ yargs@^14.2.0:
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  integrity "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
@@ -10582,19 +10582,19 @@ yauzl@^2.10.0:
 yeast@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
+  integrity "sha1-AI4G2AlDIMNy28L47XagymyKxBk= sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
 
 yui@^3.18.1:
   version "3.18.1"
   resolved "https://registry.yarnpkg.com/yui/-/yui-3.18.1.tgz#e000269ec0a7b6fbc741cbb8fcbd0e65117b014c"
-  integrity sha1-4AAmnsCntvvHQcu4/L0OZRF7AUw=
+  integrity "sha1-4AAmnsCntvvHQcu4/L0OZRF7AUw= sha512-M4/mHnq5uGvpwKEpRBh3SclL70cpDEus9LNGnrK5ZBzp4HOoueY7EkXfgtRBd+9VOQHWlFukXL2udHE53N4Wqw=="
   dependencies:
     request "~2.40.0"
 
 yuidocjs@^0.10.0:
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/yuidocjs/-/yuidocjs-0.10.2.tgz#33924967ce619024cd70ef694e267d2f988f73f6"
-  integrity sha1-M5JJZ85hkCTNcO9pTiZ9L5iPc/Y=
+  integrity "sha1-M5JJZ85hkCTNcO9pTiZ9L5iPc/Y= sha512-g0ZrXsaCmQL9zsvkgD+RxWDsMNkHne5tK72iWYodro9JQlfKxePcV1dwbGhKMy/fl1XCIW3R3erZudohU+PcEw=="
   dependencies:
     express "^4.13.1"
     graceful-fs "^4.1.2"

From 383d4349a67ced3bfb9a1edf2b413cb5249187bd Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 24 Mar 2021 17:15:50 +0000
Subject: [PATCH 0451/1405] [Security] Bump websocket-extensions from 0.1.3 to
 0.1.4

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.**
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4becb232b82..e7f68505651 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10351,9 +10351,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk= sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 which-module@^2.0.0:
   version "2.0.0"

From d3a764c35b5363c180519cf3cf0e04e1cf44f75e Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 24 Mar 2021 19:37:03 -0400
Subject: [PATCH 0452/1405] Add v3.25.4 to CHANGELOG.md.

(cherry picked from commit ee25b41214aefe89edd75551f0c6e8125a60eb9b)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d55ae6a95c6..f8adc571770 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,10 @@
 - [#19405](https://github.com/emberjs/ember.js/pull/19405) [BUGFIX] Avoid instantiation errors when `app/router.js` injects the router service.
 - [#19436](https://github.com/emberjs/ember.js/pull/19436) [BUGFIX] Support observer keys with colons
 
+### v3.25.4 (March 24, 2021)
+
+- [#19473](https://github.com/emberjs/ember.js/pull/19473) Update Glimmer VM to latest.
+
 ### v3.25.3 (March 7, 2021)
 
 - [#19448](https://github.com/emberjs/ember.js/pull/19448) Ensure query params are preserved through an intermediate loading state transition

From 3b9eee2e6e08885ab6f93b0ce81f0e6be5a870c7 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 24 Mar 2021 19:30:05 -0400
Subject: [PATCH 0453/1405] Add 3.26.1 to CHANGELOG.md.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8adc571770..16f48889383 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,10 @@
 - [#19441](https://github.com/emberjs/ember.js/pull/19441) Add automated publishing of weekly alpha releases to NPM
 - [#19462](https://github.com/emberjs/ember.js/pull/19462) Use `positional` and `named` as the argument names in `ember g helper` blueprint
 
+### v3.26.1 (March 24, 2021)
+
+- [#19473](https://github.com/emberjs/ember.js/pull/19473) Update Glimmer VM to latest.
+
 ### v3.26.0 (March 22, 2021)
 
 - [#19255](https://github.com/emberjs/ember.js/pull/19255) [DEPRECATION] Deprecate transition methods of controller and route per [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).

From 3a6a3ab2fcf666af5c4d5acf89042331c3c27328 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 25 Mar 2021 14:26:55 -0400
Subject: [PATCH 0454/1405] Add v3.27.0-beta.2 to CHANGELOG.md.

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16f48889383..09f86731593 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Ember Changelog
 
-### v3.27.0 (March 22, 2021)
+### v3.27.0-beta.2 (March 25, 2021)
+
+- [#19473](https://github.com/emberjs/ember.js/pull/19473) Update GlimmerVM to latest (fix compatibility for template import proposals)
+- [#19474](https://github.com/emberjs/ember.js/pull/19474) [FEATURE] Enable `(helper` and `(modifier` helpers
+
+### v3.27.0-beta.1 (March 22, 2021)
 
 - [#19382](https://github.com/emberjs/ember.js/pull/19382) / [#19430](https://github.com/emberjs/ember.js/pull/19430) [FEATURE] Remaining implementation work per [RFC #671](https://github.com/emberjs/rfcs/blob/master/text/0671-modernize-built-in-components-1.md).
 - [#19457](https://github.com/emberjs/ember.js/pull/19457) / [#19463](https://github.com/emberjs/ember.js/pull/19463) / [#19464](https://github.com/emberjs/ember.js/pull/19464) / [#19467](https://github.com/emberjs/ember.js/pull/19467) [DEPRECATION] Add deprecation for the Ember Global per [RFC #706](https://github.com/emberjs/rfcs/blob/master/text/0706-deprecate-ember-global.md).

From bff7766db4a393f60c0c7beb2ece528a00ff1fde Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Fri, 19 Mar 2021 22:28:42 +0100
Subject: [PATCH 0455/1405] [FEATURE routing-router-service-refresh] Add a
 refresh method to the router service

This adds the refresh method to the RouterService as described in RFC 631.

RFC PR: https://github.com/emberjs/rfcs/pull/631
---
 .../-internals/routing/lib/services/router.ts |  36 +++++++
 packages/@ember/canary-features/index.ts      |   4 +
 .../router_service_test/refresh_test.js       | 100 ++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 packages/ember/tests/routing/router_service_test/refresh_test.js

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 1982ea5e32a..72f45380f7b 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,11 +1,13 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
+import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
+import Route from '../system/route';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
@@ -474,6 +476,40 @@ export default class RouterService extends Service {
   */
 }
 
+if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
+  RouterService.reopen({
+    /**
+     * Refreshes all currently active routes, doing a full transition.
+     * If a route name is provided and refers to a currently active route,
+     * it will refresh only that route and its descendents.
+     * Returns a promise that will be resolved once the refresh is complete.
+     * All resetController, beforeModel, model, afterModel, redirect, and setupController
+     * hooks will be called again. You will get new data from the model hook.
+     *
+     * @method refresh
+     * @param {String} [routeName] the route to refresh (along with all child routes)
+     * @return Transition
+     * @category EMBER_ROUTING_ROUTER_SERVICE_REFRESH
+     * @public
+     */
+    refresh(pivotRouteName?: string) {
+      if (!pivotRouteName) {
+        return this._router._routerMicrolib.refresh();
+      }
+
+      assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
+      assert(
+        `The route "${pivotRouteName}" is currently not active`,
+        this.isActive(pivotRouteName)
+      );
+
+      let pivotRoute = getOwner(this).lookup(`route:${pivotRouteName}`) as Route;
+
+      return this._router._routerMicrolib.refresh(pivotRoute);
+    },
+  });
+}
+
 RouterService.reopen(Evented, {
   /**
      Name of the current route.
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index c6afc535d6f..617810e311c 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -21,6 +21,7 @@ export const DEFAULT_FEATURES = {
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
+  EMBER_ROUTING_ROUTER_SERVICE_REFRESH: null,
 };
 
 /**
@@ -81,3 +82,6 @@ export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
 );
+export const EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(
+  FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH
+);
diff --git a/packages/ember/tests/routing/router_service_test/refresh_test.js b/packages/ember/tests/routing/router_service_test/refresh_test.js
new file mode 100644
index 00000000000..f0c1b47049a
--- /dev/null
+++ b/packages/ember/tests/routing/router_service_test/refresh_test.js
@@ -0,0 +1,100 @@
+import { Route } from '@ember/-internals/routing';
+import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
+import { RouterTestCase, moduleFor } from 'internal-test-helpers';
+
+if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
+  moduleFor(
+    'Router Service - refresh',
+    class extends RouterTestCase {
+      async ['@test RouterService#refresh can be used to re-run the model hooks of active routes'](
+        assert
+      ) {
+        let parentCounter = 0;
+        this.add(
+          'route:parent',
+          class extends Route {
+            model() {
+              ++parentCounter;
+            }
+          }
+        );
+
+        let childCounter = 0;
+        this.add(
+          'route:parent.child',
+          class extends Route {
+            model() {
+              ++childCounter;
+            }
+          }
+        );
+
+        let sisterCounter = 0;
+        this.add(
+          'route:parent.sister',
+          class extends Route {
+            model() {
+              ++sisterCounter;
+            }
+          }
+        );
+
+        await this.visit('/');
+        assert.equal(parentCounter, 1);
+        assert.equal(childCounter, 0);
+        assert.equal(sisterCounter, 0);
+
+        await this.routerService.refresh();
+        assert.equal(parentCounter, 2);
+        assert.equal(childCounter, 0);
+        assert.equal(sisterCounter, 0);
+
+        await this.routerService.refresh('application');
+        assert.equal(parentCounter, 3);
+        assert.equal(childCounter, 0);
+        assert.equal(sisterCounter, 0);
+
+        await this.routerService.transitionTo('parent.child');
+        assert.equal(parentCounter, 3);
+        assert.equal(childCounter, 1);
+        assert.equal(sisterCounter, 0);
+
+        await this.routerService.refresh('parent.child');
+        assert.equal(parentCounter, 3);
+        assert.equal(childCounter, 2);
+        assert.equal(sisterCounter, 0);
+
+        await this.routerService.refresh('parent');
+        assert.equal(parentCounter, 4);
+        assert.equal(childCounter, 3);
+        assert.equal(sisterCounter, 0);
+
+        await this.routerService.transitionTo('parent.sister');
+        assert.equal(parentCounter, 4);
+        assert.equal(childCounter, 3);
+        assert.equal(sisterCounter, 1);
+
+        await this.routerService.refresh();
+        assert.equal(parentCounter, 5);
+        assert.equal(childCounter, 3);
+        assert.equal(sisterCounter, 2);
+      }
+
+      async ['@test RouterService#refresh verifies that the provided route exists']() {
+        await this.visit('/');
+
+        expectAssertion(() => {
+          this.routerService.refresh('this-route-does-not-exist');
+        }, 'The route "this-route-does-not-exist" was not found');
+      }
+
+      async ['@test RouterService#refresh verifies that the provided route is active']() {
+        await this.visit('/');
+
+        expectAssertion(() => {
+          this.routerService.refresh('parent.child');
+        }, 'The route "parent.child" is currently not active');
+      }
+    }
+  );
+}

From 535065d9011f1025097c2b91bde61d0e67ac3a67 Mon Sep 17 00:00:00 2001
From: Sergey Astapov <SergeAstapov@gmail.com>
Date: Thu, 25 Mar 2021 16:29:25 -0400
Subject: [PATCH 0456/1405] [DOC] Remove extra argument from
 associateDestroyableChild

---
 packages/@ember/destroyable/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@ember/destroyable/index.ts b/packages/@ember/destroyable/index.ts
index d2fbf8c280f..c3470237798 100644
--- a/packages/@ember/destroyable/index.ts
+++ b/packages/@ember/destroyable/index.ts
@@ -48,7 +48,6 @@ import {
   @for @ember/destroyable
   @param {Object|Function} parent the destroyable to entangle the child destroyables lifetime with
   @param {Object|Function} child the destroyable to be entangled with the parents lifetime
-  @param {Function} destructor the destructor to run when the destroyable object is destroyed
   @returns {Object|Function} the child argument
   @static
   @public

From 428a30ffe3a38769651bb02e4e471ef4eb31d27c Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 25 Mar 2021 15:12:39 -0700
Subject: [PATCH 0457/1405] [BUGFIX beta] Export `on` from correct path

`on` is a modifier and supposed to be exported from `@ember/modifier`,
not `@ember/helper`.
---
 packages/@ember/helper/index.ts        | 2 +-
 packages/@ember/modifier/index.ts      | 1 +
 packages/ember/tests/reexports_test.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/helper/index.ts b/packages/@ember/helper/index.ts
index e3e0d580880..8f224c2c32e 100644
--- a/packages/@ember/helper/index.ts
+++ b/packages/@ember/helper/index.ts
@@ -305,4 +305,4 @@
 */
 
 export { setHelperManager, helperCapabilities as capabilities } from '@glimmer/manager';
-export { invokeHelper, hash, array, concat, get, on, fn } from '@glimmer/runtime';
+export { invokeHelper, hash, array, concat, get, fn } from '@glimmer/runtime';
diff --git a/packages/@ember/modifier/index.ts b/packages/@ember/modifier/index.ts
index 341a37d2ef4..cb64d224d38 100644
--- a/packages/@ember/modifier/index.ts
+++ b/packages/@ember/modifier/index.ts
@@ -1,2 +1,3 @@
 export { setModifierManager } from '@glimmer/manager';
 export { modifierCapabilities as capabilities } from '@ember/-internals/glimmer';
+export { on } from '@glimmer/runtime';
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index ae0520e23d9..b5e131eff1d 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -271,12 +271,12 @@ let allExports = [
   // @ember/modifier
   ['_modifierManagerCapabilities', '@ember/modifier', 'capabilities'],
   ['_setModifierManager', '@ember/modifier', 'setModifierManager'],
+  ['_on', '@ember/modifier', 'on'],
 
   // @ember/helper
   ['_helperManagerCapabilities', '@ember/helper', 'capabilities'],
   ['_setHelperManager', '@ember/helper', 'setHelperManager'],
   ['_invokeHelper', '@ember/helper', 'invokeHelper'],
-  ['_on', '@ember/helper', 'on'],
   ['_fn', '@ember/helper', 'fn'],
   ['_array', '@ember/helper', 'array'],
   ['_hash', '@ember/helper', 'hash'],

From f5ab960c8794858abf1c4785214b6c7a991f6fd2 Mon Sep 17 00:00:00 2001
From: Henry Majoros <hmajoros@linkedin.com>
Date: Thu, 25 Mar 2021 13:05:20 -0400
Subject: [PATCH 0458/1405] [BUGFIX LTS] move LinkTo assertion into a method so
 LinkToExternal can override it

---
 .../glimmer/lib/components/-link-to.ts        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 60eeea301cb..3c0531938b8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -499,12 +499,7 @@ const LinkComponent = EmberComponent.extend({
   init() {
     this._super(...arguments);
 
-    assert(
-      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
-        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
-        'See https://ember-engines.com/docs/links for more info.',
-      !this._isEngine || this._engineMountPoint !== undefined
-    );
+    this.assertLinkToOrigin();
 
     // Map desired event name to invoke function
     let { eventName } = this;
@@ -636,6 +631,22 @@ const LinkComponent = EmberComponent.extend({
     }
   ),
 
+  /**
+   * Method to assert that LinkTo is not used inside of a routeless engine. This method is
+   * overridden in ember-engines link-to-external component to just be a noop, since the
+   * link-to-external component extends the link-to component.
+   *
+   * @method assertLinkToOrigin
+   */
+  assertLinkToOrigin() {
+    assert(
+      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
+        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
+        'See https://ember-engines.com/docs/links for more info.',
+      !this._isEngine || this._engineMountPoint !== undefined
+    );
+  }
+
   _isActive(routerState: RouterState): boolean {
     if (this.loading) {
       return false;

From c30f0b4dc780da35bc16afcea83bc85f31999909 Mon Sep 17 00:00:00 2001
From: Henry Majoros <hmajoros@linkedin.com>
Date: Thu, 25 Mar 2021 13:09:17 -0400
Subject: [PATCH 0459/1405] fix linting errors

---
 packages/@ember/-internals/glimmer/lib/components/-link-to.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 3c0531938b8..0eb5e874223 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -645,7 +645,7 @@ const LinkComponent = EmberComponent.extend({
         'See https://ember-engines.com/docs/links for more info.',
       !this._isEngine || this._engineMountPoint !== undefined
     );
-  }
+  },
 
   _isActive(routerState: RouterState): boolean {
     if (this.loading) {

From 3a1bfa250dd5f2e2e03f3a4cadf97f5967ea36cf Mon Sep 17 00:00:00 2001
From: Henry Majoros <hmajoros@linkedin.com>
Date: Thu, 25 Mar 2021 13:20:49 -0400
Subject: [PATCH 0460/1405] add assertLinkToOrigin to tests/docs/expected.js

---
 packages/@ember/-internals/glimmer/lib/components/-link-to.ts | 1 +
 tests/docs/expected.js                                        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 0eb5e874223..4be618d267b 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -637,6 +637,7 @@ const LinkComponent = EmberComponent.extend({
    * link-to-external component extends the link-to component.
    *
    * @method assertLinkToOrigin
+   * @public
    */
   assertLinkToOrigin() {
     assert(
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 33df88a6323..48245ae8c15 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -92,6 +92,7 @@ module.exports = {
     'arrayContentWillChange',
     'assert',
     'assertDestroyablesDestroyed',
+    'assertLinkToOrigin',
     'assign',
     'associateDestroyableChild',
     'asyncEnd',

From 62e7b92b1e29a5af2aa821bef5c902066c37948b Mon Sep 17 00:00:00 2001
From: Henry Majoros <hmajoros@linkedin.com>
Date: Thu, 25 Mar 2021 15:02:09 -0400
Subject: [PATCH 0461/1405] change public to private

---
 packages/@ember/-internals/glimmer/lib/components/-link-to.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 4be618d267b..2ae57b6e124 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -637,7 +637,7 @@ const LinkComponent = EmberComponent.extend({
    * link-to-external component extends the link-to component.
    *
    * @method assertLinkToOrigin
-   * @public
+   * @private
    */
   assertLinkToOrigin() {
     assert(

From 1c62a2e142c79d2b8af2bab4451fd19a15c9baf1 Mon Sep 17 00:00:00 2001
From: Nicholas Eidler <neidler@linkedin.com>
Date: Mon, 29 Mar 2021 09:56:52 -0700
Subject: [PATCH 0462/1405] [DOC] Update loading action code example (#19299)

---
 .../@ember/-internals/routing/lib/system/route.ts     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 7e2c3474173..fef5516bec1 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -501,11 +501,14 @@ class Route extends EmberObject implements IRoute {
       @action
       loading(transition, route) {
         let controller = this.controllerFor('foo');
-        controller.set('currentlyLoading', true);
 
-        transition.finally(function() {
-          controller.set('currentlyLoading', false);
-        });
+        if (controller) {
+          controller.currentlyLoading = true;
+
+          transition.finally(function() {
+            controller.currentlyLoading = false;
+          });
+        }
       }
     }
     ```

From 69bd180049f81f3c9b6a1319f7754c65b8dc6d96 Mon Sep 17 00:00:00 2001
From: Nicholas Eidler <neidler@linkedin.com>
Date: Mon, 29 Mar 2021 10:16:40 -0700
Subject: [PATCH 0463/1405] let -> const

---
 packages/@ember/-internals/routing/lib/system/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index fef5516bec1..b1ae19baa42 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -500,7 +500,7 @@ class Route extends EmberObject implements IRoute {
     export default class ApplicationRoute extends Route {
       @action
       loading(transition, route) {
-        let controller = this.controllerFor('foo');
+        const controller = this.controllerFor('foo');
 
         if (controller) {
           controller.currentlyLoading = true;

From 8e02b9dc273413dfd3dfafc44b247df8769df1c9 Mon Sep 17 00:00:00 2001
From: Nicholas Eidler <neidler@linkedin.com>
Date: Mon, 29 Mar 2021 11:26:06 -0700
Subject: [PATCH 0464/1405] Add comment explaining 'if' guard

---
 packages/@ember/-internals/routing/lib/system/route.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index b1ae19baa42..91cbad8e8c7 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -502,6 +502,7 @@ class Route extends EmberObject implements IRoute {
       loading(transition, route) {
         const controller = this.controllerFor('foo');
 
+        // The controller may not be instantiated when initially loading
         if (controller) {
           controller.currentlyLoading = true;
 

From 27e80e4d8e8b7ca156d70bdaa155ee6a4e437b0a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 29 Mar 2021 19:16:38 +0000
Subject: [PATCH 0465/1405] [Security] Bump y18n from 4.0.0 to 4.0.1

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1. **This update includes a security fix.**
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e7f68505651..b387ddcfff1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10484,9 +10484,9 @@ xtend@^4.0.0, xtend@~4.0.0:
   integrity "sha1-pcbVMr5lbiPbgg77lDofBJmNY68= sha512-iTwvhNBRetXWe81+VcIw5YeadVSWyze7uA7nVnpP13ulrpnJ3UfQm5ApGnrkmxDJFdrblRdZs0EvaTCIfei5oQ=="
 
 y18n@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
-  integrity "sha1-le+U+F7MgdAHwmThkKEg8KPIVms= sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
+  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
 yallist@^3.0.0:
   version "3.0.3"

From 83e09ab70bde5b486403c7de8da95cfa2e8f9d7e Mon Sep 17 00:00:00 2001
From: Nicholas Eidler <neidler@linkedin.com>
Date: Mon, 29 Mar 2021 12:16:48 -0700
Subject: [PATCH 0466/1405] back to using let

---
 packages/@ember/-internals/routing/lib/system/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 91cbad8e8c7..60b87e409ea 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -500,7 +500,7 @@ class Route extends EmberObject implements IRoute {
     export default class ApplicationRoute extends Route {
       @action
       loading(transition, route) {
-        const controller = this.controllerFor('foo');
+        let controller = this.controllerFor('foo');
 
         // The controller may not be instantiated when initially loading
         if (controller) {

From 7c4314e9e23f69ee8de45bf35c53cedae1c93d4c Mon Sep 17 00:00:00 2001
From: Nicholas Eidler <neidler@linkedin.com>
Date: Mon, 29 Mar 2021 16:37:45 -0700
Subject: [PATCH 0467/1405] re-run flaky IE tests


From 397d6b990fdf2e46bdc97a4424419706184e4e0a Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 30 Mar 2021 02:05:06 -0700
Subject: [PATCH 0468/1405] [BUGFIX beta] Allow passing a string literal to
 {{helper}} and {{modifier}}

As per [RFC #432](https://github.com/emberjs/rfcs/blob/master/text/0432-contextual-helpers.md#invoking-contextual-modifiers)

However, dynamic string values are currently disallowed per earlier
framework team weekly meeting discussion to not make it harder for
Embroider to heuristically analyze the dynamic usages.

Eventually we will want to do the same for components as well, and
this AST transform would work there too.
---
 .../helpers/-disallow-dynamic-resolution.ts   |  57 +++++
 .../glimmer/lib/helpers/-resolve.ts           |  39 ++++
 .../@ember/-internals/glimmer/lib/resolver.ts |  17 ++
 .../custom-modifier-manager-test.js           |  39 ++++
 .../integration/helpers/custom-helper-test.js |  21 ++
 .../lib/plugins/index.ts                      |   5 +-
 .../lib/plugins/transform-resolutions.ts      | 198 ++++++++++++++++++
 .../lib/plugins/utils.ts                      |   8 +-
 8 files changed, 381 insertions(+), 3 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
 create mode 100644 packages/ember-template-compiler/lib/plugins/transform-resolutions.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
new file mode 100644
index 00000000000..7d761c5c768
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
@@ -0,0 +1,57 @@
+/**
+@module ember
+*/
+import { assert } from '@ember/debug';
+import { CapturedArguments } from '@glimmer/interfaces';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
+
+export default internalHelper(({ positional, named }: CapturedArguments) => {
+  assert(
+    `[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`,
+    positional.length === 1
+  );
+
+  let nameOrValueRef = positional[0];
+
+  assert(`[BUG] expecting \`type\` named argument`, 'type' in named);
+  assert(`[BUG] expecting \`loc\` named argument`, 'loc' in named);
+  assert(`[BUG] expecting \`original\` named argument`, 'original' in named);
+
+  let typeRef = named.type;
+  let locRef = named.loc;
+  let originalRef = named.original;
+
+  // Bug: why do these fail?
+  // assert('[BUG] expecting a string literal for the `type` argument', isConstRef(typeRef));
+  // assert('[BUG] expecting a string literal for the `loc` argument', isConstRef(locRef));
+  // assert('[BUG] expecting a string literal for the `original` argument', isConstRef(originalRef));
+
+  const type = valueForRef(typeRef);
+  const loc = valueForRef(locRef);
+  const original = valueForRef(originalRef);
+
+  assert('[BUG] expecting a string literal for the `type` argument', typeof type === 'string');
+  assert('[BUG] expecting a string literal for the `loc` argument', typeof loc === 'string');
+  assert(
+    '[BUG] expecting a string literal for the `original` argument',
+    typeof original === 'string'
+  );
+
+  return createComputeRef(() => {
+    let nameOrValue = valueForRef(nameOrValueRef);
+
+    assert(
+      `Passing a dynamic string to the \`(${type})\` keyword is disallowed. ` +
+        `(You specified \`(${type} ${original})\` and \`${original}\` evaluated into "${nameOrValue}".) ` +
+        `This ensures we can statically analyze the template and determine which ${type}s are used. ` +
+        `If the ${type} name is always the same, use a string literal instead, i.e. \`(${type} "${nameOrValue}")\`. ` +
+        `Otherwise, import the ${type}s into JavaScript and pass them to the ${type} keyword. ` +
+        'See https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#4-no-dynamic-resolution for details. ' +
+        loc,
+      typeof nameOrValue !== 'string'
+    );
+
+    return nameOrValue;
+  });
+});
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
new file mode 100644
index 00000000000..34eda61c3c2
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
@@ -0,0 +1,39 @@
+/**
+@module ember
+*/
+import { Owner } from '@ember/-internals/owner';
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { CapturedArguments } from '@glimmer/interfaces';
+import { createConstRef, isConstRef, valueForRef } from '@glimmer/reference';
+import { internalHelper } from './internal-helper';
+
+export default internalHelper(({ positional }: CapturedArguments, owner: Owner | undefined) => {
+  // why is this allowed to be undefined in the first place?
+  assert('[BUG] missing owner', owner);
+
+  assert(
+    `[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`,
+    positional.length === 1
+  );
+
+  let fullNameRef = positional[0];
+
+  assert('[BUG] expecting a string literal as argument', isConstRef(fullNameRef));
+
+  let fullName = valueForRef(fullNameRef);
+
+  assert('[BUG] expecting a string literal as argument', typeof fullName === 'string');
+  assert('[BUG] expecting a valid full name', fullName.split(':').length === 2);
+
+  if (DEBUG) {
+    let [type, name] = fullName.split(':');
+
+    assert(
+      `Attempted to invoke \`(-resolve "${fullName}")\`, but ${name} was not a valid ${type} name.`,
+      owner.hasRegistration(fullName)
+    );
+  }
+
+  return createConstRef(owner.factoryFor(fullName)?.class, `(-resolve "${fullName}")`);
+});
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 8c87ec67c64..c20abe47c5f 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -42,8 +42,10 @@ import {
   isClassicHelper,
   SimpleHelper,
 } from './helper';
+import { default as disallowDynamicResolution } from './helpers/-disallow-dynamic-resolution';
 import { default as inElementNullCheckHelper } from './helpers/-in-element-null-check';
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
+import { default as resolve } from './helpers/-resolve';
 import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
 import { default as eachIn } from './helpers/each-in';
@@ -181,12 +183,27 @@ const BUILTIN_KEYWORD_HELPERS = {
   '-hash': hash,
   '-each-in': eachIn,
   '-normalize-class': normalizeClassHelper,
+  '-resolve': resolve,
   '-track-array': trackArray,
   '-mount': mountHelper,
   '-outlet': outletHelper,
   '-in-el-null': inElementNullCheckHelper,
 };
 
+if (DEBUG) {
+  BUILTIN_KEYWORD_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
+} else {
+  // Bug: this may be a quirk of our test setup?
+  // In prod builds, this is a no-op helper and is unused in practice. We shouldn't need
+  // to add it at all, but the current test build doesn't produce a "prod compiler", so
+  // we ended up running the debug-build for the template compliler in prod tests. Once
+  // that is fixed, this can be removed. For now, this allows the test to work and does
+  // not really harm anything, since it's just a no-op pass-through helper and the bytes
+  // has to be included anyway. In the future, perhaps we can avoid the latter by using
+  // `import(...)`?
+  BUILTIN_KEYWORD_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
+}
+
 const BUILTIN_HELPERS = {
   ...BUILTIN_KEYWORD_HELPERS,
   array,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index dd92643ce33..508dfc567ed 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -581,6 +581,45 @@ moduleFor(
       assert.equal(updateCount, 1);
     }
 
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can resolve a modifier'() {
+      this.registerModifier(
+        'replace',
+        defineSimpleModifier((element, [text]) => (element.innerHTML = text ?? 'Hello, world!'))
+      );
+
+      // BUG: this should work according to the RFC
+      // this.render(
+      //   '[<div {{modifier "replace"}}>Nope</div>][<div {{modifier (modifier "replace") "wow"}}>Nope</div>]'
+      // );
+      this.render(
+        '[<div {{(modifier "replace")}}>Nope</div>][<div {{(modifier "replace") "wow"}}>Nope</div>]'
+      );
+      this.assertText('[Hello, world!][wow]');
+      this.assertStableRerender();
+    }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Cannot dynamically resolve a modifier'(assert) {
+      this.registerModifier(
+        'replace',
+        defineSimpleModifier((element) => (element.innerHTML = 'Hello, world!'))
+      );
+
+      if (DEBUG) {
+        expectAssertion(
+          () =>
+            this.render(
+              // BUG: this should work according to the RFC
+              // '<div {{modifier this.name}}>Nope</div>',
+              '<div {{(modifier this.name)}}>Nope</div>',
+              { name: 'replace' }
+            ),
+          /Passing a dynamic string to the `\(modifier\)` keyword is disallowed\./
+        );
+      } else {
+        assert.expect(0);
+      }
+    }
+
     '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can be curried'() {
       let val = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 08d55ef94b9..ba4bb014444 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -780,6 +780,27 @@ moduleFor(
       }, expectedMessage);
     }
 
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can resolve a helper'() {
+      this.registerHelper('hello-world', ([text]) => text ?? 'Hello, world!');
+
+      this.render('[{{helper "hello-world"}}][{{helper (helper "hello-world") "wow"}}]');
+      this.assertText('[Hello, world!][wow]');
+      this.assertStableRerender();
+    }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Cannot dynamically resolve a helper'(assert) {
+      this.registerHelper('hello-world', () => 'Hello, world!');
+
+      if (DEBUG) {
+        expectAssertion(
+          () => this.render('{{helper this.name}}', { name: 'hello-world' }),
+          /Passing a dynamic string to the `\(helper\)` keyword is disallowed\./
+        );
+      } else {
+        assert.expect(0);
+      }
+    }
+
     '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
       let val = defineSimpleHelper((value) => value);
 
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 4b8ac4fe831..2efa104176a 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -14,6 +14,7 @@ import TransformInElement from './transform-in-element';
 import TransformLinkTo from './transform-link-to';
 import TransformOldClassBindingSyntax from './transform-old-class-binding-syntax';
 import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings-into-just-bindings';
+import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
 import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS, EMBER_NAMED_BLOCKS } from '@ember/canary-features';
@@ -38,7 +39,9 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     DeprecateWith,
     SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
-    !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
+    EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
+      ? TransformResolutions
+      : AssertAgainstDynamicHelpersModifiers,
   ].filter(notNull)
 );
 
diff --git a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
new file mode 100644
index 00000000000..14f3849f1ce
--- /dev/null
+++ b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
@@ -0,0 +1,198 @@
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { AST, ASTPlugin, print } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
+import { isPath, isStringLiteral, trackLocals } from './utils';
+
+/**
+ @module ember
+*/
+
+/**
+  A Glimmer2 AST transformation that replaces all instances of
+
+  ```handlebars
+  {{helper "..." ...}}
+  ```
+
+  with
+
+  ```handlebars
+  {{helper (-resolve "helper:...") ...}}
+  ```
+
+  and
+
+  ```handlebars
+  {{helper ... ...}}
+  ```
+
+  with
+
+  ```handlebars
+  {{helper (-disallow-dynamic-resolution ...) ...}}
+  ```
+
+  and
+
+  ```handlebars
+  {{modifier "..." ...}}
+  ```
+
+  with
+
+  ```handlebars
+  {{modifier (-resolve "modifier:...") ...}}
+  ```
+  and
+
+  ```handlebars
+  {{modifier ... ...}}
+  ```
+
+  with
+
+  ```handlebars
+  {{modifier (-disallow-dynamic-resolution ...) ...}}
+  ```
+
+  @private
+  @class TransformResolutions
+*/
+
+const TARGETS = Object.freeze(['helper', 'modifier']);
+
+export default function transformResolutions(env: EmberASTPluginEnvironment): ASTPlugin {
+  let { builders: b } = env.syntax;
+  let { moduleName } = env.meta;
+  let { hasLocal, node: tracker } = trackLocals();
+  let seen: Set<AST.Node> | undefined;
+
+  return {
+    name: 'transform-resolutions',
+
+    visitor: {
+      Template: {
+        enter() {
+          seen = new Set();
+        },
+
+        exit() {
+          seen = undefined;
+        },
+      },
+
+      Block: tracker,
+
+      ElementNode: {
+        keys: {
+          children: tracker,
+        },
+      },
+
+      MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
+        assert('[BUG] seen set should be available', seen);
+
+        if (seen.has(node)) {
+          return;
+        }
+
+        if (
+          isPath(node.path) &&
+          !isLocalVariable(node.path, hasLocal) &&
+          TARGETS.indexOf(node.path.original) !== -1
+        ) {
+          let result = b.mustache(
+            node.path,
+            transformParams(b, node.params, node.path.original, moduleName, node.loc),
+            node.hash,
+            node.trusting,
+            node.loc,
+            node.strip
+          );
+
+          // Avoid double/infinite-processing
+          seen.add(result);
+
+          return result;
+        }
+      },
+      SubExpression(node: AST.SubExpression): AST.Node | void {
+        assert('[BUG] seen set should be available', seen);
+
+        if (seen.has(node)) {
+          return;
+        }
+
+        if (
+          isPath(node.path) &&
+          !isLocalVariable(node.path, hasLocal) &&
+          TARGETS.indexOf(node.path.original) !== -1
+        ) {
+          let result = b.sexpr(
+            node.path,
+            transformParams(b, node.params, node.path.original, moduleName, node.loc),
+            node.hash,
+            node.loc
+          );
+
+          // Avoid double/infinite-processing
+          seen.add(result);
+
+          return result;
+        }
+      },
+    },
+  };
+}
+
+function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
+  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]);
+}
+
+function transformParams(
+  b: EmberASTPluginEnvironment['syntax']['builders'],
+  params: AST.Expression[],
+  type: string,
+  moduleName: string,
+  loc: AST.SourceLocation | undefined
+): AST.Expression[] {
+  let [first, ...rest] = params;
+
+  assert(
+    `The ${type} keyword requires at least one positional arguments ${calculateLocationDisplay(
+      moduleName,
+      loc
+    )}`,
+    first
+  );
+
+  if (isStringLiteral(first)) {
+    return [
+      b.sexpr(
+        b.path('-resolve', first.loc),
+        [b.string(`${type}:${first.value}`)],
+        undefined,
+        first.loc
+      ),
+      ...rest,
+    ];
+  } else if (DEBUG) {
+    return [
+      b.sexpr(
+        b.path('-disallow-dynamic-resolution', first.loc),
+        [first],
+        b.hash([
+          b.pair('type', b.string(type), first.loc),
+          b.pair('loc', b.string(calculateLocationDisplay(moduleName, loc)), first.loc),
+          b.pair('original', b.string(print(first))),
+        ]),
+        first.loc
+      ),
+      ...rest,
+    ];
+  } else {
+    return params;
+  }
+}
diff --git a/packages/ember-template-compiler/lib/plugins/utils.ts b/packages/ember-template-compiler/lib/plugins/utils.ts
index fa310f00e31..a2e42b39ca0 100644
--- a/packages/ember-template-compiler/lib/plugins/utils.ts
+++ b/packages/ember-template-compiler/lib/plugins/utils.ts
@@ -8,18 +8,22 @@ export function isSubExpression(node: AST.Node): node is AST.SubExpression {
   return node.type === 'SubExpression';
 }
 
+export function isStringLiteral(node: AST.Expression): node is AST.StringLiteral {
+  return node.type === 'StringLiteral';
+}
+
 export function trackLocals() {
   let locals = new Map();
 
   let node = {
-    enter(node: AST.Program | AST.ElementNode) {
+    enter(node: AST.Program | AST.Block | AST.ElementNode) {
       for (let param of node.blockParams) {
         let value = locals.get(param) || 0;
         locals.set(param, value + 1);
       }
     },
 
-    exit(node: AST.Program | AST.ElementNode) {
+    exit(node: AST.Program | AST.Block | AST.ElementNode) {
       for (let param of node.blockParams) {
         let value = locals.get(param) - 1;
 

From 21bd70c773dcc4bfe4883d7943e8a68d203b5bad Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 30 Mar 2021 06:13:29 -0700
Subject: [PATCH 0469/1405] v3.27.0-beta.3 CHANGELOG

(cherry picked from commit 0e298af9e27d85515736a0748c908e948a9fc39e)
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09f86731593..92b0da3b260 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v3.27.0-beta.3 (March 30, 2021)
+
+- [#19477](https://github.com/emberjs/ember.js/pull/19477) [BUGFIX] Move `LinkTo` assertion into a method so `LinkToExternal` can override it
+- [#19481](https://github.com/emberjs/ember.js/pull/19481) [BUGFIX] Export `on` from correct path
+- [#19487](https://github.com/emberjs/ember.js/pull/19487) [BUGFIX] Allow passing a string literal to {{helper}} and {{modifier}}
+
 ### v3.27.0-beta.2 (March 25, 2021)
 
 - [#19473](https://github.com/emberjs/ember.js/pull/19473) Update GlimmerVM to latest (fix compatibility for template import proposals)

From e13e263c6a66fcd1518ddb7b580483bbf36187a2 Mon Sep 17 00:00:00 2001
From: Sara Reidy <sara.reidy.21@gmail.com>
Date: Wed, 31 Mar 2021 06:30:57 -0400
Subject: [PATCH 0470/1405] [DOC canary] Add page-title.ts and add page-title
 to expected docs

Gonna sqash

squahs
---
 .../glimmer/lib/helpers/page-title.ts          | 18 ++++++++++++++++++
 tests/docs/expected.js                         |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/page-title.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
new file mode 100644
index 00000000000..ddda9437efe
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
@@ -0,0 +1,18 @@
+/**
+@module ember
+*/
+
+/**
+  `page-title` allows you to set the title of any page in your application and 
+  append additional titles for each route. For complete documentation, see
+  https://github.com/ember-cli/ember-page-title.
+
+  ```handlebars
+  {{page-title "My Page Title" }}
+  ```
+
+  @method log
+  @for Ember.Templates.helpers
+  @param {String} param
+  @public
+*/
\ No newline at end of file
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 48245ae8c15..4832b73e593 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -411,6 +411,7 @@ module.exports = {
     'originalMethods',
     'outlet',
     'ownerInjection',
+    'page-title',
     'paramNames',
     'params',
     'paramsFor',

From 5fd6755420dd3865022896a2515a33d16e04a25a Mon Sep 17 00:00:00 2001
From: Sara Reidy <sara.reidy.21@gmail.com>
Date: Wed, 31 Mar 2021 06:58:12 -0400
Subject: [PATCH 0471/1405] Removed trailing whitespace in page-title.ts

---
 packages/@ember/-internals/glimmer/lib/helpers/page-title.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
index ddda9437efe..03f290070a1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
@@ -3,7 +3,7 @@
 */
 
 /**
-  `page-title` allows you to set the title of any page in your application and 
+  `page-title` allows you to set the title of any page in your application and
   append additional titles for each route. For complete documentation, see
   https://github.com/ember-cli/ember-page-title.
 

From 38e16030d2f55cb266ba75568d6b74aa327c1311 Mon Sep 17 00:00:00 2001
From: Sara Reidy <sara.reidy.21@gmail.com>
Date: Wed, 31 Mar 2021 07:05:54 -0400
Subject: [PATCH 0472/1405] Added newline to end of page-title.ts

---
 packages/@ember/-internals/glimmer/lib/helpers/page-title.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
index 03f290070a1..74d0517ae19 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
@@ -15,4 +15,4 @@
   @for Ember.Templates.helpers
   @param {String} param
   @public
-*/
\ No newline at end of file
+*/

From 55d021d58e12f87fafc866706d87bdb57c4df796 Mon Sep 17 00:00:00 2001
From: Sara Reidy <sara.reidy.21@gmail.com>
Date: Wed, 31 Mar 2021 07:15:46 -0400
Subject: [PATCH 0473/1405] Added the correct method name

---
 packages/@ember/-internals/glimmer/lib/helpers/page-title.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
index 74d0517ae19..e57c5929a5f 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/page-title.ts
@@ -11,7 +11,7 @@
   {{page-title "My Page Title" }}
   ```
 
-  @method log
+  @method page-title
   @for Ember.Templates.helpers
   @param {String} param
   @public

From 1d49ea9740a921ffef27c0fd08af09216f32e2e0 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <runspired@gmail.com>
Date: Mon, 5 Apr 2021 23:22:45 -0700
Subject: [PATCH 0474/1405] fix: lookup/register and singleton flag behavior

---
 .../-internals/container/lib/container.ts     |   7 +-
 .../container/tests/container_test.js         | 244 ++++++++++++++----
 2 files changed, 191 insertions(+), 60 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 464cee719f6..0c26834bfdb 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -272,7 +272,7 @@ function isInstantiatable(container: Container, fullName: string) {
 function lookup(container: Container, fullName: string, options: LookupOptions = {}) {
   let normalizedName = fullName;
 
-  if (options.singleton !== false) {
+  if (options.singleton === true || (options.singleton === undefined && isSingleton(container, fullName))) {
     let cached = container.cache[normalizedName];
     if (cached !== undefined) {
       return cached;
@@ -335,7 +335,7 @@ function isSingletonInstance(
   return (
     singleton !== false &&
     instantiate !== false &&
-    isSingleton(container, fullName) &&
+    (singleton === true || isSingleton(container, fullName)) &&
     isInstantiatable(container, fullName)
   );
 }
@@ -359,7 +359,7 @@ function isFactoryInstance(
 ) {
   return (
     instantiate !== false &&
-    (singleton !== false || isSingleton(container, fullName)) &&
+    (singleton === false || !isSingleton(container, fullName)) &&
     isInstantiatable(container, fullName)
   );
 }
@@ -379,6 +379,7 @@ function instantiateFactory(
   // SomeClass { singleton: true, instantiate: true } | { singleton: true } | { instantiate: true } | {}
   // By default majority of objects fall into this case
   if (isSingletonInstance(container, fullName, options)) {
+
     let instance = (container.cache[normalizedName] = factoryManager.create() as CacheMember);
 
     // if this lookup happened _during_ destruction (emits a deprecation, but
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index f97ebbb6204..787819b3ba4 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -5,6 +5,193 @@ import { DEBUG } from '@glimmer/env';
 import { Registry } from '..';
 import { factory, moduleFor, AbstractTestCase, runTask } from 'internal-test-helpers';
 
+moduleFor('Container.lookup', class extends AbstractTestCase {
+
+  ['@test lookup returns a fresh instance if singleton: false is passed as an option'](
+    assert
+  ) {
+    let registry = new Registry();
+    let container = registry.container();
+    let PostController = factory();
+
+    registry.register('controller:post', PostController);
+
+    let postController1 = container.lookup('controller:post');
+    let postController2 = container.lookup('controller:post', {
+      singleton: false,
+    });
+    let postController3 = container.lookup('controller:post', {
+      singleton: false,
+    });
+    let postController4 = container.lookup('controller:post');
+
+    assert.equal(
+      postController1.toString(),
+      postController4.toString(),
+      'Singleton factories looked up normally return the same value'
+    );
+    assert.notEqual(
+      postController1.toString(),
+      postController2.toString(),
+      'Singleton factories are not equal to factories looked up with singleton: false'
+    );
+    assert.notEqual(
+      postController2.toString(),
+      postController3.toString(),
+      'Two factories looked up with singleton: false are not equal'
+    );
+    assert.notEqual(
+      postController3.toString(),
+      postController4.toString(),
+      'A singleton factory looked up after a factory called with singleton: false is not equal'
+    );
+
+    assert.ok(
+      postController1 instanceof PostController,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      postController2 instanceof PostController,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      postController3 instanceof PostController,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      postController4 instanceof PostController,
+      'All instances are instances of the registered factory'
+    );
+  }
+
+  ['@test lookup returns a fresh instance if singleton: false is passed as an option to lookup'](
+    assert
+  ) {
+    class TestFactory {
+      constructor(opts) {
+        Object.assign(this, opts);
+      }
+      static create(opts) {
+        return new this(opts);
+      }
+    }
+
+    let registry = new Registry();
+    let container = registry.container();
+    registry.register('thing:test/obj', TestFactory);
+
+    let instance1 = container.lookup('thing:test/obj');
+    let instance2 = container.lookup('thing:test/obj', {
+      singleton: false,
+    });
+    let instance3 = container.lookup('thing:test/obj', {
+      singleton: false,
+    });
+    let instance4 = container.lookup('thing:test/obj');
+
+    assert.ok(instance1 === instance4, 'factories looked up up without singleton: false are the same instance');
+    assert.ok(instance1 !== instance2, 'factories looked up with singleton: false are a different instance');
+    assert.ok(instance2 !== instance3, 'factories looked up with singleton: false are a different instance');
+    assert.ok(instance3 !== instance4, 'factories looked up after a call to singleton: false is a different instance');
+    assert.ok(
+      instance1 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance2 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance3 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance4 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+  }
+
+  ['@test lookup returns a fresh instance if singleton: false is passed as an option to register'](
+    assert
+  ) {
+    class TestFactory {
+      constructor(opts) {
+        Object.assign(this, opts);
+      }
+      static create(opts) {
+        return new this(opts);
+      }
+    }
+
+    let registry = new Registry();
+    let container = registry.container();
+    registry.register('thing:test/obj', TestFactory, { singleton: false });
+
+    let instance1 = container.lookup('thing:test/obj');
+    let instance2 = container.lookup('thing:test/obj');
+    let instance3 = container.lookup('thing:test/obj');
+
+    assert.ok(instance1 !== instance2, 'each lookup is a different instance');
+    assert.ok(instance2 !== instance3, 'each lookup is a different instance');
+    assert.ok(instance1 !== instance3, 'each lookup is a different instance');
+    assert.ok(
+      instance1 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance2 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance3 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+  }
+
+  ['@test lookup returns a singleton instance if singleton: true is passed as an option even if registered as singleton: false'](
+    assert
+  ) {
+    class TestFactory {
+      constructor(opts) {
+        Object.assign(this, opts);
+      }
+      static create(opts) {
+        return new this(opts);
+      }
+    }
+
+    let registry = new Registry();
+    let container = registry.container();
+    registry.register('thing:test/obj', TestFactory, { singleton: false });
+
+    let instance1 = container.lookup('thing:test/obj');
+    let instance2 = container.lookup('thing:test/obj', { singleton: true });
+    let instance3 = container.lookup('thing:test/obj', { singleton: true });
+    let instance4 = container.lookup('thing:test/obj');
+
+    assert.ok(instance1 !== instance2, 'each lookup is a different instance');
+    assert.ok(instance2 === instance3, 'each singleton: true lookup is the same instance');
+    assert.ok(instance3 !== instance4, 'each lookup is a different instance');
+    assert.ok(instance1 !== instance4, 'each lookup is a different instance');
+    assert.ok(
+      instance1 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance2 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance3 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+    assert.ok(
+      instance4 instanceof TestFactory,
+      'All instances are instances of the registered factory'
+    );
+  }
+});
+
 moduleFor(
   'Container',
   class extends AbstractTestCase {
@@ -45,63 +232,6 @@ moduleFor(
       );
     }
 
-    ['@test A registered factory returns a fresh instance if singleton: false is passed as an option'](
-      assert
-    ) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostController = factory();
-
-      registry.register('controller:post', PostController);
-
-      let postController1 = container.lookup('controller:post');
-      let postController2 = container.lookup('controller:post', {
-        singleton: false,
-      });
-      let postController3 = container.lookup('controller:post', {
-        singleton: false,
-      });
-      let postController4 = container.lookup('controller:post');
-
-      assert.equal(
-        postController1.toString(),
-        postController4.toString(),
-        'Singleton factories looked up normally return the same value'
-      );
-      assert.notEqual(
-        postController1.toString(),
-        postController2.toString(),
-        'Singleton factories are not equal to factories looked up with singleton: false'
-      );
-      assert.notEqual(
-        postController2.toString(),
-        postController3.toString(),
-        'Two factories looked up with singleton: false are not equal'
-      );
-      assert.notEqual(
-        postController3.toString(),
-        postController4.toString(),
-        'A singleton factory looked up after a factory called with singleton: false is not equal'
-      );
-
-      assert.ok(
-        postController1 instanceof PostController,
-        'All instances are instances of the registered factory'
-      );
-      assert.ok(
-        postController2 instanceof PostController,
-        'All instances are instances of the registered factory'
-      );
-      assert.ok(
-        postController3 instanceof PostController,
-        'All instances are instances of the registered factory'
-      );
-      assert.ok(
-        postController4 instanceof PostController,
-        'All instances are instances of the registered factory'
-      );
-    }
-
     ["@test A factory type with a registered injection's instances receive that injection"](
       assert
     ) {

From 6706b17e9a71895dc3b371cb9885647eff2bd241 Mon Sep 17 00:00:00 2001
From: Chris Thoburn <runspired@gmail.com>
Date: Mon, 5 Apr 2021 23:30:59 -0700
Subject: [PATCH 0475/1405] fix lint

---
 .../-internals/container/lib/container.ts     |   6 +-
 .../container/tests/container_test.js         | 364 +++++++++---------
 2 files changed, 192 insertions(+), 178 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 0c26834bfdb..091203bec0b 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -272,7 +272,10 @@ function isInstantiatable(container: Container, fullName: string) {
 function lookup(container: Container, fullName: string, options: LookupOptions = {}) {
   let normalizedName = fullName;
 
-  if (options.singleton === true || (options.singleton === undefined && isSingleton(container, fullName))) {
+  if (
+    options.singleton === true ||
+    (options.singleton === undefined && isSingleton(container, fullName))
+  ) {
     let cached = container.cache[normalizedName];
     if (cached !== undefined) {
       return cached;
@@ -379,7 +382,6 @@ function instantiateFactory(
   // SomeClass { singleton: true, instantiate: true } | { singleton: true } | { instantiate: true } | {}
   // By default majority of objects fall into this case
   if (isSingletonInstance(container, fullName, options)) {
-
     let instance = (container.cache[normalizedName] = factoryManager.create() as CacheMember);
 
     // if this lookup happened _during_ destruction (emits a deprecation, but
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index 787819b3ba4..4fc52d28452 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -5,192 +5,204 @@ import { DEBUG } from '@glimmer/env';
 import { Registry } from '..';
 import { factory, moduleFor, AbstractTestCase, runTask } from 'internal-test-helpers';
 
-moduleFor('Container.lookup', class extends AbstractTestCase {
-
-  ['@test lookup returns a fresh instance if singleton: false is passed as an option'](
-    assert
-  ) {
-    let registry = new Registry();
-    let container = registry.container();
-    let PostController = factory();
-
-    registry.register('controller:post', PostController);
-
-    let postController1 = container.lookup('controller:post');
-    let postController2 = container.lookup('controller:post', {
-      singleton: false,
-    });
-    let postController3 = container.lookup('controller:post', {
-      singleton: false,
-    });
-    let postController4 = container.lookup('controller:post');
-
-    assert.equal(
-      postController1.toString(),
-      postController4.toString(),
-      'Singleton factories looked up normally return the same value'
-    );
-    assert.notEqual(
-      postController1.toString(),
-      postController2.toString(),
-      'Singleton factories are not equal to factories looked up with singleton: false'
-    );
-    assert.notEqual(
-      postController2.toString(),
-      postController3.toString(),
-      'Two factories looked up with singleton: false are not equal'
-    );
-    assert.notEqual(
-      postController3.toString(),
-      postController4.toString(),
-      'A singleton factory looked up after a factory called with singleton: false is not equal'
-    );
-
-    assert.ok(
-      postController1 instanceof PostController,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      postController2 instanceof PostController,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      postController3 instanceof PostController,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      postController4 instanceof PostController,
-      'All instances are instances of the registered factory'
-    );
-  }
+moduleFor(
+  'Container.lookup',
+  class extends AbstractTestCase {
+    ['@test lookup returns a fresh instance if singleton: false is passed as an option'](assert) {
+      let registry = new Registry();
+      let container = registry.container();
+      let PostController = factory();
 
-  ['@test lookup returns a fresh instance if singleton: false is passed as an option to lookup'](
-    assert
-  ) {
-    class TestFactory {
-      constructor(opts) {
-        Object.assign(this, opts);
-      }
-      static create(opts) {
-        return new this(opts);
-      }
-    }
+      registry.register('controller:post', PostController);
 
-    let registry = new Registry();
-    let container = registry.container();
-    registry.register('thing:test/obj', TestFactory);
-
-    let instance1 = container.lookup('thing:test/obj');
-    let instance2 = container.lookup('thing:test/obj', {
-      singleton: false,
-    });
-    let instance3 = container.lookup('thing:test/obj', {
-      singleton: false,
-    });
-    let instance4 = container.lookup('thing:test/obj');
-
-    assert.ok(instance1 === instance4, 'factories looked up up without singleton: false are the same instance');
-    assert.ok(instance1 !== instance2, 'factories looked up with singleton: false are a different instance');
-    assert.ok(instance2 !== instance3, 'factories looked up with singleton: false are a different instance');
-    assert.ok(instance3 !== instance4, 'factories looked up after a call to singleton: false is a different instance');
-    assert.ok(
-      instance1 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance2 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance3 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance4 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-  }
+      let postController1 = container.lookup('controller:post');
+      let postController2 = container.lookup('controller:post', {
+        singleton: false,
+      });
+      let postController3 = container.lookup('controller:post', {
+        singleton: false,
+      });
+      let postController4 = container.lookup('controller:post');
 
-  ['@test lookup returns a fresh instance if singleton: false is passed as an option to register'](
-    assert
-  ) {
-    class TestFactory {
-      constructor(opts) {
-        Object.assign(this, opts);
-      }
-      static create(opts) {
-        return new this(opts);
-      }
-    }
+      assert.equal(
+        postController1.toString(),
+        postController4.toString(),
+        'Singleton factories looked up normally return the same value'
+      );
+      assert.notEqual(
+        postController1.toString(),
+        postController2.toString(),
+        'Singleton factories are not equal to factories looked up with singleton: false'
+      );
+      assert.notEqual(
+        postController2.toString(),
+        postController3.toString(),
+        'Two factories looked up with singleton: false are not equal'
+      );
+      assert.notEqual(
+        postController3.toString(),
+        postController4.toString(),
+        'A singleton factory looked up after a factory called with singleton: false is not equal'
+      );
 
-    let registry = new Registry();
-    let container = registry.container();
-    registry.register('thing:test/obj', TestFactory, { singleton: false });
-
-    let instance1 = container.lookup('thing:test/obj');
-    let instance2 = container.lookup('thing:test/obj');
-    let instance3 = container.lookup('thing:test/obj');
-
-    assert.ok(instance1 !== instance2, 'each lookup is a different instance');
-    assert.ok(instance2 !== instance3, 'each lookup is a different instance');
-    assert.ok(instance1 !== instance3, 'each lookup is a different instance');
-    assert.ok(
-      instance1 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance2 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance3 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-  }
+      assert.ok(
+        postController1 instanceof PostController,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        postController2 instanceof PostController,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        postController3 instanceof PostController,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        postController4 instanceof PostController,
+        'All instances are instances of the registered factory'
+      );
+    }
 
-  ['@test lookup returns a singleton instance if singleton: true is passed as an option even if registered as singleton: false'](
-    assert
-  ) {
-    class TestFactory {
-      constructor(opts) {
-        Object.assign(this, opts);
+    ['@test lookup returns a fresh instance if singleton: false is passed as an option to lookup'](
+      assert
+    ) {
+      class TestFactory {
+        constructor(opts) {
+          Object.assign(this, opts);
+        }
+        static create(opts) {
+          return new this(opts);
+        }
       }
-      static create(opts) {
-        return new this(opts);
+
+      let registry = new Registry();
+      let container = registry.container();
+      registry.register('thing:test/obj', TestFactory);
+
+      let instance1 = container.lookup('thing:test/obj');
+      let instance2 = container.lookup('thing:test/obj', {
+        singleton: false,
+      });
+      let instance3 = container.lookup('thing:test/obj', {
+        singleton: false,
+      });
+      let instance4 = container.lookup('thing:test/obj');
+
+      assert.ok(
+        instance1 === instance4,
+        'factories looked up up without singleton: false are the same instance'
+      );
+      assert.ok(
+        instance1 !== instance2,
+        'factories looked up with singleton: false are a different instance'
+      );
+      assert.ok(
+        instance2 !== instance3,
+        'factories looked up with singleton: false are a different instance'
+      );
+      assert.ok(
+        instance3 !== instance4,
+        'factories looked up after a call to singleton: false is a different instance'
+      );
+      assert.ok(
+        instance1 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance2 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance3 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance4 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+    }
+
+    ['@test lookup returns a fresh instance if singleton: false is passed as an option to register'](
+      assert
+    ) {
+      class TestFactory {
+        constructor(opts) {
+          Object.assign(this, opts);
+        }
+        static create(opts) {
+          return new this(opts);
+        }
       }
+
+      let registry = new Registry();
+      let container = registry.container();
+      registry.register('thing:test/obj', TestFactory, { singleton: false });
+
+      let instance1 = container.lookup('thing:test/obj');
+      let instance2 = container.lookup('thing:test/obj');
+      let instance3 = container.lookup('thing:test/obj');
+
+      assert.ok(instance1 !== instance2, 'each lookup is a different instance');
+      assert.ok(instance2 !== instance3, 'each lookup is a different instance');
+      assert.ok(instance1 !== instance3, 'each lookup is a different instance');
+      assert.ok(
+        instance1 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance2 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance3 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
     }
 
-    let registry = new Registry();
-    let container = registry.container();
-    registry.register('thing:test/obj', TestFactory, { singleton: false });
-
-    let instance1 = container.lookup('thing:test/obj');
-    let instance2 = container.lookup('thing:test/obj', { singleton: true });
-    let instance3 = container.lookup('thing:test/obj', { singleton: true });
-    let instance4 = container.lookup('thing:test/obj');
-
-    assert.ok(instance1 !== instance2, 'each lookup is a different instance');
-    assert.ok(instance2 === instance3, 'each singleton: true lookup is the same instance');
-    assert.ok(instance3 !== instance4, 'each lookup is a different instance');
-    assert.ok(instance1 !== instance4, 'each lookup is a different instance');
-    assert.ok(
-      instance1 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance2 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance3 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
-    assert.ok(
-      instance4 instanceof TestFactory,
-      'All instances are instances of the registered factory'
-    );
+    ['@test lookup returns a singleton instance if singleton: true is passed as an option even if registered as singleton: false'](
+      assert
+    ) {
+      class TestFactory {
+        constructor(opts) {
+          Object.assign(this, opts);
+        }
+        static create(opts) {
+          return new this(opts);
+        }
+      }
+
+      let registry = new Registry();
+      let container = registry.container();
+      registry.register('thing:test/obj', TestFactory, { singleton: false });
+
+      let instance1 = container.lookup('thing:test/obj');
+      let instance2 = container.lookup('thing:test/obj', { singleton: true });
+      let instance3 = container.lookup('thing:test/obj', { singleton: true });
+      let instance4 = container.lookup('thing:test/obj');
+
+      assert.ok(instance1 !== instance2, 'each lookup is a different instance');
+      assert.ok(instance2 === instance3, 'each singleton: true lookup is the same instance');
+      assert.ok(instance3 !== instance4, 'each lookup is a different instance');
+      assert.ok(instance1 !== instance4, 'each lookup is a different instance');
+      assert.ok(
+        instance1 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance2 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance3 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+      assert.ok(
+        instance4 instanceof TestFactory,
+        'All instances are instances of the registered factory'
+      );
+    }
   }
-});
+);
 
 moduleFor(
   'Container',

From 9a618f7305291ebf7b91f07c941be7d59dad5e72 Mon Sep 17 00:00:00 2001
From: Stephen <stephen.c.weiss@gmail.com>
Date: Wed, 21 Apr 2021 10:53:13 -0500
Subject: [PATCH 0476/1405] make transition optional on setupController [19501]

In issue 19501 it was noted that transition was marked as required
on the API for the setupController (and would fail for Typescript
projects if not present).

This change makes transition optional as it is unused by
setupController and should therefore not break applications which
do not pass it in.

Removing the parameter would potentially break backwards
compatibility. As a compromise, it's marked as optional only.
---
 packages/@ember/-internals/routing/lib/system/route.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 60b87e409ea..84b7041e1e1 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1335,11 +1335,11 @@ class Route extends EmberObject implements IRoute {
     @method setupController
     @param {Controller} controller instance
     @param {Object} model
-    @param {Object} transition
+    @param {Transition} [transition]
     @since 1.0.0
     @public
   */
-  setupController(controller: Controller, context: {}, _transition: Transition) {
+  setupController(controller: Controller, context: {}, _transition?: Transition) {
     // eslint-disable-line no-unused-vars
     if (controller && context !== undefined) {
       set(controller, 'model', context);

From 62e28165afc0d6d3b7c0a8d81b9465cad7cbad3f Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 20 Apr 2021 01:34:20 -0700
Subject: [PATCH 0477/1405] [BUGFIX beta] [DEPRECATION] Deprecate
 `@foo={{helper}}`

Per [RFC 496](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#3-no-implicit-invocation-of-argument-less-helpers),
this commit deprecates the implicit invocation of argument-less
helpers and requires explicit parenthesis if:

1. Non-strict mode, AND
2. `helper` is a free variable (not `this.helper`, `@helper` or
   a local variable), AND
3. No arguments are provided to the helper, AND
4. It's in a component invocation's named argument position (not
   `<div id={{helper}}>` or `<Foo bar={{helper}}>`), AND
5. Not parenthesized (not `@foo={{(helper)}}`), AND
6. Not interpolated (not `@foo="{{helper}}"`).

The cases in real apps where all of the above are true should be
quite rare, as most helpers take at least one argument.

This is probably not the most efficient/minimal changes to the
compiler infrastructure, but I chose to optimize for making the
change easier to remove/rollback (i.e. adding new nodes instead
of changing existing ones) as we won't be needing this for very
long.

This also bumps `@glimmer/*` to latest which also brings in the
bugfix commit https://github.com/glimmerjs/glimmer-vm/pull/1293.
---
 package.json                                  |  26 +-
 .../-internals/glimmer/lib/environment.ts     |   8 +
 .../integration/application/engine-test.js    |   4 +-
 .../integration/application/rendering-test.js |  10 +-
 .../components/curly-components-test.js       |   2 +-
 .../link-to/query-params-angle-test.js        |   4 +-
 .../components/link-to/routing-angle-test.js  |   2 +-
 .../template-only-components-test.js          |   2 +-
 .../custom-modifier-manager-test.js           |  22 +-
 .../integration/helpers/custom-helper-test.js | 107 ++++++-
 .../tests/integration/helpers/yield-test.js   |  22 ++
 .../tests/integration/syntax/each-test.js     |   4 +-
 .../tests/integration/syntax/let-test.js      |   6 +-
 .../tests/integration/syntax/with-test.js     |   6 +-
 yarn.lock                                     | 262 +++++++++---------
 15 files changed, 321 insertions(+), 166 deletions(-)

diff --git a/package.json b/package.json
index cc05ff66278..0f3f175b7f6 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.77.5",
+    "@glimmer/vm-babel-plugins": "0.78.2",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.77.5",
+    "@glimmer/compiler": "0.78.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.77.5",
-    "@glimmer/interfaces": "0.77.5",
-    "@glimmer/manager": "0.77.5",
-    "@glimmer/destroyable": "0.77.5",
-    "@glimmer/owner": "0.77.5",
-    "@glimmer/node": "0.77.5",
-    "@glimmer/opcode-compiler": "0.77.5",
-    "@glimmer/program": "0.77.5",
-    "@glimmer/reference": "0.77.5",
-    "@glimmer/runtime": "0.77.5",
-    "@glimmer/validator": "0.77.5",
+    "@glimmer/global-context": "0.78.2",
+    "@glimmer/interfaces": "0.78.2",
+    "@glimmer/manager": "0.78.2",
+    "@glimmer/destroyable": "0.78.2",
+    "@glimmer/owner": "0.78.2",
+    "@glimmer/node": "0.78.2",
+    "@glimmer/opcode-compiler": "0.78.2",
+    "@glimmer/program": "0.78.2",
+    "@glimmer/reference": "0.78.2",
+    "@glimmer/runtime": "0.78.2",
+    "@glimmer/validator": "0.78.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 5e420176c3a..847642050f0 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -116,6 +116,14 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
       enabled: '3.26.0',
     },
   },
+  {
+    id: 'argument-less-helper-paren-less-invocation',
+    until: '4.0.0',
+    for: 'ember-source',
+    since: {
+      enabled: '3.27.0',
+    },
+  },
 ];
 
 const VM_ASSERTION_OVERRIDES: { id: string; message: string }[] = [];
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index b0e8c891186..49f3499b046 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -294,7 +294,7 @@ moduleFor(
     `);
 
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.add('template:application', sharedTemplate);
@@ -345,7 +345,7 @@ moduleFor(
       this.assert.expect(2);
 
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       let sharedLayout = compile(strip`
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 2198da8943c..ec4ff535dbb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -107,7 +107,7 @@ moduleFor(
 
     ['@test it can access the model provided by the route via implicit this fallback']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.add(
@@ -143,7 +143,7 @@ moduleFor(
 
     async ['@test interior mutations on the model with set'](assert) {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.router.map(function () {
@@ -204,7 +204,7 @@ moduleFor(
 
     async ['@test interior mutations on the model with tracked properties'](assert) {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       class Model {
@@ -272,7 +272,7 @@ moduleFor(
 
     async ['@test exterior mutations on the model with set'](assert) {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.router.map(function () {
@@ -333,7 +333,7 @@ moduleFor(
 
     async ['@test exterior mutations on the model with tracked properties'](assert) {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.router.map(function () {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 032cfa50f03..712f68f7d4e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3883,7 +3883,7 @@ moduleFor(
 
     ['@test can use `{{component.foo}}` in a template GH#19313']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.registerComponent('foo-bar', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index ab8467d9007..47ad96e478f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -144,7 +144,7 @@ moduleFor(
     ) {
       this.addTemplate(
         'index',
-        `<LinkTo id='the-link' @route='index' @query={{hash}}>Index</LinkTo>`
+        `<LinkTo id='the-link' @route='index' @query={{(hash)}}>Index</LinkTo>`
       );
 
       await this.visit('/');
@@ -163,7 +163,7 @@ moduleFor(
     async [`@test it doesn't update controller QP properties on current route when invoked (empty query-params obj, inferred route)`](
       assert
     ) {
-      this.addTemplate('index', `<LinkTo id='the-link' @query={{hash}}>Index</LinkTo>`);
+      this.addTemplate('index', `<LinkTo id='the-link' @query={{(hash)}}>Index</LinkTo>`);
 
       await this.visit('/');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 65eec9a144e..60ac6577dac 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -2085,7 +2085,7 @@ moduleFor(
 
       this.addTemplate(
         'index',
-        `<LinkTo id='the-link' @route='index' @query={{hash}}>Index</LinkTo>`
+        `<LinkTo id='the-link' @route='index' @query={{(hash)}}>Index</LinkTo>`
       );
 
       await this.visit('/');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 494072aa523..22896382648 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -198,7 +198,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
 
       ['@test it renders named arguments as reflected properties']() {
         expectDeprecation(
-          /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+          /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
         );
 
         this.registerTemplateOnlyComponent('foo-bar', '|{{foo}}|{{this.bar}}|');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 508dfc567ed..51f639d9e18 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -1,5 +1,11 @@
 import { DEBUG } from '@glimmer/env';
-import { moduleFor, RenderingTestCase, runTask, defineSimpleModifier } from 'internal-test-helpers';
+import {
+  moduleFor,
+  RenderingTestCase,
+  runTask,
+  defineSimpleHelper,
+  defineSimpleModifier,
+} from 'internal-test-helpers';
 
 import { Component } from '@ember/-internals/glimmer';
 import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
@@ -644,6 +650,20 @@ moduleFor(
         });
       }, /Cannot use the \(modifier\) keyword yet, as it has not been implemented/);
     }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a dynamic modifier with a nested dynamic helper'() {
+      let foo = defineSimpleHelper(() => 'Hello, world!');
+      let bar = defineSimpleModifier((element, [value]) => (element.innerHTML = value));
+
+      this.registerComponent('baz', {
+        template: '<div {{this.bar (this.foo)}}></div>',
+        ComponentClass: Component.extend({ tagName: '', foo, bar }),
+      });
+
+      this.render('<Baz/>');
+      this.assertHTML('<div>Hello, world!</div>');
+      this.assertStableRerender();
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index ba4bb014444..dcba0e131bf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -36,7 +36,7 @@ moduleFor(
 
     ['@test it does not resolve helpers with a `.` (period)']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.registerHelper('hello.world', () => 'hello world');
@@ -826,6 +826,20 @@ moduleFor(
       }, /Cannot use the \(helper\) keyword yet, as it has not been implemented/);
     }
 
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a dynamic helper with nested helpers'() {
+      let foo = defineSimpleHelper(() => 'world!');
+      let bar = defineSimpleHelper((value) => 'Hello, ' + value);
+
+      this.registerComponent('baz', {
+        template: '{{this.bar (this.foo)}}',
+        ComponentClass: Component.extend({ foo, bar }),
+      });
+
+      this.render('<Baz/>');
+      this.assertText('Hello, world!');
+      this.assertStableRerender();
+    }
+
     ['@test helpers are not computed eagerly when used with if expressions'](assert) {
       this.registerHelper('is-ok', () => 'hello');
       this.registerHelper('throws-error', () => assert.ok(false, 'helper was computed eagerly'));
@@ -909,4 +923,95 @@ if (DEBUG) {
       }
     }
   );
+
+  moduleFor(
+    'Helpers test: argument-less helper invocation in named arguments position',
+    class extends RenderingTestCase {
+      constructor() {
+        super(...arguments);
+
+        this.registerComponent('bar', {
+          template: '[{{is-string @content}}][{{@content}}]',
+        });
+
+        this.registerHelper('is-string', ([value]) => typeof value === 'string');
+      }
+
+      ['@test invoking an argument-less helper without parens in named argument position is deprecated']() {
+        this.registerHelper('foo', () => 'Hello, world!');
+
+        expectDeprecation(
+          () => this.render('<Bar @content={{foo}} />', { foo: 'Not it!' }),
+          new RegExp(
+            /The `foo` helper was used in the `-top-level` template as /.source +
+              /`@content={{foo}}`\. This is ambigious between wanting the `@content` /.source +
+              /argument to be the `foo` helper itself, or the result of invoking the /.source +
+              /`foo` helper \(current behavior\)\. This implicit invocation behavior /.source +
+              /has been deprecated\./.source
+          )
+        );
+
+        this.assertText('[true][Hello, world!]');
+        this.assertStableRerender();
+      }
+
+      ['@test invoking an argument-less helper with parens in named argument position is not deprecated']() {
+        this.registerHelper('foo', () => 'Hello, world!');
+
+        expectNoDeprecation(() => this.render('<Bar @content={{(foo)}} />', { foo: 'Not it!' }));
+
+        this.assertText('[true][Hello, world!]');
+        this.assertStableRerender();
+      }
+
+      ['@test invoking an argument-less helper with quotes in named argument position is not deprecated']() {
+        this.registerHelper('foo', () => 'Hello, world!');
+
+        expectNoDeprecation(() => this.render('<Bar @content="{{foo}}" />', { foo: 'Not it!' }));
+
+        this.assertText('[true][Hello, world!]');
+        this.assertStableRerender();
+      }
+
+      ['@test passing a local helper in named argument position is not deprecated']() {
+        let foo = defineSimpleHelper(() => 'Hello, world!');
+
+        expectNoDeprecation(() =>
+          this.render(`{{#let this.foo as |foo|}}<Bar @content={{foo}} />{{/let}}`, { foo })
+        );
+
+        this.assertText('[false][Hello, world!]');
+        this.assertStableRerender();
+      }
+
+      // TODO: this one really should work, and there is a passing test in glimmer-vm,
+      // but somehow it doesn't work here. This is almost certainly a VM bug as something
+      // is trying to call `block.compile()` but `block` is the reference for `this.foo`.
+      // So the execution stack is probably off-by-one or something.
+
+      ['@test invoking a local helper with parens in named argument position is not deprecated']() {
+        let foo = defineSimpleHelper(() => 'Hello, world!');
+
+        expectNoDeprecation(() =>
+          this.render(`{{#let this.foo as |foo|}}<Bar @content={{(foo)}} />{{/let}}`, { foo })
+        );
+
+        this.assertText('[true][Hello, world!]');
+        this.assertStableRerender();
+      }
+
+      // TODO: this one doesn't work yet, and there is a failing test in glimmer-vm
+
+      ['@skip invoking a helper with quotes in named argument position is not deprecated']() {
+        let foo = defineSimpleHelper(() => 'Hello, world!');
+
+        expectNoDeprecation(() =>
+          this.render(`{{#let this.foo as |foo|}}<Bar @content="{{foo}}" />{{/let}}`, { foo })
+        );
+
+        this.assertText('[true][Hello, world!]');
+        this.assertStableRerender();
+      }
+    }
+  );
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
index 82a4d2f7d35..b444d3097e7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
@@ -53,6 +53,28 @@ moduleFor(
       this.assertText('[In layout:] [In block:] Seattle');
     }
 
+    ['@feature(EMBER_NAMED_BLOCKS) <:else> and <:inverse> named blocks']() {
+      this.registerComponent('yielder', {
+        template:
+          '[:else][{{has-block "else"}}][{{yield to="else"}}]' +
+          '[:inverse][{{has-block "inverse"}}][{{yield to="inverse"}}]',
+      });
+
+      this.render(
+        '[<Yielder />]' +
+          '[<Yielder><:else>Hello</:else></Yielder>]' +
+          '[<Yielder><:inverse>Goodbye</:inverse></Yielder>]'
+      );
+
+      this.assertText(
+        '[[:else][false][][:inverse][false][]]' +
+          '[[:else][true][Hello][:inverse][true][Hello]]' +
+          '[[:else][true][Goodbye][:inverse][true][Goodbye]]'
+      );
+
+      this.assertStableRerender();
+    }
+
     ['@test templates should yield to block inside a nested component']() {
       this.registerComponent('outer-comp', {
         template: '<div>[In layout:] {{yield}}</div>',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 33bac1c5f01..07a9ebb3f79 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -732,7 +732,7 @@ class EachTest extends AbstractEachTest {
 
   ['@test the scoped variable is not available outside the {{#each}} block.']() {
     expectDeprecation(
-      /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
     );
 
     this.makeList(['Yehuda']);
@@ -953,7 +953,7 @@ class EachTest extends AbstractEachTest {
 
   ['@test the scoped variable is not available outside the {{#each}} block']() {
     expectDeprecation(
-      /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+      /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
     );
 
     let first = this.createList(['Limbo']);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index 1bb3d50eed6..a08c411f2a9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -97,7 +97,7 @@ moduleFor(
 
     ['@test the scoped variable is not available outside the {{#let}} block.']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.render(`{{name}}-{{#let this.other as |name|}}{{name}}{{/let}}-{{name}}`, {
@@ -247,7 +247,7 @@ moduleFor(
 
     ['@test the scoped variable is not available outside the {{#let}} block']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.render(
@@ -332,7 +332,7 @@ moduleFor(
 
     ['@test nested {{#let}} blocks should have access to root context']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.render(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
index a99458c9c43..b3e44698d1d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
@@ -106,7 +106,7 @@ moduleFor(
 
     ['@test the scoped variable is not available outside the {{#with}} block.']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.render(`{{name}}-{{#with this.other as |name|}}{{name}}{{/with}}-{{name}}`, {
@@ -295,7 +295,7 @@ moduleFor(
 
     ['@test the scoped variable is not available outside the {{#with}} block']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.render(
@@ -380,7 +380,7 @@ moduleFor(
 
     ['@test nested {{#with}} blocks should have access to root context']() {
       expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in a template for the `[^`]+` component without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
+        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
       );
 
       this.render(
diff --git a/yarn.lock b/yarn.lock
index b387ddcfff1..ea432d8bb53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,194 +1588,194 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.77.5.tgz#f12cf9cff8b8a8c94e8edffa6f967caf3ff92776"
-  integrity sha512-WXNfEtqmoAur2+aU0qZnE1cK6GVucwUlCHJd6756FrFxTcayl/Zj6+Ti5yfTSnqXnYo2rRWn0FCc/WZ0wGlTGw==
-  dependencies:
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/syntax" "0.77.5"
-    "@glimmer/util" "0.77.5"
-    "@glimmer/wire-format" "0.77.5"
+"@glimmer/compiler@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.78.2.tgz#b02d4f1027770446637ffcce41bb5dfc71076c82"
+  integrity sha512-tI0vkwz4qxsTsOOrbJpXZiOQvDwl5dOyPbeq5Z0Fca1byaAPhxPgq+lvuSny0bDYz+T+NGS0B+9MB4yLMnCl7Q==
+  dependencies:
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/syntax" "0.78.2"
+    "@glimmer/util" "0.78.2"
+    "@glimmer/wire-format" "0.78.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.77.5.tgz#c55089f2007a42a59058784d75b30784ed138bc7"
-  integrity sha512-s8cVbb+WlE6tTpwRhzOhlwO9PSokjC3s7wzkD6gHCQIPQivc8BHqZ2czUWfQFhHZdYVk4dg04pFMq+y8m3qC0Q==
+"@glimmer/destroyable@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.78.2.tgz#13a3eab3397f25b1a52e7dc3f9f81cf7ceec621c"
+  integrity sha512-cZ+fXp4PPf9CkDV8GY8A8sd5IJ367uEDk99n0DNBLcypeZU0REb8rCIV/GzJoCUcCnT9FzDXuFGgelp23x2tFw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.77.5"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/util" "0.77.5"
+    "@glimmer/global-context" "0.78.2"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/util" "0.78.2"
 
-"@glimmer/encoder@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.77.5.tgz#40dd91417998c7f1c6b1fa947fa881a598250bc3"
-  integrity sha512-BJpuFi78T9U8g5ix5R99kYhB4m5hQRfB0femrvGhECyhtOZJ+Y797uuOaSqmGTYTY8VIhvxEao6YRaKly0K3mw==
+"@glimmer/encoder@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.78.2.tgz#39a4f8223cd7819417909d4a7c86c9e31bb1eef5"
+  integrity sha512-3V+DYqLf5sY8ehV4qaeACqpy8i1pjP0zGlsxiaFb3LdfIbfuzrNxE1JQGvN/60urqhKqGeeIk+e/Y2879voVbw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/vm" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/vm" "0.78.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.77.5.tgz#ff72f216cd39f7e7923d54f3bb0862910070a9cc"
-  integrity sha512-kWHYjOyhYeyBEEuu3gMJsLO9WxFlXFFeWmtk2raWkJ37TndZNUFMQt6C0yOyT/AkXUJH5+1W7XSia1P3TB6CKw==
+"@glimmer/global-context@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.78.2.tgz#3443b000e8617da39202d5319db881ff59a2f248"
+  integrity sha512-om0ryTEqER1ZZKD9TLBJlPm/M3z9EwHMR22luufPKZ1la8RrDQpGPMh32a8QzWnOyigiv2NXIfuUiSh5OGR/BA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.77.5.tgz#74c791ba4712588f2e7b65669d90e8d349eee30a"
-  integrity sha512-ahiZX2EG2w1DrXmIxjzmkRrAeRJS+y35YTXhP82/NSyLiS2g7NTgYbqXpsS+VfvYRZ2+EbeXzY7cTe8mN4OUxg==
+"@glimmer/interfaces@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.78.2.tgz#4dafd7f7abaf03f5a9b5d2192205ad007550ca36"
+  integrity sha512-OM1zJHNioKwd+7PM+mt28Ine9QfZLI7bwDOgB1Y+lHEZ0OdAGu6m351RBrXfQEgDCoVSFPQpOtUpWLP/FU3Utw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/low-level@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.77.5.tgz#f198acd9c6b5f39da07756db32f11cf0f8714f7e"
-  integrity sha512-A+bNz17vBcTe0qn38q0sdDldCj4gKdFllw8lRHms2Xn50xc+e0uQ00sFFVBT51XDrKiX6u+U72sVnBrUYCbGXg==
+"@glimmer/low-level@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
+  integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.77.5.tgz#dfbd94a2f47640f8d6fcdf67bb8cc8e995c835f8"
-  integrity sha512-neURL3qGaDuiq/8YYE4F2reGnS42vMjgYcJjP00eY/pBHfOY6icPR1oPwGmTt8Qr6topGc3FmUaUWDXPt0Lnkg==
+"@glimmer/manager@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.78.2.tgz#5c1d0fc24225f9546b182cab6d8ea800135bf86b"
+  integrity sha512-mHTtPJXf7uYVOsHSrLQEcv0nxGj9M2Rmks60hWKxk/pdNwt12FzRElMqyyj1j9lSbUj+LOpt9g+IZYu03w4O8g==
   dependencies:
-    "@glimmer/destroyable" "0.77.5"
+    "@glimmer/destroyable" "0.78.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/reference" "0.77.5"
-    "@glimmer/util" "0.77.5"
-    "@glimmer/validator" "0.77.5"
-
-"@glimmer/node@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.77.5.tgz#6bb693744d612a770d106b69d2803c2423c15868"
-  integrity sha512-BBM32C5GldOFxUbV2XljwoNmOGP9YobJF9WEW1zVkbggDZcGH090VwbTErrXVv8aw987fGXqei0UCFGleOXu1A==
-  dependencies:
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/runtime" "0.77.5"
-    "@glimmer/util" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/reference" "0.78.2"
+    "@glimmer/util" "0.78.2"
+    "@glimmer/validator" "0.78.2"
+
+"@glimmer/node@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.78.2.tgz#a27bd6d5ef188ea4892bc6953a62fc165a173893"
+  integrity sha512-e5mc63xbvix6qRwGLWrc5zYi0PSN5bUUlx6SWCxItObht7i7TpkylYo3y4bDZc2LqfkTN8e8dIyPqfF2dZsLsQ==
+  dependencies:
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/runtime" "0.78.2"
+    "@glimmer/util" "0.78.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.77.5.tgz#088f946587c905fcb37a6516df5cb858fc177d7c"
-  integrity sha512-qJYdDeJFch2BGpYWmZ0klExsBvu6bZYoNyRtzUmuA0+xzT2I1HdwrTpekkAHVDfB0rfHArHmcimTxgFF15o4Mg==
+"@glimmer/opcode-compiler@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.78.2.tgz#c5199fa02a7e36dbe62e4387bf37d54b1f2c33c7"
+  integrity sha512-WEmeMZMt3nD8jcUlAYLuW6xVB0uOBkyGAUHU7SHcldnfdP3GTilyPO3OzRC9ksEHK/bwtFelrbwu5tpPH1RgvQ==
   dependencies:
-    "@glimmer/encoder" "0.77.5"
+    "@glimmer/encoder" "0.78.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/reference" "0.77.5"
-    "@glimmer/util" "0.77.5"
-    "@glimmer/vm" "0.77.5"
-    "@glimmer/wire-format" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/reference" "0.78.2"
+    "@glimmer/util" "0.78.2"
+    "@glimmer/vm" "0.78.2"
+    "@glimmer/wire-format" "0.78.2"
 
-"@glimmer/owner@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.77.5.tgz#d81933f3d6c4c0feafcf3d972cc7edca00532a5b"
-  integrity sha512-0jPDb63qBNN20QkVprIuennHP1Vf3fWCQNtuVOYsDOjyV2RIlrOwTVLuFIpua86nSBRQq7gH411ZyEpoq6H3Cg==
+"@glimmer/owner@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.78.2.tgz#15e0adf8e2fef7045674e67627fa48d4b8df877e"
+  integrity sha512-02I4O5kgmQasE5vbmRY/3F6ZshPURAWtZgvCR5+YHgGo+Jt1UBMaLLDtbg8ldPDc5muUmonA3ZXIYmm1F4wTSw==
   dependencies:
-    "@glimmer/util" "0.77.5"
+    "@glimmer/util" "0.78.2"
 
-"@glimmer/program@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.77.5.tgz#53ce8da78377b255a22eb1d86eb5e6a837393305"
-  integrity sha512-19rWpeqqK7UF6CT9G+A7TOnWeoIlT8wCF4gKQNRbp2sbUugJ0PyTn7VzZTLAc110F0ohFlv17yKIrDBoPytHDw==
+"@glimmer/program@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.78.2.tgz#c38f2f55005b3c2e8f1a4825aacc2ffd6891d9a1"
+  integrity sha512-6ZeCSwqnC0mMzfHwbToTX/LC6HeUm2UMAaMri7WIh9ncNetCfKqBXRdFIKepG7fnWEADuCwE/+r6e2Qq2x3dNQ==
   dependencies:
-    "@glimmer/encoder" "0.77.5"
+    "@glimmer/encoder" "0.78.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/manager" "0.77.5"
-    "@glimmer/opcode-compiler" "0.77.5"
-    "@glimmer/util" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/manager" "0.78.2"
+    "@glimmer/opcode-compiler" "0.78.2"
+    "@glimmer/util" "0.78.2"
 
-"@glimmer/reference@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.77.5.tgz#54eac6b00bd06cb84ff8c9f854d9a7811f2c298f"
-  integrity sha512-L432i/VD4Kud8qsvPs3bY12hjkKOjfqH1tyGnjfdNAip/k6Z7GIuFDi+T/lJOLWLFONh4414KDopTysBXx9USw==
+"@glimmer/reference@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.78.2.tgz#dbffbeb4bc42f64f57104eebab0eb4ef7778d989"
+  integrity sha512-vUk20mKknDqtQEWfGbDwU9eh+XVztUUuww6V6/UKm8JokBDjGkdt4w74R2wvPIrDZYkfXErZjXwY8Ltu1lBV0A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.77.5"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/util" "0.77.5"
-    "@glimmer/validator" "0.77.5"
+    "@glimmer/global-context" "0.78.2"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/util" "0.78.2"
+    "@glimmer/validator" "0.78.2"
 
-"@glimmer/runtime@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.77.5.tgz#6b936da4e2f37cd3994626efa672b15c715ae0f8"
-  integrity sha512-rLzXY2IFw7yzsvOwy/3eLxoza9Y9vx52bivlZJ9+8AWCtn4ywNGOKwvv4i8Mf1EMXtvo3nZHC9yIwfpUJg8NLg==
+"@glimmer/runtime@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.78.2.tgz#e8d8de5b1c74f2aeaa129b43d264ff36de4de5a1"
+  integrity sha512-pzndIFJl2ycVAAnaFNm2MLwDTKymn03a+xAtHpsFwEZQ3EE2wQNnEKyBDI5SkNRShD8nkbwodd0N+YwZdGDKHw==
   dependencies:
-    "@glimmer/destroyable" "0.77.5"
+    "@glimmer/destroyable" "0.78.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.77.5"
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/low-level" "0.77.5"
-    "@glimmer/owner" "0.77.5"
-    "@glimmer/program" "0.77.5"
-    "@glimmer/reference" "0.77.5"
-    "@glimmer/util" "0.77.5"
-    "@glimmer/validator" "0.77.5"
-    "@glimmer/vm" "0.77.5"
-    "@glimmer/wire-format" "0.77.5"
+    "@glimmer/global-context" "0.78.2"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/low-level" "0.78.2"
+    "@glimmer/owner" "0.78.2"
+    "@glimmer/program" "0.78.2"
+    "@glimmer/reference" "0.78.2"
+    "@glimmer/util" "0.78.2"
+    "@glimmer/validator" "0.78.2"
+    "@glimmer/vm" "0.78.2"
+    "@glimmer/wire-format" "0.78.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.77.5.tgz#b841803dd54ea86de7e8ae8850b3760000033bf2"
-  integrity sha512-FRb1onDsP9P2CnbwTyKF91QYIbRJ0svALG7TnAJlUjQU9E4lWdI5lf7vPRh45A4W1rjcAcIcuiIS6oGrdEkhuQ==
+"@glimmer/syntax@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.78.2.tgz#3be25df8c7b7564d94d204ac0ab0c9717abe9043"
+  integrity sha512-B6OgBtUFo+K0sA+72sNQOs//TKJIZdAPUAIQGjZWsfGZGpzlFx3kuouKeK1DCtXxRIktqSDpmXFcPNKd1OqbOw==
   dependencies:
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/util" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/util" "0.78.2"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.77.5.tgz#b4e2909d34eb7db34c63fd9d942e0ffa458d4c90"
-  integrity sha512-Y78NnJClpz7sBks3q+ZNNVfCjy8ALcCQOG5GEIm/P9O3+eXMBsx2ac9Umu4LBZqmeINQ9CtFz10u2BiyxOtSQg==
+"@glimmer/util@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.78.2.tgz#d6e7e363d198ef426858a3958170774b4548cce1"
+  integrity sha512-SqmlzdtXJwAhf5fhflFsoYuM3zk1M/8bamqGXQpCB5I40NpcshpFybY/ZMwIGsYOWEwIo/LDDC1UBZ3gyMPZzA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.77.5.tgz#a5e272d700f661aa0b2f350670974792b7785a49"
-  integrity sha512-LluyvxWTqys5ulkYA24sFDQ/obwOTwbLDakNBOlHvKdh814h+scz4y8bckx6qY7AsJObQgZVAg00r1Nlhfs6fQ==
+"@glimmer/validator@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.78.2.tgz#bc7f3cf376789d1090add73bed599e840697fdc8"
+  integrity sha512-pzdC9uPaQerOoPEeSV9U/oRbZtgTkL+BryGR8R534mhAFfVlzenAa4aavKZEcnIns73MNN/G1l2iYDmjSH/6Hg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.77.5"
+    "@glimmer/global-context" "0.78.2"
 
-"@glimmer/vm-babel-plugins@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.77.5.tgz#daffb6507aa6b08ec36f69d652897d339fdd0007"
-  integrity sha512-jTBM7fJMrIEy4/bCeI8e7ypR+AuWYzLA+KORCGbnTJtL/NYg4G8qwhQAZBtg1d3KmoqyqaCsyqE6f4/tzJO4eQ==
+"@glimmer/vm-babel-plugins@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.78.2.tgz#b530a19f54da385c7099a22cf348e9062d186838"
+  integrity sha512-GSEf16h6OCtKx7PsSvD21cLXZuVc6swW2rSOAvfLeZco1DEWMRgYTwkCkColydKZcQ3gvwbPBeYwTC2K6tlnjg==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.77.5.tgz#ff244acb0ce4a0076df01da8fdd37d690833e478"
-  integrity sha512-SsG/BEnM+ySk236UlHHoxYufdWwMSmr2RiapQp6O4pDzy7npkRebTYOzXCXpYrFkjDcTwPaygYCnr7RRFJXEUA==
+"@glimmer/vm@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.78.2.tgz#525589b4d3556eafea84a2b9c6e7aa72698bf5d6"
+  integrity sha512-x+0qn1B00i8Gcw3ptqEaGsIECG4M1IdmxtLSIr+Kfga/Da/PPLXJYQx+jk924rVCnad2FzxizhyKRxCqPbU+EA==
   dependencies:
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/util" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/util" "0.78.2"
 
-"@glimmer/wire-format@0.77.5":
-  version "0.77.5"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.77.5.tgz#326ae0e09d81182096c0e4efef7cc197d96081d4"
-  integrity sha512-/FyjStQtyHkCS8dOp7t79e+PIgEAF0yo9rxmazexl3Ie3ePE9qRxOQi/GKIxi1V1YGpxxv8Aq6wP8kteUzCDaQ==
+"@glimmer/wire-format@0.78.2":
+  version "0.78.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.78.2.tgz#32686633e66fe674ea39910d48e3db9ba524eadb"
+  integrity sha512-kd8xP9P7oo+F0EijG3/2YwzUXq/AESxPS2hadjmhu2uMZ+QOzgYbeo1xC2Ig7EkXhf1tdxlmVpCS4rwhCsxzXA==
   dependencies:
-    "@glimmer/interfaces" "0.77.5"
-    "@glimmer/util" "0.77.5"
+    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/util" "0.78.2"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From ddba13f3eadaa941250d0299a5c5957c3db17dd5 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 21 Apr 2021 23:33:24 -0700
Subject: [PATCH 0478/1405] CHANGELOG for v3.27.0-beta.4

(cherry picked from commit ecc9ee974cf8832ef35dde31dd4337e77b304abc)
---
 CHANGELOG.md | 6 ++++++
 package.json | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92b0da3b260..a613a9de12c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v3.27.0-beta.4 (April 21, 2021)
+
+- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX beta] [DEPRECATION] Deprecate `@foo={{helper}}`
+- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX beta] `<:else>` and `<:inverse>` should be aliases (see )
+- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX beta] Fix nested calls to helpers in dynamic helpers (see https://github.com/glimmerjs/glimmer-vm/pull/1293)
+
 ### v3.27.0-beta.3 (March 30, 2021)
 
 - [#19477](https://github.com/emberjs/ember.js/pull/19477) [BUGFIX] Move `LinkTo` assertion into a method so `LinkToExternal` can override it
diff --git a/package.json b/package.json
index 0f3f175b7f6..f5bc7a91dec 100644
--- a/package.json
+++ b/package.json
@@ -76,14 +76,14 @@
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
     "@glimmer/compiler": "0.78.2",
+    "@glimmer/destroyable": "0.78.2",
     "@glimmer/env": "^0.1.7",
     "@glimmer/global-context": "0.78.2",
     "@glimmer/interfaces": "0.78.2",
     "@glimmer/manager": "0.78.2",
-    "@glimmer/destroyable": "0.78.2",
-    "@glimmer/owner": "0.78.2",
     "@glimmer/node": "0.78.2",
     "@glimmer/opcode-compiler": "0.78.2",
+    "@glimmer/owner": "0.78.2",
     "@glimmer/program": "0.78.2",
     "@glimmer/reference": "0.78.2",
     "@glimmer/runtime": "0.78.2",

From e1323e283b0212ee037437722b4ebf98c67f8587 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 27 Apr 2021 11:02:55 -0700
Subject: [PATCH 0479/1405] [BUGFIX beta] Remove Namespace processing

Ember no longer uses Namespaces in the `toString` on classes, so there's
no reason to eagerly process namespaces on application boot. This is
currently triggering the deprecation message in new Ember applications
on Beta, so this removes it to prevent that.
---
 packages/@ember/application/lib/application.js | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 978a55d48d3..1a65185c961 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -5,14 +5,10 @@
 import { dictionary } from '@ember/-internals/utils';
 import { ENV } from '@ember/-internals/environment';
 import { hasDOM } from '@ember/-internals/browser-environment';
-import { assert, isTesting } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { join, once, run, schedule } from '@ember/runloop';
-import {
-  libraries,
-  processAllNamespaces,
-  setNamespaceSearchDisabled,
-} from '@ember/-internals/metal';
+import { libraries } from '@ember/-internals/metal';
 import { _loaded, runLoadHooks } from './lazy_load';
 import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher, jQuery, jQueryDisabled } from '@ember/-internals/views';
@@ -828,11 +824,6 @@ const Application = Engine.extend({
 
     try {
       // TODO: Is this still needed for _globalsMode = false?
-      if (!isTesting()) {
-        // Eagerly name all classes that are already loaded
-        processAllNamespaces();
-        setNamespaceSearchDisabled(true);
-      }
 
       // See documentation on `_autoboot()` for details
       if (this.autoboot) {
@@ -887,8 +878,6 @@ const Application = Engine.extend({
   willDestroy() {
     this._super(...arguments);
 
-    setNamespaceSearchDisabled(false);
-
     if (_loaded.application === this) {
       _loaded.application = undefined;
     }

From 42b8db02d79d547a76e6c08da6f6dbc72a7fc408 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 28 Apr 2021 16:45:25 +0000
Subject: [PATCH 0480/1405] Upgrade to GitHub-native Dependabot

---
 .github/dependabot.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..d3a05e83fe9
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 10
+  versioning-strategy: increase
+  ignore:
+  - dependency-name: github
+    versions:
+    - "> 0.2.4"
+  - dependency-name: ember-cli
+    versions:
+    - 3.25.0
+  - dependency-name: core-js
+    versions:
+    - 3.8.1
+    - 3.8.3
+  - dependency-name: broccoli-rollup
+    versions:
+    - 4.1.1
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10

From eb88fde44846dc0e4a20b16fb64ed562b7abe2d5 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 27 Apr 2021 14:44:01 -0700
Subject: [PATCH 0481/1405] Resolve types from external libraries

---
 package.json                                  |  2 +-
 .../-internals/views/lib/system/jquery.d.ts   |  2 ++
 packages/@ember/engine/index.d.ts             |  6 +++--
 packages/@ember/runloop/index.d.ts            | 26 +++++++++++--------
 ...ssert-against-dynamic-helpers-modifiers.ts |  2 +-
 .../plugins/assert-against-named-blocks.ts    |  2 +-
 .../assert-input-helper-without-block.ts      |  4 +--
 .../assert-reserved-named-arguments.ts        |  2 +-
 .../plugins/assert-splattribute-expression.ts |  2 +-
 .../lib/plugins/deprecate-send-action.ts      |  2 +-
 .../lib/plugins/deprecate-with.ts             |  2 +-
 .../lib/plugins/transform-attrs-into-args.ts  |  2 +-
 .../lib/plugins/transform-has-block-syntax.ts |  2 +-
 .../lib/plugins/transform-in-element.ts       |  2 +-
 .../lib/plugins/transform-link-to.ts          |  2 +-
 .../transform-old-class-binding-syntax.ts     |  4 +--
 .../lib/plugins/transform-resolutions.ts      |  4 +--
 .../lib/system/calculate-location-display.ts  |  2 +-
 .../lib/system/compile-options.ts             | 22 +++++++++-------
 .../ember-template-compiler/lib/types.d.ts    | 21 +++++++--------
 packages/ember/index.d.ts                     |  2 +-
 tsconfig.json                                 |  4 ---
 yarn.lock                                     |  8 +++---
 23 files changed, 67 insertions(+), 60 deletions(-)
 create mode 100644 packages/@ember/-internals/views/lib/system/jquery.d.ts

diff --git a/package.json b/package.json
index f5bc7a91dec..6cd42c30e89 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.686.0",
     "babel-template": "^6.26.0",
-    "backburner.js": "^2.6.0",
+    "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-persistent-filter": "^2.3.1",
diff --git a/packages/@ember/-internals/views/lib/system/jquery.d.ts b/packages/@ember/-internals/views/lib/system/jquery.d.ts
new file mode 100644
index 00000000000..717c57ab2ef
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/system/jquery.d.ts
@@ -0,0 +1,2 @@
+export let jQuery: any;
+export let jQueryDisabled: boolean;
diff --git a/packages/@ember/engine/index.d.ts b/packages/@ember/engine/index.d.ts
index 518a05dbebe..5d0bcebb6ca 100644
--- a/packages/@ember/engine/index.d.ts
+++ b/packages/@ember/engine/index.d.ts
@@ -1,7 +1,9 @@
-export { default as EngineInstance } from './instance';
+import EngineInstance from './instance';
+import { EngineInstanceOptions, Factory } from '@ember/-internals/owner';
+
 export function getEngineParent(instance: EngineInstance): EngineInstance | undefined;
 
-import { EngineInstanceOptions, Factory } from '@ember/-internals/owner';
+export { EngineInstance };
 
 export default class Engine {
   constructor(...args: any[]);
diff --git a/packages/@ember/runloop/index.d.ts b/packages/@ember/runloop/index.d.ts
index b7b9da7e5f7..fa5bea17840 100644
--- a/packages/@ember/runloop/index.d.ts
+++ b/packages/@ember/runloop/index.d.ts
@@ -1,21 +1,25 @@
-import { Backburner, DeferredActionQueues, Timer } from 'backburner.js';
+import Backburner, { DeferredActionQueues, Timer } from 'backburner.js';
 
 export const _backburner: Backburner;
 
-export const run = Backburner.run;
-export const schedule = Backburner.schedule;
-export const later = Backburner.later;
-export const join = Backburner.join;
-export const cancel = Backburner.cancel;
-export const scheduleOnce = Backburner.scheduleOnce;
+export const run: Backburner['run'];
+export const schedule: Backburner['schedule'];
+export const later: Backburner['later'];
+export const join: Backburner['join'];
+export const cancel: Backburner['cancel'];
+export const scheduleOnce: Backburner['scheduleOnce'];
 
 export function _getCurrentRunLoop(): DeferredActionQueues;
 
 export function once(method: Function): Timer;
-export function once<T, U extends keyof T>(target: T, method: U, ...args): Timer;
-export function once(target: unknown, method: unknown | Function, ...args): Timer;
+export function once<T, U extends keyof T>(target: T, method: U, ...args: any[]): Timer;
+export function once(target: unknown, method: unknown | Function, ...args: any[]): Timer;
 
 export function bind<T extends Function>(target: T): T;
-export function bind<T extends Function, U>(target: unknown, method?: T, ...args: U): T;
-export function bind<T>(target: unknown, method?: string, ...args: T): Function;
+export function bind<T extends Function, U extends any[]>(
+  target: unknown,
+  method?: T,
+  ...args: U
+): T;
+export function bind<T extends any[]>(target: unknown, method?: string, ...args: T): Function;
 export function bind<T>(target: unknown, method?: T, ...args: unknown[]): T;
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
index 5596042bae9..90907193513 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
@@ -7,7 +7,7 @@ import { isPath, trackLocals } from './utils';
 export default function assertAgainstDynamicHelpersModifiers(
   env: EmberASTPluginEnvironment
 ): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
   let { hasLocal, node } = trackLocals();
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
index 0910b606761..a1c8d6323ee 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
@@ -14,7 +14,7 @@ import { EmberASTPluginEnvironment } from '../types';
   @class AssertAgainstNamedBlocks
 */
 export default function assertAgainstNamedBlocks(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   return {
     name: 'assert-against-named-blocks',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
index b8a5fbe62e9..d2811bed62a 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
@@ -5,7 +5,7 @@ import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 export default function errorOnInputWithContent(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   return {
     name: 'assert-input-helper-without-block',
@@ -20,7 +20,7 @@ export default function errorOnInputWithContent(env: EmberASTPluginEnvironment):
   };
 }
 
-function assertMessage(moduleName: string, node: AST.BlockStatement): string {
+function assertMessage(moduleName: string | undefined, node: AST.BlockStatement): string {
   let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
 
   return `The {{input}} helper cannot be used in block form. ${sourceInformation}`;
diff --git a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
index 76e4344c008..31303396a8b 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
@@ -4,7 +4,7 @@ import calculateLocationDisplay from '../system/calculate-location-display';
 import { EmberASTPluginEnvironment } from '../types';
 
 export default function assertReservedNamedArguments(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   return {
     name: 'assert-reserved-named-arguments',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
index 79c03ae40d3..92ffcd722c4 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
@@ -4,7 +4,7 @@ import calculateLocationDisplay from '../system/calculate-location-display';
 import { EmberASTPluginEnvironment } from '../types';
 
 export default function assertSplattributeExpressions(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   return {
     name: 'assert-splattribute-expressions',
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
index 2b119ec4a55..8a7962172ed 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
@@ -18,7 +18,7 @@ const EVENTS = [
 
 export default function deprecateSendAction(env: EmberASTPluginEnvironment): ASTPlugin {
   if (SEND_ACTION) {
-    let { moduleName } = env.meta;
+    let moduleName = env.meta?.moduleName;
 
     let deprecationMessage = (node: AST.Node, eventName: string, actionName: string) => {
       let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
index 1420b72d9cc..9567a8a0eea 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
@@ -58,7 +58,7 @@ import { isPath } from './utils';
   @class DeprecateWith
 */
 export default function deprecateWith(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
   let { builders: b } = env.syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
index b04932d28a8..177887af5f0 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
@@ -29,7 +29,7 @@ import { EmberASTPluginEnvironment } from '../types';
 
 export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   let stack: string[][] = [[]];
 
diff --git a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
index 5bf41da1fa3..34ead65a659 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
@@ -32,7 +32,7 @@ const TRANSFORMATIONS: { [key: string]: string } = {
 
 export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   function emitDeprecationMessage(node: AST.Node, name: string) {
     let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 4c094518547..6ef1ba31c94 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -42,7 +42,7 @@ import { isPath } from './utils';
   @class TransformInElement
 */
 export default function transformInElement(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
   let { builders: b } = env.syntax;
 
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
index 5de93bfdbc3..3db2bc46455 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
@@ -43,7 +43,7 @@ function transformPositionalLinkToIntoNamedArguments(
   hasBlock = true
 ): AST.BlockStatement {
   let { builders: b } = env.syntax;
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
   let {
     params,
     hash: { pairs },
diff --git a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
index 805b0cecfad..19351f3c8db 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
@@ -5,7 +5,7 @@ import { Builders, EmberASTPluginEnvironment } from '../types';
 
 export default function transformOldClassBindingSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
   let b = env.syntax.builders;
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
 
   return {
     name: 'transform-old-class-binding-syntax',
@@ -25,7 +25,7 @@ export default function transformOldClassBindingSyntax(env: EmberASTPluginEnviro
 function process(
   b: Builders,
   node: AST.BlockStatement | AST.MustacheStatement,
-  moduleName: string
+  moduleName: string | undefined
 ) {
   let allOfTheMicrosyntaxes: AST.HashPair[] = [];
   let allOfTheMicrosyntaxIndexes: number[] = [];
diff --git a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
index 14f3849f1ce..6bea76e5bd9 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
@@ -65,7 +65,7 @@ const TARGETS = Object.freeze(['helper', 'modifier']);
 
 export default function transformResolutions(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
-  let { moduleName } = env.meta;
+  let moduleName = env.meta?.moduleName;
   let { hasLocal, node: tracker } = trackLocals();
   let seen: Set<AST.Node> | undefined;
 
@@ -155,7 +155,7 @@ function transformParams(
   b: EmberASTPluginEnvironment['syntax']['builders'],
   params: AST.Expression[],
   type: string,
-  moduleName: string,
+  moduleName: string | undefined,
   loc: AST.SourceLocation | undefined
 ): AST.Expression[] {
   let [first, ...rest] = params;
diff --git a/packages/ember-template-compiler/lib/system/calculate-location-display.ts b/packages/ember-template-compiler/lib/system/calculate-location-display.ts
index 9fbfc0b9552..f37c55c3404 100644
--- a/packages/ember-template-compiler/lib/system/calculate-location-display.ts
+++ b/packages/ember-template-compiler/lib/system/calculate-location-display.ts
@@ -1,7 +1,7 @@
 import { AST } from '@glimmer/syntax';
 
 export default function calculateLocationDisplay(
-  moduleName: string,
+  moduleName: string | undefined,
   loc?: AST.SourceLocation | undefined
 ): string {
   let moduleInfo = '';
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 1c15d6a19fa..1f4c3e67964 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,7 +1,6 @@
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
 import { assign } from '@ember/polyfills';
-import { PrecompileOptions } from '@glimmer/compiler';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
 import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index';
 import { EmberPrecompileOptions, PluginFunc } from '../types';
@@ -13,16 +12,18 @@ function malformedComponentLookup(string: string) {
   return string.indexOf('::') === -1 && string.indexOf(':') > -1;
 }
 
-export function buildCompileOptions(
-  _options: Partial<EmberPrecompileOptions>
-): EmberPrecompileOptions {
+export function buildCompileOptions(_options: EmberPrecompileOptions): EmberPrecompileOptions {
+  let moduleName = _options.moduleName;
   let options: EmberPrecompileOptions = assign(
     { meta: {}, isProduction: false, plugins: { ast: [] } },
     _options,
     {
+      moduleName,
       customizeComponentName(tagname: string): string {
         assert(
-          `You tried to invoke a component named <${tagname} /> in "${_options.moduleName}", but that is not a valid name for a component. Did you mean to use the "::" syntax for nested components?`,
+          `You tried to invoke a component named <${tagname} /> in "${
+            moduleName ?? '[NO MODULE]'
+          }", but that is not a valid name for a component. Did you mean to use the "::" syntax for nested components?`,
           !malformedComponentLookup(tagname)
         );
 
@@ -39,6 +40,7 @@ export function buildCompileOptions(
   // move `moduleName` into `meta` property
   if (options.moduleName) {
     let meta = options.meta;
+    assert('has meta', meta); // We just set it
     meta.moduleName = options.moduleName;
   }
 
@@ -53,7 +55,7 @@ export function transformsFor(options: EmberPrecompileOptions): readonly PluginF
 
 export default function compileOptions(
   _options: Partial<EmberPrecompileOptions> = {}
-): PrecompileOptions {
+): EmberPrecompileOptions {
   let options = buildCompileOptions(_options);
   let builtInPlugins = transformsFor(options);
 
@@ -61,22 +63,24 @@ export default function compileOptions(
     options.plugins = { ast: [...USER_PLUGINS, ...builtInPlugins] };
   } else {
     let potententialPugins = [...USER_PLUGINS, ...builtInPlugins];
+    assert('expected plugins', options.plugins);
     let providedPlugins = options.plugins.ast.map((plugin) => wrapLegacyPluginIfNeeded(plugin));
     let pluginsToAdd = potententialPugins.filter((plugin) => {
+      assert('expected plugins', options.plugins);
       return options.plugins.ast.indexOf(plugin) === -1;
     });
     options.plugins.ast = providedPlugins.concat(pluginsToAdd);
   }
 
-  // TODO: Fix the types here so that this conversion isn't necessary
-  return (options as unknown) as PrecompileOptions;
+  return options;
 }
 
 interface LegacyPlugin {
   transform(node: AST.Program): AST.Node;
   syntax: Syntax;
 }
-type LegacyPluginClass = new (env: ASTPluginEnvironment) => LegacyPlugin;
+
+export type LegacyPluginClass = new (env: ASTPluginEnvironment) => LegacyPlugin;
 
 function wrapLegacyPluginIfNeeded(_plugin: PluginFunc | LegacyPluginClass): PluginFunc {
   let plugin = _plugin;
diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts
index e211cb9442a..35cc1c710b1 100644
--- a/packages/ember-template-compiler/lib/types.d.ts
+++ b/packages/ember-template-compiler/lib/types.d.ts
@@ -1,10 +1,14 @@
-import { ASTPlugin, ASTPluginEnvironment, builders, PrecompileOptions } from '@glimmer/syntax';
-import { StaticTemplateMeta } from '@ember/-internals/views';
+import {
+  ASTPluginBuilder,
+  ASTPluginEnvironment,
+  builders,
+  PrecompileOptions,
+} from '@glimmer/syntax';
+import { LegacyPluginClass } from './system/compile-options';
 
 export type Builders = typeof builders;
 
-export interface PluginFunc {
-  (env: EmberASTPluginEnvironment): ASTPlugin;
+export interface PluginFunc extends ASTPluginBuilder<EmberASTPluginEnvironment> {
   __raw?: LegacyPluginClass;
 }
 
@@ -13,14 +17,9 @@ interface Plugins {
 }
 
 export interface EmberPrecompileOptions extends PrecompileOptions {
-  strictMode?: boolean;
-  locals?: string[];
-  customizeComponentName(tag: string): string;
-  isProduction: boolean;
-  contents?: string;
+  isProduction?: boolean;
   moduleName?: string;
-  plugins: Plugins;
-  meta: StaticTemplateMeta;
+  plugins?: Plugins;
 }
 
 export type EmberASTPluginEnvironment = ASTPluginEnvironment & EmberPrecompileOptions;
diff --git a/packages/ember/index.d.ts b/packages/ember/index.d.ts
index 46c2fa636e0..6544926d4c2 100644
--- a/packages/ember/index.d.ts
+++ b/packages/ember/index.d.ts
@@ -1,5 +1,5 @@
 declare module 'ember' {
-  declare const Ember: any;
+  const Ember: any;
 
   export default Ember;
 }
diff --git a/tsconfig.json b/tsconfig.json
index 28014d261f1..03567256c1a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,10 +23,6 @@
     "noEmit": true,
     "allowJs": false,
 
-    // TODO: remove this once router_js types have been fixed
-    // https://github.com/tildeio/router.js/issues/290
-    "skipLibCheck": true,
-
     "paths": {
       "@glimmer/*": ["../node_modules/@glimmer/*"]
     }
diff --git a/yarn.lock b/yarn.lock
index ea432d8bb53..9a4c984b524 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2520,10 +2520,10 @@ backbone@^1.1.2:
   dependencies:
     underscore ">=1.8.3"
 
-backburner.js@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/backburner.js/-/backburner.js-2.6.0.tgz#ff3315c38026cc52eb4447ce8de80ca71dd4cff0"
-  integrity "sha1-/zMVw4AmzFLrREfOjegMpx3Uz/A= sha512-mN3OPIffal2CgTisLaJ4yaMOvZukD9PJYJBQ+5gg1WoSPVAjctvmmX+7qb9N6SIQHt0ONcZC99laWA+Ol/IIEw=="
+backburner.js@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/backburner.js/-/backburner.js-2.7.0.tgz#36a5b8a8bfceb7efc8ad56e006a238924acfd67e"
+  integrity sha512-eBZC6r7wT+YYAOKeru8IqgzOimz3VgyspXiZ1k6MI8i10zUdU8cnNII56rlnItQ89cHgQO3C/nPuFW3V9di+zg==
 
 backo2@1.0.2:
   version "1.0.2"

From ba337bb40ae944c80ce8cdbda7b5b1dd9a8a8b59 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 28 Apr 2021 13:32:33 -0700
Subject: [PATCH 0482/1405] Remove some unnecessary use of reopen in Route

---
 .../-internals/routing/lib/system/route.ts    | 396 +++++++++---------
 1 file changed, 196 insertions(+), 200 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 60b87e409ea..c3914cb6fe2 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -97,6 +97,8 @@ export function hasDefaultSerialize(route: Route): boolean {
 */
 
 class Route extends EmberObject implements IRoute {
+  static isRouteFactory = true;
+
   routeName!: string;
   fullRouteName!: string;
   context: {} = {};
@@ -1876,11 +1878,199 @@ class Route extends EmberObject implements IRoute {
     @public
    */
   buildRouteInfoMetadata() {}
-}
 
-Route.reopenClass({
-  isRouteFactory: true,
-});
+  /**
+   * @method _paramsFor
+   * @private
+   */
+  _paramsFor(routeName: string, params: {}) {
+    let transition = this._router._routerMicrolib.activeTransition;
+    if (transition !== undefined) {
+      return this.paramsFor(routeName);
+    }
+
+    return params;
+  }
+
+
+  /**
+    Store property provides a hook for data persistence libraries to inject themselves.
+
+    By default, this store property provides the exact same functionality previously
+    in the model hook.
+
+    Currently, the required interface is:
+
+    `store.find(modelName, findArguments)`
+
+    @property store
+    @type {Object}
+    @private
+  */
+  @computed
+  protected get store() {
+    let owner = getOwner(this);
+    let routeName = this.routeName;
+    let namespace = get(this, '_router.namespace');
+
+    return {
+      find(name: string, value: unknown) {
+        let modelClass: any = owner.factoryFor(`model:${name}`);
+
+        assert(
+          `You used the dynamic segment ${name}_id in your route ${routeName}, but ${namespace}.${classify(
+            name
+          )} did not exist and you did not override your route's \`model\` hook.`,
+          Boolean(modelClass)
+        );
+
+        if (!modelClass) {
+          return;
+        }
+
+        modelClass = modelClass.class;
+
+        assert(
+          `${classify(name)} has no method \`find\`.`,
+          typeof modelClass.find === 'function'
+        );
+
+        return modelClass.find(value);
+      },
+    };
+  }
+
+  protected set store(value: any) {
+    defineProperty(this, 'store', null, value);
+  }
+
+  /**
+    @private
+    @property _qp
+    */
+  @computed
+  protected get _qp() {
+    let combinedQueryParameterConfiguration;
+
+    let controllerName = this.controllerName || this.routeName;
+    let owner = getOwner(this);
+    let controller = owner.lookup<Controller>(`controller:${controllerName}`);
+    let queryParameterConfiguraton = get(this, 'queryParams');
+    let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
+
+    if (controller) {
+      // the developer has authored a controller class in their application for
+      // this route find its query params and normalize their object shape them
+      // merge in the query params for the route. As a mergedProperty,
+      // Route#queryParams is always at least `{}`
+
+      let controllerDefinedQueryParameterConfiguration = get(controller, 'queryParams') || {};
+      let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
+        controllerDefinedQueryParameterConfiguration
+      );
+      combinedQueryParameterConfiguration = mergeEachQueryParams(
+        normalizedControllerQueryParameterConfiguration,
+        queryParameterConfiguraton
+      );
+    } else if (hasRouterDefinedQueryParams) {
+      // the developer has not defined a controller but *has* supplied route query params.
+      // Generate a class for them so we can later insert default values
+      controller = generateController(owner, controllerName);
+      combinedQueryParameterConfiguration = queryParameterConfiguraton;
+    }
+
+    let qps = [];
+    let map = {};
+    let propertyNames = [];
+
+    for (let propName in combinedQueryParameterConfiguration) {
+      if (!Object.prototype.hasOwnProperty.call(combinedQueryParameterConfiguration, propName)) {
+        continue;
+      }
+
+      // to support the dubious feature of using unknownProperty
+      // on queryParams configuration
+      if (propName === 'unknownProperty' || propName === '_super') {
+        // possible todo: issue deprecation warning?
+        continue;
+      }
+
+      let desc = combinedQueryParameterConfiguration[propName];
+      let scope = desc.scope || 'model';
+      let parts;
+
+      if (scope === 'controller') {
+        parts = [];
+      }
+
+      let urlKey = desc.as || this.serializeQueryParamKey(propName);
+      let defaultValue = get(controller!, propName);
+
+      defaultValue = copyDefaultValue(defaultValue);
+
+      let type = desc.type || typeOf(defaultValue);
+
+      let defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
+      let scopedPropertyName = `${controllerName}:${propName}`;
+      let qp = {
+        undecoratedDefaultValue: get(controller!, propName),
+        defaultValue,
+        serializedDefaultValue: defaultValueSerialized,
+        serializedValue: defaultValueSerialized,
+
+        type,
+        urlKey,
+        prop: propName,
+        scopedPropertyName,
+        controllerName,
+        route: this,
+        parts, // provided later when stashNames is called if 'model' scope
+        values: null, // provided later when setup is called. no idea why.
+        scope,
+      };
+
+      map[propName] = map[urlKey] = map[scopedPropertyName] = qp;
+      qps.push(qp);
+      propertyNames.push(propName);
+    }
+
+    return {
+      qps,
+      map,
+      propertyNames,
+      states: {
+        /*
+          Called when a query parameter changes in the URL, this route cares
+          about that query parameter, but the route is not currently
+          in the active route hierarchy.
+        */
+        inactive: (prop: string, value: unknown) => {
+          let qp = map[prop];
+          this._qpChanged(prop, value, qp);
+        },
+        /*
+          Called when a query parameter changes in the URL, this route cares
+          about that query parameter, and the route is currently
+          in the active route hierarchy.
+        */
+        active: (prop: string, value: unknown) => {
+          let qp = map[prop];
+          this._qpChanged(prop, value, qp);
+          return this._activeQPChanged(qp, value);
+        },
+        /*
+          Called when a value of a query parameter this route handles changes in a controller
+          and the route is currently in the active route hierarchy.
+        */
+        allowOverrides: (prop: string, value: unknown) => {
+          let qp = map[prop];
+          this._qpChanged(prop, value, qp);
+          return this._updatingQPChanged(qp);
+        },
+      },
+    };
+  }
+}
 
 function parentRoute(route: Route) {
   let routeInfo = routeInfoFor(route, route._router._routerMicrolib.state!.routeInfos, -1);
@@ -2277,13 +2467,6 @@ Route.reopen(ActionHandler, Evented, {
   */
   templateName: null,
 
-  /**
-    @private
-
-    @property _names
-  */
-  _names: null,
-
   /**
     The name of the controller to associate with this route.
 
@@ -2306,185 +2489,6 @@ Route.reopen(ActionHandler, Evented, {
   */
   controllerName: null,
 
-  /**
-    Store property provides a hook for data persistence libraries to inject themselves.
-
-    By default, this store property provides the exact same functionality previously
-    in the model hook.
-
-    Currently, the required interface is:
-
-    `store.find(modelName, findArguments)`
-
-    @property store
-    @type {Object}
-    @private
-  */
-  store: computed({
-    get(this: Route) {
-      let owner = getOwner(this);
-      let routeName = this.routeName;
-      let namespace = get(this, '_router.namespace');
-
-      return {
-        find(name: string, value: unknown) {
-          let modelClass: any = owner.factoryFor(`model:${name}`);
-
-          assert(
-            `You used the dynamic segment ${name}_id in your route ${routeName}, but ${namespace}.${classify(
-              name
-            )} did not exist and you did not override your route's \`model\` hook.`,
-            Boolean(modelClass)
-          );
-
-          if (!modelClass) {
-            return;
-          }
-
-          modelClass = modelClass.class;
-
-          assert(
-            `${classify(name)} has no method \`find\`.`,
-            typeof modelClass.find === 'function'
-          );
-
-          return modelClass.find(value);
-        },
-      };
-    },
-
-    set(key, value) {
-      defineProperty(this, key, null, value);
-    },
-  }),
-
-  /**
-      @private
-
-      @property _qp
-    */
-  _qp: computed(function (this: Route) {
-    let combinedQueryParameterConfiguration;
-
-    let controllerName = this.controllerName || this.routeName;
-    let owner = getOwner(this);
-    let controller = owner.lookup<Controller>(`controller:${controllerName}`);
-    let queryParameterConfiguraton = get(this, 'queryParams');
-    let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
-
-    if (controller) {
-      // the developer has authored a controller class in their application for
-      // this route find its query params and normalize their object shape them
-      // merge in the query params for the route. As a mergedProperty,
-      // Route#queryParams is always at least `{}`
-
-      let controllerDefinedQueryParameterConfiguration = get(controller, 'queryParams') || {};
-      let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
-        controllerDefinedQueryParameterConfiguration
-      );
-      combinedQueryParameterConfiguration = mergeEachQueryParams(
-        normalizedControllerQueryParameterConfiguration,
-        queryParameterConfiguraton
-      );
-    } else if (hasRouterDefinedQueryParams) {
-      // the developer has not defined a controller but *has* supplied route query params.
-      // Generate a class for them so we can later insert default values
-      controller = generateController(owner, controllerName);
-      combinedQueryParameterConfiguration = queryParameterConfiguraton;
-    }
-
-    let qps = [];
-    let map = {};
-    let propertyNames = [];
-
-    for (let propName in combinedQueryParameterConfiguration) {
-      if (!Object.prototype.hasOwnProperty.call(combinedQueryParameterConfiguration, propName)) {
-        continue;
-      }
-
-      // to support the dubious feature of using unknownProperty
-      // on queryParams configuration
-      if (propName === 'unknownProperty' || propName === '_super') {
-        // possible todo: issue deprecation warning?
-        continue;
-      }
-
-      let desc = combinedQueryParameterConfiguration[propName];
-      let scope = desc.scope || 'model';
-      let parts;
-
-      if (scope === 'controller') {
-        parts = [];
-      }
-
-      let urlKey = desc.as || this.serializeQueryParamKey(propName);
-      let defaultValue = get(controller!, propName);
-
-      defaultValue = copyDefaultValue(defaultValue);
-
-      let type = desc.type || typeOf(defaultValue);
-
-      let defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
-      let scopedPropertyName = `${controllerName}:${propName}`;
-      let qp = {
-        undecoratedDefaultValue: get(controller!, propName),
-        defaultValue,
-        serializedDefaultValue: defaultValueSerialized,
-        serializedValue: defaultValueSerialized,
-
-        type,
-        urlKey,
-        prop: propName,
-        scopedPropertyName,
-        controllerName,
-        route: this,
-        parts, // provided later when stashNames is called if 'model' scope
-        values: null, // provided later when setup is called. no idea why.
-        scope,
-      };
-
-      map[propName] = map[urlKey] = map[scopedPropertyName] = qp;
-      qps.push(qp);
-      propertyNames.push(propName);
-    }
-
-    return {
-      qps,
-      map,
-      propertyNames,
-      states: {
-        /*
-          Called when a query parameter changes in the URL, this route cares
-          about that query parameter, but the route is not currently
-          in the active route hierarchy.
-        */
-        inactive: (prop: string, value: unknown) => {
-          let qp = map[prop];
-          this._qpChanged(prop, value, qp);
-        },
-        /*
-          Called when a query parameter changes in the URL, this route cares
-          about that query parameter, and the route is currently
-          in the active route hierarchy.
-        */
-        active: (prop: string, value: unknown) => {
-          let qp = map[prop];
-          this._qpChanged(prop, value, qp);
-          return this._activeQPChanged(qp, value);
-        },
-        /*
-          Called when a value of a query parameter this route handles changes in a controller
-          and the route is currently in the active route hierarchy.
-        */
-        allowOverrides: (prop: string, value: unknown) => {
-          let qp = map[prop];
-          this._qpChanged(prop, value, qp);
-          return this._updatingQPChanged(qp);
-        },
-      },
-    };
-  }),
-
   /**
     Sends an action to the router, which will delegate it to the currently
     active route hierarchy per the bubbling rules explained under `actions`.
@@ -2548,6 +2552,7 @@ Route.reopen(ActionHandler, Evented, {
       }
     }
   },
+
   /**
     The controller associated with this route.
 
@@ -2752,16 +2757,7 @@ if (ROUTER_EVENTS) {
     },
   };
 
-  Route.reopen(ROUTER_EVENT_DEPRECATIONS, {
-    _paramsFor(routeName: string, params: {}) {
-      let transition = this._router._routerMicrolib.activeTransition;
-      if (transition !== undefined) {
-        return this.paramsFor(routeName);
-      }
-
-      return params;
-    },
-  });
+  Route.reopen(ROUTER_EVENT_DEPRECATIONS);
 }
 
 export default Route;

From 9a29a1846483ac3c97d1bc27bc751633dca14e4c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 1 May 2021 05:27:15 +0000
Subject: [PATCH 0483/1405] Bump @types/qunit from 2.9.1 to 2.11.1

Bumps [@types/qunit](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qunit) from 2.9.1 to 2.11.1.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qunit)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6cd42c30e89..1202d867d96 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "@glimmer/runtime": "0.78.2",
     "@glimmer/validator": "0.78.2",
     "@simple-dom/document": "^1.4.0",
-    "@types/qunit": "^2.9.1",
+    "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
diff --git a/yarn.lock b/yarn.lock
index 9a4c984b524..51ea44bec9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1902,10 +1902,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
   integrity "sha1-00gO5mbfl4SxABoYcqL2zO+2wtc= sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg=="
 
-"@types/qunit@^2.9.1":
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.9.1.tgz#6083a42907ae6c9eecece794844bc3f8659e6c03"
-  integrity "sha1-YIOkKQeubJ7s7OeUhEvD+GWebAM= sha512-v51Fz/orMOkBGzrRvskky3UN0I81ka6rokAxkcuVyLHAh0qNKp+Roqympg/gTia8vGOIEbeSykevI0VKiIF13Q=="
+"@types/qunit@^2.11.1":
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.1.tgz#3496d430d2bb0fa4761f00a27511f46020c6b410"
+  integrity sha512-vcM5+9O8LZuu5DYseaV4J7ehkYrhkv+aMIuxnF/OqMYlVEdv+odpCH1/5OVztiqxbCqTpQKWuELkMvG7OPycUQ==
 
 "@types/resolve@0.0.8":
   version "0.0.8"

From 4e20885b06d958b5a2eba7e2064a70e5d63d0dc7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 1 May 2021 05:27:46 +0000
Subject: [PATCH 0484/1405] Bump fs-extra from 9.0.1 to 9.1.0

Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.0.1 to 9.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.0.1...9.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 6cd42c30e89..c28913667ee 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
     "execa": "^2.0.4",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^9.1.0",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
     "glob": "^7.1.4",
diff --git a/yarn.lock b/yarn.lock
index 9a4c984b524..18de32a2ea7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5470,15 +5470,15 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
-  integrity "sha1-kQ2gBiQ3ukw5/t2GPxZ1zP78ufw= sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ=="
+fs-extra@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
     at-least-node "^1.0.0"
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
-    universalify "^1.0.0"
+    universalify "^2.0.0"
 
 fs-merger@^3.1.0:
   version "3.1.0"
@@ -10130,6 +10130,11 @@ universalify@^1.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
   integrity "sha1-thodoXPoQ1sv48Z9Kbmt+FlL0W0= sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

From 3afd20cb64c334d86c657d021fdd52de1fb0c1d6 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 May 2021 11:33:45 -0400
Subject: [PATCH 0485/1405] Add v3.27.0 to CHANGELOG

(cherry picked from commit 74ef460ecb8295183efa9f5e31eeb8ec74155a49)
---
 CHANGELOG.md | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a613a9de12c..5016e52bc63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,30 +1,20 @@
 # Ember Changelog
 
-### v3.27.0-beta.4 (April 21, 2021)
-
-- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX beta] [DEPRECATION] Deprecate `@foo={{helper}}`
-- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX beta] `<:else>` and `<:inverse>` should be aliases (see )
-- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX beta] Fix nested calls to helpers in dynamic helpers (see https://github.com/glimmerjs/glimmer-vm/pull/1293)
-
-### v3.27.0-beta.3 (March 30, 2021)
-
-- [#19477](https://github.com/emberjs/ember.js/pull/19477) [BUGFIX] Move `LinkTo` assertion into a method so `LinkToExternal` can override it
-- [#19481](https://github.com/emberjs/ember.js/pull/19481) [BUGFIX] Export `on` from correct path
-- [#19487](https://github.com/emberjs/ember.js/pull/19487) [BUGFIX] Allow passing a string literal to {{helper}} and {{modifier}}
-
-### v3.27.0-beta.2 (March 25, 2021)
-
-- [#19473](https://github.com/emberjs/ember.js/pull/19473) Update GlimmerVM to latest (fix compatibility for template import proposals)
-- [#19474](https://github.com/emberjs/ember.js/pull/19474) [FEATURE] Enable `(helper` and `(modifier` helpers
-
-### v3.27.0-beta.1 (March 22, 2021)
+### v3.27.0 (May 3, 2021)
 
+- [#19309](https://github.com/emberjs/ember.js/pull/19309) / [#19487](https://github.com/emberjs/ember.js/pull/19487) / [#19474](https://github.com/emberjs/ember.js/pull/19474) [FEATURE] Enable `(helper` and `(modifier` helpers per [RFC #432](https://github.com/emberjs/rfcs/blob/master/text/0432-contextual-helpers.md).
 - [#19382](https://github.com/emberjs/ember.js/pull/19382) / [#19430](https://github.com/emberjs/ember.js/pull/19430) [FEATURE] Remaining implementation work per [RFC #671](https://github.com/emberjs/rfcs/blob/master/text/0671-modernize-built-in-components-1.md).
 - [#19457](https://github.com/emberjs/ember.js/pull/19457) / [#19463](https://github.com/emberjs/ember.js/pull/19463) / [#19464](https://github.com/emberjs/ember.js/pull/19464) / [#19467](https://github.com/emberjs/ember.js/pull/19467) [DEPRECATION] Add deprecation for the Ember Global per [RFC #706](https://github.com/emberjs/rfcs/blob/master/text/0706-deprecate-ember-global.md).
 - [#19407](https://github.com/emberjs/ember.js/pull/19407) [DEPRECATION] Add deprecation for `Route#disconnectOutlet` per [RFC #491](https://github.com/emberjs/rfcs/blob/master/text/0491-deprecate-disconnect-outlet.md).
 - [#19433](https://github.com/emberjs/ember.js/pull/19433) [DEPRECATION] Add deprecation for `Route#renderTemplate` per [RFC #418](https://github.com/emberjs/rfcs/blob/master/text/0418-deprecate-route-render-methods.md).
 - [#19442](https://github.com/emberjs/ember.js/pull/19442) [DEPRECATION] Add deprecation for `Route#render` method per [RFC #418](https://github.com/emberjs/rfcs/blob/master/text/0418-deprecate-route-render-methods.md).
 - [#19429](https://github.com/emberjs/ember.js/pull/19429) [DEPRECATION] `registerPlugin` / `unregisterPlugin` and legacy class based AST plugins (private APIs)
+- [#19499](https://github.com/emberjs/ember.js/pull/19499) [DEPRECATION] Deprecate `@foo={{helper}}` per [RFC #496](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#3-no-implicit-invocation-of-argument-less-helpers).
+- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX] Update rendering engine to `@glimmer/*` 0.78.2 for fixes including:  
+    - `<:else>` and `<:inverse>` should be aliases (see https://github.com/glimmerjs/glimmer-vm/pull/1296)
+    - Fix nested calls to helpers in dynamic helpers (see https://github.com/glimmerjs/glimmer-vm/pull/1293)
+- [#19477](https://github.com/emberjs/ember.js/pull/19477) [BUGFIX] Allow `<LinkToExternal />` to override internal assertion
+- [#19481](https://github.com/emberjs/ember.js/pull/19481) [BUGFIX] Export `on` from correct path
 - [#19466](https://github.com/emberjs/ember.js/pull/19466) [BUGFIX] Rename private runloop functions
 - [#19384](https://github.com/emberjs/ember.js/pull/19384) Use qunit-dom in helper and component test blueprints
 - [#19390](https://github.com/emberjs/ember.js/pull/19390) Refactor the internal Ember loader to use the standard Ember CLI loader

From f77c8b0b6c03a927012250d96f448c2ec0ce31da Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 May 2021 12:10:30 -0400
Subject: [PATCH 0486/1405] Add v3.28.0-beta.1 to CHANGELOG

(cherry picked from commit 916e1041d8ed38f4dc8cff0a7a9b3b4013659c6c)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5016e52bc63..1072ab38dd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.28.0-beta.1 (May 3, 2021)
+
+- [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
+
 ### v3.27.0 (May 3, 2021)
 
 - [#19309](https://github.com/emberjs/ember.js/pull/19309) / [#19487](https://github.com/emberjs/ember.js/pull/19487) / [#19474](https://github.com/emberjs/ember.js/pull/19474) [FEATURE] Enable `(helper` and `(modifier` helpers per [RFC #432](https://github.com/emberjs/rfcs/blob/master/text/0432-contextual-helpers.md).

From fe26f80d9cb98637fd7a6acc93024fd6765943fd Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 May 2021 12:12:17 -0400
Subject: [PATCH 0487/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ea3fd977765..b08011c1acf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "3.28.0-alpha.1",
+  "version": "4.0.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From e19e975913fc825e69f519acce9f781bcbdc670e Mon Sep 17 00:00:00 2001
From: The Game <chris.game@robbiebobbins.com>
Date: Wed, 5 May 2021 12:24:22 +0100
Subject: [PATCH 0488/1405] [DOC release] fix passing params to named blocks
 examples

---
 .../@ember/-internals/glimmer/lib/glimmer-component-docs.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index ec4399d774b..5be0786f4ea 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -163,7 +163,7 @@
   You can also pass parameters to named blocks:
 
   ```app/templates/components/person-profile.hbs
-  <h1>{{yield to="title" @person.name}}</h1>
+  <h1>{{yield @person.name to="title"}}</h1>
   {{yield @person.signature}}
   ```
 
@@ -184,7 +184,7 @@
   ```app/templates/components/person-profile.hbs
   <h1>
     {{#if (has-block "title")}}
-      {{yield to="title" @person.name}}
+      {{yield @person.name to="title"}}
     {{else}}
       {{@person.name}}
     {{/if}}

From 4208339556992e6ae7c325d01fe54698cb0166aa Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 16:05:00 +0000
Subject: [PATCH 0489/1405] [Security] Bump handlebars from 4.7.6 to 4.7.7

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7eb6a9d5555..a38df248d9d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3684,7 +3684,7 @@ commander@6.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
   integrity "sha1-uZC/uKwDCu3G0RvATRSI/+9W23U= sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="
 
-commander@^2.12.1, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0, commander@~2.20.3:
+commander@^2.12.1, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
@@ -5787,9 +5787,9 @@ growly@^1.3.0:
   integrity "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="
 
 handlebars@^4.0.11, handlebars@^4.0.4:
-  version "4.7.6"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
-  integrity "sha1-1MBcG6+Q6ZRfd6pop6IZqkp9904= sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="
+  version "4.7.7"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
+  integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
   dependencies:
     minimist "^1.2.5"
     neo-async "^2.6.0"
@@ -7670,9 +7670,9 @@ negotiator@0.6.2:
   integrity "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs= sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
 
 neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw= sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -10053,11 +10053,9 @@ uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   integrity "sha1-nEEagCpAmpH8bPdAgbq6NLJEmaw= sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
 
 uglify-js@^3.1.4:
-  version "3.9.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.9.3.tgz#4a285d1658b8a2ebaef9e51366b3a0f7acd79ec2"
-  integrity "sha1-SihdFli4ouuu+eUTZrOg96zXnsI= sha512-r5ImcL6QyzQGVimQoov3aL2ZScywrOgBXGndbWrdehKoSvGe/RmiE5Jpw/v+GvxODt6l2tpBXwA7n+qZVlHBMA=="
-  dependencies:
-    commander "~2.20.3"
+  version "3.13.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
+  integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
 
 unbzip2-stream@^1.3.3:
   version "1.4.2"
@@ -10394,7 +10392,7 @@ word-wrap@^1.2.3:
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-  integrity "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="
+  integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
 wordwrap@~0.0.2:
   version "0.0.3"

From 474c170d2600aa7cf26ac94864a25557f86f53dc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 16:33:57 +0000
Subject: [PATCH 0490/1405] [Security] Bump lodash from 4.17.20 to 4.17.21

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a38df248d9d..0ead472e25b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7184,9 +7184,9 @@ lodash.values@~2.3.0:
     lodash.keys "~2.3.0"
 
 lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@3.0.0:
   version "3.0.0"

From b40fd8b7eaa568205d2d7830a6500ea212a1cb4f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 6 May 2021 16:56:23 +0000
Subject: [PATCH 0491/1405] [Security] Bump underscore from 1.8.3 to 1.13.1

Bumps [underscore](https://github.com/jashkenas/underscore) from 1.8.3 to 1.13.1. **This update includes a security fix.**
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.8.3...1.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a38df248d9d..4dd00f715d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10074,9 +10074,9 @@ underscore.string@^3.2.2, underscore.string@~3.3.4:
     util-deprecate "^1.0.2"
 
 underscore@>=1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-  integrity "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg=="
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
+  integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
 
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"

From 692c3b8b13c2a75f52e63ea4c0789050cf9d7284 Mon Sep 17 00:00:00 2001
From: Ilya Radchenko <knownasilya@gmail.com>
Date: Thu, 6 May 2021 13:31:58 -0400
Subject: [PATCH 0492/1405] fix computed deprecation import path

---
 packages/@ember/object/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index 9c6bb11faed..f2fe18b27f9 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -61,7 +61,7 @@ if (DEBUG) {
     Object.defineProperty(computed, key, {
       get() {
         deprecate(
-          `Using \`computed.${key}\` has been deprecated. Instead, import the value directly from @ember/object/computed:\n\n  import { ${key} } from '@ember/runloop';`,
+          `Using \`computed.${key}\` has been deprecated. Instead, import the value directly from @ember/object/computed:\n\n  import { ${key} } from '@ember/object/computed';`,
           false,
           {
             id: 'deprecated-run-loop-and-computed-dot-access',

From c84bb827cded58c1a96904f2a80b9f10890de25f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 7 May 2021 17:49:26 +0000
Subject: [PATCH 0493/1405] [Security] Bump hosted-git-info from 2.7.1 to 2.8.9

Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.7.1 to 2.8.9. **This update includes a security fix.**
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.7.1...v2.8.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 75505e4cd02..81e2846b65e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5975,9 +5975,9 @@ homedir-polyfill@^1.0.1:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
-  integrity "sha1-l/I2l3vW4SVAiTD/bePuxigewEc= sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 html-differ@^1.4.0:
   version "1.4.0"

From 5963428dbb2c9e63848362f215a00a4ac98ed93e Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 10 May 2021 20:15:04 +0200
Subject: [PATCH 0494/1405] Fixes after merging master

---
 .../glimmer/lib/modifiers/action.ts           | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 6180470f798..06e94923fae 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -65,6 +65,7 @@ export let ActionHelper = {
 
 export class ActionState {
   public element: SimpleElement;
+  public owner: Owner;
   public actionId: number;
   public actionName: any;
   public actionArgs: any;
@@ -76,12 +77,14 @@ export class ActionState {
 
   constructor(
     element: SimpleElement,
+    owner: Owner,
     actionId: number,
     actionArgs: any[],
     namedArgs: CapturedNamedArguments,
     positionalArgs: CapturedPositionalArguments
   ) {
     this.element = element;
+    this.owner = owner;
     this.actionId = actionId;
     this.actionArgs = actionArgs;
     this.namedArgs = namedArgs;
@@ -199,23 +202,8 @@ export class ActionState {
 }
 
 class ActionModifierManager implements InternalModifierManager<ActionState, object> {
-  private _setupEventHandler?: (eventName: string) => void;
-
-  constructor(public owner: Owner) {
-    this.owner = owner;
-  }
-
-  get setupEventHandler(): (eventName: string) => void {
-    if (this._setupEventHandler === undefined) {
-      let dispatcher = this.owner.lookup<EventDispatcher>('event_dispatcher:main');
-      this._setupEventHandler = (eventName) => dispatcher?.setupHandlerForEmberEvent(eventName);
-    }
-
-    return this._setupEventHandler;
-  }
-
   create(
-    _owner: Owner,
+    owner: Owner,
     element: SimpleElement,
     _state: object,
     { named, positional }: CapturedArguments
@@ -228,7 +216,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
     }
 
     let actionId = uuid();
-    let actionState = new ActionState(element, actionId, actionArgs, named, positional);
+    let actionState = new ActionState(element, owner, actionId, actionArgs, named, positional);
 
     deprecate(
       `Using the \`{{action}}\` modifier with \`${actionState.eventName}\` events has been deprecated.`,
@@ -292,8 +280,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
     actionState.actionName = actionName;
     actionState.implicitTarget = implicitTarget;
 
-    this.setupEventHandler(actionState.eventName);
-
+    this.ensureEventSetup(actionState);
     ActionHelper.registerAction(actionState);
 
     element.setAttribute('data-ember-action', '');
@@ -310,11 +297,16 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
 
     let newEventName = actionState.getEventName();
     if (newEventName !== actionState.eventName) {
-      this.setupEventHandler(actionState.eventName);
+      this.ensureEventSetup(actionState);
       actionState.eventName = actionState.getEventName();
     }
   }
 
+  ensureEventSetup(actionState: ActionState): void {
+    let dispatcher = actionState.owner.lookup<EventDispatcher>('event_dispatcher:main');
+    dispatcher?.setupHandlerForEmberEvent(actionState.eventName);
+  }
+
   getTag(actionState: ActionState): UpdatableTag {
     return actionState.tag;
   }
@@ -324,4 +316,6 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
   }
 }
 
-export default setInternalModifierManager((o: Owner) => new ActionModifierManager(o), {});
+const ACTION_MODIFIER_MANAGER = new ActionModifierManager();
+
+export default setInternalModifierManager(ACTION_MODIFIER_MANAGER, {});

From 7d334cf5d50270ef51a8dcd0f858ab4b2ef298bd Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 27 Apr 2021 13:41:39 -0700
Subject: [PATCH 0495/1405] [BUGFIX] Makes the (hash) helper lazy

Makes the hash helper's individual keys lazy so that they do not eagerly
incur costs.
---
 package.json                                  |  26 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   |  21 +-
 yarn.lock                                     | 252 +++++++++---------
 3 files changed, 159 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index f5bc7a91dec..9b11cefed06 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.78.2",
+    "@glimmer/vm-babel-plugins": "0.79.1",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.78.2",
-    "@glimmer/destroyable": "0.78.2",
+    "@glimmer/compiler": "0.79.1",
+    "@glimmer/destroyable": "0.79.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.78.2",
-    "@glimmer/interfaces": "0.78.2",
-    "@glimmer/manager": "0.78.2",
-    "@glimmer/node": "0.78.2",
-    "@glimmer/opcode-compiler": "0.78.2",
-    "@glimmer/owner": "0.78.2",
-    "@glimmer/program": "0.78.2",
-    "@glimmer/reference": "0.78.2",
-    "@glimmer/runtime": "0.78.2",
-    "@glimmer/validator": "0.78.2",
+    "@glimmer/global-context": "0.79.1",
+    "@glimmer/interfaces": "0.79.1",
+    "@glimmer/manager": "0.79.1",
+    "@glimmer/node": "0.79.1",
+    "@glimmer/opcode-compiler": "0.79.1",
+    "@glimmer/owner": "0.79.1",
+    "@glimmer/program": "0.79.1",
+    "@glimmer/reference": "0.79.1",
+    "@glimmer/runtime": "0.79.1",
+    "@glimmer/validator": "0.79.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.9.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index d5050b03a3a..166fde44465 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -98,7 +98,26 @@ export const outletHelper = internalHelper(
 
         if (state !== null) {
           let named = dict<Reference>();
-          named.model = childRefFromParts(outletRef, ['render', 'model']);
+
+          // Create a ref for the model
+          let modelRef = childRefFromParts(outletRef, ['render', 'model']);
+
+          // Store the value of the model
+          let model = valueForRef(modelRef);
+
+          // Create a compute ref which we pass in as the `{{@model}}` reference
+          // for the outlet. This ref will update and return the value of the
+          // model _until_ the outlet itself changes. Once the outlet changes,
+          // dynamic scope also changes, and so the original model ref would not
+          // provide the correct updated value. So we stop updating and return
+          // the _last_ model value for that outlet.
+          named.model = createComputeRef(() => {
+            if (lastState === state) {
+              model = valueForRef(modelRef);
+            }
+
+            return model;
+          });
 
           if (DEBUG) {
             named.model = createDebugAliasRef!('@model', named.model);
diff --git a/yarn.lock b/yarn.lock
index ea432d8bb53..f7858d5cb2d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,52 +1588,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.78.2.tgz#b02d4f1027770446637ffcce41bb5dfc71076c82"
-  integrity sha512-tI0vkwz4qxsTsOOrbJpXZiOQvDwl5dOyPbeq5Z0Fca1byaAPhxPgq+lvuSny0bDYz+T+NGS0B+9MB4yLMnCl7Q==
-  dependencies:
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/syntax" "0.78.2"
-    "@glimmer/util" "0.78.2"
-    "@glimmer/wire-format" "0.78.2"
+"@glimmer/compiler@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.1.tgz#b169364387e04fe63f18b1433dbbf4c217d1f379"
+  integrity sha512-gR6Il358TCwQ/u4Q8Z/i/FqvDT21GesphG3jd6BlKdaCrIxoffX0WJlMLLdq+WwH90D2FXnzESCkBUbi3FC4rA==
+  dependencies:
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/syntax" "0.79.1"
+    "@glimmer/util" "0.79.1"
+    "@glimmer/wire-format" "0.79.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.78.2.tgz#13a3eab3397f25b1a52e7dc3f9f81cf7ceec621c"
-  integrity sha512-cZ+fXp4PPf9CkDV8GY8A8sd5IJ367uEDk99n0DNBLcypeZU0REb8rCIV/GzJoCUcCnT9FzDXuFGgelp23x2tFw==
+"@glimmer/destroyable@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.1.tgz#a5e327fa4fc5a8171ab49db90acc7cc9ec686459"
+  integrity sha512-t69g/x5BTmNupkGTT053aQWD4HbMAkyJVX+kC7cJv1q8V3FS9FMbyhp0wy7iGhbKRrhQ/YQCTFzn75b7kWsSTQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.78.2"
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/util" "0.78.2"
+    "@glimmer/global-context" "0.79.1"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/util" "0.79.1"
 
-"@glimmer/encoder@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.78.2.tgz#39a4f8223cd7819417909d4a7c86c9e31bb1eef5"
-  integrity sha512-3V+DYqLf5sY8ehV4qaeACqpy8i1pjP0zGlsxiaFb3LdfIbfuzrNxE1JQGvN/60urqhKqGeeIk+e/Y2879voVbw==
+"@glimmer/encoder@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.1.tgz#be86d96be3eb87ccc2745fb286f7d2dc96f8bbde"
+  integrity sha512-SKnzRb9/+G12yV+SrQ//jfH2fU5W5M9wwJ0TPjCQR5xYY/FfZlWF4yF89436x4Dby4pvbFipTDmU9V2mLwzkjw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/vm" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/vm" "0.79.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.78.2.tgz#3443b000e8617da39202d5319db881ff59a2f248"
-  integrity sha512-om0ryTEqER1ZZKD9TLBJlPm/M3z9EwHMR22luufPKZ1la8RrDQpGPMh32a8QzWnOyigiv2NXIfuUiSh5OGR/BA==
+"@glimmer/global-context@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.1.tgz#3d74868a143991f771a7680b72081a04528c292f"
+  integrity sha512-AtfbeLMgksVZ1Df94e2nUjXs4tqwkGlxsBF4P62rDmXI82KxwFFj9Qa1sqWcUIbK1I3FRrYhGKSKroPCS1wiHg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.78.2.tgz#4dafd7f7abaf03f5a9b5d2192205ad007550ca36"
-  integrity sha512-OM1zJHNioKwd+7PM+mt28Ine9QfZLI7bwDOgB1Y+lHEZ0OdAGu6m351RBrXfQEgDCoVSFPQpOtUpWLP/FU3Utw==
+"@glimmer/interfaces@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.1.tgz#c25bb029450e8666d7a4e09da8669437eee237d1"
+  integrity sha512-Mz7118uYtHAodvuNPQFzJLwCleBsh1bx/7H5LH6liCE720OOz1PD2hhamMntpetuvgkpX8OnVDp99BB7bH3/Hg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1642,140 +1642,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.78.2.tgz#5c1d0fc24225f9546b182cab6d8ea800135bf86b"
-  integrity sha512-mHTtPJXf7uYVOsHSrLQEcv0nxGj9M2Rmks60hWKxk/pdNwt12FzRElMqyyj1j9lSbUj+LOpt9g+IZYu03w4O8g==
+"@glimmer/manager@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.1.tgz#fb72af7a731eefaf044e3160e5ec684abd89976d"
+  integrity sha512-JUaaZ009APgVuqdh6o1+l4j/aAAZ3oBdrwhecee4h64xW0WSi0cWwJ4lri13NI7ko3Ig4+dcTdDYLvfeSHFLBA==
   dependencies:
-    "@glimmer/destroyable" "0.78.2"
+    "@glimmer/destroyable" "0.79.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/reference" "0.78.2"
-    "@glimmer/util" "0.78.2"
-    "@glimmer/validator" "0.78.2"
-
-"@glimmer/node@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.78.2.tgz#a27bd6d5ef188ea4892bc6953a62fc165a173893"
-  integrity sha512-e5mc63xbvix6qRwGLWrc5zYi0PSN5bUUlx6SWCxItObht7i7TpkylYo3y4bDZc2LqfkTN8e8dIyPqfF2dZsLsQ==
-  dependencies:
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/runtime" "0.78.2"
-    "@glimmer/util" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/reference" "0.79.1"
+    "@glimmer/util" "0.79.1"
+    "@glimmer/validator" "0.79.1"
+
+"@glimmer/node@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.1.tgz#8b511852bdf710867f282208141092f679ac829e"
+  integrity sha512-CK+M2HfWZ068+MLFZQBCjPuUTdSO8r7x6F8fPX7Te/Yo8KYKO4eSIzkOTAcpXX1t1xMOMzQyDaLXtnftQhaSaw==
+  dependencies:
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/runtime" "0.79.1"
+    "@glimmer/util" "0.79.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.78.2.tgz#c5199fa02a7e36dbe62e4387bf37d54b1f2c33c7"
-  integrity sha512-WEmeMZMt3nD8jcUlAYLuW6xVB0uOBkyGAUHU7SHcldnfdP3GTilyPO3OzRC9ksEHK/bwtFelrbwu5tpPH1RgvQ==
+"@glimmer/opcode-compiler@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.1.tgz#e3f567423ef4a66c52b8fcaf90af94b7db97a8ab"
+  integrity sha512-hWQucLIPclR/nxnU7KeXvQXE061rJcKcgbBjJeZPp+/Dbo8550coyUBaGSRS/mvNx/MFs16jcCcU7P1f+fiZJg==
   dependencies:
-    "@glimmer/encoder" "0.78.2"
+    "@glimmer/encoder" "0.79.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/reference" "0.78.2"
-    "@glimmer/util" "0.78.2"
-    "@glimmer/vm" "0.78.2"
-    "@glimmer/wire-format" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/reference" "0.79.1"
+    "@glimmer/util" "0.79.1"
+    "@glimmer/vm" "0.79.1"
+    "@glimmer/wire-format" "0.79.1"
 
-"@glimmer/owner@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.78.2.tgz#15e0adf8e2fef7045674e67627fa48d4b8df877e"
-  integrity sha512-02I4O5kgmQasE5vbmRY/3F6ZshPURAWtZgvCR5+YHgGo+Jt1UBMaLLDtbg8ldPDc5muUmonA3ZXIYmm1F4wTSw==
+"@glimmer/owner@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.1.tgz#fc0fbca08aef9b20c095e26e90c4d58bd6d8a189"
+  integrity sha512-nYwkKfATwNXdkMfS9Bgyps/TtCnadmpoka59seQAYV2LuwH8tuJfrme2j6mZXkQ7LMoZZY/JPJ94CiwJLfFGvA==
   dependencies:
-    "@glimmer/util" "0.78.2"
+    "@glimmer/util" "0.79.1"
 
-"@glimmer/program@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.78.2.tgz#c38f2f55005b3c2e8f1a4825aacc2ffd6891d9a1"
-  integrity sha512-6ZeCSwqnC0mMzfHwbToTX/LC6HeUm2UMAaMri7WIh9ncNetCfKqBXRdFIKepG7fnWEADuCwE/+r6e2Qq2x3dNQ==
+"@glimmer/program@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.1.tgz#e0523b8eea8075a50adc39d26d2fb2a284b71088"
+  integrity sha512-4cvWEnniwoNbCrv6FZUO/xIU+OORCRv7e7DTLjneXwuQbBqxPWUwEutQRTQNAsojfg34q5++fK9okLxkqtoBkA==
   dependencies:
-    "@glimmer/encoder" "0.78.2"
+    "@glimmer/encoder" "0.79.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/manager" "0.78.2"
-    "@glimmer/opcode-compiler" "0.78.2"
-    "@glimmer/util" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/manager" "0.79.1"
+    "@glimmer/opcode-compiler" "0.79.1"
+    "@glimmer/util" "0.79.1"
 
-"@glimmer/reference@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.78.2.tgz#dbffbeb4bc42f64f57104eebab0eb4ef7778d989"
-  integrity sha512-vUk20mKknDqtQEWfGbDwU9eh+XVztUUuww6V6/UKm8JokBDjGkdt4w74R2wvPIrDZYkfXErZjXwY8Ltu1lBV0A==
+"@glimmer/reference@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.1.tgz#c3b998a815a9f7ab1a60d8a4d4fbf9c242077a89"
+  integrity sha512-HNzaQRGjNMk7WKzscPBAvQWsP9C5AtHPXj7t+4Na4tnM3DXc81CSqjinJVaXP/M6n22cADkO1uu6m6P5hGuT0w==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.78.2"
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/util" "0.78.2"
-    "@glimmer/validator" "0.78.2"
+    "@glimmer/global-context" "0.79.1"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/util" "0.79.1"
+    "@glimmer/validator" "0.79.1"
 
-"@glimmer/runtime@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.78.2.tgz#e8d8de5b1c74f2aeaa129b43d264ff36de4de5a1"
-  integrity sha512-pzndIFJl2ycVAAnaFNm2MLwDTKymn03a+xAtHpsFwEZQ3EE2wQNnEKyBDI5SkNRShD8nkbwodd0N+YwZdGDKHw==
+"@glimmer/runtime@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.1.tgz#22ef9e676b5724d1a599a9eeaf8fbc152e988e2b"
+  integrity sha512-6kdPfzWy3SfQrbVjQGuwzY5FRC0//N+VqQW7G/bpgvpHuKuYBzBX74alMOXbokTpDwoVky7GAS6hMxhHPDEeIw==
   dependencies:
-    "@glimmer/destroyable" "0.78.2"
+    "@glimmer/destroyable" "0.79.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.78.2"
-    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/global-context" "0.79.1"
+    "@glimmer/interfaces" "0.79.1"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.78.2"
-    "@glimmer/program" "0.78.2"
-    "@glimmer/reference" "0.78.2"
-    "@glimmer/util" "0.78.2"
-    "@glimmer/validator" "0.78.2"
-    "@glimmer/vm" "0.78.2"
-    "@glimmer/wire-format" "0.78.2"
+    "@glimmer/owner" "0.79.1"
+    "@glimmer/program" "0.79.1"
+    "@glimmer/reference" "0.79.1"
+    "@glimmer/util" "0.79.1"
+    "@glimmer/validator" "0.79.1"
+    "@glimmer/vm" "0.79.1"
+    "@glimmer/wire-format" "0.79.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.78.2.tgz#3be25df8c7b7564d94d204ac0ab0c9717abe9043"
-  integrity sha512-B6OgBtUFo+K0sA+72sNQOs//TKJIZdAPUAIQGjZWsfGZGpzlFx3kuouKeK1DCtXxRIktqSDpmXFcPNKd1OqbOw==
+"@glimmer/syntax@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.1.tgz#845f19424705e27f4ef8ab1358057c77da8b4fbc"
+  integrity sha512-dbdK4un1u2GB2i8n7PUOC+nKS6HQuMxFmpiy/GNL8hIvf6i33nqtdAZ7S4UJx65V7weOqLMwhrzhEN3+901I8g==
   dependencies:
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/util" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/util" "0.79.1"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.78.2.tgz#d6e7e363d198ef426858a3958170774b4548cce1"
-  integrity sha512-SqmlzdtXJwAhf5fhflFsoYuM3zk1M/8bamqGXQpCB5I40NpcshpFybY/ZMwIGsYOWEwIo/LDDC1UBZ3gyMPZzA==
+"@glimmer/util@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.1.tgz#35b74f58712bbfcde973947449aac9b08fa38067"
+  integrity sha512-NNeTAh9NsqZLiG8to8RJzEDrUkf8h3eVBxVtRC63xOb4Pq5fQFv3B5E51ibv83yPvCyD+y/bMnInB1ep5gneYQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.78.2.tgz#bc7f3cf376789d1090add73bed599e840697fdc8"
-  integrity sha512-pzdC9uPaQerOoPEeSV9U/oRbZtgTkL+BryGR8R534mhAFfVlzenAa4aavKZEcnIns73MNN/G1l2iYDmjSH/6Hg==
+"@glimmer/validator@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.1.tgz#2735fc04c5ddb20c8033282a36c53d76b4ec688b"
+  integrity sha512-S8DXscr6a9N9rNeEfEfvAAEVTs27tFiy0Zk2xF4scq3hazWWwO9AOq8ERw4tY8Ecj9dkZH3JKZmBKZYTfWR13Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.78.2"
+    "@glimmer/global-context" "0.79.1"
 
-"@glimmer/vm-babel-plugins@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.78.2.tgz#b530a19f54da385c7099a22cf348e9062d186838"
-  integrity sha512-GSEf16h6OCtKx7PsSvD21cLXZuVc6swW2rSOAvfLeZco1DEWMRgYTwkCkColydKZcQ3gvwbPBeYwTC2K6tlnjg==
+"@glimmer/vm-babel-plugins@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.1.tgz#dfe40bbc6b32e102e72dc2256f1fc1a4a9eb03b9"
+  integrity sha512-f6nyuumSpaQKsZsRvafnTGlcrcMA9qzqAGehnEMOsfxZJmGz19+qTlMvc1/JTUjX8YztYnH4RHkiLn93H0H8JA==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.78.2.tgz#525589b4d3556eafea84a2b9c6e7aa72698bf5d6"
-  integrity sha512-x+0qn1B00i8Gcw3ptqEaGsIECG4M1IdmxtLSIr+Kfga/Da/PPLXJYQx+jk924rVCnad2FzxizhyKRxCqPbU+EA==
+"@glimmer/vm@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.1.tgz#3d14b5abf5a26bb4803d43b5a10383ebcd3e0363"
+  integrity sha512-hu617ceRYg93bnzJPFAzn5Zks91GOzpqV235t6Q32Ldk4x0srQfk58KYaS6omPj9IvtQzQQjAAeRaFswyPYrig==
   dependencies:
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/util" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/util" "0.79.1"
 
-"@glimmer/wire-format@0.78.2":
-  version "0.78.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.78.2.tgz#32686633e66fe674ea39910d48e3db9ba524eadb"
-  integrity sha512-kd8xP9P7oo+F0EijG3/2YwzUXq/AESxPS2hadjmhu2uMZ+QOzgYbeo1xC2Ig7EkXhf1tdxlmVpCS4rwhCsxzXA==
+"@glimmer/wire-format@0.79.1":
+  version "0.79.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.1.tgz#4cb0a0bca7bb629f30565a0cb738550ad447535d"
+  integrity sha512-YUBGRaD+4R4yyjp09CdEiGH0o/zOo8ZKWs3iwvAewDJpijW33EjCbNyR6yCAK3tQVSAGiQ354BYht77Z7sDXZg==
   dependencies:
-    "@glimmer/interfaces" "0.78.2"
-    "@glimmer/util" "0.78.2"
+    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/util" "0.79.1"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 995d6a7859f776f880ae2e5920fc90ab1fd74df9 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 11 May 2021 15:44:13 -0700
Subject: [PATCH 0496/1405] [BUGFIX release] Ensure ember-testing is loaded
 lazily

The recently modules API update means we are now loading real modules,
not polyfills based on the global. This means that the modules
themselves are _eagerly required_, rather than being references to a
value on the global. For example, previously, this:

```js
import { registerWaiter } from '@ember/test';

if (someCondition) {
  registerWaiter(() => {});
}
```

Would become this:

```js
if (someCondition) {
  Ember.Test.registerWaiter(() => {});
}
```

In either example, `registerWaiter` may or may not be called based on
the state of `someCondition`. However, in the second case, if
`Ember.Test` is not defined at all, it's completely ok as long as
`someCondition` is `false`. It's never called, so we never get an error
telling us `Ember.Test` is undefined.

Without the transform, the module is eagerly required, along with all of
its dependencies. If no one included `ember-testing`, then that means
it will throw an error immediately.

This PR makes the `@ember/test` module load `ember-testing` lazily, and
if it's not available (e.g. in a production environment) it replaces the
values with a function that throws a helpful error.
---
 packages/@ember/test/index.js | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/packages/@ember/test/index.js b/packages/@ember/test/index.js
index 2c5d3ae272d..3f226dbcac6 100644
--- a/packages/@ember/test/index.js
+++ b/packages/@ember/test/index.js
@@ -1,11 +1,27 @@
-import { Test } from 'ember-testing';
+import require, { has } from 'require';
 
-const {
-  registerAsyncHelper,
-  registerHelper,
-  registerWaiter,
-  unregisterHelper,
-  unregisterWaiter,
-} = Test;
+export let registerAsyncHelper;
+export let registerHelper;
+export let registerWaiter;
+export let unregisterHelper;
+export let unregisterWaiter;
 
-export { registerAsyncHelper, registerHelper, registerWaiter, unregisterHelper, unregisterWaiter };
+if (has('ember-testing')) {
+  let { Test } = require('ember-testing');
+
+  registerAsyncHelper = Test.registerAsyncHelper;
+  registerHelper = Test.registerHelper;
+  registerWaiter = Test.registerWaiter;
+  unregisterHelper = Test.unregisterHelper;
+  unregisterWaiter = Test.unregisterWaiter;
+} else {
+  let testingNotAvailableMessage = () => {
+    throw new Error('Attempted to use test utilities, but `ember-testing` was not included');
+  };
+
+  registerAsyncHelper = testingNotAvailableMessage;
+  registerHelper = testingNotAvailableMessage;
+  registerWaiter = testingNotAvailableMessage;
+  unregisterHelper = testingNotAvailableMessage;
+  unregisterWaiter = testingNotAvailableMessage;
+}

From c69365b0574a9a16cad18d1ef27669fd11680a4a Mon Sep 17 00:00:00 2001
From: Jonas Metzener <jonas.metzener@adfinis.com>
Date: Wed, 12 May 2021 09:37:15 +0200
Subject: [PATCH 0497/1405] [BUGFIX] pass module prefix to initializer test
 blueprints

---
 .../__testType__/__path__/__name__-test.js    | 19 ++++++++++++-------
 .../__testType__/__path__/__name__-test.js    | 19 ++++++++++++-------
 .../fixtures/initializer-test/rfc232.js       | 19 ++++++++++++-------
 .../instance-initializer-test/rfc232.js       | 19 ++++++++++++-------
 4 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index b5bd4650aee..4fe80c2b1d9 100644
--- a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -1,27 +1,32 @@
 import Application from '@ember/application';
 
+import config from '<%= modulePrefix %>/config/environment';
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import Resolver from 'ember-resolver';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
-module('<%= friendlyTestName %>', function(hooks) {
-  hooks.beforeEach(function() {
-    this.TestApplication = class TestApplication extends Application {}
+module('<%= friendlyTestName %>', function (hooks) {
+  hooks.beforeEach(function () {
+    this.TestApplication = class TestApplication extends Application {
+      modulePrefix = config.modulePrefix;
+      podModulePrefix = config.podModulePrefix;
+      Resolver = Resolver;
+    };
     this.TestApplication.initializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
 
-    this.application = this.TestApplication.create({ autoboot: false, Resolver });
+    this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
   // TODO: Replace this with your real tests.
-  test('it works', async function(assert) {
+  test('it works', async function (assert) {
     await this.application.boot();
 
     assert.ok(true);
diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 9e09050e437..e200288b65b 100644
--- a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -1,27 +1,32 @@
 import Application from '@ember/application';
 
+import config from '<%= modulePrefix %>/config/environment';
 import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import Resolver from 'ember-resolver';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
-module('<%= friendlyTestName %>', function(hooks) {
-  hooks.beforeEach(function() {
-    this.TestApplication = class TestApplication extends Application {}
+module('<%= friendlyTestName %>', function (hooks) {
+  hooks.beforeEach(function () {
+    this.TestApplication = class TestApplication extends Application {
+      modulePrefix = config.modulePrefix;
+      podModulePrefix = config.podModulePrefix;
+      Resolver = Resolver;
+    };
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false, Resolver });
+    this.application = this.TestApplication.create({ autoboot: false });
     this.instance = this.application.buildInstance();
   });
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
   // TODO: Replace this with your real tests.
-  test('it works', async function(assert) {
+  test('it works', async function (assert) {
     await this.instance.boot();
 
     assert.ok(true);
diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
index 709ea9aaf46..78ef00434d4 100644
--- a/node-tests/fixtures/initializer-test/rfc232.js
+++ b/node-tests/fixtures/initializer-test/rfc232.js
@@ -1,27 +1,32 @@
 import Application from '@ember/application';
 
+import config from 'my-app/config/environment';
 import { initialize } from 'my-app/initializers/foo';
 import { module, test } from 'qunit';
 import Resolver from 'ember-resolver';
 import { run } from '@ember/runloop';
 
-module('Unit | Initializer | foo', function(hooks) {
-  hooks.beforeEach(function() {
-    this.TestApplication = class TestApplication extends Application {}
+module('Unit | Initializer | foo', function (hooks) {
+  hooks.beforeEach(function () {
+    this.TestApplication = class TestApplication extends Application {
+      modulePrefix = config.modulePrefix;
+      podModulePrefix = config.podModulePrefix;
+      Resolver = Resolver;
+    };
     this.TestApplication.initializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
 
-    this.application = this.TestApplication.create({ autoboot: false, Resolver });
+    this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     run(this.application, 'destroy');
   });
 
   // TODO: Replace this with your real tests.
-  test('it works', async function(assert) {
+  test('it works', async function (assert) {
     await this.application.boot();
 
     assert.ok(true);
diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
index 64814eda522..03654f52dcf 100644
--- a/node-tests/fixtures/instance-initializer-test/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -1,27 +1,32 @@
 import Application from '@ember/application';
 
+import config from 'my-app/config/environment';
 import { initialize } from 'my-app/instance-initializers/foo';
 import { module, test } from 'qunit';
 import Resolver from 'ember-resolver';
 import { run } from '@ember/runloop';
 
-module('Unit | Instance Initializer | foo', function(hooks) {
-  hooks.beforeEach(function() {
-    this.TestApplication = class TestApplication extends Application {}
+module('Unit | Instance Initializer | foo', function (hooks) {
+  hooks.beforeEach(function () {
+    this.TestApplication = class TestApplication extends Application {
+      modulePrefix = config.modulePrefix;
+      podModulePrefix = config.podModulePrefix;
+      Resolver = Resolver;
+    };
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false, Resolver });
+    this.application = this.TestApplication.create({ autoboot: false });
     this.instance = this.application.buildInstance();
   });
-  hooks.afterEach(function() {
+  hooks.afterEach(function () {
     run(this.instance, 'destroy');
     run(this.application, 'destroy');
   });
 
   // TODO: Replace this with your real tests.
-  test('it works', async function(assert) {
+  test('it works', async function (assert) {
     await this.instance.boot();
 
     assert.ok(true);

From efd066ce45b45af96f921c02b58c8d44931222d8 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 11 May 2021 16:38:13 -0700
Subject: [PATCH 0498/1405] [BUGFIX release] 3.27 deprecation metadata

* Unify deprecation ids
* Add missing `url` and `since`
* Correctly reference `@ember/legacy-built-in-components` addon
* Error instead for `<LinkTo @href=...>`
---
 .../glimmer/lib/components/-link-to.ts        | 10 +++-
 .../glimmer/lib/components/-textarea.ts       | 10 +++-
 .../glimmer/lib/components/checkbox.ts        | 10 +++-
 .../glimmer/lib/components/internal.ts        | 24 +++++++--
 .../glimmer/lib/components/link-to.ts         | 54 ++++++++++++++++---
 .../glimmer/lib/components/text-field.ts      | 10 +++-
 .../-internals/glimmer/lib/environment.ts     |  1 +
 .../link-to/rendering-angle-test.js           | 14 +++++
 .../link-to/rendering-curly-test.js           | 14 +++++
 .../lib/mixins/target_action_support.js       |  5 +-
 .../views/lib/mixins/text_support.js          |  5 +-
 packages/@ember/component/checkbox.ts         |  9 ++--
 packages/@ember/component/text-area.ts        |  9 ++--
 packages/@ember/component/text-field.ts       |  9 ++--
 packages/@ember/routing/link-component.ts     |  9 ++--
 packages/ember/index.js                       | 11 ++--
 packages/ember/tests/reexports_test.js        |  2 +-
 17 files changed, 163 insertions(+), 43 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 2ae57b6e124..642eeb64605 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -1035,8 +1035,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
@@ -1060,8 +1063,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/-textarea.ts b/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
index 00473ea09b7..95aa097bc1c 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
@@ -62,8 +62,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
@@ -87,8 +90,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
index 31d42f17da2..d9a39d50e49 100644
--- a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
@@ -181,8 +181,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
@@ -206,8 +209,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 1942dbe344f..393b4380aa8 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -274,8 +274,12 @@ export function handleDeprecatedArguments(target: DeprecatingInternalComponentCo
         deprecate(`Passing the \`@${name}\` argument to <${angle}> is deprecated.`, false, {
           id: 'ember.built-in-components.legacy-arguments',
           for: 'ember-source',
-          since: {},
+          since: {
+            enabled: '3.27.0',
+          },
           until: '4.0.0',
+          url:
+            'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
         });
 
         this.modernized = false;
@@ -356,8 +360,12 @@ export function handleDeprecatedAttributeArguments(
               {
                 id: 'ember.built-in-components.legacy-attribute-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-attribute-arguments',
               }
             );
 
@@ -517,8 +525,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
             {
               id: 'ember.built-in-components.legacy-attribute-arguments',
               for: 'ember-source',
-              since: {},
+              since: {
+                enabled: '3.27.0',
+              },
               until: '4.0.0',
+              url:
+                'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-attribute-arguments',
             }
           );
 
@@ -530,8 +542,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
             {
               id: 'ember.built-in-components.legacy-attribute-arguments',
               for: 'ember-source',
-              since: {},
+              since: {
+                enabled: '3.27.0',
+              },
               until: '4.0.0',
+              url:
+                'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-attribute-arguments',
             }
           );
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 32b69ea997b..40ee661d959 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -393,7 +393,6 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     ['role', 'ariaRole'],
 
     // LinkTo
-    'href',
     'title',
     'rel',
     'tabindex',
@@ -402,6 +401,23 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
 
   handleDeprecatedEventArguments(LinkTo);
 
+  // @href
+  {
+    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
+
+    Object.defineProperty(prototype, 'onUnsupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function onUnsupportedArgument(this: LinkTo, name: string): void {
+        if (name === 'href') {
+          assert(`Passing the \`@href\` argument to <LinkTo> is not supported.`);
+        } else {
+          superOnUnsupportedArgument.call(this, name);
+        }
+      },
+    });
+  }
+
   // @tagName
   {
     let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
@@ -454,8 +470,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.built-in-components.legacy-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
               }
             );
 
@@ -472,8 +492,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.built-in-components.legacy-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
               }
             );
 
@@ -505,8 +529,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.built-in-components.legacy-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
               }
             );
           } else {
@@ -519,8 +547,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.built-in-components.legacy-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
               }
             );
 
@@ -540,8 +572,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.built-in-components.legacy-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
               }
             );
 
@@ -556,8 +592,12 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.built-in-components.legacy-arguments',
                 for: 'ember-source',
-                since: {},
+                since: {
+                  enabled: '3.27.0',
+                },
                 until: '4.0.0',
+                url:
+                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
               }
             );
           }
diff --git a/packages/@ember/-internals/glimmer/lib/components/text-field.ts b/packages/@ember/-internals/glimmer/lib/components/text-field.ts
index 1db0db7bf3f..a83a0f1c4b5 100644
--- a/packages/@ember/-internals/glimmer/lib/components/text-field.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/text-field.ts
@@ -225,8 +225,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
@@ -250,8 +253,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.built-in-components.reopen',
             for: 'ember-source',
-            since: {},
+            since: {
+              enabled: '3.27.0',
+            },
             until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
           }
         );
 
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 847642050f0..75f2b5b281c 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -118,6 +118,7 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
   },
   {
     id: 'argument-less-helper-paren-less-invocation',
+    url: 'https://deprecations.emberjs.com/v3.x#toc_argument-less-helper-paren-less-invocation',
     until: '4.0.0',
     for: 'ember-source',
     since: {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 3932e4c573a..3c555705a1c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -9,6 +9,7 @@ import { Router, Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
 import { LinkComponent } from '@ember/-internals/glimmer';
+import { DEBUG } from '@glimmer/env';
 
 moduleFor(
   '<LinkTo /> component (rendering tests)',
@@ -22,6 +23,19 @@ moduleFor(
       );
     }
 
+    async [`@test it throws a useful error if you pass the href argument`](assert) {
+      this.addTemplate('application', `<LinkTo @href="nope" @route="index">Index</LinkTo>`);
+
+      if (DEBUG) {
+        await assert.rejects(
+          this.visit('/'),
+          /Passing the `@href` argument to <LinkTo> is not supported\./
+        );
+      } else {
+        assert.expect(0);
+      }
+    }
+
     async ['@test it should be able to be inserted in DOM when the router is not present']() {
       this.addTemplate('application', `<LinkTo @route='index'>Go to Index</LinkTo>`);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index 7115e81ec21..b934154d7ba 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -3,6 +3,7 @@ import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'inte
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
 import { LinkComponent } from '@ember/-internals/glimmer';
+import { DEBUG } from '@glimmer/env';
 
 moduleFor(
   '{{link-to}} component (rendering tests)',
@@ -15,6 +16,19 @@ moduleFor(
       }, /You must provide one or more parameters to the `{{link-to}}` component\. \('my-app\/templates\/application\.hbs' @ L1:C0\)/);
     }
 
+    async [`@test it throws a useful error if you pass the href argument`](assert) {
+      this.addTemplate('application', `{{#link-to href="nope" route="index"}}Index{{/link-to}}`);
+
+      if (DEBUG) {
+        await assert.rejects(
+          this.visit('/'),
+          /Passing the `@href` argument to <LinkTo> is not supported\./
+        );
+      } else {
+        assert.expect(0);
+      }
+    }
+
     async ['@test it should be able to be inserted in DOM when the router is not present']() {
       this.addTemplate('application', `{{#link-to route='index'}}Go to Index{{/link-to}}`);
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
index 6c46433fa6c..b0d4bde399b 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
@@ -170,8 +170,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         deprecate('Reopening Ember.TargetActionSupport is deprecated.', false, {
           id: 'ember.built-in-components.reopen',
           for: 'ember-source',
-          since: {},
+          since: {
+            enabled: '3.27.0',
+          },
           until: '4.0.0',
+          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
         });
 
         TargetActionSupport._wasReopened = true;
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index e7e8b197a17..08c5fed43e4 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -365,8 +365,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         deprecate('Reopening Ember.TextSupport is deprecated.', false, {
           id: 'ember.built-in-components.reopen',
           for: 'ember-source',
-          since: {},
+          since: {
+            enabled: '3.27.0',
+          },
           until: '4.0.0',
+          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
         });
 
         TextSupport._wasReopened = true;
diff --git a/packages/@ember/component/checkbox.ts b/packages/@ember/component/checkbox.ts
index 374d4fb53cb..28788824d26 100644
--- a/packages/@ember/component/checkbox.ts
+++ b/packages/@ember/component/checkbox.ts
@@ -4,16 +4,17 @@ import { deprecate } from '@ember/debug';
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   deprecate(
     `Using Ember.Checkbox or importing from 'Checkbox' has been deprecated, install the ` +
-      `\`ember-legacy-built-in-components\` addon and use \`import { Checkbox } from ` +
-      `'ember-legacy-built-in-components';\` instead`,
+      `\`@ember/legacy-built-in-components\` addon and use \`import { Checkbox } from ` +
+      `'@ember/legacy-built-in-components';\` instead`,
     false,
     {
-      id: 'ember.legacy-built-in-components',
+      id: 'ember.built-in-components.import',
       until: '4.0.0',
       for: 'ember-source',
       since: {
-        // TODO: update this when enabling the feature
+        enabled: '3.27.0',
       },
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
     }
   );
 }
diff --git a/packages/@ember/component/text-area.ts b/packages/@ember/component/text-area.ts
index 10aaf051c0a..930a55ee198 100644
--- a/packages/@ember/component/text-area.ts
+++ b/packages/@ember/component/text-area.ts
@@ -4,16 +4,17 @@ import { deprecate } from '@ember/debug';
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   deprecate(
     `Using Ember.TextArea or importing from 'TextArea' has been deprecated, install the ` +
-      `\`ember-legacy-built-in-components\` addon and use \`import { TextArea } from ` +
-      `'ember-legacy-built-in-components';\` instead`,
+      `\`@ember/legacy-built-in-components\` addon and use \`import { TextArea } from ` +
+      `'@ember/legacy-built-in-components';\` instead`,
     false,
     {
-      id: 'ember.legacy-built-in-components',
+      id: 'ember.built-in-components.import',
       until: '4.0.0',
       for: 'ember-source',
       since: {
-        // TODO: update this when enabling the feature
+        enabled: '3.27.0',
       },
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
     }
   );
 }
diff --git a/packages/@ember/component/text-field.ts b/packages/@ember/component/text-field.ts
index 119f91bb2b3..77f3d6cdf3b 100644
--- a/packages/@ember/component/text-field.ts
+++ b/packages/@ember/component/text-field.ts
@@ -4,16 +4,17 @@ import { deprecate } from '@ember/debug';
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   deprecate(
     `Using Ember.TextField or importing from 'TextField' has been deprecated, install the ` +
-      `\`ember-legacy-built-in-components\` addon and use \`import { TextField } from ` +
-      `'ember-legacy-built-in-components';\` instead`,
+      `\`@ember/legacy-built-in-components\` addon and use \`import { TextField } from ` +
+      `'@ember/legacy-built-in-components';\` instead`,
     false,
     {
-      id: 'ember.legacy-built-in-components',
+      id: 'ember.built-in-components.import',
       until: '4.0.0',
       for: 'ember-source',
       since: {
-        // TODO: update this when enabling the feature
+        enabled: '3.27.0',
       },
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
     }
   );
 }
diff --git a/packages/@ember/routing/link-component.ts b/packages/@ember/routing/link-component.ts
index e419425d424..8c3e4f86a60 100644
--- a/packages/@ember/routing/link-component.ts
+++ b/packages/@ember/routing/link-component.ts
@@ -4,16 +4,17 @@ import { deprecate } from '@ember/debug';
 if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   deprecate(
     `Using Ember.LinkComponent or importing from 'LinkComponent' has been deprecated, install the ` +
-      `\`ember-legacy-built-in-components\` addon and use \`import { LinkComponent } from ` +
-      `'ember-legacy-built-in-components';\` instead`,
+      `\`@ember/legacy-built-in-components\` addon and use \`import { LinkComponent } from ` +
+      `'@ember/legacy-built-in-components';\` instead`,
     false,
     {
-      id: 'ember.legacy-built-in-components',
+      id: 'ember.built-in-components.import',
       until: '4.0.0',
       for: 'ember-source',
       since: {
-        // TODO: update this when enabling the feature
+        enabled: '3.27.0',
       },
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
     }
   );
 }
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 43543fdb462..f9cd9a39659 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -513,17 +513,18 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
 
         if (availableInLegacyAddon) {
           message +=
-            ` Install the \`ember-legacy-built-in-components\` addon and use ` +
-            `\`import { ${name} } from 'ember-legacy-built-in-components';\` instead.`;
+            ` Install the \`@ember/legacy-built-in-components\` addon and use ` +
+            `\`import { ${name} } from '@ember/legacy-built-in-components';\` instead.`;
         }
 
         deprecate(message, false, {
-          id: 'ember.built-in-components.legacy-import',
+          id: 'ember.built-in-components.import',
           until: '4.0.0',
           for: 'ember-source',
           since: {
-            // TODO: update this when enabling the feature
+            enabled: '3.27.0',
           },
+          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
         });
 
         return value;
@@ -533,7 +534,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       enumerable: true,
     });
 
-    // Expose a non-deprecated version for tests and the ember-legacy-built-in-components addon
+    // Expose a non-deprecated version for tests and the @ember/legacy-built-in-components addon
     Ember[`_Legacy${name}`] = value;
   });
 } else {
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index b5e131eff1d..4bccf517f6b 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -66,7 +66,7 @@ moduleFor(
               ),
             publicPath === null
               ? `Using Ember.${name} is deprecated.`
-              : `Using Ember.${name} or importing from '${publicPath}' is deprecated. Install the \`ember-legacy-built-in-components\` addon and use \`import { ${name} } from 'ember-legacy-built-in-components';\` instead.`
+              : `Using Ember.${name} or importing from '${publicPath}' is deprecated. Install the \`@ember/legacy-built-in-components\` addon and use \`import { ${name} } from '@ember/legacy-built-in-components';\` instead.`
           );
         } catch (error) {
           assert.pushResult({

From 566af4941eb7ecaa4679e295ecfc38263d5ee1fe Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 12 May 2021 00:59:00 -0700
Subject: [PATCH 0499/1405] [CLEANUP] Deprecations URL consistency

https://emberjs.com/deprecations/* is a redirect for
https://deprecations.emberjs.com/*
---
 lib/index.js                                              | 2 +-
 packages/@ember/-internals/console/index.js               | 2 +-
 packages/@ember/-internals/glimmer/lib/component.ts       | 6 +++---
 .../-internals/glimmer/lib/components/abstract-input.ts   | 4 ++--
 .../@ember/-internals/glimmer/lib/modifiers/action.ts     | 2 +-
 packages/@ember/-internals/glimmer/lib/utils/managers.ts  | 6 +++---
 packages/@ember/-internals/metal/lib/computed.ts          | 6 +++---
 packages/@ember/-internals/metal/lib/mixin.ts             | 2 +-
 packages/@ember/-internals/routing/lib/system/route.ts    | 4 ++--
 packages/@ember/-internals/routing/lib/system/router.ts   | 8 ++++----
 packages/@ember/-internals/runtime/lib/copy.js            | 2 +-
 .../@ember/-internals/views/lib/mixins/action_support.js  | 2 +-
 .../@ember/-internals/views/lib/mixins/text_support.js    | 2 +-
 .../@ember/-internals/views/lib/mixins/view_support.js    | 2 +-
 .../views/lib/system/jquery_event_deprecation.js          | 2 +-
 packages/@ember/-internals/views/lib/system/utils.ts      | 2 +-
 packages/@ember/polyfills/lib/merge.ts                    | 2 +-
 .../lib/plugins/deprecate-send-action.ts                  | 6 +++---
 .../lib/plugins/transform-has-block-syntax.ts             | 2 +-
 packages/ember/index.js                                   | 4 ++--
 20 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 6be64ec350e..7b209f811b4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -281,7 +281,7 @@ module.exports = {
 
     if (targets.includes('ie 11')) {
       this.ui.writeWarnLine(
-        'Internet Explorer 11 is listed in your compilation targets, but it will no longer be supported in the next major version of Ember. Please update your targets to remove IE 11 and include new targets that are within the updated support policy. For details on the new browser support policy, see:\n\n - The official documentation: http://emberjs.com/browser-support\n - the deprecation guide: https://emberjs.com/deprecations/v3.x#toc_3-0-browser-support-policy\n'
+        'Internet Explorer 11 is listed in your compilation targets, but it will no longer be supported in the next major version of Ember. Please update your targets to remove IE 11 and include new targets that are within the updated support policy. For details on the new browser support policy, see:\n\n - The official documentation: http://emberjs.com/browser-support\n - the deprecation guide: https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy\n'
       );
     }
 
diff --git a/packages/@ember/-internals/console/index.js b/packages/@ember/-internals/console/index.js
index 41b97ec62c5..38bda85f0aa 100644
--- a/packages/@ember/-internals/console/index.js
+++ b/packages/@ember/-internals/console/index.js
@@ -6,7 +6,7 @@ import { LOGGER } from '@ember/deprecated-features';
 const DEPRECATION_MESSAGE = 'Use of Ember.Logger is deprecated. Please use `console` for logging.';
 const DEPRECATION_ID = 'ember-console.deprecate-logger';
 const DEPRECATION_URL =
-  'https://emberjs.com/deprecations/v3.x#toc_use-console-rather-than-ember-logger';
+  'https://deprecations.emberjs.com/v3.x#toc_use-console-rather-than-ember-logger';
 /**
    @module ember
 */
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 369b69a94ab..c5ffd019de8 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -687,7 +687,7 @@ const Component = CoreView.extend(
         {
           id: 'ember-views.event-dispatcher.mouseenter-leave-move',
           until: '4.0.0',
-          url: 'https://emberjs.com/deprecations/v3.x#toc_component-mouseenter-leave-move',
+          url: 'https://deprecations.emberjs.com/v3.x#toc_component-mouseenter-leave-move',
           for: 'ember-source',
           since: {
             enabled: '3.13.0-beta.1',
@@ -700,7 +700,7 @@ const Component = CoreView.extend(
         {
           id: 'ember-views.event-dispatcher.mouseenter-leave-move',
           until: '4.0.0',
-          url: 'https://emberjs.com/deprecations/v3.x#toc_component-mouseenter-leave-move',
+          url: 'https://deprecations.emberjs.com/v3.x#toc_component-mouseenter-leave-move',
           for: 'ember-source',
           since: {
             enabled: '3.13.0-beta.1',
@@ -713,7 +713,7 @@ const Component = CoreView.extend(
         {
           id: 'ember-views.event-dispatcher.mouseenter-leave-move',
           until: '4.0.0',
-          url: 'https://emberjs.com/deprecations/v3.x#toc_component-mouseenter-leave-move',
+          url: 'https://deprecations.emberjs.com/v3.x#toc_component-mouseenter-leave-move',
           for: 'ember-source',
           since: {
             enabled: '3.13.0-beta.1',
diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index 13096945949..f459d5fb704 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -239,7 +239,7 @@ export function handleDeprecatedFeatures(
               for: 'ember-source',
               since: {},
               until: '4.0.0',
-              url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+              url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
             }
           );
 
@@ -270,7 +270,7 @@ export function handleDeprecatedFeatures(
                 for: 'ember-source',
                 since: {},
                 until: '4.0.0',
-                url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
               }
             );
 
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index f3678a76b96..99d516c26af 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -223,7 +223,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
       {
         id: 'ember-views.event-dispatcher.mouseenter-leave-move',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_action-mouseenter-leave-move',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_action-mouseenter-leave-move',
         for: 'ember-source',
         since: {
           enabled: '3.13.0-beta.1',
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index d437227f0db..c12bf49ba41 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -22,7 +22,7 @@ export function setComponentManager(
       {
         id: 'deprecate-string-based-component-manager',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x/#toc_component-manager-string-lookup',
+        url: 'https://deprecations.emberjs.com/v3.x/#toc_component-manager-string-lookup',
         for: 'ember-source',
         since: {
           enabled: '3.8.0',
@@ -49,7 +49,7 @@ if (DEBUG) {
       version === '3.13',
       {
         id: 'manager-capabilities.components-3-4',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_manager-capabilities-components-3-4',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_manager-capabilities-components-3-4',
         until: '4.0.0',
         for: 'ember-source',
         since: {
@@ -67,7 +67,7 @@ if (DEBUG) {
       version === '3.22',
       {
         id: 'manager-capabilities.modifiers-3-13',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_manager-capabilities-modifiers-3-13',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_manager-capabilities-modifiers-3-13',
         until: '4.0.0',
         for: 'ember-source',
         since: {
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 630f1eade01..9f261df8c6f 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -510,7 +510,7 @@ export class ComputedProperty extends ComputedDescriptor {
       {
         id: 'computed-property.override',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-override',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_computed-property-override',
         for: 'ember-source',
         since: {
           enabled: '3.9.0-beta.1',
@@ -722,7 +722,7 @@ class ComputedDecoratorImpl extends Function {
       {
         id: 'computed-property.volatile',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-volatile',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_computed-property-volatile',
         for: 'ember-source',
         since: {
           enabled: '3.9.0-beta.1',
@@ -797,7 +797,7 @@ class ComputedDecoratorImpl extends Function {
       {
         id: 'computed-property.property',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_computed-property-property',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_computed-property-property',
         for: 'ember-source',
         since: {
           enabled: '3.9.0-beta.1',
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 7073f79f8c6..3878765daaa 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -841,7 +841,7 @@ if (ALIAS_METHOD) {
       {
         id: 'object.alias-method',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_object-alias-method',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_object-alias-method',
         for: 'ember-source',
         since: {
           enabled: '3.9.0',
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 60b87e409ea..1b295201c04 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2725,7 +2725,7 @@ if (ROUTER_EVENTS) {
           {
             id: 'deprecate-router-events',
             until: '4.0.0',
-            url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
             for: 'ember-source',
             since: {
               enabled: '3.11.0',
@@ -2741,7 +2741,7 @@ if (ROUTER_EVENTS) {
           {
             id: 'deprecate-router-events',
             until: '4.0.0',
-            url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
             for: 'ember-source',
             since: {
               enabled: '3.11.0',
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index b2466ece517..7c54fb58355 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -259,7 +259,7 @@ class EmberRouter extends EmberObject {
               {
                 id: 'deprecate-router-events',
                 until: '4.0.0',
-                url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+                url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
                 for: 'ember-source',
                 since: {
                   enabled: '3.11.0',
@@ -284,7 +284,7 @@ class EmberRouter extends EmberObject {
               {
                 id: 'deprecate-router-events',
                 until: '4.0.0',
-                url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-router-events',
+                url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
                 for: 'ember-source',
                 since: {
                   enabled: '3.11.0',
@@ -1552,7 +1552,7 @@ function updatePaths(router: EmberRouter) {
               id: 'application-controller.router-properties',
               until: '4.0.0',
               url:
-                'https://emberjs.com/deprecations/v3.x#toc_application-controller-router-properties',
+                'https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties',
               for: 'ember-source',
               since: {
                 enabled: '3.10.0-beta.1',
@@ -1575,7 +1575,7 @@ function updatePaths(router: EmberRouter) {
               id: 'application-controller.router-properties',
               until: '4.0.0',
               url:
-                'https://emberjs.com/deprecations/v3.x#toc_application-controller-router-properties',
+                'https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties',
               for: 'ember-source',
               since: {
                 enabled: '3.10.0-beta.1',
diff --git a/packages/@ember/-internals/runtime/lib/copy.js b/packages/@ember/-internals/runtime/lib/copy.js
index ea5add693ff..b3416485569 100644
--- a/packages/@ember/-internals/runtime/lib/copy.js
+++ b/packages/@ember/-internals/runtime/lib/copy.js
@@ -100,7 +100,7 @@ export default function copy(obj, deep) {
   deprecate('Use ember-copy addon instead of copy method and Copyable mixin.', false, {
     id: 'ember-runtime.deprecate-copy-copyable',
     until: '4.0.0',
-    url: 'https://emberjs.com/deprecations/v3.x/#toc_ember-runtime-deprecate-copy-copyable',
+    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-runtime-deprecate-copy-copyable',
     for: 'ember-source',
     since: {
       enabled: '3.3.0',
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.js b/packages/@ember/-internals/views/lib/mixins/action_support.js
index 159f6cc5b8b..db831a8aa7e 100644
--- a/packages/@ember/-internals/views/lib/mixins/action_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.js
@@ -135,7 +135,7 @@ if (SEND_ACTION) {
       {
         id: 'ember-component.send-action',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
         for: 'ember-source',
         since: {
           enabled: '3.4.0',
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index 08c5fed43e4..cd0a949302c 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -328,7 +328,7 @@ function sendAction(eventName, view, event) {
     deprecate(message, false, {
       id: 'ember-component.send-action',
       until: '4.0.0',
-      url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
       for: 'ember-source',
       since: {
         enabled: '3.4.0',
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.js
index 9e8867c5c98..5eb1e617f30 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.js
@@ -449,7 +449,7 @@ if (JQUERY_INTEGRATION) {
       {
         id: 'ember-views.curly-components.jquery-element',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-apis',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-apis',
         for: 'ember-source',
         since: {
           enabled: '3.9.0',
diff --git a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
index f86cf84ae55..fe91faa4d75 100644
--- a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
+++ b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
@@ -30,7 +30,7 @@ export default function addJQueryEventDeprecation(jqEvent) {
               {
                 id: 'ember-views.event-dispatcher.jquery-event',
                 until: '4.0.0',
-                url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-event',
+                url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-event',
                 for: 'ember-source',
                 since: {
                   enabled: '3.9.0',
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 81050f2b5bd..454676c0ea6 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -22,7 +22,7 @@ export function constructStyleDeprecationMessage(affectedStyle: string): string
     'Binding style attributes may introduce cross-site scripting vulnerabilities; ' +
     'please ensure that values being bound are properly escaped. For more information, ' +
     'including how to disable this warning, see ' +
-    'https://emberjs.com/deprecations/v1.x/#toc_binding-style-attributes. ' +
+    'https://deprecations.emberjs.com/v1.x/#toc_binding-style-attributes. ' +
     'Style affected: "' +
     affectedStyle +
     '"'
diff --git a/packages/@ember/polyfills/lib/merge.ts b/packages/@ember/polyfills/lib/merge.ts
index 3e7bf2c08d7..dfd90473a17 100644
--- a/packages/@ember/polyfills/lib/merge.ts
+++ b/packages/@ember/polyfills/lib/merge.ts
@@ -31,7 +31,7 @@ function merge(original: object, updates: object) {
   deprecate('Use of `merge` has been deprecated. Please use `assign` instead.', false, {
     id: 'ember-polyfills.deprecate-merge',
     until: '4.0.0',
-    url: 'https://emberjs.com/deprecations/v3.x/#toc_ember-polyfills-deprecate-merge',
+    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-polyfills-deprecate-merge',
     for: 'ember-source',
     since: {
       enabled: '3.6.0-beta.1',
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
index 8a7962172ed..5d72fb778bd 100644
--- a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
+++ b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
@@ -48,7 +48,7 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
                   deprecate(deprecationMessage(node, eventName, value.chars), false, {
                     id: 'ember-component.send-action',
                     until: '4.0.0',
-                    url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                    url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
                     for: 'ember-source',
                     since: {
                       enabled: '3.4.0',
@@ -61,7 +61,7 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
                   deprecate(deprecationMessage(node, eventName, value.path.original), false, {
                     id: 'ember-component.send-action',
                     until: '4.0.0',
-                    url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                    url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
                     for: 'ember-source',
                     since: {
                       enabled: '3.4.0',
@@ -83,7 +83,7 @@ export default function deprecateSendAction(env: EmberASTPluginEnvironment): AST
               deprecate(deprecationMessage(node, pair.key, pair.value.original), false, {
                 id: 'ember-component.send-action',
                 until: '4.0.0',
-                url: 'https://emberjs.com/deprecations/v3.x#toc_ember-component-send-action',
+                url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
                 for: 'ember-source',
                 since: {
                   enabled: '3.4.0',
diff --git a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
index 34ead65a659..ac45872bf34 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
@@ -42,7 +42,7 @@ export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment):
       {
         id: 'has-block-and-has-block-params',
         until: '4.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_has-block-and-has-block-params',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_has-block-and-has-block-params',
         for: 'ember-source',
         since: {
           enabled: '3.25.0',
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f9cd9a39659..b8f3b854bcd 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -143,7 +143,7 @@ deprecate(
   !isIE,
   {
     id: '3-0-browser-support-policy',
-    url: 'https://emberjs.com/deprecations/v3.x#toc_3-0-browser-support-policy',
+    url: 'https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy',
     until: '4.0.0',
     for: 'ember-source',
     since: {
@@ -645,7 +645,7 @@ if (JQUERY_INTEGRATION && !views.jQueryDisabled) {
         {
           id: 'ember-views.curly-components.jquery-element',
           until: '4.0.0',
-          url: 'https://emberjs.com/deprecations/v3.x#toc_jquery-apis',
+          url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-apis',
           for: 'ember-source',
           since: {
             enabled: '3.9.0',

From ac201b8e3e52226dbc74daf7be476985f9109a61 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 13 May 2021 06:22:24 -0700
Subject: [PATCH 0500/1405] Release notes for v3.27.1

(cherry picked from commit 8e57edd86d2c6a0171340b316b6c436b53efb7f6)
(cherry picked from commit b3b4e5386461f912f978edd20ff231d4261d2b93)
---
 CHANGELOG.md | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1072ab38dd4..f567da99d34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
+### v3.27.1 (May 13, 2021)
+
+- [#19540](https://github.com/emberjs/ember.js/pull/19540) [BUGFIX] Ensure ember-testing is loaded lazily
+- [#19541](https://github.com/emberjs/ember.js/pull/19541) [BUGFIX] Add missing metadata for some deprecations enabled in 3.27.0
+- [#19541](https://github.com/emberjs/ember.js/pull/19541) [BUGFIX] Ensure passing `@href` to `<LinkTo>` throws an error
+- [#19541](https://github.com/emberjs/ember.js/pull/19541) [CLEANUP] Consistently use https://deprecations.emberjs.com/ in deprecation URLs
+
 ### v3.27.0 (May 3, 2021)
 
 - [#19309](https://github.com/emberjs/ember.js/pull/19309) / [#19487](https://github.com/emberjs/ember.js/pull/19487) / [#19474](https://github.com/emberjs/ember.js/pull/19474) [FEATURE] Enable `(helper` and `(modifier` helpers per [RFC #432](https://github.com/emberjs/rfcs/blob/master/text/0432-contextual-helpers.md).
@@ -14,7 +21,7 @@
 - [#19442](https://github.com/emberjs/ember.js/pull/19442) [DEPRECATION] Add deprecation for `Route#render` method per [RFC #418](https://github.com/emberjs/rfcs/blob/master/text/0418-deprecate-route-render-methods.md).
 - [#19429](https://github.com/emberjs/ember.js/pull/19429) [DEPRECATION] `registerPlugin` / `unregisterPlugin` and legacy class based AST plugins (private APIs)
 - [#19499](https://github.com/emberjs/ember.js/pull/19499) [DEPRECATION] Deprecate `@foo={{helper}}` per [RFC #496](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#3-no-implicit-invocation-of-argument-less-helpers).
-- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX] Update rendering engine to `@glimmer/*` 0.78.2 for fixes including:  
+- [#19499](https://github.com/emberjs/ember.js/pull/19499) [BUGFIX] Update rendering engine to `@glimmer/*` 0.78.2 for fixes including:
     - `<:else>` and `<:inverse>` should be aliases (see https://github.com/glimmerjs/glimmer-vm/pull/1296)
     - Fix nested calls to helpers in dynamic helpers (see https://github.com/glimmerjs/glimmer-vm/pull/1293)
 - [#19477](https://github.com/emberjs/ember.js/pull/19477) [BUGFIX] Allow `<LinkToExternal />` to override internal assertion
@@ -106,7 +113,7 @@
 
 ### v3.24.0 (December 28, 2020)
 
-- [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md). 
+- [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md).
 - [#19133](https://github.com/emberjs/ember.js/pull/19133) [FEATURE / DEPRECATION] Add new options to `deprecate()` for `for` and `since` and deprecate using `deprecate()` without those options per the [Deprecation Staging RFC](https://github.com/emberjs/rfcs/blob/master/text/0649-deprecation-staging.md).
 - [#19211](https://github.com/emberjs/ember.js/pull/19211) [DEPRECATION] Deprecate `Ember.String.loc` and `{{loc}}` per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
 - [#19234](https://github.com/emberjs/ember.js/pull/19234) [DEPRECATION] Deprecate String Prototype extensions per the [Deprecate Ember String RFC](https://github.com/emberjs/rfcs/blob/master/text/0236-deprecation-ember-string.md).
@@ -130,7 +137,7 @@
 
 - [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).
 - [#19171](https://github.com/emberjs/ember.js/pull/19171) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements `invokeHelper` from the [JavaScript Helper Invocation API RFC](https://github.com/emberjs/rfcs/blob/master/text/0626-invoke-helper.md).
-- [#19148](https://github.com/emberjs/ember.js/pull/19148) / [#19119](https://github.com/emberjs/ember.js/pull/19119) Update rendering engine to `@glimmer/*` 0.62.1 
+- [#19148](https://github.com/emberjs/ember.js/pull/19148) / [#19119](https://github.com/emberjs/ember.js/pull/19119) Update rendering engine to `@glimmer/*` 0.62.1
 - [#19122](https://github.com/emberjs/ember.js/pull/19122) [BUGFIX] Prevents dynamic invocations of string values when referenced directly in angle brackets
 - [#19136](https://github.com/emberjs/ember.js/pull/19136) [BUGFIX] Update router microlib to improve Transition related debugging
 - [#19173](https://github.com/emberjs/ember.js/pull/19173) [BUGFIX] Enforce usage of `capabilities` generation.
@@ -159,7 +166,7 @@
 - [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).
 - [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
 - [#19086](https://github.com/emberjs/ember.js/pull/19086) [FEATURE] Pass transition object to activate/deactivate hooks and events
-- [#19094](https://github.com/emberjs/ember.js/pull/19094) [BUGFIX] Fix RouterService#isActive() to work with tracking 
+- [#19094](https://github.com/emberjs/ember.js/pull/19094) [BUGFIX] Fix RouterService#isActive() to work with tracking
 - [#19163](https://github.com/emberjs/ember.js/pull/19163) [BUGFIX] Use args proxy for modifier managers.
 - [#19170](https://github.com/emberjs/ember.js/pull/19170) [BUGFIX] Make modifier manager 3.22 accept the resolved value directly.
 - [#19124](https://github.com/emberjs/ember.js/pull/19124) [BUGFIX] Fix rendering engine usage within a `fastboot` sandbox
@@ -182,7 +189,7 @@
 
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
 - [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
-- [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive 
+- [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive
 
 ### v3.20.6 (November 11, 2020)
 
@@ -240,7 +247,7 @@
   - Fix: Rerender an `{{#each`s block only when the specific item has changed
 - [#18958](https://github.com/emberjs/ember.js/pull/18958) [BUGFIX] Ensure AST transforms using `in-element` work properly.
 - [#18960](https://github.com/emberjs/ember.js/pull/18960) [BUGFIX] More assertions for Application lifecycle methods
-- [#18919](https://github.com/emberjs/ember.js/pull/18919) [BUGFIX] Add error for modifier manager without capabilities. 
+- [#18919](https://github.com/emberjs/ember.js/pull/18919) [BUGFIX] Add error for modifier manager without capabilities.
 - [#18828](https://github.com/emberjs/ember.js/pull/18828) [BUGFIX] Prepend 'TODO: ' to 'Replace this with your real tests' comments in generated tests
 - [#18353](https://github.com/emberjs/ember.js/pull/18353) [BUGFIX] Improve `fn` & `on` undefined callback message
 - [#18824](https://github.com/emberjs/ember.js/pull/18824) [CLEANUP] Remove deprecated private `window.ENV`

From 844c2f493ee40ba47f2a67bc7e2d9afd725068f9 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Wed, 12 May 2021 20:34:46 +0200
Subject: [PATCH 0501/1405] Use explicit this in helper-test blueprints

---
 .../__root__/__testType__/__collection__/__name__-test.js       | 2 +-
 .../__root__/__testType__/__collection__/__name__-test.js       | 2 +-
 .../__root__/__testType__/__collection__/__name__-test.js       | 2 +-
 .../__root__/__testType__/__collection__/__name__-test.js       | 2 +-
 .../__root__/__testType__/__collection__/__name__-test.js       | 2 +-
 node-tests/fixtures/helper-test/integration.js                  | 2 +-
 node-tests/fixtures/helper-test/mocha-0.12.js                   | 2 +-
 node-tests/fixtures/helper-test/mocha-rfc232.js                 | 2 +-
 node-tests/fixtures/helper-test/mocha.js                        | 2 +-
 node-tests/fixtures/helper-test/rfc232.js                       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
index 5e27688598d..051de3a18f5 100644
--- a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
@@ -19,7 +19,7 @@ describe('<%= friendlyTestName %>', function() {
     // `);
     this.set('inputValue', '1234');
 
-    this.render(hbs`{{<%= dasherizedModuleName %> inputValue}}`);
+    this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
     expect(this.$().text().trim()).to.equal('1234');
   });
diff --git a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
index 0e9276ae197..89d55cf614c 100644
--- a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
@@ -19,7 +19,7 @@ describeComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleNam
       // `);
       this.set('inputValue', '1234');
 
-      this.render(hbs`{{<%= dasherizedModuleName %> inputValue}}`);
+      this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
       expect(this.$().text().trim()).to.equal('1234');
     });
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 62a21879351..9b6702f1fd8 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -11,7 +11,7 @@ describe('<%= friendlyTestName %>', function() {
   it('renders', async function() {
     this.set('inputValue', '1234');
 
-    await render(hbs`{{<%= dasherizedModuleName %> inputValue}}`);
+    await render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
     expect(this.element.textContent.trim()).to.equal('1234');
   });
diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
index 2182592ebcd..6bef509e111 100644
--- a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
@@ -9,7 +9,7 @@ moduleForComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleNa
 test('it renders', function(assert) {
   this.set('inputValue', '1234');
 
-  this.render(hbs`{{<%= dasherizedModuleName %> inputValue}}`);
+  this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
   assert.equal(this.$().text().trim(), '1234');
 });<% } else if (testType == 'unit') { %>
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 4ba1b477266..baf3d449ad1 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -10,7 +10,7 @@ module('<%= friendlyTestName %>', function(hooks) {
   test('it renders', async function(assert) {
     this.set('inputValue', '1234');
 
-    await render(hbs`{{<%= dasherizedModuleName %> inputValue}}`);
+    await render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
     assert.dom(this.element).hasText('1234');
   });
diff --git a/node-tests/fixtures/helper-test/integration.js b/node-tests/fixtures/helper-test/integration.js
index ad4f7e3782b..9abe683c279 100644
--- a/node-tests/fixtures/helper-test/integration.js
+++ b/node-tests/fixtures/helper-test/integration.js
@@ -9,7 +9,7 @@ moduleForComponent('foo/bar-baz', 'helper:foo/bar-baz', {
 test('it renders', function(assert) {
   this.set('inputValue', '1234');
 
-  this.render(hbs`{{foo/bar-baz inputValue}}`);
+  this.render(hbs`{{foo/bar-baz this.inputValue}}`);
 
   assert.equal(this.$().text().trim(), '1234');
 });
diff --git a/node-tests/fixtures/helper-test/mocha-0.12.js b/node-tests/fixtures/helper-test/mocha-0.12.js
index d2eb4578af0..b78ee50dc92 100644
--- a/node-tests/fixtures/helper-test/mocha-0.12.js
+++ b/node-tests/fixtures/helper-test/mocha-0.12.js
@@ -19,7 +19,7 @@ describe('Integration | Helper | foo/bar-baz', function() {
     // `);
     this.set('inputValue', '1234');
 
-    this.render(hbs`{{foo/bar-baz inputValue}}`);
+    this.render(hbs`{{foo/bar-baz this.inputValue}}`);
 
     expect(this.$().text().trim()).to.equal('1234');
   });
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232.js b/node-tests/fixtures/helper-test/mocha-rfc232.js
index 9944e574437..2337d5c74f2 100644
--- a/node-tests/fixtures/helper-test/mocha-rfc232.js
+++ b/node-tests/fixtures/helper-test/mocha-rfc232.js
@@ -11,7 +11,7 @@ describe('Integration | Helper | foo/bar-baz', function() {
   it('renders', async function() {
     this.set('inputValue', '1234');
 
-    await render(hbs`{{foo/bar-baz inputValue}}`);
+    await render(hbs`{{foo/bar-baz this.inputValue}}`);
 
     expect(this.element.textContent.trim()).to.equal('1234');
   });
diff --git a/node-tests/fixtures/helper-test/mocha.js b/node-tests/fixtures/helper-test/mocha.js
index bece512a42d..9e3c985f0e6 100644
--- a/node-tests/fixtures/helper-test/mocha.js
+++ b/node-tests/fixtures/helper-test/mocha.js
@@ -19,7 +19,7 @@ describeComponent('foo/bar-baz', 'helper:foo/bar-baz',
       // `);
       this.set('inputValue', '1234');
 
-      this.render(hbs`{{foo/bar-baz inputValue}}`);
+      this.render(hbs`{{foo/bar-baz this.inputValue}}`);
 
       expect(this.$().text().trim()).to.equal('1234');
     });
diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/rfc232.js
index e1b7290a2f3..c39592e478c 100644
--- a/node-tests/fixtures/helper-test/rfc232.js
+++ b/node-tests/fixtures/helper-test/rfc232.js
@@ -10,7 +10,7 @@ module('Integration | Helper | foo/bar-baz', function(hooks) {
   test('it renders', async function(assert) {
     this.set('inputValue', '1234');
 
-    await render(hbs`{{foo/bar-baz inputValue}}`);
+    await render(hbs`{{foo/bar-baz this.inputValue}}`);
 
     assert.dom(this.element).hasText('1234');
   });

From cd7b0169a0f475a5ca2d699745e8810e6c4761bf Mon Sep 17 00:00:00 2001
From: Bj Tecu <github@bujorel.net>
Date: Mon, 3 May 2021 18:42:16 -0400
Subject: [PATCH 0502/1405] Remove `Ember.Logger`

---
 packages/@ember/-internals/console/index.d.ts |  10 -
 packages/@ember/-internals/console/index.js   | 201 ------------------
 packages/@ember/deprecated-features/index.ts  |   1 -
 packages/ember/index.js                       |   8 +-
 packages/ember/tests/reexports_test.js        |   3 -
 5 files changed, 1 insertion(+), 222 deletions(-)
 delete mode 100644 packages/@ember/-internals/console/index.d.ts
 delete mode 100644 packages/@ember/-internals/console/index.js

diff --git a/packages/@ember/-internals/console/index.d.ts b/packages/@ember/-internals/console/index.d.ts
deleted file mode 100644
index bf03766f40b..00000000000
--- a/packages/@ember/-internals/console/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-declare const Logger: {
-  log(...args: string[]): void;
-  warn(...args: string[]): void;
-  error(...args: string[]): void;
-  info(...args: string[]): void;
-  debug(...args: string[]): void;
-  assert(...args: string[]): void;
-};
-
-export default Logger;
diff --git a/packages/@ember/-internals/console/index.js b/packages/@ember/-internals/console/index.js
deleted file mode 100644
index 38bda85f0aa..00000000000
--- a/packages/@ember/-internals/console/index.js
+++ /dev/null
@@ -1,201 +0,0 @@
-import { deprecate } from '@ember/debug';
-import { LOGGER } from '@ember/deprecated-features';
-
-// Deliver message that the function is deprecated
-
-const DEPRECATION_MESSAGE = 'Use of Ember.Logger is deprecated. Please use `console` for logging.';
-const DEPRECATION_ID = 'ember-console.deprecate-logger';
-const DEPRECATION_URL =
-  'https://deprecations.emberjs.com/v3.x#toc_use-console-rather-than-ember-logger';
-/**
-   @module ember
-*/
-
-/**
-  Inside Ember-Metal, simply uses the methods from `imports.console`.
-  Override this to provide more robust logging functionality.
-
-  @class Logger
-  @deprecated Use 'console' instead
-
-  @namespace Ember
-  @public
-*/
-let DEPRECATED_LOGGER;
-
-if (LOGGER) {
-  DEPRECATED_LOGGER = {
-    /**
-   Logs the arguments to the console.
-   You can pass as many arguments as you want and they will be joined together with a space.
-
-    ```javascript
-    var foo = 1;
-    Ember.Logger.log('log value of foo:', foo);
-    // "log value of foo: 1" will be printed to the console
-    ```
-
-   @method log
-   @for Ember.Logger
-   @param {*} arguments
-   @public
-  */
-    log() {
-      deprecate(DEPRECATION_MESSAGE, false, {
-        id: DEPRECATION_ID,
-        until: '4.0.0',
-        url: DEPRECATION_URL,
-        for: 'ember-source',
-        since: {
-          enabled: '3.2.0',
-        },
-      });
-      return console.log(...arguments); // eslint-disable-line no-console
-    },
-
-    /**
-   Prints the arguments to the console with a warning icon.
-   You can pass as many arguments as you want and they will be joined together with a space.
-
-    ```javascript
-    Ember.Logger.warn('Something happened!');
-    // "Something happened!" will be printed to the console with a warning icon.
-    ```
-
-   @method warn
-   @for Ember.Logger
-   @param {*} arguments
-   @public
-  */
-    warn() {
-      deprecate(DEPRECATION_MESSAGE, false, {
-        id: DEPRECATION_ID,
-        until: '4.0.0',
-        url: DEPRECATION_URL,
-        for: 'ember-source',
-        since: {
-          enabled: '3.2.0',
-        },
-      });
-      return console.warn(...arguments); // eslint-disable-line no-console
-    },
-
-    /**
-   Prints the arguments to the console with an error icon, red text and a stack trace.
-   You can pass as many arguments as you want and they will be joined together with a space.
-
-    ```javascript
-    Ember.Logger.error('Danger! Danger!');
-    // "Danger! Danger!" will be printed to the console in red text.
-    ```
-
-   @method error
-   @for Ember.Logger
-   @param {*} arguments
-   @public
-  */
-    error() {
-      deprecate(DEPRECATION_MESSAGE, false, {
-        id: DEPRECATION_ID,
-        until: '4.0.0',
-        url: DEPRECATION_URL,
-        for: 'ember-source',
-        since: {
-          enabled: '3.2.0',
-        },
-      });
-      return console.error(...arguments); // eslint-disable-line no-console
-    },
-
-    /**
-   Logs the arguments to the console.
-   You can pass as many arguments as you want and they will be joined together with a space.
-
-    ```javascript
-    var foo = 1;
-    Ember.Logger.info('log value of foo:', foo);
-    // "log value of foo: 1" will be printed to the console
-    ```
-
-   @method info
-   @for Ember.Logger
-   @param {*} arguments
-   @public
-  */
-    info() {
-      deprecate(DEPRECATION_MESSAGE, false, {
-        id: DEPRECATION_ID,
-        until: '4.0.0',
-        url: DEPRECATION_URL,
-        for: 'ember-source',
-        since: {
-          enabled: '3.2.0',
-        },
-      });
-      return console.info(...arguments); // eslint-disable-line no-console
-    },
-
-    /**
-   Logs the arguments to the console in blue text.
-   You can pass as many arguments as you want and they will be joined together with a space.
-
-    ```javascript
-    var foo = 1;
-    Ember.Logger.debug('log value of foo:', foo);
-    // "log value of foo: 1" will be printed to the console
-    ```
-
-   @method debug
-   @for Ember.Logger
-   @param {*} arguments
-   @public
-  */
-    debug() {
-      deprecate(DEPRECATION_MESSAGE, false, {
-        id: DEPRECATION_ID,
-        until: '4.0.0',
-        url: DEPRECATION_URL,
-        for: 'ember-source',
-        since: {
-          enabled: '3.2.0',
-        },
-      });
-      /* eslint-disable no-console */
-      if (console.debug) {
-        return console.debug(...arguments);
-      }
-      return console.info(...arguments);
-      /* eslint-enable no-console */
-    },
-
-    /**
-   If the value passed into `Ember.Logger.assert` is not truthy it will throw an error with a stack trace.
-
-    ```javascript
-    Ember.Logger.assert(true); // undefined
-    Ember.Logger.assert(true === false); // Throws an Assertion failed error.
-    Ember.Logger.assert(true === false, 'Something invalid'); // Throws an Assertion failed error with message.
-    ```
-
-   @method assert
-   @for Ember.Logger
-   @param {Boolean} bool Value to test
-   @param {String} message Assertion message on failed
-   @public
-  */
-    assert() {
-      deprecate(DEPRECATION_MESSAGE, false, {
-        id: DEPRECATION_ID,
-        until: '4.0.0',
-        url: DEPRECATION_URL,
-        for: 'ember-source',
-        since: {
-          enabled: '3.2.0',
-        },
-      });
-      return console.assert(...arguments); // eslint-disable-line no-console
-    },
-  };
-}
-
-export default DEPRECATED_LOGGER;
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index d38c8bf6697..d750d8b3876 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -5,7 +5,6 @@
 
 export const SEND_ACTION = !!'3.4.0';
 export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
-export const LOGGER = !!'3.2.0-beta.1';
 export const MERGE = !!'3.6.0-beta.1';
 export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index b8f3b854bcd..5038fdeb908 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -16,7 +16,6 @@ import {
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
 import Backburner from 'backburner';
-import Logger from '@ember/-internals/console';
 import Controller, { inject as injectController } from '@ember/controller';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
 import {
@@ -100,7 +99,7 @@ import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
-import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
+import { EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 
 import {
   templateOnlyComponent,
@@ -376,11 +375,6 @@ Object.defineProperty(Ember, 'testing', {
 
 Ember._Backburner = Backburner;
 
-// ****@ember/-internals/console****
-if (LOGGER) {
-  Ember.Logger = Logger;
-}
-
 // ****@ember/-internals/runtime****
 Ember.A = A;
 Ember.String = {
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 4bccf517f6b..8960a2a1e1a 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -519,9 +519,6 @@ let allExports = [
   // @ember/-internals/meta
   ['meta', '@ember/-internals/meta'],
 
-  // @ember/-internals/console
-  ['Logger', '@ember/-internals/console', 'default'],
-
   // @ember/-internals/views
   ['ViewUtils.isSimpleClick', '@ember/-internals/views', 'isSimpleClick'],
   ['ViewUtils.getElementView', '@ember/-internals/views', 'getElementView'],

From ec4c034f974753cc3c291d2d93ecf1ac469e64ed Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Wed, 19 May 2021 16:27:03 -0700
Subject: [PATCH 0503/1405] [BUGFIX release] Make {{hash}} object properties
 settables

Makes all {{hash}} object properties settable, but deprecates setting
them.
---
 package.json                                  |  26 +-
 .../-internals/glimmer/lib/environment.ts     |   8 +
 .../tests/integration/helpers/hash-test.js    |  76 +++++-
 yarn.lock                                     | 252 +++++++++---------
 4 files changed, 222 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index 903fad36c42..da58bfaf4f8 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.79.1",
+    "@glimmer/vm-babel-plugins": "0.79.2",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.79.1",
-    "@glimmer/destroyable": "0.79.1",
+    "@glimmer/compiler": "0.79.2",
+    "@glimmer/destroyable": "0.79.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.79.1",
-    "@glimmer/interfaces": "0.79.1",
-    "@glimmer/manager": "0.79.1",
-    "@glimmer/node": "0.79.1",
-    "@glimmer/opcode-compiler": "0.79.1",
-    "@glimmer/owner": "0.79.1",
-    "@glimmer/program": "0.79.1",
-    "@glimmer/reference": "0.79.1",
-    "@glimmer/runtime": "0.79.1",
-    "@glimmer/validator": "0.79.1",
+    "@glimmer/global-context": "0.79.2",
+    "@glimmer/interfaces": "0.79.2",
+    "@glimmer/manager": "0.79.2",
+    "@glimmer/node": "0.79.2",
+    "@glimmer/opcode-compiler": "0.79.2",
+    "@glimmer/owner": "0.79.2",
+    "@glimmer/program": "0.79.2",
+    "@glimmer/reference": "0.79.2",
+    "@glimmer/runtime": "0.79.2",
+    "@glimmer/validator": "0.79.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 75f2b5b281c..12a91fcb41d 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -125,6 +125,14 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
       enabled: '3.27.0',
     },
   },
+  {
+    id: 'setting-on-hash',
+    until: '4.4.0',
+    for: 'ember-source',
+    since: {
+      enabled: '3.28.0',
+    },
+  },
 ];
 
 const VM_ASSERTION_OVERRIDES: { id: string; message: string }[] = [];
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index c827f9694df..3cd67140fd5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -2,7 +2,8 @@ import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
 import { Component } from '../../utils/helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set, computed } from '@ember/-internals/metal';
+import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 
 moduleFor(
   'Helpers test: {{hash}}',
@@ -186,5 +187,78 @@ moduleFor(
 
       this.assertText('Chad Hietala');
     }
+
+    ['@test works with computeds']() {
+      let FooBarComponent = Component.extend({
+        fullName: computed('hash.firstName', 'hash.lastName', function () {
+          return `${this.hash.firstName} ${this.hash.lastName}`;
+        }),
+      });
+
+      this.registerComponent('foo-bar', {
+        ComponentClass: FooBarComponent,
+        template: `{{this.fullName}}`,
+      });
+
+      this.render(`{{foo-bar hash=(hash firstName=this.firstName lastName=this.lastName)}}`, {
+        firstName: 'Chad',
+        lastName: 'Hietala',
+      });
+
+      this.assertText('Chad Hietala');
+
+      runTask(() => this.rerender());
+
+      this.assertText('Chad Hietala');
+
+      runTask(() => {
+        set(this.context, 'firstName', 'Godfrey');
+        set(this.context, 'lastName', 'Chan');
+      });
+
+      this.assertText('Godfrey Chan');
+    }
+
+    ['@test works when properties are set dynamically']() {
+      let fooBarInstance;
+      let FooBarComponent = Component.extend({
+        init() {
+          this._super();
+          fooBarInstance = this;
+        },
+      });
+
+      this.registerComponent('foo-bar', {
+        ComponentClass: FooBarComponent,
+        template: `{{this.hash.firstName}} {{this.hash.lastName}}`,
+      });
+
+      this.render(`{{foo-bar hash=(hash firstName=this.firstName)}}`, {
+        firstName: 'Chad',
+      });
+
+      this.assertText('Chad ');
+
+      runTask(() => {
+        if (HAS_NATIVE_PROXY) {
+          expectDeprecation(() => {
+            set(fooBarInstance.hash, 'lastName', 'Hietala');
+          }, /You set the '.*' property on a {{hash}} object/);
+        } else {
+          set(fooBarInstance.hash, 'lastName', 'Hietala');
+        }
+      });
+
+      this.assertText('Chad Hietala');
+
+      runTask(() => {
+        expectDeprecation(() => {
+          set(fooBarInstance.hash, 'firstName', 'Godfrey');
+          set(fooBarInstance.hash, 'lastName', 'Chan');
+        }, /You set the '.*' property on a {{hash}} object/);
+      });
+
+      this.assertText('Godfrey Chan');
+    }
   }
 );
diff --git a/yarn.lock b/yarn.lock
index 2468f9b5ec3..2f14a5d8e79 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,52 +1588,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.1.tgz#b169364387e04fe63f18b1433dbbf4c217d1f379"
-  integrity sha512-gR6Il358TCwQ/u4Q8Z/i/FqvDT21GesphG3jd6BlKdaCrIxoffX0WJlMLLdq+WwH90D2FXnzESCkBUbi3FC4rA==
-  dependencies:
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/syntax" "0.79.1"
-    "@glimmer/util" "0.79.1"
-    "@glimmer/wire-format" "0.79.1"
+"@glimmer/compiler@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.2.tgz#b874e59de7ad3317c6c28dd781dbc8c08a5942b4"
+  integrity sha512-FbN9/lJyRHOmy4bBPqU/TdiPhN/dSIEJA6Y0dyAu03zuHJqBMd5rtHLm1CRdII9dDwU6T6B09aDlsBBAt8FQcA==
+  dependencies:
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/syntax" "0.79.2"
+    "@glimmer/util" "0.79.2"
+    "@glimmer/wire-format" "0.79.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.1.tgz#a5e327fa4fc5a8171ab49db90acc7cc9ec686459"
-  integrity sha512-t69g/x5BTmNupkGTT053aQWD4HbMAkyJVX+kC7cJv1q8V3FS9FMbyhp0wy7iGhbKRrhQ/YQCTFzn75b7kWsSTQ==
+"@glimmer/destroyable@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.2.tgz#50b473483d2d45fb3fa12a28719495af683dd695"
+  integrity sha512-owBXBWHQuLN5lzbG+3yzupnTGQj6ttPAx0KTCiUBfH0BpE7tKx+w52MA87bt5GJRX+RS0g57Z1DLQy2yLavfFQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.1"
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/util" "0.79.1"
+    "@glimmer/global-context" "0.79.2"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/util" "0.79.2"
 
-"@glimmer/encoder@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.1.tgz#be86d96be3eb87ccc2745fb286f7d2dc96f8bbde"
-  integrity sha512-SKnzRb9/+G12yV+SrQ//jfH2fU5W5M9wwJ0TPjCQR5xYY/FfZlWF4yF89436x4Dby4pvbFipTDmU9V2mLwzkjw==
+"@glimmer/encoder@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.2.tgz#e3e3ebc85ba210cffdb4c66dd4bdd2e07d864dad"
+  integrity sha512-MqFWJ4rGcikk27iUOkHc2vtnC+cVO2XBQHk6m+T5LEkLHFEC0JEDSj+POxHoHnkjXi8BxbxUxxOptz85p0LGWg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/vm" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/vm" "0.79.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.1.tgz#3d74868a143991f771a7680b72081a04528c292f"
-  integrity sha512-AtfbeLMgksVZ1Df94e2nUjXs4tqwkGlxsBF4P62rDmXI82KxwFFj9Qa1sqWcUIbK1I3FRrYhGKSKroPCS1wiHg==
+"@glimmer/global-context@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.2.tgz#970276f1c7c44d34b4bd619709de78b1f46fabaf"
+  integrity sha512-Cwna7I28+6amQd+n4/6sc8PccI3cyk/fIWoxzOKBTA0AqJp/HetiE2IvLQI97VCx/Rv338IINzIu4JlfymWnXA==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.1.tgz#c25bb029450e8666d7a4e09da8669437eee237d1"
-  integrity sha512-Mz7118uYtHAodvuNPQFzJLwCleBsh1bx/7H5LH6liCE720OOz1PD2hhamMntpetuvgkpX8OnVDp99BB7bH3/Hg==
+"@glimmer/interfaces@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.2.tgz#387d11f69ced699e2a227ab9095bd9970829cbf5"
+  integrity sha512-2+CulmZ5XV3Mq2xG4qYPCcA8LVZq76OixdyLHvkGLEvwFx1J2gixcKK0+KNc0dr+Iia6Ebmu9sntulFCRguMgw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1642,140 +1642,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.1.tgz#fb72af7a731eefaf044e3160e5ec684abd89976d"
-  integrity sha512-JUaaZ009APgVuqdh6o1+l4j/aAAZ3oBdrwhecee4h64xW0WSi0cWwJ4lri13NI7ko3Ig4+dcTdDYLvfeSHFLBA==
+"@glimmer/manager@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.2.tgz#6b5a5d393483522636bc4c4b34604246950b7b08"
+  integrity sha512-1lzO8Ud7cJWmBaM7lru8dJvtgivzE5mEhkd7LwfLc/UPNNCOHY/fkfypPr0/C2nQLksVLnMB28pDsQThqoGmZQ==
   dependencies:
-    "@glimmer/destroyable" "0.79.1"
+    "@glimmer/destroyable" "0.79.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/reference" "0.79.1"
-    "@glimmer/util" "0.79.1"
-    "@glimmer/validator" "0.79.1"
-
-"@glimmer/node@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.1.tgz#8b511852bdf710867f282208141092f679ac829e"
-  integrity sha512-CK+M2HfWZ068+MLFZQBCjPuUTdSO8r7x6F8fPX7Te/Yo8KYKO4eSIzkOTAcpXX1t1xMOMzQyDaLXtnftQhaSaw==
-  dependencies:
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/runtime" "0.79.1"
-    "@glimmer/util" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/reference" "0.79.2"
+    "@glimmer/util" "0.79.2"
+    "@glimmer/validator" "0.79.2"
+
+"@glimmer/node@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.2.tgz#7ead836a2ff17273ddd37351c9f6470f17a60f1e"
+  integrity sha512-2NcWC1PzF/Ru8Xr3h8cuGUumauZMLbyTo24wzJDFCruoMIpizbxcBWGVHuFnH1Cdg8e+fu6eICsCaItVvoJNIw==
+  dependencies:
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/runtime" "0.79.2"
+    "@glimmer/util" "0.79.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.1.tgz#e3f567423ef4a66c52b8fcaf90af94b7db97a8ab"
-  integrity sha512-hWQucLIPclR/nxnU7KeXvQXE061rJcKcgbBjJeZPp+/Dbo8550coyUBaGSRS/mvNx/MFs16jcCcU7P1f+fiZJg==
+"@glimmer/opcode-compiler@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.2.tgz#997fc9cb559512afc7eb059d80e27ca58009a715"
+  integrity sha512-sXqzgYfK06ZSHzvVq0ChTx8C/2+A33E3se53wfODXZ88XAGyalTX9U2tHbfKIk3tgOUuMncNfT02NFRDZ/KnmA==
   dependencies:
-    "@glimmer/encoder" "0.79.1"
+    "@glimmer/encoder" "0.79.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/reference" "0.79.1"
-    "@glimmer/util" "0.79.1"
-    "@glimmer/vm" "0.79.1"
-    "@glimmer/wire-format" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/reference" "0.79.2"
+    "@glimmer/util" "0.79.2"
+    "@glimmer/vm" "0.79.2"
+    "@glimmer/wire-format" "0.79.2"
 
-"@glimmer/owner@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.1.tgz#fc0fbca08aef9b20c095e26e90c4d58bd6d8a189"
-  integrity sha512-nYwkKfATwNXdkMfS9Bgyps/TtCnadmpoka59seQAYV2LuwH8tuJfrme2j6mZXkQ7LMoZZY/JPJ94CiwJLfFGvA==
+"@glimmer/owner@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.2.tgz#562805781e235388a17f15c69ae72e834d680325"
+  integrity sha512-W5ZejPXyKWeCJF+6+Rv3+mkCJ56eLv+gtesggaVosbXwgL6QnUySjOdvTOwZ++HUYm6WCLognnO+XNzV25oHcQ==
   dependencies:
-    "@glimmer/util" "0.79.1"
+    "@glimmer/util" "0.79.2"
 
-"@glimmer/program@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.1.tgz#e0523b8eea8075a50adc39d26d2fb2a284b71088"
-  integrity sha512-4cvWEnniwoNbCrv6FZUO/xIU+OORCRv7e7DTLjneXwuQbBqxPWUwEutQRTQNAsojfg34q5++fK9okLxkqtoBkA==
+"@glimmer/program@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.2.tgz#755c50144ddc9b8aacf47082347552ec86207217"
+  integrity sha512-w2xI7Wz7CHx1HS49c6yZToa7XX29vhO+ydWJabMWqoaktvOTBFKZPfwVLIS7mjIe3rwQVose+VIUmbQ1IzwCQg==
   dependencies:
-    "@glimmer/encoder" "0.79.1"
+    "@glimmer/encoder" "0.79.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/manager" "0.79.1"
-    "@glimmer/opcode-compiler" "0.79.1"
-    "@glimmer/util" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/manager" "0.79.2"
+    "@glimmer/opcode-compiler" "0.79.2"
+    "@glimmer/util" "0.79.2"
 
-"@glimmer/reference@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.1.tgz#c3b998a815a9f7ab1a60d8a4d4fbf9c242077a89"
-  integrity sha512-HNzaQRGjNMk7WKzscPBAvQWsP9C5AtHPXj7t+4Na4tnM3DXc81CSqjinJVaXP/M6n22cADkO1uu6m6P5hGuT0w==
+"@glimmer/reference@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.2.tgz#070c16268dc22341aa6ffd30b6dee88cd9cf63d4"
+  integrity sha512-OobgRrcegj88E8peRHnb1KilCemEK2hF89diUkpnQAO7rOTQknnbyzxO3UgVgm/arEcW4+Ga6T+sirumJ5bKIA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.1"
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/util" "0.79.1"
-    "@glimmer/validator" "0.79.1"
+    "@glimmer/global-context" "0.79.2"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/util" "0.79.2"
+    "@glimmer/validator" "0.79.2"
 
-"@glimmer/runtime@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.1.tgz#22ef9e676b5724d1a599a9eeaf8fbc152e988e2b"
-  integrity sha512-6kdPfzWy3SfQrbVjQGuwzY5FRC0//N+VqQW7G/bpgvpHuKuYBzBX74alMOXbokTpDwoVky7GAS6hMxhHPDEeIw==
+"@glimmer/runtime@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.2.tgz#93d0285db9d19313a0d477548e4d4af880701bcc"
+  integrity sha512-FFjDVR1JQaczO+wIRudhCwAeRKUjXB+ZqhOskSEboGbVjSq4v9nxooYVf+np5SEpwPNvlqX6lEW6H7/nfusv0Q==
   dependencies:
-    "@glimmer/destroyable" "0.79.1"
+    "@glimmer/destroyable" "0.79.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.1"
-    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/global-context" "0.79.2"
+    "@glimmer/interfaces" "0.79.2"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.79.1"
-    "@glimmer/program" "0.79.1"
-    "@glimmer/reference" "0.79.1"
-    "@glimmer/util" "0.79.1"
-    "@glimmer/validator" "0.79.1"
-    "@glimmer/vm" "0.79.1"
-    "@glimmer/wire-format" "0.79.1"
+    "@glimmer/owner" "0.79.2"
+    "@glimmer/program" "0.79.2"
+    "@glimmer/reference" "0.79.2"
+    "@glimmer/util" "0.79.2"
+    "@glimmer/validator" "0.79.2"
+    "@glimmer/vm" "0.79.2"
+    "@glimmer/wire-format" "0.79.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.1.tgz#845f19424705e27f4ef8ab1358057c77da8b4fbc"
-  integrity sha512-dbdK4un1u2GB2i8n7PUOC+nKS6HQuMxFmpiy/GNL8hIvf6i33nqtdAZ7S4UJx65V7weOqLMwhrzhEN3+901I8g==
+"@glimmer/syntax@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.2.tgz#fcd6e742860ca39230043969fb04644d5cc6a5c9"
+  integrity sha512-65ZXxIM38EMKESWgvTU31ouZiQAELRO/LmOfzTJZlYH5LhSAZWSQ7tatYXDrcjPoiDojLO0a16WccZggM1etmg==
   dependencies:
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/util" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/util" "0.79.2"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.1.tgz#35b74f58712bbfcde973947449aac9b08fa38067"
-  integrity sha512-NNeTAh9NsqZLiG8to8RJzEDrUkf8h3eVBxVtRC63xOb4Pq5fQFv3B5E51ibv83yPvCyD+y/bMnInB1ep5gneYQ==
+"@glimmer/util@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.2.tgz#7c8e1684f1ad48430b7ed64a2319051b5975ccf9"
+  integrity sha512-jELDUEoNx0CCHboHFdinQu8W5ye5a7kW6fyR4Pb0zN4PPHKybOjieE6jf5l60R0pBGyqU8W8/S+CeiNgM/AU8g==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.1.tgz#2735fc04c5ddb20c8033282a36c53d76b4ec688b"
-  integrity sha512-S8DXscr6a9N9rNeEfEfvAAEVTs27tFiy0Zk2xF4scq3hazWWwO9AOq8ERw4tY8Ecj9dkZH3JKZmBKZYTfWR13Q==
+"@glimmer/validator@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.2.tgz#b132673925ce79842b4c4ef1ecbf170aa3c0daa7"
+  integrity sha512-BtSp/izgnhZHPC2onEKa4H+v6ovaq6snwLQcWHPtoenVpn5Y7KbwSy6qSuW5+NaW+XaO3ryvJbZYlDB3dDGuTw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.1"
+    "@glimmer/global-context" "0.79.2"
 
-"@glimmer/vm-babel-plugins@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.1.tgz#dfe40bbc6b32e102e72dc2256f1fc1a4a9eb03b9"
-  integrity sha512-f6nyuumSpaQKsZsRvafnTGlcrcMA9qzqAGehnEMOsfxZJmGz19+qTlMvc1/JTUjX8YztYnH4RHkiLn93H0H8JA==
+"@glimmer/vm-babel-plugins@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.2.tgz#8fa4af60c5089977690ee501c7b358c90b8d6bc5"
+  integrity sha512-c5XQQwM8iogT1mdE/U2+UuGsiFmhP4d53lgXOAq1DQ2/AMFlAXa5djMVETDUlncvLLlo6S3Iaj/FvpqTxwqn2g==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.1.tgz#3d14b5abf5a26bb4803d43b5a10383ebcd3e0363"
-  integrity sha512-hu617ceRYg93bnzJPFAzn5Zks91GOzpqV235t6Q32Ldk4x0srQfk58KYaS6omPj9IvtQzQQjAAeRaFswyPYrig==
+"@glimmer/vm@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.2.tgz#cbebf74fae0cd413486f7a4ca31715eb8ab9a39d"
+  integrity sha512-4Bbg7eDLymuV7wiM0GVbIYnQMZxo/Dn+PF1+w5mWUjHqH+ajNKNARJVt3+w+M1tg5Q/nblBVHshNzYwFaugagA==
   dependencies:
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/util" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/util" "0.79.2"
 
-"@glimmer/wire-format@0.79.1":
-  version "0.79.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.1.tgz#4cb0a0bca7bb629f30565a0cb738550ad447535d"
-  integrity sha512-YUBGRaD+4R4yyjp09CdEiGH0o/zOo8ZKWs3iwvAewDJpijW33EjCbNyR6yCAK3tQVSAGiQ354BYht77Z7sDXZg==
+"@glimmer/wire-format@0.79.2":
+  version "0.79.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.2.tgz#adb88d25752e00f0f9d3f609c1ab458ca2cac932"
+  integrity sha512-jYiEbRtHGs2auQWOmEEDbT3p9zTqAVUzKkpWzoc9u6fEC8/QfcT3FuLW7S3YjLzauPiIlOQyDVeC5IvhyZag9w==
   dependencies:
-    "@glimmer/interfaces" "0.79.1"
-    "@glimmer/util" "0.79.1"
+    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/util" "0.79.2"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 41488b8c8e29b1909b0a3c0b3383443fa46e84bd Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Mon, 24 May 2021 20:55:05 +0200
Subject: [PATCH 0504/1405] [DOC] Link the `templateOnly` docs to the correct
 package

This makes sure the `templateOnly` documentation appears in the right place.
---
 packages/@ember/component/template-only.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@ember/component/template-only.ts b/packages/@ember/component/template-only.ts
index 4fda1e66fe8..509390074fb 100644
--- a/packages/@ember/component/template-only.ts
+++ b/packages/@ember/component/template-only.ts
@@ -23,8 +23,10 @@
   ```
 
   @public
+  @static
   @method templateOnly
   @param {String} moduleName the module name that the template only component represents, this will be used for debugging purposes
+  @for @ember/component/template-only
   @category EMBER_GLIMMER_SET_COMPONENT_TEMPLATE
 */
 export { templateOnlyComponent as default } from '@glimmer/runtime';

From d8f28f42043f077e1b81290d9903c4dd13dca163 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 28 Apr 2021 15:45:09 -0700
Subject: [PATCH 0505/1405] Improve types for @ember/object

Includes:
  - Object, { action } from '@ember/object'
  - CoreObject from '@ember/object/core'
  - Observable from '@ember/object/observable'

Note that types for `extend`, `reopen`, and `reopenClass` are not
exported. Also, `get` and `set` have naive types. All of these will
be deprecated in future releases.
---
 package.json                                  |   4 +-
 .../angle-bracket-invocation-test.js          |   9 +-
 packages/@ember/-internals/metal/lib/mixin.ts |  10 +-
 .../-internals/routing/lib/location/api.ts    |   1 +
 .../routing/lib/location/auto_location.ts     | 143 ++++---
 .../routing/lib/location/hash_location.ts     |   5 +
 .../routing/lib/location/history_location.ts  |   9 +-
 .../routing/lib/location/none_location.ts     |  21 +-
 .../-internals/routing/lib/system/route.ts    | 368 +++++++++--------
 .../-internals/routing/lib/system/router.ts   | 375 ++++++++++--------
 packages/@ember/-internals/runtime/index.d.ts |  48 ++-
 .../runtime/type-tests/core.test.ts           |  25 ++
 .../runtime/types/-private/types.d.ts         |  41 ++
 .../@ember/-internals/runtime/types/core.d.ts |  87 ++++
 .../-internals/runtime/types/evented.d.ts     |  48 +++
 .../-internals/runtime/types/mixin.d.ts       |   3 +
 .../-internals/runtime/types/observable.d.ts  |  81 ++++
 packages/@ember/object/index.d.ts             |   2 +
 .../@ember/object/type-tests/core.test.ts     |   5 +
 .../@ember/object/type-tests/index.test.ts    |   5 +
 .../object/type-tests/observable.test.ts      |   5 +
 packages/@ember/object/types/core.d.ts        |   1 +
 packages/@ember/object/types/observable.d.ts  |   2 +
 tests/docs/expected.js                        |   1 -
 tsconfig.json                                 |  13 +-
 yarn.lock                                     |  10 +
 26 files changed, 902 insertions(+), 420 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/type-tests/core.test.ts
 create mode 100644 packages/@ember/-internals/runtime/types/-private/types.d.ts
 create mode 100644 packages/@ember/-internals/runtime/types/core.d.ts
 create mode 100644 packages/@ember/-internals/runtime/types/evented.d.ts
 create mode 100644 packages/@ember/-internals/runtime/types/mixin.d.ts
 create mode 100644 packages/@ember/-internals/runtime/types/observable.d.ts
 create mode 100644 packages/@ember/object/type-tests/core.test.ts
 create mode 100644 packages/@ember/object/type-tests/index.test.ts
 create mode 100644 packages/@ember/object/type-tests/observable.test.ts
 create mode 100644 packages/@ember/object/types/core.d.ts
 create mode 100644 packages/@ember/object/types/observable.d.ts

diff --git a/package.json b/package.json
index 6cd42c30e89..bedb2f2af7a 100644
--- a/package.json
+++ b/package.json
@@ -125,6 +125,7 @@
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-qunit": "^4.0.0",
     "execa": "^2.0.4",
+    "expect-type": "^0.11.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
     "fs-extra": "^9.0.1",
@@ -147,7 +148,8 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.1.0",
     "testem-failure-only-reporter": "^0.0.1",
-    "tslint": "^5.20.1"
+    "tslint": "^5.20.1",
+    "typescript": "^4.2.4"
   },
   "engines": {
     "node": "10.* || >= 12.*"
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 883dc285295..34a696ab571 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -550,10 +550,13 @@ moduleFor(
     }
 
     '@test positional parameters are not allowed'() {
+      let TestComponent = class extends Component {};
+      TestComponent.reopenClass({
+        positionalParams: ['first', 'second'],
+      });
+
       this.registerComponent('sample-component', {
-        ComponentClass: Component.extend().reopenClass({
-          positionalParams: ['first', 'second'],
-        }),
+        ComponentClass: TestComponent,
         template: '{{this.first}}{{this.second}}',
       });
 
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 7073f79f8c6..876b7ce997a 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -273,7 +273,15 @@ function mergeMixins(
         }
       }
     } else {
-      mergeProps(meta, currentMixin, descs, values, base, keys, keysWithSuper);
+      mergeProps(
+        meta,
+        currentMixin as { [key: string]: any },
+        descs,
+        values,
+        base,
+        keys,
+        keysWithSuper
+      );
     }
   }
 }
diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index 208f0756b59..cc4ac1d2040 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -10,6 +10,7 @@ export interface EmberLocation {
   formatURL(url: string): string;
   detect?(): void;
   initState?(): void;
+  destroy(): void;
 }
 
 export type UpdateCallback = (url: string) => void;
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 8122bdc623e..2dc61ce7524 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -62,13 +62,94 @@ import {
   @protected
 */
 export default class AutoLocation extends EmberObject implements EmberLocation {
-  cancelRouterSetup?: boolean | undefined;
   getURL!: () => string;
   setURL!: (url: string) => void;
   onUpdateURL!: (callback: UpdateCallback) => void;
   formatURL!: (url: string) => string;
 
+  concreteImplementation?: EmberLocation;
+
   implementation = 'auto';
+
+  // FIXME: This is never set
+  // See https://github.com/emberjs/ember.js/issues/19515
+  documentMode: number | undefined;
+
+  /**
+    @private
+
+    Will be pre-pended to path upon state change.
+
+    @since 1.5.1
+    @property rootURL
+    @default '/'
+  */
+  // Added in reopen to allow overriding via extend
+  rootURL!: string;
+
+  /**
+    @private
+
+    The browser's `location` object. This is typically equivalent to
+    `window.location`, but may be overridden for testing.
+
+    @property location
+    @default environment.location
+  */
+  // Added in reopen to allow overriding via extend
+  location!: any;
+
+  /**
+    @private
+
+    The browser's `history` object. This is typically equivalent to
+    `window.history`, but may be overridden for testing.
+
+    @since 1.5.1
+    @property history
+    @default environment.history
+  */
+  // Added in reopen to allow overriding via extend
+  history!: any;
+
+  /**
+   @private
+
+    The user agent's global variable. In browsers, this will be `window`.
+
+    @since 1.11
+    @property global
+    @default window
+  */
+  // Added in reopen to allow overriding via extend
+  global!: any;
+
+  /**
+    @private
+
+    The browser's `userAgent`. This is typically equivalent to
+    `navigator.userAgent`, but may be overridden for testing.
+
+    @since 1.5.1
+    @property userAgent
+    @default environment.history
+  */
+  // Added in reopen to allow overriding via extend
+  userAgent!: any;
+
+  /**
+    @private
+
+    This property is used by the router to know whether to cancel the routing
+    setup process, which is needed while we redirect the browser.
+
+    @since 1.5.1
+    @property cancelRouterSetup
+    @default false
+  */
+  // Added in reopen to allow overriding via extend
+  cancelRouterSetup!: boolean | undefined;
+
   /**
    Called by the router to instruct the location to do any feature detection
    necessary. In the case of AutoLocation, we detect whether to use history
@@ -115,16 +196,8 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
 }
 
 AutoLocation.reopen({
-  /**
-    @private
-
-    Will be pre-pended to path upon state change.
-
-    @since 1.5.1
-    @property rootURL
-    @default '/'
-  */
   rootURL: '/',
+
   initState: delegateToConcreteImplementation('initState'),
   getURL: delegateToConcreteImplementation('getURL'),
   setURL: delegateToConcreteImplementation('setURL'),
@@ -132,62 +205,14 @@ AutoLocation.reopen({
   onUpdateURL: delegateToConcreteImplementation('onUpdateURL'),
   formatURL: delegateToConcreteImplementation('formatURL'),
 
-  /**
-    @private
-
-    The browser's `location` object. This is typically equivalent to
-    `window.location`, but may be overridden for testing.
-
-    @property location
-    @default environment.location
-  */
   location: location,
 
-  /**
-    @private
-
-    The browser's `history` object. This is typically equivalent to
-    `window.history`, but may be overridden for testing.
-
-    @since 1.5.1
-    @property history
-    @default environment.history
-  */
   history: history,
 
-  /**
-   @private
-
-   The user agent's global variable. In browsers, this will be `window`.
-
-   @since 1.11
-   @property global
-   @default window
-  */
   global: window,
 
-  /**
-    @private
-
-    The browser's `userAgent`. This is typically equivalent to
-    `navigator.userAgent`, but may be overridden for testing.
-
-    @since 1.5.1
-    @property userAgent
-    @default environment.history
-  */
   userAgent: userAgent,
 
-  /**
-    @private
-
-    This property is used by the router to know whether to cancel the routing
-    setup process, which is needed while we redirect the browser.
-
-    @since 1.5.1
-    @property cancelRouterSetup
-    @default false
-  */
   cancelRouterSetup: false,
 });
 
@@ -196,7 +221,7 @@ function delegateToConcreteImplementation(methodName: string) {
     let { concreteImplementation } = this;
     assert(
       "AutoLocation's detect() method should be called before calling any other hooks.",
-      Boolean(concreteImplementation)
+      concreteImplementation
     );
     return concreteImplementation[methodName]?.(...args);
   };
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index 2ced27940bd..4b8828a6836 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -40,6 +40,9 @@ export default class HashLocation extends EmberObject implements EmberLocation {
   implementation = 'hash';
   _hashchangeHandler?: EventListener;
 
+  private _location?: any;
+  declare location: any;
+
   init(): void {
     set(this, 'location', this._location || window.location);
     this._hashchangeHandler = undefined;
@@ -114,6 +117,8 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     set(this, 'lastSetURL', path);
   }
 
+  lastSetURL: string | null = null;
+
   /**
     Register a callback to be invoked when the hash changes. These
     callbacks will execute when the user presses the back or forward
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index 7747f06b74b..f79e02a71b8 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -59,6 +59,11 @@ function _uuid() {
   @protected
 */
 export default class HistoryLocation extends EmberObject implements EmberLocation {
+  location!: any;
+  baseURL!: string;
+
+  history?: any;
+
   implementation = 'history';
   _previousURL?: string;
   _popstateHandler?: EventListener;
@@ -86,9 +91,9 @@ export default class HistoryLocation extends EmberObject implements EmberLocatio
     this._super(...arguments);
 
     let base = document.querySelector('base');
-    let baseURL: string | null = '';
+    let baseURL = '';
     if (base !== null && base.hasAttribute('href')) {
-      baseURL = base.getAttribute('href');
+      baseURL = base.getAttribute('href') ?? '';
     }
 
     set(this, 'baseURL', baseURL);
diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
index 5ee44089909..435f370c393 100644
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -25,6 +25,19 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
   updateCallback!: UpdateCallback;
   implementation = 'none';
 
+  // Set in reopen so it can be overwritten with extend
+  path!: string;
+
+  /**
+    Will be pre-pended to path.
+
+    @private
+    @property rootURL
+    @default '/'
+  */
+  // Set in reopen so it can be overwritten with extend
+  rootURL!: string;
+
   detect(): void {
     let { rootURL } = this;
 
@@ -114,13 +127,5 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
 
 NoneLocation.reopen({
   path: '',
-
-  /**
-    Will be pre-pended to path.
-
-    @private
-    @property rootURL
-    @default '/'
-  */
   rootURL: '/',
 });
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index c3914cb6fe2..de4babf3ff3 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -96,19 +96,20 @@ export function hasDefaultSerialize(route: Route): boolean {
   @public
 */
 
-class Route extends EmberObject implements IRoute {
+class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute, Evented {
   static isRouteFactory = true;
 
-  routeName!: string;
-  fullRouteName!: string;
   context: {} = {};
-  controller!: Controller;
   currentModel: unknown;
 
   _bucketCache!: BucketCache;
   _internalName!: string;
-  _names: unknown;
+
+  private _names: unknown;
+
   _router!: EmberRouter;
+  _topLevelViewTemplate!: any;
+  _environment!: any;
 
   constructor(owner: Owner) {
     super(...arguments);
@@ -129,6 +130,13 @@ class Route extends EmberObject implements IRoute {
     }
   }
 
+  // Implement Evented
+  on!: (name: string, method: ((...args: any[]) => void) | string) => this;
+  one!: (name: string, method: string | ((...args: any[]) => void)) => this;
+  trigger!: (name: string, ...args: any[]) => any;
+  off!: (name: string, method: string | ((...args: any[]) => void)) => this;
+  has!: (name: string) => boolean;
+
   serialize!: (
     model: {},
     params: string[]
@@ -138,6 +146,139 @@ class Route extends EmberObject implements IRoute {
       }
     | undefined;
 
+  /**
+    Configuration hash for this route's queryParams. The possible
+    configuration options and their defaults are as follows
+    (assuming a query param whose controller property is `page`):
+
+    ```javascript
+    queryParams: {
+      page: {
+        // By default, controller query param properties don't
+        // cause a full transition when they are changed, but
+        // rather only cause the URL to update. Setting
+        // `refreshModel` to true will cause an "in-place"
+        // transition to occur, whereby the model hooks for
+        // this route (and any child routes) will re-fire, allowing
+        // you to reload models (e.g., from the server) using the
+        // updated query param values.
+        refreshModel: false,
+
+        // By default, changes to controller query param properties
+        // cause the URL to update via `pushState`, which means an
+        // item will be added to the browser's history, allowing
+        // you to use the back button to restore the app to the
+        // previous state before the query param property was changed.
+        // Setting `replace` to true will use `replaceState` (or its
+        // hash location equivalent), which causes no browser history
+        // item to be added. This options name and default value are
+        // the same as the `link-to` helper's `replace` option.
+        replace: false,
+
+        // By default, the query param URL key is the same name as
+        // the controller property name. Use `as` to specify a
+        // different URL key.
+        as: 'page'
+      }
+    }
+    ```
+
+    @property queryParams
+    @for Route
+    @type Object
+    @since 1.6.0
+    @public
+  */
+  // Set in reopen so it can be overriden with extend
+  queryParams!: any;
+
+  /**
+    The name of the template to use by default when rendering this routes
+    template.
+
+    ```app/routes/posts/list.js
+    import Route from '@ember/routing/route';
+
+    export default class extends Route {
+      templateName = 'posts/list'
+    });
+    ```
+
+    ```app/routes/posts/index.js
+    import PostsList from '../posts/list';
+
+    export default class extends PostsList {};
+    ```
+
+    ```app/routes/posts/archived.js
+    import PostsList from '../posts/list';
+
+    export default class extends PostsList {};
+    ```
+
+    @property templateName
+    @type String
+    @default null
+    @since 1.4.0
+    @public
+  */
+  // Set in reopen so it can be overriden with extend
+  templateName!: string | null;
+
+  /**
+    The name of the controller to associate with this route.
+
+    By default, Ember will lookup a route's controller that matches the name
+    of the route (i.e. `posts.new`). However,
+    if you would like to define a specific controller to use, you can do so
+    using this property.
+
+    This is useful in many ways, as the controller specified will be:
+
+    * passed to the `setupController` method.
+    * used as the controller for the template being rendered by the route.
+    * returned from a call to `controllerFor` for the route.
+
+    @property controllerName
+    @type String
+    @default null
+    @since 1.4.0
+    @public
+  */
+  // Set in reopen so it can be overriden with extend
+  controllerName!: string | null;
+
+  /**
+    The controller associated with this route.
+
+    Example
+
+    ```app/routes/form.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class FormRoute extends Route {
+      @action
+      willTransition(transition) {
+        if (this.controller.get('userHasEnteredData') &&
+            !confirm('Are you sure you want to abandon progress?')) {
+          transition.abort();
+        } else {
+          // Bubble the `willTransition` action so that
+          // parent routes can decide whether or not to abort.
+          return true;
+        }
+      }
+    }
+    ```
+
+    @property controller
+    @type Controller
+    @since 1.6.0
+    @public
+  */
+  controller!: Controller;
+
   /**
     The name of the route, dot-delimited.
 
@@ -150,6 +291,7 @@ class Route extends EmberObject implements IRoute {
     @since 1.0.0
     @public
   */
+  routeName!: string;
 
   /**
     The name of the route, dot-delimited, including the engine prefix
@@ -164,6 +306,7 @@ class Route extends EmberObject implements IRoute {
     @since 2.10.0
     @public
   */
+  fullRouteName!: string;
 
   /**
     Sets the name for this route, including a fully resolved name for routes
@@ -1879,11 +2022,7 @@ class Route extends EmberObject implements IRoute {
    */
   buildRouteInfoMetadata() {}
 
-  /**
-   * @method _paramsFor
-   * @private
-   */
-  _paramsFor(routeName: string, params: {}) {
+  private _paramsFor(routeName: string, params: {}) {
     let transition = this._router._routerMicrolib.activeTransition;
     if (transition !== undefined) {
       return this.paramsFor(routeName);
@@ -1892,7 +2031,6 @@ class Route extends EmberObject implements IRoute {
     return params;
   }
 
-
   /**
     Store property provides a hook for data persistence libraries to inject themselves.
 
@@ -1930,10 +2068,7 @@ class Route extends EmberObject implements IRoute {
 
         modelClass = modelClass.class;
 
-        assert(
-          `${classify(name)} has no method \`find\`.`,
-          typeof modelClass.find === 'function'
-        );
+        assert(`${classify(name)} has no method \`find\`.`, typeof modelClass.find === 'function');
 
         return modelClass.find(value);
       },
@@ -2070,6 +2205,60 @@ class Route extends EmberObject implements IRoute {
       },
     };
   }
+
+  // Set in reopen
+  actions!: Record<string, Function>;
+
+  /**
+    Sends an action to the router, which will delegate it to the currently
+    active route hierarchy per the bubbling rules explained under `actions`.
+
+    Example
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('index');
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ApplicationRoute extends Route {
+      @action
+      track(arg) {
+        console.log(arg, 'was clicked');
+      }
+    }
+    ```
+
+    ```app/routes/index.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class IndexRoute extends Route {
+      @action
+      trackIfDebug(arg) {
+        if (debug) {
+          this.send('track', arg);
+        }
+      }
+    }
+    ```
+
+    @method send
+    @param {String} name the name of the action to trigger
+    @param {...*} args
+    @since 1.0.0
+    @public
+  */
+  // Set with reopen to override parent behavior
+  send!: (name: string, ...args: any[]) => unknown;
 }
 
 function parentRoute(route: Route) {
@@ -2133,7 +2322,7 @@ function buildRenderOptions(
     name = route.routeName;
     templateName = route.templateName || name;
   } else {
-    name = _name.replace(/\//g, '.');
+    name = _name!.replace(/\//g, '.');
     templateName = name;
   }
 
@@ -2387,156 +2576,13 @@ function getEngineRouteName(engine: Owner, routeName: string) {
   */
 Route.prototype.serialize = defaultSerialize;
 
-Route.reopen(ActionHandler, Evented, {
+// Set these here so they can be overridden with extend
+Route.reopen({
   mergedProperties: ['queryParams'],
-
-  /**
-    Configuration hash for this route's queryParams. The possible
-    configuration options and their defaults are as follows
-    (assuming a query param whose controller property is `page`):
-
-    ```javascript
-    queryParams: {
-      page: {
-        // By default, controller query param properties don't
-        // cause a full transition when they are changed, but
-        // rather only cause the URL to update. Setting
-        // `refreshModel` to true will cause an "in-place"
-        // transition to occur, whereby the model hooks for
-        // this route (and any child routes) will re-fire, allowing
-        // you to reload models (e.g., from the server) using the
-        // updated query param values.
-        refreshModel: false,
-
-        // By default, changes to controller query param properties
-        // cause the URL to update via `pushState`, which means an
-        // item will be added to the browser's history, allowing
-        // you to use the back button to restore the app to the
-        // previous state before the query param property was changed.
-        // Setting `replace` to true will use `replaceState` (or its
-        // hash location equivalent), which causes no browser history
-        // item to be added. This options name and default value are
-        // the same as the `link-to` helper's `replace` option.
-        replace: false,
-
-        // By default, the query param URL key is the same name as
-        // the controller property name. Use `as` to specify a
-        // different URL key.
-        as: 'page'
-      }
-    }
-    ```
-
-    @property queryParams
-    @for Route
-    @type Object
-    @since 1.6.0
-    @public
-  */
   queryParams: {},
-
-  /**
-    The name of the template to use by default when rendering this routes
-    template.
-
-    ```app/routes/posts/list.js
-    import Route from '@ember/routing/route';
-
-    export default class extends Route {
-      templateName = 'posts/list'
-    });
-    ```
-
-    ```app/routes/posts/index.js
-    import PostsList from '../posts/list';
-
-    export default class extends PostsList {};
-    ```
-
-    ```app/routes/posts/archived.js
-    import PostsList from '../posts/list';
-
-    export default class extends PostsList {};
-    ```
-
-    @property templateName
-    @type String
-    @default null
-    @since 1.4.0
-    @public
-  */
   templateName: null,
-
-  /**
-    The name of the controller to associate with this route.
-
-    By default, Ember will lookup a route's controller that matches the name
-    of the route (i.e. `posts.new`). However,
-    if you would like to define a specific controller to use, you can do so
-    using this property.
-
-    This is useful in many ways, as the controller specified will be:
-
-    * passed to the `setupController` method.
-    * used as the controller for the template being rendered by the route.
-    * returned from a call to `controllerFor` for the route.
-
-    @property controllerName
-    @type String
-    @default null
-    @since 1.4.0
-    @public
-  */
   controllerName: null,
 
-  /**
-    Sends an action to the router, which will delegate it to the currently
-    active route hierarchy per the bubbling rules explained under `actions`.
-
-    Example
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('index');
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      track(arg) {
-        console.log(arg, 'was clicked');
-      }
-    }
-    ```
-
-    ```app/routes/index.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class IndexRoute extends Route {
-      @action
-      trackIfDebug(arg) {
-        if (debug) {
-          this.send('track', arg);
-        }
-      }
-    }
-    ```
-
-    @method send
-    @param {String} name the name of the action to trigger
-    @param {...*} args
-    @since 1.0.0
-    @public
-  */
   send(...args: any[]) {
     assert(
       `Attempted to call .send() with the action '${args[0]}' on the destroyed route '${this.routeName}'.`,
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index b2466ece517..ea864f7a464 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -53,6 +53,7 @@ function defaultDidTransition(this: EmberRouter, infos: PrivateRouteInfo[]) {
   once(this, this.trigger, 'didTransition');
 
   if (DEBUG) {
+    // @ts-expect-error namespace isn't public
     if (this.namespace.LOG_TRANSITIONS) {
       // eslint-disable-next-line no-console
       console.log(`Transitioned into '${EmberRouter._routePath(infos)}'`);
@@ -69,6 +70,7 @@ function defaultWillTransition(
   once(this, this.trigger, 'willTransition', transition);
 
   if (DEBUG) {
+    // @ts-expect-error namespace isn't public
     if (this.namespace.LOG_TRANSITIONS) {
       // eslint-disable-next-line no-console
       console.log(
@@ -140,9 +142,39 @@ const { slice } = Array.prototype;
   @uses Evented
   @public
 */
-class EmberRouter extends EmberObject {
-  location!: string | IEmberLocation;
+class EmberRouter extends EmberObject.extend(Evented) implements Evented {
+  /**
+   Represents the URL of the root of the application, often '/'. This prefix is
+    assumed on all routes defined on this router.
+
+    @property rootURL
+    @default '/'
+    @public
+  */
+  // Set with reopen to allow overriding via extend
   rootURL!: string;
+
+  /**
+   The `location` property determines the type of URL's that your
+    application will use.
+
+    The following location types are currently available:
+
+    * `history` - use the browser's history API to make the URLs look just like any standard URL
+    * `hash` - use `#` to separate the server part of the URL from the Ember part: `/blog/#/posts/new`
+    * `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)
+    * `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`
+
+    This value is defaulted to `auto` by the `locationType` setting of `/config/environment.js`
+
+    @property location
+    @default 'hash'
+    @see {Location}
+    @public
+  */
+  // Set with reopen to allow overriding via extend
+  location!: string | IEmberLocation;
+
   _routerMicrolib!: Router<Route>;
   _didSetupRouter = false;
   _initialTransitionStarted = false;
@@ -165,6 +197,104 @@ class EmberRouter extends EmberObject {
 
   _slowTransitionTimer: unknown;
 
+  private namespace: any;
+
+  // Begin Evented
+  on!: (name: string, method: ((...args: any[]) => void) | string) => this;
+  one!: (name: string, method: string | ((...args: any[]) => void)) => this;
+  trigger!: (name: string, ...args: any[]) => any;
+  off!: (name: string, method: string | ((...args: any[]) => void)) => this;
+  has!: (name: string) => boolean;
+  // End Evented
+
+  // Set with reopenClass
+  private static dslCallbacks?: MatchCallback[];
+
+  /**
+    The `Router.map` function allows you to define mappings from URLs to routes
+    in your application. These mappings are defined within the
+    supplied callback function using `this.route`.
+
+    The first parameter is the name of the route which is used by default as the
+    path name as well.
+
+    The second parameter is the optional options hash. Available options are:
+
+      * `path`: allows you to provide your own path as well as mark dynamic
+        segments.
+      * `resetNamespace`: false by default; when nesting routes, ember will
+        combine the route names to form the fully-qualified route name, which is
+        used with `{{link-to}}` or manually transitioning to routes. Setting
+        `resetNamespace: true` will cause the route not to inherit from its
+        parent route's names. This is handy for preventing extremely long route names.
+        Keep in mind that the actual URL path behavior is still retained.
+
+    The third parameter is a function, which can be used to nest routes.
+    Nested routes, by default, will have the parent route tree's route name and
+    path prepended to it's own.
+
+    ```app/router.js
+    Router.map(function(){
+      this.route('post', { path: '/post/:post_id' }, function() {
+        this.route('edit');
+        this.route('comments', { resetNamespace: true }, function() {
+          this.route('new');
+        });
+      });
+    });
+    ```
+
+    @method map
+    @param callback
+    @public
+  */
+  static map(callback: MatchCallback) {
+    if (!this.dslCallbacks) {
+      this.dslCallbacks = [];
+      // FIXME: Can we remove this?
+      this.reopenClass({ dslCallbacks: this.dslCallbacks });
+    }
+
+    this.dslCallbacks.push(callback);
+
+    return this;
+  }
+
+  static _routePath(routeInfos: PrivateRouteInfo[]) {
+    let path: string[] = [];
+
+    // We have to handle coalescing resource names that
+    // are prefixed with their parent's names, e.g.
+    // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
+
+    function intersectionMatches(a1: string[], a2: string[]) {
+      for (let i = 0; i < a1.length; ++i) {
+        if (a1[i] !== a2[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    let name, nameParts, oldNameParts;
+    for (let i = 1; i < routeInfos.length; i++) {
+      name = routeInfos[i].name;
+      nameParts = name.split('.');
+      oldNameParts = slice.call(path);
+
+      while (oldNameParts.length) {
+        if (intersectionMatches(oldNameParts, nameParts)) {
+          break;
+        }
+        oldNameParts.shift();
+      }
+
+      path.push(...nameParts.slice(oldNameParts.length));
+    }
+
+    return path.join('.');
+  }
+
   constructor(owner: Owner) {
     super(...arguments);
 
@@ -180,7 +310,7 @@ class EmberRouter extends EmberObject {
     this._routerService = routerService;
   }
 
-  _initRouterJs() {
+  _initRouterJs(): void {
     let location = get(this, 'location');
     let router = this;
     let owner = getOwner(this);
@@ -204,7 +334,8 @@ class EmberRouter extends EmberObject {
         let route = routeOwner.lookup<Route>(fullRouteName);
 
         if (seen[name]) {
-          return route!;
+          assert('seen routes should exist', route);
+          return route;
         }
 
         seen[name] = true;
@@ -589,6 +720,7 @@ class EmberRouter extends EmberObject {
       let infos = this._routerMicrolib.currentRouteInfos;
       if (this.namespace.LOG_TRANSITIONS) {
         // eslint-disable-next-line no-console
+        assert('expected infos to be set', infos);
         console.log(`Intermediate-transitioned into '${EmberRouter._routePath(infos)}'`);
       }
     }
@@ -600,7 +732,8 @@ class EmberRouter extends EmberObject {
 
   generate(name: string, ...args: any[]) {
     let url = this._routerMicrolib.generate(name, ...args);
-    return (this.location as IEmberLocation).formatURL(url);
+    assert('expected non-string location', typeof this.location !== 'string');
+    return this.location.formatURL(url);
   }
 
   /**
@@ -1239,6 +1372,66 @@ class EmberRouter extends EmberObject {
 
     return engineInstance;
   }
+
+  /**
+    Handles updating the paths and notifying any listeners of the URL
+    change.
+
+    Triggers the router level `didTransition` hook.
+
+    For example, to notify google analytics when the route changes,
+    you could use this hook.  (Note: requires also including GA scripts, etc.)
+
+    ```javascript
+    import config from './config/environment';
+    import EmberRouter from '@ember/routing/router';
+    import { inject as service } from '@ember/service';
+
+    let Router = EmberRouter.extend({
+      location: config.locationType,
+
+      router: service(),
+
+      didTransition: function() {
+        this._super(...arguments);
+
+        ga('send', 'pageview', {
+          page: this.router.currentURL,
+          title: this.router.currentRouteName,
+        });
+      }
+    });
+    ```
+
+    @method didTransition
+    @public
+    @since 1.2.0
+  */
+  // Set with reopen to allow overriding via extend
+  didTransition!: typeof defaultDidTransition;
+
+  /**
+    Handles notifying any listeners of an impending URL
+    change.
+
+    Triggers the router level `willTransition` hook.
+
+    @method willTransition
+    @public
+    @since 1.11.0
+  */
+  // Set with reopen to allow overriding via extend
+  willTransition!: typeof defaultWillTransition;
+
+  /**
+   Represents the current URL.
+
+    @property url
+    @type {String}
+    @private
+  */
+  // Set with reopen to allow overriding via extend
+  url!: string;
 }
 
 /*
@@ -1527,7 +1720,9 @@ function updatePaths(router: EmberRouter) {
 
   let path = EmberRouter._routePath(infos);
   let currentRouteName = infos[infos.length - 1].name;
-  let currentURL = router.get('location').getURL();
+  let location = router.location;
+  assert('expected location to not be a string', typeof location !== 'string');
+  let currentURL = location.getURL();
 
   set(router, 'currentPath', path);
   set(router, 'currentRouteName', currentRouteName);
@@ -1590,92 +1785,6 @@ function updatePaths(router: EmberRouter) {
   }
 }
 
-EmberRouter.reopenClass({
-  /**
-    The `Router.map` function allows you to define mappings from URLs to routes
-    in your application. These mappings are defined within the
-    supplied callback function using `this.route`.
-
-    The first parameter is the name of the route which is used by default as the
-    path name as well.
-
-    The second parameter is the optional options hash. Available options are:
-
-      * `path`: allows you to provide your own path as well as mark dynamic
-        segments.
-      * `resetNamespace`: false by default; when nesting routes, ember will
-        combine the route names to form the fully-qualified route name, which is
-        used with `{{link-to}}` or manually transitioning to routes. Setting
-        `resetNamespace: true` will cause the route not to inherit from its
-        parent route's names. This is handy for preventing extremely long route names.
-        Keep in mind that the actual URL path behavior is still retained.
-
-    The third parameter is a function, which can be used to nest routes.
-    Nested routes, by default, will have the parent route tree's route name and
-    path prepended to it's own.
-
-    ```app/router.js
-    Router.map(function(){
-      this.route('post', { path: '/post/:post_id' }, function() {
-        this.route('edit');
-        this.route('comments', { resetNamespace: true }, function() {
-          this.route('new');
-        });
-      });
-    });
-    ```
-
-    @method map
-    @param callback
-    @public
-  */
-  map(callback: MatchCallback) {
-    if (!this.dslCallbacks) {
-      this.dslCallbacks = [];
-      this.reopenClass({ dslCallbacks: this.dslCallbacks });
-    }
-
-    this.dslCallbacks.push(callback);
-
-    return this;
-  },
-
-  _routePath(routeInfos: PrivateRouteInfo[]) {
-    let path: string[] = [];
-
-    // We have to handle coalescing resource names that
-    // are prefixed with their parent's names, e.g.
-    // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
-
-    function intersectionMatches(a1: string[], a2: string[]) {
-      for (let i = 0; i < a1.length; ++i) {
-        if (a1[i] !== a2[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    let name, nameParts, oldNameParts;
-    for (let i = 1; i < routeInfos.length; i++) {
-      name = routeInfos[i].name;
-      nameParts = name.split('.');
-      oldNameParts = slice.call(path);
-
-      while (oldNameParts.length) {
-        if (intersectionMatches(oldNameParts, nameParts)) {
-          break;
-        }
-        oldNameParts.shift();
-      }
-
-      path.push(...nameParts.slice(oldNameParts.length));
-    }
-
-    return path.join('.');
-  },
-});
-
 function didBeginTransition(transition: Transition, router: EmberRouter) {
   let routerState = new RouterState(router, router._routerMicrolib, transition[STATE_SYMBOL]!);
 
@@ -1786,91 +1895,13 @@ function representEmptyRoute(
   }
 }
 
-EmberRouter.reopen(Evented, {
-  /**
-    Handles updating the paths and notifying any listeners of the URL
-    change.
-
-    Triggers the router level `didTransition` hook.
-
-    For example, to notify google analytics when the route changes,
-    you could use this hook.  (Note: requires also including GA scripts, etc.)
-
-    ```javascript
-    import config from './config/environment';
-    import EmberRouter from '@ember/routing/router';
-    import { inject as service } from '@ember/service';
-
-    let Router = EmberRouter.extend({
-      location: config.locationType,
-
-      router: service(),
-
-      didTransition: function() {
-        this._super(...arguments);
-
-        ga('send', 'pageview', {
-          page: this.router.currentURL,
-          title: this.router.currentRouteName,
-        });
-      }
-    });
-    ```
-
-    @method didTransition
-    @public
-    @since 1.2.0
-  */
+EmberRouter.reopen({
   didTransition: defaultDidTransition,
-
-  /**
-    Handles notifying any listeners of an impending URL
-    change.
-
-    Triggers the router level `willTransition` hook.
-
-    @method willTransition
-    @public
-    @since 1.11.0
-  */
   willTransition: defaultWillTransition,
-  /**
-   Represents the URL of the root of the application, often '/'. This prefix is
-   assumed on all routes defined on this router.
-
-   @property rootURL
-   @default '/'
-   @public
-  */
   rootURL: '/',
-
-  /**
-   The `location` property determines the type of URL's that your
-   application will use.
-
-   The following location types are currently available:
-
-   * `history` - use the browser's history API to make the URLs look just like any standard URL
-   * `hash` - use `#` to separate the server part of the URL from the Ember part: `/blog/#/posts/new`
-   * `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)
-   * `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`
-
-   This value is defaulted to `auto` by the `locationType` setting of `/config/environment.js`
-
-   @property location
-   @default 'hash'
-   @see {Location}
-   @public
- */
   location: 'hash',
 
-  /**
-   Represents the current URL.
-
-   @property url
-   @type {String}
-   @private
- */
+  // FIXME: Does this need to be overrideable via extend?
   url: computed(function (this: Router<Route>) {
     let location = get(this, 'location');
 
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index 9b80d3da7d7..af32a6e2ad2 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -1,3 +1,8 @@
+import { EmberClassConstructor, Objectify, ObserverMethod } from './types/-private/types';
+import PublicCoreObject from './types/core';
+import Evented from './types/evented';
+import Observable from './types/observable';
+
 export const TargetActionSupport: any;
 export function isArray(arr: any): boolean;
 export const ControllerMixin: any;
@@ -10,13 +15,50 @@ export function deprecatingAlias(
   }
 ): any;
 
-export const CoreObject: any;
+// The public version doesn't export some deprecated methods.
+// However, these are still used internally. Returning `any` is
+// very loose, but it's essentially what was here before.
+export class CoreObject extends PublicCoreObject {
+  static extend<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...args: any[]
+  ): Objectify<Statics> & EmberClassConstructor<Instance>;
+  static reopen(...args: any[]): any;
+  static reopenClass(...args: any[]): any;
+}
+
 export const FrameworkObject: any;
-export const Object: any;
+
+export class Object extends CoreObject implements Observable {
+  get<K extends keyof this>(key: K): unknown;
+  getProperties<K extends keyof this>(list: K[]): Record<K, unknown>;
+  getProperties<K extends keyof this>(...list: K[]): Record<K, unknown>;
+  set<K extends keyof this>(key: K, value: this[K]): this[K];
+  set<T>(key: keyof this, value: T): T;
+  setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
+  setProperties<K extends keyof this>(
+    // tslint:disable-next-line:unified-signatures
+    hash: { [KK in K]: any }
+  ): Record<K, unknown>;
+  notifyPropertyChange(keyName: string): this;
+  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method: ObserverMethod<Target, this>
+  ): this;
+  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  getWithDefault<K extends keyof this>(key: K, defaultValue: any): unknown;
+  incrementProperty(keyName: keyof this, increment?: number): number;
+  decrementProperty(keyName: keyof this, decrement?: number): number;
+  toggleProperty(keyName: keyof this): boolean;
+  cacheFor<K extends keyof this>(key: K): unknown;
+}
 
 export function _contentFor(proxy: any): any;
 
 export const A: any;
 export const ActionHandler: any;
-export const Evented: any;
+export { Evented };
 export function typeOf(obj: any): string;
diff --git a/packages/@ember/-internals/runtime/type-tests/core.test.ts b/packages/@ember/-internals/runtime/type-tests/core.test.ts
new file mode 100644
index 00000000000..727f1213eea
--- /dev/null
+++ b/packages/@ember/-internals/runtime/type-tests/core.test.ts
@@ -0,0 +1,25 @@
+import { expectTypeOf } from 'expect-type';
+import CoreObject from '../types/core';
+
+/** Newable tests */
+const co1 = new CoreObject();
+
+expectTypeOf(co1.concatenatedProperties).toEqualTypeOf<string[]>();
+expectTypeOf(co1.isDestroyed).toEqualTypeOf<boolean>();
+expectTypeOf(co1.isDestroying).toEqualTypeOf<boolean>();
+expectTypeOf(co1.destroy()).toEqualTypeOf<CoreObject>();
+expectTypeOf(co1.toString()).toEqualTypeOf<string>();
+
+/** .create tests */
+const co2 = CoreObject.create();
+expectTypeOf(co2.concatenatedProperties).toEqualTypeOf<string[]>();
+expectTypeOf(co2.isDestroyed).toEqualTypeOf<boolean>();
+expectTypeOf(co2.isDestroying).toEqualTypeOf<boolean>();
+expectTypeOf(co2.destroy()).toEqualTypeOf<CoreObject>();
+expectTypeOf(co2.toString()).toEqualTypeOf<string>();
+
+/** .create tests w/ initial instance data passed in */
+const co3 = CoreObject.create({ foo: '123', bar: 456 });
+
+expectTypeOf(co3.foo).toEqualTypeOf<string>();
+expectTypeOf(co3.bar).toEqualTypeOf<number>();
diff --git a/packages/@ember/-internals/runtime/types/-private/types.d.ts b/packages/@ember/-internals/runtime/types/-private/types.d.ts
new file mode 100644
index 00000000000..2d58b2fa56a
--- /dev/null
+++ b/packages/@ember/-internals/runtime/types/-private/types.d.ts
@@ -0,0 +1,41 @@
+/**
+ * Map type `T` to a plain object hash with the identity mapping.
+ *
+ * Discards any additional object identity like the ability to `new()` up the class.
+ * The `new()` capability is added back later by merging `EmberClassConstructor<T>`
+ *
+ * Implementation is carefully chosen for the reasons described in
+ * https://github.com/typed-ember/ember-typings/pull/29
+ */
+export type Objectify<T> = Readonly<T>;
+
+export type ExtractPropertyNamesOfType<T, S> = {
+  [K in keyof T]: T[K] extends S ? K : never;
+}[keyof T];
+
+/**
+ * Used to infer the type of ember classes of type `T`.
+ *
+ * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
+ *
+ * The single-arg constructor is required by the typescript compiler.
+ * The multi-arg constructor is included for better ergonomics.
+ *
+ * Implementation is carefully chosen for the reasons described in
+ * https://github.com/typed-ember/ember-typings/pull/29
+ */
+export type EmberClassConstructor<T> = (new (properties?: object) => T) &
+  (new (...args: any[]) => T);
+
+/**
+ * Check that any arguments to `create()` match the type's properties.
+ *
+ * Accept any additional properties and add merge them into the instance.
+ */
+export type EmberInstanceArguments<T> = Partial<T> & {
+  [key: string]: any;
+};
+
+export type ObserverMethod<Target, Sender> =
+  | keyof Target
+  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
diff --git a/packages/@ember/-internals/runtime/types/core.d.ts b/packages/@ember/-internals/runtime/types/core.d.ts
new file mode 100644
index 00000000000..304747df018
--- /dev/null
+++ b/packages/@ember/-internals/runtime/types/core.d.ts
@@ -0,0 +1,87 @@
+import { EmberClassConstructor, EmberInstanceArguments, Objectify } from './-private/types';
+
+type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
+  ? T & MergeArray<Rest>
+  : unknown; // TODO: Is this correct?
+
+export default class CoreObject {
+  /**
+   * CoreObject constructor takes initial object properties as an argument.
+   */
+  constructor(properties?: object);
+
+  _super(...args: any[]): any;
+
+  /**
+   * An overridable method called when objects are instantiated. By default,
+   * does nothing unless it is overridden during class definition.
+   */
+  init(): void;
+
+  /**
+   * Defines the properties that will be concatenated from the superclass (instead of overridden).
+   * @default null
+   */
+  concatenatedProperties: string[];
+
+  /**
+   * Destroyed object property flag. If this property is true the observers and bindings were
+   * already removed by the effect of calling the destroy() method.
+   * @default false
+   */
+  isDestroyed: boolean;
+  /**
+   * Destruction scheduled flag. The destroy() method has been called. The object stays intact
+   * until the end of the run loop at which point the isDestroyed flag is set.
+   * @default false
+   */
+  isDestroying: boolean;
+
+  /**
+   * Destroys an object by setting the `isDestroyed` flag and removing its
+   * metadata, which effectively destroys observers and bindings.
+   * If you try to set a property on a destroyed object, an exception will be
+   * raised.
+   * Note that destruction is scheduled for the end of the run loop and does not
+   * happen immediately.  It will set an isDestroying flag immediately.
+   * @return receiver
+   */
+  destroy(): CoreObject;
+
+  /**
+   * Override to implement teardown.
+   */
+  willDestroy(): void;
+
+  /**
+   * Returns a string representation which attempts to provide more information than Javascript's toString
+   * typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
+   * @return string representation
+   */
+  toString(): string;
+
+  static create<Class extends typeof CoreObject, Args extends Array<Record<string, any>>>(
+    this: Class,
+    ...args: Args
+  ): InstanceType<Class> & MergeArray<Args>;
+
+  static detect<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    obj: any
+  ): obj is Objectify<Statics> & EmberClassConstructor<Instance>;
+
+  static detectInstance<Instance>(this: EmberClassConstructor<Instance>, obj: any): obj is Instance;
+
+  /**
+   * Iterate over each computed property for the class, passing its name and any
+   * associated metadata (see metaForProperty) to the callback.
+   */
+  static eachComputedProperty(callback: (...args: any[]) => any, binding: {}): void;
+  /**
+   * Returns the original hash that was passed to meta().
+   * @param key property name
+   */
+  static metaForProperty(key: string): {};
+  static isClass: boolean;
+  static isMethod: boolean;
+}
diff --git a/packages/@ember/-internals/runtime/types/evented.d.ts b/packages/@ember/-internals/runtime/types/evented.d.ts
new file mode 100644
index 00000000000..dbf86d62a8f
--- /dev/null
+++ b/packages/@ember/-internals/runtime/types/evented.d.ts
@@ -0,0 +1,48 @@
+import Mixin from '../../metal/lib/mixin';
+
+/**
+ * This mixin allows for Ember objects to subscribe to and emit events.
+ */
+interface Evented {
+  /**
+   * Subscribes to a named event with given function.
+   */
+  on<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  on(name: string, method: ((...args: any[]) => void) | string): this;
+  /**
+   * Subscribes a function to a named event and then cancels the subscription
+   * after the first time the event is triggered. It is good to use ``one`` when
+   * you only care about the first time an event has taken place.
+   */
+  one<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  one(name: string, method: string | ((...args: any[]) => void)): this;
+  /**
+   * Triggers a named event for the object. Any additional arguments
+   * will be passed as parameters to the functions that are subscribed to the
+   * event.
+   */
+  trigger(name: string, ...args: any[]): any;
+  /**
+   * Cancels subscription for given name, target, and method.
+   */
+  off<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  off(name: string, method: string | ((...args: any[]) => void)): this;
+  /**
+   * Checks to see if object has any subscriptions for named event.
+   */
+  has(name: string): boolean;
+}
+declare const Evented: Mixin;
+export default Evented;
diff --git a/packages/@ember/-internals/runtime/types/mixin.d.ts b/packages/@ember/-internals/runtime/types/mixin.d.ts
new file mode 100644
index 00000000000..abe42379680
--- /dev/null
+++ b/packages/@ember/-internals/runtime/types/mixin.d.ts
@@ -0,0 +1,3 @@
+import { Mixin } from '../../metal/lib/mixin';
+
+export default Mixin;
diff --git a/packages/@ember/-internals/runtime/types/observable.d.ts b/packages/@ember/-internals/runtime/types/observable.d.ts
new file mode 100644
index 00000000000..96b2ae03d5d
--- /dev/null
+++ b/packages/@ember/-internals/runtime/types/observable.d.ts
@@ -0,0 +1,81 @@
+import { ObserverMethod } from './-private/types';
+
+/**
+ * This mixin provides properties and property observing functionality, core features of the Ember object model.
+ */
+interface Observable {
+  /**
+   * Retrieves the value of a property from the object.
+   */
+  get<K extends keyof this>(key: K): unknown;
+  // get<K extends keyof this>(key: K): UnwrapComputedPropertyGetter<this[K]>;
+  /**
+   * To get the values of multiple properties at once, call `getProperties`
+   * with a list of strings or an array:
+   */
+  getProperties<K extends keyof this>(list: K[]): Record<K, unknown>;
+  getProperties<K extends keyof this>(...list: K[]): Record<K, unknown>;
+  /**
+   * Sets the provided key or path to the value.
+   */
+  set<K extends keyof this>(key: K, value: this[K]): this[K];
+  set<T>(key: keyof this, value: T): T;
+  /**
+   * Sets a list of properties at once. These properties are set inside
+   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+   * observers will be buffered.
+   */
+  setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
+  setProperties<K extends keyof this>(
+    // tslint:disable-next-line:unified-signatures
+    hash: { [KK in K]: any }
+  ): Record<K, unknown>;
+  /**
+   * Convenience method to call `propertyWillChange` and `propertyDidChange` in
+   * succession.
+   */
+  notifyPropertyChange(keyName: string): this;
+  /**
+   * Adds an observer on a property.
+   */
+  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  /**
+   * Remove an observer you have previously registered on this object. Pass
+   * the same key, target, and method you passed to `addObserver()` and your
+   * target will no longer receive notifications.
+   */
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method: ObserverMethod<Target, this>
+  ): this;
+  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  /**
+   * Retrieves the value of a property, or a default value in the case that the
+   * property returns `undefined`.
+   */
+  getWithDefault<K extends keyof this>(key: K, defaultValue: any): unknown;
+  /**
+   * Set the value of a property to the current value plus some amount.
+   */
+  incrementProperty(keyName: keyof this, increment?: number): number;
+  /**
+   * Set the value of a property to the current value minus some amount.
+   */
+  decrementProperty(keyName: keyof this, decrement?: number): number;
+  /**
+   * Set the value of a boolean property to the opposite of its
+   * current value.
+   */
+  toggleProperty(keyName: keyof this): boolean;
+  /**
+   * Returns the cached value of a computed property, if it exists.
+   * This allows you to inspect the value of a computed property
+   * without accidentally invoking it if it is intended to be
+   * generated lazily.
+   */
+  cacheFor<K extends keyof this>(key: K): unknown;
+}
+// declare const Observable: Mixin<Observable, CoreObject>;
+export default Observable;
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index edc356417e7..f4e2e251a2e 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -1 +1,3 @@
 export let action: MethodDecorator;
+
+export { Object as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/type-tests/core.test.ts b/packages/@ember/object/type-tests/core.test.ts
new file mode 100644
index 00000000000..ba8ee6c6b04
--- /dev/null
+++ b/packages/@ember/object/type-tests/core.test.ts
@@ -0,0 +1,5 @@
+import { expectTypeOf } from 'expect-type';
+
+import CoreObject from '@ember/object/core';
+
+expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
diff --git a/packages/@ember/object/type-tests/index.test.ts b/packages/@ember/object/type-tests/index.test.ts
new file mode 100644
index 00000000000..8e8c492bf59
--- /dev/null
+++ b/packages/@ember/object/type-tests/index.test.ts
@@ -0,0 +1,5 @@
+import { expectTypeOf } from 'expect-type';
+
+import EmberObject from '@ember/object';
+
+expectTypeOf(EmberObject.create()).toEqualTypeOf<EmberObject>();
diff --git a/packages/@ember/object/type-tests/observable.test.ts b/packages/@ember/object/type-tests/observable.test.ts
new file mode 100644
index 00000000000..78e25c0c36e
--- /dev/null
+++ b/packages/@ember/object/type-tests/observable.test.ts
@@ -0,0 +1,5 @@
+import { expectTypeOf } from 'expect-type';
+
+import Observable from '@ember/object/observable';
+
+expectTypeOf<Observable['get']>().toEqualTypeOf<<K extends keyof Observable>(key: K) => unknown>();
diff --git a/packages/@ember/object/types/core.d.ts b/packages/@ember/object/types/core.d.ts
new file mode 100644
index 00000000000..63d98c5ee17
--- /dev/null
+++ b/packages/@ember/object/types/core.d.ts
@@ -0,0 +1 @@
+export { CoreObject as default } from '../../-internals/runtime';
diff --git a/packages/@ember/object/types/observable.d.ts b/packages/@ember/object/types/observable.d.ts
new file mode 100644
index 00000000000..9f633dd12fd
--- /dev/null
+++ b/packages/@ember/object/types/observable.d.ts
@@ -0,0 +1,2 @@
+import Observable from '@ember/-internals/runtime/types/observable';
+export default Observable;
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 48245ae8c15..7c3c0bf92be 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -37,7 +37,6 @@ module.exports = {
     '_invoke',
     '_lazyInjections',
     '_logLookup',
-    '_names',
     '_normalizeCache',
     '_onLookup',
     '_options',
diff --git a/tsconfig.json b/tsconfig.json
index 03567256c1a..8e2f30e6958 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,17 +24,12 @@
     "allowJs": false,
 
     "paths": {
-      "@glimmer/*": ["../node_modules/@glimmer/*"]
+      "@glimmer/*": ["../node_modules/@glimmer/*"],
+      "@ember/object/*": ["@ember/object/*", "@ember/object/types/*"]
     }
   },
 
-  "include": [
-    "packages/**/*.ts",
-  ],
+  "include": ["packages/**/*.ts"],
 
-  "exclude": [
-    "dist",
-    "node_modules",
-    "tmp",
-  ]
+  "exclude": ["dist", "node_modules", "tmp"]
 }
diff --git a/yarn.lock b/yarn.lock
index 9a4c984b524..01ed852a482 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5007,6 +5007,11 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+expect-type@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.11.0.tgz#bce1a3e283f0334eedb39699b57dd27be7009cc1"
+  integrity sha512-hkObxepDKhTYloH/UZoxYTT2uUzdhvDEwAi0oqdk29XEkHF8p+5ZRpX/BZES2PtGN9YgyEqutIjXfnL9iMflMw==
+
 express@^4.10.7, express@^4.13.1, express@^4.16.4, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -10042,6 +10047,11 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typescript@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
+  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
+
 typescript@~4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"

From 7985ddb9eedcd775ccd68981c8e2ce3c24cdd54b Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 28 Apr 2021 16:36:15 -0700
Subject: [PATCH 0506/1405] Add test for @ember/object/compat types

---
 packages/@ember/object/type-tests/compat.test.ts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/@ember/object/type-tests/compat.test.ts

diff --git a/packages/@ember/object/type-tests/compat.test.ts b/packages/@ember/object/type-tests/compat.test.ts
new file mode 100644
index 00000000000..840ec5d7fa4
--- /dev/null
+++ b/packages/@ember/object/type-tests/compat.test.ts
@@ -0,0 +1,4 @@
+import { dependentKeyCompat } from '@ember/object/compat';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(dependentKeyCompat).toMatchTypeOf<Function>();

From f5f8213418a834864f2e09fe2f3bf3a354c9724b Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 24 May 2021 09:46:10 -0700
Subject: [PATCH 0507/1405] Further improve types per feedback

---
 packages/@ember/-internals/metal/lib/mixin.ts |  2 +-
 .../routing/lib/location/auto_location.ts     | 21 ++++-----
 .../routing/lib/location/hash_location.ts     |  4 +-
 .../routing/lib/location/history_location.ts  |  4 +-
 .../routing/lib/location/none_location.ts     |  6 +--
 .../-internals/routing/lib/system/route.ts    | 43 +++++++++----------
 .../-internals/routing/lib/system/router.ts   | 20 ++++-----
 .../@ember/object/type-tests/compat.test.ts   |  2 +-
 8 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 876b7ce997a..42bbf482c32 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -275,7 +275,7 @@ function mergeMixins(
     } else {
       mergeProps(
         meta,
-        currentMixin as { [key: string]: any },
+        currentMixin as Record<string, unknown>,
         descs,
         values,
         base,
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 2dc61ce7524..7a5fde23700 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -62,10 +62,10 @@ import {
   @protected
 */
 export default class AutoLocation extends EmberObject implements EmberLocation {
-  getURL!: () => string;
-  setURL!: (url: string) => void;
-  onUpdateURL!: (callback: UpdateCallback) => void;
-  formatURL!: (url: string) => string;
+  declare getURL: () => string;
+  declare setURL: (url: string) => void;
+  declare onUpdateURL: (callback: UpdateCallback) => void;
+  declare formatURL: (url: string) => string;
 
   concreteImplementation?: EmberLocation;
 
@@ -73,6 +73,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
 
   // FIXME: This is never set
   // See https://github.com/emberjs/ember.js/issues/19515
+  /** @internal */
   documentMode: number | undefined;
 
   /**
@@ -85,7 +86,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     @default '/'
   */
   // Added in reopen to allow overriding via extend
-  rootURL!: string;
+  declare rootURL: string;
 
   /**
     @private
@@ -97,7 +98,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     @default environment.location
   */
   // Added in reopen to allow overriding via extend
-  location!: any;
+  declare location: Location;
 
   /**
     @private
@@ -110,7 +111,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     @default environment.history
   */
   // Added in reopen to allow overriding via extend
-  history!: any;
+  declare history: any;
 
   /**
    @private
@@ -122,7 +123,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     @default window
   */
   // Added in reopen to allow overriding via extend
-  global!: any;
+  declare global: any;
 
   /**
     @private
@@ -135,7 +136,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     @default environment.history
   */
   // Added in reopen to allow overriding via extend
-  userAgent!: any;
+  declare userAgent: string;
 
   /**
     @private
@@ -148,7 +149,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
     @default false
   */
   // Added in reopen to allow overriding via extend
-  cancelRouterSetup!: boolean | undefined;
+  declare cancelRouterSetup: boolean;
 
   /**
    Called by the router to instruct the location to do any feature detection
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index 4b8828a6836..afcc655c9c4 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -40,8 +40,8 @@ export default class HashLocation extends EmberObject implements EmberLocation {
   implementation = 'hash';
   _hashchangeHandler?: EventListener;
 
-  private _location?: any;
-  declare location: any;
+  private _location?: Location;
+  declare location: Location;
 
   init(): void {
     set(this, 'location', this._location || window.location);
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index f79e02a71b8..b2e665d5a07 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -59,8 +59,8 @@ function _uuid() {
   @protected
 */
 export default class HistoryLocation extends EmberObject implements EmberLocation {
-  location!: any;
-  baseURL!: string;
+  declare location: Location;
+  declare baseURL: string;
 
   history?: any;
 
diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
index 435f370c393..a7ea318c471 100644
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -22,11 +22,11 @@ import { EmberLocation, UpdateCallback } from './api';
   @protected
 */
 export default class NoneLocation extends EmberObject implements EmberLocation {
-  updateCallback!: UpdateCallback;
+  declare updateCallback: UpdateCallback;
   implementation = 'none';
 
   // Set in reopen so it can be overwritten with extend
-  path!: string;
+  declare path: string;
 
   /**
     Will be pre-pended to path.
@@ -36,7 +36,7 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
     @default '/'
   */
   // Set in reopen so it can be overwritten with extend
-  rootURL!: string;
+  declare rootURL: string;
 
   detect(): void {
     let { rootURL } = this;
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index de4babf3ff3..cfeea8e6fd0 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -108,8 +108,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   private _names: unknown;
 
   _router!: EmberRouter;
-  _topLevelViewTemplate!: any;
-  _environment!: any;
+  declare _topLevelViewTemplate: any;
+  declare _environment: any;
 
   constructor(owner: Owner) {
     super(...arguments);
@@ -131,11 +131,11 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   }
 
   // Implement Evented
-  on!: (name: string, method: ((...args: any[]) => void) | string) => this;
-  one!: (name: string, method: string | ((...args: any[]) => void)) => this;
-  trigger!: (name: string, ...args: any[]) => any;
-  off!: (name: string, method: string | ((...args: any[]) => void)) => this;
-  has!: (name: string) => boolean;
+  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
+  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare trigger: (name: string, ...args: any[]) => any;
+  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare has: (name: string) => boolean;
 
   serialize!: (
     model: {},
@@ -190,7 +190,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   // Set in reopen so it can be overriden with extend
-  queryParams!: any;
+  declare queryParams: Record<string, unknown>;
 
   /**
     The name of the template to use by default when rendering this routes
@@ -223,7 +223,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   // Set in reopen so it can be overriden with extend
-  templateName!: string | null;
+  declare templateName: string | null;
 
   /**
     The name of the controller to associate with this route.
@@ -246,7 +246,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   // Set in reopen so it can be overriden with extend
-  controllerName!: string | null;
+  declare controllerName: string | null;
 
   /**
     The controller associated with this route.
@@ -277,7 +277,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.6.0
     @public
   */
-  controller!: Controller;
+  declare controller: Controller;
 
   /**
     The name of the route, dot-delimited.
@@ -291,7 +291,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
   */
-  routeName!: string;
+  declare routeName: string;
 
   /**
     The name of the route, dot-delimited, including the engine prefix
@@ -306,7 +306,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 2.10.0
     @public
   */
-  fullRouteName!: string;
+  declare fullRouteName: string;
 
   /**
     Sets the name for this route, including a fully resolved name for routes
@@ -2207,7 +2207,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   }
 
   // Set in reopen
-  actions!: Record<string, Function>;
+  declare actions: Record<string, (...args: any[]) => any>;
 
   /**
     Sends an action to the router, which will delegate it to the currently
@@ -2258,7 +2258,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   // Set with reopen to override parent behavior
-  send!: (name: string, ...args: any[]) => unknown;
+  declare send: (name: string, ...args: any[]) => unknown;
 }
 
 function parentRoute(route: Route) {
@@ -2271,7 +2271,7 @@ function routeInfoFor(route: Route, routeInfos: InternalRouteInfo<Route>[], offs
     return;
   }
 
-  let current: any;
+  let current: Route | undefined;
   for (let i = 0; i < routeInfos.length; i++) {
     current = routeInfos[i].route;
     if (current === route) {
@@ -2388,17 +2388,14 @@ export interface RenderOptions {
   into?: string;
   outlet: string;
   name: string;
-  controller: unknown;
+  controller: Controller | string | undefined;
   model: unknown;
   template: Template;
 }
 
-interface PartialRenderOptions {
-  into?: string;
-  outlet?: string;
-  controller?: string | any;
-  model?: {};
-}
+type PartialRenderOptions = Partial<
+  Pick<RenderOptions, 'into' | 'outlet' | 'controller' | 'model'>
+>;
 
 export function getFullQueryParams(router: EmberRouter, state: TransitionState<Route>) {
   if (state['fullQueryParams']) {
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index ea864f7a464..495e1a2f15d 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -152,7 +152,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @public
   */
   // Set with reopen to allow overriding via extend
-  rootURL!: string;
+  declare rootURL: string;
 
   /**
    The `location` property determines the type of URL's that your
@@ -173,7 +173,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @public
   */
   // Set with reopen to allow overriding via extend
-  location!: string | IEmberLocation;
+  declare location: string | IEmberLocation;
 
   _routerMicrolib!: Router<Route>;
   _didSetupRouter = false;
@@ -200,11 +200,11 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   private namespace: any;
 
   // Begin Evented
-  on!: (name: string, method: ((...args: any[]) => void) | string) => this;
-  one!: (name: string, method: string | ((...args: any[]) => void)) => this;
-  trigger!: (name: string, ...args: any[]) => any;
-  off!: (name: string, method: string | ((...args: any[]) => void)) => this;
-  has!: (name: string) => boolean;
+  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
+  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare trigger: (name: string, ...args: any[]) => unknown;
+  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare has: (name: string) => boolean;
   // End Evented
 
   // Set with reopenClass
@@ -1408,7 +1408,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @since 1.2.0
   */
   // Set with reopen to allow overriding via extend
-  didTransition!: typeof defaultDidTransition;
+  declare didTransition: typeof defaultDidTransition;
 
   /**
     Handles notifying any listeners of an impending URL
@@ -1421,7 +1421,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @since 1.11.0
   */
   // Set with reopen to allow overriding via extend
-  willTransition!: typeof defaultWillTransition;
+  declare willTransition: typeof defaultWillTransition;
 
   /**
    Represents the current URL.
@@ -1431,7 +1431,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @private
   */
   // Set with reopen to allow overriding via extend
-  url!: string;
+  declare url: string;
 }
 
 /*
diff --git a/packages/@ember/object/type-tests/compat.test.ts b/packages/@ember/object/type-tests/compat.test.ts
index 840ec5d7fa4..84fa5fc4418 100644
--- a/packages/@ember/object/type-tests/compat.test.ts
+++ b/packages/@ember/object/type-tests/compat.test.ts
@@ -1,4 +1,4 @@
 import { dependentKeyCompat } from '@ember/object/compat';
 import { expectTypeOf } from 'expect-type';
 
-expectTypeOf(dependentKeyCompat).toMatchTypeOf<Function>();
+expectTypeOf(dependentKeyCompat).toMatchTypeOf<PropertyDecorator>();

From 736a8452c6e3c72f52fdc61ff57aee9c45199c50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 23:55:03 +0000
Subject: [PATCH 0508/1405] Bump browserslist from 4.10.0 to 4.16.6

Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.10.0 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.10.0...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 109 +++++++++++++-----------------------------------------
 1 file changed, 25 insertions(+), 84 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4bac89d454c..8f26db0c3d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3179,36 +3179,16 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA= sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
 
-browserslist@^4.11.1:
-  version "4.12.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d"
-  integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==
-  dependencies:
-    caniuse-lite "^1.0.30001043"
-    electron-to-chromium "^1.3.413"
-    node-releases "^1.1.53"
-    pkg-up "^2.0.0"
-
-browserslist@^4.14.5:
-  version "4.14.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
-  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
-  dependencies:
-    caniuse-lite "^1.0.30001157"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.591"
+browserslist@^4.11.1, browserslist@^4.14.5, browserslist@^4.8.3:
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
+  dependencies:
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.66"
-
-browserslist@^4.8.3:
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.10.0.tgz#f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"
-  integrity sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==
-  dependencies:
-    caniuse-lite "^1.0.30001035"
-    electron-to-chromium "^1.3.378"
-    node-releases "^1.1.52"
-    pkg-up "^3.1.0"
+    node-releases "^1.1.71"
 
 browserstack-local@^1.4.2:
   version "1.4.2"
@@ -3375,20 +3355,10 @@ can-symlink@^1.0.0:
   dependencies:
     tmp "0.0.28"
 
-caniuse-lite@^1.0.30001035:
-  version "1.0.30001035"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
-  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
-
-caniuse-lite@^1.0.30001043:
-  version "1.0.30001052"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001052.tgz#33a5ddd13783cfe2c8a6a846ab983387d4edff75"
-  integrity sha512-b2/oWZwkpWzEB1+Azr2Z4FcpdDkH+9R4dn+bkwk/6eH9mRSrnZjhA6v32+zsV+TSqC0pp2Rxush2yUVTJ0dJTQ==
-
-caniuse-lite@^1.0.30001157:
-  version "1.0.30001157"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz#2d11aaeb239b340bc1aa730eca18a37fdb07a9ab"
-  integrity sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==
+caniuse-lite@^1.0.30001219:
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3655,10 +3625,10 @@ color-name@^1.1.1, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
 colors@1.0.3:
   version "1.0.3"
@@ -4128,20 +4098,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 
-electron-to-chromium@^1.3.378:
-  version "1.3.380"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz#1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d"
-  integrity sha512-2jhQxJKcjcSpVOQm0NAfuLq8o+130blrcawoumdXT6411xG/xIAOyZodO/y7WTaYlz/NHe3sCCAe/cJLnDsqTw==
-
-electron-to-chromium@^1.3.413:
-  version "1.3.429"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.429.tgz#0d1ef6710ba84de3710615280c1f6f79c8205b47"
-  integrity sha512-YW8rXMJx33FalISp0uP0+AkvBx9gfzzQ4NotblGga6Z8ZX00bg2e5FNWV8fyDD/VN3WLhEtjFXNwzdJrdaAHEQ==
-
-electron-to-chromium@^1.3.591:
-  version "1.3.593"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.593.tgz#947ccf6dc8e013e2b053d2463ecd1043c164fcef"
-  integrity sha512-GvO7G1ZxvffnMvPCr4A7+iQPVuvpyqMrx2VWSERAjG+pHK6tmO9XqYdBfMIq9corRyi4bNImSDEiDvIoDb8HrA==
+electron-to-chromium@^1.3.723:
+  version "1.3.736"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
+  integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
 
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
@@ -7712,22 +7672,10 @@ node-notifier@^5.0.1:
     shellwords "^0.1.0"
     which "^1.2.12"
 
-node-releases@^1.1.52:
-  version "1.1.52"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz#bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"
-  integrity sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==
-  dependencies:
-    semver "^6.3.0"
-
-node-releases@^1.1.53:
-  version "1.1.55"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.55.tgz#8af23b7c561d8e2e6e36a46637bab84633b07cee"
-  integrity sha512-H3R3YR/8TjT5WPin/wOoHOUPHgvj8leuU/Keta/rwelEQN9pA/S2Dx8/se4pZ2LBxSd0nAGzsNzhqwa77v7F1w==
-
-node-releases@^1.1.66:
-  version "1.1.66"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.66.tgz#609bd0dc069381015cd982300bae51ab4f1b1814"
-  integrity sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 node-uuid@~1.4.0:
   version "1.4.8"
@@ -8244,13 +8192,6 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-  dependencies:
-    find-up "^3.0.0"
-
 plur@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"

From e28a201b9ccfb16f93089cea9207fca9b552d98c Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Mon, 24 May 2021 23:33:40 -0700
Subject: [PATCH 0509/1405] [BUGFIX release] Improve class based tranform
 deprecation message

---
 .../lib/system/compile-options.ts             | 30 +++++++++++--------
 .../tests/system/compile_options_test.js      |  6 ++--
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 1f4c3e67964..87832571e09 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -82,11 +82,16 @@ interface LegacyPlugin {
 
 export type LegacyPluginClass = new (env: ASTPluginEnvironment) => LegacyPlugin;
 
-function wrapLegacyPluginIfNeeded(_plugin: PluginFunc | LegacyPluginClass): PluginFunc {
-  let plugin = _plugin;
-  if (_plugin.prototype && _plugin.prototype.transform) {
+function isLegacyPluginClass(plugin: PluginFunc | LegacyPluginClass): plugin is LegacyPluginClass {
+  return plugin.prototype && typeof plugin.prototype.transform === 'function';
+}
+
+function wrapLegacyPluginIfNeeded(plugin: PluginFunc | LegacyPluginClass): PluginFunc {
+  if (isLegacyPluginClass(plugin)) {
+    const Plugin = plugin;
+
     deprecate(
-      'Using class based template compilation plugins is deprecated, please update to the functional style',
+      `Using class based template compilation plugins is deprecated, please update to the functional style: ${Plugin.name}`,
       false,
       {
         id: 'template-compiler.registerPlugin',
@@ -102,28 +107,29 @@ function wrapLegacyPluginIfNeeded(_plugin: PluginFunc | LegacyPluginClass): Plug
       let pluginInstantiated = false;
 
       return {
-        name: _plugin.constructor && _plugin.constructor.name,
+        name: plugin.name,
 
         visitor: {
           Program(node: AST.Program): AST.Node | void {
             if (!pluginInstantiated) {
               pluginInstantiated = true;
-              let plugin = new (_plugin as LegacyPluginClass)(env);
+              let instance = new Plugin(env);
 
-              plugin.syntax = env.syntax;
+              instance.syntax = env.syntax;
 
-              return plugin.transform(node);
+              return instance.transform(node);
             }
           },
         },
       };
     };
 
-    pluginFunc.__raw = _plugin as LegacyPluginClass;
-    plugin = pluginFunc;
-  }
+    pluginFunc.__raw = Plugin;
 
-  return plugin as PluginFunc;
+    return pluginFunc;
+  } else {
+    return plugin;
+  }
 }
 
 export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginClass): void {
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index 921d3f2387a..2b75b69f36d 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -124,7 +124,7 @@ moduleFor(
   class extends CustomPluginsTests {
     beforeEach() {
       expectDeprecation(
-        'Using class based template compilation plugins is deprecated, please update to the functional style'
+        `Using class based template compilation plugins is deprecated, please update to the functional style: ${LegacyCustomTransform.name}`
       );
       expectDeprecation(
         'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.'
@@ -141,7 +141,7 @@ moduleFor(
 
     ['@test custom registered plugins are deduplicated'](assert) {
       expectDeprecation(
-        'Using class based template compilation plugins is deprecated, please update to the functional style'
+        `Using class based template compilation plugins is deprecated, please update to the functional style: ${LegacyCustomTransform.name}`
       );
       expectDeprecation(
         'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.'
@@ -194,7 +194,7 @@ moduleFor(
     // override so that we can provide custom AST plugins to compile
     compile(templateString) {
       expectDeprecation(
-        'Using class based template compilation plugins is deprecated, please update to the functional style'
+        'Using class based template compilation plugins is deprecated, please update to the functional style: LegacyCustomTransform'
       );
       return compile(templateString, {
         plugins: {

From bb9d96e5cf10d02681c54be426586328206a68c2 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Tue, 25 May 2021 01:57:43 -0700
Subject: [PATCH 0510/1405] [BUGFIX release] Refine Ember Global deprecation
 message

Example message:

```
Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.

See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.

Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. The following steps may help:

* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.
* Upgrade the following addons to the latest version:
  * active-model-adapter
  * ember-animated
  * ember-async-await-helper
  * ember-attacher
  * ember-cli-showdown
  * ember-freestyle
  * ember-md5

### Important ###

In order to avoid repeatedly showing the same deprecation messages, no further deprecation messages will be shown for usages of the Ember Global until ember-cli-babel is upgraded to v7.26.6 or above.

To see all instances of this deprecation message at runtime, set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.

### Details ###

Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, potentially triggering this deprecation message even when you did not directly reference the Ember Global.

The following outdated versions are found in your project:

* ember-cli-babel@6.11.0, currently used by:
  * ember-md5@6.11.0
    * Depends on ember-cli-babel@6.11.0

* ember-cli-babel@6.18.0, currently used by:
  * active-model-adapter@6.18.0
    * Depends on ember-cli-babel@^6.8.2
  * ember-angle-bracket-invocation-polyfill@6.18.0
    * Depends on ember-cli-babel@^6.17.0
    * Added by ember-animated@0.11.0
  * ember-async-await-helper@6.18.0
    * Depends on ember-cli-babel@^6.16.0
  * ember-cli-deploy-bugsnag@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.16.0
  * ember-cli-showdown@6.18.0
    * Depends on ember-cli-babel@^6.8.1
  * ember-inflector@6.18.0
    * Depends on ember-cli-babel@^6.0.0
    * Added by active-model-adapter@2.2.0
  * ember-maybe-import-regenerator@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.0.0-beta.4
    * Added by ember-animated@0.11.0
  * ember-named-arguments-polyfill@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.6.0
    * Added by ember-animated@0.11.0
  * ember-raf-scheduler@6.18.0
    * Depends on ember-cli-babel@^6.6.0
    * Added by ember-attacher@1.2.3 > ember-popper@0.11.3
  * ember-runtime-enumerable-includes-polyfill@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.9.0
    * Added by ember-freestyle@0.12.11

* ember-cli-babel@7.26.5, currently used by:
  * @embroider/macros@7.26.5 (Compatible)
    * Depends on ember-cli-babel@^7.23.0
    * Added by ember-cli-mirage@2.2.0
    * Added by ember-exam@6.1.0
  * direwolf (your app)
    * Depends on ember-cli-babel@7.26.5
  * ember-attacher@7.26.5 (Compatible)
    * Depends on ember-cli-babel@^7.23.0
  * ember-fetch@7.26.5 (Compatible)
    * Depends on ember-cli-babel@^7.23.0
  * ember-freestyle@7.26.5 (Compatible)
    * Depends on ember-cli-babel@^7.23.0
  * ember-inflector@7.26.5 (Compatible)
    * Depends on ember-cli-babel@^7.23.0
    * Added by ember-data@3.26.0
    * Added by ember-cli-mirage@2.2.0
  * ember-source@7.26.5 (Dormant)
    * Depends on ember-cli-babel@^7.23.0
  * qunit-dom@7.26.5 (Dormant)
    * Depends on ember-cli-babel@^7.23.0

Note: Addons marked as "Dormant" does not appear to have any JavaScript files. Therefore, even if they are using an old version ember-cli-babel, they are unlikely to be the cuplrit of this deprecation and can likely be ignored.

Note: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.

```
---
 lib/index.js                                  | 249 +++++++++++++++++-
 packages/@ember/-internals/bootstrap/index.js |  34 +--
 2 files changed, 267 insertions(+), 16 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 7b209f811b4..580469b2275 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -10,6 +10,7 @@ const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-pl
 const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
+const semver = require('semver');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -40,6 +41,17 @@ add(
   path.join(__dirname, '..', 'dist', 'ember-template-compiler.js')
 );
 
+function* walkAddonTree(project, pathToAddon = []) {
+  for (let addon of project.addons) {
+    yield [addon, pathToAddon];
+    yield* walkAddonTree(addon, [...pathToAddon, `${addon.name}@${addon.pkg.version}`]);
+  }
+}
+
+function requirementFor(pkg, deps = {}) {
+  return deps[pkg];
+}
+
 module.exports = {
   init() {
     this._super.init && this._super.init.apply(this, arguments);
@@ -64,11 +76,14 @@ module.exports = {
   name: 'ember-source',
   paths,
   absolutePaths,
+  _bootstrapEmber: "require('@ember/-internals/bootstrap').default();",
   _jqueryIntegrationEnabled: true,
 
   included() {
     this._super.included.apply(this, arguments);
 
+    this._issueGlobalsDeprecation();
+
     const { has } = require('@ember/edition-utils');
 
     let optionalFeatures = this.project.addons.find((a) => a.name === '@ember/optional-features');
@@ -244,7 +259,7 @@ module.exports = {
     return new MergeTrees([
       concatBundle(emberFiles, {
         outputFile: 'ember.js',
-        footer: "require('@ember/-internals/bootstrap');",
+        footer: this._bootstrapEmber,
       }),
 
       concatBundle(emberTestingFiles, {
@@ -309,4 +324,236 @@ module.exports = {
 
     return debugTree(new MergeTrees([ember, templateCompiler, jquery]), 'vendor:final');
   },
+
+  _issueGlobalsDeprecation() {
+    if (process.env.EMBER_ENV === 'production') {
+      return;
+    }
+
+    let isYarnProject = ((root) => {
+      try {
+        // eslint-disable-next-line node/no-unpublished-require
+        return require('ember-cli/lib/utilities/is-yarn-project')(root);
+      } catch {
+        return undefined;
+      }
+    })(this.project.root);
+
+    let groupedByTopLevelAddon = Object.create(null);
+    let groupedByVersion = Object.create(null);
+    let projectInfo;
+
+    for (let [addon, pathToAddon] of walkAddonTree(this.project)) {
+      let version = addon.pkg.version;
+
+      if (addon.name === 'ember-cli-babel' && semver.lt(version, '7.26.6')) {
+        let info;
+
+        if (addon.parent === this.project) {
+          let requirement = requirementFor('ember-cli-babel', this.project.pkg.devDependencies);
+          let compatible = semver.satisfies('7.26.6', requirement);
+
+          info = projectInfo = {
+            parent: `${this.project.name()} (your app)`,
+            version,
+            requirement,
+            compatible,
+            dormant: false,
+            path: pathToAddon,
+          };
+        } else {
+          let requirement = requirementFor('ember-cli-babel', addon.parent.pkg.dependencies);
+          let compatible = semver.satisfies('7.26.6', requirement);
+          let dormant = addon.parent._fileSystemInfo
+            ? addon.parent._fileSystemInfo().hasJSFiles === false
+            : false;
+
+          let topLevelAddon = addon.parent;
+
+          while (topLevelAddon.parent !== this.project) {
+            topLevelAddon = topLevelAddon.parent;
+          }
+
+          info = {
+            parent: `${addon.parent.name}@${addon.pkg.version}`,
+            version,
+            requirement,
+            compatible,
+            dormant,
+            path: pathToAddon,
+          };
+
+          let addons = groupedByTopLevelAddon[topLevelAddon.name] || [];
+          groupedByTopLevelAddon[topLevelAddon.name] = [...addons, info];
+        }
+
+        let group = groupedByVersion[version] || Object.create(null);
+        groupedByVersion[version] = group;
+
+        let addons = group[info.parent] || [];
+        group[info.parent] = [...addons, info];
+      }
+    }
+
+    if (Object.keys(groupedByVersion).length === 0) {
+      return;
+    }
+
+    let dormantTopLevelAddons = [];
+    let compatibleTopLevelAddons = [];
+    let incompatibleTopLevelAddons = [];
+
+    for (let addon of Object.keys(groupedByTopLevelAddon)) {
+      let group = groupedByTopLevelAddon[addon];
+
+      if (group.every((info) => info.dormant)) {
+        dormantTopLevelAddons.push(addon);
+      } else if (group.every((info) => info.compatible)) {
+        compatibleTopLevelAddons.push(addon);
+      } else {
+        incompatibleTopLevelAddons.push(addon);
+      }
+    }
+
+    let message =
+      'Usage of the Ember Global is deprecated. ' +
+      'You should import the Ember module or the specific API instead.\n\n' +
+      'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
+      'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
+      'The following steps may help:\n\n';
+
+    let hasActionableSteps = false;
+
+    if (projectInfo) {
+      message += '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+      hasActionableSteps = true;
+    } else if (compatibleTopLevelAddons.length > 0) {
+      // Only show the compatible addons if the project itself is up-to-date, because updating the
+      // project's own dependency on ember-cli-babel to latest may also get these addons to use it
+      // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
+      if (isYarnProject === true) {
+        message +=
+          '* Run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
+      } else if (isYarnProject === false) {
+        message += '* Run `npm dedupe`.\n';
+      } else {
+        message +=
+          '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
+          '* If using npm, run `npm dedupe`.\n';
+      }
+
+      hasActionableSteps = true;
+    }
+
+    if (incompatibleTopLevelAddons.length > 0) {
+      message += '* Upgrade the following addons to the latest version:\n';
+
+      for (let addon of incompatibleTopLevelAddons) {
+        message += `  * ${addon}\n`;
+      }
+
+      hasActionableSteps = true;
+    }
+
+    if (!hasActionableSteps) {
+      // Only show the dormant addons if there are nothing else to do because they are unlikely to
+      // be the problem.
+      message += '* Upgrade the following addons to the latest version, if available:\n';
+
+      for (let addon of dormantTopLevelAddons) {
+        message += `  * ${addon}\n`;
+      }
+    }
+
+    if (hasActionableSteps && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all') {
+      message +=
+        '\n### Important ###\n\n' +
+        'In order to avoid repeatedly showing the same deprecation messages, ' +
+        'no further deprecation messages will be shown for usages of the Ember Global ' +
+        'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
+        'To see all instances of this deprecation message at runtime, ' +
+        'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
+        'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
+    }
+
+    message +=
+      '\n### Details ###\n\n' +
+      'Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, ' +
+      'potentially triggering this deprecation message even when you did not directly reference the Ember Global.\n\n' +
+      'The following outdated versions are found in your project:\n';
+
+    let hasDormantAddons = false;
+    let hasCompatibleAddons = false;
+
+    for (let version of Object.keys(groupedByVersion).sort(semver.compare)) {
+      message += `\n* ember-cli-babel@${version}, currently used by:\n`;
+
+      for (let parent of Object.keys(groupedByVersion[version]).sort()) {
+        let info = groupedByVersion[version][parent][0];
+
+        message += `  * ${parent}`;
+
+        if (info.dormant) {
+          message += ' (Dormant)\n';
+          hasDormantAddons = true;
+        } else if (info.compatible) {
+          message += ' (Compatible)\n';
+          hasCompatibleAddons = true;
+        } else {
+          message += '\n';
+        }
+
+        message += `    * Depends on ember-cli-babel@${groupedByVersion[version][parent][0].requirement}\n`;
+
+        for (let info of groupedByVersion[version][parent]) {
+          let adddedBy = info.path.slice(0, -1);
+
+          if (adddedBy.length) {
+            message += `    * Added by ${adddedBy.join(' > ')}\n`;
+          }
+
+          if (info.compatible) {
+            hasCompatibleAddons = true;
+          }
+        }
+      }
+    }
+
+    if (hasDormantAddons) {
+      message +=
+        '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
+        'Therefore, even if they are using an old version ember-cli-babel, they are ' +
+        'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
+    }
+
+    if (hasCompatibleAddons) {
+      message += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
+
+      if (projectInfo) {
+        message += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+      } else {
+        if (isYarnProject === true) {
+          message +=
+            'Try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
+        } else if (isYarnProject === false) {
+          message += 'Try running `npm dedupe`.\n';
+        } else {
+          message +=
+            'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
+            'If using npm, try running `npm dedupe`.\n';
+        }
+      }
+    }
+
+    if (hasActionableSteps) {
+      this.ui.writeWarnLine('[DEPRECATION] ' + message);
+    }
+
+    this._bootstrapEmber = `
+      require('@ember/-internals/bootstrap').default(
+        ${JSON.stringify(message)},
+        ${hasActionableSteps && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
+      );
+    `;
+  },
 };
diff --git a/packages/@ember/-internals/bootstrap/index.js b/packages/@ember/-internals/bootstrap/index.js
index 431992b2e55..05e70d3a721 100644
--- a/packages/@ember/-internals/bootstrap/index.js
+++ b/packages/@ember/-internals/bootstrap/index.js
@@ -2,8 +2,12 @@ import require from 'require';
 import { context } from '@ember/-internals/environment';
 import { deprecate } from '@ember/debug';
 
-(function () {
+const DEFAULT_MESSAGE =
+  'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.';
+
+export default function bootstrap(message = DEFAULT_MESSAGE, once = false) {
   let Ember;
+  let disabled = false;
 
   function defineEmber(key) {
     Object.defineProperty(context.exports, key, {
@@ -14,19 +18,19 @@ import { deprecate } from '@ember/debug';
           Ember = require('ember').default;
         }
 
-        deprecate(
-          'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.',
-          false,
-          {
-            id: 'ember-global',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-          }
-        );
+        deprecate(message, disabled, {
+          id: 'ember-global',
+          until: '4.0.0',
+          url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global',
+          for: 'ember-source',
+          since: {
+            enabled: '3.27.0',
+          },
+        });
+
+        if (once) {
+          disabled = true;
+        }
 
         return Ember;
       },
@@ -43,4 +47,4 @@ import { deprecate } from '@ember/debug';
     // eslint-disable-next-line no-undef
     module.exports = Ember = require('ember').default;
   }
-})();
+}

From 7a8ab95eeeee95680974b2bdb04031b96e4ee7a4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 26 May 2021 14:37:13 -0700
Subject: [PATCH 0511/1405] [BUGFIX release] Improve computed.* and run.*
 deprecation message

Show details about outdated ember-cli-babel and only show the first instance by default.

Example message:

```
Using `computed.reads` has been deprecated. Instead, import the value directly from @ember/object/computed:

import { reads } from '@ember/object/computed';

These usages may be caused by an outdated ember-cli-babel dependency. The following steps may help:

* Upgrade the following addons to the latest version:
  * active-model-adapter
  * ember-animated
  * ember-async-await-helper
  * ember-attacher
  * ember-cli-showdown
  * ember-md5

### Important ###

In order to avoid repeatedly showing the same deprecation messages, no further deprecation messages will be shown for theses deprecated usages until ember-cli-babel is upgraded to v7.26.6 or above.

To see all instances of this deprecation message, set the `EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS` environment variable to "all", e.g. `EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test`.

### Details ###

Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, potentially triggering this deprecation message indirectly, even when you did not observe these deprecated usages in your code.

The following outdated versions are found in your project:

* ember-cli-babel@6.11.0, currently used by:
  * ember-md5@6.11.0
    * Depends on ember-cli-babel@6.11.0

* ember-cli-babel@6.18.0, currently used by:
  * active-model-adapter@6.18.0
    * Depends on ember-cli-babel@^6.8.2
  * ember-angle-bracket-invocation-polyfill@6.18.0
    * Depends on ember-cli-babel@^6.17.0
    * Added by ember-animated@0.11.0
  * ember-async-await-helper@6.18.0
    * Depends on ember-cli-babel@^6.16.0
  * ember-cli-deploy-bugsnag@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.16.0
  * ember-cli-showdown@6.18.0
    * Depends on ember-cli-babel@^6.8.1
  * ember-inflector@6.18.0
    * Depends on ember-cli-babel@^6.0.0
    * Added by active-model-adapter@2.2.0
  * ember-maybe-import-regenerator@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.0.0-beta.4
    * Added by ember-animated@0.11.0
  * ember-named-arguments-polyfill@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.6.0
    * Added by ember-animated@0.11.0
  * ember-raf-scheduler@6.18.0
    * Depends on ember-cli-babel@^6.6.0
    * Added by ember-attacher@1.2.3 > ember-popper@0.11.3
  * ember-runtime-enumerable-includes-polyfill@6.18.0 (Dormant)
    * Depends on ember-cli-babel@^6.9.0
    * Added by ember-freestyle@0.12.11

Note: Addons marked as "Dormant" does not appear to have any JavaScript files. Therefore, even if they are using an old version ember-cli-babel, they are unlikely to be the cuplrit of this deprecation and can likely be ignored.
```
---
 lib/index.js                     | 153 +++++++++++++++++++++----------
 packages/@ember/object/index.js  |  32 ++++---
 packages/@ember/runloop/index.js |  54 ++++++-----
 3 files changed, 154 insertions(+), 85 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 580469b2275..6bb6a231626 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -415,101 +415,86 @@ module.exports = {
       }
     }
 
-    let message =
-      'Usage of the Ember Global is deprecated. ' +
-      'You should import the Ember module or the specific API instead.\n\n' +
-      'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
-      'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
-      'The following steps may help:\n\n';
+    let suggestions = 'The following steps may help:\n\n';
 
-    let hasActionableSteps = false;
+    let hasActionableSuggestions = false;
 
     if (projectInfo) {
-      message += '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
-      hasActionableSteps = true;
+      suggestions += '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+      hasActionableSuggestions = true;
     } else if (compatibleTopLevelAddons.length > 0) {
       // Only show the compatible addons if the project itself is up-to-date, because updating the
       // project's own dependency on ember-cli-babel to latest may also get these addons to use it
       // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
       if (isYarnProject === true) {
-        message +=
+        suggestions +=
           '* Run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
       } else if (isYarnProject === false) {
-        message += '* Run `npm dedupe`.\n';
+        suggestions += '* Run `npm dedupe`.\n';
       } else {
-        message +=
+        suggestions +=
           '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
           '* If using npm, run `npm dedupe`.\n';
       }
 
-      hasActionableSteps = true;
+      hasActionableSuggestions = true;
     }
 
     if (incompatibleTopLevelAddons.length > 0) {
-      message += '* Upgrade the following addons to the latest version:\n';
+      suggestions += '* Upgrade the following addons to the latest version:\n';
 
       for (let addon of incompatibleTopLevelAddons) {
-        message += `  * ${addon}\n`;
+        suggestions += `  * ${addon}\n`;
       }
 
-      hasActionableSteps = true;
+      hasActionableSuggestions = true;
     }
 
-    if (!hasActionableSteps) {
+    if (!hasActionableSuggestions) {
       // Only show the dormant addons if there are nothing else to do because they are unlikely to
       // be the problem.
-      message += '* Upgrade the following addons to the latest version, if available:\n';
+      suggestions += '* Upgrade the following addons to the latest version, if available:\n';
 
       for (let addon of dormantTopLevelAddons) {
-        message += `  * ${addon}\n`;
+        suggestions += `  * ${addon}\n`;
       }
     }
 
-    if (hasActionableSteps && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all') {
-      message +=
-        '\n### Important ###\n\n' +
-        'In order to avoid repeatedly showing the same deprecation messages, ' +
-        'no further deprecation messages will be shown for usages of the Ember Global ' +
-        'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
-        'To see all instances of this deprecation message at runtime, ' +
-        'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
-        'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
-    }
-
-    message +=
+    let details =
       '\n### Details ###\n\n' +
       'Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, ' +
-      'potentially triggering this deprecation message even when you did not directly reference the Ember Global.\n\n' +
+      'potentially triggering this deprecation message indirectly, ' +
+      'even when you did not observe these deprecated usages in your code.\n\n' +
       'The following outdated versions are found in your project:\n';
 
     let hasDormantAddons = false;
     let hasCompatibleAddons = false;
 
     for (let version of Object.keys(groupedByVersion).sort(semver.compare)) {
-      message += `\n* ember-cli-babel@${version}, currently used by:\n`;
+      details += `\n* ember-cli-babel@${version}, currently used by:\n`;
 
       for (let parent of Object.keys(groupedByVersion[version]).sort()) {
         let info = groupedByVersion[version][parent][0];
 
-        message += `  * ${parent}`;
+        details += `  * ${parent}`;
 
         if (info.dormant) {
-          message += ' (Dormant)\n';
+          details += ' (Dormant)\n';
           hasDormantAddons = true;
         } else if (info.compatible) {
-          message += ' (Compatible)\n';
+          details += ' (Compatible)\n';
           hasCompatibleAddons = true;
         } else {
-          message += '\n';
+          details += '\n';
         }
 
-        message += `    * Depends on ember-cli-babel@${groupedByVersion[version][parent][0].requirement}\n`;
+        details += `    * Depends on ember-cli-babel@${groupedByVersion[version][parent][0].requirement}\n`;
 
         for (let info of groupedByVersion[version][parent]) {
           let adddedBy = info.path.slice(0, -1);
 
           if (adddedBy.length) {
-            message += `    * Added by ${adddedBy.join(' > ')}\n`;
+            details += `    * Added by ${adddedBy.join(' > ')}\n`;
           }
 
           if (info.compatible) {
@@ -520,40 +505,110 @@ module.exports = {
     }
 
     if (hasDormantAddons) {
-      message +=
+      details +=
         '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
         'Therefore, even if they are using an old version ember-cli-babel, they are ' +
         'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
     }
 
     if (hasCompatibleAddons) {
-      message += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
+      details += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
 
       if (projectInfo) {
-        message += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+        details += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
       } else {
         if (isYarnProject === true) {
-          message +=
+          details +=
             'Try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
         } else if (isYarnProject === false) {
-          message += 'Try running `npm dedupe`.\n';
+          details += 'Try running `npm dedupe`.\n';
         } else {
-          message +=
+          details +=
             'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
             'If using npm, try running `npm dedupe`.\n';
         }
       }
     }
 
-    if (hasActionableSteps) {
-      this.ui.writeWarnLine('[DEPRECATION] ' + message);
+    let globalMessage =
+      'Usage of the Ember Global is deprecated. ' +
+      'You should import the Ember module or the specific API instead.\n\n' +
+      'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
+      'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
+      suggestions;
+
+    if (hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all') {
+      globalMessage +=
+        '\n### Important ###\n\n' +
+        'In order to avoid repeatedly showing the same deprecation messages, ' +
+        'no further deprecation messages will be shown for usages of the Ember Global ' +
+        'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
+        'To see all instances of this deprecation message, ' +
+        'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
+        'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
+    }
+
+    globalMessage += details;
+
+    if (hasActionableSuggestions) {
+      this.ui.writeWarnLine('[DEPRECATION] ' + globalMessage);
     }
 
+    let onDotAccess = `(dotKey, importKey, module) => {
+      let message =
+        \`Using \\\`\${dotKey}\\\` has been deprecated. Instead, import the value directly from \${module}:\\n\\n\` +
+        \`  import { \${importKey} } from '\${module}';\\n\\n\` +
+        'These usages may be caused by an outdated ember-cli-babel dependency. ' +
+        ${JSON.stringify(suggestions)};
+
+      if (${
+        hasActionableSuggestions &&
+        process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
+      }) {
+        message +=
+          '\\n### Important ###\\n\\n' +
+          'In order to avoid repeatedly showing the same deprecation messages, ' +
+          'no further deprecation messages will be shown for theses deprecated usages ' +
+          'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
+          'To see all instances of this deprecation message, ' +
+          'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
+          'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
+      }
+
+      message += ${JSON.stringify(details)};
+
+      return message;
+    }`;
+
     this._bootstrapEmber = `
       require('@ember/-internals/bootstrap').default(
-        ${JSON.stringify(message)},
-        ${hasActionableSteps && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
+        ${JSON.stringify(globalMessage)},
+        ${hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
       );
+
+      {
+        let disabled = false;
+
+        let once = ${
+          hasActionableSuggestions &&
+          process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
+        };
+
+        let _onDotAccess = ${onDotAccess};
+
+        let onDotAccess = (...args) => {
+          if (disabled) {
+            return null;
+          } else {
+            disabled = once;
+            return _onDotAccess(...args);
+          }
+        };
+
+        require('@ember/object')._onDotAccess(onDotAccess);
+
+        require('@ember/runloop')._onDotAccess(onDotAccess);
+      }
     `;
   },
 };
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index f2fe18b27f9..af4dd9d5735 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -55,23 +55,31 @@ import {
   uniq,
 } from '@ember/object/computed';
 
+export let _onDotAccess;
+
 // eslint-disable-next-line no-undef
 if (DEBUG) {
+  let _callback = (dotKey, importKey, module) => {
+    return `Using \`${dotKey}\` has been deprecated. Instead, import the value directly from ${module}:\n\n  import { ${importKey} } from '${module}';`;
+  };
+
+  _onDotAccess = (callback) => {
+    _callback = callback;
+  };
+
   let defineDeprecatedComputedFunc = (key, func) => {
     Object.defineProperty(computed, key, {
       get() {
-        deprecate(
-          `Using \`computed.${key}\` has been deprecated. Instead, import the value directly from @ember/object/computed:\n\n  import { ${key} } from '@ember/object/computed';`,
-          false,
-          {
-            id: 'deprecated-run-loop-and-computed-dot-access',
-            until: '4.0.0',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-          }
-        );
+        let message = _callback(`computed.${key}`, key, '@ember/object/computed');
+
+        deprecate(message, message === null, {
+          id: 'deprecated-run-loop-and-computed-dot-access',
+          until: '4.0.0',
+          for: 'ember-source',
+          since: {
+            enabled: '3.27.0',
+          },
+        });
 
         return func;
       },
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index d3ae2d1e780..6ce847c96db 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -743,23 +743,31 @@ export function throttle() {
 
 export let _deprecatedGlobalGetCurrentRunLoop;
 
+export let _onDotAccess;
+
 // eslint-disable-next-line no-undef
 if (DEBUG) {
+  let _callback = (dotKey, importKey, module) => {
+    return `Using \`${dotKey}\` has been deprecated. Instead, import the value directly from ${module}:\n\n  import { ${importKey} } from '${module}';`;
+  };
+
+  _onDotAccess = (callback) => {
+    _callback = callback;
+  };
+
   let defineDeprecatedRunloopFunc = (key, func) => {
     Object.defineProperty(run, key, {
       get() {
-        deprecate(
-          `Using \`run.${key}\` has been deprecated. Instead, import the value directly from @ember/runloop:\n\n  import { ${key} } from '@ember/runloop';`,
-          false,
-          {
-            id: 'deprecated-run-loop-and-computed-dot-access',
-            until: '4.0.0',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-          }
-        );
+        let message = _callback(`run.${key}`, key, '@ember/runloop');
+
+        deprecate(message, message === null, {
+          id: 'deprecated-run-loop-and-computed-dot-access',
+          until: '4.0.0',
+          for: 'ember-source',
+          since: {
+            enabled: '3.27.0',
+          },
+        });
 
         return func;
       },
@@ -767,18 +775,16 @@ if (DEBUG) {
   };
 
   _deprecatedGlobalGetCurrentRunLoop = () => {
-    deprecate(
-      `Using \`run.currentRunLoop\` has been deprecated. Instead, import the getCurrentRunLoop() directly from @ember/runloop:\n\n  import { getCurrentRunLoop } from '@ember/runloop';`,
-      false,
-      {
-        id: 'deprecated-run-loop-and-computed-dot-access',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.27.0',
-        },
-      }
-    );
+    let message = _callback('run.currentRunLoop', 'getCurrentRunLoop', '@ember/runloop');
+
+    deprecate(message, message === null, {
+      id: 'deprecated-run-loop-and-computed-dot-access',
+      until: '4.0.0',
+      for: 'ember-source',
+      since: {
+        enabled: '3.27.0',
+      },
+    });
 
     return _getCurrentRunLoop();
   };

From 72c3fd71609b4b07502def8fe103b98d69912b7d Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 26 May 2021 16:02:33 -0700
Subject: [PATCH 0512/1405] Downlevel for IE11

---
 lib/index.js | 70 +++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 6bb6a231626..8f0ff2ffc36 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -554,31 +554,31 @@ module.exports = {
       this.ui.writeWarnLine('[DEPRECATION] ' + globalMessage);
     }
 
-    let onDotAccess = `(dotKey, importKey, module) => {
-      let message =
-        \`Using \\\`\${dotKey}\\\` has been deprecated. Instead, import the value directly from \${module}:\\n\\n\` +
-        \`  import { \${importKey} } from '\${module}';\\n\\n\` +
-        'These usages may be caused by an outdated ember-cli-babel dependency. ' +
-        ${JSON.stringify(suggestions)};
-
-      if (${
-        hasActionableSuggestions &&
-        process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
-      }) {
-        message +=
-          '\\n### Important ###\\n\\n' +
-          'In order to avoid repeatedly showing the same deprecation messages, ' +
-          'no further deprecation messages will be shown for theses deprecated usages ' +
-          'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
-          'To see all instances of this deprecation message, ' +
-          'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
-          'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
-      }
+    let onDotAccess = `function (dotKey, importKey, module) {
+          var message =
+            'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
+            '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
+            'These usages may be caused by an outdated ember-cli-babel dependency. ' +
+            ${JSON.stringify(suggestions)};
+
+          if (${
+            hasActionableSuggestions &&
+            process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
+          }) {
+            message +=
+              '\\n### Important ###\\n\\n' +
+              'In order to avoid repeatedly showing the same deprecation messages, ' +
+              'no further deprecation messages will be shown for theses deprecated usages ' +
+              'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
+              'To see all instances of this deprecation message, ' +
+              'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
+              'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
+          }
 
-      message += ${JSON.stringify(details)};
+          message += ${JSON.stringify(details)};
 
-      return message;
-    }`;
+          return message;
+        }`;
 
     this._bootstrapEmber = `
       require('@ember/-internals/bootstrap').default(
@@ -586,29 +586,27 @@ module.exports = {
         ${hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
       );
 
-      {
-        let disabled = false;
-
-        let once = ${
-          hasActionableSuggestions &&
-          process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
-        };
-
-        let _onDotAccess = ${onDotAccess};
-
-        let onDotAccess = (...args) => {
+      (function(disabled, once, _onDotAccess) {
+        var onDotAccess = function () {
           if (disabled) {
             return null;
           } else {
             disabled = once;
-            return _onDotAccess(...args);
+            return _onDotAccess.apply(undefined, arguments);
           }
         };
 
         require('@ember/object')._onDotAccess(onDotAccess);
 
         require('@ember/runloop')._onDotAccess(onDotAccess);
-      }
+      })(
+        false,
+        ${
+          hasActionableSuggestions &&
+          process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
+        },
+        ${onDotAccess}
+      );
     `;
   },
 };

From d252b96f36d1faf2844df3776697467d0a6789f4 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 27 May 2021 10:40:16 -0400
Subject: [PATCH 0513/1405] Add v3.27.2 to CHANGELOG.md.

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f567da99d34..33ae1dedbe1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,16 @@
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
+### v3.27.2 (May 27, 2021)
+
+- [#19511](https://github.com/emberjs/ember.js/pull/19511) / [#19548](https://github.com/emberjs/ember.js/pull/19548) [BUGFIX] Makes the (hash) helper lazy
+- [#19530](https://github.com/emberjs/ember.js/pull/19530) [DOC] fix passing params to named blocks examples
+- [#19536](https://github.com/emberjs/ember.js/pull/19536) [BUGFIX] Fix `computed.*` deprecation message to include the correct import path
+- [#19544](https://github.com/emberjs/ember.js/pull/19544) [BUGFIX] Use explicit this in helper test blueprints
+- [#19555](https://github.com/emberjs/ember.js/pull/19555) [BUGFIX] Improve class based tranform deprecation message
+- [#19557](https://github.com/emberjs/ember.js/pull/19557) [BUGFIX] Refine Ember Global deprecation message
+- [#19564](https://github.com/emberjs/ember.js/pull/19564) [BUGFIX] Improve computed.* and run.* deprecation message (IE11)
+
 ### v3.27.1 (May 13, 2021)
 
 - [#19540](https://github.com/emberjs/ember.js/pull/19540) [BUGFIX] Ensure ember-testing is loaded lazily

From 455fdb2d8d3f3f7941169468c48fe19985aedc32 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 27 May 2021 10:45:09 -0400
Subject: [PATCH 0514/1405] Add v3.28.0-beta.2 to CHANGELOG.md.

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33ae1dedbe1..00fcb41871b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Ember Changelog
 
+### v3.28.0-beta.2 (May 27, 2021)
+
+- [#19511](https://github.com/emberjs/ember.js/pull/19511) / [#19548](https://github.com/emberjs/ember.js/pull/19548) [BUGFIX] Makes the (hash) helper lazy
+- [#19530](https://github.com/emberjs/ember.js/pull/19530) [DOC] fix passing params to named blocks examples
+- [#19536](https://github.com/emberjs/ember.js/pull/19536) [BUGFIX] Fix `computed.*` deprecation message to include the correct import path
+- [#19544](https://github.com/emberjs/ember.js/pull/19544) [BUGFIX] Use explicit this in helper test blueprints
+- [#19555](https://github.com/emberjs/ember.js/pull/19555) [BUGFIX] Improve class based tranform deprecation message
+- [#19557](https://github.com/emberjs/ember.js/pull/19557) [BUGFIX] Refine Ember Global deprecation message
+- [#19564](https://github.com/emberjs/ember.js/pull/19564) [BUGFIX] Improve computed.* and run.* deprecation message (IE11)
+- [#19491](https://github.com/emberjs/ember.js/pull/19491) [BUGFIX] Fix `owner.lookup` `owner.register` behavior with `singleton: true` option
+
 ### v3.28.0-beta.1 (May 3, 2021)
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`

From 628a928fa24cbfef3a26c72f69fac9687d66dc9f Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Thu, 27 May 2021 07:57:32 -0700
Subject: [PATCH 0515/1405] [BUGFIX lts] Ensures that computed can depend on
 dynamic hash keys

Ensures that computeds can depend on dynamic hash keys that did not
exist on the original hash.
---
 package.json                                  |  26 +-
 .../tests/integration/helpers/hash-test.js    |  54 ++++
 yarn.lock                                     | 252 +++++++++---------
 3 files changed, 193 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index b550c165e4e..e07dee3245e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.79.2",
+    "@glimmer/vm-babel-plugins": "0.79.3",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.79.2",
-    "@glimmer/destroyable": "0.79.2",
+    "@glimmer/compiler": "0.79.3",
+    "@glimmer/destroyable": "0.79.3",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.79.2",
-    "@glimmer/interfaces": "0.79.2",
-    "@glimmer/manager": "0.79.2",
-    "@glimmer/node": "0.79.2",
-    "@glimmer/opcode-compiler": "0.79.2",
-    "@glimmer/owner": "0.79.2",
-    "@glimmer/program": "0.79.2",
-    "@glimmer/reference": "0.79.2",
-    "@glimmer/runtime": "0.79.2",
-    "@glimmer/validator": "0.79.2",
+    "@glimmer/global-context": "0.79.3",
+    "@glimmer/interfaces": "0.79.3",
+    "@glimmer/manager": "0.79.3",
+    "@glimmer/node": "0.79.3",
+    "@glimmer/opcode-compiler": "0.79.3",
+    "@glimmer/owner": "0.79.3",
+    "@glimmer/program": "0.79.3",
+    "@glimmer/reference": "0.79.3",
+    "@glimmer/runtime": "0.79.3",
+    "@glimmer/validator": "0.79.3",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index 3cd67140fd5..9b3cd24b1a1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -219,6 +219,60 @@ moduleFor(
       this.assertText('Godfrey Chan');
     }
 
+    ['@test works with computeds on non-defined properties']() {
+      let instance;
+
+      let FooBarComponent = Component.extend({
+        init() {
+          this._super(...arguments);
+
+          if (HAS_NATIVE_PROXY) {
+            expectDeprecation(() => {
+              set(this.hash, 'lastName', 'Hietala');
+            }, /You set the '.*' property on a {{hash}} object/);
+          } else {
+            set(this.hash, 'lastName', 'Hietala');
+          }
+
+          instance = this;
+        },
+
+        fullName: computed('hash.firstName', 'hash.lastName', function () {
+          return `${this.hash.firstName} ${this.hash.lastName}`;
+        }),
+      });
+
+      this.registerComponent('foo-bar', {
+        ComponentClass: FooBarComponent,
+        template: `{{this.fullName}}`,
+      });
+
+      this.render(`{{foo-bar hash=(hash firstName=this.firstName)}}`, {
+        firstName: 'Chad',
+        lastName: 'Hietala',
+      });
+
+      this.assertText('Chad Hietala');
+
+      runTask(() => this.rerender());
+
+      this.assertText('Chad Hietala');
+
+      runTask(() => {
+        set(this.context, 'firstName', 'Godfrey');
+
+        if (HAS_NATIVE_PROXY) {
+          expectDeprecation(() => {
+            set(instance.hash, 'lastName', 'Chan');
+          }, /You set the '.*' property on a {{hash}} object/);
+        } else {
+          set(instance.hash, 'lastName', 'Chan');
+        }
+      });
+
+      this.assertText('Godfrey Chan');
+    }
+
     ['@test works when properties are set dynamically']() {
       let fooBarInstance;
       let FooBarComponent = Component.extend({
diff --git a/yarn.lock b/yarn.lock
index 4bac89d454c..4e59f698e23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,52 +1588,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.2.tgz#b874e59de7ad3317c6c28dd781dbc8c08a5942b4"
-  integrity sha512-FbN9/lJyRHOmy4bBPqU/TdiPhN/dSIEJA6Y0dyAu03zuHJqBMd5rtHLm1CRdII9dDwU6T6B09aDlsBBAt8FQcA==
-  dependencies:
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/syntax" "0.79.2"
-    "@glimmer/util" "0.79.2"
-    "@glimmer/wire-format" "0.79.2"
+"@glimmer/compiler@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.3.tgz#fc68770fe50df0eab0aee0331f40ff26a8ce4763"
+  integrity sha512-eGuZg/6C9ITUZJswpiIElfTQ9P9zQoZccrwfFyoc6QQRcwPCGkfgLpbAjnOCHON/HNsq8Aa+2iswJzAuVyz4QA==
+  dependencies:
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/syntax" "0.79.3"
+    "@glimmer/util" "0.79.3"
+    "@glimmer/wire-format" "0.79.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.2.tgz#50b473483d2d45fb3fa12a28719495af683dd695"
-  integrity sha512-owBXBWHQuLN5lzbG+3yzupnTGQj6ttPAx0KTCiUBfH0BpE7tKx+w52MA87bt5GJRX+RS0g57Z1DLQy2yLavfFQ==
+"@glimmer/destroyable@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.3.tgz#a4ee01a5ef7f9e0a5e62668fb992d721c193acd4"
+  integrity sha512-vAvXi/eh6ca0Upqzqg+y/dsiFzHsh4La1J8oCSv33BXhbjoVWp+V++FaEYoGy4E8/gaDdt9fW8xZOvgBSoIBZw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.2"
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/util" "0.79.2"
+    "@glimmer/global-context" "0.79.3"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/util" "0.79.3"
 
-"@glimmer/encoder@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.2.tgz#e3e3ebc85ba210cffdb4c66dd4bdd2e07d864dad"
-  integrity sha512-MqFWJ4rGcikk27iUOkHc2vtnC+cVO2XBQHk6m+T5LEkLHFEC0JEDSj+POxHoHnkjXi8BxbxUxxOptz85p0LGWg==
+"@glimmer/encoder@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.3.tgz#7f4d957b8c948d04b8594c20ba131701a1bf9453"
+  integrity sha512-BpZqJOPpIYQyDGR/OtgE9jbjNd47DBo5L/CJmQ1PYZ11QUM5DMUHuxpIxWKKT2JpzYJfPE2xdvYrhJrCUC0Zfg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/vm" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/vm" "0.79.3"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.2.tgz#970276f1c7c44d34b4bd619709de78b1f46fabaf"
-  integrity sha512-Cwna7I28+6amQd+n4/6sc8PccI3cyk/fIWoxzOKBTA0AqJp/HetiE2IvLQI97VCx/Rv338IINzIu4JlfymWnXA==
+"@glimmer/global-context@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.3.tgz#e50fcfa598a6d9e58a9fba1586efed6d789fe24b"
+  integrity sha512-Aotq1fbYKk8CElF4x1nYJWGufXu7CS/iYUfrpX9v1zIjZMw52tfk1xTlNyRCpM1SCHuUL32QEskGAPDLsIYkVw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.2.tgz#387d11f69ced699e2a227ab9095bd9970829cbf5"
-  integrity sha512-2+CulmZ5XV3Mq2xG4qYPCcA8LVZq76OixdyLHvkGLEvwFx1J2gixcKK0+KNc0dr+Iia6Ebmu9sntulFCRguMgw==
+"@glimmer/interfaces@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.3.tgz#4e0a3ff9cf0b60bdab1a4d420f641ab540d4fc85"
+  integrity sha512-EFiNKwehbxm1xRsfnNu/5nu8Rw+0IYINL/Hciwl/28T8an7FOxftpy/iXXSaWvIsnPyBHqH1ufwsKYY6KXyNzg==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1642,140 +1642,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.2.tgz#6b5a5d393483522636bc4c4b34604246950b7b08"
-  integrity sha512-1lzO8Ud7cJWmBaM7lru8dJvtgivzE5mEhkd7LwfLc/UPNNCOHY/fkfypPr0/C2nQLksVLnMB28pDsQThqoGmZQ==
+"@glimmer/manager@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.3.tgz#02dc843bd6cbc1d5b32321029a8b250c33edc1fa"
+  integrity sha512-VhIXX9oxrLABuA34iZrrMxwhbxRJCftPyEXyD2ZNwsr9QugtAg2cYvtIWxlf9RllTACJrSU7Gb+0BPYVG+aaaQ==
   dependencies:
-    "@glimmer/destroyable" "0.79.2"
+    "@glimmer/destroyable" "0.79.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/reference" "0.79.2"
-    "@glimmer/util" "0.79.2"
-    "@glimmer/validator" "0.79.2"
-
-"@glimmer/node@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.2.tgz#7ead836a2ff17273ddd37351c9f6470f17a60f1e"
-  integrity sha512-2NcWC1PzF/Ru8Xr3h8cuGUumauZMLbyTo24wzJDFCruoMIpizbxcBWGVHuFnH1Cdg8e+fu6eICsCaItVvoJNIw==
-  dependencies:
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/runtime" "0.79.2"
-    "@glimmer/util" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/reference" "0.79.3"
+    "@glimmer/util" "0.79.3"
+    "@glimmer/validator" "0.79.3"
+
+"@glimmer/node@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.3.tgz#536457cc016b5c9788088dac8366fef9c98b7fff"
+  integrity sha512-iNC+TnEvKPRLFNQ6YJOH10NSAHVa7/aCejD+wR8BeOSBq1bbPQTmuQTluKRIwjDww+Np68SEjQ7Wkzvp2Lnivw==
+  dependencies:
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/runtime" "0.79.3"
+    "@glimmer/util" "0.79.3"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.2.tgz#997fc9cb559512afc7eb059d80e27ca58009a715"
-  integrity sha512-sXqzgYfK06ZSHzvVq0ChTx8C/2+A33E3se53wfODXZ88XAGyalTX9U2tHbfKIk3tgOUuMncNfT02NFRDZ/KnmA==
+"@glimmer/opcode-compiler@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.3.tgz#dc27d49d4236060b650e41f16526fd136e7a5d17"
+  integrity sha512-1SDl6YQ/xYAuYD/P70YHkoKri0YZSG8ELx9n1ZKVr1sB0xv6tiIrYOyhhy+omlmcRSQwWd0XEDp/4eeb7UNjlQ==
   dependencies:
-    "@glimmer/encoder" "0.79.2"
+    "@glimmer/encoder" "0.79.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/reference" "0.79.2"
-    "@glimmer/util" "0.79.2"
-    "@glimmer/vm" "0.79.2"
-    "@glimmer/wire-format" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/reference" "0.79.3"
+    "@glimmer/util" "0.79.3"
+    "@glimmer/vm" "0.79.3"
+    "@glimmer/wire-format" "0.79.3"
 
-"@glimmer/owner@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.2.tgz#562805781e235388a17f15c69ae72e834d680325"
-  integrity sha512-W5ZejPXyKWeCJF+6+Rv3+mkCJ56eLv+gtesggaVosbXwgL6QnUySjOdvTOwZ++HUYm6WCLognnO+XNzV25oHcQ==
+"@glimmer/owner@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.3.tgz#0c8aeea009bf2e01653e8419754d7b8ea57607c2"
+  integrity sha512-vEybTpdeiaDHqRX8TaNAIz7fNlE0lii4kPTxl04me8H3YAE3nKluUxgoChWMRcgakGJ8bCzVa7p215Ap/6ULtg==
   dependencies:
-    "@glimmer/util" "0.79.2"
+    "@glimmer/util" "0.79.3"
 
-"@glimmer/program@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.2.tgz#755c50144ddc9b8aacf47082347552ec86207217"
-  integrity sha512-w2xI7Wz7CHx1HS49c6yZToa7XX29vhO+ydWJabMWqoaktvOTBFKZPfwVLIS7mjIe3rwQVose+VIUmbQ1IzwCQg==
+"@glimmer/program@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.3.tgz#f77b8e81842a7b3cf8a1063fc3167d2cd82d9724"
+  integrity sha512-vIhBlnpt+czkgJhm/OrVcrxbwxgEue6H8UMSoc5vdNiJDHUWOrYdJhr1mh1DGgvM0qqPySKJhgjo3apmA5sW+w==
   dependencies:
-    "@glimmer/encoder" "0.79.2"
+    "@glimmer/encoder" "0.79.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/manager" "0.79.2"
-    "@glimmer/opcode-compiler" "0.79.2"
-    "@glimmer/util" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/manager" "0.79.3"
+    "@glimmer/opcode-compiler" "0.79.3"
+    "@glimmer/util" "0.79.3"
 
-"@glimmer/reference@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.2.tgz#070c16268dc22341aa6ffd30b6dee88cd9cf63d4"
-  integrity sha512-OobgRrcegj88E8peRHnb1KilCemEK2hF89diUkpnQAO7rOTQknnbyzxO3UgVgm/arEcW4+Ga6T+sirumJ5bKIA==
+"@glimmer/reference@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.3.tgz#4c3eed5e2c810c43145a68cb2fa4f337f0b154b8"
+  integrity sha512-c++SMUVBzpTxd7W9LF2GvCwYIiLPbdrh6kmqOEprH9v/jt4gJkagSBCl84/t6m4NPOYIql19NpK3QqfVSxTDIA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.2"
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/util" "0.79.2"
-    "@glimmer/validator" "0.79.2"
+    "@glimmer/global-context" "0.79.3"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/util" "0.79.3"
+    "@glimmer/validator" "0.79.3"
 
-"@glimmer/runtime@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.2.tgz#93d0285db9d19313a0d477548e4d4af880701bcc"
-  integrity sha512-FFjDVR1JQaczO+wIRudhCwAeRKUjXB+ZqhOskSEboGbVjSq4v9nxooYVf+np5SEpwPNvlqX6lEW6H7/nfusv0Q==
+"@glimmer/runtime@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.3.tgz#1ff2051e22eff68fe27f536059484a7b0a70fdb9"
+  integrity sha512-3GO48ddGTuQQIe/16Y4hLDiweTVdLCIn7q6fpzHf+B/ieoVhxu8YkyKYgGEex3UHz+C+GkJxW1hru4cfp0APmA==
   dependencies:
-    "@glimmer/destroyable" "0.79.2"
+    "@glimmer/destroyable" "0.79.3"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.2"
-    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/global-context" "0.79.3"
+    "@glimmer/interfaces" "0.79.3"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.79.2"
-    "@glimmer/program" "0.79.2"
-    "@glimmer/reference" "0.79.2"
-    "@glimmer/util" "0.79.2"
-    "@glimmer/validator" "0.79.2"
-    "@glimmer/vm" "0.79.2"
-    "@glimmer/wire-format" "0.79.2"
+    "@glimmer/owner" "0.79.3"
+    "@glimmer/program" "0.79.3"
+    "@glimmer/reference" "0.79.3"
+    "@glimmer/util" "0.79.3"
+    "@glimmer/validator" "0.79.3"
+    "@glimmer/vm" "0.79.3"
+    "@glimmer/wire-format" "0.79.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.2.tgz#fcd6e742860ca39230043969fb04644d5cc6a5c9"
-  integrity sha512-65ZXxIM38EMKESWgvTU31ouZiQAELRO/LmOfzTJZlYH5LhSAZWSQ7tatYXDrcjPoiDojLO0a16WccZggM1etmg==
+"@glimmer/syntax@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.3.tgz#5beadd53494d0f199b83f016af90fa28c3ecaa8c"
+  integrity sha512-IERTn/mqRk0pZnddAnYjGUV4e93rRf5scY0dYQl2EFvBHFaOdFQPe3fhSCozx0hZpagg5LCOsbRgsMwL9IT9fw==
   dependencies:
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/util" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/util" "0.79.3"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.2.tgz#7c8e1684f1ad48430b7ed64a2319051b5975ccf9"
-  integrity sha512-jELDUEoNx0CCHboHFdinQu8W5ye5a7kW6fyR4Pb0zN4PPHKybOjieE6jf5l60R0pBGyqU8W8/S+CeiNgM/AU8g==
+"@glimmer/util@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.3.tgz#a54f0383d8e83ca43625e289fe1df6c72ccfb938"
+  integrity sha512-SVHHA6blGzIM6ZMJErqvzqsapYEsN5hXyobJl+lQAAzBKvaExc7VHQfs10267HxA9WlMNLuu83+tYOu+UR67hA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.2.tgz#b132673925ce79842b4c4ef1ecbf170aa3c0daa7"
-  integrity sha512-BtSp/izgnhZHPC2onEKa4H+v6ovaq6snwLQcWHPtoenVpn5Y7KbwSy6qSuW5+NaW+XaO3ryvJbZYlDB3dDGuTw==
+"@glimmer/validator@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.3.tgz#1edde5e874629b91a04c5af316b9ba91ecb360ed"
+  integrity sha512-uXUf24RCqj48T2Hgo6ZXfwAGkBgEOQ2W/Bagg83hBv/4TbUWNt03cHq6ga2FPKpqR/T7SvhN9WM4nc5FqIYGCQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.2"
+    "@glimmer/global-context" "0.79.3"
 
-"@glimmer/vm-babel-plugins@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.2.tgz#8fa4af60c5089977690ee501c7b358c90b8d6bc5"
-  integrity sha512-c5XQQwM8iogT1mdE/U2+UuGsiFmhP4d53lgXOAq1DQ2/AMFlAXa5djMVETDUlncvLLlo6S3Iaj/FvpqTxwqn2g==
+"@glimmer/vm-babel-plugins@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.3.tgz#a8e6949f8ecc10786831d188f1001eb80927297f"
+  integrity sha512-346xmhP7J3wqCFKqIlwcaui/A+iHKm0ZWoaKb4lIkuro7/u5j094eEtdbonGq4eTj+UnDPpmzuqLWodXXxxo1Q==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.2.tgz#cbebf74fae0cd413486f7a4ca31715eb8ab9a39d"
-  integrity sha512-4Bbg7eDLymuV7wiM0GVbIYnQMZxo/Dn+PF1+w5mWUjHqH+ajNKNARJVt3+w+M1tg5Q/nblBVHshNzYwFaugagA==
+"@glimmer/vm@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.3.tgz#79b0614116d5b3417e6d0a16c0c91fbf521ccbc4"
+  integrity sha512-JX1Whpm8GGyoZefXj6jJSNBi/qWKYjC5JbHrJ9KALXYCC2JAabVQlOlfRDV4mQOYv7yCzrpM8ZDCycwHTGuJ6A==
   dependencies:
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/util" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/util" "0.79.3"
 
-"@glimmer/wire-format@0.79.2":
-  version "0.79.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.2.tgz#adb88d25752e00f0f9d3f609c1ab458ca2cac932"
-  integrity sha512-jYiEbRtHGs2auQWOmEEDbT3p9zTqAVUzKkpWzoc9u6fEC8/QfcT3FuLW7S3YjLzauPiIlOQyDVeC5IvhyZag9w==
+"@glimmer/wire-format@0.79.3":
+  version "0.79.3"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.3.tgz#eac19c32297caa5129f820206b8035b8f77d07f4"
+  integrity sha512-6izhGKLIeuWbK9FfaM1I+hXYh3EgKpbpbA99SDQav+TMPiFWFy9sos4PyEuywha5p7MZrMDKXip/l49ARG8XHg==
   dependencies:
-    "@glimmer/interfaces" "0.79.2"
-    "@glimmer/util" "0.79.2"
+    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/util" "0.79.3"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 0d68d64fb8407ff0b42215fa6ce988a0a8b539de Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Tue, 25 May 2021 19:42:57 +0200
Subject: [PATCH 0516/1405] Remove IE11 support (deprecations + testing)

---
 .github/workflows/ci.yml                       |  2 +-
 config/browserlists.js                         |  1 -
 lib/index.js                                   |  6 ------
 .../-internals/glimmer/lib/modifiers/on.ts     | 13 -------------
 .../integration/helpers/element-action-test.js | 13 ++-----------
 .../tests/integration/modifiers/on-test.js     | 16 ++--------------
 .../-internals/utils/tests/inspect_test.js     |  7 +------
 packages/ember-testing/tests/helpers_test.js   | 17 ++---------------
 packages/ember/index.js                        | 16 ----------------
 packages/internal-test-helpers/index.js        |  2 +-
 .../lib/browser-detect.ts                      | 10 ----------
 testem.browserstack.js                         | 18 ------------------
 12 files changed, 9 insertions(+), 112 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fdee4c55d08..d3819c480dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,7 +65,7 @@ jobs:
         run: yarn test
 
   browserstack-test:
-    name: Browserstack Tests (Safari, Edge, IE11)
+    name: Browserstack Tests (Safari, Edge)
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
diff --git a/config/browserlists.js b/config/browserlists.js
index ec586851a0c..51aca7525cf 100644
--- a/config/browserlists.js
+++ b/config/browserlists.js
@@ -3,7 +3,6 @@ const allSupportedBrowsers = [
   'last 2 Firefox versions',
   'last 2 Safari versions',
   'last 2 Edge versions',
-  'ie 11',
 ];
 
 const modernBrowsers = [
diff --git a/lib/index.js b/lib/index.js
index 8f0ff2ffc36..5203eb0714f 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -294,12 +294,6 @@ module.exports = {
     let targets = (this.project && this.project.targets && this.project.targets.browsers) || [];
     let targetNode = (this.project && this.project.targets && this.project.targets.node) || false;
 
-    if (targets.includes('ie 11')) {
-      this.ui.writeWarnLine(
-        'Internet Explorer 11 is listed in your compilation targets, but it will no longer be supported in the next major version of Ember. Please update your targets to remove IE 11 and include new targets that are within the updated support policy. For details on the new browser support policy, see:\n\n - The official documentation: http://emberjs.com/browser-support\n - the deprecation guide: https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy\n'
-      );
-    }
-
     const isProduction = process.env.EMBER_ENV === 'production';
 
     if (
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
index 06f3beb0fa2..a7286d4c522 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/on.ts
@@ -2,19 +2,6 @@
 @module ember
 */
 
-/*
-  Internet Explorer 11 does not support `once` and also does not support
-  passing `eventOptions`. In some situations it then throws a weird script
-  error, like:
-
-  ```
-  Could not complete the operation due to error 80020101
-  ```
-
-  This flag determines, whether `{ once: true }` and thus also event options in
-  general are supported.
-*/
-
 /**
   The `{{on}}` modifier lets you easily add event listeners (it uses
   [EventTarget.addEventListener](https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener)
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index cc095a37d76..70dc35952ab 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -32,8 +32,6 @@ function getActionIds(element) {
   );
 }
 
-const isIE11 = !window.ActiveXObject && 'ActiveXObject' in window;
-
 if (EMBER_IMPROVED_INSTRUMENTATION) {
   moduleFor(
     'Helpers test: element action instrumentation',
@@ -1144,11 +1142,7 @@ moduleFor(
           .trigger('click', { [prop]: value })[0];
         if (expected) {
           assert.ok(showCalled, `should call action with ${prop}:${value}`);
-
-          // IE11 does not allow simulated events to have a valid `defaultPrevented`
-          if (!isIE11) {
-            assert.ok(event.defaultPrevented, 'should prevent default');
-          }
+          assert.ok(event.defaultPrevented, 'should prevent default');
         } else {
           assert.notOk(showCalled, `should not call action with ${prop}:${value}`);
           assert.notOk(event.defaultPrevented, 'should not prevent default');
@@ -1486,10 +1480,7 @@ moduleFor(
         event = this.$('a').trigger('click')[0];
       });
 
-      // IE11 does not allow simulated events to have a valid `defaultPrevented`
-      if (!isIE11) {
-        this.assert.equal(event.defaultPrevented, true, 'should preventDefault');
-      }
+      this.assert.equal(event.defaultPrevented, true, 'should preventDefault');
     }
 
     ['@test it should target the proper component when `action` is in yielded block [GH #12409]']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
index 7d9556715a8..54b320cb33e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/modifiers/on-test.js
@@ -5,8 +5,6 @@ import { on } from '@glimmer/runtime';
 
 import { Component } from '../../utils/helpers';
 
-const isIE11 = !window.ActiveXObject && 'ActiveXObject' in window;
-
 moduleFor(
   '{{on}} Modifier',
   class extends RenderingTestCase {
@@ -41,8 +39,6 @@ moduleFor(
 
       if (isChrome || isFirefox) {
         assert.strictEqual(SUPPORTS_EVENT_OPTIONS, true, 'is true in chrome and firefox');
-      } else if (isIE11) {
-        assert.strictEqual(SUPPORTS_EVENT_OPTIONS, false, 'is false in IE11');
       } else {
         assert.expect(0);
       }
@@ -136,11 +132,7 @@ moduleFor(
       runTask(() => this.$('button').click());
       assert.equal(count, 1, 'has been called 1 times');
 
-      if (isIE11) {
-        this.assertCounts({ adds: 1, removes: 1 });
-      } else {
-        this.assertCounts({ adds: 1, removes: 0 });
-      }
+      this.assertCounts({ adds: 1, removes: 0 });
     }
 
     '@test changing from `once=false` to `once=true` ensures the callback can only be called once'(
@@ -169,11 +161,7 @@ moduleFor(
       runTask(() => this.$('button').click());
       assert.equal(count, 3, 'is not called again');
 
-      if (isIE11) {
-        this.assertCounts({ adds: 2, removes: 2 });
-      } else {
-        this.assertCounts({ adds: 2, removes: 1 });
-      }
+      this.assertCounts({ adds: 2, removes: 1 });
     }
 
     '@test by default bubbling is used (capture: false)'(assert) {
diff --git a/packages/@ember/-internals/utils/tests/inspect_test.js b/packages/@ember/-internals/utils/tests/inspect_test.js
index a82637165d9..65555f40668 100644
--- a/packages/@ember/-internals/utils/tests/inspect_test.js
+++ b/packages/@ember/-internals/utils/tests/inspect_test.js
@@ -36,12 +36,7 @@ moduleFor(
           return this;
         },
       };
-      // IE 11 doesn't have function name
-      if (obj.foo.name) {
-        assert.equal(inspect(obj), `{ foo: [Function:foo] }`);
-      } else {
-        assert.equal(inspect(obj), `{ foo: [Function] }`);
-      }
+      assert.equal(inspect(obj), `{ foo: [Function:foo] }`);
     }
 
     ['@test objects without a prototype'](assert) {
diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
index f2902095bb5..729fd6da46f 100644
--- a/packages/ember-testing/tests/helpers_test.js
+++ b/packages/ember-testing/tests/helpers_test.js
@@ -1,4 +1,4 @@
-import { moduleFor, AutobootApplicationTestCase, isIE11, runTask } from 'internal-test-helpers';
+import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
 
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
@@ -343,20 +343,7 @@ if (!jQueryDisabled) {
               wrapper.addEventListener('mousedown', (e) => events.push(e.type));
               wrapper.addEventListener('mouseup', (e) => events.push(e.type));
               wrapper.addEventListener('click', (e) => events.push(e.type));
-              wrapper.addEventListener('focusin', (e) => {
-                // IE11 _sometimes_ triggers focusin **twice** in a row
-                // (we believe this is when it is under higher load)
-                //
-                // the goal here is to only push a single focusin when running on
-                // IE11
-                if (isIE11) {
-                  if (events[events.length - 1] !== 'focusin') {
-                    events.push(e.type);
-                  }
-                } else {
-                  events.push(e.type);
-                }
-              });
+              wrapper.addEventListener('focusin', (e) => events.push(e.type));
             },
           })
         );
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 5038fdeb908..f0d1f8cab34 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -135,22 +135,6 @@ import {
 
 const Ember = {};
 
-import { isIE } from '@ember/-internals/browser-environment';
-
-deprecate(
-  'Internet Explorer 11 will no longer be supported in the next major version of Ember. For details on the new browser support policy, see the official documentation: http://emberjs.com/browser-support',
-  !isIE,
-  {
-    id: '3-0-browser-support-policy',
-    url: 'https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy',
-    until: '4.0.0',
-    for: 'ember-source',
-    since: {
-      enabled: '3.26.0',
-    },
-  }
-);
-
 Ember.isNamespace = true;
 Ember.toString = function () {
   return 'Ember';
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index bad3852df84..5a287432277 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -38,5 +38,5 @@ export {
   ModuleBasedResolver as ModuleBasedTestResolver,
 } from './lib/test-resolver';
 
-export { isIE11, isEdge } from './lib/browser-detect';
+export { isEdge } from './lib/browser-detect';
 export { verifyInjection, verifyRegistration } from './lib/registry-check';
diff --git a/packages/internal-test-helpers/lib/browser-detect.ts b/packages/internal-test-helpers/lib/browser-detect.ts
index 1d8e7d0c5a5..cf352934c41 100644
--- a/packages/internal-test-helpers/lib/browser-detect.ts
+++ b/packages/internal-test-helpers/lib/browser-detect.ts
@@ -1,11 +1 @@
-// `window.ActiveXObject` is "falsey" in IE11 (but not `undefined` or `false`)
-// `"ActiveXObject" in window` returns `true` in all IE versions
-// only IE11 will pass _both_ of these conditions
-
-declare global {
-  interface Window {
-    ActiveXObject: any;
-  }
-}
-export const isIE11 = !window.ActiveXObject && 'ActiveXObject' in window;
 export const isEdge = /Edge/.test(navigator.userAgent);
diff --git a/testem.browserstack.js b/testem.browserstack.js
index 93dda456e15..2841d5dab4e 100644
--- a/testem.browserstack.js
+++ b/testem.browserstack.js
@@ -37,24 +37,6 @@ const BrowserStackLaunchers = {
     ],
     protocol: 'browser',
   },
-  BS_IE_11: {
-    exe: 'node_modules/.bin/browserstack-launch',
-    args: [
-      '--os',
-      'Windows',
-      '--osv',
-      '10',
-      '--b',
-      'ie',
-      '--bv',
-      '11.0',
-      '-t',
-      '1500',
-      '--u',
-      '<url>',
-    ],
-    protocol: 'browser',
-  },
 };
 
 module.exports = {

From 8cc453f21d243b37137e092087620db8e0a21e3d Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Tue, 25 May 2021 21:50:08 +0200
Subject: [PATCH 0517/1405] Use latest Safari in BrowserStack tests

---
 testem.browserstack.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testem.browserstack.js b/testem.browserstack.js
index 2841d5dab4e..be1d26d8e27 100644
--- a/testem.browserstack.js
+++ b/testem.browserstack.js
@@ -7,7 +7,7 @@ const BrowserStackLaunchers = {
       '--os',
       'OS X',
       '--osv',
-      'Mojave',
+      'Big Sur',
       '--b',
       'safari',
       '--bv',

From f23d5e19ad7bf9e3e699562ac2cdee12c7f44313 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Tue, 25 May 2021 22:01:27 +0200
Subject: [PATCH 0518/1405] Transpile for node tests

---
 .github/workflows/ci.yml | 1 +
 config/targets.js        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d3819c480dc..2113636028d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -183,6 +183,7 @@ jobs:
         env:
           DISABLE_SOURCE_MAPS: true
           BROCCOLI_ENV: production
+          SHOULD_TRANSPILE_FOR_NODE: true
         run: yarn ember build -prod
       - name: test
         run: yarn test:node
diff --git a/config/targets.js b/config/targets.js
index 5a831d045e1..16827078166 100644
--- a/config/targets.js
+++ b/config/targets.js
@@ -6,4 +6,5 @@ const shouldTranspile = Boolean(process.env.SHOULD_TRANSPILE);
 
 module.exports = {
   browsers: isProduction || shouldTranspile ? allSupportedBrowsers : modernBrowsers,
+  ...(process.env.SHOULD_TRANSPILE_FOR_NODE ? { node: 'current' } : undefined),
 };

From 0184ec7abb987e14d05acc77f3d4ec888ef76765 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Wed, 26 May 2021 10:11:14 +0200
Subject: [PATCH 0519/1405] Test and transpile for Safari 12

---
 config/browserlists.js | 2 +-
 testem.browserstack.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/browserlists.js b/config/browserlists.js
index 51aca7525cf..f41ffc0d40f 100644
--- a/config/browserlists.js
+++ b/config/browserlists.js
@@ -1,7 +1,7 @@
 const allSupportedBrowsers = [
   'last 2 Chrome versions',
   'last 2 Firefox versions',
-  'last 2 Safari versions',
+  'Safari 12',
   'last 2 Edge versions',
 ];
 
diff --git a/testem.browserstack.js b/testem.browserstack.js
index be1d26d8e27..2841d5dab4e 100644
--- a/testem.browserstack.js
+++ b/testem.browserstack.js
@@ -7,7 +7,7 @@ const BrowserStackLaunchers = {
       '--os',
       'OS X',
       '--osv',
-      'Big Sur',
+      'Mojave',
       '--b',
       'safari',
       '--bv',

From a9121810157e1a4cb01707293b1bed04a87198cc Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 26 May 2021 11:25:35 -0700
Subject: [PATCH 0520/1405] [CLEANUP] Remove internal Ember.assign usage

---
 lib/index.js                                         |  1 -
 lib/transforms/inject-babel-helpers.js               |  4 +---
 package.json                                         |  1 -
 .../@ember/-internals/container/lib/container.ts     |  3 +--
 packages/@ember/-internals/container/lib/registry.ts |  3 +--
 .../-internals/container/tests/container_test.js     |  3 +--
 .../tests/container_debug_adapter_test.js            |  3 +--
 .../glimmer/lib/component-managers/curly.ts          |  5 ++---
 .../glimmer/lib/component-managers/outlet.ts         |  3 +--
 .../-internals/glimmer/lib/helpers/query-param.ts    |  3 +--
 .../@ember/-internals/glimmer/lib/views/outlet.ts    |  5 ++---
 .../components/contextual-components-test.js         |  3 +--
 .../tests/integration/components/input-angle-test.js |  3 +--
 .../tests/integration/components/input-curly-test.js |  3 +--
 .../integration/components/target-action-test.js     |  3 +--
 .../integration/components/textarea-angle-test.js    |  5 ++---
 .../integration/components/textarea-curly-test.js    |  5 ++---
 .../glimmer/tests/utils/shared-conditional-tests.js  |  7 +++----
 packages/@ember/-internals/metal/lib/mixin.ts        |  3 +--
 .../@ember/-internals/routing/lib/services/router.ts |  3 +--
 .../-internals/routing/lib/services/routing.ts       |  3 +--
 packages/@ember/-internals/routing/lib/system/dsl.ts | 11 +++++------
 .../@ember/-internals/routing/lib/system/route.ts    |  9 ++++-----
 .../-internals/routing/lib/system/router_state.ts    |  3 +--
 packages/@ember/-internals/routing/lib/utils.ts      |  3 +--
 .../routing/tests/location/auto_location_test.js     |  5 ++---
 .../-internals/routing/tests/location/util_test.js   |  3 +--
 .../-internals/runtime/lib/system/core_object.js     |  5 ++---
 .../-internals/views/lib/system/event_dispatcher.js  |  7 +++----
 .../-internals/views/lib/views/states/destroying.js  |  3 +--
 .../-internals/views/lib/views/states/has_element.js |  3 +--
 .../-internals/views/lib/views/states/in_dom.js      |  3 +--
 .../-internals/views/lib/views/states/pre_render.js  |  3 +--
 packages/@ember/application/instance.js              |  5 ++---
 .../@ember/application/tests/application_test.js     |  7 +++----
 packages/@ember/application/tests/bootstrap-test.js  |  3 +--
 .../dependency_injection/custom_resolver_test.js     |  3 +--
 .../@ember/application/tests/initializers_test.js    |  5 ++---
 .../application/tests/instance_initializers_test.js  |  5 ++---
 packages/@ember/application/tests/logging_test.js    |  9 ++++-----
 packages/@ember/canary-features/index.ts             |  3 +--
 packages/@ember/object/index.js                      |  3 +--
 packages/@ember/runloop/tests/later_test.js          |  3 +--
 .../lib/system/compile-options.ts                    |  3 +--
 packages/ember-testing/lib/events.js                 |  9 ++++-----
 .../ember/tests/integration/multiple-app-test.js     |  5 ++---
 packages/internal-test-helpers/lib/apply-mixins.js   |  7 +++----
 .../lib/system/synthetic-events.js                   | 10 ++++------
 .../internal-test-helpers/lib/test-cases/abstract.js |  8 +++++---
 .../lib/test-cases/application.js                    |  3 +--
 .../lib/test-cases/autoboot-application.js           |  3 +--
 .../lib/test-cases/default-resolver-application.js   |  3 +--
 .../lib/test-cases/rendering.js                      |  3 +--
 .../lib/test-cases/router-non-application.js         |  3 +--
 .../lib/test-cases/test-resolver-application.js      |  3 +--
 yarn.lock                                            | 12 ------------
 56 files changed, 91 insertions(+), 157 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 5203eb0714f..95b509eba80 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -204,7 +204,6 @@ module.exports = {
             require.resolve('@babel/plugin-transform-block-scoping'),
             { throwIfClosureRequired: true },
           ],
-          [require.resolve('@babel/plugin-transform-object-assign')],
         ],
       }),
     };
diff --git a/lib/transforms/inject-babel-helpers.js b/lib/transforms/inject-babel-helpers.js
index 829be8114b2..b89e1ab5df4 100644
--- a/lib/transforms/inject-babel-helpers.js
+++ b/lib/transforms/inject-babel-helpers.js
@@ -21,9 +21,7 @@ function injectBabelHelpersPlugin(isEmberSource) {
   return {
     pre(file) {
       file.set('helperGenerator', function (name) {
-        if (name === 'extends') {
-          return addNamed(file.path, 'assign', '@ember/polyfills');
-        } else if (isEmberSource && name === 'asyncToGenerator') {
+        if (isEmberSource && name === 'asyncToGenerator') {
           // Returning a falsy value will cause the helper to be inlined,
           // which is fine for local tests
           return false;
diff --git a/package.json b/package.json
index b550c165e4e..68d9f640578 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
   "dependencies": {
     "@babel/helper-module-imports": "^7.8.3",
     "@babel/plugin-transform-block-scoping": "^7.8.3",
-    "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.79.2",
     "babel-plugin-debug-macros": "^0.3.3",
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 091203bec0b..7aa15c1e545 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,7 +1,6 @@
 import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
 import { dictionary, HAS_NATIVE_PROXY, HAS_NATIVE_SYMBOL, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import Registry, { DebugRegistry, Injection } from './registry';
 
@@ -586,7 +585,7 @@ class FactoryManager<T, C> {
     }
 
     if (options !== undefined) {
-      props = assign({}, props, options);
+      props = Object.assign({}, props, options);
     }
 
     if (DEBUG) {
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 8659ac9e2f1..6d8634d8537 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,7 +1,6 @@
 import { Factory } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import Container, { ContainerOptions, LazyInjection } from './container';
 
@@ -607,7 +606,7 @@ export default class Registry implements IRegistry {
       resolverKnown = this.resolver.knownForType(type);
     }
 
-    return assign({}, fallbackKnown, localKnown, resolverKnown);
+    return Object.assign({}, fallbackKnown, localKnown, resolverKnown);
   }
 
   isValidFullName(fullName: string): boolean {
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index 4fc52d28452..8a9a3311887 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -1,5 +1,4 @@
 import { getOwner } from '@ember/-internals/owner';
-import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { Registry } from '..';
@@ -831,7 +830,7 @@ moduleFor(
       class Component {
         static create(options) {
           let instance = new this();
-          assign(instance, options);
+          Object.assign(instance, options);
           return instance;
         }
       }
diff --git a/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js b/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js
index 8043421051b..282c138a84d 100644
--- a/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js
+++ b/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js
@@ -1,5 +1,4 @@
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
-import { assign } from '@ember/polyfills';
 import { run } from '@ember/runloop';
 import EmberController from '@ember/controller';
 import '../index'; // Must be required to export Ember.ContainerDebugAdapter.
@@ -17,7 +16,7 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         autoboot: true,
       });
     }
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index d2cb69a1c26..21da0ed0509 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -4,7 +4,6 @@ import { addChildView, setElementView, setViewElement } from '@ember/-internals/
 import { assert, debugFreeze } from '@ember/debug';
 import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
 import { _instrumentStart } from '@ember/instrumentation';
-import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import {
   Bounds,
@@ -219,11 +218,11 @@ export default class CurlyComponentManager
       named = {
         [positionalParams]: createComputeRef(() => reifyPositional(captured)),
       };
-      assign(named, args.named.capture());
+      Object.assign(named, args.named.capture());
     } else if (Array.isArray(positionalParams) && positionalParams.length > 0) {
       const count = Math.min(positionalParams.length, args.positional.length);
       named = {};
-      assign(named, args.named.capture());
+      Object.assign(named, args.named.capture());
 
       for (let i = 0; i < count; i++) {
         // As of TS 3.7, tsc is giving us the following error on this line without the type annotation
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 65a8cf17d17..a2f904ea418 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -4,7 +4,6 @@ import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { _instrumentStart } from '@ember/instrumentation';
-import { assign } from '@ember/polyfills';
 import {
   CapturedArguments,
   CompilableProgram,
@@ -205,7 +204,7 @@ export class OutletComponentDefinition
 
 export function createRootOutlet(outletView: OutletView): OutletComponentDefinition {
   if (ENV._APPLICATION_TEMPLATE_WRAPPER) {
-    const WRAPPED_CAPABILITIES = assign({}, CAPABILITIES, {
+    const WRAPPED_CAPABILITIES = Object.assign({}, CAPABILITIES, {
       dynamicTag: true,
       elementHook: true,
       wrapped: true,
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
index a0bb4b22a4e..644e68847a5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
@@ -3,7 +3,6 @@
 */
 import { QueryParams } from '@ember/-internals/routing';
 import { assert, deprecate } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef } from '@glimmer/reference';
 import { reifyNamed } from '@glimmer/runtime';
@@ -51,6 +50,6 @@ export default internalHelper(({ positional, named }: CapturedArguments) => {
       }
     );
 
-    return new QueryParams(assign({}, reifyNamed(named) as any));
+    return new QueryParams(Object.assign({}, reifyNamed(named) as any));
   });
 });
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 4feb93abe9c..871a26a5837 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,5 +1,4 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
-import { assign } from '@ember/polyfills';
 import { schedule } from '@ember/runloop';
 import { Template } from '@glimmer/interfaces';
 import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
@@ -22,7 +21,7 @@ export default class OutletView {
     return class extends OutletView {
       static create(options: any) {
         if (options) {
-          return super.create(assign({}, injections, options));
+          return super.create(Object.assign({}, injections, options));
         } else {
           return super.create(injections);
         }
@@ -31,7 +30,7 @@ export default class OutletView {
   }
 
   static reopenClass(injections: any): void {
-    assign(this, injections);
+    Object.assign(this, injections);
   }
 
   static create(options: any): OutletView {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index 3920ae482c2..750f9df7538 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1,7 +1,6 @@
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
 
-import { assign } from '@ember/polyfills';
 import { isEmpty } from '@ember/-internals/metal';
 import { A as emberA } from '@ember/-internals/runtime';
 
@@ -1441,7 +1440,7 @@ class ContextualComponentMutableParamsTest extends RenderingTestCase {
   render(templateStr, context = {}) {
     super.render(
       `${templateStr}<span class="value">{{this.model.val2}}</span>`,
-      assign(context, { model: { val2: 8 } })
+      Object.assign(context, { model: { val2: 8 } })
     );
   }
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 35b3362de0a..905498e9f86 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,7 +1,6 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { Checkbox, TextArea, TextField } from '@ember/-internals/glimmer';
 import { set } from '@ember/-internals/metal';
 import { TargetActionSupport } from '@ember/-internals/runtime';
@@ -71,7 +70,7 @@ class InputRenderingTest extends RenderingTestCase {
   triggerEvent(type, options, selector) {
     let event = document.createEvent('Events');
     event.initEvent(type, true, true);
-    assign(event, options);
+    Object.assign(event, options);
 
     let element = this.$(selector || 'input')[0];
     runTask(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 30d51c4e209..f32278a6d56 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -2,7 +2,6 @@ import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test
 
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
 
@@ -70,7 +69,7 @@ class InputRenderingTest extends RenderingTestCase {
   triggerEvent(type, options) {
     let event = document.createEvent('Events');
     event.initEvent(type, true, true);
-    assign(event, options);
+    Object.assign(event, options);
 
     let element = this.$input()[0];
     runTask(() => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index e6f1a7ba792..6e991250fbc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -6,7 +6,6 @@ import {
   runTask,
 } from 'internal-test-helpers';
 
-import { assign } from '@ember/polyfills';
 import { set, Mixin } from '@ember/-internals/metal';
 import Controller from '@ember/controller';
 import { Object as EmberObject } from '@ember/-internals/runtime';
@@ -45,7 +44,7 @@ moduleFor(
 
     renderDelegate(template = '{{action-delegate}}', context = {}) {
       let root = this;
-      context = assign(context, {
+      context = Object.assign(context, {
         send(actionName, ...args) {
           root.sendCount++;
           root.actionCounts[actionName] = root.actionCounts[actionName] || 0;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index 2d728f7190f..bf528bd57d4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -2,12 +2,11 @@ import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'int
 
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 
 class TextAreaRenderingTest extends RenderingTestCase {
   assertTextArea({ attrs, value } = {}) {
-    let mergedAttrs = assign({ class: classes('ember-view ember-text-area') }, attrs);
+    let mergedAttrs = Object.assign({ class: classes('ember-view ember-text-area') }, attrs);
     this.assertComponentElement(this.firstChild, {
       tagName: 'textarea',
       attrs: mergedAttrs,
@@ -21,7 +20,7 @@ class TextAreaRenderingTest extends RenderingTestCase {
   triggerEvent(type, options = {}) {
     let event = document.createEvent('Events');
     event.initEvent(type, true, true);
-    assign(event, options);
+    Object.assign(event, options);
 
     this.firstChild.dispatchEvent(event);
   }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 50aa67adc1b..939883178ac 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -2,12 +2,11 @@ import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'int
 
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
-import { assign } from '@ember/polyfills';
 import { set } from '@ember/-internals/metal';
 
 class TextAreaRenderingTest extends RenderingTestCase {
   assertTextArea({ attrs, value } = {}) {
-    let mergedAttrs = assign({ class: classes('ember-view ember-text-area') }, attrs);
+    let mergedAttrs = Object.assign({ class: classes('ember-view ember-text-area') }, attrs);
     this.assertComponentElement(this.firstChild, {
       tagName: 'textarea',
       attrs: mergedAttrs,
@@ -21,7 +20,7 @@ class TextAreaRenderingTest extends RenderingTestCase {
   triggerEvent(type, options = {}) {
     let event = document.createEvent('Events');
     event.initEvent(type, true, true);
-    assign(event, options);
+    Object.assign(event, options);
 
     this.firstChild.dispatchEvent(event);
   }
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 08f8550a229..9868ed3a1dc 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -2,7 +2,6 @@
 
 import { RenderingTestCase, applyMixins, runTask } from 'internal-test-helpers';
 
-import { assign } from '@ember/polyfills';
 import { htmlSafe } from '@ember/-internals/glimmer';
 import { get, set } from '@ember/-internals/metal';
 import {
@@ -115,7 +114,7 @@ export class FalsyGenerator extends AbstractGenerator {
 
 export class StableTruthyGenerator extends TruthyGenerator {
   generate(value, idx) {
-    return assign(super.generate(value, idx), {
+    return Object.assign(super.generate(value, idx), {
       [`@test it maintains DOM stability when condition changes from ${value} to another truthy value and back [${idx}]`]() {
         this.renderValues(value);
 
@@ -141,7 +140,7 @@ export class StableTruthyGenerator extends TruthyGenerator {
 
 export class StableFalsyGenerator extends FalsyGenerator {
   generate(value, idx) {
-    return assign(super.generate(value), {
+    return Object.assign(super.generate(value), {
       [`@test it maintains DOM stability when condition changes from ${value} to another falsy value and back [${idx}]`]() {
         this.renderValues(value);
 
@@ -651,7 +650,7 @@ export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
     }
 
     let wrappedTemplate = this.wrapperFor(templates);
-    this.render(wrappedTemplate, assign({ t: 'T', f: 'F' }, context));
+    this.render(wrappedTemplate, Object.assign({ t: 'T', f: 'F' }, context));
   }
 
   ['@test it does not update when the unbound helper is used']() {
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index e1150da0daf..251893144cb 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -15,7 +15,6 @@ import {
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
 import { ALIAS_METHOD } from '@ember/deprecated-features';
-import { assign } from '@ember/polyfills';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
 import {
@@ -204,7 +203,7 @@ function applyMergedProperties(
     return value;
   }
 
-  let newBase = assign({}, baseValue);
+  let newBase = Object.assign({}, baseValue);
   let hasFunction = false;
 
   let props = Object.keys(value);
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 72f45380f7b..eb45385234b 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -4,7 +4,6 @@ import { symbol } from '@ember/-internals/utils';
 import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
-import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
 import Route from '../system/route';
@@ -313,7 +312,7 @@ export default class RouterService extends Service {
     let hasQueryParams = Object.keys(queryParams).length > 0;
 
     if (hasQueryParams) {
-      queryParams = assign({}, queryParams);
+      queryParams = Object.assign({}, queryParams);
       this._router._prepareQueryParams(
         // UNSAFE: casting `routeName as string` here encodes the existing
         // assumption but may be wrong: `extractRouteArgs` correctly returns it
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index da2cf9ed5b8..7c157e5aea4 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -5,7 +5,6 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { symbol } from '@ember/-internals/utils';
 import { readOnly } from '@ember/object/computed';
-import { assign } from '@ember/polyfills';
 import Service from '@ember/service';
 import EmberRouter, { QueryParam } from '../system/router';
 import RouterState from '../system/router_state';
@@ -55,7 +54,7 @@ export default class RoutingService extends Service {
   _generateURL(routeName: string, models: {}[], queryParams: {}) {
     let visibleQueryParams = {};
     if (queryParams) {
-      assign(visibleQueryParams, queryParams);
+      Object.assign(visibleQueryParams, queryParams);
       this.normalizeQueryParams(routeName, models, visibleQueryParams as QueryParam);
     }
 
diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts
index 91366ef8aef..554120584d7 100644
--- a/packages/@ember/-internals/routing/lib/system/dsl.ts
+++ b/packages/@ember/-internals/routing/lib/system/dsl.ts
@@ -1,6 +1,5 @@
 import { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { Option } from '@glimmer/interfaces';
 import { MatchCallback } from 'route-recognizer';
 import { EngineInfo, EngineRouteInfo } from './engines';
@@ -136,7 +135,7 @@ export default class DSLImpl implements DSL {
 
     if (this.options.engineInfo) {
       let localFullName = name.slice(this.options.engineInfo.fullName.length + 1);
-      let routeInfo: EngineRouteInfo = assign({ localFullName }, this.options.engineInfo);
+      let routeInfo: EngineRouteInfo = Object.assign({ localFullName }, this.options.engineInfo);
 
       if (serialize) {
         routeInfo.serializeMethod = serialize;
@@ -206,7 +205,7 @@ export default class DSLImpl implements DSL {
         this.options.engineInfo = engineInfo;
       }
 
-      let optionsForChild = assign({ engineInfo }, this.options);
+      let optionsForChild = Object.assign({ engineInfo }, this.options);
       let childDSL = new DSLImpl(fullName, optionsForChild);
 
       createRoute(childDSL, 'loading');
@@ -222,14 +221,14 @@ export default class DSLImpl implements DSL {
     }
 
     let localFullName = 'application';
-    let routeInfo = assign({ localFullName }, engineInfo);
+    let routeInfo = Object.assign({ localFullName }, engineInfo);
 
     if (this.enableLoadingSubstates) {
       // These values are important to register the loading routes under their
       // proper names for the Router and within the Engine's registry.
       let substateName = `${name}_loading`;
       let localFullName = `application_loading`;
-      let routeInfo = assign({ localFullName }, engineInfo);
+      let routeInfo = Object.assign({ localFullName }, engineInfo);
       createRoute(this, substateName, {
         resetNamespace: options.resetNamespace,
       });
@@ -237,7 +236,7 @@ export default class DSLImpl implements DSL {
 
       substateName = `${name}_error`;
       localFullName = `application_error`;
-      routeInfo = assign({ localFullName }, engineInfo);
+      routeInfo = Object.assign({ localFullName }, engineInfo);
       createRoute(this, substateName, {
         resetNamespace: options.resetNamespace,
         path: dummyErrorRoute,
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 3398444d948..4cccb54d96d 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -25,7 +25,6 @@ import Controller from '@ember/controller';
 import { assert, deprecate, info, isTesting } from '@ember/debug';
 import { ROUTER_EVENTS } from '@ember/deprecated-features';
 import { dependentKeyCompat } from '@ember/object/compat';
-import { assign } from '@ember/polyfills';
 import { once } from '@ember/runloop';
 import { classify } from '@ember/string';
 import { DEBUG } from '@glimmer/env';
@@ -435,7 +434,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     let state = transition ? transition[STATE_SYMBOL] : this._router._routerMicrolib.state;
 
     let fullName = route.fullRouteName;
-    let params = assign({}, state!.params[fullName!]);
+    let params = Object.assign({}, state!.params[fullName!]);
     let queryParams = getQueryParamsFor(route, state!);
 
     return Object.keys(queryParams).reduce((params, key) => {
@@ -2403,7 +2402,7 @@ export function getFullQueryParams(router: EmberRouter, state: TransitionState<R
   }
 
   state['fullQueryParams'] = {};
-  assign(state['fullQueryParams'], state.queryParams);
+  Object.assign(state['fullQueryParams'], state.queryParams);
 
   router._deserializeQueryParams(state.routeInfos, state['fullQueryParams'] as QueryParam);
   return state['fullQueryParams'];
@@ -2465,7 +2464,7 @@ function mergeEachQueryParams(controllerQP: {}, routeQP: {}) {
     }
 
     let newControllerParameterConfiguration = {};
-    assign(newControllerParameterConfiguration, controllerQP[cqpName], routeQP[cqpName]);
+    Object.assign(newControllerParameterConfiguration, controllerQP[cqpName], routeQP[cqpName]);
 
     qps[cqpName] = newControllerParameterConfiguration;
 
@@ -2484,7 +2483,7 @@ function mergeEachQueryParams(controllerQP: {}, routeQP: {}) {
     }
 
     let newRouteParameterConfiguration = {};
-    assign(newRouteParameterConfiguration, routeQP[rqpName], controllerQP[rqpName]);
+    Object.assign(newRouteParameterConfiguration, routeQP[rqpName], controllerQP[rqpName]);
     qps[rqpName] = newRouteParameterConfiguration;
   }
 
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index 886c8bd6ad9..83622a4873d 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import Router, { TransitionState } from 'router_js';
 import { shallowEqual } from '../utils';
 import Route from './route';
@@ -25,7 +24,7 @@ export default class RouterState {
     }
 
     if (queryParams !== undefined && Object.keys(queryParams).length > 0) {
-      let visibleQueryParams = assign({}, queryParams);
+      let visibleQueryParams = Object.assign({}, queryParams);
 
       this.emberRouter._prepareQueryParams(routeName, models, visibleQueryParams);
       return shallowEqual(visibleQueryParams, state.queryParams);
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index a4c82de6b52..3828653351a 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -2,7 +2,6 @@ import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
-import { assign } from '@ember/polyfills';
 import Router, { STATE_SYMBOL } from 'router_js';
 import Route from './system/route';
 import EmberRouter, { PrivateRouteInfo, QueryParam } from './system/router';
@@ -182,7 +181,7 @@ function accumulateQueryParamDescriptors(_desc: QueryParam, accum: {}) {
     }
 
     tmp = accum[key] || { as: null, scope: 'model' };
-    assign(tmp, singleDesc);
+    Object.assign(tmp, singleDesc);
 
     accum[key] = tmp;
   }
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index 45b44c88bc1..cb33a2401e6 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { window } from '@ember/-internals/browser-environment';
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
@@ -11,7 +10,7 @@ import NoneLocation from '../../lib/location/none_location';
 import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function mockBrowserLocation(overrides, assert) {
-  return assign(
+  return Object.assign(
     {
       href: 'http://test.com/',
       pathname: '/',
@@ -26,7 +25,7 @@ function mockBrowserLocation(overrides, assert) {
 }
 
 function mockBrowserHistory(overrides, assert) {
-  return assign(
+  return Object.assign(
     {
       pushState() {
         assert.ok(false, 'history.pushState should not be called during testing');
diff --git a/packages/@ember/-internals/routing/tests/location/util_test.js b/packages/@ember/-internals/routing/tests/location/util_test.js
index 51621ca446d..cd257058713 100644
--- a/packages/@ember/-internals/routing/tests/location/util_test.js
+++ b/packages/@ember/-internals/routing/tests/location/util_test.js
@@ -1,10 +1,9 @@
-import { assign } from '@ember/polyfills';
 import { replacePath, getPath, getQuery, getFullPath } from '../../lib/location/util';
 import { supportsHistory, supportsHashChange } from '../../lib/location/util';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function mockBrowserLocation(overrides, assert) {
-  return assign(
+  return Object.assign(
     {
       href: 'http://test.com/',
       pathname: '/',
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index c2262dbb450..50bdeff67f2 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -4,7 +4,6 @@
 
 import { getFactoryFor, setFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
 import { getOwner, LEGACY_OWNER } from '@ember/-internals/owner';
-import { assign } from '@ember/polyfills';
 import {
   guidFor,
   lookupDescriptor,
@@ -122,7 +121,7 @@ function initialize(obj, properties) {
 
         if (hasMergedProps && mergedProperties.indexOf(keyName) > -1) {
           let baseValue = obj[keyName];
-          value = assign({}, baseValue, value);
+          value = Object.assign({}, baseValue, value);
         }
       }
 
@@ -1130,7 +1129,7 @@ function flattenProps(...props) {
       if (hasMergedProps && mergedProperties.indexOf(keyName) > -1) {
         let baseValue = initProperties[keyName];
 
-        value = assign({}, baseValue, value);
+        value = Object.assign({}, baseValue, value);
       }
 
       initProperties[keyName] = value;
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 2b5ac3a245b..4cb32af5112 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -1,5 +1,4 @@
 import { getOwner } from '@ember/-internals/owner';
-import { assign } from '@ember/polyfills';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
@@ -67,7 +66,7 @@ export default EmberObject.extend({
     @type Object
     @private
   */
-  events: assign(
+  events: Object.assign(
     {
       touchstart: 'touchStart',
       touchmove: 'touchMove',
@@ -151,9 +150,9 @@ export default EmberObject.extend({
       })()
     );
 
-    let events = (this.finalEventNameMapping = assign({}, get(this, 'events'), addedEvents));
+    let events = (this.finalEventNameMapping = Object.assign({}, get(this, 'events'), addedEvents));
     this._reverseEventNameMapping = Object.keys(events).reduce(
-      (result, key) => assign(result, { [events[key]]: key }),
+      (result, key) => Object.assign(result, { [events[key]]: key }),
       {}
     );
     let lazyEvents = this.lazyEvents;
diff --git a/packages/@ember/-internals/views/lib/views/states/destroying.js b/packages/@ember/-internals/views/lib/views/states/destroying.js
index 4e9ec8301be..92c60e62c8f 100644
--- a/packages/@ember/-internals/views/lib/views/states/destroying.js
+++ b/packages/@ember/-internals/views/lib/views/states/destroying.js
@@ -1,8 +1,7 @@
-import { assign } from '@ember/polyfills';
 import EmberError from '@ember/error';
 import _default from './default';
 
-const destroying = assign({}, _default, {
+const destroying = Object.assign({}, _default, {
   appendChild() {
     throw new EmberError("You can't call appendChild on a view being destroyed");
   },
diff --git a/packages/@ember/-internals/views/lib/views/states/has_element.js b/packages/@ember/-internals/views/lib/views/states/has_element.js
index 21684c917fb..5b7e2c163a3 100644
--- a/packages/@ember/-internals/views/lib/views/states/has_element.js
+++ b/packages/@ember/-internals/views/lib/views/states/has_element.js
@@ -1,9 +1,8 @@
-import { assign } from '@ember/polyfills';
 import _default from './default';
 import { join } from '@ember/runloop';
 import { flaggedInstrument } from '@ember/instrumentation';
 
-const hasElement = assign({}, _default, {
+const hasElement = Object.assign({}, _default, {
   rerender(view) {
     view.renderer.rerender(view);
   },
diff --git a/packages/@ember/-internals/views/lib/views/states/in_dom.js b/packages/@ember/-internals/views/lib/views/states/in_dom.js
index 6b638ddb78a..de086e4c845 100644
--- a/packages/@ember/-internals/views/lib/views/states/in_dom.js
+++ b/packages/@ember/-internals/views/lib/views/states/in_dom.js
@@ -1,10 +1,9 @@
 import { teardownMandatorySetter } from '@ember/-internals/utils';
-import { assign } from '@ember/polyfills';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
 import hasElement from './has_element';
 
-const inDOM = assign({}, hasElement, {
+const inDOM = Object.assign({}, hasElement, {
   enter(view) {
     // Register the view for event handling. This hash is used by
     // Ember.EventDispatcher to dispatch incoming events.
diff --git a/packages/@ember/-internals/views/lib/views/states/pre_render.js b/packages/@ember/-internals/views/lib/views/states/pre_render.js
index 90b19ea9e62..a0a6718b46f 100644
--- a/packages/@ember/-internals/views/lib/views/states/pre_render.js
+++ b/packages/@ember/-internals/views/lib/views/states/pre_render.js
@@ -1,6 +1,5 @@
 import _default from './default';
-import { assign } from '@ember/polyfills';
 
-const preRender = assign({}, _default);
+const preRender = Object.assign({}, _default);
 
 export default Object.freeze(preRender);
diff --git a/packages/@ember/application/instance.js b/packages/@ember/application/instance.js
index 4bfe80f66ae..b87af2acd91 100644
--- a/packages/@ember/application/instance.js
+++ b/packages/@ember/application/instance.js
@@ -2,7 +2,6 @@
 @module @ember/application
 */
 
-import { assign } from '@ember/polyfills';
 import { get, set, computed } from '@ember/-internals/metal';
 import * as environment from '@ember/-internals/browser-environment';
 import { jQuery } from '@ember/-internals/views';
@@ -202,7 +201,7 @@ const ApplicationInstance = EngineInstance.extend({
     let applicationCustomEvents = get(this.application, 'customEvents');
     let instanceCustomEvents = get(this, 'customEvents');
 
-    let customEvents = assign({}, applicationCustomEvents, instanceCustomEvents);
+    let customEvents = Object.assign({}, applicationCustomEvents, instanceCustomEvents);
     dispatcher.setup(customEvents, this.rootElement);
 
     return dispatcher;
@@ -498,7 +497,7 @@ class BootOptions {
 
   toEnvironment() {
     // Do we really want to assign all of this!?
-    let env = assign({}, environment);
+    let env = Object.assign({}, environment);
     // For compatibility with existing code
     env.hasDOM = this.isBrowser;
     env.isInteractive = this.isInteractive;
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index ee39c6eb58a..5988677d2c8 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -10,7 +10,6 @@ import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { setTemplates } from '@ember/-internals/glimmer';
-import { assign } from '@ember/polyfills';
 import {
   moduleFor,
   ApplicationTestCase,
@@ -37,7 +36,7 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         rootElement: '#one',
         router: null,
         autoboot: true,
@@ -45,7 +44,7 @@ moduleFor(
     }
 
     createSecondApplication(options) {
-      let myOptions = assign(this.applicationOptions, options);
+      let myOptions = Object.assign(this.applicationOptions, options);
       return (this.secondApp = Application.create(myOptions));
     }
 
@@ -187,7 +186,7 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         autoboot: true,
       });
     }
diff --git a/packages/@ember/application/tests/bootstrap-test.js b/packages/@ember/application/tests/bootstrap-test.js
index 7b23194b62e..41689a361cf 100644
--- a/packages/@ember/application/tests/bootstrap-test.js
+++ b/packages/@ember/application/tests/bootstrap-test.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { moduleFor, DefaultResolverApplicationTestCase, runTask } from 'internal-test-helpers';
 
 moduleFor(
@@ -14,7 +13,7 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         autoboot: true,
         rootElement: '#app',
       });
diff --git a/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js b/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js
index 646dc6569b0..cab5dbf46fb 100644
--- a/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js
+++ b/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js
@@ -1,5 +1,4 @@
 import DefaultResolver from '@ember/application/globals-resolver';
-import { assign } from '@ember/polyfills';
 import { moduleFor, DefaultResolverApplicationTestCase, runTask } from 'internal-test-helpers';
 
 moduleFor(
@@ -18,7 +17,7 @@ moduleFor(
         },
       });
 
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         Resolver,
         autoboot: true,
       });
diff --git a/packages/@ember/application/tests/initializers_test.js b/packages/@ember/application/tests/initializers_test.js
index b8288f433f6..13fdb906da0 100644
--- a/packages/@ember/application/tests/initializers_test.js
+++ b/packages/@ember/application/tests/initializers_test.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
 import Application from '..';
 
@@ -12,13 +11,13 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         rootElement: '#one',
       });
     }
 
     createSecondApplication(options, MyApplication = Application) {
-      let myOptions = assign(
+      let myOptions = Object.assign(
         this.applicationOptions,
         {
           rootElement: '#two',
diff --git a/packages/@ember/application/tests/instance_initializers_test.js b/packages/@ember/application/tests/instance_initializers_test.js
index 9c237b32359..34a5b1f7f4c 100644
--- a/packages/@ember/application/tests/instance_initializers_test.js
+++ b/packages/@ember/application/tests/instance_initializers_test.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
 import ApplicationInstance from '@ember/application/instance';
 import Application from '@ember/application';
@@ -13,13 +12,13 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         rootElement: '#one',
       });
     }
 
     createSecondApplication(options, MyApplication = Application) {
-      let myOptions = assign(
+      let myOptions = Object.assign(
         this.applicationOptions,
         {
           rootElement: '#two',
diff --git a/packages/@ember/application/tests/logging_test.js b/packages/@ember/application/tests/logging_test.js
index ef8ff83d0b4..b9ea7363a07 100644
--- a/packages/@ember/application/tests/logging_test.js
+++ b/packages/@ember/application/tests/logging_test.js
@@ -4,7 +4,6 @@ import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 
 import Controller from '@ember/controller';
 import { Route } from '@ember/-internals/routing';
-import { assign } from '@ember/polyfills';
 
 class LoggingApplicationTestCase extends ApplicationTestCase {
   constructor() {
@@ -40,7 +39,7 @@ moduleFor(
   'Application with LOG_ACTIVE_GENERATION=true',
   class extends LoggingApplicationTestCase {
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         LOG_ACTIVE_GENERATION: true,
       });
     }
@@ -102,7 +101,7 @@ moduleFor(
   'Application when LOG_ACTIVE_GENERATION=false',
   class extends LoggingApplicationTestCase {
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         LOG_ACTIVE_GENERATION: false,
       });
     }
@@ -119,7 +118,7 @@ moduleFor(
   'Application with LOG_VIEW_LOOKUPS=true',
   class extends LoggingApplicationTestCase {
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         LOG_VIEW_LOOKUPS: true,
       });
     }
@@ -159,7 +158,7 @@ moduleFor(
   'Application with LOG_VIEW_LOOKUPS=false',
   class extends LoggingApplicationTestCase {
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         LOG_VIEW_LOOKUPS: false,
       });
     }
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 617810e311c..601c4f2b8fe 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -1,5 +1,4 @@
 import { ENV } from '@ember/-internals/environment';
-import { assign } from '@ember/polyfills';
 
 /**
   Set `EmberENV.FEATURES` in your application's `config/environment.js` file
@@ -33,7 +32,7 @@ export const DEFAULT_FEATURES = {
   @since 1.1.0
   @public
 */
-export const FEATURES = assign(DEFAULT_FEATURES, ENV.FEATURES);
+export const FEATURES = Object.assign(DEFAULT_FEATURES, ENV.FEATURES);
 
 /**
   Determine whether the specified `feature` is enabled. Used by Ember's
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index af4dd9d5735..6b07d4d3190 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -1,6 +1,5 @@
 import { DEBUG } from '@glimmer/env';
 import { assert, deprecate } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
 
 export { Object as default } from '@ember/-internals/runtime';
@@ -276,7 +275,7 @@ function setupAction(target, key, actionFn) {
   if (!Object.prototype.hasOwnProperty.call(target, 'actions')) {
     let parentActions = target.actions;
     // we need to assign because of the way mixins copy actions down when inheriting
-    target.actions = parentActions ? assign({}, parentActions) : {};
+    target.actions = parentActions ? Object.assign({}, parentActions) : {};
   }
 
   target.actions[key] = actionFn;
diff --git a/packages/@ember/runloop/tests/later_test.js b/packages/@ember/runloop/tests/later_test.js
index 89f19ead224..c2f4eb14cca 100644
--- a/packages/@ember/runloop/tests/later_test.js
+++ b/packages/@ember/runloop/tests/later_test.js
@@ -1,5 +1,4 @@
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { assign } from '@ember/polyfills';
 import { run, later, _backburner, _hasScheduledTimers, _getCurrentRunLoop } from '..';
 
 const originalSetTimeout = window.setTimeout;
@@ -226,7 +225,7 @@ moduleFor(
       // happens when an expired timer callback takes a while to run,
       // which is what we simulate here.
       let newSetTimeoutUsed;
-      _backburner._platform = assign({}, originalPlatform, {
+      _backburner._platform = Object.assign({}, originalPlatform, {
         setTimeout() {
           let wait = arguments[arguments.length - 1];
           newSetTimeoutUsed = true;
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 87832571e09..f6d42c8b2ff 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,6 +1,5 @@
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
-import { assign } from '@ember/polyfills';
 import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
 import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index';
 import { EmberPrecompileOptions, PluginFunc } from '../types';
@@ -14,7 +13,7 @@ function malformedComponentLookup(string: string) {
 
 export function buildCompileOptions(_options: EmberPrecompileOptions): EmberPrecompileOptions {
   let moduleName = _options.moduleName;
-  let options: EmberPrecompileOptions = assign(
+  let options: EmberPrecompileOptions = Object.assign(
     { meta: {}, isProduction: false, plugins: { ast: [] } },
     _options,
     {
diff --git a/packages/ember-testing/lib/events.js b/packages/ember-testing/lib/events.js
index 3cf439c6876..48cd654e1c1 100644
--- a/packages/ember-testing/lib/events.js
+++ b/packages/ember-testing/lib/events.js
@@ -1,5 +1,4 @@
 import { run } from '@ember/runloop';
-import { assign } from '@ember/polyfills';
 import isFormControl from './helpers/-is-form-control';
 
 const DEFAULT_EVENT_OPTIONS = { canBubble: true, cancelable: true };
@@ -62,7 +61,7 @@ export function fireEvent(element, type, options = {}) {
       clientX: x,
       clientY: y,
     };
-    event = buildMouseEvent(type, assign(simulatedCoordinates, options));
+    event = buildMouseEvent(type, Object.assign(simulatedCoordinates, options));
   } else {
     event = buildBasicEvent(type, options);
   }
@@ -80,7 +79,7 @@ function buildBasicEvent(type, options = {}) {
   delete options.cancelable;
 
   event.initEvent(type, bubbles, cancelable);
-  assign(event, options);
+  Object.assign(event, options);
   return event;
 }
 
@@ -88,7 +87,7 @@ function buildMouseEvent(type, options = {}) {
   let event;
   try {
     event = document.createEvent('MouseEvents');
-    let eventOpts = assign({}, DEFAULT_EVENT_OPTIONS, options);
+    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
     event.initMouseEvent(
       type,
       eventOpts.canBubble,
@@ -116,7 +115,7 @@ function buildKeyboardEvent(type, options = {}) {
   let event;
   try {
     event = document.createEvent('KeyEvents');
-    let eventOpts = assign({}, DEFAULT_EVENT_OPTIONS, options);
+    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
     event.initKeyEvent(
       type,
       eventOpts.canBubble,
diff --git a/packages/ember/tests/integration/multiple-app-test.js b/packages/ember/tests/integration/multiple-app-test.js
index a9713bb7402..b151999936a 100644
--- a/packages/ember/tests/integration/multiple-app-test.js
+++ b/packages/ember/tests/integration/multiple-app-test.js
@@ -2,7 +2,6 @@ import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 import Application from '@ember/application';
 import { Component } from '@ember/-internals/glimmer';
 import { getOwner } from '@ember/-internals/owner';
-import { assign } from '@ember/polyfills';
 import { resolve } from 'rsvp';
 
 moduleFor(
@@ -20,7 +19,7 @@ moduleFor(
     }
 
     get applicationOptions() {
-      return assign(super.applicationOptions, {
+      return Object.assign(super.applicationOptions, {
         rootElement: '#one',
         router: null,
       });
@@ -29,7 +28,7 @@ moduleFor(
     createSecondApplication(options) {
       let { applicationOptions } = this;
       let secondApplicationOptions = { rootElement: '#two' };
-      let myOptions = assign(applicationOptions, secondApplicationOptions, options);
+      let myOptions = Object.assign(applicationOptions, secondApplicationOptions, options);
       this.secondApp = Application.create(myOptions);
       this.secondResolver = this.secondApp.__registry__.resolver;
       return this.secondApp;
diff --git a/packages/internal-test-helpers/lib/apply-mixins.js b/packages/internal-test-helpers/lib/apply-mixins.js
index 08cc8733d9c..0f8071c65cd 100644
--- a/packages/internal-test-helpers/lib/apply-mixins.js
+++ b/packages/internal-test-helpers/lib/apply-mixins.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import getAllPropertyNames from './get-all-property-names';
 
 function isGenerator(mixin) {
@@ -14,10 +13,10 @@ export default function applyMixins(TestClass, ...mixins) {
       mixin = {};
 
       generator.cases.forEach((value, idx) => {
-        assign(mixin, generator.generate(value, idx));
+        Object.assign(mixin, generator.generate(value, idx));
       });
 
-      assign(TestClass.prototype, mixin);
+      Object.assign(TestClass.prototype, mixin);
     } else if (typeof mixinOrGenerator === 'function') {
       let properties = getAllPropertyNames(mixinOrGenerator);
       mixin = new mixinOrGenerator();
@@ -29,7 +28,7 @@ export default function applyMixins(TestClass, ...mixins) {
       });
     } else {
       mixin = mixinOrGenerator;
-      assign(TestClass.prototype, mixin);
+      Object.assign(TestClass.prototype, mixin);
     }
   });
 
diff --git a/packages/internal-test-helpers/lib/system/synthetic-events.js b/packages/internal-test-helpers/lib/system/synthetic-events.js
index 79b5c10fd38..cfcda7ab534 100644
--- a/packages/internal-test-helpers/lib/system/synthetic-events.js
+++ b/packages/internal-test-helpers/lib/system/synthetic-events.js
@@ -1,8 +1,6 @@
 import { run } from '@ember/runloop';
 /* globals Element */
 
-import { assign } from '@ember/polyfills';
-
 const DEFAULT_EVENT_OPTIONS = { canBubble: true, cancelable: true };
 const KEYBOARD_EVENT_TYPES = ['keydown', 'keypress', 'keyup'];
 const MOUSE_EVENT_TYPES = [
@@ -112,7 +110,7 @@ export function fireEvent(element, type, options = {}) {
       clientX: x,
       clientY: y,
     };
-    event = buildMouseEvent(type, assign(simulatedCoordinates, options));
+    event = buildMouseEvent(type, Object.assign(simulatedCoordinates, options));
   } else {
     event = buildBasicEvent(type, options);
   }
@@ -124,7 +122,7 @@ export function fireEvent(element, type, options = {}) {
 function buildBasicEvent(type, options = {}) {
   let event = document.createEvent('Events');
   event.initEvent(type, true, true);
-  assign(event, options);
+  Object.assign(event, options);
   return event;
 }
 
@@ -132,7 +130,7 @@ function buildMouseEvent(type, options = {}) {
   let event;
   try {
     event = document.createEvent('MouseEvents');
-    let eventOpts = assign({}, DEFAULT_EVENT_OPTIONS, options);
+    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
 
     event.initMouseEvent(
       type,
@@ -161,7 +159,7 @@ function buildKeyboardEvent(type, options = {}) {
   let event;
   try {
     event = document.createEvent('KeyEvents');
-    let eventOpts = assign({}, DEFAULT_EVENT_OPTIONS, options);
+    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
     event.initKeyEvent(
       type,
       eventOpts.canBubble,
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract.js b/packages/internal-test-helpers/lib/test-cases/abstract.js
index 50f0ec37d63..e9f0a81e4bf 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract.js
+++ b/packages/internal-test-helpers/lib/test-cases/abstract.js
@@ -1,7 +1,5 @@
 /* global Element */
 
-import { assign } from '@ember/polyfills';
-
 import NodeQuery from '../node-query';
 import equalInnerHTML from '../equal-inner-html';
 import equalTokens from '../equal-tokens';
@@ -162,7 +160,11 @@ export default class AbstractTestCase {
     node,
     { ElementType = HTMLElement, tagName = 'div', attrs = null, content = null }
   ) {
-    attrs = assign({}, { id: regex(/^ember\d*$/), class: classes('ember-view') }, attrs || {});
+    attrs = Object.assign(
+      {},
+      { id: regex(/^ember\d*$/), class: classes('ember-view') },
+      attrs || {}
+    );
     this.assertElement(node, { ElementType, tagName, attrs, content });
   }
 
diff --git a/packages/internal-test-helpers/lib/test-cases/application.js b/packages/internal-test-helpers/lib/test-cases/application.js
index 53ce885d1ce..3bd19d14c2e 100644
--- a/packages/internal-test-helpers/lib/test-cases/application.js
+++ b/packages/internal-test-helpers/lib/test-cases/application.js
@@ -1,7 +1,6 @@
 import TestResolverApplicationTestCase from './test-resolver-application';
 import Application from '@ember/application';
 import { Router } from '@ember/-internals/routing';
-import { assign } from '@ember/polyfills';
 
 import { runTask, runLoopSettled } from '../run';
 
@@ -24,7 +23,7 @@ export default class ApplicationTestCase extends TestResolverApplicationTestCase
   }
 
   get applicationOptions() {
-    return assign(super.applicationOptions, {
+    return Object.assign(super.applicationOptions, {
       autoboot: false,
     });
   }
diff --git a/packages/internal-test-helpers/lib/test-cases/autoboot-application.js b/packages/internal-test-helpers/lib/test-cases/autoboot-application.js
index a1b09057290..230e825ea7b 100644
--- a/packages/internal-test-helpers/lib/test-cases/autoboot-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/autoboot-application.js
@@ -1,11 +1,10 @@
 import TestResolverApplicationTestCase from './test-resolver-application';
 import Application from '@ember/application';
-import { assign } from '@ember/polyfills';
 import { Router } from '@ember/-internals/routing';
 
 export default class AutobootApplicationTestCase extends TestResolverApplicationTestCase {
   createApplication(options, MyApplication = Application) {
-    let myOptions = assign(this.applicationOptions, options);
+    let myOptions = Object.assign(this.applicationOptions, options);
     let application = (this.application = MyApplication.create(myOptions));
     this.resolver = application.__registry__.resolver;
 
diff --git a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
index 24d678a5bf6..83e9559fbcd 100644
--- a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
@@ -2,7 +2,6 @@ import AbstractApplicationTestCase from './abstract-application';
 import DefaultResolver from '@ember/application/globals-resolver';
 import Application from '@ember/application';
 import { setTemplates, setTemplate } from '@ember/-internals/glimmer';
-import { assign } from '@ember/polyfills';
 import { Router } from '@ember/-internals/routing';
 
 import { runTask } from '../run';
@@ -26,7 +25,7 @@ export default class DefaultResolverApplicationTestCase extends AbstractApplicat
   }
 
   get applicationOptions() {
-    return assign(super.applicationOptions, {
+    return Object.assign(super.applicationOptions, {
       name: 'TestApp',
       autoboot: false,
       Resolver: DefaultResolver,
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.js
index b29f6ffdad3..3760da0de54 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.js
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
 import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer';
@@ -122,7 +121,7 @@ export default class RenderingTestCase extends AbstractTestCase {
       })
     );
 
-    let attrs = assign({}, context, {
+    let attrs = Object.assign({}, context, {
       tagName: '',
       layoutName: '-top-level',
     });
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.js b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
index f59a298f98a..61faf22da91 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
@@ -1,4 +1,3 @@
-import { assign } from '@ember/polyfills';
 import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
 import { Component, _resetRenderers } from '@ember/-internals/glimmer';
@@ -105,7 +104,7 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
       })
     );
 
-    let attrs = assign({}, context, {
+    let attrs = Object.assign({}, context, {
       tagName: '',
       layoutName: '-top-level',
     });
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.js b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.js
index b8d5e87af45..dc0f25387dc 100644
--- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.js
@@ -1,11 +1,10 @@
 import AbstractApplicationTestCase from './abstract-application';
 import { ModuleBasedResolver } from '../test-resolver';
 import { Component } from '@ember/-internals/glimmer';
-import { assign } from '@ember/polyfills';
 
 export default class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
   get applicationOptions() {
-    return assign(super.applicationOptions, {
+    return Object.assign(super.applicationOptions, {
       Resolver: ModuleBasedResolver,
     });
   }
diff --git a/yarn.lock b/yarn.lock
index 4bac89d454c..67db5c5e819 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -955,8 +955,6 @@
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
   integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-for-of@^7.9.0":
   version "7.9.0"
@@ -1112,13 +1110,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-object-assign@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.8.3.tgz#dc3b8dd50ef03837868a37b7df791f64f288538e"
-  integrity sha512-i3LuN8tPDqUCRFu3dkzF2r1Nx0jp4scxtm7JxtIqI9he9Vk20YD+/zshdzR9JLsoBMlJlNR82a62vQExNEVx/Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-transform-object-super@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
@@ -5258,9 +5249,6 @@ find-babel-config@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
-  dependencies:
-    json5 "^0.5.1"
-    path-exists "^3.0.0"
 
 find-index@^1.1.0:
   version "1.1.0"

From 926452f531fb70eddea0fe85ff73843603d39de7 Mon Sep 17 00:00:00 2001
From: Bj Tecu <github@bujorel.net>
Date: Fri, 28 May 2021 17:18:12 -0400
Subject: [PATCH 0521/1405] Extend transition deprecation

---
 packages/@ember/-internals/routing/lib/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index a4c82de6b52..71c666d244b 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -254,7 +254,7 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
       since: {
         enabled: '3.26.0',
       },
-      until: '4.0.0',
+      until: '5.0.0',
       url: 'https://deprecations.emberjs.com/v3.x/#toc_routing-transition-methods',
     }
   );

From 42bd258a026fb6652ae7cb991b01c9738d2ab032 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 1 Jun 2021 16:18:27 -0400
Subject: [PATCH 0522/1405] Add v3.28.0-beta.3 to CHANGELOG

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00fcb41871b..8107d58b833 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v3.28.0-beta.3 (June 1, 2021)
+
+- [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that computed can depend on dynamic hash keys
+- [#19571](https://github.com/emberjs/ember.js/pull/19571) [BUGFIX] Delay until: 5.0.0 the removal of the deprecated transition methods of controller and route from [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).
+
 ### v3.28.0-beta.2 (May 27, 2021)
 
 - [#19511](https://github.com/emberjs/ember.js/pull/19511) / [#19548](https://github.com/emberjs/ember.js/pull/19548) [BUGFIX] Makes the (hash) helper lazy

From aef0c077f57c8a91bb41ac3a9871ebcec72cfa04 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 2 Jun 2021 15:36:26 -0400
Subject: [PATCH 0523/1405] Extract separate global deprecation helpers into
 standalone module.

No logical changes here, just moving the code to detect and generate the
message out into a stand alone module (makes it easier to reason about
and possible to unit test).

Co-authored-by: Stefan Penner <stefan.penner@gmail.com>
---
 lib/global-deprecation-utils.js | 307 +++++++++++++++++++++++++++++++
 lib/index.js                    | 308 +-------------------------------
 2 files changed, 316 insertions(+), 299 deletions(-)
 create mode 100644 lib/global-deprecation-utils.js

diff --git a/lib/global-deprecation-utils.js b/lib/global-deprecation-utils.js
new file mode 100644
index 00000000000..6cf7980c08c
--- /dev/null
+++ b/lib/global-deprecation-utils.js
@@ -0,0 +1,307 @@
+const semver = require('semver');
+
+function* walkAddonTree(project, pathToAddon = []) {
+  for (let addon of project.addons) {
+    yield [addon, pathToAddon];
+    yield* walkAddonTree(addon, [...pathToAddon, `${addon.name}@${addon.pkg.version}`]);
+  }
+}
+
+function requirementFor(pkg, deps = {}) {
+  return deps[pkg];
+}
+
+module.exports = function (project) {
+  if (process.env.EMBER_ENV === 'production') {
+    return;
+  }
+
+  let isYarnProject = ((root) => {
+    try {
+      // eslint-disable-next-line node/no-unpublished-require
+      return require('ember-cli/lib/utilities/is-yarn-project')(root);
+    } catch {
+      return undefined;
+    }
+  })(project.root);
+
+  let groupedByTopLevelAddon = Object.create(null);
+  let groupedByVersion = Object.create(null);
+  let projectInfo;
+
+  for (let [addon, pathToAddon] of walkAddonTree(project)) {
+    let version = addon.pkg.version;
+
+    if (addon.name === 'ember-cli-babel' && semver.lt(version, '7.26.6')) {
+      let info;
+
+      if (addon.parent === project) {
+        let requirement = requirementFor('ember-cli-babel', project.pkg.devDependencies);
+        let compatible = semver.satisfies('7.26.6', requirement);
+
+        info = projectInfo = {
+          parent: `${project.name()} (your app)`,
+          version,
+          requirement,
+          compatible,
+          dormant: false,
+          path: pathToAddon,
+        };
+      } else {
+        let requirement = requirementFor('ember-cli-babel', addon.parent.pkg.dependencies);
+        let compatible = semver.satisfies('7.26.6', requirement);
+        let dormant = addon.parent._fileSystemInfo
+          ? addon.parent._fileSystemInfo().hasJSFiles === false
+          : false;
+
+        let topLevelAddon = addon.parent;
+
+        while (topLevelAddon.parent !== project) {
+          topLevelAddon = topLevelAddon.parent;
+        }
+
+        info = {
+          parent: `${addon.parent.name}@${addon.pkg.version}`,
+          version,
+          requirement,
+          compatible,
+          dormant,
+          path: pathToAddon,
+        };
+
+        let addons = groupedByTopLevelAddon[topLevelAddon.name] || [];
+        groupedByTopLevelAddon[topLevelAddon.name] = [...addons, info];
+      }
+
+      let group = groupedByVersion[version] || Object.create(null);
+      groupedByVersion[version] = group;
+
+      let addons = group[info.parent] || [];
+      group[info.parent] = [...addons, info];
+    }
+  }
+
+  if (Object.keys(groupedByVersion).length === 0) {
+    return;
+  }
+
+  let dormantTopLevelAddons = [];
+  let compatibleTopLevelAddons = [];
+  let incompatibleTopLevelAddons = [];
+
+  for (let addon of Object.keys(groupedByTopLevelAddon)) {
+    let group = groupedByTopLevelAddon[addon];
+
+    if (group.every((info) => info.dormant)) {
+      dormantTopLevelAddons.push(addon);
+    } else if (group.every((info) => info.compatible)) {
+      compatibleTopLevelAddons.push(addon);
+    } else {
+      incompatibleTopLevelAddons.push(addon);
+    }
+  }
+
+  let suggestions = 'The following steps may help:\n\n';
+
+  let hasActionableSuggestions = false;
+
+  if (projectInfo) {
+    suggestions += '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+    hasActionableSuggestions = true;
+  } else if (compatibleTopLevelAddons.length > 0) {
+    // Only show the compatible addons if the project itself is up-to-date, because updating the
+    // project's own dependency on ember-cli-babel to latest may also get these addons to use it
+    // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
+    if (isYarnProject === true) {
+      suggestions +=
+        '* Run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
+    } else if (isYarnProject === false) {
+      suggestions += '* Run `npm dedupe`.\n';
+    } else {
+      suggestions +=
+        '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
+        '* If using npm, run `npm dedupe`.\n';
+    }
+
+    hasActionableSuggestions = true;
+  }
+
+  if (incompatibleTopLevelAddons.length > 0) {
+    suggestions += '* Upgrade the following addons to the latest version:\n';
+
+    for (let addon of incompatibleTopLevelAddons) {
+      suggestions += `  * ${addon}\n`;
+    }
+
+    hasActionableSuggestions = true;
+  }
+
+  if (!hasActionableSuggestions) {
+    // Only show the dormant addons if there are nothing else to do because they are unlikely to
+    // be the problem.
+    suggestions += '* Upgrade the following addons to the latest version, if available:\n';
+
+    for (let addon of dormantTopLevelAddons) {
+      suggestions += `  * ${addon}\n`;
+    }
+  }
+
+  let details =
+    '\n### Details ###\n\n' +
+    'Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, ' +
+    'potentially triggering this deprecation message indirectly, ' +
+    'even when you did not observe these deprecated usages in your code.\n\n' +
+    'The following outdated versions are found in your project:\n';
+
+  let hasDormantAddons = false;
+  let hasCompatibleAddons = false;
+
+  for (let version of Object.keys(groupedByVersion).sort(semver.compare)) {
+    details += `\n* ember-cli-babel@${version}, currently used by:\n`;
+
+    for (let parent of Object.keys(groupedByVersion[version]).sort()) {
+      let info = groupedByVersion[version][parent][0];
+
+      details += `  * ${parent}`;
+
+      if (info.dormant) {
+        details += ' (Dormant)\n';
+        hasDormantAddons = true;
+      } else if (info.compatible) {
+        details += ' (Compatible)\n';
+        hasCompatibleAddons = true;
+      } else {
+        details += '\n';
+      }
+
+      details += `    * Depends on ember-cli-babel@${groupedByVersion[version][parent][0].requirement}\n`;
+
+      for (let info of groupedByVersion[version][parent]) {
+        let adddedBy = info.path.slice(0, -1);
+
+        if (adddedBy.length) {
+          details += `    * Added by ${adddedBy.join(' > ')}\n`;
+        }
+
+        if (info.compatible) {
+          hasCompatibleAddons = true;
+        }
+      }
+    }
+  }
+
+  if (hasDormantAddons) {
+    details +=
+      '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
+      'Therefore, even if they are using an old version ember-cli-babel, they are ' +
+      'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
+  }
+
+  if (hasCompatibleAddons) {
+    details += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
+
+    if (projectInfo) {
+      details += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+    } else {
+      if (isYarnProject === true) {
+        details +=
+          'Try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
+      } else if (isYarnProject === false) {
+        details += 'Try running `npm dedupe`.\n';
+      } else {
+        details +=
+          'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
+          'If using npm, try running `npm dedupe`.\n';
+      }
+    }
+  }
+
+  let globalMessage =
+    'Usage of the Ember Global is deprecated. ' +
+    'You should import the Ember module or the specific API instead.\n\n' +
+    'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
+    'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
+    suggestions;
+
+  if (hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all') {
+    globalMessage +=
+      '\n### Important ###\n\n' +
+      'In order to avoid repeatedly showing the same deprecation messages, ' +
+      'no further deprecation messages will be shown for usages of the Ember Global ' +
+      'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
+      'To see all instances of this deprecation message, ' +
+      'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
+      'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
+  }
+
+  globalMessage += details;
+
+  let onDotAccess = `function (dotKey, importKey, module) {
+          var message =
+            'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
+            '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
+            'These usages may be caused by an outdated ember-cli-babel dependency. ' +
+            ${JSON.stringify(suggestions)};
+
+          if (${
+            hasActionableSuggestions &&
+            process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
+          }) {
+            message +=
+              '\\n### Important ###\\n\\n' +
+              'In order to avoid repeatedly showing the same deprecation messages, ' +
+              'no further deprecation messages will be shown for theses deprecated usages ' +
+              'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
+              'To see all instances of this deprecation message, ' +
+              'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
+              'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
+          }
+
+          message += ${JSON.stringify(details)};
+
+          return message;
+        }`;
+
+  let shouldIssueSingleDeprecation =
+    hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all';
+
+  let bootstrap = `require('@ember/-internals/bootstrap').default()`;
+
+  if (shouldIssueSingleDeprecation) {
+    bootstrap = `
+      require('@ember/-internals/bootstrap').default(
+        ${JSON.stringify(globalMessage)},
+        ${hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
+      );
+
+      (function(disabled, once, _onDotAccess) {
+        var onDotAccess = function () {
+          if (disabled) {
+            return null;
+          } else {
+            disabled = once;
+            return _onDotAccess.apply(undefined, arguments);
+          }
+        };
+
+        require('@ember/object')._onDotAccess(onDotAccess);
+
+        require('@ember/runloop')._onDotAccess(onDotAccess);
+      })(
+        false,
+        ${
+          hasActionableSuggestions &&
+          process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
+        },
+        ${onDotAccess}
+      );
+    `;
+  }
+
+  return {
+    globalMessage,
+    hasActionableSuggestions,
+    shouldIssueSingleDeprecation,
+    bootstrap,
+  };
+};
diff --git a/lib/index.js b/lib/index.js
index 8f0ff2ffc36..677c26ad73b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -10,7 +10,7 @@ const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-pl
 const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
-const semver = require('semver');
+const globalDeprecationInfo = require('./global-deprecation-utils');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -41,17 +41,6 @@ add(
   path.join(__dirname, '..', 'dist', 'ember-template-compiler.js')
 );
 
-function* walkAddonTree(project, pathToAddon = []) {
-  for (let addon of project.addons) {
-    yield [addon, pathToAddon];
-    yield* walkAddonTree(addon, [...pathToAddon, `${addon.name}@${addon.pkg.version}`]);
-  }
-}
-
-function requirementFor(pkg, deps = {}) {
-  return deps[pkg];
-}
-
 module.exports = {
   init() {
     this._super.init && this._super.init.apply(this, arguments);
@@ -76,13 +65,19 @@ module.exports = {
   name: 'ember-source',
   paths,
   absolutePaths,
-  _bootstrapEmber: "require('@ember/-internals/bootstrap').default();",
   _jqueryIntegrationEnabled: true,
 
   included() {
     this._super.included.apply(this, arguments);
 
-    this._issueGlobalsDeprecation();
+    let { hasActionableSuggestions, globalMessage, bootstrap } = globalDeprecationInfo(
+      this.project
+    );
+    this._bootstrapEmber = bootstrap;
+
+    if (hasActionableSuggestions) {
+      this.ui.writeWarnLine('[DEPRECATION] ' + globalMessage);
+    }
 
     const { has } = require('@ember/edition-utils');
 
@@ -324,289 +319,4 @@ module.exports = {
 
     return debugTree(new MergeTrees([ember, templateCompiler, jquery]), 'vendor:final');
   },
-
-  _issueGlobalsDeprecation() {
-    if (process.env.EMBER_ENV === 'production') {
-      return;
-    }
-
-    let isYarnProject = ((root) => {
-      try {
-        // eslint-disable-next-line node/no-unpublished-require
-        return require('ember-cli/lib/utilities/is-yarn-project')(root);
-      } catch {
-        return undefined;
-      }
-    })(this.project.root);
-
-    let groupedByTopLevelAddon = Object.create(null);
-    let groupedByVersion = Object.create(null);
-    let projectInfo;
-
-    for (let [addon, pathToAddon] of walkAddonTree(this.project)) {
-      let version = addon.pkg.version;
-
-      if (addon.name === 'ember-cli-babel' && semver.lt(version, '7.26.6')) {
-        let info;
-
-        if (addon.parent === this.project) {
-          let requirement = requirementFor('ember-cli-babel', this.project.pkg.devDependencies);
-          let compatible = semver.satisfies('7.26.6', requirement);
-
-          info = projectInfo = {
-            parent: `${this.project.name()} (your app)`,
-            version,
-            requirement,
-            compatible,
-            dormant: false,
-            path: pathToAddon,
-          };
-        } else {
-          let requirement = requirementFor('ember-cli-babel', addon.parent.pkg.dependencies);
-          let compatible = semver.satisfies('7.26.6', requirement);
-          let dormant = addon.parent._fileSystemInfo
-            ? addon.parent._fileSystemInfo().hasJSFiles === false
-            : false;
-
-          let topLevelAddon = addon.parent;
-
-          while (topLevelAddon.parent !== this.project) {
-            topLevelAddon = topLevelAddon.parent;
-          }
-
-          info = {
-            parent: `${addon.parent.name}@${addon.pkg.version}`,
-            version,
-            requirement,
-            compatible,
-            dormant,
-            path: pathToAddon,
-          };
-
-          let addons = groupedByTopLevelAddon[topLevelAddon.name] || [];
-          groupedByTopLevelAddon[topLevelAddon.name] = [...addons, info];
-        }
-
-        let group = groupedByVersion[version] || Object.create(null);
-        groupedByVersion[version] = group;
-
-        let addons = group[info.parent] || [];
-        group[info.parent] = [...addons, info];
-      }
-    }
-
-    if (Object.keys(groupedByVersion).length === 0) {
-      return;
-    }
-
-    let dormantTopLevelAddons = [];
-    let compatibleTopLevelAddons = [];
-    let incompatibleTopLevelAddons = [];
-
-    for (let addon of Object.keys(groupedByTopLevelAddon)) {
-      let group = groupedByTopLevelAddon[addon];
-
-      if (group.every((info) => info.dormant)) {
-        dormantTopLevelAddons.push(addon);
-      } else if (group.every((info) => info.compatible)) {
-        compatibleTopLevelAddons.push(addon);
-      } else {
-        incompatibleTopLevelAddons.push(addon);
-      }
-    }
-
-    let suggestions = 'The following steps may help:\n\n';
-
-    let hasActionableSuggestions = false;
-
-    if (projectInfo) {
-      suggestions += '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
-      hasActionableSuggestions = true;
-    } else if (compatibleTopLevelAddons.length > 0) {
-      // Only show the compatible addons if the project itself is up-to-date, because updating the
-      // project's own dependency on ember-cli-babel to latest may also get these addons to use it
-      // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
-      if (isYarnProject === true) {
-        suggestions +=
-          '* Run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
-      } else if (isYarnProject === false) {
-        suggestions += '* Run `npm dedupe`.\n';
-      } else {
-        suggestions +=
-          '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
-          '* If using npm, run `npm dedupe`.\n';
-      }
-
-      hasActionableSuggestions = true;
-    }
-
-    if (incompatibleTopLevelAddons.length > 0) {
-      suggestions += '* Upgrade the following addons to the latest version:\n';
-
-      for (let addon of incompatibleTopLevelAddons) {
-        suggestions += `  * ${addon}\n`;
-      }
-
-      hasActionableSuggestions = true;
-    }
-
-    if (!hasActionableSuggestions) {
-      // Only show the dormant addons if there are nothing else to do because they are unlikely to
-      // be the problem.
-      suggestions += '* Upgrade the following addons to the latest version, if available:\n';
-
-      for (let addon of dormantTopLevelAddons) {
-        suggestions += `  * ${addon}\n`;
-      }
-    }
-
-    let details =
-      '\n### Details ###\n\n' +
-      'Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, ' +
-      'potentially triggering this deprecation message indirectly, ' +
-      'even when you did not observe these deprecated usages in your code.\n\n' +
-      'The following outdated versions are found in your project:\n';
-
-    let hasDormantAddons = false;
-    let hasCompatibleAddons = false;
-
-    for (let version of Object.keys(groupedByVersion).sort(semver.compare)) {
-      details += `\n* ember-cli-babel@${version}, currently used by:\n`;
-
-      for (let parent of Object.keys(groupedByVersion[version]).sort()) {
-        let info = groupedByVersion[version][parent][0];
-
-        details += `  * ${parent}`;
-
-        if (info.dormant) {
-          details += ' (Dormant)\n';
-          hasDormantAddons = true;
-        } else if (info.compatible) {
-          details += ' (Compatible)\n';
-          hasCompatibleAddons = true;
-        } else {
-          details += '\n';
-        }
-
-        details += `    * Depends on ember-cli-babel@${groupedByVersion[version][parent][0].requirement}\n`;
-
-        for (let info of groupedByVersion[version][parent]) {
-          let adddedBy = info.path.slice(0, -1);
-
-          if (adddedBy.length) {
-            details += `    * Added by ${adddedBy.join(' > ')}\n`;
-          }
-
-          if (info.compatible) {
-            hasCompatibleAddons = true;
-          }
-        }
-      }
-    }
-
-    if (hasDormantAddons) {
-      details +=
-        '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
-        'Therefore, even if they are using an old version ember-cli-babel, they are ' +
-        'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
-    }
-
-    if (hasCompatibleAddons) {
-      details += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
-
-      if (projectInfo) {
-        details += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
-      } else {
-        if (isYarnProject === true) {
-          details +=
-            'Try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
-        } else if (isYarnProject === false) {
-          details += 'Try running `npm dedupe`.\n';
-        } else {
-          details +=
-            'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
-            'If using npm, try running `npm dedupe`.\n';
-        }
-      }
-    }
-
-    let globalMessage =
-      'Usage of the Ember Global is deprecated. ' +
-      'You should import the Ember module or the specific API instead.\n\n' +
-      'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
-      'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
-      suggestions;
-
-    if (hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all') {
-      globalMessage +=
-        '\n### Important ###\n\n' +
-        'In order to avoid repeatedly showing the same deprecation messages, ' +
-        'no further deprecation messages will be shown for usages of the Ember Global ' +
-        'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
-        'To see all instances of this deprecation message, ' +
-        'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
-        'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
-    }
-
-    globalMessage += details;
-
-    if (hasActionableSuggestions) {
-      this.ui.writeWarnLine('[DEPRECATION] ' + globalMessage);
-    }
-
-    let onDotAccess = `function (dotKey, importKey, module) {
-          var message =
-            'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
-            '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
-            'These usages may be caused by an outdated ember-cli-babel dependency. ' +
-            ${JSON.stringify(suggestions)};
-
-          if (${
-            hasActionableSuggestions &&
-            process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
-          }) {
-            message +=
-              '\\n### Important ###\\n\\n' +
-              'In order to avoid repeatedly showing the same deprecation messages, ' +
-              'no further deprecation messages will be shown for theses deprecated usages ' +
-              'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
-              'To see all instances of this deprecation message, ' +
-              'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
-              'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
-          }
-
-          message += ${JSON.stringify(details)};
-
-          return message;
-        }`;
-
-    this._bootstrapEmber = `
-      require('@ember/-internals/bootstrap').default(
-        ${JSON.stringify(globalMessage)},
-        ${hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
-      );
-
-      (function(disabled, once, _onDotAccess) {
-        var onDotAccess = function () {
-          if (disabled) {
-            return null;
-          } else {
-            disabled = once;
-            return _onDotAccess.apply(undefined, arguments);
-          }
-        };
-
-        require('@ember/object')._onDotAccess(onDotAccess);
-
-        require('@ember/runloop')._onDotAccess(onDotAccess);
-      })(
-        false,
-        ${
-          hasActionableSuggestions &&
-          process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
-        },
-        ${onDotAccess}
-      );
-    `;
-  },
 };

From 540fafaff2eb33f89e3935d39ff1c93933e3f5a1 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 2 Jun 2021 17:22:44 -0400
Subject: [PATCH 0524/1405] Add some basic tests

Co-authored-by: Stefan Penner <stefan.penner@gmail.com>
---
 lib/global-deprecation-utils.js            |  64 +++----
 tests/node/global-deprecation-info-test.js | 207 +++++++++++++++++++++
 2 files changed, 235 insertions(+), 36 deletions(-)
 create mode 100644 tests/node/global-deprecation-info-test.js

diff --git a/lib/global-deprecation-utils.js b/lib/global-deprecation-utils.js
index 6cf7980c08c..ce5c43e0352 100644
--- a/lib/global-deprecation-utils.js
+++ b/lib/global-deprecation-utils.js
@@ -1,4 +1,7 @@
+'use strict';
+
 const semver = require('semver');
+const validSemverRange = require('semver/ranges/valid');
 
 function* walkAddonTree(project, pathToAddon = []) {
   for (let addon of project.addons) {
@@ -11,19 +14,17 @@ function requirementFor(pkg, deps = {}) {
   return deps[pkg];
 }
 
-module.exports = function (project) {
-  if (process.env.EMBER_ENV === 'production') {
-    return;
-  }
+const DEFAULT_RESULT = Object.freeze({
+  globalMessage: '',
+  hasActionableSuggestions: false,
+  shouldIssueSingleDeprecation: false,
+  bootstrap: `require('@ember/-internals/bootstrap').default()`,
+});
 
-  let isYarnProject = ((root) => {
-    try {
-      // eslint-disable-next-line node/no-unpublished-require
-      return require('ember-cli/lib/utilities/is-yarn-project')(root);
-    } catch {
-      return undefined;
-    }
-  })(project.root);
+module.exports = function (project, env = process.env) {
+  if (env.EMBER_ENV === 'production') {
+    return DEFAULT_RESULT;
+  }
 
   let groupedByTopLevelAddon = Object.create(null);
   let groupedByVersion = Object.create(null);
@@ -36,8 +37,12 @@ module.exports = function (project) {
       let info;
 
       if (addon.parent === project) {
-        let requirement = requirementFor('ember-cli-babel', project.pkg.devDependencies);
-        let compatible = semver.satisfies('7.26.6', requirement);
+        let requirement =
+          requirementFor('ember-cli-babel', project.pkg.dependencies) ||
+          requirementFor('ember-cli-babel', project.pkg.devDependencies);
+
+        let validRange = validSemverRange(requirement);
+        let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
 
         info = projectInfo = {
           parent: `${project.name()} (your app)`,
@@ -49,7 +54,8 @@ module.exports = function (project) {
         };
       } else {
         let requirement = requirementFor('ember-cli-babel', addon.parent.pkg.dependencies);
-        let compatible = semver.satisfies('7.26.6', requirement);
+        let validRange = validSemverRange(requirement);
+        let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
         let dormant = addon.parent._fileSystemInfo
           ? addon.parent._fileSystemInfo().hasJSFiles === false
           : false;
@@ -82,7 +88,7 @@ module.exports = function (project) {
   }
 
   if (Object.keys(groupedByVersion).length === 0) {
-    return;
+    return DEFAULT_RESULT;
   }
 
   let dormantTopLevelAddons = [];
@@ -112,16 +118,9 @@ module.exports = function (project) {
     // Only show the compatible addons if the project itself is up-to-date, because updating the
     // project's own dependency on ember-cli-babel to latest may also get these addons to use it
     // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
-    if (isYarnProject === true) {
-      suggestions +=
-        '* Run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
-    } else if (isYarnProject === false) {
-      suggestions += '* Run `npm dedupe`.\n';
-    } else {
-      suggestions +=
-        '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
-        '* If using npm, run `npm dedupe`.\n';
-    }
+    suggestions +=
+      '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
+      '* If using npm, run `npm dedupe`.\n';
 
     hasActionableSuggestions = true;
   }
@@ -203,16 +202,9 @@ module.exports = function (project) {
     if (projectInfo) {
       details += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
     } else {
-      if (isYarnProject === true) {
-        details +=
-          'Try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n';
-      } else if (isYarnProject === false) {
-        details += 'Try running `npm dedupe`.\n';
-      } else {
-        details +=
-          'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
-          'If using npm, try running `npm dedupe`.\n';
-      }
+      details +=
+        'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
+        'If using npm, try running `npm dedupe`.\n';
     }
   }
 
diff --git a/tests/node/global-deprecation-info-test.js b/tests/node/global-deprecation-info-test.js
new file mode 100644
index 00000000000..2cea2139518
--- /dev/null
+++ b/tests/node/global-deprecation-info-test.js
@@ -0,0 +1,207 @@
+'use strict';
+
+const globalDeprecationInfo = require('../../lib/global-deprecation-utils');
+
+QUnit.module('globalDeprecationInfo', function (hooks) {
+  let project, env;
+
+  function buildBabel(parent, version) {
+    return {
+      name: 'ember-cli-babel',
+      parent,
+      pkg: {
+        version,
+      },
+      addons: [],
+    };
+  }
+
+  hooks.beforeEach(function () {
+    project = {
+      name() {
+        return 'fake-project';
+      },
+      pkg: {
+        dependencies: {},
+        devDependencies: {},
+      },
+      addons: [],
+    };
+    env = Object.create(null);
+  });
+
+  hooks.afterEach(function () {});
+
+  QUnit.test('when in production, does nothing', function (assert) {
+    env.EMBER_ENV = 'production';
+
+    let result = globalDeprecationInfo(project, env);
+
+    assert.deepEqual(result, {
+      globalMessage: '',
+      hasActionableSuggestions: false,
+      shouldIssueSingleDeprecation: false,
+      bootstrap: `require('@ember/-internals/bootstrap').default()`,
+    });
+  });
+
+  QUnit.test('without addons, does nothing', function (assert) {
+    project.addons = [];
+    let result = globalDeprecationInfo(project, env);
+
+    assert.deepEqual(result, {
+      globalMessage: '',
+      hasActionableSuggestions: false,
+      shouldIssueSingleDeprecation: false,
+      bootstrap: `require('@ember/-internals/bootstrap').default()`,
+    });
+  });
+
+  QUnit.test('projects own ember-cli-babel is too old', function (assert) {
+    project.pkg.devDependencies = {
+      'ember-cli-babel': '^7.26.0',
+    };
+
+    project.addons.push({
+      name: 'ember-cli-babel',
+      parent: project,
+      pkg: {
+        version: '7.26.5',
+      },
+      addons: [],
+    });
+
+    let result = globalDeprecationInfo(project, env);
+    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+    assert.strictEqual(result.hasActionableSuggestions, true);
+    assert.ok(
+      result.globalMessage.includes(
+        '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+      )
+    );
+  });
+
+  QUnit.test('projects has ember-cli-babel in dependencies', function (assert) {
+    project.pkg.dependencies = {
+      'ember-cli-babel': '^7.25.0',
+    };
+
+    project.addons.push({
+      name: 'ember-cli-babel',
+      parent: project,
+      pkg: {
+        version: '7.26.5',
+      },
+      addons: [],
+    });
+
+    let result = globalDeprecationInfo(project, env);
+    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+    assert.strictEqual(result.hasActionableSuggestions, true);
+    assert.ok(
+      result.globalMessage.includes(
+        '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+      )
+    );
+  });
+  QUnit.test(
+    'projects has no devDependencies, but old ember-cli-babel found in addons array',
+    function (assert) {
+      project.pkg.devDependencies = {};
+
+      project.addons.push({
+        name: 'ember-cli-babel',
+        parent: project,
+        pkg: {
+          version: '7.26.5',
+        },
+        addons: [],
+      });
+
+      let result = globalDeprecationInfo(project, env);
+      assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+      assert.strictEqual(result.hasActionableSuggestions, true);
+      assert.ok(
+        result.globalMessage.includes(
+          '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+        )
+      );
+    }
+  );
+
+  QUnit.test('projects uses linked ember-cli-babel', function (assert) {
+    project.pkg.devDependencies = {
+      'ember-cli-babel': 'link:./some/path/here',
+    };
+
+    let otherAddon = {
+      name: 'other-thing-here',
+      parent: project,
+      pkg: {},
+      addons: [],
+    };
+
+    otherAddon.addons.push(buildBabel(otherAddon, '7.26.5'));
+    project.addons.push(buildBabel(project, '7.26.6'), otherAddon);
+
+    let result = globalDeprecationInfo(project, env);
+    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+    assert.strictEqual(result.hasActionableSuggestions, true);
+
+    assert.ok(
+      result.globalMessage.includes(
+        '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel`'
+      )
+    );
+    assert.ok(result.globalMessage.includes('* If using npm, run `npm dedupe`'));
+  });
+
+  QUnit.test('projects own ember-cli-babel is up to date', function (assert) {
+    project.pkg.devDependencies = {
+      'ember-cli-babel': '^7.26.0',
+    };
+
+    project.addons.push({
+      name: 'ember-cli-babel',
+      parent: project,
+      pkg: {
+        version: '7.26.6',
+      },
+      addons: [],
+    });
+
+    let result = globalDeprecationInfo(project, env);
+    assert.strictEqual(result.shouldIssueSingleDeprecation, false);
+    assert.strictEqual(result.hasActionableSuggestions, false);
+    assert.notOk(
+      result.globalMessage.includes(
+        '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+      )
+    );
+  });
+
+  QUnit.test('transient babel that is out of date', function (assert) {
+    project.pkg.devDependencies = {
+      'ember-cli-babel': '^7.26.0',
+    };
+
+    let otherAddon = {
+      name: 'other-thing-here',
+      parent: project,
+      pkg: {
+        dependencies: {
+          'ember-cli-babel': '^7.25.0',
+        },
+      },
+      addons: [],
+    };
+
+    otherAddon.addons.push(buildBabel(otherAddon, '7.26.5'));
+    project.addons.push(buildBabel(project, '7.26.6'), otherAddon);
+
+    let result = globalDeprecationInfo(project, env);
+    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+    assert.strictEqual(result.hasActionableSuggestions, true);
+    assert.ok(result.globalMessage.includes('* other-thing-here@7.26.5 (Compatible)'));
+  });
+});

From fffe619e2fe2de4ee603b2ccb2dbf33192f9f51d Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 2 Jun 2021 18:33:26 -0400
Subject: [PATCH 0525/1405] Refactor `@ember/-internals/bootstrap` back into an
 IIFE

Fixes a few things:

* Ensures that Embroider has a consistent protocol for ensuring the
  global is bootstrapped
* Allows our override code to be transpiled
* Ensures that any bootstrapping tweaks force us out of "prebuilt" mode
  (allowing that customized bootstrap code to actually run)

Co-authored-by: Stefan Penner <stefan.penner@gmail.com>
---
 lib/global-deprecation-utils.js               | 45 ++------------
 lib/index.js                                  | 60 +++++++++++++++++--
 package.json                                  |  2 +-
 packages/@ember/-internals/bootstrap/index.js | 10 ++--
 .../-internals/bootstrap/lib/overrides.js     |  9 +++
 5 files changed, 75 insertions(+), 51 deletions(-)
 create mode 100644 packages/@ember/-internals/bootstrap/lib/overrides.js

diff --git a/lib/global-deprecation-utils.js b/lib/global-deprecation-utils.js
index ce5c43e0352..a4532b7a015 100644
--- a/lib/global-deprecation-utils.js
+++ b/lib/global-deprecation-utils.js
@@ -18,7 +18,6 @@ const DEFAULT_RESULT = Object.freeze({
   globalMessage: '',
   hasActionableSuggestions: false,
   shouldIssueSingleDeprecation: false,
-  bootstrap: `require('@ember/-internals/bootstrap').default()`,
 });
 
 module.exports = function (project, env = process.env) {
@@ -228,7 +227,7 @@ module.exports = function (project, env = process.env) {
 
   globalMessage += details;
 
-  let onDotAccess = `function (dotKey, importKey, module) {
+  let dotAccessOverride = `
           var message =
             'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
             '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
@@ -250,50 +249,18 @@ module.exports = function (project, env = process.env) {
           }
 
           message += ${JSON.stringify(details)};
-
-          return message;
-        }`;
+        `;
 
   let shouldIssueSingleDeprecation =
     hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all';
 
-  let bootstrap = `require('@ember/-internals/bootstrap').default()`;
-
-  if (shouldIssueSingleDeprecation) {
-    bootstrap = `
-      require('@ember/-internals/bootstrap').default(
-        ${JSON.stringify(globalMessage)},
-        ${hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all'}
-      );
-
-      (function(disabled, once, _onDotAccess) {
-        var onDotAccess = function () {
-          if (disabled) {
-            return null;
-          } else {
-            disabled = once;
-            return _onDotAccess.apply(undefined, arguments);
-          }
-        };
-
-        require('@ember/object')._onDotAccess(onDotAccess);
-
-        require('@ember/runloop')._onDotAccess(onDotAccess);
-      })(
-        false,
-        ${
-          hasActionableSuggestions &&
-          process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
-        },
-        ${onDotAccess}
-      );
-    `;
-  }
-
   return {
     globalMessage,
     hasActionableSuggestions,
     shouldIssueSingleDeprecation,
-    bootstrap,
+
+    dotAccessOverride,
   };
 };
+
+module.exports.DEFAULT_RESULT = DEFAULT_RESULT;
diff --git a/lib/index.js b/lib/index.js
index 677c26ad73b..aa4cf07a4ef 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -11,6 +11,7 @@ const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBa
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
 const globalDeprecationInfo = require('./global-deprecation-utils');
+const createFile = require('broccoli-file-creator');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -70,10 +71,50 @@ module.exports = {
   included() {
     this._super.included.apply(this, arguments);
 
-    let { hasActionableSuggestions, globalMessage, bootstrap } = globalDeprecationInfo(
-      this.project
-    );
-    this._bootstrapEmber = bootstrap;
+    let {
+      hasActionableSuggestions,
+      globalMessage,
+      shouldIssueSingleDeprecation,
+
+      dotAccessOverride,
+    } = globalDeprecationInfo(this.project);
+
+    if (hasActionableSuggestions) {
+      let shouldIssueSingleDotAccessDeprecation =
+        hasActionableSuggestions &&
+        process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all';
+
+      this._bootstrapMessageOverrideTree = createFile(
+        'packages/@ember/-internals/bootstrap/lib/overrides.js',
+
+        `export const message = ${JSON.stringify(globalMessage)};
+         export const deprecateOnce = ${shouldIssueSingleDeprecation};
+
+         import { _onDotAccess as runloopDotAccessOverride } from '@ember/runloop';
+         import { _onDotAccess as objectDotAccessOverride } from '@ember/object';
+
+         export function setupDotAccess() {
+           let disabled = false;
+           let once = ${shouldIssueSingleDotAccessDeprecation};
+
+           function onDotAccess(dotKey, importKey, module) {
+             if (disabled) {
+               return null;
+             } else {
+               disabled = once;
+
+               ${dotAccessOverride};
+
+               return message;
+             }
+           }
+
+           runloopDotAccessOverride(onDotAccess);
+           objectDotAccessOverride(onDotAccess);
+         }
+        `
+      );
+    }
 
     if (hasActionableSuggestions) {
       this.ui.writeWarnLine('[DEPRECATION] ' + globalMessage);
@@ -219,6 +260,10 @@ module.exports = {
   },
 
   buildEmberBundles(tree, isProduction) {
+    if (this._bootstrapMessageOverrideTree) {
+      tree = new MergeTrees([tree, this._bootstrapMessageOverrideTree], { overwrite: true });
+    }
+
     let packages = this.transpileTree(new Funnel(tree, { srcDir: 'packages' }), isProduction);
 
     let dependencies = this.transpileTree(
@@ -254,7 +299,7 @@ module.exports = {
     return new MergeTrees([
       concatBundle(emberFiles, {
         outputFile: 'ember.js',
-        footer: this._bootstrapEmber,
+        footer: `require('@ember/-internals/bootstrap')`,
       }),
 
       concatBundle(emberTestingFiles, {
@@ -299,10 +344,13 @@ module.exports = {
 
     if (
       !isProduction &&
+      // do the running applications targets match our prebuilt assets targets?
       PRE_BUILT_TARGETS.every((target) => targets.includes(target)) &&
       targets.length === PRE_BUILT_TARGETS.length &&
       // if node is defined in targets we can't reliably use the prebuilt bundles
-      !targetNode
+      !targetNode &&
+      // if we have a custom override for bootstrapping (e.g. for globals deprecations) we can't use the prebuilt bundles
+      !this._bootstrapMessageOverrideTree
     ) {
       ember = new Funnel(tree, {
         destDir: 'ember',
diff --git a/package.json b/package.json
index e07dee3245e..bfcd7f3feab 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,7 @@
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
     "broccoli-debug": "^0.6.4",
+    "broccoli-file-creator": "^2.1.1",
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
@@ -98,7 +99,6 @@
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
-    "broccoli-file-creator": "^2.1.1",
     "broccoli-persistent-filter": "^2.3.1",
     "broccoli-plugin": "^4.0.3",
     "broccoli-rollup": "^2.1.1",
diff --git a/packages/@ember/-internals/bootstrap/index.js b/packages/@ember/-internals/bootstrap/index.js
index 05e70d3a721..60fee640296 100644
--- a/packages/@ember/-internals/bootstrap/index.js
+++ b/packages/@ember/-internals/bootstrap/index.js
@@ -1,11 +1,11 @@
 import require from 'require';
 import { context } from '@ember/-internals/environment';
 import { deprecate } from '@ember/debug';
+import { message, deprecateOnce, setupDotAccess } from './lib/overrides';
 
-const DEFAULT_MESSAGE =
-  'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.';
+setupDotAccess();
 
-export default function bootstrap(message = DEFAULT_MESSAGE, once = false) {
+(function bootstrap() {
   let Ember;
   let disabled = false;
 
@@ -28,7 +28,7 @@ export default function bootstrap(message = DEFAULT_MESSAGE, once = false) {
           },
         });
 
-        if (once) {
+        if (deprecateOnce) {
           disabled = true;
         }
 
@@ -47,4 +47,4 @@ export default function bootstrap(message = DEFAULT_MESSAGE, once = false) {
     // eslint-disable-next-line no-undef
     module.exports = Ember = require('ember').default;
   }
-}
+})();
diff --git a/packages/@ember/-internals/bootstrap/lib/overrides.js b/packages/@ember/-internals/bootstrap/lib/overrides.js
new file mode 100644
index 00000000000..38af9cd1cc1
--- /dev/null
+++ b/packages/@ember/-internals/bootstrap/lib/overrides.js
@@ -0,0 +1,9 @@
+// these are default values that are overriden in some cases by the ember-addon entry point code
+// in lib/index.js (see `included` and `buildEmberBundles` methods there for more context)
+
+export const message =
+  'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.';
+
+export const deprecateOnce = false;
+
+export function setupDotAccess() {}

From 6a46de613a9796e9faa6e4c0550d8c5b6b540b58 Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Thu, 3 Jun 2021 18:45:29 +0200
Subject: [PATCH 0526/1405] [DOC] Add missing `Helper` class methods

This adds the public `CoreObject` methods to the API docs of the `Helper` class.
---
 packages/@ember/-internals/glimmer/lib/helper.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index b1888d6dac1..d14b9eb9cf1 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -78,6 +78,7 @@ export interface SimpleHelper<T = unknown> {
   Additionally, class helpers can call `recompute` to force a new computation.
 
   @class Helper
+  @extends CoreObject
   @public
   @since 1.13.0
 */

From 35689f9c4fe27f810895aeeec1ebb5ef5700ce38 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 3 Jun 2021 02:05:48 -0700
Subject: [PATCH 0527/1405] Refactor Overrides infrastructure, add more tests

Also fixed a few minor errors in the message (wrong version number etc)

Included a list of hardcoded known dormant addons (polyfills mostly) to make
the suggestions more reliable.
---
 lib/global-deprecation-utils.js               | 266 ------
 lib/index.js                                  |  61 +-
 lib/overrides.js                              | 411 +++++++++
 packages/@ember/-internals/bootstrap/index.js |  50 -
 packages/@ember/-internals/bootstrap/index.ts |  64 ++
 .../-internals/bootstrap/lib/overrides.js     |   9 -
 .../@ember/-internals/overrides/index.d.ts    |  12 +
 packages/@ember/-internals/overrides/index.js |   3 +
 packages/@ember/object/index.js               |  11 +-
 packages/@ember/runloop/index.js              |  13 +-
 tests/node/fixtures/project.js                | 148 +++
 tests/node/global-deprecation-info-test.js    | 207 -----
 tests/node/overrides-test.js                  | 869 ++++++++++++++++++
 13 files changed, 1527 insertions(+), 597 deletions(-)
 delete mode 100644 lib/global-deprecation-utils.js
 create mode 100644 lib/overrides.js
 delete mode 100644 packages/@ember/-internals/bootstrap/index.js
 create mode 100644 packages/@ember/-internals/bootstrap/index.ts
 delete mode 100644 packages/@ember/-internals/bootstrap/lib/overrides.js
 create mode 100644 packages/@ember/-internals/overrides/index.d.ts
 create mode 100644 packages/@ember/-internals/overrides/index.js
 create mode 100644 tests/node/fixtures/project.js
 delete mode 100644 tests/node/global-deprecation-info-test.js
 create mode 100644 tests/node/overrides-test.js

diff --git a/lib/global-deprecation-utils.js b/lib/global-deprecation-utils.js
deleted file mode 100644
index a4532b7a015..00000000000
--- a/lib/global-deprecation-utils.js
+++ /dev/null
@@ -1,266 +0,0 @@
-'use strict';
-
-const semver = require('semver');
-const validSemverRange = require('semver/ranges/valid');
-
-function* walkAddonTree(project, pathToAddon = []) {
-  for (let addon of project.addons) {
-    yield [addon, pathToAddon];
-    yield* walkAddonTree(addon, [...pathToAddon, `${addon.name}@${addon.pkg.version}`]);
-  }
-}
-
-function requirementFor(pkg, deps = {}) {
-  return deps[pkg];
-}
-
-const DEFAULT_RESULT = Object.freeze({
-  globalMessage: '',
-  hasActionableSuggestions: false,
-  shouldIssueSingleDeprecation: false,
-});
-
-module.exports = function (project, env = process.env) {
-  if (env.EMBER_ENV === 'production') {
-    return DEFAULT_RESULT;
-  }
-
-  let groupedByTopLevelAddon = Object.create(null);
-  let groupedByVersion = Object.create(null);
-  let projectInfo;
-
-  for (let [addon, pathToAddon] of walkAddonTree(project)) {
-    let version = addon.pkg.version;
-
-    if (addon.name === 'ember-cli-babel' && semver.lt(version, '7.26.6')) {
-      let info;
-
-      if (addon.parent === project) {
-        let requirement =
-          requirementFor('ember-cli-babel', project.pkg.dependencies) ||
-          requirementFor('ember-cli-babel', project.pkg.devDependencies);
-
-        let validRange = validSemverRange(requirement);
-        let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
-
-        info = projectInfo = {
-          parent: `${project.name()} (your app)`,
-          version,
-          requirement,
-          compatible,
-          dormant: false,
-          path: pathToAddon,
-        };
-      } else {
-        let requirement = requirementFor('ember-cli-babel', addon.parent.pkg.dependencies);
-        let validRange = validSemverRange(requirement);
-        let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
-        let dormant = addon.parent._fileSystemInfo
-          ? addon.parent._fileSystemInfo().hasJSFiles === false
-          : false;
-
-        let topLevelAddon = addon.parent;
-
-        while (topLevelAddon.parent !== project) {
-          topLevelAddon = topLevelAddon.parent;
-        }
-
-        info = {
-          parent: `${addon.parent.name}@${addon.pkg.version}`,
-          version,
-          requirement,
-          compatible,
-          dormant,
-          path: pathToAddon,
-        };
-
-        let addons = groupedByTopLevelAddon[topLevelAddon.name] || [];
-        groupedByTopLevelAddon[topLevelAddon.name] = [...addons, info];
-      }
-
-      let group = groupedByVersion[version] || Object.create(null);
-      groupedByVersion[version] = group;
-
-      let addons = group[info.parent] || [];
-      group[info.parent] = [...addons, info];
-    }
-  }
-
-  if (Object.keys(groupedByVersion).length === 0) {
-    return DEFAULT_RESULT;
-  }
-
-  let dormantTopLevelAddons = [];
-  let compatibleTopLevelAddons = [];
-  let incompatibleTopLevelAddons = [];
-
-  for (let addon of Object.keys(groupedByTopLevelAddon)) {
-    let group = groupedByTopLevelAddon[addon];
-
-    if (group.every((info) => info.dormant)) {
-      dormantTopLevelAddons.push(addon);
-    } else if (group.every((info) => info.compatible)) {
-      compatibleTopLevelAddons.push(addon);
-    } else {
-      incompatibleTopLevelAddons.push(addon);
-    }
-  }
-
-  let suggestions = 'The following steps may help:\n\n';
-
-  let hasActionableSuggestions = false;
-
-  if (projectInfo) {
-    suggestions += '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
-    hasActionableSuggestions = true;
-  } else if (compatibleTopLevelAddons.length > 0) {
-    // Only show the compatible addons if the project itself is up-to-date, because updating the
-    // project's own dependency on ember-cli-babel to latest may also get these addons to use it
-    // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
-    suggestions +=
-      '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.\n' +
-      '* If using npm, run `npm dedupe`.\n';
-
-    hasActionableSuggestions = true;
-  }
-
-  if (incompatibleTopLevelAddons.length > 0) {
-    suggestions += '* Upgrade the following addons to the latest version:\n';
-
-    for (let addon of incompatibleTopLevelAddons) {
-      suggestions += `  * ${addon}\n`;
-    }
-
-    hasActionableSuggestions = true;
-  }
-
-  if (!hasActionableSuggestions) {
-    // Only show the dormant addons if there are nothing else to do because they are unlikely to
-    // be the problem.
-    suggestions += '* Upgrade the following addons to the latest version, if available:\n';
-
-    for (let addon of dormantTopLevelAddons) {
-      suggestions += `  * ${addon}\n`;
-    }
-  }
-
-  let details =
-    '\n### Details ###\n\n' +
-    'Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, ' +
-    'potentially triggering this deprecation message indirectly, ' +
-    'even when you did not observe these deprecated usages in your code.\n\n' +
-    'The following outdated versions are found in your project:\n';
-
-  let hasDormantAddons = false;
-  let hasCompatibleAddons = false;
-
-  for (let version of Object.keys(groupedByVersion).sort(semver.compare)) {
-    details += `\n* ember-cli-babel@${version}, currently used by:\n`;
-
-    for (let parent of Object.keys(groupedByVersion[version]).sort()) {
-      let info = groupedByVersion[version][parent][0];
-
-      details += `  * ${parent}`;
-
-      if (info.dormant) {
-        details += ' (Dormant)\n';
-        hasDormantAddons = true;
-      } else if (info.compatible) {
-        details += ' (Compatible)\n';
-        hasCompatibleAddons = true;
-      } else {
-        details += '\n';
-      }
-
-      details += `    * Depends on ember-cli-babel@${groupedByVersion[version][parent][0].requirement}\n`;
-
-      for (let info of groupedByVersion[version][parent]) {
-        let adddedBy = info.path.slice(0, -1);
-
-        if (adddedBy.length) {
-          details += `    * Added by ${adddedBy.join(' > ')}\n`;
-        }
-
-        if (info.compatible) {
-          hasCompatibleAddons = true;
-        }
-      }
-    }
-  }
-
-  if (hasDormantAddons) {
-    details +=
-      '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
-      'Therefore, even if they are using an old version ember-cli-babel, they are ' +
-      'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
-  }
-
-  if (hasCompatibleAddons) {
-    details += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
-
-    if (projectInfo) {
-      details += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
-    } else {
-      details +=
-        'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
-        'If using npm, try running `npm dedupe`.\n';
-    }
-  }
-
-  let globalMessage =
-    'Usage of the Ember Global is deprecated. ' +
-    'You should import the Ember module or the specific API instead.\n\n' +
-    'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
-    'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
-    suggestions;
-
-  if (hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all') {
-    globalMessage +=
-      '\n### Important ###\n\n' +
-      'In order to avoid repeatedly showing the same deprecation messages, ' +
-      'no further deprecation messages will be shown for usages of the Ember Global ' +
-      'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
-      'To see all instances of this deprecation message, ' +
-      'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
-      'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
-  }
-
-  globalMessage += details;
-
-  let dotAccessOverride = `
-          var message =
-            'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
-            '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
-            'These usages may be caused by an outdated ember-cli-babel dependency. ' +
-            ${JSON.stringify(suggestions)};
-
-          if (${
-            hasActionableSuggestions &&
-            process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all'
-          }) {
-            message +=
-              '\\n### Important ###\\n\\n' +
-              'In order to avoid repeatedly showing the same deprecation messages, ' +
-              'no further deprecation messages will be shown for theses deprecated usages ' +
-              'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
-              'To see all instances of this deprecation message, ' +
-              'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
-              'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
-          }
-
-          message += ${JSON.stringify(details)};
-        `;
-
-  let shouldIssueSingleDeprecation =
-    hasActionableSuggestions && process.env.EMBER_GLOBAL_DEPRECATIONS !== 'all';
-
-  return {
-    globalMessage,
-    hasActionableSuggestions,
-    shouldIssueSingleDeprecation,
-
-    dotAccessOverride,
-  };
-};
-
-module.exports.DEFAULT_RESULT = DEFAULT_RESULT;
diff --git a/lib/index.js b/lib/index.js
index aa4cf07a4ef..ce887fbeb22 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -10,8 +10,7 @@ const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-pl
 const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBabelHelpers;
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
-const globalDeprecationInfo = require('./global-deprecation-utils');
-const createFile = require('broccoli-file-creator');
+const Overrides = require('./overrides');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -67,57 +66,19 @@ module.exports = {
   paths,
   absolutePaths,
   _jqueryIntegrationEnabled: true,
+  _overrideTree: undefined,
 
   included() {
     this._super.included.apply(this, arguments);
 
-    let {
-      hasActionableSuggestions,
-      globalMessage,
-      shouldIssueSingleDeprecation,
+    let overrides = Overrides.for(this.project);
 
-      dotAccessOverride,
-    } = globalDeprecationInfo(this.project);
-
-    if (hasActionableSuggestions) {
-      let shouldIssueSingleDotAccessDeprecation =
-        hasActionableSuggestions &&
-        process.env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS !== 'all';
-
-      this._bootstrapMessageOverrideTree = createFile(
-        'packages/@ember/-internals/bootstrap/lib/overrides.js',
-
-        `export const message = ${JSON.stringify(globalMessage)};
-         export const deprecateOnce = ${shouldIssueSingleDeprecation};
-
-         import { _onDotAccess as runloopDotAccessOverride } from '@ember/runloop';
-         import { _onDotAccess as objectDotAccessOverride } from '@ember/object';
-
-         export function setupDotAccess() {
-           let disabled = false;
-           let once = ${shouldIssueSingleDotAccessDeprecation};
-
-           function onDotAccess(dotKey, importKey, module) {
-             if (disabled) {
-               return null;
-             } else {
-               disabled = once;
-
-               ${dotAccessOverride};
-
-               return message;
-             }
-           }
-
-           runloopDotAccessOverride(onDotAccess);
-           objectDotAccessOverride(onDotAccess);
-         }
-        `
-      );
+    if (overrides.hasOverrides) {
+      this._overrideTree = overrides.toTree();
     }
 
-    if (hasActionableSuggestions) {
-      this.ui.writeWarnLine('[DEPRECATION] ' + globalMessage);
+    if (overrides.hasBuildTimeWarning) {
+      this.ui.writeWarnLine('[DEPRECATION] ' + overrides.buildTimeWarning);
     }
 
     const { has } = require('@ember/edition-utils');
@@ -260,8 +221,8 @@ module.exports = {
   },
 
   buildEmberBundles(tree, isProduction) {
-    if (this._bootstrapMessageOverrideTree) {
-      tree = new MergeTrees([tree, this._bootstrapMessageOverrideTree], { overwrite: true });
+    if (this._overrideTree) {
+      tree = new MergeTrees([tree, this._overrideTree], { overwrite: true });
     }
 
     let packages = this.transpileTree(new Funnel(tree, { srcDir: 'packages' }), isProduction);
@@ -349,8 +310,8 @@ module.exports = {
       targets.length === PRE_BUILT_TARGETS.length &&
       // if node is defined in targets we can't reliably use the prebuilt bundles
       !targetNode &&
-      // if we have a custom override for bootstrapping (e.g. for globals deprecations) we can't use the prebuilt bundles
-      !this._bootstrapMessageOverrideTree
+      // if we have a custom override (e.g. for globals deprecations) we can't use the prebuilt bundles
+      !this._overrideTree
     ) {
       ember = new Funnel(tree, {
         destDir: 'ember',
diff --git a/lib/overrides.js b/lib/overrides.js
new file mode 100644
index 00000000000..9eb67acaf56
--- /dev/null
+++ b/lib/overrides.js
@@ -0,0 +1,411 @@
+const createFile = require('broccoli-file-creator');
+const semver = require('semver');
+const validSemverRange = require('semver/ranges/valid');
+
+const DEFAULT_OPTIONS = Object.freeze({
+  showAllEmberGlobalDeprecations: false,
+  showAllDotAccessDeprecations: false,
+});
+
+function* walkAddonTree(project, pathToAddon = []) {
+  for (let addon of project.addons) {
+    yield [addon, pathToAddon];
+    yield* walkAddonTree(addon, [...pathToAddon, `${addon.name}@${addon.pkg.version}`]);
+  }
+}
+
+function requirementFor(pkg, deps = {}) {
+  return deps[pkg];
+}
+
+const KNWON_DORMANT_ADDONS = Object.freeze([
+  'ember-angle-bracket-invocation-polyfill',
+  'ember-fn-helper-polyfill',
+  'ember-in-element-polyfill',
+  'ember-named-blocks-polyfill',
+  'ember-on-modifier',
+]);
+module.exports = class Overrides {
+  static for(project, env = process.env) {
+    if (env.EMBER_ENV === 'production') {
+      return new Overrides([]);
+    } else {
+      return new Overrides(Overrides.addonsInfoFor(project), {
+        showAllEmberGlobalDeprecations: env.EMBER_GLOBAL_DEPRECATIONS === 'all',
+        showAllDotAccessDeprecations:
+          env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS === 'all',
+      });
+    }
+  }
+
+  static *addonsInfoFor(project) {
+    for (let [addon, pathToAddon] of walkAddonTree(project)) {
+      let version = addon.pkg.version;
+
+      if (addon.name === 'ember-cli-babel' && semver.lt(version, '7.26.6')) {
+        if (addon.parent === project) {
+          let requirement =
+            requirementFor('ember-cli-babel', project.pkg.dependencies) ||
+            requirementFor('ember-cli-babel', project.pkg.devDependencies);
+
+          let validRange = validSemverRange(requirement);
+          let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
+
+          yield {
+            parent: `${project.name()} (your app)`,
+            topLevel: null,
+            version,
+            requirement,
+            compatible,
+            dormant: false,
+            path: [],
+          };
+        } else {
+          let requirement = requirementFor('ember-cli-babel', addon.parent.pkg.dependencies);
+          let validRange = validSemverRange(requirement);
+          let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
+          let dormant =
+            KNWON_DORMANT_ADDONS.includes(addon.parent.name) ||
+            (addon.parent._fileSystemInfo
+              ? addon.parent._fileSystemInfo().hasJSFiles === false
+              : false);
+
+          let topLevelAddon = addon.parent;
+
+          while (topLevelAddon.parent !== project) {
+            topLevelAddon = topLevelAddon.parent;
+          }
+
+          yield {
+            parent: `${addon.parent.name}@${addon.parent.pkg.version}`,
+            topLevel: topLevelAddon.name,
+            version,
+            requirement,
+            compatible,
+            dormant,
+            path: pathToAddon,
+          };
+        }
+      }
+    }
+  }
+
+  static printList(list, indent = '') {
+    let output = '';
+
+    for (let item of list) {
+      if (Array.isArray(item)) {
+        output += `${indent}* ${item[0]}\n`;
+        output += Overrides.printList(item[1], indent + '  ');
+      } else {
+        output += `${indent}* ${item}\n`;
+      }
+    }
+
+    return output;
+  }
+
+  constructor(addonsInfo, options = {}) {
+    let _addonsInfo = [];
+    let projectInfo;
+    let groupedByTopLevel = Object.create(null);
+    let groupedByVersion = Object.create(null);
+
+    for (let info of addonsInfo) {
+      _addonsInfo.push(info);
+
+      if (info.topLevel === null) {
+        projectInfo = info;
+      } else {
+        let topLevel = info.topLevel;
+        let addons = groupedByTopLevel[topLevel] || [];
+        groupedByTopLevel[topLevel] = [...addons, info];
+      }
+
+      let version = info.version;
+
+      let group = groupedByVersion[version] || Object.create(null);
+      groupedByVersion[version] = group;
+
+      let addons = group[info.parent] || [];
+      group[info.parent] = [...addons, info];
+    }
+
+    let dormantTopLevelAddons = [];
+    let compatibleTopLevelAddons = [];
+    let incompatibleTopLevelAddons = [];
+
+    let suggestions = [];
+    let hasActionableSuggestions = false;
+
+    if (_addonsInfo.length > 0) {
+      for (let addon of Object.keys(groupedByTopLevel)) {
+        let group = groupedByTopLevel[addon];
+
+        if (group.every((info) => info.dormant)) {
+          dormantTopLevelAddons.push(addon);
+        } else if (group.every((info) => info.compatible)) {
+          compatibleTopLevelAddons.push(addon);
+        } else {
+          incompatibleTopLevelAddons.push(addon);
+        }
+      }
+
+      if (projectInfo) {
+        suggestions.push('Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.');
+        hasActionableSuggestions = true;
+      } else if (compatibleTopLevelAddons.length > 0) {
+        // Only show the compatible addons if the project itself is up-to-date, because updating the
+        // project's own dependency on ember-cli-babel to latest may also get these addons to use it
+        // as well. Otherwise, there is an unnecessary copy in the tree and it needs to be deduped.
+        suggestions.push(
+          'If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.'
+        );
+
+        suggestions.push('If using npm, run `npm dedupe`.');
+
+        hasActionableSuggestions = true;
+      }
+
+      if (incompatibleTopLevelAddons.length > 0) {
+        suggestions.push([
+          'Upgrade the following addons to the latest version:',
+          incompatibleTopLevelAddons,
+        ]);
+
+        hasActionableSuggestions = true;
+      }
+
+      if (!hasActionableSuggestions) {
+        suggestions.push([
+          'Upgrade the following addons to the latest version, if available:',
+          dormantTopLevelAddons,
+        ]);
+      }
+    }
+
+    this.addonsInfo = _addonsInfo;
+    this.projectInfo = projectInfo;
+    this.groupedByTopLevel = groupedByTopLevel;
+    this.groupedByVersion = groupedByVersion;
+    this.dormantTopLevelAddons = dormantTopLevelAddons;
+    this.compatibleTopLevelAddons = compatibleTopLevelAddons;
+    this.incompatibleTopLevelAddons = incompatibleTopLevelAddons;
+    this.suggestions = suggestions;
+    this.hasActionableSuggestions = hasActionableSuggestions;
+    this.options = { ...DEFAULT_OPTIONS, ...options };
+  }
+
+  get hasOverrides() {
+    return this.addonsInfo.length > 0;
+  }
+
+  get hasBuildTimeWarning() {
+    return this.hasActionableSuggestions;
+  }
+
+  get hasCompatibleAddons() {
+    return this.addonsInfo.some((info) => info.compatible);
+  }
+
+  get hasDormantAddons() {
+    return this.addonsInfo.some((info) => info.dormant);
+  }
+
+  get showAllEmberGlobalDeprecations() {
+    return !this.hasActionableSuggestions || this.options.showAllEmberGlobalDeprecations;
+  }
+
+  get showAllDotAccessDeprecations() {
+    return !this.hasActionableSuggestions || this.options.showAllDotAccessDeprecations;
+  }
+
+  get details() {
+    let details =
+      '\n### Details ###\n\n' +
+      'Prior to v7.26.6, ember-cli-babel sometimes transpiled imports into the equivalent Ember Global API, ' +
+      'potentially triggering this deprecation message indirectly, ' +
+      'even when you did not observe these deprecated usages in your code.\n\n' +
+      'The following outdated versions are found in your project:\n\n' +
+      Overrides.printList(this.outdated);
+
+    if (this.hasDormantAddons) {
+      details +=
+        '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
+        'Therefore, even if they are using an old version ember-cli-babel, they are ' +
+        'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
+    }
+
+    if (this.hasCompatibleAddons) {
+      details += `\nNote: Addons marked as "Compatible" are already compatible with ember-cli-babel@7.26.6. `;
+
+      if (this.projectInfo) {
+        details += 'Try upgrading your `devDependencies` on `ember-cli-babel` to `^7.26.6`.\n';
+      } else {
+        details +=
+          'If using yarn, try running `npx yarn-deduplicate --packages ember-cli-babel` followed by `yarn install`.' +
+          'If using npm, try running `npm dedupe`.\n';
+      }
+    }
+
+    return details;
+  }
+
+  get outdated() {
+    let list = [];
+
+    let groupedByVersion = this.groupedByVersion;
+
+    for (let version of Object.keys(groupedByVersion).sort(semver.compare)) {
+      let addons = [];
+
+      for (let parent of Object.keys(groupedByVersion[version]).sort()) {
+        let info = groupedByVersion[version][parent][0];
+        let addon;
+        let details = [];
+
+        if (info.dormant) {
+          addon = `${parent} (Dormant)`;
+        } else if (info.compatible) {
+          addon = `${parent} (Compatible)`;
+        } else {
+          addon = parent;
+        }
+
+        details.push(`Depends on ember-cli-babel@${info.requirement}`);
+
+        for (let info of groupedByVersion[version][parent]) {
+          let adddedBy = info.path.slice(0, -1);
+
+          if (adddedBy.length) {
+            details.push(`Added by ${adddedBy.join(' > ')}`);
+          }
+        }
+
+        addons.push([addon, details]);
+      }
+
+      list.push([`ember-cli-babel@${version}, currently used by:`, addons]);
+    }
+
+    return list;
+  }
+
+  get globalMessage() {
+    let message =
+      'Usage of the Ember Global is deprecated. ' +
+      'You should import the Ember module or the specific API instead.\n\n' +
+      'See https://deprecations.emberjs.com/v3.x/#toc_ember-global for details.\n\n' +
+      'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
+      'The following steps may help:\n\n' +
+      Overrides.printList(this.suggestions);
+
+    if (!this.showAllEmberGlobalDeprecations) {
+      message +=
+        '\n### Important ###\n\n' +
+        'In order to avoid repeatedly showing the same deprecation messages, ' +
+        'no further deprecation messages will be shown for usages of the Ember Global ' +
+        'until ember-cli-babel is upgraded to v7.26.6 or above.\n\n' +
+        'To see all instances of this deprecation message, ' +
+        'set the `EMBER_GLOBAL_DEPRECATIONS` environment variable to "all", ' +
+        'e.g. `EMBER_GLOBAL_DEPRECATIONS=all ember test`.\n';
+    }
+
+    message += this.details;
+
+    return message;
+  }
+
+  get buildTimeWarning() {
+    if (this.hasBuildTimeWarning) {
+      return `[DEPRECATION] ${this.globalMessage}`;
+    } else {
+      return '';
+    }
+  }
+
+  toTree() {
+    if (this.hasOverrides) {
+      return createFile('packages/@ember/-internals/overrides/index.js', this.toModule());
+    }
+  }
+
+  toModule() {
+    return `
+      export let onEmberGlobalAccess;
+      export let onComputedDotAccess;
+      export let onRunloopDotAccess;
+
+      ${this.toJS()};
+    `;
+  }
+
+  toJS() {
+    return `
+      function once(callback) {
+        let called = false;
+
+        return (...args) => {
+          if (called) {
+            return null;
+          } else {
+            called = true;
+            return callback(...args);
+          }
+        };
+      }
+
+      ${this.onDotAcces}
+
+      onEmberGlobalAccess = ${this.onEmberGlobalAccess};
+      onComputedDotAccess = onDotAccess;
+      onRunloopDotAccess = onDotAccess;
+
+      if (!${this.showAllEmberGlobalDeprecations}) {
+        onEmberGlobalAccess = once(onEmberGlobalAccess);
+      }
+
+      if (!${this.showAllDotAccessDeprecations}) {
+        onComputedDotAccess = once(onComputedDotAccess);
+        onRunloopDotAccess = once(onRunloopDotAccess);
+      }
+    `;
+  }
+
+  get onEmberGlobalAccess() {
+    return `
+      function onEmberGlobalAccess() {
+        return ${JSON.stringify(this.globalMessage)};
+      }
+    `;
+  }
+
+  get onDotAcces() {
+    return `
+      function onDotAccess(dotKey, importKey, module) {
+        let message =
+          'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
+          '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
+          'These usages may be caused by an outdated ember-cli-babel dependency. ' +
+          'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
+          'The following steps may help:\\n\\n' +
+          ${JSON.stringify(Overrides.printList(this.suggestions))};
+
+        if (!${this.showAllDotAccessDeprecations}) {
+          message +=
+            '\\n### Important ###\\n\\n' +
+            'In order to avoid repeatedly showing the same deprecation messages, ' +
+            'no further deprecation messages will be shown for theses deprecated usages ' +
+            'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
+            'To see all instances of this deprecation message, ' +
+            'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
+            'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
+        }
+
+        message += ${JSON.stringify(this.details)};
+
+        return message;
+      }
+    `;
+  }
+};
diff --git a/packages/@ember/-internals/bootstrap/index.js b/packages/@ember/-internals/bootstrap/index.js
deleted file mode 100644
index 60fee640296..00000000000
--- a/packages/@ember/-internals/bootstrap/index.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import require from 'require';
-import { context } from '@ember/-internals/environment';
-import { deprecate } from '@ember/debug';
-import { message, deprecateOnce, setupDotAccess } from './lib/overrides';
-
-setupDotAccess();
-
-(function bootstrap() {
-  let Ember;
-  let disabled = false;
-
-  function defineEmber(key) {
-    Object.defineProperty(context.exports, key, {
-      enumerable: true,
-      configurable: true,
-      get() {
-        if (!Ember) {
-          Ember = require('ember').default;
-        }
-
-        deprecate(message, disabled, {
-          id: 'ember-global',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-        });
-
-        if (deprecateOnce) {
-          disabled = true;
-        }
-
-        return Ember;
-      },
-    });
-  }
-
-  // Bootstrap the global
-  defineEmber('Ember');
-  defineEmber('Em');
-
-  // Bootstrap Node module
-  // eslint-disable-next-line no-undef
-  if (typeof module === 'object' && typeof module.require === 'function') {
-    // eslint-disable-next-line no-undef
-    module.exports = Ember = require('ember').default;
-  }
-})();
diff --git a/packages/@ember/-internals/bootstrap/index.ts b/packages/@ember/-internals/bootstrap/index.ts
new file mode 100644
index 00000000000..022ef158407
--- /dev/null
+++ b/packages/@ember/-internals/bootstrap/index.ts
@@ -0,0 +1,64 @@
+import { context } from '@ember/-internals/environment';
+import { onEmberGlobalAccess } from '@ember/-internals/overrides';
+import { deprecate } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import require from 'require';
+
+(function bootstrap() {
+  let Ember: unknown;
+
+  let get = () => {
+    if (!Ember) {
+      // tslint:disable-next-line: no-require-imports
+      Ember = require('ember').default;
+    }
+
+    return Ember;
+  };
+
+  if (DEBUG) {
+    let defaultHandler = () => {
+      return 'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.';
+    };
+
+    let handler = onEmberGlobalAccess || defaultHandler;
+    let _get = get;
+
+    get = () => {
+      let message = handler();
+
+      if (message !== null) {
+        deprecate(message, false, {
+          id: 'ember-global',
+          until: '4.0.0',
+          url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global',
+          for: 'ember-source',
+          since: {
+            enabled: '3.27.0',
+          },
+        });
+      }
+
+      return _get();
+    };
+  }
+
+  function defineEmber(key: string) {
+    Object.defineProperty(context.exports, key, {
+      enumerable: true,
+      configurable: true,
+      get,
+    });
+  }
+
+  // Bootstrap the global
+  defineEmber('Ember');
+  defineEmber('Em');
+
+  // Bootstrap Node module
+  // eslint-disable-next-line no-undef
+  if (typeof module === 'object' && typeof module.require === 'function') {
+    // tslint:disable-next-line: no-require-imports
+    module.exports = Ember = require('ember').default;
+  }
+})();
diff --git a/packages/@ember/-internals/bootstrap/lib/overrides.js b/packages/@ember/-internals/bootstrap/lib/overrides.js
deleted file mode 100644
index 38af9cd1cc1..00000000000
--- a/packages/@ember/-internals/bootstrap/lib/overrides.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// these are default values that are overriden in some cases by the ember-addon entry point code
-// in lib/index.js (see `included` and `buildEmberBundles` methods there for more context)
-
-export const message =
-  'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.';
-
-export const deprecateOnce = false;
-
-export function setupDotAccess() {}
diff --git a/packages/@ember/-internals/overrides/index.d.ts b/packages/@ember/-internals/overrides/index.d.ts
new file mode 100644
index 00000000000..e52fbb81445
--- /dev/null
+++ b/packages/@ember/-internals/overrides/index.d.ts
@@ -0,0 +1,12 @@
+type Callback<TArgs extends unknown[], TReturn> = (...args: TArgs) => TReturn;
+
+/**
+ * Returns a deprecation message or null to skip the deprecation.
+ */
+type Handler<TArgs extends unknown[]> = Callback<TArgs, string | null>;
+type GlobalAccessHandler = Handler<[]>;
+type DotAccessHandler = Handler<[dotKey: string, importKey: string, module: string]>;
+
+export let onEmberGlobalAccess: GlobalAccessHandler | undefined;
+export let onComputedDotAccess: DotAccessHandler | undefined;
+export let onRunloopDotAccess: DotAccessHandler | undefined;
diff --git a/packages/@ember/-internals/overrides/index.js b/packages/@ember/-internals/overrides/index.js
new file mode 100644
index 00000000000..35b83669272
--- /dev/null
+++ b/packages/@ember/-internals/overrides/index.js
@@ -0,0 +1,3 @@
+export let onEmberGlobalAccess;
+export let onComputedDotAccess;
+export let onRunloopDotAccess;
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index af4dd9d5735..d6ae7fbbf84 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -2,6 +2,7 @@ import { DEBUG } from '@glimmer/env';
 import { assert, deprecate } from '@ember/debug';
 import { assign } from '@ember/polyfills';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
+import { onComputedDotAccess } from '@ember/-internals/overrides';
 
 export { Object as default } from '@ember/-internals/runtime';
 
@@ -55,22 +56,18 @@ import {
   uniq,
 } from '@ember/object/computed';
 
-export let _onDotAccess;
-
 // eslint-disable-next-line no-undef
 if (DEBUG) {
-  let _callback = (dotKey, importKey, module) => {
+  let defaultHandler = (dotKey, importKey, module) => {
     return `Using \`${dotKey}\` has been deprecated. Instead, import the value directly from ${module}:\n\n  import { ${importKey} } from '${module}';`;
   };
 
-  _onDotAccess = (callback) => {
-    _callback = callback;
-  };
+  let handler = onComputedDotAccess || defaultHandler;
 
   let defineDeprecatedComputedFunc = (key, func) => {
     Object.defineProperty(computed, key, {
       get() {
-        let message = _callback(`computed.${key}`, key, '@ember/object/computed');
+        let message = handler(`computed.${key}`, key, '@ember/object/computed');
 
         deprecate(message, message === null, {
           id: 'deprecated-run-loop-and-computed-dot-access',
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index 6ce847c96db..c78ceaa48a5 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -2,6 +2,7 @@ import { DEBUG } from '@glimmer/env';
 import { assert, deprecate } from '@ember/debug';
 import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
+import { onRunloopDotAccess } from '@ember/-internals/overrides';
 import Backburner from 'backburner';
 
 let currentRunLoop = null;
@@ -743,22 +744,18 @@ export function throttle() {
 
 export let _deprecatedGlobalGetCurrentRunLoop;
 
-export let _onDotAccess;
-
 // eslint-disable-next-line no-undef
 if (DEBUG) {
-  let _callback = (dotKey, importKey, module) => {
+  let defaultHandler = (dotKey, importKey, module) => {
     return `Using \`${dotKey}\` has been deprecated. Instead, import the value directly from ${module}:\n\n  import { ${importKey} } from '${module}';`;
   };
 
-  _onDotAccess = (callback) => {
-    _callback = callback;
-  };
+  let handler = onRunloopDotAccess || defaultHandler;
 
   let defineDeprecatedRunloopFunc = (key, func) => {
     Object.defineProperty(run, key, {
       get() {
-        let message = _callback(`run.${key}`, key, '@ember/runloop');
+        let message = handler(`run.${key}`, key, '@ember/runloop');
 
         deprecate(message, message === null, {
           id: 'deprecated-run-loop-and-computed-dot-access',
@@ -775,7 +772,7 @@ if (DEBUG) {
   };
 
   _deprecatedGlobalGetCurrentRunLoop = () => {
-    let message = _callback('run.currentRunLoop', 'getCurrentRunLoop', '@ember/runloop');
+    let message = handler('run.currentRunLoop', 'getCurrentRunLoop', '@ember/runloop');
 
     deprecate(message, message === null, {
       id: 'deprecated-run-loop-and-computed-dot-access',
diff --git a/tests/node/fixtures/project.js b/tests/node/fixtures/project.js
new file mode 100644
index 00000000000..bcc867af91c
--- /dev/null
+++ b/tests/node/fixtures/project.js
@@ -0,0 +1,148 @@
+module.exports = class Project {
+  static withDep(depOptions = {}, projectOptions = {}) {
+    let addons = projectOptions.addons || [];
+
+    return new Project({
+      ...projectOptions,
+      addons: [...addons, new Addon(depOptions)],
+    });
+  }
+
+  static withTransientDep(transientDepOptions = {}, depOptions = {}, projectOptions = {}) {
+    let addons = depOptions.addons || [];
+
+    return Project.withDep(
+      {
+        ...depOptions,
+        addons: [
+          ...addons,
+          new Addon({
+            name: 'my-nested-addon',
+            version: '0.1.0',
+            ...transientDepOptions,
+          }),
+        ],
+      },
+      projectOptions
+    );
+  }
+
+  constructor({
+    name = 'my-app',
+    emberCliBabel,
+    dependencies = {},
+    devDependencies = {},
+    addons = [],
+  } = {}) {
+    this.name = () => name;
+    this.parent = null;
+    this.pkg = {
+      name,
+      dependencies: { ...dependencies },
+      devDependencies: { ...devDependencies },
+    };
+    this.addons = [...addons];
+
+    if (typeof emberCliBabel === 'string') {
+      this.pkg.devDependencies['ember-cli-babel'] = emberCliBabel;
+    }
+
+    reifyAddons(this);
+    addMissingAddons(this, this.pkg.devDependencies);
+    addMissingAddons(this, this.pkg.dependencies);
+    addMissingDeps(this, true);
+  }
+};
+
+class Addon {
+  constructor({
+    parent,
+    name = 'my-addon',
+    version = '1.0.0',
+    emberCliBabel,
+    dependencies = {},
+    addons = [],
+    hasJSFiles = name !== 'ember-cli-babel',
+  } = {}) {
+    this.parent = parent;
+    this.name = name;
+    this.pkg = {
+      name,
+      version,
+      dependencies: { ...dependencies },
+      devDependencies: {},
+    };
+    this.addons = [...addons];
+    this._fileSystemInfo = () => ({ hasJSFiles });
+
+    if (typeof emberCliBabel === 'string') {
+      this.pkg.dependencies['ember-cli-babel'] = emberCliBabel;
+    }
+
+    reifyAddons(this);
+    addMissingAddons(this, this.pkg.dependencies);
+    addMissingDeps(this);
+  }
+}
+
+// Can only handle the few hardcoded cases
+function resolve(requirement) {
+  if (requirement.startsWith('link:')) {
+    // Expecting something like "link:1.2.3"
+    return requirement.slice(5);
+  } else {
+    // Only handles "^1.0.0" -> "1.0.0", doesn't work for the general case
+    return requirement.slice(1);
+  }
+}
+
+function reifyAddons(parent) {
+  parent.addons = parent.addons.map((addon) => {
+    if (addon instanceof Addon) {
+      addon.parent = parent;
+      return addon;
+    } else {
+      let version = addon.version;
+
+      if (!version) {
+        if (parent.pkg.devDependencies[addon.name]) {
+          version = resolve(parent.pkg.devDependencies[addon.name]);
+        } else if (parent.pkg.dependencies[addon.name]) {
+          version = resolve(parent.pkg.dependencies[addon.name]);
+        }
+      }
+
+      return new Addon({ ...addon, parent, version });
+    }
+  });
+}
+
+function addMissingAddons(parent, deps) {
+  for (let [name, requirement] of Object.entries(deps)) {
+    if (!parent.addons.find((addon) => addon.name === name)) {
+      parent.addons.push(
+        new Addon({
+          parent,
+          name,
+          version: resolve(requirement),
+        })
+      );
+    }
+  }
+}
+
+function addMissingDeps(parent, devDeps = false) {
+  for (let addon of parent.addons) {
+    let target = parent.pkg.dependencies;
+    let isMissing = !(addon.name in target);
+
+    if (devDeps) {
+      target = parent.pkg.devDependencies;
+      isMissing = isMissing && !(addon.name in target);
+    }
+
+    if (isMissing) {
+      target[addon.name] = `^${addon.pkg.version}`;
+    }
+  }
+}
diff --git a/tests/node/global-deprecation-info-test.js b/tests/node/global-deprecation-info-test.js
deleted file mode 100644
index 2cea2139518..00000000000
--- a/tests/node/global-deprecation-info-test.js
+++ /dev/null
@@ -1,207 +0,0 @@
-'use strict';
-
-const globalDeprecationInfo = require('../../lib/global-deprecation-utils');
-
-QUnit.module('globalDeprecationInfo', function (hooks) {
-  let project, env;
-
-  function buildBabel(parent, version) {
-    return {
-      name: 'ember-cli-babel',
-      parent,
-      pkg: {
-        version,
-      },
-      addons: [],
-    };
-  }
-
-  hooks.beforeEach(function () {
-    project = {
-      name() {
-        return 'fake-project';
-      },
-      pkg: {
-        dependencies: {},
-        devDependencies: {},
-      },
-      addons: [],
-    };
-    env = Object.create(null);
-  });
-
-  hooks.afterEach(function () {});
-
-  QUnit.test('when in production, does nothing', function (assert) {
-    env.EMBER_ENV = 'production';
-
-    let result = globalDeprecationInfo(project, env);
-
-    assert.deepEqual(result, {
-      globalMessage: '',
-      hasActionableSuggestions: false,
-      shouldIssueSingleDeprecation: false,
-      bootstrap: `require('@ember/-internals/bootstrap').default()`,
-    });
-  });
-
-  QUnit.test('without addons, does nothing', function (assert) {
-    project.addons = [];
-    let result = globalDeprecationInfo(project, env);
-
-    assert.deepEqual(result, {
-      globalMessage: '',
-      hasActionableSuggestions: false,
-      shouldIssueSingleDeprecation: false,
-      bootstrap: `require('@ember/-internals/bootstrap').default()`,
-    });
-  });
-
-  QUnit.test('projects own ember-cli-babel is too old', function (assert) {
-    project.pkg.devDependencies = {
-      'ember-cli-babel': '^7.26.0',
-    };
-
-    project.addons.push({
-      name: 'ember-cli-babel',
-      parent: project,
-      pkg: {
-        version: '7.26.5',
-      },
-      addons: [],
-    });
-
-    let result = globalDeprecationInfo(project, env);
-    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
-    assert.strictEqual(result.hasActionableSuggestions, true);
-    assert.ok(
-      result.globalMessage.includes(
-        '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
-      )
-    );
-  });
-
-  QUnit.test('projects has ember-cli-babel in dependencies', function (assert) {
-    project.pkg.dependencies = {
-      'ember-cli-babel': '^7.25.0',
-    };
-
-    project.addons.push({
-      name: 'ember-cli-babel',
-      parent: project,
-      pkg: {
-        version: '7.26.5',
-      },
-      addons: [],
-    });
-
-    let result = globalDeprecationInfo(project, env);
-    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
-    assert.strictEqual(result.hasActionableSuggestions, true);
-    assert.ok(
-      result.globalMessage.includes(
-        '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
-      )
-    );
-  });
-  QUnit.test(
-    'projects has no devDependencies, but old ember-cli-babel found in addons array',
-    function (assert) {
-      project.pkg.devDependencies = {};
-
-      project.addons.push({
-        name: 'ember-cli-babel',
-        parent: project,
-        pkg: {
-          version: '7.26.5',
-        },
-        addons: [],
-      });
-
-      let result = globalDeprecationInfo(project, env);
-      assert.strictEqual(result.shouldIssueSingleDeprecation, true);
-      assert.strictEqual(result.hasActionableSuggestions, true);
-      assert.ok(
-        result.globalMessage.includes(
-          '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
-        )
-      );
-    }
-  );
-
-  QUnit.test('projects uses linked ember-cli-babel', function (assert) {
-    project.pkg.devDependencies = {
-      'ember-cli-babel': 'link:./some/path/here',
-    };
-
-    let otherAddon = {
-      name: 'other-thing-here',
-      parent: project,
-      pkg: {},
-      addons: [],
-    };
-
-    otherAddon.addons.push(buildBabel(otherAddon, '7.26.5'));
-    project.addons.push(buildBabel(project, '7.26.6'), otherAddon);
-
-    let result = globalDeprecationInfo(project, env);
-    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
-    assert.strictEqual(result.hasActionableSuggestions, true);
-
-    assert.ok(
-      result.globalMessage.includes(
-        '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel`'
-      )
-    );
-    assert.ok(result.globalMessage.includes('* If using npm, run `npm dedupe`'));
-  });
-
-  QUnit.test('projects own ember-cli-babel is up to date', function (assert) {
-    project.pkg.devDependencies = {
-      'ember-cli-babel': '^7.26.0',
-    };
-
-    project.addons.push({
-      name: 'ember-cli-babel',
-      parent: project,
-      pkg: {
-        version: '7.26.6',
-      },
-      addons: [],
-    });
-
-    let result = globalDeprecationInfo(project, env);
-    assert.strictEqual(result.shouldIssueSingleDeprecation, false);
-    assert.strictEqual(result.hasActionableSuggestions, false);
-    assert.notOk(
-      result.globalMessage.includes(
-        '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
-      )
-    );
-  });
-
-  QUnit.test('transient babel that is out of date', function (assert) {
-    project.pkg.devDependencies = {
-      'ember-cli-babel': '^7.26.0',
-    };
-
-    let otherAddon = {
-      name: 'other-thing-here',
-      parent: project,
-      pkg: {
-        dependencies: {
-          'ember-cli-babel': '^7.25.0',
-        },
-      },
-      addons: [],
-    };
-
-    otherAddon.addons.push(buildBabel(otherAddon, '7.26.5'));
-    project.addons.push(buildBabel(project, '7.26.6'), otherAddon);
-
-    let result = globalDeprecationInfo(project, env);
-    assert.strictEqual(result.shouldIssueSingleDeprecation, true);
-    assert.strictEqual(result.hasActionableSuggestions, true);
-    assert.ok(result.globalMessage.includes('* other-thing-here@7.26.5 (Compatible)'));
-  });
-});
diff --git a/tests/node/overrides-test.js b/tests/node/overrides-test.js
new file mode 100644
index 00000000000..90dc4aebe4e
--- /dev/null
+++ b/tests/node/overrides-test.js
@@ -0,0 +1,869 @@
+'use strict';
+
+const Project = require('./fixtures/project');
+const Overrides = require('../../lib/overrides');
+
+function cmp(a, b) {
+  if (a == undefined || a < b) {
+    return -1;
+  } else if (b == undefined || a > b) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+function addonsInfoFor(project) {
+  if (!(project instanceof Project)) {
+    project = new Project(project);
+  }
+
+  let addonsInfo = [...Overrides.addonsInfoFor(project)];
+
+  addonsInfo.sort((a, b) => cmp(a.topLevel, b.topLevel) || cmp(a.parent, b.parent));
+
+  return addonsInfo;
+}
+
+function fullExample() {
+  return {
+    name: 'direwolf',
+    devDependencies: {
+      'active-model-adapter': '^2.2.0',
+      'ember-animated': '^0.11.0',
+      'ember-cli-babel': '^7.26.3',
+      'ember-fetch': '^8.0.5',
+      'ember-source': 'link:3.27.3',
+    },
+    addons: [
+      {
+        name: 'active-model-adapter',
+        dependencies: {
+          'ember-cli-babel': '^6.18.0',
+        },
+      },
+      {
+        name: 'ember-animated',
+        dependencies: {
+          'ember-angle-bracket-invocation-polyfill': '^2.0.0',
+          'ember-cli-babel': '^7.26.3',
+        },
+        addons: [
+          {
+            name: 'ember-angle-bracket-invocation-polyfill',
+            dependencies: {
+              'ember-cli-babel': '^6.16.0',
+            },
+            addons: [
+              {
+                name: 'ember-cli-babel',
+                version: '6.18.0',
+              },
+            ],
+          },
+          {
+            name: 'ember-cli-babel',
+            version: '7.26.5',
+          },
+        ],
+      },
+      {
+        name: 'ember-cli-babel',
+        version: '7.26.5',
+      },
+      {
+        name: 'ember-fetch',
+        hasJSFiles: false,
+        dependencies: {
+          'ember-cli-babel': '^7.26.0',
+        },
+      },
+      {
+        name: 'ember-source',
+        dependencies: {
+          'ember-cli-babel': '^7.26.6',
+        },
+      },
+    ],
+  };
+}
+
+function infoForApp({
+  name = 'direwolf',
+  version = '7.26.6',
+  requirement = `^${version}`,
+  compatible = requirement.startsWith('^7'),
+} = {}) {
+  return {
+    parent: `${name} (your app)`,
+    topLevel: null,
+    version,
+    requirement,
+    compatible,
+    dormant: false,
+    path: [],
+  };
+}
+
+// function info({
+//   parent,
+//   topLevel = parent,
+//   version = '7.26.6',
+//   requirement = `^${version}`,
+//   compatible = requirement.startsWith('^7'),
+//   dormant = false,
+//   path = [`${parent}@${version}`],
+// } = {}) {
+//   return {
+//     parent,
+//     topLevel,
+//     version,
+//     requirement,
+//     compatible,
+//     dormant,
+//     path,
+//   };
+// }
+
+function evalJS(overrides) {
+  return eval(`
+    (function () {
+      let onEmberGlobalAccess, onComputedDotAccess, onRunloopDotAccess;
+
+      ${overrides.toJS()}
+
+      return {
+        onEmberGlobalAccess: onEmberGlobalAccess,
+        onComputedDotAccess: onComputedDotAccess,
+        onRunloopDotAccess: onRunloopDotAccess,
+      };
+    })()
+  `);
+}
+
+QUnit.module('Overrides', function () {
+  QUnit.module('.addonsInfoFor', function () {
+    // app
+
+    QUnit.test('it returns old babel added by app', function (assert) {
+      assert.deepEqual(addonsInfoFor({ emberCliBabel: '^6.0.0' }), [
+        {
+          parent: 'my-app (your app)',
+          topLevel: null,
+          version: '6.0.0',
+          requirement: '^6.0.0',
+          compatible: false,
+          dormant: false,
+          path: [],
+        },
+      ]);
+    });
+
+    QUnit.test('it returns old but compatible babel added by app', function (assert) {
+      assert.deepEqual(addonsInfoFor({ emberCliBabel: '^7.0.0' }), [
+        {
+          parent: 'my-app (your app)',
+          topLevel: null,
+          version: '7.0.0',
+          requirement: '^7.0.0',
+          compatible: true,
+          dormant: false,
+          path: [],
+        },
+      ]);
+    });
+
+    QUnit.test('it does not return new babel added by app', function (assert) {
+      assert.deepEqual(addonsInfoFor({ emberCliBabel: '^7.26.6' }), []);
+    });
+
+    // direct dependency
+
+    QUnit.test('it returns old babel added by a dependency', function (assert) {
+      assert.deepEqual(addonsInfoFor(Project.withDep({ emberCliBabel: '^6.0.0' })), [
+        {
+          parent: 'my-addon@1.0.0',
+          topLevel: 'my-addon',
+          version: '6.0.0',
+          requirement: '^6.0.0',
+          compatible: false,
+          dormant: false,
+          path: ['my-addon@1.0.0'],
+        },
+      ]);
+    });
+
+    QUnit.test('it returns old but compatible babel added by a dependency', function (assert) {
+      assert.deepEqual(addonsInfoFor(Project.withDep({ emberCliBabel: '^7.0.0' })), [
+        {
+          parent: 'my-addon@1.0.0',
+          topLevel: 'my-addon',
+          version: '7.0.0',
+          requirement: '^7.0.0',
+          compatible: true,
+          dormant: false,
+          path: ['my-addon@1.0.0'],
+        },
+      ]);
+    });
+
+    QUnit.test('it does not return new babel added by a dependency', function (assert) {
+      assert.deepEqual(addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6' })), []);
+    });
+
+    // direct dependency (dormant)
+
+    QUnit.test('it returns old babel added by a dormant dependency', function (assert) {
+      assert.deepEqual(
+        addonsInfoFor(Project.withDep({ emberCliBabel: '^6.0.0', hasJSFiles: false })),
+        [
+          {
+            parent: 'my-addon@1.0.0',
+            topLevel: 'my-addon',
+            version: '6.0.0',
+            requirement: '^6.0.0',
+            compatible: false,
+            dormant: true,
+            path: ['my-addon@1.0.0'],
+          },
+        ]
+      );
+    });
+
+    QUnit.test('it returns old but compatible babel added by a dormant dependency', function (
+      assert
+    ) {
+      assert.deepEqual(
+        addonsInfoFor(Project.withDep({ emberCliBabel: '^7.0.0', hasJSFiles: false })),
+        [
+          {
+            parent: 'my-addon@1.0.0',
+            topLevel: 'my-addon',
+            version: '7.0.0',
+            requirement: '^7.0.0',
+            compatible: true,
+            dormant: true,
+            path: ['my-addon@1.0.0'],
+          },
+        ]
+      );
+    });
+
+    QUnit.test('it does not return new babel added by a dormant dependency', function (assert) {
+      assert.deepEqual(
+        addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6', hasJSFiles: false })),
+        []
+      );
+    });
+
+    // transient dep
+
+    QUnit.test('it returns old babel added by a transient dependency', function (assert) {
+      assert.deepEqual(addonsInfoFor(Project.withTransientDep({ emberCliBabel: '^6.0.0' })), [
+        {
+          parent: 'my-nested-addon@0.1.0',
+          topLevel: 'my-addon',
+          version: '6.0.0',
+          requirement: '^6.0.0',
+          compatible: false,
+          dormant: false,
+          path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+        },
+      ]);
+    });
+
+    QUnit.test('it returns old but compatible babel added by a transient dependency', function (
+      assert
+    ) {
+      assert.deepEqual(addonsInfoFor(Project.withTransientDep({ emberCliBabel: '^7.0.0' })), [
+        {
+          parent: 'my-nested-addon@0.1.0',
+          topLevel: 'my-addon',
+          version: '7.0.0',
+          requirement: '^7.0.0',
+          compatible: true,
+          dormant: false,
+          path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+        },
+      ]);
+    });
+
+    QUnit.test('it does not return new babel added by a transient dependency', function (assert) {
+      assert.deepEqual(addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6' })), []);
+    });
+
+    // dormant transient dep
+
+    QUnit.test('it returns old babel added by a dormant transient dependency', function (assert) {
+      assert.deepEqual(
+        addonsInfoFor(Project.withTransientDep({ emberCliBabel: '^6.0.0', hasJSFiles: false })),
+        [
+          {
+            parent: 'my-nested-addon@0.1.0',
+            topLevel: 'my-addon',
+            version: '6.0.0',
+            requirement: '^6.0.0',
+            compatible: false,
+            dormant: true,
+            path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+          },
+        ]
+      );
+    });
+
+    QUnit.test(
+      'it returns old but compatible babel added by a dormant transient dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(Project.withTransientDep({ emberCliBabel: '^7.0.0', hasJSFiles: false })),
+          [
+            {
+              parent: 'my-nested-addon@0.1.0',
+              topLevel: 'my-addon',
+              version: '7.0.0',
+              requirement: '^7.0.0',
+              compatible: true,
+              dormant: true,
+              path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+            },
+          ]
+        );
+      }
+    );
+
+    QUnit.test('it does not return new babel added by a dormant transient dependency', function (
+      assert
+    ) {
+      assert.deepEqual(
+        addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6', hasJSFiles: false })),
+        []
+      );
+    });
+
+    // transient dep through a dormant dep
+
+    QUnit.test(
+      'it returns old babel added by a transient dependency through a dormant dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(
+            Project.withTransientDep({ emberCliBabel: '^6.0.0' }, { hasJSFiles: false })
+          ),
+          [
+            {
+              parent: 'my-nested-addon@0.1.0',
+              topLevel: 'my-addon',
+              version: '6.0.0',
+              requirement: '^6.0.0',
+              compatible: false,
+              dormant: false,
+              path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+            },
+          ]
+        );
+      }
+    );
+
+    QUnit.test(
+      'it returns old but compatible babel added by a transient dependency through a dormant dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(
+            Project.withTransientDep({ emberCliBabel: '^7.0.0' }, { hasJSFiles: false })
+          ),
+          [
+            {
+              parent: 'my-nested-addon@0.1.0',
+              topLevel: 'my-addon',
+              version: '7.0.0',
+              requirement: '^7.0.0',
+              compatible: true,
+              dormant: false,
+              path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+            },
+          ]
+        );
+      }
+    );
+
+    QUnit.test(
+      'it does not return new babel added by a transient dependency through a dormant dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6' }, { hasJSFiles: false })),
+          []
+        );
+      }
+    );
+
+    // linked dep
+
+    QUnit.test('it returns old babel added by a linked dependency', function (assert) {
+      assert.deepEqual(
+        addonsInfoFor(
+          new Project({
+            devDependencies: {
+              'ember-source': 'link:3.27.3',
+            },
+            addons: [
+              {
+                name: 'ember-source',
+                emberCliBabel: '^6.0.0',
+              },
+            ],
+          })
+        ),
+        [
+          {
+            parent: 'ember-source@3.27.3',
+            topLevel: 'ember-source',
+            version: '6.0.0',
+            requirement: '^6.0.0',
+            compatible: false,
+            dormant: false,
+            path: ['ember-source@3.27.3'],
+          },
+        ]
+      );
+    });
+
+    QUnit.test('it returns old but compatible babel added by a linked dependency', function (
+      assert
+    ) {
+      assert.deepEqual(
+        addonsInfoFor(
+          new Project({
+            devDependencies: {
+              'ember-source': 'link:3.27.3',
+            },
+            addons: [
+              {
+                name: 'ember-source',
+                emberCliBabel: '^7.0.0',
+              },
+            ],
+          })
+        ),
+        [
+          {
+            parent: 'ember-source@3.27.3',
+            topLevel: 'ember-source',
+            version: '7.0.0',
+            requirement: '^7.0.0',
+            compatible: true,
+            dormant: false,
+            path: ['ember-source@3.27.3'],
+          },
+        ]
+      );
+    });
+
+    QUnit.test('it does not return new babel added by a linked dependency', function (assert) {
+      assert.deepEqual(
+        addonsInfoFor(
+          new Project({
+            devDependencies: {
+              'ember-source': 'link:3.27.3',
+            },
+            addons: [
+              {
+                name: 'ember-source',
+                emberCliBabel: '^7.26.6',
+              },
+            ],
+          })
+        ),
+        []
+      );
+    });
+
+    // full example
+
+    QUnit.test('full example', function (assert) {
+      let project = new Project(fullExample());
+
+      assert.deepEqual(addonsInfoFor(project), [
+        {
+          parent: 'direwolf (your app)',
+          topLevel: null,
+          version: '7.26.5',
+          requirement: '^7.26.3',
+          compatible: true,
+          dormant: false,
+          path: [],
+        },
+        {
+          parent: 'active-model-adapter@2.2.0',
+          topLevel: 'active-model-adapter',
+          version: '6.18.0',
+          requirement: '^6.18.0',
+          compatible: false,
+          dormant: false,
+          path: ['active-model-adapter@2.2.0'],
+        },
+        {
+          parent: 'ember-angle-bracket-invocation-polyfill@2.0.0',
+          topLevel: 'ember-animated',
+          version: '6.18.0',
+          requirement: '^6.16.0',
+          compatible: false,
+          dormant: true,
+          path: ['ember-animated@0.11.0', 'ember-angle-bracket-invocation-polyfill@2.0.0'],
+        },
+        {
+          parent: 'ember-animated@0.11.0',
+          topLevel: 'ember-animated',
+          version: '7.26.5',
+          requirement: '^7.26.3',
+          compatible: true,
+          dormant: false,
+          path: ['ember-animated@0.11.0'],
+        },
+        {
+          parent: 'ember-fetch@8.0.5',
+          topLevel: 'ember-fetch',
+          version: '7.26.0',
+          requirement: '^7.26.0',
+          compatible: true,
+          dormant: true,
+          path: ['ember-fetch@8.0.5'],
+        },
+      ]);
+    });
+  });
+
+  QUnit.module('.printList', function () {
+    QUnit.test('it can print a flat list', function (assert) {
+      assert.equal(
+        Overrides.printList(['first', 'second', 'third'], '        '),
+        `\
+        * first
+        * second
+        * third
+`
+      );
+    });
+
+    QUnit.test('it can print a nested list', function (assert) {
+      assert.equal(
+        Overrides.printList(
+          [
+            'first',
+            [
+              'second',
+              ['second.1', ['second.2', ['second.2.1', 'second.2.2', 'second.2.3']], 'second.3'],
+            ],
+            'third',
+          ],
+          '        '
+        ),
+        `\
+        * first
+        * second
+          * second.1
+          * second.2
+            * second.2.1
+            * second.2.2
+            * second.2.3
+          * second.3
+        * third
+`
+      );
+    });
+  });
+
+  QUnit.test('it does nothing when in production', function (assert) {
+    let project = new Project(fullExample());
+    let overrides = Overrides.for(project, { EMBER_ENV: 'production' });
+
+    assert.strictEqual(overrides.hasOverrides, false, 'hasOverrides');
+    assert.strictEqual(overrides.hasBuildTimeWarning, false, 'hasBuildTimeWarning');
+  });
+
+  QUnit.test('it does nothing when everything is on new babel', function (assert) {
+    let overrides = new Overrides([]);
+
+    assert.strictEqual(overrides.hasOverrides, false, 'hasOverrides');
+    assert.strictEqual(overrides.hasBuildTimeWarning, false, 'hasBuildTimeWarning');
+  });
+
+  QUnit.test('when app is on old babel', function (assert) {
+    let overrides = new Overrides([infoForApp({ version: '6.0.0' })]);
+
+    assert.strictEqual(overrides.hasOverrides, true, 'hasOverrides');
+    assert.strictEqual(overrides.hasBuildTimeWarning, true, 'hasBuildTimeWarning');
+    assert.strictEqual(overrides.hasActionableSuggestions, true, 'hasActionableSuggestions');
+    assert.strictEqual(overrides.hasCompatibleAddons, false, 'hasCompatibleAddons');
+    assert.strictEqual(overrides.hasDormantAddons, false, 'hasDormantAddons');
+    assert.strictEqual(
+      overrides.showAllEmberGlobalDeprecations,
+      false,
+      'showAllEmberGlobalDeprecations'
+    );
+    assert.strictEqual(
+      overrides.showAllDotAccessDeprecations,
+      false,
+      'showAllDotAccessDeprecations'
+    );
+    assert.deepEqual(overrides.suggestions, [
+      'Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.',
+    ]);
+    assert.equal(
+      overrides.outdated.length,
+      1 /* number of different old babel versions */,
+      'outdated.length'
+    );
+    assert.ok(
+      overrides.buildTimeWarning.startsWith(
+        '[DEPRECATION] Usage of the Ember Global is deprecated.'
+      ),
+      'overrides.buildTimeWarning'
+    );
+    assert.ok(
+      overrides.globalMessage.startsWith('Usage of the Ember Global is deprecated.'),
+      'overrides.globalMessage'
+    );
+
+    let { onEmberGlobalAccess, onComputedDotAccess, onRunloopDotAccess } = evalJS(overrides);
+
+    assert.equal(
+      onEmberGlobalAccess(),
+      overrides.globalMessage,
+      'onEmberGlobalAccess() (first call)'
+    );
+
+    assert.strictEqual(onEmberGlobalAccess(), null, 'onEmberGlobalAccess() (second call)');
+
+    assert.ok(
+      onComputedDotAccess('computed.reads', 'reads', '@ember/object/computed').startsWith(
+        'Using `computed.reads` has been deprecated. ' +
+          'Instead, import the value directly from @ember/object/computed:\n\n' +
+          "  import { reads } from '@ember/object/computed';\n\n"
+      ),
+      'onComputedDotAccess() (first call)'
+    );
+
+    assert.strictEqual(
+      onComputedDotAccess('computed.reads', 'reads', '@ember/object/computed'),
+      null,
+      'onComputedDotAccess() (second call)'
+    );
+
+    assert.ok(
+      onRunloopDotAccess('run.next', 'next', '@ember/runloop').startsWith(
+        'Using `run.next` has been deprecated. ' +
+          'Instead, import the value directly from @ember/runloop:\n\n' +
+          "  import { next } from '@ember/runloop';\n\n"
+      ),
+      'onRunloopDotAccess() (first call)'
+    );
+
+    assert.strictEqual(
+      onRunloopDotAccess('run.next', 'next', '@ember/runloop'),
+      null,
+      'onRunloopDotAccess() (second call)'
+    );
+  });
+
+  // let project, env;
+
+  // function buildBabel(parent, version) {
+  //   return {
+  //     name: 'ember-cli-babel',
+  //     parent,
+  //     pkg: {
+  //       version,
+  //     },
+  //     addons: [],
+  //   };
+  // }
+
+  // hooks.beforeEach(function () {
+  //   project = {
+  //     name() {
+  //       return 'fake-project';
+  //     },
+  //     pkg: {
+  //       dependencies: {},
+  //       devDependencies: {},
+  //     },
+  //     addons: [],
+  //   };
+  //   env = Object.create(null);
+  // });
+
+  // hooks.afterEach(function () {});
+
+  // QUnit.test('when in production, does nothing', function (assert) {
+  //   env.EMBER_ENV = 'production';
+
+  //   let result = globalDeprecationInfo(project, env);
+
+  //   assert.deepEqual(result, {
+  //     globalMessage: '',
+  //     hasActionableSuggestions: false,
+  //     shouldIssueSingleDeprecation: false,
+  //     bootstrap: `require('@ember/-internals/bootstrap').default()`,
+  //   });
+  // });
+
+  // QUnit.test('without addons, does nothing', function (assert) {
+  //   project.addons = [];
+  //   let result = globalDeprecationInfo(project, env);
+
+  //   assert.deepEqual(result, {
+  //     globalMessage: '',
+  //     hasActionableSuggestions: false,
+  //     shouldIssueSingleDeprecation: false,
+  //     bootstrap: `require('@ember/-internals/bootstrap').default()`,
+  //   });
+  // });
+
+  // QUnit.test('projects own ember-cli-babel is too old', function (assert) {
+  //   project.pkg.devDependencies = {
+  //     'ember-cli-babel': '^7.26.0',
+  //   };
+
+  //   project.addons.push({
+  //     name: 'ember-cli-babel',
+  //     parent: project,
+  //     pkg: {
+  //       version: '7.26.5',
+  //     },
+  //     addons: [],
+  //   });
+
+  //   let result = globalDeprecationInfo(project, env);
+  //   assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+  //   assert.strictEqual(result.hasActionableSuggestions, true);
+  //   assert.ok(
+  //     result.globalMessage.includes(
+  //       '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+  //     )
+  //   );
+  // });
+
+  // QUnit.test('projects has ember-cli-babel in dependencies', function (assert) {
+  //   project.pkg.dependencies = {
+  //     'ember-cli-babel': '^7.25.0',
+  //   };
+
+  //   project.addons.push({
+  //     name: 'ember-cli-babel',
+  //     parent: project,
+  //     pkg: {
+  //       version: '7.26.5',
+  //     },
+  //     addons: [],
+  //   });
+
+  //   let result = globalDeprecationInfo(project, env);
+  //   assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+  //   assert.strictEqual(result.hasActionableSuggestions, true);
+  //   assert.ok(
+  //     result.globalMessage.includes(
+  //       '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+  //     )
+  //   );
+  // });
+  // QUnit.test(
+  //   'projects has no devDependencies, but old ember-cli-babel found in addons array',
+  //   function (assert) {
+  //     project.pkg.devDependencies = {};
+
+  //     project.addons.push({
+  //       name: 'ember-cli-babel',
+  //       parent: project,
+  //       pkg: {
+  //         version: '7.26.5',
+  //       },
+  //       addons: [],
+  //     });
+
+  //     let result = globalDeprecationInfo(project, env);
+  //     assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+  //     assert.strictEqual(result.hasActionableSuggestions, true);
+  //     assert.ok(
+  //       result.globalMessage.includes(
+  //         '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+  //       )
+  //     );
+  //   }
+  // );
+
+  // QUnit.test('projects uses linked ember-cli-babel', function (assert) {
+  //   project.pkg.devDependencies = {
+  //     'ember-cli-babel': 'link:./some/path/here',
+  //   };
+
+  //   let otherAddon = {
+  //     name: 'other-thing-here',
+  //     parent: project,
+  //     pkg: {},
+  //     addons: [],
+  //   };
+
+  //   otherAddon.addons.push(buildBabel(otherAddon, '7.26.5'));
+  //   project.addons.push(buildBabel(project, '7.26.6'), otherAddon);
+
+  //   let result = globalDeprecationInfo(project, env);
+  //   assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+  //   assert.strictEqual(result.hasActionableSuggestions, true);
+
+  //   assert.ok(
+  //     result.globalMessage.includes(
+  //       '* If using yarn, run `npx yarn-deduplicate --packages ember-cli-babel`'
+  //     )
+  //   );
+  //   assert.ok(result.globalMessage.includes('* If using npm, run `npm dedupe`'));
+  // });
+
+  // QUnit.test('projects own ember-cli-babel is up to date', function (assert) {
+  //   project.pkg.devDependencies = {
+  //     'ember-cli-babel': '^7.26.0',
+  //   };
+
+  //   project.addons.push({
+  //     name: 'ember-cli-babel',
+  //     parent: project,
+  //     pkg: {
+  //       version: '7.26.6',
+  //     },
+  //     addons: [],
+  //   });
+
+  //   let result = globalDeprecationInfo(project, env);
+  //   assert.strictEqual(result.shouldIssueSingleDeprecation, false);
+  //   assert.strictEqual(result.hasActionableSuggestions, false);
+  //   assert.notOk(
+  //     result.globalMessage.includes(
+  //       '* Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`'
+  //     )
+  //   );
+  // });
+
+  // QUnit.test('transient babel that is out of date', function (assert) {
+  //   project.pkg.devDependencies = {
+  //     'ember-cli-babel': '^7.26.0',
+  //   };
+
+  //   let otherAddon = {
+  //     name: 'other-thing-here',
+  //     parent: project,
+  //     pkg: {
+  //       dependencies: {
+  //         'ember-cli-babel': '^7.25.0',
+  //       },
+  //     },
+  //     addons: [],
+  //   };
+
+  //   otherAddon.addons.push(buildBabel(otherAddon, '7.26.5'));
+  //   project.addons.push(buildBabel(project, '7.26.6'), otherAddon);
+
+  //   let result = globalDeprecationInfo(project, env);
+  //   assert.strictEqual(result.shouldIssueSingleDeprecation, true);
+  //   assert.strictEqual(result.hasActionableSuggestions, true);
+  //   assert.ok(result.globalMessage.includes('* other-thing-here@7.26.5 (Compatible)'));
+  // });
+});

From c35fc14727330214d8c3e51fac18f4253613c37c Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 3 Jun 2021 16:23:24 -0400
Subject: [PATCH 0528/1405] Add v3.27.3 to CHANGELOG.md.

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8107d58b833..26c9223f2a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,12 @@
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
+## v3.27.3 (June 3, 2021)
+
+- [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that `computed` can depend on dynamic `(hash` keys
+- [#19571](https://github.com/emberjs/ember.js/pull/19571) [BUGFIX] Extend `Route.prototype.transitionTo` deprecation until 5.0.0
+- [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility 
+
 ### v3.27.2 (May 27, 2021)
 
 - [#19511](https://github.com/emberjs/ember.js/pull/19511) / [#19548](https://github.com/emberjs/ember.js/pull/19548) [BUGFIX] Makes the (hash) helper lazy

From d4fb9fbadd16adef2bc71c7a1e0420b237851da3 Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Thu, 3 Jun 2021 14:43:55 -0600
Subject: [PATCH 0529/1405] =?UTF-8?q?[fixes=20#19588]=20Don=E2=80=99t=20in?=
 =?UTF-8?q?clude=20type-tests=20in=20build?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Paired with @rwjblue
---
 ember-cli-build.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 77b3aa5c9e3..d7587989b7c 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -120,6 +120,9 @@ module.exports = function ({ project }) {
           '@ember/-internals/*/tests/**' /* internal packages */,
           '*/*/tests/**' /* scoped packages */,
           '*/tests/**' /* packages */,
+          '@ember/-internals/*/type-tests/**' /* internal packages */,
+          '*/*/type-tests/**' /* scoped packages */,
+          '*/type-tests/**' /* packages */,
           'ember-template-compiler/**',
           'internal-test-helpers/**',
         ],

From c445e04b6add358e92a42f311b8ed6e9f6cb6134 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Thu, 3 Jun 2021 21:33:19 -0700
Subject: [PATCH 0530/1405] Correct typo in optionalFeatures warning

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index ce887fbeb22..ccfe09c7dc7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -142,7 +142,7 @@ module.exports = {
       }
     } else {
       this.ui.writeWarnLine(
-        'The Ember Classic edition has been deprecated. Speciying "classic" in your package.json, or not specifying a value at all, will no longer be supported. You must explicitly set the "ember.edition" property to "octane". This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
+        'The Ember Classic edition has been deprecated. Specifying "classic" in your package.json, or not specifying a value at all, will no longer be supported. You must explicitly set the "ember.edition" property to "octane". This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
       );
 
       if (

From b6948fbe9dc2d1cc148b7d859bb43cc024f43312 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 7 Jun 2021 14:23:54 -0400
Subject: [PATCH 0531/1405] Add v3.28.0-beta.4 to CHANGELOG

(cherry picked from commit e31720c3a4cc218d5ec2f92e67e145920e9f311b)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26c9223f2a4..bf7e5c29556 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.28.0-beta.4 (June 7, 2021)
+
+- [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility
+
 ### v3.28.0-beta.3 (June 1, 2021)
 
 - [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that computed can depend on dynamic hash keys

From c11d07c4050e3681ae0f3d6adad3f4fa12aca8cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:12:40 +0000
Subject: [PATCH 0532/1405] Bump glob-parent from 5.1.1 to 5.1.2

Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases)
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: glob-parent
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4e59f698e23..cc9a13beb54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5648,9 +5648,9 @@ github@^0.2.3:
     mime "^1.2.11"
 
 glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity "sha1-tsHvQXxOVmPqSY8cRa+saRa7wik= sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
@@ -6318,7 +6318,7 @@ is-extendable@^1.0.1:
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
@@ -6347,7 +6347,7 @@ is-glob@^3.1.0:
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity "sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw= sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 

From fcf2a64dba1dd2621ac000c1ac733e17142f7cf4 Mon Sep 17 00:00:00 2001
From: Camille TJHOA <camille.tjhoa@outlook.com>
Date: Wed, 9 Jun 2021 14:35:19 +0000
Subject: [PATCH 0533/1405] [DOC release] Fix "Dormant" addon warning typo

---
 lib/overrides.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/overrides.js b/lib/overrides.js
index 9eb67acaf56..4eaed77a0c8 100644
--- a/lib/overrides.js
+++ b/lib/overrides.js
@@ -233,7 +233,7 @@ module.exports = class Overrides {
       details +=
         '\nNote: Addons marked as "Dormant" does not appear to have any JavaScript files. ' +
         'Therefore, even if they are using an old version ember-cli-babel, they are ' +
-        'unlikely to be the cuplrit of this deprecation and can likely be ignored.\n';
+        'unlikely to be the culprit of this deprecation and can likely be ignored.\n';
     }
 
     if (this.hasCompatibleAddons) {

From ea322a34a9e7b4654c009f27ce81582a96825daf Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 9 Jun 2021 12:54:07 -0700
Subject: [PATCH 0534/1405] Add CHANGELOG for v3.27.4

(cherry picked from commit fe32020e181de85b4b2e480792f8ad1db3e5eee1)
(cherry picked from commit 2392417347f151457c16792541e3da2b78c5e6dc)
---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf7e5c29556..fa917a03857 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,11 +24,16 @@
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
+## v3.27.4 (June 9, 2021)
+
+- [#19594](https://github.com/emberjs/ember.js/pull/19594) [BUGFIX] Revert lazy hash changes
+- [#19596](https://github.com/emberjs/ember.js/pull/19596) [DOC] Fix "Dormant" addon warning typo
+
 ## v3.27.3 (June 3, 2021)
 
 - [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that `computed` can depend on dynamic `(hash` keys
 - [#19571](https://github.com/emberjs/ember.js/pull/19571) [BUGFIX] Extend `Route.prototype.transitionTo` deprecation until 5.0.0
-- [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility 
+- [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility
 
 ### v3.27.2 (May 27, 2021)
 

From 57907a4d7d91aa58b3b3ac1258e639ce221f9492 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 10 Jun 2021 10:34:04 -0700
Subject: [PATCH 0535/1405] [BIGFIX release] Fix `<LinkTo>` with nested
 children

During bubbling, `event.target` may point to a child element whereas
`event.currentTarget` always points to the element where the handler
was attached, which is what we want here.

Reported in a comment on #19546, though this may be a distinct issue
from the original report as it was reported as a default-cancelling
parent element interfering with the nested `<LinkTo>`, and this is
the other way around.
---
 .../glimmer/lib/components/link-to.ts         |  2 +-
 .../components/link-to/routing-angle-test.js  | 41 +++++++++++++++++++
 .../components/link-to/routing-curly-test.js  | 41 +++++++++++++++++++
 3 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 40ee661d959..a139ba18c80 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -138,7 +138,7 @@ class LinkTo extends InternalComponent implements DeprecatingInternalComponent {
       return;
     }
 
-    let element = event.target;
+    let element = event.currentTarget;
     assert('[BUG] must be an <a> element', element instanceof HTMLAnchorElement);
 
     let isSelf = element.target === '' || element.target === '_self';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 60ac6577dac..fa7e4c22561 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -92,6 +92,47 @@ moduleFor(
       );
     }
 
+    async ['@test [GH#19546] it navigates into the named route when containing other elements'](
+      assert
+    ) {
+      this.addTemplate(
+        'about',
+        `
+        <h3 class="about">About</h3>
+        <LinkTo @route='index' id='home-link'><span id='inside'>Home</span></LinkTo>
+        <LinkTo @route='about' id='self-link'>Self</LinkTo>
+        `
+      );
+
+      await this.visit('/about');
+
+      assert.equal(this.$('h3.about').length, 1, 'The about template was rendered');
+      assert.equal(
+        this.$('#self-link.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#home-link:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+
+      await this.click('#inside');
+
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+    }
+
     async [`@test [DEPRECATED] it doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 138a66f7068..2ecf5ae4cf0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -92,6 +92,47 @@ moduleFor(
       );
     }
 
+    async ['@test [GH#19546] it navigates into the named route when containing other elements'](
+      assert
+    ) {
+      this.addTemplate(
+        'about',
+        `
+        <h3 class="about">About</h3>
+        <div id="home-link">{{#link-to route='index'}}<span id='inside'>Home</span>{{/link-to}}</div>
+        <div id="self-link">{{#link-to route='about'}}Self{{/link-to}}</div>
+        `
+      );
+
+      await this.visit('/about');
+
+      assert.equal(this.$('h3.about').length, 1, 'The about template was rendered');
+      assert.equal(
+        this.$('#self-link > a.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#home-link > a:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+
+      await this.click('#inside');
+
+      assert.equal(this.$('h3.home').length, 1, 'The home template was rendered');
+      assert.equal(
+        this.$('#self-link > a.active').length,
+        1,
+        'The self-link was rendered with active class'
+      );
+      assert.equal(
+        this.$('#about-link > a:not(.active)').length,
+        1,
+        'The other link was rendered without active class'
+      );
+    }
+
     async [`@test [DEPRECATED] it doesn't add an href when the tagName isn't 'a'`](assert) {
       this.addTemplate(
         'index',

From c47d6287c335b07d5425f3cab0b95bdde9811af8 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Thu, 10 Jun 2021 11:52:00 -0700
Subject: [PATCH 0536/1405] Add CHANGELOG for 3.27.5

(cherry picked from commit 428e7a05233e0c508dfbf339ae2f241a71109380)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa917a03857..a4e9cd2244b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,10 @@
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
+## v3.27.5 (June 10, 2021)
+
+- [#19597](https://github.com/emberjs/ember.js/pull/19597) [BIGFIX] Fix `<LinkTo>` with nested children
+
 ## v3.27.4 (June 9, 2021)
 
 - [#19594](https://github.com/emberjs/ember.js/pull/19594) [BUGFIX] Revert lazy hash changes

From 1a6c9640001f319fffbcf77fbd934738dfa4ff87 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias.bieniek@gmail.com>
Date: Fri, 11 Jun 2021 09:10:42 +0200
Subject: [PATCH 0537/1405] Fix Changelog formatting

The different heading levels are causing issues for services that are trying to read and filter the changelog
---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4e9cd2244b..5eb456266cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,16 +24,16 @@
 
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
-## v3.27.5 (June 10, 2021)
+### v3.27.5 (June 10, 2021)
 
 - [#19597](https://github.com/emberjs/ember.js/pull/19597) [BIGFIX] Fix `<LinkTo>` with nested children
 
-## v3.27.4 (June 9, 2021)
+### v3.27.4 (June 9, 2021)
 
 - [#19594](https://github.com/emberjs/ember.js/pull/19594) [BUGFIX] Revert lazy hash changes
 - [#19596](https://github.com/emberjs/ember.js/pull/19596) [DOC] Fix "Dormant" addon warning typo
 
-## v3.27.3 (June 3, 2021)
+### v3.27.3 (June 3, 2021)
 
 - [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that `computed` can depend on dynamic `(hash` keys
 - [#19571](https://github.com/emberjs/ember.js/pull/19571) [BUGFIX] Extend `Route.prototype.transitionTo` deprecation until 5.0.0

From 297cf58898fe29a6bf5776bdcc333233e1e8a60d Mon Sep 17 00:00:00 2001
From: Stefan Penner <stefan.penner@gmail.com>
Date: Mon, 14 Jun 2021 11:34:54 -0600
Subject: [PATCH 0538/1405] Fix spelling mistake

---
 lib/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index ce887fbeb22..ccfe09c7dc7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -142,7 +142,7 @@ module.exports = {
       }
     } else {
       this.ui.writeWarnLine(
-        'The Ember Classic edition has been deprecated. Speciying "classic" in your package.json, or not specifying a value at all, will no longer be supported. You must explicitly set the "ember.edition" property to "octane". This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
+        'The Ember Classic edition has been deprecated. Specifying "classic" in your package.json, or not specifying a value at all, will no longer be supported. You must explicitly set the "ember.edition" property to "octane". This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
       );
 
       if (

From 55d012c49bb6af87b9f0841457c1380f0006292d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 14 Jun 2021 14:07:26 -0400
Subject: [PATCH 0539/1405] Add v3.28.0-beta.5 to CHANGELOG

(cherry picked from commit 7de1e204dc72da3198ad6324039291b94154eeeb)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eb456266cf..c77951138a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.28.0-beta.5 (June 14, 2021)
+
+- [#19597](https://github.com/emberjs/ember.js/pull/19597) [BUGFIX] Fix `<LinkTo>` with nested children
+
 ### v3.28.0-beta.4 (June 7, 2021)
 
 - [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility

From 03b20d8370d2a71928ffc40b558f751e276c6850 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Tue, 1 Jun 2021 16:36:34 -0700
Subject: [PATCH 0540/1405] [BUGFIX lts] Ensure hash objects correctly entangle
 as dependencies v2

The previous bugfixes to `{{hash}}` caused a change to the semantics of
computed properties that depend on a hash. Specifically, because
`{{hash}}` objects are now proxies, they are _constant_, never updating
again after they are initially created. This is fine if you depend on
an individual key in a hash, but breaks if you depend directly on the
hash itself:

```js
computed('hash.foo', function() {}) // this works

computed('hash', function() {}) // this will no longer rerun
```

This is used occasionally when you wish to depend on the dynamic keys
of a dictionary, like so:

```js
computed('hash', function() {
  let values = [];

  for (let key in this.hash) {
    values.push(hash[key]);
  }

  return values;
})
```

Notably, this is not a problem with autotracking, because autotracking
will entangle the usage of these keys dynamically. So this is only a
problem with legacy systems such as `computed` and `observer` which
cannot dynamically add dependencies based on the function's runtime.

To fix this, we need to determine if a dependency is a hash when a
computed or an observer depends upon it, and then entangle all of its
keys if it is. We do this whenever the value is the last value in the
chain.
---
 package.json                                  |  26 +-
 .../link-to/query-params-angle-test.js        |  24 ++
 .../@ember/-internals/metal/lib/chain-tags.ts |  27 +-
 yarn.lock                                     | 252 +++++++++---------
 4 files changed, 174 insertions(+), 155 deletions(-)

diff --git a/package.json b/package.json
index e07dee3245e..cdb4f883e77 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.79.3",
+    "@glimmer/vm-babel-plugins": "0.79.4",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.79.3",
-    "@glimmer/destroyable": "0.79.3",
+    "@glimmer/compiler": "0.79.4",
+    "@glimmer/destroyable": "0.79.4",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.79.3",
-    "@glimmer/interfaces": "0.79.3",
-    "@glimmer/manager": "0.79.3",
-    "@glimmer/node": "0.79.3",
-    "@glimmer/opcode-compiler": "0.79.3",
-    "@glimmer/owner": "0.79.3",
-    "@glimmer/program": "0.79.3",
-    "@glimmer/reference": "0.79.3",
-    "@glimmer/runtime": "0.79.3",
-    "@glimmer/validator": "0.79.3",
+    "@glimmer/global-context": "0.79.4",
+    "@glimmer/interfaces": "0.79.4",
+    "@glimmer/manager": "0.79.4",
+    "@glimmer/node": "0.79.4",
+    "@glimmer/opcode-compiler": "0.79.4",
+    "@glimmer/owner": "0.79.4",
+    "@glimmer/program": "0.79.4",
+    "@glimmer/reference": "0.79.4",
+    "@glimmer/runtime": "0.79.4",
+    "@glimmer/validator": "0.79.4",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 47ad96e478f..2729071af47 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -350,6 +350,30 @@ moduleFor(
       assert.equal(theLink.attr('href'), '/?foo=ASL');
     }
 
+    async ['@test supplied QP properties can be bound in legacy components'](assert) {
+      expectDeprecation(/Passing the `@tagName` argument to/);
+
+      this.addTemplate(
+        'index',
+        `
+          <LinkTo @tagName="a" id="the-link" @query={{hash foo=this.boundThing}}>
+            Index
+          </LinkTo>
+        `
+      );
+
+      await this.visit('/');
+
+      let indexController = this.getController('index');
+      let theLink = this.$('#the-link');
+
+      assert.equal(theLink.attr('href'), '/?foo=OMG');
+
+      runTask(() => indexController.set('boundThing', 'ASL'));
+
+      assert.equal(theLink.attr('href'), '/?foo=ASL');
+    }
+
     async ['@test supplied QP properties can be bound (booleans)'](assert) {
       this.addTemplate(
         'index',
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 816f9420620..f918196155c 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,6 +1,7 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
+import { isHashProxy } from '@glimmer/runtime';
 import { _WeakSet } from '@glimmer/util';
 import {
   combine,
@@ -16,7 +17,7 @@ import { tagForProperty } from './tags';
 
 export const CHAIN_PASS_THROUGH = new _WeakSet();
 
-export function finishLazyChains(meta: Meta, key: string, value: any) {
+export function finishLazyChains(meta: Meta, key: string, value: unknown): void {
   let lazyTags = meta.readableLazyChainsFor(key);
 
   if (lazyTags === undefined) {
@@ -173,20 +174,6 @@ function getChainTags(
 
     chainTags.push(propertyTag);
 
-    // If we're at the end of the path, processing the last segment, and it's
-    // not an alias, we should _not_ get the last value, since we already have
-    // its tag. There's no reason to access it and do more work.
-    if (segmentEnd === pathLength) {
-      // If the key was an alias, we should always get the next value in order to
-      // bootstrap the alias. This is because aliases, unlike other CPs, should
-      // always be in sync with the aliased value.
-      if (CHAIN_PASS_THROUGH.has(descriptor)) {
-        // tslint:disable-next-line: no-unused-expression
-        current[segment];
-      }
-      break;
-    }
-
     if (descriptor === undefined) {
       // If the descriptor is undefined, then its a normal property, so we should
       // lookup the value to chain off of like normal.
@@ -223,8 +210,16 @@ function getChainTags(
       }
     }
 
-    if (!isObject(current)) {
+    if (segmentEnd === pathLength || !isObject(current)) {
       // we've hit the end of the chain for now, break out
+
+      // If the last value is a HashProxy, then entangle all of its tags
+      if (isHashProxy(current)) {
+        for (let key in current) {
+          chainTags.push(tagForProperty(current, key));
+        }
+      }
+
       break;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 4e59f698e23..20ef27898f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1588,52 +1588,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.3.tgz#fc68770fe50df0eab0aee0331f40ff26a8ce4763"
-  integrity sha512-eGuZg/6C9ITUZJswpiIElfTQ9P9zQoZccrwfFyoc6QQRcwPCGkfgLpbAjnOCHON/HNsq8Aa+2iswJzAuVyz4QA==
-  dependencies:
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/syntax" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/wire-format" "0.79.3"
+"@glimmer/compiler@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.4.tgz#746909c5f01ad57efec15da79567b515d1e3a6b0"
+  integrity sha512-aXTows4Kjbutp6BV18oQTFaJjIkX5+hQ25KVETK/5zla/rC9O0DQHGb2r8DDfx4DiJLXGdl4g2VLy/BfkYmcwA==
+  dependencies:
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/syntax" "0.79.4"
+    "@glimmer/util" "0.79.4"
+    "@glimmer/wire-format" "0.79.4"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.3.tgz#a4ee01a5ef7f9e0a5e62668fb992d721c193acd4"
-  integrity sha512-vAvXi/eh6ca0Upqzqg+y/dsiFzHsh4La1J8oCSv33BXhbjoVWp+V++FaEYoGy4E8/gaDdt9fW8xZOvgBSoIBZw==
+"@glimmer/destroyable@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.4.tgz#23a3a13a50063aefb2fa169feae79a373c9132bf"
+  integrity sha512-qpaglWv+GKlcm28MZvYemWTZV3kSlOKPc7kluRqXvoo7oqQdBEagm60XivMpxJUEf+A5YXsJ/Atty+r58eVvQg==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.3"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
+    "@glimmer/global-context" "0.79.4"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/util" "0.79.4"
 
-"@glimmer/encoder@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.3.tgz#7f4d957b8c948d04b8594c20ba131701a1bf9453"
-  integrity sha512-BpZqJOPpIYQyDGR/OtgE9jbjNd47DBo5L/CJmQ1PYZ11QUM5DMUHuxpIxWKKT2JpzYJfPE2xdvYrhJrCUC0Zfg==
+"@glimmer/encoder@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.4.tgz#2e2e7da3f80f21732f7ed0003c391caf4b42acfe"
+  integrity sha512-qqyW/TWVK1RP/zEVq0NU2EvOViftVyB43BB7y2yVyb+qD3gK0weP1InwPp1tyNUF7B6LHAcd64d4pN29Qj3vHw==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/vm" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/vm" "0.79.4"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.3.tgz#e50fcfa598a6d9e58a9fba1586efed6d789fe24b"
-  integrity sha512-Aotq1fbYKk8CElF4x1nYJWGufXu7CS/iYUfrpX9v1zIjZMw52tfk1xTlNyRCpM1SCHuUL32QEskGAPDLsIYkVw==
+"@glimmer/global-context@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.4.tgz#2d683a457aba7c340a3e850fdcf8a35fbcd8308e"
+  integrity sha512-Hn6KS7QUV63oMbop1LVOfPZ3KISzq4xMASjP+xrMzLIugvjBYYB+WoarUJcG7eB+TioOo0OMyVFibSP8ZTO2TQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.3.tgz#4e0a3ff9cf0b60bdab1a4d420f641ab540d4fc85"
-  integrity sha512-EFiNKwehbxm1xRsfnNu/5nu8Rw+0IYINL/Hciwl/28T8an7FOxftpy/iXXSaWvIsnPyBHqH1ufwsKYY6KXyNzg==
+"@glimmer/interfaces@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.4.tgz#3213e7fe73f35340762bef7f4e8c8df593a4a8c8"
+  integrity sha512-cyNZlRa7aXAfXY9kk7hhnWgL1R7Zw8wwi2UVEWq2nBanmpNmL1lSMJ6nY8oRIWCtWrYA9CeH7RZ6mVP5cQ/v2w==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1642,140 +1642,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.3.tgz#02dc843bd6cbc1d5b32321029a8b250c33edc1fa"
-  integrity sha512-VhIXX9oxrLABuA34iZrrMxwhbxRJCftPyEXyD2ZNwsr9QugtAg2cYvtIWxlf9RllTACJrSU7Gb+0BPYVG+aaaQ==
+"@glimmer/manager@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.4.tgz#82cefd85d503c5a3c40389f3c869a8abbf273648"
+  integrity sha512-SCSrBEdu/JvTEFPvgkDu3kaRgJrJHrhAdB2WAoevNb8bMMhADxRPTVSfYDFL/6+eQtx6krcycVeeaCLjhZ2LNA==
   dependencies:
-    "@glimmer/destroyable" "0.79.3"
+    "@glimmer/destroyable" "0.79.4"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/reference" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/validator" "0.79.3"
-
-"@glimmer/node@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.3.tgz#536457cc016b5c9788088dac8366fef9c98b7fff"
-  integrity sha512-iNC+TnEvKPRLFNQ6YJOH10NSAHVa7/aCejD+wR8BeOSBq1bbPQTmuQTluKRIwjDww+Np68SEjQ7Wkzvp2Lnivw==
-  dependencies:
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/runtime" "0.79.3"
-    "@glimmer/util" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/reference" "0.79.4"
+    "@glimmer/util" "0.79.4"
+    "@glimmer/validator" "0.79.4"
+
+"@glimmer/node@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.4.tgz#734ed99979fe8c396af3c356c0a5d5eee835d552"
+  integrity sha512-EDv/PkLGf92aFc7J8qKtBUd6ewxC5udntN6Syj0VHJ2MQeikVJWyZHwJbZP5+VUw8AbjuSKPc0Nt8G37Y2xtug==
+  dependencies:
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/runtime" "0.79.4"
+    "@glimmer/util" "0.79.4"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.3.tgz#dc27d49d4236060b650e41f16526fd136e7a5d17"
-  integrity sha512-1SDl6YQ/xYAuYD/P70YHkoKri0YZSG8ELx9n1ZKVr1sB0xv6tiIrYOyhhy+omlmcRSQwWd0XEDp/4eeb7UNjlQ==
+"@glimmer/opcode-compiler@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.4.tgz#c5dffda71216909a8b17d9ff3223a82ef018dde9"
+  integrity sha512-K/29Wvy5nzo3deLGVZhoziznLsd8+psKhA8SO2zpS7a1a7HCSAL8SvXUZFsdsUZSU0gBmCPmw+sXSkyZTpu5CA==
   dependencies:
-    "@glimmer/encoder" "0.79.3"
+    "@glimmer/encoder" "0.79.4"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/reference" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/vm" "0.79.3"
-    "@glimmer/wire-format" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/reference" "0.79.4"
+    "@glimmer/util" "0.79.4"
+    "@glimmer/vm" "0.79.4"
+    "@glimmer/wire-format" "0.79.4"
 
-"@glimmer/owner@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.3.tgz#0c8aeea009bf2e01653e8419754d7b8ea57607c2"
-  integrity sha512-vEybTpdeiaDHqRX8TaNAIz7fNlE0lii4kPTxl04me8H3YAE3nKluUxgoChWMRcgakGJ8bCzVa7p215Ap/6ULtg==
+"@glimmer/owner@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.4.tgz#ebb300eaf23986c94705cbff8c4415ed1eaad9e9"
+  integrity sha512-6w24OglbMeib1xJVxOnTBoiCQbeLtDLDSzisn9z3o6+Iv3NCMzylyjv25JU9TqJydEPftDG/An/h/Aswb8iEFw==
   dependencies:
-    "@glimmer/util" "0.79.3"
+    "@glimmer/util" "0.79.4"
 
-"@glimmer/program@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.3.tgz#f77b8e81842a7b3cf8a1063fc3167d2cd82d9724"
-  integrity sha512-vIhBlnpt+czkgJhm/OrVcrxbwxgEue6H8UMSoc5vdNiJDHUWOrYdJhr1mh1DGgvM0qqPySKJhgjo3apmA5sW+w==
+"@glimmer/program@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.4.tgz#80cfda3261388caeeb66ccc46fac469d2e788b71"
+  integrity sha512-8wvhs7xUTdbAtG+oV19PKSFsyFujnRjl4gPs76Pr7GLHX25XOBhGxL8TptPm0JShxuvB2TMZrBwMGc3rhe402g==
   dependencies:
-    "@glimmer/encoder" "0.79.3"
+    "@glimmer/encoder" "0.79.4"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/manager" "0.79.3"
-    "@glimmer/opcode-compiler" "0.79.3"
-    "@glimmer/util" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/manager" "0.79.4"
+    "@glimmer/opcode-compiler" "0.79.4"
+    "@glimmer/util" "0.79.4"
 
-"@glimmer/reference@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.3.tgz#4c3eed5e2c810c43145a68cb2fa4f337f0b154b8"
-  integrity sha512-c++SMUVBzpTxd7W9LF2GvCwYIiLPbdrh6kmqOEprH9v/jt4gJkagSBCl84/t6m4NPOYIql19NpK3QqfVSxTDIA==
+"@glimmer/reference@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.4.tgz#3d9fcf5e57c63583da14f243128a3195f650e568"
+  integrity sha512-neCaUe9vqc/zGj1kNdm1ssHQ/9icC0BJd8xjYf6vAjiJ/TKEL+u+PfL8H8zqdWAK2al5zekNlhHFY55NxzX8bQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.3"
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/validator" "0.79.3"
+    "@glimmer/global-context" "0.79.4"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/util" "0.79.4"
+    "@glimmer/validator" "0.79.4"
 
-"@glimmer/runtime@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.3.tgz#1ff2051e22eff68fe27f536059484a7b0a70fdb9"
-  integrity sha512-3GO48ddGTuQQIe/16Y4hLDiweTVdLCIn7q6fpzHf+B/ieoVhxu8YkyKYgGEex3UHz+C+GkJxW1hru4cfp0APmA==
+"@glimmer/runtime@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.4.tgz#188044848721f710859c35eecec15293b8c98bba"
+  integrity sha512-jacyHy7zQ39kR6c4BvPUXpnNDSybnFpFplnhsa0Fr8IqnXRTKqNv1KdfBwdbbPQNaojuV6vyWoh0jPErkcgh0w==
   dependencies:
-    "@glimmer/destroyable" "0.79.3"
+    "@glimmer/destroyable" "0.79.4"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.3"
-    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/global-context" "0.79.4"
+    "@glimmer/interfaces" "0.79.4"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.79.3"
-    "@glimmer/program" "0.79.3"
-    "@glimmer/reference" "0.79.3"
-    "@glimmer/util" "0.79.3"
-    "@glimmer/validator" "0.79.3"
-    "@glimmer/vm" "0.79.3"
-    "@glimmer/wire-format" "0.79.3"
+    "@glimmer/owner" "0.79.4"
+    "@glimmer/program" "0.79.4"
+    "@glimmer/reference" "0.79.4"
+    "@glimmer/util" "0.79.4"
+    "@glimmer/validator" "0.79.4"
+    "@glimmer/vm" "0.79.4"
+    "@glimmer/wire-format" "0.79.4"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.3.tgz#5beadd53494d0f199b83f016af90fa28c3ecaa8c"
-  integrity sha512-IERTn/mqRk0pZnddAnYjGUV4e93rRf5scY0dYQl2EFvBHFaOdFQPe3fhSCozx0hZpagg5LCOsbRgsMwL9IT9fw==
+"@glimmer/syntax@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.4.tgz#5aa21d4b3918238c24da3d640abc3b66150fc0c6"
+  integrity sha512-NiMIoW2G0+sBfLYnvDaZ8o8Ul/3P/ezOT8U7ZvsHDGU5hXM2buFozyoSKLILTvAQ56izdfK9fKCsn0oi4ISx3w==
   dependencies:
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/util" "0.79.4"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.3.tgz#a54f0383d8e83ca43625e289fe1df6c72ccfb938"
-  integrity sha512-SVHHA6blGzIM6ZMJErqvzqsapYEsN5hXyobJl+lQAAzBKvaExc7VHQfs10267HxA9WlMNLuu83+tYOu+UR67hA==
+"@glimmer/util@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.4.tgz#4762ed9b231482470cb9763332097d50042f9bde"
+  integrity sha512-n2lEGzM9khM43HmKlig2lG5L5cHoL4tFzW21CZzmhMfc1IDCqHuP7s7924OsXSbLT1WB7B9sm/ZhnEj2nd+GiQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.3.tgz#1edde5e874629b91a04c5af316b9ba91ecb360ed"
-  integrity sha512-uXUf24RCqj48T2Hgo6ZXfwAGkBgEOQ2W/Bagg83hBv/4TbUWNt03cHq6ga2FPKpqR/T7SvhN9WM4nc5FqIYGCQ==
+"@glimmer/validator@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.4.tgz#35bc9c6b88d0681b372f1fba3969e6385465b8d7"
+  integrity sha512-VLT9TozD3n3qwX9hOECn/d2Ig8PTn0Gl1FdiEpb04tldXWY0YL6oSoLEjH97R4KNqvati2jFQOOzyinzu9Ffkw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.3"
+    "@glimmer/global-context" "0.79.4"
 
-"@glimmer/vm-babel-plugins@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.3.tgz#a8e6949f8ecc10786831d188f1001eb80927297f"
-  integrity sha512-346xmhP7J3wqCFKqIlwcaui/A+iHKm0ZWoaKb4lIkuro7/u5j094eEtdbonGq4eTj+UnDPpmzuqLWodXXxxo1Q==
+"@glimmer/vm-babel-plugins@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.4.tgz#317b9b85752abab903674b959ed9e00e1942ae23"
+  integrity sha512-LEdgx6QXOAm+88TxgrvWvkUc6J6jPKmnMzW3IAiD7aIHasSl+/aKfZF0x3ICHyCXGaJGWI00mVKxd2n61aAY9g==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.3.tgz#79b0614116d5b3417e6d0a16c0c91fbf521ccbc4"
-  integrity sha512-JX1Whpm8GGyoZefXj6jJSNBi/qWKYjC5JbHrJ9KALXYCC2JAabVQlOlfRDV4mQOYv7yCzrpM8ZDCycwHTGuJ6A==
+"@glimmer/vm@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.4.tgz#1d0f00909c6b97b99d7c8bb11d1e7b958822dbd3"
+  integrity sha512-enCXJlypgMTxWUupQWCPUvE41Gh4vsCIWVhqdh6ol+QGzRZBGvfXTz5xu5lTKPJQhFQsTn2ecVTKKVhqMOtzpA==
   dependencies:
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/util" "0.79.4"
 
-"@glimmer/wire-format@0.79.3":
-  version "0.79.3"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.3.tgz#eac19c32297caa5129f820206b8035b8f77d07f4"
-  integrity sha512-6izhGKLIeuWbK9FfaM1I+hXYh3EgKpbpbA99SDQav+TMPiFWFy9sos4PyEuywha5p7MZrMDKXip/l49ARG8XHg==
+"@glimmer/wire-format@0.79.4":
+  version "0.79.4"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.4.tgz#4074b1194650909e295c349e75d2cebb8a03c8bd"
+  integrity sha512-QuGfVIX1ziyFDPzJaKZnbgyhzzz5a8s/B+xYg5ZEhMo5BHuyL1a3Gw+0qUMCPlVUIX0Uv+VWvI7NF9tH/ykiZA==
   dependencies:
-    "@glimmer/interfaces" "0.79.3"
-    "@glimmer/util" "0.79.3"
+    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/util" "0.79.4"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 7289a0b719a81aa096c478cc032ba17251762bea Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 21 Jun 2021 19:37:06 +0000
Subject: [PATCH 0541/1405] Bump glob from 7.1.6 to 7.1.7

Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.6 to 7.1.7.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.6...v7.1.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 7c463d542e8..70938058531 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "fs-extra": "^9.1.0",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
-    "glob": "^7.1.4",
+    "glob": "^7.1.7",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index 20ef27898f1..9bb8c81fd94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5677,10 +5677,10 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"

From 9d2446e13b30b4a3f1684d9cbe586e3054fc4c84 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jun 2021 19:38:04 +0000
Subject: [PATCH 0542/1405] Bump set-getter from 0.1.0 to 0.1.1

Bumps [set-getter](https://github.com/doowb/set-getter) from 0.1.0 to 0.1.1.
- [Release notes](https://github.com/doowb/set-getter/releases)
- [Commits](https://github.com/doowb/set-getter/commits/0.1.1)

---
updated-dependencies:
- dependency-name: set-getter
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 20ef27898f1..43baf1e86a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6237,7 +6237,7 @@ is-binary-path@~2.1.0:
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-  integrity "sha1-76ouqdqg16suoTqXsritUf776L4= sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@~2.0.3:
   version "2.0.3"
@@ -6677,7 +6677,7 @@ keyv@3.0.0:
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="
+  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
@@ -9072,9 +9072,9 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   integrity "sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
 
 set-getter@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.0.tgz#d769c182c9d5a51f409145f2fba82e5e86e80376"
-  integrity "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y= sha512-lIj6AWViymAQLQyq1qehP44w4iGbSv6pYOKRQCDzqlmxctLyCrecuge0bxRPrNSnV8EeMHKR2fVTRl3LniQLNg=="
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102"
+  integrity sha512-9sVWOy+gthr+0G9DzqqLaYNA7+5OKkSmcqjL9cBpDEaZrr3ShQlyX2cZ/O/ozE41oxn/Tt0LGEM/w4Rub3A3gw==
   dependencies:
     to-object-path "^0.3.0"
 
@@ -9900,7 +9900,7 @@ to-fast-properties@^2.0.0:
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="
+  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
   dependencies:
     kind-of "^3.0.2"
 

From 297ab0e771409d61dcb014a9a40144cd7fdd5ee8 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 21 Jun 2021 19:25:55 -0400
Subject: [PATCH 0543/1405] Add 3.28.0-beta.6 to CHANGELOG

(cherry picked from commit a01e11de7ba0dd36134bc591c02b5d08d929b0e8)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c77951138a2..13997c8d744 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v3.28.0-beta.6 (June 21, 2021)
+
+- [#19584](https://github.com/emberjs/ember.js/pull/19584) [BUGFIX] Ensure hash objects correctly entangle as dependencies
+
 ### v3.28.0-beta.5 (June 14, 2021)
 
 - [#19597](https://github.com/emberjs/ember.js/pull/19597) [BUGFIX] Fix `<LinkTo>` with nested children

From fc401e1033690dd4f0daa64364fde3caa68abb8d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 08:12:19 +0000
Subject: [PATCH 0544/1405] Bump @glimmer/owner from 0.79.4 to 0.80.0

Bumps [@glimmer/owner](https://github.com/glimmerjs/glimmer-vm) from 0.79.4 to 0.80.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.79.4...v0.80.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 70938058531..d701e8143d9 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "@glimmer/manager": "0.79.4",
     "@glimmer/node": "0.79.4",
     "@glimmer/opcode-compiler": "0.79.4",
-    "@glimmer/owner": "0.79.4",
+    "@glimmer/owner": "0.80.0",
     "@glimmer/program": "0.79.4",
     "@glimmer/reference": "0.79.4",
     "@glimmer/runtime": "0.79.4",
diff --git a/yarn.lock b/yarn.lock
index 9bb8c81fd94..f0abae17543 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1637,6 +1637,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.0.tgz#eabc7551ffe7ad27c44ba96d39e2af6ebf01c942"
+  integrity sha512-evD9aVhYacFe/lD/FzaPs0CuuIgkr17+KbOCWDeEMXW0q2FnrLiQET40eP5nyhGLELhKE62mlIzdGmleUR6XYg==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/low-level@0.78.2":
   version "0.78.2"
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
@@ -1685,6 +1692,13 @@
   dependencies:
     "@glimmer/util" "0.79.4"
 
+"@glimmer/owner@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.0.tgz#ae5da1e4bf8121592afc920a88f3f6dda603606a"
+  integrity sha512-6VkPqa1fn8Y+9K0nevtMukdVlSaGzrrpYn+QReaXGFjN97YFDQWqQUrmEjcAXeOF/zcyKTpDNrQH0ev0s4JicQ==
+  dependencies:
+    "@glimmer/util" "0.80.0"
+
 "@glimmer/program@0.79.4":
   version "0.79.4"
   resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.4.tgz#80cfda3261388caeeb66ccc46fac469d2e788b71"
@@ -1746,6 +1760,15 @@
     "@glimmer/interfaces" "0.79.4"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.0.tgz#286ec9e2c8c9e2f364e49272a3baf9d0fe3dc40c"
+  integrity sha512-fvr4zyGVp58vzVajwTwbGwp0LmPxm2SVWkfIGFcCr9r2BmYD+9bd52I0u00LsZvNJQqFNyI8RB+qXThRMi+TiA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.80.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.79.4":
   version "0.79.4"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.4.tgz#35bc9c6b88d0681b372f1fba3969e6385465b8d7"

From 8e6f55fdb40dfc6bc9b2afdb7ea4f2b04a027f2e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 08:18:59 +0000
Subject: [PATCH 0545/1405] Bump execa from 2.0.4 to 5.1.1

Bumps [execa](https://github.com/sindresorhus/execa) from 2.0.4 to 5.1.1.
- [Release notes](https://github.com/sindresorhus/execa/releases)
- [Commits](https://github.com/sindresorhus/execa/compare/v2.0.4...v5.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 65 ++++++++++++++++++++++++++++------------------------
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 70938058531..b50931d8ff2 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-qunit": "^4.0.0",
-    "execa": "^2.0.4",
+    "execa": "^5.1.1",
     "expect-type": "^0.11.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
diff --git a/yarn.lock b/yarn.lock
index 9bb8c81fd94..2f2e1347180 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3858,7 +3858,7 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q= sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
@@ -3869,7 +3869,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2:
+cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity "sha1-9zqFudXUHQRVUcF34ogtSshXKKY= sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
@@ -4962,19 +4962,19 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-execa@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-2.0.4.tgz#2f5cc589c81db316628627004ea4e37b93391d8e"
-  integrity "sha1-L1zFicgdsxZihicATqTje5M5HY4= sha512-VcQfhuGD51vQUQtKIq2fjGDLDbL6N1DTQVpYzxZ7LPIXw3HqTuIz6uxRmpV1qf8i31LHf2kjiaGI+GdHwRgbnQ=="
+execa@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
-    cross-spawn "^6.0.5"
-    get-stream "^5.0.0"
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
     is-stream "^2.0.0"
     merge-stream "^2.0.0"
-    npm-run-path "^3.0.0"
-    onetime "^5.1.0"
-    p-finally "^2.0.0"
-    signal-exit "^3.0.2"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
 exists-sync@0.0.3:
@@ -5611,13 +5611,18 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.0.0, get-stream@^5.1.0:
+get-stream@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
   integrity "sha1-ASA83JJZf5uQkGfD5lbMH008Tck= sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="
   dependencies:
     pump "^3.0.0"
 
+get-stream@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -6062,6 +6067,11 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
 iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -7794,10 +7804,10 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
-  integrity "sha1-f5G+MX9qRm7+08nymArYpO6LD6U= sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg=="
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
@@ -7923,10 +7933,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity "sha1-//DzyRYX/mK7UBiWNumayKbfe+U= sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
@@ -7995,11 +8005,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
 
-p-finally@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
-  integrity "sha1-vW/KqcVZoJa2gIBvTWV7Pw8kBWE= sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="
-
 p-is-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
@@ -9137,10 +9142,10 @@ shellwords@^0.1.0:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= sha512-meQNNykwecVxdu1RlYMKpQx4+wefIYpmxi6gexo/KAbwquJrBUrBmKYJrE8KFkVQAAVWEnwNdu21PgrD77J3xA=="
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
 silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
   version "1.1.1"

From 49344a6321328216da8cbd69cfbd15757d5f8ab8 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 11:23:07 -0700
Subject: [PATCH 0546/1405] Remove deprecated getWithDefault for v4.0

---
 packages/@ember/-internals/metal/index.ts     |   2 +-
 .../-internals/metal/lib/property_get.ts      |  46 ----
 .../metal/tests/accessors/get_test.js         | 196 +-----------------
 .../metal/tests/tracked/get_test.js           |  29 +--
 packages/@ember/-internals/runtime/index.d.ts |   1 -
 .../runtime/lib/mixins/observable.js          |  20 --
 .../tests/system/object/computed_test.js      |  35 ++--
 .../-internals/runtime/types/observable.d.ts  |   5 -
 packages/@ember/object/index.js               |   1 -
 packages/ember/index.js                       |   1 -
 packages/ember/tests/reexports_test.js        |   1 -
 tests/docs/expected.js                        |   1 -
 12 files changed, 19 insertions(+), 319 deletions(-)

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 37fba150cb2..ac0dfc2b53f 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -2,7 +2,7 @@ export { default as computed, autoComputed, isComputed, ComputedProperty } from
 export { getCachedValueFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
-export { PROXY_CONTENT, _getPath, get, getWithDefault, _getProp } from './lib/property_get';
+export { PROXY_CONTENT, _getPath, get, _getProp } from './lib/property_get';
 export { set, _setProp, trySet } from './lib/property_set';
 export {
   objectAt,
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 518aa242719..23fcc0cc896 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -158,52 +158,6 @@ export function _getPath<T extends object>(root: T, path: string | string[]): an
   return obj;
 }
 
-/**
-  Retrieves the value of a property from an Object, or a default value in the
-  case that the property returns `undefined`.
-
-  ```javascript
-  import { getWithDefault } from '@ember/object';
-  getWithDefault(person, 'lastName', 'Doe');
-  ```
-
-  @method getWithDefault
-  @for @ember/object
-  @static
-  @param {Object} obj The object to retrieve from.
-  @param {String} keyName The name of the property to retrieve
-  @param {Object} defaultValue The value to return if the property value is undefined
-  @return {Object} The property value or the defaultValue.
-  @public
-  @deprecated
-*/
-export function getWithDefault<T extends object, K extends Extract<keyof T, string>>(
-  root: T,
-  key: K,
-  defaultValue: T[K]
-): T[K] {
-  deprecate(
-    'Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined.',
-    false,
-    {
-      id: 'ember-metal.get-with-default',
-      until: '4.0.0',
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-metal-get-with-default',
-      for: 'ember-source',
-      since: {
-        enabled: '3.21.0',
-      },
-    }
-  );
-
-  let value = get(root, key);
-
-  if (value === undefined) {
-    return defaultValue;
-  }
-  return value;
-}
-
 export default get;
 
 // Warm it up
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index 6e2d4ccdcc2..93160ea9343 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -1,6 +1,6 @@
 import { ENV } from '@ember/-internals/environment';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { get, set, getWithDefault, Mixin, observer, computed } from '../..';
+import { get, set, Mixin, observer, computed } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
@@ -205,197 +205,3 @@ moduleFor(
     }
   }
 );
-
-moduleFor(
-  'getWithDefault',
-  class extends AbstractTestCase {
-    ['@test should get arbitrary properties on an object'](assert) {
-      expectDeprecation(() => {
-        let obj = {
-          string: 'string',
-          number: 23,
-          boolTrue: true,
-          boolFalse: false,
-          nullValue: null,
-        };
-
-        for (let key in obj) {
-          if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-            continue;
-          }
-          assert.equal(getWithDefault(obj, key, 'fail'), obj[key], key);
-        }
-
-        obj = {
-          undef: undefined,
-        };
-
-        assert.equal(
-          getWithDefault(obj, 'undef', 'default'),
-          'default',
-          'explicit undefined retrieves the default'
-        );
-        assert.equal(
-          getWithDefault(obj, 'not-present', 'default'),
-          'default',
-          'non-present key retrieves the default'
-        );
-      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
-    }
-
-    ['@test should call unknownProperty if defined and value is undefined'](assert) {
-      let obj = {
-        count: 0,
-        unknownProperty(key) {
-          assert.equal(key, 'foo', 'should pass key');
-          this.count++;
-          return 'FOO';
-        },
-      };
-
-      assert.equal(get(obj, 'foo'), 'FOO', 'should return value from unknown');
-      assert.equal(obj.count, 1, 'should have invoked');
-    }
-
-    ['@test if unknownProperty is present, it is called using getFromEmberMetal()/set()'](assert) {
-      expectDeprecation(() => {
-        let obj = {
-          unknownProperty(key) {
-            if (key === 'foo') {
-              assert.equal(key, 'foo', 'should pass key');
-              return 'FOO';
-            }
-          },
-        };
-        assert.equal(
-          getWithDefault(obj, 'foo', 'fail'),
-          'FOO',
-          'should return value from unknownProperty'
-        );
-        assert.equal(
-          getWithDefault(obj, 'bar', 'default'),
-          'default',
-          'should convert undefined from unknownProperty into default'
-        );
-      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
-    }
-
-    ['@test if unknownProperty is present, it is called using accessors'](assert) {
-      if (ENV.USES_ACCESSORS) {
-        let obj = {
-          unknownProperty(key) {
-            if (key === 'foo') {
-              assert.equal(key, 'foo', 'should pass key');
-              return 'FOO';
-            }
-          },
-        };
-        assert.equal(aget(obj, 'foo', 'fail'), 'FOO', 'should return value from unknownProperty');
-        assert.equal(
-          aget(obj, 'bar', 'default'),
-          'default',
-          'should convert undefined from unknownProperty into default'
-        );
-      } else {
-        assert.ok('SKIPPING ACCESSORS');
-      }
-    }
-
-    ['@test gives helpful deprecation when a property tracked with `get` is mutated after access within unknownProperty within an autotracking transaction']() {
-      class EmberObject {
-        foo = null;
-
-        unknownProperty() {
-          get(this, 'foo');
-          set(this, 'foo', 123);
-        }
-      }
-
-      let obj = new EmberObject();
-
-      expectDeprecation(() => {
-        // TODO: this must be a bug??
-        expectDeprecation(
-          /You attempted to update `undefined`, but it had already been used previously in the same computation/
-        );
-
-        track(() => {
-          get(obj, 'bar');
-        });
-      }, /You attempted to update `foo` on `EmberObject`, but it had already been used previously in the same computation/);
-    }
-
-    // ..........................................................
-    // BUGS
-    //
-
-    ['@test (regression) watched properties on unmodified inherited objects should still return their original value'](
-      assert
-    ) {
-      expectDeprecation(() => {
-        let MyMixin = Mixin.create({
-          someProperty: 'foo',
-          propertyDidChange: observer('someProperty', () => {
-            /* nothing to do */
-          }),
-        });
-
-        let baseObject = MyMixin.apply({});
-        let theRealObject = Object.create(baseObject);
-
-        assert.equal(
-          getWithDefault(theRealObject, 'someProperty', 'fail'),
-          'foo',
-          'should return the set value, not false'
-        );
-
-        run(() => destroy(baseObject));
-      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
-    }
-
-    ['@test should respect prototypical inheritance when subclasses override CPs'](assert) {
-      let ParentClass = EmberObject.extend({
-        prop: computed({
-          get() {
-            assert.ok(false, 'incorrect getter called');
-            return 123;
-          },
-        }),
-      });
-
-      let SubClass = ParentClass.extend({
-        get prop() {
-          assert.ok(true, 'correct getter called');
-          return 456;
-        },
-      });
-
-      let instance = SubClass.create();
-
-      instance.prop;
-    }
-
-    ['@test should respect prototypical inheritance when subclasses override CPs with native classes'](
-      assert
-    ) {
-      class ParentClass extends EmberObject {
-        @computed
-        get prop() {
-          assert.ok(false, 'incorrect getter called');
-          return 123;
-        }
-      }
-
-      class SubClass extends ParentClass {
-        get prop() {
-          assert.ok(true, 'correct getter called');
-          return 456;
-        }
-      }
-
-      let instance = SubClass.create();
-
-      instance.prop;
-    }
-  }
-);
diff --git a/packages/@ember/-internals/metal/tests/tracked/get_test.js b/packages/@ember/-internals/metal/tests/tracked/get_test.js
index 7263666fb0e..024b7f1b19c 100644
--- a/packages/@ember/-internals/metal/tests/tracked/get_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/get_test.js
@@ -1,5 +1,5 @@
 import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
-import { get, getWithDefault, tracked } from '../..';
+import { get, tracked } from '../..';
 
 let createObj = function () {
   class Obj {
@@ -42,32 +42,5 @@ moduleFor(
 
       this.assert.equal(get(obj, 'path.key.value'), 'value for some-key');
     }
-
-    ['@test should get arbitrary properties on an object (getWithDefault DEPRECATED)']() {
-      expectDeprecation(() => {
-        let obj = createObj();
-
-        for (let key in obj) {
-          this.assert.equal(getWithDefault(obj, key, 'fail'), obj[key], key);
-        }
-
-        class Obj {
-          @tracked undef = undefined;
-        }
-
-        let obj2 = new Obj();
-
-        this.assert.equal(
-          getWithDefault(obj2, 'undef', 'default'),
-          'default',
-          'explicit undefined retrieves the default'
-        );
-        this.assert.equal(
-          getWithDefault(obj2, 'not-present', 'default'),
-          'default',
-          'non-present key retrieves the default'
-        );
-      }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
-    }
   }
 );
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index af32a6e2ad2..2c18eec61cb 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -49,7 +49,6 @@ export class Object extends CoreObject implements Observable {
     method: ObserverMethod<Target, this>
   ): this;
   removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  getWithDefault<K extends keyof this>(key: K, defaultValue: any): unknown;
   incrementProperty(keyName: keyof this, increment?: number): number;
   decrementProperty(keyName: keyof this, decrement?: number): number;
   toggleProperty(keyName: keyof this): boolean;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.js b/packages/@ember/-internals/runtime/lib/mixins/observable.js
index 763a86cc0c9..c32cedc4cb1 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.js
@@ -5,7 +5,6 @@
 import { peekMeta } from '@ember/-internals/meta';
 import {
   get,
-  getWithDefault,
   set,
   getProperties,
   setProperties,
@@ -404,25 +403,6 @@ export default Mixin.create({
     return hasListeners(this, `${key}:change`);
   },
 
-  /**
-    Retrieves the value of a property, or a default value in the case that the
-    property returns `undefined`.
-
-    ```javascript
-    person.getWithDefault('lastName', 'Doe');
-    ```
-
-    @method getWithDefault
-    @param {String} keyName The name of the property to retrieve
-    @param {Object} defaultValue The value to return if the property value is undefined
-    @return {Object} The property value or the defaultValue.
-    @public
-    @deprecated
-  */
-  getWithDefault(keyName, defaultValue) {
-    return getWithDefault(this, keyName, defaultValue);
-  },
-
   /**
     Set the value of a property to the current value plus some amount.
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
index 369dcc40261..5d4c284d519 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
@@ -3,7 +3,6 @@ import {
   computed,
   set,
   get,
-  getWithDefault,
   observer,
   defineProperty,
   notifyPropertyChange,
@@ -17,12 +16,10 @@ function K() {
   return this;
 }
 
-function testWithDefault(assert, expect, x, y, z) {
+function testGet(assert, expect, x, y) {
   assert.equal(get(x, y), expect);
-  expectDeprecation(() => {
-    assert.equal(getWithDefault(x, y, z), expect);
-    assert.equal(x.getWithDefault(y, z), expect);
-  }, /Using getWithDefault has been deprecated. Instead, consider using Ember get and explicitly checking for undefined./);
+  assert.equal(get(x, y), expect);
+  assert.equal(x.get(y), expect);
 }
 
 moduleFor(
@@ -35,7 +32,7 @@ moduleFor(
         }),
       });
 
-      testWithDefault(assert, 'FOO', MyClass.create(), 'foo');
+      testGet(assert, 'FOO', MyClass.create(), 'foo');
     }
 
     ['@test computed property on subclass'](assert) {
@@ -51,7 +48,7 @@ moduleFor(
         }),
       });
 
-      testWithDefault(assert, 'BAR', Subclass.create(), 'foo');
+      testGet(assert, 'BAR', Subclass.create(), 'foo');
     }
 
     ['@test replacing computed property with regular val'](assert) {
@@ -65,10 +62,10 @@ moduleFor(
         foo: 'BAR',
       });
 
-      testWithDefault(assert, 'BAR', Subclass.create(), 'foo');
+      testGet(assert, 'BAR', Subclass.create(), 'foo');
     }
 
-    ['@test complex depndent keys'](assert) {
+    ['@test complex dependent keys'](assert) {
       let MyClass = EmberObject.extend({
         init() {
           this._super(...arguments);
@@ -90,18 +87,18 @@ moduleFor(
       let obj1 = MyClass.create();
       let obj2 = Subclass.create();
 
-      testWithDefault(assert, 'BIFF 1', obj1, 'foo');
-      testWithDefault(assert, 'BIFF 21', obj2, 'foo');
+      testGet(assert, 'BIFF 1', obj1, 'foo');
+      testGet(assert, 'BIFF 21', obj2, 'foo');
 
       set(get(obj1, 'bar'), 'baz', 'BLARG');
 
-      testWithDefault(assert, 'BLARG 2', obj1, 'foo');
-      testWithDefault(assert, 'BIFF 21', obj2, 'foo');
+      testGet(assert, 'BLARG 2', obj1, 'foo');
+      testGet(assert, 'BIFF 21', obj2, 'foo');
 
       set(get(obj2, 'bar'), 'baz', 'BOOM');
 
-      testWithDefault(assert, 'BLARG 2', obj1, 'foo');
-      testWithDefault(assert, 'BOOM 22', obj2, 'foo');
+      testGet(assert, 'BLARG 2', obj1, 'foo');
+      testGet(assert, 'BOOM 22', obj2, 'foo');
     }
 
     ['@test complex dependent keys changing complex dependent keys'](assert) {
@@ -135,13 +132,13 @@ moduleFor(
 
       let obj2 = Subclass.create();
 
-      testWithDefault(assert, 'BIFF2 1', obj2, 'foo');
+      testGet(assert, 'BIFF2 1', obj2, 'foo');
 
       set(get(obj2, 'bar'), 'baz', 'BLARG');
-      testWithDefault(assert, 'BIFF2 1', obj2, 'foo'); // should not invalidate property
+      testGet(assert, 'BIFF2 1', obj2, 'foo'); // should not invalidate property
 
       set(get(obj2, 'bar2'), 'baz', 'BLARG');
-      testWithDefault(assert, 'BLARG 2', obj2, 'foo'); // should not invalidate property
+      testGet(assert, 'BLARG 2', obj2, 'foo'); // should not invalidate property
     }
 
     ['@test can retrieve metadata for a computed property'](assert) {
diff --git a/packages/@ember/-internals/runtime/types/observable.d.ts b/packages/@ember/-internals/runtime/types/observable.d.ts
index 96b2ae03d5d..3a73546cebf 100644
--- a/packages/@ember/-internals/runtime/types/observable.d.ts
+++ b/packages/@ember/-internals/runtime/types/observable.d.ts
@@ -51,11 +51,6 @@ interface Observable {
     method: ObserverMethod<Target, this>
   ): this;
   removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  /**
-   * Retrieves the value of a property, or a default value in the case that the
-   * property returns `undefined`.
-   */
-  getWithDefault<K extends keyof this>(key: K, defaultValue: any): unknown;
   /**
    * Set the value of a property to the current value plus some amount.
    */
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index 6b07d4d3190..dda722726d7 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -11,7 +11,6 @@ export {
   set,
   getProperties,
   setProperties,
-  getWithDefault,
   observer,
   computed,
   trySet,
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f0d1f8cab34..7a8cd0838b8 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -274,7 +274,6 @@ Ember.ComputedProperty = metal.ComputedProperty;
 Ember._setClassicDecorator = metal.setClassicDecorator;
 Ember.meta = meta;
 Ember.get = metal.get;
-Ember.getWithDefault = metal.getWithDefault;
 Ember._getPath = metal._getPath;
 Ember.set = metal.set;
 Ember.trySet = metal.trySet;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..5feb3d3e677 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -291,7 +291,6 @@ let allExports = [
   ['defineProperty', '@ember/object', 'defineProperty'],
   ['get', '@ember/object', 'get'],
   ['getProperties', '@ember/object', 'getProperties'],
-  ['getWithDefault', '@ember/object', 'getWithDefault'],
   ['notifyPropertyChange', '@ember/object', 'notifyPropertyChange'],
   ['observer', '@ember/object', 'observer'],
   ['set', '@ember/object', 'set'],
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..a4f721e75a6 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -264,7 +264,6 @@ module.exports = {
     'getViewElement',
     'getViewId',
     'getViewRange',
-    'getWithDefault',
     'global',
     'gt',
     'gte',

From a061f8f1f09e01f85c5fda665424cdc118f5fd77 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nfurniss@linkedin.com>
Date: Tue, 13 Jul 2021 10:55:44 -0700
Subject: [PATCH 0547/1405] Remove deprecated Ember.merge for v4.0

---
 packages/@ember/deprecated-features/index.ts  |  1 -
 packages/@ember/polyfills/index.ts            |  6 --
 packages/@ember/polyfills/lib/merge.ts        | 56 -------------------
 packages/@ember/polyfills/tests/merge_test.js | 21 -------
 packages/ember/index.js                       |  3 +-
 packages/ember/tests/reexports_test.js        |  1 -
 tests/docs/expected.js                        |  1 -
 7 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 packages/@ember/polyfills/lib/merge.ts
 delete mode 100644 packages/@ember/polyfills/tests/merge_test.js

diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index d750d8b3876..ccebdeeb475 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -5,7 +5,6 @@
 
 export const SEND_ACTION = !!'3.4.0';
 export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
-export const MERGE = !!'3.6.0-beta.1';
 export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
diff --git a/packages/@ember/polyfills/index.ts b/packages/@ember/polyfills/index.ts
index 25ed10d0302..58f3eed8a65 100644
--- a/packages/@ember/polyfills/index.ts
+++ b/packages/@ember/polyfills/index.ts
@@ -1,10 +1,4 @@
-import { MERGE } from '@ember/deprecated-features';
-import { default as deprecatedMerge } from './lib/merge';
-
-let merge = MERGE ? deprecatedMerge : undefined;
-
 // Export `assignPolyfill` for testing
 export { default as assign, assign as assignPolyfill } from './lib/assign';
-export { merge };
 
 export const hasPropertyAccessors = true;
diff --git a/packages/@ember/polyfills/lib/merge.ts b/packages/@ember/polyfills/lib/merge.ts
deleted file mode 100644
index dfd90473a17..00000000000
--- a/packages/@ember/polyfills/lib/merge.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { deprecate } from '@ember/debug';
-
-/**
- @module @ember/polyfills
-*/
-
-function merge<T, U>(original: T, updates: U): T & U;
-
-/**
-  Merge the contents of two objects together into the first object.
-
-  ```javascript
-  import { merge } from '@ember/polyfills';
-
-  merge({ first: 'Tom' }, { last: 'Dale' }); // { first: 'Tom', last: 'Dale' }
-  var a = { first: 'Yehuda' };
-  var b = { last: 'Katz' };
-  merge(a, b); // a == { first: 'Yehuda', last: 'Katz' }, b == { last: 'Katz' }
-  ```
-
-  @method merge
-  @static
-  @for @ember/polyfills
-  @param {Object} original The object to merge into
-  @param {Object} updates The object to copy properties from
-  @return {Object}
-  @deprecated
-  @public
-*/
-function merge(original: object, updates: object) {
-  deprecate('Use of `merge` has been deprecated. Please use `assign` instead.', false, {
-    id: 'ember-polyfills.deprecate-merge',
-    until: '4.0.0',
-    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-polyfills-deprecate-merge',
-    for: 'ember-source',
-    since: {
-      enabled: '3.6.0-beta.1',
-    },
-  });
-
-  if (updates === null || typeof updates !== 'object') {
-    return original;
-  }
-
-  let props = Object.keys(updates);
-  let prop;
-
-  for (let i = 0; i < props.length; i++) {
-    prop = props[i];
-    original[prop] = updates[prop];
-  }
-
-  return original;
-}
-
-export default merge;
diff --git a/packages/@ember/polyfills/tests/merge_test.js b/packages/@ember/polyfills/tests/merge_test.js
deleted file mode 100644
index 69ab885f0a0..00000000000
--- a/packages/@ember/polyfills/tests/merge_test.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { merge } from '..';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  'Ember.merge',
-  class extends AbstractTestCase {
-    ['@test merging objects'](assert) {
-      let src1 = { a: 1 };
-      let src2 = { b: 2 };
-      expectDeprecation(() => {
-        merge(src1, src2);
-      }, 'Use of `merge` has been deprecated. Please use `assign` instead.');
-
-      assert.deepEqual(
-        src1,
-        { a: 1, b: 2 },
-        'merge copies values from second source object to first object'
-      );
-    }
-  }
-);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f0d1f8cab34..ad54f1167f4 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -98,7 +98,7 @@ import Resolver from '@ember/application/globals-resolver';
 import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
-import { assign, merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 
 import {
@@ -211,7 +211,6 @@ Ember.EngineInstance = EngineInstance;
 
 // ****@ember/polyfills****
 Ember.assign = assign;
-Ember.merge = merge;
 
 // ****@ember/-internals/utils****
 Ember.generateGuid = utils.generateGuid;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..17a9a1780f5 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -373,7 +373,6 @@ let allExports = [
   // @ember/polyfills
   ['assign', '@ember/polyfills', 'assign'],
   ['platform.hasPropertyAccessors', '@ember/polyfills', 'hasPropertyAccessors'],
-  ['merge', '@ember/polyfills', 'merge'],
 
   // @ember/routing/auto-location
   ['AutoLocation', '@ember/routing/auto-location', 'default'],
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..177fe2934b8 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -366,7 +366,6 @@ module.exports = {
     'match',
     'matches',
     'max',
-    'merge',
     'mergedProperties',
     'meta',
     'metadata',

From 633139385e300d4267d4e8e34e22b5c3ed1b2549 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 12:21:59 -0700
Subject: [PATCH 0548/1405] fix eslint

---
 packages/@ember/-internals/metal/lib/property_get.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 23fcc0cc896..e8c7862317d 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -2,7 +2,7 @@
 @module @ember/object
 */
 import { HAS_NATIVE_PROXY, isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
   consumeTag,

From cfdb781faf69ff2a8b6e904c3f91322f72ef22d5 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 12:48:45 -0700
Subject: [PATCH 0549/1405] Fix more lint issues

---
 packages/@ember/-internals/metal/tests/accessors/get_test.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index 93160ea9343..a9a00c87747 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -1,10 +1,9 @@
 import { ENV } from '@ember/-internals/environment';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { get, set, Mixin, observer, computed } from '../..';
+import { get, Mixin, observer } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
-import { track } from '@glimmer/validator';
 
 function aget(x, y) {
   return x[y];

From d08dde55001e6a08f486fc0ef595b48f67e44b5c Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 14:41:56 -0700
Subject: [PATCH 0550/1405] Remove deprecated tryInvoke for v4.0

---
 packages/@ember/-internals/utils/index.ts     |  2 +-
 .../@ember/-internals/utils/lib/invoke.ts     | 51 ----------------
 .../-internals/utils/tests/try_invoke_test.js | 60 -------------------
 packages/@ember/utils/index.js                |  1 -
 packages/ember/index.js                       |  1 -
 packages/ember/tests/reexports_test.js        |  1 -
 tests/docs/expected.js                        |  1 -
 7 files changed, 1 insertion(+), 116 deletions(-)
 delete mode 100644 packages/@ember/-internals/utils/tests/try_invoke_test.js

diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index 12504123e60..6ba703fa56d 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -23,7 +23,7 @@ export {
 } from './lib/super';
 export { default as inspect } from './lib/inspect';
 export { default as lookupDescriptor } from './lib/lookup-descriptor';
-export { canInvoke, tryInvoke } from './lib/invoke';
+export { canInvoke } from './lib/invoke';
 export { default as makeArray } from './lib/make-array';
 export { getName, setName } from './lib/name';
 export { default as toString } from './lib/to-string';
diff --git a/packages/@ember/-internals/utils/lib/invoke.ts b/packages/@ember/-internals/utils/lib/invoke.ts
index 2581527280a..5656fbc5af3 100644
--- a/packages/@ember/-internals/utils/lib/invoke.ts
+++ b/packages/@ember/-internals/utils/lib/invoke.ts
@@ -1,5 +1,3 @@
-import { deprecate } from '@ember/debug';
-
 /**
   Checks to see if the `methodName` exists on the `obj`.
 
@@ -25,52 +23,3 @@ export function canInvoke(obj: any | null | undefined, methodName: string): obj
 /**
   @module @ember/utils
 */
-
-/**
-  Checks to see if the `methodName` exists on the `obj`,
-  and if it does, invokes it with the arguments passed.
-
-  ```javascript
-  import { tryInvoke } from '@ember/utils';
-
-  let d = new Date('03/15/2013');
-
-  tryInvoke(d, 'getTime');              // 1363320000000
-  tryInvoke(d, 'setFullYear', [2014]);  // 1394856000000
-  tryInvoke(d, 'noSuchMethod', [2014]); // undefined
-  ```
-
-  @method tryInvoke
-  @for @ember/utils
-  @static
-  @param {Object} obj The object to check for the method
-  @param {String} methodName The method name to check for
-  @param {Array} [args] The arguments to pass to the method
-  @return {*} the return value of the invoked method or undefined if it cannot be invoked
-  @public
-  @deprecated Use Javascript's optional chaining instead.
-*/
-export function tryInvoke(
-  obj: any | undefined | null,
-  methodName: string,
-  args: Array<any | undefined | null>
-) {
-  deprecate(
-    `Use of tryInvoke is deprecated. Instead, consider using JavaScript's optional chaining.`,
-    false,
-    {
-      id: 'ember-utils.try-invoke',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.24.0',
-      },
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-utils-try-invoke',
-    }
-  );
-
-  if (canInvoke(obj, methodName)) {
-    let method = obj[methodName];
-    return method.apply(obj, args);
-  }
-}
diff --git a/packages/@ember/-internals/utils/tests/try_invoke_test.js b/packages/@ember/-internals/utils/tests/try_invoke_test.js
deleted file mode 100644
index a572c5f466f..00000000000
--- a/packages/@ember/-internals/utils/tests/try_invoke_test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { tryInvoke } from '..';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
-
-let obj;
-
-moduleFor(
-  'Ember.tryInvoke',
-  class extends TestCase {
-    constructor() {
-      super();
-
-      obj = {
-        aMethodThatExists() {
-          return true;
-        },
-        aMethodThatTakesArguments(arg1, arg2) {
-          return arg1 === arg2;
-        },
-      };
-    }
-
-    teardown() {
-      obj = undefined;
-    }
-
-    ["@test should return undefined when the object doesn't exist"](assert) {
-      expectDeprecation(
-        () => assert.equal(tryInvoke(undefined, 'aMethodThatDoesNotExist'), undefined),
-        /Use of tryInvoke is deprecated/
-      );
-    }
-
-    ["@test should return undefined when asked to perform a method that doesn't exist on the object"](
-      assert
-    ) {
-      expectDeprecation(
-        () => assert.equal(tryInvoke(obj, 'aMethodThatDoesNotExist'), undefined),
-        /Use of tryInvoke is deprecated/
-      );
-    }
-
-    ['@test should return what the method returns when asked to perform a method that exists on the object'](
-      assert
-    ) {
-      expectDeprecation(
-        () => assert.equal(tryInvoke(obj, 'aMethodThatExists'), true),
-        /Use of tryInvoke is deprecated/
-      );
-    }
-
-    ['@test should return what the method returns when asked to perform a method that takes arguments and exists on the object'](
-      assert
-    ) {
-      expectDeprecation(
-        () => assert.equal(tryInvoke(obj, 'aMethodThatTakesArguments', [true, true]), true),
-        /Use of tryInvoke is deprecated/
-      );
-    }
-  }
-);
diff --git a/packages/@ember/utils/index.js b/packages/@ember/utils/index.js
index 5049a59886e..492bce4c78b 100644
--- a/packages/@ember/utils/index.js
+++ b/packages/@ember/utils/index.js
@@ -1,3 +1,2 @@
 export { isNone, isBlank, isEmpty, isPresent } from '@ember/-internals/metal';
-export { tryInvoke } from '@ember/-internals/utils';
 export { compare, isEqual, typeOf } from '@ember/-internals/runtime';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f0d1f8cab34..8922eb866f2 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -220,7 +220,6 @@ Ember.guidFor = utils.guidFor;
 Ember.inspect = utils.inspect;
 Ember.makeArray = utils.makeArray;
 Ember.canInvoke = utils.canInvoke;
-Ember.tryInvoke = utils.tryInvoke;
 Ember.wrap = utils.wrap;
 Ember.uuid = utils.uuid;
 
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..ea06450b2d9 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -468,7 +468,6 @@ let allExports = [
   ['isEqual', '@ember/utils', 'isEqual'],
   ['isNone', '@ember/utils', 'isNone'],
   ['isPresent', '@ember/utils', 'isPresent'],
-  ['tryInvoke', '@ember/utils', 'tryInvoke'],
   ['typeOf', '@ember/utils', 'typeOf'],
 
   // @ember/version
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..a5ba730d6e9 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -573,7 +573,6 @@ module.exports = {
     'trigger',
     'triggerAction',
     'triggerEvent',
-    'tryInvoke',
     'trySet',
     'type',
     'typeInjection',

From 3574f40b662429eef005c07ce33dd2b0eae2055e Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 16:04:09 -0700
Subject: [PATCH 0551/1405] Remove deprecated -in-element logic from transform

---
 .../syntax/deprecated-in-element-test.js      | 263 ------------------
 .../lib/plugins/transform-in-element.ts       |  66 +----
 2 files changed, 2 insertions(+), 327 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js

diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
deleted file mode 100644
index 84a6a5de9bb..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/deprecated-in-element-test.js
+++ /dev/null
@@ -1,263 +0,0 @@
-import { moduleFor, RenderingTestCase, strip, equalTokens, runTask } from 'internal-test-helpers';
-import { Component } from '@ember/-internals/glimmer';
-import { set } from '@ember/-internals/metal';
-
-const deprecationMessage = /The use of the private `{{-in-element}}` is deprecated, please refactor to the public `{{in-element}}`/;
-
-moduleFor(
-  '{{-in-element}}',
-  class extends RenderingTestCase {
-    ['@test allows rendering into an external element']() {
-      expectDeprecation(deprecationMessage);
-
-      let someElement = document.createElement('div');
-
-      this.render(
-        strip`
-          {{#-in-element this.someElement}}
-            {{this.text}}
-          {{/-in-element}}
-        `,
-        {
-          someElement,
-          text: 'Whoop!',
-        }
-      );
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'Whoop!');
-
-      this.assertStableRerender();
-
-      runTask(() => set(this.context, 'text', 'Huzzah!!'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'Huzzah!!');
-
-      runTask(() => set(this.context, 'text', 'Whoop!'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'Whoop!');
-    }
-
-    ['@test it appends to the external element by default']() {
-      expectDeprecation(deprecationMessage);
-
-      let someElement = document.createElement('div');
-      someElement.appendChild(document.createTextNode('foo '));
-
-      this.render(
-        strip`
-          {{#-in-element this.someElement}}
-            {{this.text}}
-          {{/-in-element}}
-        `,
-        {
-          someElement,
-          text: 'bar',
-        }
-      );
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'foo bar');
-
-      this.assertStableRerender();
-
-      runTask(() => set(this.context, 'text', 'bar!!'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'foo bar!!');
-
-      runTask(() => set(this.context, 'text', 'bar'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'foo bar');
-    }
-
-    ['@test allows appending to the external element with insertBefore=null']() {
-      expectDeprecation(deprecationMessage);
-
-      let someElement = document.createElement('div');
-      someElement.appendChild(document.createTextNode('foo '));
-
-      this.render(
-        strip`
-          {{#-in-element this.someElement insertBefore=null}}
-            {{this.text}}
-          {{/-in-element}}
-        `,
-        {
-          someElement,
-          text: 'bar',
-        }
-      );
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'foo bar');
-
-      this.assertStableRerender();
-
-      runTask(() => set(this.context, 'text', 'bar!!'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'foo bar!!');
-
-      runTask(() => set(this.context, 'text', 'bar'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'foo bar');
-    }
-
-    ['@test allows clearing the external element with insertBefore=undefined']() {
-      expectDeprecation(deprecationMessage);
-
-      let someElement = document.createElement('div');
-      someElement.appendChild(document.createTextNode('foo '));
-
-      this.render(
-        strip`
-          {{#-in-element this.someElement insertBefore=undefined}}
-            {{this.text}}
-          {{/-in-element}}
-        `,
-        {
-          someElement,
-          text: 'bar',
-        }
-      );
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'bar');
-
-      this.assertStableRerender();
-
-      runTask(() => set(this.context, 'text', 'bar!!'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'bar!!');
-
-      runTask(() => set(this.context, 'text', 'bar'));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, 'bar');
-    }
-
-    ['@test does not allow insertBefore=non-null-value']() {
-      expectDeprecation(deprecationMessage);
-
-      let someElement = document.createElement('div');
-
-      expectAssertion(() => {
-        this.render(
-          strip`
-            {{#-in-element this.someElement insertBefore=".foo"}}
-              {{this.text}}
-            {{/-in-element}}
-          `,
-          {
-            someElement,
-            text: 'Whoop!',
-          }
-        );
-      }, /Can only pass a null or undefined literals to insertBefore in -in-element, received:/);
-    }
-
-    ['@test components are cleaned up properly'](assert) {
-      expectDeprecation(deprecationMessage);
-
-      let hooks = [];
-
-      let someElement = document.createElement('div');
-
-      this.registerComponent('modal-display', {
-        ComponentClass: Component.extend({
-          didInsertElement() {
-            hooks.push('didInsertElement');
-          },
-
-          willDestroyElement() {
-            hooks.push('willDestroyElement');
-          },
-        }),
-
-        template: `{{this.text}}`,
-      });
-
-      this.render(
-        strip`
-          {{#if this.showModal}}
-            {{#-in-element this.someElement}}
-              {{modal-display text=this.text}}
-            {{/-in-element}}
-          {{/if}}
-        `,
-        {
-          someElement,
-          text: 'Whoop!',
-          showModal: false,
-        }
-      );
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, '');
-
-      this.assertStableRerender();
-
-      runTask(() => set(this.context, 'showModal', true));
-
-      equalTokens(this.element, '<!---->');
-      this.assertComponentElement(someElement.firstChild, {
-        content: 'Whoop!',
-      });
-
-      runTask(() => set(this.context, 'text', 'Huzzah!'));
-
-      equalTokens(this.element, '<!---->');
-      this.assertComponentElement(someElement.firstChild, {
-        content: 'Huzzah!',
-      });
-
-      runTask(() => set(this.context, 'text', 'Whoop!'));
-
-      equalTokens(this.element, '<!---->');
-      this.assertComponentElement(someElement.firstChild, {
-        content: 'Whoop!',
-      });
-
-      runTask(() => set(this.context, 'showModal', false));
-
-      equalTokens(this.element, '<!---->');
-      equalTokens(someElement, '');
-
-      assert.deepEqual(hooks, ['didInsertElement', 'willDestroyElement']);
-    }
-
-    ['@test appending to the root element should not cause double clearing']() {
-      expectDeprecation(deprecationMessage);
-
-      this.render(
-        strip`
-          Before
-          {{#-in-element this.rootElement insertBefore=null}}
-            {{this.text}}
-          {{/-in-element}}
-          After
-        `,
-        {
-          rootElement: this.element,
-          text: 'Whoop!',
-        }
-      );
-
-      equalTokens(this.element, 'BeforeWhoop!<!---->After');
-
-      this.assertStableRerender();
-
-      runTask(() => set(this.context, 'text', 'Huzzah!'));
-
-      equalTokens(this.element, 'BeforeHuzzah!<!---->After');
-
-      // teardown happens in afterEach and should not cause double-clearing error
-    }
-  }
-);
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 6ef1ba31c94..43b135c2ba9 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -1,6 +1,5 @@
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
 import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
@@ -9,26 +8,7 @@ import { isPath } from './utils';
 */
 
 /**
-  A Glimmer2 AST transformation that handles the public `{{in-element}}` as per RFC287, and deprecates but still
-  continues support for the private `{{-in-element}}`.
-
-  Transforms:
-
-  ```handlebars
-  {{#-in-element someElement}}
-    {{modal-display text=text}}
-  {{/-in-element}}
-  ```
-
-  into:
-
-  ```handlebars
-  {{#in-element someElement}}
-    {{modal-display text=text}}
-  {{/in-element}}
-  ```
-
-  And issues a deprecation message.
+  A Glimmer2 AST transformation that handles the public `{{in-element}}` as per RFC287.
 
   Issues a build time assertion for:
 
@@ -42,7 +22,6 @@ import { isPath } from './utils';
   @class TransformInElement
 */
 export default function transformInElement(env: EmberASTPluginEnvironment): ASTPlugin {
-  let moduleName = env.meta?.moduleName;
   let { builders: b } = env.syntax;
 
   return {
@@ -72,47 +51,6 @@ export default function transformInElement(env: EmberASTPluginEnvironment): ASTP
               );
             }
           });
-        } else if (node.path.original === '-in-element') {
-          let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-          deprecate(
-            `The use of the private \`{{-in-element}}\` is deprecated, please refactor to the public \`{{in-element}}\`. ${sourceInformation}`,
-            false,
-            {
-              id: 'glimmer.private-in-element',
-              until: '3.25.0',
-              for: 'ember-source',
-              since: {
-                enabled: '3.20.0',
-              },
-            }
-          );
-
-          node.path.original = 'in-element';
-          node.path.parts = ['in-element'];
-
-          // replicate special hash arguments added here:
-          // https://github.com/glimmerjs/glimmer-vm/blob/ba9b37d44b85fa1385eeeea71910ff5798198c8e/packages/%40glimmer/syntax/lib/parser/handlebars-node-visitors.ts#L340-L363
-          let needsInsertBefore = true;
-          let hash = node.hash;
-          hash.pairs.forEach((pair) => {
-            if (pair.key === 'insertBefore') {
-              assert(
-                `Can only pass a null or undefined literals to insertBefore in -in-element, received: ${JSON.stringify(
-                  pair.value
-                )}`,
-                pair.value.type === 'NullLiteral' || pair.value.type === 'UndefinedLiteral'
-              );
-
-              needsInsertBefore = false;
-            }
-          });
-
-          // Maintain compatibility with previous -in-element behavior (defaults to append, not clear)
-          if (needsInsertBefore) {
-            let nullLiteral = b.literal('NullLiteral', null);
-            let nextSibling = b.pair('insertBefore', nullLiteral);
-            hash.pairs.push(nextSibling);
-          }
         }
       },
     },

From 103a212150e694b28ea0478dd81c70bd46d2be8c Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 15:34:46 -0700
Subject: [PATCH 0552/1405] Remove deprecated loc

---
 .../-internals/glimmer/lib/helpers/loc.ts     |  43 ------
 .../-internals/glimmer/lib/setup-registry.ts  |   3 -
 .../tests/integration/helpers/loc-test.js     | 127 ------------------
 packages/@ember/string/index.ts               |  79 -----------
 packages/@ember/string/tests/loc_test.js      |  80 -----------
 packages/ember/tests/reexports_test.js        |   1 -
 tests/docs/expected.js                        |   1 -
 7 files changed, 334 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/helpers/loc.ts
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
 delete mode 100644 packages/@ember/string/tests/loc_test.js

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/loc.ts b/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
deleted file mode 100644
index 83a73688d43..00000000000
--- a/packages/@ember/-internals/glimmer/lib/helpers/loc.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
-@module ember
-*/
-
-import { loc } from '@ember/string';
-import { helper } from '../helper';
-
-/**
-  Calls [String.loc](/ember/release/classes/String/methods/loc?anchor=loc) with the
-  provided string. This is a convenient way to localize text within a template.
-  For example:
-
-  ```javascript
-  Ember.STRINGS = {
-    '_welcome_': 'Bonjour'
-  };
-  ```
-
-  ```handlebars
-  <div class='message'>
-    {{loc '_welcome_'}}
-  </div>
-  ```
-
-  ```html
-  <div class='message'>
-    Bonjour
-  </div>
-  ```
-
-  See [String.loc](/ember/release/classes/String/methods/loc?anchor=loc) for how to
-  set up localized string references.
-
-  @method loc
-  @for Ember.Templates.helpers
-  @param {String} str The string to format.
-  @see {String#loc}
-  @public
-  @deprecated
-*/
-export default helper(function (params) {
-  return loc.apply(null, params as any /* let the other side handle errors */);
-});
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 7eb9588f2d6..4bb5844c9a5 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -10,7 +10,6 @@ import LinkTo from './components/link-to';
 import TextField from './components/text-field';
 import Textarea from './components/textarea';
 import { clientBuilder, rehydrationBuilder, serializeBuilder } from './dom';
-import loc from './helpers/loc';
 import { Renderer } from './renderer';
 import OutletTemplate from './templates/outlet';
 import RootTemplate from './templates/root';
@@ -55,8 +54,6 @@ export function setupEngineRegistry(registry: Registry): void {
 
   registry.optionsForType('helper', { instantiate: false });
 
-  registry.register('helper:loc', loc);
-
   registry.register('component:-text-field', TextField);
   registry.register('component:-checkbox', Checkbox);
   registry.register('component:input', Input);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
deleted file mode 100644
index b5536b06c82..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/loc-test.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
-
-import { set } from '@ember/-internals/metal';
-import { _setStrings } from '@ember/string';
-
-moduleFor(
-  'Helpers test: {{loc}}',
-  class extends RenderingTestCase {
-    constructor() {
-      super(...arguments);
-      _setStrings({
-        'Hello Friend': 'Hallo Freund',
-        Hello: 'Hallo, %@',
-      });
-    }
-
-    teardown() {
-      super.teardown();
-      _setStrings({});
-    }
-
-    ['@test it lets the original value through by default']() {
-      expectDeprecation(() => this.render(`{{loc "Hiya buddy!"}}`), /loc is deprecated/);
-      this.assertText('Hiya buddy!', 'the unlocalized string is correct');
-      runTask(() => this.rerender());
-      this.assertText('Hiya buddy!', 'the unlocalized string is correct after rerender');
-    }
-
-    ['@test it localizes a simple string']() {
-      expectDeprecation(() => this.render(`{{loc "Hello Friend"}}`), /loc is deprecated/);
-      this.assertText('Hallo Freund', 'the localized string is correct');
-      runTask(() => this.rerender());
-      this.assertText('Hallo Freund', 'the localized string is correct after rerender');
-    }
-
-    ['@test it takes passed formats into an account']() {
-      expectDeprecation(() => {
-        this.render(`{{loc "%@, %@" "Hello" "Mr. Pitkin"}}`);
-      }, /loc is deprecated/);
-      this.assertText('Hello, Mr. Pitkin', 'the formatted string is correct');
-      runTask(() => this.rerender());
-      this.assertText('Hello, Mr. Pitkin', 'the formatted string is correct after rerender');
-    }
-
-    ['@test it updates when bound params change']() {
-      expectDeprecation(() => {
-        this.render(`{{loc this.simple}} - {{loc this.personal 'Mr. Pitkin'}}`, {
-          simple: 'Hello Friend',
-          personal: 'Hello',
-        });
-        this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct');
-      }, /loc is deprecated/);
-
-      runTask(() => this.rerender());
-      this.assertText(
-        'Hallo Freund - Hallo, Mr. Pitkin',
-        'the bound value is correct after rerender'
-      );
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'simple', "G'day mate"));
-        this.assertText(
-          "G'day mate - Hallo, Mr. Pitkin",
-          'the bound value is correct after update'
-        );
-      }, /loc is deprecated/);
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'simple', 'Hello Friend'));
-        this.assertText(
-          'Hallo Freund - Hallo, Mr. Pitkin',
-          'the bound value is correct after reset'
-        );
-      }, /loc is deprecated/);
-    }
-
-    ['@test it updates when nested bound params change']() {
-      expectDeprecation(() => {
-        this.render(
-          `{{loc this.greetings.simple}} - {{loc this.greetings.personal 'Mr. Pitkin'}}`,
-          {
-            greetings: {
-              simple: 'Hello Friend',
-              personal: 'Hello',
-            },
-          }
-        );
-      }, /loc is deprecated/);
-      this.assertText('Hallo Freund - Hallo, Mr. Pitkin', 'the bound value is correct');
-
-      runTask(() => this.rerender());
-      this.assertText(
-        'Hallo Freund - Hallo, Mr. Pitkin',
-        'the bound value is correct after rerender'
-      );
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'greetings.simple', "G'day mate"));
-        this.assertText(
-          "G'day mate - Hallo, Mr. Pitkin",
-          'the bound value is correct after interior mutation'
-        );
-      }, /loc is deprecated/);
-
-      expectDeprecation(() => {
-        runTask(() =>
-          set(this.context, 'greetings', {
-            simple: 'Hello Friend',
-            personal: 'Hello',
-          })
-        );
-        this.assertText(
-          'Hallo Freund - Hallo, Mr. Pitkin',
-          'the bound value is correct after replacement'
-        );
-      }, /loc is deprecated/);
-    }
-
-    ['@test it can be overriden']() {
-      this.registerHelper('loc', () => 'Yup');
-      this.render(`{{loc this.greeting}}`, {
-        greeting: 'Hello Friend',
-      });
-      this.assertText('Yup', 'the localized string is correct');
-    }
-  }
-);
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index ce14383b106..ff1ac0ee5ac 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -7,7 +7,6 @@ export { getStrings as _getStrings, setStrings as _setStrings } from './lib/stri
 import { ENV } from '@ember/-internals/environment';
 import { Cache } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
-import { getString } from './lib/string_registry';
 
 import {
   htmlSafe as internalHtmlSafe,
@@ -81,66 +80,6 @@ const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
   @public
 */
 
-function _fmt(str: string, formats: any[]) {
-  // first, replace any ORDERED replacements.
-  let idx = 0; // the current index for non-numerical replacements
-  return str.replace(/%@([0-9]+)?/g, (_s: string, argIndex: string) => {
-    let i = argIndex ? parseInt(argIndex, 10) - 1 : idx++;
-    let r = i < formats.length ? formats[i] : undefined;
-    return typeof r === 'string' ? r : r === null ? '(null)' : r === undefined ? '' : String(r);
-  });
-}
-
-/**
-  Formats the passed string, but first looks up the string in the localized
-  strings hash. This is a convenient way to localize text.
-
-  Note that it is traditional but not required to prefix localized string
-  keys with an underscore or other character so you can easily identify
-  localized strings.
-
-  ```javascript
-  import { loc } from '@ember/string';
-
-  Ember.STRINGS = {
-    '_Hello World': 'Bonjour le monde',
-    '_Hello %@ %@': 'Bonjour %@ %@'
-  };
-
-  loc("_Hello World");  // 'Bonjour le monde';
-  loc("_Hello %@ %@", ["John", "Smith"]);  // "Bonjour John Smith";
-  ```
-
-  @method loc
-  @param {String} str The string to format
-  @param {Array} formats Optional array of parameters to interpolate into string.
-  @return {String} formatted string
-  @public
-  @deprecated
-*/
-export function loc(str: string, formats: any[]): string {
-  deprecate(
-    'loc is deprecated, please use a dedicated localization solution like ember-intl. More alternatives listed at https://emberobserver.com/categories/internationalization.',
-    false,
-    {
-      id: 'ember-string.loc',
-      until: '4.0.0',
-      for: 'ember-source',
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-string-loc',
-      since: {
-        enabled: '3.24',
-      },
-    }
-  );
-
-  if (!Array.isArray(formats) || arguments.length > 2) {
-    formats = Array.prototype.slice.call(arguments, 1);
-  }
-
-  str = getString(str) || str;
-  return _fmt(str, formats);
-}
-
 /**
   Splits a string into separate units separated by spaces, eliminating any
   empty strings in the process. This is a convenience method for split that
@@ -367,24 +306,6 @@ if (ENV.EXTEND_PROTOTYPES.String) {
       value: deprecateEmberStringPrototypeExtension('w', w),
     },
 
-    /**
-      See [String.loc](/ember/release/classes/String/methods/loc?anchor=loc).
-
-      @method loc
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    loc: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value(this: string, ...args: any[]) {
-        return loc(this, args);
-      },
-    },
-
     /**
       See [String.camelize](/ember/release/classes/String/methods/camelize?anchor=camelize).
 
diff --git a/packages/@ember/string/tests/loc_test.js b/packages/@ember/string/tests/loc_test.js
deleted file mode 100644
index 33cdc1e6875..00000000000
--- a/packages/@ember/string/tests/loc_test.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { ENV } from '@ember/-internals/environment';
-import { loc } from '@ember/string';
-import { setStrings, getStrings } from '@ember/string/lib/string_registry';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-let oldString;
-
-function test(assert, given, args, expected, description) {
-  expectDeprecation(() => {
-    assert.equal(loc(given, args), expected, description);
-    if (ENV.EXTEND_PROTOTYPES.String) {
-      assert.deepEqual(given.loc(...args), expected, description);
-    }
-  }, /loc is deprecated/);
-}
-
-moduleFor(
-  'EmberStringUtils.loc',
-  class extends AbstractTestCase {
-    beforeEach() {
-      oldString = getStrings();
-      setStrings({
-        '_Hello World': 'Bonjour le monde',
-        '_Hello %@': 'Bonjour %@',
-        '_Hello %@ %@': 'Bonjour %@ %@',
-        '_Hello %@# %@#': 'Bonjour %@2 %@1',
-      });
-    }
-
-    afterEach() {
-      setStrings(oldString);
-    }
-
-    ['@test String.prototype.loc is not available without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok('undefined' === typeof String.prototype.loc, 'String.prototype helper disabled');
-      } else {
-        assert.expect(0);
-      }
-    }
-
-    ['@test String loc tests'](assert) {
-      test(
-        assert,
-        '_Hello World',
-        [],
-        'Bonjour le monde',
-        `loc('_Hello World') => 'Bonjour le monde'`
-      );
-      test(
-        assert,
-        '_Hello %@ %@',
-        ['John', 'Doe'],
-        'Bonjour John Doe',
-        `loc('_Hello %@ %@', ['John', 'Doe']) => 'Bonjour John Doe'`
-      );
-      test(
-        assert,
-        '_Hello %@# %@#',
-        ['John', 'Doe'],
-        'Bonjour Doe John',
-        `loc('_Hello %@# %@#', ['John', 'Doe']) => 'Bonjour Doe John'`
-      );
-      test(
-        assert,
-        '_Not In Strings',
-        [],
-        '_Not In Strings',
-        `loc('_Not In Strings') => '_Not In Strings'`
-      );
-    }
-
-    ['@test works with argument form'](assert) {
-      expectDeprecation(() => {
-        assert.equal(loc('_Hello %@', 'John'), 'Bonjour John');
-        assert.equal(loc('_Hello %@ %@', ['John'], 'Doe'), 'Bonjour John Doe');
-      }, /loc is deprecated/);
-    }
-  }
-);
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..49cacd2b3cd 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -435,7 +435,6 @@ let allExports = [
   ['String.decamelize', '@ember/string', 'decamelize'],
   ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
   ['String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe'],
-  ['String.loc', '@ember/string', 'loc'],
   ['String.underscore', '@ember/string', 'underscore'],
   ['String.w', '@ember/string', 'w'],
   ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..3a1c6cbc046 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -351,7 +351,6 @@ module.exports = {
     'loading',
     'loadingClass',
     'loadingHref',
-    'loc',
     'localName',
     'location',
     'log',

From 39aeba2bef0f672bcea17454879a16d878898e2c Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 19:57:31 -0700
Subject: [PATCH 0553/1405] Remove deprecated aliasMethod

---
 packages/@ember/-internals/metal/index.ts     |   2 +-
 packages/@ember/-internals/metal/lib/mixin.ts | 119 +-----------------
 .../metal/tests/mixin/alias_method_test.js    | 101 ---------------
 packages/@ember/deprecated-features/index.ts  |   1 -
 packages/@ember/object/index.js               |   1 -
 packages/ember/index.js                       |   1 -
 packages/ember/tests/reexports_test.js        |   1 -
 tests/docs/expected.js                        |   1 -
 8 files changed, 2 insertions(+), 225 deletions(-)
 delete mode 100644 packages/@ember/-internals/metal/tests/mixin/alias_method_test.js

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 37fba150cb2..e696b443dd9 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -50,7 +50,7 @@ export {
   removeObserver,
   flushAsyncObservers,
 } from './lib/observer';
-export { Mixin, aliasMethod, mixin, observer, applyMixin } from './lib/mixin';
+export { Mixin, mixin, observer, applyMixin } from './lib/mixin';
 export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
 export { tagForProperty, tagForObject, markObjectAsDirty } from './lib/tags';
 export { tracked, TrackedDescriptor } from './lib/tracked';
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 251893144cb..3c3f434e2cc 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -13,8 +13,7 @@ import {
   wrap,
 } from '@ember/-internals/utils';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
-import { ALIAS_METHOD } from '@ember/deprecated-features';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
 import {
@@ -26,7 +25,6 @@ import {
 import {
   ComputedDescriptor,
   descriptorForDecorator,
-  descriptorForProperty,
   makeComputedDecorator,
   nativeDescDecorator,
 } from './decorator';
@@ -366,39 +364,6 @@ function mergeProps(
   }
 }
 
-let followMethodAlias: (
-  obj: object,
-  alias: Alias,
-  descs: { [key: string]: any },
-  values: { [key: string]: any }
-) => { desc: any; value: any };
-
-if (ALIAS_METHOD) {
-  followMethodAlias = function (
-    obj: object,
-    alias: Alias,
-    descs: { [key: string]: any },
-    values: { [key: string]: any }
-  ) {
-    let altKey = alias.methodName;
-    let possibleDesc;
-    let desc = descs[altKey];
-    let value = values[altKey];
-
-    if (desc !== undefined || value !== undefined) {
-      // do nothing
-    } else if ((possibleDesc = descriptorForProperty(obj, altKey)) !== undefined) {
-      desc = possibleDesc;
-      value = undefined;
-    } else {
-      desc = undefined;
-      value = obj[altKey];
-    }
-
-    return { desc, value };
-  };
-}
-
 function updateObserversAndListeners(obj: object, key: string, fn: Function, add: boolean) {
   let meta = observerListenerMetaFor(fn);
 
@@ -446,14 +411,6 @@ export function applyMixin(obj: { [key: string]: any }, mixins: Mixin[], _hideKe
     let value = values[key];
     let desc = descs[key];
 
-    if (ALIAS_METHOD) {
-      while (value !== undefined && isAlias(value)) {
-        let followed = followMethodAlias(obj, value, descs, values);
-        desc = followed.desc;
-        value = followed.value;
-      }
-    }
-
     if (value !== undefined) {
       if (typeof value === 'function') {
         updateObserversAndListeners(obj, key, value, true);
@@ -785,80 +742,6 @@ function _keys(mixin: Mixin, ret = new Set(), seen = new Set()) {
   return ret;
 }
 
-declare class Alias {
-  public methodName: string;
-  constructor(methodName: string);
-}
-
-let AliasImpl: typeof Alias;
-
-let isAlias: (alias: any) => alias is Alias;
-
-if (ALIAS_METHOD) {
-  const ALIASES = new _WeakSet();
-
-  isAlias = (alias: any): alias is Alias => {
-    return ALIASES.has(alias);
-  };
-
-  AliasImpl = class AliasImpl {
-    constructor(public methodName: string) {
-      ALIASES.add(this);
-    }
-  } as typeof Alias;
-}
-
-/**
-  Makes a method available via an additional name.
-
-  ```app/utils/person.js
-  import EmberObject, {
-    aliasMethod
-  } from '@ember/object';
-
-  export default EmberObject.extend({
-    name() {
-      return 'Tomhuda Katzdale';
-    },
-    moniker: aliasMethod('name')
-  });
-  ```
-
-  ```javascript
-  let goodGuy = Person.create();
-
-  goodGuy.name();    // 'Tomhuda Katzdale'
-  goodGuy.moniker(); // 'Tomhuda Katzdale'
-  ```
-
-  @method aliasMethod
-  @static
-  @deprecated Use a shared utility method instead
-  @for @ember/object
-  @param {String} methodName name of the method to alias
-  @public
-*/
-export let aliasMethod: (methodName: string) => any;
-
-if (ALIAS_METHOD) {
-  aliasMethod = function aliasMethod(methodName: string): Alias {
-    deprecate(
-      `You attempted to alias '${methodName}, but aliasMethod has been deprecated. Consider extracting the method into a shared utility function.`,
-      false,
-      {
-        id: 'object.alias-method',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_object-alias-method',
-        for: 'ember-source',
-        since: {
-          enabled: '3.9.0',
-        },
-      }
-    );
-    return new AliasImpl(methodName);
-  };
-}
-
 // ..........................................................
 // OBSERVER HELPER
 //
diff --git a/packages/@ember/-internals/metal/tests/mixin/alias_method_test.js b/packages/@ember/-internals/metal/tests/mixin/alias_method_test.js
deleted file mode 100644
index 3532d2f2809..00000000000
--- a/packages/@ember/-internals/metal/tests/mixin/alias_method_test.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import { get, Mixin, mixin, aliasMethod } from '../..';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-function validateAliasMethod(assert, obj) {
-  assert.equal(obj.fooMethod(), 'FOO', 'obj.fooMethod()');
-  assert.equal(obj.barMethod(), 'FOO', 'obj.barMethod should be a copy of foo');
-}
-
-moduleFor(
-  'aliasMethod',
-  class extends AbstractTestCase {
-    ['@test methods of another name are aliased when the mixin is applied'](assert) {
-      expectDeprecation(() => {
-        let MyMixin = Mixin.create({
-          fooMethod() {
-            return 'FOO';
-          },
-          barMethod: aliasMethod('fooMethod'),
-        });
-
-        let obj = MyMixin.apply({});
-        validateAliasMethod(assert, obj);
-      }, /aliasMethod has been deprecated. Consider extracting the method into a shared utility function/);
-    }
-
-    ['@test should follow aliasMethods all the way down'](assert) {
-      expectDeprecation(() => {
-        let MyMixin = Mixin.create({
-          bar: aliasMethod('foo'), // put first to break ordered iteration
-          baz() {
-            return 'baz';
-          },
-          foo: aliasMethod('baz'),
-        });
-
-        let obj = MyMixin.apply({});
-        assert.equal(get(obj, 'bar')(), 'baz', 'should have followed aliasMethods');
-      }, /aliasMethod has been deprecated. Consider extracting the method into a shared utility function/);
-    }
-
-    ['@test should alias methods from other dependent mixins'](assert) {
-      expectDeprecation(() => {
-        let BaseMixin = Mixin.create({
-          fooMethod() {
-            return 'FOO';
-          },
-        });
-
-        let MyMixin = Mixin.create(BaseMixin, {
-          barMethod: aliasMethod('fooMethod'),
-        });
-
-        let obj = MyMixin.apply({});
-        validateAliasMethod(assert, obj);
-      }, /aliasMethod has been deprecated. Consider extracting the method into a shared utility function/);
-    }
-
-    ['@test should alias methods from other mixins applied at same time'](assert) {
-      expectDeprecation(() => {
-        let BaseMixin = Mixin.create({
-          fooMethod() {
-            return 'FOO';
-          },
-        });
-
-        let MyMixin = Mixin.create({
-          barMethod: aliasMethod('fooMethod'),
-        });
-
-        let obj = mixin({}, BaseMixin, MyMixin);
-        validateAliasMethod(assert, obj);
-      }, /aliasMethod has been deprecated. Consider extracting the method into a shared utility function/);
-    }
-
-    ['@test should alias methods from mixins already applied on object'](assert) {
-      expectDeprecation(() => {
-        let BaseMixin = Mixin.create({
-          quxMethod() {
-            return 'qux';
-          },
-        });
-
-        let MyMixin = Mixin.create({
-          bar: aliasMethod('foo'),
-          barMethod: aliasMethod('fooMethod'),
-        });
-
-        let obj = {
-          fooMethod() {
-            return 'FOO';
-          },
-        };
-
-        BaseMixin.apply(obj);
-        MyMixin.apply(obj);
-
-        validateAliasMethod(assert, obj);
-      }, /aliasMethod has been deprecated. Consider extracting the method into a shared utility function/);
-    }
-  }
-);
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index d750d8b3876..85e9220d217 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -9,7 +9,6 @@ export const MERGE = !!'3.6.0-beta.1';
 export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
-export const ALIAS_METHOD = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const FUNCTION_PROTOTYPE_EXTENSIONS = !!'3.11.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index 6b07d4d3190..c3f4c55142f 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -15,7 +15,6 @@ export {
   observer,
   computed,
   trySet,
-  aliasMethod,
 } from '@ember/-internals/metal';
 
 import { computed } from '@ember/-internals/metal';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f0d1f8cab34..bdaa04e107f 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -305,7 +305,6 @@ Ember.setProperties = metal.setProperties;
 Ember.expandProperties = metal.expandProperties;
 Ember.addObserver = metal.addObserver;
 Ember.removeObserver = metal.removeObserver;
-Ember.aliasMethod = metal.aliasMethod;
 Ember.observer = metal.observer;
 Ember.mixin = metal.mixin;
 Ember.Mixin = metal.Mixin;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..42ccb65ccb8 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -286,7 +286,6 @@ let allExports = [
   // @ember/object
   ['Object', '@ember/object', 'default'],
   ['_action', '@ember/object', 'action'],
-  ['aliasMethod', '@ember/object', 'aliasMethod'],
   ['computed', '@ember/object', 'computed'],
   ['defineProperty', '@ember/object', 'defineProperty'],
   ['get', '@ember/object', 'get'],
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..eb004e0ba0c 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -75,7 +75,6 @@ module.exports = {
     'advanceReadiness',
     'afterModel',
     'alias',
-    'aliasMethod',
     'all',
     'allSettled',
     'and',

From 0fe33508e611bd9808df3b9d811c246d534746eb Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 20:18:04 -0700
Subject: [PATCH 0554/1405] Remove deprecated isVisible

---
 .../glimmer/lib/component-managers/curly.ts   |  13 --
 .../-internals/glimmer/lib/component.ts       |  10 --
 .../-internals/glimmer/lib/utils/bindings.ts  |  65 +-------
 .../components/curly-components-test.js       | 146 +-----------------
 packages/@ember/deprecated-features/index.ts  |   1 -
 tests/docs/expected.js                        |   1 -
 6 files changed, 2 insertions(+), 234 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 21da0ed0509..c520884b8ed 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -2,7 +2,6 @@ import { Factory, getOwner, Owner, setOwner } from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor, symbol } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
-import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -47,7 +46,6 @@ import {
   createClassNameBindingRef,
   createSimpleClassNameBindingRef,
   installAttributeBinding,
-  installIsVisibleBinding,
   parseAttributeBinding,
 } from '../utils/bindings';
 
@@ -103,14 +101,6 @@ function applyAttributeBindings(
     let id = component.elementId ? component.elementId : guidFor(component);
     operations.setAttribute('id', createPrimitiveRef(id), false, null);
   }
-
-  if (
-    EMBER_COMPONENT_IS_VISIBLE &&
-    installIsVisibleBinding !== undefined &&
-    seen.indexOf('style') === -1
-  ) {
-    installIsVisibleBinding(rootRef, operations);
-  }
 }
 
 const EMPTY_POSITIONAL_ARGS: Reference[] = [];
@@ -390,9 +380,6 @@ export default class CurlyComponentManager
     } else {
       let id = component.elementId ? component.elementId : guidFor(component);
       operations.setAttribute('id', createPrimitiveRef(id), false, null);
-      if (EMBER_COMPONENT_IS_VISIBLE) {
-        installIsVisibleBinding!(rootRef, operations);
-      }
     }
 
     if (classRef) {
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index f6778005b49..ddb0c74f222 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1091,16 +1091,6 @@ const Component = CoreView.extend(
       @type String
       @public
     */
-
-    /**
-     If `false`, the view will appear hidden in DOM.
-
-     @property isVisible
-     @type Boolean
-     @default null
-     @deprecated Use `<div hidden={{this.isHidden}}>` or `{{#if this.showComponent}} <MyComponent /> {{/if}}`
-     @public
-     */
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 55791ddb7ca..1ce2a0a55eb 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -1,8 +1,6 @@
 import { get } from '@ember/-internals/metal';
-import { assert, deprecate } from '@ember/debug';
-import { EMBER_COMPONENT_IS_VISIBLE } from '@ember/deprecated-features';
+import { assert } from '@ember/debug';
 import { dasherize } from '@ember/string';
-import { DEBUG } from '@glimmer/env';
 import { ElementOperations } from '@glimmer/interfaces';
 import {
   childRefFor,
@@ -10,12 +8,9 @@ import {
   createComputeRef,
   createPrimitiveRef,
   Reference,
-  UNDEFINED_REFERENCE,
   valueForRef,
 } from '@glimmer/reference';
-import { logTrackingStack } from '@glimmer/validator';
 import { Component } from './curly-component-state-bucket';
-import { htmlSafe, isHTMLSafe, SafeString } from './string';
 
 function referenceForParts(rootRef: Reference<Component>, parts: string[]): Reference {
   let isAttrs = parts[0] === 'attrs';
@@ -80,67 +75,9 @@ export function installAttributeBinding(
     !(isSimple && isPath)
   );
 
-  if (EMBER_COMPONENT_IS_VISIBLE && attribute === 'style' && createStyleBindingRef !== undefined) {
-    reference = createStyleBindingRef(reference, childRefFor(rootRef, 'isVisible'));
-  }
-
   operations.setAttribute(attribute, reference, false, null);
 }
 
-const DISPLAY_NONE = 'display: none;';
-const SAFE_DISPLAY_NONE = htmlSafe(DISPLAY_NONE);
-
-let createStyleBindingRef:
-  | undefined
-  | ((inner: Reference, isVisible: Reference) => Reference<string | SafeString>);
-
-export let installIsVisibleBinding:
-  | undefined
-  | ((rootRef: Reference<Component>, operations: ElementOperations) => void);
-
-if (EMBER_COMPONENT_IS_VISIBLE) {
-  createStyleBindingRef = (inner: Reference, isVisibleRef: Reference) => {
-    return createComputeRef(() => {
-      let value = valueForRef(inner);
-      let isVisible = valueForRef(isVisibleRef);
-
-      if (DEBUG && isVisible !== undefined) {
-        deprecate(
-          `The \`isVisible\` property on classic component classes is deprecated. Was accessed:\n\n${logTrackingStack!()}`,
-          false,
-          {
-            id: 'ember-component.is-visible',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-is-visible',
-            for: 'ember-source',
-            since: {
-              enabled: '3.15.0-beta.1',
-            },
-          }
-        );
-      }
-
-      if (isVisible !== false) {
-        return value as string;
-      } else if (!value) {
-        return SAFE_DISPLAY_NONE;
-      } else {
-        let style = value + ' ' + DISPLAY_NONE;
-        return isHTMLSafe(value) ? htmlSafe(style) : style;
-      }
-    });
-  };
-
-  installIsVisibleBinding = (rootRef: Reference<Component>, operations: ElementOperations) => {
-    operations.setAttribute(
-      'style',
-      createStyleBindingRef!(UNDEFINED_REFERENCE, childRefFor(rootRef, 'isVisible')),
-      false,
-      null
-    );
-  };
-}
-
 export function createClassNameBindingRef(
   rootRef: Reference<Component>,
   microsyntax: string,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 712f68f7d4e..ac62b19d7a7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -5,7 +5,6 @@ import {
   classes,
   equalTokens,
   equalsElement,
-  styles,
   runTask,
   runLoopSettled,
 } from 'internal-test-helpers';
@@ -18,7 +17,7 @@ import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 import { jQueryDisabled } from '@ember/-internals/views';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
-import { backtrackingMessageFor, debugStackMessageFor } from '../../utils/debug-stack';
+import { backtrackingMessageFor } from '../../utils/debug-stack';
 
 moduleFor(
   'Components test: curly components',
@@ -3150,149 +3149,6 @@ moduleFor(
       }, /You must call `super.init\(...arguments\);` or `this._super\(...arguments\)` when overriding `init` on a framework object. Please update .*/);
     }
 
-    ['@test should toggle visibility with isVisible'](assert) {
-      let assertStyle = (expected) => {
-        let matcher = styles(expected);
-        let actual = this.firstChild.getAttribute('style');
-
-        assert.pushResult({
-          result: matcher.match(actual),
-          message: matcher.message(),
-          actual,
-          expected,
-        });
-      };
-
-      this.registerComponent('foo-bar', {
-        template: `<p>foo</p>`,
-      });
-
-      expectDeprecation(() => {
-        this.render(`{{foo-bar id="foo-bar" isVisible=this.visible}}`, {
-          visible: false,
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      assertStyle('display: none;');
-
-      this.assertStableRerender();
-
-      expectDeprecation(() => {
-        runTask(() => {
-          set(this.context, 'visible', true);
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      assertStyle('');
-
-      expectDeprecation(() => {
-        runTask(() => {
-          set(this.context, 'visible', false);
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      assertStyle('display: none;');
-    }
-
-    ['@test isVisible does not overwrite component style']() {
-      this.registerComponent('foo-bar', {
-        ComponentClass: Component.extend({
-          attributeBindings: ['style'],
-          style: htmlSafe('color: blue;'),
-        }),
-
-        template: `<p>foo</p>`,
-      });
-
-      expectDeprecation(() => {
-        this.render(`{{foo-bar id="foo-bar" isVisible=this.visible}}`, {
-          visible: false,
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { id: 'foo-bar', style: styles('color: blue; display: none;') },
-      });
-
-      this.assertStableRerender();
-
-      expectDeprecation(() => {
-        runTask(() => {
-          set(this.context, 'visible', true);
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { id: 'foo-bar', style: styles('color: blue;') },
-      });
-
-      expectDeprecation(() => {
-        runTask(() => {
-          set(this.context, 'visible', false);
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { id: 'foo-bar', style: styles('color: blue; display: none;') },
-      });
-    }
-
-    ['@test adds isVisible binding when style binding is missing and other bindings exist'](
-      assert
-    ) {
-      let assertStyle = (expected) => {
-        let matcher = styles(expected);
-        let actual = this.firstChild.getAttribute('style');
-
-        assert.pushResult({
-          result: matcher.match(actual),
-          message: matcher.message(),
-          actual,
-          expected,
-        });
-      };
-
-      this.registerComponent('foo-bar', {
-        ComponentClass: Component.extend({
-          attributeBindings: ['foo'],
-          foo: 'bar',
-        }),
-        template: `<p>foo</p>`,
-      });
-
-      expectDeprecation(() => {
-        this.render(`{{foo-bar id="foo-bar" foo=this.foo isVisible=this.visible}}`, {
-          visible: false,
-          foo: 'baz',
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      assertStyle('display: none;');
-
-      this.assertStableRerender();
-
-      expectDeprecation(() => {
-        runTask(() => {
-          set(this.context, 'visible', true);
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      assertStyle('');
-
-      expectDeprecation(() => {
-        runTask(() => {
-          set(this.context, 'visible', false);
-          set(this.context, 'foo', 'woo');
-        });
-      }, debugStackMessageFor('The `isVisible` property on classic component classes is deprecated. Was accessed:', { renderTree: ['foo-bar'] }));
-
-      assertStyle('display: none;');
-      assert.equal(this.firstChild.getAttribute('foo'), 'woo');
-    }
-
     ['@test it can use readDOMAttr to read input value']() {
       let component;
       let assertElement = (expectedValue) => {
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index d750d8b3876..8d07921c304 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -13,6 +13,5 @@ export const ALIAS_METHOD = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const FUNCTION_PROTOTYPE_EXTENSIONS = !!'3.11.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
-export const EMBER_COMPONENT_IS_VISIBLE = !!'3.15.0-beta.1';
 export const PARTIALS = !!'3.15.0-beta.1';
 export const GLOBALS_RESOLVER = !!'3.16.0-beta.1';
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..fa3f0d1ea40 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -332,7 +332,6 @@ module.exports = {
     'isPresent',
     'isRejected',
     'isSettled',
-    'isVisible',
     'join',
     'jQuery',
     'keyDown',

From 02e1bfdf910e14abdb212033b8400a6da0f8e71d Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 21:42:53 -0700
Subject: [PATCH 0555/1405] Remove old deprecations path

---
 packages/@ember/application/deprecations.ts | 39 ---------------------
 packages/ember/tests/reexports_test.js      |  4 ---
 2 files changed, 43 deletions(-)
 delete mode 100644 packages/@ember/application/deprecations.ts

diff --git a/packages/@ember/application/deprecations.ts b/packages/@ember/application/deprecations.ts
deleted file mode 100644
index 61895f3da8c..00000000000
--- a/packages/@ember/application/deprecations.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import {
-  deprecate as _deprecate,
-  deprecateFunc as _deprecateFunc,
-  DeprecationOptions,
-} from '@ember/debug';
-
-export function deprecate(message: string, condition: boolean, options: DeprecationOptions): void {
-  _deprecate(
-    "`import { deprecate } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecate } from '@ember/debug';`",
-    false,
-    {
-      id: 'old-deprecate-method-paths',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.0.0',
-      },
-    }
-  );
-
-  _deprecate(message, condition, options);
-}
-
-export function deprecateFunc(message: string, options: DeprecationOptions, func: Function): void {
-  _deprecate(
-    "`import { deprecateFunc } from '@ember/application/deprecations';` has been deprecated, please update to `import { deprecateFunc } from '@ember/debug';`",
-    false,
-    {
-      id: 'old-deprecate-method-paths',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.0.0',
-      },
-    }
-  );
-
-  _deprecateFunc(message, options, func);
-}
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..2f25248286a 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -164,10 +164,6 @@ let allExports = [
   ['runLoadHooks', '@ember/application', 'runLoadHooks'],
   ['setOwner', '@ember/application', 'setOwner'],
 
-  // @ember/application/deprecations
-  [null, '@ember/application/deprecations', 'deprecate'],
-  [null, '@ember/application/deprecations', 'deprecateFunc'],
-
   // @ember/application/instance
   ['ApplicationInstance', '@ember/application/instance', 'default'],
 

From 719f6b33cf56bd6a75fd6b92702aa26f11b3a415 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 22:14:05 -0700
Subject: [PATCH 0556/1405] Remove deprecated application controller router
 properties

---
 packages/@ember/-internals/glimmer/index.ts   |  1 -
 .../-internals/glimmer/lib/helpers/action.ts  | 68 ++++++-------------
 .../glimmer/lib/modifiers/action.ts           | 22 ------
 .../helpers/closure-action-test.js            | 52 +-------------
 .../-internals/glimmer/tests/utils/helpers.js |  1 -
 5 files changed, 22 insertions(+), 122 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index f29f23a4a77..b01dcf90eda 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -388,7 +388,6 @@ export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
-export { INVOKE } from './lib/helpers/action';
 export { default as OutletView } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index e27ed4e11cc..4999a46d81c 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -2,8 +2,7 @@
 @module ember
 */
 import { get } from '@ember/-internals/metal';
-import { symbol } from '@ember/-internals/utils';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
@@ -19,7 +18,6 @@ import { _WeakSet } from '@glimmer/util';
 import { internalHelper } from './internal-helper';
 
 export const ACTIONS = new _WeakSet();
-export const INVOKE: unique symbol = symbol('INVOKE') as any;
 
 /**
   The `{{action}}` helper provides a way to pass triggers for behavior (usually
@@ -363,7 +361,7 @@ function makeArgsProcessor(valuePathRef: Reference | false, actionArgsRef: Refer
 function makeDynamicClosureAction(
   context: object,
   targetRef: Reference<MaybeActionHandler>,
-  actionRef: Reference<string | Function | Invokable>,
+  actionRef: Reference<string | Function>,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
@@ -393,14 +391,10 @@ interface MaybeActionHandler {
   actions?: Record<string, Function>;
 }
 
-interface Invokable {
-  [INVOKE]: Function;
-}
-
 function makeClosureAction(
   context: object,
   target: MaybeActionHandler,
-  action: string | Function | Invokable,
+  action: string | Function,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
@@ -412,46 +406,26 @@ function makeClosureAction(
     action !== undefined && action !== null
   );
 
-  if (typeof action[INVOKE] === 'function') {
-    deprecate(
-      `Usage of the private INVOKE API to make an object callable via action or fn is no longer supported. Please update to pass in a callback function instead. Received: ${String(
-        action
-      )}`,
-      false,
-      {
-        until: '3.25.0',
-        id: 'actions.custom-invoke-invokable',
-        for: 'ember-source',
-        since: {
-          enabled: '3.23.0-beta.1',
-        },
-      }
-    );
-
-    self = action as Invokable;
-    fn = action[INVOKE];
-  } else {
-    let typeofAction = typeof action;
+  let typeofAction = typeof action;
 
-    if (typeofAction === 'string') {
-      self = target;
-      fn = target.actions! && target.actions![action as string];
+  if (typeofAction === 'string') {
+    self = target;
+    fn = target.actions! && target.actions![action as string];
 
-      assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
-    } else if (typeofAction === 'function') {
-      self = context;
-      fn = action as Function;
-    } else {
-      // tslint:disable-next-line:max-line-length
-      assert(
-        `An action could not be made for \`${
-          debugKey || action
-        }\` in ${target}. Please confirm that you are using either a quoted action name (i.e. \`(action '${
-          debugKey || 'myAction'
-        }')\`) or a function available in ${target}.`,
-        false
-      );
-    }
+    assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
+  } else if (typeofAction === 'function') {
+    self = context;
+    fn = action as Function;
+  } else {
+    // tslint:disable-next-line:max-line-length
+    assert(
+      `An action could not be made for \`${
+        debugKey || action
+      }\` in ${target}. Please confirm that you are using either a quoted action name (i.e. \`(action '${
+        debugKey || 'myAction'
+      }')\`) or a function available in ${target}.`,
+      false
+    );
   }
 
   return (...args: any[]) => {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index c2890d7b184..0db021bbf4c 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -16,7 +16,6 @@ import { setInternalModifierManager } from '@glimmer/manager';
 import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
-import { INVOKE } from '../helpers/action';
 
 const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl'];
 const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
@@ -148,27 +147,6 @@ export class ActionState {
         target,
         name: null,
       };
-      if (typeof actionName[INVOKE] === 'function') {
-        deprecate(
-          `Usage of the private INVOKE API to make an object callable via action or fn is no longer supported. Please update to pass in a callback function instead. Received: ${String(
-            actionName
-          )}`,
-          false,
-          {
-            until: '3.25.0',
-            id: 'actions.custom-invoke-invokable',
-            for: 'ember-source',
-            since: {
-              enabled: '3.23.0-beta.1',
-            },
-          }
-        );
-
-        flaggedInstrument('interaction.ember-action', payload, () => {
-          actionName[INVOKE].apply(actionName, args);
-        });
-        return;
-      }
       if (isInvokableRef(actionName)) {
         flaggedInstrument('interaction.ember-action', payload, () => {
           updateRef(actionName, args[0]);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index dc097913c40..f394240e137 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -8,7 +8,7 @@ import { _getCurrentRunLoop } from '@ember/runloop';
 import { set, computed } from '@ember/-internals/metal';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 
-import { Component, INVOKE } from '../../utils/helpers';
+import { Component } from '../../utils/helpers';
 
 if (EMBER_IMPROVED_INSTRUMENTATION) {
   moduleFor(
@@ -1043,56 +1043,6 @@ moduleFor(
       this.assert.ok(capturedRunLoop, 'action is called within a run loop');
     }
 
-    // TODO: This is for intimate APIs, specifically ember-concurrency
-    ['@test objects that define INVOKE can be casted to actions']() {
-      expectDeprecation(() => {
-        let innerComponent;
-        let actionArgs;
-        let invokableArgs;
-
-        let InnerComponent = Component.extend({
-          init() {
-            this._super(...arguments);
-            innerComponent = this;
-          },
-          fireAction() {
-            actionArgs = this.attrs.submit(4, 5, 6);
-          },
-        });
-
-        let OuterComponent = Component.extend({
-          foo: 123,
-          submitTask: computed(function () {
-            return {
-              [INVOKE]: (...args) => {
-                invokableArgs = args;
-                return this.foo;
-              },
-            };
-          }),
-        });
-
-        this.registerComponent('inner-component', {
-          ComponentClass: InnerComponent,
-          template: 'inner',
-        });
-
-        this.registerComponent('outer-component', {
-          ComponentClass: OuterComponent,
-          template: `{{inner-component submit=(action this.submitTask 1 2 3)}}`,
-        });
-
-        this.render('{{outer-component}}');
-
-        runTask(() => {
-          innerComponent.fireAction();
-        });
-
-        this.assert.equal(actionArgs, 123);
-        this.assert.deepEqual(invokableArgs, [1, 2, 3, 4, 5, 6]);
-      }, /Usage of the private INVOKE API to make an object callable/);
-    }
-
     ['@test closure action with `(mut undefinedThing)` works properly [GH#13959]']() {
       let component;
 
diff --git a/packages/@ember/-internals/glimmer/tests/utils/helpers.js b/packages/@ember/-internals/glimmer/tests/utils/helpers.js
index eef7528b308..806eba8951e 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/helpers.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/helpers.js
@@ -2,7 +2,6 @@ export { precompile } from 'ember-template-compiler';
 export { compile } from 'internal-test-helpers';
 
 export {
-  INVOKE,
   Helper,
   helper,
   Component,

From 72ef3ecfb2ae301ebe66186e361de0028eab1dbe Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 22:24:33 -0700
Subject: [PATCH 0557/1405] Remove deprecated `with` helper

---
 packages/@ember/-internals/glimmer/index.ts   |  28 --
 .../tests/integration/helpers/partial-test.js |  32 --
 .../tests/integration/syntax/with-test.js     | 447 ------------------
 .../tests/utils/shared-conditional-tests.js   |   6 +-
 .../lib/plugins/deprecate-with.ts             | 190 --------
 .../lib/plugins/index.ts                      |   3 -
 6 files changed, 3 insertions(+), 703 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
 delete mode 100644 packages/ember-template-compiler/lib/plugins/deprecate-with.ts

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index f29f23a4a77..c7a0759c051 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -88,34 +88,6 @@
  @public
  */
 
-/**
-  Use the `{{with}}` helper when you want to alias a property to a new name. This is helpful
-  for semantic clarity as it allows you to retain default scope or to reference a property from another
-  `{{with}}` block.
-
-  If the aliased property is "falsey", for example: `false`, `undefined` `null`, `""`, `0`, `NaN` or
-  an empty array, the block will not be rendered.
-
-  ```app/templates/application.hbs
-  {{! Will only render if user.posts contains items}}
-  {{#with @model.posts as |blogPosts|}}
-    <div class="notice">
-      There are {{blogPosts.length}} blog posts written by {{@model.name}}.
-    </div>
-    {{#each blogPosts as |post|}}
-      <li>{{post.title}}</li>
-    {{/each}}
-  {{/with}}
-  ```
-
-  @method with
-  @for Ember.Templates.helpers
-  @param {Object} options
-  @return {String} HTML string
-  @deprecated Use '{{#let}}' instead
-  @public
- */
-
 /**
   `{{yield}}` denotes an area of a template that will be rendered inside
   of another template.
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
index 825b3cf8042..1f0b9b10e56 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
@@ -352,38 +352,6 @@ moduleFor(
       this.assertText('number: EVEN0number: ODD1number: EVEN2number: ODD3');
     }
 
-    ['@test [DEPRECATED] dynamic partials in {{#with}}']() {
-      this.registerPartial('_thing', '{{t}}');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-        {{#with this.item.thing as |t|}}
-          {{partial t}}
-        {{else}}
-          Nothing!
-        {{/with}}`,
-          {
-            item: { thing: false },
-          }
-        );
-      }, /`{{#with}}` is deprecated\./);
-
-      this.assertStableRerender();
-
-      this.assertText('Nothing!');
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'item.thing', 'thing'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "thing" partial to a component');
-
-      this.assertText('thing');
-
-      runTask(() => set(this.context, 'item', { thing: false }));
-
-      this.assertText('Nothing!');
-    }
-
     ['@test dynamic partials in {{#let}}']() {
       this.registerPartial('_thing', '{{t}}');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
deleted file mode 100644
index b3e44698d1d..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/with-test.js
+++ /dev/null
@@ -1,447 +0,0 @@
-import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
-
-import { get, set } from '@ember/-internals/metal';
-import { A as emberA, ObjectProxy, removeAt } from '@ember/-internals/runtime';
-
-import { IfUnlessWithSyntaxTest } from '../../utils/shared-conditional-tests';
-
-moduleFor(
-  'Syntax test: {{#with}}',
-  class extends IfUnlessWithSyntaxTest {
-    beforeEach() {
-      expectDeprecation(/^`{{#with}}` is deprecated\./);
-    }
-
-    templateFor({ cond, truthy, falsy }) {
-      return `{{#with ${cond}}}${truthy}{{else}}${falsy}{{/with}}`;
-    }
-  }
-);
-
-moduleFor(
-  'Syntax test: {{#with as}}',
-  class extends IfUnlessWithSyntaxTest {
-    beforeEach() {
-      expectDeprecation(/^`{{#with}}` is deprecated\./);
-    }
-
-    templateFor({ cond, truthy, falsy }) {
-      return `{{#with ${cond} as |test|}}${truthy}{{else}}${falsy}{{/with}}`;
-    }
-
-    ['@test keying off of `undefined` does not render']() {
-      this.render(
-        strip`
-      {{#with this.foo.bar.baz as |thing|}}
-        {{thing}}
-      {{/with}}`,
-        { foo: {} }
-      );
-
-      this.assertText('');
-
-      runTask(() => this.rerender());
-
-      this.assertText('');
-
-      runTask(() => set(this.context, 'foo', { bar: { baz: 'Here!' } }));
-
-      this.assertText('Here!');
-
-      runTask(() => set(this.context, 'foo', {}));
-
-      this.assertText('');
-    }
-
-    ['@test it renders and hides the given block based on the conditional']() {
-      this.render(`{{#with this.cond1 as |cond|}}{{cond.greeting}}{{else}}False{{/with}}`, {
-        cond1: { greeting: 'Hello' },
-      });
-
-      this.assertText('Hello');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Hello');
-
-      runTask(() => set(this.context, 'cond1.greeting', 'Hello world'));
-
-      this.assertText('Hello world');
-
-      runTask(() => set(this.context, 'cond1', false));
-
-      this.assertText('False');
-
-      runTask(() => set(this.context, 'cond1', { greeting: 'Hello' }));
-
-      this.assertText('Hello');
-    }
-
-    ['@test can access alias and original scope']() {
-      this.render(`{{#with this.person as |tom|}}{{this.title}}: {{tom.name}}{{/with}}`, {
-        title: 'Señor Engineer',
-        person: { name: 'Tom Dale' },
-      });
-
-      this.assertText('Señor Engineer: Tom Dale');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Señor Engineer: Tom Dale');
-
-      runTask(() => {
-        set(this.context, 'person.name', 'Yehuda Katz');
-        set(this.context, 'title', 'Principal Engineer');
-      });
-
-      this.assertText('Principal Engineer: Yehuda Katz');
-
-      runTask(() => {
-        set(this.context, 'person', { name: 'Tom Dale' });
-        set(this.context, 'title', 'Señor Engineer');
-      });
-
-      this.assertText('Señor Engineer: Tom Dale');
-    }
-
-    ['@test the scoped variable is not available outside the {{#with}} block.']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.render(`{{name}}-{{#with this.other as |name|}}{{name}}{{/with}}-{{name}}`, {
-        name: 'Stef',
-        other: 'Yehuda',
-      });
-
-      this.assertText('Stef-Yehuda-Stef');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Stef-Yehuda-Stef');
-
-      runTask(() => set(this.context, 'other', 'Chad'));
-
-      this.assertText('Stef-Chad-Stef');
-
-      runTask(() => set(this.context, 'name', 'Tom'));
-
-      this.assertText('Tom-Chad-Tom');
-
-      runTask(() => {
-        set(this.context, 'name', 'Stef');
-        set(this.context, 'other', 'Yehuda');
-      });
-
-      this.assertText('Stef-Yehuda-Stef');
-    }
-
-    ['@test inverse template is displayed with context']() {
-      this.render(
-        `{{#with this.falsyThing as |thing|}}Has Thing{{else}}No Thing {{this.otherThing}}{{/with}}`,
-        {
-          falsyThing: null,
-          otherThing: 'bar',
-        }
-      );
-
-      this.assertText('No Thing bar');
-
-      runTask(() => this.rerender());
-
-      this.assertText('No Thing bar');
-
-      runTask(() => set(this.context, 'otherThing', 'biz'));
-
-      this.assertText('No Thing biz');
-
-      runTask(() => set(this.context, 'falsyThing', true));
-
-      this.assertText('Has Thing');
-
-      runTask(() => set(this.context, 'otherThing', 'baz'));
-
-      this.assertText('Has Thing');
-
-      runTask(() => {
-        set(this.context, 'otherThing', 'bar');
-        set(this.context, 'falsyThing', null);
-      });
-
-      this.assertText('No Thing bar');
-    }
-
-    ['@test can access alias of a proxy']() {
-      this.render(`{{#with this.proxy as |person|}}{{person.name}}{{/with}}`, {
-        proxy: ObjectProxy.create({ content: { name: 'Tom Dale' } }),
-      });
-
-      this.assertText('Tom Dale');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Tom Dale');
-
-      runTask(() => set(this.context, 'proxy.name', 'Yehuda Katz'));
-
-      this.assertText('Yehuda Katz');
-
-      runTask(() => set(this.context, 'proxy.content', { name: 'Godfrey Chan' }));
-
-      this.assertText('Godfrey Chan');
-
-      runTask(() => set(this.context, 'proxy.content.name', 'Stefan Penner'));
-
-      this.assertText('Stefan Penner');
-
-      runTask(() => set(this.context, 'proxy.content', null));
-
-      this.assertText('');
-
-      runTask(() =>
-        set(this.context, 'proxy', ObjectProxy.create({ content: { name: 'Tom Dale' } }))
-      );
-
-      this.assertText('Tom Dale');
-    }
-
-    ['@test can access alias of an array']() {
-      this.render(
-        `{{#with this.arrayThing as |words|}}{{#each words as |word|}}{{word}}{{/each}}{{/with}}`,
-        {
-          arrayThing: emberA(['Hello', ' ', 'world']),
-        }
-      );
-
-      this.assertText('Hello world');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Hello world');
-
-      runTask(() => {
-        let array = get(this.context, 'arrayThing');
-        array.replace(0, 1, ['Goodbye']);
-        removeAt(array, 1);
-        array.insertAt(1, ', ');
-        array.pushObject('!');
-      });
-
-      this.assertText('Goodbye, world!');
-
-      runTask(() => set(this.context, 'arrayThing', ['Hello', ' ', 'world']));
-
-      this.assertText('Hello world');
-    }
-
-    ['@test `attrs` can be used as a block param [GH#14678]']() {
-      this.render('{{#with this.hash as |attrs|}}[{{this.hash.foo}}-{{attrs.foo}}]{{/with}}', {
-        hash: { foo: 'foo' },
-      });
-
-      this.assertText('[foo-foo]');
-
-      runTask(() => this.rerender());
-
-      this.assertText('[foo-foo]');
-
-      runTask(() => this.context.set('hash.foo', 'FOO'));
-
-      this.assertText('[FOO-FOO]');
-
-      runTask(() => this.context.set('hash.foo', 'foo'));
-
-      this.assertText('[foo-foo]');
-    }
-  }
-);
-
-moduleFor(
-  'Syntax test: Multiple {{#with as}} helpers',
-  class extends RenderingTestCase {
-    beforeEach() {
-      expectDeprecation(/^`{{#with}}` is deprecated\./);
-    }
-
-    ['@test re-using the same variable with different {{#with}} blocks does not override each other']() {
-      this.render(
-        `Admin: {{#with this.admin as |person|}}{{person.name}}{{/with}} User: {{#with this.user as |person|}}{{person.name}}{{/with}}`,
-        {
-          admin: { name: 'Tom Dale' },
-          user: { name: 'Yehuda Katz' },
-        }
-      );
-
-      this.assertText('Admin: Tom Dale User: Yehuda Katz');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Admin: Tom Dale User: Yehuda Katz');
-
-      runTask(() => {
-        set(this.context, 'admin.name', 'Godfrey Chan');
-        set(this.context, 'user.name', 'Stefan Penner');
-      });
-
-      this.assertText('Admin: Godfrey Chan User: Stefan Penner');
-
-      runTask(() => {
-        set(this.context, 'admin', { name: 'Tom Dale' });
-        set(this.context, 'user', { name: 'Yehuda Katz' });
-      });
-
-      this.assertText('Admin: Tom Dale User: Yehuda Katz');
-    }
-
-    ['@test the scoped variable is not available outside the {{#with}} block']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.render(
-        `{{ring}}-{{#with this.first as |ring|}}{{ring}}-{{#with this.fifth as |ring|}}{{ring}}-{{#with this.ninth as |ring|}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}-{{/with}}{{ring}}`,
-        {
-          ring: 'Greed',
-          first: 'Limbo',
-          fifth: 'Wrath',
-          ninth: 'Treachery',
-        }
-      );
-
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
-
-      runTask(() => {
-        set(this.context, 'ring', 'O');
-        set(this.context, 'fifth', 'D');
-      });
-
-      this.assertText('O-Limbo-D-Treachery-D-Limbo-O');
-
-      runTask(() => {
-        set(this.context, 'first', 'I');
-        set(this.context, 'ninth', 'K');
-      });
-
-      this.assertText('O-I-D-K-D-I-O');
-
-      runTask(() => {
-        set(this.context, 'ring', 'Greed');
-        set(this.context, 'first', 'Limbo');
-        set(this.context, 'fifth', 'Wrath');
-        set(this.context, 'ninth', 'Treachery');
-      });
-
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
-    }
-
-    ['@test it should support {{#with name as |foo|}}, then {{#with foo as |bar|}}']() {
-      this.render(`{{#with this.name as |foo|}}{{#with foo as |bar|}}{{bar}}{{/with}}{{/with}}`, {
-        name: 'caterpillar',
-      });
-
-      this.assertText('caterpillar');
-
-      runTask(() => this.rerender());
-
-      this.assertText('caterpillar');
-
-      runTask(() => set(this.context, 'name', 'butterfly'));
-
-      this.assertText('butterfly');
-
-      runTask(() => set(this.context, 'name', 'caterpillar'));
-
-      this.assertText('caterpillar');
-    }
-
-    ['@test updating the context should update the alias']() {
-      this.render(`{{#with this as |person|}}{{person.name}}{{/with}}`, {
-        name: 'Los Pivots',
-      });
-
-      this.assertText('Los Pivots');
-
-      runTask(() => this.rerender());
-
-      this.assertText('Los Pivots');
-
-      runTask(() => set(this.context, 'name', "l'Pivots"));
-
-      this.assertText("l'Pivots");
-
-      runTask(() => set(this.context, 'name', 'Los Pivots'));
-
-      this.assertText('Los Pivots');
-    }
-
-    ['@test nested {{#with}} blocks should have access to root context']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.render(
-        strip`
-      {{name}}
-      {{#with this.committer1.name as |name|}}
-        [{{name}}
-        {{#with this.committer2.name as |name|}}
-          [{{name}}]
-        {{/with}}
-        {{name}}]
-      {{/with}}
-      {{name}}
-      {{#with this.committer2.name as |name|}}
-        [{{name}}
-        {{#with this.committer1.name as |name|}}
-          [{{name}}]
-        {{/with}}
-        {{name}}]
-      {{/with}}
-      {{name}}
-    `,
-        {
-          name: 'ebryn',
-          committer1: { name: 'trek' },
-          committer2: { name: 'machty' },
-        }
-      );
-
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
-
-      runTask(() => this.rerender());
-
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
-
-      runTask(() => set(this.context, 'name', 'chancancode'));
-
-      this.assertText('chancancode[trek[machty]trek]chancancode[machty[trek]machty]chancancode');
-
-      runTask(() => set(this.context, 'committer1', { name: 'krisselden' }));
-
-      this.assertText(
-        'chancancode[krisselden[machty]krisselden]chancancode[machty[krisselden]machty]chancancode'
-      );
-
-      runTask(() => {
-        set(this.context, 'committer1.name', 'wycats');
-        set(this.context, 'committer2', { name: 'rwjblue' });
-      });
-
-      this.assertText(
-        'chancancode[wycats[rwjblue]wycats]chancancode[rwjblue[wycats]rwjblue]chancancode'
-      );
-
-      runTask(() => {
-        set(this.context, 'name', 'ebryn');
-        set(this.context, 'committer1', { name: 'trek' });
-        set(this.context, 'committer2', { name: 'machty' });
-      });
-
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
-    }
-  }
-);
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 9868ed3a1dc..e6571a274fc 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -217,7 +217,7 @@ class ObjectProxyGenerator extends AbstractGenerator {
 }
 
 // Testing behaviors shared across all conditionals, i.e. {{#if}}, {{#unless}},
-// {{#with}}, {{#each}}, {{#each-in}}, (if) and (unless)
+// {{#each}}, {{#each-in}}, (if) and (unless)
 export class BasicConditionalsTest extends AbstractConditionalsTest {
   ['@test it renders the corresponding block based on the conditional']() {
     this.renderValues(this.truthyValue, this.falsyValue);
@@ -461,7 +461,7 @@ const IfUnlessWithTestCases = [
 ];
 
 // Testing behaviors shared across the "toggling" conditionals, i.e. {{#if}},
-// {{#unless}}, {{#with}}, {{#each}}, {{#each-in}}, (if) and (unless)
+// {{#unless}}, {{#each}}, {{#each-in}}, (if) and (unless)
 export class TogglingConditionalsTest extends BasicConditionalsTest {}
 
 // Testing behaviors shared across the (if) and (unless) helpers
@@ -632,7 +632,7 @@ export class IfUnlessHelperTest extends TogglingHelperConditionalsTest {}
 applyMixins(IfUnlessHelperTest, ...IfUnlessWithTestCases);
 
 // Testing behaviors shared across the "toggling" syntatical constructs,
-// i.e. {{#if}}, {{#unless}}, {{#with}}, {{#each}} and {{#each-in}}
+// i.e. {{#if}}, {{#unless}}, {{#each}} and {{#each-in}}
 export class TogglingSyntaxConditionalsTest extends TogglingConditionalsTest {
   renderValues(...values) {
     let templates = [];
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts b/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
deleted file mode 100644
index 9567a8a0eea..00000000000
--- a/packages/ember-template-compiler/lib/plugins/deprecate-with.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { assert, deprecate } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-import { isPath } from './utils';
-
-/**
- @module ember
-*/
-
-/**
-  A Glimmer2 AST transformation that deprecates `{{#with}}` and replace it
-  with `{{#let}}` and `{{#if}}` as per RFC 445.
-
-  Transforms:
-
-  ```handlebars
-  {{#with this.foo as |bar|}}
-    ...
-  {{/with}}
-  ```
-
-  Into:
-
-  ```handlebars
-  {{#let this.foo as |bar|}}
-    {{#if bar}}
-      ...
-    {{/if}}
-  {{/let}}
-  ```
-
-  And:
-
-  ```handlebars
-  {{#with this.foo as |bar|}}
-    ...
-  {{else}}
-    ...
-  {{/with}}
-  ```
-
-  Into:
-
-  ```handlebars
-  {{#let this.foo as |bar|}}
-    {{#if bar}}
-      ...
-    {{else}}
-      ...
-    {{/if}}
-  {{/let}}
-  ```
-
-  And issues a deprecation message.
-
-  @private
-  @class DeprecateWith
-*/
-export default function deprecateWith(env: EmberASTPluginEnvironment): ASTPlugin {
-  let moduleName = env.meta?.moduleName;
-  let { builders: b } = env.syntax;
-
-  return {
-    name: 'deprecate-with',
-
-    visitor: {
-      BlockStatement(node: AST.BlockStatement) {
-        if (!isPath(node.path) || node.path.original !== 'with') return;
-
-        let { params, hash, program, inverse, loc, openStrip, inverseStrip, closeStrip } = node;
-
-        let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-
-        assert(
-          `\`{{#with}}\` takes a single positional argument (the path to alias), received ${displayParams(
-            params
-          )}. ${sourceInformation}`,
-          params.length === 1
-        );
-
-        assert(
-          `\`{{#with}}\` does not take any named arguments, received ${displayHash(
-            hash
-          )}. ${sourceInformation}`,
-          hash.pairs.length === 0
-        );
-
-        assert(
-          `\`{{#with}}\` yields a single block param, received ${displayBlockParams(
-            program.blockParams
-          )}. ${sourceInformation}`,
-          program.blockParams.length <= 1
-        );
-
-        let recommendation;
-
-        if (program.blockParams.length === 0) {
-          recommendation = 'Use `{{#if}}` instead.';
-        } else if (inverse) {
-          recommendation = 'Use `{{#let}}` together with `{{#if}} instead.';
-        } else {
-          recommendation =
-            'If you always want the block to render, replace `{{#with}}` with `{{#let}}`. ' +
-            'If you want to conditionally render the block, use `{{#let}}` together with `{{#if}} instead.';
-        }
-
-        deprecate(`\`{{#with}}\` is deprecated. ${recommendation} ${sourceInformation}`, false, {
-          id: 'ember-glimmer.with-syntax',
-          until: '4.0.0',
-          for: 'ember-source',
-          url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-glimmer-with-syntax',
-          since: {
-            enabled: '3.26.0-beta.1',
-          },
-        });
-
-        if (program.blockParams.length === 0) {
-          return b.block(
-            'if',
-            params,
-            null,
-            program,
-            inverse,
-            loc,
-            openStrip,
-            inverseStrip,
-            closeStrip
-          );
-        } else {
-          return b.block(
-            'let',
-            params,
-            null,
-            b.blockItself(
-              [
-                b.block(
-                  'if',
-                  [b.path(program.blockParams[0])],
-                  null,
-                  b.blockItself(program.body, [], program.chained, program.loc),
-                  inverse,
-                  loc,
-                  openStrip,
-                  inverseStrip,
-                  closeStrip
-                ),
-              ],
-              program.blockParams,
-              false,
-              loc
-            ),
-            null,
-            loc,
-            openStrip,
-            inverseStrip,
-            closeStrip
-          );
-        }
-      },
-    },
-  };
-}
-
-function displayParams(params: AST.Expression[]): string {
-  if (params.length === 0) {
-    return 'no positional arguments';
-  } else {
-    let display = params.map((param) => `\`${JSON.stringify(param)}\``).join(', ');
-    return `${params.length} positional arguments: ${display}`;
-  }
-}
-
-function displayHash({ pairs }: AST.Hash): string {
-  if (pairs.length === 0) {
-    return 'no named arguments';
-  } else {
-    let display = pairs.map((pair) => `\`${pair.key}\``).join(', ');
-    return `${pairs.length} named arguments: ${display}`;
-  }
-}
-
-function displayBlockParams(blockParams: string[]): string {
-  if (blockParams.length === 0) {
-    return 'no block params';
-  } else {
-    let display = blockParams.map((param) => `\`${param}\``).join(', ');
-    return `${blockParams.length} block params: ${display}`;
-  }
-}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 2efa104176a..525bea17e25 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -4,7 +4,6 @@ import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
 import DeprecateSendAction from './deprecate-send-action';
-import DeprecateWith from './deprecate-with';
 import TransformActionSyntax from './transform-action-syntax';
 import TransformAttrsIntoArgs from './transform-attrs-into-args';
 import TransformEachInIntoEach from './transform-each-in-into-each';
@@ -36,7 +35,6 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
-    DeprecateWith,
     SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
@@ -55,7 +53,6 @@ export const STRICT_MODE_TRANSFORMS = Object.freeze(
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
-    DeprecateWith,
     SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,

From f94d5c535edddb4c70f70144213e594e0fbe7ca5 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 14 Jul 2021 10:11:10 -0700
Subject: [PATCH 0558/1405] remove `with` from expected.js

---
 tests/docs/expected.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..0e9200b3049 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -613,7 +613,6 @@ module.exports = {
     'willRender',
     'willTransition',
     'willUpdate',
-    'with',
     'without',
     'wrap',
     'wrapModelType',

From 863bb7a252491b81b930d5c56a29ef9df91a3c51 Mon Sep 17 00:00:00 2001
From: Sergey Astapov <SergeAstapov@gmail.com>
Date: Fri, 16 Jul 2021 17:48:06 -0400
Subject: [PATCH 0559/1405] [DOC] Fix invokeHelper example

---
 packages/@ember/helper/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/helper/index.ts b/packages/@ember/helper/index.ts
index 8f224c2c32e..f3d84cc6e21 100644
--- a/packages/@ember/helper/index.ts
+++ b/packages/@ember/helper/index.ts
@@ -264,8 +264,8 @@
     }
   }
 
-  export default class PlusOne extends Component {
-    plusOne = invokeHelper(this, RemoteData, () => {
+  export default class PlusOneComponent extends Component {
+    plusOne = invokeHelper(this, PlusOne, () => {
       return {
         positional: [this.args.number],
       };

From f6cb99ee41910d06a6f1edea420947e5f89712ce Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sat, 17 Jul 2021 20:46:04 -0400
Subject: [PATCH 0560/1405] Remove copy & Copyable

Part of https://github.com/emberjs/ember.js/issues/19617
---
 packages/@ember/-internals/runtime/index.js   |   2 -
 .../@ember/-internals/runtime/lib/copy.js     | 120 ------------------
 .../-internals/runtime/lib/mixins/copyable.js |  34 -----
 .../runtime/tests/copyable-array/copy-test.js |  12 --
 .../runtime/tests/core/copy_test.js           |  64 ----------
 .../-internals/runtime/tests/helpers/array.js |  61 +--------
 packages/@ember/object/internals.js           |   1 -
 packages/ember/index.js                       |   4 -
 packages/ember/tests/reexports_test.js        |   2 -
 tests/docs/expected.js                        |   1 -
 10 files changed, 2 insertions(+), 299 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/copy.js
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/copyable.js
 delete mode 100644 packages/@ember/-internals/runtime/tests/copyable-array/copy-test.js
 delete mode 100644 packages/@ember/-internals/runtime/tests/core/copy_test.js

diff --git a/packages/@ember/-internals/runtime/index.js b/packages/@ember/-internals/runtime/index.js
index 6558895952b..7c3e2d5ab93 100644
--- a/packages/@ember/-internals/runtime/index.js
+++ b/packages/@ember/-internals/runtime/index.js
@@ -1,7 +1,6 @@
 export { default as Object, FrameworkObject } from './lib/system/object';
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
-export { default as copy } from './lib/copy';
 export { default as compare } from './lib/compare';
 export { default as isEqual } from './lib/is-equal';
 export {
@@ -19,7 +18,6 @@ export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
 export { default as CoreObject } from './lib/system/core_object';
 export { default as ActionHandler } from './lib/mixins/action_handler';
-export { default as Copyable } from './lib/mixins/copyable';
 export { default as Enumerable } from './lib/mixins/enumerable';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as Observable } from './lib/mixins/observable';
diff --git a/packages/@ember/-internals/runtime/lib/copy.js b/packages/@ember/-internals/runtime/lib/copy.js
deleted file mode 100644
index b3416485569..00000000000
--- a/packages/@ember/-internals/runtime/lib/copy.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import { assert, deprecate } from '@ember/debug';
-import EmberObject from './system/object';
-import Copyable from './mixins/copyable';
-
-/**
- @module @ember/object
-*/
-function _copy(obj, deep, seen, copies) {
-  // primitive data types are immutable, just return them.
-  if (typeof obj !== 'object' || obj === null) {
-    return obj;
-  }
-
-  let ret, loc;
-
-  // avoid cyclical loops
-  if (deep && (loc = seen.indexOf(obj)) >= 0) {
-    return copies[loc];
-  }
-
-  if (deep) {
-    seen.push(obj);
-  }
-
-  // IMPORTANT: this specific test will detect a native array only. Any other
-  // object will need to implement Copyable.
-  if (Array.isArray(obj)) {
-    ret = obj.slice();
-
-    if (deep) {
-      copies.push(ret);
-      loc = ret.length;
-
-      while (--loc >= 0) {
-        ret[loc] = _copy(ret[loc], deep, seen, copies);
-      }
-    }
-  } else if (Copyable.detect(obj)) {
-    ret = obj.copy(deep, seen, copies);
-    if (deep) {
-      copies.push(ret);
-    }
-  } else if (obj instanceof Date) {
-    ret = new Date(obj.getTime());
-    if (deep) {
-      copies.push(ret);
-    }
-  } else {
-    assert(
-      'Cannot clone an EmberObject that does not implement Copyable',
-      !(obj instanceof EmberObject) || Copyable.detect(obj)
-    );
-
-    ret = {};
-    if (deep) {
-      copies.push(ret);
-    }
-
-    let key;
-    for (key in obj) {
-      // support Null prototype
-      if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-        continue;
-      }
-
-      // Prevents browsers that don't respect non-enumerability from
-      // copying internal Ember properties
-      if (key.substring(0, 2) === '__') {
-        continue;
-      }
-
-      ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
-    }
-  }
-
-  return ret;
-}
-
-/**
-  Creates a shallow copy of the passed object. A deep copy of the object is
-  returned if the optional `deep` argument is `true`.
-
-  If the passed object implements the `Copyable` interface, then this
-  function will delegate to the object's `copy()` method and return the
-  result. See `Copyable` for further details.
-
-  For primitive values (which are immutable in JavaScript), the passed object
-  is simply returned.
-
-  @method copy
-  @deprecated Use 'ember-copy' addon instead
-  @static
-  @for @ember/object/internals
-  @param {Object} obj The object to clone
-  @param {Boolean} [deep=false] If true, a deep copy of the object is made.
-  @return {Object} The copied object
-  @public
-*/
-export default function copy(obj, deep) {
-  deprecate('Use ember-copy addon instead of copy method and Copyable mixin.', false, {
-    id: 'ember-runtime.deprecate-copy-copyable',
-    until: '4.0.0',
-    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-runtime-deprecate-copy-copyable',
-    for: 'ember-source',
-    since: {
-      enabled: '3.3.0',
-    },
-  });
-
-  // fast paths
-  if ('object' !== typeof obj || obj === null) {
-    return obj; // can't copy primitives
-  }
-
-  if (!Array.isArray(obj) && Copyable.detect(obj)) {
-    return obj.copy(deep);
-  }
-
-  return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
-}
diff --git a/packages/@ember/-internals/runtime/lib/mixins/copyable.js b/packages/@ember/-internals/runtime/lib/mixins/copyable.js
deleted file mode 100644
index 7a09d373f52..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/copyable.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-@module ember
-*/
-
-import { Mixin } from '@ember/-internals/metal';
-
-/**
-  Implements some standard methods for copying an object. Add this mixin to
-  any object you create that can create a copy of itself. This mixin is
-  added automatically to the built-in array.
-
-  You should generally implement the `copy()` method to return a copy of the
-  receiver.
-
-  @class Copyable
-  @namespace Ember
-  @since Ember 0.9
-  @deprecated Use 'ember-copy' addon instead
-  @private
-*/
-export default Mixin.create({
-  /**
-    __Required.__ You must implement this method to apply this mixin.
-
-    Override to return a copy of the receiver. Default implementation raises
-    an exception.
-
-    @method copy
-    @param {Boolean} deep if `true`, a deep copy of the object should be made
-    @return {Object} copy of receiver
-    @private
-  */
-  copy: null,
-});
diff --git a/packages/@ember/-internals/runtime/tests/copyable-array/copy-test.js b/packages/@ember/-internals/runtime/tests/copyable-array/copy-test.js
deleted file mode 100644
index 999cacb34bb..00000000000
--- a/packages/@ember/-internals/runtime/tests/copyable-array/copy-test.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { AbstractTestCase } from 'internal-test-helpers';
-import { runArrayTests } from '../helpers/array';
-
-class CopyTest extends AbstractTestCase {
-  '@test should return an equivalent copy'() {
-    let obj = this.newObject();
-    let copy = obj.copy();
-    this.assert.ok(this.isEqual(obj, copy), 'old object and new object should be equivalent');
-  }
-}
-
-runArrayTests('copy', CopyTest, 'CopyableNativeArray', 'CopyableArray');
diff --git a/packages/@ember/-internals/runtime/tests/core/copy_test.js b/packages/@ember/-internals/runtime/tests/core/copy_test.js
deleted file mode 100644
index 063d83ca44a..00000000000
--- a/packages/@ember/-internals/runtime/tests/core/copy_test.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import copy from '../../lib/copy';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  'Ember Copy Method',
-  class extends AbstractTestCase {
-    ['@test Ember.copy null'](assert) {
-      let obj = { field: null };
-      let copied = null;
-      expectDeprecation(() => {
-        copied = copy(obj, true);
-      }, 'Use ember-copy addon instead of copy method and Copyable mixin.');
-      assert.equal(copied.field, null, 'null should still be null');
-    }
-
-    ['@test Ember.copy date'](assert) {
-      let date = new Date(2014, 7, 22);
-      let dateCopy = null;
-      expectDeprecation(() => {
-        dateCopy = copy(date);
-      }, 'Use ember-copy addon instead of copy method and Copyable mixin.');
-      assert.equal(date.getTime(), dateCopy.getTime(), 'dates should be equivalent');
-    }
-
-    ['@test Ember.copy null prototype object'](assert) {
-      let obj = Object.create(null);
-
-      obj.foo = 'bar';
-      let copied = null;
-      expectDeprecation(() => {
-        copied = copy(obj);
-      }, 'Use ember-copy addon instead of copy method and Copyable mixin.');
-
-      assert.equal(copied.foo, 'bar', 'bar should still be bar');
-    }
-
-    ['@test Ember.copy Array'](assert) {
-      let array = [1, null, new Date(2015, 9, 9), 'four'];
-      let arrayCopy = null;
-      expectDeprecation(() => {
-        arrayCopy = copy(array);
-      }, 'Use ember-copy addon instead of copy method and Copyable mixin.');
-
-      assert.deepEqual(array, arrayCopy, 'array content cloned successfully in new array');
-    }
-
-    ['@test Ember.copy cycle detection'](assert) {
-      let obj = {
-        foo: {
-          bar: 'bar',
-        },
-      };
-      obj.foo.foo = obj.foo;
-      let cycleCopy = null;
-      expectDeprecation(() => {
-        cycleCopy = copy(obj, true);
-      }, 'Use ember-copy addon instead of copy method and Copyable mixin.');
-
-      assert.equal(cycleCopy.foo.bar, 'bar');
-      assert.notEqual(cycleCopy.foo.foo, obj.foo.foo);
-      assert.strictEqual(cycleCopy.foo.foo, cycleCopy.foo.foo);
-    }
-  }
-);
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index 3efb0459c5f..0f5f5008d38 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -3,7 +3,6 @@ import EmberArray, { A as emberA, MutableArray } from '../../lib/mixins/array';
 import { generateGuid, guidFor } from '@ember/-internals/utils';
 import {
   get,
-  set,
   computed,
   addArrayObserver,
   removeArrayObserver,
@@ -11,7 +10,6 @@ import {
   arrayContentDidChange,
 } from '@ember/-internals/metal';
 import EmberObject from '../../lib/system/object';
-import Copyable from '../../lib/mixins/copyable';
 import { moduleFor } from 'internal-test-helpers';
 
 export function newFixture(cnt) {
@@ -147,42 +145,6 @@ class NativeArrayHelpers extends AbstractArrayHelper {
   }
 }
 
-class CopyableNativeArray extends AbstractArrayHelper {
-  newObject() {
-    return emberA([generateGuid()]);
-  }
-
-  isEqual(a, b) {
-    if (!(a instanceof Array)) {
-      return false;
-    }
-
-    if (!(b instanceof Array)) {
-      return false;
-    }
-
-    if (a.length !== b.length) {
-      return false;
-    }
-
-    return a[0] === b[0];
-  }
-}
-
-class CopyableArray extends AbstractArrayHelper {
-  newObject() {
-    return CopyableObject.create();
-  }
-
-  isEqual(a, b) {
-    if (!(a instanceof CopyableObject) || !(b instanceof CopyableObject)) {
-      return false;
-    }
-
-    return get(a, 'id') === get(b, 'id');
-  }
-}
-
 class ArrayProxyHelpers extends AbstractArrayHelper {
   newObject(ary) {
     return ArrayProxy.create({ content: emberA(super.newObject(ary)) });
@@ -271,21 +233,6 @@ const TestMutableArray = EmberObject.extend(MutableArray, {
   },
 });
 
-const CopyableObject = EmberObject.extend(Copyable, {
-  id: null,
-
-  init() {
-    this._super(...arguments);
-    set(this, 'id', generateGuid());
-  },
-
-  copy() {
-    let ret = CopyableObject.create();
-    set(ret, 'id', get(this, 'id'));
-    return ret;
-  },
-});
-
 class MutableArrayHelpers extends NativeArrayHelpers {
   newObject(ary) {
     return TestMutableArray.create(super.newObject(ary));
@@ -316,15 +263,11 @@ export function runArrayTests(name, Tests, ...types) {
         case 'MutableArray':
           moduleFor(`MutableArray: ${name}`, Tests, MutableArrayHelpers);
           break;
-        case 'CopyableArray':
-          moduleFor(`CopyableArray: ${name}`, Tests, CopyableArray);
-          break;
-        case 'CopyableNativeArray':
-          moduleFor(`CopyableNativeArray: ${name}`, Tests, CopyableNativeArray);
-          break;
         case 'NativeArray':
           moduleFor(`NativeArray: ${name}`, Tests, NativeArrayHelpers);
           break;
+        default:
+          throw new Error(`runArrayTests passed unexpected type ${type}`);
       }
     });
   } else {
diff --git a/packages/@ember/object/internals.js b/packages/@ember/object/internals.js
index 1c709857059..8093f908605 100644
--- a/packages/@ember/object/internals.js
+++ b/packages/@ember/object/internals.js
@@ -1,3 +1,2 @@
 export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
-export { copy } from '@ember/-internals/runtime';
 export { guidFor } from '@ember/-internals/utils';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index f0d1f8cab34..96c21d69086 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -40,10 +40,8 @@ import {
   RegistryProxyMixin,
   ContainerProxyMixin,
   compare,
-  copy,
   isEqual,
   Array as EmberArray,
-  Copyable,
   MutableEnumerable,
   MutableArray,
   TargetActionSupport,
@@ -375,7 +373,6 @@ Ember.Object = EmberObject;
 Ember._RegistryProxyMixin = RegistryProxyMixin;
 Ember._ContainerProxyMixin = ContainerProxyMixin;
 Ember.compare = compare;
-Ember.copy = copy;
 Ember.isEqual = isEqual;
 
 /**
@@ -408,7 +405,6 @@ Ember.ObjectProxy = ObjectProxy;
 Ember.ActionHandler = ActionHandler;
 Ember.CoreObject = CoreObject;
 Ember.NativeArray = NativeArray;
-Ember.Copyable = Copyable;
 Ember.MutableEnumerable = MutableEnumerable;
 Ember.MutableArray = MutableArray;
 Ember.Evented = Evented;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 8960a2a1e1a..3668aa11bd0 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -351,7 +351,6 @@ let allExports = [
 
   // @ember/object/internals
   ['cacheFor', '@ember/object/internals', 'cacheFor'],
-  ['copy', '@ember/object/internals', 'copy'],
   ['guidFor', '@ember/object/internals', 'guidFor'],
 
   // @ember/object/mixin
@@ -543,7 +542,6 @@ let allExports = [
   ['Comparable', '@ember/-internals/runtime'],
   ['ActionHandler', '@ember/-internals/runtime'],
   ['NativeArray', '@ember/-internals/runtime'],
-  ['Copyable', '@ember/-internals/runtime'],
   ['MutableEnumerable', '@ember/-internals/runtime'],
   EMBER_MODERNIZED_BUILT_IN_COMPONENTS
     ? null
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 340eefc7de2..1de032ea4d3 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -149,7 +149,6 @@ module.exports = {
     'controller',
     'controllerFor',
     'controllerName',
-    'copy',
     'create',
     'createCache',
     'current-when',

From e6659bed244dd912ed3ee3386289f5a0caa600c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 18 Jul 2021 13:11:37 +0000
Subject: [PATCH 0561/1405] Bump ws from 7.2.5 to 7.4.6

Bumps [ws](https://github.com/websockets/ws) from 7.2.5 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.2.5...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 872fa81464b..48927c89047 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6601,11 +6601,6 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -10410,15 +10405,10 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^7.2.3:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
-  integrity "sha1-q7E3DUYmpanNedjeQEqhizRl0Q0= sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="
-
-ws@~7.4.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
-  integrity "sha1-eCEABI5U6zb+mEM2OrHGhnKyYd0= sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
+ws@^7.2.3, ws@~7.4.2:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xdg-basedir@^3.0.0:
   version "3.0.0"

From b005bc17ebd4d34520453d4d5f6df7c750e011c2 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 14:09:53 -0400
Subject: [PATCH 0562/1405] Remove run and computed dot access

---
 lib/overrides.js                              |  45 ------
 .../@ember/-internals/overrides/index.d.ts    |   3 -
 packages/@ember/-internals/overrides/index.js |   2 -
 .../tests/system/object/computed_test.js      |   4 +-
 packages/@ember/object/index.js               | 134 +-----------------
 .../object/lib/computed/computed_macros.js    |  23 +--
 .../lib/computed/reduce_computed_macros.js    |  18 +--
 .../tests/computed/computed_macros_test.js    |  52 +++----
 .../computed/reduce_computed_macros_test.js   |  18 +--
 packages/@ember/runloop/index.js              |  89 +-----------
 packages/@ember/runloop/tests/later_test.js   |   2 +-
 packages/@ember/runloop/tests/next_test.js    |   2 +-
 packages/ember/tests/reexports_test.js        |  67 +--------
 .../lib/confirm-export.js                     |   6 +-
 tests/node/overrides-test.js                  |  41 +-----
 15 files changed, 69 insertions(+), 437 deletions(-)

diff --git a/lib/overrides.js b/lib/overrides.js
index 4eaed77a0c8..d8d9f4209a6 100644
--- a/lib/overrides.js
+++ b/lib/overrides.js
@@ -4,7 +4,6 @@ const validSemverRange = require('semver/ranges/valid');
 
 const DEFAULT_OPTIONS = Object.freeze({
   showAllEmberGlobalDeprecations: false,
-  showAllDotAccessDeprecations: false,
 });
 
 function* walkAddonTree(project, pathToAddon = []) {
@@ -32,8 +31,6 @@ module.exports = class Overrides {
     } else {
       return new Overrides(Overrides.addonsInfoFor(project), {
         showAllEmberGlobalDeprecations: env.EMBER_GLOBAL_DEPRECATIONS === 'all',
-        showAllDotAccessDeprecations:
-          env.EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS === 'all',
       });
     }
   }
@@ -216,10 +213,6 @@ module.exports = class Overrides {
     return !this.hasActionableSuggestions || this.options.showAllEmberGlobalDeprecations;
   }
 
-  get showAllDotAccessDeprecations() {
-    return !this.hasActionableSuggestions || this.options.showAllDotAccessDeprecations;
-  }
-
   get details() {
     let details =
       '\n### Details ###\n\n' +
@@ -333,8 +326,6 @@ module.exports = class Overrides {
   toModule() {
     return `
       export let onEmberGlobalAccess;
-      export let onComputedDotAccess;
-      export let onRunloopDotAccess;
 
       ${this.toJS()};
     `;
@@ -358,17 +349,10 @@ module.exports = class Overrides {
       ${this.onDotAcces}
 
       onEmberGlobalAccess = ${this.onEmberGlobalAccess};
-      onComputedDotAccess = onDotAccess;
-      onRunloopDotAccess = onDotAccess;
 
       if (!${this.showAllEmberGlobalDeprecations}) {
         onEmberGlobalAccess = once(onEmberGlobalAccess);
       }
-
-      if (!${this.showAllDotAccessDeprecations}) {
-        onComputedDotAccess = once(onComputedDotAccess);
-        onRunloopDotAccess = once(onRunloopDotAccess);
-      }
     `;
   }
 
@@ -379,33 +363,4 @@ module.exports = class Overrides {
       }
     `;
   }
-
-  get onDotAcces() {
-    return `
-      function onDotAccess(dotKey, importKey, module) {
-        let message =
-          'Using \`' + dotKey + '\` has been deprecated. Instead, import the value directly from ' + module + ':\\n\\n' +
-          '  import { ' + importKey + ' } from \\'' + module + '\\';\\n\\n' +
-          'These usages may be caused by an outdated ember-cli-babel dependency. ' +
-          'Usages of the Ember Global may be caused by an outdated ember-cli-babel dependency. ' +
-          'The following steps may help:\\n\\n' +
-          ${JSON.stringify(Overrides.printList(this.suggestions))};
-
-        if (!${this.showAllDotAccessDeprecations}) {
-          message +=
-            '\\n### Important ###\\n\\n' +
-            'In order to avoid repeatedly showing the same deprecation messages, ' +
-            'no further deprecation messages will be shown for theses deprecated usages ' +
-            'until ember-cli-babel is upgraded to v7.26.6 or above.\\n\\n' +
-            'To see all instances of this deprecation message, ' +
-            'set the \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS\` environment variable to "all", ' +
-            'e.g. \`EMBER_RUNLOOP_AND_COMPUTED_DOT_ACCESS_DEPRECATIONS=all ember test\`.\\n';
-        }
-
-        message += ${JSON.stringify(this.details)};
-
-        return message;
-      }
-    `;
-  }
 };
diff --git a/packages/@ember/-internals/overrides/index.d.ts b/packages/@ember/-internals/overrides/index.d.ts
index e52fbb81445..c913783fb1d 100644
--- a/packages/@ember/-internals/overrides/index.d.ts
+++ b/packages/@ember/-internals/overrides/index.d.ts
@@ -5,8 +5,5 @@ type Callback<TArgs extends unknown[], TReturn> = (...args: TArgs) => TReturn;
  */
 type Handler<TArgs extends unknown[]> = Callback<TArgs, string | null>;
 type GlobalAccessHandler = Handler<[]>;
-type DotAccessHandler = Handler<[dotKey: string, importKey: string, module: string]>;
 
 export let onEmberGlobalAccess: GlobalAccessHandler | undefined;
-export let onComputedDotAccess: DotAccessHandler | undefined;
-export let onRunloopDotAccess: DotAccessHandler | undefined;
diff --git a/packages/@ember/-internals/overrides/index.js b/packages/@ember/-internals/overrides/index.js
index 35b83669272..e016036f95e 100644
--- a/packages/@ember/-internals/overrides/index.js
+++ b/packages/@ember/-internals/overrides/index.js
@@ -1,3 +1 @@
 export let onEmberGlobalAccess;
-export let onComputedDotAccess;
-export let onRunloopDotAccess;
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
index 5d4c284d519..44552bda829 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
@@ -345,7 +345,9 @@ moduleFor(
       assert.ok(get(SubClass.create(), 'foo'), 'FOO', 'super value is fetched');
     }
 
-    ['@test observing computed.reads prop and overriding it in create() works'](assert) {
+    ['@test observing prop installed with computed macro reads and overriding it in create() works'](
+      assert
+    ) {
       let Obj = EmberObject.extend({
         name: reads('model.name'),
         nameDidChange: observer('name', function () {}),
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.js
index 328b0fa5f2f..5542729c9b3 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.js
@@ -1,7 +1,5 @@
-import { DEBUG } from '@glimmer/env';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
-import { onComputedDotAccess } from '@ember/-internals/overrides';
 
 export { Object as default } from '@ember/-internals/runtime';
 
@@ -17,136 +15,6 @@ export {
   trySet,
 } from '@ember/-internals/metal';
 
-import { computed } from '@ember/-internals/metal';
-
-import {
-  alias,
-  and,
-  bool,
-  collect,
-  deprecatingAlias,
-  empty,
-  equal,
-  filterBy,
-  filter,
-  gte,
-  gt,
-  intersect,
-  lte,
-  lt,
-  mapBy,
-  map,
-  match,
-  max,
-  min,
-  none,
-  notEmpty,
-  not,
-  oneWay,
-  or,
-  readOnly,
-  setDiff,
-  sort,
-  sum,
-  union,
-  uniqBy,
-  uniq,
-} from '@ember/object/computed';
-
-// eslint-disable-next-line no-undef
-if (DEBUG) {
-  let defaultHandler = (dotKey, importKey, module) => {
-    return `Using \`${dotKey}\` has been deprecated. Instead, import the value directly from ${module}:\n\n  import { ${importKey} } from '${module}';`;
-  };
-
-  let handler = onComputedDotAccess || defaultHandler;
-
-  let defineDeprecatedComputedFunc = (key, func) => {
-    Object.defineProperty(computed, key, {
-      get() {
-        let message = handler(`computed.${key}`, key, '@ember/object/computed');
-
-        deprecate(message, message === null, {
-          id: 'deprecated-run-loop-and-computed-dot-access',
-          until: '4.0.0',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-        });
-
-        return func;
-      },
-    });
-  };
-
-  defineDeprecatedComputedFunc('alias', alias);
-  defineDeprecatedComputedFunc('and', and);
-  defineDeprecatedComputedFunc('bool', bool);
-  defineDeprecatedComputedFunc('collect', collect);
-  defineDeprecatedComputedFunc('deprecatingAlias', deprecatingAlias);
-  defineDeprecatedComputedFunc('empty', empty);
-  defineDeprecatedComputedFunc('equal', equal);
-  defineDeprecatedComputedFunc('filterBy', filterBy);
-  defineDeprecatedComputedFunc('filter', filter);
-  defineDeprecatedComputedFunc('gte', gte);
-  defineDeprecatedComputedFunc('gt', gt);
-  defineDeprecatedComputedFunc('intersect', intersect);
-  defineDeprecatedComputedFunc('lte', lte);
-  defineDeprecatedComputedFunc('lt', lt);
-  defineDeprecatedComputedFunc('mapBy', mapBy);
-  defineDeprecatedComputedFunc('map', map);
-  defineDeprecatedComputedFunc('match', match);
-  defineDeprecatedComputedFunc('max', max);
-  defineDeprecatedComputedFunc('min', min);
-  defineDeprecatedComputedFunc('none', none);
-  defineDeprecatedComputedFunc('notEmpty', notEmpty);
-  defineDeprecatedComputedFunc('not', not);
-  defineDeprecatedComputedFunc('oneWay', oneWay);
-  defineDeprecatedComputedFunc('reads', oneWay);
-  defineDeprecatedComputedFunc('or', or);
-  defineDeprecatedComputedFunc('readOnly', readOnly);
-  defineDeprecatedComputedFunc('setDiff', setDiff);
-  defineDeprecatedComputedFunc('sort', sort);
-  defineDeprecatedComputedFunc('sum', sum);
-  defineDeprecatedComputedFunc('union', union);
-  defineDeprecatedComputedFunc('uniqBy', uniqBy);
-  defineDeprecatedComputedFunc('uniq', uniq);
-} else {
-  computed.alias = alias;
-  computed.and = and;
-  computed.bool = bool;
-  computed.collect = collect;
-  computed.deprecatingAlias = deprecatingAlias;
-  computed.empty = empty;
-  computed.equal = equal;
-  computed.filterBy = filterBy;
-  computed.filter = filter;
-  computed.gte = gte;
-  computed.gt = gt;
-  computed.intersect = intersect;
-  computed.lte = lte;
-  computed.lt = lt;
-  computed.mapBy = mapBy;
-  computed.map = map;
-  computed.match = match;
-  computed.max = max;
-  computed.min = min;
-  computed.none = none;
-  computed.notEmpty = notEmpty;
-  computed.not = not;
-  computed.oneWay = oneWay;
-  computed.reads = oneWay;
-  computed.or = or;
-  computed.readOnly = readOnly;
-  computed.setDiff = setDiff;
-  computed.sort = sort;
-  computed.sum = sum;
-  computed.union = union;
-  computed.uniqBy = uniqBy;
-  computed.uniq = uniq;
-}
-
 /**
   Decorator that turns the target function into an Action which can be accessed
   directly by reference.
diff --git a/packages/@ember/object/lib/computed/computed_macros.js b/packages/@ember/object/lib/computed/computed_macros.js
index a18ebdbf7a4..368a3e5640b 100644
--- a/packages/@ember/object/lib/computed/computed_macros.js
+++ b/packages/@ember/object/lib/computed/computed_macros.js
@@ -24,7 +24,7 @@ function expandPropertiesToArray(predicateName, properties) {
   for (let i = 0; i < properties.length; i++) {
     let property = properties[i];
     assert(
-      `Dependent keys passed to computed.${predicateName}() can't have spaces.`,
+      `Dependent keys passed to \`${predicateName}\` computed macro can't have spaces.`,
       property.indexOf(' ') < 0
     );
 
@@ -988,11 +988,11 @@ export const or = generateComputedWithPredicate('or', (value) => !value);
 */
 
 /**
-  Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
-  data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
-  not mutate the upstream property, rather causes the current property to become
-  the value set. This causes the downstream property to permanently diverge from
-  the upstream property.
+  Where the `alias` computed macro aliases `get` and `set`, and allows for
+  bidirectional data flow, the `oneWay` computed macro only provides an aliased
+  `get`. The `set` will not mutate the upstream property, rather causes the
+  current property to become the value set. This causes the downstream property
+  to permanently diverge from the upstream property.
 
   Example:
 
@@ -1061,8 +1061,8 @@ export function oneWay(dependentKey) {
 }
 
 /**
-  This is a more semantically meaningful alias of `computed.oneWay`, whose name
-  is somewhat ambiguous as to which direction the data flows.
+  This is a more semantically meaningful alias of the `oneWay` computed macro,
+  whose name is somewhat ambiguous as to which direction the data flows.
 
   @method reads
   @static
@@ -1074,9 +1074,10 @@ export function oneWay(dependentKey) {
  */
 
 /**
-  Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
-  a readOnly one way binding. Very often when using `computed.oneWay` one does
-  not also want changes to propagate back up, as they will replace the value.
+  Where `oneWay` computed macro provides oneWay bindings, the `readOnly`
+  computed macro provides a readOnly one way binding. Very often when using
+  the `oneWay` macro one does not also want changes to propagate back up, as
+  they will replace the value.
 
   This prevents the reverse flow, and also throws an exception when it occurs.
 
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.js b/packages/@ember/object/lib/computed/reduce_computed_macros.js
index d2e80b7a2a2..81f5b1f51fd 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.js
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.js
@@ -8,7 +8,7 @@ import { compare, isArray, A as emberA, uniqBy as uniqByArray } from '@ember/-in
 
 function reduceMacro(dependentKey, callback, initialValue, name) {
   assert(
-    `Dependent key passed to \`computed.${name}\` shouldn't contain brace expanding pattern.`,
+    `Dependent key passed to \`${name}\` computed macro shouldn't contain brace expanding pattern.`,
     !/[[\]{}]/g.test(dependentKey)
   );
 
@@ -43,7 +43,7 @@ function arrayMacro(dependentKey, additionalDependentKeys, callback) {
 
 function multiArrayMacro(_dependentKeys, callback, name) {
   assert(
-    `Dependent keys passed to \`computed.${name}\` shouldn't contain brace expanding pattern.`,
+    `Dependent keys passed to \`${name}\` computed macro shouldn't contain brace expanding pattern.`,
     _dependentKeys.every((dependentKey) => !/[[\]{}]/g.test(dependentKey))
   );
   let dependentKeys = _dependentKeys.map((key) => `${key}.[]`);
@@ -516,12 +516,12 @@ export function mapBy(dependentKey, propertyKey) {
   );
 
   assert(
-    '`computed.mapBy` expects a property string for its second argument, ' +
+    '`mapBy` computed macro expects a property string for its second argument, ' +
       'perhaps you meant to use "map"',
     typeof propertyKey === 'string'
   );
   assert(
-    `Dependent key passed to \`computed.mapBy\` shouldn't contain brace expanding pattern.`,
+    `Dependent key passed to \`mapBy\` computed macro shouldn't contain brace expanding pattern.`,
     !/[[\]{}]/g.test(dependentKey)
   );
 
@@ -745,7 +745,7 @@ export function filterBy(dependentKey, propertyKey, value) {
   );
 
   assert(
-    `Dependent key passed to \`computed.filterBy\` shouldn't contain brace expanding pattern.`,
+    `Dependent key passed to \`filterBy\` computed macro shouldn't contain brace expanding pattern.`,
     !/[[\]{}]/g.test(dependentKey)
   );
 
@@ -913,7 +913,7 @@ export function uniqBy(dependentKey, propertyKey) {
   );
 
   assert(
-    `Dependent key passed to \`computed.uniqBy\` shouldn't contain brace expanding pattern.`,
+    `Dependent key passed to \`uniqBy\` computed macro shouldn't contain brace expanding pattern.`,
     !/[[\]{}]/g.test(dependentKey)
   );
 
@@ -1164,9 +1164,9 @@ export function setDiff(setAProperty, setBProperty) {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  assert('`computed.setDiff` requires exactly two dependent arrays.', arguments.length === 2);
+  assert('`setDiff` computed macro requires exactly two dependent arrays.', arguments.length === 2);
   assert(
-    `Dependent keys passed to \`computed.setDiff\` shouldn't contain brace expanding pattern.`,
+    `Dependent keys passed to \`setDiff\` computed macro shouldn't contain brace expanding pattern.`,
     !/[[\]{}]/g.test(setAProperty) && !/[[\]{}]/g.test(setBProperty)
   );
 
@@ -1448,7 +1448,7 @@ export function sort(itemsKey, additionalDependentKeys, sortDefinition) {
     }
 
     assert(
-      '`computed.sort` can either be used with an array of sort properties or with a sort function. If used with an array of sort properties, it must receive exactly two arguments: the key of the array to sort, and the key of the array of sort properties. If used with a sort function, it may receive up to three arguments: the key of the array to sort, an optional additional array of dependent keys for the computed property, and the sort function.',
+      'The `sort` computed macro can either be used with an array of sort properties or with a sort function. If used with an array of sort properties, it must receive exactly two arguments: the key of the array to sort, and the key of the array of sort properties. If used with a sort function, it may receive up to three arguments: the key of the array to sort, an optional additional array of dependent keys for the computed property, and the sort function.',
       argumentsValid
     );
   }
diff --git a/packages/@ember/object/tests/computed/computed_macros_test.js b/packages/@ember/object/tests/computed/computed_macros_test.js
index 50817b2e89a..d7a3ba301a2 100644
--- a/packages/@ember/object/tests/computed/computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/computed_macros_test.js
@@ -23,7 +23,7 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 moduleFor(
   'CP macros',
   class extends AbstractTestCase {
-    ['@test Ember.computed.empty'](assert) {
+    ['@test empty part 1/2'](assert) {
       let obj = EmberObject.extend({
         bestLannister: null,
         lannisters: null,
@@ -44,7 +44,7 @@ moduleFor(
       assert.equal(get(obj, 'noLannistersKnown'), false, 'empty respects array mutations');
     }
 
-    ['@test Ember.computed.notEmpty'](assert) {
+    ['@test notEmpty part 1/2'](assert) {
       let obj = EmberObject.extend({
         bestLannister: null,
         lannisters: null,
@@ -65,7 +65,7 @@ moduleFor(
       assert.equal(get(obj, 'LannistersKnown'), true, 'empty respects array mutations');
     }
 
-    ['@test computed.not'](assert) {
+    ['@test not'](assert) {
       let obj = { foo: true };
       defineProperty(obj, 'notFoo', not('foo'));
       assert.equal(get(obj, 'notFoo'), false);
@@ -75,7 +75,7 @@ moduleFor(
       assert.equal(get(obj, 'notFoo'), false);
     }
 
-    ['@test computed.empty'](assert) {
+    ['@test empty part 2/2'](assert) {
       let obj = { foo: [], bar: undefined, baz: null, quz: '' };
       defineProperty(obj, 'fooEmpty', empty('foo'));
       defineProperty(obj, 'barEmpty', empty('bar'));
@@ -92,7 +92,7 @@ moduleFor(
       assert.equal(get(obj, 'quzEmpty'), false);
     }
 
-    ['@test computed.bool'](assert) {
+    ['@test bool'](assert) {
       let obj = { foo() {}, bar: 'asdf', baz: null, quz: false };
       defineProperty(obj, 'fooBool', bool('foo'));
       defineProperty(obj, 'barBool', bool('bar'));
@@ -104,7 +104,7 @@ moduleFor(
       assert.equal(get(obj, 'quzBool'), false);
     }
 
-    ['@test computed.alias'](assert) {
+    ['@test alias'](assert) {
       let obj = { bar: 'asdf', baz: null, quz: false };
       defineProperty(
         obj,
@@ -137,7 +137,7 @@ moduleFor(
       assert.equal(get(obj, 'quz'), null);
     }
 
-    ['@test computed.alias set'](assert) {
+    ['@test alias set'](assert) {
       let obj = {};
       let constantValue = 'always `a`';
 
@@ -164,7 +164,7 @@ moduleFor(
       assert.equal(get(obj, 'aliased'), constantValue);
     }
 
-    ['@test computed.match'](assert) {
+    ['@test match'](assert) {
       let obj = { name: 'Paul' };
       defineProperty(obj, 'isPaul', match('name', /Paul/));
 
@@ -175,7 +175,7 @@ moduleFor(
       assert.equal(get(obj, 'isPaul'), false, 'is not Paul anymore');
     }
 
-    ['@test computed.notEmpty'](assert) {
+    ['@test notEmpty part 2/2'](assert) {
       let obj = { items: [1] };
       defineProperty(obj, 'hasItems', notEmpty('items'));
 
@@ -186,7 +186,7 @@ moduleFor(
       assert.equal(get(obj, 'hasItems'), false, 'is empty');
     }
 
-    ['@test computed.equal'](assert) {
+    ['@test equal'](assert) {
       let obj = { name: 'Paul' };
       defineProperty(obj, 'isPaul', computedEqual('name', 'Paul'));
 
@@ -197,7 +197,7 @@ moduleFor(
       assert.equal(get(obj, 'isPaul'), false, 'is not Paul anymore');
     }
 
-    ['@test computed.gt'](assert) {
+    ['@test gt'](assert) {
       let obj = { number: 2 };
       defineProperty(obj, 'isGreaterThenOne', gt('number', 1));
 
@@ -212,7 +212,7 @@ moduleFor(
       assert.equal(get(obj, 'isGreaterThenOne'), false, 'is not gt');
     }
 
-    ['@test computed.gte'](assert) {
+    ['@test gte'](assert) {
       let obj = { number: 2 };
       defineProperty(obj, 'isGreaterOrEqualThenOne', gte('number', 1));
 
@@ -227,7 +227,7 @@ moduleFor(
       assert.equal(get(obj, 'isGreaterOrEqualThenOne'), false, 'is not gte');
     }
 
-    ['@test computed.lt'](assert) {
+    ['@test lt'](assert) {
       let obj = { number: 0 };
       defineProperty(obj, 'isLesserThenOne', lt('number', 1));
 
@@ -242,7 +242,7 @@ moduleFor(
       assert.equal(get(obj, 'isLesserThenOne'), false, 'is not lt');
     }
 
-    ['@test computed.lte'](assert) {
+    ['@test lte'](assert) {
       let obj = { number: 0 };
       defineProperty(obj, 'isLesserOrEqualThenOne', lte('number', 1));
 
@@ -257,7 +257,7 @@ moduleFor(
       assert.equal(get(obj, 'isLesserOrEqualThenOne'), false, 'is not lte');
     }
 
-    ['@test computed.and two properties'](assert) {
+    ['@test and, with two properties'](assert) {
       let obj = { one: true, two: true };
       defineProperty(obj, 'oneAndTwo', and('one', 'two'));
 
@@ -278,7 +278,7 @@ moduleFor(
       assert.equal(get(obj, 'oneAndTwo'), 2, 'returns truthy value as in &&');
     }
 
-    ['@test computed.and three properties'](assert) {
+    ['@test and, with three properties'](assert) {
       let obj = { one: true, two: true, three: true };
       defineProperty(obj, 'oneTwoThree', and('one', 'two', 'three'));
 
@@ -295,7 +295,7 @@ moduleFor(
       assert.equal(get(obj, 'oneTwoThree'), 3, 'returns truthy value as in &&');
     }
 
-    ['@test computed.and expand properties'](assert) {
+    ['@test and, with expand properties'](assert) {
       let obj = { one: true, two: true, three: true };
       defineProperty(obj, 'oneTwoThree', and('{one,two,three}'));
 
@@ -312,7 +312,7 @@ moduleFor(
       assert.equal(get(obj, 'oneTwoThree'), 3, 'returns truthy value as in &&');
     }
 
-    ['@test computed.or two properties'](assert) {
+    ['@test or, with two properties'](assert) {
       let obj = { one: true, two: true };
       defineProperty(obj, 'oneOrTwo', or('one', 'two'));
 
@@ -339,7 +339,7 @@ moduleFor(
       assert.equal(get(obj, 'oneOrTwo'), 1, 'returns truthy value as in ||');
     }
 
-    ['@test computed.or three properties'](assert) {
+    ['@test or, with three properties'](assert) {
       let obj = { one: true, two: true, three: true };
       defineProperty(obj, 'oneTwoThree', or('one', 'two', 'three'));
 
@@ -370,7 +370,7 @@ moduleFor(
       assert.equal(get(obj, 'oneTwoThree'), 1, 'returns truthy value as in ||');
     }
 
-    ['@test computed.or expand properties'](assert) {
+    ['@test or, with expand properties'](assert) {
       let obj = { one: true, two: true, three: true };
       defineProperty(obj, 'oneTwoThree', or('{one,two,three}'));
 
@@ -401,18 +401,18 @@ moduleFor(
       assert.equal(get(obj, 'oneTwoThree'), 1, 'returns truthy value as in ||');
     }
 
-    ['@test computed.or and computed.and warn about dependent keys with spaces']() {
+    ['@test or and and, warn about dependent keys with spaces']() {
       let obj = { one: true, two: true };
       expectAssertion(function () {
         defineProperty(obj, 'oneOrTwo', or('one', 'two three'));
-      }, /Dependent keys passed to computed\.or\(\) can't have spaces\./);
+      }, /Dependent keys passed to `or` computed macro can't have spaces\./);
 
       expectAssertion(function () {
         defineProperty(obj, 'oneAndTwo', and('one', 'two three'));
-      }, /Dependent keys passed to computed\.and\(\) can't have spaces\./);
+      }, /Dependent keys passed to `and` computed macro can't have spaces\./);
     }
 
-    ['@test computed.oneWay'](assert) {
+    ['@test oneWay'](assert) {
       let obj = {
         firstName: 'Teddy',
         lastName: 'Zeenny',
@@ -436,7 +436,7 @@ moduleFor(
       assert.equal(get(obj, 'nickName'), 'TeddyBear');
     }
 
-    ['@test computed.readOnly'](assert) {
+    ['@test readOnly'](assert) {
       let obj = {
         firstName: 'Teddy',
         lastName: 'Zeenny',
@@ -462,7 +462,7 @@ moduleFor(
       assert.equal(get(obj, 'nickName'), 'TEDDDDDDDDYYY');
     }
 
-    ['@test computed.deprecatingAlias'](assert) {
+    ['@test deprecatingAlias'](assert) {
       let obj = { bar: 'asdf', baz: null, quz: false };
       defineProperty(
         obj,
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index fe336f45f85..32cde245c2a 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -646,7 +646,7 @@ moduleFor(
   let [name, macro] = tuple;
 
   moduleFor(
-    `computed.${name}`,
+    `CP macro \`${name}\``,
     class extends AbstractTestCase {
       beforeEach() {
         obj = EmberObject.extend({
@@ -741,7 +741,7 @@ moduleFor(
 });
 
 moduleFor(
-  'computed.uniqBy',
+  'CP Macro `uniqBy`',
   class extends AbstractTestCase {
     beforeEach() {
       obj = EmberObject.extend({
@@ -828,7 +828,7 @@ moduleFor(
 );
 
 moduleFor(
-  'computed.intersect',
+  'CP Macro `intersect`',
   class extends AbstractTestCase {
     beforeEach() {
       obj = EmberObject.extend({
@@ -935,7 +935,7 @@ moduleFor(
             array2: emberA([3, 4, 5]),
           });
         },
-        /`computed\.setDiff` requires exactly two dependent arrays/,
+        /`setDiff` computed macro requires exactly two dependent arrays/,
         'setDiff requires two dependent arrays'
       );
 
@@ -949,7 +949,7 @@ moduleFor(
             array3: emberA([7]),
           });
         },
-        /`computed\.setDiff` requires exactly two dependent arrays/,
+        /`setDiff` computed macro requires exactly two dependent arrays/,
         'setDiff requires two dependent arrays'
       );
     }
@@ -1846,19 +1846,19 @@ moduleFor(
     ['@test it throws on bad inputs']() {
       expectAssertion(() => {
         sort('foo', 'bar', 'baz');
-      }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
+      }, /`sort` computed macro can either be used with an array of sort properties or with a sort function/);
 
       expectAssertion(() => {
         sort('foo', ['bar'], 'baz');
-      }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
+      }, /`sort` computed macro can either be used with an array of sort properties or with a sort function/);
 
       expectAssertion(() => {
         sort('foo', 'bar', function () {});
-      }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
+      }, /`sort` computed macro can either be used with an array of sort properties or with a sort function/);
 
       expectAssertion(() => {
         sort('foo', ['bar'], function () {}, 'baz');
-      }, /`computed.sort` can either be used with an array of sort properties or with a sort function/);
+      }, /`sort` computed macro can either be used with an array of sort properties or with a sort function/);
     }
   }
 );
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.js
index c78ceaa48a5..e91e934ee3a 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.js
@@ -1,8 +1,6 @@
-import { DEBUG } from '@glimmer/env';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
-import { onRunloopDotAccess } from '@ember/-internals/overrides';
 import Backburner from 'backburner';
 
 let currentRunLoop = null;
@@ -741,88 +739,3 @@ export function debounce() {
 export function throttle() {
   return _backburner.throttle(...arguments);
 }
-
-export let _deprecatedGlobalGetCurrentRunLoop;
-
-// eslint-disable-next-line no-undef
-if (DEBUG) {
-  let defaultHandler = (dotKey, importKey, module) => {
-    return `Using \`${dotKey}\` has been deprecated. Instead, import the value directly from ${module}:\n\n  import { ${importKey} } from '${module}';`;
-  };
-
-  let handler = onRunloopDotAccess || defaultHandler;
-
-  let defineDeprecatedRunloopFunc = (key, func) => {
-    Object.defineProperty(run, key, {
-      get() {
-        let message = handler(`run.${key}`, key, '@ember/runloop');
-
-        deprecate(message, message === null, {
-          id: 'deprecated-run-loop-and-computed-dot-access',
-          until: '4.0.0',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-        });
-
-        return func;
-      },
-    });
-  };
-
-  _deprecatedGlobalGetCurrentRunLoop = () => {
-    let message = handler('run.currentRunLoop', 'getCurrentRunLoop', '@ember/runloop');
-
-    deprecate(message, message === null, {
-      id: 'deprecated-run-loop-and-computed-dot-access',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-    });
-
-    return _getCurrentRunLoop();
-  };
-
-  defineDeprecatedRunloopFunc('backburner', _backburner);
-  defineDeprecatedRunloopFunc('begin', begin);
-  defineDeprecatedRunloopFunc('bind', bind);
-  defineDeprecatedRunloopFunc('cancel', cancel);
-  defineDeprecatedRunloopFunc('debounce', debounce);
-  defineDeprecatedRunloopFunc('end', end);
-  defineDeprecatedRunloopFunc('hasScheduledTimers', _hasScheduledTimers);
-  defineDeprecatedRunloopFunc('join', join);
-  defineDeprecatedRunloopFunc('later', later);
-  defineDeprecatedRunloopFunc('next', next);
-  defineDeprecatedRunloopFunc('once', once);
-  defineDeprecatedRunloopFunc('schedule', schedule);
-  defineDeprecatedRunloopFunc('scheduleOnce', scheduleOnce);
-  defineDeprecatedRunloopFunc('throttle', throttle);
-  defineDeprecatedRunloopFunc('cancelTimers', _cancelTimers);
-  Object.defineProperty(run, 'currentRunLoop', {
-    get: _deprecatedGlobalGetCurrentRunLoop,
-    enumerable: false,
-  });
-} else {
-  run.backburner = _backburner;
-  run.begin = begin;
-  run.bind = bind;
-  run.cancel = cancel;
-  run.debounce = debounce;
-  run.end = end;
-  run.hasScheduledTimers = _hasScheduledTimers;
-  run.join = join;
-  run.later = later;
-  run.next = next;
-  run.once = once;
-  run.schedule = schedule;
-  run.scheduleOnce = scheduleOnce;
-  run.throttle = throttle;
-  run.cancelTimers = _cancelTimers;
-  Object.defineProperty(run, 'currentRunLoop', {
-    get: _getCurrentRunLoop,
-    enumerable: false,
-  });
-}
diff --git a/packages/@ember/runloop/tests/later_test.js b/packages/@ember/runloop/tests/later_test.js
index c2f4eb14cca..f8ec7251d28 100644
--- a/packages/@ember/runloop/tests/later_test.js
+++ b/packages/@ember/runloop/tests/later_test.js
@@ -31,7 +31,7 @@ function pauseUntil(time) {
 }
 
 moduleFor(
-  'run.later',
+  'runloop `later`',
   class extends AbstractTestCase {
     teardown() {
       _backburner._platform = originalPlatform;
diff --git a/packages/@ember/runloop/tests/next_test.js b/packages/@ember/runloop/tests/next_test.js
index 124b822ba2f..7c608eaafdd 100644
--- a/packages/@ember/runloop/tests/next_test.js
+++ b/packages/@ember/runloop/tests/next_test.js
@@ -2,7 +2,7 @@ import { run, next, _getCurrentRunLoop } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
-  'run.next',
+  'runloop `next`',
   class extends AbstractTestCase {
     ['@test should invoke immediately on next timeout'](assert) {
       let done = assert.async();
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 2ece032df5d..f8befb7a9d2 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -13,22 +13,14 @@ moduleFor(
   class extends AbstractTestCase {
     [`@test Ember exports correctly`](assert) {
       allExports.forEach((reexport) => {
-        let [path, moduleId, exportName, isDeprecated] = reexport;
+        let [path, moduleId, exportName] = reexport;
 
         // default path === exportName if none present
         if (!exportName) {
           exportName = path;
         }
 
-        confirmExport(
-          Ember,
-          assert,
-          path,
-          moduleId,
-          exportName,
-          isDeprecated,
-          `Ember.${path} exports correctly`
-        );
+        confirmExport(Ember, assert, path, moduleId, exportName);
       });
     }
 
@@ -297,39 +289,7 @@ let allExports = [
 
   // @ember/object/computed
   ['ComputedProperty', '@ember/object/computed', 'default'],
-  ['computed.alias', '@ember/object/computed', 'alias', true],
-  ['computed.and', '@ember/object/computed', 'and', true],
-  ['computed.bool', '@ember/object/computed', 'bool', true],
-  ['computed.collect', '@ember/object/computed', 'collect', true],
-  ['computed.deprecatingAlias', '@ember/object/computed', 'deprecatingAlias', true],
-  ['computed.empty', '@ember/object/computed', 'empty', true],
-  ['computed.equal', '@ember/object/computed', 'equal', true],
-  ['expandProperties', '@ember/object/computed', 'expandProperties', true],
-  ['computed.filter', '@ember/object/computed', 'filter', true],
-  ['computed.filterBy', '@ember/object/computed', 'filterBy', true],
-  ['computed.gt', '@ember/object/computed', 'gt', true],
-  ['computed.gte', '@ember/object/computed', 'gte', true],
-  ['computed.intersect', '@ember/object/computed', 'intersect', true],
-  ['computed.lt', '@ember/object/computed', 'lt', true],
-  ['computed.lte', '@ember/object/computed', 'lte', true],
-  ['computed.map', '@ember/object/computed', 'map', true],
-  ['computed.mapBy', '@ember/object/computed', 'mapBy', true],
-  ['computed.match', '@ember/object/computed', 'match', true],
-  ['computed.max', '@ember/object/computed', 'max', true],
-  ['computed.min', '@ember/object/computed', 'min', true],
-  ['computed.none', '@ember/object/computed', 'none', true],
-  ['computed.not', '@ember/object/computed', 'not', true],
-  ['computed.notEmpty', '@ember/object/computed', 'notEmpty', true],
-  ['computed.oneWay', '@ember/object/computed', 'oneWay', true],
-  ['computed.or', '@ember/object/computed', 'or', true],
-  ['computed.readOnly', '@ember/object/computed', 'readOnly', true],
-  ['computed.reads', '@ember/object/computed', 'reads', true],
-  ['computed.setDiff', '@ember/object/computed', 'setDiff', true],
-  ['computed.sort', '@ember/object/computed', 'sort', true],
-  ['computed.sum', '@ember/object/computed', 'sum', true],
-  ['computed.union', '@ember/object/computed', 'union', true],
-  ['computed.uniq', '@ember/object/computed', 'uniq', true],
-  ['computed.uniqBy', '@ember/object/computed', 'uniqBy', true],
+  ['expandProperties', '@ember/object/computed', 'expandProperties'],
 
   // @ember/object/core
   ['CoreObject', '@ember/object/core', 'default'],
@@ -394,27 +354,6 @@ let allExports = [
 
   // @ember/runloop
   ['run', '@ember/runloop', 'run'],
-  ['run.backburner', '@ember/runloop', '_backburner', true],
-  ['run.begin', '@ember/runloop', 'begin', true],
-  ['run.bind', '@ember/runloop', 'bind', true],
-  ['run.cancel', '@ember/runloop', 'cancel', true],
-  ['run.debounce', '@ember/runloop', 'debounce', true],
-  ['run.end', '@ember/runloop', 'end', true],
-  ['run.hasScheduledTimers', '@ember/runloop', '_hasScheduledTimers', true],
-  ['run.join', '@ember/runloop', 'join', true],
-  ['run.later', '@ember/runloop', 'later', true],
-  ['run.next', '@ember/runloop', 'next', true],
-  ['run.once', '@ember/runloop', 'once', true],
-  ['run.schedule', '@ember/runloop', 'schedule', true],
-  ['run.scheduleOnce', '@ember/runloop', 'scheduleOnce', true],
-  ['run.throttle', '@ember/runloop', 'throttle', true],
-  [
-    'run.currentRunLoop',
-    '@ember/runloop',
-    { get: DEBUG ? '_deprecatedGlobalGetCurrentRunLoop' : '_getCurrentRunLoop' },
-    true,
-  ],
-  ['run.cancelTimers', '@ember/runloop', '_cancelTimers', true],
 
   // @ember/service
   ['Service', '@ember/service', 'default'],
diff --git a/packages/internal-test-helpers/lib/confirm-export.js b/packages/internal-test-helpers/lib/confirm-export.js
index 20a87a0cf52..beb549f6ddf 100644
--- a/packages/internal-test-helpers/lib/confirm-export.js
+++ b/packages/internal-test-helpers/lib/confirm-export.js
@@ -14,7 +14,7 @@ function getDescriptor(obj, path) {
   return Object.getOwnPropertyDescriptor(value, last);
 }
 
-export default function confirmExport(Ember, assert, path, moduleId, exportName, isDeprecated) {
+export default function confirmExport(Ember, assert, path, moduleId, exportName) {
   try {
     let desc;
 
@@ -25,10 +25,6 @@ export default function confirmExport(Ember, assert, path, moduleId, exportName,
       desc = null;
     }
 
-    if (isDeprecated) {
-      expectDeprecation();
-    }
-
     if (desc === null) {
       let mod = require(moduleId);
       assert.notEqual(mod[exportName], undefined, `${moduleId}#${exportName} is not \`undefined\``);
diff --git a/tests/node/overrides-test.js b/tests/node/overrides-test.js
index 90dc4aebe4e..07dc930c30b 100644
--- a/tests/node/overrides-test.js
+++ b/tests/node/overrides-test.js
@@ -128,14 +128,12 @@ function infoForApp({
 function evalJS(overrides) {
   return eval(`
     (function () {
-      let onEmberGlobalAccess, onComputedDotAccess, onRunloopDotAccess;
+      let onEmberGlobalAccess;
 
       ${overrides.toJS()}
 
       return {
         onEmberGlobalAccess: onEmberGlobalAccess,
-        onComputedDotAccess: onComputedDotAccess,
-        onRunloopDotAccess: onRunloopDotAccess,
       };
     })()
   `);
@@ -600,11 +598,6 @@ QUnit.module('Overrides', function () {
       false,
       'showAllEmberGlobalDeprecations'
     );
-    assert.strictEqual(
-      overrides.showAllDotAccessDeprecations,
-      false,
-      'showAllDotAccessDeprecations'
-    );
     assert.deepEqual(overrides.suggestions, [
       'Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.',
     ]);
@@ -624,7 +617,7 @@ QUnit.module('Overrides', function () {
       'overrides.globalMessage'
     );
 
-    let { onEmberGlobalAccess, onComputedDotAccess, onRunloopDotAccess } = evalJS(overrides);
+    let { onEmberGlobalAccess } = evalJS(overrides);
 
     assert.equal(
       onEmberGlobalAccess(),
@@ -633,36 +626,6 @@ QUnit.module('Overrides', function () {
     );
 
     assert.strictEqual(onEmberGlobalAccess(), null, 'onEmberGlobalAccess() (second call)');
-
-    assert.ok(
-      onComputedDotAccess('computed.reads', 'reads', '@ember/object/computed').startsWith(
-        'Using `computed.reads` has been deprecated. ' +
-          'Instead, import the value directly from @ember/object/computed:\n\n' +
-          "  import { reads } from '@ember/object/computed';\n\n"
-      ),
-      'onComputedDotAccess() (first call)'
-    );
-
-    assert.strictEqual(
-      onComputedDotAccess('computed.reads', 'reads', '@ember/object/computed'),
-      null,
-      'onComputedDotAccess() (second call)'
-    );
-
-    assert.ok(
-      onRunloopDotAccess('run.next', 'next', '@ember/runloop').startsWith(
-        'Using `run.next` has been deprecated. ' +
-          'Instead, import the value directly from @ember/runloop:\n\n' +
-          "  import { next } from '@ember/runloop';\n\n"
-      ),
-      'onRunloopDotAccess() (first call)'
-    );
-
-    assert.strictEqual(
-      onRunloopDotAccess('run.next', 'next', '@ember/runloop'),
-      null,
-      'onRunloopDotAccess() (second call)'
-    );
   });
 
   // let project, env;

From fb1d784ce73b8e542d95f3996a12201c20d524fc Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 17:09:43 -0400
Subject: [PATCH 0563/1405] Remove meta-destruction-apis

---
 packages/@ember/-internals/meta/lib/meta.ts | 70 +--------------------
 1 file changed, 2 insertions(+), 68 deletions(-)

diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 0c97fda893f..9495447490e 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -1,6 +1,6 @@
 import { symbol, toString } from '@ember/-internals/utils';
-import { assert, deprecate } from '@ember/debug';
-import { isDestroyed, isDestroying } from '@glimmer/destroyable';
+import { assert } from '@ember/debug';
+import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import { Revision, UpdatableTag } from '@glimmer/validator';
 
@@ -133,72 +133,6 @@ export class Meta {
     return parent;
   }
 
-  // These methods are here to prevent errors in legacy compat with some addons
-  // that used them as intimate API
-  setSourceDestroying() {
-    deprecate(
-      'setSourceDestroying is deprecated, use the destroy() API to destroy the object directly instead',
-      false,
-      {
-        id: 'meta-destruction-apis',
-        until: '3.25.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.21.0',
-        },
-      }
-    );
-  }
-
-  setSourceDestroyed() {
-    deprecate(
-      'setSourceDestroyed is deprecated, use the destroy() API to destroy the object directly instead',
-      false,
-      {
-        id: 'meta-destruction-apis',
-        until: '3.25.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.21.0',
-        },
-      }
-    );
-  }
-
-  isSourceDestroying() {
-    deprecate(
-      'isSourceDestroying is deprecated, use the isDestroying() API to check the object destruction state directly instead',
-      false,
-      {
-        id: 'meta-destruction-apis',
-        until: '3.25.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.21.0',
-        },
-      }
-    );
-
-    return isDestroying(this.source);
-  }
-
-  isSourceDestroyed() {
-    deprecate(
-      'isSourceDestroyed is deprecated, use the isDestroyed() API to check the object destruction state directly instead',
-      false,
-      {
-        id: 'meta-destruction-apis',
-        until: '3.25.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.21.0',
-        },
-      }
-    );
-
-    return isDestroyed(this.source);
-  }
-
   setInitializing() {
     this._isInit = true;
   }

From 6446a6069d9e7d7be7f73f3066530c4d65a65ec8 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 17:18:07 -0400
Subject: [PATCH 0564/1405] Remove string-based setComponentManager

---
 .../-internals/glimmer/lib/utils/managers.ts  | 28 ++-----------------
 .../custom-component-manager-test.js          | 11 --------
 packages/@ember/deprecated-features/index.ts  |  1 -
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index c12bf49ba41..0073b4e1991 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,6 +1,5 @@
 import { Owner } from '@ember/-internals/owner';
 import { deprecate } from '@ember/debug';
-import { COMPONENT_MANAGER_STRING_LOOKUP } from '@ember/deprecated-features';
 import { DEBUG } from '@glimmer/env';
 import { ComponentManager } from '@glimmer/interfaces';
 import {
@@ -10,33 +9,10 @@ import {
 } from '@glimmer/manager';
 
 export function setComponentManager(
-  stringOrFunction: string | ((owner: Owner) => ComponentManager<unknown>),
+  manager: (owner: Owner) => ComponentManager<unknown>,
   obj: object
 ): object {
-  let factory: (owner: Owner) => ComponentManager<unknown>;
-
-  if (COMPONENT_MANAGER_STRING_LOOKUP && typeof stringOrFunction === 'string') {
-    deprecate(
-      'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.',
-      false,
-      {
-        id: 'deprecate-string-based-component-manager',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x/#toc_component-manager-string-lookup',
-        for: 'ember-source',
-        since: {
-          enabled: '3.8.0',
-        },
-      }
-    );
-    factory = function (owner: Owner) {
-      return owner.lookup<ComponentManager<unknown>>(`component-manager:${stringOrFunction}`)!;
-    };
-  } else {
-    factory = stringOrFunction as (owner: Owner) => ComponentManager<unknown>;
-  }
-
-  return glimmerSetComponentManager(factory, obj);
+  return glimmerSetComponentManager(manager, obj);
 }
 
 export let componentCapabilities = glimmerComponentCapabilities;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 24b6cfe7ee4..21b94917b80 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -80,17 +80,6 @@ class ComponentManagerTest extends RenderingTestCase {
 moduleFor(
   'Component Manager - Curly Invocation',
   class extends ComponentManagerTest {
-    ['@test the string based version of setComponentManager is deprecated']() {
-      expectDeprecation(() => {
-        setComponentManager(
-          'basic',
-          EmberObject.extend({
-            greeting: 'hello',
-          })
-        );
-      }, 'Passing the name of the component manager to "setupComponentManager" is deprecated. Please pass a function that produces an instance of the manager.');
-    }
-
     ['@test it can render a basic component with custom component manager']() {
       let ComponentClass = setComponentManager(
         createBasicManager,
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 67122f2e569..120076be816 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -6,7 +6,6 @@
 export const SEND_ACTION = !!'3.4.0';
 export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
 export const ROUTER_EVENTS = !!'4.0.0';
-export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const FUNCTION_PROTOTYPE_EXTENSIONS = !!'3.11.0-beta.1';

From 55618960d68394dcec06ed29e2873082d6a5b1ea Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 19:21:47 -0400
Subject: [PATCH 0565/1405] Remove hasBlock and hasBlockParams

In favor of (has-block) and (has-block-params)
---
 packages/@ember/-internals/glimmer/index.ts   |   8 +-
 .../components/contextual-components-test.js  |  23 +-
 .../components/curly-components-test.js       | 238 +++---------------
 .../lib/plugins/index.ts                      |   2 -
 .../lib/plugins/transform-has-block-syntax.ts |  84 -------
 tests/docs/expected.js                        |   4 +-
 6 files changed, 44 insertions(+), 315 deletions(-)
 delete mode 100644 packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index b85bf0842dc..cf7ecfdd08b 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -150,7 +150,7 @@
  */
 
 /**
-  `{{has-block}}` indicates if the component was invoked with a block.
+  `{{(has-block)}}` indicates if the component was invoked with a block.
 
   This component is invoked with a block:
 
@@ -187,7 +187,7 @@
   {{/if}}
   ```
 
-  @method hasBlock
+  @method has-block
   @for Ember.Templates.helpers
   @param {String} the name of the block. The name (at the moment) is either "main" or "inverse" (though only curly components support inverse)
   @return {Boolean} `true` if the component was invoked with a block
@@ -195,7 +195,7 @@
  */
 
 /**
-  `{{has-block-params}}` indicates if the component was invoked with block params.
+  `{{(has-block-params)}}` indicates if the component was invoked with block params.
 
   This component is invoked with block params:
 
@@ -242,7 +242,7 @@
   {{/if}}
   ```
 
-  @method hasBlockParams
+  @method has-block-params
   @for Ember.Templates.helpers
   @param {String} the name of the block. The name (at the moment) is either "main" or "inverse" (though only curly components support inverse)
   @return {Boolean} `true` if the component was invoked with block params
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index 750f9df7538..4d102a4b072 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1357,13 +1357,10 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test GH#18732 hasBlock works within a yielded curried component invoked within mustaches']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
-      );
+    ['@test GH#18732 (has-block) works within a yielded curried component invoked within mustaches']() {
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
-        template: '<div>{{hasBlock}}</div>',
+        template: '<div>{{(has-block)}}</div>',
       });
 
       this.registerComponent('yielding-component', {
@@ -1382,14 +1379,10 @@ moduleFor(
       this.assertText('false');
     }
 
-    ['@test GH#18732 has-block works within a yielded curried component invoked with angle bracket invocation (falsy)']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
-      );
-
+    ['@test GH#18732 (has-block) works within a yielded curried component invoked with angle bracket invocation (falsy)']() {
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
-        template: '<div>{{hasBlock}}</div>',
+        template: '<div>{{(has-block)}}</div>',
       });
 
       this.registerComponent('yielding-component', {
@@ -1408,14 +1401,10 @@ moduleFor(
       this.assertText('false');
     }
 
-    ['@test GH#18732 has-block works within a yielded curried component invoked with angle bracket invocation (truthy)']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/component-with-has-block.hbs' @ L1:C5) `
-      );
-
+    ['@test GH#18732 (has-block) works within a yielded curried component invoked with angle bracket invocation (truthy)']() {
       this.registerComponent('component-with-has-block', {
         ComponentClass: Component.extend(),
-        template: '<div>{{hasBlock}}</div>',
+        template: '<div>{{(has-block)}}</div>',
       });
 
       this.registerComponent('yielding-component', {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index ac62b19d7a7..fb317360c0e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -1950,14 +1950,10 @@ moduleFor(
       );
     }
 
-    ['@test hasBlock is true when block supplied']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
-      );
-
+    ['@test (has-block) is true when block supplied']() {
       this.registerComponent('with-block', {
         template: strip`
-        {{#if hasBlock}}
+        {{#if (has-block)}}
           {{yield}}
         {{else}}
           No Block!
@@ -1976,14 +1972,10 @@ moduleFor(
       this.assertText('In template');
     }
 
-    ['@test hasBlock is false when no block supplied']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
-      );
-
+    ['@test (has-block) is false when no block supplied']() {
       this.registerComponent('with-block', {
         template: strip`
-        {{#if hasBlock}}
+        {{#if (has-block)}}
           {{yield}}
         {{else}}
           No Block!
@@ -1999,14 +1991,10 @@ moduleFor(
       this.assertText('No Block!');
     }
 
-    ['@test hasBlockParams is true when block param supplied']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
-      );
-
+    ['@test (has-block-params) is true when block param supplied']() {
       this.registerComponent('with-block', {
         template: strip`
-        {{#if hasBlockParams}}
+        {{#if (has-block-params)}}
           {{yield this}} - In Component
         {{else}}
           {{yield}} No Block!
@@ -2025,14 +2013,10 @@ moduleFor(
       this.assertText('In template - In Component');
     }
 
-    ['@test hasBlockParams is false when no block param supplied']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/with-block.hbs' @ L1:C6) `
-      );
-
+    ['@test (has-block-params) is false when no block param supplied']() {
       this.registerComponent('with-block', {
         template: strip`
-        {{#if hasBlockParams}}
+        {{#if (has-block-params)}}
           {{yield this}}
         {{else}}
           {{yield}} No Block Param!
@@ -2156,14 +2140,10 @@ moduleFor(
       this.assertText('Yes:Hello42');
     }
 
-    ['@test expression hasBlock inverse']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-inverse.hbs' @ L1:C6) `
-      );
-
+    ['@test expression (has-block) inverse']() {
       this.registerComponent('check-inverse', {
         template: strip`
-        {{#if (hasBlock "inverse")}}
+        {{#if (has-block "inverse")}}
           Yes
         {{else}}
           No
@@ -2180,14 +2160,10 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test expression hasBlock default']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-block.hbs' @ L1:C6) `
-      );
-
+    ['@test expression (has-block) default']() {
       this.registerComponent('check-block', {
         template: strip`
-        {{#if (hasBlock)}}
+        {{#if (has-block)}}
           Yes
         {{else}}
           No
@@ -2204,14 +2180,10 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test expression hasBlockParams inverse']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-inverse.hbs' @ L1:C6) `
-      );
-
+    ['@test expression (has-block-params) inverse']() {
       this.registerComponent('check-inverse', {
         template: strip`
-        {{#if (hasBlockParams "inverse")}}
+        {{#if (has-block-params "inverse")}}
           Yes
         {{else}}
           No
@@ -2228,14 +2200,10 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test expression hasBlockParams default']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-block.hbs' @ L1:C6) `
-      );
-
+    ['@test expression (has-block-params) default']() {
       this.registerComponent('check-block', {
         template: strip`
-        {{#if (hasBlockParams)}}
+        {{#if (has-block-params)}}
           Yes
         {{else}}
           No
@@ -2252,85 +2220,9 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test non-expression hasBlock']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-block.hbs' @ L1:C6) `
-      );
-
-      this.registerComponent('check-block', {
-        template: strip`
-        {{#if hasBlock}}
-          Yes
-        {{else}}
-          No
-        {{/if}}`,
-      });
-
-      this.render(strip`
-      {{check-block}}
-      {{#check-block}}{{/check-block}}`);
-
-      this.assertComponentElement(this.firstChild, { content: 'No' });
-      this.assertComponentElement(this.nthChild(1), { content: 'Yes' });
-
-      this.assertStableRerender();
-    }
-
-    ['@test expression hasBlockParams']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-params.hbs' @ L1:C6) `
-      );
-
-      this.registerComponent('check-params', {
-        template: strip`
-        {{#if (hasBlockParams)}}
-          Yes
-        {{else}}
-          No
-        {{/if}}`,
-      });
-
-      this.render(strip`
-      {{#check-params}}{{/check-params}}
-      {{#check-params as |foo|}}{{/check-params}}`);
-
-      this.assertComponentElement(this.firstChild, { content: 'No' });
-      this.assertComponentElement(this.nthChild(1), { content: 'Yes' });
-
-      this.assertStableRerender();
-    }
-
-    ['@test non-expression hasBlockParams']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-params.hbs' @ L1:C6) `
-      );
-
-      this.registerComponent('check-params', {
-        template: strip`
-        {{#if hasBlockParams}}
-          Yes
-        {{else}}
-          No
-        {{/if}}`,
-      });
-
-      this.render(strip`
-      {{#check-params}}{{/check-params}}
-      {{#check-params as |foo|}}{{/check-params}}`);
-
-      this.assertComponentElement(this.firstChild, { content: 'No' });
-      this.assertComponentElement(this.nthChild(1), { content: 'Yes' });
-
-      this.assertStableRerender();
-    }
-
-    ['@test hasBlock expression in an attribute'](assert) {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
-      );
-
+    ['@test (has-block) expression in an attribute'](assert) {
       this.registerComponent('check-attr', {
-        template: '<button name={{hasBlock}}></button>',
+        template: '<button name={{(has-block)}}></button>',
       });
 
       this.render(strip`
@@ -2343,15 +2235,11 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlock inverse expression in an attribute'](assert) {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
-      );
-
+    ['@test (has-block) inverse expression in an attribute'](assert) {
       this.registerComponent(
         'check-attr',
         {
-          template: '<button name={{hasBlock "inverse"}}></button>',
+          template: '<button name={{(has-block "inverse")}}></button>',
         },
         ''
       );
@@ -2366,13 +2254,9 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlockParams expression in an attribute'](assert) {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
-      );
-
+    ['@test (has-block-params) expression in an attribute'](assert) {
       this.registerComponent('check-attr', {
-        template: '<button name={{hasBlockParams}}></button>',
+        template: '<button name={{(has-block-params)}}></button>',
       });
 
       this.render(strip`
@@ -2385,15 +2269,11 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlockParams inverse expression in an attribute'](assert) {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-attr.hbs' @ L1:C13) `
-      );
-
+    ['@test (has-block-params) inverse expression in an attribute'](assert) {
       this.registerComponent(
         'check-attr',
         {
-          template: '<button name={{hasBlockParams "inverse"}}></button>',
+          template: '<button name={{(has-block-params "inverse")}}></button>',
         },
         ''
       );
@@ -2408,32 +2288,9 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlock as a param to a helper']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
-      );
-
-      this.registerComponent('check-helper', {
-        template: '{{if hasBlock "true" "false"}}',
-      });
-
-      this.render(strip`
-      {{check-helper}}
-      {{#check-helper}}{{/check-helper}}`);
-
-      this.assertComponentElement(this.firstChild, { content: 'false' });
-      this.assertComponentElement(this.nthChild(1), { content: 'true' });
-
-      this.assertStableRerender();
-    }
-
-    ['@test hasBlock as an expression param to a helper']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
-      );
-
+    ['@test (has-block) as a param to a helper']() {
       this.registerComponent('check-helper', {
-        template: '{{if (hasBlock) "true" "false"}}',
+        template: '{{if (has-block) "true" "false"}}',
       });
 
       this.render(strip`
@@ -2446,13 +2303,9 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlock inverse as a param to a helper']() {
-      expectDeprecation(
-        `\`hasBlock\` is deprecated. Use \`has-block\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
-      );
-
+    ['@test (has-block) inverse as a param to a helper']() {
       this.registerComponent('check-helper', {
-        template: '{{if (hasBlock "inverse") "true" "false"}}',
+        template: '{{if (has-block "inverse") "true" "false"}}',
       });
 
       this.render(strip`
@@ -2465,32 +2318,9 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlockParams as a param to a helper']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
-      );
-
-      this.registerComponent('check-helper', {
-        template: '{{if hasBlockParams "true" "false"}}',
-      });
-
-      this.render(strip`
-      {{#check-helper}}{{/check-helper}}
-      {{#check-helper as |something|}}{{/check-helper}}`);
-
-      this.assertComponentElement(this.firstChild, { content: 'false' });
-      this.assertComponentElement(this.nthChild(1), { content: 'true' });
-
-      this.assertStableRerender();
-    }
-
-    ['@test hasBlockParams as an expression param to a helper']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
-      );
-
+    ['@test (has-block-params) as a param to a helper']() {
       this.registerComponent('check-helper', {
-        template: '{{if (hasBlockParams) "true" "false"}}',
+        template: '{{if (has-block-params) "true" "false"}}',
       });
 
       this.render(strip`
@@ -2503,13 +2333,9 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test hasBlockParams inverse as a param to a helper']() {
-      expectDeprecation(
-        `\`hasBlockParams\` is deprecated. Use \`has-block-params\` instead. ('my-app/templates/components/check-helper.hbs' @ L1:C5) `
-      );
-
+    ['@test (has-block-params) inverse as a param to a helper']() {
       this.registerComponent('check-helper', {
-        template: '{{if (hasBlockParams "inverse") "true" "false"}}',
+        template: '{{if (has-block-params "inverse") "true" "false"}}',
       });
 
       this.render(strip`
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 525bea17e25..8725773f2a9 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -8,7 +8,6 @@ import TransformActionSyntax from './transform-action-syntax';
 import TransformAttrsIntoArgs from './transform-attrs-into-args';
 import TransformEachInIntoEach from './transform-each-in-into-each';
 import TransformEachTrackArray from './transform-each-track-array';
-import TransformHasBlockSyntax from './transform-has-block-syntax';
 import TransformInElement from './transform-in-element';
 import TransformLinkTo from './transform-link-to';
 import TransformOldClassBindingSyntax from './transform-old-class-binding-syntax';
@@ -28,7 +27,6 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformActionSyntax,
     TransformAttrsIntoArgs,
     TransformEachInIntoEach,
-    TransformHasBlockSyntax,
     TransformLinkTo,
     AssertInputHelperWithoutBlock,
     TransformInElement,
diff --git a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
deleted file mode 100644
index ac45872bf34..00000000000
--- a/packages/ember-template-compiler/lib/plugins/transform-has-block-syntax.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { deprecate } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-import { isPath } from './utils';
-
-/**
- @module ember
-*/
-
-/**
-  A Glimmer2 AST transformation that replaces all instances of
-
-  ```handlebars
- {{hasBlock}}
-  ```
-
-  with
-
-  ```handlebars
- {{has-block}}
-  ```
-
-  @private
-  @class TransformHasBlockSyntax
-*/
-
-const TRANSFORMATIONS: { [key: string]: string } = {
-  hasBlock: 'has-block',
-  hasBlockParams: 'has-block-params',
-};
-
-export default function transformHasBlockSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
-  let { builders: b } = env.syntax;
-  let moduleName = env.meta?.moduleName;
-
-  function emitDeprecationMessage(node: AST.Node, name: string) {
-    let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-    deprecate(
-      `\`${name}\` is deprecated. Use \`${TRANSFORMATIONS[name]}\` instead. ${sourceInformation}`,
-      false,
-      {
-        id: 'has-block-and-has-block-params',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_has-block-and-has-block-params',
-        for: 'ember-source',
-        since: {
-          enabled: '3.25.0',
-        },
-      }
-    );
-  }
-
-  return {
-    name: 'transform-has-block-syntax',
-
-    visitor: {
-      PathExpression(node: AST.PathExpression): AST.Node | void {
-        if (TRANSFORMATIONS[node.original]) {
-          emitDeprecationMessage(node, node.original);
-          return b.sexpr(b.path(TRANSFORMATIONS[node.original]));
-        }
-      },
-      MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
-        if (isPath(node.path) && TRANSFORMATIONS[node.path.original]) {
-          emitDeprecationMessage(node, node.path.original);
-          return b.mustache(
-            b.path(TRANSFORMATIONS[node.path.original]),
-            node.params,
-            node.hash,
-            undefined,
-            node.loc
-          );
-        }
-      },
-      SubExpression(node: AST.SubExpression): AST.Node | void {
-        if (isPath(node.path) && TRANSFORMATIONS[node.path.original]) {
-          emitDeprecationMessage(node, node.path.original);
-          return b.sexpr(b.path(TRANSFORMATIONS[node.path.original]), node.params, node.hash);
-        }
-      },
-    },
-  };
-}
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 4a864a88468..acdc2460c45 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -271,8 +271,8 @@ module.exports = {
     'handleURL',
     'has',
     'hasArrayObservers',
-    'hasBlock',
-    'hasBlockParams',
+    'has-block',
+    'has-block-params',
     'hash',
     'hashSettled',
     'hasListeners',

From a8c007c5f15a53868cdc2b129cbb1eaa23ea3611 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 19:20:59 -0700
Subject: [PATCH 0566/1405] Remove for and since deprecations from deprecate
 method

---
 packages/@ember/debug/lib/deprecate.ts   | 52 +++-------------
 packages/@ember/debug/tests/main_test.js | 75 ++++++------------------
 2 files changed, 25 insertions(+), 102 deletions(-)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index d9f99a69b52..13b69501da0 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -21,7 +21,7 @@ export interface DeprecationOptions {
 }
 
 export type DeprecateFunc = (message: string, test?: boolean, options?: DeprecationOptions) => void;
-export type MissingOptionDeprecateFunc = (id: string) => string;
+export type MissingOptionDeprecateFunc = (id: string, missingOption: string) => string;
 
 /**
  @module @ember/debug
@@ -68,12 +68,8 @@ export type MissingOptionDeprecateFunc = (id: string) => string;
 let registerHandler: (handler: HandlerCallback) => void = () => {};
 let missingOptionsDeprecation: string;
 let missingOptionsIdDeprecation: string;
-let missingOptionsUntilDeprecation: string;
-let missingOptionsForDeprecation: MissingOptionDeprecateFunc = () => '';
-let missingOptionsSinceDeprecation: MissingOptionDeprecateFunc = () => '';
+let missingOptionDeprecation: MissingOptionDeprecateFunc = () => '';
 let deprecate: DeprecateFunc = () => {};
-let FOR_MISSING_DEPRECATIONS = new Set();
-let SINCE_MISSING_DEPRECATIONS = new Set();
 
 if (DEBUG) {
   registerHandler = function registerHandler(handler: HandlerCallback) {
@@ -162,13 +158,9 @@ if (DEBUG) {
     'must provide an `options` hash as the third parameter.  ' +
     '`options` should include `id` and `until` properties.';
   missingOptionsIdDeprecation = 'When calling `deprecate` you must provide `id` in options.';
-  missingOptionsUntilDeprecation = 'When calling `deprecate` you must provide `until` in options.';
 
-  missingOptionsForDeprecation = (id: string) => {
-    return `When calling \`deprecate\` you must provide \`for\` in options. Missing options.for in "${id}" deprecation`;
-  };
-  missingOptionsSinceDeprecation = (id: string) => {
-    return `When calling \`deprecate\` you must provide \`since\` in options. Missing options.since in "${id}" deprecation`;
+  missingOptionDeprecation = (id: string, missingOption: string): string => {
+    return `When calling \`deprecate\` you must provide \`${missingOption}\` in options. Missing options.${missingOption} in "${id}" deprecation`;
   };
   /**
    @module @ember/debug
@@ -203,33 +195,9 @@ if (DEBUG) {
   deprecate = function deprecate(message, test, options) {
     assert(missingOptionsDeprecation, Boolean(options && (options.id || options.until)));
     assert(missingOptionsIdDeprecation, Boolean(options!.id));
-    assert(missingOptionsUntilDeprecation, Boolean(options!.until));
-
-    if (!options!.for && !FOR_MISSING_DEPRECATIONS.has(options!.id)) {
-      FOR_MISSING_DEPRECATIONS.add(options!.id);
-
-      deprecate(missingOptionsForDeprecation(options!.id), Boolean(options!.for), {
-        id: 'ember-source.deprecation-without-for',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.24.0',
-        },
-      });
-    }
-
-    if (!options!.since && !SINCE_MISSING_DEPRECATIONS.has(options!.id)) {
-      SINCE_MISSING_DEPRECATIONS.add(options!.id);
-
-      deprecate(missingOptionsSinceDeprecation(options!.id), Boolean(options!.since), {
-        id: 'ember-source.deprecation-without-since',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.24.0',
-        },
-      });
-    }
+    assert(missingOptionDeprecation(options!.id, 'until'), Boolean(options!.until));
+    assert(missingOptionDeprecation(options!.id, 'for'), Boolean(options!.for));
+    assert(missingOptionDeprecation(options!.id, 'since'), Boolean(options!.since));
 
     invoke('deprecate', message, test, options);
   };
@@ -241,9 +209,5 @@ export {
   registerHandler,
   missingOptionsDeprecation,
   missingOptionsIdDeprecation,
-  missingOptionsUntilDeprecation,
-  missingOptionsForDeprecation,
-  missingOptionsSinceDeprecation,
-  FOR_MISSING_DEPRECATIONS,
-  SINCE_MISSING_DEPRECATIONS,
+  missingOptionDeprecation,
 };
diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 3089cb8f6a7..8e476f2bab3 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -5,11 +5,7 @@ import {
   registerHandler,
   missingOptionsDeprecation,
   missingOptionsIdDeprecation,
-  missingOptionsUntilDeprecation,
-  missingOptionsForDeprecation,
-  missingOptionsSinceDeprecation,
-  FOR_MISSING_DEPRECATIONS,
-  SINCE_MISSING_DEPRECATIONS,
+  missingOptionDeprecation,
 } from '../lib/deprecate';
 
 import {
@@ -45,8 +41,6 @@ moduleFor(
     teardown() {
       HANDLERS.deprecate = originalDeprecateHandler;
       HANDLERS.warn = originalWarnHandler;
-      FOR_MISSING_DEPRECATIONS.clear();
-      SINCE_MISSING_DEPRECATIONS.clear();
       ENV.RAISE_ON_DEPRECATION = originalEnvValue;
     }
 
@@ -256,6 +250,7 @@ moduleFor(
       assert.expect(4);
       let id = 'ABC';
       let until = 'forever';
+      let since = 'forever';
       let shouldThrow = false;
 
       registerHandler(function (message, options) {
@@ -267,14 +262,24 @@ moduleFor(
       });
 
       try {
-        deprecate('Deprecation for testing purposes', false, { id, until });
+        deprecate('Deprecation for testing purposes', false, {
+          id,
+          until,
+          since,
+          for: 'namespace',
+        });
         assert.ok(true, 'Deprecation did not throw');
       } catch (e) {
         assert.ok(false, 'Deprecation was thrown despite being added to blacklist');
       }
 
       try {
-        deprecate('Deprecation for testing purposes', false, { id, until });
+        deprecate('Deprecation for testing purposes', false, {
+          id,
+          until,
+          since,
+          for: 'namespace',
+        });
         assert.ok(true, 'Deprecation did not throw');
       } catch (e) {
         assert.ok(false, 'Deprecation was thrown despite being added to blacklist');
@@ -322,7 +327,7 @@ moduleFor(
 
       assert.throws(
         () => deprecate('foo', false, { id: 'test' }),
-        new RegExp(missingOptionsUntilDeprecation),
+        new RegExp(missingOptionDeprecation('test', 'until')),
         'proper assertion is triggered when options.until is missing'
       );
     }
@@ -332,35 +337,11 @@ moduleFor(
 
       assert.throws(
         () => deprecate('message1', false, { id: 'test', until: 'forever' }),
-        new RegExp(missingOptionsForDeprecation('test')),
+        new RegExp(missingOptionDeprecation('test', 'for')),
         'proper assertion is triggered when options.for is missing'
       );
     }
 
-    ['@test deprecate without options.for only triggers once per id'](assert) {
-      ENV.RAISE_ON_DEPRECATION = false;
-      let messages = [];
-      registerHandler(function (message, options, next) {
-        if (options.id === 'ember-source.deprecation-without-for') {
-          messages.push(message);
-        }
-        next(...arguments);
-      });
-
-      deprecate('message1', false, { id: 'test', until: 'forever' });
-      deprecate('message2', false, { id: 'test', until: 'forever' });
-      deprecate('message3', false, { id: 'another', until: 'forever' });
-
-      assert.equal(messages.length, 2, 'correct number of deprecations');
-      assert.equal(messages[0], missingOptionsForDeprecation('test'), 'first message is correct');
-
-      assert.equal(
-        messages[1],
-        missingOptionsForDeprecation('another'),
-        'second message is correct'
-      );
-    }
-
     ['@test deprecate without options.since triggers an assertion'](assert) {
       assert.expect(1);
 
@@ -371,33 +352,11 @@ moduleFor(
             until: 'forever',
             for: 'me',
           }),
-        new RegExp(missingOptionsSinceDeprecation('test')),
+        new RegExp(missingOptionDeprecation('test', 'since')),
         'proper assertion is triggered when options.since is missing'
       );
     }
 
-    ['@test deprecate without options.since only triggers once per id'](assert) {
-      ENV.RAISE_ON_DEPRECATION = false;
-      let messages = [];
-      registerHandler(function (message, options, next) {
-        if (options.id === 'ember-source.deprecation-without-since') {
-          messages.push(message);
-        }
-        next(...arguments);
-      });
-      deprecate('foo', false, { id: 'test', until: 'forever', for: 'me' });
-      deprecate('foobar', false, { id: 'test', until: 'forever', for: 'me' });
-      deprecate('baz', false, { id: 'another', until: 'forever', for: 'me' });
-
-      assert.equal(messages.length, 2, 'deprecation message only sent once');
-      assert.equal(messages[0], missingOptionsSinceDeprecation('test'), 'first message is correct');
-      assert.equal(
-        messages[1],
-        missingOptionsSinceDeprecation('another'),
-        'second message is correct'
-      );
-    }
-
     ['@test warn without options triggers an assert'](assert) {
       assert.expect(1);
 

From f9d62f17ed3135c4d0333fcc7301b0e288785beb Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Sun, 18 Jul 2021 20:58:07 -0700
Subject: [PATCH 0567/1405] Remove EMBER_EXTEND_PROTOTYPES

---
 packages/@ember/deprecated-features/index.ts |  1 -
 packages/ember/index.js                      | 24 +-------------------
 packages/ember/tests/reexports_test.js       | 10 --------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 67122f2e569..8692b18226f 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -4,7 +4,6 @@
 // not the version that the feature will be removed.
 
 export const SEND_ACTION = !!'3.4.0';
-export const EMBER_EXTEND_PROTOTYPES = !!'3.2.0-beta.5';
 export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 835fd8ea724..ea315819228 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -99,7 +99,7 @@ import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign } from '@ember/polyfills';
-import { EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
+import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 
 import {
   templateOnlyComponent,
@@ -151,28 +151,6 @@ Object.defineProperty(Ember, 'lookup', {
   enumerable: false,
 });
 
-if (EMBER_EXTEND_PROTOTYPES) {
-  Object.defineProperty(Ember, 'EXTEND_PROTOTYPES', {
-    enumerable: false,
-    get() {
-      deprecate(
-        'Accessing Ember.EXTEND_PROTOTYPES is deprecated, please migrate to Ember.ENV.EXTEND_PROTOTYPES',
-        false,
-        {
-          id: 'ember-env.old-extend-prototypes',
-          until: '4.0.0',
-          for: 'ember-source',
-          since: {
-            enabled: '3.3.0',
-          },
-        }
-      );
-
-      return ENV.EXTEND_PROTOTYPES;
-    },
-  });
-}
-
 // ****@ember/application****
 Ember.getOwner = getOwner;
 Ember.setOwner = setOwner;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 2ece032df5d..48dc05f9131 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -102,16 +102,6 @@ moduleFor(
       assert.notEqual(glimmer.isHTMLSafe, undefined, 'Ember.String.isHTMLSafe is not `undefined`');
     }
 
-    ['@test Ember.EXTEND_PROTOTYPES is present (but deprecated)'](assert) {
-      expectDeprecation(() => {
-        assert.strictEqual(
-          Ember.ENV.EXTEND_PROTOTYPES,
-          Ember.EXTEND_PROTOTYPES,
-          'Ember.EXTEND_PROTOTYPES exists'
-        );
-      }, /EXTEND_PROTOTYPES is deprecated/);
-    }
-
     '@test Ember.FEATURES is exported'(assert) {
       for (let feature in FEATURES) {
         assert.equal(

From 8ae02f246ce15db41d239a11cc6460d1cb38c416 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Sun, 18 Jul 2021 21:27:20 -0700
Subject: [PATCH 0568/1405] Remove function prototype extensions

---
 .../@ember/-internals/environment/lib/env.ts  |   9 +-
 .../-internals/metal/tests/observer_test.js   |  87 --------
 packages/@ember/-internals/runtime/index.js   |   2 -
 .../-internals/runtime/lib/ext/function.js    | 197 ------------------
 .../runtime/tests/ext/function_test.js        | 145 -------------
 packages/@ember/deprecated-features/index.ts  |   1 -
 tests/docs/expected.js                        |   1 -
 7 files changed, 1 insertion(+), 441 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/ext/function.js
 delete mode 100644 packages/@ember/-internals/runtime/tests/ext/function_test.js

diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index 5de3bf19eb8..27ea7f19e99 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -1,4 +1,3 @@
-import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
 import { DEBUG } from '@glimmer/env';
 import global from './global';
 
@@ -220,16 +219,10 @@ export const ENV = {
   if (EXTEND_PROTOTYPES !== undefined) {
     if (typeof EXTEND_PROTOTYPES === 'object' && EXTEND_PROTOTYPES !== null) {
       ENV.EXTEND_PROTOTYPES.String = EXTEND_PROTOTYPES.String !== false;
-      if (FUNCTION_PROTOTYPE_EXTENSIONS) {
-        ENV.EXTEND_PROTOTYPES.Function = EXTEND_PROTOTYPES.Function !== false;
-      }
       ENV.EXTEND_PROTOTYPES.Array = EXTEND_PROTOTYPES.Array !== false;
     } else {
       let isEnabled = EXTEND_PROTOTYPES !== false;
       ENV.EXTEND_PROTOTYPES.String = isEnabled;
-      if (FUNCTION_PROTOTYPE_EXTENSIONS) {
-        ENV.EXTEND_PROTOTYPES.Function = isEnabled;
-      }
       ENV.EXTEND_PROTOTYPES.Array = isEnabled;
     }
   }
@@ -259,6 +252,6 @@ export const ENV = {
   }
 })(global.EmberENV);
 
-export function getENV() {
+export function getENV(): object {
   return ENV;
 }
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index 1a78e8ea0c7..ea4dfd1dd02 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -1,4 +1,3 @@
-import { ENV } from '@ember/-internals/environment';
 import {
   changeProperties,
   addObserver,
@@ -15,7 +14,6 @@ import {
   set,
 } from '..';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
 import { destroy } from '@glimmer/destroyable';
 import { meta as metaFor } from '@ember/-internals/meta';
 
@@ -192,91 +190,6 @@ moduleFor(
       assert.equal(observerCount, 10, 'should continue to fire indefinitely');
     }
 
-    async ['@test observer added via Function.prototype extensions and brace expansion should fire when property changes'](
-      assert
-    ) {
-      if (!FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
-        obj = {};
-        let count = 0;
-
-        expectDeprecation(() => {
-          mixin(obj, {
-            observeFooAndBar: function () {
-              count++;
-            }.observes('{foo,bar}'),
-          });
-        }, /Function prototype extensions have been deprecated, please migrate from function\(\){}.observes\('foo'\) to observer\('foo', function\(\) {}\)/);
-
-        set(obj, 'foo', 'foo');
-        await runLoopSettled();
-
-        assert.equal(count, 1, 'observer specified via brace expansion invoked on property change');
-
-        set(obj, 'bar', 'bar');
-        await runLoopSettled();
-
-        assert.equal(count, 2, 'observer specified via brace expansion invoked on property change');
-
-        set(obj, 'baz', 'baz');
-        await runLoopSettled();
-
-        assert.equal(count, 2, 'observer not invoked on unspecified property');
-      } else {
-        assert.expect(0);
-      }
-    }
-
-    async ['@test observer specified via Function.prototype extensions via brace expansion should fire when dependent property changes'](
-      assert
-    ) {
-      if (!FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
-        obj = { baz: 'Initial' };
-        let count = 0;
-
-        defineProperty(
-          obj,
-          'foo',
-          computed('bar', function () {
-            return get(this, 'bar').toLowerCase();
-          })
-        );
-
-        defineProperty(
-          obj,
-          'bar',
-          computed('baz', function () {
-            return get(this, 'baz').toUpperCase();
-          })
-        );
-
-        expectDeprecation(() => {
-          mixin(obj, {
-            fooAndBarWatcher: function () {
-              count++;
-            }.observes('{foo,bar}'),
-          });
-        }, /Function prototype extensions have been deprecated, please migrate from function\(\){}.observes\('foo'\) to observer\('foo', function\(\) {}\)/);
-
-        get(obj, 'foo');
-        set(obj, 'baz', 'Baz');
-        await runLoopSettled();
-
-        // fire once for foo, once for bar
-        assert.equal(
-          count,
-          2,
-          'observer specified via brace expansion invoked on dependent property change'
-        );
-
-        set(obj, 'quux', 'Quux');
-        await runLoopSettled();
-
-        assert.equal(count, 2, 'observer not fired on unspecified property');
-      } else {
-        assert.expect(0);
-      }
-    }
-
     async ['@test observers watching multiple properties via brace expansion should fire when the properties change'](
       assert
     ) {
diff --git a/packages/@ember/-internals/runtime/index.js b/packages/@ember/-internals/runtime/index.js
index 6558895952b..9758f67367a 100644
--- a/packages/@ember/-internals/runtime/index.js
+++ b/packages/@ember/-internals/runtime/index.js
@@ -30,5 +30,3 @@ export { default as PromiseProxyMixin } from './lib/mixins/promise_proxy';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
 export { typeOf } from './lib/type-of';
-
-import './lib/ext/function'; // just for side effect of extending Function.prototype
diff --git a/packages/@ember/-internals/runtime/lib/ext/function.js b/packages/@ember/-internals/runtime/lib/ext/function.js
deleted file mode 100644
index be2ae54d18e..00000000000
--- a/packages/@ember/-internals/runtime/lib/ext/function.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
-@module ember
-*/
-
-import { ENV } from '@ember/-internals/environment';
-import { on, computed, observer } from '@ember/-internals/metal';
-import { deprecate } from '@ember/debug';
-import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
-
-if (FUNCTION_PROTOTYPE_EXTENSIONS && ENV.EXTEND_PROTOTYPES.Function) {
-  Object.defineProperties(Function.prototype, {
-    /**
-      The `property` extension of Javascript's Function prototype is available
-      when `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Function` is
-      `true`, which is the default.
-
-      Computed properties allow you to treat a function like a property:
-
-      ```app/utils/president.js
-      import EmberObject from '@ember/object';
-
-      export default EmberObject.extend({
-        firstName: '',
-        lastName:  '',
-
-        fullName: function() {
-          return this.get('firstName') + ' ' + this.get('lastName');
-        }.property() // Call this flag to mark the function as a property
-      });
-      ```
-
-      ```javascript
-      let president = President.create({
-        firstName: 'Barack',
-        lastName: 'Obama'
-      });
-
-      president.get('fullName'); // 'Barack Obama'
-      ```
-
-      Treating a function like a property is useful because they can work with
-      bindings, just like any other property.
-
-      Many computed properties have dependencies on other properties. For
-      example, in the above example, the `fullName` property depends on
-      `firstName` and `lastName` to determine its value. You can tell Ember
-      about these dependencies like this:
-
-      ```app/utils/president.js
-      import EmberObject from '@ember/object';
-
-      export default EmberObject.extend({
-        firstName: '',
-        lastName:  '',
-
-        fullName: function() {
-          return this.get('firstName') + ' ' + this.get('lastName');
-
-          // Tell Ember.js that this computed property depends on firstName
-          // and lastName
-        }.property('firstName', 'lastName')
-      });
-      ```
-
-      Make sure you list these dependencies so Ember knows when to update
-      bindings that connect to a computed property. Changing a dependency
-      will not immediately trigger an update of the computed property, but
-      will instead clear the cache so that it is updated when the next `get`
-      is called on the property.
-
-      See [ComputedProperty](/ember/release/classes/ComputedProperty), [@ember/object/computed](/ember/release/classes/@ember%2Fobject%2Fcomputed).
-
-      @method property
-      @for Function
-      @public
-    */
-    property: {
-      configurable: true,
-      enumerable: false,
-      writable: true,
-      value: function () {
-        deprecate(
-          `Function prototype extensions have been deprecated, please migrate from function(){}.property('bar') to computed('bar', function() {}).`,
-          false,
-          {
-            id: 'function-prototype-extensions.property',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_function-prototype-extensions-property',
-            for: 'ember-source',
-            since: {
-              enabled: '3.11.0',
-            },
-          }
-        );
-        return computed(...arguments, this);
-      },
-    },
-
-    /**
-      The `observes` extension of Javascript's Function prototype is available
-      when `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Function` is
-      true, which is the default.
-
-      You can observe property changes simply by adding the `observes`
-      call to the end of your method declarations in classes that you write.
-      For example:
-
-      ```javascript
-      import EmberObject from '@ember/object';
-
-      EmberObject.extend({
-        valueObserver: function() {
-          // Executes whenever the "value" property changes
-        }.observes('value')
-      });
-      ```
-
-      In the future this method may become asynchronous.
-
-      See `observer`.
-
-      @method observes
-      @for Function
-      @public
-    */
-    observes: {
-      configurable: true,
-      enumerable: false,
-      writable: true,
-      value: function () {
-        deprecate(
-          `Function prototype extensions have been deprecated, please migrate from function(){}.observes('foo') to observer('foo', function() {}).`,
-          false,
-          {
-            id: 'function-prototype-extensions.observes',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_function-prototype-extensions-observes',
-            for: 'ember-source',
-            since: {
-              enabled: '3.11.0',
-            },
-          }
-        );
-
-        return observer(...arguments, this);
-      },
-    },
-
-    /**
-      The `on` extension of Javascript's Function prototype is available
-      when `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Function` is
-      true, which is the default.
-
-      You can listen for events simply by adding the `on` call to the end of
-      your method declarations in classes or mixins that you write. For example:
-
-      ```javascript
-      import Mixin from '@ember/mixin';
-
-      Mixin.create({
-        doSomethingWithElement: function() {
-          // Executes whenever the "didInsertElement" event fires
-        }.on('didInsertElement')
-      });
-      ```
-
-      See `@ember/object/evented/on`.
-
-      @method on
-      @for Function
-      @public
-    */
-
-    on: {
-      configurable: true,
-      enumerable: false,
-      writable: true,
-      value: function () {
-        deprecate(
-          `Function prototype extensions have been deprecated, please migrate from function(){}.on('foo') to on('foo', function() {}).`,
-          false,
-          {
-            id: 'function-prototype-extensions.on',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_function-prototype-extensions-on',
-            for: 'ember-source',
-            since: {
-              enabled: '3.11.0',
-            },
-          }
-        );
-
-        return on(...arguments, this);
-      },
-    },
-  });
-}
diff --git a/packages/@ember/-internals/runtime/tests/ext/function_test.js b/packages/@ember/-internals/runtime/tests/ext/function_test.js
deleted file mode 100644
index f4a4b22c2f4..00000000000
--- a/packages/@ember/-internals/runtime/tests/ext/function_test.js
+++ /dev/null
@@ -1,145 +0,0 @@
-import { ENV } from '@ember/-internals/environment';
-import { Mixin, mixin, get, set } from '@ember/-internals/metal';
-import EmberObject from '../../lib/system/object';
-import Evented from '../../lib/mixins/evented';
-import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { FUNCTION_PROTOTYPE_EXTENSIONS } from '@ember/deprecated-features';
-import { destroy } from '@glimmer/destroyable';
-
-moduleFor(
-  'Function.prototype.observes() helper',
-  class extends AbstractTestCase {
-    async ['@test global observer helper takes multiple params'](assert) {
-      if (!FUNCTION_PROTOTYPE_EXTENSIONS || !ENV.EXTEND_PROTOTYPES.Function) {
-        assert.ok(
-          'undefined' === typeof Function.prototype.observes,
-          'Function.prototype helper disabled'
-        );
-        return;
-      }
-
-      let MyMixin;
-      expectDeprecation(() => {
-        MyMixin = Mixin.create({
-          count: 0,
-
-          foo: function () {
-            set(this, 'count', get(this, 'count') + 1);
-          }.observes('bar', 'baz'),
-        });
-      }, /Function prototype extensions have been deprecated, please migrate from function\(\){}.observes\('foo'\) to observer\('foo', function\(\) {}\)/);
-
-      let obj = mixin({}, MyMixin);
-      assert.equal(get(obj, 'count'), 0, 'should not invoke observer immediately');
-
-      set(obj, 'bar', 'BAZ');
-      await runLoopSettled();
-
-      set(obj, 'baz', 'BAZ');
-      await runLoopSettled();
-
-      assert.equal(get(obj, 'count'), 2, 'should invoke observer after change');
-
-      destroy(obj);
-    }
-  }
-);
-
-moduleFor(
-  'Function.prototype.on() helper',
-  class extends AbstractTestCase {
-    ['@test sets up an event listener, and can trigger the function on multiple events'](assert) {
-      if (!FUNCTION_PROTOTYPE_EXTENSIONS || !ENV.EXTEND_PROTOTYPES.Function) {
-        assert.ok(
-          'undefined' === typeof Function.prototype.on,
-          'Function.prototype helper disabled'
-        );
-        return;
-      }
-
-      let MyMixin;
-      expectDeprecation(() => {
-        MyMixin = Mixin.create({
-          count: 0,
-
-          foo: function () {
-            set(this, 'count', get(this, 'count') + 1);
-          }.on('bar', 'baz'),
-        });
-      }, /Function prototype extensions have been deprecated, please migrate from function\(\){}.on\('foo'\) to on\('foo', function\(\) {}\)/);
-
-      let obj = mixin({}, Evented, MyMixin);
-      assert.equal(get(obj, 'count'), 0, 'should not invoke listener immediately');
-
-      obj.trigger('bar');
-      obj.trigger('baz');
-      assert.equal(get(obj, 'count'), 2, 'should invoke listeners when events trigger');
-    }
-
-    async ['@test can be chained with observes'](assert) {
-      if (!FUNCTION_PROTOTYPE_EXTENSIONS || !ENV.EXTEND_PROTOTYPES.Function) {
-        assert.ok('Function.prototype helper disabled');
-        return;
-      }
-
-      let MyMixin;
-      expectDeprecation(function () {
-        MyMixin = Mixin.create({
-          count: 0,
-          bay: 'bay',
-          foo: function () {
-            set(this, 'count', get(this, 'count') + 1);
-          }
-            .observes('bay')
-            .on('bar'),
-        });
-      });
-
-      let obj = mixin({}, Evented, MyMixin);
-      assert.equal(get(obj, 'count'), 0, 'should not invoke listener immediately');
-
-      set(obj, 'bay', 'BAY');
-      obj.trigger('bar');
-      await runLoopSettled();
-
-      assert.equal(get(obj, 'count'), 2, 'should invoke observer and listener');
-
-      destroy(obj);
-    }
-  }
-);
-
-moduleFor(
-  'Function.prototype.property() helper',
-  class extends AbstractTestCase {
-    ['@test sets up a ComputedProperty'](assert) {
-      if (!FUNCTION_PROTOTYPE_EXTENSIONS || !ENV.EXTEND_PROTOTYPES.Function) {
-        assert.ok(
-          'undefined' === typeof Function.prototype.property,
-          'Function.prototype helper disabled'
-        );
-        return;
-      }
-
-      let MyClass;
-      expectDeprecation(function () {
-        MyClass = EmberObject.extend({
-          firstName: null,
-          lastName: null,
-          fullName: function () {
-            return get(this, 'firstName') + ' ' + get(this, 'lastName');
-          }.property('firstName', 'lastName'),
-        });
-      }, /Function prototype extensions have been deprecated, please migrate from function\(\){}.property\('bar'\) to computed\('bar', function\(\) {}\)/);
-
-      let obj = MyClass.create({ firstName: 'Fred', lastName: 'Flinstone' });
-      assert.equal(get(obj, 'fullName'), 'Fred Flinstone', 'should return the computed value');
-
-      set(obj, 'firstName', 'Wilma');
-      assert.equal(get(obj, 'fullName'), 'Wilma Flinstone', 'should return the new computed value');
-
-      set(obj, 'lastName', '');
-      assert.equal(get(obj, 'fullName'), 'Wilma ', 'should return the new computed value');
-    }
-  }
-);
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 67122f2e569..ea8d6037200 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -9,7 +9,6 @@ export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
-export const FUNCTION_PROTOTYPE_EXTENSIONS = !!'3.11.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
 export const PARTIALS = !!'3.15.0-beta.1';
 export const GLOBALS_RESOLVER = !!'3.16.0-beta.1';
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 4a864a88468..354287d995e 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -390,7 +390,6 @@ module.exports = {
     'objectsAt',
     'observeModelType',
     'observer',
-    'observes',
     'off',
     'on',
     'once',

From 26145d2899658102cf9681a4341edcaffe814311 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sat, 22 May 2021 21:55:02 +0200
Subject: [PATCH 0569/1405] Remove this.$() jQuery integration

---
 .../components/curly-components-test.js       | 106 ------------------
 .../components/dynamic-components-test.js     | 106 ------------------
 .../components/fragment-components-test.js    |  20 ----
 .../integration/components/life-cycle-test.js |  59 +---------
 .../views/lib/mixins/view_support.js          |  43 -------
 5 files changed, 2 insertions(+), 332 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index ac62b19d7a7..f63c56cbc98 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -14,7 +14,6 @@ import { DEBUG } from '@glimmer/env';
 import { alias, set, get, observer, on, computed, tracked } from '@ember/-internals/metal';
 import Service, { inject as injectService } from '@ember/service';
 import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import { jQueryDisabled } from '@ember/-internals/views';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
@@ -3882,108 +3881,3 @@ moduleFor(
     }
   }
 );
-
-if (jQueryDisabled) {
-  moduleFor(
-    'Components test: curly components: jQuery disabled',
-    class extends RenderingTestCase {
-      ['@test jQuery proxy is not available without jQuery']() {
-        let instance;
-
-        let FooBarComponent = Component.extend({
-          init() {
-            this._super();
-            instance = this;
-          },
-        });
-
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: 'hello',
-        });
-
-        this.render('{{foo-bar}}');
-
-        expectAssertion(() => {
-          instance.$()[0];
-        }, 'You cannot access this.$() with `jQuery` disabled.');
-      }
-    }
-  );
-} else {
-  moduleFor(
-    'Components test: curly components: jQuery enabled',
-    class extends RenderingTestCase {
-      ['@test it has a jQuery proxy to the element']() {
-        let instance;
-        let element1;
-        let element2;
-
-        let FooBarComponent = Component.extend({
-          init() {
-            this._super();
-            instance = this;
-          },
-        });
-
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: 'hello',
-        });
-
-        this.render('{{foo-bar}}');
-
-        expectDeprecation(() => {
-          element1 = instance.$()[0];
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        this.assertComponentElement(element1, { content: 'hello' });
-
-        runTask(() => this.rerender());
-
-        expectDeprecation(() => {
-          element2 = instance.$()[0];
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        this.assertComponentElement(element2, { content: 'hello' });
-
-        this.assertSameNode(element2, element1);
-      }
-
-      ['@test it scopes the jQuery proxy to the component element'](assert) {
-        let instance;
-        let $span;
-
-        let FooBarComponent = Component.extend({
-          init() {
-            this._super();
-            instance = this;
-          },
-        });
-
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: '<span class="inner">inner</span>',
-        });
-
-        this.render('<span class="outer">outer</span>{{foo-bar}}');
-
-        expectDeprecation(() => {
-          $span = instance.$('span');
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        assert.equal($span.length, 1);
-        assert.equal($span.attr('class'), 'inner');
-
-        runTask(() => this.rerender());
-
-        expectDeprecation(() => {
-          $span = instance.$('span');
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        assert.equal($span.length, 1);
-        assert.equal($span.attr('class'), 'inner');
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index 6fbcb798bf8..6068811a1d9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -2,7 +2,6 @@ import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
 import { set, computed } from '@ember/-internals/metal';
-import { jQueryDisabled } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
@@ -806,108 +805,3 @@ moduleFor(
     }
   }
 );
-
-if (jQueryDisabled) {
-  moduleFor(
-    'Components test: dynamic components: jQuery disabled',
-    class extends RenderingTestCase {
-      ['@test jQuery proxy is not available without jQuery']() {
-        let instance;
-
-        let FooBarComponent = Component.extend({
-          init() {
-            this._super();
-            instance = this;
-          },
-        });
-
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: 'hello',
-        });
-
-        this.render('{{component "foo-bar"}}');
-
-        expectAssertion(() => {
-          instance.$()[0];
-        }, 'You cannot access this.$() with `jQuery` disabled.');
-      }
-    }
-  );
-} else {
-  moduleFor(
-    'Components test: dynamic components : jQuery enabled',
-    class extends RenderingTestCase {
-      ['@test it has a jQuery proxy to the element']() {
-        let instance;
-        let element1;
-        let element2;
-
-        let FooBarComponent = Component.extend({
-          init() {
-            this._super();
-            instance = this;
-          },
-        });
-
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: 'hello',
-        });
-
-        this.render('{{component "foo-bar"}}');
-
-        expectDeprecation(() => {
-          element1 = instance.$()[0];
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        this.assertComponentElement(element1, { content: 'hello' });
-
-        runTask(() => this.rerender());
-
-        expectDeprecation(() => {
-          element2 = instance.$()[0];
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        this.assertComponentElement(element2, { content: 'hello' });
-
-        this.assertSameNode(element2, element1);
-      }
-
-      ['@test it scopes the jQuery proxy to the component element'](assert) {
-        let instance;
-        let $span;
-
-        let FooBarComponent = Component.extend({
-          init() {
-            this._super();
-            instance = this;
-          },
-        });
-
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: '<span class="inner">inner</span>',
-        });
-
-        this.render('<span class="outer">outer</span>{{component "foo-bar"}}');
-
-        expectDeprecation(() => {
-          $span = instance.$('span');
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        assert.equal($span.length, 1);
-        assert.equal($span.attr('class'), 'inner');
-
-        runTask(() => this.rerender());
-
-        expectDeprecation(() => {
-          $span = instance.$('span');
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-
-        assert.equal($span.length, 1);
-        assert.equal($span.attr('class'), 'inner');
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
index 31d868a155f..ff692ad05bf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
@@ -227,26 +227,6 @@ moduleFor(
       this.assertText('baz');
     }
 
-    ['@test throws an error if when $() is accessed on component where `tagName` is an empty string']() {
-      let template = `hit dem folks`;
-      let FooBarComponent = Component.extend({
-        tagName: '',
-        init() {
-          this._super();
-          this.$();
-        },
-      });
-
-      this.registerComponent('foo-bar', {
-        ComponentClass: FooBarComponent,
-        template,
-      });
-
-      expectAssertion(() => {
-        this.render(`{{#foo-bar}}{{/foo-bar}}`);
-      }, /You cannot access this.\$\(\) on a component with `tagName: ''` specified/);
-    }
-
     ['@test renders a contained view with omitted start tag and tagless parent view context']() {
       this.registerComponent('root-component', {
         ComponentClass: Component.extend({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index 7e5c2717e59..0198ddaf45b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -1,16 +1,9 @@
-import {
-  moduleFor,
-  RenderingTestCase,
-  classes,
-  strip,
-  runAppend,
-  runTask,
-} from 'internal-test-helpers';
+import { classes, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { schedule } from '@ember/runloop';
 import { set, setProperties } from '@ember/-internals/metal';
 import { A as emberA } from '@ember/-internals/runtime';
-import { getViewId, getViewElement, jQueryDisabled } from '@ember/-internals/views';
+import { getViewElement, getViewId } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
 
@@ -1604,54 +1597,6 @@ moduleFor(
   }
 );
 
-if (!jQueryDisabled) {
-  moduleFor(
-    'Run loop and lifecycle hooks - jQuery only',
-    class extends RenderingTestCase {
-      ['@test lifecycle hooks have proper access to this.$()'](assert) {
-        assert.expect(7);
-        let component;
-        let FooBarComponent = Component.extend({
-          tagName: 'div',
-          init() {
-            assert.notOk(this.$(), 'no access to element via this.$() on init() enter');
-            this._super(...arguments);
-            assert.notOk(this.$(), 'no access to element via this.$() after init() finished');
-          },
-          willInsertElement() {
-            component = this;
-            assert.ok(this.$(), 'willInsertElement has access to element via this.$()');
-          },
-          didInsertElement() {
-            assert.ok(this.$(), 'didInsertElement has access to element via this.$()');
-          },
-          willDestroyElement() {
-            assert.ok(this.$(), 'willDestroyElement has access to element via this.$()');
-          },
-          didDestroyElement() {
-            assert.notOk(
-              this.$(),
-              'didDestroyElement does not have access to element via this.$()'
-            );
-          },
-        });
-        this.registerComponent('foo-bar', {
-          ComponentClass: FooBarComponent,
-          template: 'hello',
-        });
-        let { owner } = this;
-
-        expectDeprecation(() => {
-          let comp = owner.lookup('component:foo-bar');
-          runAppend(comp);
-          runTask(() => component.destroy?.());
-        }, 'Using this.$() in a component has been deprecated, consider using this.element');
-        runTask(() => component.destroy?.());
-      }
-    }
-  );
-}
-
 function assertDestroyHooks(assert, _actual, _expected) {
   _expected.forEach((expected, i) => {
     let name = expected.name;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.js
index 5eb1e617f30..be6a88bdea2 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.js
@@ -3,9 +3,6 @@ import { descriptorForProperty, Mixin, nativeDescDecorator } from '@ember/-inter
 import { assert } from '@ember/debug';
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { matches } from '../system/utils';
-import { jQuery, jQueryDisabled } from '../system/jquery';
-import { deprecate } from '@ember/debug';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 
 function K() {
   return this;
@@ -422,46 +419,6 @@ let mixin = {
   },
 };
 
-if (JQUERY_INTEGRATION) {
-  /**
-   Returns a jQuery object for this view's element. If you pass in a selector
-   string, this method will return a jQuery object, using the current element
-   as its buffer.
-
-   For example, calling `view.$('li')` will return a jQuery object containing
-   all of the `li` elements inside the DOM element of this view.
-
-   @method $
-   @param {String} [selector] a jQuery-compatible selector string
-   @return {jQuery} the jQuery object for the DOM node
-   @public
-   @deprecated
-   */
-  mixin.$ = function $(sel) {
-    assert(
-      "You cannot access this.$() on a component with `tagName: ''` specified.",
-      this.tagName !== ''
-    );
-    assert('You cannot access this.$() with `jQuery` disabled.', !jQueryDisabled);
-    deprecate(
-      'Using this.$() in a component has been deprecated, consider using this.element',
-      false,
-      {
-        id: 'ember-views.curly-components.jquery-element',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-apis',
-        for: 'ember-source',
-        since: {
-          enabled: '3.9.0',
-        },
-      }
-    );
-    if (this.element) {
-      return sel ? jQuery(sel, this.element) : jQuery(this.element);
-    }
-  };
-}
-
 /**
  @class ViewMixin
  @namespace Ember

From d3f916ac9e3b9ad54c4c7e90e97ca8c76ff7fa38 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sun, 23 May 2021 13:56:02 +0200
Subject: [PATCH 0570/1405] Remove Ember.$() jQuery integration

---
 packages/ember/index.js                | 37 +-------------------------
 packages/ember/tests/reexports_test.js | 26 ++----------------
 2 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index 835fd8ea724..711f183087e 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -99,7 +99,7 @@ import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign } from '@ember/polyfills';
-import { EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
+import { EMBER_EXTEND_PROTOTYPES } from '@ember/deprecated-features';
 
 import {
   templateOnlyComponent,
@@ -609,32 +609,6 @@ Object.defineProperty(Ember, 'TEMPLATES', {
 */
 Ember.VERSION = VERSION;
 
-// ****@ember/-internals/views****
-if (JQUERY_INTEGRATION && !views.jQueryDisabled) {
-  Object.defineProperty(Ember, '$', {
-    get() {
-      deprecate(
-        "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead",
-        false,
-        {
-          id: 'ember-views.curly-components.jquery-element',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-apis',
-          for: 'ember-source',
-          since: {
-            enabled: '3.9.0',
-          },
-        }
-      );
-
-      return views.jQuery;
-    },
-
-    configurable: true,
-    enumerable: true,
-  });
-}
-
 Ember.ViewUtils = {
   isSimpleClick: views.isSimpleClick,
   getElementView: views.getElementView,
@@ -772,12 +746,3 @@ export default Ember;
  @public
  @static
  */
-
-/**
-  Alias for jQuery
-
-  @for jquery
-  @method $
-  @static
-  @public
-*/
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 2ece032df5d..d65c80baa78 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,9 +1,7 @@
 import Ember from '../index';
 import require from 'require';
-import { FEATURES, EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { confirmExport } from 'internal-test-helpers';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
+import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS, FEATURES } from '@ember/canary-features';
+import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
 import Resolver from '@ember/application/globals-resolver';
 import { DEBUG } from '@glimmer/env';
 import { ENV } from '@ember/-internals/environment';
@@ -136,26 +134,6 @@ moduleFor(
   }
 );
 
-if (!jQueryDisabled) {
-  moduleFor(
-    'ember reexports: jQuery enabled',
-    class extends AbstractTestCase {
-      [`@test Ember.$ is exported`](assert) {
-        expectDeprecation(() => {
-          let body = Ember.$('body').get(0);
-          assert.equal(body, document.body, 'Ember.$ exports working jQuery instance');
-        }, "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead");
-      }
-
-      '@test Ember.$ _**is**_ window.jQuery'(assert) {
-        expectDeprecation(() => {
-          assert.strictEqual(Ember.$, jQuery);
-        }, "Using Ember.$() has been deprecated, use `import jQuery from 'jquery';` instead");
-      }
-    }
-  );
-}
-
 let allExports = [
   // @ember/application
   ['Application', '@ember/application', 'default'],

From ca3d81c42d9596da48295a70c192cf32f02c3dda Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 28 May 2021 23:17:13 +0200
Subject: [PATCH 0571/1405] Remove IE11 check in index.html

---
 tests/index.html | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/index.html b/tests/index.html
index 9046533ef85..663d9d1cb8d 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -67,13 +67,7 @@
           EmberENV.ENABLE_OPTIONAL_FEATURES = true;
         }
 
-        var isIE = Boolean(window.MSInputMethodContext) && Boolean(document.documentMode);
-
-        // ignore deprecations for IE11 specifically (due to browser support
-        // policy deprecation, which happens before we can `expectDeprecation`)
-        if (!isIE) {
-          EmberENV['RAISE_ON_DEPRECATION'] = true;
-        }
+        EmberENV['RAISE_ON_DEPRECATION'] = true;
 
         if (QUnit.urlParams.debugrendertree) {
           EmberENV['_DEBUG_RENDER_TREE'] = true;

From 273619f59945e691a3f06462e6e8bd43d4f24729 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 28 May 2021 23:40:59 +0200
Subject: [PATCH 0572/1405] Use WeakSet for lazy events

---
 packages/@ember/-internals/glimmer/lib/component.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index ddb0c74f222..c9ddb8d0364 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -29,9 +29,7 @@ import {
 } from './component-managers/curly';
 
 // Keep track of which component classes have already been processed for lazy event setup.
-// Using a WeakSet would be more appropriate here, but this can only be used when IE11 support is dropped.
-// Thus the workaround using a WeakMap<object, true>
-let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakMap<object, true>>();
+let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<object>>();
 
 /**
 @module @ember/component
@@ -671,7 +669,7 @@ const Component = CoreView.extend(
       if (eventDispatcher) {
         let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
         if (!lazyEventsProcessedForComponentClass) {
-          lazyEventsProcessedForComponentClass = new WeakMap<object, true>();
+          lazyEventsProcessedForComponentClass = new WeakSet<object>();
           lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
         }
 
@@ -685,7 +683,7 @@ const Component = CoreView.extend(
             }
           });
 
-          lazyEventsProcessedForComponentClass.set(proto, true);
+          lazyEventsProcessedForComponentClass.add(proto);
         }
       }
 

From 840e681eb50b219fd686859d7e39bb987a65ac94 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 28 May 2021 23:56:36 +0200
Subject: [PATCH 0573/1405] Remove IE11 Object polyfills

---
 .../glimmer/lib/components/abstract-input.ts  |  6 ++---
 .../glimmer/lib/components/internal.ts        | 24 +++----------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index f459d5fb704..659837f22b2 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -15,8 +15,6 @@ import InternalComponent, {
   handleDeprecatedEventArguments,
   InternalComponentConstructor,
   jQueryEventShim,
-  ObjectEntries,
-  ObjectValues,
 } from './internal';
 
 const UNINITIALIZED: unknown = Object.freeze({});
@@ -304,7 +302,7 @@ export function handleDeprecatedFeatures(
 
     handleDeprecatedAttributeArguments(target, attributeBindings);
 
-    handleDeprecatedEventArguments(target, ObjectEntries(virtualEvents));
+    handleDeprecatedEventArguments(target, Object.entries(virtualEvents));
 
     {
       let superIsVirtualEventListener = prototype['isVirtualEventListener'];
@@ -318,7 +316,7 @@ export function handleDeprecatedFeatures(
           listener: Function
         ): listener is VirtualEventListener {
           return (
-            ObjectValues(virtualEvents).indexOf(name) !== -1 ||
+            Object.values(virtualEvents).indexOf(name) !== -1 ||
             superIsVirtualEventListener.call(this, name, listener)
           );
         },
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 393b4380aa8..81528e7cc2b 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -28,24 +28,6 @@ import InternalModifier, { InternalModifierManager } from '../modifiers/internal
 
 function NOOP(): void {}
 
-// TODO: remove me when IE11 support is EOL
-export let ObjectEntries = ((): typeof Object['entries'] => {
-  if (typeof Object.entries === 'function') {
-    return Object.entries;
-  } else {
-    return (obj: {}) => Object.keys(obj).map((key) => [key, obj[key]] as [string, unknown]);
-  }
-})();
-
-// TODO: remove me when IE11 support is EOL
-export let ObjectValues = ((): typeof Object['values'] => {
-  if (typeof Object.values === 'function') {
-    return Object.values;
-  } else {
-    return (obj: {}) => Object.keys(obj).map((key) => obj[key]);
-  }
-})();
-
 export type EventListener = (event: Event) => void;
 
 export default class InternalComponent {
@@ -444,7 +426,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         name: string
       ): boolean {
         let events = [
-          ...ObjectValues(getEventsMap(this.owner)),
+          ...Object.values(getEventsMap(this.owner)),
           'focus-in',
           'focus-out',
           'key-press',
@@ -470,7 +452,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
         let { element, component, listenerFor, listeners } = this;
 
         let entries: [event: string, argument: string][] = [
-          ...ObjectEntries(getEventsMap(this.owner)),
+          ...Object.entries(getEventsMap(this.owner)),
           ...extraEvents,
         ];
 
@@ -489,7 +471,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
       remove(): void {
         let { element, listeners } = this;
 
-        for (let [event, listener] of ObjectEntries(listeners)) {
+        for (let [event, listener] of Object.entries(listeners)) {
           element.removeEventListener(event, listener);
         }
 

From f61d5ced097fada4b7dfc46431f5247d7eed5e39 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sat, 29 May 2021 00:36:57 +0200
Subject: [PATCH 0574/1405] Remove HAS_NATIVE_SYMBOL flag

After dropping IE11 support, all supported browsers support symbols natively.
---
 .../-internals/container/lib/container.ts     |  4 +-
 .../extension-support/lib/data_adapter.js     |  3 +-
 .../-internals/glimmer/lib/utils/iterator.ts  |  7 ++-
 .../components/component-template-test.js     | 10 ++--
 .../glimmer/tests/integration/content-test.js |  6 +--
 .../tests/integration/syntax/each-in-test.js  | 49 +++++++++----------
 .../tests/integration/syntax/each-test.js     | 38 ++++++--------
 .../-internals/routing/lib/services/router.ts |  2 +-
 .../routing/lib/services/routing.ts           |  2 +-
 .../-internals/routing/lib/system/route.ts    |  2 +-
 .../runtime/lib/system/core_object.js         | 41 +---------------
 packages/@ember/-internals/utils/index.ts     |  1 -
 .../-internals/utils/lib/symbol-utils.ts      |  7 ---
 .../@ember/-internals/utils/lib/symbol.ts     |  3 +-
 .../-internals/utils/tests/guid_for_test.js   |  9 +---
 .../-internals/utils/tests/inspect_test.js    | 12 ++---
 16 files changed, 59 insertions(+), 137 deletions(-)
 delete mode 100644 packages/@ember/-internals/utils/lib/symbol-utils.ts

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 7aa15c1e545..c8a88c0b915 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,5 +1,5 @@
 import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
-import { dictionary, HAS_NATIVE_PROXY, HAS_NATIVE_SYMBOL, symbol } from '@ember/-internals/utils';
+import { dictionary, HAS_NATIVE_PROXY, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import Registry, { DebugRegistry, Injection } from './registry';
@@ -551,7 +551,7 @@ class FactoryManager<T, C> {
     this.injections = undefined;
     setFactoryFor(this, this);
 
-    if (factory && (HAS_NATIVE_SYMBOL || INIT_FACTORY in factory)) {
+    if (factory) {
       setFactoryFor(factory, this);
     }
   }
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.js
index ba39906d6e5..48dfa90647e 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.js
@@ -2,12 +2,11 @@ import { getOwner } from '@ember/-internals/owner';
 import { _backburner } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
-import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 
 function iterate(arr, fn) {
-  if (HAS_NATIVE_SYMBOL && Symbol.iterator in arr) {
+  if (Symbol.iterator in arr) {
     for (let item of arr) {
       fn(item);
     }
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 189c0fa10a0..d597ebeb0fa 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -1,6 +1,5 @@
 import { objectAt } from '@ember/-internals/metal';
-import { _contentFor } from '@ember/-internals/runtime';
-import { EmberArray, HAS_NATIVE_SYMBOL, isEmberArray, isObject } from '@ember/-internals/utils';
+import { EmberArray, isEmberArray, isObject } from '@ember/-internals/utils';
 import { Option } from '@glimmer/interfaces';
 import { IteratorDelegate } from '@glimmer/reference';
 import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
@@ -21,7 +20,7 @@ function toEachInIterator(iterable: unknown) {
 
   if (Array.isArray(iterable) || isEmberArray(iterable)) {
     return ObjectIterator.fromIndexable(iterable);
-  } else if (HAS_NATIVE_SYMBOL && isNativeIterable<[unknown, unknown]>(iterable)) {
+  } else if (isNativeIterable<[unknown, unknown]>(iterable)) {
     return MapLikeNativeIterator.from(iterable);
   } else if (hasForEach(iterable)) {
     return ObjectIterator.fromForEachable(iterable);
@@ -39,7 +38,7 @@ function toEachIterator(iterable: unknown) {
     return ArrayIterator.from(iterable);
   } else if (isEmberArray(iterable)) {
     return EmberArrayIterator.from(iterable);
-  } else if (HAS_NATIVE_SYMBOL && isNativeIterable(iterable)) {
+  } else if (isNativeIterable(iterable)) {
     return ArrayLikeNativeIterator.from(iterable);
   } else if (hasForEach(iterable)) {
     return ArrayIterator.fromForEachable(iterable);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
index 5948a096b64..cc9ae573d96 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js
@@ -1,8 +1,6 @@
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
-
 import { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
 import { Component, compile } from '../../utils/helpers';
 
@@ -68,11 +66,9 @@ moduleFor(
         setComponentTemplate(compile('foo'), 'foo');
       }, /Cannot call `setComponentTemplate` on `foo`/);
 
-      if (HAS_NATIVE_SYMBOL) {
-        assert.throws(() => {
-          setComponentTemplate(compile('foo'), Symbol('foo'));
-        }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
-      }
+      assert.throws(() => {
+        setComponentTemplate(compile('foo'), Symbol('foo'));
+      }, /Cannot call `setComponentTemplate` on `Symbol\(foo\)`/);
     }
 
     '@test calling it twice on the same object asserts'(assert) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index 126fd4ecf87..6956629ee63 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -6,7 +6,6 @@ import { set, computed } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import { Object as EmberObject, ObjectProxy } from '@ember/-internals/runtime';
-import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { Component, SafeString, htmlSafe } from '../utils/helpers';
 
@@ -768,12 +767,9 @@ const SharedContentTestCases = new DynamicContentTestGenerator([
 
 let GlimmerContentTestCases = new DynamicContentTestGenerator([
   [Object.create(null), EMPTY, 'an object with no toString'],
+  [Symbol('debug'), 'Symbol(debug)', 'a symbol'],
 ]);
 
-if (HAS_NATIVE_SYMBOL) {
-  GlimmerContentTestCases.cases.push([Symbol('debug'), 'Symbol(debug)', 'a symbol']);
-}
-
 applyMixins(DynamicContentTest, SharedContentTestCases, GlimmerContentTestCases);
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index 944116e7242..97c94cb3042 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -1,13 +1,12 @@
-import { moduleFor, RenderingTestCase, strip, applyMixins, runTask } from 'internal-test-helpers';
+import { applyMixins, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject, ObjectProxy } from '@ember/-internals/runtime';
-import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 
 import {
+  FalsyGenerator,
   TogglingSyntaxConditionalsTest,
   TruthyGenerator,
-  FalsyGenerator,
 } from '../../utils/shared-conditional-tests';
 
 function EmptyFunction() {}
@@ -677,31 +676,29 @@ moduleFor(
   }
 );
 
-if (HAS_NATIVE_SYMBOL) {
-  moduleFor(
-    'Syntax test: {{#each-in}} with custom iterables',
-    class extends EachInTest {
-      createHash(pojo) {
-        let ary = Object.keys(pojo).reduce((accum, key) => {
-          return accum.concat([[key, pojo[key]]]);
-        }, []);
-        let iterable = {
-          [Symbol.iterator]: () => makeIterator(ary),
-        };
-        return {
-          hash: iterable,
-          delegate: {
-            updateNestedValue(context, key, innerKey, value) {
-              let ary = Array.from(context.hash);
-              let target = ary.find(([k]) => k === key)[1];
-              set(target, innerKey, value);
-            },
+moduleFor(
+  'Syntax test: {{#each-in}} with custom iterables',
+  class extends EachInTest {
+    createHash(pojo) {
+      let ary = Object.keys(pojo).reduce((accum, key) => {
+        return accum.concat([[key, pojo[key]]]);
+      }, []);
+      let iterable = {
+        [Symbol.iterator]: () => makeIterator(ary),
+      };
+      return {
+        hash: iterable,
+        delegate: {
+          updateNestedValue(context, key, innerKey, value) {
+            let ary = Array.from(context.hash);
+            let target = ary.find(([k]) => k === key)[1];
+            set(target, innerKey, value);
           },
-        };
-      }
+        },
+      };
     }
-  );
-}
+  }
+);
 
 // Utils
 function makeIterator(ary) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 07a9ebb3f79..2959fda9f77 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -2,7 +2,6 @@ import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'inter
 
 import { get, set, notifyPropertyChange, computed, on } from '@ember/-internals/metal';
 import { A as emberA, ArrayProxy, RSVP } from '@ember/-internals/runtime';
-import { HAS_NATIVE_SYMBOL } from '@ember/-internals/utils';
 
 import { Component, htmlSafe } from '../../utils/helpers';
 import {
@@ -136,13 +135,11 @@ class ForEachable extends ArrayDelegate {
 
 let ArrayIterable;
 
-if (HAS_NATIVE_SYMBOL) {
-  ArrayIterable = class extends ArrayDelegate {
-    [Symbol.iterator]() {
-      return this._array[Symbol.iterator]();
-    }
-  };
-}
+ArrayIterable = class extends ArrayDelegate {
+  [Symbol.iterator]() {
+    return this._array[Symbol.iterator]();
+  }
+};
 
 class TogglingEachTest extends TogglingSyntaxConditionalsTest {
   get truthyValue() {
@@ -162,6 +159,7 @@ const TRUTHY_CASES = [
   new ForEachable(['hello']),
   ArrayProxy.create({ content: ['hello'] }),
   ArrayProxy.create({ content: emberA(['hello']) }),
+  new ArrayIterable(['hello']),
 ];
 
 const FALSY_CASES = [
@@ -176,13 +174,9 @@ const FALSY_CASES = [
   new ForEachable([]),
   ArrayProxy.create({ content: [] }),
   ArrayProxy.create({ content: emberA([]) }),
+  new ArrayIterable([]),
 ];
 
-if (HAS_NATIVE_SYMBOL) {
-  TRUTHY_CASES.push(new ArrayIterable(['hello']));
-  FALSY_CASES.push(new ArrayIterable([]));
-}
-
 applyMixins(
   BasicEachTest,
   new TruthyGenerator(TRUTHY_CASES),
@@ -1079,17 +1073,15 @@ moduleFor(
   }
 );
 
-if (HAS_NATIVE_SYMBOL) {
-  moduleFor(
-    'Syntax test: {{#each}} with array-like objects implementing Symbol.iterator',
-    class extends EachTest {
-      createList(items) {
-        let iterable = new ArrayIterable(items);
-        return { list: iterable, delegate: iterable };
-      }
+moduleFor(
+  'Syntax test: {{#each}} with array-like objects implementing Symbol.iterator',
+  class extends EachTest {
+    createList(items) {
+      let iterable = new ArrayIterable(items);
+      return { list: iterable, delegate: iterable };
     }
-  );
-}
+  }
+);
 
 moduleFor(
   'Syntax test: {{#each}} with array proxies, modifying itself',
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index eb45385234b..3c8d4b8e92d 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -10,7 +10,7 @@ import Route from '../system/route';
 import EmberRouter, { QueryParam } from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
-const ROUTER = symbol('ROUTER') as string;
+const ROUTER = (symbol('ROUTER') as unknown) as string;
 
 function cleanURL(url: string, rootURL: string) {
   if (rootURL === '/') {
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 7c157e5aea4..f2a061cba04 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -9,7 +9,7 @@ import Service from '@ember/service';
 import EmberRouter, { QueryParam } from '../system/router';
 import RouterState from '../system/router_state';
 
-const ROUTER = symbol('ROUTER') as string;
+const ROUTER = (symbol('ROUTER') as unknown) as string;
 
 /**
   The Routing service is used by LinkComponent, and provides facilities for
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 4cccb54d96d..3b4aeb58992 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -48,7 +48,7 @@ import generateController from './generate_controller';
 import EmberRouter, { QueryParam } from './router';
 
 export const ROUTE_CONNECTIONS = new WeakMap();
-const RENDER = symbol('render') as string;
+const RENDER = (symbol('render') as unknown) as string;
 
 export function defaultSerialize(
   model: {},
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 50bdeff67f2..177f5cd34c6 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -2,7 +2,7 @@
   @module @ember/object
 */
 
-import { getFactoryFor, setFactoryFor, INIT_FACTORY } from '@ember/-internals/container';
+import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
 import { getOwner, LEGACY_OWNER } from '@ember/-internals/owner';
 import {
   guidFor,
@@ -10,7 +10,6 @@ import {
   inspect,
   makeArray,
   HAS_NATIVE_PROXY,
-  HAS_NATIVE_SYMBOL,
   isInternalSymbol,
 } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
@@ -1192,44 +1191,6 @@ if (DEBUG) {
   };
 }
 
-if (!HAS_NATIVE_SYMBOL) {
-  // Allows OWNER and INIT_FACTORY to be non-enumerable in IE11
-  let instanceOwner = new WeakMap();
-  let instanceFactory = new WeakMap();
-
-  Object.defineProperty(CoreObject.prototype, OWNER, {
-    get() {
-      return instanceOwner.get(this);
-    },
-
-    set(value) {
-      instanceOwner.set(this, value);
-    },
-  });
-
-  Object.defineProperty(CoreObject.prototype, INIT_FACTORY, {
-    get() {
-      return instanceFactory.get(this);
-    },
-
-    set(value) {
-      instanceFactory.set(this, value);
-    },
-  });
-
-  Object.defineProperty(CoreObject, INIT_FACTORY, {
-    get() {
-      return instanceFactory.get(this);
-    },
-
-    set(value) {
-      instanceFactory.set(this, value);
-    },
-
-    enumerable: false,
-  });
-}
-
 function implicitInjectionDeprecation(keyName, msg = null) {
   deprecate(msg, false, {
     id: 'implicit-injections',
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index 6ba703fa56d..fc902d9d326 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -28,7 +28,6 @@ export { default as makeArray } from './lib/make-array';
 export { getName, setName } from './lib/name';
 export { default as toString } from './lib/to-string';
 export { isObject } from './lib/spec';
-export { HAS_NATIVE_SYMBOL } from './lib/symbol-utils';
 export { HAS_NATIVE_PROXY } from './lib/proxy-utils';
 export { isProxy, setProxy } from './lib/is_proxy';
 export { default as Cache } from './lib/cache';
diff --git a/packages/@ember/-internals/utils/lib/symbol-utils.ts b/packages/@ember/-internals/utils/lib/symbol-utils.ts
deleted file mode 100644
index 207c6bdd251..00000000000
--- a/packages/@ember/-internals/utils/lib/symbol-utils.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export const HAS_NATIVE_SYMBOL = (function () {
-  if (typeof Symbol !== 'function') {
-    return false;
-  }
-
-  return typeof Symbol() === 'symbol';
-})();
diff --git a/packages/@ember/-internals/utils/lib/symbol.ts b/packages/@ember/-internals/utils/lib/symbol.ts
index 849a176453a..61fda0bf442 100644
--- a/packages/@ember/-internals/utils/lib/symbol.ts
+++ b/packages/@ember/-internals/utils/lib/symbol.ts
@@ -1,7 +1,6 @@
 import { DEBUG } from '@glimmer/env';
 import { GUID_KEY } from './guid';
 import intern from './intern';
-import { HAS_NATIVE_SYMBOL } from './symbol-utils';
 
 const GENERATED_SYMBOLS: string[] = [];
 
@@ -26,4 +25,4 @@ export function enumerableSymbol(debugName: string): string {
   return symbol;
 }
 
-export const symbol = HAS_NATIVE_SYMBOL ? Symbol : enumerableSymbol;
+export const symbol = Symbol;
diff --git a/packages/@ember/-internals/utils/tests/guid_for_test.js b/packages/@ember/-internals/utils/tests/guid_for_test.js
index 3bfa49810cc..aba079aef39 100644
--- a/packages/@ember/-internals/utils/tests/guid_for_test.js
+++ b/packages/@ember/-internals/utils/tests/guid_for_test.js
@@ -1,5 +1,5 @@
-import { guidFor, HAS_NATIVE_SYMBOL } from '..';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import { guidFor } from '..';
+import { AbstractTestCase as TestCase, moduleFor } from 'internal-test-helpers';
 
 function sameGuid(assert, a, b, message) {
   assert.equal(guidFor(a), guidFor(b), message);
@@ -49,11 +49,6 @@ moduleFor(
     }
 
     ['@test symbols'](assert) {
-      if (HAS_NATIVE_SYMBOL) {
-        assert.ok(true, 'symbols are not supported on this browser');
-        return;
-      }
-
       let a = Symbol('a');
       let b = Symbol('b');
 
diff --git a/packages/@ember/-internals/utils/tests/inspect_test.js b/packages/@ember/-internals/utils/tests/inspect_test.js
index 65555f40668..95fb51afc7a 100644
--- a/packages/@ember/-internals/utils/tests/inspect_test.js
+++ b/packages/@ember/-internals/utils/tests/inspect_test.js
@@ -1,5 +1,5 @@
-import { HAS_NATIVE_SYMBOL, inspect } from '..';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import { inspect } from '..';
+import { AbstractTestCase as TestCase, moduleFor } from 'internal-test-helpers';
 
 moduleFor(
   'Ember.inspect',
@@ -130,12 +130,8 @@ How are you?`]: 1,
     }
 
     ['@test inspect outputs the toString() representation of Symbols'](assert) {
-      if (HAS_NATIVE_SYMBOL) {
-        let symbol = Symbol('test');
-        assert.equal(inspect(symbol), 'Symbol(test)');
-      } else {
-        assert.expect(0);
-      }
+      let symbol = Symbol('test');
+      assert.equal(inspect(symbol), 'Symbol(test)');
     }
   }
 );

From f30bdfdda72d18ac6f0824c342f711a593ec5514 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Sat, 29 May 2021 00:46:19 +0200
Subject: [PATCH 0575/1405] Remove HAS_NATIVE_PROXY flag

After dropping IE11 support, all supported browsers support proxies natively.
---
 .../-internals/container/lib/container.ts     | 44 +++++++++----------
 .../integration/event-dispatcher-test.js      |  7 +--
 .../tests/integration/helpers/fn-test.js      |  3 +-
 .../tests/integration/helpers/hash-test.js    |  9 +---
 .../-internals/metal/lib/property_get.ts      |  6 +--
 .../-internals/metal/lib/property_set.ts      |  9 +---
 .../-internals/runtime/lib/mixins/array.js    |  4 +-
 .../runtime/lib/system/core_object.js         |  3 +-
 .../runtime/tests/system/object_proxy_test.js |  5 +--
 packages/@ember/-internals/utils/index.ts     |  1 -
 .../-internals/utils/lib/proxy-utils.ts       |  1 -
 .../lib/system/jquery_event_deprecation.js    |  3 +-
 12 files changed, 36 insertions(+), 59 deletions(-)
 delete mode 100644 packages/@ember/-internals/utils/lib/proxy-utils.ts

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index c8a88c0b915..2f52ae92c25 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,5 +1,5 @@
 import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
-import { dictionary, HAS_NATIVE_PROXY, symbol } from '@ember/-internals/utils';
+import { dictionary, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import Registry, { DebugRegistry, Injection } from './registry';
@@ -234,30 +234,26 @@ if (DEBUG) {
  * set on the manager.
  */
 function wrapManagerInDeprecationProxy<T, C>(manager: FactoryManager<T, C>): FactoryManager<T, C> {
-  if (HAS_NATIVE_PROXY) {
-    let validator = {
-      set(_obj: T, prop: keyof T) {
-        throw new Error(
-          `You attempted to set "${prop}" on a factory manager created by container#factoryFor. A factory manager is a read-only construct.`
-        );
-      },
-    };
-
-    // Note:
-    // We have to proxy access to the manager here so that private property
-    // access doesn't cause the above errors to occur.
-    let m = manager;
-    let proxiedManager = {
-      class: m.class,
-      create(props?: { [prop: string]: any }) {
-        return m.create(props);
-      },
-    };
-
-    return new Proxy(proxiedManager, validator as any) as any;
-  }
+  let validator = {
+    set(_obj: T, prop: keyof T) {
+      throw new Error(
+        `You attempted to set "${prop}" on a factory manager created by container#factoryFor. A factory manager is a read-only construct.`
+      );
+    },
+  };
 
-  return manager;
+  // Note:
+  // We have to proxy access to the manager here so that private property
+  // access doesn't cause the above errors to occur.
+  let m = manager;
+  let proxiedManager = {
+    class: m.class,
+    create(props?: { [prop: string]: any }) {
+      return m.create(props);
+    },
+  };
+
+  return new Proxy(proxiedManager, validator as any) as any;
 }
 
 function isSingleton(container: Container, fullName: string) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index daf950f7c2f..127b8fd4384 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -8,7 +8,6 @@ import {
 } from '@ember/instrumentation';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
 
 let canDataTransfer = Boolean(document.createEvent('HTMLEvents').dataTransfer);
@@ -749,9 +748,7 @@ if (jQueryDisabled) {
         assert.ok(receivedEvent instanceof jQuery.Event, 'event is a jQuery.Event');
       }
 
-      [`@${HAS_NATIVE_PROXY ? 'test' : 'skip'} accessing jQuery.Event#originalEvent is deprecated`](
-        assert
-      ) {
+      ['@test accessing jQuery.Event#originalEvent is deprecated'](assert) {
         let receivedEvent;
 
         this.registerComponent('x-foo', {
@@ -823,7 +820,7 @@ if (jQueryDisabled) {
       }
 
       [`@${
-        HAS_NATIVE_PROXY && DEBUG ? 'test' : 'skip'
+        DEBUG ? 'test' : 'skip'
       } accessing jQuery.Event#__originalEvent does not trigger deprecations to support ember-jquery-legacy`](
         assert
       ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
index 7136480865a..c5b80ad52be 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
@@ -1,5 +1,4 @@
 import { set } from '@ember/-internals/metal';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { Component } from '../../utils/helpers';
@@ -121,7 +120,7 @@ moduleFor(
     }
 
     '@test there is no `this` context within the callback'(assert) {
-      if (DEBUG && HAS_NATIVE_PROXY) {
+      if (DEBUG) {
         assert.expect(0);
         return;
       }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index 9b3cd24b1a1..6faf3b86037 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -3,7 +3,6 @@ import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { Component } from '../../utils/helpers';
 
 import { set, computed } from '@ember/-internals/metal';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 
 moduleFor(
   'Helpers test: {{hash}}',
@@ -294,13 +293,9 @@ moduleFor(
       this.assertText('Chad ');
 
       runTask(() => {
-        if (HAS_NATIVE_PROXY) {
-          expectDeprecation(() => {
-            set(fooBarInstance.hash, 'lastName', 'Hietala');
-          }, /You set the '.*' property on a {{hash}} object/);
-        } else {
+        expectDeprecation(() => {
           set(fooBarInstance.hash, 'lastName', 'Hietala');
-        }
+        }, /You set the '.*' property on a {{hash}} object/);
       });
 
       this.assertText('Chad Hietala');
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index e8c7862317d..7d6d1183c4c 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -1,7 +1,7 @@
 /**
 @module @ember/object
 */
-import { HAS_NATIVE_PROXY, isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
+import { isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -17,7 +17,7 @@ export const PROXY_CONTENT = symbol('PROXY_CONTENT');
 
 export let getPossibleMandatoryProxyValue: (obj: object, keyName: string) => any;
 
-if (DEBUG && HAS_NATIVE_PROXY) {
+if (DEBUG) {
   getPossibleMandatoryProxyValue = function getPossibleMandatoryProxyValue(obj, keyName): any {
     let content = obj[PROXY_CONTENT];
     if (content === undefined) {
@@ -106,7 +106,7 @@ export function _getProp(obj: object, keyName: string) {
   let value: unknown;
 
   if (isObjectLike) {
-    if (DEBUG && HAS_NATIVE_PROXY) {
+    if (DEBUG) {
       value = getPossibleMandatoryProxyValue(obj, keyName);
     } else {
       value = obj[keyName];
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 908f59cc8c5..9c318753267 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -1,9 +1,4 @@
-import {
-  HAS_NATIVE_PROXY,
-  lookupDescriptor,
-  setWithMandatorySetter,
-  toString,
-} from '@ember/-internals/utils';
+import { lookupDescriptor, setWithMandatorySetter, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
@@ -80,7 +75,7 @@ export function _setProp(obj: object, keyName: string, value: any) {
   }
 
   let currentValue: any;
-  if (DEBUG && HAS_NATIVE_PROXY) {
+  if (DEBUG) {
     currentValue = getPossibleMandatoryProxyValue(obj, keyName);
   } else {
     currentValue = obj[keyName];
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index ca3794b76b0..d934edc8ba9 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -3,7 +3,7 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { PROXY_CONTENT } from '@ember/-internals/metal';
-import { setEmberArray, HAS_NATIVE_PROXY } from '@ember/-internals/utils';
+import { setEmberArray } from '@ember/-internals/utils';
 import {
   get,
   set,
@@ -138,7 +138,7 @@ function insertAt(array, index, item) {
 */
 export function isArray(_obj) {
   let obj = _obj;
-  if (DEBUG && HAS_NATIVE_PROXY && typeof _obj === 'object' && _obj !== null) {
+  if (DEBUG && typeof _obj === 'object' && _obj !== null) {
     let possibleProxyContent = _obj[PROXY_CONTENT];
     if (possibleProxyContent !== undefined) {
       obj = possibleProxyContent;
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 177f5cd34c6..48d1f620c44 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -9,7 +9,6 @@ import {
   lookupDescriptor,
   inspect,
   makeArray,
-  HAS_NATIVE_PROXY,
   isInternalSymbol,
 } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
@@ -317,7 +316,7 @@ class CoreObject {
 
     let self = this;
 
-    if (DEBUG && HAS_NATIVE_PROXY && typeof self.unknownProperty === 'function') {
+    if (DEBUG && typeof self.unknownProperty === 'function') {
       let messageFor = (obj, property) => {
         return (
           `You attempted to access the \`${String(property)}\` property (of ${obj}).\n` +
diff --git a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
index 31ab0487468..3d9cb140584 100644
--- a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
@@ -1,6 +1,5 @@
 import { DEBUG } from '@glimmer/env';
 import { addObserver, observer, computed, get, set, removeObserver } from '@ember/-internals/metal';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import ObjectProxy from '../../lib/system/object_proxy';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
@@ -101,7 +100,7 @@ moduleFor(
     }
 
     ['@test calling a function on the proxy avoids the assertion'](assert) {
-      if (DEBUG && HAS_NATIVE_PROXY) {
+      if (DEBUG) {
         let proxy = ObjectProxy.extend({
           init() {
             if (!this.foobar) {
@@ -153,7 +152,7 @@ moduleFor(
     }
 
     ['@test getting proxied properties with [] should be an error'](assert) {
-      if (DEBUG && HAS_NATIVE_PROXY) {
+      if (DEBUG) {
         let proxy = ObjectProxy.create({
           content: {
             foo: 'FOO',
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index fc902d9d326..a81d48c75fb 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -28,7 +28,6 @@ export { default as makeArray } from './lib/make-array';
 export { getName, setName } from './lib/name';
 export { default as toString } from './lib/to-string';
 export { isObject } from './lib/spec';
-export { HAS_NATIVE_PROXY } from './lib/proxy-utils';
 export { isProxy, setProxy } from './lib/is_proxy';
 export { default as Cache } from './lib/cache';
 export { EmberArray, setEmberArray, isEmberArray } from './lib/ember-array';
diff --git a/packages/@ember/-internals/utils/lib/proxy-utils.ts b/packages/@ember/-internals/utils/lib/proxy-utils.ts
deleted file mode 100644
index 08d3d25f6b2..00000000000
--- a/packages/@ember/-internals/utils/lib/proxy-utils.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const HAS_NATIVE_PROXY = typeof Proxy === 'function';
diff --git a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
index fe91faa4d75..8d401e2f976 100644
--- a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
+++ b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
@@ -1,12 +1,11 @@
 /* global Proxy */
 import { deprecate } from '@ember/debug';
 import { global } from '@ember/-internals/environment';
-import { HAS_NATIVE_PROXY } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
 import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 
 export default function addJQueryEventDeprecation(jqEvent) {
-  if (DEBUG && JQUERY_INTEGRATION && HAS_NATIVE_PROXY) {
+  if (DEBUG && JQUERY_INTEGRATION) {
     let boundFunctions = new Map();
 
     // wrap the jQuery event in a Proxy to add the deprecation message for originalEvent, according to RFC#294

From bdb32d9e224f27ba164f1a503be6dc3ac8a74ef5 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 19 Jul 2021 12:29:19 +0200
Subject: [PATCH 0576/1405] Fix test after rebase

---
 .../tests/integration/helpers/hash-test.js       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index 6faf3b86037..d68f702ebb3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -225,13 +225,9 @@ moduleFor(
         init() {
           this._super(...arguments);
 
-          if (HAS_NATIVE_PROXY) {
-            expectDeprecation(() => {
-              set(this.hash, 'lastName', 'Hietala');
-            }, /You set the '.*' property on a {{hash}} object/);
-          } else {
+          expectDeprecation(() => {
             set(this.hash, 'lastName', 'Hietala');
-          }
+          }, /You set the '.*' property on a {{hash}} object/);
 
           instance = this;
         },
@@ -260,13 +256,9 @@ moduleFor(
       runTask(() => {
         set(this.context, 'firstName', 'Godfrey');
 
-        if (HAS_NATIVE_PROXY) {
-          expectDeprecation(() => {
-            set(instance.hash, 'lastName', 'Chan');
-          }, /You set the '.*' property on a {{hash}} object/);
-        } else {
+        expectDeprecation(() => {
           set(instance.hash, 'lastName', 'Chan');
-        }
+        }, /You set the '.*' property on a {{hash}} object/);
       });
 
       this.assertText('Godfrey Chan');

From b2d435fcb0312667acc785b7509c59cb6c2fdbc8 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 13:39:48 -0400
Subject: [PATCH 0577/1405] Remove LEGACY_OWNER

---
 .../-internals/container/tests/owner_test.js  | 21 ---------------
 packages/@ember/-internals/owner/index.ts     | 27 +------------------
 .../runtime/lib/system/core_object.js         |  9 +------
 3 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/packages/@ember/-internals/container/tests/owner_test.js b/packages/@ember/-internals/container/tests/owner_test.js
index caa990de93d..478169b541f 100644
--- a/packages/@ember/-internals/container/tests/owner_test.js
+++ b/packages/@ember/-internals/container/tests/owner_test.js
@@ -14,26 +14,5 @@ moduleFor(
 
       assert.strictEqual(getOwner(obj), owner, 'owner has been set');
     }
-
-    ['@test getOwner deprecates using LEGACY_OWNER'](assert) {
-      let owner = {};
-      let obj = {};
-
-      setOwner(obj, owner);
-
-      let legacyOwner;
-
-      // This is not something we expect to happen a lot, but does exist currently
-      // in the wild: https://github.com/hjdivad/ember-m3/pull/822
-      for (let key in obj) {
-        legacyOwner = key;
-      }
-
-      let newObj = { [legacyOwner]: owner };
-
-      expectDeprecation(() => {
-        assert.strictEqual(getOwner(newObj), owner, 'owner has been set');
-      }, /You accessed the owner using `getOwner` on an object/);
-    }
   }
 );
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 79034ed59ee..7961ac36473 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -38,11 +38,6 @@ export interface Owner {
   routable?: boolean;
 }
 
-import { enumerableSymbol } from '@ember/-internals/utils';
-import { deprecate } from '@ember/debug';
-
-export const LEGACY_OWNER: unique symbol = enumerableSymbol('LEGACY_OWNER') as any;
-
 /**
   Framework objects in an Ember application (components, services, routes, etc.)
   are created via a factory and dependency injection system. Each of these
@@ -88,26 +83,7 @@ export const LEGACY_OWNER: unique symbol = enumerableSymbol('LEGACY_OWNER') as a
   @public
 */
 export function getOwner(object: any): Owner {
-  let owner = glimmerGetOwner(object) as Owner;
-
-  if (owner === undefined) {
-    owner = object[LEGACY_OWNER];
-
-    deprecate(
-      `You accessed the owner using \`getOwner\` on an object, but it was not set on that object with \`setOwner\`. You must use \`setOwner\` to set the owner on all objects. You cannot use Object.assign().`,
-      owner === undefined,
-      {
-        id: 'owner.legacy-owner-injection',
-        until: '3.25.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.22.0',
-        },
-      }
-    );
-  }
-
-  return owner;
+  return glimmerGetOwner(object) as Owner;
 }
 
 /**
@@ -124,5 +100,4 @@ export function getOwner(object: any): Owner {
 */
 export function setOwner(object: any, owner: Owner): void {
   glimmerSetOwner(object, owner);
-  object[LEGACY_OWNER] = owner;
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 48d1f620c44..05ad5cc77c1 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -3,7 +3,7 @@
 */
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
-import { getOwner, LEGACY_OWNER } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import {
   guidFor,
   lookupDescriptor,
@@ -306,9 +306,6 @@ function defineSelfDestructingImplicitInjectionGetter(obj, keyName, value, messa
 */
 class CoreObject {
   constructor(owner) {
-    // setOwner has to set both OWNER and LEGACY_OWNER for backwards compatibility, and
-    // LEGACY_OWNER is enumerable, so setting it would add an enumerable property to the object,
-    // so we just set `OWNER` directly here.
     this[OWNER] = owner;
 
     // prepare prototype...
@@ -379,10 +376,6 @@ class CoreObject {
     }
   }
 
-  // Empty setter for absorbing setting the LEGACY_OWNER, which should _not_
-  // become an enumerable property, and should not be used in general.
-  set [LEGACY_OWNER](value) {}
-
   reopen(...args) {
     applyMixin(this, args);
     return this;

From 52a1384a0c8a4cff7cc87d018e19d31188b7507d Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 19:54:40 -0400
Subject: [PATCH 0578/1405] Remove sendAction and string action passing

---
 .../glimmer/lib/components/abstract-input.ts  |  84 +--
 .../-internals/glimmer/lib/helpers/action.ts  |  10 +-
 .../components/input-angle-test.js            | 125 ----
 .../components/input-curly-test.js            | 125 ----
 .../components/target-action-test.js          | 595 +-----------------
 .../helpers/element-action-test.js            |   6 +-
 .../views/lib/mixins/action_support.js        | 153 +----
 .../views/lib/mixins/text_support.js          |  20 +-
 packages/@ember/deprecated-features/index.ts  |   1 -
 .../lib/plugins/deprecate-send-action.ts      | 103 ---
 .../lib/plugins/index.ts                      |   4 -
 .../plugins/deprecate-send-action-test.js     |  29 -
 tests/docs/expected.js                        |   1 -
 13 files changed, 12 insertions(+), 1244 deletions(-)
 delete mode 100644 packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
 delete mode 100644 packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js

diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index 659837f22b2..c81f4b23565 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -2,8 +2,8 @@ import { tracked } from '@ember/-internals/metal';
 import { TargetActionSupport } from '@ember/-internals/runtime';
 import { TextSupport } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
-import { JQUERY_INTEGRATION, SEND_ACTION } from '@ember/deprecated-features';
+import { assert } from '@ember/debug';
+import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import { action } from '@ember/object';
 import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
 import Component from '../component';
@@ -207,86 +207,6 @@ export function handleDeprecatedFeatures(
   target: InternalComponentConstructor<AbstractInput>,
   attributeBindings: Array<string | [attribute: string, argument: string]>
 ): void {
-  if (SEND_ACTION) {
-    let angle = target.toString();
-    let { prototype } = target;
-
-    interface View {
-      send(action: string, ...args: unknown[]): void;
-    }
-
-    let isView = (target: {}): target is View => {
-      return typeof (target as Partial<View>).send === 'function';
-    };
-
-    let superListenerFor = prototype['listenerFor'];
-
-    Object.defineProperty(prototype, 'listenerFor', {
-      configurable: true,
-      enumerable: false,
-      value: function listenerFor(this: AbstractInput, name: string): EventListener {
-        const actionName = this.named(name);
-
-        if (typeof actionName === 'string') {
-          deprecate(
-            `Passing actions to components as strings (like \`<${angle} @${name}="${actionName}" />\`) is deprecated. ` +
-              `Please use closure actions instead (\`<${angle} @${name}={{action "${actionName}"}} />\`).`,
-            false,
-            {
-              id: 'ember-component.send-action',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-              url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-            }
-          );
-
-          const { caller } = this;
-
-          assert('[BUG] missing caller', caller && typeof caller === 'object');
-
-          let listener: Function;
-
-          if (isView(caller)) {
-            listener = (...args: unknown[]) => caller.send(actionName, ...args);
-          } else {
-            assert(
-              `The action '${actionName}' did not exist on ${caller}`,
-              typeof caller[actionName] === 'function'
-            );
-
-            listener = caller[actionName];
-          }
-
-          let deprecatedListener = (...args: unknown[]) => {
-            deprecate(
-              `Passing actions to components as strings (like \`<${angle} @${name}="${actionName}" />\`) is deprecated. ` +
-                `Please use closure actions instead (\`<${angle} @${name}={{action "${actionName}"}} />\`).`,
-              false,
-              {
-                id: 'ember-component.send-action',
-                for: 'ember-source',
-                since: {},
-                until: '4.0.0',
-                url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-              }
-            );
-
-            return listener(...args);
-          };
-
-          if (this.isVirtualEventListener(name, deprecatedListener)) {
-            return devirtualize(deprecatedListener);
-          } else {
-            return deprecatedListener as EventListener;
-          }
-        } else {
-          return superListenerFor.call(this, name);
-        }
-      },
-    });
-  }
-
   if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     let { prototype } = target;
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 4999a46d81c..2a2315b5b6d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -95,10 +95,10 @@ export const ACTIONS = new _WeakSet();
 
   Closure actions curry both their scope and any arguments. When invoked, any
   additional arguments are added to the already curried list.
-  Actions should be invoked using the [sendAction](/ember/release/classes/Component/methods/sendAction?anchor=sendAction)
-  method. The first argument to `sendAction` is the action to be called, and
-  additional arguments are passed to the action function. This has interesting
-  properties combined with currying of arguments. For example:
+  Actions are presented in JavaScript as callbacks, and are
+  invoked like any other JavaScript function.
+
+  For example
 
   ```app/components/update-name.js
   import Component from '@glimmer/component';
@@ -152,7 +152,7 @@ export const ACTIONS = new _WeakSet();
   export default Component.extend({
     click() {
       // Note that model is not passed, it was curried in the template
-      this.sendAction('submit', 'bob');
+      this.submit('bob');
     }
   });
   ```
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 905498e9f86..4657de9ddd9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -554,31 +554,6 @@ moduleFor(
       // this.assertSelectionRange(8, 8); //NOTE: this fails in IE, the range is 0 -> 0 (TEST_SUITE=sauce)
     }
 
-    ['@test [DEPRECATED] sends an action with `<Input @enter="foo" />` when <enter> is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`<Input @enter="foo" />`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, 'Passing actions to components as strings (like `<Input @enter="foo" />`) is deprecated. Please use closure actions instead (`<Input @enter={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
-
-      expectDeprecation(() => {
-        this.triggerEvent('keyup', { key: 'Enter' });
-      }, 'Passing actions to components as strings (like `<Input @enter="foo" />`) is deprecated. Please use closure actions instead (`<Input @enter={{action "foo"}} />`).');
-    }
-
     ['@test sends an action with `<Input @enter={{action "foo"}} />` when <enter> is pressed'](
       assert
     ) {
@@ -602,31 +577,6 @@ moduleFor(
       });
     }
 
-    ['@test [DEPRECATED] sends an action with `<Input @key-press="foo" />` is pressed'](assert) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`<Input @value={{this.value}} @key-press='foo' />`, {
-          value: 'initial',
-
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\.|Passing the `@key-press` argument to <Input> is deprecated\./);
-
-      expectDeprecation(() => {
-        this.triggerEvent('keypress', { key: 'A' });
-      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
-    }
-
     ['@test sends an action with `<Input @key-press={{action "foo"}} />` is pressed'](assert) {
       let triggered = 0;
 
@@ -727,31 +677,6 @@ moduleFor(
       });
     }
 
-    ['@test [DEPRECATED] sends an action with `<Input @escape-press="foo" />` when <escape> is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`<Input @escape-press='foo' />`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, 'Passing actions to components as strings (like `<Input @escape-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @escape-press={{action "foo"}} />`). (\'-top-level\' @ L1:C0) ');
-
-      expectDeprecation(() => {
-        this.triggerEvent('keyup', { key: 'Escape' });
-      }, 'Passing actions to components as strings (like `<Input @escape-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @escape-press={{action "foo"}} />`).');
-    }
-
     ['@test sends an action with `<Input @escape-press={{action "foo"}} />` when <escape> is pressed'](
       assert
     ) {
@@ -773,31 +698,6 @@ moduleFor(
       this.triggerEvent('keyup', { key: 'Escape' });
     }
 
-    ['@test [DEPRECATED] sends an action with `<Input @key-down="foo" />` when a key is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`<Input @key-down='foo' />`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\.|Passing the `@key-down` argument to <Input> is deprecated\./);
-
-      expectDeprecation(() => {
-        this.triggerEvent('keydown', { key: 'A' });
-      }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`).');
-    }
-
     ['@test [DEPRECATED] sends an action with `<Input @key-down={{action "foo"}} />` when a key is pressed'](
       assert
     ) {
@@ -828,31 +728,6 @@ moduleFor(
       assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
-    ['@test [DEPRECATED] sends an action with `<Input @key-up="foo" />` when a key is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`<Input @key-up='foo' />`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\.|Passing the `@key-up` argument to <Input> is deprecated\./);
-
-      expectDeprecation(() => {
-        this.triggerEvent('keyup', { key: 'A' });
-      }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`).');
-    }
-
     ['@test [DEPRECATED] sends an action with `<Input @key-up={{action "foo"}} />` when a key is pressed'](
       assert
     ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index f32278a6d56..589649eecd4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -385,31 +385,6 @@ moduleFor(
       // this.assertSelectionRange(8, 8); //NOTE: this fails in IE, the range is 0 -> 0 (TEST_SUITE=sauce)
     }
 
-    ['@test [DEPRECATED] sends an action with `{{input enter="foo"}}` when <enter> is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`{{input enter='foo'}}`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, 'Passing actions to components as strings (like `{{input enter="foo"}}`) is deprecated. Please use closure actions instead (`{{input enter=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
-
-      expectDeprecation(() => {
-        this.triggerEvent('keyup', { key: 'Enter' });
-      }, 'Passing actions to components as strings (like `<Input @enter="foo" />`) is deprecated. Please use closure actions instead (`<Input @enter={{action "foo"}} />`).');
-    }
-
     ['@test sends an action with `{{input enter=(action "foo")}}` when <enter> is pressed'](
       assert
     ) {
@@ -433,31 +408,6 @@ moduleFor(
       });
     }
 
-    ['@test [DEPRECATED] sends an action with `{{input key-press="foo"}}` is pressed'](assert) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`{{input value=this.value key-press='foo'}}`, {
-          value: 'initial',
-
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\.|Passing the `@key-press` argument to <Input> is deprecated\./);
-
-      expectDeprecation(() => {
-        this.triggerEvent('keypress', { key: 'A' });
-      }, /Passing actions to components as strings \(like `({{input key-press="foo"}}|<Input @key-press="foo" \/>)`\) is deprecated\./);
-    }
-
     ['@test sends an action with `{{input key-press=(action "foo")}}` is pressed'](assert) {
       let triggered = 0;
 
@@ -558,31 +508,6 @@ moduleFor(
       });
     }
 
-    ['@test [DEPRECATED] sends an action with `{{input escape-press="foo"}}` when <escape> is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`{{input escape-press='foo'}}`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, 'Passing actions to components as strings (like `{{input escape-press="foo"}}`) is deprecated. Please use closure actions instead (`{{input escape-press=(action "foo")}}`). (\'-top-level\' @ L1:C0) ');
-
-      expectDeprecation(() => {
-        this.triggerEvent('keyup', { key: 'Escape' });
-      }, 'Passing actions to components as strings (like `<Input @escape-press="foo" />`) is deprecated. Please use closure actions instead (`<Input @escape-press={{action "foo"}} />`).');
-    }
-
     ['@test sends an action with `{{input escape-press=(action "foo")}}` when <escape> is pressed'](
       assert
     ) {
@@ -604,31 +529,6 @@ moduleFor(
       this.triggerEvent('keyup', { key: 'Escape' });
     }
 
-    ['@test [DEPRECATED] sends an action with `{{input key-down="foo"}}` when a key is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`{{input key-down='foo'}}`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, /Passing actions to components as strings \(like `({{input key-down="foo"}}|<Input @key-down="foo" \/>)`\) is deprecated\.|Passing the `@key-down` argument to <Input> is deprecated\./);
-
-      expectDeprecation(() => {
-        this.triggerEvent('keydown', { key: 'A' });
-      }, 'Passing actions to components as strings (like `<Input @key-down="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-down={{action "foo"}} />`).');
-    }
-
     ['@test sends an action with `{{input key-down=(action "foo")}}` when a key is pressed'](
       assert
     ) {
@@ -659,31 +559,6 @@ moduleFor(
       assert.equal(triggered, 1, 'The action was triggered exactly once');
     }
 
-    ['@test [DEPRECATED] sends an action with `{{input key-up="foo"}}` when a key is pressed'](
-      assert
-    ) {
-      assert.expect(4);
-
-      expectDeprecation(() => {
-        this.render(`{{input key-up='foo'}}`, {
-          actions: {
-            foo(value, event) {
-              assert.ok(true, 'action was triggered');
-              if (jQueryDisabled) {
-                assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-              } else {
-                assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-              }
-            },
-          },
-        });
-      }, /Passing actions to components as strings \(like `({{input key-up="foo"}}|<Input @key-up="foo" \/>)`\) is deprecated\.|Passing the `@key-up` argument to <Input> is deprecated\./);
-
-      expectDeprecation(() => {
-        this.triggerEvent('keyup', { key: 'A' });
-      }, 'Passing actions to components as strings (like `<Input @key-up="foo" />`) is deprecated. Please use closure actions instead (`<Input @key-up={{action "foo"}} />`).');
-    }
-
     ['@test sends an action with `{{input key-up=(action "foo")}}` when a key is pressed'](assert) {
       expectDeprecation(
         () => {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index 6e991250fbc..e40ad1d65be 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -1,604 +1,11 @@
-import {
-  moduleFor,
-  RenderingTestCase,
-  ApplicationTestCase,
-  strip,
-  runTask,
-} from 'internal-test-helpers';
+import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { set, Mixin } from '@ember/-internals/metal';
 import Controller from '@ember/controller';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
 
 import { Component } from '../../utils/helpers';
 
-function expectSendActionDeprecation(fn) {
-  expectDeprecation(
-    fn,
-    /You called (.*).sendAction\((.*)\) but Component#sendAction is deprecated. Please use closure actions instead./
-  );
-}
-
-moduleFor(
-  'Components test: sendAction',
-  class extends RenderingTestCase {
-    constructor() {
-      super(...arguments);
-      this.actionCounts = {};
-      this.sendCount = 0;
-      this.actionArguments = null;
-
-      let self = this;
-
-      this.registerComponent('action-delegate', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super();
-            self.delegate = this;
-            this.name = 'action-delegate';
-          },
-        }),
-      });
-    }
-
-    renderDelegate(template = '{{action-delegate}}', context = {}) {
-      let root = this;
-      context = Object.assign(context, {
-        send(actionName, ...args) {
-          root.sendCount++;
-          root.actionCounts[actionName] = root.actionCounts[actionName] || 0;
-          root.actionCounts[actionName]++;
-          root.actionArguments = args;
-        },
-      });
-      this.render(template, context);
-    }
-
-    assertSendCount(count) {
-      this.assert.equal(this.sendCount, count, `Send was called ${count} time(s)`);
-    }
-
-    assertNamedSendCount(actionName, count) {
-      this.assert.equal(
-        this.actionCounts[actionName],
-        count,
-        `An action named '${actionName}' was sent ${count} times`
-      );
-    }
-
-    assertSentWithArgs(expected, message = 'arguments were sent with the action') {
-      this.assert.deepEqual(this.actionArguments, expected, message);
-    }
-
-    ['@test Calling sendAction on a component without an action defined does nothing']() {
-      this.renderDelegate();
-
-      expectSendActionDeprecation(() => {
-        runTask(() => this.delegate.sendAction());
-      });
-
-      this.assertSendCount(0);
-    }
-
-    ['@test Calling sendAction on a component with an action defined calls send on the controller']() {
-      this.renderDelegate();
-
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          set(this.delegate, 'action', 'addItem');
-          this.delegate.sendAction();
-        });
-      });
-
-      this.assertSendCount(1);
-      this.assertNamedSendCount('addItem', 1);
-    }
-
-    ['@test Calling sendAction on a component with a function calls the function']() {
-      this.assert.expect(2);
-
-      this.renderDelegate();
-
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          set(this.delegate, 'action', () => this.assert.ok(true, 'function is called'));
-          this.delegate.sendAction();
-        });
-      });
-    }
-
-    ['@test Calling sendAction on a component with a function calls the function with arguments']() {
-      this.assert.expect(2);
-      let argument = {};
-
-      this.renderDelegate();
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          set(this.delegate, 'action', (actualArgument) => {
-            this.assert.deepEqual(argument, actualArgument, 'argument is passed');
-          });
-          this.delegate.sendAction('action', argument);
-        });
-      });
-    }
-
-    // TODO consolidate these next 2 tests
-    ['@test Calling sendAction on a component with a reference attr calls the function with arguments']() {
-      this.renderDelegate('{{action-delegate playing=this.playing}}', {
-        playing: null,
-      });
-
-      expectSendActionDeprecation(() => {
-        runTask(() => this.delegate.sendAction());
-      });
-
-      this.assertSendCount(0);
-
-      runTask(() => {
-        set(this.context, 'playing', 'didStartPlaying');
-      });
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          this.delegate.sendAction('playing');
-        });
-      });
-
-      this.assertSendCount(1);
-      this.assertNamedSendCount('didStartPlaying', 1);
-    }
-
-    ['@test Calling sendAction on a component with a {{mut}} attr calls the function with arguments']() {
-      this.renderDelegate('{{action-delegate playing=(mut this.playing)}}', {
-        playing: null,
-      });
-
-      expectSendActionDeprecation(() => {
-        runTask(() => this.delegate.sendAction('playing'));
-      });
-
-      this.assertSendCount(0);
-
-      runTask(() => this.delegate.attrs.playing.update('didStartPlaying'));
-      expectSendActionDeprecation(() => {
-        runTask(() => this.delegate.sendAction('playing'));
-      });
-
-      this.assertSendCount(1);
-      this.assertNamedSendCount('didStartPlaying', 1);
-    }
-
-    ["@test Calling sendAction with a named action uses the component's property as the action name"]() {
-      this.renderDelegate();
-
-      let component = this.delegate;
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          set(this.delegate, 'playing', 'didStartPlaying');
-          component.sendAction('playing');
-        });
-      });
-
-      this.assertSendCount(1);
-      this.assertNamedSendCount('didStartPlaying', 1);
-
-      expectSendActionDeprecation(() => {
-        runTask(() => component.sendAction('playing'));
-      });
-
-      this.assertSendCount(2);
-      this.assertNamedSendCount('didStartPlaying', 2);
-
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          set(component, 'action', 'didDoSomeBusiness');
-          component.sendAction();
-        });
-      });
-
-      this.assertSendCount(3);
-      this.assertNamedSendCount('didDoSomeBusiness', 1);
-    }
-
-    ['@test Calling sendAction when the action name is not a string raises an exception']() {
-      this.renderDelegate();
-
-      runTask(() => {
-        set(this.delegate, 'action', {});
-        set(this.delegate, 'playing', {});
-      });
-      expectSendActionDeprecation(() => {
-        expectAssertion(() => this.delegate.sendAction());
-      });
-      expectSendActionDeprecation(() => {
-        expectAssertion(() => this.delegate.sendAction('playing'));
-      });
-    }
-
-    ['@test Calling sendAction on a component with contexts']() {
-      this.renderDelegate();
-
-      let testContext = { song: 'She Broke My Ember' };
-      let firstContext = { song: 'She Broke My Ember' };
-      let secondContext = { song: 'My Achey Breaky Ember' };
-
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          set(this.delegate, 'playing', 'didStartPlaying');
-          this.delegate.sendAction('playing', testContext);
-        });
-      });
-
-      this.assertSendCount(1);
-      this.assertNamedSendCount('didStartPlaying', 1);
-      this.assertSentWithArgs([testContext], 'context was sent with the action');
-
-      expectSendActionDeprecation(() => {
-        runTask(() => {
-          this.delegate.sendAction('playing', firstContext, secondContext);
-        });
-      });
-
-      this.assertSendCount(2);
-      this.assertNamedSendCount('didStartPlaying', 2);
-      this.assertSentWithArgs(
-        [firstContext, secondContext],
-        'multiple contexts were sent to the action'
-      );
-    }
-
-    ['@test calling sendAction on a component within a block sends to the outer scope GH#14216'](
-      assert
-    ) {
-      let testContext = this;
-      // overrides default action-delegate so actions can be added
-      this.registerComponent('action-delegate', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super();
-            testContext.delegate = this;
-            this.name = 'action-delegate';
-          },
-
-          actions: {
-            derp(arg1) {
-              assert.ok(true, 'action called on action-delgate');
-              assert.equal(arg1, 'something special', 'argument passed through properly');
-            },
-          },
-        }),
-
-        template: strip`
-        {{#component-a}}
-          {{component-b bar="derp"}}
-        {{/component-a}}
-      `,
-      });
-
-      this.registerComponent('component-a', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            this.name = 'component-a';
-          },
-          actions: {
-            derp() {
-              assert.ok(false, 'no! bad scoping!');
-            },
-          },
-        }),
-      });
-
-      let innerChild;
-      this.registerComponent('component-b', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            innerChild = this;
-            this.name = 'component-b';
-          },
-        }),
-      });
-
-      this.renderDelegate();
-      expectSendActionDeprecation(() => {
-        runTask(() => innerChild.sendAction('bar', 'something special'));
-      });
-    }
-
-    ['@test asserts if called on a destroyed component']() {
-      let component;
-
-      this.registerComponent('rip-alley', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super();
-            component = this;
-          },
-
-          toString() {
-            return 'component:rip-alley';
-          },
-        }),
-      });
-
-      this.render('{{#if this.shouldRender}}{{rip-alley}}{{/if}}', {
-        shouldRender: true,
-      });
-
-      runTask(() => {
-        set(this.context, 'shouldRender', false);
-      });
-
-      expectAssertion(() => {
-        component.sendAction('trigger-me-dead');
-      }, "Attempted to call .sendAction() with the action 'trigger-me-dead' on the destroyed object 'component:rip-alley'.");
-    }
-  }
-);
-
-moduleFor(
-  'Components test: sendAction to a controller',
-  class extends ApplicationTestCase {
-    ["@test sendAction should trigger an action on the parent component's controller if it exists"](
-      assert
-    ) {
-      assert.expect(20);
-
-      let component;
-
-      this.router.map(function () {
-        this.route('a');
-        this.route('b');
-        this.route('c', function () {
-          this.route('d');
-          this.route('e');
-        });
-      });
-
-      this.addComponent('foo-bar', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            component = this;
-          },
-        }),
-        template: `{{this.val}}`,
-      });
-
-      this.add(
-        'controller:a',
-        Controller.extend({
-          send(actionName, actionContext) {
-            assert.equal(
-              actionName,
-              'poke',
-              'send() method was invoked from a top level controller'
-            );
-            assert.equal(
-              actionContext,
-              'top',
-              'action arguments were passed into the top level controller'
-            );
-          },
-        })
-      );
-      this.addTemplate('a', '{{foo-bar val="a" poke="poke"}}');
-
-      this.add(
-        'route:b',
-        Route.extend({
-          actions: {
-            poke(actionContext) {
-              assert.ok(true, 'Unhandled action sent to route');
-              assert.equal(actionContext, 'top no controller');
-            },
-          },
-        })
-      );
-      this.addTemplate('b', '{{foo-bar val="b" poke="poke"}}');
-
-      this.add(
-        'route:c',
-        Route.extend({
-          actions: {
-            poke(actionContext) {
-              assert.ok(true, 'Unhandled action sent to route');
-              assert.equal(actionContext, 'top with nested no controller');
-            },
-          },
-        })
-      );
-      this.addTemplate('c', '{{foo-bar val="c" poke="poke"}}{{outlet}}');
-
-      this.add('route:c.d', Route.extend({}));
-
-      this.add(
-        'controller:c.d',
-        Controller.extend({
-          send(actionName, actionContext) {
-            assert.equal(actionName, 'poke', 'send() method was invoked from a nested controller');
-            assert.equal(
-              actionContext,
-              'nested',
-              'action arguments were passed into the nested controller'
-            );
-          },
-        })
-      );
-      this.addTemplate('c.d', '{{foo-bar val=".d" poke="poke"}}');
-
-      this.add(
-        'route:c.e',
-        Route.extend({
-          actions: {
-            poke(actionContext) {
-              assert.ok(true, 'Unhandled action sent to route');
-              assert.equal(actionContext, 'nested no controller');
-            },
-          },
-        })
-      );
-      this.addTemplate('c.e', '{{foo-bar val=".e" poke="poke"}}');
-
-      return this.visit('/a')
-        .then(() => {
-          expectSendActionDeprecation(() => component.sendAction('poke', 'top'));
-        })
-        .then(() => {
-          this.assertText('a');
-          return this.visit('/b');
-        })
-        .then(() => {
-          expectSendActionDeprecation(() => component.sendAction('poke', 'top no controller'));
-        })
-        .then(() => {
-          this.assertText('b');
-          return this.visit('/c');
-        })
-        .then(() => {
-          expectSendActionDeprecation(() => {
-            component.sendAction('poke', 'top with nested no controller');
-          });
-        })
-        .then(() => {
-          this.assertText('c');
-          return this.visit('/c/d');
-        })
-        .then(() => {
-          expectSendActionDeprecation(() => component.sendAction('poke', 'nested'));
-        })
-        .then(() => {
-          this.assertText('c.d');
-          return this.visit('/c/e');
-        })
-        .then(() => {
-          expectSendActionDeprecation(() => component.sendAction('poke', 'nested no controller'));
-        })
-        .then(() => this.assertText('c.e'));
-    }
-
-    ["@test sendAction should not trigger an action in an outlet's controller if a parent component handles it"](
-      assert
-    ) {
-      assert.expect(2);
-
-      let component;
-
-      this.addComponent('x-parent', {
-        ComponentClass: Component.extend({
-          actions: {
-            poke() {
-              assert.ok(true, 'parent component handled the aciton');
-            },
-          },
-        }),
-        template: '{{x-child poke="poke"}}',
-      });
-
-      this.addComponent('x-child', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            component = this;
-          },
-        }),
-      });
-
-      this.addTemplate('application', '{{x-parent}}');
-      this.add(
-        'controller:application',
-        Controller.extend({
-          send() {
-            throw new Error('controller action should not be called');
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        expectSendActionDeprecation(() => component.sendAction('poke'));
-      });
-    }
-  }
-);
-
-moduleFor(
-  'Components test: sendAction of a closure action',
-  class extends RenderingTestCase {
-    ['@test action should be called'](assert) {
-      assert.expect(2);
-      let component;
-
-      this.registerComponent('inner-component', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            component = this;
-          },
-        }),
-        template: 'inner',
-      });
-
-      this.registerComponent('outer-component', {
-        ComponentClass: Component.extend({
-          outerSubmit() {
-            assert.ok(true, 'outerSubmit called');
-          },
-        }),
-        template: '{{inner-component submitAction=(action this.outerSubmit)}}',
-      });
-
-      this.render('{{outer-component}}');
-      expectSendActionDeprecation(() => {
-        runTask(() => component.sendAction('submitAction'));
-      });
-    }
-
-    ['@test contexts passed to sendAction are appended to the bound arguments on a closure action']() {
-      let first = 'mitch';
-      let second = 'martin';
-      let third = 'matt';
-      let fourth = 'wacky wycats';
-
-      let innerComponent;
-      let actualArgs;
-
-      this.registerComponent('inner-component', {
-        ComponentClass: Component.extend({
-          init() {
-            this._super(...arguments);
-            innerComponent = this;
-          },
-        }),
-        template: 'inner',
-      });
-
-      this.registerComponent('outer-component', {
-        ComponentClass: Component.extend({
-          third,
-          actions: {
-            outerSubmit() {
-              actualArgs = [...arguments];
-            },
-          },
-        }),
-        template: `{{inner-component innerSubmit=(action (action "outerSubmit" "${first}") "${second}" this.third)}}`,
-      });
-
-      this.render('{{outer-component}}');
-      expectSendActionDeprecation(() => {
-        runTask(() => innerComponent.sendAction('innerSubmit', fourth));
-      });
-
-      this.assert.deepEqual(
-        actualArgs,
-        [first, second, third, fourth],
-        'action has the correct args'
-      );
-    }
-  }
-);
-
 moduleFor(
   'Components test: send',
   class extends RenderingTestCase {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 70dc35952ab..8198e78d689 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -1500,9 +1500,7 @@ moduleFor(
       let InnerComponent = Component.extend({
         click() {
           innerClickCalled = true;
-          expectDeprecation(() => {
-            this.sendAction();
-          }, /You called (.*).sendAction\((.*)\) but Component#sendAction is deprecated. Please use closure actions instead./);
+          this.action();
         },
       });
 
@@ -1510,7 +1508,7 @@ moduleFor(
         ComponentClass: OuterComponent,
         template: strip`
         {{#middle-component}}
-          {{inner-component action="hey"}}
+          {{inner-component action=(action "hey")}}
         {{/middle-component}}
       `,
       });
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.js b/packages/@ember/-internals/views/lib/mixins/action_support.js
index db831a8aa7e..c8119c1e52b 100644
--- a/packages/@ember/-internals/views/lib/mixins/action_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.js
@@ -3,9 +3,7 @@
 */
 import { inspect } from '@ember/-internals/utils';
 import { Mixin, get } from '@ember/-internals/metal';
-import { assert, deprecate } from '@ember/debug';
-import { MUTABLE_CELL } from '../compat/attrs';
-import { SEND_ACTION } from '@ember/deprecated-features';
+import { assert } from '@ember/debug';
 
 const mixinObj = {
   send(actionName, ...args) {
@@ -36,155 +34,6 @@ const mixinObj = {
   },
 };
 
-if (SEND_ACTION) {
-  /**
-    Calls an action passed to a component.
-
-    For example a component for playing or pausing music may translate click events
-    into action notifications of "play" or "stop" depending on some internal state
-    of the component:
-
-    ```app/components/play-button.js
-    import Component from '@ember/component';
-
-    export default Component.extend({
-      click() {
-        if (this.get('isPlaying')) {
-          this.sendAction('play');
-        } else {
-          this.sendAction('stop');
-        }
-      }
-    });
-    ```
-
-    The actions "play" and "stop" must be passed to this `play-button` component:
-
-    ```handlebars
-    {{! app/templates/application.hbs }}
-    {{play-button play=(action "musicStarted") stop=(action "musicStopped")}}
-    ```
-
-    When the component receives a browser `click` event it translate this
-    interaction into application-specific semantics ("play" or "stop") and
-    calls the specified action.
-
-    ```app/controller/application.js
-    import Controller from '@ember/controller';
-
-    export default Controller.extend({
-      actions: {
-        musicStarted() {
-          // called when the play button is clicked
-          // and the music started playing
-        },
-        musicStopped() {
-          // called when the play button is clicked
-          // and the music stopped playing
-        }
-      }
-    });
-    ```
-
-    If no action is passed to `sendAction` a default name of "action"
-    is assumed.
-
-    ```app/components/next-button.js
-    import Component from '@ember/component';
-
-    export default Component.extend({
-      click() {
-        this.sendAction();
-      }
-    });
-    ```
-
-    ```handlebars
-    {{! app/templates/application.hbs }}
-    {{next-button action=(action "playNextSongInAlbum")}}
-    ```
-
-    ```app/controllers/application.js
-    import Controller from '@ember/controller';
-
-    export default Controller.extend({
-      actions: {
-        playNextSongInAlbum() {
-          ...
-        }
-      }
-    });
-    ```
-
-    @method sendAction
-    @param [action] {String} the action to call
-    @param [params] {*} arguments for the action
-    @public
-    @deprecated
-  */
-  let sendAction = function sendAction(action, ...contexts) {
-    assert(
-      `Attempted to call .sendAction() with the action '${action}' on the destroyed object '${this}'.`,
-      !this.isDestroying && !this.isDestroyed
-    );
-    deprecate(
-      `You called ${inspect(this)}.sendAction(${
-        typeof action === 'string' ? `"${action}"` : ''
-      }) but Component#sendAction is deprecated. Please use closure actions instead.`,
-      false,
-      {
-        id: 'ember-component.send-action',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-        for: 'ember-source',
-        since: {
-          enabled: '3.4.0',
-        },
-      }
-    );
-
-    let actionName;
-
-    // Send the default action
-    if (action === undefined) {
-      action = 'action';
-    }
-    actionName = get(this, `attrs.${action}`) || get(this, action);
-    actionName = validateAction(this, actionName);
-
-    // If no action name for that action could be found, just abort.
-    if (actionName === undefined) {
-      return;
-    }
-
-    if (typeof actionName === 'function') {
-      actionName(...contexts);
-    } else {
-      this.triggerAction({
-        action: actionName,
-        actionContext: contexts,
-      });
-    }
-  };
-
-  let validateAction = function validateAction(component, actionName) {
-    if (actionName && actionName[MUTABLE_CELL]) {
-      actionName = actionName.value;
-    }
-
-    assert(
-      `The default action was triggered on the component ${component.toString()}, but the action name (${actionName}) was not a string.`,
-      actionName === null ||
-        actionName === undefined ||
-        typeof actionName === 'string' ||
-        typeof actionName === 'function'
-    );
-    return actionName;
-  };
-
-  mixinObj.sendAction = sendAction;
-}
-
 /**
  @class ActionSupport
  @namespace Ember
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
index ef78f4ec7a5..e72590c6cb6 100644
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/text_support.js
@@ -5,7 +5,6 @@
 import { get, set, Mixin } from '@ember/-internals/metal';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { deprecate } from '@ember/debug';
-import { SEND_ACTION } from '@ember/deprecated-features';
 import { MUTABLE_CELL } from '@ember/-internals/views';
 import { DEBUG } from '@glimmer/env';
 
@@ -327,24 +326,7 @@ function sendAction(eventName, view, event) {
 
   let value = get(view, 'value');
 
-  if (SEND_ACTION && typeof action === 'string') {
-    let message = `Passing actions to components as strings (like \`<Input @${eventName}="${action}" />\`) is deprecated. Please use closure actions instead (\`<Input @${eventName}={{action "${action}"}} />\`).`;
-
-    deprecate(message, false, {
-      id: 'ember-component.send-action',
-      until: '4.0.0',
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-      for: 'ember-source',
-      since: {
-        enabled: '3.4.0',
-      },
-    });
-
-    view.triggerAction({
-      action: action,
-      actionContext: [value, event],
-    });
-  } else if (typeof action === 'function') {
+  if (typeof action === 'function') {
     action(value, event);
   }
 
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 354f3956f66..2da36f33344 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -3,7 +3,6 @@
 // These versions should be the version that the deprecation was _introduced_,
 // not the version that the feature will be removed.
 
-export const SEND_ACTION = !!'3.4.0';
 export const ROUTER_EVENTS = !!'4.0.0';
 export const COMPONENT_MANAGER_STRING_LOOKUP = !!'3.8.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
diff --git a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts b/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
deleted file mode 100644
index 5d72fb778bd..00000000000
--- a/packages/ember-template-compiler/lib/plugins/deprecate-send-action.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { deprecate } from '@ember/debug';
-import { SEND_ACTION } from '@ember/deprecated-features';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-import { isPath } from './utils';
-
-const EVENTS = [
-  'insert-newline',
-  'enter',
-  'escape-press',
-  'focus-in',
-  'focus-out',
-  'key-press',
-  'key-up',
-  'key-down',
-];
-
-export default function deprecateSendAction(env: EmberASTPluginEnvironment): ASTPlugin {
-  if (SEND_ACTION) {
-    let moduleName = env.meta?.moduleName;
-
-    let deprecationMessage = (node: AST.Node, eventName: string, actionName: string) => {
-      let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-
-      if (node.type === 'ElementNode') {
-        return `Passing actions to components as strings (like \`<Input @${eventName}="${actionName}" />\`) is deprecated. Please use closure actions instead (\`<Input @${eventName}={{action "${actionName}"}} />\`). ${sourceInformation}`;
-      } else {
-        return `Passing actions to components as strings (like \`{{input ${eventName}="${actionName}"}}\`) is deprecated. Please use closure actions instead (\`{{input ${eventName}=(action "${actionName}")}}\`). ${sourceInformation}`;
-      }
-    };
-
-    return {
-      name: 'deprecate-send-action',
-
-      visitor: {
-        ElementNode(node: AST.ElementNode) {
-          if (node.tag !== 'Input') {
-            return;
-          }
-
-          node.attributes.forEach(({ name, value }) => {
-            if (name.charAt(0) === '@') {
-              let eventName = name.substring(1);
-
-              if (EVENTS.indexOf(eventName) > -1) {
-                if (value.type === 'TextNode') {
-                  deprecate(deprecationMessage(node, eventName, value.chars), false, {
-                    id: 'ember-component.send-action',
-                    until: '4.0.0',
-                    url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-                    for: 'ember-source',
-                    since: {
-                      enabled: '3.4.0',
-                    },
-                  });
-                } else if (
-                  value.type === 'MustacheStatement' &&
-                  value.path.type === 'StringLiteral'
-                ) {
-                  deprecate(deprecationMessage(node, eventName, value.path.original), false, {
-                    id: 'ember-component.send-action',
-                    until: '4.0.0',
-                    url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-                    for: 'ember-source',
-                    since: {
-                      enabled: '3.4.0',
-                    },
-                  });
-                }
-              }
-            }
-          });
-        },
-
-        MustacheStatement(node: AST.MustacheStatement) {
-          if (!isPath(node.path) || node.path.original !== 'input') {
-            return;
-          }
-
-          node.hash.pairs.forEach((pair) => {
-            if (EVENTS.indexOf(pair.key) > -1 && pair.value.type === 'StringLiteral') {
-              deprecate(deprecationMessage(node, pair.key, pair.value.original), false, {
-                id: 'ember-component.send-action',
-                until: '4.0.0',
-                url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-send-action',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.4.0',
-                },
-              });
-            }
-          });
-        },
-      },
-    };
-  }
-
-  return {
-    name: 'deprecate-send-action',
-    visitor: {},
-  };
-}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 525bea17e25..7d610b69e96 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -3,7 +3,6 @@ import AssertAgainstNamedBlocks from './assert-against-named-blocks';
 import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
-import DeprecateSendAction from './deprecate-send-action';
 import TransformActionSyntax from './transform-action-syntax';
 import TransformAttrsIntoArgs from './transform-attrs-into-args';
 import TransformEachInIntoEach from './transform-each-in-into-each';
@@ -17,7 +16,6 @@ import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
 import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS, EMBER_NAMED_BLOCKS } from '@ember/canary-features';
-import { SEND_ACTION } from '@ember/deprecated-features';
 
 // order of plugins is important
 export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
@@ -35,7 +33,6 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
-    SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
       ? TransformResolutions
@@ -53,7 +50,6 @@ export const STRICT_MODE_TRANSFORMS = Object.freeze(
     AssertSplattributeExpressions,
     TransformEachTrackArray,
     TransformWrapMountAndOutlet,
-    SEND_ACTION ? DeprecateSendAction : null,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
   ].filter(notNull)
diff --git a/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js b/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js
deleted file mode 100644
index e5276727e14..00000000000
--- a/packages/ember-template-compiler/tests/plugins/deprecate-send-action-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { compile } from '../../index';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-const EVENTS = [
-  'insert-newline',
-  'enter',
-  'escape-press',
-  'focus-in',
-  'focus-out',
-  'key-press',
-  'key-up',
-  'key-down',
-];
-
-class DeprecateSendActionTest extends AbstractTestCase {}
-
-EVENTS.forEach(function (e) {
-  DeprecateSendActionTest.prototype[
-    `@test Using \`{{input ${e}="actionName"}}\` provides a deprecation`
-  ] = function () {
-    let expectedMessage = `Passing actions to components as strings (like \`{{input ${e}="foo-bar"}}\`) is deprecated. Please use closure actions instead (\`{{input ${e}=(action "foo-bar")}}\`). ('baz/foo-bar' @ L1:C0) `;
-
-    expectDeprecation(() => {
-      compile(`{{input ${e}="foo-bar"}}`, { moduleName: 'baz/foo-bar' });
-    }, expectedMessage);
-  };
-});
-
-moduleFor('ember-template-compiler: deprecate-send-action', DeprecateSendActionTest);
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 354287d995e..bbb206e2807 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -510,7 +510,6 @@ module.exports = {
     'schedule',
     'scheduleOnce',
     'send',
-    'sendAction',
     'sendEvent',
     'serialize',
     'serializeQueryParam',

From 8547049f81ec0f0928bc5786e9687f86f0f54f1a Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 20:23:36 -0400
Subject: [PATCH 0579/1405] Remove renderTemplate, disconnectOutlet, render

Removing these features also effectively removes support for named
outlets.
---
 .../-internals/glimmer/lib/syntax/outlet.ts   |   22 -
 .../application/debug-render-tree-test.ts     |  112 --
 .../integration/application/rendering-test.js |  180 ---
 .../-internals/routing/lib/system/route.ts    |  321 +----
 .../ember-testing/tests/acceptance_test.js    |   37 +-
 .../tests/routing/decoupled_basic_test.js     |    4 +-
 .../ember/tests/routing/model_loading_test.js |   55 -
 .../tests/routing/template_rendering_test.js  | 1228 +----------------
 tests/docs/expected.js                        |    3 -
 9 files changed, 37 insertions(+), 1925 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 166fde44465..6a8b96a050e 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -33,28 +33,6 @@ import { OutletState } from '../utils/outlet';
   <MyFooter />
   ```
 
-  You may also specify a name for the `{{outlet}}`, which is useful when using more than one
-  `{{outlet}}` in a template:
-
-  ```app/templates/application.hbs
-  {{outlet "menu"}}
-  {{outlet "sidebar"}}
-  {{outlet "main"}}
-  ```
-
-  Your routes can then render into a specific one of these `outlet`s by specifying the `outlet`
-  attribute in your `renderTemplate` function:
-
-  ```app/routes/menu.js
-  import Route from '@ember/routing/route';
-
-  export default class MenuRoute extends Route {
-    renderTemplate() {
-      this.render({ outlet: 'menu' });
-    }
-  }
-  ```
-
   See the [routing guide](https://guides.emberjs.com/release/routing/rendering-a-template/) for more
   information on how your `route` interacts with the `{{outlet}}` helper.
   Note: Your content __will not render__ if there isn't an `{{outlet}}` for it.
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 85f9683711c..c376688c0ca 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1,6 +1,5 @@
 import {
   ApplicationTestCase,
-  expectDeprecation,
   ModuleBasedTestResolver,
   moduleFor,
   strip,
@@ -180,117 +179,6 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
       }
 
-      async '@test named outlets'() {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        this.addTemplate(
-          'application',
-          strip`
-            <div id="header">{{outlet "header"}}</div>
-            {{outlet}}
-          `
-        );
-        this.addTemplate('header', 'header');
-        this.addTemplate('index', 'index');
-
-        this.add(
-          'controller:index',
-          class extends Controller {
-            queryParams = ['showHeader'];
-            showHeader = false;
-          }
-        );
-
-        interface Model {
-          showHeader: boolean;
-        }
-
-        this.add(
-          'route:index',
-          class extends Route {
-            queryParams = {
-              showHeader: {
-                refreshModel: true,
-              },
-            };
-
-            model({ showHeader }: Model): Model {
-              return { showHeader };
-            }
-
-            setupController(controller: Controller, { showHeader }: Model): void {
-              controller.setProperties({ showHeader });
-            }
-
-            renderTemplate(_: Controller, { showHeader }: Model): void {
-              expectDeprecation(() => this.render(), /Usage of `render` is deprecated/);
-
-              if (showHeader) {
-                expectDeprecation(
-                  () => this.render('header', { outlet: 'header' }),
-                  /Usage of `render` is deprecated/
-                );
-              } else {
-                expectDeprecation(
-                  () => this.disconnectOutlet('header'),
-                  'The usage of `disconnectOutlet` is deprecated.'
-                );
-              }
-            }
-          }
-        );
-
-        await this.visit('/');
-
-        this.assertRenderTree([
-          this.outlet({
-            type: 'route-template',
-            name: 'index',
-            args: { positional: [], named: { model: { showHeader: false } } },
-            instance: this.controllerFor('index'),
-            template: 'my-app/templates/index.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
-            children: [],
-          }),
-        ]);
-
-        await this.visit('/?showHeader');
-
-        this.assertRenderTree([
-          this.outlet('header', {
-            type: 'route-template',
-            name: 'header',
-            args: { positional: [], named: { model: { showHeader: true } } },
-            instance: this.controllerFor('index'),
-            template: 'my-app/templates/header.hbs',
-            bounds: this.elementBounds(this.element.firstChild),
-            children: [],
-          }),
-          this.outlet({
-            type: 'route-template',
-            name: 'index',
-            args: { positional: [], named: { model: { showHeader: true } } },
-            instance: this.controllerFor('index'),
-            template: 'my-app/templates/index.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
-            children: [],
-          }),
-        ]);
-
-        await this.visit('/');
-
-        this.assertRenderTree([
-          this.outlet({
-            type: 'route-template',
-            name: 'index',
-            args: { positional: [], named: { model: { showHeader: false } } },
-            instance: this.controllerFor('index'),
-            template: 'my-app/templates/index.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
-            children: [],
-          }),
-        ]);
-      }
-
       async '@test {{mount}}'() {
         this.addTemplate(
           'application',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index ec4ff535dbb..ba43210274c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -439,78 +439,6 @@ moduleFor(
       });
     }
 
-    ['@test it can render into named outlets']() {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.router.map(function () {
-        this.route('colors');
-      });
-
-      this.addTemplate(
-        'application',
-        strip`
-        <nav>{{outlet "nav"}}</nav>
-        <main>{{outlet}}</main>
-        `
-      );
-
-      this.addTemplate(
-        'nav',
-        strip`
-        <a href="https://emberjs.com/">Ember</a>
-        `
-      );
-
-      this.add(
-        'route:application',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render();
-              this.render('nav', {
-                into: 'application',
-                outlet: 'nav',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      this.add(
-        'route:colors',
-        Route.extend({
-          model() {
-            return ['red', 'yellow', 'blue'];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'colors',
-        strip`
-        <ul>
-          {{#each @model as |item|}}
-            <li>{{item}}</li>
-          {{/each}}
-        </ul>
-        `
-      );
-
-      return this.visit('/colors').then(() => {
-        this.assertInnerHTML(strip`
-          <nav>
-            <a href="https://emberjs.com/">Ember</a>
-          </nav>
-          <main>
-            <ul>
-              <li>red</li>
-              <li>yellow</li>
-              <li>blue</li>
-            </ul>
-          </main>
-        `);
-      });
-    }
-
     ['@test it should update the outlets when switching between routes']() {
       this.router.map(function () {
         this.route('a');
@@ -601,114 +529,6 @@ moduleFor(
         .then(() => this.assertText('b'));
     }
 
-    ['@test it should update correctly when the controller changes']() {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.router.map(function () {
-        this.route('color', { path: '/colors/:color' });
-      });
-
-      this.add(
-        'route:color',
-        Route.extend({
-          model(params) {
-            return { color: params.color };
-          },
-
-          renderTemplate(controller, model) {
-            expectDeprecation(
-              () => this.render({ controller: model.color, model }),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-
-      this.add(
-        'controller:red',
-        Controller.extend({
-          color: 'red',
-        })
-      );
-
-      this.add(
-        'controller:green',
-        Controller.extend({
-          color: 'green',
-        })
-      );
-
-      this.addTemplate('color', 'model color: {{@model.color}}, controller color: {{this.color}}');
-
-      return this.visit('/colors/red')
-        .then(() => {
-          this.assertInnerHTML('model color: red, controller color: red');
-          return this.visit('/colors/green');
-        })
-        .then(() => {
-          this.assertInnerHTML('model color: green, controller color: green');
-        });
-    }
-
-    ['@test it should produce a stable DOM when two routes render the same template']() {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.router.map(function () {
-        this.route('a');
-        this.route('b');
-      });
-
-      this.add(
-        'route:a',
-        Route.extend({
-          model() {
-            return 'A';
-          },
-
-          renderTemplate(controller, model) {
-            expectDeprecation(
-              () => this.render('common', { controller: 'common', model }),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-
-      this.add(
-        'route:b',
-        Route.extend({
-          model() {
-            return 'B';
-          },
-
-          renderTemplate(controller, model) {
-            expectDeprecation(
-              () => this.render('common', { controller: 'common', model }),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-
-      this.add(
-        'controller:common',
-        Controller.extend({
-          prefix: 'common',
-        })
-      );
-
-      this.addTemplate('common', '{{this.prefix}} {{@model}}');
-
-      return this.visit('/a')
-        .then(() => {
-          this.assertInnerHTML('common A');
-          this.takeSnapshot();
-          return this.visit('/b');
-        })
-        .then(() => {
-          this.assertInnerHTML('common B');
-          this.assertInvariants();
-        });
-    }
-
     // Regression test, glimmer child outlets tried to assume the first element.
     // but the if put-args clobbered the args used by did-create-element.
     // I wish there was a way to assert that the OutletComponentManager did not
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 3b4aeb58992..52f243340dc 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1137,20 +1137,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     this.setupController(controller, context, transition);
 
     if (this._environment.options.shouldRender) {
-      deprecate(
-        'Usage of `renderTemplate` is deprecated.',
-        this.renderTemplate === Route.prototype.renderTemplate,
-        {
-          id: 'route-render-template',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-        }
-      );
-      this.renderTemplate(controller, context);
+      this[RENDER]();
     }
 
     // Setup can cause changes to QPs which need to be propogated immediately in
@@ -1657,312 +1644,6 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     once(this._router, '_setOutlets');
   }
 
-  /**
-    A hook you can use to render the template for the current route.
-
-    This method is called with the controller for the current route and the
-    model supplied by the `model` hook. By default, it renders the route's
-    template, configured with the controller for the route.
-
-    This method can be overridden to set up and render additional or
-    alternative templates.
-
-    ```app/routes/posts.js
-    import Route from '@ember/routing/route';
-
-    export default class PostsRoute extends Route {
-      renderTemplate(controller, model) {
-        let favController = this.controllerFor('favoritePost');
-
-        // Render the `favoritePost` template into
-        // the outlet `posts`, and display the `favoritePost`
-        // controller.
-        this.render('favoritePost', {
-          outlet: 'posts',
-          controller: favController
-        });
-      }
-    }
-    ```
-
-    @method renderTemplate
-    @param {Object} controller the route's controller
-    @param {Object} model the route's model
-    @since 1.0.0
-    @public
-  */
-  renderTemplate(_controller: any, _model: {}) {
-    // eslint-disable-line no-unused-vars
-    this[RENDER]();
-  }
-
-  /**
-    `render` is used to render a template into a region of another template
-    (indicated by an `{{outlet}}`). `render` is used both during the entry
-    phase of routing (via the `renderTemplate` hook) and later in response to
-    user interaction.
-
-    For example, given the following minimal router and templates:
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('photos');
-    });
-
-    export default Router;
-    ```
-
-    ```handlebars
-    <!-- application.hbs -->
-    <div class='something-in-the-app-hbs'>
-      {{outlet "anOutletName"}}
-    </div>
-    ```
-
-    ```handlebars
-    <!-- photos.hbs -->
-    <h1>Photos</h1>
-    ```
-
-    You can render `photos.hbs` into the `"anOutletName"` outlet of
-    `application.hbs` by calling `render`:
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class PostRoute extends Route {
-      renderTemplate() {
-        this.render('photos', {
-          into: 'application',
-          outlet: 'anOutletName'
-        })
-      }
-    }
-    ```
-
-    `render` additionally allows you to supply which `controller` and
-    `model` objects should be loaded and associated with the rendered template.
-
-    ```app/routes/posts.js
-    import Route from '@ember/routing/route';
-
-    export default class PostsRoute extends Route {
-      renderTemplate(controller, model) {
-        this.render('posts', {    // the template to render, referenced by name
-          into: 'application',    // the template to render into, referenced by name
-          outlet: 'anOutletName', // the outlet inside `options.into` to render into.
-          controller: 'someControllerName', // the controller to use for this template, referenced by name
-          model: model            // the model to set on `options.controller`.
-        })
-      }
-    }
-    ```
-
-    The string values provided for the template name, and controller
-    will eventually pass through to the resolver for lookup. See
-    Resolver for how these are mapped to JavaScript objects in your
-    application. The template to render into needs to be related to  either the
-    current route or one of its ancestors.
-
-    Not all options need to be passed to `render`. Default values will be used
-    based on the name of the route specified in the router or the Route's
-    `controllerName` and `templateName` properties.
-
-    For example:
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('index');
-      this.route('post', { path: '/posts/:post_id' });
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class PostRoute extends Route {
-      renderTemplate() {
-        this.render(); // all defaults apply
-      }
-    }
-    ```
-
-    The name of the route, defined by the router, is `post`.
-
-    The following equivalent default options will be applied when
-    the Route calls `render`:
-
-    ```javascript
-    this.render('post', {  // the template name associated with 'post' Route
-      into: 'application', // the parent route to 'post' Route
-      outlet: 'main',      // {{outlet}} and {{outlet 'main'}} are synonymous,
-      controller: 'post',  // the controller associated with the 'post' Route
-    })
-    ```
-
-    By default the controller's `model` will be the route's model, so it does not
-    need to be passed unless you wish to change which model is being used.
-
-    @method render
-    @param {String} name the name of the template to render
-    @param {Object} [options] the options
-    @param {String} [options.into] the template to render into,
-                    referenced by name. Defaults to the parent template
-    @param {String} [options.outlet] the outlet inside `options.into` to render into.
-                    Defaults to 'main'
-    @param {String|Object} [options.controller] the controller to use for this template,
-                    referenced by name or as a controller instance. Defaults to the Route's paired controller
-    @param {Object} [options.model] the model object to set on `options.controller`.
-                    Defaults to the return value of the Route's model hook
-    @since 1.0.0
-    @public
-  */
-  render(name?: string, options?: PartialRenderOptions) {
-    deprecate(`Usage of \`render\` is deprecated. Route: \`${this.routeName}\``, false, {
-      id: 'route-render-template',
-      until: '4.0.0',
-      url: 'https://deprecations.emberjs.com/v3.x/#toc_route-render-template',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-    });
-    this[RENDER](name, options);
-  }
-
-  /**
-    Disconnects a view that has been rendered into an outlet.
-
-    You may pass any or all of the following options to `disconnectOutlet`:
-
-    * `outlet`: the name of the outlet to clear (default: 'main')
-    * `parentView`: the name of the view containing the outlet to clear
-       (default: the view rendered by the parent route)
-
-    Example:
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      showModal(evt) {
-        this.render(evt.modalName, {
-          outlet: 'modal',
-          into: 'application'
-        });
-      }
-
-      @action
-      hideModal() {
-        this.disconnectOutlet({
-          outlet: 'modal',
-          parentView: 'application'
-        });
-      }
-    }
-    ```
-
-    Alternatively, you can pass the `outlet` name directly as a string.
-
-    Example:
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      showModal(evt) {
-        // ...
-      }
-
-      @action
-      hideModal(evt) {
-        this.disconnectOutlet('modal');
-      }
-    }
-    ```
-
-    @method disconnectOutlet
-    @param {Object|String} options the options hash or outlet name
-    @since 1.0.0
-    @public
-  */
-  disconnectOutlet(options: string | { outlet: string; parentView?: string }) {
-    deprecate('The usage of `disconnectOutlet` is deprecated.', false, {
-      id: 'route-disconnect-outlet',
-      until: '4.0.0',
-      url: 'https://deprecations.emberjs.com/v3.x/#toc_route-disconnect-outlet',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-    });
-    let outletName;
-    let parentView;
-    if (options) {
-      if (typeof options === 'string') {
-        outletName = options;
-      } else {
-        outletName = options.outlet;
-        parentView = options.parentView ? options.parentView.replace(/\//g, '.') : undefined;
-
-        assert(
-          'You passed undefined as the outlet name.',
-          !('outlet' in options && options.outlet === undefined)
-        );
-      }
-    }
-
-    outletName = outletName || 'main';
-    this._disconnectOutlet(outletName, parentView);
-    let routeInfos = this._router._routerMicrolib.currentRouteInfos!;
-    for (let i = 0; i < routeInfos.length; i++) {
-      // This non-local state munging is sadly necessary to maintain
-      // backward compatibility with our existing semantics, which allow
-      // any route to disconnectOutlet things originally rendered by any
-      // other route. This should all get cut in 2.0.
-      routeInfos[i].route!._disconnectOutlet(outletName, parentView);
-    }
-  }
-
-  _disconnectOutlet(outletName: string, parentView: string | undefined) {
-    let parent = parentRoute(this) as any;
-    if (parent && parentView === parent.routeName) {
-      parentView = undefined;
-    }
-    let connections = ROUTE_CONNECTIONS.get(this);
-    for (let i = 0; i < connections.length; i++) {
-      let connection = connections[i];
-      if (connection.outlet === outletName && connection.into === parentView) {
-        // This neuters the disconnected outlet such that it doesn't
-        // render anything, but it leaves an entry in the outlet
-        // hierarchy so that any existing other renders that target it
-        // don't suddenly blow up. They will still stick themselves
-        // into its outlets, which won't render anywhere. All of this
-        // statefulness should get the machete in 2.0.
-        connections[i] = {
-          owner: connection.owner,
-          into: connection.into,
-          outlet: connection.outlet,
-          name: connection.name,
-          controller: undefined,
-          template: undefined,
-          model: undefined,
-        };
-        once(this._router, '_setOutlets');
-      }
-    }
-  }
-
   willDestroy() {
     this.teardownViews();
   }
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
index c58f7ecac6a..c8d5f8bb171 100644
--- a/packages/ember-testing/tests/acceptance_test.js
+++ b/packages/ember-testing/tests/acceptance_test.js
@@ -50,7 +50,7 @@ if (!jQueryDisabled) {
           this.add(
             'route:posts',
             Route.extend({
-              renderTemplate() {
+              setupController() {
                 testContext.currentRoute = 'posts';
                 this._super(...arguments);
               },
@@ -72,7 +72,7 @@ if (!jQueryDisabled) {
           this.add(
             'route:comments',
             Route.extend({
-              renderTemplate() {
+              setupController() {
                 testContext.currentRoute = 'comments';
                 this._super(...arguments);
               },
@@ -125,8 +125,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers can be chained with then`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(7);
+        assert.expect(6);
 
         window
           .visit('/posts')
@@ -165,8 +164,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers can be chained to each other (legacy)`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(8);
+        assert.expect(7);
 
         window
           .visit('/posts')
@@ -194,8 +192,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test helpers don't need to be chained`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(6);
+        assert.expect(5);
 
         window.visit('/posts');
 
@@ -222,8 +219,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Nested async helpers`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(6);
+        assert.expect(5);
 
         window.visit('/posts');
 
@@ -251,8 +247,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Multiple nested async helpers`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(4);
+        assert.expect(3);
 
         window.visit('/posts');
 
@@ -275,8 +270,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Helpers nested in thens`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(6);
+        assert.expect(5);
 
         window.visit('/posts').then(() => {
           window.click('a:first', '#comments-link');
@@ -317,8 +311,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test Unhandled exceptions are logged via Ember.Test.adapter#exception`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(3);
+        assert.expect(2);
 
         console.error = () => {}; // eslint-disable-line no-console
         let asyncHandled;
@@ -350,8 +343,7 @@ if (!jQueryDisabled) {
       [`@test Unhandled exceptions in 'andThen' are logged via Ember.Test.adapter#exception`](
         assert
       ) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(2);
+        assert.expect(1);
 
         console.error = () => {}; // eslint-disable-line no-console
         Test.adapter = QUnitAdapter.create({
@@ -372,8 +364,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test should not start routing on the root URL when visiting another`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(5);
+        assert.expect(4);
 
         window.visit('/posts');
 
@@ -436,8 +427,7 @@ if (!jQueryDisabled) {
       }
 
       [`@test visiting a URL that causes another transition should yield the correct URL`](assert) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(3);
+        assert.expect(2);
 
         window.visit('/redirect');
 
@@ -449,8 +439,7 @@ if (!jQueryDisabled) {
       [`@test visiting a URL and then visiting a second URL with a transition should yield the correct URL`](
         assert
       ) {
-        expectDeprecation('Usage of `renderTemplate` is deprecated.');
-        assert.expect(4);
+        assert.expect(3);
 
         window.visit('/posts');
 
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 9851ff0ccf5..33d1bb89897 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -919,7 +919,6 @@ moduleFor(
     }
 
     ['@test Router accounts for rootURL on page load when using history location'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       let rootURL = window.location.pathname + '/app';
       let postsTemplateRendered = false;
       let setHistory;
@@ -962,8 +961,9 @@ moduleFor(
         'route:posts',
         Route.extend({
           model() {},
-          renderTemplate() {
+          setupController() {
             postsTemplateRendered = true;
+            this._super(...arguments);
           },
         })
       );
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 0f71d5c5fe1..afced00f49c 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -203,53 +203,6 @@ moduleFor(
       });
     }
 
-    [`@test The route controller specified via controllerName is used in render`](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-      });
-
-      this.add(
-        'route:home',
-        Route.extend({
-          controllerName: 'myController',
-          renderTemplate() {
-            expectDeprecation(
-              () => this.render('alternative_home'),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-
-      this.add(
-        'controller:myController',
-        Controller.extend({
-          myValue: 'foo',
-        })
-      );
-
-      this.addTemplate('alternative_home', '<p>alternative home: {{this.myValue}}</p>');
-
-      return this.visit('/').then(() => {
-        let homeRoute = this.applicationInstance.lookup('route:home');
-        let myController = this.applicationInstance.lookup('controller:myController');
-        let text = this.$('p').text();
-
-        assert.equal(
-          homeRoute.controller,
-          myController,
-          'route controller is set by controllerName'
-        );
-
-        assert.equal(
-          text,
-          'alternative home: foo',
-          'The homepage template was rendered with data from the custom controller'
-        );
-      });
-    }
-
     [`@test The route controller specified via controllerName is used in render even when a controller with the routeName is available`](
       assert
     ) {
@@ -488,9 +441,7 @@ moduleFor(
     }
 
     ['@test Nested callbacks are not exited when moving to siblings'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
       let rootSetup = 0;
-      let rootRender = 0;
       let rootModel = 0;
       let rootSerialize = 0;
       let menuItem;
@@ -525,10 +476,6 @@ moduleFor(
             rootSetup++;
           },
 
-          renderTemplate() {
-            rootRender++;
-          },
-
           serialize() {
             rootSerialize++;
             return this._super(...arguments);
@@ -563,7 +510,6 @@ moduleFor(
           'The app is now in the initial state'
         );
         assert.equal(rootSetup, 1, 'The root setup was triggered');
-        assert.equal(rootRender, 1, 'The root render was triggered');
         assert.equal(rootSerialize, 0, 'The root serialize was not called');
         assert.equal(rootModel, 1, 'The root model was called');
 
@@ -572,7 +518,6 @@ moduleFor(
 
         return router.transitionTo('special', menuItem).then(function () {
           assert.equal(rootSetup, 1, 'The root setup was not triggered again');
-          assert.equal(rootRender, 1, 'The root render was not triggered again');
           assert.equal(rootSerialize, 0, 'The root serialize was not called');
 
           // TODO: Should this be changed?
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index f33f0c72dfc..842eb0e5540 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -2,7 +2,7 @@
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import { moduleFor, ApplicationTestCase, getTextOf, runTask } from 'internal-test-helpers';
+import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';
 
@@ -70,182 +70,6 @@ moduleFor(
       await assert.rejects(this.visit('/what-is-this-i-dont-even'), /\/what-is-this-i-dont-even/);
     }
 
-    [`@test The Homepage with explicit template name in renderTemplate`](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let text = this.$('#troll').text();
-        assert.equal(text, 'Megatroll', 'the homepage template was rendered');
-      });
-    }
-
-    async [`@test an alternate template will pull in an alternate controller`](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
-          },
-        })
-      );
-      this.add(
-        'controller:homepage',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.name = 'Comes from homepage';
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      assert.equal(this.$('p').text(), 'Comes from homepage', 'the homepage template was rendered');
-    }
-
-    async [`@test An alternate template will pull in an alternate controller instead of controllerName`](
-      assert
-    ) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.add(
-        'route:home',
-        Route.extend({
-          controllerName: 'foo',
-          renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
-          },
-        })
-      );
-      this.add(
-        'controller:foo',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.name = 'Comes from foo';
-          },
-        })
-      );
-      this.add(
-        'controller:homepage',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.name = 'Comes from homepage';
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      assert.equal(this.$('p').text(), 'Comes from homepage', 'the homepage template was rendered');
-    }
-
-    async [`@test The template will pull in an alternate controller via key/value`](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.router.map(function () {
-        this.route('homepage', { path: '/' });
-      });
-
-      this.add(
-        'route:homepage',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(
-              () => this.render({ controller: 'home' }),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-      this.add(
-        'controller:home',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.name = 'Comes from home.';
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      assert.equal(
-        this.$('p').text(),
-        'Comes from home.',
-        'the homepage template was rendered from data from the HomeController'
-      );
-    }
-
-    async [`@test The Homepage with explicit template name in renderTemplate and controller`](
-      assert
-    ) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.add(
-        'controller:home',
-        Controller.extend({
-          init() {
-            this._super(...arguments);
-            this.name = 'YES I AM HOME';
-          },
-        })
-      );
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => this.render('homepage'), /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      assert.equal(this.$('p').text(), 'YES I AM HOME', 'The homepage template was rendered');
-    }
-
-    async [`@test Model passed via renderTemplate model is set as controller's model`](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate(
-        'bio',
-        '<p>Model: {{@model.name}}</p><p>Controller: {{this.model.name}}</p>'
-      );
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render('bio', {
-                model: { name: 'emberjs' },
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      await this.visit('/');
-
-      let text = this.$('p').text();
-
-      assert.ok(
-        text.indexOf('Model: emberjs') > -1,
-        'Passed model was available as the `@model` argument'
-      );
-
-      assert.ok(
-        text.indexOf('Controller: emberjs') > -1,
-        "Passed model was set as controller's `model` property"
-      );
-    }
-
     ['@test render uses templateName from route'](assert) {
       this.addTemplate('the_real_home_template', '<p>THIS IS THE REAL HOME</p>');
       this.add(
@@ -262,65 +86,8 @@ moduleFor(
       });
     }
 
-    ['@test defining templateName allows other templates to be rendered'](assert) {
-      this.addTemplate('alert', `<div class='alert-box'>Invader!</div>`);
-      this.addTemplate('the_real_home_template', `<p>THIS IS THE REAL HOME</p>{{outlet 'alert'}}`);
-      this.add(
-        'route:home',
-        Route.extend({
-          templateName: 'the_real_home_template',
-          actions: {
-            showAlert() {
-              expectDeprecation(() => {
-                this.render('alert', {
-                  into: 'home',
-                  outlet: 'alert',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-          },
-        })
-      );
-
-      return this.visit('/')
-        .then(() => {
-          let text = this.$('p').text();
-          assert.equal(text, 'THIS IS THE REAL HOME', 'the homepage template was rendered');
-
-          return runTask(() => this.appRouter.send('showAlert'));
-        })
-        .then(() => {
-          let text = this.$('.alert-box').text();
-
-          assert.equal(text, 'Invader!', 'Template for alert was rendered into the outlet');
-        });
-    }
-
-    ['@test templateName is still used when calling render with no name and options'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('alert', `<div class='alert-box'>Invader!</div>`);
-      this.addTemplate('home', `<p>THIS IS THE REAL HOME</p>{{outlet 'alert'}}`);
-
-      this.add(
-        'route:home',
-        Route.extend({
-          templateName: 'alert',
-          renderTemplate() {
-            expectDeprecation(() => this.render({}), /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let text = this.$('.alert-box').text();
-
-        assert.equal(text, 'Invader!', 'default templateName was rendered into outlet');
-      });
-    }
-
     ['@test Generated names can be customized when providing routes with dot notation'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      assert.expect(5);
+      assert.expect(4);
 
       this.addTemplate('index', '<div>Index</div>');
       this.addTemplate('application', "<h1>Home</h1><div class='main'>{{outlet}}</div>");
@@ -339,7 +106,7 @@ moduleFor(
       this.add(
         'route:foo',
         Route.extend({
-          renderTemplate() {
+          setupController() {
             assert.ok(true, 'FooBarRoute was called');
             return this._super(...arguments);
           },
@@ -349,7 +116,7 @@ moduleFor(
       this.add(
         'route:bar.baz',
         Route.extend({
-          renderTemplate() {
+          setupController() {
             assert.ok(true, 'BarBazRoute was called');
             return this._super(...arguments);
           },
@@ -407,123 +174,6 @@ moduleFor(
       });
     }
 
-    ['@test Child routes render into specified template'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('index', '<div>Index</div>');
-      this.addTemplate('application', "<h1>Home</h1><div class='main'>{{outlet}}</div>");
-      this.addTemplate('top', "<div class='middle'>{{outlet}}</div>");
-      this.addTemplate('middle', "<div class='bottom'>{{outlet}}</div>");
-      this.addTemplate('middle.bottom', '<p>Bottom!</p>');
-
-      this.router.map(function () {
-        this.route('top', function () {
-          this.route('middle', { resetNamespace: true }, function () {
-            this.route('bottom');
-          });
-        });
-      });
-
-      this.add(
-        'route:middle.bottom',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(
-              () => this.render('middle/bottom', { into: 'top' }),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-
-      return this.visit('/top/middle/bottom').then(() => {
-        assert.ok(true, '/top/middle/bottom has been handled');
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(
-          rootElement.querySelectorAll('.main .middle .bottom p').length,
-          0,
-          'should not render into the middle template'
-        );
-        assert.equal(
-          getTextOf(rootElement.querySelector('.main .middle > p')),
-          'Bottom!',
-          'The template was rendered into the top template'
-        );
-      });
-    }
-
-    ['@test Rendering into specified template with slash notation'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('person.profile', 'profile {{outlet}}');
-      this.addTemplate('person.details', 'details!');
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-      });
-
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render('person/profile');
-              this.render('person/details', { into: 'person/profile' });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(
-          rootElement.textContent.trim(),
-          'profile details!',
-          'The templates were rendered'
-        );
-      });
-    }
-
-    ['@test Only use route rendered into main outlet for default into property on child'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', "{{outlet 'menu'}}{{outlet}}");
-      this.addTemplate('posts', '{{outlet}}');
-      this.addTemplate('posts.index', '<p class="posts-index">postsIndex</p>');
-      this.addTemplate('posts.menu', '<div class="posts-menu">postsMenu</div>');
-
-      this.router.map(function () {
-        this.route('posts', function () {});
-      });
-
-      this.add(
-        'route:posts',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render();
-              this.render('posts/menu', {
-                into: 'application',
-                outlet: 'menu',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      return this.visit('/posts').then(() => {
-        assert.ok(true, '/posts has been handled');
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(
-          getTextOf(rootElement.querySelector('div.posts-menu')),
-          'postsMenu',
-          'The posts/menu template was rendered'
-        );
-        assert.equal(
-          getTextOf(rootElement.querySelector('p.posts-index')),
-          'postsIndex',
-          'The posts/index template was rendered'
-        );
-      });
-    }
-
     ['@test Application template does not duplicate when re-rendered'](assert) {
       this.addTemplate('application', '<h3 class="render-once">I render once</h3>{{outlet}}');
 
@@ -622,830 +272,33 @@ moduleFor(
       assert.equal(insertionCount, 1, 'view should still have inserted only once');
     }
 
-    ['@test The template is not re-rendered when two routes present the exact same template & controller'](
-      assert
-    ) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
+    ['@test {{outlet}} works when created after initial render'](assert) {
+      this.addTemplate('sample', 'Hi{{#if this.showTheThing}}{{outlet}}{{/if}}Bye');
+      this.addTemplate('sample.inner', 'Yay');
+      this.addTemplate('sample.inner2', 'Boo');
       this.router.map(function () {
-        this.route('first');
-        this.route('second');
-        this.route('third');
-        this.route('fourth');
-      });
-
-      // Note add a component to test insertion
-
-      let insertionCount = 0;
-      this.add(
-        'component:x-input',
-        Component.extend({
-          didInsertElement() {
-            insertionCount += 1;
-          },
-        })
-      );
-
-      let SharedRoute = Route.extend({
-        setupController() {
-          this.controllerFor('shared').set('message', 'This is the ' + this.routeName + ' message');
-        },
-
-        renderTemplate() {
-          expectDeprecation(
-            () => this.render('shared', { controller: 'shared' }),
-            /Usage of `render` is deprecated/
-          );
-        },
+        this.route('sample', { path: '/' }, function () {
+          this.route('inner', { path: '/' });
+          this.route('inner2', { path: '/2' });
+        });
       });
 
-      this.add('route:shared', SharedRoute);
-      this.add('route:first', SharedRoute.extend());
-      this.add('route:second', SharedRoute.extend());
-      this.add('route:third', SharedRoute.extend());
-      this.add('route:fourth', SharedRoute.extend());
-
-      this.add('controller:shared', Controller.extend());
+      let rootElement;
+      return this.visit('/')
+        .then(() => {
+          rootElement = document.getElementById('qunit-fixture');
+          assert.equal(rootElement.textContent.trim(), 'HiBye', 'initial render');
 
-      this.addTemplate('shared', '<p>{{this.message}}{{x-input}}</p>');
+          run(() => this.applicationInstance.lookup('controller:sample').set('showTheThing', true));
 
-      let rootElement = document.getElementById('qunit-fixture');
-      return this.visit('/first')
-        .then(() => {
-          assert.ok(true, '/first has been handled');
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'This is the first message');
-          assert.equal(insertionCount, 1, 'expected one assertion');
-          return this.visit('/second');
-        })
-        .then(() => {
-          assert.ok(true, '/second has been handled');
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'This is the second message');
-          assert.equal(insertionCount, 1, 'expected one assertion');
-          return run(() => {
-            this.applicationInstance
-              .lookup('router:main')
-              .transitionTo('third')
-              .then(
-                function () {
-                  assert.ok(true, 'expected transition');
-                },
-                function (reason) {
-                  assert.ok(false, 'unexpected transition failure: ', QUnit.jsDump.parse(reason));
-                }
-              );
-          });
-        })
-        .then(() => {
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'This is the third message');
-          assert.equal(insertionCount, 1, 'expected one assertion');
-          return this.visit('fourth');
+          assert.equal(rootElement.textContent.trim(), 'HiYayBye', 'second render');
+          return this.visit('/2');
         })
         .then(() => {
-          assert.ok(true, '/fourth has been handled');
-          assert.equal(insertionCount, 1, 'expected one assertion');
-          assert.equal(getTextOf(rootElement.querySelector('p')), 'This is the fourth message');
+          assert.equal(rootElement.textContent.trim(), 'HiBooBye', 'third render');
         });
     }
 
-    ['@test Route should tear down multiple outlets'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', "{{outlet 'menu'}}{{outlet}}{{outlet 'footer'}}");
-      this.addTemplate('posts', '{{outlet}}');
-      this.addTemplate('users', 'users');
-      this.addTemplate('posts.index', '<p class="posts-index">postsIndex</p>');
-      this.addTemplate('posts.menu', '<div class="posts-menu">postsMenu</div>');
-      this.addTemplate('posts.footer', '<div class="posts-footer">postsFooter</div>');
-
-      this.router.map(function () {
-        this.route('posts', function () {});
-        this.route('users', function () {});
-      });
-
-      this.add(
-        'route:posts',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render('posts/menu', {
-                into: 'application',
-                outlet: 'menu',
-              });
-
-              this.render();
-
-              this.render('posts/footer', {
-                into: 'application',
-                outlet: 'footer',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      let rootElement = document.getElementById('qunit-fixture');
-      return this.visit('/posts')
-        .then(() => {
-          assert.ok(true, '/posts has been handled');
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-menu')),
-            'postsMenu',
-            'The posts/menu template was rendered'
-          );
-          assert.equal(
-            getTextOf(rootElement.querySelector('p.posts-index')),
-            'postsIndex',
-            'The posts/index template was rendered'
-          );
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-footer')),
-            'postsFooter',
-            'The posts/footer template was rendered'
-          );
-
-          return this.visit('/users');
-        })
-        .then(() => {
-          assert.ok(true, '/users has been handled');
-          assert.equal(
-            rootElement.querySelector('div.posts-menu'),
-            null,
-            'The posts/menu template was removed'
-          );
-          assert.equal(
-            rootElement.querySelector('p.posts-index'),
-            null,
-            'The posts/index template was removed'
-          );
-          assert.equal(
-            rootElement.querySelector('div.posts-footer'),
-            null,
-            'The posts/footer template was removed'
-          );
-        });
-    }
-
-    ['@test Route supports clearing outlet explicitly'](assert) {
-      this.addTemplate('application', "{{outlet}}{{outlet 'modal'}}");
-      this.addTemplate('posts', '{{outlet}}');
-      this.addTemplate('users', 'users');
-      this.addTemplate('posts.index', '<div class="posts-index">postsIndex {{outlet}}</div>');
-      this.addTemplate('posts.modal', '<div class="posts-modal">postsModal</div>');
-      this.addTemplate('posts.extra', '<div class="posts-extra">postsExtra</div>');
-
-      this.router.map(function () {
-        this.route('posts', function () {});
-        this.route('users', function () {});
-      });
-
-      this.add(
-        'route:posts',
-        Route.extend({
-          actions: {
-            showModal() {
-              expectDeprecation(() => {
-                this.render('posts/modal', {
-                  into: 'application',
-                  outlet: 'modal',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-            hideModal() {
-              expectDeprecation(
-                () =>
-                  this.disconnectOutlet({
-                    outlet: 'modal',
-                    parentView: 'application',
-                  }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      this.add(
-        'route:posts.index',
-        Route.extend({
-          actions: {
-            showExtra() {
-              expectDeprecation(() => {
-                this.render('posts/extra', {
-                  into: 'posts/index',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-            hideExtra() {
-              expectDeprecation(
-                () => this.disconnectOutlet({ parentView: 'posts/index' }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      let rootElement = document.getElementById('qunit-fixture');
-
-      return this.visit('/posts')
-        .then(() => {
-          let router = this.applicationInstance.lookup('router:main');
-
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-index')),
-            'postsIndex',
-            'The posts/index template was rendered'
-          );
-          run(() => router.send('showModal'));
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-modal')),
-            'postsModal',
-            'The posts/modal template was rendered'
-          );
-          run(() => router.send('showExtra'));
-
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-extra')),
-            'postsExtra',
-            'The posts/extra template was rendered'
-          );
-          run(() => router.send('hideModal'));
-
-          assert.equal(
-            rootElement.querySelector('div.posts-modal'),
-            null,
-            'The posts/modal template was removed'
-          );
-          run(() => router.send('hideExtra'));
-
-          assert.equal(
-            rootElement.querySelector('div.posts-extra'),
-            null,
-            'The posts/extra template was removed'
-          );
-          run(function () {
-            router.send('showModal');
-          });
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-modal')),
-            'postsModal',
-            'The posts/modal template was rendered'
-          );
-          run(function () {
-            router.send('showExtra');
-          });
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-extra')),
-            'postsExtra',
-            'The posts/extra template was rendered'
-          );
-          return this.visit('/users');
-        })
-        .then(() => {
-          assert.equal(
-            rootElement.querySelector('div.posts-index'),
-            null,
-            'The posts/index template was removed'
-          );
-          assert.equal(
-            rootElement.querySelector('div.posts-modal'),
-            null,
-            'The posts/modal template was removed'
-          );
-          assert.equal(
-            rootElement.querySelector('div.posts-extra'),
-            null,
-            'The posts/extra template was removed'
-          );
-        });
-    }
-
-    ['@test Route supports clearing outlet using string parameter'](assert) {
-      this.addTemplate('application', "{{outlet}}{{outlet 'modal'}}");
-      this.addTemplate('posts', '{{outlet}}');
-      this.addTemplate('users', 'users');
-      this.addTemplate('posts.index', '<div class="posts-index">postsIndex {{outlet}}</div>');
-      this.addTemplate('posts.modal', '<div class="posts-modal">postsModal</div>');
-
-      this.router.map(function () {
-        this.route('posts', function () {});
-        this.route('users', function () {});
-      });
-
-      this.add(
-        'route:posts',
-        Route.extend({
-          actions: {
-            showModal() {
-              expectDeprecation(() => {
-                this.render('posts/modal', {
-                  into: 'application',
-                  outlet: 'modal',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-            hideModal() {
-              expectDeprecation(
-                () => this.disconnectOutlet('modal'),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      let rootElement = document.getElementById('qunit-fixture');
-      return this.visit('/posts')
-        .then(() => {
-          let router = this.applicationInstance.lookup('router:main');
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-index')),
-            'postsIndex',
-            'The posts/index template was rendered'
-          );
-          run(() => router.send('showModal'));
-          assert.equal(
-            getTextOf(rootElement.querySelector('div.posts-modal')),
-            'postsModal',
-            'The posts/modal template was rendered'
-          );
-          run(() => router.send('hideModal'));
-          assert.equal(
-            rootElement.querySelector('div.posts-modal'),
-            null,
-            'The posts/modal template was removed'
-          );
-          return this.visit('/users');
-        })
-        .then(() => {
-          assert.equal(
-            rootElement.querySelector('div.posts-index'),
-            null,
-            'The posts/index template was removed'
-          );
-          assert.equal(
-            rootElement.querySelector('div.posts-modal'),
-            null,
-            'The posts/modal template was removed'
-          );
-        });
-    }
-
-    ['@test Route silently fails when cleaning an outlet from an inactive view'](assert) {
-      assert.expect(4); // handleURL
-
-      this.addTemplate('application', '{{outlet}}');
-      this.addTemplate('posts', "{{outlet 'modal'}}");
-      this.addTemplate('modal', 'A Yo.');
-
-      this.router.map(function () {
-        this.route('posts');
-      });
-
-      this.add(
-        'route:posts',
-        Route.extend({
-          actions: {
-            hideSelf() {
-              expectDeprecation(
-                () =>
-                  this.disconnectOutlet({
-                    outlet: 'main',
-                    parentView: 'application',
-                  }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-            showModal() {
-              expectDeprecation(
-                () => this.render('modal', { into: 'posts', outlet: 'modal' }),
-                /Usage of `render` is deprecated/
-              );
-            },
-            hideModal() {
-              expectDeprecation(
-                () => this.disconnectOutlet({ outlet: 'modal', parentView: 'posts' }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      return this.visit('/posts').then(() => {
-        assert.ok(true, '/posts has been handled');
-        let router = this.applicationInstance.lookup('router:main');
-        run(() => router.send('showModal'));
-        run(() => router.send('hideSelf'));
-        run(() => router.send('hideModal'));
-      });
-    }
-
-    ['@test Specifying non-existent controller name in route#render throws'](assert) {
-      expectDeprecation(
-        /(Usage of `renderTemplate` is deprecated|Usage of `render` is deprecated)/
-      );
-      assert.expect(2);
-
-      this.router.map(function () {
-        this.route('home', { path: '/' });
-      });
-
-      this.add(
-        'route:home',
-        Route.extend({
-          renderTemplate() {
-            expectAssertion(() => {
-              this.render('homepage', {
-                controller: 'stefanpenneristhemanforme',
-              });
-            }, "You passed `controller: 'stefanpenneristhemanforme'` into the `render` method, but no such controller could be found.");
-          },
-        })
-      );
-
-      return this.visit('/');
-    }
-
-    ['@test {{outlet}} works when created after initial render'](assert) {
-      this.addTemplate('sample', 'Hi{{#if this.showTheThing}}{{outlet}}{{/if}}Bye');
-      this.addTemplate('sample.inner', 'Yay');
-      this.addTemplate('sample.inner2', 'Boo');
-      this.router.map(function () {
-        this.route('sample', { path: '/' }, function () {
-          this.route('inner', { path: '/' });
-          this.route('inner2', { path: '/2' });
-        });
-      });
-
-      let rootElement;
-      return this.visit('/')
-        .then(() => {
-          rootElement = document.getElementById('qunit-fixture');
-          assert.equal(rootElement.textContent.trim(), 'HiBye', 'initial render');
-
-          run(() => this.applicationInstance.lookup('controller:sample').set('showTheThing', true));
-
-          assert.equal(rootElement.textContent.trim(), 'HiYayBye', 'second render');
-          return this.visit('/2');
-        })
-        .then(() => {
-          assert.equal(rootElement.textContent.trim(), 'HiBooBye', 'third render');
-        });
-    }
-
-    ['@test Can render into a named outlet at the top level'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
-      this.addTemplate('modal', 'Hello world');
-      this.addTemplate('index', 'The index');
-      this.router.map(function () {
-        this.route('index', { path: '/' });
-      });
-      this.add(
-        'route:application',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render();
-              this.render('modal', {
-                into: 'application',
-                outlet: 'other',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(
-          rootElement.textContent.trim(),
-          'A-The index-B-Hello world-C',
-          'initial render'
-        );
-      });
-    }
-
-    ['@test Can disconnect a named outlet at the top level'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
-      this.addTemplate('modal', 'Hello world');
-      this.addTemplate('index', 'The index');
-      this.router.map(function () {
-        this.route('index', { path: '/' });
-      });
-      this.add(
-        'route:application',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render();
-              this.render('modal', {
-                into: 'application',
-                outlet: 'other',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-          actions: {
-            banish() {
-              expectDeprecation(
-                () =>
-                  this.disconnectOutlet({
-                    parentView: 'application',
-                    outlet: 'other',
-                  }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(
-          rootElement.textContent.trim(),
-          'A-The index-B-Hello world-C',
-          'initial render'
-        );
-
-        run(this.applicationInstance.lookup('router:main'), 'send', 'banish');
-
-        assert.equal(rootElement.textContent.trim(), 'A-The index-B--C', 'second render');
-      });
-    }
-
-    ['@test Can render into a named outlet at the top level, with empty main outlet'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
-      this.addTemplate('modal', 'Hello world');
-
-      this.router.map(function () {
-        this.route('hasNoTemplate', { path: '/' });
-      });
-
-      this.add(
-        'route:application',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render();
-              this.render('modal', {
-                into: 'application',
-                outlet: 'other',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(rootElement.textContent.trim(), 'A--B-Hello world-C', 'initial render');
-      });
-    }
-
-    ['@test Can render into a named outlet at the top level, later'](assert) {
-      this.addTemplate('application', 'A-{{outlet}}-B-{{outlet "other"}}-C');
-      this.addTemplate('modal', 'Hello world');
-      this.addTemplate('index', 'The index');
-      this.router.map(function () {
-        this.route('index', { path: '/' });
-      });
-      this.add(
-        'route:application',
-        Route.extend({
-          actions: {
-            launch() {
-              expectDeprecation(() => {
-                this.render('modal', {
-                  into: 'application',
-                  outlet: 'other',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(rootElement.textContent.trim(), 'A-The index-B--C', 'initial render');
-        run(this.applicationInstance.lookup('router:main'), 'send', 'launch');
-        assert.equal(
-          rootElement.textContent.trim(),
-          'A-The index-B-Hello world-C',
-          'second render'
-        );
-      });
-    }
-
-    ["@test Can render routes with no 'main' outlet and their children"](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', '<div id="application">{{outlet "app"}}</div>');
-      this.addTemplate(
-        'app',
-        '<div id="app-common">{{outlet "common"}}</div><div id="app-sub">{{outlet "sub"}}</div>'
-      );
-      this.addTemplate('common', '<div id="common"></div>');
-      this.addTemplate('sub', '<div id="sub"></div>');
-
-      this.router.map(function () {
-        this.route('app', { path: '/app' }, function () {
-          this.route('sub', { path: '/sub', resetNamespace: true });
-        });
-      });
-
-      this.add(
-        'route:app',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render('app', {
-                outlet: 'app',
-                into: 'application',
-              });
-              this.render('common', {
-                outlet: 'common',
-                into: 'app',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      this.add(
-        'route:sub',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => {
-              this.render('sub', {
-                outlet: 'sub',
-                into: 'app',
-              });
-            }, /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      let rootElement;
-      return this.visit('/app')
-        .then(() => {
-          rootElement = document.getElementById('qunit-fixture');
-          assert.equal(
-            rootElement.querySelectorAll('#app-common #common').length,
-            1,
-            'Finds common while viewing /app'
-          );
-          return this.visit('/app/sub');
-        })
-        .then(() => {
-          assert.equal(
-            rootElement.querySelectorAll('#app-common #common').length,
-            1,
-            'Finds common while viewing /app/sub'
-          );
-          assert.equal(
-            rootElement.querySelectorAll('#app-sub #sub').length,
-            1,
-            'Finds sub while viewing /app/sub'
-          );
-        });
-    }
-
-    ['@test Tolerates stacked renders'](assert) {
-      this.addTemplate('application', '{{outlet}}{{outlet "modal"}}');
-      this.addTemplate('index', 'hi');
-      this.addTemplate('layer', 'layer');
-      this.router.map(function () {
-        this.route('index', { path: '/' });
-      });
-      this.add(
-        'route:application',
-        Route.extend({
-          actions: {
-            openLayer() {
-              expectDeprecation(() => {
-                this.render('layer', {
-                  into: 'application',
-                  outlet: 'modal',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-            close() {
-              expectDeprecation(
-                () =>
-                  this.disconnectOutlet({
-                    outlet: 'modal',
-                    parentView: 'application',
-                  }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        let router = this.applicationInstance.lookup('router:main');
-        assert.equal(rootElement.textContent.trim(), 'hi');
-        run(router, 'send', 'openLayer');
-        assert.equal(rootElement.textContent.trim(), 'hilayer');
-        run(router, 'send', 'openLayer');
-        assert.equal(rootElement.textContent.trim(), 'hilayer');
-        run(router, 'send', 'close');
-        assert.equal(rootElement.textContent.trim(), 'hi');
-      });
-    }
-
-    ['@test Renders child into parent with non-default template name'](assert) {
-      expectDeprecation('Usage of `renderTemplate` is deprecated.');
-      this.addTemplate('application', '<div class="a">{{outlet}}</div>');
-      this.addTemplate('exports.root', '<div class="b">{{outlet}}</div>');
-      this.addTemplate('exports.index', '<div class="c"></div>');
-
-      this.router.map(function () {
-        this.route('root', function () {});
-      });
-
-      this.add(
-        'route:root',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(() => this.render('exports/root'), /Usage of `render` is deprecated/);
-          },
-        })
-      );
-
-      this.add(
-        'route:root.index',
-        Route.extend({
-          renderTemplate() {
-            expectDeprecation(
-              () => this.render('exports/index'),
-              /Usage of `render` is deprecated/
-            );
-          },
-        })
-      );
-
-      return this.visit('/root').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        assert.equal(rootElement.querySelectorAll('.a .b .c').length, 1);
-      });
-    }
-
-    ["@test Allows any route to disconnectOutlet another route's templates"](assert) {
-      this.addTemplate('application', '{{outlet}}{{outlet "modal"}}');
-      this.addTemplate('index', 'hi');
-      this.addTemplate('layer', 'layer');
-      this.router.map(function () {
-        this.route('index', { path: '/' });
-      });
-      this.add(
-        'route:application',
-        Route.extend({
-          actions: {
-            openLayer() {
-              expectDeprecation(() => {
-                this.render('layer', {
-                  into: 'application',
-                  outlet: 'modal',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-          },
-        })
-      );
-      this.add(
-        'route:index',
-        Route.extend({
-          actions: {
-            close() {
-              expectDeprecation(
-                () =>
-                  this.disconnectOutlet({
-                    parentView: 'application',
-                    outlet: 'modal',
-                  }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let rootElement = document.getElementById('qunit-fixture');
-        let router = this.applicationInstance.lookup('router:main');
-        assert.equal(rootElement.textContent.trim(), 'hi');
-        run(router, 'send', 'openLayer');
-        assert.equal(rootElement.textContent.trim(), 'hilayer');
-        run(router, 'send', 'close');
-        assert.equal(rootElement.textContent.trim(), 'hi');
-      });
-    }
-
     ['@test Components inside an outlet have their didInsertElement hook invoked when the route is displayed'](
       assert
     ) {
@@ -1522,44 +375,5 @@ moduleFor(
         );
       });
     }
-
-    ['@test Exception if outlet name is undefined in render and disconnectOutlet']() {
-      this.add(
-        'route:application',
-        Route.extend({
-          actions: {
-            showModal() {
-              expectDeprecation(() => {
-                this.render({
-                  outlet: undefined,
-                  parentView: 'application',
-                });
-              }, /Usage of `render` is deprecated/);
-            },
-            hideModal() {
-              expectDeprecation(
-                () =>
-                  this.disconnectOutlet({
-                    outlet: undefined,
-                    parentView: 'application',
-                  }),
-                'The usage of `disconnectOutlet` is deprecated.'
-              );
-            },
-          },
-        })
-      );
-
-      return this.visit('/').then(() => {
-        let router = this.applicationInstance.lookup('router:main');
-        expectAssertion(() => {
-          run(() => router.send('showModal'));
-        }, /You passed undefined as the outlet name/);
-
-        expectAssertion(() => {
-          run(() => router.send('hideModal'));
-        }, /You passed undefined as the outlet name/);
-      });
-    }
   }
 );
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 354287d995e..22a5d583f58 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -192,7 +192,6 @@ module.exports = {
     'didUpdateAttrs',
     'disabled',
     'disabledClass',
-    'disconnectOutlet',
     'document',
     'domReady',
     'each-in',
@@ -468,8 +467,6 @@ module.exports = {
     'removeObjects',
     'removeObserver',
     'removeTestHelpers',
-    'render',
-    'renderTemplate',
     'reopen',
     'reopenClass',
     'replace',

From 92750b9f8b32cd4f11855bf19836d7da2cd7ba00 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 13 Jul 2021 15:06:01 -0700
Subject: [PATCH 0580/1405] Remove deprecated disabledWhen

---
 .../glimmer/lib/components/-link-to.ts        |  6 --
 .../glimmer/lib/components/link-to.ts         | 64 --------------
 .../components/link-to/routing-angle-test.js  | 81 +-----------------
 .../components/link-to/routing-curly-test.js  | 83 +------------------
 4 files changed, 3 insertions(+), 231 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 642eeb64605..f0a8e651e13 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -879,12 +879,6 @@ const LinkComponent = EmberComponent.extend({
   loadingHref: '#',
 
   didReceiveAttrs() {
-    let { disabledWhen } = this;
-
-    if (disabledWhen !== undefined) {
-      this.set('disabled', disabledWhen);
-    }
-
     let { params } = this;
 
     if (!params || params.length === 0) {
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index a139ba18c80..3bb0b105281 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -614,70 +614,6 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     });
   }
 
-  // @disabledWhen
-  {
-    let superIsSupportedArgument = prototype['isSupportedArgument'];
-
-    Object.defineProperty(prototype, 'isSupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function isSupportedArgument(this: LinkTo, name: string): boolean {
-        if (this.modernized) {
-          if (name === 'disabledWhen') {
-            deprecate(
-              'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
-                'Use the `@disabled` argument instead.',
-              false,
-              {
-                id: 'ember.link-to.disabled-when',
-                for: 'ember-source',
-                since: {},
-                until: '4.0.0',
-              }
-            );
-
-            return true;
-          }
-        }
-
-        return superIsSupportedArgument.call(this, name);
-      },
-    });
-
-    let superDescriptor = descriptorFor(prototype, 'isDisabled');
-
-    assert(
-      `[BUG] expecting isDisabled to be a getter on <LinkTo>`,
-      superDescriptor && typeof superDescriptor.get === 'function'
-    );
-
-    let superGetter = superDescriptor.get as (this: LinkTo) => boolean;
-
-    Object.defineProperty(prototype, 'isDisabled', {
-      configurable: true,
-      enumerable: false,
-      get: function isDisabled(this: LinkTo): boolean {
-        if ('disabledWhen' in this.args.named) {
-          deprecate(
-            'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
-              'Use the `@disabled` argument instead.',
-            false,
-            {
-              id: 'ember.link-to.disabled-when',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-            }
-          );
-
-          return Boolean(this.named('disabledWhen'));
-        }
-
-        return superGetter.call(this);
-      },
-    });
-  }
-
   // QP
   {
     let superModelsDescriptor = descriptorFor(prototype, 'models');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index fa7e4c22561..f1d1cfc863c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -147,64 +147,6 @@ moduleFor(
       assert.strictEqual(this.$('#about-link').attr('href'), null, 'there is no href attribute');
     }
 
-    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `
-        <LinkTo id="about-link-static" @route="about" @disabledWhen="truthy">About</LinkTo>
-        <LinkTo id="about-link-dynamic" @route="about" @disabledWhen={{this.dynamicDisabledWhen}}>About</LinkTo>
-        `
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          dynamicDisabledWhen = true;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.equal(
-        this.$('#about-link-dynamic.disabled').length,
-        1,
-        'The dynamic link is disabled when its disabledWhen is true'
-      );
-
-      expectDeprecation(
-        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.strictEqual(
-        this.$('#about-link-dynamic.disabled').length,
-        0,
-        'The dynamic link is re-enabled when its disabledWhen becomes false'
-      );
-    }
-
     async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -384,27 +326,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}}>About</LinkTo>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-link'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
-    }
-
     async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -451,7 +372,7 @@ moduleFor(
       assert.equal(
         this.$('h3.about').length,
         1,
-        'Transitioning did occur when disabledWhen became false'
+        'Transitioning did occur when disabled became false'
       );
     }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 2ecf5ae4cf0..eb12ae9e343 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -152,64 +152,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `
-        <div id="about-link-static">{{#link-to route="about" disabledWhen="truthy"}}About{{/link-to}}</div>
-        <div id="about-link-dynamic">{{#link-to route="about" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}</div>
-        `
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          dynamicDisabledWhen = true;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static > a.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.equal(
-        this.$('#about-link-dynamic > a.disabled').length,
-        1,
-        'The dynamic link is disabled when its disabledWhen is true'
-      );
-
-      expectDeprecation(
-        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static > a.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.strictEqual(
-        this.$('#about-link-dynamic > a.disabled').length,
-        0,
-        'The dynamic link is re-enabled when its disabledWhen becomes false'
-      );
-    }
-
     async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -251,7 +193,7 @@ moduleFor(
       assert.equal(
         this.$('#about-link-static > a.disabled').length,
         1,
-        'The static link is disabled when its disabledWhen is true'
+        'The static link is disabled when its disabled is true'
       );
       assert.strictEqual(
         this.$('#about-link-dynamic > a.disabled').length,
@@ -396,27 +338,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `<div id="about-link">{{#link-to route="about" disabledWhen=true}}About{{/link-to}}</div>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-link > a'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
-    }
-
     async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -463,7 +384,7 @@ moduleFor(
       assert.equal(
         this.$('h3.about').length,
         1,
-        'Transitioning did occur when disabledWhen became false'
+        'Transitioning did occur when disabled became false'
       );
     }
 

From 082dc76159136905495e1882016bea1fe08b058e Mon Sep 17 00:00:00 2001
From: Bj Tecu <github@bujorel.net>
Date: Mon, 3 May 2021 18:14:16 -0400
Subject: [PATCH 0581/1405] Remove `Ember.DefaultResolver` / `Ember.Resolver`

---
 .../@ember/application/globals-resolver.js    | 468 ------------------
 packages/@ember/application/resolver.js       |   1 -
 .../application/tests/application_test.js     |  55 +-
 .../application/tests/bootstrap-test.js       |  27 -
 .../custom_resolver_test.js                   |  31 --
 .../default_resolver_test.js                  | 384 --------------
 .../normalization_test.js                     |  75 ---
 packages/@ember/deprecated-features/index.ts  |   1 -
 packages/@ember/engine/index.js               |  12 +-
 packages/ember/index.js                       |  27 -
 packages/ember/tests/reexports_test.js        |  13 -
 packages/internal-test-helpers/index.js       |   1 -
 .../default-resolver-application.js           |  55 --
 tests/docs/expected.js                        |  13 -
 14 files changed, 3 insertions(+), 1160 deletions(-)
 delete mode 100644 packages/@ember/application/globals-resolver.js
 delete mode 100644 packages/@ember/application/resolver.js
 delete mode 100644 packages/@ember/application/tests/bootstrap-test.js
 delete mode 100644 packages/@ember/application/tests/dependency_injection/custom_resolver_test.js
 delete mode 100644 packages/@ember/application/tests/dependency_injection/default_resolver_test.js
 delete mode 100644 packages/@ember/application/tests/dependency_injection/normalization_test.js
 delete mode 100644 packages/internal-test-helpers/lib/test-cases/default-resolver-application.js

diff --git a/packages/@ember/application/globals-resolver.js b/packages/@ember/application/globals-resolver.js
deleted file mode 100644
index 67cad755c4d..00000000000
--- a/packages/@ember/application/globals-resolver.js
+++ /dev/null
@@ -1,468 +0,0 @@
-/**
-@module @ember/application
-*/
-
-import { dictionary, getName } from '@ember/-internals/utils';
-import { get, findNamespace } from '@ember/-internals/metal';
-import { assert, info, deprecate } from '@ember/debug';
-import { capitalize, classify, dasherize, decamelize } from '@ember/string';
-import { Object as EmberObject } from '@ember/-internals/runtime';
-import { getTemplate } from '@ember/-internals/glimmer';
-import { DEBUG } from '@glimmer/env';
-import { GLOBALS_RESOLVER } from '@ember/deprecated-features';
-import { processAllNamespaces } from '@ember/-internals/metal';
-
-/**
-  The DefaultResolver defines the default lookup rules to resolve
-  container lookups before consulting the container for registered
-  items:
-
-  * templates are looked up on `Ember.TEMPLATES`
-  * other names are looked up on the application after converting
-    the name. For example, `controller:post` looks up
-    `App.PostController` by default.
-  * there are some nuances (see examples below)
-
-  ### How Resolving Works
-
-  The container calls this object's `resolve` method with the
-  `fullName` argument.
-
-  It first parses the fullName into an object using `parseName`.
-
-  Then it checks for the presence of a type-specific instance
-  method of the form `resolve[Type]` and calls it if it exists.
-  For example if it was resolving 'template:post', it would call
-  the `resolveTemplate` method.
-
-  Its last resort is to call the `resolveOther` method.
-
-  The methods of this object are designed to be easy to override
-  in a subclass. For example, you could enhance how a template
-  is resolved like so:
-
-  ```app/app.js
-  import Application from '@ember/application';
-  import GlobalsResolver from '@ember/application/globals-resolver';
-
-  App = Application.create({
-    Resolver: GlobalsResolver.extend({
-      resolveTemplate(parsedName) {
-        let resolvedTemplate = this._super(parsedName);
-        if (resolvedTemplate) { return resolvedTemplate; }
-
-        return Ember.TEMPLATES['not_found'];
-      }
-    })
-  });
-  ```
-
-  Some examples of how names are resolved:
-
-  ```text
-  'template:post'           //=> Ember.TEMPLATES['post']
-  'template:posts/byline'   //=> Ember.TEMPLATES['posts/byline']
-  'template:posts.byline'   //=> Ember.TEMPLATES['posts/byline']
-  'template:blogPost'       //=> Ember.TEMPLATES['blog-post']
-  'controller:post'         //=> App.PostController
-  'controller:posts.index'  //=> App.PostsIndexController
-  'controller:blog/post'    //=> Blog.PostController
-  'controller:basic'        //=> Controller
-  'route:post'              //=> App.PostRoute
-  'route:posts.index'       //=> App.PostsIndexRoute
-  'route:blog/post'         //=> Blog.PostRoute
-  'route:basic'             //=> Route
-  'foo:post'                //=> App.PostFoo
-  'model:post'              //=> App.Post
-  ```
-
-  @class GlobalsResolver
-  @extends EmberObject
-  @public
-  @deprecated
-*/
-
-let DefaultResolver;
-
-if (GLOBALS_RESOLVER) {
-  DefaultResolver = class DefaultResolver extends EmberObject {
-    static create(props) {
-      // DO NOT REMOVE even though this doesn't do anything
-      // This is required for a FireFox 60+ JIT bug with our tests.
-      // without it, create(props) in our tests would lose props on a deopt.
-      return super.create(props);
-    }
-
-    /**
-      This will be set to the Application instance when it is
-      created.
-
-      @property namespace
-      @public
-      @deprecated
-    */
-
-    init() {
-      deprecate(
-        'Using the globals resolver is deprecated. Use the ember-resolver package instead. See https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
-        false,
-        {
-          until: '4.0.0',
-          id: 'globals-resolver',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
-          for: 'ember-source',
-          since: {
-            enabled: '3.16.0',
-          },
-        }
-      );
-
-      this._parseNameCache = dictionary(null);
-    }
-
-    normalize(fullName) {
-      let [type, name] = fullName.split(':');
-
-      assert(
-        'Tried to normalize a container name without a colon (:) in it. ' +
-          'You probably tried to lookup a name that did not contain a type, ' +
-          'a colon, and a name. A proper lookup name would be `view:post`.',
-        fullName.split(':').length === 2
-      );
-
-      if (type !== 'template') {
-        let result = name.replace(/(\.|_|-)./g, (m) => m.charAt(1).toUpperCase());
-
-        return `${type}:${result}`;
-      } else {
-        return fullName;
-      }
-    }
-
-    /**
-      This method is called via the container's resolver method.
-      It parses the provided `fullName` and then looks up and
-      returns the appropriate template or class.
-
-      @method resolve
-      @param {String} fullName the lookup string
-      @return {Object} the resolved factory
-      @public
-    */
-    resolve(fullName) {
-      let parsedName = this.parseName(fullName);
-      let resolveMethodName = parsedName.resolveMethodName;
-      let resolved;
-
-      if (this[resolveMethodName]) {
-        resolved = this[resolveMethodName](parsedName);
-      }
-
-      resolved = resolved || this.resolveOther(parsedName);
-
-      if (DEBUG) {
-        if (parsedName.root && parsedName.root.LOG_RESOLVER) {
-          this._logLookup(resolved, parsedName);
-        }
-
-        if (resolved) {
-          let VALIDATED_TYPES = {
-            route: ['isRouteFactory', 'Ember.Route'],
-            component: ['isComponentFactory', 'Ember.Component'],
-            view: ['isViewFactory', 'Ember.View'],
-            service: ['isServiceFactory', 'Ember.Service'],
-          };
-
-          let validationAttributes = VALIDATED_TYPES[parsedName.type];
-
-          if (validationAttributes) {
-            let [factoryFlag, expectedType] = validationAttributes;
-
-            processAllNamespaces();
-
-            assert(
-              `Expected ${parsedName.fullName} to resolve to an ${expectedType} but ` +
-                `instead it was ${getName(resolved)}.`,
-              Boolean(resolved[factoryFlag])
-            );
-          }
-        }
-      }
-
-      return resolved;
-    }
-
-    /**
-      Convert the string name of the form 'type:name' to
-      a Javascript object with the parsed aspects of the name
-      broken out.
-
-      @param {String} fullName the lookup string
-      @method parseName
-      @protected
-    */
-
-    parseName(fullName) {
-      return (
-        this._parseNameCache[fullName] ||
-        (this._parseNameCache[fullName] = this._parseName(fullName))
-      );
-    }
-
-    _parseName(fullName) {
-      let [type, fullNameWithoutType] = fullName.split(':');
-
-      let name = fullNameWithoutType;
-      let namespace = get(this, 'namespace');
-      let root = namespace;
-      let lastSlashIndex = name.lastIndexOf('/');
-      let dirname = lastSlashIndex !== -1 ? name.slice(0, lastSlashIndex) : null;
-
-      if (type !== 'template' && lastSlashIndex !== -1) {
-        let parts = name.split('/');
-        name = parts[parts.length - 1];
-        let namespaceName = capitalize(parts.slice(0, -1).join('.'));
-        root = findNamespace(namespaceName);
-
-        assert(
-          `You are looking for a ${name} ${type} in the ${namespaceName} namespace, but the namespace could not be found`,
-          root
-        );
-      }
-
-      let resolveMethodName = fullNameWithoutType === 'main' ? 'Main' : classify(type);
-
-      if (!(name && type)) {
-        throw new TypeError(
-          `Invalid fullName: \`${fullName}\`, must be of the form \`type:name\` `
-        );
-      }
-
-      return {
-        fullName,
-        type,
-        fullNameWithoutType,
-        dirname,
-        name,
-        root,
-        resolveMethodName: `resolve${resolveMethodName}`,
-      };
-    }
-
-    /**
-      Returns a human-readable description for a fullName. Used by the
-      Application namespace in assertions to describe the
-      precise name of the class that Ember is looking for, rather than
-      container keys.
-
-      @param {String} fullName the lookup string
-      @method lookupDescription
-      @protected
-    */
-    lookupDescription(fullName) {
-      let parsedName = this.parseName(fullName);
-      let description;
-
-      if (parsedName.type === 'template') {
-        return `template at ${parsedName.fullNameWithoutType.replace(/\./g, '/')}`;
-      }
-
-      description = `${parsedName.root}.${classify(parsedName.name).replace(/\./g, '')}`;
-
-      if (parsedName.type !== 'model') {
-        description += classify(parsedName.type);
-      }
-
-      return description;
-    }
-
-    makeToString(factory) {
-      return typeof factory === 'string' ? factory : factory.name ?? '(unknown class)';
-    }
-
-    /**
-      Given a parseName object (output from `parseName`), apply
-      the conventions expected by `Router`
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method useRouterNaming
-      @protected
-    */
-    useRouterNaming(parsedName) {
-      if (parsedName.name === 'basic') {
-        parsedName.name = '';
-      } else {
-        parsedName.name = parsedName.name.replace(/\./g, '_');
-      }
-    }
-    /**
-      Look up the template in Ember.TEMPLATES
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveTemplate
-      @protected
-    */
-    resolveTemplate(parsedName) {
-      let templateName = parsedName.fullNameWithoutType.replace(/\./g, '/');
-
-      return getTemplate(templateName) || getTemplate(decamelize(templateName));
-    }
-
-    /**
-      Lookup the view using `resolveOther`
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveView
-      @protected
-    */
-    resolveView(parsedName) {
-      this.useRouterNaming(parsedName);
-      return this.resolveOther(parsedName);
-    }
-
-    /**
-      Lookup the controller using `resolveOther`
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveController
-      @protected
-    */
-    resolveController(parsedName) {
-      this.useRouterNaming(parsedName);
-      return this.resolveOther(parsedName);
-    }
-    /**
-      Lookup the route using `resolveOther`
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveRoute
-      @protected
-    */
-    resolveRoute(parsedName) {
-      this.useRouterNaming(parsedName);
-      return this.resolveOther(parsedName);
-    }
-
-    /**
-      Lookup the model on the Application namespace
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveModel
-      @protected
-    */
-    resolveModel(parsedName) {
-      let className = classify(parsedName.name);
-      let factory = get(parsedName.root, className);
-
-      return factory;
-    }
-    /**
-      Look up the specified object (from parsedName) on the appropriate
-      namespace (usually on the Application)
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveHelper
-      @protected
-    */
-    resolveHelper(parsedName) {
-      return this.resolveOther(parsedName);
-    }
-    /**
-      Look up the specified object (from parsedName) on the appropriate
-      namespace (usually on the Application)
-
-      @param {Object} parsedName a parseName object with the parsed
-        fullName lookup string
-      @method resolveOther
-      @protected
-    */
-    resolveOther(parsedName) {
-      let className = classify(parsedName.name) + classify(parsedName.type);
-      let factory = get(parsedName.root, className);
-      return factory;
-    }
-
-    resolveMain(parsedName) {
-      let className = classify(parsedName.type);
-      return get(parsedName.root, className);
-    }
-
-    /**
-      Used to iterate all items of a given type.
-
-      @method knownForType
-      @param {String} type the type to search for
-      @private
-    */
-    knownForType(type) {
-      let namespace = get(this, 'namespace');
-      let suffix = classify(type);
-      let typeRegexp = new RegExp(`${suffix}$`);
-
-      let known = dictionary(null);
-      let knownKeys = Object.keys(namespace);
-      for (let index = 0; index < knownKeys.length; index++) {
-        let name = knownKeys[index];
-
-        if (typeRegexp.test(name)) {
-          let containerName = this.translateToContainerFullname(type, name);
-
-          known[containerName] = true;
-        }
-      }
-
-      return known;
-    }
-
-    /**
-      Converts provided name from the backing namespace into a container lookup name.
-
-      Examples:
-
-      * App.FooBarHelper -> helper:foo-bar
-      * App.THelper -> helper:t
-
-      @method translateToContainerFullname
-      @param {String} type
-      @param {String} name
-      @private
-    */
-    translateToContainerFullname(type, name) {
-      let suffix = classify(type);
-      let namePrefix = name.slice(0, suffix.length * -1);
-      let dasherizedName = dasherize(namePrefix);
-
-      return `${type}:${dasherizedName}`;
-    }
-  };
-
-  if (DEBUG) {
-    /**
-        @method _logLookup
-        @param {Boolean} found
-        @param {Object} parsedName
-        @private
-      */
-    DefaultResolver.prototype._logLookup = function (found, parsedName) {
-      let symbol = found ? '[✓]' : '[ ]';
-
-      let padding;
-      if (parsedName.fullName.length > 60) {
-        padding = '.';
-      } else {
-        padding = new Array(60 - parsedName.fullName.length).join('.');
-      }
-
-      info(symbol, parsedName.fullName, padding, this.lookupDescription(parsedName.fullName));
-    };
-  }
-}
-
-export default DefaultResolver;
diff --git a/packages/@ember/application/resolver.js b/packages/@ember/application/resolver.js
deleted file mode 100644
index 731dbc19767..00000000000
--- a/packages/@ember/application/resolver.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './globals-resolver';
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 5988677d2c8..729ef0f5beb 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -1,21 +1,18 @@
 import { DEBUG } from '@glimmer/env';
 import VERSION from 'ember/version';
-import { ENV, context } from '@ember/-internals/environment';
-import { libraries, processAllNamespaces } from '@ember/-internals/metal';
-import { getName } from '@ember/-internals/utils';
+import { ENV } from '@ember/-internals/environment';
+import { libraries } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { Router, NoneLocation, Route as EmberRoute } from '@ember/-internals/routing';
 import { jQueryDisabled, jQuery } from '@ember/-internals/views';
 import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { setTemplates } from '@ember/-internals/glimmer';
 import {
   moduleFor,
   ApplicationTestCase,
   AbstractTestCase,
   AutobootApplicationTestCase,
-  DefaultResolverApplicationTestCase,
   verifyInjection,
   verifyRegistration,
   runTask,
@@ -171,54 +168,6 @@ moduleFor(
   }
 );
 
-moduleFor(
-  'Application, default resolver with autoboot',
-  class extends DefaultResolverApplicationTestCase {
-    constructor() {
-      super(...arguments);
-      this.originalLookup = context.lookup;
-    }
-
-    teardown() {
-      context.lookup = this.originalLookup;
-      super.teardown();
-      setTemplates({});
-    }
-
-    get applicationOptions() {
-      return Object.assign(super.applicationOptions, {
-        autoboot: true,
-      });
-    }
-
-    [`@test acts like a namespace`](assert) {
-      this.application = runTask(() => this.createApplication());
-      let Foo = (this.application.Foo = EmberObject.extend());
-      processAllNamespaces();
-      assert.equal(getName(Foo), 'TestApp.Foo', 'Classes pick up their parent namespace');
-    }
-
-    [`@test can specify custom router`](assert) {
-      let MyRouter = Router.extend();
-      runTask(() => {
-        this.createApplication();
-        this.application.Router = MyRouter;
-      });
-
-      assert.ok(
-        this.application.__deprecatedInstance__.lookup('router:main') instanceof MyRouter,
-        'application resolved the correct router'
-      );
-    }
-
-    [`@test Minimal Application initialized with just an application template`]() {
-      this.setupFixture('<script type="text/x-handlebars">Hello World</script>');
-      runTask(() => this.createApplication());
-      this.assertInnerHTML('Hello World');
-    }
-  }
-);
-
 moduleFor(
   'Application, autobooting',
   class extends AutobootApplicationTestCase {
diff --git a/packages/@ember/application/tests/bootstrap-test.js b/packages/@ember/application/tests/bootstrap-test.js
deleted file mode 100644
index 41689a361cf..00000000000
--- a/packages/@ember/application/tests/bootstrap-test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { moduleFor, DefaultResolverApplicationTestCase, runTask } from 'internal-test-helpers';
-
-moduleFor(
-  'Application with default resolver and autoboot',
-  class extends DefaultResolverApplicationTestCase {
-    get fixture() {
-      return `
-      <div id="app"></div>
-
-      <script type="text/x-handlebars">Hello {{outlet}}</script>
-      <script type="text/x-handlebars" id="index">World!</script>
-    `;
-    }
-
-    get applicationOptions() {
-      return Object.assign(super.applicationOptions, {
-        autoboot: true,
-        rootElement: '#app',
-      });
-    }
-
-    ['@test templates in script tags are extracted at application creation'](assert) {
-      runTask(() => this.createApplication());
-      assert.equal(document.getElementById('app').textContent, 'Hello World!');
-    }
-  }
-);
diff --git a/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js b/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js
deleted file mode 100644
index cab5dbf46fb..00000000000
--- a/packages/@ember/application/tests/dependency_injection/custom_resolver_test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import DefaultResolver from '@ember/application/globals-resolver';
-import { moduleFor, DefaultResolverApplicationTestCase, runTask } from 'internal-test-helpers';
-
-moduleFor(
-  'Application with extended default resolver and autoboot',
-  class extends DefaultResolverApplicationTestCase {
-    get applicationOptions() {
-      let applicationTemplate = this.compile(`<h1>Fallback</h1>`);
-
-      let Resolver = DefaultResolver.extend({
-        resolveTemplate(resolvable) {
-          if (resolvable.fullNameWithoutType === 'application') {
-            return applicationTemplate;
-          } else {
-            return this._super(resolvable);
-          }
-        },
-      });
-
-      return Object.assign(super.applicationOptions, {
-        Resolver,
-        autoboot: true,
-      });
-    }
-
-    [`@test a resolver can be supplied to application`]() {
-      runTask(() => this.createApplication());
-      this.assertText('Fallback');
-    }
-  }
-);
diff --git a/packages/@ember/application/tests/dependency_injection/default_resolver_test.js b/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
deleted file mode 100644
index 46b9a68ffa6..00000000000
--- a/packages/@ember/application/tests/dependency_injection/default_resolver_test.js
+++ /dev/null
@@ -1,384 +0,0 @@
-import { DEBUG } from '@glimmer/env';
-
-import { moduleFor, DefaultResolverApplicationTestCase, runTask } from 'internal-test-helpers';
-
-import { context } from '@ember/-internals/environment';
-import Controller from '@ember/controller';
-import Service from '@ember/service';
-import { Object as EmberObject, Namespace } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
-import { Component, Helper, helper as makeHelper } from '@ember/-internals/glimmer';
-import { getDebugFunction, setDebugFunction } from '@ember/debug';
-
-moduleFor(
-  'Application Dependency Injection - Integration - globals resolver [DEPRECATED]',
-  class extends DefaultResolverApplicationTestCase {
-    beforeEach() {
-      runTask(() => this.createApplication());
-      return this.visit('/');
-    }
-
-    get privateRegistry() {
-      return this.application.__registry__;
-    }
-
-    /*
-     * This first batch of tests are integration tests against the public
-     * applicationInstance API.
-     */
-
-    [`@test the default resolver looks up templates in Ember.TEMPLATES`](assert) {
-      let fooTemplate = this.addTemplate('foo', `foo template`);
-      let fooBarTemplate = this.addTemplate('fooBar', `fooBar template`);
-      let fooBarBazTemplate = this.addTemplate('fooBar/baz', `fooBar/baz template`);
-
-      assert.equal(
-        this.applicationInstance.factoryFor('template:foo').class,
-        fooTemplate,
-        'resolves template:foo'
-      );
-      assert.equal(
-        this.applicationInstance.factoryFor('template:fooBar').class,
-        fooBarTemplate,
-        'resolves template:foo_bar'
-      );
-      assert.equal(
-        this.applicationInstance.factoryFor('template:fooBar.baz').class,
-        fooBarBazTemplate,
-        'resolves template:foo_bar.baz'
-      );
-    }
-
-    [`@test the default resolver looks up basic name as no prefix`](assert) {
-      let instance = this.applicationInstance.lookup('controller:basic');
-      assert.ok(Controller.detect(instance), 'locator looks up correct controller');
-    }
-
-    [`@test the default resolver looks up arbitrary types on the namespace`](assert) {
-      let Class = (this.application.FooManager = EmberObject.extend());
-      let resolvedClass = this.application.resolveRegistration('manager:foo');
-      assert.equal(Class, resolvedClass, 'looks up FooManager on application');
-    }
-
-    [`@test the default resolver resolves models on the namespace`](assert) {
-      let Class = (this.application.Post = EmberObject.extend());
-      let factoryClass = this.applicationInstance.factoryFor('model:post').class;
-      assert.equal(Class, factoryClass, 'looks up Post model on application');
-    }
-
-    [`@test the default resolver resolves *:main on the namespace`](assert) {
-      let Class = (this.application.FooBar = EmberObject.extend());
-      let factoryClass = this.applicationInstance.factoryFor('foo-bar:main').class;
-      assert.equal(Class, factoryClass, 'looks up FooBar type without name on application');
-    }
-
-    [`@test the default resolver resolves container-registered helpers`](assert) {
-      let shorthandHelper = makeHelper(() => {});
-      let helper = Helper.extend();
-
-      this.application.register('helper:shorthand', shorthandHelper);
-      this.application.register('helper:complete', helper);
-
-      let lookedUpShorthandHelper = this.applicationInstance.factoryFor('helper:shorthand').class;
-
-      assert.ok(lookedUpShorthandHelper.isHelperFactory, 'shorthand helper isHelper');
-
-      let lookedUpHelper = this.applicationInstance.factoryFor('helper:complete').class;
-
-      assert.ok(lookedUpHelper.isHelperFactory, 'complete helper is factory');
-      assert.ok(helper.detect(lookedUpHelper), 'looked up complete helper');
-    }
-
-    [`@test the default resolver resolves container-registered helpers via lookupFor`](assert) {
-      let shorthandHelper = makeHelper(() => {});
-      let helper = Helper.extend();
-
-      this.application.register('helper:shorthand', shorthandHelper);
-      this.application.register('helper:complete', helper);
-
-      let lookedUpShorthandHelper = this.applicationInstance.factoryFor('helper:shorthand').class;
-
-      assert.ok(lookedUpShorthandHelper.isHelperFactory, 'shorthand helper isHelper');
-
-      let lookedUpHelper = this.applicationInstance.factoryFor('helper:complete').class;
-
-      assert.ok(lookedUpHelper.isHelperFactory, 'complete helper is factory');
-      assert.ok(helper.detect(lookedUpHelper), 'looked up complete helper');
-    }
-
-    [`@test the default resolver resolves helpers on the namespace`](assert) {
-      let ShorthandHelper = makeHelper(() => {});
-      let CompleteHelper = Helper.extend();
-
-      this.application.ShorthandHelper = ShorthandHelper;
-      this.application.CompleteHelper = CompleteHelper;
-
-      let resolvedShorthand = this.application.resolveRegistration('helper:shorthand');
-      let resolvedComplete = this.application.resolveRegistration('helper:complete');
-
-      assert.equal(
-        resolvedShorthand,
-        ShorthandHelper,
-        'resolve fetches the shorthand helper factory'
-      );
-      assert.equal(resolvedComplete, CompleteHelper, 'resolve fetches the complete helper factory');
-    }
-
-    [`@test the default resolver resolves to the same instance, no matter the notation `](assert) {
-      this.application.NestedPostController = Controller.extend({});
-
-      assert.equal(
-        this.applicationInstance.lookup('controller:nested-post'),
-        this.applicationInstance.lookup('controller:nested_post'),
-        'looks up NestedPost controller on application'
-      );
-    }
-
-    [`@test the default resolver throws an error if the fullName to resolve is invalid`]() {
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration(undefined);
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration(null);
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration('');
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration('');
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration(':');
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration('model');
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration('model:');
-      }, /fullName must be a proper full name/);
-      expectAssertion(() => {
-        this.applicationInstance.resolveRegistration(':type');
-      }, /fullName must be a proper full name/);
-    }
-
-    ['@test the default resolver normalizes lookups'](assert) {
-      let locator = this.applicationInstance.__container__;
-      this.application.PostIndexController = EmberObject.extend({});
-      this.application.register('controller:postIndex', this.application.PostIndexController, {
-        singleton: true,
-      });
-
-      let dotNotationController = locator.lookup('controller:post.index');
-      let camelCaseController = locator.lookup('controller:postIndex');
-
-      assert.ok(dotNotationController instanceof this.application.PostIndexController);
-      assert.ok(camelCaseController instanceof this.application.PostIndexController);
-
-      assert.equal(dotNotationController, camelCaseController);
-    }
-
-    /*
-     * The following are integration tests against the private registry API.
-     */
-
-    [`@test lookup description`](assert) {
-      this.application.toString = () => 'App';
-
-      assert.equal(
-        this.privateRegistry.describe('controller:foo'),
-        'App.FooController',
-        'Type gets appended at the end'
-      );
-      assert.equal(
-        this.privateRegistry.describe('controller:foo.bar'),
-        'App.FooBarController',
-        'dots are removed'
-      );
-      assert.equal(
-        this.privateRegistry.describe('model:foo'),
-        'App.Foo',
-        "models don't get appended at the end"
-      );
-    }
-
-    [`@test assertion for routes without isRouteFactory property`]() {
-      this.application.FooRoute = Component.extend();
-
-      expectAssertion(
-        () => {
-          this.privateRegistry.resolve(`route:foo`);
-        },
-        /to resolve to an Ember.Route/,
-        'Should assert'
-      );
-    }
-
-    [`@test no assertion for routes that extend from Route`](assert) {
-      assert.test.assertions = []; // clear assertions that occurred in beforeEach so they don't affect count
-      assert.expect(0);
-      this.application.FooRoute = Route.extend();
-      this.privateRegistry.resolve(`route:foo`);
-    }
-
-    [`@test assertion for service factories without isServiceFactory property`]() {
-      expectAssertion(() => {
-        this.application.FooService = EmberObject.extend();
-        this.privateRegistry.resolve('service:foo');
-      }, /Expected service:foo to resolve to an Ember.Service but instead it was TestApp\.FooService\./);
-    }
-
-    [`@test no assertion for service factories that extend from Service`](assert) {
-      assert.test.assertions = []; // clear assertions that occurred in beforeEach so they don't affect count
-      assert.expect(0);
-      this.application.FooService = Service.extend();
-      this.privateRegistry.resolve('service:foo');
-    }
-
-    [`@test assertion for component factories without isComponentFactory property`]() {
-      expectAssertion(() => {
-        this.application.FooComponent = EmberObject.extend();
-        this.privateRegistry.resolve('component:foo');
-      }, /Expected component:foo to resolve to an Ember\.Component but instead it was TestApp\.FooComponent\./);
-    }
-
-    [`@test no assertion for component factories that extend from Component`]() {
-      expectNoDeprecation();
-      this.application.FooView = Component.extend();
-      this.privateRegistry.resolve('component:foo');
-    }
-
-    [`@test knownForType returns each item for a given type found`](assert) {
-      this.application.FooBarHelper = 'foo';
-      this.application.BazQuxHelper = 'bar';
-
-      let found = this.privateRegistry.resolver.knownForType('helper');
-
-      assert.deepEqual(found, {
-        'helper:foo-bar': true,
-        'helper:baz-qux': true,
-      });
-    }
-
-    [`@test knownForType is not required to be present on the resolver`](assert) {
-      delete this.privateRegistry.resolver.knownForType;
-
-      this.privateRegistry.resolver.knownForType('helper', () => {});
-
-      assert.ok(true, 'does not error');
-    }
-  }
-);
-
-moduleFor(
-  'Application Dependency Injection - Integration - default resolver w/ other namespace',
-  class extends DefaultResolverApplicationTestCase {
-    beforeEach() {
-      this.UserInterface = context.lookup.UserInterface = Namespace.create();
-      runTask(() => this.createApplication());
-      return this.visit('/');
-    }
-
-    teardown() {
-      let UserInterfaceNamespace = Namespace.NAMESPACES_BY_ID['UserInterface'];
-      if (UserInterfaceNamespace) {
-        runTask(() => {
-          UserInterfaceNamespace.destroy();
-        });
-      }
-      super.teardown();
-    }
-
-    [`@test the default resolver can look things up in other namespaces`](assert) {
-      this.UserInterface.NavigationController = Controller.extend();
-
-      let nav = this.applicationInstance.lookup('controller:userInterface/navigation');
-
-      assert.ok(
-        nav instanceof this.UserInterface.NavigationController,
-        'the result should be an instance of the specified class'
-      );
-    }
-  }
-);
-
-moduleFor(
-  'Application Dependency Injection - Integration - default resolver',
-  class extends DefaultResolverApplicationTestCase {
-    constructor() {
-      super();
-      this._originalLookup = context.lookup;
-      this._originalInfo = getDebugFunction('info');
-    }
-
-    beforeEach() {
-      runTask(() => this.createApplication());
-      return this.visit('/');
-    }
-
-    teardown() {
-      setDebugFunction('info', this._originalInfo);
-      context.lookup = this._originalLookup;
-      super.teardown();
-    }
-
-    [`@test the default resolver logs hits if 'LOG_RESOLVER' is set`](assert) {
-      if (!DEBUG) {
-        assert.ok(true, 'Logging does not occur in production builds');
-        return;
-      }
-
-      assert.test.assertions = []; // clear assertions that occurred in beforeEach so they don't affect count
-      assert.expect(3);
-
-      this.application.LOG_RESOLVER = true;
-      this.application.ScoobyDoo = EmberObject.extend();
-      this.application.toString = () => 'App';
-
-      setDebugFunction('info', function (symbol, name, padding, lookupDescription) {
-        assert.equal(symbol, '[✓]', 'proper symbol is printed when a module is found');
-        assert.equal(name, 'doo:scooby', 'proper lookup value is logged');
-        assert.equal(lookupDescription, 'App.ScoobyDoo');
-      });
-
-      this.applicationInstance.resolveRegistration('doo:scooby');
-    }
-
-    [`@test the default resolver logs misses if 'LOG_RESOLVER' is set`](assert) {
-      if (!DEBUG) {
-        assert.ok(true, 'Logging does not occur in production builds');
-        return;
-      }
-
-      assert.test.assertions = []; // clear assertions that occurred in beforeEach so they don't affect count
-      assert.expect(3);
-
-      this.application.LOG_RESOLVER = true;
-      this.application.toString = () => 'App';
-
-      setDebugFunction('info', function (symbol, name, padding, lookupDescription) {
-        assert.equal(symbol, '[ ]', 'proper symbol is printed when a module is not found');
-        assert.equal(name, 'doo:scooby', 'proper lookup value is logged');
-        assert.equal(lookupDescription, 'App.ScoobyDoo');
-      });
-
-      this.applicationInstance.resolveRegistration('doo:scooby');
-    }
-
-    [`@test doesn't log without LOG_RESOLVER`](assert) {
-      if (!DEBUG) {
-        assert.ok(true, 'Logging does not occur in production builds');
-        return;
-      }
-
-      let infoCount = 0;
-
-      this.application.ScoobyDoo = EmberObject.extend();
-
-      setDebugFunction('info', () => (infoCount = infoCount + 1));
-
-      this.applicationInstance.resolveRegistration('doo:scooby');
-      this.applicationInstance.resolveRegistration('doo:scrappy');
-      assert.equal(infoCount, 0, 'console.info should not be called if LOG_RESOLVER is not set');
-    }
-  }
-);
diff --git a/packages/@ember/application/tests/dependency_injection/normalization_test.js b/packages/@ember/application/tests/dependency_injection/normalization_test.js
deleted file mode 100644
index d6f726cbc22..00000000000
--- a/packages/@ember/application/tests/dependency_injection/normalization_test.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { run } from '@ember/runloop';
-import Application from '@ember/application';
-import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
-
-let application, registry;
-
-moduleFor(
-  'Application Dependency Injection - Globals Resolver - normalize [DEPRECATED]',
-  class extends TestCase {
-    constructor() {
-      super();
-
-      // Must use default resolver because test resolver does not normalize
-      run(() => {
-        expectDeprecation(() => {
-          application = Application.create();
-        });
-      });
-      registry = application.__registry__;
-    }
-
-    teardown() {
-      super.teardown();
-      run(application, 'destroy');
-      application = undefined;
-      registry = undefined;
-    }
-
-    ['@test normalization'](assert) {
-      assert.ok(registry.normalize, 'registry#normalize is present');
-
-      assert.equal(registry.normalize('foo:bar'), 'foo:bar');
-
-      assert.equal(registry.normalize('controller:posts'), 'controller:posts');
-      assert.equal(registry.normalize('controller:posts_index'), 'controller:postsIndex');
-      assert.equal(registry.normalize('controller:posts.index'), 'controller:postsIndex');
-      assert.equal(registry.normalize('controller:posts-index'), 'controller:postsIndex');
-      assert.equal(registry.normalize('controller:posts.post.index'), 'controller:postsPostIndex');
-      assert.equal(registry.normalize('controller:posts_post.index'), 'controller:postsPostIndex');
-      assert.equal(registry.normalize('controller:posts.post_index'), 'controller:postsPostIndex');
-      assert.equal(registry.normalize('controller:posts.post-index'), 'controller:postsPostIndex');
-      assert.equal(registry.normalize('controller:postsIndex'), 'controller:postsIndex');
-      assert.equal(registry.normalize('controller:blogPosts.index'), 'controller:blogPostsIndex');
-      assert.equal(registry.normalize('controller:blog/posts.index'), 'controller:blog/postsIndex');
-      assert.equal(registry.normalize('controller:blog/posts-index'), 'controller:blog/postsIndex');
-      assert.equal(
-        registry.normalize('controller:blog/posts.post.index'),
-        'controller:blog/postsPostIndex'
-      );
-      assert.equal(
-        registry.normalize('controller:blog/posts_post.index'),
-        'controller:blog/postsPostIndex'
-      );
-      assert.equal(
-        registry.normalize('controller:blog/posts_post-index'),
-        'controller:blog/postsPostIndex'
-      );
-
-      assert.equal(registry.normalize('template:blog/posts_index'), 'template:blog/posts_index');
-    }
-
-    ['@test normalization is indempotent'](assert) {
-      let examples = [
-        'controller:posts',
-        'controller:posts.post.index',
-        'controller:blog/posts.post_index',
-        'template:foo_bar',
-      ];
-
-      examples.forEach((example) => {
-        assert.equal(registry.normalize(registry.normalize(example)), registry.normalize(example));
-      });
-    }
-  }
-);
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 9344d764076..46d6da8a07e 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -8,4 +8,3 @@ export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
 export const PARTIALS = !!'3.15.0-beta.1';
-export const GLOBALS_RESOLVER = !!'3.16.0-beta.1';
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 7901e14908e..270e5d04869 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -7,7 +7,6 @@ import { Registry } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
-import DefaultResolver from '@ember/application/globals-resolver';
 import EngineInstance from '@ember/engine/instance';
 import { RoutingService } from '@ember/-internals/routing';
 import { ContainerDebugAdapter } from '@ember/-internals/extension-support';
@@ -417,15 +416,6 @@ Engine.reopenClass({
     return registry;
   },
 
-  /**
-    Set this to provide an alternate class to `DefaultResolver`
-
-    @deprecated Use 'Resolver' instead
-    @property resolver
-    @public
-  */
-  resolver: null,
-
   /**
     Set this to provide an alternate class to `DefaultResolver`
 
@@ -452,7 +442,7 @@ Engine.reopenClass({
   @return {*} the resolved value for a given lookup
 */
 function resolverFor(namespace) {
-  let ResolverClass = get(namespace, 'Resolver') || DefaultResolver;
+  let ResolverClass = get(namespace, 'Resolver');
   let props = { namespace };
   return ResolverClass.create(props);
 }
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 6308bd516b2..7709b6b9448 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -92,7 +92,6 @@ import { run } from '@ember/runloop';
 import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import Application, { onLoad, runLoadHooks } from '@ember/application';
-import Resolver from '@ember/application/globals-resolver';
 import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
@@ -154,32 +153,6 @@ Ember.setOwner = setOwner;
 Ember.Application = Application;
 Ember.ApplicationInstance = ApplicationInstance;
 
-Object.defineProperty(Ember, 'Resolver', {
-  get() {
-    deprecate(
-      'Using the globals resolver is deprecated. Use the ember-resolver package instead. See https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
-      false,
-      {
-        id: 'ember.globals-resolver',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
-        for: 'ember-source',
-        since: {
-          enabled: '3.16.0',
-        },
-      }
-    );
-
-    return Resolver;
-  },
-});
-
-Object.defineProperty(Ember, 'DefaultResolver', {
-  get() {
-    return Ember.Resolver;
-  },
-});
-
 // ****@ember/engine****
 Ember.Engine = Engine;
 Ember.EngineInstance = EngineInstance;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 59eb8963b8c..1d621d59a86 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -2,7 +2,6 @@ import Ember from '../index';
 import require from 'require';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS, FEATURES } from '@ember/canary-features';
 import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
-import Resolver from '@ember/application/globals-resolver';
 import { DEBUG } from '@glimmer/env';
 import { ENV } from '@ember/-internals/environment';
 
@@ -101,18 +100,6 @@ moduleFor(
         );
       }
     }
-
-    ['@test Ember.Resolver is present (but deprecated)'](assert) {
-      expectDeprecation(() => {
-        assert.strictEqual(Ember.Resolver, Resolver, 'Ember.Resolver exists');
-      }, /Using the globals resolver is deprecated/);
-    }
-
-    ['@test Ember.DefaultResolver is present (but deprecated)'](assert) {
-      expectDeprecation(() => {
-        assert.strictEqual(Ember.DefaultResolver, Resolver, 'Ember.DefaultResolver exists');
-      }, /Using the globals resolver is deprecated/);
-    }
   }
 );
 
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index 5a287432277..49cb9317178 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -31,7 +31,6 @@ export { default as RenderingTestCase } from './lib/test-cases/rendering';
 export { default as RouterNonApplicationTestCase } from './lib/test-cases/router-non-application';
 export { default as RouterTestCase } from './lib/test-cases/router';
 export { default as AutobootApplicationTestCase } from './lib/test-cases/autoboot-application';
-export { default as DefaultResolverApplicationTestCase } from './lib/test-cases/default-resolver-application';
 
 export {
   default as TestResolver,
diff --git a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js b/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
deleted file mode 100644
index 83e9559fbcd..00000000000
--- a/packages/internal-test-helpers/lib/test-cases/default-resolver-application.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import AbstractApplicationTestCase from './abstract-application';
-import DefaultResolver from '@ember/application/globals-resolver';
-import Application from '@ember/application';
-import { setTemplates, setTemplate } from '@ember/-internals/glimmer';
-import { Router } from '@ember/-internals/routing';
-
-import { runTask } from '../run';
-
-export default class DefaultResolverApplicationTestCase extends AbstractApplicationTestCase {
-  createApplication() {
-    let application;
-    expectDeprecation(() => {
-      application = this.application = Application.create(this.applicationOptions);
-    }, /(Using the globals resolver is deprecated|Usage of the Ember Global is deprecated)/);
-
-    // If the test expects a certain number of assertions, increment that number
-    let { assert } = QUnit.config.current;
-    if (typeof assert.test.expected === 'number') {
-      assert.test.expected += 1;
-      QUnit.config.current.expected += 1;
-    }
-
-    application.Router = Router.extend(this.routerOptions);
-    return application;
-  }
-
-  get applicationOptions() {
-    return Object.assign(super.applicationOptions, {
-      name: 'TestApp',
-      autoboot: false,
-      Resolver: DefaultResolver,
-    });
-  }
-
-  afterEach() {
-    setTemplates({});
-    return super.afterEach();
-  }
-
-  get appRouter() {
-    return this.applicationInstance.lookup('router:main');
-  }
-
-  transitionTo() {
-    return runTask(() => {
-      return this.appRouter.transitionTo(...arguments);
-    });
-  }
-
-  addTemplate(name, templateString) {
-    let compiled = this.compile(templateString);
-    setTemplate(name, compiled);
-    return compiled;
-  }
-}
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index efbb3376ffc..f96ccf2ff90 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -36,7 +36,6 @@ module.exports = {
     '_internalReset',
     '_invoke',
     '_lazyInjections',
-    '_logLookup',
     '_normalizeCache',
     '_onLookup',
     '_options',
@@ -350,7 +349,6 @@ module.exports = {
     'location',
     'log',
     'lookup',
-    'lookupDescription',
     'lt',
     'lte',
     'makeArray',
@@ -373,7 +371,6 @@ module.exports = {
     'mount',
     'mut',
     'name',
-    'namespace',
     'nearestOfType',
     'nearestWithProperty',
     'next',
@@ -409,7 +406,6 @@ module.exports = {
     'parent',
     'parentView',
     'parentViewDidChange',
-    'parseName',
     'partial',
     'pattern',
     'pauseTest',
@@ -478,16 +474,9 @@ module.exports = {
     'reset',
     'resetController',
     'resolve',
-    'resolveController',
-    'resolveHelper',
-    'resolveModel',
-    'resolveOther',
     'resolver',
     'resolveRegistration',
     'resolverFor',
-    'resolveRoute',
-    'resolveTemplate',
-    'resolveView',
     'resumeTest',
     'rethrow',
     'retry',
@@ -558,7 +547,6 @@ module.exports = {
     'tracked',
     'transitionTo',
     'transitionToRoute',
-    'translateToContainerFullname',
     'trigger',
     'triggerAction',
     'triggerEvent',
@@ -583,7 +571,6 @@ module.exports = {
     'url',
     'urlFor',
     'userAgent',
-    'useRouterNaming',
     'validationCache',
     'value',
     'visit',

From ceeeb5a6c22bae016df07c44470eb74831879b1b Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Wed, 21 Jul 2021 21:59:02 -0400
Subject: [PATCH 0582/1405] Avoid global resolver in tests/node app setup

---
 tests/node/helpers/setup-app.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/node/helpers/setup-app.js b/tests/node/helpers/setup-app.js
index 6749946018b..32abc05b417 100644
--- a/tests/node/helpers/setup-app.js
+++ b/tests/node/helpers/setup-app.js
@@ -92,16 +92,23 @@ function createApplication() {
 
   let app = this.Ember.Application.extend().create({
     autoboot: false,
+    Resolver: {
+      create: (specifier) => {
+        return this.registry[specifier];
+      },
+    },
   });
 
-  app.Router = this.Ember.Router.extend({
+  let Router = this.Ember.Router.extend({
     location: 'none',
   });
 
   if (this.routesCallback) {
-    app.Router.map(this.routesCallback);
+    Router.map(this.routesCallback);
   }
 
+  this.register('router:main', Router);
+
   registerApplicationClasses(app, this.registry);
 
   // Run application initializers

From f1851d951fdfb0ca1592828ccff59d2ee3cbb197 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 21 Jul 2021 20:35:30 -0700
Subject: [PATCH 0583/1405] Revert "Remove deprecated disabledWhen"

---
 .../glimmer/lib/components/-link-to.ts        |  6 ++
 .../glimmer/lib/components/link-to.ts         | 64 ++++++++++++++
 .../components/link-to/routing-angle-test.js  | 81 +++++++++++++++++-
 .../components/link-to/routing-curly-test.js  | 83 ++++++++++++++++++-
 4 files changed, 231 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index f0a8e651e13..642eeb64605 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -879,6 +879,12 @@ const LinkComponent = EmberComponent.extend({
   loadingHref: '#',
 
   didReceiveAttrs() {
+    let { disabledWhen } = this;
+
+    if (disabledWhen !== undefined) {
+      this.set('disabled', disabledWhen);
+    }
+
     let { params } = this;
 
     if (!params || params.length === 0) {
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 3bb0b105281..a139ba18c80 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -614,6 +614,70 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     });
   }
 
+  // @disabledWhen
+  {
+    let superIsSupportedArgument = prototype['isSupportedArgument'];
+
+    Object.defineProperty(prototype, 'isSupportedArgument', {
+      configurable: true,
+      enumerable: false,
+      value: function isSupportedArgument(this: LinkTo, name: string): boolean {
+        if (this.modernized) {
+          if (name === 'disabledWhen') {
+            deprecate(
+              'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
+                'Use the `@disabled` argument instead.',
+              false,
+              {
+                id: 'ember.link-to.disabled-when',
+                for: 'ember-source',
+                since: {},
+                until: '4.0.0',
+              }
+            );
+
+            return true;
+          }
+        }
+
+        return superIsSupportedArgument.call(this, name);
+      },
+    });
+
+    let superDescriptor = descriptorFor(prototype, 'isDisabled');
+
+    assert(
+      `[BUG] expecting isDisabled to be a getter on <LinkTo>`,
+      superDescriptor && typeof superDescriptor.get === 'function'
+    );
+
+    let superGetter = superDescriptor.get as (this: LinkTo) => boolean;
+
+    Object.defineProperty(prototype, 'isDisabled', {
+      configurable: true,
+      enumerable: false,
+      get: function isDisabled(this: LinkTo): boolean {
+        if ('disabledWhen' in this.args.named) {
+          deprecate(
+            'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
+              'Use the `@disabled` argument instead.',
+            false,
+            {
+              id: 'ember.link-to.disabled-when',
+              for: 'ember-source',
+              since: {},
+              until: '4.0.0',
+            }
+          );
+
+          return Boolean(this.named('disabledWhen'));
+        }
+
+        return superGetter.call(this);
+      },
+    });
+  }
+
   // QP
   {
     let superModelsDescriptor = descriptorFor(prototype, 'models');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index f1d1cfc863c..fa7e4c22561 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -147,6 +147,64 @@ moduleFor(
       assert.strictEqual(this.$('#about-link').attr('href'), null, 'there is no href attribute');
     }
 
+    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
+      this.addTemplate(
+        'index',
+        `
+        <LinkTo id="about-link-static" @route="about" @disabledWhen="truthy">About</LinkTo>
+        <LinkTo id="about-link-dynamic" @route="about" @disabledWhen={{this.dynamicDisabledWhen}}>About</LinkTo>
+        `
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicDisabledWhen = true;
+        }
+      );
+
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.equal(
+        this.$('#about-link-static.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.equal(
+        this.$('#about-link-dynamic.disabled').length,
+        1,
+        'The dynamic link is disabled when its disabledWhen is true'
+      );
+
+      expectDeprecation(
+        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.equal(
+        this.$('#about-link-static.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabledWhen becomes false'
+      );
+    }
+
     async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -326,6 +384,27 @@ moduleFor(
       );
     }
 
+    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
+      this.addTemplate(
+        'index',
+        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}}>About</LinkTo>`
+      );
+
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      await expectDeprecationAsync(
+        () => this.click('#about-link'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
+    }
+
     async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -372,7 +451,7 @@ moduleFor(
       assert.equal(
         this.$('h3.about').length,
         1,
-        'Transitioning did occur when disabled became false'
+        'Transitioning did occur when disabledWhen became false'
       );
     }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index eb12ae9e343..2ecf5ae4cf0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -152,6 +152,64 @@ moduleFor(
       );
     }
 
+    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
+      this.addTemplate(
+        'index',
+        `
+        <div id="about-link-static">{{#link-to route="about" disabledWhen="truthy"}}About{{/link-to}}</div>
+        <div id="about-link-dynamic">{{#link-to route="about" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}</div>
+        `
+      );
+
+      let controller;
+
+      this.add(
+        'controller:index',
+        class extends Controller {
+          constructor(...args) {
+            super(...args);
+            controller = this;
+          }
+
+          dynamicDisabledWhen = true;
+        }
+      );
+
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.equal(
+        this.$('#about-link-static > a.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.equal(
+        this.$('#about-link-dynamic > a.disabled').length,
+        1,
+        'The dynamic link is disabled when its disabledWhen is true'
+      );
+
+      expectDeprecation(
+        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.equal(
+        this.$('#about-link-static > a.disabled').length,
+        1,
+        'The static link is disabled when its disabledWhen is true'
+      );
+      assert.strictEqual(
+        this.$('#about-link-dynamic > a.disabled').length,
+        0,
+        'The dynamic link is re-enabled when its disabledWhen becomes false'
+      );
+    }
+
     async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -193,7 +251,7 @@ moduleFor(
       assert.equal(
         this.$('#about-link-static > a.disabled').length,
         1,
-        'The static link is disabled when its disabled is true'
+        'The static link is disabled when its disabledWhen is true'
       );
       assert.strictEqual(
         this.$('#about-link-dynamic > a.disabled').length,
@@ -338,6 +396,27 @@ moduleFor(
       );
     }
 
+    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
+      this.addTemplate(
+        'index',
+        `<div id="about-link">{{#link-to route="about" disabledWhen=true}}About{{/link-to}}</div>`
+      );
+
+      await expectDeprecationAsync(
+        () => this.visit('/'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      await expectDeprecationAsync(
+        () => this.click('#about-link > a'),
+        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
+        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      );
+
+      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
+    }
+
     async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -384,7 +463,7 @@ moduleFor(
       assert.equal(
         this.$('h3.about').length,
         1,
-        'Transitioning did occur when disabled became false'
+        'Transitioning did occur when disabledWhen became false'
       );
     }
 

From 8faddaf98e502b65f62574a3e2ecda5a4dc64134 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 21 Jul 2021 19:09:12 -0700
Subject: [PATCH 0584/1405] Remove .property()

---
 .../@ember/-internals/metal/lib/computed.ts   | 85 -------------------
 .../tests/system/object/computed_test.js      | 20 -----
 tests/docs/expected.js                        |  1 -
 3 files changed, 106 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 9f261df8c6f..7e38a65c1a6 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -733,81 +733,6 @@ class ComputedDecoratorImpl extends Function {
     return this;
   }
 
-  /**
-    Sets the dependent keys on this computed property. Pass any number of
-    arguments containing key paths that this computed property depends on.
-
-    Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    class President {
-      constructor(firstName, lastName) {
-        set(this, 'firstName', firstName);
-        set(this, 'lastName', lastName);
-      }
-
-      // Tell Ember that this computed property depends on firstName
-      // and lastName
-      @computed().property('firstName', 'lastName')
-      get fullName() {
-        return `${this.firstName} ${this.lastName}`;
-      }
-    }
-
-    let president = new President('Barack', 'Obama');
-
-    president.fullName; // 'Barack Obama'
-    ```
-
-    Classic Class Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    let President = EmberObject.extend({
-      fullName: computed(function() {
-        return this.get('firstName') + ' ' + this.get('lastName');
-
-        // Tell Ember that this computed property depends on firstName
-        // and lastName
-      }).property('firstName', 'lastName')
-    });
-
-    let president = President.create({
-      firstName: 'Barack',
-      lastName: 'Obama'
-    });
-
-    president.get('fullName'); // 'Barack Obama'
-    ```
-
-    @method property
-    @deprecated
-    @param {String} path* zero or more property paths
-    @return {ComputedProperty} this
-    @chainable
-    @public
-  */
-  property(this: Decorator, ...keys: string[]) {
-    deprecate(
-      'Setting dependency keys using the `.property()` modifier has been deprecated. Pass the dependency keys directly to computed as arguments instead. If you are using `.property()` on a computed property macro, consider refactoring your macro to receive additional dependent keys in its initial declaration.',
-      false,
-      {
-        id: 'computed-property.property',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_computed-property-property',
-        for: 'ember-source',
-        since: {
-          enabled: '3.9.0-beta.1',
-        },
-      }
-    );
-    (descriptorForDecorator(this) as ComputedProperty)._property(...keys);
-    return this;
-  }
-
   /**
     In some cases, you may want to annotate computed properties with additional
     metadata about how they function or what values they operate on. For example,
@@ -1010,16 +935,6 @@ class ComputedDecoratorImpl extends Function {
   libraries that depend on or use Ember, since there is no guarantee that the user
   will have [prototype Extensions](https://guides.emberjs.com/release/configuring-ember/disabling-prototype-extensions/) enabled._
 
-  The alternative syntax, with prototype extensions, might look like:
-
-  ```js
-  fullName: function() {
-    return this.get('firstName') + ' ' + this.get('lastName');
-  }.property('firstName', 'lastName')
-  ```
-
-  This form does not work with native decorators.
-
   @method computed
   @for @ember/object
   @static
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
index 44552bda829..e3acf280d7a 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
@@ -363,26 +363,6 @@ moduleFor(
       obj2.destroy();
     }
 
-    ['@test can declare dependent keys with .property()'](assert) {
-      let Obj;
-
-      expectDeprecation(() => {
-        Obj = EmberObject.extend({
-          foo: computed(function () {
-            return this.bar;
-          }).property('bar'),
-        });
-      }, /Setting dependency keys using the `.property\(\)` modifier has been deprecated/);
-
-      let obj = Obj.create({ bar: 1 });
-
-      assert.equal(obj.get('foo'), 1);
-
-      obj.set('bar', 2);
-
-      assert.equal(obj.get('foo'), 2);
-    }
-
     ['@test native getters and setters work'](assert) {
       let MyClass = EmberObject.extend({
         bar: 123,
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index efbb3376ffc..97d56d74519 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -417,7 +417,6 @@ module.exports = {
     'positionalParams',
     'preventDefault',
     'promise',
-    'property',
     'pushObject',
     'pushObjects',
     'pushState',

From 28804ab8c82f765b521e4959cd3a8e3d216b69dd Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 24 May 2021 17:52:58 +0200
Subject: [PATCH 0585/1405] Remove jQuery integration in EventDispatcher

---
 .../integration/event-dispatcher-test.js      | 207 ++--------
 .../views/lib/system/event_dispatcher.js      | 385 +++++++-----------
 .../lib/system/jquery_event_deprecation.js    |  64 ---
 3 files changed, 180 insertions(+), 476 deletions(-)
 delete mode 100644 packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js

diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index 127b8fd4384..e893ecc8a8a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -1,14 +1,12 @@
-import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { Component } from '../utils/helpers';
 import { _getCurrentRunLoop } from '@ember/runloop';
 import {
-  subscribe as instrumentationSubscribe,
   reset as instrumentationReset,
+  subscribe as instrumentationSubscribe,
 } from '@ember/instrumentation';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
-import { DEBUG } from '@glimmer/env';
 
 let canDataTransfer = Boolean(document.createEvent('HTMLEvents').dataTransfer);
 
@@ -273,6 +271,29 @@ moduleFor(
       this.$('#is-done').trigger('click');
     }
 
+    ['@test native event on text node does not throw on hasAttribute [ISSUE #16730]'](assert) {
+      this.registerComponent('x-foo', {
+        ComponentClass: Component.extend({
+          actions: {
+            someAction() {},
+          },
+        }),
+        template: `<a id="inner" href="#" {{action 'someAction'}}>test</a>`,
+      });
+
+      this.render(`{{x-foo id="outer"}}`);
+
+      let node = this.$('#inner')[0].childNodes[0];
+
+      runTask(() => {
+        let event = document.createEvent('HTMLEvents');
+        event.initEvent('mousemove', true, true);
+        node.dispatchEvent(event);
+      });
+
+      assert.ok(true);
+    }
+
     ['@test [DEPRECATED] delegated event listeners work for mouseEnter/Leave'](assert) {
       let receivedEnterEvents = [];
       let receivedLeaveEvents = [];
@@ -669,181 +690,3 @@ if (canDataTransfer) {
     }
   );
 }
-
-if (jQueryDisabled) {
-  moduleFor(
-    'EventDispatcher#native-events',
-    class extends RenderingTestCase {
-      ['@test native events are passed when jQuery is not present'](assert) {
-        let receivedEvent;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click(event) {
-              receivedEvent = event;
-            },
-          }),
-          template: `<button id="foo">bar</button>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        runTask(() => this.$('#foo').click());
-        assert.ok(receivedEvent, 'click event was triggered');
-        assert.notOk(receivedEvent.originalEvent, 'event is not a jQuery.Event');
-      }
-
-      ['@test native event on text node does not throw on hasAttribute [ISSUE #16730]'](assert) {
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            actions: {
-              someAction() {},
-            },
-          }),
-          template: `<a id="inner" href="#" {{action 'someAction'}}>test</a>`,
-        });
-
-        this.render(`{{x-foo id="outer"}}`);
-
-        let node = this.$('#inner')[0].childNodes[0];
-
-        runTask(() => {
-          let event = document.createEvent('HTMLEvents');
-          event.initEvent('mousemove', true, true);
-          node.dispatchEvent(event);
-        });
-
-        assert.ok(true);
-      }
-    }
-  );
-} else {
-  moduleFor(
-    'EventDispatcher#jquery-events',
-    class extends RenderingTestCase {
-      beforeEach() {
-        this.jqueryIntegration = window.EmberENV._JQUERY_INTEGRATION;
-      }
-
-      afterEach() {
-        window.EmberENV._JQUERY_INTEGRATION = this.jqueryIntegration;
-      }
-
-      ['@test jQuery events are passed when jQuery is present'](assert) {
-        let receivedEvent;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click(event) {
-              receivedEvent = event;
-            },
-          }),
-          template: `<button id="foo">bar</button>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        runTask(() => this.$('#foo').click());
-        assert.ok(receivedEvent, 'click event was triggered');
-        assert.ok(receivedEvent instanceof jQuery.Event, 'event is a jQuery.Event');
-      }
-
-      ['@test accessing jQuery.Event#originalEvent is deprecated'](assert) {
-        let receivedEvent;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click(event) {
-              receivedEvent = event;
-            },
-          }),
-          template: `<button id="foo">bar</button>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        runTask(() => this.$('#foo').click());
-        expectDeprecation(() => {
-          let { originalEvent } = receivedEvent;
-          assert.ok(originalEvent, 'jQuery event has originalEvent property');
-          assert.equal(originalEvent.type, 'click', 'properties of originalEvent are available');
-        }, 'Accessing jQuery.Event specific properties is deprecated. Either use the ember-jquery-legacy addon to normalize events to native events, or explicitly opt into jQuery integration using @ember/optional-features.');
-      }
-
-      ['@test other jQuery.Event properties do not trigger deprecation'](assert) {
-        let receivedEvent;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click(event) {
-              receivedEvent = event;
-            },
-          }),
-          template: `<button id="foo">bar</button>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        runTask(() => this.$('#foo').click());
-        expectNoDeprecation(() => {
-          receivedEvent.stopPropagation();
-          receivedEvent.stopImmediatePropagation();
-          receivedEvent.preventDefault();
-          assert.ok(receivedEvent.bubbles, 'properties of jQuery event are available');
-          assert.equal(receivedEvent.type, 'click', 'properties of jQuery event are available');
-        });
-      }
-
-      ['@test accessing jQuery.Event#originalEvent does not trigger deprecations when jquery integration is explicitly enabled'](
-        assert
-      ) {
-        let receivedEvent;
-        window.EmberENV._JQUERY_INTEGRATION = true;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click(event) {
-              receivedEvent = event;
-            },
-          }),
-          template: `<button id="foo">bar</button>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        runTask(() => this.$('#foo').click());
-        expectNoDeprecation(() => {
-          let { originalEvent } = receivedEvent;
-          assert.ok(originalEvent, 'jQuery event has originalEvent property');
-          assert.equal(originalEvent.type, 'click', 'properties of originalEvent are available');
-        });
-      }
-
-      [`@${
-        DEBUG ? 'test' : 'skip'
-      } accessing jQuery.Event#__originalEvent does not trigger deprecations to support ember-jquery-legacy`](
-        assert
-      ) {
-        let receivedEvent;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click(event) {
-              receivedEvent = event;
-            },
-          }),
-          template: `<button id="foo">bar</button>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        runTask(() => this.$('#foo').click());
-        expectNoDeprecation(() => {
-          let { __originalEvent: originalEvent } = receivedEvent;
-          assert.ok(originalEvent, 'jQuery event has __originalEvent property');
-          assert.equal(originalEvent.type, 'click', 'properties of __originalEvent are available');
-        });
-      }
-    }
-  );
-}
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 4cb32af5112..94c6509aae2 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -3,11 +3,9 @@ import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { getElementView } from '@ember/-internals/views';
-import { jQuery, jQueryDisabled } from './jquery';
 import ActionManager from './action_manager';
-import addJQueryEventDeprecation from './jquery_event_deprecation';
 import { contains } from './utils';
-import { JQUERY_INTEGRATION, MOUSE_ENTER_LEAVE_MOVE_EVENTS } from '@ember/deprecated-features';
+import { MOUSE_ENTER_LEAVE_MOVE_EVENTS } from '@ember/deprecated-features';
 
 /**
 @module ember
@@ -163,75 +161,47 @@ export default EmberObject.extend({
 
     let rootElementSelector = get(this, 'rootElement');
     let rootElement;
-    if (!JQUERY_INTEGRATION || jQueryDisabled) {
-      if (typeof rootElementSelector !== 'string') {
-        rootElement = rootElementSelector;
-      } else {
-        rootElement = document.querySelector(rootElementSelector);
-      }
-
-      assert(
-        `You cannot use the same root element (${
-          get(this, 'rootElement') || rootElement.tagName
-        }) multiple times in an Ember.Application`,
-        !rootElement.classList.contains(ROOT_ELEMENT_CLASS)
-      );
-      assert(
-        'You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application',
-        (() => {
-          let target = rootElement.parentNode;
-          do {
-            if (target.classList.contains(ROOT_ELEMENT_CLASS)) {
-              return false;
-            }
-
-            target = target.parentNode;
-          } while (target && target.nodeType === 1);
-
-          return true;
-        })()
-      );
-      assert(
-        'You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application',
-        !rootElement.querySelector(ROOT_ELEMENT_SELECTOR)
-      );
-
-      rootElement.classList.add(ROOT_ELEMENT_CLASS);
-
-      assert(
-        `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${
-          get(this, 'rootElement') || rootElement.tagName
-        }). Make sure you set rootElement to the body or an element in the body.`,
-        rootElement.classList.contains(ROOT_ELEMENT_CLASS)
-      );
+    if (typeof rootElementSelector !== 'string') {
+      rootElement = rootElementSelector;
     } else {
-      rootElement = jQuery(rootElementSelector);
-      assert(
-        `You cannot use the same root element (${
-          rootElement.selector || rootElement[0].tagName
-        }) multiple times in an Ember.Application`,
-        !rootElement.is(ROOT_ELEMENT_SELECTOR)
-      );
-      assert(
-        'You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application',
-        !rootElement.closest(ROOT_ELEMENT_SELECTOR).length
-      );
-      assert(
-        'You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application',
-        !rootElement.find(ROOT_ELEMENT_SELECTOR).length
-      );
-
-      rootElement.addClass(ROOT_ELEMENT_CLASS);
-
-      if (!rootElement.is(ROOT_ELEMENT_SELECTOR)) {
-        throw new TypeError(
-          `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${
-            rootElement.selector || rootElement[0].tagName
-          }). Make sure you set rootElement to the body or an element in the body.`
-        );
-      }
+      rootElement = document.querySelector(rootElementSelector);
     }
 
+    assert(
+      `You cannot use the same root element (${
+        get(this, 'rootElement') || rootElement.tagName
+      }) multiple times in an Ember.Application`,
+      !rootElement.classList.contains(ROOT_ELEMENT_CLASS)
+    );
+    assert(
+      'You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application',
+      (() => {
+        let target = rootElement.parentNode;
+        do {
+          if (target.classList.contains(ROOT_ELEMENT_CLASS)) {
+            return false;
+          }
+
+          target = target.parentNode;
+        } while (target && target.nodeType === 1);
+
+        return true;
+      })()
+    );
+    assert(
+      'You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application',
+      !rootElement.querySelector(ROOT_ELEMENT_SELECTOR)
+    );
+
+    rootElement.classList.add(ROOT_ELEMENT_CLASS);
+
+    assert(
+      `Unable to add '${ROOT_ELEMENT_CLASS}' class to root element (${
+        get(this, 'rootElement') || rootElement.tagName
+      }). Make sure you set rootElement to the body or an element in the body.`,
+      rootElement.classList.contains(ROOT_ELEMENT_CLASS)
+    );
+
     // save off the final sanitized root element (for usage in setupHandler)
     this._sanitizedRootElement = rootElement;
 
@@ -290,185 +260,144 @@ export default EmberObject.extend({
       return; // nothing to do
     }
 
-    if (!JQUERY_INTEGRATION || jQueryDisabled) {
-      let viewHandler = (target, event) => {
-        let view = getElementView(target);
-        let result = true;
+    let viewHandler = (target, event) => {
+      let view = getElementView(target);
+      let result = true;
 
-        if (view) {
-          result = view.handleEvent(eventName, event);
-        }
+      if (view) {
+        result = view.handleEvent(eventName, event);
+      }
 
-        return result;
-      };
+      return result;
+    };
 
-      let actionHandler = (target, event) => {
-        let actionId = target.getAttribute('data-ember-action');
-        let actions = ActionManager.registeredActions[actionId];
+    let actionHandler = (target, event) => {
+      let actionId = target.getAttribute('data-ember-action');
+      let actions = ActionManager.registeredActions[actionId];
 
-        // In Glimmer2 this attribute is set to an empty string and an additional
-        // attribute it set for each action on a given element. In this case, the
-        // attributes need to be read so that a proper set of action handlers can
-        // be coalesced.
-        if (actionId === '') {
-          let attributes = target.attributes;
-          let attributeCount = attributes.length;
+      // In Glimmer2 this attribute is set to an empty string and an additional
+      // attribute it set for each action on a given element. In this case, the
+      // attributes need to be read so that a proper set of action handlers can
+      // be coalesced.
+      if (actionId === '') {
+        let attributes = target.attributes;
+        let attributeCount = attributes.length;
 
-          actions = [];
+        actions = [];
 
-          for (let i = 0; i < attributeCount; i++) {
-            let attr = attributes.item(i);
-            let attrName = attr.name;
+        for (let i = 0; i < attributeCount; i++) {
+          let attr = attributes.item(i);
+          let attrName = attr.name;
 
-            if (attrName.indexOf('data-ember-action-') === 0) {
-              actions = actions.concat(ActionManager.registeredActions[attr.value]);
-            }
+          if (attrName.indexOf('data-ember-action-') === 0) {
+            actions = actions.concat(ActionManager.registeredActions[attr.value]);
           }
         }
+      }
 
-        // We have to check for actions here since in some cases, jQuery will trigger
-        // an event on `removeChild` (i.e. focusout) after we've already torn down the
-        // action handlers for the view.
-        if (!actions) {
-          return;
-        }
+      // We have to check for actions here since in some cases, jQuery will trigger
+      // an event on `removeChild` (i.e. focusout) after we've already torn down the
+      // action handlers for the view.
+      if (!actions) {
+        return;
+      }
 
-        let result = true;
-        for (let index = 0; index < actions.length; index++) {
-          let action = actions[index];
+      let result = true;
+      for (let index = 0; index < actions.length; index++) {
+        let action = actions[index];
 
-          if (action && action.eventName === eventName) {
-            // return false if any of the action handlers returns false
-            result = action.handler(event) && result;
-          }
+        if (action && action.eventName === eventName) {
+          // return false if any of the action handlers returns false
+          result = action.handler(event) && result;
         }
-        return result;
-      };
-
-      // Special handling of events that don't bubble (event delegation does not work).
-      // Mimics the way this is handled in jQuery,
-      // see https://github.com/jquery/jquery/blob/899c56f6ada26821e8af12d9f35fa039100e838e/src/event.js#L666-L700
-      if (MOUSE_ENTER_LEAVE_MOVE_EVENTS && EVENT_MAP[event] !== undefined) {
-        let mappedEventType = EVENT_MAP[event];
-        let origEventType = event;
-
-        let createFakeEvent = (eventType, event) => {
-          let fakeEvent = document.createEvent('MouseEvent');
-          fakeEvent.initMouseEvent(
-            eventType,
-            false,
-            false,
-            event.view,
-            event.detail,
-            event.screenX,
-            event.screenY,
-            event.clientX,
-            event.clientY,
-            event.ctrlKey,
-            event.altKey,
-            event.shiftKey,
-            event.metaKey,
-            event.button,
-            event.relatedTarget
-          );
-
-          // fake event.target as we don't dispatch the event
-          Object.defineProperty(fakeEvent, 'target', { value: event.target, enumerable: true });
-
-          return fakeEvent;
-        };
-
-        let handleMappedEvent = (this._eventHandlers[mappedEventType] = (event) => {
-          let target = event.target;
-          let related = event.relatedTarget;
-
-          while (
-            target &&
-            target.nodeType === 1 &&
-            (related === null || (related !== target && !contains(target, related)))
-          ) {
-            // mouseEnter/Leave don't bubble, so there is no logic to prevent it as with other events
-            if (getElementView(target)) {
-              viewHandler(target, createFakeEvent(origEventType, event));
-            } else if (target.hasAttribute('data-ember-action')) {
-              actionHandler(target, createFakeEvent(origEventType, event));
-            }
+      }
+      return result;
+    };
+
+    // Special handling of events that don't bubble (event delegation does not work).
+    // Mimics the way this is handled in jQuery,
+    // see https://github.com/jquery/jquery/blob/899c56f6ada26821e8af12d9f35fa039100e838e/src/event.js#L666-L700
+    if (MOUSE_ENTER_LEAVE_MOVE_EVENTS && EVENT_MAP[event] !== undefined) {
+      let mappedEventType = EVENT_MAP[event];
+      let origEventType = event;
+
+      let createFakeEvent = (eventType, event) => {
+        let fakeEvent = document.createEvent('MouseEvent');
+        fakeEvent.initMouseEvent(
+          eventType,
+          false,
+          false,
+          event.view,
+          event.detail,
+          event.screenX,
+          event.screenY,
+          event.clientX,
+          event.clientY,
+          event.ctrlKey,
+          event.altKey,
+          event.shiftKey,
+          event.metaKey,
+          event.button,
+          event.relatedTarget
+        );
 
-            // separate mouseEnter/Leave events are dispatched for each listening element
-            // until the element (related) has been reached that the pointing device exited from/to
-            target = target.parentNode;
-          }
-        });
-
-        rootElement.addEventListener(mappedEventType, handleMappedEvent);
-      } else {
-        let handleEvent = (this._eventHandlers[event] = (event) => {
-          let target = event.target;
-
-          do {
-            if (getElementView(target)) {
-              if (viewHandler(target, event) === false) {
-                event.preventDefault();
-                event.stopPropagation();
-                break;
-              } else if (event.cancelBubble === true) {
-                break;
-              }
-            } else if (
-              typeof target.hasAttribute === 'function' &&
-              target.hasAttribute('data-ember-action')
-            ) {
-              if (actionHandler(target, event) === false) {
-                break;
-              }
-            }
+        // fake event.target as we don't dispatch the event
+        Object.defineProperty(fakeEvent, 'target', { value: event.target, enumerable: true });
 
-            target = target.parentNode;
-          } while (target && target.nodeType === 1);
-        });
+        return fakeEvent;
+      };
 
-        rootElement.addEventListener(event, handleEvent);
-      }
-    } else {
-      rootElement.on(`${event}.ember`, '.ember-view', function (evt) {
-        let view = getElementView(this);
-        let result = true;
+      let handleMappedEvent = (this._eventHandlers[mappedEventType] = (event) => {
+        let target = event.target;
+        let related = event.relatedTarget;
+
+        while (
+          target &&
+          target.nodeType === 1 &&
+          (related === null || (related !== target && !contains(target, related)))
+        ) {
+          // mouseEnter/Leave don't bubble, so there is no logic to prevent it as with other events
+          if (getElementView(target)) {
+            viewHandler(target, createFakeEvent(origEventType, event));
+          } else if (target.hasAttribute('data-ember-action')) {
+            actionHandler(target, createFakeEvent(origEventType, event));
+          }
 
-        if (view) {
-          result = view.handleEvent(eventName, addJQueryEventDeprecation(evt));
+          // separate mouseEnter/Leave events are dispatched for each listening element
+          // until the element (related) has been reached that the pointing device exited from/to
+          target = target.parentNode;
         }
-
-        return result;
       });
 
-      rootElement.on(`${event}.ember`, '[data-ember-action]', (evt) => {
-        let attributes = evt.currentTarget.attributes;
-        let handledActions = [];
-
-        evt = addJQueryEventDeprecation(evt);
-
-        for (let i = 0; i < attributes.length; i++) {
-          let attr = attributes.item(i);
-          let attrName = attr.name;
-
-          if (attrName.lastIndexOf('data-ember-action-', 0) !== -1) {
-            let action = ActionManager.registeredActions[attr.value];
-
-            // We have to check for action here since in some cases, jQuery will trigger
-            // an event on `removeChild` (i.e. focusout) after we've already torn down the
-            // action handlers for the view.
-            if (action && action.eventName === eventName && handledActions.indexOf(action) === -1) {
-              action.handler(evt);
-              // Action handlers can mutate state which in turn creates new attributes on the element.
-              // This effect could cause the `data-ember-action` attribute to shift down and be invoked twice.
-              // To avoid this, we keep track of which actions have been handled.
-              handledActions.push(action);
+      rootElement.addEventListener(mappedEventType, handleMappedEvent);
+    } else {
+      let handleEvent = (this._eventHandlers[event] = (event) => {
+        let target = event.target;
+
+        do {
+          if (getElementView(target)) {
+            if (viewHandler(target, event) === false) {
+              event.preventDefault();
+              event.stopPropagation();
+              break;
+            } else if (event.cancelBubble === true) {
+              break;
+            }
+          } else if (
+            typeof target.hasAttribute === 'function' &&
+            target.hasAttribute('data-ember-action')
+          ) {
+            if (actionHandler(target, event) === false) {
+              break;
             }
           }
-        }
+
+          target = target.parentNode;
+        } while (target && target.nodeType === 1);
       });
-    }
 
+      rootElement.addEventListener(event, handleEvent);
+    }
     this.lazyEvents.delete(event);
   },
 
@@ -489,12 +418,8 @@ export default EmberObject.extend({
       return;
     }
 
-    if (!JQUERY_INTEGRATION || jQueryDisabled) {
-      for (let event in this._eventHandlers) {
-        rootElement.removeEventListener(event, this._eventHandlers[event]);
-      }
-    } else {
-      jQuery(rootElementSelector).off('.ember', '**');
+    for (let event in this._eventHandlers) {
+      rootElement.removeEventListener(event, this._eventHandlers[event]);
     }
 
     rootElement.classList.remove(ROOT_ELEMENT_CLASS);
diff --git a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js b/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
deleted file mode 100644
index 8d401e2f976..00000000000
--- a/packages/@ember/-internals/views/lib/system/jquery_event_deprecation.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* global Proxy */
-import { deprecate } from '@ember/debug';
-import { global } from '@ember/-internals/environment';
-import { DEBUG } from '@glimmer/env';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
-
-export default function addJQueryEventDeprecation(jqEvent) {
-  if (DEBUG && JQUERY_INTEGRATION) {
-    let boundFunctions = new Map();
-
-    // wrap the jQuery event in a Proxy to add the deprecation message for originalEvent, according to RFC#294
-    // we need a native Proxy here, so we can make sure that the internal use of originalEvent in jQuery itself does
-    // not trigger a deprecation
-    return new Proxy(jqEvent, {
-      get(target, name) {
-        switch (name) {
-          case 'originalEvent':
-            deprecate(
-              'Accessing jQuery.Event specific properties is deprecated. Either use the ember-jquery-legacy addon to normalize events to native events, or explicitly opt into jQuery integration using @ember/optional-features.',
-              ((EmberENV) => {
-                // this deprecation is intentionally checking `global.EmberENV` so
-                // that we can ensure we _only_ deprecate in the case where jQuery
-                // integration is enabled implicitly (e.g. "defaulted" to enabled)
-                // as opposed to when the user explicitly opts in to using jQuery
-                if (typeof EmberENV !== 'object' || EmberENV === null) return false;
-
-                return EmberENV._JQUERY_INTEGRATION === true;
-              })(global.EmberENV),
-              {
-                id: 'ember-views.event-dispatcher.jquery-event',
-                until: '4.0.0',
-                url: 'https://deprecations.emberjs.com/v3.x#toc_jquery-event',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.9.0',
-                },
-              }
-            );
-            return target[name];
-
-          // provide an escape hatch for ember-jquery-legacy to access originalEvent without a deprecation
-          case '__originalEvent':
-            return target.originalEvent;
-
-          default:
-            if (typeof target[name] === 'function') {
-              // cache functions for reuse
-              if (!boundFunctions.has(name)) {
-                // for jQuery.Event methods call them with `target` as the `this` context, so they will access
-                // `originalEvent` from the original jQuery event, not our proxy, thus not trigger the deprecation
-                boundFunctions.set(name, target[name].bind(target));
-              }
-
-              return boundFunctions.get(name);
-            }
-            // same for jQuery's getter functions for simple properties
-            return target[name];
-        }
-      },
-    });
-  }
-
-  return jqEvent;
-}

From d0dc039a5d0bee7a1bbef0ab478fb13a0135cf15 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 24 May 2021 17:57:12 +0200
Subject: [PATCH 0586/1405] Remove tests for jQuery events

---
 .../components/input-angle-test.js            | 46 ++++---------------
 .../components/input-curly-test.js            | 43 +++--------------
 2 files changed, 14 insertions(+), 75 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 4657de9ddd9..e978813c8d9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,10 +1,10 @@
-import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
+import { moduleFor, RenderingTestCase, runDestroy, runTask } from 'internal-test-helpers';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
 import { Checkbox, TextArea, TextField } from '@ember/-internals/glimmer';
 import { set } from '@ember/-internals/metal';
 import { TargetActionSupport } from '@ember/-internals/runtime';
-import { getElementView, jQueryDisabled, jQuery, TextSupport } from '@ember/-internals/views';
+import { getElementView, TextSupport } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
 
@@ -561,13 +561,8 @@ moduleFor(
 
       this.render(`<Input @enter={{action 'foo'}} />`, {
         actions: {
-          foo(value, event) {
+          foo() {
             assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
           },
         },
       });
@@ -586,14 +581,9 @@ moduleFor(
             value: 'initial',
 
             actions: {
-              foo(value, event) {
+              foo() {
                 triggered++;
                 assert.ok(true, 'action was triggered');
-                if (jQueryDisabled) {
-                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-                } else {
-                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-                }
               },
             },
           });
@@ -661,13 +651,8 @@ moduleFor(
 
       this.render(`<Input @insert-newline={{action 'foo'}} />`, {
         actions: {
-          foo(value, event) {
+          foo() {
             assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
           },
         },
       });
@@ -684,13 +669,8 @@ moduleFor(
 
       this.render(`<Input @escape-press={{action 'foo'}} />`, {
         actions: {
-          foo(value, event) {
+          foo() {
             assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
           },
         },
       });
@@ -707,14 +687,9 @@ moduleFor(
         () => {
           this.render(`<Input @key-down={{action 'foo'}} />`, {
             actions: {
-              foo(value, event) {
+              foo() {
                 triggered++;
                 assert.ok(true, 'action was triggered');
-                if (jQueryDisabled) {
-                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-                } else {
-                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-                }
               },
             },
           });
@@ -737,14 +712,9 @@ moduleFor(
         () => {
           this.render(`<Input @key-up={{action 'foo'}} />`, {
             actions: {
-              foo(value, event) {
+              foo() {
                 triggered++;
                 assert.ok(true, 'action was triggered');
-                if (jQueryDisabled) {
-                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-                } else {
-                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-                }
               },
             },
           });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 589649eecd4..6e93c182ec8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -3,7 +3,6 @@ import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
 import { set } from '@ember/-internals/metal';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
 
@@ -392,13 +391,8 @@ moduleFor(
 
       this.render(`{{input enter=(action 'foo')}}`, {
         actions: {
-          foo(value, event) {
+          foo() {
             assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
           },
         },
       });
@@ -417,14 +411,9 @@ moduleFor(
             value: 'initial',
 
             actions: {
-              foo(value, event) {
+              foo() {
                 triggered++;
                 assert.ok(true, 'action was triggered');
-                if (jQueryDisabled) {
-                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-                } else {
-                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-                }
               },
             },
           });
@@ -492,13 +481,8 @@ moduleFor(
 
       this.render(`{{input insert-newline=(action 'foo')}}`, {
         actions: {
-          foo(value, event) {
+          foo() {
             assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
           },
         },
       });
@@ -515,13 +499,8 @@ moduleFor(
 
       this.render(`{{input escape-press=(action 'foo')}}`, {
         actions: {
-          foo(value, event) {
+          foo() {
             assert.ok(true, 'action was triggered');
-            if (jQueryDisabled) {
-              assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-            } else {
-              assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-            }
           },
         },
       });
@@ -538,14 +517,9 @@ moduleFor(
         () => {
           this.render(`{{input key-down=(action 'foo')}}`, {
             actions: {
-              foo(value, event) {
+              foo() {
                 triggered++;
                 assert.ok(true, 'action was triggered');
-                if (jQueryDisabled) {
-                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-                } else {
-                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-                }
               },
             },
           });
@@ -564,13 +538,8 @@ moduleFor(
         () => {
           this.render(`{{input key-up=(action 'foo')}}`, {
             actions: {
-              foo(value, event) {
+              foo() {
                 assert.ok(true, 'action was triggered');
-                if (jQueryDisabled) {
-                  assert.notOk(event.originalEvent, 'event is not a jQuery.Event');
-                } else {
-                  assert.ok(event instanceof jQuery.Event, 'jQuery event was passed');
-                }
               },
             },
           });

From cfab47a45d16da734e8fbcad77ee9636c1bc9d11 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Mon, 24 May 2021 18:09:11 +0200
Subject: [PATCH 0587/1405] Fix tests after removed deprecations

---
 .../tests/integration/components/input-angle-test.js        | 6 +++---
 .../tests/integration/components/input-curly-test.js        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index e978813c8d9..a95804b1b6f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -557,7 +557,7 @@ moduleFor(
     ['@test sends an action with `<Input @enter={{action "foo"}} />` when <enter> is pressed'](
       assert
     ) {
-      assert.expect(2);
+      assert.expect(1);
 
       this.render(`<Input @enter={{action 'foo'}} />`, {
         actions: {
@@ -647,7 +647,7 @@ moduleFor(
     }
 
     ['@test sends `insert-newline` when <enter> is pressed'](assert) {
-      assert.expect(2);
+      assert.expect(1);
 
       this.render(`<Input @insert-newline={{action 'foo'}} />`, {
         actions: {
@@ -665,7 +665,7 @@ moduleFor(
     ['@test sends an action with `<Input @escape-press={{action "foo"}} />` when <escape> is pressed'](
       assert
     ) {
-      assert.expect(2);
+      assert.expect(1);
 
       this.render(`<Input @escape-press={{action 'foo'}} />`, {
         actions: {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 6e93c182ec8..4b9abf8b3d1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -387,7 +387,7 @@ moduleFor(
     ['@test sends an action with `{{input enter=(action "foo")}}` when <enter> is pressed'](
       assert
     ) {
-      assert.expect(2);
+      assert.expect(1);
 
       this.render(`{{input enter=(action 'foo')}}`, {
         actions: {
@@ -477,7 +477,7 @@ moduleFor(
     }
 
     ['@test sends `insert-newline` when <enter> is pressed'](assert) {
-      assert.expect(2);
+      assert.expect(1);
 
       this.render(`{{input insert-newline=(action 'foo')}}`, {
         actions: {
@@ -495,7 +495,7 @@ moduleFor(
     ['@test sends an action with `{{input escape-press=(action "foo")}}` when <escape> is pressed'](
       assert
     ) {
-      assert.expect(2);
+      assert.expect(1);
 
       this.render(`{{input escape-press=(action 'foo')}}`, {
         actions: {

From 339670ea8fbda3d8563e4a16b9ececaa79247cb6 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 22 Jul 2021 17:49:31 +0200
Subject: [PATCH 0588/1405] Remove jQueryEventShim for input components

---
 .../glimmer/lib/components/abstract-input.ts  |  6 -----
 .../components/input-angle-test.js            | 24 ++++++++++++-------
 .../components/input-curly-test.js            | 24 ++++++++++++-------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index c81f4b23565..1ae1ca26a74 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -3,7 +3,6 @@ import { TargetActionSupport } from '@ember/-internals/runtime';
 import { TextSupport } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert } from '@ember/debug';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import { action } from '@ember/object';
 import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
 import Component from '../component';
@@ -14,7 +13,6 @@ import InternalComponent, {
   handleDeprecatedAttributeArguments,
   handleDeprecatedEventArguments,
   InternalComponentConstructor,
-  jQueryEventShim,
 } from './internal';
 
 const UNINITIALIZED: unknown = Object.freeze({});
@@ -243,8 +241,4 @@ export function handleDeprecatedFeatures(
       });
     }
   }
-
-  if (JQUERY_INTEGRATION) {
-    jQueryEventShim(target);
-  }
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index a95804b1b6f..3a7693f42b2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -557,12 +557,13 @@ moduleFor(
     ['@test sends an action with `<Input @enter={{action "foo"}} />` when <enter> is pressed'](
       assert
     ) {
-      assert.expect(1);
+      assert.expect(2);
 
       this.render(`<Input @enter={{action 'foo'}} />`, {
         actions: {
-          foo() {
+          foo(value, event) {
             assert.ok(true, 'action was triggered');
+            assert.ok(event instanceof Event, 'Native event was passed');
           },
         },
       });
@@ -581,9 +582,10 @@ moduleFor(
             value: 'initial',
 
             actions: {
-              foo() {
+              foo(value, event) {
                 triggered++;
                 assert.ok(true, 'action was triggered');
+                assert.ok(event instanceof Event, 'Native event was passed');
               },
             },
           });
@@ -647,12 +649,13 @@ moduleFor(
     }
 
     ['@test sends `insert-newline` when <enter> is pressed'](assert) {
-      assert.expect(1);
+      assert.expect(2);
 
       this.render(`<Input @insert-newline={{action 'foo'}} />`, {
         actions: {
-          foo() {
+          foo(value, event) {
             assert.ok(true, 'action was triggered');
+            assert.ok(event instanceof Event, 'Native event was passed');
           },
         },
       });
@@ -665,12 +668,13 @@ moduleFor(
     ['@test sends an action with `<Input @escape-press={{action "foo"}} />` when <escape> is pressed'](
       assert
     ) {
-      assert.expect(1);
+      assert.expect(2);
 
       this.render(`<Input @escape-press={{action 'foo'}} />`, {
         actions: {
-          foo() {
+          foo(value, event) {
             assert.ok(true, 'action was triggered');
+            assert.ok(event instanceof Event, 'Native event was passed');
           },
         },
       });
@@ -687,9 +691,10 @@ moduleFor(
         () => {
           this.render(`<Input @key-down={{action 'foo'}} />`, {
             actions: {
-              foo() {
+              foo(value, event) {
                 triggered++;
                 assert.ok(true, 'action was triggered');
+                assert.ok(event instanceof Event, 'Native event was passed');
               },
             },
           });
@@ -712,9 +717,10 @@ moduleFor(
         () => {
           this.render(`<Input @key-up={{action 'foo'}} />`, {
             actions: {
-              foo() {
+              foo(value, event) {
                 triggered++;
                 assert.ok(true, 'action was triggered');
+                assert.ok(event instanceof Event, 'Native event was passed');
               },
             },
           });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 4b9abf8b3d1..93dd57ed485 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -387,12 +387,13 @@ moduleFor(
     ['@test sends an action with `{{input enter=(action "foo")}}` when <enter> is pressed'](
       assert
     ) {
-      assert.expect(1);
+      assert.expect(2);
 
       this.render(`{{input enter=(action 'foo')}}`, {
         actions: {
-          foo() {
+          foo(value, event) {
             assert.ok(true, 'action was triggered');
+            assert.ok(event instanceof Event, 'Native event was passed');
           },
         },
       });
@@ -411,9 +412,10 @@ moduleFor(
             value: 'initial',
 
             actions: {
-              foo() {
+              foo(value, event) {
                 triggered++;
                 assert.ok(true, 'action was triggered');
+                assert.ok(event instanceof Event, 'Native event was passed');
               },
             },
           });
@@ -477,12 +479,13 @@ moduleFor(
     }
 
     ['@test sends `insert-newline` when <enter> is pressed'](assert) {
-      assert.expect(1);
+      assert.expect(2);
 
       this.render(`{{input insert-newline=(action 'foo')}}`, {
         actions: {
-          foo() {
+          foo(value, event) {
             assert.ok(true, 'action was triggered');
+            assert.ok(event instanceof Event, 'Native event was passed');
           },
         },
       });
@@ -495,12 +498,13 @@ moduleFor(
     ['@test sends an action with `{{input escape-press=(action "foo")}}` when <escape> is pressed'](
       assert
     ) {
-      assert.expect(1);
+      assert.expect(2);
 
       this.render(`{{input escape-press=(action 'foo')}}`, {
         actions: {
-          foo() {
+          foo(value, event) {
             assert.ok(true, 'action was triggered');
+            assert.ok(event instanceof Event, 'Native event was passed');
           },
         },
       });
@@ -517,9 +521,10 @@ moduleFor(
         () => {
           this.render(`{{input key-down=(action 'foo')}}`, {
             actions: {
-              foo() {
+              foo(value, event) {
                 triggered++;
                 assert.ok(true, 'action was triggered');
+                assert.ok(event instanceof Event, 'Native event was passed');
               },
             },
           });
@@ -538,8 +543,9 @@ moduleFor(
         () => {
           this.render(`{{input key-up=(action 'foo')}}`, {
             actions: {
-              foo() {
+              foo(value, event) {
                 assert.ok(true, 'action was triggered');
+                assert.ok(event instanceof Event, 'Native event was passed');
               },
             },
           });

From 0d935ae62980856522c3b74dab39c60f09b9b880 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 22 Jul 2021 18:08:53 +0200
Subject: [PATCH 0589/1405] Remove jQueryEventShim from link-to

---
 .../glimmer/lib/components/internal.ts        | 24 -------------------
 .../glimmer/lib/components/link-to.ts         |  6 -----
 2 files changed, 30 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 81528e7cc2b..f3ac67a5c57 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -1,9 +1,7 @@
 import { Owner, setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
-import { jQuery, jQueryDisabled } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate } from '@ember/debug';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import {
   CapturedArguments,
   Destroyable,
@@ -552,25 +550,3 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
     });
   };
 }
-
-export function jQueryEventShim(target: DeprecatingInternalComponentConstructor): void {
-  if (JQUERY_INTEGRATION) {
-    let { prototype } = target;
-
-    let superListenerFor = prototype['listenerFor'];
-
-    Object.defineProperty(prototype, 'listenerFor', {
-      configurable: true,
-      enumerable: false,
-      value: function listenerFor(this: InternalComponent, name: string): EventListener {
-        let listener = superListenerFor.call(this, name);
-
-        if (jQuery && !jQueryDisabled) {
-          return (event: Event) => listener(new jQuery.Event(event));
-        } else {
-          return listener;
-        }
-      },
-    });
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 3bb0b105281..a823da4b978 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -5,7 +5,6 @@ import { TargetActionSupport } from '@ember/-internals/runtime';
 import { isSimpleClick } from '@ember/-internals/views';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, debugFreeze, deprecate, warn } from '@ember/debug';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
@@ -22,7 +21,6 @@ import InternalComponent, {
   handleDeprecatedArguments,
   handleDeprecatedAttributeArguments,
   handleDeprecatedEventArguments,
-  jQueryEventShim,
   opaquify,
 } from './internal';
 
@@ -710,8 +708,4 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   }
 }
 
-if (JQUERY_INTEGRATION) {
-  jQueryEventShim(LinkTo);
-}
-
 export default opaquify(LinkTo, LinkToTemplate);

From 2f787b8ebdedf4830c355032d8bdffe621f3b05a Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 22 Jul 2021 18:17:10 +0200
Subject: [PATCH 0590/1405] Fix linting

---
 .eslintrc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1afb795562b..0864a4f08c4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -81,6 +81,7 @@ module.exports = {
         Set: true,
         Symbol: true,
         WeakMap: true,
+        Event: true,
       },
 
       rules: {

From 851c11cfff4891ed6abff8abb47ff476f078d4c9 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 21 Jul 2021 22:15:41 -0700
Subject: [PATCH 0591/1405] Remove ability to override computed property

---
 .../@ember/-internals/metal/lib/computed.ts   | 32 +++--------------
 .../-internals/metal/tests/computed_test.js   | 35 +++++--------------
 .../metal/tests/mixin/computed_test.js        | 13 ++-----
 .../tests/system/object/create_test.js        | 18 ++++------
 4 files changed, 23 insertions(+), 75 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 9f261df8c6f..20010755ab2 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -29,14 +29,12 @@ import {
 } from './decorator';
 import expandProperties from './expand_properties';
 import { addObserver, setObserverSuspended } from './observer';
-import { defineProperty } from './properties';
 import {
   beginPropertyChanges,
   endPropertyChanges,
   notifyPropertyChange,
   PROPERTY_DID_CHANGE,
 } from './property_events';
-import { set } from './property_set';
 
 export type ComputedPropertyGetter = (keyName: string) => any;
 export type ComputedPropertySetter = (keyName: string, value: any, cachedValue?: any) => any;
@@ -432,9 +430,10 @@ export class ComputedProperty extends ComputedDescriptor {
       this._throwReadOnlyError(obj, keyName);
     }
 
-    if (!this._setter) {
-      return this.clobberSet(obj, keyName, value);
-    }
+    assert(
+      `Cannot override the computed property \`${keyName}\` on ${toString(obj)}.`,
+      this._setter !== undefined
+    );
 
     if (this._volatile) {
       return this.volatileSet(obj, keyName, value);
@@ -501,29 +500,6 @@ export class ComputedProperty extends ComputedDescriptor {
     throw new EmberError(`Cannot set read-only property "${keyName}" on object: ${inspect(obj)}`);
   }
 
-  clobberSet(obj: object, keyName: string, value: any): any {
-    deprecate(
-      `The ${toString(
-        obj
-      )}#${keyName} computed property was just overridden. This removes the computed property and replaces it with a plain value, and has been deprecated. If you want this behavior, consider defining a setter which does it manually.`,
-      false,
-      {
-        id: 'computed-property.override',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_computed-property-override',
-        for: 'ember-source',
-        since: {
-          enabled: '3.9.0-beta.1',
-        },
-      }
-    );
-
-    let cachedValue = metaFor(obj).valueFor(keyName);
-    defineProperty(obj, keyName, null, cachedValue);
-    set(obj, keyName, value);
-    return value;
-  }
-
   volatileSet(obj: object, keyName: string, value: any): any {
     return this._setter!.call(obj, keyName, value);
   }
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 4269fc49db4..69c0a522302 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -129,20 +129,6 @@ moduleFor(
       assert.equal(count, 1, 'should only call getter once');
     }
 
-    ['@test can override volatile computed property'](assert) {
-      obj = {};
-
-      expectDeprecation(() => {
-        defineProperty(obj, 'foo', computed(function () {}).volatile());
-      }, 'Setting a computed property as volatile has been deprecated. Instead, consider using a native getter with native class syntax.');
-
-      expectDeprecation(() => {
-        set(obj, 'foo', 'boom');
-      }, /The \[object Object\]#foo computed property was just overridden./);
-
-      assert.equal(obj.foo, 'boom');
-    }
-
     ['@test defining computed property should invoke property on set'](assert) {
       obj = {};
       let count = 0;
@@ -765,7 +751,7 @@ moduleFor(
       assert.ok(testObj.get('aInt') === 123, 'cp has been updated too');
     }
 
-    ['@test setter can be omited'](assert) {
+    ['@test an omitted setter cannot be set later'](assert) {
       let testObj = EmberObject.extend({
         a: '1',
         b: '2',
@@ -780,11 +766,9 @@ moduleFor(
       assert.ok(testObj.get('aInt') === 1, 'getter works');
       assert.ok(testObj.get('a') === '1');
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         testObj.set('aInt', '123');
-      }, /The <\(unknown\):ember\d*>#aInt computed property was just overridden/);
-
-      assert.ok(testObj.get('aInt') === '123', 'cp has been updated too');
+      }, /Cannot override the computed property `aInt` on <\(unknown\):ember\d*>./);
     }
 
     ['@test getter can be omited'](assert) {
@@ -979,7 +963,9 @@ moduleFor(
 moduleFor(
   'computed - default setter',
   class extends ComputedTestCase {
-    async ["@test when setting a value on a computed property that doesn't handle sets"](assert) {
+    async ["@test raises assertion when setting a value on a computed property that doesn't handle sets"](
+      assert
+    ) {
       obj = {};
       let observerFired = false;
 
@@ -993,16 +979,13 @@ moduleFor(
 
       addObserver(obj, 'foo', null, () => (observerFired = true));
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         set(obj, 'foo', 'bar');
-      }, /The \[object Object\]#foo computed property was just overridden./);
-
-      assert.equal(get(obj, 'foo'), 'bar', 'The set value is properly returned');
-      assert.ok(typeof obj.foo === 'string', 'The computed property was removed');
+      }, /Cannot override the computed property `foo` on \[object Object\]./);
 
       await runLoopSettled();
 
-      assert.ok(observerFired, 'The observer was still notified');
+      assert.notOk(observerFired, 'The observer was not notified');
     }
   }
 );
diff --git a/packages/@ember/-internals/metal/tests/mixin/computed_test.js b/packages/@ember/-internals/metal/tests/mixin/computed_test.js
index 9702066c9d6..a6d8014e045 100644
--- a/packages/@ember/-internals/metal/tests/mixin/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/computed_test.js
@@ -111,7 +111,7 @@ moduleFor(
       assert.ok(superSetOccurred, 'should pass set to _super after getting');
     }
 
-    ['@test setter behavior works properly when overriding computed properties'](assert) {
+    ['@test setter behavior asserts when overriding computed properties'](assert) {
       let obj = {};
 
       let MixinA = Mixin.create({
@@ -156,16 +156,9 @@ moduleFor(
       );
       cpWasCalled = false;
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         set(obj, 'cpWithoutSetter', 'test');
-      }, /The \[object Object\]#cpWithoutSetter computed property was just overridden./);
-
-      assert.equal(
-        get(obj, 'cpWithoutSetter'),
-        'test',
-        'The default setter was called, the value is correct'
-      );
-      assert.ok(!cpWasCalled, 'The default setter was called, not the CP itself');
+      }, /Cannot override the computed property `cpWithoutSetter` on \[object Object\]./);
     }
   }
 );
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 2936f30215c..1a05abdc9c8 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -262,7 +262,7 @@ moduleFor(
       assert.equal(result.foo.bar, 'foo');
     }
 
-    ['@test does raise deprecation if descriptor is a computed property without a setter'](assert) {
+    ['@test does raise assertion if descriptor is a computed property without a setter']() {
       let owner = buildOwner();
 
       class FooService extends Service {
@@ -282,16 +282,12 @@ moduleFor(
       owner.register('foo:main', FooObject);
       owner.inject('foo:main', 'foo', 'service:bar');
 
-      expectDeprecation(
-        /The <.*>#foo computed property was just overridden. This removes the computed property and replaces it with a plain value, and has been deprecated. If you want this behavior, consider defining a setter which does it manually./
-      );
-
-      expectDeprecation(
-        /A value was injected implicitly on the 'foo' computed property of an instance of <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/
-      );
-
-      let result = owner.lookup('foo:main');
-      assert.equal(result.foo.bar, 'bar');
+      expectAssertion(() => {
+        expectDeprecation(
+          /A value was injected implicitly on the 'foo' computed property of an instance of <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/
+        );
+        owner.lookup('foo:main');
+      }, /Cannot override the computed property `foo` on <.*>./);
     }
 
     ['@test does not raise deprecation if descriptor is a getter and equal to the implicit deprecation'](

From 5bbe4b9201fcbff22b715b5536c6e37baedd6688 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Thu, 22 Jul 2021 21:14:17 -0400
Subject: [PATCH 0592/1405] Remove window.Ember global

---
 lib/overrides.js                              | 16 ------
 packages/@ember/-internals/bootstrap/index.ts | 56 +------------------
 .../@ember/-internals/overrides/index.d.ts    |  9 ---
 tests/node/fastboot-sandbox-test.js           |  4 +-
 tests/node/overrides-test.js                  | 47 ----------------
 5 files changed, 4 insertions(+), 128 deletions(-)
 delete mode 100644 packages/@ember/-internals/overrides/index.d.ts

diff --git a/lib/overrides.js b/lib/overrides.js
index d8d9f4209a6..006d9cc1da6 100644
--- a/lib/overrides.js
+++ b/lib/overrides.js
@@ -325,8 +325,6 @@ module.exports = class Overrides {
 
   toModule() {
     return `
-      export let onEmberGlobalAccess;
-
       ${this.toJS()};
     `;
   }
@@ -347,20 +345,6 @@ module.exports = class Overrides {
       }
 
       ${this.onDotAcces}
-
-      onEmberGlobalAccess = ${this.onEmberGlobalAccess};
-
-      if (!${this.showAllEmberGlobalDeprecations}) {
-        onEmberGlobalAccess = once(onEmberGlobalAccess);
-      }
-    `;
-  }
-
-  get onEmberGlobalAccess() {
-    return `
-      function onEmberGlobalAccess() {
-        return ${JSON.stringify(this.globalMessage)};
-      }
     `;
   }
 };
diff --git a/packages/@ember/-internals/bootstrap/index.ts b/packages/@ember/-internals/bootstrap/index.ts
index 022ef158407..818e29cc74a 100644
--- a/packages/@ember/-internals/bootstrap/index.ts
+++ b/packages/@ember/-internals/bootstrap/index.ts
@@ -1,64 +1,10 @@
-import { context } from '@ember/-internals/environment';
-import { onEmberGlobalAccess } from '@ember/-internals/overrides';
-import { deprecate } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
 import require from 'require';
 
 (function bootstrap() {
-  let Ember: unknown;
-
-  let get = () => {
-    if (!Ember) {
-      // tslint:disable-next-line: no-require-imports
-      Ember = require('ember').default;
-    }
-
-    return Ember;
-  };
-
-  if (DEBUG) {
-    let defaultHandler = () => {
-      return 'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.';
-    };
-
-    let handler = onEmberGlobalAccess || defaultHandler;
-    let _get = get;
-
-    get = () => {
-      let message = handler();
-
-      if (message !== null) {
-        deprecate(message, false, {
-          id: 'ember-global',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-        });
-      }
-
-      return _get();
-    };
-  }
-
-  function defineEmber(key: string) {
-    Object.defineProperty(context.exports, key, {
-      enumerable: true,
-      configurable: true,
-      get,
-    });
-  }
-
-  // Bootstrap the global
-  defineEmber('Ember');
-  defineEmber('Em');
-
   // Bootstrap Node module
   // eslint-disable-next-line no-undef
   if (typeof module === 'object' && typeof module.require === 'function') {
     // tslint:disable-next-line: no-require-imports
-    module.exports = Ember = require('ember').default;
+    module.exports = require('ember').default;
   }
 })();
diff --git a/packages/@ember/-internals/overrides/index.d.ts b/packages/@ember/-internals/overrides/index.d.ts
deleted file mode 100644
index c913783fb1d..00000000000
--- a/packages/@ember/-internals/overrides/index.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-type Callback<TArgs extends unknown[], TReturn> = (...args: TArgs) => TReturn;
-
-/**
- * Returns a deprecation message or null to skip the deprecation.
- */
-type Handler<TArgs extends unknown[]> = Callback<TArgs, string | null>;
-type GlobalAccessHandler = Handler<[]>;
-
-export let onEmberGlobalAccess: GlobalAccessHandler | undefined;
diff --git a/tests/node/fastboot-sandbox-test.js b/tests/node/fastboot-sandbox-test.js
index ea9affbe53e..72427206550 100644
--- a/tests/node/fastboot-sandbox-test.js
+++ b/tests/node/fastboot-sandbox-test.js
@@ -43,7 +43,7 @@ function buildSandboxContext(precompile) {
     URL,
 
     // Convince jQuery not to assume it's in a browser
-    module: { exports: {} },
+    module: { exports: {}, require() {} },
   };
 
   // Set the global as `window`
@@ -69,6 +69,8 @@ var EmberENV = {
   emberScript.runInContext(context);
 
   let applicationSource = `
+let Ember = module.exports;
+
 class Router extends Ember.Router {}
 Router.map(function() {
   this.route('a');
diff --git a/tests/node/overrides-test.js b/tests/node/overrides-test.js
index 07dc930c30b..ab6f98e31c8 100644
--- a/tests/node/overrides-test.js
+++ b/tests/node/overrides-test.js
@@ -125,20 +125,6 @@ function infoForApp({
 //   };
 // }
 
-function evalJS(overrides) {
-  return eval(`
-    (function () {
-      let onEmberGlobalAccess;
-
-      ${overrides.toJS()}
-
-      return {
-        onEmberGlobalAccess: onEmberGlobalAccess,
-      };
-    })()
-  `);
-}
-
 QUnit.module('Overrides', function () {
   QUnit.module('.addonsInfoFor', function () {
     // app
@@ -593,39 +579,6 @@ QUnit.module('Overrides', function () {
     assert.strictEqual(overrides.hasActionableSuggestions, true, 'hasActionableSuggestions');
     assert.strictEqual(overrides.hasCompatibleAddons, false, 'hasCompatibleAddons');
     assert.strictEqual(overrides.hasDormantAddons, false, 'hasDormantAddons');
-    assert.strictEqual(
-      overrides.showAllEmberGlobalDeprecations,
-      false,
-      'showAllEmberGlobalDeprecations'
-    );
-    assert.deepEqual(overrides.suggestions, [
-      'Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.',
-    ]);
-    assert.equal(
-      overrides.outdated.length,
-      1 /* number of different old babel versions */,
-      'outdated.length'
-    );
-    assert.ok(
-      overrides.buildTimeWarning.startsWith(
-        '[DEPRECATION] Usage of the Ember Global is deprecated.'
-      ),
-      'overrides.buildTimeWarning'
-    );
-    assert.ok(
-      overrides.globalMessage.startsWith('Usage of the Ember Global is deprecated.'),
-      'overrides.globalMessage'
-    );
-
-    let { onEmberGlobalAccess } = evalJS(overrides);
-
-    assert.equal(
-      onEmberGlobalAccess(),
-      overrides.globalMessage,
-      'onEmberGlobalAccess() (first call)'
-    );
-
-    assert.strictEqual(onEmberGlobalAccess(), null, 'onEmberGlobalAccess() (second call)');
   });
 
   // let project, env;

From 89760aee82881b0cdf9a78ec4f59be3ea480fcf5 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 21 Jul 2021 18:50:15 -0700
Subject: [PATCH 0593/1405] Remove .volatile()

---
 .../@ember/-internals/metal/lib/computed.ts   |  88 +---------
 packages/@ember/-internals/metal/lib/mixin.ts |   1 -
 .../mixins/observable/observable_test.js      | 159 +++++++-----------
 tests/docs/expected.js                        |   1 -
 4 files changed, 65 insertions(+), 184 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 7e426c24ee8..a7fb6209523 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,6 +1,6 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect, toString } from '@ember/-internals/utils';
-import { assert, deprecate, warn } from '@ember/debug';
+import { assert, warn } from '@ember/debug';
 import EmberError from '@ember/error';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
@@ -249,7 +249,6 @@ function noop(): void {}
   @public
 */
 export class ComputedProperty extends ComputedDescriptor {
-  _volatile = false;
   _readOnly = false;
   protected _hasConfig = false;
 
@@ -370,10 +369,6 @@ export class ComputedProperty extends ComputedDescriptor {
   }
 
   get(obj: object, keyName: string): any {
-    if (this._volatile) {
-      return this._getter!.call(obj, keyName);
-    }
-
     let meta = metaFor(obj);
     let tagMeta = tagMetaFor(obj);
 
@@ -435,10 +430,6 @@ export class ComputedProperty extends ComputedDescriptor {
       this._setter !== undefined
     );
 
-    if (this._volatile) {
-      return this.volatileSet(obj, keyName, value);
-    }
-
     let meta = metaFor(obj);
 
     // ensure two way binding works when the component has defined a computed
@@ -500,10 +491,6 @@ export class ComputedProperty extends ComputedDescriptor {
     throw new EmberError(`Cannot set read-only property "${keyName}" on object: ${inspect(obj)}`);
   }
 
-  volatileSet(obj: object, keyName: string, value: any): any {
-    return this._setter!.call(obj, keyName, value);
-  }
-
   _set(obj: object, keyName: string, value: unknown, meta: Meta): any {
     let hadCachedValue = meta.revisionFor(keyName) !== undefined;
     let cachedValue = meta.valueFor(keyName);
@@ -533,11 +520,9 @@ export class ComputedProperty extends ComputedDescriptor {
 
   /* called before property is overridden */
   teardown(obj: object, keyName: string, meta: Meta): void {
-    if (!this._volatile) {
-      if (meta.revisionFor(keyName) !== undefined) {
-        meta.setRevisionFor(keyName, undefined);
-        meta.setValueFor(keyName, undefined);
-      }
+    if (meta.revisionFor(keyName) !== undefined) {
+      meta.setRevisionFor(keyName, undefined);
+      meta.setValueFor(keyName, undefined);
     }
 
     super.teardown(obj, keyName, meta);
@@ -546,10 +531,6 @@ export class ComputedProperty extends ComputedDescriptor {
 
 class AutoComputedProperty extends ComputedProperty {
   get(obj: object, keyName: string): any {
-    if (this._volatile) {
-      return this._getter!.call(obj, keyName);
-    }
-
     let meta = metaFor(obj);
     let tagMeta = tagMetaFor(obj);
 
@@ -648,67 +629,6 @@ class ComputedDecoratorImpl extends Function {
     return this;
   }
 
-  /**
-    Call on a computed property to set it into non-cached mode. When in this
-    mode the computed property will not automatically cache the return value.
-    It also does not automatically fire any change events. You must manually notify
-    any changes if you want to observe this property.
-
-    Dependency keys have no effect on volatile properties as they are for cache
-    invalidation and notification when cached value is invalidated.
-
-    Example:
-
-    ```javascript
-    import { computed } from '@ember/object';
-
-    class CallCounter {
-      _calledCount = 0;
-
-      @computed().volatile()
-      get calledCount() {
-        return this._calledCount++;
-      }
-    }
-    ```
-
-    Classic Class Example:
-
-    ```javascript
-    import EmberObject, { computed } from '@ember/object';
-
-    let CallCounter = EmberObject.extend({
-      _calledCount: 0,
-
-      value: computed(function() {
-        return this._calledCount++;
-      }).volatile()
-    });
-    ```
-    @method volatile
-    @deprecated
-    @return {ComputedProperty} this
-    @chainable
-    @public
-  */
-  volatile(this: Decorator) {
-    deprecate(
-      'Setting a computed property as volatile has been deprecated. Instead, consider using a native getter with native class syntax.',
-      false,
-      {
-        id: 'computed-property.volatile',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_computed-property-volatile',
-        for: 'ember-source',
-        since: {
-          enabled: '3.9.0-beta.1',
-        },
-      }
-    );
-    (descriptorForDecorator(this) as ComputedProperty)._volatile = true;
-    return this;
-  }
-
   /**
     In some cases, you may want to annotate computed properties with additional
     metadata about how they function or what values they operate on. For example,
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 3c3f434e2cc..7c66c3b73de 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -135,7 +135,6 @@ function giveDecoratorSuper(
     ]);
 
     newProperty._readOnly = property._readOnly;
-    newProperty._volatile = property._volatile;
     newProperty._meta = property._meta;
     newProperty.enumerable = property.enumerable;
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
index 8f7aff2389e..6c74bd02a90 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
@@ -298,120 +298,83 @@ moduleFor(
     beforeEach() {
       lookup = context.lookup = {};
 
-      expectDeprecation(() => {
-        object = ObservableObject.extend({
-          computed: computed({
-            get() {
-              this.computedCalls.push('getter-called');
-              return 'computed';
-            },
-            set(key, value) {
-              this.computedCalls.push(value);
-            },
-          }).volatile(),
-
-          computedCached: computed({
-            get() {
-              this.computedCachedCalls.push('getter-called');
-              return 'computedCached';
-            },
-            set: function (key, value) {
-              this.computedCachedCalls.push(value);
-            },
-          }),
+      object = ObservableObject.extend({
+        computed: computed({
+          get() {
+            this.computedCalls.push('getter-called');
+            return 'computed';
+          },
+          set(key, value) {
+            this.computedCalls.push(value);
+          },
+        }),
 
-          dependent: computed('changer', {
-            get() {
-              this.dependentCalls.push('getter-called');
-              return 'dependent';
-            },
-            set(key, value) {
-              this.dependentCalls.push(value);
-            },
-          }).volatile(),
-          dependentFront: computed('changer', {
-            get() {
-              this.dependentFrontCalls.push('getter-called');
-              return 'dependentFront';
-            },
-            set(key, value) {
-              this.dependentFrontCalls.push(value);
-            },
-          }).volatile(),
-          dependentCached: computed('changer', {
-            get() {
-              this.dependentCachedCalls.push('getter-called!');
-              return 'dependentCached';
-            },
-            set(key, value) {
-              this.dependentCachedCalls.push(value);
-            },
-          }),
+        dependent: computed('changer', {
+          get() {
+            this.dependentCalls.push('getter-called');
+            return 'dependent';
+          },
+          set(key, value) {
+            this.dependentCalls.push(value);
+          },
+        }),
 
-          inc: computed('changer', function () {
-            return this.incCallCount++;
-          }),
+        inc: computed('changer', function () {
+          return this.incCallCount++;
+        }),
 
-          nestedInc: computed('inc', function () {
-            get(this, 'inc');
-            return this.nestedIncCallCount++;
-          }),
+        nestedInc: computed('inc', function () {
+          get(this, 'inc');
+          return this.nestedIncCallCount++;
+        }),
 
-          isOn: computed('state', {
-            get() {
-              return this.get('state') === 'on';
-            },
-            set() {
-              this.set('state', 'on');
-              return this.get('state') === 'on';
-            },
-          }).volatile(),
-
-          isOff: computed('state', {
-            get() {
-              return this.get('state') === 'off';
-            },
-            set() {
-              this.set('state', 'off');
-              return this.get('state') === 'off';
-            },
-          }).volatile(),
-        }).create({
-          computedCalls: [],
-          computedCachedCalls: [],
-          changer: 'foo',
-          dependentCalls: [],
-          dependentFrontCalls: [],
-          dependentCachedCalls: [],
-          incCallCount: 0,
-          nestedIncCallCount: 0,
-          state: 'on',
-        });
+        isOn: computed('state', {
+          get() {
+            return this.get('state') === 'on';
+          },
+          set() {
+            this.set('state', 'on');
+            return this.get('state') === 'on';
+          },
+        }),
+
+        isOff: computed('state', {
+          get() {
+            return this.get('state') === 'off';
+          },
+          set() {
+            this.set('state', 'off');
+            return this.get('state') === 'off';
+          },
+        }),
+      }).create({
+        computedCalls: [],
+        changer: 'foo',
+        dependentCalls: [],
+        incCallCount: 0,
+        nestedIncCallCount: 0,
+        state: 'on',
       });
     }
 
     ['@test getting values should call function return value'](assert) {
       // get each property twice. Verify return.
-      let keys = w('computed computedCached dependent dependentFront dependentCached');
+      let keys = w('computed dependent');
 
       keys.forEach(function (key) {
         assert.equal(object.get(key), key, `Try #1: object.get(${key}) should run function`);
         assert.equal(object.get(key), key, `Try #2: object.get(${key}) should run function`);
       });
 
-      // verify each call count.  cached should only be called once
-      w('computedCalls dependentFrontCalls dependentCalls').forEach((key) => {
-        assert.equal(object[key].length, 2, `non-cached property ${key} should be called 2x`);
-      });
-
-      w('computedCachedCalls dependentCachedCalls').forEach((key) => {
+      // verify each call count. cached should only be called once
+      w('computedCalls dependentCalls').forEach((key) => {
         assert.equal(object[key].length, 1, `non-cached property ${key} should be called 1x`);
       });
     }
 
     ['@test setting values should call function return value'](assert) {
       // get each property twice. Verify return.
-      let keys = w('computed dependent dependentFront computedCached dependentCached');
+      let keys = w('computed dependent');
       let values = w('value1 value2');
 
       keys.forEach((key) => {
@@ -459,13 +422,13 @@ moduleFor(
 
     ['@test notify change should clear cache'](assert) {
       // call get several times to collect call count
-      object.get('computedCached'); // should run func
-      object.get('computedCached'); // should not run func
+      object.get('computed'); // should run func
+      object.get('computed'); // should not run func
 
-      object.notifyPropertyChange('computedCached');
+      object.notifyPropertyChange('computed');
 
-      object.get('computedCached'); // should run again
-      assert.equal(object.computedCachedCalls.length, 2, 'should have invoked method 2x');
+      object.get('computed'); // should run again
+      assert.equal(object.computedCalls.length, 2, 'should have invoked method 2x');
     }
 
     ['@test change dependent should clear cache'](assert) {
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 97d56d74519..f0ba24e53d8 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -586,7 +586,6 @@ module.exports = {
     'validationCache',
     'value',
     'visit',
-    'volatile',
     'w',
     'wait',
     'waitForDOMReady',

From a23c71e11281a4998f6e4cecdb5518fbba2e37b0 Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Mon, 26 Jul 2021 19:25:48 -0400
Subject: [PATCH 0594/1405] [BUGFIX release] Restore previous hash behavior

Restores the previous hash behavior where `hash` will lazily update in
templates, but eagerly evaluate and create a POJO in JS. Also preserves
the deprecation on setting on the hash.
---
 package.json                                  |  24 +-
 .../tests/integration/helpers/hash-test.js    |   3 +
 .../@ember/-internals/metal/lib/chain-tags.ts |  27 +-
 yarn.lock                                     | 250 ++++++++----------
 4 files changed, 147 insertions(+), 157 deletions(-)

diff --git a/package.json b/package.json
index d3a51855060..2c18108133f 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@babel/helper-module-imports": "^7.8.3",
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.79.4",
+    "@glimmer/vm-babel-plugins": "0.80.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -75,19 +75,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.79.4",
-    "@glimmer/destroyable": "0.79.4",
+    "@glimmer/compiler": "0.80.0",
+    "@glimmer/destroyable": "0.80.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.79.4",
-    "@glimmer/interfaces": "0.79.4",
-    "@glimmer/manager": "0.79.4",
-    "@glimmer/node": "0.79.4",
-    "@glimmer/opcode-compiler": "0.79.4",
+    "@glimmer/global-context": "0.80.0",
+    "@glimmer/interfaces": "0.80.0",
+    "@glimmer/manager": "0.80.0",
+    "@glimmer/node": "0.80.0",
+    "@glimmer/opcode-compiler": "0.80.0",
     "@glimmer/owner": "0.80.0",
-    "@glimmer/program": "0.79.4",
-    "@glimmer/reference": "0.79.4",
-    "@glimmer/runtime": "0.79.4",
-    "@glimmer/validator": "0.79.4",
+    "@glimmer/program": "0.80.0",
+    "@glimmer/reference": "0.80.0",
+    "@glimmer/runtime": "0.80.0",
+    "@glimmer/validator": "0.80.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index d68f702ebb3..342257212cf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -255,7 +255,10 @@ moduleFor(
 
       runTask(() => {
         set(this.context, 'firstName', 'Godfrey');
+      });
 
+      // needs to be separate task because of the way classic components update args
+      runTask(() => {
         expectDeprecation(() => {
           set(instance.hash, 'lastName', 'Chan');
         }, /You set the '.*' property on a {{hash}} object/);
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index f918196155c..816f9420620 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,7 +1,6 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
-import { isHashProxy } from '@glimmer/runtime';
 import { _WeakSet } from '@glimmer/util';
 import {
   combine,
@@ -17,7 +16,7 @@ import { tagForProperty } from './tags';
 
 export const CHAIN_PASS_THROUGH = new _WeakSet();
 
-export function finishLazyChains(meta: Meta, key: string, value: unknown): void {
+export function finishLazyChains(meta: Meta, key: string, value: any) {
   let lazyTags = meta.readableLazyChainsFor(key);
 
   if (lazyTags === undefined) {
@@ -174,6 +173,20 @@ function getChainTags(
 
     chainTags.push(propertyTag);
 
+    // If we're at the end of the path, processing the last segment, and it's
+    // not an alias, we should _not_ get the last value, since we already have
+    // its tag. There's no reason to access it and do more work.
+    if (segmentEnd === pathLength) {
+      // If the key was an alias, we should always get the next value in order to
+      // bootstrap the alias. This is because aliases, unlike other CPs, should
+      // always be in sync with the aliased value.
+      if (CHAIN_PASS_THROUGH.has(descriptor)) {
+        // tslint:disable-next-line: no-unused-expression
+        current[segment];
+      }
+      break;
+    }
+
     if (descriptor === undefined) {
       // If the descriptor is undefined, then its a normal property, so we should
       // lookup the value to chain off of like normal.
@@ -210,16 +223,8 @@ function getChainTags(
       }
     }
 
-    if (segmentEnd === pathLength || !isObject(current)) {
+    if (!isObject(current)) {
       // we've hit the end of the chain for now, break out
-
-      // If the last value is a HashProxy, then entangle all of its tags
-      if (isHashProxy(current)) {
-        for (let key in current) {
-          chainTags.push(tagForProperty(current, key));
-        }
-      }
-
       break;
     }
 
diff --git a/yarn.lock b/yarn.lock
index 48927c89047..5ec8b04f36c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -955,6 +955,8 @@
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
   integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-for-of@^7.9.0":
   version "7.9.0"
@@ -1579,55 +1581,48 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.4.tgz#746909c5f01ad57efec15da79567b515d1e3a6b0"
-  integrity sha512-aXTows4Kjbutp6BV18oQTFaJjIkX5+hQ25KVETK/5zla/rC9O0DQHGb2r8DDfx4DiJLXGdl4g2VLy/BfkYmcwA==
+"@glimmer/compiler@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.0.tgz#f825b2d5b55500c0a695f076c7a2fdd312a1e94e"
+  integrity sha512-oz72cvjNHXpKY1i9aJBiLQSkmqW1zbCGc1J/gIGTXeMC5tdJlDXve22eS2ZkNWI41ai3ClzpA0hIz5ju7qO8zw==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/syntax" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/wire-format" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/syntax" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/wire-format" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.4.tgz#23a3a13a50063aefb2fa169feae79a373c9132bf"
-  integrity sha512-qpaglWv+GKlcm28MZvYemWTZV3kSlOKPc7kluRqXvoo7oqQdBEagm60XivMpxJUEf+A5YXsJ/Atty+r58eVvQg==
+"@glimmer/destroyable@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.0.tgz#48e6b3d01176b11d1025ccea1429e5d4a3303ee2"
+  integrity sha512-deyxvtKZZJtlo8bs5iiTtUgDT5K1LTzQM7HtgpOFUOsHU3O9dGtCIPQjIqE92H+BfT7UwOlhC3xcfyDhUALA+w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.4"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
-"@glimmer/encoder@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.4.tgz#2e2e7da3f80f21732f7ed0003c391caf4b42acfe"
-  integrity sha512-qqyW/TWVK1RP/zEVq0NU2EvOViftVyB43BB7y2yVyb+qD3gK0weP1InwPp1tyNUF7B6LHAcd64d4pN29Qj3vHw==
+"@glimmer/encoder@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.0.tgz#f529f525b44a94939b01e99c562e206bd9833df1"
+  integrity sha512-nCyF14OIRVixchzo0AML/TkpJV2znbYcFacUwJO67cVIMY/f14614fp63ipAHPcU+1AogIORAPT1wyUXbKcaaQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/vm" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/vm" "0.80.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.4.tgz#2d683a457aba7c340a3e850fdcf8a35fbcd8308e"
-  integrity sha512-Hn6KS7QUV63oMbop1LVOfPZ3KISzq4xMASjP+xrMzLIugvjBYYB+WoarUJcG7eB+TioOo0OMyVFibSP8ZTO2TQ==
+"@glimmer/global-context@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.0.tgz#09a0620e6625cc152769d9799dbb2f2d135959e3"
+  integrity sha512-1myqwTbsLdwP3MbYeLzBqPUMsUCqv+WxaLobHhWTo/dInF8SOyzzL9Dzox/TiqXydZx/w6sGfg9/a0g+MY5cxg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.4.tgz#3213e7fe73f35340762bef7f4e8c8df593a4a8c8"
-  integrity sha512-cyNZlRa7aXAfXY9kk7hhnWgL1R7Zw8wwi2UVEWq2nBanmpNmL1lSMJ6nY8oRIWCtWrYA9CeH7RZ6mVP5cQ/v2w==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.0.tgz#eabc7551ffe7ad27c44ba96d39e2af6ebf01c942"
@@ -1640,48 +1635,41 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.4.tgz#82cefd85d503c5a3c40389f3c869a8abbf273648"
-  integrity sha512-SCSrBEdu/JvTEFPvgkDu3kaRgJrJHrhAdB2WAoevNb8bMMhADxRPTVSfYDFL/6+eQtx6krcycVeeaCLjhZ2LNA==
+"@glimmer/manager@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.0.tgz#07eae00d0846ca1c44307ab0a03a6f6ebbe63065"
+  integrity sha512-rnRR1PQgqdmuKA/Lz9iVjhSK437Yws43QtfllCoUAPjlzqekJyR0oZiozlih+b3NSHhhU1hZhr2Xoo7lzhsyjQ==
   dependencies:
-    "@glimmer/destroyable" "0.79.4"
+    "@glimmer/destroyable" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/reference" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/validator" "0.79.4"
-
-"@glimmer/node@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.4.tgz#734ed99979fe8c396af3c356c0a5d5eee835d552"
-  integrity sha512-EDv/PkLGf92aFc7J8qKtBUd6ewxC5udntN6Syj0VHJ2MQeikVJWyZHwJbZP5+VUw8AbjuSKPc0Nt8G37Y2xtug==
-  dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/runtime" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/reference" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/validator" "0.80.0"
+
+"@glimmer/node@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.0.tgz#afdd6acdd73f70b88a8e78e79f592139912047ce"
+  integrity sha512-wm3bSiWBljW5UwUII2MKu1GOLkaRha66c8RryiGP97uP0EriMXAUj9kAnhur+/oG15ME+Vp65zwx1nCVeXshYA==
+  dependencies:
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/runtime" "0.80.0"
+    "@glimmer/util" "0.80.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.4.tgz#c5dffda71216909a8b17d9ff3223a82ef018dde9"
-  integrity sha512-K/29Wvy5nzo3deLGVZhoziznLsd8+psKhA8SO2zpS7a1a7HCSAL8SvXUZFsdsUZSU0gBmCPmw+sXSkyZTpu5CA==
+"@glimmer/opcode-compiler@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.0.tgz#adb6bf7cf374b09d48a2f7365a3d4c80f1944a14"
+  integrity sha512-lvRZ0QCmbsp72u6EKpo1H3LVhq2oKLEGWj7SuIgexnLoVQvPWMfTvGHnh08XOAIAkp15LlVB240V9RWfz0T8yw==
   dependencies:
-    "@glimmer/encoder" "0.79.4"
+    "@glimmer/encoder" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/reference" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/vm" "0.79.4"
-    "@glimmer/wire-format" "0.79.4"
-
-"@glimmer/owner@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.4.tgz#ebb300eaf23986c94705cbff8c4415ed1eaad9e9"
-  integrity sha512-6w24OglbMeib1xJVxOnTBoiCQbeLtDLDSzisn9z3o6+Iv3NCMzylyjv25JU9TqJydEPftDG/An/h/Aswb8iEFw==
-  dependencies:
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/reference" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/vm" "0.80.0"
+    "@glimmer/wire-format" "0.80.0"
 
 "@glimmer/owner@0.80.0":
   version "0.80.0"
@@ -1690,67 +1678,58 @@
   dependencies:
     "@glimmer/util" "0.80.0"
 
-"@glimmer/program@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.4.tgz#80cfda3261388caeeb66ccc46fac469d2e788b71"
-  integrity sha512-8wvhs7xUTdbAtG+oV19PKSFsyFujnRjl4gPs76Pr7GLHX25XOBhGxL8TptPm0JShxuvB2TMZrBwMGc3rhe402g==
+"@glimmer/program@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.0.tgz#5bcc2709757c36127568993a61e842351814b67e"
+  integrity sha512-gp9Lmctp5ECkb7o7fvwN40cusH1Wr/cD7x0IKg3bDFeXuYGc/nUEBlZoU3jMMlGgHjW5b4Mo6LiGkOOK3QWSCA==
   dependencies:
-    "@glimmer/encoder" "0.79.4"
+    "@glimmer/encoder" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/manager" "0.79.4"
-    "@glimmer/opcode-compiler" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/manager" "0.80.0"
+    "@glimmer/opcode-compiler" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
-"@glimmer/reference@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.4.tgz#3d9fcf5e57c63583da14f243128a3195f650e568"
-  integrity sha512-neCaUe9vqc/zGj1kNdm1ssHQ/9icC0BJd8xjYf6vAjiJ/TKEL+u+PfL8H8zqdWAK2al5zekNlhHFY55NxzX8bQ==
+"@glimmer/reference@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.0.tgz#a69d4c43d2d85fc4b840e8a56a77b4480bac5774"
+  integrity sha512-Yn2RLZEWPctbSLeJRiML7DO5wAOrQCfYy4WV5YuHg4JujE7aMoYLeBFNgbGmWcAmBYZjIjVeF1/Qr2USiT3FKA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.4"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/validator" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/validator" "0.80.0"
 
-"@glimmer/runtime@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.4.tgz#188044848721f710859c35eecec15293b8c98bba"
-  integrity sha512-jacyHy7zQ39kR6c4BvPUXpnNDSybnFpFplnhsa0Fr8IqnXRTKqNv1KdfBwdbbPQNaojuV6vyWoh0jPErkcgh0w==
+"@glimmer/runtime@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.0.tgz#ddf344cca65934e283edfcad002729315623c3b7"
+  integrity sha512-tAlbowztTW18jzOPwOhZiSPAwCL5VVVBHb+dC7cArosLudvDBqVWK7dD7AM3NX7N9Ru3NoCsis9Ql0zYI7tFGA==
   dependencies:
-    "@glimmer/destroyable" "0.79.4"
+    "@glimmer/destroyable" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.4"
-    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
+    "@glimmer/interfaces" "0.80.0"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.79.4"
-    "@glimmer/program" "0.79.4"
-    "@glimmer/reference" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/validator" "0.79.4"
-    "@glimmer/vm" "0.79.4"
-    "@glimmer/wire-format" "0.79.4"
+    "@glimmer/owner" "0.80.0"
+    "@glimmer/program" "0.80.0"
+    "@glimmer/reference" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/validator" "0.80.0"
+    "@glimmer/vm" "0.80.0"
+    "@glimmer/wire-format" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.4.tgz#5aa21d4b3918238c24da3d640abc3b66150fc0c6"
-  integrity sha512-NiMIoW2G0+sBfLYnvDaZ8o8Ul/3P/ezOT8U7ZvsHDGU5hXM2buFozyoSKLILTvAQ56izdfK9fKCsn0oi4ISx3w==
+"@glimmer/syntax@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.0.tgz#5f9c2e5824fdc8f88ec3e71861598c339b6777c1"
+  integrity sha512-LP8I5MmcguUiHhahyF96dgjKrPE6l1QVl2rlJY23FkzPSVMtUAQxNsxHPZ7vqi+gu7wucNiOfIPNTh9avOr20Q==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.4.tgz#4762ed9b231482470cb9763332097d50042f9bde"
-  integrity sha512-n2lEGzM9khM43HmKlig2lG5L5cHoL4tFzW21CZzmhMfc1IDCqHuP7s7924OsXSbLT1WB7B9sm/ZhnEj2nd+GiQ==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.0.tgz#286ec9e2c8c9e2f364e49272a3baf9d0fe3dc40c"
@@ -1760,36 +1739,36 @@
     "@glimmer/interfaces" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.4.tgz#35bc9c6b88d0681b372f1fba3969e6385465b8d7"
-  integrity sha512-VLT9TozD3n3qwX9hOECn/d2Ig8PTn0Gl1FdiEpb04tldXWY0YL6oSoLEjH97R4KNqvati2jFQOOzyinzu9Ffkw==
+"@glimmer/validator@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.0.tgz#f93c221a681809e5e45451e21d58ad0a819a38c0"
+  integrity sha512-qjKKvHaxp7jT978FM1Ifa4aur/W1osPRrMFahQH5LjwMQEdLdk3OSyuxfTY6nTArnK0YJWJZPScrRD0lS2Wy9Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
 
-"@glimmer/vm-babel-plugins@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.4.tgz#317b9b85752abab903674b959ed9e00e1942ae23"
-  integrity sha512-LEdgx6QXOAm+88TxgrvWvkUc6J6jPKmnMzW3IAiD7aIHasSl+/aKfZF0x3ICHyCXGaJGWI00mVKxd2n61aAY9g==
+"@glimmer/vm-babel-plugins@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5"
+  integrity sha512-ZW6+L+FzjDZngGj87zn3MRRA/MrchC7Con33mCcI36v8u48maheB351uhQe+fBVU300IfyzNMvAdwdVKS5VIFw==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.4.tgz#1d0f00909c6b97b99d7c8bb11d1e7b958822dbd3"
-  integrity sha512-enCXJlypgMTxWUupQWCPUvE41Gh4vsCIWVhqdh6ol+QGzRZBGvfXTz5xu5lTKPJQhFQsTn2ecVTKKVhqMOtzpA==
+"@glimmer/vm@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.0.tgz#435a8d846e7e6066c018018a71be403520e9b577"
+  integrity sha512-1oSNmMXS83o/+SO1dW1rdm6hHH5ZbCfZt0mrY4+UHFHnlt8RH24z4YN36kjBVczCX1DhZJOYUrwwE4FKBjKdaQ==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
-"@glimmer/wire-format@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.4.tgz#4074b1194650909e295c349e75d2cebb8a03c8bd"
-  integrity sha512-QuGfVIX1ziyFDPzJaKZnbgyhzzz5a8s/B+xYg5ZEhMo5BHuyL1a3Gw+0qUMCPlVUIX0Uv+VWvI7NF9tH/ykiZA==
+"@glimmer/wire-format@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.0.tgz#bea3da7973a6a70611bf45cfc15592dbec132091"
+  integrity sha512-DAUEqUxq0ymuzRStw51DMhTrRZdCBVPZ7K63YFLRud3pojaApWxgeOFlsLua9nRqR6wYSSKS0y2E0n0tPnRndA==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
@@ -5232,6 +5211,9 @@ find-babel-config@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
 
 find-index@^1.1.0:
   version "1.1.0"

From b307177fb21e6d68175f7db9211df7d6dc990281 Mon Sep 17 00:00:00 2001
From: Jordan Hawker <hawker.jordan@gmail.com>
Date: Thu, 29 Jul 2021 14:23:12 -0700
Subject: [PATCH 0595/1405] [router.ts] Convert this._super to super

The router class has already been converted to a native JS class, so it should be using `super.willDestroy` in its `willDestroy` hook instead of `this._super`.
---
 packages/@ember/-internals/routing/lib/system/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 539add97aa1..ccabbe8bc1d 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -802,7 +802,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       this._toplevelView = null;
     }
 
-    this._super(...arguments);
+    super.willDestroy();
 
     this.reset();
 

From bc5ee8a0dc83719db25b4989e5d3d881551a1e0b Mon Sep 17 00:00:00 2001
From: Michael Klein <Michael@firstiwaslike.com>
Date: Thu, 29 Jul 2021 19:04:44 +0200
Subject: [PATCH 0596/1405] [DOC] Clarify invokeHelper example

---
 packages/@ember/helper/index.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/helper/index.ts b/packages/@ember/helper/index.ts
index f3d84cc6e21..47f98763171 100644
--- a/packages/@ember/helper/index.ts
+++ b/packages/@ember/helper/index.ts
@@ -252,14 +252,18 @@
   The `invokeHelper` function can be used to create a helper instance in
   JavaScript.
 
+  To access a helper's value you have to use `getValue` from
+  `@glimmer/tracking/primitives/cache`.
+
   ```js
   // app/components/data-loader.js
   import Component from '@glimmer/component';
+  import { getValue } from '@glimmer/tracking/primitives/cache';
   import Helper from '@ember/component/helper';
   import { invokeHelper } from '@ember/helper';
 
   class PlusOne extends Helper {
-    compute([num]) {
+    compute([number]) {
       return number + 1;
     }
   }
@@ -270,10 +274,14 @@
         positional: [this.args.number],
       };
     });
+
+    get value() {
+      return getValue(this.plusOne);
+    }
   }
   ```
   ```hbs
-  {{this.plusOne.value}}
+  {{this.value}}
   ```
 
   It receives three arguments:

From 238e01679bd15eafa5c6a9d988f8b68905d76177 Mon Sep 17 00:00:00 2001
From: Henry Majoros <hmajoros@linkedin.com>
Date: Fri, 30 Jul 2021 09:52:19 -0400
Subject: [PATCH 0597/1405] [BUGFIX LTS] fix memory leak in RouterService

---
 packages/@ember/-internals/routing/lib/services/router.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 3c8d4b8e92d..9c07ccdc612 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -62,6 +62,12 @@ export default class RouterService extends Service {
     return (this[ROUTER] = router);
   }
 
+  willDestroy() {
+    super.willDestroy(...arguments);
+
+    this[ROUTER] = null;
+  }
+
   /**
      Transition the application into another route. The route may
      be either a single route or route path:

From a0f486a110cf65ce38a842611880705baf9d1c6e Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 21 Jul 2021 20:44:20 -0700
Subject: [PATCH 0598/1405] Remove computed deep each

---
 .../@ember/-internals/metal/lib/chain-tags.ts | 29 +-------------
 .../@ember/-internals/metal/lib/computed.ts   | 11 +++---
 .../-internals/metal/tests/computed_test.js   | 38 +++----------------
 3 files changed, 13 insertions(+), 65 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 816f9420620..6e992308d2d 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,6 +1,6 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { _WeakSet } from '@glimmer/util';
 import {
   combine,
@@ -89,33 +89,6 @@ function getChainTags(
       lastSegmentEnd = segmentEnd + 1;
       segmentEnd = path.indexOf('.', lastSegmentEnd);
 
-      // There should be exactly one segment after an `@each` (i.e. `@each.foo`, not `@each.foo.bar`)
-      deprecate(
-        `When using @each in a dependent-key or an observer, ` +
-          `you can only chain one property level deep after ` +
-          `the @each. That is, \`${path.slice(0, segmentEnd)}\` ` +
-          `is allowed but \`${path}\` (which is what you passed) ` +
-          `is not.\n\n` +
-          `This was never supported. Currently, the extra segments ` +
-          `are silently ignored, i.e. \`${path}\` behaves exactly ` +
-          `the same as \`${path.slice(0, segmentEnd)}\`. ` +
-          `In the future, this will throw an error.\n\n` +
-          `If the current behavior is acceptable for your use case, ` +
-          `please remove the extraneous segments by changing your ` +
-          `key to \`${path.slice(0, segmentEnd)}\`. ` +
-          `Otherwise, please create an intermediary computed property ` +
-          `or switch to using tracked properties.`,
-        segmentEnd === -1,
-        {
-          until: '3.17.0',
-          id: 'ember-metal.computed-deep-each',
-          for: 'ember-source',
-          since: {
-            enabled: '3.13.0-beta.3',
-          },
-        }
-      );
-
       let arrLength = current.length;
 
       if (
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index a7fb6209523..ee5e1f581f2 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,6 +1,6 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { inspect, toString } from '@ember/-internals/utils';
-import { assert, warn } from '@ember/debug';
+import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
@@ -351,13 +351,14 @@ export class ComputedProperty extends ComputedDescriptor {
     let args: string[] = [];
 
     function addArg(property: string): void {
-      warn(
+      assert(
         `Dependent keys containing @each only work one level deep. ` +
           `You used the key "${property}" which is invalid. ` +
-          `Please create an intermediary computed property.`,
-        DEEP_EACH_REGEX.test(property) === false,
-        { id: 'ember-metal.computed-deep-each' }
+          `Please create an intermediary computed property or ` +
+          `switch to using tracked properties.`,
+        DEEP_EACH_REGEX.test(property) === false
       );
+
       args.push(property);
     }
 
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 69c0a522302..2aea2bafffc 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -166,7 +166,7 @@ moduleFor(
     //   assert.deepEqual(cp._dependentKeys, ['qux', 'zoopa.[]']);
     // }
 
-    ['@test defining a computed property with a dependent key more than one level deep beyond @each is not supported']() {
+    ['@test defining a computed property with a dependent key more than one level deep beyond @each throws an assertion']() {
       expectNoWarning(() => {
         obj = {};
         defineProperty(
@@ -185,50 +185,24 @@ moduleFor(
         );
       });
 
-      expectWarning(() => {
+      let expected = /Dependent keys containing @each only work one level deep./;
+
+      expectAssertion(() => {
         obj = {};
         defineProperty(
           obj,
           'someProp',
           computed('todos.@each.owner.name', () => {})
         );
-      }, /You used the key "todos\.@each\.owner\.name" which is invalid\. /);
+      }, expected);
 
-      expectWarning(() => {
+      expectAssertion(() => {
         obj = {};
         defineProperty(
           obj,
           'someProp',
           computed('todos.@each.owner.@each.name', () => {})
         );
-      }, /You used the key "todos\.@each\.owner\.@each\.name" which is invalid\. /);
-
-      let expected = new RegExp(
-        'When using @each in a dependent-key or an observer, ' +
-          'you can only chain one property level deep after the @each\\. ' +
-          'That is, `todos\\.@each\\.owner` is allowed but ' +
-          '`todos\\.@each\\.owner\\.name` \\(which is what you passed\\) is not\\.\n\n' +
-          'This was never supported\\. Currently, the extra segments ' +
-          'are silently ignored, i\\.e\\. `todos\\.@each\\.owner\\.name` ' +
-          'behaves exactly the same as `todos\\.@each\\.owner`\\. ' +
-          'In the future, this will throw an error\\.\n\n' +
-          'If the current behavior is acceptable for your use case, ' +
-          'please remove the extraneous segments by changing your key to ' +
-          '`todos\\.@each\\.owner`\\. Otherwise, please create an ' +
-          'intermediary computed property or switch to using tracked properties\\.'
-      );
-
-      expectDeprecation(() => {
-        obj = {
-          todos: [],
-        };
-        defineProperty(
-          obj,
-          'someProp',
-          computed('todos.@each.owner.name', () => {})
-        );
-
-        get(obj, 'someProp');
       }, expected);
     }
   }

From c6c697876ff3c710617f935c72b6113505c1fd7d Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 1 Aug 2021 08:48:30 -0400
Subject: [PATCH 0599/1405] [BUGFIX release] Deprecate htmlSafe via prototype

In Ember 3.24 various string methods added to the `String.prototype` were
deprecated for removal in Ember 4.0. `htmlSafe` (the version available
via string prototype) was supposed to be included in those deprecations,
however dues to its implementation being different it was missed. This
omission can be understood as a bug.

This patch deprecates `String.prototype.htmlSafe` targeting Ember 4.0.
This will allow the removal of *all* string prototype extensions in 4.0
as intended by the original deprecation.

See also: https://github.com/emberjs/ember.js/pull/19654#issuecomment-890386906
---
 .../glimmer/tests/utils/string-test.js        | 40 +++++++++++++++++++
 packages/ember/index.js                       | 13 ++++++
 2 files changed, 53 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/tests/utils/string-test.js b/packages/@ember/-internals/glimmer/tests/utils/string-test.js
index 139c6c3846d..343ea352474 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/string-test.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/string-test.js
@@ -1,4 +1,5 @@
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { ENV } from '@ember/-internals/environment';
 
 import { SafeString, htmlSafe, isHTMLSafe } from './helpers';
 
@@ -11,6 +12,19 @@ moduleFor(
       this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
     }
 
+    ['@test [deprecated] htmlSafe via string prototype should return an instance of SafeString']() {
+      if (ENV.EXTEND_PROTOTYPES.String) {
+        let safeString;
+        expectDeprecation(() => {
+          safeString = 'you need to be more <b>bold</b>'.htmlSafe();
+        }, /String prototype extensions are deprecated/);
+
+        this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
+      } else {
+        this.assert.expect(0);
+      }
+    }
+
     ['@test htmlSafe should return an empty string for null']() {
       let safeString = htmlSafe(null);
 
@@ -24,6 +38,32 @@ moduleFor(
       this.assert.equal(safeString instanceof SafeString, true, 'should be a SafeString');
       this.assert.equal(safeString.toString(), '', 'should return an empty string');
     }
+
+    ['@test [deprecated] htmlSafe via string prototype should return an instance of SafeString for an empty string']() {
+      if (ENV.EXTEND_PROTOTYPES.String) {
+        let safeString;
+        expectDeprecation(() => {
+          safeString = ''.htmlSafe();
+        }, /String prototype extensions are deprecated/);
+
+        this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
+      } else {
+        this.assert.expect(0);
+      }
+    }
+
+    ['@test [deprecated] String.prototype.htmlSafe is not modified without EXTEND_PROTOTYPES'](
+      assert
+    ) {
+      if (!ENV.EXTEND_PROTOTYPES.String) {
+        assert.ok(
+          'undefined' === typeof String.prototype.htmlSafe,
+          'String.prototype helper disabled'
+        );
+      } else {
+        this.assert.expect(0);
+      }
+    }
   }
 );
 
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 7709b6b9448..efd62ebc418 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -493,6 +493,19 @@ Ember._captureRenderTree = captureRenderTree;
 
 if (ENV.EXTEND_PROTOTYPES.String) {
   String.prototype.htmlSafe = function () {
+    deprecate(
+      `String prototype extensions are deprecated. Please import htmlSafe from '@ember/template' instead.`,
+      false,
+      {
+        id: 'ember-string.prototype-extensions',
+        for: 'ember-source',
+        since: {
+          enabled: '3.27.6',
+        },
+        until: '4.0.0',
+        url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
+      }
+    );
     return htmlSafe(this);
   };
 }

From 392981c1b72e06705ac9d2c22d0ea6a846806543 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 1 Aug 2021 10:16:35 -0400
Subject: [PATCH 0600/1405] Add build assertion against `{{outlet named}}`

Named outlets are effectively removed in Ember 4.0, as the render hook
and `renderTemplate` method which are used to configure them have been
removed. Add an assertion to catch anyone trying to use this API going
forward.
---
 .../glimmer/tests/integration/outlet-test.js  | 140 ------------------
 .../plugins/assert-against-named-outlets.ts   |  37 +++++
 .../lib/plugins/index.ts                      |   3 +
 .../assert-against-named-outlets-test.js      |  26 ++++
 4 files changed, 66 insertions(+), 140 deletions(-)
 create mode 100644 packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
 create mode 100644 packages/ember-template-compiler/tests/plugins/assert-against-named-outlets-test.js

diff --git a/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js b/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
index 71d4311963b..8c0ed82f978 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
@@ -1,7 +1,5 @@
 import { RenderingTestCase, moduleFor, runAppend, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
-
 moduleFor(
   'outlet view',
   class extends RenderingTestCase {
@@ -131,144 +129,6 @@ moduleFor(
       this.assertText('HIBYE');
     }
 
-    ['@test should support an optional name']() {
-      this.registerTemplate('application', '<h1>HI</h1>{{outlet "special"}}');
-      let outletState = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'application',
-          controller: {},
-          template: this.owner.lookup('template:application')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      runTask(() => this.component.setOutletState(outletState));
-
-      runAppend(this.component);
-
-      this.assertText('HI');
-
-      this.assertStableRerender();
-
-      this.registerTemplate('special', '<p>BYE</p>');
-      outletState.outlets.special = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'special',
-          controller: {},
-          template: this.owner.lookup('template:special')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      runTask(() => this.component.setOutletState(outletState));
-
-      this.assertText('HIBYE');
-    }
-
-    ['@test does not default outlet name when positional argument is present']() {
-      this.registerTemplate('application', '<h1>HI</h1>{{outlet this.someUndefinedThing}}');
-      let outletState = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'application',
-          controller: {},
-          template: this.owner.lookup('template:application')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      runTask(() => this.component.setOutletState(outletState));
-
-      runAppend(this.component);
-
-      this.assertText('HI');
-
-      this.assertStableRerender();
-
-      this.registerTemplate('special', '<p>BYE</p>');
-      outletState.outlets.main = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'special',
-          controller: {},
-          template: this.owner.lookup('template:special')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      runTask(() => this.component.setOutletState(outletState));
-
-      this.assertText('HI');
-    }
-
-    ['@test should support bound outlet name']() {
-      let controller = { outletName: 'foo' };
-      this.registerTemplate('application', '<h1>HI</h1>{{outlet this.outletName}}');
-      let outletState = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'application',
-          controller,
-          template: this.owner.lookup('template:application')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      runTask(() => this.component.setOutletState(outletState));
-
-      runAppend(this.component);
-
-      this.assertText('HI');
-
-      this.assertStableRerender();
-
-      this.registerTemplate('foo', '<p>FOO</p>');
-      outletState.outlets.foo = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'foo',
-          controller: {},
-          template: this.owner.lookup('template:foo')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      this.registerTemplate('bar', '<p>BAR</p>');
-      outletState.outlets.bar = {
-        render: {
-          owner: this.owner,
-          into: undefined,
-          outlet: 'main',
-          name: 'bar',
-          controller: {},
-          template: this.owner.lookup('template:bar')(this.owner),
-        },
-        outlets: Object.create(null),
-      };
-
-      runTask(() => this.component.setOutletState(outletState));
-
-      this.assertText('HIFOO');
-
-      runTask(() => set(controller, 'outletName', 'bar'));
-
-      this.assertText('HIBAR');
-    }
-
     ['@test outletState can pass through user code (liquid-fire initimate API) ']() {
       this.registerTemplate(
         'outer',
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
new file mode 100644
index 00000000000..8a0074f4eb5
--- /dev/null
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
@@ -0,0 +1,37 @@
+import { assert } from '@ember/debug';
+import { AST, ASTPlugin } from '@glimmer/syntax';
+import calculateLocationDisplay from '../system/calculate-location-display';
+import { EmberASTPluginEnvironment } from '../types';
+
+/**
+ @module ember
+*/
+
+/**
+  Prevents usage of named outlets, a legacy concept in Ember removed in 4.0.
+
+  @private
+  @class AssertAgainstNamedOutlets
+*/
+export default function assertAgainstNamedOutlets(env: EmberASTPluginEnvironment): ASTPlugin {
+  let moduleName = env.meta?.moduleName;
+
+  return {
+    name: 'assert-against-named-outlets',
+
+    visitor: {
+      MustacheStatement(node: AST.MustacheStatement) {
+        if (
+          node.path.type === 'PathExpression' &&
+          node.path.original === 'outlet' &&
+          node.params[0]
+        ) {
+          let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
+          assert(
+            `Named outlets were removed in Ember 4.0. See https://deprecations.emberjs.com/v3.x#toc_route-render-template for guidance on alternative APIs for named outlet use cases. ${sourceInformation}`
+          );
+        }
+      },
+    },
+  };
+}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 1f6d69ad01e..b9c74da1d48 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -1,5 +1,6 @@
 import AssertAgainstDynamicHelpersModifiers from './assert-against-dynamic-helpers-modifiers';
 import AssertAgainstNamedBlocks from './assert-against-named-blocks';
+import AssertAgainstNamedOutlets from './assert-against-named-outlets';
 import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
@@ -30,6 +31,7 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformInElement,
     AssertSplattributeExpressions,
     TransformEachTrackArray,
+    AssertAgainstNamedOutlets,
     TransformWrapMountAndOutlet,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
@@ -47,6 +49,7 @@ export const STRICT_MODE_TRANSFORMS = Object.freeze(
     TransformInElement,
     AssertSplattributeExpressions,
     TransformEachTrackArray,
+    AssertAgainstNamedOutlets,
     TransformWrapMountAndOutlet,
     !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
diff --git a/packages/ember-template-compiler/tests/plugins/assert-against-named-outlets-test.js b/packages/ember-template-compiler/tests/plugins/assert-against-named-outlets-test.js
new file mode 100644
index 00000000000..5618961fb1d
--- /dev/null
+++ b/packages/ember-template-compiler/tests/plugins/assert-against-named-outlets-test.js
@@ -0,0 +1,26 @@
+import { compile } from '../../index';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+moduleFor(
+  'ember-template-compiler: assert-against-named-outlets',
+  class extends AbstractTestCase {
+    [`named outlets are asserted against`]() {
+      expectAssertion(() => {
+        compile(`{{outlet 'foo'}}`, {
+          moduleName: 'baz/foo-bar',
+        });
+      }, `Named outlets were removed in Ember 4.0. See https://deprecations.emberjs.com/v3.x#toc_route-render-template for guidance on alternative APIs for named outlet use cases. ('baz/foo-bar' @ L1:C5) `);
+
+      expectAssertion(() => {
+        compile(`{{outlet foo}}`, {
+          moduleName: 'baz/foo-bar',
+        });
+      }, `Named outlets were removed in Ember 4.0. See https://deprecations.emberjs.com/v3.x#toc_route-render-template for guidance on alternative APIs for named outlet use cases. ('baz/foo-bar' @ L1:C5) `);
+
+      // No assertion
+      compile(`{{outlet}}`, {
+        moduleName: 'baz/foo-bar',
+      });
+    }
+  }
+);

From 206af374dd78339b0670e566a3224893dd90c42e Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 1 Aug 2021 14:11:04 -0400
Subject: [PATCH 0601/1405] Drop `Function` from `EXTEND_PROTOTYPES`

---
 packages/@ember/-internals/environment/lib/env.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index 27ea7f19e99..ca357e9f3bb 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -16,7 +16,7 @@ export const ENV = {
   ENABLE_OPTIONAL_FEATURES: false,
 
   /**
-    Determines whether Ember should add to `Array`, `Function`, and `String`
+    Determines whether Ember should add to `Array` and `String`
     native object prototypes, a few extra methods in order to provide a more
     friendly API.
 
@@ -36,7 +36,6 @@ export const ENV = {
   */
   EXTEND_PROTOTYPES: {
     Array: true,
-    Function: true,
     String: true,
   },
 

From 8ccac17e166887a485973e4cb524085055ed97b1 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 18 Jul 2021 15:53:13 -0400
Subject: [PATCH 0602/1405] Remove @ember/string methods from native prototype

---
 .../@ember/-internals/environment/lib/env.ts  |   8 +-
 .../glimmer/tests/utils/string-test.js        |  40 -----
 packages/@ember/string/index.ts               | 142 +-----------------
 packages/@ember/string/tests/camelize_test.js |  17 ---
 .../@ember/string/tests/capitalize_test.js    |  17 ---
 packages/@ember/string/tests/classify_test.js |  17 ---
 .../@ember/string/tests/dasherize_test.js     |  17 ---
 .../@ember/string/tests/decamelize_test.js    |  17 ---
 .../@ember/string/tests/underscore_test.js    |  17 ---
 packages/@ember/string/tests/w_test.js        |  14 --
 packages/ember/index.js                       |  20 +--
 11 files changed, 4 insertions(+), 322 deletions(-)

diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index ca357e9f3bb..e4f2d0f4823 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -16,7 +16,7 @@ export const ENV = {
   ENABLE_OPTIONAL_FEATURES: false,
 
   /**
-    Determines whether Ember should add to `Array` and `String`
+    Determines whether Ember should add to `Array`
     native object prototypes, a few extra methods in order to provide a more
     friendly API.
 
@@ -36,7 +36,6 @@ export const ENV = {
   */
   EXTEND_PROTOTYPES: {
     Array: true,
-    String: true,
   },
 
   /**
@@ -217,12 +216,9 @@ export const ENV = {
   let { EXTEND_PROTOTYPES } = EmberENV;
   if (EXTEND_PROTOTYPES !== undefined) {
     if (typeof EXTEND_PROTOTYPES === 'object' && EXTEND_PROTOTYPES !== null) {
-      ENV.EXTEND_PROTOTYPES.String = EXTEND_PROTOTYPES.String !== false;
       ENV.EXTEND_PROTOTYPES.Array = EXTEND_PROTOTYPES.Array !== false;
     } else {
-      let isEnabled = EXTEND_PROTOTYPES !== false;
-      ENV.EXTEND_PROTOTYPES.String = isEnabled;
-      ENV.EXTEND_PROTOTYPES.Array = isEnabled;
+      ENV.EXTEND_PROTOTYPES.Array = EXTEND_PROTOTYPES !== false;
     }
   }
 
diff --git a/packages/@ember/-internals/glimmer/tests/utils/string-test.js b/packages/@ember/-internals/glimmer/tests/utils/string-test.js
index 343ea352474..139c6c3846d 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/string-test.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/string-test.js
@@ -1,5 +1,4 @@
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import { ENV } from '@ember/-internals/environment';
 
 import { SafeString, htmlSafe, isHTMLSafe } from './helpers';
 
@@ -12,19 +11,6 @@ moduleFor(
       this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
     }
 
-    ['@test [deprecated] htmlSafe via string prototype should return an instance of SafeString']() {
-      if (ENV.EXTEND_PROTOTYPES.String) {
-        let safeString;
-        expectDeprecation(() => {
-          safeString = 'you need to be more <b>bold</b>'.htmlSafe();
-        }, /String prototype extensions are deprecated/);
-
-        this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
-      } else {
-        this.assert.expect(0);
-      }
-    }
-
     ['@test htmlSafe should return an empty string for null']() {
       let safeString = htmlSafe(null);
 
@@ -38,32 +24,6 @@ moduleFor(
       this.assert.equal(safeString instanceof SafeString, true, 'should be a SafeString');
       this.assert.equal(safeString.toString(), '', 'should return an empty string');
     }
-
-    ['@test [deprecated] htmlSafe via string prototype should return an instance of SafeString for an empty string']() {
-      if (ENV.EXTEND_PROTOTYPES.String) {
-        let safeString;
-        expectDeprecation(() => {
-          safeString = ''.htmlSafe();
-        }, /String prototype extensions are deprecated/);
-
-        this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
-      } else {
-        this.assert.expect(0);
-      }
-    }
-
-    ['@test [deprecated] String.prototype.htmlSafe is not modified without EXTEND_PROTOTYPES'](
-      assert
-    ) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.htmlSafe,
-          'String.prototype helper disabled'
-        );
-      } else {
-        this.assert.expect(0);
-      }
-    }
   }
 );
 
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index ff1ac0ee5ac..3a42940417f 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -4,7 +4,6 @@
 
 export { getStrings as _getStrings, setStrings as _setStrings } from './lib/string_registry';
 
-import { ENV } from '@ember/-internals/environment';
 import { Cache } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
 
@@ -73,8 +72,6 @@ const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
 
 /**
   Defines string helper methods including string formatting and localization.
-  Unless `EmberENV.EXTEND_PROTOTYPES.String` is `false` these methods will also be
-  added to the `String.prototype` as well.
 
   @class String
   @public
@@ -82,8 +79,7 @@ const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
 
 /**
   Splits a string into separate units separated by spaces, eliminating any
-  empty strings in the process. This is a convenience method for split that
-  is mostly useful when applied to the `String.prototype`.
+  empty strings in the process.
 
   ```javascript
   import { w } from '@ember/string';
@@ -267,139 +263,3 @@ export function isHTMLSafe(str: any | null | undefined): str is SafeString {
 
   return internalIsHtmlSafe(str);
 }
-
-if (ENV.EXTEND_PROTOTYPES.String) {
-  let deprecateEmberStringPrototypeExtension = function (
-    name: string,
-    fn: (utility: string, ...options: any) => string | string[],
-    message = `String prototype extensions are deprecated. Please import ${name} from '@ember/string' instead.`
-  ) {
-    return function (this: string) {
-      deprecate(message, false, {
-        id: 'ember-string.prototype-extensions',
-        for: 'ember-source',
-        since: {
-          enabled: '3.24',
-        },
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-prototype_extensions',
-      });
-
-      return fn(this, ...arguments);
-    };
-  };
-
-  Object.defineProperties(String.prototype, {
-    /**
-      See [String.w](/ember/release/classes/String/methods/w?anchor=w).
-
-      @method w
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    w: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('w', w),
-    },
-
-    /**
-      See [String.camelize](/ember/release/classes/String/methods/camelize?anchor=camelize).
-
-      @method camelize
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    camelize: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('camelize', camelize),
-    },
-
-    /**
-      See [String.decamelize](/ember/release/classes/String/methods/decamelize?anchor=decamelize).
-
-      @method decamelize
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    decamelize: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('decamelize', decamelize),
-    },
-
-    /**
-      See [String.dasherize](/ember/release/classes/String/methods/dasherize?anchor=dasherize).
-
-      @method dasherize
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    dasherize: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('dasherize', dasherize),
-    },
-
-    /**
-      See [String.underscore](/ember/release/classes/String/methods/underscore?anchor=underscore).
-
-      @method underscore
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    underscore: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('underscore', underscore),
-    },
-
-    /**
-      See [String.classify](/ember/release/classes/String/methods/classify?anchor=classify).
-
-      @method classify
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    classify: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('classify', classify),
-    },
-
-    /**
-      See [String.capitalize](/ember/release/classes/String/methods/capitalize?anchor=capitalize).
-
-      @method capitalize
-      @for @ember/string
-      @static
-      @private
-      @deprecated
-    */
-    capitalize: {
-      configurable: true,
-      enumerable: false,
-      writeable: true,
-      value: deprecateEmberStringPrototypeExtension('capitalize', capitalize),
-    },
-  });
-}
diff --git a/packages/@ember/string/tests/camelize_test.js b/packages/@ember/string/tests/camelize_test.js
index 252d6c1e4e0..04d4015c39f 100644
--- a/packages/@ember/string/tests/camelize_test.js
+++ b/packages/@ember/string/tests/camelize_test.js
@@ -1,30 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { camelize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(camelize(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.camelize(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.camelize',
   class extends AbstractTestCase {
-    ['@test String.prototype.camelize is not modified without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.camelize,
-          'String.prototype helper disabled'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String camelize tests'](assert) {
       test(assert, 'my favorite items', 'myFavoriteItems', 'camelize normal string');
       test(assert, 'I Love Ramen', 'iLoveRamen', 'camelize capitalized string');
diff --git a/packages/@ember/string/tests/capitalize_test.js b/packages/@ember/string/tests/capitalize_test.js
index 23766f846cf..593c81afda3 100644
--- a/packages/@ember/string/tests/capitalize_test.js
+++ b/packages/@ember/string/tests/capitalize_test.js
@@ -1,30 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { capitalize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(capitalize(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.capitalize(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.capitalize',
   class extends AbstractTestCase {
-    ['@test String.prototype.capitalize is not modified without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.capitalize,
-          'String.prototype helper disabled'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String capitalize tests'](assert) {
       test(assert, 'my favorite items', 'My favorite items', 'capitalize normal string');
       test(assert, 'css-class-name', 'Css-class-name', 'capitalize dasherized string');
diff --git a/packages/@ember/string/tests/classify_test.js b/packages/@ember/string/tests/classify_test.js
index a9e9aebea69..bb846c46bb2 100644
--- a/packages/@ember/string/tests/classify_test.js
+++ b/packages/@ember/string/tests/classify_test.js
@@ -1,30 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { classify } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(classify(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.classify(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.classify',
   class extends AbstractTestCase {
-    ['@test String.prototype.classify is not modified without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.classify,
-          'String.prototype helper disabled'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String classify tests'](assert) {
       test(assert, 'my favorite items', 'MyFavoriteItems', 'classify normal string');
       test(assert, 'css-class-name', 'CssClassName', 'classify dasherized string');
diff --git a/packages/@ember/string/tests/dasherize_test.js b/packages/@ember/string/tests/dasherize_test.js
index aa5cbabdd28..c29640412b7 100644
--- a/packages/@ember/string/tests/dasherize_test.js
+++ b/packages/@ember/string/tests/dasherize_test.js
@@ -1,30 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { dasherize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(dasherize(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.dasherize(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.dasherize',
   class extends AbstractTestCase {
-    ['@test String.prototype.dasherize is not modified without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.dasherize,
-          'String.prototype helper disabled'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String dasherize tests'](assert) {
       test(assert, 'my favorite items', 'my-favorite-items', 'dasherize normal string');
       test(assert, 'css-class-name', 'css-class-name', 'does nothing with dasherized string');
diff --git a/packages/@ember/string/tests/decamelize_test.js b/packages/@ember/string/tests/decamelize_test.js
index 9e8da71ac40..cc8aff312f6 100644
--- a/packages/@ember/string/tests/decamelize_test.js
+++ b/packages/@ember/string/tests/decamelize_test.js
@@ -1,30 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { decamelize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(decamelize(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.decamelize(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.decamelize',
   class extends AbstractTestCase {
-    ['@test String.prototype.decamelize is not modified without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.decamelize,
-          'String.prototype helper disabled'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String decamelize tests'](assert) {
       test(assert, 'my favorite items', 'my favorite items', 'does nothing with normal string');
       test(assert, 'css-class-name', 'css-class-name', 'does nothing with dasherized string');
diff --git a/packages/@ember/string/tests/underscore_test.js b/packages/@ember/string/tests/underscore_test.js
index d6516b11c61..2baf836fe76 100644
--- a/packages/@ember/string/tests/underscore_test.js
+++ b/packages/@ember/string/tests/underscore_test.js
@@ -1,30 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { underscore } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(underscore(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.underscore(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.underscore',
   class extends AbstractTestCase {
-    ['@test String.prototype.underscore is not available without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok(
-          'undefined' === typeof String.prototype.underscore,
-          'String.prototype helper disabled'
-        );
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String underscore tests'](assert) {
       test(assert, 'my favorite items', 'my_favorite_items', 'with normal string');
       test(assert, 'css-class-name', 'css_class_name', 'with dasherized string');
diff --git a/packages/@ember/string/tests/w_test.js b/packages/@ember/string/tests/w_test.js
index 026b87f0103..1357aa2fa40 100644
--- a/packages/@ember/string/tests/w_test.js
+++ b/packages/@ember/string/tests/w_test.js
@@ -1,27 +1,13 @@
-import { ENV } from '@ember/-internals/environment';
 import { w } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
   assert.deepEqual(w(given), expected, description);
-  if (ENV.EXTEND_PROTOTYPES.String) {
-    expectDeprecation(() => {
-      assert.deepEqual(given.w(), expected, description);
-    }, /String prototype extensions are deprecated/);
-  }
 }
 
 moduleFor(
   'EmberStringUtils.w',
   class extends AbstractTestCase {
-    ['@test String.prototype.w is not available without EXTEND_PROTOTYPES'](assert) {
-      if (!ENV.EXTEND_PROTOTYPES.String) {
-        assert.ok('undefined' === typeof String.prototype.w, 'String.prototype helper disabled');
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test String w tests'](assert) {
       test(
         assert,
diff --git a/packages/ember/index.js b/packages/ember/index.js
index efd62ebc418..c1bca130712 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -1,6 +1,6 @@
 import require, { has } from 'require';
 
-import { getENV, getLookup, setLookup, ENV } from '@ember/-internals/environment';
+import { getENV, getLookup, setLookup } from '@ember/-internals/environment';
 import * as utils from '@ember/-internals/utils';
 import { Registry, Container } from '@ember/-internals/container';
 import * as instrumentation from '@ember/instrumentation';
@@ -491,24 +491,6 @@ if (EMBER_GLIMMER_INVOKE_HELPER) {
 }
 Ember._captureRenderTree = captureRenderTree;
 
-if (ENV.EXTEND_PROTOTYPES.String) {
-  String.prototype.htmlSafe = function () {
-    deprecate(
-      `String prototype extensions are deprecated. Please import htmlSafe from '@ember/template' instead.`,
-      false,
-      {
-        id: 'ember-string.prototype-extensions',
-        for: 'ember-source',
-        since: {
-          enabled: '3.27.6',
-        },
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
-      }
-    );
-    return htmlSafe(this);
-  };
-}
 const deprecateImportFromString = function (
   name,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`

From 826daa772eec5151bb3072a41a55602f630267cf Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 6 Jul 2021 11:13:06 -0700
Subject: [PATCH 0603/1405] Add deprecation warning to Ember.assign

---
 packages/@ember/deprecated-features/index.ts   |  1 +
 packages/@ember/polyfills/lib/assign.ts        | 16 ++++++++++++++++
 packages/@ember/polyfills/tests/assign_test.js |  4 +++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 46d6da8a07e..f797b9e4c64 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -8,3 +8,4 @@ export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
 export const PARTIALS = !!'3.15.0-beta.1';
+export const ASSIGN = !!'4.0.0';
diff --git a/packages/@ember/polyfills/lib/assign.ts b/packages/@ember/polyfills/lib/assign.ts
index 52e2ef0a446..340d10defe2 100644
--- a/packages/@ember/polyfills/lib/assign.ts
+++ b/packages/@ember/polyfills/lib/assign.ts
@@ -1,3 +1,5 @@
+import { deprecate } from '@ember/debug';
+
 /**
  @module @ember/polyfills
 */
@@ -28,6 +30,20 @@ export function assign(target: object, ...sources: any[]): any;
   @static
 */
 export function assign(target: object) {
+  deprecate(
+    'Use of `assign` has been deprecated. Please use `Object.assign` or the spread operator instead.',
+    false,
+    {
+      id: 'ember-polyfills.deprecate-assign',
+      until: '5.0.0',
+      url: 'https://deprecations.emberjs.com/v4.x/#toc_ember-polyfills-deprecate-assign',
+      for: 'ember-source',
+      since: {
+        enabled: '4.0.0',
+      },
+    }
+  );
+
   for (let i = 1; i < arguments.length; i++) {
     let arg = arguments[i];
     if (!arg) {
diff --git a/packages/@ember/polyfills/tests/assign_test.js b/packages/@ember/polyfills/tests/assign_test.js
index 86ffc241b37..90328e5358b 100644
--- a/packages/@ember/polyfills/tests/assign_test.js
+++ b/packages/@ember/polyfills/tests/assign_test.js
@@ -49,7 +49,9 @@ moduleFor(
   'Ember.assign (polyfill)',
   class extends AssignTests {
     assign() {
-      return assignPolyfill(...arguments);
+      return expectDeprecation(() => {
+        assignPolyfill(...arguments);
+      }, 'Use of `assign` has been deprecated. Please use `Object.assign` or the spread operator instead.');
     }
   }
 );

From ca106b1b87175e36fd820e8d798f6a507be526b3 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Wed, 21 Jul 2021 12:02:49 -0700
Subject: [PATCH 0604/1405] Ember.assign polyfill uses Object.assign directly

---
 .../-internals/routing/lib/system/router.ts   |  7 +++--
 packages/@ember/deprecated-features/index.ts  |  2 +-
 packages/@ember/polyfills/index.ts            |  3 +--
 packages/@ember/polyfills/lib/assign.ts       | 27 +++----------------
 .../@ember/polyfills/tests/assign_test.js     | 11 +-------
 packages/ember/index.js                       |  2 +-
 6 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index ccabbe8bc1d..384e5c11c25 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -9,7 +9,6 @@ import Controller from '@ember/controller';
 import { assert, deprecate, info } from '@ember/debug';
 import { APP_CTRL_ROUTER_PROPS, ROUTER_EVENTS } from '@ember/deprecated-features';
 import EmberError from '@ember/error';
-import { assign } from '@ember/polyfills';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import EmberLocation, { EmberLocation as IEmberLocation } from '../location/api';
@@ -1018,7 +1017,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);
 
-    assign(queryParams, _queryParams);
+    Object.assign(queryParams, _queryParams);
     this._prepareQueryParams(
       targetRouteName,
       models,
@@ -1059,7 +1058,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     // from the active transition.
     this._fullyScopeQueryParams(targetRouteName, models, _queryParams);
     this._fullyScopeQueryParams(targetRouteName, models, unchangedQPs);
-    assign(queryParams, unchangedQPs);
+    Object.assign(queryParams, unchangedQPs);
   }
 
   /**
@@ -1156,7 +1155,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
         qps.push(qp);
       }
 
-      assign(map, qpMeta.map);
+      Object.assign(map, qpMeta.map);
     }
 
     let finalQPMeta = { qps, map };
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index f797b9e4c64..62fa61f47a4 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -8,4 +8,4 @@ export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
 export const PARTIALS = !!'3.15.0-beta.1';
-export const ASSIGN = !!'4.0.0';
+export const ASSIGN = !!'4.0.0-beta.1';
diff --git a/packages/@ember/polyfills/index.ts b/packages/@ember/polyfills/index.ts
index 58f3eed8a65..9a45df979f9 100644
--- a/packages/@ember/polyfills/index.ts
+++ b/packages/@ember/polyfills/index.ts
@@ -1,4 +1,3 @@
-// Export `assignPolyfill` for testing
-export { default as assign, assign as assignPolyfill } from './lib/assign';
+export { assign } from './lib/assign';
 
 export const hasPropertyAccessors = true;
diff --git a/packages/@ember/polyfills/lib/assign.ts b/packages/@ember/polyfills/lib/assign.ts
index 340d10defe2..d5e11401d40 100644
--- a/packages/@ember/polyfills/lib/assign.ts
+++ b/packages/@ember/polyfills/lib/assign.ts
@@ -7,7 +7,7 @@ import { deprecate } from '@ember/debug';
 export function assign<T, U>(target: T, source: U): T & U;
 export function assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
 export function assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
-export function assign(target: object, ...sources: any[]): any;
+export function assign(target: object, ...sources: object[]): object;
 /**
   Copy properties from a source object to a target object. Source arguments remain unchanged.
 
@@ -29,7 +29,7 @@ export function assign(target: object, ...sources: any[]): any;
   @public
   @static
 */
-export function assign(target: object) {
+export function assign(target: object): object {
   deprecate(
     'Use of `assign` has been deprecated. Please use `Object.assign` or the spread operator instead.',
     false,
@@ -44,26 +44,5 @@ export function assign(target: object) {
     }
   );
 
-  for (let i = 1; i < arguments.length; i++) {
-    let arg = arguments[i];
-    if (!arg) {
-      continue;
-    }
-
-    let updates = Object.keys(arg);
-
-    for (let i = 0; i < updates.length; i++) {
-      let prop = updates[i];
-      target[prop] = arg[prop];
-    }
-  }
-
-  return target;
+  return Object.assign(target, ...arguments);
 }
-
-// Note: We use the bracket notation so
-//       that the babel plugin does not
-//       transform it.
-// https://www.npmjs.com/package/babel-plugin-transform-object-assign
-const { assign: _assign } = Object;
-export default (_assign || assign) as typeof assign;
diff --git a/packages/@ember/polyfills/tests/assign_test.js b/packages/@ember/polyfills/tests/assign_test.js
index 90328e5358b..d9c8510990e 100644
--- a/packages/@ember/polyfills/tests/assign_test.js
+++ b/packages/@ember/polyfills/tests/assign_test.js
@@ -1,4 +1,4 @@
-import { assignPolyfill, assign } from '..';
+import { assign as assignPolyfill } from '..';
 import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
 
 class AssignTests extends TestCase {
@@ -55,12 +55,3 @@ moduleFor(
     }
   }
 );
-
-moduleFor(
-  'Ember.assign (maybe not-polyfill ;) )',
-  class extends AssignTests {
-    assign() {
-      return assign(...arguments);
-    }
-  }
-);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index efd62ebc418..dbcda790b68 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -223,7 +223,7 @@ Ember.get = metal.get;
 Ember._getPath = metal._getPath;
 Ember.set = metal.set;
 Ember.trySet = metal.trySet;
-Ember.FEATURES = assign({ isEnabled }, FEATURES);
+Ember.FEATURES = Object.assign({ isEnabled }, FEATURES);
 Ember._Cache = utils.Cache;
 Ember.on = metal.on;
 Ember.addListener = metal.addListener;

From edb3914e376dde6c5824e38f4b18f54721a9dd66 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco@fabscale.com>
Date: Mon, 2 Aug 2021 11:38:35 +0200
Subject: [PATCH 0605/1405] Fix assign polyfill

---
 packages/@ember/polyfills/lib/assign.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/polyfills/lib/assign.ts b/packages/@ember/polyfills/lib/assign.ts
index d5e11401d40..7ff66dbc279 100644
--- a/packages/@ember/polyfills/lib/assign.ts
+++ b/packages/@ember/polyfills/lib/assign.ts
@@ -29,7 +29,7 @@ export function assign(target: object, ...sources: object[]): object;
   @public
   @static
 */
-export function assign(target: object): object {
+export function assign(target: object, ...rest: object[]): object {
   deprecate(
     'Use of `assign` has been deprecated. Please use `Object.assign` or the spread operator instead.',
     false,
@@ -44,5 +44,5 @@ export function assign(target: object): object {
     }
   );
 
-  return Object.assign(target, ...arguments);
+  return Object.assign(target, ...rest);
 }

From 7683833ff3e12f796d8476b23cf7b3257c85d856 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 2 Aug 2021 13:48:36 -0400
Subject: [PATCH 0606/1405] Add 3.28.0-beta.7 to CHANGELOG

(cherry picked from commit f65283d7985b58e8788c65cc92bc3cf70ecc2226)
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13997c8d744..7af870522c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v3.28.0-beta.7 (August 2, 2021)
+
+- [#19681](https://github.com/emberjs/ember.js/pull/19681) [BUGFIX] Restore previous hash behavior
+- [#19685](https://github.com/emberjs/ember.js/pull/19685) [BUGFIX] Fix memory leak in RouterService
+- [#19690](https://github.com/emberjs/ember.js/pull/19690) [BUGFIX] Deprecates String.prototype.htmlSafe targeting Ember 4.0, as intended by the original deprecation.
+
 ### v3.28.0-beta.6 (June 21, 2021)
 
 - [#19584](https://github.com/emberjs/ember.js/pull/19584) [BUGFIX] Ensure hash objects correctly entangle as dependencies

From 51b3a9ef6a1949d4051c9108cb1cc204e1e2cff2 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Tue, 3 Aug 2021 20:59:53 -0400
Subject: [PATCH 0607/1405] Remove {{partial}}

---
 packages/@ember/-internals/glimmer/index.ts   |  41 --
 .../@ember/-internals/glimmer/lib/resolver.ts |  77 +---
 .../integration/application/engine-test.js    | 150 -------
 .../components/curly-components-test.js       |  44 --
 .../tests/integration/helpers/partial-test.js | 424 ------------------
 packages/@ember/deprecated-features/index.ts  |   1 -
 .../lib/test-cases/rendering.js               |  10 -
 tests/docs/expected.js                        |   1 -
 8 files changed, 3 insertions(+), 745 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index cf7ecfdd08b..5028dea2934 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -292,47 +292,6 @@
   @public
  */
 
-/**
-  The `partial` helper renders another template without
-  changing the template context:
-
-  ```handlebars
-  {{foo}}
-  {{partial "nav"}}
-  ```
-
-  The above example template will render a template named
-  "-nav", which has the same context as the parent template
-  it's rendered into, so if the "-nav" template also referenced
-  `{{foo}}`, it would print the same thing as the `{{foo}}`
-  in the above example.
-
-  If a "-nav" template isn't found, the `partial` helper will
-  fall back to a template named "nav".
-
-  ### Bound template names
-
-  The parameter supplied to `partial` can also be a path
-  to a property containing a template name, e.g.:
-
-  ```handlebars
-  {{partial someTemplateName}}
-  ```
-
-  The above example will look up the value of `someTemplateName`
-  on the template context (e.g. a controller) and use that
-  value as the name of the template to render. If the resolved
-  value is falsy, nothing will be rendered. If `someTemplateName`
-  changes, the partial will be re-rendered using the new template
-  name.
-
-  @method partial
-  @for Ember.Templates.helpers
-  @param {String} partialName The name of the template to render minus the leading underscore.
-  @deprecated Use a component instead
-  @public
-*/
-
 export { templateFactory as template, templateCacheCounters } from '@glimmer/opcode-compiler';
 
 export { default as RootTemplate } from './lib/templates/root';
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index c20abe47c5f..e5e786210dc 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,9 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
-import { assert, deprecate } from '@ember/debug';
-import { PARTIALS } from '@ember/deprecated-features';
-import EmberError from '@ember/error';
+import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import {
@@ -11,7 +9,6 @@ import {
   HelperDefinitionState,
   ModifierDefinitionState,
   Option,
-  PartialDefinition,
   ResolvedComponentDefinition,
   RuntimeResolver,
   Template,
@@ -22,7 +19,6 @@ import {
   getInternalComponentManager,
   setInternalHelperManager,
 } from '@glimmer/manager';
-import { PartialDefinitionImpl } from '@glimmer/opcode-compiler';
 import {
   array,
   concat,
@@ -114,66 +110,6 @@ function lookupComponentPair(
   }
 }
 
-let lookupPartial: { templateName: string; owner: Owner } | any;
-let templateFor: { owner: Owner; underscored: string; name: string } | any;
-let parseUnderscoredName: { templateName: string } | any;
-
-if (PARTIALS) {
-  lookupPartial = function (templateName: string, owner: Owner) {
-    deprecate(
-      `The use of \`{{partial}}\` is deprecated, please refactor the "${templateName}" partial to a component`,
-      false,
-      {
-        id: 'ember-views.partial',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-views-partial',
-        for: 'ember-source',
-        since: {
-          enabled: '3.15.0-beta.1',
-        },
-      }
-    );
-
-    if (templateName === null) {
-      return;
-    }
-
-    let template = templateFor(owner, parseUnderscoredName(templateName), templateName);
-
-    assert(`Unable to find partial with name "${templateName}"`, Boolean(template));
-
-    return template;
-  };
-
-  templateFor = function (owner: any, underscored: string, name: string) {
-    if (PARTIALS) {
-      if (!name) {
-        return;
-      }
-      assert(`templateNames are not allowed to contain periods: ${name}`, name.indexOf('.') === -1);
-
-      if (!owner) {
-        throw new EmberError(
-          'Container was not found when looking up a views template. ' +
-            'This is most likely due to manually instantiating an Ember.View. ' +
-            'See: http://git.io/EKPpnA'
-        );
-      }
-
-      return owner.lookup(`template:${underscored}`) || owner.lookup(`template:${name}`);
-    }
-  };
-
-  parseUnderscoredName = function (templateName: string) {
-    let nameParts = templateName.split('/');
-    let lastPart = nameParts[nameParts.length - 1];
-
-    nameParts[nameParts.length - 1] = `_${lastPart}`;
-
-    return nameParts.join('/');
-  };
-}
-
 const BUILTIN_KEYWORD_HELPERS = {
   action,
   mut,
@@ -227,15 +163,8 @@ const CLASSIC_HELPER_MANAGER_ASSOCIATED = new _WeakSet();
 export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTimeResolver<Owner> {
   private componentDefinitionCache: Map<object, ResolvedComponentDefinition | null> = new Map();
 
-  lookupPartial(name: string, owner: Owner): Option<PartialDefinition> {
-    if (PARTIALS) {
-      let templateFactory = lookupPartial(name, owner);
-      let template = templateFactory(owner);
-
-      return new PartialDefinitionImpl(name, template);
-    } else {
-      return null;
-    }
+  lookupPartial(): null {
+    return null;
   }
 
   lookupHelper(name: string, owner: Owner): Option<HelperDefinitionState> {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 49f3499b046..c070afe2bf5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -157,44 +157,6 @@ moduleFor(
       );
     }
 
-    setupAppAndRoutableEngineWithPartial(hooks) {
-      this.addTemplate('application', 'Application{{outlet}}');
-
-      this.router.map(function () {
-        this.mount('blog');
-      });
-      this.add('route-map:blog', function () {});
-      this.add(
-        'route:application',
-        Route.extend({
-          model() {
-            hooks.push('application - application');
-          },
-        })
-      );
-
-      this.add(
-        'engine:blog',
-        Engine.extend({
-          Resolver: ModuleBasedTestResolver,
-
-          init() {
-            this._super(...arguments);
-            this.register('template:foo', compile('foo partial'));
-            this.register('template:application', compile('Engine{{outlet}} {{partial "foo"}}'));
-            this.register(
-              'route:application',
-              Route.extend({
-                model() {
-                  hooks.push('engine - application');
-                },
-              })
-            );
-          },
-        })
-      );
-    }
-
     setupRoutelessEngine(hooks) {
       this.addTemplate('application', 'Application{{mount "chat-engine"}}');
       this.add(
@@ -207,82 +169,14 @@ moduleFor(
       );
     }
 
-    setupAppAndRoutlessEngineWithPartial(hooks) {
-      this.setupRoutelessEngine(hooks);
-
-      this.add(
-        'engine:chat-engine',
-        Engine.extend({
-          Resolver: ModuleBasedTestResolver,
-
-          init() {
-            this._super(...arguments);
-            this.register('template:foo', compile('foo partial'));
-            this.register('template:application', compile('Engine {{partial "foo"}}'));
-            this.register(
-              'controller:application',
-              Controller.extend({
-                init() {
-                  this._super(...arguments);
-                  hooks.push('engine - application');
-                },
-              })
-            );
-          },
-        })
-      );
-    }
-
     additionalEngineRegistrations(callback) {
       this._additionalEngineRegistrations = callback;
     }
 
-    setupEngineWithAttrs() {
-      this.addTemplate('application', 'Application{{mount "chat-engine"}}');
-
-      this.add(
-        'engine:chat-engine',
-        Engine.extend({
-          Resolver: ModuleBasedTestResolver,
-
-          init() {
-            this._super(...arguments);
-            this.register('template:components/foo-bar', compile(`{{partial "troll"}}`));
-            this.register('template:troll', compile('{{attrs.wat}}'));
-            this.register(
-              'controller:application',
-              Controller.extend({
-                contextType: 'Engine',
-              })
-            );
-            this.register(
-              'template:application',
-              compile('Engine {{foo-bar wat=this.contextType}}')
-            );
-          },
-        })
-      );
-    }
-
     stringsEndWith(str, suffix) {
       return str.indexOf(suffix, str.length - suffix.length) !== -1;
     }
 
-    ['@test attrs in an engine']() {
-      expectDeprecation(
-        `The use of \`{{partial}}\` is deprecated, please refactor the "troll" partial to a component`
-      );
-      expectDeprecation(
-        'Using {{attrs}} to reference named arguments has been deprecated. {{attrs.wat}} should be updated to {{@wat}}. (L1:C2) '
-      );
-
-      this.setupEngineWithAttrs([]);
-
-      return this.visit('/').then(() => {
-        this.assertText('ApplicationEngine Engine');
-      });
-    }
-
     ['@test sharing a template between engine and application has separate refinements']() {
       this.assert.expect(2);
 
@@ -467,50 +361,6 @@ moduleFor(
       });
     }
 
-    ['@test visit() with partials in routable engine'](assert) {
-      assert.expect(3);
-
-      expectDeprecation(
-        `The use of \`{{partial}}\` is deprecated, please refactor the "foo" partial to a component`
-      );
-
-      let hooks = [];
-
-      this.setupAppAndRoutableEngineWithPartial(hooks);
-
-      return this.visit('/blog', { shouldRender: true }).then(() => {
-        this.assertText('ApplicationEngine foo partial');
-
-        this.assert.deepEqual(
-          hooks,
-          ['application - application', 'engine - application'],
-          'the expected hooks were fired'
-        );
-      });
-    }
-
-    ['@test visit() with partials in non-routable engine'](assert) {
-      assert.expect(3);
-
-      expectDeprecation(
-        `The use of \`{{partial}}\` is deprecated, please refactor the "foo" partial to a component`
-      );
-
-      let hooks = [];
-
-      this.setupAppAndRoutlessEngineWithPartial(hooks);
-
-      return this.visit('/', { shouldRender: true }).then(() => {
-        this.assertText('ApplicationEngine foo partial');
-
-        this.assert.deepEqual(
-          hooks,
-          ['application - application', 'engine - application'],
-          'the expected hooks were fired'
-        );
-      });
-    }
-
     ['@test deactivate should be called on Engine Routes before destruction'](assert) {
       assert.expect(3);
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 5932a7a9e0c..edbc4e56acb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -746,50 +746,6 @@ moduleFor(
       });
     }
 
-    ['@test it can render a basic component with a block when the yield is in a partial']() {
-      this.registerPartial('_partialWithYield', 'yielded: [{{yield}}]');
-
-      this.registerComponent('foo-bar', {
-        template: '{{partial "partialWithYield"}} - In component',
-      });
-
-      expectDeprecation(() => {
-        this.render('{{#foo-bar}}hello{{/foo-bar}}');
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "partialWithYield" partial to a component');
-
-      this.assertComponentElement(this.firstChild, {
-        content: 'yielded: [hello] - In component',
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        content: 'yielded: [hello] - In component',
-      });
-    }
-
-    ['@test it can render a basic component with a block param when the yield is in a partial']() {
-      this.registerPartial('_partialWithYield', 'yielded: [{{yield "hello"}}]');
-
-      this.registerComponent('foo-bar', {
-        template: '{{partial "partialWithYield"}} - In component',
-      });
-
-      expectDeprecation(() => {
-        this.render('{{#foo-bar as |value|}}{{value}}{{/foo-bar}}');
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "partialWithYield" partial to a component');
-
-      this.assertComponentElement(this.firstChild, {
-        content: 'yielded: [hello] - In component',
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        content: 'yielded: [hello] - In component',
-      });
-    }
-
     ['@test it renders the layout with the component instance as the context']() {
       let instance;
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
deleted file mode 100644
index 1f0b9b10e56..00000000000
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/partial-test.js
+++ /dev/null
@@ -1,424 +0,0 @@
-import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
-
-import { set } from '@ember/-internals/metal';
-import { A as emberA } from '@ember/-internals/runtime';
-
-moduleFor(
-  'Helpers test: {{partial}}',
-  class extends RenderingTestCase {
-    ['@test should render other templates registered with the container']() {
-      this.registerPartial('_subTemplateFromContainer', 'sub-template');
-
-      expectDeprecation(() => {
-        this.render(`This {{partial "subTemplateFromContainer"}} is pretty great.`);
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "subTemplateFromContainer" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('This sub-template is pretty great.');
-    }
-
-    ['@test should render other slash-separated templates registered with the container']() {
-      this.registerPartial('child/_subTemplateFromContainer', 'sub-template');
-
-      expectDeprecation(() => {
-        this.render(`This {{partial "child/subTemplateFromContainer"}} is pretty great.`);
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "child/subTemplateFromContainer" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('This sub-template is pretty great.');
-    }
-
-    ['@test should use the current context']() {
-      this.registerPartial('_person_name', '{{this.model.firstName}} {{this.model.lastName}}');
-
-      expectDeprecation(() => {
-        this.render('Who is {{partial "person_name"}}?', {
-          model: {
-            firstName: 'Kris',
-            lastName: 'Selden',
-          },
-        });
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "person_name" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('Who is Kris Selden?');
-
-      runTask(() => set(this.context, 'model.firstName', 'Kelly'));
-
-      this.assertText('Who is Kelly Selden?');
-
-      runTask(() => set(this.context, 'model', { firstName: 'Kris', lastName: 'Selden' }));
-
-      this.assertText('Who is Kris Selden?');
-    }
-
-    ['@test Quoteless parameters passed to {{partial}} perform a bound property lookup of the partial name']() {
-      this.registerPartial('_subTemplate', 'sub-template');
-      this.registerPartial('_otherTemplate', 'other-template');
-
-      expectDeprecation(() => {
-        this.render(
-          'This {{partial this.templates.partialName}} is pretty {{partial this.nonexistent}}great.',
-          {
-            templates: { partialName: 'subTemplate' },
-          }
-        );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "subTemplate" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('This sub-template is pretty great.');
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'templates.partialName', 'otherTemplate'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "otherTemplate" partial to a component');
-
-      this.assertText('This other-template is pretty great.');
-
-      runTask(() => set(this.context, 'templates.partialName', null));
-
-      this.assertText('This  is pretty great.');
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'templates', { partialName: 'subTemplate' }));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "subTemplate" partial to a component');
-
-      this.assertText('This sub-template is pretty great.');
-    }
-
-    ['@test 1234 partial using data from {{#each}}']() {
-      this.registerPartial('show-item', '{{item}}');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-          {{#each this.model.items as |item|}}
-            {{item}}: {{partial 'show-item'}} |
-          {{/each}}`,
-          {
-            model: {
-              items: emberA(['apple', 'orange', 'banana']),
-            },
-          }
-        );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('apple: apple |orange: orange |banana: banana |');
-
-      expectDeprecation(() => {
-        runTask(() => this.context.model.items.pushObject('strawberry'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertText('apple: apple |orange: orange |banana: banana |strawberry: strawberry |');
-
-      runTask(() =>
-        set(this.context, 'model', {
-          items: emberA(['apple', 'orange', 'banana']),
-        })
-      );
-
-      this.assertText('apple: apple |orange: orange |banana: banana |');
-    }
-
-    ['@test partial using `{{get` on data from {{#let}}']() {
-      this.registerPartial('show-id', '{{get item "id"}}');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-          {{#let this.model as |item|}}
-            {{item.name}}: {{partial 'show-id'}}
-          {{/let}}`,
-          {
-            model: { id: 1, name: 'foo' },
-          }
-        );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-id" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('foo: 1');
-
-      runTask(() => set(this.context, 'model.id', 2));
-
-      this.assertText('foo: 2');
-
-      runTask(() => set(this.context, 'model.name', 'bar'));
-
-      this.assertText('bar: 2');
-
-      runTask(() => set(this.context, 'model', { id: 1, name: 'foo' }));
-
-      this.assertText('foo: 1');
-    }
-
-    ['@test partial using `{{get` on data from {{#each}}']() {
-      this.registerPartial('show-item', '{{get item "id"}}');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-        {{#each this.items as |item|}}
-          {{item.id}}: {{partial 'show-item'}} |
-        {{/each}}`,
-          {
-            items: emberA([{ id: 1 }, { id: 2 }, { id: 3 }]),
-          }
-        );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('1: 1 |2: 2 |3: 3 |');
-
-      expectDeprecation(() => {
-        runTask(() => this.context.items.pushObject({ id: 4 }));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertText('1: 1 |2: 2 |3: 3 |4: 4 |');
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'items', emberA([{ id: 1 }, { id: 2 }, { id: 3 }])));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertText('1: 1 |2: 2 |3: 3 |');
-    }
-
-    ['@test partial using conditional on data from {{#each}}']() {
-      this.registerPartial('show-item', '{{#if item}}{{item}}{{/if}}');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-        {{#each this.items as |item|}}
-          {{item}}: {{partial 'show-item'}} |
-        {{/each}}`,
-          {
-            items: emberA(['apple', null, 'orange', 'banana']),
-          }
-        );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('apple: apple |:  |orange: orange |banana: banana |');
-
-      expectDeprecation(() => {
-        runTask(() => this.context.items.pushObject('strawberry'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "show-item" partial to a component');
-
-      this.assertText('apple: apple |:  |orange: orange |banana: banana |strawberry: strawberry |');
-
-      runTask(() => set(this.context, 'items', emberA(['apple', null, 'orange', 'banana'])));
-
-      this.assertText('apple: apple |:  |orange: orange |banana: banana |');
-    }
-
-    ['@test nested partials using data from {{#each}}']() {
-      this.registerPartial(
-        '_outer-partial',
-        strip`
-      [outer: {{name}}] {{partial 'inner-partial'}}
-    `
-      );
-
-      this.registerPartial('inner-partial', '[inner: {{name}}]');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-        {{#each this.names as |name i|}}
-          {{i}}: {{partial 'outer-partial'}}
-        {{/each}}`,
-          {
-            names: emberA(['Alex', 'Ben']),
-          }
-        );
-      }, /The use of `{{partial}}` is deprecated, please refactor the "(inner|outer)-partial" partial to a component/);
-
-      this.assertStableRerender();
-
-      this.assertText('0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]');
-
-      expectDeprecation(() => {
-        runTask(() => this.context.names.pushObject('Sophie'));
-      }, /The use of `{{partial}}` is deprecated, please refactor the "(inner|outer)-partial" partial to a component/);
-
-      this.assertText(
-        '0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]2: [outer: Sophie] [inner: Sophie]'
-      );
-
-      runTask(() => set(this.context, 'names', emberA(['Alex', 'Ben'])));
-
-      this.assertText('0: [outer: Alex] [inner: Alex]1: [outer: Ben] [inner: Ben]');
-    }
-
-    ['@test nested partials within nested `{{#let}}` blocks']() {
-      this.registerPartial(
-        '_person2-partial',
-        strip`
-      {{#let 'Ben' as |person2|}}
-        Hi {{person1}} (aged {{age}}) and {{person2}}. {{partial 'person3-partial'}}
-      {{/let}}
-    `
-      );
-
-      this.registerPartial(
-        '_person3-partial',
-        strip`
-      {{#let 'Alex' as |person3|}}
-        Hi {{person1}} (aged {{age}}), {{person2}} and {{person3}}. {{partial 'person4-partial'}}
-      {{/let}}
-    `
-      );
-
-      this.registerPartial(
-        '_person4-partial',
-        strip`
-      {{#let 'Sarah' as |person4|}}
-        Hi {{person1}} (aged {{age}}), {{person2}}, {{person3}} and {{person4}}.
-      {{/let}}
-    `
-      );
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-        {{#let 'Sophie' as |person1|}}
-          Hi {{person1}} (aged {{this.age}}). {{partial 'person2-partial'}}
-        {{/let}}`,
-          { age: 0 }
-        );
-      }, /The use of `{{partial}}` is deprecated, please refactor the "person(2|3|4)-partial" partial to a component/);
-
-      this.assertStableRerender();
-
-      this.assertText(
-        'Hi Sophie (aged 0). Hi Sophie (aged 0) and Ben. Hi Sophie (aged 0), Ben and Alex. Hi Sophie (aged 0), Ben, Alex and Sarah.'
-      );
-
-      runTask(() => set(this.context, 'age', 1));
-
-      this.assertText(
-        'Hi Sophie (aged 1). Hi Sophie (aged 1) and Ben. Hi Sophie (aged 1), Ben and Alex. Hi Sophie (aged 1), Ben, Alex and Sarah.'
-      );
-
-      runTask(() => set(this.context, 'age', 0));
-
-      this.assertText(
-        'Hi Sophie (aged 0). Hi Sophie (aged 0) and Ben. Hi Sophie (aged 0), Ben and Alex. Hi Sophie (aged 0), Ben, Alex and Sarah.'
-      );
-    }
-
-    ['@test dynamic partials in {{#each}}']() {
-      this.registerPartial('_odd', 'ODD{{i}}');
-      this.registerPartial('_even', 'EVEN{{i}}');
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-          {{#each this.model.items as |template i|}}
-            {{this.model.type}}: {{partial template}}
-          {{/each}}`,
-          {
-            model: {
-              items: ['even', 'odd', 'even', 'odd'],
-              type: 'number',
-            },
-          }
-        );
-      }, /The use of `{{partial}}` is deprecated, please refactor the "(odd|even)" partial to a component/);
-
-      this.assertStableRerender();
-
-      this.assertText('number: EVEN0number: ODD1number: EVEN2number: ODD3');
-
-      runTask(() => set(this.context, 'model.type', 'integer'));
-
-      this.assertText('integer: EVEN0integer: ODD1integer: EVEN2integer: ODD3');
-
-      runTask(() =>
-        set(this.context, 'model', {
-          items: ['even', 'odd', 'even', 'odd'],
-          type: 'number',
-        })
-      );
-
-      this.assertText('number: EVEN0number: ODD1number: EVEN2number: ODD3');
-    }
-
-    ['@test dynamic partials in {{#let}}']() {
-      this.registerPartial('_thing', '{{t}}');
-
-      this.render(
-        strip`
-      {{#let this.item.thing as |t|}}
-        {{partial t}}
-      {{/let}}`,
-        {
-          item: { thing: null },
-        }
-      );
-
-      this.assertStableRerender();
-
-      this.assertText('');
-
-      expectDeprecation(() => {
-        runTask(() => set(this.context, 'item.thing', 'thing'));
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "thing" partial to a component');
-
-      this.assertText('thing');
-
-      runTask(() => set(this.context, 'item', { thing: null }));
-
-      this.assertText('');
-    }
-
-    ['@test partials which contain contextual components']() {
-      this.registerComponent('outer-component', {
-        template: '{{yield (hash inner=(component "inner-component" name=this.name))}}',
-      });
-
-      this.registerComponent('inner-component', {
-        template: '{{yield (hash name=this.name)}}',
-      });
-
-      this.registerPartial(
-        '_some-partial',
-        strip`
-      {{#outer.inner as |inner|}}
-        inner.name: {{inner.name}}
-      {{/outer.inner}}
-    `
-      );
-
-      expectDeprecation(() => {
-        this.render(
-          strip`
-        {{#outer-component name=this.name as |outer|}}
-          {{partial 'some-partial'}}
-        {{/outer-component}}`,
-          { name: 'Sophie' }
-        );
-      }, 'The use of `{{partial}}` is deprecated, please refactor the "some-partial" partial to a component');
-
-      this.assertStableRerender();
-
-      this.assertText('inner.name: Sophie');
-
-      runTask(() => set(this.context, 'name', 'Ben'));
-
-      this.assertText('inner.name: Ben');
-
-      runTask(() => set(this.context, 'name', 'Sophie'));
-
-      this.assertText('inner.name: Sophie');
-    }
-  }
-);
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 62fa61f47a4..45d9c852108 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -7,5 +7,4 @@ export const ROUTER_EVENTS = !!'4.0.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
-export const PARTIALS = !!'3.15.0-beta.1';
 export const ASSIGN = !!'4.0.0-beta.1';
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.js
index 3760da0de54..b3c59286749 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.js
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.js
@@ -153,16 +153,6 @@ export default class RenderingTestCase extends AbstractTestCase {
     this.owner.register(`helper:${name}`, definition);
   }
 
-  registerPartial(name, template) {
-    let owner = this.owner;
-    if (typeof template === 'string') {
-      owner.register(
-        `template:${name}`,
-        this.compile(template, { moduleName: `my-app/templates/-${name}.hbs` })
-      );
-    }
-  }
-
   registerComponent(name, { ComponentClass = Component, template = null }) {
     let { owner } = this;
 
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 925a25b1ca7..39ab2241f47 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -406,7 +406,6 @@ module.exports = {
     'parent',
     'parentView',
     'parentViewDidChange',
-    'partial',
     'pattern',
     'pauseTest',
     'popObject',

From e95522faa878b9e391a47d332484ba9a21790e75 Mon Sep 17 00:00:00 2001
From: Max Z <47531779+MrChocolatine@users.noreply.github.com>
Date: Wed, 4 Aug 2021 17:37:41 +0200
Subject: [PATCH 0608/1405] [DOC] fix component's closing tag

---
 packages/@ember/-internals/glimmer/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index cf7ecfdd08b..dd1e93af0fd 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -125,7 +125,7 @@
       <p class="error">{{validationError}}</p>
     {{/if}}
     First name:
-  {{/labeled-textfield}}
+  </LabeledTextfield>
   ```
 
   ```app/components/labeled-textfield.hbs

From b3559e48d1ebdd6c4a86a84671022849f91c0c49 Mon Sep 17 00:00:00 2001
From: Brenden Palmer <brendenpalmer@gmail.com>
Date: Thu, 5 Aug 2021 13:55:51 -0400
Subject: [PATCH 0609/1405] ensure `deserializeQueryParam` is called for lazy
 routes

---
 .../integration/application/engine-test.js    | 59 +++++++++++++++++++
 .../-internals/routing/lib/system/route.ts    | 18 ++++--
 2 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 49f3499b046..b518a074f98 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -974,5 +974,64 @@ moduleFor(
           assert.equal(error.message, 'Whoops! Something went wrong...');
         });
     }
+
+    ['@test visit() with `shouldRender: true` queryParams are properly deserialized for lazy routes'](
+      assert
+    ) {
+      assert.expect(2);
+
+      let hooks = [];
+
+      this.setupAppAndRoutableEngine(hooks);
+
+      this.add(
+        'engine:blog',
+        Engine.extend({
+          Resolver: ModuleBasedTestResolver,
+
+          init() {
+            this._super(...arguments);
+            this.register(
+              'controller:application',
+              Controller.extend({
+                queryParams: ['lazyQueryParam'],
+              })
+            );
+
+            this.register(
+              'template:application',
+              compile('Engine<div class="lazy-query-param">{{this.lazyQueryParam}}</div>{{outlet}}')
+            );
+
+            this.register(
+              'route:application',
+              Route.extend({
+                queryParams: {
+                  lazyQueryParam: {
+                    defaultValue: null,
+                  },
+                },
+                deserializeQueryParam() {
+                  hooks.push('engine - deserialize query param');
+                  return 'foo';
+                },
+                model() {
+                  hooks.push('engine - application');
+                },
+              })
+            );
+          },
+        })
+      );
+
+      return this.visit('/blog?lazyQueryParam=bar', { shouldRender: true }).then(() => {
+        assert.deepEqual(
+          hooks,
+          ['application - application', 'engine - deserialize query param', 'engine - application'],
+          'the expected hooks were fired'
+        );
+        assert.strictEqual(this.element.querySelector('.lazy-query-param').innerHTML, 'foo');
+      });
+    }
   }
 );
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index be21b28d9fa..f227374be15 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2082,11 +2082,21 @@ export function getFullQueryParams(router: EmberRouter, state: TransitionState<R
     return state['fullQueryParams'];
   }
 
-  state['fullQueryParams'] = {};
-  Object.assign(state['fullQueryParams'], state.queryParams);
+  let fullQueryParamsState = {};
+  let haveAllRouteInfosResolved = state.routeInfos.every((routeInfo) => routeInfo.route);
 
-  router._deserializeQueryParams(state.routeInfos, state['fullQueryParams'] as QueryParam);
-  return state['fullQueryParams'];
+  Object.assign(fullQueryParamsState, state.queryParams);
+
+  router._deserializeQueryParams(state.routeInfos, fullQueryParamsState as QueryParam);
+
+  // only cache query params state if all routeinfos have resolved; it's possible
+  // for lazy routes to not have resolved when `getFullQueryParams` is called, so
+  // we wait until all routes have resolved prior to caching query params state
+  if (haveAllRouteInfosResolved) {
+    state['fullQueryParams'] = fullQueryParamsState;
+  }
+
+  return fullQueryParamsState;
 }
 
 function getQueryParamsFor(route: Route, state: TransitionState<Route>) {

From 2ef9bbde2412394ffb2363aa615509bbf9eaaa10 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 9 Aug 2021 14:14:56 -0400
Subject: [PATCH 0610/1405] Add v3.28.0 to CHANGELOG

(cherry picked from commit 502936825afa222218c73efe72b04def6de18f33)
---
 CHANGELOG.md | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7af870522c1..da9f7862055 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,41 +1,13 @@
 # Ember Changelog
 
-### v3.28.0-beta.7 (August 2, 2021)
+## v3.28.0 (August 9, 2021)
 
+- [#19697](https://github.com/emberjs/ember.js/pull/19697) [BUGFIX] Ensure `deserializeQueryParam` is called for lazy routes
 - [#19681](https://github.com/emberjs/ember.js/pull/19681) [BUGFIX] Restore previous hash behavior
 - [#19685](https://github.com/emberjs/ember.js/pull/19685) [BUGFIX] Fix memory leak in RouterService
 - [#19690](https://github.com/emberjs/ember.js/pull/19690) [BUGFIX] Deprecates String.prototype.htmlSafe targeting Ember 4.0, as intended by the original deprecation.
-
-### v3.28.0-beta.6 (June 21, 2021)
-
 - [#19584](https://github.com/emberjs/ember.js/pull/19584) [BUGFIX] Ensure hash objects correctly entangle as dependencies
-
-### v3.28.0-beta.5 (June 14, 2021)
-
-- [#19597](https://github.com/emberjs/ember.js/pull/19597) [BUGFIX] Fix `<LinkTo>` with nested children
-
-### v3.28.0-beta.4 (June 7, 2021)
-
-- [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility
-
-### v3.28.0-beta.3 (June 1, 2021)
-
-- [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that computed can depend on dynamic hash keys
-- [#19571](https://github.com/emberjs/ember.js/pull/19571) [BUGFIX] Delay until: 5.0.0 the removal of the deprecated transition methods of controller and route from [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).
-
-### v3.28.0-beta.2 (May 27, 2021)
-
-- [#19511](https://github.com/emberjs/ember.js/pull/19511) / [#19548](https://github.com/emberjs/ember.js/pull/19548) [BUGFIX] Makes the (hash) helper lazy
-- [#19530](https://github.com/emberjs/ember.js/pull/19530) [DOC] fix passing params to named blocks examples
-- [#19536](https://github.com/emberjs/ember.js/pull/19536) [BUGFIX] Fix `computed.*` deprecation message to include the correct import path
-- [#19544](https://github.com/emberjs/ember.js/pull/19544) [BUGFIX] Use explicit this in helper test blueprints
-- [#19555](https://github.com/emberjs/ember.js/pull/19555) [BUGFIX] Improve class based tranform deprecation message
-- [#19557](https://github.com/emberjs/ember.js/pull/19557) [BUGFIX] Refine Ember Global deprecation message
-- [#19564](https://github.com/emberjs/ember.js/pull/19564) [BUGFIX] Improve computed.* and run.* deprecation message (IE11)
 - [#19491](https://github.com/emberjs/ember.js/pull/19491) [BUGFIX] Fix `owner.lookup` `owner.register` behavior with `singleton: true` option
-
-### v3.28.0-beta.1 (May 3, 2021)
-
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
 ### v3.27.5 (June 10, 2021)

From c4e70e3567a239c41ba9c319df72f239b1530e0c Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 3 May 2021 10:37:53 -0400
Subject: [PATCH 0611/1405] Add v3.24.4 to CHANGELOG.md.

(cherry picked from commit ca3107a82d0e41022101caed9060e075fd159fce)
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da9f7862055..15d7878b80f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,10 @@
 - [#19441](https://github.com/emberjs/ember.js/pull/19441) Add automated publishing of weekly alpha releases to NPM
 - [#19462](https://github.com/emberjs/ember.js/pull/19462) Use `positional` and `named` as the argument names in `ember g helper` blueprint
 
+### v3.24.4 (May 3, 2021)
+
+- [#19477](https://github.com/emberjs/ember.js/pull/19477) Allow `<LinkToExternal />` to override internal assertion
+
 ### v3.26.1 (March 24, 2021)
 
 - [#19473](https://github.com/emberjs/ember.js/pull/19473) Update Glimmer VM to latest.
@@ -125,7 +129,6 @@
 - [#19338](https://github.com/emberjs/ember.js/pull/19338) [BUGFIX] Add missing `deprecate` options (`for` + `since`)
 - [#19342](https://github.com/emberjs/ember.js/pull/19342) [BUGFIX] Fix misleading LinkTo error message
 
-
 ### v3.24.3 (March 7, 2021)
 
 - [#19448](https://github.com/emberjs/ember.js/pull/19448) Ensure query params are preserved through an intermediate loading state transition

From c166010bac915977bda513d389e80d37074e0da2 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 9 Aug 2021 18:10:46 -0400
Subject: [PATCH 0612/1405] Add v3.24.5 to CHANGELOG.md

(cherry picked from commit faf8a8f4ad1fc585aea36804b1e7b6c1435d1b06)
---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15d7878b80f..2d6f7c8d194 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Ember Changelog
 
-## v3.28.0 (August 9, 2021)
+### v3.28.0 (August 9, 2021)
 
 - [#19697](https://github.com/emberjs/ember.js/pull/19697) [BUGFIX] Ensure `deserializeQueryParam` is called for lazy routes
 - [#19681](https://github.com/emberjs/ember.js/pull/19681) [BUGFIX] Restore previous hash behavior
@@ -10,6 +10,11 @@
 - [#19491](https://github.com/emberjs/ember.js/pull/19491) [BUGFIX] Fix `owner.lookup` `owner.register` behavior with `singleton: true` option
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
+### v3.24.5 (August 9, 2021)
+
+- [#19685](https://github.com/emberjs/ember.js/pull/19685) Fix memory leak with `RouterService` under Chrome
+- [#19683](https://github.com/emberjs/ember.js/pull/19683) Ensure `super.willDestroy` is called correctly in `Router`'s `willDestroy`
+
 ### v3.27.5 (June 10, 2021)
 
 - [#19597](https://github.com/emberjs/ember.js/pull/19597) [BIGFIX] Fix `<LinkTo>` with nested children

From baca206a16b7756f7f5ca4f0b47846a3e6ed2699 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Sun, 18 Jul 2021 20:09:59 -0700
Subject: [PATCH 0613/1405] Remove attrs/attrs-arg-access

---
 .../components/curly-components-test.js       | 73 +++++++++----------
 .../helpers/closure-action-test.js            |  8 +-
 .../lib/plugins/transform-attrs-into-args.ts  | 31 +++-----
 .../plugins/transform-attrs-into-args-test.js | 37 ++++++----
 4 files changed, 73 insertions(+), 76 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index edbc4e56acb..a1148e71dbc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -1257,12 +1257,16 @@ moduleFor(
     }
 
     ['@test non-block with properties on attrs']() {
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.someProp}} should be updated to {{@someProp}}. ('my-app/templates/components/non-block.hbs' @ L1:C24) "
-      );
+      expectAssertion(() => {
+        this.registerComponent('non-block', {
+          template: 'In layout - someProp: {{attrs.someProp}}',
+        });
+      }, "Using {{attrs}} to reference named arguments is not supported. {{attrs.someProp}} should be updated to {{@someProp}}. ('my-app/templates/components/non-block.hbs' @ L1:C24) ");
+    }
 
+    ['@test non-block with properties on this.attrs']() {
       this.registerComponent('non-block', {
-        template: 'In layout - someProp: {{attrs.someProp}}',
+        template: 'In layout - someProp: {{this.attrs.someProp}}',
       });
 
       this.render('{{non-block someProp=this.prop}}', {
@@ -1469,32 +1473,13 @@ moduleFor(
       );
     }
 
-    ['@test this.attrs.foo === attrs.foo === @foo === foo']() {
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.value}} should be updated to {{@value}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C8) "
-      );
-
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.value}} should be updated to {{@value}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C31) "
-      );
-
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.items}} should be updated to {{@items}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C82) "
-      );
-
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.items}} should be updated to {{@items}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C135) "
-      );
-
+    ['@test this.attrs.foo === @foo === foo']() {
       this.registerComponent('foo-bar', {
         template: strip`
-        Args: {{this.attrs.value}} | {{attrs.value}} | {{@value}} | {{this.value}}
+        Args: {{this.attrs.value}} | {{@value}} | {{this.value}}
         {{#each this.attrs.items as |item|}}
           {{item}}
         {{/each}}
-        {{#each attrs.items as |item|}}
-          {{item}}
-        {{/each}}
         {{#each @items as |item|}}
           {{item}}
         {{/each}}
@@ -1518,11 +1503,11 @@ moduleFor(
         this.context.set('model.items', [1]);
       });
 
-      this.assertText(strip`Args: lul | lul | lul | lul1111`);
+      this.assertText(strip`Args: lul | lul | lul111`);
 
       runTask(() => this.context.set('model', { value: 'wat', items: [1, 2, 3] }));
 
-      this.assertText('Args: wat | wat | wat | wat123123123123');
+      this.assertText('Args: wat | wat | wat123123123');
     }
 
     ['@test non-block with properties on self']() {
@@ -1580,12 +1565,16 @@ moduleFor(
     }
 
     ['@test block with properties on attrs']() {
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.someProp}} should be updated to {{@someProp}}. ('my-app/templates/components/with-block.hbs' @ L1:C24) "
-      );
+      expectAssertion(() => {
+        this.registerComponent('with-block', {
+          template: 'In layout - someProp: {{attrs.someProp}} - {{yield}}',
+        });
+      }, "Using {{attrs}} to reference named arguments is not supported. {{attrs.someProp}} should be updated to {{@someProp}}. ('my-app/templates/components/with-block.hbs' @ L1:C24) ");
+    }
 
+    ['@test block with properties on this.attrs']() {
       this.registerComponent('with-block', {
-        template: 'In layout - someProp: {{attrs.someProp}} - {{yield}}',
+        template: 'In layout - someProp: {{this.attrs.someProp}} - {{yield}}',
       });
 
       this.render(
@@ -3299,20 +3288,28 @@ moduleFor(
     }
 
     ['@test using attrs for positional params']() {
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.myVar}} should be updated to {{@myVar}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C10) "
-      );
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.myVar2}} should be updated to {{@myVar2}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C65) "
-      );
+      let MyComponent = Component.extend();
+
+      expectAssertion(() => {
+        this.registerComponent('foo-bar', {
+          ComponentClass: MyComponent.reopenClass({
+            positionalParams: ['myVar'],
+          }),
+          template:
+            'MyVar1: {{attrs.myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{attrs.myVar2}}',
+        });
+      }, "Using {{attrs}} to reference named arguments is not supported. {{attrs.myVar}} should be updated to {{@myVar}}. ('my-app/templates/components/foo-bar.hbs' @ L1:C10) ");
+    }
 
+    ['@test using this.attrs for positional params']() {
       let MyComponent = Component.extend();
 
       this.registerComponent('foo-bar', {
         ComponentClass: MyComponent.reopenClass({
           positionalParams: ['myVar'],
         }),
-        template: 'MyVar1: {{attrs.myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{attrs.myVar2}}',
+        template:
+          'MyVar1: {{this.attrs.myVar}} {{this.myVar}} MyVar2: {{this.myVar2}} {{this.attrs.myVar2}}',
       });
 
       this.render('{{foo-bar 1 myVar2=2}}');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index f394240e137..dd76f986df0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -250,14 +250,10 @@ moduleFor(
       }, /An action could not be made for `.*` in .*\. Please confirm that you are using either a quoted action name \(i\.e\. `\(action '.*'\)`\) or a function available in .*\./);
     }
 
-    ['@test [#12718] a nice error is shown when a bound action function is undefined and it is passed as attrs.foo']() {
-      expectDeprecation(
-        "Using {{attrs}} to reference named arguments has been deprecated. {{attrs.external-action}} should be updated to {{@external-action}}. ('my-app/templates/components/inner-component.hbs' @ L1:C43) "
-      );
-
+    ['@test [#12718] a nice error is shown when a bound action function is undefined and it is passed as this.attrs.foo']() {
       this.registerComponent('inner-component', {
         template:
-          '<button id="inner-button" {{action (action attrs.external-action)}}>Click me</button>',
+          '<button id="inner-button" {{action (action this.attrs.external-action)}}>Click me</button>',
       });
 
       this.registerComponent('outer-component', {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
index 177887af5f0..82801798ab7 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
@@ -1,4 +1,4 @@
-import { deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
 import { EmberASTPluginEnvironment } from '../types';
@@ -64,24 +64,17 @@ export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment):
         if (isAttrs(node, stack[stack.length - 1])) {
           let path = b.path(node.original.substr(6)) as AST.PathExpression;
 
-          deprecate(
-            `Using {{attrs}} to reference named arguments has been deprecated. {{attrs.${
-              path.original
-            }}} should be updated to {{@${path.original}}}. ${calculateLocationDisplay(
-              moduleName,
-              node.loc
-            )}`,
-            false,
-            {
-              id: 'attrs-arg-access',
-              url: 'https://deprecations.emberjs.com/v3.x/#toc_attrs-arg-access',
-              until: '4.0.0',
-              for: 'ember-source',
-              since: {
-                enabled: '3.26.0',
-              },
-            }
-          );
+          if (node.this === false) {
+            assert(
+              `Using {{attrs}} to reference named arguments is not supported. {{attrs.${
+                path.original
+              }}} should be updated to {{@${path.original}}}. ${calculateLocationDisplay(
+                moduleName,
+                node.loc
+              )}`,
+              false
+            );
+          }
 
           path.original = `@${path.original}`;
           path.data = true;
diff --git a/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js b/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
index 3db58637b56..549d0092235 100644
--- a/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
+++ b/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
@@ -5,29 +5,40 @@ moduleFor(
   'ember-template-compiler: transforming attrs into @args',
   class extends TransformTestCase {
     ['@test it transforms attrs into @args']() {
-      expectDeprecation(() => {
+      expectAssertion(() => {
         this.assertTransformed(`{{attrs.foo}}`, `{{@foo}}`);
-      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+      }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo}} should be updated to {{@foo}}./);
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         this.assertTransformed(`{{attrs.foo.bar}}`, `{{@foo.bar}}`);
-      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
+      }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         this.assertTransformed(`{{if attrs.foo "foo"}}`, `{{if @foo "foo"}}`);
-      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+      }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo}} should be updated to {{@foo}}./);
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         this.assertTransformed(`{{#if attrs.foo}}{{/if}}`, `{{#if @foo}}{{/if}}`);
-      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+      }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo}} should be updated to {{@foo}}./);
 
-      expectDeprecation(() => {
+      expectAssertion(() => {
         this.assertTransformed(`{{deeply (nested attrs.foo.bar)}}`, `{{deeply (nested @foo.bar)}}`);
-      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
+      }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
+    }
+
+    ['@test it transforms this.attrs into @args']() {
+      this.assertTransformed(`{{this.attrs.foo}}`, `{{@foo}}`);
+
+      this.assertTransformed(`{{this.attrs.foo.bar}}`, `{{@foo.bar}}`);
+
+      this.assertTransformed(`{{if this.attrs.foo "foo"}}`, `{{if @foo "foo"}}`);
+
+      this.assertTransformed(`{{#if this.attrs.foo}}{{/if}}`, `{{#if @foo}}{{/if}}`);
 
-      expectDeprecation(() => {
-        this.assertTransformed(`{{this.attrs.foo}}`, `{{@foo}}`);
-      }, /Using {{attrs}} to reference named arguments has been deprecated. {{attrs.foo}} should be updated to {{@foo}}./);
+      this.assertTransformed(
+        `{{deeply (nested this.attrs.foo.bar)}}`,
+        `{{deeply (nested @foo.bar)}}`
+      );
     }
   }
 );

From 4a93f80cc526126e5fbe4f988249ae86f076d9c6 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Sat, 14 Aug 2021 19:10:40 -0700
Subject: [PATCH 0614/1405] Update
 packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js

Co-authored-by: Matthew Beale <matt.beale@madhatted.com>
---
 .../glimmer/tests/integration/helpers/closure-action-test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index dd76f986df0..1e901a4b41b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -253,7 +253,7 @@ moduleFor(
     ['@test [#12718] a nice error is shown when a bound action function is undefined and it is passed as this.attrs.foo']() {
       this.registerComponent('inner-component', {
         template:
-          '<button id="inner-button" {{action (action this.attrs.external-action)}}>Click me</button>',
+          '<button id="inner-button" {{action (action @external-action)}}>Click me</button>',
       });
 
       this.registerComponent('outer-component', {

From e4f73affae3e694ddefaa945a1e207d2cdd3eb52 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Sat, 14 Aug 2021 19:10:48 -0700
Subject: [PATCH 0615/1405] Update
 packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js

Co-authored-by: Matthew Beale <matt.beale@madhatted.com>
---
 .../glimmer/tests/integration/helpers/closure-action-test.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index 1e901a4b41b..a75b22e0f20 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -250,7 +250,7 @@ moduleFor(
       }, /An action could not be made for `.*` in .*\. Please confirm that you are using either a quoted action name \(i\.e\. `\(action '.*'\)`\) or a function available in .*\./);
     }
 
-    ['@test [#12718] a nice error is shown when a bound action function is undefined and it is passed as this.attrs.foo']() {
+    ['@test [#12718] a nice error is shown when a bound action function is undefined and it is passed as @foo']() {
       this.registerComponent('inner-component', {
         template:
           '<button id="inner-button" {{action (action @external-action)}}>Click me</button>',

From 572ae804765b190f012173d8589066e8a97ca5e5 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Mon, 16 Aug 2021 21:55:16 -0400
Subject: [PATCH 0616/1405] Tweak test names

---
 .../tests/integration/components/curly-components-test.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index a1148e71dbc..5fdd2305aff 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -1256,7 +1256,7 @@ moduleFor(
       this.assertText('somecomponent');
     }
 
-    ['@test non-block with properties on attrs']() {
+    ['@test non-block with properties access via attrs is asserted against']() {
       expectAssertion(() => {
         this.registerComponent('non-block', {
           template: 'In layout - someProp: {{attrs.someProp}}',
@@ -1564,7 +1564,7 @@ moduleFor(
       this.assertText('In layout - someProp: something here - In template');
     }
 
-    ['@test block with properties on attrs']() {
+    ['@test block with properties on attrs is asserted against']() {
       expectAssertion(() => {
         this.registerComponent('with-block', {
           template: 'In layout - someProp: {{attrs.someProp}} - {{yield}}',
@@ -3287,7 +3287,7 @@ moduleFor(
       this.assertText('hello');
     }
 
-    ['@test using attrs for positional params']() {
+    ['@test using attrs for positional params is asserted against']() {
       let MyComponent = Component.extend();
 
       expectAssertion(() => {

From 7b9e496c6d2d691ead94f3a3c0608f1d8588ae15 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Mon, 16 Aug 2021 22:14:10 -0400
Subject: [PATCH 0617/1405] Move transform to assertion

---
 ...s-into-args.ts => assert-against-attrs.ts} | 43 +++++++------------
 .../lib/plugins/index.ts                      |  4 +-
 ...s-test.js => assert-against-attrs-test.js} | 40 ++++++++---------
 3 files changed, 36 insertions(+), 51 deletions(-)
 rename packages/ember-template-compiler/lib/plugins/{transform-attrs-into-args.ts => assert-against-attrs.ts} (63%)
 rename packages/ember-template-compiler/tests/plugins/{transform-attrs-into-args-test.js => assert-against-attrs-test.js} (66%)

diff --git a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
similarity index 63%
rename from packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
rename to packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
index 82801798ab7..1b610f6dfbf 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-attrs-into-args.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
@@ -8,26 +8,19 @@ import { EmberASTPluginEnvironment } from '../types';
 */
 
 /**
-  A Glimmer2 AST transformation that replaces all instances of
+  A Glimmer2 AST transformation that asserts against
 
   ```handlebars
- {{attrs.foo.bar}}
+  {{attrs.foo.bar}}
   ```
 
-  to
-
-  ```handlebars
- {{@foo.bar}}
-  ```
-
-  as well as `{{#if attrs.foo}}`, `{{deeply (nested attrs.foobar.baz)}}`,
-  `{{this.attrs.foo}}` etc
+  ...as well as `{{#if attrs.foo}}`, `{{deeply (nested attrs.foobar.baz)}}`.
 
   @private
-  @class TransformAttrsToProps
+  @class AssertAgainstAttrs
 */
 
-export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment): ASTPlugin {
+export default function assertAgainstAttrs(env: EmberASTPluginEnvironment): ASTPlugin {
   let { builders: b } = env.syntax;
   let moduleName = env.meta?.moduleName;
 
@@ -39,7 +32,7 @@ export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment):
   }
 
   return {
-    name: 'transform-attrs-into-args',
+    name: 'assert-against-attrs',
 
     visitor: {
       Program: {
@@ -64,21 +57,15 @@ export default function transformAttrsIntoArgs(env: EmberASTPluginEnvironment):
         if (isAttrs(node, stack[stack.length - 1])) {
           let path = b.path(node.original.substr(6)) as AST.PathExpression;
 
-          if (node.this === false) {
-            assert(
-              `Using {{attrs}} to reference named arguments is not supported. {{attrs.${
-                path.original
-              }}} should be updated to {{@${path.original}}}. ${calculateLocationDisplay(
-                moduleName,
-                node.loc
-              )}`,
-              false
-            );
-          }
-
-          path.original = `@${path.original}`;
-          path.data = true;
-          return path;
+          assert(
+            `Using {{attrs}} to reference named arguments is not supported. {{attrs.${
+              path.original
+            }}} should be updated to {{@${path.original}}}. ${calculateLocationDisplay(
+              moduleName,
+              node.loc
+            )}`,
+            node.this !== false
+          );
         }
       },
     },
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index b9c74da1d48..06d4b3b5c05 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -1,3 +1,4 @@
+import AssertAgainstAttrs from './assert-against-attrs';
 import AssertAgainstDynamicHelpersModifiers from './assert-against-dynamic-helpers-modifiers';
 import AssertAgainstNamedBlocks from './assert-against-named-blocks';
 import AssertAgainstNamedOutlets from './assert-against-named-outlets';
@@ -5,7 +6,6 @@ import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
 import AssertSplattributeExpressions from './assert-splattribute-expression';
 import TransformActionSyntax from './transform-action-syntax';
-import TransformAttrsIntoArgs from './transform-attrs-into-args';
 import TransformEachInIntoEach from './transform-each-in-into-each';
 import TransformEachTrackArray from './transform-each-track-array';
 import TransformInElement from './transform-in-element';
@@ -24,7 +24,7 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformQuotedBindingsIntoJustBindings,
     AssertReservedNamedArguments,
     TransformActionSyntax,
-    TransformAttrsIntoArgs,
+    AssertAgainstAttrs,
     TransformEachInIntoEach,
     TransformLinkTo,
     AssertInputHelperWithoutBlock,
diff --git a/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js b/packages/ember-template-compiler/tests/plugins/assert-against-attrs-test.js
similarity index 66%
rename from packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
rename to packages/ember-template-compiler/tests/plugins/assert-against-attrs-test.js
index 549d0092235..30f5c32fbd9 100644
--- a/packages/ember-template-compiler/tests/plugins/transform-attrs-into-args-test.js
+++ b/packages/ember-template-compiler/tests/plugins/assert-against-attrs-test.js
@@ -2,51 +2,49 @@ import TransformTestCase from '../utils/transform-test-case';
 import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
 
 moduleFor(
-  'ember-template-compiler: transforming attrs into @args',
+  'ember-template-compiler: assert against attrs',
   class extends TransformTestCase {
-    ['@test it transforms attrs into @args']() {
+    ['@test it asserts against attrs']() {
       expectAssertion(() => {
-        this.assertTransformed(`{{attrs.foo}}`, `{{@foo}}`);
+        this.assertTransformed(`{{attrs.foo}}`, `{{attrs.foo}}`);
       }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo}} should be updated to {{@foo}}./);
 
       expectAssertion(() => {
-        this.assertTransformed(`{{attrs.foo.bar}}`, `{{@foo.bar}}`);
+        this.assertTransformed(`{{attrs.foo.bar}}`, `{{attrs.foo.bar}}`);
       }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
 
       expectAssertion(() => {
-        this.assertTransformed(`{{if attrs.foo "foo"}}`, `{{if @foo "foo"}}`);
+        this.assertTransformed(`{{if attrs.foo "foo"}}`, `{{if attrs.foo "foo"}}`);
       }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo}} should be updated to {{@foo}}./);
 
       expectAssertion(() => {
-        this.assertTransformed(`{{#if attrs.foo}}{{/if}}`, `{{#if @foo}}{{/if}}`);
+        this.assertTransformed(`{{#if attrs.foo}}{{/if}}`, `{{#if attrs.foo}}{{/if}}`);
       }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo}} should be updated to {{@foo}}./);
 
       expectAssertion(() => {
-        this.assertTransformed(`{{deeply (nested attrs.foo.bar)}}`, `{{deeply (nested @foo.bar)}}`);
+        this.assertTransformed(
+          `{{deeply (nested attrs.foo.bar)}}`,
+          `{{deeply (nested attrs.foo.bar)}}`
+        );
       }, /Using {{attrs}} to reference named arguments is not supported. {{attrs.foo.bar}} should be updated to {{@foo.bar}}./);
     }
 
-    ['@test it transforms this.attrs into @args']() {
-      this.assertTransformed(`{{this.attrs.foo}}`, `{{@foo}}`);
-
-      this.assertTransformed(`{{this.attrs.foo.bar}}`, `{{@foo.bar}}`);
-
-      this.assertTransformed(`{{if this.attrs.foo "foo"}}`, `{{if @foo "foo"}}`);
-
-      this.assertTransformed(`{{#if this.attrs.foo}}{{/if}}`, `{{#if @foo}}{{/if}}`);
-
+    ['@test it does not assert against this.attrs']() {
+      this.assertTransformed(`{{this.attrs.foo}}`, `{{this.attrs.foo}}`);
+      this.assertTransformed(`{{if this.attrs.foo "foo"}}`, `{{if this.attrs.foo "foo"}}`);
+      this.assertTransformed(`{{#if this.attrs.foo}}{{/if}}`, `{{#if this.attrs.foo}}{{/if}}`);
       this.assertTransformed(
         `{{deeply (nested this.attrs.foo.bar)}}`,
-        `{{deeply (nested @foo.bar)}}`
+        `{{deeply (nested this.attrs.foo.bar)}}`
       );
     }
   }
 );
 
 moduleFor(
-  'ember-template-compiler: not transforming block params named "attrs" into @args',
+  'ember-template-compiler: not asserting against block params named "attrs"',
   class extends RenderingTestCase {
-    ["@test it doesn't transform block params"]() {
+    ["@test it doesn't assert block params"]() {
       this.registerComponent('foo', {
         template: '{{#let "foo" as |attrs|}}{{attrs}}{{/let}}',
       });
@@ -54,7 +52,7 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'foo' });
     }
 
-    ["@test it doesn't transform component block params"]() {
+    ["@test it doesn't assert component block params"]() {
       this.registerComponent('foo', {
         template: '{{yield "foo"}}',
       });
@@ -62,7 +60,7 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'foo' });
     }
 
-    ["@test it doesn't transform block params with nested keys"]() {
+    ["@test it doesn't assert block params with nested keys"]() {
       this.registerComponent('foo', {
         template: '{{yield (hash bar="baz")}}',
       });

From 9ee68e04c4ac146b635b6d5d00446d259ddef6ad Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 17 Aug 2021 17:59:15 -0400
Subject: [PATCH 0618/1405] Add v4.0.0-beta.1 to CHANGELOG

(cherry picked from commit 8e1dde524457719c45ded9ef183afc4940653fff)
---
 CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d6f7c8d194..1a51f7b27c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,49 @@
 # Ember Changelog
 
+### v4.0.0-beta.1 (August 17, 2021)
+
+- [#19649](https://github.com/emberjs/ember.js/pull/19649) / [#19692](https://github.com/emberjs/ember.js/pull/19692) [DEPRECATION] Add deprecation warning to Ember.assign implementing [RFC #750](https://github.com/emberjs/rfcs/blob/master/text/0750-deprecate-ember-assign.md).
+- [#19227](https://github.com/emberjs/ember.js/pull/19227) [BUGFIX] Enable global event dispatcher listeners to be lazily created fixing Passive Listener Violation in Chrome
+- [#19542](https://github.com/emberjs/ember.js/pull/19542) [BUGFIX] Fix initializer test blueprints
+- [#19589](https://github.com/emberjs/ember.js/pull/19589) [BUGFIX] Don’t include type-tests in build output
+- [#19528](https://github.com/emberjs/ember.js/pull/19528) [CLEANUP] Remove Logger
+- [#19558](https://github.com/emberjs/ember.js/pull/19558) [CLEANUP] Remove IE11 support
+- [#19563](https://github.com/emberjs/ember.js/pull/19563) [CLEANUP] Remove internal Ember.assign usage
+- [#19636](https://github.com/emberjs/ember.js/pull/19636) [CLEANUP] Remove copy & Copyable
+- [#19638](https://github.com/emberjs/ember.js/pull/19638) [CLEANUP] Remove deprecated with
+- [#19639](https://github.com/emberjs/ember.js/pull/19639) [CLEANUP] Removes deprecated Private INVOKE API
+- [#19640](https://github.com/emberjs/ember.js/pull/19640) [CLEANUP] Remove old deprecations import path
+- [#19641](https://github.com/emberjs/ember.js/pull/19641) [CLEANUP] Remove isVisible
+- [#19642](https://github.com/emberjs/ember.js/pull/19642) [CLEANUP] Remove aliasMethod
+- [#19643](https://github.com/emberjs/ember.js/pull/19643) [CLEANUP] Remove deprecate without for and since
+- [#19644](https://github.com/emberjs/ember.js/pull/19644) [CLEANUP] Remove -in-element
+- [#19645](https://github.com/emberjs/ember.js/pull/19645) [CLEANUP] Remove tryInvoke
+- [#19646](https://github.com/emberjs/ember.js/pull/19646) [CLEANUP] Remove loc
+- [#19647](https://github.com/emberjs/ember.js/pull/19647) [CLEANUP] Remove Ember.merge
+- [#19648](https://github.com/emberjs/ember.js/pull/19648) [CLEANUP] Remove getWithDefault
+- [#19651](https://github.com/emberjs/ember.js/pull/19651) [CLEANUP] Remove LEGACY_OWNER
+- [#19652](https://github.com/emberjs/ember.js/pull/19652) [CLEANUP] Remove Globals Resolver
+- [#19653](https://github.com/emberjs/ember.js/pull/19653) [CLEANUP] Remove run and computed dot access
+- [#19654](https://github.com/emberjs/ember.js/pull/19654) [CLEANUP] Remove @ember/string methods from native prototype
+- [#19655](https://github.com/emberjs/ember.js/pull/19655) [CLEANUP] Remove meta-destruction-apis
+- [#19656](https://github.com/emberjs/ember.js/pull/19656) [CLEANUP] Remove string-based setComponentManager
+- [#19657](https://github.com/emberjs/ember.js/pull/19657) [CLEANUP] Remove hasBlock and hasBlockParams
+- [#19658](https://github.com/emberjs/ember.js/pull/19658) [CLEANUP] Remove sendAction and string action passing
+- [#19659](https://github.com/emberjs/ember.js/pull/19659) [CLEANUP] Remove renderTemplate, disconnectOutlet, render
+- [#19660](https://github.com/emberjs/ember.js/pull/19660) [CLEANUP] Remove attrs/attrs-arg-access
+- [#19661](https://github.com/emberjs/ember.js/pull/19661) [CLEANUP] Remove EMBER_EXTEND_PROTOTYPES
+- [#19663](https://github.com/emberjs/ember.js/pull/19663) [CLEANUP] Remove function prototype extensions
+- [#19665](https://github.com/emberjs/ember.js/pull/19665) [CLEANUP] Remove deprecated jQuery integration
+- [#19666](https://github.com/emberjs/ember.js/pull/19666) [CLEANUP] Remove jQuery integration in EventDispatcher
+- [#19667](https://github.com/emberjs/ember.js/pull/19667) [CLEANUP] Cleanup IE11 leftovers
+- [#19670](https://github.com/emberjs/ember.js/pull/19670) [CLEANUP] Remove .volatile()
+- [#19671](https://github.com/emberjs/ember.js/pull/19671) [CLEANUP] Remove .property()
+- [#19673](https://github.com/emberjs/ember.js/pull/19673) [CLEANUP] Remove computed deep each
+- [#19674](https://github.com/emberjs/ember.js/pull/19674) [CLEANUP] Remove ability to override computed property
+- [#19678](https://github.com/emberjs/ember.js/pull/19678) [CLEANUP] Remove window.Ember global
+- [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
+- [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
+
 ### v3.28.0 (August 9, 2021)
 
 - [#19697](https://github.com/emberjs/ember.js/pull/19697) [BUGFIX] Ensure `deserializeQueryParam` is called for lazy routes

From fe66ee42b3c7f0eb261c895122908f7597e40526 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 17 Aug 2021 18:00:54 -0400
Subject: [PATCH 0619/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2c18108133f..d91877353ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.0.0-alpha.1",
+  "version": "4.1.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From c2b9023fc8ce2b81667cc80d25f73c2c1d084a06 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 22 Jul 2021 19:29:15 +0200
Subject: [PATCH 0620/1405] Remove jQuery usage from ember-testing

As advised by feedback from core team, this removes all jQuery related testing helpers from ember-testing:
* `find`
* `findWithAssert`
* `triggerEvent`
* `keyEvent`
* `click`
* `fillIn`

All remaining helpers remain untouched for future official deprecation.
---
 packages/ember-testing/index.js               |    1 -
 packages/ember-testing/lib/events.js          |  135 --
 packages/ember-testing/lib/helpers.js         |   12 -
 .../lib/helpers/-is-form-control.js           |   16 -
 packages/ember-testing/lib/helpers/click.js   |   36 -
 packages/ember-testing/lib/helpers/fill_in.js |   46 -
 packages/ember-testing/lib/helpers/find.js    |   41 -
 .../lib/helpers/find_with_assert.js           |   34 -
 .../ember-testing/lib/helpers/key_event.js    |   36 -
 .../lib/helpers/trigger_event.js              |   62 -
 .../ember-testing/lib/setup_for_testing.js    |   16 -
 packages/ember-testing/lib/support.js         |   62 -
 .../ember-testing/tests/acceptance_test.js    |  480 -------
 packages/ember-testing/tests/helpers_test.js  | 1278 -----------------
 .../ember-testing/tests/integration_test.js   |  106 --
 tests/docs/expected.js                        |    5 -
 yarn.lock                                     |  268 ++--
 17 files changed, 120 insertions(+), 2514 deletions(-)
 delete mode 100644 packages/ember-testing/lib/events.js
 delete mode 100644 packages/ember-testing/lib/helpers/-is-form-control.js
 delete mode 100644 packages/ember-testing/lib/helpers/click.js
 delete mode 100644 packages/ember-testing/lib/helpers/fill_in.js
 delete mode 100644 packages/ember-testing/lib/helpers/find.js
 delete mode 100644 packages/ember-testing/lib/helpers/find_with_assert.js
 delete mode 100644 packages/ember-testing/lib/helpers/key_event.js
 delete mode 100644 packages/ember-testing/lib/helpers/trigger_event.js
 delete mode 100644 packages/ember-testing/lib/support.js
 delete mode 100644 packages/ember-testing/tests/acceptance_test.js
 delete mode 100644 packages/ember-testing/tests/helpers_test.js
 delete mode 100644 packages/ember-testing/tests/integration_test.js

diff --git a/packages/ember-testing/index.js b/packages/ember-testing/index.js
index 3f2b81f97e6..411e756bf72 100644
--- a/packages/ember-testing/index.js
+++ b/packages/ember-testing/index.js
@@ -3,7 +3,6 @@ export { default as Adapter } from './lib/adapters/adapter';
 export { default as setupForTesting } from './lib/setup_for_testing';
 export { default as QUnitAdapter } from './lib/adapters/qunit';
 
-import './lib/support'; // to handle various edge cases
 import './lib/ext/application';
 import './lib/ext/rsvp'; // setup RSVP + run loop integration
 import './lib/helpers'; // adds helpers to helpers object in Test
diff --git a/packages/ember-testing/lib/events.js b/packages/ember-testing/lib/events.js
deleted file mode 100644
index 48cd654e1c1..00000000000
--- a/packages/ember-testing/lib/events.js
+++ /dev/null
@@ -1,135 +0,0 @@
-import { run } from '@ember/runloop';
-import isFormControl from './helpers/-is-form-control';
-
-const DEFAULT_EVENT_OPTIONS = { canBubble: true, cancelable: true };
-const KEYBOARD_EVENT_TYPES = ['keydown', 'keypress', 'keyup'];
-const MOUSE_EVENT_TYPES = [
-  'click',
-  'mousedown',
-  'mouseup',
-  'dblclick',
-  'mouseenter',
-  'mouseleave',
-  'mousemove',
-  'mouseout',
-  'mouseover',
-];
-
-export function focus(el) {
-  if (!el) {
-    return;
-  }
-  if (el.isContentEditable || isFormControl(el)) {
-    let type = el.getAttribute('type');
-    if (type !== 'checkbox' && type !== 'radio' && type !== 'hidden') {
-      run(null, function () {
-        let browserIsNotFocused = document.hasFocus && !document.hasFocus();
-
-        // makes `document.activeElement` be `element`. If the browser is focused, it also fires a focus event
-        el.focus();
-
-        // Firefox does not trigger the `focusin` event if the window
-        // does not have focus. If the document does not have focus then
-        // fire `focusin` event as well.
-        if (browserIsNotFocused) {
-          // if the browser is not focused the previous `el.focus()` didn't fire an event, so we simulate it
-          fireEvent(el, 'focus', {
-            bubbles: false,
-          });
-
-          fireEvent(el, 'focusin');
-        }
-      });
-    }
-  }
-}
-
-export function fireEvent(element, type, options = {}) {
-  if (!element) {
-    return;
-  }
-  let event;
-  if (KEYBOARD_EVENT_TYPES.indexOf(type) > -1) {
-    event = buildKeyboardEvent(type, options);
-  } else if (MOUSE_EVENT_TYPES.indexOf(type) > -1) {
-    let rect = element.getBoundingClientRect();
-    let x = rect.left + 1;
-    let y = rect.top + 1;
-    let simulatedCoordinates = {
-      screenX: x + 5,
-      screenY: y + 95,
-      clientX: x,
-      clientY: y,
-    };
-    event = buildMouseEvent(type, Object.assign(simulatedCoordinates, options));
-  } else {
-    event = buildBasicEvent(type, options);
-  }
-  element.dispatchEvent(event);
-}
-
-function buildBasicEvent(type, options = {}) {
-  let event = document.createEvent('Events');
-
-  // Event.bubbles is read only
-  let bubbles = options.bubbles !== undefined ? options.bubbles : true;
-  let cancelable = options.cancelable !== undefined ? options.cancelable : true;
-
-  delete options.bubbles;
-  delete options.cancelable;
-
-  event.initEvent(type, bubbles, cancelable);
-  Object.assign(event, options);
-  return event;
-}
-
-function buildMouseEvent(type, options = {}) {
-  let event;
-  try {
-    event = document.createEvent('MouseEvents');
-    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
-    event.initMouseEvent(
-      type,
-      eventOpts.canBubble,
-      eventOpts.cancelable,
-      window,
-      eventOpts.detail,
-      eventOpts.screenX,
-      eventOpts.screenY,
-      eventOpts.clientX,
-      eventOpts.clientY,
-      eventOpts.ctrlKey,
-      eventOpts.altKey,
-      eventOpts.shiftKey,
-      eventOpts.metaKey,
-      eventOpts.button,
-      eventOpts.relatedTarget
-    );
-  } catch (e) {
-    event = buildBasicEvent(type, options);
-  }
-  return event;
-}
-
-function buildKeyboardEvent(type, options = {}) {
-  let event;
-  try {
-    event = document.createEvent('KeyEvents');
-    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
-    event.initKeyEvent(
-      type,
-      eventOpts.canBubble,
-      eventOpts.cancelable,
-      window,
-      eventOpts.ctrlKey,
-      eventOpts.altKey,
-      eventOpts.shiftKey,
-      eventOpts.metaKey,
-      eventOpts.keyCode,
-      eventOpts.charCode
-    );
-  } catch (e) {
-    event = buildBasicEvent(type, options);
-  }
-  return event;
-}
diff --git a/packages/ember-testing/lib/helpers.js b/packages/ember-testing/lib/helpers.js
index 24522ac9f48..edf10340e24 100644
--- a/packages/ember-testing/lib/helpers.js
+++ b/packages/ember-testing/lib/helpers.js
@@ -1,29 +1,17 @@
 import { registerHelper as helper, registerAsyncHelper as asyncHelper } from './test/helpers';
 import andThen from './helpers/and_then';
-import click from './helpers/click';
 import currentPath from './helpers/current_path';
 import currentRouteName from './helpers/current_route_name';
 import currentURL from './helpers/current_url';
-import fillIn from './helpers/fill_in';
-import find from './helpers/find';
-import findWithAssert from './helpers/find_with_assert';
-import keyEvent from './helpers/key_event';
 import { pauseTest, resumeTest } from './helpers/pause_test';
-import triggerEvent from './helpers/trigger_event';
 import visit from './helpers/visit';
 import wait from './helpers/wait';
 
 asyncHelper('visit', visit);
-asyncHelper('click', click);
-asyncHelper('keyEvent', keyEvent);
-asyncHelper('fillIn', fillIn);
 asyncHelper('wait', wait);
 asyncHelper('andThen', andThen);
 asyncHelper('pauseTest', pauseTest);
-asyncHelper('triggerEvent', triggerEvent);
 
-helper('find', find);
-helper('findWithAssert', findWithAssert);
 helper('currentRouteName', currentRouteName);
 helper('currentPath', currentPath);
 helper('currentURL', currentURL);
diff --git a/packages/ember-testing/lib/helpers/-is-form-control.js b/packages/ember-testing/lib/helpers/-is-form-control.js
deleted file mode 100644
index f1419e44bdc..00000000000
--- a/packages/ember-testing/lib/helpers/-is-form-control.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const FORM_CONTROL_TAGS = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'];
-
-/**
-  @private
-  @param {Element} element the element to check
-  @returns {boolean} `true` when the element is a form control, `false` otherwise
-*/
-export default function isFormControl(element) {
-  let { tagName, type } = element;
-
-  if (type === 'hidden') {
-    return false;
-  }
-
-  return FORM_CONTROL_TAGS.indexOf(tagName) > -1;
-}
diff --git a/packages/ember-testing/lib/helpers/click.js b/packages/ember-testing/lib/helpers/click.js
deleted file mode 100644
index c2780821e4a..00000000000
--- a/packages/ember-testing/lib/helpers/click.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
-@module ember
-*/
-import { focus, fireEvent } from '../events';
-
-/**
-  Clicks an element and triggers any actions triggered by the element's `click`
-  event.
-
-  Example:
-
-  ```javascript
-  click('.some-jQuery-selector').then(function() {
-    // assert something
-  });
-  ```
-
-  @method click
-  @param {String} selector jQuery selector for finding element on the DOM
-  @param {Object} context A DOM Element, Document, or jQuery to use as context
-  @return {RSVP.Promise<undefined>}
-  @public
-*/
-export default function click(app, selector, context) {
-  let $el = app.testHelpers.findWithAssert(selector, context);
-  let el = $el[0];
-
-  fireEvent(el, 'mousedown');
-
-  focus(el);
-
-  fireEvent(el, 'mouseup');
-  fireEvent(el, 'click');
-
-  return app.testHelpers.wait();
-}
diff --git a/packages/ember-testing/lib/helpers/fill_in.js b/packages/ember-testing/lib/helpers/fill_in.js
deleted file mode 100644
index c667eac6164..00000000000
--- a/packages/ember-testing/lib/helpers/fill_in.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
-@module ember
-*/
-import { focus, fireEvent } from '../events';
-import isFormControl from './-is-form-control';
-
-/**
-  Fills in an input element with some text.
-
-  Example:
-
-  ```javascript
-  fillIn('#email', 'you@example.com').then(function() {
-    // assert something
-  });
-  ```
-
-  @method fillIn
-  @param {String} selector jQuery selector finding an input element on the DOM
-  to fill text with
-  @param {String} text text to place inside the input element
-  @return {RSVP.Promise<undefined>}
-  @public
-*/
-export default function fillIn(app, selector, contextOrText, text) {
-  let $el, el, context;
-  if (text === undefined) {
-    text = contextOrText;
-  } else {
-    context = contextOrText;
-  }
-  $el = app.testHelpers.findWithAssert(selector, context);
-  el = $el[0];
-  focus(el);
-
-  if (isFormControl(el)) {
-    el.value = text;
-  } else {
-    el.innerHTML = text;
-  }
-
-  fireEvent(el, 'input');
-  fireEvent(el, 'change');
-
-  return app.testHelpers.wait();
-}
diff --git a/packages/ember-testing/lib/helpers/find.js b/packages/ember-testing/lib/helpers/find.js
deleted file mode 100644
index 74ffab24d0d..00000000000
--- a/packages/ember-testing/lib/helpers/find.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
-@module ember
-*/
-import { get } from '@ember/-internals/metal';
-import { assert } from '@ember/debug';
-import { jQueryDisabled } from '@ember/-internals/views';
-
-/**
-  Finds an element in the context of the app's container element. A simple alias
-  for `app.$(selector)`.
-
-  Example:
-
-  ```javascript
-  var $el = find('.my-selector');
-  ```
-
-  With the `context` param:
-
-  ```javascript
-  var $el = find('.my-selector', '.parent-element-class');
-  ```
-
-  @method find
-  @param {String} selector jQuery selector for element lookup
-  @param {String} [context] (optional) jQuery selector that will limit the selector
-                            argument to find only within the context's children
-  @return {Object} DOM element representing the results of the query
-  @public
-*/
-export default function find(app, selector, context) {
-  if (jQueryDisabled) {
-    assert(
-      'If jQuery is disabled, please import and use helpers from @ember/test-helpers [https://github.com/emberjs/ember-test-helpers]. Note: `find` is not an available helper.'
-    );
-  }
-  let $el;
-  context = context || get(app, 'rootElement');
-  $el = app.$(selector, context);
-  return $el;
-}
diff --git a/packages/ember-testing/lib/helpers/find_with_assert.js b/packages/ember-testing/lib/helpers/find_with_assert.js
deleted file mode 100644
index 15863b70d14..00000000000
--- a/packages/ember-testing/lib/helpers/find_with_assert.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
-@module ember
-*/
-/**
-  Like `find`, but throws an error if the element selector returns no results.
-
-  Example:
-
-  ```javascript
-  var $el = findWithAssert('.doesnt-exist'); // throws error
-  ```
-
-  With the `context` param:
-
-  ```javascript
-  var $el = findWithAssert('.selector-id', '.parent-element-class'); // assert will pass
-  ```
-
-  @method findWithAssert
-  @param {String} selector jQuery selector string for finding an element within
-  the DOM
-  @param {String} [context] (optional) jQuery selector that will limit the
-  selector argument to find only within the context's children
-  @return {Object} jQuery object representing the results of the query
-  @throws {Error} throws error if object returned has a length of 0
-  @public
-*/
-export default function findWithAssert(app, selector, context) {
-  let $el = app.testHelpers.find(selector, context);
-  if ($el.length === 0) {
-    throw new Error('Element ' + selector + ' not found.');
-  }
-  return $el;
-}
diff --git a/packages/ember-testing/lib/helpers/key_event.js b/packages/ember-testing/lib/helpers/key_event.js
deleted file mode 100644
index bed4161a048..00000000000
--- a/packages/ember-testing/lib/helpers/key_event.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
-@module ember
-*/
-/**
-  Simulates a key event, e.g. `keypress`, `keydown`, `keyup` with the desired keyCode
-  Example:
-  ```javascript
-  keyEvent('.some-jQuery-selector', 'keypress', 13).then(function() {
-   // assert something
-  });
-  ```
-  @method keyEvent
-  @param {String} selector jQuery selector for finding element on the DOM
-  @param {String} type the type of key event, e.g. `keypress`, `keydown`, `keyup`
-  @param {Number} keyCode the keyCode of the simulated key event
-  @return {RSVP.Promise<undefined>}
-  @since 1.5.0
-  @public
-*/
-export default function keyEvent(app, selector, contextOrType, typeOrKeyCode, keyCode) {
-  let context, type;
-
-  if (keyCode === undefined) {
-    context = null;
-    keyCode = typeOrKeyCode;
-    type = contextOrType;
-  } else {
-    context = contextOrType;
-    type = typeOrKeyCode;
-  }
-
-  return app.testHelpers.triggerEvent(selector, context, type, {
-    keyCode,
-    which: keyCode,
-  });
-}
diff --git a/packages/ember-testing/lib/helpers/trigger_event.js b/packages/ember-testing/lib/helpers/trigger_event.js
deleted file mode 100644
index 4b6e0a04f0d..00000000000
--- a/packages/ember-testing/lib/helpers/trigger_event.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
-@module ember
-*/
-import { fireEvent } from '../events';
-/**
-  Triggers the given DOM event on the element identified by the provided selector.
-  Example:
-  ```javascript
-  triggerEvent('#some-elem-id', 'blur');
-  ```
-  This is actually used internally by the `keyEvent` helper like so:
-  ```javascript
-  triggerEvent('#some-elem-id', 'keypress', { keyCode: 13 });
-  ```
- @method triggerEvent
- @param {String} selector jQuery selector for finding element on the DOM
- @param {String} [context] jQuery selector that will limit the selector
-                           argument to find only within the context's children
- @param {String} type The event type to be triggered.
- @param {Object} [options] The options to be passed to jQuery.Event.
- @return {RSVP.Promise<undefined>}
- @since 1.5.0
- @public
-*/
-export default function triggerEvent(app, selector, contextOrType, typeOrOptions, possibleOptions) {
-  let arity = arguments.length;
-  let context, type, options;
-
-  if (arity === 3) {
-    // context and options are optional, so this is
-    // app, selector, type
-    context = null;
-    type = contextOrType;
-    options = {};
-  } else if (arity === 4) {
-    // context and options are optional, so this is
-    if (typeof typeOrOptions === 'object') {
-      // either
-      // app, selector, type, options
-      context = null;
-      type = contextOrType;
-      options = typeOrOptions;
-    } else {
-      // or
-      // app, selector, context, type
-      context = contextOrType;
-      type = typeOrOptions;
-      options = {};
-    }
-  } else {
-    context = contextOrType;
-    type = typeOrOptions;
-    options = possibleOptions;
-  }
-
-  let $el = app.testHelpers.findWithAssert(selector, context);
-  let el = $el[0];
-
-  fireEvent(el, type, options);
-
-  return app.testHelpers.wait();
-}
diff --git a/packages/ember-testing/lib/setup_for_testing.js b/packages/ember-testing/lib/setup_for_testing.js
index 39fea3b120f..91c615d5fdb 100644
--- a/packages/ember-testing/lib/setup_for_testing.js
+++ b/packages/ember-testing/lib/setup_for_testing.js
@@ -1,13 +1,7 @@
 /* global self */
 
 import { setTesting } from '@ember/debug';
-import { jQuery, jQueryDisabled } from '@ember/-internals/views';
 import { getAdapter, setAdapter } from './test/adapter';
-import {
-  incrementPendingRequests,
-  decrementPendingRequests,
-  clearPendingRequests,
-} from './test/pending_requests';
 import Adapter from './adapters/adapter';
 import QUnitAdapter from './adapters/qunit';
 
@@ -31,14 +25,4 @@ export default function setupForTesting() {
   if (!adapter) {
     setAdapter(typeof self.QUnit === 'undefined' ? Adapter.create() : QUnitAdapter.create());
   }
-
-  if (!jQueryDisabled) {
-    jQuery(document).off('ajaxSend', incrementPendingRequests);
-    jQuery(document).off('ajaxComplete', decrementPendingRequests);
-
-    clearPendingRequests();
-
-    jQuery(document).on('ajaxSend', incrementPendingRequests);
-    jQuery(document).on('ajaxComplete', decrementPendingRequests);
-  }
 }
diff --git a/packages/ember-testing/lib/support.js b/packages/ember-testing/lib/support.js
deleted file mode 100644
index a45df0845ca..00000000000
--- a/packages/ember-testing/lib/support.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { warn } from '@ember/debug';
-import { jQuery, jQueryDisabled } from '@ember/-internals/views';
-
-import { hasDOM } from '@ember/-internals/browser-environment';
-
-/**
-  @module ember
-*/
-
-const $ = jQuery;
-
-/**
-  This method creates a checkbox and triggers the click event to fire the
-  passed in handler. It is used to correct for a bug in older versions
-  of jQuery (e.g 1.8.3).
-
-  @private
-  @method testCheckboxClick
-*/
-function testCheckboxClick(handler) {
-  let input = document.createElement('input');
-  $(input)
-    .attr('type', 'checkbox')
-    .css({ position: 'absolute', left: '-1000px', top: '-1000px' })
-    .appendTo('body')
-    .on('click', handler)
-    .trigger('click')
-    .remove();
-}
-
-if (hasDOM && !jQueryDisabled) {
-  $(function () {
-    /*
-      Determine whether a checkbox checked using jQuery's "click" method will have
-      the correct value for its checked property.
-
-      If we determine that the current jQuery version exhibits this behavior,
-      patch it to work correctly as in the commit for the actual fix:
-      https://github.com/jquery/jquery/commit/1fb2f92.
-    */
-    testCheckboxClick(function () {
-      if (!this.checked && !$.event.special.click) {
-        $.event.special.click = {
-          // For checkbox, fire native event so checked state will be right
-          trigger() {
-            if (this.nodeName === 'INPUT' && this.type === 'checkbox' && this.click) {
-              this.click();
-              return false;
-            }
-          },
-        };
-      }
-    });
-
-    // Try again to verify that the patch took effect or blow up.
-    testCheckboxClick(function () {
-      warn("clicked checkboxes should be checked! the jQuery patch didn't work", this.checked, {
-        id: 'ember-testing.test-checkbox-click',
-      });
-    });
-  });
-}
diff --git a/packages/ember-testing/tests/acceptance_test.js b/packages/ember-testing/tests/acceptance_test.js
deleted file mode 100644
index c8d5f8bb171..00000000000
--- a/packages/ember-testing/tests/acceptance_test.js
+++ /dev/null
@@ -1,480 +0,0 @@
-import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
-
-import { later } from '@ember/runloop';
-import Test from '../lib/test';
-import QUnitAdapter from '../lib/adapters/qunit';
-import { Route } from '@ember/-internals/routing';
-import { RSVP } from '@ember/-internals/runtime';
-import { jQueryDisabled } from '@ember/-internals/views';
-import { getDebugFunction, setDebugFunction } from '@ember/debug';
-
-const originalDebug = getDebugFunction('debug');
-
-const originalConsoleError = console.error; // eslint-disable-line no-console
-let testContext;
-
-if (!jQueryDisabled) {
-  moduleFor(
-    'ember-testing Acceptance',
-    class extends AutobootApplicationTestCase {
-      constructor() {
-        setDebugFunction('debug', function () {});
-        super();
-        this._originalAdapter = Test.adapter;
-
-        testContext = this;
-
-        runTask(() => {
-          this.createApplication();
-          this.router.map(function () {
-            this.route('posts');
-            this.route('comments');
-
-            this.route('abort_transition');
-
-            this.route('redirect');
-          });
-
-          this.indexHitCount = 0;
-          this.currentRoute = 'index';
-
-          this.add(
-            'route:index',
-            Route.extend({
-              model() {
-                testContext.indexHitCount += 1;
-              },
-            })
-          );
-
-          this.add(
-            'route:posts',
-            Route.extend({
-              setupController() {
-                testContext.currentRoute = 'posts';
-                this._super(...arguments);
-              },
-            })
-          );
-
-          this.addTemplate(
-            'posts',
-            `
-          <div class="posts-view">
-            <a class="dummy-link"></a>
-            <div id="comments-link">
-              {{#link-to route='comments'}}Comments{{/link-to}}
-            </div>
-          </div>
-        `
-          );
-
-          this.add(
-            'route:comments',
-            Route.extend({
-              setupController() {
-                testContext.currentRoute = 'comments';
-                this._super(...arguments);
-              },
-            })
-          );
-
-          this.addTemplate('comments', `<div>{{input type="text"}}</div>`);
-
-          this.add(
-            'route:abort_transition',
-            Route.extend({
-              beforeModel(transition) {
-                transition.abort();
-              },
-            })
-          );
-
-          this.add(
-            'route:redirect',
-            Route.extend({
-              beforeModel() {
-                expectDeprecation(() => {
-                  this.transitionTo('comments');
-                }, /Calling transitionTo on a route is deprecated/);
-              },
-            })
-          );
-
-          this.application.setupForTesting();
-
-          Test.registerAsyncHelper('slowHelper', () => {
-            return new RSVP.Promise((resolve) => later(resolve, 10));
-          });
-
-          this.application.injectTestHelpers();
-        });
-      }
-      afterEach() {
-        console.error = originalConsoleError; // eslint-disable-line no-console
-        super.afterEach();
-      }
-
-      teardown() {
-        setDebugFunction('debug', originalDebug);
-        Test.adapter = this._originalAdapter;
-        Test.unregisterHelper('slowHelper');
-        window.slowHelper = undefined;
-        testContext = undefined;
-        super.teardown();
-      }
-
-      [`@test helpers can be chained with then`](assert) {
-        assert.expect(6);
-
-        window
-          .visit('/posts')
-          .then(() => {
-            assert.equal(this.currentRoute, 'posts', 'Successfully visited posts route');
-            assert.equal(window.currentURL(), '/posts', 'posts URL is correct');
-            return window.click('a:contains("Comments")');
-          })
-          .then(() => {
-            assert.equal(this.currentRoute, 'comments', 'visit chained with click');
-            return window.fillIn('.ember-text-field', 'yeah');
-          })
-          .then(() => {
-            assert.equal(
-              document.querySelector('.ember-text-field').value,
-              'yeah',
-              'chained with fillIn'
-            );
-            return window.fillIn('.ember-text-field', '#qunit-fixture', 'context working');
-          })
-          .then(() => {
-            assert.equal(
-              document.querySelector('.ember-text-field').value,
-              'context working',
-              'chained with fillIn'
-            );
-            return window.click('.does-not-exist');
-          })
-          .catch((e) => {
-            assert.equal(
-              e.message,
-              'Element .does-not-exist not found.',
-              'Non-existent click exception caught'
-            );
-          });
-      }
-
-      [`@test helpers can be chained to each other (legacy)`](assert) {
-        assert.expect(7);
-
-        window
-          .visit('/posts')
-          .click('a:first', '#comments-link')
-          .fillIn('.ember-text-field', 'hello')
-          .then(() => {
-            assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
-            assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-            assert.equal(
-              document.querySelector('.ember-text-field').value,
-              'hello',
-              'Fillin successfully works'
-            );
-            window.find('.ember-text-field').one('keypress', (e) => {
-              assert.equal(e.keyCode, 13, 'keyevent chained with correct keyCode.');
-              assert.equal(e.which, 13, 'keyevent chained with correct which.');
-            });
-          })
-          .keyEvent('.ember-text-field', 'keypress', 13)
-          .visit('/posts')
-          .then(() => {
-            assert.equal(this.currentRoute, 'posts', 'Thens can also be chained to helpers');
-            assert.equal(window.currentURL(), '/posts', 'URL is set correct on chained helpers');
-          });
-      }
-
-      [`@test helpers don't need to be chained`](assert) {
-        assert.expect(5);
-
-        window.visit('/posts');
-
-        window.click('a:first', '#comments-link');
-
-        window.fillIn('.ember-text-field', 'hello');
-
-        window.andThen(() => {
-          assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
-          assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-          assert.equal(
-            window.find('.ember-text-field').val(),
-            'hello',
-            'Fillin successfully works'
-          );
-        });
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          assert.equal(this.currentRoute, 'posts');
-          assert.equal(window.currentURL(), '/posts');
-        });
-      }
-
-      [`@test Nested async helpers`](assert) {
-        assert.expect(5);
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          window.click('a:first', '#comments-link');
-          window.fillIn('.ember-text-field', 'hello');
-        });
-
-        window.andThen(() => {
-          assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
-          assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-          assert.equal(
-            window.find('.ember-text-field').val(),
-            'hello',
-            'Fillin successfully works'
-          );
-        });
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          assert.equal(this.currentRoute, 'posts');
-          assert.equal(window.currentURL(), '/posts');
-        });
-      }
-
-      [`@test Multiple nested async helpers`](assert) {
-        assert.expect(3);
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          window.click('a:first', '#comments-link');
-
-          window.fillIn('.ember-text-field', 'hello');
-          window.fillIn('.ember-text-field', 'goodbye');
-        });
-
-        window.andThen(() => {
-          assert.equal(
-            window.find('.ember-text-field').val(),
-            'goodbye',
-            'Fillin successfully works'
-          );
-          assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
-          assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-        });
-      }
-
-      [`@test Helpers nested in thens`](assert) {
-        assert.expect(5);
-
-        window.visit('/posts').then(() => {
-          window.click('a:first', '#comments-link');
-        });
-
-        window.andThen(() => {
-          window.fillIn('.ember-text-field', 'hello');
-        });
-
-        window.andThen(() => {
-          assert.equal(this.currentRoute, 'comments', 'Successfully visited comments route');
-          assert.equal(window.currentURL(), '/comments', 'Comments URL is correct');
-          assert.equal(
-            window.find('.ember-text-field').val(),
-            'hello',
-            'Fillin successfully works'
-          );
-        });
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          assert.equal(this.currentRoute, 'posts');
-          assert.equal(window.currentURL(), '/posts', 'Posts URL is correct');
-        });
-      }
-
-      [`@test Aborted transitions are not logged via Ember.Test.adapter#exception`](assert) {
-        assert.expect(0);
-
-        Test.adapter = QUnitAdapter.create({
-          exception() {
-            assert.ok(false, 'aborted transitions are not logged');
-          },
-        });
-
-        window.visit('/abort_transition');
-      }
-
-      [`@test Unhandled exceptions are logged via Ember.Test.adapter#exception`](assert) {
-        assert.expect(2);
-
-        console.error = () => {}; // eslint-disable-line no-console
-        let asyncHandled;
-        Test.adapter = QUnitAdapter.create({
-          exception(error) {
-            assert.equal(
-              error.message,
-              'Element .does-not-exist not found.',
-              'Exception successfully caught and passed to Ember.Test.adapter.exception'
-            );
-            // handle the rejection so it doesn't leak later.
-            asyncHandled.catch(() => {});
-          },
-        });
-
-        window.visit('/posts');
-
-        window.click('.invalid-element').catch((error) => {
-          assert.equal(
-            error.message,
-            'Element .invalid-element not found.',
-            'Exception successfully handled in the rejection handler'
-          );
-        });
-
-        asyncHandled = window.click('.does-not-exist');
-      }
-
-      [`@test Unhandled exceptions in 'andThen' are logged via Ember.Test.adapter#exception`](
-        assert
-      ) {
-        assert.expect(1);
-
-        console.error = () => {}; // eslint-disable-line no-console
-        Test.adapter = QUnitAdapter.create({
-          exception(error) {
-            assert.equal(
-              error.message,
-              'Catch me',
-              'Exception successfully caught and passed to Ember.Test.adapter.exception'
-            );
-          },
-        });
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          throw new Error('Catch me');
-        });
-      }
-
-      [`@test should not start routing on the root URL when visiting another`](assert) {
-        assert.expect(4);
-
-        window.visit('/posts');
-
-        window.andThen(() => {
-          assert.ok(window.find('#comments-link'), 'found comments-link');
-          assert.equal(this.currentRoute, 'posts', 'Successfully visited posts route');
-          assert.equal(window.currentURL(), '/posts', 'Posts URL is correct');
-          assert.equal(
-            this.indexHitCount,
-            0,
-            'should not hit index route when visiting another route'
-          );
-        });
-      }
-
-      [`@test only enters the index route once when visiting `](assert) {
-        assert.expect(1);
-
-        window.visit('/');
-
-        window.andThen(() => {
-          assert.equal(this.indexHitCount, 1, 'should hit index once when visiting /');
-        });
-      }
-
-      [`@test test must not finish while asyncHelpers are pending`](assert) {
-        assert.expect(2);
-
-        let async = 0;
-        let innerRan = false;
-
-        Test.adapter = QUnitAdapter.extend({
-          asyncStart() {
-            async++;
-            this._super();
-          },
-          asyncEnd() {
-            async--;
-            this._super();
-          },
-        }).create();
-
-        this.application.testHelpers.slowHelper();
-
-        window.andThen(() => {
-          innerRan = true;
-        });
-
-        assert.equal(innerRan, false, 'should not have run yet');
-        assert.ok(async > 0, 'should have told the adapter to pause');
-
-        if (async === 0) {
-          // If we failed the test, prevent zalgo from escaping and breaking
-          // our other tests.
-          Test.adapter.asyncStart();
-          Test.resolve().then(() => {
-            Test.adapter.asyncEnd();
-          });
-        }
-      }
-
-      [`@test visiting a URL that causes another transition should yield the correct URL`](assert) {
-        assert.expect(2);
-
-        window.visit('/redirect');
-
-        window.andThen(() => {
-          assert.equal(window.currentURL(), '/comments', 'Redirected to Comments URL');
-        });
-      }
-
-      [`@test visiting a URL and then visiting a second URL with a transition should yield the correct URL`](
-        assert
-      ) {
-        assert.expect(3);
-
-        window.visit('/posts');
-
-        window.andThen(function () {
-          assert.equal(window.currentURL(), '/posts', 'First visited URL is correct');
-        });
-
-        window.visit('/redirect');
-
-        window.andThen(() => {
-          assert.equal(window.currentURL(), '/comments', 'Redirected to Comments URL');
-        });
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing Acceptance - teardown',
-    class extends AutobootApplicationTestCase {
-      [`@test that the setup/teardown happens correctly`](assert) {
-        assert.expect(2);
-
-        runTask(() => {
-          this.createApplication();
-        });
-        this.application.injectTestHelpers();
-
-        assert.ok(typeof Test.Promise.prototype.click === 'function');
-
-        runTask(() => {
-          this.application.destroy();
-        });
-
-        assert.equal(Test.Promise.prototype.click, undefined);
-      }
-    }
-  );
-}
diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
deleted file mode 100644
index 729fd6da46f..00000000000
--- a/packages/ember-testing/tests/helpers_test.js
+++ /dev/null
@@ -1,1278 +0,0 @@
-import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
-
-import { Route } from '@ember/-internals/routing';
-import Controller from '@ember/controller';
-import { RSVP } from '@ember/-internals/runtime';
-import { action } from '@ember/object';
-import { later } from '@ember/runloop';
-import { Component } from '@ember/-internals/glimmer';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
-
-import Test from '../lib/test';
-import setupForTesting from '../lib/setup_for_testing';
-
-import {
-  pendingRequests,
-  incrementPendingRequests,
-  decrementPendingRequests,
-  clearPendingRequests,
-} from '../lib/test/pending_requests';
-import { setAdapter, getAdapter } from '../lib/test/adapter';
-import { registerWaiter, unregisterWaiter } from '../lib/test/waiters';
-import { getDebugFunction, setDebugFunction } from '@ember/debug';
-
-const originalInfo = getDebugFunction('info');
-const noop = function () {};
-
-function registerHelper() {
-  Test.registerHelper('LeakyMcLeakLeak', () => {});
-}
-
-function assertHelpers(assert, application, helperContainer, expected) {
-  if (!helperContainer) {
-    helperContainer = window;
-  }
-  if (expected === undefined) {
-    expected = true;
-  }
-
-  function checkHelperPresent(helper, expected) {
-    let presentInHelperContainer = Boolean(helperContainer[helper]);
-    let presentInTestHelpers = Boolean(application.testHelpers[helper]);
-
-    assert.ok(
-      presentInHelperContainer === expected,
-      "Expected '" + helper + "' to be present in the helper container (defaults to window)."
-    );
-    assert.ok(
-      presentInTestHelpers === expected,
-      "Expected '" + helper + "' to be present in App.testHelpers."
-    );
-  }
-
-  checkHelperPresent('visit', expected);
-  checkHelperPresent('click', expected);
-  checkHelperPresent('keyEvent', expected);
-  checkHelperPresent('fillIn', expected);
-  checkHelperPresent('wait', expected);
-  checkHelperPresent('triggerEvent', expected);
-}
-
-function assertNoHelpers(assert, application, helperContainer) {
-  assertHelpers(assert, application, helperContainer, false);
-}
-
-class HelpersTestCase extends AutobootApplicationTestCase {
-  constructor() {
-    super();
-    this._originalAdapter = getAdapter();
-  }
-
-  teardown() {
-    setAdapter(this._originalAdapter);
-    document.removeEventListener('ajaxSend', incrementPendingRequests);
-    document.removeEventListener('ajaxComplete', decrementPendingRequests);
-    clearPendingRequests();
-    if (this.application) {
-      this.application.removeTestHelpers();
-    }
-    super.teardown();
-  }
-}
-
-class HelpersApplicationTestCase extends HelpersTestCase {
-  constructor() {
-    super();
-    runTask(() => {
-      this.createApplication();
-      this.application.setupForTesting();
-      this.application.injectTestHelpers();
-    });
-  }
-}
-
-if (!jQueryDisabled) {
-  moduleFor(
-    'ember-testing: Helper setup',
-    class extends HelpersTestCase {
-      [`@test Ember.Application#injectTestHelpers/#removeTestHelper`](assert) {
-        runTask(() => {
-          this.createApplication();
-        });
-
-        assertNoHelpers(assert, this.application);
-
-        registerHelper();
-
-        this.application.injectTestHelpers();
-
-        assertHelpers(assert, this.application);
-
-        assert.ok(Test.Promise.prototype.LeakyMcLeakLeak, 'helper in question SHOULD be present');
-
-        this.application.removeTestHelpers();
-
-        assertNoHelpers(assert, this.application);
-
-        assert.equal(
-          Test.Promise.prototype.LeakyMcLeakLeak,
-          undefined,
-          'should NOT leak test promise extensions'
-        );
-      }
-
-      [`@test Ember.Application#setupForTesting`](assert) {
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-
-        let routerInstance = this.applicationInstance.lookup('router:main');
-        assert.equal(routerInstance.location, 'none');
-      }
-
-      [`@test Ember.Application.setupForTesting sets the application to 'testing'`](assert) {
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-
-        assert.equal(this.application.testing, true, 'Application instance is set to testing.');
-      }
-
-      [`@test Ember.Application.setupForTesting leaves the system in a deferred state.`](assert) {
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-
-        assert.equal(
-          this.application._readinessDeferrals,
-          1,
-          'App is in deferred state after setupForTesting.'
-        );
-      }
-
-      [`@test App.reset() after Application.setupForTesting leaves the system in a deferred state.`](
-        assert
-      ) {
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-
-        assert.equal(
-          this.application._readinessDeferrals,
-          1,
-          'App is in deferred state after setupForTesting.'
-        );
-
-        this.application.reset();
-
-        assert.equal(
-          this.application._readinessDeferrals,
-          1,
-          'App is in deferred state after setupForTesting.'
-        );
-      }
-
-      [`@test Ember.Application#injectTestHelpers calls callbacks registered with onInjectHelpers`](
-        assert
-      ) {
-        let injected = 0;
-
-        Test.onInjectHelpers(() => {
-          injected++;
-        });
-
-        // bind(this) so Babel doesn't leak _this
-        // into the context onInjectHelpers.
-        runTask(
-          function () {
-            this.createApplication();
-            this.application.setupForTesting();
-          }.bind(this)
-        );
-
-        assert.equal(injected, 0, 'onInjectHelpers are not called before injectTestHelpers');
-
-        this.application.injectTestHelpers();
-
-        assert.equal(injected, 1, 'onInjectHelpers are called after injectTestHelpers');
-      }
-
-      [`@test Ember.Application#injectTestHelpers adds helpers to provided object.`](assert) {
-        let helpers = {};
-
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-
-        this.application.injectTestHelpers(helpers);
-
-        assertHelpers(assert, this.application, helpers);
-
-        this.application.removeTestHelpers();
-
-        assertNoHelpers(assert, this.application, helpers);
-      }
-
-      [`@test Ember.Application#removeTestHelpers resets the helperContainer's original values`](
-        assert
-      ) {
-        let helpers = { visit: 'snazzleflabber' };
-
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-
-        this.application.injectTestHelpers(helpers);
-
-        assert.notEqual(helpers.visit, 'snazzleflabber', 'helper added to container');
-        this.application.removeTestHelpers();
-
-        assert.equal(helpers.visit, 'snazzleflabber', 'original value added back to container');
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing: Helper methods',
-    class extends HelpersApplicationTestCase {
-      [`@test 'wait' respects registerWaiters`](assert) {
-        assert.expect(3);
-
-        let counter = 0;
-        function waiter() {
-          return ++counter > 2;
-        }
-
-        let other = 0;
-        function otherWaiter() {
-          return ++other > 2;
-        }
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        registerWaiter(waiter);
-        registerWaiter(otherWaiter);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers
-          .wait()
-          .then(() => {
-            assert.equal(waiter(), true, 'should not resolve until our waiter is ready');
-            unregisterWaiter(waiter);
-            counter = 0;
-            return testHelpers.wait();
-          })
-          .then(() => {
-            assert.equal(counter, 0, 'unregistered waiter was not checked');
-            assert.equal(otherWaiter(), true, 'other waiter is still registered');
-          })
-          .finally(() => {
-            unregisterWaiter(otherWaiter);
-          });
-      }
-
-      [`@test 'visit' advances readiness.`](assert) {
-        assert.expect(2);
-
-        assert.equal(
-          this.application._readinessDeferrals,
-          1,
-          'App is in deferred state after setupForTesting.'
-        );
-
-        return this.application.testHelpers.visit('/').then(() => {
-          assert.equal(
-            this.application._readinessDeferrals,
-            0,
-            `App's readiness was advanced by visit.`
-          );
-        });
-      }
-
-      [`@test 'wait' helper can be passed a resolution value`](assert) {
-        assert.expect(4);
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let promiseObjectValue = {};
-        let objectValue = {};
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers
-          .wait('text')
-          .then((val) => {
-            assert.equal(val, 'text', 'can resolve to a string');
-            return testHelpers.wait(1);
-          })
-          .then((val) => {
-            assert.equal(val, 1, 'can resolve to an integer');
-            return testHelpers.wait(objectValue);
-          })
-          .then((val) => {
-            assert.equal(val, objectValue, 'can resolve to an object');
-            return testHelpers.wait(RSVP.resolve(promiseObjectValue));
-          })
-          .then((val) => {
-            assert.equal(val, promiseObjectValue, 'can resolve to a promise resolution value');
-          });
-      }
-
-      [`@test 'click' triggers appropriate events in order`](assert) {
-        assert.expect(5);
-
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            classNames: 'index-wrapper',
-
-            didInsertElement() {
-              let wrapper = document.querySelector('.index-wrapper');
-              wrapper.addEventListener('mousedown', (e) => events.push(e.type));
-              wrapper.addEventListener('mouseup', (e) => events.push(e.type));
-              wrapper.addEventListener('click', (e) => events.push(e.type));
-              wrapper.addEventListener('focusin', (e) => events.push(e.type));
-            },
-          })
-        );
-
-        this.add(
-          'component:x-checkbox',
-          Component.extend({
-            tagName: 'input',
-            attributeBindings: ['type'],
-            type: 'checkbox',
-            click() {
-              events.push('click:' + this.get('checked'));
-            },
-            change() {
-              events.push('change:' + this.get('checked'));
-            },
-          })
-        );
-
-        this.addTemplate(
-          'index',
-          `
-        {{#index-wrapper}}
-          <Input @type="text"/>
-          {{x-checkbox type="checkbox"}}
-          {{textarea}}
-          <div contenteditable="true"> </div>
-        {{/index-wrapper}}'));
-      `
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let events;
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers
-          .wait()
-          .then(() => {
-            events = [];
-            return testHelpers.click('.index-wrapper');
-          })
-          .then(() => {
-            assert.deepEqual(events, ['mousedown', 'mouseup', 'click'], 'fires events in order');
-          })
-          .then(() => {
-            events = [];
-            return testHelpers.click('.index-wrapper input[type=text]');
-          })
-          .then(() => {
-            assert.deepEqual(
-              events,
-              ['mousedown', 'focusin', 'mouseup', 'click'],
-              'fires focus events on inputs'
-            );
-          })
-          .then(() => {
-            events = [];
-            return testHelpers.click('.index-wrapper textarea');
-          })
-          .then(() => {
-            assert.deepEqual(
-              events,
-              ['mousedown', 'focusin', 'mouseup', 'click'],
-              'fires focus events on textareas'
-            );
-          })
-          .then(() => {
-            events = [];
-            return testHelpers.click('.index-wrapper div');
-          })
-          .then(() => {
-            assert.deepEqual(
-              events,
-              ['mousedown', 'focusin', 'mouseup', 'click'],
-              'fires focus events on contenteditable'
-            );
-          })
-          .then(() => {
-            events = [];
-            return testHelpers.click('.index-wrapper input[type=checkbox]');
-          })
-          .then(() => {
-            // i.e. mousedown, mouseup, change:true, click, click:true
-            // Firefox differs so we can't assert the exact ordering here.
-            // See https://bugzilla.mozilla.org/show_bug.cgi?id=843554.
-            assert.equal(events.length, 5, 'fires click and change on checkboxes');
-          });
-      }
-
-      [`@test 'click' triggers native events with simulated X/Y coordinates`](assert) {
-        assert.expect(15);
-
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            classNames: 'index-wrapper',
-
-            didInsertElement() {
-              let pushEvent = (e) => events.push(e);
-              this.element.addEventListener('mousedown', pushEvent);
-              this.element.addEventListener('mouseup', pushEvent);
-              this.element.addEventListener('click', pushEvent);
-            },
-          })
-        );
-
-        this.addTemplate(
-          'index',
-          `
-        {{#index-wrapper}}some text{{/index-wrapper}}
-      `
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let events;
-        let {
-          application: {
-            testHelpers: { wait, click },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            events = [];
-            return click('.index-wrapper');
-          })
-          .then(() => {
-            events.forEach((e) => {
-              assert.ok(e instanceof window.Event, 'The event is an instance of MouseEvent');
-              assert.ok(typeof e.screenX === 'number', 'screenX is correct');
-              assert.ok(typeof e.screenY === 'number', 'screenY is correct');
-              assert.ok(typeof e.clientX === 'number', 'clientX is correct');
-              assert.ok(typeof e.clientY === 'number', 'clientY is correct');
-            });
-          });
-      }
-
-      [`@test 'triggerEvent' with mouseenter triggers native events with simulated X/Y coordinates`](
-        assert
-      ) {
-        assert.expect(5);
-
-        let evt;
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            classNames: 'index-wrapper',
-            didInsertElement() {
-              this.element.addEventListener('mouseenter', (e) => (evt = e));
-            },
-          })
-        );
-
-        this.addTemplate('index', `{{#index-wrapper}}some text{{/index-wrapper}}`);
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { wait, triggerEvent },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            return triggerEvent('.index-wrapper', 'mouseenter');
-          })
-          .then(() => {
-            assert.ok(evt instanceof window.Event, 'The event is an instance of MouseEvent');
-            assert.ok(typeof evt.screenX === 'number', 'screenX is correct');
-            assert.ok(typeof evt.screenY === 'number', 'screenY is correct');
-            assert.ok(typeof evt.clientX === 'number', 'clientX is correct');
-            assert.ok(typeof evt.clientY === 'number', 'clientY is correct');
-          });
-      }
-
-      [`@test 'wait' waits for outstanding timers`](assert) {
-        assert.expect(1);
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let waitDone = false;
-        later(() => {
-          waitDone = true;
-        }, 20);
-
-        return this.application.testHelpers.wait().then(() => {
-          assert.equal(waitDone, true, 'should wait for the timer to be fired.');
-        });
-      }
-
-      [`@test 'wait' respects registerWaiters with optional context`](assert) {
-        assert.expect(3);
-
-        let obj = {
-          counter: 0,
-          ready() {
-            return ++this.counter > 2;
-          },
-        };
-
-        let other = 0;
-        function otherWaiter() {
-          return ++other > 2;
-        }
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        registerWaiter(obj, obj.ready);
-        registerWaiter(otherWaiter);
-
-        let {
-          application: {
-            testHelpers: { wait },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            assert.equal(obj.ready(), true, 'should not resolve until our waiter is ready');
-            unregisterWaiter(obj, obj.ready);
-            obj.counter = 0;
-            return wait();
-          })
-          .then(() => {
-            assert.equal(obj.counter, 0, 'the unregistered waiter should still be at 0');
-            assert.equal(otherWaiter(), true, 'other waiter should still be registered');
-          })
-          .finally(() => {
-            unregisterWaiter(otherWaiter);
-          });
-      }
-
-      [`@test 'wait' does not error if routing has not begun`](assert) {
-        assert.expect(1);
-
-        return this.application.testHelpers.wait().then(() => {
-          assert.ok(true, 'should not error without `visit`');
-        });
-      }
-
-      [`@test 'triggerEvent' accepts an optional options hash without context`](assert) {
-        assert.expect(3);
-
-        let event;
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            didInsertElement() {
-              let domElem = document.querySelector('.input');
-              domElem.addEventListener('change', (e) => (event = e));
-              domElem.addEventListener('keydown', (e) => (event = e));
-            },
-          })
-        );
-
-        this.addTemplate('index', `{{index-wrapper}}`);
-        this.addTemplate(
-          'components/index-wrapper',
-          `
-        <Input @type="text" id="scope" class="input"/>
-      `
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { wait, triggerEvent },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            return triggerEvent('.input', 'keydown', { keyCode: 13 });
-          })
-          .then(() => {
-            assert.equal(event.keyCode, 13, 'options were passed');
-            assert.equal(event.type, 'keydown', 'correct event was triggered');
-            assert.equal(
-              event.target.getAttribute('id'),
-              'scope',
-              'triggered on the correct element'
-            );
-          });
-      }
-
-      [`@test 'triggerEvent' can limit searching for a selector to a scope`](assert) {
-        assert.expect(2);
-
-        let event;
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            didInsertElement() {
-              let firstInput = document.querySelector('.input');
-              firstInput.addEventListener('blur', (e) => (event = e));
-              firstInput.addEventListener('change', (e) => (event = e));
-              let secondInput = document.querySelector('#limited .input');
-              secondInput.addEventListener('blur', (e) => (event = e));
-              secondInput.addEventListener('change', (e) => (event = e));
-            },
-          })
-        );
-
-        this.addTemplate(
-          'components/index-wrapper',
-          `
-        <Input @type="text" id="outside-scope" class="input"/>
-        <div id="limited">
-          <Input @type="text" id="inside-scope" class="input"/>
-        </div>
-      `
-        );
-        this.addTemplate('index', `{{index-wrapper}}`);
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { wait, triggerEvent },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            return triggerEvent('.input', '#limited', 'blur');
-          })
-          .then(() => {
-            assert.equal(event.type, 'blur', 'correct event was triggered');
-            assert.equal(
-              event.target.getAttribute('id'),
-              'inside-scope',
-              'triggered on the correct element'
-            );
-          });
-      }
-
-      [`@test 'triggerEvent' can be used to trigger arbitrary events`](assert) {
-        assert.expect(2);
-
-        let event;
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            didInsertElement() {
-              let foo = document.getElementById('foo');
-              foo.addEventListener('blur', (e) => (event = e));
-              foo.addEventListener('change', (e) => (event = e));
-            },
-          })
-        );
-
-        this.addTemplate(
-          'components/index-wrapper',
-          `
-        <Input @type="text" id="foo"/>
-      `
-        );
-        this.addTemplate('index', `{{index-wrapper}}`);
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { wait, triggerEvent },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            return triggerEvent('#foo', 'blur');
-          })
-          .then(() => {
-            assert.equal(event.type, 'blur', 'correct event was triggered');
-            assert.equal(
-              event.target.getAttribute('id'),
-              'foo',
-              'triggered on the correct element'
-            );
-          });
-      }
-
-      [`@test 'fillIn' takes context into consideration`](assert) {
-        assert.expect(2);
-
-        this.addTemplate(
-          'index',
-          `<div id="parent">
-            <Input @type="text" id="first" class="current"/>
-          </div>
-          <Input @type="text" id="second" class="current"/>`
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { visit, fillIn, andThen, find },
-          },
-        } = this;
-        visit('/');
-        fillIn('.current', '#parent', 'current value');
-
-        return andThen(() => {
-          assert.equal(find('#first')[0].value, 'current value');
-          assert.equal(find('#second')[0].value, '');
-        });
-      }
-
-      [`@test 'fillIn' focuses on the element`](assert) {
-        let wasFocused = false;
-
-        this.add(
-          'controller:index',
-          Controller.extend({
-            wasFocused: action(function () {
-              wasFocused = true;
-            }),
-          })
-        );
-
-        this.addTemplate(
-          'index',
-          `<div id="parent">
-            <Input @type="text" id="first" {{on "focusin" this.wasFocused}}/>
-          </div>'`
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { visit, fillIn, andThen, find, wait },
-          },
-        } = this;
-        visit('/');
-        fillIn('#first', 'current value');
-        andThen(() => {
-          assert.ok(wasFocused, 'focusIn event was triggered');
-
-          assert.equal(find('#first')[0].value, 'current value');
-        });
-
-        return wait();
-      }
-
-      [`@test 'fillIn' fires 'input' and 'change' events in the proper order`](assert) {
-        assert.expect(1);
-
-        let events = [];
-        this.add(
-          'controller:index',
-          Controller.extend({
-            actions: {
-              oninputHandler(e) {
-                events.push(e.type);
-              },
-              onchangeHandler(e) {
-                events.push(e.type);
-              },
-            },
-          })
-        );
-
-        this.addTemplate(
-          'index',
-          `<input type="text" id="first"
-            oninput={{action "oninputHandler"}}
-            onchange={{action "onchangeHandler"}}>`
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { visit, fillIn, andThen, wait },
-          },
-        } = this;
-
-        visit('/');
-        fillIn('#first', 'current value');
-        andThen(() => {
-          assert.deepEqual(
-            events,
-            ['input', 'change'],
-            '`input` and `change` events are fired in the proper order'
-          );
-        });
-
-        return wait();
-      }
-
-      [`@test 'fillIn' only sets the value in the first matched element`](assert) {
-        this.addTemplate(
-          'index',
-          `
-        <input type="text" id="first" class="in-test">
-        <input type="text" id="second" class="in-test">
-      `
-        );
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { visit, fillIn, find, andThen, wait },
-          },
-        } = this;
-
-        visit('/');
-        fillIn('input.in-test', 'new value');
-        andThen(() => {
-          assert.equal(find('#first')[0].value, 'new value');
-          assert.equal(find('#second')[0].value, '');
-        });
-
-        return wait();
-      }
-
-      [`@test 'triggerEvent' accepts an optional options hash and context`](assert) {
-        assert.expect(3);
-
-        let event;
-        this.add(
-          'component:index-wrapper',
-          Component.extend({
-            didInsertElement() {
-              let firstInput = document.querySelector('.input');
-              firstInput.addEventListener('keydown', (e) => (event = e), false);
-              firstInput.addEventListener('change', (e) => (event = e), false);
-              let secondInput = document.querySelector('#limited .input');
-              secondInput.addEventListener('keydown', (e) => (event = e), false);
-              secondInput.addEventListener('change', (e) => (event = e), false);
-            },
-          })
-        );
-
-        this.addTemplate(
-          'components/index-wrapper',
-          `
-        <Input @type="text" id="outside-scope" class="input"/>
-        <div id="limited">
-          <Input @type="text" id="inside-scope" class="input"/>
-        </div>
-      `
-        );
-        this.addTemplate('index', `{{index-wrapper}}`);
-
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-
-        let {
-          application: {
-            testHelpers: { wait, triggerEvent },
-          },
-        } = this;
-        return wait()
-          .then(() => {
-            return triggerEvent('.input', '#limited', 'keydown', {
-              keyCode: 13,
-            });
-          })
-          .then(() => {
-            assert.equal(event.keyCode, 13, 'options were passed');
-            assert.equal(event.type, 'keydown', 'correct event was triggered');
-            assert.equal(
-              event.target.getAttribute('id'),
-              'inside-scope',
-              'triggered on the correct element'
-            );
-          });
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing: debugging helpers',
-    class extends HelpersApplicationTestCase {
-      afterEach() {
-        super.afterEach();
-        setDebugFunction('info', originalInfo);
-      }
-
-      constructor() {
-        super();
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-      }
-
-      [`@test pauseTest pauses`](assert) {
-        assert.expect(1);
-        // overwrite info to suppress the console output (see https://github.com/emberjs/ember.js/issues/16391)
-        setDebugFunction('info', noop);
-
-        let { andThen, pauseTest } = this.application.testHelpers;
-
-        andThen(() => {
-          Test.adapter.asyncStart = () => {
-            assert.ok(true, 'Async start should be called after waiting for other helpers');
-          };
-        });
-
-        pauseTest();
-      }
-
-      [`@test resumeTest resumes paused tests`](assert) {
-        assert.expect(1);
-        // overwrite info to suppress the console output (see https://github.com/emberjs/ember.js/issues/16391)
-        setDebugFunction('info', noop);
-
-        let {
-          application: {
-            testHelpers: { pauseTest, resumeTest },
-          },
-        } = this;
-
-        later(() => resumeTest(), 20);
-        return pauseTest().then(() => {
-          assert.ok(true, 'pauseTest promise was resolved');
-        });
-      }
-
-      [`@test resumeTest throws if nothing to resume`](assert) {
-        assert.expect(1);
-
-        assert.throws(() => {
-          this.application.testHelpers.resumeTest();
-        }, /Testing has not been paused. There is nothing to resume./);
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing: routing helpers',
-    class extends HelpersTestCase {
-      constructor() {
-        super();
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-          this.application.injectTestHelpers();
-          this.router.map(function () {
-            this.route('posts', { resetNamespace: true }, function () {
-              this.route('new');
-              this.route('edit', { resetNamespace: true });
-            });
-          });
-        });
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-      }
-
-      [`@test currentRouteName for '/'`](assert) {
-        assert.expect(3);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers.visit('/').then(() => {
-          assert.equal(testHelpers.currentRouteName(), 'index', `should equal 'index'.`);
-          assert.equal(testHelpers.currentPath(), 'index', `should equal 'index'.`);
-          assert.equal(testHelpers.currentURL(), '/', `should equal '/'.`);
-        });
-      }
-
-      [`@test currentRouteName for '/posts'`](assert) {
-        assert.expect(3);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers.visit('/posts').then(() => {
-          assert.equal(
-            testHelpers.currentRouteName(),
-            'posts.index',
-            `should equal 'posts.index'.`
-          );
-          assert.equal(testHelpers.currentPath(), 'posts.index', `should equal 'posts.index'.`);
-          assert.equal(testHelpers.currentURL(), '/posts', `should equal '/posts'.`);
-        });
-      }
-
-      [`@test currentRouteName for '/posts/new'`](assert) {
-        assert.expect(3);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers.visit('/posts/new').then(() => {
-          assert.equal(testHelpers.currentRouteName(), 'posts.new', `should equal 'posts.new'.`);
-          assert.equal(testHelpers.currentPath(), 'posts.new', `should equal 'posts.new'.`);
-          assert.equal(testHelpers.currentURL(), '/posts/new', `should equal '/posts/new'.`);
-        });
-      }
-
-      [`@test currentRouteName for '/posts/edit'`](assert) {
-        assert.expect(3);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers.visit('/posts/edit').then(() => {
-          assert.equal(testHelpers.currentRouteName(), 'edit', `should equal 'edit'.`);
-          assert.equal(testHelpers.currentPath(), 'posts.edit', `should equal 'posts.edit'.`);
-          assert.equal(testHelpers.currentURL(), '/posts/edit', `should equal '/posts/edit'.`);
-        });
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing: pendingRequests',
-    class extends HelpersApplicationTestCase {
-      trigger(type, xhr) {
-        jQuery(document).trigger(type, xhr);
-      }
-
-      [`@test pendingRequests is maintained for ajaxSend and ajaxComplete events`](assert) {
-        let done = assert.async();
-        assert.equal(pendingRequests(), 0);
-
-        let xhr = { some: 'xhr' };
-
-        this.trigger('ajaxSend', xhr);
-        assert.equal(pendingRequests(), 1, 'Ember.Test.pendingRequests was incremented');
-
-        this.trigger('ajaxComplete', xhr);
-        setTimeout(function () {
-          assert.equal(pendingRequests(), 0, 'Ember.Test.pendingRequests was decremented');
-          done();
-        }, 0);
-      }
-
-      [`@test pendingRequests is ignores ajaxComplete events from past setupForTesting calls`](
-        assert
-      ) {
-        assert.equal(pendingRequests(), 0);
-
-        let xhr = { some: 'xhr' };
-
-        this.trigger('ajaxSend', xhr);
-        assert.equal(pendingRequests(), 1, 'Ember.Test.pendingRequests was incremented');
-
-        setupForTesting();
-
-        assert.equal(pendingRequests(), 0, 'Ember.Test.pendingRequests was reset');
-
-        let altXhr = { some: 'more xhr' };
-
-        this.trigger('ajaxSend', altXhr);
-        assert.equal(pendingRequests(), 1, 'Ember.Test.pendingRequests was incremented');
-
-        this.trigger('ajaxComplete', xhr);
-        assert.equal(
-          pendingRequests(),
-          1,
-          'Ember.Test.pendingRequests is not impressed with your unexpected complete'
-        );
-      }
-
-      [`@test pendingRequests is reset by setupForTesting`](assert) {
-        incrementPendingRequests();
-
-        setupForTesting();
-
-        assert.equal(pendingRequests(), 0, 'pendingRequests is reset');
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing: async router',
-    class extends HelpersTestCase {
-      constructor() {
-        super();
-
-        runTask(() => {
-          this.createApplication();
-
-          this.router.map(function () {
-            this.route('user', { resetNamespace: true }, function () {
-              this.route('profile');
-              this.route('edit');
-            });
-          });
-
-          // Emulate a long-running unscheduled async operation.
-          let resolveLater = () =>
-            new RSVP.Promise((resolve) => {
-              /*
-               * The wait() helper has a 10ms tick. We should resolve() after
-               * at least one tick to test whether wait() held off while the
-               * async router was still loading. 20ms should be enough.
-               */
-              later(resolve, { firstName: 'Tom' }, 20);
-            });
-
-          this.add(
-            'route:user',
-            Route.extend({
-              model() {
-                return resolveLater();
-              },
-            })
-          );
-
-          this.add(
-            'route:user.profile',
-            Route.extend({
-              beforeModel() {
-                return resolveLater().then(() => {
-                  return expectDeprecation(() => {
-                    return this.transitionTo('user.edit');
-                  }, /Calling transitionTo on a route is deprecated/);
-                });
-              },
-            })
-          );
-
-          this.application.setupForTesting();
-        });
-
-        this.application.injectTestHelpers();
-        runTask(() => {
-          this.application.advanceReadiness();
-        });
-      }
-
-      [`@test currentRouteName for '/user'`](assert) {
-        assert.expect(4);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers.visit('/user').then(() => {
-          assert.equal(testHelpers.currentRouteName(), 'user.index', `should equal 'user.index'.`);
-          assert.equal(testHelpers.currentPath(), 'user.index', `should equal 'user.index'.`);
-          assert.equal(testHelpers.currentURL(), '/user', `should equal '/user'.`);
-          let userRoute = this.applicationInstance.lookup('route:user');
-          assert.equal(userRoute.get('controller.model.firstName'), 'Tom', `should equal 'Tom'.`);
-        });
-      }
-
-      [`@test currentRouteName for '/user/profile'`](assert) {
-        assert.expect(5);
-
-        let {
-          application: { testHelpers },
-        } = this;
-        return testHelpers.visit('/user/profile').then(() => {
-          assert.equal(testHelpers.currentRouteName(), 'user.edit', `should equal 'user.edit'.`);
-          assert.equal(testHelpers.currentPath(), 'user.edit', `should equal 'user.edit'.`);
-          assert.equal(testHelpers.currentURL(), '/user/edit', `should equal '/user/edit'.`);
-          let userRoute = this.applicationInstance.lookup('route:user');
-          assert.equal(userRoute.get('controller.model.firstName'), 'Tom', `should equal 'Tom'.`);
-        });
-      }
-    }
-  );
-
-  moduleFor(
-    'ember-testing: can override built-in helpers',
-    class extends HelpersTestCase {
-      constructor() {
-        super();
-        runTask(() => {
-          this.createApplication();
-          this.application.setupForTesting();
-        });
-        this._originalVisitHelper = Test._helpers.visit;
-        this._originalFindHelper = Test._helpers.find;
-      }
-
-      teardown() {
-        Test._helpers.visit = this._originalVisitHelper;
-        Test._helpers.find = this._originalFindHelper;
-        super.teardown();
-      }
-
-      [`@test can override visit helper`](assert) {
-        assert.expect(1);
-
-        Test.registerHelper('visit', () => {
-          assert.ok(true, 'custom visit helper was called');
-        });
-
-        this.application.injectTestHelpers();
-
-        return this.application.testHelpers.visit();
-      }
-
-      [`@test can override find helper`](assert) {
-        assert.expect(1);
-
-        Test.registerHelper('find', () => {
-          assert.ok(true, 'custom find helper was called');
-
-          return ['not empty array'];
-        });
-
-        this.application.injectTestHelpers();
-
-        return this.application.testHelpers.findWithAssert('.who-cares');
-      }
-    }
-  );
-}
diff --git a/packages/ember-testing/tests/integration_test.js b/packages/ember-testing/tests/integration_test.js
deleted file mode 100644
index 0256518968c..00000000000
--- a/packages/ember-testing/tests/integration_test.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
-import Test from '../lib/test';
-
-import { A as emberA } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
-import { jQueryDisabled } from '@ember/-internals/views';
-
-moduleFor(
-  'ember-testing Integration tests of acceptance',
-  class extends AutobootApplicationTestCase {
-    constructor() {
-      super();
-
-      this.modelContent = [];
-      this._originalAdapter = Test.adapter;
-
-      runTask(() => {
-        this.createApplication();
-
-        this.addTemplate(
-          'people',
-          `
-          <div>
-            {{#each @model as |person|}}
-              <div class="name">{{person.firstName}}</div>
-            {{/each}}
-          </div>
-          `
-        );
-
-        this.router.map(function () {
-          this.route('people', { path: '/' });
-        });
-
-        this.add(
-          'route:people',
-          Route.extend({
-            model: () => this.modelContent,
-          })
-        );
-
-        this.application.setupForTesting();
-      });
-
-      runTask(() => {
-        this.application.reset();
-      });
-
-      this.application.injectTestHelpers();
-    }
-
-    teardown() {
-      super.teardown();
-      Test.adapter = this._originalAdapter;
-    }
-
-    [`@test template is bound to empty array of people`](assert) {
-      if (!jQueryDisabled) {
-        runTask(() => this.application.advanceReadiness());
-        window.visit('/').then(() => {
-          let rows = window.find('.name').length;
-          assert.equal(rows, 0, 'successfully stubbed an empty array of people');
-        });
-      } else {
-        runTask(() => this.application.advanceReadiness());
-        window.visit('/').then(() => {
-          expectAssertion(
-            () => window.find('.name'),
-            'If jQuery is disabled, please import and use helpers from @ember/test-helpers [https://github.com/emberjs/ember-test-helpers]. Note: `find` is not an available helper.'
-          );
-        });
-      }
-    }
-
-    [`@test template is bound to array of 2 people`](assert) {
-      if (!jQueryDisabled) {
-        this.modelContent = emberA([]);
-        this.modelContent.pushObject({ firstName: 'x' });
-        this.modelContent.pushObject({ firstName: 'y' });
-
-        runTask(() => this.application.advanceReadiness());
-        window.visit('/').then(() => {
-          let rows = window.find('.name').length;
-          assert.equal(rows, 2, 'successfully stubbed a non empty array of people');
-        });
-      } else {
-        assert.expect(0);
-      }
-    }
-
-    [`@test 'visit' can be called without advanceReadiness.`](assert) {
-      if (!jQueryDisabled) {
-        window.visit('/').then(() => {
-          let rows = window.find('.name').length;
-          assert.equal(
-            rows,
-            0,
-            'stubbed an empty array of people without calling advanceReadiness.'
-          );
-        });
-      } else {
-        assert.expect(0);
-      }
-    }
-  }
-);
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index efbb3376ffc..4bda343c9a2 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -217,14 +217,12 @@ module.exports = {
     'extend',
     'factoryFor',
     'fallback',
-    'fillIn',
     'filter',
     'filterBy',
     'finally',
     'find',
     'findBy',
     'findModel',
-    'findWithAssert',
     'firstObject',
     'flushWatchers',
     'fn',
@@ -331,7 +329,6 @@ module.exports = {
     'join',
     'jQuery',
     'keyDown',
-    'keyEvent',
     'keyPress',
     'keyUp',
     'knownForType',
@@ -543,7 +540,6 @@ module.exports = {
     'teardownViews',
     'templateName',
     'templateOnly',
-    'testCheckboxClick',
     'testHelpers',
     'testing',
     'textarea',
@@ -561,7 +557,6 @@ module.exports = {
     'translateToContainerFullname',
     'trigger',
     'triggerAction',
-    'triggerEvent',
     'trySet',
     'type',
     'typeInjection',
diff --git a/yarn.lock b/yarn.lock
index 872fa81464b..5ec8b04f36c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -955,6 +955,8 @@
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
   integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-transform-for-of@^7.9.0":
   version "7.9.0"
@@ -1579,55 +1581,48 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.79.4.tgz#746909c5f01ad57efec15da79567b515d1e3a6b0"
-  integrity sha512-aXTows4Kjbutp6BV18oQTFaJjIkX5+hQ25KVETK/5zla/rC9O0DQHGb2r8DDfx4DiJLXGdl4g2VLy/BfkYmcwA==
+"@glimmer/compiler@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.0.tgz#f825b2d5b55500c0a695f076c7a2fdd312a1e94e"
+  integrity sha512-oz72cvjNHXpKY1i9aJBiLQSkmqW1zbCGc1J/gIGTXeMC5tdJlDXve22eS2ZkNWI41ai3ClzpA0hIz5ju7qO8zw==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/syntax" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/wire-format" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/syntax" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/wire-format" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.79.4.tgz#23a3a13a50063aefb2fa169feae79a373c9132bf"
-  integrity sha512-qpaglWv+GKlcm28MZvYemWTZV3kSlOKPc7kluRqXvoo7oqQdBEagm60XivMpxJUEf+A5YXsJ/Atty+r58eVvQg==
+"@glimmer/destroyable@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.0.tgz#48e6b3d01176b11d1025ccea1429e5d4a3303ee2"
+  integrity sha512-deyxvtKZZJtlo8bs5iiTtUgDT5K1LTzQM7HtgpOFUOsHU3O9dGtCIPQjIqE92H+BfT7UwOlhC3xcfyDhUALA+w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.4"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
-"@glimmer/encoder@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.79.4.tgz#2e2e7da3f80f21732f7ed0003c391caf4b42acfe"
-  integrity sha512-qqyW/TWVK1RP/zEVq0NU2EvOViftVyB43BB7y2yVyb+qD3gK0weP1InwPp1tyNUF7B6LHAcd64d4pN29Qj3vHw==
+"@glimmer/encoder@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.0.tgz#f529f525b44a94939b01e99c562e206bd9833df1"
+  integrity sha512-nCyF14OIRVixchzo0AML/TkpJV2znbYcFacUwJO67cVIMY/f14614fp63ipAHPcU+1AogIORAPT1wyUXbKcaaQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/vm" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/vm" "0.80.0"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.79.4.tgz#2d683a457aba7c340a3e850fdcf8a35fbcd8308e"
-  integrity sha512-Hn6KS7QUV63oMbop1LVOfPZ3KISzq4xMASjP+xrMzLIugvjBYYB+WoarUJcG7eB+TioOo0OMyVFibSP8ZTO2TQ==
+"@glimmer/global-context@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.0.tgz#09a0620e6625cc152769d9799dbb2f2d135959e3"
+  integrity sha512-1myqwTbsLdwP3MbYeLzBqPUMsUCqv+WxaLobHhWTo/dInF8SOyzzL9Dzox/TiqXydZx/w6sGfg9/a0g+MY5cxg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.79.4.tgz#3213e7fe73f35340762bef7f4e8c8df593a4a8c8"
-  integrity sha512-cyNZlRa7aXAfXY9kk7hhnWgL1R7Zw8wwi2UVEWq2nBanmpNmL1lSMJ6nY8oRIWCtWrYA9CeH7RZ6mVP5cQ/v2w==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/interfaces@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.0.tgz#eabc7551ffe7ad27c44ba96d39e2af6ebf01c942"
@@ -1640,48 +1635,41 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.79.4.tgz#82cefd85d503c5a3c40389f3c869a8abbf273648"
-  integrity sha512-SCSrBEdu/JvTEFPvgkDu3kaRgJrJHrhAdB2WAoevNb8bMMhADxRPTVSfYDFL/6+eQtx6krcycVeeaCLjhZ2LNA==
+"@glimmer/manager@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.0.tgz#07eae00d0846ca1c44307ab0a03a6f6ebbe63065"
+  integrity sha512-rnRR1PQgqdmuKA/Lz9iVjhSK437Yws43QtfllCoUAPjlzqekJyR0oZiozlih+b3NSHhhU1hZhr2Xoo7lzhsyjQ==
   dependencies:
-    "@glimmer/destroyable" "0.79.4"
+    "@glimmer/destroyable" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/reference" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/validator" "0.79.4"
-
-"@glimmer/node@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.79.4.tgz#734ed99979fe8c396af3c356c0a5d5eee835d552"
-  integrity sha512-EDv/PkLGf92aFc7J8qKtBUd6ewxC5udntN6Syj0VHJ2MQeikVJWyZHwJbZP5+VUw8AbjuSKPc0Nt8G37Y2xtug==
-  dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/runtime" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/reference" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/validator" "0.80.0"
+
+"@glimmer/node@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.0.tgz#afdd6acdd73f70b88a8e78e79f592139912047ce"
+  integrity sha512-wm3bSiWBljW5UwUII2MKu1GOLkaRha66c8RryiGP97uP0EriMXAUj9kAnhur+/oG15ME+Vp65zwx1nCVeXshYA==
+  dependencies:
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/runtime" "0.80.0"
+    "@glimmer/util" "0.80.0"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.79.4.tgz#c5dffda71216909a8b17d9ff3223a82ef018dde9"
-  integrity sha512-K/29Wvy5nzo3deLGVZhoziznLsd8+psKhA8SO2zpS7a1a7HCSAL8SvXUZFsdsUZSU0gBmCPmw+sXSkyZTpu5CA==
+"@glimmer/opcode-compiler@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.0.tgz#adb6bf7cf374b09d48a2f7365a3d4c80f1944a14"
+  integrity sha512-lvRZ0QCmbsp72u6EKpo1H3LVhq2oKLEGWj7SuIgexnLoVQvPWMfTvGHnh08XOAIAkp15LlVB240V9RWfz0T8yw==
   dependencies:
-    "@glimmer/encoder" "0.79.4"
+    "@glimmer/encoder" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/reference" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/vm" "0.79.4"
-    "@glimmer/wire-format" "0.79.4"
-
-"@glimmer/owner@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.79.4.tgz#ebb300eaf23986c94705cbff8c4415ed1eaad9e9"
-  integrity sha512-6w24OglbMeib1xJVxOnTBoiCQbeLtDLDSzisn9z3o6+Iv3NCMzylyjv25JU9TqJydEPftDG/An/h/Aswb8iEFw==
-  dependencies:
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/reference" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/vm" "0.80.0"
+    "@glimmer/wire-format" "0.80.0"
 
 "@glimmer/owner@0.80.0":
   version "0.80.0"
@@ -1690,67 +1678,58 @@
   dependencies:
     "@glimmer/util" "0.80.0"
 
-"@glimmer/program@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.79.4.tgz#80cfda3261388caeeb66ccc46fac469d2e788b71"
-  integrity sha512-8wvhs7xUTdbAtG+oV19PKSFsyFujnRjl4gPs76Pr7GLHX25XOBhGxL8TptPm0JShxuvB2TMZrBwMGc3rhe402g==
+"@glimmer/program@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.0.tgz#5bcc2709757c36127568993a61e842351814b67e"
+  integrity sha512-gp9Lmctp5ECkb7o7fvwN40cusH1Wr/cD7x0IKg3bDFeXuYGc/nUEBlZoU3jMMlGgHjW5b4Mo6LiGkOOK3QWSCA==
   dependencies:
-    "@glimmer/encoder" "0.79.4"
+    "@glimmer/encoder" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/manager" "0.79.4"
-    "@glimmer/opcode-compiler" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/manager" "0.80.0"
+    "@glimmer/opcode-compiler" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
-"@glimmer/reference@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.79.4.tgz#3d9fcf5e57c63583da14f243128a3195f650e568"
-  integrity sha512-neCaUe9vqc/zGj1kNdm1ssHQ/9icC0BJd8xjYf6vAjiJ/TKEL+u+PfL8H8zqdWAK2al5zekNlhHFY55NxzX8bQ==
+"@glimmer/reference@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.0.tgz#a69d4c43d2d85fc4b840e8a56a77b4480bac5774"
+  integrity sha512-Yn2RLZEWPctbSLeJRiML7DO5wAOrQCfYy4WV5YuHg4JujE7aMoYLeBFNgbGmWcAmBYZjIjVeF1/Qr2USiT3FKA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.4"
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/validator" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/validator" "0.80.0"
 
-"@glimmer/runtime@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.79.4.tgz#188044848721f710859c35eecec15293b8c98bba"
-  integrity sha512-jacyHy7zQ39kR6c4BvPUXpnNDSybnFpFplnhsa0Fr8IqnXRTKqNv1KdfBwdbbPQNaojuV6vyWoh0jPErkcgh0w==
+"@glimmer/runtime@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.0.tgz#ddf344cca65934e283edfcad002729315623c3b7"
+  integrity sha512-tAlbowztTW18jzOPwOhZiSPAwCL5VVVBHb+dC7cArosLudvDBqVWK7dD7AM3NX7N9Ru3NoCsis9Ql0zYI7tFGA==
   dependencies:
-    "@glimmer/destroyable" "0.79.4"
+    "@glimmer/destroyable" "0.80.0"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.79.4"
-    "@glimmer/interfaces" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
+    "@glimmer/interfaces" "0.80.0"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.79.4"
-    "@glimmer/program" "0.79.4"
-    "@glimmer/reference" "0.79.4"
-    "@glimmer/util" "0.79.4"
-    "@glimmer/validator" "0.79.4"
-    "@glimmer/vm" "0.79.4"
-    "@glimmer/wire-format" "0.79.4"
+    "@glimmer/owner" "0.80.0"
+    "@glimmer/program" "0.80.0"
+    "@glimmer/reference" "0.80.0"
+    "@glimmer/util" "0.80.0"
+    "@glimmer/validator" "0.80.0"
+    "@glimmer/vm" "0.80.0"
+    "@glimmer/wire-format" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.79.4.tgz#5aa21d4b3918238c24da3d640abc3b66150fc0c6"
-  integrity sha512-NiMIoW2G0+sBfLYnvDaZ8o8Ul/3P/ezOT8U7ZvsHDGU5hXM2buFozyoSKLILTvAQ56izdfK9fKCsn0oi4ISx3w==
+"@glimmer/syntax@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.0.tgz#5f9c2e5824fdc8f88ec3e71861598c339b6777c1"
+  integrity sha512-LP8I5MmcguUiHhahyF96dgjKrPE6l1QVl2rlJY23FkzPSVMtUAQxNsxHPZ7vqi+gu7wucNiOfIPNTh9avOr20Q==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.79.4.tgz#4762ed9b231482470cb9763332097d50042f9bde"
-  integrity sha512-n2lEGzM9khM43HmKlig2lG5L5cHoL4tFzW21CZzmhMfc1IDCqHuP7s7924OsXSbLT1WB7B9sm/ZhnEj2nd+GiQ==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.79.4"
-    "@simple-dom/interface" "^1.4.0"
-
 "@glimmer/util@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.0.tgz#286ec9e2c8c9e2f364e49272a3baf9d0fe3dc40c"
@@ -1760,36 +1739,36 @@
     "@glimmer/interfaces" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.79.4.tgz#35bc9c6b88d0681b372f1fba3969e6385465b8d7"
-  integrity sha512-VLT9TozD3n3qwX9hOECn/d2Ig8PTn0Gl1FdiEpb04tldXWY0YL6oSoLEjH97R4KNqvati2jFQOOzyinzu9Ffkw==
+"@glimmer/validator@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.0.tgz#f93c221a681809e5e45451e21d58ad0a819a38c0"
+  integrity sha512-qjKKvHaxp7jT978FM1Ifa4aur/W1osPRrMFahQH5LjwMQEdLdk3OSyuxfTY6nTArnK0YJWJZPScrRD0lS2Wy9Q==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.79.4"
+    "@glimmer/global-context" "0.80.0"
 
-"@glimmer/vm-babel-plugins@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.79.4.tgz#317b9b85752abab903674b959ed9e00e1942ae23"
-  integrity sha512-LEdgx6QXOAm+88TxgrvWvkUc6J6jPKmnMzW3IAiD7aIHasSl+/aKfZF0x3ICHyCXGaJGWI00mVKxd2n61aAY9g==
+"@glimmer/vm-babel-plugins@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5"
+  integrity sha512-ZW6+L+FzjDZngGj87zn3MRRA/MrchC7Con33mCcI36v8u48maheB351uhQe+fBVU300IfyzNMvAdwdVKS5VIFw==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.79.4.tgz#1d0f00909c6b97b99d7c8bb11d1e7b958822dbd3"
-  integrity sha512-enCXJlypgMTxWUupQWCPUvE41Gh4vsCIWVhqdh6ol+QGzRZBGvfXTz5xu5lTKPJQhFQsTn2ecVTKKVhqMOtzpA==
+"@glimmer/vm@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.0.tgz#435a8d846e7e6066c018018a71be403520e9b577"
+  integrity sha512-1oSNmMXS83o/+SO1dW1rdm6hHH5ZbCfZt0mrY4+UHFHnlt8RH24z4YN36kjBVczCX1DhZJOYUrwwE4FKBjKdaQ==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
-"@glimmer/wire-format@0.79.4":
-  version "0.79.4"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.79.4.tgz#4074b1194650909e295c349e75d2cebb8a03c8bd"
-  integrity sha512-QuGfVIX1ziyFDPzJaKZnbgyhzzz5a8s/B+xYg5ZEhMo5BHuyL1a3Gw+0qUMCPlVUIX0Uv+VWvI7NF9tH/ykiZA==
+"@glimmer/wire-format@0.80.0":
+  version "0.80.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.0.tgz#bea3da7973a6a70611bf45cfc15592dbec132091"
+  integrity sha512-DAUEqUxq0ymuzRStw51DMhTrRZdCBVPZ7K63YFLRud3pojaApWxgeOFlsLua9nRqR6wYSSKS0y2E0n0tPnRndA==
   dependencies:
-    "@glimmer/interfaces" "0.79.4"
-    "@glimmer/util" "0.79.4"
+    "@glimmer/interfaces" "0.80.0"
+    "@glimmer/util" "0.80.0"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
@@ -5232,6 +5211,9 @@ find-babel-config@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
+  dependencies:
+    json5 "^0.5.1"
+    path-exists "^3.0.0"
 
 find-index@^1.1.0:
   version "1.1.0"
@@ -6601,11 +6583,6 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -10410,15 +10387,10 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^7.2.3:
-  version "7.2.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
-  integrity "sha1-q7E3DUYmpanNedjeQEqhizRl0Q0= sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="
-
-ws@~7.4.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
-  integrity "sha1-eCEABI5U6zb+mEM2OrHGhnKyYd0= sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="
+ws@^7.2.3, ws@~7.4.2:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xdg-basedir@^3.0.0:
   version "3.0.0"

From ca0518478df03d92090115eed212b270146a3e43 Mon Sep 17 00:00:00 2001
From: Bj Tecu <github@bujorel.net>
Date: Mon, 3 May 2021 19:01:01 -0400
Subject: [PATCH 0621/1405] [CLEANUP] Remove deprecated mouse events

---
 .../-internals/glimmer/lib/component.ts       |  40 ---
 .../glimmer/lib/modifiers/action.ts           |  21 +-
 .../components/fragment-components-test.js    |   2 +-
 .../integration/event-dispatcher-test.js      | 260 ------------------
 .../helpers/element-action-test.js            | 125 ---------
 .../views/lib/system/event_dispatcher.js      | 167 ++++-------
 packages/@ember/deprecated-features/index.ts  |   1 -
 7 files changed, 50 insertions(+), 566 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index c9ddb8d0364..3494db26f01 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -706,46 +706,6 @@ const Component = CoreView.extend(
           !eventNames.length
         );
       }
-
-      deprecate(
-        `${this}: Using \`mouseEnter\` event handler methods in components has been deprecated.`,
-        this.mouseEnter === undefined,
-        {
-          id: 'ember-views.event-dispatcher.mouseenter-leave-move',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_component-mouseenter-leave-move',
-          for: 'ember-source',
-          since: {
-            enabled: '3.13.0-beta.1',
-          },
-        }
-      );
-      deprecate(
-        `${this}: Using \`mouseLeave\` event handler methods in components has been deprecated.`,
-        this.mouseLeave === undefined,
-        {
-          id: 'ember-views.event-dispatcher.mouseenter-leave-move',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_component-mouseenter-leave-move',
-          for: 'ember-source',
-          since: {
-            enabled: '3.13.0-beta.1',
-          },
-        }
-      );
-      deprecate(
-        `${this}: Using \`mouseMove\` event handler methods in components has been deprecated.`,
-        this.mouseMove === undefined,
-        {
-          id: 'ember-views.event-dispatcher.mouseenter-leave-move',
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_component-mouseenter-leave-move',
-          for: 'ember-source',
-          since: {
-            enabled: '3.13.0-beta.1',
-          },
-        }
-      );
     },
 
     get _dispatcher(): EventDispatcher | null {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 0db021bbf4c..f1a8cc3435e 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -1,7 +1,7 @@
 import { Owner } from '@ember/-internals/owner';
 import { uuid } from '@ember/-internals/utils';
 import { ActionManager, EventDispatcher, isSimpleClick } from '@ember/-internals/views';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { registerDestructor } from '@glimmer/destroyable';
@@ -194,25 +194,8 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
     }
 
     let actionId = uuid();
-    let actionState = new ActionState(element, owner, actionId, actionArgs, named, positional);
-
-    deprecate(
-      `Using the \`{{action}}\` modifier with \`${actionState.eventName}\` events has been deprecated.`,
-      actionState.eventName !== 'mouseEnter' &&
-        actionState.eventName !== 'mouseLeave' &&
-        actionState.eventName !== 'mouseMove',
-      {
-        id: 'ember-views.event-dispatcher.mouseenter-leave-move',
-        until: '4.0.0',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_action-mouseenter-leave-move',
-        for: 'ember-source',
-        since: {
-          enabled: '3.13.0-beta.1',
-        },
-      }
-    );
 
-    return actionState;
+    return new ActionState(element, owner, actionId, actionArgs, named, positional);
   }
 
   getDebugName(): string {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
index ff692ad05bf..5d5fb77ae21 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
@@ -67,7 +67,7 @@ moduleFor(
 
       expectAssertion(() => {
         this.render(`{{#foo-bar}}{{/foo-bar}}`);
-      }, /You can not define `click,mouseEnter` function\(s\) to handle DOM event in the .* tagless component since it doesn't have any DOM element./);
+      }, /You can not define `click` function\(s\) to handle DOM event in the .* tagless component since it doesn't have any DOM element./);
     }
 
     ['@test throws an error if a custom defined event function is defined in a tagless component']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index e893ecc8a8a..aa8cb2ca634 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -270,266 +270,6 @@ moduleFor(
 
       this.$('#is-done').trigger('click');
     }
-
-    ['@test native event on text node does not throw on hasAttribute [ISSUE #16730]'](assert) {
-      this.registerComponent('x-foo', {
-        ComponentClass: Component.extend({
-          actions: {
-            someAction() {},
-          },
-        }),
-        template: `<a id="inner" href="#" {{action 'someAction'}}>test</a>`,
-      });
-
-      this.render(`{{x-foo id="outer"}}`);
-
-      let node = this.$('#inner')[0].childNodes[0];
-
-      runTask(() => {
-        let event = document.createEvent('HTMLEvents');
-        event.initEvent('mousemove', true, true);
-        node.dispatchEvent(event);
-      });
-
-      assert.ok(true);
-    }
-
-    ['@test [DEPRECATED] delegated event listeners work for mouseEnter/Leave'](assert) {
-      let receivedEnterEvents = [];
-      let receivedLeaveEvents = [];
-
-      this.registerComponent('x-foo', {
-        ComponentClass: Component.extend({
-          mouseEnter(event) {
-            receivedEnterEvents.push(event);
-          },
-          mouseLeave(event) {
-            receivedLeaveEvents.push(event);
-          },
-        }),
-        template: `<div id="inner"></div>`,
-      });
-
-      expectDeprecation(
-        () => this.render(`{{x-foo id="outer"}}`),
-        /Using `mouse(Enter|Leave)` event handler methods in components has been deprecated./
-      );
-
-      let parent = this.element;
-      let outer = this.$('#outer')[0];
-      let inner = this.$('#inner')[0];
-
-      // mouse moves over #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseenter', { canBubble: false, relatedTarget: parent });
-        this.$(outer).trigger('mouseover', { relatedTarget: parent });
-        this.$(parent).trigger('mouseout', { relatedTarget: outer });
-      });
-      assert.equal(receivedEnterEvents.length, 1, 'mouseenter event was triggered');
-      assert.strictEqual(receivedEnterEvents[0].target, outer);
-
-      // mouse moves over #inner
-      runTask(() => {
-        this.$(inner).trigger('mouseover', { relatedTarget: outer });
-        this.$(outer).trigger('mouseout', { relatedTarget: inner });
-      });
-      assert.equal(receivedEnterEvents.length, 1, 'mouseenter event was not triggered again');
-
-      // mouse moves out of #inner
-      runTask(() => {
-        this.$(inner).trigger('mouseout', { relatedTarget: outer });
-        this.$(outer).trigger('mouseover', { relatedTarget: inner });
-      });
-      assert.equal(receivedLeaveEvents.length, 0, 'mouseleave event was not triggered');
-
-      // mouse moves out of #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseleave', { canBubble: false, relatedTarget: parent });
-        this.$(outer).trigger('mouseout', { relatedTarget: parent });
-        this.$(parent).trigger('mouseover', { relatedTarget: outer });
-      });
-      assert.equal(receivedLeaveEvents.length, 1, 'mouseleave event was triggered');
-      assert.strictEqual(receivedLeaveEvents[0].target, outer);
-    }
-
-    ['@test [DEPRECATED] delegated event listeners work for mouseEnter on SVG elements'](assert) {
-      let receivedEnterEvents = [];
-      let receivedLeaveEvents = [];
-
-      this.registerComponent('x-foo', {
-        ComponentClass: Component.extend({
-          tagName: 'svg',
-          mouseEnter(event) {
-            receivedEnterEvents.push(event);
-          },
-          mouseLeave(event) {
-            receivedLeaveEvents.push(event);
-          },
-        }),
-        template: `<g id="inner"></g>`,
-      });
-
-      expectDeprecation(
-        () => this.render(`{{x-foo id="outer"}}`),
-        /Using `mouse(Enter|Leave)` event handler methods in components has been deprecated./
-      );
-
-      let parent = this.element;
-      let outer = this.$('#outer')[0];
-      let inner = this.$('#inner')[0];
-
-      // mouse moves over #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseenter', { canBubble: false, relatedTarget: parent });
-        this.$(outer).trigger('mouseover', { relatedTarget: parent });
-        this.$(parent).trigger('mouseout', { relatedTarget: outer });
-      });
-      assert.equal(receivedEnterEvents.length, 1, 'mouseenter event was triggered');
-      assert.strictEqual(receivedEnterEvents[0].target, outer);
-
-      // mouse moves over #inner
-      runTask(() => {
-        this.$(inner).trigger('mouseover', { relatedTarget: outer });
-        this.$(outer).trigger('mouseout', { relatedTarget: inner });
-      });
-      assert.equal(receivedEnterEvents.length, 1, 'mouseenter event was not triggered again');
-
-      // mouse moves out of #inner
-      runTask(() => {
-        this.$(inner).trigger('mouseout', { relatedTarget: outer });
-        this.$(outer).trigger('mouseover', { relatedTarget: inner });
-      });
-      assert.equal(receivedLeaveEvents.length, 0, 'mouseleave event was not triggered');
-
-      // mouse moves out of #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseleave', { canBubble: false, relatedTarget: parent });
-        this.$(outer).trigger('mouseout', { relatedTarget: parent });
-        this.$(parent).trigger('mouseover', { relatedTarget: outer });
-      });
-      assert.equal(receivedLeaveEvents.length, 1, 'mouseleave event was triggered');
-      assert.strictEqual(receivedLeaveEvents[0].target, outer);
-    }
-
-    ['@test [DEPRECATED] delegated event listeners work for mouseEnter/Leave with skipped events'](
-      assert
-    ) {
-      let receivedEnterEvents = [];
-      let receivedLeaveEvents = [];
-
-      this.registerComponent('x-foo', {
-        ComponentClass: Component.extend({
-          mouseEnter(event) {
-            receivedEnterEvents.push(event);
-          },
-          mouseLeave(event) {
-            receivedLeaveEvents.push(event);
-          },
-        }),
-        template: `<div id="inner"></div>`,
-      });
-
-      expectDeprecation(
-        () => this.render(`{{x-foo id="outer"}}`),
-        /Using `mouse(Enter|Leave)` event handler methods in components has been deprecated./
-      );
-
-      let parent = this.element;
-      let outer = this.$('#outer')[0];
-      let inner = this.$('#inner')[0];
-
-      // we replicate fast mouse movement, where mouseover is fired directly in #inner, skipping #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseenter', { canBubble: false, relatedTarget: parent });
-        this.$(inner).trigger('mouseover', { relatedTarget: parent });
-        this.$(parent).trigger('mouseout', { relatedTarget: inner });
-      });
-      assert.equal(receivedEnterEvents.length, 1, 'mouseenter event was triggered');
-      assert.strictEqual(receivedEnterEvents[0].target, inner);
-
-      // mouse moves out of #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseleave', { canBubble: false, relatedTarget: parent });
-        this.$(inner).trigger('mouseout', { relatedTarget: parent });
-        this.$(parent).trigger('mouseover', { relatedTarget: inner });
-      });
-      assert.equal(receivedLeaveEvents.length, 1, 'mouseleave event was triggered');
-      assert.strictEqual(receivedLeaveEvents[0].target, inner);
-    }
-
-    ['@test [DEPRECATED] delegated event listeners work for mouseEnter/Leave with skipped events and subcomponent'](
-      assert
-    ) {
-      let receivedEnterEvents = [];
-      let receivedLeaveEvents = [];
-
-      this.registerComponent('x-outer', {
-        ComponentClass: Component.extend({
-          mouseEnter(event) {
-            receivedEnterEvents.push(event);
-          },
-          mouseLeave(event) {
-            receivedLeaveEvents.push(event);
-          },
-        }),
-        template: `{{yield}}`,
-      });
-
-      this.registerComponent('x-inner', {
-        ComponentClass: Component.extend(),
-        template: ``,
-      });
-
-      expectDeprecation(
-        () => this.render(`{{#x-outer id="outer"}}{{x-inner id="inner"}}{{/x-outer}}`),
-        /Using `mouse(Enter|Leave)` event handler methods in components has been deprecated./
-      );
-
-      let parent = this.element;
-      let outer = this.$('#outer')[0];
-      let inner = this.$('#inner')[0];
-
-      // we replicate fast mouse movement, where mouseover is fired directly in #inner, skipping #outer
-      runTask(() => {
-        this.$(outer).trigger('mouseenter', { canBubble: false, relatedTarget: parent });
-        this.$(inner).trigger('mouseover', { relatedTarget: parent });
-        this.$(parent).trigger('mouseout', { relatedTarget: inner });
-      });
-      assert.equal(receivedEnterEvents.length, 1, 'mouseenter event was triggered');
-      assert.strictEqual(receivedEnterEvents[0].target, inner);
-
-      // mouse moves out of #inner
-      runTask(() => {
-        this.$(outer).trigger('mouseleave', { canBubble: false, relatedTarget: parent });
-        this.$(inner).trigger('mouseout', { relatedTarget: parent });
-        this.$(parent).trigger('mouseover', { relatedTarget: inner });
-      });
-
-      assert.equal(receivedLeaveEvents.length, 1, 'mouseleave event was triggered');
-      assert.strictEqual(receivedLeaveEvents[0].target, inner);
-    }
-
-    ['@test [DEPRECATED] supports mouseMove events'](assert) {
-      let receivedEvent;
-
-      this.registerComponent('x-foo', {
-        ComponentClass: Component.extend({
-          mouseMove(event) {
-            receivedEvent = event;
-          },
-        }),
-        template: `<div id="inner"></div>`,
-      });
-
-      expectDeprecation(
-        /Using `mouseMove` event handler methods in components has been deprecated\./
-      );
-
-      this.render(`{{x-foo}}`);
-
-      runTask(() => this.$('#inner').trigger('mousemove'));
-      assert.ok(receivedEvent, 'mousemove event was triggered');
-    }
   }
 );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 8198e78d689..74296843a9d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -1644,130 +1644,5 @@ moduleFor(
         "Element with action handler has properly updated it's conditional class"
       );
     }
-
-    ['@test [DEPRECATED] it should support mouseEnter events']() {
-      let showCalled = false;
-
-      let ExampleComponent = Component.extend({
-        actions: {
-          show() {
-            showCalled = true;
-          },
-        },
-      });
-
-      this.registerComponent('example-component', {
-        ComponentClass: ExampleComponent,
-        template: '<div id="inner" {{action "show" on="mouseEnter"}}></div>',
-      });
-
-      expectDeprecation(
-        () => this.render('{{example-component id="outer"}}'),
-        'Using the `{{action}}` modifier with `mouseEnter` events has been deprecated.'
-      );
-
-      let parent = this.element;
-      let outer = this.$('#outer')[0];
-      let inner = this.$('#inner')[0];
-
-      runTask(() => {
-        this.$(outer).trigger('mouseenter', { canBubble: false, relatedTarget: parent });
-        this.$(inner).trigger('mouseover', { relatedTarget: parent });
-        this.$(parent).trigger('mouseout', { relatedTarget: inner });
-      });
-
-      this.assert.ok(showCalled, 'show action was called on mouseEnter');
-    }
-
-    ['@test [DEPRECATED] it should support mouseLeave events']() {
-      let showCalled = false;
-
-      let ExampleComponent = Component.extend({
-        actions: {
-          show() {
-            showCalled = true;
-          },
-        },
-      });
-
-      this.registerComponent('example-component', {
-        ComponentClass: ExampleComponent,
-        template: '<div id="inner" {{action "show" on="mouseLeave"}}></div>',
-      });
-
-      expectDeprecation(
-        () => this.render('{{example-component id="outer"}}'),
-        'Using the `{{action}}` modifier with `mouseLeave` events has been deprecated.'
-      );
-
-      let parent = this.element;
-      let outer = this.$('#outer')[0];
-      let inner = this.$('#inner')[0];
-
-      runTask(() => {
-        this.$(outer).trigger('mouseleave', { canBubble: false, relatedTarget: parent });
-        this.$(inner).trigger('mouseout', { relatedTarget: parent });
-        this.$(parent).trigger('mouseover', { relatedTarget: inner });
-      });
-
-      this.assert.ok(showCalled, 'show action was called on mouseLeave');
-    }
-
-    ['@test [DEPRECATED] it should support mouseMove events']() {
-      let showCalled = false;
-
-      let ExampleComponent = Component.extend({
-        actions: {
-          show() {
-            showCalled = true;
-          },
-        },
-      });
-
-      this.registerComponent('example-component', {
-        ComponentClass: ExampleComponent,
-        template: '<div id="inner" {{action "show" on="mouseMove"}}></div>',
-      });
-
-      expectDeprecation(
-        () => this.render('{{example-component id="outer"}}'),
-        'Using the `{{action}}` modifier with `mouseMove` events has been deprecated.'
-      );
-
-      runTask(() => {
-        this.$('#inner').trigger('mousemove');
-      });
-
-      this.assert.ok(showCalled, 'show action was called on mouseMove');
-    }
-
-    ['@test [DEPRECATED] it should support bound mouseMove events']() {
-      let showCalled = false;
-
-      let ExampleComponent = Component.extend({
-        eventType: 'mouseMove',
-        actions: {
-          show() {
-            showCalled = true;
-          },
-        },
-      });
-
-      this.registerComponent('example-component', {
-        ComponentClass: ExampleComponent,
-        template: '<div id="inner" {{action "show" on=this.eventType}}></div>',
-      });
-
-      expectDeprecation(
-        () => this.render('{{example-component id="outer"}}'),
-        'Using the `{{action}}` modifier with `mouseMove` events has been deprecated.'
-      );
-
-      runTask(() => {
-        this.$('#inner').trigger('mousemove');
-      });
-
-      this.assert.ok(showCalled, 'show action was called on mouseMove');
-    }
   }
 );
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
index 94c6509aae2..db6821bf29f 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.js
@@ -4,8 +4,6 @@ import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { getElementView } from '@ember/-internals/views';
 import ActionManager from './action_manager';
-import { contains } from './utils';
-import { MOUSE_ENTER_LEAVE_MOVE_EVENTS } from '@ember/deprecated-features';
 
 /**
 @module ember
@@ -14,11 +12,6 @@ import { MOUSE_ENTER_LEAVE_MOVE_EVENTS } from '@ember/deprecated-features';
 const ROOT_ELEMENT_CLASS = 'ember-application';
 const ROOT_ELEMENT_SELECTOR = `.${ROOT_ELEMENT_CLASS}`;
 
-const EVENT_MAP = {
-  mouseenter: 'mouseover',
-  mouseleave: 'mouseout',
-};
-
 /**
   `Ember.EventDispatcher` handles delegating browser events to their
   corresponding `Ember.Views.` For example, when you click on a view,
@@ -64,41 +57,32 @@ export default EmberObject.extend({
     @type Object
     @private
   */
-  events: Object.assign(
-    {
-      touchstart: 'touchStart',
-      touchmove: 'touchMove',
-      touchend: 'touchEnd',
-      touchcancel: 'touchCancel',
-      keydown: 'keyDown',
-      keyup: 'keyUp',
-      keypress: 'keyPress',
-      mousedown: 'mouseDown',
-      mouseup: 'mouseUp',
-      contextmenu: 'contextMenu',
-      click: 'click',
-      dblclick: 'doubleClick',
-      focusin: 'focusIn',
-      focusout: 'focusOut',
-      submit: 'submit',
-      input: 'input',
-      change: 'change',
-      dragstart: 'dragStart',
-      drag: 'drag',
-      dragenter: 'dragEnter',
-      dragleave: 'dragLeave',
-      dragover: 'dragOver',
-      drop: 'drop',
-      dragend: 'dragEnd',
-    },
-    MOUSE_ENTER_LEAVE_MOVE_EVENTS
-      ? {
-          mouseenter: 'mouseEnter',
-          mouseleave: 'mouseLeave',
-          mousemove: 'mouseMove',
-        }
-      : {}
-  ),
+  events: {
+    touchstart: 'touchStart',
+    touchmove: 'touchMove',
+    touchend: 'touchEnd',
+    touchcancel: 'touchCancel',
+    keydown: 'keyDown',
+    keyup: 'keyUp',
+    keypress: 'keyPress',
+    mousedown: 'mouseDown',
+    mouseup: 'mouseUp',
+    contextmenu: 'contextMenu',
+    click: 'click',
+    dblclick: 'doubleClick',
+    focusin: 'focusIn',
+    focusout: 'focusOut',
+    submit: 'submit',
+    input: 'input',
+    change: 'change',
+    dragstart: 'dragStart',
+    drag: 'drag',
+    dragenter: 'dragEnter',
+    dragleave: 'dragLeave',
+    dragover: 'dragOver',
+    drop: 'drop',
+    dragend: 'dragEnd',
+  },
 
   /**
     The root DOM element to which event listeners should be attached. Event
@@ -314,90 +298,33 @@ export default EmberObject.extend({
       return result;
     };
 
-    // Special handling of events that don't bubble (event delegation does not work).
-    // Mimics the way this is handled in jQuery,
-    // see https://github.com/jquery/jquery/blob/899c56f6ada26821e8af12d9f35fa039100e838e/src/event.js#L666-L700
-    if (MOUSE_ENTER_LEAVE_MOVE_EVENTS && EVENT_MAP[event] !== undefined) {
-      let mappedEventType = EVENT_MAP[event];
-      let origEventType = event;
-
-      let createFakeEvent = (eventType, event) => {
-        let fakeEvent = document.createEvent('MouseEvent');
-        fakeEvent.initMouseEvent(
-          eventType,
-          false,
-          false,
-          event.view,
-          event.detail,
-          event.screenX,
-          event.screenY,
-          event.clientX,
-          event.clientY,
-          event.ctrlKey,
-          event.altKey,
-          event.shiftKey,
-          event.metaKey,
-          event.button,
-          event.relatedTarget
-        );
-
-        // fake event.target as we don't dispatch the event
-        Object.defineProperty(fakeEvent, 'target', { value: event.target, enumerable: true });
-
-        return fakeEvent;
-      };
-
-      let handleMappedEvent = (this._eventHandlers[mappedEventType] = (event) => {
-        let target = event.target;
-        let related = event.relatedTarget;
-
-        while (
-          target &&
-          target.nodeType === 1 &&
-          (related === null || (related !== target && !contains(target, related)))
+    let handleEvent = (this._eventHandlers[event] = (event) => {
+      let target = event.target;
+
+      do {
+        if (getElementView(target)) {
+          if (viewHandler(target, event) === false) {
+            event.preventDefault();
+            event.stopPropagation();
+            break;
+          } else if (event.cancelBubble === true) {
+            break;
+          }
+        } else if (
+          typeof target.hasAttribute === 'function' &&
+          target.hasAttribute('data-ember-action')
         ) {
-          // mouseEnter/Leave don't bubble, so there is no logic to prevent it as with other events
-          if (getElementView(target)) {
-            viewHandler(target, createFakeEvent(origEventType, event));
-          } else if (target.hasAttribute('data-ember-action')) {
-            actionHandler(target, createFakeEvent(origEventType, event));
+          if (actionHandler(target, event) === false) {
+            break;
           }
-
-          // separate mouseEnter/Leave events are dispatched for each listening element
-          // until the element (related) has been reached that the pointing device exited from/to
-          target = target.parentNode;
         }
-      });
-
-      rootElement.addEventListener(mappedEventType, handleMappedEvent);
-    } else {
-      let handleEvent = (this._eventHandlers[event] = (event) => {
-        let target = event.target;
 
-        do {
-          if (getElementView(target)) {
-            if (viewHandler(target, event) === false) {
-              event.preventDefault();
-              event.stopPropagation();
-              break;
-            } else if (event.cancelBubble === true) {
-              break;
-            }
-          } else if (
-            typeof target.hasAttribute === 'function' &&
-            target.hasAttribute('data-ember-action')
-          ) {
-            if (actionHandler(target, event) === false) {
-              break;
-            }
-          }
+        target = target.parentNode;
+      } while (target && target.nodeType === 1);
+    });
 
-          target = target.parentNode;
-        } while (target && target.nodeType === 1);
-      });
+    rootElement.addEventListener(event, handleEvent);
 
-      rootElement.addEventListener(event, handleEvent);
-    }
     this.lazyEvents.delete(event);
   },
 
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 45d9c852108..f21d2b32a2a 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -6,5 +6,4 @@
 export const ROUTER_EVENTS = !!'4.0.0';
 export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
-export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
 export const ASSIGN = !!'4.0.0-beta.1';

From 3e4d3878c89ef2bf90a60ee289419fe97f5fd791 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 22 Jul 2021 19:25:32 +0200
Subject: [PATCH 0622/1405] Remove internal jQuery usage

---
 .../@ember/-internals/environment/lib/env.ts  | 14 ---------
 packages/@ember/-internals/views/index.d.ts   |  2 --
 packages/@ember/-internals/views/index.js     |  1 -
 .../-internals/views/lib/system/jquery.d.ts   |  2 --
 .../-internals/views/lib/system/jquery.js     | 29 -------------------
 packages/@ember/application/instance.js       | 24 +--------------
 .../@ember/application/lib/application.js     | 21 +-------------
 .../application/tests/application_test.js     |  8 +----
 packages/@ember/deprecated-features/index.ts  |  1 -
 packages/ember/tests/reexports_test.js        |  4 ---
 tests/docs/expected.js                        |  2 --
 11 files changed, 3 insertions(+), 105 deletions(-)
 delete mode 100644 packages/@ember/-internals/views/lib/system/jquery.d.ts
 delete mode 100644 packages/@ember/-internals/views/lib/system/jquery.js

diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index e4f2d0f4823..93f3d1ac326 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -128,20 +128,6 @@ export const ENV = {
   */
   _DEBUG_RENDER_TREE: DEBUG,
 
-  /**
-    Whether the app is using jQuery. See RFC #294.
-
-    This is not intended to be set directly, as the implementation may change in
-    the future. Use `@ember/optional-features` instead.
-
-    @property _JQUERY_INTEGRATION
-    @for EmberENV
-    @type Boolean
-    @default true
-    @private
-  */
-  _JQUERY_INTEGRATION: true,
-
   /**
     Whether the app defaults to using async observers.
 
diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts
index 5b3ee4f949d..de6e4673dde 100644
--- a/packages/@ember/-internals/views/index.d.ts
+++ b/packages/@ember/-internals/views/index.d.ts
@@ -2,8 +2,6 @@ import { Option } from '@glimmer/interfaces';
 import { SimpleElement } from '@simple-dom/interface';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 
-export { jQuery, jQueryDisabled } from './lib/system/jquery';
-
 export const ActionSupport: any;
 export const ChildViewsSupport: any;
 export const ClassNamesSupport: any;
diff --git a/packages/@ember/-internals/views/index.js b/packages/@ember/-internals/views/index.js
index 6224d9e17bf..00b866a3ef7 100644
--- a/packages/@ember/-internals/views/index.js
+++ b/packages/@ember/-internals/views/index.js
@@ -1,4 +1,3 @@
-export { jQuery, jQueryDisabled } from './lib/system/jquery';
 export {
   addChildView,
   isSimpleClick,
diff --git a/packages/@ember/-internals/views/lib/system/jquery.d.ts b/packages/@ember/-internals/views/lib/system/jquery.d.ts
deleted file mode 100644
index 717c57ab2ef..00000000000
--- a/packages/@ember/-internals/views/lib/system/jquery.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export let jQuery: any;
-export let jQueryDisabled: boolean;
diff --git a/packages/@ember/-internals/views/lib/system/jquery.js b/packages/@ember/-internals/views/lib/system/jquery.js
deleted file mode 100644
index f8463832e30..00000000000
--- a/packages/@ember/-internals/views/lib/system/jquery.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { context } from '@ember/-internals/environment';
-import { hasDOM } from '@ember/-internals/browser-environment';
-import { ENV } from '@ember/-internals/environment';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
-
-export let jQuery;
-export let jQueryDisabled = !JQUERY_INTEGRATION || ENV._JQUERY_INTEGRATION === false;
-
-if (JQUERY_INTEGRATION && hasDOM) {
-  jQuery = context.imports.jQuery;
-
-  if (!jQueryDisabled && jQuery) {
-    if (jQuery.event.addProp) {
-      jQuery.event.addProp('dataTransfer');
-    } else {
-      // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
-      ['dragstart', 'drag', 'dragenter', 'dragleave', 'dragover', 'drop', 'dragend'].forEach(
-        (eventName) => {
-          jQuery.event.fixHooks[eventName] = {
-            props: ['dataTransfer'],
-          };
-        }
-      );
-    }
-  } else {
-    jQuery = undefined;
-    jQueryDisabled = true;
-  }
-}
diff --git a/packages/@ember/application/instance.js b/packages/@ember/application/instance.js
index b87af2acd91..b1639a8833e 100644
--- a/packages/@ember/application/instance.js
+++ b/packages/@ember/application/instance.js
@@ -4,7 +4,6 @@
 
 import { get, set, computed } from '@ember/-internals/metal';
 import * as environment from '@ember/-internals/browser-environment';
-import { jQuery } from '@ember/-internals/views';
 import EngineInstance from '@ember/engine/instance';
 import { renderSettled } from '@ember/-internals/glimmer';
 
@@ -57,8 +56,7 @@ const ApplicationInstance = EngineInstance.extend({
 
   /**
     The root DOM element of the Application as an element or a
-    [jQuery-compatible selector
-    string](http://api.jquery.com/category/selectors/).
+    CSS selector.
 
     @private
     @property {String|DOMElement} rootElement
@@ -328,20 +326,6 @@ ApplicationInstance.reopenClass({
 */
 class BootOptions {
   constructor(options = {}) {
-    /**
-      Provide a specific instance of jQuery. This is useful in conjunction with
-      the `document` option, as it allows you to use a copy of `jQuery` that is
-      appropriately bound to the foreign `document` (e.g. a jsdom).
-
-      This is highly experimental and support very incomplete at the moment.
-
-      @property jQuery
-      @type Object
-      @default auto-detected
-      @private
-    */
-    this.jQuery = jQuery; // This default is overridable below
-
     /**
       Interactive mode: whether we need to set up event delegation and invoke
       lifecycle callbacks on Components.
@@ -392,7 +376,6 @@ class BootOptions {
     }
 
     if (!this.isBrowser) {
-      this.jQuery = null;
       this.isInteractive = false;
       this.location = 'none';
     }
@@ -416,7 +399,6 @@ class BootOptions {
     }
 
     if (!this.shouldRender) {
-      this.jQuery = null;
       this.isInteractive = false;
     }
 
@@ -486,10 +468,6 @@ class BootOptions {
       this.location = options.location;
     }
 
-    if (options.jQuery !== undefined) {
-      this.jQuery = options.jQuery;
-    }
-
     if (options.isInteractive !== undefined) {
       this.isInteractive = Boolean(options.isInteractive);
     }
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 1a65185c961..cdff77056c5 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -11,7 +11,7 @@ import { join, once, run, schedule } from '@ember/runloop';
 import { libraries } from '@ember/-internals/metal';
 import { _loaded, runLoadHooks } from './lazy_load';
 import { RSVP } from '@ember/-internals/runtime';
-import { EventDispatcher, jQuery, jQueryDisabled } from '@ember/-internals/views';
+import { EventDispatcher } from '@ember/-internals/views';
 import {
   Route,
   Router,
@@ -26,9 +26,6 @@ import Engine from '@ember/engine';
 import { privatize as P } from '@ember/-internals/container';
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
 import { RouterService } from '@ember/-internals/routing';
-import { JQUERY_INTEGRATION } from '@ember/deprecated-features';
-
-let librariesRegistered = false;
 
 /**
   An instance of `Application` is the starting point for every Ember
@@ -353,12 +350,6 @@ const Application = Engine.extend({
     // eslint-disable-line no-unused-vars
     this._super(...arguments);
 
-    if (!this.$) {
-      this.$ = jQuery;
-    }
-
-    registerLibraries();
-
     if (DEBUG) {
       if (ENV.LOG_VERSION) {
         // we only need to see this once per Application#init
@@ -1170,14 +1161,4 @@ function commonSetupRegistry(registry) {
   registry.register('service:router', RouterService);
 }
 
-function registerLibraries() {
-  if (!librariesRegistered) {
-    librariesRegistered = true;
-
-    if (JQUERY_INTEGRATION && hasDOM && !jQueryDisabled) {
-      libraries.registerCoreLibrary('jQuery', jQuery().jquery);
-    }
-  }
-}
-
 export default Application;
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 729ef0f5beb..899149411ea 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -4,7 +4,6 @@ import { ENV } from '@ember/-internals/environment';
 import { libraries } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { Router, NoneLocation, Route as EmberRoute } from '@ember/-internals/routing';
-import { jQueryDisabled, jQuery } from '@ember/-internals/views';
 import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import { Object as EmberObject } from '@ember/-internals/runtime';
@@ -279,12 +278,7 @@ moduleFor(
       runTask(() => this.createApplication());
 
       assert.equal(messages[1], 'Ember  : ' + VERSION);
-      if (jQueryDisabled) {
-        assert.equal(messages[2], 'my-lib : ' + '2.0.0a');
-      } else {
-        assert.equal(messages[2], 'jQuery : ' + jQuery().jquery);
-        assert.equal(messages[3], 'my-lib : ' + '2.0.0a');
-      }
+      assert.equal(messages[2], 'my-lib : ' + '2.0.0a');
 
       libraries.deRegister('my-lib');
     }
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 45d9c852108..8c77bccf11d 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -4,7 +4,6 @@
 // not the version that the feature will be removed.
 
 export const ROUTER_EVENTS = !!'4.0.0';
-export const JQUERY_INTEGRATION = !!'3.9.0';
 export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const MOUSE_ENTER_LEAVE_MOVE_EVENTS = !!'3.13.0-beta.1';
 export const ASSIGN = !!'4.0.0-beta.1';
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 1d621d59a86..b54a434df1d 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -3,7 +3,6 @@ import require from 'require';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS, FEATURES } from '@ember/canary-features';
 import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
 import { DEBUG } from '@glimmer/env';
-import { ENV } from '@ember/-internals/environment';
 
 moduleFor(
   'ember reexports',
@@ -443,9 +442,6 @@ let allExports = [
   // backburner
   ['_Backburner', 'backburner', 'default'],
 
-  // jquery
-  ENV._JQUERY_INTEGRATION ? [null, 'jquery', 'default'] : null,
-
   // rsvp
   [null, 'rsvp', 'default'],
   [null, 'rsvp', 'Promise'],
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index c4f1f78595e..0b18828dbf8 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -11,7 +11,6 @@ module.exports = {
     '_APPLICATION_TEMPLATE_WRAPPER',
     '_DISABLE_PROPERTY_FALLBACK_DEPRECATION',
     '_DEBUG_RENDER_TREE',
-    '_JQUERY_INTEGRATION',
     '_DEFAULT_ASYNC_OBSERVERS',
     '_RERENDER_LOOP_LIMIT',
     '_TEMPLATE_ONLY_GLIMMER_COMPONENTS',
@@ -326,7 +325,6 @@ module.exports = {
     'isRejected',
     'isSettled',
     'join',
-    'jQuery',
     'keyDown',
     'keyPress',
     'keyUp',

From 14a21cd8f9a100f4aeddcb014c23da30f13071c6 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 18 Aug 2021 17:16:51 -0400
Subject: [PATCH 0623/1405] [BUGFIX beta] Update Node.js CI tests and
 package.json engines to match support policy

---
 .github/workflows/alpha-releases.yml |  4 ++--
 .github/workflows/ci.yml             | 24 ++++++++++++------------
 package.json                         |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index 53b4133bef5..62ab7f06b9d 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -37,7 +37,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
           registry-url: 'https://registry.npmjs.org'
       - uses: actions/cache@v2
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2113636028d..abcda5c84a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -101,7 +101,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -124,7 +124,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -148,7 +148,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -172,7 +172,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -196,7 +196,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -218,7 +218,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -241,7 +241,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
           registry-url: 'https://registry.npmjs.org'
       - uses: actions/cache@v2
         with:
@@ -266,7 +266,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
@@ -292,7 +292,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
       - uses: actions/cache@v2
         with:
           path: '**/node_modules'
diff --git a/package.json b/package.json
index d91877353ae..ad670f5138c 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "typescript": "^4.2.4"
   },
   "engines": {
-    "node": "10.* || >= 12.*"
+    "node": ">= 12.*"
   },
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"

From cd8c15704b7b8754ff69bed0cfe58583110fe7f4 Mon Sep 17 00:00:00 2001
From: Bj Tecu <github@bujorel.net>
Date: Sun, 22 Aug 2021 13:19:29 -0400
Subject: [PATCH 0624/1405] [CLEANUP] Remove Application Controller Router
 Properties

---
 .../components/link-to/routing-angle-test.js  | 15 ++--
 .../components/link-to/routing-curly-test.js  | 15 ++--
 .../-internals/routing/lib/system/router.ts   | 51 +-------------
 .../@ember/application/tests/reset_test.js    |  9 +--
 packages/@ember/deprecated-features/index.ts  |  1 -
 .../tests/routing/decoupled_basic_test.js     | 70 +++++--------------
 .../ember/tests/routing/model_loading_test.js |  8 ---
 .../ember/tests/routing/substates_test.js     | 69 +++++++++++-------
 8 files changed, 73 insertions(+), 165 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index fa7e4c22561..70076a8dc4f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -1726,16 +1726,11 @@ moduleFor(
 
       await this.click('#about-link');
 
-      expectDeprecation(() => {
-        let currentRouteName = this.applicationInstance
-          .lookup('controller:application')
-          .get('currentRouteName');
-        assert.notEqual(
-          currentRouteName,
-          'about',
-          'link-to should not transition if target is not equal to _self or empty'
-        );
-      }, 'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.');
+      assert.notEqual(
+        this.appRouter.currentRouteName,
+        'about',
+        'link-to should not transition if target is not equal to _self or empty'
+      );
     }
 
     async [`@test it accepts string/numeric arguments`](assert) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 2ecf5ae4cf0..b8cc6247317 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -1848,16 +1848,11 @@ moduleFor(
 
       await this.click('#about-link > a');
 
-      expectDeprecation(() => {
-        let currentRouteName = this.applicationInstance
-          .lookup('controller:application')
-          .get('currentRouteName');
-        assert.notEqual(
-          currentRouteName,
-          'about',
-          'link-to should not transition if target is not equal to _self or empty'
-        );
-      }, 'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.');
+      assert.notEqual(
+        this.appRouter.currentRouteName,
+        'about',
+        'link-to should not transition if target is not equal to _self or empty'
+      );
     }
 
     async [`@test it accepts string/numeric arguments`](assert) {
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 384e5c11c25..09b2bcca505 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1,13 +1,13 @@
 import { privatize as P } from '@ember/-internals/container';
 import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
-import { computed, get, notifyPropertyChange, set } from '@ember/-internals/metal';
+import { computed, get, set } from '@ember/-internals/metal';
 import { FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
 import { assert, deprecate, info } from '@ember/debug';
-import { APP_CTRL_ROUTER_PROPS, ROUTER_EVENTS } from '@ember/deprecated-features';
+import { ROUTER_EVENTS } from '@ember/deprecated-features';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
@@ -1735,53 +1735,6 @@ function updatePaths(router: EmberRouter) {
     // actually been entered at that point.
     return;
   }
-  if (APP_CTRL_ROUTER_PROPS) {
-    if (!('currentPath' in appController)) {
-      Object.defineProperty(appController, 'currentPath', {
-        get() {
-          deprecate(
-            'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.',
-            false,
-            {
-              id: 'application-controller.router-properties',
-              until: '4.0.0',
-              url:
-                'https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties',
-              for: 'ember-source',
-              since: {
-                enabled: '3.10.0-beta.1',
-              },
-            }
-          );
-          return get(router, 'currentPath');
-        },
-      });
-    }
-    notifyPropertyChange(appController, 'currentPath');
-
-    if (!('currentRouteName' in appController)) {
-      Object.defineProperty(appController, 'currentRouteName', {
-        get() {
-          deprecate(
-            'Accessing `currentRouteName` on `controller:application` is deprecated, use the `currentRouteName` property on `service:router` instead.',
-            false,
-            {
-              id: 'application-controller.router-properties',
-              until: '4.0.0',
-              url:
-                'https://deprecations.emberjs.com/v3.x#toc_application-controller-router-properties',
-              for: 'ember-source',
-              since: {
-                enabled: '3.10.0-beta.1',
-              },
-            }
-          );
-          return get(router, 'currentRouteName');
-        },
-      });
-    }
-    notifyPropertyChange(appController, 'currentRouteName');
-  }
 }
 
 function didBeginTransition(transition: Transition, router: EmberRouter) {
diff --git a/packages/@ember/application/tests/reset_test.js b/packages/@ember/application/tests/reset_test.js
index b2f15524e49..6e7c852a59a 100644
--- a/packages/@ember/application/tests/reset_test.js
+++ b/packages/@ember/application/tests/reset_test.js
@@ -1,5 +1,4 @@
 import { run } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
 import Controller from '@ember/controller';
 import { Router } from '@ember/-internals/routing';
 import { moduleFor, AutobootApplicationTestCase } from 'internal-test-helpers';
@@ -129,9 +128,7 @@ moduleFor(
           let location = initialRouter.get('location');
 
           assert.equal(location.getURL(), '/one');
-          expectDeprecation(() => {
-            assert.equal(get(initialApplicationController, 'currentPath'), 'one');
-          }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
+          assert.equal(initialRouter.currentPath, 'one');
 
           this.application.reset();
 
@@ -160,9 +157,7 @@ moduleFor(
           );
 
           assert.equal(location.getURL(), '/one');
-          expectDeprecation(() => {
-            assert.equal(get(applicationController, 'currentPath'), 'one');
-          }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
+          assert.equal(router.currentPath, 'one');
         });
     }
 
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 8170ba67304..5b93040f31c 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -4,5 +4,4 @@
 // not the version that the feature will be removed.
 
 export const ROUTER_EVENTS = !!'4.0.0';
-export const APP_CTRL_ROUTER_PROPS = !!'3.10.0-beta.1';
 export const ASSIGN = !!'4.0.0-beta.1';
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 33d1bb89897..175055830b4 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -79,14 +79,6 @@ moduleFor(
       });
     }
 
-    get currentPath() {
-      let currentPath;
-      expectDeprecation(() => {
-        currentPath = this.applicationInstance.lookup('controller:application').get('currentPath');
-      }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-      return currentPath;
-    }
-
     async ['@test warn on URLs not included in the route set'](assert) {
       await this.visit('/');
 
@@ -95,7 +87,7 @@ moduleFor(
 
     ['@test The Homepage'](assert) {
       return this.visit('/').then(() => {
-        assert.equal(this.currentPath, 'home', 'currently on the home route');
+        assert.equal(this.appRouter.currentPath, 'home', 'currently on the home route');
 
         let text = this.$('.hours').text();
         assert.equal(text, 'Hours', 'the home template was rendered');
@@ -109,7 +101,7 @@ moduleFor(
 
       return this.visit('/camelot')
         .then(() => {
-          assert.equal(this.currentPath, 'camelot');
+          assert.equal(this.appRouter.currentPath, 'camelot');
 
           let text = this.$('#camelot').text();
           assert.equal(text, 'Is a silly place', 'the camelot template was rendered');
@@ -117,7 +109,7 @@ moduleFor(
           return this.visit('/');
         })
         .then(() => {
-          assert.equal(this.currentPath, 'home');
+          assert.equal(this.appRouter.currentPath, 'home');
 
           let text = this.$('.hours').text();
           assert.equal(text, 'Hours', 'the home template was rendered');
@@ -708,12 +700,12 @@ moduleFor(
           1,
           'The home template was rendered'
         );
-        assert.equal(this.currentPath, 'home');
+        assert.equal(this.appRouter.currentPath, 'home');
       });
     }
 
     ['@test Redirecting from the middle of a route aborts the remainder of the routes'](assert) {
-      assert.expect(5);
+      assert.expect(4);
 
       this.router.map(function () {
         this.route('home');
@@ -750,13 +742,7 @@ moduleFor(
       return this.visit('/').then(() => {
         let router = this.applicationInstance.lookup('router:main');
         this.handleURLAborts(assert, '/foo/bar/baz');
-        let currentPath;
-        expectDeprecation(() => {
-          currentPath = this.applicationInstance
-            .lookup('controller:application')
-            .get('currentPath');
-        }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-        assert.equal(currentPath, 'home');
+        assert.equal(router.currentPath, 'home');
         assert.equal(router.get('location').getURL(), '/home');
       });
     }
@@ -764,7 +750,7 @@ moduleFor(
     ['@test Redirecting to the current target in the middle of a route does not abort initial routing'](
       assert
     ) {
-      assert.expect(7);
+      assert.expect(6);
 
       this.router.map(function () {
         this.route('home');
@@ -805,13 +791,7 @@ moduleFor(
 
       return this.visit('/foo/bar/baz').then(() => {
         assert.ok(true, '/foo/bar/baz has been handled');
-        let currentPath;
-        expectDeprecation(() => {
-          currentPath = this.applicationInstance
-            .lookup('controller:application')
-            .get('currentPath');
-        }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-        assert.equal(currentPath, 'foo.bar.baz');
+        assert.equal(this.appRouter.currentPath, 'foo.bar.baz');
         assert.equal(successCount, 1, 'transitionTo success handler was called once');
       });
     }
@@ -819,7 +799,7 @@ moduleFor(
     ['@test Redirecting to the current target with a different context aborts the remainder of the routes'](
       assert
     ) {
-      assert.expect(7);
+      assert.expect(6);
 
       this.router.map(function () {
         this.route('home');
@@ -860,13 +840,7 @@ moduleFor(
 
       return this.visit('/').then(() => {
         this.handleURLAborts(assert, '/foo/bar/1/baz');
-        let currentPath;
-        expectDeprecation(() => {
-          currentPath = this.applicationInstance
-            .lookup('controller:application')
-            .get('currentPath');
-        }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-        assert.equal(currentPath, 'foo.bar.baz');
+        assert.equal(this.appRouter.currentPath, 'foo.bar.baz');
         assert.equal(
           this.applicationInstance.lookup('router:main').get('location').getURL(),
           '/foo/bar/2/baz'
@@ -901,19 +875,11 @@ moduleFor(
 
       return this.visit('/foo/bar/baz').then(() => {
         assert.ok(true, '/foo/bar/baz has been handled');
-        let applicationController = this.applicationInstance.lookup('controller:application');
         let router = this.applicationInstance.lookup('router:main');
 
-        let currentPath;
-        expectDeprecation(() => {
-          currentPath = applicationController.get('currentPath');
-        }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-        assert.equal(currentPath, 'foo.bar.baz');
+        assert.equal(router.currentPath, 'foo.bar.baz');
         run(() => router.send('goToQux'));
-        expectDeprecation(() => {
-          currentPath = applicationController.get('currentPath');
-        }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-        assert.equal(currentPath, 'foo.qux');
+        assert.equal(router.currentPath, 'foo.qux');
         assert.equal(router.get('location').getURL(), '/foo/qux');
       });
     }
@@ -1405,10 +1371,10 @@ moduleFor(
       });
     }
 
-    ['@test currentRouteName is a property installed on ApplicationController that can be used in transitionTo'](
+    ['@test currentRouteName is a property installed on Router that can be used in transitionTo'](
       assert
     ) {
-      assert.expect(36);
+      assert.expect(24);
 
       this.router.map(function () {
         this.route('index', { path: '/' });
@@ -1424,17 +1390,15 @@ moduleFor(
       });
 
       return this.visit('/').then(() => {
-        let appController = this.applicationInstance.lookup('controller:application');
         let router = this.applicationInstance.lookup('router:main');
 
         function transitionAndCheck(path, expectedPath, expectedRouteName) {
           if (path) {
             run(router, 'transitionTo', path);
           }
-          expectDeprecation(() => {
-            assert.equal(appController.get('currentPath'), expectedPath);
-            assert.equal(appController.get('currentRouteName'), expectedRouteName);
-          }, /Accessing `(currentPath|currentRouteName)` on `controller:application` is deprecated, use the `(currentPath|currentRouteName)` property on `service:router` instead\./);
+
+          assert.equal(router.currentPath, expectedPath);
+          assert.equal(router.currentRouteName, expectedRouteName);
         }
 
         transitionAndCheck(null, 'index', 'index');
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index afced00f49c..81f4bc23186 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -56,14 +56,6 @@ moduleFor(
       });
     }
 
-    get currentPath() {
-      let currentPath;
-      expectDeprecation(() => {
-        currentPath = this.applicationInstance.lookup('controller:application').get('currentPath');
-      }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-      return currentPath;
-    }
-
     async ['@test warn on URLs not included in the route set'](assert) {
       await this.visit('/');
 
diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index 13330e7d0c1..494a3bd5542 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -145,7 +145,7 @@ moduleFor(
         });
 
         assert.ok(
-          this.currentPath !== 'loading',
+          this.appRouter.currentPath !== 'loading',
           `
         loading state not entered
       `
@@ -188,7 +188,7 @@ moduleFor(
 
           assert.equal(text, 'DUMMY', `dummy template has been rendered`);
         });
-        assert.equal(this.currentPath, 'loading', `loading state entered`);
+        assert.equal(this.appRouter.currentPath, 'loading', `loading state entered`);
         deferred.resolve();
 
         return promise;
@@ -249,7 +249,7 @@ moduleFor(
           );
         });
 
-        assert.equal(this.currentPath, 'loading', `loading state entered`);
+        assert.equal(this.appRouter.currentPath, 'loading', `loading state entered`);
         assert.equal(
           this.currentURL,
           '/dummy?qux=updated',
@@ -268,7 +268,7 @@ moduleFor(
     }
 
     ['@test Enter child-loading route with correct query parameters'](assert) {
-      assert.expect(9);
+      assert.expect(8);
       let deferred = RSVP.defer();
 
       this.router.map(function () {
@@ -326,12 +326,18 @@ moduleFor(
           );
         });
 
-        assert.equal(this.currentPath, 'parent.child_loading', `child loading state entered`);
+        assert.equal(
+          this.appRouter.currentPath,
+          'parent.child_loading',
+          `child loading state entered`
+        );
+
         assert.equal(
           this.currentURL,
           '/parent/child?qux=updated',
           `during child loading, url reflect the correct state`
         );
+
         assert.equal(
           this.getController('parent').qux,
           'updated',
@@ -724,14 +730,6 @@ moduleFor(
       return this.applicationInstance.lookup(`controller:${name}`);
     }
 
-    get currentPath() {
-      let currentPath;
-      expectDeprecation(() => {
-        currentPath = this.getController('application').get('currentPath');
-      }, 'Accessing `currentPath` on `controller:application` is deprecated, use the `currentPath` property on `service:router` instead.');
-      return currentPath;
-    }
-
     async ['@test ApplicationRoute#currentPath reflects loading state path'](assert) {
       await this.visit('/');
 
@@ -752,13 +750,21 @@ moduleFor(
         text = this.$('#app').text();
 
         assert.equal(text, 'GRANDMA MOM', `Grandma.mom loaded text is displayed`);
-        assert.equal(this.currentPath, 'grandma.mom.index', `currentPath reflects final state`);
+        assert.equal(
+          this.appRouter.currentPath,
+          'grandma.mom.index',
+          `currentPath reflects final state`
+        );
       });
       let text = this.$('#app').text();
 
       assert.equal(text, 'GRANDMA GRANDMALOADING', `Grandma.mom loading text displayed`);
 
-      assert.equal(this.currentPath, 'grandma.loading', `currentPath reflects loading state`);
+      assert.equal(
+        this.appRouter.currentPath,
+        'grandma.loading',
+        `currentPath reflects loading state`
+      );
 
       momDeferred.resolve();
 
@@ -801,17 +807,17 @@ moduleFor(
       );
 
       let promise = this.visit('/grandma/mom/sally');
-      assert.equal(this.currentPath, 'index', 'Initial route fully loaded');
+      assert.equal(this.appRouter.currentPath, 'index', 'Initial route fully loaded');
 
       sallyDeferred.resolve();
 
       promise
         .then(() => {
-          assert.equal(this.currentPath, 'grandma.mom.sally', 'transition completed');
+          assert.equal(this.appRouter.currentPath, 'grandma.mom.sally', 'transition completed');
 
           let visit = this.visit('/grandma/puppies');
           assert.equal(
-            this.currentPath,
+            this.appRouter.currentPath,
             'grandma.mom.sally',
             'still in initial state because the only loading state is above the pivot route'
           );
@@ -821,7 +827,7 @@ moduleFor(
         .then(() => {
           runTask(() => puppiesDeferred.resolve());
 
-          assert.equal(this.currentPath, 'grandma.puppies', 'Finished transition');
+          assert.equal(this.appRouter.currentPath, 'grandma.puppies', 'Finished transition');
         });
 
       return promise;
@@ -855,7 +861,7 @@ moduleFor(
       step(assert, 3, 'App finished loading');
 
       assert.equal(this.$('#app').text(), 'GRANDMA ERROR: did it broke?', 'error bubbles');
-      assert.equal(this.currentPath, 'grandma.error', 'Initial route fully loaded');
+      assert.equal(this.appRouter.currentPath, 'grandma.error', 'Initial route fully loaded');
     }
 
     async [`@test Non-bubbled errors that re-throw aren't swallowed`](assert) {
@@ -1047,7 +1053,7 @@ moduleFor(
         'the more specifically named mome error substate was entered over the other error route'
       );
 
-      assert.equal(this.currentPath, 'grandma.mom_error', 'Initial route fully loaded');
+      assert.equal(this.appRouter.currentPath, 'grandma.mom_error', 'Initial route fully loaded');
     }
 
     async ['@test Slow promises waterfall on startup'](assert) {
@@ -1146,13 +1152,18 @@ moduleFor(
       );
 
       await this.visit('/grandma/mom/sally');
-      assert.equal(this.currentPath, 'grandma.mom.sally', 'Initial route fully loaded');
+      assert.equal(this.appRouter.currentPath, 'grandma.mom.sally', 'Initial route fully loaded');
 
       let promise = runTask(() => this.visit('/grandma/puppies')).then(() => {
-        assert.equal(this.currentPath, 'grandma.puppies', 'Finished transition');
+        assert.equal(this.appRouter.currentPath, 'grandma.puppies', 'Finished transition');
       });
 
-      assert.equal(this.currentPath, 'grandma.loading', `in pivot route's child loading state`);
+      assert.equal(
+        this.appRouter.currentPath,
+        'grandma.loading',
+        `in pivot route's child loading state`
+      );
+
       deferred.resolve();
 
       return promise;
@@ -1261,15 +1272,19 @@ moduleFor(
       );
 
       let promise = runTask(() => this.visit('/grandma')).then(() => {
-        assert.equal(this.currentPath, 'memere.index', 'Transition should be complete');
+        assert.equal(this.appRouter.currentPath, 'memere.index', 'Transition should be complete');
       });
       let memereController = this.getController('memere');
 
-      assert.equal(this.currentPath, 'memere.loading', 'Initial route should be loading');
+      assert.equal(this.appRouter.currentPath, 'memere.loading', 'Initial route should be loading');
 
       memereController.set('test', 3);
 
-      assert.equal(this.currentPath, 'memere.loading', 'Initial route should still be loading');
+      assert.equal(
+        this.appRouter.currentPath,
+        'memere.loading',
+        'Initial route should still be loading'
+      );
 
       assert.equal(
         memereController.get('test'),

From cfad78f1b0bab14d460c8ea28cd688461afac553 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Sun, 25 Jul 2021 12:23:40 -0500
Subject: [PATCH 0625/1405] [CLEANUP beta] Deprecate owner.inject, drop
 implicit injections

---
 .../files/__root__/initializers/__name__.js   |   1 -
 .../instance-initializers/__name__.js         |   1 -
 .../initializer/initializer-nested.js         |   1 -
 .../fixtures/initializer/initializer.js       |   1 -
 .../instance-initializer-nested.js            |   1 -
 .../instance-initializer.js                   |   1 -
 .../-internals/container/lib/container.ts     |  77 +----
 .../-internals/container/lib/registry.ts      | 167 +---------
 .../container/tests/container_test.js         | 194 +----------
 .../container/tests/registry_test.js          |  92 ------
 .../lib/container_debug_adapter.js            |   7 +
 .../@ember/-internals/glimmer/lib/renderer.ts |  21 +-
 .../-internals/glimmer/lib/setup-registry.ts  |  14 +-
 .../-internals/glimmer/lib/views/outlet.ts    |   7 +-
 .../glimmer/tests/integration/outlet-test.js  |   5 +-
 .../-internals/routing/lib/system/router.ts   |   5 +-
 .../routing/tests/system/route_test.js        |  32 --
 .../runtime/lib/system/core_object.js         | 127 +-------
 .../tests/system/object/create_test.js        | 303 +-----------------
 .../@ember/application/lib/application.js     |  11 +-
 .../application/tests/application_test.js     |  10 -
 .../tests/dependency_injection_test.js        |  18 --
 packages/@ember/engine/index.js               |   6 -
 packages/@ember/engine/instance.js            |   5 -
 packages/@ember/engine/tests/engine_test.js   |  11 -
 .../ember/tests/ember-test-helpers-test.js    |   4 +-
 packages/internal-test-helpers/index.js       |   2 +-
 .../lib/registry-check.js                     |  25 --
 .../lib/test-cases/rendering.js               |   4 +-
 .../lib/test-cases/router-non-application.js  |   4 +-
 tests/docs/expected.js                        |   4 -
 tests/node/helpers/setup-component.js         |   3 +-
 tests/node/visit-test.js                      |  59 ++--
 33 files changed, 110 insertions(+), 1113 deletions(-)

diff --git a/blueprints/initializer/files/__root__/initializers/__name__.js b/blueprints/initializer/files/__root__/initializers/__name__.js
index dfb969b2702..f3083e3831a 100644
--- a/blueprints/initializer/files/__root__/initializers/__name__.js
+++ b/blueprints/initializer/files/__root__/initializers/__name__.js
@@ -1,5 +1,4 @@
 export function initialize(/* application */) {
-  // application.inject('route', 'foo', 'service:foo');
 }
 
 export default {
diff --git a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
index 2f84dce8d92..fefc0f80a2d 100644
--- a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
+++ b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
@@ -1,5 +1,4 @@
 export function initialize(/* appInstance */) {
-  // appInstance.inject('route', 'foo', 'service:foo');
 }
 
 export default {
diff --git a/node-tests/fixtures/initializer/initializer-nested.js b/node-tests/fixtures/initializer/initializer-nested.js
index dfb969b2702..f3083e3831a 100644
--- a/node-tests/fixtures/initializer/initializer-nested.js
+++ b/node-tests/fixtures/initializer/initializer-nested.js
@@ -1,5 +1,4 @@
 export function initialize(/* application */) {
-  // application.inject('route', 'foo', 'service:foo');
 }
 
 export default {
diff --git a/node-tests/fixtures/initializer/initializer.js b/node-tests/fixtures/initializer/initializer.js
index dfb969b2702..f3083e3831a 100644
--- a/node-tests/fixtures/initializer/initializer.js
+++ b/node-tests/fixtures/initializer/initializer.js
@@ -1,5 +1,4 @@
 export function initialize(/* application */) {
-  // application.inject('route', 'foo', 'service:foo');
 }
 
 export default {
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
index 2f84dce8d92..fefc0f80a2d 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
@@ -1,5 +1,4 @@
 export function initialize(/* appInstance */) {
-  // appInstance.inject('route', 'foo', 'service:foo');
 }
 
 export default {
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer.js b/node-tests/fixtures/instance-initializer/instance-initializer.js
index 2f84dce8d92..fefc0f80a2d 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer.js
@@ -1,5 +1,4 @@
 export function initialize(/* appInstance */) {
-  // appInstance.inject('route', 'foo', 'service:foo');
 }
 
 export default {
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 2f52ae92c25..d811fd971c1 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -2,7 +2,7 @@ import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner
 import { dictionary, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import Registry, { DebugRegistry, Injection } from './registry';
+import Registry, { DebugRegistry } from './registry';
 
 declare global {
   export function gc(): void;
@@ -406,68 +406,6 @@ function instantiateFactory(
   throw new Error('Could not create factory');
 }
 
-interface BuildInjectionsResult {
-  injections: { [key: string]: unknown };
-  isDynamic: boolean;
-}
-
-function processInjections(
-  container: Container,
-  injections: Injection[],
-  result: BuildInjectionsResult
-) {
-  if (DEBUG) {
-    container.registry.validateInjections(injections);
-  }
-
-  let hash = result.injections;
-
-  for (let i = 0; i < injections.length; i++) {
-    let { property, specifier } = injections[i];
-
-    hash[property] = lookup(container, specifier);
-
-    if (!result.isDynamic) {
-      result.isDynamic = !isSingleton(container, specifier);
-    }
-  }
-}
-
-function buildInjections(
-  container: Container,
-  typeInjections: Injection[],
-  injections: Injection[]
-): BuildInjectionsResult {
-  let injectionsHash = {};
-
-  setOwner(injectionsHash, container.owner!);
-
-  let result: BuildInjectionsResult = {
-    injections: injectionsHash,
-    isDynamic: false,
-  };
-
-  if (typeInjections !== undefined) {
-    processInjections(container, typeInjections, result);
-  }
-
-  if (injections !== undefined) {
-    processInjections(container, injections, result);
-  }
-
-  return result;
-}
-
-function injectionsFor(container: Container, fullName: string) {
-  let registry = container.registry;
-  let [type] = fullName.split(':');
-
-  let typeInjections = registry.getTypeInjections(type);
-  let injections = registry.getInjections(fullName);
-
-  return buildInjections(container, typeInjections, injections);
-}
-
 function destroyDestroyables(container: Container): void {
   let cache = container.cache;
   let keys = Object.keys(cache);
@@ -569,16 +507,9 @@ class FactoryManager<T, C> {
       );
     }
 
-    let props = this.injections;
-    if (props === undefined) {
-      let { injections, isDynamic } = injectionsFor(this.container, this.normalizedName);
-      setFactoryFor(injections, this);
-      props = injections;
-
-      if (!isDynamic) {
-        this.injections = injections;
-      }
-    }
+    let props = {};
+    setOwner(props, container.owner!);
+    setFactoryFor(props, this);
 
     if (options !== undefined) {
       props = Object.assign({}, props, options);
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 6d8634d8537..d89e24b15e3 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,6 +1,6 @@
 import { Factory } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import Container, { ContainerOptions, LazyInjection } from './container';
 
@@ -24,14 +24,12 @@ export interface KnownForTypeResult {
 
 export interface IRegistry {
   describe(fullName: string): string;
-  getInjections(fullName: string): Injection[];
   getOption<K extends keyof TypeOptions>(
     fullName: string,
     optionName: K
   ): TypeOptions[K] | undefined;
   getOptions(fullName: string): TypeOptions;
   getOptionsForType(type: string): TypeOptions;
-  getTypeInjections(type: string): Injection[];
   knownForType(type: string): KnownForTypeResult;
   makeToString<T, C>(factory: Factory<T, C>, fullName: string): string;
   normalizeFullName(fullName: string): string;
@@ -82,12 +80,10 @@ export default class Registry implements IRegistry {
   resolver: Resolver | (Resolve & NotResolver) | null;
   readonly fallback: IRegistry | null;
   readonly registrations: { [key: string]: object };
-  readonly _injections: { [key: string]: Injection[] };
   _localLookupCache: { [key: string]: object };
   readonly _normalizeCache: { [key: string]: string };
   readonly _options: { [key: string]: TypeOptions };
   readonly _resolveCache: { [key: string]: object };
-  readonly _typeInjections: { [key: string]: Injection[] };
   readonly _typeOptions: { [key: string]: TypeOptions };
 
   constructor(options: RegistryOptions = {}) {
@@ -96,9 +92,6 @@ export default class Registry implements IRegistry {
 
     this.registrations = dictionary(options.registrations || null);
 
-    this._typeInjections = dictionary(null);
-    this._injections = dictionary(null);
-
     this._localLookupCache = Object.create(null);
     this._normalizeCache = dictionary(null);
     this._resolveCache = dictionary(null);
@@ -130,20 +123,6 @@ export default class Registry implements IRegistry {
    @type InheritingDict
    */
 
-  /**
-   @private
-
-   @property _typeInjections
-   @type InheritingDict
-   */
-
-  /**
-   @private
-
-   @property _injections
-   @type InheritingDict
-   */
-
   /**
    @private
 
@@ -468,90 +447,9 @@ export default class Registry implements IRegistry {
   }
 
   /**
-   Used only via `injection`.
-
-   Provides a specialized form of injection, specifically enabling
-   all objects of one type to be injected with a reference to another
-   object.
-
-   For example, provided each object of type `controller` needed a `router`.
-   one would do the following:
-
-   ```javascript
-   let registry = new Registry();
-   let container = registry.container();
-
-   registry.register('router:main', Router);
-   registry.register('controller:user', UserController);
-   registry.register('controller:post', PostController);
-
-   registry.typeInjection('controller', 'router', 'router:main');
-
-   let user = container.lookup('controller:user');
-   let post = container.lookup('controller:post');
-
-   user.router instanceof Router; //=> true
-   post.router instanceof Router; //=> true
-
-   // both controllers share the same router
-   user.router === post.router; //=> true
-   ```
-
-   @private
-   @method typeInjection
-   @param {String} type
-   @param {String} property
-   @param {String} fullName
-   */
-  typeInjection(type: string, property: string, fullName: string): void {
-    assert('fullName must be a proper full name', this.isValidFullName(fullName));
-
-    let fullNameType = fullName.split(':')[0];
-    assert(`Cannot inject a '${fullName}' on other ${type}(s).`, fullNameType !== type);
-
-    let injections = this._typeInjections[type] || (this._typeInjections[type] = []);
-
-    injections.push({ property, specifier: fullName });
-  }
-
-  /**
-   Defines injection rules.
-
-   These rules are used to inject dependencies onto objects when they
-   are instantiated.
-
-   Two forms of injections are possible:
+   This is deprecated in favor of explicit injection of dependencies.
 
-   * Injecting one fullName on another fullName
-   * Injecting one fullName on a type
-
-   Example:
-
-   ```javascript
-   let registry = new Registry();
-   let container = registry.container();
-
-   registry.register('source:main', Source);
-   registry.register('model:user', User);
-   registry.register('model:post', Post);
-
-   // injecting one fullName on another fullName
-   // eg. each user model gets a post model
-   registry.injection('model:user', 'post', 'model:post');
-
-   // injecting one fullName on another type
-   registry.injection('model', 'source', 'source:main');
-
-   let user = container.lookup('model:user');
-   let post = container.lookup('model:post');
-
-   user.source instanceof Source; //=> true
-   post.source instanceof Source; //=> true
-
-   user.post instanceof Post; //=> true
-
-   // and both models share the same source
-   user.source === post.source; //=> true
+   Reference: https://deprecations.emberjs.com/v3.x#toc_implicit-injections
    ```
 
    @private
@@ -559,25 +457,22 @@ export default class Registry implements IRegistry {
    @param {String} factoryName
    @param {String} property
    @param {String} injectionName
+   @deprecated
    */
-  injection(fullName: string, property: string, injectionName: string) {
-    assert(
-      `Invalid injectionName, expected: 'type:name' got: ${injectionName}`,
-      this.isValidFullName(injectionName)
+  injection(fullName: string, property: string) {
+    deprecate(
+      `As of Ember 4.0.0, owner.inject no longer injects values into resolved instances, and calling the method has been deprecated. Since this method no longer does anything, it is fully safe to remove this injection. As an alternative to this API, you can refactor to explicitly inject \`${property}\` on \`${fullName}\`, or look it up directly using the \`getOwner\` API.`,
+      false,
+      {
+        id: 'remove-owner-inject',
+        until: '5.0.0',
+        url: 'https://deprecations.emberjs.com/v4.x#toc_implicit-injections',
+        for: 'ember-source',
+        since: {
+          enabled: '4.0.0',
+        },
+      }
     );
-
-    let normalizedInjectionName = this.normalize(injectionName);
-
-    if (fullName.indexOf(':') === -1) {
-      return this.typeInjection(fullName, property, normalizedInjectionName);
-    }
-
-    assert('fullName must be a proper full name', this.isValidFullName(fullName));
-    let normalizedName = this.normalize(fullName);
-
-    let injections = this._injections[normalizedName] || (this._injections[normalizedName] = []);
-
-    injections.push({ property, specifier: normalizedInjectionName });
   }
 
   /**
@@ -612,34 +507,6 @@ export default class Registry implements IRegistry {
   isValidFullName(fullName: string): boolean {
     return VALID_FULL_NAME_REGEXP.test(fullName);
   }
-
-  getInjections(fullName: string) {
-    let injections = this._injections[fullName];
-    if (this.fallback !== null) {
-      let fallbackInjections = this.fallback.getInjections(fullName);
-
-      if (fallbackInjections !== undefined) {
-        injections =
-          injections === undefined ? fallbackInjections : injections.concat(fallbackInjections);
-      }
-    }
-
-    return injections;
-  }
-
-  getTypeInjections(type: string): Injection[] {
-    let injections = this._typeInjections[type];
-    if (this.fallback !== null) {
-      let fallbackInjections = this.fallback.getTypeInjections(type);
-
-      if (fallbackInjections !== undefined) {
-        injections =
-          injections === undefined ? fallbackInjections : injections.concat(fallbackInjections);
-      }
-    }
-
-    return injections;
-  }
 }
 
 export declare class DebugRegistry extends Registry {
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index 8a9a3311887..fbe16b0deb4 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -223,84 +223,6 @@ moduleFor(
       assert.equal(postController, container.lookup('controller:post'));
     }
 
-    ['@test uses create time injections if factory has no extend'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let AppleController = factory();
-      let PostController = factory();
-
-      PostController.extend = undefined; // remove extend
-
-      registry.register('controller:apple', AppleController);
-      registry.register('controller:post', PostController);
-      registry.injection('controller:post', 'apple', 'controller:apple');
-
-      let postController = container.lookup('controller:post');
-
-      assert.ok(
-        postController.apple instanceof AppleController,
-        'instance receives an apple of instance AppleController'
-      );
-    }
-
-    ["@test A factory type with a registered injection's instances receive that injection"](
-      assert
-    ) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostController = factory();
-      let Store = factory();
-
-      registry.register('controller:post', PostController);
-      registry.register('store:main', Store);
-
-      registry.typeInjection('controller', 'store', 'store:main');
-
-      let postController = container.lookup('controller:post');
-      let store = container.lookup('store:main');
-
-      assert.equal(postController.store, store);
-    }
-
-    ['@test An individual factory with a registered injection receives the injection'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostController = factory();
-      let Store = factory();
-
-      registry.register('controller:post', PostController);
-      registry.register('store:main', Store);
-
-      registry.injection('controller:post', 'store', 'store:main');
-
-      let postController = container.lookup('controller:post');
-      let store = container.lookup('store:main');
-
-      assert.equal(postController.store, store, 'has the correct store injected');
-    }
-
-    ['@test A factory with both type and individual injections'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostController = factory();
-      let Store = factory();
-      let Router = factory();
-
-      registry.register('controller:post', PostController);
-      registry.register('store:main', Store);
-      registry.register('router:main', Router);
-
-      registry.injection('controller:post', 'store', 'store:main');
-      registry.typeInjection('controller', 'router', 'router:main');
-
-      let postController = container.lookup('controller:post');
-      let store = container.lookup('store:main');
-      let router = container.lookup('router:main');
-
-      assert.equal(postController.store, store);
-      assert.equal(postController.router, router);
-    }
-
     ['@test A non-singleton instance is never cached'](assert) {
       let registry = new Registry();
       let container = registry.container();
@@ -341,43 +263,7 @@ moduleFor(
       }, /Failed to create an instance of 'controller:foo'/);
     }
 
-    ['@test Injecting a failed lookup raises an error']() {
-      let registry = new Registry();
-      let container = registry.container();
-
-      let fooInstance = {};
-      let fooFactory = {};
-
-      let Foo = {
-        create() {
-          return fooInstance;
-        },
-        extend() {
-          return fooFactory;
-        },
-      };
-
-      registry.register('model:foo', Foo);
-      registry.injection('model:foo', 'store', 'store:main');
-
-      expectAssertion(() => {
-        container.lookup('model:foo');
-      });
-    }
-
-    ['@test Injecting a falsy value does not raise an error'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let ApplicationController = factory();
-
-      registry.register('controller:application', ApplicationController);
-      registry.register('user:current', null, { instantiate: false });
-      registry.injection('controller:application', 'currentUser', 'user:current');
-
-      assert.strictEqual(container.lookup('controller:application').currentUser, null);
-    }
-
-    ['@test The container returns same value each time even if the value is falsy'](assert) {
+    ['@test The container returns same value each time even if the value is falsey'](assert) {
       let registry = new Registry();
       let container = registry.container();
 
@@ -386,30 +272,6 @@ moduleFor(
       assert.strictEqual(container.lookup('falsy:value'), container.lookup('falsy:value'));
     }
 
-    ['@test Destroying the container destroys any cached singletons'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostController = factory();
-      let PostView = factory();
-      let template = function () {};
-
-      registry.register('controller:post', PostController);
-      registry.register('view:post', PostView, { singleton: false });
-      registry.register('template:post', template, { instantiate: false });
-
-      registry.injection('controller:post', 'postView', 'view:post');
-
-      let postController = container.lookup('controller:post');
-      let postView = postController.postView;
-
-      assert.ok(postView instanceof PostView, 'The non-singleton was injected');
-
-      container.destroy();
-
-      assert.ok(postController.isDestroyed, 'Singletons are destroyed');
-      assert.ok(!postView.isDestroyed, 'Non-singletons are not destroyed');
-    }
-
     ['@test The container can use a registry hook to resolve factories lazily'](assert) {
       let registry = new Registry();
       let container = registry.container();
@@ -509,27 +371,6 @@ moduleFor(
       assert.ok(postView1 !== postView2, 'The two lookups are different');
     }
 
-    ['@test An injected non-singleton instance is never cached'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-      let PostView = factory();
-      let PostViewHelper = factory();
-
-      registry.register('view:post', PostView, { singleton: false });
-      registry.register('view_helper:post', PostViewHelper, {
-        singleton: false,
-      });
-      registry.injection('view:post', 'viewHelper', 'view_helper:post');
-
-      let postView1 = container.lookup('view:post');
-      let postView2 = container.lookup('view:post');
-
-      assert.ok(
-        postView1.viewHelper !== postView2.viewHelper,
-        'Injected non-singletons are not cached'
-      );
-    }
-
     ['@test Factory resolves are cached'](assert) {
       let registry = new Registry();
       let container = registry.container();
@@ -752,39 +593,6 @@ moduleFor(
       assert.notEqual(factory1, factory3);
     }
 
-    ['@test #factoryFor created instances come with instance injections'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-
-      let Component = factory();
-      let Ajax = factory();
-      registry.register('component:foo-bar', Component);
-      registry.register('util:ajax', Ajax);
-      registry.injection('component:foo-bar', 'ajax', 'util:ajax');
-
-      let componentFactory = container.factoryFor('component:foo-bar');
-      let component = componentFactory.create();
-
-      assert.ok(component.ajax);
-      assert.ok(component.ajax instanceof Ajax);
-    }
-
-    ['@test #factoryFor options passed to create clobber injections'](assert) {
-      let registry = new Registry();
-      let container = registry.container();
-
-      let Component = factory();
-      let Ajax = factory();
-      registry.register('component:foo-bar', Component);
-      registry.register('util:ajax', Ajax);
-      registry.injection('component:foo-bar', 'ajax', 'util:ajax');
-
-      let componentFactory = container.factoryFor('component:foo-bar');
-      let instrance = componentFactory.create({ ajax: 'fetch' });
-
-      assert.equal(instrance.ajax, 'fetch');
-    }
-
     [`@test assert when calling lookup after destroy on a container`](assert) {
       let registry = new Registry();
       let container = registry.container();
diff --git a/packages/@ember/-internals/container/tests/registry_test.js b/packages/@ember/-internals/container/tests/registry_test.js
index 9981c6e32be..4630fa195c6 100644
--- a/packages/@ember/-internals/container/tests/registry_test.js
+++ b/packages/@ember/-internals/container/tests/registry_test.js
@@ -79,17 +79,6 @@ moduleFor(
       );
     }
 
-    ['@test Throw exception when trying to inject `type:thing` on all type(s)']() {
-      let registry = new Registry();
-      let PostController = factory();
-
-      registry.register('controller:post', PostController);
-
-      expectAssertion(() => {
-        registry.typeInjection('controller', 'injected', 'controller:post');
-      }, /Cannot inject a 'controller:post' on other controller\(s\)\./);
-    }
-
     ['@test The registry can take a hook to resolve factories lazily'](assert) {
       let PostController = factory();
       let resolver = {
@@ -154,26 +143,6 @@ moduleFor(
       );
     }
 
-    ['@test The registry normalizes names when injecting'](assert) {
-      let registry = new Registry();
-      let PostController = factory();
-      let user = { name: 'Stef' };
-
-      registry.normalize = function () {
-        return 'controller:post';
-      };
-
-      registry.register('controller:post', PostController);
-      registry.register('user:post', user, { instantiate: false });
-      registry.injection('controller:post', 'user', 'controller:normalized');
-
-      assert.deepEqual(
-        registry.resolve('controller:post'),
-        user,
-        'Normalizes the name when injecting'
-      );
-    }
-
     ['@test cannot register an `undefined` factory']() {
       let registry = new Registry();
 
@@ -208,29 +177,6 @@ moduleFor(
       assert.strictEqual(registry.resolve('controller:apple'), FirstApple);
     }
 
-    ['@test registry.has should not accidentally cause injections on that factory to be run. (Mitigate merely on observing)'](
-      assert
-    ) {
-      assert.expect(1);
-
-      let registry = new Registry();
-      let FirstApple = factory('first');
-      let SecondApple = factory('second');
-
-      SecondApple.extend = function () {
-        assert.ok(
-          false,
-          'should not extend or touch the injected model, merely to inspect existence of another'
-        );
-      };
-
-      registry.register('controller:apple', FirstApple);
-      registry.register('controller:second-apple', SecondApple);
-      registry.injection('controller:apple', 'badApple', 'controller:second-apple');
-
-      assert.ok(registry.has('controller:apple'));
-    }
-
     ['@test registry.has should not error for invalid fullNames'](assert) {
       let registry = new Registry();
 
@@ -483,44 +429,6 @@ moduleFor(
       );
     }
 
-    ['@test `getInjections` includes injections from a fallback registry'](assert) {
-      let fallback = new Registry();
-      let registry = new Registry({ fallback: fallback });
-
-      assert.strictEqual(
-        registry.getInjections('model:user'),
-        undefined,
-        'No injections in the primary registry'
-      );
-
-      fallback.injection('model:user', 'post', 'model:post');
-
-      assert.equal(
-        registry.getInjections('model:user').length,
-        1,
-        'Injections from the fallback registry are merged'
-      );
-    }
-
-    ['@test `getTypeInjections` includes type injections from a fallback registry'](assert) {
-      let fallback = new Registry();
-      let registry = new Registry({ fallback: fallback });
-
-      assert.strictEqual(
-        registry.getTypeInjections('model'),
-        undefined,
-        'No injections in the primary registry'
-      );
-
-      fallback.injection('model', 'source', 'source:main');
-
-      assert.equal(
-        registry.getTypeInjections('model').length,
-        1,
-        'Injections from the fallback registry are merged'
-      );
-    }
-
     ['@test `knownForType` contains keys for each item of a given type'](assert) {
       let registry = new Registry();
 
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
index 8923585ecc8..2d352fc15ab 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
@@ -1,5 +1,6 @@
 import { classify, dasherize } from '@ember/string';
 import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-internals/runtime';
+import { getOwner } from '@ember/-internals/owner';
 
 /**
 @module @ember/debug
@@ -40,6 +41,12 @@ import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-i
   @public
 */
 export default EmberObject.extend({
+  init() {
+    this._super(...arguments);
+
+    this.resolver = getOwner(this).lookup('resolver-for-debugging:main');
+  },
+
   /**
     The resolver instance of the application
     being debugged. This property will be injected
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index e4c5fe0be4d..85d64cecf5d 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,3 +1,4 @@
+import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { getOwner, Owner } from '@ember/-internals/owner';
 import { getViewElement, getViewId } from '@ember/-internals/views';
@@ -290,14 +291,16 @@ export class Renderer {
 
   readonly _runtimeResolver: ResolverImpl;
 
-  static create(props: {
-    document: SimpleDocument;
-    env: { isInteractive: boolean; hasDOM: boolean };
-    rootTemplate: TemplateFactory;
-    _viewRegistry: any;
-    builder: any;
-  }): Renderer {
-    let { document, env, rootTemplate, _viewRegistry, builder } = props;
+  static create(props: { _viewRegistry: any }): Renderer {
+    let { _viewRegistry } = props;
+    let document = getOwner(props).lookup('service:-document') as SimpleDocument;
+    let env = getOwner(props).lookup('-environment:main') as {
+      isInteractive: boolean;
+      hasDOM: boolean;
+    };
+    let owner = getOwner(props);
+    let rootTemplate = owner.lookup(P`template:-root`) as TemplateFactory;
+    let builder = owner.lookup('service:-dom-builder') as IBuilder;
     return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, builder);
   }
 
@@ -311,7 +314,7 @@ export class Renderer {
   ) {
     this._owner = owner;
     this._rootTemplate = rootTemplate(owner);
-    this._viewRegistry = viewRegistry;
+    this._viewRegistry = viewRegistry || owner.lookup('-view-registry:main');
     this._roots = [];
     this._removedRoots = [];
     this._builder = builder;
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 4bb5844c9a5..4f1977fe5ba 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -1,5 +1,6 @@
 import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
+import { getOwner } from '@ember/-internals/owner';
 import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Component from './component';
 import LegacyLinkTo from './components/-link-to';
@@ -16,16 +17,14 @@ import RootTemplate from './templates/root';
 import OutletView from './views/outlet';
 
 export function setupApplicationRegistry(registry: Registry): void {
-  registry.injection('renderer', 'env', '-environment:main');
-
   // because we are using injections we can't use instantiate false
   // we need to use bind() to copy the function so factory for
   // association won't leak
   registry.register('service:-dom-builder', {
-    create({ bootOptions }: { bootOptions: { _renderMode: string } }) {
-      let { _renderMode } = bootOptions;
+    create(props) {
+      let env = getOwner(props).lookup('-environment:main') as { _renderMode: string };
 
-      switch (_renderMode) {
+      switch (env._renderMode) {
         case 'serialize':
           return serializeBuilder.bind(null);
         case 'rehydrate':
@@ -35,14 +34,10 @@ export function setupApplicationRegistry(registry: Registry): void {
       }
     },
   });
-  registry.injection('service:-dom-builder', 'bootOptions', '-environment:main');
-  registry.injection('renderer', 'builder', 'service:-dom-builder');
 
   registry.register(P`template:-root`, RootTemplate as any);
-  registry.injection('renderer', 'rootTemplate', P`template:-root`);
 
   registry.register('renderer:-dom', Renderer);
-  registry.injection('renderer', 'document', 'service:-document');
 }
 
 export function setupEngineRegistry(registry: Registry): void {
@@ -50,7 +45,6 @@ export function setupEngineRegistry(registry: Registry): void {
 
   registry.register('view:-outlet', OutletView);
   registry.register('template:-outlet', OutletTemplate as any);
-  registry.injection('view:-outlet', 'template', 'template:-outlet');
 
   registry.optionsForType('helper', { instantiate: false });
 
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 871a26a5837..e6822d38564 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -34,10 +34,10 @@ export default class OutletView {
   }
 
   static create(options: any): OutletView {
-    let { _environment, template: templateFactory } = options;
+    let { environment: _environment, application: namespace, template: templateFactory } = options;
     let owner = getOwner(options);
     let template = templateFactory(owner);
-    return new OutletView(_environment, owner, template);
+    return new OutletView(_environment, owner, template, namespace);
   }
 
   private ref: Reference;
@@ -46,7 +46,8 @@ export default class OutletView {
   constructor(
     private _environment: BootEnvironment,
     public owner: Owner,
-    public template: Template
+    public template: Template,
+    public namespace: any
   ) {
     let outletStateTag = createTag();
     let outletState: OutletState = {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js b/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
index 8c0ed82f978..193ee68354c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/outlet-test.js
@@ -7,8 +7,9 @@ moduleFor(
       super(...arguments);
 
       let CoreOutlet = this.owner.factoryFor('view:-outlet');
-
-      this.component = CoreOutlet.create();
+      let outletTemplateFactory = this.owner.lookup('template:-outlet');
+      let environment = this.owner.lookup('-environment:main');
+      this.component = CoreOutlet.create({ environment, template: outletTemplateFactory });
     }
 
     ['@test should not error when initial rendered template is undefined']() {
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 384e5c11c25..f2807c31e4d 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -653,7 +653,10 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     if (!this._toplevelView) {
       let owner = getOwner(this);
       let OutletView = owner.factoryFor<OutletView, FactoryClass>('view:-outlet')!;
-      this._toplevelView = OutletView.create();
+      let application = owner.lookup('application:main');
+      let environment = owner.lookup('-environment:main');
+      let template = owner.lookup('template:-outlet');
+      this._toplevelView = OutletView.create({ environment, template, application });
       this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
       let instance: any = owner.lookup('-application-instance:main');
       if (instance) {
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index bcf4bfa32a5..b2c5edc4206 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -64,38 +64,6 @@ moduleFor(
       runDestroy(owner);
     }
 
-    ["@test 'store' can be injected by data persistence frameworks"](assert) {
-      assert.expect(8);
-      runDestroy(route);
-
-      let owner = buildOwner();
-
-      let post = {
-        id: 1,
-      };
-
-      let Store = EmberObject.extend({
-        find(type, value) {
-          assert.ok(true, 'injected model was called');
-          assert.equal(type, 'post', 'correct type was called');
-          assert.equal(value, 1, 'correct value was called');
-          return post;
-        },
-      });
-
-      owner.register('route:index', EmberRoute);
-      owner.register('store:main', Store);
-
-      owner.inject('route', 'store', 'store:main');
-
-      route = owner.lookup('route:index');
-
-      assert.equal(route.model({ post_id: 1 }), post, '#model returns the correct post');
-      assert.equal(route.findModel('post', 1), post, '#findModel returns the correct post');
-
-      runDestroy(owner);
-    }
-
     ["@test assert if 'store.find' method is not found"]() {
       runDestroy(route);
 
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.js
index 05ad5cc77c1..bbfe9ba0d29 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.js
@@ -4,13 +4,7 @@
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
 import { getOwner } from '@ember/-internals/owner';
-import {
-  guidFor,
-  lookupDescriptor,
-  inspect,
-  makeArray,
-  isInternalSymbol,
-} from '@ember/-internals/utils';
+import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
 import {
   PROXY_CONTENT,
@@ -22,10 +16,9 @@ import {
   descriptorForProperty,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
-  TrackedDescriptor,
 } from '@ember/-internals/metal';
 import ActionHandler from '../mixins/action_handler';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
 import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
@@ -61,21 +54,6 @@ function initialize(obj, properties) {
       !(properties instanceof Mixin)
     );
 
-    let injectedProperties;
-    if (DEBUG) {
-      // these are all the implicit injectinos
-      injectedProperties = [];
-
-      let factory = getFactoryFor(obj);
-      if (factory) {
-        for (let injection in factory.injections) {
-          if (factory.injections[injection] === properties[injection]) {
-            injectedProperties.push(injection);
-          }
-        }
-      }
-    }
-
     let concatenatedProperties = obj.concatenatedProperties;
     let mergedProperties = obj.mergedProperties;
     let hasConcatenatedProps =
@@ -124,85 +102,12 @@ function initialize(obj, properties) {
       }
 
       if (isDescriptor) {
-        if (DEBUG && injectedProperties.indexOf(keyName) !== -1) {
-          // need to check if implicit injection owner.inject('component:my-component', 'foo', 'service:bar') does not match explicit injection @service foo
-          // implicit injection takes precedence so need to tell user to rename property on obj
-          let isInjectedProperty = DEBUG_INJECTION_FUNCTIONS.has(possibleDesc._getter);
-          if (isInjectedProperty && value !== possibleDesc.get(obj, keyName)) {
-            implicitInjectionDeprecation(
-              keyName,
-              `You have explicitly defined a service injection for the '${keyName}' property on ${inspect(
-                obj
-              )}. However, a different service or value was injected via implicit injections which overrode your explicit injection. Implicit injections have been deprecated, and will be removed in the near future. In order to prevent breakage, you should inject the same value explicitly that is currently being injected implicitly.`
-            );
-          } else if (possibleDesc instanceof TrackedDescriptor) {
-            let descValue = possibleDesc.get(obj, keyName);
-
-            if (value !== descValue) {
-              implicitInjectionDeprecation(
-                keyName,
-                `A value was injected implicitly on the '${keyName}' tracked property of an instance of ${inspect(
-                  obj
-                )}, overwriting the original value which was ${inspect(
-                  descValue
-                )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
-              );
-            }
-          } else if (possibleDesc._setter === undefined) {
-            implicitInjectionDeprecation(
-              keyName,
-              `A value was injected implicitly on the '${keyName}' computed property of an instance of ${inspect(
-                obj
-              )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
-            );
-          }
-        }
-
         possibleDesc.set(obj, keyName, value);
       } else if (typeof obj.setUnknownProperty === 'function' && !(keyName in obj)) {
         obj.setUnknownProperty(keyName, value);
       } else {
         if (DEBUG) {
-          // If deprecation, either 1) an accessor descriptor or 2) class field declaration 3) only an implicit injection
-          let desc = lookupDescriptor(obj, keyName);
-
-          if (injectedProperties.indexOf(keyName) === -1) {
-            // Value was not an injected property, define in like normal
-            defineProperty(obj, keyName, null, value, m); // setup mandatory setter
-          } else if (desc) {
-            // If the property is a value prop, and it isn't the expected value,
-            // then we can warn the user when they attempt to use the value
-            if ('value' in desc && desc.value !== value) {
-              // implicit injection does not match value descriptor set on object
-              defineSelfDestructingImplicitInjectionGetter(
-                obj,
-                keyName,
-                value,
-                `A value was injected implicitly on the '${keyName}' property of an instance of ${inspect(
-                  obj
-                )}, overwriting the original value which was ${inspect(
-                  desc.value
-                )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
-              );
-            } else {
-              // Otherwise, the value is either a getter/setter, or it is the correct value.
-              // If it is a getter/setter, then we don't know what activating it might do - it could
-              // be that the user only defined a getter, and so the value will not be set at all. It
-              // could be that the setter is a no-op that does nothing. Both of these are valid ways
-              // to "override" an implicit injection, so we can't really warn here. So, assign the
-              // value like we would normally.
-              obj[keyName] = value;
-            }
-          } else {
-            defineSelfDestructingImplicitInjectionGetter(
-              obj,
-              keyName,
-              value,
-              `A value was injected implicitly on the '${keyName}' property of an instance of ${inspect(
-                obj
-              )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
-            );
-          }
+          defineProperty(obj, keyName, null, value, m); // setup mandatory setter
         } else {
           obj[keyName] = value;
         }
@@ -229,20 +134,6 @@ function initialize(obj, properties) {
   sendEvent(obj, 'init', undefined, undefined, undefined, m);
 }
 
-function defineSelfDestructingImplicitInjectionGetter(obj, keyName, value, message) {
-  Object.defineProperty(obj, keyName, {
-    configurable: true,
-    enumerable: true,
-    get() {
-      // only want to deprecate on first access so we make this self destructing
-      Object.defineProperty(obj, keyName, { value });
-
-      implicitInjectionDeprecation(keyName, message);
-      return value;
-    },
-  });
-}
-
 /**
   `CoreObject` is the base class for all Ember constructs. It establishes a
   class system based on Ember's Mixin system, and provides the basis for the
@@ -1183,16 +1074,4 @@ if (DEBUG) {
   };
 }
 
-function implicitInjectionDeprecation(keyName, msg = null) {
-  deprecate(msg, false, {
-    id: 'implicit-injections',
-    until: '4.0.0',
-    url: 'https://deprecations.emberjs.com/v3.x#toc_implicit-injections',
-    for: 'ember-source',
-    since: {
-      enabled: '3.26.0',
-    },
-  });
-}
-
 export default CoreObject;
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 1a05abdc9c8..5a5faa60012 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -1,7 +1,6 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
-import { inspect } from '@ember/-internals/utils';
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { computed, Mixin, observer, addObserver, alias, tracked } from '@ember/-internals/metal';
+import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
 import Service, { inject as service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
@@ -36,7 +35,7 @@ moduleFor(
       assert.equal(obj.foo.bar, 'foo');
     }
 
-    ['@test implicit injections raises deprecation'](assert) {
+    ['@test implicit injections raises deprecation']() {
       let owner = buildOwner();
 
       class FooService extends Service {
@@ -45,305 +44,11 @@ moduleFor(
       class FooObject extends EmberObject {}
       owner.register('service:foo', FooService);
       owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
 
-      let obj = owner.lookup('foo:main');
-      let result;
-      expectDeprecation(
-        () => (result = obj.foo),
-        `A value was injected implicitly on the 'foo' property of an instance of ${inspect(
-          obj
-        )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
-      );
-
-      assert.equal(result.bar, 'foo');
-      assert.equal(obj.foo.bar, 'foo');
-    }
-
-    ['@test implicit injections raises deprecation for old style EmberObject'](assert) {
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      let FooObject = EmberObject.extend();
-      owner.register('service:foo', FooService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
-
-      let obj = owner.lookup('foo:main');
-      let result;
-      expectDeprecation(
-        () => (result = obj.foo),
-        `A value was injected implicitly on the 'foo' property of an instance of ${inspect(
-          obj
-        )}. Implicit injection is now deprecated, please add an explicit injection for this value. If the injected value is a service, consider using the @service decorator.`
-      );
-
-      assert.equal(result.bar, 'foo');
-      assert.equal(obj.foo.bar, 'foo');
-    }
-
-    ['@test implicit injections does not raise a deprecation if explicit injection present'](
-      assert
-    ) {
-      expectNoDeprecation();
-
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class FooObject extends EmberObject {
-        @service foo;
-      }
-      owner.register('service:foo', FooService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
-
-      let obj = owner.lookup('foo:main');
-      assert.equal(obj.foo.bar, 'foo');
-    }
-
-    ['@test raises deprecation if explicit injection is not the same as the implicit injection'](
-      assert
-    ) {
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        @service foo;
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:bar');
-
-      let result;
       expectDeprecation(
-        () => (result = owner.lookup('foo:main')),
-        /You have explicitly defined a service injection for the 'foo' property on <.*>. However, a different service or value was injected via implicit injections which overrode your explicit injection. Implicit injections have been deprecated, and will be removed in the near future. In order to prevent breakage, you should inject the same value explicitly that is currently being injected implicitly./
+        () => owner.inject('foo:main', 'foo', 'service:foo'),
+        /As of Ember 4.0.0, owner.inject no longer injects values into resolved instances, and calling the method has been deprecated. Since this method no longer does anything, it is fully safe to remove this injection. As an alternative to this API, you can refactor to explicitly inject `foo` on `foo:main`, or look it up directly using the `getOwner` API./
       );
-      assert.equal(result.foo.bar, 'bar');
-    }
-
-    ['@test does not raise deprecation if descriptor is a value and equal to the implicit deprecation'](
-      assert
-    ) {
-      expectNoDeprecation();
-
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        foo = getOwner(this).lookup('service:foo');
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
-
-      let result = owner.lookup('foo:main');
-      assert.equal(result.foo.bar, 'foo');
-    }
-
-    ['@test does raise deprecation if descriptor is a value and not equal to the implicit deprecation'](
-      assert
-    ) {
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        foo = getOwner(this).lookup('service:foo');
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:bar');
-
-      expectDeprecation(() => {
-        let result = owner.lookup('foo:main');
-        assert.equal(result.foo.bar, 'bar');
-      }, /A value was injected implicitly on the 'foo' property of an instance of <.*>, overwriting the original value which was <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/);
-    }
-
-    ['@test does not raise deprecation if descriptor is a tracked property and equal to the implicit deprecation'](
-      assert
-    ) {
-      expectNoDeprecation();
-
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        @tracked foo = getOwner(this).lookup('service:foo');
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
-
-      let result = owner.lookup('foo:main');
-      assert.equal(result.foo.bar, 'foo');
-    }
-
-    ['@test does raise deprecation if descriptor is a tracked property and not equal to the implicit deprecation'](
-      assert
-    ) {
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        @tracked foo = getOwner(this).lookup('service:foo');
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:bar');
-
-      expectDeprecation(() => {
-        let result = owner.lookup('foo:main');
-        assert.equal(result.foo.bar, 'bar');
-      }, /A value was injected implicitly on the 'foo' tracked property of an instance of <.*>, overwriting the original value which was <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/);
-    }
-
-    ['@test does not raise deprecation if descriptor is a computed property with a setter'](
-      assert
-    ) {
-      expectNoDeprecation();
-
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        @computed
-        get foo() {
-          return getOwner(this).lookup('service:foo');
-        }
-
-        set foo(val) {}
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
-
-      let result = owner.lookup('foo:main');
-      assert.equal(result.foo.bar, 'foo');
-    }
-
-    ['@test does raise assertion if descriptor is a computed property without a setter']() {
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        @computed
-        get foo() {
-          return getOwner(this).lookup('service:foo');
-        }
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:bar');
-
-      expectAssertion(() => {
-        expectDeprecation(
-          /A value was injected implicitly on the 'foo' computed property of an instance of <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/
-        );
-        owner.lookup('foo:main');
-      }, /Cannot override the computed property `foo` on <.*>./);
-    }
-
-    ['@test does not raise deprecation if descriptor is a getter and equal to the implicit deprecation'](
-      assert
-    ) {
-      expectNoDeprecation();
-
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        get foo() {
-          return getOwner(this).lookup('service:foo');
-        }
-
-        set foo(_) {}
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:foo');
-
-      let result = owner.lookup('foo:main');
-      assert.equal(result.foo.bar, 'foo');
-    }
-
-    ['@test does not raise deprecation if descriptor is a getter and not equal to the implicit deprecation'](
-      assert
-    ) {
-      let owner = buildOwner();
-
-      class FooService extends Service {
-        bar = 'foo';
-      }
-      class BarService extends Service {
-        bar = 'bar';
-      }
-      class FooObject extends EmberObject {
-        get foo() {
-          return getOwner(this).lookup('service:foo');
-        }
-
-        set foo(_) {}
-      }
-      owner.register('service:foo', FooService);
-      owner.register('service:bar', BarService);
-      owner.register('foo:main', FooObject);
-      owner.inject('foo:main', 'foo', 'service:bar');
-
-      let result = owner.lookup('foo:main');
-      assert.equal(result.foo.bar, 'foo');
     }
 
     ['@test calls computed property setters'](assert) {
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index cdff77056c5..38f9406471a 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -1029,8 +1029,6 @@ const Application = Engine.extend({
       } else { // node
         application.register('service:network', NodeNetworkService);
       }
-
-      application.inject('route', 'network', 'service:network');
     };
 
     export default {
@@ -1041,13 +1039,16 @@ const Application = Engine.extend({
 
     ```app/routes/post.js
     import Route from '@ember/routing/route';
+    import { inject as service } from '@ember/service';
 
     // An example of how the (hypothetical) service is used in routes.
 
-    export default Route.extend({
+    export default class IndexRoute extends Route {
+      @service network;
+
       model(params) {
         return this.network.fetch(`/api/posts/${params.post_id}.json`);
-      },
+      }
 
       afterModel(post) {
         if (post.isExternalContent) {
@@ -1056,7 +1057,7 @@ const Application = Engine.extend({
           return post;
         }
       }
-    });
+    }
     ```
 
     ```javascript
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 899149411ea..ca013a37d27 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -12,7 +12,6 @@ import {
   ApplicationTestCase,
   AbstractTestCase,
   AutobootApplicationTestCase,
-  verifyInjection,
   verifyRegistration,
   runTask,
 } from 'internal-test-helpers';
@@ -126,7 +125,6 @@ moduleFor(
       verifyRegistration(assert, application, '-view-registry:main');
       verifyRegistration(assert, application, 'route:basic');
       verifyRegistration(assert, application, 'event_dispatcher:main');
-      verifyInjection(assert, application, 'view:-outlet', 'namespace', 'application:main');
 
       verifyRegistration(assert, application, 'location:auto');
       verifyRegistration(assert, application, 'location:hash');
@@ -143,20 +141,12 @@ moduleFor(
 
       // DEBUGGING
       verifyRegistration(assert, application, 'resolver-for-debugging:main');
-      verifyInjection(
-        assert,
-        application,
-        'container-debug-adapter:main',
-        'resolver',
-        'resolver-for-debugging:main'
-      );
       verifyRegistration(assert, application, 'container-debug-adapter:main');
       verifyRegistration(assert, application, 'component-lookup:main');
 
       verifyRegistration(assert, application, 'view:-outlet');
       verifyRegistration(assert, application, 'renderer:-dom');
       verifyRegistration(assert, application, 'template:-outlet');
-      verifyInjection(assert, application, 'view:-outlet', 'template', 'template:-outlet');
 
       assert.deepEqual(
         application.registeredOptionsForType('helper'),
diff --git a/packages/@ember/application/tests/dependency_injection_test.js b/packages/@ember/application/tests/dependency_injection_test.js
index aecc515b091..6ac4de6a61d 100644
--- a/packages/@ember/application/tests/dependency_injection_test.js
+++ b/packages/@ember/application/tests/dependency_injection_test.js
@@ -71,23 +71,5 @@ moduleFor(
         'non-singleton lookup worked'
       );
     }
-
-    ['@test injections'](assert) {
-      expectDeprecation(
-        /A value was injected implicitly on the 'fruit' property of an instance of <.*>. Implicit injection is now deprecated, please add an explicit injection for this value/
-      );
-
-      application.inject('model', 'fruit', 'fruit:favorite');
-      application.inject('model:user', 'communication', 'communication:main');
-
-      let user = locator.lookup('model:user');
-      let person = locator.lookup('model:person');
-      let fruit = locator.lookup('fruit:favorite');
-
-      assert.equal(user.get('fruit'), fruit);
-      assert.equal(person.get('fruit'), fruit);
-
-      assert.ok(application.Email.detectInstance(user.get('communication')));
-    }
   }
 );
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 270e5d04869..00e76461c90 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -485,10 +485,6 @@ function commonSetupRegistry(registry) {
 
   registry.register('controller:basic', Controller, { instantiate: false });
 
-  registry.injection('renderer', '_viewRegistry', '-view-registry:main');
-
-  registry.injection('view:-outlet', 'namespace', 'application:main');
-
   // Register the routing service...
   registry.register('service:-routing', RoutingService);
 
@@ -496,8 +492,6 @@ function commonSetupRegistry(registry) {
   registry.register('resolver-for-debugging:main', registry.resolver, {
     instantiate: false,
   });
-  registry.injection('container-debug-adapter:main', 'resolver', 'resolver-for-debugging:main');
-  // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
 
   registry.register('container-debug-adapter:main', ContainerDebugAdapter);
 
diff --git a/packages/@ember/engine/instance.js b/packages/@ember/engine/instance.js
index 5ae670a72b2..56d78227726 100644
--- a/packages/@ember/engine/instance.js
+++ b/packages/@ember/engine/instance.js
@@ -193,9 +193,6 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
     }
 
     singletons.forEach((key) => this.register(key, parent.lookup(key), { instantiate: false }));
-
-    this.inject('view', '_environment', '-environment:main');
-    this.inject('route', '_environment', '-environment:main');
   },
 });
 
@@ -211,8 +208,6 @@ EngineInstance.reopenClass({
     if (!options) {
       return;
     }
-
-    registry.injection('view', '_environment', '-environment:main');
   },
 });
 
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 8507fcc4d0d..650d6934b69 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -8,7 +8,6 @@ import {
   moduleFor,
   AbstractTestCase as TestCase,
   ModuleBasedTestResolver,
-  verifyInjection,
   verifyRegistration,
 } from 'internal-test-helpers';
 
@@ -60,8 +59,6 @@ moduleFor(
         `optionsForType 'view'`
       );
       verifyRegistration(assert, engine, 'controller:basic');
-      verifyInjection(assert, engine, 'renderer', '_viewRegistry', '-view-registry:main');
-      verifyInjection(assert, engine, 'view:-outlet', 'namespace', 'application:main');
 
       verifyRegistration(assert, engine, 'component:-text-field');
       verifyRegistration(assert, engine, 'component:-checkbox');
@@ -73,19 +70,11 @@ moduleFor(
 
       // DEBUGGING
       verifyRegistration(assert, engine, 'resolver-for-debugging:main');
-      verifyInjection(
-        assert,
-        engine,
-        'container-debug-adapter:main',
-        'resolver',
-        'resolver-for-debugging:main'
-      );
       verifyRegistration(assert, engine, 'container-debug-adapter:main');
       verifyRegistration(assert, engine, 'component-lookup:main');
 
       verifyRegistration(assert, engine, 'view:-outlet');
       verifyRegistration(assert, engine, 'template:-outlet');
-      verifyInjection(assert, engine, 'view:-outlet', 'template', 'template:-outlet');
       assert.deepEqual(
         engine.registeredOptionsForType('helper'),
         { instantiate: false },
diff --git a/packages/ember/tests/ember-test-helpers-test.js b/packages/ember/tests/ember-test-helpers-test.js
index 67d0769490e..f3e6ce6c747 100644
--- a/packages/ember/tests/ember-test-helpers-test.js
+++ b/packages/ember/tests/ember-test-helpers-test.js
@@ -46,7 +46,9 @@ module('@ember/test-helpers emulation test', function () {
     function setupRenderingContext(context) {
       let { owner } = context;
       let OutletView = owner.factoryFor('view:-outlet');
-      let toplevelView = OutletView.create();
+      let environment = owner.lookup('-environment:main');
+      let outletTemplateFactory = owner.lookup('template:-outlet');
+      let toplevelView = OutletView.create({ environment, template: outletTemplateFactory });
 
       owner.register('-top-level-view:main', {
         create() {
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.js
index 49cb9317178..5695bf2329f 100644
--- a/packages/internal-test-helpers/index.js
+++ b/packages/internal-test-helpers/index.js
@@ -38,4 +38,4 @@ export {
 } from './lib/test-resolver';
 
 export { isEdge } from './lib/browser-detect';
-export { verifyInjection, verifyRegistration } from './lib/registry-check';
+export { verifyRegistration } from './lib/registry-check';
diff --git a/packages/internal-test-helpers/lib/registry-check.js b/packages/internal-test-helpers/lib/registry-check.js
index dd75bf7c65a..cc33fdcb370 100644
--- a/packages/internal-test-helpers/lib/registry-check.js
+++ b/packages/internal-test-helpers/lib/registry-check.js
@@ -1,28 +1,3 @@
 export function verifyRegistration(assert, owner, fullName) {
   assert.ok(owner.resolveRegistration(fullName), `has registration: ${fullName}`);
 }
-
-export function verifyInjection(assert, owner, fullName, property, injectionName) {
-  let registry = owner.__registry__;
-  let injections;
-
-  if (fullName.indexOf(':') === -1) {
-    injections = registry.getTypeInjections(fullName);
-  } else {
-    injections = registry.getInjections(registry.normalize(fullName));
-  }
-
-  let normalizedName = registry.normalize(injectionName);
-  let hasInjection = false;
-  let injection;
-
-  for (let i = 0, l = injections.length; i < l; i++) {
-    injection = injections[i];
-    if (injection.property === property && injection.specifier === normalizedName) {
-      hasInjection = true;
-      break;
-    }
-  }
-
-  assert.ok(hasInjection, `has injection: ${fullName}.${property} = ${injectionName}`);
-}
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.js
index b3c59286749..ed271628e2c 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.js
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.js
@@ -18,14 +18,12 @@ export default class RenderingTestCase extends AbstractTestCase {
       ownerOptions: this.getOwnerOptions(),
       resolver: this.getResolver(),
       bootOptions,
+      viewRegistry: Object.create(null),
     }));
 
     owner.register('-view-registry:main', Object.create(null), { instantiate: false });
     owner.register('event_dispatcher:main', EventDispatcher);
 
-    // TODO: why didn't buildOwner do this for us?
-    owner.inject('renderer', '_viewRegistry', '-view-registry:main');
-
     this.renderer = this.owner.lookup('renderer:-dom');
     this.element = document.querySelector('#qunit-fixture');
     this.component = null;
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.js b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
index 61faf22da91..ed31bb3f6ef 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
@@ -16,14 +16,12 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
       ownerOptions: this.getOwnerOptions(),
       resolver: this.getResolver(),
       bootOptions,
+      viewRegistry: Object.create(null),
     }));
 
     owner.register('-view-registry:main', Object.create(null), { instantiate: false });
     owner.register('event_dispatcher:main', EventDispatcher);
 
-    // TODO: why didn't buildOwner do this for us?
-    owner.inject('renderer', '_viewRegistry', '-view-registry:main');
-
     this.renderer = this.owner.lookup('renderer:-dom');
     this.element = document.querySelector('#qunit-fixture');
     this.component = null;
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 0b18828dbf8..3b98b3f264d 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -31,7 +31,6 @@ module.exports = {
     '_helpers',
     '_hydrateUnsuppliedQueryParams',
     '_initializersRan',
-    '_injections',
     '_internalReset',
     '_invoke',
     '_lazyInjections',
@@ -52,7 +51,6 @@ module.exports = {
     '_serializeQueryParams',
     '_setRouteName',
     '_stashNames',
-    '_typeInjections',
     '_typeOptions',
     '_unwatchInstance',
     '_updatingQPChanged',
@@ -288,7 +286,6 @@ module.exports = {
     'initializer',
     'initState',
     'inject',
-    'injection',
     'injectTestHelpers',
     'input',
     'insertAt',
@@ -543,7 +540,6 @@ module.exports = {
     'triggerAction',
     'trySet',
     'type',
-    'typeInjection',
     'typeOf',
     'typeWatchers',
     'unbound',
diff --git a/tests/node/helpers/setup-component.js b/tests/node/helpers/setup-component.js
index 7321695af4f..174c75c0b54 100644
--- a/tests/node/helpers/setup-component.js
+++ b/tests/node/helpers/setup-component.js
@@ -48,7 +48,8 @@ function setupComponentTest() {
   this._hasRendered = false;
   let OutletView = module.owner.factoryFor('view:-outlet');
   let outletTemplateFactory = module.owner.lookup('template:-outlet');
-  module.component = OutletView.create();
+  let environment = module.owner.lookup('-environment:main');
+  module.component = OutletView.create({ environment, template: outletTemplateFactory });
   this._outletState = {
     render: {
       owner: module.owner || undefined,
diff --git a/tests/node/visit-test.js b/tests/node/visit-test.js
index a478b867bfe..47452946ae1 100644
--- a/tests/node/visit-test.js
+++ b/tests/node/visit-test.js
@@ -227,16 +227,16 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
   });
 
   QUnit.test('Resource-discovery setup', function (assert) {
-    this.service('network', {
-      init: function () {
-        this.set('requests', []);
-      },
+    class Network {
+      constructor() {
+        this.requests = [];
+      }
 
-      fetch: function (url) {
-        this.get('requests').push(url);
+      fetch(url) {
+        this.requests.push(url);
         return Promise.resolve();
-      },
-    });
+      }
+    }
 
     this.routes(function () {
       this.route('a');
@@ -246,9 +246,10 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
       this.route('e');
     });
 
+    let network;
     this.route('a', {
       model: function () {
-        return this.network.fetch('/a');
+        return network.fetch('/a');
       },
       afterModel: function () {
         this.replaceWith('b');
@@ -257,7 +258,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
 
     this.route('b', {
       model: function () {
-        return this.network.fetch('/b');
+        return network.fetch('/b');
       },
       afterModel: function () {
         this.replaceWith('c');
@@ -266,13 +267,13 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
 
     this.route('c', {
       model: function () {
-        return this.network.fetch('/c');
+        return network.fetch('/c');
       },
     });
 
     this.route('d', {
       model: function () {
-        return this.network.fetch('/d');
+        return network.fetch('/d');
       },
       afterModel: function () {
         this.replaceWith('e');
@@ -281,7 +282,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
 
     this.route('e', {
       model: function () {
-        return this.network.fetch('/e');
+        return network.fetch('/e');
       },
     });
 
@@ -302,31 +303,37 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
 
     let App = this.createApplication();
 
-    App.inject('route', 'network', 'service:network');
-
     function assertResources(url, resources) {
+      network = new Network();
+
       return App.visit(url, { isBrowser: false, shouldRender: false }).then(function (instance) {
         try {
           let viewRegistry = instance.lookup('-view-registry:main');
           assert.strictEqual(Object.keys(viewRegistry).length, 0, 'did not create any views');
 
-          let networkService = instance.lookup('service:network');
-          assert.deepEqual(networkService.get('requests'), resources);
+          assert.deepEqual(network.requests, resources);
         } finally {
           instance.destroy();
         }
       }, handleError(assert));
     }
 
-    return Promise.all([
-      assertResources('/a', ['/a', '/b', '/c']),
-      assertResources('/b', ['/b', '/c']),
-      assertResources('/c', ['/c']),
-      assertResources('/d', ['/d', '/e']),
-      assertResources('/e', ['/e']),
-    ]).then(function () {
-      assert.strictEqual(xFooInstances, 0, 'it should not create any x-foo components');
-    });
+    return assertResources('/a', ['/a', '/b', '/c'])
+      .then(() => {
+        return assertResources('/b', ['/b', '/c']);
+      })
+      .then(() => {
+        return assertResources('/c', ['/c']);
+      })
+      .then(() => {
+        return assertResources('/d', ['/d', '/e']);
+      })
+      .then(() => {
+        return assertResources('/e', ['/e']);
+      })
+      .then(() => {
+        assert.strictEqual(xFooInstances, 0, 'it should not create any x-foo components');
+      });
   });
 
   QUnit.test('FastBoot: tagless components can render', function (assert) {

From 6f39bcba80a16ef1c3b7091e323ca721a1c06ca5 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 17 Aug 2021 20:05:23 -0700
Subject: [PATCH 0626/1405] Remove template-compiler.registerPlugin

---
 packages/ember-template-compiler/index.ts     |   2 -
 .../lib/system/compile-options.ts             | 120 +--------------
 .../ember-template-compiler/lib/types.d.ts    |  11 +-
 .../tests/basic-usage-test.js                 |  51 +------
 .../tests/system/compile_options_test.js      | 140 ------------------
 packages/ember/index.js                       |   1 -
 6 files changed, 10 insertions(+), 315 deletions(-)

diff --git a/packages/ember-template-compiler/index.ts b/packages/ember-template-compiler/index.ts
index 85baf317ec0..e65ee16e7de 100644
--- a/packages/ember-template-compiler/index.ts
+++ b/packages/ember-template-compiler/index.ts
@@ -31,8 +31,6 @@ export {
   default as compileOptions,
   buildCompileOptions as _buildCompileOptions,
   transformsFor as _transformsFor,
-  registerPlugin,
-  unregisterPlugin,
 } from './lib/system/compile-options';
 export { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from './lib/plugins/index';
 export { EmberPrecompileOptions } from './lib/types';
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index f6d42c8b2ff..37f660d3dfe 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,6 +1,5 @@
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
-import { AST, ASTPlugin, ASTPluginEnvironment, Syntax } from '@glimmer/syntax';
+import { assert } from '@ember/debug';
 import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index';
 import { EmberPrecompileOptions, PluginFunc } from '../types';
 import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
@@ -63,127 +62,12 @@ export default function compileOptions(
   } else {
     let potententialPugins = [...USER_PLUGINS, ...builtInPlugins];
     assert('expected plugins', options.plugins);
-    let providedPlugins = options.plugins.ast.map((plugin) => wrapLegacyPluginIfNeeded(plugin));
     let pluginsToAdd = potententialPugins.filter((plugin) => {
       assert('expected plugins', options.plugins);
       return options.plugins.ast.indexOf(plugin) === -1;
     });
-    options.plugins.ast = providedPlugins.concat(pluginsToAdd);
+    options.plugins.ast = options.plugins.ast.concat(pluginsToAdd);
   }
 
   return options;
 }
-
-interface LegacyPlugin {
-  transform(node: AST.Program): AST.Node;
-  syntax: Syntax;
-}
-
-export type LegacyPluginClass = new (env: ASTPluginEnvironment) => LegacyPlugin;
-
-function isLegacyPluginClass(plugin: PluginFunc | LegacyPluginClass): plugin is LegacyPluginClass {
-  return plugin.prototype && typeof plugin.prototype.transform === 'function';
-}
-
-function wrapLegacyPluginIfNeeded(plugin: PluginFunc | LegacyPluginClass): PluginFunc {
-  if (isLegacyPluginClass(plugin)) {
-    const Plugin = plugin;
-
-    deprecate(
-      `Using class based template compilation plugins is deprecated, please update to the functional style: ${Plugin.name}`,
-      false,
-      {
-        id: 'template-compiler.registerPlugin',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.27.0',
-        },
-      }
-    );
-
-    const pluginFunc: PluginFunc = (env: ASTPluginEnvironment): ASTPlugin => {
-      let pluginInstantiated = false;
-
-      return {
-        name: plugin.name,
-
-        visitor: {
-          Program(node: AST.Program): AST.Node | void {
-            if (!pluginInstantiated) {
-              pluginInstantiated = true;
-              let instance = new Plugin(env);
-
-              instance.syntax = env.syntax;
-
-              return instance.transform(node);
-            }
-          },
-        },
-      };
-    };
-
-    pluginFunc.__raw = Plugin;
-
-    return pluginFunc;
-  } else {
-    return plugin;
-  }
-}
-
-export function registerPlugin(type: string, _plugin: PluginFunc | LegacyPluginClass): void {
-  deprecate(
-    'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.',
-    false,
-    {
-      id: 'template-compiler.registerPlugin',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-    }
-  );
-
-  if (type !== 'ast') {
-    throw new Error(
-      `Attempting to register ${_plugin} as "${type}" which is not a valid Glimmer plugin type.`
-    );
-  }
-
-  for (let i = 0; i < USER_PLUGINS.length; i++) {
-    let PLUGIN = USER_PLUGINS[i];
-    if (PLUGIN === _plugin || PLUGIN.__raw === _plugin) {
-      return;
-    }
-  }
-
-  let plugin = wrapLegacyPluginIfNeeded(_plugin);
-
-  USER_PLUGINS = [plugin, ...USER_PLUGINS];
-}
-
-export function unregisterPlugin(type: string, PluginClass: PluginFunc | LegacyPluginClass): void {
-  deprecate(
-    'unregisterPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.',
-    false,
-    {
-      id: 'template-compiler.registerPlugin',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-    }
-  );
-
-  if (type !== 'ast') {
-    throw new Error(
-      `Attempting to unregister ${PluginClass} as "${type}" which is not a valid Glimmer plugin type.`
-    );
-  }
-
-  USER_PLUGINS = USER_PLUGINS.filter(
-    (plugin) => plugin !== PluginClass && plugin.__raw !== PluginClass
-  );
-}
diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts
index 35cc1c710b1..7b2b85eb346 100644
--- a/packages/ember-template-compiler/lib/types.d.ts
+++ b/packages/ember-template-compiler/lib/types.d.ts
@@ -4,13 +4,16 @@ import {
   builders,
   PrecompileOptions,
 } from '@glimmer/syntax';
-import { LegacyPluginClass } from './system/compile-options';
 
 export type Builders = typeof builders;
 
-export interface PluginFunc extends ASTPluginBuilder<EmberASTPluginEnvironment> {
-  __raw?: LegacyPluginClass;
-}
+/*
+ * It seems like it should be possible to reepxport the `ASTPluginBuilder`
+ * interface with a new named export, but the I wasn't able to figure out the
+ * typing. Here export the interface subclass with no modification.
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface PluginFunc extends ASTPluginBuilder<EmberASTPluginEnvironment> {}
 
 interface Plugins {
   ast: PluginFunc[];
diff --git a/packages/ember-template-compiler/tests/basic-usage-test.js b/packages/ember-template-compiler/tests/basic-usage-test.js
index 4626b599048..9889f8c34f9 100644
--- a/packages/ember-template-compiler/tests/basic-usage-test.js
+++ b/packages/ember-template-compiler/tests/basic-usage-test.js
@@ -1,23 +1,6 @@
-import {
-  _buildCompileOptions,
-  _preprocess,
-  _print,
-  registerPlugin,
-  unregisterPlugin,
-} from '../index';
+import { _buildCompileOptions, _preprocess, _print } from '../index';
 import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
 
-function reverseElementNodeTag() {
-  return {
-    name: 'reverse-element-node-tag',
-    visitor: {
-      ElementNode(node) {
-        node.tag = node.tag.split('').reverse().join('');
-      },
-    },
-  };
-}
-
 function removeDataTest() {
   return {
     name: 'remove-data-test',
@@ -39,13 +22,6 @@ function removeDataTest() {
 moduleFor(
   'ember-template-compiler: Embroider-like compilation',
   class extends RenderingTestCase {
-    afterEach() {
-      expectDeprecation(() => {
-        unregisterPlugin('ast', removeDataTest);
-      }, /unregisterPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
-      return super.afterEach();
-    }
-
     '@test can process a subset of AST plugins and print'(assert) {
       let template = '<div data-test="foo" data-blah="derp" class="hahaha">&nbsp;</div>';
 
@@ -63,30 +39,5 @@ moduleFor(
 
       assert.equal(result, '<div data-blah="derp" class="hahaha">&nbsp;</div>');
     }
-
-    '@test registerPlugin based transforms can be avoided'(assert) {
-      expectDeprecation(() => {
-        registerPlugin('ast', removeDataTest);
-      }, /registerPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
-
-      let template = '<div data-test="foo" data-blah="derp" class="hahaha">&nbsp;</div>';
-
-      // build up options including strictMode default values, customizeComponentName, meta.moduleName, etc
-      let options = _buildCompileOptions({
-        mode: 'codemod',
-        moduleName: 'components/foo',
-        plugins: {
-          ast: [reverseElementNodeTag],
-        },
-      });
-
-      let transformedTemplateAST = _preprocess(template, options);
-
-      // print back to a handlebars string
-      let result = _print(transformedTemplateAST, { entityEncoding: 'raw' });
-
-      // only reverseElementNodeTag has ran, **not** removeDataTest
-      assert.equal(result, '<vid data-test="foo" data-blah="derp" class="hahaha">&nbsp;</vid>');
-    }
   }
 );
diff --git a/packages/ember-template-compiler/tests/system/compile_options_test.js b/packages/ember-template-compiler/tests/system/compile_options_test.js
index 2b75b69f36d..36e4afb82a9 100644
--- a/packages/ember-template-compiler/tests/system/compile_options_test.js
+++ b/packages/ember-template-compiler/tests/system/compile_options_test.js
@@ -3,8 +3,6 @@ import {
   compileOptions,
   RESOLUTION_MODE_TRANSFORMS,
   STRICT_MODE_TRANSFORMS,
-  registerPlugin,
-  unregisterPlugin,
 } from '../../index';
 import { moduleFor, AbstractTestCase, RenderingTestCase } from 'internal-test-helpers';
 
@@ -49,38 +47,7 @@ moduleFor(
   }
 );
 
-let customTransformCounter = 0;
-class LegacyCustomTransform {
-  constructor(options) {
-    customTransformCounter++;
-    this.options = options;
-    this.syntax = null;
-  }
-
-  transform(ast) {
-    let walker = new this.syntax.Walker();
-
-    walker.visit(ast, (node) => {
-      if (node.type !== 'ElementNode') {
-        return;
-      }
-
-      for (let i = 0; i < node.attributes.length; i++) {
-        let attribute = node.attributes[i];
-
-        if (attribute.name === 'data-test') {
-          node.attributes.splice(i, 1);
-        }
-      }
-    });
-
-    return ast;
-  }
-}
-
 function customTransform() {
-  customTransformCounter++;
-
   return {
     name: 'remove-data-test',
 
@@ -98,113 +65,6 @@ function customTransform() {
   };
 }
 
-class CustomPluginsTests extends RenderingTestCase {
-  afterEach() {
-    customTransformCounter = 0;
-    return super.afterEach();
-  }
-
-  ['@test custom plugins can be used']() {
-    this.render('<div data-test="foo" data-blah="derp" class="hahaha"></div>');
-    this.assertElement(this.firstChild, {
-      tagName: 'div',
-      attrs: { class: 'hahaha', 'data-blah': 'derp' },
-      content: '',
-    });
-  }
-
-  ['@test wrapped plugins are only invoked once per template'](assert) {
-    this.render('<div>{{#if this.falsey}}nope{{/if}}</div>');
-    assert.equal(customTransformCounter, 1, 'transform should only be instantiated once');
-  }
-}
-
-moduleFor(
-  'ember-template-compiler: [DEPRECATED] registerPlugin with a custom plugins in legacy format',
-  class extends CustomPluginsTests {
-    beforeEach() {
-      expectDeprecation(
-        `Using class based template compilation plugins is deprecated, please update to the functional style: ${LegacyCustomTransform.name}`
-      );
-      expectDeprecation(
-        'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.'
-      );
-      registerPlugin('ast', LegacyCustomTransform);
-    }
-
-    afterEach() {
-      expectDeprecation(() => {
-        unregisterPlugin('ast', LegacyCustomTransform);
-      }, /unregisterPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
-      return super.afterEach();
-    }
-
-    ['@test custom registered plugins are deduplicated'](assert) {
-      expectDeprecation(
-        `Using class based template compilation plugins is deprecated, please update to the functional style: ${LegacyCustomTransform.name}`
-      );
-      expectDeprecation(
-        'registerPlugin is deprecated, please pass plugins directly via `compile` and/or `precompile`.'
-      );
-      registerPlugin('ast', LegacyCustomTransform);
-
-      this.registerTemplate(
-        'application',
-        '<div data-test="foo" data-blah="derp" class="hahaha"></div>'
-      );
-      assert.equal(customTransformCounter, 1, 'transform should only be instantiated once');
-    }
-  }
-);
-
-moduleFor(
-  'ember-template-compiler: [DEPRECATED] registerPlugin with a custom plugins',
-  class extends CustomPluginsTests {
-    beforeEach() {
-      expectDeprecation(() => {
-        registerPlugin('ast', customTransform);
-      }, /registerPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
-    }
-
-    afterEach() {
-      expectDeprecation(() => {
-        unregisterPlugin('ast', customTransform);
-      }, /unregisterPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
-
-      return super.afterEach();
-    }
-
-    ['@test custom registered plugins are deduplicated'](assert) {
-      expectDeprecation(() => {
-        registerPlugin('ast', customTransform);
-      }, /registerPlugin is deprecated, please pass plugins directly via `compile` and\/or `precompile`/);
-
-      this.registerTemplate(
-        'application',
-        '<div data-test="foo" data-blah="derp" class="hahaha"></div>'
-      );
-      assert.equal(customTransformCounter, 1, 'transform should only be instantiated once');
-    }
-  }
-);
-
-moduleFor(
-  'ember-template-compiler: custom plugins in legacy format passed to compile',
-  class extends RenderingTestCase {
-    // override so that we can provide custom AST plugins to compile
-    compile(templateString) {
-      expectDeprecation(
-        'Using class based template compilation plugins is deprecated, please update to the functional style: LegacyCustomTransform'
-      );
-      return compile(templateString, {
-        plugins: {
-          ast: [LegacyCustomTransform],
-        },
-      });
-    }
-  }
-);
-
 moduleFor(
   'ember-template-compiler: custom plugins passed to compile',
   class extends RenderingTestCase {
diff --git a/packages/ember/index.js b/packages/ember/index.js
index ffa9aeeb8b3..e1750535291 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -603,7 +603,6 @@ function defineEmberTemplateCompilerLazyLoad(key) {
 
         EmberHTMLBars.precompile = EmberHandlebars.precompile = templateCompiler.precompile;
         EmberHTMLBars.compile = EmberHandlebars.compile = templateCompiler.compile;
-        EmberHTMLBars.registerPlugin = templateCompiler.registerPlugin;
 
         Object.defineProperty(Ember, 'HTMLBars', {
           configurable: true,

From 0ed4bbf8f611756f1152650f9895a4c4e250575d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 18:18:17 +0000
Subject: [PATCH 0627/1405] Bump actions/upload-artifact from 1 to 2.2.4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 1 to 2.2.4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v1...v2.2.4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abcda5c84a5..a657c32e81f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -55,7 +55,7 @@ jobs:
           BROCCOLI_ENV: production
         run: yarn ember build
       - name: Upload build
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2.2.4
         with:
           name: dist
           path: dist

From 5dd7b050b155ca5eba5ac19db5d57d52289c5c0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 18:23:55 +0000
Subject: [PATCH 0628/1405] Bump expect-type from 0.11.0 to 0.12.0

Bumps [expect-type](https://github.com/mmkal/ts/tree/HEAD/packages/expect-type) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/mmkal/ts/releases)
- [Changelog](https://github.com/mmkal/ts/blob/main/packages/expect-type/CHANGELOG.md)
- [Commits](https://github.com/mmkal/ts/commits/expect-type_v0.12.0/packages/expect-type)

---
updated-dependencies:
- dependency-name: expect-type
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ad670f5138c..f639d1d5815 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-qunit": "^4.0.0",
     "execa": "^5.1.1",
-    "expect-type": "^0.11.0",
+    "expect-type": "^0.12.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
     "fs-extra": "^9.1.0",
diff --git a/yarn.lock b/yarn.lock
index 5ec8b04f36c..8e48aa1ffac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4960,10 +4960,10 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect-type@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.11.0.tgz#bce1a3e283f0334eedb39699b57dd27be7009cc1"
-  integrity sha512-hkObxepDKhTYloH/UZoxYTT2uUzdhvDEwAi0oqdk29XEkHF8p+5ZRpX/BZES2PtGN9YgyEqutIjXfnL9iMflMw==
+expect-type@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.12.0.tgz#133534b5e2561158c371e74af63fd8f18a9f3d42"
+  integrity sha512-IHwziEOjpjXqxQhtOAD5zMiQpGztaEKM4Q8wnwoRN9NIFlnyNHNjRxKWv+18UqRfsqi6vVnZIYFU16ePf+HaqA==
 
 express@^4.10.7, express@^4.13.1, express@^4.16.4, express@^4.17.1:
   version "4.17.1"
@@ -6583,6 +6583,11 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"

From ca584b1a193091dcd3013986ef575d5cc4f9a937 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 18:24:40 +0000
Subject: [PATCH 0629/1405] Bump eslint-plugin-prettier from 3.3.1 to 3.4.1

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.3.1 to 3.4.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ad670f5138c..c7aa614f5c7 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "eslint-plugin-ember-internal": "^1.1.1",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-qunit": "^4.0.0",
     "execa": "^5.1.1",
     "expect-type": "^0.11.0",
diff --git a/yarn.lock b/yarn.lock
index 5ec8b04f36c..c2c03383a1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4706,10 +4706,10 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7"
-  integrity "sha1-cHnPoklweJBQEeb4Lo3YRT0Tcbc= sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ=="
+eslint-plugin-prettier@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
+  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -6583,6 +6583,11 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"

From 5b102edb838c04e4594be30be60aa16726994d80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 18:25:54 +0000
Subject: [PATCH 0630/1405] Bump inflection from 1.12.0 to 1.13.1

Bumps [inflection](https://github.com/dreamerslab/node.inflection) from 1.12.0 to 1.13.1.
- [Release notes](https://github.com/dreamerslab/node.inflection/releases)
- [Changelog](https://github.com/dreamerslab/node.inflection/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dreamerslab/node.inflection/compare/v1.12.0...v1.13.1)

---
updated-dependencies:
- dependency-name: inflection
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ad670f5138c..3e991a4e211 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-version-checker": "^5.1.1",
     "ember-router-generator": "^2.0.0",
-    "inflection": "^1.12.0",
+    "inflection": "^1.13.1",
     "jquery": "^3.5.1",
     "resolve": "^1.17.0",
     "semver": "^7.3.4",
diff --git a/yarn.lock b/yarn.lock
index 5ec8b04f36c..37974052420 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6083,10 +6083,10 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
 
-inflection@^1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416"
-  integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=
+inflection@^1.12.0, inflection@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.1.tgz#c5cadd80888a90cf84c2e96e340d7edc85d5f0cb"
+  integrity sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -6583,6 +6583,11 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"

From 4f403127602efca9ca81288bcabb1671a0212b1d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 23 Aug 2021 14:41:38 -0400
Subject: [PATCH 0631/1405] Add v4.0.0-beta.2 to CHANGELOG

(cherry picked from commit fa88559c2a256ab8dca513dc02d02ad56ffda497)
---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a51f7b27c1..0d9ad08b7ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Ember Changelog
 
+### v4.0.0-beta.2 (August 23, 2021)
+
+- [#19680](https://github.com/emberjs/ember.js/pull/19680) [DEPRECATION] Deprecate owner.inject per [RFC #680](https://github.com/emberjs/rfcs/blob/sn/owner-inject-deprecation/text/0680-implicit-injection-deprecation.md#1-deprecate-implicit-injection-on-target-object) and cleanup related deprecations that are `until: 4.0.0`.
+- [#19706](https://github.com/emberjs/ember.js/pull/19706) [BUGFIX] Explicitly drop Node 10 support to match support policy.
+- [#19650](https://github.com/emberjs/ember.js/pull/19650) [CLEANUP] Remove deprecated mouse events
+- [#19675](https://github.com/emberjs/ember.js/pull/19675) [CLEANUP] Remove jQuery usage from ember-testing
+- [#19704](https://github.com/emberjs/ember.js/pull/19704) [CLEANUP] Remove template-compiler.registerPlugin
+- [#19707](https://github.com/emberjs/ember.js/pull/19707) [CLEANUP] Remove Application Controller Router Properties
+
 ### v4.0.0-beta.1 (August 17, 2021)
 
 - [#19649](https://github.com/emberjs/ember.js/pull/19649) / [#19692](https://github.com/emberjs/ember.js/pull/19692) [DEPRECATION] Add deprecation warning to Ember.assign implementing [RFC #750](https://github.com/emberjs/rfcs/blob/master/text/0750-deprecate-ember-assign.md).

From 4b513906fcab1d4b74761a77882f5f3340b15491 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 23 Aug 2021 15:17:04 -0400
Subject: [PATCH 0632/1405] Upgrade to actions/setup-node@v2 and use the
 included caching

---
 .github/workflows/alpha-releases.yml | 14 ++---
 .github/workflows/ci.yml             | 84 ++++++++--------------------
 2 files changed, 28 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index 62ab7f06b9d..f56a3cbd52f 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -10,13 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -35,14 +32,11 @@ jobs:
     needs: [test]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
+          cache: yarn
           registry-url: 'https://registry.npmjs.org'
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: setup git
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index abcda5c84a5..19d0d0ea5b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,13 +23,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: linting
@@ -40,13 +37,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -70,13 +64,10 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -99,13 +90,10 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -122,13 +110,10 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -146,13 +131,10 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - uses: actions/download-artifact@v1
@@ -170,13 +152,10 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build
@@ -194,13 +173,10 @@ jobs:
     needs: [lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - uses: actions/download-artifact@v1
@@ -216,13 +192,10 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - uses: actions/download-artifact@v1
@@ -239,14 +212,11 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
           registry-url: 'https://registry.npmjs.org'
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build for publish
@@ -264,13 +234,10 @@ jobs:
     if: github.event_name == 'push' && contains(github.ref, 'cron') != true
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build for publish
@@ -290,13 +257,10 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 12.x
-      - uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ci-modules-${{ hashFiles('**/yarn.lock') }}
+          cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
       - name: build for publish

From da67195b657e1167fe5fb6b749366c907ea77a61 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 20:00:46 +0000
Subject: [PATCH 0633/1405] Bump actions/download-artifact from 1 to 2.0.10

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 1 to 2.0.10.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v1...v2.0.10)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19d0d0ea5b0..15efb5e6c0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v2.0.10
         with:
           name: dist
           path: dist
@@ -179,7 +179,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v2.0.10
         with:
           name: dist
           path: dist
@@ -198,7 +198,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v1
+      - uses: actions/download-artifact@v2.0.10
         with:
           name: dist
           path: dist

From 793cfddc69fd438f17c5b301dd6d1d523cc65afa Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Fri, 20 Aug 2021 20:45:56 -0700
Subject: [PATCH 0634/1405] [CLEANUP beta] Remove
 class-binding-and-class-name-bindings-in-templates

---
 .../components/class-bindings-test.js         | 326 ------------------
 .../components/link-to/routing-curly-test.js  |  54 ---
 .../lib/plugins/index.ts                      |   2 -
 .../transform-old-class-binding-syntax.ts     | 154 ---------
 4 files changed, 536 deletions(-)
 delete mode 100644 packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
index a5c6951bc72..b451caa8db5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
@@ -125,82 +125,6 @@ moduleFor(
       });
     }
 
-    ['@test it can have class name bindings in the template']() {
-      expectDeprecation(
-        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render(
-        '{{foo-bar classNameBindings="this.model.someInitiallyTrueProperty this.model.someInitiallyFalseProperty this.model.someInitiallyUndefinedProperty :static this.model.isBig:big this.model.isOpen:open:closed this.model.isUp::down this.model.bar:isTruthy:isFalsy"}}',
-        {
-          model: {
-            someInitiallyTrueProperty: true,
-            someInitiallyFalseProperty: false,
-            isBig: true,
-            isOpen: false,
-            isUp: true,
-            bar: true,
-          },
-        }
-      );
-
-      this.assertComponentElement(this.firstChild, {
-        attrs: {
-          class: classes('ember-view some-initially-true-property static big closed isTruthy'),
-        },
-        content: 'hello',
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        attrs: {
-          class: classes('ember-view some-initially-true-property static big closed isTruthy'),
-        },
-        content: 'hello',
-      });
-
-      runTask(() => {
-        set(this.context, 'model.someInitiallyTrueProperty', false);
-        set(this.context, 'model.someInitiallyFalseProperty', true);
-        set(this.context, 'model.someInitiallyUndefinedProperty', true);
-        set(this.context, 'model.isBig', false);
-        set(this.context, 'model.isOpen', true);
-        set(this.context, 'model.isUp', false);
-        set(this.context, 'model.bar', false);
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        attrs: {
-          class: classes(
-            'ember-view some-initially-false-property some-initially-undefined-property static open down isFalsy'
-          ),
-        },
-        content: 'hello',
-      });
-
-      runTask(() => {
-        set(this.context, 'model', {
-          someInitiallyTrueProperty: true,
-          someInitiallyFalseProperty: false,
-          someInitiallyUndefinedProperty: undefined,
-          isBig: true,
-          isOpen: false,
-          isUp: true,
-          bar: true,
-        });
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        attrs: {
-          class: classes('ember-view some-initially-true-property static big closed isTruthy'),
-        },
-        content: 'hello',
-      });
-    }
-
     ['@test it can have class name bindings with nested paths']() {
       let FooBarComponent = Component.extend({
         classNameBindings: ['foo.bar', 'is.enabled:enabled', 'is.happy:happy:sad'],
@@ -346,47 +270,6 @@ moduleFor(
       });
     }
 
-    ['@test const bindings can be set as attrs']() {
-      expectDeprecation(
-        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-      this.render('{{foo-bar classNameBindings="this.foo:enabled:disabled"}}', {
-        foo: true,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view enabled') },
-        content: 'hello',
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view enabled') },
-        content: 'hello',
-      });
-
-      runTask(() => set(this.context, 'foo', false));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view disabled') },
-        content: 'hello',
-      });
-
-      runTask(() => set(this.context, 'foo', true));
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        attrs: { class: classes('ember-view enabled') },
-        content: 'hello',
-      });
-    }
-
     ['@test :: class name syntax works with an empty true class']() {
       let FooBarComponent = Component.extend({
         classNameBindings: ['isEnabled::not-enabled'],
@@ -678,212 +561,3 @@ moduleFor(
     }
   }
 );
-
-moduleFor(
-  'ClassBinding integration',
-  class extends RenderingTestCase {
-    ['@test it should apply classBinding without condition always']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding=":foo"}}');
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('foo  ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('foo  ember-view') },
-      });
-    }
-
-    ['@test it should merge classBinding with class']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.birdman:respeck" class="myName"}}', {
-        birdman: true,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('respeck myName ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('respeck myName ember-view') },
-      });
-    }
-
-    ['@test it should apply classBinding with only truthy condition']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.myName:respeck"}}', {
-        myName: true,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('respeck  ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('respeck  ember-view') },
-      });
-    }
-
-    ['@test it should apply classBinding with only falsy condition']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.myName::shade"}}', {
-        myName: false,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('shade  ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('shade  ember-view') },
-      });
-    }
-
-    ['@test it should apply nothing when classBinding is falsy but only supplies truthy class']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.myName:respeck"}}', {
-        myName: false,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('ember-view') },
-      });
-    }
-
-    ['@test it should apply nothing when classBinding is truthy but only supplies falsy class']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.myName::shade"}}', { myName: true });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('ember-view') },
-      });
-    }
-
-    ['@test it should apply classBinding with falsy condition']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.swag:fresh:scrub"}}', {
-        swag: false,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('scrub  ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('scrub  ember-view') },
-      });
-    }
-
-    ['@test it should apply classBinding with truthy condition']() {
-      expectDeprecation(
-        "Passing the `classBinding` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('-top-level' @ L1:C0) "
-      );
-
-      this.registerComponent('foo-bar', { template: 'hello' });
-
-      this.render('{{foo-bar classBinding="this.swag:fresh:scrub"}}', {
-        swag: true,
-      });
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('fresh  ember-view') },
-      });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'div',
-        content: 'hello',
-        attrs: { class: classes('fresh  ember-view') },
-      });
-    }
-  }
-);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index b8cc6247317..3df012cfa86 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -579,60 +579,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it supports 'classNameBindings' with custom values [GH #11699]`](
-      assert
-    ) {
-      expectDeprecation(
-        "Passing the `classNameBindings` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ('my-app/templates/index.hbs' @ L3:C29) "
-      );
-
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <div id="about-link">{{#link-to route='about' classNameBindings='this.foo:foo-is-true:foo-is-false'}}About{{/link-to}}</div>
-        `
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          foo = false;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@class` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link > a.foo-is-false').length,
-        1,
-        'The about-link was rendered with the falsy class'
-      );
-
-      await expectDeprecation(
-        () => runTask(() => controller.set('foo', true)),
-        /Passing the `@class` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link > a.foo-is-true').length,
-        1,
-        'The about-link was rendered with the truthy class after toggling the property'
-      );
-    }
-
     async ['@test Using {{link-to}} inside a non-routable engine errors'](assert) {
       this.add(
         'engine:not-routable',
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 06d4b3b5c05..1cf5dd39ad6 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -10,7 +10,6 @@ import TransformEachInIntoEach from './transform-each-in-into-each';
 import TransformEachTrackArray from './transform-each-track-array';
 import TransformInElement from './transform-in-element';
 import TransformLinkTo from './transform-link-to';
-import TransformOldClassBindingSyntax from './transform-old-class-binding-syntax';
 import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings-into-just-bindings';
 import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
@@ -20,7 +19,6 @@ import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS, EMBER_NAMED_BLOCKS } from '@ember/
 // order of plugins is important
 export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
   [
-    TransformOldClassBindingSyntax,
     TransformQuotedBindingsIntoJustBindings,
     AssertReservedNamedArguments,
     TransformActionSyntax,
diff --git a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
deleted file mode 100644
index 19351f3c8db..00000000000
--- a/packages/ember-template-compiler/lib/plugins/transform-old-class-binding-syntax.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-import { deprecate } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { Builders, EmberASTPluginEnvironment } from '../types';
-
-export default function transformOldClassBindingSyntax(env: EmberASTPluginEnvironment): ASTPlugin {
-  let b = env.syntax.builders;
-  let moduleName = env.meta?.moduleName;
-
-  return {
-    name: 'transform-old-class-binding-syntax',
-
-    visitor: {
-      MustacheStatement(node: AST.MustacheStatement) {
-        process(b, node, moduleName);
-      },
-
-      BlockStatement(node: AST.BlockStatement) {
-        process(b, node, moduleName);
-      },
-    },
-  };
-}
-
-function process(
-  b: Builders,
-  node: AST.BlockStatement | AST.MustacheStatement,
-  moduleName: string | undefined
-) {
-  let allOfTheMicrosyntaxes: AST.HashPair[] = [];
-  let allOfTheMicrosyntaxIndexes: number[] = [];
-  let classPair: AST.HashPair | undefined;
-
-  each(node.hash.pairs, (pair, index) => {
-    let { key } = pair;
-
-    if (key === 'classBinding' || key === 'classNameBindings') {
-      deprecate(
-        `Passing the \`${key}\` property as an argument within templates has been deprecated. Instead, you can pass the class argument and use concatenation to produce the class value dynamically. ${calculateLocationDisplay(
-          moduleName,
-          node.loc
-        )}`,
-        false,
-        {
-          id: 'class-binding-and-class-name-bindings-in-templates',
-          url:
-            'https://deprecations.emberjs.com/v3.x/#toc_class-binding-and-class-name-bindings-in-templates',
-          until: '4.0.0',
-          for: 'ember-source',
-          since: {
-            enabled: '3.26.0',
-          },
-        }
-      );
-
-      allOfTheMicrosyntaxIndexes.push(index);
-      allOfTheMicrosyntaxes.push(pair);
-    } else if (key === 'class') {
-      classPair = pair;
-    }
-  });
-
-  if (allOfTheMicrosyntaxes.length === 0) {
-    return;
-  }
-
-  let classValue: AST.Expression[] = [];
-
-  if (classPair) {
-    classValue.push(classPair.value);
-    classValue.push(b.string(' '));
-  } else {
-    classPair = b.pair('class', null as any);
-    node.hash.pairs.push(classPair);
-  }
-
-  each(allOfTheMicrosyntaxIndexes, (index) => {
-    node.hash.pairs.splice(index, 1);
-  });
-
-  each(allOfTheMicrosyntaxes, ({ value }) => {
-    let sexprs: AST.Expression[] = [];
-    // TODO: add helpful deprecation when both `classNames` and `classNameBindings` can
-    // be removed.
-
-    if (value.type === 'StringLiteral') {
-      let microsyntax = parseMicrosyntax(value.original);
-
-      buildSexprs(microsyntax, sexprs, b);
-
-      classValue.push(...sexprs);
-    }
-  });
-
-  let hash = b.hash();
-  classPair.value = b.sexpr(b.path('concat'), classValue, hash);
-}
-
-function buildSexprs(microsyntax: string[][], sexprs: AST.Expression[], b: Builders) {
-  for (let i = 0; i < microsyntax.length; i++) {
-    let [propName, activeClass, inactiveClass] = microsyntax[i];
-    let sexpr;
-
-    // :my-class-name microsyntax for static values
-    if (propName === '') {
-      sexpr = b.string(activeClass);
-    } else {
-      let params: AST.Expression[] = [b.path(propName)];
-
-      if (activeClass || activeClass === '') {
-        params.push(b.string(activeClass));
-      } else {
-        let sexprParams = [b.string(propName), b.path(propName)];
-
-        let hash = b.hash();
-        if (activeClass !== undefined) {
-          hash.pairs.push(b.pair('activeClass', b.string(activeClass)));
-        }
-
-        if (inactiveClass !== undefined) {
-          hash.pairs.push(b.pair('inactiveClass', b.string(inactiveClass)));
-        }
-
-        params.push(b.sexpr(b.path('-normalize-class'), sexprParams, hash));
-      }
-
-      if (inactiveClass || inactiveClass === '') {
-        params.push(b.string(inactiveClass));
-      }
-
-      sexpr = b.sexpr(b.path('if'), params);
-    }
-
-    sexprs.push(sexpr);
-    sexprs.push(b.string(' '));
-  }
-}
-
-function each<T>(list: T[], callback: (t: T, i: number) => void) {
-  for (let i = 0; i < list.length; i++) {
-    callback(list[i], i);
-  }
-}
-
-function parseMicrosyntax(string: string): string[][] {
-  let segments = string.split(' ');
-  let ret: string[][] = [];
-
-  for (let i = 0; i < segments.length; i++) {
-    ret[i] = segments[i].split(':');
-  }
-
-  return ret;
-}

From 9f61c7a8520e01856e94893bf2049cc69f788397 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 26 Aug 2021 16:45:30 -0600
Subject: [PATCH 0635/1405] [BUGFIX release] fix router test regression in
 urlFor and recognize

As part of the improvements made between 3.24 and 3.28, the router
microlib is now lazily loaded. When these changes were made, there were
a couple cases where it *should* be possible to access router state in
a non-application test (integration etc.) but it currently is not
because the router is not necessarily set up. Since `setupRouter` is
idempotent, call it in those functions so that if it is *not* set up,
it gets set up, and otherwise it will continue working as expected.
---
 packages/@ember/-internals/routing/lib/services/router.ts  | 3 +++
 .../router_service_test/non_application_test_test.js       | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 9c07ccdc612..54b7ea05e2f 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -241,6 +241,7 @@ export default class RouterService extends Service {
      @public
    */
   urlFor(routeName: string, ...args: any[]) {
+    this._router.setupRouter();
     return this._router.generate(routeName, ...args);
   }
 
@@ -376,6 +377,7 @@ export default class RouterService extends Service {
       `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
       url.indexOf(this.rootURL) === 0
     );
+    this._router.setupRouter();
     let internalURL = cleanURL(url, this.rootURL);
     return this._router._routerMicrolib.recognize(internalURL);
   }
@@ -396,6 +398,7 @@ export default class RouterService extends Service {
       `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
       url.indexOf(this.rootURL) === 0
     );
+    this._router.setupRouter();
     let internalURL = cleanURL(url, this.rootURL);
     return this._router._routerMicrolib.recognizeAndLoad(internalURL);
   }
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index add81994bdd..f24f24b8e00 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -66,14 +66,15 @@ moduleFor(
     }
 
     ['@test RouterService#urlFor returns url'](assert) {
-      let router = this.owner.lookup('router:main');
-      router.setupRouter();
       assert.equal(this.routerService.urlFor('parent.child'), '/child');
     }
 
     ['@test RouterService#transitionTo with basic route'](assert) {
       assert.expect(2);
 
+      // Callers who want to actually execute a transition in a non-application
+      // test are doing something weird and therefore should do
+      // `owner.setupRouter()` explicitly in their tests.
       let componentInstance;
       let router = this.owner.lookup('router:main');
       router.setupRouter();
@@ -107,8 +108,6 @@ moduleFor(
     }
 
     ['@test RouterService#recognize recognize returns routeInfo'](assert) {
-      let router = this.owner.lookup('router:main');
-      router.setupRouter();
       let routeInfo = this.routerService.recognize('/dynamic-with-child/123/1?a=b');
       assert.ok(routeInfo);
       let { name, localName, parent, child, params, queryParams, paramNames } = routeInfo;

From 70e95eaa305640d4ca2c08754b2c34c120b2c3cc Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 30 Aug 2021 14:40:41 -0400
Subject: [PATCH 0636/1405] Add v4.0.0-beta.3 to CHANGELOG

(cherry picked from commit 293bc9caf2304906b7f42a3c7be4c26b23f4ea9b)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d9ad08b7ce..24d690c56a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.0.0-beta.3 (August 30, 2021)
+
+- [#19708](https://github.com/emberjs/ember.js/pull/19708) [CLEANUP] Remove class-binding-and-class-name-bindings-in-templates
+
 ### v4.0.0-beta.2 (August 23, 2021)
 
 - [#19680](https://github.com/emberjs/ember.js/pull/19680) [DEPRECATION] Deprecate owner.inject per [RFC #680](https://github.com/emberjs/rfcs/blob/sn/owner-inject-deprecation/text/0680-implicit-injection-deprecation.md#1-deprecate-implicit-injection-on-target-object) and cleanup related deprecations that are `until: 4.0.0`.

From c448335c98daf33196072c6040d9e8b05aa516b3 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 30 Aug 2021 16:40:50 -0400
Subject: [PATCH 0637/1405] Add v3.28.1 to CHANGELOG.md.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24d690c56a5..54bfbf49904 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,10 @@
 - [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
 - [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 
+### v3.28.1 (August 30, 2021)
+
+- [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized
+
 ### v3.28.0 (August 9, 2021)
 
 - [#19697](https://github.com/emberjs/ember.js/pull/19697) [BUGFIX] Ensure `deserializeQueryParam` is called for lazy routes

From f41668d8dc44bd40328746ff187f138ab07711c8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:11:48 +0000
Subject: [PATCH 0638/1405] Bump testem from 3.1.0 to 3.5.0

Bumps [testem](https://github.com/testem/testem) from 3.1.0 to 3.5.0.
- [Release notes](https://github.com/testem/testem/releases)
- [Commits](https://github.com/testem/testem/compare/v3.1.0...v3.5.0)

---
updated-dependencies:
- dependency-name: testem
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 159 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 147 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index ad670f5138c..9e965860a6a 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
-    "testem": "^3.1.0",
+    "testem": "^3.5.0",
     "testem-failure-only-reporter": "^0.0.1",
     "tslint": "^5.20.1",
     "typescript": "^4.2.4"
diff --git a/yarn.lock b/yarn.lock
index 5ec8b04f36c..f8e86753c27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1844,6 +1844,21 @@
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
 
+"@types/component-emitter@^1.2.10":
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
+  integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
+
+"@types/cookie@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
+
+"@types/cors@^2.8.12":
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+
 "@types/estree@*", "@types/estree@0.0.38":
   version "0.0.38"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
@@ -1890,6 +1905,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
   integrity sha512-HOtU5KqROKT7qX/itKHuTtt5fV0iXbheQvrgbLNXFJQBY/eh+VS5vmmTAVlo3qIGMsypm0G4N1t2AXjy1ZicaQ==
 
+"@types/node@>=10.0.0":
+  version "16.7.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc"
+  integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==
+
 "@types/node@^9.6.0":
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
@@ -2002,6 +2022,11 @@
     "@typescript-eslint/types" "4.3.0"
     eslint-visitor-keys "^2.0.0"
 
+"@xmldom/xmldom@^0.7.1":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.4.tgz#93b2f9486c88b6464e97f76c9ab49b0a548fbe57"
+  integrity sha512-wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -2538,7 +2563,7 @@ base64-js@^1.0.2:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity "sha1-WOzoy3XdB+ce0IxzarxfrE2/jfE= sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
 
-base64id@2.0.0:
+base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
   integrity "sha1-J3Csa8R9MSr5eov5pjQ0LgzSXLY= sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="
@@ -3821,6 +3846,14 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
+cors@~2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3912,6 +3945,13 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@~4.3.1, debug@~4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -4446,6 +4486,13 @@ engine.io-parser@~2.2.0:
     blob "0.0.5"
     has-binary2 "~1.0.2"
 
+engine.io-parser@~4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6"
+  integrity sha512-xEAAY0msNnESNPc00e19y5heTPX4y/TJ36gr8t1voOaNmTojP9b3oK3BbJLFufW2XFPQaaijpFewm2g2Um3uqA==
+  dependencies:
+    base64-arraybuffer "0.1.4"
+
 engine.io@~3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
@@ -4458,6 +4505,19 @@ engine.io@~3.5.0:
     engine.io-parser "~2.2.0"
     ws "~7.4.2"
 
+engine.io@~5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.0.tgz#554cdd0230d89de7b1a49a809d7ee5a129d36809"
+  integrity sha512-d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "~0.4.1"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~4.0.0"
+    ws "~7.4.2"
+
 enquirer@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -6266,6 +6326,11 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
 
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -6447,6 +6512,13 @@ is-windows@^1.0.1, is-windows@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity "sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0= sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -6583,6 +6655,11 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -7589,6 +7666,11 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
 
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -7670,6 +7752,18 @@ node-notifier@^5.0.1:
     shellwords "^0.1.0"
     which "^1.2.12"
 
+node-notifier@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-9.0.1.tgz#cea837f4c5e733936c7b9005e6545cea825d1af4"
+  integrity sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==
+  dependencies:
+    growly "^1.3.0"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
+    shellwords "^0.1.1"
+    uuid "^8.3.0"
+    which "^2.0.2"
+
 node-releases@^1.1.71:
   version "1.1.72"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
@@ -7767,7 +7861,7 @@ oauth-sign@~0.3.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.3.0.tgz#cb540f93bb2b22a7d5941691a288d60e8ea9386e"
   integrity "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4= sha512-Tr31Sh5FnK9YKm7xTUPyDMsNOvMqkVDND0zvK/Wgj7/H9q8mpye0qG2nVzrnsvLhcsX5DtqXD0la0ks6rkPCGQ=="
 
-object-assign@4.1.1, object-assign@^4.1.0:
+object-assign@4.1.1, object-assign@^4, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -8241,6 +8335,11 @@ printf@^0.5.1:
   resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.1.tgz#e0466788260859ed153006dc6867f09ddf240cf3"
   integrity "sha1-4EZniCYIWe0VMAbcaGfwnd8kDPM= sha512-UaE/jO0hNsrvPGQEb4LyNzcrJv9Z00tsreBduOSxMtrebvoUhxiEJ4YCHX8YHf6akwfKsC2Gyv5zv47UXhMiLg=="
 
+printf@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/printf/-/printf-0.6.1.tgz#b9afa3d3b55b7f2e8b1715272479fc756ed88650"
+  integrity sha512-is0ctgGdPJ5951KulgfzvHGwJtZ5ck8l042vRkV6jrkpBzTmb/lueTqguWHy2JfVA+RY6gFVlaZgUS0j7S/dsw==
+
 private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -9066,7 +9165,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity "sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
 
-shellwords@^0.1.0:
+shellwords@^0.1.0, shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
@@ -9155,6 +9254,11 @@ socket.io-adapter@~1.1.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
   integrity "sha1-qz8Nb2a4/H/KOVmrWZH4IiF4m+k= sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="
 
+socket.io-adapter@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz#039cd7c71a52abad984a6d57da2c0b7ecdd3c289"
+  integrity sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg==
+
 socket.io-client@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
@@ -9190,6 +9294,15 @@ socket.io-parser@~3.4.0:
     debug "~4.1.0"
     isarray "2.0.1"
 
+socket.io-parser@~4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
+  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
+  dependencies:
+    "@types/component-emitter" "^1.2.10"
+    component-emitter "~1.3.0"
+    debug "~4.3.1"
+
 socket.io@^2.1.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
@@ -9202,6 +9315,21 @@ socket.io@^2.1.0:
     socket.io-client "2.4.0"
     socket.io-parser "~3.4.0"
 
+socket.io@^4.1.2:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.2.0.tgz#9e1c09d3ea647e24963a2e7ba8ea5c847778e2ed"
+  integrity sha512-sjlGfMmnaWvTRVxGRGWyhd9ctpg4APxWAxu85O/SxekkxHhfxmePWZbaYCkeX5QQX0z1YEnKOlNt6w82E4Nzug==
+  dependencies:
+    "@types/cookie" "^0.4.1"
+    "@types/cors" "^2.8.12"
+    "@types/node" ">=10.0.0"
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    debug "~4.3.2"
+    engine.io "~5.2.0"
+    socket.io-adapter "~2.3.2"
+    socket.io-parser "~4.0.4"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -9702,11 +9830,12 @@ testem@^2.14.0, testem@^2.9.2:
     tmp "0.0.33"
     xmldom "^0.1.19"
 
-testem@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.1.0.tgz#d27ec0b5593706c5cb005d8829b5abd329c86c16"
-  integrity "sha1-0n7AtVk3BsXLAF2IKbWr0ynIbBY= sha512-wmPMqwocl9sU7kk32+fRpYFQVwL2XO6PszYF3IPIi6exw3zXb879Ulw4NQrkybdNtTS8yj9yv2lEuvYgpulbaw=="
+testem@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.5.0.tgz#c77cc1e46114c60f6f16c4f221a8a222346fb211"
+  integrity sha512-qucRtq6aDVrCc6aEyz15CxIpjij95B8XTHpRT7xrTdTw3iFypZw95DQjX+EnGmGIqUB7CGapv3L2OP+HAlHUBg==
   dependencies:
+    "@xmldom/xmldom" "^0.7.1"
     backbone "^1.1.2"
     bluebird "^3.4.6"
     charm "^1.0.0"
@@ -9726,16 +9855,15 @@ testem@^3.1.0:
     lodash.uniqby "^4.7.0"
     mkdirp "^0.5.1"
     mustache "^3.0.0"
-    node-notifier "^5.0.1"
+    node-notifier "^9.0.1"
     npmlog "^4.0.0"
-    printf "^0.5.1"
+    printf "^0.6.1"
     rimraf "^2.4.4"
-    socket.io "^2.1.0"
+    socket.io "^4.1.2"
     spawn-args "^0.2.0"
     styled_string "0.0.1"
     tap-parser "^7.0.0"
     tmp "0.0.33"
-    xmldom "^0.1.19"
 
 text-table@^0.2.0:
   version "0.2.0"
@@ -10168,6 +10296,11 @@ uuid@^2.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
   integrity "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg=="
 
+uuid@^8.3.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 v8-compile-cache@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
@@ -10188,7 +10321,7 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-vary@~1.1.2:
+vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
@@ -10314,7 +10447,7 @@ which@1.3.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1:
+which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="

From 4c8230e2573391518a6a5fc272e0c36bb42af1fa Mon Sep 17 00:00:00 2001
From: Ilya Radchenko <knownasilya@gmail.com>
Date: Thu, 2 Sep 2021 00:46:26 -0400
Subject: [PATCH 0639/1405] [DOC beta] remove classic syntax examples from
 macros

Part of https://github.com/emberjs/ember.js/issues/19702 initiative
---
 .../object/lib/computed/computed_macros.js    | 373 ------------------
 1 file changed, 373 deletions(-)

diff --git a/packages/@ember/object/lib/computed/computed_macros.js b/packages/@ember/object/lib/computed/computed_macros.js
index 368a3e5640b..b90b08664b0 100644
--- a/packages/@ember/object/lib/computed/computed_macros.js
+++ b/packages/@ember/object/lib/computed/computed_macros.js
@@ -87,25 +87,6 @@ function generateComputedWithPredicate(name, predicate) {
   todoList.isDone; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { empty } from '@ember/object/computed';
-
-  let ToDoList = EmberObject.extend({
-    isDone: empty('todos')
-  });
-
-  let todoList = ToDoList.create({
-    todos: ['Unit Test', 'Documentation', 'Release']
-  });
-
-  todoList.isDone; // false
-  set(todoList, 'todos', []);
-  todoList.isDone; // true
-  ```
-
   @since 1.6.0
   @method empty
   @static
@@ -155,25 +136,6 @@ export function empty(dependentKey) {
   hamster.hasStuff; // false
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { notEmpty } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    hasStuff: notEmpty('backpack')
-  });
-
-  let hamster = Hamster.create({
-    backpack: ['Food', 'Sleeping Bag', 'Tent']
-  });
-
-  hamster.hasStuff; // true
-  set(hamster, 'backpack', []);
-  hamster.hasStuff; // false
-  ```
-
   @method notEmpty
   @static
   @for @ember/object/computed
@@ -217,27 +179,6 @@ export function notEmpty(dependentKey) {
   hamster.isHungry; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { none } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    isHungry: none('food')
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.isHungry; // true
-
-  set(hamster, 'food', 'Banana');
-  hamster.isHungry; // false
-
-  set(hamster, 'food', null);
-  hamster.isHungry; // true
-  ```
-
   @method none
   @static
   @for @ember/object/computed
@@ -280,25 +221,6 @@ export function none(dependentKey) {
   user.isAnonymous; // false
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { not } from '@ember/object/computed';
-
-  let User = EmberObject.extend({
-    loggedIn: false,
-
-    isAnonymous: not('loggedIn')
-  });
-
-  let user = User.create();
-
-  user.isAnonymous; // true
-  set(user, 'loggedIn', true);
-  user.isAnonymous; // false
-  ```
-
   @method not
   @static
   @for @ember/object/computed
@@ -347,31 +269,6 @@ export function not(dependentKey) {
   hamster.hasBananas; // false
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { bool } from '@ember/object/computed';
-
-
-  let Hamster = EmberObject.extend({
-    hasBananas: bool('numBananas')
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.hasBananas; // false
-
-  set(hamster, 'numBananas', 0);
-  hamster.hasBananas; // false
-
-  set(hamster, 'numBananas', 1);
-  hamster.hasBananas; // true
-
-  set(hamster, 'numBananas', null);
-  hamster.hasBananas; // false
-  ```
-
   @method bool
   @static
   @for @ember/object/computed
@@ -417,27 +314,6 @@ export function bool(dependentKey) {
   user.hasValidEmail; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { match } from '@ember/object/computed';
-
-  let User = EmberObject.extend({
-    hasValidEmail: match('email', /^.+@.+\..+$/)
-  });
-
-  let user = User.create();
-
-  user.hasValidEmail; // false
-
-  set(user, 'email', '');
-  user.hasValidEmail; // false
-
-  set(user, 'email', 'ember_hamster@example.com');
-  user.hasValidEmail; // true
-  ```
-
   @method match
   @static
   @for @ember/object/computed
@@ -484,27 +360,6 @@ export function match(dependentKey, regexp) {
   hamster.satisfied; // false
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { equal } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    satisfied: equal('percentCarrotsEaten', 100)
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.satisfied; // false
-
-  set(hamster, 'percentCarrotsEaten', 100);
-  hamster.satisfied; // true
-
-  set(hamster, 'percentCarrotsEaten', 50);
-  hamster.satisfied; // false
-  ```
-
   @method equal
   @static
   @for @ember/object/computed
@@ -550,27 +405,6 @@ export function equal(dependentKey, value) {
   hamster.hasTooManyBananas; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { gt } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    hasTooManyBananas: gt('numBananas', 10)
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.hasTooManyBananas; // false
-
-  set(hamster, 'numBananas', 3);
-  hamster.hasTooManyBananas; // false
-
-  set(hamster, 'numBananas', 11);
-  hamster.hasTooManyBananas; // true
-  ```
-
   @method gt
   @static
   @for @ember/object/computed
@@ -616,27 +450,6 @@ export function gt(dependentKey, value) {
   hamster.hasTooManyBananas; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { gte } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    hasTooManyBananas: gte('numBananas', 10)
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.hasTooManyBananas; // false
-
-  set(hamster, 'numBananas', 3);
-  hamster.hasTooManyBananas; // false
-
-  set(hamster, 'numBananas', 10);
-  hamster.hasTooManyBananas; // true
-  ```
-
   @method gte
   @static
   @for @ember/object/computed
@@ -682,27 +495,6 @@ export function gte(dependentKey, value) {
   hamster.needsMoreBananas; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { lt } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    needsMoreBananas: lt('numBananas', 3)
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.needsMoreBananas; // true
-
-  set(hamster, 'numBananas', 3);
-  hamster.needsMoreBananas; // false
-
-  set(hamster, 'numBananas', 2);
-  hamster.needsMoreBananas; // true
-  ```
-
   @method lt
   @static
   @for @ember/object/computed
@@ -748,27 +540,6 @@ export function lt(dependentKey, value) {
   hamster.needsMoreBananas; // true
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { lte } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    needsMoreBananas: lte('numBananas', 3)
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.needsMoreBananas; // true
-
-  set(hamster, 'numBananas', 5);
-  hamster.needsMoreBananas; // false
-
-  set(hamster, 'numBananas', 3);
-  hamster.needsMoreBananas; // true
-  ```
-
   @method lte
   @static
   @for @ember/object/computed
@@ -825,34 +596,6 @@ export function lte(dependentKey, value) {
   tomster.readyForHike; // null
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { and } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    readyForCamp: and('hasTent', 'hasBackpack'),
-    readyForHike: and('hasWalkingStick', 'hasBackpack')
-  });
-
-  let tomster = Hamster.create();
-
-  tomster.readyForCamp; // false
-
-  set(tomster, 'hasTent', true);
-  tomster.readyForCamp; // false
-
-  set(tomster, 'hasBackpack', true);
-  tomster.readyForCamp; // true
-
-  set(tomster, 'hasBackpack', 'Yes');
-  tomster.readyForCamp; // 'Yes'
-
-  set(tomster, 'hasWalkingStick', null);
-  tomster.readyForHike; // null
-  ```
-
   @method and
   @static
   @for @ember/object/computed
@@ -896,31 +639,6 @@ export const and = generateComputedWithPredicate('and', (value) => value);
   tomster.readyForBeach; // 'Check'
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { or } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    readyForRain: or('hasJacket', 'hasUmbrella'),
-    readyForBeach: or('hasSunscreen', 'hasUmbrella')
-  });
-
-  let tomster = Hamster.create();
-
-  tomster.readyForRain; // undefined
-
-  set(tomster, 'hasUmbrella', true);
-  tomster.readyForRain; // true
-
-  set(tomster, 'hasJacket', 'Yes');
-  tomster.readyForRain; // 'Yes'
-
-  set(tomster, 'hasSunscreen', 'Check');
-  tomster.readyForBeach; // 'Check'
-  ```
-
   @method or
   @static
   @for @ember/object/computed
@@ -957,27 +675,6 @@ export const or = generateComputedWithPredicate('or', (value) => !value);
   alex.name;  // '@machty'
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { alias } from '@ember/object/computed';
-
-  let Person = EmberObject.extend({
-    name: 'Alex Matchneer',
-
-    nomen: alias('name')
-  });
-
-  let alex = Person.create();
-
-  alex.nomen; // 'Alex Matchneer'
-  alex.name;  // 'Alex Matchneer'
-
-  set(alex, 'nomen', '@machty');
-  alex.name;  // '@machty'
-  ```
-
   @method alias
   @static
   @for @ember/object/computed
@@ -1018,31 +715,6 @@ export const or = generateComputedWithPredicate('or', (value) => !value);
   teddy.nickName; // 'TeddyBear'
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { oneWay } from '@ember/object/computed';
-
-  let User = EmberObject.extend({
-    firstName: null,
-    lastName: null,
-
-    nickName: oneWay('firstName')
-  });
-
-  let teddy = User.create({
-    firstName: 'Teddy',
-    lastName: 'Zeenny'
-  });
-
-  teddy.nickName; // 'Teddy'
-
-  set(teddy, 'nickName', 'TeddyBear'); // 'TeddyBear'
-  teddy.firstName; // 'Teddy'
-  teddy.nickName; // 'TeddyBear'
-  ```
-
   @method oneWay
   @static
   @for @ember/object/computed
@@ -1106,32 +778,6 @@ export function oneWay(dependentKey) {
   teddy.firstName; // 'Teddy'
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { readOnly } from '@ember/object/computed';
-
-  let User = EmberObject.extend({
-    firstName: null,
-    lastName: null,
-
-    nickName: readOnly('firstName')
-  });
-
-  let teddy = User.create({
-    firstName: 'Teddy',
-    lastName:  'Zeenny'
-  });
-
-  teddy.nickName; // 'Teddy'
-
-  set(teddy, 'nickName', 'TeddyBear'); // throws Exception
-  // throw new EmberError('Cannot Set: nickName on: <User:ember27288>' );`
-
-  teddy.firstName; // 'Teddy'
-  ```
-
   @method readOnly
   @static
   @for @ember/object/computed
@@ -1175,25 +821,6 @@ export function readOnly(dependentKey) {
   hamster.cavendishCount; // 5
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { deprecatingAlias } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    bananaCount: deprecatingAlias('cavendishCount', {
-      id: 'hamster.deprecate-banana',
-      until: '3.0.0'
-    })
-  });
-
-  let hamster = Hamster.create();
-
-  set(hamster, 'bananaCount', 5); // Prints a deprecation warning.
-  hamster.cavendishCount; // 5
-  ```
-
   @method deprecatingAlias
   @static
   @for @ember/object/computed

From cec2980d97cfc5f5cfded08eb3f67bb90b033753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Sandstr=C3=B6m?= <mail+github@a16m.se>
Date: Thu, 25 Mar 2021 21:51:51 +0100
Subject: [PATCH 0640/1405] Deprecate auto location

---
 .../-internals/routing/lib/system/router.ts   | 16 ++++++++++
 .../routing/tests/system/router_test.js       | 29 +++++++++++--------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index cb6a6d4ece7..dc7a07f7f61 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -859,6 +859,22 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     if ('string' === typeof location) {
       let resolvedLocation = owner.lookup<IEmberLocation>(`location:${location}`);
 
+      if (location === 'auto') {
+        deprecate(
+          "Router location 'auto' is deprecated. Most users will want to set `locationType` to 'history' in config/environment.js for no change in behavior. See deprecation docs for details.",
+          false,
+          {
+            id: 'deprecate-auto-location',
+            until: '5.0.0',
+            url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-auto-location',
+            for: 'ember-source',
+            since: {
+              enabled: '4.1.0',
+            },
+          }
+        );
+      }
+
       if (resolvedLocation !== undefined) {
         location = set(this, 'location', resolvedLocation);
       } else {
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index 8a82387e405..fcad45e2bc6 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -98,7 +98,7 @@ moduleFor(
     }
 
     ['@test replacePath should be called with the right path'](assert) {
-      assert.expect(1);
+      assert.expect(2);
 
       let location = owner.lookup('location:auto');
 
@@ -117,11 +117,13 @@ moduleFor(
       location.global = { onhashchange() {} };
       location.history = null;
 
-      createRouter({
-        settings: {
-          location: 'auto',
-          rootURL: '/rootdir/',
-        },
+      expectDeprecation(() => {
+        createRouter({
+          settings: {
+            location: 'auto',
+            rootURL: '/rootdir/',
+          },
+        });
       });
     }
 
@@ -177,7 +179,7 @@ moduleFor(
     }
 
     ["@test AutoLocation should replace the url when it's not in the preferred format"](assert) {
-      assert.expect(1);
+      assert.expect(2);
 
       let location = owner.lookup('location:auto');
 
@@ -191,16 +193,19 @@ moduleFor(
           assert.equal(url, 'http://test.com/rootdir/#/welcome');
         },
       };
+
       location.history = null;
       location.global = {
         onhashchange() {},
       };
 
-      createRouter({
-        settings: {
-          location: 'auto',
-          rootURL: '/rootdir/',
-        },
+      expectDeprecation(() => {
+        createRouter({
+          settings: {
+            location: 'auto',
+            rootURL: '/rootdir/',
+          },
+        });
       });
     }
 

From 5af5b9f1393e856bc7f8ab0c6c68e71cb3c57b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Sandstr=C3=B6m?= <mail+github@a16m.se>
Date: Thu, 25 Mar 2021 21:54:33 +0100
Subject: [PATCH 0641/1405] Deprecate calling Location.create

This functionality has been deprecated since 2014,
but there wasn't any deprecation message before.

See commit #1d1d0db4 for details.
---
 .../-internals/routing/lib/location/api.ts       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index cc4ac1d2040..5b8e16c2a59 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -1,4 +1,4 @@
-import { assert } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 
 export interface EmberLocation {
   implementation: string;
@@ -111,6 +111,20 @@ export default {
       Boolean(implementationClass)
     );
 
+    deprecate(
+      "Calling `create` on Location class is deprecated. Instead, use `container.lookup('location:my-location')` to lookup the location you need.",
+      false,
+      {
+        id: 'deprecate-auto-location',
+        until: '5.0.0',
+        url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-auto-location',
+        for: 'ember-source',
+        since: {
+          enabled: '4.1.0',
+        },
+      }
+    );
+
     return implementationClass.create(...arguments);
   },
 

From f74ef2a845d223705b4e227e3ab200f94e0c12d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Sandstr=C3=B6m?= <mail+github@a16m.se>
Date: Thu, 25 Mar 2021 22:27:14 +0100
Subject: [PATCH 0642/1405] Deprecate Location.detect

We're only showing the deprecation warning for locations other
than 'auto', since auto already have it's own deprecation message.

We're also moving the rootURL trailing slash check from detect
to initState. That assert has nothing to do with detection, but it
was likely added there because that method is called *after*
the rootURL value is set on the location (by the router).

Luckily, the initState method is also called after that value is set,
so we can use that hook instead.

We're hijacking a method for something that isn't it's primary purpose,
but that was the case with the existing code too, so this seems
like a reasonable solution.
---
 .../routing/lib/location/none_location.ts        |  7 ++++++-
 .../-internals/routing/lib/system/router.ts      | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
index a7ea318c471..808e0ed9fc1 100644
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -38,9 +38,14 @@ export default class NoneLocation extends EmberObject implements EmberLocation {
   // Set in reopen so it can be overwritten with extend
   declare rootURL: string;
 
-  detect(): void {
+  initState(): void {
+    this._super(...arguments);
+
     let { rootURL } = this;
 
+    // This assert doesn't have anything to do with state initialization,
+    // but we're hijacking this method since it's called after the route has
+    // set the rootURL property on its Location instance.
     assert(
       'rootURL must end with a trailing forward slash e.g. "/app/"',
       rootURL.charAt(rootURL.length - 1) === '/'
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index dc7a07f7f61..c27a46b4734 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -896,6 +896,22 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       // detecting history support. This gives it a chance to set its
       // `cancelRouterSetup` property which aborts routing.
       if (typeof location.detect === 'function') {
+        if (this.location !== 'auto') {
+          deprecate(
+            'The `detect` method on the Location object is deprecated. If you need detection you can run your detection code in app.js, before setting the location type.',
+            false,
+            {
+              id: 'deprecate-auto-location',
+              until: '5.0.0',
+              url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-auto-location',
+              for: 'ember-source',
+              since: {
+                enabled: '4.1.0',
+              },
+            }
+          );
+        }
+
         location.detect();
       }
 

From 1b90e284745e4b45cf8db0f074e597ec229e5fed Mon Sep 17 00:00:00 2001
From: Gabriela <gabilarreglemail@gmail.com>
Date: Mon, 6 Sep 2021 14:42:36 +0200
Subject: [PATCH 0643/1405] [DOC beta] Deprecation link for
 Ember.Component.reopen

---
 .../@ember/-internals/glimmer/lib/component.ts     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 3494db26f01..e856100fa9d 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1083,8 +1083,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.component.reopen',
             for: 'ember-source',
-            since: {},
-            until: '4.0.0',
+            since: {
+              enabled: '4.0.0',
+            },
+            url: 'https://deprecations.emberjs.com/v4.x#toc_ember-component-reopen',
+            until: '5.0.0',
           }
         );
 
@@ -1109,8 +1112,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.component.reopen',
             for: 'ember-source',
-            since: {},
-            until: '4.0.0',
+            url: 'https://deprecations.emberjs.com/v4.x#toc_ember-component-reopen',
+            since: {
+              enabled: '4.0.0',
+            },
+            until: '5.0.0',
           }
         );
 

From d7d629ae223a8a1aaf33e3630ac309430a87e4d6 Mon Sep 17 00:00:00 2001
From: Ilya Radchenko <knownasilya@gmail.com>
Date: Mon, 13 Sep 2021 10:10:29 -0400
Subject: [PATCH 0644/1405] [DOC beta] remove classic syntax examples from
 reduce computed

 Part of https://github.com/emberjs/ember.js/issues/19702 initiative
---
 .../lib/computed/reduce_computed_macros.js    | 351 ------------------
 1 file changed, 351 deletions(-)

diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.js b/packages/@ember/object/lib/computed/reduce_computed_macros.js
index 81f5b1f51fd..ca1eb307184 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.js
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.js
@@ -72,23 +72,6 @@ function multiArrayMacro(_dependentKeys, callback, name) {
   invoice.total; // 13.49
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { sum } from '@ember/object/computed';
-
-  let Invoice = EmberObject.extend({
-    lineItems: [1.00, 2.50, 9.99],
-
-    total: sum('lineItems')
-  })
-
-  let invoice = Invoice.create();
-
-  invoice.total; // 13.49
-  ```
-
   @method sum
   @for @ember/object/computed
   @static
@@ -149,42 +132,6 @@ export function sum(dependentKey) {
   lordByron.maxChildAge; // 8
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { mapBy, max } from '@ember/object/computed';
-
-  let Person = EmberObject.extend({
-    childAges: mapBy('children', 'age'),
-    maxChildAge: max('childAges')
-  });
-
-  let lordByron = Person.create({ children: [] });
-
-  lordByron.maxChildAge; // -Infinity
-
-  set(lordByron, 'children', [
-    {
-      name: 'Augusta Ada Byron',
-      age: 7
-    }
-  ]);
-  lordByron.maxChildAge; // 7
-
-  set(lordByron, 'children', [
-    ...lordByron.children,
-    {
-      name: 'Allegra Byron',
-      age: 5
-    }, {
-      name: 'Elizabeth Medora Leigh',
-      age: 8
-    }
-  ]);
-  lordByron.maxChildAge; // 8
-  ```
-
   If the types of the arguments are not numbers, they will be converted to
   numbers and the type of the return value will always be `Number`. For example,
   the max of a list of Date objects will be the highest timestamp as a `Number`.
@@ -249,42 +196,6 @@ export function max(dependentKey) {
   lordByron.minChildAge; // 5
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { mapBy, min } from '@ember/object/computed';
-
-  let Person = EmberObject.extend({
-    childAges: mapBy('children', 'age'),
-    minChildAge: min('childAges')
-  });
-
-  let lordByron = Person.create({ children: [] });
-
-  lordByron.minChildAge; // Infinity
-
-  set(lordByron, 'children', [
-    {
-      name: 'Augusta Ada Byron',
-      age: 7
-    }
-  ]);
-  lordByron.minChildAge; // 7
-
-  set(lordByron, 'children', [
-    ...lordByron.children,
-    {
-      name: 'Allegra Byron',
-      age: 5
-    }, {
-      name: 'Elizabeth Medora Leigh',
-      age: 8
-    }
-  ]);
-  lordByron.minChildAge; // 5
-  ```
-
   If the types of the arguments are not numbers, they will be converted to
   numbers and the type of the return value will always be `Number`. For example,
   the min of a list of Date objects will be the lowest timestamp as a `Number`.
@@ -339,25 +250,6 @@ export function min(dependentKey) {
   hamster.excitingChores; // ['CLEAN!', 'WRITE MORE UNIT TESTS!']
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { map } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    excitingChores: map('chores', function(chore, index) {
-      return `${chore.toUpperCase()}!`;
-    })
-  });
-
-  let hamster = Hamster.create({
-    chores: ['clean', 'write more unit tests']
-  });
-
-  hamster.excitingChores; // ['CLEAN!', 'WRITE MORE UNIT TESTS!']
-  ```
-
   You can optionally pass an array of additional dependent keys as the second
   parameter to the macro, if your map function relies on any external values:
 
@@ -466,41 +358,6 @@ export function map(dependentKey, additionalDependentKeys, callback) {
   lordByron.childAges; // [7, 5, 8]
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { mapBy } from '@ember/object/computed';
-
-  let Person = EmberObject.extend({
-    childAges: mapBy('children', 'age')
-  });
-
-  let lordByron = Person.create({ children: [] });
-
-  lordByron.childAges; // []
-
-  set(lordByron, 'children', [
-    {
-      name: 'Augusta Ada Byron',
-      age: 7
-    }
-  ]);
-  lordByron.childAges; // [7]
-
-  set(lordByron, 'children', [
-    ...lordByron.children,
-    {
-      name: 'Allegra Byron',
-      age: 5
-    }, {
-      name: 'Elizabeth Medora Leigh',
-      age: 8
-    }
-  ]);
-  lordByron.childAges; // [7, 5, 8]
-  ```
-
   @method mapBy
   @for @ember/object/computed
   @static
@@ -566,29 +423,6 @@ export function mapBy(dependentKey, propertyKey) {
   hamster.remainingChores; // [{name: 'write more unit tests', done: false}]
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { filter } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    remainingChores: filter('chores', function(chore, index, array) {
-      return !chore.done;
-    })
-  });
-
-  let hamster = Hamster.create({
-    chores: [
-      { name: 'cook', done: true },
-      { name: 'clean', done: true },
-      { name: 'write more unit tests', done: false }
-    ]
-  });
-
-  hamster.remainingChores; // [{name: 'write more unit tests', done: false}]
-  ```
-
   You can also use `@each.property` in your dependent key, the callback will
   still use the underlying array:
 
@@ -708,27 +542,6 @@ export function filter(dependentKey, additionalDependentKeys, callback) {
   hamster.remainingChores; // [{ name: 'write more unit tests', done: false }]
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { filterBy } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    remainingChores: filterBy('chores', 'done', false)
-  });
-
-  let hamster = Hamster.create({
-    chores: [
-      { name: 'cook', done: true },
-      { name: 'clean', done: true },
-      { name: 'write more unit tests', done: false }
-    ]
-  });
-
-  hamster.remainingChores; // [{ name: 'write more unit tests', done: false }]
-  ```
-
   @method filterBy
   @for @ember/object/computed
   @static
@@ -787,28 +600,6 @@ export function filterBy(dependentKey, propertyKey, value) {
   hamster.uniqueFruits; // ['banana', 'grape', 'kale']
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { uniq } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    uniqueFruits: uniq('fruits')
-  });
-
-  let hamster = Hamster.create({
-    fruits: [
-      'banana',
-      'grape',
-      'kale',
-      'banana'
-    ]
-  });
-
-  hamster.uniqueFruits; // ['banana', 'grape', 'kale']
-  ```
-
   @method uniq
   @for @ember/object/computed
   @static
@@ -875,28 +666,6 @@ export function uniq(...args) {
   hamster.uniqueFruits; // [ { id: 1, 'banana' }, { id: 2, 'grape' }, { id: 3, 'peach' }]
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { uniqBy } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    uniqueFruits: uniqBy('fruits', 'id')
-  });
-
-  let hamster = Hamster.create({
-    fruits: [
-      { id: 1, 'banana' },
-      { id: 2, 'grape' },
-      { id: 3, 'peach' },
-      { id: 1, 'banana' }
-    ]
-  });
-
-  hamster.uniqueFruits; // [ { id: 1, 'banana' }, { id: 2, 'grape' }, { id: 3, 'peach' }]
-  ```
-
   @method uniqBy
   @for @ember/object/computed
   @static
@@ -960,34 +729,6 @@ export function uniqBy(dependentKey, propertyKey) {
   hamster.uniqueFruits; // ['banana', 'grape', 'kale', 'tomato', 'carrot', 'lettuce']
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { union } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    uniqueFruits: union('fruits', 'vegetables')
-  });
-
-  let hamster = Hamster.create({
-    fruits: [
-      'banana',
-      'grape',
-      'kale',
-      'banana',
-      'tomato'
-    ],
-    vegetables: [
-      'tomato',
-      'carrot',
-      'lettuce'
-    ]
-  });
-
-  hamster.uniqueFruits; // ['banana', 'grape', 'kale', 'tomato', 'carrot', 'lettuce']
-  ```
-
   @method union
   @for @ember/object/computed
   @static
@@ -1025,24 +766,6 @@ export let union = uniq;
   groups.friendsInCommon; // ['William King', 'Mary Somerville']
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { intersect } from '@ember/object/computed';
-
-  let FriendGroups = EmberObject.extend({
-    friendsInCommon: intersect('adaFriends', 'charlesFriends')
-  });
-
-  let groups = FriendGroups.create({
-    adaFriends: ['Charles Babbage', 'John Hobhouse', 'William King', 'Mary Somerville'],
-    charlesFriends: ['William King', 'Mary Somerville', 'Ada Lovelace', 'George Peacock']
-  });
-
-  groups.friendsInCommon; // ['William King', 'Mary Somerville']
-  ```
-
   @method intersect
   @for @ember/object/computed
   @static
@@ -1124,31 +847,6 @@ export function intersect(...args) {
   hamster.wants; // ['banana']
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { setDiff } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    wants: setDiff('likes', 'fruits')
-  });
-
-  let hamster = Hamster.create({
-    likes: [
-      'banana',
-      'grape',
-      'kale'
-    ],
-    fruits: [
-      'grape',
-      'kale',
-    ]
-  });
-
-  hamster.wants; // ['banana']
-  ```
-
   @method setDiff
   @for @ember/object/computed
   @static
@@ -1208,25 +906,6 @@ export function setDiff(setAProperty, setBProperty) {
   hamster.clothes; // ['Camp Hat', 'Camp Shirt']
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject, { set } from '@ember/object';
-  import { collect } from '@ember/object/computed';
-
-  let Hamster = EmberObject.extend({
-    clothes: collect('hat', 'shirt')
-  });
-
-  let hamster = Hamster.create();
-
-  hamster.clothes; // [null, null]
-
-  set(hamster, 'hat', 'Camp Hat');
-  set(hamster, 'shirt', 'Camp Shirt');
-  hamster.clothes; // ['Camp Hat', 'Camp Shirt']
-  ```
-
   @method collect
   @for @ember/object/computed
   @static
@@ -1315,36 +994,6 @@ export function collect(...dependentKeys) {
   todoList.priorityTodos; // [{ name:'Release', priority:1 }, { name:'Unit Test', priority:2 }, { name:'Documentation', priority:3 }]
   ```
 
-  Classic Class Example:
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { sort } from '@ember/object/computed';
-
-  let ToDoList = EmberObject.extend({
-    // using a custom sort function
-    priorityTodos: sort('todos', function(a, b){
-      if (a.priority > b.priority) {
-        return 1;
-      } else if (a.priority < b.priority) {
-        return -1;
-      }
-
-      return 0;
-    })
-  });
-
-  let todoList = ToDoList.create({
-    todos: [
-      { name: 'Unit Test', priority: 2 },
-      { name: 'Documentation', priority: 3 },
-      { name: 'Release', priority: 1 }
-    ]
-  });
-
-  todoList.priorityTodos; // [{ name:'Release', priority:1 }, { name:'Unit Test', priority:2 }, { name:'Documentation', priority:3 }]
-  ```
-
   You can also optionally pass an array of additional dependent keys as the
   second parameter, if your sort function is dependent on additional values that
   could changes:

From e53d6bb4bbb5230829eb589fdba2388de3cd28cf Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Sep 2021 13:58:09 -0400
Subject: [PATCH 0645/1405] Add v4.0.0-beta.4 to CHANGELOG`

(cherry picked from commit 121155cf0bbfa9eee623a209f712542caea7be8c)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54bfbf49904..9baee2981d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.0.0-beta.4 (September 13, 2021)
+
+- [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized
+
 ### v4.0.0-beta.3 (August 30, 2021)
 
 - [#19708](https://github.com/emberjs/ember.js/pull/19708) [CLEANUP] Remove class-binding-and-class-name-bindings-in-templates

From 8f0eacf95595aedf09ac022bedd24931627785bd Mon Sep 17 00:00:00 2001
From: Gabriela <gabilarreglemail@gmail.com>
Date: Mon, 20 Sep 2021 22:58:20 +0200
Subject: [PATCH 0646/1405] [DOC beta] Deprecation link
 Ember.link-to.disabled-when

---
 packages/@ember/-internals/glimmer/lib/components/link-to.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 2881aa629fb..6617633306f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -629,6 +629,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
               {
                 id: 'ember.link-to.disabled-when',
                 for: 'ember-source',
+                url: 'https://deprecations.emberjs.com/v4.x#toc_ember-link-to-disabled-when',
                 since: {},
                 until: '4.0.0',
               }
@@ -663,6 +664,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
             {
               id: 'ember.link-to.disabled-when',
               for: 'ember-source',
+              url: 'https://deprecations.emberjs.com/v4.x#toc_ember-link-to-disabled-when',
               since: {},
               until: '4.0.0',
             }

From fef884093cc9dcfe4ce3bc0bfe4337d326703bda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 Sep 2021 01:14:10 +0000
Subject: [PATCH 0647/1405] Bump tmpl from 1.0.4 to 1.0.5

Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5ec8b04f36c..83d1ba94555 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6583,6 +6583,11 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -9812,9 +9817,9 @@ tmp@0.0.33, tmp@^0.0.33:
     os-tmpdir "~1.0.2"
 
 tmpl@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
-  integrity "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= sha512-9tP427gQBl7Mx3vzr3mquZ+Rq+1sAqIJb5dPSYEjWMYsqitxARsFCHkZS3sDptHAmrUPCZfzXNZqSuBIHdpV5A=="
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-array@0.1.4:
   version "0.1.4"

From 8757165b870b20bcfad367ab91b9a3e1d31adb5f Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Fri, 24 Sep 2021 14:23:36 -0400
Subject: [PATCH 0648/1405] Add ember-auto-import 2

Closes https://github.com/emberjs/ember.js/issues/19752
---
 package.json |    1 +
 yarn.lock    | 1634 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 1622 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index ad670f5138c..d8e52761c56 100644
--- a/package.json
+++ b/package.json
@@ -59,6 +59,7 @@
     "broccoli-funnel": "^2.0.2",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
+    "ember-auto-import": "^2.2.0",
     "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5ec8b04f36c..7506135e622 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,11 +16,23 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
+  dependencies:
+    "@babel/highlight" "^7.14.5"
+
 "@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
   integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
 
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
+  integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
+
 "@babel/compat-data@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
@@ -30,6 +42,27 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
+"@babel/core@^7.1.6":
+  version "7.15.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
+  integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helpers" "^7.15.4"
+    "@babel/parser" "^7.15.5"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
 "@babel/core@^7.12.0", "@babel/core@^7.3.4", "@babel/core@^7.4.3":
   version "7.12.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
@@ -61,6 +94,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
+  integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
+  dependencies:
+    "@babel/types" "^7.15.4"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
@@ -78,6 +120,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-annotate-as-pure@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
@@ -93,6 +142,14 @@
     "@babel/helper-explode-assignable-expression" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
+  integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
@@ -111,6 +168,16 @@
     browserslist "^4.14.5"
     semver "^5.5.0"
 
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
+    semver "^6.3.0"
+
 "@babel/helper-compilation-targets@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
@@ -133,6 +200,18 @@
     "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
+"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+
 "@babel/helper-create-regexp-features-plugin@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
@@ -142,6 +221,14 @@
     "@babel/helper-regex" "^7.10.4"
     regexpu-core "^4.7.1"
 
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    regexpu-core "^4.7.1"
+
 "@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
   version "7.8.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
@@ -169,6 +256,20 @@
     "@babel/types" "^7.8.3"
     lodash "^4.17.13"
 
+"@babel/helper-define-polyfill-provider@^0.2.2":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
 "@babel/helper-explode-assignable-expression@^7.10.4":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
@@ -176,6 +277,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-explode-assignable-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
+  integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-explode-assignable-expression@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
@@ -193,6 +301,15 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
+  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
@@ -218,6 +335,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-get-function-arity@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
+  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
@@ -232,6 +356,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-hoist-variables@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
+  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-hoist-variables@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
@@ -246,6 +377,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-member-expression-to-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-member-expression-to-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
@@ -260,6 +398,13 @@
   dependencies:
     "@babel/types" "^7.12.5"
 
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
+  integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-module-imports@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
@@ -282,6 +427,20 @@
     "@babel/types" "^7.12.1"
     lodash "^4.17.19"
 
+"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz#7da80c8cbc1f02655d83f8b79d25866afe50d226"
+  integrity sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-simple-access" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.6"
+
 "@babel/helper-module-transforms@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
@@ -302,6 +461,13 @@
   dependencies:
     "@babel/types" "^7.10.4"
 
+"@babel/helper-optimise-call-expression@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
+  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-optimise-call-expression@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
@@ -319,6 +485,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
+"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
 "@babel/helper-regex@^7.10.4":
   version "7.10.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
@@ -342,6 +513,15 @@
     "@babel/helper-wrap-function" "^7.10.4"
     "@babel/types" "^7.12.1"
 
+"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
+  integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-wrap-function" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-remap-async-to-generator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
@@ -363,6 +543,16 @@
     "@babel/traverse" "^7.12.5"
     "@babel/types" "^7.12.5"
 
+"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
@@ -380,6 +570,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-simple-access@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
+  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
@@ -395,6 +592,13 @@
   dependencies:
     "@babel/types" "^7.12.1"
 
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
+  integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
   version "7.11.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
@@ -402,6 +606,13 @@
   dependencies:
     "@babel/types" "^7.11.0"
 
+"@babel/helper-split-export-declaration@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
+  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
@@ -414,6 +625,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
+  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
+
 "@babel/helper-validator-identifier@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
@@ -429,6 +645,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
   integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
 
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
 "@babel/helper-wrap-function@^7.10.4":
   version "7.12.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
@@ -439,6 +660,16 @@
     "@babel/traverse" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/helper-wrap-function@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
+  integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
+  dependencies:
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-wrap-function@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
@@ -458,6 +689,15 @@
     "@babel/traverse" "^7.12.5"
     "@babel/types" "^7.12.5"
 
+"@babel/helpers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
+  integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
+  dependencies:
+    "@babel/template" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/highlight@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
@@ -467,6 +707,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/highlight@^7.8.3":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
@@ -481,11 +730,25 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
   integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
 
+"@babel/parser@^7.15.4", "@babel/parser@^7.15.5":
+  version "7.15.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae"
+  integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==
+
 "@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
   version "7.9.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
   integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
 
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
+  integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
@@ -495,6 +758,15 @@
     "@babel/helper-remap-async-to-generator" "^7.12.1"
     "@babel/plugin-syntax-async-generators" "^7.8.0"
 
+"@babel/plugin-proposal-async-generator-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
+  integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.15.4"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
@@ -512,6 +784,23 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-class-static-block@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
+  integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
 "@babel/plugin-proposal-decorators@^7.10.5":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f"
@@ -521,6 +810,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-decorators" "^7.12.1"
 
+"@babel/plugin-proposal-decorators@^7.13.5":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
+  integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-decorators" "^7.14.5"
+
 "@babel/plugin-proposal-dynamic-import@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
@@ -529,6 +827,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-dynamic-import" "^7.8.0"
 
+"@babel/plugin-proposal-dynamic-import@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
+  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
 "@babel/plugin-proposal-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
@@ -545,6 +851,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
+"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
+  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
@@ -553,6 +867,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.0"
 
+"@babel/plugin-proposal-json-strings@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
+  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+
 "@babel/plugin-proposal-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
@@ -569,6 +891,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
+"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
+  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
@@ -577,6 +907,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
@@ -593,6 +931,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
+"@babel/plugin-proposal-numeric-separator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
+  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
 "@babel/plugin-proposal-numeric-separator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
@@ -610,6 +956,17 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.12.1"
 
+"@babel/plugin-proposal-object-rest-spread@^7.15.6":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
+  integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.15.4"
+
 "@babel/plugin-proposal-object-rest-spread@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
@@ -627,6 +984,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
 
+"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
 "@babel/plugin-proposal-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
@@ -644,6 +1009,15 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
     "@babel/plugin-syntax-optional-chaining" "^7.8.0"
 
+"@babel/plugin-proposal-optional-chaining@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
 "@babel/plugin-proposal-optional-chaining@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
@@ -660,6 +1034,24 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-private-methods@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
+  integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-proposal-private-property-in-object@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
+  integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
@@ -668,6 +1060,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
+  integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
   version "7.8.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
@@ -676,7 +1076,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.8.8"
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-async-generators@^7.8.0":
+"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -690,6 +1090,20 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.12.13"
+
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-decorators@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
@@ -697,7 +1111,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0":
+"@babel/plugin-syntax-decorators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
+  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
@@ -711,7 +1132,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-json-strings@^7.8.0":
+"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
@@ -725,7 +1146,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -746,27 +1167,34 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.0":
+"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0":
+"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-top-level-await@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
@@ -774,6 +1202,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
@@ -788,6 +1223,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-typescript@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
+  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-arrow-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
@@ -795,6 +1237,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-arrow-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-arrow-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
@@ -811,6 +1260,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-remap-async-to-generator" "^7.12.1"
 
+"@babel/plugin-transform-async-to-generator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
+
 "@babel/plugin-transform-async-to-generator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
@@ -827,6 +1285,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-block-scoped-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-block-scoped-functions@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
@@ -841,6 +1306,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-block-scoping@^7.15.3":
+  version "7.15.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
+  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-block-scoping@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
@@ -863,6 +1335,19 @@
     "@babel/helper-split-export-declaration" "^7.10.4"
     globals "^11.1.0"
 
+"@babel/plugin-transform-classes@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
+  integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    globals "^11.1.0"
+
 "@babel/plugin-transform-classes@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
@@ -884,6 +1369,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-computed-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-computed-properties@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
@@ -898,6 +1390,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-destructuring@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
+  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-destructuring@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
@@ -913,6 +1412,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-dotall-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
+  integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
@@ -928,6 +1435,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-duplicate-keys@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
+  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-duplicate-keys@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
@@ -943,6 +1457,14 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-exponentiation-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
+  dependencies:
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-exponentiation-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
@@ -958,6 +1480,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-for-of@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
+  integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-for-of@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
@@ -973,6 +1502,14 @@
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
@@ -988,6 +1525,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
@@ -1002,6 +1546,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-member-expression-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-member-expression-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
@@ -1018,6 +1569,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
+  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-amd@^7.2.0", "@babel/plugin-transform-modules-amd@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
@@ -1037,6 +1597,16 @@
     "@babel/helper-simple-access" "^7.12.1"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
+  integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-simple-access" "^7.15.4"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-commonjs@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
@@ -1058,6 +1628,17 @@
     "@babel/helper-validator-identifier" "^7.10.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-systemjs@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
+  integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
+  dependencies:
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-module-transforms" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.9"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-systemjs@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
@@ -1076,6 +1657,14 @@
     "@babel/helper-module-transforms" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-modules-umd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
+  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-modules-umd@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
@@ -1091,6 +1680,13 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
 
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
+  version "7.14.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
+  integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+
 "@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
@@ -1105,6 +1701,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-new-target@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
+  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-new-target@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
@@ -1120,6 +1723,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-replace-supers" "^7.12.1"
 
+"@babel/plugin-transform-object-super@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+
 "@babel/plugin-transform-object-super@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
@@ -1135,6 +1746,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-parameters@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
+  integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-parameters@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
@@ -1150,6 +1768,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-property-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-property-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
@@ -1164,6 +1789,13 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
+"@babel/plugin-transform-regenerator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
+  dependencies:
+    regenerator-transform "^0.14.2"
+
 "@babel/plugin-transform-regenerator@^7.8.7":
   version "7.8.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
@@ -1178,6 +1810,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-reserved-words@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
+  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
@@ -1195,6 +1834,18 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
+"@babel/plugin-transform-runtime@^7.13.9":
+  version "7.15.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
+  integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    semver "^6.3.0"
+
 "@babel/plugin-transform-shorthand-properties@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
@@ -1202,6 +1853,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-shorthand-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-shorthand-properties@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
@@ -1217,6 +1875,14 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
 
+"@babel/plugin-transform-spread@^7.14.6":
+  version "7.14.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
+  integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+
 "@babel/plugin-transform-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
@@ -1232,6 +1898,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/helper-regex" "^7.10.4"
 
+"@babel/plugin-transform-sticky-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-sticky-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
@@ -1247,6 +1920,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-template-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-template-literals@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
@@ -1262,6 +1942,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-typeof-symbol@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
+  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-typeof-symbol@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
@@ -1278,6 +1965,15 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-typescript" "^7.12.1"
 
+"@babel/plugin-transform-typescript@^7.13.0":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
+  integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-typescript" "^7.14.5"
+
 "@babel/plugin-transform-unicode-escapes@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
@@ -1285,6 +1981,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-unicode-escapes@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
+  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-unicode-regex@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
@@ -1293,6 +1996,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-transform-unicode-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-transform-unicode-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
@@ -1309,6 +2020,85 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
+"@babel/preset-env@^7.10.2":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
+  integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-compilation-targets" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
+    "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-class-static-block" "^7.15.4"
+    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+    "@babel/plugin-proposal-json-strings" "^7.14.5"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-private-methods" "^7.14.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.14.5"
+    "@babel/plugin-transform-async-to-generator" "^7.14.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+    "@babel/plugin-transform-block-scoping" "^7.15.3"
+    "@babel/plugin-transform-classes" "^7.15.4"
+    "@babel/plugin-transform-computed-properties" "^7.14.5"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-dotall-regex" "^7.14.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+    "@babel/plugin-transform-for-of" "^7.15.4"
+    "@babel/plugin-transform-function-name" "^7.14.5"
+    "@babel/plugin-transform-literals" "^7.14.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+    "@babel/plugin-transform-modules-amd" "^7.14.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.15.4"
+    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
+    "@babel/plugin-transform-modules-umd" "^7.14.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
+    "@babel/plugin-transform-new-target" "^7.14.5"
+    "@babel/plugin-transform-object-super" "^7.14.5"
+    "@babel/plugin-transform-parameters" "^7.15.4"
+    "@babel/plugin-transform-property-literals" "^7.14.5"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-reserved-words" "^7.14.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+    "@babel/plugin-transform-spread" "^7.14.6"
+    "@babel/plugin-transform-sticky-regex" "^7.14.5"
+    "@babel/plugin-transform-template-literals" "^7.14.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+    "@babel/plugin-transform-unicode-regex" "^7.14.5"
+    "@babel/preset-modules" "^0.1.4"
+    "@babel/types" "^7.15.6"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    core-js-compat "^3.16.0"
+    semver "^6.3.0"
+
 "@babel/preset-env@^7.12.0":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
@@ -1458,6 +2248,24 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
+"@babel/preset-modules@^0.1.4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+    "@babel/plugin-transform-dotall-regex" "^7.4.4"
+    "@babel/types" "^7.4.4"
+    esutils "^2.0.2"
+
+"@babel/runtime@7.12.18":
+  version "7.12.18"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.18.tgz#af137bd7e7d9705a412b3caaf991fe6aaa97831b"
+  integrity sha512-BogPQ7ciE6SYAUPtlm9tWbgI9+2AgqSam6QivMgXgAT+fKbgppaj4ZX15MHeLC1PVF5sNk70huBu20XxWOs8Cg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.12.0":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
@@ -1481,6 +2289,15 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
+"@babel/template@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
+  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
@@ -1490,6 +2307,21 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
+  integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-hoist-variables" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+    "@babel/parser" "^7.15.4"
+    "@babel/types" "^7.15.4"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
@@ -1529,6 +2361,14 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.15.4", "@babel/types@^7.15.6":
+  version "7.15.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
+  integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.9"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
@@ -1565,6 +2405,19 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
+"@embroider/shared-internals@^0.40.0":
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
+  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^7.0.1"
+    lodash "^4.17.10"
+    pkg-up "^3.1.0"
+    resolve-package-path "^1.2.2"
+    semver "^7.3.2"
+    typescript-memoize "^1.0.0-alpha.3"
+
 "@eslint/eslintrc@^0.1.3":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
@@ -1875,6 +2728,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
   integrity "sha1-9MfsQ+gbMZqYFRFQMXCfJph4kfA= sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
 
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
+  version "7.0.9"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -2054,6 +2912,11 @@ agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
 ajv@^6.10.0, ajv@^6.9.1:
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
@@ -2074,6 +2937,16 @@ ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -2396,6 +3269,16 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
+babel-loader@^8.0.6:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
+  integrity sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==
+  dependencies:
+    find-cache-dir "^3.3.1"
+    loader-utils "^1.4.0"
+    make-dir "^3.1.0"
+    schema-utils "^2.6.5"
+
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -2438,6 +3321,13 @@ babel-plugin-ember-modules-api-polyfill@^3.2.0:
   dependencies:
     ember-rfc176-data "^0.3.16"
 
+babel-plugin-ember-modules-api-polyfill@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
+  integrity sha512-pJajN/DkQUnStw0Az8c6khVcMQHgzqWr61lLNtVeu0g61LRW0k9jyK7vaedrHDWGe/Qe8sxG5wpiyW9NsMqFzA==
+  dependencies:
+    ember-rfc176-data "^0.3.17"
+
 babel-plugin-filter-imports@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-4.0.0.tgz#068f8da15236a96a9602c36dc6f4a6eeca70a4f4"
@@ -2446,6 +3336,17 @@ babel-plugin-filter-imports@^4.0.0:
     "@babel/types" "^7.7.2"
     lodash "^4.17.15"
 
+babel-plugin-htmlbars-inline-precompile@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-5.3.0.tgz#eeaff07c35415264aea4d6bafb5e71167f6ffb2f"
+  integrity sha512-WeLBQM5Y9rx2GbwfxKy47lWh+u23afdlb48sM+5RTMTLwO90oILA7znzzOls7e+bcj06Nw0H+xpRWuyhlS37hg==
+  dependencies:
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    line-column "^1.0.2"
+    magic-string "^0.25.7"
+    parse-static-imports "^1.1.0"
+    string.prototype.matchall "^4.0.4"
+
 babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
@@ -2457,6 +3358,35 @@ babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
+babel-plugin-polyfill-corejs2@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.2.2:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
+  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.16.2"
+
+babel-plugin-polyfill-regenerator@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+
+babel-plugin-syntax-dynamic-import@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
+  integrity sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=
+
 babel-runtime@^6.22.0, babel-runtime@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
@@ -2563,6 +3493,11 @@ basic-auth@~2.0.0:
   dependencies:
     safe-buffer "5.1.1"
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 binary-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
@@ -2871,6 +3806,19 @@ broccoli-funnel@^3.0.3:
     path-posix "^1.0.0"
     walk-sync "^2.0.2"
 
+broccoli-funnel@^3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
+  integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
+  dependencies:
+    array-equal "^1.0.0"
+    broccoli-plugin "^4.0.7"
+    debug "^4.1.1"
+    fs-tree-diff "^2.0.1"
+    heimdalljs "^0.2.0"
+    minimatch "^3.0.0"
+    walk-sync "^2.0.2"
+
 broccoli-kitchen-sink-helpers@^0.2.5:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc"
@@ -2973,6 +3921,15 @@ broccoli-output-wrapper@^3.2.1:
     heimdalljs-logger "^0.1.10"
     symlink-or-copy "^1.2.0"
 
+broccoli-output-wrapper@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
+  integrity sha512-bQAtwjSrF4Nu0CK0JOy5OZqw9t5U0zzv2555EA/cF8/a8SLDTIetk9UgrtMVw7qKLKdSpOZ2liZNeZZDaKgayw==
+  dependencies:
+    fs-extra "^8.1.0"
+    heimdalljs-logger "^0.1.10"
+    symlink-or-copy "^1.2.0"
+
 broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1"
@@ -3032,6 +3989,19 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
+broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
+  integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-output-wrapper "^3.2.5"
+    fs-merger "^3.2.1"
+    promise-map-series "^0.3.0"
+    quick-temp "^0.1.8"
+    rimraf "^3.0.2"
+    symlink-or-copy "^1.3.1"
+
 broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.3.tgz#9dcfbfb6a1b27a37cc22e65c071719ce9f92bc1e"
@@ -3074,6 +4044,11 @@ broccoli-source@^1.1.0:
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
   integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
 
+broccoli-source@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
+  integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
+
 broccoli-source@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
@@ -3183,6 +4158,17 @@ browserslist@^4.11.1, browserslist@^4.14.5, browserslist@^4.8.3:
     escalade "^3.1.1"
     node-releases "^1.1.71"
 
+browserslist@^4.16.6, browserslist@^4.17.0:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.1.tgz#a98d104f54af441290b7d592626dd541fa642eb9"
+  integrity sha512-aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ==
+  dependencies:
+    caniuse-lite "^1.0.30001259"
+    electron-to-chromium "^1.3.846"
+    escalade "^3.1.1"
+    nanocolors "^0.1.5"
+    node-releases "^1.1.76"
+
 browserstack-local@^1.4.2:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.2.tgz#5d2248384b8aa0fc521df32001127f010a92458d"
@@ -3317,6 +4303,14 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
+call-bind@^1.0.0, call-bind@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 callsites@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
@@ -3353,6 +4347,13 @@ caniuse-lite@^1.0.30001219:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
   integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
 
+caniuse-lite@^1.0.30001259:
+  version "1.0.30001260"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz#e3be3f34ddad735ca4a2736fa9e768ef34316270"
+  integrity sha512-Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg==
+  dependencies:
+    nanocolors "^0.1.0"
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -3657,6 +4658,11 @@ common-tags@^1.8.0:
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
   integrity "sha1-jjFT5ULUo56bEFVENK+q+YlWqTc= sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="
 
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+
 component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
@@ -3796,6 +4802,14 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
 
+core-js-compat@^3.16.0, core-js-compat@^3.16.2:
+  version "3.18.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.0.tgz#fb360652201e8ac8da812718c008cd0482ed9b42"
+  integrity sha512-tRVjOJu4PxdXjRMEgbP7lqWy1TWJu9a01oBkn8d+dNrhgmBwdTkzhHZpVJnEmhISLdoJI1lX08rcBcHi3TZIWg==
+  dependencies:
+    browserslist "^4.17.0"
+    semver "7.0.0"
+
 core-js-compat@^3.6.2:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
@@ -3853,6 +4867,27 @@ crypto-random-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
   integrity "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg=="
 
+css-loader@^5.2.0:
+  version "5.2.7"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae"
+  integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg==
+  dependencies:
+    icss-utils "^5.1.0"
+    loader-utils "^2.0.0"
+    postcss "^8.2.15"
+    postcss-modules-extract-imports "^3.0.0"
+    postcss-modules-local-by-default "^4.0.0"
+    postcss-modules-scope "^3.0.0"
+    postcss-modules-values "^4.0.0"
+    postcss-value-parser "^4.1.0"
+    schema-utils "^3.0.0"
+    semver "^7.3.5"
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
 ctype@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
@@ -3905,6 +4940,13 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -4096,11 +5138,87 @@ electron-to-chromium@^1.3.723:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
   integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
 
+electron-to-chromium@^1.3.846:
+  version "1.3.849"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.849.tgz#45a65a392565abc5b864624b9753393336426f4b"
+  integrity sha512-RweyW60HPOqIcxoKTGr38Yvtf2aliSUqX8dB3e9geJ0Bno0YLjcOX5F7/DPVloBkJWaPZ7xOM1A0Yme2T1A34w==
+
+ember-auto-import@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
+  integrity sha512-ngluzmtV31mTY+1ceOnWfGUIgGyZt850xFncMX/14Dfx0OhXaUKBpFjKjIor/Cen4WEF+OrdgNJAjH3sM07o6w==
+  dependencies:
+    "@babel/core" "^7.1.6"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/preset-env" "^7.10.2"
+    "@babel/traverse" "^7.1.6"
+    "@embroider/shared-internals" "^0.40.0"
+    babel-loader "^8.0.6"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-htmlbars-inline-precompile "^5.2.1"
+    babel-plugin-syntax-dynamic-import "^6.18.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^3.0.8"
+    broccoli-merge-trees "^4.2.0"
+    broccoli-plugin "^4.0.0"
+    broccoli-source "^3.0.0"
+    css-loader "^5.2.0"
+    debug "^4.3.1"
+    ember-cli-babel "^7.0.0"
+    fs-extra "^6.0.1"
+    fs-tree-diff "^2.0.0"
+    handlebars "^4.3.1"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.19"
+    mkdirp "^0.5.1"
+    parse5 "^6.0.1"
+    resolve "^1.20.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^2.6.2"
+    semver "^7.3.4"
+    style-loader "^2.0.0"
+    typescript-memoize "^1.0.0-alpha.3"
+    walk-sync "^0.3.3"
+
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
+ember-cli-babel@^7.0.0:
+  version "7.26.6"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
+  integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.13.0"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.12.0"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-babel@^7.23.0:
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92"
@@ -4378,6 +5496,11 @@ ember-rfc176-data@^0.3.16:
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.16.tgz#2ace0ac9cf9016d493a74a1d931643a308679803"
   integrity sha512-IYAzffS90r2ybAcx8c2qprYfkxa70G+/UPkxMN1hw55DU5S2aLOX6v3umKDZItoRhrvZMCnzwsdfKSrKdC9Wbg==
 
+ember-rfc176-data@^0.3.17:
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
+  integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==
+
 ember-router-generator@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-2.0.0.tgz#d04abfed4ba8b42d166477bbce47fccc672dbde0"
@@ -4399,6 +5522,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY= sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -4524,6 +5652,30 @@ es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
     string.prototype.trimleft "^2.1.1"
     string.prototype.trimright "^2.1.1"
 
+es-abstract@^1.18.2:
+  version "1.18.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
+  integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-string "^1.0.7"
+    object-inspect "^1.11.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
+
 es-abstract@^1.5.1, es-abstract@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
@@ -5215,6 +6367,15 @@ find-babel-config@^1.1.0:
     json5 "^0.5.1"
     path-exists "^3.0.0"
 
+find-cache-dir@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.2"
+    pkg-dir "^4.1.0"
+
 find-index@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.0.tgz#53007c79cd30040d6816d79458e8837d5c5705ef"
@@ -5234,6 +6395,14 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
 find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
@@ -5450,6 +6619,17 @@ fs-merger@^3.1.0:
     rimraf "^2.6.3"
     walk-sync "^2.0.2"
 
+fs-merger@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.2.1.tgz#a225b11ae530426138294b8fbb19e82e3d4e0b3b"
+  integrity sha512-AN6sX12liy0JE7C2evclwoo0aCG3PFulLjrTLsJpWh/2mM+DinhpSGqYLbHBBbIW1PLRNcFhJG8Axtz8mQW3ug==
+  dependencies:
+    broccoli-node-api "^1.7.0"
+    broccoli-node-info "^2.1.0"
+    fs-extra "^8.0.1"
+    fs-tree-diff "^2.0.1"
+    walk-sync "^2.2.0"
+
 fs-sync@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/fs-sync/-/fs-sync-1.0.4.tgz#2f94eade31862ec0a9f33a1c2546dfb1a3f3d1ae"
@@ -5532,6 +6712,11 @@ gensync@^1.0.0-beta.1:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
   integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
 
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
 get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -5542,6 +6727,15 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="
 
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -5576,6 +6770,14 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
+get-symbol-description@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -5749,7 +6951,7 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="
 
-handlebars@^4.0.11, handlebars@^4.0.4:
+handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -5776,6 +6978,11 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
@@ -5813,6 +7020,11 @@ has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg= sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
 
+has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
 has-to-string-tag-x@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
@@ -5820,6 +7032,13 @@ has-to-string-tag-x@^1.2.0:
   dependencies:
     has-symbol-support-x "^1.4.1"
 
+has-tostringtag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
+  dependencies:
+    has-symbols "^1.0.2"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -6032,6 +7251,11 @@ iconv-lite@0.4.24, iconv-lite@^0.4.13, iconv-lite@^0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+icss-utils@^5.0.0, icss-utils@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
+
 ieee754@1.1.13, ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
@@ -6141,6 +7365,15 @@ inquirer@^6:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
+internal-slot@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+  dependencies:
+    get-intrinsic "^1.1.0"
+    has "^1.0.3"
+    side-channel "^1.0.4"
+
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -6190,6 +7423,13 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
 
+is-bigint@^1.0.1:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
+  dependencies:
+    has-bigints "^1.0.1"
+
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -6197,6 +7437,14 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-boolean-object@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -6229,6 +7477,18 @@ is-callable@^1.2.0:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
   integrity "sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk= sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
 
+is-callable@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
+
+is-core-module@^2.2.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
+  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -6319,6 +7579,18 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
 
+is-negative-zero@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
+  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
+
+is-number-object@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
+  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6398,6 +7670,14 @@ is-regex@^1.1.0:
   dependencies:
     has-symbols "^1.0.1"
 
+is-regex@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
@@ -6428,6 +7708,13 @@ is-string@^1.0.5:
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
   integrity "sha1-QEk+0ZjvP/R3uMf5L2ROyCpc06Y= sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
 
+is-string@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-symbol@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
@@ -6435,6 +7722,13 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
+is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
+  dependencies:
+    has-symbols "^1.0.2"
+
 is-type@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/is-type/-/is-type-0.0.1.tgz#f651d85c365d44955d14a51d8d7061f3f6b4779c"
@@ -6518,6 +7812,11 @@ js-reporters@1.2.3:
   resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.3.tgz#8febcab370539df62e09b95da133da04b11f6168"
   integrity "sha1-j+vKs3BTnfYuCbldoTPaBLEfYWg= sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A=="
 
+js-string-escape@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
+  integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -6583,6 +7882,11 @@ json-stringify-safe@~5.0.0:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
 
+json5@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -6746,6 +8050,24 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
+loader-utils@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0"
+  integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 locate-character@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f"
@@ -6767,6 +8089,13 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
 lodash-node@^3.2.0:
   version "3.10.2"
   resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7"
@@ -6969,6 +8298,11 @@ lodash.debounce@^3.1.1:
   dependencies:
     lodash._getnative "^3.0.0"
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+
 lodash.defaults@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-2.3.0.tgz#a832b001f138f3bb9721c2819a2a7cc5ae21ed25"
@@ -7206,6 +8540,13 @@ magic-string@^0.25.2:
   dependencies:
     sourcemap-codec "^1.4.4"
 
+magic-string@^0.25.7:
+  version "0.25.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 make-dir@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
@@ -7213,6 +8554,13 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^3.0.2, make-dir@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
+  dependencies:
+    semver "^6.0.0"
+
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -7589,6 +8937,11 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
 
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
@@ -7604,6 +8957,16 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="
 
+nanocolors@^0.1.0, nanocolors@^0.1.5:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
+  integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
+
+nanoid@^3.1.25:
+  version "3.1.25"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
+  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -7675,6 +9038,11 @@ node-releases@^1.1.71:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
   integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
+node-releases@^1.1.76:
+  version "1.1.76"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e"
+  integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==
+
 node-uuid@~1.4.0:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
@@ -7786,6 +9154,11 @@ object-hash@^1.3.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
+object-inspect@^1.11.0, object-inspect@^1.9.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
+
 object-inspect@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
@@ -7818,6 +9191,16 @@ object.assign@4.1.0, object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
+object.assign@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    has-symbols "^1.0.1"
+    object-keys "^1.1.1"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
@@ -7958,6 +9341,13 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -7972,6 +9362,13 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
@@ -8026,11 +9423,21 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="
 
+parse-static-imports@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/parse-static-imports/-/parse-static-imports-1.1.0.tgz#ae2f18f18da1a993080ae406a5219455c0bbad5d"
+  integrity sha512-HlxrZcISCblEV0lzXmAHheH/8qEkKgmqkdxyHTPbSqsTUV8GzqmN1L+SSti+VbNPfbBO3bYLPHDiUs2avbAdbA==
+
 parse5@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.1.3.tgz#8bab58d06525f00e4e37d755116eb82e7241f142"
   integrity "sha1-i6tY0GUl8A5ON9dVEW64LnJB8UI= sha512-Dh9KTpTUsDvI4Ny44C+cmvGOltwG730iupD8e2Fr7mCQv8WxXdb6twa1IKgc7/IkRrtrjTB1p4YtsHbeyhfsYA=="
 
+parse5@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+
 parseqs@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
@@ -8056,6 +9463,11 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -8178,6 +9590,13 @@ pkg-dir@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
 pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
@@ -8185,6 +9604,13 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
+pkg-up@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
+  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
+  dependencies:
+    find-up "^3.0.0"
+
 plur@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
@@ -8206,6 +9632,56 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="
 
+postcss-modules-extract-imports@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
+
+postcss-modules-local-by-default@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  dependencies:
+    icss-utils "^5.0.0"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.1.0"
+
+postcss-modules-scope@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
+  dependencies:
+    postcss-selector-parser "^6.0.4"
+
+postcss-modules-values@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
+  dependencies:
+    icss-utils "^5.0.0"
+
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
+postcss@^8.2.15:
+  version "8.3.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.7.tgz#ec88563588c8da8e58e7226f7633b51ae221eeda"
+  integrity sha512-9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ==
+  dependencies:
+    nanocolors "^0.1.5"
+    nanoid "^3.1.25"
+    source-map-js "^0.6.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -8270,6 +9746,11 @@ promise-map-series@^0.2.1, promise-map-series@^0.2.3:
   dependencies:
     rsvp "^3.0.14"
 
+promise-map-series@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
+  integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
+
 promise.prototype.finally@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.0.tgz#66f161b1643636e50e7cf201dc1b84a857f3864e"
@@ -8568,6 +10049,14 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
+regexp.prototype.flags@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
+  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 regexpp@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
@@ -8707,7 +10196,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.7:
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -8723,6 +10212,14 @@ resolve-package-path@^2.0.0:
     path-root "^0.1.1"
     resolve "^1.13.1"
 
+resolve-package-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-3.1.0.tgz#35faaa5d54a9c7dd481eb7c4b2a44410c9c763d8"
+  integrity sha512-2oC2EjWbMJwvSN6Z7DbDfJMnD8MYEouaLn5eIX0j8XwPsYCVIyY9bbnX88YHVkbr8XHqvZrYbxaLPibfTYKZMA==
+  dependencies:
+    path-root "^0.1.1"
+    resolve "^1.17.0"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -8743,6 +10240,14 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.14.2, resolve@^1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 responselike@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -8949,6 +10454,24 @@ sax@>=0.6.0:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity "sha1-KBYjTiN4vdxOU1T6tcqold9xANk= sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
 
+schema-utils@^2.6.5:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
@@ -8959,7 +10482,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -8971,6 +10494,13 @@ semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -9071,6 +10601,15 @@ shellwords@^0.1.0:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -9222,6 +10761,11 @@ sort-package-json@^1.22.1:
     detect-indent "^5.0.0"
     sort-object-keys "^1.1.2"
 
+source-map-js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
+  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
@@ -9397,6 +10941,20 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string.prototype.matchall@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
+  integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.2"
+    get-intrinsic "^1.1.1"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    regexp.prototype.flags "^1.3.1"
+    side-channel "^1.0.4"
+
 string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
@@ -9405,6 +10963,14 @@ string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 string.prototype.trimleft@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
@@ -9431,6 +10997,14 @@ string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -9528,6 +11102,14 @@ strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity "sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY= sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
 
+style-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c"
+  integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 styled_string@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/styled_string/-/styled_string-0.0.1.tgz#d22782bd81295459bc4f1df18c4bad8e94dd124a"
@@ -9571,7 +11153,7 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.0:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.0, symlink-or-copy@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
   integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
@@ -9981,6 +11563,11 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typescript-memoize@^1.0.0-alpha.3:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
+  integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
+
 typescript@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
@@ -10001,6 +11588,16 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
   integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
 
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
 unbzip2-stream@^1.3.3:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
@@ -10254,10 +11851,10 @@ walk-sync@^2.0.2:
     ensure-posix-path "^1.1.0"
     matcher-collection "^2.0.0"
 
-walk-sync@^2.1.0:
+walk-sync@^2.1.0, walk-sync@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
-  integrity "sha1-gHhrBlf8yMDhwLGgQqCerilmOHo= sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg=="
+  integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==
   dependencies:
     "@types/minimatch" "^3.0.3"
     ensure-posix-path "^1.1.0"
@@ -10302,6 +11899,17 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"

From 1bc17cabb3f7a151c0bf1e43f6ba6f06918937b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 16:28:36 +0000
Subject: [PATCH 0649/1405] Bump broccoli-concat from 4.2.4 to 4.2.5

Bumps [broccoli-concat](https://github.com/ember-cli/broccoli-concat) from 4.2.4 to 4.2.5.
- [Release notes](https://github.com/ember-cli/broccoli-concat/releases)
- [Changelog](https://github.com/broccolijs/broccoli-concat/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/broccoli-concat/compare/v4.2.4...v4.2.5)

---
updated-dependencies:
- dependency-name: broccoli-concat
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 61 ++++++++--------------------------------------------
 2 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index d8e52761c56..f7afe94449b 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@glimmer/vm-babel-plugins": "0.80.0",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
-    "broccoli-concat": "^4.2.4",
+    "broccoli-concat": "^4.2.5",
     "broccoli-debug": "^0.6.4",
     "broccoli-file-creator": "^2.1.1",
     "broccoli-funnel": "^2.0.2",
diff --git a/yarn.lock b/yarn.lock
index 7506135e622..172d6658c9f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3712,10 +3712,10 @@ broccoli-concat@^3.7.3:
     lodash.uniq "^4.2.0"
     walk-sync "^0.3.2"
 
-broccoli-concat@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.4.tgz#78e359ddc540b999d815355163bf3cfb6bd67322"
-  integrity sha512-NgdBIE57r+U/AslBohQr0mCS7PopIWL8dihMI1CzqffQkisAgqWMuddjYmizqRBQlml7crBFaBeUnPDHhf4/RQ==
+broccoli-concat@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
+  integrity sha512-dFB5ATPwOyV8S2I7a07HxCoutoq23oY//LhM6Mou86cWUTB174rND5aQLR7Fu8FjFFLxoTbkk7y0VPITJ1IQrw==
   dependencies:
     broccoli-debug "^0.6.5"
     broccoli-kitchen-sink-helpers "^0.3.1"
@@ -3912,15 +3912,6 @@ broccoli-node-info@^2.1.0:
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
   integrity sha512-l6qDuboJThHfRVVWQVaTs++bFdrFTP0gJXgsWenczc1PavRVUmL1Eyb2swTAXXMpDOnr2zhNOBLx4w9AxkqbPQ==
 
-broccoli-output-wrapper@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.1.tgz#8f9d1092afe0c1a4b7a1b6f0d2c62f1c403e82ad"
-  integrity sha512-mhOTy8AyzEsqgefR2ejbv5QTy3dbY2bvDfkARo55Xml52r2MU0CehQu4T/CH6oPcAXkdVYG/hGm9UpV1vU9Ohg==
-  dependencies:
-    fs-extra "^8.1.0"
-    heimdalljs-logger "^0.1.10"
-    symlink-or-copy "^1.2.0"
-
 broccoli-output-wrapper@^3.2.5:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/broccoli-output-wrapper/-/broccoli-output-wrapper-3.2.5.tgz#514b17801c92922a2c2f87fd145df2a25a11bc5f"
@@ -3989,7 +3980,7 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
-broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.7:
+broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3, broccoli-plugin@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
   integrity sha512-a4zUsWtA1uns1K7p9rExYVYG99rdKeGRymW0qOCNkvDPHQxVi3yVyJHhQbM3EZwdt2E0mnhr5e0c/bPpJ7p3Wg==
@@ -4002,19 +3993,6 @@ broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.7:
     rimraf "^3.0.2"
     symlink-or-copy "^1.3.1"
 
-broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.3.tgz#9dcfbfb6a1b27a37cc22e65c071719ce9f92bc1e"
-  integrity sha512-CtAIEYq5K+4yQv8c/BHymOteuyjDAJfvy/asu4LudIWcMSS7dTn3yGI5gNBkwHG+qlRangYkHJNVAcDZMQbSVQ==
-  dependencies:
-    broccoli-node-api "^1.6.0"
-    broccoli-output-wrapper "^3.2.1"
-    fs-merger "^3.1.0"
-    promise-map-series "^0.2.1"
-    quick-temp "^0.1.3"
-    rimraf "^3.0.0"
-    symlink-or-copy "^1.3.0"
-
 broccoli-rollup@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d"
@@ -6607,18 +6585,6 @@ fs-extra@^9.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-merger@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.1.0.tgz#f30f74f6c70b2ff7333ec074f3d2f22298152f3b"
-  integrity sha512-RZ9JtqugaE8Rkt7idO5NSwcxEGSDZpLmVFjtVQUm3f+bWun7JAU6fKyU6ZJUeUnKdJwGx8uaro+K4QQfOR7vpA==
-  dependencies:
-    broccoli-node-api "^1.7.0"
-    broccoli-node-info "^2.1.0"
-    fs-extra "^8.0.1"
-    fs-tree-diff "^2.0.1"
-    rimraf "^2.6.3"
-    walk-sync "^2.0.2"
-
 fs-merger@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/fs-merger/-/fs-merger-3.2.1.tgz#a225b11ae530426138294b8fbb19e82e3d4e0b3b"
@@ -10280,14 +10246,14 @@ rimraf@2.6.3, rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.1, rimraf@^3.0.2:
+rimraf@^3.0.1, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -11153,7 +11119,7 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.0, symlink-or-copy@^1.3.1:
+symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
   integrity sha512-0K91MEXFpBUaywiwSSkmKjnGcasG/rVBXFLJz5DrgGabpYD6N+3yZrfD6uUIfpuTu65DZLHi7N8CizHc07BPZA==
@@ -11842,16 +11808,7 @@ walk-sync@^1.0.0, walk-sync@^1.1.3:
     ensure-posix-path "^1.1.0"
     matcher-collection "^1.1.1"
 
-walk-sync@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.0.2.tgz#5ea8a28377c8be68c92d50f4007ea381725da14b"
-  integrity sha512-dCZkrxfHjPn7tIvdYrX3uMD/R0beVrHpA8lROQ5wWrl8psJgR6xwCkwqTFes0dNujbS2o/ITpvSYgIFsLsf13A==
-  dependencies:
-    "@types/minimatch" "^3.0.3"
-    ensure-posix-path "^1.1.0"
-    matcher-collection "^2.0.0"
-
-walk-sync@^2.1.0, walk-sync@^2.2.0:
+walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
   integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==

From 61502468ee57abcf2c34390c321e3fe28b710ebf Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sat, 4 Sep 2021 08:06:46 +0200
Subject: [PATCH 0650/1405] [DOC beta] Remove unused action imports from router
 service docs

---
 packages/@ember/-internals/routing/lib/services/router.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 54b7ea05e2f..45277839f25 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -414,7 +414,6 @@ export default class RouterService extends Service {
 
     ```app/routes/contact-form.js
     import Route from '@ember/routing';
-    import { action } from '@ember/object';
     import { inject as service } from '@ember/service';
 
     export default class extends Route {
@@ -449,7 +448,6 @@ export default class RouterService extends Service {
 
     ```app/routes/contact-form.js
     import Route from '@ember/routing';
-    import { action } from '@ember/object';
     import { inject as service } from '@ember/service';
 
     export default class extends Route {

From 89e011577751bd0703f32d35557747da3f5cbf73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 13:39:28 +0000
Subject: [PATCH 0651/1405] Bump eslint-plugin-qunit from 4.0.0 to 6.2.0

Bumps [eslint-plugin-qunit](https://github.com/platinumazure/eslint-plugin-qunit) from 4.0.0 to 6.2.0.
- [Release notes](https://github.com/platinumazure/eslint-plugin-qunit/releases)
- [Changelog](https://github.com/platinumazure/eslint-plugin-qunit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/platinumazure/eslint-plugin-qunit/compare/v4.0.0...v6.2.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-qunit
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 41 +++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index f2c637d7293..dbab54905a2 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-qunit": "^4.0.0",
+    "eslint-plugin-qunit": "^6.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.12.0",
     "express": "^4.17.1",
diff --git a/yarn.lock b/yarn.lock
index eb318552378..d4d8a4c0db3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4951,7 +4951,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.1:
+debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -4965,13 +4965,6 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@~4.3.1, debug@~4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5903,10 +5896,13 @@ eslint-plugin-prettier@^3.4.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-qunit@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-4.0.0.tgz#5945ba3434bfe8879bea195192e906701051cf01"
-  integrity "sha1-WUW6NDS/6Ieb6hlRkukGcBBRzwE= sha512-+0i2xcYryUoLawi47Lp0iJKzkP931G5GXwIOq1KBKQc2pknV1VPjfE6b4mI2mR2RnL7WRoS30YjwC9SjQgJDXQ=="
+eslint-plugin-qunit@^6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d"
+  integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==
+  dependencies:
+    eslint-utils "^3.0.0"
+    requireindex "^1.2.0"
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -5916,20 +5912,20 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd"
-  integrity "sha1-e+HMcPJ6cqds0UqmmLyr7WiQ4c0= sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="
-  dependencies:
-    eslint-visitor-keys "^1.1.0"
-
-eslint-utils@^2.1.0:
+eslint-utils@^2.0.0, eslint-utils@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity "sha1-0t5eA0JOcH3BDHQGjd7a5wh0Gyc= sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
 eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
@@ -10223,6 +10219,11 @@ require-relative@^0.8.7:
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
   integrity "sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4= sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg=="
 
+requireindex@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
+  integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
+
 requireindex@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz#e5404b81557ef75db6e49c5a72004893fe03e162"

From 5a8acae5c4225326bd4dc80318507492f55d9446 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 1 Oct 2021 14:52:21 +0100
Subject: [PATCH 0652/1405] run eslint fix

---
 tests/node/build-info-test.js |  8 ++++----
 tests/node/overrides-test.js  | 18 +++++++++---------
 tests/node/visit-test.js      |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/node/build-info-test.js b/tests/node/build-info-test.js
index 22f86f73a69..7261d1b38a9 100644
--- a/tests/node/build-info-test.js
+++ b/tests/node/build-info-test.js
@@ -32,7 +32,7 @@ QUnit.module('buildVersion', () => {
     ],
     padEmptyArgs(3, [null, ''])
   ).forEach(({ args, expected }) => {
-    QUnit.test(JSON.stringify(args), (assert) => {
+    QUnit.test(JSON.stringify(args), function (assert) {
       assert.equal(buildVersion(...args), expected);
     });
   });
@@ -49,12 +49,12 @@ QUnit.module('parseTagVersion', () => {
       expected: '3.1.1-beta.2',
     },
   ].forEach(({ tag, expected }) => {
-    QUnit.test(JSON.stringify(tag), (assert) => {
+    QUnit.test(JSON.stringify(tag), function (assert) {
       assert.equal(parseTagVersion(tag), expected);
     });
   });
 
-  QUnit.test('parseTagVersion raises on non-semver tags', (assert) => {
+  QUnit.test('parseTagVersion raises on non-semver tags', function (assert) {
     assert.throws(() => {
       parseTagVersion('some-non-version-tag');
     });
@@ -127,7 +127,7 @@ QUnit.module('buildFromParts', () => {
       },
     },
   ].forEach(({ args, expected }) => {
-    QUnit.test(JSON.stringify(args), (assert) => {
+    QUnit.test(JSON.stringify(args), function (assert) {
       assert.deepEqual(buildFromParts(...args), expected);
     });
   });
diff --git a/tests/node/overrides-test.js b/tests/node/overrides-test.js
index ab6f98e31c8..2a28c4e8129 100644
--- a/tests/node/overrides-test.js
+++ b/tests/node/overrides-test.js
@@ -560,25 +560,25 @@ QUnit.module('Overrides', function () {
     let project = new Project(fullExample());
     let overrides = Overrides.for(project, { EMBER_ENV: 'production' });
 
-    assert.strictEqual(overrides.hasOverrides, false, 'hasOverrides');
-    assert.strictEqual(overrides.hasBuildTimeWarning, false, 'hasBuildTimeWarning');
+    assert.false(overrides.hasOverrides, 'hasOverrides');
+    assert.false(overrides.hasBuildTimeWarning, 'hasBuildTimeWarning');
   });
 
   QUnit.test('it does nothing when everything is on new babel', function (assert) {
     let overrides = new Overrides([]);
 
-    assert.strictEqual(overrides.hasOverrides, false, 'hasOverrides');
-    assert.strictEqual(overrides.hasBuildTimeWarning, false, 'hasBuildTimeWarning');
+    assert.false(overrides.hasOverrides, 'hasOverrides');
+    assert.false(overrides.hasBuildTimeWarning, 'hasBuildTimeWarning');
   });
 
   QUnit.test('when app is on old babel', function (assert) {
     let overrides = new Overrides([infoForApp({ version: '6.0.0' })]);
 
-    assert.strictEqual(overrides.hasOverrides, true, 'hasOverrides');
-    assert.strictEqual(overrides.hasBuildTimeWarning, true, 'hasBuildTimeWarning');
-    assert.strictEqual(overrides.hasActionableSuggestions, true, 'hasActionableSuggestions');
-    assert.strictEqual(overrides.hasCompatibleAddons, false, 'hasCompatibleAddons');
-    assert.strictEqual(overrides.hasDormantAddons, false, 'hasDormantAddons');
+    assert.true(overrides.hasOverrides, 'hasOverrides');
+    assert.true(overrides.hasBuildTimeWarning, 'hasBuildTimeWarning');
+    assert.true(overrides.hasActionableSuggestions, 'hasActionableSuggestions');
+    assert.false(overrides.hasCompatibleAddons, 'hasCompatibleAddons');
+    assert.false(overrides.hasDormantAddons, 'hasDormantAddons');
   });
 
   // let project, env;
diff --git a/tests/node/visit-test.js b/tests/node/visit-test.js
index 47452946ae1..517542483f3 100644
--- a/tests/node/visit-test.js
+++ b/tests/node/visit-test.js
@@ -87,7 +87,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
       ),
     ]).then(function () {
       assert.ok(initCalled, 'Component#init should be called');
-      assert.ok(!didInsertElementCalled, 'Component#didInsertElement should not be called');
+      assert.notOk(didInsertElementCalled, 'Component#didInsertElement should not be called');
     });
   });
 

From 986787d20d6416fc1763f2dcc3b5a7e117fa23d2 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 1 Oct 2021 15:01:17 +0100
Subject: [PATCH 0653/1405] disable qunit/no-test-expect-argument for
 (at)ember/string tests

---
 packages/@ember/string/tests/camelize_test.js   | 1 +
 packages/@ember/string/tests/capitalize_test.js | 1 +
 packages/@ember/string/tests/classify_test.js   | 1 +
 packages/@ember/string/tests/dasherize_test.js  | 1 +
 packages/@ember/string/tests/decamelize_test.js | 1 +
 packages/@ember/string/tests/underscore_test.js | 1 +
 packages/@ember/string/tests/w_test.js          | 1 +
 7 files changed, 7 insertions(+)

diff --git a/packages/@ember/string/tests/camelize_test.js b/packages/@ember/string/tests/camelize_test.js
index 04d4015c39f..1cb053fa798 100644
--- a/packages/@ember/string/tests/camelize_test.js
+++ b/packages/@ember/string/tests/camelize_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { camelize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/string/tests/capitalize_test.js b/packages/@ember/string/tests/capitalize_test.js
index 593c81afda3..7b11679722a 100644
--- a/packages/@ember/string/tests/capitalize_test.js
+++ b/packages/@ember/string/tests/capitalize_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { capitalize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/string/tests/classify_test.js b/packages/@ember/string/tests/classify_test.js
index bb846c46bb2..5232ccbf8c5 100644
--- a/packages/@ember/string/tests/classify_test.js
+++ b/packages/@ember/string/tests/classify_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { classify } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/string/tests/dasherize_test.js b/packages/@ember/string/tests/dasherize_test.js
index c29640412b7..9f41db6957b 100644
--- a/packages/@ember/string/tests/dasherize_test.js
+++ b/packages/@ember/string/tests/dasherize_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { dasherize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/string/tests/decamelize_test.js b/packages/@ember/string/tests/decamelize_test.js
index cc8aff312f6..f37af0c66a2 100644
--- a/packages/@ember/string/tests/decamelize_test.js
+++ b/packages/@ember/string/tests/decamelize_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { decamelize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/string/tests/underscore_test.js b/packages/@ember/string/tests/underscore_test.js
index 2baf836fe76..69a1b83b33b 100644
--- a/packages/@ember/string/tests/underscore_test.js
+++ b/packages/@ember/string/tests/underscore_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { underscore } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/string/tests/w_test.js b/packages/@ember/string/tests/w_test.js
index 1357aa2fa40..e9fada90f2a 100644
--- a/packages/@ember/string/tests/w_test.js
+++ b/packages/@ember/string/tests/w_test.js
@@ -1,3 +1,4 @@
+/* eslint-disable qunit/no-test-expect-argument */
 import { w } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 

From c8393752e1f5d369f56c7c6726878cdd3e21dd9a Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 1 Oct 2021 15:01:43 +0100
Subject: [PATCH 0654/1405] disable qunit/no-qunit-stop lint in qunit testing
 adapter

---
 packages/ember-testing/lib/adapters/qunit.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/ember-testing/lib/adapters/qunit.js b/packages/ember-testing/lib/adapters/qunit.js
index 7b3060f8b0b..eed764ceeb2 100644
--- a/packages/ember-testing/lib/adapters/qunit.js
+++ b/packages/ember-testing/lib/adapters/qunit.js
@@ -22,6 +22,7 @@ export default Adapter.extend({
   asyncStart() {
     if (typeof QUnit.stop === 'function') {
       // very old QUnit version
+      // eslint-disable-next-line qunit/no-qunit-stop
       QUnit.stop();
     } else {
       this.doneCallbacks.push(QUnit.config.current ? QUnit.config.current.assert.async() : null);

From a01b35495928f0f890efa03a2e022a7c84a396ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 14:20:12 +0000
Subject: [PATCH 0655/1405] Bump eslint-plugin-import from 2.22.1 to 2.24.2

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.22.1 to 2.24.2.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.22.1...v2.24.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 323 +++++++++++++++++----------------------------------
 2 files changed, 109 insertions(+), 216 deletions(-)

diff --git a/package.json b/package.json
index dbab54905a2..8dd86dffe99 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^1.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-qunit": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index d4d8a4c0db3..10740d7a4f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3121,13 +3121,15 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 
-array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity "sha1-zdZ+aFK9+cEhVGB4ZzIlXtJFk0g= sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="
+array-includes@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
+  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.2"
+    get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
 array-to-error@^1.0.0:
@@ -3152,13 +3154,14 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
 
-array.prototype.flat@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity "sha1-DegrQmsDGNv9uUAInjiwQ9N/bHs= sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ=="
+array.prototype.flat@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
@@ -4756,11 +4759,6 @@ consolidate@^0.15.1:
   dependencies:
     bluebird "^3.1.1"
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= sha512-OKZnPGeMQy2RPaUIBPFFd71iNf4791H12MCRuVQDnzGRwCYNYmTDy5pdafo2SLAcEMKzTOQnLWG4QdcjeJUMEg=="
-
 content-disposition@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
@@ -4937,27 +4935,27 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
+debug@3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity "sha1-6D0X3hbYp++3cX7b5fsQE17uYps= sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
+debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -4965,6 +4963,13 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5102,13 +5107,12 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg=="
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
-    isarray "^1.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -5634,7 +5638,7 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity "sha1-tKxAZIEH/c3PriQvQovqihTU8b8= sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="
@@ -5649,39 +5653,31 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.17.0:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity "sha1-kUIHFweFeyysx7iey2cDFsPi1So= sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk= sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="
+es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.0.tgz#0a6e6682268e7f5bdc1c740b33ce2578d64538d3"
+  integrity sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==
   dependencies:
+    call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
 
 es-abstract@^1.18.2:
   version "1.18.6"
@@ -5819,20 +5815,20 @@ eslint-config-prettier@^6.11.0:
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity "sha1-hf+oGULCUBLYIxCW3fZ5wDBCxxc= sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="
+eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    debug "^3.2.7"
+    resolve "^1.20.0"
 
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity "sha1-V569CU9Wr3eX0ZyYZsnJSGYpv6Y= sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="
+eslint-module-utils@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"
+  integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==
   dependencies:
-    debug "^2.6.9"
+    debug "^3.2.7"
     pkg-dir "^2.0.0"
 
 eslint-plugin-disable-features@^0.1.3:
@@ -5858,24 +5854,26 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.22.0:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity "sha1-CJbH5qDPRBCaLZe5WQPCu2iddwI= sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="
+eslint-plugin-import@^2.24.2:
+  version "2.24.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
+  integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
+    array-includes "^3.1.3"
+    array.prototype.flat "^1.2.4"
     debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.6.2"
+    find-up "^2.0.0"
     has "^1.0.3"
+    is-core-module "^2.6.0"
     minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    object.values "^1.1.4"
+    pkg-up "^2.0.0"
+    read-pkg-up "^3.0.0"
+    resolve "^1.20.0"
+    tsconfig-paths "^3.11.0"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -7489,25 +7487,15 @@ is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU= sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
 
-is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs= sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
-
-is-callable@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity "sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk= sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
-
 is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
-  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
+is-core-module@^2.2.0, is-core-module@^2.6.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
   dependencies:
     has "^1.0.3"
 
@@ -7683,20 +7671,6 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4= sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="
-  dependencies:
-    has "^1.0.3"
-
-is-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity "sha1-xvmKrMVG9s7FRooHt7FTq1ZKV7k= sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -7720,6 +7694,11 @@ is-running@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
   integrity "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA= sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w=="
 
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -7763,6 +7742,13 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -8064,16 +8050,6 @@ livereload-js@^2.3.0:
   resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
   integrity "sha1-RHwxzx6pq1L8INthXF3fZ494AJw= sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ=="
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -9205,11 +9181,6 @@ object-inspect@^1.11.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc= sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
-
 object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
@@ -9262,15 +9233,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity "sha1-aKmezeNWt+kpWjxeDOMdyMlT3l4= sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="
+object.values@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -9444,13 +9414,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -9561,13 +9524,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ=="
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -9607,11 +9563,6 @@ picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity "sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
-
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -9964,14 +9915,6 @@ rc@^1.0.1, rc@^1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w=="
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -9980,15 +9923,6 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA=="
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -10289,14 +10223,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.14.2, resolve@^1.20.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -11040,14 +10967,6 @@ string.prototype.matchall@^4.0.4:
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity "sha1-hYEqa4R6wAInD1gIFGBkyZX7aRM= sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -11056,32 +10975,6 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity "sha1-RAiqLl1t3QyagHObCH+8BnwDs8w= sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity "sha1-x28c7zDyG7rYr+uNsVEUls+w8qM= sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity "sha1-FK9tnzSwU/fPyJty+PLuFLkDmlQ= sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -11560,10 +11453,10 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity "sha1-CYVHpsREiAfo/Ljq4IEGTumjyQs= sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="
+tsconfig-paths@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
+  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"

From 621d1542582f99d101ddb5e88555b04cdec05629 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 15:03:53 +0000
Subject: [PATCH 0656/1405] Bump babel-plugin-debug-macros from 0.3.3 to 0.3.4

Bumps [babel-plugin-debug-macros](https://github.com/chadhietala/babel-debug-macros) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/chadhietala/babel-debug-macros/releases)
- [Changelog](https://github.com/ember-cli/babel-plugin-debug-macros/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chadhietala/babel-debug-macros/compare/v0.3.3...v0.3.4)

---
updated-dependencies:
- dependency-name: babel-plugin-debug-macros
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 ++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index dbab54905a2..183d6762c98 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.80.0",
-    "babel-plugin-debug-macros": "^0.3.3",
+    "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
     "broccoli-debug": "^0.6.4",
diff --git a/yarn.lock b/yarn.lock
index d4d8a4c0db3..96687d3faea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3311,14 +3311,7 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-debug-macros@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
-  integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
-  dependencies:
-    semver "^5.3.0"
-
-babel-plugin-debug-macros@^0.3.4:
+babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
   integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
@@ -10543,14 +10536,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5:
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==

From 52c4c12097f2cc5390e6a9dcbf3f23f7d5afc804 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 15:05:03 +0000
Subject: [PATCH 0657/1405] Bump @types/rsvp from 4.0.3 to 4.0.4

Bumps [@types/rsvp](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/rsvp) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/rsvp)

---
updated-dependencies:
- dependency-name: "@types/rsvp"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dbab54905a2..24bc1019d46 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "@glimmer/validator": "0.80.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
-    "@types/rsvp": "^4.0.3",
+    "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index d4d8a4c0db3..53311826242 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2793,10 +2793,10 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/rsvp@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.3.tgz#4a1223158453257bce09d42b9eef7cfa6d257482"
-  integrity "sha1-ShIjFYRTJXvOCdQrnu98+m0ldII= sha512-OpRwxbgx16nL/0/7ol0WoLLyLaMXBvtPOHjqLljnzAB/E7Qk1wtjytxgBhOTBMZvuLXnJUqfnjb4W/QclNFvSA=="
+"@types/rsvp@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
+  integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
 
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"

From a5f4bd214b9efe6b6cb87a1f79a0497e11ff27d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Oct 2021 15:05:22 +0000
Subject: [PATCH 0658/1405] Bump ember-cli-browserstack from 1.1.0 to 2.0.1

Bumps [ember-cli-browserstack](https://github.com/kategengler/ember-cli-browserstack) from 1.1.0 to 2.0.1.
- [Release notes](https://github.com/kategengler/ember-cli-browserstack/releases)
- [Changelog](https://github.com/kategengler/ember-cli-browserstack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/kategengler/ember-cli-browserstack/compare/v1.1.0...v2.0.1)

---
updated-dependencies:
- dependency-name: ember-cli-browserstack
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 144 +++++++++++++++++++++++++++++++++++----------------
 2 files changed, 100 insertions(+), 46 deletions(-)

diff --git a/package.json b/package.json
index dbab54905a2..6edcdad2c60 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "dag-map": "^2.0.2",
     "ember-cli": "^3.12.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
-    "ember-cli-browserstack": "^1.1.0",
+    "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
diff --git a/yarn.lock b/yarn.lock
index d4d8a4c0db3..968e2b46fdf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3030,6 +3030,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U= sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
 
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
 ansi-styles@^2.0.1, ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -3042,6 +3047,13 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
 ansi-styles@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
@@ -4172,20 +4184,20 @@ browserslist@^4.16.6, browserslist@^4.17.0:
     nanocolors "^0.1.5"
     node-releases "^1.1.76"
 
-browserstack-local@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.2.tgz#5d2248384b8aa0fc521df32001127f010a92458d"
-  integrity "sha1-XSJIOEuKoPxSHfMgARJ/AQqSRY0= sha512-fRaynjF0MvtyyfPRy2NFnVwxLyNtD28K/v9xRsIjUVf7xLc80NIm7Nfr3KXlFmWizhG91PL/UAOXlHkoxQjaNw=="
+browserstack-local@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.8.tgz#07f74a19b324cf2de69ffe65f9c2baa3a2dd9a0e"
+  integrity sha512-s+mc3gTOJwELdLWi4qFVKtGwMbb5JWsR+JxKlMaJkRJxoZ0gg3WREgPxAN0bm6iU5+S4Bi0sz0oxBRZT8BiNsQ==
   dependencies:
-    https-proxy-agent "^2.2.1"
-    is-running "^2.0.0"
-    ps-tree "=1.1.1"
+    https-proxy-agent "^4.0.0"
+    is-running "^2.1.0"
+    ps-tree "=1.2.0"
     temp-fs "^0.9.9"
 
-browserstack@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.3.tgz#93ab48799a12ef99dbd074dd595410ddb196a7ac"
-  integrity "sha1-k6tIeZoS75nb0HTdWVQQ3bGWp6w= sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg=="
+browserstack@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
+  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
   dependencies:
     https-proxy-agent "^2.2.1"
 
@@ -4566,6 +4578,15 @@ cliui@^5.0.0:
     strip-ansi "^5.2.0"
     wrap-ansi "^5.1.0"
 
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone-response@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
@@ -5287,15 +5308,15 @@ ember-cli-broccoli-sane-watcher@^3.0.0:
     rsvp "^3.0.18"
     sane "^4.0.0"
 
-ember-cli-browserstack@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-browserstack/-/ember-cli-browserstack-1.1.0.tgz#1d2bcf84370c196dc0c091ee65d54193072dadfc"
-  integrity "sha1-HSvPhDcMGW3AwJHuZdVBkwctrfw= sha512-nSYHa5YP0RjthfMBpasLJt4bnodV2AgKR4KZ4DaFrboiW+FVfqNZ8MRLBrTfaH3NqDWofcnCQTfqriByAcqbRA=="
+ember-cli-browserstack@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-browserstack/-/ember-cli-browserstack-2.0.1.tgz#4bfc6bcce28dba0a8fb4409945b8f9f9ee31abf7"
+  integrity sha512-8Ki6570dTSpvYLdNZ7VvJm4Gku4ZNfF78/4BeOD2IqH/vGo80hwBNqDqRINcy8et562uEWe8gUGyeYBZ2ohhkw==
   dependencies:
-    browserstack "^1.5.3"
-    browserstack-local "^1.4.2"
+    browserstack "^1.6.1"
+    browserstack-local "^1.4.8"
     rsvp "^4.8.5"
-    yargs "^14.2.0"
+    yargs "^17.1.1"
 
 ember-cli-dependency-checker@^3.2.0:
   version "3.2.0"
@@ -5533,6 +5554,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY= sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
@@ -7582,6 +7608,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
@@ -7715,10 +7746,10 @@ is-retry-allowed@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
   integrity "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= sha512-leC1bcIRBHjXtaZSM2gAXNeZsIOdDMgq/kHKAVKQ05JTwvb7hnvrHBEm6mnnMRyE7yu+ljNlcG8YUmALCevSxg=="
 
-is-running@^2.0.0:
+is-running@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
-  integrity "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA= sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w=="
+  integrity sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=
 
 is-stream@^1.1.0:
   version "1.1.0"
@@ -9824,10 +9855,10 @@ proxy-from-env@^1.0.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
   integrity "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A=="
 
-ps-tree@=1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.1.tgz#5f1ba35455b8c25eeb718d04c37de1555d96d3db"
-  integrity "sha1-XxujVFW4wl7rcY0Ew33hVV2W09s= sha512-kef7fYYSKVqQffmzTMsVcUD1ObNJMp8sNSmHGlGKsZQyL/ht9MZKk86u0Rd1NhpTOAuhqwKCLLpktwkqz+MF8A=="
+ps-tree@=1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.2.0.tgz#5e7425b89508736cdd4f2224d028f7bb3f722ebd"
+  integrity sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==
   dependencies:
     event-stream "=3.3.4"
 
@@ -11026,6 +11057,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string.prototype.matchall@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
@@ -11157,6 +11197,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -12055,6 +12102,15 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -12119,6 +12175,11 @@ y18n@^4.0.0:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
   integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
 
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
 yallist@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
@@ -12152,13 +12213,10 @@ yargs-parser@^10.0.0:
   dependencies:
     camelcase "^4.1.0"
 
-yargs-parser@^15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08"
-  integrity "sha1-zdepdJDsg2GV9Z8/Tb5eqej3Xwg= sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ=="
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs-unparser@1.6.0:
   version "1.6.0"
@@ -12185,22 +12243,18 @@ yargs@13.3.2, yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@^14.2.0:
-  version "14.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3"
-  integrity "sha1-8RapJCxO2GaHkLQHWbSQbCdudsM= sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg=="
+yargs@^17.1.1:
+  version "17.2.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
+  integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==
   dependencies:
-    cliui "^5.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^15.0.0"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
 
 yauzl@^2.10.0:
   version "2.10.0"

From 5e2eaa33fb624e4fc501e125bf8a90975d7f663d Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Mon, 4 Oct 2021 16:47:20 -0400
Subject: [PATCH 0659/1405] Implement @cached

Co-Authored-By: @buschtoens <jan@buschtoens.me>
---
 packages/@ember/-internals/metal/index.ts     |   1 +
 .../@ember/-internals/metal/lib/cached.ts     | 113 ++++++++++++++++++
 .../-internals/metal/tests/cached/get_test.js | 100 ++++++++++++++++
 3 files changed, 214 insertions(+)
 create mode 100644 packages/@ember/-internals/metal/lib/cached.ts
 create mode 100644 packages/@ember/-internals/metal/tests/cached/get_test.js

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 2ae048403b3..29417e57e85 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -54,6 +54,7 @@ export { Mixin, mixin, observer, applyMixin } from './lib/mixin';
 export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
 export { tagForProperty, tagForObject, markObjectAsDirty } from './lib/tags';
 export { tracked, TrackedDescriptor } from './lib/tracked';
+export { cached } from './lib/cached';
 export { createCache, getValue, isConst } from './lib/cache';
 
 export {
diff --git a/packages/@ember/-internals/metal/lib/cached.ts b/packages/@ember/-internals/metal/lib/cached.ts
new file mode 100644
index 00000000000..ae91d919a74
--- /dev/null
+++ b/packages/@ember/-internals/metal/lib/cached.ts
@@ -0,0 +1,113 @@
+// NOTE: copied from: https://github.com/glimmerjs/glimmer.js/pull/358
+import { DEBUG } from '@glimmer/env';
+import { createCache, getValue } from '@glimmer/validator';
+
+/**
+ * @decorator
+ *
+ * The `@cached` decorator can be used on getters in order to cache the return
+ * value of the getter. This is useful when a getter is expensive and used very
+ * often.
+ *
+ *
+ * @example
+ *
+ * in this guest list class, we have the `sortedGuests`
+ * getter that sorts the guests alphabetically:
+ *
+ * ```js
+ * import { tracked } from '@glimmer/tracking';
+ *
+ * class GuestList {
+ *   @tracked guests = ['Zoey', 'Tomster'];
+ *
+ *   get sortedGuests() {
+ *     return this.guests.slice().sort()
+ *   }
+ * }
+ * ```
+ *
+ * Every time `sortedGuests` is accessed, a new array will be created and sorted,
+ * because JavaScript getters do not cache by default. When the guest list is
+ * small, like the one in the example, this is not a problem. However, if the guest
+ * list were to grow very large, it would mean that we would be doing a large
+ * amount of work each time we accessed `sortedGetters`. With `@cached`, we can
+ * cache the value instead:
+ *
+ * ```js
+ * import { tracked, cached } from '@glimmer/tracking';
+ *
+ * class GuestList {
+ *   @tracked guests = ['Zoey', 'Tomster'];
+ *
+ *   @cached
+ *   get sortedGuests() {
+ *     return this.guests.slice().sort()
+ *   }
+ * }
+ * ```
+ *
+ * Now the `sortedGuests` getter will be cached based on _autotracking_. It will
+ * only rerun and create a new sorted array when the `guests` tracked property is
+ * updated.
+ *
+ * In general, you should avoid using `@cached` unless you have confirmed that the
+ * getter you are decorating is computationally expensive. `@cached` adds a small
+ * amount of overhead to the getter, making it more expensive. While this overhead
+ * is small, if `@cached` is overused it can add up to a large impact overall in
+ * your app. Many getters and tracked properties are only accessed once, rendered,
+ * and then never rerendered, so adding `@cached` when it is unnecessary can
+ * negatively impact performance.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const cached: PropertyDecorator = (...args: any[]) => {
+  const [target, key, descriptor] = args;
+
+  // Error on `@cached()`, `@cached(...args)`, and `@cached propName = value;`
+  if (DEBUG && target === undefined) throwCachedExtraneousParens();
+  if (
+    DEBUG &&
+    (typeof target !== 'object' ||
+      typeof key !== 'string' ||
+      typeof descriptor !== 'object' ||
+      args.length !== 3)
+  ) {
+    throwCachedInvalidArgsError(args);
+  }
+  if (DEBUG && (!('get' in descriptor) || typeof descriptor.get !== 'function')) {
+    throwCachedGetterOnlyError(key);
+  }
+
+  const caches = new WeakMap();
+  const getter = descriptor.get;
+
+  descriptor.get = function (): unknown {
+    if (!caches.has(this)) {
+      caches.set(this, createCache(getter.bind(this)));
+    }
+
+    return getValue(caches.get(this));
+  };
+};
+
+function throwCachedExtraneousParens(): never {
+  throw new Error(
+    'You attempted to use @cached(), which is not necessary nor supported. Remove the parentheses and you will be good to go!'
+  );
+}
+
+function throwCachedGetterOnlyError(key: string): never {
+  throw new Error(`The @cached decorator must be applied to getters. '${key}' is not a getter.`);
+}
+
+function throwCachedInvalidArgsError(args: unknown[] = []): never {
+  throw new Error(
+    `You attempted to use @cached on with ${
+      args.length > 1 ? 'arguments' : 'an argument'
+    } ( @cached(${args
+      .map((d) => `'${d}'`)
+      .join(
+        ', '
+      )}), which is not supported. Dependencies are automatically tracked, so you can just use ${'`@cached`'}`
+  );
+}
diff --git a/packages/@ember/-internals/metal/tests/cached/get_test.js b/packages/@ember/-internals/metal/tests/cached/get_test.js
new file mode 100644
index 00000000000..46ae81eac49
--- /dev/null
+++ b/packages/@ember/-internals/metal/tests/cached/get_test.js
@@ -0,0 +1,100 @@
+import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
+import { cached, tracked } from '../..';
+
+moduleFor(
+  '@cached decorator: get',
+  class extends AbstractTestCase {
+    '@test it works'() {
+      let assert = this.assert;
+
+      class Person {
+        @tracked firstName = 'Jen';
+        @tracked lastName = 'Weber';
+
+        @cached
+        get fullName() {
+          let fullName = `${this.firstName} ${this.lastName}`;
+
+          assert.step(fullName);
+          return fullName;
+        }
+      }
+
+      let person = new Person();
+
+      assert.verifySteps([], 'getter is not called after class initialization');
+
+      assert.strictEqual(person.fullName, 'Jen Weber');
+      assert.verifySteps(['Jen Weber'], 'getter was called after property access');
+
+      assert.strictEqual(person.fullName, 'Jen Weber');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
+
+      person.firstName = 'Kenneth';
+      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+
+      assert.strictEqual(person.fullName, 'Kenneth Weber');
+      assert.verifySteps(['Kenneth Weber'], 'accessing the property triggers a re-computation');
+
+      assert.strictEqual(person.fullName, 'Kenneth Weber');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
+
+      person.lastName = 'Larsen';
+      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+
+      assert.strictEqual(person.fullName, 'Kenneth Larsen');
+      assert.verifySteps(['Kenneth Larsen'], 'accessing the property triggers a re-computation');
+    }
+
+    // https://github.com/ember-polyfills/ember-cached-decorator-polyfill/issues/7
+    '@test it has a separate cache per class instance'() {
+      let assert = this.assert;
+
+      class Person {
+        @tracked firstName;
+        @tracked lastName;
+
+        constructor(firstName, lastName) {
+          this.firstName = firstName;
+          this.lastName = lastName;
+        }
+
+        @cached
+        get fullName() {
+          let fullName = `${this.firstName} ${this.lastName}`;
+          assert.step(fullName);
+          return fullName;
+        }
+      }
+
+      let jen = new Person('Jen', 'Weber');
+      let chris = new Person('Chris', 'Garrett');
+
+      assert.verifySteps([], 'getter is not called after class initialization');
+
+      assert.strictEqual(jen.fullName, 'Jen Weber');
+      assert.verifySteps(['Jen Weber'], 'getter was called after property access');
+
+      assert.strictEqual(jen.fullName, 'Jen Weber');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
+
+      assert.strictEqual(chris.fullName, 'Chris Garrett', 'other instance has a different value');
+      assert.verifySteps(['Chris Garrett'], 'getter was called after property access');
+
+      assert.strictEqual(chris.fullName, 'Chris Garrett');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
+
+      chris.lastName = 'Manson';
+      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+
+      assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
+
+      assert.strictEqual(chris.fullName, 'Chris Manson');
+      assert.verifySteps(['Chris Manson'], 'getter was called after property access');
+
+      assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
+    }
+  }
+);

From 1281862758424800b9096d3a13b1817b629f42e8 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Mon, 4 Oct 2021 18:07:32 -0400
Subject: [PATCH 0660/1405] Add new feature flag: EMBER_CACHED

---
 .../@ember/-internals/metal/lib/cached.ts     |  51 +++---
 .../-internals/metal/tests/cached/get_test.js | 153 +++++++++---------
 packages/@ember/canary-features/index.ts      |   2 +
 packages/@glimmer/tracking/index.ts           |   2 +-
 4 files changed, 109 insertions(+), 99 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/cached.ts b/packages/@ember/-internals/metal/lib/cached.ts
index ae91d919a74..76ff30f6be1 100644
--- a/packages/@ember/-internals/metal/lib/cached.ts
+++ b/packages/@ember/-internals/metal/lib/cached.ts
@@ -1,6 +1,9 @@
 // NOTE: copied from: https://github.com/glimmerjs/glimmer.js/pull/358
+// Both glimmerjs/glimmer.js and emberjs/ember.js have the exact same implementation
+// of @cached, so any changes made to one should also be made to the other
 import { DEBUG } from '@glimmer/env';
 import { createCache, getValue } from '@glimmer/validator';
+import { EMBER_CACHED } from '@ember/canary-features';
 
 /**
  * @decorator
@@ -61,33 +64,35 @@ import { createCache, getValue } from '@glimmer/validator';
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const cached: PropertyDecorator = (...args: any[]) => {
-  const [target, key, descriptor] = args;
+  if (EMBER_CACHED) {
+    const [target, key, descriptor] = args;
 
-  // Error on `@cached()`, `@cached(...args)`, and `@cached propName = value;`
-  if (DEBUG && target === undefined) throwCachedExtraneousParens();
-  if (
-    DEBUG &&
-    (typeof target !== 'object' ||
-      typeof key !== 'string' ||
-      typeof descriptor !== 'object' ||
-      args.length !== 3)
-  ) {
-    throwCachedInvalidArgsError(args);
-  }
-  if (DEBUG && (!('get' in descriptor) || typeof descriptor.get !== 'function')) {
-    throwCachedGetterOnlyError(key);
-  }
+    // Error on `@cached()`, `@cached(...args)`, and `@cached propName = value;`
+    if (DEBUG && target === undefined) throwCachedExtraneousParens();
+    if (
+      DEBUG &&
+      (typeof target !== 'object' ||
+        typeof key !== 'string' ||
+        typeof descriptor !== 'object' ||
+        args.length !== 3)
+    ) {
+      throwCachedInvalidArgsError(args);
+    }
+    if (DEBUG && (!('get' in descriptor) || typeof descriptor.get !== 'function')) {
+      throwCachedGetterOnlyError(key);
+    }
 
-  const caches = new WeakMap();
-  const getter = descriptor.get;
+    const caches = new WeakMap();
+    const getter = descriptor.get;
 
-  descriptor.get = function (): unknown {
-    if (!caches.has(this)) {
-      caches.set(this, createCache(getter.bind(this)));
-    }
+    descriptor.get = function (): unknown {
+      if (!caches.has(this)) {
+        caches.set(this, createCache(getter.bind(this)));
+      }
 
-    return getValue(caches.get(this));
-  };
+      return getValue(caches.get(this));
+    };
+  }
 };
 
 function throwCachedExtraneousParens(): never {
diff --git a/packages/@ember/-internals/metal/tests/cached/get_test.js b/packages/@ember/-internals/metal/tests/cached/get_test.js
index 46ae81eac49..9cc4d3f9b1c 100644
--- a/packages/@ember/-internals/metal/tests/cached/get_test.js
+++ b/packages/@ember/-internals/metal/tests/cached/get_test.js
@@ -1,100 +1,103 @@
 import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 import { cached, tracked } from '../..';
-
-moduleFor(
-  '@cached decorator: get',
-  class extends AbstractTestCase {
-    '@test it works'() {
-      let assert = this.assert;
-
-      class Person {
-        @tracked firstName = 'Jen';
-        @tracked lastName = 'Weber';
-
-        @cached
-        get fullName() {
-          let fullName = `${this.firstName} ${this.lastName}`;
-
-          assert.step(fullName);
-          return fullName;
+import { EMBER_CACHED } from '@ember/canary-features';
+
+if (EMBER_CACHED) {
+  moduleFor(
+    '@cached decorator: get',
+    class extends AbstractTestCase {
+      '@test it works'() {
+        let assert = this.assert;
+
+        class Person {
+          @tracked firstName = 'Jen';
+          @tracked lastName = 'Weber';
+
+          @cached
+          get fullName() {
+            let fullName = `${this.firstName} ${this.lastName}`;
+
+            assert.step(fullName);
+            return fullName;
+          }
         }
-      }
-
-      let person = new Person();
 
-      assert.verifySteps([], 'getter is not called after class initialization');
+        let person = new Person();
 
-      assert.strictEqual(person.fullName, 'Jen Weber');
-      assert.verifySteps(['Jen Weber'], 'getter was called after property access');
+        assert.verifySteps([], 'getter is not called after class initialization');
 
-      assert.strictEqual(person.fullName, 'Jen Weber');
-      assert.verifySteps([], 'getter was not called again after repeated property access');
+        assert.strictEqual(person.fullName, 'Jen Weber');
+        assert.verifySteps(['Jen Weber'], 'getter was called after property access');
 
-      person.firstName = 'Kenneth';
-      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+        assert.strictEqual(person.fullName, 'Jen Weber');
+        assert.verifySteps([], 'getter was not called again after repeated property access');
 
-      assert.strictEqual(person.fullName, 'Kenneth Weber');
-      assert.verifySteps(['Kenneth Weber'], 'accessing the property triggers a re-computation');
+        person.firstName = 'Kenneth';
+        assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
 
-      assert.strictEqual(person.fullName, 'Kenneth Weber');
-      assert.verifySteps([], 'getter was not called again after repeated property access');
+        assert.strictEqual(person.fullName, 'Kenneth Weber');
+        assert.verifySteps(['Kenneth Weber'], 'accessing the property triggers a re-computation');
 
-      person.lastName = 'Larsen';
-      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+        assert.strictEqual(person.fullName, 'Kenneth Weber');
+        assert.verifySteps([], 'getter was not called again after repeated property access');
 
-      assert.strictEqual(person.fullName, 'Kenneth Larsen');
-      assert.verifySteps(['Kenneth Larsen'], 'accessing the property triggers a re-computation');
-    }
+        person.lastName = 'Larsen';
+        assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
 
-    // https://github.com/ember-polyfills/ember-cached-decorator-polyfill/issues/7
-    '@test it has a separate cache per class instance'() {
-      let assert = this.assert;
-
-      class Person {
-        @tracked firstName;
-        @tracked lastName;
-
-        constructor(firstName, lastName) {
-          this.firstName = firstName;
-          this.lastName = lastName;
-        }
+        assert.strictEqual(person.fullName, 'Kenneth Larsen');
+        assert.verifySteps(['Kenneth Larsen'], 'accessing the property triggers a re-computation');
+      }
 
-        @cached
-        get fullName() {
-          let fullName = `${this.firstName} ${this.lastName}`;
-          assert.step(fullName);
-          return fullName;
+      // https://github.com/ember-polyfills/ember-cached-decorator-polyfill/issues/7
+      '@test it has a separate cache per class instance'() {
+        let assert = this.assert;
+
+        class Person {
+          @tracked firstName;
+          @tracked lastName;
+
+          constructor(firstName, lastName) {
+            this.firstName = firstName;
+            this.lastName = lastName;
+          }
+
+          @cached
+          get fullName() {
+            let fullName = `${this.firstName} ${this.lastName}`;
+            assert.step(fullName);
+            return fullName;
+          }
         }
-      }
 
-      let jen = new Person('Jen', 'Weber');
-      let chris = new Person('Chris', 'Garrett');
+        let jen = new Person('Jen', 'Weber');
+        let chris = new Person('Chris', 'Garrett');
 
-      assert.verifySteps([], 'getter is not called after class initialization');
+        assert.verifySteps([], 'getter is not called after class initialization');
 
-      assert.strictEqual(jen.fullName, 'Jen Weber');
-      assert.verifySteps(['Jen Weber'], 'getter was called after property access');
+        assert.strictEqual(jen.fullName, 'Jen Weber');
+        assert.verifySteps(['Jen Weber'], 'getter was called after property access');
 
-      assert.strictEqual(jen.fullName, 'Jen Weber');
-      assert.verifySteps([], 'getter was not called again after repeated property access');
+        assert.strictEqual(jen.fullName, 'Jen Weber');
+        assert.verifySteps([], 'getter was not called again after repeated property access');
 
-      assert.strictEqual(chris.fullName, 'Chris Garrett', 'other instance has a different value');
-      assert.verifySteps(['Chris Garrett'], 'getter was called after property access');
+        assert.strictEqual(chris.fullName, 'Chris Garrett', 'other instance has a different value');
+        assert.verifySteps(['Chris Garrett'], 'getter was called after property access');
 
-      assert.strictEqual(chris.fullName, 'Chris Garrett');
-      assert.verifySteps([], 'getter was not called again after repeated property access');
+        assert.strictEqual(chris.fullName, 'Chris Garrett');
+        assert.verifySteps([], 'getter was not called again after repeated property access');
 
-      chris.lastName = 'Manson';
-      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+        chris.lastName = 'Manson';
+        assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
 
-      assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
-      assert.verifySteps([], 'getter was not called again after repeated property access');
+        assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
+        assert.verifySteps([], 'getter was not called again after repeated property access');
 
-      assert.strictEqual(chris.fullName, 'Chris Manson');
-      assert.verifySteps(['Chris Manson'], 'getter was called after property access');
+        assert.strictEqual(chris.fullName, 'Chris Manson');
+        assert.verifySteps(['Chris Manson'], 'getter was called after property access');
 
-      assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
-      assert.verifySteps([], 'getter was not called again after repeated property access');
+        assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
+        assert.verifySteps([], 'getter was not called again after repeated property access');
+      }
     }
-  }
-);
+  );
+}
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 601c4f2b8fe..173e216a9f3 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -21,6 +21,7 @@ export const DEFAULT_FEATURES = {
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: null,
+  EMBER_CACHED: null,
 };
 
 /**
@@ -84,3 +85,4 @@ export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
 export const EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(
   FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH
 );
+export const EMBER_CACHED = featureValue(FEATURES.EMBER_CACHED);
diff --git a/packages/@glimmer/tracking/index.ts b/packages/@glimmer/tracking/index.ts
index f84c6ca5b85..174b13a4d72 100644
--- a/packages/@glimmer/tracking/index.ts
+++ b/packages/@glimmer/tracking/index.ts
@@ -1 +1 @@
-export { tracked } from '@ember/-internals/metal';
+export { tracked, cached } from '@ember/-internals/metal';

From cb762309765a4d0d3733c2c0ca85d0c66dcbde88 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Mon, 4 Oct 2021 18:09:30 -0400
Subject: [PATCH 0661/1405] Cleanup

---
 packages/@ember/-internals/metal/lib/cached.ts            | 2 +-
 packages/@ember/-internals/metal/tests/cached/get_test.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/cached.ts b/packages/@ember/-internals/metal/lib/cached.ts
index 76ff30f6be1..2a39d14b9e6 100644
--- a/packages/@ember/-internals/metal/lib/cached.ts
+++ b/packages/@ember/-internals/metal/lib/cached.ts
@@ -1,9 +1,9 @@
 // NOTE: copied from: https://github.com/glimmerjs/glimmer.js/pull/358
 // Both glimmerjs/glimmer.js and emberjs/ember.js have the exact same implementation
 // of @cached, so any changes made to one should also be made to the other
+import { EMBER_CACHED } from '@ember/canary-features';
 import { DEBUG } from '@glimmer/env';
 import { createCache, getValue } from '@glimmer/validator';
-import { EMBER_CACHED } from '@ember/canary-features';
 
 /**
  * @decorator
diff --git a/packages/@ember/-internals/metal/tests/cached/get_test.js b/packages/@ember/-internals/metal/tests/cached/get_test.js
index 9cc4d3f9b1c..9489338a129 100644
--- a/packages/@ember/-internals/metal/tests/cached/get_test.js
+++ b/packages/@ember/-internals/metal/tests/cached/get_test.js
@@ -48,7 +48,6 @@ if (EMBER_CACHED) {
         assert.verifySteps(['Kenneth Larsen'], 'accessing the property triggers a re-computation');
       }
 
-      // https://github.com/ember-polyfills/ember-cached-decorator-polyfill/issues/7
       '@test it has a separate cache per class instance'() {
         let assert = this.assert;
 

From cdc07377ea4f02767f5f41ca9754a3f33048b5cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:12:04 +0000
Subject: [PATCH 0662/1405] Bump broccoli-source from 3.0.0 to 3.0.1

Bumps [broccoli-source](https://github.com/broccolijs/broccoli-source) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/broccolijs/broccoli-source/releases)
- [Changelog](https://github.com/broccolijs/broccoli-source/blob/master/CHANGELOG.md)
- [Commits](https://github.com/broccolijs/broccoli-source/compare/3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: broccoli-source
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   8 +-
 yarn.lock    | 357 +++++++++++++++++----------------------------------
 2 files changed, 122 insertions(+), 243 deletions(-)

diff --git a/package.json b/package.json
index dbab54905a2..5f3de68ff8e 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.80.0",
-    "babel-plugin-debug-macros": "^0.3.3",
+    "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
     "broccoli-debug": "^0.6.4",
@@ -91,7 +91,7 @@
     "@glimmer/validator": "0.80.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
-    "@types/rsvp": "^4.0.3",
+    "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
@@ -102,7 +102,7 @@
     "broccoli-persistent-filter": "^2.3.1",
     "broccoli-plugin": "^4.0.3",
     "broccoli-rollup": "^2.1.1",
-    "broccoli-source": "^3.0.0",
+    "broccoli-source": "^3.0.1",
     "broccoli-string-replace": "^0.1.2",
     "broccoli-typescript-compiler": "^7.0.0",
     "broccoli-uglify-sourcemap": "^3.2.0",
@@ -120,7 +120,7 @@
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^1.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-qunit": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index d4d8a4c0db3..2d0220e82e4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2793,10 +2793,10 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/rsvp@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.3.tgz#4a1223158453257bce09d42b9eef7cfa6d257482"
-  integrity "sha1-ShIjFYRTJXvOCdQrnu98+m0ldII= sha512-OpRwxbgx16nL/0/7ol0WoLLyLaMXBvtPOHjqLljnzAB/E7Qk1wtjytxgBhOTBMZvuLXnJUqfnjb4W/QclNFvSA=="
+"@types/rsvp@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
+  integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
 
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"
@@ -3121,13 +3121,15 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 
-array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity "sha1-zdZ+aFK9+cEhVGB4ZzIlXtJFk0g= sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="
+array-includes@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
+  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.2"
+    get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
 array-to-error@^1.0.0:
@@ -3152,13 +3154,14 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
 
-array.prototype.flat@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity "sha1-DegrQmsDGNv9uUAInjiwQ9N/bHs= sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ=="
+array.prototype.flat@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
@@ -3311,14 +3314,7 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-debug-macros@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
-  integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
-  dependencies:
-    semver "^5.3.0"
-
-babel-plugin-debug-macros@^0.3.4:
+babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
   integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
@@ -4052,10 +4048,10 @@ broccoli-source@^2.1.2:
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
   integrity sha512-1lLayO4wfS0c0Sj50VfHJXNWf94FYY0WUhxj0R77thbs6uWI7USiOWFqQV5dRmhAJnoKaGN4WyLGQbgjgiYFwQ==
 
-broccoli-source@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.0.tgz#c7c9ba24505941b72a0244568285bc859f69dfbd"
-  integrity "sha1-x8m6JFBZQbcqAkRWgoW8hZ9p370= sha512-G4Zc8HngZIdASyQOiz/9H/0Gjc2F02EFwhWF4wiueaI+/FBrM9Ixj6Prno/1aiLIYcN0JvRC3oytN9uOVonTww=="
+broccoli-source@^3.0.0, broccoli-source@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-3.0.1.tgz#fd581b2f3877ca1338f724f6ef70acec8c7e1444"
+  integrity sha512-ZbGVQjivWi0k220fEeIUioN6Y68xjMy0xiLAc0LdieHI99gw+tafU8w0CggBDYVNsJMKUr006AZaM7gNEwCxEg==
   dependencies:
     broccoli-node-api "^1.6.0"
 
@@ -4756,11 +4752,6 @@ consolidate@^0.15.1:
   dependencies:
     bluebird "^3.1.1"
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= sha512-OKZnPGeMQy2RPaUIBPFFd71iNf4791H12MCRuVQDnzGRwCYNYmTDy5pdafo2SLAcEMKzTOQnLWG4QdcjeJUMEg=="
-
 content-disposition@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
@@ -4937,27 +4928,27 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
+debug@3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity "sha1-6D0X3hbYp++3cX7b5fsQE17uYps= sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
+debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -4965,6 +4956,13 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5102,13 +5100,12 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg=="
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
-    isarray "^1.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -5634,7 +5631,7 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity "sha1-tKxAZIEH/c3PriQvQovqihTU8b8= sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="
@@ -5649,39 +5646,31 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.17.0:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity "sha1-kUIHFweFeyysx7iey2cDFsPi1So= sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk= sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="
+es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.0.tgz#0a6e6682268e7f5bdc1c740b33ce2578d64538d3"
+  integrity sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==
   dependencies:
+    call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
 
 es-abstract@^1.18.2:
   version "1.18.6"
@@ -5819,20 +5808,20 @@ eslint-config-prettier@^6.11.0:
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity "sha1-hf+oGULCUBLYIxCW3fZ5wDBCxxc= sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="
+eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    debug "^3.2.7"
+    resolve "^1.20.0"
 
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity "sha1-V569CU9Wr3eX0ZyYZsnJSGYpv6Y= sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="
+eslint-module-utils@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"
+  integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==
   dependencies:
-    debug "^2.6.9"
+    debug "^3.2.7"
     pkg-dir "^2.0.0"
 
 eslint-plugin-disable-features@^0.1.3:
@@ -5858,24 +5847,26 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.22.0:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity "sha1-CJbH5qDPRBCaLZe5WQPCu2iddwI= sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="
+eslint-plugin-import@^2.24.2:
+  version "2.24.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
+  integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
+    array-includes "^3.1.3"
+    array.prototype.flat "^1.2.4"
     debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.6.2"
+    find-up "^2.0.0"
     has "^1.0.3"
+    is-core-module "^2.6.0"
     minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    object.values "^1.1.4"
+    pkg-up "^2.0.0"
+    read-pkg-up "^3.0.0"
+    resolve "^1.20.0"
+    tsconfig-paths "^3.11.0"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -7489,25 +7480,15 @@ is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU= sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
 
-is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs= sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
-
-is-callable@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity "sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk= sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
-
 is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
-  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
+is-core-module@^2.2.0, is-core-module@^2.6.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
   dependencies:
     has "^1.0.3"
 
@@ -7683,20 +7664,6 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4= sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="
-  dependencies:
-    has "^1.0.3"
-
-is-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity "sha1-xvmKrMVG9s7FRooHt7FTq1ZKV7k= sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -7720,6 +7687,11 @@ is-running@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
   integrity "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA= sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w=="
 
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -7763,6 +7735,13 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -8064,16 +8043,6 @@ livereload-js@^2.3.0:
   resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
   integrity "sha1-RHwxzx6pq1L8INthXF3fZ494AJw= sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ=="
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -9205,11 +9174,6 @@ object-inspect@^1.11.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc= sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
-
 object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
@@ -9262,15 +9226,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity "sha1-aKmezeNWt+kpWjxeDOMdyMlT3l4= sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="
+object.values@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -9444,13 +9407,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -9561,13 +9517,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ=="
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -9607,11 +9556,6 @@ picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity "sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
-
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -9964,14 +9908,6 @@ rc@^1.0.1, rc@^1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w=="
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -9980,15 +9916,6 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA=="
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -10289,14 +10216,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.14.2, resolve@^1.20.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -10543,14 +10463,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5:
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -11040,14 +10953,6 @@ string.prototype.matchall@^4.0.4:
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity "sha1-hYEqa4R6wAInD1gIFGBkyZX7aRM= sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -11056,32 +10961,6 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity "sha1-RAiqLl1t3QyagHObCH+8BnwDs8w= sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity "sha1-x28c7zDyG7rYr+uNsVEUls+w8qM= sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity "sha1-FK9tnzSwU/fPyJty+PLuFLkDmlQ= sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -11560,10 +11439,10 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity "sha1-CYVHpsREiAfo/Ljq4IEGTumjyQs= sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="
+tsconfig-paths@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
+  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"

From 2b65f93dca121adff660204bd2bd9ddddd57c561 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:12:22 +0000
Subject: [PATCH 0663/1405] Bump @glimmer/reference from 0.80.0 to 0.82.0

Bumps @glimmer/reference from 0.80.0 to 0.82.0.

---
updated-dependencies:
- dependency-name: "@glimmer/reference"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   8 +-
 yarn.lock    | 391 ++++++++++++++++++++-------------------------------
 2 files changed, 160 insertions(+), 239 deletions(-)

diff --git a/package.json b/package.json
index dbab54905a2..834993914d6 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.80.0",
-    "babel-plugin-debug-macros": "^0.3.3",
+    "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
     "broccoli-debug": "^0.6.4",
@@ -86,12 +86,12 @@
     "@glimmer/opcode-compiler": "0.80.0",
     "@glimmer/owner": "0.80.0",
     "@glimmer/program": "0.80.0",
-    "@glimmer/reference": "0.80.0",
+    "@glimmer/reference": "0.82.0",
     "@glimmer/runtime": "0.80.0",
     "@glimmer/validator": "0.80.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
-    "@types/rsvp": "^4.0.3",
+    "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
@@ -120,7 +120,7 @@
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^1.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-qunit": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index d4d8a4c0db3..17f7e7c72fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2476,6 +2476,13 @@
   dependencies:
     "@glimmer/env" "^0.1.7"
 
+"@glimmer/global-context@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.82.0.tgz#628cf1ed33a8a956d884a462d382bb8923cbe802"
+  integrity sha512-dgm0yOP89ycRZvz8Qs5GE+z51sPvQBpzvnxM6hgFXxqs6dq6q3YU+kgPoh1FLZ2biTvFTamTIfodtQjmlIKT/g==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+
 "@glimmer/interfaces@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.0.tgz#eabc7551ffe7ad27c44ba96d39e2af6ebf01c942"
@@ -2483,6 +2490,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.82.0.tgz#e3f21e51a421b4c1ee34dcb682c719832f4a36f5"
+  integrity sha512-Cdr2uWSNHBBf2fnm4QjkjHWgxGoT4SdrD+RDQBMwYWSaysqqsXYU3+toOLKFmaMJuyDa28Zeq17lCab7zOg43g==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/low-level@0.78.2":
   version "0.78.2"
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
@@ -2554,6 +2568,17 @@
     "@glimmer/util" "0.80.0"
     "@glimmer/validator" "0.80.0"
 
+"@glimmer/reference@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.82.0.tgz#f688be8272a71b314a023ded83d3d3afeb5b65e9"
+  integrity sha512-bL+nrB+480v8sHpbdHC6vCln+AFdJixlVi3zMu633KWWfPs5869ZiLZOiXnPBNoMK4FkMuaRwpOlke7rAbKPbw==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.82.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/validator" "0.82.0"
+
 "@glimmer/runtime@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.0.tgz#ddf344cca65934e283edfcad002729315623c3b7"
@@ -2592,6 +2617,15 @@
     "@glimmer/interfaces" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.82.0.tgz#d6ae4985f70343898d4b2297a4b3b1f5feda1934"
+  integrity sha512-/13rKFiFG8P4eXuiwnu0Y5OX0B8DkPI+4M9eH/vWp32WbhEngKwtYpVdKpjK0SEZ6DTmqFYdUQr17bwQHSDh2Q==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.82.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.0.tgz#f93c221a681809e5e45451e21d58ad0a819a38c0"
@@ -2600,6 +2634,14 @@
     "@glimmer/env" "^0.1.7"
     "@glimmer/global-context" "0.80.0"
 
+"@glimmer/validator@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.82.0.tgz#924f378e61e8a54081b1174313650f1938174d93"
+  integrity sha512-Dci5iB/WKSoLp0DyuIxf2+Um+8EI2UXIyalC76ZGMMf+iXV6N4H1guXGaunwp/J7dmJvdpGsWJ3NpILrATeWwQ==
+  dependencies:
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/global-context" "0.82.0"
+
 "@glimmer/vm-babel-plugins@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5"
@@ -2793,10 +2835,10 @@
     "@types/glob" "*"
     "@types/node" "*"
 
-"@types/rsvp@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.3.tgz#4a1223158453257bce09d42b9eef7cfa6d257482"
-  integrity "sha1-ShIjFYRTJXvOCdQrnu98+m0ldII= sha512-OpRwxbgx16nL/0/7ol0WoLLyLaMXBvtPOHjqLljnzAB/E7Qk1wtjytxgBhOTBMZvuLXnJUqfnjb4W/QclNFvSA=="
+"@types/rsvp@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
+  integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
 
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"
@@ -3121,13 +3163,15 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 
-array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity "sha1-zdZ+aFK9+cEhVGB4ZzIlXtJFk0g= sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ=="
+array-includes@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
+  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0"
+    es-abstract "^1.18.0-next.2"
+    get-intrinsic "^1.1.1"
     is-string "^1.0.5"
 
 array-to-error@^1.0.0:
@@ -3152,13 +3196,14 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
 
-array.prototype.flat@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
-  integrity "sha1-DegrQmsDGNv9uUAInjiwQ9N/bHs= sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ=="
+array.prototype.flat@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
+    es-abstract "^1.18.0-next.1"
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
@@ -3311,14 +3356,7 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-debug-macros@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.3.tgz#29c3449d663f61c7385f5b8c72d8015b069a5cb7"
-  integrity sha512-E+NI8TKpxJDBbVkdWkwHrKgJi696mnRL8XYrOPYw82veNHPDORM9WIQifl6TpIo8PNy2tU2skPqbfkmHXrHKQA==
-  dependencies:
-    semver "^5.3.0"
-
-babel-plugin-debug-macros@^0.3.4:
+babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
   integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
@@ -4756,11 +4794,6 @@ consolidate@^0.15.1:
   dependencies:
     bluebird "^3.1.1"
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= sha512-OKZnPGeMQy2RPaUIBPFFd71iNf4791H12MCRuVQDnzGRwCYNYmTDy5pdafo2SLAcEMKzTOQnLWG4QdcjeJUMEg=="
-
 content-disposition@0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
@@ -4937,27 +4970,27 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.1, debug@^3.1.0:
+debug@3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity "sha1-6D0X3hbYp++3cX7b5fsQE17uYps= sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
+debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -4965,6 +4998,13 @@ debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
+debug@~4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 decamelize-keys@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5102,13 +5142,12 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= sha512-lsGyRuYr4/PIB0txi+Fy2xOMI2dGaTguCaotzFGkVZuKR5usKfcRWIFKNM3QNrU7hh/+w2bwTW+ZeXPK5l8uVg=="
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
-    isarray "^1.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -5634,7 +5673,7 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity "sha1-tKxAZIEH/c3PriQvQovqihTU8b8= sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="
@@ -5649,39 +5688,31 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.17.0:
-  version "1.17.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz#9142071707857b2cacc7b89ecb670316c3e2d52a"
-  integrity "sha1-kUIHFweFeyysx7iey2cDFsPi1So= sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.0"
-    is-regex "^1.1.0"
-    object-inspect "^1.7.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.17.0-next.1, es-abstract@^1.17.5:
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9"
-  integrity "sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk= sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="
+es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.0.tgz#0a6e6682268e7f5bdc1c740b33ce2578d64538d3"
+  integrity sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==
   dependencies:
+    call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
     has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.1.5"
-    is-regex "^1.0.5"
-    object-inspect "^1.7.0"
+    has-symbols "^1.0.2"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.1"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
+    is-string "^1.0.7"
+    is-weakref "^1.0.1"
+    object-inspect "^1.11.0"
     object-keys "^1.1.1"
-    object.assign "^4.1.0"
-    string.prototype.trimleft "^2.1.1"
-    string.prototype.trimright "^2.1.1"
+    object.assign "^4.1.2"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
 
 es-abstract@^1.18.2:
   version "1.18.6"
@@ -5819,20 +5850,20 @@ eslint-config-prettier@^6.11.0:
   dependencies:
     get-stdin "^6.0.0"
 
-eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity "sha1-hf+oGULCUBLYIxCW3fZ5wDBCxxc= sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA=="
+eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.6:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
+  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    debug "^3.2.7"
+    resolve "^1.20.0"
 
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity "sha1-V569CU9Wr3eX0ZyYZsnJSGYpv6Y= sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA=="
+eslint-module-utils@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"
+  integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==
   dependencies:
-    debug "^2.6.9"
+    debug "^3.2.7"
     pkg-dir "^2.0.0"
 
 eslint-plugin-disable-features@^0.1.3:
@@ -5858,24 +5889,26 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.22.0:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity "sha1-CJbH5qDPRBCaLZe5WQPCu2iddwI= sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw=="
+eslint-plugin-import@^2.24.2:
+  version "2.24.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
+  integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
   dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
+    array-includes "^3.1.3"
+    array.prototype.flat "^1.2.4"
     debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.6"
+    eslint-module-utils "^2.6.2"
+    find-up "^2.0.0"
     has "^1.0.3"
+    is-core-module "^2.6.0"
     minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+    object.values "^1.1.4"
+    pkg-up "^2.0.0"
+    read-pkg-up "^3.0.0"
+    resolve "^1.20.0"
+    tsconfig-paths "^3.11.0"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -7489,25 +7522,15 @@ is-callable@^1.1.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU= sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
 
-is-callable@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
-  integrity "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs= sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
-
-is-callable@^1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity "sha1-x8ZxXNItTdtI0+GZcCI6zquwgNk= sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="
-
 is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19"
-  integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==
+is-core-module@^2.2.0, is-core-module@^2.6.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
+  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
   dependencies:
     has "^1.0.3"
 
@@ -7683,20 +7706,6 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-regex@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
-  integrity "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4= sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="
-  dependencies:
-    has "^1.0.3"
-
-is-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity "sha1-xvmKrMVG9s7FRooHt7FTq1ZKV7k= sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="
-  dependencies:
-    has-symbols "^1.0.1"
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -7720,6 +7729,11 @@ is-running@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
   integrity "sha1-MKc/9cw4VOT8JUkICen1q/jeCeA= sha512-mjJd3PujZMl7j+D395WTIO5tU5RIDBfVSRtRR4VOJou3H66E38UjbjvDGh3slJzPuolsb+yQFqwHNNdyp5jg3w=="
 
+is-shared-array-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
+  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -7763,6 +7777,13 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
+is-weakref@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
+  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
+  dependencies:
+    call-bind "^1.0.0"
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -8064,16 +8085,6 @@ livereload-js@^2.3.0:
   resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
   integrity "sha1-RHwxzx6pq1L8INthXF3fZ494AJw= sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ=="
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -9205,11 +9216,6 @@ object-inspect@^1.11.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
-object-inspect@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
-  integrity "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc= sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
-
 object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
@@ -9262,15 +9268,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity "sha1-aKmezeNWt+kpWjxeDOMdyMlT3l4= sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA=="
+object.values@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
   dependencies:
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -9444,13 +9449,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -9561,13 +9559,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ=="
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -9607,11 +9598,6 @@ picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity "sha1-7RQaasBDqEnqWISY59yosVMw6Qw= sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
-
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -9964,14 +9950,6 @@ rc@^1.0.1, rc@^1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w=="
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -9980,15 +9958,6 @@ read-pkg-up@^3.0.0:
     find-up "^2.0.0"
     read-pkg "^3.0.0"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA=="
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -10289,14 +10258,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.14.2, resolve@^1.20.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -10543,14 +10505,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5:
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -11040,14 +10995,6 @@ string.prototype.matchall@^4.0.4:
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.0, string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity "sha1-hYEqa4R6wAInD1gIFGBkyZX7aRM= sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -11056,32 +11003,6 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimleft@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc"
-  integrity "sha1-RAiqLl1t3QyagHObCH+8BnwDs8w= sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimstart "^1.0.0"
-
-string.prototype.trimright@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3"
-  integrity "sha1-x28c7zDyG7rYr+uNsVEUls+w8qM= sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    string.prototype.trimend "^1.0.0"
-
-string.prototype.trimstart@^1.0.0, string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity "sha1-FK9tnzSwU/fPyJty+PLuFLkDmlQ= sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -11560,10 +11481,10 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity "sha1-CYVHpsREiAfo/Ljq4IEGTumjyQs= sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="
+tsconfig-paths@^3.11.0:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
+  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"

From 70daf24270df67fddece0a7d55eadb04f1431b9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:24:20 +0000
Subject: [PATCH 0664/1405] Bump path-parse from 1.0.6 to 1.0.7

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index edad5e053e1..d18b9c04a72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9522,9 +9522,9 @@ path-key@^3.1.0:
   integrity "sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-posix@^1.0.0:
   version "1.0.0"

From e858cdba3ba2649b268b797e11adc5c6b04af4ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Oct 2021 01:27:44 +0000
Subject: [PATCH 0665/1405] Bump eslint-plugin-ember-internal from 1.1.1 to
 2.0.0

Bumps [eslint-plugin-ember-internal](https://github.com/Turbo87/eslint-plugin-ember-internal) from 1.1.1 to 2.0.0.
- [Release notes](https://github.com/Turbo87/eslint-plugin-ember-internal/releases)
- [Changelog](https://github.com/emberjs/eslint-plugin-ember-internal/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Turbo87/eslint-plugin-ember-internal/compare/v1.1.1...v2.0.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-ember-internal
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 1980b9ea2e2..c585a681f77 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
-    "eslint-plugin-ember-internal": "^1.1.1",
+    "eslint-plugin-ember-internal": "^2.0.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
diff --git a/yarn.lock b/yarn.lock
index edad5e053e1..660e07e4ea8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5857,10 +5857,10 @@ eslint-plugin-disable-features@^0.1.3:
   dependencies:
     requireindex "~1.1.0"
 
-eslint-plugin-ember-internal@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ember-internal/-/eslint-plugin-ember-internal-1.1.1.tgz#5327f709799eac010bfcf0dd1be8d0acbc917d34"
-  integrity "sha1-Uyf3CXmerAEL/PDdG+jQrLyRfTQ= sha512-Uqf0fu9NOXIj5mR9pjMW2s+Wb6gXNQpzDvDOje2IAYQVwrX1Fuh/noAsgAHgVKwa3oPiAe4jCKfqaW2j1BHn9w=="
+eslint-plugin-ember-internal@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember-internal/-/eslint-plugin-ember-internal-2.0.0.tgz#bebfb829c7bbc47d71ef853adf93ff37e02282b6"
+  integrity sha512-dzPY1Ka3xIMb/ZzTJHMQncKADVCmFsi2EtSuUI3FU6L3jeVg1XOuLVx3Ud5UCxUBIA37DRPhHf7DDKU4E69X2g==
   dependencies:
     line-column "^1.0.2"
     requireindex "~1.1.0"

From 7457fdbffa3280ca3908db865340ce4b7595356d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 11 Oct 2021 13:13:52 -0400
Subject: [PATCH 0666/1405] Add v4.0.0-beta.5 to CHANGELOG

(cherry picked from commit 319a953ea1f1d9cbba816abf3db93154c1ecb12c)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9baee2981d2..ddd288a38c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.0.0-beta.5 (October 11, 2021)
+
+- [#19761](https://github.com/emberjs/ember.js/pull/19761) [BREAKING] Require ember-auto-import >= 2 or higher to enable ember-source to become a v2 addon in the 4.x cycle
+
 ### v4.0.0-beta.4 (September 13, 2021)
 
 - [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized

From 485050b82600f4b50b7094319c114e6231c986c9 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 4 Oct 2021 15:59:49 -0400
Subject: [PATCH 0667/1405] Add v3.26.2 to CHANGELOG.md.

(cherry picked from commit 8376200191ae072f5fd622247edb8f852d0e3ff3)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ddd288a38c2..db8a3490ee1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -141,6 +141,10 @@
 
 - [#19477](https://github.com/emberjs/ember.js/pull/19477) Allow `<LinkToExternal />` to override internal assertion
 
+### v3.26.2 (October 4, 2021)
+
+- [#19683](https://github.com/emberjs/ember.js/pull/19683) [BUGFIX] Use `super.willDestroy` in native classes (instead of `this._super`)
+
 ### v3.26.1 (March 24, 2021)
 
 - [#19473](https://github.com/emberjs/ember.js/pull/19473) Update Glimmer VM to latest.

From d98589049e56ee16f94e342b7d014843b2e9a006 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 11 Oct 2021 13:59:35 -0400
Subject: [PATCH 0668/1405] Update package.json to latest alpha version that
 has been published so that the next attempt to publish will correctly update
 the version

- The publish was from a CI action that failed to push
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 56ac3d00a83..42f58b77221 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.1.0-alpha.1",
+  "version": "4.1.0-alpha.2",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From e4f7cfc9303b887a0db4283264e788c23b264ce3 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 11 Oct 2021 14:00:31 -0400
Subject: [PATCH 0669/1405] Push alpha release commits and tags using
 PERSONAL_TOKEN to theoretically bypass required checks on CI

---
 .github/workflows/alpha-releases.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index f56a3cbd52f..6c787346ed7 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -55,4 +55,4 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
       - name: push branch + tag
-        run: git push origin HEAD --follow-tags
+        run: git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN }}@github.com/${GITHUB_REPOSITORY} HEAD --follow-tags

From d26be60d251c8ef6493b3880f449dca98ec4475a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Oct 2021 15:13:04 +0000
Subject: [PATCH 0670/1405] Bump eslint from 7.10.0 to 7.32.0

Bumps [eslint](https://github.com/eslint/eslint) from 7.10.0 to 7.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.10.0...v7.32.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 342 ++++++++++++++++++++++-----------------------------
 2 files changed, 149 insertions(+), 195 deletions(-)

diff --git a/package.json b/package.json
index e8927c4c4be..72dac26e7f1 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^7.9.0",
+    "eslint": "^7.32.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
diff --git a/yarn.lock b/yarn.lock
index 50e3d573927..49c2cdae7bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,21 +2,14 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
-  dependencies:
-    "@babel/highlight" "^7.8.3"
-
-"@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.14.5":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
   integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
@@ -630,11 +623,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
-"@babel/helper-validator-identifier@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz#ad53562a7fc29b3b9a91bbf7d10397fd146346ed"
-  integrity sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==
-
 "@babel/helper-validator-identifier@^7.9.5":
   version "7.9.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
@@ -716,15 +704,6 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
-  integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.0"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
@@ -2418,19 +2397,18 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
-"@eslint/eslintrc@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
-  integrity "sha1-fRorI1hVLMBINMCXm9QnU2LjcIU= sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="
+"@eslint/eslintrc@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
+  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
     espree "^7.3.0"
-    globals "^12.1.0"
+    globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
     js-yaml "^3.13.1"
-    lodash "^4.17.19"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
@@ -2670,6 +2648,20 @@
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -2947,10 +2939,10 @@ acorn-dynamic-import@^3.0.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-jsx@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity "sha1-TGYGkXPW/daO2FI5/CViJhgrLr4= sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="
+acorn-jsx@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn@^5.0.0, acorn@^5.5.3:
   version "5.7.4"
@@ -2984,34 +2976,24 @@ ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@^6.10.0, ajv@^6.9.1:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity "sha1-BtYLlth7hFSlrauobnhU2mKdtLc= sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
-ajv@^6.12.4:
-  version "6.12.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
-  integrity "sha1-GbDouuj0duW6ZmMAOHd1+xoApNo= sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.12.5:
-  version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+ajv@^8.0.1:
+  version "8.6.3"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
+  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
   dependencies:
     fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
@@ -3067,11 +3049,6 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc= sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
 
-ansi-regex@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
-  integrity "sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U= sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
@@ -3252,10 +3229,10 @@ ast-types@0.13.2:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
   integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
-  integrity "sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k= sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async-disk-cache@^1.2.1:
   version "1.3.3"
@@ -5869,6 +5846,11 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 eslint-config-prettier@^6.11.0:
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
@@ -5985,12 +5967,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity "sha1-4qgs6oT/JGrW+1f5veW0ZiFFnsI= sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
-
-eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity "sha1-MOvR73wv3/AcOk8VEESvJfqwUj4= sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
@@ -6000,29 +5977,32 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
-eslint@^7.9.0:
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.10.0.tgz#494edb3e4750fb791133ca379e786a8f648c72b9"
-  integrity "sha1-SU7bPkdQ+3kRM8o3nnhqj2SMcrk= sha512-BDVffmqWl7JJXqCjAK6lWtcQThZB/aP1HXSH1JKwGwv0LQEdvpR7qzNrUT487RM39B5goWuboFad5ovMBmD8yA=="
+eslint@^7.32.0:
+  version "7.32.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
+  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.1.3"
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.3"
+    "@humanwhocodes/config-array" "^0.5.0"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
+    escape-string-regexp "^4.0.0"
     eslint-scope "^5.1.1"
     eslint-utils "^2.1.0"
-    eslint-visitor-keys "^1.3.0"
-    espree "^7.3.0"
-    esquery "^1.2.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
+    glob-parent "^5.1.2"
+    globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
@@ -6030,7 +6010,7 @@ eslint@^7.9.0:
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
-    lodash "^4.17.19"
+    lodash.merge "^4.6.2"
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
@@ -6039,7 +6019,7 @@ eslint@^7.9.0:
     semver "^7.2.1"
     strip-ansi "^6.0.0"
     strip-json-comments "^3.1.0"
-    table "^5.2.3"
+    table "^6.0.9"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -6048,13 +6028,13 @@ esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
   integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
 
-espree@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity "sha1-3DBDfPZ5R89XYSHr14DxXurHI0g= sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
     acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
+    acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
 esprima@^4.0.0, esprima@~4.0.0:
@@ -6067,10 +6047,10 @@ esprima@~3.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
   integrity "sha1-U88kes2ncxPlUcOqLnM0LT+099k= sha512-xoBq/MIShSydNZOkjkoCEjqod963yHNXTLC40ypBhop6yPqflPz/vTinmCfSrGcywVLnSftRf6a0kJLdFdzemw=="
 
-esquery@^1.2.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity "sha1-t4tYKKqOIU4p+3TE1bdS4cAz2lc= sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"
 
@@ -6295,10 +6275,10 @@ extract-zip@^2.0.0:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-fast-deep-equal@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
-  integrity "sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ= sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
   version "1.2.0"
@@ -6397,12 +6377,12 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
-  integrity "sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w= sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
-    flat-cache "^2.0.1"
+    flat-cache "^3.0.4"
 
 filesize@^4.1.2:
   version "4.1.2"
@@ -6544,14 +6524,13 @@ fixturify@^1.2.0:
     fs-extra "^7.0.1"
     matcher-collection "^2.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
-  integrity "sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA= sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
 
 flat@^4.1.0:
   version "4.1.0"
@@ -6560,10 +6539,10 @@ flat@^4.1.0:
   dependencies:
     is-buffer "~2.0.3"
 
-flatted@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
-  integrity "sha1-VRIrZTbqSWtLRIk+4mCBQdENmRY= sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg=="
+flatted@^3.1.0:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561"
+  integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
 
 follow-redirects@^1.0.0:
   version "1.13.0"
@@ -6888,7 +6867,7 @@ github@^0.2.3:
   dependencies:
     mime "^1.2.11"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
+glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -6955,12 +6934,12 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
   integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
 
-globals@^12.1.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
-  integrity "sha1-oYgTV2pBsAokqX5/gVkYwuGZJfg= sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="
+globals@^13.6.0, globals@^13.9.0:
+  version "13.11.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
+  integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
   dependencies:
-    type-fest "^0.8.1"
+    type-fest "^0.20.2"
 
 globals@^9.18.0:
   version "9.18.0"
@@ -7347,25 +7326,12 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw= sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
 
-ignore@^5.1.1:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
-  integrity "sha1-hLez2+ZFUrbvDsqZ9nQ9vsbZet8= sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A=="
-
-ignore@^5.1.4:
+ignore@^5.1.1, ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity "sha1-8VCotQo0KJsz4i9YiavU2AFvDlc= sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
 
-import-fresh@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.0.0.tgz#a3d897f420cab0e671236897f75bc14b4885c390"
-  integrity "sha1-o9iX9CDKsOZxI2iX91vBS0iFw5A= sha512-pOnA9tfM3Uwics+SaBLCNyZZZbK+4PTu0OPZtLlMIrv17EdBoC15S9Kn8ckJ9TZTyKb3ywNE5y1yeDxxGA7nTQ=="
-  dependencies:
-    parent-module "^1.0.0"
-    resolve-from "^4.0.0"
-
-import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
   integrity "sha1-Yz/2GFBueTr1rJG/SLcmd+FcvmY= sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="
@@ -7765,16 +7731,6 @@ is-shared-array-buffer@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -7961,6 +7917,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8372,7 +8333,7 @@ lodash.castarray@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
   integrity "sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="
 
-lodash.clonedeep@^4.4.1:
+lodash.clonedeep@^4.4.1, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
@@ -8549,6 +8510,11 @@ lodash.templatesettings@~2.3.0:
     lodash._reinterpolate "~2.3.0"
     lodash.escape "~2.3.0"
 
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+
 lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -10118,12 +10084,7 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
-  integrity "sha1-3WOYLuMwDme0HBlW+FCqaA2dMw4= sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g=="
-
-regexpp@^3.1.0:
+regexpp@^3.0.0, regexpp@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity "sha1-IG0K0KVkjP+9uK5GQ489xRyfeOI= sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
@@ -10219,6 +10180,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -10332,13 +10298,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
 
-rimraf@2.6.3, rimraf@~2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
-  integrity "sha1-stEE/g2Psnz54KHNqCYt04M8bKs= sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -10360,6 +10319,13 @@ rimraf@~2.5.2:
   dependencies:
     glob "^7.0.5"
 
+rimraf@~2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+  integrity "sha1-stEE/g2Psnz54KHNqCYt04M8bKs= sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="
+  dependencies:
+    glob "^7.1.3"
+
 rollup-plugin-commonjs@^9.3.4:
   version "9.3.4"
   resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.3.4.tgz#2b3dddbbbded83d45c36ff101cdd29e924fd23bc"
@@ -10695,14 +10661,14 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity "sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
-  integrity "sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY= sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -11022,7 +10988,7 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -11121,14 +11087,7 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
-  integrity "sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI= sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="
-  dependencies:
-    ansi-regex "^5.0.0"
-
-strip-ansi@^6.0.1:
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11232,15 +11191,17 @@ sync-disk-cache@^1.3.3:
     rimraf "^2.2.8"
     username-sync "^1.0.2"
 
-table@^5.2.3:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-5.2.3.tgz#cde0cc6eb06751c009efab27e8c820ca5b67b7f2"
-  integrity "sha1-zeDMbrBnUcAJ76sn6Mggyltnt/I= sha512-N2RsDAMvDLvYwFcwbPyF3VmVSSkuF+G1e+8inhBLtHpvwXGw4QRPEZhihQNeEN0i1up6/f6ObCJXNdlRG3YVyQ=="
+table@^6.0.9:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
+  integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
   dependencies:
-    ajv "^6.9.1"
-    lodash "^4.17.11"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
 
 tap-parser@^7.0.0:
   version "7.0.0"
@@ -11613,10 +11574,10 @@ type-detect@^4.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
   integrity "sha1-1w5byB223io4G8rKDG4MvcdjXeI= sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ=="
 
-type-fest@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
-  integrity "sha1-CeJJ696FHTseSNJ8EFREZn8XuD0= sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
@@ -12056,13 +12017,6 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
-  integrity "sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM= sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^7.2.3, ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"

From c9b87ceda12567315444dc8d91266f6e1302049a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Oct 2021 15:13:39 +0000
Subject: [PATCH 0671/1405] Bump @glimmer/runtime from 0.80.0 to 0.82.0

Bumps [@glimmer/runtime](https://github.com/glimmerjs/glimmer-vm) from 0.80.0 to 0.82.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.80.0...v0.82.0)

---
updated-dependencies:
- dependency-name: "@glimmer/runtime"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 108 ++++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index e8927c4c4be..6051e438644 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "@glimmer/owner": "0.80.0",
     "@glimmer/program": "0.80.0",
     "@glimmer/reference": "0.82.0",
-    "@glimmer/runtime": "0.80.0",
+    "@glimmer/runtime": "0.82.0",
     "@glimmer/validator": "0.80.0",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
diff --git a/yarn.lock b/yarn.lock
index 50e3d573927..860c0cd8cee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2455,6 +2455,16 @@
     "@glimmer/interfaces" "0.80.0"
     "@glimmer/util" "0.80.0"
 
+"@glimmer/destroyable@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.82.0.tgz#6ed8fcadd6196b79080860f0d53200cad24a0854"
+  integrity sha512-wQVFePVx6O0Gqn/vCR+2/64X2G7U9NgPzXLVK1a5gdILBzb64A22c/XoHLvm2nGzOQu7FSlLZSiy0yG7wJ3daA==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/global-context" "0.82.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
+
 "@glimmer/encoder@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.0.tgz#f529f525b44a94939b01e99c562e206bd9833df1"
@@ -2464,6 +2474,15 @@
     "@glimmer/interfaces" "0.80.0"
     "@glimmer/vm" "0.80.0"
 
+"@glimmer/encoder@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.82.0.tgz#40c9f54a36fb0a983ed18e1afb57922fd29c47dc"
+  integrity sha512-U4GWeZsSf8kuxRFEH7/ozzp8beuWkwLUZQAOKxH8yRi/8P6A4BPEvLZ5BA3rcxr6WP1kY35btp034d2ReIIC9Q==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/vm" "0.82.0"
+
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
@@ -2514,6 +2533,18 @@
     "@glimmer/util" "0.80.0"
     "@glimmer/validator" "0.80.0"
 
+"@glimmer/manager@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.82.0.tgz#a1866c4c5710a489d7ebfdcc70bce21855aae45a"
+  integrity sha512-UpUzN5kjJwjBapFA8lOH3T7hLi0UWYWLZmzAnKE3EpfeP5IlVJnO+UqR/0SKD/RJgjmqOdiE/3AZJJA/EyNnWw==
+  dependencies:
+    "@glimmer/destroyable" "0.82.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/reference" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/validator" "0.82.0"
+
 "@glimmer/node@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.0.tgz#afdd6acdd73f70b88a8e78e79f592139912047ce"
@@ -2538,6 +2569,19 @@
     "@glimmer/vm" "0.80.0"
     "@glimmer/wire-format" "0.80.0"
 
+"@glimmer/opcode-compiler@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.82.0.tgz#4b7d0565a9d9ee941be104628f5e9afce4dbabc6"
+  integrity sha512-2m0MePmirxSwZWEH6lTWEgtTKTytBy+dpOWM+UzMFKziEgP+7Vc+aacdC9aC0CYkcf47NMJ4ukS8ctUL+Lc7RA==
+  dependencies:
+    "@glimmer/encoder" "0.82.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/reference" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/vm" "0.82.0"
+    "@glimmer/wire-format" "0.82.0"
+
 "@glimmer/owner@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.0.tgz#ae5da1e4bf8121592afc920a88f3f6dda603606a"
@@ -2545,6 +2589,13 @@
   dependencies:
     "@glimmer/util" "0.80.0"
 
+"@glimmer/owner@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.82.0.tgz#4ac384bf52ab9ef1ffcea2e665de07b5701658d8"
+  integrity sha512-cTUWo3DHCP8mwzHhGZ0tBpwq0KQOhpFAPlC3fjmLXBK0f1VwzOtNYP50SAAyux4g4oeWcA3cgbErd67M2db3vA==
+  dependencies:
+    "@glimmer/util" "0.82.0"
+
 "@glimmer/program@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.0.tgz#5bcc2709757c36127568993a61e842351814b67e"
@@ -2557,6 +2608,18 @@
     "@glimmer/opcode-compiler" "0.80.0"
     "@glimmer/util" "0.80.0"
 
+"@glimmer/program@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.82.0.tgz#76964390ac42a029d3a9f521a50a58ba8514b2f6"
+  integrity sha512-Md/WTdj9HiodRMOa/1L3wPMImmMKyklWS/mkj4A3A5k6h5rDcM6lvcHfFwikv0RN+mQ0ogRbNio9D5HCFRQS6g==
+  dependencies:
+    "@glimmer/encoder" "0.82.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/manager" "0.82.0"
+    "@glimmer/opcode-compiler" "0.82.0"
+    "@glimmer/util" "0.82.0"
+
 "@glimmer/reference@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.0.tgz#a69d4c43d2d85fc4b840e8a56a77b4480bac5774"
@@ -2598,6 +2661,25 @@
     "@glimmer/wire-format" "0.80.0"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/runtime@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.82.0.tgz#9974e91cb38551d523a993684e81775fd68be945"
+  integrity sha512-LXy8lcR4bt/tbcYOfptT2tJrVHUiO5drePqBxccEcFWoSydN/4KbpWkg6ueDCTQrGqy6eyN8u3bWJyySZayJJw==
+  dependencies:
+    "@glimmer/destroyable" "0.82.0"
+    "@glimmer/env" "0.1.7"
+    "@glimmer/global-context" "0.82.0"
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/low-level" "0.78.2"
+    "@glimmer/owner" "0.82.0"
+    "@glimmer/program" "0.82.0"
+    "@glimmer/reference" "0.82.0"
+    "@glimmer/util" "0.82.0"
+    "@glimmer/validator" "0.82.0"
+    "@glimmer/vm" "0.82.0"
+    "@glimmer/wire-format" "0.82.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/syntax@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.0.tgz#5f9c2e5824fdc8f88ec3e71861598c339b6777c1"
@@ -2657,6 +2739,14 @@
     "@glimmer/interfaces" "0.80.0"
     "@glimmer/util" "0.80.0"
 
+"@glimmer/vm@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.82.0.tgz#c146b48b4359c94c26574129f3745b76f20e4918"
+  integrity sha512-XbiExuyxwY/80UJPJyQKpYEzVuEeGBEvM/OHi3yg0NYMvvTEhhFv4D7lmkRgxobSWAjK4HSROrcLdO069LJ64Q==
+  dependencies:
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
+
 "@glimmer/wire-format@0.80.0":
   version "0.80.0"
   resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.0.tgz#bea3da7973a6a70611bf45cfc15592dbec132091"
@@ -2665,6 +2755,14 @@
     "@glimmer/interfaces" "0.80.0"
     "@glimmer/util" "0.80.0"
 
+"@glimmer/wire-format@0.82.0":
+  version "0.82.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.82.0.tgz#2ead3e9ce82ae21296ae592f6b2278576e092110"
+  integrity sha512-DGugtx+UiJjqlCYecAzfmxynkFrC+fRiS1tJW6JPjfLIAY0pyjuFpLE4xyQ2RZ3J4WBIiz5Kbi/ZAtcdUkj08w==
+  dependencies:
+    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/util" "0.82.0"
+
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
@@ -7765,16 +7863,6 @@ is-shared-array-buffer@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"

From b53044d9debca526e8aa8f94fe8ae392cbbc0701 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Wed, 13 Oct 2021 16:21:52 +0100
Subject: [PATCH 0672/1405] disable lint for "unused" define

---
 packages/loader/lib/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/loader/lib/index.js b/packages/loader/lib/index.js
index 5f31ddd344d..1f87fa135f9 100644
--- a/packages/loader/lib/index.js
+++ b/packages/loader/lib/index.js
@@ -1,5 +1,6 @@
 /* eslint-disable no-var */
 /* globals global globalThis self */
+/* eslint-disable-next-line no-unused-vars */
 var define, require;
 
 (function () {

From 632f0202beb8740e8f3c0f3f5d9f3ae86e0aeabc Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Tue, 12 Oct 2021 19:06:51 -0400
Subject: [PATCH 0673/1405] Setup basic infrastructure to ensure destroyables
 destroyed

---
 .../internal-test-helpers/lib/module-for.js   | 30 +++++++++++++++++--
 packages/internal-test-helpers/lib/run.ts     |  3 +-
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/internal-test-helpers/lib/module-for.js b/packages/internal-test-helpers/lib/module-for.js
index 9840af48551..853a2b8e491 100644
--- a/packages/internal-test-helpers/lib/module-for.js
+++ b/packages/internal-test-helpers/lib/module-for.js
@@ -1,8 +1,22 @@
+/* globals URLSearchParams */
+import { DEBUG } from '@glimmer/env';
 import { isEnabled } from '@ember/canary-features';
 import applyMixins from './apply-mixins';
 import getAllPropertyNames from './get-all-property-names';
 import { setContext, unsetContext } from './test-context';
 import { all } from 'rsvp';
+import { enableDestroyableTracking, assertDestroyablesDestroyed } from '@glimmer/destroyable';
+
+const ASSERT_DESTROYABLES = (() => {
+  if (typeof URLSearchParams === 'undefined' || typeof document !== 'object') {
+    return false;
+  }
+
+  let queryParams = new URLSearchParams(document.location.search.substring(1));
+  let assertDestroyables = queryParams.get('assertDestroyables');
+
+  return assertDestroyables !== null;
+})();
 
 export default function moduleFor(description, TestClass, ...mixins) {
   QUnit.module(description, function (hooks) {
@@ -10,8 +24,20 @@ export default function moduleFor(description, TestClass, ...mixins) {
   });
 }
 
+function afterEachFinally() {
+  unsetContext();
+
+  if (DEBUG && ASSERT_DESTROYABLES) {
+    assertDestroyablesDestroyed();
+  }
+}
+
 export function setupTestClass(hooks, TestClass, ...mixins) {
   hooks.beforeEach(function (assert) {
+    if (DEBUG && ASSERT_DESTROYABLES) {
+      enableDestroyableTracking();
+    }
+
     let instance = new TestClass(assert);
     this.instance = instance;
 
@@ -41,10 +67,10 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
     // promise when it is not needed
     let filteredPromises = promises.filter(Boolean);
     if (filteredPromises.length > 0) {
-      return all(filteredPromises).finally(() => unsetContext());
+      return all(filteredPromises).finally(afterEachFinally);
     }
 
-    unsetContext();
+    afterEachFinally();
   });
 
   if (mixins.length > 0) {
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 5c5db9d074a..7e1ae29de89 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -6,6 +6,7 @@ import {
   next,
   run,
 } from '@ember/runloop';
+import { destroy } from '@glimmer/destroyable';
 
 import { Promise } from 'rsvp';
 
@@ -15,7 +16,7 @@ export function runAppend(view: any): void {
 
 export function runDestroy(toDestroy: any): void {
   if (toDestroy) {
-    run(toDestroy, 'destroy');
+    run(destroy, toDestroy);
   }
 }
 

From 1c6d390790c0d1ed6f492905562b7356502ed995 Mon Sep 17 00:00:00 2001
From: Nick Schot <nickschot@gmail.com>
Date: Wed, 6 Feb 2019 13:35:38 +0100
Subject: [PATCH 0674/1405] fix: an ObjectProxy with a property size would
 throw an assertion

---
 packages/@ember/-internals/metal/lib/is_empty.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/is_empty.ts b/packages/@ember/-internals/metal/lib/is_empty.ts
index acabf59cd08..283cd2a324a 100644
--- a/packages/@ember/-internals/metal/lib/is_empty.ts
+++ b/packages/@ember/-internals/metal/lib/is_empty.ts
@@ -41,7 +41,7 @@ export default function isEmpty(obj: any): boolean {
     return none;
   }
 
-  if (typeof obj.size === 'number') {
+  if (typeof obj.unknownProperty !== 'function' && typeof obj.size === 'number') {
     return !obj.size;
   }
 

From 8c5147f40e03903bf3416f1084c407f957eed762 Mon Sep 17 00:00:00 2001
From: Nick Schot <nickschot@gmail.com>
Date: Wed, 6 Feb 2019 13:52:15 +0100
Subject: [PATCH 0675/1405] add test

---
 packages/@ember/-internals/metal/tests/is_empty_test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/@ember/-internals/metal/tests/is_empty_test.js b/packages/@ember/-internals/metal/tests/is_empty_test.js
index fc6c8106d71..25c00835369 100644
--- a/packages/@ember/-internals/metal/tests/is_empty_test.js
+++ b/packages/@ember/-internals/metal/tests/is_empty_test.js
@@ -1,5 +1,6 @@
 import { isEmpty } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import ObjectProxy from '../../runtime/lib/system/object_proxy';
 
 moduleFor(
   'isEmpty',
@@ -8,6 +9,7 @@ moduleFor(
       let string = 'string';
       let fn = function () {};
       let object = { length: 0 };
+      let proxy = ObjectProxy.create({ content: { size: 0 } });
 
       assert.equal(true, isEmpty(null), 'for null');
       assert.equal(true, isEmpty(undefined), 'for undefined');
@@ -22,6 +24,7 @@ moduleFor(
       assert.equal(true, isEmpty([]), 'for an empty Array');
       assert.equal(false, isEmpty({}), 'for an empty Object');
       assert.equal(true, isEmpty(object), "for an Object that has zero 'length'");
+      assert.equal(true, isEmpty(proxy), "for a proxy that has zero 'size'");
     }
   }
 );

From 74881099441c3ea8b764c8a3b5bc32493b56fbcd Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 18 Oct 2021 16:56:52 -0400
Subject: [PATCH 0676/1405] Determine next alpha version based on latest alpha
 dist-tag and value for version in package.json

---
 .github/workflows/alpha-releases.yml | 12 +++++++++---
 bin/next-alpha-version.js            | 23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 bin/next-alpha-version.js

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index 6c787346ed7..6c353aebc1a 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -43,8 +43,13 @@ jobs:
         run: |
           git config --local user.email 'tomster@emberjs.com'
           git config --local user.name 'Ember.js Alpha Releaser'
+      - name: Find next alpha
+        run: |
+          LATEST_ALPHA=`npm view ember-source dist-tags.alpha`
+          export NEXT_ALPHA=`node bin/next-alpha-version.js ${LATEST_ALPHA}`
+          echo "NEXT_ALPHA=$NEXT_ALPHA" >> $GITHUB_ENV
       - name: tag the next alpha
-        run: npm version prerelease --preid alpha
+        run: npm version ${{env.NEXT_ALPHA}} --allow-same-version
       - name: build for publish
         env:
           BUILD_TYPE: alpha
@@ -54,5 +59,6 @@ jobs:
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
-      - name: push branch + tag
-        run: git push https://${GITHUB_ACTOR}:${{ secrets.PERSONAL_TOKEN }}@github.com/${GITHUB_REPOSITORY} HEAD --follow-tags
+      - name: push tag
+        # Push in a way that will NOT trigger other workflows
+        run: git push origin v${{env.NEXT_ALPHA}}
diff --git a/bin/next-alpha-version.js b/bin/next-alpha-version.js
new file mode 100644
index 00000000000..d8bb57ce99b
--- /dev/null
+++ b/bin/next-alpha-version.js
@@ -0,0 +1,23 @@
+/* eslint-disable no-console */
+
+'use strict';
+
+const BaseVersionRegex = /(\d+\.\d+\.0).*/;
+const AlphaCountRegex = /.*-alpha\.(\d+)/;
+
+const PackageVersion = require('../package.json').version;
+const LatestAlpha = process.argv.slice(2)[0];
+
+const BaseVersionFromPackageJSON = baseVersionFrom(PackageVersion);
+const BaseVersionFromLatestAlpha = baseVersionFrom(LatestAlpha);
+
+if (BaseVersionFromPackageJSON === BaseVersionFromLatestAlpha) {
+  const latestAlphaCount = Number(AlphaCountRegex.exec(LatestAlpha)[1]);
+  console.log(`${BaseVersionFromLatestAlpha}-alpha.${latestAlphaCount + 1}`);
+} else {
+  console.log(`${BaseVersionFromPackageJSON}-alpha.1`);
+}
+
+function baseVersionFrom(version) {
+  return BaseVersionRegex.exec(version)[1];
+}

From 947875f9d9286c39c963b5fb1d0fd5156b334f68 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 21 Oct 2021 19:09:10 -0400
Subject: [PATCH 0677/1405] Update glimmer-vm to allow lexical scope in loose
 mode

---
 package.json |  26 ++--
 yarn.lock    | 392 +++++++++++++++++----------------------------------
 2 files changed, 139 insertions(+), 279 deletions(-)

diff --git a/package.json b/package.json
index ed83220f310..63d391e9eab 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@babel/helper-module-imports": "^7.8.3",
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.80.0",
+    "@glimmer/vm-babel-plugins": "0.80.1",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
@@ -76,19 +76,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.80.0",
-    "@glimmer/destroyable": "0.80.0",
+    "@glimmer/compiler": "0.80.1",
+    "@glimmer/destroyable": "0.80.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.80.0",
-    "@glimmer/interfaces": "0.80.0",
-    "@glimmer/manager": "0.80.0",
-    "@glimmer/node": "0.80.0",
-    "@glimmer/opcode-compiler": "0.80.0",
-    "@glimmer/owner": "0.80.0",
-    "@glimmer/program": "0.80.0",
-    "@glimmer/reference": "0.82.0",
-    "@glimmer/runtime": "0.82.0",
-    "@glimmer/validator": "0.80.0",
+    "@glimmer/global-context": "0.80.1",
+    "@glimmer/interfaces": "0.80.1",
+    "@glimmer/manager": "0.80.1",
+    "@glimmer/node": "0.80.1",
+    "@glimmer/opcode-compiler": "0.80.1",
+    "@glimmer/owner": "0.80.1",
+    "@glimmer/program": "0.80.1",
+    "@glimmer/reference": "0.80.1",
+    "@glimmer/runtime": "0.80.1",
+    "@glimmer/validator": "0.80.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.4",
diff --git a/yarn.lock b/yarn.lock
index d22abb34c2e..47d1fae92a4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2412,85 +2412,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.0.tgz#f825b2d5b55500c0a695f076c7a2fdd312a1e94e"
-  integrity sha512-oz72cvjNHXpKY1i9aJBiLQSkmqW1zbCGc1J/gIGTXeMC5tdJlDXve22eS2ZkNWI41ai3ClzpA0hIz5ju7qO8zw==
-  dependencies:
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/syntax" "0.80.0"
-    "@glimmer/util" "0.80.0"
-    "@glimmer/wire-format" "0.80.0"
+"@glimmer/compiler@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.1.tgz#3974e2ebade228a39e4c2aeab8002db5b8e4e7f8"
+  integrity sha512-hNtHx7fN12WBO2AWkmWj3kaZhWVT4+Xh1S+cwDd/bSRRK6mNPhe4dmtgA2NRHkvK/DVbJomQYhmEZsK1Qqy/yQ==
+  dependencies:
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/syntax" "0.80.1"
+    "@glimmer/util" "0.80.1"
+    "@glimmer/wire-format" "0.80.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.0.tgz#48e6b3d01176b11d1025ccea1429e5d4a3303ee2"
-  integrity sha512-deyxvtKZZJtlo8bs5iiTtUgDT5K1LTzQM7HtgpOFUOsHU3O9dGtCIPQjIqE92H+BfT7UwOlhC3xcfyDhUALA+w==
+"@glimmer/destroyable@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.1.tgz#d3ceaa575600803a63594113ec03bc73e77d5c0c"
+  integrity sha512-PGRrv1mKU2ngDXtg21AAwbV9voTI5dzrLLV4F1BHlKx29YcDhJ/wRGlzijYdrvFl0Eof+6iKPsYUi2BhRoAkeA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.0"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/util" "0.80.0"
+    "@glimmer/global-context" "0.80.1"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/util" "0.80.1"
 
-"@glimmer/destroyable@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.82.0.tgz#6ed8fcadd6196b79080860f0d53200cad24a0854"
-  integrity sha512-wQVFePVx6O0Gqn/vCR+2/64X2G7U9NgPzXLVK1a5gdILBzb64A22c/XoHLvm2nGzOQu7FSlLZSiy0yG7wJ3daA==
+"@glimmer/encoder@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.1.tgz#f81eac1520c48539e4884d14b35be3ba3fdb2c8a"
+  integrity sha512-WzYzar06B2Tqo0xhJFKQtEAZjSONjrNB+FGfJ/2UXWYEOnMjbi/aqnEVLX48Gn8fiQvApX5e+QyxgUwpWNVMDA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.82.0"
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/util" "0.82.0"
-
-"@glimmer/encoder@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.0.tgz#f529f525b44a94939b01e99c562e206bd9833df1"
-  integrity sha512-nCyF14OIRVixchzo0AML/TkpJV2znbYcFacUwJO67cVIMY/f14614fp63ipAHPcU+1AogIORAPT1wyUXbKcaaQ==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/vm" "0.80.0"
-
-"@glimmer/encoder@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.82.0.tgz#40c9f54a36fb0a983ed18e1afb57922fd29c47dc"
-  integrity sha512-U4GWeZsSf8kuxRFEH7/ozzp8beuWkwLUZQAOKxH8yRi/8P6A4BPEvLZ5BA3rcxr6WP1kY35btp034d2ReIIC9Q==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/vm" "0.82.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/vm" "0.80.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.0.tgz#09a0620e6625cc152769d9799dbb2f2d135959e3"
-  integrity sha512-1myqwTbsLdwP3MbYeLzBqPUMsUCqv+WxaLobHhWTo/dInF8SOyzzL9Dzox/TiqXydZx/w6sGfg9/a0g+MY5cxg==
+"@glimmer/global-context@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.1.tgz#6a496b408129bae21ddeffe214256e7c23f557aa"
+  integrity sha512-UpzRzeQNbDiiQnuHBq15xsp8A6DWUcng848GUFTIJdTlZJ7/AKE/nyyaWyP6Yusc3JMYC/RtlF08ewpTmePpnQ==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/global-context@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.82.0.tgz#628cf1ed33a8a956d884a462d382bb8923cbe802"
-  integrity sha512-dgm0yOP89ycRZvz8Qs5GE+z51sPvQBpzvnxM6hgFXxqs6dq6q3YU+kgPoh1FLZ2biTvFTamTIfodtQjmlIKT/g==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-
-"@glimmer/interfaces@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.0.tgz#eabc7551ffe7ad27c44ba96d39e2af6ebf01c942"
-  integrity sha512-evD9aVhYacFe/lD/FzaPs0CuuIgkr17+KbOCWDeEMXW0q2FnrLiQET40eP5nyhGLELhKE62mlIzdGmleUR6XYg==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
-"@glimmer/interfaces@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.82.0.tgz#e3f21e51a421b4c1ee34dcb682c719832f4a36f5"
-  integrity sha512-Cdr2uWSNHBBf2fnm4QjkjHWgxGoT4SdrD+RDQBMwYWSaysqqsXYU3+toOLKFmaMJuyDa28Zeq17lCab7zOg43g==
+"@glimmer/interfaces@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.1.tgz#fd215cea24ca4a77861552990f7305e2d37513ce"
+  integrity sha512-jF1zOeaPBvLaPuLrWUQZzF4e0dDtkTcX/gllz4ar+wRFhwhgrJ6XFQWdk8/CvvK40/cW/yLPmmMYpyqk6wYw5Q==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -2499,247 +2466,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.0.tgz#07eae00d0846ca1c44307ab0a03a6f6ebbe63065"
-  integrity sha512-rnRR1PQgqdmuKA/Lz9iVjhSK437Yws43QtfllCoUAPjlzqekJyR0oZiozlih+b3NSHhhU1hZhr2Xoo7lzhsyjQ==
-  dependencies:
-    "@glimmer/destroyable" "0.80.0"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/reference" "0.80.0"
-    "@glimmer/util" "0.80.0"
-    "@glimmer/validator" "0.80.0"
-
-"@glimmer/manager@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.82.0.tgz#a1866c4c5710a489d7ebfdcc70bce21855aae45a"
-  integrity sha512-UpUzN5kjJwjBapFA8lOH3T7hLi0UWYWLZmzAnKE3EpfeP5IlVJnO+UqR/0SKD/RJgjmqOdiE/3AZJJA/EyNnWw==
+"@glimmer/manager@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.1.tgz#2f74fb370f8551b1fcf8ed5295e1b22b7755957c"
+  integrity sha512-nusmSVsxCQZjIwUTxlA5mqLWF7WoEcnzv7tQj3qxlI8W1lEaiuIhhwB9B5WI0GXRlJF/R3gFn+VI1IbSz1vQZg==
   dependencies:
-    "@glimmer/destroyable" "0.82.0"
+    "@glimmer/destroyable" "0.80.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/reference" "0.82.0"
-    "@glimmer/util" "0.82.0"
-    "@glimmer/validator" "0.82.0"
-
-"@glimmer/node@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.0.tgz#afdd6acdd73f70b88a8e78e79f592139912047ce"
-  integrity sha512-wm3bSiWBljW5UwUII2MKu1GOLkaRha66c8RryiGP97uP0EriMXAUj9kAnhur+/oG15ME+Vp65zwx1nCVeXshYA==
-  dependencies:
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/runtime" "0.80.0"
-    "@glimmer/util" "0.80.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/reference" "0.80.1"
+    "@glimmer/util" "0.80.1"
+    "@glimmer/validator" "0.80.1"
+
+"@glimmer/node@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.1.tgz#c41c6c1092b3e980f79dc3c69cd23c41e1c3afb4"
+  integrity sha512-cg+hseTbJqmsyPeOts7LktB1ECMjspS0cb92U2sLKzOU2N6g54wvoj1hwuQ6waoMo8qpeYd/uRJ2W2l5L9yrEA==
+  dependencies:
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/runtime" "0.80.1"
+    "@glimmer/util" "0.80.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.0.tgz#adb6bf7cf374b09d48a2f7365a3d4c80f1944a14"
-  integrity sha512-lvRZ0QCmbsp72u6EKpo1H3LVhq2oKLEGWj7SuIgexnLoVQvPWMfTvGHnh08XOAIAkp15LlVB240V9RWfz0T8yw==
+"@glimmer/opcode-compiler@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.1.tgz#d17c78682eb09e941b7425b6ba3f12895886ce7e"
+  integrity sha512-8Sk793kCJYKaWeiZ6y9egBrk1F4LO6Cwwwzzi79+vpQmJP0quIuG+EepNqF1Kv7NM2YiRrannywZ8Scok3ZBrA==
   dependencies:
-    "@glimmer/encoder" "0.80.0"
+    "@glimmer/encoder" "0.80.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/reference" "0.80.0"
-    "@glimmer/util" "0.80.0"
-    "@glimmer/vm" "0.80.0"
-    "@glimmer/wire-format" "0.80.0"
-
-"@glimmer/opcode-compiler@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.82.0.tgz#4b7d0565a9d9ee941be104628f5e9afce4dbabc6"
-  integrity sha512-2m0MePmirxSwZWEH6lTWEgtTKTytBy+dpOWM+UzMFKziEgP+7Vc+aacdC9aC0CYkcf47NMJ4ukS8ctUL+Lc7RA==
-  dependencies:
-    "@glimmer/encoder" "0.82.0"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/reference" "0.82.0"
-    "@glimmer/util" "0.82.0"
-    "@glimmer/vm" "0.82.0"
-    "@glimmer/wire-format" "0.82.0"
-
-"@glimmer/owner@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.0.tgz#ae5da1e4bf8121592afc920a88f3f6dda603606a"
-  integrity sha512-6VkPqa1fn8Y+9K0nevtMukdVlSaGzrrpYn+QReaXGFjN97YFDQWqQUrmEjcAXeOF/zcyKTpDNrQH0ev0s4JicQ==
-  dependencies:
-    "@glimmer/util" "0.80.0"
-
-"@glimmer/owner@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.82.0.tgz#4ac384bf52ab9ef1ffcea2e665de07b5701658d8"
-  integrity sha512-cTUWo3DHCP8mwzHhGZ0tBpwq0KQOhpFAPlC3fjmLXBK0f1VwzOtNYP50SAAyux4g4oeWcA3cgbErd67M2db3vA==
-  dependencies:
-    "@glimmer/util" "0.82.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/reference" "0.80.1"
+    "@glimmer/util" "0.80.1"
+    "@glimmer/vm" "0.80.1"
+    "@glimmer/wire-format" "0.80.1"
 
-"@glimmer/program@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.0.tgz#5bcc2709757c36127568993a61e842351814b67e"
-  integrity sha512-gp9Lmctp5ECkb7o7fvwN40cusH1Wr/cD7x0IKg3bDFeXuYGc/nUEBlZoU3jMMlGgHjW5b4Mo6LiGkOOK3QWSCA==
+"@glimmer/owner@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.1.tgz#5c8aa1cf9a9d41666d282a18147b8b5433f9e373"
+  integrity sha512-344nI+u2w4cJw//BraE+gjwi9CqJUouKlW8D2uEOio/+23z0MjcQmiO/SSCCqbRcOTATRvuYzNE5WaxqL7nizQ==
   dependencies:
-    "@glimmer/encoder" "0.80.0"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/manager" "0.80.0"
-    "@glimmer/opcode-compiler" "0.80.0"
-    "@glimmer/util" "0.80.0"
+    "@glimmer/util" "0.80.1"
 
-"@glimmer/program@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.82.0.tgz#76964390ac42a029d3a9f521a50a58ba8514b2f6"
-  integrity sha512-Md/WTdj9HiodRMOa/1L3wPMImmMKyklWS/mkj4A3A5k6h5rDcM6lvcHfFwikv0RN+mQ0ogRbNio9D5HCFRQS6g==
+"@glimmer/program@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.1.tgz#5f7826dcdbf3f504480c8e5603e2b1ecc00bfc98"
+  integrity sha512-CjOl4qW8aMKDZS389FUE/2UPHS6u75yYJObV9kRMJr8AyqfBaapsoxkZDGspmjIRpvQMZiEDfw7nA/E9owN5sA==
   dependencies:
-    "@glimmer/encoder" "0.82.0"
+    "@glimmer/encoder" "0.80.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/manager" "0.82.0"
-    "@glimmer/opcode-compiler" "0.82.0"
-    "@glimmer/util" "0.82.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/manager" "0.80.1"
+    "@glimmer/opcode-compiler" "0.80.1"
+    "@glimmer/util" "0.80.1"
 
-"@glimmer/reference@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.0.tgz#a69d4c43d2d85fc4b840e8a56a77b4480bac5774"
-  integrity sha512-Yn2RLZEWPctbSLeJRiML7DO5wAOrQCfYy4WV5YuHg4JujE7aMoYLeBFNgbGmWcAmBYZjIjVeF1/Qr2USiT3FKA==
+"@glimmer/reference@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.1.tgz#7066c1e4957a4c3030222283e4b97a6f81c3d64d"
+  integrity sha512-Xn3azk0RJNhRyEQY6FiZETKCqxGFua1Vm+PhZbfnxqePVHxUVZ5aahkz07PvhI24O6PgJ+co978kiOhdiESmxw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.0"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/util" "0.80.0"
-    "@glimmer/validator" "0.80.0"
-
-"@glimmer/reference@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.82.0.tgz#f688be8272a71b314a023ded83d3d3afeb5b65e9"
-  integrity sha512-bL+nrB+480v8sHpbdHC6vCln+AFdJixlVi3zMu633KWWfPs5869ZiLZOiXnPBNoMK4FkMuaRwpOlke7rAbKPbw==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.82.0"
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/util" "0.82.0"
-    "@glimmer/validator" "0.82.0"
-
-"@glimmer/runtime@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.0.tgz#ddf344cca65934e283edfcad002729315623c3b7"
-  integrity sha512-tAlbowztTW18jzOPwOhZiSPAwCL5VVVBHb+dC7cArosLudvDBqVWK7dD7AM3NX7N9Ru3NoCsis9Ql0zYI7tFGA==
-  dependencies:
-    "@glimmer/destroyable" "0.80.0"
-    "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.0"
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.80.0"
-    "@glimmer/program" "0.80.0"
-    "@glimmer/reference" "0.80.0"
-    "@glimmer/util" "0.80.0"
-    "@glimmer/validator" "0.80.0"
-    "@glimmer/vm" "0.80.0"
-    "@glimmer/wire-format" "0.80.0"
-    "@simple-dom/interface" "^1.4.0"
+    "@glimmer/global-context" "0.80.1"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/util" "0.80.1"
+    "@glimmer/validator" "0.80.1"
 
-"@glimmer/runtime@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.82.0.tgz#9974e91cb38551d523a993684e81775fd68be945"
-  integrity sha512-LXy8lcR4bt/tbcYOfptT2tJrVHUiO5drePqBxccEcFWoSydN/4KbpWkg6ueDCTQrGqy6eyN8u3bWJyySZayJJw==
+"@glimmer/runtime@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.1.tgz#0a62bcb79a5d3f85a508ae0993593e7450f748b5"
+  integrity sha512-UzH/+0jBGi/SGLjVYj0k6AGuulZzwDDNGnKC90ciSDnlCDYzd7AGzlMZ8bK/daI0WhYX/Y5uCWA21IbtmZSEmA==
   dependencies:
-    "@glimmer/destroyable" "0.82.0"
+    "@glimmer/destroyable" "0.80.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.82.0"
-    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/global-context" "0.80.1"
+    "@glimmer/interfaces" "0.80.1"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.82.0"
-    "@glimmer/program" "0.82.0"
-    "@glimmer/reference" "0.82.0"
-    "@glimmer/util" "0.82.0"
-    "@glimmer/validator" "0.82.0"
-    "@glimmer/vm" "0.82.0"
-    "@glimmer/wire-format" "0.82.0"
+    "@glimmer/owner" "0.80.1"
+    "@glimmer/program" "0.80.1"
+    "@glimmer/reference" "0.80.1"
+    "@glimmer/util" "0.80.1"
+    "@glimmer/validator" "0.80.1"
+    "@glimmer/vm" "0.80.1"
+    "@glimmer/wire-format" "0.80.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.0.tgz#5f9c2e5824fdc8f88ec3e71861598c339b6777c1"
-  integrity sha512-LP8I5MmcguUiHhahyF96dgjKrPE6l1QVl2rlJY23FkzPSVMtUAQxNsxHPZ7vqi+gu7wucNiOfIPNTh9avOr20Q==
+"@glimmer/syntax@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.1.tgz#ca6fb1d6efa93404e61e977538f21cfe3a61c3f9"
+  integrity sha512-yBK/pRnJaik94h0rNKZOHLVmbWFV2IG9IIez7GieMEidOE48xevpmum6TcSBITlOCcrNlaS5FhgeKp08BGwe6w==
   dependencies:
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/util" "0.80.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/util" "0.80.1"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.0.tgz#286ec9e2c8c9e2f364e49272a3baf9d0fe3dc40c"
-  integrity sha512-fvr4zyGVp58vzVajwTwbGwp0LmPxm2SVWkfIGFcCr9r2BmYD+9bd52I0u00LsZvNJQqFNyI8RB+qXThRMi+TiA==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.0"
-    "@simple-dom/interface" "^1.4.0"
-
-"@glimmer/util@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.82.0.tgz#d6ae4985f70343898d4b2297a4b3b1f5feda1934"
-  integrity sha512-/13rKFiFG8P4eXuiwnu0Y5OX0B8DkPI+4M9eH/vWp32WbhEngKwtYpVdKpjK0SEZ6DTmqFYdUQr17bwQHSDh2Q==
+"@glimmer/util@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.1.tgz#e973b1c97b915ca06ceaefbd01b334a51c772cbc"
+  integrity sha512-UnhAG57SXSgL477p0u/Y47JPCDu/pg2Xaf7aGBkW3D0NfPXgMk+RrElvChw5Lv4I5nkQlEYwm+GGwjEaFdGN2A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.82.0"
+    "@glimmer/interfaces" "0.80.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.0.tgz#f93c221a681809e5e45451e21d58ad0a819a38c0"
-  integrity sha512-qjKKvHaxp7jT978FM1Ifa4aur/W1osPRrMFahQH5LjwMQEdLdk3OSyuxfTY6nTArnK0YJWJZPScrRD0lS2Wy9Q==
-  dependencies:
-    "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.0"
-
-"@glimmer/validator@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.82.0.tgz#924f378e61e8a54081b1174313650f1938174d93"
-  integrity sha512-Dci5iB/WKSoLp0DyuIxf2+Um+8EI2UXIyalC76ZGMMf+iXV6N4H1guXGaunwp/J7dmJvdpGsWJ3NpILrATeWwQ==
+"@glimmer/validator@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.1.tgz#1b6c2bced652d1a65df2b427d893d757af1ec576"
+  integrity sha512-Ahfie+22yxKmftSR6GhW/RAzZX0ne+nxj/CdYQvkNut+CdAY9g+TkoM5LurTNW6PWBQRmgnuUW18Ddh89wZ69w==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.82.0"
+    "@glimmer/global-context" "0.80.1"
 
-"@glimmer/vm-babel-plugins@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.0.tgz#e9a6b496501eed367b94c928dc48a954830af3b5"
-  integrity sha512-ZW6+L+FzjDZngGj87zn3MRRA/MrchC7Con33mCcI36v8u48maheB351uhQe+fBVU300IfyzNMvAdwdVKS5VIFw==
+"@glimmer/vm-babel-plugins@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.1.tgz#ca0118e1e2fefd16418819d0b2b81d69dbd5be9a"
+  integrity sha512-bNPa/ncEvjr1GnLlz/VfJ731pQqaGh8030NX/rywIlMvrfP4qYXEpgvL9d33z65wMz22DREDygihV9F2giDgoQ==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.0.tgz#435a8d846e7e6066c018018a71be403520e9b577"
-  integrity sha512-1oSNmMXS83o/+SO1dW1rdm6hHH5ZbCfZt0mrY4+UHFHnlt8RH24z4YN36kjBVczCX1DhZJOYUrwwE4FKBjKdaQ==
-  dependencies:
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/util" "0.80.0"
-
-"@glimmer/vm@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.82.0.tgz#c146b48b4359c94c26574129f3745b76f20e4918"
-  integrity sha512-XbiExuyxwY/80UJPJyQKpYEzVuEeGBEvM/OHi3yg0NYMvvTEhhFv4D7lmkRgxobSWAjK4HSROrcLdO069LJ64Q==
-  dependencies:
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/util" "0.82.0"
-
-"@glimmer/wire-format@0.80.0":
-  version "0.80.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.0.tgz#bea3da7973a6a70611bf45cfc15592dbec132091"
-  integrity sha512-DAUEqUxq0ymuzRStw51DMhTrRZdCBVPZ7K63YFLRud3pojaApWxgeOFlsLua9nRqR6wYSSKS0y2E0n0tPnRndA==
+"@glimmer/vm@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.1.tgz#ee6e955b8a100b68da9b9e0cd1d58f82c23473d9"
+  integrity sha512-esK+dapnp6RQ3Jn5HzEtdDc8/dAnPNr5jZLwkQ3yYKWPuS1lI8Voz4cWc3vvhYy9FwreVC3BGihEYjyO81VDWQ==
   dependencies:
-    "@glimmer/interfaces" "0.80.0"
-    "@glimmer/util" "0.80.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/util" "0.80.1"
 
-"@glimmer/wire-format@0.82.0":
-  version "0.82.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.82.0.tgz#2ead3e9ce82ae21296ae592f6b2278576e092110"
-  integrity sha512-DGugtx+UiJjqlCYecAzfmxynkFrC+fRiS1tJW6JPjfLIAY0pyjuFpLE4xyQ2RZ3J4WBIiz5Kbi/ZAtcdUkj08w==
+"@glimmer/wire-format@0.80.1":
+  version "0.80.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.1.tgz#a37b2f2583a4d6402d3f8dddd670950078adbbf9"
+  integrity sha512-Zh4+VnyAbD5Zo1ziqHAhyVgyBzgTtxshZDOnUnLJx6l0RJVwtyVSZ+KlsCS8xLBDFH0eeT+isUSIrP19GP5jew==
   dependencies:
-    "@glimmer/interfaces" "0.82.0"
-    "@glimmer/util" "0.82.0"
+    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/util" "0.80.1"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 375dd0f03fd38b4c13d0501742277e58714f6b13 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 21 Oct 2021 19:04:39 -0400
Subject: [PATCH 0678/1405] Add v3.28.2 to CHANGELOG.md.

(cherry picked from commit 4c0e61b4a5d35084f43bb93ac7306f2183c02a1e)
---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db8a3490ee1..09d73d7be1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,7 +65,11 @@
 - [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
 - [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 
-### v3.28.1 (August 30, 2021)
+## v3.28.2 (October 21, 2021)
+
+- [glimmerjs/glimmer-vm#1351](https://github.com/glimmerjs/glimmer-vm/pull/1351) Support lexical scope in loose mode
+
+## v3.28.1 (August 30, 2021)
 
 - [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized
 

From d9a83a4ba5f11347fb443ed7f08a3b4cfdb5ffe4 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Fri, 22 Oct 2021 00:31:02 -0400
Subject: [PATCH 0679/1405] Don't pass falsy `locals` to glimmer precompile

Fixes #19797.
---
 .../lib/system/compile-options.ts                        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 37f660d3dfe..22e77714340 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -35,6 +35,15 @@ export function buildCompileOptions(_options: EmberPrecompileOptions): EmberPrec
     options.locals = undefined;
   }
 
+  if ('locals' in options && !options.locals) {
+    // Glimmer's precompile options declare `locals` like:
+    //    locals?: string[]
+    // but many in-use versions of babel-plugin-htmlbars-inline-precompile will
+    // set locals to `null`. This used to work but only because glimmer was
+    // ignoring locals for non-strict templates, and now it supports that case.
+    delete options.locals;
+  }
+
   // move `moduleName` into `meta` property
   if (options.moduleName) {
     let meta = options.meta;

From 6707ad35e1a9336309c6654f138e9b606ff5d0f6 Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Fri, 22 Oct 2021 08:25:44 -0400
Subject: [PATCH 0680/1405] Update glimmer-vm to 0.80.2 (fix some inline
 precompile issues)

---
 package.json |  26 +++---
 yarn.lock    | 252 +++++++++++++++++++++++++--------------------------
 2 files changed, 139 insertions(+), 139 deletions(-)

diff --git a/package.json b/package.json
index 63d391e9eab..333add565c1 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "@babel/helper-module-imports": "^7.8.3",
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.80.1",
+    "@glimmer/vm-babel-plugins": "0.80.2",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
@@ -76,19 +76,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.80.1",
-    "@glimmer/destroyable": "0.80.1",
+    "@glimmer/compiler": "0.80.2",
+    "@glimmer/destroyable": "0.80.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.80.1",
-    "@glimmer/interfaces": "0.80.1",
-    "@glimmer/manager": "0.80.1",
-    "@glimmer/node": "0.80.1",
-    "@glimmer/opcode-compiler": "0.80.1",
-    "@glimmer/owner": "0.80.1",
-    "@glimmer/program": "0.80.1",
-    "@glimmer/reference": "0.80.1",
-    "@glimmer/runtime": "0.80.1",
-    "@glimmer/validator": "0.80.1",
+    "@glimmer/global-context": "0.80.2",
+    "@glimmer/interfaces": "0.80.2",
+    "@glimmer/manager": "0.80.2",
+    "@glimmer/node": "0.80.2",
+    "@glimmer/opcode-compiler": "0.80.2",
+    "@glimmer/owner": "0.80.2",
+    "@glimmer/program": "0.80.2",
+    "@glimmer/reference": "0.80.2",
+    "@glimmer/runtime": "0.80.2",
+    "@glimmer/validator": "0.80.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.4",
diff --git a/yarn.lock b/yarn.lock
index 47d1fae92a4..bd8528f468d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2412,52 +2412,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.1.tgz#3974e2ebade228a39e4c2aeab8002db5b8e4e7f8"
-  integrity sha512-hNtHx7fN12WBO2AWkmWj3kaZhWVT4+Xh1S+cwDd/bSRRK6mNPhe4dmtgA2NRHkvK/DVbJomQYhmEZsK1Qqy/yQ==
-  dependencies:
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/syntax" "0.80.1"
-    "@glimmer/util" "0.80.1"
-    "@glimmer/wire-format" "0.80.1"
+"@glimmer/compiler@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.2.tgz#730001221f7240709f5952f30427f2352aa8b05d"
+  integrity sha512-oWl0A3lvGjlArlYAosUQStCAgboCOaf7GZCJ/A3cGCuy1BlP/pFCBFkgG60SODJwr+zeJLRAh0adroaisH66SA==
+  dependencies:
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/syntax" "0.80.2"
+    "@glimmer/util" "0.80.2"
+    "@glimmer/wire-format" "0.80.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.1.tgz#d3ceaa575600803a63594113ec03bc73e77d5c0c"
-  integrity sha512-PGRrv1mKU2ngDXtg21AAwbV9voTI5dzrLLV4F1BHlKx29YcDhJ/wRGlzijYdrvFl0Eof+6iKPsYUi2BhRoAkeA==
+"@glimmer/destroyable@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.2.tgz#da199504eb91cf2513f2c3ac6d0d899d83b74878"
+  integrity sha512-RdquK8byB/uvwEIzUxXL3dX0wnPW6yLooBmrR/QKOyiP0f23DdLLdT2tc7etITkF0NOFjtRApFr3Kwxm2vsHfA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.1"
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/util" "0.80.1"
+    "@glimmer/global-context" "0.80.2"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/util" "0.80.2"
 
-"@glimmer/encoder@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.1.tgz#f81eac1520c48539e4884d14b35be3ba3fdb2c8a"
-  integrity sha512-WzYzar06B2Tqo0xhJFKQtEAZjSONjrNB+FGfJ/2UXWYEOnMjbi/aqnEVLX48Gn8fiQvApX5e+QyxgUwpWNVMDA==
+"@glimmer/encoder@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.2.tgz#30dd5aed6b56362388a2e3ed1069a318c76132ca"
+  integrity sha512-16D7VVy2Riqc2+q/374auzcJ/KpIIxEactAkPlPUgexwzUEuJSPcg1hcEh0medwPQlNn1YkL+5YFPh9zFUgoWQ==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/vm" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/vm" "0.80.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.1.tgz#6a496b408129bae21ddeffe214256e7c23f557aa"
-  integrity sha512-UpzRzeQNbDiiQnuHBq15xsp8A6DWUcng848GUFTIJdTlZJ7/AKE/nyyaWyP6Yusc3JMYC/RtlF08ewpTmePpnQ==
+"@glimmer/global-context@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.2.tgz#aaa389f1055a056d0f911a7e9d101cbcc06f133b"
+  integrity sha512-XskcLaDUoXJYa/RLhkFNZSywzLoeMDQk6UTxvWrCtfE8hKXfeKSKq1FKyYenzB3SMF2ESX5yHOSd/xKBIYVypg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.1.tgz#fd215cea24ca4a77861552990f7305e2d37513ce"
-  integrity sha512-jF1zOeaPBvLaPuLrWUQZzF4e0dDtkTcX/gllz4ar+wRFhwhgrJ6XFQWdk8/CvvK40/cW/yLPmmMYpyqk6wYw5Q==
+"@glimmer/interfaces@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.2.tgz#3937610ada436102ff9f92a6ea89e6d4531c1432"
+  integrity sha512-s5xhjoRNwp2fJty8/LpOY2qRLRlevYZFxEDD+Jl44YTRdU68DZJdSYd0cBknp1qDSi+C74zIg7S5cGwS3ulkUw==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -2466,140 +2466,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.1.tgz#2f74fb370f8551b1fcf8ed5295e1b22b7755957c"
-  integrity sha512-nusmSVsxCQZjIwUTxlA5mqLWF7WoEcnzv7tQj3qxlI8W1lEaiuIhhwB9B5WI0GXRlJF/R3gFn+VI1IbSz1vQZg==
+"@glimmer/manager@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.2.tgz#739d9766a21d62965bb322f5c57a7e984af35a1f"
+  integrity sha512-9Fz+R67cqXeDkFBBfag3HNE4bla0Y2BCmzo/VSPzt6dI/2qzWl+MTDyiu85RffAnMZgXuqMUElizcsuq3hWERg==
   dependencies:
-    "@glimmer/destroyable" "0.80.1"
+    "@glimmer/destroyable" "0.80.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/reference" "0.80.1"
-    "@glimmer/util" "0.80.1"
-    "@glimmer/validator" "0.80.1"
-
-"@glimmer/node@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.1.tgz#c41c6c1092b3e980f79dc3c69cd23c41e1c3afb4"
-  integrity sha512-cg+hseTbJqmsyPeOts7LktB1ECMjspS0cb92U2sLKzOU2N6g54wvoj1hwuQ6waoMo8qpeYd/uRJ2W2l5L9yrEA==
-  dependencies:
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/runtime" "0.80.1"
-    "@glimmer/util" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/reference" "0.80.2"
+    "@glimmer/util" "0.80.2"
+    "@glimmer/validator" "0.80.2"
+
+"@glimmer/node@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.2.tgz#651055876ca4c95fc5159f7918da1ea715e222e6"
+  integrity sha512-Urtey5+Jla2sjJSeYnjIYii9pei7bLr/8dPxbVkmJEh8oK3YIcz7YNymFjXxce2Vxdnj1A1KussGzBcK0FP3pA==
+  dependencies:
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/runtime" "0.80.2"
+    "@glimmer/util" "0.80.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.1.tgz#d17c78682eb09e941b7425b6ba3f12895886ce7e"
-  integrity sha512-8Sk793kCJYKaWeiZ6y9egBrk1F4LO6Cwwwzzi79+vpQmJP0quIuG+EepNqF1Kv7NM2YiRrannywZ8Scok3ZBrA==
+"@glimmer/opcode-compiler@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.2.tgz#be6fe3d0c7e82e1d903a9b594b017236c035018b"
+  integrity sha512-STGh/F8NaYxDVG6rPM97t/A9fnOpU+uK0BQEhRLsx/iGvq8PyE966p4LKyRAbmbuFTLhbZE7E/68Y0k0eWQc6Q==
   dependencies:
-    "@glimmer/encoder" "0.80.1"
+    "@glimmer/encoder" "0.80.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/reference" "0.80.1"
-    "@glimmer/util" "0.80.1"
-    "@glimmer/vm" "0.80.1"
-    "@glimmer/wire-format" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/reference" "0.80.2"
+    "@glimmer/util" "0.80.2"
+    "@glimmer/vm" "0.80.2"
+    "@glimmer/wire-format" "0.80.2"
 
-"@glimmer/owner@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.1.tgz#5c8aa1cf9a9d41666d282a18147b8b5433f9e373"
-  integrity sha512-344nI+u2w4cJw//BraE+gjwi9CqJUouKlW8D2uEOio/+23z0MjcQmiO/SSCCqbRcOTATRvuYzNE5WaxqL7nizQ==
+"@glimmer/owner@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.2.tgz#34cf1b70ab3f061d8675c941cecaf3fcc319af3b"
+  integrity sha512-jEwaRA0oEEPaJDHs/5MlWm3fEmhN8qp3NJlLYs5Duviks+tEhtmB1zr3Jg+7TAMrJloRo9iadt4TrZzezgRAIQ==
   dependencies:
-    "@glimmer/util" "0.80.1"
+    "@glimmer/util" "0.80.2"
 
-"@glimmer/program@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.1.tgz#5f7826dcdbf3f504480c8e5603e2b1ecc00bfc98"
-  integrity sha512-CjOl4qW8aMKDZS389FUE/2UPHS6u75yYJObV9kRMJr8AyqfBaapsoxkZDGspmjIRpvQMZiEDfw7nA/E9owN5sA==
+"@glimmer/program@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.2.tgz#dc1a582c564f735f4021d3eb6c54047c237c264f"
+  integrity sha512-MpPJgeCc/yj9uawG4kqBxzVOuJNky3WB9g3Cm21k0Z+YACdguC2UjXUoA9PvjfrLEj+7eajE0wQ+QTbztOwVtQ==
   dependencies:
-    "@glimmer/encoder" "0.80.1"
+    "@glimmer/encoder" "0.80.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/manager" "0.80.1"
-    "@glimmer/opcode-compiler" "0.80.1"
-    "@glimmer/util" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/manager" "0.80.2"
+    "@glimmer/opcode-compiler" "0.80.2"
+    "@glimmer/util" "0.80.2"
 
-"@glimmer/reference@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.1.tgz#7066c1e4957a4c3030222283e4b97a6f81c3d64d"
-  integrity sha512-Xn3azk0RJNhRyEQY6FiZETKCqxGFua1Vm+PhZbfnxqePVHxUVZ5aahkz07PvhI24O6PgJ+co978kiOhdiESmxw==
+"@glimmer/reference@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.2.tgz#db14f64592bd7f505d47527eacc298a1ba7f8ea5"
+  integrity sha512-uXRc912/kAoXgNu2MIWcqARyMUq+h+N82LiNXg0mYo/SYaxT1ag3uVw6nM82ou9ii0lLWKY1fP/4knuSwu0rbA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.1"
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/util" "0.80.1"
-    "@glimmer/validator" "0.80.1"
+    "@glimmer/global-context" "0.80.2"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/util" "0.80.2"
+    "@glimmer/validator" "0.80.2"
 
-"@glimmer/runtime@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.1.tgz#0a62bcb79a5d3f85a508ae0993593e7450f748b5"
-  integrity sha512-UzH/+0jBGi/SGLjVYj0k6AGuulZzwDDNGnKC90ciSDnlCDYzd7AGzlMZ8bK/daI0WhYX/Y5uCWA21IbtmZSEmA==
+"@glimmer/runtime@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.2.tgz#14895a6d2a0c7214163a21579a7980f8784dfd6c"
+  integrity sha512-7g12Eyo/fQpKICXXW/+cQCA/mYr4ugOrM7YiZSYtAdm1gIQqQFbxnod2iLgFgISDqRHf8cKTsuZw7+yeIwQNIA==
   dependencies:
-    "@glimmer/destroyable" "0.80.1"
+    "@glimmer/destroyable" "0.80.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.1"
-    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/global-context" "0.80.2"
+    "@glimmer/interfaces" "0.80.2"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.80.1"
-    "@glimmer/program" "0.80.1"
-    "@glimmer/reference" "0.80.1"
-    "@glimmer/util" "0.80.1"
-    "@glimmer/validator" "0.80.1"
-    "@glimmer/vm" "0.80.1"
-    "@glimmer/wire-format" "0.80.1"
+    "@glimmer/owner" "0.80.2"
+    "@glimmer/program" "0.80.2"
+    "@glimmer/reference" "0.80.2"
+    "@glimmer/util" "0.80.2"
+    "@glimmer/validator" "0.80.2"
+    "@glimmer/vm" "0.80.2"
+    "@glimmer/wire-format" "0.80.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.1.tgz#ca6fb1d6efa93404e61e977538f21cfe3a61c3f9"
-  integrity sha512-yBK/pRnJaik94h0rNKZOHLVmbWFV2IG9IIez7GieMEidOE48xevpmum6TcSBITlOCcrNlaS5FhgeKp08BGwe6w==
+"@glimmer/syntax@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.2.tgz#2123a0c28c9a9d39b42392aaa3df8b7f3706645b"
+  integrity sha512-30H1RtmjCW5miO4codNPWgyO0UOeBaDuc7ohSuG0E85djh444ImfJwlLE/cW6C4pLb38OeG8vEPODnppWV3XUg==
   dependencies:
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/util" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/util" "0.80.2"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.10"
 
-"@glimmer/util@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.1.tgz#e973b1c97b915ca06ceaefbd01b334a51c772cbc"
-  integrity sha512-UnhAG57SXSgL477p0u/Y47JPCDu/pg2Xaf7aGBkW3D0NfPXgMk+RrElvChw5Lv4I5nkQlEYwm+GGwjEaFdGN2A==
+"@glimmer/util@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.2.tgz#a1dbb11575255a478c0ba161d521cdbad8c3410d"
+  integrity sha512-GniMILqLJ+dWiwmO/UOBPCqwMYEPYoFW3e/mInUbKn0YBenf/M6hJhnPI7Z11NpObknq3s5nNLkDcmR3gdFmHA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.1.tgz#1b6c2bced652d1a65df2b427d893d757af1ec576"
-  integrity sha512-Ahfie+22yxKmftSR6GhW/RAzZX0ne+nxj/CdYQvkNut+CdAY9g+TkoM5LurTNW6PWBQRmgnuUW18Ddh89wZ69w==
+"@glimmer/validator@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.2.tgz#4ac1faf608913c88d0dab54a37068bbdf6edc62a"
+  integrity sha512-m5K0IxStWHM5vJbJDDXhnr2LGAnC469RclA6jazbtl3fVHEg5njzsQYUIfRTxFpgPK3QEyRJrR6r3PG9RCMnDw==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.1"
+    "@glimmer/global-context" "0.80.2"
 
-"@glimmer/vm-babel-plugins@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.1.tgz#ca0118e1e2fefd16418819d0b2b81d69dbd5be9a"
-  integrity sha512-bNPa/ncEvjr1GnLlz/VfJ731pQqaGh8030NX/rywIlMvrfP4qYXEpgvL9d33z65wMz22DREDygihV9F2giDgoQ==
+"@glimmer/vm-babel-plugins@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.2.tgz#6e3b6b0ec06994084b44fca1f19c20fd945df454"
+  integrity sha512-ufdz76tVz3TivS8Bb92n/v6yXNX8zgREDwR3ju45ZO48yWexySllUBFOvwCAmPIoHSQGq8LyIwJGESIJLacr6A==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.1.tgz#ee6e955b8a100b68da9b9e0cd1d58f82c23473d9"
-  integrity sha512-esK+dapnp6RQ3Jn5HzEtdDc8/dAnPNr5jZLwkQ3yYKWPuS1lI8Voz4cWc3vvhYy9FwreVC3BGihEYjyO81VDWQ==
+"@glimmer/vm@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.2.tgz#33f875b0b8e2cc5a6c3d5c1548dbbc333631f6ac"
+  integrity sha512-5dk76zuc2wRR6L2FVHJIX0MQ3AuawXoO2JW/i5nP8wu3r3jXXrvUbtwtR2DCq6lasmyjk5pygtf+DSaawrezqg==
   dependencies:
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/util" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/util" "0.80.2"
 
-"@glimmer/wire-format@0.80.1":
-  version "0.80.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.1.tgz#a37b2f2583a4d6402d3f8dddd670950078adbbf9"
-  integrity sha512-Zh4+VnyAbD5Zo1ziqHAhyVgyBzgTtxshZDOnUnLJx6l0RJVwtyVSZ+KlsCS8xLBDFH0eeT+isUSIrP19GP5jew==
+"@glimmer/wire-format@0.80.2":
+  version "0.80.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.2.tgz#ae7c7bd2e2a56aca6110b6d7048dae6ac99d340e"
+  integrity sha512-UE7P2AJNs9snKr8LRd4LDZYRmOybYJodUl4vfdntmBeYHiGNWWKpft1tgg5IDdBgmYPvoOEaRQUoIkdMhMT6aA==
   dependencies:
-    "@glimmer/interfaces" "0.80.1"
-    "@glimmer/util" "0.80.1"
+    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/util" "0.80.2"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 12b89c42d1987fd782d06f1f170eb7ce25612558 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 8 Oct 2021 22:04:31 +0200
Subject: [PATCH 0681/1405] Provide `service` export from `@ember/service` in
 favour of `inject`

---
 .../glimmer/lib/components/-link-to.ts        |  4 +-
 .../glimmer/lib/components/link-to.ts         |  2 +-
 .../glimmer/lib/glimmer-component-docs.ts     |  4 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  2 +-
 .../-internals/glimmer/lib/helpers/action.ts  |  2 +-
 .../application/helper-registration-test.js   |  4 +-
 .../application/hot-reload-test.js            |  4 +-
 .../components/curly-components-test.js       | 14 +++---
 .../helpers/helper-manager-test.js            |  2 +-
 .../integration/helpers/invoke-helper-test.js |  2 +-
 .../tests/integration/helpers/tracked-test.js |  4 +-
 .../-internals/routing/lib/services/router.ts | 20 ++++-----
 .../-internals/routing/lib/system/route.ts    |  2 +-
 .../-internals/routing/lib/system/router.ts   |  2 +-
 .../routing/tests/system/route_test.js        |  4 +-
 .../tests/system/object/create_test.js        |  2 +-
 .../@ember/application/lib/application.js     |  2 +-
 .../@ember/application/tests/visit_test.js    |  8 ++--
 .../controller/tests/controller_test.js       |  4 +-
 packages/@ember/service/index.d.ts            |  1 +
 packages/@ember/service/index.js              | 24 +++++++---
 packages/@ember/service/tests/service_test.js | 45 +++++++++++++++++--
 packages/ember/index.js                       |  4 +-
 packages/ember/tests/reexports_test.js        |  2 +-
 .../query_params_test/shared_state_test.js    |  6 +--
 .../routing/router_service_test/basic_test.js |  4 +-
 .../build_routeinfo_metadata_test.js          |  2 +-
 .../currenturl_lifecycle_test.js              |  6 +--
 .../router_service_test/events_test.js        |  2 +-
 .../router_service_test/isActive_test.js      |  2 +-
 .../non_application_test_test.js              |  4 +-
 .../router_service_test/transitionTo_test.js  | 11 +++--
 .../ember/tests/service_injection_test.js     |  8 ++--
 tests/docs/expected.js                        |  1 +
 34 files changed, 132 insertions(+), 78 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
index 642eeb64605..edd973cae1b 100644
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
@@ -11,7 +11,7 @@ import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, deprecate, runInDebug, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
-import { inject as injectService } from '@ember/service';
+import { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberComponent from '../component';
 import { HAS_BLOCK } from '../component-managers/curly';
@@ -506,7 +506,7 @@ const LinkComponent = EmberComponent.extend({
     this.on(eventName, this, this._invoke);
   },
 
-  _routing: injectService('-routing'),
+  _routing: service('-routing'),
   _currentRoute: alias('_routing.currentRouteName'),
   _currentRouterState: alias('_routing.currentState'),
   _targetRouterState: alias('_routing.targetState'),
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 6617633306f..cf3b4f5a39e 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -8,7 +8,7 @@ import { assert, debugFreeze, deprecate, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { Maybe, Option } from '@glimmer/interfaces';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index 5be0786f4ea..ca7d8ea01d8 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -296,7 +296,7 @@
 
   ```javascript
   import Component from '@glimmer/component';
-  import { inject as service } from '@ember/service';
+  import { service } from '@ember/service';
 
   export default class SomeComponent extends Component {
     @service myAnimations;
@@ -319,7 +319,7 @@
 
   ```javascript
   import Component from '@glimmer/component';
-  import { inject as service } from '@ember/service';
+  import { service } from '@ember/service';
 
   export default class SomeComponent extends Component {
     @service myAnimations;
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index d14b9eb9cf1..a1f163da60c 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -97,7 +97,7 @@ let Helper = FrameworkObject.extend({
 
     ```app/helpers/current-user-email.js
     import Helper from '@ember/component/helper'
-    import { inject as service } from '@ember/service'
+    import { service } from '@ember/service'
     import { observer } from '@ember/object'
 
     export default Helper.extend({
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 2a2315b5b6d..04f98d7706e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -271,7 +271,7 @@ export const ACTIONS = new _WeakSet();
 
   ```app/controllers/application.js
   import Controller from '@ember/controller';
-  import { inject as service } from '@ember/service';
+  import { service } from '@ember/service';
 
   export default class extends Controller {
     @service someService;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
index deb0e45f838..98cbbcf9f7b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/helper-registration-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import Controller from '@ember/controller';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { Helper, helper } from '@ember/-internals/glimmer';
 
 moduleFor(
@@ -92,7 +92,7 @@ moduleFor(
       this.add(
         'helper:full-name',
         Helper.extend({
-          nameBuilder: injectService('name-builder'),
+          nameBuilder: service('name-builder'),
           compute() {
             this.get('nameBuilder').build();
           },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js
index 8b617405363..0fee258a11b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js
@@ -1,7 +1,7 @@
 import { moduleFor, ApplicationTestCase, strip, runTask } from 'internal-test-helpers';
 
 import { ENV } from '@ember/-internals/environment';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { Component, Helper } from '@ember/-internals/glimmer';
 import { expect } from '@glimmer/util';
 
@@ -59,7 +59,7 @@ moduleFor(
       this.add(
         'helper:hot-reload',
         Helper.extend({
-          reloader: injectService(),
+          reloader: service(),
 
           init() {
             this._super(...arguments);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 5fdd2305aff..759a7e7b347 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -12,7 +12,7 @@ import {
 import { run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { alias, set, get, observer, on, computed, tracked } from '@ember/-internals/metal';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
@@ -2855,13 +2855,13 @@ moduleFor(
     }
 
     ['@test services can be injected into components']() {
-      let service;
+      let serviceInstance;
       this.registerService(
         'name',
         Service.extend({
           init() {
             this._super(...arguments);
-            service = this;
+            serviceInstance = this;
           },
           last: 'Jackson',
         })
@@ -2869,7 +2869,7 @@ moduleFor(
 
       this.registerComponent('foo-bar', {
         ComponentClass: Component.extend({
-          name: injectService(),
+          name: service(),
         }),
         template: '{{this.name.last}}',
       });
@@ -2883,13 +2883,13 @@ moduleFor(
       this.assertText('Jackson');
 
       runTask(() => {
-        service.set('last', 'McGuffey');
+        serviceInstance.set('last', 'McGuffey');
       });
 
       this.assertText('McGuffey');
 
       runTask(() => {
-        service.set('last', 'Jackson');
+        serviceInstance.set('last', 'Jackson');
       });
 
       this.assertText('Jackson');
@@ -2898,7 +2898,7 @@ moduleFor(
     ['@test injecting an unknown service raises an exception']() {
       this.registerComponent('foo-bar', {
         ComponentClass: Component.extend({
-          missingService: injectService(),
+          missingService: service(),
         }),
       });
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 2a6b15ad250..6f2d831d59b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -4,7 +4,7 @@ import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { tracked, set } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
 import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
-import Service, { inject as service } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { registerDestructor } from '@glimmer/destroyable';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index ad77d25c2ba..1b27d3b7990 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -4,7 +4,7 @@ import { Helper, helper, Component as EmberComponent } from '@ember/-internals/g
 import { tracked, set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { EMBER_GLIMMER_INVOKE_HELPER, EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
-import Service, { inject as service } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
 import { destroy, isDestroyed, registerDestructor } from '@glimmer/destroyable';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index d21570e7ca4..5e74332aff2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -6,7 +6,7 @@ import {
   nativeDescDecorator as descriptor,
   notifyPropertyChange,
 } from '@ember/-internals/metal';
-import Service, { inject } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
 import { backtrackingMessageFor } from '../../utils/debug-stack';
@@ -293,7 +293,7 @@ moduleFor(
 
       this.registerComponent('person', {
         ComponentClass: Component.extend({
-          currentUser: inject('current-user'),
+          currentUser: service('current-user'),
         }),
 
         template: strip`
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 45277839f25..2db44fe45ae 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -33,7 +33,7 @@ function cleanURL(url: string, rootURL: string) {
    ```app/components/example.js
    import Component from '@glimmer/component';
    import { action } from '@ember/object';
-   import { inject as service } from '@ember/service';
+   import { service } from '@ember/service';
 
    export default class ExampleComponent extends Component {
      @service router;
@@ -85,7 +85,7 @@ export default class RouterService extends Service {
      ```app/components/example.js
      import Component from '@glimmer/component';
      import { action } from '@ember/object';
-     import { inject as service } from '@ember/service';
+     import { service } from '@ember/service';
 
      export default class extends Component {
        @service router;
@@ -184,7 +184,7 @@ export default class RouterService extends Service {
 
     ```app/components/copy-link.js
     import Component from '@glimmer/component';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
     import { action } from '@ember/object';
 
     export default class CopyLinkComponent extends Component {
@@ -211,7 +211,7 @@ export default class RouterService extends Service {
 
     ```app/components/copy-link.js
     import Component from '@glimmer/component';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
     import { action } from '@ember/object';
 
     export default class CopyLinkComponent extends Component {
@@ -254,7 +254,7 @@ export default class RouterService extends Service {
 
      ```app/components/posts.js
      import Component from '@glimmer/component';
-     import { inject as service } from '@ember/service';
+     import { service } from '@ember/service';
 
      export default class extends Component {
        @service router;
@@ -270,7 +270,7 @@ export default class RouterService extends Service {
 
      ```app/components/posts.js
      import Component from '@glimmer/component';
-     import { inject as service } from '@ember/service';
+     import { service } from '@ember/service';
 
      export default class extends Component {
        @service router;
@@ -354,7 +354,7 @@ export default class RouterService extends Service {
 
      ```
      import Component from '@ember/component';
-     import { inject as service } from '@ember/service';
+     import { service } from '@ember/service';
 
      export default class extends Component {
        @service router;
@@ -414,7 +414,7 @@ export default class RouterService extends Service {
 
     ```app/routes/contact-form.js
     import Route from '@ember/routing';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
 
     export default class extends Route {
       @service router;
@@ -448,7 +448,7 @@ export default class RouterService extends Service {
 
     ```app/routes/contact-form.js
     import Route from '@ember/routing';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
 
     export default class extends Route {
       @service router;
@@ -656,7 +656,7 @@ RouterService.reopen(Evented, {
     Usage example:
     ```app/components/header.js
       import Component from '@glimmer/component';
-      import { inject as service } from '@ember/service';
+      import { service } from '@ember/service';
       import { notEmpty } from '@ember/object/computed';
 
       export default class extends Component {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index f227374be15..df8778be0bc 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1680,7 +1680,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
     ```app/routes/application.js
     import Route from '@ember/routing/route';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
 
     export default class ApplicationRoute extends Route {
       @service router
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index cb6a6d4ece7..07245e09051 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1387,7 +1387,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     ```javascript
     import config from './config/environment';
     import EmberRouter from '@ember/routing/router';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
 
     let Router = EmberRouter.extend({
       location: config.locationType,
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index b2c5edc4206..203c0d01b5d 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -1,6 +1,6 @@
 import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import EmberRoute from '../../lib/system/route';
 import { defineProperty } from '../../../metal';
@@ -321,7 +321,7 @@ moduleFor(
       owner.register(
         'route:application',
         EmberRoute.extend({
-          authService: injectService('auth'),
+          authService: service('auth'),
         })
       );
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index 5a5faa60012..a48ff2a8466 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -1,7 +1,7 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
-import Service, { inject as service } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
 import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index 38f9406471a..b9684d42184 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -1039,7 +1039,7 @@ const Application = Engine.extend({
 
     ```app/routes/post.js
     import Route from '@ember/routing/route';
-    import { inject as service } from '@ember/service';
+    import { service } from '@ember/service';
 
     // An example of how the (hypothetical) service is used in routes.
 
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index 7fe0babca5e..d6841bbb08f 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -4,7 +4,7 @@ import {
   ApplicationTestCase,
   runTask,
 } from 'internal-test-helpers';
-import { inject as injectService } from '@ember/service';
+import { service } from '@ember/service';
 import { Object as EmberObject, RSVP, onerrorDefault } from '@ember/-internals/runtime';
 import { later } from '@ember/runloop';
 import Application from '@ember/application';
@@ -683,8 +683,8 @@ moduleFor(
         Component.extend({
           tagName: 'x-foo',
 
-          isolatedCounter: injectService(),
-          sharedCounter: injectService(),
+          isolatedCounter: service(),
+          sharedCounter: service(),
 
           init() {
             this._super();
@@ -713,7 +713,7 @@ moduleFor(
       this.add(
         'component:x-bar',
         Component.extend({
-          counter: injectService('sharedCounter'),
+          counter: service('sharedCounter'),
 
           actions: {
             incrementCounter() {
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index 3bf7a15441b..4b99455e8bc 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -1,5 +1,5 @@
 import Controller, { inject as injectController } from '@ember/controller';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { Mixin, get } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
@@ -265,7 +265,7 @@ moduleFor(
       owner.register(
         'controller:application',
         Controller.extend({
-          authService: injectService('auth'),
+          authService: service('auth'),
         })
       );
 
diff --git a/packages/@ember/service/index.d.ts b/packages/@ember/service/index.d.ts
index 61e1eea72d7..6c3cf1d2502 100644
--- a/packages/@ember/service/index.d.ts
+++ b/packages/@ember/service/index.d.ts
@@ -1,3 +1,4 @@
 export function inject(name?: string): any;
+export function service(name?: string): any;
 declare let Service: any;
 export default Service;
diff --git a/packages/@ember/service/index.js b/packages/@ember/service/index.js
index 25f420d83bf..4fd9f25d8d6 100644
--- a/packages/@ember/service/index.js
+++ b/packages/@ember/service/index.js
@@ -6,6 +6,20 @@ import { inject as metalInject } from '@ember/-internals/metal';
  @public
  */
 
+/**
+  @method inject
+  @static
+  @since 1.10.0
+  @for @ember/service
+  @param {String} name (optional) name of the service to inject, defaults to
+         the property's name
+  @return {ComputedDecorator} injection decorator instance
+  @public
+*/
+export function inject() {
+  return metalInject('service', ...arguments);
+}
+
 /**
   Creates a property that lazily looks up a service in the container. There are
   no restrictions as to what objects a service can be injected into.
@@ -14,7 +28,7 @@ import { inject as metalInject } from '@ember/-internals/metal';
 
   ```app/routes/application.js
   import Route from '@ember/routing/route';
-  import { inject as service } from '@ember/service';
+  import { service } from '@ember/service';
 
   export default class ApplicationRoute extends Route {
     @service('auth') authManager;
@@ -29,7 +43,7 @@ import { inject as metalInject } from '@ember/-internals/metal';
 
   ```app/routes/application.js
   import Route from '@ember/routing/route';
-  import { inject as service } from '@ember/service';
+  import { service } from '@ember/service';
 
   export default Route.extend({
     authManager: service('auth'),
@@ -44,16 +58,16 @@ import { inject as metalInject } from '@ember/-internals/metal';
   that looks up the `auth` service in the container, making it easily accessible
   in the `model` hook.
 
-  @method inject
+  @method service
   @static
-  @since 1.10.0
+  @since 4.1.0
   @for @ember/service
   @param {String} name (optional) name of the service to inject, defaults to
          the property's name
   @return {ComputedDecorator} injection decorator instance
   @public
 */
-export function inject() {
+export function service() {
   return metalInject('service', ...arguments);
 }
 
diff --git a/packages/@ember/service/tests/service_test.js b/packages/@ember/service/tests/service_test.js
index fcc84b62676..5c07fafae4a 100644
--- a/packages/@ember/service/tests/service_test.js
+++ b/packages/@ember/service/tests/service_test.js
@@ -1,4 +1,4 @@
-import Service, { inject as injectService } from '@ember/service';
+import Service, { inject, service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { buildOwner } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
@@ -12,7 +12,7 @@ moduleFor(
       class MainService extends Service {}
 
       class Foo extends EmberObject {
-        @injectService('main') main;
+        @inject('main') main;
       }
 
       owner.register('service:main', MainService);
@@ -29,7 +29,46 @@ moduleFor(
       class MainService extends Service {}
 
       class Foo extends EmberObject {
-        @injectService main;
+        @inject main;
+      }
+
+      owner.register('service:main', MainService);
+      owner.register('foo:main', Foo);
+
+      let foo = owner.lookup('foo:main');
+
+      assert.ok(foo.main instanceof Service, 'service injected correctly');
+    }
+  }
+);
+
+moduleFor(
+  'service - decorator',
+  class extends AbstractTestCase {
+    ['@test works with native decorators'](assert) {
+      let owner = buildOwner();
+
+      class MainService extends Service {}
+
+      class Foo extends EmberObject {
+        @service('main') main;
+      }
+
+      owner.register('service:main', MainService);
+      owner.register('foo:main', Foo);
+
+      let foo = owner.lookup('foo:main');
+
+      assert.ok(foo.main instanceof Service, 'service injected correctly');
+    }
+
+    ['@test uses the decorated property key if not provided'](assert) {
+      let owner = buildOwner();
+
+      class MainService extends Service {}
+
+      class Foo extends EmberObject {
+        @service main;
       }
 
       owner.register('service:main', MainService);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index e1750535291..7161a89e2cd 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -30,7 +30,7 @@ import {
   underscore,
   w,
 } from '@ember/string';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 
 import { action, computed } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
@@ -340,7 +340,7 @@ Ember.inject = function inject() {
       .join(' or ')}'`
   );
 };
-Ember.inject.service = injectService;
+Ember.inject.service = service;
 Ember.inject.controller = injectController;
 
 Ember.Array = EmberArray;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index b54a434df1d..80ceba86a97 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -310,7 +310,7 @@ let allExports = [
 
   // @ember/service
   ['Service', '@ember/service', 'default'],
-  ['inject.service', '@ember/service', 'inject'],
+  ['inject.service', '@ember/service', 'service'],
 
   // @ember/string
   ['String.camelize', '@ember/string', 'camelize'],
diff --git a/packages/ember/tests/routing/query_params_test/shared_state_test.js b/packages/ember/tests/routing/query_params_test/shared_state_test.js
index 8bcc144d985..1a195b6fe20 100644
--- a/packages/ember/tests/routing/query_params_test/shared_state_test.js
+++ b/packages/ember/tests/routing/query_params_test/shared_state_test.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { run } from '@ember/runloop';
 import { QueryParamTestCase, moduleFor } from 'internal-test-helpers';
 
@@ -27,14 +27,14 @@ moduleFor(
       this.add(
         'controller:home',
         Controller.extend({
-          filters: injectService(),
+          filters: service(),
         })
       );
 
       this.add(
         'controller:dashboard',
         Controller.extend({
-          filters: injectService(),
+          filters: service(),
           queryParams: [{ 'filters.shared': 'shared' }],
         })
       );
diff --git a/packages/ember/tests/routing/router_service_test/basic_test.js b/packages/ember/tests/routing/router_service_test/basic_test.js
index 818b5fbe5a3..a3dd983f08f 100644
--- a/packages/ember/tests/routing/router_service_test/basic_test.js
+++ b/packages/ember/tests/routing/router_service_test/basic_test.js
@@ -1,7 +1,7 @@
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import { set } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
-import { inject as injectService } from '@ember/service';
+import { service } from '@ember/service';
 
 moduleFor(
   'Router Service - main',
@@ -156,7 +156,7 @@ moduleFor(
       assert.expect(1);
 
       this.router.reopen({
-        routerService: injectService('router'),
+        routerService: service('router'),
         init() {
           this.routerService.one('routeDidChange', () => {
             assert.ok(true, 'routeDidChange event listener called');
diff --git a/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js b/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
index 8efb7e51431..3c0a9483800 100644
--- a/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
+++ b/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
@@ -1,5 +1,5 @@
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { Route } from '@ember/-internals/routing';
 
 moduleFor(
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index 36fb5c2598f..2c27c1cdaeb 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -1,4 +1,4 @@
-import { inject as injectService } from '@ember/service';
+import { service } from '@ember/service';
 import { readOnly } from '@ember/object/computed';
 import { Component } from '@ember/-internals/glimmer';
 import { Route } from '@ember/-internals/routing';
@@ -10,7 +10,7 @@ let results = [];
 let ROUTE_NAMES = ['index', 'child', 'sister', 'brother', 'loading'];
 
 let InstrumentedRoute = Route.extend({
-  routerService: injectService('router'),
+  routerService: service('router'),
 
   init() {
     this._super(...arguments);
@@ -122,7 +122,7 @@ moduleFor(
       });
 
       let CurrenURLComponent = Component.extend({
-        routerService: injectService('router'),
+        routerService: service('router'),
         currentURL: readOnly('routerService.currentURL'),
         currentRouteName: readOnly('routerService.currentRouteName'),
         currentRoute: readOnly('routerService.currentRoute'),
diff --git a/packages/ember/tests/routing/router_service_test/events_test.js b/packages/ember/tests/routing/router_service_test/events_test.js
index 20131502ef5..5b36af5f350 100644
--- a/packages/ember/tests/routing/router_service_test/events_test.js
+++ b/packages/ember/tests/routing/router_service_test/events_test.js
@@ -1,5 +1,5 @@
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { Route } from '@ember/-internals/routing';
 import { later } from '@ember/runloop';
 
diff --git a/packages/ember/tests/routing/router_service_test/isActive_test.js b/packages/ember/tests/routing/router_service_test/isActive_test.js
index 18021cf519f..69f35527e8a 100644
--- a/packages/ember/tests/routing/router_service_test/isActive_test.js
+++ b/packages/ember/tests/routing/router_service_test/isActive_test.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
-import Service, { inject as service } from '@ember/service';
+import Service, { service } from '@ember/service';
 
 moduleFor(
   'Router Service - isActive',
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index f24f24b8e00..2e33cc9fad3 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -1,4 +1,4 @@
-import { inject as injectService } from '@ember/service';
+import { service } from '@ember/service';
 import { Router, NoneLocation } from '@ember/-internals/routing';
 import { get } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
@@ -83,7 +83,7 @@ moduleFor(
 
       this.addComponent('foo-bar', {
         ComponentClass: Component.extend({
-          routerService: injectService('router'),
+          routerService: service('router'),
           init() {
             this._super(...arguments);
             componentInstance = this;
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index 7b6e23d96a5..fc94312b6af 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -1,4 +1,4 @@
-import { inject as injectService } from '@ember/service';
+import { service } from '@ember/service';
 import { Component } from '@ember/-internals/glimmer';
 import { Route, NoneLocation } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
@@ -6,7 +6,6 @@ import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { InternalTransition as Transition } from 'router_js';
-import { inject as service } from '@ember/service';
 
 moduleFor(
   'Router Service - transitionTo',
@@ -103,7 +102,7 @@ moduleFor(
 
       this.addComponent('foo-bar', {
         ComponentClass: Component.extend({
-          routerService: injectService('router'),
+          routerService: service('router'),
           init() {
             this._super();
             componentInstance = this;
@@ -135,7 +134,7 @@ moduleFor(
 
       this.addComponent('foo-bar', {
         ComponentClass: Component.extend({
-          routerService: injectService('router'),
+          routerService: service('router'),
           init() {
             this._super();
             componentInstance = this;
@@ -169,7 +168,7 @@ moduleFor(
 
       this.addComponent('foo-bar', {
         ComponentClass: Component.extend({
-          routerService: injectService('router'),
+          routerService: service('router'),
           init() {
             this._super();
             componentInstance = this;
@@ -214,7 +213,7 @@ moduleFor(
 
       this.addComponent('foo-bar', {
         ComponentClass: Component.extend({
-          routerService: injectService('router'),
+          routerService: service('router'),
           init() {
             this._super();
             componentInstance = this;
diff --git a/packages/ember/tests/service_injection_test.js b/packages/ember/tests/service_injection_test.js
index 280f7f81e0e..cd267732837 100644
--- a/packages/ember/tests/service_injection_test.js
+++ b/packages/ember/tests/service_injection_test.js
@@ -1,6 +1,6 @@
 import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
-import Service, { inject as injectService } from '@ember/service';
+import Service, { service } from '@ember/service';
 import { _ProxyMixin } from '@ember/-internals/runtime';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { computed } from '@ember/-internals/metal';
@@ -12,7 +12,7 @@ moduleFor(
       this.add(
         'controller:application',
         Controller.extend({
-          myService: injectService('my-service'),
+          myService: service('my-service'),
         })
       );
       let MyService = Service.extend();
@@ -31,7 +31,7 @@ moduleFor(
       this.add(
         'controller:application',
         Controller.extend({
-          myService: injectService('my-service'),
+          myService: service('my-service'),
         })
       );
       let MyService = Service.extend(_ProxyMixin, {
@@ -60,7 +60,7 @@ moduleFor(
       this.add(
         'controller:application',
         Controller.extend({
-          myService: injectService('my-service'),
+          myService: service('my-service'),
         })
       );
       let MyService = Service.extend({
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 3b98b3f264d..58791765c56 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -489,6 +489,7 @@ module.exports = {
     'serialize',
     'serializeQueryParam',
     'serializeQueryParamKey',
+    'service',
     'set',
     'setClassicDecorator',
     'setDiff',

From da6db350af275e7dff93e1b3a3042b2d15d5186d Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Fri, 22 Oct 2021 08:51:40 -0400
Subject: [PATCH 0682/1405] Add v3.28.3 to CHANGELOG.md.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09d73d7be1a..6e8862b96cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,10 @@
 - [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
 - [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 
+## v3.28.3 (October 22, 2021)
+
+- [#19799](https://github.com/emberjs/ember.js/pull/19799) / [glimmerjs/glimmer-vm#1354](https://github.com/glimmerjs/glimmer-vm/pull/1354) Fixes for errors while precompiling inline templates (introduced in 3.28.2)
+
 ## v3.28.2 (October 21, 2021)
 
 - [glimmerjs/glimmer-vm#1351](https://github.com/glimmerjs/glimmer-vm/pull/1351) Support lexical scope in loose mode

From 50359b0a510e5dfceb635666b804554e60a4cd34 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 7 Oct 2021 13:30:07 +0200
Subject: [PATCH 0683/1405] [DOC] Mark `replaceWith` and `replaceRoute` as
 deprecated

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 1 +
 packages/@ember/-internals/routing/lib/system/route.ts   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 74a86faa2b9..9416aa3f249 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -231,6 +231,7 @@ ControllerMixin.reopen({
     @method replaceRoute
     @return {Transition} the transition object associated with this
       attempted transition
+    @deprecated Use replaceWith from the Router service instead.
     @public
   */
   replaceRoute(...args: string[]) {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index f227374be15..fbe8ccc72b4 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1074,6 +1074,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @return {Transition} the transition object associated with this
       attempted transition
     @since 1.0.0
+    @deprecated Use replaceWith from the Router service instead.
     @public
   */
   replaceWith(...args: any[]) {

From a638631091562a0e9ecd6316cd2f628abd78b965 Mon Sep 17 00:00:00 2001
From: Thomas Wang <hi@xgwang.me>
Date: Wed, 8 Sep 2021 22:24:55 -0700
Subject: [PATCH 0684/1405] [CLEANUP beta] deprecate-router-events

---
 .../-internals/routing/lib/system/route.ts    |  48 +------
 .../-internals/routing/lib/system/router.ts   |  73 +++--------
 packages/@ember/deprecated-features/index.ts  |   1 -
 .../tests/routing/decoupled_basic_test.js     |  81 ------------
 .../router_service_test/events_test.js        | 117 ------------------
 tests/docs/expected.js                        |   2 -
 6 files changed, 18 insertions(+), 304 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index df8778be0bc..585f1735b71 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -22,8 +22,7 @@ import {
 } from '@ember/-internals/runtime';
 import { isProxy, lookupDescriptor, symbol } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
-import { assert, deprecate, info, isTesting } from '@ember/debug';
-import { ROUTER_EVENTS } from '@ember/deprecated-features';
+import { assert, info, isTesting } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { once } from '@ember/runloop';
 import { classify } from '@ember/string';
@@ -2448,49 +2447,4 @@ Route.reopen({
   },
 });
 
-export let ROUTER_EVENT_DEPRECATIONS: any;
-if (ROUTER_EVENTS) {
-  ROUTER_EVENT_DEPRECATIONS = {
-    on(name: string) {
-      this._super(...arguments);
-      let hasDidTransition = name === 'didTransition';
-      let hasWillTransition = name === 'willTransition';
-
-      if (hasDidTransition) {
-        deprecate(
-          'You attempted to listen to the "didTransition" event which is deprecated. Please inject the router service and listen to the "routeDidChange" event.',
-          false,
-          {
-            id: 'deprecate-router-events',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
-            for: 'ember-source',
-            since: {
-              enabled: '3.11.0',
-            },
-          }
-        );
-      }
-
-      if (hasWillTransition) {
-        deprecate(
-          'You attempted to listen to the "willTransition" event which is deprecated. Please inject the router service and listen to the "routeWillChange" event.',
-          false,
-          {
-            id: 'deprecate-router-events',
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
-            for: 'ember-source',
-            since: {
-              enabled: '3.11.0',
-            },
-          }
-        );
-      }
-    },
-  };
-
-  Route.reopen(ROUTER_EVENT_DEPRECATIONS);
-}
-
 export default Route;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 07245e09051..53c5d59fef3 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -6,8 +6,7 @@ import { BucketCache } from '@ember/-internals/routing';
 import RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
-import { assert, deprecate, info } from '@ember/debug';
-import { ROUTER_EVENTS } from '@ember/deprecated-features';
+import { assert, info } from '@ember/debug';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
@@ -20,7 +19,6 @@ import Route, {
   hasDefaultSerialize,
   RenderOptions,
   ROUTE_CONNECTIONS,
-  ROUTER_EVENT_DEPRECATIONS,
 } from './route';
 import RouterState from './router_state';
 
@@ -47,10 +45,6 @@ function defaultDidTransition(this: EmberRouter, infos: PrivateRouteInfo[]) {
   this.notifyPropertyChange('url');
   this.set('currentState', this.targetState);
 
-  // Put this in the runloop so url will be accurate. Seems
-  // less surprising than didTransition being out of sync.
-  once(this, this.trigger, 'didTransition');
-
   if (DEBUG) {
     // @ts-expect-error namespace isn't public
     if (this.namespace.LOG_TRANSITIONS) {
@@ -63,11 +57,8 @@ function defaultDidTransition(this: EmberRouter, infos: PrivateRouteInfo[]) {
 function defaultWillTransition(
   this: EmberRouter,
   oldInfos: PrivateRouteInfo[],
-  newInfos: PrivateRouteInfo[],
-  transition: Transition
+  newInfos: PrivateRouteInfo[]
 ) {
-  once(this, this.trigger, 'willTransition', transition);
-
   if (DEBUG) {
     // @ts-expect-error namespace isn't public
     if (this.namespace.LOG_TRANSITIONS) {
@@ -380,50 +371,22 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
         });
       }
 
+      // TODO: merge into routeDidChange
       didTransition(infos: PrivateRouteInfo[]) {
-        if (ROUTER_EVENTS) {
-          if (router.didTransition !== defaultDidTransition) {
-            deprecate(
-              'You attempted to override the "didTransition" method which is deprecated. Please inject the router service and listen to the "routeDidChange" event.',
-              false,
-              {
-                id: 'deprecate-router-events',
-                until: '4.0.0',
-                url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.11.0',
-                },
-              }
-            );
-          }
-        }
+        assert(
+          'You attempted to override the "didTransition" method which has been deprecated. Please inject the router service and listen to the "routeDidChange" event.',
+          router.didTransition === defaultDidTransition
+        );
         router.didTransition(infos);
       }
 
-      willTransition(
-        oldInfos: PrivateRouteInfo[],
-        newInfos: PrivateRouteInfo[],
-        transition: Transition
-      ) {
-        if (ROUTER_EVENTS) {
-          if (router.willTransition !== defaultWillTransition) {
-            deprecate(
-              'You attempted to override the "willTransition" method which is deprecated. Please inject the router service and listen to the "routeWillChange" event.',
-              false,
-              {
-                id: 'deprecate-router-events',
-                until: '4.0.0',
-                url: 'https://deprecations.emberjs.com/v3.x#toc_deprecate-router-events',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.11.0',
-                },
-              }
-            );
-          }
-        }
-        router.willTransition(oldInfos, newInfos, transition);
+      // TODO: merge into routeWillChange
+      willTransition(oldInfos: PrivateRouteInfo[], newInfos: PrivateRouteInfo[]) {
+        assert(
+          'You attempted to override the "willTransition" method which has been deprecated. Please inject the router service and listen to the "routeWillChange" event.',
+          router.willTransition === defaultWillTransition
+        );
+        router.willTransition(oldInfos, newInfos);
       }
 
       triggerEvent(
@@ -1406,7 +1369,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     ```
 
     @method didTransition
-    @public
+    @private
     @since 1.2.0
   */
   // Set with reopen to allow overriding via extend
@@ -1419,7 +1382,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     Triggers the router level `willTransition` hook.
 
     @method willTransition
-    @public
+    @private
     @since 1.11.0
   */
   // Set with reopen to allow overriding via extend
@@ -1649,6 +1612,7 @@ export function triggerEvent(
     if (ignoreFailure) {
       return;
     }
+    // TODO: update?
     throw new EmberError(
       `Can't trigger action '${name}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`
     );
@@ -1868,7 +1832,4 @@ EmberRouter.reopen({
   }),
 });
 
-if (ROUTER_EVENTS) {
-  EmberRouter.reopen(ROUTER_EVENT_DEPRECATIONS);
-}
 export default EmberRouter;
diff --git a/packages/@ember/deprecated-features/index.ts b/packages/@ember/deprecated-features/index.ts
index 5b93040f31c..11ded0a9acf 100644
--- a/packages/@ember/deprecated-features/index.ts
+++ b/packages/@ember/deprecated-features/index.ts
@@ -3,5 +3,4 @@
 // These versions should be the version that the deprecation was _introduced_,
 // not the version that the feature will be removed.
 
-export const ROUTER_EVENTS = !!'4.0.0';
 export const ASSIGN = !!'4.0.0-beta.1';
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 175055830b4..ce9a0b2a1b6 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -1055,59 +1055,6 @@ moduleFor(
       );
     }
 
-    ['@test Router `willTransition` hook passes in cancellable transition'](assert) {
-      assert.expect(8);
-      this.router.reopen({
-        willTransition(_, _2, transition) {
-          assert.ok(true, 'willTransition was called');
-          if (transition.intent.url !== '/') {
-            transition.abort();
-          }
-        },
-      });
-
-      this.router.map(function () {
-        this.route('nork');
-        this.route('about');
-      });
-
-      this.add(
-        'route:loading',
-        Route.extend({
-          activate() {
-            assert.ok(false, 'LoadingRoute was not entered');
-          },
-        })
-      );
-
-      this.add(
-        'route:nork',
-        Route.extend({
-          activate() {
-            assert.ok(false, 'NorkRoute was not entered');
-          },
-        })
-      );
-
-      this.add(
-        'route:about',
-        Route.extend({
-          activate() {
-            assert.ok(false, 'AboutRoute was not entered');
-          },
-        })
-      );
-
-      let deprecation = /You attempted to override the "willTransition" method which is deprecated\./;
-
-      return expectDeprecationAsync(() => {
-        return this.visit('/').then(() => {
-          this.handleURLAborts(assert, '/nork', deprecation);
-          this.handleURLAborts(assert, '/about', deprecation);
-        });
-      }, deprecation);
-    }
-
     ['@test Aborting/redirecting the transition in `willTransition` prevents LoadingRoute from being entered'](
       assert
     ) {
@@ -1197,34 +1144,6 @@ moduleFor(
       });
     }
 
-    async ['@test `didTransition` event fires on the router'](assert) {
-      assert.expect(3);
-
-      this.router.map(function () {
-        this.route('nork');
-      });
-
-      await this.visit('/');
-
-      let router = this.applicationInstance.lookup('router:main');
-      router.one('didTransition', function () {
-        assert.ok(true, 'didTransition fired on initial routing');
-      });
-
-      await this.visit('/');
-
-      router.one('didTransition', function () {
-        assert.ok(true, 'didTransition fired on the router');
-        assert.equal(
-          router.get('url'),
-          '/nork',
-          'The url property is updated by the time didTransition fires'
-        );
-      });
-
-      await this.visit('/nork');
-    }
-
     ['@test `activate` event fires on the route'](assert) {
       assert.expect(4);
 
diff --git a/packages/ember/tests/routing/router_service_test/events_test.js b/packages/ember/tests/routing/router_service_test/events_test.js
index 5b36af5f350..2f2946d184a 100644
--- a/packages/ember/tests/routing/router_service_test/events_test.js
+++ b/packages/ember/tests/routing/router_service_test/events_test.js
@@ -696,120 +696,3 @@ moduleFor(
     }
   }
 );
-
-moduleFor(
-  'Router Service - deprecated events',
-  class extends RouterTestCase {
-    '@test willTransition events are deprecated'() {
-      return this.visit('/').then(() => {
-        expectDeprecation(() => {
-          this.routerService['_router'].on('willTransition', () => {});
-        }, 'You attempted to listen to the "willTransition" event which is deprecated. Please inject the router service and listen to the "routeWillChange" event.');
-      });
-    }
-
-    async '@test willTransition events are deprecated on routes'() {
-      this.add(
-        'route:application',
-        Route.extend({
-          init() {
-            this._super(...arguments);
-            this.on('willTransition', () => {});
-          },
-        })
-      );
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'You attempted to listen to the "willTransition" event which is deprecated. Please inject the router service and listen to the "routeWillChange" event.'
-      );
-    }
-
-    async '@test didTransition events are deprecated on routes'() {
-      this.add(
-        'route:application',
-        Route.extend({
-          init() {
-            this._super(...arguments);
-            this.on('didTransition', () => {});
-          },
-        })
-      );
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'You attempted to listen to the "didTransition" event which is deprecated. Please inject the router service and listen to the "routeDidChange" event.'
-      );
-    }
-
-    '@test other events are not deprecated on routes'() {
-      this.add(
-        'route:application',
-        Route.extend({
-          init() {
-            this._super(...arguments);
-            this.on('fixx', () => {});
-          },
-        })
-      );
-      expectNoDeprecation(() => {
-        return this.visit('/');
-      });
-    }
-
-    '@test didTransition events are deprecated'() {
-      return this.visit('/').then(() => {
-        expectDeprecation(() => {
-          this.routerService['_router'].on('didTransition', () => {});
-        }, 'You attempted to listen to the "didTransition" event which is deprecated. Please inject the router service and listen to the "routeDidChange" event.');
-      });
-    }
-
-    '@test other events are not deprecated'() {
-      return this.visit('/').then(() => {
-        expectNoDeprecation(() => {
-          this.routerService['_router'].on('wat', () => {});
-        });
-      });
-    }
-  }
-);
-
-moduleFor(
-  'Router Service: deprecated willTransition hook',
-  class extends RouterTestCase {
-    get routerOptions() {
-      return {
-        willTransition() {
-          this._super(...arguments);
-          // Overrides
-        },
-      };
-    }
-
-    async '@test willTransition hook is deprecated'() {
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'You attempted to override the "willTransition" method which is deprecated. Please inject the router service and listen to the "routeWillChange" event.'
-      );
-    }
-  }
-);
-moduleFor(
-  'Router Service: deprecated didTransition hook',
-  class extends RouterTestCase {
-    get routerOptions() {
-      return {
-        didTransition() {
-          this._super(...arguments);
-          // Overrides
-        },
-      };
-    }
-
-    async '@test didTransition hook is deprecated'() {
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'You attempted to override the "didTransition" method which is deprecated. Please inject the router service and listen to the "routeDidChange" event.'
-      );
-    }
-  }
-);
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 58791765c56..99454eb58d1 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -182,7 +182,6 @@ module.exports = {
     'didInsertElement',
     'didReceiveAttrs',
     'didRender',
-    'didTransition',
     'didUpdate',
     'didUpdateAttrs',
     'disabled',
@@ -573,7 +572,6 @@ module.exports = {
     'willDestroyElement',
     'willInsertElement',
     'willRender',
-    'willTransition',
     'willUpdate',
     'without',
     'wrap',

From 9446348aef3fadd66c1647fd4dbc4d08bf6c39a0 Mon Sep 17 00:00:00 2001
From: Thomas Wang <hi@xgwang.me>
Date: Wed, 8 Sep 2021 22:58:52 -0700
Subject: [PATCH 0685/1405] add docs/expected back

---
 tests/docs/expected.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 99454eb58d1..58791765c56 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -182,6 +182,7 @@ module.exports = {
     'didInsertElement',
     'didReceiveAttrs',
     'didRender',
+    'didTransition',
     'didUpdate',
     'didUpdateAttrs',
     'disabled',
@@ -572,6 +573,7 @@ module.exports = {
     'willDestroyElement',
     'willInsertElement',
     'willRender',
+    'willTransition',
     'willUpdate',
     'without',
     'wrap',

From a076e8521d31fcc46c6fc9ff80281f153e106d30 Mon Sep 17 00:00:00 2001
From: Thomas Wang <hi@xgwang.me>
Date: Sat, 11 Sep 2021 12:24:55 -0700
Subject: [PATCH 0686/1405] removed used test code

---
 .../tests/routing/decoupled_basic_test.js     | 14 ++--------
 .../ember/tests/routing/model_loading_test.js | 27 -------------------
 .../tests/routing/template_rendering_test.js  | 27 -------------------
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index ce9a0b2a1b6..2383ffef257 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -52,20 +52,10 @@ moduleFor(
       console.error = originalConsoleError;
     }
 
-    handleURLAborts(assert, path, deprecated) {
+    handleURLAborts(assert, path) {
       run(() => {
         let router = this.applicationInstance.lookup('router:main');
-        let result;
-
-        if (deprecated !== undefined) {
-          expectDeprecation(() => {
-            result = router.handleURL(path);
-          });
-        } else {
-          result = router.handleURL(path);
-        }
-
-        result.then(
+        router.handleURL(path).then(
           function () {
             assert.ok(false, 'url: `' + path + '` was NOT to be handled');
           },
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 81f4bc23186..557f27924aa 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -29,33 +29,6 @@ moduleFor(
       console.error = originalConsoleError;
     }
 
-    handleURLAborts(assert, path, deprecated) {
-      run(() => {
-        let router = this.applicationInstance.lookup('router:main');
-        let result;
-
-        if (deprecated !== undefined) {
-          expectDeprecation(() => {
-            result = router.handleURL(path);
-          });
-        } else {
-          result = router.handleURL(path);
-        }
-
-        result.then(
-          function () {
-            assert.ok(false, 'url: `' + path + '` was NOT to be handled');
-          },
-          function (reason) {
-            assert.ok(
-              reason && reason.message === 'TransitionAborted',
-              'url: `' + path + '` was to be aborted'
-            );
-          }
-        );
-      });
-    }
-
     async ['@test warn on URLs not included in the route set'](assert) {
       await this.visit('/');
 
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 842eb0e5540..47c51e049b0 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -29,33 +29,6 @@ moduleFor(
       console.error = originalConsoleError;
     }
 
-    handleURLAborts(assert, path, deprecated) {
-      run(() => {
-        let router = this.applicationInstance.lookup('router:main');
-        let result;
-
-        if (deprecated !== undefined) {
-          expectDeprecation(() => {
-            result = router.handleURL(path);
-          });
-        } else {
-          result = router.handleURL(path);
-        }
-
-        result.then(
-          function () {
-            assert.ok(false, 'url: `' + path + '` was NOT to be handled');
-          },
-          function (reason) {
-            assert.ok(
-              reason && reason.message === 'TransitionAborted',
-              'url: `' + path + '` was to be aborted'
-            );
-          }
-        );
-      });
-    }
-
     get currentPath() {
       let currentPath;
       expectDeprecation(() => {

From 73baf3d3cb46c5f645e0d6a4fed0530463366b43 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 26 Oct 2021 20:24:52 -0400
Subject: [PATCH 0687/1405] Add v4.0.0-beta.6 to CHANGELOG

(cherry picked from commit 083eac14b2aaf052654c11025230e250e7e6e9ee)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e8862b96cd..86e75fb9958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.0.0-beta.6 (October 26, 2021)
+
+- [#19799](https://github.com/emberjs/ember.js/pull/19799) / [glimmerjs/glimmer-vm#1354](https://github.com/glimmerjs/glimmer-vm/pull/1354) Fixes for errors while precompiling inline templates (introduced in 3.28.2)
+
 ### v4.0.0-beta.5 (October 11, 2021)
 
 - [#19761](https://github.com/emberjs/ember.js/pull/19761) [BREAKING] Require ember-auto-import >= 2 or higher to enable ember-source to become a v2 addon in the 4.x cycle

From 0d31f3ac85ddc802096ac0dd956017169949b3d8 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Thu, 22 Jul 2021 19:23:09 +0200
Subject: [PATCH 0688/1405] Remove jQuery from build

Removes jQuery from dependencies, the build process and test runs.
---
 bin/run-tests.js         |  6 -----
 broccoli/packages.js     |  8 -------
 ember-cli-build.js       | 10 +-------
 lib/index.js             | 50 +++++-----------------------------------
 package.json             |  5 +---
 packages/jquery/index.js |  3 ---
 tests/index.html         |  8 -------
 yarn.lock                |  5 ----
 8 files changed, 8 insertions(+), 87 deletions(-)
 delete mode 100644 packages/jquery/index.js

diff --git a/bin/run-tests.js b/bin/run-tests.js
index d7cf15c0899..c414b603ec0 100755
--- a/bin/run-tests.js
+++ b/bin/run-tests.js
@@ -61,12 +61,6 @@ function generateTestsFor(packageName) {
   testFunctions.push(() => run('package=' + packageName + '&edition=classic'));
   testFunctions.push(() => run('package=' + packageName + '&prebuilt=true'));
   testFunctions.push(() => run('package=' + packageName + '&enableoptionalfeatures=true'));
-
-  // TODO: this should ultimately be deleted (when all packages can run with and
-  // without jQuery)
-  if (packageName !== 'ember') {
-    testFunctions.push(() => run('package=' + packageName + '&jquery=none'));
-  }
 }
 
 function generateEachPackageTests() {
diff --git a/broccoli/packages.js b/broccoli/packages.js
index ab8f37c035f..7c19582105f 100644
--- a/broccoli/packages.js
+++ b/broccoli/packages.js
@@ -34,14 +34,6 @@ module.exports.routerES = function _routerES() {
   });
 };
 
-module.exports.jquery = function _jquery() {
-  return new Funnel(findLib('jquery'), {
-    files: ['jquery.js'],
-    destDir: 'jquery',
-    annotation: 'jquery',
-  });
-};
-
 module.exports.loader = function _loader() {
   return new Funnel('packages/loader/lib', {
     files: ['index.js'],
diff --git a/ember-cli-build.js b/ember-cli-build.js
index d7587989b7c..5c92e7a6152 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -14,7 +14,6 @@ Error.stackTraceLimit = Infinity;
 
 const {
   routerES,
-  jquery,
   loader,
   qunit,
   handlebarsES,
@@ -249,14 +248,7 @@ function templateCompilerBundle(emberPackages, transpileTree) {
 }
 
 function testHarness() {
-  return new MergeTrees([
-    emptyTestem(),
-    testPolyfills(),
-    testIndexHTML(),
-    loader(),
-    qunit(),
-    jquery(),
-  ]);
+  return new MergeTrees([emptyTestem(), testPolyfills(), testIndexHTML(), loader(), qunit()]);
 }
 
 function emptyTestem() {
diff --git a/lib/index.js b/lib/index.js
index 406ac88e808..778268f5618 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -3,7 +3,6 @@
 const MergeTrees = require('broccoli-merge-trees');
 const Funnel = require('broccoli-funnel');
 const path = require('path');
-const resolve = require('resolve');
 const concatBundle = require('./concat-bundle');
 const buildDebugMacroPlugin = require('./build-debug-macro-plugin');
 const buildStripClassCallcheckPlugin = require('./build-strip-class-callcheck-plugin');
@@ -33,7 +32,6 @@ function add(paths, name, path) {
 add(paths, 'prod', 'vendor/ember/ember.js');
 add(paths, 'debug', 'vendor/ember/ember.js');
 add(paths, 'testing', 'vendor/ember/ember-testing.js');
-add(paths, 'jquery', 'vendor/ember/jquery/jquery.js');
 
 add(
   absolutePaths,
@@ -95,25 +93,6 @@ module.exports = {
         );
       }
 
-      if (
-        optionalFeaturesMissing ||
-        typeof optionalFeatures.isFeatureExplicitlySet !== 'function'
-      ) {
-        message.push(
-          '* Unable to detect if jquery-integration is explicitly set to a value, please update `@ember/optional-features` to the latest version'
-        );
-      }
-
-      if (
-        optionalFeaturesMissing ||
-        (typeof optionalFeatures.isFeatureExplicitlySet === 'function' &&
-          !optionalFeatures.isFeatureExplicitlySet('jquery-integration'))
-      ) {
-        message.push(
-          `* The jquery-integration optional feature should be explicitly set to a value under Octane, run \`ember feature:disable jquery-integration\` to disable it, or \`ember feature:enable jquery-integration\` to explicitly enable it`
-        );
-      }
-
       if (
         optionalFeaturesMissing ||
         optionalFeatures.isFeatureEnabled('application-template-wrapper')
@@ -165,11 +144,12 @@ module.exports = {
     }
 
     this._jqueryIntegrationEnabled =
-      optionalFeaturesMissing || optionalFeatures.isFeatureEnabled('jquery-integration');
+      !optionalFeaturesMissing && optionalFeatures.isFeatureEnabled('jquery-integration');
 
     if (this._jqueryIntegrationEnabled) {
-      this.ui.writeWarnLine(
-        'Setting the `jquery-integration` optional feature flag to `true`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `false`. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
+      const SilentError = require('silent-error');
+      throw new SilentError(
+        'Setting the `jquery-integration` optional feature flag to `true` was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `false`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
       );
     }
   },
@@ -237,10 +217,7 @@ module.exports = {
       false
     );
 
-    let exclude = [
-      isProduction ? 'ember-testing/**' : null,
-      !this._jqueryIntegrationEnabled ? 'jquery' : null,
-    ].filter((value) => value !== null);
+    let exclude = isProduction ? ['ember-testing/**'] : [];
 
     let emberFiles = new MergeTrees([new Funnel(packages, { exclude }), dependencies, headerFiles]);
 
@@ -270,21 +247,6 @@ module.exports = {
   },
 
   treeForVendor(tree) {
-    let jqueryPath;
-
-    try {
-      jqueryPath = path.dirname(
-        resolve.sync('jquery/package.json', { basedir: this.project.root })
-      );
-    } catch (error) {
-      jqueryPath = path.dirname(require.resolve('jquery/package.json'));
-    }
-
-    let jquery = new Funnel(jqueryPath + '/dist', {
-      destDir: 'ember/jquery',
-      files: ['jquery.js'],
-    });
-
     let templateCompiler = new Funnel(tree, {
       destDir: 'ember',
       include: ['ember-template-compiler.js', 'ember-template-compiler.map'],
@@ -319,6 +281,6 @@ module.exports = {
       });
     }
 
-    return debugTree(new MergeTrees([ember, templateCompiler, jquery]), 'vendor:final');
+    return debugTree(new MergeTrees([ember, templateCompiler]), 'vendor:final');
   },
 };
diff --git a/package.json b/package.json
index 333add565c1..b680eb19dab 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,7 @@
   "name": "ember-source",
   "version": "4.1.0-alpha.2",
   "description": "A JavaScript framework for creating ambitious web applications",
-  "keywords": [
-    "ember-addon"
-  ],
+  "keywords": ["ember-addon"],
   "homepage": "https://emberjs.com/",
   "bugs": {
     "url": "https://github.com/emberjs/ember.js/issues"
@@ -69,7 +67,6 @@
     "ember-cli-version-checker": "^5.1.1",
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.13.1",
-    "jquery": "^3.5.1",
     "resolve": "^1.17.0",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1"
diff --git a/packages/jquery/index.js b/packages/jquery/index.js
deleted file mode 100644
index c8317ec057c..00000000000
--- a/packages/jquery/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { jQuery } from '@ember/-internals/views';
-
-export default jQuery;
diff --git a/tests/index.html b/tests/index.html
index 663d9d1cb8d..0b8c9edf069 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -29,14 +29,6 @@
       // Close the script tag to make sure document.write happens
     </script>
 
-    <script type="text/javascript">
-      // Fallback to default jQuery
-      if (jQueryVersion !== 'none' && !window.jQuery) {
-        loadScript('./jquery/jquery.js');
-      }
-      // Close the script tag to make sure document.write happens
-    </script>
-
     <script>
       (function() {
         window.EmberENV = window.EmberENV || {};
diff --git a/yarn.lock b/yarn.lock
index bd8528f468d..f41646af38e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7812,11 +7812,6 @@ jmespath@0.15.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
   integrity "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="
 
-jquery@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
-  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
-
 js-reporters@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.3.tgz#8febcab370539df62e09b95da133da04b11f6168"

From 3a5d028ef3bb81fc0894ca2eb066407c136b3775 Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 24 Sep 2021 10:26:10 +0200
Subject: [PATCH 0689/1405] Fix `hideskipped` QUnit param, refactoring jQuery
 implementation

---
 tests/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/index.html b/tests/index.html
index 0b8c9edf069..943de2a844d 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -126,7 +126,7 @@
           testsTotal = testsPassed = testsFailed = 0;
 
           if (QUnit.urlParams.hideskipped) {
-            $('#qunit-tests').addClass('hideskipped');
+            document.getElementById('qunit-tests').classList.add('hideskipped');
           }
         });
 

From 52413c2e5d7eb397ae0c0b5ec2cfe26b8b18cdec Mon Sep 17 00:00:00 2001
From: simonihmig <simon.ihmig@kaliber5.de>
Date: Fri, 24 Sep 2021 10:40:12 +0200
Subject: [PATCH 0690/1405] Fix `jquery-integration` optional feature flag to
 only throw when explicitly enabled.

---
 lib/index.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 778268f5618..517ed26abbe 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -63,7 +63,6 @@ module.exports = {
   name: 'ember-source',
   paths,
   absolutePaths,
-  _jqueryIntegrationEnabled: true,
   _overrideTree: undefined,
 
   included() {
@@ -143,10 +142,12 @@ module.exports = {
       }
     }
 
-    this._jqueryIntegrationEnabled =
-      !optionalFeaturesMissing && optionalFeatures.isFeatureEnabled('jquery-integration');
-
-    if (this._jqueryIntegrationEnabled) {
+    if (
+      !optionalFeaturesMissing &&
+      optionalFeatures.isFeatureEnabled('jquery-integration') &&
+      typeof optionalFeatures.isFeatureExplicitlySet === 'function' &&
+      optionalFeatures.isFeatureExplicitlySet('jquery-integration')
+    ) {
       const SilentError = require('silent-error');
       throw new SilentError(
         'Setting the `jquery-integration` optional feature flag to `true` was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `false`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'

From 8409dd76c50ab4d29922d378f1d7bb3fe71bec57 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Thu, 28 Oct 2021 11:59:47 -0700
Subject: [PATCH 0691/1405] Remove some jQuery examples from comments

---
 CONTRIBUTING.md                               |  4 ----
 .../-internals/glimmer/lib/component.ts       | 17 -----------------
 .../glimmer/lib/components/checkbox.ts        |  2 +-
 packages/@ember/-internals/utils/lib/guid.ts  |  9 +++------
 .../views/lib/mixins/view_support.js          |  8 ++++----
 .../@ember/application/lib/application.js     | 16 +++++++---------
 packages/@ember/engine/index.js               |  3 +--
 packages/ember/index.js                       | 19 ++++++-------------
 tests/docs/expected.js                        |  1 -
 tests/index.html                              |  9 ---------
 10 files changed, 22 insertions(+), 66 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f3dc7d00eb9..9ec3c87fced 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,10 +141,6 @@ example:
 
 To test multiple packages, you can separate them with commas.
 
-You can also pass `jquery=VERSION` in the test URL to test different
-versions of jQuery. You can also pass `jquery=none` to run tests without jQuery
-integration.
-
 ## From the CLI
 
 Run `yarn test` to run a basic test suite or run `TEST_SUITE=all yarn test` to
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index e856100fa9d..b96711ad47f 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1000,23 +1000,6 @@ const Component = CoreView.extend(
       @private
     */
 
-    /**
-      Returns a jQuery object for this component's element. If you pass in a selector
-      string, this method will return a jQuery object, using the current element
-      as its buffer.
-
-      For example, calling `component.$('li')` will return a jQuery object containing
-      all of the `li` elements inside the DOM element of this component.
-
-      Please note that jQuery integration is off by default and this feature will
-      not work properly. To enable this feature, you can read the instructions in
-      the [jquery-integration optional feature guide](https://guides.emberjs.com/release/configuring-ember/optional-features/#toc_jquery-integration).
-      @method $
-      @param {String} [selector] a jQuery-compatible selector string
-      @return {jQuery} the jQuery object for the DOM node
-      @public
-    */
-
     /**
       The HTML `id` of the component's element in the DOM. You can provide this
       value yourself but it must be unique (just as in HTML):
diff --git a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
index d9a39d50e49..c2a781c4d92 100644
--- a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
@@ -21,7 +21,7 @@ import layout from '../templates/empty';
   The `checked` attribute of an `Checkbox` object should always be set
   through the Ember object or by interacting with its rendered element
   representation via the mouse, keyboard, or touch. Updating the value of the
-  checkbox via jQuery will result in the checked value of the object and its
+  checkbox programmatically will result in the checked value of the object and its
   element losing synchronization.
 
   ## Layout and LayoutName properties
diff --git a/packages/@ember/-internals/utils/lib/guid.ts b/packages/@ember/-internals/utils/lib/guid.ts
index 3bf3c89069e..58db63d988f 100644
--- a/packages/@ember/-internals/utils/lib/guid.ts
+++ b/packages/@ember/-internals/utils/lib/guid.ts
@@ -6,9 +6,6 @@ import { isObject } from './spec';
 */
 
 /**
- Previously we used `Ember.$.uuid`, however `$.uuid` has been removed from
- jQuery master. We'll just bootstrap our own uuid now.
-
  @private
  @return {Number} the uuid
  */
@@ -22,7 +19,7 @@ let _uuid = 0;
  @public
  @return {Number} [description]
  */
-export function uuid() {
+export function uuid(): number {
   return ++_uuid;
 }
 
@@ -73,7 +70,7 @@ export const GUID_KEY = intern(`__ember${Date.now()}`);
     separate the guid into separate namespaces.
   @return {String} the guid
 */
-export function generateGuid(obj: object, prefix = GUID_PREFIX) {
+export function generateGuid(obj: object, prefix = GUID_PREFIX): String {
   let guid = prefix + uuid();
 
   if (isObject(obj)) {
@@ -97,7 +94,7 @@ export function generateGuid(obj: object, prefix = GUID_PREFIX) {
   @param {Object} obj any object, string, number, Element, or primitive
   @return {String} the unique guid for this instance.
 */
-export function guidFor(value: any | null | undefined) {
+export function guidFor(value: any | null | undefined): string {
   let guid;
 
   if (isObject(value)) {
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.js
index be6a88bdea2..96d44e80885 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.js
@@ -166,7 +166,7 @@ let mixin = {
    and does not have an ancestor element that is associated with an Ember view.
 
    @method appendTo
-   @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
+   @param {String|DOMElement} A selector, element, HTML string
    @return {Ember.View} receiver
    @private
    */
@@ -197,11 +197,11 @@ let mixin = {
       target = selector;
 
       assert(
-        `You tried to append to a selector string (${selector}) in an environment without jQuery`,
+        `You tried to append to a selector string (${selector}) in an environment without a DOM`,
         typeof target !== 'string'
       );
       assert(
-        `You tried to append to a non-Element (${selector}) in an environment without jQuery`,
+        `You tried to append to a non-Element (${selector}) in an environment without a DOM`,
         typeof selector.appendChild === 'function'
       );
     }
@@ -354,7 +354,7 @@ let mixin = {
    Component properties that depend on the presence of an outer element, such
    as `classNameBindings` and `attributeBindings`, do not work with tagless
    components. Tagless components cannot implement methods to handle events,
-   and have no associated jQuery object to return with `$()`.
+   and their `element` property has a `null` value.
 
    @property tagName
    @type String
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index b9684d42184..ff0c92d5c49 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -120,7 +120,7 @@ import { RouterService } from '@ember/-internals/routing';
   });
   ```
 
-  The `rootElement` can be either a DOM element or a jQuery-compatible selector
+  The `rootElement` can be either a DOM element or a CSS selector
   string. Note that *views appended to the DOM outside the root element will
   not receive events.* If you specify a custom root element, make sure you only
   append views inside it!
@@ -184,8 +184,7 @@ import { RouterService } from '@ember/-internals/routing';
 const Application = Engine.extend({
   /**
     The root DOM element of the Application. This can be specified as an
-    element or a
-    [jQuery-compatible selector string](http://api.jquery.com/category/selectors/).
+    element or a [selector string](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors#reference_table_of_selectors).
 
     This is the element that will be passed to the Application's,
     `eventDispatcher`, which sets up the listeners for event delegation. Every
@@ -548,11 +547,10 @@ const Application = Engine.extend({
 
     App.deferReadiness();
 
-    // $ is a reference to the jQuery object/function
-    import $ from 'jquery;
-
-    $.getJSON('/auth-token', function(token) {
-      App.token = token;
+    fetch('/auth-token')
+    .then(response => response.json())
+    .then(data => {
+      App.token = data.token;
       App.advanceReadiness();
     });
     ```
@@ -1000,7 +998,7 @@ const Application = Engine.extend({
     implement a limited subset of the full DOM API. The `SimpleDOM` library is known
     to work.
 
-    Since there is no access to jQuery in the non-browser environment, you must also
+    Since there is no DOM access in the non-browser environment, you must also
     specify a DOM `Element` object in the same `document` for the `rootElement` option
     (as opposed to a selector string like `"body"`).
 
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.js
index 00e76461c90..3727d65323c 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.js
@@ -339,7 +339,6 @@ Engine.reopenClass({
     Example instanceInitializer to preload data into the store.
 
     ```app/initializer/preload-data.js
-    import $ from 'jquery';
 
     export function initialize(application) {
         var userConfig, userConfigEncoded, store;
@@ -352,7 +351,7 @@ Engine.reopenClass({
         // should not be relied upon for security or authorization.
 
         // Grab the encoded data from the meta tag
-        userConfigEncoded = $('head meta[name=app-user-config]').attr('content');
+        userConfigEncoded = document.querySelector('head meta[name=app-user-config]').attr('content');
 
         // Unescape the text, then parse the resulting JSON into a real object
         userConfig = JSON.parse(unescape(userConfigEncoded));
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 7161a89e2cd..1993370b0e1 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -272,12 +272,16 @@ Ember._isDestroyed = isDestroyed;
   and reporting code.
 
   ```javascript
-  import $ from 'jquery';
 
   Ember.onerror = function(error) {
-    $.ajax('/report-error', 'POST', {
+    const payload = {
       stack: error.stack,
       otherInformation: 'whatever app state you want to provide'
+    };
+
+    fetch('/report-error', {
+      method: 'POST',
+      body: JSON.stringify(payload)
     });
   };
   ```
@@ -675,14 +679,3 @@ Ember.__loader = {
 };
 
 export default Ember;
-
-/**
- @module jquery
- @public
- */
-
-/**
- @class jquery
- @public
- @static
- */
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 58791765c56..16c014156a2 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -1,6 +1,5 @@
 module.exports = {
   classitems: [
-    '$',
     'A',
     'EXTEND_PROTOTYPES',
     'GUID_KEY',
diff --git a/tests/index.html b/tests/index.html
index 943de2a844d..d83ba2b8493 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -20,15 +20,6 @@
       };
     </script>
 
-    <script type="text/javascript">
-      // Load custom version of jQuery if possible
-      var jQueryVersion = QUnit.urlParams.jquery;
-      if (jQueryVersion && jQueryVersion !== 'none') {
-        loadScript('https://code.jquery.com/jquery-'+jQueryVersion+'.js');
-      }
-      // Close the script tag to make sure document.write happens
-    </script>
-
     <script>
       (function() {
         window.EmberENV = window.EmberENV || {};

From cd8cc90a8b8125dc9aa1ac23272b75f4d310c7d4 Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Sat, 30 Oct 2021 13:40:38 +0200
Subject: [PATCH 0692/1405] [CLEANUP beta] remove the `--test-type` option from
 the helper blueprint

Rendering tests are the recommended test type for  helpers.
---
 blueprints/helper-test/index.js               | 26 ++-----------
 .../__collection__/__name__-test.js           | 13 +------
 .../__collection__/__name__-test.js           | 13 +------
 .../__collection__/__name__-test.js           | 14 +------
 .../__collection__/__name__-test.js           | 13 +------
 .../__collection__/__name__-test.js           | 16 +-------
 node-tests/blueprints/helper-test-test.js     | 38 ++-----------------
 node-tests/blueprints/helper-test.js          |  9 -----
 .../fixtures/helper-test/mocha-0.12-unit.js   | 13 -------
 .../fixtures/helper-test/mocha-rfc232-unit.js | 12 ------
 node-tests/fixtures/helper-test/mocha-unit.js | 13 -------
 .../module-unification/addon-unit.js          | 12 ------
 .../fixtures/helper-test/rfc232-unit.js       | 13 -------
 node-tests/fixtures/helper-test/unit.js       | 12 ------
 14 files changed, 14 insertions(+), 203 deletions(-)
 delete mode 100644 node-tests/fixtures/helper-test/mocha-0.12-unit.js
 delete mode 100644 node-tests/fixtures/helper-test/mocha-rfc232-unit.js
 delete mode 100644 node-tests/fixtures/helper-test/mocha-unit.js
 delete mode 100644 node-tests/fixtures/helper-test/module-unification/addon-unit.js
 delete mode 100644 node-tests/fixtures/helper-test/rfc232-unit.js
 delete mode 100644 node-tests/fixtures/helper-test/unit.js

diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index 43a1ad7dbd3..ce26638309b 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -7,29 +7,15 @@ const semver = require('semver');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
-  description: 'Generates a helper integration test or a unit test.',
-
-  availableOptions: [
-    {
-      name: 'test-type',
-      type: ['integration', 'unit'],
-      default: 'integration',
-      aliases: [
-        { i: 'integration' },
-        { u: 'unit' },
-        { integration: 'integration' },
-        { unit: 'unit' },
-      ],
-    },
-  ],
+  description: 'Generates a helper integration test.',
 
   fileMapTokens: function () {
     return {
       __root__() {
         return 'tests';
       },
-      __testType__(options) {
-        return options.locals.testType || 'integration';
+      __testType__() {
+        return 'integration';
       },
       __collection__() {
         return 'helpers';
@@ -38,9 +24,7 @@ module.exports = useTestFrameworkDetector({
   },
 
   locals: function (options) {
-    let testType = options.testType || 'integration';
-    let testName = testType === 'integration' ? 'Integration' : 'Unit';
-    let friendlyTestName = [testName, 'Helper', options.entity.name].join(' | ');
+    let friendlyTestName = ['Integration', 'Helper', options.entity.name].join(' | ');
     let dasherizedModulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
 
     let hbsImportStatement = this._useNamedHbsImport()
@@ -48,7 +32,6 @@ module.exports = useTestFrameworkDetector({
       : "import hbs from 'htmlbars-inline-precompile';";
 
     return {
-      testType,
       friendlyTestName,
       dasherizedModulePrefix,
       hbsImportStatement,
@@ -68,7 +51,6 @@ module.exports = useTestFrameworkDetector({
   afterInstall: function (options) {
     if (
       !options.dryRun &&
-      options.testType === 'integration' &&
       !this._useNamedHbsImport() &&
       isPackageMissing(this, 'ember-cli-htmlbars-inline-precompile')
     ) {
diff --git a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
index 051de3a18f5..4176c7f7976 100644
--- a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-<% if (testType == 'integration') { %>import { describe, it } from 'mocha';
+import { describe, it } from 'mocha';
 import { setupComponentTest } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -24,15 +24,4 @@ describe('<%= friendlyTestName %>', function() {
     expect(this.$().text().trim()).to.equal('1234');
   });
 });
-<% } else if (testType == 'unit') { %>import { describe, it } from 'mocha';
-import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers/<%= dasherizedModuleName %>';
 
-describe('<%= friendlyTestName %>', function() {
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    let result = <%= camelizedModuleName %>(42);
-    expect(result).to.be.ok;
-  });
-});
-<% } %>
diff --git a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
index 89d55cf614c..554478b67fa 100644
--- a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-<% if (testType == 'integration') { %>
+
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -25,15 +25,4 @@ describeComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleNam
     });
   }
 );
-<% } else if (testType == 'unit') { %>import { describe, it } from 'mocha';
-import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers/<%= dasherizedModuleName %>';
-
-describe('<%= friendlyTestName %>', function() {
 
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    let result = <%= camelizedModuleName %>(42);
-    expect(result).to.be.ok;
-  });
-});
-<% } %>
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 9b6702f1fd8..e41eec5e35c 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-<% if (testType == 'integration') { %>import { describe, it } from 'mocha';
+import { describe, it } from 'mocha';
 import { setupRenderingTest } from 'ember-mocha';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
@@ -15,14 +15,4 @@ describe('<%= friendlyTestName %>', function() {
 
     expect(this.element.textContent.trim()).to.equal('1234');
   });
-});<% } else if (testType == 'unit') { %>import { describe, it } from 'mocha';
-import { <%= camelizedModuleName %> } from '<%= dasherizedPackageName %>/helpers/<%= dasherizedModuleName %>';
-
-describe('<%= friendlyTestName %>', function() {
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    let result = <%= camelizedModuleName %>(42);
-    expect(result).to.be.ok;
-  });
-});<% } %>
+});
diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
index 6bef509e111..ff0be722ff7 100644
--- a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,4 +1,4 @@
-<% if (testType == 'integration') { %>import { moduleForComponent, test } from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleName %>', {
@@ -12,15 +12,4 @@ test('it renders', function(assert) {
   this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
   assert.equal(this.$().text().trim(), '1234');
-});<% } else if (testType == 'unit') { %>
-import { <%= camelizedModuleName %> } from '<%= dasherizedModulePrefix %>/helpers/<%= dasherizedModuleName %>';
-import { module, test } from 'qunit';
-
-module('<%= friendlyTestName %>');
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  let result = <%= camelizedModuleName %>([42]);
-  assert.ok(result);
 });
-<% } %>
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index baf3d449ad1..a56c181516e 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,4 +1,4 @@
-<% if (testType === 'integration') { %>import { module, test } from 'qunit';
+import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
@@ -14,16 +14,4 @@ module('<%= friendlyTestName %>', function(hooks) {
 
     assert.dom(this.element).hasText('1234');
   });
-});<% } else if (testType === 'unit') { %>import { <%= camelizedModuleName %> } from '<%= dasherizedModulePrefix %>/helpers/<%= dasherizedModuleName %>';
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('<%= friendlyTestName %>', function(hooks) {
-  setupTest(hooks);
-
-  // TODO: Replace this with your real tests.
-  test('it works', function(assert) {
-    let result = <%= camelizedModuleName %>([42]);
-    assert.ok(result);
-  });
-});<% } %>
+});
diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js
index 96adcb7747c..2d9004dd9c5 100644
--- a/node-tests/blueprints/helper-test-test.js
+++ b/node-tests/blueprints/helper-test-test.js
@@ -37,8 +37,8 @@ describe('Blueprint: helper-test', function () {
         });
       });
 
-      it('helper-test foo/bar-baz --integration', function () {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--integration'], (_file) => {
+      it('helper-test foo/bar-baz', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/integration.js')
           );
@@ -62,14 +62,6 @@ describe('Blueprint: helper-test', function () {
           );
         });
       });
-
-      it('helper-test foo/bar-baz --unit', function () {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
-          expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/rfc232-unit.js')
-          );
-        });
-      });
     });
 
     describe('with ember-cli-mocha@0.11.0', function () {
@@ -81,21 +73,13 @@ describe('Blueprint: helper-test', function () {
         generateFakePackageManifest('ember-cli-mocha', '0.11.0');
       });
 
-      it('helper-test foo/bar-baz --integration', function () {
+      it('helper-test foo/bar-baz', function () {
         return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
           expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
             fixture('helper-test/mocha.js')
           );
         });
       });
-
-      it('helper-test foo/bar-baz --unit', function () {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
-          expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-unit.js')
-          );
-        });
-      });
     });
 
     describe('with ember-cli-mocha@0.12.0', function () {
@@ -114,14 +98,6 @@ describe('Blueprint: helper-test', function () {
           );
         });
       });
-
-      it('helper-test foo/bar-baz for mocha --unit', function () {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
-          expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-0.12-unit.js')
-          );
-        });
-      });
     });
 
     describe('with ember-mocha@0.14.0', function () {
@@ -140,14 +116,6 @@ describe('Blueprint: helper-test', function () {
           );
         });
       });
-
-      it('helper-test foo/bar-baz for mocha --unit', function () {
-        return emberGenerateDestroy(['helper-test', 'foo/bar-baz', '--unit'], (_file) => {
-          expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
-            fixture('helper-test/mocha-rfc232-unit.js')
-          );
-        });
-      });
     });
   });
 
diff --git a/node-tests/blueprints/helper-test.js b/node-tests/blueprints/helper-test.js
index dfecf47ddb7..165687c2827 100644
--- a/node-tests/blueprints/helper-test.js
+++ b/node-tests/blueprints/helper-test.js
@@ -48,15 +48,6 @@ describe('Blueprint: helper', function () {
       });
     });
 
-    it('helper foo/bar-baz unit', function () {
-      return emberGenerateDestroy(['helper', '--test-type=unit', 'foo/bar-baz'], (_file) => {
-        expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
-        expect(_file('tests/unit/helpers/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/unit.js')
-        );
-      });
-    });
-
     it('helper foo/bar-baz --pod', function () {
       return emberGenerateDestroy(['helper', 'foo/bar-baz', '--pod'], (_file) => {
         expect(_file('app/helpers/foo/bar-baz.js')).to.equal(fixture('helper/helper.js'));
diff --git a/node-tests/fixtures/helper-test/mocha-0.12-unit.js b/node-tests/fixtures/helper-test/mocha-0.12-unit.js
deleted file mode 100644
index bcce8c2c865..00000000000
--- a/node-tests/fixtures/helper-test/mocha-0.12-unit.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'chai';
-import { describe, it } from 'mocha';
-import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
-
-describe('Unit | Helper | foo/bar-baz', function() {
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    let result = fooBarBaz(42);
-    expect(result).to.be.ok;
-  });
-});
-
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232-unit.js b/node-tests/fixtures/helper-test/mocha-rfc232-unit.js
deleted file mode 100644
index f19b35a93f7..00000000000
--- a/node-tests/fixtures/helper-test/mocha-rfc232-unit.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { expect } from 'chai';
-import { describe, it } from 'mocha';
-import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
-
-describe('Unit | Helper | foo/bar-baz', function() {
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    let result = fooBarBaz(42);
-    expect(result).to.be.ok;
-  });
-});
diff --git a/node-tests/fixtures/helper-test/mocha-unit.js b/node-tests/fixtures/helper-test/mocha-unit.js
deleted file mode 100644
index bcce8c2c865..00000000000
--- a/node-tests/fixtures/helper-test/mocha-unit.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { expect } from 'chai';
-import { describe, it } from 'mocha';
-import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
-
-describe('Unit | Helper | foo/bar-baz', function() {
-
-  // TODO: Replace this with your real tests.
-  it('works', function() {
-    let result = fooBarBaz(42);
-    expect(result).to.be.ok;
-  });
-});
-
diff --git a/node-tests/fixtures/helper-test/module-unification/addon-unit.js b/node-tests/fixtures/helper-test/module-unification/addon-unit.js
deleted file mode 100644
index d38c3e2629c..00000000000
--- a/node-tests/fixtures/helper-test/module-unification/addon-unit.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-import { fooBarBaz } from 'my-addon/helpers/foo/bar-baz';
-import { module, test } from 'qunit';
-
-module('Unit | Helper | foo/bar-baz');
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  let result = fooBarBaz([42]);
-  assert.ok(result);
-});
-
diff --git a/node-tests/fixtures/helper-test/rfc232-unit.js b/node-tests/fixtures/helper-test/rfc232-unit.js
deleted file mode 100644
index fc08ea09909..00000000000
--- a/node-tests/fixtures/helper-test/rfc232-unit.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
-import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
-
-module('Unit | Helper | foo/bar-baz', function(hooks) {
-  setupTest(hooks);
-
-  // TODO: Replace this with your real tests.
-  test('it works', function(assert) {
-    let result = fooBarBaz([42]);
-    assert.ok(result);
-  });
-});
diff --git a/node-tests/fixtures/helper-test/unit.js b/node-tests/fixtures/helper-test/unit.js
deleted file mode 100644
index 21a56367d22..00000000000
--- a/node-tests/fixtures/helper-test/unit.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';
-import { module, test } from 'qunit';
-
-module('Unit | Helper | foo/bar-baz');
-
-// TODO: Replace this with your real tests.
-test('it works', function(assert) {
-  let result = fooBarBaz([42]);
-  assert.ok(result);
-});
-

From 54f688151bcb1d48a08874ffcacd9f5d15abb874 Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Sat, 30 Oct 2021 13:45:00 +0200
Subject: [PATCH 0693/1405] Make the helper blueprint whitespace consistent

It seems the previous version of the blueprints produced some extra whitespace which can now be removed.
---
 .../__root__/__testType__/__collection__/__name__-test.js       | 1 -
 .../__root__/__testType__/__collection__/__name__-test.js       | 2 --
 node-tests/fixtures/helper-test/mocha-0.12.js                   | 1 -
 node-tests/fixtures/helper-test/mocha.js                        | 2 --
 4 files changed, 6 deletions(-)

diff --git a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
index 4176c7f7976..1b18d13b81d 100644
--- a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
@@ -24,4 +24,3 @@ describe('<%= friendlyTestName %>', function() {
     expect(this.$().text().trim()).to.equal('1234');
   });
 });
-
diff --git a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
index 554478b67fa..e8ec73453e2 100644
--- a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -25,4 +24,3 @@ describeComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleNam
     });
   }
 );
-
diff --git a/node-tests/fixtures/helper-test/mocha-0.12.js b/node-tests/fixtures/helper-test/mocha-0.12.js
index b78ee50dc92..7c6f1b33dad 100644
--- a/node-tests/fixtures/helper-test/mocha-0.12.js
+++ b/node-tests/fixtures/helper-test/mocha-0.12.js
@@ -24,4 +24,3 @@ describe('Integration | Helper | foo/bar-baz', function() {
     expect(this.$().text().trim()).to.equal('1234');
   });
 });
-
diff --git a/node-tests/fixtures/helper-test/mocha.js b/node-tests/fixtures/helper-test/mocha.js
index 9e3c985f0e6..37544b7c641 100644
--- a/node-tests/fixtures/helper-test/mocha.js
+++ b/node-tests/fixtures/helper-test/mocha.js
@@ -1,5 +1,4 @@
 import { expect } from 'chai';
-
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
@@ -25,4 +24,3 @@ describeComponent('foo/bar-baz', 'helper:foo/bar-baz',
     });
   }
 );
-

From 8afe19d58ddad24e89cec7c4e0e0500ead400be7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 15:03:54 +0000
Subject: [PATCH 0694/1405] Bump testem from 3.5.0 to 3.6.0

Bumps [testem](https://github.com/testem/testem) from 3.5.0 to 3.6.0.
- [Release notes](https://github.com/testem/testem/releases)
- [Commits](https://github.com/testem/testem/compare/v3.5.0...v3.6.0)

---
updated-dependencies:
- dependency-name: testem
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b680eb19dab..ad7ce9feb18 100644
--- a/package.json
+++ b/package.json
@@ -143,7 +143,7 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
-    "testem": "^3.5.0",
+    "testem": "^3.6.0",
     "testem-failure-only-reporter": "^0.0.1",
     "tslint": "^5.20.1",
     "typescript": "^4.2.4"
diff --git a/yarn.lock b/yarn.lock
index f41646af38e..eb9a690433e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11261,10 +11261,10 @@ testem@^2.14.0, testem@^2.9.2:
     tmp "0.0.33"
     xmldom "^0.1.19"
 
-testem@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.5.0.tgz#c77cc1e46114c60f6f16c4f221a8a222346fb211"
-  integrity sha512-qucRtq6aDVrCc6aEyz15CxIpjij95B8XTHpRT7xrTdTw3iFypZw95DQjX+EnGmGIqUB7CGapv3L2OP+HAlHUBg==
+testem@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.6.0.tgz#bf5c86944bafd035c18f41f520195cce5eef33a8"
+  integrity sha512-sXwx2IlOadOhrKf0hsV1Yt/yuYhdfrtJ4dpp7T6pFN62GjMyKifjAv2SFm+4zYHee1JwxheO7JUL0+3iN0rlHw==
   dependencies:
     "@xmldom/xmldom" "^0.7.1"
     backbone "^1.1.2"

From 0327bedc486fdb6f7f4c45b8cb92bdb630c0b983 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 15:05:04 +0000
Subject: [PATCH 0695/1405] Bump @babel/helper-module-imports from 7.8.3 to
 7.16.0

Bumps [@babel/helper-module-imports](https://github.com/babel/babel/tree/HEAD/packages/babel-helper-module-imports) from 7.8.3 to 7.16.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.0/packages/babel-helper-module-imports)

---
updated-dependencies:
- dependency-name: "@babel/helper-module-imports"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 66 ++++++++--------------------------------------------
 2 files changed, 11 insertions(+), 57 deletions(-)

diff --git a/package.json b/package.json
index b680eb19dab..774a0b33159 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "test:browserstack": "node bin/run-browserstack-tests.js"
   },
   "dependencies": {
-    "@babel/helper-module-imports": "^7.8.3",
+    "@babel/helper-module-imports": "^7.16.0",
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.80.2",
diff --git a/yarn.lock b/yarn.lock
index f41646af38e..08888ab3bef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -384,26 +384,12 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
-  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
-  dependencies:
-    "@babel/types" "^7.12.5"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
-  integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.8.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
+  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
   dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-module-imports@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498"
-  integrity sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==
-  dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.16.0"
 
 "@babel/helper-module-transforms@^7.12.1":
   version "7.12.1"
@@ -623,11 +609,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
-"@babel/helper-validator-identifier@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
-  integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
-
 "@babel/helper-validator-option@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
@@ -2331,39 +2312,12 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5":
-  version "7.12.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
-  integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.15.4", "@babel/types@^7.15.6":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
-  integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.9"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444"
-  integrity sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.9.6.tgz#2c5502b427251e9de1bd2dff95add646d95cc9f7"
-  integrity sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
+  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.9.5"
-    lodash "^4.17.13"
+    "@babel/helper-validator-identifier" "^7.15.7"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":

From 64355dc371a7fb5883e424ec02cf0fae7df53976 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Nov 2021 15:05:14 +0000
Subject: [PATCH 0696/1405] Bump glob from 7.1.7 to 7.2.0

Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.7 to 7.2.0.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/master/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.1.7...v7.2.0)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b680eb19dab..77f60a099d5 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "fs-extra": "^9.1.0",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
-    "glob": "^7.1.7",
+    "glob": "^7.2.0",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index f41646af38e..b63122d6683 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6855,10 +6855,10 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7:
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
-  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"

From dfd1da52eaafcb02e6c019ae0c10a914b07e0c5a Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 1 Nov 2021 15:09:02 -0400
Subject: [PATCH 0697/1405] Add v4.0.0-beta.7 to CHANGELOG

(cherry picked from commit 5c32ca9cc521c5ece0e80dc109bb9af9fb83ba50)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86e75fb9958..45699895d35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.0.0-beta.7 (November 1, 2021)
+
+- [#19677](https://github.com/emberjs/ember.js/pull/19677) [CLEANUP] Remove jQuery from build
+
 ### v4.0.0-beta.6 (October 26, 2021)
 
 - [#19799](https://github.com/emberjs/ember.js/pull/19799) / [glimmerjs/glimmer-vm#1354](https://github.com/glimmerjs/glimmer-vm/pull/1354) Fixes for errors while precompiling inline templates (introduced in 3.28.2)

From 89b46e4f61298a8b40fd72aeb4969c89eab96858 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 18 Oct 2021 18:15:26 -0400
Subject: [PATCH 0698/1405] Add v3.24.6 to CHANGELOG.md.

(cherry picked from commit e69904998ee98d98ed5236fd71c1e25ea91d5e26)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45699895d35..2ac35521973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,6 +81,10 @@
 
 - [glimmerjs/glimmer-vm#1351](https://github.com/glimmerjs/glimmer-vm/pull/1351) Support lexical scope in loose mode
 
+### v3.24.6 (October 18, 2021)
+
+- [glimmerjs/glimmer-vm#1347](https://github.com/glimmerjs/glimmer-vm/pull/1347) Avoid using a nested WeakMap for manager instances for a given owner (makes memory leak debugging easier)
+
 ## v3.28.1 (August 30, 2021)
 
 - [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized

From c920cfebaead8faa5e389e3b861a7d5dab04af55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Nov 2021 11:25:25 +0000
Subject: [PATCH 0699/1405] Bump @babel/plugin-transform-block-scoping from
 7.8.3 to 7.16.0

Bumps [@babel/plugin-transform-block-scoping](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-block-scoping) from 7.8.3 to 7.16.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.0/packages/babel-plugin-transform-block-scoping)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-block-scoping"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 35 +++++------------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index 6c369a8d59e..9aaf940c7d2 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.0",
-    "@babel/plugin-transform-block-scoping": "^7.8.3",
+    "@babel/plugin-transform-block-scoping": "^7.16.0",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.80.2",
     "babel-plugin-debug-macros": "^0.3.4",
diff --git a/yarn.lock b/yarn.lock
index bab6c09fcb1..4c91962f553 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -454,17 +454,7 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
-"@babel/helper-plugin-utils@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
-  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
-
-"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
@@ -1259,28 +1249,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-block-scoping@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
-  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-block-scoping@^7.15.3":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
-  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3", "@babel/plugin-transform-block-scoping@^7.16.0", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"
+  integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
-
 "@babel/plugin-transform-classes@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"

From 4112c3337b85733e940123532a6b96a5f43a7a32 Mon Sep 17 00:00:00 2001
From: Kris Selden <kris.selden@gmail.com>
Date: Tue, 2 Nov 2021 17:57:57 -0700
Subject: [PATCH 0700/1405] Fix memory leak

---
 packages/@ember/-internals/container/lib/container.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index d811fd971c1..f9e9e2a947e 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -485,7 +485,7 @@ class FactoryManager<T, C> {
     this.injections = undefined;
     setFactoryFor(this, this);
 
-    if (factory) {
+    if (isInstantiatable(container, fullName)) {
       setFactoryFor(factory, this);
     }
   }

From d52b26508998ce5a8c43c4f5125474231421e5fc Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Wed, 3 Nov 2021 13:57:05 -0400
Subject: [PATCH 0701/1405] Add v3.28.5 to CHANGELOG.md.

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ac35521973..88e9d88a30e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,10 @@
 - [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
 - [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 
+## v3.28.5 (November 3, 2021)
+
+- [#19820](https://github.com/emberjs/ember.js/pull/19820) Fix memory leak when looking up non-instantiable objects from the owner
+
 ## v3.28.3 (October 22, 2021)
 
 - [#19799](https://github.com/emberjs/ember.js/pull/19799) / [glimmerjs/glimmer-vm#1354](https://github.com/glimmerjs/glimmer-vm/pull/1354) Fixes for errors while precompiling inline templates (introduced in 3.28.2)

From 841a26b07be4f314d81a3d71eb64314fd2425247 Mon Sep 17 00:00:00 2001
From: Sergey Astapov <sergeastapov@gmail.com>
Date: Wed, 3 Nov 2021 17:40:21 -0400
Subject: [PATCH 0702/1405] [DOC] Fix tracked decorator usage in code examples

---
 packages/@ember/-internals/metal/lib/tracked.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 3fd57b71338..d102169ebe8 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -32,7 +32,8 @@ import { SELF_TAG } from './tags';
   will be tracked:
 
   ```typescript
-  import Component, { tracked } from '@glimmer/component';
+  import Component from '@glimmer/component';
+  import { tracked } from '@glimmer/tracking';
 
   export default class MyComponent extends Component {
     @tracked
@@ -53,7 +54,8 @@ import { SELF_TAG } from './tags';
   `eatenApples`, and `remainingApples`.
 
   ```typescript
-  import Component, { tracked } from '@glimmer/component';
+  import Component from '@glimmer/component';
+  import { tracked } from '@glimmer/tracking';
 
   const totalApples = 100;
 

From a50d168c64024c51823466cef923aae881db2019 Mon Sep 17 00:00:00 2001
From: Jen Weber <j@jenweber.me>
Date: Thu, 4 Nov 2021 07:30:11 -0400
Subject: [PATCH 0703/1405] [DOC release beta 3.28] Fix deprecation info

The intent was to remove this API in 4.0.
When we backfilled the missing info in previous work, this was unclear.
---
 packages/@ember/-internals/glimmer/lib/component.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index e856100fa9d..48034181784 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1084,10 +1084,10 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
             id: 'ember.component.reopen',
             for: 'ember-source',
             since: {
-              enabled: '4.0.0',
+              enabled: '3.27.0',
             },
-            url: 'https://deprecations.emberjs.com/v4.x#toc_ember-component-reopen',
-            until: '5.0.0',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-reopen',
+            until: '4.0.0',
           }
         );
 

From e20f0362379933176821d8a62dab52c8ad6ebdb0 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Thu, 4 Nov 2021 16:31:46 -0400
Subject: [PATCH 0704/1405] [DOC @glimmer/tracking] update docs for @tracked
 and @cached

Closes https://github.com/emberjs/ember.js/pull/19547

Co-Authored-By: Chris Garrett <me@pzuraq.com>
---
 .../@ember/-internals/metal/lib/cached.ts     |  57 -----
 packages/@glimmer/tracking/index.ts           | 203 ++++++++++++++++++
 2 files changed, 203 insertions(+), 57 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/cached.ts b/packages/@ember/-internals/metal/lib/cached.ts
index 2a39d14b9e6..b454a0423cd 100644
--- a/packages/@ember/-internals/metal/lib/cached.ts
+++ b/packages/@ember/-internals/metal/lib/cached.ts
@@ -5,63 +5,6 @@ import { EMBER_CACHED } from '@ember/canary-features';
 import { DEBUG } from '@glimmer/env';
 import { createCache, getValue } from '@glimmer/validator';
 
-/**
- * @decorator
- *
- * The `@cached` decorator can be used on getters in order to cache the return
- * value of the getter. This is useful when a getter is expensive and used very
- * often.
- *
- *
- * @example
- *
- * in this guest list class, we have the `sortedGuests`
- * getter that sorts the guests alphabetically:
- *
- * ```js
- * import { tracked } from '@glimmer/tracking';
- *
- * class GuestList {
- *   @tracked guests = ['Zoey', 'Tomster'];
- *
- *   get sortedGuests() {
- *     return this.guests.slice().sort()
- *   }
- * }
- * ```
- *
- * Every time `sortedGuests` is accessed, a new array will be created and sorted,
- * because JavaScript getters do not cache by default. When the guest list is
- * small, like the one in the example, this is not a problem. However, if the guest
- * list were to grow very large, it would mean that we would be doing a large
- * amount of work each time we accessed `sortedGetters`. With `@cached`, we can
- * cache the value instead:
- *
- * ```js
- * import { tracked, cached } from '@glimmer/tracking';
- *
- * class GuestList {
- *   @tracked guests = ['Zoey', 'Tomster'];
- *
- *   @cached
- *   get sortedGuests() {
- *     return this.guests.slice().sort()
- *   }
- * }
- * ```
- *
- * Now the `sortedGuests` getter will be cached based on _autotracking_. It will
- * only rerun and create a new sorted array when the `guests` tracked property is
- * updated.
- *
- * In general, you should avoid using `@cached` unless you have confirmed that the
- * getter you are decorating is computationally expensive. `@cached` adds a small
- * amount of overhead to the getter, making it more expensive. While this overhead
- * is small, if `@cached` is overused it can add up to a large impact overall in
- * your app. Many getters and tracked properties are only accessed once, rendered,
- * and then never rerendered, so adding `@cached` when it is unnecessary can
- * negatively impact performance.
- */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const cached: PropertyDecorator = (...args: any[]) => {
   if (EMBER_CACHED) {
diff --git a/packages/@glimmer/tracking/index.ts b/packages/@glimmer/tracking/index.ts
index 174b13a4d72..629afe60472 100644
--- a/packages/@glimmer/tracking/index.ts
+++ b/packages/@glimmer/tracking/index.ts
@@ -1 +1,204 @@
 export { tracked, cached } from '@ember/-internals/metal';
+
+/**
+  In order to tell Ember a value might change, we need to mark it as trackable.
+  Trackable values are values that:
+
+  - Can change over their component’s lifetime and
+  - Should cause Ember to rerender if and when they change
+
+  We can do this by marking the field with the `@tracked` decorator.
+
+  @module @glimmer/tracking
+  @public
+*/
+
+/**
+  Marks a property as tracked. By default, values that are rendered in Ember app
+  templates are _static_, meaning that updates to them won't cause the
+  application to rerender. Marking a property as tracked means that when that
+  property changes, any templates that used that property, directly or
+  indirectly, will rerender. For instance, consider this component:
+
+  ```handlebars
+  <div>Count: {{this.count}}</div>
+  <div>Times Ten: {{this.timesTen}}</div>
+  <div>
+    <button {{on "click" this.plusOne}}>
+      Plus One
+    </button>
+  </div>
+  ```
+
+  ```javascript
+  import Component from '@glimmer/component';
+  import { tracked } from '@glimmer/tracking';
+  import { action } from '@ember/object';
+
+  export default class CounterComponent extends Component {
+    @tracked count = 0;
+
+    get timesTen() {
+      return this.count * 10;
+    }
+
+    @action
+    plusOne() {
+      this.count += 1;
+    }
+  }
+  ```
+
+  Both the `{{this.count}}` and the `{{this.timesTen}}` properties in the
+  template will update whenever the button is clicked. Any tracked properties
+  that are used in any way to calculate a value that is used in the template
+  will cause a rerender when updated - this includes through method calls and
+  other means:
+
+  ```javascript
+  import Component from '@glimmer/component';
+  import { tracked } from '@glimmer/tracking';
+
+  class Entry {
+    @tracked name;
+    @tracked phoneNumber;
+
+    constructor(name, phoneNumber) {
+      this.name = name;
+      this.phoneNumber = phoneNumber;
+    }
+  }
+
+  export default class PhoneBookComponent extends Component {
+    entries = [
+      new Entry('Pizza Palace', 5551234),
+      new Entry('1st Street Cleaners', 5554321),
+      new Entry('Plants R Us', 5552468),
+    ];
+
+    // Any usage of this property will update whenever any of the names in the
+    // entries arrays are updated
+    get names() {
+      return this.entries.map(e => e.name);
+    }
+
+    // Any usage of this property will update whenever any of the numbers in the
+    // entries arrays are updated
+    get numbers() {
+      return this.getFormattedNumbers();
+    }
+
+    getFormattedNumbers() {
+      return this.entries
+        .map(e => e.phoneNumber)
+        .map(number => {
+          let numberString = '' + number;
+
+          return numberString.slice(0, 3) + '-' + numberString.slice(3);
+        });
+    }
+  }
+  ```
+
+  It's important to note that setting tracked properties will always trigger an
+  update, even if the property is set to the same value as it was before.
+
+  ```js
+  let entry = new Entry('Pizza Palace', 5551234);
+  // if entry was used when rendering, this would cause a rerender, even though
+  // the name is being set to the same value as it was before
+  entry.name = entry.name;
+  ```
+
+  `tracked` can also be used with the classic Ember object model in a similar
+  manner to classic computed properties:
+
+  ```javascript
+  import EmberObject from '@ember/object';
+  import { tracked } from '@glimmer/tracking';
+
+  const Entry = EmberObject.extend({
+    name: tracked(),
+    phoneNumber: tracked()
+  });
+  ```
+
+  Often this is unnecessary, but to ensure robust auto-tracking behavior it is
+  advisable to mark tracked state appropriately wherever possible.
+  This form of `tracked` also accepts an optional configuration object
+  containing either an initial `value` or an `initializer` function (but not
+  both).
+
+  ```javascript
+  import EmberObject from '@ember/object';
+  import { tracked } from '@glimmer/tracking';
+
+  const Entry = EmberObject.extend({
+    name: tracked({ value: 'Zoey' }),
+    favoriteSongs: tracked({
+      initializer: () => ['Raspberry Beret', 'Time After Time']
+    })
+  });
+  ```
+
+  @method tracked
+  @static
+  @for @glimmer/tracking
+  @public
+*/
+
+/**
+  The `@cached` decorator can be used on getters in order to cache the return
+  value of the getter. This is useful when a getter is expensive and used very
+  often. For instance, in this guest list class, we have the `sortedGuests`
+  getter that sorts the guests alphabetically:
+
+  ```js
+  import { tracked } from '@glimmer/tracking';
+
+  class GuestList {
+    @tracked guests = ['Zoey', 'Tomster'];
+
+    get sortedGuests() {
+      return this.guests.slice().sort()
+    }
+  }
+  ```
+
+  Every time `sortedGuests` is accessed, a new array will be created and sorted,
+  because JavaScript getters do not cache by default. When the guest list is
+  small, like the one in the example, this is not a problem. However, if the guest
+  list were to grow very large, it would mean that we would be doing a large
+  amount of work each time we accessed `sortedGetters`. With `@cached`, we can
+  cache the value instead:
+
+  ```js
+  import { tracked, cached } from '@glimmer/tracking';
+
+  class GuestList {
+    @tracked guests = ['Zoey', 'Tomster'];
+
+    @cached
+    get sortedGuests() {
+      return this.guests.slice().sort()
+    }
+  }
+  ```
+
+  Now the `sortedGuests` getter will be cached based on _autotracking_. It will
+  only rerun and create a new sorted array when the `guests` tracked property is
+  updated.
+
+  In general, you should avoid using `@cached` unless you have confirmed that the
+  getter you are decorating is computationally expensive. `@cached` adds a small
+  amount of overhead to the getter, making it more expensive. While this overhead
+  is small, if `@cached` is overused it can add up to a large impact overall in
+  your app. Many getters and tracked properties are only accessed once, rendered,
+  and then never rerendered, so adding `@cached` when it is unnecessary can
+  negatively impact performance.
+
+  @method cached
+  @static
+  @for @glimmer/tracking
+  @public
+ */

From 7085b4acb0a0502edd214e49216d1f0178546c4b Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 4 Nov 2021 17:58:26 -0400
Subject: [PATCH 0705/1405] [BUGFIX beta] Replace `assert.equal` in blueprints
 with `assert.strictEqual` to appease eslint-plugin-qunit on generation

Co-authored-by: Bryan Mishkin <698306+bmish@users.noreply.github.com>
---
 .../qunit-files/tests/acceptance/__name__-test.js           | 2 +-
 .../qunit-rfc-232-files/tests/acceptance/__name__-test.js   | 2 +-
 .../qunit-files/__root__/__testType__/__path__/__test__.js  | 6 +++---
 .../__root__/__testType__/__collection__/__name__-test.js   | 2 +-
 node-tests/fixtures/acceptance-test/addon-default.js        | 2 +-
 node-tests/fixtures/acceptance-test/addon-nested.js         | 2 +-
 node-tests/fixtures/acceptance-test/default.js              | 2 +-
 node-tests/fixtures/acceptance-test/qunit-rfc268.js         | 2 +-
 node-tests/fixtures/component-test/default-template.js      | 4 ++--
 node-tests/fixtures/component-test/default.js               | 4 ++--
 node-tests/fixtures/component-test/unit.js                  | 2 +-
 node-tests/fixtures/helper-test/integration.js              | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
index abbcab2497f..190767adcbf 100644
--- a/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
@@ -7,6 +7,6 @@ test('visiting /<%= dasherizedModuleName %>', function(assert) {
   visit('/<%= dasherizedModuleName %>');
 
   andThen(function() {
-    assert.equal(currentURL(), '/<%= dasherizedModuleName %>');
+    assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
   });
 });
diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
index b2f9e80bd91..3bdb63d7a5a 100644
--- a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -8,6 +8,6 @@ module('<%= friendlyTestName %>', function(hooks) {
   test('visiting /<%= dasherizedModuleName %>', async function(assert) {
     await visit('/<%= dasherizedModuleName %>');
 
-    assert.equal(currentURL(), '/<%= dasherizedModuleName %>');
+    assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
   });
 });
diff --git a/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
index d451eaf7c41..e1450f0a258 100644
--- a/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -13,7 +13,7 @@ test('it renders', function(assert) {
 
   this.render(hbs`<%= selfCloseComponent(componentName) %>`);
 
-  assert.equal(this.$().text().trim(), '');
+  assert.strictEqual(this.$().text().trim(), '');
 
   // Template block usage:
   this.render(hbs`
@@ -22,10 +22,10 @@ test('it renders', function(assert) {
     <%= closeComponent(componentName) %>
   `);
 
-  assert.equal(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>
+  assert.strictEqual(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>
   // Creates the component instance
   /*let component =*/ this.subject();
   // Renders the component to the page
   this.render();
-  assert.equal(this.$().text().trim(), '');<% } %>
+  assert.strictEqual(this.$().text().trim(), '');<% } %>
 });
diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
index ff0be722ff7..49211fee4f5 100644
--- a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
@@ -11,5 +11,5 @@ test('it renders', function(assert) {
 
   this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
 
-  assert.equal(this.$().text().trim(), '1234');
+  assert.strictEqual(this.$().text().trim(), '1234');
 });
diff --git a/node-tests/fixtures/acceptance-test/addon-default.js b/node-tests/fixtures/acceptance-test/addon-default.js
index f8f352f2408..6adb6c1f31e 100644
--- a/node-tests/fixtures/acceptance-test/addon-default.js
+++ b/node-tests/fixtures/acceptance-test/addon-default.js
@@ -7,6 +7,6 @@ test('visiting /foo', function(assert) {
   visit('/foo');
 
   andThen(function() {
-    assert.equal(currentURL(), '/foo');
+    assert.strictEqual(currentURL(), '/foo');
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/addon-nested.js b/node-tests/fixtures/acceptance-test/addon-nested.js
index ecba0d004bd..bc8378edc27 100644
--- a/node-tests/fixtures/acceptance-test/addon-nested.js
+++ b/node-tests/fixtures/acceptance-test/addon-nested.js
@@ -7,6 +7,6 @@ test('visiting /foo/bar', function(assert) {
   visit('/foo/bar');
 
   andThen(function() {
-    assert.equal(currentURL(), '/foo/bar');
+    assert.strictEqual(currentURL(), '/foo/bar');
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/default.js b/node-tests/fixtures/acceptance-test/default.js
index e8fbc772d06..9366e49660e 100644
--- a/node-tests/fixtures/acceptance-test/default.js
+++ b/node-tests/fixtures/acceptance-test/default.js
@@ -7,6 +7,6 @@ test('visiting /foo', function(assert) {
   visit('/foo');
 
   andThen(function() {
-    assert.equal(currentURL(), '/foo');
+    assert.strictEqual(currentURL(), '/foo');
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268.js b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
index 25eab4cf23b..7e0c1af281e 100644
--- a/node-tests/fixtures/acceptance-test/qunit-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
@@ -8,6 +8,6 @@ module('Acceptance | foo', function(hooks) {
   test('visiting /foo', async function(assert) {
     await visit('/foo');
 
-    assert.equal(currentURL(), '/foo');
+    assert.strictEqual(currentURL(), '/foo');
   });
 });
diff --git a/node-tests/fixtures/component-test/default-template.js b/node-tests/fixtures/component-test/default-template.js
index 72df2c7ff6e..50a896eedad 100644
--- a/node-tests/fixtures/component-test/default-template.js
+++ b/node-tests/fixtures/component-test/default-template.js
@@ -11,7 +11,7 @@ test('it renders', function(assert) {
 
   this.render(hbs`<<%= componentInvocation =%> />`);
 
-  assert.equal(this.$().text().trim(), '');
+  assert.strictEqual(this.$().text().trim(), '');
 
   // Template block usage:
   this.render(hbs`
@@ -20,5 +20,5 @@ test('it renders', function(assert) {
     </<%= componentInvocation =%>>
   `);
 
-  assert.equal(this.$().text().trim(), 'template block text');
+  assert.strictEqual(this.$().text().trim(), 'template block text');
 });
diff --git a/node-tests/fixtures/component-test/default.js b/node-tests/fixtures/component-test/default.js
index fc4c11ce4b9..b1e00e2d5a5 100644
--- a/node-tests/fixtures/component-test/default.js
+++ b/node-tests/fixtures/component-test/default.js
@@ -11,7 +11,7 @@ test('it renders', function(assert) {
 
   this.render(hbs`<XFoo />`);
 
-  assert.equal(this.$().text().trim(), '');
+  assert.strictEqual(this.$().text().trim(), '');
 
   // Template block usage:
   this.render(hbs`
@@ -20,5 +20,5 @@ test('it renders', function(assert) {
     </XFoo>
   `);
 
-  assert.equal(this.$().text().trim(), 'template block text');
+  assert.strictEqual(this.$().text().trim(), 'template block text');
 });
diff --git a/node-tests/fixtures/component-test/unit.js b/node-tests/fixtures/component-test/unit.js
index 74bc9dcb53d..3c99855df22 100644
--- a/node-tests/fixtures/component-test/unit.js
+++ b/node-tests/fixtures/component-test/unit.js
@@ -12,5 +12,5 @@ test('it renders', function(assert) {
   /*let component =*/ this.subject();
   // Renders the component to the page
   this.render();
-  assert.equal(this.$().text().trim(), '');
+  assert.strictEqual(this.$().text().trim(), '');
 });
diff --git a/node-tests/fixtures/helper-test/integration.js b/node-tests/fixtures/helper-test/integration.js
index 9abe683c279..f2655c45ec9 100644
--- a/node-tests/fixtures/helper-test/integration.js
+++ b/node-tests/fixtures/helper-test/integration.js
@@ -11,5 +11,5 @@ test('it renders', function(assert) {
 
   this.render(hbs`{{foo/bar-baz this.inputValue}}`);
 
-  assert.equal(this.$().text().trim(), '1234');
+  assert.strictEqual(this.$().text().trim(), '1234');
 });

From d19dff4966338ac9d99be81947b4183c56fe2da0 Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Thu, 4 Nov 2021 21:27:45 -0400
Subject: [PATCH 0706/1405] [FEATURE] Enable `@cached` decorator from
 `@glimmer/tracking`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was discussed and approved to be enabled by default (for 4.1) in a core team meeting a while back, but I forgot to actually submit the change. 🤦
---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 173e216a9f3..18b7302fba1 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -21,7 +21,7 @@ export const DEFAULT_FEATURES = {
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: null,
-  EMBER_CACHED: null,
+  EMBER_CACHED: true,
 };
 
 /**

From 56531dd5804716402e0057b157eb8cb9d68c628b Mon Sep 17 00:00:00 2001
From: Sergey Astapov <sergeastapov@gmail.com>
Date: Fri, 5 Nov 2021 11:19:47 -0400
Subject: [PATCH 0707/1405] [DOC] Fix tracked decorator usage in code examples

---
 packages/@ember/-internals/metal/lib/tracked.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index d102169ebe8..4e3dae5f204 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -63,7 +63,6 @@ import { SELF_TAG } from './tags';
     @tracked
     eatenApples = 0
 
-    @tracked('eatenApples')
     get remainingApples() {
       return totalApples - this.eatenApples;
     }

From a76a71e3b35a49dd6372ff7526dd696c8e172610 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 5 Nov 2021 13:08:12 -0400
Subject: [PATCH 0708/1405] [BUGFIX release] Fix deprecation `until` and link
 for Component.reopenClass

---
 packages/@ember/-internals/glimmer/lib/component.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 960276243fd..3633fb24854 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1095,11 +1095,11 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           {
             id: 'ember.component.reopen',
             for: 'ember-source',
-            url: 'https://deprecations.emberjs.com/v4.x#toc_ember-component-reopen',
+            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-reopen',
             since: {
-              enabled: '4.0.0',
+              enabled: '3.27.0',
             },
-            until: '5.0.0',
+            until: '4.0.0',
           }
         );
 

From 4f99f42070bc12a122cc7f45686d02b467c7d661 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 5 Nov 2021 13:33:36 -0400
Subject: [PATCH 0709/1405] Add v4.0.0-beta.8 to CHANGELOG

(cherry picked from commit f7d7b24222fe325fa34f102ae16843dc5db8ee1a)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e9d88a30e..27072ed91c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Ember Changelog
 
+### v4.0.0-beta.8 (November 5, 2021)
+
+- [#19823](https://github.com/emberjs/ember.js/pull/19823) / [#19828](https://github.com/emberjs/ember.js/pull/19828) [BUGFIX] Fix deprecation `until` and link for Component.reopenClass and Component.reopen
+- [#19825](https://github.com/emberjs/ember.js/pull/19825) [BUGFIX] Replace `assert.equal` in blueprints with `assert.strictEqual` to pass eslint-plugin-qunit v7 on generation
+- [#19808](https://github.com/emberjs/ember.js/pull/19808) [CLEANUP] Remove the `--test-type` option from the helper blueprint
+- [#19820](https://github.com/emberjs/ember.js/pull/19820) Fix memory leak when looking up non-instantiable objects from the owner
+
 ### v4.0.0-beta.7 (November 1, 2021)
 
 - [#19677](https://github.com/emberjs/ember.js/pull/19677) [CLEANUP] Remove jQuery from build

From 05e16c40b219e470a42f38e896ae7dd6b32ca098 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 8 Nov 2021 12:22:29 -0500
Subject: [PATCH 0710/1405] Fix missing `deprecate` import in router

Two PR's "crossed in the mail" and left things a bit broken (deprecate
was removed when deprecations were cleaned up, then we landed a new
deprecation).
---
 packages/@ember/-internals/routing/lib/system/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index e9b795c8961..14478e246c6 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -6,7 +6,7 @@ import { BucketCache } from '@ember/-internals/routing';
 import RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
-import { assert, info } from '@ember/debug';
+import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';

From 9b513b8b020e9222cd9349496cc3d9827b5d9c71 Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Mon, 27 Sep 2021 12:09:56 -0400
Subject: [PATCH 0711/1405] [CLEANUP beta] Update GlimmerVM to 0.83.1 (remove
 deprecated rendering features)

* Remove usages of `deprecateMutationsInTrackingTransaction`
* Remove manager-capabilities deprecations
* Remove mutation after consumption deprecations id: `autotracking.mutation-after-consumption`
* Remove `this.` property fallback deprecations id: `this-property-fallback`

Co-Authored-By: Scott Newcomer <snewcomer24@gmail.com>
Co-Authored-By: Nathaniel Furniss <nlfurniss@gmail.com>
---
 package.json                                  |  26 +-
 .../@ember/-internals/environment/lib/env.ts  |  17 --
 .../-internals/glimmer/lib/environment.ts     |  18 --
 .../@ember/-internals/glimmer/lib/helper.ts   |  29 +-
 .../-internals/glimmer/lib/utils/managers.ts  |  40 ---
 .../integration/application/engine-test.js    |  16 +-
 .../integration/application/rendering-test.js |  60 +---
 .../angle-bracket-invocation-test.js          |   2 +-
 .../components/curly-components-test.js       |  18 --
 .../template-only-components-test.js          |   6 +-
 .../custom-component-manager-test.js          |  54 +---
 .../custom-modifier-manager-test.js           | 184 +-----------
 .../integration/helpers/custom-helper-test.js |  89 +-----
 .../tests/integration/helpers/tracked-test.js |  44 ---
 .../glimmer/tests/integration/mount-test.js   |   6 +
 .../tests/integration/syntax/each-test.js     |  35 +--
 .../tests/integration/syntax/let-test.js      |  53 ++--
 .../-internals/metal/lib/property_get.ts      |  16 +-
 .../metal/tests/tracked/validation_test.js    |  19 --
 tests/docs/expected.js                        |   1 -
 yarn.lock                                     | 262 +++++++++---------
 21 files changed, 216 insertions(+), 779 deletions(-)

diff --git a/package.json b/package.json
index 9aaf940c7d2..925715ff222 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@babel/helper-module-imports": "^7.16.0",
     "@babel/plugin-transform-block-scoping": "^7.16.0",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.80.2",
+    "@glimmer/vm-babel-plugins": "0.83.1",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
@@ -73,19 +73,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.80.2",
-    "@glimmer/destroyable": "0.80.2",
+    "@glimmer/compiler": "0.83.1",
+    "@glimmer/destroyable": "0.83.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.80.2",
-    "@glimmer/interfaces": "0.80.2",
-    "@glimmer/manager": "0.80.2",
-    "@glimmer/node": "0.80.2",
-    "@glimmer/opcode-compiler": "0.80.2",
-    "@glimmer/owner": "0.80.2",
-    "@glimmer/program": "0.80.2",
-    "@glimmer/reference": "0.80.2",
-    "@glimmer/runtime": "0.80.2",
-    "@glimmer/validator": "0.80.2",
+    "@glimmer/global-context": "0.83.1",
+    "@glimmer/interfaces": "0.83.1",
+    "@glimmer/manager": "0.83.1",
+    "@glimmer/node": "0.83.1",
+    "@glimmer/opcode-compiler": "0.83.1",
+    "@glimmer/owner": "0.83.1",
+    "@glimmer/program": "0.83.1",
+    "@glimmer/reference": "0.83.1",
+    "@glimmer/runtime": "0.83.1",
+    "@glimmer/validator": "0.83.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.4",
diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index 93f3d1ac326..f8b196b7aad 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -155,23 +155,6 @@ export const ENV = {
    */
   _RERENDER_LOOP_LIMIT: 1000,
 
-  /**
-    Allows disabling the implicit this property fallback deprecation. This could be useful
-    as a way to control the volume of deprecations that are issued by temporarily disabling
-    the implicit this fallback deprecations, which would allow the other deprecations to be more easily
-    identified in the console).
-
-    NOTE: The fallback behavior **will be removed** in Ember 4.0.0, disabling **_IS NOT_**
-    a viable strategy for handling this deprecation.
-
-    @property _DISABLE_PROPERTY_FALLBACK_DEPRECATION
-    @for EmberENV
-    @type boolean
-    @default false
-    @private
-   */
-  _DISABLE_PROPERTY_FALLBACK_DEPRECATION: false,
-
   EMBER_LOAD_HOOKS: {} as {
     [hook: string]: Function[];
   },
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 12a91fcb41d..35700fd1a2e 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -98,24 +98,6 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
   disabled?: boolean;
   message?: string;
 })[] = [
-  {
-    id: 'autotracking.mutation-after-consumption',
-    until: '4.0.0',
-    for: 'ember-source',
-    since: {
-      enabled: '3.21.0',
-    },
-  },
-  {
-    id: 'this-property-fallback',
-    disabled: ENV._DISABLE_PROPERTY_FALLBACK_DEPRECATION,
-    url: 'https://deprecations.emberjs.com/v3.x#toc_this-property-fallback',
-    until: '4.0.0',
-    for: 'ember-source',
-    since: {
-      enabled: '3.26.0',
-    },
-  },
   {
     id: 'argument-less-helper-paren-less-invocation',
     url: 'https://deprecations.emberjs.com/v3.x#toc_argument-less-helper-paren-less-invocation',
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index a1f163da60c..253de1031f0 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -6,15 +6,9 @@ import { Factory, Owner, setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { getDebugName, symbol } from '@ember/-internals/utils';
 import { join } from '@ember/runloop';
-import { DEBUG } from '@glimmer/env';
 import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager';
-import {
-  consumeTag,
-  createTag,
-  deprecateMutationsInTrackingTransaction,
-  dirtyTag,
-} from '@glimmer/validator';
+import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 
 export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
 
@@ -175,16 +169,9 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 
   getValue({ instance, args }: ClassicHelperStateBucket) {
-    let ret;
     let { positional, named } = args;
 
-    if (DEBUG) {
-      deprecateMutationsInTrackingTransaction!(() => {
-        ret = instance.compute(positional as unknown[], named);
-      });
-    } else {
-      ret = instance.compute(positional as unknown[], named);
-    }
+    let ret = instance.compute(positional as unknown[], named);
 
     consumeTag(instance[RECOMPUTE_TAG]);
 
@@ -225,18 +212,6 @@ class SimpleClassicHelperManager implements HelperManager<() => unknown> {
   createHelper(definition: Wrapper, args: Arguments) {
     let { compute } = definition;
 
-    if (DEBUG) {
-      return () => {
-        let ret;
-
-        deprecateMutationsInTrackingTransaction!(() => {
-          ret = compute.call(null, args.positional as unknown[], args.named);
-        });
-
-        return ret;
-      };
-    }
-
     return () => compute.call(null, args.positional as unknown[], args.named);
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 0073b4e1991..21cc5c55ff1 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,6 +1,4 @@
 import { Owner } from '@ember/-internals/owner';
-import { deprecate } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
 import { ComponentManager } from '@glimmer/interfaces';
 import {
   componentCapabilities as glimmerComponentCapabilities,
@@ -17,41 +15,3 @@ export function setComponentManager(
 
 export let componentCapabilities = glimmerComponentCapabilities;
 export let modifierCapabilities = glimmerModifierCapabilities;
-
-if (DEBUG) {
-  componentCapabilities = (version, options) => {
-    deprecate(
-      'Versions of component manager capabilities prior to 3.13 have been deprecated. You must update to the 3.13 capabilities.',
-      version === '3.13',
-      {
-        id: 'manager-capabilities.components-3-4',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_manager-capabilities-components-3-4',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.26.0',
-        },
-      }
-    );
-
-    return glimmerComponentCapabilities(version, options);
-  };
-
-  modifierCapabilities = (version, options) => {
-    deprecate(
-      'Versions of modifier manager capabilities prior to 3.22 have been deprecated. You must update to the 3.22 capabilities.',
-      version === '3.22',
-      {
-        id: 'manager-capabilities.modifiers-3-13',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_manager-capabilities-modifiers-3-13',
-        until: '4.0.0',
-        for: 'ember-source',
-        since: {
-          enabled: '3.26.0',
-        },
-      }
-    );
-
-    return glimmerModifierCapabilities(version, options);
-  };
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index 71bc1b74107..e321647ffe9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -178,7 +178,7 @@ moduleFor(
     }
 
     ['@test sharing a template between engine and application has separate refinements']() {
-      this.assert.expect(2);
+      this.assert.expect(1);
 
       let sharedTemplate = compile(strip`
       <h1>{{this.contextType}}</h1>
@@ -187,10 +187,6 @@ moduleFor(
       {{outlet}}
     `);
 
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.add('template:application', sharedTemplate);
       this.add(
         'controller:application',
@@ -231,16 +227,12 @@ moduleFor(
       );
 
       return this.visit('/blog').then(() => {
-        this.assertText('ApplicationController Data!EngineComponent!');
+        this.assertText('ApplicationEngineComponent!');
       });
     }
 
     ['@test sharing a layout between engine and application has separate refinements']() {
-      this.assert.expect(2);
-
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
+      this.assert.expect(1);
 
       let sharedLayout = compile(strip`
         {{ambiguous-curlies}}
@@ -293,7 +285,7 @@ moduleFor(
       );
 
       return this.visit('/blog').then(() => {
-        this.assertText('ApplicationLocal Data!EngineComponent!');
+        this.assertText('ApplicationEngineComponent!');
       });
     }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index ba43210274c..2eee0f6cf63 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -105,47 +105,7 @@ moduleFor(
       });
     }
 
-    ['@test it can access the model provided by the route via implicit this fallback']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.add(
-        'route:application',
-        Route.extend({
-          model() {
-            return ['red', 'yellow', 'blue'];
-          },
-        })
-      );
-
-      this.addTemplate(
-        'application',
-        strip`
-        <ul>
-          {{#each model as |item|}}
-            <li>{{item}}</li>
-          {{/each}}
-        </ul>
-        `
-      );
-
-      return this.visit('/').then(() => {
-        this.assertInnerHTML(strip`
-        <ul>
-          <li>red</li>
-          <li>yellow</li>
-          <li>blue</li>
-        </ul>
-      `);
-      });
-    }
-
     async ['@test interior mutations on the model with set'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -164,7 +124,7 @@ moduleFor(
         strip`
         [@model: {{@model.color}}]
         [this.model: {{this.model.color}}]
-        [model: {{model.color}}]
+        [model: {{this.model.color}}]
         `
       );
 
@@ -203,10 +163,6 @@ moduleFor(
     }
 
     async ['@test interior mutations on the model with tracked properties'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       class Model {
         @tracked color;
 
@@ -233,7 +189,7 @@ moduleFor(
         strip`
         [@model: {{@model.color}}]
         [this.model: {{this.model.color}}]
-        [model: {{model.color}}]
+        [model: {{this.model.color}}]
         `
       );
 
@@ -271,10 +227,6 @@ moduleFor(
     }
 
     async ['@test exterior mutations on the model with set'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -293,7 +245,7 @@ moduleFor(
         strip`
         [@model: {{@model}}]
         [this.model: {{this.model}}]
-        [model: {{model}}]
+        [model: {{this.model}}]
         `
       );
 
@@ -332,10 +284,6 @@ moduleFor(
     }
 
     async ['@test exterior mutations on the model with tracked properties'](assert) {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.router.map(function () {
         this.route('color', { path: '/:color' });
       });
@@ -361,7 +309,7 @@ moduleFor(
         strip`
         [@model: {{@model}}]
         [this.model: {{this.model}}]
-        [model: {{model}}]
+        [model: {{this.model}}]
         `
       );
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 34a696ab571..1bb86b5c4c2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -9,7 +9,7 @@ import { Component } from '../../utils/helpers';
 
 class CustomModifierManager {
   constructor(owner) {
-    this.capabilities = modifierCapabilities('3.13');
+    this.capabilities = modifierCapabilities('3.22');
     this.owner = owner;
   }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 759a7e7b347..dc374855c77 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -3515,24 +3515,6 @@ moduleFor(
       this.assertComponentElement(this.firstChild, { content: 'hello' });
     }
 
-    ['@test can use `{{component.foo}}` in a template GH#19313']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
-      this.registerComponent('foo-bar', {
-        template: '{{component.foo}}',
-      });
-
-      this.render('{{foo-bar component=(hash foo="bar")}}');
-
-      this.assertComponentElement(this.firstChild, { content: 'bar' });
-
-      runTask(() => this.rerender());
-
-      this.assertComponentElement(this.firstChild, { content: 'bar' });
-    }
-
     ['@test can use `{{@component.foo}}` in a template GH#19313']() {
       this.registerComponent('foo-bar', {
         template: '{{@component.foo}}',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 22896382648..033188083ac 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -197,11 +197,7 @@ if (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
       }
 
       ['@test it renders named arguments as reflected properties']() {
-        expectDeprecation(
-          /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-        );
-
-        this.registerTemplateOnlyComponent('foo-bar', '|{{foo}}|{{this.bar}}|');
+        this.registerTemplateOnlyComponent('foo-bar', '|{{this.foo}}|{{this.bar}}|');
 
         this.render('{{foo-bar foo=this.foo bar=this.bar}}', {
           foo: 'foo',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 21b94917b80..62e9b576a3b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -3,11 +3,11 @@ import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-help
 
 import { componentCapabilities } from '@glimmer/manager';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { set, setProperties, computed, tracked } from '@ember/-internals/metal';
+import { set, setProperties, computed } from '@ember/-internals/metal';
 import { setComponentManager } from '@ember/-internals/glimmer';
 
 const BasicComponentManager = EmberObject.extend({
-  capabilities: componentCapabilities('3.4'),
+  capabilities: componentCapabilities('3.13'),
 
   createComponent(factory, args) {
     return factory.create({ args });
@@ -39,7 +39,7 @@ class ComponentManagerTest extends RenderingTestCase {
     super(...arguments);
 
     InstrumentedComponentManager = EmberObject.extend({
-      capabilities: componentCapabilities('3.4', {
+      capabilities: componentCapabilities('3.13', {
         destructor: true,
         asyncLifecycleCallbacks: true,
       }),
@@ -119,7 +119,7 @@ moduleFor(
     ['@test it can have no template context']() {
       let ComponentClass = setComponentManager(() => {
         return EmberObject.create({
-          capabilities: componentCapabilities('3.4'),
+          capabilities: componentCapabilities('3.13'),
 
           createComponent() {
             return null;
@@ -147,7 +147,7 @@ moduleFor(
       class Base {}
       setComponentManager(() => {
         return EmberObject.create({
-          capabilities: componentCapabilities('3.4'),
+          capabilities: componentCapabilities('3.13'),
 
           createComponent(Factory, args) {
             return new Factory(args);
@@ -206,7 +206,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
-            capabilities: componentCapabilities('3.4'),
+            capabilities: componentCapabilities('3.13'),
 
             createComponent(factory) {
               return factory.create();
@@ -411,7 +411,7 @@ moduleFor(
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
-            capabilities: componentCapabilities('3.4', {
+            capabilities: componentCapabilities('3.13', {
               destructor: true,
             }),
 
@@ -461,8 +461,9 @@ moduleFor(
       let ComponentClass = setComponentManager(
         () => {
           return EmberObject.create({
-            capabilities: componentCapabilities('3.4', {
+            capabilities: componentCapabilities('3.13', {
               asyncLifecycleCallbacks: true,
+              updateHook: true,
             }),
 
             createComponent(factory, args) {
@@ -570,7 +571,7 @@ moduleFor(
 
       assert.throws(() => {
         this.render('{{foo-bar name=this.name}}', { name: 'world' });
-      }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
+      }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
 
       assert.verifySteps([]);
     }
@@ -665,9 +666,10 @@ moduleFor(
 
     ['@test updating attributes triggers updateComponent and didUpdateComponent'](assert) {
       let TestManager = EmberObject.extend({
-        capabilities: componentCapabilities('3.4', {
+        capabilities: componentCapabilities('3.13', {
           destructor: true,
           asyncLifecycleCallbacks: true,
+          updateHook: true,
         }),
 
         createComponent(factory, args) {
@@ -883,39 +885,9 @@ moduleFor(
 
       assert.throws(() => {
         this.render('<FooBar @name={{this.name}} />', { name: 'world' });
-      }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.4' \| '3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
+      }, /Custom component managers must have a `capabilities` property that is the result of calling the `capabilities\('3.13'\)` \(imported via `import \{ capabilities \} from '@ember\/component';`\). /);
 
       assert.verifySteps([]);
     }
-
-    '@test tracked property mutation in constructor issues a deprecation'() {
-      let ComponentClass = setComponentManager(
-        createBasicManager,
-        class extends EmberObject {
-          @tracked itemCount = 0;
-
-          init() {
-            super.init(...arguments);
-
-            // first read the tracked property
-            let { itemCount } = this;
-
-            // then attempt to update the tracked property
-            this.itemCount = itemCount + 1;
-          }
-        }
-      );
-
-      this.registerComponent('foo-bar', {
-        template: `{{this.itemCount}}`,
-        ComponentClass,
-      });
-
-      expectDeprecation(() => {
-        this.render('<FooBar />');
-      }, /You attempted to update `itemCount` on `<.*>`, but it had already been used previously in the same computation/);
-
-      this.assertHTML(`1`);
-    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 51f639d9e18..144f5dff9a4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -241,50 +241,6 @@ class ModifierManagerTest extends RenderingTestCase {
     assert.equal(updateCount, 2);
   }
 
-  '@test provides a helpful deprecation when mutating a tracked value that was consumed already within constructor'(
-    assert
-  ) {
-    let ModifierClass = setModifierManager(
-      (owner) => {
-        return new this.CustomModifierManager(owner);
-      },
-      class {
-        static create() {
-          return new this();
-        }
-
-        @tracked foo = 123;
-
-        constructor() {
-          // first read the tracked property
-          this.foo;
-
-          // then attempt to update the tracked property
-          this.foo = 456;
-        }
-
-        didInsertElement() {}
-        didUpdate() {}
-        willDestroyElement() {}
-      }
-    );
-
-    this.registerModifier(
-      'foo-bar',
-      class extends ModifierClass {
-        didInsertElement() {
-          assert.ok(true, 'modifiers didInsertElement was called');
-        }
-      }
-    );
-
-    let expectedMessage = backtrackingMessageFor('foo');
-
-    expectDeprecation(() => {
-      this.render('<h1 {{foo-bar}}>hello world</h1>');
-    }, expectedMessage);
-  }
-
   '@test provides a helpful assertion when mutating a value that was consumed already'() {
     class Person {
       @tracked name = 'bob';
@@ -360,96 +316,12 @@ class ModifierManagerTest extends RenderingTestCase {
 
     assert.throws(() => {
       this.render('<h1 {{foo-bar}}>hello world</h1>');
-    }, /Custom modifier managers must have a `capabilities` property that is the result of calling the `capabilities\('3.13' \| '3.22'\)` \(imported via `import \{ capabilities \} from '@ember\/modifier';`\). /);
+    }, /Custom modifier managers must have a `capabilities` property that is the result of calling the `capabilities\('3.22'\)` \(imported via `import \{ capabilities \} from '@ember\/modifier';`\). /);
 
     assert.verifySteps([]);
   }
 }
 
-moduleFor(
-  'Basic Custom Modifier Manager: 3.13',
-  class extends ModifierManagerTest {
-    CustomModifierManager = class CustomModifierManager {
-      capabilities = modifierCapabilities('3.13');
-
-      constructor(owner) {
-        this.owner = owner;
-      }
-
-      createModifier(factory, args) {
-        // factory is the owner.factoryFor result
-        return factory.create(args);
-      }
-
-      installModifier(instance, element, args) {
-        instance.element = element;
-        let { positional, named } = args;
-        instance.didInsertElement(positional, named);
-      }
-
-      updateModifier(instance, args) {
-        let { positional, named } = args;
-        instance.didUpdate(positional, named);
-      }
-
-      destroyModifier(instance) {
-        instance.willDestroyElement();
-      }
-    };
-
-    '@test modifers consume all arguments'(assert) {
-      let insertCount = 0;
-      let updateCount = 0;
-
-      let ModifierClass = setModifierManager(
-        (owner) => {
-          return new this.CustomModifierManager(owner);
-        },
-        EmberObject.extend({
-          didInsertElement() {},
-          didUpdate() {},
-          willDestroyElement() {},
-        })
-      );
-
-      this.registerModifier(
-        'foo-bar',
-        ModifierClass.extend({
-          didInsertElement(_positional, named) {
-            insertCount++;
-
-            // consume qux
-            named.qux;
-          },
-
-          didUpdate(_positiona, named) {
-            updateCount++;
-
-            // consume qux
-            named.qux;
-          },
-        })
-      );
-
-      this.render('<h1 {{foo-bar bar=this.bar qux=this.qux}}>hello world</h1>', {
-        bar: 'bar',
-        qux: 'quz',
-      });
-
-      this.assertHTML(`<h1>hello world</h1>`);
-
-      assert.equal(insertCount, 1);
-      assert.equal(updateCount, 0);
-
-      runTask(() => set(this.context, 'bar', 'other bar'));
-      assert.equal(updateCount, 1);
-
-      runTask(() => set(this.context, 'qux', 'quuuuxxxxxx'));
-      assert.equal(updateCount, 2);
-    }
-  }
-);
-
 moduleFor(
   'Basic Custom Modifier Manager: 3.22',
   class extends ModifierManagerTest {
@@ -674,60 +546,6 @@ moduleFor(
       return { isInteractive: false };
     }
 
-    [`@test doesn't trigger lifecycle hooks when non-interactive: modifierCapabilities('3.13')`](
-      assert
-    ) {
-      class CustomModifierManager {
-        capabilities = modifierCapabilities('3.13');
-
-        constructor(owner) {
-          this.owner = owner;
-        }
-
-        createModifier(factory, args) {
-          return factory.create(args);
-        }
-
-        installModifier(instance, element, args) {
-          instance.element = element;
-          let { positional, named } = args;
-          instance.didInsertElement(positional, named);
-        }
-
-        updateModifier(instance, args) {
-          let { positional, named } = args;
-          instance.didUpdate(positional, named);
-        }
-
-        destroyModifier(instance) {
-          instance.willDestroyElement();
-        }
-      }
-      let ModifierClass = setModifierManager(
-        (owner) => {
-          return new CustomModifierManager(owner);
-        },
-        EmberObject.extend({
-          didInsertElement() {
-            assert.ok(false);
-          },
-          didUpdate() {
-            assert.ok(false);
-          },
-          willDestroyElement() {
-            assert.ok(false);
-          },
-        })
-      );
-
-      this.registerModifier('foo-bar', ModifierClass);
-
-      this.render('<h1 {{foo-bar this.baz}}>hello world</h1>');
-      runTask(() => this.context.set('baz', 'Hello'));
-
-      this.assertHTML('<h1>hello world</h1>');
-    }
-
     [`@test doesn't trigger lifecycle hooks when non-interactive: modifierCapabilities('3.22')`](
       assert
     ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index dcba0e131bf..6043edf5ef8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -8,8 +8,7 @@ import {
   defineSimpleHelper,
 } from 'internal-test-helpers';
 import { Helper, Component } from '@ember/-internals/glimmer';
-import { set, tracked } from '@ember/-internals/metal';
-import { backtrackingMessageFor } from '../../utils/debug-stack';
+import { set } from '@ember/-internals/metal';
 
 moduleFor(
   'Helpers test: custom helpers',
@@ -34,36 +33,19 @@ moduleFor(
       this.assertText('hello | hello world');
     }
 
-    ['@test it does not resolve helpers with a `.` (period)']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
+    ['@test it does not resolve helpers with a `.` (period)'](assert) {
+      if (!DEBUG) {
+        assert.ok(true, 'nothing to do in prod builds, assertion is stripped');
+        return;
+      }
 
       this.registerHelper('hello.world', () => 'hello world');
 
-      this.render('{{hello.world}}', {
-        hello: {
-          world: '',
-        },
-      });
-
-      this.assertText('');
-
-      this.assertStableRerender();
-
-      this.assertText('');
-
-      runTask(() => set(this.context, 'hello', { world: 'hello world!' }));
-
-      this.assertText('hello world!');
-
-      runTask(() => {
-        set(this.context, 'hello', {
-          world: '',
-        });
-      });
-
-      this.assertText('');
+      // cannot use `expectAssertion` because the error is thrown in glimmer-vm
+      // (and doesn't go through Ember's own assertion internals)
+      assert.throws(() => {
+        this.render('{{hello.world}}');
+      }, /Attempted to resolve a value in a strict mode template, but that value was not in scope: hello/);
     }
 
     ['@test it can resolve custom class-based helpers with or without dashes']() {
@@ -731,55 +713,6 @@ moduleFor(
       this.assertText('huzza!');
     }
 
-    ['@test class-based helper gives helpful warning when mutating a value that was tracked already']() {
-      this.add(
-        'helper:hello-world',
-        class extends Helper {
-          compute() {
-            this.get('value');
-            this.set('value', 123);
-          }
-        }
-      );
-
-      let expectedMessage = backtrackingMessageFor('value', '<.+?>', {
-        renderTree: ['\\(result of a `<\\(unknown\\).*?>` helper\\)'],
-      });
-
-      expectDeprecation(() => {
-        // TODO: this must be a bug??
-        expectDeprecation(
-          backtrackingMessageFor('undefined', undefined, {
-            renderTree: ['\\(result of a `<\\(unknown\\).*?>` helper\\)'],
-          })
-        );
-
-        this.render('{{hello-world}}');
-      }, expectedMessage);
-    }
-
-    ['@test class-based helper gives helpful deprecation when mutating a tracked property that was tracked already']() {
-      this.add(
-        'helper:hello-world',
-        class HelloWorld extends Helper {
-          @tracked value;
-
-          compute() {
-            this.value;
-            this.value = 123;
-          }
-        }
-      );
-
-      let expectedMessage = backtrackingMessageFor('value', '<HelloWorld.+?>', {
-        renderTree: ['\\(result of a `<HelloWorld.*?>` helper\\)'],
-      });
-
-      expectDeprecation(() => {
-        this.render('{{hello-world}}');
-      }, expectedMessage);
-    }
-
     '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can resolve a helper'() {
       this.registerHelper('hello-world', ([text]) => text ?? 'Hello, world!');
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index 5e74332aff2..8b42f331c2f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -1,7 +1,5 @@
 import { Object as EmberObject, A, MutableArray } from '@ember/-internals/runtime';
 import {
-  get,
-  set,
   tracked,
   nativeDescDecorator as descriptor,
   notifyPropertyChange,
@@ -9,7 +7,6 @@ import {
 import Service, { service } from '@ember/service';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { backtrackingMessageFor } from '../../utils/debug-stack';
 import { Component } from '../../utils/helpers';
 
 moduleFor(
@@ -406,46 +403,5 @@ moduleFor(
 
       this.assertText('12');
     }
-
-    '@test simple helper gives helpful warning when mutating a value that was tracked already'() {
-      this.registerHelper('hello-world', function helloWorld([person]) {
-        get(person, 'name');
-        set(person, 'name', 'sam');
-      });
-
-      let expectedMessage = backtrackingMessageFor('name', '\\(unknown object\\)', {
-        renderTree: ['\\(result of a `.*` helper\\)'],
-      });
-
-      expectDeprecation(() => {
-        // TODO: this must be a bug??
-        expectDeprecation(
-          backtrackingMessageFor('undefined', undefined, {
-            renderTree: ['\\(result of a `.*` helper\\)'],
-          })
-        );
-
-        this.render('{{hello-world this.model}}', { model: {} });
-      }, expectedMessage);
-    }
-
-    '@test simple helper gives helpful deprecation when mutating a tracked property that was tracked already'() {
-      class Person {
-        @tracked name = 'bob';
-      }
-
-      this.registerHelper('hello-world', ([person]) => {
-        person.name;
-        person.name = 'sam';
-      });
-
-      let expectedMessage = backtrackingMessageFor('name', 'Person', {
-        renderTree: ['\\(result of a `\\(unknown function\\)` helper\\)'],
-      });
-
-      expectDeprecation(() => {
-        this.render('{{hello-world this.model}}', { model: new Person() });
-      }, expectedMessage);
-    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index fd223eaccd6..5d6e7279026 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -6,6 +6,7 @@ import {
   runTask,
 } from 'internal-test-helpers';
 
+import { DEBUG } from '@ember/debug';
 import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
@@ -113,6 +114,11 @@ moduleFor(
     }
 
     async ['@test it emits a useful backtracking re-render assertion message'](assert) {
+      if (!DEBUG) {
+        assert.ok(true, 'nothing to do in prod builds, assertion is stripped');
+        return;
+      }
+
       this.router.map(function () {
         this.route('route-with-mount');
       });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 2959fda9f77..0781841d78c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -725,34 +725,28 @@ class EachTest extends AbstractEachTest {
   }
 
   ['@test the scoped variable is not available outside the {{#each}} block.']() {
-    expectDeprecation(
-      /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-    );
-
     this.makeList(['Yehuda']);
 
-    this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`, {
-      name: 'Stef',
-    });
+    this.render(`{{name}}-{{#each this.list as |name|}}{{name}}{{/each}}-{{name}}`);
 
-    this.assertText('Stef-Yehuda-Stef');
+    this.assertText('-Yehuda-');
 
     runTask(() => this.rerender());
 
-    this.assertText('Stef-Yehuda-Stef');
+    this.assertText('-Yehuda-');
 
     runTask(() => this.pushObjects([' ', 'Katz']));
 
-    this.assertText('Stef-Yehuda Katz-Stef');
+    this.assertText('-Yehuda Katz-');
 
     runTask(() => set(this.context, 'name', 'Tom'));
 
-    this.assertText('Tom-Yehuda Katz-Tom');
+    this.assertText('-Yehuda Katz-');
 
     runTask(() => set(this.context, 'name', 'Stef'));
     this.replaceList(['Yehuda']);
 
-    this.assertText('Stef-Yehuda-Stef');
+    this.assertText('-Yehuda-');
   }
 
   ['@test inverse template is displayed with context']() {
@@ -946,10 +940,6 @@ class EachTest extends AbstractEachTest {
   }
 
   ['@test the scoped variable is not available outside the {{#each}} block']() {
-    expectDeprecation(
-      /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-    );
-
     let first = this.createList(['Limbo']);
     let fifth = this.createList(['Wrath']);
     let ninth = this.createList(['Treachery']);
@@ -957,41 +947,38 @@ class EachTest extends AbstractEachTest {
     this.render(
       `{{ring}}-{{#each this.first as |ring|}}{{ring}}-{{#each this.fifth as |ring|}}{{ring}}-{{#each this.ninth as |ring|}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}-{{/each}}{{ring}}`,
       {
-        ring: 'Greed',
         first: first.list,
         fifth: fifth.list,
         ninth: ninth.list,
       }
     );
 
-    this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+    this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
     runTask(() => this.rerender());
 
-    this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+    this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
     runTask(() => {
-      set(this.context, 'ring', 'O');
       fifth.delegate.insertAt(0, 'D');
     });
 
-    this.assertText('O-Limbo-D-Treachery-D-Wrath-Treachery-Wrath-Limbo-O');
+    this.assertText('-Limbo-D-Treachery-D-Wrath-Treachery-Wrath-Limbo-');
 
     runTask(() => {
       first.delegate.pushObject('I');
       ninth.delegate.replace(0, 1, ['K']);
     });
 
-    this.assertText('O-Limbo-D-K-D-Wrath-K-Wrath-Limbo-I-D-K-D-Wrath-K-Wrath-I-O');
+    this.assertText('-Limbo-D-K-D-Wrath-K-Wrath-Limbo-I-D-K-D-Wrath-K-Wrath-I-');
 
     runTask(() => {
-      set(this.context, 'ring', 'Greed');
       set(this.context, 'first', this.createList(['Limbo']).list);
       set(this.context, 'fifth', this.createList(['Wrath']).list);
       set(this.context, 'ninth', this.createList(['Treachery']).list);
     });
 
-    this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+    this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
   }
 
   ['@test it should support {{#each this.name as |foo|}}, then {{#each foo as |bar|}}']() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index a08c411f2a9..a3f8ef73c9f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -96,35 +96,29 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block.']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.render(`{{name}}-{{#let this.other as |name|}}{{name}}{{/let}}-{{name}}`, {
-        name: 'Stef',
         other: 'Yehuda',
       });
 
-      this.assertText('Stef-Yehuda-Stef');
+      this.assertText('-Yehuda-');
 
       runTask(() => this.rerender());
 
-      this.assertText('Stef-Yehuda-Stef');
+      this.assertText('-Yehuda-');
 
       runTask(() => set(this.context, 'other', 'Chad'));
 
-      this.assertText('Stef-Chad-Stef');
+      this.assertText('-Chad-');
 
       runTask(() => set(this.context, 'name', 'Tom'));
 
-      this.assertText('Tom-Chad-Tom');
+      this.assertText('-Chad-');
 
       runTask(() => {
-        set(this.context, 'name', 'Stef');
         set(this.context, 'other', 'Yehuda');
       });
 
-      this.assertText('Stef-Yehuda-Stef');
+      this.assertText('-Yehuda-');
     }
 
     ['@test can access alias of a proxy']() {
@@ -246,48 +240,41 @@ moduleFor(
     }
 
     ['@test the scoped variable is not available outside the {{#let}} block']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.render(
         `{{ring}}-{{#let this.first as |ring|}}{{ring}}-{{#let this.fifth as |ring|}}{{ring}}-{{#let this.ninth as |ring|}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}-{{/let}}{{ring}}`,
         {
-          ring: 'Greed',
           first: 'Limbo',
           fifth: 'Wrath',
           ninth: 'Treachery',
         }
       );
 
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+      this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
       runTask(() => this.rerender());
 
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+      this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
 
       runTask(() => {
-        set(this.context, 'ring', 'O');
         set(this.context, 'fifth', 'D');
       });
 
-      this.assertText('O-Limbo-D-Treachery-D-Limbo-O');
+      this.assertText('-Limbo-D-Treachery-D-Limbo-');
 
       runTask(() => {
         set(this.context, 'first', 'I');
         set(this.context, 'ninth', 'K');
       });
 
-      this.assertText('O-I-D-K-D-I-O');
+      this.assertText('-I-D-K-D-I-');
 
       runTask(() => {
-        set(this.context, 'ring', 'Greed');
         set(this.context, 'first', 'Limbo');
         set(this.context, 'fifth', 'Wrath');
         set(this.context, 'ninth', 'Treachery');
       });
 
-      this.assertText('Greed-Limbo-Wrath-Treachery-Wrath-Limbo-Greed');
+      this.assertText('-Limbo-Wrath-Treachery-Wrath-Limbo-');
     }
 
     ['@test it should support {{#let name as |foo|}}, then {{#let foo as |bar|}}']() {
@@ -331,10 +318,6 @@ moduleFor(
     }
 
     ['@test nested {{#let}} blocks should have access to root context']() {
-      expectDeprecation(
-        /The `[^`]+` property(?: path)? was used in the `[^`]+` template without using `this`. This fallback behavior has been deprecated, all properties must be looked up on `this` when used in the template: {{[^}]+}}/
-      );
-
       this.render(
         strip`
         {{name}}
@@ -362,30 +345,26 @@ moduleFor(
         }
       );
 
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
 
       runTask(() => this.rerender());
 
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
 
       runTask(() => set(this.context, 'name', 'chancancode'));
 
-      this.assertText('chancancode[trek[machty]trek]chancancode[machty[trek]machty]chancancode');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
 
       runTask(() => set(this.context, 'committer1', { name: 'krisselden' }));
 
-      this.assertText(
-        'chancancode[krisselden[machty]krisselden]chancancode[machty[krisselden]machty]chancancode'
-      );
+      this.assertText('[krisselden[machty]krisselden][machty[krisselden]machty]');
 
       runTask(() => {
         set(this.context, 'committer1.name', 'wycats');
         set(this.context, 'committer2', { name: 'rwjblue' });
       });
 
-      this.assertText(
-        'chancancode[wycats[rwjblue]wycats]chancancode[rwjblue[wycats]rwjblue]chancancode'
-      );
+      this.assertText('[wycats[rwjblue]wycats][rwjblue[wycats]rwjblue]');
 
       runTask(() => {
         set(this.context, 'name', 'ebryn');
@@ -393,7 +372,7 @@ moduleFor(
         set(this.context, 'committer2', { name: 'machty' });
       });
 
-      this.assertText('ebryn[trek[machty]trek]ebryn[machty[trek]machty]ebryn');
+      this.assertText('[trek[machty]trek][machty[trek]machty]');
     }
   }
 );
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 7d6d1183c4c..96ebda31109 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -4,13 +4,7 @@
 import { isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import {
-  consumeTag,
-  deprecateMutationsInTrackingTransaction,
-  isTracking,
-  tagFor,
-  track,
-} from '@glimmer/validator';
+import { consumeTag, isTracking, tagFor, track } from '@glimmer/validator';
 import { isPath } from './path_cache';
 
 export const PROXY_CONTENT = symbol('PROXY_CONTENT');
@@ -118,13 +112,7 @@ export function _getProp(obj: object, keyName: string) {
       !(keyName in obj) &&
       typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
     ) {
-      if (DEBUG) {
-        deprecateMutationsInTrackingTransaction!(() => {
-          value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
-        });
-      } else {
-        value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
-      }
+      value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
     }
 
     if (isTracking()) {
diff --git a/packages/@ember/-internals/metal/tests/tracked/validation_test.js b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
index 1aa090cd903..47e5ba1a231 100644
--- a/packages/@ember/-internals/metal/tests/tracked/validation_test.js
+++ b/packages/@ember/-internals/metal/tests/tracked/validation_test.js
@@ -378,25 +378,6 @@ moduleFor(
       }, /You attempted to update `value` on `EmberObject`, but it had already been used previously in the same computation/);
     }
 
-    ['@test gives helpful deprecation when a tracked property is mutated after access within unknownProperty within an autotracking transaction']() {
-      class EmberObject {
-        @tracked foo;
-
-        unknownProperty() {
-          this.foo;
-          this.foo = 123;
-        }
-      }
-
-      let obj = new EmberObject();
-
-      expectDeprecation(() => {
-        track(() => {
-          get(obj, 'bar');
-        });
-      }, /You attempted to update `foo` on `EmberObject`, but it had already been used previously in the same computation/);
-    }
-
     ['@test get() does not entangle in the autotracking stack until after retrieving the value'](
       assert
     ) {
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 16c014156a2..fe34722c264 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -8,7 +8,6 @@ module.exports = {
     'LOG_VERSION',
     '[]',
     '_APPLICATION_TEMPLATE_WRAPPER',
-    '_DISABLE_PROPERTY_FALLBACK_DEPRECATION',
     '_DEBUG_RENDER_TREE',
     '_DEFAULT_ASYNC_OBSERVERS',
     '_RERENDER_LOOP_LIMIT',
diff --git a/yarn.lock b/yarn.lock
index 4c91962f553..2dfdfb9c456 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2341,52 +2341,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.2.tgz#730001221f7240709f5952f30427f2352aa8b05d"
-  integrity sha512-oWl0A3lvGjlArlYAosUQStCAgboCOaf7GZCJ/A3cGCuy1BlP/pFCBFkgG60SODJwr+zeJLRAh0adroaisH66SA==
-  dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/syntax" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/wire-format" "0.80.2"
+"@glimmer/compiler@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.83.1.tgz#d6b7d22a95c99be19959e7c41cd95eceda54d970"
+  integrity sha512-7Ou4cTVfQjsAklFcZl3nMMTvDQ9P3DH9iOMM7q/Ezpu/fM3fDdYofywmBOi7hHbXCxtfvj4MhLlMlMokFrM32Q==
+  dependencies:
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/syntax" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/wire-format" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.2.tgz#da199504eb91cf2513f2c3ac6d0d899d83b74878"
-  integrity sha512-RdquK8byB/uvwEIzUxXL3dX0wnPW6yLooBmrR/QKOyiP0f23DdLLdT2tc7etITkF0NOFjtRApFr3Kwxm2vsHfA==
+"@glimmer/destroyable@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.83.1.tgz#ccf912bf1d07b1ad47eaf7387af1ee742963470f"
+  integrity sha512-QPTKAg0UToCxtcq+AjhdsSZb4HhYn1CTJ2b2/5Qe9InRCPpnwFsMpLKModCLi3VRKtkBGBprxwP/ht5Ma7ok1A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.2"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/encoder@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.2.tgz#30dd5aed6b56362388a2e3ed1069a318c76132ca"
-  integrity sha512-16D7VVy2Riqc2+q/374auzcJ/KpIIxEactAkPlPUgexwzUEuJSPcg1hcEh0medwPQlNn1YkL+5YFPh9zFUgoWQ==
+"@glimmer/encoder@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.83.1.tgz#6c1619462a46980551d6a74f19266230a04eeb59"
+  integrity sha512-PADybj7+khwSyfcvRpmXpYnfZDsSmw/NpSqtCLolAvtnn7uyFfmKirTc89AWi/9iPtbqfe2XtWv3Dz/R5RnAAA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/vm" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/vm" "0.83.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.2.tgz#aaa389f1055a056d0f911a7e9d101cbcc06f133b"
-  integrity sha512-XskcLaDUoXJYa/RLhkFNZSywzLoeMDQk6UTxvWrCtfE8hKXfeKSKq1FKyYenzB3SMF2ESX5yHOSd/xKBIYVypg==
+"@glimmer/global-context@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66"
+  integrity sha512-OwlgqpbOJU73EjZOZdftab0fKbtdJ4x/QQeJseL9cvaAUiK3+w52M5ONFxD1T/yPBp2Mf7NCYqA/uL8tRbzY2A==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.2.tgz#3937610ada436102ff9f92a6ea89e6d4531c1432"
-  integrity sha512-s5xhjoRNwp2fJty8/LpOY2qRLRlevYZFxEDD+Jl44YTRdU68DZJdSYd0cBknp1qDSi+C74zIg7S5cGwS3ulkUw==
+"@glimmer/interfaces@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.83.1.tgz#fb16f5f683ddc55f130887b6141f58c0751350fe"
+  integrity sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -2395,140 +2395,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.2.tgz#739d9766a21d62965bb322f5c57a7e984af35a1f"
-  integrity sha512-9Fz+R67cqXeDkFBBfag3HNE4bla0Y2BCmzo/VSPzt6dI/2qzWl+MTDyiu85RffAnMZgXuqMUElizcsuq3hWERg==
+"@glimmer/manager@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.83.1.tgz#07e02a40f89cba3eee86b05a2557daa2ef151f6f"
+  integrity sha512-w3JXvtB/S3Bbiv/zIoUP9QmIliIPlmKrF9r4aVeyq24NIE7Dig/R+7/2pkEbqS3nOWizIRswEPqmvWRpMCilmA==
   dependencies:
-    "@glimmer/destroyable" "0.80.2"
+    "@glimmer/destroyable" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/reference" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/validator" "0.80.2"
-
-"@glimmer/node@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.2.tgz#651055876ca4c95fc5159f7918da1ea715e222e6"
-  integrity sha512-Urtey5+Jla2sjJSeYnjIYii9pei7bLr/8dPxbVkmJEh8oK3YIcz7YNymFjXxce2Vxdnj1A1KussGzBcK0FP3pA==
-  dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/runtime" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/reference" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
+
+"@glimmer/node@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.83.1.tgz#a9c87ee9196ab317b9221f4cfe3443a83da447d5"
+  integrity sha512-qog6RV0iLenedxBU2ItLiukP9AP9Wtm/eJK/UbzYHVJjE/9ty4IcrIMHPjs56cGdHfRJO7G9E5XcEBy3W0bKZg==
+  dependencies:
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/runtime" "0.83.1"
+    "@glimmer/util" "0.83.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.2.tgz#be6fe3d0c7e82e1d903a9b594b017236c035018b"
-  integrity sha512-STGh/F8NaYxDVG6rPM97t/A9fnOpU+uK0BQEhRLsx/iGvq8PyE966p4LKyRAbmbuFTLhbZE7E/68Y0k0eWQc6Q==
+"@glimmer/opcode-compiler@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.83.1.tgz#22aa25711326a2d9e02f618ea01788349303d15a"
+  integrity sha512-fkkRRp+Xoe8khGqHg4DNtT6IDgxxozo5ZZiy6eG7YtDAOx2ZGO3K3rZrp7v148T0q+u47Z++aotS5z4pakFK/A==
   dependencies:
-    "@glimmer/encoder" "0.80.2"
+    "@glimmer/encoder" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/reference" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/vm" "0.80.2"
-    "@glimmer/wire-format" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/reference" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/vm" "0.83.1"
+    "@glimmer/wire-format" "0.83.1"
 
-"@glimmer/owner@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.2.tgz#34cf1b70ab3f061d8675c941cecaf3fcc319af3b"
-  integrity sha512-jEwaRA0oEEPaJDHs/5MlWm3fEmhN8qp3NJlLYs5Duviks+tEhtmB1zr3Jg+7TAMrJloRo9iadt4TrZzezgRAIQ==
+"@glimmer/owner@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.83.1.tgz#b55261035d8a62dc26c9243e5a521c615dea83d1"
+  integrity sha512-OrYPJsn/BZ3Bij17Nnno+GuBgLh7z31DRaRZEZbPCZ1i6FyZMOI1qqZo3taOeOTUTKxLaNhxG5BqyiJPFwxUyA==
   dependencies:
-    "@glimmer/util" "0.80.2"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/program@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.2.tgz#dc1a582c564f735f4021d3eb6c54047c237c264f"
-  integrity sha512-MpPJgeCc/yj9uawG4kqBxzVOuJNky3WB9g3Cm21k0Z+YACdguC2UjXUoA9PvjfrLEj+7eajE0wQ+QTbztOwVtQ==
+"@glimmer/program@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.83.1.tgz#2a589f369ce06a37b7a7ec7fd550db708ddc6ee5"
+  integrity sha512-imQx5s6P69simF8oBtruX9Pn9j+aHt6MiAehTiWq+c8kvSsTZnQlYVHCQWfczDRrOcEOb2FvIuuo7C3+TcsKNQ==
   dependencies:
-    "@glimmer/encoder" "0.80.2"
+    "@glimmer/encoder" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/manager" "0.80.2"
-    "@glimmer/opcode-compiler" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/manager" "0.83.1"
+    "@glimmer/opcode-compiler" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/reference@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.2.tgz#db14f64592bd7f505d47527eacc298a1ba7f8ea5"
-  integrity sha512-uXRc912/kAoXgNu2MIWcqARyMUq+h+N82LiNXg0mYo/SYaxT1ag3uVw6nM82ou9ii0lLWKY1fP/4knuSwu0rbA==
+"@glimmer/reference@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.83.1.tgz#0345b95431b5bb19843b308e6311d1ef81e36192"
+  integrity sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.2"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/validator" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
 
-"@glimmer/runtime@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.2.tgz#14895a6d2a0c7214163a21579a7980f8784dfd6c"
-  integrity sha512-7g12Eyo/fQpKICXXW/+cQCA/mYr4ugOrM7YiZSYtAdm1gIQqQFbxnod2iLgFgISDqRHf8cKTsuZw7+yeIwQNIA==
+"@glimmer/runtime@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.83.1.tgz#fe285189b0ec51e00e558204b53ea761690c620f"
+  integrity sha512-el1SxV6SIq3bEB9h0Tz2RWy9AHpEZOjmeyf/cu4sneoDQi3POURJZWf1ptxBs62A0Ae2Rq32SFtuYte/THucQQ==
   dependencies:
-    "@glimmer/destroyable" "0.80.2"
+    "@glimmer/destroyable" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.2"
-    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.80.2"
-    "@glimmer/program" "0.80.2"
-    "@glimmer/reference" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/validator" "0.80.2"
-    "@glimmer/vm" "0.80.2"
-    "@glimmer/wire-format" "0.80.2"
+    "@glimmer/owner" "0.83.1"
+    "@glimmer/program" "0.83.1"
+    "@glimmer/reference" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
+    "@glimmer/vm" "0.83.1"
+    "@glimmer/wire-format" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.2.tgz#2123a0c28c9a9d39b42392aaa3df8b7f3706645b"
-  integrity sha512-30H1RtmjCW5miO4codNPWgyO0UOeBaDuc7ohSuG0E85djh444ImfJwlLE/cW6C4pLb38OeG8vEPODnppWV3XUg==
+"@glimmer/syntax@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.83.1.tgz#7e18dd445871c157ba0281f12a4fbf316fa49b41"
+  integrity sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
     "@handlebars/parser" "~2.0.0"
-    simple-html-tokenizer "^0.5.10"
+    simple-html-tokenizer "^0.5.11"
 
-"@glimmer/util@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.2.tgz#a1dbb11575255a478c0ba161d521cdbad8c3410d"
-  integrity sha512-GniMILqLJ+dWiwmO/UOBPCqwMYEPYoFW3e/mInUbKn0YBenf/M6hJhnPI7Z11NpObknq3s5nNLkDcmR3gdFmHA==
+"@glimmer/util@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb"
+  integrity sha512-amvjtl9dvrkxsoitXAly9W5NUaLIE3A2J2tWhBWIL1Z6DOFotfX7ytIosOIcPhJLZCtiXPHzMutQRv0G/MSMsA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.2.tgz#4ac1faf608913c88d0dab54a37068bbdf6edc62a"
-  integrity sha512-m5K0IxStWHM5vJbJDDXhnr2LGAnC469RclA6jazbtl3fVHEg5njzsQYUIfRTxFpgPK3QEyRJrR6r3PG9RCMnDw==
+"@glimmer/validator@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
+  integrity sha512-LaILSNnQgDHZpaUsfjVndbS1JfVn0xdTlJdFJblPbhoVklOBSReZVekens3EQ6xOr3BC612sRm1hBnEPixOY6A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
 
-"@glimmer/vm-babel-plugins@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.2.tgz#6e3b6b0ec06994084b44fca1f19c20fd945df454"
-  integrity sha512-ufdz76tVz3TivS8Bb92n/v6yXNX8zgREDwR3ju45ZO48yWexySllUBFOvwCAmPIoHSQGq8LyIwJGESIJLacr6A==
+"@glimmer/vm-babel-plugins@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.83.1.tgz#5da67e3d84199352bbf0c5bc3f1ce71bf2b2ddfc"
+  integrity sha512-Cz0e/SrOo1gSNA0PXZRYI1WGmlQSAQCpiERBlXjjpwoLgiqx2kvsjfFiCUC/CfpsO6WN6wuPMeTFGJuhSSeL5A==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.2.tgz#33f875b0b8e2cc5a6c3d5c1548dbbc333631f6ac"
-  integrity sha512-5dk76zuc2wRR6L2FVHJIX0MQ3AuawXoO2JW/i5nP8wu3r3jXXrvUbtwtR2DCq6lasmyjk5pygtf+DSaawrezqg==
+"@glimmer/vm@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.83.1.tgz#ee9611d8a13e7b5923721258600c6085fe165d0b"
+  integrity sha512-mZguahHZJKWwlcU0n5U7mcpxwcIlogHkecYyOsOPPZe2mnAID/8xmZZcFlRAShA/Z98mo4S0WLE6sY/jJ9M1WA==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/wire-format@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.2.tgz#ae7c7bd2e2a56aca6110b6d7048dae6ac99d340e"
-  integrity sha512-UE7P2AJNs9snKr8LRd4LDZYRmOybYJodUl4vfdntmBeYHiGNWWKpft1tgg5IDdBgmYPvoOEaRQUoIkdMhMT6aA==
+"@glimmer/wire-format@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.83.1.tgz#a36f0b80d9cf9f57498bfea5ddbf6d118f96475d"
+  integrity sha512-2WZ7c7tqHXDrznnFFguw7QJOgUUglnHEHzpSqPFvw1S46NecFMG0v9Q7LQRjeCKH+cwExeD6LbbF2dpKIhoJcg==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
@@ -10533,10 +10533,10 @@ simple-dom@^1.4.0:
     "@simple-dom/serializer" "^1.4.0"
     "@simple-dom/void-map" "^1.4.0"
 
-simple-html-tokenizer@^0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.10.tgz#0843e4f00c9677f1c81e3dfeefcee0a4aca8e5d0"
-  integrity sha512-1DHMUmvUOGuUZ9/+cX/+hOhWhRD5dEw6lodn8WuV+T+cQ31hhBcCu1dcDsNotowi4mMaNhrLyKoS+DtB81HdDA==
+simple-html-tokenizer@^0.5.11:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
+  integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==
 
 slash@^3.0.0:
   version "3.0.0"

From 5d24ae7480aae886d7a526d15332f53fe5b1689c Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Wed, 27 Oct 2021 15:39:24 -0400
Subject: [PATCH 0712/1405] Drop export of built-ins, remove legacy components

* Remove the export of `@ember/component/checkbox`
* Remove the export of `@ember/component/text-field`
* Remove the export of `@ember/component/text-area`
* Remove the export of `@ember/component/link-component`
* Remove the assignment of `Ember.Checkbox`
* Remove the assignment of `Ember.TextField`
* Remove the assignment of `Ember.TextArea`
* Remove the assignment of `Ember.LinkComponent`
* Remove the assignment of `Ember.TextSupport`
* Remove the assignment of `Ember.TargetActionSupport`
* Hard-code `EMBER_MODERNIZED_BUILT_IN_COMPONENTS` to `true` path in
  most places. The remaining are a few spots where there are
  deprecations targeting *5.0*.
* Hard-code the built-in components (`<Textarea>`, `<Input>`,
  `<LinkTo>`) for the modernized path
* Remove the `query-params` helper (it is only needed by the legacy
  `LinkComponent` and was deprecated).
* Review https://github.com/emberjs/ember.js/pull/19669 and ensure all
  `disabledWhen` is removed.
* Review https://github.com/emberjs/ember.js/pull/19662 and ensure all
  `@tagName` support is removed
* Review all `ember.built-in-components.*` deprecations and ensure their
  functionality is removed.
* Remove code supporting `ember-glimmer.link-to.positional-arguments`,
  basically
  https://github.com/emberjs/ember.js/blob/master/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
---
 packages/@ember/-internals/glimmer/index.ts   |    5 +-
 .../-internals/glimmer/lib/component.ts       |   72 +-
 .../glimmer/lib/components/-link-to.ts        | 1082 -----------------
 .../glimmer/lib/components/-textarea.ts       |  109 --
 .../glimmer/lib/components/abstract-input.ts  |   70 +-
 .../glimmer/lib/components/checkbox.ts        |  228 ----
 .../glimmer/lib/components/input.ts           |   78 +-
 .../glimmer/lib/components/internal.ts        |  336 +----
 .../glimmer/lib/components/link-to.ts         |  736 +++++------
 .../glimmer/lib/components/text-field.ts      |  272 -----
 .../glimmer/lib/components/textarea.ts        |   62 +-
 .../glimmer/lib/helpers/query-param.ts        |   55 -
 .../@ember/-internals/glimmer/lib/resolver.ts |    2 -
 .../-internals/glimmer/lib/setup-registry.ts  |   18 +-
 .../glimmer/lib/templates/-link-to.d.ts       |    3 -
 .../glimmer/lib/templates/-link-to.hbs        |    5 -
 .../glimmer/lib/templates/input.hbs           |   79 +-
 .../glimmer/lib/templates/link-to.hbs         |   34 +-
 .../glimmer/lib/templates/textarea.hbs        |   58 +-
 .../application/debug-render-tree-test.ts     |   91 +-
 .../components/input-angle-test.js            |  787 +-----------
 .../components/input-curly-test.js            |  659 +---------
 .../link-to/query-params-angle-test.js        |   24 -
 .../link-to/query-params-curly-test.js        |   59 -
 .../link-to/rendering-angle-test.js           |   24 +-
 .../link-to/rendering-curly-test.js           |  105 +-
 .../components/link-to/routing-angle-test.js  |  369 +-----
 .../components/link-to/routing-curly-test.js  | 1027 ++--------------
 .../transitioning-classes-angle-test.js       |  196 ---
 .../transitioning-classes-curly-test.js       |  196 ---
 .../components/strict-mode-test.js            |    9 +-
 .../components/textarea-angle-test.js         |  105 +-
 .../components/textarea-curly-test.js         |  125 +-
 .../integration/components/to-string-test.js  |   18 +-
 .../-internals/glimmer/tests/utils/helpers.js |    1 -
 packages/@ember/-internals/metal/lib/mixin.ts |    5 +-
 .../routing/lib/services/routing.ts           |    2 +-
 .../lib/mixins/target_action_support.js       |   44 +-
 packages/@ember/-internals/views/index.d.ts   |    1 -
 packages/@ember/-internals/views/index.js     |    1 -
 .../views/lib/mixins/text_support.js          |  375 ------
 .../application/tests/application_test.js     |    2 -
 packages/@ember/canary-features/index.ts      |    4 -
 packages/@ember/component/checkbox.ts         |   22 -
 packages/@ember/component/index.ts            |    2 +-
 packages/@ember/component/text-area.ts        |   22 -
 packages/@ember/component/text-field.ts       |   22 -
 packages/@ember/engine/tests/engine_test.js   |    2 -
 packages/@ember/routing/index.ts              |    2 +-
 packages/@ember/routing/link-component.ts     |   22 -
 .../lib/plugins/index.ts                      |    2 -
 .../lib/plugins/transform-link-to.ts          |  245 ----
 .../tests/plugins/transform-link-to-test.js   |  409 -------
 packages/ember/index.js                       |   59 -
 packages/ember/tests/reexports_test.js        |   66 +-
 tests/docs/expected.js                        |   31 -
 tests/node/app-boot-test.js                   |   20 +-
 57 files changed, 566 insertions(+), 7893 deletions(-)
 delete mode 100644 packages/@ember/-internals/glimmer/lib/components/-link-to.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/components/-textarea.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/components/checkbox.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/components/text-field.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts
 delete mode 100644 packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs
 delete mode 100644 packages/@ember/-internals/views/lib/mixins/text_support.js
 delete mode 100644 packages/@ember/component/checkbox.ts
 delete mode 100644 packages/@ember/component/text-area.ts
 delete mode 100644 packages/@ember/component/text-field.ts
 delete mode 100644 packages/@ember/routing/link-component.ts
 delete mode 100644 packages/ember-template-compiler/lib/plugins/transform-link-to.ts
 delete mode 100644 packages/ember-template-compiler/tests/plugins/transform-link-to-test.js

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index aa6c9e2c96f..c4f5cc31ae3 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -295,11 +295,8 @@
 export { templateFactory as template, templateCacheCounters } from '@glimmer/opcode-compiler';
 
 export { default as RootTemplate } from './lib/templates/root';
-export { default as Checkbox } from './lib/components/checkbox';
-export { default as TextField } from './lib/components/text-field';
-export { default as TextArea } from './lib/components/-textarea';
-export { default as LinkComponent } from './lib/components/-link-to';
 export { default as Input } from './lib/components/input';
+export { default as LinkTo } from './lib/components/link-to';
 export { default as Textarea } from './lib/components/textarea';
 export { default as Component } from './lib/component';
 export { default as Helper, helper } from './lib/helper';
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 3633fb24854..5404ce9c26c 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,6 +1,6 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { CoreObject, TargetActionSupport } from '@ember/-internals/runtime';
+import { TargetActionSupport } from '@ember/-internals/runtime';
 import {
   ActionSupport,
   ChildViewsSupport,
@@ -11,8 +11,7 @@ import {
   ViewMixin,
   ViewStateSupport,
 } from '@ember/-internals/views';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { Environment } from '@glimmer/interfaces';
 import { setInternalComponentManager } from '@glimmer/manager';
@@ -1044,71 +1043,4 @@ Component.reopenClass({
 
 setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
 
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(Component, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(Component, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(this: typeof Component, ...args: unknown[]): unknown {
-      if (this === Component) {
-        deprecate(
-          'Reopening the Ember.Component super class itself is deprecated. ' +
-            'Consider alternatives such as installing event listeners on ' +
-            'the document or add the customizations to specific subclasses.',
-          false,
-          {
-            id: 'ember.component.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-reopen',
-            until: '4.0.0',
-          }
-        );
-
-        Component._wasReopened = true;
-      }
-
-      return CoreObject.reopen.call(this, ...args);
-    },
-  });
-
-  Object.defineProperty(Component, 'reopenClass', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopenClass(this: typeof Component, ...args: unknown[]): unknown {
-      if (this === Component) {
-        deprecate(
-          'Reopening the Ember.Component super class itself is deprecated. ' +
-            'Consider alternatives such as installing event listeners on ' +
-            'the document or add the customizations to specific subclasses.',
-          false,
-          {
-            id: 'ember.component.reopen',
-            for: 'ember-source',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-component-reopen',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-          }
-        );
-
-        Component._wasReopened = true;
-      }
-
-      return CoreObject.reopenClass.call(this, ...args);
-    },
-  });
-}
-
 export default Component;
diff --git a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts b/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
deleted file mode 100644
index edd973cae1b..00000000000
--- a/packages/@ember/-internals/glimmer/lib/components/-link-to.ts
+++ /dev/null
@@ -1,1082 +0,0 @@
-/**
-@module ember
-*/
-
-import { alias, computed } from '@ember/-internals/metal';
-import { getOwner } from '@ember/-internals/owner';
-import RouterState from '@ember/-internals/routing/lib/system/router_state';
-import { CoreObject } from '@ember/-internals/runtime';
-import { isSimpleClick } from '@ember/-internals/views';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate, runInDebug, warn } from '@ember/debug';
-import { EngineInstance, getEngineParent } from '@ember/engine';
-import { flaggedInstrument } from '@ember/instrumentation';
-import { service } from '@ember/service';
-import { DEBUG } from '@glimmer/env';
-import EmberComponent from '../component';
-import { HAS_BLOCK } from '../component-managers/curly';
-import layout from '../templates/-link-to';
-
-/**
-  The `LinkTo` component renders a link to the supplied `routeName` passing an optionally
-  supplied model to the route as its `model` context of the route. The block for `LinkTo`
-  becomes the contents of the rendered element:
-
-  ```handlebars
-  <LinkTo @route='photoGallery'>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  This will result in:
-
-  ```html
-  <a href="/hamster-photos">
-    Great Hamster Photos
-  </a>
-  ```
-
-  ### Disabling the `LinkTo` component
-
-  The `LinkTo` component can be disabled by using the `disabled` argument. A disabled link
-  doesn't result in a transition when activated, and adds the `disabled` class to the `<a>`
-  element.
-
-  (The class name to apply to the element can be overridden by using the `disabledClass`
-  argument)
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @disabled={{true}}>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  ### Handling `href`
-
-  `<LinkTo>` will use your application's Router to fill the element's `href` property with a URL
-  that matches the path to the supplied `routeName`.
-
-  ### Handling current route
-
-  The `LinkTo` component will apply a CSS class name of 'active' when the application's current
-  route matches the supplied routeName. For example, if the application's current route is
-  'photoGallery.recent', then the following invocation of `LinkTo`:
-
-  ```handlebars
-  <LinkTo @route='photoGallery.recent'>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  will result in
-
-  ```html
-  <a href="/hamster-photos/this-week" class="active">
-    Great Hamster Photos
-  </a>
-  ```
-
-  The CSS class used for active classes can be customized by passing an `activeClass` argument:
-
-  ```handlebars
-  <LinkTo @route='photoGallery.recent' @activeClass="current-url">
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  ```html
-  <a href="/hamster-photos/this-week" class="current-url">
-    Great Hamster Photos
-  </a>
-  ```
-
-  ### Keeping a link active for other routes
-
-  If you need a link to be 'active' even when it doesn't match the current route, you can use the
-  `current-when` argument.
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @current-when='photos'>
-    Photo Gallery
-  </LinkTo>
-  ```
-
-  This may be helpful for keeping links active for:
-
-  * non-nested routes that are logically related
-  * some secondary menu approaches
-  * 'top navigation' with 'sub navigation' scenarios
-
-  A link will be active if `current-when` is `true` or the current
-  route is the route this link would transition to.
-
-  To match multiple routes 'space-separate' the routes:
-
-  ```handlebars
-  <LinkTo @route='gallery' @current-when='photos drawings paintings'>
-    Art Gallery
-  </LinkTo>
-  ```
-
-  ### Supplying a model
-
-  An optional `model` argument can be used for routes whose
-  paths contain dynamic segments. This argument will become
-  the model context of the linked route:
-
-  ```javascript
-  Router.map(function() {
-    this.route("photoGallery", {path: "hamster-photos/:photo_id"});
-  });
-  ```
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @model={{this.aPhoto}}>
-    {{aPhoto.title}}
-  </LinkTo>
-  ```
-
-  ```html
-  <a href="/hamster-photos/42">
-    Tomster
-  </a>
-  ```
-
-  ### Supplying multiple models
-
-  For deep-linking to route paths that contain multiple
-  dynamic segments, the `models` argument can be used.
-
-  As the router transitions through the route path, each
-  supplied model argument will become the context for the
-  route with the dynamic segments:
-
-  ```javascript
-  Router.map(function() {
-    this.route("photoGallery", { path: "hamster-photos/:photo_id" }, function() {
-      this.route("comment", {path: "comments/:comment_id"});
-    });
-  });
-  ```
-
-  This argument will become the model context of the linked route:
-
-  ```handlebars
-  <LinkTo @route='photoGallery.comment' @models={{array this.aPhoto this.comment}}>
-    {{comment.body}}
-  </LinkTo>
-  ```
-
-  ```html
-  <a href="/hamster-photos/42/comments/718">
-    A+++ would snuggle again.
-  </a>
-  ```
-
-  ### Supplying an explicit dynamic segment value
-
-  If you don't have a model object available to pass to `LinkTo`,
-  an optional string or integer argument can be passed for routes whose
-  paths contain dynamic segments. This argument will become the value
-  of the dynamic segment:
-
-  ```javascript
-  Router.map(function() {
-    this.route("photoGallery", { path: "hamster-photos/:photo_id" });
-  });
-  ```
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @model={{aPhotoId}}>
-    {{this.aPhoto.title}}
-  </LinkTo>
-  ```
-
-  ```html
-  <a href="/hamster-photos/42">
-    Tomster
-  </a>
-  ```
-
-  When transitioning into the linked route, the `model` hook will
-  be triggered with parameters including this passed identifier.
-
-  ### Supplying a `tagName`
-
-  By default `<LinkTo>` renders an `<a>` element. This can be overridden for a single use of
-  `<LinkTo>` by supplying a `tagName` argument:
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @tagName='li'>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  This produces:
-
-  ```html
-  <li>
-    Great Hamster Photos
-  </li>
-  ```
-
-  In general, this is not recommended.
-
-  ### Supplying query parameters
-
-  If you need to add optional key-value pairs that appear to the right of the ? in a URL,
-  you can use the `query` argument.
-
-  ```handlebars
-  <LinkTo @route='photoGallery' @query={{hash page=1 per_page=20}}>
-    Great Hamster Photos
-  </LinkTo>
-  ```
-
-  This will result in:
-
-  ```html
-  <a href="/hamster-photos?page=1&per_page=20">
-    Great Hamster Photos
-  </a>
-  ```
-
-  @for Ember.Templates.components
-  @method LinkTo
-  @see {LinkComponent}
-  @public
-*/
-
-/**
-  @module @ember/routing
-*/
-
-/**
-  See [Ember.Templates.components.LinkTo](/ember/release/classes/Ember.Templates.components/methods/input?anchor=LinkTo).
-
-  @for Ember.Templates.helpers
-  @method link-to
-  @see {Ember.Templates.components.LinkTo}
-  @public
-**/
-
-/**
-  `LinkComponent` is the internal component invoked with `<LinkTo>` or `{{link-to}}`.
-
-  @class LinkComponent
-  @extends Component
-  @see {Ember.Templates.components.LinkTo}
-  @public
-**/
-
-const UNDEFINED = Object.freeze({
-  toString() {
-    return 'UNDEFINED';
-  },
-});
-
-const EMPTY_QUERY_PARAMS = Object.freeze({});
-
-const LinkComponent = EmberComponent.extend({
-  layout,
-
-  tagName: 'a',
-
-  /**
-    @property route
-    @public
-  */
-  route: UNDEFINED,
-
-  /**
-    @property model
-    @public
-  */
-  model: UNDEFINED,
-
-  /**
-    @property models
-    @public
-  */
-  models: UNDEFINED,
-
-  /**
-    @property query
-    @public
-  */
-  query: UNDEFINED,
-
-  /**
-    Used to determine when this `LinkComponent` is active.
-
-    @property current-when
-    @public
-  */
-  'current-when': null,
-
-  /**
-    Sets the `title` attribute of the `LinkComponent`'s HTML element.
-
-    @property title
-    @default null
-    @public
-  **/
-  title: null,
-
-  /**
-    Sets the `rel` attribute of the `LinkComponent`'s HTML element.
-
-    @property rel
-    @default null
-    @public
-  **/
-  rel: null,
-
-  /**
-    Sets the `tabindex` attribute of the `LinkComponent`'s HTML element.
-
-    @property tabindex
-    @default null
-    @public
-  **/
-  tabindex: null,
-
-  /**
-    Sets the `target` attribute of the `LinkComponent`'s HTML element.
-
-    @since 1.8.0
-    @property target
-    @default null
-    @public
-  **/
-  target: null,
-
-  /**
-    The CSS class to apply to `LinkComponent`'s element when its `active`
-    property is `true`.
-
-    @property activeClass
-    @type String
-    @default active
-    @public
-  **/
-  activeClass: 'active',
-
-  /**
-    The CSS class to apply to `LinkComponent`'s element when its `loading`
-    property is `true`.
-
-    @property loadingClass
-    @type String
-    @default loading
-    @public
-  **/
-  loadingClass: 'loading',
-
-  /**
-    The CSS class to apply to a `LinkComponent`'s element when its `disabled`
-    property is `true`.
-
-    @property disabledClass
-    @type String
-    @default disabled
-    @public
-  **/
-  disabledClass: 'disabled',
-
-  /**
-    Determines whether the `LinkComponent` will trigger routing via
-    the `replaceWith` routing strategy.
-
-    @property replace
-    @type Boolean
-    @default false
-    @public
-  **/
-  replace: false,
-
-  /**
-    Determines whether the `LinkComponent` will prevent the default
-    browser action by calling preventDefault() to avoid reloading
-    the browser page.
-
-    If you need to trigger a full browser reload pass `@preventDefault={{false}}`:
-
-    ```handlebars
-    <LinkTo @route='photoGallery' @model={{this.aPhotoId}} @preventDefault={{false}}>
-      {{this.aPhotoId.title}}
-    </LinkTo>
-    ```
-
-    @property preventDefault
-    @type Boolean
-    @default true
-    @private
-  **/
-  preventDefault: true,
-
-  /**
-    By default this component will forward `href`, `title`, `rel`, `tabindex`, and `target`
-    arguments to attributes on the component's element. When invoked with `{{link-to}}`, you can
-    only customize these attributes. When invoked with `<LinkTo>`, you can just use HTML
-    attributes directly.
-
-    @property attributeBindings
-    @type Array | String
-    @default ['title', 'rel', 'tabindex', 'target']
-    @public
-  */
-  attributeBindings: ['href', 'title', 'rel', 'tabindex', 'target'],
-
-  /**
-    By default this component will set classes on its element when any of the following arguments
-    are truthy:
-
-    * active
-    * loading
-    * disabled
-
-    When these arguments are truthy, a class with the same name will be set on the element. When
-    falsy, the associated class will not be on the element.
-
-    @property classNameBindings
-    @type Array
-    @default ['active', 'loading', 'disabled', 'ember-transitioning-in', 'ember-transitioning-out']
-    @public
-  */
-  classNameBindings: ['active', 'loading', 'disabled', 'transitioningIn', 'transitioningOut'],
-
-  /**
-    By default this component responds to the `click` event. When the component element is an
-    `<a>` element, activating the link in another way, such as using the keyboard, triggers the
-    click event.
-
-    @property eventName
-    @type String
-    @default click
-    @private
-  */
-  eventName: 'click',
-
-  // this is doc'ed here so it shows up in the events
-  // section of the API documentation, which is where
-  // people will likely go looking for it.
-  /**
-    Triggers the `LinkComponent`'s routing behavior. If
-    `eventName` is changed to a value other than `click`
-    the routing behavior will trigger on that custom event
-    instead.
-
-    @event click
-    @private
-  */
-
-  /**
-    An overridable method called when `LinkComponent` objects are instantiated.
-
-    Example:
-
-    ```app/components/my-link.js
-    import LinkComponent from '@ember/routing/link-component';
-
-    export default LinkComponent.extend({
-      init() {
-        this._super(...arguments);
-        console.log('Event is ' + this.get('eventName'));
-      }
-    });
-    ```
-
-    NOTE: If you do override `init` for a framework class like `Component`,
-    be sure to call `this._super(...arguments)` in your
-    `init` declaration! If you don't, Ember may not have an opportunity to
-    do important setup work, and you'll see strange behavior in your
-    application.
-
-    @method init
-    @private
-  */
-  init() {
-    this._super(...arguments);
-
-    this.assertLinkToOrigin();
-
-    // Map desired event name to invoke function
-    let { eventName } = this;
-    this.on(eventName, this, this._invoke);
-  },
-
-  _routing: service('-routing'),
-  _currentRoute: alias('_routing.currentRouteName'),
-  _currentRouterState: alias('_routing.currentState'),
-  _targetRouterState: alias('_routing.targetState'),
-
-  _isEngine: computed(function (this: any) {
-    return getEngineParent(getOwner(this) as EngineInstance) !== undefined;
-  }),
-
-  _engineMountPoint: computed(function (this: any) {
-    return (getOwner(this) as EngineInstance).mountPoint;
-  }),
-
-  _route: computed('route', '_currentRouterState', function computeLinkToComponentRoute(this: any) {
-    let { route } = this;
-
-    return route === UNDEFINED ? this._currentRoute : this._namespaceRoute(route);
-  }),
-
-  _models: computed('model', 'models', function computeLinkToComponentModels(this: any) {
-    let { model, models } = this;
-
-    assert(
-      'You cannot provide both the `@model` and `@models` arguments to the <LinkTo> component.',
-      model === UNDEFINED || models === UNDEFINED
-    );
-
-    if (model !== UNDEFINED) {
-      return [model];
-    } else if (models !== UNDEFINED) {
-      assert('The `@models` argument must be an array.', Array.isArray(models));
-      return models;
-    } else {
-      return [];
-    }
-  }),
-
-  _query: computed('query', function computeLinkToComponentQuery(this: any) {
-    let { query } = this;
-
-    if (query === UNDEFINED) {
-      return EMPTY_QUERY_PARAMS;
-    } else {
-      return Object.assign({}, query);
-    }
-  }),
-
-  /**
-    Accessed as a classname binding to apply the component's `disabledClass`
-    CSS `class` to the element when the link is disabled.
-
-    When `true`, interactions with the element will not trigger route changes.
-    @property disabled
-    @private
-  */
-  disabled: computed({
-    get(_key: string): boolean {
-      // always returns false for `get` because (due to the `set` just below)
-      // the cached return value from the set will prevent this getter from _ever_
-      // being called after a set has occurred
-      return false;
-    },
-
-    set(this: any, _key: string, value: any): boolean {
-      this._isDisabled = value;
-
-      return value ? this.disabledClass : false;
-    },
-  }),
-
-  /**
-    Accessed as a classname binding to apply the component's `activeClass`
-    CSS `class` to the element when the link is active.
-
-    This component is considered active when its `currentWhen` property is `true`
-    or the application's current route is the route this component would trigger
-    transitions into.
-
-    The `currentWhen` property can match against multiple routes by separating
-    route names using the ` ` (space) character.
-
-    @property active
-    @private
-  */
-  active: computed('activeClass', '_active', function computeLinkToComponentActiveClass(this: any) {
-    return this._active ? this.activeClass : false;
-  }),
-
-  _active: computed(
-    '_currentRouterState',
-    '_route',
-    '_models',
-    '_query',
-    'loading',
-    'current-when',
-    function computeLinkToComponentActive(this: any) {
-      let { _currentRouterState: state } = this;
-
-      if (state) {
-        return this._isActive(state);
-      } else {
-        return false;
-      }
-    }
-  ),
-
-  willBeActive: computed(
-    '_currentRouterState',
-    '_targetRouterState',
-    '_route',
-    '_models',
-    '_query',
-    'loading',
-    'current-when',
-    function computeLinkToComponentWillBeActive(this: any) {
-      let { _currentRouterState: current, _targetRouterState: target } = this;
-
-      if (current === target) {
-        return;
-      }
-
-      return this._isActive(target);
-    }
-  ),
-
-  /**
-   * Method to assert that LinkTo is not used inside of a routeless engine. This method is
-   * overridden in ember-engines link-to-external component to just be a noop, since the
-   * link-to-external component extends the link-to component.
-   *
-   * @method assertLinkToOrigin
-   * @private
-   */
-  assertLinkToOrigin() {
-    assert(
-      'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
-        'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
-        'See https://ember-engines.com/docs/links for more info.',
-      !this._isEngine || this._engineMountPoint !== undefined
-    );
-  },
-
-  _isActive(routerState: RouterState): boolean {
-    if (this.loading) {
-      return false;
-    }
-
-    let currentWhen = this['current-when'];
-
-    if (typeof currentWhen === 'boolean') {
-      return currentWhen;
-    }
-
-    let { _models: models, _routing: routing } = this;
-
-    if (typeof currentWhen === 'string') {
-      return currentWhen
-        .split(' ')
-        .some((route) =>
-          routing.isActiveForRoute(models, undefined, this._namespaceRoute(route), routerState)
-        );
-    } else {
-      return routing.isActiveForRoute(models, this._query, this._route, routerState);
-    }
-  },
-
-  transitioningIn: computed(
-    '_active',
-    'willBeActive',
-    function computeLinkToComponentTransitioningIn(this: any) {
-      if (this.willBeActive === true && !this._active) {
-        return 'ember-transitioning-in';
-      } else {
-        return false;
-      }
-    }
-  ),
-
-  transitioningOut: computed(
-    '_active',
-    'willBeActive',
-    function computeLinkToComponentTransitioningOut(this: any) {
-      if (this.willBeActive === false && this._active) {
-        return 'ember-transitioning-out';
-      } else {
-        return false;
-      }
-    }
-  ),
-
-  _namespaceRoute(route: string): string {
-    let { _engineMountPoint: mountPoint } = this;
-
-    if (mountPoint === undefined) {
-      return route;
-    } else if (route === 'application') {
-      return mountPoint;
-    } else {
-      return `${mountPoint}.${route}`;
-    }
-  },
-
-  /**
-    Event handler that invokes the link, activating the associated route.
-
-    @method _invoke
-    @param {Event} event
-    @private
-  */
-  _invoke(this: any, event: Event): boolean {
-    if (!isSimpleClick(event)) {
-      return true;
-    }
-
-    let { bubbles, preventDefault } = this;
-    let target = this.element.target;
-    let isSelf = !target || target === '_self';
-
-    if (preventDefault !== false && isSelf) {
-      event.preventDefault();
-    }
-
-    if (bubbles === false) {
-      event.stopPropagation();
-    }
-
-    if (this._isDisabled) {
-      return false;
-    }
-
-    if (this.loading) {
-      // tslint:disable-next-line:max-line-length
-      warn(
-        'This link is in an inactive loading state because at least one of its models ' +
-          'currently has a null/undefined value, or the provided route name is invalid.',
-        false,
-        {
-          id: 'ember-glimmer.link-to.inactive-loading-state',
-        }
-      );
-      return false;
-    }
-
-    if (!isSelf) {
-      return false;
-    }
-
-    let { _route: routeName, _models: models, _query: queryParams, replace: shouldReplace } = this;
-
-    let payload = {
-      queryParams,
-      routeName,
-    };
-
-    flaggedInstrument(
-      'interaction.link-to',
-      payload,
-      this._generateTransition(payload, routeName, models, queryParams, shouldReplace)
-    );
-    return false;
-  },
-
-  _generateTransition(
-    payload: any,
-    qualifiedRouteName: string,
-    models: any[],
-    queryParams: any[],
-    shouldReplace: boolean
-  ) {
-    let { _routing: routing } = this;
-
-    return () => {
-      payload.transition = routing.transitionTo(
-        qualifiedRouteName,
-        models,
-        queryParams,
-        shouldReplace
-      );
-    };
-  },
-
-  /**
-    Sets the element's `href` attribute to the url for
-    the `LinkComponent`'s targeted route.
-
-    If the `LinkComponent`'s `tagName` is changed to a value other
-    than `a`, this property will be ignored.
-
-    @property href
-    @private
-  */
-  href: computed(
-    '_currentRouterState',
-    '_route',
-    '_models',
-    '_query',
-    'tagName',
-    'loading',
-    'loadingHref',
-    function computeLinkToComponentHref(this: any) {
-      if (this.tagName !== 'a') {
-        return;
-      }
-
-      if (this.loading) {
-        return this.loadingHref;
-      }
-
-      let { _route: route, _models: models, _query: query, _routing: routing } = this;
-
-      if (DEBUG) {
-        /*
-         * Unfortunately, to get decent error messages, we need to do this.
-         * In some future state we should be able to use a "feature flag"
-         * which allows us to strip this without needing to call it twice.
-         *
-         * if (isDebugBuild()) {
-         *   // Do the useful debug thing, probably including try/catch.
-         * } else {
-         *   // Do the performant thing.
-         * }
-         */
-        try {
-          return routing.generateURL(route, models, query);
-        } catch (e) {
-          // tslint:disable-next-line:max-line-length
-          e.message = `While generating link to route "${this.route}": ${e.message}`;
-          throw e;
-        }
-      } else {
-        return routing.generateURL(route, models, query);
-      }
-    }
-  ),
-
-  loading: computed(
-    '_route',
-    '_modelsAreLoaded',
-    'loadingClass',
-    function computeLinkToComponentLoading(this: any) {
-      let { _route: route, _modelsAreLoaded: loaded } = this;
-
-      if (!loaded || route === null || route === undefined) {
-        return this.loadingClass;
-      }
-    }
-  ),
-
-  _modelsAreLoaded: computed('_models', function computeLinkToComponentModelsAreLoaded(this: any) {
-    let { _models: models } = this;
-
-    for (let i = 0; i < models.length; i++) {
-      let model = models[i];
-      if (model === null || model === undefined) {
-        return false;
-      }
-    }
-
-    return true;
-  }),
-
-  /**
-    The default href value to use while a link-to is loading.
-    Only applies when tagName is 'a'
-
-    @property loadingHref
-    @type String
-    @default #
-    @private
-  */
-  loadingHref: '#',
-
-  didReceiveAttrs() {
-    let { disabledWhen } = this;
-
-    if (disabledWhen !== undefined) {
-      this.set('disabled', disabledWhen);
-    }
-
-    let { params } = this;
-
-    if (!params || params.length === 0) {
-      assert(
-        'You must provide at least one of the `@route`, `@model`, `@models` or `@query` argument to `<LinkTo>`.',
-        !(
-          this.route === UNDEFINED &&
-          this.model === UNDEFINED &&
-          this.models === UNDEFINED &&
-          this.query === UNDEFINED
-        )
-      );
-
-      let { _models: models } = this;
-      if (models.length > 0) {
-        let lastModel = models[models.length - 1];
-
-        if (typeof lastModel === 'object' && lastModel !== null && lastModel.isQueryParams) {
-          this.query = lastModel.values;
-          models.pop();
-        }
-      }
-
-      return;
-    }
-
-    let hasBlock = this[HAS_BLOCK];
-
-    params = params.slice();
-
-    // Process the positional arguments, in order.
-    // 1. Inline link title comes first, if present.
-    if (!hasBlock) {
-      this.set('linkTitle', params.shift());
-    }
-
-    // 2. The last argument is possibly the `query` object.
-    let queryParams = params[params.length - 1];
-
-    if (queryParams && queryParams.isQueryParams) {
-      this.set('query', params.pop().values);
-    } else {
-      this.set('query', UNDEFINED);
-    }
-
-    // 3. If there is a `route`, it is now at index 0.
-    if (params.length === 0) {
-      this.set('route', UNDEFINED);
-    } else {
-      this.set('route', params.shift());
-    }
-
-    // 4. Any remaining indices (if any) are `models`.
-    this.set('model', UNDEFINED);
-    this.set('models', params);
-
-    runInDebug(() => {
-      params = this.params.slice();
-
-      let equivalentNamedArgs = [];
-      let hasQueryParams = false;
-
-      // Process the positional arguments, in order.
-      // 1. Inline link title comes first, if present.
-      if (!hasBlock) {
-        params.shift();
-      }
-
-      // 2. The last argument is possibly the `query` object.
-      let query = params[params.length - 1];
-
-      if (query && query.isQueryParams) {
-        params.pop();
-        hasQueryParams = true;
-      }
-
-      // 3. If there is a `route`, it is now at index 0.
-      if (params.length > 0) {
-        params.shift();
-        equivalentNamedArgs.push('`@route`');
-      }
-
-      // 4. Any remaining params (if any) are `models`.
-      if (params.length === 1) {
-        equivalentNamedArgs.push('`@model`');
-      } else if (params.length > 1) {
-        equivalentNamedArgs.push('`@models`');
-      }
-
-      if (hasQueryParams) {
-        equivalentNamedArgs.push('`@query`');
-      }
-
-      if (equivalentNamedArgs.length > 0) {
-        let message = 'Invoking the `<LinkTo>` component with positional arguments is deprecated.';
-
-        message += `Please use the equivalent named arguments (${equivalentNamedArgs.join(', ')})`;
-
-        if (hasQueryParams) {
-          message += ' along with the `hash` helper';
-        }
-
-        if (!hasBlock) {
-          message += " and pass a block for the link's content.";
-        }
-
-        message += '.';
-
-        deprecate(message, false, {
-          id: 'ember-glimmer.link-to.positional-arguments',
-          until: '4.0.0',
-          for: 'ember-source',
-          url:
-            'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
-          since: {
-            enabled: '3.26.0-beta.1',
-          },
-        });
-      }
-    });
-  },
-});
-
-LinkComponent.toString = () => '@ember/routing/link-component';
-
-LinkComponent.reopenClass({
-  positionalParams: 'params',
-});
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(LinkComponent, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(LinkComponent, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(this: typeof LinkComponent, ...args: unknown[]): unknown {
-      if (this === LinkComponent) {
-        deprecate(
-          'Reopening Ember.LinkComponent is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        LinkComponent._wasReopened = true;
-      }
-
-      return CoreObject.reopen.call(this, ...args);
-    },
-  });
-
-  Object.defineProperty(LinkComponent, 'reopenClass', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopenClass(this: typeof LinkComponent, ...args: unknown[]): unknown {
-      if (this === LinkComponent) {
-        deprecate(
-          'Reopening Ember.LinkComponent is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        LinkComponent._wasReopened = true;
-      }
-
-      return CoreObject.reopenClass.call(this, ...args);
-    },
-  });
-}
-
-export default LinkComponent;
diff --git a/packages/@ember/-internals/glimmer/lib/components/-textarea.ts b/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
deleted file mode 100644
index 95aa097bc1c..00000000000
--- a/packages/@ember/-internals/glimmer/lib/components/-textarea.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
-@module @ember/component
-*/
-import { CoreObject } from '@ember/-internals/runtime';
-import { TextSupport } from '@ember/-internals/views';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-import Component from '../component';
-import layout from '../templates/empty';
-
-/**
-  The internal representation used for `Textarea` invocations.
-
-  @class TextArea
-  @extends Component
-  @see {Ember.Templates.components.Textarea}
-  @uses Ember.TextSupport
-  @public
-*/
-const TextArea = Component.extend(TextSupport, {
-  classNames: ['ember-text-area'],
-
-  layout,
-
-  tagName: 'textarea',
-  attributeBindings: [
-    'rows',
-    'cols',
-    'name',
-    'selectionEnd',
-    'selectionStart',
-    'autocomplete',
-    'wrap',
-    'lang',
-    'dir',
-    'value',
-  ],
-  rows: null,
-  cols: null,
-});
-
-TextArea.toString = () => '@ember/component/text-area';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(TextArea, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(TextArea, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(this: typeof TextArea, ...args: unknown[]): unknown {
-      if (this === TextArea) {
-        deprecate(
-          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        TextArea._wasReopened = true;
-      }
-
-      return CoreObject.reopen.call(this, ...args);
-    },
-  });
-
-  Object.defineProperty(TextArea, 'reopenClass', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopenClass(this: typeof TextArea, ...args: unknown[]): unknown {
-      if (this === TextArea) {
-        deprecate(
-          'Reopening Ember.TextArea is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        TextArea._wasReopened = true;
-      }
-
-      return CoreObject.reopenClass.call(this, ...args);
-    },
-  });
-}
-
-export default TextArea;
diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index 1ae1ca26a74..1580cbace9f 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -1,19 +1,8 @@
 import { tracked } from '@ember/-internals/metal';
-import { TargetActionSupport } from '@ember/-internals/runtime';
-import { TextSupport } from '@ember/-internals/views';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { action } from '@ember/object';
 import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
-import Component from '../component';
-import InternalComponent, {
-  DeprecatingInternalComponent,
-  EventListener,
-  handleDeprecatedArguments,
-  handleDeprecatedAttributeArguments,
-  handleDeprecatedEventArguments,
-  InternalComponentConstructor,
-} from './internal';
+import InternalComponent, { EventListener } from './internal';
 
 const UNINITIALIZED: unknown = Object.freeze({});
 
@@ -109,11 +98,7 @@ class ForkedValue implements Value {
   }
 }
 
-export default abstract class AbstractInput
-  extends InternalComponent
-  implements DeprecatingInternalComponent {
-  modernized = this.shouldModernize();
-
+export default abstract class AbstractInput extends InternalComponent {
   validateArguments(): void {
     assert(
       `The ${this.constructor} component does not take any positional arguments`,
@@ -123,15 +108,6 @@ export default abstract class AbstractInput
     super.validateArguments();
   }
 
-  protected shouldModernize(): boolean {
-    return (
-      Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
-      Component._wasReopened === false &&
-      TextSupport._wasReopened === false &&
-      TargetActionSupport._wasReopened === false
-    );
-  }
-
   private _value = valueFrom(this.args.named.value);
 
   get value(): unknown {
@@ -200,45 +176,3 @@ export default abstract class AbstractInput
     return virtualEvents.indexOf(name) !== -1;
   }
 }
-
-export function handleDeprecatedFeatures(
-  target: InternalComponentConstructor<AbstractInput>,
-  attributeBindings: Array<string | [attribute: string, argument: string]>
-): void {
-  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-    let { prototype } = target;
-
-    let virtualEvents = {
-      focusin: 'focus-in',
-      focusout: 'focus-out',
-      keypress: 'key-press',
-      keyup: 'key-up',
-      keydown: 'key-down',
-    };
-
-    handleDeprecatedArguments(target);
-
-    handleDeprecatedAttributeArguments(target, attributeBindings);
-
-    handleDeprecatedEventArguments(target, Object.entries(virtualEvents));
-
-    {
-      let superIsVirtualEventListener = prototype['isVirtualEventListener'];
-
-      Object.defineProperty(prototype, 'isVirtualEventListener', {
-        configurable: true,
-        enumerable: false,
-        value: function isVirtualEventListener(
-          this: AbstractInput,
-          name: string,
-          listener: Function
-        ): listener is VirtualEventListener {
-          return (
-            Object.values(virtualEvents).indexOf(name) !== -1 ||
-            superIsVirtualEventListener.call(this, name, listener)
-          );
-        },
-      });
-    }
-  }
-}
diff --git a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts b/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
deleted file mode 100644
index c2a781c4d92..00000000000
--- a/packages/@ember/-internals/glimmer/lib/components/checkbox.ts
+++ /dev/null
@@ -1,228 +0,0 @@
-import { set } from '@ember/-internals/metal';
-import { FrameworkObject } from '@ember/-internals/runtime';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import EmberComponent from '../component';
-import layout from '../templates/empty';
-
-/**
-@module @ember/component
-*/
-
-/**
-  The internal class used to create text inputs when the `{{input}}`
-  helper is used with `type` of `checkbox`.
-
-  See [Ember.Templates.helpers.input](/ember/release/classes/Ember.Templates.helpers/methods/input?anchor=input)  for usage details.
-
-  ## Direct manipulation of `checked`
-
-  The `checked` attribute of an `Checkbox` object should always be set
-  through the Ember object or by interacting with its rendered element
-  representation via the mouse, keyboard, or touch. Updating the value of the
-  checkbox programmatically will result in the checked value of the object and its
-  element losing synchronization.
-
-  ## Layout and LayoutName properties
-
-  Because HTML `input` elements are self closing `layout` and `layoutName`
-  properties will not be applied.
-
-  @class Checkbox
-  @extends Component
-  @public
-*/
-const Checkbox = EmberComponent.extend({
-  layout,
-
-  /**
-    By default, this component will add the `ember-checkbox` class to the component's element.
-
-    @property classNames
-    @type Array | String
-    @default ['ember-checkbox']
-    @public
-   */
-  classNames: ['ember-checkbox'],
-
-  tagName: 'input',
-
-  /**
-    By default this component will forward a number of arguments to attributes on the the
-    component's element:
-
-    * indeterminate
-    * disabled
-    * tabindex
-    * name
-    * autofocus
-    * required
-    * form
-
-    When invoked with curly braces, this is the exhaustive list of HTML attributes you can
-    customize (i.e. `{{input type="checkbox" disabled=true}}`).
-
-    When invoked with angle bracket invocation, this list is irrelevant, because you can use HTML
-    attribute syntax to customize the element (i.e.
-    `<Input @type="checkbox" disabled data-custom="custom value" />`). However, `@type` and
-    `@checked` must be passed as named arguments, not attributes.
-
-    @property attributeBindings
-    @type Array | String
-    @default ['type', 'checked', 'indeterminate', 'disabled', 'tabindex', 'name', 'autofocus', 'required', 'form']
-    @public
-  */
-  attributeBindings: [
-    'type',
-    'checked',
-    'indeterminate',
-    'disabled',
-    'tabindex',
-    'name',
-    'autofocus',
-    'required',
-    'form',
-  ],
-
-  /**
-    Sets the `type` attribute of the `Checkbox`'s element
-
-    @property disabled
-    @default false
-    @private
-   */
-  type: 'checkbox',
-
-  /**
-    Sets the `disabled` attribute of the `Checkbox`'s element
-
-    @property disabled
-    @default false
-    @public
-   */
-  disabled: false,
-
-  /**
-    Corresponds to the `indeterminate` property of the `Checkbox`'s element
-
-    @property disabled
-    @default false
-    @public
-   */
-  indeterminate: false,
-
-  /**
-    Whenever the checkbox is inserted into the DOM, perform initialization steps, which include
-    setting the indeterminate property if needed.
-
-    If this method is overridden, `super` must be called.
-
-    @method
-    @public
-   */
-  didInsertElement() {
-    this._super(...arguments);
-    this.element.indeterminate = Boolean(this.indeterminate);
-  },
-
-  /**
-    Whenever the `change` event is fired on the checkbox, update its `checked` property to reflect
-    whether the checkbox is checked.
-
-    If this method is overridden, `super` must be called.
-
-    @method
-    @public
-   */
-  change() {
-    set(this, 'checked', this.element.checked);
-  },
-});
-
-if (DEBUG) {
-  const UNSET = {};
-
-  Checkbox.reopen({
-    value: UNSET,
-
-    didReceiveAttrs() {
-      this._super();
-
-      assert(
-        "`<Input @type='checkbox' @value={{...}} />` is not supported; " +
-          "please use `<Input @type='checkbox' @checked={{...}} />` instead.",
-        !(this.type === 'checkbox' && this.value !== UNSET)
-      );
-    },
-  });
-}
-
-Checkbox.toString = () => '@ember/component/checkbox';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(Checkbox, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(Checkbox, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(this: typeof Checkbox, ...args: unknown[]): unknown {
-      if (this === Checkbox) {
-        deprecate(
-          'Reopening Ember.Checkbox is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        Checkbox._wasReopened = true;
-      }
-
-      return FrameworkObject.reopen.call(this, ...args);
-    },
-  });
-
-  Object.defineProperty(Checkbox, 'reopenClass', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopenClass(this: typeof Checkbox, ...args: unknown[]): unknown {
-      if (this === Checkbox) {
-        deprecate(
-          'Reopening Ember.Checkbox is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        Checkbox._wasReopened = true;
-      }
-
-      return FrameworkObject.reopenClass.call(this, ...args);
-    },
-  });
-}
-
-export default Checkbox;
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index b977bc5c6a8..7111d8fd8ad 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -2,20 +2,17 @@
 @module @ember/component
 */
 import { hasDOM } from '@ember/-internals/browser-environment';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert, warn } from '@ember/debug';
 import { action } from '@ember/object';
 import { valueForRef } from '@glimmer/reference';
 import { untrack } from '@glimmer/validator';
 import InputTemplate from '../templates/input';
-import AbstractInput, { handleDeprecatedFeatures, valueFrom } from './abstract-input';
-import Checkbox from './checkbox';
+import AbstractInput, { valueFrom } from './abstract-input';
 import { opaquify } from './internal';
-import TextField from './text-field';
 
 let isValidInputType: (type: string) => boolean;
 
-if (hasDOM && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+if (hasDOM) {
   const INPUT_TYPES: Record<string, boolean | undefined> = Object.create(null);
   const INPUT_ELEMENT = document.createElement('input');
 
@@ -54,6 +51,18 @@ if (hasDOM && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
   @public
   */
 
+/**
+  An opaque interface which can be imported and used in strict-mode
+  templates to call <Input>.
+
+  See [Ember.Templates.components.Input](/ember/release/classes/Ember.Templates.components/methods/Input?anchor=Input).
+
+  @for @ember/component
+  @method Input
+  @see {Ember.Templates.components.Input}
+  @public
+**/
+
 /**
   The `Input` component lets you create an HTML `<input>` element.
 
@@ -264,12 +273,6 @@ class Input extends AbstractInput {
     this.checked = element.checked;
   }
 
-  protected shouldModernize(): boolean {
-    return (
-      super.shouldModernize() && TextField._wasReopened === false && Checkbox._wasReopened === false
-    );
-  }
-
   protected isSupportedArgument(name: string): boolean {
     let supportedArguments = [
       'type',
@@ -284,57 +287,4 @@ class Input extends AbstractInput {
   }
 }
 
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  handleDeprecatedFeatures(Input, [
-    // Component
-    'id',
-    ['id', 'elementId'],
-    'class',
-    ['class', 'classNames'],
-    ['role', 'ariaRole'],
-
-    // TextSupport
-    'autocapitalize',
-    'autocorrect',
-    'autofocus',
-    'disabled',
-    'form',
-    'maxlength',
-    'minlength',
-    'placeholder',
-    'readonly',
-    'required',
-    'selectionDirection',
-    'spellcheck',
-    'tabindex',
-    'title',
-
-    // TextField
-    'accept',
-    'autocomplete',
-    'autosave',
-    'dir',
-    'formaction',
-    'formenctype',
-    'formmethod',
-    'formnovalidate',
-    'formtarget',
-    'height',
-    'inputmode',
-    'lang',
-    'list',
-    'max',
-    'min',
-    'multiple',
-    'name',
-    'pattern',
-    'size',
-    'step',
-    'width',
-
-    // Checkbox
-    'indeterminate',
-  ]);
-}
-
 export default opaquify(Input, InputTemplate);
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index f3ac67a5c57..fefc60fe016 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -1,7 +1,6 @@
 import { Owner, setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import {
   CapturedArguments,
   Destroyable,
@@ -9,20 +8,13 @@ import {
   Environment,
   InternalComponentCapabilities,
   InternalComponentManager,
-  Maybe,
-  Option,
   TemplateFactory,
   VMArguments,
   WithCreateInstance,
 } from '@glimmer/interfaces';
-import {
-  setComponentTemplate,
-  setInternalComponentManager,
-  setInternalModifierManager,
-} from '@glimmer/manager';
+import { setComponentTemplate, setInternalComponentManager } from '@glimmer/manager';
 import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
 import { untrack } from '@glimmer/validator';
-import InternalModifier, { InternalModifierManager } from '../modifiers/internal';
 
 function NOOP(): void {}
 
@@ -226,327 +218,3 @@ class InternalManager
 }
 
 const INTERNAL_COMPONENT_MANAGER = new InternalManager();
-
-// Deprecated features
-
-export interface DeprecatingInternalComponent extends InternalComponent {
-  modernized: boolean;
-}
-
-export type DeprecatingInternalComponentConstructor = InternalComponentConstructor<
-  DeprecatingInternalComponent
->;
-
-export function handleDeprecatedArguments(target: DeprecatingInternalComponentConstructor): void {
-  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-    let angle = target.toString();
-    let { prototype } = target;
-
-    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
-
-    Object.defineProperty(prototype, 'onUnsupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function onUnsupportedArgument(
-        this: DeprecatingInternalComponent,
-        name: string
-      ): void {
-        deprecate(`Passing the \`@${name}\` argument to <${angle}> is deprecated.`, false, {
-          id: 'ember.built-in-components.legacy-arguments',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-          until: '4.0.0',
-          url:
-            'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-        });
-
-        this.modernized = false;
-
-        superOnUnsupportedArgument.call(this, name);
-      },
-    });
-  }
-}
-
-export function handleDeprecatedAttributeArguments(
-  target: DeprecatingInternalComponentConstructor,
-  bindings: Array<string | [attribute: string, argument: string]>
-): void {
-  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-    let angle = target.toString();
-    let curly = angle.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
-    let { prototype } = target;
-
-    let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
-      if (target) {
-        return (
-          Object.getOwnPropertyDescriptor(target, property) ||
-          descriptorFor(Object.getPrototypeOf(target), property)
-        );
-      } else {
-        return null;
-      }
-    };
-
-    bindings.forEach((binding) => {
-      let attribute: string;
-      let argument: string;
-
-      if (Array.isArray(binding)) {
-        [attribute, argument] = binding;
-      } else {
-        attribute = argument = binding;
-      }
-
-      let superIsSupportedArgument = prototype['isSupportedArgument'];
-
-      Object.defineProperty(prototype, 'isSupportedArgument', {
-        configurable: true,
-        enumerable: false,
-        value: function isSupportedArgument(
-          this: DeprecatingInternalComponent,
-          name: string
-        ): boolean {
-          return (
-            (this.modernized && name === argument) || superIsSupportedArgument.call(this, name)
-          );
-        },
-      });
-
-      let superDescriptor = descriptorFor(prototype, attribute);
-      let superGetter: (this: DeprecatingInternalComponent) => unknown = () => undefined;
-
-      if (superDescriptor) {
-        assert(
-          `[BUG] expecting ${attribute} to be a getter on <${angle}>`,
-          typeof superDescriptor.get === 'function'
-        );
-
-        superGetter = superDescriptor.get;
-      }
-
-      Object.defineProperty(prototype, attribute, {
-        configurable: true,
-        enumerable: true,
-        get(this: DeprecatingInternalComponent): unknown {
-          if (argument in this.args.named) {
-            deprecate(
-              `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
-                `Instead, please pass the attribute directly, i.e. \`<${angle} ${attribute}={{...}} />\` ` +
-                `instead of \`<${angle} @${argument}={{...}} />\` or \`{{${curly} ${argument}=...}}\`.`,
-              false,
-              {
-                id: 'ember.built-in-components.legacy-attribute-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-attribute-arguments',
-              }
-            );
-
-            // The `class` attribute is concatenated/merged instead of clobbered
-            if (attribute === 'class' && superDescriptor) {
-              return `${superGetter.call(this)} ${this.named(argument)}`;
-            } else {
-              return this.named(argument);
-            }
-          } else {
-            return superGetter.call(this);
-          }
-        },
-      });
-    });
-  }
-}
-
-export let handleDeprecatedEventArguments: (
-  target: DeprecatingInternalComponentConstructor,
-  extraEvents?: Array<[event: string, argument: string]>
-) => void = NOOP;
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  type EventsMap = Record<string, string>;
-
-  const EVENTS = new WeakMap<object, EventsMap>();
-
-  const EMPTY_EVENTS = Object.freeze({}) as EventsMap;
-
-  const getEventsMap = (owner: Owner): EventsMap => {
-    let events = EVENTS.get(owner);
-
-    if (events === undefined) {
-      events = EMPTY_EVENTS;
-
-      let eventDispatcher = owner.lookup<Maybe<{ _finalEvents?: EventsMap }>>(
-        'event_dispatcher:main'
-      );
-
-      if (eventDispatcher !== null && eventDispatcher !== undefined) {
-        assert('[BUG] invalid event dispatcher', typeof eventDispatcher === 'object');
-
-        if (
-          '_finalEvents' in eventDispatcher &&
-          eventDispatcher._finalEvents !== null &&
-          eventDispatcher._finalEvents !== undefined
-        ) {
-          assert(
-            '[BUG] invalid _finalEvents on event dispatcher',
-            typeof eventDispatcher._finalEvents === 'object'
-          );
-
-          events = eventDispatcher._finalEvents;
-        }
-      }
-
-      EVENTS.set(owner, events);
-    }
-
-    return events;
-  };
-
-  handleDeprecatedEventArguments = (target, extraEvents = []) => {
-    let angle = target.toString();
-    let curly = angle.toLowerCase();
-    let { prototype } = target;
-
-    let superIsSupportedArgument = prototype['isSupportedArgument'];
-
-    Object.defineProperty(prototype, 'isSupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function isSupportedArgument(
-        this: DeprecatingInternalComponent,
-        name: string
-      ): boolean {
-        let events = [
-          ...Object.values(getEventsMap(this.owner)),
-          'focus-in',
-          'focus-out',
-          'key-press',
-          'key-up',
-          'key-down',
-        ];
-
-        return (
-          (this.modernized && events.indexOf(name) !== -1) ||
-          superIsSupportedArgument.call(this, name)
-        );
-      },
-    });
-
-    class DeprecatedEventHandlersModifier extends InternalModifier {
-      static toString(): string {
-        return 'DeprecatedEventHandlersModifier';
-      }
-
-      private listeners = new Map<string, EventListener>();
-
-      install(): void {
-        let { element, component, listenerFor, listeners } = this;
-
-        let entries: [event: string, argument: string][] = [
-          ...Object.entries(getEventsMap(this.owner)),
-          ...extraEvents,
-        ];
-
-        for (let [event, argument] of entries) {
-          let listener = listenerFor.call(component, event, argument);
-
-          if (listener) {
-            listeners.set(event, listener);
-            element.addEventListener(event, listener);
-          }
-        }
-
-        Object.freeze(listeners);
-      }
-
-      remove(): void {
-        let { element, listeners } = this;
-
-        for (let [event, listener] of Object.entries(listeners)) {
-          element.removeEventListener(event, listener);
-        }
-
-        this.listeners = new Map();
-      }
-
-      private get component(): DeprecatingInternalComponent {
-        let component = this.positional(0);
-
-        assert(
-          `[BUG] must pass <${angle}> component as first argument`,
-          component instanceof target
-        );
-
-        return component;
-      }
-
-      private listenerFor(
-        this: DeprecatingInternalComponent,
-        event: string,
-        argument: string
-      ): Option<EventListener> {
-        assert(`[BUG] must be called with <${angle}> component as this`, this instanceof target);
-
-        if (argument in this.args.named) {
-          deprecate(
-            `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
-              `This would have overwritten the internal \`${argument}\` method on ` +
-              `the <${angle}> component and prevented it from functioning properly. ` +
-              `Instead, please use the {{on}} modifier, i.e. \`<${angle} {{on "${event}" ...}} />\` ` +
-              `instead of \`<${angle} @${argument}={{...}} />\` or \`{{${curly} ${argument}=...}}\`.`,
-            !(argument in this),
-            {
-              id: 'ember.built-in-components.legacy-attribute-arguments',
-              for: 'ember-source',
-              since: {
-                enabled: '3.27.0',
-              },
-              until: '4.0.0',
-              url:
-                'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-attribute-arguments',
-            }
-          );
-
-          deprecate(
-            `Passing the \`@${argument}\` argument to <${angle}> is deprecated. ` +
-              `Instead, please use the {{on}} modifier, i.e. \`<${angle} {{on "${event}" ...}} />\` ` +
-              `instead of \`<${angle} @${argument}={{...}} />\` or \`{{${curly} ${argument}=...}}\`.`,
-            argument in this,
-            {
-              id: 'ember.built-in-components.legacy-attribute-arguments',
-              for: 'ember-source',
-              since: {
-                enabled: '3.27.0',
-              },
-              until: '4.0.0',
-              url:
-                'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-attribute-arguments',
-            }
-          );
-
-          return this['listenerFor'].call(this, argument);
-        } else {
-          return null;
-        }
-      }
-    }
-
-    setInternalModifierManager(
-      new InternalModifierManager(DeprecatedEventHandlersModifier, 'deprecated-event-handlers'),
-      DeprecatedEventHandlersModifier
-    );
-
-    Object.defineProperty(prototype, 'handleDeprecatedEvents', {
-      configurable: true,
-      enumerable: true,
-      value: DeprecatedEventHandlersModifier,
-    });
-  };
-}
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index cf3b4f5a39e..5f4fa1d662a 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,10 +1,8 @@
 import { Owner } from '@ember/-internals/owner';
 import { RouterState, RoutingService } from '@ember/-internals/routing';
 import { QueryParam } from '@ember/-internals/routing/lib/system/router';
-import { TargetActionSupport } from '@ember/-internals/runtime';
 import { isSimpleClick } from '@ember/-internals/views';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, debugFreeze, deprecate, warn } from '@ember/debug';
+import { assert, debugFreeze, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
@@ -13,16 +11,8 @@ import { DEBUG } from '@glimmer/env';
 import { Maybe, Option } from '@glimmer/interfaces';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import { Transition } from 'router_js';
-import Component from '../component';
 import LinkToTemplate from '../templates/link-to';
-import LegacyLinkTo from './-link-to';
-import InternalComponent, {
-  DeprecatingInternalComponent,
-  handleDeprecatedArguments,
-  handleDeprecatedAttributeArguments,
-  handleDeprecatedEventArguments,
-  opaquify,
-} from './internal';
+import InternalComponent, { opaquify } from './internal';
 
 const EMPTY_ARRAY: {}[] = [];
 const EMPTY_QUERY_PARAMS = {};
@@ -47,13 +37,244 @@ function isQueryParams(value: unknown): value is QueryParams {
   return typeof value === 'object' && value !== null && value['isQueryParams'] === true;
 }
 
-class LinkTo extends InternalComponent implements DeprecatingInternalComponent {
+/**
+  The `LinkTo` component renders a link to the supplied `routeName` passing an optionally
+  supplied model to the route as its `model` context of the route. The block for `LinkTo`
+  becomes the contents of the rendered element:
+
+  ```handlebars
+  <LinkTo @route='photoGallery'>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  This will result in:
+
+  ```html
+  <a href="/hamster-photos">
+    Great Hamster Photos
+  </a>
+  ```
+
+  ### Disabling the `LinkTo` component
+
+  The `LinkTo` component can be disabled by using the `disabled` argument. A disabled link
+  doesn't result in a transition when activated, and adds the `disabled` class to the `<a>`
+  element.
+
+  (The class name to apply to the element can be overridden by using the `disabledClass`
+  argument)
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @disabled={{true}}>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  ### Handling `href`
+
+  `<LinkTo>` will use your application's Router to fill the element's `href` property with a URL
+  that matches the path to the supplied `routeName`.
+
+  ### Handling current route
+
+  The `LinkTo` component will apply a CSS class name of 'active' when the application's current
+  route matches the supplied routeName. For example, if the application's current route is
+  'photoGallery.recent', then the following invocation of `LinkTo`:
+
+  ```handlebars
+  <LinkTo @route='photoGallery.recent'>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  will result in
+
+  ```html
+  <a href="/hamster-photos/this-week" class="active">
+    Great Hamster Photos
+  </a>
+  ```
+
+  The CSS class used for active classes can be customized by passing an `activeClass` argument:
+
+  ```handlebars
+  <LinkTo @route='photoGallery.recent' @activeClass="current-url">
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/this-week" class="current-url">
+    Great Hamster Photos
+  </a>
+  ```
+
+  ### Keeping a link active for other routes
+
+  If you need a link to be 'active' even when it doesn't match the current route, you can use the
+  `current-when` argument.
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @current-when='photos'>
+    Photo Gallery
+  </LinkTo>
+  ```
+
+  This may be helpful for keeping links active for:
+
+  * non-nested routes that are logically related
+  * some secondary menu approaches
+  * 'top navigation' with 'sub navigation' scenarios
+
+  A link will be active if `current-when` is `true` or the current
+  route is the route this link would transition to.
+
+  To match multiple routes 'space-separate' the routes:
+
+  ```handlebars
+  <LinkTo @route='gallery' @current-when='photos drawings paintings'>
+    Art Gallery
+  </LinkTo>
+  ```
+
+  ### Supplying a model
+
+  An optional `model` argument can be used for routes whose
+  paths contain dynamic segments. This argument will become
+  the model context of the linked route:
+
+  ```javascript
+  Router.map(function() {
+    this.route("photoGallery", {path: "hamster-photos/:photo_id"});
+  });
+  ```
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @model={{this.aPhoto}}>
+    {{aPhoto.title}}
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/42">
+    Tomster
+  </a>
+  ```
+
+  ### Supplying multiple models
+
+  For deep-linking to route paths that contain multiple
+  dynamic segments, the `models` argument can be used.
+
+  As the router transitions through the route path, each
+  supplied model argument will become the context for the
+  route with the dynamic segments:
+
+  ```javascript
+  Router.map(function() {
+    this.route("photoGallery", { path: "hamster-photos/:photo_id" }, function() {
+      this.route("comment", {path: "comments/:comment_id"});
+    });
+  });
+  ```
+
+  This argument will become the model context of the linked route:
+
+  ```handlebars
+  <LinkTo @route='photoGallery.comment' @models={{array this.aPhoto this.comment}}>
+    {{comment.body}}
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/42/comments/718">
+    A+++ would snuggle again.
+  </a>
+  ```
+
+  ### Supplying an explicit dynamic segment value
+
+  If you don't have a model object available to pass to `LinkTo`,
+  an optional string or integer argument can be passed for routes whose
+  paths contain dynamic segments. This argument will become the value
+  of the dynamic segment:
+
+  ```javascript
+  Router.map(function() {
+    this.route("photoGallery", { path: "hamster-photos/:photo_id" });
+  });
+  ```
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @model={{aPhotoId}}>
+    {{this.aPhoto.title}}
+  </LinkTo>
+  ```
+
+  ```html
+  <a href="/hamster-photos/42">
+    Tomster
+  </a>
+  ```
+
+  When transitioning into the linked route, the `model` hook will
+  be triggered with parameters including this passed identifier.
+
+  ### Supplying query parameters
+
+  If you need to add optional key-value pairs that appear to the right of the ? in a URL,
+  you can use the `query` argument.
+
+  ```handlebars
+  <LinkTo @route='photoGallery' @query={{hash page=1 per_page=20}}>
+    Great Hamster Photos
+  </LinkTo>
+  ```
+
+  This will result in:
+
+  ```html
+  <a href="/hamster-photos?page=1&per_page=20">
+    Great Hamster Photos
+  </a>
+  ```
+
+  @for Ember.Templates.components
+  @method LinkTo
+  @public
+*/
+
+/**
+  @module @ember/routing
+*/
+
+/**
+  See [Ember.Templates.components.LinkTo](/ember/release/classes/Ember.Templates.components/methods/input?anchor=LinkTo).
+
+  @for Ember.Templates.helpers
+  @method link-to
+  @see {Ember.Templates.components.LinkTo}
+  @public
+**/
+
+/**
+  An opaque interface which can be imported and used in strict-mode
+  templates to call <LinkTo>.
+
+  See [Ember.Templates.components.LinkTo](/ember/release/classes/Ember.Templates.components/methods/input?anchor=LinkTo).
+
+  @for @ember/routing
+  @method LinkTo
+  @see {Ember.Templates.components.LinkTo}
+  @public
+**/
+
+class LinkTo extends InternalComponent {
   static toString(): string {
     return 'LinkTo';
   }
 
-  modernized = this.shouldModernize();
-
   @service('-routing') private declare routing: RoutingService;
 
   validateArguments(): void {
@@ -61,13 +282,12 @@ class LinkTo extends InternalComponent implements DeprecatingInternalComponent {
       'You attempted to use the <LinkTo> component within a routeless engine, this is not supported. ' +
         'If you are using the ember-engines addon, use the <LinkToExternal> component instead. ' +
         'See https://ember-engines.com/docs/links for more info.',
-      !this.modernized || !this.isEngine || this.engineMountPoint !== undefined
+      !this.isEngine || this.engineMountPoint !== undefined
     );
 
     assert(
-      'You must provide at least one of the `@route`, `@model`, `@models` or `@query` argument to `<LinkTo>`.',
-      !this.modernized ||
-        'route' in this.args.named ||
+      'You must provide at least one of the `@route`, `@model`, `@models` or `@query` arguments to `<LinkTo>`.',
+      'route' in this.args.named ||
         'model' in this.args.named ||
         'models' in this.args.named ||
         'query' in this.args.named
@@ -338,15 +558,6 @@ class LinkTo extends InternalComponent implements DeprecatingInternalComponent {
     event.preventDefault();
   }
 
-  private shouldModernize(): boolean {
-    return (
-      Boolean(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) &&
-      Component._wasReopened === false &&
-      TargetActionSupport._wasReopened === false &&
-      LegacyLinkTo._wasReopened === false
-    );
-  }
-
   protected isSupportedArgument(name: string): boolean {
     let supportedArguments = [
       'route',
@@ -365,413 +576,114 @@ class LinkTo extends InternalComponent implements DeprecatingInternalComponent {
   }
 }
 
-// Deprecated features
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  let { prototype } = LinkTo;
-
-  let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
-    if (target) {
-      return (
-        Object.getOwnPropertyDescriptor(target, property) ||
-        descriptorFor(Object.getPrototypeOf(target), property)
-      );
-    } else {
-      return null;
-    }
-  };
-
-  handleDeprecatedArguments(LinkTo);
-
-  handleDeprecatedAttributeArguments(LinkTo, [
-    // Component
-    'id',
-    ['id', 'elementId'],
-    'class',
-    ['class', 'classNames'],
-    ['role', 'ariaRole'],
-
-    // LinkTo
-    'title',
-    'rel',
-    'tabindex',
-    'target',
-  ]);
-
-  handleDeprecatedEventArguments(LinkTo);
-
-  // @href
-  {
-    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
-
-    Object.defineProperty(prototype, 'onUnsupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function onUnsupportedArgument(this: LinkTo, name: string): void {
-        if (name === 'href') {
-          assert(`Passing the \`@href\` argument to <LinkTo> is not supported.`);
-        } else {
-          superOnUnsupportedArgument.call(this, name);
-        }
-      },
-    });
-  }
-
-  // @tagName
-  {
-    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
-
-    Object.defineProperty(prototype, 'onUnsupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function onUnsupportedArgument(this: LinkTo, name: string): void {
-        if (name === 'tagName') {
-          let tagName = this.named('tagName');
-
-          deprecate(
-            `Passing the \`@tagName\` argument to <LinkTo> is deprecated. Using a <${tagName}> ` +
-              'element for navigation is not recommended as it creates issues with assistive ' +
-              'technologies. Remove this argument to use the default <a> element. In the rare ' +
-              'cases that calls for using a different element, refactor to use the router ' +
-              'service inside a custom event handler instead.',
-            false,
-            {
-              id: 'ember.link-to.tag-name',
-              for: 'ember-source',
-              since: {},
-              until: '4.0.0',
-            }
-          );
-
-          this.modernized = false;
-        } else {
-          superOnUnsupportedArgument.call(this, name);
-        }
-      },
-    });
-  }
-
-  // @bubbles & @preventDefault
-  {
-    let superIsSupportedArgument = prototype['isSupportedArgument'];
-
-    Object.defineProperty(prototype, 'isSupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function isSupportedArgument(this: LinkTo, name: string): boolean {
-        if (this.modernized) {
-          if (name === 'bubbles') {
-            deprecate(
-              'Passing the `@bubbles` argument to <LinkTo> is deprecated. ' +
-                'Use the {{on}} modifier to attach a custom event handler to ' +
-                'control event propagation.',
-              false,
-              {
-                id: 'ember.built-in-components.legacy-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-              }
-            );
-
-            return true;
-          }
-
-          if (name === 'preventDefault') {
-            deprecate(
-              'Passing the `@preventDefault` argument to <LinkTo> is deprecated. ' +
-                '`preventDefault()` is called automatically on events that are ' +
-                'handled by the <LinkTo> component to prevent the browser from ' +
-                'navigating away from the page.',
-              false,
-              {
-                id: 'ember.built-in-components.legacy-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-              }
-            );
-
-            return true;
-          }
-        }
+let { prototype } = LinkTo;
 
-        return superIsSupportedArgument.call(this, name);
-      },
-    });
-
-    Object.defineProperty(prototype, 'preventDefault', {
-      configurable: true,
-      enumerable: false,
-      value: function preventDefault(this: LinkTo, event: Event): void {
-        let shouldPreventDefault = true;
-        let shouldStopPropagation = false;
-
-        if ('preventDefault' in this.args.named) {
-          let value = this.named('preventDefault');
-
-          if (isMissing(value) || value) {
-            deprecate(
-              'Passing the `@preventDefault` argument to <LinkTo> is deprecated. ' +
-                '`preventDefault()` is called automatically on events that are ' +
-                'handled by the <LinkTo> component to prevent the browser from ' +
-                'navigating away from the page.',
-              false,
-              {
-                id: 'ember.built-in-components.legacy-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-              }
-            );
-          } else {
-            deprecate(
-              'Passing the `@preventDefault` argument to <LinkTo> is deprecated. ' +
-                '`preventDefault()` should always be called on events that are ' +
-                'handled by the <LinkTo> component to prevent the browser from ' +
-                'navigating away from the page.',
-              false,
-              {
-                id: 'ember.built-in-components.legacy-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-              }
-            );
-
-            shouldPreventDefault = false;
-          }
-        }
-
-        if ('bubbles' in this.args.named) {
-          let value = this.named('bubbles');
-
-          if (value === false) {
-            deprecate(
-              'Passing the `@bubbles` argument to <LinkTo> is deprecated. ' +
-                'Use the {{on}} modifier to attach a custom event handler to ' +
-                'control event propagation.',
-              false,
-              {
-                id: 'ember.built-in-components.legacy-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-              }
-            );
-
-            shouldStopPropagation = true;
-          } else {
-            deprecate(
-              'Passing the `@bubbles` argument to <LinkTo> is deprecated. ' +
-                '`stopPropagation()` is not automatically called so there is ' +
-                'no need to pass this argument when you DO want the event to ' +
-                'propagate normally',
-              false,
-              {
-                id: 'ember.built-in-components.legacy-arguments',
-                for: 'ember-source',
-                since: {
-                  enabled: '3.27.0',
-                },
-                until: '4.0.0',
-                url:
-                  'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-legacy-arguments',
-              }
-            );
-          }
-        }
-
-        if (shouldPreventDefault) {
-          event.preventDefault();
-        }
-
-        if (shouldStopPropagation) {
-          event.stopPropagation();
-        }
-      },
-    });
-  }
-
-  // @disabledWhen
-  {
-    let superIsSupportedArgument = prototype['isSupportedArgument'];
-
-    Object.defineProperty(prototype, 'isSupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function isSupportedArgument(this: LinkTo, name: string): boolean {
-        if (this.modernized) {
-          if (name === 'disabledWhen') {
-            deprecate(
-              'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
-                'Use the `@disabled` argument instead.',
-              false,
-              {
-                id: 'ember.link-to.disabled-when',
-                for: 'ember-source',
-                url: 'https://deprecations.emberjs.com/v4.x#toc_ember-link-to-disabled-when',
-                since: {},
-                until: '4.0.0',
-              }
-            );
-
-            return true;
-          }
-        }
-
-        return superIsSupportedArgument.call(this, name);
-      },
-    });
-
-    let superDescriptor = descriptorFor(prototype, 'isDisabled');
-
-    assert(
-      `[BUG] expecting isDisabled to be a getter on <LinkTo>`,
-      superDescriptor && typeof superDescriptor.get === 'function'
+let descriptorFor = (target: object, property: string): Option<PropertyDescriptor> => {
+  if (target) {
+    return (
+      Object.getOwnPropertyDescriptor(target, property) ||
+      descriptorFor(Object.getPrototypeOf(target), property)
     );
-
-    let superGetter = superDescriptor.get as (this: LinkTo) => boolean;
-
-    Object.defineProperty(prototype, 'isDisabled', {
-      configurable: true,
-      enumerable: false,
-      get: function isDisabled(this: LinkTo): boolean {
-        if ('disabledWhen' in this.args.named) {
-          deprecate(
-            'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. ' +
-              'Use the `@disabled` argument instead.',
-            false,
-            {
-              id: 'ember.link-to.disabled-when',
-              for: 'ember-source',
-              url: 'https://deprecations.emberjs.com/v4.x#toc_ember-link-to-disabled-when',
-              since: {},
-              until: '4.0.0',
-            }
-          );
-
-          return Boolean(this.named('disabledWhen'));
-        }
-
-        return superGetter.call(this);
-      },
-    });
+  } else {
+    return null;
   }
+};
+
+// @href
+{
+  let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
+
+  Object.defineProperty(prototype, 'onUnsupportedArgument', {
+    configurable: true,
+    enumerable: false,
+    value: function onUnsupportedArgument(this: LinkTo, name: string): void {
+      if (name === 'href') {
+        assert(`Passing the \`@href\` argument to <LinkTo> is not supported.`);
+      } else {
+        superOnUnsupportedArgument.call(this, name);
+      }
+    },
+  });
+}
 
-  // QP
-  {
-    let superModelsDescriptor = descriptorFor(prototype, 'models');
+// QP
+{
+  let superModelsDescriptor = descriptorFor(prototype, 'models');
 
-    assert(
-      `[BUG] expecting models to be a getter on <LinkTo>`,
-      superModelsDescriptor && typeof superModelsDescriptor.get === 'function'
-    );
+  assert(
+    `[BUG] expecting models to be a getter on <LinkTo>`,
+    superModelsDescriptor && typeof superModelsDescriptor.get === 'function'
+  );
 
-    let superModelsGetter = superModelsDescriptor.get as (this: LinkTo) => {}[];
+  let superModelsGetter = superModelsDescriptor.get as (this: LinkTo) => {}[];
 
-    Object.defineProperty(prototype, 'models', {
-      configurable: true,
-      enumerable: false,
-      get: function models(this: LinkTo): {}[] {
-        let models = superModelsGetter.call(this);
+  Object.defineProperty(prototype, 'models', {
+    configurable: true,
+    enumerable: false,
+    get: function models(this: LinkTo): {}[] {
+      let models = superModelsGetter.call(this);
 
-        if (models.length > 0 && !('query' in this.args.named)) {
-          if (isQueryParams(models[models.length - 1])) {
-            models = models.slice(0, -1);
-          }
+      if (models.length > 0 && !('query' in this.args.named)) {
+        if (isQueryParams(models[models.length - 1])) {
+          models = models.slice(0, -1);
         }
+      }
 
-        return models;
-      },
-    });
+      return models;
+    },
+  });
 
-    let superQueryDescriptor = descriptorFor(prototype, 'query');
+  let superQueryDescriptor = descriptorFor(prototype, 'query');
 
-    assert(
-      `[BUG] expecting query to be a getter on <LinkTo>`,
-      superQueryDescriptor && typeof superQueryDescriptor.get === 'function'
-    );
+  assert(
+    `[BUG] expecting query to be a getter on <LinkTo>`,
+    superQueryDescriptor && typeof superQueryDescriptor.get === 'function'
+  );
 
-    let superQueryGetter = superQueryDescriptor.get as (this: LinkTo) => {};
+  let superQueryGetter = superQueryDescriptor.get as (this: LinkTo) => {};
 
-    Object.defineProperty(prototype, 'query', {
-      configurable: true,
-      enumerable: false,
-      get: function query(this: LinkTo): {} {
-        if ('query' in this.args.named) {
-          let qp = superQueryGetter.call(this);
+  Object.defineProperty(prototype, 'query', {
+    configurable: true,
+    enumerable: false,
+    get: function query(this: LinkTo): {} {
+      if ('query' in this.args.named) {
+        let qp = superQueryGetter.call(this);
 
-          if (isQueryParams(qp)) {
-            return qp.values ?? EMPTY_QUERY_PARAMS;
-          } else {
-            return qp;
-          }
+        if (isQueryParams(qp)) {
+          return qp.values ?? EMPTY_QUERY_PARAMS;
         } else {
-          let models = superModelsGetter.call(this);
+          return qp;
+        }
+      } else {
+        let models = superModelsGetter.call(this);
 
-          if (models.length > 0) {
-            let qp = models[models.length - 1];
+        if (models.length > 0) {
+          let qp = models[models.length - 1];
 
-            if (isQueryParams(qp) && qp.values !== null) {
-              return qp.values;
-            }
+          if (isQueryParams(qp) && qp.values !== null) {
+            return qp.values;
           }
-
-          return EMPTY_QUERY_PARAMS;
-        }
-      },
-    });
-  }
-
-  // Positional Arguments
-  {
-    let superValidateArguments = prototype['validateArguments'];
-
-    Object.defineProperty(prototype, 'validateArguments', {
-      configurable: true,
-      enumerable: false,
-      value: function validateArguments(this: LinkTo): void {
-        if (this.args.positional.length !== 0 || 'params' in this.args.named) {
-          // Already deprecated in the legacy implementation
-          this.modernized = false;
         }
 
-        superValidateArguments.call(this);
-      },
-    });
+        return EMPTY_QUERY_PARAMS;
+      }
+    },
+  });
+}
 
-    let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
+// Positional Arguments
+{
+  let superOnUnsupportedArgument = prototype['onUnsupportedArgument'];
 
-    Object.defineProperty(prototype, 'onUnsupportedArgument', {
-      configurable: true,
-      enumerable: false,
-      value: function onUnsupportedArgument(this: LinkTo, name: string): void {
-        if (name !== 'params') {
-          superOnUnsupportedArgument.call(this, name);
-        }
-      },
-    });
-  }
+  Object.defineProperty(prototype, 'onUnsupportedArgument', {
+    configurable: true,
+    enumerable: false,
+    value: function onUnsupportedArgument(this: LinkTo, name: string): void {
+      if (name !== 'params') {
+        superOnUnsupportedArgument.call(this, name);
+      }
+    },
+  });
 }
 
 export default opaquify(LinkTo, LinkToTemplate);
diff --git a/packages/@ember/-internals/glimmer/lib/components/text-field.ts b/packages/@ember/-internals/glimmer/lib/components/text-field.ts
deleted file mode 100644
index a83a0f1c4b5..00000000000
--- a/packages/@ember/-internals/glimmer/lib/components/text-field.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-/**
-@module @ember/component
-*/
-import { hasDOM } from '@ember/-internals/browser-environment';
-import { computed } from '@ember/-internals/metal';
-import { CoreObject } from '@ember/-internals/runtime';
-import { TextSupport } from '@ember/-internals/views';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-import Component from '../component';
-import layout from '../templates/empty';
-
-const inputTypes = hasDOM ? Object.create(null) : null;
-function canSetTypeOfInput(type: string): boolean {
-  // if running in outside of a browser always return
-  // the original type
-  if (!hasDOM) {
-    return Boolean(type);
-  }
-
-  if (type in inputTypes) {
-    return inputTypes[type];
-  }
-
-  let inputTypeTestElement = document.createElement('input');
-
-  try {
-    inputTypeTestElement.type = type;
-  } catch (e) {
-    // ignored
-  }
-
-  return (inputTypes[type] = inputTypeTestElement.type === type);
-}
-
-/**
-  The internal class used to create text inputs when the `Input` component is used with `type` of `text`.
-
-  See [Ember.Templates.components.Input](/ember/release/classes/Ember.Templates.components/methods/Input?anchor=Input) for usage details.
-
-  ## Layout and LayoutName properties
-
-  Because HTML `input` elements are self closing `layout` and `layoutName`
-  properties will not be applied.
-
-  @class TextField
-  @extends Component
-  @uses Ember.TextSupport
-  @public
-*/
-const TextField = Component.extend(TextSupport, {
-  layout,
-
-  /**
-    By default, this component will add the `ember-text-field` class to the component's element.
-
-    @property classNames
-    @type Array | String
-    @default ['ember-text-field']
-    @public
-   */
-  classNames: ['ember-text-field'],
-  tagName: 'input',
-
-  /**
-    By default this component will forward a number of arguments to attributes on the the
-    component's element:
-
-    * accept
-    * autocomplete
-    * autosave
-    * dir
-    * formaction
-    * formenctype
-    * formmethod
-    * formnovalidate
-    * formtarget
-    * height
-    * inputmode
-    * lang
-    * list
-    * type
-    * max
-    * min
-    * multiple
-    * name
-    * pattern
-    * size
-    * step
-    * value
-    * width
-
-    When invoked with `{{input type="text"}}`, you can only customize these attributes. When invoked
-    with `<Input @type="text" />`, you can just use HTML attributes directly.
-
-    @property attributeBindings
-    @type Array | String
-    @default ['accept', 'autocomplete', 'autosave', 'dir', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget', 'height', 'inputmode', 'lang', 'list', 'type', 'max', 'min', 'multiple', 'name', 'pattern', 'size', 'step', 'value', 'width']
-    @public
-  */
-  attributeBindings: [
-    'accept',
-    'autocomplete',
-    'autosave',
-    'dir',
-    'formaction',
-    'formenctype',
-    'formmethod',
-    'formnovalidate',
-    'formtarget',
-    'height',
-    'inputmode',
-    'lang',
-    'list',
-    'type', // needs to be before min and max. See #15675
-    'max',
-    'min',
-    'multiple',
-    'name',
-    'pattern',
-    'size',
-    'step',
-    'value',
-    'width',
-  ],
-
-  /**
-    As the user inputs text, this property is updated to reflect the `value` property of the HTML
-    element.
-
-    @property value
-    @type String
-    @default ""
-    @public
-  */
-  value: '',
-
-  /**
-    The `type` attribute of the input element.
-
-    @property type
-    @type String
-    @default "text"
-    @public
-  */
-  type: computed({
-    get(): string {
-      return 'text';
-    },
-
-    set(_key: string, value: string) {
-      let type = 'text';
-
-      if (canSetTypeOfInput(value)) {
-        type = value;
-      }
-
-      return type;
-    },
-  }),
-
-  /**
-    The `size` of the text field in characters.
-
-    @property size
-    @type String
-    @default null
-    @public
-  */
-  size: null,
-
-  /**
-    The `pattern` attribute of input element.
-
-    @property pattern
-    @type String
-    @default null
-    @public
-  */
-  pattern: null,
-
-  /**
-    The `min` attribute of input element used with `type="number"` or `type="range"`.
-
-    @property min
-    @type String
-    @default null
-    @since 1.4.0
-    @public
-  */
-  min: null,
-
-  /**
-    The `max` attribute of input element used with `type="number"` or `type="range"`.
-
-    @property max
-    @type String
-    @default null
-    @since 1.4.0
-    @public
-  */
-  max: null,
-});
-
-TextField.toString = () => '@ember/component/text-field';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(TextField, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(TextField, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(this: typeof TextField, ...args: unknown[]): unknown {
-      if (this === TextField) {
-        deprecate(
-          'Reopening Ember.TextField is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        TextField._wasReopened = true;
-      }
-
-      return CoreObject.reopen.call(this, ...args);
-    },
-  });
-
-  Object.defineProperty(TextField, 'reopenClass', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopenClass(this: typeof TextField, ...args: unknown[]): unknown {
-      if (this === TextField) {
-        deprecate(
-          'Reopening Ember.TextField is deprecated. Consider implementing your own ' +
-            'wrapper component or create a custom subclass.',
-          false,
-          {
-            id: 'ember.built-in-components.reopen',
-            for: 'ember-source',
-            since: {
-              enabled: '3.27.0',
-            },
-            until: '4.0.0',
-            url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-          }
-        );
-
-        TextField._wasReopened = true;
-      }
-
-      return CoreObject.reopenClass.call(this, ...args);
-    },
-  });
-}
-
-export default TextField;
diff --git a/packages/@ember/-internals/glimmer/lib/components/textarea.ts b/packages/@ember/-internals/glimmer/lib/components/textarea.ts
index 3c38ee9332e..8f3e3c32d71 100644
--- a/packages/@ember/-internals/glimmer/lib/components/textarea.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/textarea.ts
@@ -1,11 +1,9 @@
 /**
 @module @ember/component
 */
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { action } from '@ember/object';
 import TextareaTemplate from '../templates/textarea';
-import LegacyTextArea from './-textarea';
-import AbstractInput, { handleDeprecatedFeatures } from './abstract-input';
+import AbstractInput from './abstract-input';
 import { opaquify } from './internal';
 
 /**
@@ -118,7 +116,6 @@ import { opaquify } from './internal';
 
   @method Textarea
   @for Ember.Templates.components
-  @see {TextArea}
   @public
 */
 
@@ -127,9 +124,21 @@ import { opaquify } from './internal';
 
   @method textarea
   @for Ember.Templates.helpers
-  @see {Ember.Templates.components.textarea}
+  @see {Ember.Templates.components.Textarea}
   @public
 */
+
+/**
+  An opaque interface which can be imported and used in strict-mode
+  templates to call <Textarea>.
+
+  See [Ember.Templates.components.Textarea](/ember/release/classes/Ember.Templates.components/methods/Textarea?anchor=Input).
+
+  @for @ember/component
+  @method Textarea
+  @see {Ember.Templates.components.Textarea}
+  @public
+**/
 class Textarea extends AbstractInput {
   static toString(): string {
     return 'Textarea';
@@ -149,53 +158,10 @@ class Textarea extends AbstractInput {
     super.input(event);
   }
 
-  protected shouldModernize(): boolean {
-    return super.shouldModernize() && LegacyTextArea._wasReopened === false;
-  }
-
   protected isSupportedArgument(name: string): boolean {
     let supportedArguments = ['type', 'value', 'enter', 'insert-newline', 'escape-press'];
     return supportedArguments.indexOf(name) !== -1 || super.isSupportedArgument(name);
   }
 }
 
-// Deprecated features
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  handleDeprecatedFeatures(Textarea, [
-    // Component
-    'id',
-    ['id', 'elementId'],
-    'class',
-    ['class', 'classNames'],
-    ['role', 'ariaRole'],
-
-    // TextSupport
-    'autocapitalize',
-    'autocorrect',
-    'autofocus',
-    'disabled',
-    'form',
-    'maxlength',
-    'minlength',
-    'placeholder',
-    'readonly',
-    'required',
-    'selectionDirection',
-    'spellcheck',
-    'tabindex',
-    'title',
-
-    // TextField
-    'rows',
-    'cols',
-    'name',
-    'selectionEnd',
-    'selectionStart',
-    'autocomplete',
-    'wrap',
-    'lang',
-    'dir',
-  ]);
-}
-
 export default opaquify(Textarea, TextareaTemplate);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts b/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
deleted file mode 100644
index 644e68847a5..00000000000
--- a/packages/@ember/-internals/glimmer/lib/helpers/query-param.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
-@module ember
-*/
-import { QueryParams } from '@ember/-internals/routing';
-import { assert, deprecate } from '@ember/debug';
-import { CapturedArguments } from '@glimmer/interfaces';
-import { createComputeRef } from '@glimmer/reference';
-import { reifyNamed } from '@glimmer/runtime';
-import { internalHelper } from './internal-helper';
-
-/**
-  This is a helper to be used in conjunction with the link-to helper.
-  It will supply url query parameters to the target route.
-
-  @example In this example we are setting the `direction` query param to the value `"asc"`
-
-  ```app/templates/application.hbs
-  <LinkTo
-    @route="posts"
-    {{query-params direction="asc"}}
-  >
-    Sort
-  </LinkTo>
-  ```
-
-  @method query-params
-  @for Ember.Templates.helpers
-  @param {Object} hash takes a hash of query parameters
-  @return {Object} A `QueryParams` object for `{{link-to}}`
-  @public
-*/
-export default internalHelper(({ positional, named }: CapturedArguments) => {
-  return createComputeRef(() => {
-    assert(
-      "The `query-params` helper only accepts named arguments, e.g. (query-params queryParamPropertyName='foo') as opposed to (query-params 'foo')",
-      positional.length === 0
-    );
-
-    deprecate(
-      'The `query-params` helper is deprecated. Invoke `<LinkTo>` with the `@query` named argument and the `hash` helper instead.',
-      false,
-      {
-        id: 'ember-glimmer.link-to.positional-arguments',
-        until: '4.0.0',
-        for: 'ember-source',
-        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
-        since: {
-          enabled: '3.26.0-beta.1',
-        },
-      }
-    );
-
-    return new QueryParams(Object.assign({}, reifyNamed(named) as any));
-  });
-});
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index e5e786210dc..d008910b1cd 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -46,7 +46,6 @@ import { default as trackArray } from './helpers/-track-array';
 import { default as action } from './helpers/action';
 import { default as eachIn } from './helpers/each-in';
 import { default as mut } from './helpers/mut';
-import { default as queryParams } from './helpers/query-param';
 import { default as readonly } from './helpers/readonly';
 import { default as unbound } from './helpers/unbound';
 import actionModifier from './modifiers/action';
@@ -115,7 +114,6 @@ const BUILTIN_KEYWORD_HELPERS = {
   mut,
   readonly,
   unbound,
-  'query-params': queryParams,
   '-hash': hash,
   '-each-in': eachIn,
   '-normalize-class': normalizeClassHelper,
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 4f1977fe5ba..ca3eaa85352 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -1,14 +1,9 @@
 import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { getOwner } from '@ember/-internals/owner';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Component from './component';
-import LegacyLinkTo from './components/-link-to';
-import LegacyTextArea from './components/-textarea';
-import Checkbox from './components/checkbox';
 import Input from './components/input';
 import LinkTo from './components/link-to';
-import TextField from './components/text-field';
 import Textarea from './components/textarea';
 import { clientBuilder, rehydrationBuilder, serializeBuilder } from './dom';
 import { Renderer } from './renderer';
@@ -48,19 +43,10 @@ export function setupEngineRegistry(registry: Registry): void {
 
   registry.optionsForType('helper', { instantiate: false });
 
-  registry.register('component:-text-field', TextField);
-  registry.register('component:-checkbox', Checkbox);
   registry.register('component:input', Input);
 
-  if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-    registry.register('component:link-to', LinkTo);
-    registry.register('component:-link-to', LegacyLinkTo);
-    registry.register('component:-textarea', LegacyTextArea);
-    registry.register('component:textarea', Textarea);
-  } else {
-    registry.register('component:link-to', LegacyLinkTo);
-    registry.register('component:textarea', LegacyTextArea);
-  }
+  registry.register('component:link-to', LinkTo);
+  registry.register('component:textarea', Textarea);
 
   if (!ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS) {
     registry.register(P`component:-default`, Component);
diff --git a/packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts b/packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts
deleted file mode 100644
index 30e2f374432..00000000000
--- a/packages/@ember/-internals/glimmer/lib/templates/-link-to.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { TemplateFactory } from '@glimmer/interfaces';
-declare const TEMPLATE: TemplateFactory;
-export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs b/packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs
deleted file mode 100644
index e67d811c27e..00000000000
--- a/packages/@ember/-internals/glimmer/lib/templates/-link-to.hbs
+++ /dev/null
@@ -1,5 +0,0 @@
-{{~#if (has-block)~}}
-  {{yield}}
-{{~else~}}
-  {{this.linkTitle}}
-{{~/if~}}
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.hbs b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
index eada41c6e5e..917d85a90f5 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.hbs
@@ -1,68 +1,17 @@
-{{~#if this.modernized ~}}
-  <input
-    {{!-- for compatibility --}}
-    id={{this.id}}
-    class={{this.class}}
+<input
+  {{!-- for compatibility --}}
+  id={{this.id}}
+  class={{this.class}}
 
-    {{!-- deprecated attribute bindings --}}
-    role={{this.role}}
-    autocapitalize={{this.autocapitalize}}
-    autocorrect={{this.autocorrect}}
-    autofocus={{this.autofocus}}
-    disabled={{this.disabled}}
-    form={{this.form}}
-    maxlength={{this.maxlength}}
-    minlength={{this.minlength}}
-    placeholder={{this.placeholder}}
-    readonly={{this.readonly}}
-    required={{this.required}}
-    selectionDirection={{this.selectionDirection}}
-    spellcheck={{this.spellcheck}}
-    tabindex={{this.tabindex}}
-    title={{this.title}}
-    accept={{this.accept}}
-    autocomplete={{this.autocomplete}}
-    autosave={{this.autosave}}
-    dir={{this.dir}}
-    formaction={{this.formaction}}
-    formenctype={{this.formenctype}}
-    formmethod={{this.formmethod}}
-    formnovalidate={{this.formnovalidate}}
-    formtarget={{this.formtarget}}
-    height={{this.height}}
-    inputmode={{this.inputmode}}
-    lang={{this.lang}}
-    list={{this.list}}
-    max={{this.max}}
-    min={{this.min}}
-    multiple={{this.multiple}}
-    name={{this.name}}
-    pattern={{this.pattern}}
-    size={{this.size}}
-    step={{this.step}}
-    width={{this.width}}
-    indeterminate={{this.indeterminate}}
+  ...attributes
 
-    ...attributes
+  type={{this.type}}
+  checked={{this.checked}}
+  value={{this.value}}
 
-    type={{this.type}}
-    checked={{this.checked}}
-    value={{this.value}}
-
-    {{on "change" this.change}}
-    {{on "input" this.input}}
-    {{on "keyup" this.keyUp}}
-    {{on "paste" this.valueDidChange}}
-    {{on "cut" this.valueDidChange}}
-
-    {{this.handleDeprecatedEvents this}}
-  />
-{{~else~}}
-  {{~#let (component '-checkbox') (component '-text-field') as |Checkbox TextField|~}}
-    {{~#if this.isCheckbox~}}
-      <Checkbox @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
-    {{~else~}}
-      <TextField @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
-    {{~/if~}}
-  {{~/let~}}
-{{/if}}
+  {{on "change" this.change}}
+  {{on "input" this.input}}
+  {{on "keyup" this.keyUp}}
+  {{on "paste" this.valueDidChange}}
+  {{on "cut" this.valueDidChange}}
+/>
\ No newline at end of file
diff --git a/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs b/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs
index 9e018d66388..d8618e3668d 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/link-to.hbs
@@ -1,24 +1,18 @@
-{{~#if this.modernized~}}
-  <a
-    {{!-- for compatibility --}}
-    id={{this.id}}
-    class={{this.class}}
+<a
+  {{!-- for compatibility --}}
+  id={{this.id}}
+  class={{this.class}}
 
-    {{!-- deprecated attribute bindings --}}
-    role={{this.role}}
-    title={{this.title}}
-    rel={{this.rel}}
-    tabindex={{this.tabindex}}
-    target={{this.target}}
+  {{!-- deprecated attribute bindings --}}
+  role={{this.role}}
+  title={{this.title}}
+  rel={{this.rel}}
+  tabindex={{this.tabindex}}
+  target={{this.target}}
 
-    ...attributes
+  ...attributes
 
-    href={{this.href}}
+  href={{this.href}}
 
-    {{on 'click' this.click}}
-  >{{yield}}</a>
-{{~else~}}
-  {{~#let (component '-link-to') as |LegacyLinkTo|~}}
-    <LegacyLinkTo @__ARGS__={{this.args}} ...attributes>{{yield}}</LegacyLinkTo>
-  {{~/let~}}
-{{~/if~}}
+  {{on 'click' this.click}}
+>{{yield}}</a>
\ No newline at end of file
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
index 103a4dcd9b6..a47d6bca457 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.hbs
@@ -1,49 +1,15 @@
-{{~#if this.modernized ~}}
-  <textarea
-    {{!-- for compatibility --}}
-    id={{this.id}}
-    class={{this.class}}
+<textarea
+  {{!-- for compatibility --}}
+  id={{this.id}}
+  class={{this.class}}
 
-    {{!-- deprecated attribute bindings --}}
-    role={{this.role}}
-    autocapitalize={{this.autocapitalize}}
-    autocorrect={{this.autocorrect}}
-    autofocus={{this.autofocus}}
-    disabled={{this.disabled}}
-    form={{this.form}}
-    maxlength={{this.maxlength}}
-    minlength={{this.minlength}}
-    placeholder={{this.placeholder}}
-    readonly={{this.readonly}}
-    required={{this.required}}
-    selectionDirection={{this.selectionDirection}}
-    spellcheck={{this.spellcheck}}
-    tabindex={{this.tabindex}}
-    title={{this.title}}
-    rows={{this.rows}}
-    cols={{this.cols}}
-    name={{this.name}}
-    selectionEnd={{this.selectionEnd}}
-    selectionStart={{this.selectionStart}}
-    autocomplete={{this.autocomplete}}
-    wrap={{this.wrap}}
-    lang={{this.lang}}
-    dir={{this.dir}}
+  ...attributes
 
-    ...attributes
+  value={{this.value}}
 
-    value={{this.value}}
-
-    {{on "change" this.change}}
-    {{on "input" this.input}}
-    {{on "keyup" this.keyUp}}
-    {{on "paste" this.valueDidChange}}
-    {{on "cut" this.valueDidChange}}
-
-    {{this.handleDeprecatedEvents this}}
-  />
-{{~else~}}
-  {{~#let (component '-textarea')  as |Textarea|~}}
-    <Textarea @target={{this.caller}} @__ARGS__={{this.args}} ...attributes />
-  {{~/let~}}
-{{/if}}
+  {{on "change" this.change}}
+  {{on "input" this.input}}
+  {{on "keyup" this.keyUp}}
+  {{on "paste" this.valueDidChange}}
+  {{on "cut" this.valueDidChange}}
+/>
\ No newline at end of file
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index c376688c0ca..3ef31153049 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -9,7 +9,6 @@ import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
 import { EngineInstanceOptions, Owner } from '@ember/-internals/owner';
 import { Route } from '@ember/-internals/routing';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import Controller from '@ember/controller';
 import { captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
@@ -1173,19 +1172,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
-            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-              ? []
-              : [
-                  {
-                    type: 'component',
-                    name: '-text-field',
-                    args: { positional: [], named: { target, type: 'text', value: 'first' } },
-                    instance: (instance: object) => instance['value'] === 'first',
-                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                    bounds: this.nodeBounds(this.element.firstChild),
-                    children: [],
-                  },
-                ],
+            children: [],
           },
         ]);
 
@@ -1199,19 +1186,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
-            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-              ? []
-              : [
-                  {
-                    type: 'component',
-                    name: '-text-field',
-                    args: { positional: [], named: { target, type: 'text', value: 'first' } },
-                    instance: (instance: object) => instance['value'] === 'first',
-                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                    bounds: this.nodeBounds(this.element.firstChild),
-                    children: [],
-                  },
-                ],
+            children: [],
           },
           {
             type: 'component',
@@ -1220,19 +1195,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.lastChild),
-            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-              ? []
-              : [
-                  {
-                    type: 'component',
-                    name: '-checkbox',
-                    args: { positional: [], named: { target, type: 'checkbox', checked: false } },
-                    instance: (instance: object) => instance['checked'] === false,
-                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                    bounds: this.nodeBounds(this.element.lastChild),
-                    children: [],
-                  },
-                ],
+            children: [],
           },
         ]);
 
@@ -1246,19 +1209,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
             bounds: this.nodeBounds(this.element.firstChild),
-            children: EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-              ? []
-              : [
-                  {
-                    type: 'component',
-                    name: '-text-field',
-                    args: { positional: [], named: { target, type: 'text', value: 'first' } },
-                    instance: (instance: object) => instance['value'] === 'first',
-                    template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-                    bounds: this.nodeBounds(this.element.firstChild),
-                    children: [],
-                  },
-                ],
+            children: [],
           },
         ]);
       }
@@ -1278,27 +1229,15 @@ if (ENV._DEBUG_RENDER_TREE) {
         await this.visit('/');
 
         let textareaNode = (value: string, node: Node): ExpectedRenderNode => {
-          if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-            return {
-              type: 'component',
-              name: 'textarea',
-              args: { positional: [], named: { value } },
-              instance: (instance: object) => instance['value'] === value,
-              bounds: this.nodeBounds(node),
-              template: 'packages/@ember/-internals/glimmer/lib/templates/textarea.hbs',
-              children: [],
-            };
-          } else {
-            return {
-              type: 'component',
-              name: 'textarea',
-              args: { positional: [], named: { value } },
-              instance: (instance: object) => instance['value'] === value,
-              bounds: this.nodeBounds(node),
-              template: 'packages/@ember/-internals/glimmer/lib/templates/empty.hbs',
-              children: [],
-            };
-          }
+          return {
+            type: 'component',
+            name: 'textarea',
+            args: { positional: [], named: { value } },
+            instance: (instance: object) => instance['value'] === value,
+            bounds: this.nodeBounds(node),
+            template: 'packages/@ember/-internals/glimmer/lib/templates/textarea.hbs',
+            children: [],
+          };
         };
 
         this.assertRenderTree([textareaNode('first', this.element.firstChild)]);
@@ -1338,9 +1277,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         await this.visit('/');
 
-        let template = `packages/@ember/-internals/glimmer/lib/templates/${
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? 'link-to' : '-link-to'
-        }.hbs`;
+        let template = `packages/@ember/-internals/glimmer/lib/templates/link-to.hbs`;
 
         this.assertRenderTree([
           {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 3a7693f42b2..8eb24a843b2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,12 +1,5 @@
 import { moduleFor, RenderingTestCase, runDestroy, runTask } from 'internal-test-helpers';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { action } from '@ember/object';
-import { Checkbox, TextArea, TextField } from '@ember/-internals/glimmer';
 import { set } from '@ember/-internals/metal';
-import { TargetActionSupport } from '@ember/-internals/runtime';
-import { getElementView, TextSupport } from '@ember/-internals/views';
-
-import { Component } from '../../utils/helpers';
 
 class InputRenderingTest extends RenderingTestCase {
   $input() {
@@ -77,114 +70,6 @@ class InputRenderingTest extends RenderingTestCase {
       element.dispatchEvent(event);
     });
   }
-
-  assertTriggersNativeDOMEvents(type) {
-    // Defaults from EventDispatcher
-    let events = {
-      touchstart: 'touchStart',
-      touchmove: 'touchMove',
-      touchend: 'touchEnd',
-      touchcancel: 'touchCancel',
-      keydown: 'keyDown',
-      keyup: 'keyUp',
-      keypress: 'keyPress',
-      mousedown: 'mouseDown',
-      mouseup: 'mouseUp',
-      contextmenu: 'contextMenu',
-      click: 'click',
-      dblclick: 'doubleClick',
-      focusin: 'focusIn',
-      focusout: 'focusOut',
-      submit: 'submit',
-      input: 'input',
-      change: 'change',
-      dragstart: 'dragStart',
-      drag: 'drag',
-      dragenter: 'dragEnter',
-      dragleave: 'dragLeave',
-      dragover: 'dragOver',
-      drop: 'drop',
-      dragend: 'dragEnd',
-    };
-
-    this.registerComponent('test-component', {
-      ComponentClass: Component.extend({
-        tagName: 'input',
-        attributeBindings: ['type'],
-      }),
-    });
-
-    let triggered = {
-      standard: [],
-      custom: [],
-    };
-
-    let actions = {
-      didTrigger(id, event) {
-        triggered[id].push(event);
-      },
-    };
-
-    function argsFor(id) {
-      let args = [`id="${id}"`];
-
-      if (type) {
-        args.push(`@type="${type}"`);
-      }
-
-      Object.keys(events).forEach((event) => {
-        args.push(`@${events[event]}={{action "didTrigger" "${id}" "${event}"}}`);
-      });
-
-      return args.join(' ');
-    }
-
-    let template = `
-      <Input ${argsFor('standard')} />
-      <TestComponent ${argsFor('custom')} />
-    `;
-
-    expectDeprecation(
-      () => {
-        this.render(template, { actions });
-      },
-      /Passing the `@(touchStart|touchMove|touchEnd|touchCancel|keyDown|keyUp|keyPress|mouseDown|mouseUp|contextMenu|click|doubleClick|focusIn|focusOut|submit|input|change|dragStart|drag|dragEnter|dragLeave|dragOver|drop|dragEnd|mouseEnter|mouseLeave|mouseMove|focus-in|focus-out|key-press|key-up|key-down)` argument to <Input> is deprecated\./,
-      EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-    );
-
-    this.assert.ok(this.$('input').length === 2);
-
-    let $standard = this.$('#standard');
-    let $custom = this.$('#custom');
-
-    this.assert.equal($standard.type, $custom.type);
-
-    Object.keys(events).forEach((event) => {
-      // triggerEvent does not seem to work with focusin and focusout events
-      if (event !== 'focusin' && event !== 'focusout') {
-        this.triggerEvent(event, null, '#standard');
-        this.triggerEvent(event, null, '#custom');
-      }
-    });
-
-    // test focusin and focusout by actually moving focus
-    $standard[0].focus();
-    $standard[0].blur();
-    $custom[0].focus();
-    $custom[0].blur();
-
-    this.assert.ok(
-      triggered.standard.length > 10,
-      'sanity check that most events are triggered (standard)'
-    );
-
-    this.assert.ok(
-      triggered.custom.length > 10,
-      'sanity check that most events are triggered (custom)'
-    );
-
-    this.assert.deepEqual(triggered.standard, triggered.custom, 'called for all events');
-  }
 }
 
 moduleFor(
@@ -320,120 +205,6 @@ moduleFor(
       // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
     }
 
-    ['@test [DEPRECATED] dynamic attributes (named argument)']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `<Input @type="text" @value={{this.value}}
-              @elementId="test-input"
-              @ariaRole={{this.role}}
-              @disabled={{this.disabled}}
-              @placeholder={{this.placeholder}}
-              @name={{this.name}}
-              @maxlength={{this.maxlength}}
-              @minlength={{this.minlength}}
-              @size={{this.size}}
-              @tabindex={{this.tabindex}}/>`,
-            {
-              value: 'Original value',
-              role: 'textbox',
-              disabled: false,
-              placeholder: 'Original placeholder',
-              name: 'original-name',
-              maxlength: 10,
-              minlength: 5,
-              size: 20,
-              tabindex: 30,
-            }
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertNotDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'textbox');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20'); //NOTE: failing in IE  (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      runTask(() => this.rerender());
-
-      this.assertNotDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'textbox');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'value', 'Updated value');
-            set(this.context, 'role', 'search');
-            set(this.context, 'disabled', true);
-            set(this.context, 'placeholder', 'Updated placeholder');
-            set(this.context, 'name', 'updated-name');
-            set(this.context, 'maxlength', 11);
-            set(this.context, 'minlength', 6);
-            // set(this.context, 'size', 21); //NOTE: failing in IE (TEST_SUITE=sauce)
-            // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertDisabled();
-      this.assertValue('Updated value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Updated placeholder');
-      this.assertAttr('name', 'updated-name');
-      this.assertAttr('maxlength', '11');
-      this.assertAttr('minlength', '6');
-      // this.assertAttr('size', '21'); //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '31'); //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'value', 'Original value');
-            set(this.context, 'role', 'textbox');
-            set(this.context, 'disabled', false);
-            set(this.context, 'placeholder', 'Original placeholder');
-            set(this.context, 'name', 'original-name');
-            set(this.context, 'maxlength', 10);
-            set(this.context, 'minlength', 5);
-            // set(this.context, 'size', 20); //NOTE: failing in IE (TEST_SUITE=sauce)
-            // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertNotDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'textbox');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
-    }
-
     ['@test static attributes (HTML attribute)']() {
       this.render(`
       <Input @type="text" @value="Original value"
@@ -473,51 +244,6 @@ moduleFor(
       // this.assertAttr('tabindex', '30');  //NOTE: failing in IE (TEST_SUITE=sauce)
     }
 
-    ['@test [DEPRECATED] static attributes (named argument)']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `<Input @type="text" @value="Original value"
-              @elementId="test-input"
-              @ariaRole="search"
-              @disabled={{true}}
-              @placeholder="Original placeholder"
-              @name="original-name"
-              @maxlength={{10}}
-              @minlength={{5}}
-              @size={{20}}
-              @tabindex={{30}}/>`
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20');  //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30');  //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      runTask(() => this.rerender());
-
-      this.assertDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20');  //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30');  //NOTE: failing in IE (TEST_SUITE=sauce)
-    }
-
     ['@test cursor selection range']() {
       // Modifying input.selectionStart, which is utilized in the cursor tests,
       // causes an event in Safari.
@@ -573,81 +299,6 @@ moduleFor(
       });
     }
 
-    ['@test sends an action with `<Input @key-press={{action "foo"}} />` is pressed'](assert) {
-      let triggered = 0;
-
-      expectDeprecation(
-        () => {
-          this.render(`<Input @value={{this.value}} @key-press={{action 'foo'}} />`, {
-            value: 'initial',
-
-            actions: {
-              foo(value, event) {
-                triggered++;
-                assert.ok(true, 'action was triggered');
-                assert.ok(event instanceof Event, 'Native event was passed');
-              },
-            },
-          });
-        },
-        /Passing the `@key-press` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keypress', { key: 'A' });
-
-      assert.equal(triggered, 1, 'The action was triggered exactly once');
-    }
-
-    ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
-      let bubbled = 0;
-
-      let ParentComponent = Component.extend({
-        change() {
-          bubbled++;
-        },
-      });
-
-      this.registerComponent('parent', {
-        ComponentClass: ParentComponent,
-        template: `<Input @bubbles={{true}} />`,
-      });
-
-      expectDeprecation(
-        () => this.render(`<Parent />`),
-        'Passing the `@bubbles` argument to <Input> is deprecated.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('change');
-
-      assert.strictEqual(bubbled, 1, 'bubbled upwards');
-    }
-
-    ['@test [DEPRECATED] triggers `focus-in` when focused'](assert) {
-      let wasFocused = false;
-
-      expectDeprecation(
-        () => {
-          this.render(`<Input @focus-in={{action 'foo'}} />`, {
-            actions: {
-              foo() {
-                wasFocused = true;
-              },
-            },
-          });
-        },
-        /Passing the `@focus-in` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      runTask(() => {
-        this.$input().focus();
-      });
-
-      assert.ok(wasFocused, 'action was triggered');
-    }
-
     ['@test sends `insert-newline` when <enter> is pressed'](assert) {
       assert.expect(2);
 
@@ -682,84 +333,12 @@ moduleFor(
       this.triggerEvent('keyup', { key: 'Escape' });
     }
 
-    ['@test [DEPRECATED] sends an action with `<Input @key-down={{action "foo"}} />` when a key is pressed'](
-      assert
-    ) {
-      let triggered = 0;
-
-      expectDeprecation(
-        () => {
-          this.render(`<Input @key-down={{action 'foo'}} />`, {
-            actions: {
-              foo(value, event) {
-                triggered++;
-                assert.ok(true, 'action was triggered');
-                assert.ok(event instanceof Event, 'Native event was passed');
-              },
-            },
-          });
-        },
-        /Passing the `@key-down` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keydown', { key: 'A' });
-
-      assert.equal(triggered, 1, 'The action was triggered exactly once');
-    }
-
-    ['@test [DEPRECATED] sends an action with `<Input @key-up={{action "foo"}} />` when a key is pressed'](
-      assert
-    ) {
-      let triggered = 0;
-
-      expectDeprecation(
-        () => {
-          this.render(`<Input @key-up={{action 'foo'}} />`, {
-            actions: {
-              foo(value, event) {
-                triggered++;
-                assert.ok(true, 'action was triggered');
-                assert.ok(event instanceof Event, 'Native event was passed');
-              },
-            },
-          });
-        },
-        /Passing the `@key-up` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keyup', { key: 'A' });
-
-      assert.equal(triggered, 1, 'The action was triggered exactly once');
-    }
-
     ['@test GH#14727 can render a file input after having had render an input of other type']() {
       this.render(`<Input @type="text" /><Input @type="file" />`);
 
       this.assert.equal(this.$input()[0].type, 'text');
       this.assert.equal(this.$input()[1].type, 'file');
     }
-
-    ['@test sends an action with `<Input EVENT={{action "foo"}} />` for native DOM events']() {
-      this.assertTriggersNativeDOMEvents();
-    }
-
-    ['@test [DEPRECATED] triggers a method with `<Input @key-up={{this.didTrigger}} />`'](assert) {
-      expectDeprecation(
-        () => {
-          this.render(`<Input @key-up={{this.didTrigger}} />`, {
-            didTrigger: action(function () {
-              assert.ok(true, 'action was triggered');
-            }),
-          });
-        },
-        /Passing the `@key-up` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keyup', { key: 'A' });
-    }
   }
 );
 
@@ -888,91 +467,7 @@ moduleFor(
       this.assertAttr('tabindex', '10');
     }
 
-    ['@test [DEPRECATED] dynamic attributes (named argument)']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `<Input @type='checkbox' @checked={{this.checked}}
-              @ariaRole={{this.role}}
-              @disabled={{this.disabled}}
-              @name={{this.name}}
-              @tabindex={{this.tabindex}}
-            />`,
-            {
-              role: 'checkbox',
-              disabled: false,
-              name: 'original-name',
-              checked: false,
-              tabindex: 10,
-            }
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertNotDisabled();
-      this.assertAttr('role', 'checkbox');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('tabindex', '10');
-
-      runTask(() => this.rerender());
-
-      this.assertSingleCheckbox();
-      this.assertNotDisabled();
-      this.assertAttr('role', 'checkbox');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('tabindex', '10');
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'radio');
-            set(this.context, 'disabled', true);
-            set(this.context, 'name', 'updated-name');
-            set(this.context, 'tabindex', 11);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertDisabled();
-      this.assertAttr('role', 'radio');
-      this.assertAttr('name', 'updated-name');
-      this.assertAttr('tabindex', '11');
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'checkbox');
-            set(this.context, 'disabled', false);
-            set(this.context, 'name', 'original-name');
-            set(this.context, 'tabindex', 10);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|name|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertNotDisabled();
-      this.assertAttr('role', 'checkbox');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('tabindex', '10');
-    }
-
-    ['@feature(!EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property assertion']() {
-      expectAssertion(() => {
-        this.render(`<Input @type="checkbox" @value={{this.value}} />`, {
-          value: 'value',
-        });
-      }, /checkbox.+@value.+not supported.+use.+@checked.+instead/);
-    }
-
-    ['@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property warning']() {
+    ['`value` property warning']() {
       let message =
         '`<Input @type="checkbox" />` reflects its checked state via the `@checked` argument. ' +
         'You wrote `<Input @type="checkbox" @value={{...}} />` which is likely not what you intended. ' +
@@ -1046,38 +541,6 @@ moduleFor(
       this.assertAttr('tabindex', '10');
       this.assertAttr('name', 'original-name');
     }
-
-    ['@test [DEPRECATED] with static values (named argument)']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `<Input @type="checkbox" @checked={{false}} @ariaRole="radio" @disabled={{false}} @tabindex={{10}} @name="original-name" />`
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertCheckboxIsNotChecked();
-      this.assertNotDisabled();
-      this.assertAttr('role', 'radio');
-      this.assertAttr('tabindex', '10');
-      this.assertAttr('name', 'original-name');
-
-      runTask(() => this.rerender());
-
-      this.assertSingleCheckbox();
-      this.assertCheckboxIsNotChecked();
-      this.assertNotDisabled();
-      this.assertAttr('role', 'radio');
-      this.assertAttr('tabindex', '10');
-      this.assertAttr('name', 'original-name');
-    }
-
-    ['@test sends an action with `<Input EVENT={{action "foo"}} />` for native DOM events']() {
-      this.assertTriggersNativeDOMEvents('checkbox');
-    }
   }
 );
 
@@ -1158,97 +621,6 @@ moduleFor(
       // this.assertAttr('size', undefined); //NOTE: re-enable once `size` bug above has been addressed
       this.assertAttr('tabindex', undefined);
     }
-
-    ['@test [DEPRECATED] null values (named argument)']() {
-      let attributes = ['role', 'disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
-
-      expectDeprecation(
-        () => {
-          this.render(
-            `<Input @type="text" @value={{this.value}}
-              @ariaRole={{this.role}}
-              @disabled={{this.disabled}}
-              @placeholder={{this.placeholder}}
-              @name={{this.name}}
-              @maxlength={{this.maxlength}}
-              @size={{this.size}}
-              @tabindex={{this.tabindex}}/>`,
-            {
-              value: null,
-              role: null,
-              disabled: null,
-              placeholder: null,
-              name: null,
-              maxlength: null,
-              size: null,
-              tabindex: null,
-            }
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertValue('');
-      this.assertAllAttrs(attributes, undefined);
-
-      runTask(() => this.rerender());
-
-      this.assertValue('');
-      this.assertAllAttrs(attributes, undefined);
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'search');
-            set(this.context, 'disabled', true);
-            set(this.context, 'value', 'Updated value');
-            set(this.context, 'placeholder', 'Updated placeholder');
-            set(this.context, 'name', 'updated-name');
-            set(this.context, 'maxlength', 11);
-            set(this.context, 'size', 21);
-            set(this.context, 'tabindex', 31);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertDisabled();
-      this.assertValue('Updated value');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Updated placeholder');
-      this.assertAttr('name', 'updated-name');
-      this.assertAttr('maxlength', '11');
-      this.assertAttr('size', '21');
-      this.assertAttr('tabindex', '31');
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', null);
-            set(this.context, 'disabled', null);
-            set(this.context, 'value', null);
-            set(this.context, 'placeholder', null);
-            set(this.context, 'name', null);
-            set(this.context, 'maxlength', null);
-            // set(this.context, 'size', null); //NOTE: this fails with `Error: Failed to set the 'size' property on 'HTMLInputElement': The value provided is 0, which is an invalid size.` (TEST_SUITE=sauce)
-            set(this.context, 'tabindex', null);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertAttr('disabled', undefined);
-      this.assertValue('');
-      this.assertAttr('role', undefined);
-      // this.assertAttr('placeholder', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
-      // this.assertAttr('name', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
-      this.assertAttr('maxlength', undefined);
-      // this.assertAttr('size', undefined); //NOTE: re-enable once `size` bug above has been addressed
-      this.assertAttr('tabindex', undefined);
-    }
   }
 );
 
@@ -1298,160 +670,3 @@ function InputAttributesTest(attrs) {
 ].forEach((attrs) => {
   moduleFor(`[GH#15675] Components test: <Input ${attrs} />`, InputAttributesTest(attrs));
 });
-
-[
-  // Named argument
-  '@type="range" @min="-5" @max="50" @value="%x"',
-  '@type="range" @value="%x" @min="-5" @max="50"',
-  '@min="-5" @max="50" @type="range" @value="%x"',
-  '@min="-5" @max="50" @value="%x" @type="range"',
-  '@value="%x" @min="-5" @max="50" @type="range"',
-  '@value="%x" @type="range" @min="-5" @max="50"',
-].forEach((attrs) => {
-  moduleFor(
-    `[GH#15675] Components test: <Input ${attrs} />`,
-    class extends InputAttributesTest(attrs) {
-      renderInput(value = 25) {
-        expectDeprecation(
-          () => super.renderInput(value),
-          /Passing the `@(min|max)` argument to <Input> is deprecated\./,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-      }
-    }
-  );
-});
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  [
-    ['Ember.Component', Component, true, true],
-    ['Ember.Checkbox', Checkbox, true, false],
-    ['Ember.TextArea', TextArea, false, true],
-    ['Ember.TextField', TextField, true, false],
-    ['Ember.TextSupport', TextSupport, true, true],
-    ['Ember.TargetActionSupport', TargetActionSupport, true, true],
-  ].forEach(([label, ClassOrMixin, shouldDeoptInput, shouldDeoptTextArea]) => {
-    let message =
-      ClassOrMixin === Component
-        ? /Reopening the Ember\.Component super class itself is deprecated\./
-        : new RegExp(`Reopening ${label.replace(/\./g, '\\.')} is deprecated\\.`);
-
-    class DeoptTest extends RenderingTestCase {
-      constructor() {
-        super(...arguments);
-        this.assertDidNotReopen();
-      }
-
-      teardown() {
-        super.teardown();
-        ClassOrMixin._wasReopened = false;
-      }
-
-      assertDidReopen() {
-        this.assert.strictEqual(ClassOrMixin._wasReopened, true, `${label} was marked as reopened`);
-      }
-
-      assertDidNotReopen() {
-        this.assert.strictEqual(
-          ClassOrMixin._wasReopened,
-          false,
-          `${label} was not marked as reopened`
-        );
-      }
-
-      assertDeopt(
-        _shouldDeoptInput = shouldDeoptInput,
-        _shouldDeoptTextArea = shouldDeoptTextArea
-      ) {
-        this.render(`
-          <Input id="test-textbox" @value="hello" />
-          <Input id="test-checkbox" @type="checkbox" @checked={{true}} />
-          <Textarea id="test-textarea" @value="hello world" />
-        `);
-
-        let textbox = this.$('#test-textbox')[0];
-        let checkbox = this.$('#test-checkbox')[0];
-        let textarea = this.$('#test-textarea')[0];
-
-        this.assert.ok(textbox, 'a textbox was rendered');
-        this.assert.ok(checkbox, 'a checkbox was rendered');
-        this.assert.ok(textarea, 'a textarea was rendered');
-
-        this.assert.strictEqual(
-          this.isDeopted(textbox),
-          _shouldDeoptInput,
-          `<Input @type="text" /> ${_shouldDeoptInput ? 'was' : 'was not'} deopted`
-        );
-
-        this.assert.strictEqual(
-          this.isDeopted(checkbox),
-          _shouldDeoptInput,
-          `<Input @type="checkbox" /> ${_shouldDeoptInput ? 'was' : 'was not'} deopted`
-        );
-
-        this.assert.strictEqual(
-          this.isDeopted(textarea),
-          _shouldDeoptTextArea,
-          `<Textarea /> ${_shouldDeoptTextArea ? 'was' : 'was not'} deopted`
-        );
-      }
-
-      isDeopted(element) {
-        return getElementView(element) !== null;
-      }
-
-      [`@test ${label}.reopen()`]() {
-        expectDeprecation(
-          () =>
-            ClassOrMixin.reopen({
-              /* noop */
-            }),
-          message
-        );
-
-        this.assertDidReopen();
-        this.assertDeopt();
-      }
-    }
-
-    if (typeof ClassOrMixin.extend === 'function') {
-      DeoptTest.prototype[`@test ${label}.extend().reopen()`] = function () {
-        ClassOrMixin.extend().reopen({
-          /* noop */
-        });
-
-        this.assertDidNotReopen();
-        this.assertDeopt(false, false);
-      };
-    }
-
-    if (typeof ClassOrMixin.reopenClass === 'function') {
-      DeoptTest.prototype[`@test ${label}.reopenClass()`] = function () {
-        expectDeprecation(
-          () =>
-            ClassOrMixin.reopenClass({
-              /* noop */
-            }),
-          message
-        );
-
-        this.assertDidReopen();
-        this.assertDeopt();
-      };
-
-      DeoptTest.prototype[`@test ${label}.extend().reopenClass()`] = function () {
-        ClassOrMixin.extend().reopenClass({
-          /* noop */
-        });
-
-        this.assertDidNotReopen();
-        this.assertDeopt(false, false);
-      };
-    }
-
-    moduleFor(
-      `Components test: [DEPRECATED] <Input /> and <Textarea /> deopt (${label})`,
-      DeoptTest
-    );
-  });
-}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 93dd57ed485..8cabd37b8ec 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -1,11 +1,7 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { action } from '@ember/object';
 import { set } from '@ember/-internals/metal';
 
-import { Component } from '../../utils/helpers';
-
 class InputRenderingTest extends RenderingTestCase {
   $input() {
     return this.$('input');
@@ -75,74 +71,6 @@ class InputRenderingTest extends RenderingTestCase {
       element.dispatchEvent(event);
     });
   }
-
-  assertTriggersNativeDOMEvents(type) {
-    // Defaults from EventDispatcher
-    let events = {
-      touchstart: 'touchStart',
-      touchmove: 'touchMove',
-      touchend: 'touchEnd',
-      touchcancel: 'touchCancel',
-      keydown: 'keyDown',
-      keyup: 'keyUp',
-      keypress: 'keyPress',
-      mousedown: 'mouseDown',
-      mouseup: 'mouseUp',
-      contextmenu: 'contextMenu',
-      click: 'click',
-      dblclick: 'doubleClick',
-      focusin: 'focusIn',
-      focusout: 'focusOut',
-      submit: 'submit',
-      input: 'input',
-      change: 'change',
-      dragstart: 'dragStart',
-      drag: 'drag',
-      dragenter: 'dragEnter',
-      dragleave: 'dragLeave',
-      dragover: 'dragOver',
-      drop: 'drop',
-      dragend: 'dragEnd',
-    };
-
-    let TestComponent = Component.extend({ tagName: 'input' });
-    this.registerComponent('test-component', { ComponentClass: TestComponent });
-
-    let triggeredEvents = [];
-    let actions = {};
-    Object.keys(events).forEach((evt) => {
-      actions[`run_${evt}`] = function () {
-        triggeredEvents.push(evt);
-      };
-    });
-
-    let typeAttr = type ? `type="${type}" ` : '';
-    let actionAttrs = Object.keys(events)
-      .map((evt) => `${events[evt]}=(action 'run_${evt}')`)
-      .join(' ');
-    let template = `{{test-component ${typeAttr}${actionAttrs}}}{{input ${typeAttr}${actionAttrs}}}`;
-
-    expectDeprecation(
-      () => {
-        this.render(template, { actions });
-      },
-      /Passing the `@(touchStart|touchMove|touchEnd|touchCancel|keyDown|keyUp|keyPress|mouseDown|mouseUp|contextMenu|click|doubleClick|focusIn|focusOut|submit|input|change|dragStart|drag|dragEnter|dragLeave|dragOver|drop|dragEnd|mouseEnter|mouseLeave|mouseMove|focus-in|focus-out|key-press|key-up|key-down)` argument to <Input> is deprecated\./,
-      EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-    );
-
-    Object.keys(events).forEach((evt) => this.triggerEvent(evt, null, 'input:first-of-type'));
-    let normallyTriggeredEvents = [].concat(triggeredEvents);
-    triggeredEvents.length = 0;
-
-    this.assert.ok(
-      normallyTriggeredEvents.length > 10,
-      'sanity check that most events are triggered'
-    );
-
-    normallyTriggeredEvents.forEach((evt) => this.triggerEvent(evt, null, 'input:last-of-type'));
-
-    this.assert.deepEqual(triggeredEvents, normallyTriggeredEvents, 'called for all events');
-  }
 }
 
 moduleFor(
@@ -185,169 +113,6 @@ moduleFor(
       this.assertAttr('type', 'text');
     }
 
-    ['@test [DEPRECATED] dynamic attributes']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `
-            {{input type="text"
-              elementId="test-input"
-              ariaRole=this.role
-              disabled=this.disabled
-              value=this.value
-              placeholder=this.placeholder
-              name=this.name
-              maxlength=this.maxlength
-              minlength=this.minlength
-              size=this.size
-              tabindex=this.tabindex
-            }}`,
-            {
-              role: 'textbox',
-              disabled: false,
-              value: 'Original value',
-              placeholder: 'Original placeholder',
-              name: 'original-name',
-              maxlength: 10,
-              minlength: 5,
-              size: 20,
-              tabindex: 30,
-            }
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertNotDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'textbox');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20'); //NOTE: failing in IE  (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      runTask(() => this.rerender());
-
-      this.assertNotDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'textbox');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'search');
-            set(this.context, 'value', 'Updated value');
-            set(this.context, 'disabled', true);
-            set(this.context, 'placeholder', 'Updated placeholder');
-            set(this.context, 'name', 'updated-name');
-            set(this.context, 'maxlength', 11);
-            set(this.context, 'minlength', 6);
-            // set(this.context, 'size', 21); //NOTE: failing in IE (TEST_SUITE=sauce)
-            // set(this.context, 'tabindex', 31); //NOTE: failing in IE (TEST_SUITE=sauce)
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertDisabled();
-      this.assertValue('Updated value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Updated placeholder');
-      this.assertAttr('name', 'updated-name');
-      this.assertAttr('maxlength', '11');
-      this.assertAttr('minlength', '6');
-      // this.assertAttr('size', '21'); //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '31'); //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'textbox');
-            set(this.context, 'value', 'Original value');
-            set(this.context, 'disabled', false);
-            set(this.context, 'placeholder', 'Original placeholder');
-            set(this.context, 'name', 'original-name');
-            set(this.context, 'maxlength', 10);
-            set(this.context, 'minlength', 5);
-            // set(this.context, 'size', 20); //NOTE: failing in IE (TEST_SUITE=sauce)
-            // set(this.context, 'tabindex', 30); //NOTE: failing in IE (TEST_SUITE=sauce)
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertNotDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'textbox');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20'); //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30'); //NOTE: failing in IE (TEST_SUITE=sauce)
-    }
-
-    ['@test [DEPRECATED] static attributes']() {
-      expectDeprecation(
-        () => {
-          this.render(`
-            {{input type="text"
-              elementId="test-input"
-              ariaRole="search"
-              disabled=true
-              value="Original value"
-              placeholder="Original placeholder"
-              name="original-name"
-              maxlength=10
-              minlength=5
-              size=20
-              tabindex=30
-            }}`);
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20');  //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30');  //NOTE: failing in IE (TEST_SUITE=sauce)
-
-      runTask(() => this.rerender());
-
-      this.assertDisabled();
-      this.assertValue('Original value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Original placeholder');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('maxlength', '10');
-      this.assertAttr('minlength', '5');
-      // this.assertAttr('size', '20');  //NOTE: failing in IE (TEST_SUITE=sauce)
-      // this.assertAttr('tabindex', '30');  //NOTE: failing in IE (TEST_SUITE=sauce)
-    }
-
     ['@test cursor selection range']() {
       // Modifying input.selectionStart, which is utilized in the cursor tests,
       // causes an event in Safari.
@@ -403,81 +168,6 @@ moduleFor(
       });
     }
 
-    ['@test sends an action with `{{input key-press=(action "foo")}}` is pressed'](assert) {
-      let triggered = 0;
-
-      expectDeprecation(
-        () => {
-          this.render(`{{input value=this.value key-press=(action 'foo')}}`, {
-            value: 'initial',
-
-            actions: {
-              foo(value, event) {
-                triggered++;
-                assert.ok(true, 'action was triggered');
-                assert.ok(event instanceof Event, 'Native event was passed');
-              },
-            },
-          });
-        },
-        /Passing the `@key-press` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keypress', { key: 'A' });
-
-      assert.equal(triggered, 1, 'The action was triggered exactly once');
-    }
-
-    ['@test sends an action to the parent level when `bubbles=true` is provided'](assert) {
-      let bubbled = 0;
-
-      let ParentComponent = Component.extend({
-        change() {
-          bubbled++;
-        },
-      });
-
-      this.registerComponent('x-parent', {
-        ComponentClass: ParentComponent,
-        template: `{{input bubbles=true}}`,
-      });
-
-      expectDeprecation(
-        () => this.render(`{{x-parent}}`),
-        'Passing the `@bubbles` argument to <Input> is deprecated.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('change');
-
-      assert.strictEqual(bubbled, 1, 'bubbled upwards');
-    }
-
-    ['@test triggers `focus-in` when focused'](assert) {
-      let wasFocused = false;
-
-      expectDeprecation(
-        () => {
-          this.render(`{{input focus-in=(action 'foo')}}`, {
-            actions: {
-              foo() {
-                wasFocused = true;
-              },
-            },
-          });
-        },
-        /Passing the `@focus-in` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      runTask(() => {
-        this.$input().focus();
-      });
-
-      assert.ok(wasFocused, 'action was triggered');
-    }
-
     ['@test sends `insert-newline` when <enter> is pressed'](assert) {
       assert.expect(2);
 
@@ -512,77 +202,12 @@ moduleFor(
       this.triggerEvent('keyup', { key: 'Escape' });
     }
 
-    ['@test sends an action with `{{input key-down=(action "foo")}}` when a key is pressed'](
-      assert
-    ) {
-      let triggered = 0;
-
-      expectDeprecation(
-        () => {
-          this.render(`{{input key-down=(action 'foo')}}`, {
-            actions: {
-              foo(value, event) {
-                triggered++;
-                assert.ok(true, 'action was triggered');
-                assert.ok(event instanceof Event, 'Native event was passed');
-              },
-            },
-          });
-        },
-        /Passing the `@key-down` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keydown', { key: 'A' });
-
-      assert.equal(triggered, 1, 'The action was triggered exactly once');
-    }
-
-    ['@test sends an action with `{{input key-up=(action "foo")}}` when a key is pressed'](assert) {
-      expectDeprecation(
-        () => {
-          this.render(`{{input key-up=(action 'foo')}}`, {
-            actions: {
-              foo(value, event) {
-                assert.ok(true, 'action was triggered');
-                assert.ok(event instanceof Event, 'Native event was passed');
-              },
-            },
-          });
-        },
-        /Passing the `@key-up` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keyup', { key: 'A' });
-    }
-
     ['@test GH#14727 can render a file input after having had render an input of other type']() {
       this.render(`{{input type="text"}}{{input type="file"}}`);
 
       this.assert.equal(this.$input()[0].type, 'text');
       this.assert.equal(this.$input()[1].type, 'file');
     }
-
-    ['@test [DEPRECATED] sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
-      this.assertTriggersNativeDOMEvents();
-    }
-
-    ['@test triggers a method with `{{input key-up=this.didTrigger}}`'](assert) {
-      expectDeprecation(
-        () => {
-          this.render(`{{input key-up=this.didTrigger}}`, {
-            didTrigger: action(function () {
-              assert.ok(true, 'action was triggered');
-            }),
-          });
-        },
-        /Passing the `@key-up` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keyup', { key: 'A' });
-    }
   }
 );
 
@@ -650,98 +275,7 @@ moduleFor(
 moduleFor(
   `Components test: {{input type='checkbox'}}`,
   class extends InputRenderingTest {
-    ['@test [DEPRECATED] dynamic attributes']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `{{input
-              type='checkbox'
-              elementId="test-input"
-              ariaRole=this.role
-              disabled=this.disabled
-              name=this.name
-              checked=this.checked
-              tabindex=this.tabindex
-            }}`,
-            {
-              role: 'radio',
-              disabled: false,
-              name: 'original-name',
-              checked: false,
-              tabindex: 10,
-            }
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertNotDisabled();
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'radio');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('tabindex', '10');
-
-      runTask(() => this.rerender());
-
-      this.assertSingleCheckbox();
-      this.assertNotDisabled();
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'radio');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('tabindex', '10');
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'checkbox');
-            set(this.context, 'disabled', true);
-            set(this.context, 'name', 'updated-name');
-            set(this.context, 'tabindex', 11);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertDisabled();
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'checkbox');
-      this.assertAttr('name', 'updated-name');
-      this.assertAttr('tabindex', '11');
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'radio');
-            set(this.context, 'disabled', false);
-            set(this.context, 'name', 'original-name');
-            set(this.context, 'tabindex', 10);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|minlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertNotDisabled();
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'radio');
-      this.assertAttr('name', 'original-name');
-      this.assertAttr('tabindex', '10');
-    }
-
-    ['@feature(!EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property assertion']() {
-      expectAssertion(() => {
-        this.render(`{{input type="checkbox" value=this.value}}`, {
-          value: 'value',
-        });
-      }, /checkbox.+value.+not supported.+use.+checked.+instead/);
-    }
-
-    ['@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) `value` property warning']() {
+    ['`value` property warning']() {
       let message =
         '`<Input @type="checkbox" />` reflects its checked state via the `@checked` argument. ' +
         'You wrote `<Input @type="checkbox" @value={{...}} />` which is likely not what you intended. ' +
@@ -794,196 +328,5 @@ moduleFor(
       this.$input()[0].click();
       this.assertCheckboxIsNotChecked();
     }
-
-    ['@test [DEPRECATED] with static values']() {
-      expectDeprecation(
-        () => {
-          this.render(
-            `{{input type="checkbox"
-              elementId="test-input"
-              ariaRole="radio"
-              disabled=false
-              tabindex=10
-              name="original-name"
-              checked=false}}`
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|tabindex|name)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertSingleCheckbox();
-      this.assertCheckboxIsNotChecked();
-      this.assertNotDisabled();
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'radio');
-      this.assertAttr('tabindex', '10');
-      this.assertAttr('name', 'original-name');
-
-      runTask(() => this.rerender());
-
-      this.assertSingleCheckbox();
-      this.assertCheckboxIsNotChecked();
-      this.assertNotDisabled();
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'radio');
-      this.assertAttr('tabindex', '10');
-      this.assertAttr('name', 'original-name');
-    }
-
-    ['@test [DEPRECATED] sends an action with `{{input EVENT=(action "foo")}}` for native DOM events']() {
-      this.assertTriggersNativeDOMEvents('checkbox');
-    }
   }
 );
-
-moduleFor(
-  `Components test: {{input type='text'}}`,
-  class extends InputRenderingTest {
-    ['@test [DEPRECATED] null values']() {
-      let attributes = ['role', 'disabled', 'placeholder', 'name', 'maxlength', 'size', 'tabindex'];
-
-      expectDeprecation(
-        () => {
-          this.render(
-            `{{input type="text"
-              elementId="test-input"
-              ariaRole=this.role
-              disabled=this.disabled
-              value=this.value
-              placeholder=this.placeholder
-              name=this.name
-              maxlength=this.maxlength
-              size=this.size
-              tabindex=this.tabindex}}`,
-            {
-              role: null,
-              disabled: null,
-              value: null,
-              placeholder: null,
-              name: null,
-              maxlength: null,
-              size: null,
-              tabindex: null,
-            }
-          );
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertValue('');
-      this.assertAttr('id', 'test-input');
-      this.assertAllAttrs(attributes, undefined);
-
-      runTask(() => this.rerender());
-
-      this.assertValue('');
-      this.assertAttr('id', 'test-input');
-      this.assertAllAttrs(attributes, undefined);
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', 'search');
-            set(this.context, 'disabled', true);
-            set(this.context, 'value', 'Updated value');
-            set(this.context, 'placeholder', 'Updated placeholder');
-            set(this.context, 'name', 'updated-name');
-            set(this.context, 'maxlength', 11);
-            set(this.context, 'size', 21);
-            set(this.context, 'tabindex', 31);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertDisabled();
-      this.assertValue('Updated value');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', 'search');
-      this.assertAttr('placeholder', 'Updated placeholder');
-      this.assertAttr('name', 'updated-name');
-      this.assertAttr('maxlength', '11');
-      this.assertAttr('size', '21');
-      this.assertAttr('tabindex', '31');
-
-      expectDeprecation(
-        () => {
-          runTask(() => {
-            set(this.context, 'role', null);
-            set(this.context, 'disabled', null);
-            set(this.context, 'value', null);
-            set(this.context, 'placeholder', null);
-            set(this.context, 'name', null);
-            set(this.context, 'maxlength', null);
-            // set(this.context, 'size', null); //NOTE: this fails with `Error: Failed to set the 'size' property on 'HTMLInputElement': The value provided is 0, which is an invalid size.` (TEST_SUITE=sauce)
-            set(this.context, 'tabindex', null);
-          });
-        },
-        /Passing the `@(elementId|ariaRole|disabled|placeholder|name|maxlength|size|tabindex)` argument to <Input> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.assertAttr('disabled', undefined);
-      this.assertValue('');
-      this.assertAttr('id', 'test-input');
-      this.assertAttr('role', undefined);
-      // this.assertAttr('placeholder', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
-      // this.assertAttr('name', undefined); //NOTE: this fails with a value of "null" (TEST_SUITE=sauce)
-      this.assertAttr('maxlength', undefined);
-      // this.assertAttr('size', undefined); //NOTE: re-enable once `size` bug above has been addressed
-      this.assertAttr('tabindex', undefined);
-    }
-  }
-);
-
-// These are the permutations of the set:
-// ['type="range"', 'min="-5" max="50"', 'value="%x"']
-[
-  'type="range" min="-5" max="50" value="%x"',
-  'type="range" value="%x" min="-5" max="50"',
-  'min="-5" max="50" type="range" value="%x"',
-  'min="-5" max="50" value="%x" type="range"',
-  'value="%x" min="-5" max="50" type="range"',
-  'value="%x" type="range" min="-5" max="50"',
-].forEach((attrs) => {
-  moduleFor(
-    `[GH#15675] Components test [DEPRECATED]: {{input ${attrs}}}`,
-    class extends InputRenderingTest {
-      renderInput(value = 25) {
-        expectDeprecation(
-          () => this.render(`{{input ${attrs.replace('%x', value)}}}`),
-          /Passing the `@(min|max)` argument to <Input> is deprecated\./,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-      }
-
-      ['@test value over default max but below set max is kept']() {
-        this.renderInput('25');
-        this.assertValue('25');
-      }
-
-      ['@test value below default min but above set min is kept']() {
-        this.renderInput('-2');
-        this.assertValue('-2');
-      }
-
-      ['@test in the valid default range is kept']() {
-        this.renderInput('5');
-        this.assertValue('5');
-      }
-
-      ['@test value above max is reset to max']() {
-        this.renderInput('55');
-        this.assertValue('50');
-      }
-
-      ['@test value below min is reset to min']() {
-        this.renderInput('-10');
-        this.assertValue('-5');
-      }
-    }
-  );
-});
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 2729071af47..47ad96e478f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -350,30 +350,6 @@ moduleFor(
       assert.equal(theLink.attr('href'), '/?foo=ASL');
     }
 
-    async ['@test supplied QP properties can be bound in legacy components'](assert) {
-      expectDeprecation(/Passing the `@tagName` argument to/);
-
-      this.addTemplate(
-        'index',
-        `
-          <LinkTo @tagName="a" id="the-link" @query={{hash foo=this.boundThing}}>
-            Index
-          </LinkTo>
-        `
-      );
-
-      await this.visit('/');
-
-      let indexController = this.getController('index');
-      let theLink = this.$('#the-link');
-
-      assert.equal(theLink.attr('href'), '/?foo=OMG');
-
-      runTask(() => indexController.set('boundThing', 'ASL'));
-
-      assert.equal(theLink.attr('href'), '/?foo=ASL');
-    }
-
     async ['@test supplied QP properties can be bound (booleans)'](assert) {
       this.addTemplate(
         'index',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index 605a8c51c7e..913f600b9b5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -1,7 +1,6 @@
 import Controller from '@ember/controller';
 import { RSVP } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
-import { DEBUG } from '@glimmer/env';
 import {
   ApplicationTestCase,
   classes as classMatcher,
@@ -70,31 +69,6 @@ moduleFor(
         });
       });
     }
-
-    async ['@test [DEPRECATED] `query-params` can be used outside of `{{link-to}}'](assert) {
-      if (!DEBUG) {
-        assert.expect(0);
-        return;
-      }
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'index',
-          `{{#let (query-params foo='456' alon='BUKAI') as |qp|}}{{#link-to 'index' qp}}Index{{/link-to}}{{/let}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /The `query-params` helper is deprecated/
-      );
-
-      this.assertComponentElement(this.firstChild, {
-        tagName: 'a',
-        attrs: { href: '/?alon=BUKAI&foo=456', class: classMatcher('ember-view') },
-        content: 'Index',
-      });
-    }
   }
 );
 
@@ -841,39 +815,6 @@ moduleFor(
       this.shouldBeActive(assert, '#page-link > a');
     }
 
-    async ['@test [DEPRECATED] [GH#17869] it does not cause shadowing assertion with `hash` local variable']() {
-      this.router.map(function () {
-        this.route('post', { path: '/post/:id' });
-      });
-
-      this.add(
-        'controller:post',
-        class extends Controller {
-          queryParams = ['showComments'];
-          showComments = true;
-        }
-      );
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'index',
-          `
-          {{#let (hash id="1" title="Hello World!" body="Lorem ipsum dolor sit amet...") as |hash|}}
-            {{#link-to "post" hash (query-params showComments=false)}}View Post{{/link-to}}
-          {{/let}}
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      await this.visit('/');
-
-      this.assertComponentElement(this.element.firstElementChild, {
-        tagName: 'a',
-        attrs: { href: '/post/1?showComments=false', class: classMatcher('ember-view') },
-        content: 'View Post',
-      });
-    }
-
     async ['@test with dynamic segment and loading route, it should preserve query parameters'](
       assert
     ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 3c555705a1c..137c3783bed 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -8,7 +8,6 @@ import {
 import { Router, Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
-import { LinkComponent } from '@ember/-internals/glimmer';
 import { DEBUG } from '@glimmer/env';
 
 moduleFor(
@@ -19,7 +18,7 @@ moduleFor(
 
       return assert.rejectsAssertion(
         this.visit('/'),
-        /You must provide at least one of the `@route`, `@model`, `@models` or `@query` argument to `<LinkTo>`/
+        /You must provide at least one of the `@route`, `@model`, `@models` or `@query` arguments to `<LinkTo>`/
       );
     }
 
@@ -100,26 +99,7 @@ moduleFor(
       assert.equal(this.firstChild.classList.contains('active'), true);
     }
 
-    async ['@test able to safely extend the built-in component and use the normal path']() {
-      this.addComponent('custom-link-to', {
-        ComponentClass: class extends LinkComponent {},
-      });
-
-      this.addTemplate('application', `<CustomLinkTo @route='index'>{{this.title}}</CustomLinkTo>`);
-
-      this.add(
-        'controller:application',
-        class extends Controller {
-          title = 'Hello';
-        }
-      );
-
-      await this.visit('/');
-
-      this.assertText('Hello');
-    }
-
-    async ['@test able to pupolate innermost dynamic segment when immediate parent route is active']() {
+    async ['@test able to popolate innermost dynamic segment when immediate parent route is active']() {
       this.addTemplate('application', '{{outlet}}');
 
       this.addTemplate('parents', '{{outlet}}');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index b934154d7ba..ffd4d892d0d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -2,18 +2,22 @@ import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'inte
 
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
-import { LinkComponent } from '@ember/-internals/glimmer';
 import { DEBUG } from '@glimmer/env';
 
 moduleFor(
   '{{link-to}} component (rendering tests)',
   class extends ApplicationTestCase {
-    [`@test it throws a useful error if you invoke it wrong`](assert) {
-      assert.expect(1);
+    async [`@test it throws a useful error if you invoke it wrong`](assert) {
+      this.addTemplate('application', `{{#link-to}}Index{{/link-to}}`);
 
-      expectAssertion(() => {
-        this.addTemplate('application', `{{#link-to}}Index{{/link-to}}`);
-      }, /You must provide one or more parameters to the `{{link-to}}` component\. \('my-app\/templates\/application\.hbs' @ L1:C0\)/);
+      if (DEBUG) {
+        await assert.rejects(
+          this.visit('/'),
+          /You must provide at least one of the `@route`, `@model`, `@models` or `@query` arguments to `<LinkTo>`./
+        );
+      } else {
+        assert.expect(0);
+      }
     }
 
     async [`@test it throws a useful error if you pass the href argument`](assert) {
@@ -92,87 +96,6 @@ moduleFor(
 
       assert.equal(this.firstChild.classList.contains('active'), true);
     }
-
-    async ['@test [DEPRECATED] escaped inline form (double curlies) escapes link title']() {
-      expectDeprecation(() => {
-        this.addTemplate('application', `{{link-to this.title 'index'}}`);
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      this.add(
-        'controller:application',
-        class extends Controller {
-          title = '<b>blah</b>';
-        }
-      );
-
-      await this.visit('/');
-
-      this.assertText('<b>blah</b>');
-    }
-
-    async ['@test [DEPRECATED] unescaped inline form (triple curlies) does not escape link title'](
-      assert
-    ) {
-      expectDeprecation(() => {
-        this.addTemplate('application', `{{{link-to this.title 'index'}}}`);
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      this.add(
-        'controller:application',
-        class extends Controller {
-          title = '<b>blah</b>';
-        }
-      );
-
-      await this.visit('/');
-
-      this.assertText('blah');
-      assert.equal(this.$('b').length, 1);
-    }
-
-    async ['@test able to safely extend the built-in component and use the normal path']() {
-      this.addComponent('custom-link-to', {
-        ComponentClass: class extends LinkComponent {},
-      });
-
-      this.addTemplate(
-        'application',
-        `{{#custom-link-to route='index'}}{{this.title}}{{/custom-link-to}}`
-      );
-
-      this.add(
-        'controller:application',
-        class extends Controller {
-          title = 'Hello';
-        }
-      );
-
-      await this.visit('/');
-
-      this.assertText('Hello');
-    }
-
-    async ['@test [DEPRECATED] [GH#13432] able to safely extend the built-in component and invoke it inline']() {
-      this.addComponent('custom-link-to', {
-        ComponentClass: class extends LinkComponent {},
-      });
-
-      this.addTemplate('application', `{{custom-link-to this.title 'index'}}`);
-
-      this.add(
-        'controller:application',
-        class extends Controller {
-          title = 'Hello';
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
-      );
-
-      this.assertText('Hello');
-    }
   }
 );
 
@@ -184,13 +107,5 @@ moduleFor(
 
       this.assertText('Go to Index');
     }
-
-    ['@test [DEPRECATED] it should be able to be inserted in DOM when the router is not present - inline']() {
-      expectDeprecation(() => {
-        this.render(`{{link-to 'Go to Index' 'index'}}`);
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      this.assertText('Go to Index');
-    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 70076a8dc4f..f065021e355 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -8,10 +8,7 @@ import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
-import {
-  EMBER_IMPROVED_INSTRUMENTATION,
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
-} from '@ember/canary-features';
+import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
 import { compile } from '../../../utils/helpers';
@@ -133,78 +130,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it doesn't add an href when the tagName isn't 'a'`](assert) {
-      this.addTemplate(
-        'index',
-        `<LinkTo @route='about' id='about-link' @tagName='div'>About</LinkTo>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.strictEqual(this.$('#about-link').attr('href'), null, 'there is no href attribute');
-    }
-
-    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `
-        <LinkTo id="about-link-static" @route="about" @disabledWhen="truthy">About</LinkTo>
-        <LinkTo id="about-link-dynamic" @route="about" @disabledWhen={{this.dynamicDisabledWhen}}>About</LinkTo>
-        `
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          dynamicDisabledWhen = true;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.equal(
-        this.$('#about-link-dynamic.disabled').length,
-        1,
-        'The dynamic link is disabled when its disabledWhen is true'
-      );
-
-      expectDeprecation(
-        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.strictEqual(
-        this.$('#about-link-dynamic.disabled').length,
-        0,
-        'The dynamic link is re-enabled when its disabledWhen becomes false'
-      );
-    }
-
     async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -384,27 +309,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `<LinkTo id="about-link" @route="about" @disabledWhen={{true}}>About</LinkTo>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-link'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
-    }
-
     async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -451,7 +355,7 @@ moduleFor(
       assert.equal(
         this.$('h3.about').length,
         1,
-        'Transitioning did occur when disabledWhen became false'
+        'Transitioning did occur when disabled became false'
       );
     }
 
@@ -1253,136 +1157,7 @@ moduleFor(
       assert.equal(hidden, 1, 'The link bubbles');
     }
 
-    async [`@test [DEPRECATED] it supports bubbles=false`](assert) {
-      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-        this.addTemplate(
-          'about',
-          `
-          <div {{on 'click' this.hide}}>
-            <LinkTo id='about-contact' @route='about.contact' @bubbles={{false}}>
-              About
-            </LinkTo>
-          </div>
-          {{outlet}}
-          `
-        );
-      } else {
-        this.addTemplate(
-          'about',
-          `
-          <div {{action this.hide}}>
-            <LinkTo id='about-contact' @route='about.contact' @bubbles={{false}}>
-              About
-            </LinkTo>
-          </div>
-          {{outlet}}
-          `
-        );
-      }
-
-      this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
-
-      this.router.map(function () {
-        this.route('about', function () {
-          this.route('contact');
-        });
-      });
-
-      let hidden = 0;
-
-      this.add(
-        'controller:about',
-        class extends Controller {
-          hide() {
-            hidden++;
-          }
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/about'),
-        'Passing the `@bubbles` argument to <LinkTo> is deprecated. Use the {{on}} modifier to attach a custom event handler to control event propagation.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-contact'),
-        'Passing the `@bubbles` argument to <LinkTo> is deprecated. Use the {{on}} modifier to attach a custom event handler to control event propagation.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-
-      assert.strictEqual(hidden, 0, "The link didn't bubble");
-    }
-
-    async [`@test [DEPRECATED] it supports bubbles=boundFalseyThing`](assert) {
-      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-        this.addTemplate(
-          'about',
-          `
-          <div {{on 'click' this.hide}}>
-            <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
-              About
-            </LinkTo>
-          </div>
-          {{outlet}}
-          `
-        );
-      } else {
-        this.addTemplate(
-          'about',
-          `
-          <div {{action this.hide}}>
-            <LinkTo id='about-contact' @route='about.contact' @bubbles={{this.boundFalseyThing}}>
-              About
-            </LinkTo>
-          </div>
-          {{outlet}}
-          `
-        );
-      }
-
-      this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
-
-      let hidden = 0;
-
-      this.add(
-        'controller:about',
-        class extends Controller {
-          boundFalseyThing = false;
-
-          hide() {
-            hidden++;
-          }
-        }
-      );
-
-      this.router.map(function () {
-        this.route('about', function () {
-          this.route('contact');
-        });
-      });
-
-      await expectDeprecationAsync(
-        () => this.visit('/about'),
-        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-contact'),
-        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-      assert.strictEqual(hidden, 0, "The link didn't bubble");
-    }
-
-    async [`@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) The propagation of the click event can be stopped`](
-      assert
-    ) {
+    async [`The propagation of the click event can be stopped`](assert) {
       this.addTemplate(
         'about',
         `
@@ -1587,99 +1362,6 @@ moduleFor(
       assertNav({ prevented: true }, () => this.$('#about-link').click(), assert);
     }
 
-    async [`@test [DEPRECATED] it does not call preventDefault if '@preventDefault={{false}}]' is passed as an option`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      this.addTemplate(
-        'index',
-        `<LinkTo id='about-link' @route='about' @preventDefault={{false}}>About</LinkTo>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav(
-        { prevented: false },
-        () =>
-          expectDeprecation(
-            () => this.$('#about-link').trigger('click'),
-            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-          ),
-        assert
-      );
-    }
-
-    async [`@test [DEPRECATED] it does not call preventDefault if '@preventDefault={{this.boundThing}}' is passed as an option`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      this.addTemplate(
-        'index',
-        `<LinkTo id='about-link' @route='about' @preventDefault={{this.boundThing}}>About</LinkTo>`
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          boundThing = false;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav(
-        { prevented: false },
-        () =>
-          expectDeprecation(
-            () => this.$('#about-link').trigger('click'),
-            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-          ),
-        assert
-      );
-
-      runTask(() => controller.set('boundThing', true));
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav(
-        { prevented: true },
-        () =>
-          expectDeprecation(
-            () => this.$('#about-link').trigger('click'),
-            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-          ),
-        assert
-      );
-    }
-
     async [`@test it does not call preventDefault if 'target' attribute is provided`](assert) {
       this.addTemplate(
         'index',
@@ -2197,51 +1879,6 @@ moduleFor(
       this.assertText('Post: Papa Smurf');
     }
 
-    async [`@test [DEPRECATED] The <LinkTo /> component can use dynamic params`](assert) {
-      this.router.map(function () {
-        this.route('foo', { path: 'foo/:some/:thing' });
-        this.route('bar', { path: 'bar/:some/:thing/:else' });
-      });
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          dynamicLinkParams = ['foo', 'one', 'two'];
-        }
-      );
-
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <LinkTo id="dynamic-link" @params={{this.dynamicLinkParams}}>Dynamic</LinkTo>
-        `
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
-      );
-
-      let link = this.$('#dynamic-link');
-
-      assert.equal(link.attr('href'), '/foo/one/two');
-
-      expectDeprecation(
-        () => runTask(() => controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three'])),
-        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
-      );
-
-      assert.equal(link.attr('href'), '/bar/one/two/three');
-    }
-
     async [`@test [GH#13256]: <LinkTo /> to a parent root model hook which performs a 'transitionTo' has correct active class`](
       assert
     ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 3df012cfa86..9ff56f064f8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -8,10 +8,7 @@ import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import { Route, NoneLocation } from '@ember/-internals/routing';
-import {
-  EMBER_IMPROVED_INSTRUMENTATION,
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
-} from '@ember/canary-features';
+import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
 import { compile } from '../../../utils/helpers';
@@ -133,83 +130,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it doesn't add an href when the tagName isn't 'a'`](assert) {
-      this.addTemplate(
-        'index',
-        `<div id='about-link'>{{#link-to route='about' tagName='div'}}About{{/link-to}}</div>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.strictEqual(
-        this.$('#about-link > div').attr('href'),
-        null,
-        'there is no href attribute'
-      );
-    }
-
-    async [`@test [DEPRECATED] it applies a 'disabled' class when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `
-        <div id="about-link-static">{{#link-to route="about" disabledWhen="truthy"}}About{{/link-to}}</div>
-        <div id="about-link-dynamic">{{#link-to route="about" disabledWhen=this.dynamicDisabledWhen}}About{{/link-to}}</div>
-        `
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          dynamicDisabledWhen = true;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static > a.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.equal(
-        this.$('#about-link-dynamic > a.disabled').length,
-        1,
-        'The dynamic link is disabled when its disabledWhen is true'
-      );
-
-      expectDeprecation(
-        () => runTask(() => controller.set('dynamicDisabledWhen', false)),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(
-        this.$('#about-link-static > a.disabled').length,
-        1,
-        'The static link is disabled when its disabledWhen is true'
-      );
-      assert.strictEqual(
-        this.$('#about-link-dynamic > a.disabled').length,
-        0,
-        'The dynamic link is re-enabled when its disabledWhen becomes false'
-      );
-    }
-
     async [`@test it applies a 'disabled' class when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -251,7 +171,7 @@ moduleFor(
       assert.equal(
         this.$('#about-link-static > a.disabled').length,
         1,
-        'The static link is disabled when its disabledWhen is true'
+        'The static link is disabled when its disabled is true'
       );
       assert.strictEqual(
         this.$('#about-link-dynamic > a.disabled').length,
@@ -396,27 +316,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it does not respond to clicks when disabledWhen`](assert) {
-      this.addTemplate(
-        'index',
-        `<div id="about-link">{{#link-to route="about" disabledWhen=true}}About{{/link-to}}</div>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-link > a'),
-        'Passing the `@disabledWhen` argument to <LinkTo> is deprecated. Use the `@disabled` argument instead.',
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.strictEqual(this.$('h3.about').length, 0, 'Transitioning did not occur');
-    }
-
     async [`@test it does not respond to clicks when disabled`](assert) {
       this.addTemplate(
         'index',
@@ -463,7 +362,7 @@ moduleFor(
       assert.equal(
         this.$('h3.about').length,
         1,
-        'Transitioning did occur when disabledWhen became false'
+        'Transitioning did occur when disabled became false'
       );
     }
 
@@ -1328,133 +1227,6 @@ moduleFor(
       assert.equal(hidden, 1, 'The link bubbles');
     }
 
-    async [`@test [DEPRECATED] it supports bubbles=false`](assert) {
-      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-        this.addTemplate(
-          'about',
-          `
-          <div id='about-contact' {{on 'click' this.hide}}>
-            {{#link-to route='about.contact' bubbles=false}}
-              About
-            {{/link-to}}
-          </div>
-          {{outlet}}
-          `
-        );
-      } else {
-        this.addTemplate(
-          'about',
-          `
-          <div id='about-contact' {{action this.hide}}>
-            {{#link-to route='about.contact' bubbles=false}}
-              About
-            {{/link-to}}
-          </div>
-          {{outlet}}
-          `
-        );
-      }
-
-      this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
-
-      this.router.map(function () {
-        this.route('about', function () {
-          this.route('contact');
-        });
-      });
-
-      let hidden = 0;
-
-      this.add(
-        'controller:about',
-        class extends Controller {
-          hide() {
-            hidden++;
-          }
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/about'),
-        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-contact > a'),
-        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-
-      assert.strictEqual(hidden, 0, "The link didn't bubble");
-    }
-
-    async [`@test [DEPRECATED] it supports bubbles=boundFalseyThing`](assert) {
-      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-        this.addTemplate(
-          'about',
-          `
-          <div id='about-contact' {{on 'click' this.hide}}>
-            {{#link-to route='about.contact' bubbles=this.boundFalseyThing}}
-              About
-            {{/link-to}}
-          </div>
-          {{outlet}}
-          `
-        );
-      } else {
-        this.addTemplate(
-          'about',
-          `
-          <div id='about-contact' {{action this.hide}}>
-            {{#link-to route='about.contact' bubbles=this.boundFalseyThing}}
-              About
-            {{/link-to}}
-          </div>
-          {{outlet}}
-          `
-        );
-      }
-
-      this.addTemplate('about.contact', `<h1 id='contact'>Contact</h1>`);
-
-      let hidden = 0;
-
-      this.add(
-        'controller:about',
-        class extends Controller {
-          boundFalseyThing = false;
-
-          hide() {
-            hidden++;
-          }
-        }
-      );
-
-      this.router.map(function () {
-        this.route('about', function () {
-          this.route('contact');
-        });
-      });
-
-      await expectDeprecationAsync(
-        () => this.visit('/about'),
-        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await expectDeprecationAsync(
-        () => this.click('#about-contact > a'),
-        /Passing the `@bubbles` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assert.equal(this.$('#contact').text(), 'Contact', 'precond - the link worked');
-      assert.strictEqual(hidden, 0, "The link didn't bubble");
-    }
-
     async [`@test it moves into the named route with context`](assert) {
       this.router.map(function () {
         this.route('about');
@@ -1536,61 +1308,112 @@ moduleFor(
       assert.equal(this.$('p').text(), 'Erik Brynroflsson', 'The name is correct');
     }
 
-    async [`@test [DEPRECATED] it binds some anchor html tag common attributes`](assert) {
+    async [`@test it calls preventDefault`](assert) {
+      this.router.map(function () {
+        this.route('about');
+      });
+
       this.addTemplate(
         'index',
+        `<div id='about-link'>{{#link-to route='about'}}About{{/link-to}}</div>`
+      );
+
+      await this.visit('/');
+
+      assertNav({ prevented: true }, () => this.$('#about-link > a').click(), assert);
+    }
+
+    async [`@test it accepts string/numeric arguments`](assert) {
+      this.router.map(function () {
+        this.route('filter', { path: '/filters/:filter' });
+        this.route('post', { path: '/post/:post_id' });
+        this.route('repo', { path: '/repo/:owner/:name' });
+      });
+
+      this.add(
+        'controller:filter',
+        class extends Controller {
+          filter = 'unpopular';
+          repo = { owner: 'ember', name: 'ember.js' };
+          post_id = 123;
+        }
+      );
+
+      this.addTemplate(
+        'filter',
         `
-        <h3 class="home">Home</h3>
-        <div id='self-link'>
-          {{#link-to route='index' title='title-attr' rel='rel-attr' tabindex='-1'}}
-            Self
-          {{/link-to}}
-        </div>
+        <p>{{this.filter}}</p>
+        <div id="link">{{#link-to route="filter" model="unpopular"}}Unpopular{{/link-to}}</div>
+        <div id="path-link">{{#link-to route="filter" model=this.filter}}Unpopular{{/link-to}}</div>
+        <div id="post-path-link">{{#link-to route="post" model=this.post_id}}Post{{/link-to}}</div>
+        <div id="post-number-link">{{#link-to route="post" model=123}}Post{{/link-to}}</div>
+        <div id="repo-object-link">{{#link-to route="repo" model=this.repo}}Repo{{/link-to}}</div>
         `
       );
 
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@(id|title|rel|tabindex)` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      await this.visit('/filters/popular');
+
+      assert.equal(normalizeUrl(this.$('#link > a').attr('href')), '/filters/unpopular');
+      assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), '/filters/unpopular');
+      assert.equal(normalizeUrl(this.$('#post-path-link > a').attr('href')), '/post/123');
+      assert.equal(normalizeUrl(this.$('#post-number-link > a').attr('href')), '/post/123');
+      assert.equal(
+        normalizeUrl(this.$('#repo-object-link > a').attr('href')),
+        '/repo/ember/ember.js'
       );
+    }
 
-      let link = this.$('#self-link > a');
+    async [`@test [GH#4201] Shorthand for route.index shouldn't throw errors about context arguments`](
+      assert
+    ) {
+      this.router.map(function () {
+        this.route('lobby', function () {
+          this.route('index', { path: ':lobby_id' });
+          this.route('list');
+        });
+      });
 
-      assert.equal(link.attr('title'), 'title-attr', 'The self-link contains title attribute');
-      assert.equal(link.attr('rel'), 'rel-attr', 'The self-link contains rel attribute');
-      assert.equal(link.attr('tabindex'), '-1', 'The self-link contains tabindex attribute');
-    }
+      this.add(
+        'route:lobby.index',
+        class extends Route {
+          model(params) {
+            assert.equal(params.lobby_id, 'foobar');
+            return params.lobby_id;
+          }
+        }
+      );
 
-    async [`@test [DEPRECATED] it supports 'target' attribute`](assert) {
       this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <div id='self-link'>{{#link-to route='index' target='_blank'}}Self{{/link-to}}</div>
-        `
+        'lobby.index',
+        `<div id='lobby-link'>{{#link-to route='lobby' model='foobar'}}Lobby{{/link-to}}</div>`
       );
 
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@target` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
+      this.addTemplate(
+        'lobby.list',
+        `<div id='lobby-link'>{{#link-to route='lobby' model='foobar'}}Lobby{{/link-to}}</div>`
       );
 
-      let link = this.$('#self-link > a');
-      assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
+      await this.visit('/lobby/list');
+
+      await this.click('#lobby-link > a');
+
+      shouldBeActive(assert, this.$('#lobby-link > a'));
     }
 
-    async [`@test [DEPRECATED] it supports 'target' attribute specified as a bound param`](assert) {
+    async [`@test Quoteless route param performs property lookup`](assert) {
+      this.router.map(function () {
+        this.route('about');
+      });
+
       this.addTemplate(
         'index',
         `
-        <h3 class="home">Home</h3>
-        <div id='self-link'>{{#link-to route='index' target=this.boundLinkTarget}}Self{{/link-to}}</div>
+        <div id='string-link'>{{#link-to route='index'}}string{{/link-to}}</div>
+        <div id='path-link'>{{#link-to route=this.foo}}path{{/link-to}}</div>
         `
       );
 
-      let controller = this;
+      let controller;
 
       this.add(
         'controller:index',
@@ -1600,328 +1423,27 @@ moduleFor(
             controller = this;
           }
 
-          boundLinkTarget = '_blank';
+          foo = 'index';
         }
       );
 
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@target` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
+      let assertEquality = (href) => {
+        assert.equal(normalizeUrl(this.$('#string-link > a').attr('href')), '/');
+        assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), href);
+      };
 
-      let link = this.$('#self-link > a');
-      assert.equal(link.attr('target'), '_blank', 'The self-link contains `target` attribute');
+      await this.visit('/');
 
-      expectDeprecation(
-        () => runTask(() => controller.set('boundLinkTarget', '_self')),
-        /Passing the `@target` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
+      assertEquality('/');
+
+      runTask(() => controller.set('foo', 'about'));
 
-      assert.equal(link.attr('target'), '_self', 'The self-link contains `target` attribute');
+      assertEquality('/about');
     }
 
-    async [`@test it calls preventDefault`](assert) {
+    async [`@test it refreshes href element when one of params changes`](assert) {
       this.router.map(function () {
-        this.route('about');
-      });
-
-      this.addTemplate(
-        'index',
-        `<div id='about-link'>{{#link-to route='about'}}About{{/link-to}}</div>`
-      );
-
-      await this.visit('/');
-
-      assertNav({ prevented: true }, () => this.$('#about-link > a').click(), assert);
-    }
-
-    async [`@test [DEPRECATED] it does not call preventDefault if 'preventDefault=false' is passed as an option`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      this.addTemplate(
-        'index',
-        `<div id='about-link'>{{#link-to route='about' preventDefault=false}}About{{/link-to}}</div>`
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav(
-        { prevented: false },
-        () =>
-          expectDeprecation(
-            () => this.$('#about-link > a').trigger('click'),
-            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-          ),
-        assert
-      );
-    }
-
-    async [`@test [DEPRECATED] it does not call preventDefault if 'preventDefault=this.boundThing' is passed as an option`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      this.addTemplate(
-        'index',
-        `<div id='about-link'>{{#link-to route='about' preventDefault=this.boundThing}}About{{/link-to}}</div>`
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          boundThing = false;
-        }
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav(
-        { prevented: false },
-        () =>
-          expectDeprecation(
-            () => this.$('#about-link > a').trigger('click'),
-            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-          ),
-        assert
-      );
-
-      runTask(() => controller.set('boundThing', true));
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav(
-        { prevented: true },
-        () =>
-          expectDeprecation(
-            () => this.$('#about-link > a').trigger('click'),
-            /Passing the `@preventDefault` argument to <LinkTo> is deprecated\./,
-            EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-          ),
-        assert
-      );
-    }
-
-    async [`@test [DEPRECATED] it does not call preventDefault if 'target' attribute is provided`](
-      assert
-    ) {
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <div id='self-link'>{{#link-to route='index' target='_blank'}}Self{{/link-to}}</div>
-        `
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@target` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav({ prevented: false }, () => this.$('#self-link > a').click(), assert);
-    }
-
-    async [`@test [DEPRECATED] it should preventDefault when 'target = _self'`](assert) {
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <div id='self-link'>{{#link-to route='index' target='_self'}}Self{{/link-to}}</div>
-        `
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@target` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      assertNav({ prevented: true }, () => this.$('#self-link > a').click(), assert);
-    }
-
-    async [`@test [DEPRECATED] it should not transition if target is not equal to _self or empty`](
-      assert
-    ) {
-      this.addTemplate(
-        'index',
-        `
-        <div id='about-link'>
-          {{#link-to route='about' replace=true target='_blank'}}
-            About
-          {{/link-to}}
-        </div>
-        `
-      );
-
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@target` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      await this.click('#about-link > a');
-
-      assert.notEqual(
-        this.appRouter.currentRouteName,
-        'about',
-        'link-to should not transition if target is not equal to _self or empty'
-      );
-    }
-
-    async [`@test it accepts string/numeric arguments`](assert) {
-      this.router.map(function () {
-        this.route('filter', { path: '/filters/:filter' });
-        this.route('post', { path: '/post/:post_id' });
-        this.route('repo', { path: '/repo/:owner/:name' });
-      });
-
-      this.add(
-        'controller:filter',
-        class extends Controller {
-          filter = 'unpopular';
-          repo = { owner: 'ember', name: 'ember.js' };
-          post_id = 123;
-        }
-      );
-
-      this.addTemplate(
-        'filter',
-        `
-        <p>{{this.filter}}</p>
-        <div id="link">{{#link-to route="filter" model="unpopular"}}Unpopular{{/link-to}}</div>
-        <div id="path-link">{{#link-to route="filter" model=this.filter}}Unpopular{{/link-to}}</div>
-        <div id="post-path-link">{{#link-to route="post" model=this.post_id}}Post{{/link-to}}</div>
-        <div id="post-number-link">{{#link-to route="post" model=123}}Post{{/link-to}}</div>
-        <div id="repo-object-link">{{#link-to route="repo" model=this.repo}}Repo{{/link-to}}</div>
-        `
-      );
-
-      await this.visit('/filters/popular');
-
-      assert.equal(normalizeUrl(this.$('#link > a').attr('href')), '/filters/unpopular');
-      assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), '/filters/unpopular');
-      assert.equal(normalizeUrl(this.$('#post-path-link > a').attr('href')), '/post/123');
-      assert.equal(normalizeUrl(this.$('#post-number-link > a').attr('href')), '/post/123');
-      assert.equal(
-        normalizeUrl(this.$('#repo-object-link > a').attr('href')),
-        '/repo/ember/ember.js'
-      );
-    }
-
-    async [`@test [GH#4201] Shorthand for route.index shouldn't throw errors about context arguments`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('lobby', function () {
-          this.route('index', { path: ':lobby_id' });
-          this.route('list');
-        });
-      });
-
-      this.add(
-        'route:lobby.index',
-        class extends Route {
-          model(params) {
-            assert.equal(params.lobby_id, 'foobar');
-            return params.lobby_id;
-          }
-        }
-      );
-
-      this.addTemplate(
-        'lobby.index',
-        `<div id='lobby-link'>{{#link-to route='lobby' model='foobar'}}Lobby{{/link-to}}</div>`
-      );
-
-      this.addTemplate(
-        'lobby.list',
-        `<div id='lobby-link'>{{#link-to route='lobby' model='foobar'}}Lobby{{/link-to}}</div>`
-      );
-
-      await this.visit('/lobby/list');
-
-      await this.click('#lobby-link > a');
-
-      shouldBeActive(assert, this.$('#lobby-link > a'));
-    }
-
-    async [`@test Quoteless route param performs property lookup`](assert) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      this.addTemplate(
-        'index',
-        `
-        <div id='string-link'>{{#link-to route='index'}}string{{/link-to}}</div>
-        <div id='path-link'>{{#link-to route=this.foo}}path{{/link-to}}</div>
-        `
-      );
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          foo = 'index';
-        }
-      );
-
-      let assertEquality = (href) => {
-        assert.equal(normalizeUrl(this.$('#string-link > a').attr('href')), '/');
-        assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), href);
-      };
-
-      await this.visit('/');
-
-      assertEquality('/');
-
-      runTask(() => controller.set('foo', 'about'));
-
-      assertEquality('/about');
-    }
-
-    async [`@test it refreshes href element when one of params changes`](assert) {
-      this.router.map(function () {
-        this.route('post', { path: '/posts/:post_id' });
+        this.route('post', { path: '/posts/:post_id' });
       });
 
       let post = { id: '1' };
@@ -2065,274 +1587,6 @@ moduleFor(
       linksEqual(this.$('a'), ['/bar', '/rar', '/bar', '/rar', '/rar', '/foo']);
     }
 
-    async [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('contact');
-      });
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'index',
-          `
-          <h3 class="home">Home</h3>
-          <div id='contact-link'>{{link-to 'Contact us' 'contact'}}</div>
-          <div id='self-link'>{{#link-to route='index'}}Self{{/link-to}}</div>
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'contact',
-          `
-          <h3 class="contact">Contact</h3>
-          <div id='home-link'>{{link-to 'Home' 'index'}}</div>
-          <div id='self-link'>{{link-to 'Self' 'contact'}}</div>
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      await this.visit('/');
-
-      await this.click('#contact-link > a');
-
-      assert.equal(this.$('h3.contact').length, 1, 'The contact template was rendered');
-      assert.equal(
-        this.$('#self-link > a.active').length,
-        1,
-        'The self-link was rendered with active class'
-      );
-      assert.equal(
-        this.$('#home-link > a:not(.active)').length,
-        1,
-        'The other link was rendered without active class'
-      );
-    }
-
-    async [`@test [DEPRECATED] The non-block form {{link-to}} component updates the link text when it is a binding`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('contact');
-      });
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          contactName = 'Jane';
-        }
-      );
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'index',
-          `
-          <h3 class="home">Home</h3>
-          <div id='contact-link'>{{link-to this.contactName 'contact'}}</div>
-          <div id='self-link'>{{#link-to route='index'}}Self{{/link-to}}</div>
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'contact',
-          `
-          <h3 class="contact">Contact</h3>
-          <div id='home-link'>{{link-to 'Home' 'index'}}</div>
-          <div id='self-link'>{{link-to 'Self' 'contact'}}</div>
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      await this.visit('/');
-
-      assert.equal(
-        this.$('#contact-link > a').text(),
-        'Jane',
-        'The link title is correctly resolved'
-      );
-
-      runTask(() => controller.set('contactName', 'Joe'));
-
-      assert.equal(
-        this.$('#contact-link > a').text(),
-        'Joe',
-        'The link title is correctly updated when the bound property changes'
-      );
-
-      runTask(() => controller.set('contactName', 'Robert'));
-
-      assert.equal(
-        this.$('#contact-link > a').text(),
-        'Robert',
-        'The link title is correctly updated when the bound property changes a second time'
-      );
-
-      await this.click('#contact-link > a');
-
-      assert.equal(this.$('h3.contact').length, 1, 'The contact template was rendered');
-      assert.equal(
-        this.$('#self-link > a.active').length,
-        1,
-        'The self-link was rendered with active class'
-      );
-      assert.equal(
-        this.$('#home-link > a:not(.active)').length,
-        1,
-        'The other link was rendered without active class'
-      );
-
-      await this.click('#home-link > a');
-
-      assert.equal(this.$('h3.home').length, 1, 'The index template was rendered');
-      assert.equal(
-        this.$('#contact-link > a').text(),
-        'Robert',
-        'The link title is correctly updated when the route changes'
-      );
-    }
-
-    async [`@test [DEPRECATED] The non-block form {{link-to}} component moves into the named route with context`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('item', { path: '/item/:id' });
-      });
-
-      this.add(
-        'route:index',
-        class extends Route {
-          model() {
-            return [
-              { id: 'yehuda', name: 'Yehuda Katz' },
-              { id: 'tom', name: 'Tom Dale' },
-              { id: 'erik', name: 'Erik Brynroflsson' },
-            ];
-          }
-        }
-      );
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'index',
-          `
-          <h3 class="home">Home</h3>
-          <ul>
-            {{#each @model as |person|}}
-              <li id={{person.id}}>
-                {{link-to person.name 'item' person}}
-              </li>
-            {{/each}}
-          </ul>
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      this.addTemplate(
-        'item',
-        `
-        <h3 class="item">Item</h3>
-        <p>{{@model.name}}</p>
-        <div id='home-link'>{{#link-to route='index'}}Home{{/link-to}}</div>
-        `
-      );
-
-      await this.visit('/');
-
-      await this.click('#yehuda > a');
-
-      assert.equal(this.$('h3.item').length, 1, 'The item template was rendered');
-      assert.equal(this.$('p').text(), 'Yehuda Katz', 'The name is correct');
-
-      await this.click('#home-link > a');
-
-      assert.equal(normalizeUrl(this.$('li#yehuda > a').attr('href')), '/item/yehuda');
-      assert.equal(normalizeUrl(this.$('li#tom > a').attr('href')), '/item/tom');
-      assert.equal(normalizeUrl(this.$('li#erik > a').attr('href')), '/item/erik');
-    }
-
-    async [`@test [DEPRECATED] The non-block form {{link-to}} performs property lookup`](assert) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'index',
-          `
-          <div id='string-link'>{{link-to 'string' 'index'}}</div>
-          <div id='path-link'>{{link-to this.path this.foo}}</div>
-          `
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          foo = 'index';
-        }
-      );
-
-      await this.visit('/');
-
-      let assertEquality = (href) => {
-        assert.equal(normalizeUrl(this.$('#string-link > a').attr('href')), '/');
-        assert.equal(normalizeUrl(this.$('#path-link > a').attr('href')), href);
-      };
-
-      assertEquality('/');
-
-      runTask(() => controller.set('foo', 'about'));
-
-      assertEquality('/about');
-    }
-
-    async [`@test [DEPRECATED] The non-block form {{link-to}} protects against XSS`](assert) {
-      expectDeprecation(() => {
-        this.addTemplate('application', `<div id='link'>{{link-to this.display 'index'}}</div>`);
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      let controller;
-
-      this.add(
-        'controller:application',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          display = 'blahzorz';
-        }
-      );
-
-      await this.visit('/');
-
-      assert.equal(this.$('#link > a').text(), 'blahzorz');
-
-      runTask(() => controller.set('display', '<b>BLAMMO</b>'));
-
-      assert.equal(this.$('#link > a').text(), '<b>BLAMMO</b>');
-      assert.strictEqual(this.$('b').length, 0);
-    }
-
     async [`@test it throws a useful error if you invoke it wrong`](assert) {
       if (!DEBUG) {
         assert.expect(0);
@@ -2507,46 +1761,6 @@ moduleFor(
       );
     }
 
-    async [`@test [DEPRECATED] it updates when route changes with only query-params but without a block`](
-      assert
-    ) {
-      this.router.map(function () {
-        this.route('about');
-      });
-
-      this.add(
-        'controller:application',
-        Controller.extend({
-          queryParams: ['foo', 'bar'],
-          foo: '123',
-          bar: 'yes',
-        })
-      );
-
-      expectDeprecation(() => {
-        this.addTemplate(
-          'application',
-          `<div id='the-link'>{{link-to "Index" (query-params foo='456' bar='NAW')}}</div>`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      await this.visit('/');
-
-      assert.equal(
-        this.$('#the-link > a').attr('href'),
-        '/?bar=NAW&foo=456',
-        'link has right href'
-      );
-
-      await this.visit('/about');
-
-      assert.equal(
-        this.$('#the-link > a').attr('href'),
-        '/about?bar=NAW&foo=456',
-        'link has right href'
-      );
-    }
-
     async ['@test [GH#17018] passing model to {{link-to}} with `hash` helper works']() {
       this.router.map(function () {
         this.route('post', { path: '/posts/:post_id' });
@@ -2583,51 +1797,6 @@ moduleFor(
       this.assertText('Post: Papa Smurf');
     }
 
-    async [`@test [DEPRECATED] The {{link-to}} component can use dynamic params`](assert) {
-      this.router.map(function () {
-        this.route('foo', { path: 'foo/:some/:thing' });
-        this.route('bar', { path: 'bar/:some/:thing/:else' });
-      });
-
-      let controller;
-
-      this.add(
-        'controller:index',
-        class extends Controller {
-          constructor(...args) {
-            super(...args);
-            controller = this;
-          }
-
-          dynamicLinkParams = ['foo', 'one', 'two'];
-        }
-      );
-
-      this.addTemplate(
-        'index',
-        `
-        <h3 class="home">Home</h3>
-        <div id="dynamic-link">{{#link-to params=this.dynamicLinkParams}}Dynamic{{/link-to}}</div>
-        `
-      );
-
-      await expectDeprecationAsync(
-        () => this.visit('/'),
-        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
-      );
-
-      let link = this.$('#dynamic-link > a');
-
-      assert.equal(link.attr('href'), '/foo/one/two');
-
-      expectDeprecation(
-        () => runTask(() => controller.set('dynamicLinkParams', ['bar', 'one', 'two', 'three'])),
-        /Invoking the `<LinkTo>` component with positional arguments is deprecated/
-      );
-
-      assert.equal(link.attr('href'), '/bar/one/two/three');
-    }
-
     async [`@test [GH#13256]: {{link-to}} to a parent root model hook which performs a 'transitionTo' has correct active class`](
       assert
     ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
index 03395293b97..53c7f32cf8f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
@@ -1,6 +1,5 @@
 import { RSVP } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 function assertHasClass(assert, selector, label) {
@@ -151,198 +150,3 @@ moduleFor(
     }
   }
 );
-
-moduleFor(
-  `<LinkTo /> component: [DEPRECATED] .transitioning-in .transitioning-out CSS classes - nested link-to's`,
-  class extends ApplicationTestCase {
-    constructor(...args) {
-      super(...args);
-
-      this.aboutDefer = RSVP.defer();
-      this.otherDefer = RSVP.defer();
-      let _this = this;
-
-      this.router.map(function () {
-        this.route('parent-route', function () {
-          this.route('about');
-          this.route('other');
-        });
-      });
-      this.add(
-        'route:parent-route.about',
-        class extends Route {
-          model() {
-            return _this.aboutDefer.promise;
-          }
-        }
-      );
-
-      this.add(
-        'route:parent-route.other',
-        class extends Route {
-          model() {
-            return _this.otherDefer.promise;
-          }
-        }
-      );
-
-      this.addTemplate(
-        'application',
-        `
-        {{outlet}}
-        <LinkTo @tagName='li' @route='index'>
-          <LinkTo id='index-link' @route='index'>Index</LinkTo>
-        </LinkTo>
-        <LinkTo @tagName='li' @route='parent-route.about'>
-          <LinkTo id='about-link' @route='parent-route.about'>About</LinkTo>
-        </LinkTo>
-        <LinkTo @tagName='li' @route='parent-route.other'>
-          <LinkTo id='other-link' @route='parent-route.other'>Other</LinkTo>
-        </LinkTo>
-        `
-      );
-    }
-
-    async beforeEach() {
-      return expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-    }
-
-    resolveAbout() {
-      return runTask(() => {
-        this.aboutDefer.resolve();
-        this.aboutDefer = RSVP.defer();
-      });
-    }
-
-    resolveOther() {
-      return runTask(() => {
-        this.otherDefer.resolve();
-        this.otherDefer = RSVP.defer();
-      });
-    }
-
-    teardown() {
-      super.teardown();
-      this.aboutDefer = null;
-      this.otherDefer = null;
-    }
-
-    [`@test while a transition is underway with nested link-to's`](assert) {
-      // TODO undo changes to this test but currently this test navigates away if navigation
-      // outlet is not stable and the second $about.click() is triggered.
-      let $about = this.$('#about-link');
-
-      runTask(() => $about.click());
-
-      let $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      let $other = this.$('#other-link');
-
-      assertHasClass(assert, $index, 'active');
-      assertHasNoClass(assert, $about, 'active');
-      assertHasNoClass(assert, $about, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      this.resolveAbout();
-
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasClass(assert, $about, 'active');
-      assertHasNoClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      runTask(() => $other.click());
-
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasClass(assert, $about, 'active');
-      assertHasNoClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      this.resolveOther();
-
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasNoClass(assert, $about, 'active');
-      assertHasClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      runTask(() => $about.click());
-
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasNoClass(assert, $about, 'active');
-      assertHasClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasClass(assert, $other, 'ember-transitioning-out');
-
-      this.resolveAbout();
-
-      $index = this.$('#index-link');
-      $about = this.$('#about-link');
-      $other = this.$('#other-link');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasClass(assert, $about, 'active');
-      assertHasNoClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-    }
-  }
-);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
index 8724c4ee335..75d54006ec5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
@@ -1,6 +1,5 @@
 import { RSVP } from '@ember/-internals/runtime';
 import { Route } from '@ember/-internals/routing';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 function assertHasClass(assert, selector, label) {
@@ -151,198 +150,3 @@ moduleFor(
     }
   }
 );
-
-moduleFor(
-  `{{link-to}} component: [DEPRECATED] .transitioning-in .transitioning-out CSS classes - nested link-to's`,
-  class extends ApplicationTestCase {
-    constructor(...args) {
-      super(...args);
-
-      this.aboutDefer = RSVP.defer();
-      this.otherDefer = RSVP.defer();
-      let _this = this;
-
-      this.router.map(function () {
-        this.route('parent-route', function () {
-          this.route('about');
-          this.route('other');
-        });
-      });
-      this.add(
-        'route:parent-route.about',
-        class extends Route {
-          model() {
-            return _this.aboutDefer.promise;
-          }
-        }
-      );
-
-      this.add(
-        'route:parent-route.other',
-        class extends Route {
-          model() {
-            return _this.otherDefer.promise;
-          }
-        }
-      );
-
-      this.addTemplate(
-        'application',
-        `
-        {{outlet}}
-        {{#link-to route='index' tagName='li'}}
-          <div id='index-link'>{{#link-to route='index'}}Index{{/link-to}}</div>
-        {{/link-to}}
-        {{#link-to route='parent-route.about' tagName='li'}}
-          <div id='about-link'>{{#link-to route='parent-route.about'}}About{{/link-to}}</div>
-        {{/link-to}}
-        {{#link-to route='parent-route.other' tagName='li'}}
-          <div id='other-link'>{{#link-to route='parent-route.other'}}Other{{/link-to}}</div>
-        {{/link-to}}
-        `
-      );
-    }
-
-    async beforeEach() {
-      return expectDeprecationAsync(
-        () => this.visit('/'),
-        /Passing the `@tagName` argument to <LinkTo> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-    }
-
-    resolveAbout() {
-      return runTask(() => {
-        this.aboutDefer.resolve();
-        this.aboutDefer = RSVP.defer();
-      });
-    }
-
-    resolveOther() {
-      return runTask(() => {
-        this.otherDefer.resolve();
-        this.otherDefer = RSVP.defer();
-      });
-    }
-
-    teardown() {
-      super.teardown();
-      this.aboutDefer = null;
-      this.otherDefer = null;
-    }
-
-    [`@test while a transition is underway with nested link-to's`](assert) {
-      // TODO undo changes to this test but currently this test navigates away if navigation
-      // outlet is not stable and the second $about.click() is triggered.
-      let $about = this.$('#about-link > a');
-
-      runTask(() => $about.click());
-
-      let $index = this.$('#index-link > a');
-      $about = this.$('#about-link > a');
-      let $other = this.$('#other-link > a');
-
-      assertHasClass(assert, $index, 'active');
-      assertHasNoClass(assert, $about, 'active');
-      assertHasNoClass(assert, $about, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      this.resolveAbout();
-
-      $index = this.$('#index-link > a');
-      $about = this.$('#about-link > a');
-      $other = this.$('#other-link > a');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasClass(assert, $about, 'active');
-      assertHasNoClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      runTask(() => $other.click());
-
-      $index = this.$('#index-link > a');
-      $about = this.$('#about-link > a');
-      $other = this.$('#other-link > a');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasClass(assert, $about, 'active');
-      assertHasNoClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      this.resolveOther();
-
-      $index = this.$('#index-link > a');
-      $about = this.$('#about-link > a');
-      $other = this.$('#other-link > a');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasNoClass(assert, $about, 'active');
-      assertHasClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-
-      runTask(() => $about.click());
-
-      $index = this.$('#index-link > a');
-      $about = this.$('#about-link > a');
-      $other = this.$('#other-link > a');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasNoClass(assert, $about, 'active');
-      assertHasClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasClass(assert, $other, 'ember-transitioning-out');
-
-      this.resolveAbout();
-
-      $index = this.$('#index-link > a');
-      $about = this.$('#about-link > a');
-      $other = this.$('#other-link > a');
-
-      assertHasNoClass(assert, $index, 'active');
-      assertHasClass(assert, $about, 'active');
-      assertHasNoClass(assert, $other, 'active');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-in');
-      assertHasNoClass(assert, $about, 'ember-transitioning-in');
-      assertHasNoClass(assert, $other, 'ember-transitioning-in');
-
-      assertHasNoClass(assert, $index, 'ember-transitioning-out');
-      assertHasNoClass(assert, $about, 'ember-transitioning-out');
-      assertHasNoClass(assert, $other, 'ember-transitioning-out');
-    }
-  }
-);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index 888c33cd088..9431e40fa8d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -8,7 +8,8 @@ import {
 } from 'internal-test-helpers';
 import { EMBER_STRICT_MODE } from '@ember/canary-features';
 
-import { Input, LinkComponent as LinkTo, TextArea } from '@ember/-internals/glimmer';
+import { Input, Textarea } from '@ember/component';
+import { LinkTo } from '@ember/routing';
 import { hash, array, concat, get, on, fn } from '@glimmer/runtime';
 import GlimmerishComponent from '../../utils/glimmerish-component';
 
@@ -178,8 +179,8 @@ if (EMBER_STRICT_MODE) {
         this.assertStableRerender();
       }
 
-      '@test Can use TextArea'() {
-        let Foo = defineComponent({ TextArea }, '<TextArea/>');
+      '@test Can use Textarea'() {
+        let Foo = defineComponent({ Textarea }, '<Textarea/>');
 
         this.registerComponent('foo', { ComponentClass: Foo });
 
@@ -274,7 +275,7 @@ if (EMBER_STRICT_MODE) {
         return this.visit('/').then(() => {
           this.assertComponentElement(this.firstChild, {
             tagName: 'a',
-            attrs: { href: '/', class: 'active ember-view' },
+            attrs: { href: '/', class: 'ember-view active' },
             content: 'Index',
           });
         });
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index bf528bd57d4..8969d9507ce 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -1,7 +1,5 @@
 import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
 
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { action } from '@ember/object';
 import { set } from '@ember/-internals/metal';
 
 class TextAreaRenderingTest extends RenderingTestCase {
@@ -31,7 +29,7 @@ class BoundTextAreaAttributes {
     this.cases = cases;
   }
 
-  generate({ attribute, argument = attribute, first, second }) {
+  generate({ attribute, first, second }) {
     return {
       [`@test ${attribute} (HTML attribute)`]() {
         this.render(`<Textarea ${attribute}={{this.value}} />`, {
@@ -47,35 +45,6 @@ class BoundTextAreaAttributes {
         runTask(() => set(this.context, 'value', first));
         this.assertTextArea({ attrs: { [attribute]: first } });
       },
-
-      [`@test [DEPRECATED] @${argument} (named argument)`]() {
-        let deprecation = new RegExp(
-          `Passing the \`@${argument}\` argument to <Textarea> is deprecated\\.`
-        );
-
-        expectDeprecation(
-          () => this.render(`<Textarea @${argument}={{this.value}} />`, { value: first }),
-          deprecation,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-        this.assertTextArea({ attrs: { [attribute]: first } });
-
-        this.assertStableRerender();
-
-        expectDeprecation(
-          () => runTask(() => set(this.context, 'value', second)),
-          deprecation,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-        this.assertTextArea({ attrs: { [attribute]: second } });
-
-        expectDeprecation(
-          () => runTask(() => set(this.context, 'value', first)),
-          deprecation,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-        this.assertTextArea({ attrs: { [attribute]: first } });
-      },
     };
   }
 }
@@ -83,7 +52,7 @@ class BoundTextAreaAttributes {
 applyMixins(
   TextAreaRenderingTest,
   new BoundTextAreaAttributes([
-    { attribute: 'role', argument: 'ariaRole', first: 'textbox', second: 'search' },
+    { attribute: 'role', first: 'textbox', second: 'search' },
     { attribute: 'placeholder', first: 'Stuff here', second: 'Other stuff' },
     { attribute: 'name', first: 'Stuff here', second: 'Other stuff' },
     { attribute: 'title', first: 'Stuff here', second: 'Other stuff' },
@@ -111,15 +80,6 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test [DEPRECATED] Supports @elementId (named argument)'](assert) {
-      expectDeprecation(
-        () => this.render('<Textarea @elementId="test-textarea" />'),
-        /Passing the `@elementId` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.equal(this.$('textarea').attr('id'), 'test-textarea');
-    }
-
     ['@test Should respect disabled (HTML attribute)'](assert) {
       this.render('<Textarea disabled={{this.disabled}} />', {
         disabled: true,
@@ -127,15 +87,6 @@ moduleFor(
       assert.ok(this.$('textarea').is(':disabled'));
     }
 
-    ['@test [DEPRECATED] Should respect @disabled (named argument)'](assert) {
-      expectDeprecation(
-        () => this.render('<Textarea @disabled={{this.disabled}} />', { disabled: true }),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':disabled'));
-    }
-
     ['@test Should respect disabled (HTML attribute) when false'](assert) {
       this.render('<Textarea disabled={{this.disabled}} />', {
         disabled: false,
@@ -143,15 +94,6 @@ moduleFor(
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
-    ['@test [DEPRECATED] Should respect @disabled (named argument) when false'](assert) {
-      expectDeprecation(
-        () => this.render('<Textarea @disabled={{this.disabled}} />', { disabled: false }),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':not(:disabled)'));
-    }
-
     ['@test Should become disabled (HTML attribute) when the context changes'](assert) {
       this.render('<Textarea disabled={{this.disabled}} />');
       assert.ok(this.$('textarea').is(':not(:disabled)'));
@@ -165,33 +107,6 @@ moduleFor(
       assert.ok(this.$('textarea').is(':not(:disabled)'));
     }
 
-    ['@test [DEPRECATED] Should become @disabled (named argument) when the context changes'](
-      assert
-    ) {
-      expectDeprecation(
-        () => this.render('<Textarea @disabled={{this.disabled}} />'),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':not(:disabled)'));
-
-      this.assertStableRerender();
-
-      expectDeprecation(
-        () => runTask(() => set(this.context, 'disabled', true)),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':disabled'));
-
-      expectDeprecation(
-        () => runTask(() => set(this.context, 'disabled', false)),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':not(:disabled)'));
-    }
-
     ['@test Should bind its contents to the specified @value']() {
       this.render('<Textarea @value={{this.model.val}} />', {
         model: { val: 'A beautiful day in Seattle' },
@@ -252,21 +167,5 @@ moduleFor(
       runTask(() => set(this.context, 'model', { val: 'A beautiful day in Seattle' }));
       this.assertTextArea({ value: 'A beautiful day in Seattle' });
     }
-
-    ['@test triggers a method with `<Textarea @key-up={{this.didTrigger}} />`'](assert) {
-      expectDeprecation(
-        () => {
-          this.render(`<Textarea @key-up={{this.didTrigger}} />`, {
-            didTrigger: action(function () {
-              assert.ok(true, 'action was triggered');
-            }),
-          });
-        },
-        /Passing the `@key-up` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keyup', { key: 'A' });
-    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 939883178ac..61b75addccf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -1,7 +1,5 @@
-import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
+import { RenderingTestCase, moduleFor, classes, runTask } from 'internal-test-helpers';
 
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { action } from '@ember/object';
 import { set } from '@ember/-internals/metal';
 
 class TextAreaRenderingTest extends RenderingTestCase {
@@ -26,59 +24,6 @@ class TextAreaRenderingTest extends RenderingTestCase {
   }
 }
 
-class BoundTextAreaAttributes {
-  constructor(cases) {
-    this.cases = cases;
-  }
-
-  generate({ attribute, argument = attribute, first, second }) {
-    return {
-      [`@test [DEPRECATED] ${argument}`]() {
-        let deprecation = new RegExp(
-          `Passing the \`@${argument}\` argument to <Textarea> is deprecated\\.`
-        );
-
-        expectDeprecation(
-          () => this.render(`{{textarea ${argument}=this.value}}`, { value: first }),
-          deprecation,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-        this.assertTextArea({ attrs: { [attribute]: first } });
-
-        this.assertStableRerender();
-
-        expectDeprecation(
-          () => runTask(() => set(this.context, 'value', second)),
-          deprecation,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-        this.assertTextArea({ attrs: { [attribute]: second } });
-
-        expectDeprecation(
-          () => runTask(() => set(this.context, 'value', first)),
-          deprecation,
-          EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-        );
-        this.assertTextArea({ attrs: { [attribute]: first } });
-      },
-    };
-  }
-}
-
-applyMixins(
-  TextAreaRenderingTest,
-  new BoundTextAreaAttributes([
-    { attribute: 'role', argument: 'ariaRole', first: 'textbox', second: 'search' },
-    { attribute: 'placeholder', first: 'Stuff here', second: 'Other stuff' },
-    { attribute: 'name', first: 'Stuff here', second: 'Other stuff' },
-    { attribute: 'title', first: 'Stuff here', second: 'Other stuff' },
-    { attribute: 'maxlength', first: '1', second: '2' },
-    { attribute: 'rows', first: '1', second: '2' },
-    { attribute: 'cols', first: '1', second: '2' },
-    { attribute: 'tabindex', first: '1', second: '2' },
-  ])
-);
-
 moduleFor(
   'Components test: {{textarea}}',
   class extends TextAreaRenderingTest {
@@ -90,58 +35,6 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    ['@test [DEPRECATED] Supports elementId'](assert) {
-      expectDeprecation(
-        () => this.render('{{textarea elementId="test-textarea"}}'),
-        /Passing the `@elementId` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.equal(this.$('textarea').attr('id'), 'test-textarea');
-    }
-
-    ['@test [DEPRECATED] Should respect disabled'](assert) {
-      expectDeprecation(
-        () => this.render('{{textarea disabled=this.disabled}}', { disabled: true }),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':disabled'));
-    }
-
-    ['@test [DEPRECATED] Should respect disabled when false'](assert) {
-      expectDeprecation(
-        () => this.render('{{textarea disabled=this.disabled}}', { disabled: false }),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':not(:disabled)'));
-    }
-
-    ['@test [DEPRECATED] Should become disabled when the context changes'](assert) {
-      expectDeprecation(
-        () => this.render('{{textarea disabled=this.disabled}}'),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':not(:disabled)'));
-
-      this.assertStableRerender();
-
-      expectDeprecation(
-        () => runTask(() => set(this.context, 'disabled', true)),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':disabled'));
-
-      expectDeprecation(
-        () => runTask(() => set(this.context, 'disabled', false)),
-        /Passing the `@disabled` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-      assert.ok(this.$('textarea').is(':not(:disabled)'));
-    }
-
     ['@test Should bind its contents to the specified value']() {
       this.render('{{textarea value=this.model.val}}', {
         model: { val: 'A beautiful day in Seattle' },
@@ -202,21 +95,5 @@ moduleFor(
       runTask(() => set(this.context, 'model', { val: 'A beautiful day in Seattle' }));
       this.assertTextArea({ value: 'A beautiful day in Seattle' });
     }
-
-    ['@test triggers a method with `{{textarea key-up=this.didTrigger}}`'](assert) {
-      expectDeprecation(
-        () => {
-          this.render(`{{textarea key-up=this.didTrigger}}`, {
-            didTrigger: action(function () {
-              assert.ok(true, 'action was triggered');
-            }),
-          });
-        },
-        /Passing the `@key-up` argument to <Textarea> is deprecated\./,
-        EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-      );
-
-      this.triggerEvent('keyup', { key: 'A' });
-    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/to-string-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/to-string-test.js
index 908393358df..9606a6e9752 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/to-string-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/to-string-test.js
@@ -1,28 +1,12 @@
 import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
 
-import { Checkbox, Component, LinkComponent, TextArea, TextField } from '@ember/-internals/glimmer';
+import { Component } from '@ember/-internals/glimmer';
 
 moduleFor(
   'built-in component toString',
   class AbstractAppendTest extends RenderingTestCase {
-    '@test text-field has the correct toString value'(assert) {
-      assert.strictEqual(TextField.toString(), '@ember/component/text-field');
-    }
-
-    '@test checkbox has the correct toString value'(assert) {
-      assert.strictEqual(Checkbox.toString(), '@ember/component/checkbox');
-    }
-
-    '@test text-area has the correct toString value'(assert) {
-      assert.strictEqual(TextArea.toString(), '@ember/component/text-area');
-    }
-
     '@test component has the correct toString value'(assert) {
       assert.strictEqual(Component.toString(), '@ember/component');
     }
-
-    '@test LinkTo has the correct toString value'(assert) {
-      assert.strictEqual(LinkComponent.toString(), '@ember/routing/link-component');
-    }
   }
 );
diff --git a/packages/@ember/-internals/glimmer/tests/utils/helpers.js b/packages/@ember/-internals/glimmer/tests/utils/helpers.js
index 806eba8951e..baac59ae5c3 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/helpers.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/helpers.js
@@ -5,7 +5,6 @@ export {
   Helper,
   helper,
   Component,
-  LinkComponent,
   InteractiveRenderer,
   InertRenderer,
   htmlSafe,
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 7c66c3b73de..115d3745b22 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -12,7 +12,6 @@ import {
   setObservers,
   wrap,
 } from '@ember/-internals/utils';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
@@ -551,7 +550,7 @@ export default class Mixin {
       */
       guidFor(this);
 
-      if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS && Mixin._disableDebugSeal !== true) {
+      if (Mixin._disableDebugSeal !== true) {
         Object.seal(this);
       }
     }
@@ -665,7 +664,7 @@ export default class Mixin {
   }
 }
 
-if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
+if (DEBUG) {
   Object.defineProperty(Mixin, '_disableDebugSeal', {
     configurable: true,
     enumerable: false,
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index f2a061cba04..b040ac0518e 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -12,7 +12,7 @@ import RouterState from '../system/router_state';
 const ROUTER = (symbol('ROUTER') as unknown) as string;
 
 /**
-  The Routing service is used by LinkComponent, and provides facilities for
+  The Routing service is used by LinkTo, and provides facilities for
   the component/view layer to interact with the router.
 
   This is a private service for internal usage only. For public usage,
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
index b0d4bde399b..17479109eca 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
@@ -4,14 +4,9 @@
 
 import { context } from '@ember/-internals/environment';
 import { get, Mixin, computed } from '@ember/-internals/metal';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { assert, deprecate } from '@ember/debug';
+import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
-if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Mixin._disableDebugSeal = true;
-}
-
 /**
 `Ember.TargetActionSupport` is a mixin that can be included in a class
 to add a `triggerAction` method with semantics similar to the Handlebars
@@ -153,41 +148,8 @@ function getTarget(instance) {
   return null;
 }
 
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(TargetActionSupport, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(TargetActionSupport, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(...args) {
-      if (this === TargetActionSupport) {
-        deprecate('Reopening Ember.TargetActionSupport is deprecated.', false, {
-          id: 'ember.built-in-components.reopen',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-        });
-
-        TargetActionSupport._wasReopened = true;
-      }
-
-      return Mixin.prototype.reopen.call(this, ...args);
-    },
-  });
-
-  if (DEBUG) {
-    Object.seal(TargetActionSupport);
-    Mixin._disableDebugSeal = false;
-  }
+if (DEBUG) {
+  Object.seal(TargetActionSupport);
 }
 
 export default TargetActionSupport;
diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts
index de6e4673dde..811551560d9 100644
--- a/packages/@ember/-internals/views/index.d.ts
+++ b/packages/@ember/-internals/views/index.d.ts
@@ -8,7 +8,6 @@ export const ClassNamesSupport: any;
 export const CoreView: any;
 export const ViewMixin: any;
 export const ViewStateSupport: any;
-export const TextSupport: any;
 
 export function getElementView(element: SimpleElement): unknown;
 export function getViewElement(view: unknown): Option<SimpleElement>;
diff --git a/packages/@ember/-internals/views/index.js b/packages/@ember/-internals/views/index.js
index 00b866a3ef7..b103f9f0550 100644
--- a/packages/@ember/-internals/views/index.js
+++ b/packages/@ember/-internals/views/index.js
@@ -17,7 +17,6 @@ export {
 } from './lib/system/utils';
 export { default as EventDispatcher } from './lib/system/event_dispatcher';
 export { default as ComponentLookup } from './lib/component_lookup';
-export { default as TextSupport } from './lib/mixins/text_support';
 export { default as CoreView } from './lib/views/core_view';
 export { default as ClassNamesSupport } from './lib/mixins/class_names_support';
 export { default as ChildViewsSupport } from './lib/mixins/child_views_support';
diff --git a/packages/@ember/-internals/views/lib/mixins/text_support.js b/packages/@ember/-internals/views/lib/mixins/text_support.js
deleted file mode 100644
index e72590c6cb6..00000000000
--- a/packages/@ember/-internals/views/lib/mixins/text_support.js
+++ /dev/null
@@ -1,375 +0,0 @@
-/**
-@module ember
-*/
-
-import { get, set, Mixin } from '@ember/-internals/metal';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-import { MUTABLE_CELL } from '@ember/-internals/views';
-import { DEBUG } from '@glimmer/env';
-
-if (DEBUG && EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Mixin._disableDebugSeal = true;
-}
-
-const KEY_EVENTS = {
-  Enter: 'insertNewline',
-  Escape: 'cancel',
-};
-
-/**
-  `TextSupport` is a shared mixin used by both `TextField` and
-  `TextArea`. `TextSupport` adds a number of methods that allow you to
-  specify a controller action to invoke when a certain event is fired on your
-  text field or textarea. The specified controller action would get the current
-  value of the field passed in as the only argument unless the value of
-  the field is empty. In that case, the instance of the field itself is passed
-  in as the only argument.
-
-  Let's use the pressing of the escape key as an example. If you wanted to
-  invoke a controller action when a user presses the escape key while on your
-  field, you would use the `escape-press` attribute on your field like so:
-
-  ```handlebars
-    {{! application.hbs}}
-
-    {{input escape-press='alertUser'}}
-  ```
-
-  ```javascript
-      import Application from '@ember/application';
-      import Controller from '@ember/controller';
-      App = Application.create();
-
-      App.ApplicationController = Controller.extend({
-        actions: {
-          alertUser: function ( currentValue ) {
-            alert( 'escape pressed, current value: ' + currentValue );
-          }
-        }
-      });
-  ```
-
-  The following chart is a visual representation of what takes place when the
-  escape key is pressed in this scenario:
-
-  ```
-  The Template
-  +---------------------------+
-  |                           |
-  | escape-press='alertUser'  |
-  |                           |          TextSupport Mixin
-  +----+----------------------+          +-------------------------------+
-       |                                 | cancel method                 |
-       |      escape button pressed      |                               |
-       +-------------------------------> | checks for the `escape-press` |
-                                         | attribute and pulls out the   |
-       +-------------------------------+ | `alertUser` value             |
-       |     action name 'alertUser'     +-------------------------------+
-       |     sent to controller
-       v
-  Controller
-  +------------------------------------------ +
-  |                                           |
-  |  actions: {                               |
-  |     alertUser: function( currentValue ){  |
-  |       alert( 'the esc key was pressed!' ) |
-  |     }                                     |
-  |  }                                        |
-  |                                           |
-  +-------------------------------------------+
-  ```
-
-  Here are the events that we currently support along with the name of the
-  attribute you would need to use on your field. To reiterate, you would use the
-  attribute name like so:
-
-  ```handlebars
-    {{input attribute-name='controllerAction'}}
-  ```
-
-  ```
-  +--------------------+----------------+
-  |                    |                |
-  | event              | attribute name |
-  +--------------------+----------------+
-  | new line inserted  | insert-newline |
-  |                    |                |
-  | enter key pressed  | enter          |
-  |                    |                |
-  | cancel key pressed | escape-press   |
-  |                    |                |
-  | focusin            | focus-in       |
-  |                    |                |
-  | focusout           | focus-out      |
-  |                    |                |
-  | keypress           | key-press      |
-  |                    |                |
-  | keyup              | key-up         |
-  |                    |                |
-  | keydown            | key-down       |
-  +--------------------+----------------+
-  ```
-
-  @class TextSupport
-  @namespace Ember
-  @uses Ember.TargetActionSupport
-  @extends Mixin
-  @private
-*/
-const TextSupport = Mixin.create({
-  value: '',
-
-  attributeBindings: [
-    'autocapitalize',
-    'autocorrect',
-    'autofocus',
-    'disabled',
-    'form',
-    'maxlength',
-    'minlength',
-    'placeholder',
-    'readonly',
-    'required',
-    'selectionDirection',
-    'spellcheck',
-    'tabindex',
-    'title',
-  ],
-  placeholder: null,
-  disabled: false,
-  maxlength: null,
-
-  /**
-    Whether the `keyUp` event that triggers an `action` to be sent continues
-    propagating to other views.
-
-    By default, when the user presses the return key on their keyboard and
-    the text field has an `action` set, the action will be sent to the view's
-    controller and the key event will stop propagating.
-
-    If you would like parent views to receive the `keyUp` event even after an
-    action has been dispatched, set `bubbles` to true.
-
-    @property bubbles
-    @type Boolean
-    @default false
-    @private
-  */
-  bubbles: false,
-
-  interpretKeyEvents(event) {
-    let method = KEY_EVENTS[event.key];
-
-    this._elementValueDidChange();
-    if (method) {
-      return this[method](event);
-    }
-  },
-
-  _elementValueDidChange() {
-    set(this, 'value', this.element.value);
-  },
-
-  change(event) {
-    this._elementValueDidChange(event);
-  },
-
-  paste(event) {
-    this._elementValueDidChange(event);
-  },
-
-  cut(event) {
-    this._elementValueDidChange(event);
-  },
-
-  input(event) {
-    this._elementValueDidChange(event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when either the `enter`
-    key is pressed or, in the case of the field being a textarea, when a newline
-    is inserted. To use this method, give your field an `insert-newline`
-    attribute. The value of that attribute should be the name of the action
-    in your controller that you wish to invoke.
-
-    For an example on how to use the `insert-newline` attribute, please
-    reference the example near the top of this file.
-
-    @method insertNewline
-    @param {Event} event
-    @private
-  */
-  insertNewline(event) {
-    sendAction('enter', this, event);
-    sendAction('insert-newline', this, event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when the escape button
-    is pressed. To use this method, give your field an `escape-press`
-    attribute. The value of that attribute should be the name of the action
-    in your controller that you wish to invoke.
-
-    For an example on how to use the `escape-press` attribute, please reference
-    the example near the top of this file.
-
-    @method cancel
-    @param {Event} event
-    @private
-  */
-  cancel(event) {
-    sendAction('escape-press', this, event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when a field receives
-    focus. To use this method, give your field a `focus-in` attribute. The value
-    of that attribute should be the name of the action in your controller
-    that you wish to invoke.
-
-    For an example on how to use the `focus-in` attribute, please reference the
-    example near the top of this file.
-
-    @method focusIn
-    @param {Event} event
-    @private
-  */
-  focusIn(event) {
-    sendAction('focus-in', this, event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when a field loses
-    focus. To use this method, give your field a `focus-out` attribute. The value
-    of that attribute should be the name of the action in your controller
-    that you wish to invoke.
-
-    For an example on how to use the `focus-out` attribute, please reference the
-    example near the top of this file.
-
-    @method focusOut
-    @param {Event} event
-    @private
-  */
-  focusOut(event) {
-    this._elementValueDidChange(event);
-    sendAction('focus-out', this, event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when a key is pressed.
-    To use this method, give your field a `key-press` attribute. The value of
-    that attribute should be the name of the action in your controller you
-    that wish to invoke.
-
-    For an example on how to use the `key-press` attribute, please reference the
-    example near the top of this file.
-
-    @method keyPress
-    @param {Event} event
-    @private
-  */
-  keyPress(event) {
-    sendAction('key-press', this, event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when a key-up event is
-    fired. To use this method, give your field a `key-up` attribute. The value
-    of that attribute should be the name of the action in your controller
-    that you wish to invoke.
-
-    For an example on how to use the `key-up` attribute, please reference the
-    example near the top of this file.
-
-    @method keyUp
-    @param {Event} event
-    @private
-  */
-  keyUp(event) {
-    this.interpretKeyEvents(event);
-    sendAction('key-up', this, event);
-  },
-
-  /**
-    Allows you to specify a controller action to invoke when a key-down event is
-    fired. To use this method, give your field a `key-down` attribute. The value
-    of that attribute should be the name of the action in your controller that
-    you wish to invoke.
-
-    For an example on how to use the `key-down` attribute, please reference the
-    example near the top of this file.
-
-    @method keyDown
-    @param {Event} event
-    @private
-  */
-  keyDown(event) {
-    sendAction('key-down', this, event);
-  },
-});
-
-// In principle, this shouldn't be necessary, but the legacy
-// sendAction semantics for TextField are different from
-// the component semantics so this method normalizes them.
-function sendAction(eventName, view, event) {
-  let action = get(view, `attrs.${eventName}`);
-  if (action !== null && typeof action === 'object' && action[MUTABLE_CELL] === true) {
-    action = action.value;
-  }
-
-  if (action === undefined) {
-    action = get(view, eventName);
-  }
-
-  let value = get(view, 'value');
-
-  if (typeof action === 'function') {
-    action(value, event);
-  }
-
-  if (action && !get(view, 'bubbles')) {
-    event.stopPropagation();
-  }
-}
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  Object.defineProperty(TextSupport, '_wasReopened', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-
-  Object.defineProperty(TextSupport, 'reopen', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: function reopen(...args) {
-      if (this === TextSupport) {
-        deprecate('Reopening Ember.TextSupport is deprecated.', false, {
-          id: 'ember.built-in-components.reopen',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-          until: '4.0.0',
-          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-reopen',
-        });
-
-        TextSupport._wasReopened = true;
-      }
-
-      return Mixin.prototype.reopen.call(this, ...args);
-    },
-  });
-
-  if (DEBUG) {
-    Object.seal(TextSupport);
-    Mixin._disableDebugSeal = false;
-  }
-}
-
-export default TextSupport;
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index ca013a37d27..f4c51d8bf27 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -131,8 +131,6 @@ moduleFor(
       verifyRegistration(assert, application, 'location:history');
       verifyRegistration(assert, application, 'location:none');
 
-      verifyRegistration(assert, application, 'component:-text-field');
-      verifyRegistration(assert, application, 'component:-checkbox');
       verifyRegistration(assert, application, 'component:link-to');
 
       verifyRegistration(assert, application, 'component:textarea');
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 18b7302fba1..d4fdf31769f 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -17,7 +17,6 @@ export const DEFAULT_FEATURES = {
   EMBER_NAMED_BLOCKS: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_GLIMMER_INVOKE_HELPER: true,
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: null,
@@ -75,9 +74,6 @@ export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROV
 export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
-export const EMBER_MODERNIZED_BUILT_IN_COMPONENTS = featureValue(
-  FEATURES.EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-);
 export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
diff --git a/packages/@ember/component/checkbox.ts b/packages/@ember/component/checkbox.ts
deleted file mode 100644
index 28788824d26..00000000000
--- a/packages/@ember/component/checkbox.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  deprecate(
-    `Using Ember.Checkbox or importing from 'Checkbox' has been deprecated, install the ` +
-      `\`@ember/legacy-built-in-components\` addon and use \`import { Checkbox } from ` +
-      `'@ember/legacy-built-in-components';\` instead`,
-    false,
-    {
-      id: 'ember.built-in-components.import',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
-    }
-  );
-}
-
-export { Checkbox as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/component/index.ts b/packages/@ember/component/index.ts
index 9f04047bb49..a6500456ff0 100644
--- a/packages/@ember/component/index.ts
+++ b/packages/@ember/component/index.ts
@@ -1,5 +1,5 @@
 export { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
-export { Component as default, Input } from '@ember/-internals/glimmer';
+export { Component as default, Input, Textarea } from '@ember/-internals/glimmer';
 export {
   componentCapabilities as capabilities,
   setComponentManager,
diff --git a/packages/@ember/component/text-area.ts b/packages/@ember/component/text-area.ts
deleted file mode 100644
index 930a55ee198..00000000000
--- a/packages/@ember/component/text-area.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  deprecate(
-    `Using Ember.TextArea or importing from 'TextArea' has been deprecated, install the ` +
-      `\`@ember/legacy-built-in-components\` addon and use \`import { TextArea } from ` +
-      `'@ember/legacy-built-in-components';\` instead`,
-    false,
-    {
-      id: 'ember.built-in-components.import',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
-    }
-  );
-}
-
-export { TextArea as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/component/text-field.ts b/packages/@ember/component/text-field.ts
deleted file mode 100644
index 77f3d6cdf3b..00000000000
--- a/packages/@ember/component/text-field.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  deprecate(
-    `Using Ember.TextField or importing from 'TextField' has been deprecated, install the ` +
-      `\`@ember/legacy-built-in-components\` addon and use \`import { TextField } from ` +
-      `'@ember/legacy-built-in-components';\` instead`,
-    false,
-    {
-      id: 'ember.built-in-components.import',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
-    }
-  );
-}
-
-export { TextField as default } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 650d6934b69..473878418ba 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -60,8 +60,6 @@ moduleFor(
       );
       verifyRegistration(assert, engine, 'controller:basic');
 
-      verifyRegistration(assert, engine, 'component:-text-field');
-      verifyRegistration(assert, engine, 'component:-checkbox');
       verifyRegistration(assert, engine, 'component:link-to');
 
       verifyRegistration(assert, engine, 'component:textarea');
diff --git a/packages/@ember/routing/index.ts b/packages/@ember/routing/index.ts
index f0e6ccd093d..474d8b90c17 100644
--- a/packages/@ember/routing/index.ts
+++ b/packages/@ember/routing/index.ts
@@ -1 +1 @@
-export { LinkComponent as LinkTo } from '@ember/-internals/glimmer';
+export { LinkTo } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/routing/link-component.ts b/packages/@ember/routing/link-component.ts
deleted file mode 100644
index 8c3e4f86a60..00000000000
--- a/packages/@ember/routing/link-component.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS } from '@ember/canary-features';
-import { deprecate } from '@ember/debug';
-
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  deprecate(
-    `Using Ember.LinkComponent or importing from 'LinkComponent' has been deprecated, install the ` +
-      `\`@ember/legacy-built-in-components\` addon and use \`import { LinkComponent } from ` +
-      `'@ember/legacy-built-in-components';\` instead`,
-    false,
-    {
-      id: 'ember.built-in-components.import',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.27.0',
-      },
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
-    }
-  );
-}
-
-export { LinkComponent as default } from '@ember/-internals/glimmer';
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 1cf5dd39ad6..28f29a10b25 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -9,7 +9,6 @@ import TransformActionSyntax from './transform-action-syntax';
 import TransformEachInIntoEach from './transform-each-in-into-each';
 import TransformEachTrackArray from './transform-each-track-array';
 import TransformInElement from './transform-in-element';
-import TransformLinkTo from './transform-link-to';
 import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings-into-just-bindings';
 import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
@@ -24,7 +23,6 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformActionSyntax,
     AssertAgainstAttrs,
     TransformEachInIntoEach,
-    TransformLinkTo,
     AssertInputHelperWithoutBlock,
     TransformInElement,
     AssertSplattributeExpressions,
diff --git a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts b/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
deleted file mode 100644
index 3db2bc46455..00000000000
--- a/packages/ember-template-compiler/lib/plugins/transform-link-to.ts
+++ /dev/null
@@ -1,245 +0,0 @@
-import { assert, deprecate } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { Builders, EmberASTPluginEnvironment } from '../types';
-import { isPath, isSubExpression } from './utils';
-
-function isInlineLinkTo(node: AST.MustacheStatement): boolean {
-  return isPath(node.path) && node.path.original === 'link-to';
-}
-
-function isBlockLinkTo(node: AST.BlockStatement): boolean {
-  return isPath(node.path) && node.path.original === 'link-to';
-}
-
-function isQueryParams(node: AST.Expression): node is AST.SubExpression {
-  return isSubExpression(node) && isPath(node.path) && node.path.original === 'query-params';
-}
-
-function transformInlineLinkToIntoBlockForm(
-  env: EmberASTPluginEnvironment,
-  node: AST.MustacheStatement
-): AST.BlockStatement {
-  let { builders: b } = env.syntax;
-
-  return b.block(
-    'link-to',
-    node.params.slice(1),
-    node.hash,
-    b.blockItself(
-      [buildStatement(b, node.params[0], node.escaped, node.loc)],
-      undefined,
-      false,
-      node.loc
-    ),
-    null,
-    node.loc
-  );
-}
-
-function transformPositionalLinkToIntoNamedArguments(
-  env: EmberASTPluginEnvironment,
-  node: AST.BlockStatement,
-  hasBlock = true
-): AST.BlockStatement {
-  let { builders: b } = env.syntax;
-  let moduleName = env.meta?.moduleName;
-  let {
-    params,
-    hash: { pairs },
-  } = node;
-
-  let keys = pairs.map((pair) => pair.key);
-
-  if (params.length === 0) {
-    assert(
-      `You must provide one or more parameters to the \`{{link-to}}\` component. ${calculateLocationDisplay(
-        moduleName,
-        node.loc
-      )}`,
-      keys.indexOf('params') !== -1 ||
-        keys.indexOf('route') !== -1 ||
-        keys.indexOf('model') !== -1 ||
-        keys.indexOf('models') !== -1 ||
-        keys.indexOf('query') !== -1
-    );
-
-    return node;
-  } else {
-    assert(
-      `You cannot pass positional parameters and the \`params\` argument to the \`{{link-to}}\` component at the same time. ${calculateLocationDisplay(
-        moduleName,
-        node.loc
-      )}`,
-      keys.indexOf('params') === -1
-    );
-
-    assert(
-      `You cannot pass positional parameters and the \`route\` argument to the \`{{link-to}}\` component at the same time. ${calculateLocationDisplay(
-        moduleName,
-        node.loc
-      )}`,
-      keys.indexOf('route') === -1
-    );
-
-    assert(
-      `You cannot pass positional parameters and the \`model\` argument to the \`{{link-to}}\` component at the same time. ${calculateLocationDisplay(
-        moduleName,
-        node.loc
-      )}`,
-      keys.indexOf('model') === -1
-    );
-
-    assert(
-      `You cannot pass positional parameters and the \`models\` argument to the \`{{link-to}}\` component at the same time. ${calculateLocationDisplay(
-        moduleName,
-        node.loc
-      )}`,
-      keys.indexOf('models') === -1
-    );
-
-    assert(
-      `You cannot pass positional parameters and the \`query\` argument to the \`{{link-to}}\` component at the same time. ${calculateLocationDisplay(
-        moduleName,
-        node.loc
-      )}`,
-      keys.indexOf('query') === -1
-    );
-  }
-
-  assert(
-    `You must provide one or more parameters to the \`{{link-to}}\` component. ${calculateLocationDisplay(
-      moduleName,
-      node.loc
-    )}`,
-    params.length > 0
-  );
-
-  let equivalentNamedArgs = [];
-  let hasQueryParams = false;
-
-  // 1. The last argument is possibly the `query` object.
-
-  let query = params[params.length - 1];
-
-  if (query && isQueryParams(query)) {
-    params.pop();
-
-    assert(
-      `The \`(query-params ...)\` helper does not take positional arguments. ${calculateLocationDisplay(
-        moduleName,
-        query.loc
-      )}`,
-      query.params.length === 0
-    );
-
-    pairs.push(
-      b.pair(
-        'query',
-        b.sexpr(b.path('-hash', query.path.loc), [], query.hash, query.loc),
-        query.loc
-      )
-    );
-
-    hasQueryParams = true;
-  }
-
-  // 2. If there is a `route`, it is now at index 0.
-
-  let route = params.shift();
-
-  if (route) {
-    pairs.push(b.pair('route', route, route.loc));
-    equivalentNamedArgs.push('`@route`');
-  }
-
-  // 3. Any remaining indices (if any) are `models`.
-
-  if (params.length === 1) {
-    pairs.push(b.pair('model', params[0], params[0].loc));
-    equivalentNamedArgs.push('`@model`');
-  } else if (params.length > 1) {
-    pairs.push(
-      b.pair('models', b.sexpr(b.path('array', node.loc), params, undefined, node.loc), node.loc)
-    );
-    equivalentNamedArgs.push('`@models`');
-  }
-
-  if (hasQueryParams) {
-    equivalentNamedArgs.push('`@query`');
-  }
-
-  if (equivalentNamedArgs.length > 0) {
-    let message = 'Invoking the `<LinkTo>` component with positional arguments is deprecated.';
-
-    message += `Please use the equivalent named arguments (${equivalentNamedArgs.join(', ')})`;
-
-    if (hasQueryParams) {
-      message += ' along with the `hash` helper';
-    }
-
-    if (!hasBlock) {
-      message += " and pass a block for the link's content.";
-    }
-
-    message += '.';
-
-    if (node.loc?.source) {
-      message += ` ${calculateLocationDisplay(moduleName, node.loc)}`;
-    }
-
-    deprecate(message, false, {
-      id: 'ember-glimmer.link-to.positional-arguments',
-      until: '4.0.0',
-      for: 'ember-source',
-      url: 'https://deprecations.emberjs.com/v3.x#toc_ember-glimmer-link-to-positional-arguments',
-      since: {
-        enabled: '3.26.0-beta.1',
-      },
-    });
-  }
-
-  return b.block(
-    node.path,
-    null,
-    b.hash(pairs, node.hash.loc),
-    node.program,
-    node.inverse,
-    node.loc
-  );
-}
-
-function buildStatement(b: Builders, content: AST.Node, escaped: boolean, loc: AST.SourceLocation) {
-  switch (content.type) {
-    case 'PathExpression':
-      return b.mustache(content, undefined, undefined, !escaped, loc);
-
-    case 'SubExpression':
-      return b.mustache(content.path, content.params, content.hash, !escaped, loc);
-
-    // The default case handles literals.
-    default:
-      return b.text(`${(content as AST.Literal).value}`, loc);
-  }
-}
-
-export default function transformLinkTo(env: EmberASTPluginEnvironment): ASTPlugin {
-  return {
-    name: 'transform-link-to',
-
-    visitor: {
-      MustacheStatement(node: AST.MustacheStatement): AST.Node | void {
-        if (isInlineLinkTo(node)) {
-          let block = transformInlineLinkToIntoBlockForm(env, node);
-          return transformPositionalLinkToIntoNamedArguments(env, block, false);
-        }
-      },
-
-      BlockStatement(node: AST.BlockStatement): AST.Node | void {
-        if (isBlockLinkTo(node)) {
-          return transformPositionalLinkToIntoNamedArguments(env, node);
-        }
-      },
-    },
-  };
-}
diff --git a/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js b/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js
deleted file mode 100644
index 01a9d8185a3..00000000000
--- a/packages/ember-template-compiler/tests/plugins/transform-link-to-test.js
+++ /dev/null
@@ -1,409 +0,0 @@
-import TransformTestCase from '../utils/transform-test-case';
-import { compile } from '../../index';
-import { moduleFor } from 'internal-test-helpers';
-
-moduleFor(
-  'ember-template-compiler: transforming inline {{link-to}} into the block form',
-  class extends TransformTestCase {
-    ['@test [DEPRECATED] it transforms an inline {{link-to}} into its block form']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to 'foo' 'index'}}`,
-          `{{#link-to route='index'}}foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] bound link title']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to foo 'index'}}`,
-          `{{#link-to route='index'}}{{foo}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to this.foo 'index'}}`,
-          `{{#link-to route='index'}}{{this.foo}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to foo.bar.baz 'index'}}`,
-          `{{#link-to route='index'}}{{foo.bar.baz}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to @foo 'index'}}`,
-          `{{#link-to route='index'}}{{@foo}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] sexp link title']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to (foo) 'index'}}`,
-          `{{#link-to route='index'}}{{foo}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to (foo bar) 'index'}}`,
-          `{{#link-to route='index'}}{{foo bar}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{link-to (foo bar baz=bat) 'index'}}`,
-          `{{#link-to route='index'}}{{foo bar baz=bat}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-  }
-);
-
-moduleFor(
-  'ember-template-compiler: transforming inline {{{link-to}}} into the block form',
-  class extends TransformTestCase {
-    ['@test [DEPRECATED] it transforms an inline {{{link-to}}} into its block form']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to 'foo' 'index'}}}`,
-          `{{#link-to route='index'}}foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] bound link title']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to foo 'index'}}}`,
-          `{{#link-to route='index'}}{{{foo}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to this.foo 'index'}}}`,
-          `{{#link-to route='index'}}{{{this.foo}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to foo.bar.baz 'index'}}}`,
-          `{{#link-to route='index'}}{{{foo.bar.baz}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to @foo 'index'}}}`,
-          `{{#link-to route='index'}}{{{@foo}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] sexp link title']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to (foo) 'index'}}}`,
-          `{{#link-to route='index'}}{{{foo}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to (foo bar) 'index'}}}`,
-          `{{#link-to route='index'}}{{{foo bar}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{{link-to (foo bar baz=bat) 'index'}}}`,
-          `{{#link-to route='index'}}{{{foo bar baz=bat}}}{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-  }
-);
-
-moduleFor(
-  'ember-template-compiler: transforming positional arguments into named arguments',
-  class extends TransformTestCase {
-    ['@test [DEPRECATED] no arguments']() {
-      expectAssertion(
-        () => compile('{{#link-to}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /You must provide one or more parameters to the `{{link-to}}` component. \('-top-level' @ L1:C0\)/
-      );
-
-      expectAssertion(
-        () => compile('{{#link-to class="wow"}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /You must provide one or more parameters to the `{{link-to}}` component. \('-top-level' @ L1:C0\)/
-      );
-
-      // these are ok
-
-      compile('{{#link-to params=foo}}zomg{{/link-to}}', { moduleName: '-top-level' });
-      compile('{{#link-to route=foo}}zomg{{/link-to}}', { moduleName: '-top-level' });
-      compile('{{#link-to model=foo}}zomg{{/link-to}}', { moduleName: '-top-level' });
-      compile('{{#link-to models=foo}}zomg{{/link-to}}', { moduleName: '-top-level' });
-      compile('{{#link-to query=foo}}zomg{{/link-to}}', { moduleName: '-top-level' });
-    }
-
-    ['@test [DEPRECATED] mixing positional and named arguments']() {
-      expectAssertion(
-        () => compile('{{#link-to foo params=bar}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /cannot pass positional parameters and the `params` argument to the `{{link-to}}` component at the same time. \('-top-level' @ L1:C0\)/
-      );
-
-      expectAssertion(
-        () => compile('{{#link-to foo route=bar}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /cannot pass positional parameters and the `route` argument to the `{{link-to}}` component at the same time. \('-top-level' @ L1:C0\)/
-      );
-
-      expectAssertion(
-        () => compile('{{#link-to foo model=bar}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /cannot pass positional parameters and the `model` argument to the `{{link-to}}` component at the same time. \('-top-level' @ L1:C0\)/
-      );
-
-      expectAssertion(
-        () => compile('{{#link-to foo models=bar}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /cannot pass positional parameters and the `models` argument to the `{{link-to}}` component at the same time. \('-top-level' @ L1:C0\)/
-      );
-
-      expectAssertion(
-        () => compile('{{#link-to foo query=bar}}zomg{{/link-to}}', { moduleName: '-top-level' }),
-        /cannot pass positional parameters and the `query` argument to the `{{link-to}}` component at the same time. \('-top-level' @ L1:C0\)/
-      );
-    }
-
-    ['@test [DEPRECATED] route only']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo'}}Foo{{/link-to}}`,
-          `{{#link-to route='foo'}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to foo}}Foo{{/link-to}}`,
-          `{{#link-to route=foo}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to this.foo}}Foo{{/link-to}}`,
-          `{{#link-to route=this.foo}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to foo.bar.baz}}Foo{{/link-to}}`,
-          `{{#link-to route=foo.bar.baz}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to @foo}}Foo{{/link-to}}`,
-          `{{#link-to route=@foo}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to @foo}}Foo{{/link-to}}`,
-          `{{#link-to route=@foo}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to (foo)}}Foo{{/link-to}}`,
-          `{{#link-to route=(foo)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to (foo bar)}}Foo{{/link-to}}`,
-          `{{#link-to route=(foo bar)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to (foo bar baz=bat)}}Foo{{/link-to}}`,
-          `{{#link-to route=(foo bar baz=bat)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] single model']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' 'bar'}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model='bar'}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' bar}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=bar}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' this.bar}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=this.bar}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' bar.baz.bat}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=bar.baz.bat}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' @bar}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=@bar}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (bar)}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=(bar)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (bar baz)}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=(bar baz)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (bar baz bat=wat)}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' model=(bar baz bat=wat)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] multi models']() {
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' 'bar' 'baz' 'bat'}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array 'bar' 'baz' 'bat')}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' bar baz bat}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array bar baz bat)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' this.bar this.baz this.bat}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array this.bar this.baz this.bat)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' bar.baz.bat baz.bat.bar bat.bar.baz}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array bar.baz.bat baz.bat.bar bat.bar.baz)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' @bar @baz @bat}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array @bar @baz @bat)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (bar) (baz) (bat)}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array (bar) (baz) (bat))}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (bar baz) (baz bat) (bat bar)}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array (bar baz) (baz bat) (bat bar))}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (bar baz bat=wat) (baz bat wat=bar) (bat wat bar=baz)}}Foo{{/link-to}}`,
-          `{{#link-to route='foo' models=(array (bar baz bat=wat) (baz bat wat=bar) (bat wat bar=baz))}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-
-    ['@test [DEPRECATED] query params']() {
-      QUnit.dump.maxDepth = 100;
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to (query-params)}}Foo{{/link-to}}`,
-          `{{#link-to query=(-hash)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-          `{{#link-to query=(-hash foo='bar' baz=bat)}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-          `{{#link-to query=(-hash foo='bar' baz=bat) route='foo'}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' 'bar' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-          `{{#link-to query=(-hash foo='bar' baz=bat) route='foo' model='bar'}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-
-      expectDeprecation(() => {
-        this.assertTransformed(
-          `{{#link-to 'foo' 'bar' 'baz' 'bat' 'wat' (query-params foo='bar' baz=bat)}}Foo{{/link-to}}`,
-          `{{#link-to query=(-hash foo='bar' baz=bat) route='foo' models=(array 'bar' 'baz' 'bat' 'wat')}}Foo{{/link-to}}`
-        );
-      }, /Invoking the `<LinkTo>` component with positional arguments is deprecated/);
-    }
-  }
-);
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 1993370b0e1..a25538e3f1a 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -11,7 +11,6 @@ import {
   isEnabled,
   EMBER_GLIMMER_HELPER_MANAGER,
   EMBER_GLIMMER_INVOKE_HELPER,
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS,
 } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
@@ -44,7 +43,6 @@ import {
   Array as EmberArray,
   MutableEnumerable,
   MutableArray,
-  TargetActionSupport,
   Evented,
   PromiseProxyMixin,
   Observable,
@@ -63,7 +61,6 @@ import {
   A,
 } from '@ember/-internals/runtime';
 import {
-  Checkbox,
   Component,
   componentCapabilities,
   modifierCapabilities,
@@ -74,11 +71,8 @@ import {
   helper,
   htmlSafe,
   isHTMLSafe,
-  LinkComponent,
   setTemplates,
   template,
-  TextField,
-  TextArea,
   Input,
   isSerializationFirstNode,
 } from '@ember/-internals/glimmer';
@@ -416,59 +410,6 @@ Object.defineProperty(Ember, 'BOOTED', {
 Ember.Component = Component;
 Helper.helper = helper;
 Ember.Helper = Helper;
-if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
-  [
-    ['Checkbox', '@ember/component/checkbox', Checkbox, true],
-    ['TextField', '@ember/component/text-field', TextField, true],
-    ['TextArea', '@ember/component/text-area', TextArea, true],
-    ['LinkComponent', '@ember/routing/link-component', LinkComponent, true],
-    ['TextSupport', null, views.TextSupport, false],
-    ['TargetActionSupport', null, TargetActionSupport, false],
-  ].forEach(([name, path, value, availableInLegacyAddon]) => {
-    Object.defineProperty(Ember, name, {
-      get() {
-        let message = `Using Ember.${name}`;
-
-        if (path !== null) {
-          message += ` or importing from '${path}'`;
-        }
-
-        message += ` is deprecated.`;
-
-        if (availableInLegacyAddon) {
-          message +=
-            ` Install the \`@ember/legacy-built-in-components\` addon and use ` +
-            `\`import { ${name} } from '@ember/legacy-built-in-components';\` instead.`;
-        }
-
-        deprecate(message, false, {
-          id: 'ember.built-in-components.import',
-          until: '4.0.0',
-          for: 'ember-source',
-          since: {
-            enabled: '3.27.0',
-          },
-          url: 'https://deprecations.emberjs.com/v3.x#toc_ember-built-in-components-import',
-        });
-
-        return value;
-      },
-
-      configurable: true,
-      enumerable: true,
-    });
-
-    // Expose a non-deprecated version for tests and the @ember/legacy-built-in-components addon
-    Ember[`_Legacy${name}`] = value;
-  });
-} else {
-  Ember.Checkbox = Checkbox;
-  Ember.TextField = TextField;
-  Ember.TextArea = TextArea;
-  Ember.LinkComponent = LinkComponent;
-  Ember.TextSupport = views.TextSupport;
-  Ember.TargetActionSupport = TargetActionSupport;
-}
 Ember._setComponentManager = setComponentManager;
 Ember._componentManagerCapabilities = componentCapabilities;
 Ember._setModifierManager = setModifierManager;
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index 80ceba86a97..ab2ae99fa8c 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,6 +1,6 @@
 import Ember from '../index';
 import require from 'require';
-import { EMBER_MODERNIZED_BUILT_IN_COMPONENTS, FEATURES } from '@ember/canary-features';
+import { FEATURES } from '@ember/canary-features';
 import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
 import { DEBUG } from '@glimmer/env';
 
@@ -20,52 +20,6 @@ moduleFor(
       });
     }
 
-    ['@feature(EMBER_MODERNIZED_BUILT_IN_COMPONENTS) deprecated built-in components'](assert) {
-      [
-        ['Checkbox', '@ember/component/checkbox', '@ember/-internals/glimmer'],
-        ['TextField', '@ember/component/text-field', '@ember/-internals/glimmer'],
-        ['TextArea', '@ember/component/text-area', '@ember/-internals/glimmer'],
-        ['LinkComponent', '@ember/routing/link-component', '@ember/-internals/glimmer'],
-        ['TextSupport', null, '@ember/-internals/views'],
-        ['TargetActionSupport', null, '@ember/-internals/runtime'],
-      ].forEach(([name, publicPath, privatePath]) => {
-        // loosely based on confirmExport
-        try {
-          let module = require(privatePath);
-          let value = module[name];
-
-          assert.ok(
-            Object.prototype.hasOwnProperty.call(Ember, name),
-            `the ${name} property exists on the Ember global`
-          );
-
-          assert.strictEqual(
-            Ember[`_Legacy${name}`],
-            value,
-            `Ember._Legacy${name} has the correct value and does not trigger a deprecation`
-          );
-
-          expectDeprecation(
-            () =>
-              assert.strictEqual(
-                Ember[name],
-                value,
-                `Ember.${name} has the correct value triggers a deprecation`
-              ),
-            publicPath === null
-              ? `Using Ember.${name} is deprecated.`
-              : `Using Ember.${name} or importing from '${publicPath}' is deprecated. Install the \`@ember/legacy-built-in-components\` addon and use \`import { ${name} } from '@ember/legacy-built-in-components';\` instead.`
-          );
-        } catch (error) {
-          assert.pushResult({
-            result: false,
-            message: `An error occurred while testing ${name} is exported from ${privatePath}.`,
-            source: error,
-          });
-        }
-      });
-    }
-
     ['@skip Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
       let glimmer = require('@ember/-internals/glimmer');
       expectDeprecation(() => {
@@ -133,15 +87,11 @@ let allExports = [
 
   // @ember/component
   ['Component', '@ember/component', 'default'],
-  ['_Input', '@ember/component', 'Input'],
   ['_componentManagerCapabilities', '@ember/component', 'capabilities'],
   ['_getComponentTemplate', '@ember/component', 'getComponentTemplate'],
   ['_setComponentManager', '@ember/component', 'setComponentManager'],
   ['_setComponentTemplate', '@ember/component', 'setComponentTemplate'],
 
-  // @ember/component/checkbox
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['Checkbox', '@ember/component/checkbox'],
-
   // @ember/component/helper
   ['Helper', '@ember/component/helper', 'default'],
   ['Helper.helper', '@ember/component/helper', 'helper'],
@@ -149,12 +99,6 @@ let allExports = [
   // @ember/component/template-only
   ['_templateOnlyComponent', '@ember/component/template-only', 'default'],
 
-  // @ember/component/text-area
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextArea', '@ember/-component/text-area'],
-
-  // @ember/component/text-field
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextField', '@ember/component/text-field'],
-
   // @ember/controller
   ['Controller', '@ember/controller', 'default'],
   ['inject.controller', '@ember/controller', 'inject'],
@@ -290,9 +234,6 @@ let allExports = [
   // @ember/routing/history-location
   ['HistoryLocation', '@ember/routing/history-location', 'default'],
 
-  // @ember/routing/link-component
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['LinkComponent', '@ember/-internals/glimmer'],
-
   // @ember/routing/location
   ['Location', '@ember/routing/location', 'default'],
 
@@ -412,13 +353,13 @@ let allExports = [
   ['ViewUtils.getRootViews', '@ember/-internals/views', 'getRootViews'],
   ['ViewUtils.getChildViews', '@ember/-internals/views', 'getChildViews'],
   ['ViewUtils.isSerializationFirstNode', '@ember/-internals/glimmer', 'isSerializationFirstNode'],
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS ? null : ['TextSupport', '@ember/-internals/views'],
   ['ComponentLookup', '@ember/-internals/views'],
   ['EventDispatcher', '@ember/-internals/views'],
 
   // @ember/-internals/glimmer
   ['TEMPLATES', '@ember/-internals/glimmer', { get: 'getTemplates', set: 'setTemplates' }],
   ['Handlebars.Utils.escapeExpression', '@ember/-internals/glimmer', 'escapeExpression'],
+  ['_Input', '@ember/-internals/glimmer', 'Input'],
 
   // @ember/-internals/runtime
   ['_RegistryProxyMixin', '@ember/-internals/runtime', 'RegistryProxyMixin'],
@@ -427,9 +368,6 @@ let allExports = [
   ['ActionHandler', '@ember/-internals/runtime'],
   ['NativeArray', '@ember/-internals/runtime'],
   ['MutableEnumerable', '@ember/-internals/runtime'],
-  EMBER_MODERNIZED_BUILT_IN_COMPONENTS
-    ? null
-    : ['TargetActionSupport', '@ember/-internals/runtime'],
   ['ControllerMixin', '@ember/controller/lib/controller_mixin', 'default'],
   ['_ProxyMixin', '@ember/-internals/runtime'],
 
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 16c014156a2..424d54883e9 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -31,7 +31,6 @@ module.exports = {
     '_hydrateUnsuppliedQueryParams',
     '_initializersRan',
     '_internalReset',
-    '_invoke',
     '_lazyInjections',
     '_normalizeCache',
     '_onLookup',
@@ -59,8 +58,6 @@ module.exports = {
     'action',
     'actions',
     'activate',
-    'active',
-    'activeClass',
     'adapter',
     'addArrayObserver',
     'addListener',
@@ -85,7 +82,6 @@ module.exports = {
     'arrayContentWillChange',
     'assert',
     'assertDestroyablesDestroyed',
-    'assertLinkToOrigin',
     'assign',
     'associateDestroyableChild',
     'asyncEnd',
@@ -100,7 +96,6 @@ module.exports = {
     'bind',
     'bool',
     'boot',
-    'bubbles',
     'buildChildEngineInstance',
     'buildInstance',
     'buildRegistry',
@@ -125,7 +120,6 @@ module.exports = {
     'classNameBindings',
     'classNames',
     'clear',
-    'click',
     'cloneParentDependencies',
     'collect',
     'columnsForType',
@@ -145,7 +139,6 @@ module.exports = {
     'controllerName',
     'create',
     'createCache',
-    'current-when',
     'currentPath',
     'currentRoute',
     'currentRouteName',
@@ -184,8 +177,6 @@ module.exports = {
     'didTransition',
     'didUpdate',
     'didUpdateAttrs',
-    'disabled',
-    'disabledClass',
     'document',
     'domReady',
     'each-in',
@@ -203,7 +194,6 @@ module.exports = {
     'equal',
     'error',
     'eventDispatcher',
-    'eventName',
     'events',
     'every',
     'exception',
@@ -221,8 +211,6 @@ module.exports = {
     'firstObject',
     'flushWatchers',
     'fn',
-    'focusIn',
-    'focusOut',
     'followRedirects',
     'forEach',
     'formatURL',
@@ -273,7 +261,6 @@ module.exports = {
     'helper',
     'helperContainer',
     'history',
-    'href',
     'htmlSafe',
     'if',
     'in-element',
@@ -288,7 +275,6 @@ module.exports = {
     'injectTestHelpers',
     'input',
     'insertAt',
-    'insertNewline',
     'inspect',
     'instanceInitializer',
     'instrument',
@@ -321,9 +307,6 @@ module.exports = {
     'isRejected',
     'isSettled',
     'join',
-    'keyDown',
-    'keyPress',
-    'keyUp',
     'knownForType',
     'lastIndexOf',
     'lastObject',
@@ -334,8 +317,6 @@ module.exports = {
     'let',
     'link-to',
     'loading',
-    'loadingClass',
-    'loadingHref',
     'localName',
     'location',
     'log',
@@ -358,7 +339,6 @@ module.exports = {
     'mixin',
     'model',
     'modelFor',
-    'models',
     'mount',
     'mut',
     'name',
@@ -397,17 +377,13 @@ module.exports = {
     'parent',
     'parentView',
     'parentViewDidChange',
-    'pattern',
     'pauseTest',
     'popObject',
     'positionalParams',
-    'preventDefault',
     'promise',
     'pushObject',
     'pushObjects',
     'pushState',
-    'query-params',
-    'query',
     'queryParams',
     'queryParamsDidChange',
     'queues',
@@ -442,7 +418,6 @@ module.exports = {
     'registry',
     'reject',
     'rejectBy',
-    'rel',
     'releaseMethods',
     'removeArrayObserver',
     'removeAt',
@@ -472,7 +447,6 @@ module.exports = {
     'reverseObjects',
     'rootElement',
     'rootURL',
-    'route',
     'routeDidChange',
     'routeName',
     'routeWillChange',
@@ -508,7 +482,6 @@ module.exports = {
     'setURL',
     'shiftObject',
     'shouldRender',
-    'size',
     'slice',
     'sort',
     'sortBy',
@@ -516,7 +489,6 @@ module.exports = {
     'store',
     'subscribe',
     'sum',
-    'tabindex',
     'tagName',
     'target',
     'teardownViews',
@@ -528,7 +500,6 @@ module.exports = {
     'then',
     'this[RENDER]',
     'throttle',
-    'title',
     'to',
     'toArray',
     'toggleProperty',
@@ -539,7 +510,6 @@ module.exports = {
     'trigger',
     'triggerAction',
     'trySet',
-    'type',
     'typeOf',
     'typeWatchers',
     'unbound',
@@ -559,7 +529,6 @@ module.exports = {
     'urlFor',
     'userAgent',
     'validationCache',
-    'value',
     'visit',
     'w',
     'wait',
diff --git a/tests/node/app-boot-test.js b/tests/node/app-boot-test.js
index ae040dd4559..e341f787169 100644
--- a/tests/node/app-boot-test.js
+++ b/tests/node/app-boot-test.js
@@ -16,7 +16,7 @@ QUnit.module('App Boot', function (hooks) {
     this.template(
       'components/root-component',
       "\
-      <h1>Hello {{#if hasExistence}}{{location}}{{/if}}</h1>\
+      <h1>Hello {{#if this.hasExistence}}{{this.location}}{{/if}}</h1>\
       <div>{{component 'foo-bar'}}</div>\
     "
     );
@@ -38,8 +38,22 @@ QUnit.module('App Boot', function (hooks) {
     });
   });
 
+  QUnit.test('<LinkTo>', function (assert) {
+    this.template('application', "<h1><LinkTo @route='photos'>Go to photos</LinkTo></h1>");
+    this.routes(function () {
+      this.route('photos');
+    });
+
+    return this.renderToHTML('/').then(function (html) {
+      assert.htmlMatches(
+        html,
+        '<body><div id="EMBER_ID" class="ember-view"><h1><a id="EMBER_ID" href="/photos" class="ember-view">Go to photos</a></h1></div></body>'
+      );
+    });
+  });
+
   QUnit.test('{{link-to}}', function (assert) {
-    this.template('application', "<h1>{{#link-to 'photos'}}Go to photos{{/link-to}}</h1>");
+    this.template('application', "<h1>{{#link-to route='photos'}}Go to photos{{/link-to}}</h1>");
     this.routes(function () {
       this.route('photos');
     });
@@ -57,7 +71,7 @@ QUnit.module('App Boot', function (hooks) {
       this.route('photos');
     });
 
-    this.template('application', '<h1>{{{title}}}</h1>');
+    this.template('application', '<h1>{{{this.title}}}</h1>');
     this.controller('application', {
       title: '<b>Hello world</b>',
     });

From 3ca842332a6d0d39b56093f7b58171d64f2e483b Mon Sep 17 00:00:00 2001
From: Edward Faulkner <ef@alum.mit.edu>
Date: Wed, 10 Nov 2021 12:59:10 -0500
Subject: [PATCH 0713/1405] remove `this` fallback from node tests

---
 tests/node/app-boot-test.js            | 4 ++--
 tests/node/component-rendering-test.js | 2 +-
 tests/node/visit-test.js               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/node/app-boot-test.js b/tests/node/app-boot-test.js
index ae040dd4559..331e2b9126e 100644
--- a/tests/node/app-boot-test.js
+++ b/tests/node/app-boot-test.js
@@ -16,7 +16,7 @@ QUnit.module('App Boot', function (hooks) {
     this.template(
       'components/root-component',
       "\
-      <h1>Hello {{#if hasExistence}}{{location}}{{/if}}</h1>\
+      <h1>Hello {{#if this.hasExistence}}{{this.location}}{{/if}}</h1>\
       <div>{{component 'foo-bar'}}</div>\
     "
     );
@@ -57,7 +57,7 @@ QUnit.module('App Boot', function (hooks) {
       this.route('photos');
     });
 
-    this.template('application', '<h1>{{{title}}}</h1>');
+    this.template('application', '<h1>{{{this.title}}}</h1>');
     this.controller('application', {
       title: '<b>Hello world</b>',
     });
diff --git a/tests/node/component-rendering-test.js b/tests/node/component-rendering-test.js
index 2d23b4f9a90..c9398f3707f 100644
--- a/tests/node/component-rendering-test.js
+++ b/tests/node/component-rendering-test.js
@@ -12,7 +12,7 @@ QUnit.module('Components can be rendered without a DOM dependency', function (ho
   QUnit.test('Component with dynamic value', function (assert) {
     this.set('location', 'World');
 
-    let html = this.render('<h1>Hello {{location}}</h1>');
+    let html = this.render('<h1>Hello {{this.location}}</h1>');
 
     assert.ok(html.match(/<h1>Hello World<\/h1>/));
   });
diff --git a/tests/node/visit-test.js b/tests/node/visit-test.js
index 517542483f3..2814b298d59 100644
--- a/tests/node/visit-test.js
+++ b/tests/node/visit-test.js
@@ -51,7 +51,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
     this.template('application', '<h1>Hello world</h1>\n{{outlet}}');
     this.template('a', '<h2>Welcome to {{x-foo page="A"}}</h2>');
     this.template('b', '<h2>{{x-foo page="B"}}</h2>');
-    this.template('components/x-foo', 'Page {{page}}');
+    this.template('components/x-foo', 'Page {{this.page}}');
 
     let initCalled = false;
     let didInsertElementCalled = false;
@@ -135,7 +135,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
   });
 
   QUnit.test('FastBoot: attributes are sanitized', function (assert) {
-    this.template('application', '<a href={{test}}></a>');
+    this.template('application', '<a href={{this.test}}></a>');
 
     this.controller('application', {
       test: 'javascript:alert("hello")',

From 277d5665369085988a1a40034d297f0896b627df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Nov 2021 18:24:15 +0000
Subject: [PATCH 0714/1405] Bump eslint-plugin-import from 2.24.2 to 2.25.3

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.24.2 to 2.25.3.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.24.2...v2.25.3)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  30 ++--
 yarn.lock    | 396 ++++++++++++++++++++++++---------------------------
 2 files changed, 200 insertions(+), 226 deletions(-)

diff --git a/package.json b/package.json
index 6c369a8d59e..e5ed055b387 100644
--- a/package.json
+++ b/package.json
@@ -46,9 +46,9 @@
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.0",
-    "@babel/plugin-transform-block-scoping": "^7.8.3",
+    "@babel/plugin-transform-block-scoping": "^7.16.0",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.80.2",
+    "@glimmer/vm-babel-plugins": "0.83.1",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
@@ -73,19 +73,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.80.2",
-    "@glimmer/destroyable": "0.80.2",
+    "@glimmer/compiler": "0.83.1",
+    "@glimmer/destroyable": "0.83.1",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.80.2",
-    "@glimmer/interfaces": "0.80.2",
-    "@glimmer/manager": "0.80.2",
-    "@glimmer/node": "0.80.2",
-    "@glimmer/opcode-compiler": "0.80.2",
-    "@glimmer/owner": "0.80.2",
-    "@glimmer/program": "0.80.2",
-    "@glimmer/reference": "0.80.2",
-    "@glimmer/runtime": "0.80.2",
-    "@glimmer/validator": "0.80.2",
+    "@glimmer/global-context": "0.83.1",
+    "@glimmer/interfaces": "0.83.1",
+    "@glimmer/manager": "0.83.1",
+    "@glimmer/node": "0.83.1",
+    "@glimmer/opcode-compiler": "0.83.1",
+    "@glimmer/owner": "0.83.1",
+    "@glimmer/program": "0.83.1",
+    "@glimmer/reference": "0.83.1",
+    "@glimmer/runtime": "0.83.1",
+    "@glimmer/validator": "0.83.1",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.4",
@@ -117,7 +117,7 @@
     "eslint-import-resolver-node": "^0.3.3",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^2.0.0",
-    "eslint-plugin-import": "^2.24.2",
+    "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-qunit": "^6.2.0",
diff --git a/yarn.lock b/yarn.lock
index bab6c09fcb1..ec56b7fa59e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -454,17 +454,7 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
-"@babel/helper-plugin-utils@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
-  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
-
-"@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
@@ -1259,28 +1249,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-block-scoping@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
-  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-block-scoping@^7.15.3":
-  version "7.15.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
-  integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==
+"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3", "@babel/plugin-transform-block-scoping@^7.16.0", "@babel/plugin-transform-block-scoping@^7.8.3":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"
+  integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz#97d35dab66857a437c166358b91d09050c868f3a"
-  integrity sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    lodash "^4.17.13"
-
 "@babel/plugin-transform-classes@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
@@ -2366,52 +2341,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.80.2.tgz#730001221f7240709f5952f30427f2352aa8b05d"
-  integrity sha512-oWl0A3lvGjlArlYAosUQStCAgboCOaf7GZCJ/A3cGCuy1BlP/pFCBFkgG60SODJwr+zeJLRAh0adroaisH66SA==
+"@glimmer/compiler@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.83.1.tgz#d6b7d22a95c99be19959e7c41cd95eceda54d970"
+  integrity sha512-7Ou4cTVfQjsAklFcZl3nMMTvDQ9P3DH9iOMM7q/Ezpu/fM3fDdYofywmBOi7hHbXCxtfvj4MhLlMlMokFrM32Q==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/syntax" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/wire-format" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/syntax" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/wire-format" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.80.2.tgz#da199504eb91cf2513f2c3ac6d0d899d83b74878"
-  integrity sha512-RdquK8byB/uvwEIzUxXL3dX0wnPW6yLooBmrR/QKOyiP0f23DdLLdT2tc7etITkF0NOFjtRApFr3Kwxm2vsHfA==
+"@glimmer/destroyable@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.83.1.tgz#ccf912bf1d07b1ad47eaf7387af1ee742963470f"
+  integrity sha512-QPTKAg0UToCxtcq+AjhdsSZb4HhYn1CTJ2b2/5Qe9InRCPpnwFsMpLKModCLi3VRKtkBGBprxwP/ht5Ma7ok1A==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.2"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/encoder@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.80.2.tgz#30dd5aed6b56362388a2e3ed1069a318c76132ca"
-  integrity sha512-16D7VVy2Riqc2+q/374auzcJ/KpIIxEactAkPlPUgexwzUEuJSPcg1hcEh0medwPQlNn1YkL+5YFPh9zFUgoWQ==
+"@glimmer/encoder@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.83.1.tgz#6c1619462a46980551d6a74f19266230a04eeb59"
+  integrity sha512-PADybj7+khwSyfcvRpmXpYnfZDsSmw/NpSqtCLolAvtnn7uyFfmKirTc89AWi/9iPtbqfe2XtWv3Dz/R5RnAAA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/vm" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/vm" "0.83.1"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.80.2.tgz#aaa389f1055a056d0f911a7e9d101cbcc06f133b"
-  integrity sha512-XskcLaDUoXJYa/RLhkFNZSywzLoeMDQk6UTxvWrCtfE8hKXfeKSKq1FKyYenzB3SMF2ESX5yHOSd/xKBIYVypg==
+"@glimmer/global-context@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66"
+  integrity sha512-OwlgqpbOJU73EjZOZdftab0fKbtdJ4x/QQeJseL9cvaAUiK3+w52M5ONFxD1T/yPBp2Mf7NCYqA/uL8tRbzY2A==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.80.2.tgz#3937610ada436102ff9f92a6ea89e6d4531c1432"
-  integrity sha512-s5xhjoRNwp2fJty8/LpOY2qRLRlevYZFxEDD+Jl44YTRdU68DZJdSYd0cBknp1qDSi+C74zIg7S5cGwS3ulkUw==
+"@glimmer/interfaces@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.83.1.tgz#fb16f5f683ddc55f130887b6141f58c0751350fe"
+  integrity sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -2420,140 +2395,140 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.80.2.tgz#739d9766a21d62965bb322f5c57a7e984af35a1f"
-  integrity sha512-9Fz+R67cqXeDkFBBfag3HNE4bla0Y2BCmzo/VSPzt6dI/2qzWl+MTDyiu85RffAnMZgXuqMUElizcsuq3hWERg==
+"@glimmer/manager@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.83.1.tgz#07e02a40f89cba3eee86b05a2557daa2ef151f6f"
+  integrity sha512-w3JXvtB/S3Bbiv/zIoUP9QmIliIPlmKrF9r4aVeyq24NIE7Dig/R+7/2pkEbqS3nOWizIRswEPqmvWRpMCilmA==
   dependencies:
-    "@glimmer/destroyable" "0.80.2"
+    "@glimmer/destroyable" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/reference" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/validator" "0.80.2"
-
-"@glimmer/node@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.80.2.tgz#651055876ca4c95fc5159f7918da1ea715e222e6"
-  integrity sha512-Urtey5+Jla2sjJSeYnjIYii9pei7bLr/8dPxbVkmJEh8oK3YIcz7YNymFjXxce2Vxdnj1A1KussGzBcK0FP3pA==
-  dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/runtime" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/reference" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
+
+"@glimmer/node@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.83.1.tgz#a9c87ee9196ab317b9221f4cfe3443a83da447d5"
+  integrity sha512-qog6RV0iLenedxBU2ItLiukP9AP9Wtm/eJK/UbzYHVJjE/9ty4IcrIMHPjs56cGdHfRJO7G9E5XcEBy3W0bKZg==
+  dependencies:
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/runtime" "0.83.1"
+    "@glimmer/util" "0.83.1"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.80.2.tgz#be6fe3d0c7e82e1d903a9b594b017236c035018b"
-  integrity sha512-STGh/F8NaYxDVG6rPM97t/A9fnOpU+uK0BQEhRLsx/iGvq8PyE966p4LKyRAbmbuFTLhbZE7E/68Y0k0eWQc6Q==
+"@glimmer/opcode-compiler@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.83.1.tgz#22aa25711326a2d9e02f618ea01788349303d15a"
+  integrity sha512-fkkRRp+Xoe8khGqHg4DNtT6IDgxxozo5ZZiy6eG7YtDAOx2ZGO3K3rZrp7v148T0q+u47Z++aotS5z4pakFK/A==
   dependencies:
-    "@glimmer/encoder" "0.80.2"
+    "@glimmer/encoder" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/reference" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/vm" "0.80.2"
-    "@glimmer/wire-format" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/reference" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/vm" "0.83.1"
+    "@glimmer/wire-format" "0.83.1"
 
-"@glimmer/owner@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.80.2.tgz#34cf1b70ab3f061d8675c941cecaf3fcc319af3b"
-  integrity sha512-jEwaRA0oEEPaJDHs/5MlWm3fEmhN8qp3NJlLYs5Duviks+tEhtmB1zr3Jg+7TAMrJloRo9iadt4TrZzezgRAIQ==
+"@glimmer/owner@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.83.1.tgz#b55261035d8a62dc26c9243e5a521c615dea83d1"
+  integrity sha512-OrYPJsn/BZ3Bij17Nnno+GuBgLh7z31DRaRZEZbPCZ1i6FyZMOI1qqZo3taOeOTUTKxLaNhxG5BqyiJPFwxUyA==
   dependencies:
-    "@glimmer/util" "0.80.2"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/program@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.80.2.tgz#dc1a582c564f735f4021d3eb6c54047c237c264f"
-  integrity sha512-MpPJgeCc/yj9uawG4kqBxzVOuJNky3WB9g3Cm21k0Z+YACdguC2UjXUoA9PvjfrLEj+7eajE0wQ+QTbztOwVtQ==
+"@glimmer/program@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.83.1.tgz#2a589f369ce06a37b7a7ec7fd550db708ddc6ee5"
+  integrity sha512-imQx5s6P69simF8oBtruX9Pn9j+aHt6MiAehTiWq+c8kvSsTZnQlYVHCQWfczDRrOcEOb2FvIuuo7C3+TcsKNQ==
   dependencies:
-    "@glimmer/encoder" "0.80.2"
+    "@glimmer/encoder" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/manager" "0.80.2"
-    "@glimmer/opcode-compiler" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/manager" "0.83.1"
+    "@glimmer/opcode-compiler" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/reference@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.80.2.tgz#db14f64592bd7f505d47527eacc298a1ba7f8ea5"
-  integrity sha512-uXRc912/kAoXgNu2MIWcqARyMUq+h+N82LiNXg0mYo/SYaxT1ag3uVw6nM82ou9ii0lLWKY1fP/4knuSwu0rbA==
+"@glimmer/reference@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.83.1.tgz#0345b95431b5bb19843b308e6311d1ef81e36192"
+  integrity sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.2"
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/validator" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
 
-"@glimmer/runtime@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.80.2.tgz#14895a6d2a0c7214163a21579a7980f8784dfd6c"
-  integrity sha512-7g12Eyo/fQpKICXXW/+cQCA/mYr4ugOrM7YiZSYtAdm1gIQqQFbxnod2iLgFgISDqRHf8cKTsuZw7+yeIwQNIA==
+"@glimmer/runtime@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.83.1.tgz#fe285189b0ec51e00e558204b53ea761690c620f"
+  integrity sha512-el1SxV6SIq3bEB9h0Tz2RWy9AHpEZOjmeyf/cu4sneoDQi3POURJZWf1ptxBs62A0Ae2Rq32SFtuYte/THucQQ==
   dependencies:
-    "@glimmer/destroyable" "0.80.2"
+    "@glimmer/destroyable" "0.83.1"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.80.2"
-    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
+    "@glimmer/interfaces" "0.83.1"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.80.2"
-    "@glimmer/program" "0.80.2"
-    "@glimmer/reference" "0.80.2"
-    "@glimmer/util" "0.80.2"
-    "@glimmer/validator" "0.80.2"
-    "@glimmer/vm" "0.80.2"
-    "@glimmer/wire-format" "0.80.2"
+    "@glimmer/owner" "0.83.1"
+    "@glimmer/program" "0.83.1"
+    "@glimmer/reference" "0.83.1"
+    "@glimmer/util" "0.83.1"
+    "@glimmer/validator" "0.83.1"
+    "@glimmer/vm" "0.83.1"
+    "@glimmer/wire-format" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.80.2.tgz#2123a0c28c9a9d39b42392aaa3df8b7f3706645b"
-  integrity sha512-30H1RtmjCW5miO4codNPWgyO0UOeBaDuc7ohSuG0E85djh444ImfJwlLE/cW6C4pLb38OeG8vEPODnppWV3XUg==
+"@glimmer/syntax@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.83.1.tgz#7e18dd445871c157ba0281f12a4fbf316fa49b41"
+  integrity sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
     "@handlebars/parser" "~2.0.0"
-    simple-html-tokenizer "^0.5.10"
+    simple-html-tokenizer "^0.5.11"
 
-"@glimmer/util@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.80.2.tgz#a1dbb11575255a478c0ba161d521cdbad8c3410d"
-  integrity sha512-GniMILqLJ+dWiwmO/UOBPCqwMYEPYoFW3e/mInUbKn0YBenf/M6hJhnPI7Z11NpObknq3s5nNLkDcmR3gdFmHA==
+"@glimmer/util@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb"
+  integrity sha512-amvjtl9dvrkxsoitXAly9W5NUaLIE3A2J2tWhBWIL1Z6DOFotfX7ytIosOIcPhJLZCtiXPHzMutQRv0G/MSMsA==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/validator@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.80.2.tgz#4ac1faf608913c88d0dab54a37068bbdf6edc62a"
-  integrity sha512-m5K0IxStWHM5vJbJDDXhnr2LGAnC469RclA6jazbtl3fVHEg5njzsQYUIfRTxFpgPK3QEyRJrR6r3PG9RCMnDw==
+"@glimmer/validator@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
+  integrity sha512-LaILSNnQgDHZpaUsfjVndbS1JfVn0xdTlJdFJblPbhoVklOBSReZVekens3EQ6xOr3BC612sRm1hBnEPixOY6A==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.80.2"
+    "@glimmer/global-context" "0.83.1"
 
-"@glimmer/vm-babel-plugins@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.80.2.tgz#6e3b6b0ec06994084b44fca1f19c20fd945df454"
-  integrity sha512-ufdz76tVz3TivS8Bb92n/v6yXNX8zgREDwR3ju45ZO48yWexySllUBFOvwCAmPIoHSQGq8LyIwJGESIJLacr6A==
+"@glimmer/vm-babel-plugins@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.83.1.tgz#5da67e3d84199352bbf0c5bc3f1ce71bf2b2ddfc"
+  integrity sha512-Cz0e/SrOo1gSNA0PXZRYI1WGmlQSAQCpiERBlXjjpwoLgiqx2kvsjfFiCUC/CfpsO6WN6wuPMeTFGJuhSSeL5A==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.80.2.tgz#33f875b0b8e2cc5a6c3d5c1548dbbc333631f6ac"
-  integrity sha512-5dk76zuc2wRR6L2FVHJIX0MQ3AuawXoO2JW/i5nP8wu3r3jXXrvUbtwtR2DCq6lasmyjk5pygtf+DSaawrezqg==
+"@glimmer/vm@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.83.1.tgz#ee9611d8a13e7b5923721258600c6085fe165d0b"
+  integrity sha512-mZguahHZJKWwlcU0n5U7mcpxwcIlogHkecYyOsOPPZe2mnAID/8xmZZcFlRAShA/Z98mo4S0WLE6sY/jJ9M1WA==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
-"@glimmer/wire-format@0.80.2":
-  version "0.80.2"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.80.2.tgz#ae7c7bd2e2a56aca6110b6d7048dae6ac99d340e"
-  integrity sha512-UE7P2AJNs9snKr8LRd4LDZYRmOybYJodUl4vfdntmBeYHiGNWWKpft1tgg5IDdBgmYPvoOEaRQUoIkdMhMT6aA==
+"@glimmer/wire-format@0.83.1":
+  version "0.83.1"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.83.1.tgz#a36f0b80d9cf9f57498bfea5ddbf6d118f96475d"
+  integrity sha512-2WZ7c7tqHXDrznnFFguw7QJOgUUglnHEHzpSqPFvw1S46NecFMG0v9Q7LQRjeCKH+cwExeD6LbbF2dpKIhoJcg==
   dependencies:
-    "@glimmer/interfaces" "0.80.2"
-    "@glimmer/util" "0.80.2"
+    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/util" "0.83.1"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
@@ -3064,16 +3039,16 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 
-array-includes@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
-  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
+array-includes@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
+  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.2"
+    es-abstract "^1.19.1"
     get-intrinsic "^1.1.1"
-    is-string "^1.0.5"
+    is-string "^1.0.7"
 
 array-to-error@^1.0.0:
   version "1.1.1"
@@ -3097,14 +3072,14 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="
 
-array.prototype.flat@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
-  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
+array.prototype.flat@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
+  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
+    es-abstract "^1.19.0"
 
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
@@ -5603,10 +5578,10 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.0.tgz#0a6e6682268e7f5bdc1c740b33ce2578d64538d3"
-  integrity sha512-oWPrF+7P1nGv/rw9oIInwdkmI1qediEJSvVfHFryBd8mWllCKB5tke3aKyf51J6chgyKmi6mODqdnin2yb88Nw==
+es-abstract@^1.18.2:
+  version "1.18.6"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
+  integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
@@ -5619,9 +5594,7 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
     is-callable "^1.2.4"
     is-negative-zero "^2.0.1"
     is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
     object-inspect "^1.11.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
@@ -5629,10 +5602,10 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
-es-abstract@^1.18.2:
-  version "1.18.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
-  integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
+es-abstract@^1.19.0, es-abstract@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
+  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
@@ -5645,7 +5618,9 @@ es-abstract@^1.18.2:
     is-callable "^1.2.4"
     is-negative-zero "^2.0.1"
     is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.1"
     is-string "^1.0.7"
+    is-weakref "^1.0.1"
     object-inspect "^1.11.0"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
@@ -5778,12 +5753,13 @@ eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-module-utils@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"
-  integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==
+eslint-module-utils@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
+  integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
   dependencies:
     debug "^3.2.7"
+    find-up "^2.1.0"
     pkg-dir "^2.0.0"
 
 eslint-plugin-disable-features@^0.1.3:
@@ -5809,24 +5785,22 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.24.2:
-  version "2.24.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da"
-  integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q==
+eslint-plugin-import@^2.25.3:
+  version "2.25.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766"
+  integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==
   dependencies:
-    array-includes "^3.1.3"
-    array.prototype.flat "^1.2.4"
+    array-includes "^3.1.4"
+    array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.6.2"
-    find-up "^2.0.0"
+    eslint-module-utils "^2.7.1"
     has "^1.0.3"
-    is-core-module "^2.6.0"
+    is-core-module "^2.8.0"
+    is-glob "^4.0.3"
     minimatch "^3.0.4"
-    object.values "^1.1.4"
-    pkg-up "^2.0.0"
-    read-pkg-up "^3.0.0"
+    object.values "^1.1.5"
     resolve "^1.20.0"
     tsconfig-paths "^3.11.0"
 
@@ -7431,10 +7405,10 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.2.0, is-core-module@^2.6.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.7.0.tgz#3c0ef7d31b4acfc574f80c58409d568a836848e3"
-  integrity sha512-ByY+tjCciCr+9nLryBYcSD50EOGWt95c7tIsKTG1J2ixKKXPvF7Ej3AVd+UfDydAJom3biBGDBALaO79ktwgEQ==
+is-core-module@^2.2.0, is-core-module@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
+  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
   dependencies:
     has "^1.0.3"
 
@@ -7526,10 +7500,10 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -9182,14 +9156,14 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
-  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
+object.values@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
+  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.2"
+    es-abstract "^1.19.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
@@ -10558,10 +10532,10 @@ simple-dom@^1.4.0:
     "@simple-dom/serializer" "^1.4.0"
     "@simple-dom/void-map" "^1.4.0"
 
-simple-html-tokenizer@^0.5.10:
-  version "0.5.10"
-  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.10.tgz#0843e4f00c9677f1c81e3dfeefcee0a4aca8e5d0"
-  integrity sha512-1DHMUmvUOGuUZ9/+cX/+hOhWhRD5dEw6lodn8WuV+T+cQ31hhBcCu1dcDsNotowi4mMaNhrLyKoS+DtB81HdDA==
+simple-html-tokenizer@^0.5.11:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.5.11.tgz#4c5186083c164ba22a7b477b7687ac056ad6b1d9"
+  integrity sha512-C2WEK/Z3HoSFbYq8tI7ni3eOo/NneSPRoPpcM7WdLjFOArFuyXEjAoCdOC3DgMfRyziZQ1hCNR4mrNdWEvD0og==
 
 slash@^3.0.0:
   version "3.0.0"

From 41438a8a5e26261239565bbcd1459d1b6a71f1b8 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 10 Nov 2021 15:30:33 -0500
Subject: [PATCH 0715/1405] Add v4.0.0-beta.9 to CHANGELOG

(cherry picked from commit f1008843f47707f7b00d116773468d683ffe90f4)
---
 CHANGELOG.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27072ed91c7..c983e3e468e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Ember Changelog
 
+### v4.0.0-beta.9 (November 20, 2021)
+
+- [#19749](https://github.com/emberjs/ember.js/pull/19749) [CLEANUP] Remove `deprecate-router-events` support code
+- [#19762](https://github.com/emberjs/ember.js/pull/19762) [CLEANUP] Update GlimmerVM to 0.81
+  - removes deprecation of mutations during helper compute 
+  - removes deprecation of mutations during unknownProperty
+  - `@glimmer/integration-tests`, `@glimmer/manager`, `@glimmer/validator`
+    * [#1330](https://github.com/glimmerjs/glimmer-vm/pull/1330) Remove deprecated support for mutation after consumption during certain manager hooks ([@snewcomer](https://github.com/snewcomer))
+  - `@glimmer/manager`
+    * [#1328](https://github.com/glimmerjs/glimmer-vm/pull/1328) Remove deprecated Component Manager version 3.4 ([@nlfurniss](https://github.com/nlfurniss))
+  - `@glimmer/integration-tests`, `@glimmer/manager`
+    * [#1329](https://github.com/glimmerjs/glimmer-vm/pull/1329) Remove deprecated Modifier Manager version 3.13 ([@nlfurniss](https://github.com/nlfurniss))
+- [#19806](https://github.com/emberjs/ember.js/pull/19806) [CLEANUP] Drop export of built-ins, remove legacy components 
+
 ### v4.0.0-beta.8 (November 5, 2021)
 
 - [#19823](https://github.com/emberjs/ember.js/pull/19823) / [#19828](https://github.com/emberjs/ember.js/pull/19828) [BUGFIX] Fix deprecation `until` and link for Component.reopenClass and Component.reopen

From 88b354e9be1cfa6f277a17d6b04d7648b994f924 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 10 Nov 2021 15:36:17 -0500
Subject: [PATCH 0716/1405] Correct date of beta in changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c983e3e468e..15a74f71231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Ember Changelog
 
-### v4.0.0-beta.9 (November 20, 2021)
+### v4.0.0-beta.9 (November 10, 2021)
 
 - [#19749](https://github.com/emberjs/ember.js/pull/19749) [CLEANUP] Remove `deprecate-router-events` support code
 - [#19762](https://github.com/emberjs/ember.js/pull/19762) [CLEANUP] Update GlimmerVM to 0.81

From cc48e64e44f9a2bec7426e16b31aa89dfb2c3d55 Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Fri, 12 Nov 2021 11:50:32 +0100
Subject: [PATCH 0717/1405] [FEATURE] Enable `RouterService#refresh` method

---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index d4fdf31769f..1fe89d6519e 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -19,7 +19,7 @@ export const DEFAULT_FEATURES = {
   EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
-  EMBER_ROUTING_ROUTER_SERVICE_REFRESH: null,
+  EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
   EMBER_CACHED: true,
 };
 

From a9aedeadef809b92c9ee92c22ba04f31fc8dd774 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 11 Nov 2021 20:06:33 -0500
Subject: [PATCH 0718/1405] [CLEANUP beta] Remove deprecated array observers

Part of https://github.com/emberjs/ember.js/issues/19617

* Remove `someArray.addArrayObserver`
  https://github.com/emberjs/ember.js/pull/19833/files#diff-8116921433c6e1664250d5735e4f9daeb6ea9e00940783e0c4db7adf88aa8772L532
* Remove `someArray.removeArrayObserver`
  https://github.com/emberjs/ember.js/pull/19833/files#diff-8116921433c6e1664250d5735e4f9daeb6ea9e00940783e0c4db7adf88aa8772L548
* Remove `someArray.hasArrayObservers`
  https://github.com/emberjs/ember.js/pull/19833/files#diff-8116921433c6e1664250d5735e4f9daeb6ea9e00940783e0c4db7adf88aa8772L571
* Remove `someArray.arrayContentWillChange`
  https://github.com/emberjs/ember.js/pull/19833/files#diff-8116921433c6e1664250d5735e4f9daeb6ea9e00940783e0c4db7adf88aa8772L642
* Remove `someArray.arrayContentDidChange`
  https://github.com/emberjs/ember.js/pull/19833/files#diff-8116921433c6e1664250d5735e4f9daeb6ea9e00940783e0c4db7adf88aa8772L670
  (also at
  https://github.com/emberjs/ember.js/pull/19833/files#diff-79a0015ca0e6a6c3661d9119f4caf6b26b111af6bb0e5bb784558631c599a81cL357)
* On the internal version of `addArrayObserver`, remove the optionality
  of `willChange` and `didChange` arguments to name the hooks. In
  framework code (and now in test) these are always provided.
* Retain basically all the test coverage of array observers since they
  remain used by `ArrayProxy` internally (and through that interface, in
  Ember Data).

Co-authored-by: Matthew Beale <matt.beale@madhatted.com>
---
 packages/@ember/-internals/metal/lib/array.ts |  83 +++----
 .../-internals/runtime/lib/mixins/array.js    | 203 +-----------------
 .../runtime/lib/system/array_proxy.js         |  19 +-
 .../-internals/runtime/tests/helpers/array.js |  10 +-
 .../runtime/tests/mixins/array_test.js        |  30 +--
 .../tests/mutable-array/replace-test.js       |   4 +-
 .../system/array_proxy/array_observer_test.js |  55 -----
 .../-internals/utils/lib/ember-array.ts       |   1 -
 tests/docs/expected.js                        |   5 -
 9 files changed, 50 insertions(+), 360 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js

diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index 92043a6128e..fca4a400659 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -1,13 +1,11 @@
-import { EmberArray, getDebugName } from '@ember/-internals/utils';
-import { deprecate } from '@ember/debug';
+import { EmberArray } from '@ember/-internals/utils';
 import { arrayContentDidChange, arrayContentWillChange } from './array_events';
 import { addListener, removeListener } from './events';
-import { notifyPropertyChange } from './property_events';
 
 const EMPTY_ARRAY = Object.freeze([]);
 
-interface ObjectHasArrayObservers {
-  hasArrayObservers?: boolean;
+interface ObservedObject<T> extends EmberArray<T> {
+  _revalidate?: () => void;
 }
 
 export function objectAt<T>(array: T[] | EmberArray<T>, index: number): T | undefined {
@@ -58,34 +56,33 @@ export function replaceInNativeArray<T>(
 }
 
 interface ArrayObserverOptions {
-  willChange?: string;
-  didChange?: string;
+  willChange: string;
+  didChange: string;
 }
 
-type Operation = (
-  obj: ObjectHasArrayObservers,
+type Operation<T> = (
+  obj: ObservedObject<T>,
   eventName: string,
   target: object | Function | null,
   callbackName: string
 ) => void;
 
-function arrayObserversHelper(
-  obj: ObjectHasArrayObservers,
+function arrayObserversHelper<T>(
+  obj: ObservedObject<T>,
   target: object | Function | null,
-  opts: ArrayObserverOptions | undefined,
-  operation: Operation,
-  notify: boolean
-): ObjectHasArrayObservers {
-  let willChange = (opts && opts.willChange) || 'arrayWillChange';
-  let didChange = (opts && opts.didChange) || 'arrayDidChange';
-  let hasObservers = obj.hasArrayObservers;
+  opts: ArrayObserverOptions,
+  operation: Operation<T>
+): ObservedObject<T> {
+  let { willChange, didChange } = opts;
 
   operation(obj, '@array:before', target, willChange);
   operation(obj, '@array:change', target, didChange);
 
-  if (hasObservers === notify) {
-    notifyPropertyChange(obj, 'hasArrayObservers');
-  }
+  /*
+   * Array proxies have a `_revalidate` method which must be called to set
+   * up their internal array observation systems.
+   */
+  obj._revalidate?.();
 
   return obj;
 }
@@ -93,47 +90,15 @@ function arrayObserversHelper(
 export function addArrayObserver<T>(
   array: EmberArray<T>,
   target: object | Function | null,
-  opts?: ArrayObserverOptions | undefined,
-  suppress = false
-): ObjectHasArrayObservers {
-  deprecate(
-    `Array observers have been deprecated. Added an array observer to ${getDebugName?.(array)}.`,
-    suppress,
-    {
-      id: 'array-observers',
-      url: 'https://deprecations.emberjs.com/v3.x#toc_array-observers',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.26.0-beta.1',
-      },
-    }
-  );
-
-  return arrayObserversHelper(array, target, opts, addListener, false);
+  opts: ArrayObserverOptions
+): ObservedObject<T> {
+  return arrayObserversHelper(array, target, opts, addListener);
 }
 
 export function removeArrayObserver<T>(
   array: EmberArray<T>,
   target: object | Function | null,
-  opts?: ArrayObserverOptions | undefined,
-  suppress = false
-): ObjectHasArrayObservers {
-  deprecate(
-    `Array observers have been deprecated. Removed an array observer from ${getDebugName?.(
-      array
-    )}.`,
-    suppress,
-    {
-      id: 'array-observers',
-      url: 'https://deprecations.emberjs.com/v3.x#toc_array-observers',
-      until: '4.0.0',
-      for: 'ember-source',
-      since: {
-        enabled: '3.26.0-beta.1',
-      },
-    }
-  );
-
-  return arrayObserversHelper(array, target, opts, removeListener, true);
+  opts: ArrayObserverOptions
+): ObservedObject<T> {
+  return arrayObserversHelper(array, target, opts, removeListener);
 }
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index d934edc8ba9..c8caf748b2e 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -12,14 +12,8 @@ import {
   replace,
   computed,
   Mixin,
-  hasListeners,
   beginPropertyChanges,
   endPropertyChanges,
-  addArrayObserver,
-  removeArrayObserver,
-  arrayContentWillChange,
-  arrayContentDidChange,
-  nativeDescDecorator as descriptor,
 } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 import Enumerable from './enumerable';
@@ -476,201 +470,6 @@ const ArrayMixin = Mixin.create(Enumerable, {
     return -1;
   },
 
-  // ..........................................................
-  // ARRAY OBSERVERS
-  //
-
-  /**
-    Adds an array observer to the receiving array. The array observer object
-    normally must implement two methods:
-
-    * `willChange(observedObj, start, removeCount, addCount)` - This method will be
-      called just before the array is modified.
-    * `didChange(observedObj, start, removeCount, addCount)` - This method will be
-      called just after the array is modified.
-
-    Both callbacks will be passed the observed object, starting index of the
-    change as well as a count of the items to be removed and added. You can use
-    these callbacks to optionally inspect the array during the change, clear
-    caches, or do any other bookkeeping necessary.
-
-    In addition to passing a target, you can also include an options hash
-    which you can use to override the method names that will be invoked on the
-    target.
-
-    @method addArrayObserver
-    @param {Object} target The observer object.
-    @param {Object} opts Optional hash of configuration options including
-      `willChange` and `didChange` option.
-    @return {EmberArray} receiver
-    @public
-    @example
-        import Service from '@ember/service';
-
-        export default Service.extend({
-          data: Ember.A(),
-
-          init() {
-            this._super(...arguments);
-
-            this.data.addArrayObserver(this, {
-              willChange: 'dataWillChange',
-              didChange: 'dataDidChange'
-            });
-          },
-
-          dataWillChange(array, start, removeCount, addCount) {
-            console.log('array will change', array, start, removeCount, addCount);
-          },
-
-          dataDidChange(array, start, removeCount, addCount) {
-            console.log('array did change', array, start, removeCount, addCount);
-          }
-        });
-  */
-
-  addArrayObserver(target, opts) {
-    return addArrayObserver(this, target, opts);
-  },
-
-  /**
-    Removes an array observer from the object if the observer is current
-    registered. Calling this method multiple times with the same object will
-    have no effect.
-
-    @method removeArrayObserver
-    @param {Object} target The object observing the array.
-    @param {Object} opts Optional hash of configuration options including
-      `willChange` and `didChange` option.
-    @return {EmberArray} receiver
-    @public
-  */
-  removeArrayObserver(target, opts) {
-    return removeArrayObserver(this, target, opts);
-  },
-
-  /**
-    Becomes true whenever the array currently has observers watching changes
-    on the array.
-
-    ```javascript
-    let arr = [1, 2, 3, 4, 5];
-    arr.hasArrayObservers; // false
-
-    arr.addArrayObserver(this, {
-      willChange() {
-        console.log('willChange');
-      }
-    });
-    arr.hasArrayObservers; // true
-    ```
-
-    @property {Boolean} hasArrayObservers
-    @public
-  */
-  hasArrayObservers: descriptor({
-    configurable: true,
-    enumerable: false,
-    get() {
-      return hasListeners(this, '@array:change') || hasListeners(this, '@array:before');
-    },
-  }),
-
-  /**
-    If you are implementing an object that supports `EmberArray`, call this
-    method just before the array content changes to notify any observers and
-    invalidate any related properties. Pass the starting index of the change
-    as well as a delta of the amounts to change.
-
-    ```app/components/show-post.js
-    import Component from '@ember/component';
-    import EmberObject from '@ember/object';
-
-    const Post = EmberObject.extend({
-      body: '',
-      save() {}
-    })
-
-    export default Component.extend({
-      attemptsToModify: 0,
-      successfulModifications: 0,
-      posts: null,
-
-      init() {
-        this._super(...arguments);
-
-        this.posts = [1, 2, 3].map(i => Post.create({ body: i }));
-        this.posts.addArrayObserver(this, {
-          willChange() {
-            this.incrementProperty('attemptsToModify');
-          },
-          didChange() {
-            this.incrementProperty('successfulModifications');
-          }
-        });
-      },
-
-      actions: {
-        editPost(post, newContent) {
-          let oldContent = post.body,
-              postIndex = this.posts.indexOf(post);
-
-          this.posts.arrayContentWillChange(postIndex, 0, 0); // attemptsToModify = 1
-          post.set('body', newContent);
-
-          post.save()
-            .then(response => {
-              this.posts.arrayContentDidChange(postIndex, 0, 0); // successfulModifications = 1
-            })
-            .catch(error => {
-              post.set('body', oldContent);
-            })
-        }
-      }
-    });
-    ```
-
-    @method arrayContentWillChange
-    @param {Number} startIdx The starting index in the array that will change.
-    @param {Number} removeAmt The number of items that will be removed. If you
-      pass `null` assumes 0
-    @param {Number} addAmt The number of items that will be added. If you
-      pass `null` assumes 0.
-    @return {EmberArray} receiver
-    @public
-  */
-  arrayContentWillChange(startIdx, removeAmt, addAmt) {
-    return arrayContentWillChange(this, startIdx, removeAmt, addAmt);
-  },
-
-  /**
-    If you are implementing an object that supports `EmberArray`, call this
-    method just after the array content changes to notify any observers and
-    invalidate any related properties. Pass the starting index of the change
-    as well as a delta of the amounts to change.
-
-    ```javascript
-    let arr = [1, 2, 3, 4, 5];
-
-    arr.copyWithin(-2); // [1, 2, 3, 1, 2]
-    // arr.lastObject = 5
-    arr.arrayContentDidChange(3, 2, 2);
-    // arr.lastObject = 2
-    ```
-
-    @method arrayContentDidChange
-    @param {Number} startIdx The starting index in the array that did change.
-    @param {Number} removeAmt The number of items that were removed. If you
-      pass `null` assumes 0
-    @param {Number} addAmt The number of items that were added. If you
-      pass `null` assumes 0.
-    @return {EmberArray} receiver
-    @public
-  */
-  arrayContentDidChange(startIdx, removeAmt, addAmt) {
-    return arrayContentDidChange(this, startIdx, removeAmt, addAmt);
-  },
-
   /**
     Iterates through the array, calling the passed function on each
     item. This method corresponds to the `forEach()` method defined in
@@ -1551,7 +1350,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
 
     This is one of the primitives you must implement to support `Array`.
     You should replace amt objects started at idx with the objects in the
-    passed array. You should also call `this.arrayContentDidChange()`
+    passed array.
 
     Note that this method is expected to validate the type(s) of objects that it expects.
 
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
index 8fed955c0a9..7c76d928454 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.js
@@ -11,6 +11,7 @@ import {
   removeArrayObserver,
   replace,
   arrayContentDidChange,
+  arrayContentWillChange,
   tagForProperty,
 } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
@@ -256,11 +257,11 @@ export default class ArrayProxy extends EmberObject {
     let newLength = arrangedContent ? get(arrangedContent, 'length') : 0;
 
     this._removeArrangedContentArrayObserver();
-    this.arrayContentWillChange(0, oldLength, newLength);
+    arrayContentWillChange(this, 0, oldLength, newLength);
 
     this._invalidate();
 
-    this.arrayContentDidChange(0, oldLength, newLength);
+    arrayContentDidChange(this, 0, oldLength, newLength, false);
     this._addArrangedContentArrayObserver(arrangedContent);
   }
 
@@ -272,7 +273,7 @@ export default class ArrayProxy extends EmberObject {
         isArray(arrangedContent) || arrangedContent.isDestroyed
       );
 
-      addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING, true);
+      addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING);
 
       this._arrangedContent = arrangedContent;
     }
@@ -280,14 +281,14 @@ export default class ArrayProxy extends EmberObject {
 
   _removeArrangedContentArrayObserver() {
     if (this._arrangedContent) {
-      removeArrayObserver(this._arrangedContent, this, ARRAY_OBSERVER_MAPPING, true);
+      removeArrayObserver(this._arrangedContent, this, ARRAY_OBSERVER_MAPPING);
     }
   }
 
   _arrangedContentArrayWillChange() {}
 
   _arrangedContentArrayDidChange(proxy, idx, removedCnt, addedCnt) {
-    this.arrayContentWillChange(idx, removedCnt, addedCnt);
+    arrayContentWillChange(this, idx, removedCnt, addedCnt);
 
     let dirtyIndex = idx;
     if (dirtyIndex < 0) {
@@ -301,7 +302,7 @@ export default class ArrayProxy extends EmberObject {
 
     this._lengthDirty = true;
 
-    this.arrayContentDidChange(idx, removedCnt, addedCnt);
+    arrayContentDidChange(this, idx, removedCnt, addedCnt, false);
   }
 
   _invalidate() {
@@ -351,10 +352,4 @@ ArrayProxy.reopen(MutableArray, {
     @public
   */
   arrangedContent: alias('content'),
-
-  // Array proxies don't need to notify when they change since their `[]` tag is
-  // already dependent on the `[]` tag of `arrangedContent`
-  arrayContentDidChange(startIdx, removeAmt, addAmt) {
-    return arrayContentDidChange(this, startIdx, removeAmt, addAmt, false);
-  },
 });
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index 0f5f5008d38..d7181c94813 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -61,12 +61,18 @@ const ArrayTestsObserverClass = EmberObject.extend({
   },
 
   observeArray(obj) {
-    addArrayObserver(obj, this);
+    addArrayObserver(obj, this, {
+      willChange: 'arrayWillChange',
+      didChange: 'arrayDidChange',
+    });
     return this;
   },
 
   stopObserveArray(obj) {
-    removeArrayObserver(obj, this);
+    removeArrayObserver(obj, this, {
+      willChange: 'arrayWillChange',
+      didChange: 'arrayDidChange',
+    });
     return this;
   },
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index 49b158919ae..c72c1cfe94b 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -193,11 +193,9 @@ moduleFor(
 //
 
 moduleFor(
-  'notify array observers',
+  'notify array observers (internal)',
   class extends AbstractTestCase {
     beforeEach(assert) {
-      expectDeprecation(/Array observers have been deprecated/);
-
       obj = DummyArray.create();
 
       observer = EmberObject.extend({
@@ -215,7 +213,10 @@ moduleFor(
         _after: null,
       });
 
-      addArrayObserver(obj, observer);
+      addArrayObserver(obj, observer, {
+        willChange: 'arrayWillChange',
+        didChange: 'arrayDidChange',
+      });
     }
 
     afterEach() {
@@ -248,29 +249,16 @@ moduleFor(
     }
 
     ['@test removing array observer should disable'](assert) {
-      removeArrayObserver(obj, observer);
+      removeArrayObserver(obj, observer, {
+        willChange: 'arrayWillChange',
+        didChange: 'arrayDidChange',
+      });
       arrayContentWillChange(obj);
       assert.deepEqual(observer._before, null);
 
       arrayContentDidChange(obj);
       assert.deepEqual(observer._after, null);
     }
-
-    ['@test hasArrayObservers should work'](assert) {
-      assert.equal(
-        obj.hasArrayObservers,
-        true,
-        'correctly shows it has an array observer when one exists'
-      );
-
-      removeArrayObserver(obj, observer);
-
-      assert.equal(
-        obj.hasArrayObservers,
-        false,
-        'correctly shows it has an array observer when one exists'
-      );
-    }
   }
 );
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
index afa44afd6f2..7b72f9591ba 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/replace-test.js
@@ -240,9 +240,7 @@ class ReplaceTests extends AbstractTestCase {
     obj.destroy();
   }
 
-  async '@test Adding object should notify array observer'() {
-    expectDeprecation(/Array observers have been deprecated/);
-
+  async '@test Adding object should notify array observer (internal)'() {
     let fixtures = newFixture(4);
     let obj = this.newObject(fixtures);
     let observer = this.newObserver(obj).observeArray(obj);
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js
deleted file mode 100644
index 8515d192521..00000000000
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/array_observer_test.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import { set } from '@ember/-internals/metal';
-import ArrayProxy from '../../../lib/system/array_proxy';
-import { A } from '../../../lib/mixins/array';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  'ArrayProxy - array observers',
-  class extends AbstractTestCase {
-    ['@test mutating content'](assert) {
-      expectDeprecation(/Array observers have been deprecated/);
-
-      assert.expect(5);
-
-      let content = A(['x', 'y', 'z']);
-      let proxy = ArrayProxy.create({ content });
-
-      proxy.addArrayObserver({
-        arrayWillChange(proxy, startIndex, removeCount, addCount) {
-          assert.deepEqual([startIndex, removeCount, addCount], [1, 1, 3]);
-          assert.deepEqual(proxy.toArray(), ['x', 'y', 'z']);
-        },
-        arrayDidChange(proxy, startIndex, removeCount, addCount) {
-          assert.deepEqual([startIndex, removeCount, addCount], [1, 1, 3]);
-          assert.deepEqual(proxy.toArray(), ['x', 'a', 'b', 'c', 'z']);
-        },
-      });
-
-      proxy.toArray();
-      content.replace(1, 1, ['a', 'b', 'c']);
-    }
-
-    ['@test assigning content'](assert) {
-      expectDeprecation(/Array observers have been deprecated/);
-
-      assert.expect(5);
-
-      let content = A(['x', 'y', 'z']);
-      let proxy = ArrayProxy.create({ content });
-
-      proxy.addArrayObserver({
-        arrayWillChange(proxy, startIndex, removeCount, addCount) {
-          assert.deepEqual([startIndex, removeCount, addCount], [0, 3, 5]);
-          assert.deepEqual(proxy.toArray(), ['x', 'y', 'z']);
-        },
-        arrayDidChange(proxy, startIndex, removeCount, addCount) {
-          assert.deepEqual([startIndex, removeCount, addCount], [0, 3, 5]);
-          assert.deepEqual(proxy.toArray(), ['a', 'b', 'c', 'd', 'e']);
-        },
-      });
-
-      proxy.toArray();
-      set(proxy, 'content', A(['a', 'b', 'c', 'd', 'e']));
-    }
-  }
-);
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index f6b3d68a2b5..b81e3c63e0e 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -4,7 +4,6 @@ const EMBER_ARRAYS = new _WeakSet();
 
 export interface EmberArray<T> {
   length: number;
-  hasArrayObservers?: boolean;
   objectAt(index: number): T | undefined;
   replace(start: number, deleteCount: number, items: T[]): void;
   splice(start: number, deleteCount: number, ...items: T[]): void;
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 54ac5a51513..961c10486de 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -58,7 +58,6 @@ module.exports = {
     'actions',
     'activate',
     'adapter',
-    'addArrayObserver',
     'addListener',
     'addObject',
     'addObjects',
@@ -77,8 +76,6 @@ module.exports = {
     'ariaRole',
     'arrangedContent',
     'array',
-    'arrayContentDidChange',
-    'arrayContentWillChange',
     'assert',
     'assertDestroyablesDestroyed',
     'assign',
@@ -248,7 +245,6 @@ module.exports = {
     'handleEvent',
     'handleURL',
     'has',
-    'hasArrayObservers',
     'has-block',
     'has-block-params',
     'hash',
@@ -418,7 +414,6 @@ module.exports = {
     'reject',
     'rejectBy',
     'releaseMethods',
-    'removeArrayObserver',
     'removeAt',
     'removeListener',
     'removeObject',

From 34950ebfd6ac6ba531ad8b3eb2593ca8f0444968 Mon Sep 17 00:00:00 2001
From: Sergey Astapov <sergeastapov@gmail.com>
Date: Fri, 12 Nov 2021 12:48:39 -0500
Subject: [PATCH 0719/1405] [DOC] Update destroyables docs to include
 super(...args) in examples

---
 packages/@ember/destroyable/index.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/destroyable/index.ts b/packages/@ember/destroyable/index.ts
index c3470237798..39d34cc89fe 100644
--- a/packages/@ember/destroyable/index.ts
+++ b/packages/@ember/destroyable/index.ts
@@ -34,7 +34,9 @@ import {
 
   ```js
   class CustomSelect extends Component {
-    constructor() {
+    constructor(...args) {
+      super(...args);
+
       // obj is now a child of the component. When the component is destroyed,
       // obj will also be destroyed, and have all of its destructors triggered.
       this.obj = associateDestroyableChild(this, {});
@@ -165,12 +167,15 @@ import {
   parent is destroyed, the destructor function will be called.
 
   ```js
+  import Component from '@glimmer/component';
   import { registerDestructor } from '@ember/destroyable';
 
   class Modal extends Component {
     @service resize;
 
-    constructor() {
+    constructor(...args) {
+      super(...args);
+
       this.resize.register(this, this.layout);
 
       registerDestructor(this, () => this.resize.unregister(this));
@@ -187,6 +192,7 @@ import {
   than creating a closure function per destroyable.
 
   ```js
+  import Component from '@glimmer/component';
   import { registerDestructor } from '@ember/destroyable';
 
   function unregisterResize(instance) {
@@ -196,7 +202,9 @@ import {
   class Modal extends Component {
     @service resize;
 
-    constructor() {
+    constructor(...args) {
+      super(...args);
+
       this.resize.register(this, this.layout);
 
       registerDestructor(this, unregisterResize);
@@ -223,12 +231,15 @@ export function registerDestructor<T extends object>(
   from the destroyable.
 
   ```js
+  import Component from '@glimmer/component';
   import { registerDestructor, unregisterDestructor } from '@ember/destroyable';
 
   class Modal extends Component {
     @service modals;
 
-    constructor() {
+    constructor(...args) {
+      super(...args);
+
       this.modals.add(this);
 
       this.modalDestructor = registerDestructor(this, () => this.modals.remove(this));

From a58356fa7981e73b077d5c9b98acde5c24c5803d Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 12 Nov 2021 20:08:41 +0100
Subject: [PATCH 0720/1405] [CLEANUP beta] Turn
 `template-only-glimmer-components` deprecation into an error

---
 lib/index.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index 517ed26abbe..dbb38692d97 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -10,6 +10,7 @@ const injectBabelHelpers = require('./transforms/inject-babel-helpers').injectBa
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:addon');
 const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
 const Overrides = require('./overrides');
+const SilentError = require('silent-error');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -115,7 +116,6 @@ module.exports = {
           `You have configured your application to indicate that it is using the 'octane' edition (via \`setEdition('octane')\`), but the appropriate Octane features were not enabled:\n`
         );
 
-        const SilentError = require('silent-error');
         throw new SilentError(message.join('\n\t'));
       }
     } else {
@@ -136,8 +136,8 @@ module.exports = {
         optionalFeaturesMissing ||
         !optionalFeatures.isFeatureEnabled('template-only-glimmer-components')
       ) {
-        this.ui.writeWarnLine(
-          'Setting the `template-only-glimmer-components` optional feature flag to `false`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `true`. You can also run `npx @ember/octanify` to do this. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-template-only-glimmer-components'
+        throw new SilentError(
+          'Setting the `template-only-glimmer-components` optional feature flag to `false`, or not providing a setting at all, was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `true`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-template-only-glimmer-components'
         );
       }
     }
@@ -148,7 +148,6 @@ module.exports = {
       typeof optionalFeatures.isFeatureExplicitlySet === 'function' &&
       optionalFeatures.isFeatureExplicitlySet('jquery-integration')
     ) {
-      const SilentError = require('silent-error');
       throw new SilentError(
         'Setting the `jquery-integration` optional feature flag to `true` was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `false`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-jquery-integration'
       );

From 43d323399ce63bf09ea7235490adb61242e3458d Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Sun, 14 Nov 2021 15:10:12 -0500
Subject: [PATCH 0721/1405] [CLEANUP beta] Inelegant throw for
 arg-less-paren-less helper

---
 .../-internals/glimmer/lib/environment.ts     | 18 +++++------
 .../integration/helpers/custom-helper-test.js | 32 ++++++++-----------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 35700fd1a2e..4d6bc87c2d2 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -66,6 +66,15 @@ setGlobalContext({
     if (DEBUG) {
       let { id } = options;
 
+      if (id === 'argument-less-helper-paren-less-invocation') {
+        throw new Error(
+          `A resolved helper cannot be passed as a named argument as the syntax is ` +
+            `ambiguously a pass-by-reference or invocation. Use the ` +
+            `\`{{helper 'foo-helper}}\` helper to pass by reference or explicitly ` +
+            `invoke the helper with parens: \`{{(fooHelper)}}\`.`
+        );
+      }
+
       let override = VM_DEPRECATION_OVERRIDES.filter((o) => o.id === id)[0];
 
       if (!override) throw new Error(`deprecation override for ${id} not found`);
@@ -98,15 +107,6 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
   disabled?: boolean;
   message?: string;
 })[] = [
-  {
-    id: 'argument-less-helper-paren-less-invocation',
-    url: 'https://deprecations.emberjs.com/v3.x#toc_argument-less-helper-paren-less-invocation',
-    until: '4.0.0',
-    for: 'ember-source',
-    since: {
-      enabled: '3.27.0',
-    },
-  },
   {
     id: 'setting-on-hash',
     until: '4.4.0',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 6043edf5ef8..3d02c8a6b35 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -870,25 +870,21 @@ if (DEBUG) {
         this.registerHelper('is-string', ([value]) => typeof value === 'string');
       }
 
-      ['@test invoking an argument-less helper without parens in named argument position is deprecated']() {
+      ['@test invoking an argument-less helper without parens in named argument position throws'](
+        assert
+      ) {
         this.registerHelper('foo', () => 'Hello, world!');
 
-        expectDeprecation(
+        assert.throws(
           () => this.render('<Bar @content={{foo}} />', { foo: 'Not it!' }),
-          new RegExp(
-            /The `foo` helper was used in the `-top-level` template as /.source +
-              /`@content={{foo}}`\. This is ambigious between wanting the `@content` /.source +
-              /argument to be the `foo` helper itself, or the result of invoking the /.source +
-              /`foo` helper \(current behavior\)\. This implicit invocation behavior /.source +
-              /has been deprecated\./.source
-          )
+          `A resolved helper cannot be passed as a named argument as the syntax is ` +
+            `ambiguously a pass-by-reference or invocation. Use the ` +
+            `\`{{helper 'foo-helper}}\` helper to pass by reference or explicitly ` +
+            `invoke the helper with parens: \`{{(fooHelper)}}\`.`
         );
-
-        this.assertText('[true][Hello, world!]');
-        this.assertStableRerender();
       }
 
-      ['@test invoking an argument-less helper with parens in named argument position is not deprecated']() {
+      ['@test invoking an argument-less helper with parens in named argument position']() {
         this.registerHelper('foo', () => 'Hello, world!');
 
         expectNoDeprecation(() => this.render('<Bar @content={{(foo)}} />', { foo: 'Not it!' }));
@@ -897,7 +893,7 @@ if (DEBUG) {
         this.assertStableRerender();
       }
 
-      ['@test invoking an argument-less helper with quotes in named argument position is not deprecated']() {
+      ['@test invoking an argument-less helper with quotes in named argument position']() {
         this.registerHelper('foo', () => 'Hello, world!');
 
         expectNoDeprecation(() => this.render('<Bar @content="{{foo}}" />', { foo: 'Not it!' }));
@@ -906,7 +902,7 @@ if (DEBUG) {
         this.assertStableRerender();
       }
 
-      ['@test passing a local helper in named argument position is not deprecated']() {
+      ['@test passing a local helper in named argument position']() {
         let foo = defineSimpleHelper(() => 'Hello, world!');
 
         expectNoDeprecation(() =>
@@ -922,7 +918,7 @@ if (DEBUG) {
       // is trying to call `block.compile()` but `block` is the reference for `this.foo`.
       // So the execution stack is probably off-by-one or something.
 
-      ['@test invoking a local helper with parens in named argument position is not deprecated']() {
+      ['@test invoking a local helper with parens in named argument position']() {
         let foo = defineSimpleHelper(() => 'Hello, world!');
 
         expectNoDeprecation(() =>
@@ -933,9 +929,7 @@ if (DEBUG) {
         this.assertStableRerender();
       }
 
-      // TODO: this one doesn't work yet, and there is a failing test in glimmer-vm
-
-      ['@skip invoking a helper with quotes in named argument position is not deprecated']() {
+      ['@skip invoking a helper with quotes in named argument position']() {
         let foo = defineSimpleHelper(() => 'Hello, world!');
 
         expectNoDeprecation(() =>

From 47f338121267f1f716e6e68f7ecc9b3635e56255 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 15 Nov 2021 12:03:08 -0500
Subject: [PATCH 0722/1405] Make using the "classic" edition of Ember throw

---
 lib/index.js | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index dbb38692d97..2487d5b308c 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -119,27 +119,9 @@ module.exports = {
         throw new SilentError(message.join('\n\t'));
       }
     } else {
-      this.ui.writeWarnLine(
-        'The Ember Classic edition has been deprecated. Specifying "classic" in your package.json, or not specifying a value at all, will no longer be supported. You must explicitly set the "ember.edition" property to "octane". This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
+      throw new SilentError(
+        'The Ember Classic edition has been removed. Specifying "classic" in your package.json, or not specifying a value at all, is no longer supported. You must explicitly set the "ember.edition" property to "octane". You can also run `npx @ember/octanify` to do this. \n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_editions-classic'
       );
-
-      if (
-        optionalFeaturesMissing ||
-        optionalFeatures.isFeatureEnabled('application-template-wrapper')
-      ) {
-        this.ui.writeWarnLine(
-          'Setting the `application-template-wrapper` optional feature flag to `true`, or not providing a setting at all, has been deprecated. You must add the `@ember/optional-features` addon and set this feature to `false`. You can also run `npx @ember/octanify` to do this. This warning will become an error in Ember 4.0.0.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-application-template-wrapper'
-        );
-      }
-
-      if (
-        optionalFeaturesMissing ||
-        !optionalFeatures.isFeatureEnabled('template-only-glimmer-components')
-      ) {
-        throw new SilentError(
-          'Setting the `template-only-glimmer-components` optional feature flag to `false`, or not providing a setting at all, was deprecated in Ember 3.x and removed in Ember 4.0.0. You must add the `@ember/optional-features` addon and set this feature to `true`.\n\nFor more information, see the deprecation guide: https://deprecations.emberjs.com/v3.x/#toc_optional-feature-template-only-glimmer-components'
-        );
-      }
     }
 
     if (

From d320f79978c929c221d8224ec492400d176297e6 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 15 Nov 2021 11:47:03 -0500
Subject: [PATCH 0723/1405] Add v4.0.0-beta.10 to CHANGELOG

(cherry picked from commit 685f11be1577ee84820e0ec6b625e45be8f5bd36)
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15a74f71231..d7de5c27aab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+### v4.0.0-beta.10 (November 15, 2021)
+
+- [#19833](https://github.com/emberjs/ember.js/pull/19833) [CLEANUP] Remove deprecated array observers
+- [#19836](https://github.com/emberjs/ember.js/pull/19836) [CLEANUP] Turn `template-only-glimmer-components` deprecation into an error
+- [#19843](https://github.com/emberjs/ember.js/pull/19843) [CLEANUP] Turn `argument-less-helper-paren-less-invocation` deprecation into an error
+
 ### v4.0.0-beta.9 (November 10, 2021)
 
 - [#19749](https://github.com/emberjs/ember.js/pull/19749) [CLEANUP] Remove `deprecate-router-events` support code

From 58c28dc5483e17dcd2d6f45ae5a783a6656abc67 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 12 Nov 2021 21:17:04 +0100
Subject: [PATCH 0724/1405] [CLEANUP beta] Remove check to see if `ember` is
 defined as a Bower dependency

---
 lib/index.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index dbb38692d97..d873039d2bf 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -44,13 +44,6 @@ module.exports = {
   init() {
     this._super.init && this._super.init.apply(this, arguments);
 
-    if ('ember' in this.project.bowerDependencies()) {
-      // TODO: move this to a throw soon.
-      this.ui.writeWarnLine(
-        'Ember.js is now provided by node_module `ember-source`, please remove it from bower'
-      );
-    }
-
     // resets `this.root` to the correct location by default ember-cli
     // considers `__dirname` here to be the root, but since our main entry
     // point is within a subfolder we need to correct that

From 96143deb03ba5dd0c7a1b893f2128889beed6b0c Mon Sep 17 00:00:00 2001
From: Robert Jackson <rjackson@linkedin.com>
Date: Thu, 4 Nov 2021 14:44:29 -0400
Subject: [PATCH 0725/1405] Add v3.28.6 to CHANGELOG.md.

(cherry picked from commit c76034a9a22b1c38bc4b1dfb7394f95560e821b1)
---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7de5c27aab..7b472feeaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -100,10 +100,19 @@
 - [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
 - [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 
+## v3.28.6 (November 4, 2021)
+
+- [#19683](https://github.com/emberjs/ember.js/pull/19683) Ensure super.willDestroy is called correctly in Router's willDestroy
+
 ## v3.28.5 (November 3, 2021)
 
 - [#19820](https://github.com/emberjs/ember.js/pull/19820) Fix memory leak when looking up non-instantiable objects from the owner
 
+## v3.28.4 (October 22, 2021)
+
+- [#19798](https://github.com/emberjs/ember.js/pull/19798) More fixes for errors while precompiling inline templates (introduced in 3.28.2)
+- [glimmerjs/glimmer-vm@0.80.3](https://github.com/glimmerjs/glimmer-vm/releases/tag/v0.80.3) Improve template compilation speed regression
+
 ## v3.28.3 (October 22, 2021)
 
 - [#19799](https://github.com/emberjs/ember.js/pull/19799) / [glimmerjs/glimmer-vm#1354](https://github.com/glimmerjs/glimmer-vm/pull/1354) Fixes for errors while precompiling inline templates (introduced in 3.28.2)

From c4dd6eeb191d94c53a27a77b8f3eb841d604c2f0 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 15 Nov 2021 18:18:09 -0500
Subject: [PATCH 0726/1405] Add v4.0.0 to CHANGELOG

(cherry picked from commit d8573f9d63020d0358b69ef9974e2f4508e165f4)
---
 CHANGELOG.md | 156 +++++++++++++++++++++------------------------------
 1 file changed, 64 insertions(+), 92 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b472feeaf3..29dff4caa05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,104 +1,76 @@
 # Ember Changelog
 
-### v4.0.0-beta.10 (November 15, 2021)
-
-- [#19833](https://github.com/emberjs/ember.js/pull/19833) [CLEANUP] Remove deprecated array observers
-- [#19836](https://github.com/emberjs/ember.js/pull/19836) [CLEANUP] Turn `template-only-glimmer-components` deprecation into an error
-- [#19843](https://github.com/emberjs/ember.js/pull/19843) [CLEANUP] Turn `argument-less-helper-paren-less-invocation` deprecation into an error
-
-### v4.0.0-beta.9 (November 10, 2021)
-
-- [#19749](https://github.com/emberjs/ember.js/pull/19749) [CLEANUP] Remove `deprecate-router-events` support code
-- [#19762](https://github.com/emberjs/ember.js/pull/19762) [CLEANUP] Update GlimmerVM to 0.81
-  - removes deprecation of mutations during helper compute 
-  - removes deprecation of mutations during unknownProperty
-  - `@glimmer/integration-tests`, `@glimmer/manager`, `@glimmer/validator`
-    * [#1330](https://github.com/glimmerjs/glimmer-vm/pull/1330) Remove deprecated support for mutation after consumption during certain manager hooks ([@snewcomer](https://github.com/snewcomer))
-  - `@glimmer/manager`
-    * [#1328](https://github.com/glimmerjs/glimmer-vm/pull/1328) Remove deprecated Component Manager version 3.4 ([@nlfurniss](https://github.com/nlfurniss))
-  - `@glimmer/integration-tests`, `@glimmer/manager`
-    * [#1329](https://github.com/glimmerjs/glimmer-vm/pull/1329) Remove deprecated Modifier Manager version 3.13 ([@nlfurniss](https://github.com/nlfurniss))
-- [#19806](https://github.com/emberjs/ember.js/pull/19806) [CLEANUP] Drop export of built-ins, remove legacy components 
-
-### v4.0.0-beta.8 (November 5, 2021)
-
-- [#19823](https://github.com/emberjs/ember.js/pull/19823) / [#19828](https://github.com/emberjs/ember.js/pull/19828) [BUGFIX] Fix deprecation `until` and link for Component.reopenClass and Component.reopen
-- [#19825](https://github.com/emberjs/ember.js/pull/19825) [BUGFIX] Replace `assert.equal` in blueprints with `assert.strictEqual` to pass eslint-plugin-qunit v7 on generation
-- [#19808](https://github.com/emberjs/ember.js/pull/19808) [CLEANUP] Remove the `--test-type` option from the helper blueprint
-- [#19820](https://github.com/emberjs/ember.js/pull/19820) Fix memory leak when looking up non-instantiable objects from the owner
-
-### v4.0.0-beta.7 (November 1, 2021)
-
-- [#19677](https://github.com/emberjs/ember.js/pull/19677) [CLEANUP] Remove jQuery from build
-
-### v4.0.0-beta.6 (October 26, 2021)
-
-- [#19799](https://github.com/emberjs/ember.js/pull/19799) / [glimmerjs/glimmer-vm#1354](https://github.com/glimmerjs/glimmer-vm/pull/1354) Fixes for errors while precompiling inline templates (introduced in 3.28.2)
-
-### v4.0.0-beta.5 (October 11, 2021)
+### v4.0.0 (November 15, 2021)
 
 - [#19761](https://github.com/emberjs/ember.js/pull/19761) [BREAKING] Require ember-auto-import >= 2 or higher to enable ember-source to become a v2 addon in the 4.x cycle
-
-### v4.0.0-beta.4 (September 13, 2021)
-
-- [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized
-
-### v4.0.0-beta.3 (August 30, 2021)
-
-- [#19708](https://github.com/emberjs/ember.js/pull/19708) [CLEANUP] Remove class-binding-and-class-name-bindings-in-templates
-
-### v4.0.0-beta.2 (August 23, 2021)
-
+- [#19706](https://github.com/emberjs/ember.js/pull/19706) [BREAKING] Explicitly drop Node 10 support to match support policy.
+- [BREAKING] Remove deprecated features
+  - [#19838](https://github.com/emberjs/ember.js/pull/19838) [CLEANUP] Remove check to see if `ember` is defined as a Bower dependency
+  - [#19846](https://github.com/emberjs/ember.js/pull/19846) [CLEANUP] Make using the "classic" edition of Ember throw
+  - [#19833](https://github.com/emberjs/ember.js/pull/19833) [CLEANUP] Remove deprecated array observers
+  - [#19836](https://github.com/emberjs/ember.js/pull/19836) [CLEANUP] Turn `template-only-glimmer-components` deprecation into an error
+  - [#19843](https://github.com/emberjs/ember.js/pull/19843) [CLEANUP] Turn `argument-less-helper-paren-less-invocation` deprecation into an error
+  - [#19749](https://github.com/emberjs/ember.js/pull/19749) [CLEANUP] Remove `deprecate-router-events` support code
+  - [#19762](https://github.com/emberjs/ember.js/pull/19762) [CLEANUP] Update GlimmerVM to 0.81
+    - removes deprecation of mutations during helper compute
+    - removes deprecation of mutations during unknownProperty
+    - `@glimmer/integration-tests`, `@glimmer/manager`, `@glimmer/validator`
+      * [#1330](https://github.com/glimmerjs/glimmer-vm/pull/1330) Remove deprecated support for mutation after consumption during certain manager hooks ([@snewcomer](https://github.com/snewcomer))
+    - `@glimmer/manager`
+      * [#1328](https://github.com/glimmerjs/glimmer-vm/pull/1328) Remove deprecated Component Manager version 3.4 ([@nlfurniss](https://github.com/nlfurniss))
+    - `@glimmer/integration-tests`, `@glimmer/manager`
+      * [#1329](https://github.com/glimmerjs/glimmer-vm/pull/1329) Remove deprecated Modifier Manager version 3.13 ([@nlfurniss](https://github.com/nlfurniss))
+  - [#19806](https://github.com/emberjs/ember.js/pull/19806) [CLEANUP] Drop export of built-ins, remove legacy components
+  - [#19808](https://github.com/emberjs/ember.js/pull/19808) [CLEANUP] Remove the `--test-type` option from the helper blueprint
+  - [#19677](https://github.com/emberjs/ember.js/pull/19677) [CLEANUP] Remove jQuery from build
+  - [#19708](https://github.com/emberjs/ember.js/pull/19708) [CLEANUP] Remove class-binding-and-class-name-bindings-in-templates
+  - [#19650](https://github.com/emberjs/ember.js/pull/19650) [CLEANUP] Remove deprecated mouse events
+  - [#19675](https://github.com/emberjs/ember.js/pull/19675) [CLEANUP] Remove jQuery usage from ember-testing
+  - [#19704](https://github.com/emberjs/ember.js/pull/19704) [CLEANUP] Remove template-compiler.registerPlugin
+  - [#19707](https://github.com/emberjs/ember.js/pull/19707) [CLEANUP] Remove Application Controller Router Properties
+  - [#19528](https://github.com/emberjs/ember.js/pull/19528) [CLEANUP] Remove Logger
+  - [#19558](https://github.com/emberjs/ember.js/pull/19558) [CLEANUP] Remove IE11 support
+  - [#19563](https://github.com/emberjs/ember.js/pull/19563) [CLEANUP] Remove internal Ember.assign usage
+  - [#19636](https://github.com/emberjs/ember.js/pull/19636) [CLEANUP] Remove copy & Copyable
+  - [#19638](https://github.com/emberjs/ember.js/pull/19638) [CLEANUP] Remove deprecated with
+  - [#19639](https://github.com/emberjs/ember.js/pull/19639) [CLEANUP] Removes deprecated Private INVOKE API
+  - [#19640](https://github.com/emberjs/ember.js/pull/19640) [CLEANUP] Remove old deprecations import path
+  - [#19641](https://github.com/emberjs/ember.js/pull/19641) [CLEANUP] Remove isVisible
+  - [#19642](https://github.com/emberjs/ember.js/pull/19642) [CLEANUP] Remove aliasMethod
+  - [#19643](https://github.com/emberjs/ember.js/pull/19643) [CLEANUP] Remove deprecate without for and since
+  - [#19644](https://github.com/emberjs/ember.js/pull/19644) [CLEANUP] Remove -in-element
+  - [#19645](https://github.com/emberjs/ember.js/pull/19645) [CLEANUP] Remove tryInvoke
+  - [#19646](https://github.com/emberjs/ember.js/pull/19646) [CLEANUP] Remove loc
+  - [#19647](https://github.com/emberjs/ember.js/pull/19647) [CLEANUP] Remove Ember.merge
+  - [#19648](https://github.com/emberjs/ember.js/pull/19648) [CLEANUP] Remove getWithDefault
+  - [#19651](https://github.com/emberjs/ember.js/pull/19651) [CLEANUP] Remove LEGACY_OWNER
+  - [#19652](https://github.com/emberjs/ember.js/pull/19652) [CLEANUP] Remove Globals Resolver
+  - [#19653](https://github.com/emberjs/ember.js/pull/19653) [CLEANUP] Remove run and computed dot access
+  - [#19654](https://github.com/emberjs/ember.js/pull/19654) [CLEANUP] Remove @ember/string methods from native prototype
+  - [#19655](https://github.com/emberjs/ember.js/pull/19655) [CLEANUP] Remove meta-destruction-apis
+  - [#19656](https://github.com/emberjs/ember.js/pull/19656) [CLEANUP] Remove string-based setComponentManager
+  - [#19657](https://github.com/emberjs/ember.js/pull/19657) [CLEANUP] Remove hasBlock and hasBlockParams
+  - [#19658](https://github.com/emberjs/ember.js/pull/19658) [CLEANUP] Remove sendAction and string action passing
+  - [#19659](https://github.com/emberjs/ember.js/pull/19659) [CLEANUP] Remove renderTemplate, disconnectOutlet, render
+  - [#19660](https://github.com/emberjs/ember.js/pull/19660) [CLEANUP] Remove attrs/attrs-arg-access
+  - [#19661](https://github.com/emberjs/ember.js/pull/19661) [CLEANUP] Remove EMBER_EXTEND_PROTOTYPES
+  - [#19663](https://github.com/emberjs/ember.js/pull/19663) [CLEANUP] Remove function prototype extensions
+  - [#19665](https://github.com/emberjs/ember.js/pull/19665) [CLEANUP] Remove deprecated jQuery integration
+  - [#19666](https://github.com/emberjs/ember.js/pull/19666) [CLEANUP] Remove jQuery integration in EventDispatcher
+  - [#19667](https://github.com/emberjs/ember.js/pull/19667) [CLEANUP] Cleanup IE11 leftovers
+  - [#19670](https://github.com/emberjs/ember.js/pull/19670) [CLEANUP] Remove .volatile()
+  - [#19671](https://github.com/emberjs/ember.js/pull/19671) [CLEANUP] Remove .property()
+  - [#19673](https://github.com/emberjs/ember.js/pull/19673) [CLEANUP] Remove computed deep each
+  - [#19674](https://github.com/emberjs/ember.js/pull/19674) [CLEANUP] Remove ability to override computed property
+  - [#19678](https://github.com/emberjs/ember.js/pull/19678) [CLEANUP] Remove window.Ember global
+  - [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
+  - [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 - [#19680](https://github.com/emberjs/ember.js/pull/19680) [DEPRECATION] Deprecate owner.inject per [RFC #680](https://github.com/emberjs/rfcs/blob/sn/owner-inject-deprecation/text/0680-implicit-injection-deprecation.md#1-deprecate-implicit-injection-on-target-object) and cleanup related deprecations that are `until: 4.0.0`.
-- [#19706](https://github.com/emberjs/ember.js/pull/19706) [BUGFIX] Explicitly drop Node 10 support to match support policy.
-- [#19650](https://github.com/emberjs/ember.js/pull/19650) [CLEANUP] Remove deprecated mouse events
-- [#19675](https://github.com/emberjs/ember.js/pull/19675) [CLEANUP] Remove jQuery usage from ember-testing
-- [#19704](https://github.com/emberjs/ember.js/pull/19704) [CLEANUP] Remove template-compiler.registerPlugin
-- [#19707](https://github.com/emberjs/ember.js/pull/19707) [CLEANUP] Remove Application Controller Router Properties
-
-### v4.0.0-beta.1 (August 17, 2021)
-
 - [#19649](https://github.com/emberjs/ember.js/pull/19649) / [#19692](https://github.com/emberjs/ember.js/pull/19692) [DEPRECATION] Add deprecation warning to Ember.assign implementing [RFC #750](https://github.com/emberjs/rfcs/blob/master/text/0750-deprecate-ember-assign.md).
+- [#19825](https://github.com/emberjs/ember.js/pull/19825) [BUGFIX] Replace `assert.equal` in blueprints with `assert.strictEqual` to pass eslint-plugin-qunit v7 on generation
 - [#19227](https://github.com/emberjs/ember.js/pull/19227) [BUGFIX] Enable global event dispatcher listeners to be lazily created fixing Passive Listener Violation in Chrome
 - [#19542](https://github.com/emberjs/ember.js/pull/19542) [BUGFIX] Fix initializer test blueprints
 - [#19589](https://github.com/emberjs/ember.js/pull/19589) [BUGFIX] Don’t include type-tests in build output
-- [#19528](https://github.com/emberjs/ember.js/pull/19528) [CLEANUP] Remove Logger
-- [#19558](https://github.com/emberjs/ember.js/pull/19558) [CLEANUP] Remove IE11 support
-- [#19563](https://github.com/emberjs/ember.js/pull/19563) [CLEANUP] Remove internal Ember.assign usage
-- [#19636](https://github.com/emberjs/ember.js/pull/19636) [CLEANUP] Remove copy & Copyable
-- [#19638](https://github.com/emberjs/ember.js/pull/19638) [CLEANUP] Remove deprecated with
-- [#19639](https://github.com/emberjs/ember.js/pull/19639) [CLEANUP] Removes deprecated Private INVOKE API
-- [#19640](https://github.com/emberjs/ember.js/pull/19640) [CLEANUP] Remove old deprecations import path
-- [#19641](https://github.com/emberjs/ember.js/pull/19641) [CLEANUP] Remove isVisible
-- [#19642](https://github.com/emberjs/ember.js/pull/19642) [CLEANUP] Remove aliasMethod
-- [#19643](https://github.com/emberjs/ember.js/pull/19643) [CLEANUP] Remove deprecate without for and since
-- [#19644](https://github.com/emberjs/ember.js/pull/19644) [CLEANUP] Remove -in-element
-- [#19645](https://github.com/emberjs/ember.js/pull/19645) [CLEANUP] Remove tryInvoke
-- [#19646](https://github.com/emberjs/ember.js/pull/19646) [CLEANUP] Remove loc
-- [#19647](https://github.com/emberjs/ember.js/pull/19647) [CLEANUP] Remove Ember.merge
-- [#19648](https://github.com/emberjs/ember.js/pull/19648) [CLEANUP] Remove getWithDefault
-- [#19651](https://github.com/emberjs/ember.js/pull/19651) [CLEANUP] Remove LEGACY_OWNER
-- [#19652](https://github.com/emberjs/ember.js/pull/19652) [CLEANUP] Remove Globals Resolver
-- [#19653](https://github.com/emberjs/ember.js/pull/19653) [CLEANUP] Remove run and computed dot access
-- [#19654](https://github.com/emberjs/ember.js/pull/19654) [CLEANUP] Remove @ember/string methods from native prototype
-- [#19655](https://github.com/emberjs/ember.js/pull/19655) [CLEANUP] Remove meta-destruction-apis
-- [#19656](https://github.com/emberjs/ember.js/pull/19656) [CLEANUP] Remove string-based setComponentManager
-- [#19657](https://github.com/emberjs/ember.js/pull/19657) [CLEANUP] Remove hasBlock and hasBlockParams
-- [#19658](https://github.com/emberjs/ember.js/pull/19658) [CLEANUP] Remove sendAction and string action passing
-- [#19659](https://github.com/emberjs/ember.js/pull/19659) [CLEANUP] Remove renderTemplate, disconnectOutlet, render
-- [#19660](https://github.com/emberjs/ember.js/pull/19660) [CLEANUP] Remove attrs/attrs-arg-access
-- [#19661](https://github.com/emberjs/ember.js/pull/19661) [CLEANUP] Remove EMBER_EXTEND_PROTOTYPES
-- [#19663](https://github.com/emberjs/ember.js/pull/19663) [CLEANUP] Remove function prototype extensions
-- [#19665](https://github.com/emberjs/ember.js/pull/19665) [CLEANUP] Remove deprecated jQuery integration
-- [#19666](https://github.com/emberjs/ember.js/pull/19666) [CLEANUP] Remove jQuery integration in EventDispatcher
-- [#19667](https://github.com/emberjs/ember.js/pull/19667) [CLEANUP] Cleanup IE11 leftovers
-- [#19670](https://github.com/emberjs/ember.js/pull/19670) [CLEANUP] Remove .volatile()
-- [#19671](https://github.com/emberjs/ember.js/pull/19671) [CLEANUP] Remove .property()
-- [#19673](https://github.com/emberjs/ember.js/pull/19673) [CLEANUP] Remove computed deep each
-- [#19674](https://github.com/emberjs/ember.js/pull/19674) [CLEANUP] Remove ability to override computed property
-- [#19678](https://github.com/emberjs/ember.js/pull/19678) [CLEANUP] Remove window.Ember global
-- [#19695](https://github.com/emberjs/ember.js/pull/19695) [CLEANUP] Remove {{partial}}
-- [#19691](https://github.com/emberjs/ember.js/pull/19691) Add build assertion against `{{outlet named}}`
 
 ## v3.28.6 (November 4, 2021)
 

From 17f13e0ef8656f2f69f08ac387569356386d5d62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Nov 2021 21:46:57 +0000
Subject: [PATCH 0727/1405] Bump aws-sdk from 2.686.0 to 2.814.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.686.0 to 2.814.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.686.0...v2.814.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 925715ff222..2187062d6c1 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "auto-dist-tag": "^1.0.0",
-    "aws-sdk": "^2.686.0",
+    "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
diff --git a/yarn.lock b/yarn.lock
index 2dfdfb9c456..248aef462fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3186,12 +3186,12 @@ auto-dist-tag@^1.0.0:
     pkg-up "^2.0.0"
     semver "^5.3.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.686.0:
-  version "2.686.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.686.0.tgz#c58c3874eff4c76c763d137df617e87971321eb7"
-  integrity "sha1-xYw4dO/0x2x2PRN99hfoeXEyHrc= sha512-QhYhJ5y8tUG5SlmY3CSf9RBaa3EFbta28oarOyiwceHKmY80cMCafRI1YypT6CVDx/q91dbnSNQfWhs0cZPbBQ=="
+aws-sdk@^2.0.9, aws-sdk@^2.814.0:
+  version "2.814.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.814.0.tgz#7a1c36006e0b5826f14bd2511b1d229ef6814bb0"
+  integrity sha512-empd1m/J/MAkL6d9OeRpmg9thobULu0wk4v8W3JToaxGi2TD7PIdvE6yliZKyOVAdJINhBWEBhxR4OUIHhcGbQ==
   dependencies:
-    buffer "4.9.1"
+    buffer "4.9.2"
     events "1.1.1"
     ieee754 "1.1.13"
     jmespath "0.15.0"
@@ -4138,10 +4138,10 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
   integrity "sha1-TLiDLSNhJYmwQG6eKVbBfwb99TE= sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
 
-buffer@4.9.1:
-  version "4.9.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
-  integrity "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg= sha512-DNK4ruAqtyHaN8Zne7PkBTO+dD1Lr0YfTduMqlIyjvQIoztBkUxrvL+hKeLW8NXFKHOq/2upkxuoS9znQ9bW9A=="
+buffer@4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
   dependencies:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"

From 40905c575397c36b05e4f516f423ddfe9095bc7a Mon Sep 17 00:00:00 2001
From: Philippe Bernery <pbernery@users.noreply.github.com>
Date: Fri, 19 Nov 2021 12:01:54 +0100
Subject: [PATCH 0728/1405] Slight fix in the documentation

The comment was probably referring an old version of the sample code.
---
 packages/@ember/-internals/glimmer/lib/helpers/get.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index b91fa69dd26..0c87a23342b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -37,7 +37,7 @@
   ```
 
   For a more complex example, this template would allow the user to switch
-  between showing the user's height and weight with a click:
+  between showing the user's name and preferred coding language with a click:
 
   ```app/components/developer-detail.js
   import Component from '@glimmer/component';

From 0c0f62e5e13e856d228c44becd0fd5c5fbf99db7 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 19 Nov 2021 19:27:42 -0500
Subject: [PATCH 0729/1405] Add 4.1.0-beta.1 to CHANGELOG

(cherry picked from commit 927b86a70f5bd4394056817d4a89cc646fbd8dbe)
---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29dff4caa05..beb600b12ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Ember Changelog
 
+### v4.1.0-beta.1 (November 19, 2021)
+
+- [#19772](https://github.com/emberjs/ember.js/pull/19772) / [#19826](https://github.com/emberjs/ember.js/pull/19826) [FEATURE] Add a `@cached` decorator per [RFC #0566](https://github.com/emberjs/rfcs/blob/af64915b5ecde010fce09309a47ee6d2447588d0/text/0566-memo-decorator.md).
+- [#19471](https://github.com/emberjs/ember.js/pull/19471) / [#19834](https://github.com/emberjs/ember.js/pull/19834) [FEATURE] Add `refresh` method to the Router Service per [RFC #0631](https://github.com/emberjs/rfcs/blob/master/text/0631-refresh-method-for-router-service.md).
+- [#19776](https://github.com/emberjs/ember.js/pull/19776) [FEATURE] Provide `service` export from `@ember/service` in favour of `inject` implementing [RFC #0752](https://github.com/emberjs/rfcs/blob/master/text/0752-inject-service.md).
+- [#19510](https://github.com/emberjs/ember.js/pull/19510) [DEPRECATION] Deprecate auto location per [RFC #0711](https://github.com/emberjs/rfcs/blob/master/text/0711-deprecate-auto-location.md).
+- [#17570](https://github.com/emberjs/ember.js/pull/17570) [BUGFIX] Passing ObjectProxy with a property size to `isEmpty` would throw assertion
+- [#18269](https://github.com/emberjs/ember.js/pull/18269) [BUGFIX] Fix for when query params are using a nested value
+- [#19787](https://github.com/emberjs/ember.js/pull/19787) Setup basic infrastructure to ensure destroyables destroyed
+
 ### v4.0.0 (November 15, 2021)
 
 - [#19761](https://github.com/emberjs/ember.js/pull/19761) [BREAKING] Require ember-auto-import >= 2 or higher to enable ember-source to become a v2 addon in the 4.x cycle

From b88bd244cafef582c94b1c3faa8742070c83d697 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 19 Nov 2021 19:30:21 -0500
Subject: [PATCH 0730/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 93237e8413d..0c425f4c315 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.1.0-alpha.2",
+  "version": "4.2.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": ["ember-addon"],
   "homepage": "https://emberjs.com/",

From caf451172df5306a351023b9bb4a5d0f01e76792 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Tue, 30 Nov 2021 09:36:01 -0500
Subject: [PATCH 0731/1405] [BUGFIX release] Improve assert in default store

When a route has a dynamic segment, several implicit behaviors may be
provided by the Ember framework or by the framework in conjunction with
a library (commonly Ember Data).

* If the route class exists and has a `model(` hook implemented, then
  that logic is the explicit implementation for data loading on that
  route. In the far future (say, Ember 5), we want explicit data loading
  to be the only way data can be loaded.
* However, today there are several implicit data loading behaviors.
  First, the user may explicitly inject a `store` service into the
  route. If a `model` hook is not implemented, the `find` method on the
  store will be called. This is, as of this writing, valid in Ember 3 &
  4 and not deprecated.
* If a `model` hook is not implemented and if an explicit injection
  is not present, a container/owner-based
  implicit type or factor injection may have added the `store`. This
  if valid in Ember 3, but deprecated in Ember 3.28.7 (see
  https://github.com/emberjs/ember.js/pull/19854), and does not occur
  in Ember 4 since implicit injections are no longer supported.
* If a `model` hook is not implemented, and if neither an explicit or
  implicit injection of `store` is made, then Ember provides a minimal
  "default store" implementation. This looks up a model matching the
  route name, and calls a `find` method on that model. If there is no
  model, an assertion is thrown. If there a model but it has no `find`,
  an assertion is thrown.

This patch updates those assertions (which are very old) to better coach
developers toward the APIs we prefer in modern development. These are:

* If you have a route with dynamic segments, you should implement a
  `model` hook on the route.
* Alternatively, and as a transition step for existing code, you may
  explicitly inject a store on the route to preserve behavior in an
  application which was relying on implicit injections.

There are a lot of edge cases to consider in these copy changes. Many
apps use Ember Data. Some apps use different data layers which also
provide a `store` service. Some applications implement their own `store`
and may implicitly inject it. Some use no `store` at all!

Many apps use dynamic segments. Developers may not realize that if a
model hook (or route class) has not been defined in Ember and Ember
Data 3.28, the `store` service is being relied upon and causes
these assertions to never be run.

In Ember 3.28 accessing the implicit injection of `store` (and indeed
all implicit injection consumption) is deprecated, so
existing code should be upgraded to explicit injections and these
assertions should never come into play.

In Ember 4.0 developers who author:

* A new dynamic segment route.
* ...with no route class or no model hook.
* ...and no explicit service injection.
* ...but who also have `model` type factories (likely through Ember
  Data convention)

Would see the second of the updated assertions here. This patch updates
the message for 3.28 since it is plausible some non-conventional apps
could be seeing this message in 3.x, especially as they upgrade to Ember
4.0.
---
 .../-internals/routing/lib/system/route.ts    | 28 +++++++++++----
 .../routing/tests/system/route_test.js        | 35 ++++++++++++++++---
 2 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 277ff633b40..0ae59b37d5b 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -25,7 +25,6 @@ import Controller from '@ember/controller';
 import { assert, info, isTesting } from '@ember/debug';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { once } from '@ember/runloop';
-import { classify } from '@ember/string';
 import { DEBUG } from '@glimmer/env';
 import { Template, TemplateFactory } from '@glimmer/interfaces';
 import {
@@ -1736,16 +1735,18 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   protected get store() {
     let owner = getOwner(this);
     let routeName = this.routeName;
-    let namespace = get(this, '_router.namespace');
 
     return {
       find(name: string, value: unknown) {
         let modelClass: any = owner.factoryFor(`model:${name}`);
 
         assert(
-          `You used the dynamic segment ${name}_id in your route ${routeName}, but ${namespace}.${classify(
-            name
-          )} did not exist and you did not override your route's \`model\` hook.`,
+          `You used the dynamic segment \`${name}_id\` in your route ` +
+            `\`${routeName}\` for which Ember requires you provide a ` +
+            `data-loading implementation. Commonly, that is done by ` +
+            `adding a model hook implementation on the route ` +
+            `(\`model({${name}_id}) {\`) or by injecting an implemention of ` +
+            `a data store: \`@service store;\`.`,
           Boolean(modelClass)
         );
 
@@ -1755,7 +1756,22 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
         modelClass = modelClass.class;
 
-        assert(`${classify(name)} has no method \`find\`.`, typeof modelClass.find === 'function');
+        assert(
+          `You used the dynamic segment \`${name}_id\` in your route ` +
+            `\`${routeName}\` for which Ember requires you provide a ` +
+            `data-loading implementation. Commonly, that is done by ` +
+            `adding a model hook implementation on the route ` +
+            `(\`model({${name}_id}) {\`) or by injecting an implemention of ` +
+            `a data store: \`@service store;\`.\n\n` +
+            `Rarely, applications may attempt to use a legacy behavior where ` +
+            `the model class (in this case \`${name}\`) is resolved and the ` +
+            `\`find\` method on that class is invoked to load data. In this ` +
+            `application, a model of \`${name}\` was found but it did not ` +
+            `provide a \`find\` method. You should not add a \`find\` ` +
+            `method to your model. Instead, please implement an appropriate ` +
+            `\`model\` hook on the \`${routeName}\` route.`,
+          typeof modelClass.find === 'function'
+        );
 
         return modelClass.find(value);
       },
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index fbc5de2c80d..2b6fd159f29 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -70,14 +70,31 @@ moduleFor(
       let owner = buildOwner();
       let Post = EmberObject.extend();
 
-      owner.register('route:index', EmberRoute);
+      owner.register(
+        'route:index',
+        EmberRoute.extend({
+          routeName: 'index',
+        })
+      );
       owner.register('model:post', Post);
 
       route = owner.lookup('route:index');
 
       expectAssertion(function () {
         route.findModel('post', 1);
-      }, 'Post has no method `find`.');
+      }, `You used the dynamic segment \`post_id\` in your route ` +
+        `\`index\` for which Ember requires you provide a ` +
+        `data-loading implementation. Commonly, that is done by ` +
+        `adding a model hook implementation on the route ` +
+        `(\`model({post_id}) {\`) or by injecting an implemention of ` +
+        `a data store: \`@service store;\`.\n\n` +
+        `Rarely, applications may attempt to use a legacy behavior where ` +
+        `the model class (in this case \`post\`) is resolved and the ` +
+        `\`find\` method on that class is invoked to load data. In this ` +
+        `application, a model of \`post\` was found but it did not ` +
+        `provide a \`find\` method. You should not add a \`find\` ` +
+        `method to your model. Instead, please implement an appropriate ` +
+        `\`model\` hook on the \`index\` route.`);
 
       runDestroy(owner);
     }
@@ -86,13 +103,23 @@ moduleFor(
       runDestroy(route);
 
       let owner = buildOwner();
-      owner.register('route:index', EmberRoute);
+      owner.register(
+        'route:index',
+        EmberRoute.extend({
+          routeName: 'index',
+        })
+      );
 
       route = owner.lookup('route:index');
 
       expectAssertion(function () {
         route.model({ post_id: 1 });
-      }, /You used the dynamic segment post_id in your route undefined, but <.*:ember\d+>.Post did not exist and you did not override your route's `model` hook./);
+      }, `You used the dynamic segment \`post_id\` in your route ` +
+        `\`index\` for which Ember requires you provide a ` +
+        `data-loading implementation. Commonly, that is done by ` +
+        `adding a model hook implementation on the route ` +
+        `(\`model({post_id}) {\`) or by injecting an implemention of ` +
+        `a data store: \`@service store;\`.`);
 
       runDestroy(owner);
     }

From e253e921c79b7c7dd40d2ade217f581a43ee2c7a Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Tue, 30 Nov 2021 14:08:49 -0500
Subject: [PATCH 0732/1405] [BUGFIX release] Add model hook in route blueprint

When generating a route with a dynamic segment, say via:

    ember g route foo --path="bar/:buzz_id"

The default empty route definition will cause an awkward assertion to be
thrown.

* In 3.28 without any data layer, the user is prompted via assertion to
  implement a model hook.
* In 3.28 with Ember Data, an implicit fetch via Ember Data happens.
* In 4.0 without any data layer, the user would be prompted via
  assertion to implement a model hook.
* In 4.0 with Ember Data, the user would be prompted via assertion to
  either add a `find` method (old assertion) or to implement a model
  hook (new assertion via
  https://github.com/emberjs/ember.js/pull/19858).

It is doubtless that many users will still encounter these behaviors,
but updating the blueprints to generate a model hook by default improves
on the happy path.

In theory this could do back to 3.28, however the value there is
somewhat less since Ember Data's implicit store injection remains in
that version (and therefore the assertions/messages are less confusing).
---
 blueprints/route/files/__root__/__path__/__name__.js  |  9 ++++++++-
 blueprints/route/index.js                             |  2 ++
 .../route/native-files/__root__/__path__/__name__.js  |  9 ++++++++-
 node-tests/blueprints/route-test.js                   |  6 ++++--
 .../route/native-route-with-dynamic-segment.js        | 11 +++++++++++
 .../fixtures/route/route-with-dynamic-segment.js      | 11 +++++++++++
 6 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 node-tests/fixtures/route/native-route-with-dynamic-segment.js
 create mode 100644 node-tests/fixtures/route/route-with-dynamic-segment.js

diff --git a/blueprints/route/files/__root__/__path__/__name__.js b/blueprints/route/files/__root__/__path__/__name__.js
index 6c74252aa1b..7908be4f953 100644
--- a/blueprints/route/files/__root__/__path__/__name__.js
+++ b/blueprints/route/files/__root__/__path__/__name__.js
@@ -1,4 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
+export default Route.extend({<% if (hasDynamicSegment) {%>
+  model(params) {
+    /**
+     * This route was generated with a dynamic segment. Implement data loading
+     * based on that dynamic segment here in the model hook.
+     */
+    return params;
+  },<%}%>
 });
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index 50b10685a4b..6c197852e74 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -75,6 +75,7 @@ module.exports = useEditionDetector({
     let moduleName = options.entity.name;
     let rawRouteName = moduleName.split('/').pop();
     let emberPageTitleExists = 'ember-page-title' in options.project.dependencies();
+    let hasDynamicSegment = options.path && options.path.includes(':');
 
     if (options.resetNamespace) {
       moduleName = rawRouteName;
@@ -84,6 +85,7 @@ module.exports = useEditionDetector({
       moduleName: stringUtil.dasherize(moduleName),
       routeName: stringUtil.classify(rawRouteName),
       addTitle: emberPageTitleExists,
+      hasDynamicSegment,
     };
   },
 
diff --git a/blueprints/route/native-files/__root__/__path__/__name__.js b/blueprints/route/native-files/__root__/__path__/__name__.js
index 508c4dbe00c..2bf1de81a14 100644
--- a/blueprints/route/native-files/__root__/__path__/__name__.js
+++ b/blueprints/route/native-files/__root__/__path__/__name__.js
@@ -1,4 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default class <%= classifiedModuleName %>Route extends Route {
+export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
+  model(params) {
+    /**
+     * This route was generated with a dynamic segment. Implement data loading
+     * based on that dynamic segment here in the model hook.
+     */
+    return params;
+  }<%}%>
 }
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index b8b55b15979..c3251ca2d23 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -81,7 +81,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --path=:foo_id/show', function () {
       return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
+        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route-with-dynamic-segment.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
 
@@ -560,7 +560,9 @@ describe('Blueprint: route', function () {
 
     it('route foo --path=:foo_id/show', function () {
       return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('app/routes/foo.js')).to.equal(
+          fixture('route/native-route-with-dynamic-segment.js')
+        );
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
 
diff --git a/node-tests/fixtures/route/native-route-with-dynamic-segment.js b/node-tests/fixtures/route/native-route-with-dynamic-segment.js
new file mode 100644
index 00000000000..7856d6b3fec
--- /dev/null
+++ b/node-tests/fixtures/route/native-route-with-dynamic-segment.js
@@ -0,0 +1,11 @@
+import Route from '@ember/routing/route';
+
+export default class FooRoute extends Route {
+  model(params) {
+    /**
+     * This route was generated with a dynamic segment. Implement data loading
+     * based on that dynamic segment here in the model hook.
+     */
+    return params;
+  }
+}
diff --git a/node-tests/fixtures/route/route-with-dynamic-segment.js b/node-tests/fixtures/route/route-with-dynamic-segment.js
new file mode 100644
index 00000000000..aa466fc9446
--- /dev/null
+++ b/node-tests/fixtures/route/route-with-dynamic-segment.js
@@ -0,0 +1,11 @@
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+  model(params) {
+    /**
+     * This route was generated with a dynamic segment. Implement data loading
+     * based on that dynamic segment here in the model hook.
+     */
+    return params;
+  },
+});

From 7e411fd2205af318492a948a23ed3cc4da99aacb Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 1 Dec 2021 09:33:25 -0500
Subject: [PATCH 0733/1405] Add v4.0.1 to CHANGELOG

(cherry picked from commit dc7bfafb8963a8f9a9741137ed28430c48b73f90)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index beb600b12ce..796f20bcfdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,11 @@
 - [#18269](https://github.com/emberjs/ember.js/pull/18269) [BUGFIX] Fix for when query params are using a nested value
 - [#19787](https://github.com/emberjs/ember.js/pull/19787) Setup basic infrastructure to ensure destroyables destroyed
 
+### v4.0.1 (December 1, 2021)
+
+- [#19858](https://github.com/emberjs/ember.js/pull/19858) [BUGFIX] Improve assert message in default store for when routes have dynamic segments but no model hook
+- [#19860](https://github.com/emberjs/ember.js/pull/19860) [BUGFIX] Add model hook in route blueprint for routes with dynamic segments
+
 ### v4.0.0 (November 15, 2021)
 
 - [#19761](https://github.com/emberjs/ember.js/pull/19761) [BREAKING] Require ember-auto-import >= 2 or higher to enable ember-source to become a v2 addon in the 4.x cycle

From afceac756c098b270719da08faa169fdc1b6b3f3 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 1 Dec 2021 09:43:49 -0500
Subject: [PATCH 0734/1405] Add v3.28.7 to CHANGELOG

(cherry picked from commit edb5b210b4f03e66c84b91df795ff5a2630eecee)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 796f20bcfdf..05f3666b3b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,11 @@
 - [#19542](https://github.com/emberjs/ember.js/pull/19542) [BUGFIX] Fix initializer test blueprints
 - [#19589](https://github.com/emberjs/ember.js/pull/19589) [BUGFIX] Don’t include type-tests in build output
 
+## v3.28.7 (December 1, 2021)
+
+- [#19854](https://github.com/emberjs/ember.js/pull/19854) [BUGFIX] Fix implicit injections deprecation for routes to cover previously missed cases
+- [#19857](https://github.com/emberjs/ember.js/pull/19857) [BUGFIX] Improve assert message in default store for when routes have dynamic segments but no model hook
+
 ## v3.28.6 (November 4, 2021)
 
 - [#19683](https://github.com/emberjs/ember.js/pull/19683) Ensure super.willDestroy is called correctly in Router's willDestroy

From e98c146576a012bf64f645b3a816e9a18b07e5fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:02:48 +0000
Subject: [PATCH 0735/1405] Bump broccoli-funnel from 2.0.2 to 3.0.8

Bumps [broccoli-funnel](https://github.com/broccolijs/broccoli-funnel) from 2.0.2 to 3.0.8.
- [Release notes](https://github.com/broccolijs/broccoli-funnel/releases)
- [Changelog](https://github.com/broccolijs/broccoli-funnel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/broccolijs/broccoli-funnel/compare/v2.0.2...v3.0.8)

---
updated-dependencies:
- dependency-name: broccoli-funnel
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 0c425f4c315..127b45f347c 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "broccoli-concat": "^4.2.5",
     "broccoli-debug": "^0.6.4",
     "broccoli-file-creator": "^2.1.1",
-    "broccoli-funnel": "^2.0.2",
+    "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
     "ember-auto-import": "^2.2.0",
diff --git a/yarn.lock b/yarn.lock
index ef61c29dcb7..5438698185b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3729,23 +3729,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1, broccoli-funnel@^2.0.2:
     symlink-or-copy "^1.0.0"
     walk-sync "^0.3.1"
 
-broccoli-funnel@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.3.tgz#26fd42632471f67a91f4770d1987118087219937"
-  integrity "sha1-Jv1CYyRx9nqR9HcNGYcRgIchmTc= sha512-LPzZ91BwStoHZXdXHQAJeYORl189OrRKM5NdIi86SDU9wZ4s/3lV1PRFOiobDT/jKM10voM7CDzfvicHbCYxAQ=="
-  dependencies:
-    array-equal "^1.0.0"
-    blank-object "^1.0.1"
-    broccoli-plugin "^4.0.1"
-    debug "^4.1.1"
-    fast-ordered-set "^1.0.0"
-    fs-tree-diff "^2.0.1"
-    heimdalljs "^0.2.0"
-    minimatch "^3.0.0"
-    path-posix "^1.0.0"
-    walk-sync "^2.0.2"
-
-broccoli-funnel@^3.0.8:
+broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
   integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==

From ed05f1ae75667fac54fe7e32d11c4ff245ead817 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:02:58 +0000
Subject: [PATCH 0736/1405] Bump common-tags from 1.8.0 to 1.8.2

Bumps [common-tags](https://github.com/zspecza/common-tags) from 1.8.0 to 1.8.2.
- [Release notes](https://github.com/zspecza/common-tags/releases)
- [Commits](https://github.com/zspecza/common-tags/compare/v1.8.0...v1.8.2)

---
updated-dependencies:
- dependency-name: common-tags
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0c425f4c315..ca21ca1f0e8 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "broccoli-string-replace": "^0.1.2",
     "broccoli-typescript-compiler": "^7.0.0",
     "broccoli-uglify-sourcemap": "^3.2.0",
-    "common-tags": "^1.8.0",
+    "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
     "ember-cli": "^3.12.0",
diff --git a/yarn.lock b/yarn.lock
index ef61c29dcb7..0a827e8a4fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4579,10 +4579,10 @@ commander@^2.12.1, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
 
-common-tags@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity "sha1-jjFT5ULUo56bEFVENK+q+YlWqTc= sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="
+common-tags@^1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
 commondir@^1.0.1:
   version "1.0.1"

From 5feea05bdeac06be0adcb2ae44cc9956fc7030a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:03:15 +0000
Subject: [PATCH 0737/1405] Bump @types/qunit from 2.11.1 to 2.11.2

Bumps [@types/qunit](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qunit) from 2.11.1 to 2.11.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qunit)

---
updated-dependencies:
- dependency-name: "@types/qunit"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0c425f4c315..401619df63e 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "@glimmer/runtime": "0.83.1",
     "@glimmer/validator": "0.83.1",
     "@simple-dom/document": "^1.4.0",
-    "@types/qunit": "^2.11.1",
+    "@types/qunit": "^2.11.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
diff --git a/yarn.lock b/yarn.lock
index ef61c29dcb7..f5a7e60b528 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2694,10 +2694,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
   integrity "sha1-00gO5mbfl4SxABoYcqL2zO+2wtc= sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg=="
 
-"@types/qunit@^2.11.1":
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.1.tgz#3496d430d2bb0fa4761f00a27511f46020c6b410"
-  integrity sha512-vcM5+9O8LZuu5DYseaV4J7ehkYrhkv+aMIuxnF/OqMYlVEdv+odpCH1/5OVztiqxbCqTpQKWuELkMvG7OPycUQ==
+"@types/qunit@^2.11.2":
+  version "2.11.2"
+  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.2.tgz#4cb99ae3ea6afe94b9c4cfd3ab715a285729ca9c"
+  integrity sha512-Bt0fz9l8sWxqP+cjoqWQyNVyOPPK+7GPhKIKLLTi7llR0FV+pyd50FXTXafZeZnsFVUgXw4pdupydz75E6vxjQ==
 
 "@types/resolve@0.0.8":
   version "0.0.8"

From 93435e7fd01e7ad3d870aac3a85cc50978f673f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 15:03:49 +0000
Subject: [PATCH 0738/1405] Bump expect-type from 0.12.0 to 0.13.0

Bumps [expect-type](https://github.com/mmkal/ts/tree/HEAD/packages/expect-type) from 0.12.0 to 0.13.0.
- [Release notes](https://github.com/mmkal/ts/releases)
- [Changelog](https://github.com/mmkal/ts/blob/main/packages/expect-type/CHANGELOG.md)
- [Commits](https://github.com/mmkal/ts/commits/expect-type_v0.13.0/packages/expect-type)

---
updated-dependencies:
- dependency-name: expect-type
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0c425f4c315..fe7dc5c168b 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-qunit": "^6.2.0",
     "execa": "^5.1.1",
-    "expect-type": "^0.12.0",
+    "expect-type": "^0.13.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
     "fs-extra": "^9.1.0",
diff --git a/yarn.lock b/yarn.lock
index ef61c29dcb7..10e16824f48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6071,10 +6071,10 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect-type@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.12.0.tgz#133534b5e2561158c371e74af63fd8f18a9f3d42"
-  integrity sha512-IHwziEOjpjXqxQhtOAD5zMiQpGztaEKM4Q8wnwoRN9NIFlnyNHNjRxKWv+18UqRfsqi6vVnZIYFU16ePf+HaqA==
+expect-type@^0.13.0:
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
+  integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
 
 express@^4.10.7, express@^4.13.1, express@^4.16.4, express@^4.17.1:
   version "4.17.1"

From 703b9ca2653a6b479a762b30dca1a33eaa13d8ab Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 2 Dec 2021 13:52:33 -0500
Subject: [PATCH 0739/1405] Add v3.28.8 to CHANGELOG

(cherry picked from commit 498cebc669cafb679dad6e1ad0189c9b92270054)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05f3666b3b2..c688b9f8b0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,10 @@
 - [#19542](https://github.com/emberjs/ember.js/pull/19542) [BUGFIX] Fix initializer test blueprints
 - [#19589](https://github.com/emberjs/ember.js/pull/19589) [BUGFIX] Don’t include type-tests in build output
 
+## v3.28.8 (December 2, 2021)
+
+- [#19868](https://github.com/emberjs/ember.js/pull/19868) [BUGFIX] Fix a bug with the implicit injections deprecation that meant injecting a store to avoid the deprecation did not work.
+
 ## v3.28.7 (December 1, 2021)
 
 - [#19854](https://github.com/emberjs/ember.js/pull/19854) [BUGFIX] Fix implicit injections deprecation for routes to cover previously missed cases

From d59d3210b954149274969d999809940f1dd63232 Mon Sep 17 00:00:00 2001
From: "James C. Davis" <jdavis@salsify.com>
Date: Mon, 6 Dec 2021 01:47:16 -0500
Subject: [PATCH 0740/1405] Document get helper array element access with a
 number

---
 .../-internals/glimmer/lib/helpers/get.ts      | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index 0c87a23342b..d1902a4ca20 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -3,8 +3,9 @@
 */
 
 /**
-  Dynamically look up a property on an object. The second argument to `{{get}}`
-  should have a string value, although it can be bound.
+  Dynamically look up a property on an object or an element in an array.
+  The second argument to `{{get}}` should have a string or number value,
+  although it can be bound.
 
   For example, these two usages are equivalent:
 
@@ -77,6 +78,19 @@
   Would allow the user to swap what fact is being displayed, and also edit
   that fact via a two-way mutable binding.
 
+  The `{{get}}` helper can also be used for array element access via index.
+  This would display the value of the first element in the array `this.names`:
+
+  ```handlebars
+  {{get this.names 0}}
+  ```
+
+  Array element access also works with a dynamic second argument:
+
+  ```handlebars
+  {{get this.names @index}}
+  ```
+
   @public
   @method get
   @for Ember.Templates.helpers

From 3dbaf964d9f4c1d23d5835b10eb8fd5e369cfb6c Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Sat, 11 Dec 2021 19:00:46 -0500
Subject: [PATCH 0741/1405] chore(dev-deps): update linting to latest including
 eslint 8

---
 .eslintrc.js                                  |   5 +-
 package.json                                  |  23 +-
 .../-internals/glimmer/lib/environment.ts     |   4 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |   2 +-
 .../-internals/metal/lib/property_set.ts      |   2 +-
 .../-internals/metal/tests/computed_test.js   |   2 +
 .../lib/ember-dev/run-loop.ts                 |   2 +-
 packages/internal-test-helpers/lib/run.ts     |   6 +-
 yarn.lock                                     | 450 +++++++++---------
 9 files changed, 258 insertions(+), 238 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 0864a4f08c4..822775333bd 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -17,8 +17,11 @@ module.exports = {
     'no-unused-vars': 'error',
     'no-throw-literal': 'error',
     'no-var': 'error',
+
+    'qunit/no-assert-equal': 'off',
     'qunit/no-commented-tests': 'off',
     'qunit/require-expect': 'off',
+
     'disable-features/disable-async-await': 'error',
     'disable-features/disable-generator-functions': 'error',
   },
@@ -37,7 +40,7 @@ module.exports = {
     {
       files: ['*.ts'],
 
-      extends: ['plugin:@typescript-eslint/recommended', 'prettier/@typescript-eslint'],
+      extends: ['plugin:@typescript-eslint/recommended'],
 
       parserOptions: {
         sourceType: 'module',
diff --git a/package.json b/package.json
index 0c425f4c315..bc19443c94f 100644
--- a/package.json
+++ b/package.json
@@ -33,12 +33,14 @@
     "docs": "ember ember-cli-yuidoc",
     "link:glimmer": "node bin/yarn-link-glimmer.js",
     "start": "ember serve",
-    "lint": "yarn lint:tsc && yarn lint:tslint && yarn lint:eslint && yarn lint:docs",
+    "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"",
     "lint:docs": "qunit tests/docs/coverage-test.js",
     "lint:eslint": "eslint . --cache",
+    "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
     "lint:tsc": "tsc --noEmit",
     "lint:tslint": "tslint -p tsconfig.json",
-    "lint:fix": "yarn lint:eslint --fix && yarn lint:tslint --fix",
+    "lint:tslint:fix": "npm-run-all \"lint:tslint --fix\"",
+    "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
     "test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
     "test:node": "qunit tests/node/**/*-test.js",
@@ -89,8 +91,8 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^4.3.0",
-    "@typescript-eslint/parser": "^4.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
@@ -112,15 +114,15 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-import-resolver-node": "^0.3.3",
+    "eslint": "^8.4.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^2.0.0",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-qunit": "^6.2.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-qunit": "^7.1.0",
     "execa": "^5.1.1",
     "expect-type": "^0.12.0",
     "express": "^4.17.1",
@@ -133,6 +135,7 @@
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
     "mocha": "^7.1.2",
+    "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "puppeteer": "^3.0.4",
     "qunit": "^2.14.0",
@@ -145,7 +148,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^0.0.1",
-    "tslint": "^5.20.1",
+    "tslint": "^6.1.3",
     "typescript": "^4.2.4"
   },
   "engines": {
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 4d6bc87c2d2..91ddb636985 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -1,11 +1,11 @@
 import { ENV } from '@ember/-internals/environment';
-import { _getProp, _setProp, get, set } from '@ember/-internals/metal';
+import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { assert, deprecate, warn } from '@ember/debug';
 import { DeprecationOptions } from '@ember/debug/lib/deprecate';
-import { _backburner, schedule } from '@ember/runloop';
+import { schedule, _backburner } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
 import { EnvironmentDelegate } from '@glimmer/runtime';
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index d008910b1cd..bf35d49cb59 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -26,8 +26,8 @@ import {
   get,
   hash,
   on,
-  TEMPLATE_ONLY_COMPONENT_MANAGER,
   templateOnlyComponent,
+  TEMPLATE_ONLY_COMPONENT_MANAGER,
 } from '@glimmer/runtime';
 import { _WeakSet } from '@glimmer/util';
 import { isCurlyManager } from './component-managers/curly';
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 9c318753267..bbf7487cdce 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -5,7 +5,7 @@ import { DEBUG } from '@glimmer/env';
 import { COMPUTED_SETTERS } from './decorator';
 import { isPath } from './path_cache';
 import { notifyPropertyChange } from './property_events';
-import { _getPath as getPath, getPossibleMandatoryProxyValue } from './property_get';
+import { getPossibleMandatoryProxyValue, _getPath as getPath } from './property_get';
 
 interface ExtendedObject {
   isDestroyed?: boolean;
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 2aea2bafffc..76abb0bccce 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -1013,11 +1013,13 @@ moduleFor(
 class LazyObject {
   value = 123;
 
+  // eslint-disable-next-line no-dupe-class-members
   @computed('_value')
   get value() {
     return get(this, '_value');
   }
 
+  // eslint-disable-next-line no-dupe-class-members
   set value(value) {
     set(this, '_value', value);
   }
diff --git a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
index 95ee33ef5d6..c1199c811f4 100644
--- a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
@@ -1,5 +1,5 @@
 // @ts-ignore
-import { _cancelTimers, _getCurrentRunLoop, _hasScheduledTimers, end } from '@ember/runloop';
+import { end, _cancelTimers, _getCurrentRunLoop, _hasScheduledTimers } from '@ember/runloop';
 
 export function setupRunLoopCheck(hooks: NestedHooks) {
   hooks.afterEach(function (assert) {
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 7e1ae29de89..9f6bf4a89bb 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -1,10 +1,10 @@
 import {
-  _getCurrentRunLoop,
-  // @ts-ignore
-  _hasScheduledTimers,
   // @ts-ignore
   next,
   run,
+  _getCurrentRunLoop,
+  // @ts-ignore
+  _hasScheduledTimers,
 } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
 
diff --git a/yarn.lock b/yarn.lock
index ef61c29dcb7..ab9feae0f16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,13 +2,6 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
@@ -657,15 +650,6 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
@@ -2326,18 +2310,18 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint/eslintrc@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
+  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
+    debug "^4.3.2"
+    espree "^9.2.0"
     globals "^13.9.0"
     ignore "^4.0.6"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
@@ -2535,19 +2519,19 @@
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
+  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
+    "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
-  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -2659,12 +2643,7 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/json-schema@^7.0.3":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity "sha1-9MfsQ+gbMZqYFRFQMXCfJph4kfA= sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
-
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8":
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
@@ -2731,75 +2710,75 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.3.0.tgz#1a23d904bf8ea248d09dc3761af530d90f39c8fa"
-  integrity "sha1-GiPZBL+OokjQncN2GvUw2Q85yPo= sha512-RqEcaHuEKnn3oPFislZ6TNzsBLqpZjN93G69SS+laav/I8w/iGMuMq97P0D2/2/kW4SCebHggqhbcCfbDaaX+g=="
+"@typescript-eslint/eslint-plugin@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.6.0.tgz#efd8668b3d6627c46ce722c2afe813928fe120a0"
+  integrity sha512-MIbeMy5qfLqtgs1hWd088k1hOuRsN9JrHUPwVVKCD99EOUqScd7SrwoZl4Gso05EAP9w1kvLWUVGJOVpRPkDPA==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.3.0"
-    "@typescript-eslint/scope-manager" "4.3.0"
-    debug "^4.1.1"
+    "@typescript-eslint/experimental-utils" "5.6.0"
+    "@typescript-eslint/scope-manager" "5.6.0"
+    debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
-    regexpp "^3.0.0"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    ignore "^5.1.8"
+    regexpp "^3.2.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.3.0.tgz#3f3c6c508e01b8050d51b016e7f7da0e3aefcb87"
-  integrity "sha1-PzxsUI4BuAUNUbAW5/faDjrvy4c= sha512-cmmIK8shn3mxmhpKfzMMywqiEheyfXLV/+yPDnOTvQX/ztngx7Lg/OD26J8gTZfkLKUmaEBxO2jYP3keV7h2OQ=="
-  dependencies:
-    "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.3.0"
-    "@typescript-eslint/types" "4.3.0"
-    "@typescript-eslint/typescript-estree" "4.3.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^2.0.0"
+"@typescript-eslint/experimental-utils@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.6.0.tgz#f3a5960f2004abdcac7bb81412bafc1560841c23"
+  integrity sha512-VDoRf3Qj7+W3sS/ZBXZh3LBzp0snDLEgvp6qj0vOAIiAPM07bd5ojQ3CTzF/QFl5AKh7Bh1ycgj6lFBJHUt/DA==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.6.0"
+    "@typescript-eslint/types" "5.6.0"
+    "@typescript-eslint/typescript-estree" "5.6.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.3.0.tgz#684fc0be6551a2bfcb253991eec3c786a8c063a3"
-  integrity "sha1-aE/AvmVRor/LJTmR7sPHhqjAY6M= sha512-JyfRnd72qRuUwItDZ00JNowsSlpQGeKfl9jxwO0FHK1qQ7FbYdoy5S7P+5wh1ISkT2QyAvr2pc9dAemDxzt75g=="
+"@typescript-eslint/parser@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.6.0.tgz#11677324659641400d653253c03dcfbed468d199"
+  integrity sha512-YVK49NgdUPQ8SpCZaOpiq1kLkYRPMv9U5gcMrywzI8brtwZjr/tG3sZpuHyODt76W/A0SufNjYt9ZOgrC4tLIQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.3.0"
-    "@typescript-eslint/types" "4.3.0"
-    "@typescript-eslint/typescript-estree" "4.3.0"
-    debug "^4.1.1"
+    "@typescript-eslint/scope-manager" "5.6.0"
+    "@typescript-eslint/types" "5.6.0"
+    "@typescript-eslint/typescript-estree" "5.6.0"
+    debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
-  integrity "sha1-x0Mifgh1RZaAgNI2LPsSc4Qstqc= sha512-cTeyP5SCNE8QBRfc+Lgh4Xpzje46kNUhXYfc3pQWmJif92sjrFuHT9hH4rtOkDTo/si9Klw53yIr+djqGZS1ig=="
+"@typescript-eslint/scope-manager@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.6.0.tgz#9dd7f007dc8f3a34cdff6f79f5eaab27ae05157e"
+  integrity sha512-1U1G77Hw2jsGWVsO2w6eVCbOg0HZ5WxL/cozVSTfqnL/eB9muhb8THsP0G3w+BB5xAHv9KptwdfYFAUfzcIh4A==
   dependencies:
-    "@typescript-eslint/types" "4.3.0"
-    "@typescript-eslint/visitor-keys" "4.3.0"
+    "@typescript-eslint/types" "5.6.0"
+    "@typescript-eslint/visitor-keys" "5.6.0"
 
-"@typescript-eslint/types@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
-  integrity "sha1-HwstXhQFQ+JhTwbUj7OulRk8bd8= sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw=="
+"@typescript-eslint/types@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.6.0.tgz#745cb1b59daadcc1f32f7be95f0f68accf38afdd"
+  integrity sha512-OIZffked7mXv4mXzWU5MgAEbCf9ecNJBKi+Si6/I9PpTaj+cf2x58h2oHW5/P/yTnPkKaayfjhLvx+crnl5ubA==
 
-"@typescript-eslint/typescript-estree@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
-  integrity "sha1-DtwQaOay5Mf9xU1h4yn852JBzug= sha512-ZAI7xjkl+oFdLV/COEz2tAbQbR3XfgqHEGy0rlUXzfGQic6EBCR4s2+WS3cmTPG69aaZckEucBoTxW9PhzHxxw=="
+"@typescript-eslint/typescript-estree@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.6.0.tgz#dfbb19c9307fdd81bd9c650c67e8397821d7faf0"
+  integrity sha512-92vK5tQaE81rK7fOmuWMrSQtK1IMonESR+RJR2Tlc7w4o0MeEdjgidY/uO2Gobh7z4Q1hhS94Cr7r021fMVEeA==
   dependencies:
-    "@typescript-eslint/types" "4.3.0"
-    "@typescript-eslint/visitor-keys" "4.3.0"
-    debug "^4.1.1"
-    globby "^11.0.1"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    semver "^7.3.2"
-    tsutils "^3.17.1"
+    "@typescript-eslint/types" "5.6.0"
+    "@typescript-eslint/visitor-keys" "5.6.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"
-  integrity "sha1-DlqwoJVSkD7eriBZguhSHhdjWuA= sha512-xZxkuR7XLM6RhvLkgv9yYlTcBHnTULzfnw4i6+z2TGBLy9yljAypQaZl9c3zFvy7PNI7fYWyvKYtohyF8au3cw=="
+"@typescript-eslint/visitor-keys@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.6.0.tgz#3e36509e103fe9713d8f035ac977235fd63cb6e6"
+  integrity sha512-1p7hDp5cpRFUyE3+lvA74egs+RWSgumrBpzBCDzfTFv0aQ7lIeay80yU0hIxgAhwQ6PcasW35kaOCyDOv6O/Ng==
   dependencies:
-    "@typescript-eslint/types" "4.3.0"
-    eslint-visitor-keys "^2.0.0"
+    "@typescript-eslint/types" "5.6.0"
+    eslint-visitor-keys "^3.0.0"
 
 "@xmldom/xmldom@^0.7.1":
   version "0.7.4"
@@ -2836,10 +2815,10 @@ acorn@^5.0.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
 
-acorn@^7.4.0:
-  version "7.4.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
-  integrity "sha1-4a1IbmxUUBY0xsOXxcEh2qODYHw= sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="
+acorn@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
+  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
 
 after@0.8.2:
   version "0.8.2"
@@ -2873,16 +2852,6 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1:
-  version "8.6.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764"
-  integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -3009,6 +2978,11 @@ argparse@^1.0.7, argparse@~1.0.2:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -3116,11 +3090,6 @@ ast-types@0.13.2:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
   integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 async-disk-cache@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.3.tgz#6040486660b370e4051cd9fa9fee275e1fae3728"
@@ -4764,7 +4733,7 @@ cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
-cross-spawn@^6.0.0:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q= sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="
@@ -4862,7 +4831,7 @@ debug@3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
@@ -4876,6 +4845,13 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.2:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+  dependencies:
+    ms "2.1.2"
+
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -5738,14 +5714,12 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-config-prettier@^6.11.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
-  integrity "sha1-nrK8z/cn2xxSEE8LSeh+pGYFoNI= sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw=="
-  dependencies:
-    get-stdin "^6.0.0"
+eslint-config-prettier@^8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
 
-eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.6:
+eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
   integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
@@ -5816,30 +5790,38 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
-  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
+eslint-plugin-prettier@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
+  integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-qunit@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-6.2.0.tgz#f4efda29da99523e560848d9592c39c0590c308d"
-  integrity sha512-KvPmkIC2MHpfRxs/r8WUeeGkG6y+3qwSi2AZIBtjcM/YG6Z3k0GxW5Hbu3l7X0TDhljVCeBb9Q5puUkHzl83Mw==
+eslint-plugin-qunit@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.1.0.tgz#d0d4f9f9f2b9623953a4b7f1ca8a71f4aa7df2b7"
+  integrity sha512-w1+iL/+idpHGNgWYKknY7uPA3EaVDgl4HT4ndkNM2ONr/MW3FTM3FLRpy6yDZ5YE3km372Ym9Vr/N28E3OI6Jg==
   dependencies:
     eslint-utils "^3.0.0"
     requireindex "^1.2.0"
 
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
-  integrity "sha1-54blmmbLkrP2wfsNUIqrF0hI9Iw= sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+eslint-scope@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
+  integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-utils@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity "sha1-0t5eA0JOcH3BDHQGjd7a5wh0Gyc= sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="
@@ -5853,7 +5835,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity "sha1-MOvR73wv3/AcOk8VEESvJfqwUj4= sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
@@ -5863,37 +5845,41 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
-eslint@^7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
+  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
+
+eslint@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.4.1.tgz#d6531bbf3e598dffd7c0c7d35ec52a0b30fdfa2d"
+  integrity sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
+    "@eslint/eslintrc" "^1.0.5"
+    "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
     enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
+    eslint-scope "^7.1.0"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.1.0"
+    espree "^9.2.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
+    glob-parent "^6.0.1"
     globals "^13.6.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
@@ -5901,11 +5887,10 @@ eslint@^7.32.0:
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^3.1.0"
+    regexpp "^3.2.0"
     semver "^7.2.1"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
-    table "^6.0.9"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
@@ -5914,14 +5899,14 @@ esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
   integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
+  integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
   dependencies:
-    acorn "^7.4.0"
+    acorn "^8.6.0"
     acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    eslint-visitor-keys "^3.1.0"
 
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
@@ -6687,11 +6672,6 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity "sha1-ngm/cSs2CrkiXoEgSPcf3pyJZXs= sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g=="
-
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -6753,13 +6733,20 @@ github@^0.2.3:
   dependencies:
     mime "^1.2.11"
 
-glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0:
+glob-parent@^5.1.0, glob-parent@~5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob@7.1.3:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -6837,10 +6824,10 @@ globalyzer@0.1.0:
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
   integrity "sha1-y3baeVVWaaFRnVqO3wk6+qC/FGU= sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="
 
-globby@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
-  integrity "sha1-mivxB6Bo8//qvEmtcCx57ejP01c= sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ=="
+globby@^11.0.4:
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
+  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -7217,6 +7204,11 @@ ignore@^5.1.1, ignore@^5.1.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity "sha1-8VCotQo0KJsz4i9YiavU2AFvDlc= sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
 
+ignore@^5.1.8:
+  version "5.1.9"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
+  integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
@@ -7768,6 +7760,13 @@ js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -7798,11 +7797,6 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
-json-schema-traverse@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
-  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
-
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -8214,7 +8208,7 @@ lodash.castarray@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115"
   integrity "sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU= sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q=="
 
-lodash.clonedeep@^4.4.1, lodash.clonedeep@^4.5.0:
+lodash.clonedeep@^4.4.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
@@ -8391,11 +8385,6 @@ lodash.templatesettings@~2.3.0:
     lodash._reinterpolate "~2.3.0"
     lodash.escape "~2.3.0"
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
 lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -8605,6 +8594,11 @@ memory-streams@^0.1.3:
   dependencies:
     readable-stream "~1.0.2"
 
+memorystream@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
+  integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
+
 meow@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
@@ -8797,7 +8791,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
   integrity "sha1-VMRBzkyWzXeQ4QtBqHqlEGjsqys= sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
 
-mkdirp@0.5.5, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.5, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -9046,6 +9040,21 @@ npm-package-arg@^6.1.0:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
+npm-run-all@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
+  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    chalk "^2.4.1"
+    cross-spawn "^6.0.5"
+    memorystream "^0.3.1"
+    minimatch "^3.0.4"
+    pidtree "^0.3.0"
+    read-pkg "^3.0.0"
+    shell-quote "^1.6.1"
+    string.prototype.padend "^3.0.0"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -9486,6 +9495,11 @@ picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
 
+pidtree@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a"
+  integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -9965,11 +9979,16 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.0.0, regexpp@^3.1.0:
+regexpp@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
   integrity "sha1-IG0K0KVkjP+9uK5GQ489xRyfeOI= sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
 
+regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
 regexpu-core@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
@@ -10061,11 +10080,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
-require-from-string@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -10495,6 +10509,11 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity "sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
 
+shell-quote@^1.6.1:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
+  integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
+
 shellwords@^0.1.0, shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
@@ -10542,15 +10561,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity "sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -10869,7 +10879,7 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10892,6 +10902,15 @@ string.prototype.matchall@^4.0.4:
     regexp.prototype.flags "^1.3.1"
     side-channel "^1.0.4"
 
+string.prototype.padend@^3.0.0:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz#997a6de12c92c7cb34dc8a201a6c53d9bd88a5f1"
+  integrity sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.1"
+
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -11072,18 +11091,6 @@ sync-disk-cache@^1.3.3:
     rimraf "^2.2.8"
     username-sync "^1.0.2"
 
-table@^6.0.9:
-  version "6.7.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.2.tgz#a8d39b9f5966693ca8b0feba270a78722cbaf3b0"
-  integrity sha512-UFZK67uvyNivLeQbVtkiUs8Uuuxv24aSL4/Vil2PJVtMgU8Lx0CYkP12uCGa3kjyQzOSgV1+z9Wkb82fCGsO0g==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-
 tap-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
@@ -11390,15 +11397,20 @@ tsconfig-paths@^3.11.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.13.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY= sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 
-tslint@^5.20.1:
-  version "5.20.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
-  integrity "sha1-5AHortoBUrxE3QfmFANPP4DGe30= sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="
+tslint@^6.1.3:
+  version "6.1.3"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
+  integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -11408,10 +11420,10 @@ tslint@^5.20.1:
     glob "^7.1.1"
     js-yaml "^3.13.1"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     resolve "^1.3.2"
     semver "^5.3.0"
-    tslib "^1.8.0"
+    tslib "^1.13.0"
     tsutils "^2.29.0"
 
 tsutils@^2.29.0:
@@ -11421,10 +11433,10 @@ tsutils@^2.29.0:
   dependencies:
     tslib "^1.8.1"
 
-tsutils@^3.17.1:
-  version "3.17.1"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
-  integrity "sha1-7XGZF/EcoN7lhicrKsSeAVot11k= sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
   dependencies:
     tslib "^1.8.1"
 

From 917b161285af9062477b09ffc8183a20a0de1dce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Dec 2021 15:09:52 +0000
Subject: [PATCH 0742/1405] Bump actions/download-artifact from 2.0.10 to 2.1.0

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2.0.10 to 2.1.0.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2.0.10...v2.1.0)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0da16ab54d7..4912f5b752c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v2.0.10
+      - uses: actions/download-artifact@v2.1.0
         with:
           name: dist
           path: dist
@@ -179,7 +179,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v2.0.10
+      - uses: actions/download-artifact@v2.1.0
         with:
           name: dist
           path: dist
@@ -198,7 +198,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v2.0.10
+      - uses: actions/download-artifact@v2.1.0
         with:
           name: dist
           path: dist

From 8a924b74e73b82309af7e2be0fc3fc66b49a4dd8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 00:47:19 +0000
Subject: [PATCH 0743/1405] Bump broccoli-uglify-sourcemap from 3.2.0 to 4.0.0

Bumps [broccoli-uglify-sourcemap](https://github.com/ember-cli/broccoli-uglify-sourcemap) from 3.2.0 to 4.0.0.
- [Release notes](https://github.com/ember-cli/broccoli-uglify-sourcemap/releases)
- [Changelog](https://github.com/ember-cli/broccoli-terser-sourcemap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/broccoli-uglify-sourcemap/compare/v3.2.0...v4.0.0)

---
updated-dependencies:
- dependency-name: broccoli-uglify-sourcemap
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 62 ++++++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 206ad32053c..d6c7c5ae42a 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "broccoli-source": "^3.0.1",
     "broccoli-string-replace": "^0.1.2",
     "broccoli-typescript-compiler": "^7.0.0",
-    "broccoli-uglify-sourcemap": "^3.2.0",
+    "broccoli-uglify-sourcemap": "^4.0.0",
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
diff --git a/yarn.lock b/yarn.lock
index d93a7c7e5f0..d7671a5c204 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4015,22 +4015,21 @@ broccoli-typescript-compiler@^7.0.0:
     typescript "~4.0.3"
     walk-sync "^2.1.0"
 
-broccoli-uglify-sourcemap@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-3.2.0.tgz#d96f1d41f6c18e9a5d49af1a5ab9489cdcac1c6c"
-  integrity "sha1-2W8dQfbBjppdSa8aWrlInNysHGw= sha512-kkkn8v7kXdWwnZNekq+3ILuTAGkZoaoEMUYCKoER5/uokuoyTjtdYLHaE7UxHkuPEuLfjvJYv21sCCePZ74/2g=="
+broccoli-uglify-sourcemap@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-4.0.0.tgz#c5c5fbd9563cf0fe4c68c337bb61e98fe0697a3b"
+  integrity sha512-46yB4gw1Q3ALtBROY5QfKXNXxYK5uPSvER1OGjjh2t3piaipqBfuRXTzQZvmZ+Odr6/McY+J8XmxON4+lE1ukg==
   dependencies:
     async-promise-queue "^1.0.5"
-    broccoli-plugin "^1.2.1"
+    broccoli-plugin "^4.0.3"
     debug "^4.1.0"
     lodash.defaultsdeep "^4.6.1"
-    matcher-collection "^2.0.0"
-    mkdirp "^0.5.0"
+    matcher-collection "^2.0.1"
     source-map-url "^0.4.0"
-    symlink-or-copy "^1.0.1"
-    terser "^4.3.9"
-    walk-sync "^1.1.3"
-    workerpool "^5.0.1"
+    symlink-or-copy "^1.3.1"
+    terser "^5.3.0"
+    walk-sync "^2.2.0"
+    workerpool "^6.0.0"
 
 broccoli@^3.1.1:
   version "3.1.2"
@@ -8568,10 +8567,10 @@ matcher-collection@^1.0.0, matcher-collection@^1.1.1:
   dependencies:
     minimatch "^3.0.2"
 
-matcher-collection@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.0.tgz#470ae263c793e897b3f1e72c695016b7aea355c4"
-  integrity sha512-wSi4BgQGTFfBN5J+pIaS78rEKk4qIkjrw+NfJYdHsd2cRVIQsbDi3BZtNAXTFA2WHvlbS9kLGtTjv3cPJKuRSw==
+matcher-collection@^2.0.0, matcher-collection@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-2.0.1.tgz#90be1a4cf58d6f2949864f65bb3b0f3e41303b29"
+  integrity sha512-daE62nS2ZQsDg9raM0IlZzLmI2u+7ZapXBwdoeBUKAYERPDDIc0qNqA8E0Rp2D+gspKR7BgIFP52GeujaGXWeQ==
   dependencies:
     "@types/minimatch" "^3.0.3"
     minimatch "^3.0.2"
@@ -10705,10 +10704,10 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@~0.5.12:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity "sha1-CuBp5/47p1OMZMmFFeNTOerFoEI= sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -10747,6 +10746,11 @@ source-map@~0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@~0.7.2:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
+
 sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
@@ -11128,14 +11132,14 @@ temp@0.9.0:
   dependencies:
     rimraf "~2.6.2"
 
-terser@^4.3.9:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.2.tgz#cb1cf055e7f70caa5863f00ba3e67dc3c97b5150"
-  integrity "sha1-yxzwVef3DKpYY/ALo+Z9w8l7UVA= sha512-6FUjJdY2i3WZAtYBtnV06OOcOfzl+4hSKYE9wgac8rkLRBToPDDrBB2AcHwQD/OKDxbnvhVy2YgOPWO2SsKWqg=="
+terser@^5.3.0:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
+  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
   dependencies:
     commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
+    source-map "~0.7.2"
+    source-map-support "~0.5.20"
 
 testdouble@^3.2.6:
   version "3.3.1"
@@ -11861,10 +11865,10 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
-workerpool@^5.0.1:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-5.0.4.tgz#4f67cb70ff7550a27ab94de25b0b843cd92059a2"
-  integrity "sha1-T2fLcP91UKJ6uU3iWwuEPNkgWaI= sha512-Sywova24Ow2NQ24JPB68bI89EdqMDjUXo4OpofK/QMD7C2ZVMloYBgQ5J3PChcBJHj2vspsmGx1/3nBKXtUkXQ=="
+workerpool@^6.0.0:
+  version "6.1.5"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
+  integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
 
 wrap-ansi@^5.1.0:
   version "5.1.0"

From 6198c672863ddd58cc42d958de7d3f60a30a5dc2 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 17 Dec 2021 16:19:56 -0500
Subject: [PATCH 0744/1405] [BUGFIX release] Explicitly list and expose the
 currently supported browsers on the `ember-source` module - Test against the
 lowest supported browsers for Firefox, Safari and   Chrome

---
 .github/workflows/ci.yml |  5 ++++
 config/browserlists.js   |  7 +-----
 lib/browsers.js          | 50 ++++++++++++++++++++++++++++++++++++++++
 lib/index.js             |  4 ++++
 testem.browserstack.js   | 24 ++++++++++++++++---
 5 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 lib/browsers.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4912f5b752c..ef1fb8c6fea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -202,6 +202,11 @@ jobs:
         with:
           name: dist
           path: dist
+      - name: Setup firefox
+        uses: browser-actions/setup-firefox@latest
+        with:
+          firefox-version: 91
+      - run: firefox --version
       - name: test
         run: yarn ember test -c testem.ci-browsers.js
 
diff --git a/config/browserlists.js b/config/browserlists.js
index f41ffc0d40f..60fc7020059 100644
--- a/config/browserlists.js
+++ b/config/browserlists.js
@@ -1,9 +1,4 @@
-const allSupportedBrowsers = [
-  'last 2 Chrome versions',
-  'last 2 Firefox versions',
-  'Safari 12',
-  'last 2 Edge versions',
-];
+const allSupportedBrowsers = require('../lib/browsers');
 
 const modernBrowsers = [
   'last 1 Chrome versions',
diff --git a/lib/browsers.js b/lib/browsers.js
new file mode 100644
index 00000000000..c4f65b92ddb
--- /dev/null
+++ b/lib/browsers.js
@@ -0,0 +1,50 @@
+module.exports = [
+  'Chrome >= 92',
+  'Edge >= 93',
+  'Firefox >= 91',
+  'iOS >= 12',
+  'Safari >= 12',
+  'ChromeAndroid >= 96',
+  'FirefoxAndroid >= 94',
+];
+
+/*
+  As of the release of 4.0.0, the above query expands to:
+
+  and_chr 96
+  and_ff 94
+  chrome 96
+  chrome 95
+  chrome 94
+  chrome 93
+  chrome 92
+  chrome 91
+  chrome 87
+  edge 96
+  edge 95
+  firefox 95
+  firefox 94
+  firefox 93
+  firefox 60
+  firefox 52
+  ios_saf 15.2
+  ios_saf 15.0-15.1
+  ios_saf 14.5-14.8
+  ios_saf 14.0-14.4
+  ios_saf 13.4-13.7
+  ios_saf 13.3
+  ios_saf 13.2
+  ios_saf 13.0-13.1
+  ios_saf 12.2-12.5
+  ios_saf 12.0-12.1
+  safari 15.2
+  safari 15.1
+  safari 15
+  safari 14.1
+  safari 14
+  safari 13.1
+  safari 13
+  safari 12.1
+  safari 12
+
+*/
diff --git a/lib/index.js b/lib/index.js
index 496834ac163..5a1a043dfb8 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -11,6 +11,7 @@ const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:add
 const vmBabelPlugins = require('@glimmer/vm-babel-plugins');
 const Overrides = require('./overrides');
 const SilentError = require('silent-error');
+const SupportedBrowsers = require('./browsers');
 
 const PRE_BUILT_TARGETS = [
   'last 1 Chrome versions',
@@ -59,6 +60,9 @@ module.exports = {
   absolutePaths,
   _overrideTree: undefined,
 
+  // Expose supported list of browsers for reference by other packages
+  supportedBrowsers: SupportedBrowsers,
+
   included() {
     this._super.included.apply(this, arguments);
 
diff --git a/testem.browserstack.js b/testem.browserstack.js
index 2841d5dab4e..239a8e8cc7c 100644
--- a/testem.browserstack.js
+++ b/testem.browserstack.js
@@ -1,7 +1,7 @@
 const FailureOnlyPerBrowserReporter = require('testem-failure-only-reporter/grouped-by-browser');
 
 const BrowserStackLaunchers = {
-  BS_Safari_Current: {
+  BS_Safari_12: {
     exe: 'node_modules/.bin/browserstack-launch',
     args: [
       '--os',
@@ -11,7 +11,7 @@ const BrowserStackLaunchers = {
       '--b',
       'safari',
       '--bv',
-      'latest',
+      'latest', // Will always be 12.x on Mojave
       '-t',
       '1200',
       '--u',
@@ -29,7 +29,25 @@ const BrowserStackLaunchers = {
       '--b',
       'edge',
       '--bv',
-      'latest',
+      '93',
+      '-t',
+      '1200',
+      '--u',
+      '<url>',
+    ],
+    protocol: 'browser',
+  },
+  BS_MS_Chrome: {
+    exe: 'node_modules/.bin/browserstack-launch',
+    args: [
+      '--os',
+      'Windows',
+      '--osv',
+      '11',
+      '--b',
+      'Chrome',
+      '--bv',
+      '92',
       '-t',
       '1200',
       '--u',

From 78ff514505939ba8da3b29a8380cdcd3c3663a4f Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 17 Dec 2021 16:30:50 -0500
Subject: [PATCH 0745/1405] Be more specific on firefox version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ef1fb8c6fea..c69a5f1178a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -205,7 +205,7 @@ jobs:
       - name: Setup firefox
         uses: browser-actions/setup-firefox@latest
         with:
-          firefox-version: 91
+          firefox-version: 91.0.1
       - run: firefox --version
       - name: test
         run: yarn ember test -c testem.ci-browsers.js

From 908d96f6c038c38cca248b222d6b7555992abc72 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Fri, 17 Dec 2021 23:39:58 -0500
Subject: [PATCH 0746/1405] Add smoke test app to CI

---
 .github/workflows/ci.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4912f5b752c..b2e1da40b0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,6 +84,29 @@ jobs:
           BROWSERSTACK_ACCESS_KEY: o5LNEdygq1SP4L9kst4s
         run: yarn test:browserstack
 
+  smoke-test:
+    name: Smoke tests (Full Ember Apps)
+    runs-on: ubuntu-latest
+    needs: [basic-test, lint]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: yarn
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: build
+        run: yarn ember build -prod
+      - name: test
+        # todo: potentially more apps? use matrix?
+        run: |
+          yarn link
+          cd smoke-tests/ember-test-app/
+          yarn
+          yarn link ember-source
+          yarn test
+
   production-test:
     name: Production (All Tests + Canary Features)
     runs-on: ubuntu-latest

From 091d3a74d5a6bf6a37c79d26a94fcf9a2313602c Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Fri, 17 Dec 2021 23:34:09 -0500
Subject: [PATCH 0747/1405] Add first smoke-test app

---
 .eslintignore                                 |  1 +
 smoke-tests/ember-test-app/.editorconfig      | 19 +++++
 smoke-tests/ember-test-app/.eslintignore      | 22 ++++++
 smoke-tests/ember-test-app/.eslintrc.js       | 58 +++++++++++++++
 smoke-tests/ember-test-app/.gitignore         | 29 ++++++++
 smoke-tests/ember-test-app/.prettierignore    | 21 ++++++
 smoke-tests/ember-test-app/.prettierrc.js     |  5 ++
 .../ember-test-app/.template-lintrc.js        |  5 ++
 smoke-tests/ember-test-app/app/app.js         | 12 ++++
 .../ember-test-app/app/components/.gitkeep    |  0
 .../ember-test-app/app/controllers/.gitkeep   |  0
 .../ember-test-app/app/helpers/.gitkeep       |  0
 smoke-tests/ember-test-app/app/index.html     | 25 +++++++
 .../ember-test-app/app/models/.gitkeep        |  0
 smoke-tests/ember-test-app/app/router.js      |  9 +++
 .../ember-test-app/app/routes/.gitkeep        |  0
 smoke-tests/ember-test-app/app/styles/app.css |  0
 .../app/templates/application.hbs             |  7 ++
 .../config/ember-cli-update.json              | 18 +++++
 .../ember-test-app/config/environment.js      | 51 +++++++++++++
 .../config/optional-features.json             |  6 ++
 smoke-tests/ember-test-app/config/targets.js  | 26 +++++++
 smoke-tests/ember-test-app/ember-cli-build.js | 24 +++++++
 smoke-tests/ember-test-app/package.json       | 71 +++++++++++++++++++
 smoke-tests/ember-test-app/public/robots.txt  |  3 +
 smoke-tests/ember-test-app/testem.js          | 23 ++++++
 .../ember-test-app/tests/helpers/.gitkeep     |  0
 smoke-tests/ember-test-app/tests/index.html   | 40 +++++++++++
 .../ember-test-app/tests/integration/.gitkeep |  0
 .../ember-test-app/tests/test-helper.js       | 12 ++++
 .../ember-test-app/tests/unit/.gitkeep        |  0
 smoke-tests/ember-test-app/vendor/.gitkeep    |  0
 32 files changed, 487 insertions(+)
 create mode 100644 smoke-tests/ember-test-app/.editorconfig
 create mode 100644 smoke-tests/ember-test-app/.eslintignore
 create mode 100644 smoke-tests/ember-test-app/.eslintrc.js
 create mode 100644 smoke-tests/ember-test-app/.gitignore
 create mode 100644 smoke-tests/ember-test-app/.prettierignore
 create mode 100644 smoke-tests/ember-test-app/.prettierrc.js
 create mode 100644 smoke-tests/ember-test-app/.template-lintrc.js
 create mode 100644 smoke-tests/ember-test-app/app/app.js
 create mode 100644 smoke-tests/ember-test-app/app/components/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/app/controllers/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/app/helpers/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/app/index.html
 create mode 100644 smoke-tests/ember-test-app/app/models/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/app/router.js
 create mode 100644 smoke-tests/ember-test-app/app/routes/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/app/styles/app.css
 create mode 100644 smoke-tests/ember-test-app/app/templates/application.hbs
 create mode 100644 smoke-tests/ember-test-app/config/ember-cli-update.json
 create mode 100644 smoke-tests/ember-test-app/config/environment.js
 create mode 100644 smoke-tests/ember-test-app/config/optional-features.json
 create mode 100644 smoke-tests/ember-test-app/config/targets.js
 create mode 100644 smoke-tests/ember-test-app/ember-cli-build.js
 create mode 100644 smoke-tests/ember-test-app/package.json
 create mode 100644 smoke-tests/ember-test-app/public/robots.txt
 create mode 100644 smoke-tests/ember-test-app/testem.js
 create mode 100644 smoke-tests/ember-test-app/tests/helpers/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/tests/index.html
 create mode 100644 smoke-tests/ember-test-app/tests/integration/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/tests/test-helper.js
 create mode 100644 smoke-tests/ember-test-app/tests/unit/.gitkeep
 create mode 100644 smoke-tests/ember-test-app/vendor/.gitkeep

diff --git a/.eslintignore b/.eslintignore
index 2003cec41a0..a9f8b499220 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -3,3 +3,4 @@ node-tests/fixtures/**/*.js
 /docs/
 dist/
 tmp/
+smoke-tests/
diff --git a/smoke-tests/ember-test-app/.editorconfig b/smoke-tests/ember-test-app/.editorconfig
new file mode 100644
index 00000000000..c35a002406b
--- /dev/null
+++ b/smoke-tests/ember-test-app/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+
+[*.{diff,md}]
+trim_trailing_whitespace = false
diff --git a/smoke-tests/ember-test-app/.eslintignore b/smoke-tests/ember-test-app/.eslintignore
new file mode 100644
index 00000000000..701947ed3a6
--- /dev/null
+++ b/smoke-tests/ember-test-app/.eslintignore
@@ -0,0 +1,22 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.*/
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/smoke-tests/ember-test-app/.eslintrc.js b/smoke-tests/ember-test-app/.eslintrc.js
new file mode 100644
index 00000000000..41a1a43d828
--- /dev/null
+++ b/smoke-tests/ember-test-app/.eslintrc.js
@@ -0,0 +1,58 @@
+'use strict';
+
+module.exports = {
+  root: true,
+  parser: 'babel-eslint',
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+    ecmaFeatures: {
+      legacyDecorators: true,
+    },
+  },
+  plugins: ['ember'],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended',
+    'plugin:prettier/recommended',
+  ],
+  env: {
+    browser: true,
+  },
+  rules: {},
+  overrides: [
+    // node files
+    {
+      files: [
+        './.eslintrc.js',
+        './.prettierrc.js',
+        './.template-lintrc.js',
+        './ember-cli-build.js',
+        './testem.js',
+        './blueprints/*/index.js',
+        './config/**/*.js',
+        './lib/*/index.js',
+        './server/**/*.js',
+      ],
+      parserOptions: {
+        sourceType: 'script',
+      },
+      env: {
+        browser: false,
+        node: true,
+      },
+      plugins: ['node'],
+      extends: ['plugin:node/recommended'],
+      rules: {
+        // this can be removed once the following is fixed
+        // https://github.com/mysticatea/eslint-plugin-node/issues/77
+        'node/no-unpublished-require': 'off',
+      },
+    },
+    {
+      // Test files:
+      files: ['tests/**/*-test.{js,ts}'],
+      extends: ['plugin:qunit/recommended'],
+    },
+  ],
+};
diff --git a/smoke-tests/ember-test-app/.gitignore b/smoke-tests/ember-test-app/.gitignore
new file mode 100644
index 00000000000..09a917f9c2c
--- /dev/null
+++ b/smoke-tests/ember-test-app/.gitignore
@@ -0,0 +1,29 @@
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+# This smoke test ensures that a stable new'd app can run with latest ember-source
+# and not having the lock file will help us catch issues that maybe come from elsewhere.
+yarn.lock
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/.env*
+/.pnp*
+/.sass-cache
+/.eslintcache
+/connect.lock
+/coverage/
+/libpeerconnection.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/smoke-tests/ember-test-app/.prettierignore b/smoke-tests/ember-test-app/.prettierignore
new file mode 100644
index 00000000000..9221655522b
--- /dev/null
+++ b/smoke-tests/ember-test-app/.prettierignore
@@ -0,0 +1,21 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+/node_modules/
+
+# misc
+/coverage/
+!.*
+.eslintcache
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try
diff --git a/smoke-tests/ember-test-app/.prettierrc.js b/smoke-tests/ember-test-app/.prettierrc.js
new file mode 100644
index 00000000000..534e6d35aab
--- /dev/null
+++ b/smoke-tests/ember-test-app/.prettierrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  singleQuote: true,
+};
diff --git a/smoke-tests/ember-test-app/.template-lintrc.js b/smoke-tests/ember-test-app/.template-lintrc.js
new file mode 100644
index 00000000000..f35f61c7b3a
--- /dev/null
+++ b/smoke-tests/ember-test-app/.template-lintrc.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended',
+};
diff --git a/smoke-tests/ember-test-app/app/app.js b/smoke-tests/ember-test-app/app/app.js
new file mode 100644
index 00000000000..b6e3fcb9768
--- /dev/null
+++ b/smoke-tests/ember-test-app/app/app.js
@@ -0,0 +1,12 @@
+import Application from '@ember/application';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
+import config from 'ember-test-app/config/environment';
+
+export default class App extends Application {
+  modulePrefix = config.modulePrefix;
+  podModulePrefix = config.podModulePrefix;
+  Resolver = Resolver;
+}
+
+loadInitializers(App, config.modulePrefix);
diff --git a/smoke-tests/ember-test-app/app/components/.gitkeep b/smoke-tests/ember-test-app/app/components/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/app/controllers/.gitkeep b/smoke-tests/ember-test-app/app/controllers/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/app/helpers/.gitkeep b/smoke-tests/ember-test-app/app/helpers/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/app/index.html b/smoke-tests/ember-test-app/app/index.html
new file mode 100644
index 00000000000..846e9ed87e3
--- /dev/null
+++ b/smoke-tests/ember-test-app/app/index.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>EmberTestApp</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/ember-test-app.css">
+
+    {{content-for "head-footer"}}
+          <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+  <body>
+    {{content-for "body"}}
+
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/ember-test-app.js"></script>
+
+    {{content-for "body-footer"}}
+  </body>
+</html>
diff --git a/smoke-tests/ember-test-app/app/models/.gitkeep b/smoke-tests/ember-test-app/app/models/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/app/router.js b/smoke-tests/ember-test-app/app/router.js
new file mode 100644
index 00000000000..aeffbcc03fb
--- /dev/null
+++ b/smoke-tests/ember-test-app/app/router.js
@@ -0,0 +1,9 @@
+import EmberRouter from '@ember/routing/router';
+import config from 'ember-test-app/config/environment';
+
+export default class Router extends EmberRouter {
+  location = config.locationType;
+  rootURL = config.rootURL;
+}
+
+Router.map(function () {});
diff --git a/smoke-tests/ember-test-app/app/routes/.gitkeep b/smoke-tests/ember-test-app/app/routes/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/app/styles/app.css b/smoke-tests/ember-test-app/app/styles/app.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/app/templates/application.hbs b/smoke-tests/ember-test-app/app/templates/application.hbs
new file mode 100644
index 00000000000..b0522933205
--- /dev/null
+++ b/smoke-tests/ember-test-app/app/templates/application.hbs
@@ -0,0 +1,7 @@
+{{page-title "EmberTestApp"}}
+
+{{!-- The following component displays Ember's default welcome message. --}}
+<WelcomePage />
+{{!-- Feel free to remove this! --}}
+
+{{outlet}}
\ No newline at end of file
diff --git a/smoke-tests/ember-test-app/config/ember-cli-update.json b/smoke-tests/ember-test-app/config/ember-cli-update.json
new file mode 100644
index 00000000000..b46cba5d89a
--- /dev/null
+++ b/smoke-tests/ember-test-app/config/ember-cli-update.json
@@ -0,0 +1,18 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.28.4",
+      "blueprints": [
+        {
+          "name": "app",
+          "outputRepo": "https://github.com/ember-cli/ember-new-output",
+          "codemodsSource": "ember-app-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/smoke-tests/ember-test-app/config/environment.js b/smoke-tests/ember-test-app/config/environment.js
new file mode 100644
index 00000000000..8f5d95a596f
--- /dev/null
+++ b/smoke-tests/ember-test-app/config/environment.js
@@ -0,0 +1,51 @@
+'use strict';
+
+module.exports = function (environment) {
+  let ENV = {
+    modulePrefix: 'ember-test-app',
+    environment,
+    rootURL: '/',
+    locationType: 'auto',
+    EmberENV: {
+      FEATURES: {
+        // Here you can enable experimental features on an ember canary build
+        // e.g. EMBER_NATIVE_DECORATOR_SUPPORT: true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false,
+      },
+    },
+
+    APP: {
+      // Here you can pass flags/options to your application instance
+      // when it is created
+    },
+  };
+
+  if (environment === 'development') {
+    // ENV.APP.LOG_RESOLVER = true;
+    // ENV.APP.LOG_ACTIVE_GENERATION = true;
+    // ENV.APP.LOG_TRANSITIONS = true;
+    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
+    // ENV.APP.LOG_VIEW_LOOKUPS = true;
+  }
+
+  if (environment === 'test') {
+    // Testem prefers this...
+    ENV.locationType = 'none';
+
+    // keep test console output quieter
+    ENV.APP.LOG_ACTIVE_GENERATION = false;
+    ENV.APP.LOG_VIEW_LOOKUPS = false;
+
+    ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
+  }
+
+  if (environment === 'production') {
+    // here you can enable a production-specific feature
+  }
+
+  return ENV;
+};
diff --git a/smoke-tests/ember-test-app/config/optional-features.json b/smoke-tests/ember-test-app/config/optional-features.json
new file mode 100644
index 00000000000..b26286e2ecd
--- /dev/null
+++ b/smoke-tests/ember-test-app/config/optional-features.json
@@ -0,0 +1,6 @@
+{
+  "application-template-wrapper": false,
+  "default-async-observers": true,
+  "jquery-integration": false,
+  "template-only-glimmer-components": true
+}
diff --git a/smoke-tests/ember-test-app/config/targets.js b/smoke-tests/ember-test-app/config/targets.js
new file mode 100644
index 00000000000..3cd797ab4fc
--- /dev/null
+++ b/smoke-tests/ember-test-app/config/targets.js
@@ -0,0 +1,26 @@
+'use strict';
+
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions',
+];
+
+// Ember's browser support policy is changing, and IE11 support will end in
+// v4.0 onwards.
+//
+// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
+//
+// If you need IE11 support on a version of Ember that still offers support
+// for it, uncomment the code block below.
+//
+// const isCI = Boolean(process.env.CI);
+// const isProduction = process.env.EMBER_ENV === 'production';
+//
+// if (isCI || isProduction) {
+//   browsers.push('ie 11');
+// }
+
+module.exports = {
+  browsers,
+};
diff --git a/smoke-tests/ember-test-app/ember-cli-build.js b/smoke-tests/ember-test-app/ember-cli-build.js
new file mode 100644
index 00000000000..48e94e9e440
--- /dev/null
+++ b/smoke-tests/ember-test-app/ember-cli-build.js
@@ -0,0 +1,24 @@
+'use strict';
+
+const EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function (defaults) {
+  let app = new EmberApp(defaults, {
+    // Add options here
+  });
+
+  // Use `app.import` to add additional libraries to the generated
+  // output files.
+  //
+  // If you need to use different assets in different
+  // environments, specify an object as the first parameter. That
+  // object's keys should be the environment name and the values
+  // should be the asset to use in that environment.
+  //
+  // If the library that you are including contains AMD or ES6
+  // modules that you would like to import into your application
+  // please specify an object with the list of modules as keys
+  // along with the exports of each module as its value.
+
+  return app.toTree();
+};
diff --git a/smoke-tests/ember-test-app/package.json b/smoke-tests/ember-test-app/package.json
new file mode 100644
index 00000000000..3fe46b8a49d
--- /dev/null
+++ b/smoke-tests/ember-test-app/package.json
@@ -0,0 +1,71 @@
+{
+  "name": "ember-test-app",
+  "version": "0.0.0",
+  "private": true,
+  "description": "Small description for ember-test-app goes here",
+  "repository": "",
+  "license": "MIT",
+  "author": "",
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {
+    "build": "ember build --environment=production",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
+    "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
+    "lint:hbs": "ember-template-lint .",
+    "lint:hbs:fix": "ember-template-lint . --fix",
+    "lint:js": "eslint . --cache",
+    "lint:js:fix": "eslint . --fix",
+    "start": "ember serve",
+    "test": "npm-run-all lint test:*",
+    "test:ember": "ember test"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^2.0.0",
+    "@ember/test-helpers": "^2.4.2",
+    "@glimmer/component": "^1.0.4",
+    "@glimmer/tracking": "^1.0.4",
+    "babel-eslint": "^10.1.0",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-auto-import": "^2.2.4",
+    "ember-cli": "~3.28.4",
+    "ember-cli-app-version": "^5.0.0",
+    "ember-cli-babel": "^7.26.6",
+    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-htmlbars": "^5.7.1",
+    "ember-cli-inject-live-reload": "^2.1.0",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-terser": "^4.0.2",
+    "ember-data": "~3.28.0",
+    "ember-export-application-global": "^2.0.1",
+    "ember-fetch": "^8.1.1",
+    "ember-load-initializers": "^2.1.2",
+    "ember-maybe-import-regenerator": "^0.1.6",
+    "ember-page-title": "^6.2.2",
+    "ember-qunit": "^5.1.4",
+    "ember-resolver": "^8.0.2",
+    "ember-source": "~3.28.0",
+    "ember-template-lint": "^3.6.0",
+    "ember-welcome-page": "^4.0.0",
+    "eslint": "^7.32.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-ember": "^10.5.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-qunit": "^6.2.0",
+    "loader.js": "^4.7.0",
+    "npm-run-all": "^4.1.5",
+    "prettier": "^2.3.2",
+    "qunit": "^2.16.0",
+    "qunit-dom": "^1.6.0",
+    "webpack": "^5.65.0"
+  },
+  "engines": {
+    "node": "12.* || 14.* || >= 16"
+  },
+  "ember": {
+    "edition": "octane"
+  }
+}
diff --git a/smoke-tests/ember-test-app/public/robots.txt b/smoke-tests/ember-test-app/public/robots.txt
new file mode 100644
index 00000000000..f5916452e5f
--- /dev/null
+++ b/smoke-tests/ember-test-app/public/robots.txt
@@ -0,0 +1,3 @@
+# http://www.robotstxt.org
+User-agent: *
+Disallow:
diff --git a/smoke-tests/ember-test-app/testem.js b/smoke-tests/ember-test-app/testem.js
new file mode 100644
index 00000000000..ed2f37124ad
--- /dev/null
+++ b/smoke-tests/ember-test-app/testem.js
@@ -0,0 +1,23 @@
+'use strict';
+
+module.exports = {
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: ['Chrome'],
+  launch_in_dev: ['Chrome'],
+  browser_start_timeout: 120,
+  browser_args: {
+    Chrome: {
+      ci: [
+        // --no-sandbox is needed when running Chrome inside a container
+        process.env.CI ? '--no-sandbox' : null,
+        '--headless',
+        '--disable-dev-shm-usage',
+        '--disable-software-rasterizer',
+        '--mute-audio',
+        '--remote-debugging-port=0',
+        '--window-size=1440,900',
+      ].filter(Boolean),
+    },
+  },
+};
diff --git a/smoke-tests/ember-test-app/tests/helpers/.gitkeep b/smoke-tests/ember-test-app/tests/helpers/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/tests/index.html b/smoke-tests/ember-test-app/tests/index.html
new file mode 100644
index 00000000000..87263eb9d1b
--- /dev/null
+++ b/smoke-tests/ember-test-app/tests/index.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>EmberTestApp Tests</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+
+    {{content-for "head"}}
+    {{content-for "test-head"}}
+
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/ember-test-app.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
+
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
+          <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+  <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
+
+    <div id="qunit"></div>
+    <div id="qunit-fixture">
+      <div id="ember-testing-container">
+        <div id="ember-testing"></div>
+      </div>
+    </div>
+
+    <script src="/testem.js" integrity="" data-embroider-ignore></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/test-support.js"></script>
+    <script src="{{rootURL}}assets/ember-test-app.js"></script>
+    <script src="{{rootURL}}assets/tests.js"></script>
+
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
+  </body>
+</html>
diff --git a/smoke-tests/ember-test-app/tests/integration/.gitkeep b/smoke-tests/ember-test-app/tests/integration/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/tests/test-helper.js b/smoke-tests/ember-test-app/tests/test-helper.js
new file mode 100644
index 00000000000..2edd1d30e3c
--- /dev/null
+++ b/smoke-tests/ember-test-app/tests/test-helper.js
@@ -0,0 +1,12 @@
+import Application from 'ember-test-app/app';
+import config from 'ember-test-app/config/environment';
+import * as QUnit from 'qunit';
+import { setApplication } from '@ember/test-helpers';
+import { setup } from 'qunit-dom';
+import { start } from 'ember-qunit';
+
+setApplication(Application.create(config.APP));
+
+setup(QUnit.assert);
+
+start();
diff --git a/smoke-tests/ember-test-app/tests/unit/.gitkeep b/smoke-tests/ember-test-app/tests/unit/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/smoke-tests/ember-test-app/vendor/.gitkeep b/smoke-tests/ember-test-app/vendor/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d

From 757a0d8234f9d62d47d50ebbdafb1a4d1afc7842 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Dec 2021 15:09:45 +0000
Subject: [PATCH 0748/1405] Bump actions/upload-artifact from 2.2.4 to 2.3.1

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2.2.4 to 2.3.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2.2.4...v2.3.1)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4912f5b752c..8488e5b97d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
           BROCCOLI_ENV: production
         run: yarn ember build
       - name: Upload build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v2.3.1
         with:
           name: dist
           path: dist

From 25ce856785551c55ab307bfd52ec46b25e43236c Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Tue, 28 Dec 2021 01:39:46 +0000
Subject: [PATCH 0749/1405] [BUGFIX beta] Fix url for deprecate-auto-location
 deprecation

---
 packages/@ember/-internals/routing/lib/location/api.ts  | 2 +-
 packages/@ember/-internals/routing/lib/system/router.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index 5b8e16c2a59..969c4ef19ce 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -117,7 +117,7 @@ export default {
       {
         id: 'deprecate-auto-location',
         until: '5.0.0',
-        url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-auto-location',
+        url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
         for: 'ember-source',
         since: {
           enabled: '4.1.0',
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 14478e246c6..ae7336ab3cd 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -829,7 +829,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
           {
             id: 'deprecate-auto-location',
             until: '5.0.0',
-            url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-auto-location',
+            url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
             for: 'ember-source',
             since: {
               enabled: '4.1.0',
@@ -866,7 +866,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
             {
               id: 'deprecate-auto-location',
               until: '5.0.0',
-              url: 'https://emberjs.com/deprecations/v3.x#toc_deprecate-auto-location',
+              url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
               for: 'ember-source',
               since: {
                 enabled: '4.1.0',

From 19fcd0906cdb4803652ea402745c40df9d83bfa1 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 28 Dec 2021 16:48:55 -0500
Subject: [PATCH 0750/1405] Add v4.1.0 to CHANGELOG

(cherry picked from commit f28832a488050099c66521703272dcddd066a65c)
---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c688b9f8b0f..e701b0b1da3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Ember Changelog
 
-### v4.1.0-beta.1 (November 19, 2021)
+### v4.1.0 (December 28, 2021)
 
 - [#19772](https://github.com/emberjs/ember.js/pull/19772) / [#19826](https://github.com/emberjs/ember.js/pull/19826) [FEATURE] Add a `@cached` decorator per [RFC #0566](https://github.com/emberjs/rfcs/blob/af64915b5ecde010fce09309a47ee6d2447588d0/text/0566-memo-decorator.md).
 - [#19471](https://github.com/emberjs/ember.js/pull/19471) / [#19834](https://github.com/emberjs/ember.js/pull/19834) [FEATURE] Add `refresh` method to the Router Service per [RFC #0631](https://github.com/emberjs/rfcs/blob/master/text/0631-refresh-method-for-router-service.md).
@@ -8,7 +8,6 @@
 - [#19510](https://github.com/emberjs/ember.js/pull/19510) [DEPRECATION] Deprecate auto location per [RFC #0711](https://github.com/emberjs/rfcs/blob/master/text/0711-deprecate-auto-location.md).
 - [#17570](https://github.com/emberjs/ember.js/pull/17570) [BUGFIX] Passing ObjectProxy with a property size to `isEmpty` would throw assertion
 - [#18269](https://github.com/emberjs/ember.js/pull/18269) [BUGFIX] Fix for when query params are using a nested value
-- [#19787](https://github.com/emberjs/ember.js/pull/19787) Setup basic infrastructure to ensure destroyables destroyed
 
 ### v4.0.1 (December 1, 2021)
 

From 4207892094a709dee7680018cae4d9b6f1379e49 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Tue, 28 Dec 2021 22:16:28 -0600
Subject: [PATCH 0751/1405] re-enable no-console which ESLint 6 removed as a
 recommended rule

---
 .eslintrc.js                                            | 1 +
 packages/@ember/-internals/glimmer/lib/renderer.ts      | 1 +
 packages/@ember/-internals/routing/lib/system/router.ts | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 822775333bd..e73749bca74 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -12,6 +12,7 @@ module.exports = {
   ],
   plugins: ['ember-internal', 'import', 'qunit', 'disable-features'],
   rules: {
+    'no-console': 'error',
     'no-implicit-coercion': 'error',
     'no-new-wrappers': 'error',
     'no-unused-vars': 'error',
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 85d64cecf5d..9ba09a05954 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -96,6 +96,7 @@ function errorLoopTransaction(fn: () => void) {
           // Noop the function so that we won't keep calling it and causing
           // infinite looping failures;
           fn = () => {
+            // eslint-disable-next-line no-console
             console.warn(
               'Attempted to rerender, but the Ember application has had an unrecoverable error occur during render. You should reload the application after fixing the cause of the error.'
             );
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index ae7336ab3cd..d9120240c4b 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -684,8 +684,8 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     if (DEBUG) {
       let infos = this._routerMicrolib.currentRouteInfos;
       if (this.namespace.LOG_TRANSITIONS) {
-        // eslint-disable-next-line no-console
         assert('expected infos to be set', infos);
+        // eslint-disable-next-line no-console
         console.log(`Intermediate-transitioned into '${EmberRouter._routePath(infos)}'`);
       }
     }

From 23cf57c4e3f378d9da0cc11e91fae62b9ffba1c3 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Tue, 28 Dec 2021 22:39:14 -0600
Subject: [PATCH 0752/1405] eslint --fix --report-unused-disable-directives

---
 bin/run-browserstack-tests.js                                   | 2 +-
 bin/run-tests-browser-runner.js                                 | 2 +-
 packages/@ember/-internals/bootstrap/index.ts                   | 1 -
 .../glimmer/tests/integration/helpers/closure-action-test.js    | 1 -
 packages/@ember/-internals/metal/lib/alias.ts                   | 1 -
 packages/@ember/-internals/routing/lib/system/dsl.ts            | 1 -
 packages/@ember/-internals/routing/lib/system/route.ts          | 1 -
 packages/@ember/application/lib/application.js                  | 2 --
 packages/@ember/debug/index.ts                                  | 2 +-
 packages/ember/index.js                                         | 1 -
 packages/loader/lib/index.js                                    | 1 -
 tests/docs/coverage-test.js                                     | 1 -
 12 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/bin/run-browserstack-tests.js b/bin/run-browserstack-tests.js
index 94587018a49..60eb5435d60 100755
--- a/bin/run-browserstack-tests.js
+++ b/bin/run-browserstack-tests.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-console, node/no-unsupported-features/es-syntax */
+/* eslint-disable no-console */
 
 const execa = require('execa');
 const chalk = require('chalk');
diff --git a/bin/run-tests-browser-runner.js b/bin/run-tests-browser-runner.js
index 01df5a98d4b..6c6fed31ca0 100644
--- a/bin/run-tests-browser-runner.js
+++ b/bin/run-tests-browser-runner.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-console, node/no-unsupported-features/es-syntax */
+/* eslint-disable no-console */
 
 'use strict';
 
diff --git a/packages/@ember/-internals/bootstrap/index.ts b/packages/@ember/-internals/bootstrap/index.ts
index 818e29cc74a..1e615b7664d 100644
--- a/packages/@ember/-internals/bootstrap/index.ts
+++ b/packages/@ember/-internals/bootstrap/index.ts
@@ -2,7 +2,6 @@ import require from 'require';
 
 (function bootstrap() {
   // Bootstrap Node module
-  // eslint-disable-next-line no-undef
   if (typeof module === 'object' && typeof module.require === 'function') {
     // tslint:disable-next-line: no-require-imports
     module.exports = require('ember').default;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index a75b22e0f20..898638fa445 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -373,7 +373,6 @@ moduleFor(
       let OuterComponent = Component.extend({
         third,
         outerSubmit() {
-          // eslint-disable-line no-unused-vars
           actualArgs = [...arguments];
         },
       });
diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index e7b62f189b1..c54e7b3173c 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -113,7 +113,6 @@ export class AliasedProperty extends ComputedDescriptor {
 }
 
 function AliasedProperty_readOnlySet(obj: object, keyName: string): never {
-  // eslint-disable-line no-unused-vars
   throw new EmberError(`Cannot set read-only property '${keyName}' on object: ${inspect(obj)}`);
 }
 
diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts
index 554120584d7..2b06e3b262d 100644
--- a/packages/@ember/-internals/routing/lib/system/dsl.ts
+++ b/packages/@ember/-internals/routing/lib/system/dsl.ts
@@ -61,7 +61,6 @@ export default class DSLImpl implements DSL {
     this.options = options;
   }
 
-  /* eslint-disable no-dupe-class-members */
   route(name: string): void;
   route(name: string, callback: DSLCallback): void;
   route(name: string, options: RouteOptions): void;
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 0ae59b37d5b..229be18fb78 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1477,7 +1477,6 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   setupController(controller: Controller, context: {}, _transition?: Transition) {
-    // eslint-disable-line no-unused-vars
     if (controller && context !== undefined) {
       set(controller, 'model', context);
     }
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.js
index ff0c92d5c49..5cbf5076571 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.js
@@ -346,7 +346,6 @@ const Application = Engine.extend({
   _applicationInstances: null,
 
   init() {
-    // eslint-disable-line no-unused-vars
     this._super(...arguments);
 
     if (DEBUG) {
@@ -1124,7 +1123,6 @@ Application.reopenClass({
     @private
   */
   buildRegistry() {
-    // eslint-disable-line no-unused-vars
     let registry = this._super(...arguments);
 
     commonSetupRegistry(registry);
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 514006ce305..9884299ff06 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -194,7 +194,7 @@ if (DEBUG) {
     } else {
       console.log(`DEBUG: ${message}`);
     }
-    /* eslint-ensable no-console */
+    /* eslint-enable no-console */
   });
 
   /**
diff --git a/packages/ember/index.js b/packages/ember/index.js
index a25538e3f1a..579692e922b 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -76,7 +76,6 @@ import {
   Input,
   isSerializationFirstNode,
 } from '@ember/-internals/glimmer';
-// eslint-disable-next-line import/no-unresolved
 import VERSION from './version';
 import * as views from '@ember/-internals/views';
 import * as routing from '@ember/-internals/routing';
diff --git a/packages/loader/lib/index.js b/packages/loader/lib/index.js
index 1f87fa135f9..3b7a5782c9a 100644
--- a/packages/loader/lib/index.js
+++ b/packages/loader/lib/index.js
@@ -81,7 +81,6 @@ var define, require;
     return internalRequire(name, null);
   };
 
-  // eslint-disable-next-line no-unused-vars
   define = function (name, deps, callback) {
     registry[name] = { deps: deps, callback: callback };
   };
diff --git a/tests/docs/coverage-test.js b/tests/docs/coverage-test.js
index a355536b42e..9c3b56f60c7 100644
--- a/tests/docs/coverage-test.js
+++ b/tests/docs/coverage-test.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 'use strict';
 
 const path = require('path');

From 3c4dc114040cf611d8c39e95b6c289463bd04bb5 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Wed, 29 Dec 2021 08:03:40 -0600
Subject: [PATCH 0753/1405] add reportUnusedDisableDirectives to eslint config
 for warnings

---
 .eslintrc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index e73749bca74..65492b31732 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -3,6 +3,7 @@ const path = require('path');
 module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
+  reportUnusedDisableDirectives: true,
   extends: [
     'eslint:recommended',
     'plugin:import/errors',

From 166bc48410a6f3bd724111d2f57f62c9f692d771 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:17:41 -0600
Subject: [PATCH 0754/1405] eslint --report-unused-disable-directives

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1b96c1e7ffe..ee388ec5bba 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "start": "ember serve",
     "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"",
     "lint:docs": "qunit tests/docs/coverage-test.js",
-    "lint:eslint": "eslint . --cache",
+    "lint:eslint": "eslint --report-unused-disable-directives --cache .",
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
     "lint:tsc": "tsc --noEmit",
     "lint:tslint": "tslint -p tsconfig.json",

From 2257c450d072734a0030b61b9a35b355515a9746 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Wed, 29 Dec 2021 10:20:11 -0600
Subject: [PATCH 0755/1405] update deps again

---
 package.json |  8 ++---
 yarn.lock    | 98 ++++++++++++++++++++++++++--------------------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index ee388ec5bba..c303ae04d9a 100644
--- a/package.json
+++ b/package.json
@@ -91,8 +91,8 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.2",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.8.1",
+    "@typescript-eslint/parser": "^5.8.1",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
@@ -114,7 +114,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.4.1",
+    "eslint": "^8.5.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
@@ -122,7 +122,7 @@
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-qunit": "^7.1.0",
+    "eslint-plugin-qunit": "^7.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.13.0",
     "express": "^4.17.1",
diff --git a/yarn.lock b/yarn.lock
index 13f9cfbd04c..e2335557606 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2710,13 +2710,13 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.6.0.tgz#efd8668b3d6627c46ce722c2afe813928fe120a0"
-  integrity sha512-MIbeMy5qfLqtgs1hWd088k1hOuRsN9JrHUPwVVKCD99EOUqScd7SrwoZl4Gso05EAP9w1kvLWUVGJOVpRPkDPA==
+"@typescript-eslint/eslint-plugin@^5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz#97dfaa39f38e99f86801fdf34f9f1bed66704258"
+  integrity sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==
   dependencies:
-    "@typescript-eslint/experimental-utils" "5.6.0"
-    "@typescript-eslint/scope-manager" "5.6.0"
+    "@typescript-eslint/experimental-utils" "5.8.1"
+    "@typescript-eslint/scope-manager" "5.8.1"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -2724,60 +2724,60 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.6.0.tgz#f3a5960f2004abdcac7bb81412bafc1560841c23"
-  integrity sha512-VDoRf3Qj7+W3sS/ZBXZh3LBzp0snDLEgvp6qj0vOAIiAPM07bd5ojQ3CTzF/QFl5AKh7Bh1ycgj6lFBJHUt/DA==
+"@typescript-eslint/experimental-utils@5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz#01861eb2f0749f07d02db342b794145a66ed346f"
+  integrity sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.6.0"
-    "@typescript-eslint/types" "5.6.0"
-    "@typescript-eslint/typescript-estree" "5.6.0"
+    "@typescript-eslint/scope-manager" "5.8.1"
+    "@typescript-eslint/types" "5.8.1"
+    "@typescript-eslint/typescript-estree" "5.8.1"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.6.0.tgz#11677324659641400d653253c03dcfbed468d199"
-  integrity sha512-YVK49NgdUPQ8SpCZaOpiq1kLkYRPMv9U5gcMrywzI8brtwZjr/tG3sZpuHyODt76W/A0SufNjYt9ZOgrC4tLIQ==
+"@typescript-eslint/parser@^5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.8.1.tgz#380f5f1e596b540059998aa3fc80d78f0f9b0d0a"
+  integrity sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.6.0"
-    "@typescript-eslint/types" "5.6.0"
-    "@typescript-eslint/typescript-estree" "5.6.0"
+    "@typescript-eslint/scope-manager" "5.8.1"
+    "@typescript-eslint/types" "5.8.1"
+    "@typescript-eslint/typescript-estree" "5.8.1"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.6.0.tgz#9dd7f007dc8f3a34cdff6f79f5eaab27ae05157e"
-  integrity sha512-1U1G77Hw2jsGWVsO2w6eVCbOg0HZ5WxL/cozVSTfqnL/eB9muhb8THsP0G3w+BB5xAHv9KptwdfYFAUfzcIh4A==
+"@typescript-eslint/scope-manager@5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz#7fc0604f7ade8833e4d42cebaa1e2debf8b932e4"
+  integrity sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==
   dependencies:
-    "@typescript-eslint/types" "5.6.0"
-    "@typescript-eslint/visitor-keys" "5.6.0"
+    "@typescript-eslint/types" "5.8.1"
+    "@typescript-eslint/visitor-keys" "5.8.1"
 
-"@typescript-eslint/types@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.6.0.tgz#745cb1b59daadcc1f32f7be95f0f68accf38afdd"
-  integrity sha512-OIZffked7mXv4mXzWU5MgAEbCf9ecNJBKi+Si6/I9PpTaj+cf2x58h2oHW5/P/yTnPkKaayfjhLvx+crnl5ubA==
+"@typescript-eslint/types@5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.1.tgz#04c6b49ebc8c99238238a6b8b43f2fc613983b5a"
+  integrity sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==
 
-"@typescript-eslint/typescript-estree@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.6.0.tgz#dfbb19c9307fdd81bd9c650c67e8397821d7faf0"
-  integrity sha512-92vK5tQaE81rK7fOmuWMrSQtK1IMonESR+RJR2Tlc7w4o0MeEdjgidY/uO2Gobh7z4Q1hhS94Cr7r021fMVEeA==
+"@typescript-eslint/typescript-estree@5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz#a592855be688e7b729a1e9411d7d74ec992ed6ef"
+  integrity sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==
   dependencies:
-    "@typescript-eslint/types" "5.6.0"
-    "@typescript-eslint/visitor-keys" "5.6.0"
+    "@typescript-eslint/types" "5.8.1"
+    "@typescript-eslint/visitor-keys" "5.8.1"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.6.0.tgz#3e36509e103fe9713d8f035ac977235fd63cb6e6"
-  integrity sha512-1p7hDp5cpRFUyE3+lvA74egs+RWSgumrBpzBCDzfTFv0aQ7lIeay80yU0hIxgAhwQ6PcasW35kaOCyDOv6O/Ng==
+"@typescript-eslint/visitor-keys@5.8.1":
+  version "5.8.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz#58a2c566265d5511224bc316149890451c1bbab0"
+  integrity sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==
   dependencies:
-    "@typescript-eslint/types" "5.6.0"
+    "@typescript-eslint/types" "5.8.1"
     eslint-visitor-keys "^3.0.0"
 
 "@xmldom/xmldom@^0.7.1":
@@ -5797,10 +5797,10 @@ eslint-plugin-prettier@^4.0.0:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-qunit@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.1.0.tgz#d0d4f9f9f2b9623953a4b7f1ca8a71f4aa7df2b7"
-  integrity sha512-w1+iL/+idpHGNgWYKknY7uPA3EaVDgl4HT4ndkNM2ONr/MW3FTM3FLRpy6yDZ5YE3km372Ym9Vr/N28E3OI6Jg==
+eslint-plugin-qunit@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.2.0.tgz#ad00e0007dc0bbd1d59309cc6388238b6a8784a3"
+  integrity sha512-ebT6aOpmMj4vchG0hVw9Ukbutk/lgywrc8gc9w9hH2/4WjKqwMlyM7iVwqB7OAXv6gtQMJZuziT0wNjjymAuWA==
   dependencies:
     eslint-utils "^3.0.0"
     requireindex "^1.2.0"
@@ -5850,10 +5850,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
   integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
 
-eslint@^8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.4.1.tgz#d6531bbf3e598dffd7c0c7d35ec52a0b30fdfa2d"
-  integrity sha512-TxU/p7LB1KxQ6+7aztTnO7K0i+h0tDi81YRY9VzB6Id71kNz+fFYnf5HD5UOQmxkzcoa0TlVZf9dpMtUv0GpWg==
+eslint@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f"
+  integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==
   dependencies:
     "@eslint/eslintrc" "^1.0.5"
     "@humanwhocodes/config-array" "^0.9.2"

From 14be5c9ef004196fbcee98d9bf6c9d83854857e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 15:05:23 +0000
Subject: [PATCH 0756/1405] Bump eslint-plugin-prettier from 3.4.1 to 4.0.0

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.4.1 to 4.0.0.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits/v4.0.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 206ad32053c..0eae9a06723 100644
--- a/package.json
+++ b/package.json
@@ -119,7 +119,7 @@
     "eslint-plugin-ember-internal": "^2.0.0",
     "eslint-plugin-import": "^2.25.3",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^6.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.13.0",
diff --git a/yarn.lock b/yarn.lock
index d93a7c7e5f0..19e2e4747ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5816,10 +5816,10 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
-  integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
+eslint-plugin-prettier@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
+  integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 

From 06947c4c6eebf1d43103e237d9b5ed56061bdef3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 15:06:33 +0000
Subject: [PATCH 0757/1405] Bump @babel/helper-module-imports from 7.16.0 to
 7.16.7

Bumps [@babel/helper-module-imports](https://github.com/babel/babel/tree/HEAD/packages/babel-helper-module-imports) from 7.16.0 to 7.16.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.7/packages/babel-helper-module-imports)

---
updated-dependencies:
- dependency-name: "@babel/helper-module-imports"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 206ad32053c..34f3fc724ef 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "test:browserstack": "node bin/run-browserstack-tests.js"
   },
   "dependencies": {
-    "@babel/helper-module-imports": "^7.16.0",
+    "@babel/helper-module-imports": "^7.16.7",
     "@babel/plugin-transform-block-scoping": "^7.16.0",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.83.1",
diff --git a/yarn.lock b/yarn.lock
index d93a7c7e5f0..72041509ef4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -384,12 +384,12 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.16.0", "@babel/helper-module-imports@^7.8.3":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
-  integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.8.3":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.16.7"
 
 "@babel/helper-module-transforms@^7.12.1":
   version "7.12.1"
@@ -599,6 +599,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
 "@babel/helper-validator-option@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
@@ -2287,12 +2292,12 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba"
-  integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==
+"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.7", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
+  integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.15.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
 "@cnakazawa/watch@^1.0.3":

From b50b0f8ea1ff14963d765b761048e6077c0df2d5 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 4 Jan 2022 15:48:43 -0700
Subject: [PATCH 0758/1405] Add documentation for `setComponentManager`

---
 .../@ember/-internals/glimmer/lib/utils/managers.ts   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 21cc5c55ff1..1c7a8674292 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -6,6 +6,17 @@ import {
   setComponentManager as glimmerSetComponentManager,
 } from '@glimmer/manager';
 
+/**
+   Associate a class with a component manager (an object that is responsible for
+   coordinating the lifecycle events that occurs when invoking, rendering and
+   re-rendering a component).
+
+   @method setComponentManager
+   @param {Function} factory a function to create the owner for an object
+   @param {Object} obj the object to associate with the componetn manager
+   @return {Object} the same object passed in
+   @public
+  */
 export function setComponentManager(
   manager: (owner: Owner) => ComponentManager<unknown>,
   obj: object

From 6bf0153354dd51a5270147db7892bc424b444246 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Fri, 17 Dec 2021 23:52:36 -0500
Subject: [PATCH 0759/1405] [Bugfix release] Allow class-based helpers in
 strict-mode

https://github.com/emberjs/ember.js/issues/19877
---
 .../@ember/-internals/glimmer/lib/helper.ts   |  2 +-
 .../tests/integration/custom-helper-test.js   | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 packages/@ember/-internals/glimmer/tests/integration/custom-helper-test.js

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 253de1031f0..36b6060caf6 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -179,7 +179,7 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 
   getDebugName(definition: ClassHelperFactory) {
-    return getDebugName!(definition.class!['prototype']);
+    return getDebugName!((definition.class || definition)!['prototype']);
   }
 }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-helper-test.js
new file mode 100644
index 00000000000..88efc31cf7d
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-helper-test.js
@@ -0,0 +1,78 @@
+import { RenderingTestCase, moduleFor, strip } from 'internal-test-helpers';
+
+import { precompileJSON } from '@glimmer/compiler';
+import { getTemplateLocals } from '@glimmer/syntax';
+import { createTemplateFactory } from '@ember/template-factory';
+
+import { Helper } from '../../index';
+import { setComponentTemplate } from '@glimmer/manager';
+import { templateOnlyComponent } from '@glimmer/runtime';
+
+// eslint-disable-next-line ember-internal/require-yuidoc-access
+/**
+ * The template-compiler does not support strict mode at this time.
+ * precompile from ember-template-compiler returns a string and
+ * not a template-factory, so it doesn't help with strict-mode testing.
+ *
+ * We also can't import from `@ember/template-compiler` because it
+ * doesn't exist to this kind of test, otherwise we'd be able to use
+ * precompileTemplate, which would be perfect :D
+ *
+ * Copied(ish) from https://github.com/NullVoxPopuli/ember-repl/blob/main/addon/hbs.ts#L51
+ */
+function precompileTemplate(source, { moduleName, scope = {} }) {
+  let locals = getTemplateLocals(source);
+
+  let options = {
+    strictMode: true,
+    moduleName,
+    locals,
+    isProduction: false,
+    meta: { moduleName },
+  };
+
+  // Copied from @glimmer/compiler/lib/compiler#precompile
+  let [block, usedLocals] = precompileJSON(source, options);
+  let usedScope = usedLocals.map((key) => scope[key]);
+
+  let blockJSON = JSON.stringify(block);
+  let templateJSONObject = {
+    id: moduleName,
+    block: blockJSON,
+    moduleName: moduleName ?? '(unknown template module)',
+    scope: () => usedScope,
+    isStrictMode: true,
+  };
+
+  let factory = createTemplateFactory(templateJSONObject);
+
+  return factory;
+}
+
+moduleFor(
+  'Custom Helper test',
+  class extends RenderingTestCase {
+    ['@test works with strict-mode']() {
+      class Custom extends Helper {
+        compute([value]) {
+          return `${value}-custom`;
+        }
+      }
+
+      let template = strip`
+        {{ (Custom 'my-test') }}
+      `;
+
+      let templateFactory = precompileTemplate(template, {
+        moduleName: 'strict-mode',
+        scope: { Custom },
+      });
+
+      let TestComponent = setComponentTemplate(templateFactory, templateOnlyComponent());
+
+      this.render(`<this.TestComponent />`, { TestComponent });
+      this.assertText('my-test-custom');
+      this.assertStableRerender();
+    }
+  }
+);

From 5ea53d595877c49aad18c8a6ca68d23b1ea226f5 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 7 Jan 2022 14:51:55 -0500
Subject: [PATCH 0760/1405] Add v4.2.0-beta.1 to CHANGELOG

(cherry picked from commit 3b4b36d97235dddda882e014a0727fb5a41195a8)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e701b0b1da3..9bc3313bb27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.2.0-beta.1 (December 28, 2021)
+
+- [#19878](https://github.com/emberjs/ember.js/pull/19772) [BUGFIX] Allow class-based helpers to work in strict-mode.
+
 ### v4.1.0 (December 28, 2021)
 
 - [#19772](https://github.com/emberjs/ember.js/pull/19772) / [#19826](https://github.com/emberjs/ember.js/pull/19826) [FEATURE] Add a `@cached` decorator per [RFC #0566](https://github.com/emberjs/rfcs/blob/af64915b5ecde010fce09309a47ee6d2447588d0/text/0566-memo-decorator.md).

From 19ae8d7fda0245e91b4c736a7332a45938a0890f Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 7 Jan 2022 14:53:46 -0500
Subject: [PATCH 0761/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 206ad32053c..a8272b55996 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.2.0-alpha.1",
+  "version": "4.3.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": ["ember-addon"],
   "homepage": "https://emberjs.com/",

From db26be197cd7572d51c3b64b22b01f06ead8dda0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 9 Jan 2022 16:09:48 +0000
Subject: [PATCH 0762/1405] Bump ember-cli-version-checker from 5.1.1 to 5.1.2

Bumps [ember-cli-version-checker](https://github.com/ember-cli/ember-cli-version-checker) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/ember-cli/ember-cli-version-checker/releases)
- [Changelog](https://github.com/ember-cli/ember-cli-version-checker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/ember-cli-version-checker/compare/v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: ember-cli-version-checker
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 10aa24f2b7c..475f63c5b36 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
-    "ember-cli-version-checker": "^5.1.1",
+    "ember-cli-version-checker": "^5.1.2",
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.13.1",
     "resolve": "^1.17.0",
diff --git a/yarn.lock b/yarn.lock
index 0459f7a1c42..6ad48c93b22 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5289,13 +5289,13 @@ ember-cli-version-checker@^4.1.0:
     semver "^6.3.0"
     silent-error "^1.1.1"
 
-ember-cli-version-checker@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.1.tgz#3185c526c14671609cbd22ab0d0925787fc84f3d"
-  integrity sha512-YziSW1MgOuVdJSyUY2CKSC4vXrGQIHF6FgygHkJOxYGjZNQYwf5MK0sbliKatvJf7kzDSnXs+r8JLrD74W/A8A==
+ember-cli-version-checker@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
+  integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
   dependencies:
-    resolve-package-path "^2.0.0"
-    semver "^7.3.2"
+    resolve-package-path "^3.1.0"
+    semver "^7.3.4"
     silent-error "^1.1.1"
 
 ember-cli-yuidoc@^0.9.1:

From 02ebee35608f2ad171ec54327e498299b1c8e72e Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 14:10:58 -0700
Subject: [PATCH 0763/1405] controller test

---
 node-tests/blueprints/controller-test.js | 231 +----------------------
 1 file changed, 5 insertions(+), 226 deletions(-)

diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js
index 289e452228f..0993caf9ea0 100644
--- a/node-tests/blueprints/controller-test.js
+++ b/node-tests/blueprints/controller-test.js
@@ -19,229 +19,6 @@ const enableOctane = setupTestEnvironment.enableOctane;
 describe('Blueprint: controller', function () {
   setupTestHooks(this);
 
-  describe('in app', function () {
-    beforeEach(function () {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('controller foo', function () {
-      return emberGenerateDestroy(['controller', 'foo'], (_file) => {
-        expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
-
-        expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo.js', function () {
-      return emberGenerateDestroy(['controller', 'foo.js'], (_file) => {
-        expect(_file('app/controllers/foo.js.js')).to.not.exist;
-        expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
-
-        expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
-
-        expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo/bar', function () {
-      return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
-        expect(_file('app/controllers/foo/bar.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-      });
-    });
-
-    it('controller foo --pod', function () {
-      return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
-        expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
-
-        expect(_file('tests/unit/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo.js --pod', function () {
-      return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
-        expect(_file('app/foo.js/controller.js')).to.not.exist;
-        expect(_file('tests/unit/foo.js/controller-test.js')).to.not.exist;
-
-        expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
-
-        expect(_file('tests/unit/foo/controller-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo/bar --pod', function () {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], (_file) => {
-        expect(_file('app/foo/bar/controller.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('tests/unit/foo/bar/controller-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-      });
-    });
-
-    describe('with podModulePrefix', function () {
-      beforeEach(function () {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('controller foo --pod podModulePrefix', function () {
-        return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
-
-          expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
-            fixture('controller-test/default.js')
-          );
-        });
-      });
-
-      it('controller foo.js --pod podModulePrefix', function () {
-        return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
-          expect(_file('app/pods/foo.js/controller.js')).to.not.exist;
-          expect(_file('tests/unit/pods/foo.js/controller-test.js')).to.not.exist;
-
-          expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
-
-          expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
-            fixture('controller-test/default.js')
-          );
-        });
-      });
-
-      it('controller foo/bar --pod podModulePrefix', function () {
-        return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/bar/controller.js')).to.equal(
-            fixture('controller/controller-nested.js')
-          );
-
-          expect(_file('tests/unit/pods/foo/bar/controller-test.js')).to.equal(
-            fixture('controller-test/default-nested.js')
-          );
-        });
-      });
-    });
-  });
-
-  describe('in addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('controller foo', function () {
-      return emberGenerateDestroy(['controller', 'foo'], (_file) => {
-        expect(_file('addon/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
-
-        expect(_file('app/controllers/foo.js')).to.contain(
-          "export { default } from 'my-addon/controllers/foo';"
-        );
-
-        expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo.js', function () {
-      return emberGenerateDestroy(['controller', 'foo.js'], (_file) => {
-        expect(_file('addon/controllers/foo.js.js')).to.not.exist;
-        expect(_file('app/controllers/foo.js.js')).to.not.exist;
-        expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
-
-        expect(_file('addon/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
-
-        expect(_file('app/controllers/foo.js')).to.contain(
-          "export { default } from 'my-addon/controllers/foo';"
-        );
-
-        expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
-      });
-    });
-
-    it('controller foo/bar', function () {
-      return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
-        expect(_file('addon/controllers/foo/bar.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('app/controllers/foo/bar.js')).to.contain(
-          "export { default } from 'my-addon/controllers/foo/bar';"
-        );
-
-        expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
-      });
-    });
-
-    it('controller foo --dummy', function () {
-      return emberGenerateDestroy(['controller', 'foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('app/controllers/foo-test.js')).to.not.exist;
-
-        expect(_file('tests/unit/controllers/foo-test.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo.js --dummy', function () {
-      return emberGenerateDestroy(['controller', 'foo.js', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/controllers/foo.js.js')).to.not.exist;
-
-        expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
-          fixture('controller/controller.js')
-        );
-
-        expect(_file('app/controllers/foo-test.js')).to.not.exist;
-
-        expect(_file('tests/unit/controllers/foo-test.js')).to.not.exist;
-      });
-    });
-
-    it('controller foo/bar --dummy', function () {
-      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/controllers/foo/bar.js')).to.equal(
-          fixture('controller/controller-nested.js')
-        );
-
-        expect(_file('app/controllers/foo/bar.js')).to.not.exist;
-
-        expect(_file('tests/unit/controllers/foo/bar-test.js')).to.not.exist;
-      });
-    });
-  });
-
   describe('in app - octane', function () {
     enableOctane();
 
@@ -296,6 +73,7 @@ describe('Blueprint: controller', function () {
     });
 
     describe('with podModulePrefix', function () {
+      enableOctane();
       beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
@@ -432,6 +210,7 @@ describe('Blueprint: controller', function () {
   });
 
   describe('in in-repo-addon', function () {
+    enableOctane();
     beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
@@ -446,7 +225,7 @@ describe('Blueprint: controller', function () {
     it('controller foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['controller', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/controllers/foo.js')).to.equal(
-          fixture('controller/controller.js')
+          fixture('controller/native-controller.js')
         );
 
         expect(_file('lib/my-addon/app/controllers/foo.js')).to.contain(
@@ -466,7 +245,7 @@ describe('Blueprint: controller', function () {
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
 
         expect(_file('lib/my-addon/addon/controllers/foo.js')).to.equal(
-          fixture('controller/controller.js')
+          fixture('controller/native-controller.js')
         );
 
         expect(_file('lib/my-addon/app/controllers/foo.js')).to.contain(
@@ -484,7 +263,7 @@ describe('Blueprint: controller', function () {
         ['controller', 'foo/bar', '--in-repo-addon=my-addon'],
         (_file) => {
           expect(_file('lib/my-addon/addon/controllers/foo/bar.js')).to.equal(
-            fixture('controller/controller-nested.js')
+            fixture('controller/native-controller-nested.js')
           );
 
           expect(_file('lib/my-addon/app/controllers/foo/bar.js')).to.contain(

From 29317a6ad046bf929150069a3ef259f5c3cd37cb Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 14:11:07 -0700
Subject: [PATCH 0764/1405] component test

---
 node-tests/blueprints/component-test.js | 1232 +++++------------------
 1 file changed, 261 insertions(+), 971 deletions(-)

diff --git a/node-tests/blueprints/component-test.js b/node-tests/blueprints/component-test.js
index 523662c9adf..79e7c7bc889 100644
--- a/node-tests/blueprints/component-test.js
+++ b/node-tests/blueprints/component-test.js
@@ -16,8 +16,6 @@ const fixture = require('../helpers/fixture');
 const setupTestEnvironment = require('../helpers/setup-test-environment');
 const enableOctane = setupTestEnvironment.enableOctane;
 
-const { EMBER_SET_COMPONENT_TEMPLATE } = require('../../blueprints/component');
-
 const glimmerComponentContents = `import Component from '@glimmer/component';
 
 export default class FooComponent extends Component {
@@ -38,7 +36,9 @@ export default templateOnly();
 describe('Blueprint: component', function () {
   setupTestHooks(this);
 
-  describe('in app', function () {
+  describe('in app - octane', function () {
+    enableOctane();
+
     beforeEach(function () {
       return emberNew()
         .then(() =>
@@ -52,9 +52,8 @@ describe('Blueprint: component', function () {
 
     it('component foo', function () {
       return emberGenerateDestroy(['component', 'foo'], (_file) => {
-        expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-
-        expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
+        expect(_file('app/components/foo.js')).to.not.exist;
+        expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
 
         expect(_file('tests/integration/components/foo-test.js')).to.equal(
           fixture('component-test/default-template.js', {
@@ -67,186 +66,19 @@ describe('Blueprint: component', function () {
       });
     });
 
-    if (EMBER_SET_COMPONENT_TEMPLATE) {
-      // classic default
-      it('component foo --component-structure=classic --component-class=@ember/component', function () {
-        return emberGenerateDestroy(
-          [
-            'component',
-            'foo',
-            '--component-structure',
-            'classic',
-            '--component-class',
-            '@ember/component',
-          ],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-
-            expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      // Octane default
-      it('component foo --component-structure=flat --component-class=@glimmer/component', function () {
-        return emberGenerateDestroy(
-          [
-            'component',
-            '--component-structure',
-            'flat',
-            '--component-class',
-            '@glimmer/component',
-            'foo',
-          ],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
-
-            expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --component-structure=flat', function () {
-        return emberGenerateDestroy(
-          ['component', '--component-structure', 'flat', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-
-            expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --component-structure=nested', function () {
-        return emberGenerateDestroy(
-          ['component', '--component-structure', 'nested', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo/index.js')).to.equal(emberComponentContents);
-
-            expect(_file('app/components/foo/index.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --component-structure=classic', function () {
-        return emberGenerateDestroy(
-          ['component', '--component-structure', 'classic', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-
-            expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --component-class=@ember/component', function () {
-        return emberGenerateDestroy(
-          ['component', '--component-class', '@ember/component', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-
-            expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --component-class=@glimmer/component', function () {
-        return emberGenerateDestroy(
-          ['component', '--component-class', '@glimmer/component', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
-
-            expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --component-class=@ember/component/template-only', function () {
-        return emberGenerateDestroy(
-          ['component', '--component-class', '@ember/component/template-only', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(templateOnlyContents);
-
-            expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/components/foo-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo',
-                  componentInvocation: 'Foo',
-                },
-              })
-            );
-          }
-        );
-      });
-
-      it('component foo --no-component-class', function () {
-        return emberGenerateDestroy(['component', '--no-component-class', 'foo'], (_file) => {
-          expect(_file('app/components/foo.js')).to.not.exist;
+    // classic default
+    it('component foo --component-structure=classic --component-class=@ember/component', function () {
+      return emberGenerateDestroy(
+        [
+          'component',
+          'foo',
+          '--component-structure',
+          'classic',
+          '--component-class',
+          '@ember/component',
+        ],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
 
           expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
 
@@ -258,470 +90,156 @@ describe('Blueprint: component', function () {
               },
             })
           );
-        });
-      });
-    }
-    it('component x-foo', function () {
-      return emberGenerateDestroy(['component', 'x-foo'], (_file) => {
-        expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
-
-        expect(_file('app/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component foo/x-foo', function () {
-      return emberGenerateDestroy(['component', 'foo/x-foo'], (_file) => {
-        expect(_file('app/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
-
-        expect(_file('app/templates/components/foo/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo/x-foo',
-              componentInvocation: 'Foo::XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo --path foo', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--path', 'foo'], (_file) => {
-        expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
-
-        expect(_file('app/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component foo.js', function () {
-      return emberGenerateDestroy(['component', 'foo.js'], (_file) => {
-        expect(_file('app/components/foo.js.js')).to.not.exist;
-        expect(_file('app/templates/components/foo.js.hbs')).to.not.exist;
-        expect(_file('tests/integration/components/foo.js-test.js')).to.not.exist;
-
-        expect(_file('app/components/foo.js')).to.equal(fixture('component/component.js'));
-
-        expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo',
-              componentInvocation: 'Foo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo --pod', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
-        expect(_file('app/components/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-
-        expect(_file('app/components/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component foo/x-foo --pod', function () {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], (_file) => {
-        expect(_file('app/components/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
-
-        expect(_file('app/components/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/foo/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo/x-foo',
-              componentInvocation: 'Foo::XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo --pod --path foo', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], (_file) => {
-        expect(_file('app/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-
-        expect(_file('app/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/foo/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-              path: 'foo/',
-            },
-          })
-        );
-      });
-    });
-
-    it('component foo/x-foo --pod --path bar', function () {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '--path', 'bar'], (_file) => {
-        expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
-
-        expect(_file('app/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/bar/foo/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo/x-foo',
-              componentInvocation: 'Foo::XFoo',
-              path: 'bar/',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo --pod --path bar/foo', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'bar/foo'], (_file) => {
-        expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-
-        expect(_file('app/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/bar/foo/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-              path: 'bar/foo/',
-            },
-          })
-        );
-      });
-    });
-
-    it('component foo/x-foo --pod --path bar/baz', function () {
-      return emberGenerateDestroy(
-        ['component', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
-        (_file) => {
-          expect(_file('app/bar/baz/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
-          );
-
-          expect(_file('app/bar/baz/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/bar/baz/foo/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo/x-foo',
-                componentInvocation: 'Foo::XFoo',
-                path: 'bar/baz/',
-              },
-            })
-          );
         }
       );
     });
 
-    it('component x-foo --pod -no-path', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], (_file) => {
-        expect(_file('app/x-foo/component.js')).to.equal(fixture('component/component-dash.js'));
-
-        expect(_file('app/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component foo/x-foo --pod -no-path', function () {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], (_file) => {
-        expect(_file('app/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
-
-        expect(_file('app/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/foo/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo/x-foo',
-              componentInvocation: 'Foo::XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo.js --pod', function () {
-      return emberGenerateDestroy(['component', 'x-foo.js', '--pod'], (_file) => {
-        expect(_file('app/components/x-foo.js/component.js')).to.not.exist;
-        expect(_file('app/components/x-foo.js/template.hbs')).to.not.exist;
-        expect(_file('tests/integration/components/x-foo.js/component-test.js')).to.not.exist;
-
-        expect(_file('app/components/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-
-        expect(_file('app/components/x-foo/template.hbs')).to.equal('{{yield}}');
-
-        expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    describe('with podModulePrefix', function () {
-      beforeEach(function () {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('component foo --pod', function () {
-        return emberGenerateDestroy(['component', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/components/foo/component.js')).to.equal(
-            fixture('component/component.js')
-          );
-
-          expect(_file('app/pods/components/foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/pods/components/foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo',
-                componentInvocation: 'Foo',
-              },
-            })
-          );
-        });
-      });
-
-      it('component x-foo --pod', function () {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
-          expect(_file('app/pods/components/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
-          );
-
-          expect(_file('app/pods/components/x-foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/pods/components/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
-              },
-            })
-          );
-        });
-      });
-
-      it('component foo/x-foo --pod', function () {
-        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], (_file) => {
-          expect(_file('app/pods/components/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
-          );
-
-          expect(_file('app/pods/components/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/pods/components/foo/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo/x-foo',
-                componentInvocation: 'Foo::XFoo',
-              },
-            })
-          );
-        });
-      });
-
-      it('component x-foo --pod --path foo', function () {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], (_file) => {
-          expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
-          );
-
-          expect(_file('app/pods/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('tests/integration/pods/foo/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
-                path: 'foo/',
-              },
-            })
-          );
-        });
-      });
-
-      it('component foo/x-foo --pod --path bar', function () {
-        return emberGenerateDestroy(
-          ['component', 'foo/x-foo', '--pod', '--path', 'bar'],
-          (_file) => {
-            expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-nested.js')
-            );
-
-            expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-
-            expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo/x-foo',
-                  componentInvocation: 'Foo::XFoo',
-                  path: 'bar/',
-                },
-              })
-            );
-          }
-        );
-      });
+    // Octane default
+    it('component foo --component-structure=flat --component-class=@glimmer/component', function () {
+      return emberGenerateDestroy(
+        [
+          'component',
+          '--component-structure',
+          'flat',
+          '--component-class',
+          '@glimmer/component',
+          'foo',
+        ],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
 
-      it('component x-foo --pod --path bar/foo', function () {
-        return emberGenerateDestroy(
-          ['component', 'x-foo', '--pod', '--path', 'bar/foo'],
-          (_file) => {
-            expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-dash.js')
-            );
+          expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
 
-            expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
-            expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'x-foo',
-                  componentInvocation: 'XFoo',
-                  path: 'bar/foo/',
-                },
-              })
-            );
-          }
-        );
-      });
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo',
+                componentInvocation: 'Foo',
+              },
+            })
+          );
+        }
+      );
+    });
 
-      it('component foo/x-foo --pod --path bar/baz', function () {
-        return emberGenerateDestroy(
-          ['component', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
-          (_file) => {
-            expect(_file('app/pods/bar/baz/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-nested.js')
-            );
+    it('component foo --component-structure=flat', function () {
+      return emberGenerateDestroy(
+        ['component', '--component-structure', 'flat', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
 
-            expect(_file('app/pods/bar/baz/foo/x-foo/template.hbs')).to.equal('{{yield}}');
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo',
+                componentInvocation: 'Foo',
+              },
+            })
+          );
+        }
+      );
+    });
 
-            expect(_file('tests/integration/pods/bar/baz/foo/x-foo/component-test.js')).to.equal(
-              fixture('component-test/default-template.js', {
-                replace: {
-                  component: 'foo/x-foo',
-                  componentInvocation: 'Foo::XFoo',
-                  path: 'bar/baz/',
-                },
-              })
-            );
-          }
-        );
-      });
+    it('component foo --component-structure=nested', function () {
+      return emberGenerateDestroy(
+        ['component', '--component-structure', 'nested', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo/index.hbs')).to.equal('{{yield}}');
 
-      it('component x-foo --pod -no-path', function () {
-        return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], (_file) => {
-          expect(_file('app/pods/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo',
+                componentInvocation: 'Foo',
+              },
+            })
           );
+        }
+      );
+    });
 
-          expect(_file('app/pods/x-foo/template.hbs')).to.equal('{{yield}}');
+    it('component foo --component-structure=classic', function () {
+      return emberGenerateDestroy(
+        ['component', '--component-structure', 'classic', 'foo'],
+        (_file) => {
+          expect(_file('app/templates/components/foo.hbs')).to.equal('{{yield}}');
 
-          expect(_file('tests/integration/pods/x-foo/component-test.js')).to.equal(
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
             fixture('component-test/default-template.js', {
               replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
+                component: 'foo',
+                componentInvocation: 'Foo',
               },
             })
           );
-        });
-      });
+        }
+      );
+    });
 
-      it('component foo/x-foo --pod -no-path', function () {
-        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], (_file) => {
-          expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
+    it('component foo --component-class=@ember/component', function () {
+      return emberGenerateDestroy(
+        ['component', '--component-class', '@ember/component', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
+
+          expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
+
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo',
+                componentInvocation: 'Foo',
+              },
+            })
           );
+        }
+      );
+    });
 
-          expect(_file('app/pods/foo/x-foo/template.hbs')).to.equal('{{yield}}');
+    it('component foo --component-class=@glimmer/component', function () {
+      return emberGenerateDestroy(
+        ['component', '--component-class', '@glimmer/component', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
 
-          expect(_file('tests/integration/pods/foo/x-foo/component-test.js')).to.equal(
+          expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
+
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
             fixture('component-test/default-template.js', {
               replace: {
-                component: 'foo/x-foo',
-                componentInvocation: 'Foo::XFoo',
+                component: 'foo',
+                componentInvocation: 'Foo',
               },
             })
           );
-        });
-      });
+        }
+      );
     });
-  });
 
-  describe('in app - octane', function () {
-    enableOctane();
+    it('component foo --component-class=@ember/component/template-only', function () {
+      return emberGenerateDestroy(
+        ['component', '--component-class', '@ember/component/template-only', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(templateOnlyContents);
 
-    beforeEach(function () {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
+          expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
+
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo',
+                componentInvocation: 'Foo',
+              },
+            })
+          );
+        }
+      );
     });
 
-    it('component foo', function () {
-      return emberGenerateDestroy(['component', 'foo'], (_file) => {
+    it('component foo --no-component-class', function () {
+      return emberGenerateDestroy(['component', '--no-component-class', 'foo'], (_file) => {
         expect(_file('app/components/foo.js')).to.not.exist;
+
         expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
 
         expect(_file('tests/integration/components/foo-test.js')).to.equal(
@@ -807,182 +325,157 @@ describe('Blueprint: component', function () {
         }
       );
     });
-  });
-
-  describe('in addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('component foo', function () {
-      return emberGenerateDestroy(['component', 'foo'], (_file) => {
-        expect(_file('addon/components/foo.js')).to.equal(fixture('component/component-addon.js'));
-
-        expect(_file('addon/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('app/components/foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo';"
-        );
-
-        expect(_file('tests/integration/components/foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo',
-              componentInvocation: 'Foo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo', function () {
-      return emberGenerateDestroy(['component', 'x-foo'], (_file) => {
-        expect(_file('addon/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-
-        expect(_file('addon/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('app/components/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo';"
-        );
 
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
+    describe('with podModulePrefix', function () {
+      beforeEach(function () {
+        setupPodConfig({ podModulePrefix: true });
       });
-    });
-
-    it('component x-foo.js', function () {
-      return emberGenerateDestroy(['component', 'x-foo.js'], (_file) => {
-        expect(_file('addon/components/x-foo.js.js')).to.not.exist;
-        expect(_file('addon/templates/components/x-foo.js.hbs')).to.not.exist;
-        expect(_file('app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('tests/integration/components/x-foo.js-test.js')).to.not.exist;
 
-        expect(_file('addon/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-
-        expect(_file('addon/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('app/components/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo';"
-        );
+      it('component foo --pod', function () {
+        return emberGenerateDestroy(['component', 'foo', '--pod'], (_file) => {
+          expect(_file('app/pods/components/foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
+          expect(_file('tests/integration/pods/components/foo/component-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo',
+                componentInvocation: 'Foo',
+              },
+            })
+          );
+        });
       });
-    });
-
-    it('component foo/x-foo', function () {
-      return emberGenerateDestroy(['component', 'foo/x-foo'], (_file) => {
-        expect(_file('addon/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-addon-nested.js')
-        );
-
-        expect(_file('addon/templates/components/foo/x-foo.hbs')).to.equal('{{yield}}');
 
-        expect(_file('app/components/foo/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo/x-foo';"
-        );
+      it('component x-foo --pod', function () {
+        return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
+          expect(_file('app/pods/components/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo/x-foo',
-              componentInvocation: 'Foo::XFoo',
-            },
-          })
-        );
+          expect(_file('tests/integration/pods/components/x-foo/component-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'x-foo',
+                componentInvocation: 'XFoo',
+              },
+            })
+          );
+        });
       });
-    });
 
-    it('component x-foo --dummy', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-
-        expect(_file('tests/dummy/app/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('app/components/x-foo.js')).to.not.exist;
+      it('component foo/x-foo --pod', function () {
+        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod'], (_file) => {
+          expect(_file('app/pods/components/foo/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/unit/components/x-foo-test.js')).to.not.exist;
+          expect(_file('tests/integration/pods/components/foo/x-foo/component-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo/x-foo',
+                componentInvocation: 'Foo::XFoo',
+              },
+            })
+          );
+        });
       });
-    });
-
-    it('component foo/x-foo --dummy', function () {
-      return emberGenerateDestroy(['component', 'foo/x-foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-addon-nested.js')
-        );
-
-        expect(_file('tests/dummy/app/templates/components/foo/x-foo.hbs')).to.equal('{{yield}}');
 
-        expect(_file('app/components/foo/x-foo.js')).to.not.exist;
+      it('component x-foo --pod --path foo', function () {
+        return emberGenerateDestroy(['component', 'x-foo', '--pod', '--path', 'foo'], (_file) => {
+          expect(_file('app/pods/foo/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/unit/components/foo/x-foo-test.js')).to.not.exist;
+          expect(_file('tests/integration/pods/foo/x-foo/component-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'x-foo',
+                componentInvocation: 'XFoo',
+                path: 'foo/',
+              },
+            })
+          );
+        });
       });
-    });
 
-    it('component x-foo.js --dummy', function () {
-      return emberGenerateDestroy(['component', 'x-foo.js', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('tests/dummy/app/templates/components/x-foo.js.hbs')).to.not.exist;
-        expect(_file('app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('tests/unit/components/x-foo.js-test.js')).to.not.exist;
+      it('component foo/x-foo --pod --path bar', function () {
+        return emberGenerateDestroy(
+          ['component', 'foo/x-foo', '--pod', '--path', 'bar'],
+          (_file) => {
+            expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
+            expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
+              fixture('component-test/default-template.js', {
+                replace: {
+                  component: 'foo/x-foo',
+                  componentInvocation: 'Foo::XFoo',
+                  path: 'bar/',
+                },
+              })
+            );
+          }
         );
+      });
 
-        expect(_file('tests/dummy/app/templates/components/x-foo.hbs')).to.equal('{{yield}}');
+      it('component x-foo --pod --path bar/foo', function () {
+        return emberGenerateDestroy(
+          ['component', 'x-foo', '--pod', '--path', 'bar/foo'],
+          (_file) => {
+            expect(_file('app/pods/bar/foo/x-foo/template.hbs')).to.equal('{{yield}}');
+            expect(_file('tests/integration/pods/bar/foo/x-foo/component-test.js')).to.equal(
+              fixture('component-test/default-template.js', {
+                replace: {
+                  component: 'x-foo',
+                  componentInvocation: 'XFoo',
+                  path: 'bar/foo/',
+                },
+              })
+            );
+          }
+        );
+      });
 
-        expect(_file('app/components/x-foo.js')).to.not.exist;
+      it('component foo/x-foo --pod --path bar/baz', function () {
+        return emberGenerateDestroy(
+          ['component', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
+          (_file) => {
+            expect(_file('app/pods/bar/baz/foo/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/unit/components/x-foo-test.js')).to.not.exist;
+            expect(_file('tests/integration/pods/bar/baz/foo/x-foo/component-test.js')).to.equal(
+              fixture('component-test/default-template.js', {
+                replace: {
+                  component: 'foo/x-foo',
+                  componentInvocation: 'Foo::XFoo',
+                  path: 'bar/baz/',
+                },
+              })
+            );
+          }
+        );
       });
-    });
 
-    it('component x-foo --pod', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--pod'], (_file) => {
-        expect(_file('addon/components/x-foo/component.js')).to.equal(
-          fixture('component/component-addon-dash-pod.js')
-        );
+      it('component x-foo --pod -no-path', function () {
+        return emberGenerateDestroy(['component', 'x-foo', '--pod', '-no-path'], (_file) => {
+          expect(_file('app/pods/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('addon/components/x-foo/template.hbs')).to.equal('{{yield}}');
+          expect(_file('tests/integration/pods/x-foo/component-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'x-foo',
+                componentInvocation: 'XFoo',
+              },
+            })
+          );
+        });
+      });
 
-        expect(_file('app/components/x-foo/component.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo/component';"
-        );
+      it('component foo/x-foo --pod -no-path', function () {
+        return emberGenerateDestroy(['component', 'foo/x-foo', '--pod', '-no-path'], (_file) => {
+          expect(_file('app/pods/foo/x-foo/template.hbs')).to.equal('{{yield}}');
 
-        expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
+          expect(_file('tests/integration/pods/foo/x-foo/component-test.js')).to.equal(
+            fixture('component-test/default-template.js', {
+              replace: {
+                component: 'foo/x-foo',
+                componentInvocation: 'Foo::XFoo',
+              },
+            })
+          );
+        });
       });
     });
   });
@@ -1101,209 +594,6 @@ describe('Blueprint: component', function () {
     });
   });
 
-  describe('in in-repo-addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'in-repo-addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('component foo --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(['component', 'foo', '--in-repo-addon=my-addon'], (_file) => {
-        expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(
-          fixture('component/component-addon.js')
-        );
-
-        expect(_file('lib/my-addon/addon/templates/components/foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('lib/my-addon/app/components/foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo';"
-        );
-
-        expect(_file('tests/integration/components/foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'foo',
-              componentInvocation: 'Foo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(['component', 'x-foo', '--in-repo-addon=my-addon'], (_file) => {
-        expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-
-        expect(_file('lib/my-addon/addon/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-        expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo';"
-        );
-
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default-template.js', {
-            replace: {
-              component: 'x-foo',
-              componentInvocation: 'XFoo',
-            },
-          })
-        );
-      });
-    });
-
-    it('component x-foo.js --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(
-        ['component', 'x-foo.js', '--in-repo-addon=my-addon'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo.js.js')).to.not.exist;
-          expect(_file('lib/my-addon/addon/templates/components/x-foo.js.hbs')).to.not.exist;
-          expect(_file('lib/my-addon/app/components/x-foo.js.js')).to.not.exist;
-          expect(_file('tests/integration/components/x-foo-test.js.js')).to.not.exist;
-
-          expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
-            fixture('component/component-addon-dash.js')
-          );
-
-          expect(_file('lib/my-addon/addon/templates/components/x-foo.hbs')).to.equal('{{yield}}');
-
-          expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo';"
-          );
-
-          expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
-              },
-            })
-          );
-        }
-      );
-    });
-
-    it('component foo/x-foo --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(
-        ['component', 'foo/x-foo', '--in-repo-addon=my-addon'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/foo/x-foo.js')).to.equal(
-            fixture('component/component-addon-nested.js')
-          );
-
-          expect(_file('lib/my-addon/addon/templates/components/foo/x-foo.hbs')).to.equal(
-            '{{yield}}'
-          );
-
-          expect(_file('lib/my-addon/app/components/foo/x-foo.js')).to.contain(
-            "export { default } from 'my-addon/components/foo/x-foo';"
-          );
-
-          expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo/x-foo',
-                componentInvocation: 'Foo::XFoo',
-              },
-            })
-          );
-        }
-      );
-    });
-
-    it('component x-foo --in-repo-addon=my-addon --pod', function () {
-      return emberGenerateDestroy(
-        ['component', 'x-foo', '--in-repo-addon=my-addon', '--pod'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
-            fixture('component/component-addon-dash-pod.js')
-          );
-
-          expect(_file('lib/my-addon/addon/components/x-foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('lib/my-addon/app/components/x-foo/component.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo/component';"
-          );
-
-          expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
-              },
-            })
-          );
-        }
-      );
-    });
-
-    it('component x-foo.js --in-repo-addon=my-addon --pod', function () {
-      return emberGenerateDestroy(
-        ['component', 'x-foo.js', '--in-repo-addon=my-addon', '--pod'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo/component.js.js')).to.not.exist;
-          expect(_file('lib/my-addon/addon/components/x-foo/template.js.hbs')).to.not.exist;
-          expect(_file('lib/my-addon/app/components/x-foo/component.js.js')).to.not.exist;
-          expect(_file('tests/integration/components/x-foo/component-test.js.js')).to.not.exist;
-
-          expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
-            fixture('component/component-addon-dash-pod.js')
-          );
-
-          expect(_file('lib/my-addon/addon/components/x-foo/template.hbs')).to.equal('{{yield}}');
-
-          expect(_file('lib/my-addon/app/components/x-foo/component.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo/component';"
-          );
-
-          expect(_file('tests/integration/components/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'x-foo',
-                componentInvocation: 'XFoo',
-              },
-            })
-          );
-        }
-      );
-    });
-
-    it('component foo/x-foo --in-repo-addon=my-addon --pod', function () {
-      return emberGenerateDestroy(
-        ['component', 'foo/x-foo', '--in-repo-addon=my-addon', '--pod'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-addon-nested-pod.js')
-          );
-
-          expect(_file('lib/my-addon/addon/components/foo/x-foo/template.hbs')).to.equal(
-            '{{yield}}'
-          );
-
-          expect(_file('lib/my-addon/app/components/foo/x-foo/component.js')).to.contain(
-            "export { default } from 'my-addon/components/foo/x-foo/component';"
-          );
-
-          expect(_file('tests/integration/components/foo/x-foo/component-test.js')).to.equal(
-            fixture('component-test/default-template.js', {
-              replace: {
-                component: 'foo/x-foo',
-                componentInvocation: 'Foo::XFoo',
-              },
-            })
-          );
-        }
-      );
-    });
-  });
-
   describe('in in-repo-addon - octane', function () {
     enableOctane();
 

From d3f28e894da25ea01d272a2013e71b7c051dee66 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 14:11:14 -0700
Subject: [PATCH 0765/1405] component class test

---
 node-tests/blueprints/component-class-test.js | 539 +++---------------
 1 file changed, 95 insertions(+), 444 deletions(-)

diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js
index 5fd49f4258a..ecae3d45e74 100644
--- a/node-tests/blueprints/component-class-test.js
+++ b/node-tests/blueprints/component-class-test.js
@@ -16,8 +16,6 @@ const fixture = require('../helpers/fixture');
 const setupTestEnvironment = require('../helpers/setup-test-environment');
 const enableOctane = setupTestEnvironment.enableOctane;
 
-const { EMBER_SET_COMPONENT_TEMPLATE } = require('../../blueprints/component');
-
 const glimmerComponentContents = `import Component from '@glimmer/component';
 
 export default class FooComponent extends Component {
@@ -38,7 +36,9 @@ export default templateOnly();
 describe('Blueprint: component-class', function () {
   setupTestHooks(this);
 
-  describe('in app', function () {
+  describe('in app - octane', function () {
+    enableOctane();
+
     beforeEach(function () {
       return emberNew()
         .then(() =>
@@ -52,213 +52,134 @@ describe('Blueprint: component-class', function () {
 
     it('component-class foo', function () {
       return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
-        expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-      });
-    });
-
-    if (EMBER_SET_COMPONENT_TEMPLATE) {
-      // classic default
-      it('component-class foo --component-structure=classic --component-class=@ember/component', function () {
-        return emberGenerateDestroy(
-          [
-            'component-class',
-            'foo',
-            '--component-structure',
-            'classic',
-            '--component-class',
-            '@ember/component',
-          ],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-          }
-        );
-      });
-
-      // Octane default
-      it('component-class foo --component-structure=flat --component-class=@glimmer/component', function () {
-        return emberGenerateDestroy(
-          [
-            'component-class',
-            '--component-structure',
-            'flat',
-            '--component-class',
-            '@glimmer/component',
-            'foo',
-          ],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
-          }
-        );
-      });
-
-      it('component-class foo --component-structure=flat', function () {
-        return emberGenerateDestroy(
-          ['component-class', '--component-structure', 'flat', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-          }
-        );
-      });
-
-      it('component-class foo --component-structure=nested', function () {
-        return emberGenerateDestroy(
-          ['component-class', '--component-structure', 'nested', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo/index.js')).to.equal(emberComponentContents);
-          }
-        );
-      });
-
-      it('component-class foo --component-structure=classic', function () {
-        return emberGenerateDestroy(
-          ['component-class', '--component-structure', 'classic', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-          }
-        );
-      });
-
-      it('component-class foo --component-class=@ember/component', function () {
-        return emberGenerateDestroy(
-          ['component-class', '--component-class', '@ember/component', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
-          }
-        );
-      });
-
-      it('component-class foo --component-class=@glimmer/component', function () {
-        return emberGenerateDestroy(
-          ['component-class', '--component-class', '@glimmer/component', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
-          }
-        );
-      });
-
-      it('component-class foo --component-class=@ember/component/template-only', function () {
-        return emberGenerateDestroy(
-          ['component-class', '--component-class', '@ember/component/template-only', 'foo'],
-          (_file) => {
-            expect(_file('app/components/foo.js')).to.equal(templateOnlyContents);
-          }
-        );
-      });
-    }
-
-    it('component-class x-foo', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
-        expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
-      });
-    });
-
-    it('component-class foo/x-foo', function () {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
-        expect(_file('app/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
+        expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
       });
     });
 
-    it('component-class x-foo --path foo', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--path', 'foo'], (_file) => {
-        expect(_file('app/components/x-foo.js')).to.equal(fixture('component/component-dash.js'));
-      });
+    // classic default
+    it('component-class foo --component-structure=classic --component-class=@ember/component', function () {
+      return emberGenerateDestroy(
+        [
+          'component-class',
+          'foo',
+          '--component-structure',
+          'classic',
+          '--component-class',
+          '@ember/component',
+        ],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
+        }
+      );
     });
 
-    it('component-class foo.js', function () {
-      return emberGenerateDestroy(['component-class', 'foo.js'], (_file) => {
-        expect(_file('app/components/foo.js.js')).to.not.exist;
-        expect(_file('app/components/foo.js')).to.equal(fixture('component/component.js'));
-      });
+    // Octane default
+    it('component-class foo --component-structure=flat --component-class=@glimmer/component', function () {
+      return emberGenerateDestroy(
+        [
+          'component-class',
+          '--component-structure',
+          'flat',
+          '--component-class',
+          '@glimmer/component',
+          'foo',
+        ],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
+        }
+      );
     });
 
-    it('component-class x-foo --pod', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
-        expect(_file('app/components/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-      });
+    it('component-class foo --component-structure=flat', function () {
+      return emberGenerateDestroy(
+        ['component-class', '--component-structure', 'flat', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
+        }
+      );
     });
 
-    it('component-class foo/x-foo --pod', function () {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], (_file) => {
-        expect(_file('app/components/foo/x-foo/component.js')).to.equal(
-          fixture('component/component-nested.js')
-        );
-      });
+    it('component-class foo --component-structure=nested', function () {
+      return emberGenerateDestroy(
+        ['component-class', '--component-structure', 'nested', 'foo'],
+        (_file) => {
+          expect(_file('app/components/foo/index.js')).to.equal(glimmerComponentContents);
+        }
+      );
     });
 
-    it('component-class x-foo --pod --path foo', function () {
+    it('component-class foo --component-structure=classic', function () {
       return emberGenerateDestroy(
-        ['component-class', 'x-foo', '--pod', '--path', 'foo'],
+        ['component-class', '--component-structure', 'classic', 'foo'],
         (_file) => {
-          expect(_file('app/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
-          );
+          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
         }
       );
     });
 
-    it('component-class foo/x-foo --pod --path bar', function () {
+    it('component-class foo --component-class=@ember/component', function () {
       return emberGenerateDestroy(
-        ['component-class', 'foo/x-foo', '--pod', '--path', 'bar'],
+        ['component-class', '--component-class', '@ember/component', 'foo'],
         (_file) => {
-          expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
-          );
+          expect(_file('app/components/foo.js')).to.equal(emberComponentContents);
         }
       );
     });
 
-    it('component-class x-foo --pod --path bar/foo', function () {
+    it('component-class foo --component-class=@glimmer/component', function () {
       return emberGenerateDestroy(
-        ['component-class', 'x-foo', '--pod', '--path', 'bar/foo'],
+        ['component-class', '--component-class', '@glimmer/component', 'foo'],
         (_file) => {
-          expect(_file('app/bar/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
-          );
+          expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
         }
       );
     });
 
-    it('component-class foo/x-foo --pod --path bar/baz', function () {
+    it('component-class foo --component-class=@ember/component/template-only', function () {
       return emberGenerateDestroy(
-        ['component-class', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
+        ['component-class', '--component-class', '@ember/component/template-only', 'foo'],
         (_file) => {
-          expect(_file('app/bar/baz/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
-          );
+          expect(_file('app/components/foo.js')).to.equal(templateOnlyContents);
         }
       );
     });
 
-    it('component-class x-foo --pod -no-path', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], (_file) => {
-        expect(_file('app/x-foo/component.js')).to.equal(fixture('component/component-dash.js'));
+    it('component-class x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
+        expect(_file('app/components/x-foo.js')).to.equal(
+          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+        );
+      });
+    });
+
+    it('component-class x-foo.js', function () {
+      return emberGenerateDestroy(['component-class', 'x-foo.js'], (_file) => {
+        expect(_file('app/components/x-foo.js.js')).to.not.exist;
+        expect(_file('app/components/x-foo.js')).to.equal(
+          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
+        );
+      });
+    });
+
+    it('component-class foo/x-foo', function () {
+      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
+        expect(_file('app/components/foo/x-foo.js')).to.equal(
+          glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
+        );
       });
     });
 
-    it('component-class foo/x-foo --pod -no-path', function () {
+    it('component-class foo/x-foo --component-class="@glimmer/component"', function () {
       return emberGenerateDestroy(
-        ['component-class', 'foo/x-foo', '--pod', '-no-path'],
+        ['component-class', 'foo/x-foo', '--component-class', '@glimmer/component'],
         (_file) => {
-          expect(_file('app/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
+          expect(_file('app/components/foo/x-foo.js')).to.equal(
+            glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
           );
         }
       );
     });
 
-    it('component-class x-foo.js --pod', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo.js', '--pod'], (_file) => {
-        expect(_file('app/components/x-foo.js/component.js')).to.not.exist;
-        expect(_file('app/components/x-foo/component.js')).to.equal(
-          fixture('component/component-dash.js')
-        );
-      });
-    });
-
     describe('with podModulePrefix', function () {
       beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
@@ -267,7 +188,7 @@ describe('Blueprint: component-class', function () {
       it('component-class foo --pod', function () {
         return emberGenerateDestroy(['component-class', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/component.js')).to.equal(
-            fixture('component/component.js')
+            fixture('component/native-component.js')
           );
         });
       });
@@ -275,7 +196,7 @@ describe('Blueprint: component-class', function () {
       it('component-class x-foo --pod', function () {
         return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
+            fixture('component/native-component-dash.js')
           );
         });
       });
@@ -283,7 +204,7 @@ describe('Blueprint: component-class', function () {
       it('component-class foo/x-foo --pod', function () {
         return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-nested.js')
+            fixture('component/native-component-nested.js')
           );
         });
       });
@@ -293,7 +214,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'x-foo', '--pod', '--path', 'foo'],
           (_file) => {
             expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-dash.js')
+              fixture('component/native-component-dash.js')
             );
           }
         );
@@ -304,7 +225,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'foo/x-foo', '--pod', '--path', 'bar'],
           (_file) => {
             expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-nested.js')
+              fixture('component/native-component-nested.js')
             );
           }
         );
@@ -315,7 +236,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'x-foo', '--pod', '--path', 'bar/foo'],
           (_file) => {
             expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-dash.js')
+              fixture('component/native-component-dash.js')
             );
           }
         );
@@ -326,7 +247,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
           (_file) => {
             expect(_file('app/pods/bar/baz/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-nested.js')
+              fixture('component/native-component-nested.js')
             );
           }
         );
@@ -335,7 +256,7 @@ describe('Blueprint: component-class', function () {
       it('component-class x-foo --pod -no-path', function () {
         return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], (_file) => {
           expect(_file('app/pods/x-foo/component.js')).to.equal(
-            fixture('component/component-dash.js')
+            fixture('component/native-component-dash.js')
           );
         });
       });
@@ -345,7 +266,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'foo/x-foo', '--pod', '-no-path'],
           (_file) => {
             expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
-              fixture('component/component-nested.js')
+              fixture('component/native-component-nested.js')
             );
           }
         );
@@ -353,160 +274,6 @@ describe('Blueprint: component-class', function () {
     });
   });
 
-  describe('in app - octane', function () {
-    enableOctane();
-
-    beforeEach(function () {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('component-class foo', function () {
-      return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
-        expect(_file('app/components/foo.js')).to.equal(glimmerComponentContents);
-      });
-    });
-
-    it('component-class x-foo', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
-        expect(_file('app/components/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
-        );
-      });
-    });
-
-    it('component-class x-foo.js', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo.js'], (_file) => {
-        expect(_file('app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('app/components/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'XFooComponent')
-        );
-      });
-    });
-
-    it('component-class foo/x-foo', function () {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
-        expect(_file('app/components/foo/x-foo.js')).to.equal(
-          glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
-        );
-      });
-    });
-
-    it('component-class foo/x-foo --component-class="@glimmer/component"', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'foo/x-foo', '--component-class', '@glimmer/component'],
-        (_file) => {
-          expect(_file('app/components/foo/x-foo.js')).to.equal(
-            glimmerComponentContents.replace('FooComponent', 'FooXFooComponent')
-          );
-        }
-      );
-    });
-  });
-
-  describe('in addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('component-class foo', function () {
-      return emberGenerateDestroy(['component-class', 'foo'], (_file) => {
-        expect(_file('addon/components/foo.js')).to.equal(fixture('component/component-addon.js'));
-        expect(_file('app/components/foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo';"
-        );
-      });
-    });
-
-    it('component-class x-foo', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo'], (_file) => {
-        expect(_file('addon/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-        expect(_file('app/components/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo';"
-        );
-      });
-    });
-
-    it('component-class x-foo.js', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo.js'], (_file) => {
-        expect(_file('addon/components/x-foo.js.js')).to.not.exist;
-        expect(_file('app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('addon/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-        expect(_file('app/components/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo';"
-        );
-      });
-    });
-
-    it('component-class foo/x-foo', function () {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo'], (_file) => {
-        expect(_file('addon/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-addon-nested.js')
-        );
-        expect(_file('app/components/foo/x-foo.js')).to.contain(
-          "export { default } from 'my-addon/components/foo/x-foo';"
-        );
-      });
-    });
-
-    it('component-class x-foo --dummy', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-        expect(_file('app/components/x-foo.js')).to.not.exist;
-      });
-    });
-
-    it('component-class foo/x-foo --dummy', function () {
-      return emberGenerateDestroy(['component-class', 'foo/x-foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/components/foo/x-foo.js')).to.equal(
-          fixture('component/component-addon-nested.js')
-        );
-        expect(_file('app/components/foo/x-foo.js')).to.not.exist;
-      });
-    });
-
-    it('component-class x-foo.js --dummy', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo.js', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('app/components/x-foo.js.js')).to.not.exist;
-        expect(_file('tests/dummy/app/components/x-foo.js')).to.equal(
-          fixture('component/component-addon-dash.js')
-        );
-        expect(_file('app/components/x-foo.js')).to.not.exist;
-      });
-    });
-
-    it('component-class x-foo --pod', function () {
-      return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
-        expect(_file('addon/components/x-foo/component.js')).to.equal(
-          fixture('component/component-addon-dash-pod.js')
-        );
-        expect(_file('app/components/x-foo/component.js')).to.contain(
-          "export { default } from 'my-addon/components/x-foo/component';"
-        );
-      });
-    });
-  });
-
   describe('in addon - octane', function () {
     enableOctane();
 
@@ -571,122 +338,6 @@ describe('Blueprint: component-class', function () {
     });
   });
 
-  describe('in in-repo-addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'in-repo-addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('component-class foo --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'foo', '--in-repo-addon=my-addon'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/foo.js')).to.equal(
-            fixture('component/component-addon.js')
-          );
-          expect(_file('lib/my-addon/app/components/foo.js')).to.contain(
-            "export { default } from 'my-addon/components/foo';"
-          );
-        }
-      );
-    });
-
-    it('component-class x-foo --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'x-foo', '--in-repo-addon=my-addon'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
-            fixture('component/component-addon-dash.js')
-          );
-          expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo';"
-          );
-        }
-      );
-    });
-
-    it('component-class x-foo.js --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'x-foo.js', '--in-repo-addon=my-addon'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo.js.js')).to.not.exist;
-          expect(_file('lib/my-addon/app/components/x-foo.js.js')).to.not.exist;
-
-          expect(_file('lib/my-addon/addon/components/x-foo.js')).to.equal(
-            fixture('component/component-addon-dash.js')
-          );
-          expect(_file('lib/my-addon/app/components/x-foo.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo';"
-          );
-        }
-      );
-    });
-
-    it('component-class foo/x-foo --in-repo-addon=my-addon', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'foo/x-foo', '--in-repo-addon=my-addon'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/foo/x-foo.js')).to.equal(
-            fixture('component/component-addon-nested.js')
-          );
-          expect(_file('lib/my-addon/app/components/foo/x-foo.js')).to.contain(
-            "export { default } from 'my-addon/components/foo/x-foo';"
-          );
-        }
-      );
-    });
-
-    it('component-class x-foo --in-repo-addon=my-addon --pod', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'x-foo', '--in-repo-addon=my-addon', '--pod'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
-            fixture('component/component-addon-dash-pod.js')
-          );
-          expect(_file('lib/my-addon/app/components/x-foo/component.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo/component';"
-          );
-        }
-      );
-    });
-
-    it('component-class x-foo.js --in-repo-addon=my-addon --pod', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'x-foo.js', '--in-repo-addon=my-addon', '--pod'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/x-foo/component.js.js')).to.not.exist;
-          expect(_file('lib/my-addon/app/components/x-foo/component.js.js')).to.not.exist;
-          expect(_file('lib/my-addon/addon/components/x-foo/component.js')).to.equal(
-            fixture('component/component-addon-dash-pod.js')
-          );
-          expect(_file('lib/my-addon/app/components/x-foo/component.js')).to.contain(
-            "export { default } from 'my-addon/components/x-foo/component';"
-          );
-        }
-      );
-    });
-
-    it('component-class foo/x-foo --in-repo-addon=my-addon --pod', function () {
-      return emberGenerateDestroy(
-        ['component-class', 'foo/x-foo', '--in-repo-addon=my-addon', '--pod'],
-        (_file) => {
-          expect(_file('lib/my-addon/addon/components/foo/x-foo/component.js')).to.equal(
-            fixture('component/component-addon-nested-pod.js')
-          );
-          expect(_file('lib/my-addon/app/components/foo/x-foo/component.js')).to.contain(
-            "export { default } from 'my-addon/components/foo/x-foo/component';"
-          );
-        }
-      );
-    });
-  });
-
   describe('in in-repo-addon - octane', function () {
     enableOctane();
 

From 1754cceed0c73ba00382018e2af327fb68a1cf4b Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 14:39:00 -0700
Subject: [PATCH 0766/1405] route test

---
 node-tests/blueprints/route-test.js | 598 ++--------------------------
 1 file changed, 40 insertions(+), 558 deletions(-)

diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index c3251ca2d23..55882e8da96 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -23,483 +23,6 @@ const enableOctane = setupTestEnvironment.enableOctane;
 describe('Blueprint: route', function () {
   setupTestHooks(this);
 
-  describe('in app', function () {
-    beforeEach(function () {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('route foo', function () {
-      return emberGenerateDestroy(['route', 'foo'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('app/router.js')).to.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js', function () {
-      return emberGenerateDestroy(['route', 'foo.js'], (_file) => {
-        expect(_file('app/routes/foo.js.js')).to.not.exist;
-        expect(_file('app/templates/foo.js.hbs')).to.not.exist;
-        expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
-
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('app/router.js')).to.contain("this.route('foo')");
-        expect(file('app/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo --skip-router', function () {
-      return emberGenerateDestroy(['route', 'foo', '--skip-router'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.exist;
-        expect(_file('app/templates/foo.hbs')).to.exist;
-        expect(_file('tests/unit/routes/foo-test.js')).to.exist;
-        expect(file('app/router.js')).to.not.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo --path=:foo_id/show', function () {
-      return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route-with-dynamic-segment.js'));
-
-        expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('app/router.js'))
-          .to.contain("this.route('foo', {")
-          .to.contain("path: ':foo_id/show'")
-          .to.contain('});');
-      }).then(() => {
-        expect(file('app/router.js'))
-          .to.not.contain("this.route('foo'")
-          .to.not.contain("path: ':foo_id/show'");
-      });
-    });
-
-    it('route parent/child --reset-namespace', function () {
-      return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], (_file) => {
-        expect(_file('app/routes/child.js')).to.equal(fixture('route/route-child.js'));
-
-        expect(_file('app/templates/child.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('tests/unit/routes/child-test.js')).to.equal(
-          fixture('route-test/default-child.js')
-        );
-
-        expect(file('app/router.js'))
-          .to.contain("this.route('parent', {")
-          .to.contain("this.route('child', {")
-          .to.contain('resetNamespace: true')
-          .to.contain('});');
-      });
-    });
-
-    it('route parent/child --reset-namespace --pod', function () {
-      return emberGenerateDestroy(
-        ['route', 'parent/child', '--reset-namespace', '--pod'],
-        (_file) => {
-          expect(_file('app/child/route.js')).to.equal(fixture('route/route-child.js'));
-
-          expect(_file('app/child/template.hbs')).to.equal('{{outlet}}');
-
-          expect(_file('tests/unit/child/route-test.js')).to.equal(
-            fixture('route-test/default-child.js')
-          );
-
-          expect(file('app/router.js'))
-            .to.contain("this.route('parent', {")
-            .to.contain("this.route('child', {")
-            .to.contain('resetNamespace: true')
-            .to.contain('});');
-        }
-      );
-    });
-
-    it('route index', function () {
-      return emberGenerateDestroy(['route', 'index'], (_file) => {
-        expect(_file('app/routes/index.js')).to.exist;
-        expect(_file('app/templates/index.hbs')).to.exist;
-        expect(_file('tests/unit/routes/index-test.js')).to.exist;
-        expect(file('app/router.js')).to.not.contain("this.route('index')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('index')");
-      });
-    });
-
-    it('route application', function () {
-      fs.removeSync('app/templates/application.hbs');
-      return emberGenerate(['route', 'application']).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('application')");
-      });
-    });
-
-    it('route basic', function () {
-      return emberGenerateDestroy(['route', 'basic'], (_file) => {
-        expect(_file('app/routes/basic.js')).to.exist;
-        expect(file('app/router.js')).to.not.contain("this.route('basic')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('basic')");
-      });
-    });
-
-    it('route foo --pod', function () {
-      return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-        expect(_file('app/foo.js/route.js')).to.not.exist;
-        expect(_file('app/foo.js/template.hbs')).to.not.exist;
-        expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
-
-        expect(_file('app/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('app/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('app/router.js')).to.contain("this.route('foo')");
-        expect(file('app/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js --pod', function () {
-      return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
-        expect(_file('app/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('app/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('app/router.js')).to.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo --pod with --path', function () {
-      return emberGenerate(['route', 'foo', '--pod', '--path=:foo_id/show'])
-        .then(() =>
-          expect(file('app/router.js'))
-            .to.contain("this.route('foo', {")
-            .to.contain("path: ':foo_id/show'")
-            .to.contain('});')
-        )
-
-        .then(() => emberDestroy(['route', 'foo', '--pod', '--path=:foo_id/show']))
-        .then(() =>
-          expect(file('app/router.js'))
-            .to.not.contain("this.route('foo', {")
-            .to.not.contain("path: ':foo_id/show'")
-        );
-    });
-
-    it('route index --pod', function () {
-      return emberGenerate(['route', 'index', '--pod']).then(() =>
-        expect(file('app/router.js')).to.not.contain("this.route('index')")
-      );
-    });
-
-    it('route application --pod', function () {
-      return emberGenerate(['route', 'application', '--pod'])
-        .then(() => expect(file('app/application/route.js')).to.exist)
-        .then(() => expect(file('app/application/template.hbs')).to.exist)
-        .then(() => expect(file('app/router.js')).to.not.contain("this.route('application')"));
-    });
-
-    it('route basic --pod', function () {
-      return emberGenerateDestroy(['route', 'basic', '--pod'], (_file) => {
-        expect(_file('app/basic/route.js')).to.exist;
-        expect(file('app/router.js')).to.not.contain("this.route('index')");
-      });
-    });
-
-    describe('with podModulePrefix', function () {
-      beforeEach(function () {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('route foo --pod', function () {
-        return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/route.js'));
-
-          expect(_file('app/pods/foo/template.hbs')).to.equal('{{outlet}}');
-
-          expect(_file('tests/unit/pods/foo/route-test.js')).to.equal(
-            fixture('route-test/default.js')
-          );
-
-          expect(file('app/router.js')).to.contain("this.route('foo')");
-        }).then(() => {
-          expect(file('app/router.js')).to.not.contain("this.route('foo')");
-        });
-      });
-
-      it('route foo.js --pod', function () {
-        return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo.js/route.js')).to.not.exist;
-          expect(_file('app/pods/foo.js/template.hbs')).to.not.exist;
-          expect(_file('tests/unit/pods/foo.js/route-test.js')).to.not.exist;
-
-          expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/route.js'));
-
-          expect(_file('app/pods/foo/template.hbs')).to.equal('{{outlet}}');
-
-          expect(_file('tests/unit/pods/foo/route-test.js')).to.equal(
-            fixture('route-test/default.js')
-          );
-
-          expect(file('app/router.js')).to.contain("this.route('foo')");
-          expect(file('app/router.js')).to.not.contain("this.route('foo.js')");
-        }).then(() => {
-          expect(file('app/router.js')).to.not.contain("this.route('foo')");
-        });
-      });
-    });
-
-    describe('ember-page-title is installed', function () {
-      beforeEach(function () {
-        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
-      });
-
-      it('route foo', function () {
-        return emberGenerateDestroy(['route', 'foo'], (_file) => {
-          expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
-        });
-      });
-
-      it('route foo/bar', function () {
-        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
-          expect(_file('app/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
-        });
-      });
-    });
-  });
-
-  describe('in addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('route foo', function () {
-      return emberGenerateDestroy(['route', 'foo'], (_file) => {
-        expect(_file('addon/routes/foo.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/routes/foo.js')).to.contain(
-          "export { default } from 'my-addon/routes/foo';"
-        );
-
-        expect(_file('app/templates/foo.js')).to.contain(
-          "export { default } from 'my-addon/templates/foo';"
-        );
-
-        expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js', function () {
-      return emberGenerateDestroy(['route', 'foo.js'], (_file) => {
-        expect(_file('addon/routes/foo.js.js')).to.not.exist;
-        expect(_file('addon/templates/foo.js.hbs')).to.not.exist;
-        expect(_file('app/routes/foo.js.js')).to.not.exist;
-        expect(_file('app/templates/foo.js.js')).to.not.exist;
-        expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
-
-        expect(_file('addon/routes/foo.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/routes/foo.js')).to.contain(
-          "export { default } from 'my-addon/routes/foo';"
-        );
-
-        expect(_file('app/templates/foo.js')).to.contain(
-          "export { default } from 'my-addon/templates/foo';"
-        );
-
-        expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
-
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')");
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo/bar', function () {
-      return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
-        expect(_file('addon/routes/foo/bar.js')).to.equal(fixture('route/route-nested.js'));
-
-        expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/routes/foo/bar.js')).to.contain(
-          "export { default } from 'my-addon/routes/foo/bar';"
-        );
-
-        expect(_file('app/templates/foo/bar.js')).to.contain(
-          "export { default } from 'my-addon/templates/foo/bar';"
-        );
-
-        expect(_file('tests/unit/routes/foo/bar-test.js')).to.equal(
-          fixture('route-test/default-nested.js')
-        );
-
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('bar')");
-      }).then(() => {
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('bar')");
-      });
-    });
-
-    it('route foo --dummy', function () {
-      return emberGenerateDestroy(['route', 'foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/routes/foo.js')).to.not.exist;
-        expect(_file('app/templates/foo.hbs')).to.not.exist;
-        expect(_file('tests/unit/routes/foo-test.js')).to.not.exist;
-
-        expect(file('tests/dummy/app/router.js')).to.contain("this.route('foo')");
-      }).then(() => {
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo.js --dummy', function () {
-      return emberGenerateDestroy(['route', 'foo.js', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/routes/foo.js.js')).to.not.exist;
-        expect(_file('tests/dummy/app/templates/foo.js.hbs')).to.not.exist;
-
-        expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/routes/foo.js')).to.not.exist;
-        expect(_file('app/templates/foo.hbs')).to.not.exist;
-        expect(_file('tests/unit/routes/foo-test.js')).to.not.exist;
-
-        expect(file('tests/dummy/app/router.js')).to.contain("this.route('foo')");
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo.js')");
-      }).then(() => {
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('foo')");
-      });
-    });
-
-    it('route foo/bar --dummy', function () {
-      return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/routes/foo/bar.js')).to.equal(
-          fixture('route/route-nested.js')
-        );
-
-        expect(_file('tests/dummy/app/templates/foo/bar.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/routes/foo/bar.js')).to.not.exist;
-        expect(_file('app/templates/foo/bar.hbs')).to.not.exist;
-        expect(_file('tests/unit/routes/foo/bar-test.js')).to.not.exist;
-
-        expect(file('tests/dummy/app/router.js'))
-          .to.contain("this.route('foo', function() {")
-          .to.contain("this.route('bar')");
-      }).then(() => {
-        expect(file('tests/dummy/app/router.js')).to.not.contain("this.route('bar')");
-      });
-    });
-
-    it('route foo --pod', function () {
-      return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-        expect(_file('addon/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('addon/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/foo/route.js')).to.contain(
-          "export { default } from 'my-addon/foo/route';"
-        );
-
-        expect(_file('app/foo/template.js')).to.contain(
-          "export { default } from 'my-addon/foo/template';"
-        );
-
-        expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-      });
-    });
-
-    it('route foo.js --pod', function () {
-      return emberGenerateDestroy(['route', 'foo.js', '--pod'], (_file) => {
-        expect(_file('addon/foo.js/route.js')).to.not.exist;
-        expect(_file('addon/foo.js/template.hbs')).to.not.exist;
-        expect(_file('app/foo.js/route.js')).to.not.exist;
-        expect(_file('app/foo.js/template.js')).to.not.exist;
-        expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
-
-        expect(_file('addon/foo/route.js')).to.equal(fixture('route/route.js'));
-
-        expect(_file('addon/foo/template.hbs')).to.equal('{{outlet}}');
-
-        expect(_file('app/foo/route.js')).to.contain(
-          "export { default } from 'my-addon/foo/route';"
-        );
-
-        expect(_file('app/foo/template.js')).to.contain(
-          "export { default } from 'my-addon/foo/template';"
-        );
-
-        expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
-      });
-    });
-
-    describe('ember-page-title is installed', function () {
-      beforeEach(function () {
-        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
-      });
-
-      it('route foo', function () {
-        return emberGenerateDestroy(['route', 'foo'], (_file) => {
-          expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
-        });
-      });
-
-      it('route foo/bar', function () {
-        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
-          expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
-        });
-      });
-    });
-  });
-
   describe('in app - octane', function () {
     enableOctane();
 
@@ -518,7 +41,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'foo'], (_file) => {
         expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
 
@@ -536,7 +59,7 @@ describe('Blueprint: route', function () {
 
         expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
 
@@ -564,7 +87,7 @@ describe('Blueprint: route', function () {
           fixture('route/native-route-with-dynamic-segment.js')
         );
 
-        expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
 
@@ -583,7 +106,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], (_file) => {
         expect(_file('app/routes/child.js')).to.equal(fixture('route/native-route-child.js'));
 
-        expect(_file('app/templates/child.hbs')).to.equal('{{outlet}}');
+        expect(_file('app/templates/child.hbs')).to.equal('{{page-title "Child"}}\n{{outlet}}');
 
         expect(_file('tests/unit/routes/child-test.js')).to.equal(
           fixture('route-test/default-child.js')
@@ -603,7 +126,7 @@ describe('Blueprint: route', function () {
         (_file) => {
           expect(_file('app/child/route.js')).to.equal(fixture('route/native-route-child.js'));
 
-          expect(_file('app/child/template.hbs')).to.equal('{{outlet}}');
+          expect(_file('app/child/template.hbs')).to.equal('{{page-title "Child"}}\n{{outlet}}');
 
           expect(_file('tests/unit/child/route-test.js')).to.equal(
             fixture('route-test/default-child.js')
@@ -649,7 +172,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
         expect(_file('app/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('app/foo/template.hbs')).to.equal('{{outlet}}');
+        expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
 
@@ -667,7 +190,7 @@ describe('Blueprint: route', function () {
 
         expect(_file('app/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('app/foo/template.hbs')).to.equal('{{outlet}}');
+        expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
 
@@ -724,7 +247,7 @@ describe('Blueprint: route', function () {
         return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
-          expect(_file('app/pods/foo/template.hbs')).to.equal('{{outlet}}');
+          expect(_file('app/pods/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
           expect(_file('tests/unit/pods/foo/route-test.js')).to.equal(
             fixture('route-test/default.js')
@@ -744,7 +267,7 @@ describe('Blueprint: route', function () {
 
           expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
-          expect(_file('app/pods/foo/template.hbs')).to.equal('{{outlet}}');
+          expect(_file('app/pods/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
           expect(_file('tests/unit/pods/foo/route-test.js')).to.equal(
             fixture('route-test/default.js')
@@ -757,24 +280,6 @@ describe('Blueprint: route', function () {
         });
       });
     });
-
-    describe('ember-page-title is installed', function () {
-      beforeEach(function () {
-        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
-      });
-
-      it('route foo', function () {
-        return emberGenerateDestroy(['route', 'foo'], (_file) => {
-          expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
-        });
-      });
-
-      it('route foo/bar', function () {
-        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
-          expect(_file('app/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
-        });
-      });
-    });
   });
 
   describe('in addon - octane', function () {
@@ -795,7 +300,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'foo'], (_file) => {
         expect(_file('addon/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('app/routes/foo.js')).to.contain(
           "export { default } from 'my-addon/routes/foo';"
@@ -823,7 +328,7 @@ describe('Blueprint: route', function () {
 
         expect(_file('addon/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('app/routes/foo.js')).to.contain(
           "export { default } from 'my-addon/routes/foo';"
@@ -846,7 +351,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
         expect(_file('addon/routes/foo/bar.js')).to.equal(fixture('route/native-route-nested.js'));
 
-        expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
+        expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
 
         expect(_file('app/routes/foo/bar.js')).to.contain(
           "export { default } from 'my-addon/routes/foo/bar';"
@@ -870,7 +375,9 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal(
+          '{{page-title "Foo"}}\n{{outlet}}'
+        );
 
         expect(_file('app/routes/foo.js')).to.not.exist;
         expect(_file('app/templates/foo.hbs')).to.not.exist;
@@ -889,7 +396,9 @@ describe('Blueprint: route', function () {
 
         expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal(
+          '{{page-title "Foo"}}\n{{outlet}}'
+        );
 
         expect(_file('app/routes/foo.js')).to.not.exist;
         expect(_file('app/templates/foo.hbs')).to.not.exist;
@@ -908,7 +417,9 @@ describe('Blueprint: route', function () {
           fixture('route/native-route-nested.js')
         );
 
-        expect(_file('tests/dummy/app/templates/foo/bar.hbs')).to.equal('{{outlet}}');
+        expect(_file('tests/dummy/app/templates/foo/bar.hbs')).to.equal(
+          '{{page-title "Bar"}}\n{{outlet}}'
+        );
 
         expect(_file('app/routes/foo/bar.js')).to.not.exist;
         expect(_file('app/templates/foo/bar.hbs')).to.not.exist;
@@ -926,7 +437,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
         expect(_file('addon/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('addon/foo/template.hbs')).to.equal('{{outlet}}');
+        expect(_file('addon/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('app/foo/route.js')).to.contain(
           "export { default } from 'my-addon/foo/route';"
@@ -950,7 +461,7 @@ describe('Blueprint: route', function () {
 
         expect(_file('addon/foo/route.js')).to.equal(fixture('route/native-route.js'));
 
-        expect(_file('addon/foo/template.hbs')).to.equal('{{outlet}}');
+        expect(_file('addon/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
         expect(_file('app/foo/route.js')).to.contain(
           "export { default } from 'my-addon/foo/route';"
@@ -963,27 +474,10 @@ describe('Blueprint: route', function () {
         expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
       });
     });
-
-    describe('ember-page-title is installed', function () {
-      beforeEach(function () {
-        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
-      });
-
-      it('route foo', function () {
-        return emberGenerateDestroy(['route', 'foo'], (_file) => {
-          expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
-        });
-      });
-
-      it('route foo/bar', function () {
-        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
-          expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
-        });
-      });
-    });
   });
 
   describe('in in-repo-addon', function () {
+    enableOctane();
     beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
@@ -997,9 +491,13 @@ describe('Blueprint: route', function () {
 
     it('route foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
-        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(fixture('route/route.js'));
+        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(
+          fixture('route/native-route.js')
+        );
 
-        expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
+          '{{page-title "Foo"}}\n{{outlet}}'
+        );
 
         expect(_file('lib/my-addon/app/routes/foo.js')).to.contain(
           "export { default } from 'my-addon/routes/foo';"
@@ -1021,9 +519,13 @@ describe('Blueprint: route', function () {
         expect(_file('lib/my-addon/app/templates/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
 
-        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(fixture('route/route.js'));
+        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(
+          fixture('route/native-route.js')
+        );
 
-        expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('{{outlet}}');
+        expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
+          '{{page-title "Foo"}}\n{{outlet}}'
+        );
 
         expect(_file('lib/my-addon/app/routes/foo.js')).to.contain(
           "export { default } from 'my-addon/routes/foo';"
@@ -1040,10 +542,12 @@ describe('Blueprint: route', function () {
     it('route foo/bar --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/routes/foo/bar.js')).to.equal(
-          fixture('route/route-nested.js')
+          fixture('route/native-route-nested.js')
         );
 
-        expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
+        expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal(
+          '{{page-title "Bar"}}\n{{outlet}}'
+        );
 
         expect(_file('lib/my-addon/app/routes/foo/bar.js')).to.contain(
           "export { default } from 'my-addon/routes/foo/bar';"
@@ -1058,27 +562,5 @@ describe('Blueprint: route', function () {
         );
       });
     });
-
-    describe('ember-page-title is installed', function () {
-      beforeEach(function () {
-        return modifyPackages([{ name: 'ember-page-title', dev: true }]);
-      });
-
-      it('route foo', function () {
-        return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
-          expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
-            '{{page-title "Foo"}}\n{{outlet}}'
-          );
-        });
-      });
-
-      it('route foo/bar', function () {
-        return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
-          expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal(
-            '{{page-title "Bar"}}\n{{outlet}}'
-          );
-        });
-      });
-    });
   });
 });

From 965d2b33ce4a7a501827b390d28600a3462870a0 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 16:30:03 -0700
Subject: [PATCH 0767/1405] route test

---
 node-tests/blueprints/route-test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index 55882e8da96..3eac2c25cec 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -32,6 +32,7 @@ describe('Blueprint: route', function () {
           modifyPackages([
             { name: 'ember-qunit', delete: true },
             { name: 'ember-cli-qunit', dev: true },
+            { name: 'ember-page-title', dev: true },
           ])
         )
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
@@ -291,6 +292,7 @@ describe('Blueprint: route', function () {
           modifyPackages([
             { name: 'ember-qunit', delete: true },
             { name: 'ember-cli-qunit', dev: true },
+            { name: 'ember-page-title', dev: true },
           ])
         )
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
@@ -484,6 +486,7 @@ describe('Blueprint: route', function () {
           modifyPackages([
             { name: 'ember-qunit', delete: true },
             { name: 'ember-cli-qunit', dev: true },
+            { name: 'ember-page-title', dev: true },
           ])
         )
         .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));

From b0c3e10494b5404304ddde1c488b9365258c6863 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 14:42:29 -0700
Subject: [PATCH 0768/1405] service test

---
 node-tests/blueprints/service-test.js | 213 ++------------------------
 1 file changed, 11 insertions(+), 202 deletions(-)

diff --git a/node-tests/blueprints/service-test.js b/node-tests/blueprints/service-test.js
index 011555fc78a..5169299a69b 100644
--- a/node-tests/blueprints/service-test.js
+++ b/node-tests/blueprints/service-test.js
@@ -19,126 +19,6 @@ const enableOctane = setupTestEnvironment.enableOctane;
 describe('Blueprint: service', function () {
   setupTestHooks(this);
 
-  describe('in app', function () {
-    beforeEach(function () {
-      return emberNew()
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('service foo', function () {
-      return emberGenerateDestroy(['service', 'foo'], (_file) => {
-        expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('tests/unit/services/foo-test.js')).to.equal(
-          fixture('service-test/default.js')
-        );
-      });
-    });
-
-    it('service foo.js', function () {
-      return emberGenerateDestroy(['service', 'foo.js'], (_file) => {
-        expect(_file('app/services/foo.js.js')).to.not.exist;
-        expect(_file('tests/unit/services/foo-test.js.js')).to.not.exist;
-
-        expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('tests/unit/services/foo-test.js')).to.equal(
-          fixture('service-test/default.js')
-        );
-      });
-    });
-
-    it('service foo/bar', function () {
-      return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
-        expect(_file('app/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
-
-        expect(_file('tests/unit/services/foo/bar-test.js')).to.equal(
-          fixture('service-test/default-nested.js')
-        );
-      });
-    });
-
-    it('service foo --pod', function () {
-      return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
-        expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('tests/unit/foo/service-test.js')).to.equal(
-          fixture('service-test/default.js')
-        );
-      });
-    });
-
-    it('service foo.js --pod', function () {
-      return emberGenerateDestroy(['service', 'foo.js', '--pod'], (_file) => {
-        expect(_file('app/foo.js/service.js')).to.not.exist;
-        expect(_file('tests/unit/foo.js/service-test.js')).to.not.exist;
-
-        expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('tests/unit/foo/service-test.js')).to.equal(
-          fixture('service-test/default.js')
-        );
-      });
-    });
-
-    it('service foo/bar --pod', function () {
-      return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
-        expect(_file('app/foo/bar/service.js')).to.equal(fixture('service/service-nested.js'));
-
-        expect(_file('tests/unit/foo/bar/service-test.js')).to.equal(
-          fixture('service-test/default-nested.js')
-        );
-      });
-    });
-
-    describe('with podModulePrefix', function () {
-      beforeEach(function () {
-        setupPodConfig({ podModulePrefix: true });
-      });
-
-      it('service foo --pod', function () {
-        return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js'));
-
-          expect(_file('tests/unit/pods/foo/service-test.js')).to.equal(
-            fixture('service-test/default.js')
-          );
-        });
-      });
-
-      it('service foo.js --pod', function () {
-        return emberGenerateDestroy(['service', 'foo.js', '--pod'], (_file) => {
-          expect(_file('app/pods/foo.js/service.js')).to.not.exist;
-          expect(_file('tests/unit/pods/foo.js/service-test.js')).to.not.exist;
-
-          expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js'));
-
-          expect(_file('tests/unit/pods/foo/service-test.js')).to.equal(
-            fixture('service-test/default.js')
-          );
-        });
-      });
-
-      it('service foo/bar --pod', function () {
-        return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/bar/service.js')).to.equal(
-            fixture('service/service-nested.js')
-          );
-
-          expect(_file('tests/unit/pods/foo/bar/service-test.js')).to.equal(
-            fixture('service-test/default-nested.js')
-          );
-        });
-      });
-    });
-  });
-
   describe('in app - octane', function () {
     enableOctane();
 
@@ -224,6 +104,8 @@ describe('Blueprint: service', function () {
     });
 
     describe('with podModulePrefix', function () {
+      enableOctane();
+
       beforeEach(function () {
         setupPodConfig({ podModulePrefix: true });
       });
@@ -265,85 +147,6 @@ describe('Blueprint: service', function () {
     });
   });
 
-  describe('in addon', function () {
-    beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
-    });
-
-    it('service foo', function () {
-      return emberGenerateDestroy(['service', 'foo'], (_file) => {
-        expect(_file('addon/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('app/services/foo.js')).to.contain(
-          "export { default } from 'my-addon/services/foo';"
-        );
-
-        expect(_file('tests/unit/services/foo-test.js')).to.equal(
-          fixture('service-test/default.js')
-        );
-      });
-    });
-
-    it('service foo.js', function () {
-      return emberGenerateDestroy(['service', 'foo.js'], (_file) => {
-        expect(_file('addon/services/foo.js.js')).to.not.exist;
-        expect(_file('app/services/foo.js.js')).to.not.exist;
-        expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
-
-        expect(_file('addon/services/foo.js')).to.equal(fixture('service/service.js'));
-
-        expect(_file('app/services/foo.js')).to.contain(
-          "export { default } from 'my-addon/services/foo';"
-        );
-
-        expect(_file('tests/unit/services/foo-test.js')).to.equal(
-          fixture('service-test/default.js')
-        );
-      });
-    });
-
-    it('service foo/bar', function () {
-      return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
-        expect(_file('addon/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
-
-        expect(_file('app/services/foo/bar.js')).to.contain(
-          "export { default } from 'my-addon/services/foo/bar';"
-        );
-
-        expect(_file('tests/unit/services/foo/bar-test.js')).to.equal(
-          fixture('service-test/default-nested.js')
-        );
-      });
-    });
-
-    it('service foo/bar --dummy', function () {
-      return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
-          fixture('service/service-nested.js')
-        );
-        expect(_file('addon/services/foo/bar.js')).to.not.exist;
-      });
-    });
-
-    it('service foo/bar.js --dummy', function () {
-      return emberGenerateDestroy(['service', 'foo/bar.js', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/services/foo/bar.js.js')).to.not.exist;
-
-        expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
-          fixture('service/service-nested.js')
-        );
-        expect(_file('addon/services/foo/bar.js')).to.not.exist;
-      });
-    });
-  });
-
   describe('in addon - octane', function () {
     enableOctane();
 
@@ -428,6 +231,8 @@ describe('Blueprint: service', function () {
   });
 
   describe('in in-repo-addon', function () {
+    enableOctane();
+
     beforeEach(function () {
       return emberNew({ target: 'in-repo-addon' })
         .then(() =>
@@ -441,7 +246,9 @@ describe('Blueprint: service', function () {
 
     it('service foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['service', 'foo', '--in-repo-addon=my-addon'], (_file) => {
-        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(fixture('service/service.js'));
+        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(
+          fixture('service/native-service.js')
+        );
 
         expect(_file('lib/my-addon/app/services/foo.js')).to.contain(
           "export { default } from 'my-addon/services/foo';"
@@ -459,7 +266,9 @@ describe('Blueprint: service', function () {
         expect(_file('lib/my-addon/app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
 
-        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(fixture('service/service.js'));
+        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(
+          fixture('service/native-service.js')
+        );
 
         expect(_file('lib/my-addon/app/services/foo.js')).to.contain(
           "export { default } from 'my-addon/services/foo';"
@@ -474,7 +283,7 @@ describe('Blueprint: service', function () {
     it('service foo/bar --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['service', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/services/foo/bar.js')).to.equal(
-          fixture('service/service-nested.js')
+          fixture('service/native-service-nested.js')
         );
 
         expect(_file('lib/my-addon/app/services/foo/bar.js')).to.contain(

From 4602942180f5834435318255816f3bd4e5764a36 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 16:05:52 -0700
Subject: [PATCH 0769/1405] remove pre-octane blueprints and fixtures

typo
---
 blueprints/component-addon/index.js           |  5 +-
 .../__root__/__path__/__name__.js             |  1 -
 blueprints/component-class-addon/index.js     |  5 +-
 .../__root__/__path__/__name__.js             |  1 -
 .../files/__root__/__path__/__name__.js       |  4 +-
 blueprints/controller/index.js                |  6 +--
 .../__root__/__path__/__name__.js             |  4 --
 .../route/files/__root__/__path__/__name__.js |  6 +--
 blueprints/route/index.js                     |  5 +-
 .../__root__/__path__/__name__.js             | 11 -----
 .../__templatepath__/__templatename__.hbs     |  2 -
 .../files/__root__/__path__/__name__.js       |  4 +-
 blueprints/service/index.js                   |  6 +--
 .../__root__/__path__/__name__.js             |  4 --
 .../blueprints/component-class-addon-test.js  |  4 +-
 node-tests/blueprints/component-class-test.js | 18 ++++----
 node-tests/blueprints/controller-test.js      | 40 ++++++----------
 node-tests/blueprints/route-test.js           | 46 ++++++++-----------
 node-tests/blueprints/service-test.js         | 44 +++++++-----------
 .../component/component-addon-dash-pod.js     |  6 ---
 .../component/component-addon-dash.js         |  6 ---
 .../component/component-addon-nested-pod.js   |  6 ---
 .../component/component-addon-nested.js       |  6 ---
 .../fixtures/component/component-addon.js     |  6 ---
 .../fixtures/component/component-dash.js      |  6 +--
 .../fixtures/component/component-nested.js    |  6 +--
 node-tests/fixtures/component/component.js    |  6 +--
 .../component/native-component-dash.js        |  4 --
 .../component/native-component-nested.js      |  4 --
 .../fixtures/component/native-component.js    |  4 --
 .../fixtures/controller/controller-nested.js  |  4 +-
 node-tests/fixtures/controller/controller.js  |  4 +-
 .../controller/native-controller-nested.js    |  4 --
 .../fixtures/controller/native-controller.js  |  4 --
 .../fixtures/route/native-route-child.js      |  4 --
 .../fixtures/route/native-route-nested.js     |  4 --
 .../native-route-with-dynamic-segment.js      | 11 -----
 node-tests/fixtures/route/native-route.js     |  4 --
 node-tests/fixtures/route/route-child.js      |  4 +-
 node-tests/fixtures/route/route-nested.js     |  4 +-
 .../route/route-with-dynamic-segment.js       |  6 +--
 node-tests/fixtures/route/route.js            |  4 +-
 .../fixtures/service/native-service-nested.js |  4 --
 node-tests/fixtures/service/native-service.js |  4 --
 node-tests/fixtures/service/service-nested.js |  4 +-
 node-tests/fixtures/service/service.js        |  4 +-
 46 files changed, 106 insertions(+), 243 deletions(-)
 delete mode 100644 blueprints/component-addon/native-files/__root__/__path__/__name__.js
 delete mode 100644 blueprints/component-class-addon/native-files/__root__/__path__/__name__.js
 delete mode 100644 blueprints/controller/native-files/__root__/__path__/__name__.js
 delete mode 100644 blueprints/route/native-files/__root__/__path__/__name__.js
 delete mode 100644 blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
 delete mode 100644 blueprints/service/native-files/__root__/__path__/__name__.js
 delete mode 100644 node-tests/fixtures/component/component-addon-dash-pod.js
 delete mode 100644 node-tests/fixtures/component/component-addon-dash.js
 delete mode 100644 node-tests/fixtures/component/component-addon-nested-pod.js
 delete mode 100644 node-tests/fixtures/component/component-addon-nested.js
 delete mode 100644 node-tests/fixtures/component/component-addon.js
 delete mode 100644 node-tests/fixtures/component/native-component-dash.js
 delete mode 100644 node-tests/fixtures/component/native-component-nested.js
 delete mode 100644 node-tests/fixtures/component/native-component.js
 delete mode 100644 node-tests/fixtures/controller/native-controller-nested.js
 delete mode 100644 node-tests/fixtures/controller/native-controller.js
 delete mode 100644 node-tests/fixtures/route/native-route-child.js
 delete mode 100644 node-tests/fixtures/route/native-route-nested.js
 delete mode 100644 node-tests/fixtures/route/native-route-with-dynamic-segment.js
 delete mode 100644 node-tests/fixtures/route/native-route.js
 delete mode 100644 node-tests/fixtures/service/native-service-nested.js
 delete mode 100644 node-tests/fixtures/service/native-service.js

diff --git a/blueprints/component-addon/index.js b/blueprints/component-addon/index.js
index a3f30e40a61..36d34589cb3 100644
--- a/blueprints/component-addon/index.js
+++ b/blueprints/component-addon/index.js
@@ -4,9 +4,8 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const useEditionDetector = require('../edition-detector');
 
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a component.',
 
   fileMapTokens: function () {
@@ -73,4 +72,4 @@ module.exports = useEditionDetector({
       path: getPathOption(options),
     };
   },
-});
+};
diff --git a/blueprints/component-addon/native-files/__root__/__path__/__name__.js b/blueprints/component-addon/native-files/__root__/__path__/__name__.js
deleted file mode 100644
index 71a8b71c1c6..00000000000
--- a/blueprints/component-addon/native-files/__root__/__path__/__name__.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '<%= modulePath %>';
\ No newline at end of file
diff --git a/blueprints/component-class-addon/index.js b/blueprints/component-class-addon/index.js
index 19272db5258..1ec2bbb5288 100644
--- a/blueprints/component-class-addon/index.js
+++ b/blueprints/component-class-addon/index.js
@@ -4,9 +4,8 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const useEditionDetector = require('../edition-detector');
 
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a component class.',
 
   fileMapTokens: function () {
@@ -51,4 +50,4 @@ module.exports = useEditionDetector({
       path: getPathOption(options),
     };
   },
-});
+};
diff --git a/blueprints/component-class-addon/native-files/__root__/__path__/__name__.js b/blueprints/component-class-addon/native-files/__root__/__path__/__name__.js
deleted file mode 100644
index 71a8b71c1c6..00000000000
--- a/blueprints/component-class-addon/native-files/__root__/__path__/__name__.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '<%= modulePath %>';
\ No newline at end of file
diff --git a/blueprints/controller/files/__root__/__path__/__name__.js b/blueprints/controller/files/__root__/__path__/__name__.js
index d630f313455..f4f0e1b5433 100644
--- a/blueprints/controller/files/__root__/__path__/__name__.js
+++ b/blueprints/controller/files/__root__/__path__/__name__.js
@@ -1,4 +1,4 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-});
+export default class <%= classifiedModuleName %>Controller extends Controller {
+}
diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
index e6ff5f89e6e..d2d529a4594 100644
--- a/blueprints/controller/index.js
+++ b/blueprints/controller/index.js
@@ -1,10 +1,8 @@
 'use strict';
 
-const useEditionDetector = require('../edition-detector');
-
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a controller.',
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
-});
+};
diff --git a/blueprints/controller/native-files/__root__/__path__/__name__.js b/blueprints/controller/native-files/__root__/__path__/__name__.js
deleted file mode 100644
index f4f0e1b5433..00000000000
--- a/blueprints/controller/native-files/__root__/__path__/__name__.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class <%= classifiedModuleName %>Controller extends Controller {
-}
diff --git a/blueprints/route/files/__root__/__path__/__name__.js b/blueprints/route/files/__root__/__path__/__name__.js
index 7908be4f953..2bf1de81a14 100644
--- a/blueprints/route/files/__root__/__path__/__name__.js
+++ b/blueprints/route/files/__root__/__path__/__name__.js
@@ -1,11 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({<% if (hasDynamicSegment) {%>
+export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
   model(params) {
     /**
      * This route was generated with a dynamic segment. Implement data loading
      * based on that dynamic segment here in the model hook.
      */
     return params;
-  },<%}%>
-});
+  }<%}%>
+}
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index 6c197852e74..f78f9253d16 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -5,9 +5,8 @@ const path = require('path');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
-const useEditionDetector = require('../edition-detector');
 
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a route and a template, and registers the route with the router.',
 
   availableOptions: [
@@ -122,7 +121,7 @@ module.exports = useEditionDetector({
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
-});
+};
 
 function updateRouter(action, options) {
   let entity = options.entity;
diff --git a/blueprints/route/native-files/__root__/__path__/__name__.js b/blueprints/route/native-files/__root__/__path__/__name__.js
deleted file mode 100644
index 2bf1de81a14..00000000000
--- a/blueprints/route/native-files/__root__/__path__/__name__.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
-  model(params) {
-    /**
-     * This route was generated with a dynamic segment. Implement data loading
-     * based on that dynamic segment here in the model hook.
-     */
-    return params;
-  }<%}%>
-}
diff --git a/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs b/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
deleted file mode 100644
index 9857cee0c36..00000000000
--- a/blueprints/route/native-files/__root__/__templatepath__/__templatename__.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-<% if (addTitle) {%>{{page-title "<%= routeName %>"}}
-<%}%>{{outlet}}
\ No newline at end of file
diff --git a/blueprints/service/files/__root__/__path__/__name__.js b/blueprints/service/files/__root__/__path__/__name__.js
index 2c0547143aa..c79f7d69641 100644
--- a/blueprints/service/files/__root__/__path__/__name__.js
+++ b/blueprints/service/files/__root__/__path__/__name__.js
@@ -1,4 +1,4 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-});
+export default class <%= classifiedModuleName %>Service extends Service {
+}
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index 528ffcddb19..d6566cdddc5 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -1,10 +1,8 @@
 'use strict';
 
-const useEditionDetector = require('../edition-detector');
-
-module.exports = useEditionDetector({
+module.exports = {
   description: 'Generates a service.',
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
-});
+};
diff --git a/blueprints/service/native-files/__root__/__path__/__name__.js b/blueprints/service/native-files/__root__/__path__/__name__.js
deleted file mode 100644
index c79f7d69641..00000000000
--- a/blueprints/service/native-files/__root__/__path__/__name__.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Service from '@ember/service';
-
-export default class <%= classifiedModuleName %>Service extends Service {
-}
diff --git a/node-tests/blueprints/component-class-addon-test.js b/node-tests/blueprints/component-class-addon-test.js
index 1dcdd80caaa..19a42c309f3 100644
--- a/node-tests/blueprints/component-class-addon-test.js
+++ b/node-tests/blueprints/component-class-addon-test.js
@@ -4,11 +4,13 @@ const blueprintHelpers = require('ember-cli-blueprint-test-helpers/helpers');
 const setupTestHooks = blueprintHelpers.setupTestHooks;
 const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
-
+const setupTestEnvironment = require('../helpers/setup-test-environment');
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
 
+const enableOctane = setupTestEnvironment.enableOctane;
 describe('Blueprint: component-class-addon', function () {
+  enableOctane();
   setupTestHooks(this);
 
   describe('in addon', function () {
diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js
index ecae3d45e74..fe4d0ba906c 100644
--- a/node-tests/blueprints/component-class-test.js
+++ b/node-tests/blueprints/component-class-test.js
@@ -188,7 +188,7 @@ describe('Blueprint: component-class', function () {
       it('component-class foo --pod', function () {
         return emberGenerateDestroy(['component-class', 'foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/component.js')).to.equal(
-            fixture('component/native-component.js')
+            fixture('component/component.js')
           );
         });
       });
@@ -196,7 +196,7 @@ describe('Blueprint: component-class', function () {
       it('component-class x-foo --pod', function () {
         return emberGenerateDestroy(['component-class', 'x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/x-foo/component.js')).to.equal(
-            fixture('component/native-component-dash.js')
+            fixture('component/component-dash.js')
           );
         });
       });
@@ -204,7 +204,7 @@ describe('Blueprint: component-class', function () {
       it('component-class foo/x-foo --pod', function () {
         return emberGenerateDestroy(['component-class', 'foo/x-foo', '--pod'], (_file) => {
           expect(_file('app/pods/components/foo/x-foo/component.js')).to.equal(
-            fixture('component/native-component-nested.js')
+            fixture('component/component-nested.js')
           );
         });
       });
@@ -214,7 +214,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'x-foo', '--pod', '--path', 'foo'],
           (_file) => {
             expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
-              fixture('component/native-component-dash.js')
+              fixture('component/component-dash.js')
             );
           }
         );
@@ -225,7 +225,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'foo/x-foo', '--pod', '--path', 'bar'],
           (_file) => {
             expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-              fixture('component/native-component-nested.js')
+              fixture('component/component-nested.js')
             );
           }
         );
@@ -236,7 +236,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'x-foo', '--pod', '--path', 'bar/foo'],
           (_file) => {
             expect(_file('app/pods/bar/foo/x-foo/component.js')).to.equal(
-              fixture('component/native-component-dash.js')
+              fixture('component/component-dash.js')
             );
           }
         );
@@ -247,7 +247,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'foo/x-foo', '--pod', '--path', 'bar/baz'],
           (_file) => {
             expect(_file('app/pods/bar/baz/foo/x-foo/component.js')).to.equal(
-              fixture('component/native-component-nested.js')
+              fixture('component/component-nested.js')
             );
           }
         );
@@ -256,7 +256,7 @@ describe('Blueprint: component-class', function () {
       it('component-class x-foo --pod -no-path', function () {
         return emberGenerateDestroy(['component-class', 'x-foo', '--pod', '-no-path'], (_file) => {
           expect(_file('app/pods/x-foo/component.js')).to.equal(
-            fixture('component/native-component-dash.js')
+            fixture('component/component-dash.js')
           );
         });
       });
@@ -266,7 +266,7 @@ describe('Blueprint: component-class', function () {
           ['component-class', 'foo/x-foo', '--pod', '-no-path'],
           (_file) => {
             expect(_file('app/pods/foo/x-foo/component.js')).to.equal(
-              fixture('component/native-component-nested.js')
+              fixture('component/component-nested.js')
             );
           }
         );
diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js
index 0993caf9ea0..a9c1fb3ee7b 100644
--- a/node-tests/blueprints/controller-test.js
+++ b/node-tests/blueprints/controller-test.js
@@ -35,9 +35,7 @@ describe('Blueprint: controller', function () {
 
     it('controller foo', function () {
       return emberGenerateDestroy(['controller', 'foo'], (_file) => {
-        expect(_file('app/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
-        );
+        expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
           fixture('controller-test/default.js')
@@ -50,9 +48,7 @@ describe('Blueprint: controller', function () {
         expect(_file('app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
 
-        expect(_file('app/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
-        );
+        expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
           fixture('controller-test/default.js')
@@ -63,7 +59,7 @@ describe('Blueprint: controller', function () {
     it('controller foo/bar', function () {
       return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
         expect(_file('app/controllers/foo/bar.js')).to.equal(
-          fixture('controller/native-controller-nested.js')
+          fixture('controller/controller-nested.js')
         );
 
         expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
@@ -80,9 +76,7 @@ describe('Blueprint: controller', function () {
 
       it('controller foo --pod podModulePrefix', function () {
         return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/controller.js')).to.equal(
-            fixture('controller/native-controller.js')
-          );
+          expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
 
           expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
             fixture('controller-test/default.js')
@@ -92,9 +86,7 @@ describe('Blueprint: controller', function () {
 
       it('controller foo.js --pod podModulePrefix', function () {
         return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/controller.js')).to.equal(
-            fixture('controller/native-controller.js')
-          );
+          expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
 
           expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
             fixture('controller-test/default.js')
@@ -120,9 +112,7 @@ describe('Blueprint: controller', function () {
 
     it('controller foo', function () {
       return emberGenerateDestroy(['controller', 'foo'], (_file) => {
-        expect(_file('addon/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
-        );
+        expect(_file('addon/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('app/controllers/foo.js')).to.contain(
           "export { default } from 'my-addon/controllers/foo';"
@@ -140,9 +130,7 @@ describe('Blueprint: controller', function () {
         expect(_file('app/controllers/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
 
-        expect(_file('addon/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
-        );
+        expect(_file('addon/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
 
         expect(_file('app/controllers/foo.js')).to.contain(
           "export { default } from 'my-addon/controllers/foo';"
@@ -157,7 +145,7 @@ describe('Blueprint: controller', function () {
     it('controller foo/bar', function () {
       return emberGenerateDestroy(['controller', 'foo/bar'], (_file) => {
         expect(_file('addon/controllers/foo/bar.js')).to.equal(
-          fixture('controller/native-controller-nested.js')
+          fixture('controller/controller-nested.js')
         );
 
         expect(_file('app/controllers/foo/bar.js')).to.contain(
@@ -173,7 +161,7 @@ describe('Blueprint: controller', function () {
     it('controller foo --dummy', function () {
       return emberGenerateDestroy(['controller', 'foo', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
+          fixture('controller/controller.js')
         );
 
         expect(_file('app/controllers/foo-test.js')).to.not.exist;
@@ -187,7 +175,7 @@ describe('Blueprint: controller', function () {
         expect(_file('tests/dummy/app/controllers/foo.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
+          fixture('controller/controller.js')
         );
 
         expect(_file('app/controllers/foo-test.js')).to.not.exist;
@@ -199,7 +187,7 @@ describe('Blueprint: controller', function () {
     it('controller foo/bar --dummy', function () {
       return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/controllers/foo/bar.js')).to.equal(
-          fixture('controller/native-controller-nested.js')
+          fixture('controller/controller-nested.js')
         );
 
         expect(_file('app/controllers/foo/bar.js')).to.not.exist;
@@ -225,7 +213,7 @@ describe('Blueprint: controller', function () {
     it('controller foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['controller', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
+          fixture('controller/controller.js')
         );
 
         expect(_file('lib/my-addon/app/controllers/foo.js')).to.contain(
@@ -245,7 +233,7 @@ describe('Blueprint: controller', function () {
         expect(_file('tests/unit/controllers/foo.js-test.js')).to.not.exist;
 
         expect(_file('lib/my-addon/addon/controllers/foo.js')).to.equal(
-          fixture('controller/native-controller.js')
+          fixture('controller/controller.js')
         );
 
         expect(_file('lib/my-addon/app/controllers/foo.js')).to.contain(
@@ -263,7 +251,7 @@ describe('Blueprint: controller', function () {
         ['controller', 'foo/bar', '--in-repo-addon=my-addon'],
         (_file) => {
           expect(_file('lib/my-addon/addon/controllers/foo/bar.js')).to.equal(
-            fixture('controller/native-controller-nested.js')
+            fixture('controller/controller-nested.js')
           );
 
           expect(_file('lib/my-addon/app/controllers/foo/bar.js')).to.contain(
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index 3eac2c25cec..1e1d661e0e8 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -40,7 +40,7 @@ describe('Blueprint: route', function () {
 
     it('route foo', function () {
       return emberGenerateDestroy(['route', 'foo'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -58,7 +58,7 @@ describe('Blueprint: route', function () {
         expect(_file('app/templates/foo.js.hbs')).to.not.exist;
         expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
 
-        expect(_file('app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -84,9 +84,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --path=:foo_id/show', function () {
       return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], (_file) => {
-        expect(_file('app/routes/foo.js')).to.equal(
-          fixture('route/native-route-with-dynamic-segment.js')
-        );
+        expect(_file('app/routes/foo.js')).to.equal(fixture('route/route-with-dynamic-segment.js'));
 
         expect(_file('app/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -105,7 +103,7 @@ describe('Blueprint: route', function () {
 
     it('route parent/child --reset-namespace', function () {
       return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], (_file) => {
-        expect(_file('app/routes/child.js')).to.equal(fixture('route/native-route-child.js'));
+        expect(_file('app/routes/child.js')).to.equal(fixture('route/route-child.js'));
 
         expect(_file('app/templates/child.hbs')).to.equal('{{page-title "Child"}}\n{{outlet}}');
 
@@ -125,7 +123,7 @@ describe('Blueprint: route', function () {
       return emberGenerateDestroy(
         ['route', 'parent/child', '--reset-namespace', '--pod'],
         (_file) => {
-          expect(_file('app/child/route.js')).to.equal(fixture('route/native-route-child.js'));
+          expect(_file('app/child/route.js')).to.equal(fixture('route/route-child.js'));
 
           expect(_file('app/child/template.hbs')).to.equal('{{page-title "Child"}}\n{{outlet}}');
 
@@ -171,7 +169,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --pod', function () {
       return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-        expect(_file('app/foo/route.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('app/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -189,7 +187,7 @@ describe('Blueprint: route', function () {
         expect(_file('app/foo.js/template.hbs')).to.not.exist;
         expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
 
-        expect(_file('app/foo/route.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('app/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -246,7 +244,7 @@ describe('Blueprint: route', function () {
 
       it('route foo --pod', function () {
         return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/native-route.js'));
+          expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/route.js'));
 
           expect(_file('app/pods/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -266,7 +264,7 @@ describe('Blueprint: route', function () {
           expect(_file('app/pods/foo.js/template.hbs')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/route-test.js')).to.not.exist;
 
-          expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/native-route.js'));
+          expect(_file('app/pods/foo/route.js')).to.equal(fixture('route/route.js'));
 
           expect(_file('app/pods/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -300,7 +298,7 @@ describe('Blueprint: route', function () {
 
     it('route foo', function () {
       return emberGenerateDestroy(['route', 'foo'], (_file) => {
-        expect(_file('addon/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('addon/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -328,7 +326,7 @@ describe('Blueprint: route', function () {
         expect(_file('app/templates/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
 
-        expect(_file('addon/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('addon/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('addon/templates/foo.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -351,7 +349,7 @@ describe('Blueprint: route', function () {
 
     it('route foo/bar', function () {
       return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
-        expect(_file('addon/routes/foo/bar.js')).to.equal(fixture('route/native-route-nested.js'));
+        expect(_file('addon/routes/foo/bar.js')).to.equal(fixture('route/route-nested.js'));
 
         expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{page-title "Bar"}}\n{{outlet}}');
 
@@ -375,7 +373,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --dummy', function () {
       return emberGenerateDestroy(['route', 'foo', '--dummy'], (_file) => {
-        expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal(
           '{{page-title "Foo"}}\n{{outlet}}'
@@ -396,7 +394,7 @@ describe('Blueprint: route', function () {
         expect(_file('tests/dummy/app/routes/foo.js.js')).to.not.exist;
         expect(_file('tests/dummy/app/templates/foo.js.hbs')).to.not.exist;
 
-        expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('tests/dummy/app/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('tests/dummy/app/templates/foo.hbs')).to.equal(
           '{{page-title "Foo"}}\n{{outlet}}'
@@ -416,7 +414,7 @@ describe('Blueprint: route', function () {
     it('route foo/bar --dummy', function () {
       return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/routes/foo/bar.js')).to.equal(
-          fixture('route/native-route-nested.js')
+          fixture('route/route-nested.js')
         );
 
         expect(_file('tests/dummy/app/templates/foo/bar.hbs')).to.equal(
@@ -437,7 +435,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --pod', function () {
       return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
-        expect(_file('addon/foo/route.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('addon/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('addon/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -461,7 +459,7 @@ describe('Blueprint: route', function () {
         expect(_file('app/foo.js/template.js')).to.not.exist;
         expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
 
-        expect(_file('addon/foo/route.js')).to.equal(fixture('route/native-route.js'));
+        expect(_file('addon/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('addon/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
 
@@ -494,9 +492,7 @@ describe('Blueprint: route', function () {
 
     it('route foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
-        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(
-          fixture('route/native-route.js')
-        );
+        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
           '{{page-title "Foo"}}\n{{outlet}}'
@@ -522,9 +518,7 @@ describe('Blueprint: route', function () {
         expect(_file('lib/my-addon/app/templates/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/routes/foo.js-test.js')).to.not.exist;
 
-        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(
-          fixture('route/native-route.js')
-        );
+        expect(_file('lib/my-addon/addon/routes/foo.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal(
           '{{page-title "Foo"}}\n{{outlet}}'
@@ -545,7 +539,7 @@ describe('Blueprint: route', function () {
     it('route foo/bar --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/routes/foo/bar.js')).to.equal(
-          fixture('route/native-route-nested.js')
+          fixture('route/route-nested.js')
         );
 
         expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal(
diff --git a/node-tests/blueprints/service-test.js b/node-tests/blueprints/service-test.js
index 5169299a69b..6ccb39191b3 100644
--- a/node-tests/blueprints/service-test.js
+++ b/node-tests/blueprints/service-test.js
@@ -35,7 +35,7 @@ describe('Blueprint: service', function () {
 
     it('service foo', function () {
       return emberGenerateDestroy(['service', 'foo'], (_file) => {
-        expect(_file('app/services/foo.js')).to.equal(fixture('service/native-service.js'));
+        expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('tests/unit/services/foo-test.js')).to.equal(
           fixture('service-test/default.js')
@@ -48,7 +48,7 @@ describe('Blueprint: service', function () {
         expect(_file('app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
 
-        expect(_file('app/services/foo.js')).to.equal(fixture('service/native-service.js'));
+        expect(_file('app/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('tests/unit/services/foo-test.js')).to.equal(
           fixture('service-test/default.js')
@@ -58,9 +58,7 @@ describe('Blueprint: service', function () {
 
     it('service foo/bar', function () {
       return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
-        expect(_file('app/services/foo/bar.js')).to.equal(
-          fixture('service/native-service-nested.js')
-        );
+        expect(_file('app/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
 
         expect(_file('tests/unit/services/foo/bar-test.js')).to.equal(
           fixture('service-test/default-nested.js')
@@ -70,7 +68,7 @@ describe('Blueprint: service', function () {
 
     it('service foo --pod', function () {
       return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
-        expect(_file('app/foo/service.js')).to.equal(fixture('service/native-service.js'));
+        expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('tests/unit/foo/service-test.js')).to.equal(
           fixture('service-test/default.js')
@@ -83,7 +81,7 @@ describe('Blueprint: service', function () {
         expect(_file('app/foo.js/service.js')).to.not.exist;
         expect(_file('tests/unit/foo.js/service-test.js')).to.not.exist;
 
-        expect(_file('app/foo/service.js')).to.equal(fixture('service/native-service.js'));
+        expect(_file('app/foo/service.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('tests/unit/foo/service-test.js')).to.equal(
           fixture('service-test/default.js')
@@ -93,9 +91,7 @@ describe('Blueprint: service', function () {
 
     it('service foo/bar --pod', function () {
       return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
-        expect(_file('app/foo/bar/service.js')).to.equal(
-          fixture('service/native-service-nested.js')
-        );
+        expect(_file('app/foo/bar/service.js')).to.equal(fixture('service/service-nested.js'));
 
         expect(_file('tests/unit/foo/bar/service-test.js')).to.equal(
           fixture('service-test/default-nested.js')
@@ -112,7 +108,7 @@ describe('Blueprint: service', function () {
 
       it('service foo --pod', function () {
         return emberGenerateDestroy(['service', 'foo', '--pod'], (_file) => {
-          expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/native-service.js'));
+          expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js'));
 
           expect(_file('tests/unit/pods/foo/service-test.js')).to.equal(
             fixture('service-test/default.js')
@@ -125,7 +121,7 @@ describe('Blueprint: service', function () {
           expect(_file('app/pods/foo.js/service.js')).to.not.exist;
           expect(_file('tests/unit/pods/foo.js/service-test.js')).to.not.exist;
 
-          expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/native-service.js'));
+          expect(_file('app/pods/foo/service.js')).to.equal(fixture('service/service.js'));
 
           expect(_file('tests/unit/pods/foo/service-test.js')).to.equal(
             fixture('service-test/default.js')
@@ -136,7 +132,7 @@ describe('Blueprint: service', function () {
       it('service foo/bar --pod', function () {
         return emberGenerateDestroy(['service', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/pods/foo/bar/service.js')).to.equal(
-            fixture('service/native-service-nested.js')
+            fixture('service/service-nested.js')
           );
 
           expect(_file('tests/unit/pods/foo/bar/service-test.js')).to.equal(
@@ -163,7 +159,7 @@ describe('Blueprint: service', function () {
 
     it('service foo', function () {
       return emberGenerateDestroy(['service', 'foo'], (_file) => {
-        expect(_file('addon/services/foo.js')).to.equal(fixture('service/native-service.js'));
+        expect(_file('addon/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('app/services/foo.js')).to.contain(
           "export { default } from 'my-addon/services/foo';"
@@ -181,7 +177,7 @@ describe('Blueprint: service', function () {
         expect(_file('app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
 
-        expect(_file('addon/services/foo.js')).to.equal(fixture('service/native-service.js'));
+        expect(_file('addon/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('app/services/foo.js')).to.contain(
           "export { default } from 'my-addon/services/foo';"
@@ -195,9 +191,7 @@ describe('Blueprint: service', function () {
 
     it('service foo/bar', function () {
       return emberGenerateDestroy(['service', 'foo/bar'], (_file) => {
-        expect(_file('addon/services/foo/bar.js')).to.equal(
-          fixture('service/native-service-nested.js')
-        );
+        expect(_file('addon/services/foo/bar.js')).to.equal(fixture('service/service-nested.js'));
 
         expect(_file('app/services/foo/bar.js')).to.contain(
           "export { default } from 'my-addon/services/foo/bar';"
@@ -212,7 +206,7 @@ describe('Blueprint: service', function () {
     it('service foo/bar --dummy', function () {
       return emberGenerateDestroy(['service', 'foo/bar', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
-          fixture('service/native-service-nested.js')
+          fixture('service/service-nested.js')
         );
         expect(_file('addon/services/foo/bar.js')).to.not.exist;
       });
@@ -223,7 +217,7 @@ describe('Blueprint: service', function () {
         expect(_file('tests/dummy/app/services/foo/bar.js.js')).to.not.exist;
 
         expect(_file('tests/dummy/app/services/foo/bar.js')).to.equal(
-          fixture('service/native-service-nested.js')
+          fixture('service/service-nested.js')
         );
         expect(_file('addon/services/foo/bar.js')).to.not.exist;
       });
@@ -246,9 +240,7 @@ describe('Blueprint: service', function () {
 
     it('service foo --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['service', 'foo', '--in-repo-addon=my-addon'], (_file) => {
-        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(
-          fixture('service/native-service.js')
-        );
+        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('lib/my-addon/app/services/foo.js')).to.contain(
           "export { default } from 'my-addon/services/foo';"
@@ -266,9 +258,7 @@ describe('Blueprint: service', function () {
         expect(_file('lib/my-addon/app/services/foo.js.js')).to.not.exist;
         expect(_file('tests/unit/services/foo.js-test.js')).to.not.exist;
 
-        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(
-          fixture('service/native-service.js')
-        );
+        expect(_file('lib/my-addon/addon/services/foo.js')).to.equal(fixture('service/service.js'));
 
         expect(_file('lib/my-addon/app/services/foo.js')).to.contain(
           "export { default } from 'my-addon/services/foo';"
@@ -283,7 +273,7 @@ describe('Blueprint: service', function () {
     it('service foo/bar --in-repo-addon=my-addon', function () {
       return emberGenerateDestroy(['service', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/services/foo/bar.js')).to.equal(
-          fixture('service/native-service-nested.js')
+          fixture('service/service-nested.js')
         );
 
         expect(_file('lib/my-addon/app/services/foo/bar.js')).to.contain(
diff --git a/node-tests/fixtures/component/component-addon-dash-pod.js b/node-tests/fixtures/component/component-addon-dash-pod.js
deleted file mode 100644
index ab273cde100..00000000000
--- a/node-tests/fixtures/component/component-addon-dash-pod.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@ember/component';
-import layout from './template';
-
-export default Component.extend({
-  layout
-});
diff --git a/node-tests/fixtures/component/component-addon-dash.js b/node-tests/fixtures/component/component-addon-dash.js
deleted file mode 100644
index 48554d4c235..00000000000
--- a/node-tests/fixtures/component/component-addon-dash.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@ember/component';
-import layout from '../templates/components/x-foo';
-
-export default Component.extend({
-  layout
-});
diff --git a/node-tests/fixtures/component/component-addon-nested-pod.js b/node-tests/fixtures/component/component-addon-nested-pod.js
deleted file mode 100644
index ab273cde100..00000000000
--- a/node-tests/fixtures/component/component-addon-nested-pod.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@ember/component';
-import layout from './template';
-
-export default Component.extend({
-  layout
-});
diff --git a/node-tests/fixtures/component/component-addon-nested.js b/node-tests/fixtures/component/component-addon-nested.js
deleted file mode 100644
index a82bb87775a..00000000000
--- a/node-tests/fixtures/component/component-addon-nested.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@ember/component';
-import layout from '../../templates/components/foo/x-foo';
-
-export default Component.extend({
-  layout
-});
diff --git a/node-tests/fixtures/component/component-addon.js b/node-tests/fixtures/component/component-addon.js
deleted file mode 100644
index e1a8431527e..00000000000
--- a/node-tests/fixtures/component/component-addon.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Component from '@ember/component';
-import layout from '../templates/components/foo';
-
-export default Component.extend({
-  layout
-});
diff --git a/node-tests/fixtures/component/component-dash.js b/node-tests/fixtures/component/component-dash.js
index bb93d73f350..9e23a7c24fc 100644
--- a/node-tests/fixtures/component/component-dash.js
+++ b/node-tests/fixtures/component/component-dash.js
@@ -1,4 +1,4 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 
-export default Component.extend({
-});
+export default class XFooComponent extends Component {
+}
diff --git a/node-tests/fixtures/component/component-nested.js b/node-tests/fixtures/component/component-nested.js
index bb93d73f350..4894221b299 100644
--- a/node-tests/fixtures/component/component-nested.js
+++ b/node-tests/fixtures/component/component-nested.js
@@ -1,4 +1,4 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 
-export default Component.extend({
-});
+export default class FooXFooComponent extends Component {
+}
diff --git a/node-tests/fixtures/component/component.js b/node-tests/fixtures/component/component.js
index bb93d73f350..ae749fcda9b 100644
--- a/node-tests/fixtures/component/component.js
+++ b/node-tests/fixtures/component/component.js
@@ -1,4 +1,4 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 
-export default Component.extend({
-});
+export default class FooComponent extends Component {
+}
diff --git a/node-tests/fixtures/component/native-component-dash.js b/node-tests/fixtures/component/native-component-dash.js
deleted file mode 100644
index 9e23a7c24fc..00000000000
--- a/node-tests/fixtures/component/native-component-dash.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class XFooComponent extends Component {
-}
diff --git a/node-tests/fixtures/component/native-component-nested.js b/node-tests/fixtures/component/native-component-nested.js
deleted file mode 100644
index 4894221b299..00000000000
--- a/node-tests/fixtures/component/native-component-nested.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class FooXFooComponent extends Component {
-}
diff --git a/node-tests/fixtures/component/native-component.js b/node-tests/fixtures/component/native-component.js
deleted file mode 100644
index ae749fcda9b..00000000000
--- a/node-tests/fixtures/component/native-component.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Component from '@glimmer/component';
-
-export default class FooComponent extends Component {
-}
diff --git a/node-tests/fixtures/controller/controller-nested.js b/node-tests/fixtures/controller/controller-nested.js
index d630f313455..2461fdcd5cb 100644
--- a/node-tests/fixtures/controller/controller-nested.js
+++ b/node-tests/fixtures/controller/controller-nested.js
@@ -1,4 +1,4 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-});
+export default class FooBarController extends Controller {
+}
diff --git a/node-tests/fixtures/controller/controller.js b/node-tests/fixtures/controller/controller.js
index d630f313455..987a05b3be6 100644
--- a/node-tests/fixtures/controller/controller.js
+++ b/node-tests/fixtures/controller/controller.js
@@ -1,4 +1,4 @@
 import Controller from '@ember/controller';
 
-export default Controller.extend({
-});
+export default class FooController extends Controller {
+}
diff --git a/node-tests/fixtures/controller/native-controller-nested.js b/node-tests/fixtures/controller/native-controller-nested.js
deleted file mode 100644
index 2461fdcd5cb..00000000000
--- a/node-tests/fixtures/controller/native-controller-nested.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class FooBarController extends Controller {
-}
diff --git a/node-tests/fixtures/controller/native-controller.js b/node-tests/fixtures/controller/native-controller.js
deleted file mode 100644
index 987a05b3be6..00000000000
--- a/node-tests/fixtures/controller/native-controller.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Controller from '@ember/controller';
-
-export default class FooController extends Controller {
-}
diff --git a/node-tests/fixtures/route/native-route-child.js b/node-tests/fixtures/route/native-route-child.js
deleted file mode 100644
index 8481ba97ba5..00000000000
--- a/node-tests/fixtures/route/native-route-child.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class ParentChildRoute extends Route {
-}
diff --git a/node-tests/fixtures/route/native-route-nested.js b/node-tests/fixtures/route/native-route-nested.js
deleted file mode 100644
index 5a0c1661f75..00000000000
--- a/node-tests/fixtures/route/native-route-nested.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class FooBarRoute extends Route {
-}
diff --git a/node-tests/fixtures/route/native-route-with-dynamic-segment.js b/node-tests/fixtures/route/native-route-with-dynamic-segment.js
deleted file mode 100644
index 7856d6b3fec..00000000000
--- a/node-tests/fixtures/route/native-route-with-dynamic-segment.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class FooRoute extends Route {
-  model(params) {
-    /**
-     * This route was generated with a dynamic segment. Implement data loading
-     * based on that dynamic segment here in the model hook.
-     */
-    return params;
-  }
-}
diff --git a/node-tests/fixtures/route/native-route.js b/node-tests/fixtures/route/native-route.js
deleted file mode 100644
index fa31033660d..00000000000
--- a/node-tests/fixtures/route/native-route.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Route from '@ember/routing/route';
-
-export default class FooRoute extends Route {
-}
diff --git a/node-tests/fixtures/route/route-child.js b/node-tests/fixtures/route/route-child.js
index 6c74252aa1b..8481ba97ba5 100644
--- a/node-tests/fixtures/route/route-child.js
+++ b/node-tests/fixtures/route/route-child.js
@@ -1,4 +1,4 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
-});
+export default class ParentChildRoute extends Route {
+}
diff --git a/node-tests/fixtures/route/route-nested.js b/node-tests/fixtures/route/route-nested.js
index 6c74252aa1b..5a0c1661f75 100644
--- a/node-tests/fixtures/route/route-nested.js
+++ b/node-tests/fixtures/route/route-nested.js
@@ -1,4 +1,4 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
-});
+export default class FooBarRoute extends Route {
+}
diff --git a/node-tests/fixtures/route/route-with-dynamic-segment.js b/node-tests/fixtures/route/route-with-dynamic-segment.js
index aa466fc9446..7856d6b3fec 100644
--- a/node-tests/fixtures/route/route-with-dynamic-segment.js
+++ b/node-tests/fixtures/route/route-with-dynamic-segment.js
@@ -1,11 +1,11 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
+export default class FooRoute extends Route {
   model(params) {
     /**
      * This route was generated with a dynamic segment. Implement data loading
      * based on that dynamic segment here in the model hook.
      */
     return params;
-  },
-});
+  }
+}
diff --git a/node-tests/fixtures/route/route.js b/node-tests/fixtures/route/route.js
index 6c74252aa1b..fa31033660d 100644
--- a/node-tests/fixtures/route/route.js
+++ b/node-tests/fixtures/route/route.js
@@ -1,4 +1,4 @@
 import Route from '@ember/routing/route';
 
-export default Route.extend({
-});
+export default class FooRoute extends Route {
+}
diff --git a/node-tests/fixtures/service/native-service-nested.js b/node-tests/fixtures/service/native-service-nested.js
deleted file mode 100644
index b6205148786..00000000000
--- a/node-tests/fixtures/service/native-service-nested.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Service from '@ember/service';
-
-export default class FooBarService extends Service {
-}
diff --git a/node-tests/fixtures/service/native-service.js b/node-tests/fixtures/service/native-service.js
deleted file mode 100644
index 8447de6df53..00000000000
--- a/node-tests/fixtures/service/native-service.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import Service from '@ember/service';
-
-export default class FooService extends Service {
-}
diff --git a/node-tests/fixtures/service/service-nested.js b/node-tests/fixtures/service/service-nested.js
index 2c0547143aa..b6205148786 100644
--- a/node-tests/fixtures/service/service-nested.js
+++ b/node-tests/fixtures/service/service-nested.js
@@ -1,4 +1,4 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-});
+export default class FooBarService extends Service {
+}
diff --git a/node-tests/fixtures/service/service.js b/node-tests/fixtures/service/service.js
index 2c0547143aa..8447de6df53 100644
--- a/node-tests/fixtures/service/service.js
+++ b/node-tests/fixtures/service/service.js
@@ -1,4 +1,4 @@
 import Service from '@ember/service';
 
-export default Service.extend({
-});
+export default class FooService extends Service {
+}

From 554e2973a30113c951fec3194bd24147da716da9 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Wed, 12 Jan 2022 12:26:27 -0700
Subject: [PATCH 0770/1405] PR feedback

---
 blueprints/edition-detector.js           | 13 ------
 node-tests/blueprints/controller-test.js | 49 ++++++++++++++++++++
 node-tests/blueprints/route-test.js      | 58 ++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 13 deletions(-)
 delete mode 100644 blueprints/edition-detector.js

diff --git a/blueprints/edition-detector.js b/blueprints/edition-detector.js
deleted file mode 100644
index 4e37fcf1e32..00000000000
--- a/blueprints/edition-detector.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-const { has } = require('@ember/edition-utils');
-const path = require('path');
-
-module.exports = function (blueprint) {
-  blueprint.filesPath = function () {
-    let rootPath = has('octane') ? 'native-files' : 'files';
-    return path.join(this.path, rootPath);
-  };
-
-  return blueprint;
-};
diff --git a/node-tests/blueprints/controller-test.js b/node-tests/blueprints/controller-test.js
index a9c1fb3ee7b..854b26f9edc 100644
--- a/node-tests/blueprints/controller-test.js
+++ b/node-tests/blueprints/controller-test.js
@@ -68,6 +68,41 @@ describe('Blueprint: controller', function () {
       });
     });
 
+    it('controller foo --pod', function () {
+      return emberGenerateDestroy(['controller', 'foo', '--pod'], (_file) => {
+        expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
+
+        expect(_file('tests/unit/foo/controller-test.js')).to.equal(
+          fixture('controller-test/default.js')
+        );
+      });
+    });
+
+    it('controller foo.js --pod', function () {
+      return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
+        expect(_file('app/foo.js/controller.js')).to.not.exist;
+        expect(_file('tests/unit/foo.js/controller-test.js')).to.not.exist;
+
+        expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
+
+        expect(_file('tests/unit/foo/controller-test.js')).to.equal(
+          fixture('controller-test/default.js')
+        );
+      });
+    });
+
+    it('controller foo/bar --pod', function () {
+      return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], (_file) => {
+        expect(_file('app/foo/bar/controller.js')).to.equal(
+          fixture('controller/controller-nested.js')
+        );
+
+        expect(_file('tests/unit/foo/bar/controller-test.js')).to.equal(
+          fixture('controller-test/default-nested.js')
+        );
+      });
+    });
+
     describe('with podModulePrefix', function () {
       enableOctane();
       beforeEach(function () {
@@ -86,6 +121,8 @@ describe('Blueprint: controller', function () {
 
       it('controller foo.js --pod podModulePrefix', function () {
         return emberGenerateDestroy(['controller', 'foo.js', '--pod'], (_file) => {
+          expect(_file('app/pods/foo.js/controller.js')).to.not.exist;
+          expect(_file('tests/unit/pods/foo.js/controller-test.js')).to.not.exist;
           expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
 
           expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
@@ -93,6 +130,18 @@ describe('Blueprint: controller', function () {
           );
         });
       });
+
+      it('controller foo/bar --pod podModulePrefix', function () {
+        return emberGenerateDestroy(['controller', 'foo/bar', '--pod'], (_file) => {
+          expect(_file('app/pods/foo/bar/controller.js')).to.equal(
+            fixture('controller/controller-nested.js')
+          );
+
+          expect(_file('tests/unit/pods/foo/bar/controller-test.js')).to.equal(
+            fixture('controller-test/default-nested.js')
+          );
+        });
+      });
     });
   });
 
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index 1e1d661e0e8..d03f3504701 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -169,6 +169,10 @@ describe('Blueprint: route', function () {
 
     it('route foo --pod', function () {
       return emberGenerateDestroy(['route', 'foo', '--pod'], (_file) => {
+        expect(_file('app/foo.js/route.js')).to.not.exist;
+        expect(_file('app/foo.js/template.hbs')).to.not.exist;
+        expect(_file('tests/unit/foo.js/route-test.js')).to.not.exist;
+
         expect(_file('app/foo/route.js')).to.equal(fixture('route/route.js'));
 
         expect(_file('app/foo/template.hbs')).to.equal('{{page-title "Foo"}}\n{{outlet}}');
@@ -278,6 +282,24 @@ describe('Blueprint: route', function () {
           expect(file('app/router.js')).to.not.contain("this.route('foo')");
         });
       });
+
+      describe('ember-page-title is not installed', function () {
+        beforeEach(function () {
+          return modifyPackages([{ name: 'ember-page-title', delete: true }]);
+        });
+
+        it('route foo', function () {
+          return emberGenerateDestroy(['route', 'foo'], (_file) => {
+            expect(_file('app/templates/foo.hbs')).to.equal('{{outlet}}');
+          });
+        });
+
+        it('route foo/bar', function () {
+          return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
+            expect(_file('app/templates/foo/bar.hbs')).to.equal('{{outlet}}');
+          });
+        });
+      });
     });
   });
 
@@ -474,6 +496,24 @@ describe('Blueprint: route', function () {
         expect(_file('tests/unit/foo/route-test.js')).to.equal(fixture('route-test/default.js'));
       });
     });
+
+    describe('ember-page-title is not installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', delete: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo'], (_file) => {
+          expect(_file('addon/templates/foo.hbs')).to.equal('{{outlet}}');
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar'], (_file) => {
+          expect(_file('addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
+        });
+      });
+    });
   });
 
   describe('in in-repo-addon', function () {
@@ -559,5 +599,23 @@ describe('Blueprint: route', function () {
         );
       });
     });
+
+    describe('ember-page-title is not installed', function () {
+      beforeEach(function () {
+        return modifyPackages([{ name: 'ember-page-title', delete: true }]);
+      });
+
+      it('route foo', function () {
+        return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], (_file) => {
+          expect(_file('lib/my-addon/addon/templates/foo.hbs')).to.equal('{{outlet}}');
+        });
+      });
+
+      it('route foo/bar', function () {
+        return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
+          expect(_file('lib/my-addon/addon/templates/foo/bar.hbs')).to.equal('{{outlet}}');
+        });
+      });
+    });
   });
 });

From 519c8ef89a0070cfe3a2d3e24d15e9daa4c33d8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jan 2022 22:10:46 +0000
Subject: [PATCH 0771/1405] Bump ember-cli from 3.12.0 to 4.1.0

Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 3.12.0 to 4.1.0.
- [Release notes](https://github.com/ember-cli/ember-cli/releases)
- [Changelog](https://github.com/ember-cli/ember-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/ember-cli/compare/v3.12.0...v4.1.0)

---
updated-dependencies:
- dependency-name: ember-cli
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |    2 +-
 yarn.lock    | 1569 +++++++++++++++++++++++++++++++++-----------------
 2 files changed, 1026 insertions(+), 545 deletions(-)

diff --git a/package.json b/package.json
index 475f63c5b36..2becdf8de00 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
-    "ember-cli": "^3.12.0",
+    "ember-cli": "^4.1.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 6ad48c93b22..e83a0c54968 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,13 @@
   dependencies:
     "@babel/highlight" "^7.14.5"
 
+"@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
 "@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
@@ -26,6 +33,11 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
   integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
 
+"@babel/compat-data@^7.16.4":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
+  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
+
 "@babel/compat-data@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
@@ -35,20 +47,20 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.1.6":
-  version "7.15.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.5.tgz#f8ed9ace730722544609f90c9bb49162dc3bf5b9"
-  integrity sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.15.4"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helpers" "^7.15.4"
-    "@babel/parser" "^7.15.5"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
+"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.3.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
+  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -56,29 +68,7 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/core@^7.12.0", "@babel/core@^7.3.4", "@babel/core@^7.4.3":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
-  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helpers" "^7.12.1"
-    "@babel/parser" "^7.12.3"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.5":
+"@babel/generator@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
   integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
@@ -96,6 +86,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
+  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
+  dependencies:
+    "@babel/types" "^7.16.8"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
@@ -171,6 +170,16 @@
     browserslist "^4.16.6"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
+  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+  dependencies:
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-validator-option" "^7.16.7"
+    browserslist "^4.17.5"
+    semver "^6.3.0"
+
 "@babel/helper-compilation-targets@^7.9.6":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
@@ -263,6 +272,13 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-environment-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
+  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-explode-assignable-expression@^7.10.4":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
@@ -303,6 +319,15 @@
     "@babel/template" "^7.15.4"
     "@babel/types" "^7.15.4"
 
+"@babel/helper-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
+  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
@@ -335,6 +360,13 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
+"@babel/helper-get-function-arity@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
+  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
@@ -356,6 +388,13 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-hoist-variables@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
@@ -420,6 +459,20 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.6"
 
+"@babel/helper-module-transforms@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
+  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-module-transforms@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
@@ -546,6 +599,13 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
+"@babel/helper-simple-access@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
+  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
@@ -582,6 +642,13 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
@@ -614,6 +681,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
   integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
 
+"@babel/helper-validator-option@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
+  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
+
 "@babel/helper-wrap-function@^7.10.4":
   version "7.12.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
@@ -644,23 +716,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
-  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
-  dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
-
-"@babel/helpers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
-  integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
+"@babel/helpers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
+  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
   dependencies:
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -680,16 +743,30 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.4", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5":
+"@babel/highlight@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
+  integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.10.4", "@babel/parser@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
   integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
 
-"@babel/parser@^7.15.4", "@babel/parser@^7.15.5":
+"@babel/parser@^7.15.4":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae"
   integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==
 
+"@babel/parser@^7.16.7", "@babel/parser@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
+  integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
+
 "@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
   version "7.9.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
@@ -1500,16 +1577,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
-  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5":
+"@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.9.6":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
   integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
@@ -1518,15 +1586,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-amd@^7.2.0", "@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz#8539ec42c153d12ea3836e0e3ac30d5aae7b258e"
-  integrity sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
 "@babel/plugin-transform-modules-commonjs@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
@@ -2213,6 +2272,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.14.0":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
+  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.8.4":
   version "7.9.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
@@ -2238,6 +2304,15 @@
     "@babel/parser" "^7.15.4"
     "@babel/types" "^7.15.4"
 
+"@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
@@ -2277,6 +2352,22 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
+"@babel/traverse@^7.16.7":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
+  integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.16.8"
+    "@babel/types" "^7.16.8"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/traverse@^7.4.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
@@ -2300,6 +2391,14 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
+  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -2618,6 +2717,26 @@
   dependencies:
     "@types/estree" "*"
 
+"@types/body-parser@*":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
+"@types/chai-as-promised@^7.1.2":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@types/chai-as-promised/-/chai-as-promised-7.1.4.tgz#caf64e76fb056b8c8ced4b761ed499272b737601"
+  integrity sha512-1y3L1cHePcIm5vXkh1DSGf/zQq5n5xDKG1fpCvf18+uOkpce0Z1ozNFPkyWsVswK7ntN1sZBw3oU6gmN+pDUcA==
+  dependencies:
+    "@types/chai" "*"
+
+"@types/chai@*", "@types/chai@^4.2.9":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.0.tgz#23509ebc1fa32f1b4d50d6a66c4032d5b8eaabdc"
+  integrity sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -2628,6 +2747,13 @@
   resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
   integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
 
+"@types/connect@*":
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/cookie@^0.4.1":
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
@@ -2648,6 +2774,25 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/express-serve-static-core@^4.17.18":
+  version "4.17.28"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
+  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+  dependencies:
+    "@types/node" "*"
+    "@types/qs" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.2":
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "^4.17.18"
+    "@types/qs" "*"
+    "@types/serve-static" "*"
+
 "@types/fs-extra@^5.0.5":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.1.0.tgz#2a325ef97901504a3828718c390d34b8426a10a1"
@@ -2655,6 +2800,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/fs-extra@^8.1.0":
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.2.tgz#7125cc2e4bdd9bd2fc83005ffdb1d0ba00cca61f"
+  integrity sha512-SvSrYXfWSc7R4eqnOzbQF4TZmfpNSM9FrSWLU3EUnWBuyZqNBOrv1B1JA3byUDPUl9z4Ab3jeZG2eDdySlgNMg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/glob@*":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
@@ -2664,6 +2816,14 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
+"@types/glob@^7.1.1":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
+  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/json-schema@^7.0.3":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
@@ -2679,6 +2839,11 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity "sha1-7ihweulOEdK4J7y+UnC86n8+ce4= sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
 
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
 "@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -2699,11 +2864,21 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
   integrity "sha1-00gO5mbfl4SxABoYcqL2zO+2wtc= sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg=="
 
+"@types/qs@*":
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
+
 "@types/qunit@^2.11.2":
   version "2.11.2"
   resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.2.tgz#4cb99ae3ea6afe94b9c4cfd3ab715a285729ca9c"
   integrity sha512-Bt0fz9l8sWxqP+cjoqWQyNVyOPPK+7GPhKIKLLTi7llR0FV+pyd50FXTXafZeZnsFVUgXw4pdupydz75E6vxjQ==
 
+"@types/range-parser@*":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
 "@types/resolve@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
@@ -2719,11 +2894,27 @@
     "@types/glob" "*"
     "@types/node" "*"
 
+"@types/rimraf@^2.0.3":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.5.tgz#368fb04d59630b727fc05a74d2ca557f64a8ef98"
+  integrity sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==
+  dependencies:
+    "@types/glob" "*"
+    "@types/node" "*"
+
 "@types/rsvp@^4.0.4":
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
   integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
 
+"@types/serve-static@*":
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
+
 "@types/symlink-or-copy@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/symlink-or-copy/-/symlink-or-copy-1.2.0.tgz#4151a81b4052c80bc2becbae09f3a9ec010a9c7a"
@@ -2986,6 +3177,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 anymatch@~3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
@@ -3014,6 +3213,11 @@ argparse@^1.0.7, argparse@~1.0.2:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -3147,11 +3351,6 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
     async "^2.4.1"
     debug "^2.6.8"
 
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= sha512-nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w=="
-
 async@^2.4.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
@@ -3159,6 +3358,13 @@ async@^2.4.1:
   dependencies:
     lodash "^4.17.10"
 
+async@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
+  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  dependencies:
+    lodash "^4.17.14"
+
 async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -3302,6 +3508,17 @@ babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
     reselect "^3.0.1"
     resolve "^1.4.0"
 
+babel-plugin-module-resolver@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
+  integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
+  dependencies:
+    find-babel-config "^1.2.0"
+    glob "^7.1.6"
+    pkg-up "^3.1.0"
+    reselect "^4.0.0"
+    resolve "^1.13.1"
+
 babel-plugin-polyfill-corejs2@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
@@ -3430,12 +3647,12 @@ base@^0.11.1:
     mixin-deep "^1.2.0"
     pascalcase "^0.1.1"
 
-basic-auth@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.0.tgz#015db3f353e02e56377755f962742e8981e7bbba"
-  integrity "sha1-AV2z81PgLlY3d1X5YnQuiYHnu7o= sha512-BNzMKPNNIV3+C02TSO9oILCAPS/htf/upL+TRV2gOnPwSQbFKuL249fwVozDNbSq/AeyoRoVeQgJcK4sN77aHg=="
+basic-auth@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
   dependencies:
-    safe-buffer "5.1.1"
+    safe-buffer "5.1.2"
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -3514,16 +3731,17 @@ boom@0.4.x:
   dependencies:
     hoek "0.9.x"
 
-bower-config@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.1.tgz#85fd9df367c2b8dbbd0caa4c5f2bad40cd84c2cc"
-  integrity "sha1-hf2d82fCuNu9DKpMXyutQM2Ewsw= sha512-9k12aae2vBdIIbzJlRKta8qNMCM6V1cs0xutPBBrSrvhQk3iDuYCM/ICFpAafjfgeNFKa9HMJGSW/2Nt3gG7Yw=="
+bower-config@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/bower-config/-/bower-config-1.4.3.tgz#3454fecdc5f08e7aa9cc6d556e492be0669689ae"
+  integrity sha512-MVyyUk3d1S7d2cl6YISViwJBc2VXCkxF5AUFykvN0PQj5FsUiMNSgAYTso18oRFfyZ6XEtjrgg9MAaufHbOwNw==
   dependencies:
     graceful-fs "^4.1.3"
+    minimist "^0.2.1"
     mout "^1.0.0"
-    optimist "^0.6.1"
     osenv "^0.1.3"
     untildify "^2.1.0"
+    wordwrap "^0.0.3"
 
 bower-endpoint-parser@0.2.2:
   version "0.2.2"
@@ -3571,7 +3789,7 @@ broccoli-amd-funnel@^2.0.1:
     broccoli-plugin "^1.3.0"
     symlink-or-copy "^1.2.0"
 
-broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.8.0:
+broccoli-babel-transpiler@^7.8.0:
   version "7.8.0"
   resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
   integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
@@ -3638,24 +3856,6 @@ broccoli-clean-css@^1.1.0:
     inline-source-map-comment "^1.0.5"
     json-stable-stringify "^1.0.0"
 
-broccoli-concat@^3.7.3:
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.7.4.tgz#7371e846eb7a97cb44ccff10f68582bcadcafacd"
-  integrity "sha1-c3HoRut6l8tEzP8Q9oWCvK3K+s0= sha512-9gRv1tyCQuq2+48DT9DQyxRNLOuwDtHybDeYuWA3g26HFqZd0PGAOeXcLXHpKRhxzrEbU6Gm28dZ/KolMr04cQ=="
-  dependencies:
-    broccoli-debug "^0.6.5"
-    broccoli-kitchen-sink-helpers "^0.3.1"
-    broccoli-plugin "^1.3.0"
-    ensure-posix-path "^1.0.2"
-    fast-sourcemap-concat "^1.4.0"
-    find-index "^1.1.0"
-    fs-extra "^4.0.3"
-    fs-tree-diff "^0.5.7"
-    lodash.merge "^4.6.2"
-    lodash.omit "^4.1.0"
-    lodash.uniq "^4.2.0"
-    walk-sync "^0.3.2"
-
 broccoli-concat@^4.2.5:
   version "4.2.5"
   resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-4.2.5.tgz#d578f00094048b5fc87195e82fbdbde20d838d29"
@@ -3793,33 +3993,16 @@ broccoli-merge-trees@^4.2.0:
     broccoli-plugin "^4.0.2"
     merge-trees "^2.0.0"
 
-broccoli-middleware@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.0.1.tgz#093314f13e52fad7fa8c4254a4e4a4560c857a65"
-  integrity "sha1-CTMU8T5S+tf6jEJUpOSkVgyFemU= sha512-V/K5uozcEH/XJ09ZAL8aJt/W2UwJU8I8fA2FAg3u9gzs5dQrehHDtgSoKS2QjPjurRC1GSiYLcsMp36sezaQQg=="
+broccoli-middleware@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-2.1.1.tgz#183635bbef4dc1241533ee001a162f013d776cb9"
+  integrity sha512-BK8aPhQpOLsHWiftrqXQr84XsvzUqeaN4PlCQOYg5yM0M+WKAHtX2WFXmicSQZOVgKDyh5aeoNTFkHjBAEBzwQ==
   dependencies:
+    ansi-html "^0.0.7"
     handlebars "^4.0.4"
+    has-ansi "^3.0.0"
     mime-types "^2.1.18"
 
-broccoli-module-normalizer@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/broccoli-module-normalizer/-/broccoli-module-normalizer-1.3.0.tgz#f9982d9cbb776b4ed754161cc6547784d3eb19de"
-  integrity "sha1-+ZgtnLt3a07XVBYcxlR3hNPrGd4= sha512-0idZCOtdVG6xXoQ36Psc1ApMCr3lW5DB+WEAOEwHcUoESIBHzwcRPQTxheGIjZ5o0hxpsRYAUH5x0ErtNezbrQ=="
-  dependencies:
-    broccoli-plugin "^1.3.0"
-    merge-trees "^1.0.1"
-    rimraf "^2.6.2"
-    symlink-or-copy "^1.1.8"
-
-broccoli-module-unification-reexporter@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-module-unification-reexporter/-/broccoli-module-unification-reexporter-1.0.0.tgz#031909c5d3f159ec11d5f9e2346f2861db8acb3e"
-  integrity "sha1-AxkJxdPxWewR1fniNG8oYduKyz4= sha512-HTi9ua520M20aBZomaiBopsSt3yjL7J/paR3XPjieygK7+ShATBiZdn0B+ZPiniBi4I8JuMn1q0fNFUevtP//A=="
-  dependencies:
-    broccoli-plugin "^1.3.0"
-    mkdirp "^0.5.1"
-    walk-sync "^0.3.2"
-
 broccoli-node-api@^1.6.0, broccoli-node-api@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-api/-/broccoli-node-api-1.7.0.tgz#391aa6edecd2a42c63c111b4162956b2fa288cb6"
@@ -3830,11 +4013,6 @@ broccoli-node-info@^1.1.0:
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412"
   integrity "sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI= sha512-DUohSZCdfXli/3iN6SmxPbck1OVG8xCkrLx47R25his06xVc1ZmmrOsrThiM8BsCWirwyocODiYJqNP5W2Hg1A=="
 
-broccoli-node-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.0.0.tgz#652a7940ede40630b84ad009c6236f4bc548b556"
-  integrity "sha1-ZSp5QO3kBjC4StAJxiNvS8VItVY= sha512-xfnzPYdf8Uu3mfhEPkh3CX1suGHNNW4k3f730llzr4Dl7UXvI5T8RUb7X04BSvJfvqYTekM/JTmYrjB01WAsCg=="
-
 broccoli-node-info@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.1.0.tgz#ca84560e8570ff78565bea1699866ddbf58ad644"
@@ -3868,7 +4046,7 @@ broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6:
     symlink-or-copy "^1.0.1"
     walk-sync "^0.3.1"
 
-broccoli-persistent-filter@^2.1.1, broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.3.1:
+broccoli-persistent-filter@^2.2.1, broccoli-persistent-filter@^2.3.0, broccoli-persistent-filter@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-2.3.1.tgz#4a052e0e0868b344c3a2977e35a3d497aa9eca72"
   integrity sha512-hVsmIgCDrl2NFM+3Gs4Cr2TA6UPaIZip99hN8mtkaUPgM8UeVnCbxelCvBjUBHo0oaaqP5jzqqnRVvb568Yu5g==
@@ -3898,7 +4076,7 @@ broccoli-plugin@1.1.0:
     rimraf "^2.3.4"
     symlink-or-copy "^1.0.1"
 
-broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0, broccoli-plugin@^1.3.1:
+broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli-plugin@^1.2.1, broccoli-plugin@^1.3.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz#a26315732fb99ed2d9fb58f12a1e14e986b4fabd"
   integrity sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==
@@ -3908,6 +4086,16 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli
     rimraf "^2.3.4"
     symlink-or-copy "^1.1.8"
 
+broccoli-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz#2fab6c578219cfcc64f773e9616073313fc8b334"
+  integrity sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==
+  dependencies:
+    promise-map-series "^0.2.1"
+    quick-temp "^0.1.3"
+    rimraf "^2.3.4"
+    symlink-or-copy "^1.1.8"
+
 broccoli-plugin@^4.0.0, broccoli-plugin@^4.0.1, broccoli-plugin@^4.0.2, broccoli-plugin@^4.0.3, broccoli-plugin@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/broccoli-plugin/-/broccoli-plugin-4.0.7.tgz#dd176a85efe915ed557d913744b181abe05047db"
@@ -3938,10 +4126,10 @@ broccoli-rollup@^2.1.1:
     symlink-or-copy "^1.1.8"
     walk-sync "^0.3.1"
 
-broccoli-slow-trees@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz#9bf2a9e2f8eb3ed3a3f2abdde988da437ccdc9b4"
-  integrity "sha1-m/Kp4vjrPtOj8qvd6YjaQ3zNybQ= sha512-YSziKLG9j0aKZBIO0u10DbCOlsVV6EEFWcY0W8rZdTwBS1eG3RSEyLYHhJhVMJTUZYYjphpDhedDMrdxUPm39A=="
+broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/broccoli-slow-trees/-/broccoli-slow-trees-3.1.0.tgz#8e48903f59e061bf1213963733b9e61dec2ee5d7"
+  integrity sha512-FRI7mRTk2wjIDrdNJd6znS7Kmmne4VkAkl8Ix1R/VoePFMD0g0tEl671xswzFqaRjpT9Qu+CC4hdXDLDJBuzMw==
   dependencies:
     heimdalljs "^0.2.1"
 
@@ -3962,25 +4150,25 @@ broccoli-source@^3.0.0, broccoli-source@^3.0.1:
   dependencies:
     broccoli-node-api "^1.6.0"
 
-broccoli-stew@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-2.1.0.tgz#ba73add17fda3b9b01d8cfb343a8b613b7136a0a"
-  integrity "sha1-unOt0X/aO5sB2M+zQ6i2E7cTago= sha512-tgCkuTWYl4uf7k7ib2D79KFEj2hCgnTUNPMnrCoAha0/4bywcNccmaZVWtL9Ex37yX5h5eAbnM/ak2ULoMwSSw=="
+broccoli-stew@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-stew/-/broccoli-stew-3.0.0.tgz#fd1d19d162ad9490b42e5c563b78c26eb1e80b95"
+  integrity sha512-NXfi+Vas24n3Ivo21GvENTI55qxKu7OwKRnCLWXld8MiLiQKQlWIq28eoARaFj0lTUFwUa4jKZeA7fW9PiWQeg==
   dependencies:
     broccoli-debug "^0.6.5"
     broccoli-funnel "^2.0.0"
     broccoli-merge-trees "^3.0.1"
-    broccoli-persistent-filter "^2.1.1"
-    broccoli-plugin "^1.3.1"
+    broccoli-persistent-filter "^2.3.0"
+    broccoli-plugin "^2.1.0"
     chalk "^2.4.1"
-    debug "^3.1.0"
+    debug "^4.1.1"
     ensure-posix-path "^1.0.1"
-    fs-extra "^6.0.1"
+    fs-extra "^8.0.1"
     minimatch "^3.0.4"
-    resolve "^1.8.1"
-    rsvp "^4.8.4"
+    resolve "^1.11.1"
+    rsvp "^4.8.5"
     symlink-or-copy "^1.2.0"
-    walk-sync "^0.3.3"
+    walk-sync "^1.1.3"
 
 broccoli-string-replace@^0.1.2:
   version "0.1.2"
@@ -4020,32 +4208,35 @@ broccoli-uglify-sourcemap@^4.0.0:
     walk-sync "^2.2.0"
     workerpool "^6.0.0"
 
-broccoli@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.1.2.tgz#31a8758aa087a26d62f1dab65c1d0af87cbced73"
-  integrity "sha1-Mah1iqCHom1i8dq2XB0K+Hy87XM= sha512-lSQB5sReBO1yPnWvQEqrAtLomK1BB1lsFQjc/whszK9j37v0tvvuCOeHX40x7iw3D2V4CyiBrYUUPY4pBjwdzA=="
+broccoli@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.5.2.tgz#60921167d57b43fb5bad527420d62fe532595ef4"
+  integrity sha512-sWi3b3fTUSVPDsz5KsQ5eCQNVAtLgkIE/HYFkEZXR/07clqmd4E/gFiuwSaqa9b+QTXc1Uemfb7TVWbEIURWDg==
   dependencies:
+    "@types/chai" "^4.2.9"
+    "@types/chai-as-promised" "^7.1.2"
+    "@types/express" "^4.17.2"
     ansi-html "^0.0.7"
-    broccoli-node-info "^2.0.0"
+    broccoli-node-info "^2.1.0"
     broccoli-slow-trees "^3.0.1"
-    broccoli-source "^1.1.0"
-    commander "^2.15.1"
+    broccoli-source "^3.0.0"
+    commander "^4.1.1"
     connect "^3.6.6"
     console-ui "^3.0.4"
     esm "^3.2.4"
-    findup-sync "^2.0.0"
-    handlebars "^4.0.11"
+    findup-sync "^4.0.0"
+    handlebars "^4.7.3"
     heimdalljs "^0.2.6"
     heimdalljs-logger "^0.1.9"
-    mime-types "^2.1.19"
-    promise.prototype.finally "^3.1.0"
+    https "^1.0.0"
+    mime-types "^2.1.26"
     resolve-path "^1.4.0"
-    rimraf "^2.6.2"
+    rimraf "^3.0.2"
     sane "^4.0.0"
-    tmp "0.0.33"
-    tree-sync "^1.2.2"
+    tmp "^0.0.33"
+    tree-sync "^2.0.0"
     underscore.string "^3.2.2"
-    watch-detector "^0.1.0"
+    watch-detector "^1.0.0"
 
 browser-stdout@1.3.1:
   version "1.3.1"
@@ -4074,6 +4265,17 @@ browserslist@^4.16.6, browserslist@^4.17.0:
     nanocolors "^0.1.5"
     node-releases "^1.1.76"
 
+browserslist@^4.17.5:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
+  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+  dependencies:
+    caniuse-lite "^1.0.30001286"
+    electron-to-chromium "^1.4.17"
+    escalade "^3.1.1"
+    node-releases "^2.0.1"
+    picocolors "^1.0.0"
+
 browserstack-local@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.8.tgz#07f74a19b324cf2de69ffe65f9c2baa3a2dd9a0e"
@@ -4091,6 +4293,13 @@ browserstack@^1.6.1:
   dependencies:
     https-proxy-agent "^2.2.1"
 
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -4098,29 +4307,11 @@ bser@^2.0.0:
   dependencies:
     node-int64 "^0.4.0"
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA= sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow= sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
   integrity "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
 
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity "sha1-+PeLdniYiO858gXNY39o5wISKyw= sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="
-
 buffer-from@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
@@ -4221,6 +4412,11 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
   integrity "sha1-+361abcq16RYEvk/2UMKPkELPdM= sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw=="
 
+callsites@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
@@ -4259,6 +4455,11 @@ caniuse-lite@^1.0.30001259:
   dependencies:
     nanocolors "^0.1.0"
 
+caniuse-lite@^1.0.30001286:
+  version "1.0.30001299"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz#d753bf6444ed401eb503cbbe17aa3e1451b5a68c"
+  integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -4347,10 +4548,10 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
-  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+chalk@^4.0.0, chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -4392,10 +4593,10 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs= sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity "sha1-Z6npZL4xpR4V5QENWObxKDQAL0Y= sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+ci-info@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
+  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
 
 class-utils@^0.3.5:
   version "0.3.5"
@@ -4430,6 +4631,11 @@ clean-css@^3.4.5:
     commander "2.8.x"
     source-map "0.4.x"
 
+clean-stack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 clean-up-path@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5"
@@ -4562,11 +4768,16 @@ commander@6.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
   integrity "sha1-uZC/uKwDCu3G0RvATRSI/+9W23U= sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="
 
-commander@^2.12.1, commander@^2.15.1, commander@^2.20.0, commander@^2.6.0:
+commander@^2.12.1, commander@^2.20.0, commander@^2.6.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
 
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
 common-tags@^1.8.2:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -4622,17 +4833,17 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-configstore@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-4.0.0.tgz#5933311e95d3687efb592c528b922d9262d227e7"
-  integrity "sha1-WTMxHpXTaH77WSxSi5ItkmLSJ+c= sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ=="
+configstore@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
+  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
   dependencies:
-    dot-prop "^4.1.0"
+    dot-prop "^5.2.0"
     graceful-fs "^4.1.2"
-    make-dir "^1.0.0"
-    unique-string "^1.0.0"
-    write-file-atomic "^2.0.0"
-    xdg-basedir "^3.0.0"
+    make-dir "^3.0.0"
+    unique-string "^2.0.0"
+    write-file-atomic "^3.0.0"
+    xdg-basedir "^4.0.0"
 
 connect@^3.6.6:
   version "3.6.6"
@@ -4649,10 +4860,10 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
 
-console-ui@^3.0.2, console-ui@^3.0.4:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171"
-  integrity "sha1-aBoEFOiwoj7WedCigC452SCAEXE= sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ=="
+console-ui@^3.0.4, console-ui@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.2.tgz#51aef616ff02013c85ccee6a6d77ef7a94202e7a"
+  integrity sha512-+5j3R4wZJcEYZeXk30whc4ZU/+fWW9JMTNntVuMYpjZJ9n26Cxr0tUBXco1NRjVZRpRVvZ4DDKKKIHNYeUG9Dw==
   dependencies:
     chalk "^2.1.0"
     inquirer "^6"
@@ -4763,7 +4974,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity "sha1-9zqFudXUHQRVUcF34ogtSshXKKY= sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="
@@ -4779,10 +4990,10 @@ cryptiles@0.2.x:
   dependencies:
     boom "0.4.x"
 
-crypto-random-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
-  integrity "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4= sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg=="
+crypto-random-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
+  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
 css-loader@^5.2.0:
   version "5.2.7"
@@ -4857,7 +5068,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, d
   dependencies:
     ms "2.1.2"
 
-debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
+debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4978,6 +5189,11 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
 
+depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
@@ -4988,10 +5204,15 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q=="
 
-detect-indent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
-  integrity "sha1-OHHMCmoALow+Wzz38zYmRnXwa50= sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g=="
+detect-indent@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
+  integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
+
+detect-newline@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 diff@1.0.8:
   version "1.0.8"
@@ -5008,6 +5229,11 @@ diff@^4.0.1:
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
   integrity "sha1-DGZ8tGfru1zqfxTxNcwtuneAqP8= sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="
 
+diff@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -5029,12 +5255,12 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dot-prop@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"
-  integrity "sha1-RYhBlKcfws2nHLtLzrOk3S9DO6Q= sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ=="
+dot-prop@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
+  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
   dependencies:
-    is-obj "^1.0.0"
+    is-obj "^2.0.0"
 
 duplexer3@^0.1.4:
   version "0.1.4"
@@ -5066,6 +5292,11 @@ electron-to-chromium@^1.3.846:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.849.tgz#45a65a392565abc5b864624b9753393336426f4b"
   integrity sha512-RweyW60HPOqIcxoKTGr38Yvtf2aliSUqX8dB3e9geJ0Bno0YLjcOX5F7/DPVloBkJWaPZ7xOM1A0Yme2T1A34w==
 
+electron-to-chromium@^1.4.17:
+  version "1.4.44"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
+  integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
+
 ember-auto-import@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
@@ -5188,17 +5419,6 @@ ember-cli-blueprint-test-helpers@^0.19.2:
     testdouble "^3.2.6"
     tmp-sync "^1.0.0"
 
-ember-cli-broccoli-sane-watcher@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe"
-  integrity "sha1-3BgSwEfhzuxEE9PEG1Gp/8YbTP4= sha512-sLn+wy6FJpGMHtSwAGUjQK3nJFvw2b6H8bR2EgMIXxkUI3DYFLi6Xnyxm02XlMTcfTxF10yHFhHJe0O+PcJM7A=="
-  dependencies:
-    broccoli-slow-trees "^3.0.1"
-    heimdalljs "^0.2.1"
-    heimdalljs-logger "^0.1.7"
-    rsvp "^3.0.18"
-    sane "^4.0.0"
-
 ember-cli-browserstack@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ember-cli-browserstack/-/ember-cli-browserstack-2.0.1.tgz#4bfc6bcce28dba0a8fb4409945b8f9f9ee31abf7"
@@ -5309,102 +5529,101 @@ ember-cli-yuidoc@^0.9.1:
     rsvp "3.0.14"
     yuidocjs "^0.10.0"
 
-ember-cli@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.12.0.tgz#e6d27e4c57fc44eb7963fe4611b3b0cfb9d9558d"
-  integrity "sha1-5tJ+TFf8ROt5Y/5GEbOwz7nZVY0= sha512-hON3/thKAIcwzHX9SWIvf+UR2sQTWyXzyECYw20NDvUSydZMVtggK4GQncu7LSiUs+5zIxT8ZPzanpUZMINuCg=="
+ember-cli@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.1.0.tgz#65d482c25a7f0b93f400f799d92bb28af8527086"
+  integrity sha512-weWNx1bWdcLGCfUTRSN9393yzBkTBcIIhbGW/cOIvwsDjTxkT+RA2XdnpdeHtH4JnIW2JiJSAErCebN5R4wT7w==
   dependencies:
-    "@babel/core" "^7.4.3"
-    "@babel/plugin-transform-modules-amd" "^7.2.0"
+    "@babel/core" "^7.16.0"
+    "@babel/plugin-transform-modules-amd" "^7.12.1"
     amd-name-resolver "^1.3.1"
-    babel-plugin-module-resolver "^3.2.0"
-    bower-config "^1.4.1"
+    babel-plugin-module-resolver "^4.1.0"
+    bower-config "^1.4.3"
     bower-endpoint-parser "0.2.2"
-    broccoli "^3.1.1"
+    broccoli "^3.5.2"
     broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.2.0"
+    broccoli-babel-transpiler "^7.8.0"
     broccoli-builder "^0.18.14"
-    broccoli-concat "^3.7.3"
+    broccoli-concat "^4.2.5"
     broccoli-config-loader "^1.0.1"
     broccoli-config-replace "^1.1.2"
     broccoli-debug "^0.6.5"
-    broccoli-funnel "^2.0.2"
+    broccoli-funnel "^3.0.8"
     broccoli-funnel-reducer "^1.0.0"
     broccoli-merge-trees "^3.0.2"
-    broccoli-middleware "^2.0.1"
-    broccoli-module-normalizer "^1.3.0"
-    broccoli-module-unification-reexporter "^1.0.0"
-    broccoli-slow-trees "^3.0.1"
-    broccoli-source "^1.1.0"
-    broccoli-stew "^2.1.0"
+    broccoli-middleware "^2.1.1"
+    broccoli-slow-trees "^3.1.0"
+    broccoli-source "^3.0.1"
+    broccoli-stew "^3.0.0"
     calculate-cache-key-for-tree "^2.0.0"
     capture-exit "^2.0.0"
-    chalk "^2.4.2"
-    ci-info "^2.0.0"
+    chalk "^4.1.0"
+    ci-info "^3.3.0"
     clean-base-url "^1.0.0"
     compression "^1.7.4"
-    configstore "^4.0.0"
-    console-ui "^3.0.2"
+    configstore "^5.0.1"
+    console-ui "^3.1.2"
     core-object "^3.1.5"
     dag-map "^2.0.2"
-    diff "^4.0.1"
-    ember-cli-broccoli-sane-watcher "^3.0.0"
+    diff "^5.0.0"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-lodash-subset "^2.0.1"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-preprocess-registry "^3.3.0"
     ember-cli-string-utils "^1.1.0"
-    ember-source-channel-url "^1.1.0"
-    ensure-posix-path "^1.0.2"
-    execa "^1.0.0"
+    ember-source-channel-url "^3.0.0"
+    ensure-posix-path "^1.1.1"
+    execa "^5.1.1"
     exit "^0.1.2"
-    express "^4.16.4"
-    filesize "^4.1.2"
-    find-up "^3.0.0"
-    find-yarn-workspace-root "^1.2.1"
-    fs-extra "^7.0.1"
+    express "^4.17.1"
+    filesize "^8.0.6"
+    find-up "^5.0.0"
+    find-yarn-workspace-root "^2.0.0"
+    fixturify-project "^2.1.1"
+    fs-extra "^9.1.0"
     fs-tree-diff "^2.0.1"
     get-caller-file "^2.0.5"
-    git-repo-info "^2.1.0"
-    glob "^7.1.4"
+    git-repo-info "^2.1.1"
+    glob "^7.2.0"
     heimdalljs "^0.2.6"
-    heimdalljs-fs-monitor "^0.2.2"
-    heimdalljs-graph "^0.3.5"
+    heimdalljs-fs-monitor "^1.1.1"
+    heimdalljs-graph "^1.0.0"
     heimdalljs-logger "^0.1.10"
-    http-proxy "^1.17.0"
-    inflection "^1.12.0"
+    http-proxy "^1.18.1"
+    inflection "^1.13.1"
     is-git-url "^1.0.0"
-    isbinaryfile "^3.0.3"
-    js-yaml "^3.13.1"
+    is-language-code "^3.1.0"
+    isbinaryfile "^4.0.8"
+    js-yaml "^3.14.0"
     json-stable-stringify "^1.0.1"
     leek "0.0.24"
-    lodash.template "^4.4.0"
-    markdown-it "^8.4.2"
-    markdown-it-terminal "0.1.0"
+    lodash.template "^4.5.0"
+    markdown-it "^12.0.4"
+    markdown-it-terminal "0.2.1"
     minimatch "^3.0.4"
-    morgan "^1.9.1"
+    morgan "^1.10.0"
     nopt "^3.0.6"
-    npm-package-arg "^6.1.0"
-    p-defer "^2.1.0"
-    portfinder "^1.0.20"
-    promise-map-series "^0.2.3"
-    promise.prototype.finally "^3.1.0"
+    npm-package-arg "^8.1.5"
+    p-defer "^3.0.0"
+    portfinder "^1.0.28"
+    promise-map-series "^0.3.0"
+    promise.hash.helper "^1.0.7"
     quick-temp "^0.1.8"
-    resolve "^1.10.1"
-    resolve-package-path "^1.2.7"
-    rsvp "^4.8.4"
-    sane "^4.1.0"
-    semver "^6.0.0"
+    resolve "^1.20.0"
+    resolve-package-path "^3.1.0"
+    sane "^5.0.1"
+    semver "^7.3.4"
     silent-error "^1.1.1"
-    sort-package-json "^1.22.1"
-    symlink-or-copy "^1.2.0"
-    temp "0.9.0"
-    testem "^2.14.0"
-    tiny-lr "^1.1.1"
-    tree-sync "^1.4.0"
-    uuid "^3.3.2"
-    walk-sync "^1.1.3"
-    watch-detector "^0.1.0"
+    sort-package-json "^1.49.0"
+    symlink-or-copy "^1.3.1"
+    temp "0.9.4"
+    testem "^3.2.0"
+    tiny-lr "^2.0.0"
+    tree-sync "^2.1.0"
+    uuid "^8.3.2"
+    walk-sync "^2.2.0"
+    watch-detector "^1.0.1"
+    workerpool "^6.1.4"
     yam "^1.0.0"
 
 ember-publisher@0.0.7:
@@ -5433,12 +5652,12 @@ ember-router-generator@^2.0.0:
     "@babel/traverse" "^7.4.5"
     recast "^0.18.1"
 
-ember-source-channel-url@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-1.1.0.tgz#73de5cc6ebc25b2120e932ec1d8f82677bfaf6ef"
-  integrity "sha1-c95cxuvCWyEg6TLsHY+CZ3v69u8= sha512-y1RVXmyqrdX6zq9ZejpPt7ohKNGuLMBEKaOUyxFWcYAM5gvLuo6xFerwNmXEBbu4e3//GaoasjodXi6Cl+ddUQ=="
+ember-source-channel-url@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-source-channel-url/-/ember-source-channel-url-3.0.0.tgz#bcd5be72c63fa0b8c390b3121783b462063e2a1b"
+  integrity sha512-vF/8BraOc66ZxIDo3VuNP7iiDrnXEINclJgSJmqwAAEpg84Zb1DHPI22XTXSDA+E8fW5btPUxu65c3ZXi8AQFA==
   dependencies:
-    got "^8.0.1"
+    node-fetch "^2.6.0"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -5541,7 +5760,7 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
-ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0:
+ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0, ensure-posix-path@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
   integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
@@ -5551,6 +5770,11 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
+entities@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+
 error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
@@ -5616,7 +5840,7 @@ es-abstract@^1.19.0, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
-es-abstract@^1.5.1, es-abstract@^1.9.0:
+es-abstract@^1.5.1:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity "sha1-rIYUX91QmdjdSVWMy6Lq+biOJOk= sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="
@@ -6001,6 +6225,11 @@ exec-sh@^0.3.2:
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
   integrity "sha1-ZzjeLrfI5nHQNmrqCw24xvfXORs= sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
 
+exec-sh@^0.3.4:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
+  integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
+
 execa@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
@@ -6014,6 +6243,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -6064,7 +6308,7 @@ expect-type@^0.13.0:
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
   integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
 
-express@^4.10.7, express@^4.13.1, express@^4.16.4, express@^4.17.1:
+express@^4.10.7, express@^4.13.1, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="
@@ -6138,6 +6382,11 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+extract-stack@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b"
+  integrity sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==
+
 extract-zip@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz#f53b71d44f4ff5a4527a2259ade000fb8b303492"
@@ -6159,6 +6408,17 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
 
+fast-glob@^3.0.3:
+  version "3.2.10"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"
+  integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@^3.1.1:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
@@ -6188,20 +6448,6 @@ fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2:
   dependencies:
     blank-object "^1.0.1"
 
-fast-sourcemap-concat@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.4.0.tgz#122c330d4a2afaff16ad143bc9674b87cd76c8ad"
-  integrity "sha1-EiwzDUoq+v8WrRQ7yWdLh812yK0= sha512-x90Wlx/2C83lfyg7h4oguTZN4MyaVfaiUSJQNpU+YEA0Odf9u659Opo44b0LfoVg9G/bOE++GdID/dkyja+XcA=="
-  dependencies:
-    chalk "^2.0.0"
-    fs-extra "^5.0.0"
-    heimdalljs-logger "^0.1.9"
-    memory-streams "^0.1.3"
-    mkdirp "^0.5.0"
-    source-map "^0.4.2"
-    source-map-url "^0.3.0"
-    sourcemap-validator "^1.1.0"
-
 fast-sourcemap-concat@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-2.1.0.tgz#12dd36bfc38c804093e4bd1de61dd6216f574211"
@@ -6223,10 +6469,10 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-faye-websocket@~0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
-  integrity "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= sha512-Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="
+faye-websocket@^0.11.3:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -6237,6 +6483,13 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "^2.0.0"
 
+fb-watchman@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
@@ -6258,10 +6511,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-filesize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-4.1.2.tgz#fcd570af1353cea97897be64f56183adb995994b"
-  integrity "sha1-/NVwrxNTzql4l75k9WGDrbmVmUs= sha512-iSWteWtfNcrWQTkQw8ble2bnonSl7YJImsn9OZKpE2E4IHhXI78eASpDYUljXZZdYj36QsEKjOs/CsiDqmKMJw=="
+filesize@^8.0.6:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.6.tgz#5f0c27aa1b507fa7d9f72c912a774ca6a44111b1"
+  integrity sha512-sHvRqTiwdmcuzqet7iVwsbwF6UrV3wIgDf2SHNdY1Hgl8PC45HZg/0xtdw6U2izIV4lccnrY9ftl6wZFNdjYMg==
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -6306,7 +6559,7 @@ finalhandler@^1.1.2, finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0:
+find-babel-config@^1.1.0, find-babel-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
   integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
@@ -6350,7 +6603,15 @@ find-up@^4.0.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-yarn-workspace-root@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
   integrity "sha1-QOuObnwlAt36old8F28iFCL4YNs= sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q=="
@@ -6358,14 +6619,21 @@ find-yarn-workspace-root@^1.1.0, find-yarn-workspace-root@^1.2.1:
     fs-extra "^4.0.3"
     micromatch "^3.1.4"
 
-findup-sync@^2.0.0:
+find-yarn-workspace-root@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
-  integrity "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g=="
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
+  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
+  dependencies:
+    micromatch "^4.0.2"
+
+findup-sync@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
+  integrity sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==
   dependencies:
     detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
+    is-glob "^4.0.0"
+    micromatch "^4.0.2"
     resolve-dir "^1.0.1"
 
 fireworm@^0.7.0:
@@ -6387,6 +6655,15 @@ fixturify-project@^1.10.0:
     fixturify "^1.2.0"
     tmp "^0.0.33"
 
+fixturify-project@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fixturify-project/-/fixturify-project-2.1.1.tgz#a511dd26700c6b64ac271ef4393e7124f153c81f"
+  integrity sha512-sP0gGMTr4iQ8Kdq5Ez0CVJOZOGWqzP5dv/veOTdFNywioKjkNWCHBi1q65DMpcNGUGeoOUWehyji274Q2wRgxA==
+  dependencies:
+    fixturify "^2.1.0"
+    tmp "^0.0.33"
+    type-fest "^0.11.0"
+
 fixturify@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-1.3.0.tgz#163c468093c7c4d90b70cde39fd6325f6528b25d"
@@ -6398,6 +6675,18 @@ fixturify@^1.2.0:
     fs-extra "^7.0.1"
     matcher-collection "^2.0.0"
 
+fixturify@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.1.tgz#e962d72f062600cb81a9651086f60d822c72d998"
+  integrity sha512-SRgwIMXlxkb6AUgaVjIX+jCEqdhyXu9hah7mcK+lWynjKtX73Ux1TDv71B7XyaQ+LJxkYRHl5yCL8IycAvQRUw==
+  dependencies:
+    "@types/fs-extra" "^8.1.0"
+    "@types/minimatch" "^3.0.3"
+    "@types/rimraf" "^2.0.3"
+    fs-extra "^8.1.0"
+    matcher-collection "^2.0.1"
+    walk-sync "^2.0.2"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -6575,7 +6864,7 @@ fs-sync@^1.0.4:
     mkdirp "^0.5.1"
     rimraf "^2.1.4"
 
-fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6, fs-tree-diff@^0.5.7:
+fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz#a4ec6182c2f5bd80b9b83c8e23e4522e6f5fd946"
   integrity sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==
@@ -6641,11 +6930,6 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
-
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -6692,6 +6976,13 @@ get-stream@^4.0.0:
   dependencies:
     pump "^3.0.0"
 
+get-stream@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
+  dependencies:
+    pump "^3.0.0"
+
 get-stream@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
@@ -6717,12 +7008,17 @@ get-value@^2.0.3, get-value@^2.0.6:
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="
 
+git-hooks-list@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz#be5baaf78203ce342f2f844a9d2b03dba1b45156"
+  integrity sha512-Y7wLWcrLUXwk2noSka166byGCvhMtDRpgHdzCno1UQv/n/Hegp++a2xBWJL1lJarnKD3SWaljD+0z1ztqxuKyQ==
+
 git-repo-info@^1.0.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943"
   integrity "sha1-KgcoIyVKr2L88HZgB9e2ZRvUGUM= sha512-oqzBH6cNvE8Cq3p61ps4m0POZrVMKlARntc2BxLnuqTK+HeWpKfUMJQ7H1CvescHRINj+0a7TKA+Pp/bOq5F1Q=="
 
-git-repo-info@^2.1.0, git-repo-info@^2.1.1:
+git-repo-info@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-2.1.1.tgz#220ffed8cbae74ef8a80e3052f2ccb5179aed058"
   integrity "sha1-Ig/+2MuudO+KgOMFLyzLUXmu0Fg= sha512-8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="
@@ -6771,7 +7067,7 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0:
+glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -6825,6 +7121,20 @@ globalyzer@0.1.0:
   resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
   integrity "sha1-y3baeVVWaaFRnVqO3wk6+qC/FGU= sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="
 
+globby@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.0.tgz#abfcd0630037ae174a88590132c2f6804e291072"
+  integrity sha512-3LifW9M4joGZasyYPz2A1U74zbC/45fvpXUvO/9KbSa+VV0aGZarWkfdgKyR9sExNP0t0x0ss/UMJpNpcaTspw==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
+    slash "^3.0.0"
+
 globby@^11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
@@ -6842,7 +7152,7 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity "sha1-3V2eyCYjJzDNZ5Ol4zqTApheYJg= sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
 
-got@^8.0.1, got@^8.3.1:
+got@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
   integrity "sha1-HSP2Q5Dpf3dsrFLluTbl9RTS6Tc= sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="
@@ -6865,7 +7175,7 @@ got@^8.0.1, got@^8.3.1:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
+graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
   integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
@@ -6885,7 +7195,7 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw=="
 
-handlebars@^4.0.11, handlebars@^4.0.4, handlebars@^4.3.1:
+handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.3:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -6912,6 +7222,13 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+has-ansi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-3.0.0.tgz#36077ef1d15f333484aa7fa77a28606f1c655b37"
+  integrity sha1-Ngd+8dFfMzSEqn+neihgbxxlWzc=
+  dependencies:
+    ansi-regex "^3.0.0"
+
 has-bigints@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -7043,18 +7360,21 @@ he@1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity "sha1-hK5l+n6vsWX922FWauFLrwVmTw8= sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
 
-heimdalljs-fs-monitor@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.2.2.tgz#a76d98f52dbf3aa1b7c20cebb0132e2f5eeb9204"
-  integrity "sha1-p22Y9S2/OqG3wgzrsBMuL17rkgQ= sha512-R/VhkWs8tm4x+ekLIp+oieR8b3xYK0oFDumEraGnwNMixpiKwO3+Ms5MJzDP5W5Ui1+H/57nGW5L3lHbxi20GA=="
+heimdalljs-fs-monitor@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-1.1.1.tgz#bb4021007e88484202402cdf594e3962d70dc4f4"
+  integrity sha512-BHB8oOXLRlrIaON0MqJSEjGVPDyqt2Y6gu+w2PaEZjrCxeVtZG7etEZp7M4ZQ80HNvnr66KIQ2lot2qdeG8HgQ==
   dependencies:
+    callsites "^3.1.0"
+    clean-stack "^2.2.0"
+    extract-stack "^2.0.0"
     heimdalljs "^0.2.3"
     heimdalljs-logger "^0.1.7"
 
-heimdalljs-graph@^0.3.5:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-0.3.5.tgz#420fbbc8fc3aec5963ddbbf1a5fb47921c4a5927"
-  integrity "sha1-Qg+7yPw67Flj3bvxpftHkhxKWSc= sha512-szOy9WZUc7eUInEBQEsoa1G2d+oYHrn6ndZPf76eh8A9ID1zWUCEEsxP3F+CvQx9+EDrg1srdyLUmfVAr8EB4g=="
+heimdalljs-graph@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-1.0.0.tgz#0059857952988e54f3a74bb23edaf669f8eaf6af"
+  integrity sha512-v2AsTERBss0ukm/Qv4BmXrkwsT5x6M1V5Om6E8NcDQ/ruGkERsfsuLi5T8jx8qWzKMGYlwzAd7c/idymxRaPzA==
 
 heimdalljs-logger@^0.1.10, heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9:
   version "0.1.10"
@@ -7090,11 +7410,18 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
+hosted-git-info@^2.1.4:
   version "2.8.9"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
+hosted-git-info@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 html-differ@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/html-differ/-/html-differ-1.4.0.tgz#bb95a74d54d8f107b75ad5ada166a6924093b828"
@@ -7139,7 +7466,7 @@ http-parser-js@>=0.4.0:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
   integrity "sha1-6hoE+2St/wJC6ZdPKX3Uw8rSceE= sha512-gmzoCd68gAuhyr4mOLSm4loH3Pv9fn0+YL7lItcK4BbGaxc9g+lQ7As4LhU8ZMqaPcSt4nSquIaUVbcXF/adqw=="
 
-http-proxy@^1.13.1, http-proxy@^1.17.0:
+http-proxy@^1.13.1, http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
   integrity "sha1-QBVB8FNIhLv5UmAzTnL4juOXZUk= sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="
@@ -7173,6 +7500,16 @@ https-proxy-agent@^4.0.0:
     agent-base "5"
     debug "4"
 
+https@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
+  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
+
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -7228,7 +7565,7 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
 
-inflection@^1.12.0, inflection@^1.13.1:
+inflection@^1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.1.tgz#c5cadd80888a90cf84c2e96e340d7edc85d5f0cb"
   integrity sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA==
@@ -7393,7 +7730,7 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.2.0, is-core-module@^2.8.0:
+is-core-module@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
   integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
@@ -7454,7 +7791,7 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
@@ -7481,13 +7818,6 @@ is-git-url@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
   integrity "sha1-U/aEzRQyhbUsMkS05vKCU1J69ms= sha512-UCFta9F9rWFSavp9H3zHEHrARUfZbdJvmHKeEpds4BK3v7W2LdXoNypMtXXi5w5YBDEBCTYmbI+vsSwI8LYJaQ=="
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  integrity "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
@@ -7495,6 +7825,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-language-code@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-3.1.0.tgz#b2386b49227e7010636f16d0c2c681ca40136ab5"
+  integrity sha512-zJdQ3QTeLye+iphMeK3wks+vXSRFKh68/Pnlw7aOfApFSEIOhYa8P9vwwa6QrImNNBMJTiL1PpYF0f4BxDuEgA==
+  dependencies:
+    "@babel/runtime" "^7.14.0"
+
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -7529,10 +7866,10 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss= sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
 
-is-obj@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-  integrity "sha1-PkcprB9f3gJc19g6iW2rn09n2w8= sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="
+is-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
+  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
 is-object@^1.0.1:
   version "1.0.1"
@@ -7546,6 +7883,11 @@ is-odd@^2.0.0:
   dependencies:
     is-number "^4.0.0"
 
+is-plain-obj@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -7648,6 +7990,11 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
+is-typedarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
 is-weakref@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
@@ -7682,12 +8029,10 @@ isarray@2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
   integrity "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ=="
 
-isbinaryfile@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80"
-  integrity "sha1-XW3vPt6/boyoyunDAYOoBLX4voA= sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="
-  dependencies:
-    buffer-alloc "^1.2.0"
+isbinaryfile@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
+  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -7748,7 +8093,7 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc= sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="
@@ -7756,6 +8101,14 @@ js-yaml@3.13.1, js-yaml@^3.13.1, js-yaml@^3.2.5, js-yaml@^3.2.7:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -7944,6 +8297,13 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-it@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+  dependencies:
+    uc.micro "^1.0.1"
+
 linkify-it@~1.2.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a"
@@ -7951,10 +8311,10 @@ linkify-it@~1.2.0:
   dependencies:
     uc.micro "^1.0.1"
 
-livereload-js@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
-  integrity "sha1-RHwxzx6pq1L8INthXF3fZ494AJw= sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw=="
+livereload-js@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-3.3.2.tgz#c88b009c6e466b15b91faa26fd7c99d620e12651"
+  integrity sha512-w677WnINxFkuixAoUEXOStewzLYGI76XVag+0JWMMEyjJQKs0ibWZMxkTlB96Lm3EjZ7IeOxVziBEbtxVQqQZA==
 
 load-json-file@^4.0.0:
   version "4.0.0"
@@ -8012,6 +8372,13 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash-node@^3.2.0:
   version "3.10.2"
   resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7"
@@ -8131,16 +8498,16 @@ lodash._objecttypes@~2.3.0:
   resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz#6a3ea3987dd6eeb8021b2d5c9c303549cc2bae1e"
   integrity sha1-aj6jmH3W7rgCGy1cnDA1Scwrrh4=
 
+lodash._reinterpolate@^3.0.0, lodash._reinterpolate@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+  integrity "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="
+
 lodash._reinterpolate@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-2.3.0.tgz#03ee9d85c0e55cbd590d71608a295bdda51128ec"
   integrity sha1-A+6dhcDlXL1ZDXFgiilb3aURKOw=
 
-lodash._reinterpolate@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="
-
 lodash._renative@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/lodash._renative/-/lodash._renative-2.3.0.tgz#77d8edd4ced26dd5971f9e15a5f772e4e317fbd3"
@@ -8343,12 +8710,12 @@ lodash.support@~2.3.0:
   dependencies:
     lodash._renative "~2.3.0"
 
-lodash.template@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
-  integrity "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A= sha512-ZYuOnfoFp8NM7NfIO3rF2ZqXObtxfW1KAyBED68MLXJs6LizTeS6JD6od8HT3CDWkxrsUnxAF0DViyhjKkxy9g=="
+lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
-    lodash._reinterpolate "~3.0.0"
+    lodash._reinterpolate "^3.0.0"
     lodash.templatesettings "^4.0.0"
 
 lodash.template@~2.3.x:
@@ -8401,7 +8768,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8468,14 +8835,7 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-make-dir@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.1.0.tgz#19b4369fe48c116f53c2af95ad102c0e39e85d51"
-  integrity "sha1-GbQ2n+SMEW9Twq+VrRAsDjnoXVE= sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA=="
-  dependencies:
-    pify "^3.0.0"
-
-make-dir@^3.0.2, make-dir@^3.1.0:
+make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -8516,17 +8876,28 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-markdown-it-terminal@0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9"
-  integrity "sha1-VFq9jdAcPWI1O/zqcdtYC1HSK9k= sha512-Pq9BTUtEzuO6ZxNU7xYczEUHWkkCS6mE5FjpV6VnmbT56re1RCnO5nAE2ZehzY5H+uvVSNuwiqvoHaJj8+tssA=="
+markdown-it-terminal@0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705"
+  integrity sha512-e8hbK9L+IyFac2qY05R7paP+Fqw1T4pSQW3miK3VeG9QmpqBjg5Qzjv/v6C7YNxSNRS2Kp8hUFtm5lWU9eK4lw==
   dependencies:
     ansi-styles "^3.0.0"
     cardinal "^1.0.0"
     cli-table "^0.3.1"
-    lodash.merge "^4.6.0"
+    lodash.merge "^4.6.2"
     markdown-it "^8.3.1"
 
+markdown-it@^12.0.4:
+  version "12.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~2.1.0"
+    linkify-it "^3.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
 markdown-it@^4.3.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414"
@@ -8538,7 +8909,7 @@ markdown-it@^4.3.0:
     mdurl "~1.0.0"
     uc.micro "^1.0.0"
 
-markdown-it@^8.3.1, markdown-it@^8.4.2:
+markdown-it@^8.3.1:
   version "8.4.2"
   resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
   integrity "sha1-OG+YmY3BWjdyKqdyIIT0Agvdm1Q= sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ=="
@@ -8618,18 +8989,6 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity "sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
 
-merge-trees@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-1.0.1.tgz#ccbe674569787f9def17fd46e6525f5700bbd23e"
-  integrity "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4= sha512-O7TWwipLHhc9tErjq3WBvNP7I1g7Wgudl1ZkLqpT7F2MZy1yEdgnI9cpZZxBaqk+wJZu+2b9FE7D3ubUmGFHFA=="
-  dependencies:
-    can-symlink "^1.0.0"
-    fs-tree-diff "^0.5.4"
-    heimdalljs "^0.2.1"
-    heimdalljs-logger "^0.1.7"
-    rimraf "^2.4.3"
-    symlink-or-copy "^1.0.0"
-
 merge-trees@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161"
@@ -8638,7 +8997,7 @@ merge-trees@^2.0.0:
     fs-updater "^1.0.4"
     heimdalljs "^0.2.5"
 
-merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity "sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
@@ -8648,7 +9007,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity "sha1-cIWbyVyYQJUvNZoGij/En57PrCM= sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="
@@ -8675,6 +9034,14 @@ micromatch@^4.0.2:
     braces "^3.0.1"
     picomatch "^2.0.5"
 
+micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.2.3"
+
 mime-db@1.44.0:
   version "1.44.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
@@ -8685,18 +9052,30 @@ mime-db@1.45.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
   integrity "sha1-zO7aIczXw6dF66LezVXUtz54eeo= sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="
 
+mime-db@1.51.0:
+  version "1.51.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
+  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
+
 "mime-db@>= 1.40.0 < 2":
   version "1.40.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
   integrity "sha1-plBX6ZjbCQ9zKmj2wnbTh9QSbDI= sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
 
-mime-types@^2.1.18, mime-types@^2.1.19:
+mime-types@^2.1.18:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
   integrity "sha1-R5SfmOJ56lMRn1ci4PNOUpvsAJ8= sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="
   dependencies:
     mime-db "1.44.0"
 
+mime-types@^2.1.26:
+  version "2.1.34"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
+  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  dependencies:
+    mime-db "1.51.0"
+
 mime-types@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce"
@@ -8754,16 +9133,16 @@ minimist-options@^3.0.1:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
 
+minimist@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
+  integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
+
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8= sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw=="
-
 minipass@^2.2.0:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
@@ -8785,7 +9164,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
   integrity "sha1-VMRBzkyWzXeQ4QtBqHqlEGjsqys= sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
 
-mkdirp@0.5.5, mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -8832,16 +9211,16 @@ mocha@^7.1.2:
     yargs-parser "13.1.2"
     yargs-unparser "1.6.0"
 
-morgan@^1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.1.tgz#0a8d16734a1d9afbc824b99df87e738e58e2da59"
-  integrity "sha1-Co0Wc0odmvvIJLmd+H5zjlji2lk= sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="
+morgan@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
   dependencies:
-    basic-auth "~2.0.0"
+    basic-auth "~2.0.1"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "~2.0.0"
     on-finished "~2.3.0"
-    on-headers "~1.0.1"
+    on-headers "~1.0.2"
 
 mout@^1.0.0:
   version "1.1.0"
@@ -8934,6 +9313,13 @@ node-environment-flags@1.0.6:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
+node-fetch@^2.6.0:
+  version "2.6.6"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
+  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+  dependencies:
+    whatwg-url "^5.0.0"
+
 node-int64@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
@@ -8976,6 +9362,11 @@ node-releases@^1.1.76:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e"
   integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==
 
+node-releases@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
+  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+
 node-uuid@~1.4.0:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
@@ -9024,14 +9415,13 @@ normalize-url@2.0.1:
     query-string "^5.0.1"
     sort-keys "^2.0.0"
 
-npm-package-arg@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
-  integrity "sha1-Fa4eJ1ilAn77TCUFVLhac323/ME= sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA=="
+npm-package-arg@^8.1.5:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
-    hosted-git-info "^2.6.0"
-    osenv "^0.1.5"
-    semver "^5.5.0"
+    hosted-git-info "^4.0.1"
+    semver "^7.3.4"
     validate-npm-package-name "^3.0.0"
 
 npm-run-path@^2.0.0:
@@ -9041,7 +9431,7 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npm-run-path@^4.0.1:
+npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -9160,7 +9550,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.1, on-headers@~1.0.2:
+on-headers@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity "sha1-dysK5qqlJcOZ5Imt+tkMQD6zwo8= sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
@@ -9179,21 +9569,13 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-onetime@^5.1.2:
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity "sha1-2j6nRob6IaGaERwybpDrFaAZZoY= sha512-snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g=="
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -9228,7 +9610,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.0, osenv@^0.1.3, osenv@^0.1.5:
+osenv@^0.1.0, osenv@^0.1.3:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity "sha1-hc36+uso6Gd/QW4odZK18/SepBA= sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="
@@ -9241,10 +9623,10 @@ p-cancelable@^0.4.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
   integrity "sha1-NfNj1n1SCByNlYXje8zrfgu8sqA= sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
 
-p-defer@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-2.1.0.tgz#d9c97b40f8fb5c256a70b4aabec3c1c8c42f1fae"
-  integrity "sha1-2cl7QPj7XCVqcLSqvsPByMQvH64= sha512-xMwL9id1bHn/UfNGFEMFwlULOprQUEOg6vhqSfr6oKxPFB0oSh0zhGq/9/tPSE+cyij2+RW6H8+0Ke4xsPdZ7Q=="
+p-defer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
+  integrity sha512-ugZxsxmtTln604yeYd29EGrNhazN2lywetzpKhfmQjW/VJmhpDmWbiX+h0zL8V91R0UXkhb3KtPmyq9PZw3aYw==
 
 p-finally@^1.0.0:
   version "1.0.0"
@@ -9275,6 +9657,13 @@ p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -9296,6 +9685,13 @@ p-locate@^4.1.0:
   dependencies:
     p-limit "^2.2.0"
 
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
@@ -9408,7 +9804,7 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity "sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
 
-path-parse@^1.0.6:
+path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -9464,6 +9860,11 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity "sha1-elfrVQpng/kRUzH89GY9XI4AelA= sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="
 
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.0.4:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
@@ -9474,6 +9875,11 @@ picomatch@^2.0.5, picomatch@^2.2.1:
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
 
+picomatch@^2.2.3:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
 pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
@@ -9526,14 +9932,14 @@ plur@^2.1.2:
   dependencies:
     irregular-plurals "^1.0.0"
 
-portfinder@^1.0.20:
-  version "1.0.20"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
-  integrity "sha1-vqaGMuVLLhOrewxHdem0G/Jw5Eo= sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw=="
+portfinder@^1.0.28:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
+  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
   dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.5"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -9652,7 +10058,7 @@ progress@^2.0.0, progress@^2.0.1:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg= sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
 
-promise-map-series@^0.2.1, promise-map-series@^0.2.3:
+promise-map-series@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.2.3.tgz#c2d377afc93253f6bd03dbb77755eb88ab20a847"
   integrity sha1-wtN3r8kyU/a9A9u3d1XriKsgqEc=
@@ -9664,14 +10070,10 @@ promise-map-series@^0.3.0:
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
   integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
 
-promise.prototype.finally@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/promise.prototype.finally/-/promise.prototype.finally-3.1.0.tgz#66f161b1643636e50e7cf201dc1b84a857f3864e"
-  integrity "sha1-ZvFhsWQ2NuUOfPIB3BuEqFfzhk4= sha512-7p/K2f6dI+dM8yjRQEGrTQs5hTQixUAdOGpMEA3+pVxpX5oHKRSKAXyLw9Q9HUWDTdwtoo39dSHGQtN90HcEwQ=="
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.9.0"
-    function-bind "^1.1.1"
+promise.hash.helper@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
+  integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
 
 proxy-addr@~2.0.5:
   version "2.0.5"
@@ -10084,6 +10486,11 @@ reselect@^3.0.1:
   resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
   integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
 
+reselect@^4.0.0:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
+  integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
+
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -10097,7 +10504,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.2, resolve-package-path@^1.2.7:
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.2:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -10134,13 +10541,14 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
+  integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
   dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
+    is-core-module "^2.8.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
 
 responselike@1.0.2:
   version "1.0.2"
@@ -10167,7 +10575,7 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
 
-rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -10291,11 +10699,6 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
-  integrity "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM= sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
-
 safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -10323,7 +10726,7 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 
-sane@^4.0.0, sane@^4.1.0:
+sane@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
   integrity "sha1-7Ygf2SJzOmxGG8GJ3CtsAG8//e0= sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA=="
@@ -10338,6 +10741,21 @@ sane@^4.0.0, sane@^4.1.0:
     minimist "^1.1.1"
     walker "~1.0.5"
 
+sane@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-5.0.1.tgz#ae94cb06acf5ad158242ff23f563d8cbe0ec1e4b"
+  integrity sha512-9/0CYoRz0MKKf04OMCO3Qk3RQl1PAwWAhPSQSym4ULiLpTZnrY1JoZU0IEikHu8kdk2HvKT/VwQMq/xFZ8kh1Q==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^3.1.1"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.4"
+    execa "^4.0.0"
+    fb-watchman "^2.0.1"
+    micromatch "^4.0.2"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
 sax@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
@@ -10366,7 +10784,7 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.7.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -10502,7 +10920,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
-silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0, silent-error@^1.1.1:
+silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
   integrity sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==
@@ -10664,18 +11082,22 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-sort-object-keys@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.2.tgz#d3a6c48dc2ac97e6bc94367696e03f6d09d37952"
-  integrity "sha1-06bEjcKsl+a8lDZ2luA/bQnTeVI= sha512-IWz4OstR6UZsK9dEhw/J99r+LYbm6TNSY6yPvldttFJkFj/1vUvzCmw82CeeCS/aHxdm1QUL+5K96Q2ssplnFw=="
+sort-object-keys@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
+  integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@^1.22.1:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.22.1.tgz#384ce7a098cd13be4109800d5ce2f0cf7826052e"
-  integrity "sha1-OEznoJjNE75BCYANXOLwz3gmBS4= sha512-uVINQraFQvnlzNHFnQOT4MYy0qonIEzKwhrI2yrTiQjNo5QF4h3ffrnCk7a95QAwoK/RdkO/w8W9tJIcaOWC7g=="
+sort-package-json@^1.49.0:
+  version "1.53.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.53.1.tgz#8f2672b06314cf04d9a6bcefc75a5f38d600b811"
+  integrity sha512-ltLORrQuuPMpy23YkWCA8fO7zBOxM4P1j9LcGxci4K2Fk8jmSyCA/ATU6CFyy8qR2HQRx4RBYWzoi78FU/Anuw==
   dependencies:
-    detect-indent "^5.0.0"
-    sort-object-keys "^1.1.2"
+    detect-indent "^6.0.0"
+    detect-newline "3.1.0"
+    git-hooks-list "1.0.3"
+    globby "10.0.0"
+    is-plain-obj "2.1.0"
+    sort-object-keys "^1.1.3"
 
 source-map-js@^0.6.2:
   version "0.6.2"
@@ -11049,6 +11471,11 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 symlink-or-copy@^1.0.0, symlink-or-copy@^1.0.1, symlink-or-copy@^1.1.8, symlink-or-copy@^1.2.0, symlink-or-copy@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/symlink-or-copy/-/symlink-or-copy-1.3.1.tgz#9506dd64d8e98fa21dcbf4018d1eab23e77f71fe"
@@ -11114,11 +11541,12 @@ temp-fs@^0.9.9:
   dependencies:
     rimraf "~2.5.2"
 
-temp@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.0.tgz#61391795a11bd9738d4c4d7f55f012cb8f55edaa"
-  integrity "sha1-YTkXlaEb2XONTE1/VfASy49V7ao= sha512-YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="
+temp@0.9.4:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620"
+  integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==
   dependencies:
+    mkdirp "^0.5.1"
     rimraf "~2.6.2"
 
 terser@^5.3.0:
@@ -11147,7 +11575,7 @@ testem-failure-only-reporter@^0.0.1:
   dependencies:
     testem "^2.9.2"
 
-testem@^2.14.0, testem@^2.9.2:
+testem@^2.9.2:
   version "2.17.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
   integrity "sha1-HLSiqQUkoIiAPf5S+/GXpv1zyIM= sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ=="
@@ -11182,7 +11610,7 @@ testem@^2.14.0, testem@^2.9.2:
     tmp "0.0.33"
     xmldom "^0.1.19"
 
-testem@^3.6.0:
+testem@^3.2.0, testem@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-3.6.0.tgz#bf5c86944bafd035c18f41f520195cce5eef33a8"
   integrity sha512-sXwx2IlOadOhrKf0hsV1Yt/yuYhdfrtJ4dpp7T6pFN62GjMyKifjAv2SFm+4zYHee1JwxheO7JUL0+3iN0rlHw==
@@ -11257,15 +11685,15 @@ tiny-glob@0.2.8:
     globalyzer "0.1.0"
     globrex "^0.1.2"
 
-tiny-lr@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz#9fa547412f238fedb068ee295af8b682c98b2aab"
-  integrity "sha1-n6VHQS8jj+2waO4pWvi2gsmLKqs= sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA=="
+tiny-lr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-2.0.0.tgz#863659d7ce1ed201a117d8197d7f8b9a27bdc085"
+  integrity sha512-f6nh0VMRvhGx4KCeK1lQ/jaL0Zdb5WdR+Jk8q9OSUQnaSDxAEGH1fgqLZ+cMl5EW3F2MGnCsalBO1IsnnogW1Q==
   dependencies:
     body "^5.1.0"
     debug "^3.1.0"
-    faye-websocket "~0.10.0"
-    livereload-js "^2.3.0"
+    faye-websocket "^0.11.3"
+    livereload-js "^3.3.1"
     object-assign "^4.1.0"
     qs "^6.4.0"
 
@@ -11291,6 +11719,13 @@ tmp@0.0.33, tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 tmpl@1.0.x:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
@@ -11357,7 +11792,12 @@ tough-cookie@>=0.12.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tree-sync@^1.2.2, tree-sync@^1.4.0:
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+
+tree-sync@^1.2.2:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-1.4.0.tgz#314598d13abaf752547d9335b8f95d9a137100d6"
   integrity sha512-YvYllqh3qrR5TAYZZTXdspnIhlKAYezPYw11ntmweoceu4VK+keN356phHRIIo1d+RDmLpHZrUlmxga2gc9kSQ==
@@ -11368,6 +11808,17 @@ tree-sync@^1.2.2, tree-sync@^1.4.0:
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
+tree-sync@^2.0.0, tree-sync@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tree-sync/-/tree-sync-2.1.0.tgz#31cbbd41f2936f5390b61e8c9d7cb27e75a212fe"
+  integrity sha512-OLWW+Nd99NOM53aZ8ilT/YpEiOo6mXD3F4/wLbARqybSZ3Jb8IxHK5UGVbZaae0wtXAyQshVV+SeqVBik+Fbmw==
+  dependencies:
+    debug "^4.1.1"
+    fs-tree-diff "^2.0.1"
+    mkdirp "^0.5.5"
+    quick-temp "^0.1.5"
+    walk-sync "^0.3.3"
+
 trim-newlines@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
@@ -11448,6 +11899,11 @@ type-detect@^4.0.0:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
   integrity "sha1-1w5byB223io4G8rKDG4MvcdjXeI= sha512-N9IvkQslUGYGC24RkJk1ba99foK6TkwC2FHAEBlQFBP0RxQZS8ZpJuAZcwiY/w9ZJHFQb1aOXBI60OdxhTrwEQ=="
 
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
@@ -11461,6 +11917,13 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typescript-memoize@^1.0.0-alpha.3:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
@@ -11550,12 +12013,12 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^0.4.3"
 
-unique-string@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a"
-  integrity "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo= sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg=="
+unique-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
+  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
   dependencies:
-    crypto-random-string "^1.0.0"
+    crypto-random-string "^2.0.0"
 
 universalify@^0.1.0:
   version "0.1.1"
@@ -11653,7 +12116,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
 
-uuid@3.3.2, uuid@^3.3.2:
+uuid@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE= sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
@@ -11663,7 +12126,7 @@ uuid@^2.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
   integrity "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg=="
 
-uuid@^8.3.0:
+uuid@^8.3.0, uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -11728,7 +12191,7 @@ walk-sync@^0.2.0:
     ensure-posix-path "^1.0.0"
     matcher-collection "^1.0.0"
 
-walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2, walk-sync@^0.3.3:
+walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.3:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.4.tgz#cf78486cc567d3a96b5b2237c6108017a5ffb9a4"
   integrity sha512-ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig==
@@ -11762,16 +12225,15 @@ walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watch-detector@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-0.1.0.tgz#e37b410d149e2a8bf263a4f8b71e2f667633dbf8"
-  integrity "sha1-43tBDRSeKovyY6T4tx4vZnYz2/g= sha512-vfzMMfpjQc88xjETwl2HuE6PjEuxCBeyC4bQmqrHrofdfYWi/4mEJklYbNgSzpqM9PxubsiPIrE5SZ1FDyiQ2w=="
+watch-detector@^1.0.0, watch-detector@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.1.tgz#3106a6b489284ec2ecaef0e65cf1b8ec9117296e"
+  integrity sha512-8sJ8rvNfg2ciqCa5IxIdmdxU/vuUe9V/jw+thXbdreELSv3+Cq6k8K42cLEL86W2td1PMmfNCWZuAhrZ/sD4mw==
   dependencies:
-    heimdalljs-logger "^0.1.9"
-    quick-temp "^0.1.8"
-    rsvp "^4.7.0"
-    semver "^5.4.1"
-    silent-error "^1.1.0"
+    heimdalljs-logger "^0.1.10"
+    semver "^6.3.0"
+    silent-error "^1.1.1"
+    tmp "^0.1.0"
 
 wcwidth@^1.0.1:
   version "1.0.1"
@@ -11780,6 +12242,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -11793,6 +12260,14 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -11835,16 +12310,16 @@ word-wrap@^1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity "sha1-YQY29rH3A4kb00dxzLF/uTtHB5w= sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
 
+wordwrap@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
+
 wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity "sha1-o9XabNXAvAAI03I0u68b7WMFkQc= sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="
-
 workerpool@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.2.tgz#b34e79243647decb174b7481ab5b351dc565c426"
@@ -11854,7 +12329,7 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
-workerpool@^6.0.0:
+workerpool@^6.0.0, workerpool@^6.1.4:
   version "6.1.5"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
   integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
@@ -11882,24 +12357,25 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-write-file-atomic@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
-  integrity "sha1-H/YVdcLipOjlENb6TiQ8zhg5mas= sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA=="
+write-file-atomic@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
   dependencies:
-    graceful-fs "^4.1.11"
     imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
     signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
 
 ws@^7.2.3, ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
-xdg-basedir@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4"
-  integrity "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= sha512-1Dly4xqlulvPD3fZUQJLY+FUIeqN3N2MM3uqe4rCJftAvOjFa3jFGfctOgluGx4ahPbUCsZkmJILiP0Vi4T6lQ=="
+xdg-basedir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
+  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
 xml2js@0.4.19:
   version "0.4.19"
@@ -12028,6 +12504,11 @@ yeast@0.1.2:
   resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
   integrity "sha1-AI4G2AlDIMNy28L47XagymyKxBk= sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
 
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
 yui@^3.18.1:
   version "3.18.1"
   resolved "https://registry.yarnpkg.com/yui/-/yui-3.18.1.tgz#e000269ec0a7b6fbc741cbb8fcbd0e65117b014c"

From 9e245ca661653ca0c716131776eaaa02cee59d40 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Wed, 12 Jan 2022 17:37:09 -0500
Subject: [PATCH 0772/1405] update lint again

---
 package.json |   8 +--
 yarn.lock    | 154 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 89 insertions(+), 73 deletions(-)

diff --git a/package.json b/package.json
index b43a5788996..7725abb1aed 100644
--- a/package.json
+++ b/package.json
@@ -91,8 +91,8 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.2",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.8.1",
-    "@typescript-eslint/parser": "^5.8.1",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
@@ -114,12 +114,12 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.5.0",
+    "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^2.0.0",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
     "eslint-plugin-qunit": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index 624749a984c..5984e25c1f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2906,13 +2906,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.1.tgz#97dfaa39f38e99f86801fdf34f9f1bed66704258"
-  integrity sha512-wTZ5oEKrKj/8/366qTM366zqhIKAp6NCMweoRONtfuC07OAU9nVI2GZZdqQ1qD30WAAtcPdkH+npDwtRFdp4Rw==
-  dependencies:
-    "@typescript-eslint/experimental-utils" "5.8.1"
-    "@typescript-eslint/scope-manager" "5.8.1"
+"@typescript-eslint/eslint-plugin@^5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.9.1.tgz#e5a86d7e1f9dc0b3df1e6d94feaf20dd838d066c"
+  integrity sha512-Xv9tkFlyD4MQGpJgTo6wqDqGvHIRmRgah/2Sjz1PUnJTawjHWIwBivUE9x0QtU2WVii9baYgavo/bHjrZJkqTw==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "5.9.1"
+    "@typescript-eslint/scope-manager" "5.9.1"
+    "@typescript-eslint/type-utils" "5.9.1"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -2920,60 +2921,69 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz#01861eb2f0749f07d02db342b794145a66ed346f"
-  integrity sha512-fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww==
+"@typescript-eslint/experimental-utils@5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.9.1.tgz#8c407c4dd5ffe522329df6e4c9c2b52206d5f7f1"
+  integrity sha512-cb1Njyss0mLL9kLXgS/eEY53SZQ9sT519wpX3i+U457l2UXRDuo87hgKfgRazmu9/tQb0x2sr3Y0yrU+Zz0y+w==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.8.1"
-    "@typescript-eslint/types" "5.8.1"
-    "@typescript-eslint/typescript-estree" "5.8.1"
+    "@typescript-eslint/scope-manager" "5.9.1"
+    "@typescript-eslint/types" "5.9.1"
+    "@typescript-eslint/typescript-estree" "5.9.1"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/parser@^5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.8.1.tgz#380f5f1e596b540059998aa3fc80d78f0f9b0d0a"
-  integrity sha512-K1giKHAjHuyB421SoXMXFHHVI4NdNY603uKw92++D3qyxSeYvC10CBJ/GE5Thpo4WTUvu1mmJI2/FFkz38F2Gw==
+"@typescript-eslint/parser@^5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.9.1.tgz#b114011010a87e17b3265ca715e16c76a9834cef"
+  integrity sha512-PLYO0AmwD6s6n0ZQB5kqPgfvh73p0+VqopQQLuNfi7Lm0EpfKyDalchpVwkE+81k5HeiRrTV/9w1aNHzjD7C4g==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.8.1"
-    "@typescript-eslint/types" "5.8.1"
-    "@typescript-eslint/typescript-estree" "5.8.1"
+    "@typescript-eslint/scope-manager" "5.9.1"
+    "@typescript-eslint/types" "5.9.1"
+    "@typescript-eslint/typescript-estree" "5.9.1"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz#7fc0604f7ade8833e4d42cebaa1e2debf8b932e4"
-  integrity sha512-DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q==
+"@typescript-eslint/scope-manager@5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.9.1.tgz#6c27be89f1a9409f284d95dfa08ee3400166fe69"
+  integrity sha512-8BwvWkho3B/UOtzRyW07ffJXPaLSUKFBjpq8aqsRvu6HdEuzCY57+ffT7QoV4QXJXWSU1+7g3wE4AlgImmQ9pQ==
+  dependencies:
+    "@typescript-eslint/types" "5.9.1"
+    "@typescript-eslint/visitor-keys" "5.9.1"
+
+"@typescript-eslint/type-utils@5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.9.1.tgz#c6832ffe655b9b1fec642d36db1a262d721193de"
+  integrity sha512-tRSpdBnPRssjlUh35rE9ug5HrUvaB9ntREy7gPXXKwmIx61TNN7+l5YKgi1hMKxo5NvqZCfYhA5FvyuJG6X6vg==
   dependencies:
-    "@typescript-eslint/types" "5.8.1"
-    "@typescript-eslint/visitor-keys" "5.8.1"
+    "@typescript-eslint/experimental-utils" "5.9.1"
+    debug "^4.3.2"
+    tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.8.1.tgz#04c6b49ebc8c99238238a6b8b43f2fc613983b5a"
-  integrity sha512-L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA==
+"@typescript-eslint/types@5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.9.1.tgz#1bef8f238a2fb32ebc6ff6d75020d9f47a1593c6"
+  integrity sha512-SsWegWudWpkZCwwYcKoDwuAjoZXnM1y2EbEerTHho19Hmm+bQ56QG4L4jrtCu0bI5STaRTvRTZmjprWlTw/5NQ==
 
-"@typescript-eslint/typescript-estree@5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz#a592855be688e7b729a1e9411d7d74ec992ed6ef"
-  integrity sha512-26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ==
+"@typescript-eslint/typescript-estree@5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.9.1.tgz#d5b996f49476495070d2b8dd354861cf33c005d6"
+  integrity sha512-gL1sP6A/KG0HwrahVXI9fZyeVTxEYV//6PmcOn1tD0rw8VhUWYeZeuWHwwhnewnvEMcHjhnJLOBhA9rK4vmb8A==
   dependencies:
-    "@typescript-eslint/types" "5.8.1"
-    "@typescript-eslint/visitor-keys" "5.8.1"
+    "@typescript-eslint/types" "5.9.1"
+    "@typescript-eslint/visitor-keys" "5.9.1"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.8.1":
-  version "5.8.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz#58a2c566265d5511224bc316149890451c1bbab0"
-  integrity sha512-SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg==
+"@typescript-eslint/visitor-keys@5.9.1":
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.9.1.tgz#f52206f38128dd4f675cf28070a41596eee985b7"
+  integrity sha512-Xh37pNz9e9ryW4TVdwiFzmr4hloty8cFj8GTWMXh3Z8swGwyQWeCcNgF0hm6t09iZd6eiZmIf4zHedQVP6TVtg==
   dependencies:
-    "@typescript-eslint/types" "5.8.1"
+    "@typescript-eslint/types" "5.9.1"
     eslint-visitor-keys "^3.0.0"
 
 "@xmldom/xmldom@^0.7.1":
@@ -3016,6 +3026,11 @@ acorn@^8.6.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
   integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
 
+acorn@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+
 after@0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
@@ -5934,14 +5949,13 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-module-utils@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.1.tgz#b435001c9f8dd4ab7f6d0efcae4b9696d4c24b7c"
-  integrity sha512-fjoetBXQZq2tSTWZ9yWVl2KuFrTZZH3V+9iD1V1RfpDgxzJR+mPd/KZmMiA8gbPqdBzpNiEHOuT7IYEWxrH0zQ==
+eslint-module-utils@^2.7.2:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
+  integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
   dependencies:
     debug "^3.2.7"
     find-up "^2.1.0"
-    pkg-dir "^2.0.0"
 
 eslint-plugin-disable-features@^0.1.3:
   version "0.1.3"
@@ -5966,24 +5980,24 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.25.3:
-  version "2.25.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz#a554b5f66e08fb4f6dc99221866e57cfff824766"
-  integrity sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==
+eslint-plugin-import@^2.25.4:
+  version "2.25.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
+  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
   dependencies:
     array-includes "^3.1.4"
     array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.1"
+    eslint-module-utils "^2.7.2"
     has "^1.0.3"
     is-core-module "^2.8.0"
     is-glob "^4.0.3"
     minimatch "^3.0.4"
     object.values "^1.1.5"
     resolve "^1.20.0"
-    tsconfig-paths "^3.11.0"
+    tsconfig-paths "^3.12.0"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -6057,10 +6071,10 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
   integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
 
-eslint@^8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.5.0.tgz#ddd2c1afd8f412036f87ae2a063d2aa296d3175f"
-  integrity sha512-tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg==
+eslint@^8.6.0:
+  version "8.6.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.6.0.tgz#4318c6a31c5584838c1a2e940c478190f58d558e"
+  integrity sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==
   dependencies:
     "@eslint/eslintrc" "^1.0.5"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -6074,7 +6088,7 @@ eslint@^8.5.0:
     eslint-scope "^7.1.0"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.1.0"
-    espree "^9.2.0"
+    espree "^9.3.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -6115,6 +6129,15 @@ espree@^9.2.0:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^3.1.0"
 
+espree@^9.3.0:
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"
+  integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==
+  dependencies:
+    acorn "^8.7.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^3.1.0"
+
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -9906,13 +9929,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= sha512-ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw=="
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -11826,10 +11842,10 @@ trim-newlines@^2.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
   integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
 
-tsconfig-paths@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36"
-  integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA==
+tsconfig-paths@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
+  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"

From d59a8e12d2f9f5a49ec3d66cef9aa1314410e6ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jan 2022 09:24:44 +0000
Subject: [PATCH 0773/1405] Bump follow-redirects from 1.13.0 to 1.14.7

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5984e25c1f3..7c14bf5aaad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6711,9 +6711,9 @@ flatted@^3.1.0:
   integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
 
 follow-redirects@^1.0.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
-  integrity "sha1-tC6Nk6Kn7qXtiGM2dtZZe8jjhNs= sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"

From 013879236710d56c8395b596e7daf615dabca720 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 11 Jan 2022 20:59:16 -0700
Subject: [PATCH 0774/1405] [BUGFIX] Improve types for DeprecationOptions

The previous design allowed invalid values for `DeprecationOptions`:

- `{}` (that is, an empty object)
- `{ enabled: 'v4.1.0' }` (that is, without `available`)

Both of these violate the text of the RFC! The new design *requires*
that at least `available` be present, and that `enabled` cannot be
present *without` `enabled`. (Previously, a number of Ember's own
internal deprecations were not following the RFC spec; the newly
introduced types caught all of those!)

This PR also removes the exported key names for the stages, which are
implicit in the interface-based API and which are currently unused
outside this module.

While touching the code anyway, fix a bunch of missing return type
annotation lint errors.
---
 .../-internals/container/lib/registry.ts      | 11 ++--
 .../-internals/glimmer/lib/environment.ts     |  1 +
 .../-internals/routing/lib/location/api.ts    |  1 +
 .../-internals/routing/lib/system/router.ts   |  2 +
 .../@ember/-internals/routing/lib/utils.ts    | 15 +++--
 packages/@ember/debug/lib/deprecate.ts        | 56 +++++++++++--------
 packages/@ember/polyfills/lib/assign.ts       |  1 +
 packages/@ember/string/index.ts               |  1 +
 8 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index d89e24b15e3..c37d8b3ec71 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -159,7 +159,7 @@ export default class Registry implements IRegistry {
    @param {Object} options
    @return {Container} created container
    */
-  container(options?: ContainerOptions) {
+  container(options?: ContainerOptions): Container {
     return new Container(this, options);
   }
 
@@ -355,7 +355,7 @@ export default class Registry implements IRegistry {
    @param {String} [options.source] the fullname of the request source (used for local lookups)
    @return {Boolean}
    */
-  has(fullName: string) {
+  has(fullName: string): boolean {
     if (!this.isValidFullName(fullName)) {
       return false;
     }
@@ -392,7 +392,7 @@ export default class Registry implements IRegistry {
    @param {String} type
    @param {Object} options
    */
-  optionsForType(type: string, options: TypeOptions) {
+  optionsForType(type: string, options: TypeOptions): void {
     this._typeOptions[type] = options;
   }
 
@@ -410,7 +410,7 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @param {Object} options
    */
-  options(fullName: string, options: TypeOptions) {
+  options(fullName: string, options: TypeOptions): void {
     let normalizedName = this.normalize(fullName);
     this._options[normalizedName] = options;
   }
@@ -459,7 +459,7 @@ export default class Registry implements IRegistry {
    @param {String} injectionName
    @deprecated
    */
-  injection(fullName: string, property: string) {
+  injection(fullName: string, property: string): void {
     deprecate(
       `As of Ember 4.0.0, owner.inject no longer injects values into resolved instances, and calling the method has been deprecated. Since this method no longer does anything, it is fully safe to remove this injection. As an alternative to this API, you can refactor to explicitly inject \`${property}\` on \`${fullName}\`, or look it up directly using the \`getOwner\` API.`,
       false,
@@ -469,6 +469,7 @@ export default class Registry implements IRegistry {
         url: 'https://deprecations.emberjs.com/v4.x#toc_implicit-injections',
         for: 'ember-source',
         since: {
+          available: '4.0.0',
           enabled: '4.0.0',
         },
       }
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 91ddb636985..b69f58b505f 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -112,6 +112,7 @@ const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
     until: '4.4.0',
     for: 'ember-source',
     since: {
+      available: '3.28.0',
       enabled: '3.28.0',
     },
   },
diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index 969c4ef19ce..d13166e5b3a 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -120,6 +120,7 @@ export default {
         url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
         for: 'ember-source',
         since: {
+          available: '4.1.0',
           enabled: '4.1.0',
         },
       }
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index d9120240c4b..b4a904b4b3a 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -832,6 +832,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
             url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
             for: 'ember-source',
             since: {
+              available: '4.1.0',
               enabled: '4.1.0',
             },
           }
@@ -869,6 +870,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
               url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
               for: 'ember-source',
               since: {
+                available: '4.1.0',
                 enabled: '4.1.0',
               },
             }
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 2e35a299543..0e6bb24dcee 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -8,7 +8,9 @@ import EmberRouter, { PrivateRouteInfo, QueryParam } from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
-export function extractRouteArgs(args: unknown[]) {
+export function extractRouteArgs(
+  args: unknown[]
+): { routeName: string | undefined; models: {}[]; queryParams: object } {
   args = args.slice();
   let possibleQueryParams = args[args.length - 1];
 
@@ -35,14 +37,14 @@ export function extractRouteArgs(args: unknown[]) {
   return { routeName, models, queryParams };
 }
 
-export function getActiveTargetName(router: Router<Route>) {
+export function getActiveTargetName(router: Router<Route>): string {
   let routeInfos = router.activeTransition
     ? router.activeTransition[STATE_SYMBOL]!.routeInfos
     : router.state!.routeInfos;
   return routeInfos[routeInfos.length - 1].name;
 }
 
-export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInfo[]) {
+export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInfo[]): void {
   if (routeInfos['_namesStashed']) {
     return;
   }
@@ -99,7 +101,7 @@ function _calculateCacheValuePrefix(prefix: string, part: string) {
 /*
   Stolen from Controller
 */
-export function calculateCacheKey(prefix: string, parts: string[] = [], values: {}) {
+export function calculateCacheKey(prefix: string, parts: string[] = [], values: {}): string {
   let suffixes = '';
   for (let i = 0; i < parts.length; ++i) {
     let part = parts[i];
@@ -221,7 +223,7 @@ export function prefixRouteNameArg(route: Route, args: any[]) {
   return args;
 }
 
-export function shallowEqual(a: {}, b: {}) {
+export function shallowEqual(a: {}, b: {}): boolean {
   let k;
   let aCount = 0;
   let bCount = 0;
@@ -243,7 +245,7 @@ export function shallowEqual(a: {}, b: {}) {
   return aCount === bCount;
 }
 
-export function deprecateTransitionMethods(frameworkClass: string, methodName: string) {
+export function deprecateTransitionMethods(frameworkClass: string, methodName: string): void {
   deprecate(
     `Calling ${methodName} on a ${frameworkClass} is deprecated. Use the RouterService instead.`,
     false,
@@ -251,6 +253,7 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
       id: 'routing.transition-methods',
       for: 'ember-source',
       since: {
+        available: '3.26.0',
         enabled: '3.26.0',
       },
       until: '5.0.0',
diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 13b69501da0..66e0e77215b 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -10,14 +10,20 @@ declare global {
   };
 }
 
-export type DeprecationStages = 'available' | 'enabled';
+interface Available {
+  available: string;
+}
+
+interface Enabled extends Available {
+  enabled: string;
+}
 
 export interface DeprecationOptions {
   id: string;
   until: string;
   url?: string;
   for: string;
-  since: Partial<Record<DeprecationStages, string>>;
+  since: Available | Enabled;
 }
 
 export type DeprecateFunc = (message: string, test?: boolean, options?: DeprecationOptions) => void;
@@ -72,7 +78,7 @@ let missingOptionDeprecation: MissingOptionDeprecateFunc = () => '';
 let deprecate: DeprecateFunc = () => {};
 
 if (DEBUG) {
-  registerHandler = function registerHandler(handler: HandlerCallback) {
+  registerHandler = function registerHandler(handler: HandlerCallback): void {
     genericRegisterHandler('deprecate', handler);
   };
 
@@ -95,7 +101,7 @@ if (DEBUG) {
     console.warn(`DEPRECATION: ${updatedMessage}`); // eslint-disable-line no-console
   });
 
-  let captureErrorForStack: () => Error;
+  let captureErrorForStack: () => unknown;
 
   if (new Error().stack) {
     captureErrorForStack = () => new Error();
@@ -115,24 +121,26 @@ if (DEBUG) {
       let error = captureErrorForStack();
       let stack;
 
-      if (error.stack) {
-        if (error['arguments']) {
-          // Chrome
-          stack = error.stack
-            .replace(/^\s+at\s+/gm, '')
-            .replace(/^([^(]+?)([\n$])/gm, '{anonymous}($1)$2')
-            .replace(/^Object.<anonymous>\s*\(([^)]+)\)/gm, '{anonymous}($1)')
-            .split('\n');
-          stack.shift();
-        } else {
-          // Firefox
-          stack = error.stack
-            .replace(/(?:\n@:0)?\s+$/m, '')
-            .replace(/^\(/gm, '{anonymous}(')
-            .split('\n');
+      if (error instanceof Error) {
+        if (error.stack) {
+          if (error['arguments']) {
+            // Chrome
+            stack = error.stack
+              .replace(/^\s+at\s+/gm, '')
+              .replace(/^([^(]+?)([\n$])/gm, '{anonymous}($1)$2')
+              .replace(/^Object.<anonymous>\s*\(([^)]+)\)/gm, '{anonymous}($1)')
+              .split('\n');
+            stack.shift();
+          } else {
+            // Firefox
+            stack = error.stack
+              .replace(/(?:\n@:0)?\s+$/m, '')
+              .replace(/^\(/gm, '{anonymous}(')
+              .split('\n');
+          }
+
+          stackStr = `\n    ${stack.slice(2).join('\n    ')}`;
         }
-
-        stackStr = `\n    ${stack.slice(2).join('\n    ')}`;
       }
 
       let updatedMessage = formatMessage(message, options);
@@ -192,7 +200,11 @@ if (DEBUG) {
     @public
     @since 1.0.0
   */
-  deprecate = function deprecate(message, test, options) {
+  deprecate = function deprecate(
+    message: string,
+    test?: boolean,
+    options?: DeprecationOptions
+  ): void {
     assert(missingOptionsDeprecation, Boolean(options && (options.id || options.until)));
     assert(missingOptionsIdDeprecation, Boolean(options!.id));
     assert(missingOptionDeprecation(options!.id, 'until'), Boolean(options!.until));
diff --git a/packages/@ember/polyfills/lib/assign.ts b/packages/@ember/polyfills/lib/assign.ts
index 7ff66dbc279..11c9e99e5e2 100644
--- a/packages/@ember/polyfills/lib/assign.ts
+++ b/packages/@ember/polyfills/lib/assign.ts
@@ -39,6 +39,7 @@ export function assign(target: object, ...rest: object[]): object {
       url: 'https://deprecations.emberjs.com/v4.x/#toc_ember-polyfills-deprecate-assign',
       for: 'ember-source',
       since: {
+        available: '4.0.0',
         enabled: '4.0.0',
       },
     }
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 3a42940417f..98b2b12b31f 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -245,6 +245,7 @@ function deprecateImportFromString(
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {
+      available: '3.25',
       enabled: '3.25',
     },
     until: '4.0.0',

From e7fc6deeb70e5b0084091ca45bf1916cbf5f1fa4 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 18 Jan 2022 12:52:34 -0800
Subject: [PATCH 0775/1405] Remove TSLint

---
 package.json                                  |  11 +-
 packages/@ember/-internals/bootstrap/index.ts |   1 -
 .../glimmer/lib/component-managers/curly.ts   |   1 -
 .../-internals/glimmer/lib/component.ts       |   2 -
 .../glimmer/lib/components/link-to.ts         |  13 +-
 .../-internals/glimmer/lib/helpers/action.ts  |   1 -
 .../@ember/-internals/glimmer/lib/renderer.ts |   2 -
 .../lib/utils/curly-component-state-bucket.ts |   1 -
 packages/@ember/-internals/meta/lib/meta.ts   |   2 +-
 .../@ember/-internals/metal/lib/chain-tags.ts |   2 -
 packages/@ember/-internals/runtime/index.d.ts |   5 +-
 .../-internals/runtime/types/observable.d.ts  |   5 +-
 .../-internals/utils/lib/mandatory-setter.ts  |   2 +-
 .../views/lib/mixins/view_support.js          |   2 -
 .../-internals/views/lib/system/utils.ts      |   2 +-
 packages/ember-template-compiler/index.ts     |   1 -
 .../lib/system/compile.ts                     |   1 -
 .../lib/system/initializer.ts                 |   1 -
 .../lib/ember-dev/setup-qunit.ts              |   2 +-
 packages/internal-test-helpers/lib/run.ts     |   4 +-
 tslint.json                                   |  25 ---
 yarn.lock                                     | 203 +++++++-----------
 22 files changed, 102 insertions(+), 187 deletions(-)
 delete mode 100644 tslint.json

diff --git a/package.json b/package.json
index 7725abb1aed..78791baba31 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,6 @@
     "lint:eslint": "eslint --report-unused-disable-directives --cache .",
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
     "lint:tsc": "tsc --noEmit",
-    "lint:tslint": "tslint -p tsconfig.json",
-    "lint:tslint:fix": "npm-run-all \"lint:tslint --fix\"",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
     "test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
@@ -91,8 +89,8 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.2",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.9.1",
-    "@typescript-eslint/parser": "^5.9.1",
+    "@typescript-eslint/eslint-plugin": "^5.10.0",
+    "@typescript-eslint/parser": "^5.10.0",
     "auto-dist-tag": "^1.0.0",
     "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
@@ -114,7 +112,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.6.0",
+    "eslint": "^8.7.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
@@ -148,8 +146,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^0.0.1",
-    "tslint": "^6.1.3",
-    "typescript": "^4.2.4"
+    "typescript": "^4.5.4"
   },
   "engines": {
     "node": ">= 12.*"
diff --git a/packages/@ember/-internals/bootstrap/index.ts b/packages/@ember/-internals/bootstrap/index.ts
index 1e615b7664d..adabe9c4f8b 100644
--- a/packages/@ember/-internals/bootstrap/index.ts
+++ b/packages/@ember/-internals/bootstrap/index.ts
@@ -3,7 +3,6 @@ import require from 'require';
 (function bootstrap() {
   // Bootstrap Node module
   if (typeof module === 'object' && typeof module.require === 'function') {
-    // tslint:disable-next-line: no-require-imports
     module.exports = require('ember').default;
   }
 })();
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index c520884b8ed..93aad70f2b8 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -63,7 +63,6 @@ const EMBER_VIEW_REF = createPrimitiveRef('ember-view');
 
 function aliasIdToElementId(args: VMArguments, props: any) {
   if (args.named.has('id')) {
-    // tslint:disable-next-line:max-line-length
     assert(
       `You cannot invoke a component with both 'id' and 'elementId' at the same time.`,
       !args.named.has('elementId')
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 5404ce9c26c..fc9a0590bda 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -690,7 +690,6 @@ const Component = CoreView.extend(
         let eventNames = [];
         let events = eventDispatcher.finalEventNameMapping;
 
-        // tslint:disable-next-line:forin
         for (let key in events) {
           let methodName = events[key];
 
@@ -700,7 +699,6 @@ const Component = CoreView.extend(
         }
         // If in a tagless component, assert that no event handlers are defined
         assert(
-          // tslint:disable-next-line:max-line-length
           `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
           !eventNames.length
         );
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 5f4fa1d662a..27f1476df41 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -2,7 +2,7 @@ import { Owner } from '@ember/-internals/owner';
 import { RouterState, RoutingService } from '@ember/-internals/routing';
 import { QueryParam } from '@ember/-internals/routing/lib/system/router';
 import { isSimpleClick } from '@ember/-internals/views';
-import { assert, debugFreeze, warn } from '@ember/debug';
+import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
@@ -342,9 +342,14 @@ class LinkTo extends InternalComponent {
       try {
         return routing.generateURL(route, models, query);
       } catch (e) {
-        // tslint:disable-next-line:max-line-length
-        e.message = `While generating link to route "${route}": ${e.message}`;
-        throw e;
+        let details = e instanceof Error ? e.message : inspect(e);
+        let message = `While generating link to route "${route}": ${details}`;
+        if (e instanceof Error) {
+          e.message = message;
+          throw e;
+        } else {
+          throw message;
+        }
       }
     } else {
       return routing.generateURL(route, models, query);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 04f98d7706e..51ecfc8d8b0 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -417,7 +417,6 @@ function makeClosureAction(
     self = context;
     fn = action as Function;
   } else {
-    // tslint:disable-next-line:max-line-length
     assert(
       `An action could not be made for \`${
         debugKey || action
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 9ba09a05954..9d4fec3e5cc 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -61,7 +61,6 @@ export class DynamicScope implements GlimmerDynamicScope {
   }
 
   get(key: 'outletState'): Reference<OutletState | undefined> {
-    // tslint:disable-next-line:max-line-length
     assert(
       `Using \`-get-dynamic-scope\` is only supported for \`outletState\` (you used \`${key}\`).`,
       key === 'outletState'
@@ -70,7 +69,6 @@ export class DynamicScope implements GlimmerDynamicScope {
   }
 
   set(key: 'outletState', value: Reference<OutletState | undefined>) {
-    // tslint:disable-next-line:max-line-length
     assert(
       `Using \`-with-dynamic-scope\` is only supported for \`outletState\` (you used \`${key}\`).`,
       key === 'outletState'
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 0801e30d83c..117c4a41a30 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -24,7 +24,6 @@ export interface Component {
 }
 
 type Finalizer = () => void;
-// tslint:disable-next-line:no-empty
 function NOOP() {}
 
 /**
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 9495447490e..df0086d1f91 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -124,7 +124,7 @@ export class Meta {
     this._listeners = undefined;
   }
 
-  get parent() {
+  get parent(): Meta | null {
     let parent = this._parent;
     if (parent === undefined) {
       let proto = getPrototypeOf(this.source);
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 6e992308d2d..848f74f0d7d 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -129,7 +129,6 @@ function getChainTags(
 
           // If the key is an alias, we need to bootstrap it
           if (descriptor !== undefined && typeof descriptor.altKey === 'string') {
-            // tslint:disable-next-line: no-unused-expression
             item[segment];
           }
         }
@@ -154,7 +153,6 @@ function getChainTags(
       // bootstrap the alias. This is because aliases, unlike other CPs, should
       // always be in sync with the aliased value.
       if (CHAIN_PASS_THROUGH.has(descriptor)) {
-        // tslint:disable-next-line: no-unused-expression
         current[segment];
       }
       break;
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index 2c18eec61cb..ad21ecf222e 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -36,10 +36,7 @@ export class Object extends CoreObject implements Observable {
   set<K extends keyof this>(key: K, value: this[K]): this[K];
   set<T>(key: keyof this, value: T): T;
   setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
-  setProperties<K extends keyof this>(
-    // tslint:disable-next-line:unified-signatures
-    hash: { [KK in K]: any }
-  ): Record<K, unknown>;
+  setProperties<K extends keyof this>(hash: { [KK in K]: any }): Record<K, unknown>;
   notifyPropertyChange(keyName: string): this;
   addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
   addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
diff --git a/packages/@ember/-internals/runtime/types/observable.d.ts b/packages/@ember/-internals/runtime/types/observable.d.ts
index 3a73546cebf..f6e254c2bbe 100644
--- a/packages/@ember/-internals/runtime/types/observable.d.ts
+++ b/packages/@ember/-internals/runtime/types/observable.d.ts
@@ -26,10 +26,7 @@ interface Observable {
    * observers will be buffered.
    */
   setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
-  setProperties<K extends keyof this>(
-    // tslint:disable-next-line:unified-signatures
-    hash: { [KK in K]: any }
-  ): Record<K, unknown>;
+  setProperties<K extends keyof this>(hash: { [KK in K]: any }): Record<K, unknown>;
   /**
    * Convenience method to call `propertyWillChange` and `propertyDidChange` in
    * succession.
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 3ab5b72cbca..655319a5f8e 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -105,7 +105,7 @@ if (DEBUG) {
     if (setters !== undefined && setters[keyName] !== undefined) {
       Object.defineProperty(obj, keyName, setters[keyName]);
 
-      setters[keyName] = undefined;
+      delete setters[keyName];
     }
   };
 
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.js
index 96d44e80885..2ac6c6a3cd5 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.js
@@ -383,13 +383,11 @@ let mixin = {
   init() {
     this._super(...arguments);
 
-    // tslint:disable-next-line:max-line-length
     assert(
       `You cannot use a computed property for the component's \`elementId\` (${this}).`,
       descriptorForProperty(this, 'elementId') === undefined
     );
 
-    // tslint:disable-next-line:max-line-length
     assert(
       `You cannot use a computed property for the component's \`tagName\` (${this}).`,
       descriptorForProperty(this, 'tagName') === undefined
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 454676c0ea6..5b4f7598df9 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -188,7 +188,7 @@ export function getViewRange(view: View): Range {
   @method getViewClientRects
   @param {Ember.View} view
 */
-export function getViewClientRects(view: View): ClientRectList | DOMRectList {
+export function getViewClientRects(view: View): DOMRectList {
   let range = getViewRange(view);
   return range.getClientRects();
 }
diff --git a/packages/ember-template-compiler/index.ts b/packages/ember-template-compiler/index.ts
index e65ee16e7de..38d8ddc4b3a 100644
--- a/packages/ember-template-compiler/index.ts
+++ b/packages/ember-template-compiler/index.ts
@@ -15,7 +15,6 @@ declare global {
 export let _Ember: unknown;
 
 try {
-  // tslint:disable-next-line: no-require-imports
   _Ember = require('ember');
 } catch (e) {
   _Ember = {
diff --git a/packages/ember-template-compiler/lib/system/compile.ts b/packages/ember-template-compiler/lib/system/compile.ts
index 02a693e8faf..493fa33dc18 100644
--- a/packages/ember-template-compiler/lib/system/compile.ts
+++ b/packages/ember-template-compiler/lib/system/compile.ts
@@ -24,7 +24,6 @@ export default function compile(
   options: Partial<EmberPrecompileOptions> = {}
 ): Factory {
   if (!template && has('@ember/-internals/glimmer')) {
-    // tslint:disable-next-line:no-require-imports
     template = require('@ember/-internals/glimmer').template;
   }
 
diff --git a/packages/ember-template-compiler/lib/system/initializer.ts b/packages/ember-template-compiler/lib/system/initializer.ts
index 7a20796855c..3ab5354790e 100644
--- a/packages/ember-template-compiler/lib/system/initializer.ts
+++ b/packages/ember-template-compiler/lib/system/initializer.ts
@@ -7,7 +7,6 @@ if (
   has('@ember/-internals/browser-environment') &&
   has('@ember/-internals/glimmer')
 ) {
-  // tslint:disable:no-require-imports
   let emberEnv = require('@ember/-internals/browser-environment');
   let emberGlimmer = require('@ember/-internals/glimmer');
   let emberApp = require('@ember/application');
diff --git a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
index 5142e42d09d..f037f515eae 100644
--- a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
@@ -54,7 +54,7 @@ export default function setupQUnit() {
     expected?: RegExp | string,
     message?: string
   ) {
-    let error: Error;
+    let error: unknown;
     let prevOnError = Ember.onerror;
 
     Ember.onerror = (e: Error) => {
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 9f6bf4a89bb..2735811bfa9 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -1,9 +1,9 @@
 import {
-  // @ts-ignore
+  // @ts-expect-error 'next' is not typed
   next,
   run,
   _getCurrentRunLoop,
-  // @ts-ignore
+  // @ts-expect-error '_hasScheduledTimers' is not typed
   _hasScheduledTimers,
 } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index 3448349edec..00000000000
--- a/tslint.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "rules": {
-    "curly": false,
-    "no-var-keyword": true,
-    "indent": [true, "spaces"],
-    "label-position": true,
-    "no-consecutive-blank-lines": [
-      true
-    ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-variable": true,
-    "no-inferrable-types": [true],
-    "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "triple-equals": true,
-    "class-name": true,
-    "no-require-imports": true,
-    "no-duplicate-imports": true,
-    "ordered-imports": true,
-    "quotemark": {
-      "options": ["single", "avoid-escape"]
-    }
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index 7c14bf5aaad..c36537406b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
   integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
@@ -2906,14 +2906,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.9.1.tgz#e5a86d7e1f9dc0b3df1e6d94feaf20dd838d066c"
-  integrity sha512-Xv9tkFlyD4MQGpJgTo6wqDqGvHIRmRgah/2Sjz1PUnJTawjHWIwBivUE9x0QtU2WVii9baYgavo/bHjrZJkqTw==
+"@typescript-eslint/eslint-plugin@^5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz#e90afea96dff8620892ad216b0e4ccdf8ee32d3a"
+  integrity sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "5.9.1"
-    "@typescript-eslint/scope-manager" "5.9.1"
-    "@typescript-eslint/type-utils" "5.9.1"
+    "@typescript-eslint/scope-manager" "5.10.0"
+    "@typescript-eslint/type-utils" "5.10.0"
+    "@typescript-eslint/utils" "5.10.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -2921,69 +2921,69 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.9.1.tgz#8c407c4dd5ffe522329df6e4c9c2b52206d5f7f1"
-  integrity sha512-cb1Njyss0mLL9kLXgS/eEY53SZQ9sT519wpX3i+U457l2UXRDuo87hgKfgRazmu9/tQb0x2sr3Y0yrU+Zz0y+w==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.9.1"
-    "@typescript-eslint/types" "5.9.1"
-    "@typescript-eslint/typescript-estree" "5.9.1"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/parser@^5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.9.1.tgz#b114011010a87e17b3265ca715e16c76a9834cef"
-  integrity sha512-PLYO0AmwD6s6n0ZQB5kqPgfvh73p0+VqopQQLuNfi7Lm0EpfKyDalchpVwkE+81k5HeiRrTV/9w1aNHzjD7C4g==
+"@typescript-eslint/parser@^5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz#8f59e036f5f1cffc178cacbd5ccdd02aeb96c91c"
+  integrity sha512-pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.9.1"
-    "@typescript-eslint/types" "5.9.1"
-    "@typescript-eslint/typescript-estree" "5.9.1"
+    "@typescript-eslint/scope-manager" "5.10.0"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/typescript-estree" "5.10.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.9.1.tgz#6c27be89f1a9409f284d95dfa08ee3400166fe69"
-  integrity sha512-8BwvWkho3B/UOtzRyW07ffJXPaLSUKFBjpq8aqsRvu6HdEuzCY57+ffT7QoV4QXJXWSU1+7g3wE4AlgImmQ9pQ==
+"@typescript-eslint/scope-manager@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz#bb5d872e8b9e36203908595507fbc4d3105329cb"
+  integrity sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==
   dependencies:
-    "@typescript-eslint/types" "5.9.1"
-    "@typescript-eslint/visitor-keys" "5.9.1"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/visitor-keys" "5.10.0"
 
-"@typescript-eslint/type-utils@5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.9.1.tgz#c6832ffe655b9b1fec642d36db1a262d721193de"
-  integrity sha512-tRSpdBnPRssjlUh35rE9ug5HrUvaB9ntREy7gPXXKwmIx61TNN7+l5YKgi1hMKxo5NvqZCfYhA5FvyuJG6X6vg==
+"@typescript-eslint/type-utils@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz#8524b9479c19c478347a7df216827e749e4a51e5"
+  integrity sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==
   dependencies:
-    "@typescript-eslint/experimental-utils" "5.9.1"
+    "@typescript-eslint/utils" "5.10.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.9.1.tgz#1bef8f238a2fb32ebc6ff6d75020d9f47a1593c6"
-  integrity sha512-SsWegWudWpkZCwwYcKoDwuAjoZXnM1y2EbEerTHho19Hmm+bQ56QG4L4jrtCu0bI5STaRTvRTZmjprWlTw/5NQ==
+"@typescript-eslint/types@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c"
+  integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==
 
-"@typescript-eslint/typescript-estree@5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.9.1.tgz#d5b996f49476495070d2b8dd354861cf33c005d6"
-  integrity sha512-gL1sP6A/KG0HwrahVXI9fZyeVTxEYV//6PmcOn1tD0rw8VhUWYeZeuWHwwhnewnvEMcHjhnJLOBhA9rK4vmb8A==
+"@typescript-eslint/typescript-estree@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224"
+  integrity sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==
   dependencies:
-    "@typescript-eslint/types" "5.9.1"
-    "@typescript-eslint/visitor-keys" "5.9.1"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/visitor-keys" "5.10.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/visitor-keys@5.9.1":
-  version "5.9.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.9.1.tgz#f52206f38128dd4f675cf28070a41596eee985b7"
-  integrity sha512-Xh37pNz9e9ryW4TVdwiFzmr4hloty8cFj8GTWMXh3Z8swGwyQWeCcNgF0hm6t09iZd6eiZmIf4zHedQVP6TVtg==
+"@typescript-eslint/utils@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz#c3d152a85da77c400e37281355561c72fb1b5a65"
+  integrity sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==
   dependencies:
-    "@typescript-eslint/types" "5.9.1"
+    "@types/json-schema" "^7.0.9"
+    "@typescript-eslint/scope-manager" "5.10.0"
+    "@typescript-eslint/types" "5.10.0"
+    "@typescript-eslint/typescript-estree" "5.10.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/visitor-keys@5.10.0":
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz#770215497ad67cd15a572b52089991d5dfe06281"
+  integrity sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==
+  dependencies:
+    "@typescript-eslint/types" "5.10.0"
     eslint-visitor-keys "^3.0.0"
 
 "@xmldom/xmldom@^0.7.1":
@@ -3081,11 +3081,6 @@ ansi-colors@3.2.3:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
   integrity "sha1-V9NbhoboUeLMBMQD8cACA5dqGBM= sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="
 
-ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity "sha1-y7muJWv3UK8eqzRPIpqif+lLo0g= sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
-
 ansi-escapes@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
@@ -4313,7 +4308,7 @@ buffer@^5.2.1, buffer@^5.5.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
   integrity "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ=="
@@ -4747,7 +4742,7 @@ commander@6.2.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
   integrity "sha1-uZC/uKwDCu3G0RvATRSI/+9W23U= sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="
 
-commander@^2.12.1, commander@^2.20.0, commander@^2.6.0:
+commander@^2.20.0, commander@^2.6.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
@@ -5210,11 +5205,6 @@ diff@3.5.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
   integrity "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI= sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
 
-diff@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"
-  integrity "sha1-DGZ8tGfru1zqfxTxNcwtuneAqP8= sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="
-
 diff@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
@@ -5739,13 +5729,6 @@ engine.io@~5.2.0:
     engine.io-parser "~4.0.0"
     ws "~7.4.2"
 
-enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
-  integrity "sha1-Kn/l3WNKHkElqXXsmU/1RW3Dc00= sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="
-  dependencies:
-    ansi-colors "^4.1.1"
-
 ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, ensure-posix-path@^1.1.0, ensure-posix-path@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
@@ -6071,10 +6054,15 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
   integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
 
-eslint@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.6.0.tgz#4318c6a31c5584838c1a2e940c478190f58d558e"
-  integrity sha512-UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw==
+eslint-visitor-keys@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
+  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
+
+eslint@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.7.0.tgz#22e036842ee5b7cf87b03fe237731675b4d3633c"
+  integrity sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==
   dependencies:
     "@eslint/eslintrc" "^1.0.5"
     "@humanwhocodes/config-array" "^0.9.2"
@@ -6083,11 +6071,10 @@ eslint@^8.6.0:
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
     eslint-scope "^7.1.0"
     eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.1.0"
+    eslint-visitor-keys "^3.2.0"
     espree "^9.3.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
@@ -6096,7 +6083,7 @@ eslint@^8.6.0:
     functional-red-black-tree "^1.0.1"
     glob-parent "^6.0.1"
     globals "^13.6.0"
-    ignore "^4.0.6"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
@@ -6107,9 +6094,7 @@ eslint@^8.6.0:
     minimatch "^3.0.4"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    progress "^2.0.0"
     regexpp "^3.2.0"
-    semver "^7.2.1"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
@@ -7072,7 +7057,7 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
+glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -7552,6 +7537,11 @@ ignore@^5.1.8:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
   integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
 
+ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
@@ -8111,7 +8101,7 @@ js-yaml@3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -9176,7 +9166,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
   integrity "sha1-VMRBzkyWzXeQ4QtBqHqlEGjsqys= sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
 
-mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5:
+mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -10078,7 +10068,7 @@ process-relative-require@^1.0.0:
   dependencies:
     node-modules-path "^1.0.0"
 
-progress@^2.0.0, progress@^2.0.1:
+progress@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg= sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
@@ -10566,7 +10556,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.21.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
   integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
@@ -10824,7 +10814,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -11852,42 +11842,11 @@ tsconfig-paths@^3.12.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@^1.13.0:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY= sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 
-tslint@^6.1.3:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
-  integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^4.0.1"
-    glob "^7.1.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.3"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.13.0"
-    tsutils "^2.29.0"
-
-tsutils@^2.29.0:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity "sha1-MrSIUBRnrL7dS4VJhnOggSrKC5k= sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="
-  dependencies:
-    tslib "^1.8.1"
-
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -11952,10 +11911,10 @@ typescript-memoize@^1.0.0-alpha.3:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
   integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
 
-typescript@^4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
-  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
+typescript@^4.5.4:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
+  integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
 
 typescript@~4.0.3:
   version "4.0.3"

From 97987da1363f48049982fd448c56cd8dea745d70 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 May 2021 15:04:12 -0700
Subject: [PATCH 0776/1405] Reorganize tests, make future public types more
 accurate

Previously, we were exporting some details that should have been
internal-only, such as reopen, reopenClass, and extend for CoreObject
and EmberObject.
---
 packages/@ember/-internals/runtime/index.d.ts | 35 ++++-------
 .../-internals/runtime/types/index.d.ts       | 29 +++++++++
 packages/@ember/object/index.d.ts             |  2 +-
 .../@ember/object/type-tests/action.test.ts   | 16 +++++
 .../@ember/object/type-tests/compat.test.ts   |  4 --
 .../compat/dependent-key-compat.test.ts       | 17 ++++++
 .../@ember/object/type-tests/core.test.ts     |  5 --
 .../type-tests/core/index.test.ts}            | 14 ++++-
 .../object/type-tests/ember-object.test.ts    | 61 +++++++++++++++++++
 .../@ember/object/type-tests/index.test.ts    |  5 --
 .../type-tests/observable/index.test.ts       |  5 ++
 packages/@ember/object/types/core.d.ts        |  2 +-
 12 files changed, 155 insertions(+), 40 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/types/index.d.ts
 create mode 100644 packages/@ember/object/type-tests/action.test.ts
 delete mode 100644 packages/@ember/object/type-tests/compat.test.ts
 create mode 100644 packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts
 delete mode 100644 packages/@ember/object/type-tests/core.test.ts
 rename packages/@ember/{-internals/runtime/type-tests/core.test.ts => object/type-tests/core/index.test.ts} (69%)
 create mode 100644 packages/@ember/object/type-tests/ember-object.test.ts
 delete mode 100644 packages/@ember/object/type-tests/index.test.ts
 create mode 100644 packages/@ember/object/type-tests/observable/index.test.ts

diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index ad21ecf222e..265d167b589 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -1,7 +1,7 @@
-import { EmberClassConstructor, Objectify, ObserverMethod } from './types/-private/types';
+import { EmberClassConstructor, Objectify } from './types/-private/types';
 import PublicCoreObject from './types/core';
+import PublicEmberObject from './types/index';
 import Evented from './types/evented';
-import Observable from './types/observable';
 
 export const TargetActionSupport: any;
 export function isArray(arr: any): boolean;
@@ -29,27 +29,16 @@ export class CoreObject extends PublicCoreObject {
 
 export const FrameworkObject: any;
 
-export class Object extends CoreObject implements Observable {
-  get<K extends keyof this>(key: K): unknown;
-  getProperties<K extends keyof this>(list: K[]): Record<K, unknown>;
-  getProperties<K extends keyof this>(...list: K[]): Record<K, unknown>;
-  set<K extends keyof this>(key: K, value: this[K]): this[K];
-  set<T>(key: keyof this, value: T): T;
-  setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
-  setProperties<K extends keyof this>(hash: { [KK in K]: any }): Record<K, unknown>;
-  notifyPropertyChange(keyName: string): this;
-  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
-  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  removeObserver<Target>(
-    key: keyof this,
-    target: Target,
-    method: ObserverMethod<Target, this>
-  ): this;
-  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  incrementProperty(keyName: keyof this, increment?: number): number;
-  decrementProperty(keyName: keyof this, decrement?: number): number;
-  toggleProperty(keyName: keyof this): boolean;
-  cacheFor<K extends keyof this>(key: K): unknown;
+// The public version doesn't export some deprecated methods.
+// However, these are still used internally. Returning `any` is
+// very loose, but it's essentially what was here before.
+export class Object extends PublicEmberObject {
+  static extend<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...args: any[]
+  ): Objectify<Statics> & EmberClassConstructor<Instance>;
+  static reopen(...args: any[]): any;
+  static reopenClass(...args: any[]): any;
 }
 
 export function _contentFor(proxy: any): any;
diff --git a/packages/@ember/-internals/runtime/types/index.d.ts b/packages/@ember/-internals/runtime/types/index.d.ts
new file mode 100644
index 00000000000..3927b787280
--- /dev/null
+++ b/packages/@ember/-internals/runtime/types/index.d.ts
@@ -0,0 +1,29 @@
+import { ObserverMethod } from './-private/types';
+import CoreObject from './core';
+import Observable from './observable';
+
+export default class Object extends CoreObject implements Observable {
+  get<K extends keyof this>(key: K): unknown;
+  getProperties<K extends keyof this>(list: K[]): Record<K, unknown>;
+  getProperties<K extends keyof this>(...list: K[]): Record<K, unknown>;
+  set<K extends keyof this>(key: K, value: this[K]): this[K];
+  set<T>(key: keyof this, value: T): T;
+  setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
+  setProperties<K extends keyof this>(
+    // tslint:disable-next-line:unified-signatures
+    hash: { [KK in K]: any }
+  ): Record<K, unknown>;
+  notifyPropertyChange(keyName: string): this;
+  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method: ObserverMethod<Target, this>
+  ): this;
+  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  incrementProperty(keyName: keyof this, increment?: number): number;
+  decrementProperty(keyName: keyof this, decrement?: number): number;
+  toggleProperty(keyName: keyof this): boolean;
+  cacheFor<K extends keyof this>(key: K): unknown;
+}
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index f4e2e251a2e..05b5538669d 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -1,3 +1,3 @@
 export let action: MethodDecorator;
 
-export { Object as default } from '@ember/-internals/runtime';
+export { default } from '@ember/-internals/runtime/types/index';
diff --git a/packages/@ember/object/type-tests/action.test.ts b/packages/@ember/object/type-tests/action.test.ts
new file mode 100644
index 00000000000..19932a2250f
--- /dev/null
+++ b/packages/@ember/object/type-tests/action.test.ts
@@ -0,0 +1,16 @@
+import { expectTypeOf } from 'expect-type';
+
+import { action } from '@ember/object';
+
+expectTypeOf(action).toEqualTypeOf<MethodDecorator>();
+
+class Foo {
+  // @ts-expect-error action is a method decorator
+  @action
+  bar!: string;
+
+  @action
+  foo() {}
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/compat.test.ts b/packages/@ember/object/type-tests/compat.test.ts
deleted file mode 100644
index 84fa5fc4418..00000000000
--- a/packages/@ember/object/type-tests/compat.test.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { dependentKeyCompat } from '@ember/object/compat';
-import { expectTypeOf } from 'expect-type';
-
-expectTypeOf(dependentKeyCompat).toMatchTypeOf<PropertyDecorator>();
diff --git a/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts b/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts
new file mode 100644
index 00000000000..9b8edced499
--- /dev/null
+++ b/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts
@@ -0,0 +1,17 @@
+import { dependentKeyCompat } from '@ember/object/compat';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(dependentKeyCompat).toMatchTypeOf<PropertyDecorator>();
+
+// Example (without irrelevant details) from https://api.emberjs.com/ember/3.18/functions/@ember%2Fobject%2Fcompat/dependentKeyCompat
+class Person {
+  firstName!: string;
+  lastName!: string;
+
+  @dependentKeyCompat
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+}
+
+new Person();
diff --git a/packages/@ember/object/type-tests/core.test.ts b/packages/@ember/object/type-tests/core.test.ts
deleted file mode 100644
index ba8ee6c6b04..00000000000
--- a/packages/@ember/object/type-tests/core.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { expectTypeOf } from 'expect-type';
-
-import CoreObject from '@ember/object/core';
-
-expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
diff --git a/packages/@ember/-internals/runtime/type-tests/core.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
similarity index 69%
rename from packages/@ember/-internals/runtime/type-tests/core.test.ts
rename to packages/@ember/object/type-tests/core/index.test.ts
index 727f1213eea..03e0b7c988f 100644
--- a/packages/@ember/-internals/runtime/type-tests/core.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -1,5 +1,8 @@
 import { expectTypeOf } from 'expect-type';
-import CoreObject from '../types/core';
+
+import CoreObject from '@ember/object/core';
+
+expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
 
 /** Newable tests */
 const co1 = new CoreObject();
@@ -23,3 +26,12 @@ const co3 = CoreObject.create({ foo: '123', bar: 456 });
 
 expectTypeOf(co3.foo).toEqualTypeOf<string>();
 expectTypeOf(co3.bar).toEqualTypeOf<number>();
+
+// @ts-expect-error extend is no longer available in the public API
+CoreObject.extend({ baz: 6 });
+
+// @ts-expect-error reopen is no longer available in the public API
+CoreObject.reopen({ baz: 6 });
+
+// @ts-expect-error reopenClass is no longer available in the public API
+CoreObject.reopenClass({ baz: 6 });
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
new file mode 100644
index 00000000000..ce2e22f1206
--- /dev/null
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -0,0 +1,61 @@
+import { expectTypeOf } from 'expect-type';
+
+import EmberObject from '@ember/object';
+
+expectTypeOf(EmberObject.create()).toEqualTypeOf<EmberObject>();
+
+/**
+ * Zero-argument case
+ */
+const o = EmberObject.create();
+// create returns an object
+expectTypeOf(o).toMatchTypeOf<object>();
+
+// object returned by create type-checks as an instance of Ember.Object
+expectTypeOf(o.isDestroyed).toEqualTypeOf<boolean>(); // from instance
+expectTypeOf(o.isDestroying).toEqualTypeOf<boolean>(); // from instance
+expectTypeOf(o.get).toEqualTypeOf<(key: keyof EmberObject) => unknown>(); // from prototype
+
+/**
+ * One-argument case
+ */
+const o1 = EmberObject.create({ x: 9, y: 'hello', z: false });
+expectTypeOf(o1.x).toEqualTypeOf<number>();
+expectTypeOf(o1.y).toEqualTypeOf<string>();
+expectTypeOf(o1.z).toEqualTypeOf<boolean>();
+
+const obj = EmberObject.create({ a: 1 }, { b: 2 }, { c: 3 });
+expectTypeOf(obj.b).toEqualTypeOf<number>();
+expectTypeOf(obj.a).toEqualTypeOf<number>();
+expectTypeOf(obj.c).toEqualTypeOf<number>();
+
+export class Person extends EmberObject {
+  firstName!: string;
+  lastName!: string;
+  age!: number;
+}
+const p = new Person();
+
+expectTypeOf(p.firstName).toEqualTypeOf<string>();
+// get is deprecated and only returns unknown now
+expectTypeOf(p.get('firstName')).toEqualTypeOf<unknown>();
+// @ts-expect-error Can't get unknown properties
+p.get('invalid');
+
+const p2 = Person.create({ firstName: 'string' });
+expectTypeOf(p2.firstName).toEqualTypeOf<string>();
+
+const p2b = Person.create({}, { firstName: 'string' });
+expectTypeOf(p2b.firstName).toEqualTypeOf<string>();
+
+const p2c = Person.create({}, {}, { firstName: 'string' });
+expectTypeOf(p2c.firstName).toEqualTypeOf<string>();
+
+// @ts-expect-error extend is no longer available in the public API
+Person.extend({ fullName: 6 });
+
+// @ts-expect-error reopen is no longer available in the public API
+Person.reopen({ fullName: 6 });
+
+// @ts-expect-error reopenClass is no longer available in the public API
+Person.reopenClass({ fullName: 6 });
diff --git a/packages/@ember/object/type-tests/index.test.ts b/packages/@ember/object/type-tests/index.test.ts
deleted file mode 100644
index 8e8c492bf59..00000000000
--- a/packages/@ember/object/type-tests/index.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { expectTypeOf } from 'expect-type';
-
-import EmberObject from '@ember/object';
-
-expectTypeOf(EmberObject.create()).toEqualTypeOf<EmberObject>();
diff --git a/packages/@ember/object/type-tests/observable/index.test.ts b/packages/@ember/object/type-tests/observable/index.test.ts
new file mode 100644
index 00000000000..78e25c0c36e
--- /dev/null
+++ b/packages/@ember/object/type-tests/observable/index.test.ts
@@ -0,0 +1,5 @@
+import { expectTypeOf } from 'expect-type';
+
+import Observable from '@ember/object/observable';
+
+expectTypeOf<Observable['get']>().toEqualTypeOf<<K extends keyof Observable>(key: K) => unknown>();
diff --git a/packages/@ember/object/types/core.d.ts b/packages/@ember/object/types/core.d.ts
index 63d98c5ee17..652f234bf8b 100644
--- a/packages/@ember/object/types/core.d.ts
+++ b/packages/@ember/object/types/core.d.ts
@@ -1 +1 @@
-export { CoreObject as default } from '../../-internals/runtime';
+export { default } from '../../-internals/runtime/types/core';

From f623ce0b24bbb5ef3d10cacfbc23ccc19f7679d4 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 May 2021 15:35:54 -0700
Subject: [PATCH 0777/1405] Prepare for public @ember/object/events and evented
 types

---
 .../@ember/-internals/metal/lib/events.ts     |  2 +-
 .../@ember/object/{evented.js => evented.ts}  |  0
 .../@ember/object/{events.js => events.ts}    |  0
 .../object/type-tests/events/index.test.ts    | 36 +++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 rename packages/@ember/object/{evented.js => evented.ts} (100%)
 rename packages/@ember/object/{events.js => events.ts} (100%)
 create mode 100644 packages/@ember/object/type-tests/events/index.test.ts

diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index 270f7c277e9..d77e7150be7 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -118,7 +118,7 @@ export function removeListener(
 export function sendEvent(
   obj: object,
   eventName: string,
-  params: any[],
+  params?: any[],
   actions?: any[],
   _meta?: Meta | null
 ) {
diff --git a/packages/@ember/object/evented.js b/packages/@ember/object/evented.ts
similarity index 100%
rename from packages/@ember/object/evented.js
rename to packages/@ember/object/evented.ts
diff --git a/packages/@ember/object/events.js b/packages/@ember/object/events.ts
similarity index 100%
rename from packages/@ember/object/events.js
rename to packages/@ember/object/events.ts
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
new file mode 100644
index 00000000000..928b4c2cc0e
--- /dev/null
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -0,0 +1,36 @@
+import { addListener, removeListener, sendEvent } from '@ember/object/events';
+
+import EmberObject from '@ember/object';
+import { on } from '@ember/object/evented';
+
+class Job extends EmberObject {
+  logStartOrUpdate = on('started', 'updated', () => {
+    console.log('Job updated!');
+  });
+
+  logCompleted = on('completed', () => {
+    console.log('Job completed!');
+  });
+}
+
+const job = Job.create();
+
+sendEvent(job, 'started'); // Logs 'Job started!'
+sendEvent(job, 'updated'); // Logs 'Job updated!'
+sendEvent(job, 'completed'); // Logs 'Job completed!'
+
+class MyClass extends EmberObject {
+  constructor() {
+    super();
+    addListener(this, 'willDestroy', this, 'willDestroyListener');
+    addListener(this, 'willDestroy', this, 'willDestroyListener', true);
+    addListener(this, 'willDestroy', this, this.willDestroyListener);
+    addListener(this, 'willDestroy', this, this.willDestroyListener, true);
+    removeListener(this, 'willDestroy', this, 'willDestroyListener');
+    removeListener(this, 'willDestroy', this, this.willDestroyListener);
+  }
+
+  willDestroyListener() {}
+}
+
+MyClass.create();

From e9a1b96643f9065a81f46bd8374773ea4e4097a2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 May 2021 15:42:43 -0700
Subject: [PATCH 0778/1405] Prepare for public @ember/object/observers types

---
 .../object/{observers.js => observers.ts}     |  0
 .../object/type-tests/observers/index.test.ts | 33 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 rename packages/@ember/object/{observers.js => observers.ts} (100%)
 create mode 100644 packages/@ember/object/type-tests/observers/index.test.ts

diff --git a/packages/@ember/object/observers.js b/packages/@ember/object/observers.ts
similarity index 100%
rename from packages/@ember/object/observers.js
rename to packages/@ember/object/observers.ts
diff --git a/packages/@ember/object/type-tests/observers/index.test.ts b/packages/@ember/object/type-tests/observers/index.test.ts
new file mode 100644
index 00000000000..423fd95f6ce
--- /dev/null
+++ b/packages/@ember/object/type-tests/observers/index.test.ts
@@ -0,0 +1,33 @@
+import EmberObject from '@ember/object';
+import { removeObserver, addObserver } from '@ember/object/observers';
+
+class MyComponent extends EmberObject {
+  foo = 'bar';
+
+  constructor() {
+    super();
+    this.addObserver('foo', this, 'fooDidChange');
+    this.addObserver('foo', this, this.fooDidChange);
+    addObserver(this, 'foo', this, 'fooDidChange');
+    addObserver(this, 'foo', this, this.fooDidChange);
+    this.removeObserver('foo', this, 'fooDidChange');
+    this.removeObserver('foo', this, this.fooDidChange);
+    removeObserver(this, 'foo', this, 'fooDidChange');
+    removeObserver(this, 'foo', this, this.fooDidChange);
+    const lambda = () => {
+      this.fooDidChange(this, 'foo');
+    };
+    this.addObserver('foo', lambda);
+    this.removeObserver('foo', lambda);
+    addObserver(this, 'foo', lambda);
+    removeObserver(this, 'foo', lambda);
+  }
+
+  fooDidChange(_sender: this, _key: string) {
+    // your code
+  }
+}
+
+const myComponent = MyComponent.create();
+myComponent.addObserver('foo', null, () => {});
+myComponent.set('foo', 'baz');

From 7e1d65ddecb9f3ca05b26d11ec986ab11fac5ba5 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 May 2021 16:10:08 -0700
Subject: [PATCH 0779/1405] Prepare for public @ember/object/internals types

---
 packages/@ember/-internals/metal/lib/computed_cache.ts   | 4 +++-
 .../@ember/object/type-tests/internals/cache-for.test.ts | 8 ++++++++
 .../@ember/object/type-tests/internals/guid-for.test.ts  | 9 +++++++++
 packages/@ember/object/types/internals.d.ts              | 2 ++
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 packages/@ember/object/type-tests/internals/cache-for.test.ts
 create mode 100644 packages/@ember/object/type-tests/internals/guid-for.test.ts
 create mode 100644 packages/@ember/object/types/internals.d.ts

diff --git a/packages/@ember/-internals/metal/lib/computed_cache.ts b/packages/@ember/-internals/metal/lib/computed_cache.ts
index 32d433f7ded..f6bc37b3ce4 100644
--- a/packages/@ember/-internals/metal/lib/computed_cache.ts
+++ b/packages/@ember/-internals/metal/lib/computed_cache.ts
@@ -1,9 +1,11 @@
 import { peekMeta } from '@ember/-internals/meta';
 
-export function getCachedValueFor(obj: object, key: string) {
+export function getCachedValueFor(obj: object, key: string): unknown {
   let meta = peekMeta(obj);
 
   if (meta) {
     return meta.valueFor(key);
+  } else {
+    return undefined;
   }
 }
diff --git a/packages/@ember/object/type-tests/internals/cache-for.test.ts b/packages/@ember/object/type-tests/internals/cache-for.test.ts
new file mode 100644
index 00000000000..3f9fec828e6
--- /dev/null
+++ b/packages/@ember/object/type-tests/internals/cache-for.test.ts
@@ -0,0 +1,8 @@
+import { expectTypeOf } from 'expect-type';
+
+import { cacheFor } from '@ember/object/internals';
+
+expectTypeOf(cacheFor).toEqualTypeOf<(obj: object, key: string) => unknown>();
+
+expectTypeOf(cacheFor({ foo: 1 }, 'foo')).toEqualTypeOf<unknown>();
+expectTypeOf(cacheFor({ foo: 1 }, 'other')).toEqualTypeOf<unknown>();
diff --git a/packages/@ember/object/type-tests/internals/guid-for.test.ts b/packages/@ember/object/type-tests/internals/guid-for.test.ts
new file mode 100644
index 00000000000..69e7fb50d55
--- /dev/null
+++ b/packages/@ember/object/type-tests/internals/guid-for.test.ts
@@ -0,0 +1,9 @@
+import { expectTypeOf } from 'expect-type';
+
+import { guidFor } from '@ember/object/internals';
+
+expectTypeOf(guidFor('foo')).toEqualTypeOf<string>();
+expectTypeOf(guidFor(1)).toEqualTypeOf<string>();
+expectTypeOf(guidFor({ bar: 1 })).toEqualTypeOf<string>();
+expectTypeOf(guidFor(null)).toEqualTypeOf<string>();
+expectTypeOf(guidFor(undefined)).toEqualTypeOf<string>();
diff --git a/packages/@ember/object/types/internals.d.ts b/packages/@ember/object/types/internals.d.ts
new file mode 100644
index 00000000000..8093f908605
--- /dev/null
+++ b/packages/@ember/object/types/internals.d.ts
@@ -0,0 +1,2 @@
+export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
+export { guidFor } from '@ember/-internals/utils';

From 4ddf449706e7cc01b153f1d28d5c5f9bf78efcd4 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 09:35:42 -0700
Subject: [PATCH 0780/1405] Prepare for public @ember/object/computed types

---
 packages/@ember/object/computed.d.ts          | 104 +++++++++++++++++-
 .../object/type-tests/computed/alias.test.ts  |  15 +++
 .../object/type-tests/computed/and.test.ts    |  17 +++
 .../object/type-tests/computed/bool.test.ts   |  15 +++
 .../type-tests/computed/collect.test.ts       |  12 ++
 .../computed/deprecating-alias.test.ts        |  21 ++++
 .../object/type-tests/computed/empty.test.ts  |  15 +++
 .../object/type-tests/computed/equal.test.ts  |  15 +++
 .../computed/expand-properties.test.ts        |  12 ++
 .../type-tests/computed/filter-by.test.ts     |  18 +++
 .../object/type-tests/computed/filter.test.ts |  26 +++++
 .../object/type-tests/computed/gt.test.ts     |  14 +++
 .../object/type-tests/computed/gte.test.ts    |  14 +++
 .../type-tests/computed/intersect.test.ts     |  12 ++
 .../object/type-tests/computed/lt.test.ts     |  14 +++
 .../object/type-tests/computed/lte.test.ts    |  14 +++
 .../object/type-tests/computed/map-by.test.ts |  16 +++
 .../object/type-tests/computed/map.test.ts    |  30 +++++
 .../object/type-tests/computed/match.test.ts  |  19 ++++
 .../object/type-tests/computed/max.test.ts    |  15 +++
 .../object/type-tests/computed/min.test.ts    |  15 +++
 .../object/type-tests/computed/none.test.ts   |  15 +++
 .../type-tests/computed/not-empty.test.ts     |  15 +++
 .../object/type-tests/computed/not.test.ts    |  15 +++
 .../type-tests/computed/one-way.test.ts       |  15 +++
 .../object/type-tests/computed/or.test.ts     |  17 +++
 .../type-tests/computed/read-only.test.ts     |  15 +++
 .../object/type-tests/computed/reads.test.ts  |  15 +++
 .../type-tests/computed/set-diff.test.ts      |  15 +++
 .../object/type-tests/computed/sort.test.ts   |  35 ++++++
 .../object/type-tests/computed/sum.test.ts    |  15 +++
 .../object/type-tests/computed/union.test.ts  |  12 ++
 .../type-tests/computed/uniq-by.test.ts       |  16 +++
 .../object/type-tests/computed/uniq.test.ts   |  14 +++
 34 files changed, 645 insertions(+), 2 deletions(-)
 create mode 100644 packages/@ember/object/type-tests/computed/alias.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/and.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/bool.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/collect.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/empty.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/equal.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/expand-properties.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/filter-by.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/filter.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/gt.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/gte.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/intersect.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/lt.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/lte.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/map-by.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/map.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/match.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/max.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/min.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/none.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/not-empty.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/not.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/one-way.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/or.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/read-only.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/reads.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/set-diff.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/sort.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/sum.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/union.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/uniq-by.test.ts
 create mode 100644 packages/@ember/object/type-tests/computed/uniq.test.ts

diff --git a/packages/@ember/object/computed.d.ts b/packages/@ember/object/computed.d.ts
index f2f15b706cf..4461a9709ae 100644
--- a/packages/@ember/object/computed.d.ts
+++ b/packages/@ember/object/computed.d.ts
@@ -1,2 +1,102 @@
-/* @internal */
-export function readOnly(key: string): any;
+import { DeprecationOptions } from '@ember/debug';
+
+export function alias(dependentKey: string): PropertyDecorator;
+
+export function and(dependentKey: string, ...additionalDependentKeys: string[]): PropertyDecorator;
+
+export function bool(dependentKey: string): PropertyDecorator;
+
+export function collect(
+  dependentKey: string,
+  ...additionalDependentKeys: string[]
+): PropertyDecorator;
+
+export function deprecatingAlias(
+  dependentKey: string,
+  options: DeprecationOptions
+): PropertyDecorator;
+
+export function empty(dependentKey: string): PropertyDecorator;
+
+export function equal(dependentKey: string, value: any): PropertyDecorator;
+
+export function expandProperties(pattern: string, callback: (expanded: string) => void): void;
+
+export function filter(
+  dependentKey: string,
+  callback: (value: unknown, index: number, array: unknown[]) => boolean
+): PropertyDecorator;
+export function filter(
+  dependentKey: string,
+  additionalDependentKeys: string[],
+  callback: (value: unknown, index: number, array: unknown[]) => boolean
+): PropertyDecorator;
+
+export function filterBy(dependentKey: string, propertyKey: string, value?: any): PropertyDecorator;
+
+export function gt(dependentKey: string, value: number): PropertyDecorator;
+
+export function gte(dependentKey: string, value: number): PropertyDecorator;
+
+export function intersect(
+  dependentKey: string,
+  ...additionalDependentKeys: string[]
+): PropertyDecorator;
+
+export function lt(dependentKey: string, value: number): PropertyDecorator;
+
+export function lte(dependentKey: string, value: number): PropertyDecorator;
+
+export function map(
+  dependentKey: string,
+  callback: (value: unknown, index: number) => boolean
+): PropertyDecorator;
+export function map(
+  dependentKey: string,
+  additionalDependentKeys: string[],
+  callback: (value: unknown, index: number) => boolean
+): PropertyDecorator;
+
+export function mapBy(dependentKey: string, propertyKey: string): PropertyDecorator;
+
+export function match(dependentKey: string, value: RegExp): PropertyDecorator;
+
+export function max(dependentKey: string): PropertyDecorator;
+
+export function min(dependentKey: string): PropertyDecorator;
+
+export function none(dependentKey: string): PropertyDecorator;
+
+export function not(dependentKey: string): PropertyDecorator;
+
+export function notEmpty(dependentKey: string): PropertyDecorator;
+
+export function oneWay(dependentKey: string): PropertyDecorator;
+
+export function or(dependentKey: string, ...additionalDependentKeys: string[]): PropertyDecorator;
+
+export function readOnly(dependentKey: string): PropertyDecorator;
+
+export function reads(dependentKey: string): PropertyDecorator;
+
+export function setDiff(setAProperty: string, setBProperty: string): PropertyDecorator;
+
+type SortDefinition = (itemA: unknown, itemB: unknown) => number;
+export function sort(itemsKey: string, sortDefinition: SortDefinition | string): PropertyDecorator;
+export function sort(
+  itemsKey: string,
+  additionalDependentKeys: string[],
+  sortDefinition: SortDefinition
+): PropertyDecorator;
+
+export function sum(dependentKey: string): PropertyDecorator;
+
+export function union(
+  dependentKey: string,
+  ...additionalDependentKeys: string[]
+): PropertyDecorator;
+
+// NOTE: Despite documentation, union and uniq are aliases, so uniq actually can take more props
+export function uniq(dependentKey: string): PropertyDecorator;
+
+export function uniqBy(dependentKey: string, propertyKey: string): PropertyDecorator;
diff --git a/packages/@ember/object/type-tests/computed/alias.test.ts b/packages/@ember/object/type-tests/computed/alias.test.ts
new file mode 100644
index 00000000000..948ac751d64
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/alias.test.ts
@@ -0,0 +1,15 @@
+import { alias } from '@ember/object/computed';
+
+class Foo {
+  @alias('foo') alias: unknown;
+
+  // @ts-expect-error Only takes one key
+  @alias('foo', 'bar')
+  alias2: unknown;
+
+  // @ts-expect-error Requires a key
+  @alias()
+  alias3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/and.test.ts b/packages/@ember/object/type-tests/computed/and.test.ts
new file mode 100644
index 00000000000..8e38fd7287b
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/and.test.ts
@@ -0,0 +1,17 @@
+import { and } from '@ember/object/computed';
+
+class Foo {
+  @and('foo') and: unknown;
+
+  @and('foo', 'bar', 'baz', 'qux') and2: unknown;
+
+  // @ts-expect-error Requires a key
+  @and()
+  and3: unknown;
+
+  // @ts-expect-error Arguments must be keys
+  @and('foo', 1)
+  and4: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/bool.test.ts b/packages/@ember/object/type-tests/computed/bool.test.ts
new file mode 100644
index 00000000000..9730de114fc
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/bool.test.ts
@@ -0,0 +1,15 @@
+import { bool } from '@ember/object/computed';
+
+class Foo {
+  @bool('foo') declare bool: boolean;
+
+  // @ts-expect-error Requires a key
+  @bool()
+  declare bool2: boolean;
+
+  // @ts-expect-error It only takes one key
+  @bool('foo', 'bar')
+  declare bool3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/collect.test.ts b/packages/@ember/object/type-tests/computed/collect.test.ts
new file mode 100644
index 00000000000..ffb821a0a95
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/collect.test.ts
@@ -0,0 +1,12 @@
+import { collect } from '@ember/object/computed';
+
+class Foo {
+  @collect('foo') declare collect: unknown[];
+  @collect('foo', 'bar', 'baz') declare collect2: unknown[];
+
+  // @ts-expect-error it requires a key
+  @collect()
+  declare collect3: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts b/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
new file mode 100644
index 00000000000..fc665f32400
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
@@ -0,0 +1,21 @@
+import { deprecatingAlias } from '@ember/object/computed';
+
+class Foo {
+  @deprecatingAlias('foo', {
+    id: 'test',
+    until: '4.0.0',
+    for: 'testing',
+    since: { enabled: '3.0.0' },
+  })
+  declare deprecatingAlias: unknown;
+
+  // @ts-expect-error Requires deprecation options
+  @deprecatingAlias('foo')
+  declare deprecatingAlias2: unknown;
+
+  // @ts-expect-error Requires valid deprecation options
+  @deprecatingAlias('foo', { id: 'test' })
+  declare deprecatingAlias3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/empty.test.ts b/packages/@ember/object/type-tests/computed/empty.test.ts
new file mode 100644
index 00000000000..5f747702d4f
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/empty.test.ts
@@ -0,0 +1,15 @@
+import { empty } from '@ember/object/computed';
+
+class Foo {
+  @empty('foo') declare empty: boolean;
+
+  // @ts-expect-error Only takes one key
+  @empty('foo', 'bar')
+  declare empty2: boolean;
+
+  // @ts-expect-error Requires a key
+  @empty()
+  declare empty3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/equal.test.ts b/packages/@ember/object/type-tests/computed/equal.test.ts
new file mode 100644
index 00000000000..b3966d517a5
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/equal.test.ts
@@ -0,0 +1,15 @@
+import { equal } from '@ember/object/computed';
+
+class Foo {
+  @equal('foo', 'bar') declare equal: boolean;
+
+  // @ts-expect-error Requires a second value parameter
+  @equal('foo')
+  declare equal2: boolean;
+
+  // @ts-expect-error Requires a key
+  @equal()
+  declare equal3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/expand-properties.test.ts b/packages/@ember/object/type-tests/computed/expand-properties.test.ts
new file mode 100644
index 00000000000..87cf1d15752
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/expand-properties.test.ts
@@ -0,0 +1,12 @@
+import { expandProperties } from '@ember/object/computed';
+
+expandProperties('{foo}.bar.{baz}', (arg: string) => console.log(arg));
+
+// @ts-expect-error a callback is required
+expandProperties('{foo}.bar.{baz}');
+
+// @ts-expect-error a pattern is required
+expandProperties();
+
+// @ts-expect-error a valid callback is required
+expandProperties('{foo}.bar.{baz}', (arg: number) => arg);
diff --git a/packages/@ember/object/type-tests/computed/filter-by.test.ts b/packages/@ember/object/type-tests/computed/filter-by.test.ts
new file mode 100644
index 00000000000..cb756d8d04b
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/filter-by.test.ts
@@ -0,0 +1,18 @@
+import { filterBy } from '@ember/object/computed';
+
+class Foo {
+  @filterBy('foo', 'key', 'value')
+  declare filterBy: unknown[];
+
+  @filterBy('foo', 'key', true)
+  declare filterBy2: unknown[];
+
+  @filterBy('foo', 'key')
+  declare filterBy3: unknown[];
+
+  // @ts-expect-error a comparison key is required
+  @filterBy('foo')
+  declare filterBy4: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/filter.test.ts b/packages/@ember/object/type-tests/computed/filter.test.ts
new file mode 100644
index 00000000000..134cdd08d02
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/filter.test.ts
@@ -0,0 +1,26 @@
+import { filter } from '@ember/object/computed';
+
+class Foo {
+  @filter('foo', (item: unknown) => Boolean(item))
+  declare filter: unknown[];
+
+  @filter('foo', (item: unknown, index: number, array: unknown[]) => item === array[index])
+  declare filter2: unknown[];
+
+  @filter('foo', ['baz', 'qux'], (item: unknown) => Boolean(item))
+  declare filter3: unknown[];
+
+  // @ts-expect-error a callback is required
+  @filter('foo')
+  declare filter4: unknown[];
+
+  // @ts-expect-error a callback is required
+  @filter('foo', ['baz', 'qux'])
+  declare filter5: unknown[];
+
+  // @ts-expect-error arguments are required
+  @filter()
+  declare filter6: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/gt.test.ts b/packages/@ember/object/type-tests/computed/gt.test.ts
new file mode 100644
index 00000000000..9520b64d428
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/gt.test.ts
@@ -0,0 +1,14 @@
+import { gt } from '@ember/object/computed';
+
+class Foo {
+  @gt('foo', 10) declare gt: boolean;
+
+  // @ts-expect-error Requires a key
+  @gt()
+  declare gt2: boolean;
+
+  // @ts-expect-error Must compare to a number
+  @gt('foo', 'bar') declare gt3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/gte.test.ts b/packages/@ember/object/type-tests/computed/gte.test.ts
new file mode 100644
index 00000000000..8cb53de2472
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/gte.test.ts
@@ -0,0 +1,14 @@
+import { gte } from '@ember/object/computed';
+
+class Foo {
+  @gte('foo', 10) declare gte: boolean;
+
+  // @ts-expect-error Requires a key
+  @gte()
+  declare gte2: boolean;
+
+  // @ts-expect-error Must compare to a number
+  @gte('foo', 'bar') declare gte3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/intersect.test.ts b/packages/@ember/object/type-tests/computed/intersect.test.ts
new file mode 100644
index 00000000000..0b96c0baff7
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/intersect.test.ts
@@ -0,0 +1,12 @@
+import { intersect } from '@ember/object/computed';
+
+class Foo {
+  @intersect('foo') declare intersect: unknown[];
+  @intersect('foo', 'bar', 'baz') declare intersect2: unknown[];
+
+  // @ts-expect-error it requires a key
+  @intersect()
+  declare intersect3: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/lt.test.ts b/packages/@ember/object/type-tests/computed/lt.test.ts
new file mode 100644
index 00000000000..692116d7cf7
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/lt.test.ts
@@ -0,0 +1,14 @@
+import { lt } from '@ember/object/computed';
+
+class Foo {
+  @lt('foo', 10) declare lt: boolean;
+
+  // @ts-expect-error Requires a key
+  @lt()
+  declare lt2: boolean;
+
+  // @ts-expect-error Must compare to a number
+  @lt('foo', 'bar') declare lt3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/lte.test.ts b/packages/@ember/object/type-tests/computed/lte.test.ts
new file mode 100644
index 00000000000..66d769811f2
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/lte.test.ts
@@ -0,0 +1,14 @@
+import { lte } from '@ember/object/computed';
+
+class Foo {
+  @lte('foo', 10) declare lte: boolean;
+
+  // @ts-expect-error Requires a key
+  @lte()
+  declare lte2: boolean;
+
+  // @ts-expect-error Must compare to a number
+  @lte('foo', 'bar') declare lte3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/map-by.test.ts b/packages/@ember/object/type-tests/computed/map-by.test.ts
new file mode 100644
index 00000000000..85e88dc8ca6
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/map-by.test.ts
@@ -0,0 +1,16 @@
+import { mapBy } from '@ember/object/computed';
+
+class Foo {
+  @mapBy('foo', 'key')
+  declare mapBy: unknown[];
+
+  // @ts-expect-error Requires a key
+  @mapBy('foo')
+  declare mapBy2: unknown[];
+
+  // @ts-expect-error Only takes one propertyKey
+  @mapBy('foo', 'key', 'key2')
+  declare mapBy3: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/map.test.ts b/packages/@ember/object/type-tests/computed/map.test.ts
new file mode 100644
index 00000000000..47d5aa75c76
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/map.test.ts
@@ -0,0 +1,30 @@
+import { map } from '@ember/object/computed';
+
+class Foo {
+  @map('foo', (item: unknown) => Boolean(item))
+  declare map: unknown[];
+
+  @map('foo', (_item: unknown, index: number) => index > 0)
+  declare map2: unknown[];
+
+  @map('foo', ['baz', 'qux'], (item: unknown) => Boolean(item))
+  declare map3: unknown[];
+
+  // @ts-expect-error a callback is required
+  @map('foo')
+  declare map4: unknown[];
+
+  // @ts-expect-error a callback is required
+  @map('foo', ['baz', 'qux'])
+  declare map5: unknown[];
+
+  // @ts-expect-error arguments are required
+  @map()
+  declare map6: unknown[];
+
+  // @ts-expect-error doesn't receive an array property
+  @map('foo', (_item: unknown, index: number, array: unknown[]) => item === array[index])
+  declare map7: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/match.test.ts b/packages/@ember/object/type-tests/computed/match.test.ts
new file mode 100644
index 00000000000..81d4f2778aa
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/match.test.ts
@@ -0,0 +1,19 @@
+import { match } from '@ember/object/computed';
+
+class Foo {
+  @match('foo', /^foo$/) declare match: boolean;
+
+  // @ts-expect-error Requires a second value parameter
+  @match('foo')
+  declare match2: boolean;
+
+  // @ts-expect-error Requires a second parameter to be a regex
+  @match('foo', 'bar')
+  declare match3: boolean;
+
+  // @ts-expect-error Requires a key
+  @match()
+  declare match4: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/max.test.ts b/packages/@ember/object/type-tests/computed/max.test.ts
new file mode 100644
index 00000000000..d7a9c1f8bfb
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/max.test.ts
@@ -0,0 +1,15 @@
+import { max } from '@ember/object/computed';
+
+class Foo {
+  @max('foo') max: unknown;
+
+  // @ts-expect-error Only takes one key
+  @max('foo', 'bar')
+  max2: unknown;
+
+  // @ts-expect-error Requires a key
+  @max()
+  max3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/min.test.ts b/packages/@ember/object/type-tests/computed/min.test.ts
new file mode 100644
index 00000000000..79f4ce72969
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/min.test.ts
@@ -0,0 +1,15 @@
+import { min } from '@ember/object/computed';
+
+class Foo {
+  @min('foo') min: unknown;
+
+  // @ts-expect-error Only takes one key
+  @min('foo', 'bar')
+  min2: unknown;
+
+  // @ts-expect-error Requires a key
+  @min()
+  min3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/none.test.ts b/packages/@ember/object/type-tests/computed/none.test.ts
new file mode 100644
index 00000000000..7f0c51a1e4f
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/none.test.ts
@@ -0,0 +1,15 @@
+import { none } from '@ember/object/computed';
+
+class Foo {
+  @none('foo') none: unknown;
+
+  // @ts-expect-error Only takes one key
+  @none('foo', 'bar')
+  none2: unknown;
+
+  // @ts-expect-error Requires a key
+  @none()
+  none3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/not-empty.test.ts b/packages/@ember/object/type-tests/computed/not-empty.test.ts
new file mode 100644
index 00000000000..74ddd251f67
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/not-empty.test.ts
@@ -0,0 +1,15 @@
+import { notEmpty } from '@ember/object/computed';
+
+class Foo {
+  @notEmpty('foo') notEmpty: unknown;
+
+  // @ts-expect-error Only takes one key
+  @notEmpty('foo', 'bar')
+  notEmpty2: unknown;
+
+  // @ts-expect-error Requires a key
+  @notEmpty()
+  notEmpty3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/not.test.ts b/packages/@ember/object/type-tests/computed/not.test.ts
new file mode 100644
index 00000000000..a4d4590d730
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/not.test.ts
@@ -0,0 +1,15 @@
+import { not } from '@ember/object/computed';
+
+class Foo {
+  @not('foo') not: unknown;
+
+  // @ts-expect-error Only takes one key
+  @not('foo', 'bar')
+  not2: unknown;
+
+  // @ts-expect-error Requires a key
+  @not()
+  not3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/one-way.test.ts b/packages/@ember/object/type-tests/computed/one-way.test.ts
new file mode 100644
index 00000000000..32ed75de290
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/one-way.test.ts
@@ -0,0 +1,15 @@
+import { oneWay } from '@ember/object/computed';
+
+class Foo {
+  @oneWay('foo') oneWay: unknown;
+
+  // @ts-expect-error Only takes one key
+  @oneWay('foo', 'bar')
+  oneWay2: unknown;
+
+  // @ts-expect-error Requires a key
+  @oneWay()
+  oneWay3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/or.test.ts b/packages/@ember/object/type-tests/computed/or.test.ts
new file mode 100644
index 00000000000..09e0b6f20ba
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/or.test.ts
@@ -0,0 +1,17 @@
+import { or } from '@ember/object/computed';
+
+class Foo {
+  @or('foo') or: unknown;
+
+  @or('foo', 'bar', 'baz', 'qux') or2: unknown;
+
+  // @ts-expect-error Requires a key
+  @or()
+  or3: unknown;
+
+  // @ts-expect-error Arguments must be keys
+  @or('foo', 1)
+  or4: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/read-only.test.ts b/packages/@ember/object/type-tests/computed/read-only.test.ts
new file mode 100644
index 00000000000..e63676bbbb8
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/read-only.test.ts
@@ -0,0 +1,15 @@
+import { readOnly } from '@ember/object/computed';
+
+class Foo {
+  @readOnly('foo') readOnly: unknown;
+
+  // @ts-expect-error Only takes one key
+  @readOnly('foo', 'bar')
+  readOnly2: unknown;
+
+  // @ts-expect-error Requires a key
+  @readOnly()
+  readOnly3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/reads.test.ts b/packages/@ember/object/type-tests/computed/reads.test.ts
new file mode 100644
index 00000000000..7a04111ac38
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/reads.test.ts
@@ -0,0 +1,15 @@
+import { reads } from '@ember/object/computed';
+
+class Foo {
+  @reads('foo') reads: unknown;
+
+  // @ts-expect-error Only takes one key
+  @reads('foo', 'bar')
+  reads2: unknown;
+
+  // @ts-expect-error Requires a key
+  @reads()
+  reads3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/set-diff.test.ts b/packages/@ember/object/type-tests/computed/set-diff.test.ts
new file mode 100644
index 00000000000..1911d92445d
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/set-diff.test.ts
@@ -0,0 +1,15 @@
+import { setDiff } from '@ember/object/computed';
+
+class Foo {
+  @setDiff('foo', 'bar') declare setDiff: boolean;
+
+  // @ts-expect-error Requires a second key parameter
+  @setDiff('foo')
+  declare setDiff2: boolean;
+
+  // @ts-expect-error Requires a key
+  @setDiff()
+  declare setDiff3: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/sort.test.ts b/packages/@ember/object/type-tests/computed/sort.test.ts
new file mode 100644
index 00000000000..8e10a5880a0
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/sort.test.ts
@@ -0,0 +1,35 @@
+import { sort } from '@ember/object/computed';
+
+class Foo {
+  // With sortKey
+  @sort('foo', 'bar') declare sort: boolean;
+
+  // With sortDefinition
+  @sort('foo', (itemA, itemB) => Number(itemA) - Number(itemB)) declare sort2: boolean;
+
+  // With dependentKeys
+  @sort('foo', ['bar', 'baz'], (itemA, itemB) => Number(itemA) - Number(itemB))
+  declare sort3: boolean;
+
+  // @ts-expect-error Requires a second parameter
+  @sort('foo')
+  declare sort4: boolean;
+
+  // @ts-expect-error Requires a key
+  @sort()
+  declare sort5: boolean;
+
+  // @ts-expect-error Requires a sortDefinition
+  @sort('foo', ['bar', 'baz'])
+  declare sort6: boolean;
+
+  // @ts-expect-error Can't pass sortKey as third param
+  @sort('foo', ['bar', 'baz'], 'sortKey')
+  declare sort7: boolean;
+
+  // @ts-expect-error Requires valid sortDefinition
+  @sort('foo', () => true)
+  declare sort8: boolean;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/sum.test.ts b/packages/@ember/object/type-tests/computed/sum.test.ts
new file mode 100644
index 00000000000..f64616829c6
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/sum.test.ts
@@ -0,0 +1,15 @@
+import { sum } from '@ember/object/computed';
+
+class Foo {
+  @sum('foo') sum: unknown;
+
+  // @ts-expect-error Only takes one key
+  @sum('foo', 'bar')
+  sum2: unknown;
+
+  // @ts-expect-error Requires a key
+  @sum()
+  sum3: unknown;
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/union.test.ts b/packages/@ember/object/type-tests/computed/union.test.ts
new file mode 100644
index 00000000000..2b3251bf248
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/union.test.ts
@@ -0,0 +1,12 @@
+import { union } from '@ember/object/computed';
+
+class Foo {
+  @union('foo') declare union: unknown[];
+  @union('foo', 'bar', 'baz') declare union2: unknown[];
+
+  // @ts-expect-error it requires a key
+  @union()
+  declare union3: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/uniq-by.test.ts b/packages/@ember/object/type-tests/computed/uniq-by.test.ts
new file mode 100644
index 00000000000..23a026ac364
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/uniq-by.test.ts
@@ -0,0 +1,16 @@
+import { uniqBy } from '@ember/object/computed';
+
+class Foo {
+  @uniqBy('foo', 'key')
+  declare uniqBy: unknown[];
+
+  // @ts-expect-error Requires a key
+  @uniqBy('foo')
+  declare uniqBy2: unknown[];
+
+  // @ts-expect-error Only takes one propertyKey
+  @uniqBy('foo', 'key', 'key2')
+  declare uniqBy3: unknown[];
+}
+
+new Foo();
diff --git a/packages/@ember/object/type-tests/computed/uniq.test.ts b/packages/@ember/object/type-tests/computed/uniq.test.ts
new file mode 100644
index 00000000000..b118d99c75a
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed/uniq.test.ts
@@ -0,0 +1,14 @@
+import { uniq } from '@ember/object/computed';
+
+class Foo {
+  @uniq('foo') declare uniq: unknown[];
+
+  // @ts-expect-error only allows a single key
+  @uniq('foo', 'bar') declare uniq2: unknown[];
+
+  // @ts-expect-error it requires a key
+  @uniq()
+  declare uniq3: unknown[];
+}
+
+new Foo();

From e6e337973d987e6b4f3625d3ff228aee1b38fefa Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 11:32:35 -0700
Subject: [PATCH 0781/1405] Prepare for public @ember/object computed method
 type

---
 packages/@ember/object/index.d.ts               |  4 ++++
 .../@ember/object/type-tests/computed.test.ts   | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 packages/@ember/object/type-tests/computed.test.ts

diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index 05b5538669d..d975a18fabc 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -1,3 +1,7 @@
 export let action: MethodDecorator;
 
+// NOTE: The internal version of computed is TypeScript.
+// However, it is more permissive than we want.
+export function computed(...dependentKeys: string[]): MethodDecorator;
+
 export { default } from '@ember/-internals/runtime/types/index';
diff --git a/packages/@ember/object/type-tests/computed.test.ts b/packages/@ember/object/type-tests/computed.test.ts
new file mode 100644
index 00000000000..7517b6a0bef
--- /dev/null
+++ b/packages/@ember/object/type-tests/computed.test.ts
@@ -0,0 +1,17 @@
+import { computed } from '@ember/object';
+
+class Foo {
+  declare firstName: string;
+  declare lastName: string;
+
+  @computed('firstName', 'lastName')
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+
+  // @ts-expect-error must decorate a method
+  @computed('firstName', 'lastName')
+  declare badFullName: string;
+}
+
+new Foo();

From 825d7b92e1587afb09df43be3a1509d2b50c4c49 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 11:32:49 -0700
Subject: [PATCH 0782/1405] Prepare for public @ember/object defineProperty
 method type

---
 packages/@ember/object/index.d.ts                  | 10 ++++++++++
 .../object/type-tests/define-property.test.ts      | 14 ++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 packages/@ember/object/type-tests/define-property.test.ts

diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index d975a18fabc..975e9806365 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -4,4 +4,14 @@ export let action: MethodDecorator;
 // However, it is more permissive than we want.
 export function computed(...dependentKeys: string[]): MethodDecorator;
 
+// NOTE: The internal version of defineProperty is TypeScript.
+// However, it is more permissive than we want.
+export function defineProperty(
+  obj: object,
+  keyName: string,
+  desc?: PropertyDescriptor,
+  data?: any,
+  meta?: any
+): void;
+
 export { default } from '@ember/-internals/runtime/types/index';
diff --git a/packages/@ember/object/type-tests/define-property.test.ts b/packages/@ember/object/type-tests/define-property.test.ts
new file mode 100644
index 00000000000..3da35db32af
--- /dev/null
+++ b/packages/@ember/object/type-tests/define-property.test.ts
@@ -0,0 +1,14 @@
+import { defineProperty } from '@ember/object';
+
+let contact = {};
+
+// ES5 compatible mode
+defineProperty(contact, 'firstName', {
+  writable: true,
+  configurable: false,
+  enumerable: true,
+  value: 'Charles',
+});
+
+// define a simple property
+defineProperty(contact, 'lastName', undefined, 'Jolley');

From ca80959e37906e7c6392c75d0d37d2a5c034fa2e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 13:40:08 -0700
Subject: [PATCH 0783/1405] Prepare for public @ember/object get/set types and
 improve existing

---
 .../-internals/runtime/types/index.d.ts       | 15 +++------
 .../-internals/runtime/types/observable.d.ts  | 16 +++++-----
 packages/@ember/object/index.d.ts             | 13 ++++++++
 .../object/type-tests/ember-object.test.ts    | 31 ++++++++++++++++---
 .../object/type-tests/get-properties.test.ts  | 20 ++++++++++++
 packages/@ember/object/type-tests/get.test.ts | 11 +++++++
 .../object/type-tests/observable.test.ts      |  5 ---
 .../type-tests/observable/index.test.ts       |  3 +-
 .../object/type-tests/set-properties.test.ts  | 10 ++++++
 packages/@ember/object/type-tests/set.test.ts | 14 +++++++++
 10 files changed, 110 insertions(+), 28 deletions(-)
 create mode 100644 packages/@ember/object/type-tests/get-properties.test.ts
 create mode 100644 packages/@ember/object/type-tests/get.test.ts
 delete mode 100644 packages/@ember/object/type-tests/observable.test.ts
 create mode 100644 packages/@ember/object/type-tests/set-properties.test.ts
 create mode 100644 packages/@ember/object/type-tests/set.test.ts

diff --git a/packages/@ember/-internals/runtime/types/index.d.ts b/packages/@ember/-internals/runtime/types/index.d.ts
index 3927b787280..44c3a523acd 100644
--- a/packages/@ember/-internals/runtime/types/index.d.ts
+++ b/packages/@ember/-internals/runtime/types/index.d.ts
@@ -3,16 +3,11 @@ import CoreObject from './core';
 import Observable from './observable';
 
 export default class Object extends CoreObject implements Observable {
-  get<K extends keyof this>(key: K): unknown;
-  getProperties<K extends keyof this>(list: K[]): Record<K, unknown>;
-  getProperties<K extends keyof this>(...list: K[]): Record<K, unknown>;
-  set<K extends keyof this>(key: K, value: this[K]): this[K];
-  set<T>(key: keyof this, value: T): T;
-  setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
-  setProperties<K extends keyof this>(
-    // tslint:disable-next-line:unified-signatures
-    hash: { [KK in K]: any }
-  ): Record<K, unknown>;
+  get(key: string): unknown;
+  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
+  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
+  set<T>(key: string, value: T): T;
+  setProperties<T extends Record<string, any>>(hash: T): T;
   notifyPropertyChange(keyName: string): this;
   addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
   addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
diff --git a/packages/@ember/-internals/runtime/types/observable.d.ts b/packages/@ember/-internals/runtime/types/observable.d.ts
index f6e254c2bbe..ae00e128d11 100644
--- a/packages/@ember/-internals/runtime/types/observable.d.ts
+++ b/packages/@ember/-internals/runtime/types/observable.d.ts
@@ -7,26 +7,26 @@ interface Observable {
   /**
    * Retrieves the value of a property from the object.
    */
-  get<K extends keyof this>(key: K): unknown;
-  // get<K extends keyof this>(key: K): UnwrapComputedPropertyGetter<this[K]>;
+  get(key: string): unknown;
+
   /**
    * To get the values of multiple properties at once, call `getProperties`
    * with a list of strings or an array:
    */
-  getProperties<K extends keyof this>(list: K[]): Record<K, unknown>;
-  getProperties<K extends keyof this>(...list: K[]): Record<K, unknown>;
+  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
+  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
+
   /**
    * Sets the provided key or path to the value.
    */
-  set<K extends keyof this>(key: K, value: this[K]): this[K];
-  set<T>(key: keyof this, value: T): T;
+  set<T>(key: string, value: T): T;
+
   /**
    * Sets a list of properties at once. These properties are set inside
    * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
    * observers will be buffered.
    */
-  setProperties<K extends keyof this>(hash: Pick<this, K>): Record<K, unknown>;
-  setProperties<K extends keyof this>(hash: { [KK in K]: any }): Record<K, unknown>;
+  setProperties<T extends Record<string, any>>(hash: T): T;
   /**
    * Convenience method to call `propertyWillChange` and `propertyDidChange` in
    * succession.
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index 975e9806365..67275732ad3 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -14,4 +14,17 @@ export function defineProperty(
   meta?: any
 ): void;
 
+// NOTE: We don't properly handle types for CPs so we just return unknown for gets
+export function get(obj: any, key: string): unknown;
+export function getProperties<L extends string[]>(
+  obj: any,
+  list: L
+): { [Key in L[number]]: unknown };
+export function getProperties<L extends string[]>(
+  obj: any,
+  ...list: L
+): { [Key in L[number]]: unknown };
+export function set<T>(obj: any, key: string, value: T): T;
+export function setProperties<T extends Record<string, any>>(obj: any, hash: T): T;
+
 export { default } from '@ember/-internals/runtime/types/index';
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index ce2e22f1206..ce781eeec4c 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -14,7 +14,6 @@ expectTypeOf(o).toMatchTypeOf<object>();
 // object returned by create type-checks as an instance of Ember.Object
 expectTypeOf(o.isDestroyed).toEqualTypeOf<boolean>(); // from instance
 expectTypeOf(o.isDestroying).toEqualTypeOf<boolean>(); // from instance
-expectTypeOf(o.get).toEqualTypeOf<(key: keyof EmberObject) => unknown>(); // from prototype
 
 /**
  * One-argument case
@@ -37,10 +36,34 @@ export class Person extends EmberObject {
 const p = new Person();
 
 expectTypeOf(p.firstName).toEqualTypeOf<string>();
-// get is deprecated and only returns unknown now
+
+// get not preferred for TS only returns unknown
 expectTypeOf(p.get('firstName')).toEqualTypeOf<unknown>();
-// @ts-expect-error Can't get unknown properties
-p.get('invalid');
+// Also returns unknown for invalid properties
+expectTypeOf(p.get('invalid')).toEqualTypeOf<unknown>();
+
+// get is not preferred for TS and only returns unknown
+let getPropertiesResult = p.getProperties('firstName', 'lastName', 'invalid');
+expectTypeOf(getPropertiesResult).toEqualTypeOf<{
+  firstName: unknown;
+  lastName: unknown;
+  invalid: unknown;
+}>();
+// @ts-expect-error doesn't have unknown properties
+getPropertiesResult.unknown;
+
+expectTypeOf(p.set('firstName', 'Joe')).toEqualTypeOf<string>();
+expectTypeOf(p.set('invalid', 1)).toEqualTypeOf<number>();
+
+let setPropertiesResult = p.setProperties({ firstName: 'Joe', invalid: 1 });
+expectTypeOf(setPropertiesResult).toEqualTypeOf<{
+  firstName: string;
+  invalid: number;
+}>();
+expectTypeOf(setPropertiesResult.firstName).toEqualTypeOf<string>();
+expectTypeOf(setPropertiesResult.invalid).toEqualTypeOf<number>();
+// @ts-expect-error doesn't have unknown properties
+setPropertiesResult.unknown;
 
 const p2 = Person.create({ firstName: 'string' });
 expectTypeOf(p2.firstName).toEqualTypeOf<string>();
diff --git a/packages/@ember/object/type-tests/get-properties.test.ts b/packages/@ember/object/type-tests/get-properties.test.ts
new file mode 100644
index 00000000000..3504d8082c9
--- /dev/null
+++ b/packages/@ember/object/type-tests/get-properties.test.ts
@@ -0,0 +1,20 @@
+import { getProperties } from '@ember/object';
+
+import { expectTypeOf } from 'expect-type';
+
+let foo = { baz: 1 };
+
+// We can't correctly infer CP types so just return unknown
+expectTypeOf(getProperties(foo, 'baz', 'missing')).toEqualTypeOf<{
+  baz: unknown;
+  missing: unknown;
+}>();
+
+// We can't infer a more specific return without casting the keys
+expectTypeOf(getProperties(foo, ['baz', 'missing'])).toMatchTypeOf<{
+  [x: string]: unknown;
+}>();
+expectTypeOf(getProperties(foo, ['baz', 'missing'] as Array<'baz' | 'missing'>)).toEqualTypeOf<{
+  baz: unknown;
+  missing: unknown;
+}>();
diff --git a/packages/@ember/object/type-tests/get.test.ts b/packages/@ember/object/type-tests/get.test.ts
new file mode 100644
index 00000000000..dc30db47a52
--- /dev/null
+++ b/packages/@ember/object/type-tests/get.test.ts
@@ -0,0 +1,11 @@
+import { get } from '@ember/object';
+
+import { expectTypeOf } from 'expect-type';
+
+let foo = { baz: 1 };
+
+// We can't correctly infer CP types so just return unknown
+expectTypeOf(get(foo, 'baz')).toEqualTypeOf<unknown>();
+
+// We can get unknown properties
+expectTypeOf(get(foo, 'missing')).toEqualTypeOf<unknown>();
diff --git a/packages/@ember/object/type-tests/observable.test.ts b/packages/@ember/object/type-tests/observable.test.ts
deleted file mode 100644
index 78e25c0c36e..00000000000
--- a/packages/@ember/object/type-tests/observable.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { expectTypeOf } from 'expect-type';
-
-import Observable from '@ember/object/observable';
-
-expectTypeOf<Observable['get']>().toEqualTypeOf<<K extends keyof Observable>(key: K) => unknown>();
diff --git a/packages/@ember/object/type-tests/observable/index.test.ts b/packages/@ember/object/type-tests/observable/index.test.ts
index 78e25c0c36e..8eb57f8032d 100644
--- a/packages/@ember/object/type-tests/observable/index.test.ts
+++ b/packages/@ember/object/type-tests/observable/index.test.ts
@@ -2,4 +2,5 @@ import { expectTypeOf } from 'expect-type';
 
 import Observable from '@ember/object/observable';
 
-expectTypeOf<Observable['get']>().toEqualTypeOf<<K extends keyof Observable>(key: K) => unknown>();
+// A very naive test that at least makes sure we can import this
+expectTypeOf<Observable['get']>().toMatchTypeOf<Function>();
diff --git a/packages/@ember/object/type-tests/set-properties.test.ts b/packages/@ember/object/type-tests/set-properties.test.ts
new file mode 100644
index 00000000000..b1b8143338b
--- /dev/null
+++ b/packages/@ember/object/type-tests/set-properties.test.ts
@@ -0,0 +1,10 @@
+import { setProperties } from '@ember/object';
+
+import { expectTypeOf } from 'expect-type';
+
+let foo = { baz: 1 };
+
+expectTypeOf(setProperties(foo, { baz: 2, missing: true })).toEqualTypeOf<{
+  baz: number;
+  missing: boolean;
+}>();
diff --git a/packages/@ember/object/type-tests/set.test.ts b/packages/@ember/object/type-tests/set.test.ts
new file mode 100644
index 00000000000..8a5583309f9
--- /dev/null
+++ b/packages/@ember/object/type-tests/set.test.ts
@@ -0,0 +1,14 @@
+import { set } from '@ember/object';
+
+import { expectTypeOf } from 'expect-type';
+
+let foo = { baz: 1 };
+
+expectTypeOf(set(foo, 'baz', 2)).toEqualTypeOf<number>();
+
+// FIXME: This is definitely a potential footgun. You're allowed to
+// change the type without any warning.
+expectTypeOf(set(foo, 'baz', 'aaaahhh')).toEqualTypeOf<string>();
+
+// We can set unknown properties
+expectTypeOf(set(foo, 'missing', true)).toEqualTypeOf<boolean>();

From 0fdc07f2ebcc012db6532d759d9b7b310750b9c3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 16:02:51 -0700
Subject: [PATCH 0784/1405] Improve internal  types for future public
 consumption

---
 .../@ember/-internals/metal/lib/computed.ts   | 115 ++++++++++++------
 .../@ember/-internals/metal/lib/decorator.ts  |  10 +-
 packages/@ember/-internals/metal/lib/mixin.ts |  25 ++--
 packages/@ember/object/index.d.ts             |   4 +-
 .../@ember/object/type-tests/computed.test.ts |  13 +-
 5 files changed, 113 insertions(+), 54 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index ee5e1f581f2..25e6d46e3f3 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -23,6 +23,7 @@ import {
   DecoratorPropertyDescriptor,
   descriptorForDecorator,
   descriptorForProperty,
+  ElementDescriptor,
   isClassicDecorator,
   isElementDescriptor,
   makeComputedDecorator,
@@ -36,14 +37,36 @@ import {
   PROPERTY_DID_CHANGE,
 } from './property_events';
 
-export type ComputedPropertyGetter = (keyName: string) => any;
-export type ComputedPropertySetter = (keyName: string, value: any, cachedValue?: any) => any;
+export type ComputedPropertyGetterFunction<T> = (this: any, key: string) => T;
+export type ComputedPropertySetterFunction<T> = (
+  this: any,
+  key: string,
+  newVal: T,
+  oldVal: T | undefined
+) => T;
 
-export interface ComputedPropertyGetterAndSetter {
-  get?: ComputedPropertyGetter;
-  set?: ComputedPropertySetter;
+export interface ComputedPropertyGetterObj<T> {
+  get(this: any, key: string): T;
 }
-export type ComputedPropertyConfig = ComputedPropertyGetter | ComputedPropertyGetterAndSetter;
+
+export interface ComputedPropertySetterObj<T> {
+  set(this: any, key: string, value: T): T;
+}
+export type ComputedPropertyObj<Get, Set> =
+  | ComputedPropertyGetterObj<Get>
+  | ComputedPropertySetterObj<Set>
+  | (ComputedPropertyGetterObj<Get> & ComputedPropertySetterObj<Set>);
+
+export type ComputedPropertyGetter<T> =
+  | ComputedPropertyGetterFunction<T>
+  | ComputedPropertyGetterObj<T>;
+export type ComputedPropertySetter<T> =
+  | ComputedPropertySetterFunction<T>
+  | ComputedPropertySetterObj<T>;
+
+export type ComputedPropertyCallback<Get, Set = Get> =
+  | ComputedPropertyGetterFunction<Get>
+  | ComputedPropertyObj<Get, Set>;
 
 /**
 @module @ember/object
@@ -248,14 +271,14 @@ function noop(): void {}
   @class ComputedProperty
   @public
 */
-export class ComputedProperty extends ComputedDescriptor {
+export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
   _readOnly = false;
   protected _hasConfig = false;
 
-  _getter?: ComputedPropertyGetter = undefined;
-  _setter?: ComputedPropertySetter = undefined;
+  _getter?: ComputedPropertyGetterFunction<Get> = undefined;
+  _setter?: ComputedPropertySetterFunction<Set> = undefined;
 
-  constructor(args: Array<string | ComputedPropertyConfig>) {
+  constructor(args: Array<string | ComputedPropertyCallback<Get, Set>>) {
     super();
 
     let maybeConfig = args[args.length - 1];
@@ -273,9 +296,10 @@ export class ComputedProperty extends ComputedDescriptor {
           !isClassicDecorator(config)
         );
 
-        this._getter = config as ComputedPropertyGetter;
+        this._getter = config;
       } else {
-        const objectConfig = config as ComputedPropertyGetterAndSetter;
+        const objectConfig = config as ComputedPropertyGetterObj<Get> &
+          ComputedPropertySetterObj<Set>;
         assert(
           'computed expects a function or an object as last argument.',
           typeof objectConfig === 'object' && !Array.isArray(objectConfig)
@@ -330,7 +354,7 @@ export class ComputedProperty extends ComputedDescriptor {
       let { get, set } = propertyDesc!;
 
       if (get !== undefined) {
-        this._getter = get as ComputedPropertyGetter;
+        this._getter = get as ComputedPropertyGetterFunction<Get>;
       }
 
       if (set !== undefined) {
@@ -492,9 +516,9 @@ export class ComputedProperty extends ComputedDescriptor {
     throw new EmberError(`Cannot set read-only property "${keyName}" on object: ${inspect(obj)}`);
   }
 
-  _set(obj: object, keyName: string, value: unknown, meta: Meta): any {
+  _set(obj: object, keyName: string, value: Set, meta: Meta): any {
     let hadCachedValue = meta.revisionFor(keyName) !== undefined;
-    let cachedValue = meta.valueFor(keyName);
+    let cachedValue = meta.valueFor(keyName) as Set;
 
     let ret;
     let { _setter } = this;
@@ -530,7 +554,7 @@ export class ComputedProperty extends ComputedDescriptor {
   }
 }
 
-class AutoComputedProperty extends ComputedProperty {
+class AutoComputedProperty<Get, Set = Get> extends ComputedProperty<Get, Set> {
   get(obj: object, keyName: string): any {
     let meta = metaFor(obj);
     let tagMeta = tagMetaFor(obj);
@@ -576,10 +600,12 @@ class AutoComputedProperty extends ComputedProperty {
   }
 }
 
-export type ComputedDecorator = Decorator & PropertyDecorator & ComputedDecoratorImpl;
+export type ComputedDecorator<Get, Set = Get> = Decorator &
+  PropertyDecorator &
+  ComputedDecoratorImpl<Get, Set>;
 
 // TODO: This class can be svelted once `meta` has been deprecated
-class ComputedDecoratorImpl extends Function {
+class ComputedDecoratorImpl<Get, Set = Get> extends Function {
   /**
     Call on a computed property to set it into read-only mode. When in this
     mode the computed property will throw an error when set.
@@ -621,10 +647,10 @@ class ComputedDecoratorImpl extends Function {
     @public
   */
   readOnly(this: Decorator) {
-    let desc = descriptorForDecorator(this) as ComputedProperty;
+    let desc = descriptorForDecorator(this) as ComputedProperty<Get, Set>;
     assert(
       'Computed properties that define a setter using the new syntax cannot be read-only',
-      !(desc._setter && desc._setter !== desc._getter)
+      !(desc._setter && (desc._setter as unknown) !== (desc._getter as unknown))
     );
     desc._readOnly = true;
     return this;
@@ -677,7 +703,7 @@ class ComputedDecoratorImpl extends Function {
     @public
   */
   meta(this: Decorator, meta?: any): any {
-    let prop = descriptorForDecorator(this) as ComputedProperty;
+    let prop = descriptorForDecorator(this) as ComputedProperty<Get, Set>;
 
     if (arguments.length === 0) {
       return prop._meta || {};
@@ -690,15 +716,20 @@ class ComputedDecoratorImpl extends Function {
   // TODO: Remove this when we can provide alternatives in the ecosystem to
   // addons such as ember-macro-helpers that use it.
   get _getter() {
-    return (descriptorForDecorator(this) as ComputedProperty)._getter;
+    return (descriptorForDecorator(this) as ComputedProperty<Get, Set>)._getter;
   }
 
   // TODO: Refactor this, this is an internal API only
   set enumerable(value: boolean) {
-    (descriptorForDecorator(this) as ComputedProperty).enumerable = value;
+    (descriptorForDecorator(this) as ComputedProperty<Get, Set>).enumerable = value;
   }
 }
 
+type ComputedDecoratorKeysAndConfig<Get, Set = Get> = [
+  ...keys: string[],
+  config: ComputedPropertyCallback<Get, Set>
+];
+
 /**
   This helper returns a new property descriptor that wraps the passed
   computed property function. You can use this helper to define properties with
@@ -840,38 +871,52 @@ class ComputedDecoratorImpl extends Function {
   @return {ComputedDecorator} property decorator instance
   @public
 */
-export function computed(target: object, key: string, desc: PropertyDescriptor): PropertyDescriptor;
-export function computed(...args: (string | ComputedPropertyConfig)[]): ComputedDecorator;
+// @computed without parens or computed with descriptor args
 export function computed(
-  ...args: (object | string | ComputedPropertyConfig | DecoratorPropertyDescriptor)[]
-): ComputedDecorator | DecoratorPropertyDescriptor {
+  target: object,
+  propertyName: string,
+  descriptor: DecoratorPropertyDescriptor
+): DecoratorPropertyDescriptor;
+// @computed with keys only
+export function computed<Get, Set = Get>(...dependentKeys: string[]): ComputedDecorator<Get, Set>;
+// @computed with keys and config
+export function computed<Get, Set = Get>(
+  ...args: ComputedDecoratorKeysAndConfig<Get, Set>
+): ComputedDecorator<Get, Set>;
+// @computed with config only
+export function computed<Get, Set = Get>(
+  callback: ComputedPropertyCallback<Get, Set>
+): ComputedDecorator<Get, Set>;
+export function computed<Get, Set = Get>(
+  ...args: ElementDescriptor | string[] | ComputedDecoratorKeysAndConfig<Get, Set>
+): ComputedDecorator<Get, Set> | DecoratorPropertyDescriptor {
   assert(
     `@computed can only be used directly as a native decorator. If you're using tracked in classic classes, add parenthesis to call it like a function: computed()`,
-    !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && args[4] === true)
+    !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && (args[4] as unknown) === true)
   );
 
   if (isElementDescriptor(args)) {
     let decorator = makeComputedDecorator(
       new ComputedProperty([]),
       ComputedDecoratorImpl
-    ) as ComputedDecorator;
+    ) as ComputedDecorator<Get, Set>;
 
     return decorator(args[0], args[1], args[2]);
   }
 
   return makeComputedDecorator(
-    new ComputedProperty(args as (string | ComputedPropertyConfig)[]),
+    new ComputedProperty(args as (string | ComputedPropertyObj<Get, Set>)[]),
     ComputedDecoratorImpl
-  ) as ComputedDecorator;
+  ) as ComputedDecorator<Get, Set>;
 }
 
-export function autoComputed(
-  ...config: [ComputedPropertyConfig]
-): ComputedDecorator | DecoratorPropertyDescriptor {
+export function autoComputed<Get, Set = Get>(
+  ...config: [ComputedPropertyObj<Get, Set>]
+): ComputedDecorator<Get, Set> | DecoratorPropertyDescriptor {
   return makeComputedDecorator(
     new AutoComputedProperty(config),
     ComputedDecoratorImpl
-  ) as ComputedDecorator;
+  ) as ComputedDecorator<Get, Set>;
 }
 
 /**
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 29e7b338ed1..4ce9d88108b 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -13,9 +13,13 @@ export type Decorator = (
   isClassicDecorator?: boolean
 ) => DecoratorPropertyDescriptor;
 
-export function isElementDescriptor(
-  args: any[]
-): args is [object, string, DecoratorPropertyDescriptor] {
+export type ElementDescriptor = [
+  target: object,
+  propertyName: string,
+  descriptor: DecoratorPropertyDescriptor
+];
+
+export function isElementDescriptor(args: any[]): args is ElementDescriptor {
   let [maybeTarget, maybeKey, maybeDesc] = args;
 
   return (
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 115d3745b22..3538734f262 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -19,6 +19,7 @@ import {
   ComputedDecorator,
   ComputedProperty,
   ComputedPropertyGetter,
+  ComputedPropertyObj,
   ComputedPropertySetter,
 } from './computed';
 import {
@@ -67,12 +68,12 @@ function concatenatedMixinProperties(
   return concats;
 }
 
-function giveDecoratorSuper(
+function giveDecoratorSuper<Get, Set>(
   key: string,
-  decorator: ComputedDecorator,
-  property: ComputedProperty | true,
+  decorator: ComputedDecorator<Get, Set>,
+  property: ComputedProperty<Get, Set> | true,
   descs: { [key: string]: any }
-): ComputedDecorator {
+): ComputedDecorator<Get, Set> {
   if (property === true) {
     return decorator;
   }
@@ -86,7 +87,7 @@ function giveDecoratorSuper(
   let superDesc = descs[key];
 
   // Check to see if the super property is a decorator first, if so load its descriptor
-  let superProperty: ComputedProperty | true | undefined =
+  let superProperty: ComputedProperty<Get, Set> | true | undefined =
     typeof superDesc === 'function' ? descriptorForDecorator(superDesc) : superDesc;
 
   if (superProperty === undefined || superProperty === true) {
@@ -99,14 +100,14 @@ function giveDecoratorSuper(
     return decorator;
   }
 
-  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter;
+  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter<Get>;
   let set;
   let originalSetter = property._setter;
   let superSetter = superProperty._setter;
 
   if (superSetter !== undefined) {
     if (originalSetter !== undefined) {
-      set = wrap(originalSetter, superSetter) as ComputedPropertySetter;
+      set = wrap(originalSetter, superSetter) as ComputedPropertySetter<Set>;
     } else {
       // If the super property has a setter, we default to using it no matter what.
       // This is clearly very broken and weird, but it's what was here so we have
@@ -130,14 +131,14 @@ function giveDecoratorSuper(
       {
         get,
         set,
-      },
+      } as ComputedPropertyObj<Get, Set>,
     ]);
 
     newProperty._readOnly = property._readOnly;
     newProperty._meta = property._meta;
     newProperty.enumerable = property.enumerable;
 
-    return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator;
+    return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator<Get, Set>;
   }
 
   return decorator;
@@ -281,7 +282,7 @@ function mergeMixins(
   }
 }
 
-function mergeProps(
+function mergeProps<Get, Set>(
   meta: Meta,
   props: { [key: string]: unknown },
   descs: { [key: string]: unknown },
@@ -335,8 +336,8 @@ function mergeProps(
         // Wrap descriptor function to implement _super() if needed
         descs[key] = giveDecoratorSuper(
           key,
-          value as ComputedDecorator,
-          desc as ComputedProperty,
+          value as ComputedDecorator<Get, Set>,
+          desc as ComputedProperty<Get, Set>,
           descs
         );
         values[key] = undefined;
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index 67275732ad3..854d9515151 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -1,8 +1,6 @@
 export let action: MethodDecorator;
 
-// NOTE: The internal version of computed is TypeScript.
-// However, it is more permissive than we want.
-export function computed(...dependentKeys: string[]): MethodDecorator;
+export { computed } from '@ember/-internals/metal';
 
 // NOTE: The internal version of defineProperty is TypeScript.
 // However, it is more permissive than we want.
diff --git a/packages/@ember/object/type-tests/computed.test.ts b/packages/@ember/object/type-tests/computed.test.ts
index 7517b6a0bef..5d628f4cdbf 100644
--- a/packages/@ember/object/type-tests/computed.test.ts
+++ b/packages/@ember/object/type-tests/computed.test.ts
@@ -9,9 +9,20 @@ class Foo {
     return `${this.firstName} ${this.lastName}`;
   }
 
-  // @ts-expect-error must decorate a method
+  @(computed('firstName', 'lastName').readOnly())
+  get readonlyFullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+
+  // NOTE: This should probably not work, but types do currently allow it.
   @computed('firstName', 'lastName')
   declare badFullName: string;
+
+  // NOTE: This works, but is not recommended.
+  @computed('firstName', 'lastName', function () {
+    return `${this.firstName} ${this.lastName}`;
+  })
+  declare altFullName: string;
 }
 
 new Foo();

From 49b006d4857c4b0f2660681dceafa1af1088c6fc Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 16:10:26 -0700
Subject: [PATCH 0785/1405] Improve internal `defineProperty` types for future
 public consumption

---
 packages/@ember/-internals/metal/lib/properties.ts |  2 +-
 packages/@ember/object/index.d.ts                  | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts
index 55d5403bcaf..97af63fac18 100644
--- a/packages/@ember/-internals/metal/lib/properties.ts
+++ b/packages/@ember/-internals/metal/lib/properties.ts
@@ -59,7 +59,7 @@ import { revalidateObservers } from './observer';
 export function defineProperty(
   obj: object,
   keyName: string,
-  desc?: Decorator | undefined | null,
+  desc?: Decorator | PropertyDescriptor | undefined | null,
   data?: any | undefined | null,
   _meta?: Meta
 ): void {
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index 854d9515151..c58296a1496 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -1,18 +1,8 @@
 export let action: MethodDecorator;
 
-export { computed } from '@ember/-internals/metal';
+export { computed, defineProperty } from '@ember/-internals/metal';
 
-// NOTE: The internal version of defineProperty is TypeScript.
-// However, it is more permissive than we want.
-export function defineProperty(
-  obj: object,
-  keyName: string,
-  desc?: PropertyDescriptor,
-  data?: any,
-  meta?: any
-): void;
-
-// NOTE: We don't properly handle types for CPs so we just return unknown for gets
+// NOTE: We don't properly handle types for CPs so we just return unknown for gets.
 export function get(obj: any, key: string): unknown;
 export function getProperties<L extends string[]>(
   obj: any,

From 94c357457a6170d0609b75b19a77c97a068d4658 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 May 2021 16:37:45 -0700
Subject: [PATCH 0786/1405] Improve internal `get` and `set` types for future
 public consumption

---
 .../-internals/glimmer/lib/utils/bindings.ts  |  4 +--
 .../-internals/metal/lib/get_properties.ts    |  9 +++++-
 .../@ember/-internals/metal/lib/libraries.ts  |  2 +-
 .../-internals/metal/lib/property_get.ts      |  2 +-
 .../-internals/metal/lib/property_set.ts      |  2 +-
 .../-internals/routing/lib/ext/controller.ts  |  4 +--
 .../-internals/routing/lib/system/route.ts    | 29 ++++++++++---------
 .../-internals/routing/lib/system/router.ts   | 14 ++++-----
 packages/@ember/object/index.d.ts             | 22 +++++---------
 9 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 1ce2a0a55eb..14952e50647 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -62,8 +62,8 @@ export function installAttributeBinding(
     if (elementId === undefined || elementId === null) {
       elementId = component.elementId;
     }
-    elementId = createPrimitiveRef(elementId);
-    operations.setAttribute('id', elementId, true, null);
+    let elementIdRef = createPrimitiveRef(elementId);
+    operations.setAttribute('id', elementIdRef, true, null);
     return;
   }
 
diff --git a/packages/@ember/-internals/metal/lib/get_properties.ts b/packages/@ember/-internals/metal/lib/get_properties.ts
index d967d6b6282..1a91c0d808c 100644
--- a/packages/@ember/-internals/metal/lib/get_properties.ts
+++ b/packages/@ember/-internals/metal/lib/get_properties.ts
@@ -31,7 +31,12 @@ import { get } from './property_get';
   @return {Object}
   @public
 */
-export default function getProperties(obj: object, keys?: string[]): object {
+function getProperties<L extends string[]>(obj: object, list: L): { [Key in L[number]]: unknown };
+function getProperties<L extends string[]>(
+  obj: object,
+  ...list: L
+): { [Key in L[number]]: unknown };
+function getProperties(obj: object, keys?: string[]): object {
   let ret = {};
   let propertyNames = arguments;
   let i = 1;
@@ -45,3 +50,5 @@ export default function getProperties(obj: object, keys?: string[]): object {
   }
   return ret;
 }
+
+export default getProperties;
diff --git a/packages/@ember/-internals/metal/lib/libraries.ts b/packages/@ember/-internals/metal/lib/libraries.ts
index 5823e50b629..fdaf9ab9369 100644
--- a/packages/@ember/-internals/metal/lib/libraries.ts
+++ b/packages/@ember/-internals/metal/lib/libraries.ts
@@ -84,7 +84,7 @@ if (EMBER_LIBRARIES_ISREGISTERED) {
 if (DEBUG) {
   Libraries.prototype.logVersions = function (): void {
     let libs = this._registry;
-    let nameLengths = libs.map((item) => get(item, 'name.length'));
+    let nameLengths = libs.map((item) => get(item, 'name.length')) as number[];
     let maxNameLength = Math.max.apply(null, nameLengths);
 
     debug('-------------------------------');
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 96ebda31109..effae01b72d 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -69,7 +69,7 @@ interface MaybeHasIsDestroyed {
   @return {Object} the property value or `null`.
   @public
 */
-export function get(obj: object, keyName: string): any {
+export function get(obj: object, keyName: string): unknown {
   assert(
     `Get must be called with two arguments; an object and a property key`,
     arguments.length === 2
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index bbf7487cdce..2b84ada62e1 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -37,7 +37,7 @@ interface ExtendedObject {
   @return {Object} the passed value.
   @public
 */
-export function set<T = unknown>(obj: object, keyName: string, value: T, tolerant?: boolean): T {
+export function set<T>(obj: object, keyName: string, value: T, tolerant?: boolean): T {
   assert(
     `Set must be called with three or four arguments; an object, a property key, a value and tolerant true/false`,
     arguments.length === 3 || arguments.length === 4
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 9416aa3f249..1b466218674 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -169,7 +169,7 @@ ControllerMixin.reopen({
     deprecateTransitionMethods('controller', 'transitionToRoute');
 
     // target may be either another controller or a router
-    let target = get(this, 'target');
+    let target = get(this, 'target') as any;
     let method = target.transitionToRoute || target.transitionTo;
     return method.apply(target, prefixRouteNameArg(this, args));
   },
@@ -237,7 +237,7 @@ ControllerMixin.reopen({
   replaceRoute(...args: string[]) {
     deprecateTransitionMethods('controller', 'replaceRoute');
     // target may be either another controller or a router
-    let target = get(this, 'target');
+    let target = get(this, 'target') as any;
     let method = target.replaceRoute || target.replaceWith;
     return method.apply(target, prefixRouteNameArg(this, args));
   },
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 229be18fb78..5b7dde9d872 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -334,7 +334,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       names = (routeInfo && routeInfo['_names']) || [];
     }
 
-    let qps = get(this, '_qp.qps');
+    let qps = get(this, '_qp.qps') as any;
 
     let namePaths = new Array(names.length);
     for (let a = 0; a < names.length; ++a) {
@@ -494,7 +494,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @property _optionsForQueryParam
   */
   _optionsForQueryParam(qp: QueryParam) {
-    const queryParams = get(this, 'queryParams');
+    const queryParams = get(this, 'queryParams') as any;
     return (
       get(queryParams, qp.urlKey) ||
       get(queryParams, qp.prop) ||
@@ -1107,13 +1107,13 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     // Assign the route's controller so that it can more easily be
     // referenced in action handlers. Side effects. Side effects everywhere.
     if (!this.controller) {
-      let qp = get(this, '_qp');
-      let propNames = qp !== undefined ? get(qp, 'propertyNames') : [];
+      let qp = get(this, '_qp') as any;
+      let propNames = qp !== undefined ? (get(qp, 'propertyNames') as string[]) : [];
       addQueryParamsObservers(controller, propNames);
       this.controller = controller;
     }
 
-    let queryParams = get(this, '_qp');
+    let queryParams = get(this, '_qp') as any;
 
     let states = queryParams.states;
 
@@ -1353,7 +1353,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   model(params: {}, transition: Transition) {
     let name, sawParams, value;
-    let queryParams = get(this, '_qp.map');
+    let queryParams = get(this, '_qp.map') as any;
 
     for (let prop in params) {
       if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -1403,7 +1403,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @private
   */
   findModel(...args: any[]) {
-    return get(this, 'store').find(...args);
+    return (get(this, 'store') as any).find(...args);
   }
 
   /**
@@ -1792,7 +1792,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     let controllerName = this.controllerName || this.routeName;
     let owner = getOwner(this);
     let controller = owner.lookup<Controller>(`controller:${controllerName}`);
-    let queryParameterConfiguraton = get(this, 'queryParams');
+    let queryParameterConfiguraton = get(this, 'queryParams') as this['queryParams'];
     let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
 
     if (controller) {
@@ -1801,7 +1801,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       // merge in the query params for the route. As a mergedProperty,
       // Route#queryParams is always at least `{}`
 
-      let controllerDefinedQueryParameterConfiguration = get(controller, 'queryParams') || {};
+      let controllerDefinedQueryParameterConfiguration =
+        (get(controller, 'queryParams') as any) || {};
       let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
         controllerDefinedQueryParameterConfiguration
       );
@@ -2134,7 +2135,7 @@ function getQueryParamsFor(route: Route, state: TransitionState<Route>) {
   let params = (state['queryParamsFor'][name] = {});
 
   // Copy over all the query params for this route/controller into params hash.
-  let qps = get(route, '_qp.qps');
+  let qps = get(route, '_qp.qps') as any;
   for (let i = 0; i < qps.length; ++i) {
     // Put deserialized qp on params hash.
     let qp = qps[i];
@@ -2148,7 +2149,7 @@ function getQueryParamsFor(route: Route, state: TransitionState<Route>) {
   return params;
 }
 
-function copyDefaultValue(value: unknown[]) {
+function copyDefaultValue(value: unknown) {
   if (Array.isArray(value)) {
     return emberA(value.slice());
   }
@@ -2350,14 +2351,14 @@ Route.reopen({
     @private
    */
     queryParamsDidChange(this: Route, changed: {}, _totalPresent: unknown, removed: {}) {
-      let qpMap = get(this, '_qp').map;
+      let qpMap = (get(this, '_qp') as any).map;
 
       let totalChanged = Object.keys(changed).concat(Object.keys(removed));
       for (let i = 0; i < totalChanged.length; ++i) {
         let qp = qpMap[totalChanged[i]];
         if (
           qp &&
-          get(this._optionsForQueryParam(qp), 'refreshModel') &&
+          (get(this._optionsForQueryParam(qp), 'refreshModel') as boolean) &&
           this._router.currentState
         ) {
           this.refresh();
@@ -2459,7 +2460,7 @@ Route.reopen({
       }
 
       qpMeta.qps.forEach((qp: QueryParam) => {
-        let routeQpMeta = get(qp.route, '_qp');
+        let routeQpMeta = get(qp.route, '_qp') as any;
         let finalizedController = qp.route.controller;
         finalizedController['_qpDelegate'] = get(routeQpMeta, 'states.active');
       });
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index b4a904b4b3a..8d1081684a1 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -301,7 +301,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   }
 
   _initRouterJs(): void {
-    let location = get(this, 'location');
+    let location = get(this, 'location') as IEmberLocation;
     let router = this;
     let owner = getOwner(this);
     let seen = Object.create(null);
@@ -454,7 +454,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       replaceURL(url: string) {
         if (location.replaceURL) {
           let doReplaceURL = () => {
-            location.replaceURL(url);
+            location.replaceURL!(url);
             set(router, 'currentURL', url);
           };
           once(doReplaceURL);
@@ -534,9 +534,9 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   */
   startRouting() {
     if (this.setupRouter()) {
-      let initialURL = get(this, 'initialURL');
+      let initialURL = get(this, 'initialURL') as string | undefined;
       if (initialURL === undefined) {
-        initialURL = get(this, 'location').getURL();
+        initialURL = (get(this, 'location') as IEmberLocation).getURL();
       }
       let initialTransition = this.handleURL(initialURL);
       if (initialTransition && initialTransition.error) {
@@ -552,7 +552,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     this._didSetupRouter = true;
     this._setupLocation();
 
-    let location = get(this, 'location');
+    let location = get(this, 'location') as IEmberLocation;
 
     // Allow the Location class to cancel the router setup while it refreshes
     // the page
@@ -1099,7 +1099,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   */
   _getQPMeta(routeInfo: PrivateRouteInfo) {
     let route = routeInfo.route;
-    return route && get(route, '_qp');
+    return route && (get(route, '_qp') as any);
   }
 
   /**
@@ -1856,7 +1856,7 @@ EmberRouter.reopen({
 
   // FIXME: Does this need to be overrideable via extend?
   url: computed(function (this: Router<Route>) {
-    let location = get(this, 'location');
+    let location = get(this, 'location') as string | IEmberLocation;
 
     if (typeof location === 'string') {
       return undefined;
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index c58296a1496..2f5e1e547e1 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -1,18 +1,12 @@
 export let action: MethodDecorator;
 
-export { computed, defineProperty } from '@ember/-internals/metal';
-
-// NOTE: We don't properly handle types for CPs so we just return unknown for gets.
-export function get(obj: any, key: string): unknown;
-export function getProperties<L extends string[]>(
-  obj: any,
-  list: L
-): { [Key in L[number]]: unknown };
-export function getProperties<L extends string[]>(
-  obj: any,
-  ...list: L
-): { [Key in L[number]]: unknown };
-export function set<T>(obj: any, key: string, value: T): T;
-export function setProperties<T extends Record<string, any>>(obj: any, hash: T): T;
+export {
+  computed,
+  defineProperty,
+  get,
+  getProperties,
+  set,
+  setProperties,
+} from '@ember/-internals/metal';
 
 export { default } from '@ember/-internals/runtime/types/index';

From eeb2fe25bf4d91abbb5555787594a57066a06cdd Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 08:56:05 -0700
Subject: [PATCH 0787/1405] Remove extra exports

---
 packages/@ember/-internals/runtime/index.d.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index 265d167b589..710dec692ed 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -5,15 +5,6 @@ import Evented from './types/evented';
 
 export const TargetActionSupport: any;
 export function isArray(arr: any): boolean;
-export const ControllerMixin: any;
-
-export function deprecatingAlias(
-  name: string,
-  opts: {
-    id: string;
-    until: string;
-  }
-): any;
 
 // The public version doesn't export some deprecated methods.
 // However, these are still used internally. Returning `any` is

From 4823e99088854498df6727b48e33d104a127906c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 08:57:36 -0700
Subject: [PATCH 0788/1405] Add types for `copy`, directly export
 object/internals types

---
 packages/@ember/-internals/runtime/index.d.ts         | 1 +
 packages/@ember/-internals/runtime/lib/copy.d.ts      | 3 +++
 packages/@ember/object/{internals.js => internals.ts} | 0
 packages/@ember/object/types/internals.d.ts           | 2 --
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/copy.d.ts
 rename packages/@ember/object/{internals.js => internals.ts} (100%)
 delete mode 100644 packages/@ember/object/types/internals.d.ts

diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index 710dec692ed..c4e607dab8c 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -2,6 +2,7 @@ import { EmberClassConstructor, Objectify } from './types/-private/types';
 import PublicCoreObject from './types/core';
 import PublicEmberObject from './types/index';
 import Evented from './types/evented';
+export { default as copy } from './lib/copy';
 
 export const TargetActionSupport: any;
 export function isArray(arr: any): boolean;
diff --git a/packages/@ember/-internals/runtime/lib/copy.d.ts b/packages/@ember/-internals/runtime/lib/copy.d.ts
new file mode 100644
index 00000000000..610262eb251
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/copy.d.ts
@@ -0,0 +1,3 @@
+declare function copy<T>(obj: T, deep: true): T;
+declare function copy(obj: any, deep?: boolean): any;
+export default copy;
diff --git a/packages/@ember/object/internals.js b/packages/@ember/object/internals.ts
similarity index 100%
rename from packages/@ember/object/internals.js
rename to packages/@ember/object/internals.ts
diff --git a/packages/@ember/object/types/internals.d.ts b/packages/@ember/object/types/internals.d.ts
deleted file mode 100644
index 8093f908605..00000000000
--- a/packages/@ember/object/types/internals.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
-export { guidFor } from '@ember/-internals/utils';

From d99fe552ae5ac6d1728b4fa4485b1e2740220bde Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 08:58:03 -0700
Subject: [PATCH 0789/1405] Refactor types from internal, improves public types
 for mixins

---
 .../@ember/-internals/metal/lib/events.ts     |  6 ++-
 packages/@ember/-internals/metal/lib/mixin.ts | 17 ++++++++
 packages/@ember/-internals/runtime/index.d.ts | 33 +++------------
 .../{types => lib/mixins}/evented.d.ts        |  3 +-
 .../{types => lib/mixins}/observable.d.ts     | 11 +++--
 .../core.d.ts => lib/system/core_object.d.ts} | 27 +++++++++++-
 .../index.d.ts => lib/system/object.d.ts}     |  9 ++--
 .../runtime/types/-private/types.d.ts         | 41 -------------------
 packages/@ember/object/{core.js => core.ts}   |  0
 packages/@ember/object/index.d.ts             |  2 +-
 packages/@ember/object/{mixin.js => mixin.ts} |  0
 .../object/{observable.js => observable.ts}   |  0
 .../object/type-tests/core/index.test.ts      |  6 +--
 .../object/type-tests/ember-object.test.ts    |  6 +--
 .../object/type-tests/evented/index.test.ts   |  7 ++++
 .../object/type-tests/evented/on.test.ts      | 15 +++++++
 .../object/type-tests/mixin/index.test.ts     |  9 ++++
 .../type-tests/observable/index.test.ts       |  3 +-
 packages/@ember/object/types/core.d.ts        |  1 -
 packages/@ember/object/types/observable.d.ts  |  2 -
 20 files changed, 108 insertions(+), 90 deletions(-)
 rename packages/@ember/-internals/runtime/{types => lib/mixins}/evented.d.ts (97%)
 rename packages/@ember/-internals/runtime/{types => lib/mixins}/observable.d.ts (90%)
 rename packages/@ember/-internals/runtime/{types/core.d.ts => lib/system/core_object.d.ts} (75%)
 rename packages/@ember/-internals/runtime/{types/index.d.ts => lib/system/object.d.ts} (83%)
 delete mode 100644 packages/@ember/-internals/runtime/types/-private/types.d.ts
 rename packages/@ember/object/{core.js => core.ts} (100%)
 rename packages/@ember/object/{mixin.js => mixin.ts} (100%)
 rename packages/@ember/object/{observable.js => observable.ts} (100%)
 create mode 100644 packages/@ember/object/type-tests/evented/index.test.ts
 create mode 100644 packages/@ember/object/type-tests/evented/on.test.ts
 create mode 100644 packages/@ember/object/type-tests/mixin/index.test.ts
 delete mode 100644 packages/@ember/object/types/core.d.ts
 delete mode 100644 packages/@ember/object/types/observable.d.ts

diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index d77e7150be7..9875bbb4a47 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -203,8 +203,10 @@ export function hasListeners(obj: object, eventName: string): boolean {
   @return {Function} the listener function, passed as last argument to on(...)
   @public
 */
-export function on(...args: Array<string | Function>): Function {
-  let func = args.pop() as Function;
+export function on<T extends (...args: any[]) => any>(
+  ...args: [...eventNames: string[], func: T]
+): T {
+  let func = args.pop();
   let events = args as string[];
 
   assert('on expects function as last argument', typeof func === 'function');
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 3538734f262..2173c14420a 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -525,13 +525,22 @@ const MIXINS = new _WeakSet();
   @public
 */
 export default class Mixin {
+  /** @internal */
   declare static _disableDebugSeal?: boolean;
 
+  /** @internal */
   mixins: Mixin[] | undefined;
+
+  /** @internal */
   properties: { [key: string]: any } | undefined;
+
+  /** @internal */
   ownerConstructor: any;
+
+  /** @internal */
   _without: any[] | undefined;
 
+  /** @internal */
   constructor(mixins: Mixin[] | undefined, properties?: { [key: string]: any }) {
     MIXINS.add(this);
     this.properties = extractAccessors(properties);
@@ -572,6 +581,7 @@ export default class Mixin {
 
   // returns the mixins currently applied to the specified object
   // TODO: Make `mixin`
+  /** @internal */
   static mixins(obj: object): Mixin[] {
     let meta = peekMeta(obj);
     let ret: Mixin[] = [];
@@ -593,6 +603,7 @@ export default class Mixin {
     @method reopen
     @param arguments*
     @private
+    @internal
   */
   reopen(...args: any[]) {
     if (args.length === 0) {
@@ -616,6 +627,7 @@ export default class Mixin {
     @param obj
     @return applied object
     @private
+    @internal
   */
   apply(obj: object, _hideKeys = false) {
     // Ember.NativeArray is a normal Ember.Mixin that we mix into `Array.prototype` when prototype extensions are enabled
@@ -626,6 +638,7 @@ export default class Mixin {
     return applyMixin(obj, [this], _hideKeys);
   }
 
+  /** @internal */
   applyPartial(obj: object) {
     return applyMixin(obj, [this]);
   }
@@ -635,6 +648,7 @@ export default class Mixin {
     @param obj
     @return {Boolean}
     @private
+    @internal
   */
   detect(obj: any): boolean {
     if (typeof obj !== 'object' || obj === null) {
@@ -650,16 +664,19 @@ export default class Mixin {
     return meta.hasMixin(this);
   }
 
+  /** @internal */
   without(...args: any[]) {
     let ret = new Mixin([this]);
     ret._without = args;
     return ret;
   }
 
+  /** @internal */
   keys() {
     return _keys(this);
   }
 
+  /** @internal */
   toString() {
     return '(unknown mixin)';
   }
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
index c4e607dab8c..3efcfebfe81 100644
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ b/packages/@ember/-internals/runtime/index.d.ts
@@ -1,41 +1,20 @@
-import { EmberClassConstructor, Objectify } from './types/-private/types';
-import PublicCoreObject from './types/core';
-import PublicEmberObject from './types/index';
-import Evented from './types/evented';
+import CoreObject from './lib/system/core_object';
+import Object from './lib/system/object';
+import Evented from './lib/mixins/evented';
 export { default as copy } from './lib/copy';
 
 export const TargetActionSupport: any;
 export function isArray(arr: any): boolean;
 
-// The public version doesn't export some deprecated methods.
-// However, these are still used internally. Returning `any` is
-// very loose, but it's essentially what was here before.
-export class CoreObject extends PublicCoreObject {
-  static extend<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    ...args: any[]
-  ): Objectify<Statics> & EmberClassConstructor<Instance>;
-  static reopen(...args: any[]): any;
-  static reopenClass(...args: any[]): any;
-}
+export { CoreObject, Object };
 
 export const FrameworkObject: any;
 
-// The public version doesn't export some deprecated methods.
-// However, these are still used internally. Returning `any` is
-// very loose, but it's essentially what was here before.
-export class Object extends PublicEmberObject {
-  static extend<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    ...args: any[]
-  ): Objectify<Statics> & EmberClassConstructor<Instance>;
-  static reopen(...args: any[]): any;
-  static reopenClass(...args: any[]): any;
-}
-
 export function _contentFor(proxy: any): any;
 
 export const A: any;
 export const ActionHandler: any;
 export { Evented };
 export function typeOf(obj: any): string;
+
+export { default as Observable } from './lib/mixins/observable';
diff --git a/packages/@ember/-internals/runtime/types/evented.d.ts b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
similarity index 97%
rename from packages/@ember/-internals/runtime/types/evented.d.ts
rename to packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
index dbf86d62a8f..7bf3d4485fa 100644
--- a/packages/@ember/-internals/runtime/types/evented.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
@@ -1,4 +1,4 @@
-import Mixin from '../../metal/lib/mixin';
+import Mixin from '../../types/mixin';
 
 /**
  * This mixin allows for Ember objects to subscribe to and emit events.
@@ -44,5 +44,6 @@ interface Evented {
    */
   has(name: string): boolean;
 }
+
 declare const Evented: Mixin;
 export default Evented;
diff --git a/packages/@ember/-internals/runtime/types/observable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
similarity index 90%
rename from packages/@ember/-internals/runtime/types/observable.d.ts
rename to packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
index ae00e128d11..6507deb533e 100644
--- a/packages/@ember/-internals/runtime/types/observable.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
@@ -1,9 +1,13 @@
-import { ObserverMethod } from './-private/types';
+import { Mixin } from '@ember/-internals/metal';
+
+export type ObserverMethod<Target, Sender> =
+  | keyof Target
+  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
 
 /**
  * This mixin provides properties and property observing functionality, core features of the Ember object model.
  */
-interface Observable {
+export interface Observable {
   /**
    * Retrieves the value of a property from the object.
    */
@@ -69,5 +73,6 @@ interface Observable {
    */
   cacheFor<K extends keyof this>(key: K): unknown;
 }
-// declare const Observable: Mixin<Observable, CoreObject>;
+
+declare const Observable: Mixin;
 export default Observable;
diff --git a/packages/@ember/-internals/runtime/types/core.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
similarity index 75%
rename from packages/@ember/-internals/runtime/types/core.d.ts
rename to packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index 304747df018..b59a2961038 100644
--- a/packages/@ember/-internals/runtime/types/core.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -1,10 +1,33 @@
-import { EmberClassConstructor, EmberInstanceArguments, Objectify } from './-private/types';
+/**
+ * Used to infer the type of ember classes of type `T`.
+ *
+ * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
+ *
+ * The single-arg constructor is required by the typescript compiler.
+ * The multi-arg constructor is included for better ergonomics.
+ *
+ * Implementation is carefully chosen for the reasons described in
+ * https://github.com/typed-ember/ember-typings/pull/29
+ */
+type EmberClassConstructor<T> = (new (properties?: object) => T) & (new (...args: any[]) => T);
 
 type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
   ? T & MergeArray<Rest>
   : unknown; // TODO: Is this correct?
 
 export default class CoreObject {
+  /** @internal */
+  static extend<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...args: any[]
+  ): Readonly<Statics> & EmberClassConstructor<Instance>;
+
+  /** @internal */
+  static reopen(...args: any[]): any;
+
+  /** @internal */
+  static reopenClass(...args: any[]): any;
+
   /**
    * CoreObject constructor takes initial object properties as an argument.
    */
@@ -68,7 +91,7 @@ export default class CoreObject {
   static detect<Statics, Instance>(
     this: Statics & EmberClassConstructor<Instance>,
     obj: any
-  ): obj is Objectify<Statics> & EmberClassConstructor<Instance>;
+  ): obj is Readonly<Statics> & EmberClassConstructor<Instance>;
 
   static detectInstance<Instance>(this: EmberClassConstructor<Instance>, obj: any): obj is Instance;
 
diff --git a/packages/@ember/-internals/runtime/types/index.d.ts b/packages/@ember/-internals/runtime/lib/system/object.d.ts
similarity index 83%
rename from packages/@ember/-internals/runtime/types/index.d.ts
rename to packages/@ember/-internals/runtime/lib/system/object.d.ts
index 44c3a523acd..579c8162e82 100644
--- a/packages/@ember/-internals/runtime/types/index.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.d.ts
@@ -1,6 +1,5 @@
-import { ObserverMethod } from './-private/types';
-import CoreObject from './core';
-import Observable from './observable';
+import CoreObject from './core_object';
+import { Observable, ObserverMethod } from '../mixins/observable';
 
 export default class Object extends CoreObject implements Observable {
   get(key: string): unknown;
@@ -22,3 +21,7 @@ export default class Object extends CoreObject implements Observable {
   toggleProperty(keyName: keyof this): boolean;
   cacheFor<K extends keyof this>(key: K): unknown;
 }
+
+export class FrameworkObject extends CoreObject {
+  _debugContainerKey: string | undefined;
+}
diff --git a/packages/@ember/-internals/runtime/types/-private/types.d.ts b/packages/@ember/-internals/runtime/types/-private/types.d.ts
deleted file mode 100644
index 2d58b2fa56a..00000000000
--- a/packages/@ember/-internals/runtime/types/-private/types.d.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Map type `T` to a plain object hash with the identity mapping.
- *
- * Discards any additional object identity like the ability to `new()` up the class.
- * The `new()` capability is added back later by merging `EmberClassConstructor<T>`
- *
- * Implementation is carefully chosen for the reasons described in
- * https://github.com/typed-ember/ember-typings/pull/29
- */
-export type Objectify<T> = Readonly<T>;
-
-export type ExtractPropertyNamesOfType<T, S> = {
-  [K in keyof T]: T[K] extends S ? K : never;
-}[keyof T];
-
-/**
- * Used to infer the type of ember classes of type `T`.
- *
- * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
- *
- * The single-arg constructor is required by the typescript compiler.
- * The multi-arg constructor is included for better ergonomics.
- *
- * Implementation is carefully chosen for the reasons described in
- * https://github.com/typed-ember/ember-typings/pull/29
- */
-export type EmberClassConstructor<T> = (new (properties?: object) => T) &
-  (new (...args: any[]) => T);
-
-/**
- * Check that any arguments to `create()` match the type's properties.
- *
- * Accept any additional properties and add merge them into the instance.
- */
-export type EmberInstanceArguments<T> = Partial<T> & {
-  [key: string]: any;
-};
-
-export type ObserverMethod<Target, Sender> =
-  | keyof Target
-  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
diff --git a/packages/@ember/object/core.js b/packages/@ember/object/core.ts
similarity index 100%
rename from packages/@ember/object/core.js
rename to packages/@ember/object/core.ts
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index 2f5e1e547e1..afc53c8ef24 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -9,4 +9,4 @@ export {
   setProperties,
 } from '@ember/-internals/metal';
 
-export { default } from '@ember/-internals/runtime/types/index';
+export { Object as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/mixin.js b/packages/@ember/object/mixin.ts
similarity index 100%
rename from packages/@ember/object/mixin.js
rename to packages/@ember/object/mixin.ts
diff --git a/packages/@ember/object/observable.js b/packages/@ember/object/observable.ts
similarity index 100%
rename from packages/@ember/object/observable.js
rename to packages/@ember/object/observable.ts
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index 03e0b7c988f..d18dfb9de44 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -27,11 +27,11 @@ const co3 = CoreObject.create({ foo: '123', bar: 456 });
 expectTypeOf(co3.foo).toEqualTypeOf<string>();
 expectTypeOf(co3.bar).toEqualTypeOf<number>();
 
-// @ts-expect-error extend is no longer available in the public API
+// NOTE: This is marked as @internal and will not be publicly available
 CoreObject.extend({ baz: 6 });
 
-// @ts-expect-error reopen is no longer available in the public API
+// NOTE: This is marked as @internal and will not be publicly available
 CoreObject.reopen({ baz: 6 });
 
-// @ts-expect-error reopenClass is no longer available in the public API
+// NOTE: This is marked as @internal and will not be publicly available
 CoreObject.reopenClass({ baz: 6 });
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index ce781eeec4c..4b54d427b4a 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -74,11 +74,11 @@ expectTypeOf(p2b.firstName).toEqualTypeOf<string>();
 const p2c = Person.create({}, {}, { firstName: 'string' });
 expectTypeOf(p2c.firstName).toEqualTypeOf<string>();
 
-// @ts-expect-error extend is no longer available in the public API
+// NOTE: This is marked as @internal and will not be publicly available
 Person.extend({ fullName: 6 });
 
-// @ts-expect-error reopen is no longer available in the public API
+// NOTE: This is marked as @internal and will not be publicly available
 Person.reopen({ fullName: 6 });
 
-// @ts-expect-error reopenClass is no longer available in the public API
+// NOTE: This is marked as @internal and will not be publicly available
 Person.reopenClass({ fullName: 6 });
diff --git a/packages/@ember/object/type-tests/evented/index.test.ts b/packages/@ember/object/type-tests/evented/index.test.ts
new file mode 100644
index 00000000000..7daf6dbf730
--- /dev/null
+++ b/packages/@ember/object/type-tests/evented/index.test.ts
@@ -0,0 +1,7 @@
+import { expectTypeOf } from 'expect-type';
+
+import Mixin from '@ember/object/mixin';
+import Evented from '@ember/object/evented';
+
+// A very naive test that at least makes sure we can import this
+expectTypeOf<typeof Evented>().toMatchTypeOf<Mixin>();
diff --git a/packages/@ember/object/type-tests/evented/on.test.ts b/packages/@ember/object/type-tests/evented/on.test.ts
new file mode 100644
index 00000000000..3bb191110a9
--- /dev/null
+++ b/packages/@ember/object/type-tests/evented/on.test.ts
@@ -0,0 +1,15 @@
+import { on } from '@ember/object/evented';
+import { sendEvent } from '@ember/object/events';
+import { expectTypeOf } from 'expect-type';
+
+class Job {
+  logCompleted = on('completed', function () {
+    console.log('Job completed!');
+  });
+}
+
+let job = new Job();
+
+sendEvent(job, 'completed'); // Logs 'Job completed!'
+
+expectTypeOf(job.logCompleted).toEqualTypeOf<() => void>();
diff --git a/packages/@ember/object/type-tests/mixin/index.test.ts b/packages/@ember/object/type-tests/mixin/index.test.ts
new file mode 100644
index 00000000000..0ad9cc6d0de
--- /dev/null
+++ b/packages/@ember/object/type-tests/mixin/index.test.ts
@@ -0,0 +1,9 @@
+import { expectTypeOf } from 'expect-type';
+
+import Mixin from '@ember/object/mixin';
+
+let newMixin = Mixin.create({
+  foo: 'bar',
+});
+
+expectTypeOf(newMixin).toMatchTypeOf<Mixin>();
diff --git a/packages/@ember/object/type-tests/observable/index.test.ts b/packages/@ember/object/type-tests/observable/index.test.ts
index 8eb57f8032d..b07c82ecc88 100644
--- a/packages/@ember/object/type-tests/observable/index.test.ts
+++ b/packages/@ember/object/type-tests/observable/index.test.ts
@@ -1,6 +1,7 @@
 import { expectTypeOf } from 'expect-type';
 
+import Mixin from '@ember/object/mixin';
 import Observable from '@ember/object/observable';
 
 // A very naive test that at least makes sure we can import this
-expectTypeOf<Observable['get']>().toMatchTypeOf<Function>();
+expectTypeOf<typeof Observable>().toMatchTypeOf<Mixin>();
diff --git a/packages/@ember/object/types/core.d.ts b/packages/@ember/object/types/core.d.ts
deleted file mode 100644
index 652f234bf8b..00000000000
--- a/packages/@ember/object/types/core.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from '../../-internals/runtime/types/core';
diff --git a/packages/@ember/object/types/observable.d.ts b/packages/@ember/object/types/observable.d.ts
deleted file mode 100644
index 9f633dd12fd..00000000000
--- a/packages/@ember/object/types/observable.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import Observable from '@ember/-internals/runtime/types/observable';
-export default Observable;

From 4c9a7da54e6187df7abf98b3f6a75ddd63b563a4 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 09:32:49 -0700
Subject: [PATCH 0790/1405] Improve JS type handling

---
 tsconfig.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 8e2f30e6958..5f84ec9e4a5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,7 +21,9 @@
 
     "newLine": "LF",
     "noEmit": true,
-    "allowJs": false,
+
+    "allowJs": true,
+    "checkJs": false,
 
     "paths": {
       "@glimmer/*": ["../node_modules/@glimmer/*"],

From 17d158178ebd23e538c4d1d34eb462ab3e9164b2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 11:44:31 -0700
Subject: [PATCH 0791/1405] Prepare for public @ember/object `observer` types

---
 packages/@ember/-internals/metal/lib/mixin.ts | 26 +++++++++++------
 packages/@ember/object/index.d.ts             |  1 +
 .../@ember/object/type-tests/observer.test.ts | 28 +++++++++++++++++++
 3 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 packages/@ember/object/type-tests/observer.test.ts

diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 2173c14420a..7dcaad98095 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -762,7 +762,11 @@ function _keys(mixin: Mixin, ret = new Set(), seen = new Set()) {
 // OBSERVER HELPER
 //
 
-type ObserverDefinition = { dependentKeys: string[]; fn: Function; sync: boolean };
+type ObserverDefinition<T extends (...args: any[]) => any> = {
+  dependentKeys: string[];
+  fn: T;
+  sync: boolean;
+};
 
 /**
   Specify a method that observes property changes.
@@ -789,9 +793,11 @@ type ObserverDefinition = { dependentKeys: string[]; fn: Function; sync: boolean
   @public
   @static
 */
-export function observer(...args: (string | Function)[]): Function;
-export function observer(definition: ObserverDefinition): Function;
-export function observer(...args: (string | Function | ObserverDefinition)[]) {
+export function observer<T extends (...args: any[]) => any>(
+  ...args:
+    | [propertyName: string, ...additionalPropertyNames: string[], func: T]
+    | [ObserverDefinition<T>]
+): T {
   let funcOrDef = args.pop();
 
   assert(
@@ -799,16 +805,18 @@ export function observer(...args: (string | Function | ObserverDefinition)[]) {
     typeof funcOrDef === 'function' || (typeof funcOrDef === 'object' && funcOrDef !== null)
   );
 
-  let func, dependentKeys, sync;
+  let func: T;
+  let dependentKeys: string[];
+  let sync: boolean;
 
   if (typeof funcOrDef === 'function') {
     func = funcOrDef;
-    dependentKeys = args;
+    dependentKeys = args as string[];
     sync = !ENV._DEFAULT_ASYNC_OBSERVERS;
   } else {
-    func = (funcOrDef as ObserverDefinition).fn;
-    dependentKeys = (funcOrDef as ObserverDefinition).dependentKeys;
-    sync = (funcOrDef as ObserverDefinition).sync;
+    func = (funcOrDef as ObserverDefinition<T>).fn;
+    dependentKeys = (funcOrDef as ObserverDefinition<T>).dependentKeys;
+    sync = (funcOrDef as ObserverDefinition<T>).sync;
   }
 
   assert('observer called without a function', typeof func === 'function');
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index afc53c8ef24..233d7828116 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -5,6 +5,7 @@ export {
   defineProperty,
   get,
   getProperties,
+  observer,
   set,
   setProperties,
 } from '@ember/-internals/metal';
diff --git a/packages/@ember/object/type-tests/observer.test.ts b/packages/@ember/object/type-tests/observer.test.ts
new file mode 100644
index 00000000000..8be9df0a99e
--- /dev/null
+++ b/packages/@ember/object/type-tests/observer.test.ts
@@ -0,0 +1,28 @@
+import { observer } from '@ember/object';
+
+import { expectTypeOf } from 'expect-type';
+
+let definition = {
+  dependentKeys: ['value1', 'value2', 'value3'],
+  fn: () => {},
+  sync: true,
+};
+
+class Foo {
+  valueObserver = observer('value', function () {
+    // Executes whenever the "value" property changes
+  });
+
+  definitionObserver = observer(definition);
+
+  // @ts-expect-error Requires at least one key
+  noKeysObserver = observer(() => {});
+
+  // @ts-expect-error Doesn't allow keys and definition
+  extraKeysObserver = observer('extraKey', definition);
+}
+
+let foo = new Foo();
+
+expectTypeOf(foo.valueObserver).toEqualTypeOf<() => void>();
+expectTypeOf(foo.definitionObserver).toEqualTypeOf<() => void>();

From d8ddd9855348f7212f14a6df9b21bd6d115ffc4c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 11:49:52 -0700
Subject: [PATCH 0792/1405] Prepare for public @ember/object `trySet` types

---
 .../@ember/-internals/metal/lib/property_set.ts  |  2 +-
 packages/@ember/object/index.d.ts                |  1 +
 .../@ember/object/type-tests/try-set.test.ts     | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 packages/@ember/object/type-tests/try-set.test.ts

diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 2b84ada62e1..54e089bb22a 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -143,6 +143,6 @@ function _setPath(root: object, path: string, value: any, tolerant?: boolean): a
   @param {Object} value The value to set
   @public
 */
-export function trySet(root: object, path: string, value: any): any {
+export function trySet<T>(root: object, path: string, value: T): T {
   return set(root, path, value, true);
 }
diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
index 233d7828116..d6c9b69cf6c 100644
--- a/packages/@ember/object/index.d.ts
+++ b/packages/@ember/object/index.d.ts
@@ -8,6 +8,7 @@ export {
   observer,
   set,
   setProperties,
+  trySet,
 } from '@ember/-internals/metal';
 
 export { Object as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/type-tests/try-set.test.ts b/packages/@ember/object/type-tests/try-set.test.ts
new file mode 100644
index 00000000000..90031126bab
--- /dev/null
+++ b/packages/@ember/object/type-tests/try-set.test.ts
@@ -0,0 +1,16 @@
+import { trySet } from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+
+let obj = { name: 'Zoey' };
+
+let result = trySet(obj, 'contacts.twitter', '@emberjs');
+expectTypeOf(result).toEqualTypeOf<string>();
+
+// @ts-expect-error requires a value
+trySet(obj, 'contacts.twitter');
+
+// @ts-expect-error requires a key
+trySet(obj);
+
+// @ts-expect-error requires an object
+trySet('contacts.twitter', '@emberjs');

From c2814c0eff10ecb0060aa726fea80595e248d4b0 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 12:02:24 -0700
Subject: [PATCH 0793/1405] Use internal version of alias and expandProperties

---
 packages/@ember/object/computed.d.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@ember/object/computed.d.ts b/packages/@ember/object/computed.d.ts
index 4461a9709ae..2eb67512fcd 100644
--- a/packages/@ember/object/computed.d.ts
+++ b/packages/@ember/object/computed.d.ts
@@ -1,6 +1,6 @@
 import { DeprecationOptions } from '@ember/debug';
 
-export function alias(dependentKey: string): PropertyDecorator;
+export { alias, expandProperties } from '@ember/-internals/metal';
 
 export function and(dependentKey: string, ...additionalDependentKeys: string[]): PropertyDecorator;
 
@@ -20,8 +20,6 @@ export function empty(dependentKey: string): PropertyDecorator;
 
 export function equal(dependentKey: string, value: any): PropertyDecorator;
 
-export function expandProperties(pattern: string, callback: (expanded: string) => void): void;
-
 export function filter(
   dependentKey: string,
   callback: (value: unknown, index: number, array: unknown[]) => boolean

From 76fb14d4c9c012394a65dc6fe278cedc89c88970 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 12:19:05 -0700
Subject: [PATCH 0794/1405] Improve @ember/object type tests and exposure

---
 .../runtime/lib/system/core_object.d.ts       |  9 ++++
 .../-internals/runtime/lib/system/object.d.ts | 15 +++++++
 .../object/type-tests/ember-object.test.ts    | 42 +++++++++++++++++++
 .../object/type-tests/observers/index.test.ts | 14 +------
 4 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index b59a2961038..e0d324fe1f6 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -33,6 +33,7 @@ export default class CoreObject {
    */
   constructor(properties?: object);
 
+  /** @internal */
   _super(...args: any[]): any;
 
   /**
@@ -88,23 +89,31 @@ export default class CoreObject {
     ...args: Args
   ): InstanceType<Class> & MergeArray<Args>;
 
+  /** @internal */
   static detect<Statics, Instance>(
     this: Statics & EmberClassConstructor<Instance>,
     obj: any
   ): obj is Readonly<Statics> & EmberClassConstructor<Instance>;
 
+  /** @internal */
   static detectInstance<Instance>(this: EmberClassConstructor<Instance>, obj: any): obj is Instance;
 
   /**
    * Iterate over each computed property for the class, passing its name and any
    * associated metadata (see metaForProperty) to the callback.
+   * @internal
    */
   static eachComputedProperty(callback: (...args: any[]) => any, binding: {}): void;
   /**
    * Returns the original hash that was passed to meta().
    * @param key property name
+   * @internal
    */
   static metaForProperty(key: string): {};
+
+  /** @internal */
   static isClass: boolean;
+
+  /** @internal */
   static isMethod: boolean;
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/object.d.ts b/packages/@ember/-internals/runtime/lib/system/object.d.ts
index 579c8162e82..cfd92e36c12 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.d.ts
@@ -3,13 +3,23 @@ import { Observable, ObserverMethod } from '../mixins/observable';
 
 export default class Object extends CoreObject implements Observable {
   get(key: string): unknown;
+
   getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
+
   getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
+
+  /** NOT TYPE SAFE! */
   set<T>(key: string, value: T): T;
+
+  /** NOT TYPE SAFE! */
   setProperties<T extends Record<string, any>>(hash: T): T;
+
   notifyPropertyChange(keyName: string): this;
+
   addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+
   addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
   removeObserver<Target>(
     key: keyof this,
     target: Target,
@@ -17,8 +27,13 @@ export default class Object extends CoreObject implements Observable {
   ): this;
   removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
   incrementProperty(keyName: keyof this, increment?: number): number;
+
+  /** NOT TYPE SAFE! */
   decrementProperty(keyName: keyof this, decrement?: number): number;
+
+  /** NOT TYPE SAFE! */
   toggleProperty(keyName: keyof this): boolean;
+
   cacheFor<K extends keyof this>(key: K): unknown;
 }
 
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index 4b54d427b4a..40af9079ee0 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -42,6 +42,20 @@ expectTypeOf(p.get('firstName')).toEqualTypeOf<unknown>();
 // Also returns unknown for invalid properties
 expectTypeOf(p.get('invalid')).toEqualTypeOf<unknown>();
 
+expectTypeOf(p.incrementProperty('age')).toEqualTypeOf<number>();
+expectTypeOf(p.incrementProperty('age', 2)).toEqualTypeOf<number>();
+// @ts-expect-error must increment by a value
+p.incrementProperty('age', 'foo');
+
+expectTypeOf(p.decrementProperty('age')).toEqualTypeOf<number>();
+expectTypeOf(p.decrementProperty('age', 2)).toEqualTypeOf<number>();
+// @ts-expect-error must decrement by a value
+p.decrementProperty('age', 'foo');
+
+expectTypeOf(p.toggleProperty('age')).toEqualTypeOf<boolean>();
+
+expectTypeOf(p.cacheFor('age')).toEqualTypeOf<unknown>();
+
 // get is not preferred for TS and only returns unknown
 let getPropertiesResult = p.getProperties('firstName', 'lastName', 'invalid');
 expectTypeOf(getPropertiesResult).toEqualTypeOf<{
@@ -65,6 +79,8 @@ expectTypeOf(setPropertiesResult.invalid).toEqualTypeOf<number>();
 // @ts-expect-error doesn't have unknown properties
 setPropertiesResult.unknown;
 
+expectTypeOf(p.notifyPropertyChange('firstName')).toEqualTypeOf(p);
+
 const p2 = Person.create({ firstName: 'string' });
 expectTypeOf(p2.firstName).toEqualTypeOf<string>();
 
@@ -82,3 +98,29 @@ Person.reopen({ fullName: 6 });
 
 // NOTE: This is marked as @internal and will not be publicly available
 Person.reopenClass({ fullName: 6 });
+
+
+class MyComponent extends EmberObject {
+  foo = 'bar';
+
+  constructor() {
+    super();
+    this.addObserver('foo', this, 'fooDidChange');
+    this.addObserver('foo', this, this.fooDidChange);
+    this.removeObserver('foo', this, 'fooDidChange');
+    this.removeObserver('foo', this, this.fooDidChange);
+    const lambda = () => {
+      this.fooDidChange(this, 'foo');
+    };
+    this.addObserver('foo', lambda);
+    this.removeObserver('foo', lambda);
+  }
+
+  fooDidChange(_sender: this, _key: string) {
+    // your code
+  }
+}
+
+const myComponent = MyComponent.create();
+myComponent.addObserver('foo', null, () => {});
+myComponent.set('foo', 'baz');
diff --git a/packages/@ember/object/type-tests/observers/index.test.ts b/packages/@ember/object/type-tests/observers/index.test.ts
index 423fd95f6ce..d9e54753ca0 100644
--- a/packages/@ember/object/type-tests/observers/index.test.ts
+++ b/packages/@ember/object/type-tests/observers/index.test.ts
@@ -1,24 +1,16 @@
-import EmberObject from '@ember/object';
 import { removeObserver, addObserver } from '@ember/object/observers';
 
-class MyComponent extends EmberObject {
+class MyComponent {
   foo = 'bar';
 
   constructor() {
-    super();
-    this.addObserver('foo', this, 'fooDidChange');
-    this.addObserver('foo', this, this.fooDidChange);
     addObserver(this, 'foo', this, 'fooDidChange');
     addObserver(this, 'foo', this, this.fooDidChange);
-    this.removeObserver('foo', this, 'fooDidChange');
-    this.removeObserver('foo', this, this.fooDidChange);
     removeObserver(this, 'foo', this, 'fooDidChange');
     removeObserver(this, 'foo', this, this.fooDidChange);
     const lambda = () => {
       this.fooDidChange(this, 'foo');
     };
-    this.addObserver('foo', lambda);
-    this.removeObserver('foo', lambda);
     addObserver(this, 'foo', lambda);
     removeObserver(this, 'foo', lambda);
   }
@@ -28,6 +20,4 @@ class MyComponent extends EmberObject {
   }
 }
 
-const myComponent = MyComponent.create();
-myComponent.addObserver('foo', null, () => {});
-myComponent.set('foo', 'baz');
+new MyComponent();

From 09bc358a74796227a6b2952bc4b0ca865409e634 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 28 May 2021 12:29:10 -0700
Subject: [PATCH 0795/1405] Mark more types as @internal

---
 packages/@ember/-internals/meta/lib/meta.ts   | 39 +++++++++++++++++++
 .../@ember/-internals/metal/lib/computed.ts   |  2 +
 .../-internals/runtime/lib/system/object.d.ts |  1 +
 3 files changed, 42 insertions(+)

diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index df0086d1f91..72b8d0ff433 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -86,22 +86,36 @@ type Listener = StringListener | FunctionListener;
 let currentListenerVersion = 1;
 
 export class Meta {
+  /** @internal */
   _descriptors: Map<string, any> | undefined;
+  /** @internal */
   _mixins: any | undefined;
+  /** @internal */
   _isInit: boolean;
+  /** @internal */
   _lazyChains: ObjMap<[UpdatableTag, unknown][]> | undefined;
+  /** @internal */
   _values: ObjMap<unknown> | undefined;
+  /** @internal */
   _revisions: ObjMap<Revision> | undefined;
+  /** @internal */
   source: object;
+  /** @internal */
   proto: object | undefined;
+  /** @internal */
   _parent: Meta | undefined | null;
 
+  /** @internal */
   _listeners: Listener[] | undefined;
+  /** @internal */
   _listenersVersion = 1;
+  /** @internal */
   _inheritedEnd = -1;
+  /** @internal */
   _flattenedVersion = 0;
 
   // DEBUG
+  /** @internal */
   constructor(obj: object) {
     if (DEBUG) {
       counters!.metaInstantiated++;
@@ -124,6 +138,7 @@ export class Meta {
     this._listeners = undefined;
   }
 
+  /** @internal */
   get parent(): Meta | null {
     let parent = this._parent;
     if (parent === undefined) {
@@ -137,26 +152,32 @@ export class Meta {
     this._isInit = true;
   }
 
+  /** @internal */
   unsetInitializing() {
     this._isInit = false;
   }
 
+  /** @internal */
   isInitializing() {
     return this._isInit;
   }
 
+  /** @internal */
   isPrototypeMeta(obj: object) {
     return this.proto === this.source && this.source === obj;
   }
 
+  /** @internal */
   _getOrCreateOwnMap(key: string) {
     return this[key] || (this[key] = Object.create(null));
   }
 
+  /** @internal */
   _getOrCreateOwnSet(key: string) {
     return this[key] || (this[key] = new Set());
   }
 
+  /** @internal */
   _findInheritedMap(key: string, subkey: string): any | undefined {
     let pointer: Meta | null = this;
     while (pointer !== null) {
@@ -171,6 +192,7 @@ export class Meta {
     }
   }
 
+  /** @internal */
   _hasInInheritedSet(key: string, value: any) {
     let pointer: Meta | null = this;
     while (pointer !== null) {
@@ -183,30 +205,35 @@ export class Meta {
     return false;
   }
 
+  /** @internal */
   valueFor(key: string): unknown {
     let values = this._values;
 
     return values !== undefined ? values[key] : undefined;
   }
 
+  /** @internal */
   setValueFor(key: string, value: unknown) {
     let values = this._getOrCreateOwnMap('_values');
 
     values[key] = value;
   }
 
+  /** @internal */
   revisionFor(key: string): Revision | undefined {
     let revisions = this._revisions;
 
     return revisions !== undefined ? revisions[key] : undefined;
   }
 
+  /** @internal */
   setRevisionFor(key: string, revision: Revision | undefined) {
     let revisions = this._getOrCreateOwnMap('_revisions');
 
     revisions[key] = revision;
   }
 
+  /** @internal */
   writableLazyChainsFor(key: string): [UpdatableTag, unknown][] {
     if (DEBUG) {
       counters!.writableLazyChainsCalls++;
@@ -223,6 +250,7 @@ export class Meta {
     return chains;
   }
 
+  /** @internal */
   readableLazyChainsFor(key: string): [UpdatableTag, unknown][] | undefined {
     if (DEBUG) {
       counters!.readableLazyChainsCalls++;
@@ -237,6 +265,7 @@ export class Meta {
     return undefined;
   }
 
+  /** @internal */
   addMixin(mixin: any) {
     assert(
       isDestroyed(this.source)
@@ -250,10 +279,12 @@ export class Meta {
     set.add(mixin);
   }
 
+  /** @internal */
   hasMixin(mixin: any) {
     return this._hasInInheritedSet('_mixins', mixin);
   }
 
+  /** @internal */
   forEachMixins(fn: Function) {
     let pointer: Meta | null = this;
     let seen: Set<any> | undefined;
@@ -273,6 +304,7 @@ export class Meta {
     }
   }
 
+  /** @internal */
   writeDescriptors(subkey: string, value: any) {
     assert(
       isDestroyed(this.source)
@@ -286,15 +318,18 @@ export class Meta {
     map.set(subkey, value);
   }
 
+  /** @internal */
   peekDescriptors(subkey: string) {
     let possibleDesc = this._findInheritedMap('_descriptors', subkey);
     return possibleDesc === UNDEFINED ? undefined : possibleDesc;
   }
 
+  /** @internal */
   removeDescriptors(subkey: string) {
     this.writeDescriptors(subkey, UNDEFINED);
   }
 
+  /** @internal */
   forEachDescriptors(fn: Function) {
     let pointer: Meta | null = this;
     let seen: Set<any> | undefined;
@@ -315,6 +350,7 @@ export class Meta {
     }
   }
 
+  /** @internal */
   addToListeners(
     eventName: string,
     target: object | null,
@@ -329,6 +365,7 @@ export class Meta {
     this.pushListener(eventName, target, method, once ? ListenerKind.ONCE : ListenerKind.ADD, sync);
   }
 
+  /** @internal */
   removeFromListeners(eventName: string, target: object | null, method: Function | string): void {
     if (DEBUG) {
       counters!.removeFromListenersCalls++;
@@ -507,6 +544,7 @@ export class Meta {
     return this._listeners;
   }
 
+  /** @internal */
   matchingListeners(eventName: string): (string | boolean | object | null)[] | undefined {
     let listeners = this.flattenedListeners();
     let result;
@@ -539,6 +577,7 @@ export class Meta {
     return result;
   }
 
+  /** @internal */
   observerEvents() {
     let listeners = this.flattenedListeners();
     let result;
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 25e6d46e3f3..6da1a1c4c09 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -715,11 +715,13 @@ class ComputedDecoratorImpl<Get, Set = Get> extends Function {
 
   // TODO: Remove this when we can provide alternatives in the ecosystem to
   // addons such as ember-macro-helpers that use it.
+  /** @internal */
   get _getter() {
     return (descriptorForDecorator(this) as ComputedProperty<Get, Set>)._getter;
   }
 
   // TODO: Refactor this, this is an internal API only
+  /** @internal */
   set enumerable(value: boolean) {
     (descriptorForDecorator(this) as ComputedProperty<Get, Set>).enumerable = value;
   }
diff --git a/packages/@ember/-internals/runtime/lib/system/object.d.ts b/packages/@ember/-internals/runtime/lib/system/object.d.ts
index cfd92e36c12..7b9bf87700b 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.d.ts
@@ -38,5 +38,6 @@ export default class Object extends CoreObject implements Observable {
 }
 
 export class FrameworkObject extends CoreObject {
+  /** @internal */
   _debugContainerKey: string | undefined;
 }

From 76789a81888695ff03efa0c335d7abc7469194b8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 4 Jun 2021 09:47:24 -0700
Subject: [PATCH 0796/1405] Fix lint error

---
 packages/@ember/object/type-tests/ember-object.test.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index 40af9079ee0..91405e19494 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -99,7 +99,6 @@ Person.reopen({ fullName: 6 });
 // NOTE: This is marked as @internal and will not be publicly available
 Person.reopenClass({ fullName: 6 });
 
-
 class MyComponent extends EmberObject {
   foo = 'bar';
 

From 9354e508ee6fb0a8c2e881aab81dd4ab2e676861 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 23 Dec 2021 09:49:52 -0800
Subject: [PATCH 0797/1405] Simplify computed types

---
 .../@ember/-internals/metal/lib/computed.ts   | 118 ++++++++----------
 packages/@ember/-internals/metal/lib/mixin.ts |  24 ++--
 2 files changed, 63 insertions(+), 79 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 6da1a1c4c09..452c673ceed 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -37,36 +37,30 @@ import {
   PROPERTY_DID_CHANGE,
 } from './property_events';
 
-export type ComputedPropertyGetterFunction<T> = (this: any, key: string) => T;
-export type ComputedPropertySetterFunction<T> = (
+export type ComputedPropertyGetterFunction = (this: any, key: string) => unknown;
+export type ComputedPropertySetterFunction = (
   this: any,
   key: string,
-  newVal: T,
-  oldVal: T | undefined
-) => T;
+  newVal: unknown,
+  oldVal: unknown
+) => unknown;
 
-export interface ComputedPropertyGetterObj<T> {
-  get(this: any, key: string): T;
+export interface ComputedPropertyGetterObj {
+  get(this: any, key: string): unknown;
 }
 
-export interface ComputedPropertySetterObj<T> {
-  set(this: any, key: string, value: T): T;
+export interface ComputedPropertySetterObj {
+  set(this: any, key: string, value: unknown): unknown;
 }
-export type ComputedPropertyObj<Get, Set> =
-  | ComputedPropertyGetterObj<Get>
-  | ComputedPropertySetterObj<Set>
-  | (ComputedPropertyGetterObj<Get> & ComputedPropertySetterObj<Set>);
-
-export type ComputedPropertyGetter<T> =
-  | ComputedPropertyGetterFunction<T>
-  | ComputedPropertyGetterObj<T>;
-export type ComputedPropertySetter<T> =
-  | ComputedPropertySetterFunction<T>
-  | ComputedPropertySetterObj<T>;
-
-export type ComputedPropertyCallback<Get, Set = Get> =
-  | ComputedPropertyGetterFunction<Get>
-  | ComputedPropertyObj<Get, Set>;
+export type ComputedPropertyObj =
+  | ComputedPropertyGetterObj
+  | ComputedPropertySetterObj
+  | (ComputedPropertyGetterObj & ComputedPropertySetterObj);
+
+export type ComputedPropertyGetter = ComputedPropertyGetterFunction | ComputedPropertyGetterObj;
+export type ComputedPropertySetter = ComputedPropertySetterFunction | ComputedPropertySetterObj;
+
+export type ComputedPropertyCallback = ComputedPropertyGetterFunction | ComputedPropertyObj;
 
 /**
 @module @ember/object
@@ -271,14 +265,14 @@ function noop(): void {}
   @class ComputedProperty
   @public
 */
-export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
+export class ComputedProperty extends ComputedDescriptor {
   _readOnly = false;
   protected _hasConfig = false;
 
-  _getter?: ComputedPropertyGetterFunction<Get> = undefined;
-  _setter?: ComputedPropertySetterFunction<Set> = undefined;
+  _getter?: ComputedPropertyGetterFunction = undefined;
+  _setter?: ComputedPropertySetterFunction = undefined;
 
-  constructor(args: Array<string | ComputedPropertyCallback<Get, Set>>) {
+  constructor(args: Array<string | ComputedPropertyCallback>) {
     super();
 
     let maybeConfig = args[args.length - 1];
@@ -298,8 +292,7 @@ export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
 
         this._getter = config;
       } else {
-        const objectConfig = config as ComputedPropertyGetterObj<Get> &
-          ComputedPropertySetterObj<Set>;
+        const objectConfig = config as ComputedPropertyGetterObj & ComputedPropertySetterObj;
         assert(
           'computed expects a function or an object as last argument.',
           typeof objectConfig === 'object' && !Array.isArray(objectConfig)
@@ -354,7 +347,7 @@ export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
       let { get, set } = propertyDesc!;
 
       if (get !== undefined) {
-        this._getter = get as ComputedPropertyGetterFunction<Get>;
+        this._getter = get as ComputedPropertyGetterFunction;
       }
 
       if (set !== undefined) {
@@ -393,7 +386,7 @@ export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
     this._dependentKeys = args;
   }
 
-  get(obj: object, keyName: string): any {
+  get(obj: object, keyName: string): unknown {
     let meta = metaFor(obj);
     let tagMeta = tagMetaFor(obj);
 
@@ -445,7 +438,7 @@ export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
     return ret;
   }
 
-  set(obj: object, keyName: string, value: any): any {
+  set(obj: object, keyName: string, value: unknown): unknown {
     if (this._readOnly) {
       this._throwReadOnlyError(obj, keyName);
     }
@@ -516,9 +509,9 @@ export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
     throw new EmberError(`Cannot set read-only property "${keyName}" on object: ${inspect(obj)}`);
   }
 
-  _set(obj: object, keyName: string, value: Set, meta: Meta): any {
+  _set(obj: object, keyName: string, value: unknown, meta: Meta): unknown {
     let hadCachedValue = meta.revisionFor(keyName) !== undefined;
-    let cachedValue = meta.valueFor(keyName) as Set;
+    let cachedValue = meta.valueFor(keyName);
 
     let ret;
     let { _setter } = this;
@@ -554,8 +547,8 @@ export class ComputedProperty<Get, Set = Get> extends ComputedDescriptor {
   }
 }
 
-class AutoComputedProperty<Get, Set = Get> extends ComputedProperty<Get, Set> {
-  get(obj: object, keyName: string): any {
+class AutoComputedProperty extends ComputedProperty {
+  get(obj: object, keyName: string): unknown {
     let meta = metaFor(obj);
     let tagMeta = tagMetaFor(obj);
 
@@ -600,12 +593,10 @@ class AutoComputedProperty<Get, Set = Get> extends ComputedProperty<Get, Set> {
   }
 }
 
-export type ComputedDecorator<Get, Set = Get> = Decorator &
-  PropertyDecorator &
-  ComputedDecoratorImpl<Get, Set>;
+export type ComputedDecorator = Decorator & PropertyDecorator & ComputedDecoratorImpl;
 
 // TODO: This class can be svelted once `meta` has been deprecated
-class ComputedDecoratorImpl<Get, Set = Get> extends Function {
+class ComputedDecoratorImpl extends Function {
   /**
     Call on a computed property to set it into read-only mode. When in this
     mode the computed property will throw an error when set.
@@ -647,7 +638,7 @@ class ComputedDecoratorImpl<Get, Set = Get> extends Function {
     @public
   */
   readOnly(this: Decorator) {
-    let desc = descriptorForDecorator(this) as ComputedProperty<Get, Set>;
+    let desc = descriptorForDecorator(this) as ComputedProperty;
     assert(
       'Computed properties that define a setter using the new syntax cannot be read-only',
       !(desc._setter && (desc._setter as unknown) !== (desc._getter as unknown))
@@ -702,8 +693,8 @@ class ComputedDecoratorImpl<Get, Set = Get> extends Function {
     @chainable
     @public
   */
-  meta(this: Decorator, meta?: any): any {
-    let prop = descriptorForDecorator(this) as ComputedProperty<Get, Set>;
+  meta(this: Decorator, meta?: unknown): unknown {
+    let prop = descriptorForDecorator(this) as ComputedProperty;
 
     if (arguments.length === 0) {
       return prop._meta || {};
@@ -717,20 +708,17 @@ class ComputedDecoratorImpl<Get, Set = Get> extends Function {
   // addons such as ember-macro-helpers that use it.
   /** @internal */
   get _getter() {
-    return (descriptorForDecorator(this) as ComputedProperty<Get, Set>)._getter;
+    return (descriptorForDecorator(this) as ComputedProperty)._getter;
   }
 
   // TODO: Refactor this, this is an internal API only
   /** @internal */
   set enumerable(value: boolean) {
-    (descriptorForDecorator(this) as ComputedProperty<Get, Set>).enumerable = value;
+    (descriptorForDecorator(this) as ComputedProperty).enumerable = value;
   }
 }
 
-type ComputedDecoratorKeysAndConfig<Get, Set = Get> = [
-  ...keys: string[],
-  config: ComputedPropertyCallback<Get, Set>
-];
+type ComputedDecoratorKeysAndConfig = [...keys: string[], config: ComputedPropertyCallback];
 
 /**
   This helper returns a new property descriptor that wraps the passed
@@ -880,18 +868,14 @@ export function computed(
   descriptor: DecoratorPropertyDescriptor
 ): DecoratorPropertyDescriptor;
 // @computed with keys only
-export function computed<Get, Set = Get>(...dependentKeys: string[]): ComputedDecorator<Get, Set>;
+export function computed(...dependentKeys: string[]): ComputedDecorator;
 // @computed with keys and config
-export function computed<Get, Set = Get>(
-  ...args: ComputedDecoratorKeysAndConfig<Get, Set>
-): ComputedDecorator<Get, Set>;
+export function computed(...args: ComputedDecoratorKeysAndConfig): ComputedDecorator;
 // @computed with config only
-export function computed<Get, Set = Get>(
-  callback: ComputedPropertyCallback<Get, Set>
-): ComputedDecorator<Get, Set>;
-export function computed<Get, Set = Get>(
-  ...args: ElementDescriptor | string[] | ComputedDecoratorKeysAndConfig<Get, Set>
-): ComputedDecorator<Get, Set> | DecoratorPropertyDescriptor {
+export function computed(callback: ComputedPropertyCallback): ComputedDecorator;
+export function computed(
+  ...args: ElementDescriptor | string[] | ComputedDecoratorKeysAndConfig
+): ComputedDecorator | DecoratorPropertyDescriptor {
   assert(
     `@computed can only be used directly as a native decorator. If you're using tracked in classic classes, add parenthesis to call it like a function: computed()`,
     !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && (args[4] as unknown) === true)
@@ -901,24 +885,24 @@ export function computed<Get, Set = Get>(
     let decorator = makeComputedDecorator(
       new ComputedProperty([]),
       ComputedDecoratorImpl
-    ) as ComputedDecorator<Get, Set>;
+    ) as ComputedDecorator;
 
     return decorator(args[0], args[1], args[2]);
   }
 
   return makeComputedDecorator(
-    new ComputedProperty(args as (string | ComputedPropertyObj<Get, Set>)[]),
+    new ComputedProperty(args as (string | ComputedPropertyObj)[]),
     ComputedDecoratorImpl
-  ) as ComputedDecorator<Get, Set>;
+  ) as ComputedDecorator;
 }
 
-export function autoComputed<Get, Set = Get>(
-  ...config: [ComputedPropertyObj<Get, Set>]
-): ComputedDecorator<Get, Set> | DecoratorPropertyDescriptor {
+export function autoComputed(
+  ...config: [ComputedPropertyObj]
+): ComputedDecorator | DecoratorPropertyDescriptor {
   return makeComputedDecorator(
     new AutoComputedProperty(config),
     ComputedDecoratorImpl
-  ) as ComputedDecorator<Get, Set>;
+  ) as ComputedDecorator;
 }
 
 /**
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 7dcaad98095..76dc825bdf1 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -68,12 +68,12 @@ function concatenatedMixinProperties(
   return concats;
 }
 
-function giveDecoratorSuper<Get, Set>(
+function giveDecoratorSuper(
   key: string,
-  decorator: ComputedDecorator<Get, Set>,
-  property: ComputedProperty<Get, Set> | true,
+  decorator: ComputedDecorator,
+  property: ComputedProperty | true,
   descs: { [key: string]: any }
-): ComputedDecorator<Get, Set> {
+): ComputedDecorator {
   if (property === true) {
     return decorator;
   }
@@ -87,7 +87,7 @@ function giveDecoratorSuper<Get, Set>(
   let superDesc = descs[key];
 
   // Check to see if the super property is a decorator first, if so load its descriptor
-  let superProperty: ComputedProperty<Get, Set> | true | undefined =
+  let superProperty: ComputedProperty | true | undefined =
     typeof superDesc === 'function' ? descriptorForDecorator(superDesc) : superDesc;
 
   if (superProperty === undefined || superProperty === true) {
@@ -100,14 +100,14 @@ function giveDecoratorSuper<Get, Set>(
     return decorator;
   }
 
-  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter<Get>;
+  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter;
   let set;
   let originalSetter = property._setter;
   let superSetter = superProperty._setter;
 
   if (superSetter !== undefined) {
     if (originalSetter !== undefined) {
-      set = wrap(originalSetter, superSetter) as ComputedPropertySetter<Set>;
+      set = wrap(originalSetter, superSetter) as ComputedPropertySetter;
     } else {
       // If the super property has a setter, we default to using it no matter what.
       // This is clearly very broken and weird, but it's what was here so we have
@@ -131,14 +131,14 @@ function giveDecoratorSuper<Get, Set>(
       {
         get,
         set,
-      } as ComputedPropertyObj<Get, Set>,
+      } as ComputedPropertyObj,
     ]);
 
     newProperty._readOnly = property._readOnly;
     newProperty._meta = property._meta;
     newProperty.enumerable = property.enumerable;
 
-    return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator<Get, Set>;
+    return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator;
   }
 
   return decorator;
@@ -282,7 +282,7 @@ function mergeMixins(
   }
 }
 
-function mergeProps<Get, Set>(
+function mergeProps(
   meta: Meta,
   props: { [key: string]: unknown },
   descs: { [key: string]: unknown },
@@ -336,8 +336,8 @@ function mergeProps<Get, Set>(
         // Wrap descriptor function to implement _super() if needed
         descs[key] = giveDecoratorSuper(
           key,
-          value as ComputedDecorator<Get, Set>,
-          desc as ComputedProperty<Get, Set>,
+          value as ComputedDecorator,
+          desc as ComputedProperty,
           descs
         );
         values[key] = undefined;

From 32eb0fde8d40c80438e601cb56be620ef1cf53f2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 23 Dec 2021 09:56:52 -0800
Subject: [PATCH 0798/1405] Improve return type of getProperties

---
 packages/@ember/-internals/metal/lib/decorator.ts     |  2 +-
 .../@ember/-internals/metal/lib/get_properties.ts     | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 4ce9d88108b..fef8e11cef6 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -19,7 +19,7 @@ export type ElementDescriptor = [
   descriptor: DecoratorPropertyDescriptor
 ];
 
-export function isElementDescriptor(args: any[]): args is ElementDescriptor {
+export function isElementDescriptor(args: unknown[]): args is ElementDescriptor {
   let [maybeTarget, maybeKey, maybeDesc] = args;
 
   return (
diff --git a/packages/@ember/-internals/metal/lib/get_properties.ts b/packages/@ember/-internals/metal/lib/get_properties.ts
index 1a91c0d808c..b9109a318ea 100644
--- a/packages/@ember/-internals/metal/lib/get_properties.ts
+++ b/packages/@ember/-internals/metal/lib/get_properties.ts
@@ -31,13 +31,10 @@ import { get } from './property_get';
   @return {Object}
   @public
 */
-function getProperties<L extends string[]>(obj: object, list: L): { [Key in L[number]]: unknown };
-function getProperties<L extends string[]>(
-  obj: object,
-  ...list: L
-): { [Key in L[number]]: unknown };
-function getProperties(obj: object, keys?: string[]): object {
-  let ret = {};
+function getProperties<L extends string[]>(obj: object, list: L): Record<L[number], unknown>;
+function getProperties<L extends string[]>(obj: object, ...list: L): Record<L[number], unknown>;
+function getProperties<L extends string[]>(obj: object, keys?: L): Record<L[number], unknown> {
+  let ret = {} as Record<L[number], unknown>;
   let propertyNames = arguments;
   let i = 1;
 

From e001116328630d91c81a27ec55c0043ff463fb26 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 23 Dec 2021 10:00:06 -0800
Subject: [PATCH 0799/1405] Prefer assert over 'as' cast

---
 packages/@ember/-internals/metal/lib/libraries.ts        | 8 ++++++--
 packages/@ember/-internals/routing/lib/ext/controller.ts | 8 ++++++--
 packages/@ember/controller/index.d.ts                    | 1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/libraries.ts b/packages/@ember/-internals/metal/lib/libraries.ts
index fdaf9ab9369..2f70a3242ee 100644
--- a/packages/@ember/-internals/metal/lib/libraries.ts
+++ b/packages/@ember/-internals/metal/lib/libraries.ts
@@ -1,5 +1,5 @@
 import { EMBER_LIBRARIES_ISREGISTERED } from '@ember/canary-features';
-import { debug, warn } from '@ember/debug';
+import { assert, debug, warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import VERSION from 'ember/version';
 import { get } from './property_get';
@@ -84,7 +84,11 @@ if (EMBER_LIBRARIES_ISREGISTERED) {
 if (DEBUG) {
   Libraries.prototype.logVersions = function (): void {
     let libs = this._registry;
-    let nameLengths = libs.map((item) => get(item, 'name.length')) as number[];
+    let nameLengths = libs.map((item) => get(item, 'name.length'));
+    assert(
+      'nameLengths is number array',
+      nameLengths instanceof Array && nameLengths.every((n) => typeof n === 'number')
+    );
     let maxNameLength = Math.max.apply(null, nameLengths);
 
     debug('-------------------------------');
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 1b466218674..43dfd7af84f 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -1,6 +1,9 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
+import Controller from '@ember/controller';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
+import { assert } from '@ember/debug';
+import { Router } from '../..';
 import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
 
 /**
@@ -169,8 +172,9 @@ ControllerMixin.reopen({
     deprecateTransitionMethods('controller', 'transitionToRoute');
 
     // target may be either another controller or a router
-    let target = get(this, 'target') as any;
-    let method = target.transitionToRoute || target.transitionTo;
+    let target = get(this, 'target');
+    assert('controller or router', target instanceof Controller || target instanceof Router);
+    let method = target instanceof Controller ? target.transitionToRoute : target.transitionTo;
     return method.apply(target, prefixRouteNameArg(this, args));
   },
 
diff --git a/packages/@ember/controller/index.d.ts b/packages/@ember/controller/index.d.ts
index 07dd76a9df4..efc815f177e 100644
--- a/packages/@ember/controller/index.d.ts
+++ b/packages/@ember/controller/index.d.ts
@@ -6,6 +6,7 @@ export default class Controller {
   get<T>(key: string): T;
   set<T>(key: string, value: T): void;
   setProperties(props: { [key: string]: any }): void;
+  transitionToRoute(...args: unknown[]): unknown;
 }
 
 export function inject(name?: string): any;

From ff7562d56b325aecad60eee45a0c890a92598880 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 23 Dec 2021 10:17:24 -0800
Subject: [PATCH 0800/1405] trySet can return undefined

---
 packages/@ember/-internals/metal/lib/property_set.ts | 2 +-
 packages/@ember/object/type-tests/try-set.test.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 54e089bb22a..911c79218d4 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -143,6 +143,6 @@ function _setPath(root: object, path: string, value: any, tolerant?: boolean): a
   @param {Object} value The value to set
   @public
 */
-export function trySet<T>(root: object, path: string, value: T): T {
+export function trySet<T>(root: object, path: string, value: T): T | undefined {
   return set(root, path, value, true);
 }
diff --git a/packages/@ember/object/type-tests/try-set.test.ts b/packages/@ember/object/type-tests/try-set.test.ts
index 90031126bab..1efa83213e8 100644
--- a/packages/@ember/object/type-tests/try-set.test.ts
+++ b/packages/@ember/object/type-tests/try-set.test.ts
@@ -4,7 +4,7 @@ import { expectTypeOf } from 'expect-type';
 let obj = { name: 'Zoey' };
 
 let result = trySet(obj, 'contacts.twitter', '@emberjs');
-expectTypeOf(result).toEqualTypeOf<string>();
+expectTypeOf(result).toEqualTypeOf<string | undefined>();
 
 // @ts-expect-error requires a value
 trySet(obj, 'contacts.twitter');

From 85c3d25f302a6ce3053c43980e54868b93674bfc Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 23 Dec 2021 11:21:06 -0800
Subject: [PATCH 0801/1405] Improve Routing types

---
 .../glimmer/lib/components/link-to.ts         |  10 +-
 .../-internals/metal/lib/property_get.ts      |   2 +
 .../-internals/routing/lib/services/router.ts |  16 ++-
 .../routing/lib/services/routing.ts           |  19 ++--
 .../-internals/routing/lib/system/route.ts    | 107 +++++++++++-------
 .../-internals/routing/lib/system/router.ts   |  51 ++++++---
 .../routing/lib/system/router_state.ts        |   4 +-
 .../@ember/-internals/routing/lib/utils.ts    |  65 +++++++----
 packages/@ember/controller/index.d.ts         |   1 +
 packages/@ember/object/type-tests/get.test.ts |   4 +-
 10 files changed, 179 insertions(+), 100 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 27f1476df41..a6d20a973b1 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,6 +1,5 @@
 import { Owner } from '@ember/-internals/owner';
 import { RouterState, RoutingService } from '@ember/-internals/routing';
-import { QueryParam } from '@ember/-internals/routing/lib/system/router';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
@@ -400,8 +399,7 @@ class LinkTo extends InternalComponent {
     flaggedInstrument('interaction.link-to', payload, () => {
       assert('[BUG] route can only be missing if isLoading is true', isPresent(route));
 
-      // TODO: is the signature wrong? this.query is definitely NOT a QueryParam!
-      payload.transition = routing.transitionTo(route, models, query as QueryParam, replace);
+      payload.transition = routing.transitionTo(route, models, query, replace);
     });
   }
 
@@ -448,8 +446,7 @@ class LinkTo extends InternalComponent {
     }
   }
 
-  // TODO: this should probably be Record<string, unknown> or something
-  private get query(): {} {
+  private get query(): Record<string, unknown> {
     if ('query' in this.args.named) {
       let query = this.named('query');
 
@@ -554,8 +551,7 @@ class LinkTo extends InternalComponent {
 
       assert('[BUG] route can only be missing if isLoading is true', isPresent(route));
 
-      // TODO: is the signature wrong? this.query is definitely NOT a QueryParam!
-      return routing.isActiveForRoute(models, query as QueryParam, route, state);
+      return routing.isActiveForRoute(models, query, route, state);
     }
   }
 
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index effae01b72d..1186c22cb27 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -69,6 +69,8 @@ interface MaybeHasIsDestroyed {
   @return {Object} the property value or `null`.
   @public
 */
+export function get<T extends object, K extends keyof T>(obj: T, keyName: K): T[K];
+export function get(obj: object, keyName: string): unknown;
 export function get(obj: object, keyName: string): unknown {
   assert(
     `Get must be called with two arguments; an object and a property key`,
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 2db44fe45ae..c9b5799c5d2 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -6,8 +6,9 @@ import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
+import { Transition } from 'router_js';
 import Route from '../system/route';
-import EmberRouter, { QueryParam } from '../system/router';
+import EmberRouter from '../system/router';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
 const ROUTER = (symbol('ROUTER') as unknown) as string;
@@ -115,11 +116,18 @@ export default class RouterService extends Service {
        attempted transition
      @public
    */
-  transitionTo(...args: (string | object)[]) {
+  transitionTo(
+    routeNameOrURL: string,
+    ...modelsAndOptions: [...any[], Record<string, unknown>]
+  ): Transition;
+  transitionTo(routeNameOrURL: string, ...models: any[]): Transition;
+  transitionTo(...modelsAndOptions: [...any[], Record<string, unknown>]): Transition;
+  transitionTo(...models: any[]): Transition;
+  transitionTo(...args: (string | any | Record<string, unknown>)[]): Transition {
     if (resemblesURL(args[0])) {
       // NOTE: this `args[0] as string` cast is safe and TS correctly infers it
       // in 3.6+, so it can be removed when TS is upgraded.
-      return this._router._doURLTransition('transitionTo', args[0] as string);
+      return this._router._doURLTransition('transitionTo', args[0]);
     }
 
     let { routeName, models, queryParams } = extractRouteArgs(args);
@@ -332,7 +340,7 @@ export default class RouterService extends Service {
         // UNSAFE: downstream consumers treat this as `QueryParam`, which the
         // type system here *correctly* reports as incorrect, because it may be
         // just an empty object.
-        queryParams as QueryParam,
+        queryParams,
         true /* fromRouterService */
       );
 
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index b040ac0518e..63864875dc2 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -6,7 +6,7 @@ import { getOwner, Owner } from '@ember/-internals/owner';
 import { symbol } from '@ember/-internals/utils';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
-import EmberRouter, { QueryParam } from '../system/router';
+import EmberRouter from '../system/router';
 import RouterState from '../system/router_state';
 
 const ROUTER = (symbol('ROUTER') as unknown) as string;
@@ -37,7 +37,12 @@ export default class RoutingService extends Service {
     return this.router.hasRoute(routeName);
   }
 
-  transitionTo(routeName: string, models: {}[], queryParams: QueryParam, shouldReplace: boolean) {
+  transitionTo(
+    routeName: string,
+    models: {}[],
+    queryParams: Record<string, unknown>,
+    shouldReplace: boolean
+  ) {
     let transition = this.router._doTransition(routeName, models, queryParams);
 
     if (shouldReplace) {
@@ -47,15 +52,15 @@ export default class RoutingService extends Service {
     return transition;
   }
 
-  normalizeQueryParams(routeName: string, models: {}[], queryParams: QueryParam) {
+  normalizeQueryParams(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
     this.router._prepareQueryParams(routeName, models, queryParams);
   }
 
-  _generateURL(routeName: string, models: {}[], queryParams: {}) {
+  _generateURL(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
     let visibleQueryParams = {};
     if (queryParams) {
       Object.assign(visibleQueryParams, queryParams);
-      this.normalizeQueryParams(routeName, models, visibleQueryParams as QueryParam);
+      this.normalizeQueryParams(routeName, models, visibleQueryParams);
     }
 
     return this.router.generate(routeName, ...models, {
@@ -63,7 +68,7 @@ export default class RoutingService extends Service {
     });
   }
 
-  generateURL(routeName: string, models: {}[], queryParams: {}) {
+  generateURL(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
     if (this.router._initialTransitionStarted) {
       return this._generateURL(routeName, models, queryParams);
     } else {
@@ -79,7 +84,7 @@ export default class RoutingService extends Service {
 
   isActiveForRoute(
     contexts: {}[],
-    queryParams: QueryParam | undefined,
+    queryParams: Record<string, unknown> | undefined,
     routeName: string,
     routerState: RouterState
   ): boolean {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 5b7dde9d872..001710f0f2e 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -45,6 +45,17 @@ import {
 import generateController from './generate_controller';
 import EmberRouter, { QueryParam } from './router';
 
+export type QueryParamMeta = {
+  qps: QueryParam[];
+  map: Record<string, QueryParam>;
+  propertyNames: string[];
+  states: {
+    inactive(prop: string, value: unknown): void;
+    active(prop: string, value: unknown): any;
+    allowOverrides(prop: string, value: unknown): any;
+  };
+};
+
 export const ROUTE_CONNECTIONS = new WeakMap();
 const RENDER = (symbol('render') as unknown) as string;
 
@@ -187,7 +198,14 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   // Set in reopen so it can be overriden with extend
-  declare queryParams: Record<string, unknown>;
+  declare queryParams: Record<
+    string,
+    {
+      refreshModel?: boolean;
+      replace?: boolean;
+      as?: string;
+    }
+  >;
 
   /**
     The name of the template to use by default when rendering this routes
@@ -334,7 +352,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       names = (routeInfo && routeInfo['_names']) || [];
     }
 
-    let qps = get(this, '_qp.qps') as any;
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    let qps = (get(this, '_qp') as Route['_qp']).qps;
 
     let namePaths = new Array(names.length);
     for (let a = 0; a < names.length; ++a) {
@@ -493,8 +512,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
     @property _optionsForQueryParam
   */
-  _optionsForQueryParam(qp: QueryParam) {
-    const queryParams = get(this, 'queryParams') as any;
+  _optionsForQueryParam(qp: QueryParam): {} {
+    const queryParams = get(this, 'queryParams');
     return (
       get(queryParams, qp.urlKey) ||
       get(queryParams, qp.prop) ||
@@ -550,7 +569,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   _internalReset(isExiting: boolean, transition: Transition) {
     let controller = this.controller;
-    controller['_qpDelegate'] = get(this, '_qp.states.inactive');
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    controller['_qpDelegate'] = (get(this, '_qp') as Route['_qp']).states.inactive;
 
     this.resetController(controller, isExiting, transition);
   }
@@ -1104,17 +1124,17 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       controller = this.generateController(controllerName);
     }
 
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    let queryParams = get(this, '_qp') as Route['_qp'];
+
     // Assign the route's controller so that it can more easily be
     // referenced in action handlers. Side effects. Side effects everywhere.
     if (!this.controller) {
-      let qp = get(this, '_qp') as any;
-      let propNames = qp !== undefined ? (get(qp, 'propertyNames') as string[]) : [];
+      let propNames = queryParams.propertyNames;
       addQueryParamsObservers(controller, propNames);
       this.controller = controller;
     }
 
-    let queryParams = get(this, '_qp') as any;
-
     let states = queryParams.states;
 
     controller._qpDelegate = states.allowOverrides;
@@ -1353,7 +1373,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   model(params: {}, transition: Transition) {
     let name, sawParams, value;
-    let queryParams = get(this, '_qp.map') as any;
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    let queryParams = (get(this, '_qp') as Route['_qp']).map;
 
     for (let prop in params) {
       if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -1786,13 +1807,13 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @property _qp
     */
   @computed
-  protected get _qp() {
+  protected get _qp(): QueryParamMeta {
     let combinedQueryParameterConfiguration;
 
     let controllerName = this.controllerName || this.routeName;
     let owner = getOwner(this);
     let controller = owner.lookup<Controller>(`controller:${controllerName}`);
-    let queryParameterConfiguraton = get(this, 'queryParams') as this['queryParams'];
+    let queryParameterConfiguraton = get(this, 'queryParams');
     let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
 
     if (controller) {
@@ -1817,9 +1838,9 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       combinedQueryParameterConfiguration = queryParameterConfiguraton;
     }
 
-    let qps = [];
-    let map = {};
-    let propertyNames = [];
+    let qps: QueryParam[] = [];
+    let map: Record<string, QueryParam> = {};
+    let propertyNames: string[] = [];
 
     for (let propName in combinedQueryParameterConfiguration) {
       if (!Object.prototype.hasOwnProperty.call(combinedQueryParameterConfiguration, propName)) {
@@ -1835,7 +1856,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
       let desc = combinedQueryParameterConfiguration[propName];
       let scope = desc.scope || 'model';
-      let parts;
+      let parts: string[] | undefined = undefined;
 
       if (scope === 'controller') {
         parts = [];
@@ -1850,7 +1871,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
       let defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
       let scopedPropertyName = `${controllerName}:${propName}`;
-      let qp = {
+      let qp: QueryParam = {
         undecoratedDefaultValue: get(controller!, propName),
         defaultValue,
         serializedDefaultValue: defaultValueSerialized,
@@ -2101,41 +2122,43 @@ type PartialRenderOptions = Partial<
 >;
 
 export function getFullQueryParams(router: EmberRouter, state: TransitionState<Route>) {
-  if (state['fullQueryParams']) {
-    return state['fullQueryParams'];
+  if (state.fullQueryParams) {
+    return state.fullQueryParams;
   }
 
-  let fullQueryParamsState = {};
   let haveAllRouteInfosResolved = state.routeInfos.every((routeInfo) => routeInfo.route);
 
-  Object.assign(fullQueryParamsState, state.queryParams);
+  let fullQueryParamsState: Record<string, unknown> = {
+    ...state.queryParams,
+  };
 
-  router._deserializeQueryParams(state.routeInfos, fullQueryParamsState as QueryParam);
+  router._deserializeQueryParams(state.routeInfos, fullQueryParamsState);
 
   // only cache query params state if all routeinfos have resolved; it's possible
   // for lazy routes to not have resolved when `getFullQueryParams` is called, so
   // we wait until all routes have resolved prior to caching query params state
   if (haveAllRouteInfosResolved) {
-    state['fullQueryParams'] = fullQueryParamsState;
+    state.fullQueryParams = fullQueryParamsState;
   }
 
   return fullQueryParamsState;
 }
 
 function getQueryParamsFor(route: Route, state: TransitionState<Route>) {
-  state['queryParamsFor'] = state['queryParamsFor'] || {};
+  state.queryParamsFor = state.queryParamsFor || {};
   let name = route.fullRouteName;
 
-  if (state['queryParamsFor'][name]) {
-    return state['queryParamsFor'][name];
+  if (state.queryParamsFor[name]) {
+    return state.queryParamsFor[name];
   }
 
   let fullQueryParams = getFullQueryParams(route._router, state);
 
-  let params = (state['queryParamsFor'][name] = {});
+  let params: Record<string, unknown> = (state.queryParamsFor[name] = {});
 
   // Copy over all the query params for this route/controller into params hash.
-  let qps = get(route, '_qp.qps') as any;
+  // SAFETY: Since `_qp` is protected we can't infer the type
+  let qps = (get(route, '_qp') as Route['_qp']).qps;
   for (let i = 0; i < qps.length; ++i) {
     // Put deserialized qp on params hash.
     let qp = qps[i];
@@ -2149,7 +2172,7 @@ function getQueryParamsFor(route: Route, state: TransitionState<Route>) {
   return params;
 }
 
-function copyDefaultValue(value: unknown) {
+function copyDefaultValue<T>(value: T): T {
   if (Array.isArray(value)) {
     return emberA(value.slice());
   }
@@ -2351,18 +2374,19 @@ Route.reopen({
     @private
    */
     queryParamsDidChange(this: Route, changed: {}, _totalPresent: unknown, removed: {}) {
-      let qpMap = (get(this, '_qp') as any).map;
+      // SAFETY: Since `_qp` is protected we can't infer the type
+      let qpMap = (get(this, '_qp') as Route['_qp']).map;
 
       let totalChanged = Object.keys(changed).concat(Object.keys(removed));
       for (let i = 0; i < totalChanged.length; ++i) {
         let qp = qpMap[totalChanged[i]];
-        if (
-          qp &&
-          (get(this._optionsForQueryParam(qp), 'refreshModel') as boolean) &&
-          this._router.currentState
-        ) {
-          this.refresh();
-          break;
+        if (qp) {
+          let options = this._optionsForQueryParam(qp);
+          assert('options exists', options && typeof options === 'object');
+          if ((get(options, 'refreshModel') as boolean) && this._router.currentState) {
+            this.refresh();
+            break;
+          }
         }
       }
 
@@ -2397,7 +2421,8 @@ Route.reopen({
         // Do a reverse lookup to see if the changed query
         // param URL key corresponds to a QP property on
         // this controller.
-        let value, svalue;
+        let value;
+        let svalue: string | null | undefined;
         if (changes.has(qp.urlKey)) {
           // Value updated in/before setupController
           value = get(controller, qp.prop);
@@ -2416,7 +2441,8 @@ Route.reopen({
           }
         }
 
-        controller._qpDelegate = get(route, '_qp.states.inactive');
+        // SAFETY: Since `_qp` is protected we can't infer the type
+        controller._qpDelegate = (get(route, '_qp') as Route['_qp']).states.inactive;
 
         let thisQueryParamChanged = svalue !== qp.serializedValue;
         if (thisQueryParamChanged) {
@@ -2460,7 +2486,8 @@ Route.reopen({
       }
 
       qpMeta.qps.forEach((qp: QueryParam) => {
-        let routeQpMeta = get(qp.route, '_qp') as any;
+        // SAFETY: Since `_qp` is protected we can't infer the type
+        let routeQpMeta = get(qp.route, '_qp') as Route['_qp'];
         let finalizedController = qp.route.controller;
         finalizedController['_qpDelegate'] = get(routeQpMeta, 'states.active');
       });
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 8d1081684a1..bc968bf668d 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -17,6 +17,7 @@ import Route, {
   defaultSerialize,
   getFullQueryParams,
   hasDefaultSerialize,
+  QueryParamMeta,
   RenderOptions,
   ROUTE_CONNECTIONS,
 } from './route';
@@ -110,9 +111,15 @@ export interface QueryParam {
   urlKey: string;
   type: string;
   route: Route;
-  parts: string[];
-  values: {};
+  parts?: string[];
+  values: {} | null;
   scopedPropertyName: string;
+  scope: string;
+  defaultValue: unknown;
+  undecoratedDefaultValue: unknown;
+  serializedValue: string | null | undefined;
+  serializedDefaultValue: string | null | undefined;
+  controllerName: string;
 }
 
 export type PrivateRouteInfo = InternalRouteInfo<Route>;
@@ -174,8 +181,10 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   currentPath: string | null = null;
   currentRoute = null;
 
-  _qpCache = Object.create(null);
-  _qpUpdates = new Set();
+  _qpCache: Record<string, { qps: QueryParam[]; map: QueryParamMeta['map'] }> = Object.create(null);
+
+  // Set of QueryParam['urlKey']
+  _qpUpdates: Set<string> = new Set();
   _queuedQPChanges: { [key: string]: unknown } = {};
 
   _bucketCache: BucketCache;
@@ -726,7 +735,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @private
     @since 1.7.0
   */
-  isActiveIntent(routeName: string, models: {}[], queryParams: QueryParam) {
+  isActiveIntent(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
     return this.currentState!.isActiveIntent(routeName, models, queryParams);
   }
 
@@ -789,6 +798,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     once(this, this._fireQueryParamTransition);
   }
 
+  // The queryParameterName is QueryParam['urlKey']
   _updatingQPChanged(queryParameterName: string) {
     this._qpUpdates.add(queryParameterName);
   }
@@ -897,7 +907,10 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {Object} queryParams
     @return {Void}
   */
-  _serializeQueryParams(routeInfos: PrivateRouteInfo[], queryParams: QueryParam) {
+  _serializeQueryParams(
+    routeInfos: PrivateRouteInfo[],
+    queryParams: Record<string, unknown>
+  ): asserts queryParams is Record<string, string | null | undefined> {
     forEachQueryParam(
       this,
       routeInfos,
@@ -942,7 +955,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {Object} queryParams
     @return {Void}
   */
-  _deserializeQueryParams(routeInfos: PrivateRouteInfo[], queryParams: QueryParam) {
+  _deserializeQueryParams(routeInfos: PrivateRouteInfo[], queryParams: Record<string, unknown>) {
     forEachQueryParam(
       this,
       routeInfos,
@@ -989,7 +1002,10 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {Object} queryParams
     @return {Void}
   */
-  _pruneDefaultQueryParamValues(routeInfos: PrivateRouteInfo[], queryParams: {}) {
+  _pruneDefaultQueryParamValues(
+    routeInfos: PrivateRouteInfo[],
+    queryParams: Record<string, string | null | undefined>
+  ) {
     let qps = this._queryParamsFor(routeInfos);
     for (let key in queryParams) {
       let qp = qps.map[key];
@@ -1002,7 +1018,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   _doTransition(
     _targetRouteName: string | undefined,
     models: {}[],
-    _queryParams: {},
+    _queryParams: Record<string, unknown>,
     _keepDefaultQueryParamValues?: boolean
   ) {
     let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
@@ -1013,15 +1029,16 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     this._initialTransitionStarted = true;
 
-    let queryParams = {};
+    let queryParams: Record<string, unknown> = {};
 
     this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);
 
     Object.assign(queryParams, _queryParams);
+
     this._prepareQueryParams(
       targetRouteName,
       models,
-      queryParams as QueryParam,
+      queryParams,
       Boolean(_keepDefaultQueryParamValues)
     );
 
@@ -1035,7 +1052,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   _processActiveTransitionQueryParams(
     targetRouteName: string,
     models: {}[],
-    queryParams: {},
+    queryParams: Record<string, unknown>,
     _queryParams: {}
   ) {
     // merge in any queryParams from the active transition which could include
@@ -1044,7 +1061,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       return;
     }
 
-    let unchangedQPs = {};
+    let unchangedQPs: Partial<QueryParamMeta> = {};
     let qpUpdates = this._qpUpdates;
     let params = getFullQueryParams(this, this._routerMicrolib.activeTransition[STATE_SYMBOL]);
     for (let key in params) {
@@ -1076,7 +1093,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   _prepareQueryParams(
     targetRouteName: string,
     models: {}[],
-    queryParams: QueryParam,
+    queryParams: Record<string, unknown>,
     _fromRouterService?: boolean
   ) {
     let state = calculatePostTransitionState(this, targetRouteName, models);
@@ -1099,7 +1116,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   */
   _getQPMeta(routeInfo: PrivateRouteInfo) {
     let route = routeInfo.route;
-    return route && (get(route, '_qp') as any);
+    return route && (get(route, '_qp') as Route['_qp']);
   }
 
   /**
@@ -1120,7 +1137,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     }
 
     let shouldCache = true;
-    let map = {};
+    let map: QueryParamMeta['map'] = {};
     let qps = [];
     let qpsByUrlKey = DEBUG ? {} : null;
     let qpMeta;
@@ -1758,7 +1775,7 @@ function didBeginTransition(transition: Transition, router: EmberRouter) {
 function forEachQueryParam(
   router: EmberRouter,
   routeInfos: PrivateRouteInfo[],
-  queryParams: QueryParam,
+  queryParams: Record<string, unknown>,
   callback: (key: string, value: unknown, qp: QueryParam) => void
 ) {
   let qpCache = router._queryParamsFor(routeInfos);
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index 83622a4873d..10f04b6dd29 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -1,7 +1,7 @@
 import Router, { TransitionState } from 'router_js';
 import { shallowEqual } from '../utils';
 import Route from './route';
-import EmberRouter, { QueryParam } from './router';
+import EmberRouter from './router';
 
 export default class RouterState {
   router: Router<Route>;
@@ -17,7 +17,7 @@ export default class RouterState {
     this.routerJsState = routerJsState;
   }
 
-  isActiveIntent(routeName: string, models: {}[], queryParams?: QueryParam): boolean {
+  isActiveIntent(routeName: string, models: {}[], queryParams?: Record<string, unknown>): boolean {
     let state = this.routerJsState;
     if (!this.router.isActiveIntent(routeName, models, undefined, state)) {
       return false;
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 0e6bb24dcee..7d122949e04 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -4,27 +4,37 @@ import { deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
 import Router, { STATE_SYMBOL } from 'router_js';
 import Route from './system/route';
-import EmberRouter, { PrivateRouteInfo, QueryParam } from './system/router';
+import EmberRouter, { PrivateRouteInfo } from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
+type ControllerQueryParam = string | Record<string, string> | { as?: string; scope?: string };
+type ExpandedControllerQueryParam = { as: string | null; scope: string };
+
+type ExtractedArgs = {
+  routeName: string | undefined;
+  models: {}[];
+  queryParams: Record<string, unknown>;
+};
+type HasQueryParams = { queryParams: Record<string, unknown> };
+
 export function extractRouteArgs(
-  args: unknown[]
-): { routeName: string | undefined; models: {}[]; queryParams: object } {
+  args:
+    | [routeNameOrURL: string, ...modelsAndOptions: [...any[], Record<string, unknown>]]
+    | [routeNameOrURL: string, ...models: any[]]
+    | [...modelsAndOptions: [...any[], Record<string, unknown>]]
+    | [...models: any[]]
+): ExtractedArgs {
   args = args.slice();
-  let possibleQueryParams = args[args.length - 1];
-
-  let queryParams;
-  if (
-    possibleQueryParams &&
-    Object.prototype.hasOwnProperty.call(possibleQueryParams, 'queryParams')
-  ) {
-    // SAFETY: this cast is safe because we have just checked whether
-    // `possibleQueryParams` -- defined as the last item in args -- both exists
-    // and has the property `queryParams`. If either of these invariants change,
-    // ***this is unsafe and should be changed***.
-    queryParams = (args.pop() as { queryParams: object }).queryParams;
+
+  let possibleQueryParams = args.pop();
+
+  let queryParams: Record<string, unknown>;
+  if (hasQueryParams(possibleQueryParams)) {
+    queryParams = possibleQueryParams.queryParams;
   } else {
+    // Not query params so return to the array
+    args.push(possibleQueryParams);
     queryParams = {};
   }
 
@@ -153,8 +163,8 @@ export function calculateCacheKey(prefix: string, parts: string[] = [], values:
   This helper normalizes all three possible styles into the
   'Array of fully defined objects' style.
 */
-export function normalizeControllerQueryParams(queryParams: QueryParam[]) {
-  let qpMap = {};
+export function normalizeControllerQueryParams(queryParams: ControllerQueryParam[]) {
+  let qpMap: Record<string, ExpandedControllerQueryParam> = {};
 
   for (let i = 0; i < queryParams.length; ++i) {
     accumulateQueryParamDescriptors(queryParams[i], qpMap);
@@ -163,7 +173,10 @@ export function normalizeControllerQueryParams(queryParams: QueryParam[]) {
   return qpMap;
 }
 
-function accumulateQueryParamDescriptors(_desc: QueryParam, accum: {}) {
+function accumulateQueryParamDescriptors(
+  _desc: ControllerQueryParam,
+  accum: Record<string, ExpandedControllerQueryParam>
+) {
   let desc: {} = _desc;
   let tmp: {};
   if (typeof desc === 'string') {
@@ -182,10 +195,10 @@ function accumulateQueryParamDescriptors(_desc: QueryParam, accum: {}) {
       singleDesc = { as: singleDesc };
     }
 
-    tmp = accum[key] || { as: null, scope: 'model' };
-    Object.assign(tmp, singleDesc);
+    let val = accum[key] || { as: null, scope: 'model' };
+    Object.assign(val, singleDesc);
 
-    accum[key] = tmp;
+    accum[key] = val;
   }
 }
 
@@ -261,3 +274,13 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
     }
   );
 }
+
+function hasQueryParams(value: unknown): value is HasQueryParams {
+  if (value && typeof value === 'object') {
+    let qps = (value as HasQueryParams).queryParams;
+    if (qps && typeof qps === 'object') {
+      return Object.keys(qps).every((k) => typeof k === 'string');
+    }
+  }
+  return false;
+}
diff --git a/packages/@ember/controller/index.d.ts b/packages/@ember/controller/index.d.ts
index efc815f177e..51abeed19ba 100644
--- a/packages/@ember/controller/index.d.ts
+++ b/packages/@ember/controller/index.d.ts
@@ -7,6 +7,7 @@ export default class Controller {
   set<T>(key: string, value: T): void;
   setProperties(props: { [key: string]: any }): void;
   transitionToRoute(...args: unknown[]): unknown;
+  _qpDelegate: unknown;
 }
 
 export function inject(name?: string): any;
diff --git a/packages/@ember/object/type-tests/get.test.ts b/packages/@ember/object/type-tests/get.test.ts
index dc30db47a52..aef422a6102 100644
--- a/packages/@ember/object/type-tests/get.test.ts
+++ b/packages/@ember/object/type-tests/get.test.ts
@@ -4,8 +4,8 @@ import { expectTypeOf } from 'expect-type';
 
 let foo = { baz: 1 };
 
-// We can't correctly infer CP types so just return unknown
-expectTypeOf(get(foo, 'baz')).toEqualTypeOf<unknown>();
+// We can infer basic types
+expectTypeOf(get(foo, 'baz')).toEqualTypeOf<number>();
 
 // We can get unknown properties
 expectTypeOf(get(foo, 'missing')).toEqualTypeOf<unknown>();

From 0f952599c132a1f01b38559594648c8373d69f4f Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 23 Dec 2021 15:03:37 -0800
Subject: [PATCH 0802/1405] Improve some type tests

---
 .../type-tests/compat/dependent-key-compat.test.ts    |  4 ++--
 packages/@ember/object/type-tests/computed.test.ts    |  3 +++
 .../@ember/object/type-tests/computed/alias.test.ts   |  3 +++
 .../@ember/object/type-tests/computed/and.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/bool.test.ts    |  4 ++++
 .../@ember/object/type-tests/computed/collect.test.ts |  4 ++++
 .../type-tests/computed/deprecating-alias.test.ts     | 11 +++++++++++
 .../@ember/object/type-tests/computed/empty.test.ts   |  3 +++
 .../@ember/object/type-tests/computed/equal.test.ts   |  3 +++
 .../object/type-tests/computed/filter-by.test.ts      |  3 +++
 .../@ember/object/type-tests/computed/filter.test.ts  |  3 +++
 packages/@ember/object/type-tests/computed/gt.test.ts |  3 +++
 .../@ember/object/type-tests/computed/gte.test.ts     |  3 +++
 .../object/type-tests/computed/intersect.test.ts      |  3 +++
 packages/@ember/object/type-tests/computed/lt.test.ts |  3 +++
 .../@ember/object/type-tests/computed/lte.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/map-by.test.ts  |  3 +++
 .../@ember/object/type-tests/computed/map.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/match.test.ts   |  3 +++
 .../@ember/object/type-tests/computed/max.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/min.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/none.test.ts    |  3 +++
 .../object/type-tests/computed/not-empty.test.ts      |  3 +++
 .../@ember/object/type-tests/computed/not.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/one-way.test.ts |  3 +++
 packages/@ember/object/type-tests/computed/or.test.ts |  3 +++
 .../object/type-tests/computed/read-only.test.ts      |  3 +++
 .../@ember/object/type-tests/computed/reads.test.ts   |  3 +++
 .../object/type-tests/computed/set-diff.test.ts       |  3 +++
 .../@ember/object/type-tests/computed/sort.test.ts    |  3 +++
 .../@ember/object/type-tests/computed/sum.test.ts     |  3 +++
 .../@ember/object/type-tests/computed/union.test.ts   |  3 +++
 .../@ember/object/type-tests/computed/uniq-by.test.ts |  3 +++
 .../@ember/object/type-tests/computed/uniq.test.ts    |  3 +++
 34 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts b/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts
index 9b8edced499..7f199648ea5 100644
--- a/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts
+++ b/packages/@ember/object/type-tests/compat/dependent-key-compat.test.ts
@@ -5,8 +5,8 @@ expectTypeOf(dependentKeyCompat).toMatchTypeOf<PropertyDecorator>();
 
 // Example (without irrelevant details) from https://api.emberjs.com/ember/3.18/functions/@ember%2Fobject%2Fcompat/dependentKeyCompat
 class Person {
-  firstName!: string;
-  lastName!: string;
+  declare firstName: string;
+  declare lastName: string;
 
   @dependentKeyCompat
   get fullName() {
diff --git a/packages/@ember/object/type-tests/computed.test.ts b/packages/@ember/object/type-tests/computed.test.ts
index 5d628f4cdbf..8ddd570c10e 100644
--- a/packages/@ember/object/type-tests/computed.test.ts
+++ b/packages/@ember/object/type-tests/computed.test.ts
@@ -1,4 +1,7 @@
 import { computed } from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(computed('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   declare firstName: string;
diff --git a/packages/@ember/object/type-tests/computed/alias.test.ts b/packages/@ember/object/type-tests/computed/alias.test.ts
index 948ac751d64..81b4ec81c69 100644
--- a/packages/@ember/object/type-tests/computed/alias.test.ts
+++ b/packages/@ember/object/type-tests/computed/alias.test.ts
@@ -1,4 +1,7 @@
 import { alias } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(alias('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @alias('foo') alias: unknown;
diff --git a/packages/@ember/object/type-tests/computed/and.test.ts b/packages/@ember/object/type-tests/computed/and.test.ts
index 8e38fd7287b..5a0bad6c125 100644
--- a/packages/@ember/object/type-tests/computed/and.test.ts
+++ b/packages/@ember/object/type-tests/computed/and.test.ts
@@ -1,4 +1,7 @@
 import { and } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(and('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @and('foo') and: unknown;
diff --git a/packages/@ember/object/type-tests/computed/bool.test.ts b/packages/@ember/object/type-tests/computed/bool.test.ts
index 9730de114fc..4a94984eb91 100644
--- a/packages/@ember/object/type-tests/computed/bool.test.ts
+++ b/packages/@ember/object/type-tests/computed/bool.test.ts
@@ -1,5 +1,9 @@
 import { bool } from '@ember/object/computed';
 
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(bool('foo')).toEqualTypeOf<PropertyDecorator>();
+
 class Foo {
   @bool('foo') declare bool: boolean;
 
diff --git a/packages/@ember/object/type-tests/computed/collect.test.ts b/packages/@ember/object/type-tests/computed/collect.test.ts
index ffb821a0a95..b68ecc6e9f4 100644
--- a/packages/@ember/object/type-tests/computed/collect.test.ts
+++ b/packages/@ember/object/type-tests/computed/collect.test.ts
@@ -1,5 +1,9 @@
 import { collect } from '@ember/object/computed';
 
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(collect('foo')).toEqualTypeOf<PropertyDecorator>();
+
 class Foo {
   @collect('foo') declare collect: unknown[];
   @collect('foo', 'bar', 'baz') declare collect2: unknown[];
diff --git a/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts b/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
index fc665f32400..9c4c1fa8ed5 100644
--- a/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
+++ b/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
@@ -1,5 +1,16 @@
 import { deprecatingAlias } from '@ember/object/computed';
 
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(
+  deprecatingAlias('foo', {
+    id: 'test',
+    until: '4.0.0',
+    for: 'testing',
+    since: { enabled: '3.0.0' },
+  })
+).toEqualTypeOf<PropertyDecorator>();
+
 class Foo {
   @deprecatingAlias('foo', {
     id: 'test',
diff --git a/packages/@ember/object/type-tests/computed/empty.test.ts b/packages/@ember/object/type-tests/computed/empty.test.ts
index 5f747702d4f..1fefe81bccf 100644
--- a/packages/@ember/object/type-tests/computed/empty.test.ts
+++ b/packages/@ember/object/type-tests/computed/empty.test.ts
@@ -1,4 +1,7 @@
 import { empty } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(empty('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @empty('foo') declare empty: boolean;
diff --git a/packages/@ember/object/type-tests/computed/equal.test.ts b/packages/@ember/object/type-tests/computed/equal.test.ts
index b3966d517a5..7ba996ff6cd 100644
--- a/packages/@ember/object/type-tests/computed/equal.test.ts
+++ b/packages/@ember/object/type-tests/computed/equal.test.ts
@@ -1,4 +1,7 @@
 import { equal } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(equal('foo', 'bar')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @equal('foo', 'bar') declare equal: boolean;
diff --git a/packages/@ember/object/type-tests/computed/filter-by.test.ts b/packages/@ember/object/type-tests/computed/filter-by.test.ts
index cb756d8d04b..8f9e0890f4c 100644
--- a/packages/@ember/object/type-tests/computed/filter-by.test.ts
+++ b/packages/@ember/object/type-tests/computed/filter-by.test.ts
@@ -1,4 +1,7 @@
 import { filterBy } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(filterBy('foo', 'key')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @filterBy('foo', 'key', 'value')
diff --git a/packages/@ember/object/type-tests/computed/filter.test.ts b/packages/@ember/object/type-tests/computed/filter.test.ts
index 134cdd08d02..eb41768c6b6 100644
--- a/packages/@ember/object/type-tests/computed/filter.test.ts
+++ b/packages/@ember/object/type-tests/computed/filter.test.ts
@@ -1,4 +1,7 @@
 import { filter } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(filter('foo', (item: unknown) => Boolean(item))).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @filter('foo', (item: unknown) => Boolean(item))
diff --git a/packages/@ember/object/type-tests/computed/gt.test.ts b/packages/@ember/object/type-tests/computed/gt.test.ts
index 9520b64d428..fa2e51210c0 100644
--- a/packages/@ember/object/type-tests/computed/gt.test.ts
+++ b/packages/@ember/object/type-tests/computed/gt.test.ts
@@ -1,4 +1,7 @@
 import { gt } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(gt('foo', 10)).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @gt('foo', 10) declare gt: boolean;
diff --git a/packages/@ember/object/type-tests/computed/gte.test.ts b/packages/@ember/object/type-tests/computed/gte.test.ts
index 8cb53de2472..6b2bbd8872e 100644
--- a/packages/@ember/object/type-tests/computed/gte.test.ts
+++ b/packages/@ember/object/type-tests/computed/gte.test.ts
@@ -1,4 +1,7 @@
 import { gte } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(gte('foo', 10)).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @gte('foo', 10) declare gte: boolean;
diff --git a/packages/@ember/object/type-tests/computed/intersect.test.ts b/packages/@ember/object/type-tests/computed/intersect.test.ts
index 0b96c0baff7..b38bb73e12d 100644
--- a/packages/@ember/object/type-tests/computed/intersect.test.ts
+++ b/packages/@ember/object/type-tests/computed/intersect.test.ts
@@ -1,4 +1,7 @@
 import { intersect } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(intersect('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @intersect('foo') declare intersect: unknown[];
diff --git a/packages/@ember/object/type-tests/computed/lt.test.ts b/packages/@ember/object/type-tests/computed/lt.test.ts
index 692116d7cf7..7b0ddd0868e 100644
--- a/packages/@ember/object/type-tests/computed/lt.test.ts
+++ b/packages/@ember/object/type-tests/computed/lt.test.ts
@@ -1,4 +1,7 @@
 import { lt } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(lt('foo', 10)).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @lt('foo', 10) declare lt: boolean;
diff --git a/packages/@ember/object/type-tests/computed/lte.test.ts b/packages/@ember/object/type-tests/computed/lte.test.ts
index 66d769811f2..79af85c30b6 100644
--- a/packages/@ember/object/type-tests/computed/lte.test.ts
+++ b/packages/@ember/object/type-tests/computed/lte.test.ts
@@ -1,4 +1,7 @@
 import { lte } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(lte('foo', 10)).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @lte('foo', 10) declare lte: boolean;
diff --git a/packages/@ember/object/type-tests/computed/map-by.test.ts b/packages/@ember/object/type-tests/computed/map-by.test.ts
index 85e88dc8ca6..63d0c0c3070 100644
--- a/packages/@ember/object/type-tests/computed/map-by.test.ts
+++ b/packages/@ember/object/type-tests/computed/map-by.test.ts
@@ -1,4 +1,7 @@
 import { mapBy } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(mapBy('foo', 'key')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @mapBy('foo', 'key')
diff --git a/packages/@ember/object/type-tests/computed/map.test.ts b/packages/@ember/object/type-tests/computed/map.test.ts
index 47d5aa75c76..ed725eab4bf 100644
--- a/packages/@ember/object/type-tests/computed/map.test.ts
+++ b/packages/@ember/object/type-tests/computed/map.test.ts
@@ -1,4 +1,7 @@
 import { map } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(map('foo', (item: unknown) => Boolean(item))).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @map('foo', (item: unknown) => Boolean(item))
diff --git a/packages/@ember/object/type-tests/computed/match.test.ts b/packages/@ember/object/type-tests/computed/match.test.ts
index 81d4f2778aa..b3f164a5c0d 100644
--- a/packages/@ember/object/type-tests/computed/match.test.ts
+++ b/packages/@ember/object/type-tests/computed/match.test.ts
@@ -1,4 +1,7 @@
 import { match } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(match('foo', /^foo$/)).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @match('foo', /^foo$/) declare match: boolean;
diff --git a/packages/@ember/object/type-tests/computed/max.test.ts b/packages/@ember/object/type-tests/computed/max.test.ts
index d7a9c1f8bfb..814e5d88c33 100644
--- a/packages/@ember/object/type-tests/computed/max.test.ts
+++ b/packages/@ember/object/type-tests/computed/max.test.ts
@@ -1,4 +1,7 @@
 import { max } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(max('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @max('foo') max: unknown;
diff --git a/packages/@ember/object/type-tests/computed/min.test.ts b/packages/@ember/object/type-tests/computed/min.test.ts
index 79f4ce72969..00bf8912328 100644
--- a/packages/@ember/object/type-tests/computed/min.test.ts
+++ b/packages/@ember/object/type-tests/computed/min.test.ts
@@ -1,4 +1,7 @@
 import { min } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(min('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @min('foo') min: unknown;
diff --git a/packages/@ember/object/type-tests/computed/none.test.ts b/packages/@ember/object/type-tests/computed/none.test.ts
index 7f0c51a1e4f..e9a8d5f1660 100644
--- a/packages/@ember/object/type-tests/computed/none.test.ts
+++ b/packages/@ember/object/type-tests/computed/none.test.ts
@@ -1,4 +1,7 @@
 import { none } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(none('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @none('foo') none: unknown;
diff --git a/packages/@ember/object/type-tests/computed/not-empty.test.ts b/packages/@ember/object/type-tests/computed/not-empty.test.ts
index 74ddd251f67..453a319426b 100644
--- a/packages/@ember/object/type-tests/computed/not-empty.test.ts
+++ b/packages/@ember/object/type-tests/computed/not-empty.test.ts
@@ -1,4 +1,7 @@
 import { notEmpty } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(notEmpty('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @notEmpty('foo') notEmpty: unknown;
diff --git a/packages/@ember/object/type-tests/computed/not.test.ts b/packages/@ember/object/type-tests/computed/not.test.ts
index a4d4590d730..e207bb826a4 100644
--- a/packages/@ember/object/type-tests/computed/not.test.ts
+++ b/packages/@ember/object/type-tests/computed/not.test.ts
@@ -1,4 +1,7 @@
 import { not } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(not('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @not('foo') not: unknown;
diff --git a/packages/@ember/object/type-tests/computed/one-way.test.ts b/packages/@ember/object/type-tests/computed/one-way.test.ts
index 32ed75de290..a02fcf08cb3 100644
--- a/packages/@ember/object/type-tests/computed/one-way.test.ts
+++ b/packages/@ember/object/type-tests/computed/one-way.test.ts
@@ -1,4 +1,7 @@
 import { oneWay } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(oneWay('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @oneWay('foo') oneWay: unknown;
diff --git a/packages/@ember/object/type-tests/computed/or.test.ts b/packages/@ember/object/type-tests/computed/or.test.ts
index 09e0b6f20ba..c06299353ff 100644
--- a/packages/@ember/object/type-tests/computed/or.test.ts
+++ b/packages/@ember/object/type-tests/computed/or.test.ts
@@ -1,4 +1,7 @@
 import { or } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(or('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @or('foo') or: unknown;
diff --git a/packages/@ember/object/type-tests/computed/read-only.test.ts b/packages/@ember/object/type-tests/computed/read-only.test.ts
index e63676bbbb8..3830a7de0ed 100644
--- a/packages/@ember/object/type-tests/computed/read-only.test.ts
+++ b/packages/@ember/object/type-tests/computed/read-only.test.ts
@@ -1,4 +1,7 @@
 import { readOnly } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(readOnly('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @readOnly('foo') readOnly: unknown;
diff --git a/packages/@ember/object/type-tests/computed/reads.test.ts b/packages/@ember/object/type-tests/computed/reads.test.ts
index 7a04111ac38..934d843ffbb 100644
--- a/packages/@ember/object/type-tests/computed/reads.test.ts
+++ b/packages/@ember/object/type-tests/computed/reads.test.ts
@@ -1,4 +1,7 @@
 import { reads } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(reads('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @reads('foo') reads: unknown;
diff --git a/packages/@ember/object/type-tests/computed/set-diff.test.ts b/packages/@ember/object/type-tests/computed/set-diff.test.ts
index 1911d92445d..b98cd5526bc 100644
--- a/packages/@ember/object/type-tests/computed/set-diff.test.ts
+++ b/packages/@ember/object/type-tests/computed/set-diff.test.ts
@@ -1,4 +1,7 @@
 import { setDiff } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(setDiff('foo', 'bar')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @setDiff('foo', 'bar') declare setDiff: boolean;
diff --git a/packages/@ember/object/type-tests/computed/sort.test.ts b/packages/@ember/object/type-tests/computed/sort.test.ts
index 8e10a5880a0..610f2923106 100644
--- a/packages/@ember/object/type-tests/computed/sort.test.ts
+++ b/packages/@ember/object/type-tests/computed/sort.test.ts
@@ -1,4 +1,7 @@
 import { sort } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(sort('foo', 'bar')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   // With sortKey
diff --git a/packages/@ember/object/type-tests/computed/sum.test.ts b/packages/@ember/object/type-tests/computed/sum.test.ts
index f64616829c6..4e49d537985 100644
--- a/packages/@ember/object/type-tests/computed/sum.test.ts
+++ b/packages/@ember/object/type-tests/computed/sum.test.ts
@@ -1,4 +1,7 @@
 import { sum } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(sum('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @sum('foo') sum: unknown;
diff --git a/packages/@ember/object/type-tests/computed/union.test.ts b/packages/@ember/object/type-tests/computed/union.test.ts
index 2b3251bf248..db6c47270fa 100644
--- a/packages/@ember/object/type-tests/computed/union.test.ts
+++ b/packages/@ember/object/type-tests/computed/union.test.ts
@@ -1,4 +1,7 @@
 import { union } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(union('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @union('foo') declare union: unknown[];
diff --git a/packages/@ember/object/type-tests/computed/uniq-by.test.ts b/packages/@ember/object/type-tests/computed/uniq-by.test.ts
index 23a026ac364..2ef82a7ce27 100644
--- a/packages/@ember/object/type-tests/computed/uniq-by.test.ts
+++ b/packages/@ember/object/type-tests/computed/uniq-by.test.ts
@@ -1,4 +1,7 @@
 import { uniqBy } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(uniqBy('foo', 'bar')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @uniqBy('foo', 'key')
diff --git a/packages/@ember/object/type-tests/computed/uniq.test.ts b/packages/@ember/object/type-tests/computed/uniq.test.ts
index b118d99c75a..4275c48b1b4 100644
--- a/packages/@ember/object/type-tests/computed/uniq.test.ts
+++ b/packages/@ember/object/type-tests/computed/uniq.test.ts
@@ -1,4 +1,7 @@
 import { uniq } from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(uniq('foo')).toEqualTypeOf<PropertyDecorator>();
 
 class Foo {
   @uniq('foo') declare uniq: unknown[];

From ffcdb9fc8256da573ee8ba17eae3e6f747ded2a4 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 14 Jan 2022 10:58:39 -0800
Subject: [PATCH 0803/1405] Fix failing lints

---
 packages/@ember/-internals/routing/lib/system/route.ts   | 9 +++++++--
 .../object/type-tests/computed/expand-properties.test.ts | 1 +
 packages/@ember/object/type-tests/evented/on.test.ts     | 1 +
 packages/@ember/object/type-tests/events/index.test.ts   | 2 ++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 001710f0f2e..c004d080f0c 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -56,6 +56,11 @@ export type QueryParamMeta = {
   };
 };
 
+type RouteTransitionState = TransitionState<Route> & {
+  fullQueryParams?: Record<string, unknown>;
+  queryParamsFor?: Record<string, Record<string, unknown>>;
+};
+
 export const ROUTE_CONNECTIONS = new WeakMap();
 const RENDER = (symbol('render') as unknown) as string;
 
@@ -2121,7 +2126,7 @@ type PartialRenderOptions = Partial<
   Pick<RenderOptions, 'into' | 'outlet' | 'controller' | 'model'>
 >;
 
-export function getFullQueryParams(router: EmberRouter, state: TransitionState<Route>) {
+export function getFullQueryParams(router: EmberRouter, state: RouteTransitionState) {
   if (state.fullQueryParams) {
     return state.fullQueryParams;
   }
@@ -2144,7 +2149,7 @@ export function getFullQueryParams(router: EmberRouter, state: TransitionState<R
   return fullQueryParamsState;
 }
 
-function getQueryParamsFor(route: Route, state: TransitionState<Route>) {
+function getQueryParamsFor(route: Route, state: RouteTransitionState) {
   state.queryParamsFor = state.queryParamsFor || {};
   let name = route.fullRouteName;
 
diff --git a/packages/@ember/object/type-tests/computed/expand-properties.test.ts b/packages/@ember/object/type-tests/computed/expand-properties.test.ts
index 87cf1d15752..d86d89509d7 100644
--- a/packages/@ember/object/type-tests/computed/expand-properties.test.ts
+++ b/packages/@ember/object/type-tests/computed/expand-properties.test.ts
@@ -1,5 +1,6 @@
 import { expandProperties } from '@ember/object/computed';
 
+// eslint-disable-next-line no-console
 expandProperties('{foo}.bar.{baz}', (arg: string) => console.log(arg));
 
 // @ts-expect-error a callback is required
diff --git a/packages/@ember/object/type-tests/evented/on.test.ts b/packages/@ember/object/type-tests/evented/on.test.ts
index 3bb191110a9..5520db8de1a 100644
--- a/packages/@ember/object/type-tests/evented/on.test.ts
+++ b/packages/@ember/object/type-tests/evented/on.test.ts
@@ -4,6 +4,7 @@ import { expectTypeOf } from 'expect-type';
 
 class Job {
   logCompleted = on('completed', function () {
+    // eslint-disable-next-line no-console
     console.log('Job completed!');
   });
 }
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
index 928b4c2cc0e..4561e98ac51 100644
--- a/packages/@ember/object/type-tests/events/index.test.ts
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -5,10 +5,12 @@ import { on } from '@ember/object/evented';
 
 class Job extends EmberObject {
   logStartOrUpdate = on('started', 'updated', () => {
+    // eslint-disable-next-line no-console
     console.log('Job updated!');
   });
 
   logCompleted = on('completed', () => {
+    // eslint-disable-next-line no-console
     console.log('Job completed!');
   });
 }

From c0a5ae33d2fa0f933c18baf8b3d944ac557ed515 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 18 Jan 2022 12:15:28 -0800
Subject: [PATCH 0804/1405] Fix a couple types

---
 packages/@ember/-internals/routing/lib/utils.ts               | 2 +-
 .../object/type-tests/computed/deprecating-alias.test.ts      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 7d122949e04..25be037d7e5 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -111,7 +111,7 @@ function _calculateCacheValuePrefix(prefix: string, part: string) {
 /*
   Stolen from Controller
 */
-export function calculateCacheKey(prefix: string, parts: string[] = [], values: {}): string {
+export function calculateCacheKey(prefix: string, parts: string[] = [], values: {} | null): string {
   let suffixes = '';
   for (let i = 0; i < parts.length; ++i) {
     let part = parts[i];
diff --git a/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts b/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
index 9c4c1fa8ed5..820123b4aa2 100644
--- a/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
+++ b/packages/@ember/object/type-tests/computed/deprecating-alias.test.ts
@@ -7,7 +7,7 @@ expectTypeOf(
     id: 'test',
     until: '4.0.0',
     for: 'testing',
-    since: { enabled: '3.0.0' },
+    since: { available: '3.0.0', enabled: '3.0.0' },
   })
 ).toEqualTypeOf<PropertyDecorator>();
 
@@ -16,7 +16,7 @@ class Foo {
     id: 'test',
     until: '4.0.0',
     for: 'testing',
-    since: { enabled: '3.0.0' },
+    since: { available: '3.0.0', enabled: '3.0.0' },
   })
   declare deprecatingAlias: unknown;
 

From 0ff7e435dc2028940ff1c9b0e7fd6129624407f2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 18 Jan 2022 15:37:20 -0800
Subject: [PATCH 0805/1405] Resolve failing tests

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 9 ++++++---
 .../@ember/-internals/routing/tests/system/route_test.js | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 43dfd7af84f..0568ce1a180 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -2,7 +2,6 @@ import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
-import { assert } from '@ember/debug';
 import { Router } from '../..';
 import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
 
@@ -173,8 +172,12 @@ ControllerMixin.reopen({
 
     // target may be either another controller or a router
     let target = get(this, 'target');
-    assert('controller or router', target instanceof Controller || target instanceof Router);
-    let method = target instanceof Controller ? target.transitionToRoute : target.transitionTo;
+
+    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
+    // mock out an object that only has the single method. Since this is deprecated, I think it's
+    // ok to be a little less than proper here.
+    let method = (target as Controller).transitionToRoute ?? (target as Router).transitionTo;
+
     return method.apply(target, prefixRouteNameArg(this, args));
   },
 
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 2b6fd159f29..b4693c2a4d1 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -3,7 +3,6 @@ import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-te
 import Service, { service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import EmberRoute from '../../lib/system/route';
-import { defineProperty } from '../../../metal';
 import ObjectProxy from '@ember/-internals/runtime/lib/system/object_proxy';
 
 let route, routeOne, routeTwo, lookupHash;
@@ -55,9 +54,6 @@ moduleFor(
       let owner = buildOwner(ownerOptions);
       setOwner(route, owner);
 
-      // Override the computed property by redefining it
-      defineProperty(route, '_qp', null, null);
-
       assert.equal(route.model({ post_id: 1 }), post);
       assert.equal(route.findModel('post', 1), post, '#findModel returns the correct post');
 

From 575892ba8623ca24f67ee3024070ac4f7f704abf Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 18 Jan 2022 16:16:46 -0800
Subject: [PATCH 0806/1405] Resolve comment that no longer applies

---
 packages/@ember/-internals/routing/lib/services/router.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index c9b5799c5d2..43c19b674d4 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -337,9 +337,6 @@ export default class RouterService extends Service {
         // *do not* account for this being `undefined`.
         routeName as string,
         models,
-        // UNSAFE: downstream consumers treat this as `QueryParam`, which the
-        // type system here *correctly* reports as incorrect, because it may be
-        // just an empty object.
         queryParams,
         true /* fromRouterService */
       );

From 6a9954389a4461ffc7da992fdb5eac1ffd1fa8ac Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 18 Jan 2022 16:19:27 -0800
Subject: [PATCH 0807/1405] Avoid an 'as any' cast

---
 packages/@ember/-internals/routing/lib/ext/controller.ts | 9 +++++++--
 packages/@ember/controller/index.d.ts                    | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 0568ce1a180..005bf7fe6cf 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -244,8 +244,13 @@ ControllerMixin.reopen({
   replaceRoute(...args: string[]) {
     deprecateTransitionMethods('controller', 'replaceRoute');
     // target may be either another controller or a router
-    let target = get(this, 'target') as any;
-    let method = target.replaceRoute || target.replaceWith;
+    let target = get(this, 'target');
+
+    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
+    // mock out an object that only has the single method. Since this is deprecated, I think it's
+    // ok to be a little less than proper here.
+    let method = (target as Controller).replaceRoute ?? (target as Router).replaceWith;
+
     return method.apply(target, prefixRouteNameArg(this, args));
   },
 });
diff --git a/packages/@ember/controller/index.d.ts b/packages/@ember/controller/index.d.ts
index 51abeed19ba..4e535921b74 100644
--- a/packages/@ember/controller/index.d.ts
+++ b/packages/@ember/controller/index.d.ts
@@ -7,6 +7,7 @@ export default class Controller {
   set<T>(key: string, value: T): void;
   setProperties(props: { [key: string]: any }): void;
   transitionToRoute(...args: unknown[]): unknown;
+  replaceRoute(...args: unknown[]): unknown;
   _qpDelegate: unknown;
 }
 

From ce44b6ab241c85ab6e7454af6c9ad2ed86485406 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 18 Jan 2022 17:19:28 -0800
Subject: [PATCH 0808/1405] Resolve some eslint warnings

---
 .../-internals/browser-environment/lib/has-dom.ts      |  2 +-
 .../-internals/glimmer/lib/component-managers/curly.ts |  2 +-
 .../-internals/glimmer/lib/component-managers/mount.ts |  2 +-
 packages/@ember/-internals/glimmer/lib/component.ts    |  2 +-
 .../@ember/-internals/glimmer/lib/helpers/action.ts    |  2 +-
 packages/@ember/-internals/glimmer/lib/resolver.ts     |  2 +-
 packages/@ember/-internals/glimmer/lib/syntax/mount.ts |  2 +-
 .../@ember/-internals/glimmer/lib/utils/bindings.ts    |  2 +-
 .../@ember/-internals/glimmer/lib/utils/to-bool.ts     |  2 +-
 .../integration/application/debug-render-tree-test.ts  |  2 +-
 packages/@ember/-internals/meta/lib/meta.ts            |  2 +-
 packages/@ember/-internals/metal/lib/computed.ts       | 10 +++++-----
 packages/@ember/-internals/metal/lib/events.ts         |  2 +-
 packages/@ember/-internals/metal/lib/mixin.ts          |  8 ++++----
 .../@ember/-internals/metal/lib/namespace_search.ts    |  2 +-
 packages/@ember/-internals/metal/lib/properties.ts     |  6 +++---
 .../@ember/-internals/routing/lib/services/router.ts   |  4 ++--
 .../@ember/-internals/routing/lib/services/routing.ts  |  4 ++--
 packages/@ember/-internals/routing/lib/system/dsl.ts   |  2 +-
 .../routing/lib/system/generate_controller.ts          |  2 +-
 packages/@ember/-internals/routing/lib/system/route.ts |  2 +-
 .../@ember/-internals/routing/lib/system/router.ts     |  4 ++--
 .../@ember/-internals/utils/lib/mandatory-setter.ts    |  3 +--
 packages/@ember/-internals/views/lib/system/utils.ts   |  2 +-
 packages/@ember/object/compat.ts                       |  2 +-
 .../lib/plugins/assert-against-attrs.ts                |  2 +-
 26 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/packages/@ember/-internals/browser-environment/lib/has-dom.ts b/packages/@ember/-internals/browser-environment/lib/has-dom.ts
index 7928623e8c3..0360db0bd8e 100644
--- a/packages/@ember/-internals/browser-environment/lib/has-dom.ts
+++ b/packages/@ember/-internals/browser-environment/lib/has-dom.ts
@@ -1,7 +1,7 @@
 // check if window exists and actually is the global
 export default typeof self === 'object' &&
   self !== null &&
-  (self as Window['self']).Object === Object &&
+  self.Object === Object &&
   typeof Window !== 'undefined' &&
   self.constructor === Window &&
   typeof document === 'object' &&
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 93aad70f2b8..e5bc8c04790 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -434,7 +434,7 @@ export default class CurlyComponentManager
 
     if (args !== null && !validateTag(argsTag, argsRevision)) {
       beginTrackFrame();
-      let props = processComponentArgs(args!);
+      let props = processComponentArgs(args);
       argsTag = bucket.argsTag = endTrackFrame();
 
       bucket.argsRevision = valueForTag(argsTag);
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index d712c739327..cf0bd78b57f 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -154,7 +154,7 @@ class MountManager
     let { controller, modelRef } = bucket;
 
     if (modelRef !== undefined) {
-      controller.set('model', valueForRef(modelRef!));
+      controller.set('model', valueForRef(modelRef));
     }
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index fc9a0590bda..38bf1b7333a 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -787,7 +787,7 @@ const Component = CoreView.extend(
         _element !== null
       );
 
-      let element = _element!;
+      let element = _element;
       let isSVG = element.namespaceURI === Namespace.SVG;
       let { type, normalized } = normalizeProperty(element, name);
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 51ecfc8d8b0..21a0146c9c5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -410,7 +410,7 @@ function makeClosureAction(
 
   if (typeofAction === 'string') {
     self = target;
-    fn = target.actions! && target.actions![action as string];
+    fn = (target.actions && target.actions[action as string])!;
 
     assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
   } else if (typeofAction === 'function') {
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index bf35d49cb59..96071ae14c5 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -252,7 +252,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     let key: object;
 
     if (pair.component === null) {
-      key = template = pair.layout!(owner);
+      key = template = pair.layout(owner);
     } else {
       key = pair.component;
     }
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index ad56720a0ea..e176840f7c8 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -87,7 +87,7 @@ export const mountHelper = internalHelper(
 
         assert(
           `You used \`{{mount '${name}'}}\`, but the engine '${name}' can not be found.`,
-          (owner as Owner).hasRegistration(`engine:${name}`)
+          owner.hasRegistration(`engine:${name}`)
         );
 
         lastName = name;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 14952e50647..894c1b2c441 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -116,7 +116,7 @@ export function createSimpleClassNameBindingRef(inner: Reference, path?: string)
         path !== undefined
       );
 
-      return dasherizedPath || (dasherizedPath = dasherize(path!));
+      return dasherizedPath || (dasherizedPath = dasherize(path));
     } else if (value || value === 0) {
       return String(value);
     } else {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
index a85d85310a9..5e6133ef246 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
@@ -6,7 +6,7 @@ import { consumeTag } from '@glimmer/validator';
 
 export default function toBool(predicate: unknown): boolean {
   if (isProxy(predicate)) {
-    consumeTag(tagForProperty(predicate as object, 'content'));
+    consumeTag(tagForProperty(predicate, 'content'));
 
     return Boolean(get(predicate, 'isTruthy'));
   } else if (isArray(predicate)) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 3ef31153049..d83f2b24fd6 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -28,7 +28,7 @@ interface CapturedBounds {
 }
 
 function compileTemplate(templateSource: string, options: Partial<EmberPrecompileOptions>) {
-  return compile(templateSource, options) as any;
+  return compile(templateSource, options);
 }
 
 type Expected<T> = T | ((actual: T) => boolean);
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 72b8d0ff433..0b3809f8f91 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -383,7 +383,7 @@ export class Meta {
   ): void {
     let listeners = this.writableListeners();
 
-    let i = indexOfListener(listeners, event, target, method!);
+    let i = indexOfListener(listeners, event, target, method);
 
     // remove if found listener was inherited
     if (i !== -1 && i < this._inheritedEnd) {
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 452c673ceed..e991361b766 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -344,7 +344,7 @@ export class ComputedProperty extends ComputedDescriptor {
           (typeof propertyDesc.get === 'function' || typeof propertyDesc.set === 'function')
       );
 
-      let { get, set } = propertyDesc!;
+      let { get, set } = propertyDesc;
 
       if (get !== undefined) {
         this._getter = get as ComputedPropertyGetterFunction;
@@ -414,7 +414,7 @@ export class ComputedProperty extends ComputedDescriptor {
       });
 
       if (_dependentKeys !== undefined) {
-        updateTag(propertyTag!, getChainTagsForKeys(obj, _dependentKeys, tagMeta, meta));
+        updateTag(propertyTag, getChainTagsForKeys(obj, _dependentKeys, tagMeta, meta));
 
         if (DEBUG) {
           ALLOW_CYCLES!.set(propertyTag, true);
@@ -427,7 +427,7 @@ export class ComputedProperty extends ComputedDescriptor {
       finishLazyChains(meta, keyName, ret);
     }
 
-    consumeTag(propertyTag!);
+    consumeTag(propertyTag);
 
     // Add the tag of the returned value if it is an array, since arrays
     // should always cause updates if they are consumed and then changed
@@ -573,7 +573,7 @@ class AutoComputedProperty extends ComputedProperty {
         ret = _getter!.call(obj, keyName);
       });
 
-      updateTag(propertyTag!, tag);
+      updateTag(propertyTag, tag);
 
       meta.setValueFor(keyName, ret);
       meta.setRevisionFor(keyName, valueForTag(propertyTag));
@@ -581,7 +581,7 @@ class AutoComputedProperty extends ComputedProperty {
       finishLazyChains(meta, keyName, ret);
     }
 
-    consumeTag(propertyTag!);
+    consumeTag(propertyTag);
 
     // Add the tag of the returned value if it is an array, since arrays
     // should always cause updates if they are consumed and then changed
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index 9875bbb4a47..8b50abedccf 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -133,7 +133,7 @@ export function sendEvent(
 
   for (let i = actions.length - 3; i >= 0; i -= 3) {
     // looping in reverse for once listeners
-    let target = actions[i] as any | null;
+    let target = actions[i];
     let method = actions[i + 1] as string | Function;
     let once = actions[i + 2] as boolean;
 
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 76dc825bdf1..041abbe31d8 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -814,9 +814,9 @@ export function observer<T extends (...args: any[]) => any>(
     dependentKeys = args as string[];
     sync = !ENV._DEFAULT_ASYNC_OBSERVERS;
   } else {
-    func = (funcOrDef as ObserverDefinition<T>).fn;
-    dependentKeys = (funcOrDef as ObserverDefinition<T>).dependentKeys;
-    sync = (funcOrDef as ObserverDefinition<T>).sync;
+    func = funcOrDef.fn;
+    dependentKeys = funcOrDef.dependentKeys;
+    sync = funcOrDef.sync;
   }
 
   assert('observer called without a function', typeof func === 'function');
@@ -831,7 +831,7 @@ export function observer<T extends (...args: any[]) => any>(
   let paths: string[] = [];
 
   for (let i = 0; i < dependentKeys.length; ++i) {
-    expandProperties(dependentKeys[i] as string, (path: string) => paths.push(path));
+    expandProperties(dependentKeys[i], (path: string) => paths.push(path));
   }
 
   setObservers(func as Function, {
diff --git a/packages/@ember/-internals/metal/lib/namespace_search.ts b/packages/@ember/-internals/metal/lib/namespace_search.ts
index 356cb85dc77..3fdb573698a 100644
--- a/packages/@ember/-internals/metal/lib/namespace_search.ts
+++ b/packages/@ember/-internals/metal/lib/namespace_search.ts
@@ -153,7 +153,7 @@ function tryIsNamespace(lookup: { [k: string]: any }, prop: string): Namespace |
     let obj = lookup[prop];
     return (
       ((obj !== null && typeof obj === 'object') || typeof obj === 'function') &&
-      (obj as any).isNamespace &&
+      obj.isNamespace &&
       obj
     );
   } catch (e) {
diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts
index 97af63fac18..0d98ee465d3 100644
--- a/packages/@ember/-internals/metal/lib/properties.ts
+++ b/packages/@ember/-internals/metal/lib/properties.ts
@@ -72,7 +72,7 @@ export function defineProperty(
   }
 
   if (isClassicDecorator(desc)) {
-    defineDecorator(obj, keyName, desc!, meta);
+    defineDecorator(obj, keyName, desc, meta);
   } else if (desc === null || desc === undefined) {
     defineValue(obj, keyName, data, wasDescriptor, true);
   } else {
@@ -91,9 +91,9 @@ export function defineDecorator(obj: object, keyName: string, desc: Decorator, m
   let propertyDesc;
 
   if (DEBUG) {
-    propertyDesc = desc!(obj, keyName, undefined, meta, true);
+    propertyDesc = desc(obj, keyName, undefined, meta, true);
   } else {
-    propertyDesc = desc!(obj, keyName, undefined, meta);
+    propertyDesc = desc(obj, keyName, undefined, meta);
   }
 
   Object.defineProperty(obj, keyName, propertyDesc as PropertyDescriptor);
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 43c19b674d4..eda135f2010 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,4 +1,4 @@
-import { getOwner, Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
 import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
@@ -58,7 +58,7 @@ export default class RouterService extends Service {
     if (router !== undefined) {
       return router;
     }
-    const owner = getOwner(this) as Owner;
+    const owner = getOwner(this);
     router = owner.lookup('router:main') as EmberRouter;
     return (this[ROUTER] = router);
   }
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 63864875dc2..19fbadd8dae 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 
-import { getOwner, Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { symbol } from '@ember/-internals/utils';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
@@ -27,7 +27,7 @@ export default class RoutingService extends Service {
     if (router !== undefined) {
       return router;
     }
-    const owner = getOwner(this) as Owner;
+    const owner = getOwner(this);
     router = owner.lookup('router:main') as EmberRouter;
     router.setupRouter();
     return (this[ROUTER] = router);
diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts
index 2b06e3b262d..355c9800301 100644
--- a/packages/@ember/-internals/routing/lib/system/dsl.ts
+++ b/packages/@ember/-internals/routing/lib/system/dsl.ts
@@ -77,7 +77,7 @@ export default class DSLImpl implements DSL {
     } else if (isCallback(_callback)) {
       assert('Unexpected arguments', arguments.length === 3);
       assert('Unexpected arguments', isOptions(_options));
-      options = _options as RouteOptions;
+      options = _options;
       callback = _callback;
     } else {
       options = _options || {};
diff --git a/packages/@ember/-internals/routing/lib/system/generate_controller.ts b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
index d31f7afa192..4737766ae7d 100644
--- a/packages/@ember/-internals/routing/lib/system/generate_controller.ts
+++ b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
@@ -16,7 +16,7 @@ import { DEBUG } from '@glimmer/env';
 */
 
 export function generateControllerFactory(owner: Owner, controllerName: string): Factory<{}> {
-  let Factory = owner.factoryFor<any, any>('controller:basic')!.class!;
+  let Factory = owner.factoryFor<any, any>('controller:basic')!.class;
 
   Factory = Factory.extend({
     toString() {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index c004d080f0c..9dffa040e3e 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -456,7 +456,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     let state = transition ? transition[STATE_SYMBOL] : this._router._routerMicrolib.state;
 
     let fullName = route.fullRouteName;
-    let params = Object.assign({}, state!.params[fullName!]);
+    let params = Object.assign({}, state!.params[fullName]);
     let queryParams = getQueryParamsFor(route, state!);
 
     return Object.keys(queryParams).reduce((params, key) => {
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index bc968bf668d..8be4f762866 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -596,7 +596,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     for (let i = 0; i < routeInfos.length; i++) {
       let route = routeInfos[i].route!;
-      let connections = ROUTE_CONNECTIONS.get(route!);
+      let connections = ROUTE_CONNECTIONS.get(route);
       let ownState: OutletState;
       if (connections.length === 0) {
         ownState = representEmptyRoute(liveRoutes, defaultParentState, route);
@@ -675,7 +675,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
         `A transition was attempted from '${this.currentRouteName}' to '${args[0]}' but the application instance has already been destroyed.`,
         !this.isDestroying && !this.isDestroyed
       );
-      return this._doURLTransition('transitionTo', args[0] as string);
+      return this._doURLTransition('transitionTo', args[0]);
     }
     let { routeName, models, queryParams } = extractRouteArgs(args);
     assert(
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 655319a5f8e..c1da3f19512 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -32,7 +32,6 @@ if (DEBUG) {
 
   let MANDATORY_SETTERS: WeakMap<
     object,
-    // @ts-ignore
     { [key: string | symbol]: PropertyDescriptorWithMeta }
   > = new WeakMap();
 
@@ -45,7 +44,7 @@ if (DEBUG) {
       return;
     }
 
-    SEEN_TAGS!.add(tag);
+    SEEN_TAGS.add(tag);
 
     if (Array.isArray(obj) && isElementKey(keyName)) {
       return;
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 5b4f7598df9..ba6e0371495 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -229,7 +229,7 @@ export const elMatches: typeof Element.prototype.matches | undefined =
 
 export function matches(el: Element, selector: string): boolean {
   assert('cannot call `matches` in fastboot mode', elMatches !== undefined);
-  return elMatches!.call(el, selector);
+  return elMatches.call(el, selector);
 }
 
 export function contains(a: Node, b: Node): boolean {
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index dc429f3135e..2a202bdd324 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -153,7 +153,7 @@ export function dependentKeyCompat(
           (typeof desc.get === 'function' || typeof desc.set === 'function')
       );
 
-      return wrapGetterSetter(target, key, desc!);
+      return wrapGetterSetter(target, key, desc);
     };
 
     setClassicDecorator(decorator);
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
index 1b610f6dfbf..c127df12ffc 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
@@ -55,7 +55,7 @@ export default function assertAgainstAttrs(env: EmberASTPluginEnvironment): ASTP
 
       PathExpression(node: AST.PathExpression): AST.Node | void {
         if (isAttrs(node, stack[stack.length - 1])) {
-          let path = b.path(node.original.substr(6)) as AST.PathExpression;
+          let path = b.path(node.original.substr(6));
 
           assert(
             `Using {{attrs}} to reference named arguments is not supported. {{attrs.${

From 57423800dda978fec82c9582f65cd68e0d37dd47 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 19 Jan 2022 09:13:45 -0800
Subject: [PATCH 0809/1405] Resolve some
 @typescript-eslint/restrict-plus-operands warnings

---
 packages/@ember/-internals/utils/lib/guid.ts    | 12 ++++++------
 packages/@ember/-internals/utils/lib/inspect.ts |  2 +-
 packages/@ember/-internals/utils/lib/symbol.ts  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/-internals/utils/lib/guid.ts b/packages/@ember/-internals/utils/lib/guid.ts
index 58db63d988f..35234aba999 100644
--- a/packages/@ember/-internals/utils/lib/guid.ts
+++ b/packages/@ember/-internals/utils/lib/guid.ts
@@ -71,7 +71,7 @@ export const GUID_KEY = intern(`__ember${Date.now()}`);
   @return {String} the guid
 */
 export function generateGuid(obj: object, prefix = GUID_PREFIX): String {
-  let guid = prefix + uuid();
+  let guid = prefix + uuid().toString();
 
   if (isObject(obj)) {
     OBJECT_GUIDS.set(obj, guid);
@@ -101,7 +101,7 @@ export function guidFor(value: any | null | undefined): string {
     guid = OBJECT_GUIDS.get(value);
 
     if (guid === undefined) {
-      guid = GUID_PREFIX + uuid();
+      guid = `${GUID_PREFIX}${uuid()}`;
       OBJECT_GUIDS.set(value, guid);
     }
   } else {
@@ -111,13 +111,13 @@ export function guidFor(value: any | null | undefined): string {
       let type = typeof value;
 
       if (type === 'string') {
-        guid = 'st' + uuid();
+        guid = `st${uuid()}`;
       } else if (type === 'number') {
-        guid = 'nu' + uuid();
+        guid = `nu${uuid()}`;
       } else if (type === 'symbol') {
-        guid = 'sy' + uuid();
+        guid = `sy${uuid()}`;
       } else {
-        guid = '(' + value + ')';
+        guid = `(${value})`;
       }
 
       NON_OBJECT_GUIDS.set(value, guid);
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index b03bd695338..89b549304cf 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -96,7 +96,7 @@ function inspectObject(obj: object, depth: number, seen: WeakSet<object>) {
     }
 
     let key = keys[i];
-    s += inspectKey(key) + ': ' + inspectValue(obj[key], depth, seen);
+    s += `${inspectKey(key)}: ${inspectValue(obj[key], depth, seen)}`;
   }
   s += ' }';
   return s;
diff --git a/packages/@ember/-internals/utils/lib/symbol.ts b/packages/@ember/-internals/utils/lib/symbol.ts
index 61fda0bf442..b4f4318f754 100644
--- a/packages/@ember/-internals/utils/lib/symbol.ts
+++ b/packages/@ember/-internals/utils/lib/symbol.ts
@@ -15,7 +15,7 @@ export function enumerableSymbol(debugName: string): string {
   // TODO: Investigate using platform symbols, but we do not
   // want to require non-enumerability for this API, which
   // would introduce a large cost.
-  let id = GUID_KEY + Math.floor(Math.random() * Date.now());
+  let id = GUID_KEY + Math.floor(Math.random() * Date.now()).toString();
   let symbol = intern(`__${debugName}${id}__`);
 
   if (DEBUG) {

From 95df93d670fd2efffc17087563862dc57d274095 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 19 Jan 2022 10:26:09 -0800
Subject: [PATCH 0810/1405] Resolve warnings in @ember/object/computed.d.ts

---
 packages/@ember/object/computed.d.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/object/computed.d.ts b/packages/@ember/object/computed.d.ts
index 2eb67512fcd..b7ca23c908e 100644
--- a/packages/@ember/object/computed.d.ts
+++ b/packages/@ember/object/computed.d.ts
@@ -18,7 +18,7 @@ export function deprecatingAlias(
 
 export function empty(dependentKey: string): PropertyDecorator;
 
-export function equal(dependentKey: string, value: any): PropertyDecorator;
+export function equal(dependentKey: string, value: unknown): PropertyDecorator;
 
 export function filter(
   dependentKey: string,
@@ -30,7 +30,11 @@ export function filter(
   callback: (value: unknown, index: number, array: unknown[]) => boolean
 ): PropertyDecorator;
 
-export function filterBy(dependentKey: string, propertyKey: string, value?: any): PropertyDecorator;
+export function filterBy(
+  dependentKey: string,
+  propertyKey: string,
+  value?: unknown
+): PropertyDecorator;
 
 export function gt(dependentKey: string, value: number): PropertyDecorator;
 

From 251d3eb21f07888b431dc1fb814eab7a6b55636c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 19 Jan 2022 10:36:02 -0800
Subject: [PATCH 0811/1405] Resolve some warnings in tests

---
 packages/@ember/object/type-tests/computed.test.ts        | 2 +-
 packages/@ember/object/type-tests/define-property.test.ts | 2 +-
 packages/@ember/object/type-tests/ember-object.test.ts    | 6 ++++--
 packages/@ember/object/type-tests/evented/on.test.ts      | 2 +-
 packages/@ember/object/type-tests/events/index.test.ts    | 3 +++
 packages/@ember/object/type-tests/get-properties.test.ts  | 2 +-
 packages/@ember/object/type-tests/get.test.ts             | 2 +-
 packages/@ember/object/type-tests/mixin/index.test.ts     | 2 +-
 packages/@ember/object/type-tests/observer.test.ts        | 5 +++--
 packages/@ember/object/type-tests/observers/index.test.ts | 2 ++
 packages/@ember/object/type-tests/set-properties.test.ts  | 2 +-
 packages/@ember/object/type-tests/set.test.ts             | 2 +-
 packages/@ember/object/type-tests/try-set.test.ts         | 4 ++--
 13 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/packages/@ember/object/type-tests/computed.test.ts b/packages/@ember/object/type-tests/computed.test.ts
index 8ddd570c10e..e7e70e32280 100644
--- a/packages/@ember/object/type-tests/computed.test.ts
+++ b/packages/@ember/object/type-tests/computed.test.ts
@@ -22,7 +22,7 @@ class Foo {
   declare badFullName: string;
 
   // NOTE: This works, but is not recommended.
-  @computed('firstName', 'lastName', function () {
+  @computed('firstName', 'lastName', function (this: Foo) {
     return `${this.firstName} ${this.lastName}`;
   })
   declare altFullName: string;
diff --git a/packages/@ember/object/type-tests/define-property.test.ts b/packages/@ember/object/type-tests/define-property.test.ts
index 3da35db32af..26dad03a8b0 100644
--- a/packages/@ember/object/type-tests/define-property.test.ts
+++ b/packages/@ember/object/type-tests/define-property.test.ts
@@ -1,6 +1,6 @@
 import { defineProperty } from '@ember/object';
 
-let contact = {};
+const contact = {};
 
 // ES5 compatible mode
 defineProperty(contact, 'firstName', {
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index 91405e19494..0baa0c8a2d5 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -57,7 +57,7 @@ expectTypeOf(p.toggleProperty('age')).toEqualTypeOf<boolean>();
 expectTypeOf(p.cacheFor('age')).toEqualTypeOf<unknown>();
 
 // get is not preferred for TS and only returns unknown
-let getPropertiesResult = p.getProperties('firstName', 'lastName', 'invalid');
+const getPropertiesResult = p.getProperties('firstName', 'lastName', 'invalid');
 expectTypeOf(getPropertiesResult).toEqualTypeOf<{
   firstName: unknown;
   lastName: unknown;
@@ -69,7 +69,7 @@ getPropertiesResult.unknown;
 expectTypeOf(p.set('firstName', 'Joe')).toEqualTypeOf<string>();
 expectTypeOf(p.set('invalid', 1)).toEqualTypeOf<number>();
 
-let setPropertiesResult = p.setProperties({ firstName: 'Joe', invalid: 1 });
+const setPropertiesResult = p.setProperties({ firstName: 'Joe', invalid: 1 });
 expectTypeOf(setPropertiesResult).toEqualTypeOf<{
   firstName: string;
   invalid: number;
@@ -105,8 +105,10 @@ class MyComponent extends EmberObject {
   constructor() {
     super();
     this.addObserver('foo', this, 'fooDidChange');
+
     this.addObserver('foo', this, this.fooDidChange);
     this.removeObserver('foo', this, 'fooDidChange');
+
     this.removeObserver('foo', this, this.fooDidChange);
     const lambda = () => {
       this.fooDidChange(this, 'foo');
diff --git a/packages/@ember/object/type-tests/evented/on.test.ts b/packages/@ember/object/type-tests/evented/on.test.ts
index 5520db8de1a..e5073d9d06d 100644
--- a/packages/@ember/object/type-tests/evented/on.test.ts
+++ b/packages/@ember/object/type-tests/evented/on.test.ts
@@ -9,7 +9,7 @@ class Job {
   });
 }
 
-let job = new Job();
+const job = new Job();
 
 sendEvent(job, 'completed'); // Logs 'Job completed!'
 
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
index 4561e98ac51..fe65d4ef4c5 100644
--- a/packages/@ember/object/type-tests/events/index.test.ts
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -26,9 +26,12 @@ class MyClass extends EmberObject {
     super();
     addListener(this, 'willDestroy', this, 'willDestroyListener');
     addListener(this, 'willDestroy', this, 'willDestroyListener', true);
+
     addListener(this, 'willDestroy', this, this.willDestroyListener);
+
     addListener(this, 'willDestroy', this, this.willDestroyListener, true);
     removeListener(this, 'willDestroy', this, 'willDestroyListener');
+
     removeListener(this, 'willDestroy', this, this.willDestroyListener);
   }
 
diff --git a/packages/@ember/object/type-tests/get-properties.test.ts b/packages/@ember/object/type-tests/get-properties.test.ts
index 3504d8082c9..090141ddf03 100644
--- a/packages/@ember/object/type-tests/get-properties.test.ts
+++ b/packages/@ember/object/type-tests/get-properties.test.ts
@@ -2,7 +2,7 @@ import { getProperties } from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
 
-let foo = { baz: 1 };
+const foo = { baz: 1 };
 
 // We can't correctly infer CP types so just return unknown
 expectTypeOf(getProperties(foo, 'baz', 'missing')).toEqualTypeOf<{
diff --git a/packages/@ember/object/type-tests/get.test.ts b/packages/@ember/object/type-tests/get.test.ts
index aef422a6102..c6edb2e1022 100644
--- a/packages/@ember/object/type-tests/get.test.ts
+++ b/packages/@ember/object/type-tests/get.test.ts
@@ -2,7 +2,7 @@ import { get } from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
 
-let foo = { baz: 1 };
+const foo = { baz: 1 };
 
 // We can infer basic types
 expectTypeOf(get(foo, 'baz')).toEqualTypeOf<number>();
diff --git a/packages/@ember/object/type-tests/mixin/index.test.ts b/packages/@ember/object/type-tests/mixin/index.test.ts
index 0ad9cc6d0de..6d558fa77a4 100644
--- a/packages/@ember/object/type-tests/mixin/index.test.ts
+++ b/packages/@ember/object/type-tests/mixin/index.test.ts
@@ -2,7 +2,7 @@ import { expectTypeOf } from 'expect-type';
 
 import Mixin from '@ember/object/mixin';
 
-let newMixin = Mixin.create({
+const newMixin = Mixin.create({
   foo: 'bar',
 });
 
diff --git a/packages/@ember/object/type-tests/observer.test.ts b/packages/@ember/object/type-tests/observer.test.ts
index 8be9df0a99e..d185987376a 100644
--- a/packages/@ember/object/type-tests/observer.test.ts
+++ b/packages/@ember/object/type-tests/observer.test.ts
@@ -2,8 +2,9 @@ import { observer } from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
 
-let definition = {
+const definition = {
   dependentKeys: ['value1', 'value2', 'value3'],
+
   fn: () => {},
   sync: true,
 };
@@ -22,7 +23,7 @@ class Foo {
   extraKeysObserver = observer('extraKey', definition);
 }
 
-let foo = new Foo();
+const foo = new Foo();
 
 expectTypeOf(foo.valueObserver).toEqualTypeOf<() => void>();
 expectTypeOf(foo.definitionObserver).toEqualTypeOf<() => void>();
diff --git a/packages/@ember/object/type-tests/observers/index.test.ts b/packages/@ember/object/type-tests/observers/index.test.ts
index d9e54753ca0..9ac5ac0dbe3 100644
--- a/packages/@ember/object/type-tests/observers/index.test.ts
+++ b/packages/@ember/object/type-tests/observers/index.test.ts
@@ -5,8 +5,10 @@ class MyComponent {
 
   constructor() {
     addObserver(this, 'foo', this, 'fooDidChange');
+
     addObserver(this, 'foo', this, this.fooDidChange);
     removeObserver(this, 'foo', this, 'fooDidChange');
+
     removeObserver(this, 'foo', this, this.fooDidChange);
     const lambda = () => {
       this.fooDidChange(this, 'foo');
diff --git a/packages/@ember/object/type-tests/set-properties.test.ts b/packages/@ember/object/type-tests/set-properties.test.ts
index b1b8143338b..c2a40934ae7 100644
--- a/packages/@ember/object/type-tests/set-properties.test.ts
+++ b/packages/@ember/object/type-tests/set-properties.test.ts
@@ -2,7 +2,7 @@ import { setProperties } from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
 
-let foo = { baz: 1 };
+const foo = { baz: 1 };
 
 expectTypeOf(setProperties(foo, { baz: 2, missing: true })).toEqualTypeOf<{
   baz: number;
diff --git a/packages/@ember/object/type-tests/set.test.ts b/packages/@ember/object/type-tests/set.test.ts
index 8a5583309f9..08dfee92e90 100644
--- a/packages/@ember/object/type-tests/set.test.ts
+++ b/packages/@ember/object/type-tests/set.test.ts
@@ -2,7 +2,7 @@ import { set } from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
 
-let foo = { baz: 1 };
+const foo = { baz: 1 };
 
 expectTypeOf(set(foo, 'baz', 2)).toEqualTypeOf<number>();
 
diff --git a/packages/@ember/object/type-tests/try-set.test.ts b/packages/@ember/object/type-tests/try-set.test.ts
index 1efa83213e8..074990400af 100644
--- a/packages/@ember/object/type-tests/try-set.test.ts
+++ b/packages/@ember/object/type-tests/try-set.test.ts
@@ -1,9 +1,9 @@
 import { trySet } from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
-let obj = { name: 'Zoey' };
+const obj = { name: 'Zoey' };
 
-let result = trySet(obj, 'contacts.twitter', '@emberjs');
+const result = trySet(obj, 'contacts.twitter', '@emberjs');
 expectTypeOf(result).toEqualTypeOf<string | undefined>();
 
 // @ts-expect-error requires a value

From 7f41e6eea3886771db1c02aed48c486c87c11543 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 20 Jan 2022 13:28:37 -0800
Subject: [PATCH 0812/1405] Avoid losing some internal type information

---
 .../-internals/container/lib/container.ts     |  2 +-
 .../@ember/-internals/glimmer/lib/helper.ts   | 56 +++++++++++--------
 packages/@ember/-internals/runtime/index.d.ts | 20 -------
 .../-internals/runtime/{index.js => index.ts} |  0
 .../-internals/runtime/lib/mixins/array.d.ts  | 12 ++++
 .../@ember/-internals/runtime/lib/type-of.js  |  2 +-
 6 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/index.d.ts
 rename packages/@ember/-internals/runtime/{index.js => index.ts} (100%)
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/array.d.ts

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index f9e9e2a947e..0a34b3bbfe4 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -461,7 +461,7 @@ export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void
   obj[INIT_FACTORY] = factory;
 }
 
-class FactoryManager<T, C> {
+export class FactoryManager<T, C> {
   readonly container: Container;
   readonly owner: Owner | null;
   readonly class: Factory<T, C> & DebugFactory<T, C>;
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 36b6060caf6..2370ffe92e8 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -2,6 +2,7 @@
 @module @ember/component
 */
 
+import { FactoryManager } from '@ember/-internals/container/lib/container';
 import { Factory, Owner, setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { getDebugName, symbol } from '@ember/-internals/utils';
@@ -27,6 +28,8 @@ export interface HelperInstance<T = unknown> {
   destroy(): void;
 }
 
+const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
+
 export interface SimpleHelper<T = unknown> {
   compute: HelperFunction<T>;
 }
@@ -76,11 +79,26 @@ export interface SimpleHelper<T = unknown> {
   @public
   @since 1.13.0
 */
-let Helper = FrameworkObject.extend({
+interface Helper {
+  /**
+    Override this function when writing a class-based helper.
+
+    @method compute
+    @param {Array} params The positional arguments to the helper
+    @param {Object} hash The named arguments to the helper
+    @public
+    @since 1.13.0
+  */
+  compute(params: unknown[], hash: object): unknown;
+}
+class Helper extends FrameworkObject {
+  static isHelperFactory = true;
+  static [IS_CLASSIC_HELPER] = true;
+
   init() {
-    this._super(...arguments);
+    super.init();
     this[RECOMPUTE_TAG] = createTag();
-  },
+  }
 
   /**
     On a class-based helper, it may be useful to force a recomputation of that
@@ -113,23 +131,8 @@ let Helper = FrameworkObject.extend({
   */
   recompute() {
     join(() => dirtyTag(this[RECOMPUTE_TAG]));
-  },
-
-  /**
-    Override this function when writing a class-based helper.
-
-    @method compute
-    @param {Array} params The positional arguments to the helper
-    @param {Object} hash The named arguments to the helper
-    @public
-    @since 1.13.0
-  */
-});
-
-const IS_CLASSIC_HELPER = symbol('IS_CLASSIC_HELPER');
-
-Helper.isHelperFactory = true;
-Helper[IS_CLASSIC_HELPER] = true;
+  }
+}
 
 export function isClassicHelper(obj: object): boolean {
   return obj[IS_CLASSIC_HELPER] === true;
@@ -154,9 +157,10 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
     this.ownerInjection = ownerInjection;
   }
 
-  createHelper(definition: typeof Helper, args: Arguments) {
-    let instance =
-      definition.class === undefined ? definition.create(this.ownerInjection) : definition.create();
+  createHelper<T, C>(definition: typeof Helper | FactoryManager<T, C>, args: Arguments) {
+    let instance = isFactoryManager<T, C>(definition)
+      ? definition.create()
+      : definition.create(this.ownerInjection);
 
     return {
       instance,
@@ -183,6 +187,10 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
+function isFactoryManager<T, C>(obj: unknown): obj is FactoryManager<T, C> {
+  return obj != null && 'class' in (obj as FactoryManager<T, C>);
+}
+
 setHelperManager((owner: Owner | undefined): ClassicHelperManager => {
   return new ClassicHelperManager(owner);
 }, Helper);
@@ -252,4 +260,4 @@ export function helper(helperFn: HelperFunction): HelperFactory<SimpleHelper> {
   return new Wrapper(helperFn);
 }
 
-export default Helper as HelperFactory<HelperInstance>;
+export default Helper;
diff --git a/packages/@ember/-internals/runtime/index.d.ts b/packages/@ember/-internals/runtime/index.d.ts
deleted file mode 100644
index 3efcfebfe81..00000000000
--- a/packages/@ember/-internals/runtime/index.d.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import CoreObject from './lib/system/core_object';
-import Object from './lib/system/object';
-import Evented from './lib/mixins/evented';
-export { default as copy } from './lib/copy';
-
-export const TargetActionSupport: any;
-export function isArray(arr: any): boolean;
-
-export { CoreObject, Object };
-
-export const FrameworkObject: any;
-
-export function _contentFor(proxy: any): any;
-
-export const A: any;
-export const ActionHandler: any;
-export { Evented };
-export function typeOf(obj: any): string;
-
-export { default as Observable } from './lib/mixins/observable';
diff --git a/packages/@ember/-internals/runtime/index.js b/packages/@ember/-internals/runtime/index.ts
similarity index 100%
rename from packages/@ember/-internals/runtime/index.js
rename to packages/@ember/-internals/runtime/index.ts
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
new file mode 100644
index 00000000000..4d606684210
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -0,0 +1,12 @@
+declare const Array: any;
+declare const NativeArray: any;
+declare const MutableArray: any;
+
+export const A: any;
+export function isArray(arr: any): boolean;
+export function removeAt(...args: any[]): any;
+export function uniqBy(...args: any[]): any;
+
+export { NativeArray, MutableArray };
+
+export default Array;
diff --git a/packages/@ember/-internals/runtime/lib/type-of.js b/packages/@ember/-internals/runtime/lib/type-of.js
index 76bf2d1eead..4fd77f74760 100644
--- a/packages/@ember/-internals/runtime/lib/type-of.js
+++ b/packages/@ember/-internals/runtime/lib/type-of.js
@@ -77,7 +77,7 @@ const { toString } = Object.prototype;
 
   @method typeOf
   @for @ember/utils
-  @param {Object} item the item to check
+  @param item the item to check
   @return {String} the type
   @public
   @static

From 44d831642986096dc207dbcf76c6a415a4f61601 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Jan 2022 08:30:11 +0000
Subject: [PATCH 0813/1405] Bump nanoid from 3.1.25 to 3.2.0

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.25 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.25...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c36537406b7..1b45485be1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9265,9 +9265,9 @@ nanocolors@^0.1.0, nanocolors@^0.1.5:
   integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
 nanoid@^3.1.25:
-  version "3.1.25"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152"
-  integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
 nanomatch@^1.2.9:
   version "1.2.9"

From d1fab78b3d926e66412cfdd775c2f4b75189cf57 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 20 Jan 2022 14:23:07 -0800
Subject: [PATCH 0814/1405] Future public types for @ember/array

---
 .../-internals/glimmer/lib/utils/iterator.ts  |   3 +-
 packages/@ember/-internals/metal/lib/array.ts |   6 +-
 .../-internals/routing/lib/system/route.ts    |   4 +-
 .../-internals/runtime/lib/mixins/array.d.ts  | 109 ++++++++-
 .../-internals/runtime/lib/mixins/array.js    |   1 +
 .../runtime/lib/system/array_proxy.d.ts       |  14 ++
 packages/@ember/-internals/utils/index.ts     |   2 +-
 .../-internals/utils/lib/ember-array.ts       |   8 +-
 .../@ember/-internals/utils/lib/make-array.ts |   3 +-
 packages/@ember/array/index.js                |   2 -
 packages/@ember/array/index.ts                |   2 +
 .../@ember/array/{mutable.js => mutable.ts}   |   0
 packages/@ember/array/{proxy.js => proxy.ts}  |   0
 packages/@ember/array/type-tests/index.ts     | 210 ++++++++++++++++++
 packages/@ember/array/type-tests/mutable.ts   |  63 ++++++
 packages/@ember/array/type-tests/proxy.ts     |  20 ++
 16 files changed, 421 insertions(+), 26 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
 delete mode 100644 packages/@ember/array/index.js
 create mode 100644 packages/@ember/array/index.ts
 rename packages/@ember/array/{mutable.js => mutable.ts} (100%)
 rename packages/@ember/array/{proxy.js => proxy.ts} (100%)
 create mode 100644 packages/@ember/array/type-tests/index.ts
 create mode 100644 packages/@ember/array/type-tests/mutable.ts
 create mode 100644 packages/@ember/array/type-tests/proxy.ts

diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index d597ebeb0fa..c94977ffa36 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -1,5 +1,6 @@
 import { objectAt } from '@ember/-internals/metal';
-import { EmberArray, isEmberArray, isObject } from '@ember/-internals/utils';
+import { Array as EmberArray } from '@ember/-internals/runtime';
+import { isEmberArray, isObject } from '@ember/-internals/utils';
 import { Option } from '@glimmer/interfaces';
 import { IteratorDelegate } from '@glimmer/reference';
 import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index fca4a400659..1a4e9154b56 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -1,4 +1,4 @@
-import { EmberArray } from '@ember/-internals/utils';
+import { Array as EmberArray, MutableArray, NativeArray } from '@ember/-internals/runtime';
 import { arrayContentDidChange, arrayContentWillChange } from './array_events';
 import { addListener, removeListener } from './events';
 
@@ -17,7 +17,7 @@ export function objectAt<T>(array: T[] | EmberArray<T>, index: number): T | unde
 }
 
 export function replace<T>(
-  array: T[] | EmberArray<T>,
+  array: NativeArray<T> | MutableArray<T>,
   start: number,
   deleteCount: number,
   items = EMPTY_ARRAY
@@ -34,7 +34,7 @@ const CHUNK_SIZE = 60000;
 // To avoid overflowing the stack, we splice up to CHUNK_SIZE items at a time.
 // See https://code.google.com/p/chromium/issues/detail?id=56588 for more details.
 export function replaceInNativeArray<T>(
-  array: T[] | EmberArray<T>,
+  array: T[] | NativeArray<T>,
   start: number,
   deleteCount: number,
   items: ReadonlyArray<T>
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index c004d080f0c..cc7eb7faa34 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2177,9 +2177,11 @@ function getQueryParamsFor(route: Route, state: RouteTransitionState) {
   return params;
 }
 
+// FIXME: This should probably actually return a `NativeArray` if the passed in value is an Array.
 function copyDefaultValue<T>(value: T): T {
   if (Array.isArray(value)) {
-    return emberA(value.slice());
+    // SAFETY: We lost the type data about the array if we don't cast.
+    return (emberA(value.slice()) as unknown) as T;
   }
   return value;
 }
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index 4d606684210..e5de10a78fd 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -1,12 +1,103 @@
-declare const Array: any;
-declare const NativeArray: any;
-declare const MutableArray: any;
+import { Mixin } from '@ember/-internals/metal';
 
-export const A: any;
-export function isArray(arr: any): boolean;
-export function removeAt(...args: any[]): any;
-export function uniqBy(...args: any[]): any;
+type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
 
-export { NativeArray, MutableArray };
+interface EmberArray<T> {
+  length: number;
+  objectAt(idx: number): T | undefined;
+  objectsAt(indexes: number[]): Array<T | undefined>;
+  firstObject: T | undefined;
+  lastObject: T | undefined;
+  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
+  indexOf(object: T, startAt?: number): number;
+  lastIndexOf(object: T, startAt?: number): number;
+  forEach<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => void,
+    target?: Target
+  ): this;
+  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
+  setEach<K extends string>(key: K, value: Value<T, K>): this;
+  map<U, Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => U,
+    target?: Target
+  ): NativeArray<U>;
+  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
+  filter<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    target?: Target
+  ): NativeArray<T>;
+  reject<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    target?: Target
+  ): NativeArray<T>;
+  filterBy(key: string): NativeArray<T>;
+  rejectBy(key: string): NativeArray<T>;
+  find<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    target?: Target
+  ): T | undefined;
+  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
+  every<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    target?: Target
+  ): boolean;
+  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
+  any<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    target?: Target
+  ): boolean;
+  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
+  reduce<V>(
+    callback: (summation: V, current: T, index: number, arr: this) => V,
+    initialValue?: V
+  ): V;
+  invoke<K extends string>(
+    methodName: K,
+    ...args: Value<T, K> extends (...args: any[]) => any ? Parameters<Value<T, K>> : unknown[]
+  ): NativeArray<Value<T, K> extends (...args: any[]) => any ? ReturnType<Value<T, K>> : unknown>;
+  toArray(): T[];
+  compact(): NativeArray<Exclude<T, null>>;
+  includes(object: T, startAt?: number): boolean;
+  sortBy(key: string): T[];
+  uniq(): NativeArray<T>;
+  uniqBy(key: string): NativeArray<T>;
+  without(value: T): NativeArray<T>;
+}
 
-export default Array;
+declare const EmberArray: Mixin;
+export default EmberArray;
+
+interface MutableArray<T> extends EmberArray<T> {
+  replace(idx: number, amt: number, objects: T[]): void;
+  clear(): this;
+  insertAt(idx: number, object: T): this;
+  removeAt(start: number, len: number): this;
+  pushObject(obj: T): this;
+  pushObjects(objects: T[]): this;
+  popObject(): T | undefined;
+  shiftObject(): T | null | undefined;
+  unshiftObject(object: T): this;
+  unshiftObjects(objects: T[]): this;
+  reverseObjects(): this;
+  setObjects(object: T[]): this;
+  removeObject(object: T): this;
+  removeObjects(objects: T[]): this;
+  addObject(obj: T): this;
+  addObjects(objects: T[]): this;
+}
+
+declare const MutableArray: Mixin;
+export { MutableArray };
+
+// NOTE: We have to Omit some definitions from Array because MutableArray defines them differently.
+interface NativeArray<T>
+  extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
+    MutableArray<T> {}
+declare const NativeArray: Array<unknown>;
+export { NativeArray };
+
+export function A<T>(arr?: T): T extends Array<infer V> ? NativeArray<V> : NativeArray<unknown>;
+
+export function removeAt<T>(array: T[] | EmberArray<T>, start: number, len: number): EmberArray<T>;
+export function uniqBy<T>(array: T[], keyOrFunc: string | ((item: T) => unknown)): T[];
+export function isArray(obj: unknown): boolean;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index c8caf748b2e..3c87ff82abf 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -1101,6 +1101,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Object} The reduced value.
     @public
   */
+  // FIXME: When called without initialValue, behavior does not match native behavior
   reduce(callback, initialValue) {
     assert('`reduce` expects a function as first argument.', typeof callback === 'function');
 
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
new file mode 100644
index 00000000000..bc164bc6813
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
@@ -0,0 +1,14 @@
+import EmberArray, { MutableArray } from '../mixins/array';
+import EmberObject from './object';
+
+interface ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>> extends MutableArray<T> {
+  content: C;
+  arrangedContent: C;
+  objectAtContent(idx: number): T | undefined;
+  replaceContent(idx: number, amt: number, objects: T[]): void;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+declare class ArrayProxy<T, C extends EmberArray<T>> extends EmberObject {}
+
+export { ArrayProxy as default };
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index a81d48c75fb..af55ecd97f5 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -30,7 +30,7 @@ export { default as toString } from './lib/to-string';
 export { isObject } from './lib/spec';
 export { isProxy, setProxy } from './lib/is_proxy';
 export { default as Cache } from './lib/cache';
-export { EmberArray, setEmberArray, isEmberArray } from './lib/ember-array';
+export { setEmberArray, isEmberArray } from './lib/ember-array';
 export {
   setupMandatorySetter,
   teardownMandatorySetter,
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index b81e3c63e0e..d4305d2ee54 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -1,14 +1,8 @@
+import { Array as EmberArray } from '@ember/-internals/runtime';
 import { _WeakSet } from '@glimmer/util';
 
 const EMBER_ARRAYS = new _WeakSet();
 
-export interface EmberArray<T> {
-  length: number;
-  objectAt(index: number): T | undefined;
-  replace(start: number, deleteCount: number, items: T[]): void;
-  splice(start: number, deleteCount: number, ...items: T[]): void;
-}
-
 export function setEmberArray(obj: object) {
   EMBER_ARRAYS.add(obj);
 }
diff --git a/packages/@ember/-internals/utils/lib/make-array.ts b/packages/@ember/-internals/utils/lib/make-array.ts
index aff0302e4a3..12f628eed78 100644
--- a/packages/@ember/-internals/utils/lib/make-array.ts
+++ b/packages/@ember/-internals/utils/lib/make-array.ts
@@ -29,8 +29,7 @@ const { isArray } = Array;
  @return {Array}
  @private
  */
-function makeArray<T>(obj: T[]): T[];
-function makeArray<T>(obj: T): T[];
+function makeArray<T, TT>(obj: T): T extends TT[] ? T : T extends null | undefined ? [] : [T];
 function makeArray(obj: any | null | undefined): Array<any | null | undefined> {
   if (obj === null || obj === undefined) {
     return [];
diff --git a/packages/@ember/array/index.js b/packages/@ember/array/index.js
deleted file mode 100644
index a7ab583fc86..00000000000
--- a/packages/@ember/array/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export { Array as default, isArray, A } from '@ember/-internals/runtime';
-export { makeArray } from '@ember/-internals/utils';
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
new file mode 100644
index 00000000000..bacb74f0967
--- /dev/null
+++ b/packages/@ember/array/index.ts
@@ -0,0 +1,2 @@
+export { Array as default, NativeArray, isArray, A } from '@ember/-internals/runtime';
+export { makeArray } from '@ember/-internals/utils';
diff --git a/packages/@ember/array/mutable.js b/packages/@ember/array/mutable.ts
similarity index 100%
rename from packages/@ember/array/mutable.js
rename to packages/@ember/array/mutable.ts
diff --git a/packages/@ember/array/proxy.js b/packages/@ember/array/proxy.ts
similarity index 100%
rename from packages/@ember/array/proxy.js
rename to packages/@ember/array/proxy.ts
diff --git a/packages/@ember/array/type-tests/index.ts b/packages/@ember/array/type-tests/index.ts
new file mode 100644
index 00000000000..67a31719d42
--- /dev/null
+++ b/packages/@ember/array/type-tests/index.ts
@@ -0,0 +1,210 @@
+import EmberArray, { A, NativeArray, isArray, makeArray } from '@ember/array';
+import MutableArray from '@ember/array/mutable';
+
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  bar = 1;
+  hi(): string {
+    return 'Hi';
+  }
+  withArgs(foo: number, bar: string): string {
+    return `${foo}${bar}`;
+  }
+}
+
+let foo = new Foo();
+
+let arr = A([foo]);
+
+class Target {
+  foo = 2;
+}
+
+let target = new Target();
+
+expectTypeOf(arr).toMatchTypeOf<EmberArray<Foo>>();
+expectTypeOf(arr).toMatchTypeOf<MutableArray<Foo>>();
+expectTypeOf(arr).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.length).toEqualTypeOf<number>();
+
+expectTypeOf(arr.objectAt(1)).toEqualTypeOf<Foo | undefined>();
+
+expectTypeOf(arr.firstObject).toEqualTypeOf<Foo | undefined>();
+
+expectTypeOf(arr.lastObject).toEqualTypeOf<Foo | undefined>();
+
+expectTypeOf(arr.slice()).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(arr.slice(1)).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(arr.slice(1, 2)).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.indexOf(new Foo())).toEqualTypeOf<number>();
+// @ts-expect-error checks param type
+arr.indexOf('invalid');
+
+expectTypeOf(arr.lastIndexOf(new Foo())).toEqualTypeOf<number>();
+// @ts-expect-error checks param type
+arr.lastIndexOf('invalid');
+
+expectTypeOf(arr.forEach((item: Foo) => String(item))).toEqualTypeOf(arr);
+
+arr.forEach((item, index, arr) => {
+  expectTypeOf(this).toEqualTypeOf<undefined>();
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+});
+arr.forEach(function (_item) {
+  expectTypeOf(this).toEqualTypeOf(target);
+}, target);
+
+expectTypeOf(arr.getEach('bar')).toEqualTypeOf<NativeArray<number>>();
+expectTypeOf(arr.getEach('missing')).toEqualTypeOf<NativeArray<unknown>>();
+
+expectTypeOf(arr.setEach('bar', 2)).toEqualTypeOf(arr);
+// @ts-expect-error string is not assignable to bar
+arr.setEach('bar', 'string');
+
+// Can set unknown property
+expectTypeOf(arr.setEach('missing', 'anything')).toEqualTypeOf(arr);
+
+let mapped = arr.map((item, index, arr) => {
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+  return 1;
+});
+expectTypeOf(mapped).toEqualTypeOf<NativeArray<number>>();
+
+arr.map(function (_item) {
+  expectTypeOf(this).toEqualTypeOf(target);
+}, target);
+
+expectTypeOf(arr.mapBy('bar')).toEqualTypeOf<NativeArray<number>>();
+expectTypeOf(arr.mapBy('missing')).toEqualTypeOf<NativeArray<unknown>>();
+
+let filtered = arr.filter((item, index, arr) => {
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+  return true;
+});
+expectTypeOf(filtered).toEqualTypeOf<NativeArray<Foo>>();
+arr.filter(function (_item) {
+  expectTypeOf(this).toEqualTypeOf(target);
+  return true;
+}, target);
+
+let rejected = arr.reject((item, index, arr) => {
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+  return true;
+});
+expectTypeOf(rejected).toEqualTypeOf<NativeArray<Foo>>();
+arr.reject(function (_item) {
+  expectTypeOf(this).toEqualTypeOf(target);
+  return true;
+}, target);
+
+expectTypeOf(arr.filterBy('bar')).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(arr.filterBy('missing')).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.rejectBy('bar')).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(arr.rejectBy('missing')).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.findBy('bar')).toEqualTypeOf<Foo | undefined>();
+arr.findBy('bar', 1);
+// @ts-expect-error value has incorrect type
+arr.findBy('bar', 'invalid');
+arr.findBy('missing', 'whatever');
+
+let isEvery = arr.every((item, index, arr) => {
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+  return true;
+});
+expectTypeOf(isEvery).toEqualTypeOf<boolean>();
+arr.every(function (_item) {
+  expectTypeOf(this).toEqualTypeOf(target);
+  return true;
+}, target);
+
+expectTypeOf(arr.isEvery('bar')).toEqualTypeOf<boolean>();
+arr.isEvery('bar', 1);
+// @ts-expect-error value has incorrect type
+arr.isEvery('bar', 'invalid');
+arr.isEvery('missing', 'whatever');
+
+let isAny = arr.any((item, index, arr) => {
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+  return true;
+});
+expectTypeOf(isAny).toEqualTypeOf<boolean>();
+arr.any(function (_item) {
+  expectTypeOf(this).toEqualTypeOf(target);
+  return true;
+}, target);
+
+expectTypeOf(arr.isAny('bar')).toEqualTypeOf<boolean>();
+arr.isAny('bar', 1);
+// @ts-expect-error value has incorrect type
+arr.isAny('bar', 'invalid');
+arr.isAny('missing', 'whatever');
+
+let reduced = arr.reduce((summation, item, index, arr) => {
+  expectTypeOf(summation).toEqualTypeOf<number>();
+  expectTypeOf(item).toEqualTypeOf<Foo>();
+  expectTypeOf(index).toEqualTypeOf<number>();
+  expectTypeOf(arr).toEqualTypeOf(arr);
+  return 1;
+}, 1);
+expectTypeOf(reduced).toEqualTypeOf<number>();
+// NOTE: This doesn't match native behavior and is a bit weird
+expectTypeOf(arr.reduce((summation, _item) => summation)).toEqualTypeOf<unknown>();
+
+expectTypeOf(arr.invoke('hi')).toEqualTypeOf<NativeArray<string>>();
+expectTypeOf(arr.invoke('withArgs', 1, 'two')).toEqualTypeOf<NativeArray<string>>();
+// @ts-expect-error Doesn't allow calling with invalid args
+arr.invoke('withArgs', 'invalid');
+expectTypeOf(arr.invoke('missing')).toEqualTypeOf<NativeArray<unknown>>();
+// Currently, args passed to unrecognized methods are ignored
+arr.invoke('missing', 'invalid');
+
+expectTypeOf(arr.toArray()).toEqualTypeOf<Foo[]>();
+
+expectTypeOf(arr.compact()).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(A([foo, null]).compact()).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.includes(foo)).toEqualTypeOf<boolean>();
+// @ts-expect-error Invalid type
+arr.includes(1);
+
+// For some reason this doesn't return a NativeArray
+expectTypeOf(arr.sortBy('bar')).toEqualTypeOf<Foo[]>();
+// Doesn't enforce keys
+expectTypeOf(arr.sortBy('missing')).toEqualTypeOf<Foo[]>();
+
+expectTypeOf(arr.uniq()).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.uniqBy('bar')).toEqualTypeOf<NativeArray<Foo>>();
+// Doesn't enforce keys
+expectTypeOf(arr.uniqBy('missing')).toEqualTypeOf<NativeArray<Foo>>();
+
+expectTypeOf(arr.without(foo)).toEqualTypeOf<NativeArray<Foo>>();
+// @ts-expect-error invalid type
+arr.without(1);
+
+expectTypeOf(isArray(arr)).toEqualTypeOf<boolean>();
+
+expectTypeOf(makeArray(arr)).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(makeArray([foo])).toEqualTypeOf<Foo[]>();
+expectTypeOf(makeArray(foo)).toEqualTypeOf<[Foo]>();
+expectTypeOf(makeArray(1)).toEqualTypeOf<[number]>();
+expectTypeOf(makeArray('string')).toEqualTypeOf<[string]>();
+expectTypeOf(makeArray(undefined)).toEqualTypeOf<[]>();
+expectTypeOf(makeArray(null)).toEqualTypeOf<[]>();
diff --git a/packages/@ember/array/type-tests/mutable.ts b/packages/@ember/array/type-tests/mutable.ts
new file mode 100644
index 00000000000..7728981004c
--- /dev/null
+++ b/packages/@ember/array/type-tests/mutable.ts
@@ -0,0 +1,63 @@
+import MutableArray from '@ember/array/mutable';
+import { A } from '@ember/array';
+
+import { expectTypeOf } from 'expect-type';
+
+class Foo {}
+
+let foo = new Foo();
+
+let arr = A([foo]);
+
+expectTypeOf(arr).toMatchTypeOf<MutableArray<Foo>>();
+
+expectTypeOf(arr.replace(1, 1, [foo])).toEqualTypeOf<void>();
+// TODO: Why doesn't this fail?
+arr.replace(1, 1, ['invalid']);
+
+expectTypeOf(arr.clear()).toEqualTypeOf(arr);
+
+expectTypeOf(arr.insertAt(1, foo)).toEqualTypeOf(arr);
+
+// TODO: Why doesn't this fail?
+arr.insertAt(1, 'invalid');
+
+expectTypeOf(arr.removeAt(1, 1)).toEqualTypeOf(arr);
+
+expectTypeOf(arr.pushObject(foo)).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.pushObject('invalid');
+
+expectTypeOf(arr.pushObjects([foo])).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.pushObjects(['invalid']);
+
+expectTypeOf(arr.popObject()).toEqualTypeOf<Foo | undefined>();
+
+expectTypeOf(arr.shiftObject()).toEqualTypeOf<Foo | null | undefined>();
+
+expectTypeOf(arr.unshiftObject(foo)).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.unshiftObject('invalid');
+
+expectTypeOf(arr.unshiftObjects([foo])).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.unshiftObjects(['invalid']);
+
+expectTypeOf(arr.reverseObjects()).toEqualTypeOf(arr);
+
+expectTypeOf(arr.setObjects([foo])).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.setObjects(['invalid']);
+
+expectTypeOf(arr.removeObject(foo)).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.removeObject('invalid');
+
+expectTypeOf(arr.addObject(foo)).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.addObject('invalid');
+
+expectTypeOf(arr.addObjects([foo])).toEqualTypeOf(arr);
+// TODO: Why doesn't this fail?
+arr.addObjects(['invalid']);
diff --git a/packages/@ember/array/type-tests/proxy.ts b/packages/@ember/array/type-tests/proxy.ts
new file mode 100644
index 00000000000..f88be3f36b6
--- /dev/null
+++ b/packages/@ember/array/type-tests/proxy.ts
@@ -0,0 +1,20 @@
+import EmberArray, { A, NativeArray } from '@ember/array';
+import ArrayProxy from '@ember/array/proxy';
+import MutableArray from '@ember/array/mutable';
+
+import { expectTypeOf } from 'expect-type';
+
+class Foo {}
+
+let foo = new Foo();
+
+let content = A([foo]);
+
+// We can't infer the correct type through `create`;
+let proxy = ArrayProxy.create({ content }) as ArrayProxy<Foo, NativeArray<Foo>>;
+
+expectTypeOf(proxy).toMatchTypeOf<EmberArray<Foo>>();
+expectTypeOf(proxy).toMatchTypeOf<MutableArray<Foo>>();
+
+expectTypeOf(proxy.content).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(proxy.arrangedContent).toEqualTypeOf<NativeArray<Foo>>();

From 80db8ef9e93d662c9aa4570f99546e48f1a9de01 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 25 Jan 2022 09:48:40 -0800
Subject: [PATCH 0815/1405] Clean up some object types duplication

---
 .../runtime/lib/mixins/observable.d.ts        | 12 ++++++
 .../-internals/runtime/lib/system/object.d.ts | 40 ++-----------------
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
index 6507deb533e..ff3fffef6c0 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
@@ -20,27 +20,32 @@ export interface Observable {
   getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
   getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
 
+  // NOT TYPE SAFE!
   /**
    * Sets the provided key or path to the value.
    */
   set<T>(key: string, value: T): T;
 
+  // NOT TYPE SAFE!
   /**
    * Sets a list of properties at once. These properties are set inside
    * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
    * observers will be buffered.
    */
   setProperties<T extends Record<string, any>>(hash: T): T;
+
   /**
    * Convenience method to call `propertyWillChange` and `propertyDidChange` in
    * succession.
    */
   notifyPropertyChange(keyName: string): this;
+
   /**
    * Adds an observer on a property.
    */
   addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
   addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
   /**
    * Remove an observer you have previously registered on this object. Pass
    * the same key, target, and method you passed to `addObserver()` and your
@@ -52,19 +57,26 @@ export interface Observable {
     method: ObserverMethod<Target, this>
   ): this;
   removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
+  // NOT TYPE SAFE!
   /**
    * Set the value of a property to the current value plus some amount.
    */
   incrementProperty(keyName: keyof this, increment?: number): number;
+
+  // NOT TYPE SAFE!
   /**
    * Set the value of a property to the current value minus some amount.
    */
   decrementProperty(keyName: keyof this, decrement?: number): number;
+
+  // NOT TYPE SAFE!
   /**
    * Set the value of a boolean property to the opposite of its
    * current value.
    */
   toggleProperty(keyName: keyof this): boolean;
+
   /**
    * Returns the cached value of a computed property, if it exists.
    * This allows you to inspect the value of a computed property
diff --git a/packages/@ember/-internals/runtime/lib/system/object.d.ts b/packages/@ember/-internals/runtime/lib/system/object.d.ts
index 7b9bf87700b..95e884e933c 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.d.ts
@@ -1,41 +1,9 @@
 import CoreObject from './core_object';
-import { Observable, ObserverMethod } from '../mixins/observable';
+import { Observable } from '../mixins/observable';
 
-export default class Object extends CoreObject implements Observable {
-  get(key: string): unknown;
-
-  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
-
-  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
-
-  /** NOT TYPE SAFE! */
-  set<T>(key: string, value: T): T;
-
-  /** NOT TYPE SAFE! */
-  setProperties<T extends Record<string, any>>(hash: T): T;
-
-  notifyPropertyChange(keyName: string): this;
-
-  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
-
-  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-
-  removeObserver<Target>(
-    key: keyof this,
-    target: Target,
-    method: ObserverMethod<Target, this>
-  ): this;
-  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  incrementProperty(keyName: keyof this, increment?: number): number;
-
-  /** NOT TYPE SAFE! */
-  decrementProperty(keyName: keyof this, decrement?: number): number;
-
-  /** NOT TYPE SAFE! */
-  toggleProperty(keyName: keyof this): boolean;
-
-  cacheFor<K extends keyof this>(key: K): unknown;
-}
+interface EmberObject extends CoreObject, Observable {}
+declare class EmberObject extends CoreObject {}
+export { EmberObject as default };
 
 export class FrameworkObject extends CoreObject {
   /** @internal */

From 3768472fcf6015d5a325c72ea124546845548662 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 20 Jan 2022 14:31:43 -0800
Subject: [PATCH 0816/1405] Move some pass-through .js files to .ts

---
 .../{container-debug-adapter.js => container-debug-adapter.ts}    | 0
 packages/@ember/debug/{data-adapter.js => data-adapter.ts}        | 0
 packages/@ember/enumerable/{index.js => index.ts}                 | 0
 packages/@ember/template-factory/{index.js => index.ts}           | 0
 packages/@ember/utils/{index.js => index.ts}                      | 0
 packages/@ember/version/{index.js => index.ts}                    | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/@ember/debug/{container-debug-adapter.js => container-debug-adapter.ts} (100%)
 rename packages/@ember/debug/{data-adapter.js => data-adapter.ts} (100%)
 rename packages/@ember/enumerable/{index.js => index.ts} (100%)
 rename packages/@ember/template-factory/{index.js => index.ts} (100%)
 rename packages/@ember/utils/{index.js => index.ts} (100%)
 rename packages/@ember/version/{index.js => index.ts} (100%)

diff --git a/packages/@ember/debug/container-debug-adapter.js b/packages/@ember/debug/container-debug-adapter.ts
similarity index 100%
rename from packages/@ember/debug/container-debug-adapter.js
rename to packages/@ember/debug/container-debug-adapter.ts
diff --git a/packages/@ember/debug/data-adapter.js b/packages/@ember/debug/data-adapter.ts
similarity index 100%
rename from packages/@ember/debug/data-adapter.js
rename to packages/@ember/debug/data-adapter.ts
diff --git a/packages/@ember/enumerable/index.js b/packages/@ember/enumerable/index.ts
similarity index 100%
rename from packages/@ember/enumerable/index.js
rename to packages/@ember/enumerable/index.ts
diff --git a/packages/@ember/template-factory/index.js b/packages/@ember/template-factory/index.ts
similarity index 100%
rename from packages/@ember/template-factory/index.js
rename to packages/@ember/template-factory/index.ts
diff --git a/packages/@ember/utils/index.js b/packages/@ember/utils/index.ts
similarity index 100%
rename from packages/@ember/utils/index.js
rename to packages/@ember/utils/index.ts
diff --git a/packages/@ember/version/index.js b/packages/@ember/version/index.ts
similarity index 100%
rename from packages/@ember/version/index.js
rename to packages/@ember/version/index.ts

From 842fd3cdb2547e56c8d7198d9f230f7c130a2534 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 20 Jan 2022 08:37:58 -0800
Subject: [PATCH 0817/1405] Correct types for getOwner

---
 .../glimmer/lib/component-managers/curly.ts   |  1 +
 .../-internals/glimmer/lib/component.ts       |  2 ++
 .../@ember/-internals/glimmer/lib/renderer.ts |  9 +++++----
 .../-internals/glimmer/lib/setup-registry.ts  |  5 ++++-
 .../-internals/glimmer/lib/views/outlet.ts    |  2 ++
 packages/@ember/-internals/owner/index.ts     |  4 ++--
 .../routing/lib/location/auto_location.ts     |  4 +++-
 .../-internals/routing/lib/services/router.ts |  8 ++++++--
 .../routing/lib/services/routing.ts           |  5 ++++-
 .../-internals/routing/lib/system/route.ts    | 16 ++++++++++++---
 .../-internals/routing/lib/system/router.ts   | 20 ++++++++++++++++---
 .../@ember/-internals/routing/lib/utils.ts    |  4 +++-
 .../-internals/views/lib/system/utils.ts      |  1 +
 13 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index e5bc8c04790..47ac8096e1d 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -126,6 +126,7 @@ export default class CurlyComponentManager
   protected templateFor(component: Component): CompilableProgram | null {
     let { layout, layoutName } = component;
     let owner = getOwner(component);
+    assert('Component is unexpectedly missing an owner', owner);
 
     let factory: TemplateFactory;
 
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 38bf1b7333a..9901ba079b2 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -708,6 +708,8 @@ const Component = CoreView.extend(
     get _dispatcher(): EventDispatcher | null {
       if (this.__dispatcher === undefined) {
         let owner = getOwner(this);
+        assert('Component is unexpectedly missing an owner', owner);
+
         if (owner.lookup<Environment>('-environment:main')!.isInteractive) {
           this.__dispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
         } else {
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 9d4fec3e5cc..775662b1cd8 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -292,15 +292,16 @@ export class Renderer {
 
   static create(props: { _viewRegistry: any }): Renderer {
     let { _viewRegistry } = props;
-    let document = getOwner(props).lookup('service:-document') as SimpleDocument;
-    let env = getOwner(props).lookup('-environment:main') as {
+    let owner = getOwner(props);
+    assert('Renderer is unexpectedly missing an owner', owner);
+    let document = owner.lookup('service:-document') as SimpleDocument;
+    let env = owner.lookup('-environment:main') as {
       isInteractive: boolean;
       hasDOM: boolean;
     };
-    let owner = getOwner(props);
     let rootTemplate = owner.lookup(P`template:-root`) as TemplateFactory;
     let builder = owner.lookup('service:-dom-builder') as IBuilder;
-    return new this(getOwner(props), document, env, rootTemplate, _viewRegistry, builder);
+    return new this(owner, document, env, rootTemplate, _viewRegistry, builder);
   }
 
   constructor(
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index ca3eaa85352..317f26f735b 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -1,6 +1,7 @@
 import { privatize as P, Registry } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { getOwner } from '@ember/-internals/owner';
+import { assert } from '@ember/debug';
 import Component from './component';
 import Input from './components/input';
 import LinkTo from './components/link-to';
@@ -17,7 +18,9 @@ export function setupApplicationRegistry(registry: Registry): void {
   // association won't leak
   registry.register('service:-dom-builder', {
     create(props) {
-      let env = getOwner(props).lookup('-environment:main') as { _renderMode: string };
+      let owner = getOwner(props);
+      assert('DomBuilderService is unexpectedly missing an owner', owner);
+      let env = owner.lookup('-environment:main') as { _renderMode: string };
 
       switch (env._renderMode) {
         case 'serialize':
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index e6822d38564..bc6a4117c4d 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,4 +1,5 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
+import { assert } from '@ember/debug';
 import { schedule } from '@ember/runloop';
 import { Template } from '@glimmer/interfaces';
 import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
@@ -36,6 +37,7 @@ export default class OutletView {
   static create(options: any): OutletView {
     let { environment: _environment, application: namespace, template: templateFactory } = options;
     let owner = getOwner(options);
+    assert('OutletView is unexpectedly missing an owner', owner);
     let template = templateFactory(owner);
     return new OutletView(_environment, owner, template, namespace);
   }
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 7961ac36473..43e3e26b9eb 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -82,8 +82,8 @@ export interface Owner {
   @since 2.3.0
   @public
 */
-export function getOwner(object: any): Owner {
-  return glimmerGetOwner(object) as Owner;
+export function getOwner(object: any): Owner | undefined {
+  return glimmerGetOwner(object);
 }
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 7a5fde23700..3ad97c299f7 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -180,7 +180,9 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
       implementation = 'none';
     }
 
-    let concrete = getOwner(this).lookup<EmberLocation>(`location:${implementation}`);
+    let owner = getOwner(this);
+    assert('AutoLocation is unexpectedly missing an owner', owner);
+    let concrete = owner.lookup<EmberLocation>(`location:${implementation}`);
     assert(`Could not find location '${implementation}'.`, concrete !== undefined);
 
     set(concrete, 'rootURL', rootURL);
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index eda135f2010..9591e69aacc 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -58,7 +58,9 @@ export default class RouterService extends Service {
     if (router !== undefined) {
       return router;
     }
-    const owner = getOwner(this);
+    let owner = getOwner(this);
+    assert('RouterService is unexpectedly missing an owner', owner);
+
     router = owner.lookup('router:main') as EmberRouter;
     return (this[ROUTER] = router);
   }
@@ -514,7 +516,9 @@ if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
         this.isActive(pivotRouteName)
       );
 
-      let pivotRoute = getOwner(this).lookup(`route:${pivotRouteName}`) as Route;
+      let owner = getOwner(this);
+      assert('RouterService is unexpectedly missing an owner', owner);
+      let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
 
       return this._router._routerMicrolib.refresh(pivotRoute);
     },
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 19fbadd8dae..0ee46bb97ad 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -4,6 +4,7 @@
 
 import { getOwner } from '@ember/-internals/owner';
 import { symbol } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import EmberRouter from '../system/router';
@@ -27,7 +28,9 @@ export default class RoutingService extends Service {
     if (router !== undefined) {
       return router;
     }
-    const owner = getOwner(this);
+    let owner = getOwner(this);
+    assert('RoutingService is unexpectedly missing an owner', owner);
+
     router = owner.lookup('router:main') as EmberRouter;
     router.setupRouter();
     return (this[ROUTER] = router);
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 2809f61a59e..3467152dc98 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -338,7 +338,9 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   _setRouteName(name: string) {
     this.routeName = name;
-    this.fullRouteName = getEngineRouteName(getOwner(this), name)!;
+    let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+    this.fullRouteName = getEngineRouteName(owner, name)!;
   }
 
   /**
@@ -446,7 +448,9 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   paramsFor(name: string) {
-    let route = getOwner(this).lookup<Route>(`route:${name}`);
+    let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+    let route = owner.lookup<Route>(`route:${name}`);
 
     if (route === undefined) {
       return {};
@@ -1535,6 +1539,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   controllerFor(name: string, _skipAssert: boolean): Controller {
     let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
     let route = owner.lookup<Route>(`route:${name}`);
 
     if (route && route.controllerName) {
@@ -1577,6 +1582,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   generateController(name: string) {
     let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
 
     return generateController(owner, name);
   }
@@ -1626,6 +1632,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   modelFor(_name: string) {
     let name;
     let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
     let transition =
       this._router && this._router._routerMicrolib
         ? this._router._routerMicrolib.activeTransition
@@ -1758,7 +1765,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   */
   @computed
   protected get store() {
-    let owner = getOwner(this);
+    const owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
     let routeName = this.routeName;
 
     return {
@@ -1817,6 +1825,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
     let controllerName = this.controllerName || this.routeName;
     let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
     let controller = owner.lookup<Controller>(`controller:${controllerName}`);
     let queryParameterConfiguraton = get(this, 'queryParams');
     let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
@@ -2036,6 +2045,7 @@ function buildRenderOptions(
   );
 
   let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
   let name, templateName, into, outlet, model;
   let controller: Controller | string | undefined = undefined;
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 8be4f762866..a15670c154b 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -312,7 +312,8 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   _initRouterJs(): void {
     let location = get(this, 'location') as IEmberLocation;
     let router = this;
-    let owner = getOwner(this);
+    const owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
     let seen = Object.create(null);
 
     class PrivateRouter extends Router<Route> {
@@ -330,6 +331,8 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
         let fullRouteName = `route:${routeName}`;
 
+        assert('Route is unexpectedly missing an owner', routeOwner);
+
         let route = routeOwner.lookup<Route>(fullRouteName);
 
         if (seen[name]) {
@@ -500,7 +503,8 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   _buildDSL(): DSL {
     let enableLoadingSubstates = this._hasModuleBasedResolver();
     let router = this;
-    let owner = getOwner(this);
+    const owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
     let options = {
       enableLoadingSubstates,
       resolveRouteMap(name: string) {
@@ -527,6 +531,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
   _hasModuleBasedResolver() {
     let owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
     let resolver = get(owner, 'application.__registry__.resolver.moduleBasedResolver');
     return Boolean(resolver);
   }
@@ -624,6 +629,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     if (!this._toplevelView) {
       let owner = getOwner(this);
+      assert('Router is unexpectedly missing an owner', owner);
       let OutletView = owner.factoryFor<OutletView, FactoryClass>('view:-outlet')!;
       let application = owner.lookup('application:main');
       let environment = owner.lookup('-environment:main');
@@ -828,6 +834,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     let location = this.location;
     let rootURL = this.rootURL;
     let owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
 
     if ('string' === typeof location) {
       let resolvedLocation = owner.lookup<IEmberLocation>(`location:${location}`);
@@ -1370,6 +1377,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     if (!engineInstance) {
       let owner = getOwner(this);
+      assert('Router is unexpectedly missing an owner', owner);
 
       assert(
         `You attempted to mount the engine '${name}' in your router map, but the engine can not be found.`,
@@ -1606,6 +1614,8 @@ function logError(_error: any, initialMessage: string) {
 */
 function findRouteSubstateName(route: Route, state: string) {
   let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
+
   let { routeName, fullRouteName, _router: router } = route;
 
   let substateName = `${routeName}_${state}`;
@@ -1626,6 +1636,8 @@ function findRouteSubstateName(route: Route, state: string) {
 */
 function findRouteStateName(route: Route, state: string) {
   let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
+
   let { routeName, fullRouteName, _router: router } = route;
 
   let stateName = routeName === 'application' ? state : `${routeName}.${state}`;
@@ -1745,7 +1757,9 @@ function updatePaths(router: EmberRouter) {
   set(router, 'currentRouteName', currentRouteName);
   set(router, 'currentURL', currentURL);
 
-  let appController = getOwner(router).lookup<Controller>('controller:application');
+  let owner = getOwner(router);
+  assert('Router is unexpectedly missing an owner', owner);
+  let appController = owner.lookup<Controller>('controller:application');
 
   if (!appController) {
     // appController might not exist when top-level loading/error
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 25be037d7e5..7c533f98ea6 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -1,6 +1,6 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { deprecate } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
 import Router, { STATE_SYMBOL } from 'router_js';
 import Route from './system/route';
@@ -219,6 +219,8 @@ export function resemblesURL(str: unknown): str is string {
 export function prefixRouteNameArg(route: Route, args: any[]) {
   let routeName = args[0];
   let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
+
   let prefix = owner.mountPoint;
 
   // only alter the routeName if it's actually referencing a route.
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index ba6e0371495..bf51d7b1027 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -118,6 +118,7 @@ const CHILD_VIEW_IDS: WeakMap<View, Set<string>> = new WeakMap();
 */
 export function getChildViews(view: View): View[] {
   let owner = getOwner(view);
+  assert('View is unexpectedly missing an owner', owner);
   let registry = owner.lookup<Dict<View>>('-view-registry:main')!;
   return collectChildViews(view, registry);
 }

From 9a42f9bae3ac9c5bd898187c3fb95a6ecca6ebb9 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 19 Jan 2022 17:03:08 -0800
Subject: [PATCH 0818/1405] Future public types for @ember/application

---
 packages/@ember/-internals/owner/index.ts     |  9 ++-
 .../runtime/lib/system/namespace.d.ts         |  3 +
 .../runtime/lib/system/namespace.js           |  4 +-
 packages/@ember/application/index.d.ts        |  1 +
 packages/@ember/application/instance.d.ts     | 26 ++++++++
 .../@ember/application/lib/application.d.ts   | 17 +++++
 .../{namespace.js => namespace.ts}            |  0
 .../application/type-tests/index.test.ts      | 41 ++++++++++++
 .../application/type-tests/instance.test.ts   | 65 +++++++++++++++++++
 .../application/type-tests/namespace.test.ts  |  7 ++
 packages/@ember/engine/instance.d.ts          | 10 +--
 11 files changed, 174 insertions(+), 9 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/system/namespace.d.ts
 create mode 100644 packages/@ember/application/instance.d.ts
 create mode 100644 packages/@ember/application/lib/application.d.ts
 rename packages/@ember/application/{namespace.js => namespace.ts} (100%)
 create mode 100644 packages/@ember/application/type-tests/index.test.ts
 create mode 100644 packages/@ember/application/type-tests/instance.test.ts
 create mode 100644 packages/@ember/application/type-tests/namespace.test.ts

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 43e3e26b9eb..88a5d334243 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -30,12 +30,15 @@ import EngineInstance from '@ember/engine/instance';
 export interface Owner {
   lookup<T>(fullName: string, options?: LookupOptions): T | undefined;
   factoryFor<T, C>(fullName: string, options?: LookupOptions): Factory<T, C> | undefined;
-  factoryFor(fullName: string, options?: LookupOptions): Factory<any, any> | undefined;
-  buildChildEngineInstance(name: string, options?: EngineInstanceOptions): EngineInstance;
-  register<T, C>(fullName: string, factory: Factory<T, C>, options?: object): void;
+  register<T, C>(fullName: string, factory: Factory<T, C>, options?: LookupOptions): void;
   hasRegistration(name: string, options?: LookupOptions): boolean;
+
+  /** @internal */
   mountPoint?: string;
+  /** @internal */
   routable?: boolean;
+  /** @internal */
+  buildChildEngineInstance(name: string, options?: EngineInstanceOptions): EngineInstance;
 }
 
 /**
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.d.ts b/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
new file mode 100644
index 00000000000..601adb8f8d2
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
@@ -0,0 +1,3 @@
+import EmberObject from './object';
+
+export default class Namespace extends EmberObject {}
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.js b/packages/@ember/-internals/runtime/lib/system/namespace.js
index 89b7a5bfd4d..f76f552f285 100644
--- a/packages/@ember/-internals/runtime/lib/system/namespace.js
+++ b/packages/@ember/-internals/runtime/lib/system/namespace.js
@@ -1,6 +1,7 @@
 /**
-@module ember
+@module @ember/application
 */
+
 import {
   NAMESPACES,
   NAMESPACES_BY_ID,
@@ -29,7 +30,6 @@ import EmberObject from './object';
   ```
 
   @class Namespace
-  @namespace Ember
   @extends EmberObject
   @public
 */
diff --git a/packages/@ember/application/index.d.ts b/packages/@ember/application/index.d.ts
index 30eeea101a9..d7a56d82c31 100644
--- a/packages/@ember/application/index.d.ts
+++ b/packages/@ember/application/index.d.ts
@@ -1 +1,2 @@
 export { getOwner, setOwner } from '@ember/-internals/owner';
+export { default } from './lib/application';
diff --git a/packages/@ember/application/instance.d.ts b/packages/@ember/application/instance.d.ts
new file mode 100644
index 00000000000..a04c11955d2
--- /dev/null
+++ b/packages/@ember/application/instance.d.ts
@@ -0,0 +1,26 @@
+import { EngineInstance } from '@ember/engine';
+
+export class BootOptions {
+  isBrowser: boolean;
+  shouldRender: boolean;
+  document: Document | null;
+  rootElement: string | Element | null;
+  location: string | null;
+
+  constructor(options?: {
+    isBrowser?: boolean;
+    shouldRender?: boolean;
+    document?: Document;
+    rootElement?: string | Element;
+    location?: string;
+    isInteractive?: boolean;
+  });
+
+  toEnvironment(): Record<string, unknown>;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface ApplicationInstance extends EngineInstance {}
+declare class ApplicationInstance {}
+
+export default ApplicationInstance;
diff --git a/packages/@ember/application/lib/application.d.ts b/packages/@ember/application/lib/application.d.ts
new file mode 100644
index 00000000000..bb3f709db98
--- /dev/null
+++ b/packages/@ember/application/lib/application.d.ts
@@ -0,0 +1,17 @@
+import { EngineInstanceOptions } from '@ember/-internals/owner';
+import { EventDispatcher } from '@ember/-internals/views';
+import Engine from '@ember/engine';
+import ApplicationInstance, { BootOptions } from '../instance';
+
+export default class Application extends Engine {
+  rootElement: string | Element;
+  eventDispatcher: EventDispatcher;
+  customEvents: Record<string, string | null> | null;
+  buildInstance(options?: EngineInstanceOptions): ApplicationInstance;
+  deferReadiness(): void;
+  advanceReadiness(): void;
+  boot(): void;
+  ready(): void;
+  reset(): void;
+  visit(url: string, options: BootOptions): Promise<ApplicationInstance>;
+}
diff --git a/packages/@ember/application/namespace.js b/packages/@ember/application/namespace.ts
similarity index 100%
rename from packages/@ember/application/namespace.js
rename to packages/@ember/application/namespace.ts
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
new file mode 100644
index 00000000000..c4a7c8cd114
--- /dev/null
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -0,0 +1,41 @@
+import { EventDispatcher } from '@ember/-internals/views';
+import Application, { getOwner, setOwner } from '@ember/application';
+import ApplicationInstance, { BootOptions } from '@ember/application/instance';
+import { Owner } from '@ember/-internals/owner';
+
+import { expectTypeOf } from 'expect-type';
+
+class App extends Application {
+  rootElement = '#ember-application';
+  customEvents = {
+    mouseenter: null,
+    paste: 'paste',
+  };
+  ready() {
+    // I'm ready!
+  }
+}
+
+const app = new App();
+
+// You shouldn't really be setting this, so let's at least check that we can read it
+expectTypeOf(app.eventDispatcher).toEqualTypeOf<EventDispatcher>();
+
+expectTypeOf(app.buildInstance()).toEqualTypeOf<ApplicationInstance>();
+expectTypeOf(app.deferReadiness()).toEqualTypeOf<void>();
+expectTypeOf(app.advanceReadiness()).toEqualTypeOf<void>();
+expectTypeOf(app.boot()).toEqualTypeOf<void>();
+expectTypeOf(app.ready()).toEqualTypeOf<void>();
+expectTypeOf(app.reset()).toEqualTypeOf<void>();
+expectTypeOf(app.visit('/my-app', new BootOptions())).toEqualTypeOf<Promise<ApplicationInstance>>();
+
+class App2 extends Application {
+  // @ts-expect-error Doesn't allow number
+  rootElement = 1;
+}
+
+new App2();
+
+expectTypeOf(getOwner('foo')).toEqualTypeOf<Owner | undefined>();
+
+expectTypeOf(setOwner('foo', {} as Owner)).toEqualTypeOf<void>();
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
new file mode 100644
index 00000000000..1ac6e63baf4
--- /dev/null
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -0,0 +1,65 @@
+import Application from '@ember/application';
+import ApplicationInstance, { BootOptions } from '@ember/application/instance';
+import { EngineInstance } from '@ember/engine';
+import EmberObject from '@ember/object';
+
+import { expectTypeOf } from 'expect-type';
+
+const app = new Application();
+const instance = app.buildInstance();
+
+expectTypeOf(instance).toEqualTypeOf<ApplicationInstance>();
+expectTypeOf(instance).toMatchTypeOf<EngineInstance>();
+expectTypeOf(instance).toMatchTypeOf<EmberObject>();
+
+declare class Store extends EmberObject {}
+
+expectTypeOf(instance.register('service:store', Store)).toEqualTypeOf<void>();
+expectTypeOf(
+  instance.register('service:store-singleton', Store, { singleton: true, instantiate: true })
+).toEqualTypeOf<void>();
+
+expectTypeOf(instance.lookup<Store>('service:store')).toEqualTypeOf<Store | undefined>();
+expectTypeOf(
+  instance.lookup<Store>('service:store', { singleton: true, instantiate: true })
+).toEqualTypeOf<Store | undefined>();
+
+expectTypeOf(instance.hasRegistration('service:store')).toEqualTypeOf<boolean>();
+expectTypeOf(
+  instance.hasRegistration('service:store', { singleton: true, instantiate: true })
+).toEqualTypeOf<boolean>();
+
+expectTypeOf(instance.boot()).toEqualTypeOf<void>();
+
+const bootOptions = new BootOptions({
+  isBrowser: true,
+  shouldRender: false,
+  document: window.document,
+  rootElement: '#ember-application',
+  location: 'history',
+});
+
+expectTypeOf(bootOptions.isBrowser).toEqualTypeOf<boolean>();
+expectTypeOf(bootOptions.shouldRender).toEqualTypeOf<boolean>();
+expectTypeOf(bootOptions.document).toEqualTypeOf<Document | null>();
+expectTypeOf(bootOptions.rootElement).toEqualTypeOf<string | Element | null>();
+expectTypeOf(bootOptions.location).toEqualTypeOf<string | null>();
+
+new BootOptions({
+  // @ts-expect-error Incorrect type
+  isBrowser: 1,
+  // @ts-expect-error Incorrect type
+  shouldRender: 1,
+  // @ts-expect-error Incorrect type
+  document: window,
+  // @ts-expect-error Incorrect type
+  rootElement: 1,
+  // @ts-expect-error Incorrect type
+  location: 1,
+});
+
+new BootOptions({
+  rootElement: window.document.createElement('div'),
+});
+
+new BootOptions();
diff --git a/packages/@ember/application/type-tests/namespace.test.ts b/packages/@ember/application/type-tests/namespace.test.ts
new file mode 100644
index 00000000000..46332e2701c
--- /dev/null
+++ b/packages/@ember/application/type-tests/namespace.test.ts
@@ -0,0 +1,7 @@
+import Namespace from '@ember/application/namespace';
+
+import { expectTypeOf } from 'expect-type';
+
+const namespace = Namespace.create({ VERSION: '1.0.0' });
+
+expectTypeOf(namespace).toMatchTypeOf<Namespace>();
diff --git a/packages/@ember/engine/instance.d.ts b/packages/@ember/engine/instance.d.ts
index 033f3d787b4..ab41cf52477 100644
--- a/packages/@ember/engine/instance.d.ts
+++ b/packages/@ember/engine/instance.d.ts
@@ -1,8 +1,10 @@
 import { Owner } from '@ember/-internals/owner';
+import EmberObject from '@ember/object';
 
-export default interface EngineInstance extends Owner {
-  mountPoint?: string;
-  routable?: boolean;
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface EngineInstance extends Owner {}
+declare class EngineInstance extends EmberObject {
   boot(): void;
-  destroy(): void;
 }
+
+export default EngineInstance;

From 9e9b17b5c1765db530eebd916789383e0e90a33d Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 19 Jan 2022 10:23:27 -0800
Subject: [PATCH 0819/1405] Refactor @ember/object/compat

---
 packages/@ember/object/compat.ts | 69 ++++++++++++++++++++------------
 1 file changed, 44 insertions(+), 25 deletions(-)

diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 2a202bdd324..4956482d2bf 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -6,6 +6,7 @@ import {
   isElementDescriptor,
   setClassicDecorator,
 } from '@ember/-internals/metal';
+import type { ElementDescriptor } from '@ember/-internals/metal/lib/decorator';
 import { assert } from '@ember/debug';
 import { consumeTag, tagFor, track, UpdatableTag, updateTag } from '@glimmer/validator';
 
@@ -121,23 +122,50 @@ let wrapGetterSetter = function (target: object, key: string, desc: PropertyDesc
   @return {PropertyDecorator} property decorator instance
  */
 export function dependentKeyCompat(
-  target: object,
-  key: string,
-  desc: PropertyDescriptor
+  target: ElementDescriptor[0],
+  key: ElementDescriptor[1],
+  desc: ElementDescriptor[2]
 ): PropertyDescriptor;
-export function dependentKeyCompat(desc: { get?: Function; set?: Function }): Decorator;
-export function dependentKeyCompat(
-  target: object | { get?: Function; set?: Function },
-  key?: string,
-  desc?: PropertyDescriptor
-) {
-  if (!isElementDescriptor([target, key, desc])) {
-    desc = target as PropertyDescriptor;
-
-    let decorator = function (
+export function dependentKeyCompat(desc: PropertyDescriptor): Decorator;
+export function dependentKeyCompat(...args: ElementDescriptor | [PropertyDescriptor]) {
+  if (isElementDescriptor(args)) {
+    let [target, key, desc] = args;
+
+    assert(
+      'The @dependentKeyCompat decorator must be applied to getters/setters when used in native classes',
+      desc != null && (typeof desc.get === 'function' || typeof desc.set === 'function')
+    );
+
+    return wrapGetterSetter(target, key, desc);
+  } else {
+    const desc = args[0];
+
+    assert(
+      'expected valid PropertyDescriptor',
+      ((value: unknown): value is PropertyDescriptor => {
+        if (value && typeof value === 'object') {
+          let cast = value as PropertyDescriptor;
+          return (
+            (cast.configurable === undefined ||
+              cast.configurable === false ||
+              cast.configurable === true) &&
+            (cast.enumerable === undefined ||
+              cast.enumerable === false ||
+              cast.enumerable === true) &&
+            (cast.writable === undefined || cast.writable === false || cast.writable === true) &&
+            (cast.get === undefined || typeof cast.get === 'function') &&
+            (cast.set === undefined || typeof cast.set === 'function')
+          );
+        }
+
+        return false;
+      })(desc)
+    );
+
+    let decorator: Decorator = function (
       target: object,
       key: string,
-      _desc: DecoratorPropertyDescriptor,
+      _desc?: DecoratorPropertyDescriptor,
       _meta?: Meta,
       isClassicDecorator?: boolean
     ) {
@@ -148,9 +176,7 @@ export function dependentKeyCompat(
 
       assert(
         'The dependentKeyCompat() decorator must be passed a getter or setter when used in classic classes',
-        desc !== null &&
-          typeof desc === 'object' &&
-          (typeof desc.get === 'function' || typeof desc.set === 'function')
+        typeof desc.get === 'function' || typeof desc.set === 'function'
       );
 
       return wrapGetterSetter(target, key, desc);
@@ -158,15 +184,8 @@ export function dependentKeyCompat(
 
     setClassicDecorator(decorator);
 
-    return decorator as Decorator;
+    return decorator;
   }
-
-  assert(
-    'The @dependentKeyCompat decorator must be applied to getters/setters when used in native classes',
-    (desc !== null && typeof desc!.get === 'function') || typeof desc!.set === 'function'
-  );
-
-  return wrapGetterSetter(target, key!, desc!);
 }
 
 setClassicDecorator(dependentKeyCompat as Decorator);

From 2ae0b1871113a97b2275ec8cc47fe9155170385f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jan 2022 21:38:14 +0000
Subject: [PATCH 0820/1405] Bump node-fetch from 2.6.6 to 2.6.7

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 1b45485be1a..c115c44d4e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9316,9 +9316,9 @@ node-environment-flags@1.0.6:
     semver "^5.7.0"
 
 node-fetch@^2.6.0:
-  version "2.6.6"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89"
-  integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 

From a041cbe4432dd9811494d0613936cc663a2b3134 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:04:59 +0000
Subject: [PATCH 0821/1405] Bump ember-cli from 4.1.0 to 4.1.1

Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/ember-cli/ember-cli/releases)
- [Changelog](https://github.com/ember-cli/ember-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/ember-cli/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: ember-cli
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 78791baba31..6a62fdca17c 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
-    "ember-cli": "^4.1.0",
+    "ember-cli": "^4.1.1",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index 1b45485be1a..47a20419d1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5505,10 +5505,10 @@ ember-cli-yuidoc@^0.9.1:
     rsvp "3.0.14"
     yuidocjs "^0.10.0"
 
-ember-cli@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.1.0.tgz#65d482c25a7f0b93f400f799d92bb28af8527086"
-  integrity sha512-weWNx1bWdcLGCfUTRSN9393yzBkTBcIIhbGW/cOIvwsDjTxkT+RA2XdnpdeHtH4JnIW2JiJSAErCebN5R4wT7w==
+ember-cli@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.1.1.tgz#166a15f44b1ec6d4643261a18c3faa1b2cd4a5a2"
+  integrity sha512-QFgV14wYOPIc4h1szQ8OW5evPUn7B8YZDs/dexRmD6x9+Y/2BH8lmWyO6vFopBhgV91w1/mSiNDsef+MSdBLbQ==
   dependencies:
     "@babel/core" "^7.16.0"
     "@babel/plugin-transform-modules-amd" "^7.12.1"

From 2bf40174ca43ae52ed4ae491731cce05c233a3db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:05:45 +0000
Subject: [PATCH 0822/1405] Bump auto-dist-tag from 1.0.0 to 2.1.1

Bumps [auto-dist-tag](https://github.com/Turbo87/auto-dist-tag) from 1.0.0 to 2.1.1.
- [Release notes](https://github.com/Turbo87/auto-dist-tag/releases)
- [Changelog](https://github.com/Turbo87/auto-dist-tag/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Turbo87/auto-dist-tag/compare/v1.0.0...v2.1.1)

---
updated-dependencies:
- dependency-name: auto-dist-tag
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 600 +++++++++++++++++++++++++--------------------------
 2 files changed, 297 insertions(+), 305 deletions(-)

diff --git a/package.json b/package.json
index 78791baba31..8ab7111f853 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "auto-dist-tag": "^1.0.0",
+    "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
diff --git a/yarn.lock b/yarn.lock
index 1b45485be1a..ea93659cb45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
 "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
@@ -9,13 +16,6 @@
   dependencies:
     "@babel/highlight" "^7.14.5"
 
-"@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
 "@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
@@ -2689,10 +2689,17 @@
   resolved "https://registry.yarnpkg.com/@simple-dom/void-map/-/void-map-1.4.0.tgz#f15f07568fe1076740407266aa5e6eac249bc78c"
   integrity "sha1-8V8HVo/hB2dAQHJmql5urCSbx4w= sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw=="
 
-"@sindresorhus/is@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity "sha1-mgb08TfuhNffBGDB/bETX/psUP0= sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
 
 "@types/acorn@^4.0.3":
   version "4.0.3"
@@ -2828,6 +2835,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimist@^1.2.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
 "@types/node@*":
   version "11.13.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
@@ -2843,6 +2855,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
   integrity "sha1-00gO5mbfl4SxABoYcqL2zO+2wtc= sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg=="
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
@@ -3217,11 +3234,6 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -3359,17 +3371,17 @@ atob@^2.0.0:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k= sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
 
-auto-dist-tag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/auto-dist-tag/-/auto-dist-tag-1.0.0.tgz#ded651a2802c74dc268c49352a573344a6d52fd6"
-  integrity "sha1-3tZRooAsdNwmjEk1KlczRKbVL9Y= sha512-URcE69HrQNgcYNHhhTFSoOk7g5tzjF33x1ToD37nU5BcuN/ehC5r3fmMYTRNvfDoJlxBOWy+dt5Ru4ex+Q/orQ=="
+auto-dist-tag@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/auto-dist-tag/-/auto-dist-tag-2.1.1.tgz#4c103b66b44d29ab1ad85ecd4b4488e574d6c811"
+  integrity sha512-w3aUbxMesY8VpJCW26F8enOvJnegb4fDtjDttc1UpBVEzRidEmMHzVI9J9cbeTh92vDfoxVeQezJbnqtAz20iw==
   dependencies:
-    debug "^3.1.0"
-    fs-extra "^6.0.1"
-    meow "^5.0.0"
-    package-json "^5.0.0"
-    pkg-up "^2.0.0"
-    semver "^5.3.0"
+    debug "^4.3.1"
+    fs-extra "^9.0.0"
+    meow "^9.0.0"
+    package-json "^6.0.0"
+    pkg-up "^3.0.0"
+    semver "^7.0.0"
 
 aws-sdk@^2.0.9, aws-sdk@^2.814.0:
   version "2.814.0"
@@ -4353,18 +4365,18 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cacheable-request@^2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0= sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ=="
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
   dependencies:
-    clone-response "1.0.2"
-    get-stream "3.0.0"
-    http-cache-semantics "3.8.1"
-    keyv "3.0.0"
-    lowercase-keys "1.0.0"
-    normalize-url "2.0.1"
-    responselike "1.0.2"
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
 
 calculate-cache-key-for-tree@^2.0.0:
   version "2.0.0"
@@ -4391,25 +4403,25 @@ callsites@^3.1.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= sha512-Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q=="
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
-    camelcase "^4.1.0"
-    map-obj "^2.0.0"
-    quick-lru "^1.0.0"
-
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
 
 camelcase@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
   integrity "sha1-AylVJ9WL081Kp1Nj81sujZe+L0I= sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
 
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 can-symlink@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
@@ -4657,10 +4669,10 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clone-response@1.0.2:
+clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
@@ -4995,13 +5007,6 @@ ctype@0.5.3:
   resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
   integrity "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8= sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg=="
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity "sha1-mI3zP+qxke95mmE2nddsF635V+o= sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="
-  dependencies:
-    array-find-index "^1.0.1"
-
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
@@ -5035,10 +5040,10 @@ debug@3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
   dependencies:
     ms "2.1.2"
 
@@ -5049,13 +5054,6 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -5070,10 +5068,10 @@ debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize-keys@^1.0.0:
+decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -5126,6 +5124,11 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -6576,14 +6579,14 @@ find-up@3.0.0, find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^4.0.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -6736,14 +6739,6 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
 
-from2@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
@@ -6820,7 +6815,7 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -6947,12 +6942,7 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="
 
-get-stream@3.0.0, get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="
-
-get-stream@^4.0.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity "sha1-wbJVV189wh1Zv8ec09K0axw6VLU= sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="
@@ -7142,28 +7132,22 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity "sha1-3V2eyCYjJzDNZ5Ol4zqTApheYJg= sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
 
-got@^8.3.1:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity "sha1-HSP2Q5Dpf3dsrFLluTbl9RTS6Tc= sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
   dependencies:
-    "@sindresorhus/is" "^0.7.0"
-    cacheable-request "^2.1.1"
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
     decompress-response "^3.3.0"
     duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    into-stream "^3.1.0"
-    is-retry-allowed "^1.1.0"
-    isurl "^1.0.0-alpha5"
-    lowercase-keys "^1.0.0"
-    mimic-response "^1.0.0"
-    p-cancelable "^0.4.0"
-    p-timeout "^2.0.1"
-    pify "^3.0.0"
-    safe-buffer "^5.1.1"
-    timed-out "^4.0.1"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
-    url-to-options "^1.0.1"
 
 graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
   version "4.2.2"
@@ -7197,6 +7181,11 @@ handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.3:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-ansi@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-1.0.3.tgz#c0b5b1615d9e382b0ff67169d967b425e48ca538"
@@ -7246,11 +7235,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbol-support-x@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU= sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
-
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -7266,13 +7250,6 @@ has-symbols@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-to-string-tag-x@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity "sha1-oEWrOD17SyASoAFIqwql8pAETU0= sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="
-  dependencies:
-    has-symbol-support-x "^1.4.1"
-
 has-tostringtag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -7425,10 +7402,10 @@ html-differ@^1.4.0:
     vow "0.4.13"
     vow-fs "0.3.6"
 
-http-cache-semantics@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity "sha1-ObDhat2bYFvwqe89nar0hDtMrNI= sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
 http-errors@1.7.2, http-errors@~1.7.2:
   version "1.7.2"
@@ -7555,10 +7532,10 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
 
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ=="
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 indexof@0.0.1:
   version "0.0.1"
@@ -7632,14 +7609,6 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-into-stream@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ=="
-  dependencies:
-    from2 "^2.1.1"
-    p-is-promise "^1.1.0"
-
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -7730,6 +7699,13 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
+is-core-module@^2.5.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
@@ -7871,11 +7847,6 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity "sha1-iVJojF7C/9awPsyF52ngKQMINHA= sha512-+XzmTRB/JXoIdK20Ge8K8PRsP5UlthLaVhIRxzIwQ73jRgER8iRw98DilvERx/tSjOHLy9JM4sKUfLRMB5ui0Q=="
-
 is-odd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
@@ -7932,11 +7903,6 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity "sha1-/S2INUXEa6xaYz57mgnof6LLUGk= sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
 
-is-retry-allowed@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= sha512-leC1bcIRBHjXtaZSM2gAXNeZsIOdDMgq/kHKAVKQ05JTwvb7hnvrHBEm6mnnMRyE7yu+ljNlcG8YUmALCevSxg=="
-
 is-running@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
@@ -8060,14 +8026,6 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
-isurl@^1.0.0-alpha5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc= sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="
-  dependencies:
-    has-to-string-tag-x "^1.2.0"
-    is-object "^1.0.1"
-
 jmespath@0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
@@ -8141,6 +8099,11 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -8210,10 +8173,10 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-keyv@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity "sha1-RJI7o55osSp87H32wyaMAx8u83M= sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
   dependencies:
     json-buffer "3.0.0"
 
@@ -8241,6 +8204,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity "sha1-ARRrNqYhjmTljzqNZt5df8b20FE= sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 
+kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -8292,6 +8260,11 @@ line-column@^1.0.2:
     isarray "^1.0.0"
     isobject "^2.0.0"
 
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
 linkify-it@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
@@ -8791,19 +8764,21 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ=="
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
+lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
   integrity "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="
 
+lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -8856,10 +8831,10 @@ map-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="
 
-map-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity "sha1-plzSkIepJZi4eRJXpSPgISIqwfk= sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ=="
+map-obj@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 map-stream@~0.1.0:
   version "0.1.0"
@@ -8966,20 +8941,23 @@ memorystream@^0.3.1:
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
-meow@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
-  integrity "sha1-38c9Y6mvxxSl43F2DrXIi5EHiqQ= sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="
-  dependencies:
-    camelcase-keys "^4.0.0"
-    decamelize-keys "^1.0.0"
-    loud-rejection "^1.0.0"
-    minimist-options "^3.0.1"
-    normalize-package-data "^2.3.4"
-    read-pkg-up "^3.0.0"
-    redent "^2.0.0"
-    trim-newlines "^2.0.0"
-    yargs-parser "^10.0.0"
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -9115,11 +9093,16 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
 
-mimic-response@^1.0.0:
+mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs= sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
 
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -9127,13 +9110,14 @@ mimic-response@^1.0.0:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ= sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
 
 minimist@^0.2.1:
   version "0.2.1"
@@ -9386,7 +9370,7 @@ nopt@^3.0.6:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   integrity "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8= sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="
@@ -9396,6 +9380,26 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-package-data@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -9408,14 +9412,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
 
-normalize-url@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity "sha1-g1qdoVUfom9w6SMpBpojqmV01+Y= sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="
-  dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
+normalize-url@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
 npm-package-arg@^8.1.5:
   version "8.1.5"
@@ -9635,10 +9635,10 @@ osenv@^0.1.0, osenv@^0.1.3:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-cancelable@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity "sha1-NfNj1n1SCByNlYXje8zrfgu8sqA= sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
 p-defer@^3.0.0:
   version "3.0.0"
@@ -9650,11 +9650,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg=="
-
 p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@@ -9709,27 +9704,20 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-timeout@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg= sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
   integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
-package-json@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-5.0.0.tgz#a7dbe2725edcc7dc9bcee627672275e323882433"
-  integrity "sha1-p9vicl7cx9ybzuYnZyJ14yOIJDM= sha512-EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="
+package-json@^6.0.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
   dependencies:
-    got "^8.3.1"
-    registry-auth-token "^3.3.2"
-    registry-url "^3.1.0"
-    semver "^5.5.0"
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
 
 parent-module@^1.0.0:
   version "1.0.0"
@@ -9746,6 +9734,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
 parse-ms@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
@@ -9933,7 +9931,7 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-up@^3.1.0:
+pkg-up@^3.0.0, pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
@@ -10164,15 +10162,6 @@ qs@~1.0.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768"
   integrity "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g= sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg=="
 
-query-string@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity "sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s= sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="
-  dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -10186,10 +10175,10 @@ quibble@^0.5.1:
     lodash "^4.17.2"
     resolve "^1.5.0"
 
-quick-lru@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= sha512-tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA=="
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
 quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
   version "0.1.8"
@@ -10233,23 +10222,24 @@ raw-body@~1.1.0:
     bytes "1"
     string_decoder "0.10"
 
-rc@^1.0.1, rc@^1.1.6:
+rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity "sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw=="
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
 
 read-pkg@^3.0.0:
   version "3.0.0"
@@ -10260,6 +10250,16 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 "readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -10269,7 +10269,7 @@ read-pkg@^3.0.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.6:
+readable-stream@^2.0.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8= sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="
@@ -10309,13 +10309,13 @@ recast@^0.18.1:
     private "^0.1.8"
     source-map "~0.6.1"
 
-redent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= sha512-XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw=="
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
-    indent-string "^3.0.0"
-    strip-indent "^2.0.0"
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
 
 redeyed@~1.0.0:
   version "1.0.1"
@@ -10404,20 +10404,19 @@ regexpu-core@^4.7.1:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
-registry-auth-token@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity "sha1-hR/UkDjuy1hpERFa+EUmDuyYPyA= sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
   dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
+    rc "^1.2.8"
 
-registry-url@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity "sha1-PU74cPc93h138M+aOBQyRE4XSUI= sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA=="
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
   dependencies:
-    rc "^1.0.1"
+    rc "^1.2.8"
 
 regjsgen@^0.5.1:
   version "0.5.1"
@@ -10565,10 +10564,10 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.1
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-responselike@1.0.2:
+responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
@@ -10714,7 +10713,7 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -10809,12 +10808,12 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -11086,13 +11085,6 @@ socket.io@^4.1.2:
     socket.io-adapter "~2.3.2"
     socket.io-parser "~4.0.4"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg=="
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 sort-object-keys@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
@@ -11259,11 +11251,6 @@ stream-combiner@~0.0.4:
   dependencies:
     duplexer "~0.1.1"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
-
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -11425,10 +11412,12 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity "sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
 
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
 
 strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
@@ -11680,11 +11669,6 @@ time-zone@^1.0.0:
   resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
   integrity "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0= sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA=="
 
-timed-out@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="
-
 tiny-glob@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.8.tgz#b2792c396cc62db891ffa161fe8b33e76123e531"
@@ -11761,6 +11745,11 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -11827,10 +11816,10 @@ tree-sync@^2.0.0, tree-sync@^2.1.0:
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
-trim-newlines@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
+trim-newlines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 tsconfig-paths@^3.12.0:
   version "3.12.0"
@@ -11886,11 +11875,26 @@ type-fest@^0.11.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
 
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -12056,11 +12060,6 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-to-options@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="
-
 url@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
@@ -12423,14 +12422,7 @@ yargs-parser@13.1.2, yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity "sha1-cgImW4n36eny5XZeD+c1qQXtuqg= sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^20.2.2:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==

From 233cdca2dc2ef85954a5a878dea91cb96fb10d4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 23:45:07 +0000
Subject: [PATCH 0823/1405] Bump @types/qunit from 2.11.2 to 2.11.3

Bumps [@types/qunit](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qunit) from 2.11.2 to 2.11.3.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qunit)

---
updated-dependencies:
- dependency-name: "@types/qunit"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   4 +-
 yarn.lock    | 608 +++++++++++++++++++++++++--------------------------
 2 files changed, 302 insertions(+), 310 deletions(-)

diff --git a/package.json b/package.json
index 78791baba31..95a5a102c87 100644
--- a/package.json
+++ b/package.json
@@ -87,11 +87,11 @@
     "@glimmer/runtime": "0.83.1",
     "@glimmer/validator": "0.83.1",
     "@simple-dom/document": "^1.4.0",
-    "@types/qunit": "^2.11.2",
+    "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
-    "auto-dist-tag": "^1.0.0",
+    "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.814.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
diff --git a/yarn.lock b/yarn.lock
index 1b45485be1a..11f11d3eb94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
 "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
@@ -9,13 +16,6 @@
   dependencies:
     "@babel/highlight" "^7.14.5"
 
-"@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
 "@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
@@ -2689,10 +2689,17 @@
   resolved "https://registry.yarnpkg.com/@simple-dom/void-map/-/void-map-1.4.0.tgz#f15f07568fe1076740407266aa5e6eac249bc78c"
   integrity "sha1-8V8HVo/hB2dAQHJmql5urCSbx4w= sha512-VDhLEyVCbuhOBBgHol9ShzIv9O8UCzdXeH4FoXu2DOcu/nnvTjLTck+BgXsCLv5ynDiUdoqsREEVFnoyPpFKVw=="
 
-"@sindresorhus/is@^0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
-  integrity "sha1-mgb08TfuhNffBGDB/bETX/psUP0= sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
 
 "@types/acorn@^4.0.3":
   version "4.0.3"
@@ -2828,6 +2835,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimist@^1.2.0":
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
 "@types/node@*":
   version "11.13.2"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
@@ -2843,15 +2855,20 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
   integrity "sha1-00gO5mbfl4SxABoYcqL2zO+2wtc= sha512-h3YZbOq2+ZoDFI1z8Zx0Ck/xRWkOESVaLdgLdd/c25mMQ1Y2CAkILu9ny5A15S5f32gGcQdaUIZ2jzYr8D7IFg=="
 
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+
 "@types/qs@*":
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
-"@types/qunit@^2.11.2":
-  version "2.11.2"
-  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.2.tgz#4cb99ae3ea6afe94b9c4cfd3ab715a285729ca9c"
-  integrity sha512-Bt0fz9l8sWxqP+cjoqWQyNVyOPPK+7GPhKIKLLTi7llR0FV+pyd50FXTXafZeZnsFVUgXw4pdupydz75E6vxjQ==
+"@types/qunit@^2.11.3":
+  version "2.11.3"
+  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.3.tgz#2900adb58eee250c96b2d33a923cc4eae70d72ba"
+  integrity sha512-UF/4jDehcpRlMXzKXi2Z59Id48/uYlMeUDhYdjFrVVwy30Eud/e60Ok3yVjSPlHprafj3B315uFTrF6eqQTeSw==
 
 "@types/range-parser@*":
   version "1.2.4"
@@ -3217,11 +3234,6 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-find-index@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
-  integrity "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw=="
-
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -3359,17 +3371,17 @@ atob@^2.0.0:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k= sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
 
-auto-dist-tag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/auto-dist-tag/-/auto-dist-tag-1.0.0.tgz#ded651a2802c74dc268c49352a573344a6d52fd6"
-  integrity "sha1-3tZRooAsdNwmjEk1KlczRKbVL9Y= sha512-URcE69HrQNgcYNHhhTFSoOk7g5tzjF33x1ToD37nU5BcuN/ehC5r3fmMYTRNvfDoJlxBOWy+dt5Ru4ex+Q/orQ=="
+auto-dist-tag@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/auto-dist-tag/-/auto-dist-tag-2.1.1.tgz#4c103b66b44d29ab1ad85ecd4b4488e574d6c811"
+  integrity sha512-w3aUbxMesY8VpJCW26F8enOvJnegb4fDtjDttc1UpBVEzRidEmMHzVI9J9cbeTh92vDfoxVeQezJbnqtAz20iw==
   dependencies:
-    debug "^3.1.0"
-    fs-extra "^6.0.1"
-    meow "^5.0.0"
-    package-json "^5.0.0"
-    pkg-up "^2.0.0"
-    semver "^5.3.0"
+    debug "^4.3.1"
+    fs-extra "^9.0.0"
+    meow "^9.0.0"
+    package-json "^6.0.0"
+    pkg-up "^3.0.0"
+    semver "^7.0.0"
 
 aws-sdk@^2.0.9, aws-sdk@^2.814.0:
   version "2.814.0"
@@ -4353,18 +4365,18 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-cacheable-request@^2.1.1:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
-  integrity "sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0= sha512-vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ=="
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
   dependencies:
-    clone-response "1.0.2"
-    get-stream "3.0.0"
-    http-cache-semantics "3.8.1"
-    keyv "3.0.0"
-    lowercase-keys "1.0.0"
-    normalize-url "2.0.1"
-    responselike "1.0.2"
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
 
 calculate-cache-key-for-tree@^2.0.0:
   version "2.0.0"
@@ -4391,25 +4403,25 @@ callsites@^3.1.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
-  integrity "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= sha512-Ej37YKYbFUI8QiYlvj9YHb6/Z60dZyPJW0Cs8sFilMbd2lP0bw3ylAq9yJkK4lcTA2dID5fG8LjmJYbO7kWb7Q=="
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
   dependencies:
-    camelcase "^4.1.0"
-    map-obj "^2.0.0"
-    quick-lru "^1.0.0"
-
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
 
 camelcase@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
   integrity "sha1-AylVJ9WL081Kp1Nj81sujZe+L0I= sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
 
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
 can-symlink@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
@@ -4657,10 +4669,10 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
-clone-response@1.0.2:
+clone-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
     mimic-response "^1.0.0"
 
@@ -4995,13 +5007,6 @@ ctype@0.5.3:
   resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
   integrity "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8= sha512-T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg=="
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity "sha1-mI3zP+qxke95mmE2nddsF635V+o= sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="
-  dependencies:
-    array-find-index "^1.0.1"
-
 d@1:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
@@ -5035,10 +5040,10 @@ debug@3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1, debug@~4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
   dependencies:
     ms "2.1.2"
 
@@ -5049,13 +5054,6 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -5070,10 +5068,10 @@ debug@~4.1.0:
   dependencies:
     ms "^2.1.1"
 
-decamelize-keys@^1.0.0:
+decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -5126,6 +5124,11 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
 define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
@@ -6576,14 +6579,14 @@ find-up@3.0.0, find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^4.0.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -6736,14 +6739,6 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="
 
-from2@^2.1.1:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
 from@~0:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
@@ -6820,7 +6815,7 @@ fs-extra@^8.0.1, fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -6947,12 +6942,7 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw=="
 
-get-stream@3.0.0, get-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-  integrity "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="
-
-get-stream@^4.0.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity "sha1-wbJVV189wh1Zv8ec09K0axw6VLU= sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="
@@ -7142,28 +7132,22 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity "sha1-3V2eyCYjJzDNZ5Ol4zqTApheYJg= sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="
 
-got@^8.3.1:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
-  integrity "sha1-HSP2Q5Dpf3dsrFLluTbl9RTS6Tc= sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
   dependencies:
-    "@sindresorhus/is" "^0.7.0"
-    cacheable-request "^2.1.1"
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
     decompress-response "^3.3.0"
     duplexer3 "^0.1.4"
-    get-stream "^3.0.0"
-    into-stream "^3.1.0"
-    is-retry-allowed "^1.1.0"
-    isurl "^1.0.0-alpha5"
-    lowercase-keys "^1.0.0"
-    mimic-response "^1.0.0"
-    p-cancelable "^0.4.0"
-    p-timeout "^2.0.1"
-    pify "^3.0.0"
-    safe-buffer "^5.1.1"
-    timed-out "^4.0.1"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
-    url-to-options "^1.0.1"
 
 graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:
   version "4.2.2"
@@ -7197,6 +7181,11 @@ handlebars@^4.0.4, handlebars@^4.3.1, handlebars@^4.7.3:
   optionalDependencies:
     uglify-js "^3.1.4"
 
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
 has-ansi@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-1.0.3.tgz#c0b5b1615d9e382b0ff67169d967b425e48ca538"
@@ -7246,11 +7235,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbol-support-x@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
-  integrity "sha1-FAn5i8ACR9pF2mfO4KNvKC/yZFU= sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw=="
-
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
@@ -7266,13 +7250,6 @@ has-symbols@^1.0.2:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-to-string-tag-x@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
-  integrity "sha1-oEWrOD17SyASoAFIqwql8pAETU0= sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="
-  dependencies:
-    has-symbol-support-x "^1.4.1"
-
 has-tostringtag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -7425,10 +7402,10 @@ html-differ@^1.4.0:
     vow "0.4.13"
     vow-fs "0.3.6"
 
-http-cache-semantics@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity "sha1-ObDhat2bYFvwqe89nar0hDtMrNI= sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="
+http-cache-semantics@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
+  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
 http-errors@1.7.2, http-errors@~1.7.2:
   version "1.7.2"
@@ -7555,10 +7532,10 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
 
-indent-string@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
-  integrity "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ=="
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 indexof@0.0.1:
   version "0.0.1"
@@ -7632,14 +7609,6 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-into-stream@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
-  integrity "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY= sha512-TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ=="
-  dependencies:
-    from2 "^2.1.1"
-    p-is-promise "^1.1.0"
-
 invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -7730,6 +7699,13 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
+is-core-module@^2.5.0:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
+  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+  dependencies:
+    has "^1.0.3"
+
 is-core-module@^2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
@@ -7871,11 +7847,6 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-  integrity "sha1-iVJojF7C/9awPsyF52ngKQMINHA= sha512-+XzmTRB/JXoIdK20Ge8K8PRsP5UlthLaVhIRxzIwQ73jRgER8iRw98DilvERx/tSjOHLy9JM4sKUfLRMB5ui0Q=="
-
 is-odd@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
@@ -7932,11 +7903,6 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity "sha1-/S2INUXEa6xaYz57mgnof6LLUGk= sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="
 
-is-retry-allowed@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
-  integrity "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= sha512-leC1bcIRBHjXtaZSM2gAXNeZsIOdDMgq/kHKAVKQ05JTwvb7hnvrHBEm6mnnMRyE7yu+ljNlcG8YUmALCevSxg=="
-
 is-running@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
@@ -8060,14 +8026,6 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
-isurl@^1.0.0-alpha5:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
-  integrity "sha1-sn9PSfPNqj6kSgpbfzRi5u3DnWc= sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="
-  dependencies:
-    has-to-string-tag-x "^1.2.0"
-    is-object "^1.0.1"
-
 jmespath@0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
@@ -8141,6 +8099,11 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity "sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
 
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -8210,10 +8173,10 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-keyv@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
-  integrity "sha1-RJI7o55osSp87H32wyaMAx8u83M= sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
   dependencies:
     json-buffer "3.0.0"
 
@@ -8241,6 +8204,11 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity "sha1-ARRrNqYhjmTljzqNZt5df8b20FE= sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
 
+kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
@@ -8292,6 +8260,11 @@ line-column@^1.0.2:
     isarray "^1.0.0"
     isobject "^2.0.0"
 
+lines-and-columns@^1.1.6:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
+
 linkify-it@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.0.3.tgz#d94a4648f9b1c179d64fa97291268bdb6ce9434f"
@@ -8791,19 +8764,21 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ=="
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
-lowercase-keys@1.0.0, lowercase-keys@^1.0.0:
+lowercase-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
   integrity "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="
 
+lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
+lowercase-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
+  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -8856,10 +8831,10 @@ map-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="
 
-map-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
-  integrity "sha1-plzSkIepJZi4eRJXpSPgISIqwfk= sha512-TzQSV2DiMYgoF5RycneKVUzIa9bQsj/B3tTgsE3dOGqlzHnGIDaC7XBE7grnA+8kZPnfqSGFe95VHc2oc0VFUQ=="
+map-obj@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 map-stream@~0.1.0:
   version "0.1.0"
@@ -8966,20 +8941,23 @@ memorystream@^0.3.1:
   resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
   integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI=
 
-meow@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
-  integrity "sha1-38c9Y6mvxxSl43F2DrXIi5EHiqQ= sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="
-  dependencies:
-    camelcase-keys "^4.0.0"
-    decamelize-keys "^1.0.0"
-    loud-rejection "^1.0.0"
-    minimist-options "^3.0.1"
-    normalize-package-data "^2.3.4"
-    read-pkg-up "^3.0.0"
-    redent "^2.0.0"
-    trim-newlines "^2.0.0"
-    yargs-parser "^10.0.0"
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -9115,11 +9093,16 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity "sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
 
-mimic-response@^1.0.0:
+mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs= sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
 
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -9127,13 +9110,14 @@ mimic-response@^1.0.0:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist-options@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
-  integrity "sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ= sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
     is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
 
 minimist@^0.2.1:
   version "0.2.1"
@@ -9386,7 +9370,7 @@ nopt@^3.0.6:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
+normalize-package-data@^2.3.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   integrity "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8= sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="
@@ -9396,6 +9380,26 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-package-data@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -9408,14 +9412,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
 
-normalize-url@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
-  integrity "sha1-g1qdoVUfom9w6SMpBpojqmV01+Y= sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="
-  dependencies:
-    prepend-http "^2.0.0"
-    query-string "^5.0.1"
-    sort-keys "^2.0.0"
+normalize-url@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
 npm-package-arg@^8.1.5:
   version "8.1.5"
@@ -9635,10 +9635,10 @@ osenv@^0.1.0, osenv@^0.1.3:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-p-cancelable@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
-  integrity "sha1-NfNj1n1SCByNlYXje8zrfgu8sqA= sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
 p-defer@^3.0.0:
   version "3.0.0"
@@ -9650,11 +9650,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
 
-p-is-promise@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
-  integrity "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4= sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg=="
-
 p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@@ -9709,27 +9704,20 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-timeout@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
-  integrity "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg= sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="
-  dependencies:
-    p-finally "^1.0.0"
-
 p-try@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
   integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
 
-package-json@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-5.0.0.tgz#a7dbe2725edcc7dc9bcee627672275e323882433"
-  integrity "sha1-p9vicl7cx9ybzuYnZyJ14yOIJDM= sha512-EeHQFFTlEmLrkIQoxbE9w0FuAWHoc1XpthDqnZ/i9keOt701cteyXwAxQFLpVqVjj3feh2TodkihjLaRUtIgLg=="
+package-json@^6.0.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
+  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
   dependencies:
-    got "^8.3.1"
-    registry-auth-token "^3.3.2"
-    registry-url "^3.1.0"
-    semver "^5.5.0"
+    got "^9.6.0"
+    registry-auth-token "^4.0.0"
+    registry-url "^5.0.0"
+    semver "^6.2.0"
 
 parent-module@^1.0.0:
   version "1.0.0"
@@ -9746,6 +9734,16 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
 parse-ms@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d"
@@ -9933,7 +9931,7 @@ pkg-up@^2.0.0:
   dependencies:
     find-up "^2.1.0"
 
-pkg-up@^3.1.0:
+pkg-up@^3.0.0, pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
   integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
@@ -10164,15 +10162,6 @@ qs@~1.0.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768"
   integrity "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g= sha512-tHuOP9TN/1VmDM/ylApGK1QF3PSIP8I6bHDEfoKNQeViREQ/sfu1bAUrA1hoDun8p8Tpm7jcsz47g+3PiGoYdg=="
 
-query-string@^5.0.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
-  integrity "sha1-p4wBK3HBfgXy4/ojGd0zBoLvs8s= sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw=="
-  dependencies:
-    decode-uri-component "^0.2.0"
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 querystring@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
@@ -10186,10 +10175,10 @@ quibble@^0.5.1:
     lodash "^4.17.2"
     resolve "^1.5.0"
 
-quick-lru@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-  integrity "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= sha512-tRS7sTgyxMXtLum8L65daJnHUhfDUgboRdcWW2bR9vBfrj2+O5HSMbQOJfJJjIVSPFqbBCF37FpwWXGitDc5tA=="
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
 quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
   version "0.1.8"
@@ -10233,23 +10222,24 @@ raw-body@~1.1.0:
     bytes "1"
     string_decoder "0.10"
 
-rc@^1.0.1, rc@^1.1.6:
+rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity "sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0= sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
     ini "~1.3.0"
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-read-pkg-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
-  integrity "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= sha512-YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw=="
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
-    find-up "^2.0.0"
-    read-pkg "^3.0.0"
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
 
 read-pkg@^3.0.0:
   version "3.0.0"
@@ -10260,6 +10250,16 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
 "readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
@@ -10269,7 +10269,7 @@ read-pkg@^3.0.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.6:
+readable-stream@^2.0.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8= sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="
@@ -10309,13 +10309,13 @@ recast@^0.18.1:
     private "^0.1.8"
     source-map "~0.6.1"
 
-redent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
-  integrity "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= sha512-XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw=="
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
-    indent-string "^3.0.0"
-    strip-indent "^2.0.0"
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
 
 redeyed@~1.0.0:
   version "1.0.1"
@@ -10404,20 +10404,19 @@ regexpu-core@^4.7.1:
     unicode-match-property-ecmascript "^1.0.4"
     unicode-match-property-value-ecmascript "^1.2.0"
 
-registry-auth-token@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz#851fd49038eecb586911115af845260eec983f20"
-  integrity "sha1-hR/UkDjuy1hpERFa+EUmDuyYPyA= sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="
+registry-auth-token@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
+  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
   dependencies:
-    rc "^1.1.6"
-    safe-buffer "^5.0.1"
+    rc "^1.2.8"
 
-registry-url@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz#3d4ef870f73dde1d77f0cf9a381432444e174942"
-  integrity "sha1-PU74cPc93h138M+aOBQyRE4XSUI= sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA=="
+registry-url@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
+  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
   dependencies:
-    rc "^1.0.1"
+    rc "^1.2.8"
 
 regjsgen@^0.5.1:
   version "0.5.1"
@@ -10565,10 +10564,10 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.1
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-responselike@1.0.2:
+responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
   dependencies:
     lowercase-keys "^1.0.0"
 
@@ -10714,7 +10713,7 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -10809,12 +10808,12 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -11086,13 +11085,6 @@ socket.io@^4.1.2:
     socket.io-adapter "~2.3.2"
     socket.io-parser "~4.0.4"
 
-sort-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
-  integrity "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg=="
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 sort-object-keys@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
@@ -11259,11 +11251,6 @@ stream-combiner@~0.0.4:
   dependencies:
     duplexer "~0.1.1"
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
-
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
@@ -11425,10 +11412,12 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity "sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="
 
-strip-indent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
-  integrity "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= sha512-RsSNPLpq6YUL7QYy44RnPVTn/lcVZtb48Uof3X5JLbF4zD/Gs7ZFDv2HWol+leoQN2mT86LAzSshGfkTlSOpsA=="
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
 
 strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
@@ -11680,11 +11669,6 @@ time-zone@^1.0.0:
   resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
   integrity "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0= sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA=="
 
-timed-out@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
-  integrity "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8= sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA=="
-
 tiny-glob@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.8.tgz#b2792c396cc62db891ffa161fe8b33e76123e531"
@@ -11761,6 +11745,11 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
@@ -11827,10 +11816,10 @@ tree-sync@^2.0.0, tree-sync@^2.1.0:
     quick-temp "^0.1.5"
     walk-sync "^0.3.3"
 
-trim-newlines@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
-  integrity "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
+trim-newlines@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 tsconfig-paths@^3.12.0:
   version "3.12.0"
@@ -11886,11 +11875,26 @@ type-fest@^0.11.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
   integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
 
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.17, type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
@@ -12056,11 +12060,6 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-to-options@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
-  integrity "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k= sha512-0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="
-
 url@0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
@@ -12423,14 +12422,7 @@ yargs-parser@13.1.2, yargs-parser@^13.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity "sha1-cgImW4n36eny5XZeD+c1qQXtuqg= sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="
-  dependencies:
-    camelcase "^4.1.0"
-
-yargs-parser@^20.2.2:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==

From 4432f0292dd9dfb5f5eb8398f9dcd65a1623f98d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 23:47:59 +0000
Subject: [PATCH 0824/1405] Bump @babel/preset-env from 7.9.6 to 7.16.11

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.9.6 to 7.16.11.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.11/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |    2 +-
 yarn.lock    | 2152 ++++++++++++--------------------------------------
 2 files changed, 516 insertions(+), 1638 deletions(-)

diff --git a/package.json b/package.json
index bdd85bba2e8..2b36466a8d2 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "silent-error": "^1.1.1"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.9.5",
+    "@babel/preset-env": "^7.16.11",
     "@glimmer/compiler": "0.83.1",
     "@glimmer/destroyable": "0.83.1",
     "@glimmer/env": "^0.1.7",
diff --git a/yarn.lock b/yarn.lock
index 98df05414df..edd2eb42766 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,30 +16,11 @@
   dependencies:
     "@babel/highlight" "^7.14.5"
 
-"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
-  integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
-
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
-  integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
-
-"@babel/compat-data@^7.16.4":
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/compat-data@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.6.tgz#3f604c40e420131affe6f2c8052e9a275ae2049b"
-  integrity sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==
-  dependencies:
-    browserslist "^4.11.1"
-    invariant "^2.2.4"
-    semver "^5.5.0"
-
 "@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.3.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
@@ -98,72 +79,29 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
+"@babel/helper-annotate-as-pure@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
   integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-annotate-as-pure@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz#60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"
-  integrity sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
-  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
-  integrity sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz#c84097a427a061ac56a1c30ebf54b7b22d241503"
-  integrity sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
-  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
+"@babel/helper-annotate-as-pure@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
+  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
   dependencies:
-    "@babel/compat-data" "^7.12.5"
-    "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.14.5"
-    semver "^5.5.0"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
-  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
+  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
   dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-validator-option" "^7.14.5"
-    browserslist "^4.16.6"
-    semver "^6.3.0"
+    "@babel/helper-explode-assignable-expression" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.16.7":
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
   integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
@@ -173,17 +111,6 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz#1e05b7ccc9d38d2f8b40b458b380a04dcfadd38a"
-  integrity sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==
-  dependencies:
-    "@babel/compat-data" "^7.9.6"
-    browserslist "^4.11.1"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
 "@babel/helper-create-class-features-plugin@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
@@ -195,7 +122,7 @@
     "@babel/helper-replace-supers" "^7.12.1"
     "@babel/helper-split-export-declaration" "^7.10.4"
 
-"@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
+"@babel/helper-create-class-features-plugin@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
   integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
@@ -207,50 +134,27 @@
     "@babel/helper-replace-supers" "^7.15.4"
     "@babel/helper-split-export-declaration" "^7.15.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz#18b1302d4677f9dc4740fe8c9ed96680e29d37e8"
-  integrity sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
+  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
-    regexpu-core "^4.7.1"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
 
-"@babel/helper-create-regexp-features-plugin@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
-  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
+"@babel/helper-create-regexp-features-plugin@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
+  integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
     regexpu-core "^4.7.1"
 
-"@babel/helper-create-regexp-features-plugin@^7.8.3", "@babel/helper-create-regexp-features-plugin@^7.8.8":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz#5d84180b588f560b7864efaeea89243e58312087"
-  integrity sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-    regexpu-core "^4.7.0"
-
-"@babel/helper-define-map@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
-  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
-
-"@babel/helper-define-map@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz#a0655cad5451c3760b726eba875f1cd8faa02c15"
-  integrity sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==
-  dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/types" "^7.8.3"
-    lodash "^4.17.13"
-
 "@babel/helper-define-polyfill-provider@^0.2.2":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
@@ -265,6 +169,20 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-define-polyfill-provider@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
+  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.13.0"
+    "@babel/helper-module-imports" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/traverse" "^7.13.0"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
+
 "@babel/helper-environment-visitor@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
@@ -272,27 +190,12 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
-  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-explode-assignable-expression@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
-  integrity sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-explode-assignable-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz#a728dc5b4e89e30fc2dfc7d04fa28a930653f982"
-  integrity sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==
+"@babel/helper-explode-assignable-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
+  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
   dependencies:
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.16.7"
 
 "@babel/helper-function-name@^7.10.4":
   version "7.10.4"
@@ -303,7 +206,7 @@
     "@babel/template" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
+"@babel/helper-function-name@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
   integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
@@ -330,15 +233,6 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c"
-  integrity sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.9.5"
-
 "@babel/helper-get-function-arity@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
@@ -367,13 +261,6 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
-  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
 "@babel/helper-hoist-variables@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
@@ -388,13 +275,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-hoist-variables@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz#1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"
-  integrity sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-member-expression-to-functions@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
@@ -409,49 +289,20 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
+"@babel/helper-member-expression-to-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
+  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
   dependencies:
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.8.3":
+"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
   integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
-  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-simple-access" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/helper-validator-identifier" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
-
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz#7da80c8cbc1f02655d83f8b79d25866afe50d226"
-  integrity sha512-ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.15.4"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-simple-access" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-    "@babel/helper-validator-identifier" "^7.15.7"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.6"
-
 "@babel/helper-module-transforms@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
@@ -466,19 +317,6 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
-
 "@babel/helper-optimise-call-expression@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
@@ -493,60 +331,26 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
-  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-
-"@babel/helper-regex@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz#32dfbb79899073c415557053a19bd055aae50ae0"
-  integrity sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==
-  dependencies:
-    lodash "^4.17.19"
-
-"@babel/helper-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
-  integrity sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==
-  dependencies:
-    lodash "^4.17.13"
-
-"@babel/helper-remap-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
-  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
+"@babel/helper-optimise-call-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
+  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.16.7"
 
-"@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
-  integrity sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-wrap-function" "^7.15.4"
-    "@babel/types" "^7.15.4"
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
+  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
 
-"@babel/helper-remap-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz#273c600d8b9bf5006142c1e35887d555c12edd86"
-  integrity sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==
+"@babel/helper-remap-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
+  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-wrap-function" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-wrap-function" "^7.16.8"
+    "@babel/types" "^7.16.8"
 
 "@babel/helper-replace-supers@^7.12.1":
   version "7.12.5"
@@ -558,7 +362,7 @@
     "@babel/traverse" "^7.12.5"
     "@babel/types" "^7.12.5"
 
-"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
+"@babel/helper-replace-supers@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
   integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
@@ -568,29 +372,16 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/helper-replace-supers@^7.8.3", "@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
-"@babel/helper-simple-access@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
-  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-simple-access@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
-  integrity sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==
+"@babel/helper-replace-supers@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
+  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
   dependencies:
-    "@babel/types" "^7.15.4"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/traverse" "^7.16.7"
+    "@babel/types" "^7.16.7"
 
 "@babel/helper-simple-access@^7.16.7":
   version "7.16.7"
@@ -599,27 +390,12 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
-  integrity sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==
+"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
+  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
   dependencies:
-    "@babel/types" "^7.15.4"
+    "@babel/types" "^7.16.0"
 
 "@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
   version "7.11.0"
@@ -649,12 +425,7 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
-
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
+"@babel/helper-validator-identifier@^7.14.5":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
@@ -664,50 +435,20 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helper-validator-option@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
-  integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
-
-"@babel/helper-validator-option@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
-  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
-
 "@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
 
-"@babel/helper-wrap-function@^7.10.4":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
-  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-wrap-function@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
-  integrity sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==
-  dependencies:
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/template" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-wrap-function@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz#9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"
-  integrity sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==
+"@babel/helper-wrap-function@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
+  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
   dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.16.8"
+    "@babel/types" "^7.16.8"
 
 "@babel/helpers@^7.16.7":
   version "7.16.7"
@@ -746,6 +487,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae"
   integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==
 
+"@babel/parser@^7.16.10":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
+  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
+
 "@babel/parser@^7.16.7", "@babel/parser@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
@@ -756,65 +502,46 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
   integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
-  integrity sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
+  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
-  integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
+  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
 
-"@babel/plugin-proposal-async-generator-functions@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz#f82aabe96c135d2ceaa917feb9f5fca31635277e"
-  integrity sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
+  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.15.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-async-generator-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz#bad329c670b382589721b27540c7d288601c6e6f"
-  integrity sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-
-"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
-  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
-  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
+"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
+  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-class-static-block@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz#3e7ca6128453c089e8b477a99f970c63fc1cb8d7"
-  integrity sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==
+"@babel/plugin-proposal-class-static-block@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
+  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-decorators@^7.10.5":
@@ -835,277 +562,115 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-decorators" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
-  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
-  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
+"@babel/plugin-proposal-dynamic-import@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
+  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-dynamic-import@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz#38c4fe555744826e97e2ae930b0fb4cc07e66054"
-  integrity sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-
-"@babel/plugin-proposal-export-namespace-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
-  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+"@babel/plugin-proposal-export-namespace-from@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
+  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
-  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
+"@babel/plugin-proposal-json-strings@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
+  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
-  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
+"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
+  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-json-strings@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
-  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
+  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz#da5216b238a98b58a1e05d6852104b10f9a70d6b"
-  integrity sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==
+"@babel/plugin-proposal-numeric-separator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
+  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
-  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
-  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
-  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
-  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz#e4572253fdeed65cddeecfdab3f928afeb2fd5d2"
-  integrity sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
-"@babel/plugin-proposal-numeric-separator@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba"
-  integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-numeric-separator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
-  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz#5d6769409699ec9b3b68684cd8116cedff93bad8"
-  integrity sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-
-"@babel/plugin-proposal-object-rest-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
-  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-
-"@babel/plugin-proposal-object-rest-spread@^7.15.6":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
-  integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
+  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
   dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/compat-data" "^7.16.4"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.15.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz#7a093586fcb18b08266eb1a7177da671ac575b63"
-  integrity sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
-  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/plugin-transform-parameters" "^7.16.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
-  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
+"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
+  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz#9dee96ab1650eed88646ae9734ca167ac4a9c5c9"
-  integrity sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz#cce122203fc8a32794296fc377c6dedaf4363797"
-  integrity sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
-  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
+"@babel/plugin-proposal-optional-chaining@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
+  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz#31db16b154c39d6b8a645292472b98394c292a58"
-  integrity sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==
+"@babel/plugin-proposal-private-methods@^7.16.11":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
+  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-create-class-features-plugin" "^7.16.10"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-methods@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
-  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-proposal-private-methods@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
-  integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-proposal-private-property-in-object@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz#55c5e3b4d0261fd44fe637e3f624cfb0f484e3e5"
-  integrity sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==
+"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
+  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
-  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
-  integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.4.4", "@babel/plugin-proposal-unicode-property-regex@^7.8.3":
-  version "7.8.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz#ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"
-  integrity sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==
+"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
+  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.8"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
-  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
@@ -1134,7 +699,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
@@ -1148,7 +713,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
@@ -1162,7 +727,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -1176,28 +741,21 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-numeric-separator@^7.8.0", "@babel/plugin-syntax-numeric-separator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f"
-  integrity sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-syntax-object-rest-spread@^7.8.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -1211,13 +769,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
-  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
@@ -1225,13 +776,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz#3acdece695e6b13aaf57fc291d1a800950c71391"
-  integrity sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
 "@babel/plugin-syntax-typescript@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
@@ -1246,566 +790,204 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
-  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-arrow-functions@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
-  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-arrow-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz#82776c2ed0cd9e1a49956daeb896024c9473b8b6"
-  integrity sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
-  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
-
-"@babel/plugin-transform-async-to-generator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
-  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-remap-async-to-generator" "^7.14.5"
-
-"@babel/plugin-transform-async-to-generator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz#4308fad0d9409d71eafb9b1a6ee35f9d64b64086"
-  integrity sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-remap-async-to-generator" "^7.8.3"
-
-"@babel/plugin-transform-block-scoped-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
-  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-block-scoped-functions@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
-  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-block-scoped-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz#437eec5b799b5852072084b3ae5ef66e8349e8a3"
-  integrity sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.15.3", "@babel/plugin-transform-block-scoping@^7.16.0", "@babel/plugin-transform-block-scoping@^7.8.3":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16"
-  integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-classes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
-  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-define-map" "^7.10.4"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
-  integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz#800597ddb8aefc2c293ed27459c1fcc935a26c2c"
-  integrity sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-define-map" "^7.8.3"
-    "@babel/helper-function-name" "^7.9.5"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-computed-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
-  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-computed-properties@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
-  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-computed-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz#96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"
-  integrity sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-destructuring@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
-  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-destructuring@^7.14.7":
-  version "7.14.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
-  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-destructuring@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz#72c97cf5f38604aea3abf3b935b0e17b1db76a50"
-  integrity sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-dotall-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
-  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-dotall-regex@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
-  integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-dotall-regex@^7.4.4", "@babel/plugin-transform-dotall-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz#c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"
-  integrity sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-duplicate-keys@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
-  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-duplicate-keys@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
-  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-duplicate-keys@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz#8d12df309aa537f272899c565ea1768e286e21f1"
-  integrity sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-exponentiation-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
-  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-exponentiation-operator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
-  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-exponentiation-operator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz#581a6d7f56970e06bf51560cd64f5e947b70d7b7"
-  integrity sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-for-of@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
-  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-for-of@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
-  integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-for-of@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz#0f260e27d3e29cd1bb3128da5e76c761aa6c108e"
-  integrity sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-function-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
-  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-function-name@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
-  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz#279373cb27322aaad67c2683e776dfc47196ed8b"
-  integrity sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
-  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
-  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz#aef239823d91994ec7b68e55193525d76dbd5dc1"
-  integrity sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-member-expression-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
-  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-member-expression-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
-  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-member-expression-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz#963fed4b620ac7cbf6029c755424029fa3a40410"
-  integrity sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.9.6":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
-  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
-  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.12.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
-  integrity sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-simple-access" "^7.15.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-commonjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz#64b7474a4279ee588cacd1906695ca721687c277"
-  integrity sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-simple-access" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
-  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-identifier" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
-  integrity sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.15.4"
-    "@babel/helper-module-transforms" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-identifier" "^7.14.9"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
-"@babel/plugin-transform-modules-systemjs@^7.9.6":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz#207f1461c78a231d5337a92140e52422510d81a4"
-  integrity sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==
+"@babel/plugin-transform-arrow-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
+  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.8.3"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-umd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
-  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
+"@babel/plugin-transform-async-to-generator@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
+  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-remap-async-to-generator" "^7.16.8"
 
-"@babel/plugin-transform-modules-umd@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
-  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
+"@babel/plugin-transform-block-scoped-functions@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
+  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-umd@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz#e909acae276fec280f9b821a5f38e1f08b480697"
-  integrity sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==
+"@babel/plugin-transform-block-scoping@^7.16.0", "@babel/plugin-transform-block-scoping@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
+  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
-  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
+"@babel/plugin-transform-classes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
+  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    globals "^11.1.0"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
-  version "7.14.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
-  integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==
+"@babel/plugin-transform-computed-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
+  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
-  integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-destructuring@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
+  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-new-target@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
-  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
+"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
+  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-new-target@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
-  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
+"@babel/plugin-transform-duplicate-keys@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
+  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-new-target@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz#60cc2ae66d85c95ab540eb34babb6434d4c70c43"
-  integrity sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==
+"@babel/plugin-transform-exponentiation-operator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
+  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
-  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
+"@babel/plugin-transform-for-of@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
+  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
-  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
+"@babel/plugin-transform-function-name@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
+  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-object-super@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz#ebb6a1e7a86ffa96858bd6ac0102d65944261725"
-  integrity sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==
+"@babel/plugin-transform-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
+  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
-  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
+"@babel/plugin-transform-member-expression-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
+  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-parameters@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
-  integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
+"@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
+  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-parameters@^7.9.5":
-  version "7.9.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz#173b265746f5e15b2afe527eeda65b73623a0795"
-  integrity sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
+  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-simple-access" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-property-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
-  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
+  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-property-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
-  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
+"@babel/plugin-transform-modules-umd@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
+  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-property-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz#33194300d8539c1ed28c62ad5087ba3807b98263"
-  integrity sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
+  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
-  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
+"@babel/plugin-transform-new-target@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
+  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
-  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
+"@babel/plugin-transform-object-super@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
+  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
 
-"@babel/plugin-transform-regenerator@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
-  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
+"@babel/plugin-transform-parameters@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
+  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-reserved-words@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
-  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
+"@babel/plugin-transform-property-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
+  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-reserved-words@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
-  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
+"@babel/plugin-transform-regenerator@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
+  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz#9a0635ac4e665d29b162837dd3cc50745dfdf1f5"
-  integrity sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==
+"@babel/plugin-transform-reserved-words@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
+  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-runtime@^7.12.0":
   version "7.12.1"
@@ -1829,115 +1011,41 @@
     babel-plugin-polyfill-regenerator "^0.2.2"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
-  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-shorthand-properties@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
-  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-shorthand-properties@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz#28545216e023a832d4d3a1185ed492bcfeac08c8"
-  integrity sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
-  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-
-"@babel/plugin-transform-spread@^7.14.6":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
-  integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
-
-"@babel/plugin-transform-spread@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz#9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"
-  integrity sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-
-"@babel/plugin-transform-sticky-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz#5c24cf50de396d30e99afc8d1c700e8bce0f5caf"
-  integrity sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-regex" "^7.10.4"
-
-"@babel/plugin-transform-sticky-regex@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
-  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-sticky-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz#be7a1290f81dae767475452199e1f76d6175b100"
-  integrity sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/helper-regex" "^7.8.3"
-
-"@babel/plugin-transform-template-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
-  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-template-literals@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
-  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
+"@babel/plugin-transform-shorthand-properties@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
+  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-template-literals@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz#7bfa4732b455ea6a43130adc0ba767ec0e402a80"
-  integrity sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==
+"@babel/plugin-transform-spread@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
+  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
-  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
+"@babel/plugin-transform-sticky-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
+  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
-  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
+"@babel/plugin-transform-template-literals@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
+  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typeof-symbol@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz#ede4062315ce0aaf8a657a920858f1a2f35fc412"
-  integrity sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==
+"@babel/plugin-transform-typeof-symbol@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
+  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-typescript@^7.12.0":
   version "7.12.1"
@@ -1957,43 +1065,20 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-typescript" "^7.14.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
-  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-unicode-escapes@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
-  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-transform-unicode-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
-  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-unicode-regex@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
-  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
+  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-unicode-regex@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz#0cef36e3ba73e5c57273effb182f46b91a1ecaad"
-  integrity sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==
+"@babel/plugin-transform-unicode-regex@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
+  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
+    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/polyfill@^7.11.5":
   version "7.12.1"
@@ -2003,31 +1088,32 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.6.tgz#0f3898db9d63d320f21b17380d8462779de57659"
-  integrity sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==
+"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11":
+  version "7.16.11"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
+  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
   dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-compilation-targets" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.15.4"
-    "@babel/plugin-proposal-async-generator-functions" "^7.15.4"
-    "@babel/plugin-proposal-class-properties" "^7.14.5"
-    "@babel/plugin-proposal-class-static-block" "^7.15.4"
-    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
-    "@babel/plugin-proposal-json-strings" "^7.14.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
-    "@babel/plugin-proposal-object-rest-spread" "^7.15.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@babel/plugin-proposal-private-methods" "^7.14.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.15.4"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
+    "@babel/compat-data" "^7.16.8"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-option" "^7.16.7"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-class-static-block" "^7.16.7"
+    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
+    "@babel/plugin-proposal-json-strings" "^7.16.7"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
+    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
+    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/plugin-proposal-private-methods" "^7.16.11"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
@@ -2042,199 +1128,50 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.14.5"
-    "@babel/plugin-transform-async-to-generator" "^7.14.5"
-    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
-    "@babel/plugin-transform-block-scoping" "^7.15.3"
-    "@babel/plugin-transform-classes" "^7.15.4"
-    "@babel/plugin-transform-computed-properties" "^7.14.5"
-    "@babel/plugin-transform-destructuring" "^7.14.7"
-    "@babel/plugin-transform-dotall-regex" "^7.14.5"
-    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
-    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
-    "@babel/plugin-transform-for-of" "^7.15.4"
-    "@babel/plugin-transform-function-name" "^7.14.5"
-    "@babel/plugin-transform-literals" "^7.14.5"
-    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
-    "@babel/plugin-transform-modules-amd" "^7.14.5"
-    "@babel/plugin-transform-modules-commonjs" "^7.15.4"
-    "@babel/plugin-transform-modules-systemjs" "^7.15.4"
-    "@babel/plugin-transform-modules-umd" "^7.14.5"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9"
-    "@babel/plugin-transform-new-target" "^7.14.5"
-    "@babel/plugin-transform-object-super" "^7.14.5"
-    "@babel/plugin-transform-parameters" "^7.15.4"
-    "@babel/plugin-transform-property-literals" "^7.14.5"
-    "@babel/plugin-transform-regenerator" "^7.14.5"
-    "@babel/plugin-transform-reserved-words" "^7.14.5"
-    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
-    "@babel/plugin-transform-spread" "^7.14.6"
-    "@babel/plugin-transform-sticky-regex" "^7.14.5"
-    "@babel/plugin-transform-template-literals" "^7.14.5"
-    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
-    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
-    "@babel/plugin-transform-unicode-regex" "^7.14.5"
-    "@babel/preset-modules" "^0.1.4"
-    "@babel/types" "^7.15.6"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.2"
-    babel-plugin-polyfill-regenerator "^0.2.2"
-    core-js-compat "^3.16.0"
+    "@babel/plugin-transform-arrow-functions" "^7.16.7"
+    "@babel/plugin-transform-async-to-generator" "^7.16.8"
+    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
+    "@babel/plugin-transform-block-scoping" "^7.16.7"
+    "@babel/plugin-transform-classes" "^7.16.7"
+    "@babel/plugin-transform-computed-properties" "^7.16.7"
+    "@babel/plugin-transform-destructuring" "^7.16.7"
+    "@babel/plugin-transform-dotall-regex" "^7.16.7"
+    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
+    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
+    "@babel/plugin-transform-for-of" "^7.16.7"
+    "@babel/plugin-transform-function-name" "^7.16.7"
+    "@babel/plugin-transform-literals" "^7.16.7"
+    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.16.7"
+    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
+    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
+    "@babel/plugin-transform-modules-umd" "^7.16.7"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
+    "@babel/plugin-transform-new-target" "^7.16.7"
+    "@babel/plugin-transform-object-super" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-property-literals" "^7.16.7"
+    "@babel/plugin-transform-regenerator" "^7.16.7"
+    "@babel/plugin-transform-reserved-words" "^7.16.7"
+    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
+    "@babel/plugin-transform-spread" "^7.16.7"
+    "@babel/plugin-transform-sticky-regex" "^7.16.7"
+    "@babel/plugin-transform-template-literals" "^7.16.7"
+    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
+    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
+    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.16.8"
+    babel-plugin-polyfill-corejs2 "^0.3.0"
+    babel-plugin-polyfill-corejs3 "^0.5.0"
+    babel-plugin-polyfill-regenerator "^0.3.0"
+    core-js-compat "^3.20.2"
     semver "^6.3.0"
 
-"@babel/preset-env@^7.12.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.1.tgz#9c7e5ca82a19efc865384bb4989148d2ee5d7ac2"
-  integrity sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==
-  dependencies:
-    "@babel/compat-data" "^7.12.1"
-    "@babel/helper-compilation-targets" "^7.12.1"
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
-    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
-    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
-    "@babel/plugin-proposal-json-strings" "^7.12.1"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.1"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.1"
-    "@babel/plugin-proposal-private-methods" "^7.12.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.12.1"
-    "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-async-to-generator" "^7.12.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
-    "@babel/plugin-transform-classes" "^7.12.1"
-    "@babel/plugin-transform-computed-properties" "^7.12.1"
-    "@babel/plugin-transform-destructuring" "^7.12.1"
-    "@babel/plugin-transform-dotall-regex" "^7.12.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
-    "@babel/plugin-transform-for-of" "^7.12.1"
-    "@babel/plugin-transform-function-name" "^7.12.1"
-    "@babel/plugin-transform-literals" "^7.12.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
-    "@babel/plugin-transform-modules-amd" "^7.12.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
-    "@babel/plugin-transform-modules-umd" "^7.12.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
-    "@babel/plugin-transform-new-target" "^7.12.1"
-    "@babel/plugin-transform-object-super" "^7.12.1"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-    "@babel/plugin-transform-property-literals" "^7.12.1"
-    "@babel/plugin-transform-regenerator" "^7.12.1"
-    "@babel/plugin-transform-reserved-words" "^7.12.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
-    "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-sticky-regex" "^7.12.1"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
-    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
-    "@babel/plugin-transform-unicode-regex" "^7.12.1"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.1"
-    core-js-compat "^3.6.2"
-    semver "^5.5.0"
-
-"@babel/preset-env@^7.9.5":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.6.tgz#df063b276c6455ec6fcfc6e53aacc38da9b0aea6"
-  integrity sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==
-  dependencies:
-    "@babel/compat-data" "^7.9.6"
-    "@babel/helper-compilation-targets" "^7.9.6"
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-plugin-utils" "^7.8.3"
-    "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
-    "@babel/plugin-proposal-dynamic-import" "^7.8.3"
-    "@babel/plugin-proposal-json-strings" "^7.8.3"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-proposal-numeric-separator" "^7.8.3"
-    "@babel/plugin-proposal-object-rest-spread" "^7.9.6"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-proposal-optional-chaining" "^7.9.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.8.3"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.8.3"
-    "@babel/plugin-transform-arrow-functions" "^7.8.3"
-    "@babel/plugin-transform-async-to-generator" "^7.8.3"
-    "@babel/plugin-transform-block-scoped-functions" "^7.8.3"
-    "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@babel/plugin-transform-classes" "^7.9.5"
-    "@babel/plugin-transform-computed-properties" "^7.8.3"
-    "@babel/plugin-transform-destructuring" "^7.9.5"
-    "@babel/plugin-transform-dotall-regex" "^7.8.3"
-    "@babel/plugin-transform-duplicate-keys" "^7.8.3"
-    "@babel/plugin-transform-exponentiation-operator" "^7.8.3"
-    "@babel/plugin-transform-for-of" "^7.9.0"
-    "@babel/plugin-transform-function-name" "^7.8.3"
-    "@babel/plugin-transform-literals" "^7.8.3"
-    "@babel/plugin-transform-member-expression-literals" "^7.8.3"
-    "@babel/plugin-transform-modules-amd" "^7.9.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.9.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.9.6"
-    "@babel/plugin-transform-modules-umd" "^7.9.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
-    "@babel/plugin-transform-new-target" "^7.8.3"
-    "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.9.5"
-    "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.7"
-    "@babel/plugin-transform-reserved-words" "^7.8.3"
-    "@babel/plugin-transform-shorthand-properties" "^7.8.3"
-    "@babel/plugin-transform-spread" "^7.8.3"
-    "@babel/plugin-transform-sticky-regex" "^7.8.3"
-    "@babel/plugin-transform-template-literals" "^7.8.3"
-    "@babel/plugin-transform-typeof-symbol" "^7.8.4"
-    "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.9.6"
-    browserslist "^4.11.1"
-    core-js-compat "^3.6.2"
-    invariant "^2.2.2"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
-"@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.0.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
-    "@babel/plugin-transform-dotall-regex" "^7.4.4"
-    "@babel/types" "^7.4.4"
-    esutils "^2.0.2"
-
-"@babel/preset-modules@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
-  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
+"@babel/preset-modules@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -2297,7 +1234,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/template@^7.8.3", "@babel/template@^7.8.6":
+"@babel/template@^7.8.3":
   version "7.8.6"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
   integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
@@ -2321,7 +1258,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5":
+"@babel/traverse@^7.12.5":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
   integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
@@ -2352,7 +1289,23 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.4.5", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
+"@babel/traverse@^7.16.8":
+  version "7.16.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
+  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.16.10"
+    "@babel/types" "^7.16.8"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.4.5":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
   integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
@@ -2367,15 +1320,7 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.16.7", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5", "@babel/types@^7.9.6":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
-  integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.16.8":
+"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.15.4", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
   integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
@@ -3514,6 +2459,15 @@ babel-plugin-polyfill-corejs2@^0.2.2:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
     semver "^6.1.1"
 
+babel-plugin-polyfill-corejs2@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
+  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+  dependencies:
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    semver "^6.1.1"
+
 babel-plugin-polyfill-corejs3@^0.2.2:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
@@ -3522,6 +2476,14 @@ babel-plugin-polyfill-corejs3@^0.2.2:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
     core-js-compat "^3.16.2"
 
+babel-plugin-polyfill-corejs3@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060"
+  integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    core-js-compat "^3.20.0"
+
 babel-plugin-polyfill-regenerator@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
@@ -3529,6 +2491,13 @@ babel-plugin-polyfill-regenerator@^0.2.2:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.2.2"
 
+babel-plugin-polyfill-regenerator@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
+  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.1"
+
 babel-plugin-syntax-dynamic-import@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da"
@@ -4229,29 +3198,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA= sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
 
-browserslist@^4.11.1, browserslist@^4.14.5, browserslist@^4.8.3:
-  version "4.16.6"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
-  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
-  dependencies:
-    caniuse-lite "^1.0.30001219"
-    colorette "^1.2.2"
-    electron-to-chromium "^1.3.723"
-    escalade "^3.1.1"
-    node-releases "^1.1.71"
-
-browserslist@^4.16.6, browserslist@^4.17.0:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.1.tgz#a98d104f54af441290b7d592626dd541fa642eb9"
-  integrity sha512-aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ==
-  dependencies:
-    caniuse-lite "^1.0.30001259"
-    electron-to-chromium "^1.3.846"
-    escalade "^3.1.1"
-    nanocolors "^0.1.5"
-    node-releases "^1.1.76"
-
-browserslist@^4.17.5:
+browserslist@^4.17.5, browserslist@^4.19.1:
   version "4.19.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
   integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
@@ -4429,18 +3376,6 @@ can-symlink@^1.0.0:
   dependencies:
     tmp "0.0.28"
 
-caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
-
-caniuse-lite@^1.0.30001259:
-  version "1.0.30001260"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz#e3be3f34ddad735ca4a2736fa9e768ef34316270"
-  integrity sha512-Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg==
-  dependencies:
-    nanocolors "^0.1.0"
-
 caniuse-lite@^1.0.30001286:
   version "1.0.30001299"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz#d753bf6444ed401eb503cbbe17aa3e1451b5a68c"
@@ -4725,11 +3660,6 @@ color-name@^1.1.1, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
-
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -4908,20 +3838,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
 
-core-js-compat@^3.16.0, core-js-compat@^3.16.2:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.18.0.tgz#fb360652201e8ac8da812718c008cd0482ed9b42"
-  integrity sha512-tRVjOJu4PxdXjRMEgbP7lqWy1TWJu9a01oBkn8d+dNrhgmBwdTkzhHZpVJnEmhISLdoJI1lX08rcBcHi3TZIWg==
-  dependencies:
-    browserslist "^4.17.0"
-    semver "7.0.0"
-
-core-js-compat@^3.6.2:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz#938476569ebb6cda80d339bcf199fae4f16fff17"
-  integrity sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==
+core-js-compat@^3.16.2, core-js-compat@^3.20.0, core-js-compat@^3.20.2:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885"
+  integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==
   dependencies:
-    browserslist "^4.8.3"
+    browserslist "^4.19.1"
     semver "7.0.0"
 
 core-js@^2.4.0, core-js@^2.6.5:
@@ -5261,16 +4183,6 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 
-electron-to-chromium@^1.3.723:
-  version "1.3.736"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
-  integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
-
-electron-to-chromium@^1.3.846:
-  version "1.3.849"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.849.tgz#45a65a392565abc5b864624b9753393336426f4b"
-  integrity sha512-RweyW60HPOqIcxoKTGr38Yvtf2aliSUqX8dB3e9geJ0Bno0YLjcOX5F7/DPVloBkJWaPZ7xOM1A0Yme2T1A34w==
-
 electron-to-chromium@^1.4.17:
   version "1.4.44"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
@@ -7609,7 +6521,7 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -8232,18 +7144,6 @@ leek@0.0.24:
     lodash.assign "^3.2.0"
     rsvp "^3.0.21"
 
-leven@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
-  integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
-
-levenary@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
-  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
-  dependencies:
-    leven "^3.1.0"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -9243,7 +8143,7 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="
 
-nanocolors@^0.1.0, nanocolors@^0.1.5:
+nanocolors@^0.1.5:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
   integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
@@ -9338,16 +8238,6 @@ node-notifier@^9.0.1:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.71:
-  version "1.1.72"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
-  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
-
-node-releases@^1.1.76:
-  version "1.1.76"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.76.tgz#df245b062b0cafbd5282ab6792f7dccc2d97f36e"
-  integrity sha512-9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA==
-
 node-releases@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
@@ -10380,18 +9270,6 @@ regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938"
-  integrity sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==
-  dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
-
 regexpu-core@^4.7.1:
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"

From 132ae340f2a3e6e1e0cb8a3f9f57a21c4cd66e15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 23:48:31 +0000
Subject: [PATCH 0825/1405] Bump aws-sdk from 2.814.0 to 2.1066.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.814.0 to 2.1066.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.814.0...v2.1066.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index bdd85bba2e8..81aa4c85019 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "auto-dist-tag": "^2.1.1",
-    "aws-sdk": "^2.814.0",
+    "aws-sdk": "^2.1066.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
diff --git a/yarn.lock b/yarn.lock
index 98df05414df..15af3e65083 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3383,15 +3383,15 @@ auto-dist-tag@^2.1.1:
     pkg-up "^3.0.0"
     semver "^7.0.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.814.0:
-  version "2.814.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.814.0.tgz#7a1c36006e0b5826f14bd2511b1d229ef6814bb0"
-  integrity sha512-empd1m/J/MAkL6d9OeRpmg9thobULu0wk4v8W3JToaxGi2TD7PIdvE6yliZKyOVAdJINhBWEBhxR4OUIHhcGbQ==
+aws-sdk@^2.0.9, aws-sdk@^2.1066.0:
+  version "2.1066.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1066.0.tgz#2a9b00d983f3c740a7adda18d4e9a5c34d4d3887"
+  integrity sha512-9BZPdJgIvau8Jf2l3PxInNqQd733uKLqGGDywMV71duxNTLgdBZe2zvCkbgl22+ldC8R2LVMdS64DzchfQIxHg==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
     ieee754 "1.1.13"
-    jmespath "0.15.0"
+    jmespath "0.16.0"
     querystring "0.2.0"
     sax "1.2.1"
     url "0.10.3"
@@ -8026,10 +8026,10 @@ istextorbinary@2.1.0:
     editions "^1.1.1"
     textextensions "1 || 2"
 
-jmespath@0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
-  integrity "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="
+jmespath@0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
+  integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
 js-reporters@1.2.3:
   version "1.2.3"

From 16b0e9cf062665ffb1b073ce12a29d8dc5cbc7e3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Feb 2022 23:48:35 +0000
Subject: [PATCH 0826/1405] Bump fs-extra from 9.1.0 to 10.0.0

Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/9.1.0...10.0.0)

---
updated-dependencies:
- dependency-name: fs-extra
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bdd85bba2e8..c79329cf01e 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "expect-type": "^0.13.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^10.0.0",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
     "glob": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index 98df05414df..777b200da96 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6770,6 +6770,15 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
+fs-extra@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
+  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^4.0.2, fs-extra@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"

From 1a879f2b40cc6fb2161d2f9c6e2e9659abb1c3c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:02:51 +0000
Subject: [PATCH 0827/1405] Bump resolve from 1.21.0 to 1.22.0

Bumps [resolve](https://github.com/browserify/resolve) from 1.21.0 to 1.22.0.
- [Release notes](https://github.com/browserify/resolve/releases)
- [Commits](https://github.com/browserify/resolve/compare/v1.21.0...v1.22.0)

---
updated-dependencies:
- dependency-name: resolve
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index fad0150dc89..282600cfb8c 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "ember-cli-version-checker": "^5.1.2",
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.13.1",
-    "resolve": "^1.17.0",
+    "resolve": "^1.22.0",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1"
   },
diff --git a/yarn.lock b/yarn.lock
index e8b1cf4f5ce..3f56fcd02fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7699,20 +7699,13 @@ is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.5.0:
+is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
   integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
   dependencies:
     has "^1.0.3"
 
-is-core-module@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548"
-  integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==
-  dependencies:
-    has "^1.0.3"
-
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -10555,12 +10548,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.21.0.tgz#b51adc97f3472e6a5cf4444d34bc9d6b9037591f"
-  integrity sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+  version "1.22.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
+  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
   dependencies:
-    is-core-module "^2.8.0"
+    is-core-module "^2.8.1"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 

From 18c1435134265d5e5a52858b5bef9d6939659907 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Feb 2022 00:03:00 +0000
Subject: [PATCH 0828/1405] Bump testem-failure-only-reporter from 0.0.1 to
 1.0.0

Bumps [testem-failure-only-reporter](https://github.com/emberjs/testem-failure-only-reporter) from 0.0.1 to 1.0.0.
- [Release notes](https://github.com/emberjs/testem-failure-only-reporter/releases)
- [Changelog](https://github.com/emberjs/testem-failure-only-reporter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emberjs/testem-failure-only-reporter/compare/v0.0.1...v1.0.0)

---
updated-dependencies:
- dependency-name: testem-failure-only-reporter
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 256 ++-------------------------------------------------
 2 files changed, 10 insertions(+), 248 deletions(-)

diff --git a/package.json b/package.json
index fad0150dc89..e6a6be8a0f3 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
-    "testem-failure-only-reporter": "^0.0.1",
+    "testem-failure-only-reporter": "^1.0.0",
     "typescript": "^4.5.4"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index e8b1cf4f5ce..c19f007f9ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3048,11 +3048,6 @@ acorn@^8.7.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA=="
-
 agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
@@ -3281,11 +3276,6 @@ array.prototype.flat@^1.2.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.0"
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU= sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
-
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -3595,11 +3585,6 @@ backburner.js@^2.7.0:
   resolved "https://registry.yarnpkg.com/backburner.js/-/backburner.js-2.7.0.tgz#36a5b8a8bfceb7efc8ad56e006a238924acfd67e"
   integrity sha512-eBZC6r7wT+YYAOKeru8IqgzOimz3VgyspXiZ1k6MI8i10zUdU8cnNII56rlnItQ89cHgQO3C/nPuFW3V9di+zg==
 
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity "sha1-MasayLEpNjRj41s+u2n038+6eUc= sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -3669,11 +3654,6 @@ blank-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
   integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity "sha1-1oDu7yX4zZGtUz9bAe7UjmTK9oM= sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
-
 bluebird@^3.1.1, bluebird@^3.4.6:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
@@ -4774,12 +4754,7 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw=="
-
-component-emitter@1.2.1, component-emitter@^1.2.1:
+component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
   integrity "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA=="
@@ -4789,11 +4764,6 @@ component-emitter@~1.3.0:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A= sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
 
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA=="
-
 compressible@~2.0.16:
   version "2.0.17"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
@@ -5054,20 +5024,6 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE= sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="
-  dependencies:
-    ms "2.0.0"
-
-debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5672,34 +5628,6 @@ end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.0.tgz#fc1b4d9616288ce4f2daf06dcf612413dec941c7"
-  integrity "sha1-/BtNlhYojOTy2vBtz2EkE97JQcc= sha512-12wPRfMrugVw/DNyJk34GQ5vIVArEcVMXWugQGGuw2XxUSztFNmJggZmv8IZlLyEdnpO1QB9LkcjeWewO2vxtA=="
-  dependencies:
-    component-emitter "~1.3.0"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.2.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~7.4.2"
-    xmlhttprequest-ssl "~1.5.4"
-    yeast "0.1.2"
-
-engine.io-parser@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity "sha1-V85WEdk3DulPmWQbWJ+UyX5PXac= sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg=="
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.4"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
-
 engine.io-parser@~4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-4.0.3.tgz#83d3a17acfd4226f19e721bb22a1ee8f7662d2f6"
@@ -5707,18 +5635,6 @@ engine.io-parser@~4.0.0:
   dependencies:
     base64-arraybuffer "0.1.4"
 
-engine.io@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
-  integrity "sha1-nWuYXIo5sf6HzZHrAU3gVSJZghs= sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA=="
-  dependencies:
-    accepts "~1.3.4"
-    base64id "2.0.0"
-    cookie "~0.4.1"
-    debug "~4.1.0"
-    engine.io-parser "~2.2.0"
-    ws "~7.4.2"
-
 engine.io@~5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.0.tgz#554cdd0230d89de7b1a49a809d7ee5a129d36809"
@@ -7213,18 +7129,6 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity "sha1-d3asYn8+p3JQz8My2rfd9eT10R0= sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -7537,11 +7441,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
-
 inflection@^1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.1.tgz#c5cadd80888a90cf84c2e96e340d7edc85d5f0cb"
@@ -7990,11 +7889,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
 
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ=="
-
 isbinaryfile@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
@@ -9316,16 +9210,6 @@ node-modules-path@^1.0.0, node-modules-path@^1.0.1:
   resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
   integrity "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg= sha512-DQTUnpUBWdRcLWJ/dKuYAXoTwofrIi2khgiwpNJ6Ce8JwLpcBWrm9ypOY307ta0o8nzcWwJf1RX7UWys6ahFlQ=="
 
-node-notifier@^5.0.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"
-  integrity "sha1-L6nhJgX6EACdRFSdb82KY93g5P8= sha512-HJp4p6fq5IlsFsjQFfhaZWfbUMfDiaSDZ5Wr/9g9Huwh+KFk0FdW8sjBLjk1bReQc4KPr9xUd/KBcsluCY8L/A=="
-  dependencies:
-    growly "^1.3.0"
-    semver "^5.3.0"
-    shellwords "^0.1.0"
-    which "^1.2.12"
-
 node-notifier@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-9.0.1.tgz#cea837f4c5e733936c7b9005e6545cea825d1af4"
@@ -9769,16 +9653,6 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity "sha1-jku1oZ0c3IRKCKyXTTTic6+mcNU= sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w=="
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity "sha1-4Ulugp46wv9H85pN0ESzKCPEolo= sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow=="
-
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -10039,11 +9913,6 @@ pretty-ms@^3.1.0:
     parse-ms "^1.0.0"
     plur "^2.1.2"
 
-printf@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/printf/-/printf-0.5.1.tgz#e0466788260859ed153006dc6867f09ddf240cf3"
-  integrity "sha1-4EZniCYIWe0VMAbcaGfwnd8kDPM= sha512-UaE/jO0hNsrvPGQEb4LyNzcrJv9Z00tsreBduOSxMtrebvoUhxiEJ4YCHX8YHf6akwfKsC2Gyv5zv47UXhMiLg=="
-
 printf@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/printf/-/printf-0.6.1.tgz#b9afa3d3b55b7f2e8b1715272479fc756ed88650"
@@ -10920,7 +10789,7 @@ shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.3.tgz#aa40edac170445b9a431e17bb62c0b881b9c4123"
   integrity sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==
 
-shellwords@^0.1.0, shellwords@^0.1.1:
+shellwords@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity "sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
@@ -11004,51 +10873,11 @@ sntp@0.2.x:
   dependencies:
     hoek "0.9.x"
 
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity "sha1-qz8Nb2a4/H/KOVmrWZH4IiF4m+k= sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g=="
-
 socket.io-adapter@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz#039cd7c71a52abad984a6d57da2c0b7ecdd3c289"
   integrity sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg==
 
-socket.io-client@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
-  integrity "sha1-qvtdWUo8VaNDVVYvyK6iLtkRmjU= sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="
-  dependencies:
-    backo2 "1.0.2"
-    component-bind "1.0.0"
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    engine.io-client "~3.5.0"
-    has-binary2 "~1.0.2"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    socket.io-parser "~3.3.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.3.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
-  integrity "sha1-74cgCdCtz3BPL76DAZGhR1KtULY= sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg=="
-  dependencies:
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io-parser@~3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
-  integrity "sha1-sGr4ODApdYN+qy3JgAN9okBU1ko= sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    isarray "2.0.1"
-
 socket.io-parser@~4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
@@ -11058,18 +10887,6 @@ socket.io-parser@~4.0.4:
     component-emitter "~1.3.0"
     debug "~4.3.1"
 
-socket.io@^2.1.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2"
-  integrity "sha1-la2GHJpSNp1/Gmis8NShsW2kUdI= sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w=="
-  dependencies:
-    debug "~4.1.0"
-    engine.io "~3.5.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.4.0"
-    socket.io-parser "~3.4.0"
-
 socket.io@^4.1.2:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.2.0.tgz#9e1c09d3ea647e24963a2e7ba8ea5c847778e2ed"
@@ -11565,49 +11382,14 @@ testdouble@^3.2.6:
     quibble "^0.5.1"
     stringify-object-es5 "^2.5.0"
 
-testem-failure-only-reporter@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/testem-failure-only-reporter/-/testem-failure-only-reporter-0.0.1.tgz#d096a22b3c78b4d4bdc74d4f8727d75ef8c57b7a"
-  integrity "sha1-0JaiKzx4tNS9x01PhyfXXvjFe3o= sha512-a3bquFhuguXcI244mAzt8ByCIEoAOsI7NVihNafi8PTYDVCnpgxm73JluduR9GITXopdOeyLAJnlI3pavY7x3w=="
-  dependencies:
-    testem "^2.9.2"
-
-testem@^2.9.2:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-2.17.0.tgz#1cb4a2a90524a088803dfe52fbf197a6fd73c883"
-  integrity "sha1-HLSiqQUkoIiAPf5S+/GXpv1zyIM= sha512-PLkIlT523w5rTJPWwR4TL1EiAEa941ECV7d4pMqsB0YdnH+sCTz0loWMKCUSdhR+VijveAZ6anE/JHehE7KqMQ=="
+testem-failure-only-reporter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/testem-failure-only-reporter/-/testem-failure-only-reporter-1.0.0.tgz#4e995cca31018e91ec4b22d0616590c6841b1874"
+  integrity sha512-G3fC1FSW/mI2ElrzaJfGEtTHBB7U1IFimwC1oIpUc1+wYsgw+2tCUV1t+cB/dsBbryq4Cbe1NQ397fJ2maCs7g==
   dependencies:
-    backbone "^1.1.2"
-    bluebird "^3.4.6"
-    charm "^1.0.0"
-    commander "^2.6.0"
-    compression "^1.7.4"
-    consolidate "^0.15.1"
-    execa "^1.0.0"
-    express "^4.10.7"
-    fireworm "^0.7.0"
-    glob "^7.0.4"
-    http-proxy "^1.13.1"
-    js-yaml "^3.2.5"
-    lodash.assignin "^4.1.0"
-    lodash.castarray "^4.4.0"
-    lodash.clonedeep "^4.4.1"
-    lodash.find "^4.5.1"
-    lodash.uniqby "^4.7.0"
-    mkdirp "^0.5.1"
-    mustache "^3.0.0"
-    node-notifier "^5.0.1"
-    npmlog "^4.0.0"
-    printf "^0.5.1"
-    rimraf "^2.4.4"
-    socket.io "^2.1.0"
-    spawn-args "^0.2.0"
-    styled_string "0.0.1"
-    tap-parser "^7.0.0"
-    tmp "0.0.33"
-    xmldom "^0.1.19"
+    testem "^3.0.0"
 
-testem@^3.2.0, testem@^3.6.0:
+testem@^3.0.0, testem@^3.2.0, testem@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-3.6.0.tgz#bf5c86944bafd035c18f41f520195cce5eef33a8"
   integrity sha512-sXwx2IlOadOhrKf0hsV1Yt/yuYhdfrtJ4dpp7T6pFN62GjMyKifjAv2SFm+4zYHee1JwxheO7JUL0+3iN0rlHw==
@@ -11723,11 +11505,6 @@ tmpl@1.0.x:
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity "sha1-F+bBH3PdTz10zaek/zI46a2b+JA= sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A=="
-
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
@@ -12265,7 +12042,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
 
-which@1.3.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
+which@1.3.1, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="
@@ -12371,16 +12148,6 @@ xmlbuilder@~9.0.1:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
   integrity "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="
 
-xmldom@^0.1.19:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.27.tgz#d501f97b3bdb403af8ef9ecc20573187aadac0e9"
-  integrity "sha1-1QH5ezvbQDr4757MIFcxh6rawOk= sha512-7WpJBYwyhvsddFJA51SOIU0Be9W44sbGGjc6Z3ly8Wx/Wl7nriMPZ5xf6Np9ASlJ6gACfXcTLukm4DtX372lFw=="
-
-xmlhttprequest-ssl@~1.5.4:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
-  integrity "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4= sha512-/bFPLUgJrfGUL10AIv4Y7/CUt6so9CLtB/oFxQSHseSDNNCdC6vwwKEqwLN6wNPBg9YWXAiMu8jkf6RPRS/75Q=="
-
 xtend@^4.0.0, xtend@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -12473,11 +12240,6 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity "sha1-AI4G2AlDIMNy28L47XagymyKxBk= sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"

From 352019f834d629e32baff05dfaeef6777decf335 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Feb 2022 14:40:19 +0000
Subject: [PATCH 0829/1405] Bump mocha from 7.1.2 to 9.2.0

Bumps [mocha](https://github.com/mochajs/mocha) from 7.1.2 to 9.2.0.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v7.1.2...v9.2.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 471 ++++++++++++++++++++-------------------------------
 2 files changed, 180 insertions(+), 293 deletions(-)

diff --git a/package.json b/package.json
index bb0454b95e8..74cde958636 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
-    "mocha": "^7.1.2",
+    "mocha": "^9.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
     "puppeteer": "^3.0.4",
diff --git a/yarn.lock b/yarn.lock
index a82e1489bf4..a42eb19ccf2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1948,6 +1948,11 @@
     "@typescript-eslint/types" "5.10.0"
     eslint-visitor-keys "^3.0.0"
 
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
 "@xmldom/xmldom@^0.7.1":
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.4.tgz#93b2f9486c88b6464e97f76c9ab49b0a548fbe57"
@@ -2033,10 +2038,10 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-ansi-colors@3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
-  integrity "sha1-V9NbhoboUeLMBMQD8cACA5dqGBM= sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
 ansi-escapes@^3.2.0:
   version "3.2.0"
@@ -2078,7 +2083,7 @@ ansi-styles@^2.0.1, ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="
 
-ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -2113,7 +2118,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.1.1:
+anymatch@^3.1.1, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -2121,14 +2126,6 @@ anymatch@^3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity "sha1-xV7PAhheJGklk5kxDBc84xIzsUI= sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 aproba@^1.0.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -3339,16 +3336,16 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity "sha1-AylVJ9WL081Kp1Nj81sujZe+L0I= sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA=="
-
 camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
+camelcase@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
 can-symlink@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/can-symlink/-/can-symlink-1.0.0.tgz#97b607d8a84bb6c6e228b902d864ecb594b9d219"
@@ -3474,20 +3471,20 @@ check-error@^1.0.1, check-error@^1.0.2:
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
   integrity "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA=="
 
-chokidar@3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
-  integrity "sha1-EsBxRmjFWAD2WeJi1JYql/r1VKY= sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="
+chokidar@3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
-    anymatch "~3.1.1"
+    anymatch "~3.1.2"
     braces "~3.0.2"
-    glob-parent "~5.1.0"
+    glob-parent "~5.1.2"
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.2.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    fsevents "~2.1.1"
+    fsevents "~2.3.2"
 
 chownr@^1.1.1:
   version "1.1.4"
@@ -3566,15 +3563,6 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= sha512-EJLbKSuvHTrVRynOXCYFTbQKZOFXWNe3/6DN1yrEH3TuuZT1x4dMQnCHnfCrBUUiGjO63enEIfaB17VaRl2d4A=="
 
-cliui@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
-  integrity "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U= sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="
-  dependencies:
-    string-width "^3.1.0"
-    strip-ansi "^5.2.0"
-    wrap-ansi "^5.1.0"
-
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -3925,14 +3913,7 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity "sha1-6D0X3hbYp++3cX7b5fsQE17uYps= sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="
-  dependencies:
-    ms "^2.1.1"
-
-debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@4.3.3, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
@@ -3959,6 +3940,11 @@ decamelize@^1.1.0, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
 
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -4081,12 +4067,7 @@ diff@1.0.8:
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.0.8.tgz#343276308ec991b7bc82267ed55bc1411f971666"
   integrity "sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY= sha512-1zEb73vemXFpUmfh3fsta4YHz3lwebxXvaWmPbFv9apujQBWDnkrPDLXLQs1gZo4RCWMDsT89r0Pf/z8/02TGA=="
 
-diff@3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity "sha1-gAwN0eCov7yVg1wgKtIg/jF+WhI= sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
-
-diff@^5.0.0:
+diff@5.0.0, diff@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
@@ -4506,11 +4487,6 @@ ember-source-channel-url@^3.0.0:
   dependencies:
     node-fetch "^2.6.0"
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY= sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -4640,27 +4616,6 @@ es-abstract@^1.19.0, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
-es-abstract@^1.5.1:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
-  integrity "sha1-rIYUX91QmdjdSVWMy6Lq+biOJOk= sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg=="
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-keys "^1.0.12"
-
-es-to-primitive@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
-  integrity "sha1-7fckeAM0VujdqO8J4ArZZQcH83c= sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="
-  dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
-
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -4740,16 +4695,16 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escape-string-regexp@^4.0.0:
+escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
 eslint-config-prettier@^8.3.0:
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
@@ -5400,12 +5355,13 @@ find-index@^1.1.0:
   resolved "https://registry.yarnpkg.com/find-index/-/find-index-1.1.0.tgz#53007c79cd30040d6816d79458e8837d5c5705ef"
   integrity sha1-UwB8ec0wBA1oFteUWOiDfVxXBe8=
 
-find-up@3.0.0, find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+find-up@5.0.0, find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
-    locate-path "^3.0.0"
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
 
 find-up@^2.1.0:
   version "2.1.0"
@@ -5414,6 +5370,13 @@ find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
@@ -5422,14 +5385,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 find-yarn-workspace-root@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz#40eb8e6e7c2502ddfaa2577c176f221422f860db"
@@ -5514,12 +5469,10 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flat@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
-  integrity "sha1-CQvsiwXjnLowl0fx1YjwTbr5jbI= sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="
-  dependencies:
-    is-buffer "~2.0.3"
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 flatted@^3.1.0:
   version "3.2.2"
@@ -5712,10 +5665,10 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
-  integrity "sha1-TAofs0vGjlQ7S4Kp7Dkr+9qECAU= sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
@@ -5746,7 +5699,7 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34= sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
@@ -5838,7 +5791,7 @@ github@^0.2.3:
   dependencies:
     mime "^1.2.11"
 
-glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.0:
+glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -5852,10 +5805,10 @@ glob-parent@^6.0.1:
   dependencies:
     is-glob "^4.0.3"
 
-glob@7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE= sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="
+glob@7.2.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5875,18 +5828,6 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -6109,7 +6050,7 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.1, has@^1.0.3:
+has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="
@@ -6488,11 +6429,6 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-buffer@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
-  integrity "sha1-Ts8/z3ScvR5HJonhCaxmJhol5yU= sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
-
 is-builtin-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
@@ -6658,7 +6594,7 @@ is-odd@^2.0.0:
   dependencies:
     is-number "^4.0.0"
 
-is-plain-obj@2.1.0:
+is-plain-obj@2.1.0, is-plain-obj@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
@@ -6687,13 +6623,6 @@ is-reference@^1.1.0:
   dependencies:
     "@types/estree" "0.0.38"
 
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  integrity "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= sha512-WQgPrEkb1mPCWLSlLFuN1VziADSixANugwSkJfPRR73FNWIQQN+tR/t1zWfyES/Y9oag/XBtVsahFdfBku3Kyw=="
-  dependencies:
-    has "^1.0.1"
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -6765,6 +6694,11 @@ is-typedarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
 is-weakref@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
@@ -6850,13 +6784,12 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.13.1:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity "sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc= sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="
+js-yaml@4.1.0, js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
+    argparse "^2.0.1"
 
 js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.1"
@@ -6866,13 +6799,6 @@ js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -7530,12 +7456,13 @@ lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4"
-  integrity "sha1-86CFFqXeqJMzan3uFNGKHP2rd8Q= sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="
+log-symbols@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
-    chalk "^2.4.2"
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
 
 log-symbols@^2.2.0:
   version "2.2.0"
@@ -7937,7 +7864,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
   integrity "sha1-VMRBzkyWzXeQ4QtBqHqlEGjsqys= sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
 
-mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -7954,35 +7881,35 @@ mktemp@~0.4.0:
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
   integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
-mocha@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6"
-  integrity "sha1-jkDRmKz5GlKs4SLNdZnJq4V7KeY= sha512-o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="
+mocha@^9.2.0:
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.0.tgz#2bfba73d46e392901f877ab9a47b7c9c5d0275cc"
+  integrity sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==
   dependencies:
-    ansi-colors "3.2.3"
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
     browser-stdout "1.3.1"
-    chokidar "3.3.0"
-    debug "3.2.6"
-    diff "3.5.0"
-    escape-string-regexp "1.0.5"
-    find-up "3.0.0"
-    glob "7.1.3"
+    chokidar "3.5.3"
+    debug "4.3.3"
+    diff "5.0.0"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.2.0"
     growl "1.10.5"
     he "1.2.0"
-    js-yaml "3.13.1"
-    log-symbols "3.0.0"
+    js-yaml "4.1.0"
+    log-symbols "4.1.0"
     minimatch "3.0.4"
-    mkdirp "0.5.5"
-    ms "2.1.1"
-    node-environment-flags "1.0.6"
-    object.assign "4.1.0"
-    strip-json-comments "2.0.1"
-    supports-color "6.0.0"
-    which "1.3.1"
-    wide-align "1.1.3"
-    yargs "13.3.2"
-    yargs-parser "13.1.2"
-    yargs-unparser "1.6.0"
+    ms "2.1.3"
+    nanoid "3.2.0"
+    serialize-javascript "6.0.0"
+    strip-json-comments "3.1.1"
+    supports-color "8.1.1"
+    which "2.0.2"
+    workerpool "6.2.0"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
+    yargs-unparser "2.0.0"
 
 morgan@^1.10.0:
   version "1.10.0"
@@ -8015,7 +7942,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8035,7 +7962,7 @@ nanocolors@^0.1.5:
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
   integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
-nanoid@^3.1.25:
+nanoid@3.2.0, nanoid@^3.1.25:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
   integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
@@ -8078,14 +8005,6 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y= sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
 
-node-environment-flags@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
-  integrity "sha1-owrBNiH299Z0JgpU3t4EjDmCwIg= sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="
-  dependencies:
-    object.getownpropertydescriptors "^2.0.3"
-    semver "^5.7.0"
-
 node-fetch@^2.6.0:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -8283,7 +8202,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@4.1.0, object.assign@^4.1.0:
+object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -8303,14 +8222,6 @@ object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
-  integrity "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY= sha512-NwrpYtu1CSNWdNgcEvLmHOHjhMeglj22YJpg/ezASfIFYqNK4F94iUxKRPnRNbOuOMoQb5JS+6Ebi16xtYZbqQ=="
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.5.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -8951,6 +8862,13 @@ qunit@^2.14.0:
     node-watch "0.7.1"
     tiny-glob "0.2.8"
 
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -9044,12 +8962,12 @@ readable-stream@~1.0.2:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readdirp@~3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
-  integrity "sha1-wwwzNSsSyW37S4lUIaSf1alZODk= sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
-    picomatch "^2.0.4"
+    picomatch "^2.2.1"
 
 recast@^0.18.1:
   version "0.18.2"
@@ -9210,11 +9128,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs= sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
-
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -9458,7 +9371,7 @@ safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@~5.2.0:
+safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
@@ -9538,7 +9451,7 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -9579,6 +9492,13 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
+serialize-javascript@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
 serve-static@1.14.1, serve-static@^1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
@@ -9589,7 +9509,7 @@ serve-static@1.14.1, serve-static@^1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity "sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
@@ -9961,15 +9881,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity "sha1-InZ74htirxCBV0MG9prFG2IgOWE= sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string-width@^4.1.0, string-width@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
@@ -10071,7 +9982,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.0.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4= sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="
@@ -10107,16 +10018,16 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@2.0.1, strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
-
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity "sha1-MfEoGzgyYwQ0gxwxDAHMzajL4AY= sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
 
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+  integrity "sha1-PFMZQukIwml8DsNEhYwobHygpgo= sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="
+
 style-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c"
@@ -10137,12 +10048,12 @@ sum-up@^1.0.1:
   dependencies:
     chalk "^1.0.0"
 
-supports-color@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
-  integrity "sha1-ds/nQs8fQbubHCmtAwaMBbTA5Ao= sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="
+supports-color@8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
-    has-flag "^3.0.0"
+    has-flag "^4.0.0"
 
 supports-color@^1.3.0:
   version "1.3.1"
@@ -10908,26 +10819,21 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
+which@2.0.2, which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
+  dependencies:
+    isexe "^2.0.0"
 
-which@1.3.1, which@^1.2.14, which@^1.2.9:
+which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="
   dependencies:
     isexe "^2.0.0"
 
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@1.1.3, wide-align@^1.1.0:
+wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   integrity "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc= sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="
@@ -10949,6 +10855,11 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
+workerpool@6.2.0, workerpool@^6.0.0, workerpool@^6.1.4:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
+  integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
+
 workerpool@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-3.1.2.tgz#b34e79243647decb174b7481ab5b351dc565c426"
@@ -10958,20 +10869,6 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
-workerpool@^6.0.0, workerpool@^6.1.4:
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
-  integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
-
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk= sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -11024,11 +10921,6 @@ xtend@^4.0.0, xtend@~4.0.0:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity "sha1-pcbVMr5lbiPbgg77lDofBJmNY68= sha512-iTwvhNBRetXWe81+VcIw5YeadVSWyze7uA7nVnpP13ulrpnJ3UfQm5ApGnrkmxDJFdrblRdZs0EvaTCIfei5oQ=="
 
-y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
-
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
@@ -11052,43 +10944,38 @@ yam@^1.0.0:
     fs-extra "^4.0.2"
     lodash.merge "^4.6.0"
 
-yargs-parser@13.1.2, yargs-parser@^13.1.2:
-  version "13.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
-  integrity "sha1-Ew8JcC667vJlDVTObj5XBvek+zg= sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
+yargs-parser@20.2.4:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
 yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-unparser@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
-  integrity "sha1-7yXCx2n/a9CeSw+dfGBfsnhG6p8= sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
   dependencies:
-    flat "^4.1.0"
-    lodash "^4.17.15"
-    yargs "^13.3.0"
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
 
-yargs@13.3.2, yargs@^13.3.0:
-  version "13.3.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
-  integrity "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0= sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="
+yargs@16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.2"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
 
 yargs@^17.1.1:
   version "17.2.1"

From 18900ec7086600dba01a56809c5b24e991189c5c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 2 Feb 2022 10:57:41 -0800
Subject: [PATCH 0830/1405] Upgrade broccoli-typescript-compiler

Allows our specified version of TypeScript to be used for compilation.
---
 package.json                                  |   2 +-
 .../-internals/container/lib/container.ts     |   5 +-
 yarn.lock                                     | 834 ++----------------
 3 files changed, 58 insertions(+), 783 deletions(-)

diff --git a/package.json b/package.json
index 5a5857d6d34..8f0c3474bb8 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,7 @@
     "broccoli-rollup": "^2.1.1",
     "broccoli-source": "^3.0.1",
     "broccoli-string-replace": "^0.1.2",
-    "broccoli-typescript-compiler": "^7.0.0",
+    "broccoli-typescript-compiler": "^8.0.0",
     "broccoli-uglify-sourcemap": "^4.0.0",
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 0a34b3bbfe4..94d8d9b98e1 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -4,10 +4,6 @@ import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import Registry, { DebugRegistry } from './registry';
 
-declare global {
-  export function gc(): void;
-}
-
 interface LeakTracking {
   hasContainers(): boolean;
   reset(): void;
@@ -31,6 +27,7 @@ if (DEBUG) {
         containers = new WeakSet<Container>();
         return {
           hasContainers() {
+            // @ts-expect-error We just checked if it is definied
             gc();
             return GetWeakSetValues(containers).length > 0;
           },
diff --git a/yarn.lock b/yarn.lock
index 1628be12fa1..de6881d5dfa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,13 +9,6 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
-  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
-  dependencies:
-    "@babel/highlight" "^7.14.5"
-
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
@@ -42,24 +35,6 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
-  dependencies:
-    "@babel/types" "^7.12.5"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.4.tgz#85acb159a267ca6324f9793986991ee2022a05b0"
-  integrity sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==
-  dependencies:
-    "@babel/types" "^7.15.4"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
 "@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
@@ -69,23 +44,6 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
-  integrity sha512-onl4Oy46oGCzymOXtKMQpI7VXtCbTSHK1kqBydZ6AmzuNcacEVqGk9tZtAS+48IA9IstZcDCgIg8hQKnb7suRw==
-  dependencies:
-    "@babel/types" "^7.9.0"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
-  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -111,30 +69,7 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
-  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-
-"@babel/helper-create-class-features-plugin@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
-  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-member-expression-to-functions" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
+"@babel/helper-create-class-features-plugin@^7.15.4", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
   integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
@@ -197,24 +132,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-function-name@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
-  integrity sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.15.4"
-    "@babel/template" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-function-name@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
@@ -224,29 +141,6 @@
     "@babel/template" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-get-function-arity@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
-  integrity sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-get-function-arity@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
@@ -254,20 +148,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-hoist-variables@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
-  integrity sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-hoist-variables@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
@@ -275,20 +155,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
-  integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-member-expression-to-functions@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
-  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-member-expression-to-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
@@ -296,7 +162,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.7":
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
   integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
@@ -317,20 +183,6 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
-  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-optimise-call-expression@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
-  integrity sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
@@ -352,26 +204,6 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
-  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
-
-"@babel/helper-replace-supers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
-  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-replace-supers@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
@@ -397,20 +229,6 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
-  dependencies:
-    "@babel/types" "^7.11.0"
-
-"@babel/helper-split-export-declaration@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
-  integrity sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
 "@babel/helper-split-export-declaration@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
@@ -418,18 +236,6 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-validator-identifier@^7.14.5":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
-  integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
-
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
@@ -459,15 +265,6 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/highlight@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
-  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.5"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
@@ -477,31 +274,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.4", "@babel/parser@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
-  integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
-
-"@babel/parser@^7.15.4":
-  version "7.15.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.7.tgz#0c3ed4a2eb07b165dfa85b3cc45c727334c4edae"
-  integrity sha512-rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g==
-
-"@babel/parser@^7.16.10":
+"@babel/parser@^7.16.10", "@babel/parser@^7.16.7", "@babel/parser@^7.4.5":
   version "7.16.12"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
-  integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
-
-"@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
-  integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -527,7 +304,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.10.4", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -544,15 +321,6 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.10.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz#59271439fed4145456c41067450543aee332d15f"
-  integrity sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-decorators" "^7.12.1"
-
 "@babel/plugin-proposal-decorators@^7.13.5":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
@@ -685,13 +453,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
-  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-decorators@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
@@ -776,13 +537,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz#460ba9d77077653803c3dd2e673f76d66b4029e5"
-  integrity sha512-UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-typescript@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
@@ -901,7 +655,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.10.5", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
+"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
   integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
@@ -989,16 +743,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-runtime@^7.12.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz#04b792057eb460389ff6a4198e377614ea1e7ba5"
-  integrity sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    resolve "^1.8.1"
-    semver "^5.5.1"
-
 "@babel/plugin-transform-runtime@^7.13.9":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
@@ -1047,15 +791,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typescript@^7.12.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz#d92cc0af504d510e26a754a7dbc2e5c8cd9c7ab4"
-  integrity sha512-VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-typescript" "^7.12.1"
-
 "@babel/plugin-transform-typescript@^7.13.0":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
@@ -1186,45 +921,13 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.12.0":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
-  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.14.0":
+"@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
   integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.8.4":
-  version "7.9.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f"
-  integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/template@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
-  integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/parser" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
 "@babel/template@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
@@ -1234,62 +937,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/template@^7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
-  integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-hoist-variables" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-    "@babel/parser" "^7.15.4"
-    "@babel/types" "^7.15.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
-  integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.5"
-    "@babel/types" "^7.12.5"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.16.7":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.8.tgz#bab2f2b09a5fe8a8d9cad22cbfe3ba1d126fef9c"
-  integrity sha512-xe+H7JlvKsDQwXRsBhSnq1/+9c+LlQcCK3Tn/l5sbx02HYns/cn7ibp9+RV1sIUqu7hKg91NWsgHurO9dowITQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.8"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.16.8":
+"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
   integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -1305,22 +953,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.4.5":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
-  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.15.4", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
   integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
@@ -1673,11 +1306,6 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.0.tgz#23509ebc1fa32f1b4d50d6a66c4032d5b8eaabdc"
   integrity sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==
 
-"@types/color-name@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
-  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
-
 "@types/component-emitter@^1.2.10":
   version "1.2.10"
   resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
@@ -1705,11 +1333,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
   integrity "sha1-wb5AqpM3I8YIggqZo3OhbSFaHKI= sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA=="
 
-"@types/events@*":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
-  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-
 "@types/express-serve-static-core@^4.17.18":
   version "4.17.28"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
@@ -1743,16 +1366,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/glob@*":
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
-  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
-  dependencies:
-    "@types/events" "*"
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
-"@types/glob@^7.1.1":
+"@types/glob@*", "@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
   integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
@@ -1785,12 +1399,7 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/node@*":
-  version "11.13.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.2.tgz#dc85dde46aa8740bb4aed54b8104250f8f849503"
-  integrity sha512-HOtU5KqROKT7qX/itKHuTtt5fV0iXbheQvrgbLNXFJQBY/eh+VS5vmmTAVlo3qIGMsypm0G4N1t2AXjy1ZicaQ==
-
-"@types/node@>=10.0.0":
+"@types/node@*", "@types/node@>=10.0.0":
   version "16.7.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc"
   integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==
@@ -1827,15 +1436,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/rimraf@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.4.tgz#403887b0b53c6100a6c35d2ab24f6ccc042fec46"
-  integrity sha512-8gBudvllD2A/c0CcEX/BivIDorHFt5UI5m46TsNj8DjWCCTTZT74kEe4g+QsY7P/B9WdO98d82zZgXO/RQzu2Q==
-  dependencies:
-    "@types/glob" "*"
-    "@types/node" "*"
-
-"@types/rimraf@^2.0.3":
+"@types/rimraf@^2.0.2", "@types/rimraf@^2.0.3":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.5.tgz#368fb04d59630b727fc05a74d2ca557f64a8ef98"
   integrity sha512-YyP+VfeaqAyFmXoTh3HChxOQMyjByRMsHU7kc5KOJkSlXudhMhQIALbYV7rHh/l8d2lX3VUQzprrcAgWdRuU8g==
@@ -1988,11 +1589,6 @@ acorn@^5.0.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
 
-acorn@^8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.6.0.tgz#e3692ba0eb1a0c83eaa4f37f5fa7368dd7142895"
-  integrity sha512-U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw==
-
 acorn@^8.7.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
@@ -2025,7 +1621,7 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
+amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
   integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
@@ -2090,21 +1686,13 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0:
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^4.1.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.0.tgz#5681f0dcf7ae5880a7841d8831c4724ed9cc0172"
-  integrity sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==
-  dependencies:
-    "@types/color-name" "^1.1.1"
-    color-convert "^2.0.1"
-
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -2269,14 +1857,7 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
     async "^2.4.1"
     debug "^2.6.8"
 
-async@^2.4.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
-  integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
-  dependencies:
-    lodash "^4.17.10"
-
-async@^2.6.2:
+async@^2.4.1, async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -2361,7 +1942,7 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-debug-macros@^0.3.3, babel-plugin-debug-macros@^0.3.4:
+babel-plugin-debug-macros@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
   integrity sha512-wfel/vb3pXfwIDZUrkoDrn5FHmlWI96PCJ3UCDv2a86poJ3EQrnArNW5KfHSVJ9IOgxHbo748cQt7sDU+0KCEw==
@@ -2382,13 +1963,6 @@ babel-plugin-ember-data-packages-polyfill@^0.1.2:
   dependencies:
     "@ember-data/rfc395-data" "^0.0.4"
 
-babel-plugin-ember-modules-api-polyfill@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.2.0.tgz#302cb58a3c0fa33d93ab5115f1e91d76c6ec766b"
-  integrity sha512-k5gyC1kUDyZDcdD8LMGTI7KA+cHdKainuWpmc7d5yv42WgZFO75njPi3hZchEGsFFXtSqm9jiahgvLBUV8E8mA==
-  dependencies:
-    ember-rfc176-data "^0.3.16"
-
 babel-plugin-ember-modules-api-polyfill@^3.5.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-3.5.0.tgz#27b6087fac75661f779f32e60f94b14d0e9f6965"
@@ -2415,7 +1989,7 @@ babel-plugin-htmlbars-inline-precompile@^5.2.1:
     parse-static-imports "^1.1.0"
     string.prototype.matchall "^4.0.4"
 
-babel-plugin-module-resolver@^3.1.1, babel-plugin-module-resolver@^3.2.0:
+babel-plugin-module-resolver@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz#ddfa5e301e3b9aa12d852a9979f18b37881ff5a7"
   integrity sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==
@@ -3065,11 +2639,6 @@ broccoli-slow-trees@^3.0.1, broccoli-slow-trees@^3.1.0:
   dependencies:
     heimdalljs "^0.2.1"
 
-broccoli-source@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-1.1.0.tgz#54f0e82c8b73f46580cbbc4f578f0b32fca8f809"
-  integrity sha1-VPDoLItz9GWAy7xPV48LMvyo+Ak=
-
 broccoli-source@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/broccoli-source/-/broccoli-source-2.1.2.tgz#e9ae834f143b607e9ec114ade66731500c38b90b"
@@ -3110,10 +2679,10 @@ broccoli-string-replace@^0.1.2:
     broccoli-persistent-filter "^1.1.5"
     minimatch "^3.0.3"
 
-broccoli-typescript-compiler@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-7.0.0.tgz#a7792ceb8db2ddb3d57e91e429750b4ce9568626"
-  integrity "sha1-p3ks642y3bPVfpHkKXULTOlWhiY= sha512-9BSZc9tVdm3SEbR7uyMQ6XqYMQWkdCvp2dPlZYnENEqbUToCIVOJuOZ24nrenR6N4eTZPnY3R99DkgyoxmRp5A=="
+broccoli-typescript-compiler@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/broccoli-typescript-compiler/-/broccoli-typescript-compiler-8.0.0.tgz#bc92c41ae9ed19b0f25431026f49a6b6ce23a4e6"
+  integrity sha512-I6hs7tGYte/mU3OubPtcgqUgHSjqU5KzcsrKnXFqfSrpoaFkjHhhVZE5V2CdvfKOY1k6zJlldKL01fa+sjCG7A==
   dependencies:
     broccoli-funnel "^3.0.3"
     broccoli-merge-trees "^4.2.0"
@@ -3121,7 +2690,6 @@ broccoli-typescript-compiler@^7.0.0:
     fs-tree-diff "^2.0.1"
     heimdalljs "0.3.3"
     md5-hex "^3.0.1"
-    typescript "~4.0.3"
     walk-sync "^2.1.0"
 
 broccoli-uglify-sourcemap@^4.0.0:
@@ -3210,13 +2778,6 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-bser@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
-  integrity "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk= sha512-FozP+z0rEpi3AywbeT1QnOrGFJDbC0986aFDR2NlNLF+/WEYdv/7/qb1FVtla+KBWswkQBOA7okWd+85ThWlCQ=="
-  dependencies:
-    node-int64 "^0.4.0"
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -3244,11 +2805,6 @@ buffer@^5.2.1, buffer@^5.5.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-builtin-modules@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ=="
-
 builtin-modules@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
@@ -3317,12 +2873,7 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-callsites@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
-  integrity "sha1-+361abcq16RYEvk/2UMKPkELPdM= sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw=="
-
-callsites@^3.1.0:
+callsites@^3.0.0, callsites@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
@@ -3672,12 +3223,7 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-component-emitter@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= sha512-jPatnhd33viNplKjqXKRkGU345p263OIWzDL2wH3LGIGp5Kojo+uXizHmOADRvhGFFTnJqX3jBAKP6vvmSDKcA=="
-
-component-emitter@~1.3.0:
+component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity "sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A= sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
@@ -3993,7 +3539,7 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
@@ -4168,7 +3714,7 @@ ember-cli-babel-plugin-helpers@^1.1.1:
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
   version "7.26.6"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -4201,38 +3747,6 @@ ember-cli-babel@^7.0.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
-ember-cli-babel@^7.23.0:
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.23.0.tgz#ec580aa2c115d0810e454dd5c2fffce238284b92"
-  integrity sha512-ix58DlRDAbGITtdJoRUPcAoQwKLYr/x/kIXjU9u1ATyhmuUjqb+0FDXghOWbkNihGiNOqBBR49+LBgK9AeBcNw==
-  dependencies:
-    "@babel/core" "^7.12.0"
-    "@babel/helper-compilation-targets" "^7.12.0"
-    "@babel/plugin-proposal-class-properties" "^7.10.4"
-    "@babel/plugin-proposal-decorators" "^7.10.5"
-    "@babel/plugin-transform-modules-amd" "^7.10.5"
-    "@babel/plugin-transform-runtime" "^7.12.0"
-    "@babel/plugin-transform-typescript" "^7.12.0"
-    "@babel/polyfill" "^7.11.5"
-    "@babel/preset-env" "^7.12.0"
-    "@babel/runtime" "^7.12.0"
-    amd-name-resolver "^1.2.1"
-    babel-plugin-debug-macros "^0.3.3"
-    babel-plugin-ember-data-packages-polyfill "^0.1.2"
-    babel-plugin-ember-modules-api-polyfill "^3.2.0"
-    babel-plugin-module-resolver "^3.1.1"
-    broccoli-babel-transpiler "^7.8.0"
-    broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.1"
-    broccoli-source "^1.1.0"
-    clone "^2.1.2"
-    ember-cli-babel-plugin-helpers "^1.1.1"
-    ember-cli-version-checker "^4.1.0"
-    ensure-posix-path "^1.0.2"
-    fixturify-project "^1.10.0"
-    rimraf "^3.0.1"
-    semver "^5.5.0"
-
 ember-cli-blueprint-test-helpers@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/ember-cli-blueprint-test-helpers/-/ember-cli-blueprint-test-helpers-0.19.2.tgz#9e563cd81ab39931253ced0982c5d02475895401"
@@ -4461,11 +3975,6 @@ ember-publisher@0.0.7:
   dependencies:
     aws-sdk "^2.0.9"
 
-ember-rfc176-data@^0.3.16:
-  version "0.3.16"
-  resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.16.tgz#2ace0ac9cf9016d493a74a1d931643a308679803"
-  integrity sha512-IYAzffS90r2ybAcx8c2qprYfkxa70G+/UPkxMN1hw55DU5S2aLOX6v3umKDZItoRhrvZMCnzwsdfKSrKdC9Wbg==
-
 ember-rfc176-data@^0.3.17:
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
@@ -4502,14 +4011,7 @@ encodeurl@~1.0.1, encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
 
-end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM= sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="
-  dependencies:
-    once "^1.4.0"
-
-end-of-stream@^1.4.1:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity "sha1-WuZKX0UFe682JuwU2gyl5LJDHrA= sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="
@@ -4566,31 +4068,7 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.18.2:
-  version "1.18.6"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456"
-  integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.4"
-    is-string "^1.0.7"
-    object-inspect "^1.11.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
-
-es-abstract@^1.19.0, es-abstract@^1.19.1:
+es-abstract@^1.18.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
   version "1.19.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
   integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
@@ -4835,12 +4313,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz#eee4acea891814cda67a7d8812d9647dd0179af2"
-  integrity sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==
-
-eslint-visitor-keys@^3.2.0:
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
   integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
@@ -4891,16 +4364,7 @@ esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
   integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
 
-espree@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.2.0.tgz#c50814e01611c2d0f8bd4daa83c369eabba80dbc"
-  integrity sha512-oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg==
-  dependencies:
-    acorn "^8.6.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^3.1.0"
-
-espree@^9.3.0:
+espree@^9.2.0, espree@^9.3.0:
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"
   integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==
@@ -4994,12 +4458,7 @@ events@1.1.1:
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
   integrity "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw=="
 
-exec-sh@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
-  integrity "sha1-ZzjeLrfI5nHQNmrqCw24xvfXORs= sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg=="
-
-exec-sh@^0.3.4:
+exec-sh@^0.3.2, exec-sh@^0.3.4:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc"
   integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==
@@ -5182,7 +4641,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
 
-fast-glob@^3.0.3:
+fast-glob@^3.0.3, fast-glob@^3.1.1:
   version "3.2.10"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"
   integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==
@@ -5193,18 +4652,6 @@ fast-glob@^3.0.3:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.1.1:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
-  integrity "sha1-0grvv5lXk4Pn88xmUpFYybmFVNM= sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
-    merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
-
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -5250,14 +4697,7 @@ faye-websocket@^0.11.3:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fb-watchman@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
-  integrity "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= sha512-+6dk4acfiWsbMc8pH0boQDeQprOM4mO/kS4IAvZVJZk4B6CZYLg4DkTGbL82vhglUXDtkJPnLfO0WXv3uxGNfA=="
-  dependencies:
-    bser "^2.0.0"
-
-fb-watchman@^2.0.1:
+fb-watchman@^2.0.0, fb-watchman@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
   integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
@@ -5739,20 +5179,13 @@ get-stream@^4.0.0, get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.0.0:
+get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"
-  integrity "sha1-ASA83JJZf5uQkGfD5lbMH008Tck= sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="
-  dependencies:
-    pump "^3.0.0"
-
 get-stream@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -5800,7 +5233,7 @@ github@^0.2.3:
   dependencies:
     mime "^1.2.11"
 
-glob-parent@^5.1.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
+glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -6001,17 +5434,7 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
-  integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
-
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg= sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
-
-has-symbols@^1.0.2:
+has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
@@ -6270,17 +5693,7 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw= sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
 
-ignore@^5.1.1, ignore@^5.1.4:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity "sha1-8VCotQo0KJsz4i9YiavU2AFvDlc= sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
-
-ignore@^5.1.8:
-  version "5.1.9"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb"
-  integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ==
-
-ignore@^5.2.0:
+ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -6438,19 +5851,7 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-builtin-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
-  integrity "sha1-VAVy0096wxGfj3bDDLwbHgN6/74= sha512-C2wz7Juo5pUZTFQVer9c+9b4qw3I5T/CHQxQyhVu7BJel6C22FmsLIWsdseYyOw6xz9Pqy9eJWSkQ7+3iN1HVw=="
-  dependencies:
-    builtin-modules "^1.0.0"
-
-is-callable@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
-  integrity "sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU= sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
-
-is-callable@^1.2.4:
+is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
@@ -6665,26 +6066,14 @@ is-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
   integrity "sha1-venDJoDW+uBBKdasnZIc54FfeOM= sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
 
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity "sha1-QEk+0ZjvP/R3uMf5L2ROyCpc06Y= sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
-
-is-string@^1.0.7:
+is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-symbol@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
-  integrity "sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg= sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw=="
-  dependencies:
-    has-symbols "^1.0.0"
-
-is-symbol@^1.0.3:
+is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
@@ -6933,12 +6322,7 @@ kind-of@^5.0.0:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity "sha1-cpyR4thXt6QZofmqZWhcTDP1hF0= sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
 
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-  integrity "sha1-ARRrNqYhjmTljzqNZt5df8b20FE= sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
-
-kind-of@^6.0.3:
+kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
@@ -7460,7 +6844,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7487,12 +6871,7 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0"
 
-lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
-  integrity "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY= sha512-RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="
-
-lowercase-keys@^1.0.1:
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
@@ -7516,14 +6895,7 @@ magic-string@^0.24.0:
   dependencies:
     sourcemap-codec "^1.4.1"
 
-magic-string@^0.25.2:
-  version "0.25.2"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.2.tgz#139c3a729515ec55e96e69e82a11fe890a293ad9"
-  integrity "sha1-E5w6cpUV7FXpbmnoKhH+iQopOtk= sha512-iLs9mPjh9IuTtRsqqhNGYcZXGei0Nh/A4xirrsqW7c+QhKVFL2vm7U09ru6cHRD22azaP/wMDgI+HCqbETMTtg=="
-  dependencies:
-    sourcemap-codec "^1.4.4"
-
-magic-string@^0.25.7:
+magic-string@^0.25.2, magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
   integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
@@ -7729,15 +7101,7 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity "sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk= sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
-
-micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
   integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -7745,34 +7109,12 @@ micromatch@^4.0.4:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
-mime-db@1.44.0:
-  version "1.44.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
-  integrity "sha1-+hHF6wrKEzS0Izy01S8QxaYnL5I= sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
-
-mime-db@1.45.0:
-  version "1.45.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
-  integrity "sha1-zO7aIczXw6dF66LezVXUtz54eeo= sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="
-
-mime-db@1.51.0:
+mime-db@1.51.0, "mime-db@>= 1.40.0 < 2":
   version "1.51.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-"mime-db@>= 1.40.0 < 2":
-  version "1.40.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
-  integrity "sha1-plBX6ZjbCQ9zKmj2wnbTh9QSbDI= sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
-
-mime-types@^2.1.18:
-  version "2.1.27"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
-  integrity "sha1-R5SfmOJ56lMRn1ci4PNOUpvsAJ8= sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="
-  dependencies:
-    mime-db "1.44.0"
-
-mime-types@^2.1.26:
+mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.24:
   version "2.1.34"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
   integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -7784,13 +7126,6 @@ mime-types@~1.0.1:
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce"
   integrity "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4= sha512-echfutj/t5SoTL4WZpqjA1DCud1XO0WQF3/GJ48YBmc4ZMhCK77QA6Z/w6VTQERLKuJ4drze3kw2TUT8xZXVNw=="
 
-mime-types@~2.1.24:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity "sha1-EWDEdX6rLFNjiI4AUnPs950qDs0= sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="
-  dependencies:
-    mime-db "1.45.0"
-
 mime@1.6.0, mime@^1.2.11:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -8065,17 +7400,7 @@ nopt@^3.0.6:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
-  integrity "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8= sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw=="
-  dependencies:
-    hosted-git-info "^2.1.4"
-    is-builtin-module "^1.0.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-package-data@^2.5.0:
+normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
@@ -8194,12 +7519,7 @@ object-inspect@^1.11.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
-object-keys@^1.0.11, object-keys@^1.0.12:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
-  integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==
-
-object-keys@^1.1.1:
+object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity "sha1-HEfyct8nfzsdrwYWd9nILiMixg4= sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
@@ -8211,17 +7531,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-object.assign@^4.1.2:
+object.assign@^4.1.0, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -8342,14 +7652,7 @@ p-limit@^1.1.0:
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
   integrity sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=
 
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^2.2.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -8486,12 +7789,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="
 
-path-key@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
-  integrity "sha1-maENhwqAO91e5vBHDljfzS+aVNM= sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg=="
-
-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity "sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
@@ -8557,17 +7855,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity "sha1-IbrIiLbthgH4Mc54FuM1vHefCko= sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA=="
-
-picomatch@^2.0.5, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity "sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
-
-picomatch@^2.2.3:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -9049,12 +8337,7 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity "sha1-IG0K0KVkjP+9uK5GQ489xRyfeOI= sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
-
-regexpp@^3.2.0:
+regexpp@^3.0.0, regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -9217,7 +8500,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.4.0, resolve@^1.5.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -9375,12 +8658,12 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
@@ -9460,7 +8743,7 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0, semver@^5.5.1:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
@@ -10488,11 +9771,6 @@ typescript@^4.5.4:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
   integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
 
-typescript@~4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.3.tgz#153bbd468ef07725c1df9c77e8b453f8d36abba5"
-  integrity "sha1-FTu9Ro7wdyXB35x36LRT+NNqu6U= sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="
-
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"

From 5ede88fc77bfde30436afd0e27d93c5368f12b48 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 3 Feb 2022 10:48:24 -0800
Subject: [PATCH 0831/1405] Fix computed types

---
 packages/@ember/-internals/metal/index.ts     |  2 +-
 packages/@ember/-internals/metal/lib/alias.ts | 10 ++++----
 .../@ember/-internals/metal/lib/computed.ts   | 12 +++++-----
 .../@ember/-internals/metal/lib/decorator.ts  | 23 ++++++++++++-------
 .../-internals/metal/lib/injected_property.ts | 13 ++++++++---
 .../@ember/-internals/metal/lib/properties.ts | 11 ++++++---
 .../@ember/-internals/metal/lib/tracked.ts    |  9 +++++---
 packages/@ember/object/compat.ts              |  6 +++--
 .../object/type-tests/computed/alias.test.ts  |  3 ++-
 9 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 29417e57e85..c5f78047033 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -28,7 +28,7 @@ export {
 } from './lib/property_events';
 export { defineProperty } from './lib/properties';
 export {
-  Decorator,
+  ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
   isElementDescriptor,
   nativeDescDecorator,
diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index c54e7b3173c..5476a074d79 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -15,7 +15,7 @@ import {
 import { CHAIN_PASS_THROUGH, finishLazyChains, getChainTagsForKey } from './chain-tags';
 import {
   ComputedDescriptor,
-  Decorator,
+  ExtendedMethodDecorator,
   descriptorForDecorator,
   isElementDescriptor,
   makeComputedDecorator,
@@ -24,7 +24,7 @@ import { defineProperty } from './properties';
 import { get } from './property_get';
 import { set } from './property_set';
 
-export type AliasDecorator = Decorator & PropertyDecorator & AliasDecoratorImpl;
+export type AliasDecorator = PropertyDecorator & AliasDecoratorImpl;
 
 export default function alias(altKey: string): AliasDecorator {
   assert(
@@ -37,17 +37,17 @@ export default function alias(altKey: string): AliasDecorator {
 
 // TODO: This class can be svelted once `meta` has been deprecated
 class AliasDecoratorImpl extends Function {
-  readOnly(this: Decorator) {
+  readOnly(this: ExtendedMethodDecorator) {
     (descriptorForDecorator(this) as AliasedProperty).readOnly();
     return this;
   }
 
-  oneWay(this: Decorator) {
+  oneWay(this: ExtendedMethodDecorator) {
     (descriptorForDecorator(this) as AliasedProperty).oneWay();
     return this;
   }
 
-  meta(this: Decorator, meta?: any): any {
+  meta(this: ExtendedMethodDecorator, meta?: any): any {
     let prop = descriptorForDecorator(this) as AliasedProperty;
 
     if (arguments.length === 0) {
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index e991361b766..db0747ac34f 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -19,7 +19,7 @@ import {
 import { finishLazyChains, getChainTagsForKeys } from './chain-tags';
 import {
   ComputedDescriptor,
-  Decorator,
+  ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
   descriptorForDecorator,
   descriptorForProperty,
@@ -593,7 +593,7 @@ class AutoComputedProperty extends ComputedProperty {
   }
 }
 
-export type ComputedDecorator = Decorator & PropertyDecorator & ComputedDecoratorImpl;
+export type ComputedDecorator = ExtendedMethodDecorator & ComputedDecoratorImpl;
 
 // TODO: This class can be svelted once `meta` has been deprecated
 class ComputedDecoratorImpl extends Function {
@@ -637,7 +637,7 @@ class ComputedDecoratorImpl extends Function {
     @chainable
     @public
   */
-  readOnly(this: Decorator) {
+  readOnly(this: ExtendedMethodDecorator) {
     let desc = descriptorForDecorator(this) as ComputedProperty;
     assert(
       'Computed properties that define a setter using the new syntax cannot be read-only',
@@ -693,7 +693,7 @@ class ComputedDecoratorImpl extends Function {
     @chainable
     @public
   */
-  meta(this: Decorator, meta?: unknown): unknown {
+  meta(this: ExtendedMethodDecorator, meta?: unknown): unknown {
     let prop = descriptorForDecorator(this) as ComputedProperty;
 
     if (arguments.length === 0) {
@@ -866,7 +866,7 @@ export function computed(
   target: object,
   propertyName: string,
   descriptor: DecoratorPropertyDescriptor
-): DecoratorPropertyDescriptor;
+): DecoratorPropertyDescriptor | void;
 // @computed with keys only
 export function computed(...dependentKeys: string[]): ComputedDecorator;
 // @computed with keys and config
@@ -875,7 +875,7 @@ export function computed(...args: ComputedDecoratorKeysAndConfig): ComputedDecor
 export function computed(callback: ComputedPropertyCallback): ComputedDecorator;
 export function computed(
   ...args: ElementDescriptor | string[] | ComputedDecoratorKeysAndConfig
-): ComputedDecorator | DecoratorPropertyDescriptor {
+): ComputedDecorator | DecoratorPropertyDescriptor | void {
   assert(
     `@computed can only be used directly as a native decorator. If you're using tracked in classic classes, add parenthesis to call it like a function: computed()`,
     !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && (args[4] as unknown) === true)
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index fef8e11cef6..0a4e0d649c4 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -5,10 +5,11 @@ import { _WeakSet as WeakSet } from '@glimmer/util';
 
 export type DecoratorPropertyDescriptor = (PropertyDescriptor & { initializer?: any }) | undefined;
 
-export type Decorator = (
+// Same as built-in MethodDecorator but with more arguments
+export type ExtendedMethodDecorator = (
   target: object,
   key: string,
-  desc?: DecoratorPropertyDescriptor,
+  desc: DecoratorPropertyDescriptor,
   maybeMeta?: Meta,
   isClassicDecorator?: boolean
 ) => DecoratorPropertyDescriptor;
@@ -111,7 +112,7 @@ export const COMPUTED_SETTERS = new WeakSet();
 export function makeComputedDecorator(
   desc: ComputedDescriptor,
   DecoratorClass: { prototype: object }
-): Decorator {
+): ExtendedMethodDecorator {
   let decorator = function COMPUTED_DECORATOR(
     target: object,
     key: string,
@@ -149,7 +150,10 @@ export function makeComputedDecorator(
 
 /////////////
 
-const DECORATOR_DESCRIPTOR_MAP: WeakMap<Decorator, ComputedDescriptor | true> = new WeakMap();
+const DECORATOR_DESCRIPTOR_MAP: WeakMap<
+  ExtendedMethodDecorator,
+  ComputedDescriptor | true
+> = new WeakMap();
 
 /**
   Returns the CP descriptor associated with `obj` and `keyName`, if any.
@@ -176,7 +180,7 @@ export function descriptorForProperty(obj: object, keyName: string, _meta?: Meta
 }
 
 export function descriptorForDecorator(dec: Function): ComputedDescriptor | true | undefined {
-  return DECORATOR_DESCRIPTOR_MAP.get(dec as Decorator);
+  return DECORATOR_DESCRIPTOR_MAP.get(dec as ExtendedMethodDecorator);
 }
 
 /**
@@ -187,8 +191,8 @@ export function descriptorForDecorator(dec: Function): ComputedDescriptor | true
   @return {boolean}
   @private
 */
-export function isClassicDecorator(dec: unknown): dec is Decorator {
-  return typeof dec === 'function' && DECORATOR_DESCRIPTOR_MAP.has(dec as Decorator);
+export function isClassicDecorator(dec: unknown): dec is ExtendedMethodDecorator {
+  return typeof dec === 'function' && DECORATOR_DESCRIPTOR_MAP.has(dec as ExtendedMethodDecorator);
 }
 
 /**
@@ -198,6 +202,9 @@ export function isClassicDecorator(dec: unknown): dec is Decorator {
   @param {function} decorator the value to mark as a decorator
   @private
 */
-export function setClassicDecorator(dec: Decorator, value: ComputedDescriptor | true = true) {
+export function setClassicDecorator(
+  dec: ExtendedMethodDecorator,
+  value: ComputedDescriptor | true = true
+) {
   DECORATOR_DESCRIPTOR_MAP.set(dec, value);
 }
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index 5462e4b2bc1..66e73db92ee 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -2,7 +2,11 @@ import { getOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { computed } from './computed';
-import { Decorator, DecoratorPropertyDescriptor, isElementDescriptor } from './decorator';
+import {
+  ExtendedMethodDecorator,
+  DecoratorPropertyDescriptor,
+  isElementDescriptor,
+} from './decorator';
 import { defineProperty } from './properties';
 
 export let DEBUG_INJECTION_FUNCTIONS: WeakMap<Function, any>;
@@ -27,14 +31,17 @@ if (DEBUG) {
          to the property's name
   @private
 */
-function inject(type: string, name: string): Decorator;
+function inject(type: string, name: string): ExtendedMethodDecorator | void;
 function inject(
   type: string,
   target: object,
   key: string,
   desc: DecoratorPropertyDescriptor
 ): DecoratorPropertyDescriptor;
-function inject(type: string, ...args: any[]): Decorator | DecoratorPropertyDescriptor {
+function inject(
+  type: string,
+  ...args: any[]
+): ExtendedMethodDecorator | DecoratorPropertyDescriptor | void {
   assert('a string type must be provided to inject', typeof type === 'string');
 
   let calledAsDecorator = isElementDescriptor(args);
diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts
index 0d98ee465d3..64525daa14c 100644
--- a/packages/@ember/-internals/metal/lib/properties.ts
+++ b/packages/@ember/-internals/metal/lib/properties.ts
@@ -5,7 +5,7 @@
 import { Meta, meta as metaFor } from '@ember/-internals/meta';
 import { setWithMandatorySetter } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
-import { Decorator, descriptorForProperty, isClassicDecorator } from './decorator';
+import { ExtendedMethodDecorator, descriptorForProperty, isClassicDecorator } from './decorator';
 import { revalidateObservers } from './observer';
 
 /**
@@ -59,7 +59,7 @@ import { revalidateObservers } from './observer';
 export function defineProperty(
   obj: object,
   keyName: string,
-  desc?: Decorator | PropertyDescriptor | undefined | null,
+  desc?: ExtendedMethodDecorator | PropertyDescriptor | undefined | null,
   data?: any | undefined | null,
   _meta?: Meta
 ): void {
@@ -87,7 +87,12 @@ export function defineProperty(
   }
 }
 
-export function defineDecorator(obj: object, keyName: string, desc: Decorator, meta: Meta) {
+export function defineDecorator(
+  obj: object,
+  keyName: string,
+  desc: ExtendedMethodDecorator,
+  meta: Meta
+) {
   let propertyDesc;
 
   if (DEBUG) {
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 4e3dae5f204..57c7960df02 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -6,7 +6,7 @@ import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator
 import { CHAIN_PASS_THROUGH } from './chain-tags';
 import {
   COMPUTED_SETTERS,
-  Decorator,
+  ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
   isElementDescriptor,
   setClassicDecorator,
@@ -75,14 +75,17 @@ import { SELF_TAG } from './tags';
 
   @param dependencies Optional dependents to be tracked.
 */
-export function tracked(propertyDesc: { value: any; initializer: () => any }): Decorator;
+export function tracked(propertyDesc: {
+  value: any;
+  initializer: () => any;
+}): ExtendedMethodDecorator;
 export function tracked(target: object, key: string): void;
 export function tracked(
   target: object,
   key: string,
   desc: DecoratorPropertyDescriptor
 ): DecoratorPropertyDescriptor;
-export function tracked(...args: any[]): Decorator | DecoratorPropertyDescriptor {
+export function tracked(...args: any[]): ExtendedMethodDecorator | DecoratorPropertyDescriptor {
   assert(
     `@tracked can only be used directly as a native decorator. If you're using tracked in classic classes, add parenthesis to call it like a function: tracked()`,
     !(isElementDescriptor(args.slice(0, 3)) && args.length === 5 && args[4] === true)
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 4956482d2bf..763dd286fc9 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -127,7 +127,9 @@ export function dependentKeyCompat(
   desc: ElementDescriptor[2]
 ): PropertyDescriptor;
 export function dependentKeyCompat(desc: PropertyDescriptor): Decorator;
-export function dependentKeyCompat(...args: ElementDescriptor | [PropertyDescriptor]) {
+export function dependentKeyCompat(
+  ...args: ElementDescriptor | [PropertyDescriptor]
+): PropertyDescriptor | Decorator {
   if (isElementDescriptor(args)) {
     let [target, key, desc] = args;
 
@@ -188,4 +190,4 @@ export function dependentKeyCompat(...args: ElementDescriptor | [PropertyDescrip
   }
 }
 
-setClassicDecorator(dependentKeyCompat as Decorator);
+setClassicDecorator(dependentKeyCompat);
diff --git a/packages/@ember/object/type-tests/computed/alias.test.ts b/packages/@ember/object/type-tests/computed/alias.test.ts
index 81b4ec81c69..a08ebe9856b 100644
--- a/packages/@ember/object/type-tests/computed/alias.test.ts
+++ b/packages/@ember/object/type-tests/computed/alias.test.ts
@@ -1,7 +1,8 @@
+import { AliasDecorator } from '@ember/-internals/metal/lib/alias';
 import { alias } from '@ember/object/computed';
 import { expectTypeOf } from 'expect-type';
 
-expectTypeOf(alias('foo')).toEqualTypeOf<PropertyDecorator>();
+expectTypeOf(alias('foo')).toEqualTypeOf<AliasDecorator>();
 
 class Foo {
   @alias('foo') alias: unknown;

From bffc1e9ec174f30fcc60a72db38d48aa9aa29849 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 3 Feb 2022 10:28:52 -0800
Subject: [PATCH 0832/1405] Future public types for @ember/service

---
 packages/@ember/-internals/metal/index.ts     |  1 +
 packages/@ember/-internals/metal/lib/alias.ts |  3 +-
 .../@ember/-internals/metal/lib/computed.ts   |  5 +-
 .../@ember/-internals/metal/lib/decorator.ts  |  4 +-
 .../-internals/metal/lib/injected_property.ts | 40 +++++----
 packages/@ember/-internals/metal/lib/mixin.ts |  1 +
 .../@ember/-internals/metal/lib/tracked.ts    |  9 +-
 .../-internals/routing/lib/services/router.ts | 12 ++-
 .../routing/lib/services/routing.ts           |  5 ++
 packages/@ember/object/compat.ts              |  8 +-
 packages/@ember/service/index.d.ts            |  4 -
 .../@ember/service/{index.js => index.ts}     | 36 +++++---
 .../@ember/service/tests/service_ts_test.ts   | 82 +++++++++++++++++++
 .../@ember/service/type-tests/index.test.ts   | 34 ++++++++
 14 files changed, 194 insertions(+), 50 deletions(-)
 delete mode 100644 packages/@ember/service/index.d.ts
 rename packages/@ember/service/{index.js => index.ts} (59%)
 create mode 100644 packages/@ember/service/tests/service_ts_test.ts
 create mode 100644 packages/@ember/service/type-tests/index.test.ts

diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index c5f78047033..c765d9803bc 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -30,6 +30,7 @@ export { defineProperty } from './lib/properties';
 export {
   ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
+  ElementDescriptor,
   isElementDescriptor,
   nativeDescDecorator,
   descriptorForDecorator,
diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index 5476a074d79..8539c065309 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -24,7 +24,7 @@ import { defineProperty } from './properties';
 import { get } from './property_get';
 import { set } from './property_set';
 
-export type AliasDecorator = PropertyDecorator & AliasDecoratorImpl;
+export type AliasDecorator = ExtendedMethodDecorator & PropertyDecorator & AliasDecoratorImpl;
 
 export default function alias(altKey: string): AliasDecorator {
   assert(
@@ -32,6 +32,7 @@ export default function alias(altKey: string): AliasDecorator {
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
+  // SAFETY: We passed in the impl for this class
   return makeComputedDecorator(new AliasedProperty(altKey), AliasDecoratorImpl) as AliasDecorator;
 }
 
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index db0747ac34f..7664f073476 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -593,7 +593,7 @@ class AutoComputedProperty extends ComputedProperty {
   }
 }
 
-export type ComputedDecorator = ExtendedMethodDecorator & ComputedDecoratorImpl;
+export type ComputedDecorator = ExtendedMethodDecorator & PropertyDecorator & ComputedDecoratorImpl;
 
 // TODO: This class can be svelted once `meta` has been deprecated
 class ComputedDecoratorImpl extends Function {
@@ -882,6 +882,7 @@ export function computed(
   );
 
   if (isElementDescriptor(args)) {
+    // SAFETY: We passed in the impl for this class
     let decorator = makeComputedDecorator(
       new ComputedProperty([]),
       ComputedDecoratorImpl
@@ -890,6 +891,7 @@ export function computed(
     return decorator(args[0], args[1], args[2]);
   }
 
+  // SAFETY: We passed in the impl for this class
   return makeComputedDecorator(
     new ComputedProperty(args as (string | ComputedPropertyObj)[]),
     ComputedDecoratorImpl
@@ -899,6 +901,7 @@ export function computed(
 export function autoComputed(
   ...config: [ComputedPropertyObj]
 ): ComputedDecorator | DecoratorPropertyDescriptor {
+  // SAFETY: We passed in the impl for this class
   return makeComputedDecorator(
     new AutoComputedProperty(config),
     ComputedDecoratorImpl
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 0a4e0d649c4..c13709ed94f 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -17,7 +17,7 @@ export type ExtendedMethodDecorator = (
 export type ElementDescriptor = [
   target: object,
   propertyName: string,
-  descriptor: DecoratorPropertyDescriptor
+  descriptor?: DecoratorPropertyDescriptor
 ];
 
 export function isElementDescriptor(args: unknown[]): args is ElementDescriptor {
@@ -62,7 +62,7 @@ export abstract class ComputedDescriptor {
   setup(
     _obj: object,
     keyName: string,
-    _propertyDesc: DecoratorPropertyDescriptor,
+    _propertyDesc: DecoratorPropertyDescriptor | undefined,
     meta: Meta
   ): void {
     meta.writeDescriptors(keyName, this);
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index 66e73db92ee..92273f55393 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -2,11 +2,7 @@ import { getOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { computed } from './computed';
-import {
-  ExtendedMethodDecorator,
-  DecoratorPropertyDescriptor,
-  isElementDescriptor,
-} from './decorator';
+import { DecoratorPropertyDescriptor, isElementDescriptor, ElementDescriptor } from './decorator';
 import { defineProperty } from './properties';
 
 export let DEBUG_INJECTION_FUNCTIONS: WeakMap<Function, any>;
@@ -31,22 +27,32 @@ if (DEBUG) {
          to the property's name
   @private
 */
-function inject(type: string, name: string): ExtendedMethodDecorator | void;
+// Decorator factory (with args)
+// (Also matches non-decorator form, types may be incorrect for this.)
+function inject(type: string, name: string): PropertyDecorator;
+// Non-decorator
+function inject(type: string): PropertyDecorator;
+// Decorator (without args)
+function inject(type: string, ...args: [ElementDescriptor[0], ElementDescriptor[1]]): void;
+function inject(type: string, ...args: ElementDescriptor): DecoratorPropertyDescriptor;
+// Catch-all for service and controller injections
 function inject(
   type: string,
-  target: object,
-  key: string,
-  desc: DecoratorPropertyDescriptor
-): DecoratorPropertyDescriptor;
+  ...args: [] | [name: string] | ElementDescriptor
+): PropertyDecorator | DecoratorPropertyDescriptor | void;
 function inject(
   type: string,
-  ...args: any[]
-): ExtendedMethodDecorator | DecoratorPropertyDescriptor | void {
+  ...args: [] | [name: string] | ElementDescriptor
+): PropertyDecorator | DecoratorPropertyDescriptor | void {
   assert('a string type must be provided to inject', typeof type === 'string');
+  let elementDescriptor;
+  let name: string | undefined;
 
-  let calledAsDecorator = isElementDescriptor(args);
-
-  let name = calledAsDecorator ? undefined : args[0];
+  if (isElementDescriptor(args)) {
+    elementDescriptor = args;
+  } else if (typeof args[0] === 'string') {
+    name = args[0];
+  }
 
   let getInjection = function (this: any, propertyName: string) {
     let owner = getOwner(this) || this.container; // fallback to `container` for backwards compat
@@ -74,8 +80,8 @@ function inject(
     },
   });
 
-  if (calledAsDecorator) {
-    return decorator(args[0], args[1], args[2]);
+  if (elementDescriptor) {
+    return decorator(elementDescriptor[0], elementDescriptor[1], elementDescriptor[2]);
   } else {
     return decorator;
   }
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 041abbe31d8..45e09ac90fb 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -138,6 +138,7 @@ function giveDecoratorSuper(
     newProperty._meta = property._meta;
     newProperty.enumerable = property.enumerable;
 
+    // SAFETY: We passed in the impl for this class
     return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator;
   }
 
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 57c7960df02..5272dc3a8a6 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -3,6 +3,7 @@ import { isEmberArray } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
+import { ElementDescriptor } from '..';
 import { CHAIN_PASS_THROUGH } from './chain-tags';
 import {
   COMPUTED_SETTERS,
@@ -120,7 +121,7 @@ export function tracked(...args: any[]): ExtendedMethodDecorator | DecoratorProp
     let decorator = function (
       target: object,
       key: string,
-      _desc: DecoratorPropertyDescriptor,
+      _desc?: DecoratorPropertyDescriptor,
       _meta?: any,
       isClassicDecorator?: boolean
     ): DecoratorPropertyDescriptor {
@@ -150,11 +151,7 @@ if (DEBUG) {
   setClassicDecorator(tracked);
 }
 
-function descriptorForField([target, key, desc]: [
-  object,
-  string,
-  DecoratorPropertyDescriptor
-]): DecoratorPropertyDescriptor {
+function descriptorForField([target, key, desc]: ElementDescriptor): DecoratorPropertyDescriptor {
   assert(
     `You attempted to use @tracked on ${key}, but that element is not a class field. @tracked is only usable on class fields. Native getters and setters will autotrack add any tracked fields they encounter, so there is no need mark getters and setters with @tracked.`,
     !desc || (!desc.value && !desc.get && !desc.set)
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 9591e69aacc..65f1d64b056 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -52,7 +52,11 @@ function cleanURL(url: string, rootURL: string) {
    @extends Service
    @class RouterService
  */
-export default class RouterService extends Service {
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface RouterService extends Evented {}
+class RouterService extends Service.extend(Evented) {
+  declare rootURL: EmberRouter['rootURL'];
+
   get _router(): EmberRouter {
     let router = this[ROUTER];
     if (router !== undefined) {
@@ -66,7 +70,7 @@ export default class RouterService extends Service {
   }
 
   willDestroy() {
-    super.willDestroy(...arguments);
+    super.willDestroy();
 
     this[ROUTER] = null;
   }
@@ -525,7 +529,7 @@ if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
   });
 }
 
-RouterService.reopen(Evented, {
+RouterService.reopen({
   /**
      Name of the current route.
 
@@ -681,3 +685,5 @@ RouterService.reopen(Evented, {
    */
   currentRoute: readOnly('_router.currentRoute'),
 });
+
+export default RouterService;
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 0ee46bb97ad..57048916514 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -23,6 +23,11 @@ const ROUTER = (symbol('ROUTER') as unknown) as string;
   @class RoutingService
 */
 export default class RoutingService extends Service {
+  declare targetState: EmberRouter['targetState'];
+  declare currentState: EmberRouter['currentState'];
+  declare currentRouteName: EmberRouter['currentRouteName'];
+  declare currentPath: EmberRouter['currentPath'];
+
   get router(): EmberRouter {
     let router = this[ROUTER];
     if (router !== undefined) {
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 763dd286fc9..2bf481d61a2 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -1,6 +1,6 @@
 import { Meta } from '@ember/-internals/meta';
 import {
-  Decorator,
+  ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
   descriptorForProperty,
   isElementDescriptor,
@@ -126,10 +126,10 @@ export function dependentKeyCompat(
   key: ElementDescriptor[1],
   desc: ElementDescriptor[2]
 ): PropertyDescriptor;
-export function dependentKeyCompat(desc: PropertyDescriptor): Decorator;
+export function dependentKeyCompat(desc: PropertyDescriptor): ExtendedMethodDecorator;
 export function dependentKeyCompat(
   ...args: ElementDescriptor | [PropertyDescriptor]
-): PropertyDescriptor | Decorator {
+): PropertyDescriptor | ExtendedMethodDecorator {
   if (isElementDescriptor(args)) {
     let [target, key, desc] = args;
 
@@ -164,7 +164,7 @@ export function dependentKeyCompat(
       })(desc)
     );
 
-    let decorator: Decorator = function (
+    let decorator: ExtendedMethodDecorator = function (
       target: object,
       key: string,
       _desc?: DecoratorPropertyDescriptor,
diff --git a/packages/@ember/service/index.d.ts b/packages/@ember/service/index.d.ts
deleted file mode 100644
index 6c3cf1d2502..00000000000
--- a/packages/@ember/service/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export function inject(name?: string): any;
-export function service(name?: string): any;
-declare let Service: any;
-export default Service;
diff --git a/packages/@ember/service/index.js b/packages/@ember/service/index.ts
similarity index 59%
rename from packages/@ember/service/index.js
rename to packages/@ember/service/index.ts
index 4fd9f25d8d6..9fae70f4b3c 100644
--- a/packages/@ember/service/index.js
+++ b/packages/@ember/service/index.ts
@@ -1,5 +1,9 @@
 import { FrameworkObject } from '@ember/-internals/runtime';
-import { inject as metalInject } from '@ember/-internals/metal';
+import {
+  DecoratorPropertyDescriptor,
+  ElementDescriptor,
+  inject as metalInject,
+} from '@ember/-internals/metal';
 
 /**
  @module @ember/service
@@ -16,8 +20,14 @@ import { inject as metalInject } from '@ember/-internals/metal';
   @return {ComputedDecorator} injection decorator instance
   @public
 */
-export function inject() {
-  return metalInject('service', ...arguments);
+export function inject(name: string): PropertyDecorator;
+export function inject(...args: [ElementDescriptor[0], ElementDescriptor[1]]): void;
+export function inject(...args: ElementDescriptor): DecoratorPropertyDescriptor;
+export function inject(): PropertyDecorator;
+export function inject(
+  ...args: [] | [name: string] | ElementDescriptor
+): PropertyDecorator | DecoratorPropertyDescriptor | void {
+  return metalInject('service', ...args);
 }
 
 /**
@@ -67,8 +77,14 @@ export function inject() {
   @return {ComputedDecorator} injection decorator instance
   @public
 */
-export function service() {
-  return metalInject('service', ...arguments);
+export function service(name: string): PropertyDecorator;
+export function service(...args: [ElementDescriptor[0], ElementDescriptor[1]]): void;
+export function service(...args: ElementDescriptor): DecoratorPropertyDescriptor;
+export function service(): PropertyDecorator;
+export function service(
+  ...args: [] | [name: string] | ElementDescriptor
+): PropertyDecorator | DecoratorPropertyDescriptor | void {
+  return metalInject('service', ...args);
 }
 
 /**
@@ -77,10 +93,6 @@ export function service() {
   @since 1.10.0
   @public
 */
-const Service = FrameworkObject.extend();
-
-Service.reopenClass({
-  isServiceFactory: true,
-});
-
-export default Service;
+export default class Service extends FrameworkObject {
+  static isServiceFactory = true;
+}
diff --git a/packages/@ember/service/tests/service_ts_test.ts b/packages/@ember/service/tests/service_ts_test.ts
new file mode 100644
index 00000000000..41bcdc9b61d
--- /dev/null
+++ b/packages/@ember/service/tests/service_ts_test.ts
@@ -0,0 +1,82 @@
+import Service, { inject, service } from '@ember/service';
+import { Object as EmberObject } from '@ember/-internals/runtime';
+import { buildOwner } from 'internal-test-helpers';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+moduleFor(
+  'inject - decorator (TS)',
+  class extends AbstractTestCase {
+    ['@test works with native decorators'](assert: QUnit['assert']) {
+      let owner = buildOwner();
+
+      class MainService extends Service {}
+
+      class Foo extends EmberObject {
+        @inject('main') declare main: MainService;
+      }
+
+      owner.register('service:main', MainService);
+      owner.register('foo:main', Foo);
+
+      let foo = owner.lookup('foo:main');
+
+      assert.ok(foo.main instanceof Service, 'service injected correctly');
+    }
+
+    ['@test uses the decorated property key if not provided'](assert: QUnit['assert']) {
+      let owner = buildOwner();
+
+      class MainService extends Service {}
+
+      class Foo extends EmberObject {
+        @inject declare main: MainService;
+      }
+
+      owner.register('service:main', MainService);
+      owner.register('foo:main', Foo);
+
+      let foo = owner.lookup('foo:main');
+
+      assert.ok(foo.main instanceof Service, 'service injected correctly');
+    }
+  }
+);
+
+moduleFor(
+  'service - decorator (TS)',
+  class extends AbstractTestCase {
+    ['@test works with native decorators'](assert: QUnit['assert']) {
+      let owner = buildOwner();
+
+      class MainService extends Service {}
+
+      class Foo extends EmberObject {
+        @service('main') declare main: MainService;
+      }
+
+      owner.register('service:main', MainService);
+      owner.register('foo:main', Foo);
+
+      let foo = owner.lookup('foo:main');
+
+      assert.ok(foo.main instanceof Service, 'service injected correctly');
+    }
+
+    ['@test uses the decorated property key if not provided'](assert: QUnit['assert']) {
+      let owner = buildOwner();
+
+      class MainService extends Service {}
+
+      class Foo extends EmberObject {
+        @service declare main: MainService;
+      }
+
+      owner.register('service:main', MainService);
+      owner.register('foo:main', Foo);
+
+      let foo = owner.lookup('foo:main');
+
+      assert.ok(foo.main instanceof Service, 'service injected correctly');
+    }
+  }
+);
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
new file mode 100644
index 00000000000..1addcbc60ed
--- /dev/null
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -0,0 +1,34 @@
+import { FrameworkObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import Service, { inject, service } from '@ember/service';
+import { expectTypeOf } from 'expect-type';
+
+class MainService extends Service {}
+class FooService extends Service {}
+class BarService extends Service {}
+class BazService extends Service {}
+
+let mainService = new MainService();
+
+expectTypeOf(mainService).toMatchTypeOf<FrameworkObject>();
+
+expectTypeOf(Service.isServiceFactory).toEqualTypeOf<boolean>();
+
+expectTypeOf(inject()).toEqualTypeOf<PropertyDecorator>();
+expectTypeOf(inject('foo')).toEqualTypeOf<PropertyDecorator>();
+
+class Foo extends EmberObject {
+  @inject('main') declare main: MainService;
+  @inject declare foo: FooService;
+  @service('bar') declare bar: BarService;
+  @service declare baz: BazService;
+}
+new Foo();
+
+const Legacy = EmberObject.extend({
+  main: inject('main'),
+  foo: inject(),
+  bar: service('bar'),
+  baz: service(),
+});
+Legacy.create();

From 0f833d8f1733f3309044d2499c0b3c46b8978790 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 3 Feb 2022 11:31:52 -0800
Subject: [PATCH 0833/1405] Future public types for @ember/controller

---
 .../-internals/routing/lib/ext/controller.ts  | 26 ++++----
 .../-internals/routing/lib/system/route.ts    |  6 +-
 .../-internals/routing/lib/system/router.ts   | 16 +++--
 .../@ember/-internals/routing/lib/utils.ts    | 66 ++++++++++++-------
 .../runtime/lib/mixins/action_handler.d.ts    |  3 +
 .../-internals/runtime/lib/system/object.d.ts |  6 +-
 packages/@ember/controller/index.d.ts         | 14 ----
 .../@ember/controller/{index.js => index.ts}  | 15 ++++-
 .../controller/lib/controller_mixin.d.ts      | 28 +++++++-
 .../controller/type-tests/index.test.ts       | 64 ++++++++++++++++++
 10 files changed, 180 insertions(+), 64 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
 delete mode 100644 packages/@ember/controller/index.d.ts
 rename packages/@ember/controller/{index.js => index.ts} (63%)
 create mode 100644 packages/@ember/controller/type-tests/index.test.ts

diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 005bf7fe6cf..f4f1439757c 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -2,8 +2,9 @@ import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
+import { Transition } from 'router_js';
 import { Router } from '../..';
-import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
+import { deprecateTransitionMethods, prefixRouteNameArg, RouteArgs } from '../utils';
 
 /**
 @module ember
@@ -155,19 +156,19 @@ ControllerMixin.reopen({
 
     See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
 
-    @param {String} name the name of the route or a URL
+    @for Ember.ControllerMixin
+    @method transitionToRoute
+    @deprecated Use transitionTo from the Router service instead.
+    @param {String} [name] the name of the route or a URL
     @param {...Object} models the model(s) or identifier(s) to be used
       while transitioning to the route.
     @param {Object} [options] optional hash with a queryParams property
       containing a mapping of query parameters
-    @for Ember.ControllerMixin
-    @method transitionToRoute
     @return {Transition} the transition object associated with this
       attempted transition
-    @deprecated Use transitionTo from the Router service instead.
     @public
   */
-  transitionToRoute(...args: any[]) {
+  transitionToRoute(...args: RouteArgs): Transition {
     deprecateTransitionMethods('controller', 'transitionToRoute');
 
     // target may be either another controller or a router
@@ -231,17 +232,20 @@ ControllerMixin.reopen({
     aController.replaceRoute('/blog/post/1/comment/13');
     ```
 
-    @param {String} name the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used
-    while transitioning to the route.
     @for Ember.ControllerMixin
     @method replaceRoute
+    @deprecated Use replaceWith from the Router service instead.
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used
+    while transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+    containing a mapping of query parameters
     @return {Transition} the transition object associated with this
       attempted transition
-    @deprecated Use replaceWith from the Router service instead.
     @public
   */
-  replaceRoute(...args: string[]) {
+
+  replaceRoute(...args: RouteArgs): Transition {
     deprecateTransitionMethods('controller', 'replaceRoute');
     // target may be either another controller or a router
     let target = get(this, 'target');
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 3467152dc98..ab0c4e311a8 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -38,8 +38,10 @@ import {
 import {
   calculateCacheKey,
   deprecateTransitionMethods,
+  NamedRouteArgs,
   normalizeControllerQueryParams,
   prefixRouteNameArg,
+  RouteArgs,
   stashParamNames,
 } from '../utils';
 import generateController from './generate_controller';
@@ -1015,7 +1017,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @deprecated Use transitionTo from the Router service instead.
     @public
   */
-  transitionTo(...args: any[]) {
+  transitionTo(...args: RouteArgs) {
     deprecateTransitionMethods('route', 'transitionTo');
     return this._router.transitionTo(...prefixRouteNameArg(this, args));
   }
@@ -1037,7 +1039,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.2.0
     @public
    */
-  intermediateTransitionTo(...args: any[]) {
+  intermediateTransitionTo(...args: NamedRouteArgs) {
     let [name, ...preparedArgs] = prefixRouteNameArg(this, args);
     this._router.intermediateTransitionTo(name, ...preparedArgs);
   }
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index a15670c154b..9c66e67d68c 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -11,7 +11,13 @@ import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import EmberLocation, { EmberLocation as IEmberLocation } from '../location/api';
-import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils';
+import {
+  calculateCacheKey,
+  extractRouteArgs,
+  getActiveTargetName,
+  resemblesURL,
+  RouteArgs,
+} from '../utils';
 import DSL from './dsl';
 import Route, {
   defaultSerialize,
@@ -666,7 +672,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     See [transitionTo](/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
 
     @method transitionTo
-    @param {String} name the name of the route or a URL
+    @param {String} [name] the name of the route or a URL
     @param {...Object} models the model(s) or identifier(s) to be used while
       transitioning to the route.
     @param {Object} [options] optional hash with a queryParams property
@@ -675,7 +681,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       attempted transition
     @public
   */
-  transitionTo(...args: unknown[]) {
+  transitionTo(...args: RouteArgs): Transition {
     if (resemblesURL(args[0])) {
       assert(
         `A transition was attempted from '${this.currentRouteName}' to '${args[0]}' but the application instance has already been destroyed.`,
@@ -706,7 +712,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     }
   }
 
-  replaceWith(...args: any[]) {
+  replaceWith(...args: RouteArgs): Transition {
     return this.transitionTo(...args).method('replace');
   }
 
@@ -1027,7 +1033,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     models: {}[],
     _queryParams: Record<string, unknown>,
     _keepDefaultQueryParamValues?: boolean
-  ) {
+  ): Transition {
     let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
     assert(
       `The route ${targetRouteName} was not found`,
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 7c533f98ea6..a142be97978 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -11,38 +11,52 @@ const ALL_PERIODS_REGEX = /\./g;
 type ControllerQueryParam = string | Record<string, string> | { as?: string; scope?: string };
 type ExpandedControllerQueryParam = { as: string | null; scope: string };
 
+type Model = object | string | number;
+
+export type NamedRouteArgs =
+  | [routeNameOrUrl: string, ...modelsAndOptions: [...Model[], RouteOptions]]
+  | [routeNameOrUrl: string, ...models: Model[]];
+
+export type UnnamedRouteArgs =
+  | [...modelsAndOptions: [...Model[], RouteOptions]]
+  | [...models: Model[]]
+  | [options: RouteOptions];
+
+export type RouteArgs = NamedRouteArgs | UnnamedRouteArgs;
+
 type ExtractedArgs = {
   routeName: string | undefined;
-  models: {}[];
+  models: Model[];
   queryParams: Record<string, unknown>;
 };
-type HasQueryParams = { queryParams: Record<string, unknown> };
-
-export function extractRouteArgs(
-  args:
-    | [routeNameOrURL: string, ...modelsAndOptions: [...any[], Record<string, unknown>]]
-    | [routeNameOrURL: string, ...models: any[]]
-    | [...modelsAndOptions: [...any[], Record<string, unknown>]]
-    | [...models: any[]]
-): ExtractedArgs {
+
+export type RouteOptions = { queryParams: Record<string, unknown> };
+
+export function extractRouteArgs(args: RouteArgs): ExtractedArgs {
   args = args.slice();
 
-  let possibleQueryParams = args.pop();
+  let possibleOptions = args.pop();
 
   let queryParams: Record<string, unknown>;
-  if (hasQueryParams(possibleQueryParams)) {
-    queryParams = possibleQueryParams.queryParams;
+  if (isRouteOptions(possibleOptions)) {
+    queryParams = possibleOptions.queryParams;
   } else {
     // Not query params so return to the array
-    args.push(possibleQueryParams);
+    if (possibleOptions !== undefined) {
+      args.push(possibleOptions);
+    }
     queryParams = {};
   }
 
-  // UNSAFE: these are simply assumed as the existing behavior of the system.
-  // However, this could break if upstream refactors change it, and the types
-  // here would not be able to tell us; we would lie to everything downstream.
-  let routeName = args.shift() as string | undefined;
-  let models = args as {}[];
+  let routeName;
+
+  if (typeof args[0] === 'string') {
+    routeName = args.shift();
+    // We just checked this!
+    assert('routeName is a string', typeof routeName === 'string');
+  }
+
+  let models = args;
 
   return { routeName, models, queryParams };
 }
@@ -216,15 +230,19 @@ export function resemblesURL(str: unknown): str is string {
 
   @private
 */
-export function prefixRouteNameArg(route: Route, args: any[]) {
-  let routeName = args[0];
+export function prefixRouteNameArg<T extends NamedRouteArgs | UnnamedRouteArgs>(
+  route: Route,
+  args: T
+): T {
+  let routeName: string;
   let owner = getOwner(route);
   assert('Route is unexpectedly missing an owner', owner);
 
   let prefix = owner.mountPoint;
 
   // only alter the routeName if it's actually referencing a route.
-  if (owner.routable && typeof routeName === 'string') {
+  if (owner.routable && typeof args[0] === 'string') {
+    routeName = args[0];
     if (resemblesURL(routeName)) {
       throw new EmberError(
         'Programmatic transitions by URL cannot be used within an Engine. Please use the route name instead.'
@@ -277,9 +295,9 @@ export function deprecateTransitionMethods(frameworkClass: string, methodName: s
   );
 }
 
-function hasQueryParams(value: unknown): value is HasQueryParams {
+function isRouteOptions(value: unknown): value is RouteOptions {
   if (value && typeof value === 'object') {
-    let qps = (value as HasQueryParams).queryParams;
+    let qps = (value as RouteOptions).queryParams;
     if (qps && typeof qps === 'object') {
       return Object.keys(qps).every((k) => typeof k === 'string');
     }
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
new file mode 100644
index 00000000000..5a09e39d957
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
@@ -0,0 +1,3 @@
+import Mixin from '../../types/mixin';
+
+export default class ActionHandler extends Mixin {}
diff --git a/packages/@ember/-internals/runtime/lib/system/object.d.ts b/packages/@ember/-internals/runtime/lib/system/object.d.ts
index 95e884e933c..d3eab4d5b49 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.d.ts
@@ -3,9 +3,11 @@ import { Observable } from '../mixins/observable';
 
 interface EmberObject extends CoreObject, Observable {}
 declare class EmberObject extends CoreObject {}
-export { EmberObject as default };
 
-export class FrameworkObject extends CoreObject {
+interface FrameworkObject extends CoreObject, Observable {}
+declare class FrameworkObject extends CoreObject {
   /** @internal */
   _debugContainerKey: string | undefined;
 }
+
+export { FrameworkObject, EmberObject as default };
diff --git a/packages/@ember/controller/index.d.ts b/packages/@ember/controller/index.d.ts
deleted file mode 100644
index 4e535921b74..00000000000
--- a/packages/@ember/controller/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export default class Controller {
-  isController: true;
-  target?: unknown;
-  store?: unknown;
-  model?: unknown;
-  get<T>(key: string): T;
-  set<T>(key: string, value: T): void;
-  setProperties(props: { [key: string]: any }): void;
-  transitionToRoute(...args: unknown[]): unknown;
-  replaceRoute(...args: unknown[]): unknown;
-  _qpDelegate: unknown;
-}
-
-export function inject(name?: string): any;
diff --git a/packages/@ember/controller/index.js b/packages/@ember/controller/index.ts
similarity index 63%
rename from packages/@ember/controller/index.js
rename to packages/@ember/controller/index.ts
index 660a8bed3d8..eab6827c381 100644
--- a/packages/@ember/controller/index.js
+++ b/packages/@ember/controller/index.ts
@@ -1,18 +1,21 @@
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { inject as metalInject } from '@ember/-internals/metal';
 import ControllerMixin from './lib/controller_mixin';
+import { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 
 /**
 @module @ember/controller
 */
 
+// NOTE: This doesn't actually extend EmberObject.
 /**
   @class Controller
   @extends EmberObject
   @uses Ember.ControllerMixin
   @public
 */
-const Controller = FrameworkObject.extend(ControllerMixin);
+interface Controller<T = unknown> extends FrameworkObject, ControllerMixin<T> {}
+class Controller<T = unknown> extends FrameworkObject.extend(ControllerMixin) {}
 
 /**
   Creates a property that lazily looks up another controller in the container.
@@ -55,8 +58,14 @@ const Controller = FrameworkObject.extend(ControllerMixin);
   @return {ComputedDecorator} injection decorator instance
   @public
 */
-export function inject() {
-  return metalInject('controller', ...arguments);
+export function inject(name: string): PropertyDecorator;
+export function inject(...args: [ElementDescriptor[0], ElementDescriptor[1]]): void;
+export function inject(...args: ElementDescriptor): DecoratorPropertyDescriptor;
+export function inject(): PropertyDecorator;
+export function inject(
+  ...args: [] | [name: string] | ElementDescriptor
+): PropertyDecorator | DecoratorPropertyDescriptor | void {
+  return metalInject('controller', ...args);
 }
 
 export default Controller;
diff --git a/packages/@ember/controller/lib/controller_mixin.d.ts b/packages/@ember/controller/lib/controller_mixin.d.ts
index 10477bb4293..361709aafe8 100644
--- a/packages/@ember/controller/lib/controller_mixin.d.ts
+++ b/packages/@ember/controller/lib/controller_mixin.d.ts
@@ -1,4 +1,26 @@
+import { RouteArgs } from '@ember/-internals/routing/lib/utils';
+import Mixin from '@ember/object/mixin';
+import { Transition } from 'router_js';
+
 /* @internal */
-declare let ControllerMixin: any;
-/* @internal */
-export default ControllerMixin;
+interface ControllerMixin<T> {
+  /** @internal */
+  _qpDelegate: unknown | null;
+
+  isController: true;
+  target: unknown | null;
+  model: T;
+
+  // From routing/lib/ext/controller
+
+  concatenatedProperties: string[];
+
+  queryParams: Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>;
+
+  transitionToRoute(...args: RouteArgs): Transition;
+
+  replaceRoute(...args: RouteArgs): Transition;
+}
+declare const ControllerMixin: Mixin;
+
+export { ControllerMixin as default };
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
new file mode 100644
index 00000000000..2577966a7a0
--- /dev/null
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -0,0 +1,64 @@
+import Controller, { inject } from '@ember/controller';
+
+import { expectTypeOf } from 'expect-type';
+
+class Foo {}
+
+let foo = new Foo();
+let foo2 = new Foo();
+
+let controller = new Controller<Foo>();
+
+expectTypeOf(controller).toEqualTypeOf<Controller<Foo>>();
+
+// Has observable methods
+expectTypeOf(controller.get).toBeFunction();
+expectTypeOf(controller.set).toBeFunction();
+
+expectTypeOf(controller.target).toEqualTypeOf<unknown | undefined>();
+
+expectTypeOf(controller.model).toEqualTypeOf<Foo>();
+
+expectTypeOf(controller.concatenatedProperties).toEqualTypeOf<string[]>();
+
+expectTypeOf(controller.queryParams).toEqualTypeOf<
+  Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>
+>();
+
+controller.transitionToRoute('blogPosts');
+controller.transitionToRoute('blogPosts', foo);
+controller.transitionToRoute('blogPosts', 1);
+controller.transitionToRoute('blogPosts', 'one');
+controller.transitionToRoute('blogComment', foo, foo2);
+controller.transitionToRoute('blogComment', 1, 13);
+controller.transitionToRoute('blogComment', 'one', 'thirteen');
+controller.transitionToRoute('/blog/posts/1/comment/13');
+controller.transitionToRoute('blogPost', 1, { queryParams: { showComments: true } });
+controller.transitionToRoute({ queryParams: { showComments: true } });
+
+// Ideally, these would fail, but we can't distinguish it from a model
+controller.transitionToRoute('blogPost', 1, { queryParams: { 1: true } });
+controller.transitionToRoute({ queryParams: { 1: true } });
+
+controller.replaceRoute('blogPosts');
+controller.replaceRoute('blogPosts', foo);
+controller.replaceRoute('blogPosts', 1);
+controller.replaceRoute('blogPosts', 'one');
+controller.replaceRoute('blogComment', foo, foo2);
+controller.replaceRoute('blogComment', 1, 13);
+controller.replaceRoute('blogComment', 'one', 'thirteen');
+controller.replaceRoute('/blog/posts/1/comment/13');
+controller.replaceRoute('blogPost', 1, { queryParams: { showComments: true } });
+controller.replaceRoute({ queryParams: { showComments: true } });
+
+// Ideally, these would fail, but we can't distinguish it from a model
+controller.replaceRoute('blogPost', 1, { queryParams: { 1: true } });
+controller.replaceRoute({ queryParams: { 1: true } });
+
+expectTypeOf(inject('foo')).toMatchTypeOf<PropertyDecorator>();
+
+// Allows inferred name
+expectTypeOf(inject()).toMatchTypeOf<PropertyDecorator>();
+
+// @ts-expect-error Doesn't allow invalid types
+inject(1);

From 1320f55a753739584a64a521cc0483f8277e7f7e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 2 Feb 2022 11:51:14 -0800
Subject: [PATCH 0834/1405] Improve routing docs

---
 .../-internals/routing/lib/services/router.ts |  4 ----
 .../-internals/routing/lib/system/router.ts   | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 65f1d64b056..d39e69dd6dd 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -79,8 +79,6 @@ class RouterService extends Service.extend(Evented) {
      Transition the application into another route. The route may
      be either a single route or route path:
 
-     See [transitionTo](/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
-
      Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
      This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
      See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
@@ -151,8 +149,6 @@ class RouterService extends Service.extend(Evented) {
      This is most commonly used to manage redirects in a way that does not cause confusing additions
      to the user's browsing history.
 
-     See [replaceWith](/ember/release/classes/Route/methods/replaceWith?anchor=replaceWith) for more info.
-
      Calling `replaceWith` from the Router service will cause default query parameter values to be included in the URL.
      This behavior is different from calling `replaceWith` on a route.
      See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 9c66e67d68c..1f7e60bfa71 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -669,8 +669,6 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     Transition the application into another route. The route may
     be either a single route or route path:
 
-    See [transitionTo](/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
-
     @method transitionTo
     @param {String} [name] the name of the route or a URL
     @param {...Object} models the model(s) or identifier(s) to be used while
@@ -712,6 +710,23 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     }
   }
 
+  /**
+    Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
+    it replaces the entry for the current route.
+    When the user clicks the "back" button in the browser, there will be fewer steps.
+    This is most commonly used to manage redirects in a way that does not cause confusing additions
+    to the user's browsing history.
+
+    @method replaceWith
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used while
+      transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @public
+  */
   replaceWith(...args: RouteArgs): Transition {
     return this.transitionTo(...args).method('replace');
   }

From c88c16fa53f2f08d8647c39e7ba4cbd2b0bdd8f8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 Jan 2022 13:47:38 -0800
Subject: [PATCH 0835/1405] Turn on noUncheckedIndexedAccess

---
 .../-internals/container/lib/container.ts     |  4 +-
 .../-internals/container/lib/registry.ts      | 23 +++---
 .../glimmer/lib/component-managers/curly.ts   | 15 ++--
 .../helpers/-disallow-dynamic-resolution.ts   | 14 ++--
 .../lib/helpers/-in-element-null-check.ts     |  9 ++-
 .../glimmer/lib/helpers/-normalize-class.ts   | 10 ++-
 .../glimmer/lib/helpers/-resolve.ts           |  2 +-
 .../glimmer/lib/helpers/-track-array.ts       |  4 +-
 .../-internals/glimmer/lib/helpers/action.ts  |  5 +-
 .../-internals/glimmer/lib/helpers/each-in.ts |  4 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |  1 +
 .../glimmer/lib/helpers/readonly.ts           |  5 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |  2 +-
 .../glimmer/lib/modifiers/action.ts           |  1 +
 .../@ember/-internals/glimmer/lib/renderer.ts | 15 ++--
 .../-internals/glimmer/lib/syntax/outlet.ts   |  4 +-
 .../-internals/glimmer/lib/utils/bindings.ts  | 14 +++-
 .../-internals/glimmer/lib/utils/iterator.ts  |  6 +-
 .../glimmer/lib/utils/process-args.ts         |  2 +
 .../application/debug-render-tree-test.ts     |  7 +-
 packages/@ember/-internals/meta/lib/meta.ts   | 13 ++-
 .../@ember/-internals/metal/lib/chain-tags.ts |  7 +-
 .../@ember/-internals/metal/lib/computed.ts   |  4 +-
 .../@ember/-internals/metal/lib/libraries.ts  | 10 +--
 packages/@ember/-internals/metal/lib/mixin.ts | 26 +++---
 .../-internals/metal/lib/namespace_search.ts  |  7 +-
 .../-internals/metal/lib/property_get.ts      |  4 +-
 .../-internals/metal/lib/set_properties.ts    |  5 +-
 .../-internals/routing/lib/system/route.ts    | 41 +++++-----
 .../-internals/routing/lib/system/router.ts   | 81 ++++++++++---------
 .../@ember/-internals/routing/lib/utils.ts    | 21 +++--
 .../@ember/-internals/utils/lib/inspect.ts    |  2 +
 .../-internals/utils/lib/mandatory-setter.ts  |  4 +-
 .../-internals/views/lib/system/utils.ts      |  1 +
 packages/@ember/instrumentation/index.ts      | 19 +++--
 packages/@ember/string/index.ts               |  7 +-
 .../lib/plugins/assert-against-attrs.ts       |  5 +-
 ...ssert-against-dynamic-helpers-modifiers.ts |  6 +-
 .../plugins/transform-each-in-into-each.ts    |  4 +-
 .../lib/plugins/transform-each-track-array.ts |  4 +-
 ...form-quoted-bindings-into-just-bindings.ts |  6 +-
 .../lib/plugins/transform-resolutions.ts      |  2 +-
 .../lib/system/bootstrap.ts                   |  4 +-
 .../lib/system/dasherize-component-name.ts    |  2 +-
 .../lib/ember-dev/method-call-tracker.ts      | 19 ++---
 .../lib/ember-dev/namespaces.ts               |  8 +-
 tsconfig.json                                 |  1 +
 47 files changed, 251 insertions(+), 209 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 94d8d9b98e1..c96320aa836 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -407,9 +407,9 @@ function destroyDestroyables(container: Container): void {
   let cache = container.cache;
   let keys = Object.keys(cache);
 
-  for (let i = 0; i < keys.length; i++) {
-    let key = keys[i];
+  for (let key of keys) {
     let value = cache[key];
+    assert('has cached value', value);
 
     if (value.destroy) {
       value.destroy();
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index c37d8b3ec71..5b11d49b083 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -28,8 +28,8 @@ export interface IRegistry {
     fullName: string,
     optionName: K
   ): TypeOptions[K] | undefined;
-  getOptions(fullName: string): TypeOptions;
-  getOptionsForType(type: string): TypeOptions;
+  getOptions(fullName: string): TypeOptions | undefined;
+  getOptionsForType(type: string): TypeOptions | undefined;
   knownForType(type: string): KnownForTypeResult;
   makeToString<T, C>(factory: Factory<T, C>, fullName: string): string;
   normalizeFullName(fullName: string): string;
@@ -396,7 +396,7 @@ export default class Registry implements IRegistry {
     this._typeOptions[type] = options;
   }
 
-  getOptionsForType(type: string): TypeOptions {
+  getOptionsForType(type: string): TypeOptions | undefined {
     let optionsForType = this._typeOptions[type];
     if (optionsForType === undefined && this.fallback !== null) {
       optionsForType = this.fallback.getOptionsForType(type);
@@ -415,7 +415,7 @@ export default class Registry implements IRegistry {
     this._options[normalizedName] = options;
   }
 
-  getOptions(fullName: string): TypeOptions {
+  getOptions(fullName: string): TypeOptions | undefined {
     let normalizedName = this.normalize(fullName);
     let options = this._options[normalizedName];
 
@@ -436,6 +436,7 @@ export default class Registry implements IRegistry {
     }
 
     let type = fullName.split(':')[0];
+    assert('has type', type); // split always will have at least one value
     options = this._typeOptions[type];
 
     if (options && options[optionName] !== undefined) {
@@ -484,8 +485,7 @@ export default class Registry implements IRegistry {
   knownForType(type: string): KnownForTypeResult {
     let localKnown = dictionary(null);
     let registeredNames = Object.keys(this.registrations);
-    for (let index = 0; index < registeredNames.length; index++) {
-      let fullName = registeredNames[index];
+    for (let fullName of registeredNames) {
       let itemType = fullName.split(':')[0];
 
       if (itemType === type) {
@@ -522,7 +522,9 @@ if (DEBUG) {
 
     for (let key in hash) {
       if (Object.prototype.hasOwnProperty.call(hash, key)) {
-        let { specifier } = hash[key];
+        let value = hash[key];
+        assert('has value', value);
+        let { specifier } = value;
         assert(
           `Expected a proper full name, given '${specifier}'`,
           this.isValidFullName(specifier)
@@ -543,9 +545,8 @@ if (DEBUG) {
       return;
     }
 
-    for (let i = 0; i < injections.length; i++) {
-      let { specifier } = injections[i];
-
+    for (let injection of injections) {
+      let { specifier } = injection;
       assert(`Attempting to inject an unknown injection: '${specifier}'`, this.has(specifier));
     }
   };
@@ -589,6 +590,8 @@ const privateNames: { [key: string]: string } = dictionary(null);
 const privateSuffix = `${Math.random()}${Date.now()}`.replace('.', '');
 
 export function privatize([fullName]: TemplateStringsArray): string {
+  assert('has a single string argument', arguments.length === 1 && fullName);
+
   let name = privateNames[fullName];
   if (name) {
     return name;
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 47ac8096e1d..3f164ef7506 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -85,6 +85,7 @@ function applyAttributeBindings(
 
   while (i !== -1) {
     let binding = attributeBindings[i];
+    assert('has binding', binding);
     let parsed: [string, string, boolean] = parseAttributeBinding(binding);
     let attribute = parsed[1];
 
@@ -174,6 +175,7 @@ export default class CurlyComponentManager
       );
 
       let { __ARGS__, ...rest } = args.named.capture();
+      assert('[BUG] unexpectedly missing __ARGS__ after check', __ARGS__);
 
       // does this need to be untracked?
       let __args__ = valueForRef(__ARGS__) as CapturedArguments;
@@ -215,14 +217,8 @@ export default class CurlyComponentManager
       Object.assign(named, args.named.capture());
 
       for (let i = 0; i < count; i++) {
-        // As of TS 3.7, tsc is giving us the following error on this line without the type annotation
-        //
-        //   TS7022: 'name' implicitly has type 'any' because it does not have a type annotation and is
-        //   referenced directly or indirectly in its own initializer.
-        //
-        // This is almost certainly a TypeScript bug, feel free to try and remove the annotation after
-        // upgrading if it is not needed anymore.
-        const name: string = positionalParams[i];
+        let name = positionalParams[i];
+        assert('Expected at least one positional param', name);
 
         assert(
           `You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`,
@@ -495,8 +491,7 @@ export function processComponentInitializationAssertions(component: Component, p
     `classNameBindings must not have spaces in them: ${component}`,
     (() => {
       let { classNameBindings } = component;
-      for (let i = 0; i < classNameBindings.length; i++) {
-        let binding = classNameBindings[i];
+      for (let binding of classNameBindings) {
         if (binding.split(' ').length > 1) {
           return false;
         }
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
index 7d761c5c768..d645d98ddd8 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
@@ -7,21 +7,21 @@ import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
 export default internalHelper(({ positional, named }: CapturedArguments) => {
+  const nameOrValueRef = positional[0];
+
   assert(
     `[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`,
-    positional.length === 1
+    positional.length === 1 && nameOrValueRef
   );
 
-  let nameOrValueRef = positional[0];
-
-  assert(`[BUG] expecting \`type\` named argument`, 'type' in named);
-  assert(`[BUG] expecting \`loc\` named argument`, 'loc' in named);
-  assert(`[BUG] expecting \`original\` named argument`, 'original' in named);
-
   let typeRef = named.type;
   let locRef = named.loc;
   let originalRef = named.original;
 
+  assert(`[BUG] expecting \`type\` named argument`, typeRef);
+  assert(`[BUG] expecting \`loc\` named argument`, locRef);
+  assert(`[BUG] expecting \`original\` named argument`, originalRef);
+
   // Bug: why do these fail?
   // assert('[BUG] expecting a string literal for the `type` argument', isConstRef(typeRef));
   // assert('[BUG] expecting a string literal for the `loc` argument', isConstRef(locRef));
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
index dfb7b7aa178..5649421a363 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -8,7 +8,8 @@ let helper: Helper;
 
 if (DEBUG) {
   helper = (args: CapturedArguments) => {
-    let inner = args.positional[0];
+    const inner = args.positional[0];
+    assert('expected at least one positional arg', inner);
 
     return createComputeRef(() => {
       let value = valueForRef(inner);
@@ -22,7 +23,11 @@ if (DEBUG) {
     });
   };
 } else {
-  helper = (args: CapturedArguments) => args.positional[0];
+  helper = (args: CapturedArguments) => {
+    let arg = args.positional[0];
+    assert('expected at least one positional arg', arg);
+    return arg;
+  };
 }
 
 export default internalHelper(helper);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 9db32be2b00..56533a06d4e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,3 +1,4 @@
+import { assert } from '@ember/debug';
 import { dasherize } from '@ember/string';
 import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
@@ -5,9 +6,14 @@ import { internalHelper } from './internal-helper';
 
 export default internalHelper(({ positional }: CapturedArguments) => {
   return createComputeRef(() => {
-    let classNameParts = (valueForRef(positional[0]) as string).split('.');
+    let classNameArg = positional[0];
+    let valueArg = positional[1];
+    assert('expected at least two positional args', classNameArg && valueArg);
+
+    let classNameParts = (valueForRef(classNameArg) as string).split('.');
     let className = classNameParts[classNameParts.length - 1];
-    let value = valueForRef(positional[1]);
+    assert('has className', className); // Always at least one split result
+    let value = valueForRef(valueArg);
 
     if (value === true) {
       return dasherize(className);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
index 34eda61c3c2..f06690f2279 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
@@ -19,7 +19,7 @@ export default internalHelper(({ positional }: CapturedArguments, owner: Owner |
 
   let fullNameRef = positional[0];
 
-  assert('[BUG] expecting a string literal as argument', isConstRef(fullNameRef));
+  assert('[BUG] expecting a string literal as argument', fullNameRef && isConstRef(fullNameRef));
 
   let fullName = valueForRef(fullNameRef);
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index a4c91c38848..d69c9466349 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -3,6 +3,7 @@
 */
 import { tagForProperty } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
@@ -14,7 +15,8 @@ import { internalHelper } from './internal-helper';
   transform at build time, similar to the (-each-in) helper
 */
 export default internalHelper(({ positional }: CapturedArguments) => {
-  let inner = positional[0];
+  const inner = positional[0];
+  assert('expected at least one positional arg', inner);
 
   return createComputeRef(() => {
     let iterable = valueForRef(inner);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 21a0146c9c5..b6045fce724 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -290,11 +290,12 @@ export default internalHelper(
     // pos[1] is the action name or function
     // Anything else is an action argument.
     let [context, action, ...restArgs] = positional;
+    assert('hash position arguments', context && action);
 
     let debugKey: string = action.debugLabel!;
 
-    let target = 'target' in named ? named.target : context;
-    let processArgs = makeArgsProcessor('value' in named && named.value, restArgs);
+    let target = 'target' in named && named.target ? named.target : context;
+    let processArgs = makeArgsProcessor(('value' in named && named.value) || false, restArgs);
 
     let fn: Function;
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 30c9b0e0dda..2bef9dc0760 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -4,6 +4,7 @@
 import { tagForObject } from '@ember/-internals/metal';
 import { _contentFor } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
@@ -167,7 +168,8 @@ export class EachInWrapper {
 }
 
 export default internalHelper(({ positional }: CapturedArguments) => {
-  let inner = positional[0];
+  const inner = positional[0];
+  assert('expected at least one positional arg', inner);
 
   return createComputeRef(() => {
     let iterable = valueForRef(inner);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index 3c073fc6ae6..cfd3185b6bf 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -82,6 +82,7 @@ import { internalHelper } from './internal-helper';
 
 export default internalHelper(({ positional }: CapturedArguments) => {
   let ref = positional[0];
+  assert('expected at least one positional arg', ref);
 
   // TODO: Improve this error message. This covers at least two distinct
   // cases:
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index 98328c11145..c6f1be38eea 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -3,6 +3,7 @@
 */
 import { CapturedArguments } from '@glimmer/interfaces';
 import { createReadOnlyRef } from '@glimmer/reference';
+import { assert } from '@ember/debug';
 import { internalHelper } from './internal-helper';
 
 /**
@@ -121,5 +122,7 @@ import { internalHelper } from './internal-helper';
   @private
 */
 export default internalHelper(({ positional }: CapturedArguments) => {
-  return createReadOnlyRef(positional[0]);
+  let firstArg = positional[0];
+  assert('has first arg', firstArg);
+  return createReadOnlyRef(firstArg);
 });
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index e119f0c3903..b7acd0812b8 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -41,5 +41,5 @@ export default internalHelper(({ positional, named }: CapturedArguments) => {
     positional.length === 1 && Object.keys(named).length === 0
   );
 
-  return createUnboundRef(valueForRef(positional[0]), '(resurt of an `unbound` helper)');
+  return createUnboundRef(valueForRef(positional[0]!), '(result of an `unbound` helper)');
 });
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index f1a8cc3435e..ec23c0ceff6 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -251,6 +251,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
   update(actionState: ActionState): void {
     let { positional } = actionState;
     let actionNameRef = positional[1];
+    assert('Expected at least one positional arg', actionNameRef);
 
     if (!isInvokableRef(actionNameRef)) {
       actionState.actionName = valueForRef(actionNameRef);
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 775662b1cd8..a3c6016589c 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -205,8 +205,8 @@ function deregister(renderer: Renderer): void {
 }
 
 function loopBegin(): void {
-  for (let i = 0; i < renderers.length; i++) {
-    renderers[i]._scheduleRevalidate();
+  for (let renderer of renderers) {
+    renderer._scheduleRevalidate();
   }
 }
 
@@ -249,12 +249,12 @@ function resolveRenderPromise() {
 
 let loops = 0;
 function loopEnd() {
-  for (let i = 0; i < renderers.length; i++) {
-    if (!renderers[i]._isValid()) {
+  for (let renderer of renderers) {
+    if (!renderer._isValid()) {
       if (loops > ENV._RERENDER_LOOP_LIMIT) {
         loops = 0;
         // TODO: do something better
-        renderers[i].destroy();
+        renderer.destroy();
         throw new Error('infinite rendering invalidation detected');
       }
       loops++;
@@ -433,6 +433,7 @@ export class Renderer {
     let i = this._roots.length;
     while (i--) {
       let root = roots[i];
+      assert('has root', root);
       if (root.isFor(view)) {
         root.destroy();
         roots.splice(i, 1);
@@ -500,6 +501,7 @@ export class Renderer {
         // each root is processed
         for (let i = 0; i < roots.length; i++) {
           let root = roots[i];
+          assert('has root', root);
 
           if (root.destroyed) {
             // add to the list of roots to be removed
@@ -561,8 +563,7 @@ export class Renderer {
 
   _clearAllRoots(): void {
     let roots = this._roots;
-    for (let i = 0; i < roots.length; i++) {
-      let root = roots[i];
+    for (let root of roots) {
       root.destroy();
     }
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 6a8b96a050e..b050fa728f5 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -54,7 +54,9 @@ export const outletHelper = internalHelper(
     if (args.positional.length === 0) {
       nameRef = createPrimitiveRef('main');
     } else {
-      nameRef = args.positional[0];
+      let maybeNameRef = args.positional[0];
+      assert('Expected at least one positional arg', maybeNameRef);
+      nameRef = maybeNameRef;
     }
 
     let outletRef = createComputeRef(() => {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 894c1b2c441..1c87da38c85 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -20,7 +20,7 @@ function referenceForParts(rootRef: Reference<Component>, parts: string[]): Refe
     parts.shift();
 
     if (parts.length === 1) {
-      return childRefFor(rootRef, parts[0]);
+      return childRefFor(rootRef, parts[0]!);
     }
   }
 
@@ -83,7 +83,11 @@ export function createClassNameBindingRef(
   microsyntax: string,
   operations: ElementOperations
 ) {
-  let [prop, truthy, falsy] = microsyntax.split(':');
+  let parts = microsyntax.split(':');
+  let [prop, truthy, falsy] = parts;
+  // NOTE: This could be an empty string
+  assert('has prop', prop !== undefined); // Will always have at least one part
+
   let isStatic = prop === '';
 
   if (isStatic) {
@@ -125,7 +129,11 @@ export function createSimpleClassNameBindingRef(inner: Reference, path?: string)
   });
 }
 
-export function createColonClassNameBindingRef(inner: Reference, truthy: string, falsy: string) {
+export function createColonClassNameBindingRef(
+  inner: Reference,
+  truthy: string,
+  falsy: string | undefined
+) {
   return createComputeRef(() => {
     return valueForRef(inner) ? truthy : falsy;
   });
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index c94977ffa36..791925e356d 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -116,15 +116,13 @@ class EmberArrayIterator extends BoundedIterator {
 class ObjectIterator extends BoundedIterator {
   static fromIndexable(obj: Indexable) {
     let keys = Object.keys(obj);
-    let { length } = keys;
 
-    if (length === 0) {
+    if (keys.length === 0) {
       return null;
     } else {
       let values: unknown[] = [];
-      for (let i = 0; i < length; i++) {
+      for (let key of keys) {
         let value: any;
-        let key = keys[i];
 
         value = obj[key];
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
index e7c09a85d33..5e6eb93f80b 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
@@ -2,6 +2,7 @@ import { symbol } from '@ember/-internals/utils';
 import { MUTABLE_CELL } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
 import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
+import { assert } from '@ember/debug';
 import { ARGS } from '../component-managers/curly';
 import { ACTIONS } from '../helpers/action';
 
@@ -16,6 +17,7 @@ export function processComponentArgs(namedArgs: CapturedNamedArguments) {
 
   for (let name in namedArgs) {
     let ref = namedArgs[name];
+    assert('expected ref', ref);
     let value = valueForRef(ref);
 
     let isAction = typeof value === 'function' && ACTIONS.has(value);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index d83f2b24fd6..e8298831fb8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -10,7 +10,7 @@ import { Component, setComponentManager } from '@ember/-internals/glimmer';
 import { EngineInstanceOptions, Owner } from '@ember/-internals/owner';
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
-import { captureRenderTree } from '@ember/debug';
+import { assert, captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { CapturedRenderNode } from '@glimmer/interfaces';
@@ -1448,7 +1448,10 @@ if (ENV._DEBUG_RENDER_TREE) {
           expected = expected.sort(byTypeAndName);
 
           for (let i = 0; i < actual.length; i++) {
-            this.assertRenderNode(actual[i], expected[i], `${actual[i].type}:${actual[i].name}`);
+            let actualVal = actual[i];
+            let expectedVal = expected[i];
+            assert('has actualVal and expectedVal', actualVal && expectedVal);
+            this.assertRenderNode(actualVal, expectedVal, `${actualVal.type}:${actualVal.name}`);
           }
         } else {
           this.assert.deepEqual(actual, [], path);
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 0b3809f8f91..0e13eac6d4f 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -419,6 +419,7 @@ export class Meta {
       } as Listener);
     } else {
       let listener = listeners[i];
+      assert('has listener', listener);
 
       // If the listener is our own listener and we are trying to remove it, we
       // want to splice it out entirely so we don't hold onto a reference.
@@ -516,8 +517,7 @@ export class Meta {
               this._inheritedEnd = 0;
             }
 
-            for (let i = 0; i < parentListeners.length; i++) {
-              let listener = parentListeners[i];
+            for (let listener of parentListeners) {
               let index = indexOfListener(
                 listeners,
                 listener.event,
@@ -554,9 +554,7 @@ export class Meta {
     }
 
     if (listeners !== undefined) {
-      for (let index = 0; index < listeners.length; index++) {
-        let listener = listeners[index];
-
+      for (let listener of listeners) {
         // REMOVE listeners are placeholders that tell us not to
         // inherit, so they never match. Only ADD and ONCE can match.
         if (
@@ -587,9 +585,7 @@ export class Meta {
     }
 
     if (listeners !== undefined) {
-      for (let index = 0; index < listeners.length; index++) {
-        let listener = listeners[index];
-
+      for (let listener of listeners) {
         // REMOVE listeners are placeholders that tell us not to
         // inherit, so they never match. Only ADD and ONCE can match.
         if (
@@ -730,6 +726,7 @@ function indexOfListener(
 ) {
   for (let i = listeners.length - 1; i >= 0; i--) {
     let listener = listeners[i];
+    assert('has listener', listener);
 
     if (listener.event === event && listener.target === target && listener.method === method) {
       return i;
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index 848f74f0d7d..a5d72f54702 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -24,8 +24,7 @@ export function finishLazyChains(meta: Meta, key: string, value: any) {
   }
 
   if (isObject(value)) {
-    for (let i = 0; i < lazyTags.length; i++) {
-      let [tag, deps] = lazyTags[i];
+    for (let [tag, deps] of lazyTags) {
       updateTag(tag, getChainTagsForKey(value, deps as string, tagMetaFor(value), peekMeta(value)));
     }
   }
@@ -41,8 +40,8 @@ export function getChainTagsForKeys(
 ): Tag {
   let tags: Tag[] = [];
 
-  for (let i = 0; i < keys.length; i++) {
-    getChainTags(tags, obj, keys[i], tagMeta, meta);
+  for (let key of keys) {
+    getChainTags(tags, obj, key, tagMeta, meta);
   }
 
   return combine(tags);
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 7664f073476..29fcf665260 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -379,8 +379,8 @@ export class ComputedProperty extends ComputedDescriptor {
       args.push(property);
     }
 
-    for (let i = 0; i < passedArgs.length; i++) {
-      expandProperties(passedArgs[i], addArg);
+    for (let arg of passedArgs) {
+      expandProperties(arg, addArg);
     }
 
     this._dependentKeys = args;
diff --git a/packages/@ember/-internals/metal/lib/libraries.ts b/packages/@ember/-internals/metal/lib/libraries.ts
index 2f70a3242ee..d96ca2adf89 100644
--- a/packages/@ember/-internals/metal/lib/libraries.ts
+++ b/packages/@ember/-internals/metal/lib/libraries.ts
@@ -32,11 +32,10 @@ export class Libraries {
 
   _getLibraryByName(name: string): Library | undefined {
     let libs = this._registry;
-    let count = libs.length;
 
-    for (let i = 0; i < count; i++) {
-      if (libs[i].name === name) {
-        return libs[i];
+    for (let lib of libs) {
+      if (lib.name === name) {
+        return lib;
       }
     }
     return undefined;
@@ -92,8 +91,7 @@ if (DEBUG) {
     let maxNameLength = Math.max.apply(null, nameLengths);
 
     debug('-------------------------------');
-    for (let i = 0; i < libs.length; i++) {
-      let lib = libs[i];
+    for (let lib of libs) {
       let spaces = new Array(maxNameLength - lib.name.length + 1).join(' ');
       debug([lib.name, spaces, ' : ', lib.version].join(''));
     }
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 45e09ac90fb..d102fee0ed5 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -39,10 +39,7 @@ const { isArray } = Array;
 
 function extractAccessors(properties: { [key: string]: any } | undefined) {
   if (properties !== undefined) {
-    let keys = Object.keys(properties);
-
-    for (let i = 0; i < keys.length; i++) {
-      let key = keys[i];
+    for (let key of Object.keys(properties)) {
       let desc = Object.getOwnPropertyDescriptor(properties, key)!;
 
       if (desc.get !== undefined || desc.set !== undefined) {
@@ -206,8 +203,7 @@ function applyMergedProperties(
 
   let props = Object.keys(value);
 
-  for (let i = 0; i < props.length; i++) {
-    let prop = props[i];
+  for (let prop of props) {
     let propValue = value[prop];
 
     if (typeof propValue === 'function') {
@@ -297,8 +293,7 @@ function mergeProps(
 
   let propKeys = Object.keys(props);
 
-  for (let i = 0; i < propKeys.length; i++) {
-    let key = propKeys[i];
+  for (let key of propKeys) {
     let value = props[key];
 
     if (value === undefined) continue;
@@ -374,16 +369,16 @@ function updateObserversAndListeners(obj: object, key: string, fn: Function, add
   if (observers !== undefined) {
     let updateObserver = add ? addObserver : removeObserver;
 
-    for (let i = 0; i < observers.paths.length; i++) {
-      updateObserver(obj, observers.paths[i], null, key, observers.sync);
+    for (let path of observers.paths) {
+      updateObserver(obj, path, null, key, observers.sync);
     }
   }
 
   if (listeners !== undefined) {
     let updateListener = add ? addListener : removeListener;
 
-    for (let i = 0; i < listeners.length; i++) {
-      updateListener(obj, listeners[i], null, key);
+    for (let listener of listeners) {
+      updateListener(obj, listener, null, key);
     }
   }
 }
@@ -406,8 +401,7 @@ export function applyMixin(obj: { [key: string]: any }, mixins: Mixin[], _hideKe
   // * Copying `toString` in broken browsers
   mergeMixins(mixins, meta, descs, values, obj, keys, keysWithSuper);
 
-  for (let i = 0; i < keys.length; i++) {
-    let key = keys[i];
+  for (let key of keys) {
     let value = values[key];
     let desc = descs[key];
 
@@ -831,8 +825,8 @@ export function observer<T extends (...args: any[]) => any>(
 
   let paths: string[] = [];
 
-  for (let i = 0; i < dependentKeys.length; ++i) {
-    expandProperties(dependentKeys[i], (path: string) => paths.push(path));
+  for (let dependentKey of dependentKeys) {
+    expandProperties(dependentKey, (path: string) => paths.push(path));
   }
 
   setObservers(func as Function, {
diff --git a/packages/@ember/-internals/metal/lib/namespace_search.ts b/packages/@ember/-internals/metal/lib/namespace_search.ts
index 3fdb573698a..c307cf7d8e5 100644
--- a/packages/@ember/-internals/metal/lib/namespace_search.ts
+++ b/packages/@ember/-internals/metal/lib/namespace_search.ts
@@ -47,8 +47,7 @@ export function findNamespaces(): void {
   }
   let lookup = context.lookup;
   let keys = Object.keys(lookup);
-  for (let i = 0; i < keys.length; i++) {
-    let key = keys[i];
+  for (let key of keys) {
     // Only process entities that start with uppercase A-Z
     if (!isUppercase(key.charCodeAt(0))) {
       continue;
@@ -81,8 +80,8 @@ export function processAllNamespaces(): void {
   if (unprocessedNamespaces || unprocessedMixins) {
     let namespaces = NAMESPACES;
 
-    for (let i = 0; i < namespaces.length; i++) {
-      processNamespace(namespaces[i]);
+    for (let namespace of namespaces) {
+      processNamespace(namespace);
     }
 
     unprocessedMixins = false;
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 1186c22cb27..f680939471f 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -137,12 +137,12 @@ export function _getPath<T extends object>(root: T, path: string | string[]): an
   let obj: any = root;
   let parts = typeof path === 'string' ? path.split('.') : path;
 
-  for (let i = 0; i < parts.length; i++) {
+  for (let part of parts) {
     if (obj === undefined || obj === null || (obj as MaybeHasIsDestroyed).isDestroyed) {
       return undefined;
     }
 
-    obj = _getProp(obj, parts[i]);
+    obj = _getProp(obj, part);
   }
 
   return obj;
diff --git a/packages/@ember/-internals/metal/lib/set_properties.ts b/packages/@ember/-internals/metal/lib/set_properties.ts
index 440d4714ec2..932ea8cde3a 100644
--- a/packages/@ember/-internals/metal/lib/set_properties.ts
+++ b/packages/@ember/-internals/metal/lib/set_properties.ts
@@ -36,11 +36,8 @@ export default function setProperties<TProperties extends { [key: string]: any }
   }
   changeProperties(() => {
     let props = Object.keys(properties);
-    let propertyName;
-
-    for (let i = 0; i < props.length; i++) {
-      propertyName = props[i];
 
+    for (let propertyName of props) {
       set(obj, propertyName, properties[propertyName]);
     }
   });
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index ab0c4e311a8..dba89a141af 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -37,6 +37,7 @@ import {
 } from 'router_js';
 import {
   calculateCacheKey,
+  ControllerQueryParam,
   deprecateTransitionMethods,
   NamedRouteArgs,
   normalizeControllerQueryParams,
@@ -77,6 +78,7 @@ export function defaultSerialize(
   let object = {};
   if (params.length === 1) {
     let [name] = params;
+    assert('has name', name);
     if (name in model) {
       object[name] = get(model, name);
     } else if (/_id$/.test(name)) {
@@ -369,8 +371,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       namePaths[a] = `${routeInfo.name}.${names[a]}`;
     }
 
-    for (let i = 0; i < qps.length; ++i) {
-      let qp = qps[i];
+    for (let qp of qps) {
       if (qp.scope === 'model') {
         qp.parts = namePaths;
       }
@@ -465,12 +466,12 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     let params = Object.assign({}, state!.params[fullName]);
     let queryParams = getQueryParamsFor(route, state!);
 
-    return Object.keys(queryParams).reduce((params, key) => {
+    return Object.entries(queryParams).reduce((params, [key, value]) => {
       assert(
         `The route '${this.routeName}' has both a dynamic segment and query param with name '${key}'. Please rename one to avoid collisions.`,
         !params[key]
       );
-      params[key] = queryParams[key];
+      params[key] = value;
       return params;
     }, params);
   }
@@ -1160,6 +1161,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
       allParams.forEach((prop: string) => {
         let aQp = queryParams.map[prop];
+        assert('expected aQp', aQp);
         aQp.values = params;
 
         let cacheKey = calculateCacheKey(aQp.route.fullRouteName, aQp.parts, aQp.values);
@@ -1407,7 +1409,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
         if (transition.resolveIndex < 1) {
           return;
         }
-        return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1].context;
+        return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1]!.context;
       }
     }
 
@@ -1838,8 +1840,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       // merge in the query params for the route. As a mergedProperty,
       // Route#queryParams is always at least `{}`
 
-      let controllerDefinedQueryParameterConfiguration =
-        (get(controller, 'queryParams') as any) || {};
+      let controllerDefinedQueryParameterConfiguration: ControllerQueryParam[] =
+        (get(controller, 'queryParams') as ControllerQueryParam[]) || [];
       let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
         controllerDefinedQueryParameterConfiguration
       );
@@ -1921,6 +1923,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
         */
         inactive: (prop: string, value: unknown) => {
           let qp = map[prop];
+          assert('expected inactive callback to only be called for registered qps', qp);
           this._qpChanged(prop, value, qp);
         },
         /*
@@ -1930,6 +1933,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
         */
         active: (prop: string, value: unknown) => {
           let qp = map[prop];
+          assert('expected active callback to only be called for registered qps', qp);
           this._qpChanged(prop, value, qp);
           return this._activeQPChanged(qp, value);
         },
@@ -1939,6 +1943,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
         */
         allowOverrides: (prop: string, value: unknown) => {
           let qp = map[prop];
+          assert('expected allowOverrides callback to only be called for registered qps', qp);
           this._qpChanged(prop, value, qp);
           return this._updatingQPChanged(qp);
         },
@@ -2013,7 +2018,9 @@ function routeInfoFor(route: Route, routeInfos: InternalRouteInfo<Route>[], offs
 
   let current: Route | undefined;
   for (let i = 0; i < routeInfos.length; i++) {
-    current = routeInfos[i].route;
+    let routeInfo = routeInfos[i];
+    assert('has current routeInfo', routeInfo);
+    current = routeInfo.route;
     if (current === route) {
       return routeInfos[i + offset];
     }
@@ -2161,12 +2168,13 @@ export function getFullQueryParams(router: EmberRouter, state: RouteTransitionSt
   return fullQueryParamsState;
 }
 
-function getQueryParamsFor(route: Route, state: RouteTransitionState) {
+function getQueryParamsFor(route: Route, state: RouteTransitionState): Record<string, unknown> {
   state.queryParamsFor = state.queryParamsFor || {};
   let name = route.fullRouteName;
 
-  if (state.queryParamsFor[name]) {
-    return state.queryParamsFor[name];
+  let existing = state.queryParamsFor[name];
+  if (existing) {
+    return existing;
   }
 
   let fullQueryParams = getFullQueryParams(route._router, state);
@@ -2176,10 +2184,8 @@ function getQueryParamsFor(route: Route, state: RouteTransitionState) {
   // Copy over all the query params for this route/controller into params hash.
   // SAFETY: Since `_qp` is protected we can't infer the type
   let qps = (get(route, '_qp') as Route['_qp']).qps;
-  for (let i = 0; i < qps.length; ++i) {
+  for (let qp of qps) {
     // Put deserialized qp on params hash.
-    let qp = qps[i];
-
     let qpValueWasPassedIn = qp.prop in fullQueryParams;
     params[qp.prop] = qpValueWasPassedIn
       ? fullQueryParams[qp.prop]
@@ -2397,8 +2403,8 @@ Route.reopen({
       let qpMap = (get(this, '_qp') as Route['_qp']).map;
 
       let totalChanged = Object.keys(changed).concat(Object.keys(removed));
-      for (let i = 0; i < totalChanged.length; ++i) {
-        let qp = qpMap[totalChanged[i]];
+      for (let change of totalChanged) {
+        let qp = qpMap[change];
         if (qp) {
           let options = this._optionsForQueryParam(qp);
           assert('options exists', options && typeof options === 'object');
@@ -2431,8 +2437,7 @@ Route.reopen({
 
       stashParamNames(router, routeInfos);
 
-      for (let i = 0; i < qpMeta.qps.length; ++i) {
-        let qp = qpMeta.qps[i];
+      for (let qp of qpMeta.qps) {
         let route = qp.route;
         let controller = route.controller;
         let presentKey = qp.urlKey in params && qp.urlKey;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 1f7e60bfa71..8f7b51b1cd9 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -191,12 +191,12 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
   // Set of QueryParam['urlKey']
   _qpUpdates: Set<string> = new Set();
-  _queuedQPChanges: { [key: string]: unknown } = {};
+  _queuedQPChanges: Record<string, unknown> = {};
 
   _bucketCache: BucketCache;
   _toplevelView: OutletView | null = null;
   _handledErrors = new Set();
-  _engineInstances: { [name: string]: { [id: string]: EngineInstance } } = Object.create(null);
+  _engineInstances: Record<string, Record<string, EngineInstance>> = Object.create(null);
   _engineInfoByRoute = Object.create(null);
   _routerService: RouterService;
 
@@ -283,7 +283,9 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     let name, nameParts, oldNameParts;
     for (let i = 1; i < routeInfos.length; i++) {
-      name = routeInfos[i].name;
+      let routeInfo = routeInfos[i];
+      assert('has routeInfo', routeInfo);
+      name = routeInfo.name;
       nameParts = name.split('.');
       oldNameParts = slice.call(path);
 
@@ -605,8 +607,8 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     let defaultParentState: OutletState | undefined;
     let liveRoutes = null;
 
-    for (let i = 0; i < routeInfos.length; i++) {
-      let route = routeInfos[i].route!;
+    for (let routeInfo of routeInfos) {
+      let route = routeInfo.route!;
       let connections = ROUTE_CONNECTIONS.get(route);
       let ownState: OutletState;
       if (connections.length === 0) {
@@ -654,7 +656,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   handleURL(url: string) {
     // Until we have an ember-idiomatic way of accessing #hashes, we need to
     // remove it because router.js doesn't know how to handle it.
-    let _url = url.split(/#(.+)?/)[0];
+    let _url = url.split(/#(.+)?/)[0]!;
     return this._doURLTransition('handleURL', _url);
   }
 
@@ -809,8 +811,10 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
     let instances = this._engineInstances;
     for (let name in instances) {
-      for (let id in instances[name]) {
-        run(instances[name][id], 'destroy');
+      let instance = instances[name];
+      assert('has instance', instance);
+      for (let id in instance) {
+        run(instance[id], 'destroy');
       }
     }
   }
@@ -943,7 +947,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       this,
       routeInfos,
       queryParams,
-      (key: string, value: unknown, qp: QueryParam) => {
+      (key: string, value: unknown, qp: QueryParam | undefined) => {
         if (qp) {
           delete queryParams[key];
           queryParams[qp.urlKey] = qp.route.serializeQueryParam(value, qp.urlKey, qp.type);
@@ -988,7 +992,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       this,
       routeInfos,
       queryParams,
-      (key: string, value: unknown, qp: QueryParam) => {
+      (key: string, value: unknown, qp: QueryParam | undefined) => {
         // If we don't have QP meta info for a given key, then we do nothing
         // because all values will be treated as strings
         if (qp) {
@@ -1158,7 +1162,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
    */
   _queryParamsFor(routeInfos: PrivateRouteInfo[]) {
     let routeInfoLength = routeInfos.length;
-    let leafRouteName = routeInfos[routeInfoLength - 1].name;
+    let leafRouteName = routeInfos[routeInfoLength - 1]!.name;
     let cached = this._qpCache[leafRouteName];
     if (cached !== undefined) {
       return cached;
@@ -1169,12 +1173,11 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     let qps = [];
     let qpsByUrlKey = DEBUG ? {} : null;
     let qpMeta;
-    let qp;
     let urlKey;
     let qpOther;
 
-    for (let i = 0; i < routeInfoLength; ++i) {
-      qpMeta = this._getQPMeta(routeInfos[i]);
+    for (let routeInfo of routeInfos) {
+      qpMeta = this._getQPMeta(routeInfo);
 
       if (!qpMeta) {
         shouldCache = false;
@@ -1182,9 +1185,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       }
 
       // Loop over each QP to make sure we don't have any collisions by urlKey
-      for (let i = 0; i < qpMeta.qps.length; i++) {
-        qp = qpMeta.qps[i];
-
+      for (let qp of qpMeta.qps) {
         if (DEBUG) {
           urlKey = qp.urlKey;
           qpOther = qpsByUrlKey![urlKey];
@@ -1227,19 +1228,15 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     let state = calculatePostTransitionState(this, leafRouteName, contexts);
     let routeInfos = state.routeInfos;
     let qpMeta;
-    for (let i = 0, len = routeInfos.length; i < len; ++i) {
-      qpMeta = this._getQPMeta(routeInfos[i]);
+    for (let routeInfo of routeInfos) {
+      qpMeta = this._getQPMeta(routeInfo);
 
       if (!qpMeta) {
         continue;
       }
 
-      let qp;
-      let presentProp;
-      for (let j = 0, qpLen = qpMeta.qps.length; j < qpLen; ++j) {
-        qp = qpMeta.qps[j];
-
-        presentProp =
+      for (let qp of qpMeta.qps) {
+        let presentProp =
           (qp.prop in queryParams && qp.prop) ||
           (qp.scopedPropertyName in queryParams && qp.scopedPropertyName) ||
           (qp.urlKey in queryParams && qp.urlKey);
@@ -1276,15 +1273,17 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     let qp;
     let presentProp;
 
-    for (let i = 0; i < routeInfos.length; ++i) {
-      qpMeta = this._getQPMeta(routeInfos[i]);
+    for (let routeInfo of routeInfos) {
+      qpMeta = this._getQPMeta(routeInfo);
 
       if (!qpMeta) {
         continue;
       }
 
+      // Needs to stay for index loop to avoid throwIfClosureRequired
       for (let j = 0, qpLen = qpMeta.qps.length; j < qpLen; ++j) {
         qp = qpMeta.qps[j];
+        assert('expected qp', qp);
 
         presentProp =
           (qp.prop in queryParams && qp.prop) ||
@@ -1389,12 +1388,17 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     mountPoint: string;
   }) {
     let engineInstances = this._engineInstances;
+    let namedInstances = engineInstances[name];
 
-    if (!engineInstances[name]) {
-      engineInstances[name] = Object.create(null);
+    if (!namedInstances) {
+      namedInstances = Object.create(null);
+      engineInstances[name] = namedInstances!;
     }
 
-    let engineInstance = engineInstances[name][instanceId];
+    // We just set these!
+    assert('has namedInstances', namedInstances);
+
+    let engineInstance = namedInstances[instanceId];
 
     if (!engineInstance) {
       let owner = getOwner(this);
@@ -1412,7 +1416,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
       engineInstance.boot();
 
-      engineInstances[name][instanceId] = engineInstance;
+      namedInstances[instanceId] = engineInstance;
     }
 
     return engineInstance;
@@ -1500,6 +1504,8 @@ function forEachRouteAbove(
 ) {
   for (let i = routeInfos.length - 1; i >= 0; --i) {
     let routeInfo = routeInfos[i];
+    assert('has routeInfo', routeInfo);
+
     let route = routeInfo.route;
 
     // routeInfo.handler being `undefined` generally means either:
@@ -1707,6 +1713,7 @@ export function triggerEvent(
 
   for (let i = routeInfos.length - 1; i >= 0; i--) {
     routeInfo = routeInfos[i];
+    assert('has routeInfo', routeInfo);
     handler = routeInfo.route;
     actionHandler = handler && handler.actions && handler.actions[name];
     if (actionHandler) {
@@ -1743,9 +1750,7 @@ function calculatePostTransitionState(
   let state = emberRouter._routerMicrolib.applyIntent(leafRouteName, contexts);
   let { routeInfos, params } = state;
 
-  for (let i = 0; i < routeInfos.length; ++i) {
-    let routeInfo = routeInfos[i];
-
+  for (let routeInfo of routeInfos) {
     // If the routeInfo is not resolved, we serialize the context into params
     if (!routeInfo.isResolved) {
       params[routeInfo.name] = routeInfo.serialize(
@@ -1769,7 +1774,9 @@ function updatePaths(router: EmberRouter) {
   }
 
   let path = EmberRouter._routePath(infos);
-  let currentRouteName = infos[infos.length - 1].name;
+  let info = infos[infos.length - 1];
+  assert('expected info', info);
+  let currentRouteName = info.name;
   let location = router.location;
   assert('expected location to not be a string', typeof location !== 'string');
   let currentURL = location.getURL();
@@ -1811,7 +1818,7 @@ function forEachQueryParam(
   router: EmberRouter,
   routeInfos: PrivateRouteInfo[],
   queryParams: Record<string, unknown>,
-  callback: (key: string, value: unknown, qp: QueryParam) => void
+  callback: (key: string, value: unknown, qp: QueryParam | undefined) => void
 ) {
   let qpCache = router._queryParamsFor(routeInfos);
 
@@ -1838,7 +1845,7 @@ function findLiveRoute(liveRoutes: OutletState | null, name: string) {
     }
     let outlets = test.outlets;
     for (let outletName in outlets) {
-      stack.push(outlets[outletName]);
+      stack.push(outlets[outletName]!);
     }
   }
 
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index a142be97978..18d00c0b29b 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -8,7 +8,10 @@ import EmberRouter, { PrivateRouteInfo } from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
-type ControllerQueryParam = string | Record<string, string> | { as?: string; scope?: string };
+export type ControllerQueryParam =
+  | string
+  | Record<string, string>
+  | { as?: string; scope?: string };
 type ExpandedControllerQueryParam = { as: string | null; scope: string };
 
 type Model = object | string | number;
@@ -65,7 +68,9 @@ export function getActiveTargetName(router: Router<Route>): string {
   let routeInfos = router.activeTransition
     ? router.activeTransition[STATE_SYMBOL]!.routeInfos
     : router.state!.routeInfos;
-  return routeInfos[routeInfos.length - 1].name;
+  let lastRouteInfo = routeInfos[routeInfos.length - 1];
+  assert('has last route info', lastRouteInfo);
+  return lastRouteInfo.name;
 }
 
 export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInfo[]): void {
@@ -77,12 +82,15 @@ export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInf
   // keeps separate a routeInfo's list of parameter names depending
   // on whether a URL transition or named transition is happening.
   // Hopefully we can remove this in the future.
-  let targetRouteName = routeInfos[routeInfos.length - 1].name;
+  let routeInfo = routeInfos[routeInfos.length - 1];
+  assert('has route info', routeInfo);
+  let targetRouteName = routeInfo.name;
   let recogHandlers = router._routerMicrolib.recognizer.handlersFor(targetRouteName);
   let dynamicParent: PrivateRouteInfo;
 
   for (let i = 0; i < routeInfos.length; ++i) {
     let routeInfo = routeInfos[i];
+    assert('has route info', routeInfo);
     let names = recogHandlers[i].names;
 
     if (names.length) {
@@ -127,8 +135,7 @@ function _calculateCacheValuePrefix(prefix: string, part: string) {
 */
 export function calculateCacheKey(prefix: string, parts: string[] = [], values: {} | null): string {
   let suffixes = '';
-  for (let i = 0; i < parts.length; ++i) {
-    let part = parts[i];
+  for (let part of parts) {
     let cacheValuePrefix = _calculateCacheValuePrefix(prefix, part);
     let value;
     if (values) {
@@ -180,8 +187,8 @@ export function calculateCacheKey(prefix: string, parts: string[] = [], values:
 export function normalizeControllerQueryParams(queryParams: ControllerQueryParam[]) {
   let qpMap: Record<string, ExpandedControllerQueryParam> = {};
 
-  for (let i = 0; i < queryParams.length; ++i) {
-    accumulateQueryParamDescriptors(queryParams[i], qpMap);
+  for (let queryParam of queryParams) {
+    accumulateQueryParamDescriptors(queryParam, qpMap);
   }
 
   return qpMap;
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index 89b549304cf..fb4dc37613e 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -1,4 +1,5 @@
 import { _WeakSet as WeakSet } from '@glimmer/util';
+import { assert } from '@ember/debug';
 const { toString: objectToString } = Object.prototype;
 const { toString: functionToString } = Function.prototype;
 const { isArray } = Array;
@@ -96,6 +97,7 @@ function inspectObject(obj: object, depth: number, seen: WeakSet<object>) {
     }
 
     let key = keys[i];
+    assert('has key', key); // Looping over array
     s += `${inspectKey(key)}: ${inspectValue(obj[key], depth, seen)}`;
   }
   s += ' }';
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index c1da3f19512..1240e0ec8cd 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -102,7 +102,7 @@ if (DEBUG) {
     let setters = MANDATORY_SETTERS.get(obj);
 
     if (setters !== undefined && setters[keyName] !== undefined) {
-      Object.defineProperty(obj, keyName, setters[keyName]);
+      Object.defineProperty(obj, keyName, setters[keyName]!);
 
       delete setters[keyName];
     }
@@ -112,7 +112,7 @@ if (DEBUG) {
     let setters = MANDATORY_SETTERS.get(obj);
 
     if (setters !== undefined && setters[keyName] !== undefined) {
-      let setter = setters[keyName];
+      let setter = setters[keyName]!;
 
       if (setter.set) {
         setter.set.call(obj, value);
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index bf51d7b1027..95eceb7d390 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -50,6 +50,7 @@ export function getRootViews(owner: Owner): View[] {
 
   Object.keys(registry).forEach((id) => {
     let view = registry[id];
+    assert('expected view', view);
 
     if (view.parentView === null) {
       rootViews.push(view);
diff --git a/packages/@ember/instrumentation/index.ts b/packages/@ember/instrumentation/index.ts
index e1382d0ac9e..a2dca835f29 100644
--- a/packages/@ember/instrumentation/index.ts
+++ b/packages/@ember/instrumentation/index.ts
@@ -3,6 +3,7 @@
 
 import { ENV } from '@ember/-internals/environment';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
+import { assert } from '@ember/debug';
 
 export interface Listener<T> {
   before: (name: string, timestamp: number, payload: object) => T;
@@ -91,10 +92,8 @@ let cache: { [key: string]: Listener<any>[] } = {};
 
 function populateListeners(name: string) {
   let listeners: Listener<any>[] = [];
-  let subscriber;
 
-  for (let i = 0; i < subscribers.length; i++) {
-    subscriber = subscribers[i];
+  for (let subscriber of subscribers) {
     if (subscriber.regex.test(name)) {
       listeners.push(subscriber.object);
     }
@@ -258,15 +257,17 @@ export function _instrumentStart<Arg>(
 
   let beforeValues: any[] = [];
   let timestamp = time();
-  for (let i = 0; i < listeners.length; i++) {
-    let listener = listeners[i];
+  for (let listener of listeners) {
     beforeValues.push(listener.before(name, timestamp, payload));
   }
 
+  const constListeners = listeners;
+
   return function _instrumentEnd(): void {
     let timestamp = time();
-    for (let i = 0; i < listeners.length; i++) {
-      let listener = listeners[i];
+    for (let i = 0; i < constListeners.length; i++) {
+      let listener = constListeners[i];
+      assert('has listener', listener); // Iterating over values
       if (typeof listener.after === 'function') {
         listener.after(name, timestamp, payload, beforeValues[i]);
       }
@@ -293,11 +294,9 @@ export function _instrumentStart<Arg>(
 */
 export function subscribe<T>(pattern: string, object: Listener<T>): Subscriber<T> {
   let paths = pattern.split('.');
-  let path;
   let regexes: string[] = [];
 
-  for (let i = 0; i < paths.length; i++) {
-    path = paths[i];
+  for (let path of paths) {
     if (path === '*') {
       regexes.push('[^\\.]*');
     } else {
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 98b2b12b31f..3474fe000a9 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -39,9 +39,10 @@ const CLASSIFY_CACHE = new Cache<string, string>(1000, (str) => {
     initialChar + (chr ? chr.toUpperCase() : '');
   let parts = str.split('/');
   for (let i = 0; i < parts.length; i++) {
-    parts[i] = parts[i]
-      .replace(STRING_CLASSIFY_REGEXP_1, replace1)
-      .replace(STRING_CLASSIFY_REGEXP_2, replace2);
+    parts[i] = parts[i]!.replace(STRING_CLASSIFY_REGEXP_1, replace1).replace(
+      STRING_CLASSIFY_REGEXP_2,
+      replace2
+    );
   }
   return parts
     .join('/')
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
index c127df12ffc..43f95976af9 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
@@ -28,6 +28,7 @@ export default function assertAgainstAttrs(env: EmberASTPluginEnvironment): ASTP
 
   function updateBlockParamsStack(blockParams: string[]) {
     let parent = stack[stack.length - 1];
+    assert('has parent', parent);
     stack.push(parent.concat(blockParams));
   }
 
@@ -54,7 +55,7 @@ export default function assertAgainstAttrs(env: EmberASTPluginEnvironment): ASTP
       },
 
       PathExpression(node: AST.PathExpression): AST.Node | void {
-        if (isAttrs(node, stack[stack.length - 1])) {
+        if (isAttrs(node, stack[stack.length - 1]!)) {
           let path = b.path(node.original.substr(6));
 
           assert(
@@ -75,7 +76,7 @@ export default function assertAgainstAttrs(env: EmberASTPluginEnvironment): ASTP
 function isAttrs(node: AST.PathExpression, symbols: string[]) {
   let name = node.parts[0];
 
-  if (symbols.indexOf(name) !== -1) {
+  if (name && symbols.indexOf(name) !== -1) {
     return false;
   }
 
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
index 90907193513..289bda9b8eb 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
@@ -24,7 +24,7 @@ export default function assertAgainstDynamicHelpersModifiers(
 
       MustacheStatement(node: AST.MustacheStatement) {
         if (isPath(node.path)) {
-          let name = node.path.parts[0];
+          let name = node.path.parts[0]!;
 
           assert(
             `${messageFor(name)} ${calculateLocationDisplay(moduleName, node.loc)}`,
@@ -35,7 +35,7 @@ export default function assertAgainstDynamicHelpersModifiers(
 
       SubExpression(node: AST.SubExpression) {
         if (isPath(node.path)) {
-          let name = node.path.parts[0];
+          let name = node.path.parts[0]!;
 
           assert(
             `${messageFor(name)} ${calculateLocationDisplay(moduleName, node.loc)}`,
@@ -48,7 +48,7 @@ export default function assertAgainstDynamicHelpersModifiers(
 }
 
 function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
-  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]);
+  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]!);
 }
 
 function messageFor(name: string): string {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
index cfc457929e7..28ea503a147 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
@@ -31,7 +31,7 @@ export default function transformEachInIntoEach(env: EmberASTPluginEnvironment):
     visitor: {
       BlockStatement(node: AST.BlockStatement): AST.Node | void {
         if (isPath(node.path) && node.path.original === 'each-in') {
-          node.params[0] = b.sexpr(b.path('-each-in'), [node.params[0]]);
+          node.params[0] = b.sexpr(b.path('-each-in'), [node.params[0]!]);
 
           let blockParams = node.program.blockParams;
 
@@ -40,7 +40,7 @@ export default function transformEachInIntoEach(env: EmberASTPluginEnvironment):
           } else if (blockParams.length === 1) {
             // insert a dummy variable for the first slot
             // pick a name that won't parse so it won't shadow any real variables
-            blockParams = ['( unused value )', blockParams[0]];
+            blockParams = ['( unused value )', blockParams[0]!];
           } else {
             let key = blockParams.shift()!;
             let value = blockParams.shift()!;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
index af17e511e19..c6634f4ac6b 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
@@ -1,4 +1,5 @@
 import { AST, ASTPlugin } from '@glimmer/syntax';
+import { assert } from '@ember/debug';
 import { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
@@ -32,6 +33,7 @@ export default function transformEachTrackArray(env: EmberASTPluginEnvironment):
       BlockStatement(node: AST.BlockStatement): AST.Node | void {
         if (isPath(node.path) && node.path.original === 'each') {
           let firstParam = node.params[0];
+          assert('has firstParam', firstParam);
 
           if (
             firstParam.type === 'SubExpression' &&
@@ -41,7 +43,7 @@ export default function transformEachTrackArray(env: EmberASTPluginEnvironment):
             return;
           }
 
-          node.params[0] = b.sexpr(b.path('-track-array'), [node.params[0]]);
+          node.params[0] = b.sexpr(b.path('-track-array'), [firstParam]);
 
           return b.block(
             b.path('each'),
diff --git a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
index d4d279aef58..032bafd4e7c 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
@@ -37,9 +37,9 @@ function validStyleAttr(attr: AST.AttrNode | undefined) {
 function getStyleAttr(node: AST.ElementNode): AST.AttrNode | undefined {
   let attributes = node.attributes;
 
-  for (let i = 0; i < attributes.length; i++) {
-    if (attributes[i].name === 'style') {
-      return attributes[i];
+  for (let attribute of attributes) {
+    if (attribute.name === 'style') {
+      return attribute;
     }
   }
   return undefined;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
index 6bea76e5bd9..454353c8095 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
@@ -148,7 +148,7 @@ export default function transformResolutions(env: EmberASTPluginEnvironment): AS
 }
 
 function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
-  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]);
+  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]!);
 }
 
 function transformParams(
diff --git a/packages/ember-template-compiler/lib/system/bootstrap.ts b/packages/ember-template-compiler/lib/system/bootstrap.ts
index 1800e56ce1a..7e1dd370fcb 100644
--- a/packages/ember-template-compiler/lib/system/bootstrap.ts
+++ b/packages/ember-template-compiler/lib/system/bootstrap.ts
@@ -33,9 +33,7 @@ function bootstrap({ context, hasTemplate, setTemplate }: BootstrapOptions) {
 
   let elements = context.querySelectorAll(selector);
 
-  for (let i = 0; i < elements.length; i++) {
-    let script = elements[i];
-
+  for (let script of elements) {
     // Get the name of the script
     // First look for data-template-name attribute, then fall back to its
     // id if no name is found.
diff --git a/packages/ember-template-compiler/lib/system/dasherize-component-name.ts b/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
index 44a25065881..52bdda1329b 100644
--- a/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
+++ b/packages/ember-template-compiler/lib/system/dasherize-component-name.ts
@@ -13,7 +13,7 @@ export default new Cache<string, string>(1000, (key) =>
       return '/';
     }
 
-    if (index === 0 || !ALPHA.test(key[index - 1])) {
+    if (index === 0 || !ALPHA.test(key[index - 1]!)) {
       return char.toLowerCase();
     }
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
index 206ccc3c7b2..6f7457e66bd 100644
--- a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
@@ -1,4 +1,5 @@
 import { DEBUG } from '@glimmer/env';
+import { assert as emberAssert } from '@ember/debug';
 import { checkTest, DebugEnv, DebugFunction, DebugFunctionOptions } from './utils';
 
 type Actual = [string, boolean, DebugFunctionOptions];
@@ -74,7 +75,7 @@ export default class MethodCallTracker {
     let expectedMessages = this._expectedMessages;
     let expectedOptionLists = this._expectedOptionLists;
     let actuals = this._actuals;
-    let o, i, j;
+    let o, i;
 
     if (!isExpectingNoCalls && expectedMessages.length === 0 && actuals.length === 0) {
       return;
@@ -87,9 +88,9 @@ export default class MethodCallTracker {
 
     if (isExpectingNoCalls) {
       let actualMessages = [];
-      for (i = 0; i < actuals.length; i++) {
-        if (!actuals[i][1]) {
-          actualMessages.push(actuals[i][0]);
+      for (let actual in actuals) {
+        if (!actual[1]) {
+          actualMessages.push(actual[0]);
         }
       }
       assert.ok(
@@ -111,6 +112,7 @@ export default class MethodCallTracker {
         let matchesMessage = false;
         let matchesOptionList = false;
         actual = actuals[i];
+        emberAssert('has actual', actual); // We just checked the array
 
         if (actual[1] === true) {
           continue;
@@ -127,10 +129,9 @@ export default class MethodCallTracker {
         } else if (actual[2]) {
           matchesOptionList = true;
 
-          for (j = 0; j < expectedOptionList.length; j++) {
+          for (let expectedOption of expectedOptionList) {
             matchesOptionList =
-              matchesOptionList &&
-              Object.prototype.hasOwnProperty.call(actual[2], expectedOptionList[j]);
+              matchesOptionList && Object.prototype.hasOwnProperty.call(actual[2], expectedOption);
           }
         }
 
@@ -175,8 +176,8 @@ export default class MethodCallTracker {
     }
 
     for (i = 0; i < actuals.length; i++) {
-      if (!matched.has(i) && actuals[i][1] !== true) {
-        assert.ok(false, `Unexpected Ember.${methodName} call: ${actuals[i][0]}`);
+      if (!matched.has(i) && actuals[i]![1] !== true) {
+        assert.ok(false, `Unexpected Ember.${methodName} call: ${actuals[i]![0]}`);
       }
     }
   }
diff --git a/packages/internal-test-helpers/lib/ember-dev/namespaces.ts b/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
index b15bfa502ce..32d6c5d709e 100644
--- a/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/namespaces.ts
@@ -9,16 +9,16 @@ export function setupNamespacesCheck(hooks: NestedHooks): void {
       assert.ok(false, 'Should not have any NAMESPACES after tests');
       run(() => {
         let namespaces = NAMESPACES.slice();
-        for (let i = 0; i < namespaces.length; i++) {
-          namespaces[i].destroy();
+        for (let namespace of namespaces) {
+          namespace.destroy();
         }
       });
     }
     let keys = Object.keys(NAMESPACES_BY_ID);
     if (keys.length > 0) {
       assert.ok(false, 'Should not have any NAMESPACES_BY_ID after tests');
-      for (let i = 0; i < keys.length; i++) {
-        delete NAMESPACES_BY_ID[keys[i]];
+      for (let key of keys) {
+        delete NAMESPACES_BY_ID[key];
       }
     }
   });
diff --git a/tsconfig.json b/tsconfig.json
index 5f84ec9e4a5..1e884f6219f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,6 +17,7 @@
     "allowUnreachableCode": false,
     "suppressImplicitAnyIndexErrors": true,
     "noUnusedLocals": true,
+    "noUncheckedIndexedAccess": true,
     "noUnusedParameters": true,
 
     "newLine": "LF",

From a47efb0356441c151c4c9a985059659975d4caf1 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 27 Jan 2022 15:29:23 -0800
Subject: [PATCH 0836/1405] Future public @ember/routing types

---
 package.json                                  |   2 +-
 .../glimmer/lib/components/link-to.ts         |  12 +-
 packages/@ember/-internals/routing/index.ts   |   8 +-
 .../-internals/routing/lib/ext/controller.ts  |  10 +-
 .../-internals/routing/lib/services/router.ts | 222 ++++---
 .../routing/lib/services/routing.ts           |  24 +-
 .../routing/lib/system/route-info.ts          |   4 +-
 .../-internals/routing/lib/system/route.ts    | 605 +++++++++---------
 .../-internals/routing/lib/system/router.ts   | 141 ++--
 .../routing/lib/system/router_state.ts        |  22 +-
 .../@ember/-internals/routing/lib/utils.ts    |  54 +-
 .../controller/lib/controller_mixin.d.ts      |   5 +-
 .../{auto-location.js => auto-location.ts}    |   0
 .../{hash-location.js => hash-location.ts}    |   0
 packages/@ember/routing/location.js           |   1 -
 packages/@ember/routing/location.ts           |   1 +
 .../{none-location.js => none-location.ts}    |   0
 .../@ember/routing/{route.js => route.ts}     |   0
 packages/@ember/routing/router-service.ts     |   5 +
 .../@ember/routing/{router.js => router.ts}   |   0
 .../routing/type-tests/auto-location.test.ts  |  10 +
 .../routing/type-tests/hash-location.test.ts  |  10 +
 .../type-tests/history-location.test.ts       |  10 +
 .../@ember/routing/type-tests/link-to.test.ts |   6 +
 .../routing/type-tests/location.test.ts       |  40 ++
 .../routing/type-tests/none-location.test.ts  |  10 +
 .../routing/type-tests/route/index.test.ts    |  72 +++
 .../type-tests/route/overrides.test.ts        |  47 ++
 .../type-tests/route/query-params.test.ts     |  34 +
 .../routing/type-tests/route/send.test.ts     |  30 +
 .../routing/type-tests/router-service.test.ts |  94 +++
 .../routing/type-tests/router/index.test.ts   |  44 ++
 .../routing/type-tests/router/map.test.ts     |  26 +
 yarn.lock                                     |   8 +-
 34 files changed, 1018 insertions(+), 539 deletions(-)
 rename packages/@ember/routing/{auto-location.js => auto-location.ts} (100%)
 rename packages/@ember/routing/{hash-location.js => hash-location.ts} (100%)
 delete mode 100644 packages/@ember/routing/location.js
 create mode 100644 packages/@ember/routing/location.ts
 rename packages/@ember/routing/{none-location.js => none-location.ts} (100%)
 rename packages/@ember/routing/{route.js => route.ts} (100%)
 create mode 100644 packages/@ember/routing/router-service.ts
 rename packages/@ember/routing/{router.js => router.ts} (100%)
 create mode 100644 packages/@ember/routing/type-tests/auto-location.test.ts
 create mode 100644 packages/@ember/routing/type-tests/hash-location.test.ts
 create mode 100644 packages/@ember/routing/type-tests/history-location.test.ts
 create mode 100644 packages/@ember/routing/type-tests/link-to.test.ts
 create mode 100644 packages/@ember/routing/type-tests/location.test.ts
 create mode 100644 packages/@ember/routing/type-tests/none-location.test.ts
 create mode 100644 packages/@ember/routing/type-tests/route/index.test.ts
 create mode 100644 packages/@ember/routing/type-tests/route/overrides.test.ts
 create mode 100644 packages/@ember/routing/type-tests/route/query-params.test.ts
 create mode 100644 packages/@ember/routing/type-tests/route/send.test.ts
 create mode 100644 packages/@ember/routing/type-tests/router-service.test.ts
 create mode 100644 packages/@ember/routing/type-tests/router/index.test.ts
 create mode 100644 packages/@ember/routing/type-tests/router/map.test.ts

diff --git a/package.json b/package.json
index 8f0c3474bb8..5596e5ed596 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^7.3.0",
+    "router_js": "^8.0.1",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index a6d20a973b1..17aa8eeb239 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,5 +1,5 @@
 import { Owner } from '@ember/-internals/owner';
-import { RouterState, RoutingService } from '@ember/-internals/routing';
+import { Route, RouterState, RoutingService } from '@ember/-internals/routing';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { EngineInstance, getEngineParent } from '@ember/engine';
@@ -274,7 +274,7 @@ class LinkTo extends InternalComponent {
     return 'LinkTo';
   }
 
-  @service('-routing') private declare routing: RoutingService;
+  @service('-routing') private declare routing: RoutingService<Route>;
 
   validateArguments(): void {
     assert(
@@ -466,12 +466,12 @@ class LinkTo extends InternalComponent {
   }
 
   private get isActive(): boolean {
-    return this.isActiveForState(this.routing.currentState as Maybe<RouterState>);
+    return this.isActiveForState(this.routing.currentState as Maybe<RouterState<Route>>);
   }
 
   private get willBeActive(): Option<boolean> {
-    let current = this.routing.currentState as Maybe<RouterState>;
-    let target = this.routing.targetState as Maybe<RouterState>;
+    let current = this.routing.currentState as Maybe<RouterState<Route>>;
+    let target = this.routing.targetState as Maybe<RouterState<Route>>;
 
     if (current === target) {
       return null;
@@ -525,7 +525,7 @@ class LinkTo extends InternalComponent {
     }
   }
 
-  private isActiveForState(state: Maybe<RouterState>): boolean {
+  private isActiveForState(state: Maybe<RouterState<Route>>): boolean {
     if (!isPresent(state)) {
       return false;
     }
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index ba9956e5375..b36670bb8a6 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,7 +1,7 @@
 // ES6TODO: Cleanup modules with side-effects below
 import './lib/ext/controller';
 
-export { default as Location } from './lib/location/api';
+export { default as Location, EmberLocation } from './lib/location/api';
 export { default as NoneLocation } from './lib/location/none_location';
 export { default as HashLocation } from './lib/location/hash_location';
 export { default as HistoryLocation } from './lib/location/history_location';
@@ -17,6 +17,10 @@ export { default as Router, QueryParam } from './lib/system/router';
 export { default as Route } from './lib/system/route';
 export { default as QueryParams } from './lib/system/query_params';
 export { default as RoutingService } from './lib/services/routing';
-export { default as RouterService } from './lib/services/router';
+export {
+  default as RouterService,
+  RouteInfo,
+  RouteInfoWithAttributes,
+} from './lib/services/router';
 export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index f4f1439757c..71b42e4e517 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -3,7 +3,7 @@ import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
 import { Transition } from 'router_js';
-import { Router } from '../..';
+import { Route, Router } from '../..';
 import { deprecateTransitionMethods, prefixRouteNameArg, RouteArgs } from '../utils';
 
 /**
@@ -168,7 +168,7 @@ ControllerMixin.reopen({
       attempted transition
     @public
   */
-  transitionToRoute(...args: RouteArgs): Transition {
+  transitionToRoute<R extends Route>(...args: RouteArgs<R>): Transition {
     deprecateTransitionMethods('controller', 'transitionToRoute');
 
     // target may be either another controller or a router
@@ -177,7 +177,7 @@ ControllerMixin.reopen({
     // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
     // mock out an object that only has the single method. Since this is deprecated, I think it's
     // ok to be a little less than proper here.
-    let method = (target as Controller).transitionToRoute ?? (target as Router).transitionTo;
+    let method = (target as Controller).transitionToRoute ?? (target as Router<R>).transitionTo;
 
     return method.apply(target, prefixRouteNameArg(this, args));
   },
@@ -245,7 +245,7 @@ ControllerMixin.reopen({
     @public
   */
 
-  replaceRoute(...args: RouteArgs): Transition {
+  replaceRoute<R extends Route>(...args: RouteArgs<R>): Transition {
     deprecateTransitionMethods('controller', 'replaceRoute');
     // target may be either another controller or a router
     let target = get(this, 'target');
@@ -253,7 +253,7 @@ ControllerMixin.reopen({
     // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
     // mock out an object that only has the single method. Since this is deprecated, I think it's
     // ok to be a little less than proper here.
-    let method = (target as Controller).replaceRoute ?? (target as Router).replaceWith;
+    let method = (target as Controller).replaceRoute ?? (target as Router<R>).replaceWith;
 
     return method.apply(target, prefixRouteNameArg(this, args));
   },
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index d39e69dd6dd..287344dd129 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -6,10 +6,11 @@ import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
-import { Transition } from 'router_js';
+import { ModelFor, Transition } from 'router_js';
 import Route from '../system/route';
 import EmberRouter from '../system/router';
-import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
+import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
+import { extractRouteArgs, resemblesURL, RouteArgs, RouteOptions, shallowEqual } from '../utils';
 
 const ROUTER = (symbol('ROUTER') as unknown) as string;
 
@@ -53,11 +54,9 @@ function cleanURL(url: string, rootURL: string) {
    @class RouterService
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface RouterService extends Evented {}
-class RouterService extends Service.extend(Evented) {
-  declare rootURL: EmberRouter['rootURL'];
-
-  get _router(): EmberRouter {
+interface RouterService<R extends Route> extends Evented {}
+class RouterService<R extends Route> extends Service.extend(Evented) {
+  get _router(): EmberRouter<R> {
     let router = this[ROUTER];
     if (router !== undefined) {
       return router;
@@ -65,7 +64,7 @@ class RouterService extends Service.extend(Evented) {
     let owner = getOwner(this);
     assert('RouterService is unexpectedly missing an owner', owner);
 
-    router = owner.lookup('router:main') as EmberRouter;
+    router = owner.lookup('router:main') as EmberRouter<R>;
     return (this[ROUTER] = router);
   }
 
@@ -120,14 +119,7 @@ class RouterService extends Service.extend(Evented) {
        attempted transition
      @public
    */
-  transitionTo(
-    routeNameOrURL: string,
-    ...modelsAndOptions: [...any[], Record<string, unknown>]
-  ): Transition;
-  transitionTo(routeNameOrURL: string, ...models: any[]): Transition;
-  transitionTo(...modelsAndOptions: [...any[], Record<string, unknown>]): Transition;
-  transitionTo(...models: any[]): Transition;
-  transitionTo(...args: (string | any | Record<string, unknown>)[]): Transition {
+  transitionTo(...args: RouteArgs<R>): Transition {
     if (resemblesURL(args[0])) {
       // NOTE: this `args[0] as string` cast is safe and TS correctly infers it
       // in 3.6+, so it can be removed when TS is upgraded.
@@ -177,8 +169,8 @@ class RouterService extends Service.extend(Evented) {
        attempted transition
      @public
    */
-  replaceWith(/* routeNameOrUrl, ...models, options */) {
-    return this.transitionTo(...arguments).method('replace');
+  replaceWith(...args: RouteArgs<R>): Transition {
+    return this.transitionTo(...args).method('replace');
   }
 
   /**
@@ -243,14 +235,13 @@ class RouterService extends Service.extend(Evented) {
 
      @method urlFor
      @param {String} routeName the name of the route
-     @param {...Object} models the model(s) or identifier(s) to be used while
-       transitioning to the route.
+     @param {...Object} models the model(s) for the route.
      @param {Object} [options] optional hash with a queryParams property
        containing a mapping of query parameters
      @return {String} the string representing the generated URL
      @public
    */
-  urlFor(routeName: string, ...args: any[]) {
+  urlFor(routeName: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]) {
     this._router.setupRouter();
     return this._router.generate(routeName, ...args);
   }
@@ -302,7 +293,7 @@ class RouterService extends Service.extend(Evented) {
      @return {boolean} true if the provided routeName/models/queryParams are active
      @public
    */
-  isActive(...args: any[]) {
+  isActive(...args: RouteArgs<R>) {
     let { routeName, models, queryParams } = extractRouteArgs(args);
     let routerMicrolib = this._router._routerMicrolib;
 
@@ -377,9 +368,10 @@ class RouterService extends Service.extend(Evented) {
 
       @method recognize
       @param {String} url
+      @return {RouteInfo | null}
       @public
     */
-  recognize(url: string) {
+  recognize(url: string): RouteInfo | null {
     assert(
       `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
       url.indexOf(this.rootURL) === 0
@@ -398,9 +390,10 @@ class RouterService extends Service.extend(Evented) {
 
       @method recognizeAndLoad
       @param {String} url
+      @return {RouteInfo}
       @public
    */
-  recognizeAndLoad(url: string) {
+  recognizeAndLoad(url: string): Promise<RouteInfoWithAttributes> {
     assert(
       `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
       url.indexOf(this.rootURL) === 0
@@ -487,101 +480,103 @@ class RouterService extends Service.extend(Evented) {
     @param {Transition} transition
     @public
   */
-}
 
-if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
-  RouterService.reopen({
-    /**
-     * Refreshes all currently active routes, doing a full transition.
-     * If a route name is provided and refers to a currently active route,
-     * it will refresh only that route and its descendents.
-     * Returns a promise that will be resolved once the refresh is complete.
-     * All resetController, beforeModel, model, afterModel, redirect, and setupController
-     * hooks will be called again. You will get new data from the model hook.
-     *
-     * @method refresh
-     * @param {String} [routeName] the route to refresh (along with all child routes)
-     * @return Transition
-     * @category EMBER_ROUTING_ROUTER_SERVICE_REFRESH
-     * @public
-     */
-    refresh(pivotRouteName?: string) {
-      if (!pivotRouteName) {
-        return this._router._routerMicrolib.refresh();
-      }
+  // Canary features
+  /**
+   * Refreshes all currently active routes, doing a full transition.
+   * If a route name is provided and refers to a currently active route,
+   * it will refresh only that route and its descendents.
+   * Returns a promise that will be resolved once the refresh is complete.
+   * All resetController, beforeModel, model, afterModel, redirect, and setupController
+   * hooks will be called again. You will get new data from the model hook.
+   *
+   * @method refresh
+   * @param {String} [routeName] the route to refresh (along with all child routes)
+   * @return Transition
+   * @category EMBER_ROUTING_ROUTER_SERVICE_REFRESH
+   * @public
+   */
+  refresh = EMBER_ROUTING_ROUTER_SERVICE_REFRESH
+    ? function (this: RouterService<Route>, pivotRouteName?: string): Transition {
+        if (!pivotRouteName) {
+          return this._router._routerMicrolib.refresh();
+        }
 
-      assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
-      assert(
-        `The route "${pivotRouteName}" is currently not active`,
-        this.isActive(pivotRouteName)
-      );
+        assert(
+          `The route "${pivotRouteName}" was not found`,
+          this._router.hasRoute(pivotRouteName)
+        );
+        assert(
+          `The route "${pivotRouteName}" is currently not active`,
+          this.isActive(pivotRouteName)
+        );
 
-      let owner = getOwner(this);
-      assert('RouterService is unexpectedly missing an owner', owner);
-      let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
+        let owner = getOwner(this);
+        assert('RouterService is unexpectedly missing an owner', owner);
+        let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
 
-      return this._router._routerMicrolib.refresh(pivotRoute);
-    },
-  });
-}
+        return this._router._routerMicrolib.refresh(pivotRoute);
+      }
+    : undefined;
 
-RouterService.reopen({
   /**
-     Name of the current route.
-
-     This property represents the logical name of the route,
-     which is comma separated.
-     For the following router:
-
-     ```app/router.js
-     Router.map(function() {
-       this.route('about');
-       this.route('blog', function () {
-         this.route('post', { path: ':post_id' });
-       });
-     });
-     ```
+   Name of the current route.
 
-     It will return:
+    This property represents the logical name of the route,
+    which is comma separated.
+    For the following router:
 
-     * `index` when you visit `/`
-     * `about` when you visit `/about`
-     * `blog.index` when you visit `/blog`
-     * `blog.post` when you visit `/blog/some-post-id`
+    ```app/router.js
+    Router.map(function() {
+      this.route('about');
+      this.route('blog', function () {
+        this.route('post', { path: ':post_id' });
+      });
+    });
+    ```
 
-     @property currentRouteName
-     @type String
-     @public
-   */
-  currentRouteName: readOnly('_router.currentRouteName'),
+    It will return:
+
+    * `index` when you visit `/`
+    * `about` when you visit `/about`
+    * `blog.index` when you visit `/blog`
+    * `blog.post` when you visit `/blog/some-post-id`
+
+    @property currentRouteName
+    @type {String | null}
+    @public
+  */
+  @readOnly('_router.currentRouteName')
+  declare readonly currentRouteName: this['_router']['currentRouteName'];
 
   /**
-     Current URL for the application.
+   Current URL for the application.
 
-    This property represents the URL path for this route.
-    For the following router:
+  This property represents the URL path for this route.
+  For the following router:
 
-     ```app/router.js
-     Router.map(function() {
-       this.route('about');
-       this.route('blog', function () {
-         this.route('post', { path: ':post_id' });
-       });
-     });
-     ```
+    ```app/router.js
+    Router.map(function() {
+      this.route('about');
+      this.route('blog', function () {
+        this.route('post', { path: ':post_id' });
+      });
+    });
+    ```
 
-     It will return:
+    It will return:
 
-     * `/` when you visit `/`
-     * `/about` when you visit `/about`
-     * `/blog` when you visit `/blog`
-     * `/blog/some-post-id` when you visit `/blog/some-post-id`
+    * `/` when you visit `/`
+    * `/about` when you visit `/about`
+    * `/blog` when you visit `/blog`
+    * `/blog/some-post-id` when you visit `/blog/some-post-id`
 
-     @property currentURL
-     @type String
-     @public
-   */
-  currentURL: readOnly('_router.currentURL'),
+    @property currentURL
+    @type String
+    @public
+  */
+  @readOnly('_router.currentURL')
+  declare readonly currentURL: this['_router']['currentURL'];
 
   /**
     The `location` property returns what implementation of the `location` API
@@ -620,7 +615,8 @@ RouterService.reopen({
     @see {Location}
     @public
   */
-  location: readOnly('_router.location'),
+  @readOnly('_router.location')
+  declare readonly location: this['_router']['location'];
 
   /**
     The `rootURL` property represents the URL of the root of
@@ -649,7 +645,8 @@ RouterService.reopen({
     @default '/'
     @public
   */
-  rootURL: readOnly('_router.rootURL'),
+  @readOnly('_router.rootURL')
+  declare readonly rootURL: this['_router']['rootURL'];
 
   /**
     The `currentRoute` property contains metadata about the current leaf route.
@@ -675,11 +672,12 @@ RouterService.reopen({
       });
     ```
 
-     @property currentRoute
-     @type RouteInfo
-     @public
-   */
-  currentRoute: readOnly('_router.currentRoute'),
-});
+    @property currentRoute
+    @type RouteInfo
+    @public
+  */
+  @readOnly('_router.currentRoute')
+  declare readonly currentRoute: this['_router']['currentRoute'];
+}
 
-export default RouterService;
+export { RouterService as default, RouteInfo, RouteInfoWithAttributes };
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 57048916514..837321f0270 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -7,6 +7,8 @@ import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
+import { ModelFor } from 'router_js';
+import { Route } from '../..';
 import EmberRouter from '../system/router';
 import RouterState from '../system/router_state';
 
@@ -22,13 +24,13 @@ const ROUTER = (symbol('ROUTER') as unknown) as string;
   @private
   @class RoutingService
 */
-export default class RoutingService extends Service {
+export default class RoutingService<R extends Route> extends Service {
   declare targetState: EmberRouter['targetState'];
   declare currentState: EmberRouter['currentState'];
   declare currentRouteName: EmberRouter['currentRouteName'];
   declare currentPath: EmberRouter['currentPath'];
 
-  get router(): EmberRouter {
+  get router(): EmberRouter<R> {
     let router = this[ROUTER];
     if (router !== undefined) {
       return router;
@@ -36,7 +38,7 @@ export default class RoutingService extends Service {
     let owner = getOwner(this);
     assert('RoutingService is unexpectedly missing an owner', owner);
 
-    router = owner.lookup('router:main') as EmberRouter;
+    router = owner.lookup('router:main') as EmberRouter<R>;
     router.setupRouter();
     return (this[ROUTER] = router);
   }
@@ -47,7 +49,7 @@ export default class RoutingService extends Service {
 
   transitionTo(
     routeName: string,
-    models: {}[],
+    models: ModelFor<R>[],
     queryParams: Record<string, unknown>,
     shouldReplace: boolean
   ) {
@@ -60,11 +62,15 @@ export default class RoutingService extends Service {
     return transition;
   }
 
-  normalizeQueryParams(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
+  normalizeQueryParams(
+    routeName: string,
+    models: ModelFor<R>[],
+    queryParams: Record<string, unknown>
+  ) {
     this.router._prepareQueryParams(routeName, models, queryParams);
   }
 
-  _generateURL(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
+  _generateURL(routeName: string, models: ModelFor<R>[], queryParams: Record<string, unknown>) {
     let visibleQueryParams = {};
     if (queryParams) {
       Object.assign(visibleQueryParams, queryParams);
@@ -76,7 +82,7 @@ export default class RoutingService extends Service {
     });
   }
 
-  generateURL(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
+  generateURL(routeName: string, models: ModelFor<R>[], queryParams: Record<string, unknown>) {
     if (this.router._initialTransitionStarted) {
       return this._generateURL(routeName, models, queryParams);
     } else {
@@ -91,10 +97,10 @@ export default class RoutingService extends Service {
   }
 
   isActiveForRoute(
-    contexts: {}[],
+    contexts: ModelFor<R>[],
     queryParams: Record<string, unknown> | undefined,
     routeName: string,
-    routerState: RouterState
+    routerState: RouterState<R>
   ): boolean {
     let handlers = this.router._routerMicrolib.recognizer.handlersFor(routeName);
     let leafName = handlers[handlers.length - 1].handler;
diff --git a/packages/@ember/-internals/routing/lib/system/route-info.ts b/packages/@ember/-internals/routing/lib/system/route-info.ts
index afc521047d5..538f4a352ad 100644
--- a/packages/@ember/-internals/routing/lib/system/route-info.ts
+++ b/packages/@ember/-internals/routing/lib/system/route-info.ts
@@ -1,3 +1,5 @@
+export { RouteInfo, RouteInfoWithAttributes } from 'router_js';
+
 /**
   A `RouteInfoWithAttributes` is an object that contains
   metadata, including the resolved value from the routes
@@ -54,7 +56,7 @@
 /**
   This is the resolved return value from the
   route's model hook.
-  @property {Object|Array|String} attributes
+  @property {Object|Array|String|undefined} attributes
   @public
 */
 
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index dba89a141af..6084873ff3a 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -29,6 +29,8 @@ import { DEBUG } from '@glimmer/env';
 import { Template, TemplateFactory } from '@glimmer/interfaces';
 import {
   InternalRouteInfo,
+  IModel,
+  ModelFor,
   PARAMS_SYMBOL,
   Route as IRoute,
   STATE_SYMBOL,
@@ -59,44 +61,17 @@ export type QueryParamMeta = {
   };
 };
 
-type RouteTransitionState = TransitionState<Route> & {
+type RouteTransitionState<R extends Route> = TransitionState<R> & {
   fullQueryParams?: Record<string, unknown>;
   queryParamsFor?: Record<string, Record<string, unknown>>;
 };
 
+type MaybeParameters<T> = T extends (...args: any[]) => any ? Parameters<T> : unknown[];
+type MaybeReturnType<T> = T extends (...args: any[]) => any ? ReturnType<T> : unknown;
+
 export const ROUTE_CONNECTIONS = new WeakMap();
 const RENDER = (symbol('render') as unknown) as string;
 
-export function defaultSerialize(
-  model: {},
-  params: string[]
-): { [key: string]: unknown } | undefined {
-  if (params.length < 1 || !model) {
-    return;
-  }
-
-  let object = {};
-  if (params.length === 1) {
-    let [name] = params;
-    assert('has name', name);
-    if (name in model) {
-      object[name] = get(model, name);
-    } else if (/_id$/.test(name)) {
-      object[name] = get(model, 'id');
-    } else if (isProxy(model)) {
-      object[name] = get(model, name);
-    }
-  } else {
-    object = getProperties(model, params);
-  }
-
-  return object;
-}
-
-export function hasDefaultSerialize(route: Route): boolean {
-  return route.serialize === defaultSerialize;
-}
-
 /**
 @module @ember/routing
 */
@@ -112,12 +87,184 @@ export function hasDefaultSerialize(route: Route): boolean {
   @since 1.0.0
   @public
 */
+interface Route<T extends IModel = {}> extends IRoute<T> {
+  /**
+    The `willTransition` action is fired at the beginning of any
+    attempted transition with a `Transition` object as the sole
+    argument. This action can be used for aborting, redirecting,
+    or decorating the transition from the currently active routes.
+
+    A good example is preventing navigation when a form is
+    half-filled out:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ContactFormRoute extends Route {
+      @action
+      willTransition(transition) {
+        if (this.controller.get('userHasEnteredData')) {
+          this.controller.displayNavigationConfirm();
+          transition.abort();
+        }
+      }
+    }
+    ```
+
+    You can also redirect elsewhere by calling
+    `this.transitionTo('elsewhere')` from within `willTransition`.
+    Note that `willTransition` will not be fired for the
+    redirecting `transitionTo`, since `willTransition` doesn't
+    fire when there is already a transition underway. If you want
+    subsequent `willTransition` actions to fire for the redirecting
+    transition, you must first explicitly call
+    `transition.abort()`.
+
+    To allow the `willTransition` event to continue bubbling to the parent
+    route, use `return true;`. When the `willTransition` method has a
+    return value of `true` then the parent route's `willTransition` method
+    will be fired, enabling "bubbling" behavior for the event.
+
+    @event willTransition
+    @param {Transition} transition
+    @since 1.0.0
+    @public
+  */
+  willTransition?(transition: Transition): boolean | void;
+
+  /**
+    The `didTransition` action is fired after a transition has
+    successfully been completed. This occurs after the normal model
+    hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
+    have resolved. The `didTransition` action has no arguments,
+    however, it can be useful for tracking page views or resetting
+    state on the controller.
+
+    ```app/routes/login.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class LoginRoute extends Route {
+      @action
+      didTransition() {
+        this.controller.get('errors.base').clear();
+        return true; // Bubble the didTransition event
+      }
+    }
+    ```
+
+    @event didTransition
+    @since 1.2.0
+    @public
+  */
+  didTransition?(): boolean | void;
+
+  /**
+    The `loading` action is fired on the route when a route's `model`
+    hook returns a promise that is not already resolved. The current
+    `Transition` object is the first parameter and the route that
+    triggered the loading event is the second parameter.
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ApplicationRoute extends Route {
+      @action
+      loading(transition, route) {
+        let controller = this.controllerFor('foo');
+
+        // The controller may not be instantiated when initially loading
+        if (controller) {
+          controller.currentlyLoading = true;
+
+          transition.finally(function() {
+            controller.currentlyLoading = false;
+          });
+        }
+      }
+    }
+    ```
+
+    @event loading
+    @param {Transition} transition
+    @param {Route} route The route that triggered the loading event
+    @since 1.2.0
+    @public
+  */
+  loading?(transition: Transition, route: Route): boolean | void;
+
+  /**
+    When attempting to transition into a route, any of the hooks
+    may return a promise that rejects, at which point an `error`
+    action will be fired on the partially-entered routes, allowing
+    for per-route error handling logic, or shared error handling
+    logic defined on a parent route.
+
+    Here is an example of an error handler that will be invoked
+    for rejected promises from the various hooks on the route,
+    as well as any unhandled errors from child routes:
+
+    ```app/routes/admin.js
+    import { reject } from 'rsvp';
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class AdminRoute extends Route {
+      beforeModel() {
+        return reject('bad things!');
+      }
+
+      @action
+      error(error, transition) {
+        // Assuming we got here due to the error in `beforeModel`,
+        // we can expect that error === "bad things!",
+        // but a promise model rejecting would also
+        // call this hook, as would any errors encountered
+        // in `afterModel`.
+
+        // The `error` hook is also provided the failed
+        // `transition`, which can be stored and later
+        // `.retry()`d if desired.
+
+        this.transitionTo('login');
+      }
+    }
+    ```
+
+    `error` actions that bubble up all the way to `ApplicationRoute`
+    will fire a default error handler that logs the error. You can
+    specify your own global default error handler by overriding the
+    `error` handler on `ApplicationRoute`:
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ApplicationRoute extends Route {
+      @action
+      error(error, transition) {
+        this.controllerFor('banner').displayError(error.message);
+      }
+    }
+    ```
+    @event error
+    @param {Error} error
+    @param {Transition} transition
+    @since 1.0.0
+    @public
+  */
+  error?(error: Error, transition: Transition): boolean | void;
+}
 
-class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute, Evented {
+class Route<T extends IModel = {}>
+  extends EmberObject.extend(ActionHandler, Evented)
+  implements IRoute, Evented {
   static isRouteFactory = true;
 
-  context: {} = {};
-  currentModel: unknown;
+  context = {} as T;
+  declare currentModel: T;
 
   _bucketCache!: BucketCache;
   _internalName!: string;
@@ -154,14 +301,73 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
   declare has: (name: string) => boolean;
 
-  serialize!: (
-    model: {},
-    params: string[]
-  ) =>
-    | {
-        [key: string]: unknown;
+  /**
+    A hook you can implement to convert the route's model into parameters
+    for the URL.
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('post', { path: '/posts/:post_id' });
+    });
+
+    ```
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+
+    export default class PostRoute extends Route {
+      model({ post_id }) {
+        // the server returns `{ id: 12 }`
+        return fetch(`/posts/${post_id}`;
+      }
+
+      serialize(model) {
+        // this will make the URL `/posts/12`
+        return { post_id: model.id };
       }
-    | undefined;
+    }
+    ```
+
+    The default `serialize` method will insert the model's `id` into the
+    route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+    If the route has multiple dynamic segments or does not contain '_id', `serialize`
+    will return `getProperties(model, params)`
+
+    This method is called when `transitionTo` is called with a context
+    in order to populate the URL.
+
+    @method serialize
+    @param {Object} model the routes model
+    @param {Array} params an Array of parameter names for the current
+      route (in the example, `['post_id']`.
+    @return {Object} the serialized parameters
+    @since 1.0.0
+    @public
+  */
+  serialize(model: T | undefined, params: string[]): { [key: string]: unknown } | undefined {
+    if (params.length < 1 || !model) {
+      return;
+    }
+
+    let object = {};
+    if (params.length === 1) {
+      let [name] = params;
+      assert('has name', name);
+      if (name in model) {
+        object[name] = get(model, name);
+      } else if (/_id$/.test(name)) {
+        object[name] = get(model, 'id');
+      } else if (isProxy(model)) {
+        object[name] = get(model, name);
+      }
+    } else {
+      object = getProperties(model, params);
+    }
+
+    return object;
+  }
 
   /**
     Configuration hash for this route's queryParams. The possible
@@ -364,7 +570,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     }
 
     // SAFETY: Since `_qp` is protected we can't infer the type
-    let qps = (get(this, '_qp') as Route['_qp']).qps;
+    let qps = (get(this, '_qp') as Route<T>['_qp']).qps;
 
     let namePaths = new Array(names.length);
     for (let a = 0; a < names.length; ++a) {
@@ -450,7 +656,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.4.0
     @public
   */
-  paramsFor(name: string) {
+  paramsFor(name: string): Record<string, unknown> {
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
     let route = owner.lookup<Route>(`route:${name}`);
@@ -558,7 +764,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.7.0
     @public
   */
-  resetController(_controller: any, _isExiting: boolean, _transition: Transition) {
+  resetController(_controller: Controller, _isExiting: boolean, _transition: Transition) {
     return this;
   }
 
@@ -582,7 +788,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
   _internalReset(isExiting: boolean, transition: Transition) {
     let controller = this.controller;
     // SAFETY: Since `_qp` is protected we can't infer the type
-    controller['_qpDelegate'] = (get(this, '_qp') as Route['_qp']).states.inactive;
+    controller['_qpDelegate'] = (get(this, '_qp') as Route<T>['_qp']).states.inactive;
 
     this.resetController(controller, isExiting, transition);
   }
@@ -598,171 +804,6 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     this.trigger('activate', transition);
   }
 
-  /**
-    The `willTransition` action is fired at the beginning of any
-    attempted transition with a `Transition` object as the sole
-    argument. This action can be used for aborting, redirecting,
-    or decorating the transition from the currently active routes.
-
-    A good example is preventing navigation when a form is
-    half-filled out:
-
-    ```app/routes/contact-form.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ContactFormRoute extends Route {
-      @action
-      willTransition(transition) {
-        if (this.controller.get('userHasEnteredData')) {
-          this.controller.displayNavigationConfirm();
-          transition.abort();
-        }
-      }
-    }
-    ```
-
-    You can also redirect elsewhere by calling
-    `this.transitionTo('elsewhere')` from within `willTransition`.
-    Note that `willTransition` will not be fired for the
-    redirecting `transitionTo`, since `willTransition` doesn't
-    fire when there is already a transition underway. If you want
-    subsequent `willTransition` actions to fire for the redirecting
-    transition, you must first explicitly call
-    `transition.abort()`.
-
-    To allow the `willTransition` event to continue bubbling to the parent
-    route, use `return true;`. When the `willTransition` method has a
-    return value of `true` then the parent route's `willTransition` method
-    will be fired, enabling "bubbling" behavior for the event.
-
-    @event willTransition
-    @param {Transition} transition
-    @since 1.0.0
-    @public
-  */
-
-  /**
-    The `didTransition` action is fired after a transition has
-    successfully been completed. This occurs after the normal model
-    hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
-    have resolved. The `didTransition` action has no arguments,
-    however, it can be useful for tracking page views or resetting
-    state on the controller.
-
-    ```app/routes/login.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class LoginRoute extends Route {
-      @action
-      didTransition() {
-        this.controller.get('errors.base').clear();
-        return true; // Bubble the didTransition event
-      }
-    }
-    ```
-
-    @event didTransition
-    @since 1.2.0
-    @public
-  */
-
-  /**
-    The `loading` action is fired on the route when a route's `model`
-    hook returns a promise that is not already resolved. The current
-    `Transition` object is the first parameter and the route that
-    triggered the loading event is the second parameter.
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      loading(transition, route) {
-        let controller = this.controllerFor('foo');
-
-        // The controller may not be instantiated when initially loading
-        if (controller) {
-          controller.currentlyLoading = true;
-
-          transition.finally(function() {
-            controller.currentlyLoading = false;
-          });
-        }
-      }
-    }
-    ```
-
-    @event loading
-    @param {Transition} transition
-    @param {Route} route The route that triggered the loading event
-    @since 1.2.0
-    @public
-  */
-
-  /**
-    When attempting to transition into a route, any of the hooks
-    may return a promise that rejects, at which point an `error`
-    action will be fired on the partially-entered routes, allowing
-    for per-route error handling logic, or shared error handling
-    logic defined on a parent route.
-
-    Here is an example of an error handler that will be invoked
-    for rejected promises from the various hooks on the route,
-    as well as any unhandled errors from child routes:
-
-    ```app/routes/admin.js
-    import { reject } from 'rsvp';
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class AdminRoute extends Route {
-      beforeModel() {
-        return reject('bad things!');
-      }
-
-      @action
-      error(error, transition) {
-        // Assuming we got here due to the error in `beforeModel`,
-        // we can expect that error === "bad things!",
-        // but a promise model rejecting would also
-        // call this hook, as would any errors encountered
-        // in `afterModel`.
-
-        // The `error` hook is also provided the failed
-        // `transition`, which can be stored and later
-        // `.retry()`d if desired.
-
-        this.transitionTo('login');
-      }
-    }
-    ```
-
-    `error` actions that bubble up all the way to `ApplicationRoute`
-    will fire a default error handler that logs the error. You can
-    specify your own global default error handler by overriding the
-    `error` handler on `ApplicationRoute`:
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      error(error, transition) {
-        this.controllerFor('banner').displayError(error.message);
-      }
-    }
-    ```
-    @event error
-    @param {Error} error
-    @param {Transition} transition
-    @since 1.0.0
-    @public
-  */
-
   /**
     This event is triggered when the router enters the route. It is
     not executed when the model for the route changes.
@@ -1018,7 +1059,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @deprecated Use transitionTo from the Router service instead.
     @public
   */
-  transitionTo(...args: RouteArgs) {
+  transitionTo(...args: RouteArgs<this>): Transition {
     deprecateTransitionMethods('route', 'transitionTo');
     return this._router.transitionTo(...prefixRouteNameArg(this, args));
   }
@@ -1040,7 +1081,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.2.0
     @public
    */
-  intermediateTransitionTo(...args: NamedRouteArgs) {
+  intermediateTransitionTo(...args: NamedRouteArgs<this>): void {
     let [name, ...preparedArgs] = prefixRouteNameArg(this, args);
     this._router.intermediateTransitionTo(name, ...preparedArgs);
   }
@@ -1067,7 +1108,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.4.0
     @public
    */
-  refresh() {
+  refresh(): Transition {
     return this._router._routerMicrolib.refresh(this);
   }
 
@@ -1114,7 +1155,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @deprecated Use replaceWith from the Router service instead.
     @public
   */
-  replaceWith(...args: any[]) {
+  replaceWith(...args: any[]): Transition {
     deprecateTransitionMethods('route', 'replaceWith');
     return this._router.replaceWith(...prefixRouteNameArg(this, args));
   }
@@ -1125,19 +1166,13 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @private
     @method setup
   */
-  setup(context: {}, transition: Transition) {
+  setup(context: T | undefined, transition: Transition) {
     let controllerName = this.controllerName || this.routeName;
     let definedController = this.controllerFor(controllerName, true);
-
-    let controller: any;
-    if (definedController) {
-      controller = definedController;
-    } else {
-      controller = this.generateController(controllerName);
-    }
+    let controller = definedController ?? this.generateController(controllerName);
 
     // SAFETY: Since `_qp` is protected we can't infer the type
-    let queryParams = get(this, '_qp') as Route['_qp'];
+    let queryParams = get(this, '_qp') as Route<T>['_qp'];
 
     // Assign the route's controller so that it can more easily be
     // referenced in action handlers. Side effects. Side effects everywhere.
@@ -1232,7 +1267,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
   */
-  beforeModel() {}
+  beforeModel(_transition: Transition): unknown | Promise<unknown>;
+  beforeModel(_transition: Transition): void {}
 
   /**
     This hook is called after this route's model has resolved.
@@ -1269,7 +1305,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
    */
-  afterModel() {}
+  afterModel(_resolvedModel: T | undefined, _transition: Transition): unknown | Promise<unknown>;
+  afterModel(_resolvedModel: T | undefined, _transition: Transition): void {}
 
   /**
     A hook you can implement to optionally redirect to another route.
@@ -1294,7 +1331,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
   */
-  redirect() {}
+  redirect(_model: T, _transition: Transition) {}
 
   /**
     Called when the context is changed by router.js.
@@ -1384,10 +1421,10 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
   */
-  model(params: {}, transition: Transition) {
+  model(params: Record<string, unknown>, transition: Transition): T | Promise<T> | undefined {
     let name, sawParams, value;
     // SAFETY: Since `_qp` is protected we can't infer the type
-    let queryParams = (get(this, '_qp') as Route['_qp']).map;
+    let queryParams = (get(this, '_qp') as Route<T>['_qp']).map;
 
     for (let prop in params) {
       if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -1404,12 +1441,18 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
     if (!name) {
       if (sawParams) {
-        return Object.assign({}, params);
+        // SAFETY: This should be equivalent
+        return Object.assign({}, params) as T;
       } else {
         if (transition.resolveIndex < 1) {
           return;
         }
-        return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1]!.context;
+        // SAFETY: These return types should be equivalent but router.js doesn't have enough
+        // generics to infer it.
+        return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1]!.context as
+          | T
+          | Promise<T>
+          | undefined;
       }
     }
 
@@ -1510,7 +1553,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
   */
-  setupController(controller: Controller, context: {}, _transition?: Transition) {
+  setupController(controller: Controller, context: T | undefined, _transition?: Transition) {
     if (controller && context !== undefined) {
       set(controller, 'model', context);
     }
@@ -1537,11 +1580,13 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
 
     @method controllerFor
     @param {String} name the name of the route or controller
-    @return {Controller}
+    @return {Controller | undefined}
     @since 1.0.0
     @public
   */
-  controllerFor(name: string, _skipAssert: boolean): Controller {
+  controllerFor(name: string, _skipAssert: true): Controller | undefined;
+  controllerFor(name: string, _skipAssert?: false): Controller;
+  controllerFor(name: string, _skipAssert = false): Controller | undefined {
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
     let route = owner.lookup<Route>(`route:${name}`);
@@ -1560,7 +1605,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       controller !== undefined || _skipAssert === true
     );
 
-    return controller!;
+    return controller;
   }
 
   /**
@@ -1633,7 +1678,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 1.0.0
     @public
   */
-  modelFor(_name: string) {
+  modelFor(_name: string): unknown | undefined {
     let name;
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
@@ -1660,7 +1705,7 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
       }
     }
 
-    return route && route.currentModel;
+    return route?.currentModel;
   }
 
   /**
@@ -1742,7 +1787,8 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @since 3.10.0
     @public
    */
-  buildRouteInfoMetadata() {}
+  buildRouteInfoMetadata(): unknown;
+  buildRouteInfoMetadata(): void {}
 
   private _paramsFor(routeName: string, params: {}) {
     let transition = this._router._routerMicrolib.activeTransition;
@@ -2003,7 +2049,14 @@ class Route extends EmberObject.extend(ActionHandler, Evented) implements IRoute
     @public
   */
   // Set with reopen to override parent behavior
-  declare send: (name: string, ...args: any[]) => unknown;
+  declare send: <K extends keyof this | keyof this['actions']>(
+    name: K,
+    ...args: MaybeParameters<
+      K extends keyof this ? this[K] : K extends keyof this['actions'] ? this['actions'][K] : never
+    >
+  ) => MaybeReturnType<
+    K extends keyof this ? this[K] : K extends keyof this['actions'] ? this['actions'][K] : never
+  >;
 }
 
 function parentRoute(route: Route) {
@@ -2145,7 +2198,10 @@ type PartialRenderOptions = Partial<
   Pick<RenderOptions, 'into' | 'outlet' | 'controller' | 'model'>
 >;
 
-export function getFullQueryParams(router: EmberRouter, state: RouteTransitionState) {
+export function getFullQueryParams<R extends Route>(
+  router: EmberRouter<R>,
+  state: RouteTransitionState<R>
+) {
   if (state.fullQueryParams) {
     return state.fullQueryParams;
   }
@@ -2168,7 +2224,10 @@ export function getFullQueryParams(router: EmberRouter, state: RouteTransitionSt
   return fullQueryParamsState;
 }
 
-function getQueryParamsFor(route: Route, state: RouteTransitionState): Record<string, unknown> {
+function getQueryParamsFor<R extends Route>(
+  route: R,
+  state: RouteTransitionState<R>
+): Record<string, unknown> {
   state.queryParamsFor = state.queryParamsFor || {};
   let name = route.fullRouteName;
 
@@ -2183,7 +2242,7 @@ function getQueryParamsFor(route: Route, state: RouteTransitionState): Record<st
 
   // Copy over all the query params for this route/controller into params hash.
   // SAFETY: Since `_qp` is protected we can't infer the type
-  let qps = (get(route, '_qp') as Route['_qp']).qps;
+  let qps = (get(route, '_qp') as Route<ModelFor<R>>['_qp']).qps;
   for (let qp of qps) {
     // Put deserialized qp on params hash.
     let qpValueWasPassedIn = qp.prop in fullQueryParams;
@@ -2287,52 +2346,13 @@ function getEngineRouteName(engine: Owner, routeName: string) {
   return routeName;
 }
 
-/**
-    A hook you can implement to convert the route's model into parameters
-    for the URL.
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('post', { path: '/posts/:post_id' });
-    });
-
-    ```
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
+const defaultSerialize = Route.prototype.serialize;
 
-    export default class PostRoute extends Route {
-      model({ post_id }) {
-        // the server returns `{ id: 12 }`
-        return fetch(`/posts/${post_id}`;
-      }
+export { defaultSerialize };
 
-      serialize(model) {
-        // this will make the URL `/posts/12`
-        return { post_id: model.id };
-      }
-    }
-    ```
-
-    The default `serialize` method will insert the model's `id` into the
-    route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-    If the route has multiple dynamic segments or does not contain '_id', `serialize`
-    will return `getProperties(model, params)`
-
-    This method is called when `transitionTo` is called with a context
-    in order to populate the URL.
-
-    @method serialize
-    @param {Object} model the routes model
-    @param {Array} params an Array of parameter names for the current
-      route (in the example, `['post_id']`.
-    @return {Object} the serialized parameters
-    @since 1.0.0
-    @public
-  */
-Route.prototype.serialize = defaultSerialize;
+export function hasDefaultSerialize(route: Route): boolean {
+  return route.serialize === defaultSerialize;
+}
 
 // Set these here so they can be overridden with extend
 Route.reopen({
@@ -2398,9 +2418,9 @@ Route.reopen({
     @returns {boolean}
     @private
    */
-    queryParamsDidChange(this: Route, changed: {}, _totalPresent: unknown, removed: {}) {
+    queryParamsDidChange<T>(this: Route<T>, changed: {}, _totalPresent: unknown, removed: {}) {
       // SAFETY: Since `_qp` is protected we can't infer the type
-      let qpMap = (get(this, '_qp') as Route['_qp']).map;
+      let qpMap = (get(this, '_qp') as Route<T>['_qp']).map;
 
       let totalChanged = Object.keys(changed).concat(Object.keys(removed));
       for (let change of totalChanged) {
@@ -2418,7 +2438,12 @@ Route.reopen({
       return true;
     },
 
-    finalizeQueryParamChange(this: Route, params: {}, finalParams: {}[], transition: Transition) {
+    finalizeQueryParamChange<T>(
+      this: Route<T>,
+      params: {},
+      finalParams: {}[],
+      transition: Transition
+    ) {
       if (this.fullRouteName !== 'application') {
         return true;
       }
@@ -2466,7 +2491,7 @@ Route.reopen({
         }
 
         // SAFETY: Since `_qp` is protected we can't infer the type
-        controller._qpDelegate = (get(route, '_qp') as Route['_qp']).states.inactive;
+        controller._qpDelegate = (get(route, '_qp') as Route<T>['_qp']).states.inactive;
 
         let thisQueryParamChanged = svalue !== qp.serializedValue;
         if (thisQueryParamChanged) {
@@ -2511,7 +2536,7 @@ Route.reopen({
 
       qpMeta.qps.forEach((qp: QueryParam) => {
         // SAFETY: Since `_qp` is protected we can't infer the type
-        let routeQpMeta = get(qp.route, '_qp') as Route['_qp'];
+        let routeQpMeta = get(qp.route, '_qp') as Route<T>['_qp'];
         let finalizedController = qp.route.controller;
         finalizedController['_qpDelegate'] = get(routeQpMeta, 'states.active');
       });
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 8f7b51b1cd9..a89af0dfc4f 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -17,8 +17,9 @@ import {
   getActiveTargetName,
   resemblesURL,
   RouteArgs,
+  RouteOptions,
 } from '../utils';
-import DSL from './dsl';
+import DSL, { DSLCallback } from './dsl';
 import Route, {
   defaultSerialize,
   getFullQueryParams,
@@ -33,10 +34,12 @@ import RouterState from './router_state';
 @module @ember/routing
 */
 
-import { MatchCallback } from 'route-recognizer';
 import Router, {
   InternalRouteInfo,
   logAbort,
+  ModelFor,
+  RouteInfo,
+  RouteInfoWithAttributes,
   STATE_SYMBOL,
   Transition,
   TransitionError,
@@ -44,7 +47,10 @@ import Router, {
 } from 'router_js';
 import { EngineRouteInfo } from './engines';
 
-function defaultDidTransition(this: EmberRouter, infos: PrivateRouteInfo[]) {
+function defaultDidTransition<R extends Route>(
+  this: EmberRouter<R>,
+  infos: InternalRouteInfo<R>[]
+) {
   updatePaths(this);
 
   this._cancelSlowTransitionTimer();
@@ -61,10 +67,10 @@ function defaultDidTransition(this: EmberRouter, infos: PrivateRouteInfo[]) {
   }
 }
 
-function defaultWillTransition(
-  this: EmberRouter,
-  oldInfos: PrivateRouteInfo[],
-  newInfos: PrivateRouteInfo[]
+function defaultWillTransition<R extends Route>(
+  this: EmberRouter<R>,
+  oldInfos: InternalRouteInfo<R>[],
+  newInfos: InternalRouteInfo<R>[]
 ) {
   if (DEBUG) {
     // @ts-expect-error namespace isn't public
@@ -128,8 +134,6 @@ export interface QueryParam {
   controllerName: string;
 }
 
-export type PrivateRouteInfo = InternalRouteInfo<Route>;
-
 function K(this: Router<Route>) {
   return this;
 }
@@ -145,7 +149,7 @@ const { slice } = Array.prototype;
   @uses Evented
   @public
 */
-class EmberRouter extends EmberObject.extend(Evented) implements Evented {
+class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) implements Evented {
   /**
    Represents the URL of the root of the application, often '/'. This prefix is
     assumed on all routes defined on this router.
@@ -178,14 +182,14 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   // Set with reopen to allow overriding via extend
   declare location: string | IEmberLocation;
 
-  _routerMicrolib!: Router<Route>;
+  _routerMicrolib!: Router<R>;
   _didSetupRouter = false;
   _initialTransitionStarted = false;
 
   currentURL: string | null = null;
   currentRouteName: string | null = null;
   currentPath: string | null = null;
-  currentRoute = null;
+  currentRoute: RouteInfo | RouteInfoWithAttributes | null = null;
 
   _qpCache: Record<string, { qps: QueryParam[]; map: QueryParamMeta['map'] }> = Object.create(null);
 
@@ -198,7 +202,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   _handledErrors = new Set();
   _engineInstances: Record<string, Record<string, EngineInstance>> = Object.create(null);
   _engineInfoByRoute = Object.create(null);
-  _routerService: RouterService;
+  _routerService: RouterService<R>;
 
   _slowTransitionTimer: unknown;
 
@@ -213,7 +217,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   // End Evented
 
   // Set with reopenClass
-  private static dslCallbacks?: MatchCallback[];
+  private static dslCallbacks?: DSLCallback[];
 
   /**
     The `Router.map` function allows you to define mappings from URLs to routes
@@ -253,7 +257,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param callback
     @public
   */
-  static map(callback: MatchCallback) {
+  static map(callback: DSLCallback) {
     if (!this.dslCallbacks) {
       this.dslCallbacks = [];
       // FIXME: Can we remove this?
@@ -265,7 +269,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     return this;
   }
 
-  static _routePath(routeInfos: PrivateRouteInfo[]) {
+  static _routePath(routeInfos: InternalRouteInfo<Route>[]) {
     let path: string[] = [];
 
     // We have to handle coalescing resource names that
@@ -312,20 +316,20 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     assert('BUG: BucketCache should always be present', bucketCache !== undefined);
     this._bucketCache = bucketCache;
 
-    let routerService: RouterService | undefined = owner.lookup('service:router');
+    let routerService: RouterService<R> | undefined = owner.lookup('service:router');
     assert('BUG: RouterService should always be present', routerService !== undefined);
     this._routerService = routerService;
   }
 
   _initRouterJs(): void {
     let location = get(this, 'location') as IEmberLocation;
-    let router = this;
+    let router = this as EmberRouter<R>;
     const owner = getOwner(this);
     assert('Router is unexpectedly missing an owner', owner);
     let seen = Object.create(null);
 
-    class PrivateRouter extends Router<Route> {
-      getRoute(name: string): Route {
+    class PrivateRouter extends Router<R> {
+      getRoute(name: string): R {
         let routeName = name;
         let routeOwner = owner;
         let engineInfo = router._engineInfoByRoute[routeName];
@@ -341,7 +345,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
         assert('Route is unexpectedly missing an owner', routeOwner);
 
-        let route = routeOwner.lookup<Route>(fullRouteName);
+        let route = routeOwner.lookup<R>(fullRouteName);
 
         if (seen[name]) {
           assert('seen routes should exist', route);
@@ -392,25 +396,25 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       }
 
       // TODO: merge into routeDidChange
-      didTransition(infos: PrivateRouteInfo[]) {
+      didTransition(infos: InternalRouteInfo<R>[]) {
         assert(
           'You attempted to override the "didTransition" method which has been deprecated. Please inject the router service and listen to the "routeDidChange" event.',
           router.didTransition === defaultDidTransition
         );
-        router.didTransition(infos);
+        router.didTransition<R>(infos);
       }
 
       // TODO: merge into routeWillChange
-      willTransition(oldInfos: PrivateRouteInfo[], newInfos: PrivateRouteInfo[]) {
+      willTransition(oldInfos: InternalRouteInfo<R>[], newInfos: InternalRouteInfo<R>[]) {
         assert(
           'You attempted to override the "willTransition" method which has been deprecated. Please inject the router service and listen to the "routeWillChange" event.',
           router.willTransition === defaultWillTransition
         );
-        router.willTransition(oldInfos, newInfos);
+        router.willTransition<R>(oldInfos, newInfos);
       }
 
       triggerEvent(
-        routeInfos: PrivateRouteInfo[],
+        routeInfos: InternalRouteInfo<R>[],
         ignoreFailure: boolean,
         name: string,
         args: unknown[]
@@ -681,7 +685,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       attempted transition
     @public
   */
-  transitionTo(...args: RouteArgs): Transition {
+  transitionTo(...args: RouteArgs<R>): Transition {
     if (resemblesURL(args[0])) {
       assert(
         `A transition was attempted from '${this.currentRouteName}' to '${args[0]}' but the application instance has already been destroyed.`,
@@ -689,7 +693,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       );
       return this._doURLTransition('transitionTo', args[0]);
     }
-    let { routeName, models, queryParams } = extractRouteArgs(args);
+    let { routeName, models, queryParams } = extractRouteArgs<R>(args);
     assert(
       `A transition was attempted from '${this.currentRouteName}' to '${routeName}' but the application instance has already been destroyed.`,
       !this.isDestroying && !this.isDestroyed
@@ -729,11 +733,11 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
       attempted transition
     @public
   */
-  replaceWith(...args: RouteArgs): Transition {
+  replaceWith(...args: RouteArgs<R>): Transition {
     return this.transitionTo(...args).method('replace');
   }
 
-  generate(name: string, ...args: any[]) {
+  generate(name: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]) {
     let url = this._routerMicrolib.generate(name, ...args);
     assert('expected non-string location', typeof this.location !== 'string');
     return this.location.formatURL(url);
@@ -764,7 +768,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @private
     @since 1.7.0
   */
-  isActiveIntent(routeName: string, models: {}[], queryParams: Record<string, unknown>) {
+  isActiveIntent(routeName: string, models: ModelFor<R>[], queryParams: Record<string, unknown>) {
     return this.currentState!.isActiveIntent(routeName, models, queryParams);
   }
 
@@ -940,7 +944,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @return {Void}
   */
   _serializeQueryParams(
-    routeInfos: PrivateRouteInfo[],
+    routeInfos: InternalRouteInfo<R>[],
     queryParams: Record<string, unknown>
   ): asserts queryParams is Record<string, string | null | undefined> {
     forEachQueryParam(
@@ -987,7 +991,10 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {Object} queryParams
     @return {Void}
   */
-  _deserializeQueryParams(routeInfos: PrivateRouteInfo[], queryParams: Record<string, unknown>) {
+  _deserializeQueryParams(
+    routeInfos: InternalRouteInfo<R>[],
+    queryParams: Record<string, unknown>
+  ) {
     forEachQueryParam(
       this,
       routeInfos,
@@ -1035,7 +1042,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @return {Void}
   */
   _pruneDefaultQueryParamValues(
-    routeInfos: PrivateRouteInfo[],
+    routeInfos: InternalRouteInfo<R>[],
     queryParams: Record<string, string | null | undefined>
   ) {
     let qps = this._queryParamsFor(routeInfos);
@@ -1049,7 +1056,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
   _doTransition(
     _targetRouteName: string | undefined,
-    models: {}[],
+    models: ModelFor<R>[],
     _queryParams: Record<string, unknown>,
     _keepDefaultQueryParamValues?: boolean
   ): Transition {
@@ -1083,7 +1090,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
 
   _processActiveTransitionQueryParams(
     targetRouteName: string,
-    models: {}[],
+    models: ModelFor<R>[],
     queryParams: Record<string, unknown>,
     _queryParams: {}
   ) {
@@ -1124,7 +1131,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   */
   _prepareQueryParams(
     targetRouteName: string,
-    models: {}[],
+    models: ModelFor<R>[],
     queryParams: Record<string, unknown>,
     _fromRouterService?: boolean
   ) {
@@ -1146,7 +1153,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {RouteInfo} routeInfo
     @return {Object}
   */
-  _getQPMeta(routeInfo: PrivateRouteInfo) {
+  _getQPMeta(routeInfo: InternalRouteInfo<R>) {
     let route = routeInfo.route;
     return route && (get(route, '_qp') as Route['_qp']);
   }
@@ -1160,7 +1167,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {Array<RouteInfo>} routeInfos
     @return {Object}
    */
-  _queryParamsFor(routeInfos: PrivateRouteInfo[]) {
+  _queryParamsFor(routeInfos: InternalRouteInfo<R>[]) {
     let routeInfoLength = routeInfos.length;
     let leafRouteName = routeInfos[routeInfoLength - 1]!.name;
     let cached = this._qpCache[leafRouteName];
@@ -1224,7 +1231,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @param {Object} queryParams
     @return {Void}
   */
-  _fullyScopeQueryParams(leafRouteName: string, contexts: {}[], queryParams: {}) {
+  _fullyScopeQueryParams(leafRouteName: string, contexts: ModelFor<R>[], queryParams: {}) {
     let state = calculatePostTransitionState(this, leafRouteName, contexts);
     let routeInfos = state.routeInfos;
     let qpMeta;
@@ -1263,7 +1270,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     @return {Void}
   */
   _hydrateUnsuppliedQueryParams(
-    state: TransitionState<Route>,
+    state: TransitionState<R>,
     queryParams: {},
     _fromRouterService: boolean
   ): void {
@@ -1338,7 +1345,7 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
     );
   }
 
-  currentState: null | RouterState = null;
+  currentState: null | RouterState<R> = null;
   targetState = null;
 
   _handleSlowTransition(transition: Transition, originRoute: Route) {
@@ -1498,9 +1505,9 @@ class EmberRouter extends EmberObject.extend(Evented) implements Evented {
   @param {Function} callback
   @return {Void}
  */
-function forEachRouteAbove(
-  routeInfos: PrivateRouteInfo[],
-  callback: (route: Route, routeInfo: PrivateRouteInfo) => boolean
+function forEachRouteAbove<R extends Route>(
+  routeInfos: InternalRouteInfo<R>[],
+  callback: (route: R, routeInfo: InternalRouteInfo<R>) => boolean
 ) {
   for (let i = routeInfos.length - 1; i >= 0; --i) {
     let routeInfo = routeInfos[i];
@@ -1528,22 +1535,22 @@ function forEachRouteAbove(
 // These get invoked when an action bubbles above ApplicationRoute
 // and are not meant to be overridable.
 let defaultActionHandlers = {
-  willResolveModel(
-    this: EmberRouter,
-    _routeInfos: PrivateRouteInfo[],
+  willResolveModel<R extends Route>(
+    this: EmberRouter<R>,
+    _routeInfos: InternalRouteInfo<R>[],
     transition: Transition,
-    originRoute: Route
+    originRoute: R
   ) {
     this._scheduleLoadingEvent(transition, originRoute);
   },
 
   // Attempt to find an appropriate error route or substate to enter.
-  error(routeInfos: PrivateRouteInfo[], error: Error, transition: Transition) {
+  error<R extends Route>(routeInfos: InternalRouteInfo<R>[], error: Error, transition: Transition) {
     let router: any = this;
 
     let routeInfoWithError = routeInfos[routeInfos.length - 1];
 
-    forEachRouteAbove(routeInfos, (route: Route, routeInfo: PrivateRouteInfo) => {
+    forEachRouteAbove(routeInfos, (route: R, routeInfo: InternalRouteInfo<R>) => {
       // We don't check the leaf most routeInfo since that would
       // technically be below where we're at in the route hierarchy.
       if (routeInfo !== routeInfoWithError) {
@@ -1571,12 +1578,12 @@ let defaultActionHandlers = {
   },
 
   // Attempt to find an appropriate loading route or substate to enter.
-  loading(routeInfos: PrivateRouteInfo[], transition: Transition) {
+  loading<R extends Route>(routeInfos: InternalRouteInfo<R>[], transition: Transition) {
     let router: any = this;
 
     let routeInfoWithSlowLoading = routeInfos[routeInfos.length - 1];
 
-    forEachRouteAbove(routeInfos, (route: Route, routeInfo: PrivateRouteInfo) => {
+    forEachRouteAbove(routeInfos, (route: R, routeInfo: InternalRouteInfo<R>) => {
       // We don't check the leaf most routeInfos since that would
       // technically be below where we're at in the route hierarchy.
       if (routeInfo !== routeInfoWithSlowLoading) {
@@ -1691,9 +1698,9 @@ function routeHasBeenDefined(owner: Owner, router: any, localName: string, fullN
   return routerHasRoute && ownerHasRoute;
 }
 
-export function triggerEvent(
-  this: EmberRouter,
-  routeInfos: PrivateRouteInfo[],
+export function triggerEvent<R extends Route>(
+  this: EmberRouter<R>,
+  routeInfos: InternalRouteInfo<R>[],
   ignoreFailure: boolean,
   name: string,
   args: any[]
@@ -1742,10 +1749,10 @@ export function triggerEvent(
   }
 }
 
-function calculatePostTransitionState(
-  emberRouter: EmberRouter,
+function calculatePostTransitionState<R extends Route>(
+  emberRouter: EmberRouter<R>,
   leafRouteName: string,
-  contexts: {}[]
+  contexts: ModelFor<R>[]
 ) {
   let state = emberRouter._routerMicrolib.applyIntent(leafRouteName, contexts);
   let { routeInfos, params } = state;
@@ -1753,13 +1760,7 @@ function calculatePostTransitionState(
   for (let routeInfo of routeInfos) {
     // If the routeInfo is not resolved, we serialize the context into params
     if (!routeInfo.isResolved) {
-      params[routeInfo.name] = routeInfo.serialize(
-        routeInfo.context as
-          | {
-              [key: string]: unknown;
-            }
-          | undefined
-      );
+      params[routeInfo.name] = routeInfo.serialize(routeInfo.context as ModelFor<R> | undefined);
     } else {
       params[routeInfo.name] = routeInfo.params;
     }
@@ -1814,9 +1815,9 @@ function didBeginTransition(transition: Transition, router: EmberRouter) {
   }, 'Transition Error');
 }
 
-function forEachQueryParam(
-  router: EmberRouter,
-  routeInfos: PrivateRouteInfo[],
+function forEachQueryParam<R extends Route>(
+  router: EmberRouter<R>,
+  routeInfos: InternalRouteInfo<R>[],
   queryParams: Record<string, unknown>,
   callback: (key: string, value: unknown, qp: QueryParam | undefined) => void
 ) {
@@ -1914,7 +1915,7 @@ EmberRouter.reopen({
   location: 'hash',
 
   // FIXME: Does this need to be overrideable via extend?
-  url: computed(function (this: Router<Route>) {
+  url: computed(function (this: EmberRouter) {
     let location = get(this, 'location') as string | IEmberLocation;
 
     if (typeof location === 'string') {
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index 10f04b6dd29..f7840c23213 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -1,23 +1,23 @@
-import Router, { TransitionState } from 'router_js';
+import Router, { ModelFor, TransitionState } from 'router_js';
 import { shallowEqual } from '../utils';
 import Route from './route';
 import EmberRouter from './router';
 
-export default class RouterState {
-  router: Router<Route>;
-  emberRouter: EmberRouter;
-  routerJsState: TransitionState<Route>;
-  constructor(
-    emberRouter: EmberRouter,
-    router: Router<Route>,
-    routerJsState: TransitionState<Route>
-  ) {
+export default class RouterState<R extends Route> {
+  router: Router<R>;
+  emberRouter: EmberRouter<R>;
+  routerJsState: TransitionState<R>;
+  constructor(emberRouter: EmberRouter<R>, router: Router<R>, routerJsState: TransitionState<R>) {
     this.emberRouter = emberRouter;
     this.router = router;
     this.routerJsState = routerJsState;
   }
 
-  isActiveIntent(routeName: string, models: {}[], queryParams?: Record<string, unknown>): boolean {
+  isActiveIntent(
+    routeName: string,
+    models: ModelFor<R>[],
+    queryParams?: Record<string, unknown>
+  ): boolean {
     let state = this.routerJsState;
     if (!this.router.isActiveIntent(routeName, models, undefined, state)) {
       return false;
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 18d00c0b29b..6589ccff7d1 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -2,9 +2,9 @@ import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { assert, deprecate } from '@ember/debug';
 import EmberError from '@ember/error';
-import Router, { STATE_SYMBOL } from 'router_js';
+import Router, { STATE_SYMBOL, InternalRouteInfo, ModelFor } from 'router_js';
 import Route from './system/route';
-import EmberRouter, { PrivateRouteInfo } from './system/router';
+import EmberRouter from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
@@ -14,40 +14,36 @@ export type ControllerQueryParam =
   | { as?: string; scope?: string };
 type ExpandedControllerQueryParam = { as: string | null; scope: string };
 
-type Model = object | string | number;
+export type NamedRouteArgs<R extends Route> =
+  | [routeNameOrUrl: string, ...modelsAndOptions: [...ModelFor<R>[], RouteOptions]]
+  | [routeNameOrUrl: string, ...models: ModelFor<R>[]];
 
-export type NamedRouteArgs =
-  | [routeNameOrUrl: string, ...modelsAndOptions: [...Model[], RouteOptions]]
-  | [routeNameOrUrl: string, ...models: Model[]];
-
-export type UnnamedRouteArgs =
-  | [...modelsAndOptions: [...Model[], RouteOptions]]
-  | [...models: Model[]]
+export type UnnamedRouteArgs<R extends Route> =
+  | [...modelsAndOptions: [...ModelFor<R>[], RouteOptions]]
+  | [...models: ModelFor<R>[]]
   | [options: RouteOptions];
 
-export type RouteArgs = NamedRouteArgs | UnnamedRouteArgs;
+export type RouteArgs<R extends Route> = NamedRouteArgs<R> | UnnamedRouteArgs<R>;
 
-type ExtractedArgs = {
+type ExtractedArgs<R extends Route> = {
   routeName: string | undefined;
-  models: Model[];
+  models: ModelFor<R>[];
   queryParams: Record<string, unknown>;
 };
 
 export type RouteOptions = { queryParams: Record<string, unknown> };
 
-export function extractRouteArgs(args: RouteArgs): ExtractedArgs {
-  args = args.slice();
+export function extractRouteArgs<R extends Route>(args: RouteArgs<R>): ExtractedArgs<R> {
+  // SAFETY: This should just be the same thing
+  args = args.slice() as RouteArgs<R>;
 
-  let possibleOptions = args.pop();
+  let possibleOptions = args[args.length - 1];
 
   let queryParams: Record<string, unknown>;
   if (isRouteOptions(possibleOptions)) {
+    args.pop(); // Remove options
     queryParams = possibleOptions.queryParams;
   } else {
-    // Not query params so return to the array
-    if (possibleOptions !== undefined) {
-      args.push(possibleOptions);
-    }
     queryParams = {};
   }
 
@@ -59,7 +55,8 @@ export function extractRouteArgs(args: RouteArgs): ExtractedArgs {
     assert('routeName is a string', typeof routeName === 'string');
   }
 
-  let models = args;
+  // SAFTEY: We removed the name and options if they existed, only models left.
+  let models = args as ModelFor<R>[];
 
   return { routeName, models, queryParams };
 }
@@ -73,7 +70,10 @@ export function getActiveTargetName(router: Router<Route>): string {
   return lastRouteInfo.name;
 }
 
-export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInfo[]): void {
+export function stashParamNames<R extends Route>(
+  router: EmberRouter<R>,
+  routeInfos: InternalRouteInfo<R>[]
+): void {
   if (routeInfos['_namesStashed']) {
     return;
   }
@@ -86,7 +86,7 @@ export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInf
   assert('has route info', routeInfo);
   let targetRouteName = routeInfo.name;
   let recogHandlers = router._routerMicrolib.recognizer.handlersFor(targetRouteName);
-  let dynamicParent: PrivateRouteInfo;
+  let dynamicParent: InternalRouteInfo<R>;
 
   for (let i = 0; i < routeInfos.length; ++i) {
     let routeInfo = routeInfos[i];
@@ -100,7 +100,11 @@ export function stashParamNames(router: EmberRouter, routeInfos: PrivateRouteInf
     routeInfo['_names'] = names;
 
     let route = routeInfo.route!;
-    route._stashNames(routeInfo, dynamicParent!);
+    // SAFETY: This cast should be idential. I don't understand why it is needed.
+    route._stashNames(
+      routeInfo as InternalRouteInfo<NonNullable<R>>,
+      dynamicParent! as InternalRouteInfo<NonNullable<R>>
+    );
   }
 
   routeInfos['_namesStashed'] = true;
@@ -237,7 +241,7 @@ export function resemblesURL(str: unknown): str is string {
 
   @private
 */
-export function prefixRouteNameArg<T extends NamedRouteArgs | UnnamedRouteArgs>(
+export function prefixRouteNameArg<T extends NamedRouteArgs<Route> | UnnamedRouteArgs<Route>>(
   route: Route,
   args: T
 ): T {
diff --git a/packages/@ember/controller/lib/controller_mixin.d.ts b/packages/@ember/controller/lib/controller_mixin.d.ts
index 361709aafe8..e55c275b94f 100644
--- a/packages/@ember/controller/lib/controller_mixin.d.ts
+++ b/packages/@ember/controller/lib/controller_mixin.d.ts
@@ -1,5 +1,6 @@
 import { RouteArgs } from '@ember/-internals/routing/lib/utils';
 import Mixin from '@ember/object/mixin';
+import Route from '@ember/routing/route';
 import { Transition } from 'router_js';
 
 /* @internal */
@@ -17,9 +18,9 @@ interface ControllerMixin<T> {
 
   queryParams: Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>;
 
-  transitionToRoute(...args: RouteArgs): Transition;
+  transitionToRoute(...args: RouteArgs<Route>): Transition;
 
-  replaceRoute(...args: RouteArgs): Transition;
+  replaceRoute(...args: RouteArgs<Route>): Transition;
 }
 declare const ControllerMixin: Mixin;
 
diff --git a/packages/@ember/routing/auto-location.js b/packages/@ember/routing/auto-location.ts
similarity index 100%
rename from packages/@ember/routing/auto-location.js
rename to packages/@ember/routing/auto-location.ts
diff --git a/packages/@ember/routing/hash-location.js b/packages/@ember/routing/hash-location.ts
similarity index 100%
rename from packages/@ember/routing/hash-location.js
rename to packages/@ember/routing/hash-location.ts
diff --git a/packages/@ember/routing/location.js b/packages/@ember/routing/location.js
deleted file mode 100644
index c36fb225f94..00000000000
--- a/packages/@ember/routing/location.js
+++ /dev/null
@@ -1 +0,0 @@
-export { Location as default } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/location.ts b/packages/@ember/routing/location.ts
new file mode 100644
index 00000000000..081191b6941
--- /dev/null
+++ b/packages/@ember/routing/location.ts
@@ -0,0 +1 @@
+export { Location as default, EmberLocation as ILocation } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/none-location.js b/packages/@ember/routing/none-location.ts
similarity index 100%
rename from packages/@ember/routing/none-location.js
rename to packages/@ember/routing/none-location.ts
diff --git a/packages/@ember/routing/route.js b/packages/@ember/routing/route.ts
similarity index 100%
rename from packages/@ember/routing/route.js
rename to packages/@ember/routing/route.ts
diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
new file mode 100644
index 00000000000..2f48ca37564
--- /dev/null
+++ b/packages/@ember/routing/router-service.ts
@@ -0,0 +1,5 @@
+export {
+  RouterService as default,
+  RouteInfo,
+  RouteInfoWithAttributes,
+} from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/router.js b/packages/@ember/routing/router.ts
similarity index 100%
rename from packages/@ember/routing/router.js
rename to packages/@ember/routing/router.ts
diff --git a/packages/@ember/routing/type-tests/auto-location.test.ts b/packages/@ember/routing/type-tests/auto-location.test.ts
new file mode 100644
index 00000000000..e5e455bfeaa
--- /dev/null
+++ b/packages/@ember/routing/type-tests/auto-location.test.ts
@@ -0,0 +1,10 @@
+import EmberObject from '@ember/object';
+import AutoLocation from '@ember/routing/auto-location';
+import { ILocation } from '@ember/routing/location';
+import { expectTypeOf } from 'expect-type';
+
+// This doesn't have any public API
+
+let location = new AutoLocation();
+expectTypeOf(location).toMatchTypeOf<EmberObject>();
+expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/hash-location.test.ts b/packages/@ember/routing/type-tests/hash-location.test.ts
new file mode 100644
index 00000000000..fd881f61e82
--- /dev/null
+++ b/packages/@ember/routing/type-tests/hash-location.test.ts
@@ -0,0 +1,10 @@
+import { ILocation } from '@ember/routing/location';
+import EmberObject from '@ember/object';
+import HashLocation from '@ember/routing/hash-location';
+import { expectTypeOf } from 'expect-type';
+
+// This doesn't have any public API
+
+let location = new HashLocation();
+expectTypeOf(location).toMatchTypeOf<EmberObject>();
+expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/history-location.test.ts b/packages/@ember/routing/type-tests/history-location.test.ts
new file mode 100644
index 00000000000..d132fc78f7b
--- /dev/null
+++ b/packages/@ember/routing/type-tests/history-location.test.ts
@@ -0,0 +1,10 @@
+import EmberObject from '@ember/object';
+import HistoryLocation from '@ember/routing/history-location';
+import { ILocation } from '@ember/routing/location';
+import { expectTypeOf } from 'expect-type';
+
+// This doesn't have any public API
+
+let location = new HistoryLocation();
+expectTypeOf(location).toMatchTypeOf<EmberObject>();
+expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/link-to.test.ts b/packages/@ember/routing/type-tests/link-to.test.ts
new file mode 100644
index 00000000000..64d01bba8b4
--- /dev/null
+++ b/packages/@ember/routing/type-tests/link-to.test.ts
@@ -0,0 +1,6 @@
+import { OpaqueInternalComponentConstructor } from '@ember/-internals/glimmer/lib/components/internal';
+import { LinkTo } from '@ember/routing';
+import { expectTypeOf } from 'expect-type';
+
+// This type is weird
+expectTypeOf(LinkTo).toEqualTypeOf<OpaqueInternalComponentConstructor>();
diff --git a/packages/@ember/routing/type-tests/location.test.ts b/packages/@ember/routing/type-tests/location.test.ts
new file mode 100644
index 00000000000..bca25d0217a
--- /dev/null
+++ b/packages/@ember/routing/type-tests/location.test.ts
@@ -0,0 +1,40 @@
+import Location, { ILocation } from '@ember/routing/location';
+import { expectTypeOf } from 'expect-type';
+
+// This is deprecated so let's not bother with more testing
+expectTypeOf(Location.create).toBeFunction();
+
+// Interface
+expectTypeOf<ILocation['implementation']>().toEqualTypeOf<string>();
+expectTypeOf<ILocation['cancelRouterSetup']>().toEqualTypeOf<boolean | undefined>();
+expectTypeOf<ILocation['getURL']>().toEqualTypeOf<() => string>();
+expectTypeOf<ILocation['setURL']>().toEqualTypeOf<(url: string) => void>();
+expectTypeOf<ILocation['replaceURL']>().toEqualTypeOf<((url: string) => void) | undefined>();
+expectTypeOf<ILocation['onUpdateURL']>().toEqualTypeOf<(callback: (url: string) => void) => void>();
+expectTypeOf<ILocation['formatURL']>().toEqualTypeOf<(url: string) => string>();
+expectTypeOf<ILocation['detect']>().toEqualTypeOf<(() => void) | undefined>();
+expectTypeOf<ILocation['initState']>().toEqualTypeOf<(() => void) | undefined>();
+expectTypeOf<ILocation['destroy']>().toEqualTypeOf<() => void>();
+
+// Minimal implementation
+class TestLocation implements ILocation {
+  implementation = 'test';
+
+  getURL() {
+    return 'test://url';
+  }
+
+  setURL(_url: string) {}
+
+  onUpdateURL(callback: (url: string) => void): void {
+    callback('test://callback');
+  }
+
+  formatURL(url: string): string {
+    return url;
+  }
+
+  destroy(): void {}
+}
+
+new TestLocation();
diff --git a/packages/@ember/routing/type-tests/none-location.test.ts b/packages/@ember/routing/type-tests/none-location.test.ts
new file mode 100644
index 00000000000..58f31ffa915
--- /dev/null
+++ b/packages/@ember/routing/type-tests/none-location.test.ts
@@ -0,0 +1,10 @@
+import EmberObject from '@ember/object';
+import NoneLocation from '@ember/routing/none-location';
+import { ILocation } from '@ember/routing/location';
+import { expectTypeOf } from 'expect-type';
+
+// This doesn't have any public API
+
+let location = new NoneLocation();
+expectTypeOf(location).toMatchTypeOf<EmberObject>();
+expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/route/index.test.ts b/packages/@ember/routing/type-tests/route/index.test.ts
new file mode 100644
index 00000000000..851004c0ffd
--- /dev/null
+++ b/packages/@ember/routing/type-tests/route/index.test.ts
@@ -0,0 +1,72 @@
+import { Owner } from '@ember/-internals/owner';
+import Controller from '@ember/controller';
+import EmberObject from '@ember/object';
+import Route from '@ember/routing/route';
+import { expectTypeOf } from 'expect-type';
+import { Transition } from 'router_js';
+
+// NOTE: This is invalid, but acceptable for type tests
+let owner = {} as Owner;
+let route = new Route(owner);
+
+expectTypeOf(route).toMatchTypeOf<EmberObject>();
+
+expectTypeOf(route.templateName).toEqualTypeOf<string | null>();
+
+expectTypeOf(route.controllerName).toEqualTypeOf<string | null>();
+
+expectTypeOf(route.controller).toEqualTypeOf<Controller>();
+
+expectTypeOf(route.routeName).toEqualTypeOf<string>();
+
+expectTypeOf(route.fullRouteName).toEqualTypeOf<string>();
+
+// TODO: Review this return type. It is always string or undefined?
+expectTypeOf(route.paramsFor('foo')).toEqualTypeOf<Record<string, unknown>>();
+
+let aPost = {};
+let aComment = {};
+expectTypeOf(route.transitionTo('blogPosts')).toEqualTypeOf<Transition>();
+route.transitionTo('blogPosts.recentEntries');
+route.transitionTo('blogPost', aPost);
+route.transitionTo('blogPost', 1);
+route.transitionTo('blogComment', aPost, aComment);
+route.transitionTo('blogComment', 1, 13);
+route.transitionTo('/');
+route.transitionTo('/blog/post/1/comment/13');
+route.transitionTo('/blog/posts?sort=title');
+route.transitionTo('blogPost', 1, { queryParams: { showComments: 'true' } });
+route.transitionTo({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(route.replaceWith('blogPosts')).toEqualTypeOf<Transition>();
+route.replaceWith('blogPosts.recentEntries');
+route.replaceWith('blogPost', aPost);
+route.replaceWith('blogPost', 1);
+route.replaceWith('blogComment', aPost, aComment);
+route.replaceWith('blogComment', 1, 13);
+route.replaceWith('/');
+route.replaceWith('/blog/post/1/comment/13');
+route.replaceWith('/blog/posts?sort=title');
+route.replaceWith('blogPost', 1, { queryParams: { showComments: 'true' } });
+route.replaceWith({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(route.intermediateTransitionTo('blogPosts')).toEqualTypeOf<void>();
+
+route.intermediateTransitionTo('blogPosts.recentEntries');
+route.intermediateTransitionTo('blogPost', aPost);
+route.intermediateTransitionTo('blogPost', 1);
+route.intermediateTransitionTo('blogComment', aPost, aComment);
+route.intermediateTransitionTo('blogComment', 1, 13);
+route.intermediateTransitionTo('/');
+route.intermediateTransitionTo('blogPost', 1, { queryParams: { showComments: 'true' } });
+// @ts-expect-error Requires a name
+route.intermediateTransitionTo({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(route.refresh()).toEqualTypeOf<Transition>();
+
+expectTypeOf(route.controllerFor('foo')).toEqualTypeOf<Controller>();
+// The second argument is undocumented
+expectTypeOf(route.controllerFor('foo', true)).toEqualTypeOf<Controller | undefined>();
+expectTypeOf(route.controllerFor('foo', false)).toEqualTypeOf<Controller>();
+
+expectTypeOf(route.modelFor('foo')).toEqualTypeOf<unknown>();
diff --git a/packages/@ember/routing/type-tests/route/overrides.test.ts b/packages/@ember/routing/type-tests/route/overrides.test.ts
new file mode 100644
index 00000000000..3c444359301
--- /dev/null
+++ b/packages/@ember/routing/type-tests/route/overrides.test.ts
@@ -0,0 +1,47 @@
+import { Owner } from '@ember/-internals/owner';
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+import Route from '@ember/routing/route';
+import { Transition } from 'router_js';
+
+// NOTE: This is invalid, but acceptable for type tests
+let owner = {} as Owner;
+class Foo {}
+
+class MyRoute extends Route<Foo> {
+  resetController(_controller: Controller, _isExiting: boolean, _transition: Transition): this {
+    return this;
+  }
+
+  @action
+  willTransition(_transition: Transition) {}
+
+  @action
+  didTransition() {}
+
+  @action
+  loading(_transition: Transition, _route: Route<Foo>) {}
+
+  activate(_transition: Transition): void {}
+
+  deactivate(_transition?: Transition): void {}
+
+  beforeModel(_transition: Transition): void {}
+
+  afterModel(_transition: Transition): void {}
+
+  redirect(_transition: Transition): void {}
+
+  model(_params: Record<string, unknown>, _transition: Transition): Foo | Promise<Foo> {
+    return new Foo();
+  }
+
+  setupController(_controller: Controller, _context: Foo, _transition?: Transition): void {}
+
+  buildRouteInfoMetadata(): void {}
+
+  serialize(_model: Foo | undefined, _params: string[]): { [key: string]: unknown } {
+    return {};
+  }
+}
+new MyRoute(owner);
diff --git a/packages/@ember/routing/type-tests/route/query-params.test.ts b/packages/@ember/routing/type-tests/route/query-params.test.ts
new file mode 100644
index 00000000000..f19254b6972
--- /dev/null
+++ b/packages/@ember/routing/type-tests/route/query-params.test.ts
@@ -0,0 +1,34 @@
+import { Owner } from '@ember/-internals/owner';
+import Route from '@ember/routing/route';
+
+// NOTE: This is invalid, but acceptable for type tests
+let owner = {} as Owner;
+
+class MyRoute extends Route {
+  queryParams = {
+    page: {
+      refreshModel: false,
+      replace: false,
+      as: 'page',
+    },
+  };
+}
+new MyRoute(owner);
+
+class InvalidQPs1 extends Route {
+  // @ts-expect-error Must be a Record
+  queryParams = 1;
+}
+new InvalidQPs1(owner);
+
+class InvalidQPs2 extends Route {
+  // @ts-expect-error Invalid details
+  queryParams = { page: true };
+}
+new InvalidQPs2(owner);
+
+class InvalidQPs3 extends Route {
+  // @ts-expect-error Invalid details hash
+  queryParams = { page: { refreshModel: 1 } };
+}
+new InvalidQPs3(owner);
diff --git a/packages/@ember/routing/type-tests/route/send.test.ts b/packages/@ember/routing/type-tests/route/send.test.ts
new file mode 100644
index 00000000000..9b068bad279
--- /dev/null
+++ b/packages/@ember/routing/type-tests/route/send.test.ts
@@ -0,0 +1,30 @@
+import { Owner } from '@ember/-internals/owner';
+import { action } from '@ember/object';
+import Route from '@ember/routing/route';
+
+class MyRoute extends Route {
+  @action
+  topLevel(_foo: number, _opt?: boolean) {}
+
+  actions = {
+    nested(_foo: string, _opt?: number) {},
+  };
+}
+
+// NOTE: This is invalid, but acceptable for type tests
+let owner = {} as Owner;
+let route = new MyRoute(owner);
+
+route.send('topLevel', 1);
+route.send('topLevel', 1, true);
+// @ts-expect-error Requires argument
+route.send('topLevel');
+// @ts-expect-error Invalid argument
+route.send('topLevel', false);
+
+route.send('nested', 'val');
+route.send('nested', 'val', 2);
+// @ts-expect-error Requires argument
+route.send('nested');
+// @ts-expect-error Invalid argument
+route.send('nested', false);
diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts
new file mode 100644
index 00000000000..32c7bec59e7
--- /dev/null
+++ b/packages/@ember/routing/type-tests/router-service.test.ts
@@ -0,0 +1,94 @@
+/* eslint-disable no-self-assign */
+
+import { EmberLocation } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import RouterService, { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
+import { expectTypeOf } from 'expect-type';
+import { Transition } from 'router_js';
+
+class Post {}
+class Comment {}
+
+let router = new RouterService<Route<Post | Comment>>();
+
+let aPost = new Post();
+let aComment = new Comment();
+
+expectTypeOf(router.transitionTo('blogPosts')).toEqualTypeOf<Transition>();
+router.transitionTo('blogPosts.recentEntries');
+router.transitionTo('blogPost', aPost);
+router.transitionTo('blogPost', 1);
+router.transitionTo('blogComment', aPost, aComment);
+router.transitionTo('blogComment', 1, 13);
+router.transitionTo('/');
+router.transitionTo('/blog/post/1/comment/13');
+router.transitionTo('/blog/posts?sort=title');
+router.transitionTo('blogPost', 1, { queryParams: { showComments: 'true' } });
+router.transitionTo({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(router.replaceWith('blogPosts')).toEqualTypeOf<Transition>();
+router.replaceWith('blogPosts.recentEntries');
+router.replaceWith('blogPost', aPost);
+router.replaceWith('blogPost', 1);
+router.replaceWith('blogComment', aPost, aComment);
+router.replaceWith('blogComment', 1, 13);
+router.replaceWith('/');
+router.replaceWith('/blog/post/1/comment/13');
+router.replaceWith('/blog/posts?sort=title');
+router.replaceWith('blogPost', 1, { queryParams: { showComments: 'true' } });
+router.replaceWith({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(router.urlFor('blogPosts')).toEqualTypeOf<string>();
+router.urlFor('blogPost', aPost);
+router.urlFor('blogPost', aPost, { queryParams: { showComments: 'true' } });
+
+expectTypeOf(router.isActive('blogPost')).toEqualTypeOf<boolean>();
+router.isActive('blogPosts.recentEntries');
+router.isActive('blogPost', aPost);
+router.isActive('blogPost', 1);
+router.isActive('blogComment', aPost, aComment);
+router.isActive('blogComment', 1, 13);
+router.isActive('blogPost', 1, { queryParams: { showComments: 'true' } });
+router.isActive({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(router.recognize('/blog/post/1/comment/13')).toEqualTypeOf<RouteInfo | null>();
+// @ts-expect-error it shouldn't be a RouteInfoWithAttributes
+router.recognize('/').attributes;
+// @ts-expect-error requires a string
+router.recognize(aPost);
+
+expectTypeOf(router.recognizeAndLoad('/blog/post/1/comment/13')).toEqualTypeOf<
+  Promise<RouteInfoWithAttributes>
+>();
+// @ts-expect-error requires a string
+router.recognizeAndLoad(aPost);
+
+// NOTE: We can't currently infer the type
+router.on('routeWillChange', (_transition: unknown) => {});
+router.on('routeDidChange', (_transition: unknown) => {});
+
+// Canary
+if (router.refresh) {
+  expectTypeOf(router.refresh()).toEqualTypeOf<Transition>();
+  expectTypeOf(router.refresh('blogPost')).toEqualTypeOf<Transition>();
+}
+
+expectTypeOf(router.currentRouteName).toEqualTypeOf<string | null>();
+// @ts-expect-error readonly
+router.currentRouteName = router.currentRouteName;
+
+expectTypeOf(router.currentURL).toEqualTypeOf<string | null>();
+// @ts-expect-error readonly
+router.currentURL = router.currentURL;
+
+expectTypeOf(router.location).toEqualTypeOf<string | EmberLocation>();
+// @ts-expect-error readonly
+router.location = router.location;
+
+expectTypeOf(router.rootURL).toEqualTypeOf<string>();
+// @ts-expect-error readonly
+router.rootURL = router.rootURL;
+
+expectTypeOf(router.currentRoute).toEqualTypeOf<RouteInfo | RouteInfoWithAttributes | null>();
+// @ts-expect-error readonly
+router.currentRoute = router.currentRoute;
diff --git a/packages/@ember/routing/type-tests/router/index.test.ts b/packages/@ember/routing/type-tests/router/index.test.ts
new file mode 100644
index 00000000000..8a07f166439
--- /dev/null
+++ b/packages/@ember/routing/type-tests/router/index.test.ts
@@ -0,0 +1,44 @@
+import { Owner } from '@ember/-internals/owner';
+import EmberObject from '@ember/object';
+import Evented from '@ember/object/evented';
+import { ILocation } from '@ember/routing/location';
+import Router from '@ember/routing/router';
+import { expectTypeOf } from 'expect-type';
+import { Transition } from 'router_js';
+
+expectTypeOf<Router>().toMatchTypeOf<EmberObject>();
+expectTypeOf<Router>().toMatchTypeOf<Evented>();
+
+// NOTE: This is invalid, but acceptable for type tests
+let owner = {} as Owner;
+let router = new Router(owner);
+
+expectTypeOf(router.rootURL).toEqualTypeOf<string>();
+
+expectTypeOf(router.location).toEqualTypeOf<string | ILocation>();
+
+let aPost = {};
+let aComment = {};
+expectTypeOf(router.transitionTo('blogPosts')).toEqualTypeOf<Transition>();
+router.transitionTo('blogPosts.recentEntries');
+router.transitionTo('blogPost', aPost);
+router.transitionTo('blogPost', 1);
+router.transitionTo('blogComment', aPost, aComment);
+router.transitionTo('blogComment', 1, 13);
+router.transitionTo('/');
+router.transitionTo('/blog/post/1/comment/13');
+router.transitionTo('/blog/posts?sort=title');
+router.transitionTo('blogPost', 1, { queryParams: { showComments: 'true' } });
+router.transitionTo({ queryParams: { showComments: 'true' } });
+
+expectTypeOf(router.replaceWith('blogPosts')).toEqualTypeOf<Transition>();
+router.replaceWith('blogPosts.recentEntries');
+router.replaceWith('blogPost', aPost);
+router.replaceWith('blogPost', 1);
+router.replaceWith('blogComment', aPost, aComment);
+router.replaceWith('blogComment', 1, 13);
+router.replaceWith('/');
+router.replaceWith('/blog/post/1/comment/13');
+router.replaceWith('/blog/posts?sort=title');
+router.replaceWith('blogPost', 1, { queryParams: { showComments: 'true' } });
+router.replaceWith({ queryParams: { showComments: 'true' } });
diff --git a/packages/@ember/routing/type-tests/router/map.test.ts b/packages/@ember/routing/type-tests/router/map.test.ts
new file mode 100644
index 00000000000..4d9c71aa9e0
--- /dev/null
+++ b/packages/@ember/routing/type-tests/router/map.test.ts
@@ -0,0 +1,26 @@
+import Router from '@ember/routing/router';
+
+// From inline docs
+Router.map(function () {
+  this.route('post', { path: '/post/:post_id' }, function () {
+    this.route('edit');
+    this.route('comments', { resetNamespace: true }, function () {
+      this.route('new');
+    });
+  });
+
+  // @ts-expect-error Invalid name
+  this.route({ invalid: true });
+
+  // @ts-expect-error Unrecognized option
+  this.route('invalid', { invalid: true });
+
+  this.mount('my-addon');
+  this.mount('other-addon', { path: 'other-addon', as: 'other-addon', resetNamespace: true });
+
+  // @ts-expect-error Invalid name
+  this.mount({ invalid: true });
+
+  // @ts-expect-error Unrecognized option
+  this.mount('invalid', { invalid: true });
+});
diff --git a/yarn.lock b/yarn.lock
index de6881d5dfa..0a5dd75caca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8612,10 +8612,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity "sha1-Oasf+84cWebSvcpBbwkyYR5PPKM= sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g=="
 
-router_js@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-7.3.0.tgz#6c061b6b097cfec537fa0d6c5a5c6e317730799f"
-  integrity "sha1-bAYbawl8/sU3+g1sWlxuMXcweZ8= sha512-A+iVTfG03XNks7oC/KGXq+EKp9kAac9BOYuomq2KouXUM4U57Io20/tuQq1kx+OwHB4gEY0XaRQjuHwljkbRHg=="
+router_js@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-8.0.1.tgz#26e197ac0e7be04e9b7850e7755f81fa737c5568"
+  integrity sha512-61q9s2hLFHh8bCl/sTDoAOf0B+7lnTzG1tYjK8W32vg0iwUC2hXMo+2ymLFBfdvdDtD4RdknMVh9scyy9zbElg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 

From ed21b59379232d04adaca9e3f265f214cc2a055e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 Jan 2022 13:47:38 -0800
Subject: [PATCH 0837/1405] Minor types correction

---
 packages/@ember/-internals/routing/lib/system/route.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 6084873ff3a..8e6af951afd 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -1421,7 +1421,7 @@ class Route<T extends IModel = {}>
     @since 1.0.0
     @public
   */
-  model(params: Record<string, unknown>, transition: Transition): T | Promise<T> | undefined {
+  model(params: Record<string, unknown>, transition: Transition): T | PromiseLike<T> | undefined {
     let name, sawParams, value;
     // SAFETY: Since `_qp` is protected we can't infer the type
     let queryParams = (get(this, '_qp') as Route<T>['_qp']).map;
@@ -1447,11 +1447,10 @@ class Route<T extends IModel = {}>
         if (transition.resolveIndex < 1) {
           return;
         }
-        // SAFETY: These return types should be equivalent but router.js doesn't have enough
-        // generics to infer it.
+        // SAFETY: This should be correct, but TS is unable to infer this.
         return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1]!.context as
           | T
-          | Promise<T>
+          | PromiseLike<T>
           | undefined;
       }
     }

From 839eed2ab13d26cb349dc3c5e898c7c142acd65f Mon Sep 17 00:00:00 2001
From: Dan Wenzel <dan@danwenzel.com>
Date: Tue, 16 Nov 2021 17:44:20 -0600
Subject: [PATCH 0838/1405] Fix typo in error messages

Cannot is one word
---
 packages/@ember/-internals/container/lib/container.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index c96320aa836..1b7c596c74e 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -145,7 +145,7 @@ export default class Container {
    */
   lookup(fullName: string, options: LookupOptions): any {
     if (this.isDestroyed) {
-      throw new Error(`Can not call \`.lookup\` after the owner has been destroyed`);
+      throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
     }
     assert('fullName must be a proper full name', this.registry.isValidFullName(fullName));
     return lookup(this, this.registry.normalize(fullName), options);
@@ -212,7 +212,7 @@ export default class Container {
    */
   factoryFor<T, C>(fullName: string): Factory<T, C> | undefined {
     if (this.isDestroyed) {
-      throw new Error(`Can not call \`.factoryFor\` after the owner has been destroyed`);
+      throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
     }
     let normalizedName = this.registry.normalize(fullName);
 
@@ -500,7 +500,7 @@ export class FactoryManager<T, C> {
 
     if (container.isDestroyed) {
       throw new Error(
-        `Can not create new instances after the owner has been destroyed (you attempted to create ${this.fullName})`
+        `Cannot create new instances after the owner has been destroyed (you attempted to create ${this.fullName})`
       );
     }
 

From 4afbe9103a2a2fee6518ad80c91f8cf80122fc37 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Sat, 5 Feb 2022 19:59:19 +0000
Subject: [PATCH 0839/1405] adjust failing assertions

---
 .../@ember/-internals/container/tests/container_test.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index fbe16b0deb4..e3dd6663a20 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -608,7 +608,7 @@ moduleFor(
 
       assert.throws(() => {
         container.lookup('service:foo');
-      }, /Can not call `.lookup` after the owner has been destroyed/);
+      }, /Cannot call `.lookup` after the owner has been destroyed/);
     }
 
     [`@test assert when calling factoryFor after destroy on a container`](assert) {
@@ -626,7 +626,7 @@ moduleFor(
 
       assert.throws(() => {
         container.factoryFor('service:foo');
-      }, /Can not call `.factoryFor` after the owner has been destroyed/);
+      }, /Cannot call `.factoryFor` after the owner has been destroyed/);
     }
 
     // this is skipped until templates and the glimmer environment do not require `OWNER` to be
@@ -690,7 +690,7 @@ moduleFor(
 
       assert.throws(() => {
         Factory.create();
-      }, /Can not create new instances after the owner has been destroyed \(you attempted to create service:other\)/);
+      }, /Cannot create new instances after the owner has been destroyed \(you attempted to create service:other\)/);
     }
   }
 );

From d30ded0effb7d9d0a514464a3cdb7eaa98da0435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moacir=20P=2E=20de=20Sa=CC=81=20Pereira?=
 <github@moacir.moacir.com>
Date: Sun, 6 Feb 2022 15:04:14 -0500
Subject: [PATCH 0840/1405] [CLEANUP prettier-blueprints] Format fixtures with
 Prettier.

The blueprint fixtures don't pass the Prettier formatting rules. The
most commonly broken Prettier setting seems to be `function()`.

Other additions include trailing commas, suppressing unnecessary
linebreaks, and adding friendly linebreaks.
---
 node-tests/fixtures/acceptance-test/addon-default.js  |  4 ++--
 node-tests/fixtures/acceptance-test/addon-nested.js   |  4 ++--
 node-tests/fixtures/acceptance-test/default.js        |  4 ++--
 node-tests/fixtures/acceptance-test/mocha-rfc268.js   |  4 ++--
 node-tests/fixtures/acceptance-test/mocha.js          |  8 ++++----
 node-tests/fixtures/acceptance-test/qunit-rfc268.js   |  4 ++--
 .../fixtures/component-test/default-template.js       |  4 ++--
 node-tests/fixtures/component-test/default.js         |  4 ++--
 node-tests/fixtures/component-test/mocha-0.12-unit.js |  6 +++---
 node-tests/fixtures/component-test/mocha-0.12.js      |  6 +++---
 .../fixtures/component-test/mocha-rfc232-unit.js      |  4 ++--
 node-tests/fixtures/component-test/mocha-rfc232.js    |  4 ++--
 node-tests/fixtures/component-test/mocha-unit.js      | 10 ++++++----
 node-tests/fixtures/component-test/mocha.js           | 10 ++++++----
 node-tests/fixtures/component-test/rfc232-unit.js     |  4 ++--
 node-tests/fixtures/component-test/rfc232.js          |  4 ++--
 node-tests/fixtures/component-test/unit.js            |  5 ++---
 node-tests/fixtures/component/component-dash.js       |  3 +--
 node-tests/fixtures/component/component-nested.js     |  3 +--
 node-tests/fixtures/component/component.js            |  3 +--
 node-tests/fixtures/controller-test/default-nested.js |  2 +-
 node-tests/fixtures/controller-test/default.js        |  2 +-
 .../fixtures/controller-test/mocha-0.12-nested.js     |  4 ++--
 node-tests/fixtures/controller-test/mocha-0.12.js     |  4 ++--
 node-tests/fixtures/controller-test/mocha-nested.js   |  8 +++++---
 .../fixtures/controller-test/mocha-rfc232-nested.js   |  4 ++--
 node-tests/fixtures/controller-test/mocha-rfc232.js   |  4 ++--
 node-tests/fixtures/controller-test/mocha.js          |  8 +++++---
 node-tests/fixtures/controller-test/rfc232-nested.js  |  4 ++--
 node-tests/fixtures/controller-test/rfc232.js         |  4 ++--
 node-tests/fixtures/controller/controller-nested.js   |  3 +--
 node-tests/fixtures/controller/controller.js          |  3 +--
 node-tests/fixtures/helper-test/integration.js        |  4 ++--
 node-tests/fixtures/helper-test/mocha-0.12.js         |  6 +++---
 node-tests/fixtures/helper-test/mocha-rfc232.js       |  4 ++--
 node-tests/fixtures/helper-test/mocha.js              | 10 ++++++----
 node-tests/fixtures/helper-test/rfc232.js             |  4 ++--
 node-tests/fixtures/helper/helper.js                  |  2 +-
 node-tests/fixtures/helper/mu-helper.js               |  2 +-
 node-tests/fixtures/initializer-test/default.js       |  5 ++---
 node-tests/fixtures/initializer-test/dummy.js         |  5 ++---
 node-tests/fixtures/initializer-test/mocha-rfc232.js  | 10 +++++-----
 node-tests/fixtures/initializer-test/mocha.js         | 11 +++++------
 node-tests/fixtures/initializer/initializer-nested.js |  5 ++---
 node-tests/fixtures/initializer/initializer.js        |  5 ++---
 .../fixtures/instance-initializer-test/default.js     |  4 ++--
 .../fixtures/instance-initializer-test/dummy.js       |  4 ++--
 .../instance-initializer-test/mocha-rfc232.js         | 10 +++++-----
 .../fixtures/instance-initializer-test/mocha.js       | 10 +++++-----
 .../instance-initializer-nested.js                    |  5 ++---
 .../instance-initializer/instance-initializer.js      |  5 ++---
 node-tests/fixtures/mixin-test/addon.js               |  2 +-
 node-tests/fixtures/mixin-test/default.js             |  2 +-
 node-tests/fixtures/mixin-test/mocha-rfc232.js        |  4 ++--
 node-tests/fixtures/mixin-test/mocha.js               |  4 ++--
 node-tests/fixtures/mixin-test/rfc232.js              |  2 +-
 node-tests/fixtures/route-test/default-child.js       |  2 +-
 node-tests/fixtures/route-test/default-nested.js      |  2 +-
 node-tests/fixtures/route-test/default.js             |  2 +-
 node-tests/fixtures/route-test/mocha-0.12.js          |  4 ++--
 node-tests/fixtures/route-test/mocha-rfc232.js        |  4 ++--
 node-tests/fixtures/route-test/mocha.js               |  8 +++++---
 node-tests/fixtures/route-test/rfc232.js              |  4 ++--
 node-tests/fixtures/route/route-child.js              |  3 +--
 node-tests/fixtures/route/route-nested.js             |  3 +--
 node-tests/fixtures/route/route.js                    |  3 +--
 node-tests/fixtures/service-test/default-nested.js    |  2 +-
 node-tests/fixtures/service-test/default.js           |  2 +-
 node-tests/fixtures/service-test/mocha-0.12.js        |  4 ++--
 node-tests/fixtures/service-test/mocha-rfc232.js      |  4 ++--
 node-tests/fixtures/service-test/mocha.js             |  8 +++++---
 node-tests/fixtures/service-test/rfc232.js            |  4 ++--
 node-tests/fixtures/service/service-nested.js         |  3 +--
 node-tests/fixtures/service/service.js                |  3 +--
 node-tests/fixtures/util-test/addon-default-nested.js |  2 +-
 node-tests/fixtures/util-test/addon-default.js        |  2 +-
 node-tests/fixtures/util-test/default-nested.js       |  2 +-
 node-tests/fixtures/util-test/default.js              |  2 +-
 node-tests/fixtures/util-test/dummy.js                |  2 +-
 node-tests/fixtures/util-test/mocha-rfc232.js         |  4 ++--
 node-tests/fixtures/util-test/mocha.js                |  4 ++--
 node-tests/fixtures/util-test/rfc232.js               |  5 ++---
 82 files changed, 178 insertions(+), 183 deletions(-)

diff --git a/node-tests/fixtures/acceptance-test/addon-default.js b/node-tests/fixtures/acceptance-test/addon-default.js
index 6adb6c1f31e..3ca96b784a0 100644
--- a/node-tests/fixtures/acceptance-test/addon-default.js
+++ b/node-tests/fixtures/acceptance-test/addon-default.js
@@ -3,10 +3,10 @@ import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | foo');
 
-test('visiting /foo', function(assert) {
+test('visiting /foo', function (assert) {
   visit('/foo');
 
-  andThen(function() {
+  andThen(function () {
     assert.strictEqual(currentURL(), '/foo');
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/addon-nested.js b/node-tests/fixtures/acceptance-test/addon-nested.js
index bc8378edc27..ccb4342836c 100644
--- a/node-tests/fixtures/acceptance-test/addon-nested.js
+++ b/node-tests/fixtures/acceptance-test/addon-nested.js
@@ -3,10 +3,10 @@ import moduleForAcceptance from '../../../tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | foo/bar');
 
-test('visiting /foo/bar', function(assert) {
+test('visiting /foo/bar', function (assert) {
   visit('/foo/bar');
 
-  andThen(function() {
+  andThen(function () {
     assert.strictEqual(currentURL(), '/foo/bar');
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/default.js b/node-tests/fixtures/acceptance-test/default.js
index 9366e49660e..0662fdc1bc1 100644
--- a/node-tests/fixtures/acceptance-test/default.js
+++ b/node-tests/fixtures/acceptance-test/default.js
@@ -3,10 +3,10 @@ import moduleForAcceptance from 'my-app/tests/helpers/module-for-acceptance';
 
 moduleForAcceptance('Acceptance | foo');
 
-test('visiting /foo', function(assert) {
+test('visiting /foo', function (assert) {
   visit('/foo');
 
-  andThen(function() {
+  andThen(function () {
     assert.strictEqual(currentURL(), '/foo');
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/mocha-rfc268.js b/node-tests/fixtures/acceptance-test/mocha-rfc268.js
index 9f5c93d21f1..ee8ab318fc6 100644
--- a/node-tests/fixtures/acceptance-test/mocha-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/mocha-rfc268.js
@@ -3,10 +3,10 @@ import { expect } from 'chai';
 import { setupApplicationTest } from 'ember-mocha';
 import { visit, currentURL } from '@ember/test-helpers';
 
-describe('Acceptance | foo', function() {
+describe('Acceptance | foo', function () {
   setupApplicationTest();
 
-  it('can visit /foo', async function() {
+  it('can visit /foo', async function () {
     await visit('/foo');
     expect(currentURL()).to.equal('/foo');
   });
diff --git a/node-tests/fixtures/acceptance-test/mocha.js b/node-tests/fixtures/acceptance-test/mocha.js
index b2a8f0b6171..bd30772492e 100644
--- a/node-tests/fixtures/acceptance-test/mocha.js
+++ b/node-tests/fixtures/acceptance-test/mocha.js
@@ -3,18 +3,18 @@ import { expect } from 'chai';
 import startApp from 'my-app/tests/helpers/start-app';
 import { run } from '@ember/runloop';
 
-describe('Acceptance | foo', function() {
+describe('Acceptance | foo', function () {
   let application;
 
-  beforeEach(function() {
+  beforeEach(function () {
     application = startApp();
   });
 
-  afterEach(function() {
+  afterEach(function () {
     run(application, 'destroy');
   });
 
-  it('can visit /foo', function() {
+  it('can visit /foo', function () {
     visit('/foo');
 
     return andThen(() => {
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268.js b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
index 7e0c1af281e..480b0bacea1 100644
--- a/node-tests/fixtures/acceptance-test/qunit-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
@@ -2,10 +2,10 @@ import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 
-module('Acceptance | foo', function(hooks) {
+module('Acceptance | foo', function (hooks) {
   setupApplicationTest(hooks);
 
-  test('visiting /foo', async function(assert) {
+  test('visiting /foo', async function (assert) {
     await visit('/foo');
 
     assert.strictEqual(currentURL(), '/foo');
diff --git a/node-tests/fixtures/component-test/default-template.js b/node-tests/fixtures/component-test/default-template.js
index 50a896eedad..caf12d3460a 100644
--- a/node-tests/fixtures/component-test/default-template.js
+++ b/node-tests/fixtures/component-test/default-template.js
@@ -2,10 +2,10 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('<%= path =%><%= component =%>', 'Integration | Component | <%= component =%>', {
-  integration: true
+  integration: true,
 });
 
-test('it renders', function(assert) {
+test('it renders', function (assert) {
   // Set any properties with this.set('myProperty', 'value');
   // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/node-tests/fixtures/component-test/default.js b/node-tests/fixtures/component-test/default.js
index b1e00e2d5a5..e3ac770ec05 100644
--- a/node-tests/fixtures/component-test/default.js
+++ b/node-tests/fixtures/component-test/default.js
@@ -2,10 +2,10 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('x-foo', 'Integration | Component | x-foo', {
-  integration: true
+  integration: true,
 });
 
-test('it renders', function(assert) {
+test('it renders', function (assert) {
   // Set any properties with this.set('myProperty', 'value');
   // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/node-tests/fixtures/component-test/mocha-0.12-unit.js b/node-tests/fixtures/component-test/mocha-0.12-unit.js
index 05378537f6d..c98405285dd 100644
--- a/node-tests/fixtures/component-test/mocha-0.12-unit.js
+++ b/node-tests/fixtures/component-test/mocha-0.12-unit.js
@@ -2,14 +2,14 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupComponentTest } from 'ember-mocha';
 
-describe('Unit | Component | x-foo', function() {
+describe('Unit | Component | x-foo', function () {
   setupComponentTest('x-foo', {
     // Specify the other units that are required for this test
     // needs: ['component:foo', 'helper:bar'],
-    unit: true
+    unit: true,
   });
 
-  it('renders', function() {
+  it('renders', function () {
     // creates the component instance
     let component = this.subject();
     // renders the component on the page
diff --git a/node-tests/fixtures/component-test/mocha-0.12.js b/node-tests/fixtures/component-test/mocha-0.12.js
index 2cc9ca48a18..d15179c6bd7 100644
--- a/node-tests/fixtures/component-test/mocha-0.12.js
+++ b/node-tests/fixtures/component-test/mocha-0.12.js
@@ -3,12 +3,12 @@ import { describe, it } from 'mocha';
 import { setupComponentTest } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
-describe('Integration | Component | x-foo', function() {
+describe('Integration | Component | x-foo', function () {
   setupComponentTest('x-foo', {
-    integration: true
+    integration: true,
   });
 
-  it('renders', function() {
+  it('renders', function () {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/node-tests/fixtures/component-test/mocha-rfc232-unit.js b/node-tests/fixtures/component-test/mocha-rfc232-unit.js
index 72f1b87eb6d..eb920ec4225 100644
--- a/node-tests/fixtures/component-test/mocha-rfc232-unit.js
+++ b/node-tests/fixtures/component-test/mocha-rfc232-unit.js
@@ -2,10 +2,10 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Component | x-foo', function() {
+describe('Unit | Component | x-foo', function () {
   setupTest();
 
-  it('exists', function() {
+  it('exists', function () {
     let component = this.owner.factoryFor('component:x-foo').create();
     expect(component).to.be.ok;
   });
diff --git a/node-tests/fixtures/component-test/mocha-rfc232.js b/node-tests/fixtures/component-test/mocha-rfc232.js
index 377c35ea122..8b8d85dfb17 100644
--- a/node-tests/fixtures/component-test/mocha-rfc232.js
+++ b/node-tests/fixtures/component-test/mocha-rfc232.js
@@ -4,10 +4,10 @@ import { setupRenderingTest } from 'ember-mocha';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-describe('Integration | Component | x-foo', function() {
+describe('Integration | Component | x-foo', function () {
   setupRenderingTest();
 
-  it('renders', async function() {
+  it('renders', async function () {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.set('myAction', function(val) { ... });
 
diff --git a/node-tests/fixtures/component-test/mocha-unit.js b/node-tests/fixtures/component-test/mocha-unit.js
index b5aeb40d2aa..8a39bb4fbac 100644
--- a/node-tests/fixtures/component-test/mocha-unit.js
+++ b/node-tests/fixtures/component-test/mocha-unit.js
@@ -1,14 +1,16 @@
 import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';
 
-describeComponent('x-foo', 'Unit | Component | x-foo',
+describeComponent(
+  'x-foo',
+  'Unit | Component | x-foo',
   {
     // Specify the other units that are required for this test
     // needs: ['component:foo', 'helper:bar'],
-    unit: true
+    unit: true,
   },
-  function() {
-    it('renders', function() {
+  function () {
+    it('renders', function () {
       // creates the component instance
       let component = this.subject();
       // renders the component on the page
diff --git a/node-tests/fixtures/component-test/mocha.js b/node-tests/fixtures/component-test/mocha.js
index 0d81e511bb2..c2d3a7f7355 100644
--- a/node-tests/fixtures/component-test/mocha.js
+++ b/node-tests/fixtures/component-test/mocha.js
@@ -2,12 +2,14 @@ import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
-describeComponent('x-foo', 'Integration | Component | x-foo',
+describeComponent(
+  'x-foo',
+  'Integration | Component | x-foo',
   {
-    integration: true
+    integration: true,
   },
-  function() {
-    it('renders', function() {
+  function () {
+    it('renders', function () {
       // Set any properties with this.set('myProperty', 'value');
       // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/node-tests/fixtures/component-test/rfc232-unit.js b/node-tests/fixtures/component-test/rfc232-unit.js
index 8aa1687366b..848f8a3dec6 100644
--- a/node-tests/fixtures/component-test/rfc232-unit.js
+++ b/node-tests/fixtures/component-test/rfc232-unit.js
@@ -1,10 +1,10 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Component | x-foo', function(hooks) {
+module('Unit | Component | x-foo', function (hooks) {
   setupTest(hooks);
 
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let component = this.owner.factoryFor('component:x-foo').create();
     assert.ok(component);
   });
diff --git a/node-tests/fixtures/component-test/rfc232.js b/node-tests/fixtures/component-test/rfc232.js
index 1cd0d54a48c..3e3a9dded48 100644
--- a/node-tests/fixtures/component-test/rfc232.js
+++ b/node-tests/fixtures/component-test/rfc232.js
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-module('Integration | Component | x-foo', function(hooks) {
+module('Integration | Component | x-foo', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.set('myAction', function(val) { ... });
 
diff --git a/node-tests/fixtures/component-test/unit.js b/node-tests/fixtures/component-test/unit.js
index 3c99855df22..e0315a88335 100644
--- a/node-tests/fixtures/component-test/unit.js
+++ b/node-tests/fixtures/component-test/unit.js
@@ -3,11 +3,10 @@ import { moduleForComponent, test } from 'ember-qunit';
 moduleForComponent('x-foo', 'Unit | Component | x-foo', {
   // Specify the other units that are required for this test
   // needs: ['component:foo', 'helper:bar'],
-  unit: true
+  unit: true,
 });
 
-test('it renders', function(assert) {
-  
+test('it renders', function (assert) {
   // Creates the component instance
   /*let component =*/ this.subject();
   // Renders the component to the page
diff --git a/node-tests/fixtures/component/component-dash.js b/node-tests/fixtures/component/component-dash.js
index 9e23a7c24fc..77fcff7ef89 100644
--- a/node-tests/fixtures/component/component-dash.js
+++ b/node-tests/fixtures/component/component-dash.js
@@ -1,4 +1,3 @@
 import Component from '@glimmer/component';
 
-export default class XFooComponent extends Component {
-}
+export default class XFooComponent extends Component {}
diff --git a/node-tests/fixtures/component/component-nested.js b/node-tests/fixtures/component/component-nested.js
index 4894221b299..b1da76d57d4 100644
--- a/node-tests/fixtures/component/component-nested.js
+++ b/node-tests/fixtures/component/component-nested.js
@@ -1,4 +1,3 @@
 import Component from '@glimmer/component';
 
-export default class FooXFooComponent extends Component {
-}
+export default class FooXFooComponent extends Component {}
diff --git a/node-tests/fixtures/component/component.js b/node-tests/fixtures/component/component.js
index ae749fcda9b..5663784b5d5 100644
--- a/node-tests/fixtures/component/component.js
+++ b/node-tests/fixtures/component/component.js
@@ -1,4 +1,3 @@
 import Component from '@glimmer/component';
 
-export default class FooComponent extends Component {
-}
+export default class FooComponent extends Component {}
diff --git a/node-tests/fixtures/controller-test/default-nested.js b/node-tests/fixtures/controller-test/default-nested.js
index 8775fe7aefa..d7ee67d9bf4 100644
--- a/node-tests/fixtures/controller-test/default-nested.js
+++ b/node-tests/fixtures/controller-test/default-nested.js
@@ -6,7 +6,7 @@ moduleFor('controller:foo/bar', 'Unit | Controller | foo/bar', {
 });
 
 // TODO: Replace this with your real tests.
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let controller = this.subject();
   assert.ok(controller);
 });
diff --git a/node-tests/fixtures/controller-test/default.js b/node-tests/fixtures/controller-test/default.js
index 97d30048db1..ce293abaebd 100644
--- a/node-tests/fixtures/controller-test/default.js
+++ b/node-tests/fixtures/controller-test/default.js
@@ -6,7 +6,7 @@ moduleFor('controller:foo', 'Unit | Controller | foo', {
 });
 
 // TODO: Replace this with your real tests.
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let controller = this.subject();
   assert.ok(controller);
 });
diff --git a/node-tests/fixtures/controller-test/mocha-0.12-nested.js b/node-tests/fixtures/controller-test/mocha-0.12-nested.js
index 57b82b4f136..0b33f570ed9 100644
--- a/node-tests/fixtures/controller-test/mocha-0.12-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-0.12-nested.js
@@ -2,14 +2,14 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Controller | foo/bar', function() {
+describe('Unit | Controller | foo/bar', function () {
   setupTest('controller:foo/bar', {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   });
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let controller = this.subject();
     expect(controller).to.be.ok;
   });
diff --git a/node-tests/fixtures/controller-test/mocha-0.12.js b/node-tests/fixtures/controller-test/mocha-0.12.js
index eb39fcd92be..44d665349bd 100644
--- a/node-tests/fixtures/controller-test/mocha-0.12.js
+++ b/node-tests/fixtures/controller-test/mocha-0.12.js
@@ -2,14 +2,14 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Controller | foo', function() {
+describe('Unit | Controller | foo', function () {
   setupTest('controller:foo', {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   });
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let controller = this.subject();
     expect(controller).to.be.ok;
   });
diff --git a/node-tests/fixtures/controller-test/mocha-nested.js b/node-tests/fixtures/controller-test/mocha-nested.js
index 8e3a62027b1..0810b155690 100644
--- a/node-tests/fixtures/controller-test/mocha-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-nested.js
@@ -1,14 +1,16 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('controller:foo/bar', 'Unit | Controller | foo/bar',
+describeModule(
+  'controller:foo/bar',
+  'Unit | Controller | foo/bar',
   {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   },
-  function() {
+  function () {
     // TODO: Replace this with your real tests.
-    it('exists', function() {
+    it('exists', function () {
       let controller = this.subject();
       expect(controller).to.be.ok;
     });
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
index addbae8ee7d..a957691c713 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
@@ -2,11 +2,11 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Controller | foo/bar', function() {
+describe('Unit | Controller | foo/bar', function () {
   setupTest();
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let controller = this.owner.lookup('controller:foo/bar');
     expect(controller).to.be.ok;
   });
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232.js b/node-tests/fixtures/controller-test/mocha-rfc232.js
index b21b4dadb5b..cbfb5c0665a 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232.js
@@ -2,11 +2,11 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Controller | foo', function() {
+describe('Unit | Controller | foo', function () {
   setupTest();
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let controller = this.owner.lookup('controller:foo');
     expect(controller).to.be.ok;
   });
diff --git a/node-tests/fixtures/controller-test/mocha.js b/node-tests/fixtures/controller-test/mocha.js
index 2ab57c0d820..989643d1552 100644
--- a/node-tests/fixtures/controller-test/mocha.js
+++ b/node-tests/fixtures/controller-test/mocha.js
@@ -1,14 +1,16 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('controller:foo', 'Unit | Controller | foo',
+describeModule(
+  'controller:foo',
+  'Unit | Controller | foo',
   {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   },
-  function() {
+  function () {
     // TODO: Replace this with your real tests.
-    it('exists', function() {
+    it('exists', function () {
       let controller = this.subject();
       expect(controller).to.be.ok;
     });
diff --git a/node-tests/fixtures/controller-test/rfc232-nested.js b/node-tests/fixtures/controller-test/rfc232-nested.js
index a4b9f1b4ec4..aecdde3dd5f 100644
--- a/node-tests/fixtures/controller-test/rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/rfc232-nested.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Controller | foo/bar', function(hooks) {
+module('Unit | Controller | foo/bar', function (hooks) {
   setupTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let controller = this.owner.lookup('controller:foo/bar');
     assert.ok(controller);
   });
diff --git a/node-tests/fixtures/controller-test/rfc232.js b/node-tests/fixtures/controller-test/rfc232.js
index 7b7fce3846e..c4815a2ea8c 100644
--- a/node-tests/fixtures/controller-test/rfc232.js
+++ b/node-tests/fixtures/controller-test/rfc232.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Controller | foo', function(hooks) {
+module('Unit | Controller | foo', function (hooks) {
   setupTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let controller = this.owner.lookup('controller:foo');
     assert.ok(controller);
   });
diff --git a/node-tests/fixtures/controller/controller-nested.js b/node-tests/fixtures/controller/controller-nested.js
index 2461fdcd5cb..1d43f2f7b51 100644
--- a/node-tests/fixtures/controller/controller-nested.js
+++ b/node-tests/fixtures/controller/controller-nested.js
@@ -1,4 +1,3 @@
 import Controller from '@ember/controller';
 
-export default class FooBarController extends Controller {
-}
+export default class FooBarController extends Controller {}
diff --git a/node-tests/fixtures/controller/controller.js b/node-tests/fixtures/controller/controller.js
index 987a05b3be6..e62a7ed792d 100644
--- a/node-tests/fixtures/controller/controller.js
+++ b/node-tests/fixtures/controller/controller.js
@@ -1,4 +1,3 @@
 import Controller from '@ember/controller';
 
-export default class FooController extends Controller {
-}
+export default class FooController extends Controller {}
diff --git a/node-tests/fixtures/helper-test/integration.js b/node-tests/fixtures/helper-test/integration.js
index f2655c45ec9..232b3af1558 100644
--- a/node-tests/fixtures/helper-test/integration.js
+++ b/node-tests/fixtures/helper-test/integration.js
@@ -2,11 +2,11 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('foo/bar-baz', 'helper:foo/bar-baz', {
-  integration: true
+  integration: true,
 });
 
 // TODO: Replace this with your real tests.
-test('it renders', function(assert) {
+test('it renders', function (assert) {
   this.set('inputValue', '1234');
 
   this.render(hbs`{{foo/bar-baz this.inputValue}}`);
diff --git a/node-tests/fixtures/helper-test/mocha-0.12.js b/node-tests/fixtures/helper-test/mocha-0.12.js
index 7c6f1b33dad..64d1bca53c9 100644
--- a/node-tests/fixtures/helper-test/mocha-0.12.js
+++ b/node-tests/fixtures/helper-test/mocha-0.12.js
@@ -3,12 +3,12 @@ import { describe, it } from 'mocha';
 import { setupComponentTest } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
-describe('Integration | Helper | foo/bar-baz', function() {
+describe('Integration | Helper | foo/bar-baz', function () {
   setupComponentTest('foo/bar-baz', {
-    integration: true
+    integration: true,
   });
 
-  it('renders', function() {
+  it('renders', function () {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
     // Template block usage:
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232.js b/node-tests/fixtures/helper-test/mocha-rfc232.js
index 2337d5c74f2..6017c0f6292 100644
--- a/node-tests/fixtures/helper-test/mocha-rfc232.js
+++ b/node-tests/fixtures/helper-test/mocha-rfc232.js
@@ -4,11 +4,11 @@ import { setupRenderingTest } from 'ember-mocha';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-describe('Integration | Helper | foo/bar-baz', function() {
+describe('Integration | Helper | foo/bar-baz', function () {
   setupRenderingTest();
 
   // TODO: Replace this with your real tests.
-  it('renders', async function() {
+  it('renders', async function () {
     this.set('inputValue', '1234');
 
     await render(hbs`{{foo/bar-baz this.inputValue}}`);
diff --git a/node-tests/fixtures/helper-test/mocha.js b/node-tests/fixtures/helper-test/mocha.js
index 37544b7c641..dd93cd84e46 100644
--- a/node-tests/fixtures/helper-test/mocha.js
+++ b/node-tests/fixtures/helper-test/mocha.js
@@ -2,12 +2,14 @@ import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
-describeComponent('foo/bar-baz', 'helper:foo/bar-baz',
+describeComponent(
+  'foo/bar-baz',
+  'helper:foo/bar-baz',
   {
-    integration: true
+    integration: true,
   },
-  function() {
-    it('renders', function() {
+  function () {
+    it('renders', function () {
       // Set any properties with this.set('myProperty', 'value');
       // Handle any actions with this.on('myAction', function(val) { ... });
       // Template block usage:
diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/rfc232.js
index c39592e478c..4c666b1afbd 100644
--- a/node-tests/fixtures/helper-test/rfc232.js
+++ b/node-tests/fixtures/helper-test/rfc232.js
@@ -3,11 +3,11 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
-module('Integration | Helper | foo/bar-baz', function(hooks) {
+module('Integration | Helper | foo/bar-baz', function (hooks) {
   setupRenderingTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     this.set('inputValue', '1234');
 
     await render(hbs`{{foo/bar-baz this.inputValue}}`);
diff --git a/node-tests/fixtures/helper/helper.js b/node-tests/fixtures/helper/helper.js
index a28d3cabcd6..f9ba5222510 100644
--- a/node-tests/fixtures/helper/helper.js
+++ b/node-tests/fixtures/helper/helper.js
@@ -1,5 +1,5 @@
 import { helper } from '@ember/component/helper';
 
-export default helper(function fooBarBaz(positional/*, named*/) {
+export default helper(function fooBarBaz(positional /*, named*/) {
   return positional;
 });
diff --git a/node-tests/fixtures/helper/mu-helper.js b/node-tests/fixtures/helper/mu-helper.js
index e4fe6b2b4c5..88c8894ebd3 100644
--- a/node-tests/fixtures/helper/mu-helper.js
+++ b/node-tests/fixtures/helper/mu-helper.js
@@ -1,6 +1,6 @@
 import { helper as buildHelper } from '@ember/component/helper';
 
-export function fooBarBaz(positional/*, named*/) {
+export function fooBarBaz(positional /*, named*/) {
   return positional;
 }
 
diff --git a/node-tests/fixtures/initializer-test/default.js b/node-tests/fixtures/initializer-test/default.js
index 29ab5d4ef1c..3cc5b0c3db0 100644
--- a/node-tests/fixtures/initializer-test/default.js
+++ b/node-tests/fixtures/initializer-test/default.js
@@ -4,7 +4,6 @@ import { run } from '@ember/runloop';
 import { initialize } from 'my-app/initializers/foo';
 import { module, test } from 'qunit';
 
-
 module('Unit | Initializer | foo', {
   beforeEach() {
     run(() => {
@@ -14,11 +13,11 @@ module('Unit | Initializer | foo', {
   },
   afterEach() {
     run(this.application, 'destroy');
-  }
+  },
 });
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   initialize(this.application);
 
   // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/initializer-test/dummy.js b/node-tests/fixtures/initializer-test/dummy.js
index b48e96cece5..4ef19373903 100644
--- a/node-tests/fixtures/initializer-test/dummy.js
+++ b/node-tests/fixtures/initializer-test/dummy.js
@@ -4,7 +4,6 @@ import { run } from '@ember/runloop';
 import { initialize } from 'dummy/initializers/foo';
 import { module, test } from 'qunit';
 
-
 module('Unit | Initializer | foo', {
   beforeEach() {
     run(() => {
@@ -14,11 +13,11 @@ module('Unit | Initializer | foo', {
   },
   afterEach() {
     run(this.application, 'destroy');
-  }
+  },
 });
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   initialize(this.application);
 
   // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/initializer-test/mocha-rfc232.js b/node-tests/fixtures/initializer-test/mocha-rfc232.js
index ee2a5fb026d..d203fccc6da 100644
--- a/node-tests/fixtures/initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/initializer-test/mocha-rfc232.js
@@ -4,23 +4,23 @@ import Application from '@ember/application';
 import { initialize } from 'my-app/initializers/foo';
 import { run } from '@ember/runloop';
 
-describe('Unit | Initializer | foo', function() {
-  beforeEach(function() {
+describe('Unit | Initializer | foo', function () {
+  beforeEach(function () {
     this.TestApplication = Application.extend();
     this.TestApplication.initializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
 
     this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  afterEach(function() {
+  afterEach(function () {
     run(this.application, 'destroy');
   });
 
   // TODO: Replace this with your real tests.
-  it('works', async function() {
+  it('works', async function () {
     await this.application.boot();
 
     // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/initializer-test/mocha.js b/node-tests/fixtures/initializer-test/mocha.js
index a59442cc5ef..242f7e91388 100644
--- a/node-tests/fixtures/initializer-test/mocha.js
+++ b/node-tests/fixtures/initializer-test/mocha.js
@@ -4,23 +4,22 @@ import { run } from '@ember/runloop';
 import Application from '@ember/application';
 import { initialize } from 'my-app/initializers/foo';
 
-
-describe('Unit | Initializer | foo', function() {
+describe('Unit | Initializer | foo', function () {
   let application;
 
-  beforeEach(function() {
-    run(function() {
+  beforeEach(function () {
+    run(function () {
       application = Application.create();
       application.deferReadiness();
     });
   });
 
-  afterEach(function() {
+  afterEach(function () {
     run(application, 'destroy');
   });
 
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     initialize(application);
 
     // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/initializer/initializer-nested.js b/node-tests/fixtures/initializer/initializer-nested.js
index f3083e3831a..66078297b08 100644
--- a/node-tests/fixtures/initializer/initializer-nested.js
+++ b/node-tests/fixtures/initializer/initializer-nested.js
@@ -1,6 +1,5 @@
-export function initialize(/* application */) {
-}
+export function initialize(/* application */) {}
 
 export default {
-  initialize
+  initialize,
 };
diff --git a/node-tests/fixtures/initializer/initializer.js b/node-tests/fixtures/initializer/initializer.js
index f3083e3831a..66078297b08 100644
--- a/node-tests/fixtures/initializer/initializer.js
+++ b/node-tests/fixtures/initializer/initializer.js
@@ -1,6 +1,5 @@
-export function initialize(/* application */) {
-}
+export function initialize(/* application */) {}
 
 export default {
-  initialize
+  initialize,
 };
diff --git a/node-tests/fixtures/instance-initializer-test/default.js b/node-tests/fixtures/instance-initializer-test/default.js
index 7c4bb90e57a..a9c9927c0f4 100644
--- a/node-tests/fixtures/instance-initializer-test/default.js
+++ b/node-tests/fixtures/instance-initializer-test/default.js
@@ -13,11 +13,11 @@ module('Unit | Instance Initializer | foo', {
   afterEach() {
     run(this.appInstance, 'destroy');
     run(this.application, 'destroy');
-  }
+  },
 });
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   initialize(this.appInstance);
 
   // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/instance-initializer-test/dummy.js b/node-tests/fixtures/instance-initializer-test/dummy.js
index 1ab4f1dbff0..55d16cccb36 100644
--- a/node-tests/fixtures/instance-initializer-test/dummy.js
+++ b/node-tests/fixtures/instance-initializer-test/dummy.js
@@ -13,11 +13,11 @@ module('Unit | Instance Initializer | foo', {
   afterEach() {
     run(this.appInstance, 'destroy');
     run(this.application, 'destroy');
-  }
+  },
 });
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   initialize(this.appInstance);
 
   // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
index 9c2702d5470..994286e1b88 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
@@ -4,23 +4,23 @@ import Application from '@ember/application';
 import { initialize } from 'my-app/instance-initializers/foo';
 import { run } from '@ember/runloop';
 
-describe('Unit | Instance Initializer | foo', function() {
-  beforeEach(function() {
+describe('Unit | Instance Initializer | foo', function () {
+  beforeEach(function () {
     this.TestApplication = Application.extend();
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
     this.application = this.TestApplication.create({ autoboot: false });
     this.instance = this.application.buildInstance();
   });
-  afterEach(function() {
+  afterEach(function () {
     run(this.instance, 'destroy');
     run(this.application, 'destroy');
   });
 
   // TODO: Replace this with your real tests.
-  it('works', async function() {
+  it('works', async function () {
     await this.instance.boot();
 
     expect(true).to.be.ok;
diff --git a/node-tests/fixtures/instance-initializer-test/mocha.js b/node-tests/fixtures/instance-initializer-test/mocha.js
index 50dbe0a1c17..89b409cc033 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha.js
@@ -5,23 +5,23 @@ import { run } from '@ember/runloop';
 import { initialize } from 'my-app/instance-initializers/foo';
 import destroyApp from '../../helpers/destroy-app';
 
-describe('Unit | Instance Initializer | foo', function() {
+describe('Unit | Instance Initializer | foo', function () {
   let application, appInstance;
 
-  beforeEach(function() {
-    run(function() {
+  beforeEach(function () {
+    run(function () {
       application = Application.create();
       appInstance = application.buildInstance();
     });
   });
 
-  afterEach(function() {
+  afterEach(function () {
     run(appInstance, 'destroy');
     destroyApp(application);
   });
 
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     initialize(appInstance);
 
     // you would normally confirm the results of the initializer here
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
index fefc0f80a2d..e1755216147 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
@@ -1,6 +1,5 @@
-export function initialize(/* appInstance */) {
-}
+export function initialize(/* appInstance */) {}
 
 export default {
-  initialize
+  initialize,
 };
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer.js b/node-tests/fixtures/instance-initializer/instance-initializer.js
index fefc0f80a2d..e1755216147 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer.js
@@ -1,6 +1,5 @@
-export function initialize(/* appInstance */) {
-}
+export function initialize(/* appInstance */) {}
 
 export default {
-  initialize
+  initialize,
 };
diff --git a/node-tests/fixtures/mixin-test/addon.js b/node-tests/fixtures/mixin-test/addon.js
index da7da2da1fc..73ed2ccabe6 100644
--- a/node-tests/fixtures/mixin-test/addon.js
+++ b/node-tests/fixtures/mixin-test/addon.js
@@ -5,7 +5,7 @@ import { module, test } from 'qunit';
 module('Unit | Mixin | foo');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let FooObject = EmberObject.extend(FooMixin);
   let subject = FooObject.create();
   assert.ok(subject);
diff --git a/node-tests/fixtures/mixin-test/default.js b/node-tests/fixtures/mixin-test/default.js
index 1880e85c7b4..070c444471d 100644
--- a/node-tests/fixtures/mixin-test/default.js
+++ b/node-tests/fixtures/mixin-test/default.js
@@ -5,7 +5,7 @@ import { module, test } from 'qunit';
 module('Unit | Mixin | foo');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let FooObject = EmberObject.extend(FooMixin);
   let subject = FooObject.create();
   assert.ok(subject);
diff --git a/node-tests/fixtures/mixin-test/mocha-rfc232.js b/node-tests/fixtures/mixin-test/mocha-rfc232.js
index 449cd5d41b6..4c261059db6 100644
--- a/node-tests/fixtures/mixin-test/mocha-rfc232.js
+++ b/node-tests/fixtures/mixin-test/mocha-rfc232.js
@@ -3,9 +3,9 @@ import { describe, it } from 'mocha';
 import EmberObject from '@ember/object';
 import FooMixin from 'my-app/mixins/foo';
 
-describe('Unit | Mixin | foo', function() {
+describe('Unit | Mixin | foo', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let FooObject = EmberObject.extend(FooMixin);
     let subject = FooObject.create();
     expect(subject).to.be.ok;
diff --git a/node-tests/fixtures/mixin-test/mocha.js b/node-tests/fixtures/mixin-test/mocha.js
index 449cd5d41b6..4c261059db6 100644
--- a/node-tests/fixtures/mixin-test/mocha.js
+++ b/node-tests/fixtures/mixin-test/mocha.js
@@ -3,9 +3,9 @@ import { describe, it } from 'mocha';
 import EmberObject from '@ember/object';
 import FooMixin from 'my-app/mixins/foo';
 
-describe('Unit | Mixin | foo', function() {
+describe('Unit | Mixin | foo', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let FooObject = EmberObject.extend(FooMixin);
     let subject = FooObject.create();
     expect(subject).to.be.ok;
diff --git a/node-tests/fixtures/mixin-test/rfc232.js b/node-tests/fixtures/mixin-test/rfc232.js
index 2b76ff468a4..78c90f206b5 100644
--- a/node-tests/fixtures/mixin-test/rfc232.js
+++ b/node-tests/fixtures/mixin-test/rfc232.js
@@ -2,7 +2,7 @@ import EmberObject from '@ember/object';
 import FooMixin from 'my-app/mixins/foo';
 import { module, test } from 'qunit';
 
-module('Unit | Mixin | foo', function() {
+module('Unit | Mixin | foo', function () {
   // TODO: Replace this with your real tests.
   test('it works', function (assert) {
     let FooObject = EmberObject.extend(FooMixin);
diff --git a/node-tests/fixtures/route-test/default-child.js b/node-tests/fixtures/route-test/default-child.js
index 6ab71d91996..6e0f2ea37a3 100644
--- a/node-tests/fixtures/route-test/default-child.js
+++ b/node-tests/fixtures/route-test/default-child.js
@@ -5,7 +5,7 @@ moduleFor('route:child', 'Unit | Route | parent/child', {
   // needs: ['controller:foo']
 });
 
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let route = this.subject();
   assert.ok(route);
 });
diff --git a/node-tests/fixtures/route-test/default-nested.js b/node-tests/fixtures/route-test/default-nested.js
index 2484d6bd626..8bea0da02a6 100644
--- a/node-tests/fixtures/route-test/default-nested.js
+++ b/node-tests/fixtures/route-test/default-nested.js
@@ -5,7 +5,7 @@ moduleFor('route:foo/bar', 'Unit | Route | foo/bar', {
   // needs: ['controller:foo']
 });
 
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let route = this.subject();
   assert.ok(route);
 });
diff --git a/node-tests/fixtures/route-test/default.js b/node-tests/fixtures/route-test/default.js
index 52c198bce1f..d8b44fbee47 100644
--- a/node-tests/fixtures/route-test/default.js
+++ b/node-tests/fixtures/route-test/default.js
@@ -5,7 +5,7 @@ moduleFor('route:foo', 'Unit | Route | foo', {
   // needs: ['controller:foo']
 });
 
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let route = this.subject();
   assert.ok(route);
 });
diff --git a/node-tests/fixtures/route-test/mocha-0.12.js b/node-tests/fixtures/route-test/mocha-0.12.js
index dbcda035e7e..8ac8c375168 100644
--- a/node-tests/fixtures/route-test/mocha-0.12.js
+++ b/node-tests/fixtures/route-test/mocha-0.12.js
@@ -2,13 +2,13 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Route | foo', function() {
+describe('Unit | Route | foo', function () {
   setupTest('route:foo', {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   });
 
-  it('exists', function() {
+  it('exists', function () {
     let route = this.subject();
     expect(route).to.be.ok;
   });
diff --git a/node-tests/fixtures/route-test/mocha-rfc232.js b/node-tests/fixtures/route-test/mocha-rfc232.js
index b368708f37e..0ae4896e73f 100644
--- a/node-tests/fixtures/route-test/mocha-rfc232.js
+++ b/node-tests/fixtures/route-test/mocha-rfc232.js
@@ -2,10 +2,10 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Route | foo', function() {
+describe('Unit | Route | foo', function () {
   setupTest();
 
-  it('exists', function() {
+  it('exists', function () {
     let route = this.owner.lookup('route:foo');
     expect(route).to.be.ok;
   });
diff --git a/node-tests/fixtures/route-test/mocha.js b/node-tests/fixtures/route-test/mocha.js
index 59064a5f868..11328c6913c 100644
--- a/node-tests/fixtures/route-test/mocha.js
+++ b/node-tests/fixtures/route-test/mocha.js
@@ -1,13 +1,15 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('route:foo', 'Unit | Route | foo',
+describeModule(
+  'route:foo',
+  'Unit | Route | foo',
   {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   },
-  function() {
-    it('exists', function() {
+  function () {
+    it('exists', function () {
       let route = this.subject();
       expect(route).to.be.ok;
     });
diff --git a/node-tests/fixtures/route-test/rfc232.js b/node-tests/fixtures/route-test/rfc232.js
index eec4697f0a0..3d6bf9b098b 100644
--- a/node-tests/fixtures/route-test/rfc232.js
+++ b/node-tests/fixtures/route-test/rfc232.js
@@ -1,10 +1,10 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Route | foo', function(hooks) {
+module('Unit | Route | foo', function (hooks) {
   setupTest(hooks);
 
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let route = this.owner.lookup('route:foo');
     assert.ok(route);
   });
diff --git a/node-tests/fixtures/route/route-child.js b/node-tests/fixtures/route/route-child.js
index 8481ba97ba5..1c7ff09d7f3 100644
--- a/node-tests/fixtures/route/route-child.js
+++ b/node-tests/fixtures/route/route-child.js
@@ -1,4 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class ParentChildRoute extends Route {
-}
+export default class ParentChildRoute extends Route {}
diff --git a/node-tests/fixtures/route/route-nested.js b/node-tests/fixtures/route/route-nested.js
index 5a0c1661f75..ef44fb6e59f 100644
--- a/node-tests/fixtures/route/route-nested.js
+++ b/node-tests/fixtures/route/route-nested.js
@@ -1,4 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class FooBarRoute extends Route {
-}
+export default class FooBarRoute extends Route {}
diff --git a/node-tests/fixtures/route/route.js b/node-tests/fixtures/route/route.js
index fa31033660d..311d0a00f1c 100644
--- a/node-tests/fixtures/route/route.js
+++ b/node-tests/fixtures/route/route.js
@@ -1,4 +1,3 @@
 import Route from '@ember/routing/route';
 
-export default class FooRoute extends Route {
-}
+export default class FooRoute extends Route {}
diff --git a/node-tests/fixtures/service-test/default-nested.js b/node-tests/fixtures/service-test/default-nested.js
index a2acf7ea09d..e0200f9c32b 100644
--- a/node-tests/fixtures/service-test/default-nested.js
+++ b/node-tests/fixtures/service-test/default-nested.js
@@ -6,7 +6,7 @@ moduleFor('service:foo/bar', 'Unit | Service | foo/bar', {
 });
 
 // TODO: Replace this with your real tests.
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let service = this.subject();
   assert.ok(service);
 });
diff --git a/node-tests/fixtures/service-test/default.js b/node-tests/fixtures/service-test/default.js
index 2e5321ecd48..e3edff4a145 100644
--- a/node-tests/fixtures/service-test/default.js
+++ b/node-tests/fixtures/service-test/default.js
@@ -6,7 +6,7 @@ moduleFor('service:foo', 'Unit | Service | foo', {
 });
 
 // TODO: Replace this with your real tests.
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let service = this.subject();
   assert.ok(service);
 });
diff --git a/node-tests/fixtures/service-test/mocha-0.12.js b/node-tests/fixtures/service-test/mocha-0.12.js
index bf2023f1f49..694b3603d55 100644
--- a/node-tests/fixtures/service-test/mocha-0.12.js
+++ b/node-tests/fixtures/service-test/mocha-0.12.js
@@ -2,14 +2,14 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Service | foo', function() {
+describe('Unit | Service | foo', function () {
   setupTest('service:foo', {
     // Specify the other units that are required for this test.
     // needs: ['service:foo']
   });
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let service = this.subject();
     expect(service).to.be.ok;
   });
diff --git a/node-tests/fixtures/service-test/mocha-rfc232.js b/node-tests/fixtures/service-test/mocha-rfc232.js
index 65905b9e1ec..3aa66206dc2 100644
--- a/node-tests/fixtures/service-test/mocha-rfc232.js
+++ b/node-tests/fixtures/service-test/mocha-rfc232.js
@@ -2,11 +2,11 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('Unit | Service | foo', function() {
+describe('Unit | Service | foo', function () {
   setupTest();
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let service = this.owner.lookup('service:foo');
     expect(service).to.be.ok;
   });
diff --git a/node-tests/fixtures/service-test/mocha.js b/node-tests/fixtures/service-test/mocha.js
index f8909b0a8c2..b03dd281787 100644
--- a/node-tests/fixtures/service-test/mocha.js
+++ b/node-tests/fixtures/service-test/mocha.js
@@ -1,14 +1,16 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('service:foo', 'Unit | Service | foo',
+describeModule(
+  'service:foo',
+  'Unit | Service | foo',
   {
     // Specify the other units that are required for this test.
     // needs: ['service:foo']
   },
-  function() {
+  function () {
     // TODO: Replace this with your real tests.
-    it('exists', function() {
+    it('exists', function () {
       let service = this.subject();
       expect(service).to.be.ok;
     });
diff --git a/node-tests/fixtures/service-test/rfc232.js b/node-tests/fixtures/service-test/rfc232.js
index 9d6efae3174..f54363db7ca 100644
--- a/node-tests/fixtures/service-test/rfc232.js
+++ b/node-tests/fixtures/service-test/rfc232.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('Unit | Service | foo', function(hooks) {
+module('Unit | Service | foo', function (hooks) {
   setupTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let service = this.owner.lookup('service:foo');
     assert.ok(service);
   });
diff --git a/node-tests/fixtures/service/service-nested.js b/node-tests/fixtures/service/service-nested.js
index b6205148786..25979e899ca 100644
--- a/node-tests/fixtures/service/service-nested.js
+++ b/node-tests/fixtures/service/service-nested.js
@@ -1,4 +1,3 @@
 import Service from '@ember/service';
 
-export default class FooBarService extends Service {
-}
+export default class FooBarService extends Service {}
diff --git a/node-tests/fixtures/service/service.js b/node-tests/fixtures/service/service.js
index 8447de6df53..f26f8b62490 100644
--- a/node-tests/fixtures/service/service.js
+++ b/node-tests/fixtures/service/service.js
@@ -1,4 +1,3 @@
 import Service from '@ember/service';
 
-export default class FooService extends Service {
-}
+export default class FooService extends Service {}
diff --git a/node-tests/fixtures/util-test/addon-default-nested.js b/node-tests/fixtures/util-test/addon-default-nested.js
index e1ffab78d16..6d88f77241d 100644
--- a/node-tests/fixtures/util-test/addon-default-nested.js
+++ b/node-tests/fixtures/util-test/addon-default-nested.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 module('Unit | Utility | foo/bar-baz');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let result = fooBarBaz();
   assert.ok(result);
 });
diff --git a/node-tests/fixtures/util-test/addon-default.js b/node-tests/fixtures/util-test/addon-default.js
index 164b20ab8ff..ce2487e6193 100644
--- a/node-tests/fixtures/util-test/addon-default.js
+++ b/node-tests/fixtures/util-test/addon-default.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 module('Unit | Utility | foo-bar');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let result = fooBar();
   assert.ok(result);
 });
diff --git a/node-tests/fixtures/util-test/default-nested.js b/node-tests/fixtures/util-test/default-nested.js
index 9688d485e6e..26f82416b54 100644
--- a/node-tests/fixtures/util-test/default-nested.js
+++ b/node-tests/fixtures/util-test/default-nested.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 module('Unit | Utility | foo/bar-baz');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let result = fooBarBaz();
   assert.ok(result);
 });
diff --git a/node-tests/fixtures/util-test/default.js b/node-tests/fixtures/util-test/default.js
index 44ccfaa7f2d..dc3851312bb 100644
--- a/node-tests/fixtures/util-test/default.js
+++ b/node-tests/fixtures/util-test/default.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 module('Unit | Utility | foo-bar');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let result = fooBar();
   assert.ok(result);
 });
diff --git a/node-tests/fixtures/util-test/dummy.js b/node-tests/fixtures/util-test/dummy.js
index 164b20ab8ff..ce2487e6193 100644
--- a/node-tests/fixtures/util-test/dummy.js
+++ b/node-tests/fixtures/util-test/dummy.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 module('Unit | Utility | foo-bar');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let result = fooBar();
   assert.ok(result);
 });
diff --git a/node-tests/fixtures/util-test/mocha-rfc232.js b/node-tests/fixtures/util-test/mocha-rfc232.js
index d99ec534e41..2e76e59d5e5 100644
--- a/node-tests/fixtures/util-test/mocha-rfc232.js
+++ b/node-tests/fixtures/util-test/mocha-rfc232.js
@@ -2,9 +2,9 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import fooBar from 'my-app/utils/foo-bar';
 
-describe('Unit | Utility | foo-bar', function() {
+describe('Unit | Utility | foo-bar', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let result = fooBar();
     expect(result).to.be.ok;
   });
diff --git a/node-tests/fixtures/util-test/mocha.js b/node-tests/fixtures/util-test/mocha.js
index d99ec534e41..2e76e59d5e5 100644
--- a/node-tests/fixtures/util-test/mocha.js
+++ b/node-tests/fixtures/util-test/mocha.js
@@ -2,9 +2,9 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import fooBar from 'my-app/utils/foo-bar';
 
-describe('Unit | Utility | foo-bar', function() {
+describe('Unit | Utility | foo-bar', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let result = fooBar();
     expect(result).to.be.ok;
   });
diff --git a/node-tests/fixtures/util-test/rfc232.js b/node-tests/fixtures/util-test/rfc232.js
index 45a0a808ffc..d7c5def38ea 100644
--- a/node-tests/fixtures/util-test/rfc232.js
+++ b/node-tests/fixtures/util-test/rfc232.js
@@ -1,10 +1,9 @@
 import fooBar from 'my-app/utils/foo-bar';
 import { module, test } from 'qunit';
 
-module('Unit | Utility | foo-bar', function() {
-
+module('Unit | Utility | foo-bar', function () {
   // TODO: Replace this with your real tests.
-  test('it works', function(assert) {
+  test('it works', function (assert) {
     let result = fooBar();
     assert.ok(result);
   });

From aa02e00eee36d74f8ee18513cee36ab5ba750002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moacir=20P=2E=20de=20Sa=CC=81=20Pereira?=
 <github@moacir.moacir.com>
Date: Sun, 6 Feb 2022 15:51:37 -0500
Subject: [PATCH 0841/1405] [CLEANUP prettier-blueprints] Adjust blueprints and
 blueprint tests to match Prettier formatted fixtures.

lint: Adjust component tests and blueprints to match prettier formatted fixtures.

lint: Adjust controller blueprints to match prettier formatted fixtures.

lint: Adjust helper blueprints to match prettier formatted fixtures.

lint: Adjust initializer blueprints to match prettier formatted fixtures.

lint: Adjust mixin blueprints and tests to match prettier formatted fixtures.

lint: Adjust route blueprints to match prettier formatted fixtures.

lint: Adjust service blueprints to match prettier formatted fixtures.

lint: Adjust util blueprints to match prettier formatted fixtures.
---
 .../tests/acceptance/__name__-test.js         |  8 ++---
 .../tests/acceptance/__name__-test.js         |  4 +--
 .../tests/acceptance/__name__-test.js         |  4 +--
 .../tests/acceptance/__name__-test.js         |  4 +--
 blueprints/component-class/index.js           |  4 +--
 .../__testType__/__path__/__test__.js         |  8 ++---
 .../__testType__/__path__/__test__.js         | 12 ++++---
 .../__testType__/__path__/__test__.js         |  8 ++---
 .../__testType__/__path__/__test__.js         |  8 ++---
 .../__testType__/__path__/__test__.js         |  8 ++---
 blueprints/component/index.js                 |  4 +--
 .../__testType__/__path__/__test__.js         |  4 +--
 .../__testType__/__path__/__test__.js         |  8 +++--
 .../__testType__/__path__/__test__.js         |  4 +--
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  4 +--
 .../files/__root__/__path__/__name__.js       |  3 +-
 .../__collection__/__name__-test.js           |  6 ++--
 .../__collection__/__name__-test.js           | 10 +++---
 .../__collection__/__name__-test.js           |  4 +--
 .../__collection__/__name__-test.js           |  4 +--
 .../__collection__/__name__-test.js           |  4 +--
 .../files/__root__/__collection__/__name__.js |  2 +-
 .../__root__/__collection__/__name__.js       |  2 +-
 .../__testType__/__path__/__name__-test.js    | 13 ++++---
 .../__testType__/__path__/__name__-test.js    | 10 +++---
 .../__testType__/__path__/__name__-test.js    |  7 ++--
 .../files/__root__/initializers/__name__.js   |  5 ++-
 .../__testType__/__path__/__name__-test.js    | 10 +++---
 .../__testType__/__path__/__name__-test.js    | 10 +++---
 .../__testType__/__path__/__name__-test.js    |  4 +--
 .../instance-initializers/__name__.js         |  5 ++-
 .../__root__/__testType__/__name__-test.js    |  4 +--
 .../__root__/__testType__/__name__-test.js    |  4 +--
 .../__root__/__testType__/__name__-test.js    |  2 +-
 .../__root__/__testType__/__name__-test.js    |  2 +-
 .../mixin/files/__root__/mixins/__name__.js   |  3 +-
 .../__testType__/__path__/__test__.js         |  4 +--
 .../__testType__/__path__/__test__.js         |  8 +++--
 .../__testType__/__path__/__test__.js         |  4 +--
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  4 +--
 .../route/files/__root__/__path__/__name__.js |  4 +--
 .../__testType__/__path__/__test__.js         |  4 +--
 .../__testType__/__path__/__test__.js         |  8 +++--
 .../__testType__/__path__/__test__.js         |  4 +--
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  4 +--
 .../files/__root__/__path__/__name__.js       |  3 +-
 .../__root__/__testType__/__name__-test.js    |  4 +--
 .../__root__/__testType__/__name__-test.js    |  4 +--
 .../__root__/__testType__/__name__-test.js    |  2 +-
 .../__root__/__testType__/__name__-test.js    |  5 ++-
 node-tests/blueprints/component-class-test.js |  6 ++--
 node-tests/blueprints/component-test.js       |  6 ++--
 node-tests/blueprints/mixin-test.js           | 36 +++++++++----------
 56 files changed, 160 insertions(+), 162 deletions(-)

diff --git a/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
index 2700039e658..b6038d964c8 100644
--- a/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
@@ -3,18 +3,18 @@ import { expect } from 'chai';
 import startApp from '<%= dasherizedPackageName %>/tests/helpers/start-app';
 <% if (destroyAppExists) { %>import destroyApp from '<%= dasherizedPackageName %>/tests/helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   let application;
 
-  beforeEach(function() {
+  beforeEach(function () {
     application = startApp();
   });
 
-  afterEach(function() {
+  afterEach(function () {
     <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
   });
 
-  it('can visit /<%= dasherizedModuleName %>', function() {
+  it('can visit /<%= dasherizedModuleName %>', function () {
     visit('/<%= dasherizedModuleName %>');
 
     return andThen(() => {
diff --git a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
index e26de7ca265..58566199373 100644
--- a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -3,10 +3,10 @@ import { expect } from 'chai';
 import { setupApplicationTest } from 'ember-mocha';
 import { visit, currentURL } from '@ember/test-helpers';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   setupApplicationTest();
 
-  it('can visit /<%= dasherizedModuleName %>', async function() {
+  it('can visit /<%= dasherizedModuleName %>', async function () {
     await visit('/<%= dasherizedModuleName %>');
     expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
   });
diff --git a/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
index 190767adcbf..35b4c18f65b 100644
--- a/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
@@ -3,10 +3,10 @@ import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-
 
 moduleForAcceptance('<%= friendlyTestName %>');
 
-test('visiting /<%= dasherizedModuleName %>', function(assert) {
+test('visiting /<%= dasherizedModuleName %>', function (assert) {
   visit('/<%= dasherizedModuleName %>');
 
-  andThen(function() {
+  andThen(function () {
     assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
   });
 });
diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
index 3bdb63d7a5a..b8215b2e711 100644
--- a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -2,10 +2,10 @@ import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 
-module('<%= friendlyTestName %>', function(hooks) {
+module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);
 
-  test('visiting /<%= dasherizedModuleName %>', async function(assert) {
+  test('visiting /<%= dasherizedModuleName %>', async function (assert) {
     await visit('/<%= dasherizedModuleName %>');
 
     assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
index 697d5b0b6c3..a14d3535d6d 100644
--- a/blueprints/component-class/index.js
+++ b/blueprints/component-class/index.js
@@ -151,12 +151,12 @@ module.exports = {
           importTemplate = `import layout from '${templatePath}';${EOL}`;
           defaultExport = `Component.extend({${EOL}  layout${EOL}});`;
         } else {
-          defaultExport = `Component.extend({${EOL}});`;
+          defaultExport = `Component.extend({});`;
         }
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;
-        defaultExport = `class ${classifiedModuleName}Component extends Component {\n}`;
+        defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
         break;
       case '@ember/component/template-only':
         importComponent = `import templateOnly from '@ember/component/template-only';`;
diff --git a/blueprints/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
index 52200d594e5..f73315461e6 100644
--- a/blueprints/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -3,14 +3,14 @@ import { describe, it } from 'mocha';
 import { setupComponentTest } from 'ember-mocha';<% if (testType === 'integration') { %>
 import hbs from 'htmlbars-inline-precompile';<% } %>
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupComponentTest('<%= componentPathName %>', {
-    <% if (testType === 'integration' ) { %>integration: true<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+    <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
     // needs: ['component:foo', 'helper:bar'],
-    unit: true<% } %>
+    unit: true,<% } %>
   });
 
-  it('renders', function() {
+  it('renders', function () {
     <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/blueprints/component-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/mocha-files/__root__/__testType__/__path__/__test__.js
index 7dafcd4505e..765ad7f3310 100644
--- a/blueprints/component-test/mocha-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -2,14 +2,16 @@ import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';<% if (testType === 'integration') { %>
 import hbs from 'htmlbars-inline-precompile';<% } %>
 
-describeComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>',
+describeComponent(
+  '<%= componentPathName %>',
+  '<%= friendlyTestDescription %>',
   {
-    <% if (testType === 'integration' ) { %>integration: true<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+    <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
     // needs: ['component:foo', 'helper:bar'],
-    unit: true<% } %>
+    unit: true,<% } %>
   },
-  function() {
-    it('renders', function() {
+  function () {
+    it('renders', function () {
       <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
       // Handle any actions with this.on('myAction', function(val) { ... });
 
diff --git a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 68422cb9543..cded3089872 100644
--- a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -4,10 +4,10 @@ import { setupRenderingTest } from 'ember-mocha';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupRenderingTest();
 
-  it('renders', async function() {
+  it('renders', async function () {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.set('myAction', function(val) { ... });
 
@@ -28,10 +28,10 @@ describe('<%= friendlyTestDescription %>', function() {
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest();
 
-  it('exists', function() {
+  it('exists', function () {
     let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
     expect(component).to.be.ok;
   });
diff --git a/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
index e1450f0a258..29c6b4e042b 100644
--- a/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -2,13 +2,13 @@ import { moduleForComponent, test } from 'ember-qunit';<% if (testType === 'inte
 import hbs from 'htmlbars-inline-precompile';<% } %>
 
 moduleForComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>', {
-  <% if (testType === 'integration' ) { %>integration: true<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+  <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
   // needs: ['component:foo', 'helper:bar'],
-  unit: true<% } %>
+  unit: true,<% } %>
 });
 
-test('it renders', function(assert) {
-  <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+test('it renders', function (assert) {<% if (testType === 'integration' ) { %>
+  // Set any properties with this.set('myProperty', 'value');
   // Handle any actions with this.on('myAction', function(val) { ... });
 
   this.render(hbs`<%= selfCloseComponent(componentName) %>`);
diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 3684ab5f6eb..999fd69cd9f 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -3,10 +3,10 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
-module('<%= friendlyTestDescription %>', function(hooks) {
+module('<%= friendlyTestDescription %>', function (hooks) {
   setupRenderingTest(hooks);
 
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.set('myAction', function(val) { ... });
 
@@ -26,10 +26,10 @@ module('<%= friendlyTestDescription %>', function(hooks) {
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('<%= friendlyTestDescription %>', function(hooks) {
+module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
 
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
     assert.ok(component);
   });
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index bb7cf036521..ebce261f739 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -253,12 +253,12 @@ module.exports = {
           importTemplate = `import layout from '${templatePath}';${EOL}`;
           defaultExport = `Component.extend({${EOL}  layout${EOL}});`;
         } else {
-          defaultExport = `Component.extend({${EOL}});`;
+          defaultExport = `Component.extend({});`;
         }
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;
-        defaultExport = `class ${classifiedModuleName}Component extends Component {${EOL}}`;
+        defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
         break;
       case '@ember/component/template-only':
         importComponent = `import templateOnly from '@ember/component/template-only';`;
diff --git a/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
index 8be2a4a01b5..28c0896cd35 100644
--- a/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -2,14 +2,14 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest('controller:<%= dasherizedModuleName %>', {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   });
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let controller = this.subject();
     expect(controller).to.be.ok;
   });
diff --git a/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
index 63e225f6dc8..b2a49c7728d 100644
--- a/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -1,14 +1,16 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>',
+describeModule(
+  'controller:<%= dasherizedModuleName %>',
+  '<%= friendlyTestDescription %>',
   {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   },
-  function() {
+  function () {
     // TODO: Replace this with your real tests.
-    it('exists', function() {
+    it('exists', function () {
       let controller = this.subject();
       expect(controller).to.be.ok;
     });
diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 79dade91ef5..39f3d69f5cc 100644
--- a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -2,11 +2,11 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest();
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let controller = this.owner.lookup('controller:<%= controllerPathName %>');
     expect(controller).to.be.ok;
   });
diff --git a/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
index 25a2604730a..8d274ae5f3b 100644
--- a/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -6,7 +6,7 @@ moduleFor('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription
 });
 
 // TODO: Replace this with your real tests.
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let controller = this.subject();
   assert.ok(controller);
 });
diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 4213416e7b6..2bd2b5fb853 100644
--- a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('<%= friendlyTestDescription %>', function(hooks) {
+module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let controller = this.owner.lookup('controller:<%= controllerPathName %>');
     assert.ok(controller);
   });
diff --git a/blueprints/controller/files/__root__/__path__/__name__.js b/blueprints/controller/files/__root__/__path__/__name__.js
index f4f0e1b5433..dcfbd50a6dc 100644
--- a/blueprints/controller/files/__root__/__path__/__name__.js
+++ b/blueprints/controller/files/__root__/__path__/__name__.js
@@ -1,4 +1,3 @@
 import Controller from '@ember/controller';
 
-export default class <%= classifiedModuleName %>Controller extends Controller {
-}
+export default class <%= classifiedModuleName %>Controller extends Controller {}
diff --git a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
index 1b18d13b81d..cdb02d28391 100644
--- a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
@@ -3,12 +3,12 @@ import { describe, it } from 'mocha';
 import { setupComponentTest } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   setupComponentTest('<%= dasherizedModuleName %>', {
-    integration: true
+    integration: true,
   });
 
-  it('renders', function() {
+  it('renders', function () {
     // Set any properties with this.set('myProperty', 'value');
     // Handle any actions with this.on('myAction', function(val) { ... });
     // Template block usage:
diff --git a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
index e8ec73453e2..843e9b35bcf 100644
--- a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
@@ -2,12 +2,14 @@ import { expect } from 'chai';
 import { describeComponent, it } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
-describeComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleName %>',
+describeComponent(
+  '<%= dasherizedModuleName %>',
+  'helper:<%= dasherizedModuleName %>',
   {
-    integration: true
+    integration: true,
   },
-  function() {
-    it('renders', function() {
+  function () {
+    it('renders', function () {
       // Set any properties with this.set('myProperty', 'value');
       // Handle any actions with this.on('myAction', function(val) { ... });
       // Template block usage:
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index e41eec5e35c..8eed95f4e7f 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -4,11 +4,11 @@ import { setupRenderingTest } from 'ember-mocha';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   setupRenderingTest();
 
   // TODO: Replace this with your real tests.
-  it('renders', async function() {
+  it('renders', async function () {
     this.set('inputValue', '1234');
 
     await render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
index 49211fee4f5..45b8e177f2c 100644
--- a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
@@ -2,11 +2,11 @@ import { moduleForComponent, test } from 'ember-qunit';
 import hbs from 'htmlbars-inline-precompile';
 
 moduleForComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleName %>', {
-  integration: true
+  integration: true,
 });
 
 // TODO: Replace this with your real tests.
-test('it renders', function(assert) {
+test('it renders', function (assert) {
   this.set('inputValue', '1234');
 
   this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index a56c181516e..69c96f7b230 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -3,11 +3,11 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
-module('<%= friendlyTestName %>', function(hooks) {
+module('<%= friendlyTestName %>', function (hooks) {
   setupRenderingTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it renders', async function(assert) {
+  test('it renders', async function (assert) {
     this.set('inputValue', '1234');
 
     await render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
diff --git a/blueprints/helper/files/__root__/__collection__/__name__.js b/blueprints/helper/files/__root__/__collection__/__name__.js
index 4a8d40d6799..786682850a6 100644
--- a/blueprints/helper/files/__root__/__collection__/__name__.js
+++ b/blueprints/helper/files/__root__/__collection__/__name__.js
@@ -1,5 +1,5 @@
 import { helper } from '@ember/component/helper';
 
-export default helper(function <%= camelizedModuleName %>(positional/*, named*/) {
+export default helper(function <%= camelizedModuleName %>(positional /*, named*/) {
   return positional;
 });
diff --git a/blueprints/helper/mu-files/__root__/__collection__/__name__.js b/blueprints/helper/mu-files/__root__/__collection__/__name__.js
index dcfd120c8f6..d737dfc8868 100644
--- a/blueprints/helper/mu-files/__root__/__collection__/__name__.js
+++ b/blueprints/helper/mu-files/__root__/__collection__/__name__.js
@@ -1,6 +1,6 @@
 import { helper as buildHelper } from '@ember/component/helper';
 
-export function <%= camelizedModuleName %>(positional/*, named*/) {
+export function <%= camelizedModuleName %>(positional /*, named*/) {
   return positional;
 }
 
diff --git a/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
index 2359278209b..5c3ed1a4a17 100644
--- a/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
@@ -3,24 +3,23 @@ import { describe, it, beforeEach, afterEach } from 'mocha';
 import { run } from '@ember/runloop';
 import Application from '@ember/application';
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
-<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } %>
-
-describe('<%= friendlyTestName %>', function() {
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';\n<% } %>
+describe('<%= friendlyTestName %>', function () {
   let application;
 
-  beforeEach(function() {
-    run(function() {
+  beforeEach(function () {
+    run(function () {
       application = Application.create();
       application.deferReadiness();
     });
   });
 
-  afterEach(function() {
+  afterEach(function () {
     <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
   });
 
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     initialize(application);
 
     // you would normally confirm the results of the initializer here
diff --git a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index a76e9fb041b..b8759dae165 100644
--- a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -4,23 +4,23 @@ import Application from '@ember/application';
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
-describe('<%= friendlyTestName %>', function() {
-  beforeEach(function() {
+describe('<%= friendlyTestName %>', function () {
+  beforeEach(function () {
     this.TestApplication = Application.extend();
     this.TestApplication.initializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
 
     this.application = this.TestApplication.create({ autoboot: false });
   });
 
-  afterEach(function() {
+  afterEach(function () {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
   // TODO: Replace this with your real tests.
-  it('works', async function() {
+  it('works', async function () {
     await this.application.boot();
 
     // you would normally confirm the results of the initializer here
diff --git a/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
index 809b65a6639..4a3131618ea 100644
--- a/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
@@ -3,8 +3,7 @@ import { run } from '@ember/runloop';
 
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
-<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } %>
-
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';\n<% } %>
 module('<%= friendlyTestName %>', {
   beforeEach() {
     run(() => {
@@ -14,11 +13,11 @@ module('<%= friendlyTestName %>', {
   },
   afterEach() {
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
-  }
+  },
 });
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   initialize(this.application);
 
   // you would normally confirm the results of the initializer here
diff --git a/blueprints/initializer/files/__root__/initializers/__name__.js b/blueprints/initializer/files/__root__/initializers/__name__.js
index f3083e3831a..66078297b08 100644
--- a/blueprints/initializer/files/__root__/initializers/__name__.js
+++ b/blueprints/initializer/files/__root__/initializers/__name__.js
@@ -1,6 +1,5 @@
-export function initialize(/* application */) {
-}
+export function initialize(/* application */) {}
 
 export default {
-  initialize
+  initialize,
 };
diff --git a/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
index 43199ba3bf5..9be570cf8d0 100644
--- a/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
@@ -5,23 +5,23 @@ import { run } from '@ember/runloop';
 import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 import destroyApp from '../../helpers/destroy-app';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   let application, appInstance;
 
-  beforeEach(function() {
-    run(function() {
+  beforeEach(function () {
+    run(function () {
       application = Application.create();
       appInstance = application.buildInstance();
     });
   });
 
-  afterEach(function() {
+  afterEach(function () {
     run(appInstance, 'destroy');
     destroyApp(application);
   });
 
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     initialize(appInstance);
 
     // you would normally confirm the results of the initializer here
diff --git a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
index 7b680e4f19e..d244591737d 100644
--- a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -4,23 +4,23 @@ import Application from '@ember/application';
 import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
-describe('<%= friendlyTestName %>', function() {
-  beforeEach(function() {
+describe('<%= friendlyTestName %>', function () {
+  beforeEach(function () {
     this.TestApplication = Application.extend();
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
-      initialize
+      initialize,
     });
     this.application = this.TestApplication.create({ autoboot: false });
     this.instance = this.application.buildInstance();
   });
-  afterEach(function() {
+  afterEach(function () {
     <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
   // TODO: Replace this with your real tests.
-  it('works', async function() {
+  it('works', async function () {
     await this.instance.boot();
 
     expect(true).to.be.ok;
diff --git a/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
index 6f075d87ce4..9f056812709 100644
--- a/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
+++ b/blueprints/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
@@ -14,11 +14,11 @@ module('<%= friendlyTestName %>', {
   afterEach() {
     run(this.appInstance, 'destroy');
     <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
-  }
+  },
 });
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   initialize(this.appInstance);
 
   // you would normally confirm the results of the initializer here
diff --git a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
index fefc0f80a2d..e1755216147 100644
--- a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
+++ b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
@@ -1,6 +1,5 @@
-export function initialize(/* appInstance */) {
-}
+export function initialize(/* appInstance */) {}
 
 export default {
-  initialize
+  initialize,
 };
diff --git a/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
index 34491730117..915c4202a81 100644
--- a/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
@@ -3,9 +3,9 @@ import { describe, it } from 'mocha';
 import EmberObject from '@ember/object';
 import <%= classifiedModuleName %>Mixin from '<%= dasherizedPackageName %>/mixins/<%= dasherizedModuleName %>';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
     let subject = <%= classifiedModuleName %>Object.create();
     expect(subject).to.be.ok;
diff --git a/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
index 34491730117..915c4202a81 100644
--- a/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -3,9 +3,9 @@ import { describe, it } from 'mocha';
 import EmberObject from '@ember/object';
 import <%= classifiedModuleName %>Mixin from '<%= dasherizedPackageName %>/mixins/<%= dasherizedModuleName %>';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
     let subject = <%= classifiedModuleName %>Object.create();
     expect(subject).to.be.ok;
diff --git a/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
index 7888ebc1d68..00579ff7c02 100644
--- a/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -5,7 +5,7 @@ import { module, test } from 'qunit';
 module('<%= friendlyTestName %>');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
   let subject = <%= classifiedModuleName %>Object.create();
   assert.ok(subject);
diff --git a/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
index de7dde8fe26..034a718d852 100644
--- a/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -2,7 +2,7 @@ import EmberObject from '@ember/object';
 import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
-module('<%= friendlyTestName %>', function() {
+module('<%= friendlyTestName %>', function () {
   // TODO: Replace this with your real tests.
   test('it works', function (assert) {
     let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
diff --git a/blueprints/mixin/files/__root__/mixins/__name__.js b/blueprints/mixin/files/__root__/mixins/__name__.js
index 4f1bab5d000..9aa7bf677d8 100644
--- a/blueprints/mixin/files/__root__/mixins/__name__.js
+++ b/blueprints/mixin/files/__root__/mixins/__name__.js
@@ -1,4 +1,3 @@
 import Mixin from '@ember/object/mixin';
 
-export default Mixin.create({
-});
+export default Mixin.create({});
diff --git a/blueprints/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
index 8b8f8ca18e7..4764e61b2e9 100644
--- a/blueprints/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -2,13 +2,13 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest('route:<%= moduleName %>', {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   });
 
-  it('exists', function() {
+  it('exists', function () {
     let route = this.subject();
     expect(route).to.be.ok;
   });
diff --git a/blueprints/route-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/mocha-files/__root__/__testType__/__path__/__test__.js
index ef17729f4ce..e2f6ecb1547 100644
--- a/blueprints/route-test/mocha-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -1,13 +1,15 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('route:<%= moduleName %>', '<%= friendlyTestDescription %>',
+describeModule(
+  'route:<%= moduleName %>',
+  '<%= friendlyTestDescription %>',
   {
     // Specify the other units that are required for this test.
     // needs: ['controller:foo']
   },
-  function() {
-    it('exists', function() {
+  function () {
+    it('exists', function () {
       let route = this.subject();
       expect(route).to.be.ok;
     });
diff --git a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index f2d0456e955..36e7503f359 100644
--- a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -2,10 +2,10 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest();
 
-  it('exists', function() {
+  it('exists', function () {
     let route = this.owner.lookup('route:<%= dasherizedModuleName %>');
     expect(route).to.be.ok;
   });
diff --git a/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js
index 7ef49ffdb0e..44232623e38 100644
--- a/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -5,7 +5,7 @@ moduleFor('route:<%= moduleName %>', '<%= friendlyTestDescription %>', {
   // needs: ['controller:foo']
 });
 
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let route = this.subject();
   assert.ok(route);
 });
diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index f3ed6df1c17..abe9789b73d 100644
--- a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,10 +1,10 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('<%= friendlyTestDescription %>', function(hooks) {
+module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
 
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let route = this.owner.lookup('route:<%= moduleName %>');
     assert.ok(route);
   });
diff --git a/blueprints/route/files/__root__/__path__/__name__.js b/blueprints/route/files/__root__/__path__/__name__.js
index 2bf1de81a14..ea35f564e3f 100644
--- a/blueprints/route/files/__root__/__path__/__name__.js
+++ b/blueprints/route/files/__root__/__path__/__name__.js
@@ -7,5 +7,5 @@ export default class <%= classifiedModuleName %>Route extends Route {<% if (hasD
      * based on that dynamic segment here in the model hook.
      */
     return params;
-  }<%}%>
-}
+  }
+<%}%>}
diff --git a/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
index b04821213a9..dde1fd8b11c 100644
--- a/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -2,14 +2,14 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest('service:<%= dasherizedModuleName %>', {
     // Specify the other units that are required for this test.
     // needs: ['service:foo']
   });
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let service = this.subject();
     expect(service).to.be.ok;
   });
diff --git a/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
index 53638511c68..2954042d0d0 100644
--- a/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -1,14 +1,16 @@
 import { expect } from 'chai';
 import { describeModule, it } from 'ember-mocha';
 
-describeModule('service:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>',
+describeModule(
+  'service:<%= dasherizedModuleName %>',
+  '<%= friendlyTestDescription %>',
   {
     // Specify the other units that are required for this test.
     // needs: ['service:foo']
   },
-  function() {
+  function () {
     // TODO: Replace this with your real tests.
-    it('exists', function() {
+    it('exists', function () {
       let service = this.subject();
       expect(service).to.be.ok;
     });
diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index ca0b4e65955..1970c5ddbb0 100644
--- a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -2,11 +2,11 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import { setupTest } from 'ember-mocha';
 
-describe('<%= friendlyTestDescription %>', function() {
+describe('<%= friendlyTestDescription %>', function () {
   setupTest();
 
   // TODO: Replace this with your real tests.
-  it('exists', function() {
+  it('exists', function () {
     let service = this.owner.lookup('service:<%= dasherizedModuleName %>');
     expect(service).to.be.ok;
   });
diff --git a/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
index 203b9d24aa8..1f42bc8820f 100644
--- a/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -6,7 +6,7 @@ moduleFor('service:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>
 });
 
 // TODO: Replace this with your real tests.
-test('it exists', function(assert) {
+test('it exists', function (assert) {
   let service = this.subject();
   assert.ok(service);
 });
diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 5904acff9b5..49b3458119a 100644
--- a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,11 +1,11 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 
-module('<%= friendlyTestDescription %>', function(hooks) {
+module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
 
   // TODO: Replace this with your real tests.
-  test('it exists', function(assert) {
+  test('it exists', function (assert) {
     let service = this.owner.lookup('service:<%= dasherizedModuleName %>');
     assert.ok(service);
   });
diff --git a/blueprints/service/files/__root__/__path__/__name__.js b/blueprints/service/files/__root__/__path__/__name__.js
index c79f7d69641..6f7a5e9baa4 100644
--- a/blueprints/service/files/__root__/__path__/__name__.js
+++ b/blueprints/service/files/__root__/__path__/__name__.js
@@ -1,4 +1,3 @@
 import Service from '@ember/service';
 
-export default class <%= classifiedModuleName %>Service extends Service {
-}
+export default class <%= classifiedModuleName %>Service extends Service {}
diff --git a/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js
index de9e098806b..8d06bcc0413 100644
--- a/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/mocha-files/__root__/__testType__/__name__-test.js
@@ -2,9 +2,9 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import <%= camelizedModuleName %> from '<%= dasherizedPackageName %>/utils/<%= dasherizedModuleName %>';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let result = <%= camelizedModuleName %>();
     expect(result).to.be.ok;
   });
diff --git a/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
index de9e098806b..8d06bcc0413 100644
--- a/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -2,9 +2,9 @@ import { expect } from 'chai';
 import { describe, it } from 'mocha';
 import <%= camelizedModuleName %> from '<%= dasherizedPackageName %>/utils/<%= dasherizedModuleName %>';
 
-describe('<%= friendlyTestName %>', function() {
+describe('<%= friendlyTestName %>', function () {
   // TODO: Replace this with your real tests.
-  it('works', function() {
+  it('works', function () {
     let result = <%= camelizedModuleName %>();
     expect(result).to.be.ok;
   });
diff --git a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
index 9eeb7fa4bc3..d9eeb2bbb93 100644
--- a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -4,7 +4,7 @@ import { module, test } from 'qunit';
 module('<%= friendlyTestName %>');
 
 // TODO: Replace this with your real tests.
-test('it works', function(assert) {
+test('it works', function (assert) {
   let result = <%= camelizedModuleName %>();
   assert.ok(result);
 });
diff --git a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
index 124b6a2368a..d531b5ee8d0 100644
--- a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -1,10 +1,9 @@
 import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
-module('<%= friendlyTestName %>', function() {
-
+module('<%= friendlyTestName %>', function () {
   // TODO: Replace this with your real tests.
-  test('it works', function(assert) {
+  test('it works', function (assert) {
     let result = <%= camelizedModuleName %>();
     assert.ok(result);
   });
diff --git a/node-tests/blueprints/component-class-test.js b/node-tests/blueprints/component-class-test.js
index fe4d0ba906c..4eb913c76ee 100644
--- a/node-tests/blueprints/component-class-test.js
+++ b/node-tests/blueprints/component-class-test.js
@@ -18,14 +18,12 @@ const enableOctane = setupTestEnvironment.enableOctane;
 
 const glimmerComponentContents = `import Component from '@glimmer/component';
 
-export default class FooComponent extends Component {
-}
+export default class FooComponent extends Component {}
 `;
 
 const emberComponentContents = `import Component from '@ember/component';
 
-export default Component.extend({
-});
+export default Component.extend({});
 `;
 
 const templateOnlyContents = `import templateOnly from '@ember/component/template-only';
diff --git a/node-tests/blueprints/component-test.js b/node-tests/blueprints/component-test.js
index 79e7c7bc889..3769e94f1bd 100644
--- a/node-tests/blueprints/component-test.js
+++ b/node-tests/blueprints/component-test.js
@@ -18,14 +18,12 @@ const enableOctane = setupTestEnvironment.enableOctane;
 
 const glimmerComponentContents = `import Component from '@glimmer/component';
 
-export default class FooComponent extends Component {
-}
+export default class FooComponent extends Component {}
 `;
 
 const emberComponentContents = `import Component from '@ember/component';
 
-export default Component.extend({
-});
+export default Component.extend({});
 `;
 
 const templateOnlyContents = `import templateOnly from '@ember/component/template-only';
diff --git a/node-tests/blueprints/mixin-test.js b/node-tests/blueprints/mixin-test.js
index 7ee243a6b11..8426fea27fe 100644
--- a/node-tests/blueprints/mixin-test.js
+++ b/node-tests/blueprints/mixin-test.js
@@ -22,7 +22,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo'], (_file) => {
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -37,7 +37,7 @@ describe('Blueprint: mixin', function () {
 
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -49,7 +49,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo/bar'], (_file) => {
         expect(_file('app/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -69,7 +69,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo', '--pod'], (_file) => {
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -84,7 +84,7 @@ describe('Blueprint: mixin', function () {
 
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -96,7 +96,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], (_file) => {
         expect(_file('app/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -121,7 +121,7 @@ describe('Blueprint: mixin', function () {
         return emberGenerateDestroy(['mixin', 'foo', '--pod'], (_file) => {
           expect(_file('app/mixins/foo.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
-            .to.contain(`export default Mixin.create({${EOL}});`);
+            .to.contain(`export default Mixin.create({});`);
 
           expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
             "import FooMixin from 'my-app/mixins/foo';"
@@ -136,7 +136,7 @@ describe('Blueprint: mixin', function () {
 
           expect(_file('app/mixins/foo.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
-            .to.contain(`export default Mixin.create({${EOL}});`);
+            .to.contain(`export default Mixin.create({});`);
 
           expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
             "import FooMixin from 'my-app/mixins/foo';"
@@ -148,7 +148,7 @@ describe('Blueprint: mixin', function () {
         return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], (_file) => {
           expect(_file('app/mixins/foo/bar.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
-            .to.contain(`export default Mixin.create({${EOL}});`);
+            .to.contain(`export default Mixin.create({});`);
 
           expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
             "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -167,7 +167,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo'], (_file) => {
         expect(_file('addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -184,7 +184,7 @@ describe('Blueprint: mixin', function () {
 
         expect(_file('addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -198,7 +198,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo/bar'], (_file) => {
         expect(_file('addon/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-addon/mixins/foo/bar';"
@@ -212,7 +212,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz'], (_file) => {
         expect(_file('addon/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
@@ -226,7 +226,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--dummy'], (_file) => {
         expect(_file('tests/dummy/app/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('addon/mixins/foo/bar/baz.js')).to.not.exist;
       });
@@ -238,7 +238,7 @@ describe('Blueprint: mixin', function () {
 
         expect(_file('tests/dummy/app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('addon/mixins/foo.js')).to.not.exist;
       });
@@ -254,7 +254,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -269,7 +269,7 @@ describe('Blueprint: mixin', function () {
 
         expect(_file('lib/my-addon/addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -281,7 +281,7 @@ describe('Blueprint: mixin', function () {
       return emberGenerateDestroy(['mixin', 'foo/bar', '--in-repo-addon=my-addon'], (_file) => {
         expect(_file('lib/my-addon/addon/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain(`export default Mixin.create({${EOL}});`);
+          .to.contain(`export default Mixin.create({});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-addon/mixins/foo/bar';"

From ea486c5e693346373886dcd08496085268ad1e1d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 7 Feb 2022 17:22:45 -0500
Subject: [PATCH 0842/1405] Add 4.2.0 to CHANGELOG

(cherry picked from commit 693ce77994e0c826988ee0370831cd2dc3237d8b)
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bc3313bb27..b31e7f2fe0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Ember Changelog
 
-### v4.2.0-beta.1 (December 28, 2021)
+### v4.2.0 (February 7, 2022)
 
-- [#19878](https://github.com/emberjs/ember.js/pull/19772) [BUGFIX] Allow class-based helpers to work in strict-mode.
+- [#19878](https://github.com/emberjs/ember.js/pull/19878) [BUGFIX] Allow class-based helpers to work in strict-mode.
 
 ### v4.1.0 (December 28, 2021)
 

From 1e56cc828415bd0bfcccb35f431daa12467129aa Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 7 Feb 2022 17:43:28 -0500
Subject: [PATCH 0843/1405] Add v4.3.0-beta.1 to CHANGELOG

(cherry picked from commit 30d54b8e69d9bf5ad78e9b442c3946c47d8c78b2)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b31e7f2fe0d..be276d530ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.3.0-beta.1 (February 7, 2022)
+
+No public API changes or bugfixes. 
+
 ### v4.2.0 (February 7, 2022)
 
 - [#19878](https://github.com/emberjs/ember.js/pull/19878) [BUGFIX] Allow class-based helpers to work in strict-mode.

From bfaed5a9a944bf31c99f5772da4f7681b7004555 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 7 Feb 2022 17:45:12 -0500
Subject: [PATCH 0844/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5596e5ed596..04bff7a893e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.3.0-alpha.1",
+  "version": "4.4.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": ["ember-addon"],
   "homepage": "https://emberjs.com/",

From 2ef2be9950885f1c39248525e98b9db7c3854cf0 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 4 Feb 2022 21:22:11 +0100
Subject: [PATCH 0845/1405] Remove code related to named outlets

---
 .../-internals/glimmer/lib/syntax/outlet.ts       | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index b050fa728f5..c894d1d0512 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -6,7 +6,6 @@ import {
   childRefFromParts,
   createComputeRef,
   createDebugAliasRef,
-  createPrimitiveRef,
   Reference,
   valueForRef,
 } from '@glimmer/reference';
@@ -38,32 +37,22 @@ import { OutletState } from '../utils/outlet';
   Note: Your content __will not render__ if there isn't an `{{outlet}}` for it.
 
   @method outlet
-  @param {String} [name]
   @for Ember.Templates.helpers
   @public
 */
 export const outletHelper = internalHelper(
-  (args: CapturedArguments, owner?: Owner, scope?: DynamicScope) => {
+  (_args: CapturedArguments, owner?: Owner, scope?: DynamicScope) => {
     assert('Expected owner to be present, {{outlet}} requires an owner', owner);
     assert(
       'Expected dynamic scope to be present. You may have attempted to use the {{outlet}} keyword dynamically. This keyword cannot be used dynamically.',
       scope
     );
-    let nameRef: Reference<string>;
-
-    if (args.positional.length === 0) {
-      nameRef = createPrimitiveRef('main');
-    } else {
-      let maybeNameRef = args.positional[0];
-      assert('Expected at least one positional arg', maybeNameRef);
-      nameRef = maybeNameRef;
-    }
 
     let outletRef = createComputeRef(() => {
       let state = valueForRef(scope.get('outletState') as Reference<OutletState | undefined>);
       let outlets = state !== undefined ? state.outlets : undefined;
 
-      return outlets !== undefined ? outlets[valueForRef(nameRef)] : undefined;
+      return outlets !== undefined ? outlets.main : undefined;
     });
 
     let lastState: OutletDefinitionState | null = null;

From 45861c096c66b0629983505bcd821e17a3f6ab2f Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Wed, 9 Feb 2022 11:08:54 -0500
Subject: [PATCH 0846/1405] Update error message instructions

Since Ember 3.25 it's unnecessary to pass a helper or modifier class to the corresponding template keyword before you can use them. They are first-class values that can be used directly.

This updates the error message to stop suggesting the now-unnecessary use of the helper and modifier keywords.
---
 .../glimmer/lib/helpers/-disallow-dynamic-resolution.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
index d645d98ddd8..ae49fb96441 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
@@ -46,7 +46,7 @@ export default internalHelper(({ positional, named }: CapturedArguments) => {
         `(You specified \`(${type} ${original})\` and \`${original}\` evaluated into "${nameOrValue}".) ` +
         `This ensures we can statically analyze the template and determine which ${type}s are used. ` +
         `If the ${type} name is always the same, use a string literal instead, i.e. \`(${type} "${nameOrValue}")\`. ` +
-        `Otherwise, import the ${type}s into JavaScript and pass them to the ${type} keyword. ` +
+        `Otherwise, import the ${type}s into JavaScript and pass them directly. ` +
         'See https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md#4-no-dynamic-resolution for details. ' +
         loc,
       typeof nameOrValue !== 'string'

From 3df04944debcea398d17c4094694fef6ae9205cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 22:56:50 +0000
Subject: [PATCH 0847/1405] Bump mout from 1.1.0 to 1.2.3

Bumps [mout](https://github.com/mout/mout) from 1.1.0 to 1.2.3.
- [Release notes](https://github.com/mout/mout/releases)
- [Changelog](https://github.com/mout/mout/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mout/mout/compare/v1.1.0...v1.2.3)

---
updated-dependencies:
- dependency-name: mout
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0a5dd75caca..5196547ee7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7267,9 +7267,9 @@ morgan@^1.10.0:
     on-headers "~1.0.2"
 
 mout@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mout/-/mout-1.1.0.tgz#0b29d41e6a80fa9e2d4a5be9d602e1d9d02177f6"
-  integrity "sha1-CynUHmqA+p4tSlvp1gLh2dAhd/Y= sha512-XsP0vf4As6BfqglxZqbqQ8SR6KQot2AgxvR0gG+WtUkf90vUXchMOZQtPf/Hml1rEffJupqL/tIrU6EYhsUQjw=="
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.3.tgz#bd1477d8c7f2db5fcf43c91de30b6cc746b78e10"
+  integrity sha512-vtE+eZcSj/sBkIp6gxB87MznryWP+gHIp0XX9SKrzA5TAkvz6y7VTuNruBjYdJozd8NY5i9XVIsn8cn3SwNjzg==
 
 ms@2.0.0:
   version "2.0.0"

From cc971452183cebde9d0fd29d722b8daf224bcae2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 9 Feb 2022 15:17:46 -0800
Subject: [PATCH 0848/1405] Better types for get

---
 .../-internals/metal/lib/get_properties.ts    |  6 ++--
 .../-internals/metal/lib/property_get.ts      | 28 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/get_properties.ts b/packages/@ember/-internals/metal/lib/get_properties.ts
index b9109a318ea..9df246308a7 100644
--- a/packages/@ember/-internals/metal/lib/get_properties.ts
+++ b/packages/@ember/-internals/metal/lib/get_properties.ts
@@ -31,9 +31,9 @@ import { get } from './property_get';
   @return {Object}
   @public
 */
-function getProperties<L extends string[]>(obj: object, list: L): Record<L[number], unknown>;
-function getProperties<L extends string[]>(obj: object, ...list: L): Record<L[number], unknown>;
-function getProperties<L extends string[]>(obj: object, keys?: L): Record<L[number], unknown> {
+function getProperties<L extends string[]>(obj: unknown, list: L): Record<L[number], unknown>;
+function getProperties<L extends string[]>(obj: unknown, ...list: L): Record<L[number], unknown>;
+function getProperties<L extends string[]>(obj: unknown, keys?: L): Record<L[number], unknown> {
   let ret = {} as Record<L[number], unknown>;
   let propertyNames = arguments;
   let i = 1;
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index f680939471f..e92033bd3b2 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -70,8 +70,8 @@ interface MaybeHasIsDestroyed {
   @public
 */
 export function get<T extends object, K extends keyof T>(obj: T, keyName: K): T[K];
-export function get(obj: object, keyName: string): unknown;
-export function get(obj: object, keyName: string): unknown {
+export function get(obj: unknown, keyName: string): unknown;
+export function get(obj: unknown, keyName: string): unknown {
   assert(
     `Get must be called with two arguments; an object and a property key`,
     arguments.length === 2
@@ -92,16 +92,14 @@ export function get(obj: object, keyName: string): unknown {
   return isPath(keyName) ? _getPath(obj, keyName) : _getProp(obj, keyName);
 }
 
-export function _getProp(obj: object, keyName: string) {
-  let type = typeof obj;
-
-  let isObject = type === 'object';
-  let isFunction = type === 'function';
-  let isObjectLike = isObject || isFunction;
+export function _getProp(obj: unknown, keyName: string) {
+  if (obj == null) {
+    return;
+  }
 
   let value: unknown;
 
-  if (isObjectLike) {
+  if (typeof obj === 'object' || typeof obj === 'function') {
     if (DEBUG) {
       value = getPossibleMandatoryProxyValue(obj, keyName);
     } else {
@@ -110,7 +108,7 @@ export function _getProp(obj: object, keyName: string) {
 
     if (
       value === undefined &&
-      isObject &&
+      typeof obj === 'object' &&
       !(keyName in obj) &&
       typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
     ) {
@@ -127,14 +125,14 @@ export function _getProp(obj: object, keyName: string) {
       }
     }
   } else {
-    value = obj[keyName];
+    // SAFETY: It should be ok to access properties on any non-nullish value
+    value = (obj as object)[keyName];
   }
 
   return value;
 }
 
-export function _getPath<T extends object>(root: T, path: string | string[]): any {
-  let obj: any = root;
+export function _getPath(obj: unknown, path: string | string[]): any {
   let parts = typeof path === 'string' ? path.split('.') : path;
 
   for (let part of parts) {
@@ -155,8 +153,8 @@ _getProp('foo' as any, 'a');
 _getProp('foo' as any, 1 as any);
 _getProp({}, 'a');
 _getProp({}, 1 as any);
-_getProp({ unkonwnProperty() {} }, 'a');
-_getProp({ unkonwnProperty() {} }, 1 as any);
+_getProp({ unknownProperty() {} }, 'a');
+_getProp({ unknownProperty() {} }, 1 as any);
 
 get({}, 'foo');
 get({}, 'foo.bar');

From e1d249355bb29586d3ff69863c6ab5637b9d7017 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 9 Feb 2022 15:17:56 -0800
Subject: [PATCH 0849/1405] Update router_js types

---
 package.json                                           | 2 +-
 packages/@ember/-internals/routing/lib/system/route.ts | 5 ++---
 yarn.lock                                              | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 04bff7a893e..4563419b873 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^8.0.1",
+    "router_js": "^8.0.2",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.1",
     "simple-dom": "^1.4.0",
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 8e6af951afd..4aeea7e6808 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -29,7 +29,6 @@ import { DEBUG } from '@glimmer/env';
 import { Template, TemplateFactory } from '@glimmer/interfaces';
 import {
   InternalRouteInfo,
-  IModel,
   ModelFor,
   PARAMS_SYMBOL,
   Route as IRoute,
@@ -87,7 +86,7 @@ const RENDER = (symbol('render') as unknown) as string;
   @since 1.0.0
   @public
 */
-interface Route<T extends IModel = {}> extends IRoute<T> {
+interface Route<T = unknown> extends IRoute<T> {
   /**
     The `willTransition` action is fired at the beginning of any
     attempted transition with a `Transition` object as the sole
@@ -258,7 +257,7 @@ interface Route<T extends IModel = {}> extends IRoute<T> {
   error?(error: Error, transition: Transition): boolean | void;
 }
 
-class Route<T extends IModel = {}>
+class Route<T = unknown>
   extends EmberObject.extend(ActionHandler, Evented)
   implements IRoute, Evented {
   static isRouteFactory = true;
diff --git a/yarn.lock b/yarn.lock
index 0a5dd75caca..a9aeea1a054 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8612,10 +8612,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity "sha1-Oasf+84cWebSvcpBbwkyYR5PPKM= sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g=="
 
-router_js@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-8.0.1.tgz#26e197ac0e7be04e9b7850e7755f81fa737c5568"
-  integrity sha512-61q9s2hLFHh8bCl/sTDoAOf0B+7lnTzG1tYjK8W32vg0iwUC2hXMo+2ymLFBfdvdDtD4RdknMVh9scyy9zbElg==
+router_js@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-8.0.2.tgz#ea0e011ac050d41cae896e3bd18c542456bec910"
+  integrity sha512-l0RUYT61Z7xtmTrEJh4pP6Y4TvFfp6OdCWAV0i+3wQZpAZOnX/OQR8wsbyPRjM3iJIddCJYkX3ayySKMfCzdGw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 

From b1e5e9cb7b640d633f5e27318f583e5e77146a2a Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 10 Feb 2022 08:30:42 -0700
Subject: [PATCH 0850/1405] Include `setComponentManager` in expected docs

---
 tests/docs/expected.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 961c10486de..f2ff968fd14 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -459,6 +459,7 @@ module.exports = {
     'service',
     'set',
     'setClassicDecorator',
+    'setComponentManager',
     'setDiff',
     'setEach',
     'setEngineParent',

From cef5d498f26b588c45081f3c671260070a10dfdb Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 08:59:45 -0800
Subject: [PATCH 0851/1405] Fix EmberObject types

---
 .../@ember/-internals/routing/lib/system/route.ts     |  2 +-
 .../@ember/-internals/routing/lib/system/router.ts    |  2 +-
 .../-internals/runtime/lib/system/core_object.d.ts    |  8 +++++---
 packages/@ember/controller/type-tests/index.test.ts   |  6 +++++-
 packages/@ember/object/type-tests/core/index.test.ts  |  7 +++++--
 .../@ember/object/type-tests/ember-object.test.ts     | 11 ++++++++---
 .../@ember/object/type-tests/events/index.test.ts     |  5 +++--
 .../@ember/routing/type-tests/auto-location.test.ts   |  6 +++++-
 .../@ember/routing/type-tests/hash-location.test.ts   |  6 +++++-
 .../routing/type-tests/history-location.test.ts       |  6 +++++-
 .../@ember/routing/type-tests/none-location.test.ts   |  6 +++++-
 .../@ember/routing/type-tests/router-service.test.ts  |  6 +++++-
 packages/@ember/service/type-tests/index.test.ts      |  8 ++++++--
 13 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 4aeea7e6808..66387720f9c 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -275,7 +275,7 @@ class Route<T = unknown>
   declare _environment: any;
 
   constructor(owner: Owner) {
-    super(...arguments);
+    super(owner);
 
     if (owner) {
       let router = owner.lookup<EmberRouter>('router:main');
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index a89af0dfc4f..2155f10b986 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -307,7 +307,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
   }
 
   constructor(owner: Owner) {
-    super(...arguments);
+    super(owner);
 
     this._resetQueuedQueryParameterChanges();
     this.namespace = owner.lookup('application:main');
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index e0d324fe1f6..45d0d5b1344 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -1,3 +1,5 @@
+import { Owner } from '@ember/-internals/owner';
+
 /**
  * Used to infer the type of ember classes of type `T`.
  *
@@ -9,7 +11,7 @@
  * Implementation is carefully chosen for the reasons described in
  * https://github.com/typed-ember/ember-typings/pull/29
  */
-type EmberClassConstructor<T> = (new (properties?: object) => T) & (new (...args: any[]) => T);
+type EmberClassConstructor<T> = new (owner: Owner) => T;
 
 type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
   ? T & MergeArray<Rest>
@@ -29,9 +31,9 @@ export default class CoreObject {
   static reopenClass(...args: any[]): any;
 
   /**
-   * CoreObject constructor takes initial object properties as an argument.
+   * CoreObject constructor takes owner.
    */
-  constructor(properties?: object);
+  constructor(owner: Owner);
 
   /** @internal */
   _super(...args: any[]): any;
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
index 2577966a7a0..1b293a5ec72 100644
--- a/packages/@ember/controller/type-tests/index.test.ts
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -1,13 +1,17 @@
+import { Owner } from '@ember/-internals/owner';
 import Controller, { inject } from '@ember/controller';
 
 import { expectTypeOf } from 'expect-type';
 
+// Good enough for tests
+let owner = {} as Owner;
+
 class Foo {}
 
 let foo = new Foo();
 let foo2 = new Foo();
 
-let controller = new Controller<Foo>();
+let controller = new Controller<Foo>(owner);
 
 expectTypeOf(controller).toEqualTypeOf<Controller<Foo>>();
 
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index d18dfb9de44..d11b365e5fa 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -1,11 +1,14 @@
+import { Owner } from '@ember/-internals/owner';
+import CoreObject from '@ember/object/core';
 import { expectTypeOf } from 'expect-type';
 
-import CoreObject from '@ember/object/core';
+// Good enough for tests
+let owner = {} as Owner;
 
 expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
 
 /** Newable tests */
-const co1 = new CoreObject();
+const co1 = new CoreObject(owner);
 
 expectTypeOf(co1.concatenatedProperties).toEqualTypeOf<string[]>();
 expectTypeOf(co1.isDestroyed).toEqualTypeOf<boolean>();
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index 0baa0c8a2d5..6237ca702a0 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -1,6 +1,10 @@
 import { expectTypeOf } from 'expect-type';
 
 import EmberObject from '@ember/object';
+import { Owner } from '@ember/-internals/owner';
+
+// Good enough for tests
+let owner = {} as Owner;
 
 expectTypeOf(EmberObject.create()).toEqualTypeOf<EmberObject>();
 
@@ -33,7 +37,7 @@ export class Person extends EmberObject {
   lastName!: string;
   age!: number;
 }
-const p = new Person();
+const p = new Person(owner);
 
 expectTypeOf(p.firstName).toEqualTypeOf<string>();
 
@@ -102,8 +106,9 @@ Person.reopenClass({ fullName: 6 });
 class MyComponent extends EmberObject {
   foo = 'bar';
 
-  constructor() {
-    super();
+  constructor(owner: Owner) {
+    super(owner);
+
     this.addObserver('foo', this, 'fooDidChange');
 
     this.addObserver('foo', this, this.fooDidChange);
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
index fe65d4ef4c5..c11e56c32e3 100644
--- a/packages/@ember/object/type-tests/events/index.test.ts
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -2,6 +2,7 @@ import { addListener, removeListener, sendEvent } from '@ember/object/events';
 
 import EmberObject from '@ember/object';
 import { on } from '@ember/object/evented';
+import { Owner } from '@ember/-internals/owner';
 
 class Job extends EmberObject {
   logStartOrUpdate = on('started', 'updated', () => {
@@ -22,8 +23,8 @@ sendEvent(job, 'updated'); // Logs 'Job updated!'
 sendEvent(job, 'completed'); // Logs 'Job completed!'
 
 class MyClass extends EmberObject {
-  constructor() {
-    super();
+  constructor(owner: Owner) {
+    super(owner);
     addListener(this, 'willDestroy', this, 'willDestroyListener');
     addListener(this, 'willDestroy', this, 'willDestroyListener', true);
 
diff --git a/packages/@ember/routing/type-tests/auto-location.test.ts b/packages/@ember/routing/type-tests/auto-location.test.ts
index e5e455bfeaa..663e00a8a69 100644
--- a/packages/@ember/routing/type-tests/auto-location.test.ts
+++ b/packages/@ember/routing/type-tests/auto-location.test.ts
@@ -1,10 +1,14 @@
+import { Owner } from '@ember/-internals/owner';
 import EmberObject from '@ember/object';
 import AutoLocation from '@ember/routing/auto-location';
 import { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
+// Good enough for tests
+let owner = {} as Owner;
+
 // This doesn't have any public API
 
-let location = new AutoLocation();
+let location = new AutoLocation(owner);
 expectTypeOf(location).toMatchTypeOf<EmberObject>();
 expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/hash-location.test.ts b/packages/@ember/routing/type-tests/hash-location.test.ts
index fd881f61e82..d933ce2f89c 100644
--- a/packages/@ember/routing/type-tests/hash-location.test.ts
+++ b/packages/@ember/routing/type-tests/hash-location.test.ts
@@ -2,9 +2,13 @@ import { ILocation } from '@ember/routing/location';
 import EmberObject from '@ember/object';
 import HashLocation from '@ember/routing/hash-location';
 import { expectTypeOf } from 'expect-type';
+import { Owner } from '@ember/-internals/owner';
+
+// Good enough for tests
+let owner = {} as Owner;
 
 // This doesn't have any public API
 
-let location = new HashLocation();
+let location = new HashLocation(owner);
 expectTypeOf(location).toMatchTypeOf<EmberObject>();
 expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/history-location.test.ts b/packages/@ember/routing/type-tests/history-location.test.ts
index d132fc78f7b..5a92377efa6 100644
--- a/packages/@ember/routing/type-tests/history-location.test.ts
+++ b/packages/@ember/routing/type-tests/history-location.test.ts
@@ -1,10 +1,14 @@
+import { Owner } from '@ember/-internals/owner';
 import EmberObject from '@ember/object';
 import HistoryLocation from '@ember/routing/history-location';
 import { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
+// Good enough for tests
+let owner = {} as Owner;
+
 // This doesn't have any public API
 
-let location = new HistoryLocation();
+let location = new HistoryLocation(owner);
 expectTypeOf(location).toMatchTypeOf<EmberObject>();
 expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/none-location.test.ts b/packages/@ember/routing/type-tests/none-location.test.ts
index 58f31ffa915..726db4f843b 100644
--- a/packages/@ember/routing/type-tests/none-location.test.ts
+++ b/packages/@ember/routing/type-tests/none-location.test.ts
@@ -2,9 +2,13 @@ import EmberObject from '@ember/object';
 import NoneLocation from '@ember/routing/none-location';
 import { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
+import { Owner } from '@ember/-internals/owner';
+
+// Good enough for tests
+let owner = {} as Owner;
 
 // This doesn't have any public API
 
-let location = new NoneLocation();
+let location = new NoneLocation(owner);
 expectTypeOf(location).toMatchTypeOf<EmberObject>();
 expectTypeOf(location).toMatchTypeOf<ILocation>();
diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts
index 32c7bec59e7..35df8ccf857 100644
--- a/packages/@ember/routing/type-tests/router-service.test.ts
+++ b/packages/@ember/routing/type-tests/router-service.test.ts
@@ -1,15 +1,19 @@
 /* eslint-disable no-self-assign */
 
+import { Owner } from '@ember/-internals/owner';
 import { EmberLocation } from '@ember/-internals/routing';
 import Route from '@ember/routing/route';
 import RouterService, { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
 import { expectTypeOf } from 'expect-type';
 import { Transition } from 'router_js';
 
+// Good enough for tests
+let owner = {} as Owner;
+
 class Post {}
 class Comment {}
 
-let router = new RouterService<Route<Post | Comment>>();
+let router = new RouterService<Route<Post | Comment>>(owner);
 
 let aPost = new Post();
 let aComment = new Comment();
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
index 1addcbc60ed..7a41ad07ff0 100644
--- a/packages/@ember/service/type-tests/index.test.ts
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -1,14 +1,18 @@
+import { Owner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import EmberObject from '@ember/object';
 import Service, { inject, service } from '@ember/service';
 import { expectTypeOf } from 'expect-type';
 
+// Good enough for tests
+let owner = {} as Owner;
+
 class MainService extends Service {}
 class FooService extends Service {}
 class BarService extends Service {}
 class BazService extends Service {}
 
-let mainService = new MainService();
+let mainService = new MainService(owner);
 
 expectTypeOf(mainService).toMatchTypeOf<FrameworkObject>();
 
@@ -23,7 +27,7 @@ class Foo extends EmberObject {
   @service('bar') declare bar: BarService;
   @service declare baz: BazService;
 }
-new Foo();
+new Foo(owner);
 
 const Legacy = EmberObject.extend({
   main: inject('main'),

From e0e717262e5ece4cb62fef230011f2c4a5812525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 17:16:15 +0300
Subject: [PATCH 0852/1405] [CLEANUP] Remove the EMBER_GLIMMER_INVOKE_HELPER
 feature flag

---
 .../integration/helpers/invoke-helper-test.js | 614 +++++++++---------
 packages/@ember/canary-features/index.ts      |   2 -
 packages/ember/index.js                       |  11 +-
 3 files changed, 308 insertions(+), 319 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index 1b27d3b7990..68bc6d69436 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -3,453 +3,451 @@ import { helperCapabilities, setHelperManager } from '@glimmer/manager';
 import { Helper, helper, Component as EmberComponent } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { EMBER_GLIMMER_INVOKE_HELPER, EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
+import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
 import { destroy, isDestroyed, registerDestructor } from '@glimmer/destroyable';
 import { invokeHelper } from '@glimmer/runtime';
 
-if (EMBER_GLIMMER_INVOKE_HELPER) {
-  moduleFor(
-    'Helpers test: invokeHelper',
-    class extends RenderingTestCase {
-      '@test it works with a component'() {
-        class PlusOneHelper extends Helper {
-          compute([num]) {
-            return num + 1;
-          }
+moduleFor(
+  'Helpers test: invokeHelper',
+  class extends RenderingTestCase {
+    '@test it works with a component'() {
+      class PlusOneHelper extends Helper {
+        compute([num]) {
+          return num + 1;
         }
+      }
 
-        class PlusOne extends EmberComponent {
-          @tracked number;
+      class PlusOne extends EmberComponent {
+        @tracked number;
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return {
-              positional: [this.number],
-            };
-          });
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return {
+            positional: [this.number],
+          };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        this.registerComponent('plus-one', {
-          template: `{{this.value}}`,
-          ComponentClass: PlusOne,
-        });
+      this.registerComponent('plus-one', {
+        template: `{{this.value}}`,
+        ComponentClass: PlusOne,
+      });
 
-        this.render(`<PlusOne @number={{this.value}} />`, {
-          value: 4,
-        });
+      this.render(`<PlusOne @number={{this.value}} />`, {
+        value: 4,
+      });
 
-        this.assertText('5');
+      this.assertText('5');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertText('5');
+      this.assertText('5');
 
-        runTask(() => set(this.context, 'value', 5));
+      runTask(() => set(this.context, 'value', 5));
 
-        this.assertText('6');
-      }
+      this.assertText('6');
+    }
 
-      '@test it works with simple helpers'() {
-        let PlusOneHelper = helper(([num]) => num + 1);
+    '@test it works with simple helpers'() {
+      let PlusOneHelper = helper(([num]) => num + 1);
 
-        class PlusOne extends EmberComponent {
-          @tracked number;
+      class PlusOne extends EmberComponent {
+        @tracked number;
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return {
-              positional: [this.number],
-            };
-          });
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return {
+            positional: [this.number],
+          };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        this.registerComponent('plus-one', {
-          template: `{{this.value}}`,
-          ComponentClass: PlusOne,
-        });
-
-        this.render(`<PlusOne @number={{this.value}} />`, {
-          value: 4,
-        });
+      this.registerComponent('plus-one', {
+        template: `{{this.value}}`,
+        ComponentClass: PlusOne,
+      });
 
-        this.assertText('5');
+      this.render(`<PlusOne @number={{this.value}} />`, {
+        value: 4,
+      });
 
-        runTask(() => this.rerender());
+      this.assertText('5');
 
-        this.assertText('5');
+      runTask(() => this.rerender());
 
-        runTask(() => set(this.context, 'value', 5));
+      this.assertText('5');
 
-        this.assertText('6');
-      }
+      runTask(() => set(this.context, 'value', 5));
 
-      '@test services can be injected if there is an owner'() {
-        let numberService;
+      this.assertText('6');
+    }
 
-        this.registerService(
-          'number',
-          class extends Service {
-            constructor() {
-              super(...arguments);
-              numberService = this;
-            }
+    '@test services can be injected if there is an owner'() {
+      let numberService;
 
-            @tracked value = 4;
+      this.registerService(
+        'number',
+        class extends Service {
+          constructor() {
+            super(...arguments);
+            numberService = this;
           }
-        );
-
-        class PlusOneHelper extends Helper {
-          @service number;
 
-          compute() {
-            return this.number.value + 1;
-          }
+          @tracked value = 4;
         }
+      );
 
-        class PlusOne extends EmberComponent {
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return {
-              positional: [this.number],
-            };
-          });
+      class PlusOneHelper extends Helper {
+        @service number;
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        compute() {
+          return this.number.value + 1;
         }
+      }
 
-        this.registerComponent('plus-one', {
-          template: `{{this.value}}`,
-          ComponentClass: PlusOne,
+      class PlusOne extends EmberComponent {
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return {
+            positional: [this.number],
+          };
         });
 
-        this.render(`<PlusOne />`);
+        get value() {
+          return getValue(this.plusOne);
+        }
+      }
 
-        this.assertText('5');
+      this.registerComponent('plus-one', {
+        template: `{{this.value}}`,
+        ComponentClass: PlusOne,
+      });
 
-        runTask(() => this.rerender());
+      this.render(`<PlusOne />`);
 
-        this.assertText('5');
+      this.assertText('5');
 
-        runTask(() => (numberService.value = 5));
+      runTask(() => this.rerender());
 
-        this.assertText('6');
-      }
+      this.assertText('5');
 
-      '@test works if there is no owner'(assert) {
-        class PlusOneHelper extends Helper {
-          compute([num]) {
-            return num + 1;
-          }
-        }
+      runTask(() => (numberService.value = 5));
 
-        class PlusOne {
-          constructor(number) {
-            this.number = number;
-          }
+      this.assertText('6');
+    }
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return { positional: [this.number] };
-          });
+    '@test works if there is no owner'(assert) {
+      class PlusOneHelper extends Helper {
+        compute([num]) {
+          return num + 1;
+        }
+      }
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+      class PlusOne {
+        constructor(number) {
+          this.number = number;
         }
 
-        let instance = new PlusOne(4);
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return { positional: [this.number] };
+        });
 
-        assert.notOk(getOwner(instance), 'no owner exists on the wrapper');
-        assert.equal(instance.value, 5, 'helper works without an owner');
+        get value() {
+          return getValue(this.plusOne);
+        }
       }
 
-      '@test tracking for arguments works for tracked properties'(assert) {
-        let count = 0;
+      let instance = new PlusOne(4);
 
-        class PlusOneHelper extends Helper {
-          compute([num]) {
-            count++;
-            return num + 1;
-          }
+      assert.notOk(getOwner(instance), 'no owner exists on the wrapper');
+      assert.equal(instance.value, 5, 'helper works without an owner');
+    }
+
+    '@test tracking for arguments works for tracked properties'(assert) {
+      let count = 0;
+
+      class PlusOneHelper extends Helper {
+        compute([num]) {
+          count++;
+          return num + 1;
         }
+      }
 
-        class PlusOne {
-          @tracked number;
+      class PlusOne {
+        @tracked number;
 
-          constructor(number) {
-            this.number = number;
-          }
+        constructor(number) {
+          this.number = number;
+        }
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return { positional: [this.number] };
-          });
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return { positional: [this.number] };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        let instance = new PlusOne(4);
+      let instance = new PlusOne(4);
 
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(count, 1, 'helper only called once');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(count, 1, 'helper only called once');
 
-        instance.number = 5;
+      instance.number = 5;
 
-        assert.equal(instance.value, 6, 'helper works');
-        assert.equal(count, 2, 'helper called a second time');
-      }
+      assert.equal(instance.value, 6, 'helper works');
+      assert.equal(count, 2, 'helper called a second time');
+    }
 
-      '@test computeArgs only called when consumed values change'(assert) {
-        let count = 0;
+    '@test computeArgs only called when consumed values change'(assert) {
+      let count = 0;
 
-        class PlusNHelper extends Helper {
-          compute([num], { n }) {
-            return num + n;
-          }
+      class PlusNHelper extends Helper {
+        compute([num], { n }) {
+          return num + n;
         }
+      }
 
-        class PlusN {
-          @tracked number;
-          @tracked n;
+      class PlusN {
+        @tracked number;
+        @tracked n;
 
-          constructor(number, n) {
-            this.number = number;
-            this.n = n;
-          }
+        constructor(number, n) {
+          this.number = number;
+          this.n = n;
+        }
 
-          plusOne = invokeHelper(this, PlusNHelper, () => {
-            count++;
-            return {
-              positional: [this.number],
-              named: {
-                n: this.n,
-              },
-            };
-          });
+        plusOne = invokeHelper(this, PlusNHelper, () => {
+          count++;
+          return {
+            positional: [this.number],
+            named: {
+              n: this.n,
+            },
+          };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        let instance = new PlusN(4, 1);
+      let instance = new PlusN(4, 1);
 
-        assert.equal(count, 0, 'computeArgs not called yet');
+      assert.equal(count, 0, 'computeArgs not called yet');
 
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(count, 1, 'computeArgs only called once');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(count, 1, 'computeArgs only called once');
 
-        instance.number = 5;
+      instance.number = 5;
 
-        assert.equal(instance.value, 6, 'helper works');
-        assert.equal(instance.value, 6, 'helper works');
-        assert.equal(count, 2, 'computeArgs called a second time');
+      assert.equal(instance.value, 6, 'helper works');
+      assert.equal(instance.value, 6, 'helper works');
+      assert.equal(count, 2, 'computeArgs called a second time');
 
-        instance.n = 5;
+      instance.n = 5;
 
-        assert.equal(instance.value, 10, 'helper works');
-        assert.equal(instance.value, 10, 'helper works');
-        assert.equal(count, 3, 'computeArgs called a third time');
-      }
+      assert.equal(instance.value, 10, 'helper works');
+      assert.equal(instance.value, 10, 'helper works');
+      assert.equal(count, 3, 'computeArgs called a third time');
+    }
 
-      '@test helper updates based on internal state changes'(assert) {
-        let count = 0;
-        let helper;
+    '@test helper updates based on internal state changes'(assert) {
+      let count = 0;
+      let helper;
 
-        class PlusOneHelper extends Helper {
-          @tracked number = 4;
+      class PlusOneHelper extends Helper {
+        @tracked number = 4;
 
-          constructor() {
-            super(...arguments);
-            helper = this;
-          }
+        constructor() {
+          super(...arguments);
+          helper = this;
+        }
 
-          compute() {
-            count++;
-            return this.number + 1;
-          }
+        compute() {
+          count++;
+          return this.number + 1;
         }
+      }
 
-        class PlusOne {
-          plusOne = invokeHelper(this, PlusOneHelper);
+      class PlusOne {
+        plusOne = invokeHelper(this, PlusOneHelper);
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        let instance = new PlusOne();
+      let instance = new PlusOne();
 
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(count, 1, 'helper only called once');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(count, 1, 'helper only called once');
 
-        helper.number = 5;
+      helper.number = 5;
 
-        assert.equal(instance.value, 6, 'helper works');
-        assert.equal(count, 2, 'helper called a second time');
-      }
+      assert.equal(instance.value, 6, 'helper works');
+      assert.equal(count, 2, 'helper called a second time');
+    }
 
-      '@test helper that with constant args is constant'(assert) {
-        let count = 0;
+    '@test helper that with constant args is constant'(assert) {
+      let count = 0;
 
-        class PlusOneHelper extends Helper {
-          compute([num]) {
-            count++;
-            return num + 1;
-          }
+      class PlusOneHelper extends Helper {
+        compute([num]) {
+          count++;
+          return num + 1;
         }
+      }
 
-        class PlusOne {
-          number;
+      class PlusOne {
+        number;
 
-          constructor(number) {
-            this.number = number;
-          }
+        constructor(number) {
+          this.number = number;
+        }
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return { positional: [this.number] };
-          });
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return { positional: [this.number] };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        let instance = new PlusOne(4);
+      let instance = new PlusOne(4);
 
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(count, 1, 'helper only called once');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(count, 1, 'helper only called once');
 
-        instance.number = 5;
+      instance.number = 5;
 
-        assert.equal(instance.value, 5, 'helper works');
-        assert.equal(count, 1, 'helper not called a second time');
-      }
+      assert.equal(instance.value, 5, 'helper works');
+      assert.equal(count, 1, 'helper not called a second time');
+    }
 
-      '@test helper destroys correctly when context object is destroyed'(assert) {
-        let context = {};
-        let instance;
+    '@test helper destroys correctly when context object is destroyed'(assert) {
+      let context = {};
+      let instance;
 
-        class TestHelper extends Helper {
-          constructor() {
-            super(...arguments);
-            instance = this;
-          }
+      class TestHelper extends Helper {
+        constructor() {
+          super(...arguments);
+          instance = this;
         }
+      }
 
-        let cache = invokeHelper(context, TestHelper);
+      let cache = invokeHelper(context, TestHelper);
 
-        registerDestructor(context, () => assert.step('context'));
-        registerDestructor(cache, () => assert.step('cache'));
-        registerDestructor(instance, () => assert.step('instance'));
+      registerDestructor(context, () => assert.step('context'));
+      registerDestructor(cache, () => assert.step('cache'));
+      registerDestructor(instance, () => assert.step('instance'));
 
-        runTask(() => destroy(context));
+      runTask(() => destroy(context));
 
-        assert.ok(isDestroyed(context), 'context destroyed');
-        assert.ok(isDestroyed(cache), 'cache destroyed');
-        assert.ok(isDestroyed(instance), 'instance destroyed');
+      assert.ok(isDestroyed(context), 'context destroyed');
+      assert.ok(isDestroyed(cache), 'cache destroyed');
+      assert.ok(isDestroyed(instance), 'instance destroyed');
 
-        assert.verifySteps(['instance', 'cache', 'context'], 'destructors ran in correct order');
-      }
+      assert.verifySteps(['instance', 'cache', 'context'], 'destructors ran in correct order');
+    }
 
-      '@test helper destroys correctly when helper cache is destroyed'(assert) {
-        let context = {};
-        let instance;
+    '@test helper destroys correctly when helper cache is destroyed'(assert) {
+      let context = {};
+      let instance;
 
-        class TestHelper extends Helper {
-          constructor() {
-            super(...arguments);
-            instance = this;
-          }
+      class TestHelper extends Helper {
+        constructor() {
+          super(...arguments);
+          instance = this;
         }
+      }
 
-        let cache = invokeHelper(context, TestHelper);
+      let cache = invokeHelper(context, TestHelper);
 
-        registerDestructor(context, () => assert.step('context'));
-        registerDestructor(cache, () => assert.step('cache'));
-        registerDestructor(instance, () => assert.step('instance'));
+      registerDestructor(context, () => assert.step('context'));
+      registerDestructor(cache, () => assert.step('cache'));
+      registerDestructor(instance, () => assert.step('instance'));
 
-        runTask(() => destroy(cache));
+      runTask(() => destroy(cache));
 
-        assert.notOk(isDestroyed(context), 'context NOT destroyed');
-        assert.ok(isDestroyed(cache), 'cache destroyed');
-        assert.ok(isDestroyed(instance), 'instance destroyed');
+      assert.notOk(isDestroyed(context), 'context NOT destroyed');
+      assert.ok(isDestroyed(cache), 'cache destroyed');
+      assert.ok(isDestroyed(instance), 'instance destroyed');
 
-        assert.verifySteps(['instance', 'cache'], 'destructors ran in correct order');
-      }
+      assert.verifySteps(['instance', 'cache'], 'destructors ran in correct order');
+    }
 
-      '@test simple helper destroys correctly when context object is destroyed'(assert) {
-        let context = {};
+    '@test simple helper destroys correctly when context object is destroyed'(assert) {
+      let context = {};
 
-        let TestHelper = helper(() => {});
-        let cache = invokeHelper(context, TestHelper);
+      let TestHelper = helper(() => {});
+      let cache = invokeHelper(context, TestHelper);
 
-        registerDestructor(context, () => assert.step('context'));
-        registerDestructor(cache, () => assert.step('cache'));
+      registerDestructor(context, () => assert.step('context'));
+      registerDestructor(cache, () => assert.step('cache'));
 
-        runTask(() => destroy(context));
+      runTask(() => destroy(context));
 
-        assert.ok(isDestroyed(context), 'context destroyed');
-        assert.ok(isDestroyed(cache), 'cache destroyed');
+      assert.ok(isDestroyed(context), 'context destroyed');
+      assert.ok(isDestroyed(cache), 'cache destroyed');
 
-        assert.verifySteps(['cache', 'context'], 'destructors ran in correct order');
+      assert.verifySteps(['cache', 'context'], 'destructors ran in correct order');
+    }
+
+    '@test throws an error if value is accessed after it is destroyed'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      '@test throws an error if value is accessed after it is destroyed'(assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+      assert.throws(() => {
+        let helper = invokeHelper({}, class extends Helper {});
 
-        assert.throws(() => {
-          let helper = invokeHelper({}, class extends Helper {});
+        runTask(() => destroy(helper));
 
-          runTask(() => destroy(helper));
+        getValue(helper);
+      }, /You attempted to get the value of a helper after the helper was destroyed, which is not allowed/);
+    }
 
-          getValue(helper);
-        }, /You attempted to get the value of a helper after the helper was destroyed, which is not allowed/);
+    '@test asserts if no context object is passed'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      '@test asserts if no context object is passed'(assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+      assert.throws(() => {
+        invokeHelper(undefined, class extends Helper {});
+      }, /Expected a context object to be passed as the first parameter to invokeHelper, got undefined/);
+    }
 
-        assert.throws(() => {
-          invokeHelper(undefined, class extends Helper {});
-        }, /Expected a context object to be passed as the first parameter to invokeHelper, got undefined/);
+    '@test asserts if no manager exists for the helper definition'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      '@test asserts if no manager exists for the helper definition'(assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
-
-        assert.throws(() => {
-          invokeHelper({}, class {});
-        }, /Attempted to load a helper, but there wasn't a helper manager associated with the definition. The definition was:/);
-      }
+      assert.throws(() => {
+        invokeHelper({}, class {});
+      }, /Attempted to load a helper, but there wasn't a helper manager associated with the definition. The definition was:/);
     }
-  );
-}
+  }
+);
 
-if (EMBER_GLIMMER_HELPER_MANAGER && EMBER_GLIMMER_INVOKE_HELPER) {
+if (EMBER_GLIMMER_HELPER_MANAGER) {
   class TestHelperManager {
     capabilities = helperCapabilities('3.23', {
       hasValue: true,
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 1fe89d6519e..beb1239d6e7 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -16,7 +16,6 @@ export const DEFAULT_FEATURES = {
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_NAMED_BLOCKS: true,
   EMBER_GLIMMER_HELPER_MANAGER: true,
-  EMBER_GLIMMER_INVOKE_HELPER: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
@@ -73,7 +72,6 @@ export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIE
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
 export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
-export const EMBER_GLIMMER_INVOKE_HELPER = featureValue(FEATURES.EMBER_GLIMMER_INVOKE_HELPER);
 export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 579692e922b..b476391ca4b 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -6,12 +6,7 @@ import { Registry, Container } from '@ember/-internals/container';
 import * as instrumentation from '@ember/instrumentation';
 import { meta } from '@ember/-internals/meta';
 import * as metal from '@ember/-internals/metal';
-import {
-  FEATURES,
-  isEnabled,
-  EMBER_GLIMMER_HELPER_MANAGER,
-  EMBER_GLIMMER_INVOKE_HELPER,
-} from '@ember/canary-features';
+import { FEATURES, isEnabled, EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
 import Backburner from 'backburner';
@@ -430,9 +425,7 @@ if (EMBER_GLIMMER_HELPER_MANAGER) {
   Ember._helperManagerCapabilities = helperCapabilities;
   Ember._setHelperManager = setHelperManager;
 }
-if (EMBER_GLIMMER_INVOKE_HELPER) {
-  Ember._invokeHelper = invokeHelper;
-}
+Ember._invokeHelper = invokeHelper;
 Ember._captureRenderTree = captureRenderTree;
 
 const deprecateImportFromString = function (

From e36530f2f6d7cabd34c52dd1f8bfe1a7c21e14d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrei=20Sebastian=20C=C3=AEmpean?=
 <andreisebastianc@gmail.com>
Date: Fri, 16 Oct 2020 17:45:20 +0300
Subject: [PATCH 0853/1405] [CLEANUP] Remove the EMBER_GLIMMER_HELPER_MANAGER
 flag

---
 .../helpers/helper-manager-test.js            | 521 +++++++++---------
 .../integration/helpers/invoke-helper-test.js | 249 +++++----
 packages/@ember/canary-features/index.ts      |   2 -
 packages/ember/index.js                       |   8 +-
 4 files changed, 385 insertions(+), 395 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 6f2d831d59b..7a6119d4b7a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -3,7 +3,6 @@ import { helperCapabilities, setHelperManager, setModifierManager } from '@glimm
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { tracked, set } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
-import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { service } from '@ember/service';
 import { registerDestructor } from '@glimmer/destroyable';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
@@ -48,351 +47,349 @@ class TestHelper {
 
 setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
 
-if (EMBER_GLIMMER_HELPER_MANAGER) {
-  moduleFor(
-    'Helpers test: helper managers',
-    class extends RenderingTestCase {
-      ['@test it works']() {
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            value() {
-              return 'hello';
-            }
+moduleFor(
+  'Helpers test: helper managers',
+  class extends RenderingTestCase {
+    ['@test it works']() {
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          value() {
+            return 'hello';
           }
-        );
+        }
+      );
 
-        this.render('{{hello}}');
+      this.render('{{hello}}');
 
-        this.assertText('hello');
+      this.assertText('hello');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertText('hello');
-      }
+      this.assertText('hello');
+    }
 
-      ['@test tracks changes to named arguments'](assert) {
-        let count = 0;
+    ['@test tracks changes to named arguments'](assert) {
+      let count = 0;
 
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            value() {
-              count++;
-              return this.args.named.foo;
-            }
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          value() {
+            count++;
+            return this.args.named.foo;
           }
-        );
+        }
+      );
 
-        this.render('{{hello foo=this.foo}}', {
-          foo: 123,
-        });
+      this.render('{{hello foo=this.foo}}', {
+        foo: 123,
+      });
 
-        assert.equal(count, 1, 'rendered once');
-        this.assertText('123');
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        assert.equal(count, 1, 'rendered once');
-        this.assertText('123');
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
 
-        runTask(() => set(this.context, 'foo', 456));
+      runTask(() => set(this.context, 'foo', 456));
 
-        assert.equal(count, 2, 'rendered twice');
-        this.assertText('456');
-      }
+      assert.equal(count, 2, 'rendered twice');
+      this.assertText('456');
+    }
 
-      ['@test tracks changes to positional arguments'](assert) {
-        let count = 0;
+    ['@test tracks changes to positional arguments'](assert) {
+      let count = 0;
 
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            value() {
-              count++;
-              return this.args.positional[0];
-            }
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          value() {
+            count++;
+            return this.args.positional[0];
           }
-        );
+        }
+      );
 
-        this.render('{{hello this.foo}}', {
-          foo: 123,
-        });
+      this.render('{{hello this.foo}}', {
+        foo: 123,
+      });
 
-        assert.equal(count, 1, 'rendered once');
-        this.assertText('123');
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        assert.equal(count, 1, 'rendered once');
-        this.assertText('123');
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
 
-        runTask(() => set(this.context, 'foo', 456));
+      runTask(() => set(this.context, 'foo', 456));
 
-        assert.equal(count, 2, 'rendered twice');
-        this.assertText('456');
-      }
+      assert.equal(count, 2, 'rendered twice');
+      this.assertText('456');
+    }
 
-      ['@test tracks changes to tracked properties'](assert) {
-        let count = 0;
-        let instance;
+    ['@test tracks changes to tracked properties'](assert) {
+      let count = 0;
+      let instance;
 
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            @tracked foo = 123;
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          @tracked foo = 123;
 
-            constructor(...args) {
-              super(...args);
-              instance = this;
-            }
+          constructor(...args) {
+            super(...args);
+            instance = this;
+          }
 
-            value() {
-              count++;
-              return this.foo;
-            }
+          value() {
+            count++;
+            return this.foo;
           }
-        );
+        }
+      );
 
-        this.render('{{hello}}');
+      this.render('{{hello}}');
 
-        assert.equal(count, 1, 'rendered once');
-        this.assertText('123');
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        assert.equal(count, 1, 'rendered once');
-        this.assertText('123');
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
 
-        runTask(() => (instance.foo = 456));
+      runTask(() => (instance.foo = 456));
 
-        assert.equal(count, 2, 'rendered twice');
-        this.assertText('456');
-      }
+      assert.equal(count, 2, 'rendered twice');
+      this.assertText('456');
+    }
 
-      ['@test services can be injected']() {
-        this.registerService(
-          'hello',
-          Service.extend({
-            value: 'hello',
-          })
-        );
-
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            @service hello;
-
-            value() {
-              return this.hello.value;
-            }
+    ['@test services can be injected']() {
+      this.registerService(
+        'hello',
+        Service.extend({
+          value: 'hello',
+        })
+      );
+
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          @service hello;
+
+          value() {
+            return this.hello.value;
           }
-        );
+        }
+      );
 
-        this.render('{{hello}}');
+      this.render('{{hello}}');
 
-        this.assertText('hello');
-      }
+      this.assertText('hello');
+    }
 
-      ['@test destroyable is associated correctly'](assert) {
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            value() {
-              return 'hello';
-            }
-
-            willDestroy() {
-              assert.ok(true, 'destructor called');
-            }
+    ['@test destroyable is associated correctly'](assert) {
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          value() {
+            return 'hello';
           }
-        );
 
-        this.render('{{hello}}');
+          willDestroy() {
+            assert.ok(true, 'destructor called');
+          }
+        }
+      );
 
-        this.assertText('hello');
-      }
+      this.render('{{hello}}');
 
-      ['@test debug name is used for backtracking message']() {
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            @tracked foo = 123;
+      this.assertText('hello');
+    }
 
-            value() {
-              this.foo;
-              this.foo = 456;
-            }
-          }
-        );
+    ['@test debug name is used for backtracking message']() {
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          @tracked foo = 123;
 
-        let expectedMessage = backtrackingMessageFor('foo', '.*', {
-          renderTree: ['\\(result of a `TEST_HELPER` helper\\)'],
-        });
+          value() {
+            this.foo;
+            this.foo = 456;
+          }
+        }
+      );
 
-        expectAssertion(() => {
-          this.render('{{hello}}');
-        }, expectedMessage);
-      }
+      let expectedMessage = backtrackingMessageFor('foo', '.*', {
+        renderTree: ['\\(result of a `TEST_HELPER` helper\\)'],
+      });
 
-      ['@test asserts against using both `hasValue` and `hasScheduledEffect`'](assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+      expectAssertion(() => {
+        this.render('{{hello}}');
+      }, expectedMessage);
+    }
 
-        assert.throws(() => {
-          helperCapabilities('3.23', {
-            hasValue: true,
-            hasScheduledEffect: true,
-          });
-        }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
+    ['@test asserts against using both `hasValue` and `hasScheduledEffect`'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      ['@test asserts requiring either `hasValue` or `hasScheduledEffect`'](assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+      assert.throws(() => {
+        helperCapabilities('3.23', {
+          hasValue: true,
+          hasScheduledEffect: true,
+        });
+      }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
+    }
 
-        assert.throws(() => {
-          helperCapabilities('3.23', {});
-        }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
+    ['@test asserts requiring either `hasValue` or `hasScheduledEffect`'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      ['@test asserts against using `hasScheduledEffect`'](assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+      assert.throws(() => {
+        helperCapabilities('3.23', {});
+      }, /You must pass either the `hasValue` OR the `hasScheduledEffect` capability when defining a helper manager. Passing neither, or both, is not permitted./);
+    }
 
-        assert.throws(() => {
-          helperCapabilities('3.23', {
-            hasScheduledEffect: true,
-          });
-        }, /The `hasScheduledEffect` capability has not yet been implemented for helper managers. Please pass `hasValue` instead/);
+    ['@test asserts against using `hasScheduledEffect`'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      ['@test asserts against using incorrect version for capabilities'](assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+      assert.throws(() => {
+        helperCapabilities('3.23', {
+          hasScheduledEffect: true,
+        });
+      }, /The `hasScheduledEffect` capability has not yet been implemented for helper managers. Please pass `hasValue` instead/);
+    }
 
-        assert.throws(() => {
-          helperCapabilities('aoeu', {
-            hasScheduledEffect: true,
-          });
-        }, /Invalid helper manager compatibility specified/);
+    ['@test asserts against using incorrect version for capabilities'](assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
       }
 
-      ['@test helper manager and modifier manager can be associated with the same value']() {
-        setModifierManager(() => ({}), TestHelper);
+      assert.throws(() => {
+        helperCapabilities('aoeu', {
+          hasScheduledEffect: true,
+        });
+      }, /Invalid helper manager compatibility specified/);
+    }
+
+    ['@test helper manager and modifier manager can be associated with the same value']() {
+      setModifierManager(() => ({}), TestHelper);
 
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            value() {
-              return 'hello';
-            }
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          value() {
+            return 'hello';
           }
-        );
+        }
+      );
 
-        this.render('{{hello}}');
+      this.render('{{hello}}');
 
-        this.assertText('hello');
+      this.assertText('hello');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertText('hello');
-      }
+      this.assertText('hello');
+    }
 
-      '@test capabilities helper function must be used to generate capabilities'(assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-          return;
-        }
+    '@test capabilities helper function must be used to generate capabilities'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+        return;
+      }
 
-        class OverrideTestHelperManager extends TestHelperManager {
-          capabilities = {
-            hasValue: true,
-            hasDestroyable: true,
-            hasScheduledEffect: false,
-          };
-        }
+      class OverrideTestHelperManager extends TestHelperManager {
+        capabilities = {
+          hasValue: true,
+          hasDestroyable: true,
+          hasScheduledEffect: false,
+        };
+      }
 
-        class TestHelper {}
+      class TestHelper {}
 
-        setHelperManager((owner) => new OverrideTestHelperManager(owner), TestHelper);
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            value() {
-              return 'hello';
-            }
+      setHelperManager((owner) => new OverrideTestHelperManager(owner), TestHelper);
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          value() {
+            return 'hello';
           }
-        );
+        }
+      );
 
-        assert.throws(() => {
-          this.render('{{hello}}');
-        }, /Custom helper managers must have a `capabilities` property that is the result of calling the `capabilities\('3.23'\)` \(imported via `import \{ capabilities \} from '@ember\/helper';`\). /);
+      assert.throws(() => {
+        this.render('{{hello}}');
+      }, /Custom helper managers must have a `capabilities` property that is the result of calling the `capabilities\('3.23'\)` \(imported via `import \{ capabilities \} from '@ember\/helper';`\). /);
 
-        assert.verifySteps([]);
-      }
+      assert.verifySteps([]);
+    }
 
-      '@test custom helpers gives helpful assertion when reading then mutating a tracked value within constructor'() {
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            @tracked foo = 123;
+    '@test custom helpers gives helpful assertion when reading then mutating a tracked value within constructor'() {
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          @tracked foo = 123;
 
-            constructor() {
-              super(...arguments);
+          constructor() {
+            super(...arguments);
 
-              // first read the tracked property
-              this.foo;
+            // first read the tracked property
+            this.foo;
 
-              // then attempt to update the tracked property
-              this.foo = 456;
-            }
+            // then attempt to update the tracked property
+            this.foo = 456;
+          }
 
-            value() {
-              return this.foo;
-            }
+          value() {
+            return this.foo;
           }
-        );
+        }
+      );
 
-        let expectedMessage = backtrackingMessageFor('foo');
+      let expectedMessage = backtrackingMessageFor('foo');
 
-        expectAssertion(() => {
-          this.render('{{hello}}');
-        }, expectedMessage);
-      }
+      expectAssertion(() => {
+        this.render('{{hello}}');
+      }, expectedMessage);
+    }
 
-      '@test custom helpers gives helpful assertion when reading then mutating a tracked value within value'() {
-        this.registerCustomHelper(
-          'hello',
-          class extends TestHelper {
-            @tracked foo = 123;
+    '@test custom helpers gives helpful assertion when reading then mutating a tracked value within value'() {
+      this.registerCustomHelper(
+        'hello',
+        class extends TestHelper {
+          @tracked foo = 123;
 
-            value() {
-              // first read the tracked property
-              this.foo;
+          value() {
+            // first read the tracked property
+            this.foo;
 
-              // then attempt to update the tracked property
-              this.foo = 456;
-            }
+            // then attempt to update the tracked property
+            this.foo = 456;
           }
-        );
+        }
+      );
 
-        let expectedMessage = backtrackingMessageFor('foo', '.*', {
-          renderTree: ['\\(result of a `TEST_HELPER` helper\\)'],
-        });
+      let expectedMessage = backtrackingMessageFor('foo', '.*', {
+        renderTree: ['\\(result of a `TEST_HELPER` helper\\)'],
+      });
 
-        expectAssertion(() => {
-          this.render('{{hello}}');
-        }, expectedMessage);
-      }
+      expectAssertion(() => {
+        this.render('{{hello}}');
+      }, expectedMessage);
     }
-  );
-}
+  }
+);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index 68bc6d69436..735a3784f42 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -3,7 +3,6 @@ import { helperCapabilities, setHelperManager } from '@glimmer/manager';
 import { Helper, helper, Component as EmberComponent } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
@@ -447,179 +446,177 @@ moduleFor(
   }
 );
 
-if (EMBER_GLIMMER_HELPER_MANAGER) {
-  class TestHelperManager {
-    capabilities = helperCapabilities('3.23', {
-      hasValue: true,
-      hasDestroyable: true,
-    });
+class TestHelperManager {
+  capabilities = helperCapabilities('3.23', {
+    hasValue: true,
+    hasDestroyable: true,
+  });
 
-    createHelper(Helper, args) {
-      return new Helper(args);
-    }
-
-    getValue(instance) {
-      return instance.value();
-    }
+  createHelper(Helper, args) {
+    return new Helper(args);
+  }
 
-    getDestroyable(instance) {
-      return instance;
-    }
+  getValue(instance) {
+    return instance.value();
   }
 
-  class TestHelper {
-    constructor(args) {
-      this.args = args;
+  getDestroyable(instance) {
+    return instance;
+  }
+}
 
-      registerDestructor(this, () => this.willDestroy());
-    }
+class TestHelper {
+  constructor(args) {
+    this.args = args;
 
-    willDestroy() {}
+    registerDestructor(this, () => this.willDestroy());
   }
 
-  setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
+  willDestroy() {}
+}
 
-  moduleFor(
-    'Helpers test: invokeHelper with custom helper managers',
-    class extends RenderingTestCase {
-      '@test it works with custom helper managers'() {
-        class PlusOneHelper extends TestHelper {
-          value() {
-            return this.args.positional[0] + 1;
-          }
+setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
+
+moduleFor(
+  'Helpers test: invokeHelper with custom helper managers',
+  class extends RenderingTestCase {
+    '@test it works with custom helper managers'() {
+      class PlusOneHelper extends TestHelper {
+        value() {
+          return this.args.positional[0] + 1;
         }
+      }
 
-        class PlusOne extends EmberComponent {
-          @tracked number;
+      class PlusOne extends EmberComponent {
+        @tracked number;
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return {
-              positional: [this.number],
-            };
-          });
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return {
+            positional: [this.number],
+          };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        this.registerComponent('plus-one', {
-          template: `{{this.value}}`,
-          ComponentClass: PlusOne,
-        });
+      this.registerComponent('plus-one', {
+        template: `{{this.value}}`,
+        ComponentClass: PlusOne,
+      });
 
-        this.render(`<PlusOne @number={{this.value}} />`, {
-          value: 4,
-        });
+      this.render(`<PlusOne @number={{this.value}} />`, {
+        value: 4,
+      });
 
-        this.assertText('5');
+      this.assertText('5');
 
-        runTask(() => this.rerender());
+      runTask(() => this.rerender());
 
-        this.assertText('5');
+      this.assertText('5');
 
-        runTask(() => set(this.context, 'value', 5));
+      runTask(() => set(this.context, 'value', 5));
 
-        this.assertText('6');
-      }
+      this.assertText('6');
+    }
 
-      '@test helper that accesses no args is constant'(assert) {
-        let count = 0;
+    '@test helper that accesses no args is constant'(assert) {
+      let count = 0;
 
-        class PlusOneHelper extends TestHelper {
-          value() {
-            count++;
-            return 123;
-          }
+      class PlusOneHelper extends TestHelper {
+        value() {
+          count++;
+          return 123;
         }
+      }
 
-        class PlusOne {
-          @tracked number;
+      class PlusOne {
+        @tracked number;
 
-          constructor(number) {
-            this.number = number;
-          }
+        constructor(number) {
+          this.number = number;
+        }
 
-          plusOne = invokeHelper(this, PlusOneHelper, () => {
-            return { positional: [this.number] };
-          });
+        plusOne = invokeHelper(this, PlusOneHelper, () => {
+          return { positional: [this.number] };
+        });
 
-          get value() {
-            return getValue(this.plusOne);
-          }
+        get value() {
+          return getValue(this.plusOne);
         }
+      }
 
-        let instance = new PlusOne(4);
+      let instance = new PlusOne(4);
 
-        assert.equal(instance.value, 123, 'helper works');
-        assert.equal(instance.value, 123, 'helper works');
-        assert.equal(count, 1, 'helper only called once');
+      assert.equal(instance.value, 123, 'helper works');
+      assert.equal(instance.value, 123, 'helper works');
+      assert.equal(count, 1, 'helper only called once');
 
-        instance.number = 5;
+      instance.number = 5;
 
-        assert.equal(instance.value, 123, 'helper works');
-        assert.equal(count, 1, 'helper not called a second time');
-      }
+      assert.equal(instance.value, 123, 'helper works');
+      assert.equal(count, 1, 'helper not called a second time');
+    }
 
-      '@test helper destroys correctly when context object is destroyed'(assert) {
-        let context = {};
-        let instance;
+    '@test helper destroys correctly when context object is destroyed'(assert) {
+      let context = {};
+      let instance;
 
-        class MyTestHelper extends TestHelper {
-          constructor() {
-            super(...arguments);
-            instance = this;
-          }
+      class MyTestHelper extends TestHelper {
+        constructor() {
+          super(...arguments);
+          instance = this;
         }
+      }
 
-        let cache = invokeHelper(context, MyTestHelper);
+      let cache = invokeHelper(context, MyTestHelper);
 
-        registerDestructor(context, () => assert.step('context'));
-        registerDestructor(cache, () => assert.step('cache'));
-        registerDestructor(instance, () => assert.step('instance'));
+      registerDestructor(context, () => assert.step('context'));
+      registerDestructor(cache, () => assert.step('cache'));
+      registerDestructor(instance, () => assert.step('instance'));
 
-        runTask(() => destroy(context));
+      runTask(() => destroy(context));
 
-        assert.ok(isDestroyed(context), 'context destroyed');
-        assert.ok(isDestroyed(cache), 'cache destroyed');
-        assert.ok(isDestroyed(instance), 'instance destroyed');
+      assert.ok(isDestroyed(context), 'context destroyed');
+      assert.ok(isDestroyed(cache), 'cache destroyed');
+      assert.ok(isDestroyed(instance), 'instance destroyed');
 
-        assert.verifySteps(['instance', 'cache', 'context'], 'destructors ran in correct order');
-      }
+      assert.verifySteps(['instance', 'cache', 'context'], 'destructors ran in correct order');
+    }
+
+    '@test args are frozen in debug builds'(assert) {
+      if (!DEBUG) {
+        assert.expect(0);
+      } else {
+        assert.expect(1);
 
-      '@test args are frozen in debug builds'(assert) {
-        if (!DEBUG) {
-          assert.expect(0);
-        } else {
-          assert.expect(1);
-
-          class PlusOneHelper extends TestHelper {
-            value() {
-              assert.ok(Object.isFrozen(this.args), 'args are frozen');
-              return 123;
-            }
+        class PlusOneHelper extends TestHelper {
+          value() {
+            assert.ok(Object.isFrozen(this.args), 'args are frozen');
+            return 123;
           }
+        }
 
-          class PlusOne {
-            number;
+        class PlusOne {
+          number;
 
-            constructor(number) {
-              this.number = number;
-            }
+          constructor(number) {
+            this.number = number;
+          }
 
-            plusOne = invokeHelper(this, PlusOneHelper, () => {
-              return { positional: [this.number] };
-            });
+          plusOne = invokeHelper(this, PlusOneHelper, () => {
+            return { positional: [this.number] };
+          });
 
-            get value() {
-              return getValue(this.plusOne);
-            }
+          get value() {
+            return getValue(this.plusOne);
           }
-
-          // get the value to trigger the assertion
-          new PlusOne(4).value;
         }
+
+        // get the value to trigger the assertion
+        new PlusOne(4).value;
       }
     }
-  );
-}
+  }
+);
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index beb1239d6e7..30fd41bfbe1 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -15,7 +15,6 @@ export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_NAMED_BLOCKS: true,
-  EMBER_GLIMMER_HELPER_MANAGER: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
@@ -71,7 +70,6 @@ function featureValue(value: null | boolean) {
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
-export const EMBER_GLIMMER_HELPER_MANAGER = featureValue(FEATURES.EMBER_GLIMMER_HELPER_MANAGER);
 export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
diff --git a/packages/ember/index.js b/packages/ember/index.js
index b476391ca4b..b88304e57db 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -6,7 +6,7 @@ import { Registry, Container } from '@ember/-internals/container';
 import * as instrumentation from '@ember/instrumentation';
 import { meta } from '@ember/-internals/meta';
 import * as metal from '@ember/-internals/metal';
-import { FEATURES, isEnabled, EMBER_GLIMMER_HELPER_MANAGER } from '@ember/canary-features';
+import { FEATURES, isEnabled } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
 import Backburner from 'backburner';
@@ -421,10 +421,8 @@ Ember._get = get;
 Ember._on = on;
 Ember._fn = fn;
 
-if (EMBER_GLIMMER_HELPER_MANAGER) {
-  Ember._helperManagerCapabilities = helperCapabilities;
-  Ember._setHelperManager = setHelperManager;
-}
+Ember._helperManagerCapabilities = helperCapabilities;
+Ember._setHelperManager = setHelperManager;
 Ember._invokeHelper = invokeHelper;
 Ember._captureRenderTree = captureRenderTree;
 

From 14115659d1972baffb7d795a1c1997365cb9691d Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 09:42:47 -0800
Subject: [PATCH 0854/1405] Better Ember.A types

---
 packages/@ember/-internals/runtime/lib/mixins/array.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index e5de10a78fd..ae0d538d305 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -96,7 +96,8 @@ interface NativeArray<T>
 declare const NativeArray: Array<unknown>;
 export { NativeArray };
 
-export function A<T>(arr?: T): T extends Array<infer V> ? NativeArray<V> : NativeArray<unknown>;
+export function A<A>(arr: A): A extends Array<infer V> ? NativeArray<V> : NativeArray<unknown>;
+export function A<T>(): NativeArray<T>;
 
 export function removeAt<T>(array: T[] | EmberArray<T>, start: number, len: number): EmberArray<T>;
 export function uniqBy<T>(array: T[], keyOrFunc: string | ((item: T) => unknown)): T[];

From 320d8294a30a10f8efa5d17130be68feca333165 Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Thu, 10 Feb 2022 21:03:25 +0100
Subject: [PATCH 0855/1405] [CLEANUP] Remove the EMBER_NAMED_BLOCKS feature
 flag

---
 .../tests/integration/helpers/yield-test.js   |  4 +-
 packages/@ember/canary-features/index.ts      |  2 -
 .../plugins/assert-against-named-blocks.ts    | 55 -------------------
 .../lib/plugins/index.ts                      |  5 +-
 .../assert-against-named-blocks-test.js       | 33 -----------
 5 files changed, 3 insertions(+), 96 deletions(-)
 delete mode 100644 packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
 delete mode 100644 packages/ember-template-compiler/tests/plugins/assert-against-named-blocks-test.js

diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
index b444d3097e7..05d4c392ff9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
@@ -26,7 +26,7 @@ moduleFor(
       this.assertText('[In layout:] [In Block:] Seattle');
     }
 
-    ['@feature(EMBER_NAMED_BLOCKS) can yield to a named block']() {
+    ['@test can yield to a named block']() {
       // This test fails when the default Ember component backing class is used:
       this.registerComponent('yield-comp', {
         template: '[In layout:] {{yield to="block"}}',
@@ -53,7 +53,7 @@ moduleFor(
       this.assertText('[In layout:] [In block:] Seattle');
     }
 
-    ['@feature(EMBER_NAMED_BLOCKS) <:else> and <:inverse> named blocks']() {
+    ['@test <:else> and <:inverse> named blocks']() {
       this.registerComponent('yielder', {
         template:
           '[:else][{{has-block "else"}}][{{yield to="else"}}]' +
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 30fd41bfbe1..46e4315e2e7 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -14,7 +14,6 @@ import { ENV } from '@ember/-internals/environment';
 export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
-  EMBER_NAMED_BLOCKS: true,
   EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
@@ -69,7 +68,6 @@ function featureValue(value: null | boolean) {
 
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
-export const EMBER_NAMED_BLOCKS = featureValue(FEATURES.EMBER_NAMED_BLOCKS);
 export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
deleted file mode 100644
index a1c8d6323ee..00000000000
--- a/packages/ember-template-compiler/lib/plugins/assert-against-named-blocks.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-
-/**
- @module ember
-*/
-
-/**
-  Prevents usage of named blocks
-
-  @private
-  @class AssertAgainstNamedBlocks
-*/
-export default function assertAgainstNamedBlocks(env: EmberASTPluginEnvironment): ASTPlugin {
-  let moduleName = env.meta?.moduleName;
-
-  return {
-    name: 'assert-against-named-blocks',
-
-    visitor: {
-      ElementNode(node: AST.ElementNode) {
-        if (node.tag[0] === ':') {
-          let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-
-          assert(
-            `Named blocks are not currently available, attempted to use the <${node.tag}> named block. ${sourceInformation}`
-          );
-        }
-      },
-
-      MustacheStatement(node: AST.MustacheStatement) {
-        if (node.path.type === 'PathExpression' && node.path.original === 'yield') {
-          let to = node.hash.pairs.filter((pair) => pair.key === 'to')[0];
-
-          // Glimmer template compiler ensures yield must receive a string literal,
-          // so we only need to check if it is not "default" or "inverse"
-          if (
-            to &&
-            to.value.type === 'StringLiteral' &&
-            to.value.original !== 'default' &&
-            to.value.original !== 'inverse'
-          ) {
-            let sourceInformation = calculateLocationDisplay(moduleName, node.loc);
-
-            assert(
-              `Named blocks are not currently available, attempted to yield to a named block other than "default" or "inverse": {{yield to="${to.value.original}"}}. ${sourceInformation}`
-            );
-          }
-        }
-      },
-    },
-  };
-}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 28f29a10b25..4ca0c016304 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -1,6 +1,5 @@
 import AssertAgainstAttrs from './assert-against-attrs';
 import AssertAgainstDynamicHelpersModifiers from './assert-against-dynamic-helpers-modifiers';
-import AssertAgainstNamedBlocks from './assert-against-named-blocks';
 import AssertAgainstNamedOutlets from './assert-against-named-outlets';
 import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
@@ -13,7 +12,7 @@ import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings
 import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
-import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS, EMBER_NAMED_BLOCKS } from '@ember/canary-features';
+import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS } from '@ember/canary-features';
 
 // order of plugins is important
 export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
@@ -29,7 +28,6 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformEachTrackArray,
     AssertAgainstNamedOutlets,
     TransformWrapMountAndOutlet,
-    !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
       ? TransformResolutions
       : AssertAgainstDynamicHelpersModifiers,
@@ -47,7 +45,6 @@ export const STRICT_MODE_TRANSFORMS = Object.freeze(
     TransformEachTrackArray,
     AssertAgainstNamedOutlets,
     TransformWrapMountAndOutlet,
-    !EMBER_NAMED_BLOCKS ? AssertAgainstNamedBlocks : null,
     !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
   ].filter(notNull)
 );
diff --git a/packages/ember-template-compiler/tests/plugins/assert-against-named-blocks-test.js b/packages/ember-template-compiler/tests/plugins/assert-against-named-blocks-test.js
deleted file mode 100644
index c45063dc27b..00000000000
--- a/packages/ember-template-compiler/tests/plugins/assert-against-named-blocks-test.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { compile } from '../../index';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  'ember-template-compiler: assert-against-named-blocks',
-  class extends AbstractTestCase {
-    [`@feature(EMBER_NAMED_BLOCKS) is disabled when feature flag is enabled`](assert) {
-      assert.expect(0);
-
-      compile(`<Foo><:named></:named></Foo>`, {
-        moduleName: 'baz/foo-bar',
-      });
-
-      compile(`{{yield to="bar"}}`, {
-        moduleName: 'baz/bar-baz',
-      });
-    }
-
-    [`@feature(!EMBER_NAMED_BLOCKS) is enabled when feature flag is disabled`]() {
-      expectAssertion(() => {
-        compile(`<Foo><:named></:named></Foo>`, {
-          moduleName: 'baz/foo-bar',
-        });
-      }, `Named blocks are not currently available, attempted to use the <:named> named block. ('baz/foo-bar' @ L1:C5) `);
-
-      expectAssertion(() => {
-        compile(`{{yield to="bar"}}`, {
-          moduleName: 'baz/bar-baz',
-        });
-      }, `Named blocks are not currently available, attempted to yield to a named block other than "default" or "inverse": {{yield to="bar"}}. ('baz/bar-baz' @ L1:C0) `);
-    }
-  }
-);

From db7c537fb7b2e30d28287dce74856322bc45bbf0 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 12:31:40 -0800
Subject: [PATCH 0856/1405] Fix types for canInvoke

---
 packages/@ember/-internals/utils/lib/invoke.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/utils/lib/invoke.ts b/packages/@ember/-internals/utils/lib/invoke.ts
index 5656fbc5af3..6f4c865605b 100644
--- a/packages/@ember/-internals/utils/lib/invoke.ts
+++ b/packages/@ember/-internals/utils/lib/invoke.ts
@@ -16,8 +16,8 @@
   @return {Boolean}
   @private
 */
-export function canInvoke(obj: any | null | undefined, methodName: string): obj is Function {
-  return obj !== null && obj !== undefined && typeof obj[methodName] === 'function';
+export function canInvoke(obj: unknown, methodName: string): boolean {
+  return obj != null && typeof (obj as Record<string, unknown>)[methodName] === 'function';
 }
 
 /**

From 4d02c25b59fab6d32de46dd5da488a1eeefef441 Mon Sep 17 00:00:00 2001
From: Jan Votava <jan@sensible.io>
Date: Mon, 13 Aug 2018 11:42:00 +0200
Subject: [PATCH 0857/1405] Fix isEmpty on nested objects

So ArrayProxy inside ObjectProxy works with ES5 getters
Fixes #16878
---
 packages/@ember/-internals/metal/lib/is_empty.ts   | 10 ++++------
 .../-internals/runtime/tests/core/is_empty_test.js | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/is_empty.ts b/packages/@ember/-internals/metal/lib/is_empty.ts
index 283cd2a324a..5339ac8cd84 100644
--- a/packages/@ember/-internals/metal/lib/is_empty.ts
+++ b/packages/@ember/-internals/metal/lib/is_empty.ts
@@ -52,18 +52,16 @@ export default function isEmpty(obj: any): boolean {
     if (typeof size === 'number') {
       return !size;
     }
-  }
-
-  if (typeof obj.length === 'number' && objectType !== 'function') {
-    return !obj.length;
-  }
 
-  if (objectType === 'object') {
     let length = get(obj, 'length');
     if (typeof length === 'number') {
       return !length;
     }
   }
 
+  if (typeof obj.length === 'number' && objectType !== 'function') {
+    return !obj.length;
+  }
+
   return false;
 }
diff --git a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
index 65f9812eaf6..1d32bc85eab 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
@@ -1,15 +1,27 @@
 import { isEmpty } from '@ember/-internals/metal';
 import ArrayProxy from '../../lib/system/array_proxy';
+import ObjectProxy from '../../lib/system/object_proxy';
 import { A as emberA } from '../../lib/mixins/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   'Ember.isEmpty',
   class extends AbstractTestCase {
-    ['@test Ember.isEmpty'](assert) {
+    ['@test Ember.isEmpty ArrayProxy'](assert) {
       let arrayProxy = ArrayProxy.create({ content: emberA() });
 
       assert.equal(true, isEmpty(arrayProxy), 'for an ArrayProxy that has empty content');
     }
+
+    ['@test Ember.isEmpty ObjectProxy ArrayProxy'](assert) {
+      let arrayProxy = ArrayProxy.create({ content: emberA([]) });
+      let objectProxy = ObjectProxy.create({ content: arrayProxy });
+
+      assert.equal(
+        true,
+        isEmpty(objectProxy),
+        'for an ArrayProxy inside ObjectProxy that has empty content'
+      );
+    }
   }
 );

From b1047ad3e7a4fb0f3c8a5203e8ec983f97c21f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moacir=20P=2E=20de=20Sa=CC=81=20Pereira?=
 <github@moacir.moacir.com>
Date: Thu, 10 Feb 2022 16:58:40 -0500
Subject: [PATCH 0858/1405] lint: Fix lint error

---
 node-tests/blueprints/mixin-test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/node-tests/blueprints/mixin-test.js b/node-tests/blueprints/mixin-test.js
index 8426fea27fe..4f8e1da2621 100644
--- a/node-tests/blueprints/mixin-test.js
+++ b/node-tests/blueprints/mixin-test.js
@@ -5,7 +5,6 @@ const setupTestHooks = blueprintHelpers.setupTestHooks;
 const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
-const EOL = require('os').EOL;
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;

From d268677a8b38146ba1a9ec2ff72f257a284bd214 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 Jan 2022 10:53:47 -0800
Subject: [PATCH 0859/1405] Future public @ember/engine types

---
 .../-internals/container/lib/container.ts     | 10 +-
 .../-internals/container/lib/registry.ts      | 14 +--
 .../glimmer/lib/components/link-to.ts         |  3 +-
 .../@ember/-internals/glimmer/lib/resolver.ts | 17 ++--
 .../application/debug-render-tree-test.ts     |  6 +-
 packages/@ember/-internals/owner/index.ts     | 14 +--
 .../routing/lib/system/controller_for.ts      |  4 +-
 .../runtime/lib/mixins/container_proxy.d.ts   | 11 +++
 .../runtime/lib/mixins/registry_proxy.d.ts    | 17 ++++
 .../runtime/lib/mixins/registry_proxy.js      |  4 +-
 packages/@ember/application/instance.d.ts     |  8 +-
 .../application/type-tests/instance.test.ts   |  7 +-
 packages/@ember/engine/index.d.ts             | 19 ++--
 packages/@ember/engine/instance.d.ts          | 10 +-
 .../{engine-parent.js => engine-parent.ts}    |  5 +-
 .../@ember/engine/type-tests/index.test.ts    | 93 +++++++++++++++++++
 16 files changed, 179 insertions(+), 63 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
 rename packages/@ember/engine/lib/{engine-parent.js => engine-parent.ts} (75%)
 create mode 100644 packages/@ember/engine/type-tests/index.test.ts

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 1b7c596c74e..cdb120d579e 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,8 +1,8 @@
-import { Factory, LookupOptions, Owner, setOwner } from '@ember/-internals/owner';
+import { Factory, Owner, setOwner } from '@ember/-internals/owner';
 import { dictionary, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import Registry, { DebugRegistry } from './registry';
+import Registry, { DebugRegistry, TypeOptions } from './registry';
 
 interface LeakTracking {
   hasContainers(): boolean;
@@ -143,7 +143,7 @@ export default class Container {
    @param {String} [options.source] The fullname of the request source (used for local lookup)
    @return {any}
    */
-  lookup(fullName: string, options: LookupOptions): any {
+  lookup<T>(fullName: string, options?: TypeOptions): T | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
     }
@@ -206,8 +206,6 @@ export default class Container {
     @public
    @method factoryFor
    @param {String} fullName
-   @param {Object} [options]
-   @param {String} [options.source] The fullname of the request source (used for local lookup)
    @return {any}
    */
   factoryFor<T, C>(fullName: string): Factory<T, C> | undefined {
@@ -261,7 +259,7 @@ function isInstantiatable(container: Container, fullName: string) {
   return container.registry.getOption(fullName, 'instantiate') !== false;
 }
 
-function lookup(container: Container, fullName: string, options: LookupOptions = {}) {
+function lookup(container: Container, fullName: string, options: TypeOptions = {}) {
   let normalizedName = fullName;
 
   if (
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 5b11d49b083..7732a293baf 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -79,12 +79,12 @@ export default class Registry implements IRegistry {
   readonly _failSet: Set<string>;
   resolver: Resolver | (Resolve & NotResolver) | null;
   readonly fallback: IRegistry | null;
-  readonly registrations: { [key: string]: object };
-  _localLookupCache: { [key: string]: object };
-  readonly _normalizeCache: { [key: string]: string };
-  readonly _options: { [key: string]: TypeOptions };
-  readonly _resolveCache: { [key: string]: object };
-  readonly _typeOptions: { [key: string]: TypeOptions };
+  readonly registrations: Record<string, object>;
+  _localLookupCache: Record<string, object>;
+  readonly _normalizeCache: Record<string, string>;
+  readonly _options: Record<string, TypeOptions>;
+  readonly _resolveCache: Record<string, object>;
+  readonly _typeOptions: Record<string, TypeOptions>;
 
   constructor(options: RegistryOptions = {}) {
     this.fallback = options.fallback || null;
@@ -182,7 +182,7 @@ export default class Registry implements IRegistry {
    @param {Function} factory
    @param {Object} options
    */
-  register<T, C>(fullName: string, factory: Factory<T, C>, options: object = {}): void {
+  register<T, C>(fullName: string, factory: Factory<T, C>, options: TypeOptions = {}): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
     assert(`Attempting to register an unknown factory: '${fullName}'`, factory !== undefined);
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 17aa8eeb239..0320e62a57c 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -2,7 +2,8 @@ import { Owner } from '@ember/-internals/owner';
 import { Route, RouterState, RoutingService } from '@ember/-internals/routing';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
-import { EngineInstance, getEngineParent } from '@ember/engine';
+import { getEngineParent } from '@ember/engine';
+import EngineInstance from '@ember/engine/instance';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 96071ae14c5..8edd3ec6436 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,6 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { ENV } from '@ember/-internals/environment';
-import { Factory, FactoryClass, LookupOptions, Owner } from '@ember/-internals/owner';
+import { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
@@ -56,16 +57,12 @@ function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
 }
 
-function componentFor(
-  name: string,
-  owner: Owner,
-  options?: LookupOptions
-): Option<Factory<{}, {}>> {
+function componentFor(name: string, owner: Owner): Option<Factory<{}, {}>> {
   let fullName = `component:${name}`;
-  return owner.factoryFor(fullName, options) || null;
+  return owner.factoryFor(fullName) || null;
 }
 
-function layoutFor(name: string, owner: Owner, options?: LookupOptions): Option<Template> {
+function layoutFor(name: string, owner: Owner, options?: TypeOptions): Option<Template> {
   let templateFullName = `template:components/${name}`;
 
   return owner.lookup(templateFullName, options) || null;
@@ -88,9 +85,9 @@ type LookupResult =
 function lookupComponentPair(
   owner: Owner,
   name: string,
-  options?: LookupOptions
+  options?: TypeOptions
 ): Option<LookupResult> {
-  let component = componentFor(name, owner, options);
+  let component = componentFor(name, owner);
 
   if (component !== null && component.class !== undefined) {
     let layout = getComponentTemplate(component.class);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index e8298831fb8..83914b32073 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -198,7 +198,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             Resolver = ModuleBasedTestResolver;
 
             init() {
-              super.init(...arguments);
+              super.init();
               this.register(
                 'template:application',
                 compileTemplate(
@@ -234,7 +234,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             Resolver = ModuleBasedTestResolver;
 
             init() {
-              super.init(...arguments);
+              super.init();
               this.register(
                 'template:application',
                 compileTemplate(
@@ -579,7 +579,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             Resolver = ModuleBasedTestResolver;
 
             init() {
-              super.init(...arguments);
+              super.init();
               this.register(
                 'template:application',
                 compileTemplate(
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 88a5d334243..f8f9665d550 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -4,11 +4,6 @@ import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimm
 @module @ember/application
 */
 
-export interface LookupOptions {
-  singleton?: boolean;
-  instantiate?: boolean;
-}
-
 export interface FactoryClass {
   positionalParams?: string | string[] | undefined | null;
 }
@@ -27,11 +22,12 @@ export interface EngineInstanceOptions {
 }
 
 import EngineInstance from '@ember/engine/instance';
+import { TypeOptions } from '../container/lib/registry';
 export interface Owner {
-  lookup<T>(fullName: string, options?: LookupOptions): T | undefined;
-  factoryFor<T, C>(fullName: string, options?: LookupOptions): Factory<T, C> | undefined;
-  register<T, C>(fullName: string, factory: Factory<T, C>, options?: LookupOptions): void;
-  hasRegistration(name: string, options?: LookupOptions): boolean;
+  lookup<T>(fullName: string, options?: TypeOptions): T | undefined;
+  factoryFor<T, C>(fullName: string): Factory<T, C> | undefined;
+  register<T, C>(fullName: string, factory: Factory<T, C>, options?: TypeOptions): void;
+  hasRegistration(name: string): boolean;
 
   /** @internal */
   mountPoint?: string;
diff --git a/packages/@ember/-internals/routing/lib/system/controller_for.ts b/packages/@ember/-internals/routing/lib/system/controller_for.ts
index 678812ff578..3a04cea3303 100644
--- a/packages/@ember/-internals/routing/lib/system/controller_for.ts
+++ b/packages/@ember/-internals/routing/lib/system/controller_for.ts
@@ -1,5 +1,5 @@
 import { Container } from '@ember/-internals/container';
-import { LookupOptions } from '@ember/-internals/owner';
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
 /**
 @module ember
 */
@@ -14,7 +14,7 @@ import { LookupOptions } from '@ember/-internals/owner';
 export default function controllerFor(
   container: Container,
   controllerName: string,
-  lookupOptions: LookupOptions
+  lookupOptions: TypeOptions
 ) {
   return container.lookup(`controller:${controllerName}`, lookupOptions);
 }
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
new file mode 100644
index 00000000000..31d9dbee6b1
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
@@ -0,0 +1,11 @@
+import { Container } from '@ember/-internals/container';
+import Mixin from '../../types/mixin';
+
+interface ContainerProxy {
+  ownerInjection: Container['ownerInjection'];
+  lookup: Container['lookup'];
+  factoryFor: Container['factoryFor'];
+}
+declare const ContainerProxy: Mixin;
+
+export default ContainerProxy;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
new file mode 100644
index 00000000000..b18c207573b
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
@@ -0,0 +1,17 @@
+import { Registry } from '@ember/-internals/container';
+import Mixin from '../../types/mixin';
+
+interface RegistryProxyMixin {
+  resolveRegistration: Registry['resolve'];
+  register: Registry['register'];
+  unregister: Registry['unregister'];
+  hasRegistration: Registry['has'];
+  registeredOption: Registry['getOption'];
+  registerOptions: Registry['options'];
+  registeredOptions: Registry['getOptions'];
+  registerOptionsForType: Registry['optionsForType'];
+  registeredOptionsForType: Registry['getOptionsForType'];
+}
+declare const RegistryProxyMixin: Mixin;
+
+export default RegistryProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
index da3e416ef17..5f7a011dca9 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
@@ -23,9 +23,9 @@ export default Mixin.create({
    @param {String} fullName
    @return {Function} fullName's factory
    */
-  resolveRegistration(fullName, options) {
+  resolveRegistration(fullName) {
     assert('fullName must be a proper full name', this.__registry__.isValidFullName(fullName));
-    return this.__registry__.resolve(fullName, options);
+    return this.__registry__.resolve(fullName);
   },
 
   /**
diff --git a/packages/@ember/application/instance.d.ts b/packages/@ember/application/instance.d.ts
index a04c11955d2..d5bb40458c3 100644
--- a/packages/@ember/application/instance.d.ts
+++ b/packages/@ember/application/instance.d.ts
@@ -1,4 +1,4 @@
-import { EngineInstance } from '@ember/engine';
+import EngineInstance from '@ember/engine/instance';
 
 export class BootOptions {
   isBrowser: boolean;
@@ -19,8 +19,4 @@ export class BootOptions {
   toEnvironment(): Record<string, unknown>;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface ApplicationInstance extends EngineInstance {}
-declare class ApplicationInstance {}
-
-export default ApplicationInstance;
+export default class ApplicationInstance extends EngineInstance {}
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 1ac6e63baf4..e6ba5393fee 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -1,6 +1,6 @@
 import Application from '@ember/application';
 import ApplicationInstance, { BootOptions } from '@ember/application/instance';
-import { EngineInstance } from '@ember/engine';
+import EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
@@ -25,9 +25,8 @@ expectTypeOf(
 ).toEqualTypeOf<Store | undefined>();
 
 expectTypeOf(instance.hasRegistration('service:store')).toEqualTypeOf<boolean>();
-expectTypeOf(
-  instance.hasRegistration('service:store', { singleton: true, instantiate: true })
-).toEqualTypeOf<boolean>();
+// @ts-expect-error requires name
+instance.hasRegistration();
 
 expectTypeOf(instance.boot()).toEqualTypeOf<void>();
 
diff --git a/packages/@ember/engine/index.d.ts b/packages/@ember/engine/index.d.ts
index 5d0bcebb6ca..36a691b14a1 100644
--- a/packages/@ember/engine/index.d.ts
+++ b/packages/@ember/engine/index.d.ts
@@ -1,13 +1,16 @@
 import EngineInstance from './instance';
-import { EngineInstanceOptions, Factory } from '@ember/-internals/owner';
+import { EngineInstanceOptions } from '@ember/-internals/owner';
+import { Namespace, RegistryProxyMixin } from '@ember/-internals/runtime';
 
-export function getEngineParent(instance: EngineInstance): EngineInstance | undefined;
+export { getEngineParent } from '@ember/engine/lib/engine-parent';
 
-export { EngineInstance };
-
-export default class Engine {
-  constructor(...args: any[]);
-  init(...args: any[]): void;
-  register<T, C>(fullName: string, factory: Factory<T, C>, options?: object): void;
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Engine extends RegistryProxyMixin {}
+declare class Engine extends Namespace {
   buildInstance(options?: EngineInstanceOptions): EngineInstance;
+  initializer: (initializer: unknown) => void;
+  instanceInitializer: (initializer: unknown) => void;
+  Resolver: unknown | null;
 }
+
+export { Engine as default };
diff --git a/packages/@ember/engine/instance.d.ts b/packages/@ember/engine/instance.d.ts
index ab41cf52477..76516f6f970 100644
--- a/packages/@ember/engine/instance.d.ts
+++ b/packages/@ember/engine/instance.d.ts
@@ -1,10 +1,14 @@
+import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
 import { Owner } from '@ember/-internals/owner';
+import { BootOptions } from '@ember/application/instance';
 import EmberObject from '@ember/object';
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface EngineInstance extends Owner {}
+interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, Owner {}
+
 declare class EngineInstance extends EmberObject {
-  boot(): void;
+  init(...args: unknown[]): void;
+  boot(options?: BootOptions): void;
+  unregister(fullName: string): void;
 }
 
 export default EngineInstance;
diff --git a/packages/@ember/engine/lib/engine-parent.js b/packages/@ember/engine/lib/engine-parent.ts
similarity index 75%
rename from packages/@ember/engine/lib/engine-parent.js
rename to packages/@ember/engine/lib/engine-parent.ts
index e6e70748fdb..924b9d54d5b 100644
--- a/packages/@ember/engine/lib/engine-parent.js
+++ b/packages/@ember/engine/lib/engine-parent.ts
@@ -2,6 +2,7 @@
 @module @ember/engine
 */
 import { symbol } from '@ember/-internals/utils';
+import EngineInstance from '../instance';
 
 const ENGINE_PARENT = symbol('ENGINE_PARENT');
 
@@ -15,7 +16,7 @@ const ENGINE_PARENT = symbol('ENGINE_PARENT');
   @static
   @private
 */
-export function getEngineParent(engine) {
+export function getEngineParent(engine: EngineInstance): EngineInstance | undefined {
   return engine[ENGINE_PARENT];
 }
 
@@ -27,6 +28,6 @@ export function getEngineParent(engine) {
   @param {EngineInstance} parent The parent engine instance.
   @private
 */
-export function setEngineParent(engine, parent) {
+export function setEngineParent(engine: EngineInstance, parent: EngineInstance): void {
   engine[ENGINE_PARENT] = parent;
 }
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
new file mode 100644
index 00000000000..b9f1aa2358f
--- /dev/null
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -0,0 +1,93 @@
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import { Factory } from '@ember/-internals/owner';
+import Namespace from '@ember/application/namespace';
+import Engine from '@ember/engine';
+import EngineInstance from '@ember/engine/instance';
+import EmberObject from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+
+class Foo extends EmberObject {}
+class Bar {}
+
+let engine = new Engine();
+
+expectTypeOf(engine).toMatchTypeOf<Namespace>();
+
+expectTypeOf(engine.buildInstance()).toEqualTypeOf<EngineInstance>();
+engine.buildInstance({ mountPoint: 'foo', routable: true });
+// @ts-expect-error Invalid argument
+engine.buildInstance(1);
+// @ts-expect-error Invalid argument
+engine.buildInstance({});
+// @ts-expect-error Invalid argument
+engine.buildInstance({ mountPoint: 1, routable: true });
+// @ts-expect-error Invalid argument
+engine.buildInstance({ mountPoint: 'foo' });
+
+expectTypeOf(engine.initializer).toEqualTypeOf<(initializer: unknown) => void>();
+
+expectTypeOf(engine.instanceInitializer).toEqualTypeOf<(initializer: unknown) => void>();
+
+expectTypeOf(engine.Resolver).toEqualTypeOf<unknown | null>();
+
+// RegistryProxy
+
+expectTypeOf(engine.resolveRegistration<unknown, object>('foo')).toEqualTypeOf<
+  Factory<unknown, object> | undefined
+>();
+// @ts-expect-error Requires name
+engine.resolveRegistration();
+// @ts-expect-error Only takes one arg
+engine.resolveRegistration('foo', {});
+
+expectTypeOf(engine.register('fruit:favorite', Foo)).toMatchTypeOf<void>();
+engine.register('fruit:favorite', Foo, { singleton: true, instantiate: true });
+// @ts-expect-error requires a Factory object
+engine.register('fruit:foo', Bar);
+// @ts-expect-error requires a string name
+engine.register(1, Foo);
+// @ts-expect-error requires a Factory
+engine.register('fruit:foo');
+// @ts-expect-error requires valid options
+engine.register('fruit:favorite', Foo, { singleton: 1 });
+
+expectTypeOf(engine.unregister('model:user')).toEqualTypeOf<void>();
+// @ts-expect-error Requires a name
+engine.unregister();
+
+expectTypeOf(engine.hasRegistration('fruit:favorite')).toEqualTypeOf<boolean>();
+// @ts-expect-error Requires a name
+engine.hasRegistration();
+
+expectTypeOf(engine.registeredOption('fruit:favorite', 'instantiate')).toEqualTypeOf<
+  boolean | undefined
+>();
+engine.registeredOption('fruit:favorite', 'singleton');
+// @ts-expect-error verifies key
+engine.registeredOption('fruit:favorite', 'invalid');
+
+expectTypeOf(engine.registerOptions('fruit:favorite', { instantiate: true })).toEqualTypeOf<void>();
+// @ts-expect-error requires options
+engine.registerOptions('fruit:favorite');
+// @ts-expect-error requires valid options
+engine.registerOptions('fruit:favorite', 1);
+// @ts-expect-error requires valid options
+engine.registerOptions('fruit:favorite', { singleton: 1 });
+
+expectTypeOf(engine.registeredOptions('fruit:favorite')).toEqualTypeOf<TypeOptions | undefined>();
+// @ts-expect-error requires string name
+engine.registeredOption(1);
+
+expectTypeOf(
+  engine.registerOptionsForType('fruit:favorite', { singleton: true, instantiate: false })
+).toEqualTypeOf<void>();
+// @ts-expect-error requires options
+engine.registerOptionsForType('fruit:favorite');
+// @ts-expect-error requires valid options
+engine.registerOptionsForType('fruit:favorite', 1);
+// @ts-expect-error requires valid options
+engine.registerOptionsForType('fruit:favorite', { singleton: 1 });
+
+expectTypeOf(engine.registeredOptionsForType('my-type')).toEqualTypeOf<TypeOptions | undefined>();
+// @ts-expect-error requires type
+engine.registeredOptionsForType();

From d4c40f1d66cbdea276ec7db4f61a025619b12b79 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Feb 2022 17:58:39 -0800
Subject: [PATCH 0860/1405] Resolve unsafe owner methods

---
 .../-internals/container/lib/container.ts     | 23 +++++++++++-------
 .../-internals/container/lib/registry.ts      |  2 +-
 .../glimmer/lib/component-managers/curly.ts   |  2 +-
 .../-internals/glimmer/lib/component.ts       |  4 ++--
 .../glimmer/lib/modifiers/action.ts           |  2 +-
 .../@ember/-internals/glimmer/lib/resolver.ts | 19 +++++++--------
 .../application/debug-render-tree-test.ts     |  4 ++--
 packages/@ember/-internals/owner/index.ts     |  6 ++---
 .../routing/lib/location/auto_location.ts     |  2 +-
 .../routing/lib/system/generate_controller.ts |  4 ++--
 .../-internals/routing/lib/system/route.ts    | 24 ++++++++++---------
 .../-internals/routing/lib/system/router.ts   | 16 ++++++-------
 .../-internals/views/lib/system/utils.ts      |  4 ++--
 .../application/type-tests/instance.test.ts   |  6 ++---
 .../@ember/debug/lib/capture-render-tree.ts   |  2 +-
 15 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index cdb120d579e..da224b31077 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,4 +1,4 @@
-import { Factory, Owner, setOwner } from '@ember/-internals/owner';
+import { Factory, FactoryClass, Owner, setOwner } from '@ember/-internals/owner';
 import { dictionary, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
@@ -143,7 +143,7 @@ export default class Container {
    @param {String} [options.source] The fullname of the request source (used for local lookup)
    @return {any}
    */
-  lookup<T>(fullName: string, options?: TypeOptions): T | undefined {
+  lookup(fullName: string, options?: TypeOptions): unknown {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
     }
@@ -208,7 +208,7 @@ export default class Container {
    @param {String} fullName
    @return {any}
    */
-  factoryFor<T, C>(fullName: string): Factory<T, C> | undefined {
+  factoryFor(fullName: string): Factory<unknown> | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
     }
@@ -216,7 +216,9 @@ export default class Container {
 
     assert('fullName must be a proper full name', this.registry.isValidFullName(normalizedName));
 
-    return factoryFor<T, C>(this, normalizedName, fullName) as Factory<T, C> | undefined;
+    // TODO: This needs to return a Factory to be compatible with Owner.
+    // We should correctly the types so that this cast is not necessary.
+    return factoryFor(this, normalizedName, fullName) as Factory<unknown>;
   }
 }
 
@@ -275,14 +277,18 @@ function lookup(container: Container, fullName: string, options: TypeOptions = {
   return instantiateFactory(container, normalizedName, fullName, options);
 }
 
-function factoryFor<T, C>(container: Container, normalizedName: string, fullName: string) {
+function factoryFor(
+  container: Container,
+  normalizedName: string,
+  fullName: string
+): FactoryManager<unknown> | undefined {
   let cached = container.factoryManagerCache[normalizedName];
 
   if (cached !== undefined) {
     return cached;
   }
 
-  let factory = container.registry.resolve(normalizedName) as DebugFactory<T, C> | undefined;
+  let factory = container.registry.resolve(normalizedName) as DebugFactory<unknown> | undefined;
 
   if (factory === undefined) {
     return;
@@ -440,7 +446,8 @@ export interface LazyInjection {
   specifier: string;
 }
 
-declare interface DebugFactory<T, C> extends Factory<T, C> {
+declare interface DebugFactory<T, C extends FactoryClass | object = FactoryClass>
+  extends Factory<T, C> {
   _onLookup?: (fullName: string) => void;
   _initFactory?: (factoryManager: FactoryManager<T, C>) => void;
   _lazyInjections(): { [key: string]: LazyInjection };
@@ -456,7 +463,7 @@ export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void
   obj[INIT_FACTORY] = factory;
 }
 
-export class FactoryManager<T, C> {
+export class FactoryManager<T, C extends FactoryClass | object = FactoryClass> {
   readonly container: Container;
   readonly owner: Owner | null;
   readonly class: Factory<T, C> & DebugFactory<T, C>;
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 7732a293baf..d976f984756 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -182,7 +182,7 @@ export default class Registry implements IRegistry {
    @param {Function} factory
    @param {Object} options
    */
-  register<T, C>(fullName: string, factory: Factory<T, C>, options: TypeOptions = {}): void {
+  register(fullName: string, factory: Factory<unknown>, options: TypeOptions = {}): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
     assert(`Attempting to register an unknown factory: '${fullName}'`, factory !== undefined);
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 3f164ef7506..2cc64543431 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -133,7 +133,7 @@ export default class CurlyComponentManager
 
     if (layout === undefined) {
       if (layoutName !== undefined) {
-        let _factory = owner.lookup<TemplateFactory>(`template:${layoutName}`);
+        let _factory = owner.lookup(`template:${layoutName}`) as TemplateFactory;
         assert(`Layout \`${layoutName}\` not found!`, _factory !== undefined);
         factory = _factory;
       } else {
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 9901ba079b2..d838f613beb 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -710,8 +710,8 @@ const Component = CoreView.extend(
         let owner = getOwner(this);
         assert('Component is unexpectedly missing an owner', owner);
 
-        if (owner.lookup<Environment>('-environment:main')!.isInteractive) {
-          this.__dispatcher = owner.lookup<EventDispatcher>('event_dispatcher:main');
+        if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
+          this.__dispatcher = owner.lookup('event_dispatcher:main') as EventDispatcher;
         } else {
           // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
           this.__dispatcher = null;
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index ec23c0ceff6..aabb2b59c9c 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -265,7 +265,7 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
   }
 
   ensureEventSetup(actionState: ActionState): void {
-    let dispatcher = actionState.owner.lookup<EventDispatcher>('event_dispatcher:main');
+    let dispatcher = actionState.owner.lookup('event_dispatcher:main') as EventDispatcher;
     dispatcher?.setupHandlerForEmberEvent(actionState.eventName);
   }
 
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 8edd3ec6436..ffd80103b21 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,7 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { ENV } from '@ember/-internals/environment';
-import { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
+import { Factory, Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
@@ -57,7 +57,7 @@ function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
 }
 
-function componentFor(name: string, owner: Owner): Option<Factory<{}, {}>> {
+function componentFor(name: string, owner: Owner): Option<Factory<unknown>> {
   let fullName = `component:${name}`;
   return owner.factoryFor(fullName) || null;
 }
@@ -65,16 +65,16 @@ function componentFor(name: string, owner: Owner): Option<Factory<{}, {}>> {
 function layoutFor(name: string, owner: Owner, options?: TypeOptions): Option<Template> {
   let templateFullName = `template:components/${name}`;
 
-  return owner.lookup(templateFullName, options) || null;
+  return (owner.lookup(templateFullName, options) as Template) || null;
 }
 
 type LookupResult =
   | {
-      component: Factory<{}, {}>;
+      component: Factory<unknown>;
       layout: TemplateFactory;
     }
   | {
-      component: Factory<{}, {}>;
+      component: Factory<unknown>;
       layout: null;
     }
   | {
@@ -173,10 +173,9 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
       return helper;
     }
 
-    const factory = owner.factoryFor<
-      SimpleHelper | HelperInstance,
-      HelperFactory<SimpleHelper | HelperInstance>
-    >(`helper:${name}`);
+    const factory = owner.factoryFor(`helper:${name}`) as
+      | Factory<SimpleHelper, HelperFactory<SimpleHelper>>
+      | Factory<HelperInstance, HelperFactory<HelperInstance>>;
 
     if (factory === undefined) {
       return null;
@@ -221,7 +220,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
       return builtin;
     }
 
-    let modifier = owner.factoryFor<unknown, FactoryClass>(`modifier:${name}`);
+    let modifier = owner.factoryFor(`modifier:${name}`);
 
     if (modifier === undefined) {
       return null;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 83914b32073..05cde32219d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -670,7 +670,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          let controller = instance!.lookup<Controller>('controller:application')!;
+          let controller = (instance!.lookup('controller:application') as Controller)!;
           controller.set('message', 'World');
         });
 
@@ -716,7 +716,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          let controller = instance!.lookup<Controller>('controller:application')!;
+          let controller = (instance!.lookup('controller:application') as Controller)!;
           controller.set('message', undefined);
         });
 
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index f8f9665d550..b355f45ea5d 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -24,9 +24,9 @@ export interface EngineInstanceOptions {
 import EngineInstance from '@ember/engine/instance';
 import { TypeOptions } from '../container/lib/registry';
 export interface Owner {
-  lookup<T>(fullName: string, options?: TypeOptions): T | undefined;
-  factoryFor<T, C>(fullName: string): Factory<T, C> | undefined;
-  register<T, C>(fullName: string, factory: Factory<T, C>, options?: TypeOptions): void;
+  lookup(fullName: string, options?: TypeOptions): unknown;
+  factoryFor(fullName: string): Factory<unknown> | undefined;
+  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
   hasRegistration(name: string): boolean;
 
   /** @internal */
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 3ad97c299f7..20306c4a3bd 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -182,7 +182,7 @@ export default class AutoLocation extends EmberObject implements EmberLocation {
 
     let owner = getOwner(this);
     assert('AutoLocation is unexpectedly missing an owner', owner);
-    let concrete = owner.lookup<EmberLocation>(`location:${implementation}`);
+    let concrete = owner.lookup(`location:${implementation}`) as EmberLocation;
     assert(`Could not find location '${implementation}'.`, concrete !== undefined);
 
     set(concrete, 'rootURL', rootURL);
diff --git a/packages/@ember/-internals/routing/lib/system/generate_controller.ts b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
index 4737766ae7d..1b65a61e5f5 100644
--- a/packages/@ember/-internals/routing/lib/system/generate_controller.ts
+++ b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
@@ -16,7 +16,7 @@ import { DEBUG } from '@glimmer/env';
 */
 
 export function generateControllerFactory(owner: Owner, controllerName: string): Factory<{}> {
-  let Factory = owner.factoryFor<any, any>('controller:basic')!.class;
+  let Factory = (owner.factoryFor('controller:basic') as Factory<any, any>).class;
 
   Factory = Factory.extend({
     toString() {
@@ -44,7 +44,7 @@ export default function generateController(owner: Owner, controllerName: string)
   generateControllerFactory(owner, controllerName);
 
   let fullName = `controller:${controllerName}`;
-  let instance = owner.lookup<Controller>(fullName)!;
+  let instance = (owner.lookup(fullName) as Controller)!;
 
   if (DEBUG) {
     if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 66387720f9c..6cc78f42568 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -278,8 +278,8 @@ class Route<T = unknown>
     super(owner);
 
     if (owner) {
-      let router = owner.lookup<EmberRouter>('router:main');
-      let bucketCache = owner.lookup<BucketCache>(P`-bucket-cache:main`);
+      let router = owner.lookup('router:main') as EmberRouter;
+      let bucketCache = owner.lookup(P`-bucket-cache:main`) as BucketCache;
 
       assert(
         'ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!',
@@ -658,7 +658,7 @@ class Route<T = unknown>
   paramsFor(name: string): Record<string, unknown> {
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
-    let route = owner.lookup<Route>(`route:${name}`);
+    let route = owner.lookup(`route:${name}`) as Route;
 
     if (route === undefined) {
       return {};
@@ -1587,13 +1587,13 @@ class Route<T = unknown>
   controllerFor(name: string, _skipAssert = false): Controller | undefined {
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
-    let route = owner.lookup<Route>(`route:${name}`);
+    let route = owner.lookup(`route:${name}`) as Route;
 
     if (route && route.controllerName) {
       name = route.controllerName;
     }
 
-    let controller = owner.lookup<Controller>(`controller:${name}`);
+    let controller = owner.lookup(`controller:${name}`) as Controller;
 
     // NOTE: We're specifically checking that skipAssert is true, because according
     //   to the old API the second parameter was model. We do not want people who
@@ -1693,7 +1693,7 @@ class Route<T = unknown>
       name = _name;
     }
 
-    let route = owner.lookup<Route>(`route:${name}`);
+    let route = owner.lookup(`route:${name}`) as Route;
     // If we are mid-transition, we want to try and look up
     // resolved parent contexts on the current transitionEvent.
     if (transition !== undefined && transition !== null) {
@@ -1874,7 +1874,7 @@ class Route<T = unknown>
     let controllerName = this.controllerName || this.routeName;
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
-    let controller = owner.lookup<Controller>(`controller:${controllerName}`);
+    let controller = owner.lookup(`controller:${controllerName}`) as Controller;
     let queryParameterConfiguraton = get(this, 'queryParams');
     let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
 
@@ -2127,16 +2127,18 @@ function buildRenderOptions(
 
   if (controller === undefined) {
     if (isDefaultRender) {
-      controller = route.controllerName || owner.lookup<Controller>(`controller:${name}`);
+      controller = route.controllerName || (owner.lookup(`controller:${name}`) as Controller);
     } else {
       controller =
-        owner.lookup<Controller>(`controller:${name}`) || route.controllerName || route.routeName;
+        (owner.lookup(`controller:${name}`) as Controller) ||
+        route.controllerName ||
+        route.routeName;
     }
   }
 
   if (typeof controller === 'string') {
     let controllerName = controller;
-    controller = owner.lookup<Controller>(`controller:${controllerName}`);
+    controller = owner.lookup(`controller:${controllerName}`) as Controller;
     assert(
       `You passed \`controller: '${controllerName}'\` into the \`render\` method, but no such controller could be found.`,
       isDefaultRender || controller !== undefined
@@ -2149,7 +2151,7 @@ function buildRenderOptions(
     (controller! as any).set('model', model);
   }
 
-  let template = owner.lookup<TemplateFactory>(`template:${templateName}`);
+  let template = owner.lookup(`template:${templateName}`) as TemplateFactory;
   assert(
     `Could not find "${templateName}" template, view, or component.`,
     isDefaultRender || template !== undefined
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 2155f10b986..bf2907212d7 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1,7 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
 import { computed, get, set } from '@ember/-internals/metal';
-import { FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
+import { Factory, FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
@@ -312,11 +312,11 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     this._resetQueuedQueryParameterChanges();
     this.namespace = owner.lookup('application:main');
 
-    let bucketCache: BucketCache | undefined = owner.lookup(P`-bucket-cache:main`);
+    let bucketCache = owner.lookup(P`-bucket-cache:main`) as BucketCache | undefined;
     assert('BUG: BucketCache should always be present', bucketCache !== undefined);
     this._bucketCache = bucketCache;
 
-    let routerService: RouterService<R> | undefined = owner.lookup('service:router');
+    let routerService = owner.lookup('service:router') as RouterService<R> | undefined;
     assert('BUG: RouterService should always be present', routerService !== undefined);
     this._routerService = routerService;
   }
@@ -345,7 +345,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
 
         assert('Route is unexpectedly missing an owner', routeOwner);
 
-        let route = routeOwner.lookup<R>(fullRouteName);
+        let route = routeOwner.lookup(fullRouteName) as R;
 
         if (seen[name]) {
           assert('seen routes should exist', route);
@@ -357,7 +357,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
         if (!route) {
           let DefaultRoute: any = routeOwner.factoryFor('route:basic')!.class;
           routeOwner.register(fullRouteName, DefaultRoute.extend());
-          route = routeOwner.lookup(fullRouteName);
+          route = routeOwner.lookup(fullRouteName) as R;
 
           if (DEBUG) {
             if (router.namespace.LOG_ACTIVE_GENERATION) {
@@ -642,7 +642,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     if (!this._toplevelView) {
       let owner = getOwner(this);
       assert('Router is unexpectedly missing an owner', owner);
-      let OutletView = owner.factoryFor<OutletView, FactoryClass>('view:-outlet')!;
+      let OutletView = owner.factoryFor('view:-outlet') as Factory<OutletView, FactoryClass>;
       let application = owner.lookup('application:main');
       let environment = owner.lookup('-environment:main');
       let template = owner.lookup('template:-outlet');
@@ -866,7 +866,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     assert('Router is unexpectedly missing an owner', owner);
 
     if ('string' === typeof location) {
-      let resolvedLocation = owner.lookup<IEmberLocation>(`location:${location}`);
+      let resolvedLocation = owner.lookup(`location:${location}`) as IEmberLocation;
 
       if (location === 'auto') {
         deprecate(
@@ -1788,7 +1788,7 @@ function updatePaths(router: EmberRouter) {
 
   let owner = getOwner(router);
   assert('Router is unexpectedly missing an owner', owner);
-  let appController = owner.lookup<Controller>('controller:application');
+  let appController = owner.lookup('controller:application') as Controller;
 
   if (!appController) {
     // appController might not exist when top-level loading/error
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 95eceb7d390..975af3d1f81 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -44,7 +44,7 @@ interface View {
   @param {Object} owner
 */
 export function getRootViews(owner: Owner): View[] {
-  let registry = owner.lookup<Dict<View>>('-view-registry:main')!;
+  let registry = owner.lookup('-view-registry:main') as Dict<View>;
 
   let rootViews: View[] = [];
 
@@ -120,7 +120,7 @@ const CHILD_VIEW_IDS: WeakMap<View, Set<string>> = new WeakMap();
 export function getChildViews(view: View): View[] {
   let owner = getOwner(view);
   assert('View is unexpectedly missing an owner', owner);
-  let registry = owner.lookup<Dict<View>>('-view-registry:main')!;
+  let registry = owner.lookup('-view-registry:main') as Dict<View>;
   return collectChildViews(view, registry);
 }
 
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index e6ba5393fee..6c71ae0cbf2 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -19,10 +19,10 @@ expectTypeOf(
   instance.register('service:store-singleton', Store, { singleton: true, instantiate: true })
 ).toEqualTypeOf<void>();
 
-expectTypeOf(instance.lookup<Store>('service:store')).toEqualTypeOf<Store | undefined>();
+expectTypeOf(instance.lookup('service:store')).toEqualTypeOf<unknown>();
 expectTypeOf(
-  instance.lookup<Store>('service:store', { singleton: true, instantiate: true })
-).toEqualTypeOf<Store | undefined>();
+  instance.lookup('service:store', { singleton: true, instantiate: true })
+).toEqualTypeOf<unknown>();
 
 expectTypeOf(instance.hasRegistration('service:store')).toEqualTypeOf<boolean>();
 // @ts-expect-error requires name
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 7a58e68be7c..196701c0725 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -20,7 +20,7 @@ import { expect } from '@glimmer/util';
   @since 3.14.0
 */
 export default function captureRenderTree(app: Owner): CapturedRenderNode[] {
-  let renderer = expect(app.lookup<Renderer>('renderer:-dom'), `BUG: owner is missing renderer`);
+  let renderer = expect(app.lookup('renderer:-dom') as Renderer, `BUG: owner is missing renderer`);
 
   return renderer.debugRenderTree.capture();
 }

From b97e01a685c316ab4bb80fd71ac0cefda8d1d1ea Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 14:36:56 -0800
Subject: [PATCH 0861/1405] Fix failing tests

---
 packages/@ember/application/type-tests/index.test.ts    | 6 ++++--
 packages/@ember/application/type-tests/instance.test.ts | 6 +++++-
 packages/@ember/engine/type-tests/index.test.ts         | 7 +++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index c4a7c8cd114..1416a3be6f6 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -5,6 +5,8 @@ import { Owner } from '@ember/-internals/owner';
 
 import { expectTypeOf } from 'expect-type';
 
+let owner = {} as Owner;
+
 class App extends Application {
   rootElement = '#ember-application';
   customEvents = {
@@ -16,7 +18,7 @@ class App extends Application {
   }
 }
 
-const app = new App();
+const app = new App(owner);
 
 // You shouldn't really be setting this, so let's at least check that we can read it
 expectTypeOf(app.eventDispatcher).toEqualTypeOf<EventDispatcher>();
@@ -34,7 +36,7 @@ class App2 extends Application {
   rootElement = 1;
 }
 
-new App2();
+new App2(owner);
 
 expectTypeOf(getOwner('foo')).toEqualTypeOf<Owner | undefined>();
 
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 6c71ae0cbf2..12eb726167c 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -1,3 +1,4 @@
+import { Owner } from '@ember/-internals/owner';
 import Application from '@ember/application';
 import ApplicationInstance, { BootOptions } from '@ember/application/instance';
 import EngineInstance from '@ember/engine/instance';
@@ -5,7 +6,10 @@ import EmberObject from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
 
-const app = new Application();
+// Good enough for tests
+let owner = {} as Owner;
+
+const app = new Application(owner);
 const instance = app.buildInstance();
 
 expectTypeOf(instance).toEqualTypeOf<ApplicationInstance>();
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index b9f1aa2358f..74581a0863d 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -1,15 +1,18 @@
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
-import { Factory } from '@ember/-internals/owner';
+import { Factory, Owner } from '@ember/-internals/owner';
 import Namespace from '@ember/application/namespace';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
+// Good enough for tests
+let owner = {} as Owner;
+
 class Foo extends EmberObject {}
 class Bar {}
 
-let engine = new Engine();
+let engine = new Engine(owner);
 
 expectTypeOf(engine).toMatchTypeOf<Namespace>();
 

From e2048a7b886fa2f77d21f7d28caccebf7e370610 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 15:48:41 -0800
Subject: [PATCH 0862/1405] Use asserts instead of casts where possible

---
 .../-internals/glimmer/lib/component.ts       |  6 +++-
 .../glimmer/lib/modifiers/action.ts           |  3 +-
 .../application/debug-render-tree-test.ts     |  6 ++--
 .../-internals/routing/lib/services/router.ts |  6 +++-
 .../routing/lib/services/routing.ts           |  6 +++-
 .../routing/lib/system/generate_controller.ts |  5 +--
 .../-internals/routing/lib/system/route.ts    | 32 +++++++++++--------
 .../-internals/routing/lib/system/router.ts   | 18 ++---------
 .../routing/tests/system/route_test.js        |  6 ++++
 .../@ember/debug/lib/capture-render-tree.ts   |  2 ++
 10 files changed, 54 insertions(+), 36 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index d838f613beb..d7a12fb0ec4 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -711,7 +711,11 @@ const Component = CoreView.extend(
         assert('Component is unexpectedly missing an owner', owner);
 
         if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
-          this.__dispatcher = owner.lookup('event_dispatcher:main') as EventDispatcher;
+          this.__dispatcher = owner.lookup('event_dispatcher:main');
+          assert(
+            'Expected dispatcher to be an EventDispatcher',
+            this.__dispatcher instanceof EventDispatcher
+          );
         } else {
           // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
           this.__dispatcher = null;
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index aabb2b59c9c..1babc34eaaa 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -265,7 +265,8 @@ class ActionModifierManager implements InternalModifierManager<ActionState, obje
   }
 
   ensureEventSetup(actionState: ActionState): void {
-    let dispatcher = actionState.owner.lookup('event_dispatcher:main') as EventDispatcher;
+    let dispatcher = actionState.owner.lookup('event_dispatcher:main');
+    assert('Expected dispatcher to be an EventDispatcher', dispatcher instanceof EventDispatcher);
     dispatcher?.setupHandlerForEmberEvent(actionState.eventName);
   }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 05cde32219d..a5846fade72 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -670,7 +670,8 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          let controller = (instance!.lookup('controller:application') as Controller)!;
+          let controller = instance!.lookup('controller:application');
+          assert('Expected an instance of controller', controller instanceof Controller);
           controller.set('message', 'World');
         });
 
@@ -716,7 +717,8 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          let controller = (instance!.lookup('controller:application') as Controller)!;
+          let controller = instance!.lookup('controller:application');
+          assert('Expected an instance of controller', controller instanceof Controller);
           controller.set('message', undefined);
         });
 
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 287344dd129..276143f2e57 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -64,7 +64,11 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     let owner = getOwner(this);
     assert('RouterService is unexpectedly missing an owner', owner);
 
-    router = owner.lookup('router:main') as EmberRouter<R>;
+    router = owner.lookup('router:main');
+    assert(
+      'ROUTER SERVICE BUG: Expected router to be an instance of EmberRouter',
+      router instanceof EmberRouter
+    );
     return (this[ROUTER] = router);
   }
 
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 837321f0270..081ee17d9c9 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -38,7 +38,11 @@ export default class RoutingService<R extends Route> extends Service {
     let owner = getOwner(this);
     assert('RoutingService is unexpectedly missing an owner', owner);
 
-    router = owner.lookup('router:main') as EmberRouter<R>;
+    router = owner.lookup('router:main');
+    assert(
+      'ROUTING SERVICE BUG: Expected router to be an instance of EmberRouter',
+      router instanceof EmberRouter
+    );
     router.setupRouter();
     return (this[ROUTER] = router);
   }
diff --git a/packages/@ember/-internals/routing/lib/system/generate_controller.ts b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
index 1b65a61e5f5..968b43eeb7f 100644
--- a/packages/@ember/-internals/routing/lib/system/generate_controller.ts
+++ b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
@@ -1,7 +1,7 @@
 import { get } from '@ember/-internals/metal';
 import { Factory, Owner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
-import { info } from '@ember/debug';
+import { assert, info } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 /**
 @module ember
@@ -44,7 +44,8 @@ export default function generateController(owner: Owner, controllerName: string)
   generateControllerFactory(owner, controllerName);
 
   let fullName = `controller:${controllerName}`;
-  let instance = (owner.lookup(fullName) as Controller)!;
+  let instance = owner.lookup(fullName);
+  assert('Expected an instance of controller', instance instanceof Controller);
 
   if (DEBUG) {
     if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 6cc78f42568..eb472de3b71 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -278,12 +278,12 @@ class Route<T = unknown>
     super(owner);
 
     if (owner) {
-      let router = owner.lookup('router:main') as EmberRouter;
-      let bucketCache = owner.lookup(P`-bucket-cache:main`) as BucketCache;
+      let router = owner.lookup('router:main');
+      let bucketCache = owner.lookup(P`-bucket-cache:main`);
 
       assert(
         'ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!',
-        router && bucketCache
+        router instanceof EmberRouter && bucketCache instanceof BucketCache
       );
 
       this._router = router;
@@ -1593,7 +1593,7 @@ class Route<T = unknown>
       name = route.controllerName;
     }
 
-    let controller = owner.lookup(`controller:${name}`) as Controller;
+    let controller = owner.lookup(`controller:${name}`);
 
     // NOTE: We're specifically checking that skipAssert is true, because according
     //   to the old API the second parameter was model. We do not want people who
@@ -1603,6 +1603,11 @@ class Route<T = unknown>
       controller !== undefined || _skipAssert === true
     );
 
+    assert(
+      `Expected controller:${name} to be an instance of Controller`,
+      controller === undefined || controller instanceof Controller
+    );
+
     return controller;
   }
 
@@ -1874,11 +1879,13 @@ class Route<T = unknown>
     let controllerName = this.controllerName || this.routeName;
     let owner = getOwner(this);
     assert('Route is unexpectedly missing an owner', owner);
-    let controller = owner.lookup(`controller:${controllerName}`) as Controller;
+    let controller = owner.lookup(`controller:${controllerName}`);
     let queryParameterConfiguraton = get(this, 'queryParams');
     let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
 
     if (controller) {
+      assert('Expected an instance of controller', controller instanceof Controller);
+
       // the developer has authored a controller class in their application for
       // this route find its query params and normalize their object shape them
       // merge in the query params for the route. As a mergedProperty,
@@ -2107,7 +2114,7 @@ function buildRenderOptions(
   let owner = getOwner(route);
   assert('Route is unexpectedly missing an owner', owner);
   let name, templateName, into, outlet, model;
-  let controller: Controller | string | undefined = undefined;
+  let controller;
 
   if (options) {
     into = options.into && options.into.replace(/\//g, '.');
@@ -2127,28 +2134,27 @@ function buildRenderOptions(
 
   if (controller === undefined) {
     if (isDefaultRender) {
-      controller = route.controllerName || (owner.lookup(`controller:${name}`) as Controller);
+      controller = route.controllerName || owner.lookup(`controller:${name}`);
     } else {
-      controller =
-        (owner.lookup(`controller:${name}`) as Controller) ||
-        route.controllerName ||
-        route.routeName;
+      controller = owner.lookup(`controller:${name}`) || route.controllerName || route.routeName;
     }
   }
 
   if (typeof controller === 'string') {
     let controllerName = controller;
-    controller = owner.lookup(`controller:${controllerName}`) as Controller;
+    controller = owner.lookup(`controller:${controllerName}`);
     assert(
       `You passed \`controller: '${controllerName}'\` into the \`render\` method, but no such controller could be found.`,
       isDefaultRender || controller !== undefined
     );
   }
 
+  assert('Expected an instance of controller', controller instanceof Controller);
+
   if (model === undefined) {
     model = route.currentModel;
   } else {
-    (controller! as any).set('model', model);
+    controller.set('model', model);
   }
 
   let template = owner.lookup(`template:${templateName}`) as TemplateFactory;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index bf2907212d7..9f66c7b8c06 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -5,7 +5,6 @@ import { Factory, FactoryClass, getOwner, Owner } from '@ember/-internals/owner'
 import { BucketCache } from '@ember/-internals/routing';
 import RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
-import Controller from '@ember/controller';
 import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
@@ -312,8 +311,8 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     this._resetQueuedQueryParameterChanges();
     this.namespace = owner.lookup('application:main');
 
-    let bucketCache = owner.lookup(P`-bucket-cache:main`) as BucketCache | undefined;
-    assert('BUG: BucketCache should always be present', bucketCache !== undefined);
+    let bucketCache = owner.lookup(P`-bucket-cache:main`);
+    assert('BUG: BucketCache should always be present', bucketCache instanceof BucketCache);
     this._bucketCache = bucketCache;
 
     let routerService = owner.lookup('service:router') as RouterService<R> | undefined;
@@ -323,7 +322,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
 
   _initRouterJs(): void {
     let location = get(this, 'location') as IEmberLocation;
-    let router = this as EmberRouter<R>;
+    let router = this;
     const owner = getOwner(this);
     assert('Router is unexpectedly missing an owner', owner);
     let seen = Object.create(null);
@@ -1785,17 +1784,6 @@ function updatePaths(router: EmberRouter) {
   set(router, 'currentPath', path);
   set(router, 'currentRouteName', currentRouteName);
   set(router, 'currentURL', currentURL);
-
-  let owner = getOwner(router);
-  assert('Router is unexpectedly missing an owner', owner);
-  let appController = owner.lookup('controller:application') as Controller;
-
-  if (!appController) {
-    // appController might not exist when top-level loading/error
-    // substates have been entered since ApplicationRoute hasn't
-    // actually been entered at that point.
-    return;
-  }
 }
 
 function didBeginTransition(transition: Transition, router: EmberRouter) {
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index b4693c2a4d1..bf0ab3d6588 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -4,6 +4,7 @@ import Service, { service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import EmberRoute from '../../lib/system/route';
 import ObjectProxy from '@ember/-internals/runtime/lib/system/object_proxy';
+import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
 let route, routeOne, routeTwo, lookupHash;
 
@@ -321,6 +322,10 @@ moduleFor(
     constructor() {
       super();
 
+      // Disable assertions for these tests so we can use fake controllers
+      this.originalAssert = getDebugFunction('assert');
+      setDebugFunction('assert', () => {});
+
       let owner = {
         lookup(fullName) {
           return lookupHash[fullName];
@@ -342,6 +347,7 @@ moduleFor(
     teardown() {
       runDestroy(routeOne);
       runDestroy(routeTwo);
+      setDebugFunction('assert', this.originalAssert);
     }
 
     ['@test route._qp does not crash if the controller has no QP, or setProperties'](assert) {
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 196701c0725..9b3519f9309 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -20,6 +20,8 @@ import { expect } from '@glimmer/util';
   @since 3.14.0
 */
 export default function captureRenderTree(app: Owner): CapturedRenderNode[] {
+  // SAFETY: Ideally we'd assert here but that causes awkward circular requires since this is also in @ember/debug.
+  // This is only for debug stuff so not very risky.
   let renderer = expect(app.lookup('renderer:-dom') as Renderer, `BUG: owner is missing renderer`);
 
   return renderer.debugRenderTree.capture();

From 2665f1ca83614fa7695bb68c9a8e651feb35cec2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:35:03 +0000
Subject: [PATCH 0863/1405] Bump pathval from 1.1.0 to 1.1.1

Bumps [pathval](https://github.com/chaijs/pathval) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/chaijs/pathval/releases)
- [Changelog](https://github.com/chaijs/pathval/blob/master/CHANGELOG.md)
- [Commits](https://github.com/chaijs/pathval/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: pathval
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index a9aeea1a054..e1b1729126f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7834,9 +7834,9 @@ path-type@^4.0.0:
   integrity "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
 
 pathval@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity "sha1-uULm1L3mUwBe9rcTYd74cn0GReA= sha512-qZ181q3ICkag/+lv1X6frDUF84pqCm30qild3LGbD84n0AC75CYwnWsQRDlpz7zDkU5NVcmhHh4LjXK0goLYZA=="
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
+  integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
 pause-stream@0.0.11:
   version "0.0.11"

From cf18a2dd40dd0f61d003f6362ce7fb6f6a7e703d Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 17:24:45 -0800
Subject: [PATCH 0864/1405] Make test owners more realistic

---
 .../routing/tests/ext/controller_test.js      |  6 ++-
 .../routing/tests/system/dsl_test.js          | 29 ++++++-----
 .../routing/tests/system/route_test.js        | 12 +++++
 .../-internals/runtime/tests/inject_test.js   |  4 +-
 .../runtime/tests/system/core_object_test.js  | 10 +++-
 .../tests/system/object/create_test.js        |  6 ++-
 .../controller/tests/controller_test.js       | 16 +++++-
 packages/@ember/service/tests/service_test.js | 10 +++-
 .../@ember/service/tests/service_ts_test.ts   | 10 +++-
 .../internal-test-helpers/lib/build-owner.js  | 51 ++++++++-----------
 .../lib/test-cases/router-non-application.js  |  1 +
 11 files changed, 105 insertions(+), 50 deletions(-)

diff --git a/packages/@ember/-internals/routing/tests/ext/controller_test.js b/packages/@ember/-internals/routing/tests/ext/controller_test.js
index 83db6e54c88..0905dddd148 100644
--- a/packages/@ember/-internals/routing/tests/ext/controller_test.js
+++ b/packages/@ember/-internals/routing/tests/ext/controller_test.js
@@ -1,6 +1,6 @@
 import { setOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
-import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   '@ember/-internals/routing/ext/controller',
@@ -51,6 +51,8 @@ moduleFor(
           'passes query param only transitions through'
         );
       }, /Calling transitionToRoute on a controller is deprecated/);
+
+      runDestroy(engineInstance);
     }
 
     ["@test replaceRoute considers an engine's mountPoint"](assert) {
@@ -96,6 +98,8 @@ moduleFor(
           'passes query param only transitions through'
         );
       }, /Calling replaceRoute on a controller is deprecated/);
+
+      runDestroy(engineInstance);
     }
   }
 );
diff --git a/packages/@ember/-internals/routing/tests/system/dsl_test.js b/packages/@ember/-internals/routing/tests/system/dsl_test.js
index ad57892e99e..2da4e2281cd 100644
--- a/packages/@ember/-internals/routing/tests/system/dsl_test.js
+++ b/packages/@ember/-internals/routing/tests/system/dsl_test.js
@@ -1,5 +1,5 @@
 import EmberRouter from '../../lib/system/router';
-import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   'Ember Router DSL',
@@ -8,19 +8,20 @@ moduleFor(
       super();
       this.Router = class extends EmberRouter {};
 
-      this.routerInstance = new this.Router(
-        buildOwner({
-          ownerOptions: { routable: true },
-        })
-      );
+      this.owner = buildOwner({
+        ownerOptions: { routable: true },
+      });
+      this.routerInstance = new this.Router(this.owner);
     }
 
     teardown() {
       this.Router = null;
       this.routerInstance = null;
+      runDestroy(this.owner);
     }
 
     ['@test should fail when using a reserved route name'](assert) {
+      let owners = [];
       let reservedNames = ['basic', 'application'];
 
       assert.expect(reservedNames.length);
@@ -33,9 +34,13 @@ moduleFor(
             this.route(reservedName);
           });
 
-          new Router(buildOwner())._initRouterJs();
+          let owner = buildOwner();
+          owners.push(owner);
+          new Router(owner)._initRouterJs();
         }, "'" + reservedName + "' cannot be used as a route name.");
       });
+
+      owners.forEach((o) => runDestroy(o));
     }
 
     ['@test [GH#16642] better error when using a colon in a route name']() {
@@ -186,14 +191,14 @@ moduleFor(
     constructor() {
       super();
       this.Router = class extends EmberRouter {};
-      this.routerInstance = new this.Router(
-        buildOwner({
-          ownerOptions: { routable: true },
-        })
-      );
+      this.owner = buildOwner({
+        ownerOptions: { routable: true },
+      });
+      this.routerInstance = new this.Router(this.owner);
     }
 
     teardown() {
+      runDestroy(this.owner);
       this.Router = null;
       this.routerInstance = null;
     }
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index b4693c2a4d1..9b542330852 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -385,6 +385,8 @@ moduleFor(
       let authService = owner.lookup('service:auth');
 
       assert.equal(authService, appRoute.get('authService'), 'service.auth is injected');
+
+      runDestroy(owner);
     }
   }
 );
@@ -448,6 +450,8 @@ moduleFor(
         { c: 'd' },
         'params match for `posts` route in engine'
       );
+
+      runDestroy(engineInstance);
     }
 
     ["@test modelFor considers an engine's mountPoint"](assert) {
@@ -497,6 +501,8 @@ moduleFor(
 
       assert.strictEqual(route.modelFor('application'), applicationModel);
       assert.strictEqual(route.modelFor('posts'), postsModel);
+
+      runDestroy(engineInstance);
     }
 
     ["@test transitionTo considers an engine's mountPoint"](assert) {
@@ -542,6 +548,8 @@ moduleFor(
           'passes query param only transitions through'
         );
       }, /Calling transitionTo on a route is deprecated/);
+
+      runDestroy(engineInstance);
     }
 
     ["@test intermediateTransitionTo considers an engine's mountPoint"](assert) {
@@ -576,6 +584,8 @@ moduleFor(
       let queryParams = {};
       route.intermediateTransitionTo(queryParams);
       assert.strictEqual(lastRoute, queryParams, 'passes query param only transitions through');
+
+      runDestroy(engineInstance);
     }
 
     ["@test replaceWith considers an engine's mountPoint"](assert) {
@@ -621,6 +631,8 @@ moduleFor(
           'passes query param only transitions through'
         );
       }, /Calling replaceWith on a route is deprecated/);
+
+      runDestroy(engineInstance);
     }
   }
 );
diff --git a/packages/@ember/-internals/runtime/tests/inject_test.js b/packages/@ember/-internals/runtime/tests/inject_test.js
index 79375e0fcc5..408e2064a7e 100644
--- a/packages/@ember/-internals/runtime/tests/inject_test.js
+++ b/packages/@ember/-internals/runtime/tests/inject_test.js
@@ -2,7 +2,7 @@ import { inject } from '@ember/-internals/metal';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../lib/system/object';
 import { buildOwner } from 'internal-test-helpers';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { runDestroy, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   'inject',
@@ -18,6 +18,8 @@ moduleFor(
       expectAssertion(() => {
         owner.lookup('foo:main');
       }, /Attempting to inject an unknown injection: 'bar:baz'/);
+
+      runDestroy(owner);
     }
 
     ['@test factories should return a list of lazy injection full names'](assert) {
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index 9dd0687b498..611b863c488 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,7 +1,13 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import { get, set, observer } from '@ember/-internals/metal';
 import CoreObject from '../../lib/system/core_object';
-import { moduleFor, AbstractTestCase, buildOwner, runLoopSettled } from 'internal-test-helpers';
+import {
+  moduleFor,
+  AbstractTestCase,
+  buildOwner,
+  runDestroy,
+  runLoopSettled,
+} from 'internal-test-helpers';
 import { track } from '@glimmer/validator';
 import { destroy } from '@glimmer/destroyable';
 import { run } from '@ember/runloop';
@@ -54,6 +60,8 @@ moduleFor(
       owner.register('thing:one', someProxyishThing, { instantiate: false });
 
       assert.equal(owner.lookup('thing:one'), someProxyishThing);
+
+      runDestroy(owner);
     }
 
     ['@test should not trigger proxy assertion when probing for a "symbol"'](assert) {
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
index a48ff2a8466..38717ebdc69 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object/create_test.js
@@ -4,7 +4,7 @@ import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '../../../lib/system/object';
-import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
+import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
 moduleFor(
@@ -33,6 +33,8 @@ moduleFor(
 
       let obj = owner.lookup('foo:main');
       assert.equal(obj.foo.bar, 'foo');
+
+      runDestroy(owner);
     }
 
     ['@test implicit injections raises deprecation']() {
@@ -49,6 +51,8 @@ moduleFor(
         () => owner.inject('foo:main', 'foo', 'service:foo'),
         /As of Ember 4.0.0, owner.inject no longer injects values into resolved instances, and calling the method has been deprecated. Since this method no longer does anything, it is fully safe to remove this injection. As an alternative to this API, you can refactor to explicitly inject `foo` on `foo:main`, or look it up directly using the `getOwner` API./
       );
+
+      runDestroy(owner);
     }
 
     ['@test calls computed property setters'](assert) {
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index 4b99455e8bc..f6340ae8202 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -113,6 +113,8 @@ moduleFor(
       setOwner(controller, owner);
 
       controller.send('poke');
+
+      runDestroy(owner);
     }
 
     ["@test Action can be handled by a superclass' actions object"](assert) {
@@ -223,9 +225,9 @@ moduleFor(
   'Controller deprecations -> Controller injected properties',
   class extends AbstractTestCase {
     ['@test defining a controller on a non-controller should fail assertion']() {
-      expectAssertion(function () {
-        let owner = buildOwner();
+      let owner = buildOwner();
 
+      expectAssertion(function () {
         let AnObject = EmberObject.extend({
           foo: injectController('bar'),
         });
@@ -235,6 +237,8 @@ moduleFor(
 
         owner.lookup('foo:main');
       }, /Defining `foo` as an injected controller property on a non-controller \(`foo:main`\) is not allowed/);
+
+      runDestroy(owner);
     }
 
     ['@test controllers can be injected into controllers'](assert) {
@@ -257,6 +261,8 @@ moduleFor(
         postController.get('postsController'),
         'controller.posts is injected'
       );
+
+      runDestroy(owner);
     }
 
     ['@test services can be injected into controllers'](assert) {
@@ -275,6 +281,8 @@ moduleFor(
       let authService = owner.lookup('service:auth');
 
       assert.equal(authService, appController.get('authService'), 'service.auth is injected');
+
+      runDestroy(owner);
     }
   }
 );
@@ -297,6 +305,8 @@ moduleFor(
       let index = owner.lookup('controller:index');
 
       assert.ok(index.main instanceof Controller, 'controller injected correctly');
+
+      runDestroy(owner);
     }
 
     ['@test uses the decorated property key if not provided'](assert) {
@@ -314,6 +324,8 @@ moduleFor(
       let index = owner.lookup('controller:index');
 
       assert.ok(index.main instanceof Controller, 'controller injected correctly');
+
+      runDestroy(owner);
     }
   }
 );
diff --git a/packages/@ember/service/tests/service_test.js b/packages/@ember/service/tests/service_test.js
index 5c07fafae4a..37726a3ace3 100644
--- a/packages/@ember/service/tests/service_test.js
+++ b/packages/@ember/service/tests/service_test.js
@@ -1,6 +1,6 @@
 import Service, { inject, service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { buildOwner } from 'internal-test-helpers';
+import { buildOwner, runDestroy } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -21,6 +21,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
 
     ['@test uses the decorated property key if not provided'](assert) {
@@ -38,6 +40,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
   }
 );
@@ -60,6 +64,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
 
     ['@test uses the decorated property key if not provided'](assert) {
@@ -77,6 +83,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
   }
 );
diff --git a/packages/@ember/service/tests/service_ts_test.ts b/packages/@ember/service/tests/service_ts_test.ts
index 41bcdc9b61d..dca6de5ca43 100644
--- a/packages/@ember/service/tests/service_ts_test.ts
+++ b/packages/@ember/service/tests/service_ts_test.ts
@@ -1,6 +1,6 @@
 import Service, { inject, service } from '@ember/service';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { buildOwner } from 'internal-test-helpers';
+import { buildOwner, runDestroy } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -21,6 +21,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
 
     ['@test uses the decorated property key if not provided'](assert: QUnit['assert']) {
@@ -38,6 +40,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
   }
 );
@@ -60,6 +64,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
 
     ['@test uses the decorated property key if not provided'](assert: QUnit['assert']) {
@@ -77,6 +83,8 @@ moduleFor(
       let foo = owner.lookup('foo:main');
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
+
+      runDestroy(owner);
     }
   }
 );
diff --git a/packages/internal-test-helpers/lib/build-owner.js b/packages/internal-test-helpers/lib/build-owner.js
index 1efb678a238..04c2e56a29d 100644
--- a/packages/internal-test-helpers/lib/build-owner.js
+++ b/packages/internal-test-helpers/lib/build-owner.js
@@ -1,12 +1,7 @@
-import { Registry } from '@ember/-internals/container';
-import { Router } from '@ember/-internals/routing';
-import ApplicationInstance from '@ember/application/instance';
 import Application from '@ember/application';
-import {
-  RegistryProxyMixin,
-  ContainerProxyMixin,
-  Object as EmberObject,
-} from '@ember/-internals/runtime';
+import ApplicationInstance from '@ember/application/instance';
+import Engine from '@ember/engine';
+import { registerDestructor } from '@ember/destroyable';
 
 class ResolverWrapper {
   constructor(resolver) {
@@ -19,35 +14,31 @@ class ResolverWrapper {
 }
 
 export default function buildOwner(options = {}) {
+  let ownerType = options.ownerType || 'application';
   let ownerOptions = options.ownerOptions || {};
   let resolver = options.resolver;
   let bootOptions = options.bootOptions || {};
 
-  let Owner = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin);
-
-  let namespace = EmberObject.create({
-    Resolver: new ResolverWrapper(resolver),
-  });
-
-  let fallbackRegistry = Application.buildRegistry(namespace);
-  fallbackRegistry.register('router:main', Router);
-
-  let registry = new Registry({
-    fallback: fallbackRegistry,
-  });
+  let namespace;
+  if (ownerType === 'application') {
+    namespace = Application.create({
+      autoboot: false,
+      Resolver: new ResolverWrapper(resolver),
+    });
+  } else {
+    namespace = Engine.create({
+      buildRegistry() {
+        return (this.__registry__ = Application.buildRegistry(this));
+      },
+      Resolver: new ResolverWrapper(resolver),
+    });
+  }
 
-  ApplicationInstance.setupRegistry(registry, bootOptions);
+  let owner = namespace.buildInstance(ownerOptions);
 
-  let owner = Owner.create(
-    {
-      __registry__: registry,
-      __container__: null,
-    },
-    ownerOptions
-  );
+  ApplicationInstance.setupRegistry(owner.__registry__, bootOptions);
 
-  let container = registry.container({ owner });
-  owner.__container__ = container;
+  registerDestructor(owner, () => namespace.destroy());
 
   return owner;
 }
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.js b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
index ed31bb3f6ef..4802aa5ad93 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.js
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.js
@@ -13,6 +13,7 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     let bootOptions = this.getBootOptions();
 
     let owner = (this.owner = buildOwner({
+      ownerType: 'engine',
       ownerOptions: this.getOwnerOptions(),
       resolver: this.getResolver(),
       bootOptions,

From bd02b0fb72dfb7ed79d7e013da34e046b0e587db Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 15:54:04 -0800
Subject: [PATCH 0865/1405] Refactor Owner handling with better public API

---
 .../glimmer/lib/component-managers/mount.ts   |  2 ++
 .../glimmer/lib/component-managers/outlet.ts  | 12 +++----
 .../glimmer/lib/components/link-to.ts         |  7 ++--
 .../application/debug-render-tree-test.ts     |  4 +--
 packages/@ember/-internals/owner/index.ts     | 34 +++++++++++--------
 .../-internals/routing/lib/system/route.ts    |  7 ++--
 .../-internals/routing/lib/system/router.ts   |  8 ++---
 .../@ember/-internals/routing/lib/utils.ts    |  3 +-
 .../runtime/lib/mixins/container_proxy.d.ts   | 11 ++++--
 .../runtime/lib/mixins/registry_proxy.d.ts    | 25 +++++++++-----
 .../runtime/lib/mixins/registry_proxy.js      |  1 +
 .../@ember/application/lib/application.d.ts   |  2 +-
 packages/@ember/engine/index.d.ts             |  3 +-
 packages/@ember/engine/instance.d.ts          | 10 ++++--
 14 files changed, 76 insertions(+), 53 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index cf0bd78b57f..c1911994289 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,5 +1,6 @@
 import { Owner } from '@ember/-internals/owner';
 import { generateControllerFactory } from '@ember/-internals/routing';
+import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { associateDestroyableChild } from '@glimmer/destroyable';
 import {
@@ -74,6 +75,7 @@ class MountManager
     // we should resolve the engine app template in the helper
     // it also should use the owner that looked up the mount helper.
 
+    assert('Expected owner to be an EngineInstance', owner instanceof EngineInstance);
     let engine = owner.buildChildEngineInstance(name);
 
     engine.boot();
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index a2f904ea418..0ad930765ba 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -95,14 +95,14 @@ class OutletComponentManager
       let currentOwner = valueForRef(currentStateRef)!.render!.owner;
 
       if (parentOwner && parentOwner !== currentOwner) {
-        let engine = currentOwner as EngineInstance;
+        assert(
+          'Expected currentOwner to be an EngineInstance',
+          currentOwner instanceof EngineInstance
+        );
 
-        assert('invalid engine: missing mountPoint', typeof currentOwner.mountPoint === 'string');
-        assert('invalid engine: missing routable', currentOwner.routable === true);
+        let mountPoint = currentOwner.mountPoint;
 
-        let mountPoint = engine.mountPoint!;
-
-        state.engine = engine;
+        state.engine = currentOwner;
         state.engineBucket = { mountPoint };
       }
     }
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 0320e62a57c..5025ff4ef57 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,4 +1,3 @@
-import { Owner } from '@ember/-internals/owner';
 import { Route, RouterState, RoutingService } from '@ember/-internals/routing';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
@@ -490,11 +489,13 @@ class LinkTo extends InternalComponent {
   }
 
   private get isEngine(): boolean {
-    return getEngineParent(this.owner as EngineInstance) !== undefined;
+    let owner = this.owner;
+    return owner instanceof EngineInstance && getEngineParent(owner) !== undefined;
   }
 
   private get engineMountPoint(): string | undefined {
-    return (this.owner as Owner | EngineInstance).mountPoint;
+    let owner = this.owner;
+    return owner instanceof EngineInstance ? owner.mountPoint : undefined;
   }
 
   private classFor(state: 'active' | 'loading' | 'disabled'): string {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 05cde32219d..8ec31d978e2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -7,12 +7,12 @@ import {
 
 import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
-import { EngineInstanceOptions, Owner } from '@ember/-internals/owner';
+import { Owner } from '@ember/-internals/owner';
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { assert, captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
-import EngineInstance from '@ember/engine/instance';
+import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
 import { CapturedRenderNode } from '@glimmer/interfaces';
 import { componentCapabilities, setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index b355f45ea5d..4448d616c1e 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,9 +1,12 @@
 import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner';
+import { TypeOptions } from '../container/lib/registry';
 
 /**
 @module @ember/application
 */
 
+export { TypeOptions };
+
 export interface FactoryClass {
   positionalParams?: string | string[] | undefined | null;
 }
@@ -16,25 +19,26 @@ export interface Factory<T, C extends FactoryClass | object = FactoryClass> {
   create(props?: { [prop: string]: any }): T;
 }
 
-export interface EngineInstanceOptions {
-  mountPoint: string;
-  routable: boolean;
-}
-
-import EngineInstance from '@ember/engine/instance';
-import { TypeOptions } from '../container/lib/registry';
+// A combination of the public methods on ContainerProxyMixin and RegistryProxyMixin
 export interface Owner {
+  // From ContainerProxy
+  ownerInjection(): void;
   lookup(fullName: string, options?: TypeOptions): unknown;
   factoryFor(fullName: string): Factory<unknown> | undefined;
-  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
-  hasRegistration(name: string): boolean;
 
-  /** @internal */
-  mountPoint?: string;
-  /** @internal */
-  routable?: boolean;
-  /** @internal */
-  buildChildEngineInstance(name: string, options?: EngineInstanceOptions): EngineInstance;
+  // From RegistryProxy
+  resolveRegistration<T, C>(fullName: string): Factory<T, C> | undefined;
+  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
+  unregister(fullName: string): void;
+  hasRegistration(fullName: string): boolean;
+  registeredOption<K extends keyof TypeOptions>(
+    fullName: string,
+    optionName: K
+  ): TypeOptions[K] | undefined;
+  registerOptions(fullName: string, options: TypeOptions): void;
+  registeredOptions(fullName: string): TypeOptions | undefined;
+  registerOptionsForType(type: string, options: TypeOptions): void;
+  registeredOptionsForType(type: string): TypeOptions | undefined;
 }
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 6cc78f42568..ccee0955350 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -23,6 +23,7 @@ import {
 import { isProxy, lookupDescriptor, symbol } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
 import { assert, info, isTesting } from '@ember/debug';
+import EngineInstance from '@ember/engine/instance';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { once } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
@@ -548,7 +549,7 @@ class Route<T = unknown>
   _setRouteName(name: string) {
     this.routeName = name;
     let owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
+    assert('Expected route to have EngineInstance as owner', owner instanceof EngineInstance);
     this.fullRouteName = getEngineRouteName(owner, name)!;
   }
 
@@ -1679,7 +1680,7 @@ class Route<T = unknown>
   modelFor(_name: string): unknown | undefined {
     let name;
     let owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
+    assert('Expected router owner to be an EngineInstance', owner instanceof EngineInstance);
     let transition =
       this._router && this._router._routerMicrolib
         ? this._router._routerMicrolib.activeTransition
@@ -2332,7 +2333,7 @@ function addQueryParamsObservers(controller: any, propNames: string[]) {
   });
 }
 
-function getEngineRouteName(engine: Owner, routeName: string) {
+function getEngineRouteName(engine: EngineInstance, routeName: string) {
   if (engine.routable) {
     let prefix = engine.mountPoint;
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index bf2907212d7..22a815443b4 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -46,6 +46,7 @@ import Router, {
   TransitionState,
 } from 'router_js';
 import { EngineRouteInfo } from './engines';
+import EngineInstance from '@ember/engine/instance';
 
 function defaultDidTransition<R extends Route>(
   this: EmberRouter<R>,
@@ -113,11 +114,6 @@ interface OutletState<T extends RenderOutletState = RenderOutletState> {
   wasUsed?: boolean;
 }
 
-interface EngineInstance extends Owner {
-  boot(): void;
-  destroy(): void;
-}
-
 export interface QueryParam {
   prop: string;
   urlKey: string;
@@ -1409,7 +1405,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
 
     if (!engineInstance) {
       let owner = getOwner(this);
-      assert('Router is unexpectedly missing an owner', owner);
+      assert('Expected router to have EngineInstance as owner', owner instanceof EngineInstance);
 
       assert(
         `You attempted to mount the engine '${name}' in your router map, but the engine can not be found.`,
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 6589ccff7d1..cb97efa92fb 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -1,6 +1,7 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { assert, deprecate } from '@ember/debug';
+import EngineInstance from '@ember/engine/instance';
 import EmberError from '@ember/error';
 import Router, { STATE_SYMBOL, InternalRouteInfo, ModelFor } from 'router_js';
 import Route from './system/route';
@@ -247,7 +248,7 @@ export function prefixRouteNameArg<T extends NamedRouteArgs<Route> | UnnamedRout
 ): T {
   let routeName: string;
   let owner = getOwner(route);
-  assert('Route is unexpectedly missing an owner', owner);
+  assert('Expected route to have EngineInstance as owner', owner instanceof EngineInstance);
 
   let prefix = owner.mountPoint;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
index 31d9dbee6b1..2f9cbf8e112 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
@@ -1,10 +1,15 @@
 import { Container } from '@ember/-internals/container';
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import { Factory } from '@ember/-internals/owner';
 import Mixin from '../../types/mixin';
 
 interface ContainerProxy {
-  ownerInjection: Container['ownerInjection'];
-  lookup: Container['lookup'];
-  factoryFor: Container['factoryFor'];
+  /** @internal */
+  __container__: Container;
+
+  ownerInjection(): void;
+  lookup(fullName: string, options?: TypeOptions): unknown;
+  factoryFor(fullName: string): Factory<unknown> | undefined;
 }
 declare const ContainerProxy: Mixin;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
index b18c207573b..08b5901250a 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
@@ -1,16 +1,23 @@
 import { Registry } from '@ember/-internals/container';
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import { Factory } from '@ember/-internals/owner';
 import Mixin from '../../types/mixin';
 
 interface RegistryProxyMixin {
-  resolveRegistration: Registry['resolve'];
-  register: Registry['register'];
-  unregister: Registry['unregister'];
-  hasRegistration: Registry['has'];
-  registeredOption: Registry['getOption'];
-  registerOptions: Registry['options'];
-  registeredOptions: Registry['getOptions'];
-  registerOptionsForType: Registry['optionsForType'];
-  registeredOptionsForType: Registry['getOptionsForType'];
+  /** @internal */
+  __registry__: Registry;
+  resolveRegistration<T, C>(fullName: string): Factory<T, C> | undefined;
+  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
+  unregister(fullName: string): void;
+  hasRegistration(fullName: string): boolean;
+  registeredOption<K extends keyof TypeOptions>(
+    fullName: string,
+    optionName: K
+  ): TypeOptions[K] | undefined;
+  registerOptions(fullName: string, options: TypeOptions): void;
+  registeredOptions(fullName: string): TypeOptions | undefined;
+  registerOptionsForType(type: string, options: TypeOptions): void;
+  registeredOptionsForType(type: string): TypeOptions | undefined;
 }
 declare const RegistryProxyMixin: Mixin;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
index 5f7a011dca9..59d1c4f70e1 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
@@ -254,6 +254,7 @@ export default Mixin.create({
     @param  factoryNameOrType {String}
     @param  property {String}
     @param  injectionName {String}
+    @deprecated
   **/
   inject: registryAlias('injection'),
 });
diff --git a/packages/@ember/application/lib/application.d.ts b/packages/@ember/application/lib/application.d.ts
index bb3f709db98..96c93190ac6 100644
--- a/packages/@ember/application/lib/application.d.ts
+++ b/packages/@ember/application/lib/application.d.ts
@@ -1,6 +1,6 @@
-import { EngineInstanceOptions } from '@ember/-internals/owner';
 import { EventDispatcher } from '@ember/-internals/views';
 import Engine from '@ember/engine';
+import { EngineInstanceOptions } from '@ember/engine/instance';
 import ApplicationInstance, { BootOptions } from '../instance';
 
 export default class Application extends Engine {
diff --git a/packages/@ember/engine/index.d.ts b/packages/@ember/engine/index.d.ts
index 36a691b14a1..a867217311b 100644
--- a/packages/@ember/engine/index.d.ts
+++ b/packages/@ember/engine/index.d.ts
@@ -1,5 +1,4 @@
-import EngineInstance from './instance';
-import { EngineInstanceOptions } from '@ember/-internals/owner';
+import EngineInstance, { EngineInstanceOptions } from './instance';
 import { Namespace, RegistryProxyMixin } from '@ember/-internals/runtime';
 
 export { getEngineParent } from '@ember/engine/lib/engine-parent';
diff --git a/packages/@ember/engine/instance.d.ts b/packages/@ember/engine/instance.d.ts
index 76516f6f970..7dd7f96164f 100644
--- a/packages/@ember/engine/instance.d.ts
+++ b/packages/@ember/engine/instance.d.ts
@@ -3,12 +3,18 @@ import { Owner } from '@ember/-internals/owner';
 import { BootOptions } from '@ember/application/instance';
 import EmberObject from '@ember/object';
 
+export interface EngineInstanceOptions {
+  mountPoint: string;
+  routable: boolean;
+}
+
 interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, Owner {}
 
 declare class EngineInstance extends EmberObject {
-  init(...args: unknown[]): void;
   boot(options?: BootOptions): void;
-  unregister(fullName: string): void;
+  mountPoint: string;
+  routable: boolean;
+  buildChildEngineInstance(name: string, options?: EngineInstanceOptions): EngineInstance;
 }
 
 export default EngineInstance;

From fdd890257419c0bfda78e7aca194d823451b0eca Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco@fabscale.com>
Date: Fri, 11 Feb 2022 09:04:11 +0100
Subject: [PATCH 0866/1405] Document `router.on()` and `router.off()` methods

The methods to register/unregister listeners for the route change events on the router service are not documented as of now.
I also updated the example for the events to not register the events in the route constructor, as I guess the actual example there would rather use the activate hook or something like this.

Related to https://github.com/typed-ember/ember-cli-typescript/issues/1161
---
 .../-internals/routing/lib/services/router.ts | 67 +++++++++++++++++--
 1 file changed, 61 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 276143f2e57..586d2bdeb01 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -407,6 +407,65 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     return this._router._routerMicrolib.recognizeAndLoad(internalURL);
   }
 
+  /**
+    You can register a listener for events emitted by this service with `.on()`:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing';
+    import { service } from '@ember/service';
+
+    export default class extends Route {
+      @service router;
+
+      activate() {
+        this.router.on('routeWillChange', (transition) => {
+          if (!transition.to.find(route => route.name === this.routeName)) {
+            alert("Please save or cancel your changes.");
+            transition.abort();
+          }
+        })
+      }
+    }
+    ```
+
+    @method on
+    @param {String} eventName
+    @param {Function} callback
+    @public
+  */
+
+  /**
+    You can unregister a listener for events emitted by this service with `.off()`:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing';
+    import { service } from '@ember/service';
+
+    export default class extends Route {
+      @service router;
+
+      callback = (transition) =>  {
+        if (!transition.to.find(route => route.name === this.routeName)) {
+          alert("Please save or cancel your changes.");
+          transition.abort();
+        }
+      };
+
+      activate() {
+        this.router.on('routeWillChange', this.callback);
+      }
+
+      deactivate() {
+        this.router.off('routeWillChange', this.callback);
+    }
+    ```
+
+    @method off
+    @param {String} eventName
+    @param {Function} callback
+    @public
+  */
+
   /**
     The `routeWillChange` event is fired at the beginning of any
     attempted transition with a `Transition` object as the sole
@@ -423,9 +482,7 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     export default class extends Route {
       @service router;
 
-      constructor() {
-        super(...arguments);
-
+      activate() {
         this.router.on('routeWillChange', (transition) => {
           if (!transition.to.find(route => route.name === this.routeName)) {
             alert("Please save or cancel your changes.");
@@ -457,9 +514,7 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     export default class extends Route {
       @service router;
 
-      constructor() {
-        super(...arguments);
-
+      activate() {
         this.router.on('routeDidChange', (transition) => {
           ga.send('pageView', {
             current: transition.to.name,

From 40db4133bd35009eb62de89f7adbf45e718e154b Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 10 Feb 2022 21:32:17 +0100
Subject: [PATCH 0867/1405] [CLEANUP] Remove `EMBER_STRICT_MODE` feature flag

---
 .../components/strict-mode-test.js            | 485 +++++++++---------
 packages/@ember/canary-features/index.ts      |   2 -
 .../lib/system/compile-options.ts             |  10 +-
 3 files changed, 242 insertions(+), 255 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index 9431e40fa8d..90a4c7ff3d7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -6,280 +6,277 @@ import {
   defineSimpleHelper,
   defineSimpleModifier,
 } from 'internal-test-helpers';
-import { EMBER_STRICT_MODE } from '@ember/canary-features';
 
 import { Input, Textarea } from '@ember/component';
 import { LinkTo } from '@ember/routing';
 import { hash, array, concat, get, on, fn } from '@glimmer/runtime';
 import GlimmerishComponent from '../../utils/glimmerish-component';
 
-if (EMBER_STRICT_MODE) {
-  moduleFor(
-    'Strict Mode',
-    class extends RenderingTestCase {
-      '@test Can use a component in scope'() {
-        let Foo = defineComponent({}, 'Hello, world!');
-        let Bar = defineComponent({ Foo }, '<Foo/>');
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@test Can use a custom helper in scope (in append position)'() {
-        let foo = defineSimpleHelper(() => 'Hello, world!');
-        let Bar = defineComponent({ foo }, '{{foo}}');
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@test Can use a custom modifier in scope'() {
-        let foo = defineSimpleModifier((element) => (element.innerHTML = 'Hello, world!'));
-        let Bar = defineComponent({ foo }, '<div {{foo}}></div>');
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('<div>Hello, world!</div>');
-        this.assertStableRerender();
-      }
-
-      '@test Can shadow keywords'() {
-        let ifComponent = defineComponent({}, 'Hello, world!');
-        let Bar = defineComponent({ if: ifComponent }, '{{#if}}{{/if}}');
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@test Can use constant values in ambiguous helper/component position'() {
-        let value = 'Hello, world!';
-
-        let Foo = defineComponent({ value }, '{{value}}');
-
-        this.registerComponent('foo', { ComponentClass: Foo });
-
-        this.render('<Foo/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@test Can use inline if and unless in strict mode templates'() {
-        let Foo = defineComponent({}, '{{if true "foo" "bar"}}{{unless true "foo" "bar"}}');
-
-        this.registerComponent('foo', { ComponentClass: Foo });
-
-        this.render('<Foo/>');
-        this.assertHTML('foobar');
-        this.assertStableRerender();
-      }
-
-      '@test Can use a dynamic component definition'() {
-        let Foo = defineComponent({}, 'Hello, world!');
-        let Bar = defineComponent(
-          {},
-          '<this.Foo/>',
-          class extends GlimmerishComponent {
-            Foo = Foo;
-          }
-        );
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@test Can use a dynamic component definition (curly)'() {
-        let Foo = defineComponent({}, 'Hello, world!');
-        let Bar = defineComponent(
-          {},
-          '{{this.Foo}}',
-          class extends GlimmerishComponent {
-            Foo = Foo;
-          }
-        );
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@test Can use a dynamic helper definition'() {
-        let foo = defineSimpleHelper(() => 'Hello, world!');
-        let Bar = defineComponent(
-          {},
-          '{{this.foo}}',
-          class extends GlimmerishComponent {
-            foo = foo;
-          }
-        );
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
-        let foo = defineSimpleHelper((value) => value);
-        let Foo = defineComponent({}, '{{@value}}');
-        let Bar = defineComponent({ Foo, foo }, '<Foo @value={{helper foo "Hello, world!"}}/>');
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
-
-      '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic modifier'() {
-        let foo = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
-        let Foo = defineComponent({}, '<div {{@value}}></div>');
-        let Bar = defineComponent({ Foo, foo }, '<Foo @value={{modifier foo "Hello, world!"}}/>');
-
-        this.registerComponent('bar', { ComponentClass: Bar });
-
-        this.render('<Bar/>');
-        this.assertHTML('<div>Hello, world!</div>');
-        this.assertStableRerender();
-      }
+moduleFor(
+  'Strict Mode',
+  class extends RenderingTestCase {
+    '@test Can use a component in scope'() {
+      let Foo = defineComponent({}, 'Hello, world!');
+      let Bar = defineComponent({ Foo }, '<Foo/>');
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
     }
-  );
 
-  moduleFor(
-    'Strict Mode - built ins',
-    class extends RenderingTestCase {
-      '@test Can use Input'() {
-        let Foo = defineComponent({ Input }, '<Input/>');
+    '@test Can use a custom helper in scope (in append position)'() {
+      let foo = defineSimpleHelper(() => 'Hello, world!');
+      let Bar = defineComponent({ foo }, '{{foo}}');
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('bar', { ComponentClass: Bar });
 
-        this.render('<Foo/>');
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'input',
-          attrs: {
-            type: 'text',
-            class: 'ember-text-field ember-view',
-          },
-        });
-        this.assertStableRerender();
-      }
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
 
-      '@test Can use Textarea'() {
-        let Foo = defineComponent({ Textarea }, '<Textarea/>');
+    '@test Can use a custom modifier in scope'() {
+      let foo = defineSimpleModifier((element) => (element.innerHTML = 'Hello, world!'));
+      let Bar = defineComponent({ foo }, '<div {{foo}}></div>');
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('bar', { ComponentClass: Bar });
 
-        this.render('<Foo/>');
-        this.assertComponentElement(this.firstChild, {
-          tagName: 'textarea',
-          attrs: {
-            class: 'ember-text-area ember-view',
-          },
-        });
-        this.assertStableRerender();
-      }
+      this.render('<Bar/>');
+      this.assertHTML('<div>Hello, world!</div>');
+      this.assertStableRerender();
+    }
+
+    '@test Can shadow keywords'() {
+      let ifComponent = defineComponent({}, 'Hello, world!');
+      let Bar = defineComponent({ if: ifComponent }, '{{#if}}{{/if}}');
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@test Can use constant values in ambiguous helper/component position'() {
+      let value = 'Hello, world!';
+
+      let Foo = defineComponent({ value }, '{{value}}');
+
+      this.registerComponent('foo', { ComponentClass: Foo });
+
+      this.render('<Foo/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@test Can use inline if and unless in strict mode templates'() {
+      let Foo = defineComponent({}, '{{if true "foo" "bar"}}{{unless true "foo" "bar"}}');
+
+      this.registerComponent('foo', { ComponentClass: Foo });
+
+      this.render('<Foo/>');
+      this.assertHTML('foobar');
+      this.assertStableRerender();
+    }
+
+    '@test Can use a dynamic component definition'() {
+      let Foo = defineComponent({}, 'Hello, world!');
+      let Bar = defineComponent(
+        {},
+        '<this.Foo/>',
+        class extends GlimmerishComponent {
+          Foo = Foo;
+        }
+      );
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@test Can use a dynamic component definition (curly)'() {
+      let Foo = defineComponent({}, 'Hello, world!');
+      let Bar = defineComponent(
+        {},
+        '{{this.Foo}}',
+        class extends GlimmerishComponent {
+          Foo = Foo;
+        }
+      );
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@test Can use a dynamic helper definition'() {
+      let foo = defineSimpleHelper(() => 'Hello, world!');
+      let Bar = defineComponent(
+        {},
+        '{{this.foo}}',
+        class extends GlimmerishComponent {
+          foo = foo;
+        }
+      );
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
+      let foo = defineSimpleHelper((value) => value);
+      let Foo = defineComponent({}, '{{@value}}');
+      let Bar = defineComponent({ Foo, foo }, '<Foo @value={{helper foo "Hello, world!"}}/>');
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic modifier'() {
+      let foo = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
+      let Foo = defineComponent({}, '<div {{@value}}></div>');
+      let Bar = defineComponent({ Foo, foo }, '<Foo @value={{modifier foo "Hello, world!"}}/>');
+
+      this.registerComponent('bar', { ComponentClass: Bar });
+
+      this.render('<Bar/>');
+      this.assertHTML('<div>Hello, world!</div>');
+      this.assertStableRerender();
+    }
+  }
+);
+
+moduleFor(
+  'Strict Mode - built ins',
+  class extends RenderingTestCase {
+    '@test Can use Input'() {
+      let Foo = defineComponent({ Input }, '<Input/>');
+
+      this.registerComponent('foo', { ComponentClass: Foo });
+
+      this.render('<Foo/>');
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'input',
+        attrs: {
+          type: 'text',
+          class: 'ember-text-field ember-view',
+        },
+      });
+      this.assertStableRerender();
+    }
 
-      '@test Can use hash'() {
-        let Foo = defineComponent(
-          { hash },
-          '{{#let (hash value="Hello, world!") as |hash|}}{{hash.value}}{{/let}}'
-        );
+    '@test Can use Textarea'() {
+      let Foo = defineComponent({ Textarea }, '<Textarea/>');
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('foo', { ComponentClass: Foo });
 
-        this.render('<Foo/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
+      this.render('<Foo/>');
+      this.assertComponentElement(this.firstChild, {
+        tagName: 'textarea',
+        attrs: {
+          class: 'ember-text-area ember-view',
+        },
+      });
+      this.assertStableRerender();
+    }
+
+    '@test Can use hash'() {
+      let Foo = defineComponent(
+        { hash },
+        '{{#let (hash value="Hello, world!") as |hash|}}{{hash.value}}{{/let}}'
+      );
+
+      this.registerComponent('foo', { ComponentClass: Foo });
 
-      '@test Can use array'() {
-        let Foo = defineComponent(
-          { array },
-          '{{#each (array "Hello, world!") as |value|}}{{value}}{{/each}}'
-        );
+      this.render('<Foo/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
+
+    '@test Can use array'() {
+      let Foo = defineComponent(
+        { array },
+        '{{#each (array "Hello, world!") as |value|}}{{value}}{{/each}}'
+      );
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('foo', { ComponentClass: Foo });
 
-        this.render('<Foo/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
+      this.render('<Foo/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
 
-      '@test Can use concat'() {
-        let Foo = defineComponent({ concat }, '{{(concat "Hello" ", " "world!")}}');
+    '@test Can use concat'() {
+      let Foo = defineComponent({ concat }, '{{(concat "Hello" ", " "world!")}}');
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('foo', { ComponentClass: Foo });
 
-        this.render('<Foo/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
+      this.render('<Foo/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
 
-      '@test Can use get'() {
-        let Foo = defineComponent(
-          { hash, get },
-          '{{#let (hash value="Hello, world!") as |hash|}}{{(get hash "value")}}{{/let}}'
-        );
+    '@test Can use get'() {
+      let Foo = defineComponent(
+        { hash, get },
+        '{{#let (hash value="Hello, world!") as |hash|}}{{(get hash "value")}}{{/let}}'
+      );
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('foo', { ComponentClass: Foo });
 
-        this.render('<Foo/>');
-        this.assertHTML('Hello, world!');
-        this.assertStableRerender();
-      }
+      this.render('<Foo/>');
+      this.assertHTML('Hello, world!');
+      this.assertStableRerender();
+    }
 
-      '@test Can use on and fn'(assert) {
-        assert.expect(1);
+    '@test Can use on and fn'(assert) {
+      assert.expect(1);
 
-        let handleClick = (value) => {
-          assert.equal(value, 123);
-        };
+      let handleClick = (value) => {
+        assert.equal(value, 123);
+      };
 
-        let Foo = defineComponent(
-          { on, fn, handleClick },
-          '<button {{on "click" (fn handleClick 123)}}>Click</button>'
-        );
+      let Foo = defineComponent(
+        { on, fn, handleClick },
+        '<button {{on "click" (fn handleClick 123)}}>Click</button>'
+      );
 
-        this.registerComponent('foo', { ComponentClass: Foo });
+      this.registerComponent('foo', { ComponentClass: Foo });
 
-        this.render('<Foo/>');
-        this.click('button');
-      }
+      this.render('<Foo/>');
+      this.click('button');
     }
-  );
-
-  moduleFor(
-    'Strict Mode - LinkTo',
-    class extends ApplicationTestCase {
-      '@test Can use LinkTo'() {
-        let Foo = defineComponent({ LinkTo }, '<LinkTo @route="index">Index</LinkTo>');
-
-        this.addComponent('foo', { ComponentClass: Foo });
-        this.addTemplate('index', `<Foo/>`);
-
-        return this.visit('/').then(() => {
-          this.assertComponentElement(this.firstChild, {
-            tagName: 'a',
-            attrs: { href: '/', class: 'ember-view active' },
-            content: 'Index',
-          });
+  }
+);
+
+moduleFor(
+  'Strict Mode - LinkTo',
+  class extends ApplicationTestCase {
+    '@test Can use LinkTo'() {
+      let Foo = defineComponent({ LinkTo }, '<LinkTo @route="index">Index</LinkTo>');
+
+      this.addComponent('foo', { ComponentClass: Foo });
+      this.addTemplate('index', `<Foo/>`);
+
+      return this.visit('/').then(() => {
+        this.assertComponentElement(this.firstChild, {
+          tagName: 'a',
+          attrs: { href: '/', class: 'ember-view active' },
+          content: 'Index',
         });
-      }
+      });
     }
-  );
-}
+  }
+);
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 46e4315e2e7..b78ec159750 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -14,7 +14,6 @@ import { ENV } from '@ember/-internals/environment';
 export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
-  EMBER_STRICT_MODE: true,
   EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
   EMBER_CACHED: true,
@@ -68,7 +67,6 @@ function featureValue(value: null | boolean) {
 
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
-export const EMBER_STRICT_MODE = featureValue(FEATURES.EMBER_STRICT_MODE);
 export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
   FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
 );
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 22e77714340..79cc6521855 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,4 +1,3 @@
-import { EMBER_STRICT_MODE } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index';
 import { EmberPrecompileOptions, PluginFunc } from '../types';
@@ -30,11 +29,6 @@ export function buildCompileOptions(_options: EmberPrecompileOptions): EmberPrec
     }
   );
 
-  if (!EMBER_STRICT_MODE) {
-    options.strictMode = false;
-    options.locals = undefined;
-  }
-
   if ('locals' in options && !options.locals) {
     // Glimmer's precompile options declare `locals` like:
     //    locals?: string[]
@@ -55,9 +49,7 @@ export function buildCompileOptions(_options: EmberPrecompileOptions): EmberPrec
 }
 
 export function transformsFor(options: EmberPrecompileOptions): readonly PluginFunc[] {
-  return EMBER_STRICT_MODE && options.strictMode
-    ? STRICT_MODE_TRANSFORMS
-    : RESOLUTION_MODE_TRANSFORMS;
+  return options.strictMode ? STRICT_MODE_TRANSFORMS : RESOLUTION_MODE_TRANSFORMS;
 }
 
 export default function compileOptions(

From 9078dc24c6d9e7418d1b4bd13cb26474449e1022 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 11 Feb 2022 17:01:19 +0100
Subject: [PATCH 0868/1405] [CLEANUP] Remove  feature flag

---
 .../components/strict-mode-test.js            |  4 +-
 .../custom-modifier-manager-test.js           | 16 ++----
 .../integration/helpers/custom-helper-test.js | 16 ++----
 packages/@ember/canary-features/index.ts      |  4 --
 ...ssert-against-dynamic-helpers-modifiers.ts | 56 -------------------
 .../lib/plugins/index.ts                      |  8 +--
 6 files changed, 11 insertions(+), 93 deletions(-)
 delete mode 100644 packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
index 90a4c7ff3d7..c9866582d3c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/strict-mode-test.js
@@ -132,7 +132,7 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
+    '@test Can use a curried dynamic helper'() {
       let foo = defineSimpleHelper((value) => value);
       let Foo = defineComponent({}, '{{@value}}');
       let Bar = defineComponent({ Foo, foo }, '<Foo @value={{helper foo "Hello, world!"}}/>');
@@ -144,7 +144,7 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic modifier'() {
+    '@test Can use a curried dynamic modifier'() {
       let foo = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
       let Foo = defineComponent({}, '<div {{@value}}></div>');
       let Bar = defineComponent({ Foo, foo }, '<Foo @value={{modifier foo "Hello, world!"}}/>');
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index 144f5dff9a4..caecb822958 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -459,7 +459,7 @@ moduleFor(
       assert.equal(updateCount, 1);
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can resolve a modifier'() {
+    '@test Can resolve a modifier'() {
       this.registerModifier(
         'replace',
         defineSimpleModifier((element, [text]) => (element.innerHTML = text ?? 'Hello, world!'))
@@ -476,7 +476,7 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Cannot dynamically resolve a modifier'(assert) {
+    '@test Cannot dynamically resolve a modifier'(assert) {
       this.registerModifier(
         'replace',
         defineSimpleModifier((element) => (element.innerHTML = 'Hello, world!'))
@@ -498,7 +498,7 @@ moduleFor(
       }
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can be curried'() {
+    '@test Can be curried'() {
       let val = defineSimpleModifier((element, [text]) => (element.innerHTML = text));
 
       this.registerComponent('foo', {
@@ -515,15 +515,7 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@feature(!EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Cannot be curried when flag is not enabled'() {
-      expectAssertion(() => {
-        this.registerComponent('bar', {
-          template: '<Foo @value={{modifier this.val "Hello, world!"}}/>',
-        });
-      }, /Cannot use the \(modifier\) keyword yet, as it has not been implemented/);
-    }
-
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a dynamic modifier with a nested dynamic helper'() {
+    '@test Can use a dynamic modifier with a nested dynamic helper'() {
       let foo = defineSimpleHelper(() => 'Hello, world!');
       let bar = defineSimpleModifier((element, [value]) => (element.innerHTML = value));
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 3d02c8a6b35..48c57757f00 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -713,7 +713,7 @@ moduleFor(
       this.assertText('huzza!');
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can resolve a helper'() {
+    '@test Can resolve a helper'() {
       this.registerHelper('hello-world', ([text]) => text ?? 'Hello, world!');
 
       this.render('[{{helper "hello-world"}}][{{helper (helper "hello-world") "wow"}}]');
@@ -721,7 +721,7 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Cannot dynamically resolve a helper'(assert) {
+    '@test Cannot dynamically resolve a helper'(assert) {
       this.registerHelper('hello-world', () => 'Hello, world!');
 
       if (DEBUG) {
@@ -734,7 +734,7 @@ moduleFor(
       }
     }
 
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
+    '@test Can use a curried dynamic helper'() {
       let val = defineSimpleHelper((value) => value);
 
       this.registerComponent('foo', {
@@ -751,15 +751,7 @@ moduleFor(
       this.assertStableRerender();
     }
 
-    '@feature(!EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a curried dynamic helper'() {
-      expectAssertion(() => {
-        this.registerComponent('bar', {
-          template: '<Foo @value={{helper this.val "Hello, world!"}}/>',
-        });
-      }, /Cannot use the \(helper\) keyword yet, as it has not been implemented/);
-    }
-
-    '@feature(EMBER_DYNAMIC_HELPERS_AND_MODIFIERS) Can use a dynamic helper with nested helpers'() {
+    '@test Can use a dynamic helper with nested helpers'() {
       let foo = defineSimpleHelper(() => 'world!');
       let bar = defineSimpleHelper((value) => 'Hello, ' + value);
 
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index b78ec159750..8055bb59a69 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -14,7 +14,6 @@ import { ENV } from '@ember/-internals/environment';
 export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
-  EMBER_DYNAMIC_HELPERS_AND_MODIFIERS: true,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
   EMBER_CACHED: true,
 };
@@ -67,9 +66,6 @@ function featureValue(value: null | boolean) {
 
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
-export const EMBER_DYNAMIC_HELPERS_AND_MODIFIERS = featureValue(
-  FEATURES.EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
-);
 export const EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(
   FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH
 );
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts b/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
deleted file mode 100644
index 289bda9b8eb..00000000000
--- a/packages/ember-template-compiler/lib/plugins/assert-against-dynamic-helpers-modifiers.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
-import { isPath, trackLocals } from './utils';
-
-export default function assertAgainstDynamicHelpersModifiers(
-  env: EmberASTPluginEnvironment
-): ASTPlugin {
-  let moduleName = env.meta?.moduleName;
-  let { hasLocal, node } = trackLocals();
-
-  return {
-    name: 'assert-against-dynamic-helpers-modifiers',
-
-    visitor: {
-      Program: node,
-
-      ElementNode: {
-        keys: {
-          children: node,
-        },
-      },
-
-      MustacheStatement(node: AST.MustacheStatement) {
-        if (isPath(node.path)) {
-          let name = node.path.parts[0]!;
-
-          assert(
-            `${messageFor(name)} ${calculateLocationDisplay(moduleName, node.loc)}`,
-            (name !== 'helper' && name !== 'modifier') || isLocalVariable(node.path, hasLocal)
-          );
-        }
-      },
-
-      SubExpression(node: AST.SubExpression) {
-        if (isPath(node.path)) {
-          let name = node.path.parts[0]!;
-
-          assert(
-            `${messageFor(name)} ${calculateLocationDisplay(moduleName, node.loc)}`,
-            (name !== 'helper' && name !== 'modifier') || isLocalVariable(node.path, hasLocal)
-          );
-        }
-      },
-    },
-  };
-}
-
-function isLocalVariable(node: AST.PathExpression, hasLocal: (k: string) => boolean): boolean {
-  return !node.this && node.parts.length === 1 && hasLocal(node.parts[0]!);
-}
-
-function messageFor(name: string): string {
-  return `Cannot use the (${name}) keyword yet, as it has not been implemented.`;
-}
diff --git a/packages/ember-template-compiler/lib/plugins/index.ts b/packages/ember-template-compiler/lib/plugins/index.ts
index 4ca0c016304..0b619bb76f9 100644
--- a/packages/ember-template-compiler/lib/plugins/index.ts
+++ b/packages/ember-template-compiler/lib/plugins/index.ts
@@ -1,5 +1,4 @@
 import AssertAgainstAttrs from './assert-against-attrs';
-import AssertAgainstDynamicHelpersModifiers from './assert-against-dynamic-helpers-modifiers';
 import AssertAgainstNamedOutlets from './assert-against-named-outlets';
 import AssertInputHelperWithoutBlock from './assert-input-helper-without-block';
 import AssertReservedNamedArguments from './assert-reserved-named-arguments';
@@ -12,8 +11,6 @@ import TransformQuotedBindingsIntoJustBindings from './transform-quoted-bindings
 import TransformResolutions from './transform-resolutions';
 import TransformWrapMountAndOutlet from './transform-wrap-mount-and-outlet';
 
-import { EMBER_DYNAMIC_HELPERS_AND_MODIFIERS } from '@ember/canary-features';
-
 // order of plugins is important
 export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
   [
@@ -28,9 +25,7 @@ export const RESOLUTION_MODE_TRANSFORMS = Object.freeze(
     TransformEachTrackArray,
     AssertAgainstNamedOutlets,
     TransformWrapMountAndOutlet,
-    EMBER_DYNAMIC_HELPERS_AND_MODIFIERS
-      ? TransformResolutions
-      : AssertAgainstDynamicHelpersModifiers,
+    TransformResolutions,
   ].filter(notNull)
 );
 
@@ -45,7 +40,6 @@ export const STRICT_MODE_TRANSFORMS = Object.freeze(
     TransformEachTrackArray,
     AssertAgainstNamedOutlets,
     TransformWrapMountAndOutlet,
-    !EMBER_DYNAMIC_HELPERS_AND_MODIFIERS ? AssertAgainstDynamicHelpersModifiers : null,
   ].filter(notNull)
 );
 

From d0371027994e0203c1072d0f258cc169830aa0b2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 11 Feb 2022 08:46:48 -0800
Subject: [PATCH 0869/1405] Improve BootOptions types and add more type-tests

---
 packages/@ember/application/instance.d.ts     | 25 ++++-------
 packages/@ember/application/instance.js       |  6 +--
 .../@ember/application/lib/application.d.ts   |  2 +-
 .../application/type-tests/index.test.ts      | 26 ++++++++++-
 .../application/type-tests/instance.test.ts   | 44 +++++++------------
 .../@ember/engine/type-tests/instance.test.ts | 38 ++++++++++++++++
 6 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 packages/@ember/engine/type-tests/instance.test.ts

diff --git a/packages/@ember/application/instance.d.ts b/packages/@ember/application/instance.d.ts
index d5bb40458c3..298e3b6c27b 100644
--- a/packages/@ember/application/instance.d.ts
+++ b/packages/@ember/application/instance.d.ts
@@ -1,22 +1,13 @@
 import EngineInstance from '@ember/engine/instance';
 
-export class BootOptions {
-  isBrowser: boolean;
-  shouldRender: boolean;
-  document: Document | null;
-  rootElement: string | Element | null;
-  location: string | null;
-
-  constructor(options?: {
-    isBrowser?: boolean;
-    shouldRender?: boolean;
-    document?: Document;
-    rootElement?: string | Element;
-    location?: string;
-    isInteractive?: boolean;
-  });
-
-  toEnvironment(): Record<string, unknown>;
+export interface BootOptions {
+  isBrowser?: boolean;
+  shouldRender?: boolean;
+  document?: Document | null;
+  rootElement?: string | Element | null;
+  location?: string | null;
+  // Private?
+  isInteractive?: boolean;
 }
 
 export default class ApplicationInstance extends EngineInstance {}
diff --git a/packages/@ember/application/instance.js b/packages/@ember/application/instance.js
index b1639a8833e..9b5841338f2 100644
--- a/packages/@ember/application/instance.js
+++ b/packages/@ember/application/instance.js
@@ -335,12 +335,12 @@ class BootOptions {
       @default auto-detected
       @private
     */
-    this.isInteractive = environment.hasDOM; // This default is overridable below
+    this.isInteractive = Boolean(environment.hasDOM); // This default is overridable below
 
     /**
       @property _renderMode
       @type string
-      @default false
+      @default undefined
       @private
     */
     this._renderMode = options._renderMode;
@@ -372,7 +372,7 @@ class BootOptions {
     if (options.isBrowser !== undefined) {
       this.isBrowser = Boolean(options.isBrowser);
     } else {
-      this.isBrowser = environment.hasDOM;
+      this.isBrowser = Boolean(environment.hasDOM);
     }
 
     if (!this.isBrowser) {
diff --git a/packages/@ember/application/lib/application.d.ts b/packages/@ember/application/lib/application.d.ts
index bb3f709db98..80163ece32a 100644
--- a/packages/@ember/application/lib/application.d.ts
+++ b/packages/@ember/application/lib/application.d.ts
@@ -13,5 +13,5 @@ export default class Application extends Engine {
   boot(): void;
   ready(): void;
   reset(): void;
-  visit(url: string, options: BootOptions): Promise<ApplicationInstance>;
+  visit(url: string, options?: BootOptions): Promise<ApplicationInstance>;
 }
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index 1416a3be6f6..13eb5fd5fba 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -1,6 +1,6 @@
 import { EventDispatcher } from '@ember/-internals/views';
 import Application, { getOwner, setOwner } from '@ember/application';
-import ApplicationInstance, { BootOptions } from '@ember/application/instance';
+import ApplicationInstance from '@ember/application/instance';
 import { Owner } from '@ember/-internals/owner';
 
 import { expectTypeOf } from 'expect-type';
@@ -29,7 +29,29 @@ expectTypeOf(app.advanceReadiness()).toEqualTypeOf<void>();
 expectTypeOf(app.boot()).toEqualTypeOf<void>();
 expectTypeOf(app.ready()).toEqualTypeOf<void>();
 expectTypeOf(app.reset()).toEqualTypeOf<void>();
-expectTypeOf(app.visit('/my-app', new BootOptions())).toEqualTypeOf<Promise<ApplicationInstance>>();
+
+let bootOptions = {
+  isBrowser: true,
+  shouldRender: false,
+  document: window.document,
+  rootElement: '#ember-application',
+  location: 'history',
+};
+
+app.visit('/my-app', bootOptions);
+
+app.visit('/my-app', { isBrowser: true });
+
+// @ts-expect-error Incorrect type
+app.visit('/my-app', { isBrowser: 1 });
+// @ts-expect-error Incorrect type
+app.visit('/my-app', { shouldRender: 1 });
+// @ts-expect-error Incorrect type
+app.visit('/my-app', { document: window });
+// @ts-expect-error Incorrect type
+app.visit('/my-app', { rootElement: 1 });
+// @ts-expect-error Incorrect type
+app.visit('/my-app', { location: 1 });
 
 class App2 extends Application {
   // @ts-expect-error Doesn't allow number
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 12eb726167c..d8eb59f100c 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -34,35 +34,25 @@ instance.hasRegistration();
 
 expectTypeOf(instance.boot()).toEqualTypeOf<void>();
 
-const bootOptions = new BootOptions({
+const bootOptions: BootOptions = {
   isBrowser: true,
   shouldRender: false,
   document: window.document,
   rootElement: '#ember-application',
   location: 'history',
-});
-
-expectTypeOf(bootOptions.isBrowser).toEqualTypeOf<boolean>();
-expectTypeOf(bootOptions.shouldRender).toEqualTypeOf<boolean>();
-expectTypeOf(bootOptions.document).toEqualTypeOf<Document | null>();
-expectTypeOf(bootOptions.rootElement).toEqualTypeOf<string | Element | null>();
-expectTypeOf(bootOptions.location).toEqualTypeOf<string | null>();
-
-new BootOptions({
-  // @ts-expect-error Incorrect type
-  isBrowser: 1,
-  // @ts-expect-error Incorrect type
-  shouldRender: 1,
-  // @ts-expect-error Incorrect type
-  document: window,
-  // @ts-expect-error Incorrect type
-  rootElement: 1,
-  // @ts-expect-error Incorrect type
-  location: 1,
-});
-
-new BootOptions({
-  rootElement: window.document.createElement('div'),
-});
-
-new BootOptions();
+};
+
+instance.boot(bootOptions);
+
+instance.boot({ isBrowser: true });
+
+// @ts-expect-error Incorrect type
+instance.boot({ isBrowser: 1 });
+// @ts-expect-error Incorrect type
+instance.boot({ shouldRender: 1 });
+// @ts-expect-error Incorrect type
+instance.boot({ document: window });
+// @ts-expect-error Incorrect type
+instance.boot({ rootElement: 1 });
+// @ts-expect-error Incorrect type
+instance.boot({ location: 1 });
diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts
new file mode 100644
index 00000000000..10494e8d3d5
--- /dev/null
+++ b/packages/@ember/engine/type-tests/instance.test.ts
@@ -0,0 +1,38 @@
+import { Owner } from '@ember/-internals/owner';
+import EngineInstance from '@ember/engine/instance';
+import EmberObject from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf<EngineInstance>().toMatchTypeOf<EmberObject>();
+expectTypeOf<EngineInstance>().toMatchTypeOf<Owner>();
+
+// Good enough for tests
+let owner = {} as Owner;
+let instance = new EngineInstance(owner);
+
+expectTypeOf(instance.boot()).toEqualTypeOf<void>();
+
+expectTypeOf(instance.boot()).toEqualTypeOf<void>();
+
+let bootOptions = {
+  isBrowser: true,
+  shouldRender: false,
+  document: window.document,
+  rootElement: '#ember-application',
+  location: 'history',
+};
+
+instance.boot(bootOptions);
+
+instance.boot({ isBrowser: true });
+
+// @ts-expect-error Incorrect type
+instance.boot({ isBrowser: 1 });
+// @ts-expect-error Incorrect type
+instance.boot({ shouldRender: 1 });
+// @ts-expect-error Incorrect type
+instance.boot({ document: window });
+// @ts-expect-error Incorrect type
+instance.boot({ rootElement: 1 });
+// @ts-expect-error Incorrect type
+instance.boot({ location: 1 });

From abc0b4aa237a58997f99d3832bd560f294135fd1 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 Jan 2022 21:33:56 -0800
Subject: [PATCH 0870/1405] Add @ember/error type test

---
 packages/@ember/error/type-tests/index.test.ts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/@ember/error/type-tests/index.test.ts

diff --git a/packages/@ember/error/type-tests/index.test.ts b/packages/@ember/error/type-tests/index.test.ts
new file mode 100644
index 00000000000..a0120bdacc5
--- /dev/null
+++ b/packages/@ember/error/type-tests/index.test.ts
@@ -0,0 +1,4 @@
+import EmberError from '@ember/error';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(EmberError).toEqualTypeOf<ErrorConstructor>();

From 71ed37c04ac2ec3e9054e341122764924d0070ab Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 Jan 2022 21:51:57 -0800
Subject: [PATCH 0871/1405] Add @ember/helper type tests

---
 .../helper/type-tests/capabilities.test.ts    | 14 ++++++
 .../helper/type-tests/invoke-helper.test.ts   | 30 +++++++++++
 .../type-tests/set-helper-manager.test.ts     | 50 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 packages/@ember/helper/type-tests/capabilities.test.ts
 create mode 100644 packages/@ember/helper/type-tests/invoke-helper.test.ts
 create mode 100644 packages/@ember/helper/type-tests/set-helper-manager.test.ts

diff --git a/packages/@ember/helper/type-tests/capabilities.test.ts b/packages/@ember/helper/type-tests/capabilities.test.ts
new file mode 100644
index 00000000000..cae8caa04b4
--- /dev/null
+++ b/packages/@ember/helper/type-tests/capabilities.test.ts
@@ -0,0 +1,14 @@
+import { capabilities } from '@ember/helper';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(capabilities('3.23')).toMatchTypeOf<{
+  hasValue: boolean;
+  hasDestroyable: boolean;
+  hasScheduledEffect: boolean;
+}>();
+
+capabilities('3.23', { hasValue: true });
+// @ts-expect-error invalid capabilities
+capabilities('3.23', { hasValue: 1 });
+// @ts-expect-error invalid verison
+capabilities('3.22');
diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts
new file mode 100644
index 00000000000..596b856bc8c
--- /dev/null
+++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts
@@ -0,0 +1,30 @@
+import Component from '@ember/-internals/glimmer/lib/component';
+import { getValue } from '@ember/-internals/metal';
+import Helper from '@ember/component/helper';
+import { invokeHelper } from '@ember/helper';
+import { Cache } from '@glimmer/validator';
+import { expectTypeOf } from 'expect-type';
+
+// NOTE: The types should probably be stricter, but they're from glimmer itself
+
+class PlusOne extends Helper {
+  compute([number]: [number]) {
+    return number + 1;
+  }
+}
+
+export default class PlusOneComponent extends Component {
+  plusOne = invokeHelper(this, PlusOne, () => {
+    return {
+      positional: [this.args.number],
+    };
+  });
+
+  get value() {
+    return getValue(this.plusOne);
+  }
+}
+
+let component = new PlusOneComponent();
+
+expectTypeOf(component.plusOne).toEqualTypeOf<Cache<unknown>>();
diff --git a/packages/@ember/helper/type-tests/set-helper-manager.test.ts b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
new file mode 100644
index 00000000000..9ad7937b270
--- /dev/null
+++ b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
@@ -0,0 +1,50 @@
+import { HelperFactory, HelperFunction, SimpleHelper } from '@ember/-internals/glimmer/lib/helper';
+import { getDebugName } from '@ember/-internals/utils';
+import { capabilities, setHelperManager } from '@ember/helper';
+import { Arguments, HelperManager } from '@glimmer/interfaces';
+import { expectTypeOf } from 'expect-type';
+
+class Wrapper implements HelperFactory<SimpleHelper> {
+  isHelperFactory: true = true;
+
+  constructor(public compute: HelperFunction) {}
+
+  create() {
+    // needs new instance or will leak containers
+    return {
+      compute: this.compute,
+    };
+  }
+}
+
+class SimpleClassicHelperManager implements HelperManager<() => unknown> {
+  capabilities = capabilities('3.23', {
+    hasValue: true,
+  });
+
+  createHelper(definition: Wrapper, args: Arguments) {
+    let { compute } = definition;
+
+    return () => compute.call(null, args.positional as unknown[], args.named);
+  }
+
+  getValue(fn: () => unknown) {
+    return fn();
+  }
+
+  getDebugName(definition: Wrapper) {
+    return getDebugName!(definition.compute);
+  }
+}
+
+export const SIMPLE_CLASSIC_HELPER_MANAGER = new SimpleClassicHelperManager();
+
+expectTypeOf(
+  setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype)
+).toEqualTypeOf<Wrapper>();
+
+// @ts-expect-error invalid factory
+setHelperManager(1, Wrapper.prototype);
+
+// @ts-expect-error requires a second param
+setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER);

From d1989091294eff20d3c7c618393dbc1e4d92de5a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 26 Jan 2022 22:00:23 -0800
Subject: [PATCH 0872/1405] Add type test for @ember/polyfills

---
 .../@ember/polyfills/type-tests/assign.test.ts     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 packages/@ember/polyfills/type-tests/assign.test.ts

diff --git a/packages/@ember/polyfills/type-tests/assign.test.ts b/packages/@ember/polyfills/type-tests/assign.test.ts
new file mode 100644
index 00000000000..3d7f0484266
--- /dev/null
+++ b/packages/@ember/polyfills/type-tests/assign.test.ts
@@ -0,0 +1,14 @@
+import { assign } from '@ember/polyfills';
+import { expectTypeOf } from 'expect-type';
+
+// NOTE: Actual types could be better, but this is deprecated.
+
+let a = { first: 'Yehuda' };
+let b = { last: 'Katz' };
+let c = { company: 'Other Company' };
+let d = { company: 'Tilde Inc.' };
+expectTypeOf(assign(a, b, c, d)).toEqualTypeOf<{
+  first: string;
+  last: string;
+  company: string;
+}>();

From 96cc5d57439b60731ed5a191d52f61294eb64a4a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Feb 2022 10:53:41 -0800
Subject: [PATCH 0873/1405] Add type tests for @ember/canary-features

---
 packages/@ember/canary-features/type-tests/index.test.ts | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/@ember/canary-features/type-tests/index.test.ts

diff --git a/packages/@ember/canary-features/type-tests/index.test.ts b/packages/@ember/canary-features/type-tests/index.test.ts
new file mode 100644
index 00000000000..e16f8cacf21
--- /dev/null
+++ b/packages/@ember/canary-features/type-tests/index.test.ts
@@ -0,0 +1,8 @@
+import { DEFAULT_FEATURES, FEATURES, isEnabled } from '@ember/canary-features';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(DEFAULT_FEATURES).toMatchTypeOf<Record<string, boolean | null>>();
+
+expectTypeOf(FEATURES).toMatchTypeOf<Record<string, boolean | null>>();
+
+expectTypeOf(isEnabled('foo')).toMatchTypeOf<boolean>();

From 1149a6d3c0755dcd5bb57368baef68d82b657db9 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Feb 2022 15:53:47 -0800
Subject: [PATCH 0874/1405] Add @ember/template type tests

---
 packages/@ember/template/type-tests/index.test.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 packages/@ember/template/type-tests/index.test.ts

diff --git a/packages/@ember/template/type-tests/index.test.ts b/packages/@ember/template/type-tests/index.test.ts
new file mode 100644
index 00000000000..8caa197c852
--- /dev/null
+++ b/packages/@ember/template/type-tests/index.test.ts
@@ -0,0 +1,13 @@
+import { SafeString } from '@ember/-internals/glimmer';
+import { htmlSafe, isHTMLSafe } from '@ember/template';
+import { expectTypeOf } from 'expect-type';
+
+let safe = htmlSafe('<div>someString</div>');
+expectTypeOf(safe).toEqualTypeOf<SafeString>();
+
+expectTypeOf(isHTMLSafe(safe)).toEqualTypeOf<boolean>();
+
+isHTMLSafe('unsafe');
+isHTMLSafe(1);
+isHTMLSafe(null);
+isHTMLSafe(undefined);

From 3ea0f394fd644d579a4c0f04d97d6ce7d9dd0310 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Feb 2022 16:20:27 -0800
Subject: [PATCH 0875/1405] Add type tests for @ember/destroyable

---
 .../assert-destroyables-destroyed.test.ts     |  6 ++++
 .../associate-destroyable-child.test.ts       | 16 ++++++++++
 .../destroyable/type-tests/destroy.test.ts    | 15 ++++++++++
 .../enable-destroy-tracking.test.ts           |  6 ++++
 .../type-tests/is-destroyed.test.ts           | 16 ++++++++++
 .../type-tests/is-destroying.test.ts          | 19 ++++++++++++
 .../type-tests/register-destructor.test.ts    | 27 +++++++++++++++++
 .../type-tests/unregister-destructor.test.ts  | 30 +++++++++++++++++++
 8 files changed, 135 insertions(+)
 create mode 100644 packages/@ember/destroyable/type-tests/assert-destroyables-destroyed.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/associate-destroyable-child.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/destroy.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/enable-destroy-tracking.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/is-destroyed.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/is-destroying.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/register-destructor.test.ts
 create mode 100644 packages/@ember/destroyable/type-tests/unregister-destructor.test.ts

diff --git a/packages/@ember/destroyable/type-tests/assert-destroyables-destroyed.test.ts b/packages/@ember/destroyable/type-tests/assert-destroyables-destroyed.test.ts
new file mode 100644
index 00000000000..87d732dd5a0
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/assert-destroyables-destroyed.test.ts
@@ -0,0 +1,6 @@
+import { assertDestroyablesDestroyed } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+if (assertDestroyablesDestroyed) {
+  expectTypeOf(assertDestroyablesDestroyed()).toEqualTypeOf<void>();
+}
diff --git a/packages/@ember/destroyable/type-tests/associate-destroyable-child.test.ts b/packages/@ember/destroyable/type-tests/associate-destroyable-child.test.ts
new file mode 100644
index 00000000000..59eb1898d91
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/associate-destroyable-child.test.ts
@@ -0,0 +1,16 @@
+import { associateDestroyableChild } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {}
+class Bar {}
+
+let foo = new Foo();
+let bar = new Bar();
+
+expectTypeOf(associateDestroyableChild(foo, bar)).toEqualTypeOf<Bar>();
+// @ts-expect-error number is not destroyable
+associateDestroyableChild(1, bar);
+// @ts-expect-error number is not destroyable
+associateDestroyableChild(foo, 1);
+// @ts-expect-error two values required
+associateDestroyableChild(foo);
diff --git a/packages/@ember/destroyable/type-tests/destroy.test.ts b/packages/@ember/destroyable/type-tests/destroy.test.ts
new file mode 100644
index 00000000000..1c5b19bc4fb
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/destroy.test.ts
@@ -0,0 +1,15 @@
+import { destroy, registerDestructor } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+let obj = {};
+
+registerDestructor(obj, () => {
+  /* Will get called when destroyed */
+});
+
+expectTypeOf(destroy(obj)).toEqualTypeOf<void>();
+
+// @ts-expect-error not destroyable
+destroy(1);
+// @ts-expect-error requires arg
+destroy();
diff --git a/packages/@ember/destroyable/type-tests/enable-destroy-tracking.test.ts b/packages/@ember/destroyable/type-tests/enable-destroy-tracking.test.ts
new file mode 100644
index 00000000000..5a67e89ae5a
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/enable-destroy-tracking.test.ts
@@ -0,0 +1,6 @@
+import { enableDestroyableTracking } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+if (enableDestroyableTracking) {
+  expectTypeOf(enableDestroyableTracking()).toEqualTypeOf<void>();
+}
diff --git a/packages/@ember/destroyable/type-tests/is-destroyed.test.ts b/packages/@ember/destroyable/type-tests/is-destroyed.test.ts
new file mode 100644
index 00000000000..afae820b4ea
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/is-destroyed.test.ts
@@ -0,0 +1,16 @@
+import { destroy, isDestroyed } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+let obj = {};
+
+expectTypeOf(isDestroyed(obj)).toEqualTypeOf<boolean>(); // false
+destroy(obj);
+
+// ...sometime later, after scheduled destruction
+
+expectTypeOf(isDestroyed(obj)).toEqualTypeOf<boolean>(); // true
+
+// @ts-expect-error requires a destroyable value
+isDestroyed(1);
+// @ts-expect-error requires a value
+isDestroyed();
diff --git a/packages/@ember/destroyable/type-tests/is-destroying.test.ts b/packages/@ember/destroyable/type-tests/is-destroying.test.ts
new file mode 100644
index 00000000000..e5f6eb6c691
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/is-destroying.test.ts
@@ -0,0 +1,19 @@
+import { destroy, isDestroying, isDestroyed } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+let obj = {};
+
+expectTypeOf(isDestroying(obj)).toEqualTypeOf<boolean>(); // false
+
+destroy(obj);
+
+isDestroying(obj); // true
+
+// ...sometime later, after scheduled destruction
+isDestroyed(obj); // true
+isDestroying(obj); // true
+
+// @ts-expect-error requires a destroyable value
+isDestroying(1);
+// @ts-expect-error requires a value
+isDestroying();
diff --git a/packages/@ember/destroyable/type-tests/register-destructor.test.ts b/packages/@ember/destroyable/type-tests/register-destructor.test.ts
new file mode 100644
index 00000000000..d7540273a0c
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/register-destructor.test.ts
@@ -0,0 +1,27 @@
+import { destroy, registerDestructor } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {}
+let obj = new Foo();
+
+expectTypeOf(
+  registerDestructor(obj, () => {
+    /* Will get called when destroyed */
+  })
+).toEqualTypeOf<(destroyable: {}) => void>();
+
+registerDestructor(obj, (_obj: Foo) => {});
+
+destroy(obj);
+
+// @ts-expect-error not destroyable
+registerDestructor(1, () => {});
+
+// @ts-expect-error requires object
+registerDestructor(() => {});
+
+// @ts-expect-error requires callback
+registerDestructor(obj);
+
+// @ts-expect-error invalid callback
+registerDestructor(obj, (blah: number) => {});
diff --git a/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts b/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts
new file mode 100644
index 00000000000..99bdfa8e665
--- /dev/null
+++ b/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts
@@ -0,0 +1,30 @@
+import { registerDestructor, unregisterDestructor } from '@ember/destroyable';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  type: 'foo' = 'foo';
+}
+let obj = new Foo();
+
+let destructor = registerDestructor(obj, () => {
+  /* Will get called when destroyed */
+});
+
+expectTypeOf(unregisterDestructor(obj, destructor)).toEqualTypeOf<void>();
+
+// @ts-expect-error invalid destructor
+unregisterDestructor(obj, 1);
+
+// @ts-expect-error requires destructor
+unregisterDestructor(obj);
+
+// @ts-expect-error requires object
+unregisterDestructor(destructor);
+
+class Bar {
+  type: 'blah' = 'blah';
+}
+let obj2 = new Bar();
+
+// @ts-expect-error destroyable type mismatch
+unregisterDestructor(obj2, destructor);

From 420a01fe1864a5e8d447ac714a3cfb9aff012a49 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Feb 2022 11:14:10 -0800
Subject: [PATCH 0876/1405] Improve @ember/utils and add type tests

---
 .../@ember/-internals/metal/lib/is_blank.ts   |  3 +-
 .../@ember/-internals/metal/lib/is_empty.ts   | 34 ++++++++------
 .../@ember/-internals/metal/lib/is_none.ts    |  1 -
 .../@ember/-internals/metal/lib/is_present.ts |  3 +-
 .../-internals/metal/lib/property_get.ts      |  2 +-
 .../runtime/lib/{compare.js => compare.ts}    | 34 ++++++++++----
 .../@ember/-internals/runtime/lib/copy.d.ts   |  3 --
 .../runtime/lib/{is-equal.js => is-equal.ts}  | 10 +++--
 .../runtime/lib/mixins/action_handler.d.ts    |  2 +-
 .../runtime/lib/mixins/comparable.d.ts        |  8 ++++
 .../runtime/lib/mixins/evented.d.ts           |  2 +-
 .../runtime/lib/{type-of.js => type-of.ts}    | 22 ++++++++--
 .../-internals/runtime/types/mixin.d.ts       |  3 --
 .../@ember/utils/type-tests/compare.test.ts   |  8 ++++
 .../@ember/utils/type-tests/is-blank.test.ts  | 17 +++++++
 .../@ember/utils/type-tests/is-empty.test.ts  | 19 ++++++++
 .../@ember/utils/type-tests/is-equal.test.ts  | 21 +++++++++
 .../@ember/utils/type-tests/is-none.test.ts   | 17 +++++++
 .../utils/type-tests/is-present.test.ts       | 28 ++++++++++++
 .../@ember/utils/type-tests/type-of.test.ts   | 44 +++++++++++++++++++
 20 files changed, 239 insertions(+), 42 deletions(-)
 rename packages/@ember/-internals/runtime/lib/{compare.js => compare.ts} (71%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/copy.d.ts
 rename packages/@ember/-internals/runtime/lib/{is-equal.js => is-equal.ts} (86%)
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts
 rename packages/@ember/-internals/runtime/lib/{type-of.js => type-of.ts} (92%)
 delete mode 100644 packages/@ember/-internals/runtime/types/mixin.d.ts
 create mode 100644 packages/@ember/utils/type-tests/compare.test.ts
 create mode 100644 packages/@ember/utils/type-tests/is-blank.test.ts
 create mode 100644 packages/@ember/utils/type-tests/is-empty.test.ts
 create mode 100644 packages/@ember/utils/type-tests/is-equal.test.ts
 create mode 100644 packages/@ember/utils/type-tests/is-none.test.ts
 create mode 100644 packages/@ember/utils/type-tests/is-present.test.ts
 create mode 100644 packages/@ember/utils/type-tests/type-of.test.ts

diff --git a/packages/@ember/-internals/metal/lib/is_blank.ts b/packages/@ember/-internals/metal/lib/is_blank.ts
index ee666ef1ff6..2caef0a9043 100644
--- a/packages/@ember/-internals/metal/lib/is_blank.ts
+++ b/packages/@ember/-internals/metal/lib/is_blank.ts
@@ -8,7 +8,6 @@ import isEmpty from './is_empty';
   ```javascript
   import { isBlank } from '@ember/utils';
 
-  isBlank();                // true
   isBlank(null);            // true
   isBlank(undefined);       // true
   isBlank('');              // true
@@ -29,6 +28,6 @@ import isEmpty from './is_empty';
   @since 1.5.0
   @public
 */
-export default function isBlank(obj: any): boolean {
+export default function isBlank(obj: unknown): boolean {
   return isEmpty(obj) || (typeof obj === 'string' && /\S/.test(obj) === false);
 }
diff --git a/packages/@ember/-internals/metal/lib/is_empty.ts b/packages/@ember/-internals/metal/lib/is_empty.ts
index 5339ac8cd84..c9227858130 100644
--- a/packages/@ember/-internals/metal/lib/is_empty.ts
+++ b/packages/@ember/-internals/metal/lib/is_empty.ts
@@ -1,4 +1,4 @@
-import { get } from './property_get';
+import { get, MaybeHasUnknownProperty } from './property_get';
 /**
  @module @ember/utils
 */
@@ -13,7 +13,6 @@ import { get } from './property_get';
   to check emptiness.
 
   ```javascript
-  isEmpty();                 // true
   isEmpty(null);             // true
   isEmpty(undefined);        // true
   isEmpty('');               // true
@@ -35,33 +34,40 @@ import { get } from './property_get';
   @return {Boolean}
   @public
 */
-export default function isEmpty(obj: any): boolean {
-  let none = obj === null || obj === undefined;
-  if (none) {
-    return none;
+export default function isEmpty(obj: unknown): boolean {
+  if (obj === null || obj === undefined) {
+    return true;
   }
 
-  if (typeof obj.unknownProperty !== 'function' && typeof obj.size === 'number') {
-    return !obj.size;
+  if (
+    typeof (obj as MaybeHasUnknownProperty).unknownProperty !== 'function' &&
+    typeof (obj as HasSize).size === 'number'
+  ) {
+    return !(obj as HasSize).size;
   }
 
-  let objectType = typeof obj;
-
-  if (objectType === 'object') {
+  if (typeof obj === 'object') {
     let size = get(obj, 'size');
     if (typeof size === 'number') {
       return !size;
     }
-
     let length = get(obj, 'length');
     if (typeof length === 'number') {
       return !length;
     }
   }
 
-  if (typeof obj.length === 'number' && objectType !== 'function') {
-    return !obj.length;
+  if (typeof (obj as HasLength).length === 'number' && typeof obj !== 'function') {
+    return !(obj as HasLength).length;
   }
 
   return false;
 }
+
+interface HasSize {
+  size: number;
+}
+
+interface HasLength {
+  length: number;
+}
diff --git a/packages/@ember/-internals/metal/lib/is_none.ts b/packages/@ember/-internals/metal/lib/is_none.ts
index 99fa853fde8..2b29252a21b 100644
--- a/packages/@ember/-internals/metal/lib/is_none.ts
+++ b/packages/@ember/-internals/metal/lib/is_none.ts
@@ -7,7 +7,6 @@
   confusing.
 
   ```javascript
-  isNone();              // true
   isNone(null);          // true
   isNone(undefined);     // true
   isNone('');            // false
diff --git a/packages/@ember/-internals/metal/lib/is_present.ts b/packages/@ember/-internals/metal/lib/is_present.ts
index d80d3672d3c..7b4d6f758c2 100644
--- a/packages/@ember/-internals/metal/lib/is_present.ts
+++ b/packages/@ember/-internals/metal/lib/is_present.ts
@@ -6,7 +6,6 @@ import isBlank from './is_blank';
   A value is present if it not `isBlank`.
 
   ```javascript
-  isPresent();                // false
   isPresent(null);            // false
   isPresent(undefined);       // false
   isPresent('');              // false
@@ -32,6 +31,6 @@ import isBlank from './is_blank';
   @since 1.8.0
   @public
 */
-export default function isPresent(obj: object): boolean {
+export default function isPresent<T>(obj: T): obj is Exclude<T, null | undefined> {
   return !isBlank(obj);
 }
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index e92033bd3b2..b8abcc10c99 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -23,7 +23,7 @@ if (DEBUG) {
   };
 }
 
-interface MaybeHasUnknownProperty {
+export interface MaybeHasUnknownProperty {
   unknownProperty?: (keyName: string) => any;
 }
 
diff --git a/packages/@ember/-internals/runtime/lib/compare.js b/packages/@ember/-internals/runtime/lib/compare.ts
similarity index 71%
rename from packages/@ember/-internals/runtime/lib/compare.js
rename to packages/@ember/-internals/runtime/lib/compare.ts
index dc70eba4c09..813d521c49f 100644
--- a/packages/@ember/-internals/runtime/lib/compare.js
+++ b/packages/@ember/-internals/runtime/lib/compare.ts
@@ -1,5 +1,6 @@
 import { typeOf } from './type-of';
 import Comparable from './mixins/comparable';
+import { assert } from '@ember/debug';
 
 const TYPE_ORDER = {
   undefined: 0,
@@ -15,6 +16,8 @@ const TYPE_ORDER = {
   date: 10,
 };
 
+type Compare = -1 | 0 | 1;
+
 //
 // the spaceship operator
 //
@@ -32,9 +35,10 @@ const TYPE_ORDER = {
 //                                |       `._    `.    \
 //                                `._________`-.   `.   `.___
 //                                              SSt  `------'`
-function spaceship(a, b) {
+function spaceship(a: number, b: number): Compare {
   let diff = a - b;
-  return (diff > 0) - (diff < 0);
+  // SAFETY: It will be one of the known values
+  return (Number(diff > 0) - Number(diff < 0)) as Compare;
 }
 
 /**
@@ -87,7 +91,7 @@ function spaceship(a, b) {
  @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
  @public
 */
-export default function compare(v, w) {
+export default function compare(v: unknown, w: unknown): Compare {
   if (v === w) {
     return 0;
   }
@@ -95,12 +99,13 @@ export default function compare(v, w) {
   let type1 = typeOf(v);
   let type2 = typeOf(w);
 
-  if (type1 === 'instance' && Comparable.detect(v) && v.constructor.compare) {
+  if (type1 === 'instance' && isComparable(v) && v.constructor.compare) {
     return v.constructor.compare(v, w);
   }
 
-  if (type2 === 'instance' && Comparable.detect(w) && w.constructor.compare) {
-    return w.constructor.compare(w, v) * -1;
+  if (type2 === 'instance' && isComparable(w) && w.constructor.compare) {
+    // SAFETY: Multiplying by a negative just changes the sign
+    return (w.constructor.compare(w, v) * -1) as Compare;
   }
 
   let res = spaceship(TYPE_ORDER[type1], TYPE_ORDER[type2]);
@@ -112,13 +117,17 @@ export default function compare(v, w) {
   // types are equal - so we have to check values now
   switch (type1) {
     case 'boolean':
+      assert('both are boolean', typeof v === 'boolean' && typeof w === 'boolean');
+      return spaceship(Number(v), Number(w));
     case 'number':
+      assert('both are numbers', typeof v === 'number' && typeof w === 'number');
       return spaceship(v, w);
-
     case 'string':
+      assert('both are strings', typeof v === 'string' && typeof w === 'string');
       return spaceship(v.localeCompare(w), 0);
 
     case 'array': {
+      assert('both are arrays', Array.isArray(v) && Array.isArray(w));
       let vLen = v.length;
       let wLen = w.length;
       let len = Math.min(vLen, wLen);
@@ -135,15 +144,24 @@ export default function compare(v, w) {
       return spaceship(vLen, wLen);
     }
     case 'instance':
-      if (Comparable.detect(v)) {
+      if (isComparable(v) && v.compare) {
         return v.compare(v, w);
       }
       return 0;
 
     case 'date':
+      assert('both are dates', v instanceof Date && w instanceof Date);
       return spaceship(v.getTime(), w.getTime());
 
     default:
       return 0;
   }
 }
+
+interface ComparableConstructor {
+  constructor: Comparable;
+}
+
+function isComparable(value: unknown): value is Comparable & ComparableConstructor {
+  return Comparable.detect(value);
+}
diff --git a/packages/@ember/-internals/runtime/lib/copy.d.ts b/packages/@ember/-internals/runtime/lib/copy.d.ts
deleted file mode 100644
index 610262eb251..00000000000
--- a/packages/@ember/-internals/runtime/lib/copy.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare function copy<T>(obj: T, deep: true): T;
-declare function copy(obj: any, deep?: boolean): any;
-export default copy;
diff --git a/packages/@ember/-internals/runtime/lib/is-equal.js b/packages/@ember/-internals/runtime/lib/is-equal.ts
similarity index 86%
rename from packages/@ember/-internals/runtime/lib/is-equal.js
rename to packages/@ember/-internals/runtime/lib/is-equal.ts
index afebf55990d..41bddd71378 100644
--- a/packages/@ember/-internals/runtime/lib/is-equal.js
+++ b/packages/@ember/-internals/runtime/lib/is-equal.ts
@@ -47,9 +47,9 @@
   @return {Boolean}
   @public
 */
-export default function isEqual(a, b) {
-  if (a && typeof a.isEqual === 'function') {
-    return a.isEqual(b);
+export default function isEqual(a: unknown, b: unknown): boolean {
+  if (a && typeof (a as IsEqual).isEqual === 'function') {
+    return (a as IsEqual).isEqual(b);
   }
 
   if (a instanceof Date && b instanceof Date) {
@@ -58,3 +58,7 @@ export default function isEqual(a, b) {
 
   return a === b;
 }
+
+interface IsEqual {
+  isEqual(val: unknown): boolean;
+}
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
index 5a09e39d957..07e4a62c7d0 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
@@ -1,3 +1,3 @@
-import Mixin from '../../types/mixin';
+import { Mixin } from '@ember/-internals/metal';
 
 export default class ActionHandler extends Mixin {}
diff --git a/packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts
new file mode 100644
index 00000000000..6cb017e9802
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts
@@ -0,0 +1,8 @@
+import { Mixin } from '@ember/-internals/metal';
+
+interface Comparable {
+  compare: ((a: unknown, b: unknown) => -1 | 0 | 1) | null;
+}
+declare const Comparable: Mixin;
+
+export default Comparable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
index 7bf3d4485fa..5d0bb160322 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
@@ -1,4 +1,4 @@
-import Mixin from '../../types/mixin';
+import { Mixin } from '@ember/-internals/metal';
 
 /**
  * This mixin allows for Ember objects to subscribe to and emit events.
diff --git a/packages/@ember/-internals/runtime/lib/type-of.js b/packages/@ember/-internals/runtime/lib/type-of.ts
similarity index 92%
rename from packages/@ember/-internals/runtime/lib/type-of.js
rename to packages/@ember/-internals/runtime/lib/type-of.ts
index 4fd77f74760..0f39f4888d2 100644
--- a/packages/@ember/-internals/runtime/lib/type-of.js
+++ b/packages/@ember/-internals/runtime/lib/type-of.ts
@@ -1,9 +1,25 @@
 import CoreObject from './system/core_object';
 
+type TypeName =
+  | 'undefined'
+  | 'null'
+  | 'string'
+  | 'number'
+  | 'boolean'
+  | 'function'
+  | 'array'
+  | 'regexp'
+  | 'date'
+  | 'filelist'
+  | 'class'
+  | 'instance'
+  | 'error'
+  | 'object';
+
 // ........................................
 // TYPING & ARRAY MESSAGING
 //
-const TYPE_MAP = {
+const TYPE_MAP: Record<string, TypeName> = {
   '[object Boolean]': 'boolean',
   '[object Number]': 'number',
   '[object String]': 'string',
@@ -14,7 +30,7 @@ const TYPE_MAP = {
   '[object RegExp]': 'regexp',
   '[object Object]': 'object',
   '[object FileList]': 'filelist',
-};
+} as const;
 
 const { toString } = Object.prototype;
 
@@ -82,7 +98,7 @@ const { toString } = Object.prototype;
   @public
   @static
 */
-export function typeOf(item) {
+export function typeOf(item: unknown): TypeName {
   if (item === null) {
     return 'null';
   }
diff --git a/packages/@ember/-internals/runtime/types/mixin.d.ts b/packages/@ember/-internals/runtime/types/mixin.d.ts
deleted file mode 100644
index abe42379680..00000000000
--- a/packages/@ember/-internals/runtime/types/mixin.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Mixin } from '../../metal/lib/mixin';
-
-export default Mixin;
diff --git a/packages/@ember/utils/type-tests/compare.test.ts b/packages/@ember/utils/type-tests/compare.test.ts
new file mode 100644
index 00000000000..5836b65d75c
--- /dev/null
+++ b/packages/@ember/utils/type-tests/compare.test.ts
@@ -0,0 +1,8 @@
+import { compare } from '@ember/utils';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(compare('hello', 'hello')).toEqualTypeOf<-1 | 0 | 1>(); // 0
+compare('abc', 'dfg'); // -1
+compare(2, 1); // 1
+compare('hello', 50); // 1
+compare(50, 'hello'); // -1
diff --git a/packages/@ember/utils/type-tests/is-blank.test.ts b/packages/@ember/utils/type-tests/is-blank.test.ts
new file mode 100644
index 00000000000..9f8af277821
--- /dev/null
+++ b/packages/@ember/utils/type-tests/is-blank.test.ts
@@ -0,0 +1,17 @@
+import { isBlank } from '@ember/utils';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(isBlank(null)).toEqualTypeOf<boolean>(); // true
+
+isBlank(undefined); // true
+isBlank(''); // true
+isBlank([]); // true
+isBlank('\n\t'); // true
+isBlank('  '); // true
+isBlank({}); // false
+isBlank('\n\t Hello'); // false
+isBlank('Hello world'); // false
+isBlank([1, 2, 3]); // false
+
+// @ts-expect-error requires an argument
+isBlank();
diff --git a/packages/@ember/utils/type-tests/is-empty.test.ts b/packages/@ember/utils/type-tests/is-empty.test.ts
new file mode 100644
index 00000000000..a8d0549e203
--- /dev/null
+++ b/packages/@ember/utils/type-tests/is-empty.test.ts
@@ -0,0 +1,19 @@
+import { isEmpty } from '@ember/utils';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(isEmpty(null)).toEqualTypeOf<boolean>(); // true
+
+isEmpty(undefined); // true
+isEmpty(''); // true
+isEmpty([]); // true
+isEmpty({ size: 0 }); // true
+isEmpty({}); // false
+isEmpty('Adam Hawkins'); // false
+isEmpty([0, 1, 2]); // false
+isEmpty('\n\t'); // false
+isEmpty('  '); // false
+isEmpty({ size: 1 }); // false
+isEmpty({ size: () => 0 }); // false
+
+// @ts-expect-error requires an argument
+isEmpty();
diff --git a/packages/@ember/utils/type-tests/is-equal.test.ts b/packages/@ember/utils/type-tests/is-equal.test.ts
new file mode 100644
index 00000000000..34f7510c177
--- /dev/null
+++ b/packages/@ember/utils/type-tests/is-equal.test.ts
@@ -0,0 +1,21 @@
+import { isEqual } from '@ember/utils';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(isEqual('hello', 'hello')).toEqualTypeOf<boolean>(); // true
+
+isEqual(1, 2); // false
+
+class Person {
+  constructor(public ssn: string) {}
+
+  isEqual(other: Person) {
+    return this.ssn == other.ssn;
+  }
+}
+
+let personA = new Person('123-45-6789');
+let personB = new Person('123-45-6789');
+
+isEqual(personA, personB); // true
+
+isEqual([4, 2], [4, 2]); // false
diff --git a/packages/@ember/utils/type-tests/is-none.test.ts b/packages/@ember/utils/type-tests/is-none.test.ts
new file mode 100644
index 00000000000..df1be5db731
--- /dev/null
+++ b/packages/@ember/utils/type-tests/is-none.test.ts
@@ -0,0 +1,17 @@
+import { isNone } from '@ember/utils';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(isNone(null)).toEqualTypeOf<boolean>(); // true
+isNone(undefined); // true
+isNone(''); // false
+isNone([]); // false
+isNone(function () {}); // false
+
+// It functions as a type guard
+let foo: unknown;
+if (isNone(foo)) {
+  expectTypeOf(foo).toEqualTypeOf<null | undefined>();
+}
+
+// @ts-expect-error argument is required
+isNone(); // true
diff --git a/packages/@ember/utils/type-tests/is-present.test.ts b/packages/@ember/utils/type-tests/is-present.test.ts
new file mode 100644
index 00000000000..489b9491c9c
--- /dev/null
+++ b/packages/@ember/utils/type-tests/is-present.test.ts
@@ -0,0 +1,28 @@
+import { isPresent } from '@ember/utils';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(isPresent(null)).toEqualTypeOf<boolean>(); // false
+
+isPresent(undefined); // false
+isPresent(''); // false
+isPresent('  '); // false
+isPresent('\n\t'); // false
+isPresent([]); // false
+isPresent({ length: 0 }); // false
+isPresent(false); // true
+isPresent(true); // true
+isPresent('string'); // true
+isPresent(0); // true
+isPresent(function () {}); // true
+isPresent({}); // true
+isPresent('\n\t Hello'); // true
+isPresent([1, 2, 3]); // true
+
+// It functions as a type guard
+let foo: string | null | undefined;
+if (isPresent(foo)) {
+  expectTypeOf(foo).toEqualTypeOf<string>();
+}
+
+// @ts-expect-error it requires an argument
+isPresent(); // false
diff --git a/packages/@ember/utils/type-tests/type-of.test.ts b/packages/@ember/utils/type-tests/type-of.test.ts
new file mode 100644
index 00000000000..2313bcfd8ef
--- /dev/null
+++ b/packages/@ember/utils/type-tests/type-of.test.ts
@@ -0,0 +1,44 @@
+/* eslint-disable no-new-wrappers */
+
+import { typeOf } from '@ember/utils';
+import { A } from '@ember/array';
+import EmberObject from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(typeOf(null)).toEqualTypeOf<
+  | 'undefined'
+  | 'null'
+  | 'string'
+  | 'number'
+  | 'boolean'
+  | 'function'
+  | 'array'
+  | 'regexp'
+  | 'date'
+  | 'filelist'
+  | 'class'
+  | 'instance'
+  | 'error'
+  | 'object'
+>();
+
+typeOf(undefined); // 'undefined'
+typeOf('michael'); // 'string'
+typeOf(new String('michael')); // 'string'
+typeOf(101); // 'number'
+typeOf(new Number(101)); // 'number'
+typeOf(true); // 'boolean'
+typeOf(new Boolean(true)); // 'boolean'
+typeOf(A); // 'function'
+typeOf(A()); // 'array'
+typeOf([1, 2, 90]); // 'array'
+typeOf(/abc/); // 'regexp'
+typeOf(new Date()); // 'date'
+typeOf((({} as Event).target as HTMLInputElement).files); // 'filelist'
+typeOf(EmberObject.extend()); // 'class'
+typeOf(EmberObject.create()); // 'instance'
+typeOf(new Error('teamocil')); // 'error'
+typeOf({ a: 'b' }); // 'object'
+
+// @ts-expect-error it requires an argument
+typeOf();

From aa8c53aa45aa7d2e7badfee1207d9dd4f4196fc2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Feb 2022 11:20:51 -0800
Subject: [PATCH 0877/1405] Add type-tests for @ember/version

---
 packages/@ember/version/type-tests/index.test.ts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/@ember/version/type-tests/index.test.ts

diff --git a/packages/@ember/version/type-tests/index.test.ts b/packages/@ember/version/type-tests/index.test.ts
new file mode 100644
index 00000000000..ba5efac4aaa
--- /dev/null
+++ b/packages/@ember/version/type-tests/index.test.ts
@@ -0,0 +1,4 @@
+import { VERSION } from '@ember/version';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(VERSION).toEqualTypeOf<string>();

From 7c75b281a5ce651c21277bf9011d276f40e50581 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Feb 2022 12:05:08 -0800
Subject: [PATCH 0878/1405] Clean up and add type tests for @ember/debug

---
 packages/@ember/debug/lib/deprecate.ts        |  4 +-
 packages/@ember/debug/lib/handlers.ts         | 31 ++++++---
 packages/@ember/debug/lib/warn.ts             |  2 +-
 packages/@ember/debug/tests/main_test.js      | 33 +++++-----
 .../@ember/debug/type-tests/assert.test.ts    | 18 ++++++
 .../@ember/debug/type-tests/debug.test.ts     |  7 +++
 .../@ember/debug/type-tests/deprecate.test.ts | 63 +++++++++++++++++++
 .../register-deprecation-handler.test.ts      | 18 ++++++
 .../type-tests/register-warn-handler.test.ts  | 18 ++++++
 .../debug/type-tests/run-in-debug.test.ts     | 10 +++
 packages/@ember/debug/type-tests/warn.test.ts | 16 +++++
 packages/ember/index.js                       |  1 +
 12 files changed, 195 insertions(+), 26 deletions(-)
 create mode 100644 packages/@ember/debug/type-tests/assert.test.ts
 create mode 100644 packages/@ember/debug/type-tests/debug.test.ts
 create mode 100644 packages/@ember/debug/type-tests/deprecate.test.ts
 create mode 100644 packages/@ember/debug/type-tests/register-deprecation-handler.test.ts
 create mode 100644 packages/@ember/debug/type-tests/register-warn-handler.test.ts
 create mode 100644 packages/@ember/debug/type-tests/run-in-debug.test.ts
 create mode 100644 packages/@ember/debug/type-tests/warn.test.ts

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 66e0e77215b..45d79281587 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -71,14 +71,14 @@ export type MissingOptionDeprecateFunc = (id: string, missingOption: string) =>
   @param handler {Function} A function to handle deprecation calls.
   @since 2.1.0
 */
-let registerHandler: (handler: HandlerCallback) => void = () => {};
+let registerHandler: (handler: HandlerCallback<DeprecationOptions>) => void = () => {};
 let missingOptionsDeprecation: string;
 let missingOptionsIdDeprecation: string;
 let missingOptionDeprecation: MissingOptionDeprecateFunc = () => '';
 let deprecate: DeprecateFunc = () => {};
 
 if (DEBUG) {
-  registerHandler = function registerHandler(handler: HandlerCallback): void {
+  registerHandler = function registerHandler(handler: HandlerCallback<DeprecationOptions>): void {
     genericRegisterHandler('deprecate', handler);
   };
 
diff --git a/packages/@ember/debug/lib/handlers.ts b/packages/@ember/debug/lib/handlers.ts
index 1cf86cf43f3..a7df6c3979a 100644
--- a/packages/@ember/debug/lib/handlers.ts
+++ b/packages/@ember/debug/lib/handlers.ts
@@ -1,28 +1,41 @@
 import { DEBUG } from '@glimmer/env';
 
 export type Options = object;
-export type Handler = (message: string, options?: Options) => void;
-export type HandlerCallback = (message: string, options: any, nextHandler: Handler) => void;
+export type Handler<O extends Options> = (message: string, options?: O) => void;
+export type HandlerCallback<O extends Options> = (
+  message: string,
+  options: O | undefined,
+  nextHandler: Handler<O>
+) => void;
 
 export interface Handlers {
-  [key: string]: Handler;
+  [key: string]: Handler<Options>;
 }
 
 export let HANDLERS: Handlers = {};
 
-export type RegisterHandlerFunc = (type: string, callback: HandlerCallback) => void;
+export type RegisterHandlerFunc<O extends Options> = (
+  type: string,
+  callback: HandlerCallback<O>
+) => void;
 export type InvokeFunc = (type: string, message: string, test?: boolean, options?: Options) => void;
 
-let registerHandler: RegisterHandlerFunc = () => {};
+let registerHandler = function registerHandler<O extends Options>(
+  _type: string,
+  _callback: HandlerCallback<O>
+) {};
 let invoke: InvokeFunc = () => {};
 
 if (DEBUG) {
-  registerHandler = function registerHandler(type, callback) {
-    let nextHandler = HANDLERS[type] || (() => {});
+  registerHandler = function registerHandler<O extends Options>(
+    type: string,
+    callback: HandlerCallback<O>
+  ): void {
+    let nextHandler: Handler<O> = HANDLERS[type] || (() => {});
 
-    HANDLERS[type] = (message, options) => {
+    HANDLERS[type] = ((message: string, options?: O) => {
       callback(message, options, nextHandler);
-    };
+    }) as Handler<Options>;
   };
 
   invoke = function invoke(type, message, test, options) {
diff --git a/packages/@ember/debug/lib/warn.ts b/packages/@ember/debug/lib/warn.ts
index fcadf0e64ad..9ef2f7c1eea 100644
--- a/packages/@ember/debug/lib/warn.ts
+++ b/packages/@ember/debug/lib/warn.ts
@@ -7,7 +7,7 @@ export interface WarnOptions {
   id: string;
 }
 
-export type RegisterHandlerFunc = (handler: HandlerCallback) => void;
+export type RegisterHandlerFunc = (handler: HandlerCallback<WarnOptions>) => void;
 export type WarnFunc = (message: string, test?: boolean, options?: WarnOptions) => void;
 
 let registerHandler: RegisterHandlerFunc = () => {};
diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 8e476f2bab3..74c485c0555 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -59,7 +59,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         });
         assert.ok(true, 'deprecate did not throw');
       } catch (e) {
@@ -80,7 +80,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         });
         assert.ok(true, 'deprecate did not throw');
       } catch (e) {
@@ -94,7 +94,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         });
       }, /Should throw/);
     }
@@ -116,7 +116,7 @@ moduleFor(
           id: 'my-deprecation',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         });
         assert.ok(true, 'Did not throw when level is set by id');
       } catch (e) {
@@ -128,7 +128,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         });
       }, /Should throw with no matching id/);
 
@@ -137,7 +137,7 @@ moduleFor(
           id: 'other-id',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         });
       }, /Should throw with non-matching id/);
     }
@@ -150,7 +150,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         })
       );
       assert.throws(() =>
@@ -158,7 +158,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         })
       );
       assert.throws(() =>
@@ -166,7 +166,7 @@ moduleFor(
           id: 'test',
           until: 'forever',
           for: 'me',
-          since: { enabled: '1.0.0' },
+          since: { available: '1.0.0', enabled: '1.0.0' },
         })
       );
     }
@@ -179,7 +179,7 @@ moduleFor(
         function () {
           assert.ok(false, 'this function should not be invoked');
         },
-        { id: 'test', until: 'forever', for: 'me', since: { enabled: '1.0.0' } }
+        { id: 'test', until: 'forever', for: 'me', since: { available: '1.0.0', enabled: '1.0.0' } }
       );
 
       assert.ok(true, 'deprecations were not thrown');
@@ -192,19 +192,19 @@ moduleFor(
         id: 'test',
         until: 'forever',
         for: 'me',
-        since: { enabled: '1.0.0' },
+        since: { available: '1.0.0', enabled: '1.0.0' },
       });
       deprecate('Deprecation is thrown', '1', {
         id: 'test',
         until: 'forever',
         for: 'me',
-        since: { enabled: '1.0.0' },
+        since: { available: '1.0.0', enabled: '1.0.0' },
       });
       deprecate('Deprecation is thrown', 1, {
         id: 'test',
         until: 'forever',
         for: 'me',
-        since: { enabled: '1.0.0' },
+        since: { available: '1.0.0', enabled: '1.0.0' },
       });
 
       assert.ok(true, 'deprecations were not thrown');
@@ -316,7 +316,12 @@ moduleFor(
       assert.expect(1);
 
       assert.throws(
-        () => deprecate('foo', false, { until: 'forever', for: 'me', since: { enabled: '1.0.0' } }),
+        () =>
+          deprecate('foo', false, {
+            until: 'forever',
+            for: 'me',
+            since: { available: '1.0.0', enabled: '1.0.0' },
+          }),
         new RegExp(missingOptionsIdDeprecation),
         'proper assertion is triggered when options.id is missing'
       );
diff --git a/packages/@ember/debug/type-tests/assert.test.ts b/packages/@ember/debug/type-tests/assert.test.ts
new file mode 100644
index 00000000000..ed26bd456f7
--- /dev/null
+++ b/packages/@ember/debug/type-tests/assert.test.ts
@@ -0,0 +1,18 @@
+import { assert } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+
+let str: unknown;
+assert('Must pass a string', typeof str === 'string');
+
+// Fail unconditionally
+assert('This code path should never be run');
+
+expectTypeOf(assert('foo')).toEqualTypeOf<void>();
+
+// @ts-expect-error inverted order
+assert(typeof str === 'string', 'Must pass a string');
+
+// Functions as a type guard
+let otherStr: unknown;
+assert('Must pass a string', typeof otherStr === 'string');
+expectTypeOf(otherStr).toEqualTypeOf<string>();
diff --git a/packages/@ember/debug/type-tests/debug.test.ts b/packages/@ember/debug/type-tests/debug.test.ts
new file mode 100644
index 00000000000..8d9b424e886
--- /dev/null
+++ b/packages/@ember/debug/type-tests/debug.test.ts
@@ -0,0 +1,7 @@
+import { debug } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(debug("I'm a debug notice!")).toEqualTypeOf<void>();
+
+// @ts-expect-error requires a string
+debug(1);
diff --git a/packages/@ember/debug/type-tests/deprecate.test.ts b/packages/@ember/debug/type-tests/deprecate.test.ts
new file mode 100644
index 00000000000..efa6917a971
--- /dev/null
+++ b/packages/@ember/debug/type-tests/deprecate.test.ts
@@ -0,0 +1,63 @@
+import { deprecate } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+
+let str: unknown;
+deprecate('Must pass a string', typeof str === 'string');
+
+// Always deprecated
+deprecate('This code path should never be run');
+
+expectTypeOf(deprecate('foo')).toEqualTypeOf<void>();
+
+deprecate('foo', true, {
+  id: 'foo',
+  until: '5.0.0',
+  url: 'http://example.com/deprecation',
+  for: 'my-module',
+  since: { available: '1.0.0', enabled: '1.0.0' },
+});
+
+deprecate('foo', true, {
+  id: 'foo',
+  until: '5.0.0',
+  for: 'my-module',
+  since: { available: '1.0.0', enabled: '1.0.0' },
+});
+
+deprecate('foo', true, {
+  id: 'foo',
+  until: '5.0.0',
+  for: 'my-module',
+  since: { available: '1.0.0' },
+});
+
+// @ts-expect-error requires id
+deprecate('foo', true, {
+  until: '5.0.0',
+  for: 'my-module',
+  since: { available: '1.0.0', enabled: '1.0.0' },
+});
+
+// @ts-expect-error requires until
+deprecate('foo', true, {
+  id: 'foo',
+  for: 'my-module',
+  since: { available: '1.0.0', enabled: '1.0.0' },
+});
+
+// @ts-expect-error requires for
+deprecate('foo', true, {
+  id: 'foo',
+  until: '5.0.0',
+  since: { available: '1.0.0', enabled: '1.0.0' },
+});
+
+// @ts-expect-error requires since
+deprecate('foo', true, {
+  id: 'foo',
+  until: '5.0.0',
+  for: 'my-module',
+});
+
+// @ts-expect-error inverted order
+deprecate(typeof str === 'string', 'Must pass a string');
diff --git a/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts b/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts
new file mode 100644
index 00000000000..f56f9090f48
--- /dev/null
+++ b/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts
@@ -0,0 +1,18 @@
+import { registerDeprecationHandler } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+import { DeprecationOptions } from '../lib/deprecate';
+import { Handler } from '../lib/handlers';
+
+let ret = registerDeprecationHandler((message, options, next) => {
+  expectTypeOf(message).toEqualTypeOf<string>();
+  expectTypeOf(options).toEqualTypeOf<DeprecationOptions | undefined>();
+  expectTypeOf(next).toEqualTypeOf<Handler<DeprecationOptions>>();
+
+  if (message.indexOf('should') !== -1) {
+    throw new Error(`Deprecation message with should: ${message}`);
+  } else {
+    // defer to whatever handler was registered before this one
+    next(message, options);
+  }
+});
+expectTypeOf(ret).toEqualTypeOf<void>();
diff --git a/packages/@ember/debug/type-tests/register-warn-handler.test.ts b/packages/@ember/debug/type-tests/register-warn-handler.test.ts
new file mode 100644
index 00000000000..4faf33ff7ff
--- /dev/null
+++ b/packages/@ember/debug/type-tests/register-warn-handler.test.ts
@@ -0,0 +1,18 @@
+import { registerWarnHandler } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+import { Handler } from '../lib/handlers';
+import { WarnOptions } from '../lib/warn';
+
+let ret = registerWarnHandler((message, options, next) => {
+  expectTypeOf(message).toEqualTypeOf<string>();
+  expectTypeOf(options).toEqualTypeOf<WarnOptions | undefined>();
+  expectTypeOf(next).toEqualTypeOf<Handler<WarnOptions>>();
+
+  if (message.indexOf('should') !== -1) {
+    throw new Error(`Warn message with should: ${message}`);
+  } else {
+    // defer to whatever handler was registered before this one
+    next(message, options);
+  }
+});
+expectTypeOf(ret).toEqualTypeOf<void>();
diff --git a/packages/@ember/debug/type-tests/run-in-debug.test.ts b/packages/@ember/debug/type-tests/run-in-debug.test.ts
new file mode 100644
index 00000000000..040bdd58228
--- /dev/null
+++ b/packages/@ember/debug/type-tests/run-in-debug.test.ts
@@ -0,0 +1,10 @@
+import { runInDebug } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+
+let ret = runInDebug(() => {
+  // Do expensive thing
+});
+expectTypeOf(ret).toEqualTypeOf<void>();
+
+// @ts-expect-error no arguments to callbacks
+runInDebug((_foo: boolean) => {});
diff --git a/packages/@ember/debug/type-tests/warn.test.ts b/packages/@ember/debug/type-tests/warn.test.ts
new file mode 100644
index 00000000000..2b6508e0195
--- /dev/null
+++ b/packages/@ember/debug/type-tests/warn.test.ts
@@ -0,0 +1,16 @@
+import { warn } from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+
+let foo = true;
+let ret = warn('Too much foo!', foo, {
+  id: 'ember-debug.too-much-foo',
+});
+expectTypeOf(ret).toEqualTypeOf<void>();
+
+warn('No options');
+
+// @ts-expect-error Invalid condition
+warn('Invalid condition', { id: 1 });
+
+// @ts-expect-error Invalid options
+warn('Invalid options', true, { id: 1 });
diff --git a/packages/ember/index.js b/packages/ember/index.js
index b88304e57db..98e2b6b3593 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -436,6 +436,7 @@ const deprecateImportFromString = function (
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {
+      available: '3.25',
       enabled: '3.25',
     },
     until: '4.0.0',

From c2ef5bee3ec3eab20417fc38f9a3f8587b6ad9e3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Feb 2022 12:07:35 -0800
Subject: [PATCH 0879/1405] Properly exclude type-tests from build

---
 ember-cli-build.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ember-cli-build.js b/ember-cli-build.js
index 5c92e7a6152..759cb39c434 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -232,6 +232,8 @@ function templateCompilerBundle(emberPackages, transpileTree) {
           '@ember/-internals/*/tests/**' /* internal packages */,
           '*/*/tests/**' /* scoped packages */,
           '*/tests/**' /* packages */,
+          '*/*/type-tests/**' /* scoped packages */,
+          '*/type-tests/**' /* packages */,
         ],
       }),
       templateCompilerDependencies(),

From 494943376301fe460c9d23ca84be3baaa51e9f19 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Feb 2022 16:46:35 -0800
Subject: [PATCH 0880/1405] More runloop TS and type-tests

---
 .../-internals/glimmer/lib/helpers/action.ts  |  16 +-
 .../-internals/glimmer/lib/views/outlet.ts    |   7 +-
 .../routing/lib/location/hash_location.ts     |   2 +-
 .../-internals/routing/lib/system/router.ts   |  15 +-
 .../runtime/lib/mixins/container_proxy.d.ts   |   2 +-
 .../runtime/lib/mixins/registry_proxy.d.ts    |   2 +-
 packages/@ember/runloop/index.d.ts            |  25 --
 .../@ember/runloop/{index.js => index.ts}     | 260 +++++++++++++++---
 .../runloop/type-tests.ts/begin-end.test.ts   |   7 +
 .../@ember/runloop/type-tests.ts/bind.test.ts | 138 ++++++++++
 .../runloop/type-tests.ts/cancel.test.ts      |   8 +
 .../runloop/type-tests.ts/debounce.test.ts    | 148 ++++++++++
 .../@ember/runloop/type-tests.ts/join.test.ts |  80 ++++++
 .../runloop/type-tests.ts/later.test.ts       |  88 ++++++
 .../@ember/runloop/type-tests.ts/next.test.ts |  82 ++++++
 .../@ember/runloop/type-tests.ts/once.test.ts |  82 ++++++
 .../@ember/runloop/type-tests.ts/run.test.ts  |  82 ++++++
 .../type-tests.ts/schedule-once.test.ts       |  91 ++++++
 .../runloop/type-tests.ts/schedule.test.ts    |  91 ++++++
 .../runloop/type-tests.ts/throttle.test.ts    | 148 ++++++++++
 .../lib/ember-dev/run-loop.ts                 |   1 -
 packages/internal-test-helpers/lib/run.ts     |  15 +-
 tsconfig.json                                 |   3 +-
 23 files changed, 1301 insertions(+), 92 deletions(-)
 delete mode 100644 packages/@ember/runloop/index.d.ts
 rename packages/@ember/runloop/{index.js => index.ts} (72%)
 create mode 100644 packages/@ember/runloop/type-tests.ts/begin-end.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/bind.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/cancel.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/debounce.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/join.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/later.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/next.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/once.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/run.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/schedule.test.ts
 create mode 100644 packages/@ember/runloop/type-tests.ts/throttle.test.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index b6045fce724..f75dec64867 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -362,7 +362,7 @@ function makeArgsProcessor(valuePathRef: Reference | false, actionArgsRef: Refer
 function makeDynamicClosureAction(
   context: object,
   targetRef: Reference<MaybeActionHandler>,
-  actionRef: Reference<string | Function>,
+  actionRef: Reference<string | ((...args: any[]) => any)>,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
@@ -389,34 +389,32 @@ function makeDynamicClosureAction(
 }
 
 interface MaybeActionHandler {
-  actions?: Record<string, Function>;
+  actions?: Record<string, (...args: any[]) => any>;
 }
 
 function makeClosureAction(
   context: object,
   target: MaybeActionHandler,
-  action: string | Function,
+  action: string | ((...args: any[]) => any),
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
   let self: object;
-  let fn: Function;
+  let fn: (...args: any[]) => any;
 
   assert(
     `Action passed is null or undefined in (action) from ${target}.`,
     action !== undefined && action !== null
   );
 
-  let typeofAction = typeof action;
-
-  if (typeofAction === 'string') {
+  if (typeof action === 'string') {
     self = target;
     fn = (target.actions && target.actions[action as string])!;
 
     assert(`An action named '${action}' was not found in ${target}`, Boolean(fn));
-  } else if (typeofAction === 'function') {
+  } else if (typeof action === 'function') {
     self = context;
-    fn = action as Function;
+    fn = action;
   } else {
     assert(
       `An action could not be made for \`${
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index bc6a4117c4d..1d4eadfa193 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -6,6 +6,7 @@ import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
 import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
 import { OutletDefinitionState } from '../component-managers/outlet';
+import { Renderer } from '../renderer';
 import { OutletState } from '../utils/outlet';
 
 export interface BootEnvironment {
@@ -95,9 +96,11 @@ export default class OutletView {
       target = selector;
     }
 
-    let renderer = this.owner.lookup('renderer:-dom');
+    let renderer = this.owner.lookup('renderer:-dom') as Renderer;
 
-    schedule('render', renderer, 'appendOutletView', this, target);
+    // SAFETY: It's not clear that this cast is safe.
+    // The types for appendOutletView may be incorrect or this is a potential bug.
+    schedule('render', renderer, 'appendOutletView', this, target as SimpleElement);
   }
 
   rerender(): void {
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index afcc655c9c4..3f249865134 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -130,7 +130,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
   */
   onUpdateURL(callback: UpdateCallback): void {
     this._removeEventListener();
-    this._hashchangeHandler = bind(this, function (this: HashLocation) {
+    this._hashchangeHandler = bind(this, function (this: HashLocation, _event: Event) {
       let path = this.getURL();
       if (this.lastSetURL === path) {
         return;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 39d40c624b0..5b28ad13595 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -44,6 +44,7 @@ import Router, {
   TransitionError,
   TransitionState,
 } from 'router_js';
+import type { Timer } from 'backburner';
 import { EngineRouteInfo } from './engines';
 import EngineInstance from '@ember/engine/instance';
 
@@ -199,7 +200,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
   _engineInfoByRoute = Object.create(null);
   _routerService: RouterService<R>;
 
-  _slowTransitionTimer: unknown;
+  _slowTransitionTimer: Timer | null = null;
 
   private namespace: any;
 
@@ -810,10 +811,12 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
 
     let instances = this._engineInstances;
     for (let name in instances) {
-      let instance = instances[name];
-      assert('has instance', instance);
-      for (let id in instance) {
-        run(instance[id], 'destroy');
+      let instanceMap = instances[name];
+      assert('has instanceMap', instanceMap);
+      for (let id in instanceMap) {
+        let instance = instanceMap[id];
+        assert('has instance', instance);
+        run(instance, 'destroy');
       }
     }
   }
@@ -1334,7 +1337,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     this._slowTransitionTimer = scheduleOnce(
       'routerTransitions',
       this,
-      '_handleSlowTransition',
+      this._handleSlowTransition,
       transition,
       originRoute
     );
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
index 2f9cbf8e112..74549deec9f 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
@@ -1,7 +1,7 @@
 import { Container } from '@ember/-internals/container';
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import { Mixin } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
-import Mixin from '../../types/mixin';
 
 interface ContainerProxy {
   /** @internal */
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
index 08b5901250a..8e68a3df3ac 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
@@ -1,7 +1,7 @@
 import { Registry } from '@ember/-internals/container';
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import { Mixin } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
-import Mixin from '../../types/mixin';
 
 interface RegistryProxyMixin {
   /** @internal */
diff --git a/packages/@ember/runloop/index.d.ts b/packages/@ember/runloop/index.d.ts
deleted file mode 100644
index fa5bea17840..00000000000
--- a/packages/@ember/runloop/index.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import Backburner, { DeferredActionQueues, Timer } from 'backburner.js';
-
-export const _backburner: Backburner;
-
-export const run: Backburner['run'];
-export const schedule: Backburner['schedule'];
-export const later: Backburner['later'];
-export const join: Backburner['join'];
-export const cancel: Backburner['cancel'];
-export const scheduleOnce: Backburner['scheduleOnce'];
-
-export function _getCurrentRunLoop(): DeferredActionQueues;
-
-export function once(method: Function): Timer;
-export function once<T, U extends keyof T>(target: T, method: U, ...args: any[]): Timer;
-export function once(target: unknown, method: unknown | Function, ...args: any[]): Timer;
-
-export function bind<T extends Function>(target: T): T;
-export function bind<T extends Function, U extends any[]>(
-  target: unknown,
-  method?: T,
-  ...args: U
-): T;
-export function bind<T extends any[]>(target: unknown, method?: string, ...args: T): Function;
-export function bind<T>(target: unknown, method?: T, ...args: unknown[]): T;
diff --git a/packages/@ember/runloop/index.js b/packages/@ember/runloop/index.ts
similarity index 72%
rename from packages/@ember/runloop/index.js
rename to packages/@ember/runloop/index.ts
index e91e934ee3a..ae87b46b46e 100644
--- a/packages/@ember/runloop/index.js
+++ b/packages/@ember/runloop/index.ts
@@ -1,24 +1,53 @@
 import { assert } from '@ember/debug';
 import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
-import Backburner from 'backburner';
-
-let currentRunLoop = null;
+import Backburner, { DeferredActionQueues, Timer } from 'backburner';
+
+export { Timer };
+
+// Partial types from https://medium.com/codex/currying-in-typescript-ca5226c85b85
+
+type PartialParams<P extends any[]> = P extends [infer First, ...infer Rest]
+  ? [] | [First] | [First, ...PartialParams<Rest>]
+  : // This is necessary to handle optional tuple values
+  Required<P> extends [infer First, ...infer Rest]
+  ? [] | [First | undefined] | [First | undefined, ...PartialParams<Partial<Rest>>]
+  : never;
+
+type RemainingParams<PartialParams extends any[], All extends any[]> = PartialParams extends [
+  infer First,
+  ...infer Rest
+]
+  ? All extends [infer AllFirst, ...infer AllRest]
+    ? First extends AllFirst
+      ? RemainingParams<Rest, AllRest>
+      : never
+    : // This is necessary to handle optional tuple values
+    Required<All> extends [infer AllFirst, ...infer AllRest]
+    ? First extends AllFirst | undefined
+      ? Partial<RemainingParams<Rest, AllRest>>
+      : never
+    : never
+  : PartialParams extends []
+  ? All
+  : never;
+
+let currentRunLoop: DeferredActionQueues | null = null;
 export function _getCurrentRunLoop() {
   return currentRunLoop;
 }
 
-function onBegin(current) {
+function onBegin(current: DeferredActionQueues) {
   currentRunLoop = current;
 }
 
-function onEnd(current, next) {
+function onEnd(_current: DeferredActionQueues, next: DeferredActionQueues) {
   currentRunLoop = next;
 
   flushAsyncObservers();
 }
 
-function flush(queueName, next) {
+function flush(queueName: string, next: () => void) {
   if (queueName === 'render' || queueName === _rsvpErrorQueue) {
     flushAsyncObservers();
   }
@@ -99,8 +128,20 @@ export const _backburner = new Backburner(_queues, {
   @return {Object} return value from invoking the passed function.
   @public
 */
-export function run() {
-  return _backburner.run(...arguments);
+export function run<F extends (...args: any[]) => any>(method: F, ...args: Parameters<F>): void;
+export function run<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: Parameters<F>
+): void;
+export function run<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+): void;
+export function run(...args: any[]): void {
+  // @ts-expect-error TS doesn't like our spread args
+  return _backburner.run(...args);
 }
 
 /**
@@ -147,8 +188,22 @@ export function run() {
   when called within an existing loop, no return value is possible.
   @public
 */
-export function join() {
-  return _backburner.join(...arguments);
+export function join<F extends (...args: any[]) => any>(
+  method: F,
+  ...args: Parameters<F>
+): ReturnType<F> | void;
+export function join<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: Parameters<F>
+): ReturnType<F> | void;
+export function join<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+): T[U] extends (...args: any[]) => any ? ReturnType<T[U]> | void : void;
+export function join(methodOrTarget: any, methodOrArg?: any, ...additionalArgs: any[]): any {
+  return _backburner.join(methodOrTarget, methodOrArg, ...additionalArgs);
 }
 
 /**
@@ -213,7 +268,31 @@ export function join() {
   @since 1.4.0
   @public
 */
-export const bind = (...curried) => {
+export function bind<
+  T,
+  F extends (this: T, ...args: any[]) => any,
+  A extends PartialParams<Parameters<F>>
+>(
+  target: T,
+  method: F,
+  ...args: A
+): (...args: RemainingParams<A, Parameters<F>>) => ReturnType<F> | void;
+export function bind<F extends (...args: any[]) => any, A extends PartialParams<Parameters<F>>>(
+  method: F,
+  ...args: A
+): (...args: RemainingParams<A, Parameters<F>>) => ReturnType<F> | void;
+export function bind<
+  T,
+  U extends keyof T,
+  A extends T[U] extends (...args: any[]) => any ? PartialParams<Parameters<T[U]>> : []
+>(
+  target: T,
+  method: U,
+  ...args: A
+): T[U] extends (...args: any[]) => any
+  ? (...args: RemainingParams<A, Parameters<T[U]>>) => ReturnType<T[U]> | void
+  : never;
+export function bind(...curried: any[]): any {
   assert(
     'could not find a suitable method to bind',
     (function (methodOrTarget, methodOrArg) {
@@ -226,17 +305,20 @@ export const bind = (...curried) => {
       } else if (length === 1) {
         return typeof methodOrTarget === 'function';
       } else {
-        let type = typeof methodOrArg;
         return (
-          type === 'function' || // second argument is a function
-          (methodOrTarget !== null && type === 'string' && methodOrArg in methodOrTarget) || // second argument is the name of a method in first argument
+          typeof methodOrArg === 'function' || // second argument is a function
+          (methodOrTarget !== null &&
+            typeof methodOrArg === 'string' &&
+            methodOrArg in methodOrTarget) || // second argument is the name of a method in first argument
           typeof methodOrTarget === 'function' //first argument is a function
         );
       }
+      // @ts-expect-error TS doesn't like our spread args
     })(...curried)
   );
-  return (...args) => join(...curried.concat(args));
-};
+  // @ts-expect-error TS doesn't like our spread args
+  return (...args: any[]) => join(...curried.concat(args));
+}
 
 /**
   Begins a new RunLoop. Any deferred actions invoked after the begin will
@@ -325,8 +407,26 @@ export function end() {
   @return {*} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function schedule(/* queue, target, method */) {
-  return _backburner.schedule(...arguments);
+export function schedule<F extends (...args: any[]) => any>(
+  queueName: string,
+  method: F,
+  ...args: Parameters<F>
+): Timer;
+export function schedule<T, F extends (this: T, ...args: any[]) => any>(
+  queueName: string,
+  target: T,
+  method: F,
+  ...args: Parameters<F>
+): Timer;
+export function schedule<T, U extends keyof T>(
+  queueName: string,
+  target: T,
+  method: U,
+  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+): Timer;
+export function schedule(...args: any[]): Timer {
+  // @ts-expect-error TS doesn't like the rest args here
+  return _backburner.schedule(...args);
 }
 
 // Used by global test teardown
@@ -369,8 +469,25 @@ export function _cancelTimers() {
   @return {*} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function later(/*target, method*/) {
-  return _backburner.later(...arguments);
+export function later<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: [...args: Parameters<F>, wait: string | number]
+): Timer;
+export function later<F extends (...args: any[]) => any>(
+  method: F,
+  ...args: [...args: Parameters<F>, wait: string | number]
+): Timer;
+export function later<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: [
+    ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : [],
+    wait: string | number
+  ]
+): Timer;
+export function later(...args: any): Timer {
+  return _backburner.later(...args);
 }
 
 /**
@@ -388,9 +505,20 @@ export function later(/*target, method*/) {
   @return {Object} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function once(...args) {
-  args.unshift('actions');
-  return _backburner.scheduleOnce(...args);
+export function once<F extends (...args: any[]) => any>(method: F, ...args: Parameters<F>): Timer;
+export function once<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: Parameters<F>
+): Timer;
+export function once<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+): Timer;
+export function once(...args: any[]): Timer {
+  // @ts-expect-error TS doesn't like the rest args here
+  return _backburner.scheduleOnce('actions', ...args);
 }
 
 /**
@@ -465,8 +593,26 @@ export function once(...args) {
   @return {Object} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function scheduleOnce(/* queue, target, method*/) {
-  return _backburner.scheduleOnce(...arguments);
+export function scheduleOnce<F extends (...args: any[]) => any>(
+  queueName: string,
+  method: F,
+  ...args: Parameters<F>
+): Timer;
+export function scheduleOnce<T, F extends (this: T, ...args: any[]) => any>(
+  queueName: string,
+  target: T,
+  method: F,
+  ...args: Parameters<F>
+): Timer;
+export function scheduleOnce<T, U extends keyof T>(
+  queueName: string,
+  target: T,
+  method: U,
+  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+): Timer;
+export function scheduleOnce(...args: any[]): Timer {
+  // @ts-expect-error TS doesn't like the rest args here
+  return _backburner.scheduleOnce(...args);
 }
 
 /**
@@ -539,9 +685,19 @@ export function scheduleOnce(/* queue, target, method*/) {
   @return {Object} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function next(...args) {
-  args.push(1);
-  return _backburner.later(...args);
+export function next<F extends (...args: any[]) => any>(method: F, ...args: Parameters<F>): Timer;
+export function next<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: Parameters<F>
+): Timer;
+export function next<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+): Timer;
+export function next(...args: any[]) {
+  return _backburner.later(...args, 1);
 }
 
 /**
@@ -611,7 +767,7 @@ export function next(...args) {
   @return {Boolean} true if canceled or false/undefined if it wasn't found
   @public
 */
-export function cancel(timer) {
+export function cancel(timer: Timer): boolean {
   return _backburner.cancel(timer);
 }
 
@@ -689,8 +845,27 @@ export function cancel(timer) {
   @return {Array} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function debounce() {
-  return _backburner.debounce(...arguments);
+export function debounce<F extends (...args: any[]) => any>(
+  method: F,
+  ...args: [...args: Parameters<F>, wait: string | number, immediate?: boolean]
+): Timer;
+export function debounce<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: [...args: Parameters<F>, wait: string | number, immediate?: boolean]
+): Timer;
+export function debounce<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: [
+    ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : [],
+    wait: string | number,
+    immediate?: boolean
+  ]
+): Timer;
+export function debounce(...args: any[]) {
+  // @ts-expect-error TS doesn't like the rest args here
+  return _backburner.debounce(...args);
 }
 
 /**
@@ -736,6 +911,25 @@ export function debounce() {
   @return {Array} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function throttle() {
-  return _backburner.throttle(...arguments);
+export function throttle<F extends (...args: any[]) => any>(
+  method: F,
+  ...args: [...args: Parameters<F>, wait?: string | number, immediate?: boolean]
+): Timer;
+export function throttle<T, F extends (this: T, ...args: any[]) => any>(
+  target: T,
+  method: F,
+  ...args: [...args: Parameters<F>, wait?: string | number, immediate?: boolean]
+): Timer;
+export function throttle<T, U extends keyof T>(
+  target: T,
+  method: U,
+  ...args: [
+    ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : [],
+    wait?: string | number,
+    immediate?: boolean
+  ]
+): Timer;
+export function throttle(...args: any[]): Timer {
+  // @ts-expect-error TS doesn't like the rest args here
+  return _backburner.throttle(...args);
 }
diff --git a/packages/@ember/runloop/type-tests.ts/begin-end.test.ts b/packages/@ember/runloop/type-tests.ts/begin-end.test.ts
new file mode 100644
index 00000000000..fc890450b8e
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/begin-end.test.ts
@@ -0,0 +1,7 @@
+import { begin, end } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(begin()).toEqualTypeOf<void>();
+
+// code to be executed within a RunLoop
+expectTypeOf(end()).toEqualTypeOf<void>();
diff --git a/packages/@ember/runloop/type-tests.ts/bind.test.ts b/packages/@ember/runloop/type-tests.ts/bind.test.ts
new file mode 100644
index 00000000000..f8886aed0c2
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/bind.test.ts
@@ -0,0 +1,138 @@
+import { bind } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  bind((_foo: number, _bar: boolean, _baz?: string): number => {
+    return 1;
+  })
+).toEqualTypeOf<(foo: number, bar: boolean, baz?: string) => number | void>();
+
+expectTypeOf(
+  bind((_foo: number, _bar: boolean, _baz?: string): number => {
+    return 1;
+  }, 1)
+).toEqualTypeOf<(bar: boolean, baz?: string) => number | void>();
+
+expectTypeOf(
+  bind(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<(baz?: string) => number | void>();
+
+expectTypeOf(
+  bind(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'baz'
+  )
+).toEqualTypeOf<() => number | void>();
+
+expectTypeOf(
+  bind(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<() => number | void>();
+
+bind((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  bind(foo, function (_foo: number, _bar: boolean, _baz?: string): number {
+    expectTypeOf(this).toEqualTypeOf<Foo>();
+    return 1;
+  })
+).toEqualTypeOf<(foo: number, bar: boolean, baz?: string) => number | void>();
+
+expectTypeOf(
+  bind(
+    foo,
+    function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1
+  )
+).toEqualTypeOf<(bar: boolean, baz?: string) => number | void>();
+
+expectTypeOf(
+  bind(
+    foo,
+    function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<(baz?: string) => number | void>();
+
+expectTypeOf(
+  bind(
+    foo,
+    function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'baz'
+  )
+).toEqualTypeOf<() => number | void>();
+
+expectTypeOf(
+  bind(
+    foo,
+    function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<() => number | void>();
+
+// @ts-expect-error Invalid args
+bind(
+  foo,
+  function (this: Foo, _foo: number): number {
+    return 1;
+  },
+  'string'
+);
+
+// With function string reference
+expectTypeOf(bind(foo, 'test')).toEqualTypeOf<
+  (foo: number, bar: boolean, baz?: string) => number | void
+>();
+
+expectTypeOf(bind(foo, 'test', 1)).toEqualTypeOf<(bar: boolean, baz?: string) => number | void>();
+
+expectTypeOf(bind(foo, 'test', 1, true)).toEqualTypeOf<(baz?: string) => number | void>();
+
+expectTypeOf(bind(foo, 'test', 1, true, 'baz')).toEqualTypeOf<() => number | void>();
+
+expectTypeOf(bind(foo, 'test', 1, true, undefined)).toEqualTypeOf<() => number | void>();
+
+// @ts-expect-error Invalid args
+bind(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/cancel.test.ts b/packages/@ember/runloop/type-tests.ts/cancel.test.ts
new file mode 100644
index 00000000000..a02c22132b2
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/cancel.test.ts
@@ -0,0 +1,8 @@
+import { cancel, next } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+let runNext = next(null, () => {
+  // will not be executed
+});
+
+expectTypeOf(cancel(runNext)).toEqualTypeOf<boolean>();
diff --git a/packages/@ember/runloop/type-tests.ts/debounce.test.ts b/packages/@ember/runloop/type-tests.ts/debounce.test.ts
new file mode 100644
index 00000000000..b3b0d1c71f7
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/debounce.test.ts
@@ -0,0 +1,148 @@
+import { debounce } from '@ember/runloop';
+import { Timer } from 'backburner.js';
+import { expectTypeOf } from 'expect-type';
+
+// From Docs
+
+function whoRan() {
+  // Do stuff
+}
+
+let myContext = { name: 'debounce', test(_foo: number, _baz?: boolean): void {} };
+
+debounce(myContext, whoRan, 150);
+
+// less than 150ms passes
+debounce(myContext, whoRan, 150);
+
+debounce(myContext, whoRan, 150, true);
+
+// console logs 'debounce ran.' one time immediately.
+// 100ms passes
+debounce(myContext, whoRan, 150, true);
+
+// 150ms passes and nothing else is logged to the console and
+// the debouncee is no longer being watched
+debounce(myContext, whoRan, 150, true);
+
+// console logs 'debounce ran.' one time immediately.
+// 150ms passes and nothing else is logged to the console and
+// the debouncee is no longer being watched
+
+// Method only
+expectTypeOf(debounce((_foo: number, _baz?: boolean): void => {}, 1, undefined, 1)).toEqualTypeOf<
+  Timer
+>();
+
+// @ts-expect-error Requires wait
+debounce((_foo: number, _baz?: boolean): void => {}, 1, true);
+
+// @ts-expect-error Requires all args
+debounce((_foo: number, _baz?: boolean): void => {}, 1, 1);
+
+// Can set immediate
+debounce((_foo: number, _baz?: boolean): void => {}, 1, true, 1, true);
+
+// With target
+debounce(
+  myContext,
+  function (_foo: number, _baz?: boolean): void {
+    expectTypeOf(this).toEqualTypeOf(myContext);
+  },
+  1,
+  true,
+  1,
+  true
+);
+
+// With key
+debounce(myContext, 'test', 1, true, 1, true);
+
+// @ts-expect-error invalid key
+debounce(myContext, 'invalid');
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  debounce(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined,
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  debounce(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string',
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+debounce((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  debounce(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true,
+    undefined,
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  debounce(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string',
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+debounce(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true,
+  1
+);
+
+// With function string reference
+expectTypeOf(debounce(foo, 'test', 1, true, 'string', 1)).toEqualTypeOf<Timer>();
+
+expectTypeOf(debounce(foo, 'test', 1, true, undefined, 1)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+debounce(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/join.test.ts b/packages/@ember/runloop/type-tests.ts/join.test.ts
new file mode 100644
index 00000000000..a867cde90d7
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/join.test.ts
@@ -0,0 +1,80 @@
+import { join } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  join(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<number | void>();
+
+expectTypeOf(
+  join(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<number | void>();
+
+join((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  join(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<number | void>();
+
+expectTypeOf(
+  join(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<number | void>();
+
+// @ts-expect-error invalid args
+join(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string'
+);
+
+// With function string reference
+expectTypeOf(join(foo, 'test', 1, true)).toEqualTypeOf<number | void>();
+
+expectTypeOf(join(foo, 'test', 1, true, 'string')).toEqualTypeOf<number | void>();
+
+// @ts-expect-error Invalid args
+join(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/later.test.ts b/packages/@ember/runloop/type-tests.ts/later.test.ts
new file mode 100644
index 00000000000..44019658816
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/later.test.ts
@@ -0,0 +1,88 @@
+import { later, Timer } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  later(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined,
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  later(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string',
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+later((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  later(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true,
+    undefined,
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  later(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string',
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+later(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true,
+  1
+);
+
+// With function string reference
+expectTypeOf(later(foo, 'test', 1, true, 'string', 1)).toEqualTypeOf<Timer>();
+
+expectTypeOf(later(foo, 'test', 1, true, undefined, 1)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+later(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/next.test.ts b/packages/@ember/runloop/type-tests.ts/next.test.ts
new file mode 100644
index 00000000000..145471531f5
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/next.test.ts
@@ -0,0 +1,82 @@
+import { next, Timer } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  next(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  next(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+next((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  next(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  next(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+next(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true
+);
+
+// With function string reference
+expectTypeOf(next(foo, 'test', 1, true, 'string')).toEqualTypeOf<Timer>();
+
+expectTypeOf(next(foo, 'test', 1, true)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+next(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/once.test.ts b/packages/@ember/runloop/type-tests.ts/once.test.ts
new file mode 100644
index 00000000000..1a1ad5dd8bb
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/once.test.ts
@@ -0,0 +1,82 @@
+import { once, Timer } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  once(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  once(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+once((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  once(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  once(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+once(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true
+);
+
+// With function string reference
+expectTypeOf(once(foo, 'test', 1, true, 'string')).toEqualTypeOf<Timer>();
+
+expectTypeOf(once(foo, 'test', 1, true)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+once(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/run.test.ts b/packages/@ember/runloop/type-tests.ts/run.test.ts
new file mode 100644
index 00000000000..9e8088fa403
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/run.test.ts
@@ -0,0 +1,82 @@
+import { run } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  run(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<void>();
+
+expectTypeOf(
+  run(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<void>();
+
+run((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  run(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<void>();
+
+expectTypeOf(
+  run(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<void>();
+
+// @ts-expect-error invalid args
+run(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true
+);
+
+// With function string reference
+expectTypeOf(run(foo, 'test', 1, true, 'string')).toEqualTypeOf<void>();
+
+expectTypeOf(run(foo, 'test', 1, true)).toEqualTypeOf<void>();
+
+// @ts-expect-error Invalid args
+run(foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts b/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
new file mode 100644
index 00000000000..6137504c06a
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
@@ -0,0 +1,91 @@
+import { scheduleOnce, Timer } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  scheduleOnce(
+    'my-queue',
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  scheduleOnce(
+    'my-queue',
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+scheduleOnce(
+  'my-queue',
+  (_foo: number): number => {
+    return 1;
+  },
+  // @ts-expect-error invalid argument
+  'string'
+);
+
+// With target and function
+expectTypeOf(
+  scheduleOnce(
+    'my-queue',
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  scheduleOnce(
+    'my-queue',
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+scheduleOnce(
+  'my-queue',
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true
+);
+
+// With function string reference
+expectTypeOf(scheduleOnce('my-queue', foo, 'test', 1, true, 'string')).toEqualTypeOf<Timer>();
+
+expectTypeOf(scheduleOnce('my-queue', foo, 'test', 1, true)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+scheduleOnce('my-queue', foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/schedule.test.ts b/packages/@ember/runloop/type-tests.ts/schedule.test.ts
new file mode 100644
index 00000000000..79297cb9eee
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/schedule.test.ts
@@ -0,0 +1,91 @@
+import { schedule, Timer } from '@ember/runloop';
+import { expectTypeOf } from 'expect-type';
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  schedule(
+    'my-queue',
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  schedule(
+    'my-queue',
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+schedule(
+  'my-queue',
+  (_foo: number): number => {
+    return 1;
+  },
+  // @ts-expect-error invalid argument
+  'string'
+);
+
+// With target and function
+expectTypeOf(
+  schedule(
+    'my-queue',
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  schedule(
+    'my-queue',
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string'
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+schedule(
+  'my-queue',
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true
+);
+
+// With function string reference
+expectTypeOf(schedule('my-queue', foo, 'test', 1, true, 'string')).toEqualTypeOf<Timer>();
+
+expectTypeOf(schedule('my-queue', foo, 'test', 1, true)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+schedule('my-queue', foo, 'test', 'string');
diff --git a/packages/@ember/runloop/type-tests.ts/throttle.test.ts b/packages/@ember/runloop/type-tests.ts/throttle.test.ts
new file mode 100644
index 00000000000..6888c491a9d
--- /dev/null
+++ b/packages/@ember/runloop/type-tests.ts/throttle.test.ts
@@ -0,0 +1,148 @@
+import { throttle } from '@ember/runloop';
+import { Timer } from 'backburner.js';
+import { expectTypeOf } from 'expect-type';
+
+// From Docs
+
+function whoRan() {
+  // Do stuff
+}
+
+let myContext = { name: 'throttle', test(_foo: number, _baz?: boolean): void {} };
+
+throttle(myContext, whoRan, 150);
+
+// less than 150ms passes
+throttle(myContext, whoRan, 150);
+
+throttle(myContext, whoRan, 150, true);
+
+// console logs 'throttle ran.' one time immediately.
+// 100ms passes
+throttle(myContext, whoRan, 150, true);
+
+// 150ms passes and nothing else is logged to the console and
+// the throttlee is no longer being watched
+throttle(myContext, whoRan, 150, true);
+
+// console logs 'throttle ran.' one time immediately.
+// 150ms passes and nothing else is logged to the console and
+// the throttlee is no longer being watched
+
+// Method only
+expectTypeOf(throttle((_foo: number, _baz?: boolean): void => {}, 1, undefined, 1)).toEqualTypeOf<
+  Timer
+>();
+
+// Wait is optional
+throttle((_foo: number, _baz?: boolean): void => {}, 1, true);
+
+// @ts-expect-error Requires all args
+throttle((_foo: number, _baz?: boolean): void => {}, 1, 1);
+
+// Can set immediate
+throttle((_foo: number, _baz?: boolean): void => {}, 1, true, 1, true);
+
+// With target
+throttle(
+  myContext,
+  function (_foo: number, _baz?: boolean): void {
+    expectTypeOf(this).toEqualTypeOf(myContext);
+  },
+  1,
+  true,
+  1,
+  true
+);
+
+// With key
+throttle(myContext, 'test', 1, true, 1, true);
+
+// @ts-expect-error invalid key
+throttle(myContext, 'invalid');
+
+class Foo {
+  test(_foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  }
+}
+
+let foo = new Foo();
+
+// With only function
+expectTypeOf(
+  throttle(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    undefined,
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  throttle(
+    (_foo: number, _bar: boolean, _baz?: string): number => {
+      return 1;
+    },
+    1,
+    true,
+    'string',
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+throttle((_foo: number): number => {
+  return 1;
+  // @ts-expect-error invalid argument
+}, 'string');
+
+// With target and function
+expectTypeOf(
+  throttle(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      expectTypeOf(this).toEqualTypeOf<Foo>();
+      return 1;
+    },
+    1,
+    true,
+    undefined,
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+expectTypeOf(
+  throttle(
+    foo,
+    function (_foo: number, _bar: boolean, _baz?: string): number {
+      return 1;
+    },
+    1,
+    true,
+    'string',
+    1
+  )
+).toEqualTypeOf<Timer>();
+
+// @ts-expect-error invalid args
+throttle(
+  foo,
+  function (this: Foo, _foo: number, _bar: boolean, _baz?: string): number {
+    return 1;
+  },
+  1,
+  'string',
+  true,
+  1
+);
+
+// With function string reference
+expectTypeOf(throttle(foo, 'test', 1, true, 'string', 1)).toEqualTypeOf<Timer>();
+
+expectTypeOf(throttle(foo, 'test', 1, true, undefined, 1)).toEqualTypeOf<Timer>();
+
+// @ts-expect-error Invalid args
+throttle(foo, 'test', 'string');
diff --git a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
index c1199c811f4..131fcf67844 100644
--- a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
@@ -1,4 +1,3 @@
-// @ts-ignore
 import { end, _cancelTimers, _getCurrentRunLoop, _hasScheduledTimers } from '@ember/runloop';
 
 export function setupRunLoopCheck(hooks: NestedHooks) {
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 2735811bfa9..026a7146634 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -1,11 +1,4 @@
-import {
-  // @ts-expect-error 'next' is not typed
-  next,
-  run,
-  _getCurrentRunLoop,
-  // @ts-expect-error '_hasScheduledTimers' is not typed
-  _hasScheduledTimers,
-} from '@ember/runloop';
+import { next, run, _getCurrentRunLoop, _hasScheduledTimers } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
 
 import { Promise } from 'rsvp';
@@ -20,19 +13,19 @@ export function runDestroy(toDestroy: any): void {
   }
 }
 
-export function runTask(callback: Function): Function {
+export function runTask(callback: (...args: any[]) => any): void {
   return run(callback);
 }
 
 export function runTaskNext(): Promise<void> {
-  return new Promise((resolve: Function) => {
+  return new Promise((resolve) => {
     return next(resolve);
   });
 }
 
 // TODO: Find a better name 😎
 export function runLoopSettled(event?: any): Promise<void> {
-  return new Promise(function (resolve: Function) {
+  return new Promise(function (resolve) {
     // Every 5ms, poll for the async thing to have finished
     let watcher = setInterval(() => {
       // If there are scheduled timers or we are inside of a run loop, keep polling
diff --git a/tsconfig.json b/tsconfig.json
index 1e884f6219f..fdef4e6beff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,8 +27,7 @@
     "checkJs": false,
 
     "paths": {
-      "@glimmer/*": ["../node_modules/@glimmer/*"],
-      "@ember/object/*": ["@ember/object/*", "@ember/object/types/*"]
+      "backburner": ["../node_modules/backburner.js/dist/backburner.d.ts"]
     }
   },
 

From d02dfa1b13bf8b34459872ada058aef4d7cddd03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 12 Feb 2022 06:31:54 +0000
Subject: [PATCH 0881/1405] Bump follow-redirects from 1.14.7 to 1.14.8

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index e1b1729126f..b583ab06aaf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4920,9 +4920,9 @@ flatted@^3.1.0:
   integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==
 
 follow-redirects@^1.0.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-in@^1.0.2:
   version "1.0.2"

From 6416faf206157b0553a3d99132e415d644f5f4fc Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 14 Feb 2022 16:16:16 -0800
Subject: [PATCH 0882/1405] [BUGFIX] Don't serialize default QPs on
 RouterService

Fixes #19493
---
 .../-internals/routing/lib/services/router.ts | 27 ++++++++++++-------
 .../-internals/routing/lib/system/route.ts    |  2 +-
 .../-internals/routing/lib/system/router.ts   |  9 ++-----
 .../router_service_test/isActive_test.js      |  5 ++--
 .../router_service_test/replaceWith_test.js   |  4 +--
 .../router_service_test/transitionTo_test.js  | 12 ++++-----
 6 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 276143f2e57..6a5e2450af8 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -133,7 +133,6 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     let { routeName, models, queryParams } = extractRouteArgs(args);
 
     let transition = this._router._doTransition(routeName, models, queryParams, true);
-    transition['_keepDefaultQueryParamValues'] = true;
 
     return transition;
   }
@@ -324,21 +323,31 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     let hasQueryParams = Object.keys(queryParams).length > 0;
 
     if (hasQueryParams) {
+      // UNSAFE: casting `routeName as string` here encodes the existing
+      // assumption but may be wrong: `extractRouteArgs` correctly returns it
+      // as `string | undefined`. There may be bugs if `_prepareQueryParams`
+      // does not correctly account for `undefined` values for `routeName`.
+      //  Spoilers: under the hood this currently uses router.js APIs which
+      // *do not* account for this being `undefined`.
+      let targetRouteName = routeName as string;
+
       queryParams = Object.assign({}, queryParams);
       this._router._prepareQueryParams(
-        // UNSAFE: casting `routeName as string` here encodes the existing
-        // assumption but may be wrong: `extractRouteArgs` correctly returns it
-        // as `string | undefined`. There may be bugs if `_prepareQueryParams`
-        // does not correctly account for `undefined` values for `routeName`.
-        //  Spoilers: under the hood this currently uses router.js APIs which
-        // *do not* account for this being `undefined`.
-        routeName as string,
+        targetRouteName,
         models,
         queryParams,
         true /* fromRouterService */
       );
 
-      return shallowEqual(queryParams, routerMicrolib.state!.queryParams);
+      let currentQueryParams = Object.assign({}, routerMicrolib.state!.queryParams);
+      this._router._prepareQueryParams(
+        targetRouteName,
+        models,
+        currentQueryParams,
+        true /* fromRouterService */
+      );
+
+      return shallowEqual(queryParams, currentQueryParams);
     }
 
     return true;
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 1e2586d8ed3..e239ee2da3f 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -2522,7 +2522,7 @@ Route.reopen({
         qp.serializedValue = svalue;
 
         let thisQueryParamHasDefaultValue = qp.serializedDefaultValue === svalue;
-        if (!thisQueryParamHasDefaultValue || (transition as any)._keepDefaultQueryParamValues) {
+        if (!thisQueryParamHasDefaultValue) {
           finalParams.push({
             value: svalue,
             visible: true,
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 39d40c624b0..1b3ce694b0a 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1053,7 +1053,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     _targetRouteName: string | undefined,
     models: ModelFor<R>[],
     _queryParams: Record<string, unknown>,
-    _keepDefaultQueryParamValues?: boolean
+    _fromRouterService?: boolean
   ): Transition {
     let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
     assert(
@@ -1069,12 +1069,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
 
     Object.assign(queryParams, _queryParams);
 
-    this._prepareQueryParams(
-      targetRouteName,
-      models,
-      queryParams,
-      Boolean(_keepDefaultQueryParamValues)
-    );
+    this._prepareQueryParams(targetRouteName, models, queryParams, Boolean(_fromRouterService));
 
     let transition = this._routerMicrolib.transitionTo(targetRouteName, ...models, { queryParams });
 
diff --git a/packages/ember/tests/routing/router_service_test/isActive_test.js b/packages/ember/tests/routing/router_service_test/isActive_test.js
index 69f35527e8a..698124d7550 100644
--- a/packages/ember/tests/routing/router_service_test/isActive_test.js
+++ b/packages/ember/tests/routing/router_service_test/isActive_test.js
@@ -117,9 +117,10 @@ moduleFor(
           return this.routerService.transitionTo('parent.child', queryParams);
         })
         .then(() => {
-          assert.ok(this.routerService.isActive('parent.child', queryParams));
+          assert.ok(this.routerService.isActive('parent.child', queryParams), 'route is active');
           assert.notOk(
-            this.routerService.isActive('parent.child', this.buildQueryParams({ sort: 'DESC' }))
+            this.routerService.isActive('parent.child', this.buildQueryParams({ sort: 'DESC' })),
+            'route with QPs is not active'
           );
         });
     }
diff --git a/packages/ember/tests/routing/router_service_test/replaceWith_test.js b/packages/ember/tests/routing/router_service_test/replaceWith_test.js
index a1ca0bca866..ea0683b13a3 100644
--- a/packages/ember/tests/routing/router_service_test/replaceWith_test.js
+++ b/packages/ember/tests/routing/router_service_test/replaceWith_test.js
@@ -107,7 +107,7 @@ moduleFor(
         });
     }
 
-    ['@test RouterService#replaceWith with basic query params does not remove query param defaults'](
+    ['@test RouterService#replaceWith with basic query params removes query param defaults'](
       assert
     ) {
       assert.expect(1);
@@ -133,7 +133,7 @@ moduleFor(
           return this.routerService.replaceWith('parent.child', queryParams);
         })
         .then(() => {
-          assert.deepEqual(this.state, ['/', '/child?sort=ASC']);
+          assert.deepEqual(this.state, ['/', '/child']);
         });
     }
   }
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index fc94312b6af..a5c84311586 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -238,7 +238,7 @@ moduleFor(
       this.assertText('much dynamicism');
     }
 
-    ['@test RouterService#transitionTo with basic query params does not remove query param defaults'](
+    ['@test RouterService#transitionTo with basic query params removes query param defaults'](
       assert
     ) {
       assert.expect(1);
@@ -258,7 +258,7 @@ moduleFor(
           return this.routerService.transitionTo('parent.child', queryParams);
         })
         .then(() => {
-          assert.equal(this.routerService.get('currentURL'), '/child?sort=ASC');
+          assert.equal(this.routerService.get('currentURL'), '/child');
         });
     }
 
@@ -302,14 +302,14 @@ moduleFor(
         })
       );
 
-      let queryParams = this.buildQueryParams({ sort: 'ASC' });
+      let queryParams = this.buildQueryParams({ sort: 'DESC' });
 
       return this.visit('/')
         .then(() => {
           return this.routerService.transitionTo('parent.child', queryParams);
         })
         .then(() => {
-          assert.equal(this.routerService.get('currentURL'), '/child?sort=ASC');
+          assert.equal(this.routerService.get('currentURL'), '/child?sort=DESC');
         });
     }
 
@@ -328,14 +328,14 @@ moduleFor(
         })
       );
 
-      let queryParams = this.buildQueryParams({ url_sort: 'ASC' });
+      let queryParams = this.buildQueryParams({ url_sort: 'DESC' });
 
       return this.visit('/')
         .then(() => {
           return this.routerService.transitionTo('parent.child', queryParams);
         })
         .then(() => {
-          assert.equal(this.routerService.get('currentURL'), '/child?url_sort=ASC');
+          assert.equal(this.routerService.get('currentURL'), '/child?url_sort=DESC');
         });
     }
 

From b07f42cf2391e98f244702b9073a6db3f2c52cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moacir=20P=2E=20de=20Sa=CC=81=20Pereira?=
 <github@moacir.moacir.com>
Date: Tue, 15 Feb 2022 15:49:10 -0500
Subject: [PATCH 0883/1405] [DOC] Fix two typos in glimmer-component-docs.ts

---
 .../@ember/-internals/glimmer/lib/glimmer-component-docs.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
index ca7d8ea01d8..fc3b6c73873 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-component-docs.ts
@@ -14,7 +14,7 @@
   Ember ships with two types of JavaScript classes for components:
 
   1. Glimmer components, imported from `@glimmer/component`, which are the
-     default component's for Ember Octane (3.15) and more recent editions.
+     default components for Ember Octane (3.15) and more recent editions.
   2. Classic components, imported from `@ember/component`, which were the
      default for older editions of Ember (pre 3.15).
 
@@ -240,7 +240,7 @@
   location as the template file, with the same name, and export a subclass
   of `Component` as the default value. For example, to add Javascript to the
   `PersonProfile` component which we defined above, we would create
-  `app/comopnents/person-profile.js` and export our class as the default, like
+  `app/components/person-profile.js` and export our class as the default, like
   so:
 
   ```app/components/person-profile.js

From ee66a493840cb10515eb23b3fc2ff74a539f885a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 16 Feb 2022 17:51:06 -0800
Subject: [PATCH 0884/1405] Cleaner implementation of `isPresent`

Co-authored-by: Chris Krycho <hello@chriskrycho.com>
---
 packages/@ember/-internals/metal/lib/is_present.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/metal/lib/is_present.ts b/packages/@ember/-internals/metal/lib/is_present.ts
index 7b4d6f758c2..62327739e65 100644
--- a/packages/@ember/-internals/metal/lib/is_present.ts
+++ b/packages/@ember/-internals/metal/lib/is_present.ts
@@ -31,6 +31,6 @@ import isBlank from './is_blank';
   @since 1.8.0
   @public
 */
-export default function isPresent<T>(obj: T): obj is Exclude<T, null | undefined> {
+export default function isPresent<T>(obj: T | null | undefined): obj is T {
   return !isBlank(obj);
 }

From ff51eb4d9106fa1f4b413a20935440cec2895df3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 16 Feb 2022 20:51:15 -0800
Subject: [PATCH 0885/1405] Resolve a couple minor typing issues

---
 packages/@ember/-internals/runtime/lib/compare.ts  | 2 +-
 packages/@ember/debug/type-tests/deprecate.test.ts | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/-internals/runtime/lib/compare.ts
index 813d521c49f..480933e9212 100644
--- a/packages/@ember/-internals/runtime/lib/compare.ts
+++ b/packages/@ember/-internals/runtime/lib/compare.ts
@@ -37,7 +37,7 @@ type Compare = -1 | 0 | 1;
 //                                              SSt  `------'`
 function spaceship(a: number, b: number): Compare {
   let diff = a - b;
-  // SAFETY: It will be one of the known values
+  // SAFETY: Number casts true into 1 and false into 0. Therefore, this must end up as one of the Compare values.
   return (Number(diff > 0) - Number(diff < 0)) as Compare;
 }
 
diff --git a/packages/@ember/debug/type-tests/deprecate.test.ts b/packages/@ember/debug/type-tests/deprecate.test.ts
index efa6917a971..06b2050f5cd 100644
--- a/packages/@ember/debug/type-tests/deprecate.test.ts
+++ b/packages/@ember/debug/type-tests/deprecate.test.ts
@@ -59,5 +59,12 @@ deprecate('foo', true, {
   for: 'my-module',
 });
 
+deprecate('foo', true, {
+  id: 'foo',
+  until: '5.0.0',
+  // @ts-expect-error requires 'available' if 'enabled' present
+  since: { enabled: '1.0.0' },
+});
+
 // @ts-expect-error inverted order
 deprecate(typeof str === 'string', 'Must pass a string');

From 8388b3d60ed0269bcbca93707147cc6b49cc3d8e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Feb 2022 14:19:41 -0800
Subject: [PATCH 0886/1405] Refactor a bunch of component internals for TS

---
 .../glimmer/lib/component-managers/curly.ts   |   3 +-
 .../glimmer/lib/component-managers/root.ts    |   3 +-
 .../-internals/glimmer/lib/component.ts       | 768 +++++++++---------
 .../-internals/glimmer/lib/environment.ts     |   2 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |  21 +-
 .../-internals/glimmer/lib/utils/bindings.ts  |   2 +-
 .../lib/utils/curly-component-state-bucket.ts |  22 +-
 .../application/debug-render-tree-test.ts     |  11 +-
 .../runtime/lib/mixins/evented.d.ts           |   7 +
 .../lib/mixins/target_action_support.d.ts     |  12 +
 packages/@ember/-internals/views/index.d.ts   |  44 -
 .../-internals/views/{index.js => index.ts}   |   0
 .../views/lib/mixins/action_support.d.ts      |   8 +
 .../views/lib/mixins/child_views_support.d.ts |  10 +
 .../views/lib/mixins/class_names_support.d.ts |  10 +
 .../views/lib/mixins/view_state_support.d.ts  |   8 +
 .../views/lib/mixins/view_support.d.ts        |  20 +
 .../views/lib/system/event_dispatcher.d.ts    |   8 +
 .../-internals/views/lib/system/utils.ts      |  32 +-
 .../-internals/views/lib/views/core_view.d.ts |  12 +
 .../@ember/component/type-tests/index.test.ts |  10 +
 21 files changed, 545 insertions(+), 468 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts
 delete mode 100644 packages/@ember/-internals/views/index.d.ts
 rename packages/@ember/-internals/views/{index.js => index.ts} (100%)
 create mode 100644 packages/@ember/-internals/views/lib/mixins/action_support.d.ts
 create mode 100644 packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts
 create mode 100644 packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
 create mode 100644 packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts
 create mode 100644 packages/@ember/-internals/views/lib/mixins/view_support.d.ts
 create mode 100644 packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
 create mode 100644 packages/@ember/-internals/views/lib/views/core_view.d.ts
 create mode 100644 packages/@ember/component/type-tests/index.test.ts

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 2cc64543431..771bcc80f18 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -39,6 +39,7 @@ import {
   valueForTag,
 } from '@glimmer/validator';
 import { SimpleElement } from '@simple-dom/interface';
+import Component from '../component';
 import { DynamicScope } from '../renderer';
 import RuntimeResolver from '../resolver';
 import { isTemplateFactory } from '../template';
@@ -49,7 +50,7 @@ import {
   parseAttributeBinding,
 } from '../utils/bindings';
 
-import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
+import ComponentStateBucket from '../utils/curly-component-state-bucket';
 import { processComponentArgs } from '../utils/process-args';
 
 export const ARGS = enumerableSymbol('ARGS');
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index afbfe4c0ca8..2b964149c17 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -11,8 +11,9 @@ import {
 } from '@glimmer/interfaces';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
+import Component from '../component';
 import { DynamicScope } from '../renderer';
-import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
+import ComponentStateBucket from '../utils/curly-component-state-bucket';
 import CurlyComponentManager, {
   DIRTY_TAG,
   initialRenderInstrumentDetails,
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index d7a12fb0ec4..916a1032c1c 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,5 +1,5 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import { getOwner } from '@ember/-internals/owner';
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
 import {
   ActionSupport,
@@ -13,7 +13,7 @@ import {
 } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { Environment } from '@glimmer/interfaces';
+import { Environment, Template, TemplateFactory } from '@glimmer/interfaces';
 import { setInternalComponentManager } from '@glimmer/manager';
 import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
@@ -26,6 +26,7 @@ import {
   DIRTY_TAG,
   IS_DISPATCHING_ATTRS,
 } from './component-managers/curly';
+import { View } from './renderer';
 
 // Keep track of which component classes have already been processed for lazy event setup.
 let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<object>>();
@@ -648,402 +649,431 @@ let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<object>>();
   @uses Ember.ViewStateSupport
   @public
 */
-const Component = CoreView.extend(
-  ChildViewsSupport,
-  ViewStateSupport,
-  ClassNamesSupport,
-  TargetActionSupport,
-  ActionSupport,
-  ViewMixin,
-  {
-    isComponent: true,
-
-    init() {
-      this._super(...arguments);
-      this[IS_DISPATCHING_ATTRS] = false;
-      this[DIRTY_TAG] = createTag();
-      this[BOUNDS] = null;
-
-      let eventDispatcher = this._dispatcher;
-      if (eventDispatcher) {
-        let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
-        if (!lazyEventsProcessedForComponentClass) {
-          lazyEventsProcessedForComponentClass = new WeakSet<object>();
-          lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
-        }
+interface Component
+  extends CoreView,
+    ChildViewsSupport,
+    ViewStateSupport,
+    ClassNamesSupport,
+    TargetActionSupport,
+    ActionSupport,
+    ViewMixin {
+  parentView: Component | null;
+
+  /**
+    Layout can be used to wrap content in a component.
+    @property layout
+    @type Function
+    @public
+  */
+  layout?: TemplateFactory | Template;
+
+  /**
+    The name of the layout to lookup if no layout is provided.
+    By default `Component` will lookup a template with this name in
+    `Ember.TEMPLATES` (a shared global object).
+    @property layoutName
+    @type String
+    @default undefined
+    @private
+  */
+  layoutName?: string;
+
+  attributeBindings?: Array<string>;
+}
+class Component
+  extends CoreView.extend(
+    ChildViewsSupport,
+    ViewStateSupport,
+    ClassNamesSupport,
+    TargetActionSupport,
+    ActionSupport,
+    ViewMixin
+  )
+  implements View {
+  static isComponentFactory = true;
+  static positionalParams = [];
+
+  static toString(): string {
+    return '@ember/component';
+  }
 
-        let proto = Object.getPrototypeOf(this);
-        if (!lazyEventsProcessedForComponentClass.has(proto)) {
-          let lazyEvents = eventDispatcher.lazyEvents;
+  isComponent = true;
 
-          lazyEvents.forEach((mappedEventName: string, event: string) => {
-            if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
-              eventDispatcher.setupHandlerForBrowserEvent(event);
-            }
-          });
+  private __dispatcher: EventDispatcher | null | undefined;
 
-          lazyEventsProcessedForComponentClass.add(proto);
-        }
-      }
+  constructor(owner: Owner) {
+    super(owner);
+    this[IS_DISPATCHING_ATTRS] = false;
+    this[DIRTY_TAG] = createTag();
+    this[BOUNDS] = null;
 
-      if (DEBUG && eventDispatcher && this.renderer._isInteractive && this.tagName === '') {
-        let eventNames = [];
-        let events = eventDispatcher.finalEventNameMapping;
+    const eventDispatcher = this._dispatcher;
+    if (eventDispatcher) {
+      let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
+      if (!lazyEventsProcessedForComponentClass) {
+        lazyEventsProcessedForComponentClass = new WeakSet<object>();
+        lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
+      }
 
-        for (let key in events) {
-          let methodName = events[key];
+      let proto = Object.getPrototypeOf(this);
+      if (!lazyEventsProcessedForComponentClass.has(proto)) {
+        let lazyEvents = eventDispatcher.lazyEvents;
 
-          if (typeof this[methodName] === 'function') {
-            eventNames.push(methodName);
+        lazyEvents.forEach((mappedEventName: string, event: string) => {
+          if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
+            eventDispatcher.setupHandlerForBrowserEvent(event);
           }
+        });
+
+        lazyEventsProcessedForComponentClass.add(proto);
+      }
+    }
+
+    // @ts-expect-error _isInteractive is private
+    if (DEBUG && eventDispatcher && this.renderer._isInteractive && this.tagName === '') {
+      let eventNames = [];
+      let events = eventDispatcher.finalEventNameMapping;
+
+      for (let key in events) {
+        let methodName = events[key];
+
+        if (methodName && typeof this[methodName] === 'function') {
+          eventNames.push(methodName);
         }
-        // If in a tagless component, assert that no event handlers are defined
+      }
+      // If in a tagless component, assert that no event handlers are defined
+      assert(
+        `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
+        !eventNames.length
+      );
+    }
+  }
+
+  get _dispatcher(): EventDispatcher | null {
+    if (this.__dispatcher === undefined) {
+      let owner = getOwner(this);
+      assert('Component is unexpectedly missing an owner', owner);
+
+      if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
+        let dispatcher = owner.lookup('event_dispatcher:main');
         assert(
-          `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
-          !eventNames.length
+          'Expected dispatcher to be an EventDispatcher',
+          dispatcher instanceof EventDispatcher
         );
+        this.__dispatcher = dispatcher;
+      } else {
+        // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
+        this.__dispatcher = null;
       }
-    },
-
-    get _dispatcher(): EventDispatcher | null {
-      if (this.__dispatcher === undefined) {
-        let owner = getOwner(this);
-        assert('Component is unexpectedly missing an owner', owner);
-
-        if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
-          this.__dispatcher = owner.lookup('event_dispatcher:main');
-          assert(
-            'Expected dispatcher to be an EventDispatcher',
-            this.__dispatcher instanceof EventDispatcher
-          );
-        } else {
-          // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
-          this.__dispatcher = null;
-        }
-      }
+    }
 
-      return this.__dispatcher;
-    },
+    return this.__dispatcher;
+  }
 
-    on(eventName: string) {
-      this._dispatcher?.setupHandlerForEmberEvent(eventName);
-      return this._super(...arguments);
-    },
+  on<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  on(name: string, method: ((...args: any[]) => void) | string): this;
+  on<Target>(
+    name: string,
+    ...args:
+      | [Target, string | ((this: Target, ...args: any[]) => void)]
+      | [((...args: any[]) => void) | string]
+  ): this {
+    this._dispatcher?.setupHandlerForEmberEvent(name);
+    return super.on(name, ...args);
+  }
 
-    rerender() {
-      dirtyTag(this[DIRTY_TAG]);
-      this._super();
-    },
+  rerender() {
+    dirtyTag(this[DIRTY_TAG]);
+  }
 
-    [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
-      if (this[IS_DISPATCHING_ATTRS]) {
-        return;
-      }
+  [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
+    if (this[IS_DISPATCHING_ATTRS]) {
+      return;
+    }
 
-      let args = this[ARGS];
-      let reference = args !== undefined ? args[key] : undefined;
+    let args = this[ARGS];
+    let reference = args !== undefined ? args[key] : undefined;
 
-      if (reference !== undefined && isUpdatableRef(reference)) {
-        updateRef(reference, arguments.length === 2 ? value : get(this, key));
-      }
-    },
-
-    getAttr(key: string) {
-      // TODO Intimate API should be deprecated
-      return this.get(key);
-    },
-
-    /**
-      Normally, Ember's component model is "write-only". The component takes a
-      bunch of attributes that it got passed in, and uses them to render its
-      template.
-
-      One nice thing about this model is that if you try to set a value to the
-      same thing as last time, Ember (through HTMLBars) will avoid doing any
-      work on the DOM.
-
-      This is not just a performance optimization. If an attribute has not
-      changed, it is important not to clobber the element's "hidden state".
-      For example, if you set an input's `value` to the same value as before,
-      it will clobber selection state and cursor position. In other words,
-      setting an attribute is not **always** idempotent.
-
-      This method provides a way to read an element's attribute and also
-      update the last value Ember knows about at the same time. This makes
-      setting an attribute idempotent.
-
-      In particular, what this means is that if you get an `<input>` element's
-      `value` attribute and then re-render the template with the same value,
-      it will avoid clobbering the cursor and selection position.
-      Since most attribute sets are idempotent in the browser, you typically
-      can get away with reading attributes using jQuery, but the most reliable
-      way to do so is through this method.
-      @method readDOMAttr
-
-      @param {String} name the name of the attribute
-      @return String
-      @public
-     */
-    readDOMAttr(name: string) {
-      // TODO revisit this
-      let _element = getViewElement(this);
+    if (reference !== undefined && isUpdatableRef(reference)) {
+      updateRef(reference, arguments.length === 2 ? value : get(this, key));
+    }
+  }
 
-      assert(
-        `Cannot call \`readDOMAttr\` on ${this} which does not have an element`,
-        _element !== null
-      );
+  getAttr(key: string) {
+    // TODO Intimate API should be deprecated
+    return this.get(key);
+  }
 
-      let element = _element;
-      let isSVG = element.namespaceURI === Namespace.SVG;
-      let { type, normalized } = normalizeProperty(element, name);
+  /**
+    Normally, Ember's component model is "write-only". The component takes a
+    bunch of attributes that it got passed in, and uses them to render its
+    template.
+
+    One nice thing about this model is that if you try to set a value to the
+    same thing as last time, Ember (through HTMLBars) will avoid doing any
+    work on the DOM.
+
+    This is not just a performance optimization. If an attribute has not
+    changed, it is important not to clobber the element's "hidden state".
+    For example, if you set an input's `value` to the same value as before,
+    it will clobber selection state and cursor position. In other words,
+    setting an attribute is not **always** idempotent.
+
+    This method provides a way to read an element's attribute and also
+    update the last value Ember knows about at the same time. This makes
+    setting an attribute idempotent.
+
+    In particular, what this means is that if you get an `<input>` element's
+    `value` attribute and then re-render the template with the same value,
+    it will avoid clobbering the cursor and selection position.
+    Since most attribute sets are idempotent in the browser, you typically
+    can get away with reading attributes using jQuery, but the most reliable
+    way to do so is through this method.
+    @method readDOMAttr
+
+    @param {String} name the name of the attribute
+    @return String
+    @public
+    */
+  readDOMAttr(name: string) {
+    // TODO revisit this
+    let _element = getViewElement(this);
 
-      if (isSVG || type === 'attr') {
-        return element.getAttribute(normalized);
-      }
+    assert(
+      `Cannot call \`readDOMAttr\` on ${this} which does not have an element`,
+      _element !== null
+    );
+
+    let element = _element;
+    let isSVG = element.namespaceURI === Namespace.SVG;
+    let { type, normalized } = normalizeProperty(element, name);
+
+    if (isSVG || type === 'attr') {
+      return element.getAttribute(normalized);
+    }
+
+    return element[normalized];
+  }
+
+  /**
+   The WAI-ARIA role of the control represented by this view. For example, a
+    button may have a role of type 'button', or a pane may have a role of
+    type 'alertdialog'. This property is used by assistive software to help
+    visually challenged users navigate rich web applications.
 
-      return element[normalized];
-    },
-
-    /**
-     The WAI-ARIA role of the control represented by this view. For example, a
-     button may have a role of type 'button', or a pane may have a role of
-     type 'alertdialog'. This property is used by assistive software to help
-     visually challenged users navigate rich web applications.
-
-     The full list of valid WAI-ARIA roles is available at:
-     [https://www.w3.org/TR/wai-aria/#roles_categorization](https://www.w3.org/TR/wai-aria/#roles_categorization)
-
-     @property ariaRole
-     @type String
-     @default null
-     @public
-     */
-
-    /**
-     Enables components to take a list of parameters as arguments.
-     For example, a component that takes two parameters with the names
-     `name` and `age`:
-
-     ```app/components/my-component.js
-     import Component from '@ember/component';
-
-     let MyComponent = Component.extend();
-
-     MyComponent.reopenClass({
-       positionalParams: ['name', 'age']
-     });
-
-     export default MyComponent;
-     ```
-
-     It can then be invoked like this:
-
-     ```hbs
-     {{my-component "John" 38}}
-     ```
-
-     The parameters can be referred to just like named parameters:
-
-     ```hbs
-     Name: {{name}}, Age: {{age}}.
-     ```
-
-     Using a string instead of an array allows for an arbitrary number of
-     parameters:
-
-     ```app/components/my-component.js
-     import Component from '@ember/component';
-
-     let MyComponent = Component.extend();
-
-     MyComponent.reopenClass({
-       positionalParams: 'names'
-     });
-
-     export default MyComponent;
-     ```
-
-     It can then be invoked like this:
-
-     ```hbs
-     {{my-component "John" "Michael" "Scott"}}
-     ```
-     The parameters can then be referred to by enumerating over the list:
-
-     ```hbs
-     {{#each names as |name|}}{{name}}{{/each}}
-     ```
-
-     @static
-     @public
-     @property positionalParams
-     @since 1.13.0
-     */
-
-    /**
-     Called when the attributes passed into the component have been updated.
-     Called both during the initial render of a container and during a rerender.
-     Can be used in place of an observer; code placed here will be executed
-     every time any attribute updates.
-     @method didReceiveAttrs
-     @public
-     @since 1.13.0
-     */
-    didReceiveAttrs() {},
-
-    /**
-     Called when the attributes passed into the component have been updated.
-     Called both during the initial render of a container and during a rerender.
-     Can be used in place of an observer; code placed here will be executed
-     every time any attribute updates.
-     @event didReceiveAttrs
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called after a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @method didRender
-     @public
-     @since 1.13.0
-     */
-    didRender() {},
-
-    /**
-     Called after a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @event didRender
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called before a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @method willRender
-     @public
-     @since 1.13.0
-     */
-    willRender() {},
-
-    /**
-     Called before a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @event willRender
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called when the attributes passed into the component have been changed.
-     Called only during a rerender, not during an initial render.
-     @method didUpdateAttrs
-     @public
-     @since 1.13.0
-     */
-    didUpdateAttrs() {},
-
-    /**
-     Called when the attributes passed into the component have been changed.
-     Called only during a rerender, not during an initial render.
-     @event didUpdateAttrs
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called when the component is about to update and rerender itself.
-     Called only during a rerender, not during an initial render.
-     @method willUpdate
-     @public
-     @since 1.13.0
-     */
-    willUpdate() {},
-
-    /**
-     Called when the component is about to update and rerender itself.
-     Called only during a rerender, not during an initial render.
-     @event willUpdate
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called when the component has updated and rerendered itself.
-     Called only during a rerender, not during an initial render.
-     @method didUpdate
-     @public
-     @since 1.13.0
-     */
-    didUpdate() {},
-
-    /**
-     Called when the component has updated and rerendered itself.
-     Called only during a rerender, not during an initial render.
-     @event didUpdate
-     @public
-     @since 1.13.0
-     */
-
-    /**
-      Layout can be used to wrap content in a component.
-      @property layout
-      @type Function
-      @public
+    The full list of valid WAI-ARIA roles is available at:
+    [https://www.w3.org/TR/wai-aria/#roles_categorization](https://www.w3.org/TR/wai-aria/#roles_categorization)
+
+    @property ariaRole
+    @type String
+    @default null
+    @public
     */
 
-    /**
-      The name of the layout to lookup if no layout is provided.
-      By default `Component` will lookup a template with this name in
-      `Ember.TEMPLATES` (a shared global object).
-      @property layoutName
-      @type String
-      @default null
-      @private
+  /**
+   Enables components to take a list of parameters as arguments.
+    For example, a component that takes two parameters with the names
+    `name` and `age`:
+
+    ```app/components/my-component.js
+    import Component from '@ember/component';
+
+    let MyComponent = Component.extend();
+
+    MyComponent.reopenClass({
+      positionalParams: ['name', 'age']
+    });
+
+    export default MyComponent;
+    ```
+
+    It can then be invoked like this:
+
+    ```hbs
+    {{my-component "John" 38}}
+    ```
+
+    The parameters can be referred to just like named parameters:
+
+    ```hbs
+    Name: {{name}}, Age: {{age}}.
+    ```
+
+    Using a string instead of an array allows for an arbitrary number of
+    parameters:
+
+    ```app/components/my-component.js
+    import Component from '@ember/component';
+
+    let MyComponent = Component.extend();
+
+    MyComponent.reopenClass({
+      positionalParams: 'names'
+    });
+
+    export default MyComponent;
+    ```
+
+    It can then be invoked like this:
+
+    ```hbs
+    {{my-component "John" "Michael" "Scott"}}
+    ```
+    The parameters can then be referred to by enumerating over the list:
+
+    ```hbs
+    {{#each names as |name|}}{{name}}{{/each}}
+    ```
+
+    @static
+    @public
+    @property positionalParams
+    @since 1.13.0
     */
 
-    /**
-      The HTML `id` of the component's element in the DOM. You can provide this
-      value yourself but it must be unique (just as in HTML):
-
-      ```handlebars
-      {{my-component elementId="a-really-cool-id"}}
-      ```
-
-      ```handlebars
-      <MyComponent @elementId="a-really-cool-id" />
-      ```
-      If not manually set a default value will be provided by the framework.
-      Once rendered an element's `elementId` is considered immutable and you
-      should never change it. If you need to compute a dynamic value for the
-      `elementId`, you should do this when the component or element is being
-      instantiated:
-
-      ```javascript
-      export default Component.extend({
-        init() {
-          this._super(...arguments);
-
-          var index = this.get('index');
-          this.set('elementId', `component-id${index}`);
-        }
-      });
-      ```
+  /**
+   Called when the attributes passed into the component have been updated.
+    Called both during the initial render of a container and during a rerender.
+    Can be used in place of an observer; code placed here will be executed
+    every time any attribute updates.
+    @method didReceiveAttrs
+    @public
+    @since 1.13.0
+    */
+  didReceiveAttrs() {}
+
+  /**
+   Called when the attributes passed into the component have been updated.
+    Called both during the initial render of a container and during a rerender.
+    Can be used in place of an observer; code placed here will be executed
+    every time any attribute updates.
+    @event didReceiveAttrs
+    @public
+    @since 1.13.0
+    */
 
-      @property elementId
-      @type String
-      @public
+  /**
+   Called after a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @method didRender
+    @public
+    @since 1.13.0
+    */
+  didRender() {}
+
+  /**
+   Called after a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @event didRender
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called before a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @method willRender
+    @public
+    @since 1.13.0
+    */
+  willRender() {}
+
+  /**
+   Called before a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @event willRender
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the attributes passed into the component have been changed.
+    Called only during a rerender, not during an initial render.
+    @method didUpdateAttrs
+    @public
+    @since 1.13.0
+    */
+  didUpdateAttrs() {}
+
+  /**
+   Called when the attributes passed into the component have been changed.
+    Called only during a rerender, not during an initial render.
+    @event didUpdateAttrs
+    @public
+    @since 1.13.0
     */
-  }
-);
 
-Component.toString = () => '@ember/component';
+  /**
+   Called when the component is about to update and rerender itself.
+    Called only during a rerender, not during an initial render.
+    @method willUpdate
+    @public
+    @since 1.13.0
+    */
+  willUpdate() {}
+
+  /**
+   Called when the component is about to update and rerender itself.
+    Called only during a rerender, not during an initial render.
+    @event willUpdate
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the component has updated and rerendered itself.
+    Called only during a rerender, not during an initial render.
+    @method didUpdate
+    @public
+    @since 1.13.0
+    */
+  didUpdate() {}
+
+  /**
+   Called when the component has updated and rerendered itself.
+    Called only during a rerender, not during an initial render.
+    @event didUpdate
+    @public
+    @since 1.13.0
+    */
+
+  /**
+    The HTML `id` of the component's element in the DOM. You can provide this
+    value yourself but it must be unique (just as in HTML):
+
+    ```handlebars
+    {{my-component elementId="a-really-cool-id"}}
+    ```
+
+    ```handlebars
+    <MyComponent @elementId="a-really-cool-id" />
+    ```
+    If not manually set a default value will be provided by the framework.
+    Once rendered an element's `elementId` is considered immutable and you
+    should never change it. If you need to compute a dynamic value for the
+    `elementId`, you should do this when the component or element is being
+    instantiated:
+
+    ```javascript
+    export default Component.extend({
+      init() {
+        this._super(...arguments);
+
+        var index = this.get('index');
+        this.set('elementId', `component-id${index}`);
+      }
+    });
+    ```
 
-Component.reopenClass({
-  isComponentFactory: true,
-  positionalParams: [],
-});
+    @property elementId
+    @type String
+    @public
+  */
+}
 
 setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
 
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index b69f58b505f..fa1bfb51794 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -41,7 +41,7 @@ setGlobalContext({
 
   warnIfStyleNotTrusted(value: unknown) {
     warn(
-      constructStyleDeprecationMessage(value),
+      constructStyleDeprecationMessage(String(value)),
       (() => {
         if (value === null || value === undefined || isHTMLSafe(value)) {
           return true;
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index a3c6016589c..77dd4ba6748 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,6 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { getOwner, Owner } from '@ember/-internals/owner';
+import { guidFor } from '@ember/-internals/utils';
 import { getViewElement, getViewId } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { _backburner, _getCurrentRunLoop } from '@ember/runloop';
@@ -38,23 +39,29 @@ import { unwrapTemplate } from '@glimmer/util';
 import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
 import { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
 import RSVP from 'rsvp';
+import Component from './component';
 import { BOUNDS } from './component-managers/curly';
 import { createRootOutlet } from './component-managers/outlet';
 import { RootComponentDefinition } from './component-managers/root';
 import { NodeDOMTreeConstruction } from './dom';
 import { EmberEnvironmentDelegate } from './environment';
 import ResolverImpl from './resolver';
-import { Component } from './utils/curly-component-state-bucket';
 import { OutletState } from './utils/outlet';
 import OutletView from './views/outlet';
 
 export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder;
 
+export interface View {
+  parentView: Option<View>;
+  renderer: Renderer;
+  tagName: string | null;
+  elementId: string | null;
+  isDestroying: boolean;
+  isDestroyed: boolean;
+}
+
 export class DynamicScope implements GlimmerDynamicScope {
-  constructor(
-    public view: Component | {} | null,
-    public outletState: Reference<OutletState | undefined>
-  ) {}
+  constructor(public view: View | null, public outletState: Reference<OutletState | undefined>) {}
 
   child() {
     return new DynamicScope(this.view, this.outletState);
@@ -129,7 +136,7 @@ class RootState {
       template !== undefined
     );
 
-    this.id = getViewId(root);
+    this.id = root instanceof OutletView ? guidFor(root) : getViewId(root);
     this.result = undefined;
     this.destroyed = false;
 
@@ -449,7 +456,7 @@ export class Renderer {
     this._clearAllRoots();
   }
 
-  getElement(view: unknown): Option<SimpleElement> {
+  getElement(view: View): Option<SimpleElement> {
     if (this._isInteractive) {
       return getViewElement(view);
     } else {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 1c87da38c85..780e5ee2594 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -10,7 +10,7 @@ import {
   Reference,
   valueForRef,
 } from '@glimmer/reference';
-import { Component } from './curly-component-state-bucket';
+import Component from '../component';
 
 function referenceForParts(rootRef: Reference<Component>, parts: string[]): Reference {
   let isAttrs = parts[0] === 'attrs';
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 117c4a41a30..5ad9fe9aa18 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,27 +1,9 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
 import { registerDestructor } from '@glimmer/destroyable';
-import { CapturedNamedArguments, Template, TemplateFactory } from '@glimmer/interfaces';
+import { CapturedNamedArguments } from '@glimmer/interfaces';
 import { createConstRef, Reference } from '@glimmer/reference';
 import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
-import { Renderer } from '../renderer';
-
-export interface Component {
-  _debugContainerKey: string;
-  _transitionTo(name: string): void;
-  layout?: TemplateFactory | Template;
-  layoutName?: string;
-  attributeBindings: Array<string>;
-  classNames: Array<string>;
-  classNameBindings: Array<string>;
-  elementId: string;
-  tagName: string;
-  isDestroying: boolean;
-  appendChild(view: {}): void;
-  trigger(event: string): void;
-  destroy(): void;
-  setProperties(props: { [key: string]: any }): void;
-  renderer: Renderer;
-}
+import Component from '../component';
 
 type Finalizer = () => void;
 function NOOP() {}
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 1494f62c0b8..3cc9f927a84 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1003,7 +1003,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         );
 
         this.addComponent('hello-world', {
-          ComponentClass: Component.extend(),
+          ComponentClass: class extends Component {},
           template: 'Hello World',
         });
 
@@ -1498,11 +1498,12 @@ if (ENV._DEBUG_RENDER_TREE) {
         );
 
         this.addComponent('hello-world', {
-          ComponentClass: Component.extend({
-            init() {
+          ComponentClass: class extends Component {
+            constructor(owner: Owner) {
+              super(owner);
               throw new Error('oops!');
-            },
-          }),
+            }
+          },
           template: '{{@name}}',
         });
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
index 5d0bb160322..5b053513747 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
@@ -13,6 +13,13 @@ interface Evented {
     method: string | ((this: Target, ...args: any[]) => void)
   ): this;
   on(name: string, method: ((...args: any[]) => void) | string): this;
+  // Allow for easier super calls
+  on<Target>(
+    name: string,
+    ...args:
+      | [Target, string | ((this: Target, ...args: any[]) => void)]
+      | [((...args: any[]) => void) | string]
+  ): this;
   /**
    * Subscribes a function to a named event and then cancels the subscription
    * after the first time the event is triggered. It is good to use ``one`` when
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts
new file mode 100644
index 00000000000..fc7195ce6b4
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts
@@ -0,0 +1,12 @@
+import Mixin from '@ember/object/mixin';
+
+interface TargetActionSupport {
+  target: unknown;
+  action: unknown;
+  actionContext: unknown;
+  actionContextObject: unknown;
+  triggerAction(opts?: object): unknown;
+}
+declare const TargetActionSupport: Mixin;
+
+export default TargetActionSupport;
diff --git a/packages/@ember/-internals/views/index.d.ts b/packages/@ember/-internals/views/index.d.ts
deleted file mode 100644
index 811551560d9..00000000000
--- a/packages/@ember/-internals/views/index.d.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Option } from '@glimmer/interfaces';
-import { SimpleElement } from '@simple-dom/interface';
-import { Object as EmberObject } from '@ember/-internals/runtime';
-
-export const ActionSupport: any;
-export const ChildViewsSupport: any;
-export const ClassNamesSupport: any;
-export const CoreView: any;
-export const ViewMixin: any;
-export const ViewStateSupport: any;
-
-export function getElementView(element: SimpleElement): unknown;
-export function getViewElement(view: unknown): Option<SimpleElement>;
-export function setElementView(element: SimpleElement, view: unknown): void;
-export function setViewElement(view: unknown, element: SimpleElement): void;
-export function clearElementView(element: SimpleElement): void;
-export function clearViewElement(view: unknown): void;
-
-export function addChildView(parent: unknown, child: unknown): void;
-
-export function isSimpleClick(event: Event): boolean;
-
-export function constructStyleDeprecationMessage(affectedStyle: any): string;
-
-export function getViewId(view: any): string;
-
-export const MUTABLE_CELL: string;
-
-export const ActionManager: {
-  registeredActions: {
-    [id: string]: any | undefined;
-  };
-};
-
-export declare class EventDispatcher extends EmberObject {
-  events: Record<string, string>;
-  finalEventNameMapping: Record<string, string>;
-  rootElement: string | HTMLElement;
-  lazyEvents: Map<string, string>;
-
-  setup(addedEvents: object, rootElement?: string | HTMLElement): void;
-  setupHandlerForBrowserEvent(event: string): void;
-  setupHandlerForEmberEvent(event: string): void;
-}
diff --git a/packages/@ember/-internals/views/index.js b/packages/@ember/-internals/views/index.ts
similarity index 100%
rename from packages/@ember/-internals/views/index.js
rename to packages/@ember/-internals/views/index.ts
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.d.ts b/packages/@ember/-internals/views/lib/mixins/action_support.d.ts
new file mode 100644
index 00000000000..70ba2cbfaf0
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.d.ts
@@ -0,0 +1,8 @@
+import Mixin from '@ember/object/mixin';
+
+interface ActionSupport {
+  send(actionName: string, ...args: unknown[]): void;
+}
+declare const ActionSupport: Mixin;
+
+export default ActionSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts b/packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts
new file mode 100644
index 00000000000..5b60b8703d2
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts
@@ -0,0 +1,10 @@
+import { View } from '@ember/-internals/glimmer/lib/renderer';
+import Mixin from '@ember/object/mixin';
+
+interface ChildViewsSupport {
+  readonly childViews: View[];
+  appendChild(view: View): void;
+}
+declare const ChildViewsSupport: Mixin;
+
+export default ChildViewsSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts b/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
new file mode 100644
index 00000000000..508e1c04baa
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
@@ -0,0 +1,10 @@
+import Mixin from '@ember/object/mixin';
+
+interface ClassNamesSupport {
+  concatenatedProperties: string[];
+  classNames: string[];
+  classNameBindings: string[];
+}
+declare const ClassNamesSupport: Mixin;
+
+export default ClassNamesSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts b/packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts
new file mode 100644
index 00000000000..0c92c9b7fa5
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts
@@ -0,0 +1,8 @@
+import Mixin from '@ember/object/mixin';
+
+interface ViewStateSupport {
+  _transitionTo(state: unknown): void;
+}
+declare const ViewStateSupport: Mixin;
+
+export default ViewStateSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.d.ts b/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
new file mode 100644
index 00000000000..a26059e51cb
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
@@ -0,0 +1,20 @@
+import Mixin from '@ember/object/mixin';
+
+interface ViewSupport {
+  concatenatedProperties: string[];
+  rerender(): unknown;
+  element: Element;
+  appendTo(selector: string | Element): this;
+  append(): this;
+  elementId: string | null;
+  willInsertElement(): void;
+  didInsertElement(): void;
+  willClearRender(): void;
+  willDestroyElement(): void;
+  parentViewDidChange(): void;
+  tagName: string | null;
+  handleEvent(eventName: string, evt: unknown): unknown;
+}
+declare const ViewSupport: Mixin;
+
+export default ViewSupport;
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
new file mode 100644
index 00000000000..5113dc50e67
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
@@ -0,0 +1,8 @@
+import EmberObject from '@ember/object';
+
+export default class EventDispatcher extends EmberObject {
+  finalEventNameMapping: Record<string, string>;
+  lazyEvents: Map<string, string>;
+  setupHandlerForBrowserEvent(event: string): void;
+  setupHandlerForEmberEvent(event: string): void;
+}
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 975af3d1f81..633c76459b4 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -1,15 +1,18 @@
-import { Renderer } from '@ember/-internals/glimmer';
+import { View } from '@ember/-internals/glimmer/lib/renderer';
 import { getOwner, Owner } from '@ember/-internals/owner';
-/* globals Element */
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { Dict, Option } from '@glimmer/interfaces';
+import { SimpleElement } from '@simple-dom/interface';
 
 /**
 @module ember
 */
 
-export function isSimpleClick(event: MouseEvent): boolean {
+export function isSimpleClick(event: Event): boolean {
+  if (!(event instanceof MouseEvent)) {
+    return false;
+  }
   let modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
   let secondaryClick = event.which > 1; // IE9 may return undefined
 
@@ -29,15 +32,6 @@ export function constructStyleDeprecationMessage(affectedStyle: string): string
   );
 }
 
-interface View {
-  parentView: Option<View>;
-  renderer: Renderer;
-  tagName?: string;
-  elementId?: string;
-  isDestroying: boolean;
-  isDestroyed: boolean;
-}
-
 /**
   @private
   @method getRootViews
@@ -73,10 +67,10 @@ export function getViewId(view: View): string {
   }
 }
 
-const ELEMENT_VIEW: WeakMap<Element, View> = new WeakMap();
-const VIEW_ELEMENT: WeakMap<View, Element> = new WeakMap();
+const ELEMENT_VIEW: WeakMap<SimpleElement, View> = new WeakMap();
+const VIEW_ELEMENT: WeakMap<View, SimpleElement> = new WeakMap();
 
-export function getElementView(element: Element): Option<View> {
+export function getElementView(element: SimpleElement): Option<View> {
   return ELEMENT_VIEW.get(element) || null;
 }
 
@@ -85,15 +79,15 @@ export function getElementView(element: Element): Option<View> {
   @method getViewElement
   @param {Ember.View} view
  */
-export function getViewElement(view: View): Option<Element> {
+export function getViewElement(view: View): Option<SimpleElement> {
   return VIEW_ELEMENT.get(view) || null;
 }
 
-export function setElementView(element: Element, view: View): void {
+export function setElementView(element: SimpleElement, view: View): void {
   ELEMENT_VIEW.set(element, view);
 }
 
-export function setViewElement(view: View, element: Element): void {
+export function setViewElement(view: View, element: SimpleElement): void {
   VIEW_ELEMENT.set(view, element);
 }
 
@@ -102,7 +96,7 @@ export function setViewElement(view: View, element: Element): void {
 // this case, we want to prevent access to the element (and vice verse) during
 // destruction.
 
-export function clearElementView(element: Element): void {
+export function clearElementView(element: SimpleElement): void {
   ELEMENT_VIEW.delete(element);
 }
 
diff --git a/packages/@ember/-internals/views/lib/views/core_view.d.ts b/packages/@ember/-internals/views/lib/views/core_view.d.ts
new file mode 100644
index 00000000000..a3c23eaa4e5
--- /dev/null
+++ b/packages/@ember/-internals/views/lib/views/core_view.d.ts
@@ -0,0 +1,12 @@
+import { Renderer } from '@ember/-internals/glimmer';
+import { ActionHandler } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import Evented from '@ember/object/evented';
+
+interface CoreView extends Evented, ActionHandler {}
+declare class CoreView extends EmberObject {
+  parentView: CoreView | null;
+  renderer: Renderer;
+}
+
+export { CoreView as default };
diff --git a/packages/@ember/component/type-tests/index.test.ts b/packages/@ember/component/type-tests/index.test.ts
new file mode 100644
index 00000000000..bccc1576357
--- /dev/null
+++ b/packages/@ember/component/type-tests/index.test.ts
@@ -0,0 +1,10 @@
+import Component from '@ember/component';
+import { CoreView } from '@ember/-internals/views';
+import { expectTypeOf } from 'expect-type';
+import { Owner } from '@ember/-internals/owner';
+
+// NOTE: This is invalid, but acceptable for type tests
+let owner = {} as Owner;
+let component = new Component(owner);
+
+expectTypeOf(component).toMatchTypeOf<CoreView>();

From 4b1ccc2be4dd8f7d7a7bb1d1a3ff96eb76d6e5c3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Feb 2022 15:40:11 -0800
Subject: [PATCH 0887/1405] Future public types for @ember/component

---
 .../@ember/-internals/glimmer/lib/helper.ts   | 27 ++++++++----
 .../-internals/glimmer/lib/utils/managers.ts  |  6 +--
 .../component/type-tests/capabilities.test.ts | 16 +++++++
 .../type-tests/get-component-template.test.ts |  8 ++++
 .../type-tests/helper/helper.test.ts          | 18 ++++++++
 .../component/type-tests/helper/index.test.ts | 42 +++++++++++++++++++
 .../@ember/component/type-tests/index.test.ts | 41 ++++++++++++++++++
 .../type-tests/set-component-manager.test.ts  | 17 ++++++++
 .../type-tests/set-component-template.test.ts |  8 ++++
 .../type-tests/template-only.test.ts          | 11 +++++
 .../helper/type-tests/invoke-helper.test.ts   |  8 +++-
 11 files changed, 191 insertions(+), 11 deletions(-)
 create mode 100644 packages/@ember/component/type-tests/capabilities.test.ts
 create mode 100644 packages/@ember/component/type-tests/get-component-template.test.ts
 create mode 100644 packages/@ember/component/type-tests/helper/helper.test.ts
 create mode 100644 packages/@ember/component/type-tests/helper/index.test.ts
 create mode 100644 packages/@ember/component/type-tests/set-component-manager.test.ts
 create mode 100644 packages/@ember/component/type-tests/set-component-template.test.ts
 create mode 100644 packages/@ember/component/type-tests/template-only.test.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 2370ffe92e8..e9932fac16d 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -13,7 +13,11 @@ import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 
 export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
 
-export type HelperFunction<T = unknown> = (positional: unknown[], named: Dict<unknown>) => T;
+export type HelperFunction<
+  T = unknown,
+  P extends unknown[] = unknown[],
+  N extends Dict<unknown> = Dict<unknown>
+> = (positional: P, named: N) => T;
 
 export type SimpleHelperFactory = Factory<SimpleHelper, HelperFactory<SimpleHelper>>;
 export type ClassHelperFactory = Factory<HelperInstance, HelperFactory<HelperInstance>>;
@@ -30,8 +34,12 @@ export interface HelperInstance<T = unknown> {
 
 const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
 
-export interface SimpleHelper<T = unknown> {
-  compute: HelperFunction<T>;
+export interface SimpleHelper<
+  T = unknown,
+  P extends unknown[] = unknown[],
+  N extends Dict<unknown> = Dict<unknown>
+> {
+  compute: HelperFunction<T, P, N>;
 }
 
 /**
@@ -89,7 +97,7 @@ interface Helper {
     @public
     @since 1.13.0
   */
-  compute(params: unknown[], hash: object): unknown;
+  compute(params: unknown[], hash: Dict<unknown>): unknown;
 }
 class Helper extends FrameworkObject {
   static isHelperFactory = true;
@@ -199,10 +207,11 @@ export const CLASSIC_HELPER_MANAGER = getInternalHelperManager(Helper);
 
 ///////////
 
-class Wrapper implements HelperFactory<SimpleHelper> {
+class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
+  implements HelperFactory<SimpleHelper<T, P, N>> {
   isHelperFactory: true = true;
 
-  constructor(public compute: HelperFunction) {}
+  constructor(public compute: HelperFunction<T, P, N>) {}
 
   create() {
     // needs new instance or will leak containers
@@ -256,7 +265,11 @@ setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype);
   @public
   @since 1.13.0
 */
-export function helper(helperFn: HelperFunction): HelperFactory<SimpleHelper> {
+export function helper<
+  T = unknown,
+  P extends unknown[] = unknown[],
+  N extends Dict<unknown> = Dict<unknown>
+>(helperFn: HelperFunction<T, P, N>): HelperFactory<SimpleHelper<T, P, N>> {
   return new Wrapper(helperFn);
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 1c7a8674292..a3b88671ccb 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -17,10 +17,10 @@ import {
    @return {Object} the same object passed in
    @public
   */
-export function setComponentManager(
+export function setComponentManager<T extends object>(
   manager: (owner: Owner) => ComponentManager<unknown>,
-  obj: object
-): object {
+  obj: T
+): T {
   return glimmerSetComponentManager(manager, obj);
 }
 
diff --git a/packages/@ember/component/type-tests/capabilities.test.ts b/packages/@ember/component/type-tests/capabilities.test.ts
new file mode 100644
index 00000000000..0014713e0ae
--- /dev/null
+++ b/packages/@ember/component/type-tests/capabilities.test.ts
@@ -0,0 +1,16 @@
+import { capabilities } from '@ember/component';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(capabilities('3.13')).toMatchTypeOf<{
+  asyncLifecycleCallbacks?: boolean | undefined;
+  destructor?: boolean | undefined;
+  updateHook?: boolean | undefined;
+}>();
+
+capabilities('3.13', { asyncLifecycleCallbacks: true });
+capabilities('3.4', { asyncLifecycleCallbacks: true });
+
+// @ts-expect-error invalid capabilities
+capabilities('3.13', { asyncLifecycleCallbacks: 1 });
+// @ts-expect-error invalid verison
+capabilities('3.12');
diff --git a/packages/@ember/component/type-tests/get-component-template.test.ts b/packages/@ember/component/type-tests/get-component-template.test.ts
new file mode 100644
index 00000000000..6a50cf49cb5
--- /dev/null
+++ b/packages/@ember/component/type-tests/get-component-template.test.ts
@@ -0,0 +1,8 @@
+import { getComponentTemplate } from '@ember/component';
+import { TemplateFactory } from '@glimmer/interfaces';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(getComponentTemplate({})).toEqualTypeOf<TemplateFactory | undefined>();
+
+// @ts-expect-error requires param
+getComponentTemplate();
diff --git a/packages/@ember/component/type-tests/helper/helper.test.ts b/packages/@ember/component/type-tests/helper/helper.test.ts
new file mode 100644
index 00000000000..e1e02d26e2a
--- /dev/null
+++ b/packages/@ember/component/type-tests/helper/helper.test.ts
@@ -0,0 +1,18 @@
+import { HelperFactory, SimpleHelper } from '@ember/-internals/glimmer/lib/helper';
+import { helper } from '@ember/component/helper';
+import { expectTypeOf } from 'expect-type';
+
+// NOTE: The types for `helper` are not actually safe. Glint helps with this.
+
+let myHelper = helper(function ([cents]: [number], { currency }: { currency: string }) {
+  return `${currency}${cents * 0.01}`;
+});
+expectTypeOf(myHelper).toEqualTypeOf<
+  HelperFactory<SimpleHelper<string, [number], { currency: string }>>
+>();
+
+// @ts-expect-error invalid named params
+helper(function ([cents]: [number], named: number) {});
+
+// @ts-expect-error invalid params
+helper(function (params: number) {});
diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts
new file mode 100644
index 00000000000..e3d3a8e075f
--- /dev/null
+++ b/packages/@ember/component/type-tests/helper/index.test.ts
@@ -0,0 +1,42 @@
+import { Owner } from '@ember/-internals/owner';
+import { FrameworkObject } from '@ember/-internals/runtime';
+import Helper from '@ember/component/helper';
+import { expectTypeOf } from 'expect-type';
+
+// Good enough for tests
+let owner = {} as Owner;
+
+// NOTE: The types for `compute` are not actually safe. Glint helps with this.
+
+let helper = new Helper(owner);
+
+expectTypeOf(helper).toMatchTypeOf<FrameworkObject>();
+
+class MyHelper extends Helper {
+  compute([cents]: [number], { currency }: { currency: string }) {
+    return `${currency}${cents * 0.01}`;
+  }
+}
+new MyHelper(owner);
+
+class NoHash extends Helper {
+  compute([cents]: [number]): string {
+    return `${cents * 0.01}`;
+  }
+}
+new NoHash(owner);
+
+class NoParams extends Helper {
+  compute(): string {
+    return 'hello';
+  }
+}
+new NoParams(owner);
+
+class InvalidHelper extends Helper {
+  // @ts-expect-error Invalid params
+  compute(value: boolean): string {
+    return String(value);
+  }
+}
+new InvalidHelper(owner);
diff --git a/packages/@ember/component/type-tests/index.test.ts b/packages/@ember/component/type-tests/index.test.ts
index bccc1576357..8538178abcc 100644
--- a/packages/@ember/component/type-tests/index.test.ts
+++ b/packages/@ember/component/type-tests/index.test.ts
@@ -2,9 +2,50 @@ import Component from '@ember/component';
 import { CoreView } from '@ember/-internals/views';
 import { expectTypeOf } from 'expect-type';
 import { Owner } from '@ember/-internals/owner';
+import { View } from '@ember/-internals/glimmer/lib/renderer';
+import { action } from '@ember/object';
+import { tracked } from '@ember/-internals/metal';
 
 // NOTE: This is invalid, but acceptable for type tests
 let owner = {} as Owner;
 let component = new Component(owner);
 
 expectTypeOf(component).toMatchTypeOf<CoreView>();
+expectTypeOf(component).toMatchTypeOf<View>();
+
+class MyComponent extends Component {
+  tagName = 'em';
+  classNames = ['my-class', 'my-other-class'];
+  classNameBindings = ['propertyA', 'propertyB'];
+  attributeBindings = ['href'];
+
+  @tracked propertyA = 'from-a';
+
+  get propertyB(): string | void {
+    if (this.propertyA === 'from-a') {
+      return 'from-b';
+    }
+  }
+
+  @tracked href = 'https://tilde.io';
+
+  @action click(_event: Event): void {
+    // Clicked!
+  }
+}
+new MyComponent(owner);
+
+class BadComponent extends Component {
+  // @ts-expect-error invalid tag name
+  tagName = 1;
+
+  // @ts-expect-error invalid classname
+  classNames = 'foo';
+
+  // @ts-expect-error invalid classNameBindings
+  classNameBindings = [1];
+
+  // @ts-expect-error invalid attributeBindings
+  attributeBindings = [true];
+}
+new BadComponent(owner);
diff --git a/packages/@ember/component/type-tests/set-component-manager.test.ts b/packages/@ember/component/type-tests/set-component-manager.test.ts
new file mode 100644
index 00000000000..6e29af3c11f
--- /dev/null
+++ b/packages/@ember/component/type-tests/set-component-manager.test.ts
@@ -0,0 +1,17 @@
+import { Owner } from '@ember/-internals/owner';
+import { setComponentManager } from '@ember/component';
+import { ComponentManager } from '@glimmer/interfaces';
+import { expectTypeOf } from 'expect-type';
+
+// Obviously this is invalid, but it works for our purposes.
+let manager = {} as ComponentManager<unknown>;
+
+class Foo {}
+let foo = new Foo();
+
+expectTypeOf(setComponentManager((_owner: Owner) => manager, foo)).toEqualTypeOf<Foo>();
+
+// @ts-expect-error invalid callback
+setComponentManager(() => {
+  return {};
+}, foo);
diff --git a/packages/@ember/component/type-tests/set-component-template.test.ts b/packages/@ember/component/type-tests/set-component-template.test.ts
new file mode 100644
index 00000000000..a99a3d3608e
--- /dev/null
+++ b/packages/@ember/component/type-tests/set-component-template.test.ts
@@ -0,0 +1,8 @@
+import { setComponentTemplate } from '@ember/component';
+import { TemplateFactory } from '@glimmer/interfaces';
+import { expectTypeOf } from 'expect-type';
+
+// Good enough for testing
+let factory = {} as TemplateFactory;
+
+expectTypeOf(setComponentTemplate(factory, {})).toEqualTypeOf<object>();
diff --git a/packages/@ember/component/type-tests/template-only.test.ts b/packages/@ember/component/type-tests/template-only.test.ts
new file mode 100644
index 00000000000..a47ba4153e2
--- /dev/null
+++ b/packages/@ember/component/type-tests/template-only.test.ts
@@ -0,0 +1,11 @@
+import templateOnlyComponent from '@ember/component/template-only';
+import { TemplateOnlyComponentDefinition } from '@glimmer/runtime/dist/types/lib/component/template-only';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(templateOnlyComponent()).toEqualTypeOf<TemplateOnlyComponentDefinition>();
+
+templateOnlyComponent('myModule');
+templateOnlyComponent('myModule', 'myName');
+
+// @ts-expect-error invalid params
+templateOnlyComponent(1);
diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts
index 596b856bc8c..65300ce5519 100644
--- a/packages/@ember/helper/type-tests/invoke-helper.test.ts
+++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts
@@ -1,5 +1,6 @@
 import Component from '@ember/-internals/glimmer/lib/component';
 import { getValue } from '@ember/-internals/metal';
+import { Owner } from '@ember/-internals/owner';
 import Helper from '@ember/component/helper';
 import { invokeHelper } from '@ember/helper';
 import { Cache } from '@glimmer/validator';
@@ -14,6 +15,9 @@ class PlusOne extends Helper {
 }
 
 export default class PlusOneComponent extends Component {
+  // Glint would help with this
+  declare args: { number: number };
+
   plusOne = invokeHelper(this, PlusOne, () => {
     return {
       positional: [this.args.number],
@@ -25,6 +29,8 @@ export default class PlusOneComponent extends Component {
   }
 }
 
-let component = new PlusOneComponent();
+// Good enough for tests!
+let owner = {} as Owner;
+let component = new PlusOneComponent(owner);
 
 expectTypeOf(component.plusOne).toEqualTypeOf<Cache<unknown>>();

From 8dac87b3ef36640771bf1af920c1aa97c1fdd07e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Feb 2022 17:19:30 +0000
Subject: [PATCH 0888/1405] Bump engine.io from 5.2.0 to 5.2.1

Bumps [engine.io](https://github.com/socketio/engine.io) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/socketio/engine.io/releases)
- [Changelog](https://github.com/socketio/engine.io/blob/5.2.1/CHANGELOG.md)
- [Commits](https://github.com/socketio/engine.io/compare/5.2.0...5.2.1)

---
updated-dependencies:
- dependency-name: engine.io
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 60cf011d225..b80e5d2089e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1565,12 +1565,12 @@ abbrev@1:
   integrity "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg= sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity "sha1-UxvHJlF6OytB+FACHGzBXqq1B80= sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
 
 acorn-dynamic-import@^3.0.0:
   version "3.0.0"
@@ -2133,7 +2133,7 @@ balanced-match@^1.0.0:
 base64-arraybuffer@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg=="
+  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
 base64-js@^1.0.2:
   version "1.3.1"
@@ -3333,9 +3333,9 @@ cookie@0.4.0:
   integrity "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo= sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
 
 cookie@~0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity "sha1-r9cT/ibr0hupXOth+agRblClN9E= sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
@@ -4026,9 +4026,9 @@ engine.io-parser@~4.0.0:
     base64-arraybuffer "0.1.4"
 
 engine.io@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.0.tgz#554cdd0230d89de7b1a49a809d7ee5a129d36809"
-  integrity sha512-d1DexkQx87IFr1FLuV+0f5kAm1Hk1uOVijLOb+D1sDO2QMb7YjE02VHtZtxo7xIXMgcWLb+vl3HRT0rI9tr4jQ==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-5.2.1.tgz#3f84baf13471d35a6f3284a4effcd04c2f73c8a1"
+  integrity sha512-hyNxjVgWp619QMfqi/+/6/LQF+ueOIWeVOza3TeyvxUGjeT9U/xPkkHW/NJNuhbStrxMujEoMadoc2EY7DDEnw==
   dependencies:
     accepts "~1.3.4"
     base64id "2.0.0"
@@ -7114,7 +7114,7 @@ mime-db@1.51.0, "mime-db@>= 1.40.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
-mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.24:
+mime-types@^2.1.18, mime-types@^2.1.26, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.34"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
   integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
@@ -7334,10 +7334,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
 
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity "sha1-/qz3zPUlp3rpY0Q2pkiD/+yjRvs= sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.6.0:
   version "2.6.2"

From 709cbc074871b3d18c9cdb73ca5f3e468ece0d98 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 23 Dec 2021 16:47:50 -0800
Subject: [PATCH 0889/1405] Initial implementation of the unique-id helper

The implementation works, and still needs:

- [ ] Docs
- [ ] Feature Flag

Co-authored-by: Melanie Sumner <melaniersumner@gmail.com>
---
 .../glimmer/lib/helpers/unique-id.ts          |  23 +++
 .../@ember/-internals/glimmer/lib/resolver.ts |   3 +
 .../integration/helpers/unique-id-test.js     | 144 ++++++++++++++++++
 3 files changed, 170 insertions(+)
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
 create mode 100644 packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
new file mode 100644
index 00000000000..b5eabf82257
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -0,0 +1,23 @@
+import { internalHelper } from './internal-helper';
+import { Reference, createConstRef } from '@glimmer/reference';
+
+export default internalHelper(
+  (): Reference<string> => {
+    return createConstRef(uniqueId(), 'unique-id');
+  }
+);
+
+// From https://gist.github.com/selfish/fef2c0ba6cdfe07af76e64cecd74888b
+//
+// This code should be reasonably fast, and provide a unique value every time
+// it's called, which is what we need here. It produces a string formatted as a
+// standard UUID, which avoids accidentally turning Ember-specific
+// implementation details into an intimate API.
+function uniqueId() {
+  // @ts-expect-error this one-liner abuses weird JavaScript semantics that
+  // TypeScript (legitimately) doesn't like, but they're nonetheless valid and
+  // specced.
+  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (a) =>
+    (a ^ ((Math.random() * 16) >> (a / 4))).toString(16)
+  );
+}
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ffd80103b21..9e5fefd507b 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -49,6 +49,8 @@ import { default as eachIn } from './helpers/each-in';
 import { default as mut } from './helpers/mut';
 import { default as readonly } from './helpers/readonly';
 import { default as unbound } from './helpers/unbound';
+import { default as uniqueId } from './helpers/unique-id';
+
 import actionModifier from './modifiers/action';
 import { mountHelper } from './syntax/mount';
 import { outletHelper } from './syntax/outlet';
@@ -142,6 +144,7 @@ const BUILTIN_HELPERS = {
   fn,
   get,
   hash,
+  'unique-id': uniqueId,
 };
 
 const BUILTIN_KEYWORD_MODIFIERS = {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
new file mode 100644
index 00000000000..1209edc3839
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
@@ -0,0 +1,144 @@
+import { RenderingTestCase, strip, moduleFor, runTask } from 'internal-test-helpers';
+import { setProperties } from '@ember/-internals/metal';
+
+moduleFor(
+  'Helpers test: {{unique-id}}',
+  class extends RenderingTestCase {
+    ['@test it generates a unique id (string) each time']() {
+      let { first, second } = this.render(`<p>{{unique-id}}</p><p>{{unique-id}}</p>`, () => {
+        let first = this.asElement(this.firstChild);
+        let second = this.asElement(this.nthChild(1));
+
+        return {
+          first: this.asTextContent(first.firstChild),
+          second: this.asTextContent(second.firstChild),
+        };
+      });
+
+      this.assert.notStrictEqual(
+        first,
+        second,
+        `different invocations of {{unique-id}} should produce different values`
+      );
+    }
+
+    [`@test when unique-id is used with #let, it remains stable when it's used`]() {
+      let { first, second } = this.render(
+        strip`
+          {{#let (unique-id) as |id|}}
+            <p>{{id}}</p><p>{{id}}</p>
+          {{/let}}
+        `,
+        () => {
+          let first = this.asElement(this.firstChild);
+          let second = this.asElement(this.nthChild(1));
+
+          return {
+            first: this.asTextContent(first.firstChild),
+            second: this.asTextContent(second.firstChild),
+          };
+        }
+      );
+
+      this.assert.strictEqual(
+        first,
+        second,
+        `when unique-id is used as a variable, it remains the same`
+      );
+    }
+
+    [`@test unique-id doesn't change if it's concatenated with a value that does change`]() {
+      class Elements {
+        constructor(label, input, assert) {
+          this.label = label;
+          this.input = input;
+          this.assert = assert;
+        }
+
+        id(regex) {
+          let forAttr = this.label.getAttribute('for');
+
+          this.assert.strictEqual(
+            forAttr,
+            this.input.getAttribute('id'),
+            `the label's 'for' attribute should be the same as the input's 'id' attribute`
+          );
+
+          let match = forAttr.match(regex);
+
+          this.assert.ok(match, 'the id starts with the prefix');
+
+          return match[1];
+        }
+      }
+
+      let { elements, id } = this.render(
+        strip`
+            {{#let (unique-id) as |id|}}
+              <label for="{{this.prefix}}-{{id}}">Enable Feature</label>
+              <input id="{{this.prefix}}-{{id}}" type="checkbox">
+            {{/let}}`,
+        { prefix: 'app' },
+        () => {
+          let label = this.asElement(this.firstChild, 'label');
+          let input = this.asElement(this.nthChild(1), 'input');
+
+          let elements = new Elements(label, input, this.assert);
+
+          return { elements, id: elements.id(/^app-(.*)$/) };
+        }
+      );
+
+      this.update({ prefix: 'melanie' }, () => {
+        let newId = elements.id(/^melanie-(.*)$/);
+
+        this.assert.strictEqual(
+          id,
+          newId,
+          `the unique-id part of a concatenated attribute shouldn't change just because a dynamic part of it changed`
+        );
+      });
+    }
+
+    render(template, ...rest) {
+      // If there are three parameters to `render`, the second parameter is the
+      // template's arguments.
+      let args = rest.length === 2 ? rest[0] : {};
+      // If there are two parameters to `render`, the second parameter is the
+      // postcondition. Otherwise, the third parameter is the postcondition.
+      let postcondition = rest.length === 2 ? rest[1] : rest[0];
+
+      super.render(template, args);
+      let result = postcondition();
+      this.assertStableRerender();
+      return result;
+    }
+
+    update(args, postcondition) {
+      runTask(() => setProperties(this.context, args));
+      postcondition();
+      this.assertStableRerender();
+    }
+
+    asElement(node, tag) {
+      this.assert.ok(node !== null && node.nodeType === 1);
+
+      if (tag) {
+        this.assert.strictEqual(node.tagName.toLowerCase(), tag, `Element is <${tag}>`);
+      }
+
+      return node;
+    }
+
+    asTextNode(node) {
+      this.assert.ok(node !== null && node.nodeType === 3);
+      return node;
+    }
+
+    asTextContent(node) {
+      let data = this.asTextNode(node).data;
+      this.assert.ok(data.trim().length > 0, `The text node has content`);
+      return data;
+    }
+  }
+);

From ef40ae6a4cf490619ff227bbb61a12c19826feb0 Mon Sep 17 00:00:00 2001
From: Melanie <melanie.sumner@hey.com>
Date: Fri, 24 Dec 2021 13:50:10 -0600
Subject: [PATCH 0890/1405] Fixed linter issues.

---
 packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index b5eabf82257..d0f5b140404 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -1,5 +1,5 @@
+import { createConstRef, Reference } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
-import { Reference, createConstRef } from '@glimmer/reference';
 
 export default internalHelper(
   (): Reference<string> => {

From cf2fa08cf9622e5edb543022f57b6383381a9716 Mon Sep 17 00:00:00 2001
From: Melanie <melanie.sumner@hey.com>
Date: Fri, 24 Dec 2021 14:08:08 -0600
Subject: [PATCH 0891/1405] Added documentation

---
 .../glimmer/lib/helpers/unique-id.ts          | 27 +++++++++++++++++++
 tests/docs/expected.js                        |  1 +
 2 files changed, 28 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index d0f5b140404..2f2dd35be4d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -1,3 +1,30 @@
+/**
+@module ember
+*/
+
+/**
+  Use the {{unique-id}} helper to generate a unique ID string suitable for use as
+  an ID attribute in the DOM.
+
+  ```handlebars
+  <input id={{unique-id}} type="email" />
+  ```
+  Each invocation of {{unique-id}} will return a new, unique ID string.
+  You can use the `let` helper to create an ID that can be reused within a template.
+
+  ```handlebars
+  {{#let (unique-id) as |emailId|}}
+    <label for={{emailId}}>Email address</label>
+    <input id={{emailId}} type="email" />
+  {{/let}}
+  ```
+
+  @method unique-id
+  @for Ember.Templates.helpers
+  @since 4.1.0
+  @public
+  */
+
 import { createConstRef, Reference } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index f2ff968fd14..81253774e8f 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -512,6 +512,7 @@ module.exports = {
     'union',
     'uniq',
     'uniqBy',
+    'unique-id',
     'unless',
     'unregister',
     'unregisterDestructor',

From 2313c5c28fbb1cea4b8793c06cdc58b14ece3332 Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Wed, 16 Feb 2022 21:08:48 +0100
Subject: [PATCH 0892/1405] Add a feature flag for the unique-id helper

---
 .../@ember/-internals/glimmer/lib/resolver.ts |   6 +-
 .../integration/helpers/unique-id-test.js     | 223 +++++++++---------
 packages/@ember/canary-features/index.ts      |   2 +
 3 files changed, 120 insertions(+), 111 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 9e5fefd507b..095f17f51ed 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -2,6 +2,7 @@ import { privatize as P } from '@ember/-internals/container';
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { ENV } from '@ember/-internals/environment';
 import { Factory, Owner } from '@ember/-internals/owner';
+import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
@@ -144,9 +145,12 @@ const BUILTIN_HELPERS = {
   fn,
   get,
   hash,
-  'unique-id': uniqueId,
 };
 
+if (EMBER_UNIQUE_ID_HELPER) {
+  BUILTIN_HELPERS['unique-id'] = uniqueId;
+}
+
 const BUILTIN_KEYWORD_MODIFIERS = {
   action: actionModifier,
 };
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
index 1209edc3839..763722f49ed 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
@@ -1,35 +1,13 @@
 import { RenderingTestCase, strip, moduleFor, runTask } from 'internal-test-helpers';
 import { setProperties } from '@ember/-internals/metal';
-
-moduleFor(
-  'Helpers test: {{unique-id}}',
-  class extends RenderingTestCase {
-    ['@test it generates a unique id (string) each time']() {
-      let { first, second } = this.render(`<p>{{unique-id}}</p><p>{{unique-id}}</p>`, () => {
-        let first = this.asElement(this.firstChild);
-        let second = this.asElement(this.nthChild(1));
-
-        return {
-          first: this.asTextContent(first.firstChild),
-          second: this.asTextContent(second.firstChild),
-        };
-      });
-
-      this.assert.notStrictEqual(
-        first,
-        second,
-        `different invocations of {{unique-id}} should produce different values`
-      );
-    }
-
-    [`@test when unique-id is used with #let, it remains stable when it's used`]() {
-      let { first, second } = this.render(
-        strip`
-          {{#let (unique-id) as |id|}}
-            <p>{{id}}</p><p>{{id}}</p>
-          {{/let}}
-        `,
-        () => {
+import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
+
+if (EMBER_UNIQUE_ID_HELPER) {
+  moduleFor(
+    'Helpers test: {{unique-id}}',
+    class extends RenderingTestCase {
+      ['@test it generates a unique id (string) each time']() {
+        let { first, second } = this.render(`<p>{{unique-id}}</p><p>{{unique-id}}</p>`, () => {
           let first = this.asElement(this.firstChild);
           let second = this.asElement(this.nthChild(1));
 
@@ -37,108 +15,133 @@ moduleFor(
             first: this.asTextContent(first.firstChild),
             second: this.asTextContent(second.firstChild),
           };
-        }
-      );
+        });
 
-      this.assert.strictEqual(
-        first,
-        second,
-        `when unique-id is used as a variable, it remains the same`
-      );
-    }
+        this.assert.notStrictEqual(
+          first,
+          second,
+          `different invocations of {{unique-id}} should produce different values`
+        );
+      }
 
-    [`@test unique-id doesn't change if it's concatenated with a value that does change`]() {
-      class Elements {
-        constructor(label, input, assert) {
-          this.label = label;
-          this.input = input;
-          this.assert = assert;
-        }
+      [`@test when unique-id is used with #let, it remains stable when it's used`]() {
+        let { first, second } = this.render(
+          strip`
+          {{#let (unique-id) as |id|}}
+            <p>{{id}}</p><p>{{id}}</p>
+          {{/let}}
+        `,
+          () => {
+            let first = this.asElement(this.firstChild);
+            let second = this.asElement(this.nthChild(1));
+
+            return {
+              first: this.asTextContent(first.firstChild),
+              second: this.asTextContent(second.firstChild),
+            };
+          }
+        );
 
-        id(regex) {
-          let forAttr = this.label.getAttribute('for');
+        this.assert.strictEqual(
+          first,
+          second,
+          `when unique-id is used as a variable, it remains the same`
+        );
+      }
 
-          this.assert.strictEqual(
-            forAttr,
-            this.input.getAttribute('id'),
-            `the label's 'for' attribute should be the same as the input's 'id' attribute`
-          );
+      [`@test unique-id doesn't change if it's concatenated with a value that does change`]() {
+        class Elements {
+          constructor(label, input, assert) {
+            this.label = label;
+            this.input = input;
+            this.assert = assert;
+          }
 
-          let match = forAttr.match(regex);
+          id(regex) {
+            let forAttr = this.label.getAttribute('for');
 
-          this.assert.ok(match, 'the id starts with the prefix');
+            this.assert.strictEqual(
+              forAttr,
+              this.input.getAttribute('id'),
+              `the label's 'for' attribute should be the same as the input's 'id' attribute`
+            );
 
-          return match[1];
+            let match = forAttr.match(regex);
+
+            this.assert.ok(match, 'the id starts with the prefix');
+
+            return match[1];
+          }
         }
-      }
 
-      let { elements, id } = this.render(
-        strip`
+        let { elements, id } = this.render(
+          strip`
             {{#let (unique-id) as |id|}}
               <label for="{{this.prefix}}-{{id}}">Enable Feature</label>
               <input id="{{this.prefix}}-{{id}}" type="checkbox">
             {{/let}}`,
-        { prefix: 'app' },
-        () => {
-          let label = this.asElement(this.firstChild, 'label');
-          let input = this.asElement(this.nthChild(1), 'input');
-
-          let elements = new Elements(label, input, this.assert);
-
-          return { elements, id: elements.id(/^app-(.*)$/) };
-        }
-      );
+          { prefix: 'app' },
+          () => {
+            let label = this.asElement(this.firstChild, 'label');
+            let input = this.asElement(this.nthChild(1), 'input');
 
-      this.update({ prefix: 'melanie' }, () => {
-        let newId = elements.id(/^melanie-(.*)$/);
+            let elements = new Elements(label, input, this.assert);
 
-        this.assert.strictEqual(
-          id,
-          newId,
-          `the unique-id part of a concatenated attribute shouldn't change just because a dynamic part of it changed`
+            return { elements, id: elements.id(/^app-(.*)$/) };
+          }
         );
-      });
-    }
 
-    render(template, ...rest) {
-      // If there are three parameters to `render`, the second parameter is the
-      // template's arguments.
-      let args = rest.length === 2 ? rest[0] : {};
-      // If there are two parameters to `render`, the second parameter is the
-      // postcondition. Otherwise, the third parameter is the postcondition.
-      let postcondition = rest.length === 2 ? rest[1] : rest[0];
-
-      super.render(template, args);
-      let result = postcondition();
-      this.assertStableRerender();
-      return result;
-    }
+        this.update({ prefix: 'melanie' }, () => {
+          let newId = elements.id(/^melanie-(.*)$/);
 
-    update(args, postcondition) {
-      runTask(() => setProperties(this.context, args));
-      postcondition();
-      this.assertStableRerender();
-    }
+          this.assert.strictEqual(
+            id,
+            newId,
+            `the unique-id part of a concatenated attribute shouldn't change just because a dynamic part of it changed`
+          );
+        });
+      }
 
-    asElement(node, tag) {
-      this.assert.ok(node !== null && node.nodeType === 1);
+      render(template, ...rest) {
+        // If there are three parameters to `render`, the second parameter is the
+        // template's arguments.
+        let args = rest.length === 2 ? rest[0] : {};
+        // If there are two parameters to `render`, the second parameter is the
+        // postcondition. Otherwise, the third parameter is the postcondition.
+        let postcondition = rest.length === 2 ? rest[1] : rest[0];
+
+        super.render(template, args);
+        let result = postcondition();
+        this.assertStableRerender();
+        return result;
+      }
 
-      if (tag) {
-        this.assert.strictEqual(node.tagName.toLowerCase(), tag, `Element is <${tag}>`);
+      update(args, postcondition) {
+        runTask(() => setProperties(this.context, args));
+        postcondition();
+        this.assertStableRerender();
       }
 
-      return node;
-    }
+      asElement(node, tag) {
+        this.assert.ok(node !== null && node.nodeType === 1);
 
-    asTextNode(node) {
-      this.assert.ok(node !== null && node.nodeType === 3);
-      return node;
-    }
+        if (tag) {
+          this.assert.strictEqual(node.tagName.toLowerCase(), tag, `Element is <${tag}>`);
+        }
 
-    asTextContent(node) {
-      let data = this.asTextNode(node).data;
-      this.assert.ok(data.trim().length > 0, `The text node has content`);
-      return data;
+        return node;
+      }
+
+      asTextNode(node) {
+        this.assert.ok(node !== null && node.nodeType === 3);
+        return node;
+      }
+
+      asTextContent(node) {
+        let data = this.asTextNode(node).data;
+        this.assert.ok(data.trim().length > 0, `The text node has content`);
+        return data;
+      }
     }
-  }
-);
+  );
+}
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 8055bb59a69..3d8174b6db1 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -16,6 +16,7 @@ export const DEFAULT_FEATURES = {
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
   EMBER_CACHED: true,
+  EMBER_UNIQUE_ID_HELPER: null,
 };
 
 /**
@@ -70,3 +71,4 @@ export const EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(
   FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH
 );
 export const EMBER_CACHED = featureValue(FEATURES.EMBER_CACHED);
+export const EMBER_UNIQUE_ID_HELPER = featureValue(FEATURES.EMBER_UNIQUE_ID_HELPER);

From 7c53209bc1e7b59b787a6121f6fde7b488a90efc Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 18 Feb 2022 21:08:01 +0100
Subject: [PATCH 0893/1405] [DOC] Update `@since` tag for `unique-id` helper

---
 packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index 2f2dd35be4d..0a094a3c6f7 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -21,7 +21,7 @@
 
   @method unique-id
   @for Ember.Templates.helpers
-  @since 4.1.0
+  @since 4.3.0
   @public
   */
 

From 4830b0404d6e3f0109646a7d98d7b1e698444677 Mon Sep 17 00:00:00 2001
From: Melanie Sumner <melanie.sumner@hey.com>
Date: Fri, 18 Feb 2022 15:26:54 -0600
Subject: [PATCH 0894/1405] Update
 packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts

---
 packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index 0a094a3c6f7..640d104f254 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -21,7 +21,7 @@
 
   @method unique-id
   @for Ember.Templates.helpers
-  @since 4.3.0
+  @since 4.4.0
   @public
   */
 

From 4e4900d934c0aa82b648cc0f17332b3b0e5f2c39 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Mon, 21 Feb 2022 10:48:40 +0100
Subject: [PATCH 0895/1405] [RFC 637] Customizable test setups

---
 .../tests/acceptance/__name__-test.js               |  2 +-
 .../tests/acceptance/__name__-test.js               |  2 +-
 .../__root__/__testType__/__path__/__test__.js      |  4 ++--
 .../__root__/__testType__/__path__/__test__.js      |  4 ++--
 .../__root__/__testType__/__path__/__test__.js      |  2 +-
 .../__root__/__testType__/__path__/__test__.js      |  2 +-
 .../__testType__/__collection__/__name__-test.js    |  2 +-
 .../__testType__/__collection__/__name__-test.js    |  2 +-
 .../__root__/__testType__/__path__/__test__.js      |  2 +-
 .../__root__/__testType__/__path__/__test__.js      |  2 +-
 .../__root__/__testType__/__path__/__test__.js      |  2 +-
 .../__root__/__testType__/__path__/__test__.js      |  2 +-
 node-tests/blueprints/acceptance-test-test.js       |  2 +-
 node-tests/fixtures/acceptance-test/mocha-rfc268.js |  2 +-
 .../fixtures/acceptance-test/qunit-rfc268-addon.js  | 13 +++++++++++++
 node-tests/fixtures/acceptance-test/qunit-rfc268.js |  2 +-
 .../fixtures/component-test/mocha-rfc232-unit.js    |  2 +-
 node-tests/fixtures/component-test/mocha-rfc232.js  |  2 +-
 node-tests/fixtures/component-test/rfc232-unit.js   |  2 +-
 node-tests/fixtures/component-test/rfc232.js        |  2 +-
 .../fixtures/controller-test/mocha-rfc232-nested.js |  2 +-
 node-tests/fixtures/controller-test/mocha-rfc232.js |  2 +-
 .../fixtures/controller-test/rfc232-nested.js       |  2 +-
 node-tests/fixtures/controller-test/rfc232.js       |  2 +-
 node-tests/fixtures/helper-test/mocha-rfc232.js     |  2 +-
 node-tests/fixtures/helper-test/rfc232.js           |  2 +-
 node-tests/fixtures/route-test/mocha-rfc232.js      |  2 +-
 node-tests/fixtures/route-test/rfc232.js            |  2 +-
 node-tests/fixtures/service-test/mocha-rfc232.js    |  2 +-
 node-tests/fixtures/service-test/rfc232.js          |  2 +-
 30 files changed, 44 insertions(+), 31 deletions(-)
 create mode 100644 node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js

diff --git a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
index 58566199373..c829c1213b4 100644
--- a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from 'ember-mocha';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {
diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
index b8215b2e711..874340678ec 100644
--- a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index cded3089872..1124f53ec61 100644
--- a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 999fd69cd9f..922cc75b599 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 39f3d69f5cc..70beddc7a11 100644
--- a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 2bd2b5fb853..576450eeeb7 100644
--- a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 8eed95f4e7f..caf6e271319 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 69c96f7b230..5197aa67b56 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 36e7503f359..163dbd6210b 100644
--- a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index abe9789b73d..1bbe98f8213 100644
--- a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 1970c5ddbb0..3c8a84d0323 100644
--- a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 49b3458119a..fc13a97e339 100644
--- a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index 70a32e23d7b..5a7a1c4f577 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -139,7 +139,7 @@ describe('Blueprint: acceptance-test', function () {
       it('acceptance-test foo', function () {
         return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
           expect(_file('tests/acceptance/foo-test.js')).to.equal(
-            fixture('acceptance-test/qunit-rfc268.js')
+            fixture('acceptance-test/qunit-rfc268-addon.js')
           );
         });
       });
diff --git a/node-tests/fixtures/acceptance-test/mocha-rfc268.js b/node-tests/fixtures/acceptance-test/mocha-rfc268.js
index ee8ab318fc6..89b9ee39e21 100644
--- a/node-tests/fixtures/acceptance-test/mocha-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/mocha-rfc268.js
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from 'ember-mocha';
+import { setupApplicationTest } from 'my-app/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('Acceptance | foo', function () {
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js b/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
new file mode 100644
index 00000000000..2d001b04e05
--- /dev/null
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { visit, currentURL } from '@ember/test-helpers';
+import { setupApplicationTest } from 'my-addon/tests/helpers';
+
+module('Acceptance | foo', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /foo', async function (assert) {
+    await visit('/foo');
+
+    assert.strictEqual(currentURL(), '/foo');
+  });
+});
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268.js b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
index 480b0bacea1..a313e02d112 100644
--- a/node-tests/fixtures/acceptance-test/qunit-rfc268.js
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
+import { setupApplicationTest } from 'my-app/tests/helpers';
 
 module('Acceptance | foo', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/node-tests/fixtures/component-test/mocha-rfc232-unit.js b/node-tests/fixtures/component-test/mocha-rfc232-unit.js
index eb920ec4225..bd084d11c77 100644
--- a/node-tests/fixtures/component-test/mocha-rfc232-unit.js
+++ b/node-tests/fixtures/component-test/mocha-rfc232-unit.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Component | x-foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/component-test/mocha-rfc232.js b/node-tests/fixtures/component-test/mocha-rfc232.js
index 8b8d85dfb17..8f1edf3f246 100644
--- a/node-tests/fixtures/component-test/mocha-rfc232.js
+++ b/node-tests/fixtures/component-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/component-test/rfc232-unit.js b/node-tests/fixtures/component-test/rfc232-unit.js
index 848f8a3dec6..404bf3f9409 100644
--- a/node-tests/fixtures/component-test/rfc232-unit.js
+++ b/node-tests/fixtures/component-test/rfc232-unit.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Component | x-foo', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/component-test/rfc232.js b/node-tests/fixtures/component-test/rfc232.js
index 3e3a9dded48..93374f79530 100644
--- a/node-tests/fixtures/component-test/rfc232.js
+++ b/node-tests/fixtures/component-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
index a957691c713..0eee2a68ef3 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232-nested.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Controller | foo/bar', function () {
   setupTest();
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232.js b/node-tests/fixtures/controller-test/mocha-rfc232.js
index cbfb5c0665a..b0a2c780a73 100644
--- a/node-tests/fixtures/controller-test/mocha-rfc232.js
+++ b/node-tests/fixtures/controller-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Controller | foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/controller-test/rfc232-nested.js b/node-tests/fixtures/controller-test/rfc232-nested.js
index aecdde3dd5f..598a6942a42 100644
--- a/node-tests/fixtures/controller-test/rfc232-nested.js
+++ b/node-tests/fixtures/controller-test/rfc232-nested.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Controller | foo/bar', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/controller-test/rfc232.js b/node-tests/fixtures/controller-test/rfc232.js
index c4815a2ea8c..44f3af0265f 100644
--- a/node-tests/fixtures/controller-test/rfc232.js
+++ b/node-tests/fixtures/controller-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Controller | foo', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232.js b/node-tests/fixtures/helper-test/mocha-rfc232.js
index 6017c0f6292..8b262c88ff2 100644
--- a/node-tests/fixtures/helper-test/mocha-rfc232.js
+++ b/node-tests/fixtures/helper-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/helper-test/rfc232.js b/node-tests/fixtures/helper-test/rfc232.js
index 4c666b1afbd..ad840ae1ad5 100644
--- a/node-tests/fixtures/helper-test/rfc232.js
+++ b/node-tests/fixtures/helper-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from 'my-app/tests/helpers';
 import { render } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
diff --git a/node-tests/fixtures/route-test/mocha-rfc232.js b/node-tests/fixtures/route-test/mocha-rfc232.js
index 0ae4896e73f..b6435e1b089 100644
--- a/node-tests/fixtures/route-test/mocha-rfc232.js
+++ b/node-tests/fixtures/route-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Route | foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/route-test/rfc232.js b/node-tests/fixtures/route-test/rfc232.js
index 3d6bf9b098b..25c080eed61 100644
--- a/node-tests/fixtures/route-test/rfc232.js
+++ b/node-tests/fixtures/route-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Route | foo', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/fixtures/service-test/mocha-rfc232.js b/node-tests/fixtures/service-test/mocha-rfc232.js
index 3aa66206dc2..ceae7203f34 100644
--- a/node-tests/fixtures/service-test/mocha-rfc232.js
+++ b/node-tests/fixtures/service-test/mocha-rfc232.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from 'my-app/tests/helpers';
 
 describe('Unit | Service | foo', function () {
   setupTest();
diff --git a/node-tests/fixtures/service-test/rfc232.js b/node-tests/fixtures/service-test/rfc232.js
index f54363db7ca..1ae3f96b1eb 100644
--- a/node-tests/fixtures/service-test/rfc232.js
+++ b/node-tests/fixtures/service-test/rfc232.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from 'my-app/tests/helpers';
 
 module('Unit | Service | foo', function (hooks) {
   setupTest(hooks);

From 182a0345703e1456013b2206c414beaf7fb81caa Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 22 Feb 2022 15:45:10 -0800
Subject: [PATCH 0896/1405] Avoid zebra classes for Component

---
 .../-internals/glimmer/lib/component.ts       | 732 +++++++++---------
 .../runtime/lib/mixins/action_handler.d.ts    |   5 +-
 .../runtime/lib/system/core_object.d.ts       |  27 +-
 .../-internals/views/lib/views/core_view.d.ts |  12 -
 .../lib/views/{core_view.js => core_view.ts}  |  15 +-
 .../@ember/component/type-tests/index.test.ts |  49 +-
 .../helper/type-tests/invoke-helper.test.ts   |   7 +-
 7 files changed, 406 insertions(+), 441 deletions(-)
 delete mode 100644 packages/@ember/-internals/views/lib/views/core_view.d.ts
 rename packages/@ember/-internals/views/lib/views/{core_view.js => core_view.ts} (75%)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 916a1032c1c..b1f7c791ba4 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,6 +1,7 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import { getOwner, Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
+import { CoreObjectClass } from '@ember/-internals/runtime/lib/system/core_object';
 import {
   ActionSupport,
   ChildViewsSupport,
@@ -26,7 +27,6 @@ import {
   DIRTY_TAG,
   IS_DISPATCHING_ATTRS,
 } from './component-managers/curly';
-import { View } from './renderer';
 
 // Keep track of which component classes have already been processed for lazy event setup.
 let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<object>>();
@@ -649,6 +649,8 @@ let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<object>>();
   @uses Ember.ViewStateSupport
   @public
 */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface ComponentClass extends CoreObjectClass<Component> {}
 interface Component
   extends CoreView,
     ChildViewsSupport,
@@ -657,7 +659,7 @@ interface Component
     TargetActionSupport,
     ActionSupport,
     ViewMixin {
-  parentView: Component | null;
+  attributeBindings?: string[];
 
   /**
     Layout can be used to wrap content in a component.
@@ -677,403 +679,387 @@ interface Component
     @private
   */
   layoutName?: string;
-
-  attributeBindings?: Array<string>;
 }
-class Component
-  extends CoreView.extend(
-    ChildViewsSupport,
-    ViewStateSupport,
-    ClassNamesSupport,
-    TargetActionSupport,
-    ActionSupport,
-    ViewMixin
-  )
-  implements View {
-  static isComponentFactory = true;
-  static positionalParams = [];
-
-  static toString(): string {
-    return '@ember/component';
-  }
-
-  isComponent = true;
-
-  private __dispatcher: EventDispatcher | null | undefined;
 
-  constructor(owner: Owner) {
-    super(owner);
-    this[IS_DISPATCHING_ATTRS] = false;
-    this[DIRTY_TAG] = createTag();
-    this[BOUNDS] = null;
-
-    const eventDispatcher = this._dispatcher;
-    if (eventDispatcher) {
-      let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
-      if (!lazyEventsProcessedForComponentClass) {
-        lazyEventsProcessedForComponentClass = new WeakSet<object>();
-        lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
-      }
+const Component = (CoreView.extend(
+  ChildViewsSupport,
+  ViewStateSupport,
+  ClassNamesSupport,
+  TargetActionSupport,
+  ActionSupport,
+  ViewMixin,
+  {
+    isComponent: true,
+
+    init() {
+      this._super(...arguments);
+      this[IS_DISPATCHING_ATTRS] = false;
+      this[DIRTY_TAG] = createTag();
+      this[BOUNDS] = null;
+
+      let eventDispatcher = this._dispatcher;
+      if (eventDispatcher) {
+        let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
+        if (!lazyEventsProcessedForComponentClass) {
+          lazyEventsProcessedForComponentClass = new WeakSet<object>();
+          lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
+        }
 
-      let proto = Object.getPrototypeOf(this);
-      if (!lazyEventsProcessedForComponentClass.has(proto)) {
-        let lazyEvents = eventDispatcher.lazyEvents;
+        let proto = Object.getPrototypeOf(this);
+        if (!lazyEventsProcessedForComponentClass.has(proto)) {
+          let lazyEvents = eventDispatcher.lazyEvents;
 
-        lazyEvents.forEach((mappedEventName: string, event: string) => {
-          if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
-            eventDispatcher.setupHandlerForBrowserEvent(event);
-          }
-        });
+          lazyEvents.forEach((mappedEventName: string, event: string) => {
+            if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
+              eventDispatcher.setupHandlerForBrowserEvent(event);
+            }
+          });
 
-        lazyEventsProcessedForComponentClass.add(proto);
+          lazyEventsProcessedForComponentClass.add(proto);
+        }
       }
-    }
 
-    // @ts-expect-error _isInteractive is private
-    if (DEBUG && eventDispatcher && this.renderer._isInteractive && this.tagName === '') {
-      let eventNames = [];
-      let events = eventDispatcher.finalEventNameMapping;
+      if (DEBUG && eventDispatcher && this.renderer._isInteractive && this.tagName === '') {
+        let eventNames = [];
+        let events = eventDispatcher.finalEventNameMapping;
 
-      for (let key in events) {
-        let methodName = events[key];
+        for (let key in events) {
+          let methodName = events[key];
 
-        if (methodName && typeof this[methodName] === 'function') {
-          eventNames.push(methodName);
+          if (typeof this[methodName] === 'function') {
+            eventNames.push(methodName);
+          }
         }
-      }
-      // If in a tagless component, assert that no event handlers are defined
-      assert(
-        `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
-        !eventNames.length
-      );
-    }
-  }
-
-  get _dispatcher(): EventDispatcher | null {
-    if (this.__dispatcher === undefined) {
-      let owner = getOwner(this);
-      assert('Component is unexpectedly missing an owner', owner);
-
-      if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
-        let dispatcher = owner.lookup('event_dispatcher:main');
+        // If in a tagless component, assert that no event handlers are defined
         assert(
-          'Expected dispatcher to be an EventDispatcher',
-          dispatcher instanceof EventDispatcher
+          `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
+          !eventNames.length
         );
-        this.__dispatcher = dispatcher;
-      } else {
-        // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
-        this.__dispatcher = null;
       }
-    }
-
-    return this.__dispatcher;
-  }
-
-  on<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  on(name: string, method: ((...args: any[]) => void) | string): this;
-  on<Target>(
-    name: string,
-    ...args:
-      | [Target, string | ((this: Target, ...args: any[]) => void)]
-      | [((...args: any[]) => void) | string]
-  ): this {
-    this._dispatcher?.setupHandlerForEmberEvent(name);
-    return super.on(name, ...args);
-  }
-
-  rerender() {
-    dirtyTag(this[DIRTY_TAG]);
-  }
-
-  [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
-    if (this[IS_DISPATCHING_ATTRS]) {
-      return;
-    }
-
-    let args = this[ARGS];
-    let reference = args !== undefined ? args[key] : undefined;
-
-    if (reference !== undefined && isUpdatableRef(reference)) {
-      updateRef(reference, arguments.length === 2 ? value : get(this, key));
-    }
-  }
-
-  getAttr(key: string) {
-    // TODO Intimate API should be deprecated
-    return this.get(key);
-  }
-
-  /**
-    Normally, Ember's component model is "write-only". The component takes a
-    bunch of attributes that it got passed in, and uses them to render its
-    template.
-
-    One nice thing about this model is that if you try to set a value to the
-    same thing as last time, Ember (through HTMLBars) will avoid doing any
-    work on the DOM.
-
-    This is not just a performance optimization. If an attribute has not
-    changed, it is important not to clobber the element's "hidden state".
-    For example, if you set an input's `value` to the same value as before,
-    it will clobber selection state and cursor position. In other words,
-    setting an attribute is not **always** idempotent.
-
-    This method provides a way to read an element's attribute and also
-    update the last value Ember knows about at the same time. This makes
-    setting an attribute idempotent.
-
-    In particular, what this means is that if you get an `<input>` element's
-    `value` attribute and then re-render the template with the same value,
-    it will avoid clobbering the cursor and selection position.
-    Since most attribute sets are idempotent in the browser, you typically
-    can get away with reading attributes using jQuery, but the most reliable
-    way to do so is through this method.
-    @method readDOMAttr
-
-    @param {String} name the name of the attribute
-    @return String
-    @public
-    */
-  readDOMAttr(name: string) {
-    // TODO revisit this
-    let _element = getViewElement(this);
-
-    assert(
-      `Cannot call \`readDOMAttr\` on ${this} which does not have an element`,
-      _element !== null
-    );
-
-    let element = _element;
-    let isSVG = element.namespaceURI === Namespace.SVG;
-    let { type, normalized } = normalizeProperty(element, name);
-
-    if (isSVG || type === 'attr') {
-      return element.getAttribute(normalized);
-    }
-
-    return element[normalized];
-  }
-
-  /**
-   The WAI-ARIA role of the control represented by this view. For example, a
-    button may have a role of type 'button', or a pane may have a role of
-    type 'alertdialog'. This property is used by assistive software to help
-    visually challenged users navigate rich web applications.
-
-    The full list of valid WAI-ARIA roles is available at:
-    [https://www.w3.org/TR/wai-aria/#roles_categorization](https://www.w3.org/TR/wai-aria/#roles_categorization)
-
-    @property ariaRole
-    @type String
-    @default null
-    @public
-    */
-
-  /**
-   Enables components to take a list of parameters as arguments.
-    For example, a component that takes two parameters with the names
-    `name` and `age`:
-
-    ```app/components/my-component.js
-    import Component from '@ember/component';
-
-    let MyComponent = Component.extend();
-
-    MyComponent.reopenClass({
-      positionalParams: ['name', 'age']
-    });
-
-    export default MyComponent;
-    ```
-
-    It can then be invoked like this:
-
-    ```hbs
-    {{my-component "John" 38}}
-    ```
-
-    The parameters can be referred to just like named parameters:
-
-    ```hbs
-    Name: {{name}}, Age: {{age}}.
-    ```
-
-    Using a string instead of an array allows for an arbitrary number of
-    parameters:
-
-    ```app/components/my-component.js
-    import Component from '@ember/component';
-
-    let MyComponent = Component.extend();
-
-    MyComponent.reopenClass({
-      positionalParams: 'names'
-    });
-
-    export default MyComponent;
-    ```
-
-    It can then be invoked like this:
-
-    ```hbs
-    {{my-component "John" "Michael" "Scott"}}
-    ```
-    The parameters can then be referred to by enumerating over the list:
-
-    ```hbs
-    {{#each names as |name|}}{{name}}{{/each}}
-    ```
-
-    @static
-    @public
-    @property positionalParams
-    @since 1.13.0
-    */
-
-  /**
-   Called when the attributes passed into the component have been updated.
-    Called both during the initial render of a container and during a rerender.
-    Can be used in place of an observer; code placed here will be executed
-    every time any attribute updates.
-    @method didReceiveAttrs
-    @public
-    @since 1.13.0
-    */
-  didReceiveAttrs() {}
+    },
+
+    get _dispatcher(): EventDispatcher | null {
+      if (this.__dispatcher === undefined) {
+        let owner = getOwner(this);
+        assert('Component is unexpectedly missing an owner', owner);
+
+        if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
+          this.__dispatcher = owner.lookup('event_dispatcher:main');
+          assert(
+            'Expected dispatcher to be an EventDispatcher',
+            this.__dispatcher instanceof EventDispatcher
+          );
+        } else {
+          // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
+          this.__dispatcher = null;
+        }
+      }
 
-  /**
-   Called when the attributes passed into the component have been updated.
-    Called both during the initial render of a container and during a rerender.
-    Can be used in place of an observer; code placed here will be executed
-    every time any attribute updates.
-    @event didReceiveAttrs
-    @public
-    @since 1.13.0
-    */
+      return this.__dispatcher;
+    },
 
-  /**
-   Called after a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @method didRender
-    @public
-    @since 1.13.0
-    */
-  didRender() {}
+    on(eventName: string) {
+      this._dispatcher?.setupHandlerForEmberEvent(eventName);
+      return this._super(...arguments);
+    },
 
-  /**
-   Called after a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @event didRender
-    @public
-    @since 1.13.0
-    */
+    rerender() {
+      dirtyTag(this[DIRTY_TAG]);
+      this._super();
+    },
 
-  /**
-   Called before a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @method willRender
-    @public
-    @since 1.13.0
-    */
-  willRender() {}
+    [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
+      if (this[IS_DISPATCHING_ATTRS]) {
+        return;
+      }
 
-  /**
-   Called before a component has been rendered, both on initial render and
-    in subsequent rerenders.
-    @event willRender
-    @public
-    @since 1.13.0
-    */
+      let args = this[ARGS];
+      let reference = args !== undefined ? args[key] : undefined;
 
-  /**
-   Called when the attributes passed into the component have been changed.
-    Called only during a rerender, not during an initial render.
-    @method didUpdateAttrs
-    @public
-    @since 1.13.0
-    */
-  didUpdateAttrs() {}
+      if (reference !== undefined && isUpdatableRef(reference)) {
+        updateRef(reference, arguments.length === 2 ? value : get(this, key));
+      }
+    },
+
+    getAttr(key: string) {
+      // TODO Intimate API should be deprecated
+      return this.get(key);
+    },
+
+    /**
+      Normally, Ember's component model is "write-only". The component takes a
+      bunch of attributes that it got passed in, and uses them to render its
+      template.
+
+      One nice thing about this model is that if you try to set a value to the
+      same thing as last time, Ember (through HTMLBars) will avoid doing any
+      work on the DOM.
+
+      This is not just a performance optimization. If an attribute has not
+      changed, it is important not to clobber the element's "hidden state".
+      For example, if you set an input's `value` to the same value as before,
+      it will clobber selection state and cursor position. In other words,
+      setting an attribute is not **always** idempotent.
+
+      This method provides a way to read an element's attribute and also
+      update the last value Ember knows about at the same time. This makes
+      setting an attribute idempotent.
+
+      In particular, what this means is that if you get an `<input>` element's
+      `value` attribute and then re-render the template with the same value,
+      it will avoid clobbering the cursor and selection position.
+      Since most attribute sets are idempotent in the browser, you typically
+      can get away with reading attributes using jQuery, but the most reliable
+      way to do so is through this method.
+      @method readDOMAttr
+
+      @param {String} name the name of the attribute
+      @return String
+      @public
+     */
+    readDOMAttr(name: string) {
+      // TODO revisit this
+      let _element = getViewElement(this);
 
-  /**
-   Called when the attributes passed into the component have been changed.
-    Called only during a rerender, not during an initial render.
-    @event didUpdateAttrs
-    @public
-    @since 1.13.0
-    */
+      assert(
+        `Cannot call \`readDOMAttr\` on ${this} which does not have an element`,
+        _element !== null
+      );
 
-  /**
-   Called when the component is about to update and rerender itself.
-    Called only during a rerender, not during an initial render.
-    @method willUpdate
-    @public
-    @since 1.13.0
-    */
-  willUpdate() {}
+      let element = _element;
+      let isSVG = element.namespaceURI === Namespace.SVG;
+      let { type, normalized } = normalizeProperty(element, name);
 
-  /**
-   Called when the component is about to update and rerender itself.
-    Called only during a rerender, not during an initial render.
-    @event willUpdate
-    @public
-    @since 1.13.0
-    */
+      if (isSVG || type === 'attr') {
+        return element.getAttribute(normalized);
+      }
 
-  /**
-   Called when the component has updated and rerendered itself.
-    Called only during a rerender, not during an initial render.
-    @method didUpdate
-    @public
-    @since 1.13.0
-    */
-  didUpdate() {}
+      return element[normalized];
+    },
+
+    /**
+     The WAI-ARIA role of the control represented by this view. For example, a
+     button may have a role of type 'button', or a pane may have a role of
+     type 'alertdialog'. This property is used by assistive software to help
+     visually challenged users navigate rich web applications.
+
+     The full list of valid WAI-ARIA roles is available at:
+     [https://www.w3.org/TR/wai-aria/#roles_categorization](https://www.w3.org/TR/wai-aria/#roles_categorization)
+
+     @property ariaRole
+     @type String
+     @default null
+     @public
+     */
+
+    /**
+     Enables components to take a list of parameters as arguments.
+     For example, a component that takes two parameters with the names
+     `name` and `age`:
+
+     ```app/components/my-component.js
+     import Component from '@ember/component';
+
+     let MyComponent = Component.extend();
+
+     MyComponent.reopenClass({
+       positionalParams: ['name', 'age']
+     });
+
+     export default MyComponent;
+     ```
+
+     It can then be invoked like this:
+
+     ```hbs
+     {{my-component "John" 38}}
+     ```
+
+     The parameters can be referred to just like named parameters:
+
+     ```hbs
+     Name: {{name}}, Age: {{age}}.
+     ```
+
+     Using a string instead of an array allows for an arbitrary number of
+     parameters:
+
+     ```app/components/my-component.js
+     import Component from '@ember/component';
+
+     let MyComponent = Component.extend();
+
+     MyComponent.reopenClass({
+       positionalParams: 'names'
+     });
+
+     export default MyComponent;
+     ```
+
+     It can then be invoked like this:
+
+     ```hbs
+     {{my-component "John" "Michael" "Scott"}}
+     ```
+     The parameters can then be referred to by enumerating over the list:
+
+     ```hbs
+     {{#each names as |name|}}{{name}}{{/each}}
+     ```
+
+     @static
+     @public
+     @property positionalParams
+     @since 1.13.0
+     */
+
+    /**
+     Called when the attributes passed into the component have been updated.
+     Called both during the initial render of a container and during a rerender.
+     Can be used in place of an observer; code placed here will be executed
+     every time any attribute updates.
+     @method didReceiveAttrs
+     @public
+     @since 1.13.0
+     */
+    didReceiveAttrs() {},
+
+    /**
+     Called when the attributes passed into the component have been updated.
+     Called both during the initial render of a container and during a rerender.
+     Can be used in place of an observer; code placed here will be executed
+     every time any attribute updates.
+     @event didReceiveAttrs
+     @public
+     @since 1.13.0
+     */
+
+    /**
+     Called after a component has been rendered, both on initial render and
+     in subsequent rerenders.
+     @method didRender
+     @public
+     @since 1.13.0
+     */
+    didRender() {},
+
+    /**
+     Called after a component has been rendered, both on initial render and
+     in subsequent rerenders.
+     @event didRender
+     @public
+     @since 1.13.0
+     */
+
+    /**
+     Called before a component has been rendered, both on initial render and
+     in subsequent rerenders.
+     @method willRender
+     @public
+     @since 1.13.0
+     */
+    willRender() {},
+
+    /**
+     Called before a component has been rendered, both on initial render and
+     in subsequent rerenders.
+     @event willRender
+     @public
+     @since 1.13.0
+     */
+
+    /**
+     Called when the attributes passed into the component have been changed.
+     Called only during a rerender, not during an initial render.
+     @method didUpdateAttrs
+     @public
+     @since 1.13.0
+     */
+    didUpdateAttrs() {},
+
+    /**
+     Called when the attributes passed into the component have been changed.
+     Called only during a rerender, not during an initial render.
+     @event didUpdateAttrs
+     @public
+     @since 1.13.0
+     */
+
+    /**
+     Called when the component is about to update and rerender itself.
+     Called only during a rerender, not during an initial render.
+     @method willUpdate
+     @public
+     @since 1.13.0
+     */
+    willUpdate() {},
+
+    /**
+     Called when the component is about to update and rerender itself.
+     Called only during a rerender, not during an initial render.
+     @event willUpdate
+     @public
+     @since 1.13.0
+     */
+
+    /**
+     Called when the component has updated and rerendered itself.
+     Called only during a rerender, not during an initial render.
+     @method didUpdate
+     @public
+     @since 1.13.0
+     */
+    didUpdate() {},
+
+    /**
+     Called when the component has updated and rerendered itself.
+     Called only during a rerender, not during an initial render.
+     @event didUpdate
+     @public
+     @since 1.13.0
+     */
+
+    /**
+      The HTML `id` of the component's element in the DOM. You can provide this
+      value yourself but it must be unique (just as in HTML):
+
+      ```handlebars
+      {{my-component elementId="a-really-cool-id"}}
+      ```
+
+      ```handlebars
+      <MyComponent @elementId="a-really-cool-id" />
+      ```
+      If not manually set a default value will be provided by the framework.
+      Once rendered an element's `elementId` is considered immutable and you
+      should never change it. If you need to compute a dynamic value for the
+      `elementId`, you should do this when the component or element is being
+      instantiated:
+
+      ```javascript
+      export default Component.extend({
+        init() {
+          this._super(...arguments);
+
+          var index = this.get('index');
+          this.set('elementId', `component-id${index}`);
+        }
+      });
+      ```
 
-  /**
-   Called when the component has updated and rerendered itself.
-    Called only during a rerender, not during an initial render.
-    @event didUpdate
-    @public
-    @since 1.13.0
+      @property elementId
+      @type String
+      @public
     */
+  }
+) as unknown) as ComponentClass;
 
-  /**
-    The HTML `id` of the component's element in the DOM. You can provide this
-    value yourself but it must be unique (just as in HTML):
-
-    ```handlebars
-    {{my-component elementId="a-really-cool-id"}}
-    ```
-
-    ```handlebars
-    <MyComponent @elementId="a-really-cool-id" />
-    ```
-    If not manually set a default value will be provided by the framework.
-    Once rendered an element's `elementId` is considered immutable and you
-    should never change it. If you need to compute a dynamic value for the
-    `elementId`, you should do this when the component or element is being
-    instantiated:
-
-    ```javascript
-    export default Component.extend({
-      init() {
-        this._super(...arguments);
-
-        var index = this.get('index');
-        this.set('elementId', `component-id${index}`);
-      }
-    });
-    ```
+Component.toString = () => '@ember/component';
 
-    @property elementId
-    @type String
-    @public
-  */
-}
+Component.reopenClass({
+  isComponentFactory: true,
+  positionalParams: [],
+});
 
 setInternalComponentManager(CURLY_COMPONENT_MANAGER, Component);
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
index 07e4a62c7d0..dd0e93c132d 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
@@ -1,3 +1,6 @@
 import { Mixin } from '@ember/-internals/metal';
 
-export default class ActionHandler extends Mixin {}
+export default class ActionHandler extends Mixin {
+  actions?: Record<string, (...args: unknown[]) => void>;
+  send(actionName: string, ...args: unknown[]): void;
+}
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index 45d0d5b1344..d62d796b081 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -11,18 +11,39 @@ import { Owner } from '@ember/-internals/owner';
  * Implementation is carefully chosen for the reasons described in
  * https://github.com/typed-ember/ember-typings/pull/29
  */
-type EmberClassConstructor<T> = new (owner: Owner) => T;
+export type EmberClassConstructor<T> = new (owner: Owner) => T;
 
-type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
+export type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
   ? T & MergeArray<Rest>
   : unknown; // TODO: Is this correct?
 
+/** @internal */
+export interface CoreObjectClass<Instance> extends EmberClassConstructor<Instance> {
+  /** @internal */
+  extend<Statics>(
+    this: EmberClassConstructor<Instance>,
+    ...args: any[]
+  ): CoreObjectClass<Statics & Instance>;
+
+  /** @internal */
+  reopen(...args: any[]): any;
+
+  /** @internal */
+  reopenClass(...args: any[]): any;
+
+  /** @internal */
+  create<Class extends EmberClassConstructor<Instance>, Args extends Array<Record<string, any>>>(
+    this: Class,
+    ...args: Args
+  ): InstanceType<Class> & MergeArray<Args>;
+}
+
 export default class CoreObject {
   /** @internal */
   static extend<Statics, Instance>(
     this: Statics & EmberClassConstructor<Instance>,
     ...args: any[]
-  ): Readonly<Statics> & EmberClassConstructor<Instance>;
+  ): Readonly<Statics> & CoreObjectClass<Instance>;
 
   /** @internal */
   static reopen(...args: any[]): any;
diff --git a/packages/@ember/-internals/views/lib/views/core_view.d.ts b/packages/@ember/-internals/views/lib/views/core_view.d.ts
deleted file mode 100644
index a3c23eaa4e5..00000000000
--- a/packages/@ember/-internals/views/lib/views/core_view.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Renderer } from '@ember/-internals/glimmer';
-import { ActionHandler } from '@ember/-internals/runtime';
-import EmberObject from '@ember/object';
-import Evented from '@ember/object/evented';
-
-interface CoreView extends Evented, ActionHandler {}
-declare class CoreView extends EmberObject {
-  parentView: CoreView | null;
-  renderer: Renderer;
-}
-
-export { CoreView as default };
diff --git a/packages/@ember/-internals/views/lib/views/core_view.js b/packages/@ember/-internals/views/lib/views/core_view.ts
similarity index 75%
rename from packages/@ember/-internals/views/lib/views/core_view.js
rename to packages/@ember/-internals/views/lib/views/core_view.ts
index 7ba99b29f21..8d5963c5ee1 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.js
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -1,5 +1,7 @@
+import { View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
 import { ActionHandler, Evented, FrameworkObject } from '@ember/-internals/runtime';
+import { CoreObjectClass } from '@ember/-internals/runtime/lib/system/core_object';
 import states from './states';
 
 /**
@@ -18,7 +20,10 @@ import states from './states';
   @uses Ember.ActionHandler
   @private
 */
-const CoreView = FrameworkObject.extend(Evented, ActionHandler, {
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface CoreViewClass extends CoreObjectClass<CoreView> {}
+interface CoreView extends FrameworkObject, Evented, ActionHandler, View {}
+const CoreView = (FrameworkObject.extend(Evented, ActionHandler, {
   isView: true,
 
   _states: states,
@@ -42,7 +47,7 @@ const CoreView = FrameworkObject.extend(Evented, ActionHandler, {
   */
   parentView: null,
 
-  instrumentDetails(hash) {
+  instrumentDetails(hash: any) {
     hash.object = this.toString();
     hash.containerKey = this._debugContainerKey;
     hash.view = this;
@@ -57,7 +62,7 @@ const CoreView = FrameworkObject.extend(Evented, ActionHandler, {
     @param name {String}
     @private
   */
-  trigger(name, ...args) {
+  trigger(name: string, ...args: any[]) {
     this._super(...arguments);
     let method = this[name];
     if (typeof method === 'function') {
@@ -65,10 +70,10 @@ const CoreView = FrameworkObject.extend(Evented, ActionHandler, {
     }
   },
 
-  has(name) {
+  has(name: string) {
     return typeof this[name] === 'function' || this._super(name);
   },
-});
+}) as unknown) as CoreViewClass;
 
 CoreView.reopenClass({
   isViewFactory: true,
diff --git a/packages/@ember/component/type-tests/index.test.ts b/packages/@ember/component/type-tests/index.test.ts
index 8538178abcc..31d080ac528 100644
--- a/packages/@ember/component/type-tests/index.test.ts
+++ b/packages/@ember/component/type-tests/index.test.ts
@@ -1,51 +1,16 @@
 import Component from '@ember/component';
 import { CoreView } from '@ember/-internals/views';
 import { expectTypeOf } from 'expect-type';
-import { Owner } from '@ember/-internals/owner';
 import { View } from '@ember/-internals/glimmer/lib/renderer';
-import { action } from '@ember/object';
-import { tracked } from '@ember/-internals/metal';
 
-// NOTE: This is invalid, but acceptable for type tests
-let owner = {} as Owner;
-let component = new Component(owner);
+const MyComponent = Component.extend();
+
+let component = MyComponent.create();
 
 expectTypeOf(component).toMatchTypeOf<CoreView>();
 expectTypeOf(component).toMatchTypeOf<View>();
 
-class MyComponent extends Component {
-  tagName = 'em';
-  classNames = ['my-class', 'my-other-class'];
-  classNameBindings = ['propertyA', 'propertyB'];
-  attributeBindings = ['href'];
-
-  @tracked propertyA = 'from-a';
-
-  get propertyB(): string | void {
-    if (this.propertyA === 'from-a') {
-      return 'from-b';
-    }
-  }
-
-  @tracked href = 'https://tilde.io';
-
-  @action click(_event: Event): void {
-    // Clicked!
-  }
-}
-new MyComponent(owner);
-
-class BadComponent extends Component {
-  // @ts-expect-error invalid tag name
-  tagName = 1;
-
-  // @ts-expect-error invalid classname
-  classNames = 'foo';
-
-  // @ts-expect-error invalid classNameBindings
-  classNameBindings = [1];
-
-  // @ts-expect-error invalid attributeBindings
-  attributeBindings = [true];
-}
-new BadComponent(owner);
+expectTypeOf(component.tagName).toEqualTypeOf<string | null>();
+expectTypeOf(component.classNames).toEqualTypeOf<string[]>();
+expectTypeOf(component.classNameBindings).toEqualTypeOf<string[]>();
+expectTypeOf(component.attributeBindings).toEqualTypeOf<string[] | undefined>();
diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts
index 65300ce5519..626a00bedd8 100644
--- a/packages/@ember/helper/type-tests/invoke-helper.test.ts
+++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts
@@ -1,6 +1,5 @@
 import Component from '@ember/-internals/glimmer/lib/component';
 import { getValue } from '@ember/-internals/metal';
-import { Owner } from '@ember/-internals/owner';
 import Helper from '@ember/component/helper';
 import { invokeHelper } from '@ember/helper';
 import { Cache } from '@glimmer/validator';
@@ -14,7 +13,7 @@ class PlusOne extends Helper {
   }
 }
 
-export default class PlusOneComponent extends Component {
+class PlusOneComponent extends Component {
   // Glint would help with this
   declare args: { number: number };
 
@@ -29,8 +28,6 @@ export default class PlusOneComponent extends Component {
   }
 }
 
-// Good enough for tests!
-let owner = {} as Owner;
-let component = new PlusOneComponent(owner);
+let component = PlusOneComponent.create();
 
 expectTypeOf(component.plusOne).toEqualTypeOf<Cache<unknown>>();

From befe02254bcd408b47f8603b1afd6221130d4189 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 22 Feb 2022 15:58:20 -0800
Subject: [PATCH 0897/1405] Improve helper type generics, fix confusing
 variable name

---
 .../@ember/-internals/glimmer/lib/helper.ts   | 22 +++++++++----------
 .../@ember/-internals/glimmer/lib/resolver.ts |  5 ++++-
 .../helper/type-tests/invoke-helper.test.ts   |  5 ++---
 .../type-tests/set-helper-manager.test.ts     |  9 ++++----
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index e9932fac16d..537851153b3 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -13,13 +13,15 @@ import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 
 export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
 
-export type HelperFunction<
-  T = unknown,
-  P extends unknown[] = unknown[],
-  N extends Dict<unknown> = Dict<unknown>
-> = (positional: P, named: N) => T;
-
-export type SimpleHelperFactory = Factory<SimpleHelper, HelperFactory<SimpleHelper>>;
+export type HelperFunction<T, P extends unknown[], N extends Dict<unknown>> = (
+  positional: P,
+  named: N
+) => T;
+
+export type SimpleHelperFactory<T, P extends unknown[], N extends Dict<unknown>> = Factory<
+  SimpleHelper<T, P, N>,
+  HelperFactory<SimpleHelper<T, P, N>>
+>;
 export type ClassHelperFactory = Factory<HelperInstance, HelperFactory<HelperInstance>>;
 
 export interface HelperFactory<T> {
@@ -34,11 +36,7 @@ export interface HelperInstance<T = unknown> {
 
 const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
 
-export interface SimpleHelper<
-  T = unknown,
-  P extends unknown[] = unknown[],
-  N extends Dict<unknown> = Dict<unknown>
-> {
+export interface SimpleHelper<T, P extends unknown[], N extends Dict<unknown>> {
   compute: HelperFunction<T, P, N>;
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ffd80103b21..cebdb9a84b6 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -174,7 +174,10 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     }
 
     const factory = owner.factoryFor(`helper:${name}`) as
-      | Factory<SimpleHelper, HelperFactory<SimpleHelper>>
+      | Factory<
+          SimpleHelper<unknown, unknown[], Record<string, unknown>>,
+          HelperFactory<SimpleHelper<unknown, unknown[], Record<string, unknown>>>
+        >
       | Factory<HelperInstance, HelperFactory<HelperInstance>>;
 
     if (factory === undefined) {
diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts
index 626a00bedd8..dc11df20609 100644
--- a/packages/@ember/helper/type-tests/invoke-helper.test.ts
+++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts
@@ -14,12 +14,11 @@ class PlusOne extends Helper {
 }
 
 class PlusOneComponent extends Component {
-  // Glint would help with this
-  declare args: { number: number };
+  declare number: number;
 
   plusOne = invokeHelper(this, PlusOne, () => {
     return {
-      positional: [this.args.number],
+      positional: [this.number],
     };
   });
 
diff --git a/packages/@ember/helper/type-tests/set-helper-manager.test.ts b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
index 9ad7937b270..9b11f65029f 100644
--- a/packages/@ember/helper/type-tests/set-helper-manager.test.ts
+++ b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
@@ -1,13 +1,14 @@
 import { HelperFactory, HelperFunction, SimpleHelper } from '@ember/-internals/glimmer/lib/helper';
 import { getDebugName } from '@ember/-internals/utils';
 import { capabilities, setHelperManager } from '@ember/helper';
-import { Arguments, HelperManager } from '@glimmer/interfaces';
+import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
 
-class Wrapper implements HelperFactory<SimpleHelper> {
+class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
+  implements HelperFactory<SimpleHelper<T, P, N>> {
   isHelperFactory: true = true;
 
-  constructor(public compute: HelperFunction) {}
+  constructor(public compute: HelperFunction<T, P, N>) {}
 
   create() {
     // needs new instance or will leak containers
@@ -41,7 +42,7 @@ export const SIMPLE_CLASSIC_HELPER_MANAGER = new SimpleClassicHelperManager();
 
 expectTypeOf(
   setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype)
-).toEqualTypeOf<Wrapper>();
+).toEqualTypeOf<Wrapper<any, any, any>>();
 
 // @ts-expect-error invalid factory
 setHelperManager(1, Wrapper.prototype);

From 36175c7e566790e87e0d2de673c7f2ec4ef222d8 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Wed, 23 Feb 2022 13:19:56 -0700
Subject: [PATCH 0898/1405] export renderSettled via renderer package

---
 packages/@ember/renderer/index.ts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/@ember/renderer/index.ts

diff --git a/packages/@ember/renderer/index.ts b/packages/@ember/renderer/index.ts
new file mode 100644
index 00000000000..1f6c2b096ec
--- /dev/null
+++ b/packages/@ember/renderer/index.ts
@@ -0,0 +1,21 @@
+/**
+  @module @ember/renderer
+  @public
+*/
+
+/**
+ * @class Renderer
+ * @public
+ */
+
+/**
+  Returns a promise which will resolve when rendering has settled. Settled in
+  this context is defined as when all of the tags in use are "current" (e.g.
+  `renderers.every(r => r._isValid())`). When this is checked at the _end_ of
+  the run loop, this essentially guarantees that all rendering is completed.
+
+  @method renderSettled
+  @return {Promise<void>} a promise which fulfills when rendering has settled
+  @public
+*/
+export { renderSettled } from '@ember/-internals/glimmer';

From aacca3ba348e3e2d2d4fbb0243564108ebc0e97c Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 23 Feb 2022 16:53:39 -0700
Subject: [PATCH 0899/1405] Do not use defaults for helper type params

---
 packages/@ember/-internals/glimmer/lib/helper.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 537851153b3..e2cbbc34a27 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -263,11 +263,9 @@ setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype);
   @public
   @since 1.13.0
 */
-export function helper<
-  T = unknown,
-  P extends unknown[] = unknown[],
-  N extends Dict<unknown> = Dict<unknown>
->(helperFn: HelperFunction<T, P, N>): HelperFactory<SimpleHelper<T, P, N>> {
+export function helper<T, P extends unknown[], N extends Dict<unknown>>(
+  helperFn: HelperFunction<T, P, N>
+): HelperFactory<SimpleHelper<T, P, N>> {
   return new Wrapper(helperFn);
 }
 

From e36de34391ab527615db9d7b4c13e449d50fb5cf Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 16:15:42 -0800
Subject: [PATCH 0900/1405] Resolve a few more issues in component types

---
 .../@ember/-internals/runtime/lib/mixins/action_handler.d.ts    | 2 +-
 packages/@ember/-internals/runtime/lib/system/core_object.d.ts  | 2 ++
 packages/@ember/-internals/views/lib/views/core_view.ts         | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
index dd0e93c132d..a4aac4e466a 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
@@ -1,6 +1,6 @@
 import { Mixin } from '@ember/-internals/metal';
 
 export default class ActionHandler extends Mixin {
-  actions?: Record<string, (...args: unknown[]) => void>;
+  actions?: Record<string, (...args: any[]) => unknown>;
   send(actionName: string, ...args: unknown[]): void;
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index d62d796b081..6b302f2b597 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -11,8 +11,10 @@ import { Owner } from '@ember/-internals/owner';
  * Implementation is carefully chosen for the reasons described in
  * https://github.com/typed-ember/ember-typings/pull/29
  */
+/** @internal */
 export type EmberClassConstructor<T> = new (owner: Owner) => T;
 
+/** @internal */
 export type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
   ? T & MergeArray<Rest>
   : unknown; // TODO: Is this correct?
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 8d5963c5ee1..81754bdc670 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -47,7 +47,7 @@ const CoreView = (FrameworkObject.extend(Evented, ActionHandler, {
   */
   parentView: null,
 
-  instrumentDetails(hash: any) {
+  instrumentDetails(hash: Record<string, unknown>) {
     hash.object = this.toString();
     hash.containerKey = this._debugContainerKey;
     hash.view = this;

From 8539f04c72d96757a7b6c6d3cf7c101cbf1daa60 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 08:45:33 -0800
Subject: [PATCH 0901/1405] Convert @ember/-internals/extension-support to TS

---
 .../extension-support/{index.js => index.ts}  |   0
 ..._adapter.js => container_debug_adapter.ts} |  36 +--
 .../lib/{data_adapter.js => data_adapter.ts}  | 233 ++++++++++--------
 .../runtime/lib/system/namespace.d.ts         |   4 +-
 4 files changed, 157 insertions(+), 116 deletions(-)
 rename packages/@ember/-internals/extension-support/{index.js => index.ts} (100%)
 rename packages/@ember/-internals/extension-support/lib/{container_debug_adapter.js => container_debug_adapter.ts} (78%)
 rename packages/@ember/-internals/extension-support/lib/{data_adapter.js => data_adapter.ts} (74%)

diff --git a/packages/@ember/-internals/extension-support/index.js b/packages/@ember/-internals/extension-support/index.ts
similarity index 100%
rename from packages/@ember/-internals/extension-support/index.js
rename to packages/@ember/-internals/extension-support/index.ts
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
similarity index 78%
rename from packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
rename to packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
index 2d352fc15ab..39f9f6c161f 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
@@ -1,6 +1,13 @@
 import { classify, dasherize } from '@ember/string';
-import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-internals/runtime';
-import { getOwner } from '@ember/-internals/owner';
+import {
+  A as emberA,
+  typeOf,
+  Namespace,
+  Object as EmberObject,
+  NativeArray,
+} from '@ember/-internals/runtime';
+import { getOwner, Owner } from '@ember/-internals/owner';
+import { Resolver } from '@ember/-internals/container/lib/registry';
 
 /**
 @module @ember/debug
@@ -40,12 +47,12 @@ import { getOwner } from '@ember/-internals/owner';
   @since 1.5.0
   @public
 */
-export default EmberObject.extend({
-  init() {
-    this._super(...arguments);
+export default class ContainerDebugAdapter extends EmberObject {
+  constructor(owner: Owner) {
+    super(owner);
 
-    this.resolver = getOwner(this).lookup('resolver-for-debugging:main');
-  },
+    this.resolver = getOwner(this)!.lookup('resolver-for-debugging:main') as Resolver;
+  }
 
   /**
     The resolver instance of the application
@@ -53,10 +60,9 @@ export default EmberObject.extend({
     on creation.
 
     @property resolver
-    @default null
     @public
   */
-  resolver: null,
+  declare resolver: Resolver;
 
   /**
     Returns true if it is possible to catalog a list of available
@@ -67,13 +73,13 @@ export default EmberObject.extend({
     @return {boolean} whether a list is available for this type.
     @public
   */
-  canCatalogEntriesByType(type) {
+  canCatalogEntriesByType(type: string) {
     if (type === 'model' || type === 'template') {
       return false;
     }
 
     return true;
-  },
+  }
 
   /**
     Returns the available classes a given type.
@@ -83,9 +89,9 @@ export default EmberObject.extend({
     @return {Array} An array of strings.
     @public
   */
-  catalogEntriesByType(type) {
+  catalogEntriesByType(type: string): NativeArray<string> {
     let namespaces = emberA(Namespace.NAMESPACES);
-    let types = emberA();
+    let types = emberA<string>();
     let typeSuffixRegex = new RegExp(`${classify(type)}$`);
 
     namespaces.forEach((namespace) => {
@@ -102,5 +108,5 @@ export default EmberObject.extend({
       }
     });
     return types;
-  },
-});
+  }
+}
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.js b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
similarity index 74%
rename from packages/@ember/-internals/extension-support/lib/data_adapter.js
rename to packages/@ember/-internals/extension-support/lib/data_adapter.ts
index 48dfa90647e..8874c4c2c62 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.js
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
@@ -1,11 +1,36 @@
-import { getOwner } from '@ember/-internals/owner';
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { _backburner } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
-import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
-
-function iterate(arr, fn) {
+import {
+  Namespace,
+  Object as EmberObject,
+  A as emberA,
+  NativeArray,
+} from '@ember/-internals/runtime';
+import { consumeTag, createCache, getValue, tagFor, untrack, Cache } from '@glimmer/validator';
+import { ContainerDebugAdapter } from '..';
+
+type RecordColor = 'black' | 'red' | 'blue' | 'green';
+
+type WrappedType<N extends string = string> = {
+  name: N;
+  count: number;
+  columns: unknown[];
+  object: unknown;
+};
+
+type WrappedRecord<T> = {
+  object: T;
+  columnValues: object;
+  searchKeywords: NativeArray<unknown>;
+  filterValues: object;
+  color: RecordColor | null;
+};
+
+type RecordCallback<T> = (records: Array<{ columnValues: object; object: T }>) => void;
+
+function iterate<T>(arr: Array<T>, fn: (value: T) => void): void {
   if (Symbol.iterator in arr) {
     for (let item of arr) {
       fn(item);
@@ -15,14 +40,16 @@ function iterate(arr, fn) {
   }
 }
 
-class RecordsWatcher {
-  recordCaches = new Map();
+class RecordsWatcher<T> {
+  recordCaches: Map<T, Cache<void>> = new Map();
+
+  added: WrappedRecord<T>[] = [];
+  updated: WrappedRecord<T>[] = [];
+  removed: WrappedRecord<T>[] = [];
 
-  added = [];
-  updated = [];
-  removed = [];
+  declare recordArrayCache: Cache<void>;
 
-  getCacheForItem(record) {
+  getCacheForItem(record: T) {
     let recordCache = this.recordCaches.get(record);
 
     if (!recordCache) {
@@ -43,10 +70,14 @@ class RecordsWatcher {
     return recordCache;
   }
 
-  constructor(records, recordsAdded, recordsUpdated, recordsRemoved, wrapRecord, release) {
-    this.release = release;
-    this.wrapRecord = wrapRecord;
-
+  constructor(
+    records: NativeArray<T>,
+    recordsAdded: RecordCallback<T>,
+    recordsUpdated: RecordCallback<T>,
+    recordsRemoved: RecordCallback<T>,
+    public wrapRecord: (record: T) => WrappedRecord<T>,
+    public release: () => void
+  ) {
     this.recordArrayCache = createCache(() => {
       let seen = new Set();
 
@@ -61,7 +92,7 @@ class RecordsWatcher {
       // Untrack this operation because these records are being removed, they
       // should not be polled again in the future
       untrack(() => {
-        this.recordCaches.forEach((cache, record) => {
+        this.recordCaches.forEach((_cache, record) => {
           if (!seen.has(record)) {
             this.removed.push(wrapRecord(record));
             this.recordCaches.delete(record);
@@ -92,7 +123,9 @@ class RecordsWatcher {
 }
 
 class TypeWatcher {
-  constructor(records, onChange, release) {
+  declare cache: Cache<void>;
+
+  constructor(records: unknown[], onChange: () => void, public release: () => void) {
     let hasBeenAccessed = false;
 
     this.cache = createCache(() => {
@@ -162,17 +195,21 @@ class TypeWatcher {
   @extends EmberObject
   @public
 */
-export default EmberObject.extend({
-  init() {
-    this._super(...arguments);
-
-    this.containerDebugAdapter = getOwner(this).lookup('container-debug-adapter:main');
-
-    this.releaseMethods = emberA();
-    this.recordsWatchers = new Map();
-    this.typeWatchers = new Map();
-    this.flushWatchers = null;
-  },
+export default class DataAdapter<T> extends EmberObject {
+  releaseMethods = emberA<() => void>();
+  recordsWatchers: Map<unknown, { release: () => void; revalidate: () => void }> = new Map();
+  typeWatchers: Map<unknown, { release: () => void; revalidate: () => void }> = new Map();
+  flushWatchers: (() => void) | null = null;
+
+  // TODO: Revisit this
+  declare containerDebugAdapter: ContainerDebugAdapter;
+
+  constructor(owner: Owner) {
+    super(owner);
+    this.containerDebugAdapter = getOwner(this)!.lookup(
+      'container-debug-adapter:main'
+    ) as ContainerDebugAdapter;
+  }
 
   /**
     The container-debug-adapter which is used
@@ -194,7 +231,7 @@ export default EmberObject.extend({
     @default 3
     @since 1.3.0
   */
-  attributeLimit: 3,
+  attributeLimit = 3;
 
   /**
      Ember Data > v1.0.0-beta.18
@@ -208,7 +245,7 @@ export default EmberObject.extend({
      @public
      @property acceptsModelName
    */
-  acceptsModelName: true,
+  acceptsModelName = true;
 
   /**
      Map from records arrays to RecordsWatcher instances
@@ -257,7 +294,7 @@ export default EmberObject.extend({
   */
   getFilters() {
     return emberA();
-  },
+  }
 
   /**
     Fetch the model types and observe them for changes.
@@ -273,9 +310,12 @@ export default EmberObject.extend({
 
     @return {Function} Method to call to remove all observers
   */
-  watchModelTypes(typesAdded, typesUpdated) {
+  watchModelTypes(
+    typesAdded: (types: WrappedType[]) => void,
+    typesUpdated: (types: WrappedType[]) => void
+  ) {
     let modelTypes = this.getModelTypes();
-    let releaseMethods = emberA();
+    let releaseMethods = emberA<() => void>();
     let typesToSend;
 
     typesToSend = modelTypes.map((type) => {
@@ -293,16 +333,16 @@ export default EmberObject.extend({
     };
     this.releaseMethods.pushObject(release);
     return release;
-  },
+  }
 
-  _nameToClass(type) {
+  _nameToClass(type: unknown): unknown {
     if (typeof type === 'string') {
-      let owner = getOwner(this);
+      let owner = getOwner(this)!;
       let Factory = owner.factoryFor(`model:${type}`);
       type = Factory && Factory.class;
     }
     return type;
-  },
+  }
 
   /**
     Fetch the records of a given type and observe them for changes.
@@ -326,7 +366,12 @@ export default EmberObject.extend({
 
     @return {Function} Method to call to remove all observers.
   */
-  watchRecords(modelName, recordsAdded, recordsUpdated, recordsRemoved) {
+  watchRecords(
+    modelName: string,
+    recordsAdded: RecordCallback<T>,
+    recordsUpdated: RecordCallback<T>,
+    recordsRemoved: RecordCallback<T>
+  ) {
     let klass = this._nameToClass(modelName);
     let records = this.getRecords(klass, modelName);
     let { recordsWatchers } = this;
@@ -334,12 +379,12 @@ export default EmberObject.extend({
     let recordsWatcher = recordsWatchers.get(records);
 
     if (!recordsWatcher) {
-      recordsWatcher = new RecordsWatcher(
+      recordsWatcher = new RecordsWatcher<T>(
         records,
         recordsAdded,
         recordsUpdated,
         recordsRemoved,
-        (record) => this.wrapRecord(record),
+        (record: T) => this.wrapRecord(record),
         () => {
           recordsWatchers.delete(records);
           this.updateFlushWatchers();
@@ -353,7 +398,7 @@ export default EmberObject.extend({
     }
 
     return recordsWatcher.release;
-  },
+  }
 
   updateFlushWatchers() {
     if (this.flushWatchers === null) {
@@ -369,7 +414,7 @@ export default EmberObject.extend({
       _backburner.off('end', this.flushWatchers);
       this.flushWatchers = null;
     }
-  },
+  }
 
   /**
     Clear all observers before destruction
@@ -387,7 +432,7 @@ export default EmberObject.extend({
     if (this.flushWatchers) {
       _backburner.off('end', this.flushWatchers);
     }
-  },
+  }
 
   /**
     Detect whether a class is a model.
@@ -399,9 +444,9 @@ export default EmberObject.extend({
     @method detect
     @return boolean Whether the class is a model class or not.
   */
-  detect() {
+  detect(_klass: unknown): boolean {
     return false;
-  },
+  }
 
   /**
     Get the columns for a given model type.
@@ -412,9 +457,9 @@ export default EmberObject.extend({
      name: {String} The name of the column.
      desc: {String} Humanized description (what would show in a table column name).
   */
-  columnsForType() {
+  columnsForType(_klass: unknown) {
     return emberA();
-  },
+  }
 
   /**
     Adds observers to a model type class.
@@ -426,7 +471,7 @@ export default EmberObject.extend({
     @return {Function} The function to call to remove observers.
   */
 
-  observeModelType(modelName, typesUpdated) {
+  observeModelType(modelName: string, typesUpdated: (types: WrappedType[]) => void) {
     let klass = this._nameToClass(modelName);
     let records = this.getRecords(klass, modelName);
 
@@ -451,7 +496,7 @@ export default EmberObject.extend({
     }
 
     return typeWatcher.release;
-  },
+  }
 
   /**
     Wraps a given model type and observes changes to it.
@@ -460,29 +505,22 @@ export default EmberObject.extend({
     @method wrapModelType
     @param {Class} klass A model class.
     @param {String} modelName Name of the class.
-    @return {Object} Contains the wrapped type and the function to remove observers
-    Format:
-      type: {Object} The wrapped type.
-        The wrapped type has the following format:
-          name: {String} The name of the type.
-          count: {Integer} The number of records available.
-          columns: {Columns} An array of columns to describe the record.
-          object: {Class} The actual Model type class.
-      release: {Function} The function to remove observers.
+    @return {Object} The wrapped type has the following format:
+      name: {String} The name of the type.
+      count: {Integer} The number of records available.
+      columns: {Columns} An array of columns to describe the record.
+      object: {Class} The actual Model type class.
   */
-  wrapModelType(klass, name) {
+  wrapModelType<N extends string>(klass: unknown, name: N): WrappedType<N> {
     let records = this.getRecords(klass, name);
-    let typeToSend;
 
-    typeToSend = {
+    return {
       name,
       count: get(records, 'length'),
       columns: this.columnsForType(klass),
       object: klass,
     };
-
-    return typeToSend;
-  },
+  }
 
   /**
     Fetches all models defined in the application.
@@ -491,27 +529,23 @@ export default EmberObject.extend({
     @method getModelTypes
     @return {Array} Array of model types.
   */
-  getModelTypes() {
-    let containerDebugAdapter = this.get('containerDebugAdapter');
-    let types;
-
-    if (containerDebugAdapter.canCatalogEntriesByType('model')) {
-      types = containerDebugAdapter.catalogEntriesByType('model');
-    } else {
-      types = this._getObjectsOnNamespaces();
-    }
+  getModelTypes(): NativeArray<{ klass: unknown; name: string }> {
+    let containerDebugAdapter = this.containerDebugAdapter;
+
+    let stringTypes = containerDebugAdapter.canCatalogEntriesByType('model')
+      ? containerDebugAdapter.catalogEntriesByType('model')
+      : this._getObjectsOnNamespaces();
 
     // New adapters return strings instead of classes.
-    types = emberA(types).map((name) => {
+    let klassTypes = emberA(stringTypes).map((name) => {
       return {
         klass: this._nameToClass(name),
         name,
       };
     });
-    types = emberA(types).filter((type) => this.detect(type.klass));
 
-    return emberA(types);
-  },
+    return emberA(klassTypes).filter((type) => this.detect(type.klass));
+  }
 
   /**
     Loops over all namespaces and all objects
@@ -523,7 +557,7 @@ export default EmberObject.extend({
   */
   _getObjectsOnNamespaces() {
     let namespaces = emberA(Namespace.NAMESPACES);
-    let types = emberA();
+    let types = emberA<string>();
 
     namespaces.forEach((namespace) => {
       for (let key in namespace) {
@@ -540,7 +574,7 @@ export default EmberObject.extend({
       }
     });
     return types;
-  },
+  }
 
   /**
     Fetches all loaded records for a given type.
@@ -551,9 +585,9 @@ export default EmberObject.extend({
      This array will be observed for changes,
      so it should update when new records are added/removed.
   */
-  getRecords() {
+  getRecords(_klass: unknown, _name: string): NativeArray<T> {
     return emberA();
-  },
+  }
 
   /**
     Wraps a record and observers changes to it.
@@ -565,16 +599,15 @@ export default EmberObject.extend({
     columnValues: {Array}
     searchKeywords: {Array}
   */
-  wrapRecord(record) {
-    let recordToSend = { object: record };
-
-    recordToSend.columnValues = this.getRecordColumnValues(record);
-    recordToSend.searchKeywords = this.getRecordKeywords(record);
-    recordToSend.filterValues = this.getRecordFilterValues(record);
-    recordToSend.color = this.getRecordColor(record);
-
-    return recordToSend;
-  },
+  wrapRecord(record: T): WrappedRecord<T> {
+    return {
+      object: record,
+      columnValues: this.getRecordColumnValues(record),
+      searchKeywords: this.getRecordKeywords(record),
+      filterValues: this.getRecordFilterValues(record),
+      color: this.getRecordColor(record),
+    };
+  }
 
   /**
     Gets the values for each column.
@@ -584,9 +617,9 @@ export default EmberObject.extend({
     @return {Object} Keys should match column names defined
     by the model type.
   */
-  getRecordColumnValues() {
+  getRecordColumnValues(_record: T) {
     return {};
-  },
+  }
 
   /**
     Returns keywords to match when searching records.
@@ -595,9 +628,9 @@ export default EmberObject.extend({
     @method getRecordKeywords
     @return {Array} Relevant keywords for search.
   */
-  getRecordKeywords() {
+  getRecordKeywords(_record: T) {
     return emberA();
-  },
+  }
 
   /**
     Returns the values of filters defined by `getFilters`.
@@ -607,9 +640,9 @@ export default EmberObject.extend({
     @param {Object} record The record instance.
     @return {Object} The filter values.
   */
-  getRecordFilterValues() {
+  getRecordFilterValues(_record: T): object {
     return {};
-  },
+  }
 
   /**
     Each record can have a color that represents its state.
@@ -620,7 +653,7 @@ export default EmberObject.extend({
     @return {String} The records color.
       Possible options: black, red, blue, green.
   */
-  getRecordColor() {
+  getRecordColor(_record: T): RecordColor | null {
     return null;
-  },
-});
+  }
+}
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.d.ts b/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
index 601adb8f8d2..d660535fbdf 100644
--- a/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
@@ -1,3 +1,5 @@
 import EmberObject from './object';
 
-export default class Namespace extends EmberObject {}
+export default class Namespace extends EmberObject {
+  static NAMESPACES: Namespace[];
+}

From cd40a6be39e99664c13293a87c900ccb68f38d1c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 10:19:27 -0800
Subject: [PATCH 0902/1405] Convert @ember/-internals/overrides to TS

---
 packages/@ember/-internals/overrides/index.js | 1 -
 packages/@ember/-internals/overrides/index.ts | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 packages/@ember/-internals/overrides/index.js
 create mode 100644 packages/@ember/-internals/overrides/index.ts

diff --git a/packages/@ember/-internals/overrides/index.js b/packages/@ember/-internals/overrides/index.js
deleted file mode 100644
index e016036f95e..00000000000
--- a/packages/@ember/-internals/overrides/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export let onEmberGlobalAccess;
diff --git a/packages/@ember/-internals/overrides/index.ts b/packages/@ember/-internals/overrides/index.ts
new file mode 100644
index 00000000000..a940eb1661d
--- /dev/null
+++ b/packages/@ember/-internals/overrides/index.ts
@@ -0,0 +1 @@
+export let onEmberGlobalAccess: any;

From d62c50959caf37a9a91ea6306619be446ef671cb Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 10:31:03 -0800
Subject: [PATCH 0903/1405] Convert @ember/-internals/runtime/lib/ext/rsvp to
 TS

---
 .../@ember/-internals/runtime/lib/ext/rsvp.js | 59 ---------------
 .../@ember/-internals/runtime/lib/ext/rsvp.ts | 75 +++++++++++++++++++
 2 files changed, 75 insertions(+), 59 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/ext/rsvp.js
 create mode 100644 packages/@ember/-internals/runtime/lib/ext/rsvp.ts

diff --git a/packages/@ember/-internals/runtime/lib/ext/rsvp.js b/packages/@ember/-internals/runtime/lib/ext/rsvp.js
deleted file mode 100644
index e6bbfc241e5..00000000000
--- a/packages/@ember/-internals/runtime/lib/ext/rsvp.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as RSVP from 'rsvp';
-import { _backburner, _rsvpErrorQueue } from '@ember/runloop';
-import { getDispatchOverride } from '@ember/-internals/error-handling';
-import { assert } from '@ember/debug';
-
-RSVP.configure('async', (callback, promise) => {
-  _backburner.schedule('actions', null, callback, promise);
-});
-
-RSVP.configure('after', (cb) => {
-  _backburner.schedule(_rsvpErrorQueue, null, cb);
-});
-
-RSVP.on('error', onerrorDefault);
-
-export function onerrorDefault(reason) {
-  let error = errorFor(reason);
-  if (error) {
-    let overrideDispatch = getDispatchOverride();
-    if (overrideDispatch) {
-      overrideDispatch(error);
-    } else {
-      throw error;
-    }
-  }
-}
-
-function errorFor(reason) {
-  if (!reason) return;
-
-  if (reason.errorThrown) {
-    return unwrapErrorThrown(reason);
-  }
-
-  if (reason.name === 'UnrecognizedURLError') {
-    assert(`The URL '${reason.message}' did not match any routes in your application`, false);
-    return;
-  }
-
-  if (reason.name === 'TransitionAborted') {
-    return;
-  }
-
-  return reason;
-}
-
-function unwrapErrorThrown(reason) {
-  let error = reason.errorThrown;
-  if (typeof error === 'string') {
-    error = new Error(error);
-  }
-  Object.defineProperty(error, '__reason_with_error_thrown__', {
-    value: reason,
-    enumerable: false,
-  });
-  return error;
-}
-
-export default RSVP;
diff --git a/packages/@ember/-internals/runtime/lib/ext/rsvp.ts b/packages/@ember/-internals/runtime/lib/ext/rsvp.ts
new file mode 100644
index 00000000000..a8f5a92b62d
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/ext/rsvp.ts
@@ -0,0 +1,75 @@
+import * as RSVP from 'rsvp';
+import { _backburner, _rsvpErrorQueue } from '@ember/runloop';
+import { getDispatchOverride } from '@ember/-internals/error-handling';
+import { assert } from '@ember/debug';
+
+RSVP.configure('async', (callback: unknown, promise: unknown) => {
+  _backburner.schedule('actions', null, callback, promise);
+});
+
+RSVP.configure('after', (cb: unknown) => {
+  _backburner.schedule(_rsvpErrorQueue, null, cb);
+});
+
+RSVP.on('error', onerrorDefault);
+
+export function onerrorDefault(reason: unknown) {
+  let error = errorFor(reason);
+  if (error) {
+    let overrideDispatch = getDispatchOverride();
+    if (overrideDispatch) {
+      overrideDispatch(error);
+    } else {
+      throw error;
+    }
+  }
+}
+
+interface ReasonWithErrorThrown {
+  errorThrown: unknown;
+}
+
+interface ReasonWithName {
+  name: unknown;
+}
+
+interface UnrecognizedURLError {
+  name: 'UnrecognizedURLError';
+  message: string;
+}
+
+function errorFor(reason: unknown) {
+  if (!reason) return;
+
+  let withErrorThrown = reason as ReasonWithErrorThrown;
+  if (withErrorThrown?.errorThrown) {
+    return unwrapErrorThrown(withErrorThrown);
+  }
+
+  let withName = reason as UnrecognizedURLError;
+  if (withName.name === 'UnrecognizedURLError') {
+    assert(`The URL '${withName.message}' did not match any routes in your application`, false);
+    // @ts-expect-error We'll hit this if the assert is stripped
+    return;
+  }
+
+  if ((reason as ReasonWithName).name === 'TransitionAborted') {
+    return;
+  }
+
+  return reason;
+}
+
+function unwrapErrorThrown(reason: ReasonWithErrorThrown) {
+  let error = reason.errorThrown;
+  if (typeof error === 'string') {
+    error = new Error(error);
+  }
+  Object.defineProperty(error, '__reason_with_error_thrown__', {
+    value: reason,
+    enumerable: false,
+  });
+  return error;
+}
+
+export default RSVP;

From 2485aba0d858a5a13a4a5718d01b3a49de45dbf7 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 10 Feb 2022 14:03:57 -0800
Subject: [PATCH 0904/1405] Add types for runtime mixins

---
 CHANGELOG.md                                  |  2 +-
 .../-internals/container/lib/container.ts     | 15 ++++------
 .../-internals/container/lib/registry.ts      | 14 ++++++++--
 .../-internals/metal/lib/property_get.ts      |  3 +-
 .../-internals/runtime/lib/mixins/-proxy.d.ts | 28 +++++++++++++++++++
 .../runtime/lib/mixins/action_handler.d.ts    |  5 +++-
 .../-internals/runtime/lib/mixins/array.d.ts  |  6 ++--
 .../-internals/runtime/lib/mixins/array.js    |  2 +-
 .../runtime/lib/mixins/container_proxy.d.ts   |  6 ++--
 .../runtime/lib/mixins/enumerable.d.ts        |  7 +++++
 .../lib/mixins/mutable_enumerable.d.ts        |  8 ++++++
 .../runtime/lib/mixins/promise_proxy.d.ts     | 24 ++++++++++++++++
 .../runtime/lib/system/core_object.d.ts       |  6 +++-
 .../runtime/lib/system/object_proxy.d.ts      |  8 ++++++
 .../@ember/-internals/utils/lib/is_proxy.ts   |  5 ++--
 .../object/type-tests/core/index.test.ts      |  4 +--
 16 files changed, 116 insertions(+), 27 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts
 create mode 100644 packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
 create mode 100644 packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be276d530ed..a765466ab0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3144,7 +3144,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * CollectionView context is now its content
 * Various enhancements to bound helpers: adds multiple property support to bound helpers, adds bind-able options hash properties, adds {{unbound}} helper support to render unbound form of helpers.
 * Add App.inject
-* Add Ember.EnumberableUtils.intersection
+* Add Ember.EnumerableUtils.intersection
 * Deprecate Controller#controllerFor in favor of Controller#needs
 * Adds `bubbles` property to Ember.TextField
 * Allow overriding of Ember.Router#handleURL
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index da224b31077..9911051d29b 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -308,15 +308,10 @@ function factoryFor(
   return manager;
 }
 
-interface FactoryOptions {
-  instantiate?: boolean;
-  singleton?: boolean;
-}
-
 function isSingletonClass(
   container: Container,
   fullName: string,
-  { instantiate, singleton }: FactoryOptions
+  { instantiate, singleton }: TypeOptions
 ) {
   return (
     singleton !== false &&
@@ -329,7 +324,7 @@ function isSingletonClass(
 function isSingletonInstance(
   container: Container,
   fullName: string,
-  { instantiate, singleton }: FactoryOptions
+  { instantiate, singleton }: TypeOptions
 ) {
   return (
     singleton !== false &&
@@ -342,7 +337,7 @@ function isSingletonInstance(
 function isFactoryClass(
   container: Container,
   fullname: string,
-  { instantiate, singleton }: FactoryOptions
+  { instantiate, singleton }: TypeOptions
 ) {
   return (
     instantiate === false &&
@@ -354,7 +349,7 @@ function isFactoryClass(
 function isFactoryInstance(
   container: Container,
   fullName: string,
-  { instantiate, singleton }: FactoryOptions
+  { instantiate, singleton }: TypeOptions
 ) {
   return (
     instantiate !== false &&
@@ -367,7 +362,7 @@ function instantiateFactory(
   container: Container,
   normalizedName: string,
   fullName: string,
-  options: FactoryOptions
+  options: TypeOptions
 ) {
   let factoryManager = factoryFor(container, normalizedName, fullName);
 
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index d976f984756..e9ca8e25a96 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,9 +1,9 @@
 import { Factory } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
+import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 import Container, { ContainerOptions, LazyInjection } from './container';
-
 export interface Injection {
   property: string;
   specifier: string;
@@ -46,6 +46,10 @@ export type NotResolver = {
 
 export type Resolve = <T, C>(name: string) => Factory<T, C> | undefined;
 
+export interface ResolverClass {
+  create(...args: unknown[]): Resolver;
+}
+
 export interface Resolver {
   knownForType?: (type: string) => KnownForTypeResult;
   lookupDescription?: (fullName: string) => string;
@@ -77,7 +81,7 @@ const VALID_FULL_NAME_REGEXP = /^[^:]+:[^:]+$/;
 */
 export default class Registry implements IRegistry {
   readonly _failSet: Set<string>;
-  resolver: Resolver | (Resolve & NotResolver) | null;
+  resolver: Resolver | null;
   readonly fallback: IRegistry | null;
   readonly registrations: Record<string, object>;
   _localLookupCache: Record<string, object>;
@@ -86,6 +90,8 @@ export default class Registry implements IRegistry {
   readonly _resolveCache: Record<string, object>;
   readonly _typeOptions: Record<string, TypeOptions>;
 
+  set?: typeof set;
+
   constructor(options: RegistryOptions = {}) {
     this.fallback = options.fallback || null;
     this.resolver = options.resolver || null;
@@ -182,7 +188,9 @@ export default class Registry implements IRegistry {
    @param {Function} factory
    @param {Object} options
    */
-  register(fullName: string, factory: Factory<unknown>, options: TypeOptions = {}): void {
+  register(fullName: string, factory: object, options: TypeOptions & { instantiate: false }): void;
+  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
+  register(fullName: string, factory: object, options: TypeOptions = {}): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
     assert(`Attempting to register an unknown factory: '${fullName}'`, factory !== undefined);
 
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index b8abcc10c99..e032a30b1a2 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -1,6 +1,7 @@
 /**
 @module @ember/object
 */
+import ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
 import { isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
@@ -159,7 +160,7 @@ _getProp({ unknownProperty() {} }, 1 as any);
 get({}, 'foo');
 get({}, 'foo.bar');
 
-let fakeProxy = {};
+let fakeProxy = {} as ProxyMixin<unknown>;
 setProxy(fakeProxy);
 
 track(() => _getProp({}, 'a'));
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts
new file mode 100644
index 00000000000..bc3b5a0944f
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts
@@ -0,0 +1,28 @@
+import { Mixin } from '@ember/-internals/metal';
+
+export function contentFor<T>(proxy: ProxyMixin<T>): T | null;
+
+interface ProxyMixin<T = unknown> {
+  /**
+    The object whose properties will be forwarded.
+
+    @property content
+    @type {unknown}
+    @default null
+    @public
+  */
+  content: T | null;
+
+  willDestroy(): void;
+
+  isTruthy: boolean;
+
+  unknownProperty<K extends keyof T>(key: K): T[K] | undefined;
+  unknownProperty(key: string): unknown;
+
+  setUnknownProperty<K extends keyof T>(key: K, value: T[K]): T[K];
+  setUnknownProperty<V>(key: string, value: V): V;
+}
+declare const ProxyMixin: Mixin;
+
+export default ProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
index a4aac4e466a..c917912e49e 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
@@ -1,6 +1,9 @@
 import { Mixin } from '@ember/-internals/metal';
 
-export default class ActionHandler extends Mixin {
+interface ActionHandler {
   actions?: Record<string, (...args: any[]) => unknown>;
   send(actionName: string, ...args: unknown[]): void;
 }
+declare const ActionHandler: Mixin;
+
+export default ActionHandler;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index ae0d538d305..c637c03e709 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -1,8 +1,10 @@
 import { Mixin } from '@ember/-internals/metal';
+import Enumerable from './enumerable';
+import MutableEnumerable from './mutable_enumerable';
 
 type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
 
-interface EmberArray<T> {
+interface EmberArray<T> extends Enumerable {
   length: number;
   objectAt(idx: number): T | undefined;
   objectsAt(indexes: number[]): Array<T | undefined>;
@@ -67,7 +69,7 @@ interface EmberArray<T> {
 declare const EmberArray: Mixin;
 export default EmberArray;
 
-interface MutableArray<T> extends EmberArray<T> {
+interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
   replace(idx: number, amt: number, objects: T[]): void;
   clear(): this;
   insertAt(idx: number, object: T): this;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index 3c87ff82abf..e1c75bc09f4 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -1561,7 +1561,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     ```
 
     @method unshiftObjects
-    @param {Enumberable} objects the objects to add
+    @param {Enumerable} objects the objects to add
     @return {EmberArray} receiver
     @public
   */
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
index 74549deec9f..49d53cf649e 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
@@ -3,7 +3,7 @@ import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
 
-interface ContainerProxy {
+interface ContainerProxyMixin {
   /** @internal */
   __container__: Container;
 
@@ -11,6 +11,6 @@ interface ContainerProxy {
   lookup(fullName: string, options?: TypeOptions): unknown;
   factoryFor(fullName: string): Factory<unknown> | undefined;
 }
-declare const ContainerProxy: Mixin;
+declare const ContainerProxyMixin: Mixin;
 
-export default ContainerProxy;
+export default ContainerProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts
new file mode 100644
index 00000000000..f72ec8e1c1d
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts
@@ -0,0 +1,7 @@
+import { Mixin } from '@ember/-internals/metal';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Enumerable {}
+declare const Enumerable: Mixin;
+
+export default Enumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts
new file mode 100644
index 00000000000..12a7d5a4db4
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts
@@ -0,0 +1,8 @@
+import { Mixin } from '@ember/-internals/metal';
+import Enumerable from './enumerable';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface MutableEnumerable extends Enumerable {}
+declare const MutableEnumerable: Mixin;
+
+export default MutableEnumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
new file mode 100644
index 00000000000..b0015973608
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
@@ -0,0 +1,24 @@
+import { Mixin } from '@ember/-internals/metal';
+
+interface PromiseProxyMixin<T> {
+  reason: null;
+
+  readonly isPending: boolean;
+
+  readonly isSettled: boolean;
+
+  isRejected: boolean;
+
+  isFulfilled: boolean;
+
+  promise: Promise<T>;
+
+  then: this['promise']['then'];
+
+  catch: this['promise']['catch'];
+
+  finally: this['promise']['finally'];
+}
+declare const PromiseProxyMixin: Mixin;
+
+export default PromiseProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index 6b302f2b597..10cf42c53b2 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -86,6 +86,7 @@ export default class CoreObject {
    */
   isDestroying: boolean;
 
+  // NOTE That the actual CoreObject#destroy returns `this`;
   /**
    * Destroys an object by setting the `isDestroyed` flag and removing its
    * metadata, which effectively destroys observers and bindings.
@@ -95,7 +96,7 @@ export default class CoreObject {
    * happen immediately.  It will set an isDestroying flag immediately.
    * @return receiver
    */
-  destroy(): CoreObject;
+  destroy(): void;
 
   /**
    * Override to implement teardown.
@@ -141,4 +142,7 @@ export default class CoreObject {
 
   /** @internal */
   static isMethod: boolean;
+
+  /** @internal */
+  static superclass: unknown;
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts b/packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts
new file mode 100644
index 00000000000..7d9462851b7
--- /dev/null
+++ b/packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts
@@ -0,0 +1,8 @@
+import FrameworkObject from './object';
+import _ProxyMixin from '../mixins/-proxy';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface ObjectProxy extends _ProxyMixin {}
+declare class ObjectProxy extends FrameworkObject {}
+
+export default ObjectProxy;
diff --git a/packages/@ember/-internals/utils/lib/is_proxy.ts b/packages/@ember/-internals/utils/lib/is_proxy.ts
index f01a84eda53..c83ba8186d2 100644
--- a/packages/@ember/-internals/utils/lib/is_proxy.ts
+++ b/packages/@ember/-internals/utils/lib/is_proxy.ts
@@ -1,16 +1,17 @@
+import ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
 import { _WeakSet as WeakSet } from '@glimmer/util';
 import { isObject } from './spec';
 
 const PROXIES = new WeakSet();
 
-export function isProxy(value: any | undefined | null): value is object {
+export function isProxy(value: unknown): value is ProxyMixin<unknown> {
   if (isObject(value)) {
     return PROXIES.has(value);
   }
   return false;
 }
 
-export function setProxy(object: object): void {
+export function setProxy(object: ProxyMixin<unknown>): void {
   if (isObject(object)) {
     PROXIES.add(object);
   }
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index d11b365e5fa..dd875ccec75 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -13,7 +13,7 @@ const co1 = new CoreObject(owner);
 expectTypeOf(co1.concatenatedProperties).toEqualTypeOf<string[]>();
 expectTypeOf(co1.isDestroyed).toEqualTypeOf<boolean>();
 expectTypeOf(co1.isDestroying).toEqualTypeOf<boolean>();
-expectTypeOf(co1.destroy()).toEqualTypeOf<CoreObject>();
+expectTypeOf(co1.destroy()).toEqualTypeOf<void>();
 expectTypeOf(co1.toString()).toEqualTypeOf<string>();
 
 /** .create tests */
@@ -21,7 +21,7 @@ const co2 = CoreObject.create();
 expectTypeOf(co2.concatenatedProperties).toEqualTypeOf<string[]>();
 expectTypeOf(co2.isDestroyed).toEqualTypeOf<boolean>();
 expectTypeOf(co2.isDestroying).toEqualTypeOf<boolean>();
-expectTypeOf(co2.destroy()).toEqualTypeOf<CoreObject>();
+expectTypeOf(co2.destroy()).toEqualTypeOf<void>();
 expectTypeOf(co2.toString()).toEqualTypeOf<string>();
 
 /** .create tests w/ initial instance data passed in */

From c857f97c2bee11de19a190849d0aae859a75e313 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 16:50:31 -0800
Subject: [PATCH 0905/1405] Clean up some more internal types

---
 .../@ember/-internals/container/lib/registry.ts    | 14 ++------------
 .../lib/container_debug_adapter.ts                 |  2 +-
 packages/@ember/-internals/runtime/lib/ext/rsvp.ts |  2 +-
 .../runtime/lib/mixins/promise_proxy.d.ts          |  2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index e9ca8e25a96..373ed93c1f5 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -36,16 +36,6 @@ export interface IRegistry {
   resolve<T, C>(fullName: string, options?: ResolveOptions): Factory<T, C> | undefined;
 }
 
-export type NotResolver = {
-  knownForType: never;
-  lookupDescription: never;
-  makeToString: never;
-  normalize: never;
-  resolve: never;
-};
-
-export type Resolve = <T, C>(name: string) => Factory<T, C> | undefined;
-
 export interface ResolverClass {
   create(...args: unknown[]): Resolver;
 }
@@ -55,13 +45,13 @@ export interface Resolver {
   lookupDescription?: (fullName: string) => string;
   makeToString?: <T, C>(factory: Factory<T, C>, fullName: string) => string;
   normalize?: (fullName: string) => string;
-  resolve: Resolve;
+  resolve<T, C>(name: string): Factory<T, C> | undefined;
 }
 
 export interface RegistryOptions {
   fallback?: IRegistry;
   registrations?: { [key: string]: object };
-  resolver?: Resolver | (Resolve & NotResolver);
+  resolver?: Resolver;
 }
 
 const VALID_FULL_NAME_REGEXP = /^[^:]+:[^:]+$/;
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
index 39f9f6c161f..c7937c66f4b 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
@@ -62,7 +62,7 @@ export default class ContainerDebugAdapter extends EmberObject {
     @property resolver
     @public
   */
-  declare resolver: Resolver;
+  resolver: Resolver;
 
   /**
     Returns true if it is possible to catalog a list of available
diff --git a/packages/@ember/-internals/runtime/lib/ext/rsvp.ts b/packages/@ember/-internals/runtime/lib/ext/rsvp.ts
index a8f5a92b62d..45419961a9a 100644
--- a/packages/@ember/-internals/runtime/lib/ext/rsvp.ts
+++ b/packages/@ember/-internals/runtime/lib/ext/rsvp.ts
@@ -42,7 +42,7 @@ function errorFor(reason: unknown) {
   if (!reason) return;
 
   let withErrorThrown = reason as ReasonWithErrorThrown;
-  if (withErrorThrown?.errorThrown) {
+  if (withErrorThrown.errorThrown) {
     return unwrapErrorThrown(withErrorThrown);
   }
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
index b0015973608..5c685022b69 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
@@ -1,7 +1,7 @@
 import { Mixin } from '@ember/-internals/metal';
 
 interface PromiseProxyMixin<T> {
-  reason: null;
+  reason: unknown;
 
   readonly isPending: boolean;
 

From 7be49a69e48362feb507cc8115c0874d0c1d3840 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 12:02:16 -0800
Subject: [PATCH 0906/1405] Rename all internal-test-helper .js to .ts

---
 packages/internal-test-helpers/index.d.ts                        | 1 -
 packages/internal-test-helpers/{index.js => index.ts}            | 0
 .../lib/{apply-mixins.js => apply-mixins.ts}                     | 0
 .../internal-test-helpers/lib/{build-owner.js => build-owner.ts} | 0
 .../lib/{confirm-export.js => confirm-export.ts}                 | 0
 .../lib/{equal-inner-html.js => equal-inner-html.ts}             | 0
 .../lib/{equal-tokens.js => equal-tokens.ts}                     | 0
 packages/internal-test-helpers/lib/{factory.js => factory.ts}    | 0
 .../lib/{get-all-property-names.js => get-all-property-names.ts} | 0
 packages/internal-test-helpers/lib/{matchers.js => matchers.ts}  | 0
 .../internal-test-helpers/lib/{module-for.js => module-for.ts}   | 0
 .../internal-test-helpers/lib/{node-query.js => node-query.ts}   | 0
 .../lib/{registry-check.js => registry-check.ts}                 | 0
 packages/internal-test-helpers/lib/{strip.js => strip.ts}        | 0
 .../lib/system/{synthetic-events.js => synthetic-events.ts}      | 0
 .../{abstract-application.js => abstract-application.ts}         | 0
 .../lib/test-cases/{abstract.js => abstract.ts}                  | 0
 .../lib/test-cases/{application.js => application.ts}            | 0
 .../{autoboot-application.js => autoboot-application.ts}         | 0
 .../lib/test-cases/{query-param.js => query-param.ts}            | 0
 .../lib/test-cases/{rendering.js => rendering.ts}                | 0
 .../{router-non-application.js => router-non-application.ts}     | 0
 .../lib/test-cases/{router.js => router.ts}                      | 0
 ...test-resolver-application.js => test-resolver-application.ts} | 0
 .../lib/{test-resolver.js => test-resolver.ts}                   | 0
 .../internal-test-helpers/tests/{index-test.js => index-test.ts} | 0
 26 files changed, 1 deletion(-)
 delete mode 100644 packages/internal-test-helpers/index.d.ts
 rename packages/internal-test-helpers/{index.js => index.ts} (100%)
 rename packages/internal-test-helpers/lib/{apply-mixins.js => apply-mixins.ts} (100%)
 rename packages/internal-test-helpers/lib/{build-owner.js => build-owner.ts} (100%)
 rename packages/internal-test-helpers/lib/{confirm-export.js => confirm-export.ts} (100%)
 rename packages/internal-test-helpers/lib/{equal-inner-html.js => equal-inner-html.ts} (100%)
 rename packages/internal-test-helpers/lib/{equal-tokens.js => equal-tokens.ts} (100%)
 rename packages/internal-test-helpers/lib/{factory.js => factory.ts} (100%)
 rename packages/internal-test-helpers/lib/{get-all-property-names.js => get-all-property-names.ts} (100%)
 rename packages/internal-test-helpers/lib/{matchers.js => matchers.ts} (100%)
 rename packages/internal-test-helpers/lib/{module-for.js => module-for.ts} (100%)
 rename packages/internal-test-helpers/lib/{node-query.js => node-query.ts} (100%)
 rename packages/internal-test-helpers/lib/{registry-check.js => registry-check.ts} (100%)
 rename packages/internal-test-helpers/lib/{strip.js => strip.ts} (100%)
 rename packages/internal-test-helpers/lib/system/{synthetic-events.js => synthetic-events.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{abstract-application.js => abstract-application.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{abstract.js => abstract.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{application.js => application.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{autoboot-application.js => autoboot-application.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{query-param.js => query-param.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{rendering.js => rendering.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{router-non-application.js => router-non-application.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{router.js => router.ts} (100%)
 rename packages/internal-test-helpers/lib/test-cases/{test-resolver-application.js => test-resolver-application.ts} (100%)
 rename packages/internal-test-helpers/lib/{test-resolver.js => test-resolver.ts} (100%)
 rename packages/internal-test-helpers/tests/{index-test.js => index-test.ts} (100%)

diff --git a/packages/internal-test-helpers/index.d.ts b/packages/internal-test-helpers/index.d.ts
deleted file mode 100644
index fbaf8aca635..00000000000
--- a/packages/internal-test-helpers/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'internal-test-helpers';
diff --git a/packages/internal-test-helpers/index.js b/packages/internal-test-helpers/index.ts
similarity index 100%
rename from packages/internal-test-helpers/index.js
rename to packages/internal-test-helpers/index.ts
diff --git a/packages/internal-test-helpers/lib/apply-mixins.js b/packages/internal-test-helpers/lib/apply-mixins.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/apply-mixins.js
rename to packages/internal-test-helpers/lib/apply-mixins.ts
diff --git a/packages/internal-test-helpers/lib/build-owner.js b/packages/internal-test-helpers/lib/build-owner.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/build-owner.js
rename to packages/internal-test-helpers/lib/build-owner.ts
diff --git a/packages/internal-test-helpers/lib/confirm-export.js b/packages/internal-test-helpers/lib/confirm-export.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/confirm-export.js
rename to packages/internal-test-helpers/lib/confirm-export.ts
diff --git a/packages/internal-test-helpers/lib/equal-inner-html.js b/packages/internal-test-helpers/lib/equal-inner-html.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/equal-inner-html.js
rename to packages/internal-test-helpers/lib/equal-inner-html.ts
diff --git a/packages/internal-test-helpers/lib/equal-tokens.js b/packages/internal-test-helpers/lib/equal-tokens.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/equal-tokens.js
rename to packages/internal-test-helpers/lib/equal-tokens.ts
diff --git a/packages/internal-test-helpers/lib/factory.js b/packages/internal-test-helpers/lib/factory.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/factory.js
rename to packages/internal-test-helpers/lib/factory.ts
diff --git a/packages/internal-test-helpers/lib/get-all-property-names.js b/packages/internal-test-helpers/lib/get-all-property-names.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/get-all-property-names.js
rename to packages/internal-test-helpers/lib/get-all-property-names.ts
diff --git a/packages/internal-test-helpers/lib/matchers.js b/packages/internal-test-helpers/lib/matchers.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/matchers.js
rename to packages/internal-test-helpers/lib/matchers.ts
diff --git a/packages/internal-test-helpers/lib/module-for.js b/packages/internal-test-helpers/lib/module-for.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/module-for.js
rename to packages/internal-test-helpers/lib/module-for.ts
diff --git a/packages/internal-test-helpers/lib/node-query.js b/packages/internal-test-helpers/lib/node-query.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/node-query.js
rename to packages/internal-test-helpers/lib/node-query.ts
diff --git a/packages/internal-test-helpers/lib/registry-check.js b/packages/internal-test-helpers/lib/registry-check.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/registry-check.js
rename to packages/internal-test-helpers/lib/registry-check.ts
diff --git a/packages/internal-test-helpers/lib/strip.js b/packages/internal-test-helpers/lib/strip.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/strip.js
rename to packages/internal-test-helpers/lib/strip.ts
diff --git a/packages/internal-test-helpers/lib/system/synthetic-events.js b/packages/internal-test-helpers/lib/system/synthetic-events.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/system/synthetic-events.js
rename to packages/internal-test-helpers/lib/system/synthetic-events.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.js b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/abstract-application.js
rename to packages/internal-test-helpers/lib/test-cases/abstract-application.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract.js b/packages/internal-test-helpers/lib/test-cases/abstract.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/abstract.js
rename to packages/internal-test-helpers/lib/test-cases/abstract.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/application.js b/packages/internal-test-helpers/lib/test-cases/application.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/application.js
rename to packages/internal-test-helpers/lib/test-cases/application.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/autoboot-application.js b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/autoboot-application.js
rename to packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.js b/packages/internal-test-helpers/lib/test-cases/query-param.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/query-param.js
rename to packages/internal-test-helpers/lib/test-cases/query-param.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.js b/packages/internal-test-helpers/lib/test-cases/rendering.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/rendering.js
rename to packages/internal-test-helpers/lib/test-cases/rendering.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.js b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/router-non-application.js
rename to packages/internal-test-helpers/lib/test-cases/router-non-application.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/router.js b/packages/internal-test-helpers/lib/test-cases/router.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/router.js
rename to packages/internal-test-helpers/lib/test-cases/router.ts
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.js b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-cases/test-resolver-application.js
rename to packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
diff --git a/packages/internal-test-helpers/lib/test-resolver.js b/packages/internal-test-helpers/lib/test-resolver.ts
similarity index 100%
rename from packages/internal-test-helpers/lib/test-resolver.js
rename to packages/internal-test-helpers/lib/test-resolver.ts
diff --git a/packages/internal-test-helpers/tests/index-test.js b/packages/internal-test-helpers/tests/index-test.ts
similarity index 100%
rename from packages/internal-test-helpers/tests/index-test.js
rename to packages/internal-test-helpers/tests/index-test.ts

From b8d7c676b0ef57e5f26d7dc5f8572d8c739e1d4c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 10:28:19 -0800
Subject: [PATCH 0907/1405] Convert internal-test-helpers to TS

Also fix some incorrect types
---
 .../-internals/glimmer/lib/helpers/action.ts  |   2 +-
 .../application/debug-render-tree-test.ts     | 158 +++++++++---------
 packages/@ember/-internals/metal/lib/mixin.ts |   2 +-
 .../views/lib/system/event_dispatcher.d.ts    |   2 +
 packages/@ember/application/instance.d.ts     |   4 +-
 .../@ember/application/lib/application.d.ts   |   4 +-
 .../application/type-tests/index.test.ts      |   2 +-
 .../application/type-tests/instance.test.ts   |   2 +-
 packages/@ember/engine/index.d.ts             |   2 +
 packages/@ember/engine/instance.d.ts          |   8 +-
 .../@ember/engine/type-tests/index.test.ts    |   7 +-
 .../@ember/engine/type-tests/instance.test.ts |   4 +-
 packages/@ember/runloop/index.ts              |  12 +-
 .../@ember/runloop/type-tests.ts/run.test.ts  |  12 +-
 .../@ember/service/tests/service_ts_test.ts   |   8 +-
 .../tests/utils/transform-test-case.ts        |   4 +-
 .../internal-test-helpers/lib/apply-mixins.ts |  32 +++-
 .../internal-test-helpers/lib/build-owner.ts  |  19 ++-
 .../lib/confirm-export.ts                     |  36 ++--
 .../lib/element-helpers.ts                    |   4 +-
 .../lib/equal-inner-html.ts                   |  11 +-
 .../internal-test-helpers/lib/equal-tokens.ts |  10 +-
 packages/internal-test-helpers/lib/factory.ts |  73 ++++----
 .../lib/get-all-property-names.ts             |   4 +-
 .../internal-test-helpers/lib/matchers.ts     |  39 +++--
 .../internal-test-helpers/lib/module-for.ts   |  63 ++++---
 .../internal-test-helpers/lib/node-query.ts   |  69 ++++----
 .../lib/registry-check.ts                     |   4 +-
 packages/internal-test-helpers/lib/run.ts     |   2 +-
 packages/internal-test-helpers/lib/strip.ts   |   2 +-
 .../lib/system/synthetic-events.ts            | 107 +++++-------
 .../lib/test-cases/abstract-application.ts    |  39 +++--
 .../lib/test-cases/abstract.ts                |  95 +++++++----
 .../lib/test-cases/application.ts             |  29 ++--
 .../lib/test-cases/autoboot-application.ts    |  23 ++-
 .../lib/test-cases/query-param.ts             |  37 ++--
 .../lib/test-cases/rendering.ts               |  96 +++++++----
 .../lib/test-cases/router-non-application.ts  |  52 ++++--
 .../lib/test-cases/router.ts                  |  10 +-
 .../test-cases/test-resolver-application.ts   |  26 ++-
 .../lib/test-resolver.ts                      |  13 +-
 .../internal-test-helpers/tests/index-test.ts |   2 +-
 42 files changed, 662 insertions(+), 468 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index f75dec64867..0dbc9616f63 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -310,7 +310,7 @@ export default internalHelper(
     } else {
       fn = makeDynamicClosureAction(
         valueForRef(context) as object,
-        target,
+        target!,
         action,
         processArgs,
         debugKey
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 3cc9f927a84..e7926c1f23c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -53,8 +53,8 @@ if (ENV._DEBUG_RENDER_TREE) {
     class extends ApplicationTestCase {
       _TEMPLATE_ONLY_GLIMMER_COMPONENTS: boolean;
 
-      constructor() {
-        super(...arguments);
+      constructor(assert: QUnit['assert']) {
+        super(assert);
         this._TEMPLATE_ONLY_GLIMMER_COMPONENTS = ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS;
         ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS = true;
       }
@@ -100,7 +100,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { model: undefined } },
             instance: this.controllerFor('index'),
             template: 'my-app/templates/index.hbs',
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [],
           }),
         ]);
@@ -114,7 +114,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { model: undefined } },
             instance: this.controllerFor('foo'),
             template: 'my-app/templates/foo.hbs',
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [
               this.outlet({
                 type: 'route-template',
@@ -122,7 +122,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model: undefined } },
                 instance: this.controllerFor('foo.index'),
                 template: 'my-app/templates/foo/index.hbs',
-                bounds: this.nodeBounds(this.element.lastChild),
+                bounds: this.nodeBounds(this.element!.lastChild),
                 children: [],
               }),
             ],
@@ -138,7 +138,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { model: undefined } },
             instance: this.controllerFor('foo'),
             template: 'my-app/templates/foo.hbs',
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [
               this.outlet({
                 type: 'route-template',
@@ -146,7 +146,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model: 'wow' } },
                 instance: this.controllerFor('foo.inner'),
                 template: 'my-app/templates/foo/inner.hbs',
-                bounds: this.nodeBounds(this.element.lastChild),
+                bounds: this.nodeBounds(this.element!.lastChild),
                 children: [],
               }),
             ],
@@ -162,7 +162,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { model: undefined } },
             instance: this.controllerFor('foo'),
             template: 'my-app/templates/foo.hbs',
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [
               this.outlet({
                 type: 'route-template',
@@ -170,7 +170,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model: 'zomg' } },
                 instance: this.controllerFor('foo.inner'),
                 template: 'my-app/templates/foo/inner.hbs',
-                bounds: this.nodeBounds(this.element.lastChild),
+                bounds: this.nodeBounds(this.element!.lastChild),
                 children: [],
               }),
             ],
@@ -290,7 +290,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('engineName', 'bar');
+          this.controllerFor('application')!.set('engineName', 'bar');
         });
 
         this.assertRenderTree([
@@ -337,7 +337,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('engineName', undefined);
+          this.controllerFor('application')!.set('engineName', undefined);
         });
 
         this.assertRenderTree([
@@ -370,7 +370,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         };
 
         runTask(() => {
-          this.controllerFor('application').setProperties({
+          this.controllerFor('application')!.setProperties({
             showMore: true,
             engineModel: model,
           });
@@ -430,7 +430,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('engineName', 'bar');
+          this.controllerFor('application')!.set('engineName', 'bar');
         });
 
         this.assertRenderTree([
@@ -537,7 +537,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
 
         runTask(() => {
-          this.controllerFor('application').setProperties({
+          this.controllerFor('application')!.setProperties({
             showMore: false,
             engineName: undefined,
           });
@@ -630,7 +630,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { model: undefined } },
             instance: this.controllerFor('index'),
             template: 'my-app/templates/index.hbs',
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [],
           }),
         ]);
@@ -644,7 +644,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: {} },
             instance: instance!,
             template: null,
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [
               {
                 type: 'route-template',
@@ -652,7 +652,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model: undefined } },
                 instance: instance!.lookup('controller:application'),
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.element),
+                bounds: this.elementBounds(this.element!),
                 children: [
                   this.outlet({
                     type: 'route-template',
@@ -660,7 +660,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { model: undefined } },
                     instance: instance!.lookup('controller:index'),
                     template: 'foo/templates/index.hbs',
-                    bounds: this.nodeBounds(this.element.firstChild),
+                    bounds: this.nodeBounds(this.element!.firstChild),
                     children: [],
                   }),
                 ],
@@ -682,7 +682,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: {} },
             instance: instance!,
             template: null,
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [
               {
                 type: 'route-template',
@@ -690,7 +690,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model: undefined } },
                 instance: instance!.lookup('controller:application'),
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.element),
+                bounds: this.elementBounds(this.element!),
                 children: [
                   this.outlet({
                     type: 'route-template',
@@ -698,7 +698,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { model: undefined } },
                     instance: instance!.lookup('controller:index'),
                     template: 'foo/templates/index.hbs',
-                    bounds: this.nodeBounds(this.element.firstChild),
+                    bounds: this.nodeBounds(this.element!.firstChild),
                     children: [],
                   }),
                   {
@@ -707,7 +707,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { message: 'World' } },
                     instance: null,
                     template: 'foo/components/hello.hbs',
-                    bounds: this.nodeBounds(this.element.lastChild),
+                    bounds: this.nodeBounds(this.element!.lastChild),
                     children: [],
                   },
                 ],
@@ -729,7 +729,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: {} },
             instance: instance!,
             template: null,
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [
               {
                 type: 'route-template',
@@ -737,7 +737,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model: undefined } },
                 instance: instance!.lookup('controller:application'),
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.element),
+                bounds: this.elementBounds(this.element!),
                 children: [
                   this.outlet({
                     type: 'route-template',
@@ -745,7 +745,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { model: undefined } },
                     instance: instance!.lookup('controller:index'),
                     template: 'foo/templates/index.hbs',
-                    bounds: this.nodeBounds(this.element.firstChild),
+                    bounds: this.nodeBounds(this.element!.firstChild),
                     children: [],
                   }),
                 ],
@@ -763,7 +763,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { model: undefined } },
             instance: this.controllerFor('index'),
             template: 'my-app/templates/index.hbs',
-            bounds: this.elementBounds(this.element),
+            bounds: this.elementBounds(this.element!),
             children: [],
           }),
         ]);
@@ -795,13 +795,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
@@ -811,7 +811,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -820,13 +820,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'second' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
         this.assertRenderTree([
@@ -836,7 +836,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -868,13 +868,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
@@ -884,7 +884,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -893,13 +893,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'second' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
         this.assertRenderTree([
@@ -909,7 +909,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -943,13 +943,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
@@ -959,7 +959,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -968,13 +968,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'second' } },
             instance: null,
             template: 'my-app/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
         this.assertRenderTree([
@@ -984,7 +984,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: null,
             template: 'my-app/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -1016,13 +1016,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: object) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
@@ -1032,7 +1032,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: object) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -1041,13 +1041,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'second' } },
             instance: (instance: object) => instance['name'] === 'second',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
         this.assertRenderTree([
@@ -1057,7 +1057,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: object) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -1101,13 +1101,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: object) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
@@ -1117,7 +1117,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: object) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -1126,13 +1126,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'second' } },
             instance: (instance: object) => instance['name'] === 'second',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
         this.assertRenderTree([
@@ -1142,7 +1142,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { name: 'first' } },
             instance: (instance: object) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -1162,7 +1162,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         await this.visit('/');
 
-        let target = this.controllerFor('application');
+        let target = this.controllerFor('application')!;
 
         let inputToString = /<Input:ember[0-9]+>/;
 
@@ -1173,7 +1173,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { type: 'text', value: 'first' } },
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -1187,7 +1187,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { type: 'text', value: 'first' } },
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -1196,7 +1196,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { type: 'checkbox', checked: false } },
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
@@ -1210,7 +1210,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { type: 'text', value: 'first' } },
             instance: (instance: object) => inputToString.test(instance.toString()),
             template: 'packages/@ember/-internals/glimmer/lib/templates/input.hbs',
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
@@ -1230,7 +1230,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         await this.visit('/');
 
-        let textareaNode = (value: string, node: Node): ExpectedRenderNode => {
+        let textareaNode = (value: string, node: Node | null): ExpectedRenderNode => {
           return {
             type: 'component',
             name: 'textarea',
@@ -1242,22 +1242,22 @@ if (ENV._DEBUG_RENDER_TREE) {
           };
         };
 
-        this.assertRenderTree([textareaNode('first', this.element.firstChild)]);
+        this.assertRenderTree([textareaNode('first', this.element!.firstChild)]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
-          textareaNode('first', this.element.firstChild),
-          textareaNode('second', this.element.lastChild),
+          textareaNode('first', this.element!.firstChild),
+          textareaNode('second', this.element!.lastChild),
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
-        this.assertRenderTree([textareaNode('first', this.element.firstChild)]);
+        this.assertRenderTree([textareaNode('first', this.element!.firstChild)]);
       }
 
       async '@test <LinkTo> components'() {
@@ -1288,13 +1288,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { route: 'foo' } },
             instance: (instance: object) => instance['route'] === 'foo',
             template,
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', true);
+          this.controllerFor('application')!.set('showSecond', true);
         });
 
         this.assertRenderTree([
@@ -1304,7 +1304,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { route: 'foo' } },
             instance: (instance: object) => instance['route'] === 'foo',
             template,
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
           {
@@ -1313,13 +1313,13 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { route: 'bar' } },
             instance: (instance: object) => instance['route'] === 'bar',
             template,
-            bounds: this.nodeBounds(this.element.lastChild),
+            bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
           },
         ]);
 
         runTask(() => {
-          this.controllerFor('application').set('showSecond', false);
+          this.controllerFor('application')!.set('showSecond', false);
         });
 
         this.assertRenderTree([
@@ -1329,14 +1329,14 @@ if (ENV._DEBUG_RENDER_TREE) {
             args: { positional: [], named: { route: 'foo' } },
             instance: (instance: object) => instance['route'] === 'foo',
             template,
-            bounds: this.nodeBounds(this.element.firstChild),
+            bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
           },
         ]);
       }
 
       get owner(): Owner {
-        return this.applicationInstance;
+        return this.applicationInstance!;
       }
 
       outlet(
@@ -1369,10 +1369,10 @@ if (ENV._DEBUG_RENDER_TREE) {
         };
       }
 
-      nodeBounds(node: Node): CapturedBounds {
+      nodeBounds(node: Node | null): CapturedBounds {
         return {
           parentElement: ((expect(
-            node.parentNode,
+            node?.parentNode,
             'BUG: detached node'
           ) as unknown) as SimpleNode) as SimpleElement,
           firstNode: (node as unknown) as SimpleNode,
@@ -1400,7 +1400,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             template: outlet,
             bounds: ENV._APPLICATION_TEMPLATE_WRAPPER
               ? this.nodeBounds(this.element)
-              : this.elementBounds(this.element),
+              : this.elementBounds(this.element!),
             children: [
               this.outlet({
                 type: 'route-template',
@@ -1410,7 +1410,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 template: this.owner.hasRegistration('template:application')
                   ? 'my-app/templates/application.hbs'
                   : outlet,
-                bounds: this.elementBounds(this.element),
+                bounds: this.elementBounds(this.element!),
                 children: expected,
               }),
             ],
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index d102fee0ed5..25309f8ca90 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -254,7 +254,7 @@ function mergeMixins(
       } else if (mixins !== undefined) {
         mergeMixins(mixins, meta, descs, values, base, keys, keysWithSuper);
 
-        if (currentMixin._without !== undefined) {
+        if (currentMixin instanceof Mixin && currentMixin._without !== undefined) {
           currentMixin._without.forEach((keyName: string) => {
             // deleting the key means we won't process the value
             let index = keys.indexOf(keyName);
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
index 5113dc50e67..bb2a7d3a522 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
@@ -5,4 +5,6 @@ export default class EventDispatcher extends EmberObject {
   lazyEvents: Map<string, string>;
   setupHandlerForBrowserEvent(event: string): void;
   setupHandlerForEmberEvent(event: string): void;
+  /** @private */
+  setup(addedEvents: Record<string, string | null>, _rootElement: Element): void;
 }
diff --git a/packages/@ember/application/instance.d.ts b/packages/@ember/application/instance.d.ts
index 298e3b6c27b..5bf13267ecd 100644
--- a/packages/@ember/application/instance.d.ts
+++ b/packages/@ember/application/instance.d.ts
@@ -10,4 +10,6 @@ export interface BootOptions {
   isInteractive?: boolean;
 }
 
-export default class ApplicationInstance extends EngineInstance {}
+export default class ApplicationInstance extends EngineInstance {
+  visit(url: string): Promise<this>;
+}
diff --git a/packages/@ember/application/lib/application.d.ts b/packages/@ember/application/lib/application.d.ts
index a87e909d948..cde593027b5 100644
--- a/packages/@ember/application/lib/application.d.ts
+++ b/packages/@ember/application/lib/application.d.ts
@@ -10,8 +10,10 @@ export default class Application extends Engine {
   buildInstance(options?: EngineInstanceOptions): ApplicationInstance;
   deferReadiness(): void;
   advanceReadiness(): void;
-  boot(): void;
+  boot(): Promise<this>;
   ready(): void;
   reset(): void;
   visit(url: string, options?: BootOptions): Promise<ApplicationInstance>;
+  /** @private */
+  __deprecatedInstance__?: ApplicationInstance;
 }
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index 13eb5fd5fba..312ccbffc3f 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -26,7 +26,7 @@ expectTypeOf(app.eventDispatcher).toEqualTypeOf<EventDispatcher>();
 expectTypeOf(app.buildInstance()).toEqualTypeOf<ApplicationInstance>();
 expectTypeOf(app.deferReadiness()).toEqualTypeOf<void>();
 expectTypeOf(app.advanceReadiness()).toEqualTypeOf<void>();
-expectTypeOf(app.boot()).toEqualTypeOf<void>();
+expectTypeOf(app.boot()).toEqualTypeOf<Promise<Application>>();
 expectTypeOf(app.ready()).toEqualTypeOf<void>();
 expectTypeOf(app.reset()).toEqualTypeOf<void>();
 
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index d8eb59f100c..92e4632dfb6 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -32,7 +32,7 @@ expectTypeOf(instance.hasRegistration('service:store')).toEqualTypeOf<boolean>()
 // @ts-expect-error requires name
 instance.hasRegistration();
 
-expectTypeOf(instance.boot()).toEqualTypeOf<void>();
+expectTypeOf(instance.boot()).toEqualTypeOf<Promise<ApplicationInstance>>();
 
 const bootOptions: BootOptions = {
   isBrowser: true,
diff --git a/packages/@ember/engine/index.d.ts b/packages/@ember/engine/index.d.ts
index a867217311b..ce6f8becfdd 100644
--- a/packages/@ember/engine/index.d.ts
+++ b/packages/@ember/engine/index.d.ts
@@ -1,11 +1,13 @@
 import EngineInstance, { EngineInstanceOptions } from './instance';
 import { Namespace, RegistryProxyMixin } from '@ember/-internals/runtime';
+import { Registry } from '@ember/-internals/container';
 
 export { getEngineParent } from '@ember/engine/lib/engine-parent';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface Engine extends RegistryProxyMixin {}
 declare class Engine extends Namespace {
+  static buildRegistry(engine: Engine): Registry;
   buildInstance(options?: EngineInstanceOptions): EngineInstance;
   initializer: (initializer: unknown) => void;
   instanceInitializer: (initializer: unknown) => void;
diff --git a/packages/@ember/engine/instance.d.ts b/packages/@ember/engine/instance.d.ts
index 7dd7f96164f..34ee9cf22dd 100644
--- a/packages/@ember/engine/instance.d.ts
+++ b/packages/@ember/engine/instance.d.ts
@@ -2,16 +2,18 @@ import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runti
 import { Owner } from '@ember/-internals/owner';
 import { BootOptions } from '@ember/application/instance';
 import EmberObject from '@ember/object';
+import { Registry } from '@ember/-internals/container';
 
 export interface EngineInstanceOptions {
-  mountPoint: string;
-  routable: boolean;
+  mountPoint?: string;
+  routable?: boolean;
 }
 
 interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, Owner {}
 
 declare class EngineInstance extends EmberObject {
-  boot(options?: BootOptions): void;
+  static setupRegistry(registry: Registry, options: unknown): void;
+  boot(options?: BootOptions): Promise<this>;
   mountPoint: string;
   routable: boolean;
   buildChildEngineInstance(name: string, options?: EngineInstanceOptions): EngineInstance;
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index 74581a0863d..0d91282dfd8 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -18,14 +18,13 @@ expectTypeOf(engine).toMatchTypeOf<Namespace>();
 
 expectTypeOf(engine.buildInstance()).toEqualTypeOf<EngineInstance>();
 engine.buildInstance({ mountPoint: 'foo', routable: true });
+engine.buildInstance({});
+engine.buildInstance({ mountPoint: 'foo' });
+
 // @ts-expect-error Invalid argument
 engine.buildInstance(1);
 // @ts-expect-error Invalid argument
-engine.buildInstance({});
-// @ts-expect-error Invalid argument
 engine.buildInstance({ mountPoint: 1, routable: true });
-// @ts-expect-error Invalid argument
-engine.buildInstance({ mountPoint: 'foo' });
 
 expectTypeOf(engine.initializer).toEqualTypeOf<(initializer: unknown) => void>();
 
diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts
index 10494e8d3d5..7c29288c546 100644
--- a/packages/@ember/engine/type-tests/instance.test.ts
+++ b/packages/@ember/engine/type-tests/instance.test.ts
@@ -10,9 +10,7 @@ expectTypeOf<EngineInstance>().toMatchTypeOf<Owner>();
 let owner = {} as Owner;
 let instance = new EngineInstance(owner);
 
-expectTypeOf(instance.boot()).toEqualTypeOf<void>();
-
-expectTypeOf(instance.boot()).toEqualTypeOf<void>();
+expectTypeOf(instance.boot()).toEqualTypeOf<Promise<EngineInstance>>();
 
 let bootOptions = {
   isBrowser: true,
diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts
index ae87b46b46e..6ba792f3ee5 100644
--- a/packages/@ember/runloop/index.ts
+++ b/packages/@ember/runloop/index.ts
@@ -128,18 +128,22 @@ export const _backburner = new Backburner(_queues, {
   @return {Object} return value from invoking the passed function.
   @public
 */
-export function run<F extends (...args: any[]) => any>(method: F, ...args: Parameters<F>): void;
+export function run<F extends () => any>(method: F): ReturnType<F>;
+export function run<F extends (...args: any[]) => any>(
+  method: F,
+  ...args: Parameters<F>
+): ReturnType<F>;
 export function run<T, F extends (this: T, ...args: any[]) => any>(
   target: T,
   method: F,
   ...args: Parameters<F>
-): void;
+): ReturnType<F>;
 export function run<T, U extends keyof T>(
   target: T,
   method: U,
   ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
-): void;
-export function run(...args: any[]): void {
+): T[U] extends (...args: any[]) => any ? ReturnType<T[U]> : unknown;
+export function run(...args: any[]): unknown {
   // @ts-expect-error TS doesn't like our spread args
   return _backburner.run(...args);
 }
diff --git a/packages/@ember/runloop/type-tests.ts/run.test.ts b/packages/@ember/runloop/type-tests.ts/run.test.ts
index 9e8088fa403..a52ad56bc5b 100644
--- a/packages/@ember/runloop/type-tests.ts/run.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/run.test.ts
@@ -19,7 +19,7 @@ expectTypeOf(
     true,
     undefined
   )
-).toEqualTypeOf<void>();
+).toEqualTypeOf<number>();
 
 expectTypeOf(
   run(
@@ -30,7 +30,7 @@ expectTypeOf(
     true,
     'string'
   )
-).toEqualTypeOf<void>();
+).toEqualTypeOf<number>();
 
 run((_foo: number): number => {
   return 1;
@@ -48,7 +48,7 @@ expectTypeOf(
     1,
     true
   )
-).toEqualTypeOf<void>();
+).toEqualTypeOf<number>();
 
 expectTypeOf(
   run(
@@ -60,7 +60,7 @@ expectTypeOf(
     true,
     'string'
   )
-).toEqualTypeOf<void>();
+).toEqualTypeOf<number>();
 
 // @ts-expect-error invalid args
 run(
@@ -74,9 +74,9 @@ run(
 );
 
 // With function string reference
-expectTypeOf(run(foo, 'test', 1, true, 'string')).toEqualTypeOf<void>();
+expectTypeOf(run(foo, 'test', 1, true, 'string')).toEqualTypeOf<number>();
 
-expectTypeOf(run(foo, 'test', 1, true)).toEqualTypeOf<void>();
+expectTypeOf(run(foo, 'test', 1, true)).toEqualTypeOf<number>();
 
 // @ts-expect-error Invalid args
 run(foo, 'test', 'string');
diff --git a/packages/@ember/service/tests/service_ts_test.ts b/packages/@ember/service/tests/service_ts_test.ts
index dca6de5ca43..e0088ba9555 100644
--- a/packages/@ember/service/tests/service_ts_test.ts
+++ b/packages/@ember/service/tests/service_ts_test.ts
@@ -18,7 +18,7 @@ moduleFor(
       owner.register('service:main', MainService);
       owner.register('foo:main', Foo);
 
-      let foo = owner.lookup('foo:main');
+      let foo = owner.lookup('foo:main') as Foo;
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
 
@@ -37,7 +37,7 @@ moduleFor(
       owner.register('service:main', MainService);
       owner.register('foo:main', Foo);
 
-      let foo = owner.lookup('foo:main');
+      let foo = owner.lookup('foo:main') as Foo;
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
 
@@ -61,7 +61,7 @@ moduleFor(
       owner.register('service:main', MainService);
       owner.register('foo:main', Foo);
 
-      let foo = owner.lookup('foo:main');
+      let foo = owner.lookup('foo:main') as Foo;
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
 
@@ -80,7 +80,7 @@ moduleFor(
       owner.register('service:main', MainService);
       owner.register('foo:main', Foo);
 
-      let foo = owner.lookup('foo:main');
+      let foo = owner.lookup('foo:main') as Foo;
 
       assert.ok(foo.main instanceof Service, 'service injected correctly');
 
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 605fad79bac..8f4f2d9dddd 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -4,8 +4,8 @@ import { AST, ASTPlugin } from '@glimmer/syntax';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { compileOptions } from '../../index';
 
-export default class extends AbstractTestCase {
-  assertTransformed(before: string, after: string): void {
+export default abstract class extends AbstractTestCase {
+  assertTransformed(this: QUnit, before: string, after: string): void {
     this.assert.deepEqual(deloc(ast(before)), deloc(ast(after)));
   }
 }
diff --git a/packages/internal-test-helpers/lib/apply-mixins.ts b/packages/internal-test-helpers/lib/apply-mixins.ts
index 0f8071c65cd..1bdf7cfaacd 100644
--- a/packages/internal-test-helpers/lib/apply-mixins.ts
+++ b/packages/internal-test-helpers/lib/apply-mixins.ts
@@ -1,12 +1,34 @@
 import getAllPropertyNames from './get-all-property-names';
 
-function isGenerator(mixin) {
-  return Array.isArray(mixin.cases) && typeof mixin.generate === 'function';
+export interface Generator {
+  cases: unknown[];
+  generate: (...args: unknown[]) => unknown;
 }
 
-export default function applyMixins(TestClass, ...mixins) {
+export interface GeneratorClass<T extends Generator> extends Function {
+  new (): T;
+}
+
+export type Mixin<T extends Generator> = T | GeneratorClass<T> | Record<string, unknown>;
+
+function isGenerator(mixin: unknown): mixin is Generator {
+  if (mixin && typeof mixin === 'object') {
+    let cast = mixin as Generator;
+    return Array.isArray(cast.cases) && typeof cast.generate === 'function';
+  }
+  return false;
+}
+
+function isGeneratorClass<T extends Generator>(mixin: unknown): mixin is GeneratorClass<T> {
+  return typeof mixin === 'function';
+}
+
+export default function applyMixins<T extends Generator>(
+  TestClass: Function,
+  ...mixins: Mixin<T>[]
+) {
   mixins.forEach((mixinOrGenerator) => {
-    let mixin;
+    let mixin: object;
 
     if (isGenerator(mixinOrGenerator)) {
       let generator = mixinOrGenerator;
@@ -17,7 +39,7 @@ export default function applyMixins(TestClass, ...mixins) {
       });
 
       Object.assign(TestClass.prototype, mixin);
-    } else if (typeof mixinOrGenerator === 'function') {
+    } else if (isGeneratorClass(mixinOrGenerator)) {
       let properties = getAllPropertyNames(mixinOrGenerator);
       mixin = new mixinOrGenerator();
 
diff --git a/packages/internal-test-helpers/lib/build-owner.ts b/packages/internal-test-helpers/lib/build-owner.ts
index 04c2e56a29d..dd6a48314dc 100644
--- a/packages/internal-test-helpers/lib/build-owner.ts
+++ b/packages/internal-test-helpers/lib/build-owner.ts
@@ -2,9 +2,13 @@ import Application from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import { registerDestructor } from '@ember/destroyable';
+import Resolver from './test-resolver';
+import { EngineInstanceOptions } from '@ember/engine/instance';
 
 class ResolverWrapper {
-  constructor(resolver) {
+  resolver: Resolver | undefined;
+
+  constructor(resolver: Resolver | undefined) {
     this.resolver = resolver;
   }
 
@@ -13,13 +17,20 @@ class ResolverWrapper {
   }
 }
 
-export default function buildOwner(options = {}) {
+export default function buildOwner(
+  options: {
+    ownerType?: 'application' | 'engine';
+    ownerOptions?: EngineInstanceOptions;
+    resolver?: Resolver;
+    bootOptions?: object;
+  } = {}
+) {
   let ownerType = options.ownerType || 'application';
   let ownerOptions = options.ownerOptions || {};
   let resolver = options.resolver;
   let bootOptions = options.bootOptions || {};
 
-  let namespace;
+  let namespace: Application | Engine;
   if (ownerType === 'application') {
     namespace = Application.create({
       autoboot: false,
@@ -27,7 +38,7 @@ export default function buildOwner(options = {}) {
     });
   } else {
     namespace = Engine.create({
-      buildRegistry() {
+      buildRegistry(this: Engine) {
         return (this.__registry__ = Application.buildRegistry(this));
       },
       Resolver: new ResolverWrapper(resolver),
diff --git a/packages/internal-test-helpers/lib/confirm-export.ts b/packages/internal-test-helpers/lib/confirm-export.ts
index beb549f6ddf..25e48988c50 100644
--- a/packages/internal-test-helpers/lib/confirm-export.ts
+++ b/packages/internal-test-helpers/lib/confirm-export.ts
@@ -1,22 +1,29 @@
 import require from 'require';
 
-function getDescriptor(obj, path) {
+function getDescriptor(obj: Record<string, unknown>, path: string) {
   let parts = path.split('.');
-  let value = obj;
+  let value: unknown = obj;
   for (let i = 0; i < parts.length - 1; i++) {
-    let part = parts[i];
-    value = value[part];
+    let part = parts[i]!;
+    // NOTE: This isn't entirely safe since we could have a null!
+    value = (value as Record<string, unknown>)[part];
     if (!value) {
       return undefined;
     }
   }
-  let last = parts[parts.length - 1];
+  let last = parts[parts.length - 1]!;
   return Object.getOwnPropertyDescriptor(value, last);
 }
 
-export default function confirmExport(Ember, assert, path, moduleId, exportName) {
+export default function confirmExport(
+  Ember: Record<string, unknown>,
+  assert: QUnit['assert'],
+  path: string,
+  moduleId: string,
+  exportName: string | { value: unknown; get: string; set: string }
+) {
   try {
-    let desc;
+    let desc: PropertyDescriptor | null | undefined;
 
     if (path !== null) {
       desc = getDescriptor(Ember, path);
@@ -25,12 +32,16 @@ export default function confirmExport(Ember, assert, path, moduleId, exportName)
       desc = null;
     }
 
-    if (desc === null) {
+    if (desc == null) {
       let mod = require(moduleId);
-      assert.notEqual(mod[exportName], undefined, `${moduleId}#${exportName} is not \`undefined\``);
+      assert.notEqual(
+        mod[exportName as string],
+        undefined,
+        `${moduleId}#${exportName} is not \`undefined\``
+      );
     } else if (typeof exportName === 'string') {
       let mod = require(moduleId);
-      let value = 'value' in desc ? desc.value : desc.get.call(Ember);
+      let value = 'value' in desc ? desc.value : desc.get!.call(Ember);
       assert.equal(value, mod[exportName], `Ember.${path} is exported correctly`);
       assert.notEqual(mod[exportName], undefined, `Ember.${path} is not \`undefined\``);
     } else if ('value' in desc) {
@@ -48,8 +59,9 @@ export default function confirmExport(Ember, assert, path, moduleId, exportName)
   } catch (error) {
     assert.pushResult({
       result: false,
-      message: `An error occurred while testing ${path} is exported from ${moduleId}.`,
-      source: error,
+      message: `An error occurred while testing ${path} is exported from ${moduleId}`,
+      actual: error,
+      expected: undefined,
     });
   }
 }
diff --git a/packages/internal-test-helpers/lib/element-helpers.ts b/packages/internal-test-helpers/lib/element-helpers.ts
index 3d4ed9b6a50..5915f757043 100644
--- a/packages/internal-test-helpers/lib/element-helpers.ts
+++ b/packages/internal-test-helpers/lib/element-helpers.ts
@@ -1,12 +1,12 @@
 import { getContext } from './test-context';
 
-export function getElement(): Element {
+export function getElement(): HTMLElement {
   let context = getContext();
   if (!context) {
     throw new Error('Test context is not set up.');
   }
 
-  let element = context.element;
+  let element = context['element'];
   if (!element) {
     throw new Error('`element` property on test context is not set up.');
   }
diff --git a/packages/internal-test-helpers/lib/equal-inner-html.ts b/packages/internal-test-helpers/lib/equal-inner-html.ts
index f406a211267..dee3f81aadb 100644
--- a/packages/internal-test-helpers/lib/equal-inner-html.ts
+++ b/packages/internal-test-helpers/lib/equal-inner-html.ts
@@ -6,11 +6,11 @@ let ieSVGInnerHTML = (() => {
   let div = document.createElement('div');
   let node = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
   div.appendChild(node);
-  let clone = div.cloneNode(true);
+  let clone = div.cloneNode(true) as HTMLDivElement;
   return clone.innerHTML === '<svg xmlns="http://www.w3.org/2000/svg" />';
 })();
 
-function normalizeInnerHTML(actualHTML) {
+function normalizeInnerHTML(actualHTML: string) {
   if (ieSVGInnerHTML) {
     // Replace `<svg xmlns="http://www.w3.org/2000/svg" height="50%" />` with `<svg height="50%"></svg>`, etc.
     // drop namespace attribute
@@ -26,12 +26,17 @@ function normalizeInnerHTML(actualHTML) {
   return actualHTML;
 }
 
-export default function equalInnerHTML(assert, fragment, html) {
+export default function equalInnerHTML(
+  assert: QUnit['assert'],
+  fragment: HTMLElement,
+  html: string
+) {
   let actualHTML = normalizeInnerHTML(fragment.innerHTML);
 
   assert.pushResult({
     result: actualHTML === html,
     actual: actualHTML,
     expected: html,
+    message: "innerHTML doesn't match",
   });
 }
diff --git a/packages/internal-test-helpers/lib/equal-tokens.ts b/packages/internal-test-helpers/lib/equal-tokens.ts
index f4a984b0732..8ff757992f1 100644
--- a/packages/internal-test-helpers/lib/equal-tokens.ts
+++ b/packages/internal-test-helpers/lib/equal-tokens.ts
@@ -1,6 +1,6 @@
 import { tokenize } from 'simple-html-tokenizer';
 
-function generateTokens(containerOrHTML) {
+function generateTokens(containerOrHTML: string | Element) {
   if (typeof containerOrHTML === 'string') {
     return {
       tokens: tokenize(containerOrHTML),
@@ -14,7 +14,7 @@ function generateTokens(containerOrHTML) {
   }
 }
 
-function normalizeTokens(tokens) {
+function normalizeTokens(tokens: ReturnType<typeof tokenize>) {
   tokens.forEach((token) => {
     if (token.type === 'StartTag') {
       token.attributes = token.attributes.sort((a, b) => {
@@ -30,7 +30,11 @@ function normalizeTokens(tokens) {
   });
 }
 
-export default function equalTokens(actualContainer, expectedHTML, message = null) {
+export default function equalTokens(
+  actualContainer: string | Element,
+  expectedHTML: string,
+  message: string | null = null
+) {
   let actual = generateTokens(actualContainer);
   let expected = generateTokens(expectedHTML);
 
diff --git a/packages/internal-test-helpers/lib/factory.ts b/packages/internal-test-helpers/lib/factory.ts
index b0e1294605a..ef4bfebaaf8 100644
--- a/packages/internal-test-helpers/lib/factory.ts
+++ b/packages/internal-test-helpers/lib/factory.ts
@@ -1,4 +1,4 @@
-function setProperties(object, properties) {
+function setProperties(object: object, properties: object) {
   for (let key in properties) {
     if (Object.prototype.hasOwnProperty.call(properties, key)) {
       object[key] = properties[key];
@@ -9,55 +9,38 @@ function setProperties(object, properties) {
 let guids = 0;
 
 export default function factory() {
-  function Klass(options) {
-    setProperties(this, options);
-    this._guid = guids++;
-    this.isDestroyed = false;
-  }
-
-  Klass.prototype.constructor = Klass;
-  Klass.prototype.destroy = function () {
-    this.isDestroyed = true;
-  };
-
-  Klass.prototype.toString = function () {
-    return '<Factory:' + this._guid + '>';
-  };
-
-  Klass.create = create;
-  Klass.extend = extend;
-  Klass.reopen = extend;
-  Klass.reopenClass = reopenClass;
-
-  return Klass;
-
-  function create(options) {
-    return new this.prototype.constructor(options);
-  }
-
-  function reopenClass(options) {
-    setProperties(this, options);
-  }
-
-  function extend(options) {
-    function Child(options) {
-      Klass.call(this, options);
+  class TestFactory {
+    _guid: number;
+    isDestroyed: boolean;
+
+    constructor(options: Partial<TestFactory>) {
+      setProperties(this, options);
+      this._guid = guids++;
+      this.isDestroyed = false;
     }
 
-    let Parent = this;
-
-    Child.prototype = new Parent();
-    Child.prototype.constructor = Child;
+    destroy() {
+      this.isDestroyed = true;
+    }
 
-    setProperties(Child, Klass);
-    setProperties(Child.prototype, options);
+    toString() {
+      return '<Factory:' + this._guid + '>';
+    }
 
-    Child.create = create;
-    Child.extend = extend;
-    Child.reopen = extend;
+    static create(options: Partial<TestFactory>) {
+      return new TestFactory(options);
+    }
 
-    Child.reopenClass = reopenClass;
+    static reopenClass(options: Partial<typeof TestFactory>) {
+      setProperties(this, options);
+    }
 
-    return Child;
+    static extend(options: object) {
+      class ChildTestFactory extends TestFactory {}
+      setProperties(ChildTestFactory, options);
+      return ChildTestFactory;
+    }
   }
+
+  return TestFactory;
 }
diff --git a/packages/internal-test-helpers/lib/get-all-property-names.ts b/packages/internal-test-helpers/lib/get-all-property-names.ts
index 4a67a25ac68..f5eaa0e85af 100644
--- a/packages/internal-test-helpers/lib/get-all-property-names.ts
+++ b/packages/internal-test-helpers/lib/get-all-property-names.ts
@@ -1,6 +1,6 @@
-export default function getAllPropertyNames(Klass) {
+export default function getAllPropertyNames(Klass: Function) {
   let proto = Klass.prototype;
-  let properties = new Set();
+  let properties: Set<string> = new Set();
 
   while (proto !== Object.prototype) {
     let names = Object.getOwnPropertyNames(proto);
diff --git a/packages/internal-test-helpers/lib/matchers.ts b/packages/internal-test-helpers/lib/matchers.ts
index 8ca276dd3bb..e03330eb055 100644
--- a/packages/internal-test-helpers/lib/matchers.ts
+++ b/packages/internal-test-helpers/lib/matchers.ts
@@ -1,15 +1,22 @@
 const HTMLElement = window.HTMLElement;
 const MATCHER_BRAND = '3d4ef194-13be-4ccf-8dc7-862eea02c93e';
 
-function isMatcher(obj) {
+interface Matcher<T> {
+  [MATCHER_BRAND]: true;
+  match(actual: T): boolean;
+  expected(): T;
+  message(): string;
+}
+
+function isMatcher(obj: unknown): obj is Matcher<unknown> {
   return typeof obj === 'object' && obj !== null && MATCHER_BRAND in obj;
 }
 
-function equalsAttr(expected) {
+function equalsAttr(expected: unknown) {
   return {
     [MATCHER_BRAND]: true,
 
-    match(actual) {
+    match(actual: unknown) {
       return expected === actual;
     },
 
@@ -23,11 +30,11 @@ function equalsAttr(expected) {
   };
 }
 
-export function regex(r) {
+export function regex(r: RegExp) {
   return {
     [MATCHER_BRAND]: true,
 
-    match(v) {
+    match(v: string) {
       return r.test(v);
     },
 
@@ -41,11 +48,11 @@ export function regex(r) {
   };
 }
 
-export function classes(expected) {
+export function classes(expected: string) {
   return {
     [MATCHER_BRAND]: true,
 
-    match(actual) {
+    match(actual: string) {
       actual = actual.trim();
       return (
         actual &&
@@ -63,11 +70,11 @@ export function classes(expected) {
   };
 }
 
-export function styles(expected) {
+export function styles(expected: string) {
   return {
     [MATCHER_BRAND]: true,
 
-    match(actual) {
+    match(actual: string) {
       // coerce `null` or `undefined` to an empty string
       // needed for matching empty styles on IE9 - IE11
       actual = actual || '';
@@ -99,7 +106,13 @@ export function styles(expected) {
   };
 }
 
-export function equalsElement(assert, element, tagName, attributes, content) {
+export function equalsElement(
+  assert: QUnit['assert'],
+  element: Element,
+  tagName: string,
+  attributes: Record<string, unknown> | null,
+  content: unknown
+) {
   assert.pushResult({
     result: element.tagName === tagName.toUpperCase(),
     actual: element.tagName.toLowerCase(),
@@ -130,13 +143,15 @@ export function equalsElement(assert, element, tagName, attributes, content) {
 
   let actualAttributes = {};
 
-  for (let i = 0, l = element.attributes.length; i < l; i++) {
-    actualAttributes[element.attributes[i].name] = element.attributes[i].value;
+  for (let attribute of element.attributes) {
+    actualAttributes[attribute.name] = attribute.value;
   }
 
   if (!(element instanceof HTMLElement)) {
     assert.pushResult({
       result: element instanceof HTMLElement,
+      actual: element,
+      expected: typeof HTMLElement,
       message: 'Element must be an HTML Element, not an SVG Element',
     });
   } else {
diff --git a/packages/internal-test-helpers/lib/module-for.ts b/packages/internal-test-helpers/lib/module-for.ts
index 853a2b8e491..7fe64a70e2e 100644
--- a/packages/internal-test-helpers/lib/module-for.ts
+++ b/packages/internal-test-helpers/lib/module-for.ts
@@ -1,11 +1,20 @@
 /* globals URLSearchParams */
 import { DEBUG } from '@glimmer/env';
 import { isEnabled } from '@ember/canary-features';
-import applyMixins from './apply-mixins';
+import applyMixins, { Mixin, Generator } from './apply-mixins';
 import getAllPropertyNames from './get-all-property-names';
 import { setContext, unsetContext } from './test-context';
 import { all } from 'rsvp';
 import { enableDestroyableTracking, assertDestroyablesDestroyed } from '@glimmer/destroyable';
+import AbstractTestCase from './test-cases/abstract';
+
+interface TestClass<T extends AbstractTestCase> {
+  new (assert: QUnit['assert']): T;
+}
+
+interface TestContext {
+  instance: AbstractTestCase | null | undefined;
+}
 
 const ASSERT_DESTROYABLES = (() => {
   if (typeof URLSearchParams === 'undefined' || typeof document !== 'object') {
@@ -18,7 +27,11 @@ const ASSERT_DESTROYABLES = (() => {
   return assertDestroyables !== null;
 })();
 
-export default function moduleFor(description, TestClass, ...mixins) {
+export default function moduleFor<T extends AbstractTestCase, M extends Generator>(
+  description: string,
+  TestClass: TestClass<T>,
+  ...mixins: Mixin<M>[]
+) {
   QUnit.module(description, function (hooks) {
     setupTestClass(hooks, TestClass, ...mixins);
   });
@@ -28,14 +41,18 @@ function afterEachFinally() {
   unsetContext();
 
   if (DEBUG && ASSERT_DESTROYABLES) {
-    assertDestroyablesDestroyed();
+    assertDestroyablesDestroyed!();
   }
 }
 
-export function setupTestClass(hooks, TestClass, ...mixins) {
-  hooks.beforeEach(function (assert) {
+export function setupTestClass<T extends AbstractTestCase, G extends Generator>(
+  hooks: NestedHooks,
+  TestClass: TestClass<T>,
+  ...mixins: Mixin<G>[]
+) {
+  hooks.beforeEach(function (this: TestContext, assert: QUnit['assert']) {
     if (DEBUG && ASSERT_DESTROYABLES) {
-      enableDestroyableTracking();
+      enableDestroyableTracking!();
     }
 
     let instance = new TestClass(assert);
@@ -48,14 +65,14 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
     }
   });
 
-  hooks.afterEach(function () {
+  hooks.afterEach(function (this: TestContext) {
     let promises = [];
     let instance = this.instance;
     this.instance = null;
-    if (instance.teardown) {
+    if (instance?.teardown) {
       promises.push(instance.teardown());
     }
-    if (instance.afterEach) {
+    if (instance?.afterEach) {
       promises.push(instance.afterEach());
     }
 
@@ -67,10 +84,14 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
     // promise when it is not needed
     let filteredPromises = promises.filter(Boolean);
     if (filteredPromises.length > 0) {
-      return all(filteredPromises).finally(afterEachFinally);
+      return all(filteredPromises)
+        .finally(afterEachFinally)
+        .then(() => {});
     }
 
     afterEachFinally();
+
+    return;
   });
 
   if (mixins.length > 0) {
@@ -80,7 +101,7 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
   let properties = getAllPropertyNames(TestClass);
   properties.forEach(generateTest);
 
-  function shouldTest(features) {
+  function shouldTest(features: string[]) {
     return features.every((feature) => {
       if (feature[0] === '!') {
         return !isEnabled(feature.slice(1));
@@ -90,29 +111,29 @@ export function setupTestClass(hooks, TestClass, ...mixins) {
     });
   }
 
-  function generateTest(name) {
+  function generateTest(name: string) {
     if (name.indexOf('@test ') === 0) {
-      QUnit.test(name.slice(5), function (assert) {
-        return this.instance[name](assert);
+      QUnit.test(name.slice(5), function (this: TestContext, assert) {
+        return this.instance![name](assert);
       });
     } else if (name.indexOf('@only ') === 0) {
       // eslint-disable-next-line qunit/no-only
-      QUnit.only(name.slice(5), function (assert) {
-        return this.instance[name](assert);
+      QUnit.only(name.slice(5), function (this: TestContext, assert) {
+        return this.instance![name](assert);
       });
     } else if (name.indexOf('@skip ') === 0) {
-      QUnit.skip(name.slice(5), function (assert) {
-        return this.instance[name](assert);
+      QUnit.skip(name.slice(5), function (this: TestContext, assert) {
+        return this.instance![name](assert);
       });
     } else {
       let match = /^@feature\(([A-Z_a-z-! ,]+)\) /.exec(name);
 
       if (match) {
-        let features = match[1].replace(/ /g, '').split(',');
+        let features = match[1]!.replace(/ /g, '').split(',');
 
         if (shouldTest(features)) {
-          QUnit.test(name.slice(match[0].length), function (assert) {
-            return this.instance[name](assert);
+          QUnit.test(name.slice(match[0]!.length), function (this: TestContext, assert) {
+            return this.instance![name](assert);
           });
         }
       }
diff --git a/packages/internal-test-helpers/lib/node-query.ts b/packages/internal-test-helpers/lib/node-query.ts
index 50c78b1a8ea..54ad06f8d15 100644
--- a/packages/internal-test-helpers/lib/node-query.ts
+++ b/packages/internal-test-helpers/lib/node-query.ts
@@ -1,19 +1,30 @@
 /* global Node */
 
 import { assert } from '@ember/debug';
-import { blur, fireEvent, focus, matches } from './system/synthetic-events';
+import {
+  blur,
+  fireEvent,
+  focus,
+  KEYBOARD_EVENT_TYPES,
+  matches,
+  MOUSE_EVENT_TYPES,
+} from './system/synthetic-events';
 
 export default class NodeQuery {
-  static query(selector, context = document) {
+  static query(selector: string, context: Document | DocumentFragment | Element = document) {
+    // TODO: Can we remove this?
     assert(`Invalid second parameter to NodeQuery.query`, context && context instanceof Node);
-    return new NodeQuery(toArray(context.querySelectorAll(selector)));
+    return new NodeQuery(Array.from(context.querySelectorAll(selector)));
   }
 
-  static element(element) {
+  static element(element: HTMLElement): NodeQuery {
     return new NodeQuery([element]);
   }
 
-  constructor(nodes) {
+  nodes: Element[];
+  length: number;
+
+  constructor(nodes: Element[]) {
     assert('NodeQuery must be initialized with a literal array', Array.isArray(nodes));
     this.nodes = nodes;
 
@@ -26,14 +37,14 @@ export default class NodeQuery {
     Object.freeze(this);
   }
 
-  find(selector) {
+  find(selector: string | Element) {
     assertSingle(this);
 
     return this[0].querySelector(selector);
   }
 
-  findAll(selector) {
-    let nodes = [];
+  findAll(selector: string): NodeQuery {
+    let nodes: Element[] = [];
 
     this.nodes.forEach((node) => {
       nodes.push(...node.querySelectorAll(selector));
@@ -42,7 +53,13 @@ export default class NodeQuery {
     return new NodeQuery(nodes);
   }
 
-  trigger(eventName, options) {
+  trigger<T extends keyof typeof KEYBOARD_EVENT_TYPES>(
+    eventName: T,
+    options?: KeyboardEventInit
+  ): void;
+  trigger<T extends keyof typeof MOUSE_EVENT_TYPES>(eventName: T, options?: MouseEventInit): void;
+  trigger(eventName: string, options?: EventInit): void;
+  trigger(eventName: string, options: EventInit = {}) {
     return this.nodes.map((node) => fireEvent(node, eventName, options));
   }
 
@@ -62,33 +79,37 @@ export default class NodeQuery {
     return this.nodes.map((node) => node.textContent).join('');
   }
 
-  attr(name) {
+  attr(name: string) {
     if (arguments.length !== 1) {
       throw new Error('not implemented');
     }
 
     assertSingle(this);
 
-    return this.nodes[0].getAttribute(name);
+    return this.nodes[0]!.getAttribute(name);
   }
 
-  prop(name, value) {
+  prop(name: string): unknown;
+  prop(name: string, value: unknown): unknown;
+  prop(name: string, value?: unknown) {
     if (arguments.length > 1) {
       return this.setProp(name, value);
     }
 
     assertSingle(this);
 
-    return this.nodes[0][name];
+    return this.nodes[0]![name];
   }
 
-  setProp(name, value) {
+  setProp(name: string, value: unknown) {
     this.nodes.forEach((node) => (node[name] = value));
 
     return this;
   }
 
-  val(value) {
+  val(): unknown;
+  val(value: unknown): unknown;
+  val(value?: unknown): unknown {
     if (arguments.length === 1) {
       return this.setProp('value', value);
     }
@@ -96,29 +117,19 @@ export default class NodeQuery {
     return this.prop('value');
   }
 
-  is(selector) {
+  is(selector: string) {
     return this.nodes.every((node) => matches(node, selector));
   }
 
-  hasClass(className) {
+  hasClass(className: string) {
     return this.is(`.${className}`);
   }
 }
 
-function assertSingle(nodeQuery) {
+function assertSingle(nodeQuery: NodeQuery) {
   if (nodeQuery.length !== 1) {
     throw new Error(
-      `attr(name) called on a NodeQuery with ${this.nodes.length} elements. Expected one element.`
+      `attr(name) called on a NodeQuery with ${nodeQuery.length} elements. Expected one element.`
     );
   }
 }
-
-function toArray(nodes) {
-  let out = [];
-
-  for (let i = 0; i < nodes.length; i++) {
-    out.push(nodes[i]);
-  }
-
-  return out;
-}
diff --git a/packages/internal-test-helpers/lib/registry-check.ts b/packages/internal-test-helpers/lib/registry-check.ts
index cc33fdcb370..da4bbf1e864 100644
--- a/packages/internal-test-helpers/lib/registry-check.ts
+++ b/packages/internal-test-helpers/lib/registry-check.ts
@@ -1,3 +1,5 @@
-export function verifyRegistration(assert, owner, fullName) {
+import { Owner } from '@ember/-internals/owner';
+
+export function verifyRegistration(assert: QUnit['assert'], owner: Owner, fullName: string) {
   assert.ok(owner.resolveRegistration(fullName), `has registration: ${fullName}`);
 }
diff --git a/packages/internal-test-helpers/lib/run.ts b/packages/internal-test-helpers/lib/run.ts
index 026a7146634..f7465737645 100644
--- a/packages/internal-test-helpers/lib/run.ts
+++ b/packages/internal-test-helpers/lib/run.ts
@@ -13,7 +13,7 @@ export function runDestroy(toDestroy: any): void {
   }
 }
 
-export function runTask(callback: (...args: any[]) => any): void {
+export function runTask<F extends () => any>(callback: F): ReturnType<F> {
   return run(callback);
 }
 
diff --git a/packages/internal-test-helpers/lib/strip.ts b/packages/internal-test-helpers/lib/strip.ts
index 5d0509410c3..af6c22e129c 100644
--- a/packages/internal-test-helpers/lib/strip.ts
+++ b/packages/internal-test-helpers/lib/strip.ts
@@ -1,4 +1,4 @@
-export default function strip([...strings], ...values) {
+export default function strip([...strings], ...values: unknown[]) {
   let str = strings
     .map((string, index) => {
       let interpolated = values[index];
diff --git a/packages/internal-test-helpers/lib/system/synthetic-events.ts b/packages/internal-test-helpers/lib/system/synthetic-events.ts
index cfcda7ab534..4d29b06ca01 100644
--- a/packages/internal-test-helpers/lib/system/synthetic-events.ts
+++ b/packages/internal-test-helpers/lib/system/synthetic-events.ts
@@ -1,9 +1,9 @@
 import { run } from '@ember/runloop';
 /* globals Element */
 
-const DEFAULT_EVENT_OPTIONS = { canBubble: true, cancelable: true };
-const KEYBOARD_EVENT_TYPES = ['keydown', 'keypress', 'keyup'];
-const MOUSE_EVENT_TYPES = [
+export const DEFAULT_EVENT_OPTIONS = { bubbles: true, cancelable: true };
+export const KEYBOARD_EVENT_TYPES = ['keydown', 'keypress', 'keyup'] as const;
+export const MOUSE_EVENT_TYPES = [
   'click',
   'mousedown',
   'mouseup',
@@ -13,40 +13,31 @@ const MOUSE_EVENT_TYPES = [
   'mousemove',
   'mouseout',
   'mouseover',
-];
-
-export const elMatches =
-  typeof Element !== 'undefined' &&
-  (Element.prototype.matches ||
-    Element.prototype.matchesSelector ||
-    Element.prototype.mozMatchesSelector ||
-    Element.prototype.msMatchesSelector ||
-    Element.prototype.oMatchesSelector ||
-    Element.prototype.webkitMatchesSelector);
-
-export function matches(el, selector) {
-  return elMatches.call(el, selector);
+] as const;
+
+export function matches(el: Element, selector: string) {
+  return el.matches(selector);
 }
 
-function isFocusable(el) {
+function isFocusable(el: Element): el is HTMLElement {
   let focusableTags = ['INPUT', 'BUTTON', 'LINK', 'SELECT', 'A', 'TEXTAREA'];
-  let { tagName, type } = el;
+  let { tagName, type } = el as HTMLInputElement;
 
   if (type === 'hidden') {
     return false;
   }
 
-  return focusableTags.indexOf(tagName) > -1 || el.contentEditable === 'true';
+  return focusableTags.indexOf(tagName) > -1 || (el as HTMLElement).contentEditable === 'true';
 }
 
-export function click(el, options = {}) {
+export function click(el: HTMLElement | null | undefined, options = {}) {
   run(() => fireEvent(el, 'mousedown', options));
   focus(el);
   run(() => fireEvent(el, 'mouseup', options));
   run(() => fireEvent(el, 'click', options));
 }
 
-export function focus(el) {
+export function focus(el: Element | null | undefined) {
   if (!el) {
     return;
   }
@@ -72,7 +63,7 @@ export function focus(el) {
   }
 }
 
-export function blur(el) {
+export function blur(el: Element) {
   if (isFocusable(el)) {
     run(null, function () {
       let browserIsNotFocused = document.hasFocus && !document.hasFocus();
@@ -93,14 +84,33 @@ export function blur(el) {
   }
 }
 
-export function fireEvent(element, type, options = {}) {
+export function fireEvent<T extends keyof typeof KEYBOARD_EVENT_TYPES>(
+  element: Element | null | undefined,
+  type: T,
+  options?: KeyboardEventInit
+): void;
+export function fireEvent<T extends keyof typeof MOUSE_EVENT_TYPES>(
+  element: Element | null | undefined,
+  type: T,
+  options?: MouseEventInit
+): void;
+export function fireEvent(
+  element: Element | null | undefined,
+  type: string,
+  options?: EventInit
+): void;
+export function fireEvent(
+  element: Element | null | undefined,
+  type: string,
+  options: EventInit = {}
+) {
   if (!element) {
     return;
   }
   let event;
-  if (KEYBOARD_EVENT_TYPES.indexOf(type) > -1) {
+  if ((KEYBOARD_EVENT_TYPES as readonly string[]).indexOf(type) > -1) {
     event = buildKeyboardEvent(type, options);
-  } else if (MOUSE_EVENT_TYPES.indexOf(type) > -1) {
+  } else if ((MOUSE_EVENT_TYPES as readonly string[]).indexOf(type) > -1) {
     let rect = element.getBoundingClientRect();
     let x = rect.left + 1;
     let y = rect.top + 1;
@@ -119,59 +129,24 @@ export function fireEvent(element, type, options = {}) {
   return event;
 }
 
-function buildBasicEvent(type, options = {}) {
-  let event = document.createEvent('Events');
-  event.initEvent(type, true, true);
-  Object.assign(event, options);
-  return event;
+function buildBasicEvent(type: string, options: EventInit = {}) {
+  return new Event(type, { ...DEFAULT_EVENT_OPTIONS, ...options });
 }
 
-function buildMouseEvent(type, options = {}) {
+function buildMouseEvent(type: string, options: MouseEventInit = {}) {
   let event;
   try {
-    event = document.createEvent('MouseEvents');
-    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
-
-    event.initMouseEvent(
-      type,
-      eventOpts.canBubble,
-      eventOpts.cancelable,
-      window,
-      eventOpts.detail,
-      eventOpts.screenX,
-      eventOpts.screenY,
-      eventOpts.clientX,
-      eventOpts.clientY,
-      eventOpts.ctrlKey,
-      eventOpts.altKey,
-      eventOpts.shiftKey,
-      eventOpts.metaKey,
-      eventOpts.button,
-      eventOpts.relatedTarget
-    );
+    event = new MouseEvent(type, { ...DEFAULT_EVENT_OPTIONS, ...options });
   } catch (e) {
     event = buildBasicEvent(type, options);
   }
   return event;
 }
 
-function buildKeyboardEvent(type, options = {}) {
+function buildKeyboardEvent(type: string, options: KeyboardEventInit = {}) {
   let event;
   try {
-    event = document.createEvent('KeyEvents');
-    let eventOpts = Object.assign({}, DEFAULT_EVENT_OPTIONS, options);
-    event.initKeyEvent(
-      type,
-      eventOpts.canBubble,
-      eventOpts.cancelable,
-      window,
-      eventOpts.ctrlKey,
-      eventOpts.altKey,
-      eventOpts.shiftKey,
-      eventOpts.metaKey,
-      eventOpts.keyCode,
-      eventOpts.charCode
-    );
+    event = new KeyboardEvent(type, { ...DEFAULT_EVENT_OPTIONS, ...options });
   } catch (e) {
     event = buildBasicEvent(type, options);
   }
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
index a8d7d6e03e7..35faccc9a96 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
@@ -1,10 +1,19 @@
-import { compile } from 'ember-template-compiler';
+import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
 import { ENV } from '@ember/-internals/environment';
 import AbstractTestCase from './abstract';
 import { runDestroy, runTask, runLoopSettled } from '../run';
+import Application from '@ember/application';
+import ApplicationInstance, { BootOptions } from '@ember/application/instance';
+import Router from '@ember/routing/router';
 
-export default class AbstractApplicationTestCase extends AbstractTestCase {
-  _ensureInstance(bootOptions) {
+export default abstract class AbstractApplicationTestCase extends AbstractTestCase {
+  _applicationInstancePromise?: Promise<ApplicationInstance>;
+
+  abstract application: Application;
+
+  abstract applicationInstance?: ApplicationInstance;
+
+  _ensureInstance(bootOptions?: BootOptions) {
     if (this._applicationInstancePromise) {
       return this._applicationInstancePromise;
     }
@@ -18,7 +27,7 @@ export default class AbstractApplicationTestCase extends AbstractTestCase {
     ));
   }
 
-  async visit(url, options) {
+  async visit(url: string, options?: BootOptions) {
     // Create the instance
     let instance = await this._ensureInstance(options).then((instance) =>
       runTask(() => instance.visit(url))
@@ -30,17 +39,21 @@ export default class AbstractApplicationTestCase extends AbstractTestCase {
     return instance;
   }
 
-  get element() {
+  _element: Element | null = null;
+
+  get element(): Element | null {
     if (this._element) {
       return this._element;
-    } else if (ENV._APPLICATION_TEMPLATE_WRAPPER) {
-      return (this._element = document.querySelector('#qunit-fixture > div.ember-view'));
-    } else {
-      return (this._element = document.querySelector('#qunit-fixture'));
     }
+
+    let element = document.querySelector(
+      ENV._APPLICATION_TEMPLATE_WRAPPER ? '#qunit-fixture > div.ember-view' : '#qunit-fixture'
+    );
+
+    return (this._element = element);
   }
 
-  set element(element) {
+  set element(element: Element | null) {
     this._element = element;
   }
 
@@ -64,10 +77,10 @@ export default class AbstractApplicationTestCase extends AbstractTestCase {
   }
 
   get router() {
-    return this.application.resolveRegistration('router:main');
+    return this.application.resolveRegistration('router:main') as typeof Router;
   }
 
-  compile(/* string, options */) {
-    return compile(...arguments);
+  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}): unknown {
+    return compile(templateString, options);
   }
 }
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract.ts b/packages/internal-test-helpers/lib/test-cases/abstract.ts
index e9f0a81e4bf..b8babd323a9 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract.ts
+++ b/packages/internal-test-helpers/lib/test-cases/abstract.ts
@@ -5,13 +5,14 @@ import equalInnerHTML from '../equal-inner-html';
 import equalTokens from '../equal-tokens';
 import { getElement } from '../element-helpers';
 import { equalsElement, regex, classes } from '../matchers';
-import { runLoopSettled, runTask } from '../run';
+import { runLoopSettled } from '../run';
+import { assert } from '@ember/debug';
 
 const TextNode = window.Text;
 const HTMLElement = window.HTMLElement;
 const Comment = window.Comment;
 
-function isMarker(node) {
+function isMarker(node: unknown): node is Comment | typeof TextNode {
   if (node instanceof Comment && node.textContent === '') {
     return true;
   }
@@ -23,9 +24,15 @@ function isMarker(node) {
   return false;
 }
 
-export default class AbstractTestCase {
-  constructor(assert) {
-    this.element = null;
+export default abstract class AbstractTestCase {
+  snapshot: ChildNode[] | null;
+  assert: QUnit['assert'];
+
+  get fixture(): string | undefined {
+    return undefined;
+  }
+
+  constructor(assert: QUnit['assert']) {
     this.snapshot = null;
     this.assert = assert;
 
@@ -36,10 +43,11 @@ export default class AbstractTestCase {
   }
 
   teardown() {}
+  beforeEach(_assert: QUnit['assert']) {}
   afterEach() {}
 
-  setupFixture(innerHTML) {
-    let fixture = document.getElementById('qunit-fixture');
+  setupFixture(innerHTML: string) {
+    let fixture = document.getElementById('qunit-fixture')!;
     fixture.innerHTML = innerHTML;
   }
 
@@ -49,7 +57,7 @@ export default class AbstractTestCase {
     return this.nthChild(0);
   }
 
-  nthChild(n) {
+  nthChild(n: number) {
     let i = 0;
     let node = getElement().firstChild;
 
@@ -83,8 +91,8 @@ export default class AbstractTestCase {
     return count;
   }
 
-  $(sel) {
-    if (sel instanceof Element) {
+  $(sel?: string | HTMLElement) {
+    if (sel instanceof HTMLElement) {
       return NodeQuery.element(sel);
     } else if (typeof sel === 'string') {
       return NodeQuery.query(sel, getElement());
@@ -95,19 +103,19 @@ export default class AbstractTestCase {
     }
   }
 
-  wrap(element) {
+  wrap(element: HTMLElement) {
     return NodeQuery.element(element);
   }
 
-  click(selector) {
+  click(selector: HTMLElement | string) {
     let element;
     if (typeof selector === 'string') {
-      element = getElement().querySelector(selector);
+      element = getElement().querySelector(selector) as HTMLElement | null;
     } else {
       element = selector;
     }
 
-    let event = element.click();
+    let event = element!.click();
 
     return runLoopSettled(event);
   }
@@ -117,7 +125,7 @@ export default class AbstractTestCase {
   }
 
   takeSnapshot() {
-    let snapshot = (this.snapshot = []);
+    let snapshot: ChildNode[] = (this.snapshot = []);
 
     let node = getElement().firstChild;
 
@@ -132,7 +140,7 @@ export default class AbstractTestCase {
     return snapshot;
   }
 
-  assertText(text) {
+  assertText(text: string) {
     this.assert.strictEqual(
       this.textValue(),
       text,
@@ -140,25 +148,48 @@ export default class AbstractTestCase {
     );
   }
 
-  assertInnerHTML(html) {
+  assertInnerHTML(html: string) {
     equalInnerHTML(this.assert, getElement(), html);
   }
 
-  assertHTML(html) {
+  assertHTML(html: string) {
     equalTokens(getElement(), html, `#qunit-fixture content should be: \`${html}\``);
   }
 
-  assertElement(node, { ElementType = HTMLElement, tagName, attrs = null, content = null }) {
+  assertElement(
+    node: HTMLElement,
+    {
+      ElementType = HTMLElement,
+      tagName,
+      attrs = null,
+      content = null,
+    }: {
+      ElementType?: typeof HTMLElement;
+      tagName: string;
+      attrs?: Record<string, unknown> | null;
+      content?: unknown;
+    }
+  ) {
     if (!(node instanceof ElementType)) {
-      throw new Error(`Expecting a ${ElementType.name}, but got ${node}`);
+      throw new Error(`Expecting a ${ElementType.name}, but got ${String(node)}`);
     }
 
     equalsElement(this.assert, node, tagName, attrs, content);
   }
 
   assertComponentElement(
-    node,
-    { ElementType = HTMLElement, tagName = 'div', attrs = null, content = null }
+    node: HTMLElement,
+    {
+      ElementType = HTMLElement,
+      tagName = 'div',
+      attrs = {},
+      content = null,
+    }: {
+      ElementType?: typeof HTMLElement;
+      tagName: string;
+      attrs?: Record<string, unknown>;
+      content?: unknown;
+    }
   ) {
     attrs = Object.assign(
       {},
@@ -168,12 +199,17 @@ export default class AbstractTestCase {
     this.assertElement(node, { ElementType, tagName, attrs, content });
   }
 
-  assertSameNode(actual, expected) {
+  assertSameNode(actual: ChildNode | undefined, expected: ChildNode | undefined) {
     this.assert.strictEqual(actual, expected, 'DOM node stability');
   }
 
-  assertInvariants(oldSnapshot, newSnapshot) {
-    oldSnapshot = oldSnapshot || this.snapshot;
+  assertInvariants(): void;
+  assertInvariants(oldSnapshot: ChildNode[], newSnapshot: ChildNode[]): void;
+  assertInvariants(oldSnapshot?: ChildNode[], newSnapshot?: ChildNode[]): void {
+    if (!oldSnapshot) {
+      assert('expected an existing snapshot', this.snapshot);
+      oldSnapshot = this.snapshot;
+    }
     newSnapshot = newSnapshot || this.takeSnapshot();
 
     this.assert.strictEqual(newSnapshot.length, oldSnapshot.length, 'Same number of nodes');
@@ -183,13 +219,8 @@ export default class AbstractTestCase {
     }
   }
 
-  assertPartialInvariants(start, end) {
+  assertPartialInvariants(start: number, end: number) {
+    assert('expected an existing snapshot', this.snapshot);
     this.assertInvariants(this.snapshot, this.takeSnapshot().slice(start, end));
   }
-
-  assertStableRerender() {
-    this.takeSnapshot();
-    runTask(() => this.rerender());
-    this.assertInvariants();
-  }
 }
diff --git a/packages/internal-test-helpers/lib/test-cases/application.ts b/packages/internal-test-helpers/lib/test-cases/application.ts
index 3bd19d14c2e..b4ae19901a6 100644
--- a/packages/internal-test-helpers/lib/test-cases/application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/application.ts
@@ -3,19 +3,28 @@ import Application from '@ember/application';
 import { Router } from '@ember/-internals/routing';
 
 import { runTask, runLoopSettled } from '../run';
+import Resolver from '../test-resolver';
+import { assert as emberAssert } from '@ember/debug';
+import Controller from '@ember/controller';
+import ApplicationInstance from '@ember/application/instance';
 
-export default class ApplicationTestCase extends TestResolverApplicationTestCase {
-  constructor() {
-    super(...arguments);
+export default abstract class ApplicationTestCase extends TestResolverApplicationTestCase {
+  application: Application;
+  applicationInstance?: ApplicationInstance;
+  resolver: Resolver;
+
+  constructor(assert: QUnit['assert']) {
+    super(assert);
 
     let { applicationOptions } = this;
     this.application = runTask(this.createApplication.bind(this, applicationOptions));
 
-    this.resolver = this.application.__registry__.resolver;
+    // TODO: Review this cast
+    let resolver = this.application.__registry__.resolver;
+    emberAssert('expected a resolver', resolver instanceof Resolver);
+    this.resolver = resolver;
 
-    if (this.resolver) {
-      this.resolver.add('router:main', Router.extend(this.routerOptions));
-    }
+    resolver.add('router:main', Router.extend(this.routerOptions));
   }
 
   createApplication(myOptions = {}, MyApplication = Application) {
@@ -29,7 +38,7 @@ export default class ApplicationTestCase extends TestResolverApplicationTestCase
   }
 
   get appRouter() {
-    return this.applicationInstance.lookup('router:main');
+    return this.applicationInstance!.lookup('router:main') as Router;
   }
 
   get currentURL() {
@@ -41,7 +50,7 @@ export default class ApplicationTestCase extends TestResolverApplicationTestCase
     await runLoopSettled();
   }
 
-  controllerFor(name) {
-    return this.applicationInstance.lookup(`controller:${name}`);
+  controllerFor(name: string) {
+    return this.applicationInstance!.lookup(`controller:${name}`) as Controller | undefined;
   }
 }
diff --git a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
index 230e825ea7b..456d5ea9fca 100644
--- a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
@@ -1,27 +1,32 @@
 import TestResolverApplicationTestCase from './test-resolver-application';
 import Application from '@ember/application';
 import { Router } from '@ember/-internals/routing';
+import Resolver from '../test-resolver';
+import { assert } from '@ember/debug';
+import ApplicationInstance from '@ember/application/instance';
 
-export default class AutobootApplicationTestCase extends TestResolverApplicationTestCase {
-  createApplication(options, MyApplication = Application) {
+export default abstract class AutobootApplicationTestCase extends TestResolverApplicationTestCase {
+  resolver?: Resolver;
+
+  createApplication(options: object, MyApplication = Application) {
     let myOptions = Object.assign(this.applicationOptions, options);
     let application = (this.application = MyApplication.create(myOptions));
-    this.resolver = application.__registry__.resolver;
+    let resolver = application.__registry__.resolver;
+    assert('expected a resolver', resolver instanceof Resolver);
+    this.resolver = resolver;
 
-    if (this.resolver) {
-      this.resolver.add('router:main', Router.extend(this.routerOptions));
-    }
+    resolver.add('router:main', Router.extend(this.routerOptions));
 
     return application;
   }
 
-  visit(url) {
+  visit(url: string) {
     return this.application.boot().then(() => {
-      return this.applicationInstance.visit(url);
+      return this.applicationInstance!.visit(url);
     });
   }
 
-  get applicationInstance() {
+  get applicationInstance(): ApplicationInstance | undefined {
     let { application } = this;
 
     if (!application) {
diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.ts b/packages/internal-test-helpers/lib/test-cases/query-param.ts
index 808c2f7729a..0296d4b1a20 100644
--- a/packages/internal-test-helpers/lib/test-cases/query-param.ts
+++ b/packages/internal-test-helpers/lib/test-cases/query-param.ts
@@ -1,12 +1,17 @@
+import { BootOptions } from '@ember/application/instance';
 import Controller from '@ember/controller';
+import EmberObject from '@ember/object';
 import { NoneLocation } from '@ember/-internals/routing';
 
 import ApplicationTestCase from './application';
 import { runLoopSettled } from '../run';
 
-export default class QueryParamTestCase extends ApplicationTestCase {
-  constructor() {
-    super(...arguments);
+export default abstract class QueryParamTestCase extends ApplicationTestCase {
+  expectedPushURL: unknown;
+  expectedReplaceURL: unknown;
+
+  constructor(assert: QUnit['assert']) {
+    super(assert);
 
     let testCase = this;
     testCase.expectedPushURL = null;
@@ -15,7 +20,7 @@ export default class QueryParamTestCase extends ApplicationTestCase {
     this.add(
       'location:test',
       NoneLocation.extend({
-        setURL(path) {
+        setURL(path: string) {
           if (testCase.expectedReplaceURL) {
             testCase.assert.ok(false, 'pushState occurred but a replaceState was expected');
           }
@@ -28,7 +33,7 @@ export default class QueryParamTestCase extends ApplicationTestCase {
           this.set('path', path);
         },
 
-        replaceURL(path) {
+        replaceURL(path: string) {
           if (testCase.expectedPushURL) {
             testCase.assert.ok(false, 'replaceState occurred but a pushState was expected');
           }
@@ -48,18 +53,18 @@ export default class QueryParamTestCase extends ApplicationTestCase {
     );
   }
 
-  visitAndAssert(path) {
-    return this.visit(...arguments).then(() => {
+  visitAndAssert(path: string, options?: BootOptions) {
+    return this.visit(path, options).then(() => {
       this.assertCurrentPath(path);
     });
   }
 
-  getController(name) {
-    return this.applicationInstance.lookup(`controller:${name}`);
+  getController(name: string) {
+    return this.applicationInstance!.lookup(`controller:${name}`);
   }
 
-  getRoute(name) {
-    return this.applicationInstance.lookup(`route:${name}`);
+  getRoute(name: string) {
+    return this.applicationInstance!.lookup(`route:${name}`);
   }
 
   get routerOptions() {
@@ -68,7 +73,9 @@ export default class QueryParamTestCase extends ApplicationTestCase {
     };
   }
 
-  async setAndFlush(obj, prop, value) {
+  async setAndFlush(obj: EmberObject, prop: Record<string, unknown>): Promise<void>;
+  async setAndFlush(obj: EmberObject, prop: string, value: unknown): Promise<void>;
+  async setAndFlush(obj: EmberObject, prop: Record<string, unknown> | string, value?: unknown) {
     if (typeof prop === 'object') {
       obj.setProperties(prop);
     } else {
@@ -78,7 +85,7 @@ export default class QueryParamTestCase extends ApplicationTestCase {
     await runLoopSettled();
   }
 
-  assertCurrentPath(path, message = `current path equals '${path}'`) {
+  assertCurrentPath(path: string, message = `current path equals '${path}'`) {
     this.assert.equal(this.appRouter.get('location.path'), path, message);
   }
 
@@ -89,7 +96,7 @@ export default class QueryParamTestCase extends ApplicationTestCase {
     @public
     @method setSingleQPController
   */
-  setSingleQPController(routeName, param = 'foo', defaultValue = 'bar', options = {}) {
+  setSingleQPController(routeName: string, param = 'foo', defaultValue = 'bar', options = {}) {
     this.add(
       `controller:${routeName}`,
       Controller.extend(
@@ -109,7 +116,7 @@ export default class QueryParamTestCase extends ApplicationTestCase {
     @method setMappedQPController
   */
   setMappedQPController(
-    routeName,
+    routeName: string,
     prop = 'page',
     urlKey = 'parentPage',
     defaultValue = 1,
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index ed271628e2c..a801ded8203 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -1,65 +1,86 @@
-import { compile } from 'ember-template-compiler';
+import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
-import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer';
-import { ModuleBasedResolver } from '../test-resolver';
+import { helper, Helper, Component, _resetRenderers, Renderer } from '@ember/-internals/glimmer';
+import Resolver, { ModuleBasedResolver } from '../test-resolver';
 
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
-import { runAppend, runDestroy } from '../run';
+import { runAppend, runDestroy, runTask } from '../run';
+import { Factory } from '@ember/-internals/owner';
+import { BootOptions } from '@ember/application/instance';
+import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
+import { HelperFunction } from '@ember/-internals/glimmer/lib/helper';
 
 const TextNode = window.Text;
 
-export default class RenderingTestCase extends AbstractTestCase {
-  constructor() {
-    super(...arguments);
+export default abstract class RenderingTestCase extends AbstractTestCase {
+  owner: EngineInstance;
+  renderer: Renderer;
+  element: HTMLElement;
+  component: any;
+
+  constructor(assert: QUnit['assert']) {
+    super(assert);
     let bootOptions = this.getBootOptions();
 
     let owner = (this.owner = buildOwner({
       ownerOptions: this.getOwnerOptions(),
       resolver: this.getResolver(),
       bootOptions,
-      viewRegistry: Object.create(null),
     }));
 
     owner.register('-view-registry:main', Object.create(null), { instantiate: false });
     owner.register('event_dispatcher:main', EventDispatcher);
 
-    this.renderer = this.owner.lookup('renderer:-dom');
-    this.element = document.querySelector('#qunit-fixture');
+    this.renderer = this.owner.lookup('renderer:-dom') as Renderer;
+    this.element = document.querySelector('#qunit-fixture')!;
     this.component = null;
 
     if (
       !bootOptions ||
       (bootOptions.isInteractive !== false && bootOptions.skipEventDispatcher !== true)
     ) {
-      owner.lookup('event_dispatcher:main').setup(this.getCustomDispatcherEvents(), this.element);
+      (owner.lookup('event_dispatcher:main') as EventDispatcher).setup(
+        this.getCustomDispatcherEvents(),
+        this.element
+      );
     }
   }
 
-  compile() {
-    return compile(...arguments);
+  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}) {
+    return compile(templateString, options);
   }
 
   getCustomDispatcherEvents() {
     return {};
   }
 
-  getOwnerOptions() {}
-  getBootOptions() {}
+  getOwnerOptions(): EngineInstanceOptions | undefined {
+    return undefined;
+  }
+
+  getBootOptions(): (BootOptions & { skipEventDispatcher?: boolean }) | undefined {
+    return undefined;
+  }
 
-  get resolver() {
-    return this.owner.__registry__.fallback.resolver;
+  get resolver(): Resolver {
+    return (this.owner.__registry__.fallback as any).resolver;
   }
 
   getResolver() {
     return new ModuleBasedResolver();
   }
 
-  add(specifier, factory) {
+  add(specifier: string, factory: unknown) {
     this.resolver.add(specifier, factory);
   }
 
-  addTemplate(templateName, templateString) {
+  addTemplate(
+    templateName:
+      | string
+      | { specifier: string; source: unknown; namespace: unknown; moduleName: string },
+    templateString: string
+  ) {
     if (typeof templateName === 'string') {
       this.resolver.add(
         `template:${templateName}`,
@@ -77,7 +98,7 @@ export default class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  addComponent(name, { ComponentClass = null, template = null }) {
+  addComponent(name: string, { ComponentClass = null, template = null }) {
     if (ComponentClass) {
       this.resolver.add(`component:${name}`, ComponentClass);
     }
@@ -109,7 +130,7 @@ export default class RenderingTestCase extends AbstractTestCase {
     return this.component;
   }
 
-  render(templateStr, context = {}) {
+  render(templateStr: string, context = {}) {
     let { owner } = this;
 
     owner.register(
@@ -132,26 +153,27 @@ export default class RenderingTestCase extends AbstractTestCase {
   }
 
   rerender() {
-    this.component.rerender();
+    this.component!.rerender();
   }
 
-  registerHelper(name, funcOrClassBody) {
-    let type = typeof funcOrClassBody;
-
-    if (type === 'function') {
+  registerHelper<T, P extends unknown[], N extends Record<string, unknown>>(
+    name: string,
+    funcOrClassBody: HelperFunction<T, P, N> | Record<string, unknown>
+  ) {
+    if (typeof funcOrClassBody === 'function') {
       this.owner.register(`helper:${name}`, helper(funcOrClassBody));
-    } else if (type === 'object' && type !== null) {
+    } else if (typeof funcOrClassBody === 'object' && funcOrClassBody !== null) {
       this.owner.register(`helper:${name}`, Helper.extend(funcOrClassBody));
     } else {
       throw new Error(`Cannot register ${funcOrClassBody} as a helper`);
     }
   }
 
-  registerCustomHelper(name, definition) {
+  registerCustomHelper(name: string, definition: Factory<unknown>) {
     this.owner.register(`helper:${name}`, definition);
   }
 
-  registerComponent(name, { ComponentClass = Component, template = null }) {
+  registerComponent(name: string, { ComponentClass = Component, template = null }) {
     let { owner } = this;
 
     if (ComponentClass) {
@@ -168,18 +190,18 @@ export default class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerModifier(name, ModifierClass) {
+  registerModifier(name: string, ModifierClass: Factory<unknown>) {
     let { owner } = this;
 
     owner.register(`modifier:${name}`, ModifierClass);
   }
 
-  registerComponentManager(name, manager) {
+  registerComponentManager(name: string, manager: Factory<unknown>) {
     let owner = this.owner;
     owner.register(`component-manager:${name}`, manager);
   }
 
-  registerTemplate(name, template) {
+  registerTemplate(name: string, template: string) {
     let { owner } = this;
     if (typeof template === 'string') {
       owner.register(
@@ -193,15 +215,21 @@ export default class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerService(name, klass) {
+  registerService(name: string, klass: Factory<unknown>) {
     this.owner.register(`service:${name}`, klass);
   }
 
-  assertTextNode(node, text) {
+  assertTextNode(node: Node, text: string) {
     if (!(node instanceof TextNode)) {
       throw new Error(`Expecting a text node, but got ${node}`);
     }
 
     this.assert.strictEqual(node.textContent, text, 'node.textContent');
   }
+
+  assertStableRerender() {
+    this.takeSnapshot();
+    runTask(() => this.rerender());
+    this.assertInvariants();
+  }
 }
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
index 4802aa5ad93..dadc7d2f3e5 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
@@ -1,15 +1,22 @@
-import { compile } from 'ember-template-compiler';
+import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
-import { Component, _resetRenderers } from '@ember/-internals/glimmer';
-import { ModuleBasedResolver } from '../test-resolver';
+import { Component, Renderer, _resetRenderers } from '@ember/-internals/glimmer';
+import Resolver, { ModuleBasedResolver } from '../test-resolver';
 
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy } from '../run';
+import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
+import { BootOptions } from '@ember/application/instance';
 
 export default class RouterNonApplicationTestCase extends AbstractTestCase {
-  constructor() {
-    super(...arguments);
+  owner: EngineInstance;
+  renderer: Renderer;
+  element: HTMLElement;
+  component: any;
+
+  constructor(assert: QUnit['assert']) {
+    super(assert);
     let bootOptions = this.getBootOptions();
 
     let owner = (this.owner = buildOwner({
@@ -17,37 +24,46 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
       ownerOptions: this.getOwnerOptions(),
       resolver: this.getResolver(),
       bootOptions,
-      viewRegistry: Object.create(null),
     }));
 
     owner.register('-view-registry:main', Object.create(null), { instantiate: false });
     owner.register('event_dispatcher:main', EventDispatcher);
 
-    this.renderer = this.owner.lookup('renderer:-dom');
-    this.element = document.querySelector('#qunit-fixture');
+    this.renderer = this.owner.lookup('renderer:-dom') as Renderer;
+    this.element = document.querySelector('#qunit-fixture')!;
     this.component = null;
   }
 
-  compile() {
-    return compile(...arguments);
+  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}) {
+    return compile(templateString, options);
+  }
+
+  getOwnerOptions(): EngineInstanceOptions | undefined {
+    return undefined;
   }
 
-  getOwnerOptions() {}
-  getBootOptions() {}
+  getBootOptions(): (BootOptions & { skipEventDispatcher?: boolean }) | undefined {
+    return undefined;
+  }
 
-  get resolver() {
-    return this.owner.__registry__.fallback.resolver;
+  get resolver(): Resolver {
+    return (this.owner.__registry__.fallback as any).resolver;
   }
 
   getResolver() {
     return new ModuleBasedResolver();
   }
 
-  add(specifier, factory) {
+  add(specifier: string, factory: unknown) {
     this.resolver.add(specifier, factory);
   }
 
-  addTemplate(templateName, templateString) {
+  addTemplate(
+    templateName:
+      | string
+      | { specifier: string; source: unknown; namespace: unknown; moduleName: string },
+    templateString: string
+  ) {
     if (typeof templateName === 'string') {
       this.resolver.add(
         `template:${templateName}`,
@@ -65,7 +81,7 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     }
   }
 
-  addComponent(name, { ComponentClass = null, template = null }) {
+  addComponent(name: string, { ComponentClass = null, template = null }) {
     if (ComponentClass) {
       this.resolver.add(`component:${name}`, ComponentClass);
     }
@@ -93,7 +109,7 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     }
   }
 
-  render(templateStr, context = {}) {
+  render(templateStr: string, context = {}) {
     let { owner } = this;
 
     owner.register(
diff --git a/packages/internal-test-helpers/lib/test-cases/router.ts b/packages/internal-test-helpers/lib/test-cases/router.ts
index 1e5b3b96ef1..d32bad3a806 100644
--- a/packages/internal-test-helpers/lib/test-cases/router.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router.ts
@@ -1,8 +1,8 @@
 import ApplicationTestCase from './application';
 
-export default class RouterTestCase extends ApplicationTestCase {
-  constructor() {
-    super(...arguments);
+export default abstract class RouterTestCase extends ApplicationTestCase {
+  constructor(assert: QUnit['assert']) {
+    super(assert);
 
     this.router.map(function () {
       this.route('parent', { path: '/' }, function () {
@@ -18,10 +18,10 @@ export default class RouterTestCase extends ApplicationTestCase {
   }
 
   get routerService() {
-    return this.applicationInstance.lookup('service:router');
+    return this.applicationInstance!.lookup('service:router');
   }
 
-  buildQueryParams(queryParams) {
+  buildQueryParams(queryParams: object) {
     return {
       queryParams,
     };
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
index dc0f25387dc..9a4db9b057c 100644
--- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
@@ -1,20 +1,22 @@
 import AbstractApplicationTestCase from './abstract-application';
-import { ModuleBasedResolver } from '../test-resolver';
+import Resolver, { ModuleBasedResolver } from '../test-resolver';
 import { Component } from '@ember/-internals/glimmer';
 
-export default class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
+export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
+  abstract resolver?: Resolver;
+
   get applicationOptions() {
     return Object.assign(super.applicationOptions, {
       Resolver: ModuleBasedResolver,
     });
   }
 
-  add(specifier, factory) {
-    this.resolver.add(specifier, factory);
+  add(specifier: string, factory: unknown) {
+    this.resolver!.add(specifier, factory);
   }
 
-  addTemplate(templateName, templateString) {
-    this.resolver.add(
+  addTemplate(templateName: string, templateString: string) {
+    this.resolver!.add(
       `template:${templateName}`,
       this.compile(templateString, {
         moduleName: `my-app/templates/${templateName.replace(/\./g, '/')}.hbs`,
@@ -22,13 +24,19 @@ export default class TestResolverApplicationTestCase extends AbstractApplication
     );
   }
 
-  addComponent(name, { ComponentClass = Component, template = null }) {
+  addComponent(
+    name: string,
+    {
+      ComponentClass = Component,
+      template = null,
+    }: { ComponentClass?: object | null; template?: string | null }
+  ) {
     if (ComponentClass) {
-      this.resolver.add(`component:${name}`, ComponentClass);
+      this.resolver!.add(`component:${name}`, ComponentClass);
     }
 
     if (typeof template === 'string') {
-      this.resolver.add(
+      this.resolver!.add(
         `template:components/${name}`,
         this.compile(template, {
           moduleName: `my-app/templates/components/${name}.hbs`,
diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts
index 1290fbc8f49..c71ee7e69fb 100644
--- a/packages/internal-test-helpers/lib/test-resolver.ts
+++ b/packages/internal-test-helpers/lib/test-resolver.ts
@@ -2,7 +2,7 @@ import { compile } from 'ember-template-compiler';
 
 const DELIMITER = '%';
 
-function serializeKey(specifier, source, namespace) {
+function serializeKey(specifier: string, source?: unknown, namespace?: unknown) {
   let [type, name] = specifier.split(':');
   return `${type}://${[
     name,
@@ -12,13 +12,18 @@ function serializeKey(specifier, source, namespace) {
 }
 
 class Resolver {
+  _registered: Record<string, unknown>;
+
   constructor() {
     this._registered = {};
   }
-  resolve(specifier) {
+  resolve(specifier: string) {
     return this._registered[specifier] || this._registered[serializeKey(specifier)];
   }
-  add(lookup, factory) {
+  add(
+    lookup: string | { specifier: string; source: unknown; namespace: unknown },
+    factory: unknown
+  ) {
     let key;
     switch (typeof lookup) {
       case 'string':
@@ -36,7 +41,7 @@ class Resolver {
 
     return (this._registered[key] = factory);
   }
-  addTemplate(templateName, template) {
+  addTemplate(templateName: string, template: string) {
     let templateType = typeof template;
     if (templateType !== 'string') {
       throw new Error(
diff --git a/packages/internal-test-helpers/tests/index-test.ts b/packages/internal-test-helpers/tests/index-test.ts
index bdf2f1bbd70..d13c2dbc5bb 100644
--- a/packages/internal-test-helpers/tests/index-test.ts
+++ b/packages/internal-test-helpers/tests/index-test.ts
@@ -3,7 +3,7 @@ import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 moduleFor(
   'internal-test-helpers',
   class extends AbstractTestCase {
-    ['@test module present'](assert) {
+    ['@test module present'](assert: QUnit['assert']) {
       assert.ok(true, 'each package needs at least one test to be able to run through `npm test`');
     }
   }

From 11ea7c80effa7a85937410bdf3d9ea9e1461df5a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 11:58:10 -0800
Subject: [PATCH 0908/1405] Enable noPropertyAccessFromIndexSignature

---
 .../glimmer/lib/components/abstract-input.ts       |  2 +-
 .../-internals/glimmer/lib/components/input.ts     | 14 +++++++-------
 .../lib/helpers/-disallow-dynamic-resolution.ts    |  6 +++---
 .../-internals/glimmer/lib/helpers/action.ts       |  4 ++--
 .../@ember/-internals/glimmer/lib/syntax/outlet.ts |  6 +++---
 .../@ember/-internals/glimmer/lib/views/outlet.ts  |  2 +-
 .../@ember/-internals/routing/lib/system/router.ts |  2 +-
 .../@ember/-internals/views/lib/views/core_view.ts |  6 +++---
 packages/@ember/debug/index.ts                     |  2 +-
 tsconfig.json                                      |  1 +
 10 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index 1580cbace9f..d0c6acdb5e3 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -108,7 +108,7 @@ export default abstract class AbstractInput extends InternalComponent {
     super.validateArguments();
   }
 
-  private _value = valueFrom(this.args.named.value);
+  private _value = valueFrom(this.args.named['value']);
 
   get value(): unknown {
     return this._value.get();
diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 7111d8fd8ad..4162dbf4f02 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -213,7 +213,7 @@ class Input extends AbstractInput {
     return this.named('type') === 'checkbox';
   }
 
-  private _checked = valueFrom(this.args.named.checked);
+  private _checked = valueFrom(this.args.named['checked']);
 
   get checked(): unknown {
     if (this.isCheckbox) {
@@ -223,9 +223,9 @@ class Input extends AbstractInput {
           'Did you mean `<Input @type="checkbox" @checked={{...}} />`?',
         untrack(
           () =>
-            this.args.named.checked !== undefined ||
-            this.args.named.value === undefined ||
-            typeof valueForRef(this.args.named.value) === 'string'
+            this.args.named['checked'] !== undefined ||
+            this.args.named['value'] === undefined ||
+            typeof valueForRef(this.args.named['value']) === 'string'
         ),
         { id: 'ember.built-in-components.input-checkbox-value' }
       );
@@ -243,9 +243,9 @@ class Input extends AbstractInput {
         'Did you mean `<Input @type="checkbox" @checked={{...}} />`?',
       untrack(
         () =>
-          this.args.named.checked !== undefined ||
-          this.args.named.value === undefined ||
-          typeof valueForRef(this.args.named.value) === 'string'
+          this.args.named['checked'] !== undefined ||
+          this.args.named['value'] === undefined ||
+          typeof valueForRef(this.args.named['value']) === 'string'
       ),
       { id: 'ember.built-in-components.input-checkbox-value' }
     );
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
index ae49fb96441..f5c484dbd57 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
@@ -14,9 +14,9 @@ export default internalHelper(({ positional, named }: CapturedArguments) => {
     positional.length === 1 && nameOrValueRef
   );
 
-  let typeRef = named.type;
-  let locRef = named.loc;
-  let originalRef = named.original;
+  let typeRef = named['type'];
+  let locRef = named['loc'];
+  let originalRef = named['original'];
 
   assert(`[BUG] expecting \`type\` named argument`, typeRef);
   assert(`[BUG] expecting \`loc\` named argument`, locRef);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 0dbc9616f63..5f390323584 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -294,8 +294,8 @@ export default internalHelper(
 
     let debugKey: string = action.debugLabel!;
 
-    let target = 'target' in named && named.target ? named.target : context;
-    let processArgs = makeArgsProcessor(('value' in named && named.value) || false, restArgs);
+    let target = 'target' in named ? named['target'] : context;
+    let processArgs = makeArgsProcessor(('value' in named && named['value']) || false, restArgs);
 
     let fn: Function;
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index c894d1d0512..289193522ac 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -52,7 +52,7 @@ export const outletHelper = internalHelper(
       let state = valueForRef(scope.get('outletState') as Reference<OutletState | undefined>);
       let outlets = state !== undefined ? state.outlets : undefined;
 
-      return outlets !== undefined ? outlets.main : undefined;
+      return outlets !== undefined ? outlets['main'] : undefined;
     });
 
     let lastState: OutletDefinitionState | null = null;
@@ -80,7 +80,7 @@ export const outletHelper = internalHelper(
           // dynamic scope also changes, and so the original model ref would not
           // provide the correct updated value. So we stop updating and return
           // the _last_ model value for that outlet.
-          named.model = createComputeRef(() => {
+          named['model'] = createComputeRef(() => {
             if (lastState === state) {
               model = valueForRef(modelRef);
             }
@@ -89,7 +89,7 @@ export const outletHelper = internalHelper(
           });
 
           if (DEBUG) {
-            named.model = createDebugAliasRef!('@model', named.model);
+            named['model'] = createDebugAliasRef!('@model', named['model']);
           }
 
           let args = createCapturedArgs(named, EMPTY_POSITIONAL);
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 1d4eadfa193..c3a3f863b30 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -73,7 +73,7 @@ export default class OutletView {
       },
       (state: OutletState) => {
         dirtyTag(outletStateTag);
-        outletState.outlets.main = state;
+        outletState.outlets['main'] = state;
       }
     ));
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index fc201d782ea..7b0c6ae8d20 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1879,7 +1879,7 @@ function representEmptyRoute(
     // Create an entry to represent our default template name,
     // just so other routes can target it and inherit its place
     // in the outlet hierarchy.
-    defaultParentState!.outlets.main = {
+    defaultParentState!.outlets['main'] = {
       render: {
         name: routeName,
         outlet: 'main',
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 81754bdc670..83ea2febe07 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -48,9 +48,9 @@ const CoreView = (FrameworkObject.extend(Evented, ActionHandler, {
   parentView: null,
 
   instrumentDetails(hash: Record<string, unknown>) {
-    hash.object = this.toString();
-    hash.containerKey = this._debugContainerKey;
-    hash.view = this;
+    hash['object'] = this.toString();
+    hash['containerKey'] = this._debugContainerKey;
+    hash['view'] = this;
     return hash;
   },
 
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 9884299ff06..c03c097ffe8 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -321,7 +321,7 @@ if (DEBUG && !isTesting()) {
         if (
           document.documentElement &&
           document.documentElement.dataset &&
-          !document.documentElement.dataset.emberExtension
+          !document.documentElement.dataset['emberExtension']
         ) {
           let downloadURL;
 
diff --git a/tsconfig.json b/tsconfig.json
index fdef4e6beff..523620b164e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -16,6 +16,7 @@
     "noImplicitReturns": true,
     "allowUnreachableCode": false,
     "suppressImplicitAnyIndexErrors": true,
+    "noPropertyAccessFromIndexSignature": true,
     "noUnusedLocals": true,
     "noUncheckedIndexedAccess": true,
     "noUnusedParameters": true,

From b4c1f33aa4d0090ab546874d99f843e133a10518 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 13:35:25 -0800
Subject: [PATCH 0909/1405] Set TS flags per RFC

---
 tsconfig.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tsconfig.json b/tsconfig.json
index 523620b164e..26e2e9dccf3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,6 +20,8 @@
     "noUnusedLocals": true,
     "noUncheckedIndexedAccess": true,
     "noUnusedParameters": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": false,
 
     "newLine": "LF",
     "noEmit": true,

From b193c3571567b01813e6350381556e8adea0e094 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:10:09 +0000
Subject: [PATCH 0910/1405] Bump actions/setup-node from 2 to 3

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/alpha-releases.yml |  4 ++--
 .github/workflows/ci.yml             | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index 6c353aebc1a..0e2a29b710e 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -32,7 +32,7 @@ jobs:
     needs: [test]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e00e18af8ba..c13c70382f1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -64,7 +64,7 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -90,7 +90,7 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -110,7 +110,7 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -131,7 +131,7 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -152,7 +152,7 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -173,7 +173,7 @@ jobs:
     needs: [lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -192,7 +192,7 @@ jobs:
     needs: [basic-test, lint]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -217,7 +217,7 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           registry-url: 'https://registry.npmjs.org'
@@ -239,7 +239,7 @@ jobs:
     if: github.event_name == 'push' && contains(github.ref, 'cron') != true
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn
@@ -262,7 +262,7 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 12.x
           cache: yarn

From eb0bc378859fa174d5d96b850fd98b892265b9e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:02:46 +0000
Subject: [PATCH 0911/1405] Bump inflection from 1.13.1 to 1.13.2

Bumps [inflection](https://github.com/dreamerslab/node.inflection) from 1.13.1 to 1.13.2.
- [Release notes](https://github.com/dreamerslab/node.inflection/releases)
- [Changelog](https://github.com/dreamerslab/node.inflection/blob/master/CHANGELOG.md)
- [Commits](https://github.com/dreamerslab/node.inflection/compare/v1.13.1...v1.13.2)

---
updated-dependencies:
- dependency-name: inflection
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..5f96f59943d 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "ember-cli-string-utils": "^1.1.0",
     "ember-cli-version-checker": "^5.1.2",
     "ember-router-generator": "^2.0.0",
-    "inflection": "^1.13.1",
+    "inflection": "^1.13.2",
     "resolve": "^1.22.0",
     "semver": "^7.3.4",
     "silent-error": "^1.1.1"
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..6ea904b3a8b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5716,10 +5716,10 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-inflection@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.1.tgz#c5cadd80888a90cf84c2e96e340d7edc85d5f0cb"
-  integrity sha512-dldYtl2WlN0QDkIDtg8+xFwOS2Tbmp12t1cHa5/YClU6ZQjTFm7B66UcVbh9NQB+HvT5BAd2t5+yKsBkw5pcqA==
+inflection@^1.13.1, inflection@^1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
+  integrity sha512-cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw==
 
 inflight@^1.0.4:
   version "1.0.6"

From 6d609ef419d6e76524bdad414d5320ebe98fb9ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:03:32 +0000
Subject: [PATCH 0912/1405] Bump aws-sdk from 2.1066.0 to 2.1083.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1066.0 to 2.1083.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1066.0...v2.1083.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..13a014666f9 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "auto-dist-tag": "^2.1.1",
-    "aws-sdk": "^2.1066.0",
+    "aws-sdk": "^2.1083.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..c8e7d0fad3c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1896,10 +1896,10 @@ auto-dist-tag@^2.1.1:
     pkg-up "^3.0.0"
     semver "^7.0.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.1066.0:
-  version "2.1066.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1066.0.tgz#2a9b00d983f3c740a7adda18d4e9a5c34d4d3887"
-  integrity sha512-9BZPdJgIvau8Jf2l3PxInNqQd733uKLqGGDywMV71duxNTLgdBZe2zvCkbgl22+ldC8R2LVMdS64DzchfQIxHg==
+aws-sdk@^2.0.9, aws-sdk@^2.1083.0:
+  version "2.1083.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1083.0.tgz#afdc3d99d035b84b1dc75437f7670af0078ed2ab"
+  integrity sha512-o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"

From 5b8a61f8ba48c755e4bea657282a10bc60897575 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:03:59 +0000
Subject: [PATCH 0913/1405] Bump puppeteer from 3.0.4 to 13.4.1

Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 3.0.4 to 13.4.1.
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/puppeteer/puppeteer/compare/v3.0.4...v13.4.1)

---
updated-dependencies:
- dependency-name: puppeteer
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 143 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..778ac9d8c04 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "mocha": "^9.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
-    "puppeteer": "^3.0.4",
+    "puppeteer": "^13.4.1",
     "qunit": "^2.14.0",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..feae23a2243 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1599,6 +1599,13 @@ agent-base@5:
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
   integrity "sha1-6Ps/JClZ20TWO+Zl23qOc5U3oyw= sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="
 
+agent-base@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
 agent-base@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
@@ -2180,10 +2187,10 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.0.0.tgz#e597d1a7a6a3558a2d1c7241a16c99965e6aa40f"
   integrity sha1-5ZfRp6ajVYotHHJBoWyZll5qpA8=
 
-bl@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
-  integrity "sha1-EtYoetwpCA4ipwXldksqlSLNxIk= sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="
+bl@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"
@@ -3375,6 +3382,13 @@ cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
+cross-fetch@3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
+  integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==
+  dependencies:
+    node-fetch "2.6.7"
+
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -3608,6 +3622,11 @@ detect-newline@3.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
+devtools-protocol@0.0.960912:
+  version "0.0.960912"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.960912.tgz#411c1fa355eddb72f06c4a8743f2808766db6245"
+  integrity sha512-I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg==
+
 diff@1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.0.8.tgz#343276308ec991b7bc82267ed55bc1411f971666"
@@ -4620,10 +4639,10 @@ extract-stack@^2.0.0:
   resolved "https://registry.yarnpkg.com/extract-stack/-/extract-stack-2.0.0.tgz#11367bc865bfcd9bc0db3123e5edb57786f11f9b"
   integrity sha512-AEo4zm+TenK7zQorGK1f9mJ8L14hnTDi2ZQPR+Mub1NX8zimka1mXpV5LpH8x9HoUmFSHZCfLHqWvp0Y4FxxzQ==
 
-extract-zip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz#f53b71d44f4ff5a4527a2259ade000fb8b303492"
-  integrity "sha1-9Ttx1E9P9aRSeiJZreAA+4swNJI= sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg=="
+extract-zip@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
     debug "^4.1.1"
     get-stream "^5.1.0"
@@ -5640,6 +5659,14 @@ http-signature@~0.10.0:
     assert-plus "^0.1.5"
     ctype "0.5.3"
 
+https-proxy-agent@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 https-proxy-agent@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
@@ -7131,11 +7158,6 @@ mime@1.6.0, mime@^1.2.11:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE= sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
 
-mime@^2.0.3:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
-  integrity "sha1-4FH9iBNYWF8yed8zP+aU2gvP/dY= sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="
-
 mime@~1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
@@ -7349,7 +7371,7 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y= sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
 
-node-fetch@^2.6.0:
+node-fetch@2.6.7, node-fetch@^2.6.0:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
@@ -7882,7 +7904,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="
 
-pkg-dir@^4.1.0:
+pkg-dir@4.2.0, pkg-dir@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -8026,10 +8048,10 @@ process-relative-require@^1.0.0:
   dependencies:
     node-modules-path "^1.0.0"
 
-progress@^2.0.1:
+progress@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
-  integrity "sha1-foz42PW48jnBvGi+tOt4Vn1XLvg= sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 promise-map-series@^0.2.1:
   version "0.2.3"
@@ -8056,10 +8078,10 @@ proxy-addr@~2.0.5:
     forwarded "~0.1.2"
     ipaddr.js "1.9.0"
 
-proxy-from-env@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A=="
+proxy-from-env@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 ps-tree@=1.2.0:
   version "1.2.0"
@@ -8091,21 +8113,23 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity "sha1-tYsBCsQMIsVldhbI0sLALHv0eew= sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 
-puppeteer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.0.4.tgz#f445aae0a6732c65bbb90e963dcd6fd8fde0d780"
-  integrity "sha1-9EWq4KZzLGW7uQ6WPc1v2P3g14A= sha512-1QEb4tJXXbNId7WSHlcDkS3B4GklTIebKn8Y9D6B7tAdUjQncb+8QlTjbQsAgGX5dhRG32Qycuk5XKzJgLs0sg=="
+puppeteer@^13.4.1:
+  version "13.4.1"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.4.1.tgz#495b91d2fae3e9761a31bab1820ad179caac0fd9"
+  integrity sha512-2arcYPEGvLV9HvOw01Zv1b1IAXrMWHqsFJn0Hn00qe9HtCmaF0b8FlrbdLjCIbkaFc6icH5+GqcG8R5KxlJSRg==
   dependencies:
-    debug "^4.1.0"
-    extract-zip "^2.0.0"
-    https-proxy-agent "^4.0.0"
-    mime "^2.0.3"
-    progress "^2.0.1"
-    proxy-from-env "^1.0.0"
-    rimraf "^3.0.2"
-    tar-fs "^2.0.0"
-    unbzip2-stream "^1.3.3"
-    ws "^7.2.3"
+    cross-fetch "3.1.5"
+    debug "4.3.3"
+    devtools-protocol "0.0.960912"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    pkg-dir "4.2.0"
+    progress "2.0.3"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    tar-fs "2.1.1"
+    unbzip2-stream "1.4.3"
+    ws "8.5.0"
 
 q@~0.9.6:
   version "0.9.7"
@@ -8534,6 +8558,13 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
 
+rimraf@3.0.2, rimraf@^3.0.1, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -8541,13 +8572,6 @@ rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimra
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.1, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@~2.5.2:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
@@ -9401,22 +9425,22 @@ tap-parser@^7.0.0:
     js-yaml "^3.2.7"
     minipass "^2.2.0"
 
-tar-fs@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.1.tgz#e44086c1c60d31a4f0cf893b1c4e155dabfae9e2"
-  integrity "sha1-5ECGwcYNMaTwz4k7HE4VXav66eI= sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA=="
+tar-fs@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
+  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
     pump "^3.0.0"
-    tar-stream "^2.0.0"
+    tar-stream "^2.1.4"
 
-tar-stream@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.2.tgz#6d5ef1a7e5783a95ff70b69b97455a5968dc1325"
-  integrity "sha1-bV7xp+V4OpX/cLabl0VaWWjcEyU= sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q=="
+tar-stream@^2.1.4:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
+  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
   dependencies:
-    bl "^4.0.1"
+    bl "^4.0.3"
     end-of-stream "^1.4.1"
     fs-constants "^1.0.0"
     inherits "^2.0.3"
@@ -9791,10 +9815,10 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
-unbzip2-stream@^1.3.3:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz#84eb9e783b186d8fb397515fbb656f312f1a7dbf"
-  integrity "sha1-hOueeDsYbY+zl1Ffu2VvMS8afb8= sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg=="
+unbzip2-stream@1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
+  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
   dependencies:
     buffer "^5.2.1"
     through "^2.3.8"
@@ -10180,7 +10204,12 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@^7.2.3, ws@~7.4.2:
+ws@8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+
+ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==

From b277fa9d46df71fb5efe270c1b89176ffb476983 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:04:29 +0000
Subject: [PATCH 0914/1405] Bump @glimmer/owner from 0.83.1 to 0.84.0

Bumps [@glimmer/owner](https://github.com/glimmerjs/glimmer-vm) from 0.83.1 to 0.84.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.83.1...v0.84.0)

---
updated-dependencies:
- dependency-name: "@glimmer/owner"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4563419b873..d28cc8b2266 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "@glimmer/manager": "0.83.1",
     "@glimmer/node": "0.83.1",
     "@glimmer/opcode-compiler": "0.83.1",
-    "@glimmer/owner": "0.83.1",
+    "@glimmer/owner": "0.84.0",
     "@glimmer/program": "0.83.1",
     "@glimmer/reference": "0.83.1",
     "@glimmer/runtime": "0.83.1",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..d4a391cb8bd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1056,6 +1056,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.0.tgz#fa5cb7189910c853d473db19133d2180d813c0b7"
+  integrity sha512-+2clm2821gP+LiA4w1GOQtjgLDoqFOYVw3uwTvmzKGislR5lzC9s0la3W7NCqYwApv2aeZry4CJ6um6/Q46mYw==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/low-level@0.78.2":
   version "0.78.2"
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
@@ -1104,6 +1111,13 @@
   dependencies:
     "@glimmer/util" "0.83.1"
 
+"@glimmer/owner@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.84.0.tgz#71c6ebbd369c8c4a3cdf91bc53e445d2e92572fa"
+  integrity sha512-JH00K54PSQ14rsTLKj3bZ2fVS0n6OeHdd6rWWogWWA/RCvPPmHi9bRz9KeyVhXiebgy5p/0Fvc0xFcrmMdJwnw==
+  dependencies:
+    "@glimmer/util" "0.84.0"
+
 "@glimmer/program@0.83.1":
   version "0.83.1"
   resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.83.1.tgz#2a589f369ce06a37b7a7ec7fd550db708ddc6ee5"
@@ -1165,6 +1179,15 @@
     "@glimmer/interfaces" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.0.tgz#a9d3a9471678e5c80470646a70ea54c2cf1f8e2c"
+  integrity sha512-H5OjZXaroV821TLVHXox4t2GICwUA8HdijyAf+wouSfINmm+y4GbbEwoZM9ns8YSZGX7/gG0Z4Znwti0oFbHPw==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.84.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.83.1":
   version "0.83.1"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"

From db2d33eaa291882a3c31eaf7d1696bf93727eef8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:04:50 +0000
Subject: [PATCH 0915/1405] Bump ember-auto-import from 2.2.0 to 2.4.0

Bumps [ember-auto-import](https://github.com/ef4/ember-auto-import/tree/HEAD/packages/ember-auto-import) from 2.2.0 to 2.4.0.
- [Release notes](https://github.com/ef4/ember-auto-import/releases)
- [Changelog](https://github.com/ef4/ember-auto-import/blob/main/packages/ember-auto-import/CHANGELOG.md)
- [Commits](https://github.com/ef4/ember-auto-import/commits/v2.4.0/packages/ember-auto-import)

---
updated-dependencies:
- dependency-name: ember-auto-import
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 344 +++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 280 insertions(+), 66 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..72f944891e3 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-auto-import": "^2.2.0",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..e40f30583d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -14,28 +21,28 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.3.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
-  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+"@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
+  version "7.17.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
+  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
   dependencies:
+    "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.7"
+    "@babel/generator" "^7.17.3"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.7"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.3"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
     semver "^6.3.0"
-    source-map "^0.5.0"
 
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+"@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
   integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
@@ -44,6 +51,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
+  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -82,6 +98,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.17.1":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
@@ -256,14 +285,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
-  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+"@babel/helpers@^7.17.2":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
+  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
 
 "@babel/highlight@^7.16.7":
   version "7.16.7"
@@ -279,6 +308,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
+"@babel/parser@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
+  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -304,7 +338,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -321,14 +355,16 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.13.5":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
-  integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==
+"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493"
+  integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-decorators" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.17.1"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/plugin-syntax-decorators" "^7.17.0"
+    charcodes "^0.2.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
@@ -406,7 +442,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -414,7 +450,7 @@
     "@babel/helper-create-class-features-plugin" "^7.16.10"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
   integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
@@ -453,12 +489,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
-  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+"@babel/plugin-syntax-decorators@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
+  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -823,7 +859,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11":
+"@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
   integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
@@ -937,7 +973,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
   integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -953,6 +989,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
@@ -961,6 +1013,14 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -979,18 +1039,32 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@embroider/shared-internals@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
-  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+"@embroider/macros@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
+  integrity sha512-WD2V3OKXZB73OymI/zC2+MbqIYaAskhjtSOVVY6yG6kWILyVsJ6+fcbNHEnZyGqs4sm0TvHVJfevmA2OXV8Pww==
   dependencies:
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^7.0.1"
-    lodash "^4.17.10"
-    pkg-up "^3.1.0"
-    resolve-package-path "^1.2.2"
+    "@embroider/shared-internals" "1.2.0"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
     semver "^7.3.2"
-    typescript-memoize "^1.0.0-alpha.3"
+
+"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
+  integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
 
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
@@ -1215,6 +1289,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1394,6 +1486,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimatch@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -1606,11 +1703,25 @@ agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -1621,6 +1732,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.8.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
+  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -1816,6 +1937,11 @@ asn1@0.1.11:
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
   integrity "sha1-VZvhg3bQik7E2+gId9J4GGObLfc= sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA=="
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 assert-plus@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
@@ -1925,6 +2051,11 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
+babel-import-util@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+  integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
 babel-loader@^8.0.6:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
@@ -3005,6 +3136,11 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
+  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3671,17 +3807,17 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
   integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
 
-ember-auto-import@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
-  integrity sha512-ngluzmtV31mTY+1ceOnWfGUIgGyZt850xFncMX/14Dfx0OhXaUKBpFjKjIor/Cen4WEF+OrdgNJAjH3sM07o6w==
+ember-auto-import@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.0.tgz#91c4797f08315728086e35af954cb60bd23c14bc"
+  integrity sha512-BwF6iTaoSmT2vJ9NEHEGRBCh2+qp+Nlaz/Q7roqNSxl5oL5iMRwenPnHhOoBPTYZvPhcV/KgXR5e+pBQ107plQ==
   dependencies:
-    "@babel/core" "^7.1.6"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-decorators" "^7.13.5"
-    "@babel/preset-env" "^7.10.2"
-    "@babel/traverse" "^7.1.6"
-    "@embroider/shared-internals" "^0.40.0"
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/preset-env" "^7.16.7"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/shared-internals" "^1.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"
@@ -3693,28 +3829,26 @@ ember-auto-import@^2.2.0:
     broccoli-source "^3.0.0"
     css-loader "^5.2.0"
     debug "^4.3.1"
-    ember-cli-babel "^7.0.0"
     fs-extra "^6.0.1"
     fs-tree-diff "^2.0.0"
     handlebars "^4.3.1"
     js-string-escape "^1.0.1"
     lodash "^4.17.19"
-    mkdirp "^0.5.1"
+    mini-css-extract-plugin "^2.5.2"
     parse5 "^6.0.1"
     resolve "^1.20.0"
     resolve-package-path "^3.1.0"
-    rimraf "^2.6.2"
     semver "^7.3.4"
     style-loader "^2.0.0"
     typescript-memoize "^1.0.0-alpha.3"
-    walk-sync "^0.3.3"
+    walk-sync "^3.0.0"
 
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
+ember-cli-babel@^7.23.0:
   version "7.26.6"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -3747,6 +3881,42 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
+ember-cli-babel@^7.26.6:
+  version "7.26.11"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
+  integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.16.5"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-proposal-private-methods" "^7.16.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.16.5"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    calculate-cache-key-for-tree "^2.0.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-blueprint-test-helpers@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/ember-cli-blueprint-test-helpers/-/ember-cli-blueprint-test-helpers-0.19.2.tgz#9e563cd81ab39931253ced0982c5d02475895401"
@@ -6232,6 +6402,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -6844,7 +7019,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7161,6 +7336,13 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+mini-css-extract-plugin@^2.5.2:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
+  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
+  dependencies:
+    schema-utils "^4.0.0"
+
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -8420,6 +8602,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -8463,7 +8650,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.2:
+resolve-package-path@^1.0.11:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -8487,6 +8674,13 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
+resolve-package-path@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -8743,6 +8937,16 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
@@ -9761,10 +9965,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript-memoize@^1.0.0-alpha.3:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
-  integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
+typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
 typescript@^4.5.4:
   version "4.5.4"
@@ -10045,6 +10249,16 @@ walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
     matcher-collection "^2.0.0"
     minimatch "^3.0.4"
 
+walk-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
+  integrity sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==
+  dependencies:
+    "@types/minimatch" "^3.0.4"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.1"
+    minimatch "^3.0.4"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From 04fecdaab7b6c0a5fd2a438a86e2d8a32b1dc77d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 17:23:13 +0000
Subject: [PATCH 0916/1405] Bump @glimmer/compiler from 0.83.1 to 0.84.0

Bumps [@glimmer/compiler](https://github.com/glimmerjs/glimmer-vm) from 0.83.1 to 0.84.0.
- [Release notes](https://github.com/glimmerjs/glimmer-vm/releases)
- [Changelog](https://github.com/glimmerjs/glimmer-vm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/glimmerjs/glimmer-vm/compare/v0.83.1...v0.84.0)

---
updated-dependencies:
- dependency-name: "@glimmer/compiler"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   4 +-
 yarn.lock    | 396 +++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 319 insertions(+), 81 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..7fe251c281c 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-auto-import": "^2.2.0",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
@@ -73,7 +73,7 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.16.11",
-    "@glimmer/compiler": "0.83.1",
+    "@glimmer/compiler": "0.84.0",
     "@glimmer/destroyable": "0.83.1",
     "@glimmer/env": "^0.1.7",
     "@glimmer/global-context": "0.83.1",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..7ae34803833 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -14,28 +21,28 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.3.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
-  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+"@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
+  version "7.17.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
+  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
   dependencies:
+    "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.7"
+    "@babel/generator" "^7.17.3"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.7"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.3"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
     semver "^6.3.0"
-    source-map "^0.5.0"
 
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+"@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
   integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
@@ -44,6 +51,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
+  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -82,6 +98,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.17.1":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
@@ -256,14 +285,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
-  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+"@babel/helpers@^7.17.2":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
+  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
 
 "@babel/highlight@^7.16.7":
   version "7.16.7"
@@ -279,6 +308,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
+"@babel/parser@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
+  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -304,7 +338,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -321,14 +355,16 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.13.5":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
-  integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==
+"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493"
+  integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-decorators" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.17.1"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/plugin-syntax-decorators" "^7.17.0"
+    charcodes "^0.2.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
@@ -406,7 +442,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -414,7 +450,7 @@
     "@babel/helper-create-class-features-plugin" "^7.16.10"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
   integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
@@ -453,12 +489,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
-  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+"@babel/plugin-syntax-decorators@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
+  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -823,7 +859,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11":
+"@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
   integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
@@ -937,7 +973,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
   integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -953,6 +989,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
@@ -961,6 +1013,14 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -979,18 +1039,32 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@embroider/shared-internals@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
-  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+"@embroider/macros@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
+  integrity sha512-WD2V3OKXZB73OymI/zC2+MbqIYaAskhjtSOVVY6yG6kWILyVsJ6+fcbNHEnZyGqs4sm0TvHVJfevmA2OXV8Pww==
   dependencies:
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^7.0.1"
-    lodash "^4.17.10"
-    pkg-up "^3.1.0"
-    resolve-package-path "^1.2.2"
+    "@embroider/shared-internals" "1.2.0"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
     semver "^7.3.2"
-    typescript-memoize "^1.0.0-alpha.3"
+
+"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
+  integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
 
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
@@ -1007,15 +1081,15 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.83.1.tgz#d6b7d22a95c99be19959e7c41cd95eceda54d970"
-  integrity sha512-7Ou4cTVfQjsAklFcZl3nMMTvDQ9P3DH9iOMM7q/Ezpu/fM3fDdYofywmBOi7hHbXCxtfvj4MhLlMlMokFrM32Q==
+"@glimmer/compiler@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.84.0.tgz#58b7027d83707e9805a7b7832a9aa59e57d855c6"
+  integrity sha512-DVO8KLgw8dQQF/r1tR3XDBgVsVdCE8e5CyeiCLYTQR5X48Js0LE0bQiY0EtsopyXeswcURf+OVNsNIyHuXAwKQ==
   dependencies:
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/syntax" "0.83.1"
-    "@glimmer/util" "0.83.1"
-    "@glimmer/wire-format" "0.83.1"
+    "@glimmer/interfaces" "0.84.0"
+    "@glimmer/syntax" "0.84.0"
+    "@glimmer/util" "0.84.0"
+    "@glimmer/wire-format" "0.84.0"
     "@simple-dom/interface" "^1.4.0"
 
 "@glimmer/destroyable@0.83.1":
@@ -1056,6 +1130,13 @@
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/interfaces@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.0.tgz#fa5cb7189910c853d473db19133d2180d813c0b7"
+  integrity sha512-+2clm2821gP+LiA4w1GOQtjgLDoqFOYVw3uwTvmzKGislR5lzC9s0la3W7NCqYwApv2aeZry4CJ6um6/Q46mYw==
+  dependencies:
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/low-level@0.78.2":
   version "0.78.2"
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
@@ -1146,13 +1227,13 @@
     "@glimmer/wire-format" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.83.1.tgz#7e18dd445871c157ba0281f12a4fbf316fa49b41"
-  integrity sha512-n3vEd0GtjtgkOsd2gqkSimp8ecqq5KrHyana/s1XJZvVAPD5rMWT9WvAVWG8XAktns8BxjwLIUoj/vkOfA+eHg==
+"@glimmer/syntax@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.0.tgz#bf5104fc2be7c853f1e3897dda16a655f6fd7d5f"
+  integrity sha512-TAo1vaO5SPWtstU3XOAeiG5izhlw2v2ASns7f5dwe0hzGPRHPGuatmsVCtw/CS6FH86weboLrOGz0KQwjMaKfQ==
   dependencies:
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
+    "@glimmer/interfaces" "0.84.0"
+    "@glimmer/util" "0.84.0"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
@@ -1165,6 +1246,15 @@
     "@glimmer/interfaces" "0.83.1"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.0.tgz#a9d3a9471678e5c80470646a70ea54c2cf1f8e2c"
+  integrity sha512-H5OjZXaroV821TLVHXox4t2GICwUA8HdijyAf+wouSfINmm+y4GbbEwoZM9ns8YSZGX7/gG0Z4Znwti0oFbHPw==
+  dependencies:
+    "@glimmer/env" "0.1.7"
+    "@glimmer/interfaces" "0.84.0"
+    "@simple-dom/interface" "^1.4.0"
+
 "@glimmer/validator@0.83.1":
   version "0.83.1"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
@@ -1196,6 +1286,14 @@
     "@glimmer/interfaces" "0.83.1"
     "@glimmer/util" "0.83.1"
 
+"@glimmer/wire-format@0.84.0":
+  version "0.84.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.84.0.tgz#d70bd970ff877752c1d5e46eabec4a5c6583a319"
+  integrity sha512-vvagH+UteM1A5g0lLPBWmbNTbDfs9wzQUgNFzygX4WxuEwXfGyxDvfFPoRifyrdV1Eft/h/yKtZ/b6WyCLdDLA==
+  dependencies:
+    "@glimmer/interfaces" "0.84.0"
+    "@glimmer/util" "0.84.0"
+
 "@handlebars/parser@~2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
@@ -1215,6 +1313,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1394,6 +1510,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimatch@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -1606,11 +1727,25 @@ agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -1621,6 +1756,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.8.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
+  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -1816,6 +1961,11 @@ asn1@0.1.11:
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
   integrity "sha1-VZvhg3bQik7E2+gId9J4GGObLfc= sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA=="
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 assert-plus@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
@@ -1925,6 +2075,11 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
+babel-import-util@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+  integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
 babel-loader@^8.0.6:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
@@ -3005,6 +3160,11 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
+  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3671,17 +3831,17 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
   integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
 
-ember-auto-import@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
-  integrity sha512-ngluzmtV31mTY+1ceOnWfGUIgGyZt850xFncMX/14Dfx0OhXaUKBpFjKjIor/Cen4WEF+OrdgNJAjH3sM07o6w==
+ember-auto-import@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.0.tgz#91c4797f08315728086e35af954cb60bd23c14bc"
+  integrity sha512-BwF6iTaoSmT2vJ9NEHEGRBCh2+qp+Nlaz/Q7roqNSxl5oL5iMRwenPnHhOoBPTYZvPhcV/KgXR5e+pBQ107plQ==
   dependencies:
-    "@babel/core" "^7.1.6"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-decorators" "^7.13.5"
-    "@babel/preset-env" "^7.10.2"
-    "@babel/traverse" "^7.1.6"
-    "@embroider/shared-internals" "^0.40.0"
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/preset-env" "^7.16.7"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/shared-internals" "^1.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"
@@ -3693,28 +3853,26 @@ ember-auto-import@^2.2.0:
     broccoli-source "^3.0.0"
     css-loader "^5.2.0"
     debug "^4.3.1"
-    ember-cli-babel "^7.0.0"
     fs-extra "^6.0.1"
     fs-tree-diff "^2.0.0"
     handlebars "^4.3.1"
     js-string-escape "^1.0.1"
     lodash "^4.17.19"
-    mkdirp "^0.5.1"
+    mini-css-extract-plugin "^2.5.2"
     parse5 "^6.0.1"
     resolve "^1.20.0"
     resolve-package-path "^3.1.0"
-    rimraf "^2.6.2"
     semver "^7.3.4"
     style-loader "^2.0.0"
     typescript-memoize "^1.0.0-alpha.3"
-    walk-sync "^0.3.3"
+    walk-sync "^3.0.0"
 
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
+ember-cli-babel@^7.23.0:
   version "7.26.6"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -3747,6 +3905,42 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
+ember-cli-babel@^7.26.6:
+  version "7.26.11"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
+  integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.16.5"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-proposal-private-methods" "^7.16.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.16.5"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    calculate-cache-key-for-tree "^2.0.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-blueprint-test-helpers@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/ember-cli-blueprint-test-helpers/-/ember-cli-blueprint-test-helpers-0.19.2.tgz#9e563cd81ab39931253ced0982c5d02475895401"
@@ -6232,6 +6426,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -6844,7 +7043,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7161,6 +7360,13 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+mini-css-extract-plugin@^2.5.2:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
+  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
+  dependencies:
+    schema-utils "^4.0.0"
+
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -8420,6 +8626,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -8463,7 +8674,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.2:
+resolve-package-path@^1.0.11:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -8487,6 +8698,13 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
+resolve-package-path@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -8743,6 +8961,16 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
@@ -9761,10 +9989,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript-memoize@^1.0.0-alpha.3:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
-  integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
+typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
 typescript@^4.5.4:
   version "4.5.4"
@@ -10045,6 +10273,16 @@ walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
     matcher-collection "^2.0.0"
     minimatch "^3.0.4"
 
+walk-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
+  integrity sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==
+  dependencies:
+    "@types/minimatch" "^3.0.4"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.1"
+    minimatch "^3.0.4"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From 26381ed9fc4349964991a5ded9b76f788dff43d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 17:23:40 +0000
Subject: [PATCH 0917/1405] Bump fs-extra from 10.0.0 to 10.0.1

Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 10.0.0 to 10.0.1.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/10.0.0...10.0.1)

---
updated-dependencies:
- dependency-name: fs-extra
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   4 +-
 yarn.lock    | 352 +++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 285 insertions(+), 71 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..99c67abbd2c 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-auto-import": "^2.2.0",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
@@ -125,7 +125,7 @@
     "expect-type": "^0.13.0",
     "express": "^4.17.1",
     "finalhandler": "^1.1.2",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.0.1",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
     "glob": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..f01aa318a58 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -14,28 +21,28 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.3.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
-  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+"@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
+  version "7.17.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
+  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
   dependencies:
+    "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.7"
+    "@babel/generator" "^7.17.3"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.7"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.3"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
     semver "^6.3.0"
-    source-map "^0.5.0"
 
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+"@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
   integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
@@ -44,6 +51,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
+  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -82,6 +98,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.17.1":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
@@ -256,14 +285,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
-  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+"@babel/helpers@^7.17.2":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
+  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
 
 "@babel/highlight@^7.16.7":
   version "7.16.7"
@@ -279,6 +308,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
+"@babel/parser@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
+  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -304,7 +338,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -321,14 +355,16 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.13.5":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
-  integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==
+"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493"
+  integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-decorators" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.17.1"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/plugin-syntax-decorators" "^7.17.0"
+    charcodes "^0.2.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
@@ -406,7 +442,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -414,7 +450,7 @@
     "@babel/helper-create-class-features-plugin" "^7.16.10"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
   integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
@@ -453,12 +489,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
-  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+"@babel/plugin-syntax-decorators@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
+  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -823,7 +859,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11":
+"@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
   integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
@@ -937,7 +973,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
   integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -953,6 +989,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
@@ -961,6 +1013,14 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -979,18 +1039,32 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@embroider/shared-internals@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
-  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+"@embroider/macros@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
+  integrity sha512-WD2V3OKXZB73OymI/zC2+MbqIYaAskhjtSOVVY6yG6kWILyVsJ6+fcbNHEnZyGqs4sm0TvHVJfevmA2OXV8Pww==
   dependencies:
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^7.0.1"
-    lodash "^4.17.10"
-    pkg-up "^3.1.0"
-    resolve-package-path "^1.2.2"
+    "@embroider/shared-internals" "1.2.0"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
     semver "^7.3.2"
-    typescript-memoize "^1.0.0-alpha.3"
+
+"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
+  integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
 
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
@@ -1215,6 +1289,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1394,6 +1486,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimatch@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -1606,11 +1703,25 @@ agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -1621,6 +1732,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.8.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
+  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -1816,6 +1937,11 @@ asn1@0.1.11:
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
   integrity "sha1-VZvhg3bQik7E2+gId9J4GGObLfc= sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA=="
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 assert-plus@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
@@ -1925,6 +2051,11 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
+babel-import-util@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+  integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
 babel-loader@^8.0.6:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
@@ -3005,6 +3136,11 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
+  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3671,17 +3807,17 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
   integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
 
-ember-auto-import@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
-  integrity sha512-ngluzmtV31mTY+1ceOnWfGUIgGyZt850xFncMX/14Dfx0OhXaUKBpFjKjIor/Cen4WEF+OrdgNJAjH3sM07o6w==
+ember-auto-import@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.0.tgz#91c4797f08315728086e35af954cb60bd23c14bc"
+  integrity sha512-BwF6iTaoSmT2vJ9NEHEGRBCh2+qp+Nlaz/Q7roqNSxl5oL5iMRwenPnHhOoBPTYZvPhcV/KgXR5e+pBQ107plQ==
   dependencies:
-    "@babel/core" "^7.1.6"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-decorators" "^7.13.5"
-    "@babel/preset-env" "^7.10.2"
-    "@babel/traverse" "^7.1.6"
-    "@embroider/shared-internals" "^0.40.0"
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/preset-env" "^7.16.7"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/shared-internals" "^1.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"
@@ -3693,28 +3829,26 @@ ember-auto-import@^2.2.0:
     broccoli-source "^3.0.0"
     css-loader "^5.2.0"
     debug "^4.3.1"
-    ember-cli-babel "^7.0.0"
     fs-extra "^6.0.1"
     fs-tree-diff "^2.0.0"
     handlebars "^4.3.1"
     js-string-escape "^1.0.1"
     lodash "^4.17.19"
-    mkdirp "^0.5.1"
+    mini-css-extract-plugin "^2.5.2"
     parse5 "^6.0.1"
     resolve "^1.20.0"
     resolve-package-path "^3.1.0"
-    rimraf "^2.6.2"
     semver "^7.3.4"
     style-loader "^2.0.0"
     typescript-memoize "^1.0.0-alpha.3"
-    walk-sync "^0.3.3"
+    walk-sync "^3.0.0"
 
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
+ember-cli-babel@^7.23.0:
   version "7.26.6"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -3747,6 +3881,42 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
+ember-cli-babel@^7.26.6:
+  version "7.26.11"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
+  integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.16.5"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-proposal-private-methods" "^7.16.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.16.5"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    calculate-cache-key-for-tree "^2.0.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-blueprint-test-helpers@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/ember-cli-blueprint-test-helpers/-/ember-cli-blueprint-test-helpers-0.19.2.tgz#9e563cd81ab39931253ced0982c5d02475895401"
@@ -4991,10 +5161,10 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
-  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+fs-extra@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
+  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -6232,6 +6402,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -6844,7 +7019,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7161,6 +7336,13 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+mini-css-extract-plugin@^2.5.2:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
+  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
+  dependencies:
+    schema-utils "^4.0.0"
+
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -8420,6 +8602,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -8463,7 +8650,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.2:
+resolve-package-path@^1.0.11:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -8487,6 +8674,13 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
+resolve-package-path@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -8743,6 +8937,16 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
@@ -9761,10 +9965,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript-memoize@^1.0.0-alpha.3:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
-  integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
+typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
 typescript@^4.5.4:
   version "4.5.4"
@@ -10045,6 +10249,16 @@ walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
     matcher-collection "^2.0.0"
     minimatch "^3.0.4"
 
+walk-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
+  integrity sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==
+  dependencies:
+    "@types/minimatch" "^3.0.4"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.1"
+    minimatch "^3.0.4"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From c5036c4f67a8ae48b816d907586bf90896f71a89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 17:24:14 +0000
Subject: [PATCH 0918/1405] Bump @typescript-eslint/parser from 5.10.0 to
 5.13.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.10.0 to 5.13.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.13.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   4 +-
 yarn.lock    | 392 +++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 322 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index 4563419b873..1c29834e4d1 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-auto-import": "^2.2.0",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.23.0",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
@@ -90,7 +90,7 @@
     "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.10.0",
+    "@typescript-eslint/parser": "^5.13.0",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1066.0",
     "babel-template": "^6.26.0",
diff --git a/yarn.lock b/yarn.lock
index b80e5d2089e..b72433fd17e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
@@ -14,28 +21,28 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/core@^7.1.6", "@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.3.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.7.tgz#db990f931f6d40cb9b87a0dc7d2adc749f1dcbcf"
-  integrity sha512-aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA==
+"@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
+  version "7.17.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
+  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
   dependencies:
+    "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.7"
+    "@babel/generator" "^7.17.3"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.7"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.3"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
     semver "^6.3.0"
-    source-map "^0.5.0"
 
-"@babel/generator@^7.16.7", "@babel/generator@^7.16.8":
+"@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
   integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
@@ -44,6 +51,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
+  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -82,6 +98,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.17.1":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
@@ -256,14 +285,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.7.tgz#7e3504d708d50344112767c3542fc5e357fffefc"
-  integrity sha512-9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw==
+"@babel/helpers@^7.17.2":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
+  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
   dependencies:
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
 
 "@babel/highlight@^7.16.7":
   version "7.16.7"
@@ -279,6 +308,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
+"@babel/parser@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
+  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -304,7 +338,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -321,14 +355,16 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-decorators@^7.13.5":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.15.4.tgz#fb55442bc83ab4d45dda76b91949706bf22881d2"
-  integrity sha512-WNER+YLs7avvRukEddhu5PSfSaMMimX2xBFgLQS7Bw16yrUxJGWidO9nQp+yLy9MVybg5Ba3BlhAw+BkdhpDmg==
+"@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493"
+  integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-decorators" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.17.1"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/plugin-syntax-decorators" "^7.17.0"
+    charcodes "^0.2.0"
 
 "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
@@ -406,7 +442,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -414,7 +450,7 @@
     "@babel/helper-create-class-features-plugin" "^7.16.10"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
   integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
@@ -453,12 +489,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
-  integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
+"@babel/plugin-syntax-decorators@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
+  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -823,7 +859,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.10.2", "@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11":
+"@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
   integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
@@ -937,7 +973,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.1.6", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
   integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -953,6 +989,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.3"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
@@ -961,6 +1013,14 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
+  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -979,18 +1039,32 @@
   resolved "https://registry.yarnpkg.com/@ember/edition-utils/-/edition-utils-1.2.0.tgz#a039f542dc14c8e8299c81cd5abba95e2459cfa6"
   integrity sha512-VmVq/8saCaPdesQmftPqbFtxJWrzxNGSQ+e8x8LLe3Hjm36pJ04Q8LeORGZkAeOhldoUX9seLGmSaHeXkIqoog==
 
-"@embroider/shared-internals@^0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.40.0.tgz#2f768c60f4f35ba5f9228f046f70324851e8bfe2"
-  integrity sha512-Ovr/i0Qgn6W6jdGXMvYJKlRoRpyBY9uhYozDSFKlBjeEmRJ0Plp7OST41+O5Td6Pqp+Rv2jVSnGzhA/MpC++NQ==
+"@embroider/macros@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.2.0.tgz#9a2d99225fba6dcb69e795cddad9f4948c2a2b6b"
+  integrity sha512-WD2V3OKXZB73OymI/zC2+MbqIYaAskhjtSOVVY6yG6kWILyVsJ6+fcbNHEnZyGqs4sm0TvHVJfevmA2OXV8Pww==
   dependencies:
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^7.0.1"
-    lodash "^4.17.10"
-    pkg-up "^3.1.0"
-    resolve-package-path "^1.2.2"
+    "@embroider/shared-internals" "1.2.0"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
     semver "^7.3.2"
-    typescript-memoize "^1.0.0-alpha.3"
+
+"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
+  integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
 
 "@eslint/eslintrc@^1.0.5":
   version "1.0.5"
@@ -1215,6 +1289,24 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1394,6 +1486,11 @@
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
+"@types/minimatch@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
@@ -1484,14 +1581,14 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.10.0.tgz#8f59e036f5f1cffc178cacbd5ccdd02aeb96c91c"
-  integrity sha512-pJB2CCeHWtwOAeIxv8CHVGJhI5FNyJAIpx5Pt72YkK3QfEzt6qAlXZuyaBmyfOdM62qU0rbxJzNToPTVeJGrQw==
+"@typescript-eslint/parser@^5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.13.0.tgz#0394ed8f2f849273c0bf4b811994d177112ced5c"
+  integrity sha512-GdrU4GvBE29tm2RqWOM0P5QfCtgCyN4hXICj/X9ibKED16136l9ZpoJvCL5pSKtmJzA+NRDzQ312wWMejCVVfg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.10.0"
-    "@typescript-eslint/types" "5.10.0"
-    "@typescript-eslint/typescript-estree" "5.10.0"
+    "@typescript-eslint/scope-manager" "5.13.0"
+    "@typescript-eslint/types" "5.13.0"
+    "@typescript-eslint/typescript-estree" "5.13.0"
     debug "^4.3.2"
 
 "@typescript-eslint/scope-manager@5.10.0":
@@ -1502,6 +1599,14 @@
     "@typescript-eslint/types" "5.10.0"
     "@typescript-eslint/visitor-keys" "5.10.0"
 
+"@typescript-eslint/scope-manager@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.13.0.tgz#cf6aff61ca497cb19f0397eea8444a58f46156b6"
+  integrity sha512-T4N8UvKYDSfVYdmJq7g2IPJYCRzwtp74KyDZytkR4OL3NRupvswvmJQJ4CX5tDSurW2cvCc1Ia1qM7d0jpa7IA==
+  dependencies:
+    "@typescript-eslint/types" "5.13.0"
+    "@typescript-eslint/visitor-keys" "5.13.0"
+
 "@typescript-eslint/type-utils@5.10.0":
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz#8524b9479c19c478347a7df216827e749e4a51e5"
@@ -1516,6 +1621,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c"
   integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==
 
+"@typescript-eslint/types@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.13.0.tgz#da1de4ae905b1b9ff682cab0bed6b2e3be9c04e5"
+  integrity sha512-LmE/KO6DUy0nFY/OoQU0XelnmDt+V8lPQhh8MOVa7Y5k2gGRd6U9Kp3wAjhB4OHg57tUO0nOnwYQhRRyEAyOyg==
+
 "@typescript-eslint/typescript-estree@5.10.0":
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224"
@@ -1529,6 +1639,19 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.13.0.tgz#b37c07b748ff030a3e93d87c842714e020b78141"
+  integrity sha512-Q9cQow0DeLjnp5DuEDjLZ6JIkwGx3oYZe+BfcNuw/POhtpcxMTy18Icl6BJqTSd+3ftsrfuVb7mNHRZf7xiaNA==
+  dependencies:
+    "@typescript-eslint/types" "5.13.0"
+    "@typescript-eslint/visitor-keys" "5.13.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.10.0":
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz#c3d152a85da77c400e37281355561c72fb1b5a65"
@@ -1549,6 +1672,14 @@
     "@typescript-eslint/types" "5.10.0"
     eslint-visitor-keys "^3.0.0"
 
+"@typescript-eslint/visitor-keys@5.13.0":
+  version "5.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.13.0.tgz#f45ff55bcce16403b221ac9240fbeeae4764f0fd"
+  integrity sha512-HLKEAS/qA1V7d9EzcpLFykTePmOQqOFim8oCvhY3pZgQ8Hi38hYpHd9e5GN6nQBFQNecNhws5wkS9Y5XIO0s/g==
+  dependencies:
+    "@typescript-eslint/types" "5.13.0"
+    eslint-visitor-keys "^3.0.0"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
@@ -1606,11 +1737,25 @@ agent-base@^4.3.0:
   dependencies:
     es6-promisify "^5.0.0"
 
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
+ajv-keywords@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
@@ -1621,6 +1766,16 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.8.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
+  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 amd-name-resolver@^1.2.0, amd-name-resolver@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
@@ -1816,6 +1971,11 @@ asn1@0.1.11:
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
   integrity "sha1-VZvhg3bQik7E2+gId9J4GGObLfc= sha512-Fh9zh3G2mZ8qM/kwsiKwL2U2FmXxVsboP4x1mXjnhKHv3SmzaBZoYvxEQJz/YS2gnCgd8xlAVWcZnQyC9qZBsA=="
 
+assert-never@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/assert-never/-/assert-never-1.2.1.tgz#11f0e363bf146205fb08193b5c7b90f4d1cf44fe"
+  integrity sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==
+
 assert-plus@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
@@ -1925,6 +2085,11 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
+babel-import-util@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.1.0.tgz#4156b16ef090c4f0d3cdb869ff799202f24aeb93"
+  integrity sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==
+
 babel-loader@^8.0.6:
   version "8.2.2"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81"
@@ -3005,6 +3170,11 @@ chalk@^4.0.0, chalk@^4.1.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+charcodes@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
+  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3671,17 +3841,17 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
   integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
 
-ember-auto-import@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
-  integrity sha512-ngluzmtV31mTY+1ceOnWfGUIgGyZt850xFncMX/14Dfx0OhXaUKBpFjKjIor/Cen4WEF+OrdgNJAjH3sM07o6w==
+ember-auto-import@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.0.tgz#91c4797f08315728086e35af954cb60bd23c14bc"
+  integrity sha512-BwF6iTaoSmT2vJ9NEHEGRBCh2+qp+Nlaz/Q7roqNSxl5oL5iMRwenPnHhOoBPTYZvPhcV/KgXR5e+pBQ107plQ==
   dependencies:
-    "@babel/core" "^7.1.6"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-decorators" "^7.13.5"
-    "@babel/preset-env" "^7.10.2"
-    "@babel/traverse" "^7.1.6"
-    "@embroider/shared-internals" "^0.40.0"
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-proposal-class-properties" "^7.16.7"
+    "@babel/plugin-proposal-decorators" "^7.16.7"
+    "@babel/preset-env" "^7.16.7"
+    "@embroider/macros" "^1.0.0"
+    "@embroider/shared-internals" "^1.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"
@@ -3693,28 +3863,26 @@ ember-auto-import@^2.2.0:
     broccoli-source "^3.0.0"
     css-loader "^5.2.0"
     debug "^4.3.1"
-    ember-cli-babel "^7.0.0"
     fs-extra "^6.0.1"
     fs-tree-diff "^2.0.0"
     handlebars "^4.3.1"
     js-string-escape "^1.0.1"
     lodash "^4.17.19"
-    mkdirp "^0.5.1"
+    mini-css-extract-plugin "^2.5.2"
     parse5 "^6.0.1"
     resolve "^1.20.0"
     resolve-package-path "^3.1.0"
-    rimraf "^2.6.2"
     semver "^7.3.4"
     style-loader "^2.0.0"
     typescript-memoize "^1.0.0-alpha.3"
-    walk-sync "^0.3.3"
+    walk-sync "^3.0.0"
 
 ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
+ember-cli-babel@^7.23.0:
   version "7.26.6"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
   integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
@@ -3747,6 +3915,42 @@ ember-cli-babel@^7.0.0, ember-cli-babel@^7.23.0:
     rimraf "^3.0.1"
     semver "^5.5.0"
 
+ember-cli-babel@^7.26.6:
+  version "7.26.11"
+  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
+  integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
+  dependencies:
+    "@babel/core" "^7.12.0"
+    "@babel/helper-compilation-targets" "^7.12.0"
+    "@babel/plugin-proposal-class-properties" "^7.16.5"
+    "@babel/plugin-proposal-decorators" "^7.13.5"
+    "@babel/plugin-proposal-private-methods" "^7.16.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.16.5"
+    "@babel/plugin-transform-modules-amd" "^7.13.0"
+    "@babel/plugin-transform-runtime" "^7.13.9"
+    "@babel/plugin-transform-typescript" "^7.13.0"
+    "@babel/polyfill" "^7.11.5"
+    "@babel/preset-env" "^7.16.5"
+    "@babel/runtime" "7.12.18"
+    amd-name-resolver "^1.3.1"
+    babel-plugin-debug-macros "^0.3.4"
+    babel-plugin-ember-data-packages-polyfill "^0.1.2"
+    babel-plugin-ember-modules-api-polyfill "^3.5.0"
+    babel-plugin-module-resolver "^3.2.0"
+    broccoli-babel-transpiler "^7.8.0"
+    broccoli-debug "^0.6.4"
+    broccoli-funnel "^2.0.2"
+    broccoli-source "^2.1.2"
+    calculate-cache-key-for-tree "^2.0.0"
+    clone "^2.1.2"
+    ember-cli-babel-plugin-helpers "^1.1.1"
+    ember-cli-version-checker "^4.1.0"
+    ensure-posix-path "^1.0.2"
+    fixturify-project "^1.10.0"
+    resolve-package-path "^3.1.0"
+    rimraf "^3.0.1"
+    semver "^5.5.0"
+
 ember-cli-blueprint-test-helpers@^0.19.2:
   version "0.19.2"
   resolved "https://registry.yarnpkg.com/ember-cli-blueprint-test-helpers/-/ember-cli-blueprint-test-helpers-0.19.2.tgz#9e563cd81ab39931253ced0982c5d02475895401"
@@ -6232,6 +6436,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity "sha1-afaofZUTq4u4/mO9sJecRI5oRmA= sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
@@ -6844,7 +7053,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7161,6 +7370,13 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+mini-css-extract-plugin@^2.5.2:
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
+  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
+  dependencies:
+    schema-utils "^4.0.0"
+
 "minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -8420,6 +8636,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity "sha1-jGStX9MNqxyXbiNE/+f3kqam30I= sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-relative@^0.8.7:
   version "0.8.7"
   resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de"
@@ -8463,7 +8684,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11, resolve-package-path@^1.2.2:
+resolve-package-path@^1.0.11:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -8487,6 +8708,13 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
+resolve-package-path@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
+  integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
+  dependencies:
+    path-root "^0.1.1"
+
 resolve-path@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/resolve-path/-/resolve-path-1.4.0.tgz#c4bda9f5efb2fce65247873ab36bb4d834fe16f7"
@@ -8743,6 +8971,16 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+schema-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.8.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.0.0"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
@@ -9761,10 +9999,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript-memoize@^1.0.0-alpha.3:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.0.1.tgz#0a8199aa28f6fe18517f6e9308ef7bfbe9a98d59"
-  integrity sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==
+typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
+  integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
 typescript@^4.5.4:
   version "4.5.4"
@@ -10045,6 +10283,16 @@ walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
     matcher-collection "^2.0.0"
     minimatch "^3.0.4"
 
+walk-sync@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-3.0.0.tgz#67f882925021e20569a1edd560b8da31da8d171c"
+  integrity sha512-41TvKmDGVpm2iuH7o+DAOt06yyu/cSHpX3uzAwetzASvlNtVddgIjXIb2DfB/Wa20B1Jo86+1Dv1CraSU7hWdw==
+  dependencies:
+    "@types/minimatch" "^3.0.4"
+    ensure-posix-path "^1.1.0"
+    matcher-collection "^2.0.1"
+    minimatch "^3.0.4"
+
 walker@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"

From 44bf7b7032e34c2a0be069b4868c5e473f618a72 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 1 Mar 2022 11:29:53 -0700
Subject: [PATCH 0919/1405] update docs test

---
 tests/docs/expected.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 81253774e8f..e57a7e9e118 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -420,6 +420,7 @@ module.exports = {
     'removeObjects',
     'removeObserver',
     'removeTestHelpers',
+    'renderSettled',
     'reopen',
     'reopenClass',
     'replace',

From 1ed27ae2527a1607264353c1aef1fb8d3295b32a Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 1 Mar 2022 14:05:53 -0500
Subject: [PATCH 0920/1405] Add v4.3.0-beta.2 to CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a765466ab0a..eb0484ff085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.3.0-beta.2 (March 1, 2022)
+
+- [#19971](https://github.com/emberjs/ember.js/pull/19971) [BUGFIX] Don't serialize default Query Params on RouterService
+
 ### v4.3.0-beta.1 (February 7, 2022)
 
 No public API changes or bugfixes. 

From b85514a980be7f2ad1f471510b5d8785f18dbbdd Mon Sep 17 00:00:00 2001
From: Robert Jackson <me@rwjblue.com>
Date: Fri, 4 Mar 2022 15:34:13 -0500
Subject: [PATCH 0921/1405] [FEATURE EMBER_UNIQUE_ID_HELPER] Enable by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Discussed this at today's Ember core team meeting, and we are 👍👍  on enabling this feature by default.
---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 3d8174b6db1..88ed47e3f59 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -16,7 +16,7 @@ export const DEFAULT_FEATURES = {
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
   EMBER_CACHED: true,
-  EMBER_UNIQUE_ID_HELPER: null,
+  EMBER_UNIQUE_ID_HELPER: true,
 };
 
 /**

From 7e33a6890233f2ab2f7d68e2d708fa5416b067f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 15:13:23 +0000
Subject: [PATCH 0922/1405] Bump actions/download-artifact from 2.1.0 to 3

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2.1.0 to 3.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2.1.0...v3)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 994ee40a84b..9a96a2974a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -160,7 +160,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v2.1.0
+      - uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
@@ -202,7 +202,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v2.1.0
+      - uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
@@ -221,7 +221,7 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v2.1.0
+      - uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist

From c831109e4d7ed34987f361a6bb53f9846039ea86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 15:13:26 +0000
Subject: [PATCH 0923/1405] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/alpha-releases.yml |  4 ++--
 .github/workflows/ci.yml             | 26 +++++++++++++-------------
 .github/workflows/cron.yml           |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index 0e2a29b710e..d8c8a45c14a 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -9,7 +9,7 @@ jobs:
     name: Basic Test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 994ee40a84b..998e8441268 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     name: Linting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -36,7 +36,7 @@ jobs:
     name: Debug and Prebuilt (All Tests by Package + Canary Features + Optional Jquery)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
         with:
           node-version: 12.x
@@ -112,7 +112,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -132,7 +132,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -153,7 +153,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -174,7 +174,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -195,7 +195,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -214,7 +214,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [basic-test, lint]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -239,7 +239,7 @@ jobs:
     needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -261,7 +261,7 @@ jobs:
     # Only run on pushes to branches that are not from the cron workflow
     if: github.event_name == 'push' && contains(github.ref, 'cron') != true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
@@ -284,7 +284,7 @@ jobs:
     # Only run on pushes to master
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 12.x
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index e4011c57eb4..62bd699eb23 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -16,7 +16,7 @@ jobs:
           - beta
           - release
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
           fetch-depth: 0

From 4474e3606d1d0edb52829df93c36c85560e99ae9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Mar 2022 15:13:30 +0000
Subject: [PATCH 0924/1405] Bump actions/upload-artifact from 2.3.1 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2.3.1 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2.3.1...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 994ee40a84b..b70945a980f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
           BROCCOLI_ENV: production
         run: yarn ember build
       - name: Upload build
-        uses: actions/upload-artifact@v2.3.1
+        uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist

From bbf2730ebc58391c0a6d8ab2634aece9d341b6fb Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Mar 2022 12:58:29 -0800
Subject: [PATCH 0925/1405] Lock down TS version

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4653efd17df..915348bbf7c 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^1.0.0",
-    "typescript": "^4.5.4"
+    "typescript": "~4.5.4"
   },
   "engines": {
     "node": ">= 12.*"
diff --git a/yarn.lock b/yarn.lock
index 5c1266a3301..f64a29c41dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10059,10 +10059,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
-typescript@^4.5.4:
-  version "4.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.4.tgz#a17d3a0263bf5c8723b9c52f43c5084edf13c2e8"
-  integrity sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==
+typescript@~4.5.4:
+  version "4.5.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
+  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From a052b655b68f2c0533cffbd6e47db56c35939798 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Mar 2022 18:28:12 -0800
Subject: [PATCH 0926/1405] Use TS 4.6

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 915348bbf7c..ccb668fdaf2 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^1.0.0",
-    "typescript": "~4.5.4"
+    "typescript": "~4.6.0"
   },
   "engines": {
     "node": ">= 12.*"
diff --git a/yarn.lock b/yarn.lock
index f64a29c41dd..b33b1d5ff97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10059,10 +10059,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
-typescript@~4.5.4:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
-  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+typescript@~4.6.0:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
+  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From 60565ad3f96ff99c5789c4387c9530bf6c7ec02e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 8 Mar 2022 09:41:39 -0800
Subject: [PATCH 0927/1405] Log `until` for deprecations

---
 packages/@ember/debug/lib/deprecate.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 45d79281587..08c3f7a482b 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -85,11 +85,15 @@ if (DEBUG) {
   let formatMessage = function formatMessage(_message: string, options?: DeprecationOptions) {
     let message = _message;
 
-    if (options && options.id) {
+    if (options?.id) {
       message = message + ` [deprecation id: ${options.id}]`;
     }
 
-    if (options && options.url) {
+    if (options?.until) {
+      message = message + ` This will be removed in Ember ${options.until}.`;
+    }
+
+    if (options?.url) {
       message += ` See ${options.url} for more details.`;
     }
 

From 26c54b77645533d116343419e98e2fc1c43a8fb6 Mon Sep 17 00:00:00 2001
From: Nathaniel Furniss <nlfurniss@gmail.com>
Date: Tue, 8 Mar 2022 22:43:24 -0800
Subject: [PATCH 0928/1405] Remove `optional jQuery` from CI job

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e61785c80d9..c20a33eb655 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
         run: yarn lint
 
   basic-test:
-    name: Debug and Prebuilt (All Tests by Package + Canary Features + Optional Jquery)
+    name: Debug and Prebuilt (All Tests by Package + Canary Features)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

From ee136fc91caa75b02846a3a9188ac6943fe4851e Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Sun, 13 Mar 2022 21:35:23 +0100
Subject: [PATCH 0929/1405] Add explicit module names for the `RouteInfo` and
 `Transition` classes

Adding an explicit module name ensures they appear under the correct package in the API docs.
---
 packages/@ember/-internals/routing/lib/system/route-info.ts | 4 ++++
 packages/@ember/-internals/routing/lib/system/transition.ts | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/@ember/-internals/routing/lib/system/route-info.ts b/packages/@ember/-internals/routing/lib/system/route-info.ts
index 538f4a352ad..ac6141846e3 100644
--- a/packages/@ember/-internals/routing/lib/system/route-info.ts
+++ b/packages/@ember/-internals/routing/lib/system/route-info.ts
@@ -1,5 +1,9 @@
 export { RouteInfo, RouteInfoWithAttributes } from 'router_js';
 
+/**
+ @module @ember/routing
+*/
+
 /**
   A `RouteInfoWithAttributes` is an object that contains
   metadata, including the resolved value from the routes
diff --git a/packages/@ember/-internals/routing/lib/system/transition.ts b/packages/@ember/-internals/routing/lib/system/transition.ts
index fce723fe136..601cd6912e1 100644
--- a/packages/@ember/-internals/routing/lib/system/transition.ts
+++ b/packages/@ember/-internals/routing/lib/system/transition.ts
@@ -1,3 +1,7 @@
+/**
+ @module @ember/routing
+*/
+
 /**
   A Transition is a thennable (a promise-like object) that represents
   an attempt to transition to another route. It can be aborted, either

From 7217417c57b12911faeae6ff868e9ee8953fc5c8 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 11 Jan 2022 11:42:06 -0700
Subject: [PATCH 0930/1405] convert acceptance test

---
 blueprints/acceptance-test/index.js                             | 2 ++
 .../tests/acceptance/{__name__-test.js => __name__-test.ts}     | 0
 .../tests/acceptance/{__name__-test.js => __name__-test.ts}     | 0
 3 files changed, 2 insertions(+)
 rename blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/{__name__-test.js => __name__-test.ts} (100%)

diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js
index f2d3259aa04..9e3fc4826d4 100644
--- a/blueprints/acceptance-test/index.js
+++ b/blueprints/acceptance-test/index.js
@@ -10,6 +10,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates an acceptance test for a feature.',
 
+  shouldTransformTypeScript: true,
+
   locals: function (options) {
     let testFolderRoot = stringUtils.dasherize(options.project.name());
 
diff --git a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts
similarity index 100%
rename from blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
rename to blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts
diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts
similarity index 100%
rename from blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
rename to blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts

From 28e5dc03b3d2b915af7c0e810df2d896d20b6dc2 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Mon, 14 Mar 2022 11:22:18 -0600
Subject: [PATCH 0931/1405] convert component blueprints

---
 .../__root__/__path__/{__name__.js => __name__.ts}     |  0
 blueprints/component-addon/index.js                    |  2 ++
 .../__root__/__path__/{__name__.js => __name__.ts}     |  0
 blueprints/component-class-addon/index.js              |  2 ++
 .../__root__/__path__/{__name__.js => __name__.ts}     |  0
 blueprints/component-class/index.js                    |  2 ++
 blueprints/component-test/index.js                     |  2 ++
 .../__testType__/__path__/{__test__.js => __test__.ts} |  0
 .../__testType__/__path__/{__test__.js => __test__.ts} | 10 +++++-----
 .../__root__/__path__/{__name__.js => __name__.ts}     |  0
 blueprints/component/index.js                          |  4 +++-
 11 files changed, 16 insertions(+), 6 deletions(-)
 rename blueprints/component-addon/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/component-class-addon/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/component-class/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (89%)
 rename blueprints/component/files/__root__/__path__/{__name__.js => __name__.ts} (100%)

diff --git a/blueprints/component-addon/files/__root__/__path__/__name__.js b/blueprints/component-addon/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/component-addon/files/__root__/__path__/__name__.js
rename to blueprints/component-addon/files/__root__/__path__/__name__.ts
diff --git a/blueprints/component-addon/index.js b/blueprints/component-addon/index.js
index 36d34589cb3..5d2e4193834 100644
--- a/blueprints/component-addon/index.js
+++ b/blueprints/component-addon/index.js
@@ -8,6 +8,8 @@ const normalizeEntityName = require('ember-cli-normalize-entity-name');
 module.exports = {
   description: 'Generates a component.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __path__: function (options) {
diff --git a/blueprints/component-class-addon/files/__root__/__path__/__name__.js b/blueprints/component-class-addon/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/component-class-addon/files/__root__/__path__/__name__.js
rename to blueprints/component-class-addon/files/__root__/__path__/__name__.ts
diff --git a/blueprints/component-class-addon/index.js b/blueprints/component-class-addon/index.js
index 1ec2bbb5288..0710b0b0378 100644
--- a/blueprints/component-class-addon/index.js
+++ b/blueprints/component-class-addon/index.js
@@ -8,6 +8,8 @@ const normalizeEntityName = require('ember-cli-normalize-entity-name');
 module.exports = {
   description: 'Generates a component class.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __path__: function (options) {
diff --git a/blueprints/component-class/files/__root__/__path__/__name__.js b/blueprints/component-class/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/component-class/files/__root__/__path__/__name__.js
rename to blueprints/component-class/files/__root__/__path__/__name__.ts
diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
index a14d3535d6d..ec9d605ebe8 100644
--- a/blueprints/component-class/index.js
+++ b/blueprints/component-class/index.js
@@ -20,6 +20,8 @@ const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = true;
 module.exports = {
   description: 'Generates a component class.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'path',
diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js
index 96d5c38a04f..8490230a349 100644
--- a/blueprints/component-test/index.js
+++ b/blueprints/component-test/index.js
@@ -16,6 +16,8 @@ function invocationFor(options) {
 module.exports = useTestFrameworkDetector({
   description: 'Generates a component integration or unit test.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'test-type',
diff --git a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 89%
rename from blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 922cc75b599..696c01d16a6 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -16,10 +16,10 @@ module('<%= friendlyTestDescription %>', function (hooks) {
 
     // Template block usage:
     await render(hbs`
-      <%= openComponent(componentName) %>
-        template block text
-      <%= closeComponent(componentName) %>
-    `);
+  <%= openComponent(componentName) %>
+    template block text
+  <%= closeComponent(componentName) %>
+`);
 
     assert.dom(this.element).hasText('template block text');
   });
@@ -33,4 +33,4 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
     assert.ok(component);
   });
-});<% } %>
+}); <% } %>
diff --git a/blueprints/component/files/__root__/__path__/__name__.js b/blueprints/component/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/component/files/__root__/__path__/__name__.js
rename to blueprints/component/files/__root__/__path__/__name__.ts
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index ebce261f739..f1a1c769eac 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -21,6 +21,8 @@ const EMBER_GLIMMER_SET_COMPONENT_TEMPLATE = true;
 module.exports = {
   description: 'Generates a component.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'path',
@@ -203,7 +205,7 @@ module.exports = {
 
     if (this.EMBER_GLIMMER_SET_COMPONENT_TEMPLATE && this.options.componentClass === '') {
       files = files.filter((file) => {
-        if (file.endsWith('.js')) {
+        if (file.endsWith('.js') || file.endsWith('.ts')) {
           this.skippedJsFiles.add(file);
           return false;
         } else {

From 9c96d1f3c1c6555e939375ebee1709f6a0664cc5 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Thu, 13 Jan 2022 14:53:53 -0700
Subject: [PATCH 0932/1405] convert controller blueprints

---
 blueprints/controller-test/index.js                            | 3 +++
 .../__testType__/__path__/{__test__.js => __test__.ts}         | 0
 .../__testType__/__path__/{__test__.js => __test__.ts}         | 0
 .../files/__root__/__path__/{__name__.js => __name__.ts}       | 0
 blueprints/controller/index.js                                 | 3 +++
 5 files changed, 6 insertions(+)
 rename blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/controller/files/__root__/__path__/{__name__.js => __name__.ts} (100%)

diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js
index becf3ca8ac8..17d09b83d0e 100644
--- a/blueprints/controller-test/index.js
+++ b/blueprints/controller-test/index.js
@@ -7,6 +7,9 @@ const path = require('path');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
+
+  shouldTransformTypeScript: true,
+
   locals: function (options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let controllerPathName = dasherizedModuleName;
diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/controller/files/__root__/__path__/__name__.js b/blueprints/controller/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/controller/files/__root__/__path__/__name__.js
rename to blueprints/controller/files/__root__/__path__/__name__.ts
diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
index d2d529a4594..d4e7e31b3ae 100644
--- a/blueprints/controller/index.js
+++ b/blueprints/controller/index.js
@@ -2,6 +2,9 @@
 
 module.exports = {
   description: 'Generates a controller.',
+
+  shouldTransformTypeScript: true,
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },

From dec484711cc81f0b2bb2ab4c37e9ebe867b752f5 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Thu, 13 Jan 2022 15:37:15 -0700
Subject: [PATCH 0933/1405] convert helper tests

---
 blueprints/-addon-import.js                                     | 2 ++
 .../files/__root__/__path__/{__name__.js => __name__.ts}        | 0
 blueprints/helper-test/index.js                                 | 2 ++
 .../__collection__/{__name__-test.js => __name__-test.ts}       | 0
 .../__collection__/{__name__-test.js => __name__-test.ts}       | 0
 .../files/__root__/__collection__/{__name__.js => __name__.ts}  | 0
 blueprints/helper/index.js                                      | 2 ++
 7 files changed, 6 insertions(+)
 rename blueprints/helper-addon/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/helper/files/__root__/__collection__/{__name__.js => __name__.ts} (100%)

diff --git a/blueprints/-addon-import.js b/blueprints/-addon-import.js
index 27cf4f7f6fa..6f5181860ae 100644
--- a/blueprints/-addon-import.js
+++ b/blueprints/-addon-import.js
@@ -7,6 +7,8 @@ const inflector = require('inflection');
 module.exports = {
   description: 'Generates an import wrapper.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __name__: function (options) {
diff --git a/blueprints/helper-addon/files/__root__/__path__/__name__.js b/blueprints/helper-addon/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/helper-addon/files/__root__/__path__/__name__.js
rename to blueprints/helper-addon/files/__root__/__path__/__name__.ts
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index ce26638309b..d7244cefc4d 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -9,6 +9,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates a helper integration test.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __root__() {
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
similarity index 100%
rename from blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
similarity index 100%
rename from blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
diff --git a/blueprints/helper/files/__root__/__collection__/__name__.js b/blueprints/helper/files/__root__/__collection__/__name__.ts
similarity index 100%
rename from blueprints/helper/files/__root__/__collection__/__name__.js
rename to blueprints/helper/files/__root__/__collection__/__name__.ts
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
index 9cd15da2616..20ee589108d 100644
--- a/blueprints/helper/index.js
+++ b/blueprints/helper/index.js
@@ -7,6 +7,8 @@ const path = require('path');
 module.exports = {
   description: 'Generates a helper function.',
 
+  shouldTransformTypeScript: true,
+
   filesPath() {
     let rootPath = 'files';
     return path.join(this.path, rootPath);

From 847e3043a3acf0865e6bfd94d8b63998e526b658 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Fri, 11 Feb 2022 07:26:27 -0700
Subject: [PATCH 0934/1405] convert initializer blueprints

---
 .../files/__root__/__path__/{__name__.js => __name__.ts}    | 0
 blueprints/initializer-test/index.js                        | 2 ++
 .../__path__/{__name__-test.js => __name__-test.ts}         | 0
 .../__path__/{__name__-test.js => __name__-test.ts}         | 0
 .../initializer/files/__root__/initializers/__name__.js     | 5 -----
 .../initializer/files/__root__/initializers/__name__.ts     | 6 ++++++
 blueprints/initializer/index.js                             | 2 ++
 node-tests/fixtures/initializer-test/mocha-rfc232.js        | 4 +++-
 node-tests/fixtures/initializer-test/rfc232.js              | 4 +++-
 node-tests/fixtures/initializer/initializer-nested.js       | 2 +-
 node-tests/fixtures/initializer/initializer.js              | 2 +-
 11 files changed, 18 insertions(+), 9 deletions(-)
 rename blueprints/initializer-addon/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js => __name__-test.ts} (100%)
 delete mode 100644 blueprints/initializer/files/__root__/initializers/__name__.js
 create mode 100644 blueprints/initializer/files/__root__/initializers/__name__.ts

diff --git a/blueprints/initializer-addon/files/__root__/__path__/__name__.js b/blueprints/initializer-addon/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/initializer-addon/files/__root__/__path__/__name__.js
rename to blueprints/initializer-addon/files/__root__/__path__/__name__.ts
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index c4aee01abbd..850aa4db71a 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -9,6 +9,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates an initializer unit test.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __root__() {
diff --git a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
similarity index 100%
rename from blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
rename to blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
diff --git a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
similarity index 100%
rename from blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
rename to blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
diff --git a/blueprints/initializer/files/__root__/initializers/__name__.js b/blueprints/initializer/files/__root__/initializers/__name__.js
deleted file mode 100644
index 66078297b08..00000000000
--- a/blueprints/initializer/files/__root__/initializers/__name__.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function initialize(/* application */) {}
-
-export default {
-  initialize,
-};
diff --git a/blueprints/initializer/files/__root__/initializers/__name__.ts b/blueprints/initializer/files/__root__/initializers/__name__.ts
new file mode 100644
index 00000000000..a57249cc00e
--- /dev/null
+++ b/blueprints/initializer/files/__root__/initializers/__name__.ts
@@ -0,0 +1,6 @@
+export function initialize(application) {
+}
+
+export default {
+  initialize
+};
diff --git a/blueprints/initializer/index.js b/blueprints/initializer/index.js
index 201732241cd..3101e9bbbec 100644
--- a/blueprints/initializer/index.js
+++ b/blueprints/initializer/index.js
@@ -2,4 +2,6 @@
 
 module.exports = {
   description: 'Generates an initializer.',
+
+  shouldTransformTypeScript: true,
 };
diff --git a/node-tests/fixtures/initializer-test/mocha-rfc232.js b/node-tests/fixtures/initializer-test/mocha-rfc232.js
index d203fccc6da..d1492020e19 100644
--- a/node-tests/fixtures/initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/initializer-test/mocha-rfc232.js
@@ -12,7 +12,9 @@ describe('Unit | Initializer | foo', function () {
       initialize,
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
   });
 
   afterEach(function () {
diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
index 78ef00434d4..03281d90d83 100644
--- a/node-tests/fixtures/initializer-test/rfc232.js
+++ b/node-tests/fixtures/initializer-test/rfc232.js
@@ -18,7 +18,9 @@ module('Unit | Initializer | foo', function (hooks) {
       initialize,
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
   });
 
   hooks.afterEach(function () {
diff --git a/node-tests/fixtures/initializer/initializer-nested.js b/node-tests/fixtures/initializer/initializer-nested.js
index 66078297b08..065fae64a51 100644
--- a/node-tests/fixtures/initializer/initializer-nested.js
+++ b/node-tests/fixtures/initializer/initializer-nested.js
@@ -1,4 +1,4 @@
-export function initialize(/* application */) {}
+export function initialize(application) {}
 
 export default {
   initialize,
diff --git a/node-tests/fixtures/initializer/initializer.js b/node-tests/fixtures/initializer/initializer.js
index 66078297b08..065fae64a51 100644
--- a/node-tests/fixtures/initializer/initializer.js
+++ b/node-tests/fixtures/initializer/initializer.js
@@ -1,4 +1,4 @@
-export function initialize(/* application */) {}
+export function initialize(application) {}
 
 export default {
   initialize,

From a9738b730b9135110fb252959d4b5a588646d015 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Fri, 11 Feb 2022 07:30:09 -0700
Subject: [PATCH 0935/1405] convert instance initializer blueprints

---
 .../files/__root__/__path__/{__name__.js => __name__.ts}    | 0
 blueprints/instance-initializer-test/index.js               | 2 ++
 .../__path__/{__name__-test.js => __name__-test.ts}         | 0
 .../__path__/{__name__-test.js => __name__-test.ts}         | 0
 .../files/__root__/instance-initializers/__name__.js        | 5 -----
 .../files/__root__/instance-initializers/__name__.ts        | 6 ++++++
 blueprints/instance-initializer/index.js                    | 2 ++
 .../fixtures/instance-initializer-test/mocha-rfc232.js      | 4 +++-
 node-tests/fixtures/instance-initializer-test/rfc232.js     | 4 +++-
 .../instance-initializer/instance-initializer-nested.js     | 2 +-
 .../fixtures/instance-initializer/instance-initializer.js   | 2 +-
 11 files changed, 18 insertions(+), 9 deletions(-)
 rename blueprints/instance-initializer-addon/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__name__-test.js => __name__-test.ts} (100%)
 delete mode 100644 blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
 create mode 100644 blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts

diff --git a/blueprints/instance-initializer-addon/files/__root__/__path__/__name__.js b/blueprints/instance-initializer-addon/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/instance-initializer-addon/files/__root__/__path__/__name__.js
rename to blueprints/instance-initializer-addon/files/__root__/__path__/__name__.ts
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index 0fcba9e70b3..3dd06994708 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -9,6 +9,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates an instance initializer unit test.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __root__() {
diff --git a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
similarity index 100%
rename from blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
rename to blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
similarity index 100%
rename from blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
rename to blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
diff --git a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
deleted file mode 100644
index e1755216147..00000000000
--- a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function initialize(/* appInstance */) {}
-
-export default {
-  initialize,
-};
diff --git a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts
new file mode 100644
index 00000000000..40b7dbe4adf
--- /dev/null
+++ b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts
@@ -0,0 +1,6 @@
+export function initialize(appInstance) {
+}
+
+export default {
+  initialize
+};
diff --git a/blueprints/instance-initializer/index.js b/blueprints/instance-initializer/index.js
index 79c87c1db92..5879ba7ed1f 100644
--- a/blueprints/instance-initializer/index.js
+++ b/blueprints/instance-initializer/index.js
@@ -1,5 +1,7 @@
 'use strict';
 
 module.exports = {
+  shouldTransformTypeScript: true,
+
   description: 'Generates an instance initializer.',
 };
diff --git a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
index 994286e1b88..cce518320e5 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
@@ -11,7 +11,9 @@ describe('Unit | Instance Initializer | foo', function () {
       name: 'initializer under test',
       initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
     this.instance = this.application.buildInstance();
   });
   afterEach(function () {
diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
index 03654f52dcf..3d1588250ad 100644
--- a/node-tests/fixtures/instance-initializer-test/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -17,7 +17,9 @@ module('Unit | Instance Initializer | foo', function (hooks) {
       name: 'initializer under test',
       initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function () {
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
index e1755216147..07759372054 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
@@ -1,4 +1,4 @@
-export function initialize(/* appInstance */) {}
+export function initialize(appInstance) {}
 
 export default {
   initialize,
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer.js b/node-tests/fixtures/instance-initializer/instance-initializer.js
index e1755216147..07759372054 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer.js
@@ -1,4 +1,4 @@
-export function initialize(/* appInstance */) {}
+export function initialize(appInstance) {}
 
 export default {
   initialize,

From e8ead449b075e54d9dc58d146186a2f40977a3f0 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Fri, 14 Jan 2022 10:59:54 -0700
Subject: [PATCH 0936/1405] convert route blueprints

---
 .../files/__root__/__path__/{__name__.js => __name__.ts}        | 0
 blueprints/route-addon/index.js                                 | 2 ++
 blueprints/route-test/index.js                                  | 2 ++
 .../__root__/__testType__/__path__/{__test__.js => __test__.ts} | 0
 .../__root__/__testType__/__path__/{__test__.js => __test__.ts} | 0
 .../route/files/__root__/__path__/{__name__.js => __name__.ts}  | 0
 blueprints/route/index.js                                       | 2 ++
 7 files changed, 6 insertions(+)
 rename blueprints/route-addon/files/__root__/__path__/{__name__.js => __name__.ts} (100%)
 rename blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/route/files/__root__/__path__/{__name__.js => __name__.ts} (100%)

diff --git a/blueprints/route-addon/files/__root__/__path__/__name__.js b/blueprints/route-addon/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/route-addon/files/__root__/__path__/__name__.js
rename to blueprints/route-addon/files/__root__/__path__/__name__.ts
diff --git a/blueprints/route-addon/index.js b/blueprints/route-addon/index.js
index f88a316f49a..1ea46805458 100644
--- a/blueprints/route-addon/index.js
+++ b/blueprints/route-addon/index.js
@@ -7,6 +7,8 @@ const inflector = require('inflection');
 module.exports = {
   description: 'Generates import wrappers for a route and its template.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens: function () {
     return {
       __templatepath__: function (options) {
diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js
index 9437b5f4585..6de68a7b3bd 100644
--- a/blueprints/route-test/index.js
+++ b/blueprints/route-test/index.js
@@ -7,6 +7,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'reset-namespace',
diff --git a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/route/files/__root__/__path__/__name__.js b/blueprints/route/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/route/files/__root__/__path__/__name__.js
rename to blueprints/route/files/__root__/__path__/__name__.ts
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index f78f9253d16..b6b3c56e148 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -9,6 +9,8 @@ const EmberRouterGenerator = require('ember-router-generator');
 module.exports = {
   description: 'Generates a route and a template, and registers the route with the router.',
 
+  shouldTransformTypeScript: true,
+
   availableOptions: [
     {
       name: 'path',

From e43e7ef5c337bba030d0baacf99610114d77a486 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Fri, 14 Jan 2022 11:10:42 -0700
Subject: [PATCH 0937/1405] convert service blueprints

---
 blueprints/service-test/index.js                               | 2 ++
 .../__testType__/__path__/{__test__.js => __test__.ts}         | 0
 .../__testType__/__path__/{__test__.js => __test__.ts}         | 0
 .../files/__root__/__path__/{__name__.js => __name__.ts}       | 0
 blueprints/service/index.js                                    | 3 +++
 5 files changed, 5 insertions(+)
 rename blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/{__test__.js => __test__.ts} (100%)
 rename blueprints/service/files/__root__/__path__/{__name__.js => __name__.ts} (100%)

diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.js
index bb022737ce8..9ca68da4d67 100644
--- a/blueprints/service-test/index.js
+++ b/blueprints/service-test/index.js
@@ -5,6 +5,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates a service unit test.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens() {
     return {
       __root__() {
diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
similarity index 100%
rename from blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
rename to blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
diff --git a/blueprints/service/files/__root__/__path__/__name__.js b/blueprints/service/files/__root__/__path__/__name__.ts
similarity index 100%
rename from blueprints/service/files/__root__/__path__/__name__.js
rename to blueprints/service/files/__root__/__path__/__name__.ts
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index d6566cdddc5..9a83db1d7d9 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -2,6 +2,9 @@
 
 module.exports = {
   description: 'Generates a service.',
+
+  shouldTransformTypeScript: true,
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },

From eb14c568029781052be0bbd68efe4d5dbf7286c6 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Fri, 11 Feb 2022 07:31:30 -0700
Subject: [PATCH 0938/1405] convert util blueprints

---
 blueprints/util-test/index.js                                  | 2 ++
 .../__testType__/{__name__-test.js => __name__-test.ts}        | 0
 .../__testType__/{__name__-test.js => __name__-test.ts}        | 0
 .../util/files/__root__/utils/{__name__.js => __name__.ts}     | 0
 blueprints/util/index.js                                       | 3 +++
 5 files changed, 5 insertions(+)
 rename blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/{__name__-test.js => __name__-test.ts} (100%)
 rename blueprints/util/files/__root__/utils/{__name__.js => __name__.ts} (100%)

diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
index 16f69b856d6..8b75121e16c 100644
--- a/blueprints/util-test/index.js
+++ b/blueprints/util-test/index.js
@@ -8,6 +8,8 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 module.exports = useTestFrameworkDetector({
   description: 'Generates a util unit test.',
 
+  shouldTransformTypeScript: true,
+
   fileMapTokens() {
     return {
       __root__() {
diff --git a/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.ts
similarity index 100%
rename from blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
rename to blueprints/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.ts
diff --git a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
similarity index 100%
rename from blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
rename to blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
diff --git a/blueprints/util/files/__root__/utils/__name__.js b/blueprints/util/files/__root__/utils/__name__.ts
similarity index 100%
rename from blueprints/util/files/__root__/utils/__name__.js
rename to blueprints/util/files/__root__/utils/__name__.ts
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
index dd9b34d9f86..31eda3a9ba8 100644
--- a/blueprints/util/index.js
+++ b/blueprints/util/index.js
@@ -2,6 +2,9 @@
 
 module.exports = {
   description: 'Generates a simple utility module/function.',
+
+  shouldTransformTypeScript: true,
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },

From d6c7d6857c9af62e1566f99c9528b98bacdfd550 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Wed, 19 Jan 2022 13:59:31 -0700
Subject: [PATCH 0939/1405] minor formatting

---
 .../__testType__/__path__/__test__.ts         |  8 ++--
 .../__testType__/__path__/__name__-test.ts    |  4 +-
 .../__testType__/__path__/__name__-test.ts    | 45 ++++++++++---------
 .../__testType__/__path__/__name__-test.ts    |  6 ++-
 .../__testType__/__path__/__name__-test.ts    |  7 ++-
 .../route/files/__root__/__path__/__name__.ts |  6 +--
 .../fixtures/initializer-test/rfc232.js       |  1 +
 .../instance-initializer-test/mocha-rfc232.js |  2 +
 .../instance-initializer-test/rfc232.js       |  3 ++
 .../route/route-with-dynamic-segment.js       |  6 +--
 10 files changed, 52 insertions(+), 36 deletions(-)

diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 696c01d16a6..00936ce1c73 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -16,10 +16,10 @@ module('<%= friendlyTestDescription %>', function (hooks) {
 
     // Template block usage:
     await render(hbs`
-  <%= openComponent(componentName) %>
-    template block text
-  <%= closeComponent(componentName) %>
-`);
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
 
     assert.dom(this.element).hasText('template block text');
   });
diff --git a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
index b8759dae165..bf3e61a425a 100644
--- a/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
+++ b/blueprints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
@@ -12,7 +12,9 @@ describe('<%= friendlyTestName %>', function () {
       initialize,
     });
 
-    this.application = this.TestApplication.create({ autoboot: false });
+    this.application = this.TestApplication.create({
+      autoboot: false
+    });
   });
 
   afterEach(function () {
diff --git a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
index 4fe80c2b1d9..53ff55c7b0b 100644
--- a/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
+++ b/blueprints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
@@ -4,31 +4,34 @@ import config from '<%= modulePrefix %>/config/environment';
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import Resolver from 'ember-resolver';
-<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app'; <% } else { %>import { run } from '@ember/runloop'; <% } %>
 
-module('<%= friendlyTestName %>', function (hooks) {
-  hooks.beforeEach(function () {
-    this.TestApplication = class TestApplication extends Application {
-      modulePrefix = config.modulePrefix;
-      podModulePrefix = config.podModulePrefix;
-      Resolver = Resolver;
-    };
-    this.TestApplication.initializer({
-      name: 'initializer under test',
-      initialize,
-    });
+  module('<%= friendlyTestName %>', function (hooks) {
+    hooks.beforeEach(function () {
+      this.TestApplication = class TestApplication extends Application {
+        modulePrefix = config.modulePrefix;
+        podModulePrefix = config.podModulePrefix;
+        Resolver = Resolver;
+      };
 
-    this.application = this.TestApplication.create({ autoboot: false });
-  });
+      this.TestApplication.initializer({
+        name: 'initializer under test',
+        initialize,
+      });
 
-  hooks.afterEach(function () {
-    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+      this.application = this.TestApplication.create({
+        autoboot: false
+      });
+    });
+
+    hooks.afterEach(function () {
+      <% if (destroyAppExists) { %> destroyApp(this.application); <% } else { %> run(this.application, 'destroy'); <% } %>
   });
 
-  // TODO: Replace this with your real tests.
-  test('it works', async function (assert) {
-    await this.application.boot();
+    // TODO: Replace this with your real tests.
+    test('it works', async function (assert) {
+      await this.application.boot();
 
-    assert.ok(true);
+      assert.ok(true);
+    });
   });
-});
diff --git a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
index d244591737d..eb20199ccba 100644
--- a/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
+++ b/blueprints/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
@@ -11,7 +11,11 @@ describe('<%= friendlyTestName %>', function () {
       name: 'initializer under test',
       initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+
+    this.application = this.TestApplication.create({
+      autoboot: false
+    });
+    
     this.instance = this.application.buildInstance();
   });
   afterEach(function () {
diff --git a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
index e200288b65b..947e4c8a38f 100644
--- a/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
+++ b/blueprints/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.ts
@@ -13,11 +13,16 @@ module('<%= friendlyTestName %>', function (hooks) {
       podModulePrefix = config.podModulePrefix;
       Resolver = Resolver;
     };
+
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
       initialize,
     });
-    this.application = this.TestApplication.create({ autoboot: false });
+
+    this.application = this.TestApplication.create({
+      autoboot: false
+    });
+
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function () {
diff --git a/blueprints/route/files/__root__/__path__/__name__.ts b/blueprints/route/files/__root__/__path__/__name__.ts
index ea35f564e3f..aeb39c6b91b 100644
--- a/blueprints/route/files/__root__/__path__/__name__.ts
+++ b/blueprints/route/files/__root__/__path__/__name__.ts
@@ -2,10 +2,8 @@ import Route from '@ember/routing/route';
 
 export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
   model(params) {
-    /**
-     * This route was generated with a dynamic segment. Implement data loading
-     * based on that dynamic segment here in the model hook.
-     */
+    // This route was generated with a dynamic segment. Implement data loading
+    // based on that dynamic segment here in the model hook.
     return params;
   }
 <%}%>}
diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
index 03281d90d83..dd5f30c3aed 100644
--- a/node-tests/fixtures/initializer-test/rfc232.js
+++ b/node-tests/fixtures/initializer-test/rfc232.js
@@ -13,6 +13,7 @@ module('Unit | Initializer | foo', function (hooks) {
       podModulePrefix = config.podModulePrefix;
       Resolver = Resolver;
     };
+
     this.TestApplication.initializer({
       name: 'initializer under test',
       initialize,
diff --git a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
index cce518320e5..5a7d195336e 100644
--- a/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/mocha-rfc232.js
@@ -11,9 +11,11 @@ describe('Unit | Instance Initializer | foo', function () {
       name: 'initializer under test',
       initialize,
     });
+
     this.application = this.TestApplication.create({
       autoboot: false,
     });
+
     this.instance = this.application.buildInstance();
   });
   afterEach(function () {
diff --git a/node-tests/fixtures/instance-initializer-test/rfc232.js b/node-tests/fixtures/instance-initializer-test/rfc232.js
index 3d1588250ad..1547b9c874e 100644
--- a/node-tests/fixtures/instance-initializer-test/rfc232.js
+++ b/node-tests/fixtures/instance-initializer-test/rfc232.js
@@ -13,13 +13,16 @@ module('Unit | Instance Initializer | foo', function (hooks) {
       podModulePrefix = config.podModulePrefix;
       Resolver = Resolver;
     };
+
     this.TestApplication.instanceInitializer({
       name: 'initializer under test',
       initialize,
     });
+
     this.application = this.TestApplication.create({
       autoboot: false,
     });
+
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function () {
diff --git a/node-tests/fixtures/route/route-with-dynamic-segment.js b/node-tests/fixtures/route/route-with-dynamic-segment.js
index 7856d6b3fec..c31543f32ad 100644
--- a/node-tests/fixtures/route/route-with-dynamic-segment.js
+++ b/node-tests/fixtures/route/route-with-dynamic-segment.js
@@ -2,10 +2,8 @@ import Route from '@ember/routing/route';
 
 export default class FooRoute extends Route {
   model(params) {
-    /**
-     * This route was generated with a dynamic segment. Implement data loading
-     * based on that dynamic segment here in the model hook.
-     */
+    // This route was generated with a dynamic segment. Implement data loading
+    // based on that dynamic segment here in the model hook.
     return params;
   }
 }

From 61fe2dd2335921bb223f2e2854f463ec1cc04948 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Mon, 14 Mar 2022 11:22:35 -0600
Subject: [PATCH 0940/1405] polyfill ts blueprint support

---
 blueprints/-addon-import.js                   |   6 +
 blueprints/acceptance-test/index.js           |   6 +
 blueprints/component-addon/index.js           |   6 +
 blueprints/component-class-addon/index.js     |   6 +
 blueprints/component-class/index.js           |   2 +
 blueprints/component-test/index.js            |   6 +
 blueprints/component/index.js                 |   2 +
 blueprints/controller-test/index.js           |   6 +
 blueprints/controller/index.js                |   7 +
 blueprints/helper-test/index.js               |   6 +
 blueprints/helper/index.js                    |   6 +
 blueprints/initializer-test/index.js          |   6 +
 blueprints/initializer/index.js               |   6 +
 blueprints/instance-initializer-test/index.js |   6 +
 blueprints/instance-initializer/index.js      |   7 +
 blueprints/route-addon/index.js               |   6 +
 blueprints/route-test/index.js                |   6 +
 blueprints/route/index.js                     |   6 +
 blueprints/service-test/index.js              |   7 +
 blueprints/service/index.js                   |   7 +
 blueprints/util-test/index.js                 |   6 +
 blueprints/util/index.js                      |   7 +
 package.json                                  |   5 +-
 yarn.lock                                     | 370 ++++++++++++++----
 24 files changed, 431 insertions(+), 73 deletions(-)

diff --git a/blueprints/-addon-import.js b/blueprints/-addon-import.js
index 6f5181860ae..d4ae282cd2a 100644
--- a/blueprints/-addon-import.js
+++ b/blueprints/-addon-import.js
@@ -3,12 +3,18 @@
 const stringUtil = require('ember-cli-string-utils');
 const path = require('path');
 const inflector = require('inflection');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = {
   description: 'Generates an import wrapper.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __name__: function (options) {
diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js
index 9e3fc4826d4..f46e9c33acb 100644
--- a/blueprints/acceptance-test/index.js
+++ b/blueprints/acceptance-test/index.js
@@ -6,12 +6,18 @@ const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an acceptance test for a feature.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   locals: function (options) {
     let testFolderRoot = stringUtils.dasherize(options.project.name());
 
diff --git a/blueprints/component-addon/index.js b/blueprints/component-addon/index.js
index 5d2e4193834..d7d1b1c851f 100644
--- a/blueprints/component-addon/index.js
+++ b/blueprints/component-addon/index.js
@@ -4,12 +4,18 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = {
   description: 'Generates a component.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __path__: function (options) {
diff --git a/blueprints/component-class-addon/index.js b/blueprints/component-class-addon/index.js
index 0710b0b0378..751b790d29a 100644
--- a/blueprints/component-class-addon/index.js
+++ b/blueprints/component-class-addon/index.js
@@ -4,12 +4,18 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = {
   description: 'Generates a component class.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __path__: function (options) {
diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
index ec9d605ebe8..25db13861e2 100644
--- a/blueprints/component-class/index.js
+++ b/blueprints/component-class/index.js
@@ -8,6 +8,7 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
 const { has } = require('@ember/edition-utils');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const OCTANE = has('octane');
 
@@ -49,6 +50,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js
index 8490230a349..70dae927c56 100644
--- a/blueprints/component-test/index.js
+++ b/blueprints/component-test/index.js
@@ -5,6 +5,7 @@ const stringUtil = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const getPathOption = require('ember-cli-get-component-path-option');
 const semver = require('semver');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -18,6 +19,11 @@ module.exports = useTestFrameworkDetector({
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   availableOptions: [
     {
       name: 'test-type',
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index f1a1c769eac..9d021a4e815 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -9,6 +9,7 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
 const { has } = require('@ember/edition-utils');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const OCTANE = has('octane');
 
@@ -53,6 +54,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js
index 17d09b83d0e..e5dd1c14ac3 100644
--- a/blueprints/controller-test/index.js
+++ b/blueprints/controller-test/index.js
@@ -4,12 +4,18 @@ const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   locals: function (options) {
     let dasherizedModuleName = stringUtil.dasherize(options.entity.name);
     let controllerPathName = dasherizedModuleName;
diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
index d4e7e31b3ae..87802832a14 100644
--- a/blueprints/controller/index.js
+++ b/blueprints/controller/index.js
@@ -1,10 +1,17 @@
 'use strict';
 
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
 module.exports = {
   description: 'Generates a controller.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index d7244cefc4d..031f8a2035e 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -3,6 +3,7 @@
 const stringUtils = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -11,6 +12,11 @@ module.exports = useTestFrameworkDetector({
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __root__() {
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
index 20ee589108d..0ff754e8000 100644
--- a/blueprints/helper/index.js
+++ b/blueprints/helper/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const path = require('path');
 
@@ -9,6 +10,11 @@ module.exports = {
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   filesPath() {
     let rootPath = 'files';
     return path.join(this.path, rootPath);
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index 850aa4db71a..6376c587df6 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -11,6 +12,11 @@ module.exports = useTestFrameworkDetector({
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __root__() {
diff --git a/blueprints/initializer/index.js b/blueprints/initializer/index.js
index 3101e9bbbec..35f0d1df482 100644
--- a/blueprints/initializer/index.js
+++ b/blueprints/initializer/index.js
@@ -1,7 +1,13 @@
 'use strict';
 
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 module.exports = {
   description: 'Generates an initializer.',
 
   shouldTransformTypeScript: true,
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
 };
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index 3dd06994708..03133eff9a5 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -3,6 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -11,6 +12,11 @@ module.exports = useTestFrameworkDetector({
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __root__() {
diff --git a/blueprints/instance-initializer/index.js b/blueprints/instance-initializer/index.js
index 5879ba7ed1f..5536937f610 100644
--- a/blueprints/instance-initializer/index.js
+++ b/blueprints/instance-initializer/index.js
@@ -1,7 +1,14 @@
 'use strict';
 
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
 module.exports = {
   shouldTransformTypeScript: true,
 
   description: 'Generates an instance initializer.',
+
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
 };
diff --git a/blueprints/route-addon/index.js b/blueprints/route-addon/index.js
index 1ea46805458..befcdca0db9 100644
--- a/blueprints/route-addon/index.js
+++ b/blueprints/route-addon/index.js
@@ -3,12 +3,18 @@
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const inflector = require('inflection');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = {
   description: 'Generates import wrappers for a route and its template.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __templatepath__: function (options) {
diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js
index 6de68a7b3bd..eab3026acd9 100644
--- a/blueprints/route-test/index.js
+++ b/blueprints/route-test/index.js
@@ -3,12 +3,18 @@
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   availableOptions: [
     {
       name: 'reset-namespace',
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index b6b3c56e148..46c8ed353a4 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -5,6 +5,7 @@ const path = require('path');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = {
   description: 'Generates a route and a template, and registers the route with the router.',
@@ -28,6 +29,11 @@ module.exports = {
     },
   ],
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens: function () {
     return {
       __name__(options) {
diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.js
index 9ca68da4d67..dca9d6370e2 100644
--- a/blueprints/service-test/index.js
+++ b/blueprints/service-test/index.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -7,6 +9,11 @@ module.exports = useTestFrameworkDetector({
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens() {
     return {
       __root__() {
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index 9a83db1d7d9..056c2ae797e 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -1,10 +1,17 @@
 'use strict';
 
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
 module.exports = {
   description: 'Generates a service.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
index 8b75121e16c..71d1a7255f2 100644
--- a/blueprints/util-test/index.js
+++ b/blueprints/util-test/index.js
@@ -2,6 +2,7 @@
 
 const stringUtils = require('ember-cli-string-utils');
 const path = require('path');
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -10,6 +11,11 @@ module.exports = useTestFrameworkDetector({
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   fileMapTokens() {
     return {
       __root__() {
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
index 31eda3a9ba8..0e327fdcfbf 100644
--- a/blueprints/util/index.js
+++ b/blueprints/util/index.js
@@ -1,10 +1,17 @@
 'use strict';
 
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
 module.exports = {
   description: 'Generates a simple utility module/function.',
 
   shouldTransformTypeScript: true,
 
+  init() {
+    this._super && this._super.init.apply(this, arguments);
+    typescriptBlueprintPolyfill(this);
+  },
+
   normalizeEntityName: function (entityName) {
     return entityName.replace(/\.js$/, ''); //Prevent generation of ".js.js" files
   },
diff --git a/package.json b/package.json
index ccb668fdaf2..03cb0934048 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,9 @@
   "name": "ember-source",
   "version": "4.4.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
-  "keywords": ["ember-addon"],
+  "keywords": [
+    "ember-addon"
+  ],
   "homepage": "https://emberjs.com/",
   "bugs": {
     "url": "https://github.com/emberjs/ember.js/issues"
@@ -64,6 +66,7 @@
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-path-utils": "^1.0.0",
     "ember-cli-string-utils": "^1.1.0",
+    "ember-cli-typescript-blueprint-polyfill": "^0.1.0",
     "ember-cli-version-checker": "^5.1.2",
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.13.2",
diff --git a/yarn.lock b/yarn.lock
index b33b1d5ff97..01a0dc97d81 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23"
+  integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.0"
+
 "@ampproject/remapping@^2.1.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
@@ -9,13 +16,25 @@
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
+  dependencies:
+    "@babel/highlight" "^7.14.5"
+
+"@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
     "@babel/highlight" "^7.16.7"
 
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.15.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
+  integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
@@ -42,6 +61,27 @@
     json5 "^2.1.2"
     semver "^6.3.0"
 
+"@babel/core@^7.16.10":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337"
+  integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw==
+  dependencies:
+    "@ampproject/remapping" "^2.0.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.0"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.0"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.0"
+    "@babel/types" "^7.17.0"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+
 "@babel/generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
@@ -51,6 +91,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
+  integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
+  dependencies:
+    "@babel/types" "^7.17.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
 "@babel/generator@^7.17.3":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
@@ -60,6 +109,23 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.9.0":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
+  integrity sha512-onl4Oy46oGCzymOXtKMQpI7VXtCbTSHK1kqBydZ6AmzuNcacEVqGk9tZtAS+48IA9IstZcDCgIg8hQKnb7suRw==
+  dependencies:
+    "@babel/types" "^7.9.0"
+    jsesc "^2.5.1"
+    lodash "^4.17.13"
+    source-map "^0.5.0"
+
+"@babel/helper-annotate-as-pure@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
+  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -75,7 +141,27 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
+"@babel/helper-compilation-targets@^7.12.0":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
+  dependencies:
+    "@babel/compat-data" "^7.12.5"
+    "@babel/helper-validator-option" "^7.12.1"
+    browserslist "^4.14.5"
+    semver "^5.5.0"
+
+"@babel/helper-compilation-targets@^7.13.0":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
+  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
+  dependencies:
+    "@babel/compat-data" "^7.15.0"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
+    semver "^6.3.0"
+
+"@babel/helper-compilation-targets@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
   integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
@@ -85,7 +171,19 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.15.4", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
+"@babel/helper-create-class-features-plugin@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
+  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.15.4"
+    "@babel/helper-function-name" "^7.15.4"
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/helper-replace-supers" "^7.15.4"
+    "@babel/helper-split-export-declaration" "^7.15.4"
+
+"@babel/helper-create-class-features-plugin@^7.16.10":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
   integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
@@ -98,6 +196,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.16.7":
+  version "7.17.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21"
+  integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-member-expression-to-functions" "^7.16.7"
+    "@babel/helper-optimise-call-expression" "^7.16.7"
+    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+
 "@babel/helper-create-class-features-plugin@^7.17.1":
   version "7.17.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
@@ -161,7 +272,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.16.7":
+"@babel/helper-function-name@^7.15.4", "@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
   integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
@@ -184,6 +295,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-member-expression-to-functions@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
+  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
+  dependencies:
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-member-expression-to-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
@@ -212,14 +330,19 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
+"@babel/helper-optimise-call-expression@^7.15.4", "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
   integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-plugin-utils@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
@@ -233,6 +356,16 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
+"@babel/helper-replace-supers@^7.15.4":
+  version "7.15.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
+  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.15.4"
+    "@babel/helper-optimise-call-expression" "^7.15.4"
+    "@babel/traverse" "^7.15.4"
+    "@babel/types" "^7.15.4"
+
 "@babel/helper-replace-supers@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
@@ -258,19 +391,19 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-split-export-declaration@^7.16.7":
+"@babel/helper-split-export-declaration@^7.15.4", "@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
   integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-validator-identifier@^7.16.7":
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helper-validator-option@^7.16.7":
+"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
@@ -294,6 +427,15 @@
     "@babel/traverse" "^7.17.0"
     "@babel/types" "^7.17.0"
 
+"@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/highlight@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
@@ -303,16 +445,26 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.7", "@babel/parser@^7.4.5":
+"@babel/parser@^7.16.10", "@babel/parser@^7.16.7":
   version "7.16.12"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
   integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
 
+"@babel/parser@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
+  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
+
 "@babel/parser@^7.17.3":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
   integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
 
+"@babel/parser@^7.4.5", "@babel/parser@^7.9.0":
+  version "7.9.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
+  integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -331,12 +483,8 @@
 
 "@babel/plugin-proposal-async-generator-functions@^7.16.8":
   version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
+  integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
 
 "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
@@ -489,7 +637,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.17.0":
+"@babel/plugin-syntax-decorators@^7.16.7", "@babel/plugin-syntax-decorators@^7.17.0":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
   integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
@@ -580,6 +728,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
+"@babel/plugin-syntax-typescript@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
+  integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.16.7"
+
 "@babel/plugin-transform-arrow-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
@@ -836,6 +991,15 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-typescript" "^7.14.5"
 
+"@babel/plugin-transform-typescript@^7.16.8":
+  version "7.16.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0"
+  integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/plugin-syntax-typescript" "^7.16.7"
+
 "@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
@@ -973,7 +1137,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8":
   version "7.16.10"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
   integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
@@ -989,7 +1153,23 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+"@babel/traverse@^7.15.4", "@babel/traverse@^7.17.0":
+  version "7.17.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
+  integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.0"
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-function-name" "^7.16.7"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.17.0"
+    "@babel/types" "^7.17.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/traverse@^7.17.3":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
   integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
@@ -1005,7 +1185,30 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
+"@babel/traverse@^7.4.5":
+  version "7.9.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
+  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
+  dependencies:
+    "@babel/code-frame" "^7.8.3"
+    "@babel/generator" "^7.9.0"
+    "@babel/helper-function-name" "^7.8.3"
+    "@babel/helper-split-export-declaration" "^7.8.3"
+    "@babel/parser" "^7.9.0"
+    "@babel/types" "^7.9.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.13"
+
+"@babel/types@^7.15.4", "@babel/types@^7.16.7", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.9.0":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
+  integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
+"@babel/types@^7.16.0", "@babel/types@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
   integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
@@ -1321,14 +1524,14 @@
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
+  integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+  version "1.4.10"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
+  integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
 
 "@jridgewell/trace-mapping@^0.3.0":
   version "0.3.4"
@@ -2946,7 +3149,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA= sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
 
-browserslist@^4.17.5, browserslist@^4.19.1:
+browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1:
   version "4.19.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
   integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
@@ -4096,6 +4299,14 @@ ember-cli-string-utils@^1.1.0:
   resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1"
   integrity sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=
 
+ember-cli-typescript-blueprint-polyfill@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript-blueprint-polyfill/-/ember-cli-typescript-blueprint-polyfill-0.1.0.tgz#5917646a996b452a3a6b3f306ab2a27e93ea2cc2"
+  integrity sha512-g0weUTOnHmPGqVZzkQTl3Nbk9fzEdFkEXydCs5mT1qBjXh8eQ6VlmjjGD5/998UXKuA0pLSCVVMbSp/linLzGA==
+  dependencies:
+    chalk "^4.0.0"
+    remove-types "^1.0.0"
+
 ember-cli-version-checker@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7"
@@ -7111,7 +7322,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8265,6 +8476,11 @@ prettier@^2.1.2:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
   integrity "sha1-MFBwDa4uTItnxMP2Zs24r0BeHOU= sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="
 
+prettier@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
+  integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
+
 pretty-ms@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881"
@@ -8562,17 +8778,17 @@ redeyed@~1.0.0:
   dependencies:
     esprima "~3.0.0"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
+  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
   dependencies:
-    regenerate "^1.4.0"
+    regenerate "^1.4.2"
 
-regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+regenerate@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -8614,16 +8830,16 @@ regexpp@^3.0.0, regexpp@^3.2.0:
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
+  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^9.0.0"
+    regjsgen "^0.5.2"
+    regjsparser "^0.7.0"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.0.0"
 
 registry-auth-token@^4.0.0:
   version "4.2.1"
@@ -8639,15 +8855,15 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-regjsgen@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c"
-  integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==
+regjsgen@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
+  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
-regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+regjsparser@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
+  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -8656,6 +8872,16 @@ remove-trailing-separator@^1.0.1:
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity "sha1-wkvOKig62tW8P1jg1IJJuSN52O8= sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="
 
+remove-types@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/remove-types/-/remove-types-1.0.0.tgz#491119e8fce23f2f961fe2254e5a119a017d9a3d"
+  integrity sha512-G7Hk1Q+UJ5DvlNAoJZObxANkBZGiGdp589rVcTW/tYqJWJ5rwfraSnKSQaETN8Epaytw8J40nS/zC7bcHGv36w==
+  dependencies:
+    "@babel/core" "^7.16.10"
+    "@babel/plugin-syntax-decorators" "^7.16.7"
+    "@babel/plugin-transform-typescript" "^7.16.8"
+    prettier "^2.5.1"
+
 repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
@@ -10105,28 +10331,28 @@ underscore@>=1.8.3:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
   integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
-  integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
 union-value@^1.0.0:
   version "1.0.0"

From a8d1dc6a7ba850c54b0c8e60503e50fed6c6ce02 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Thu, 10 Feb 2022 14:38:11 -0700
Subject: [PATCH 0941/1405] tell eslint to ignore ts blueprint files

---
 .eslintignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.eslintignore b/.eslintignore
index a9f8b499220..ac0ac43d3a5 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 blueprints/*/*files/**/*.js
+blueprints/*/*files/**/*.ts
 node-tests/fixtures/**/*.js
 /docs/
 dist/

From 30fc38bbcb619f86fbb9281bc2efcf02355d12f1 Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Tue, 15 Feb 2022 11:37:55 -0700
Subject: [PATCH 0942/1405] feature flag typescript blueprint functionality

---
 .eslintignore                                 |  1 +
 .eslintrc.js                                  |  1 +
 blueprints-js/-addon-import.js                | 48 +++++++++++++++
 .../tests/acceptance/__name__-test.js         | 24 ++++++++
 .../tests/acceptance/__name__-test.js         | 13 ++++
 .../tests/acceptance/__name__-test.js         | 12 ++++
 .../tests/acceptance/__name__-test.js         | 13 ++++
 .../files/__root__/__path__/__name__.js       |  1 +
 .../files/__root__/__path__/__name__.js       |  1 +
 .../files/__root__/__path__/__name__.js       |  3 +
 .../__testType__/__path__/__test__.js         | 34 +++++++++++
 .../__testType__/__path__/__test__.js         | 36 +++++++++++
 .../__testType__/__path__/__test__.js         | 38 ++++++++++++
 .../__testType__/__path__/__test__.js         | 31 ++++++++++
 .../__testType__/__path__/__test__.js         | 36 +++++++++++
 .../files/__root__/__path__/__name__.js       |  3 +
 .../__templatepath__/__templatename__.hbs     |  1 +
 .../__testType__/__path__/__test__.js         | 16 +++++
 .../__testType__/__path__/__test__.js         | 18 ++++++
 .../__testType__/__path__/__test__.js         | 13 ++++
 .../__testType__/__path__/__test__.js         | 12 ++++
 .../__testType__/__path__/__test__.js         | 12 ++++
 .../files/__root__/__path__/__name__.js       |  3 +
 .../files/__root__/__path__/__name__.js       |  1 +
 .../__collection__/__name__-test.js           | 26 ++++++++
 .../__collection__/__name__-test.js           | 28 +++++++++
 .../__collection__/__name__-test.js           | 18 ++++++
 .../__collection__/__name__-test.js           | 15 +++++
 .../__collection__/__name__-test.js           | 17 ++++++
 .../files/__root__/__collection__/__name__.js |  5 ++
 .../__root__/__collection__/__name__.js       |  7 +++
 .../files/__root__/__path__/__name__.js       |  1 +
 .../__testType__/__path__/__name__-test.js    | 28 +++++++++
 .../__testType__/__path__/__name__-test.js    | 31 ++++++++++
 .../__testType__/__path__/__name__-test.js    | 25 ++++++++
 .../__testType__/__path__/__name__-test.js    | 37 ++++++++++++
 .../files/__root__/initializers/__name__.js   |  5 ++
 .../files/__root__/__path__/__name__.js       |  1 +
 .../__testType__/__path__/__name__-test.js    | 30 ++++++++++
 .../__testType__/__path__/__name__-test.js    | 32 ++++++++++
 .../__testType__/__path__/__name__-test.js    | 26 ++++++++
 .../__testType__/__path__/__name__-test.js    | 39 ++++++++++++
 .../instance-initializers/__name__.js         |  5 ++
 .../__root__/__testType__/__name__-test.js    | 13 ++++
 .../__root__/__testType__/__name__-test.js    | 13 ++++
 .../__root__/__testType__/__name__-test.js    | 12 ++++
 .../__root__/__testType__/__name__-test.js    | 12 ++++
 .../mixin/files/__root__/mixins/__name__.js   |  3 +
 .../files/__root__/__path__/__name__.js       |  1 +
 .../__templatepath__/__templatename__.js      |  1 +
 .../__testType__/__path__/__test__.js         | 15 +++++
 .../__testType__/__path__/__test__.js         | 17 ++++++
 .../__testType__/__path__/__test__.js         | 12 ++++
 .../__testType__/__path__/__test__.js         | 11 ++++
 .../__testType__/__path__/__test__.js         | 11 ++++
 .../route/files/__root__/__path__/__name__.js |  9 +++
 .../__templatepath__/__templatename__.hbs     |  2 +
 .../__testType__/__path__/__test__.js         | 16 +++++
 .../__testType__/__path__/__test__.js         | 18 ++++++
 .../__testType__/__path__/__test__.js         | 13 ++++
 .../__testType__/__path__/__test__.js         | 12 ++++
 .../__testType__/__path__/__test__.js         | 12 ++++
 .../files/__root__/__path__/__name__.js       |  3 +
 .../files/__root__/__path__/__name__.hbs      |  0
 blueprints-js/test-framework-detector.js      | 60 +++++++++++++++++++
 .../__root__/__testType__/__name__-test.js    | 11 ++++
 .../__root__/__testType__/__name__-test.js    | 11 ++++
 .../__root__/__testType__/__name__-test.js    | 10 ++++
 .../__root__/__testType__/__name__-test.js    | 10 ++++
 .../util/files/__root__/utils/__name__.js     |  3 +
 blueprints/-addon-import.js                   |  5 +-
 .../-maybe-polyfill-typescript-blueprints.js  | 17 ++++++
 blueprints/acceptance-test/index.js           |  4 +-
 blueprints/component-addon/index.js           |  5 +-
 blueprints/component-class-addon/index.js     |  5 +-
 blueprints/component-class/index.js           |  5 +-
 blueprints/component-test/index.js            |  4 +-
 blueprints/component/index.js                 |  5 +-
 blueprints/controller-test/index.js           |  5 +-
 blueprints/controller/index.js                |  4 +-
 blueprints/helper-test/index.js               |  5 +-
 blueprints/helper/index.js                    |  5 +-
 blueprints/initializer-test/index.js          |  4 +-
 blueprints/initializer/index.js               |  5 +-
 blueprints/instance-initializer-test/index.js |  4 +-
 .../instance-initializers/__name__.ts         |  2 +-
 blueprints/instance-initializer/index.js      |  4 +-
 blueprints/route-addon/index.js               |  5 +-
 blueprints/route-test/index.js                |  5 +-
 blueprints/route/index.js                     |  5 +-
 blueprints/service-test/index.js              |  5 +-
 blueprints/service/index.js                   |  4 +-
 blueprints/util-test/index.js                 |  4 +-
 blueprints/util/index.js                      |  4 +-
 .../instance-initializer-nested.js            |  2 +-
 .../instance-initializer.js                   |  2 +-
 package.json                                  |  4 +-
 97 files changed, 1137 insertions(+), 49 deletions(-)
 create mode 100644 blueprints-js/-addon-import.js
 create mode 100644 blueprints-js/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
 create mode 100644 blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
 create mode 100644 blueprints-js/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
 create mode 100644 blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
 create mode 100644 blueprints-js/component-addon/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/component-class-addon/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/component-class/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/component-test/mocha-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/component/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/component/files/__root__/__templatepath__/__templatename__.hbs
 create mode 100644 blueprints-js/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/controller/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/helper-addon/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
 create mode 100644 blueprints-js/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
 create mode 100644 blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
 create mode 100644 blueprints-js/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
 create mode 100644 blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
 create mode 100644 blueprints-js/helper/files/__root__/__collection__/__name__.js
 create mode 100644 blueprints-js/helper/mu-files/__root__/__collection__/__name__.js
 create mode 100644 blueprints-js/initializer-addon/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/initializer/files/__root__/initializers/__name__.js
 create mode 100644 blueprints-js/instance-initializer-addon/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
 create mode 100644 blueprints-js/instance-initializer/files/__root__/instance-initializers/__name__.js
 create mode 100644 blueprints-js/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/mixin/files/__root__/mixins/__name__.js
 create mode 100644 blueprints-js/route-addon/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/route-addon/files/__root__/__templatepath__/__templatename__.js
 create mode 100644 blueprints-js/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/route-test/mocha-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/route-test/qunit-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/route/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/route/files/__root__/__templatepath__/__templatename__.hbs
 create mode 100644 blueprints-js/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
 create mode 100644 blueprints-js/service/files/__root__/__path__/__name__.js
 create mode 100644 blueprints-js/template/files/__root__/__path__/__name__.hbs
 create mode 100644 blueprints-js/test-framework-detector.js
 create mode 100644 blueprints-js/util-test/mocha-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
 create mode 100644 blueprints-js/util/files/__root__/utils/__name__.js
 create mode 100644 blueprints/-maybe-polyfill-typescript-blueprints.js

diff --git a/.eslintignore b/.eslintignore
index ac0ac43d3a5..96eab461a6a 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,4 +1,5 @@
 blueprints/*/*files/**/*.js
+blueprints-js/*/*files/**/*.js
 blueprints/*/*files/**/*.ts
 node-tests/fixtures/**/*.js
 /docs/
diff --git a/.eslintrc.js b/.eslintrc.js
index 65492b31732..fe4278a1baa 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -126,6 +126,7 @@ module.exports = {
         'node-tests/**/*.js',
         'tests/node/**/*.js',
         'blueprints/**/*.js',
+        'blueprints-js/**/*.js',
         'bin/**/*.js',
         'tests/docs/*.js',
         'config/**/*.js',
diff --git a/blueprints-js/-addon-import.js b/blueprints-js/-addon-import.js
new file mode 100644
index 00000000000..27cf4f7f6fa
--- /dev/null
+++ b/blueprints-js/-addon-import.js
@@ -0,0 +1,48 @@
+'use strict';
+
+const stringUtil = require('ember-cli-string-utils');
+const path = require('path');
+const inflector = require('inflection');
+
+module.exports = {
+  description: 'Generates an import wrapper.',
+
+  fileMapTokens: function () {
+    return {
+      __name__: function (options) {
+        return options.dasherizedModuleName;
+      },
+      __path__: function (options) {
+        return inflector.pluralize(options.locals.blueprintName);
+      },
+      __root__: function (options) {
+        if (options.inRepoAddon) {
+          return path.join('lib', options.inRepoAddon, 'app');
+        }
+        return 'app';
+      },
+    };
+  },
+
+  locals: function (options) {
+    let addonRawName = options.inRepoAddon ? options.inRepoAddon : options.project.name();
+    let addonName = stringUtil.dasherize(addonRawName);
+    let fileName = stringUtil.dasherize(options.entity.name);
+    let blueprintName = options.originBlueprintName;
+    let modulePathSegments = [
+      addonName,
+      inflector.pluralize(options.originBlueprintName),
+      fileName,
+    ];
+
+    if (blueprintName.match(/-addon/)) {
+      blueprintName = blueprintName.substr(0, blueprintName.indexOf('-addon'));
+      modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
+    }
+
+    return {
+      modulePath: modulePathSegments.join('/'),
+      blueprintName: blueprintName,
+    };
+  },
+};
diff --git a/blueprints-js/acceptance-test/mocha-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
new file mode 100644
index 00000000000..b6038d964c8
--- /dev/null
+++ b/blueprints-js/acceptance-test/mocha-files/tests/acceptance/__name__-test.js
@@ -0,0 +1,24 @@
+import { describe, it, beforeEach, afterEach } from 'mocha';
+import { expect } from 'chai';
+import startApp from '<%= dasherizedPackageName %>/tests/helpers/start-app';
+<% if (destroyAppExists) { %>import destroyApp from '<%= dasherizedPackageName %>/tests/helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+
+describe('<%= friendlyTestName %>', function () {
+  let application;
+
+  beforeEach(function () {
+    application = startApp();
+  });
+
+  afterEach(function () {
+    <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
+  });
+
+  it('can visit /<%= dasherizedModuleName %>', function () {
+    visit('/<%= dasherizedModuleName %>');
+
+    return andThen(() => {
+      expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
+    });
+  });
+});
diff --git a/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
new file mode 100644
index 00000000000..58566199373
--- /dev/null
+++ b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -0,0 +1,13 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import { setupApplicationTest } from 'ember-mocha';
+import { visit, currentURL } from '@ember/test-helpers';
+
+describe('<%= friendlyTestName %>', function () {
+  setupApplicationTest();
+
+  it('can visit /<%= dasherizedModuleName %>', async function () {
+    await visit('/<%= dasherizedModuleName %>');
+    expect(currentURL()).to.equal('/<%= dasherizedModuleName %>');
+  });
+});
diff --git a/blueprints-js/acceptance-test/qunit-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
new file mode 100644
index 00000000000..35b4c18f65b
--- /dev/null
+++ b/blueprints-js/acceptance-test/qunit-files/tests/acceptance/__name__-test.js
@@ -0,0 +1,12 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '<%= testFolderRoot %>/tests/helpers/module-for-acceptance';
+
+moduleForAcceptance('<%= friendlyTestName %>');
+
+test('visiting /<%= dasherizedModuleName %>', function (assert) {
+  visit('/<%= dasherizedModuleName %>');
+
+  andThen(function () {
+    assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
+  });
+});
diff --git a/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
new file mode 100644
index 00000000000..b8215b2e711
--- /dev/null
+++ b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { visit, currentURL } from '@ember/test-helpers';
+import { setupApplicationTest } from 'ember-qunit';
+
+module('<%= friendlyTestName %>', function (hooks) {
+  setupApplicationTest(hooks);
+
+  test('visiting /<%= dasherizedModuleName %>', async function (assert) {
+    await visit('/<%= dasherizedModuleName %>');
+
+    assert.strictEqual(currentURL(), '/<%= dasherizedModuleName %>');
+  });
+});
diff --git a/blueprints-js/component-addon/files/__root__/__path__/__name__.js b/blueprints-js/component-addon/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..71a8b71c1c6
--- /dev/null
+++ b/blueprints-js/component-addon/files/__root__/__path__/__name__.js
@@ -0,0 +1 @@
+export { default } from '<%= modulePath %>';
\ No newline at end of file
diff --git a/blueprints-js/component-class-addon/files/__root__/__path__/__name__.js b/blueprints-js/component-class-addon/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..71a8b71c1c6
--- /dev/null
+++ b/blueprints-js/component-class-addon/files/__root__/__path__/__name__.js
@@ -0,0 +1 @@
+export { default } from '<%= modulePath %>';
\ No newline at end of file
diff --git a/blueprints-js/component-class/files/__root__/__path__/__name__.js b/blueprints-js/component-class/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..777e6155290
--- /dev/null
+++ b/blueprints-js/component-class/files/__root__/__path__/__name__.js
@@ -0,0 +1,3 @@
+<%= importComponent %>
+<%= importTemplate %>
+export default <%= defaultExport %>
diff --git a/blueprints-js/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..f73315461e6
--- /dev/null
+++ b/blueprints-js/component-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,34 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupComponentTest('<%= componentPathName %>', {
+    <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+    // needs: ['component:foo', 'helper:bar'],
+    unit: true,<% } %>
+  });
+
+  it('renders', function () {
+    <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.on('myAction', function(val) { ... });
+
+    this.render(hbs`<%= selfCloseComponent(componentName) %>`);
+    expect(this.$()).to.have.length(1);
+
+    // Template block usage:
+    this.render(hbs`
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
+
+    expect(this.$().text().trim()).to.equal('template block text');<% } else if(testType === 'unit') { %>// creates the component instance
+    let component = this.subject();
+    // renders the component on the page
+    this.render();
+    expect(component).to.be.ok;
+    expect(this.$()).to.have.length(1);<% } %>
+  });
+});
diff --git a/blueprints-js/component-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/mocha-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..765ad7f3310
--- /dev/null
+++ b/blueprints-js/component-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,36 @@
+import { expect } from 'chai';
+import { describeComponent, it } from 'ember-mocha';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+describeComponent(
+  '<%= componentPathName %>',
+  '<%= friendlyTestDescription %>',
+  {
+    <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+    // needs: ['component:foo', 'helper:bar'],
+    unit: true,<% } %>
+  },
+  function () {
+    it('renders', function () {
+      <% if (testType === 'integration' ) { %>// Set any properties with this.set('myProperty', 'value');
+      // Handle any actions with this.on('myAction', function(val) { ... });
+
+      this.render(hbs`<%= selfCloseComponent(componentName) %>`);
+      expect(this.$()).to.have.length(1);
+
+      // Template block usage:
+      this.render(hbs`
+        <%= openComponent(componentName) %>
+          template block text
+        <%= closeComponent(componentName) %>
+      `);
+
+      expect(this.$().text().trim()).to.equal('template block text');<% } else if(testType === 'unit') { %>// creates the component instance
+      let component = this.subject();
+      // renders the component on the page
+      this.render();
+      expect(component).to.be.ok;
+      expect(this.$()).to.have.length(1);<% } %>
+    });
+  }
+);
diff --git a/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..cded3089872
--- /dev/null
+++ b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,38 @@
+<% if (testType === 'integration') { %>import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupRenderingTest } from 'ember-mocha';
+import { render } from '@ember/test-helpers';
+<%= hbsImportStatement %>
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupRenderingTest();
+
+  it('renders', async function () {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<%= selfCloseComponent(componentName) %>`);
+
+    expect(this.element.textContent.trim()).to.equal('');
+
+    // Template block usage:
+    await render(hbs`
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
+
+    expect(this.element.textContent.trim()).to.equal('template block text');
+  });
+});<% } else if (testType === 'unit') { %>import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest();
+
+  it('exists', function () {
+    let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
+    expect(component).to.be.ok;
+  });
+});<% } %>
diff --git a/blueprints-js/component-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..29c6b4e042b
--- /dev/null
+++ b/blueprints-js/component-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,31 @@
+import { moduleForComponent, test } from 'ember-qunit';<% if (testType === 'integration') { %>
+import hbs from 'htmlbars-inline-precompile';<% } %>
+
+moduleForComponent('<%= componentPathName %>', '<%= friendlyTestDescription %>', {
+  <% if (testType === 'integration' ) { %>integration: true,<% } else if(testType === 'unit') { %>// Specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar'],
+  unit: true,<% } %>
+});
+
+test('it renders', function (assert) {<% if (testType === 'integration' ) { %>
+  // Set any properties with this.set('myProperty', 'value');
+  // Handle any actions with this.on('myAction', function(val) { ... });
+
+  this.render(hbs`<%= selfCloseComponent(componentName) %>`);
+
+  assert.strictEqual(this.$().text().trim(), '');
+
+  // Template block usage:
+  this.render(hbs`
+    <%= openComponent(componentName) %>
+      template block text
+    <%= closeComponent(componentName) %>
+  `);
+
+  assert.strictEqual(this.$().text().trim(), 'template block text');<% } else if(testType === 'unit') { %>
+  // Creates the component instance
+  /*let component =*/ this.subject();
+  // Renders the component to the page
+  this.render();
+  assert.strictEqual(this.$().text().trim(), '');<% } %>
+});
diff --git a/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..999fd69cd9f
--- /dev/null
+++ b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,36 @@
+<% if (testType === 'integration') { %>import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+<%= hbsImportStatement %>
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<%= selfCloseComponent(componentName) %>`);
+
+    assert.dom(this.element).hasText('');
+
+    // Template block usage:
+    await render(hbs`
+      <%= openComponent(componentName) %>
+        template block text
+      <%= closeComponent(componentName) %>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let component = this.owner.factoryFor('component:<%= componentPathName %>').create();
+    assert.ok(component);
+  });
+});<% } %>
diff --git a/blueprints-js/component/files/__root__/__path__/__name__.js b/blueprints-js/component/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..777e6155290
--- /dev/null
+++ b/blueprints-js/component/files/__root__/__path__/__name__.js
@@ -0,0 +1,3 @@
+<%= importComponent %>
+<%= importTemplate %>
+export default <%= defaultExport %>
diff --git a/blueprints-js/component/files/__root__/__templatepath__/__templatename__.hbs b/blueprints-js/component/files/__root__/__templatepath__/__templatename__.hbs
new file mode 100644
index 00000000000..fb5c4b157d1
--- /dev/null
+++ b/blueprints-js/component/files/__root__/__templatepath__/__templatename__.hbs
@@ -0,0 +1 @@
+{{yield}}
\ No newline at end of file
diff --git a/blueprints-js/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..28c0896cd35
--- /dev/null
+++ b/blueprints-js/controller-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,16 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest('controller:<%= dasherizedModuleName %>', {
+    // Specify the other units that are required for this test.
+    // needs: ['controller:foo']
+  });
+
+  // TODO: Replace this with your real tests.
+  it('exists', function () {
+    let controller = this.subject();
+    expect(controller).to.be.ok;
+  });
+});
diff --git a/blueprints-js/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..b2a49c7728d
--- /dev/null
+++ b/blueprints-js/controller-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import { describeModule, it } from 'ember-mocha';
+
+describeModule(
+  'controller:<%= dasherizedModuleName %>',
+  '<%= friendlyTestDescription %>',
+  {
+    // Specify the other units that are required for this test.
+    // needs: ['controller:foo']
+  },
+  function () {
+    // TODO: Replace this with your real tests.
+    it('exists', function () {
+      let controller = this.subject();
+      expect(controller).to.be.ok;
+    });
+  }
+);
diff --git a/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..39f3d69f5cc
--- /dev/null
+++ b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest();
+
+  // TODO: Replace this with your real tests.
+  it('exists', function () {
+    let controller = this.owner.lookup('controller:<%= controllerPathName %>');
+    expect(controller).to.be.ok;
+  });
+});
diff --git a/blueprints-js/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..8d274ae5f3b
--- /dev/null
+++ b/blueprints-js/controller-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,12 @@
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('controller:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>', {
+  // Specify the other units that are required for this test.
+  // needs: ['controller:foo']
+});
+
+// TODO: Replace this with your real tests.
+test('it exists', function (assert) {
+  let controller = this.subject();
+  assert.ok(controller);
+});
diff --git a/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..2bd2b5fb853
--- /dev/null
+++ b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let controller = this.owner.lookup('controller:<%= controllerPathName %>');
+    assert.ok(controller);
+  });
+});
diff --git a/blueprints-js/controller/files/__root__/__path__/__name__.js b/blueprints-js/controller/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..dcfbd50a6dc
--- /dev/null
+++ b/blueprints-js/controller/files/__root__/__path__/__name__.js
@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class <%= classifiedModuleName %>Controller extends Controller {}
diff --git a/blueprints-js/helper-addon/files/__root__/__path__/__name__.js b/blueprints-js/helper-addon/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..83aac86a6a1
--- /dev/null
+++ b/blueprints-js/helper-addon/files/__root__/__path__/__name__.js
@@ -0,0 +1 @@
+export { default } from '<%= modulePath %>';
diff --git a/blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
new file mode 100644
index 00000000000..cdb02d28391
--- /dev/null
+++ b/blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
@@ -0,0 +1,26 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupComponentTest } from 'ember-mocha';
+import hbs from 'htmlbars-inline-precompile';
+
+describe('<%= friendlyTestName %>', function () {
+  setupComponentTest('<%= dasherizedModuleName %>', {
+    integration: true,
+  });
+
+  it('renders', function () {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.on('myAction', function(val) { ... });
+    // Template block usage:
+    // this.render(hbs`
+    //   {{#<%= dasherizedModuleName %>}}
+    //     template content
+    //   {{/<%= dasherizedModuleName %>}}
+    // `);
+    this.set('inputValue', '1234');
+
+    this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
+
+    expect(this.$().text().trim()).to.equal('1234');
+  });
+});
diff --git a/blueprints-js/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
new file mode 100644
index 00000000000..843e9b35bcf
--- /dev/null
+++ b/blueprints-js/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
@@ -0,0 +1,28 @@
+import { expect } from 'chai';
+import { describeComponent, it } from 'ember-mocha';
+import hbs from 'htmlbars-inline-precompile';
+
+describeComponent(
+  '<%= dasherizedModuleName %>',
+  'helper:<%= dasherizedModuleName %>',
+  {
+    integration: true,
+  },
+  function () {
+    it('renders', function () {
+      // Set any properties with this.set('myProperty', 'value');
+      // Handle any actions with this.on('myAction', function(val) { ... });
+      // Template block usage:
+      // this.render(hbs`
+      //   {{#<%= dasherizedModuleName %>}}
+      //     template content
+      //   {{/<%= dasherizedModuleName %>}}
+      // `);
+      this.set('inputValue', '1234');
+
+      this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
+
+      expect(this.$().text().trim()).to.equal('1234');
+    });
+  }
+);
diff --git a/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
new file mode 100644
index 00000000000..8eed95f4e7f
--- /dev/null
+++ b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupRenderingTest } from 'ember-mocha';
+import { render } from '@ember/test-helpers';
+<%= hbsImportStatement %>
+
+describe('<%= friendlyTestName %>', function () {
+  setupRenderingTest();
+
+  // TODO: Replace this with your real tests.
+  it('renders', async function () {
+    this.set('inputValue', '1234');
+
+    await render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
+
+    expect(this.element.textContent.trim()).to.equal('1234');
+  });
+});
diff --git a/blueprints-js/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
new file mode 100644
index 00000000000..45b8e177f2c
--- /dev/null
+++ b/blueprints-js/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
@@ -0,0 +1,15 @@
+import { moduleForComponent, test } from 'ember-qunit';
+import hbs from 'htmlbars-inline-precompile';
+
+moduleForComponent('<%= dasherizedModuleName %>', 'helper:<%= dasherizedModuleName %>', {
+  integration: true,
+});
+
+// TODO: Replace this with your real tests.
+test('it renders', function (assert) {
+  this.set('inputValue', '1234');
+
+  this.render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
+
+  assert.strictEqual(this.$().text().trim(), '1234');
+});
diff --git a/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
new file mode 100644
index 00000000000..69c96f7b230
--- /dev/null
+++ b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render } from '@ember/test-helpers';
+<%= hbsImportStatement %>
+
+module('<%= friendlyTestName %>', function (hooks) {
+  setupRenderingTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it renders', async function (assert) {
+    this.set('inputValue', '1234');
+
+    await render(hbs`{{<%= dasherizedModuleName %> this.inputValue}}`);
+
+    assert.dom(this.element).hasText('1234');
+  });
+});
diff --git a/blueprints-js/helper/files/__root__/__collection__/__name__.js b/blueprints-js/helper/files/__root__/__collection__/__name__.js
new file mode 100644
index 00000000000..786682850a6
--- /dev/null
+++ b/blueprints-js/helper/files/__root__/__collection__/__name__.js
@@ -0,0 +1,5 @@
+import { helper } from '@ember/component/helper';
+
+export default helper(function <%= camelizedModuleName %>(positional /*, named*/) {
+  return positional;
+});
diff --git a/blueprints-js/helper/mu-files/__root__/__collection__/__name__.js b/blueprints-js/helper/mu-files/__root__/__collection__/__name__.js
new file mode 100644
index 00000000000..d737dfc8868
--- /dev/null
+++ b/blueprints-js/helper/mu-files/__root__/__collection__/__name__.js
@@ -0,0 +1,7 @@
+import { helper as buildHelper } from '@ember/component/helper';
+
+export function <%= camelizedModuleName %>(positional /*, named*/) {
+  return positional;
+}
+
+export const helper = buildHelper(<%= camelizedModuleName %>);
diff --git a/blueprints-js/initializer-addon/files/__root__/__path__/__name__.js b/blueprints-js/initializer-addon/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..79e541af69d
--- /dev/null
+++ b/blueprints-js/initializer-addon/files/__root__/__path__/__name__.js
@@ -0,0 +1 @@
+export { default, initialize } from '<%= modulePath %>';
diff --git a/blueprints-js/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..5c3ed1a4a17
--- /dev/null
+++ b/blueprints-js/initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,28 @@
+import { expect } from 'chai';
+import { describe, it, beforeEach, afterEach } from 'mocha';
+import { run } from '@ember/runloop';
+import Application from '@ember/application';
+import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';\n<% } %>
+describe('<%= friendlyTestName %>', function () {
+  let application;
+
+  beforeEach(function () {
+    run(function () {
+      application = Application.create();
+      application.deferReadiness();
+    });
+  });
+
+  afterEach(function () {
+    <% if (destroyAppExists) { %>destroyApp(application);<% } else { %>run(application, 'destroy');<% } %>
+  });
+
+  // TODO: Replace this with your real tests.
+  it('works', function () {
+    initialize(application);
+
+    // you would normally confirm the results of the initializer here
+    expect(true).to.be.ok;
+  });
+});
diff --git a/blueprints-js/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..ea7700cbffd
--- /dev/null
+++ b/blueprints-js/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,31 @@
+import { expect } from 'chai';
+import { describe, it, beforeEach, afterEach } from 'mocha';
+import Application from '@ember/application';
+import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+
+describe('<%= friendlyTestName %>', function () {
+  beforeEach(function () {
+    this.TestApplication = Application.extend();
+    this.TestApplication.initializer({
+      name: 'initializer under test',
+      initialize,
+    });
+
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
+  });
+
+  afterEach(function () {
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+  });
+
+  // TODO: Replace this with your real tests.
+  it('works', async function () {
+    await this.application.boot();
+
+    // you would normally confirm the results of the initializer here
+    expect(true).to.be.ok;
+  });
+});
diff --git a/blueprints-js/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..4a3131618ea
--- /dev/null
+++ b/blueprints-js/initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,25 @@
+import Application from '@ember/application';
+import { run } from '@ember/runloop';
+
+import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';\n<% } %>
+module('<%= friendlyTestName %>', {
+  beforeEach() {
+    run(() => {
+      this.application = Application.create();
+      this.application.deferReadiness();
+    });
+  },
+  afterEach() {
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+  },
+});
+
+// TODO: Replace this with your real tests.
+test('it works', function (assert) {
+  initialize(this.application);
+
+  // you would normally confirm the results of the initializer here
+  assert.ok(true);
+});
diff --git a/blueprints-js/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..ba8829873f8
--- /dev/null
+++ b/blueprints-js/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,37 @@
+import Application from '@ember/application';
+
+import config from '<%= modulePrefix %>/config/environment';
+import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+
+module('<%= friendlyTestName %>', function (hooks) {
+  hooks.beforeEach(function () {
+    this.TestApplication = class TestApplication extends Application {
+      modulePrefix = config.modulePrefix;
+      podModulePrefix = config.podModulePrefix;
+      Resolver = Resolver;
+    };
+
+    this.TestApplication.initializer({
+      name: 'initializer under test',
+      initialize,
+    });
+
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
+  });
+
+  hooks.afterEach(function () {
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+  });
+
+  // TODO: Replace this with your real tests.
+  test('it works', async function (assert) {
+    await this.application.boot();
+
+    assert.ok(true);
+  });
+});
diff --git a/blueprints-js/initializer/files/__root__/initializers/__name__.js b/blueprints-js/initializer/files/__root__/initializers/__name__.js
new file mode 100644
index 00000000000..065fae64a51
--- /dev/null
+++ b/blueprints-js/initializer/files/__root__/initializers/__name__.js
@@ -0,0 +1,5 @@
+export function initialize(application) {}
+
+export default {
+  initialize,
+};
diff --git a/blueprints-js/instance-initializer-addon/files/__root__/__path__/__name__.js b/blueprints-js/instance-initializer-addon/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..79e541af69d
--- /dev/null
+++ b/blueprints-js/instance-initializer-addon/files/__root__/__path__/__name__.js
@@ -0,0 +1 @@
+export { default, initialize } from '<%= modulePath %>';
diff --git a/blueprints-js/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..9be570cf8d0
--- /dev/null
+++ b/blueprints-js/instance-initializer-test/mocha-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,30 @@
+import { expect } from 'chai';
+import { describe, it, afterEach, beforeEach } from 'mocha';
+import Application from '@ember/application';
+import { run } from '@ember/runloop';
+import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
+import destroyApp from '../../helpers/destroy-app';
+
+describe('<%= friendlyTestName %>', function () {
+  let application, appInstance;
+
+  beforeEach(function () {
+    run(function () {
+      application = Application.create();
+      appInstance = application.buildInstance();
+    });
+  });
+
+  afterEach(function () {
+    run(appInstance, 'destroy');
+    destroyApp(application);
+  });
+
+  // TODO: Replace this with your real tests.
+  it('works', function () {
+    initialize(appInstance);
+
+    // you would normally confirm the results of the initializer here
+    expect(true).to.be.ok;
+  });
+});
diff --git a/blueprints-js/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..66daf8ac499
--- /dev/null
+++ b/blueprints-js/instance-initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,32 @@
+import { expect } from 'chai';
+import { describe, it, beforeEach, afterEach } from 'mocha';
+import Application from '@ember/application';
+import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+
+describe('<%= friendlyTestName %>', function () {
+  beforeEach(function () {
+    this.TestApplication = Application.extend();
+    this.TestApplication.instanceInitializer({
+      name: 'initializer under test',
+      initialize,
+    });
+
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
+
+    this.instance = this.application.buildInstance();
+  });
+  afterEach(function () {
+    <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+  });
+
+  // TODO: Replace this with your real tests.
+  it('works', async function () {
+    await this.instance.boot();
+
+    expect(true).to.be.ok;
+  });
+});
diff --git a/blueprints-js/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..9f056812709
--- /dev/null
+++ b/blueprints-js/instance-initializer-test/qunit-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,26 @@
+import Application from '@ember/application';
+import { run } from '@ember/runloop';
+import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';<% if (destroyAppExists) { %>
+import destroyApp from '../../helpers/destroy-app';<% } %>
+
+module('<%= friendlyTestName %>', {
+  beforeEach() {
+    run(() => {
+      this.application = Application.create();
+      this.appInstance = this.application.buildInstance();
+    });
+  },
+  afterEach() {
+    run(this.appInstance, 'destroy');
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+  },
+});
+
+// TODO: Replace this with your real tests.
+test('it works', function (assert) {
+  initialize(this.appInstance);
+
+  // you would normally confirm the results of the initializer here
+  assert.ok(true);
+});
diff --git a/blueprints-js/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/blueprints-js/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
new file mode 100644
index 00000000000..dcb4f3f305c
--- /dev/null
+++ b/blueprints-js/instance-initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -0,0 +1,39 @@
+import Application from '@ember/application';
+
+import config from '<%= modulePrefix %>/config/environment';
+import { initialize } from '<%= modulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+import Resolver from 'ember-resolver';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
+
+module('<%= friendlyTestName %>', function (hooks) {
+  hooks.beforeEach(function () {
+    this.TestApplication = class TestApplication extends Application {
+      modulePrefix = config.modulePrefix;
+      podModulePrefix = config.podModulePrefix;
+      Resolver = Resolver;
+    };
+
+    this.TestApplication.instanceInitializer({
+      name: 'initializer under test',
+      initialize,
+    });
+
+    this.application = this.TestApplication.create({
+      autoboot: false,
+    });
+
+    this.instance = this.application.buildInstance();
+  });
+  hooks.afterEach(function () {
+    <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+  });
+
+  // TODO: Replace this with your real tests.
+  test('it works', async function (assert) {
+    await this.instance.boot();
+
+    assert.ok(true);
+  });
+});
diff --git a/blueprints-js/instance-initializer/files/__root__/instance-initializers/__name__.js b/blueprints-js/instance-initializer/files/__root__/instance-initializers/__name__.js
new file mode 100644
index 00000000000..e0281ca4e7e
--- /dev/null
+++ b/blueprints-js/instance-initializer/files/__root__/instance-initializers/__name__.js
@@ -0,0 +1,5 @@
+export function initialize(owner) {}
+
+export default {
+  initialize,
+};
diff --git a/blueprints-js/mixin-test/mocha-files/__root__/__testType__/__name__-test.js b/blueprints-js/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..915c4202a81
--- /dev/null
+++ b/blueprints-js/mixin-test/mocha-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import EmberObject from '@ember/object';
+import <%= classifiedModuleName %>Mixin from '<%= dasherizedPackageName %>/mixins/<%= dasherizedModuleName %>';
+
+describe('<%= friendlyTestName %>', function () {
+  // TODO: Replace this with your real tests.
+  it('works', function () {
+    let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
+    let subject = <%= classifiedModuleName %>Object.create();
+    expect(subject).to.be.ok;
+  });
+});
diff --git a/blueprints-js/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints-js/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..915c4202a81
--- /dev/null
+++ b/blueprints-js/mixin-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import EmberObject from '@ember/object';
+import <%= classifiedModuleName %>Mixin from '<%= dasherizedPackageName %>/mixins/<%= dasherizedModuleName %>';
+
+describe('<%= friendlyTestName %>', function () {
+  // TODO: Replace this with your real tests.
+  it('works', function () {
+    let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
+    let subject = <%= classifiedModuleName %>Object.create();
+    expect(subject).to.be.ok;
+  });
+});
diff --git a/blueprints-js/mixin-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints-js/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..00579ff7c02
--- /dev/null
+++ b/blueprints-js/mixin-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+
+module('<%= friendlyTestName %>');
+
+// TODO: Replace this with your real tests.
+test('it works', function (assert) {
+  let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
+  let subject = <%= classifiedModuleName %>Object.create();
+  assert.ok(subject);
+});
diff --git a/blueprints-js/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints-js/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..034a718d852
--- /dev/null
+++ b/blueprints-js/mixin-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+
+module('<%= friendlyTestName %>', function () {
+  // TODO: Replace this with your real tests.
+  test('it works', function (assert) {
+    let <%= classifiedModuleName %>Object = EmberObject.extend(<%= classifiedModuleName %>Mixin);
+    let subject = <%= classifiedModuleName %>Object.create();
+    assert.ok(subject);
+  });
+});
diff --git a/blueprints-js/mixin/files/__root__/mixins/__name__.js b/blueprints-js/mixin/files/__root__/mixins/__name__.js
new file mode 100644
index 00000000000..9aa7bf677d8
--- /dev/null
+++ b/blueprints-js/mixin/files/__root__/mixins/__name__.js
@@ -0,0 +1,3 @@
+import Mixin from '@ember/object/mixin';
+
+export default Mixin.create({});
diff --git a/blueprints-js/route-addon/files/__root__/__path__/__name__.js b/blueprints-js/route-addon/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..d921567455f
--- /dev/null
+++ b/blueprints-js/route-addon/files/__root__/__path__/__name__.js
@@ -0,0 +1 @@
+export { default } from '<%= routeModulePath %>';
diff --git a/blueprints-js/route-addon/files/__root__/__templatepath__/__templatename__.js b/blueprints-js/route-addon/files/__root__/__templatepath__/__templatename__.js
new file mode 100644
index 00000000000..2701b135456
--- /dev/null
+++ b/blueprints-js/route-addon/files/__root__/__templatepath__/__templatename__.js
@@ -0,0 +1 @@
+export { default } from '<%= templateModulePath %>';
diff --git a/blueprints-js/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..4764e61b2e9
--- /dev/null
+++ b/blueprints-js/route-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,15 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest('route:<%= moduleName %>', {
+    // Specify the other units that are required for this test.
+    // needs: ['controller:foo']
+  });
+
+  it('exists', function () {
+    let route = this.subject();
+    expect(route).to.be.ok;
+  });
+});
diff --git a/blueprints-js/route-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/mocha-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..e2f6ecb1547
--- /dev/null
+++ b/blueprints-js/route-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,17 @@
+import { expect } from 'chai';
+import { describeModule, it } from 'ember-mocha';
+
+describeModule(
+  'route:<%= moduleName %>',
+  '<%= friendlyTestDescription %>',
+  {
+    // Specify the other units that are required for this test.
+    // needs: ['controller:foo']
+  },
+  function () {
+    it('exists', function () {
+      let route = this.subject();
+      expect(route).to.be.ok;
+    });
+  }
+);
diff --git a/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..36e7503f359
--- /dev/null
+++ b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,12 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest();
+
+  it('exists', function () {
+    let route = this.owner.lookup('route:<%= dasherizedModuleName %>');
+    expect(route).to.be.ok;
+  });
+});
diff --git a/blueprints-js/route-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/qunit-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..44232623e38
--- /dev/null
+++ b/blueprints-js/route-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,11 @@
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('route:<%= moduleName %>', '<%= friendlyTestDescription %>', {
+  // Specify the other units that are required for this test.
+  // needs: ['controller:foo']
+});
+
+test('it exists', function (assert) {
+  let route = this.subject();
+  assert.ok(route);
+});
diff --git a/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..abe9789b73d
--- /dev/null
+++ b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:<%= moduleName %>');
+    assert.ok(route);
+  });
+});
diff --git a/blueprints-js/route/files/__root__/__path__/__name__.js b/blueprints-js/route/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..aeb39c6b91b
--- /dev/null
+++ b/blueprints-js/route/files/__root__/__path__/__name__.js
@@ -0,0 +1,9 @@
+import Route from '@ember/routing/route';
+
+export default class <%= classifiedModuleName %>Route extends Route {<% if (hasDynamicSegment) {%>
+  model(params) {
+    // This route was generated with a dynamic segment. Implement data loading
+    // based on that dynamic segment here in the model hook.
+    return params;
+  }
+<%}%>}
diff --git a/blueprints-js/route/files/__root__/__templatepath__/__templatename__.hbs b/blueprints-js/route/files/__root__/__templatepath__/__templatename__.hbs
new file mode 100644
index 00000000000..9857cee0c36
--- /dev/null
+++ b/blueprints-js/route/files/__root__/__templatepath__/__templatename__.hbs
@@ -0,0 +1,2 @@
+<% if (addTitle) {%>{{page-title "<%= routeName %>"}}
+<%}%>{{outlet}}
\ No newline at end of file
diff --git a/blueprints-js/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..dde1fd8b11c
--- /dev/null
+++ b/blueprints-js/service-test/mocha-0.12-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,16 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest('service:<%= dasherizedModuleName %>', {
+    // Specify the other units that are required for this test.
+    // needs: ['service:foo']
+  });
+
+  // TODO: Replace this with your real tests.
+  it('exists', function () {
+    let service = this.subject();
+    expect(service).to.be.ok;
+  });
+});
diff --git a/blueprints-js/service-test/mocha-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..2954042d0d0
--- /dev/null
+++ b/blueprints-js/service-test/mocha-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import { describeModule, it } from 'ember-mocha';
+
+describeModule(
+  'service:<%= dasherizedModuleName %>',
+  '<%= friendlyTestDescription %>',
+  {
+    // Specify the other units that are required for this test.
+    // needs: ['service:foo']
+  },
+  function () {
+    // TODO: Replace this with your real tests.
+    it('exists', function () {
+      let service = this.subject();
+      expect(service).to.be.ok;
+    });
+  }
+);
diff --git a/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..1970c5ddbb0
--- /dev/null
+++ b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function () {
+  setupTest();
+
+  // TODO: Replace this with your real tests.
+  it('exists', function () {
+    let service = this.owner.lookup('service:<%= dasherizedModuleName %>');
+    expect(service).to.be.ok;
+  });
+});
diff --git a/blueprints-js/service-test/qunit-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..1f42bc8820f
--- /dev/null
+++ b/blueprints-js/service-test/qunit-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,12 @@
+import { moduleFor, test } from 'ember-qunit';
+
+moduleFor('service:<%= dasherizedModuleName %>', '<%= friendlyTestDescription %>', {
+  // Specify the other units that are required for this test.
+  // needs: ['service:foo']
+});
+
+// TODO: Replace this with your real tests.
+test('it exists', function (assert) {
+  let service = this.subject();
+  assert.ok(service);
+});
diff --git a/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
new file mode 100644
index 00000000000..49b3458119a
--- /dev/null
+++ b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('<%= friendlyTestDescription %>', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let service = this.owner.lookup('service:<%= dasherizedModuleName %>');
+    assert.ok(service);
+  });
+});
diff --git a/blueprints-js/service/files/__root__/__path__/__name__.js b/blueprints-js/service/files/__root__/__path__/__name__.js
new file mode 100644
index 00000000000..6f7a5e9baa4
--- /dev/null
+++ b/blueprints-js/service/files/__root__/__path__/__name__.js
@@ -0,0 +1,3 @@
+import Service from '@ember/service';
+
+export default class <%= classifiedModuleName %>Service extends Service {}
diff --git a/blueprints-js/template/files/__root__/__path__/__name__.hbs b/blueprints-js/template/files/__root__/__path__/__name__.hbs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/blueprints-js/test-framework-detector.js b/blueprints-js/test-framework-detector.js
new file mode 100644
index 00000000000..a294a911dfb
--- /dev/null
+++ b/blueprints-js/test-framework-detector.js
@@ -0,0 +1,60 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const VersionChecker = require('ember-cli-version-checker');
+
+module.exports = function (blueprint) {
+  blueprint.supportsAddon = function () {
+    return false;
+  };
+
+  blueprint.filesPath = function () {
+    let type;
+    const qunitRfcVersion = 'qunit-rfc-232';
+    const mochaRfcVersion = 'mocha-rfc-232';
+    const mochaVersion = 'mocha-0.12';
+
+    let dependencies = this.project.dependencies();
+    if ('ember-qunit' in dependencies) {
+      type = qunitRfcVersion;
+    } else if ('ember-cli-qunit' in dependencies) {
+      let checker = new VersionChecker(this.project);
+      if (
+        fs.existsSync(`${this.path}/${qunitRfcVersion}-files`) &&
+        checker.for('ember-cli-qunit', 'npm').gte('4.2.0')
+      ) {
+        type = qunitRfcVersion;
+      } else {
+        type = 'qunit';
+      }
+    } else if ('ember-mocha' in dependencies) {
+      let checker = new VersionChecker(this.project);
+      if (
+        fs.existsSync(`${this.path}/${mochaRfcVersion}-files`) &&
+        checker.for('ember-mocha', 'npm').gte('0.14.0')
+      ) {
+        type = mochaRfcVersion;
+      } else {
+        type = mochaVersion;
+      }
+    } else if ('ember-cli-mocha' in dependencies) {
+      let checker = new VersionChecker(this.project);
+      if (
+        fs.existsSync(`${this.path}/${mochaVersion}-files`) &&
+        checker.for('ember-cli-mocha', 'npm').gte('0.12.0')
+      ) {
+        type = mochaVersion;
+      } else {
+        type = 'mocha';
+      }
+    } else {
+      this.ui.writeLine("Couldn't determine test style - using QUnit");
+      type = 'qunit';
+    }
+
+    return path.join(this.path, type + '-files');
+  };
+
+  return blueprint;
+};
diff --git a/blueprints-js/util-test/mocha-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/mocha-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..8d06bcc0413
--- /dev/null
+++ b/blueprints-js/util-test/mocha-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,11 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import <%= camelizedModuleName %> from '<%= dasherizedPackageName %>/utils/<%= dasherizedModuleName %>';
+
+describe('<%= friendlyTestName %>', function () {
+  // TODO: Replace this with your real tests.
+  it('works', function () {
+    let result = <%= camelizedModuleName %>();
+    expect(result).to.be.ok;
+  });
+});
diff --git a/blueprints-js/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..8d06bcc0413
--- /dev/null
+++ b/blueprints-js/util-test/mocha-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,11 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import <%= camelizedModuleName %> from '<%= dasherizedPackageName %>/utils/<%= dasherizedModuleName %>';
+
+describe('<%= friendlyTestName %>', function () {
+  // TODO: Replace this with your real tests.
+  it('works', function () {
+    let result = <%= camelizedModuleName %>();
+    expect(result).to.be.ok;
+  });
+});
diff --git a/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..d9eeb2bbb93
--- /dev/null
+++ b/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,10 @@
+import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+
+module('<%= friendlyTestName %>');
+
+// TODO: Replace this with your real tests.
+test('it works', function (assert) {
+  let result = <%= camelizedModuleName %>();
+  assert.ok(result);
+});
diff --git a/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
new file mode 100644
index 00000000000..d531b5ee8d0
--- /dev/null
+++ b/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -0,0 +1,10 @@
+import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import { module, test } from 'qunit';
+
+module('<%= friendlyTestName %>', function () {
+  // TODO: Replace this with your real tests.
+  test('it works', function (assert) {
+    let result = <%= camelizedModuleName %>();
+    assert.ok(result);
+  });
+});
diff --git a/blueprints-js/util/files/__root__/utils/__name__.js b/blueprints-js/util/files/__root__/utils/__name__.js
new file mode 100644
index 00000000000..ab636c1792a
--- /dev/null
+++ b/blueprints-js/util/files/__root__/utils/__name__.js
@@ -0,0 +1,3 @@
+export default function <%= camelizedModuleName %>() {
+  return true;
+}
diff --git a/blueprints/-addon-import.js b/blueprints/-addon-import.js
index d4ae282cd2a..fa40870e6f4 100644
--- a/blueprints/-addon-import.js
+++ b/blueprints/-addon-import.js
@@ -3,7 +3,8 @@
 const stringUtil = require('ember-cli-string-utils');
 const path = require('path');
 const inflector = require('inflection');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('./-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates an import wrapper.',
@@ -12,7 +13,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/-maybe-polyfill-typescript-blueprints.js b/blueprints/-maybe-polyfill-typescript-blueprints.js
new file mode 100644
index 00000000000..1af065e5a01
--- /dev/null
+++ b/blueprints/-maybe-polyfill-typescript-blueprints.js
@@ -0,0 +1,17 @@
+const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const EMBER_TYPESCRIPT_BLUEPRINTS = false;
+
+function canEmitTypeScript() {
+  return 'EMBER_TYPESCRIPT_BLUEPRINTS' in process.env
+    ? process.env.EMBER_TYPESCRIPT_BLUEPRINTS
+    : EMBER_TYPESCRIPT_BLUEPRINTS;
+}
+
+module.exports = function (context) {
+  if (canEmitTypeScript()) {
+    typescriptBlueprintPolyfill(context);
+  } else {
+    // Use the plain old JS templates from before
+    context.path = context.path.replace('blueprints', 'blueprints-js');
+  }
+};
diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js
index f46e9c33acb..547f085df20 100644
--- a/blueprints/acceptance-test/index.js
+++ b/blueprints/acceptance-test/index.js
@@ -5,8 +5,8 @@ const path = require('path');
 const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates an acceptance test for a feature.',
@@ -15,7 +15,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   locals: function (options) {
diff --git a/blueprints/component-addon/index.js b/blueprints/component-addon/index.js
index d7d1b1c851f..1550b25c886 100644
--- a/blueprints/component-addon/index.js
+++ b/blueprints/component-addon/index.js
@@ -4,7 +4,8 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates a component.',
@@ -13,7 +14,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/component-class-addon/index.js b/blueprints/component-class-addon/index.js
index 751b790d29a..16df092bdb0 100644
--- a/blueprints/component-class-addon/index.js
+++ b/blueprints/component-class-addon/index.js
@@ -4,7 +4,8 @@ const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates a component class.',
@@ -13,7 +14,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/component-class/index.js b/blueprints/component-class/index.js
index 25db13861e2..1c6f463b7cc 100644
--- a/blueprints/component-class/index.js
+++ b/blueprints/component-class/index.js
@@ -8,7 +8,8 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
 const { has } = require('@ember/edition-utils');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 const OCTANE = has('octane');
 
@@ -50,7 +51,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js
index 70dae927c56..9f6c3547cc8 100644
--- a/blueprints/component-test/index.js
+++ b/blueprints/component-test/index.js
@@ -5,8 +5,8 @@ const stringUtil = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const getPathOption = require('ember-cli-get-component-path-option');
 const semver = require('semver');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
@@ -21,7 +21,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   availableOptions: [
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index 9d021a4e815..57f31654455 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -9,7 +9,8 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
 const { EOL } = require('os');
 const { has } = require('@ember/edition-utils');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 const OCTANE = has('octane');
 
@@ -54,7 +55,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js
index e5dd1c14ac3..f5d2defe4a4 100644
--- a/blueprints/controller-test/index.js
+++ b/blueprints/controller-test/index.js
@@ -4,7 +4,8 @@ const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
@@ -13,7 +14,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   locals: function (options) {
diff --git a/blueprints/controller/index.js b/blueprints/controller/index.js
index 87802832a14..5a3280004ad 100644
--- a/blueprints/controller/index.js
+++ b/blueprints/controller/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates a controller.',
@@ -9,7 +9,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   normalizeEntityName: function (entityName) {
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index 031f8a2035e..4a54bd252e1 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -3,7 +3,8 @@
 const stringUtils = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -14,7 +15,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
index 0ff754e8000..6bc5b1497d0 100644
--- a/blueprints/helper/index.js
+++ b/blueprints/helper/index.js
@@ -1,7 +1,8 @@
 'use strict';
 
 const normalizeEntityName = require('ember-cli-normalize-entity-name');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 const path = require('path');
 
@@ -12,7 +13,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   filesPath() {
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index 6376c587df6..bc4755eca15 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -3,8 +3,8 @@
 const fs = require('fs');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -14,7 +14,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/initializer/index.js b/blueprints/initializer/index.js
index 35f0d1df482..932cd98bd04 100644
--- a/blueprints/initializer/index.js
+++ b/blueprints/initializer/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+
 module.exports = {
   description: 'Generates an initializer.',
 
@@ -8,6 +9,6 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 };
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index 03133eff9a5..b691b4a8b41 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -3,8 +3,8 @@
 const fs = require('fs');
 const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -14,7 +14,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts
index 40b7dbe4adf..b7ee40e953c 100644
--- a/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts
+++ b/blueprints/instance-initializer/files/__root__/instance-initializers/__name__.ts
@@ -1,4 +1,4 @@
-export function initialize(appInstance) {
+export function initialize(owner) {
 }
 
 export default {
diff --git a/blueprints/instance-initializer/index.js b/blueprints/instance-initializer/index.js
index 5536937f610..c8d4dacdd1c 100644
--- a/blueprints/instance-initializer/index.js
+++ b/blueprints/instance-initializer/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   shouldTransformTypeScript: true,
@@ -9,6 +9,6 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 };
diff --git a/blueprints/route-addon/index.js b/blueprints/route-addon/index.js
index befcdca0db9..171cdeea2a9 100644
--- a/blueprints/route-addon/index.js
+++ b/blueprints/route-addon/index.js
@@ -3,7 +3,8 @@
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
 const inflector = require('inflection');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates import wrappers for a route and its template.',
@@ -12,7 +13,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js
index eab3026acd9..fc79e51b099 100644
--- a/blueprints/route-test/index.js
+++ b/blueprints/route-test/index.js
@@ -2,8 +2,9 @@
 
 const path = require('path');
 const stringUtil = require('ember-cli-string-utils');
+
 const useTestFrameworkDetector = require('../test-framework-detector');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
@@ -12,7 +13,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   availableOptions: [
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index 46c8ed353a4..a36743f9289 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -5,7 +5,8 @@ const path = require('path');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates a route and a template, and registers the route with the router.',
@@ -31,7 +32,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens: function () {
diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.js
index dca9d6370e2..308126e7a67 100644
--- a/blueprints/service-test/index.js
+++ b/blueprints/service-test/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -11,7 +10,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens() {
diff --git a/blueprints/service/index.js b/blueprints/service/index.js
index 056c2ae797e..a5c8a75d545 100644
--- a/blueprints/service/index.js
+++ b/blueprints/service/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates a service.',
@@ -9,7 +9,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   normalizeEntityName: function (entityName) {
diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
index 71d1a7255f2..55b63152b02 100644
--- a/blueprints/util-test/index.js
+++ b/blueprints/util-test/index.js
@@ -2,8 +2,8 @@
 
 const stringUtils = require('ember-cli-string-utils');
 const path = require('path');
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
 
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -13,7 +13,7 @@ module.exports = useTestFrameworkDetector({
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   fileMapTokens() {
diff --git a/blueprints/util/index.js b/blueprints/util/index.js
index 0e327fdcfbf..69cb5d58df5 100644
--- a/blueprints/util/index.js
+++ b/blueprints/util/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
+const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
 module.exports = {
   description: 'Generates a simple utility module/function.',
@@ -9,7 +9,7 @@ module.exports = {
 
   init() {
     this._super && this._super.init.apply(this, arguments);
-    typescriptBlueprintPolyfill(this);
+    maybePolyfillTypeScriptBlueprints(this);
   },
 
   normalizeEntityName: function (entityName) {
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
index 07759372054..e0281ca4e7e 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer-nested.js
@@ -1,4 +1,4 @@
-export function initialize(appInstance) {}
+export function initialize(owner) {}
 
 export default {
   initialize,
diff --git a/node-tests/fixtures/instance-initializer/instance-initializer.js b/node-tests/fixtures/instance-initializer/instance-initializer.js
index 07759372054..e0281ca4e7e 100644
--- a/node-tests/fixtures/instance-initializer/instance-initializer.js
+++ b/node-tests/fixtures/instance-initializer/instance-initializer.js
@@ -1,4 +1,4 @@
-export function initialize(appInstance) {}
+export function initialize(owner) {}
 
 export default {
   initialize,
diff --git a/package.json b/package.json
index 03cb0934048..71957d227a0 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,9 @@
     "lint:tsc": "tsc --noEmit",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
-    "test:blueprints": "mocha node-tests/blueprints/**/*-test.js",
+    "test:blueprints:js": "mocha node-tests/blueprints/**/*-test.js",
+    "test:blueprints:ts": "EMBER_TYPESCRIPT_BLUEPRINTS=true yarn test:blueprints:js",
+    "test:blueprints": "yarn test:blueprints:js && yarn test:blueprints:ts",
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js"
   },

From f9661d7b30c3d0c67e6d1fb4c621e0ec1d8cb3fa Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Mon, 14 Mar 2022 12:25:02 -0600
Subject: [PATCH 0943/1405] update js blueprints for customizable test helpers

---
 .../mocha-rfc-232-files/tests/acceptance/__name__-test.js     | 2 +-
 .../qunit-rfc-232-files/tests/acceptance/__name__-test.js     | 2 +-
 .../__root__/__testType__/__path__/__test__.js                | 4 ++--
 .../__root__/__testType__/__path__/__test__.js                | 4 ++--
 .../__root__/__testType__/__path__/__test__.js                | 2 +-
 .../__root__/__testType__/__path__/__test__.js                | 2 +-
 .../__root__/__testType__/__collection__/__name__-test.js     | 2 +-
 .../__root__/__testType__/__collection__/__name__-test.js     | 2 +-
 .../__root__/__testType__/__path__/__test__.js                | 2 +-
 .../__root__/__testType__/__path__/__test__.js                | 2 +-
 .../__root__/__testType__/__path__/__test__.js                | 2 +-
 .../__root__/__testType__/__path__/__test__.js                | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
index 58566199373..c829c1213b4 100644
--- a/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from 'ember-mocha';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {
diff --git a/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
index b8215b2e711..874340678ec 100644
--- a/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'ember-qunit';
+import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index cded3089872..1124f53ec61 100644
--- a/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 999fd69cd9f..922cc75b599 100644
--- a/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 39f3d69f5cc..70beddc7a11 100644
--- a/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 2bd2b5fb853..576450eeeb7 100644
--- a/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 8eed95f4e7f..caf6e271319 100644
--- a/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from 'ember-mocha';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 69c96f7b230..5197aa67b56 100644
--- a/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 36e7503f359..163dbd6210b 100644
--- a/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index abe9789b73d..1bbe98f8213 100644
--- a/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 1970c5ddbb0..3c8a84d0323 100644
--- a/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from 'ember-mocha';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 49b3458119a..fc13a97e339 100644
--- a/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
+import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);

From 6076d2f52c00afa0a684ac15be094bb174c5b764 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <LPSego3+dev@gmail.com>
Date: Sat, 12 Mar 2022 09:50:43 -0500
Subject: [PATCH 0944/1405] [CLEANUP beta] remove feature flags for shipped
 features

- router service refresh - shipped in 4.1
- cached - shipped in 4.1
---
 .../@ember/-internals/metal/lib/cached.ts     |  51 +++---
 .../-internals/metal/tests/cached/get_test.js | 145 ++++++++--------
 .../-internals/routing/lib/services/router.ts |  35 ++--
 packages/@ember/canary-features/index.ts      |   6 -
 .../router_service_test/refresh_test.js       | 155 +++++++++---------
 5 files changed, 184 insertions(+), 208 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/cached.ts b/packages/@ember/-internals/metal/lib/cached.ts
index b454a0423cd..aad1fa1572a 100644
--- a/packages/@ember/-internals/metal/lib/cached.ts
+++ b/packages/@ember/-internals/metal/lib/cached.ts
@@ -1,41 +1,38 @@
 // NOTE: copied from: https://github.com/glimmerjs/glimmer.js/pull/358
 // Both glimmerjs/glimmer.js and emberjs/ember.js have the exact same implementation
 // of @cached, so any changes made to one should also be made to the other
-import { EMBER_CACHED } from '@ember/canary-features';
 import { DEBUG } from '@glimmer/env';
 import { createCache, getValue } from '@glimmer/validator';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const cached: PropertyDecorator = (...args: any[]) => {
-  if (EMBER_CACHED) {
-    const [target, key, descriptor] = args;
-
-    // Error on `@cached()`, `@cached(...args)`, and `@cached propName = value;`
-    if (DEBUG && target === undefined) throwCachedExtraneousParens();
-    if (
-      DEBUG &&
-      (typeof target !== 'object' ||
-        typeof key !== 'string' ||
-        typeof descriptor !== 'object' ||
-        args.length !== 3)
-    ) {
-      throwCachedInvalidArgsError(args);
-    }
-    if (DEBUG && (!('get' in descriptor) || typeof descriptor.get !== 'function')) {
-      throwCachedGetterOnlyError(key);
-    }
+  const [target, key, descriptor] = args;
+
+  // Error on `@cached()`, `@cached(...args)`, and `@cached propName = value;`
+  if (DEBUG && target === undefined) throwCachedExtraneousParens();
+  if (
+    DEBUG &&
+    (typeof target !== 'object' ||
+      typeof key !== 'string' ||
+      typeof descriptor !== 'object' ||
+      args.length !== 3)
+  ) {
+    throwCachedInvalidArgsError(args);
+  }
+  if (DEBUG && (!('get' in descriptor) || typeof descriptor.get !== 'function')) {
+    throwCachedGetterOnlyError(key);
+  }
 
-    const caches = new WeakMap();
-    const getter = descriptor.get;
+  const caches = new WeakMap();
+  const getter = descriptor.get;
 
-    descriptor.get = function (): unknown {
-      if (!caches.has(this)) {
-        caches.set(this, createCache(getter.bind(this)));
-      }
+  descriptor.get = function (): unknown {
+    if (!caches.has(this)) {
+      caches.set(this, createCache(getter.bind(this)));
+    }
 
-      return getValue(caches.get(this));
-    };
-  }
+    return getValue(caches.get(this));
+  };
 };
 
 function throwCachedExtraneousParens(): never {
diff --git a/packages/@ember/-internals/metal/tests/cached/get_test.js b/packages/@ember/-internals/metal/tests/cached/get_test.js
index 9489338a129..1b6ca256d8b 100644
--- a/packages/@ember/-internals/metal/tests/cached/get_test.js
+++ b/packages/@ember/-internals/metal/tests/cached/get_test.js
@@ -1,102 +1,99 @@
 import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 import { cached, tracked } from '../..';
-import { EMBER_CACHED } from '@ember/canary-features';
-
-if (EMBER_CACHED) {
-  moduleFor(
-    '@cached decorator: get',
-    class extends AbstractTestCase {
-      '@test it works'() {
-        let assert = this.assert;
-
-        class Person {
-          @tracked firstName = 'Jen';
-          @tracked lastName = 'Weber';
-
-          @cached
-          get fullName() {
-            let fullName = `${this.firstName} ${this.lastName}`;
-
-            assert.step(fullName);
-            return fullName;
-          }
+
+moduleFor(
+  '@cached decorator: get',
+  class extends AbstractTestCase {
+    '@test it works'() {
+      let assert = this.assert;
+
+      class Person {
+        @tracked firstName = 'Jen';
+        @tracked lastName = 'Weber';
+
+        @cached
+        get fullName() {
+          let fullName = `${this.firstName} ${this.lastName}`;
+
+          assert.step(fullName);
+          return fullName;
         }
+      }
 
-        let person = new Person();
+      let person = new Person();
 
-        assert.verifySteps([], 'getter is not called after class initialization');
+      assert.verifySteps([], 'getter is not called after class initialization');
 
-        assert.strictEqual(person.fullName, 'Jen Weber');
-        assert.verifySteps(['Jen Weber'], 'getter was called after property access');
+      assert.strictEqual(person.fullName, 'Jen Weber');
+      assert.verifySteps(['Jen Weber'], 'getter was called after property access');
 
-        assert.strictEqual(person.fullName, 'Jen Weber');
-        assert.verifySteps([], 'getter was not called again after repeated property access');
+      assert.strictEqual(person.fullName, 'Jen Weber');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
 
-        person.firstName = 'Kenneth';
-        assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+      person.firstName = 'Kenneth';
+      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
 
-        assert.strictEqual(person.fullName, 'Kenneth Weber');
-        assert.verifySteps(['Kenneth Weber'], 'accessing the property triggers a re-computation');
+      assert.strictEqual(person.fullName, 'Kenneth Weber');
+      assert.verifySteps(['Kenneth Weber'], 'accessing the property triggers a re-computation');
 
-        assert.strictEqual(person.fullName, 'Kenneth Weber');
-        assert.verifySteps([], 'getter was not called again after repeated property access');
+      assert.strictEqual(person.fullName, 'Kenneth Weber');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
 
-        person.lastName = 'Larsen';
-        assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+      person.lastName = 'Larsen';
+      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
 
-        assert.strictEqual(person.fullName, 'Kenneth Larsen');
-        assert.verifySteps(['Kenneth Larsen'], 'accessing the property triggers a re-computation');
-      }
+      assert.strictEqual(person.fullName, 'Kenneth Larsen');
+      assert.verifySteps(['Kenneth Larsen'], 'accessing the property triggers a re-computation');
+    }
 
-      '@test it has a separate cache per class instance'() {
-        let assert = this.assert;
+    '@test it has a separate cache per class instance'() {
+      let assert = this.assert;
 
-        class Person {
-          @tracked firstName;
-          @tracked lastName;
+      class Person {
+        @tracked firstName;
+        @tracked lastName;
 
-          constructor(firstName, lastName) {
-            this.firstName = firstName;
-            this.lastName = lastName;
-          }
+        constructor(firstName, lastName) {
+          this.firstName = firstName;
+          this.lastName = lastName;
+        }
 
-          @cached
-          get fullName() {
-            let fullName = `${this.firstName} ${this.lastName}`;
-            assert.step(fullName);
-            return fullName;
-          }
+        @cached
+        get fullName() {
+          let fullName = `${this.firstName} ${this.lastName}`;
+          assert.step(fullName);
+          return fullName;
         }
+      }
 
-        let jen = new Person('Jen', 'Weber');
-        let chris = new Person('Chris', 'Garrett');
+      let jen = new Person('Jen', 'Weber');
+      let chris = new Person('Chris', 'Garrett');
 
-        assert.verifySteps([], 'getter is not called after class initialization');
+      assert.verifySteps([], 'getter is not called after class initialization');
 
-        assert.strictEqual(jen.fullName, 'Jen Weber');
-        assert.verifySteps(['Jen Weber'], 'getter was called after property access');
+      assert.strictEqual(jen.fullName, 'Jen Weber');
+      assert.verifySteps(['Jen Weber'], 'getter was called after property access');
 
-        assert.strictEqual(jen.fullName, 'Jen Weber');
-        assert.verifySteps([], 'getter was not called again after repeated property access');
+      assert.strictEqual(jen.fullName, 'Jen Weber');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
 
-        assert.strictEqual(chris.fullName, 'Chris Garrett', 'other instance has a different value');
-        assert.verifySteps(['Chris Garrett'], 'getter was called after property access');
+      assert.strictEqual(chris.fullName, 'Chris Garrett', 'other instance has a different value');
+      assert.verifySteps(['Chris Garrett'], 'getter was called after property access');
 
-        assert.strictEqual(chris.fullName, 'Chris Garrett');
-        assert.verifySteps([], 'getter was not called again after repeated property access');
+      assert.strictEqual(chris.fullName, 'Chris Garrett');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
 
-        chris.lastName = 'Manson';
-        assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
+      chris.lastName = 'Manson';
+      assert.verifySteps([], 'changing a property does not trigger an eager re-computation');
 
-        assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
-        assert.verifySteps([], 'getter was not called again after repeated property access');
+      assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
 
-        assert.strictEqual(chris.fullName, 'Chris Manson');
-        assert.verifySteps(['Chris Manson'], 'getter was called after property access');
+      assert.strictEqual(chris.fullName, 'Chris Manson');
+      assert.verifySteps(['Chris Manson'], 'getter was called after property access');
 
-        assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
-        assert.verifySteps([], 'getter was not called again after repeated property access');
-      }
+      assert.strictEqual(jen.fullName, 'Jen Weber', 'other instance is unaffected');
+      assert.verifySteps([], 'getter was not called again after repeated property access');
     }
-  );
-}
+  }
+);
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index a51ee420327..ad962dc7c7c 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,7 +1,6 @@
 import { getOwner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
-import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
@@ -549,7 +548,6 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     @public
   */
 
-  // Canary features
   /**
    * Refreshes all currently active routes, doing a full transition.
    * If a route name is provided and refers to a currently active route,
@@ -561,31 +559,24 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
    * @method refresh
    * @param {String} [routeName] the route to refresh (along with all child routes)
    * @return Transition
-   * @category EMBER_ROUTING_ROUTER_SERVICE_REFRESH
    * @public
    */
-  refresh = EMBER_ROUTING_ROUTER_SERVICE_REFRESH
-    ? function (this: RouterService<Route>, pivotRouteName?: string): Transition {
-        if (!pivotRouteName) {
-          return this._router._routerMicrolib.refresh();
-        }
+  refresh(pivotRouteName?: string): Transition {
+    if (!pivotRouteName) {
+      return this._router._routerMicrolib.refresh();
+    }
 
-        assert(
-          `The route "${pivotRouteName}" was not found`,
-          this._router.hasRoute(pivotRouteName)
-        );
-        assert(
-          `The route "${pivotRouteName}" is currently not active`,
-          this.isActive(pivotRouteName)
-        );
+    assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
+    assert(`The route "${pivotRouteName}" is currently not active`, this.isActive(pivotRouteName));
 
-        let owner = getOwner(this);
-        assert('RouterService is unexpectedly missing an owner', owner);
-        let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
+    let owner = getOwner(this);
+    assert('RouterService is unexpectedly missing an owner', owner);
+    let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
 
-        return this._router._routerMicrolib.refresh(pivotRoute);
-      }
-    : undefined;
+    // R could be instantiated with a different sub-type
+    // @ts-ignore
+    return this._router._routerMicrolib.refresh(pivotRoute);
+  }
 
   /**
    Name of the current route.
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 88ed47e3f59..7fe503807eb 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -14,8 +14,6 @@ import { ENV } from '@ember/-internals/environment';
 export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
-  EMBER_ROUTING_ROUTER_SERVICE_REFRESH: true,
-  EMBER_CACHED: true,
   EMBER_UNIQUE_ID_HELPER: true,
 };
 
@@ -67,8 +65,4 @@ function featureValue(value: null | boolean) {
 
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
-export const EMBER_ROUTING_ROUTER_SERVICE_REFRESH = featureValue(
-  FEATURES.EMBER_ROUTING_ROUTER_SERVICE_REFRESH
-);
-export const EMBER_CACHED = featureValue(FEATURES.EMBER_CACHED);
 export const EMBER_UNIQUE_ID_HELPER = featureValue(FEATURES.EMBER_UNIQUE_ID_HELPER);
diff --git a/packages/ember/tests/routing/router_service_test/refresh_test.js b/packages/ember/tests/routing/router_service_test/refresh_test.js
index f0c1b47049a..9b0d08c06e2 100644
--- a/packages/ember/tests/routing/router_service_test/refresh_test.js
+++ b/packages/ember/tests/routing/router_service_test/refresh_test.js
@@ -1,100 +1,97 @@
 import { Route } from '@ember/-internals/routing';
-import { EMBER_ROUTING_ROUTER_SERVICE_REFRESH } from '@ember/canary-features';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 
-if (EMBER_ROUTING_ROUTER_SERVICE_REFRESH) {
-  moduleFor(
-    'Router Service - refresh',
-    class extends RouterTestCase {
-      async ['@test RouterService#refresh can be used to re-run the model hooks of active routes'](
-        assert
-      ) {
-        let parentCounter = 0;
-        this.add(
-          'route:parent',
-          class extends Route {
-            model() {
-              ++parentCounter;
-            }
+moduleFor(
+  'Router Service - refresh',
+  class extends RouterTestCase {
+    async ['@test RouterService#refresh can be used to re-run the model hooks of active routes'](
+      assert
+    ) {
+      let parentCounter = 0;
+      this.add(
+        'route:parent',
+        class extends Route {
+          model() {
+            ++parentCounter;
           }
-        );
+        }
+      );
 
-        let childCounter = 0;
-        this.add(
-          'route:parent.child',
-          class extends Route {
-            model() {
-              ++childCounter;
-            }
+      let childCounter = 0;
+      this.add(
+        'route:parent.child',
+        class extends Route {
+          model() {
+            ++childCounter;
           }
-        );
+        }
+      );
 
-        let sisterCounter = 0;
-        this.add(
-          'route:parent.sister',
-          class extends Route {
-            model() {
-              ++sisterCounter;
-            }
+      let sisterCounter = 0;
+      this.add(
+        'route:parent.sister',
+        class extends Route {
+          model() {
+            ++sisterCounter;
           }
-        );
+        }
+      );
 
-        await this.visit('/');
-        assert.equal(parentCounter, 1);
-        assert.equal(childCounter, 0);
-        assert.equal(sisterCounter, 0);
+      await this.visit('/');
+      assert.equal(parentCounter, 1);
+      assert.equal(childCounter, 0);
+      assert.equal(sisterCounter, 0);
 
-        await this.routerService.refresh();
-        assert.equal(parentCounter, 2);
-        assert.equal(childCounter, 0);
-        assert.equal(sisterCounter, 0);
+      await this.routerService.refresh();
+      assert.equal(parentCounter, 2);
+      assert.equal(childCounter, 0);
+      assert.equal(sisterCounter, 0);
 
-        await this.routerService.refresh('application');
-        assert.equal(parentCounter, 3);
-        assert.equal(childCounter, 0);
-        assert.equal(sisterCounter, 0);
+      await this.routerService.refresh('application');
+      assert.equal(parentCounter, 3);
+      assert.equal(childCounter, 0);
+      assert.equal(sisterCounter, 0);
 
-        await this.routerService.transitionTo('parent.child');
-        assert.equal(parentCounter, 3);
-        assert.equal(childCounter, 1);
-        assert.equal(sisterCounter, 0);
+      await this.routerService.transitionTo('parent.child');
+      assert.equal(parentCounter, 3);
+      assert.equal(childCounter, 1);
+      assert.equal(sisterCounter, 0);
 
-        await this.routerService.refresh('parent.child');
-        assert.equal(parentCounter, 3);
-        assert.equal(childCounter, 2);
-        assert.equal(sisterCounter, 0);
+      await this.routerService.refresh('parent.child');
+      assert.equal(parentCounter, 3);
+      assert.equal(childCounter, 2);
+      assert.equal(sisterCounter, 0);
 
-        await this.routerService.refresh('parent');
-        assert.equal(parentCounter, 4);
-        assert.equal(childCounter, 3);
-        assert.equal(sisterCounter, 0);
+      await this.routerService.refresh('parent');
+      assert.equal(parentCounter, 4);
+      assert.equal(childCounter, 3);
+      assert.equal(sisterCounter, 0);
 
-        await this.routerService.transitionTo('parent.sister');
-        assert.equal(parentCounter, 4);
-        assert.equal(childCounter, 3);
-        assert.equal(sisterCounter, 1);
+      await this.routerService.transitionTo('parent.sister');
+      assert.equal(parentCounter, 4);
+      assert.equal(childCounter, 3);
+      assert.equal(sisterCounter, 1);
 
-        await this.routerService.refresh();
-        assert.equal(parentCounter, 5);
-        assert.equal(childCounter, 3);
-        assert.equal(sisterCounter, 2);
-      }
+      await this.routerService.refresh();
+      assert.equal(parentCounter, 5);
+      assert.equal(childCounter, 3);
+      assert.equal(sisterCounter, 2);
+    }
 
-      async ['@test RouterService#refresh verifies that the provided route exists']() {
-        await this.visit('/');
+    async ['@test RouterService#refresh verifies that the provided route exists']() {
+      await this.visit('/');
 
-        expectAssertion(() => {
-          this.routerService.refresh('this-route-does-not-exist');
-        }, 'The route "this-route-does-not-exist" was not found');
-      }
+      expectAssertion(() => {
+        this.routerService.refresh('this-route-does-not-exist');
+      }, 'The route "this-route-does-not-exist" was not found');
+    }
 
-      async ['@test RouterService#refresh verifies that the provided route is active']() {
-        await this.visit('/');
+    async ['@test RouterService#refresh verifies that the provided route is active']() {
+      await this.visit('/');
 
-        expectAssertion(() => {
-          this.routerService.refresh('parent.child');
-        }, 'The route "parent.child" is currently not active');
-      }
+      expectAssertion(() => {
+        this.routerService.refresh('parent.child');
+      }, 'The route "parent.child" is currently not active');
     }
-  );
-}
+  }
+);

From 437108ac154de35af0d26f6c66b881da8f8312aa Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Mar 2022 12:26:03 -0600
Subject: [PATCH 0945/1405] [BUGFIX LTS] remove bad `setFactoryFor` call

This call *attempted* to avoid setting the `INIT_FACTORY` on items
which did not need it (specifically, it avoided setting it on things
which were not instantiable), but ultimately failed to do. It was
ultimately setting the new `FactoryManager` instance as the
`INIT_FACTORY` value on each instantiable object, which includes
classes and not just class instances, since objects are only treated as
non-instantiable when they explicitly specify `instantiate: false`.

The net was a memory leak: the routing service *class* ended up with an
`INIT_FACTORY` pointing to a `FactoryManager` instance which in turn
always had a `container` on it, which meant that there was a cycle (the
container also referenced the service) and thus a leak. This affects
both tests and FastBoot, where we construct new instances of the
service whenever we call the `visit` API.
---
 packages/@ember/-internals/container/lib/container.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 9911051d29b..30e96ea836a 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -481,10 +481,6 @@ export class FactoryManager<T, C extends FactoryClass | object = FactoryClass> {
     this.madeToString = undefined;
     this.injections = undefined;
     setFactoryFor(this, this);
-
-    if (isInstantiatable(container, fullName)) {
-      setFactoryFor(factory, this);
-    }
   }
 
   toString(): string {

From d79edb3f42a8ebb772a17807420bc4309791155d Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Mar 2022 08:10:38 -0600
Subject: [PATCH 0946/1405] Correctly associate props with factory and owner in
 FactoryManager

Previously, we stomped the `props` binding with an `Object.assign()`,
which meant that the original empty props object would get GC'd after
the end of the method and the item passed into the class created at the
end of the `FactoryManager.create` call would be a *different* object,
which does *not* have the factory or owner associations.

Fixes #20023
---
 packages/@ember/-internals/container/lib/container.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 9911051d29b..36e6ba1293f 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -504,14 +504,10 @@ export class FactoryManager<T, C extends FactoryClass | object = FactoryClass> {
       );
     }
 
-    let props = {};
+    let props = options ? { ...options } : {};
     setOwner(props, container.owner!);
     setFactoryFor(props, this);
 
-    if (options !== undefined) {
-      props = Object.assign({}, props, options);
-    }
-
     if (DEBUG) {
       let lazyInjections;
       let validationCache = this.container.validationCache;

From 12263da4d4ef5989807b31ab7653b1f1909ddd72 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Mar 2022 08:10:38 -0600
Subject: [PATCH 0947/1405] [TYPES] Clean up types in routing and router
 services

There were a handful of unnecessary casts and assertions here, which I
noticed as part of working on #20024 and #20025. This simplifies and
cleans those up, and improves the internal type safety a bit as result!
---
 .../@ember/-internals/routing/lib/services/routing.ts  |  2 +-
 .../@ember/-internals/routing/lib/system/router.ts     | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 081ee17d9c9..514939114c7 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -12,7 +12,7 @@ import { Route } from '../..';
 import EmberRouter from '../system/router';
 import RouterState from '../system/router_state';
 
-const ROUTER = (symbol('ROUTER') as unknown) as string;
+const ROUTER = symbol('ROUTER');
 
 /**
   The Routing service is used by LinkTo, and provides facilities for
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 7b0c6ae8d20..96a6f41f871 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -341,7 +341,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
 
         assert('Route is unexpectedly missing an owner', routeOwner);
 
-        let route = routeOwner.lookup(fullRouteName) as R;
+        let route = routeOwner.lookup(fullRouteName) as R | undefined;
 
         if (seen[name]) {
           assert('seen routes should exist', route);
@@ -351,6 +351,8 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
         seen[name] = true;
 
         if (!route) {
+          // SAFETY: this is configured in `commonSetupRegistry` in the
+          // `@ember/application/lib` package.
           let DefaultRoute: any = routeOwner.factoryFor('route:basic')!.class;
           routeOwner.register(fullRouteName, DefaultRoute.extend());
           route = routeOwner.lookup(fullRouteName) as R;
@@ -362,15 +364,15 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
           }
         }
 
-        route!._setRouteName(routeName);
+        route._setRouteName(routeName);
 
-        if (engineInfo && !hasDefaultSerialize(route!)) {
+        if (engineInfo && !hasDefaultSerialize(route)) {
           throw new Error(
             'Defining a custom serialize method on an Engine route is not supported.'
           );
         }
 
-        return route!;
+        return route;
       }
 
       getSerializer(name: string) {

From 0a1b4e495771a0ed5c8cd77b4102ce8ae06fd603 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Mar 2022 13:20:44 -0600
Subject: [PATCH 0948/1405] [BUGFIX beta] remove unneeded `setFactoryFor(this,
 this)`

Identified as part of the work on #20025, this particular `setFactoryFor`
was needed at one time but is now defunct. Remove it.
---
 packages/@ember/-internals/container/lib/container.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 9911051d29b..4a294812a76 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -480,7 +480,6 @@ export class FactoryManager<T, C extends FactoryClass | object = FactoryClass> {
     this.normalizedName = normalizedName;
     this.madeToString = undefined;
     this.injections = undefined;
-    setFactoryFor(this, this);
 
     if (isInstantiatable(container, fullName)) {
       setFactoryFor(factory, this);

From 4eb26d37cda521daefd47f08676e0f53f6aab332 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 17 Mar 2022 10:20:23 -0700
Subject: [PATCH 0949/1405] Convert internals object to .ts and simplify
 inheritance

---
 .../@ember/-internals/glimmer/lib/helper.ts   |  4 ++--
 .../application/debug-render-tree-test.ts     | 12 +++++-----
 packages/@ember/-internals/meta/lib/meta.ts   | 10 ++++----
 .../@ember/-internals/metal/lib/events.ts     |  2 +-
 .../runtime/lib/mixins/observable.d.ts        |  2 +-
 .../runtime/lib/system/core_object.d.ts       |  2 +-
 .../-internals/runtime/lib/system/object.d.ts | 13 ----------
 .../lib/system/{object.js => object.ts}       | 24 ++++++++-----------
 8 files changed, 27 insertions(+), 42 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/object.d.ts
 rename packages/@ember/-internals/runtime/lib/system/{object.js => object.ts} (77%)

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index e2cbbc34a27..78d4f929bca 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -101,8 +101,8 @@ class Helper extends FrameworkObject {
   static isHelperFactory = true;
   static [IS_CLASSIC_HELPER] = true;
 
-  init() {
-    super.init();
+  init(properties: object | undefined) {
+    super.init(properties);
     this[RECOMPUTE_TAG] = createTag();
   }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index e7926c1f23c..407b760e088 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -197,8 +197,8 @@ if (ENV._DEBUG_RENDER_TREE) {
             isFooEngine = true;
             Resolver = ModuleBasedTestResolver;
 
-            init() {
-              super.init();
+            init(properties: object | undefined) {
+              super.init(properties);
               this.register(
                 'template:application',
                 compileTemplate(
@@ -233,8 +233,8 @@ if (ENV._DEBUG_RENDER_TREE) {
           class extends Engine {
             Resolver = ModuleBasedTestResolver;
 
-            init() {
-              super.init();
+            init(properties: object | undefined) {
+              super.init(properties);
               this.register(
                 'template:application',
                 compileTemplate(
@@ -578,8 +578,8 @@ if (ENV._DEBUG_RENDER_TREE) {
             isFooEngine = true;
             Resolver = ModuleBasedTestResolver;
 
-            init() {
-              super.init();
+            init(properties: object | undefined) {
+              super.init(properties);
               this.register(
                 'template:application',
                 compileTemplate(
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 0e13eac6d4f..a607acb4466 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -354,7 +354,7 @@ export class Meta {
   addToListeners(
     eventName: string,
     target: object | null,
-    method: Function | string,
+    method: Function | PropertyKey,
     once: boolean,
     sync: boolean
   ) {
@@ -377,7 +377,7 @@ export class Meta {
   private pushListener(
     event: string,
     target: object | null,
-    method: Function | string,
+    method: Function | PropertyKey,
     kind: ListenerKind.ADD | ListenerKind.ONCE | ListenerKind.REMOVE,
     sync = false
   ): void {
@@ -429,7 +429,9 @@ export class Meta {
         assert(
           `You attempted to add an observer for the same method on '${
             event.split(':')[0]
-          }' twice to ${target} as both sync and async. Observers must be either sync or async, they cannot be both. This is likely a mistake, you should either remove the code that added the observer a second time, or update it to always be sync or async. The method was ${method}.`,
+          }' twice to ${target} as both sync and async. Observers must be either sync or async, they cannot be both. This is likely a mistake, you should either remove the code that added the observer a second time, or update it to always be sync or async. The method was ${String(
+            method
+          )}.`,
           !(
             listener.kind === ListenerKind.ADD &&
             kind === ListenerKind.ADD &&
@@ -722,7 +724,7 @@ function indexOfListener(
   listeners: Listener[],
   event: string,
   target: object | null,
-  method: Function | string | null
+  method: Function | PropertyKey | null
 ) {
   for (let i = listeners.length - 1; i >= 0; i--) {
     let listener = listeners[i];
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index 4c3d9ccfbfe..e5b4127cc1a 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -40,7 +40,7 @@ export function addListener(
   obj: object,
   eventName: string,
   target: object | Function | null,
-  method?: Function | string,
+  method?: Function | PropertyKey,
   once?: boolean,
   sync = true
 ): void {
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
index ff3fffef6c0..6b4825a9e6c 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
@@ -7,7 +7,7 @@ export type ObserverMethod<Target, Sender> =
 /**
  * This mixin provides properties and property observing functionality, core features of the Ember object model.
  */
-export interface Observable {
+interface Observable {
   /**
    * Retrieves the value of a property from the object.
    */
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
index 10cf42c53b2..2883650e29b 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
@@ -65,7 +65,7 @@ export default class CoreObject {
    * An overridable method called when objects are instantiated. By default,
    * does nothing unless it is overridden during class definition.
    */
-  init(): void;
+  init(props: object | undefined): void;
 
   /**
    * Defines the properties that will be concatenated from the superclass (instead of overridden).
diff --git a/packages/@ember/-internals/runtime/lib/system/object.d.ts b/packages/@ember/-internals/runtime/lib/system/object.d.ts
deleted file mode 100644
index d3eab4d5b49..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/object.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import CoreObject from './core_object';
-import { Observable } from '../mixins/observable';
-
-interface EmberObject extends CoreObject, Observable {}
-declare class EmberObject extends CoreObject {}
-
-interface FrameworkObject extends CoreObject, Observable {}
-declare class FrameworkObject extends CoreObject {
-  /** @internal */
-  _debugContainerKey: string | undefined;
-}
-
-export { FrameworkObject, EmberObject as default };
diff --git a/packages/@ember/-internals/runtime/lib/system/object.js b/packages/@ember/-internals/runtime/lib/system/object.ts
similarity index 77%
rename from packages/@ember/-internals/runtime/lib/system/object.js
rename to packages/@ember/-internals/runtime/lib/system/object.ts
index 5f29bc2bf06..6c5850eab58 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.js
+++ b/packages/@ember/-internals/runtime/lib/system/object.ts
@@ -20,33 +20,27 @@ import { DEBUG } from '@glimmer/env';
   @uses Observable
   @public
 */
-export default class EmberObject extends CoreObject {
+interface EmberObject extends CoreObject, Observable {}
+class EmberObject extends CoreObject.extend(Observable) {
   get _debugContainerKey() {
     let factory = getFactoryFor(this);
     return factory !== undefined && factory.fullName;
   }
 }
 
-Observable.apply(EmberObject.prototype);
+export default EmberObject;
 
-export let FrameworkObject;
-
-FrameworkObject = class FrameworkObject extends CoreObject {
-  get _debugContainerKey() {
-    let factory = getFactoryFor(this);
-    return factory !== undefined && factory.fullName;
-  }
-};
-
-Observable.apply(FrameworkObject.prototype);
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface FrameworkObject extends EmberObject {}
+let FrameworkObject = class FrameworkObject extends EmberObject {};
 
 if (DEBUG) {
   let INIT_WAS_CALLED = symbol('INIT_WAS_CALLED');
   let ASSERT_INIT_WAS_CALLED = symbol('ASSERT_INIT_WAS_CALLED');
 
   FrameworkObject = class DebugFrameworkObject extends EmberObject {
-    init() {
-      super.init(...arguments);
+    init(properties: object | undefined) {
+      super.init(properties);
       this[INIT_WAS_CALLED] = true;
     }
 
@@ -60,3 +54,5 @@ if (DEBUG) {
 
   addListener(FrameworkObject.prototype, 'init', null, ASSERT_INIT_WAS_CALLED);
 }
+
+export { FrameworkObject };

From ae6f8076c62a102caae6342a6910adb14590bc0e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Feb 2022 20:08:11 -0800
Subject: [PATCH 0950/1405] Convert Object internals to TS

---
 .../-internals/glimmer/lib/component.ts       | 715 +++++++++---------
 .../@ember/-internals/glimmer/lib/renderer.ts |   4 +-
 packages/@ember/-internals/meta/lib/meta.ts   |   3 +-
 packages/@ember/-internals/metal/index.ts     |   9 +-
 .../@ember/-internals/metal/lib/is_empty.ts   |   7 +-
 packages/@ember/-internals/metal/lib/mixin.ts |  10 +-
 .../-internals/metal/lib/property_get.ts      |  16 +-
 .../runtime/lib/mixins/evented.d.ts           |   7 -
 .../runtime/lib/system/core_object.d.ts       | 148 ----
 .../system/{core_object.js => core_object.ts} | 182 +++--
 .../views/lib/mixins/class_names_support.d.ts |   1 -
 .../views/lib/mixins/view_support.d.ts        |   1 -
 .../-internals/views/lib/views/core_view.ts   |  65 +-
 .../controller/lib/controller_mixin.d.ts      |   2 -
 .../controller/type-tests/index.test.ts       |   2 +-
 .../object/type-tests/core/index.test.ts      |   9 +-
 16 files changed, 561 insertions(+), 620 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/core_object.d.ts
 rename packages/@ember/-internals/runtime/lib/system/{core_object.js => core_object.ts} (87%)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index b1f7c791ba4..320b3aacfea 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,7 +1,6 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
-import { CoreObjectClass } from '@ember/-internals/runtime/lib/system/core_object';
 import {
   ActionSupport,
   ChildViewsSupport,
@@ -649,39 +648,159 @@ let lazyEventsProcessed = new WeakMap<EventDispatcher, WeakSet<object>>();
   @uses Ember.ViewStateSupport
   @public
 */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface ComponentClass extends CoreObjectClass<Component> {}
-interface Component
-  extends CoreView,
-    ChildViewsSupport,
-    ViewStateSupport,
-    ClassNamesSupport,
-    TargetActionSupport,
-    ActionSupport,
-    ViewMixin {
-  attributeBindings?: string[];
+interface ComponentMethods {
+  // Overrideable methods are defined here since you can't `declare` a method in a class
 
   /**
-    Layout can be used to wrap content in a component.
-    @property layout
-    @type Function
+   Called when the attributes passed into the component have been updated.
+    Called both during the initial render of a container and during a rerender.
+    Can be used in place of an observer; code placed here will be executed
+    every time any attribute updates.
+    @method didReceiveAttrs
     @public
-  */
-  layout?: TemplateFactory | Template;
+    @since 1.13.0
+    */
+  didReceiveAttrs(): void;
 
   /**
-    The name of the layout to lookup if no layout is provided.
-    By default `Component` will lookup a template with this name in
-    `Ember.TEMPLATES` (a shared global object).
-    @property layoutName
+   Called when the attributes passed into the component have been updated.
+    Called both during the initial render of a container and during a rerender.
+    Can be used in place of an observer; code placed here will be executed
+    every time any attribute updates.
+    @event didReceiveAttrs
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called after a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @method didRender
+    @public
+    @since 1.13.0
+    */
+  didRender(): void;
+
+  /**
+   Called after a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @event didRender
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called before a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @method willRender
+    @public
+    @since 1.13.0
+    */
+  willRender(): void;
+
+  /**
+   Called before a component has been rendered, both on initial render and
+    in subsequent rerenders.
+    @event willRender
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the attributes passed into the component have been changed.
+    Called only during a rerender, not during an initial render.
+    @method didUpdateAttrs
+    @public
+    @since 1.13.0
+    */
+  didUpdateAttrs(): void;
+
+  /**
+   Called when the attributes passed into the component have been changed.
+    Called only during a rerender, not during an initial render.
+    @event didUpdateAttrs
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the component is about to update and rerender itself.
+    Called only during a rerender, not during an initial render.
+    @method willUpdate
+    @public
+    @since 1.13.0
+    */
+  willUpdate(): void;
+
+  /**
+   Called when the component is about to update and rerender itself.
+    Called only during a rerender, not during an initial render.
+    @event willUpdate
+    @public
+    @since 1.13.0
+    */
+
+  /**
+   Called when the component has updated and rerendered itself.
+    Called only during a rerender, not during an initial render.
+    @method didUpdate
+    @public
+    @since 1.13.0
+    */
+  didUpdate(): void;
+
+  /**
+   Called when the component has updated and rerendered itself.
+    Called only during a rerender, not during an initial render.
+    @event didUpdate
+    @public
+    @since 1.13.0
+    */
+
+  /**
+    The HTML `id` of the component's element in the DOM. You can provide this
+    value yourself but it must be unique (just as in HTML):
+
+    ```handlebars
+    {{my-component elementId="a-really-cool-id"}}
+    ```
+
+    ```handlebars
+    <MyComponent @elementId="a-really-cool-id" />
+    ```
+    If not manually set a default value will be provided by the framework.
+    Once rendered an element's `elementId` is considered immutable and you
+    should never change it. If you need to compute a dynamic value for the
+    `elementId`, you should do this when the component or element is being
+    instantiated:
+
+    ```javascript
+    export default Component.extend({
+      init() {
+        this._super(...arguments);
+
+        var index = this.get('index');
+        this.set('elementId', `component-id${index}`);
+      }
+    });
+    ```
+
+    @property elementId
     @type String
-    @default undefined
-    @private
+    @public
   */
-  layoutName?: string;
 }
+interface Component
+  extends CoreView,
+    ChildViewsSupport,
+    ViewStateSupport,
+    ClassNamesSupport,
+    TargetActionSupport,
+    ActionSupport,
+    ViewMixin,
+    ComponentMethods {}
 
-const Component = (CoreView.extend(
+class Component extends CoreView.extend(
   ChildViewsSupport,
   ViewStateSupport,
   ClassNamesSupport,
@@ -689,375 +808,285 @@ const Component = (CoreView.extend(
   ActionSupport,
   ViewMixin,
   {
-    isComponent: true,
-
-    init() {
-      this._super(...arguments);
-      this[IS_DISPATCHING_ATTRS] = false;
-      this[DIRTY_TAG] = createTag();
-      this[BOUNDS] = null;
-
-      let eventDispatcher = this._dispatcher;
-      if (eventDispatcher) {
-        let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
-        if (!lazyEventsProcessedForComponentClass) {
-          lazyEventsProcessedForComponentClass = new WeakSet<object>();
-          lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
-        }
+    // Make sure these are overrideable, but get a default
+    didReceiveAttrs() {},
+    didRender() {},
+    didUpdate() {},
+    didUpdateAttrs() {},
+    willRender() {},
+    willUpdate() {},
+  } as ComponentMethods
+) {
+  isComponent = true;
 
-        let proto = Object.getPrototypeOf(this);
-        if (!lazyEventsProcessedForComponentClass.has(proto)) {
-          let lazyEvents = eventDispatcher.lazyEvents;
+  _superRerender?: ViewMixin['rerender'];
 
-          lazyEvents.forEach((mappedEventName: string, event: string) => {
-            if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
-              eventDispatcher.setupHandlerForBrowserEvent(event);
-            }
-          });
+  init(properties: object | undefined) {
+    super.init(properties);
 
-          lazyEventsProcessedForComponentClass.add(proto);
-        }
-      }
+    // Handle methods from ViewMixin
+    this._superRerender = this.rerender;
+    this.rerender = this._rerender;
+
+    this[IS_DISPATCHING_ATTRS] = false;
+    this[DIRTY_TAG] = createTag();
+    this[BOUNDS] = null;
 
-      if (DEBUG && eventDispatcher && this.renderer._isInteractive && this.tagName === '') {
-        let eventNames = [];
-        let events = eventDispatcher.finalEventNameMapping;
+    const eventDispatcher = this._dispatcher;
+    if (eventDispatcher) {
+      let lazyEventsProcessedForComponentClass = lazyEventsProcessed.get(eventDispatcher);
+      if (!lazyEventsProcessedForComponentClass) {
+        lazyEventsProcessedForComponentClass = new WeakSet<object>();
+        lazyEventsProcessed.set(eventDispatcher, lazyEventsProcessedForComponentClass);
+      }
 
-        for (let key in events) {
-          let methodName = events[key];
+      let proto = Object.getPrototypeOf(this);
+      if (!lazyEventsProcessedForComponentClass.has(proto)) {
+        let lazyEvents = eventDispatcher.lazyEvents;
 
-          if (typeof this[methodName] === 'function') {
-            eventNames.push(methodName);
+        lazyEvents.forEach((mappedEventName: string, event: string) => {
+          if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
+            eventDispatcher.setupHandlerForBrowserEvent(event);
           }
-        }
-        // If in a tagless component, assert that no event handlers are defined
-        assert(
-          `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
-          !eventNames.length
-        );
+        });
+
+        lazyEventsProcessedForComponentClass.add(proto);
       }
-    },
-
-    get _dispatcher(): EventDispatcher | null {
-      if (this.__dispatcher === undefined) {
-        let owner = getOwner(this);
-        assert('Component is unexpectedly missing an owner', owner);
-
-        if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
-          this.__dispatcher = owner.lookup('event_dispatcher:main');
-          assert(
-            'Expected dispatcher to be an EventDispatcher',
-            this.__dispatcher instanceof EventDispatcher
-          );
-        } else {
-          // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
-          this.__dispatcher = null;
+    }
+
+    if (DEBUG && eventDispatcher && this.renderer._isInteractive && this.tagName === '') {
+      let eventNames = [];
+      let events = eventDispatcher.finalEventNameMapping;
+
+      for (let key in events) {
+        let methodName = events[key]!;
+
+        if (typeof this[methodName] === 'function') {
+          eventNames.push(methodName);
         }
       }
+      // If in a tagless component, assert that no event handlers are defined
+      assert(
+        `You can not define \`${eventNames}\` function(s) to handle DOM event in the \`${this}\` tagless component since it doesn't have any DOM element.`,
+        !eventNames.length
+      );
+    }
+  }
 
-      return this.__dispatcher;
-    },
-
-    on(eventName: string) {
-      this._dispatcher?.setupHandlerForEmberEvent(eventName);
-      return this._super(...arguments);
-    },
+  __dispatcher?: EventDispatcher | null;
 
-    rerender() {
-      dirtyTag(this[DIRTY_TAG]);
-      this._super();
-    },
+  get _dispatcher(): EventDispatcher | null {
+    if (this.__dispatcher === undefined) {
+      let owner = getOwner(this);
+      assert('Component is unexpectedly missing an owner', owner);
 
-    [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
-      if (this[IS_DISPATCHING_ATTRS]) {
-        return;
+      if ((owner.lookup('-environment:main') as Environment)!.isInteractive) {
+        let dispatcher = owner.lookup('event_dispatcher:main');
+        assert(
+          'Expected dispatcher to be an EventDispatcher',
+          dispatcher instanceof EventDispatcher
+        );
+        this.__dispatcher = dispatcher;
+      } else {
+        // In FastBoot we have no EventDispatcher. Set to null to not try again to look it up.
+        this.__dispatcher = null;
       }
+    }
 
-      let args = this[ARGS];
-      let reference = args !== undefined ? args[key] : undefined;
+    return this.__dispatcher;
+  }
 
-      if (reference !== undefined && isUpdatableRef(reference)) {
-        updateRef(reference, arguments.length === 2 ? value : get(this, key));
-      }
-    },
-
-    getAttr(key: string) {
-      // TODO Intimate API should be deprecated
-      return this.get(key);
-    },
-
-    /**
-      Normally, Ember's component model is "write-only". The component takes a
-      bunch of attributes that it got passed in, and uses them to render its
-      template.
-
-      One nice thing about this model is that if you try to set a value to the
-      same thing as last time, Ember (through HTMLBars) will avoid doing any
-      work on the DOM.
-
-      This is not just a performance optimization. If an attribute has not
-      changed, it is important not to clobber the element's "hidden state".
-      For example, if you set an input's `value` to the same value as before,
-      it will clobber selection state and cursor position. In other words,
-      setting an attribute is not **always** idempotent.
-
-      This method provides a way to read an element's attribute and also
-      update the last value Ember knows about at the same time. This makes
-      setting an attribute idempotent.
-
-      In particular, what this means is that if you get an `<input>` element's
-      `value` attribute and then re-render the template with the same value,
-      it will avoid clobbering the cursor and selection position.
-      Since most attribute sets are idempotent in the browser, you typically
-      can get away with reading attributes using jQuery, but the most reliable
-      way to do so is through this method.
-      @method readDOMAttr
-
-      @param {String} name the name of the attribute
-      @return String
-      @public
-     */
-    readDOMAttr(name: string) {
-      // TODO revisit this
-      let _element = getViewElement(this);
+  on<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  on(name: string, method: ((...args: any[]) => void) | string): this;
+  on(name: string, target: any, method?: any) {
+    this._dispatcher?.setupHandlerForEmberEvent(name);
+    return super.on(name, target, method);
+  }
 
-      assert(
-        `Cannot call \`readDOMAttr\` on ${this} which does not have an element`,
-        _element !== null
-      );
+  // Changed to `rerender` on init
+  _rerender() {
+    dirtyTag(this[DIRTY_TAG]);
+    this._superRerender!();
+  }
+
+  [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
+    if (this[IS_DISPATCHING_ATTRS]) {
+      return;
+    }
 
-      let element = _element;
-      let isSVG = element.namespaceURI === Namespace.SVG;
-      let { type, normalized } = normalizeProperty(element, name);
+    let args = this[ARGS];
+    let reference = args !== undefined ? args[key] : undefined;
 
-      if (isSVG || type === 'attr') {
-        return element.getAttribute(normalized);
-      }
+    if (reference !== undefined && isUpdatableRef(reference)) {
+      updateRef(reference, arguments.length === 2 ? value : get(this, key));
+    }
+  }
 
-      return element[normalized];
-    },
+  getAttr(key: string) {
+    // TODO Intimate API should be deprecated
+    return this.get(key);
+  }
 
-    /**
-     The WAI-ARIA role of the control represented by this view. For example, a
-     button may have a role of type 'button', or a pane may have a role of
-     type 'alertdialog'. This property is used by assistive software to help
-     visually challenged users navigate rich web applications.
+  /**
+    Normally, Ember's component model is "write-only". The component takes a
+    bunch of attributes that it got passed in, and uses them to render its
+    template.
+
+    One nice thing about this model is that if you try to set a value to the
+    same thing as last time, Ember (through HTMLBars) will avoid doing any
+    work on the DOM.
+
+    This is not just a performance optimization. If an attribute has not
+    changed, it is important not to clobber the element's "hidden state".
+    For example, if you set an input's `value` to the same value as before,
+    it will clobber selection state and cursor position. In other words,
+    setting an attribute is not **always** idempotent.
+
+    This method provides a way to read an element's attribute and also
+    update the last value Ember knows about at the same time. This makes
+    setting an attribute idempotent.
+
+    In particular, what this means is that if you get an `<input>` element's
+    `value` attribute and then re-render the template with the same value,
+    it will avoid clobbering the cursor and selection position.
+    Since most attribute sets are idempotent in the browser, you typically
+    can get away with reading attributes using jQuery, but the most reliable
+    way to do so is through this method.
+    @method readDOMAttr
+
+    @param {String} name the name of the attribute
+    @return String
+    @public
+    */
+  readDOMAttr(name: string) {
+    // TODO revisit this
+    let _element = getViewElement(this);
 
-     The full list of valid WAI-ARIA roles is available at:
-     [https://www.w3.org/TR/wai-aria/#roles_categorization](https://www.w3.org/TR/wai-aria/#roles_categorization)
+    assert(
+      `Cannot call \`readDOMAttr\` on ${this} which does not have an element`,
+      _element !== null
+    );
 
-     @property ariaRole
-     @type String
-     @default null
-     @public
-     */
+    let element = _element;
+    let isSVG = element.namespaceURI === Namespace.SVG;
+    let { type, normalized } = normalizeProperty(element, name);
 
-    /**
-     Enables components to take a list of parameters as arguments.
-     For example, a component that takes two parameters with the names
-     `name` and `age`:
+    if (isSVG || type === 'attr') {
+      return element.getAttribute(normalized);
+    }
 
-     ```app/components/my-component.js
-     import Component from '@ember/component';
+    return element[normalized];
+  }
 
-     let MyComponent = Component.extend();
+  declare attributeBindings?: string[];
 
-     MyComponent.reopenClass({
-       positionalParams: ['name', 'age']
-     });
+  /**
+    Layout can be used to wrap content in a component.
+    @property layout
+    @type Function
+    @public
+  */
+  declare layout?: TemplateFactory | Template;
 
-     export default MyComponent;
-     ```
+  /**
+    The name of the layout to lookup if no layout is provided.
+    By default `Component` will lookup a template with this name in
+    `Ember.TEMPLATES` (a shared global object).
+    @property layoutName
+    @type String
+    @default undefined
+    @private
+  */
+  declare layoutName?: string;
 
-     It can then be invoked like this:
+  /**
+   The WAI-ARIA role of the control represented by this view. For example, a
+    button may have a role of type 'button', or a pane may have a role of
+    type 'alertdialog'. This property is used by assistive software to help
+    visually challenged users navigate rich web applications.
 
-     ```hbs
-     {{my-component "John" 38}}
-     ```
+    The full list of valid WAI-ARIA roles is available at:
+    [https://www.w3.org/TR/wai-aria/#roles_categorization](https://www.w3.org/TR/wai-aria/#roles_categorization)
 
-     The parameters can be referred to just like named parameters:
+    @property ariaRole
+    @type String
+    @default undefined
+    @public
+    */
+  declare ariaRole?: string;
 
-     ```hbs
-     Name: {{name}}, Age: {{age}}.
-     ```
+  static isComponentFactory = true;
 
-     Using a string instead of an array allows for an arbitrary number of
-     parameters:
+  static toString() {
+    return '@ember/component';
+  }
+}
 
-     ```app/components/my-component.js
-     import Component from '@ember/component';
+Component.reopenClass({
+  /**
+   Enables components to take a list of parameters as arguments.
+    For example, a component that takes two parameters with the names
+    `name` and `age`:
 
-     let MyComponent = Component.extend();
+    ```app/components/my-component.js
+    import Component from '@ember/component';
 
-     MyComponent.reopenClass({
-       positionalParams: 'names'
-     });
+    let MyComponent = Component.extend();
 
-     export default MyComponent;
-     ```
+    MyComponent.reopenClass({
+      positionalParams: ['name', 'age']
+    });
 
-     It can then be invoked like this:
+    export default MyComponent;
+    ```
 
-     ```hbs
-     {{my-component "John" "Michael" "Scott"}}
-     ```
-     The parameters can then be referred to by enumerating over the list:
+    It can then be invoked like this:
 
-     ```hbs
-     {{#each names as |name|}}{{name}}{{/each}}
-     ```
+    ```hbs
+    {{my-component "John" 38}}
+    ```
 
-     @static
-     @public
-     @property positionalParams
-     @since 1.13.0
-     */
+    The parameters can be referred to just like named parameters:
 
-    /**
-     Called when the attributes passed into the component have been updated.
-     Called both during the initial render of a container and during a rerender.
-     Can be used in place of an observer; code placed here will be executed
-     every time any attribute updates.
-     @method didReceiveAttrs
-     @public
-     @since 1.13.0
-     */
-    didReceiveAttrs() {},
+    ```hbs
+    Name: {{name}}, Age: {{age}}.
+    ```
 
-    /**
-     Called when the attributes passed into the component have been updated.
-     Called both during the initial render of a container and during a rerender.
-     Can be used in place of an observer; code placed here will be executed
-     every time any attribute updates.
-     @event didReceiveAttrs
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called after a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @method didRender
-     @public
-     @since 1.13.0
-     */
-    didRender() {},
+    Using a string instead of an array allows for an arbitrary number of
+    parameters:
 
-    /**
-     Called after a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @event didRender
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called before a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @method willRender
-     @public
-     @since 1.13.0
-     */
-    willRender() {},
+    ```app/components/my-component.js
+    import Component from '@ember/component';
 
-    /**
-     Called before a component has been rendered, both on initial render and
-     in subsequent rerenders.
-     @event willRender
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called when the attributes passed into the component have been changed.
-     Called only during a rerender, not during an initial render.
-     @method didUpdateAttrs
-     @public
-     @since 1.13.0
-     */
-    didUpdateAttrs() {},
+    let MyComponent = Component.extend();
 
-    /**
-     Called when the attributes passed into the component have been changed.
-     Called only during a rerender, not during an initial render.
-     @event didUpdateAttrs
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called when the component is about to update and rerender itself.
-     Called only during a rerender, not during an initial render.
-     @method willUpdate
-     @public
-     @since 1.13.0
-     */
-    willUpdate() {},
+    MyComponent.reopenClass({
+      positionalParams: 'names'
+    });
 
-    /**
-     Called when the component is about to update and rerender itself.
-     Called only during a rerender, not during an initial render.
-     @event willUpdate
-     @public
-     @since 1.13.0
-     */
-
-    /**
-     Called when the component has updated and rerendered itself.
-     Called only during a rerender, not during an initial render.
-     @method didUpdate
-     @public
-     @since 1.13.0
-     */
-    didUpdate() {},
+    export default MyComponent;
+    ```
 
-    /**
-     Called when the component has updated and rerendered itself.
-     Called only during a rerender, not during an initial render.
-     @event didUpdate
-     @public
-     @since 1.13.0
-     */
-
-    /**
-      The HTML `id` of the component's element in the DOM. You can provide this
-      value yourself but it must be unique (just as in HTML):
-
-      ```handlebars
-      {{my-component elementId="a-really-cool-id"}}
-      ```
-
-      ```handlebars
-      <MyComponent @elementId="a-really-cool-id" />
-      ```
-      If not manually set a default value will be provided by the framework.
-      Once rendered an element's `elementId` is considered immutable and you
-      should never change it. If you need to compute a dynamic value for the
-      `elementId`, you should do this when the component or element is being
-      instantiated:
-
-      ```javascript
-      export default Component.extend({
-        init() {
-          this._super(...arguments);
-
-          var index = this.get('index');
-          this.set('elementId', `component-id${index}`);
-        }
-      });
-      ```
+    It can then be invoked like this:
 
-      @property elementId
-      @type String
-      @public
-    */
-  }
-) as unknown) as ComponentClass;
+    ```hbs
+    {{my-component "John" "Michael" "Scott"}}
+    ```
+    The parameters can then be referred to by enumerating over the list:
 
-Component.toString = () => '@ember/component';
+    ```hbs
+    {{#each names as |name|}}{{name}}{{/each}}
+    ```
 
-Component.reopenClass({
-  isComponentFactory: true,
+    @static
+    @public
+    @property positionalParams
+    @since 1.13.0
+    */
   positionalParams: [],
 });
 
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 77dd4ba6748..0c02461633c 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -293,7 +293,9 @@ export class Renderer {
 
   private _lastRevision = -1;
   private _destroyed = false;
-  private _isInteractive: boolean;
+
+  /** @private */
+  _isInteractive: boolean;
 
   readonly _runtimeResolver: ResolverImpl;
 
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index a607acb4466..2493af87198 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -1,3 +1,4 @@
+import { ComputedProperty } from '@ember/-internals/metal';
 import { symbol, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { isDestroyed } from '@glimmer/destroyable';
@@ -330,7 +331,7 @@ export class Meta {
   }
 
   /** @internal */
-  forEachDescriptors(fn: Function) {
+  forEachDescriptors(fn: (key: string, value: ComputedProperty) => void) {
     let pointer: Meta | null = this;
     let seen: Set<any> | undefined;
     while (pointer !== null) {
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index c765d9803bc..8a434b254d8 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -2,7 +2,14 @@ export { default as computed, autoComputed, isComputed, ComputedProperty } from
 export { getCachedValueFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
-export { PROXY_CONTENT, _getPath, get, _getProp } from './lib/property_get';
+export {
+  PROXY_CONTENT,
+  _getPath,
+  get,
+  _getProp,
+  HasUnknownProperty,
+  hasUnknownProperty,
+} from './lib/property_get';
 export { set, _setProp, trySet } from './lib/property_set';
 export {
   objectAt,
diff --git a/packages/@ember/-internals/metal/lib/is_empty.ts b/packages/@ember/-internals/metal/lib/is_empty.ts
index c9227858130..a520c044915 100644
--- a/packages/@ember/-internals/metal/lib/is_empty.ts
+++ b/packages/@ember/-internals/metal/lib/is_empty.ts
@@ -1,4 +1,4 @@
-import { get, MaybeHasUnknownProperty } from './property_get';
+import { get, hasUnknownProperty } from './property_get';
 /**
  @module @ember/utils
 */
@@ -39,10 +39,7 @@ export default function isEmpty(obj: unknown): boolean {
     return true;
   }
 
-  if (
-    typeof (obj as MaybeHasUnknownProperty).unknownProperty !== 'function' &&
-    typeof (obj as HasSize).size === 'number'
-  ) {
+  if (!hasUnknownProperty(obj) && typeof (obj as HasSize).size === 'number') {
     return !(obj as HasSize).size;
   }
 
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 25309f8ca90..a818c0eb8bc 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -383,7 +383,11 @@ function updateObserversAndListeners(obj: object, key: string, fn: Function, add
   }
 }
 
-export function applyMixin(obj: { [key: string]: any }, mixins: Mixin[], _hideKeys = false) {
+export function applyMixin(
+  obj: { [key: string]: any },
+  mixins: Array<Mixin | Record<string, unknown>>,
+  _hideKeys = false
+) {
   let descs = Object.create(null);
   let values = Object.create(null);
   let meta = metaFor(obj);
@@ -600,7 +604,9 @@ export default class Mixin {
     @private
     @internal
   */
-  reopen(...args: any[]) {
+  // Args should be `Array<Mixin | Record<string, unknown>>` but this causes
+  // types to be overly strict.
+  reopen(...args: any[]): this | undefined {
     if (args.length === 0) {
       return;
     }
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index e032a30b1a2..7c5214ce6f8 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -24,8 +24,16 @@ if (DEBUG) {
   };
 }
 
-export interface MaybeHasUnknownProperty {
-  unknownProperty?: (keyName: string) => any;
+export interface HasUnknownProperty {
+  unknownProperty: (keyName: string) => any;
+}
+
+export function hasUnknownProperty(val: unknown): val is HasUnknownProperty {
+  return (
+    typeof val === 'object' &&
+    val !== null &&
+    typeof (val as HasUnknownProperty).unknownProperty === 'function'
+  );
 }
 
 interface MaybeHasIsDestroyed {
@@ -111,9 +119,9 @@ export function _getProp(obj: unknown, keyName: string) {
       value === undefined &&
       typeof obj === 'object' &&
       !(keyName in obj) &&
-      typeof (obj as MaybeHasUnknownProperty).unknownProperty === 'function'
+      hasUnknownProperty(obj)
     ) {
-      value = (obj as MaybeHasUnknownProperty).unknownProperty!(keyName);
+      value = obj.unknownProperty(keyName);
     }
 
     if (isTracking()) {
diff --git a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
index 5b053513747..5d0bb160322 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
@@ -13,13 +13,6 @@ interface Evented {
     method: string | ((this: Target, ...args: any[]) => void)
   ): this;
   on(name: string, method: ((...args: any[]) => void) | string): this;
-  // Allow for easier super calls
-  on<Target>(
-    name: string,
-    ...args:
-      | [Target, string | ((this: Target, ...args: any[]) => void)]
-      | [((...args: any[]) => void) | string]
-  ): this;
   /**
    * Subscribes a function to a named event and then cancels the subscription
    * after the first time the event is triggered. It is good to use ``one`` when
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts b/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
deleted file mode 100644
index 2883650e29b..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/core_object.d.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { Owner } from '@ember/-internals/owner';
-
-/**
- * Used to infer the type of ember classes of type `T`.
- *
- * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
- *
- * The single-arg constructor is required by the typescript compiler.
- * The multi-arg constructor is included for better ergonomics.
- *
- * Implementation is carefully chosen for the reasons described in
- * https://github.com/typed-ember/ember-typings/pull/29
- */
-/** @internal */
-export type EmberClassConstructor<T> = new (owner: Owner) => T;
-
-/** @internal */
-export type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
-  ? T & MergeArray<Rest>
-  : unknown; // TODO: Is this correct?
-
-/** @internal */
-export interface CoreObjectClass<Instance> extends EmberClassConstructor<Instance> {
-  /** @internal */
-  extend<Statics>(
-    this: EmberClassConstructor<Instance>,
-    ...args: any[]
-  ): CoreObjectClass<Statics & Instance>;
-
-  /** @internal */
-  reopen(...args: any[]): any;
-
-  /** @internal */
-  reopenClass(...args: any[]): any;
-
-  /** @internal */
-  create<Class extends EmberClassConstructor<Instance>, Args extends Array<Record<string, any>>>(
-    this: Class,
-    ...args: Args
-  ): InstanceType<Class> & MergeArray<Args>;
-}
-
-export default class CoreObject {
-  /** @internal */
-  static extend<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    ...args: any[]
-  ): Readonly<Statics> & CoreObjectClass<Instance>;
-
-  /** @internal */
-  static reopen(...args: any[]): any;
-
-  /** @internal */
-  static reopenClass(...args: any[]): any;
-
-  /**
-   * CoreObject constructor takes owner.
-   */
-  constructor(owner: Owner);
-
-  /** @internal */
-  _super(...args: any[]): any;
-
-  /**
-   * An overridable method called when objects are instantiated. By default,
-   * does nothing unless it is overridden during class definition.
-   */
-  init(props: object | undefined): void;
-
-  /**
-   * Defines the properties that will be concatenated from the superclass (instead of overridden).
-   * @default null
-   */
-  concatenatedProperties: string[];
-
-  /**
-   * Destroyed object property flag. If this property is true the observers and bindings were
-   * already removed by the effect of calling the destroy() method.
-   * @default false
-   */
-  isDestroyed: boolean;
-  /**
-   * Destruction scheduled flag. The destroy() method has been called. The object stays intact
-   * until the end of the run loop at which point the isDestroyed flag is set.
-   * @default false
-   */
-  isDestroying: boolean;
-
-  // NOTE That the actual CoreObject#destroy returns `this`;
-  /**
-   * Destroys an object by setting the `isDestroyed` flag and removing its
-   * metadata, which effectively destroys observers and bindings.
-   * If you try to set a property on a destroyed object, an exception will be
-   * raised.
-   * Note that destruction is scheduled for the end of the run loop and does not
-   * happen immediately.  It will set an isDestroying flag immediately.
-   * @return receiver
-   */
-  destroy(): void;
-
-  /**
-   * Override to implement teardown.
-   */
-  willDestroy(): void;
-
-  /**
-   * Returns a string representation which attempts to provide more information than Javascript's toString
-   * typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
-   * @return string representation
-   */
-  toString(): string;
-
-  static create<Class extends typeof CoreObject, Args extends Array<Record<string, any>>>(
-    this: Class,
-    ...args: Args
-  ): InstanceType<Class> & MergeArray<Args>;
-
-  /** @internal */
-  static detect<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    obj: any
-  ): obj is Readonly<Statics> & EmberClassConstructor<Instance>;
-
-  /** @internal */
-  static detectInstance<Instance>(this: EmberClassConstructor<Instance>, obj: any): obj is Instance;
-
-  /**
-   * Iterate over each computed property for the class, passing its name and any
-   * associated metadata (see metaForProperty) to the callback.
-   * @internal
-   */
-  static eachComputedProperty(callback: (...args: any[]) => any, binding: {}): void;
-  /**
-   * Returns the original hash that was passed to meta().
-   * @param key property name
-   * @internal
-   */
-  static metaForProperty(key: string): {};
-
-  /** @internal */
-  static isClass: boolean;
-
-  /** @internal */
-  static isMethod: boolean;
-
-  /** @internal */
-  static superclass: unknown;
-}
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.js b/packages/@ember/-internals/runtime/lib/system/core_object.ts
similarity index 87%
rename from packages/@ember/-internals/runtime/lib/system/core_object.js
rename to packages/@ember/-internals/runtime/lib/system/core_object.ts
index bbfe9ba0d29..3eff0461b1b 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.js
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.ts
@@ -3,7 +3,7 @@
 */
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
-import { getOwner } from '@ember/-internals/owner';
+import { getOwner, Owner } from '@ember/-internals/owner';
 import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
 import {
@@ -16,6 +16,9 @@ import {
   descriptorForProperty,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
+  ComputedProperty,
+  HasUnknownProperty,
+  hasUnknownProperty,
 } from '@ember/-internals/metal';
 import ActionHandler from '../mixins/action_handler';
 import { assert } from '@ember/debug';
@@ -24,6 +27,35 @@ import { _WeakSet as WeakSet } from '@glimmer/util';
 import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
 import { OWNER } from '@glimmer/owner';
 
+type EmberClassConstructor<T> = new (owner: Owner) => T;
+
+type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
+  ? T & MergeArray<Rest>
+  : unknown; // TODO: Is this correct?
+
+interface HasSetUnknownProperty {
+  setUnknownProperty: (keyName: string, value: any) => any;
+}
+
+function hasSetUnknownProperty(val: unknown): val is HasSetUnknownProperty {
+  return (
+    typeof val === 'object' &&
+    val !== null &&
+    typeof (val as HasSetUnknownProperty).setUnknownProperty === 'function'
+  );
+}
+
+interface HasToStringExtension {
+  toStringExtension: () => void;
+}
+
+function hasToStringExtension(val: unknown): val is HasToStringExtension {
+  return (
+    typeof val === 'object' &&
+    val !== null &&
+    typeof (val as HasToStringExtension).toStringExtension === 'function'
+  );
+}
 const reopen = Mixin.prototype.reopen;
 
 const wasApplied = new WeakSet();
@@ -33,13 +65,13 @@ const initCalled = DEBUG ? new WeakSet() : undefined; // only used in debug buil
 
 const destroyCalled = new Set();
 
-function ensureDestroyCalled(instance) {
+function ensureDestroyCalled(instance: CoreObject) {
   if (!destroyCalled.has(instance)) {
     instance.destroy();
   }
 }
 
-function initialize(obj, properties) {
+function initialize(obj: CoreObject, properties?: unknown) {
   let m = meta(obj);
 
   if (properties !== undefined) {
@@ -56,14 +88,10 @@ function initialize(obj, properties) {
 
     let concatenatedProperties = obj.concatenatedProperties;
     let mergedProperties = obj.mergedProperties;
-    let hasConcatenatedProps =
-      concatenatedProperties !== undefined && concatenatedProperties.length > 0;
-    let hasMergedProps = mergedProperties !== undefined && mergedProperties.length > 0;
 
     let keyNames = Object.keys(properties);
 
-    for (let i = 0; i < keyNames.length; i++) {
-      let keyName = keyNames[i];
+    for (let keyName of keyNames) {
       let value = properties[keyName];
 
       assert(
@@ -86,7 +114,11 @@ function initialize(obj, properties) {
       let isDescriptor = possibleDesc !== undefined;
 
       if (!isDescriptor) {
-        if (hasConcatenatedProps && concatenatedProperties.indexOf(keyName) > -1) {
+        if (
+          concatenatedProperties !== undefined &&
+          concatenatedProperties.length > 0 &&
+          concatenatedProperties.indexOf(keyName) > -1
+        ) {
           let baseValue = obj[keyName];
           if (baseValue) {
             value = makeArray(baseValue).concat(value);
@@ -95,7 +127,11 @@ function initialize(obj, properties) {
           }
         }
 
-        if (hasMergedProps && mergedProperties.indexOf(keyName) > -1) {
+        if (
+          mergedProperties !== undefined &&
+          mergedProperties.length > 0 &&
+          mergedProperties.indexOf(keyName) > -1
+        ) {
           let baseValue = obj[keyName];
           value = Object.assign({}, baseValue, value);
         }
@@ -103,7 +139,7 @@ function initialize(obj, properties) {
 
       if (isDescriptor) {
         possibleDesc.set(obj, keyName, value);
-      } else if (typeof obj.setUnknownProperty === 'function' && !(keyName in obj)) {
+      } else if (hasSetUnknownProperty(obj) && !(keyName in obj)) {
         obj.setUnknownProperty(keyName, value);
       } else {
         if (DEBUG) {
@@ -117,7 +153,7 @@ function initialize(obj, properties) {
 
   // using DEBUG here to avoid the extraneous variable when not needed
   if (DEBUG) {
-    initCalled.add(obj);
+    initCalled!.add(obj);
   }
   obj.init(properties);
 
@@ -131,7 +167,7 @@ function initialize(obj, properties) {
     }
   }
 
-  sendEvent(obj, 'init', undefined, undefined, undefined, m);
+  sendEvent(obj, 'init', undefined, undefined, m);
 }
 
 /**
@@ -195,17 +231,20 @@ function initialize(obj, properties) {
   @class CoreObject
   @public
 */
+interface CoreObject {
+  /** @internal */
+  _super(...args: any[]): any;
+}
 class CoreObject {
-  constructor(owner) {
+  constructor(owner?: Owner) {
     this[OWNER] = owner;
 
     // prepare prototype...
-    this.constructor.proto();
+    (this.constructor as typeof CoreObject).proto();
 
-    let self = this;
-
-    if (DEBUG && typeof self.unknownProperty === 'function') {
-      let messageFor = (obj, property) => {
+    let self;
+    if (DEBUG && hasUnknownProperty(this)) {
+      let messageFor = (obj: unknown, property: unknown) => {
         return (
           `You attempted to access the \`${String(property)}\` property (of ${obj}).\n` +
           `Since Ember 3.1, this is usually fine as you no longer need to use \`.get()\`\n` +
@@ -221,12 +260,12 @@ class CoreObject {
 
       /* globals Proxy Reflect */
       self = new Proxy(this, {
-        get(target, property, receiver) {
+        get(target: CoreObject & HasUnknownProperty, property, receiver) {
           if (property === PROXY_CONTENT) {
             return target;
           } else if (
             // init called will be set on the proxy, not the target, so get with the receiver
-            !initCalled.has(receiver) ||
+            !initCalled!.has(receiver) ||
             typeof property === 'symbol' ||
             isInternalSymbol(property) ||
             property === 'toJSON' ||
@@ -251,10 +290,13 @@ class CoreObject {
           }
         },
       });
+    } else {
+      self = this;
     }
 
+    const destroyable = self;
     registerDestructor(self, ensureDestroyCalled, true);
-    registerDestructor(self, () => self.willDestroy());
+    registerDestructor(self, () => destroyable.willDestroy());
 
     // disable chains
     let m = meta(self);
@@ -267,7 +309,7 @@ class CoreObject {
     }
   }
 
-  reopen(...args) {
+  reopen(...args: Array<Mixin | Record<string, unknown>>) {
     applyMixin(this, args);
     return this;
   }
@@ -304,7 +346,7 @@ class CoreObject {
     @method init
     @public
   */
-  init() {}
+  init(_properties: object | undefined) {}
 
   /**
     Defines the properties that will be concatenated from the superclass
@@ -469,7 +511,7 @@ class CoreObject {
     return isDestroyed(this);
   }
 
-  set isDestroyed(value) {
+  set isDestroyed(_value) {
     assert(`You cannot set \`${this}.isDestroyed\` directly, please use \`.destroy()\`.`, false);
   }
 
@@ -487,7 +529,7 @@ class CoreObject {
     return isDestroying(this);
   }
 
-  set isDestroying(value) {
+  set isDestroying(_value) {
     assert(`You cannot set \`${this}.isDestroying\` directly, please use \`.destroy()\`.`, false);
   }
 
@@ -566,8 +608,7 @@ class CoreObject {
     @public
   */
   toString() {
-    let hasToStringExtension = typeof this.toStringExtension === 'function';
-    let extension = hasToStringExtension ? `:${this.toStringExtension()}` : '';
+    let extension = hasToStringExtension(this) ? `:${this.toStringExtension()}` : '';
 
     return `<${getFactoryFor(this) || '(unknown)'}:${guidFor(this)}${extension}>`;
   }
@@ -666,9 +707,15 @@ class CoreObject {
     @param {Object} [arguments]* Object containing values to use within the new class
     @public
   */
-  static extend() {
+  // Args should be `Array<Mixin | Record<string, unknown>>` but this causes
+  // types to be overly strict.
+  static extend<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...mixins: any[]
+  ): Readonly<Statics> & EmberClassConstructor<Instance>;
+  static extend(...mixins: any[]) {
     let Class = class extends this {};
-    reopen.apply(Class.PrototypeMixin, arguments);
+    reopen.apply(Class.PrototypeMixin, mixins);
     return Class;
   }
 
@@ -713,7 +760,12 @@ class CoreObject {
     @param [arguments]*
     @public
   */
-  static create(props, extra) {
+  static create<Class extends typeof CoreObject, Args extends Array<Record<string, any>>>(
+    this: Class,
+    ...args: Args
+  ): InstanceType<Class> & MergeArray<Args>;
+  static create(...args: Record<string, unknown>[]) {
+    let props = args[0];
     let instance;
 
     if (props !== undefined) {
@@ -723,10 +775,10 @@ class CoreObject {
       instance = new this();
     }
 
-    if (extra === undefined) {
+    if (args.length <= 1) {
       initialize(instance, props);
     } else {
-      initialize(instance, flattenProps.apply(this, arguments));
+      initialize(instance, flattenProps.apply(this, args));
     }
 
     return instance;
@@ -766,9 +818,11 @@ class CoreObject {
     @static
     @public
   */
-  static reopen() {
+  // Args should be `Array<Mixin | Record<string, unknown>>` but this causes
+  // types to be overly strict.
+  static reopen(...args: any[]) {
     this.willReopen();
-    reopen.apply(this.PrototypeMixin, arguments);
+    reopen.apply(this.PrototypeMixin, args);
     return this;
   }
 
@@ -847,12 +901,12 @@ class CoreObject {
     @static
     @public
   */
-  static reopenClass() {
-    applyMixin(this, arguments);
+  static reopenClass(...mixins: Array<Mixin | Record<string, unknown>>) {
+    applyMixin(this, mixins);
     return this;
   }
 
-  static detect(obj) {
+  static detect(obj: unknown) {
     if ('function' !== typeof obj) {
       return false;
     }
@@ -860,12 +914,12 @@ class CoreObject {
       if (obj === this) {
         return true;
       }
-      obj = obj.superclass;
+      obj = (obj as typeof CoreObject).superclass;
     }
     return false;
   }
 
-  static detectInstance(obj) {
+  static detectInstance(obj: unknown) {
     return obj instanceof this;
   }
 
@@ -900,7 +954,7 @@ class CoreObject {
     @param key {String} property name
     @private
   */
-  static metaForProperty(key) {
+  static metaForProperty(key: string) {
     let proto = this.proto(); // ensure prototype is initialized
     let possibleDesc = descriptorForProperty(proto, key);
 
@@ -922,11 +976,11 @@ class CoreObject {
     @param {Object} binding
     @private
   */
-  static eachComputedProperty(callback, binding = this) {
+  static eachComputedProperty(callback: (name: string, meta: unknown) => void, binding = this) {
     this.proto(); // ensure prototype is initialized
     let empty = {};
 
-    meta(this.prototype).forEachDescriptors((name, descriptor) => {
+    meta(this.prototype).forEachDescriptors((name: string, descriptor: ComputedProperty) => {
       if (descriptor.enumerable) {
         let meta = descriptor._meta || empty;
         callback.call(binding, name, meta);
@@ -970,22 +1024,21 @@ class CoreObject {
   static toString() {
     return `<${getFactoryFor(this) || '(unknown)'}:constructor>`;
   }
-}
 
-CoreObject.isClass = true;
-CoreObject.isMethod = false;
+  static isClass = true;
+  static isMethod = false;
 
-function flattenProps(...props) {
-  let { concatenatedProperties, mergedProperties } = this;
-  let hasConcatenatedProps =
-    concatenatedProperties !== undefined && concatenatedProperties.length > 0;
-  let hasMergedProps = mergedProperties !== undefined && mergedProperties.length > 0;
+  static _onLookup?: (debugContainerKey: string) => void;
+  static _lazyInjections?: () => void;
 
-  let initProperties = {};
+  declare concatenatedProperties?: string[] | string;
+  declare mergedProperties?: unknown[];
+}
 
-  for (let i = 0; i < props.length; i++) {
-    let properties = props[i];
+function flattenProps(this: typeof CoreObject, ...props: Array<Record<string, unknown>>) {
+  let initProperties = {};
 
+  for (let properties of props) {
     assert(
       'EmberObject.create no longer supports mixing in other ' +
         'definitions, use .extend & .create separately instead.',
@@ -995,25 +1048,8 @@ function flattenProps(...props) {
     let keyNames = Object.keys(properties);
 
     for (let j = 0, k = keyNames.length; j < k; j++) {
-      let keyName = keyNames[j];
+      let keyName = keyNames[j]!;
       let value = properties[keyName];
-
-      if (hasConcatenatedProps && concatenatedProperties.indexOf(keyName) > -1) {
-        let baseValue = initProperties[keyName];
-
-        if (baseValue) {
-          value = makeArray(baseValue).concat(value);
-        } else {
-          value = makeArray(value);
-        }
-      }
-
-      if (hasMergedProps && mergedProperties.indexOf(keyName) > -1) {
-        let baseValue = initProperties[keyName];
-
-        value = Object.assign({}, baseValue, value);
-      }
-
       initProperties[keyName] = value;
     }
   }
@@ -1028,7 +1064,7 @@ if (DEBUG) {
     @private
     @method _onLookup
   */
-  CoreObject._onLookup = function injectedPropertyAssertion(debugContainerKey) {
+  CoreObject._onLookup = function injectedPropertyAssertion(debugContainerKey: string) {
     let [type] = debugContainerKey.split(':');
     let proto = this.proto();
 
diff --git a/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts b/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
index 508e1c04baa..6e026424c6b 100644
--- a/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
+++ b/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
@@ -1,7 +1,6 @@
 import Mixin from '@ember/object/mixin';
 
 interface ClassNamesSupport {
-  concatenatedProperties: string[];
   classNames: string[];
   classNameBindings: string[];
 }
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.d.ts b/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
index a26059e51cb..373ad305d0f 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
@@ -1,7 +1,6 @@
 import Mixin from '@ember/object/mixin';
 
 interface ViewSupport {
-  concatenatedProperties: string[];
   rerender(): unknown;
   element: Element;
   appendTo(selector: string | Element): this;
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 83ea2febe07..3a640fa75c2 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -1,7 +1,6 @@
-import { View } from '@ember/-internals/glimmer/lib/renderer';
+import { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
 import { ActionHandler, Evented, FrameworkObject } from '@ember/-internals/runtime';
-import { CoreObjectClass } from '@ember/-internals/runtime/lib/system/core_object';
 import states from './states';
 
 /**
@@ -20,21 +19,17 @@ import states from './states';
   @uses Ember.ActionHandler
   @private
 */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface CoreViewClass extends CoreObjectClass<CoreView> {}
-interface CoreView extends FrameworkObject, Evented, ActionHandler, View {}
-const CoreView = (FrameworkObject.extend(Evented, ActionHandler, {
-  isView: true,
 
-  _states: states,
+interface CoreView extends FrameworkObject, Evented, ActionHandler, View {}
+class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
+  isView = true;
 
-  init() {
-    this._super(...arguments);
-    this._state = 'preRender';
-    this._currentState = this._states.preRender;
-  },
+  _states = states;
+  _state: unknown;
+  _currentState: unknown;
 
-  renderer: inject('renderer', '-dom'),
+  _superTrigger?: Evented['trigger'];
+  _superHas?: Evented['has'];
 
   /**
     If the view is currently inserted into the DOM of a parent view, this
@@ -45,14 +40,32 @@ const CoreView = (FrameworkObject.extend(Evented, ActionHandler, {
     @default null
     @private
   */
-  parentView: null,
+  declare parentView: View | null;
+
+  init(properties: object | undefined) {
+    super.init(properties);
+
+    // Handle methods from Evented
+    this._superTrigger = this.trigger;
+    this.trigger = this._trigger;
+    this._superHas = this.has;
+    this.has = this._has;
+
+    this.parentView ??= null;
+
+    this._state = 'preRender';
+    this._currentState = this._states.preRender;
+  }
+
+  @inject('renderer', '-dom')
+  declare renderer: Renderer;
 
   instrumentDetails(hash: Record<string, unknown>) {
     hash['object'] = this.toString();
     hash['containerKey'] = this._debugContainerKey;
     hash['view'] = this;
     return hash;
-  },
+  }
 
   /**
     Override the default event firing from `Evented` to
@@ -62,21 +75,21 @@ const CoreView = (FrameworkObject.extend(Evented, ActionHandler, {
     @param name {String}
     @private
   */
-  trigger(name: string, ...args: any[]) {
-    this._super(...arguments);
+  // Changed to `trigger` on init
+  _trigger(name: string, ...args: any[]) {
+    this._superTrigger!(name, ...args);
     let method = this[name];
     if (typeof method === 'function') {
       return method.apply(this, args);
     }
-  },
+  }
 
-  has(name: string) {
-    return typeof this[name] === 'function' || this._super(name);
-  },
-}) as unknown) as CoreViewClass;
+  // Changed to `has` on init
+  _has(name: string) {
+    return typeof this[name] === 'function' || this._superHas!(name);
+  }
 
-CoreView.reopenClass({
-  isViewFactory: true,
-});
+  static isViewFactory = true;
+}
 
 export default CoreView;
diff --git a/packages/@ember/controller/lib/controller_mixin.d.ts b/packages/@ember/controller/lib/controller_mixin.d.ts
index e55c275b94f..f4740f367d2 100644
--- a/packages/@ember/controller/lib/controller_mixin.d.ts
+++ b/packages/@ember/controller/lib/controller_mixin.d.ts
@@ -14,8 +14,6 @@ interface ControllerMixin<T> {
 
   // From routing/lib/ext/controller
 
-  concatenatedProperties: string[];
-
   queryParams: Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>;
 
   transitionToRoute(...args: RouteArgs<Route>): Transition;
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
index 1b293a5ec72..c13669186b1 100644
--- a/packages/@ember/controller/type-tests/index.test.ts
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -23,7 +23,7 @@ expectTypeOf(controller.target).toEqualTypeOf<unknown | undefined>();
 
 expectTypeOf(controller.model).toEqualTypeOf<Foo>();
 
-expectTypeOf(controller.concatenatedProperties).toEqualTypeOf<string[]>();
+expectTypeOf(controller.concatenatedProperties).toEqualTypeOf<string[] | string | undefined>();
 
 expectTypeOf(controller.queryParams).toEqualTypeOf<
   Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index dd875ccec75..279d099a37a 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -10,18 +10,19 @@ expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
 /** Newable tests */
 const co1 = new CoreObject(owner);
 
-expectTypeOf(co1.concatenatedProperties).toEqualTypeOf<string[]>();
+expectTypeOf(co1.concatenatedProperties).toEqualTypeOf<string[] | string | undefined>();
 expectTypeOf(co1.isDestroyed).toEqualTypeOf<boolean>();
 expectTypeOf(co1.isDestroying).toEqualTypeOf<boolean>();
-expectTypeOf(co1.destroy()).toEqualTypeOf<void>();
+expectTypeOf(co1.destroy()).toEqualTypeOf<CoreObject>();
 expectTypeOf(co1.toString()).toEqualTypeOf<string>();
 
 /** .create tests */
+
 const co2 = CoreObject.create();
-expectTypeOf(co2.concatenatedProperties).toEqualTypeOf<string[]>();
+expectTypeOf(co2.concatenatedProperties).toEqualTypeOf<string[] | string | undefined>();
 expectTypeOf(co2.isDestroyed).toEqualTypeOf<boolean>();
 expectTypeOf(co2.isDestroying).toEqualTypeOf<boolean>();
-expectTypeOf(co2.destroy()).toEqualTypeOf<void>();
+expectTypeOf(co2.destroy()).toEqualTypeOf<CoreObject>();
 expectTypeOf(co2.toString()).toEqualTypeOf<string>();
 
 /** .create tests w/ initial instance data passed in */

From cb84a728bcb7e60fc9896713261834fa53fa99ae Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 17 Mar 2022 09:48:13 -0700
Subject: [PATCH 0951/1405] Incorporate suggestions

---
 .../-internals/glimmer/lib/component.ts       | 28 +++++++++++++++----
 .../@ember/-internals/glimmer/lib/renderer.ts |  2 +-
 packages/@ember/-internals/metal/lib/mixin.ts |  4 +--
 .../runtime/lib/system/core_object.ts         | 11 +++-----
 .../-internals/views/lib/views/core_view.ts   | 12 ++++++--
 5 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 320b3aacfea..6bb58b22c07 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -808,7 +808,8 @@ class Component extends CoreView.extend(
   ActionSupport,
   ViewMixin,
   {
-    // Make sure these are overrideable, but get a default
+    // These need to be overridable via extend/create but should still
+    // have a default. Defining them here is the best way to achieve that.
     didReceiveAttrs() {},
     didRender() {},
     didUpdate() {},
@@ -819,12 +820,16 @@ class Component extends CoreView.extend(
 ) {
   isComponent = true;
 
-  _superRerender?: ViewMixin['rerender'];
+  // SAFTEY: This is set in `init`.
+  declare _superRerender: ViewMixin['rerender'];
 
   init(properties: object | undefined) {
     super.init(properties);
 
-    // Handle methods from ViewMixin
+    // Handle methods from ViewMixin.
+    // The native class inheritance will not work for mixins. To work around this,
+    // we copy the existing rerender method provided by the mixin and swap in the
+    // new rerender method from our class.
     this._superRerender = this.rerender;
     this.rerender = this._rerender;
 
@@ -859,9 +864,9 @@ class Component extends CoreView.extend(
       let events = eventDispatcher.finalEventNameMapping;
 
       for (let key in events) {
-        let methodName = events[key]!;
+        let methodName = events[key];
 
-        if (typeof this[methodName] === 'function') {
+        if (methodName && typeof this[methodName] === 'function') {
           eventNames.push(methodName);
         }
       }
@@ -904,13 +909,16 @@ class Component extends CoreView.extend(
   on(name: string, method: ((...args: any[]) => void) | string): this;
   on(name: string, target: any, method?: any) {
     this._dispatcher?.setupHandlerForEmberEvent(name);
+    // The `on` method here comes from the Evented mixin. Since this mixin
+    // is applied to the parent of this class, however, we are still able
+    // to use `super`.
     return super.on(name, target, method);
   }
 
   // Changed to `rerender` on init
   _rerender() {
     dirtyTag(this[DIRTY_TAG]);
-    this._superRerender!();
+    this._superRerender();
   }
 
   [PROPERTY_DID_CHANGE](key: string, value?: unknown) {
@@ -982,6 +990,13 @@ class Component extends CoreView.extend(
     return element[normalized];
   }
 
+  // --- Declarations which support mixins ---
+  // We use `declare` on these properties, even though they are optional, so
+  // that they do not get created on the class *at all* when emitting the
+  // transpiled code. Otherwise, since declared class properties are equivalent
+  // to calling `defineProperty` in the class constructor, they would "stomp"
+  // the properties supplied by mixins.
+
   declare attributeBindings?: string[];
 
   /**
@@ -1026,6 +1041,7 @@ class Component extends CoreView.extend(
   }
 }
 
+// We continue to use reopenClass here so that positionalParams can be overridden with reopenClass in subclasses.
 Component.reopenClass({
   /**
    Enables components to take a list of parameters as arguments.
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 0c02461633c..0577231463a 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -294,7 +294,7 @@ export class Renderer {
   private _lastRevision = -1;
   private _destroyed = false;
 
-  /** @private */
+  /** @internal */
   _isInteractive: boolean;
 
   readonly _runtimeResolver: ResolverImpl;
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index a818c0eb8bc..eb2302f1cc0 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -384,7 +384,7 @@ function updateObserversAndListeners(obj: object, key: string, fn: Function, add
 }
 
 export function applyMixin(
-  obj: { [key: string]: any },
+  obj: Record<string, any>,
   mixins: Array<Mixin | Record<string, unknown>>,
   _hideKeys = false
 ) {
@@ -604,8 +604,6 @@ export default class Mixin {
     @private
     @internal
   */
-  // Args should be `Array<Mixin | Record<string, unknown>>` but this causes
-  // types to be overly strict.
   reopen(...args: any[]): this | undefined {
     if (args.length === 0) {
       return;
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.ts b/packages/@ember/-internals/runtime/lib/system/core_object.ts
index 3eff0461b1b..6c72782e4c4 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.ts
@@ -3,7 +3,8 @@
 */
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
-import { getOwner, Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
 import {
@@ -117,7 +118,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
         if (
           concatenatedProperties !== undefined &&
           concatenatedProperties.length > 0 &&
-          concatenatedProperties.indexOf(keyName) > -1
+          concatenatedProperties.includes(keyName)
         ) {
           let baseValue = obj[keyName];
           if (baseValue) {
@@ -130,7 +131,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
         if (
           mergedProperties !== undefined &&
           mergedProperties.length > 0 &&
-          mergedProperties.indexOf(keyName) > -1
+          mergedProperties.includes(keyName)
         ) {
           let baseValue = obj[keyName];
           value = Object.assign({}, baseValue, value);
@@ -707,8 +708,6 @@ class CoreObject {
     @param {Object} [arguments]* Object containing values to use within the new class
     @public
   */
-  // Args should be `Array<Mixin | Record<string, unknown>>` but this causes
-  // types to be overly strict.
   static extend<Statics, Instance>(
     this: Statics & EmberClassConstructor<Instance>,
     ...mixins: any[]
@@ -818,8 +817,6 @@ class CoreObject {
     @static
     @public
   */
-  // Args should be `Array<Mixin | Record<string, unknown>>` but this causes
-  // types to be overly strict.
   static reopen(...args: any[]) {
     this.willReopen();
     reopen.apply(this.PrototypeMixin, args);
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 3a640fa75c2..4e883b243c9 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -21,10 +21,15 @@ import states from './states';
 */
 
 interface CoreView extends FrameworkObject, Evented, ActionHandler, View {}
-class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
+class CoreView extends FrameworkObject.extend(Evented, ActionHandler, {
+  // Continue to declare `_states` here so that we have a single reference on the prototype
+  // instead of one on each instance.
+  _states: states,
+}) {
   isView = true;
 
-  _states = states;
+  declare _states: typeof states;
+
   _state: unknown;
   _currentState: unknown;
 
@@ -46,6 +51,9 @@ class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
     super.init(properties);
 
     // Handle methods from Evented
+    // The native class inheritance will not work for mixins. To work around this,
+    // we copy the existing trigger and has methods provided by the mixin and swap in the
+    // new ones from our class.
     this._superTrigger = this.trigger;
     this.trigger = this._trigger;
     this._superHas = this.has;

From b8ad06687618b7d9a243977c7ad9cdcf9510e4ad Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 17 Mar 2022 16:14:18 -0600
Subject: [PATCH 0952/1405] Revert "export `renderSettled` via
 `@ember/renderer` package"

---
 packages/@ember/renderer/index.ts | 21 ---------------------
 tests/docs/expected.js            |  1 -
 2 files changed, 22 deletions(-)
 delete mode 100644 packages/@ember/renderer/index.ts

diff --git a/packages/@ember/renderer/index.ts b/packages/@ember/renderer/index.ts
deleted file mode 100644
index 1f6c2b096ec..00000000000
--- a/packages/@ember/renderer/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
-  @module @ember/renderer
-  @public
-*/
-
-/**
- * @class Renderer
- * @public
- */
-
-/**
-  Returns a promise which will resolve when rendering has settled. Settled in
-  this context is defined as when all of the tags in use are "current" (e.g.
-  `renderers.every(r => r._isValid())`). When this is checked at the _end_ of
-  the run loop, this essentially guarantees that all rendering is completed.
-
-  @method renderSettled
-  @return {Promise<void>} a promise which fulfills when rendering has settled
-  @public
-*/
-export { renderSettled } from '@ember/-internals/glimmer';
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index e57a7e9e118..81253774e8f 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -420,7 +420,6 @@ module.exports = {
     'removeObjects',
     'removeObserver',
     'removeTestHelpers',
-    'renderSettled',
     'reopen',
     'reopenClass',
     'replace',

From f8e1b81d5359fc5f544d376b0bc1ed152ad187e3 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 18 Mar 2022 17:00:36 +0100
Subject: [PATCH 0953/1405] [DOC] Change `comma separated` to `dot separated`
 for `currentRouteName`

---
 packages/@ember/-internals/routing/lib/services/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index ad962dc7c7c..7edb91c576e 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -582,7 +582,7 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
    Name of the current route.
 
     This property represents the logical name of the route,
-    which is comma separated.
+    which is dot separated.
     For the following router:
 
     ```app/router.js

From 9adc2739b5accb9afeec9543dce2a66dd4974b2f Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 09:34:23 -0700
Subject: [PATCH 0954/1405] Upgrade eslint and prettier dependencies

---
 package.json |  10 +--
 yarn.lock    | 204 +++++++++++++++++++++------------------------------
 2 files changed, 90 insertions(+), 124 deletions(-)

diff --git a/package.json b/package.json
index 71957d227a0..09513a90b0f 100644
--- a/package.json
+++ b/package.json
@@ -94,8 +94,8 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.10.0",
-    "@typescript-eslint/parser": "^5.13.0",
+    "@typescript-eslint/eslint-plugin": "^5.15.0",
+    "@typescript-eslint/parser": "^5.15.0",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1083.0",
     "babel-template": "^6.26.0",
@@ -117,8 +117,8 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.7.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint": "^8.11.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^2.0.0",
@@ -139,7 +139,7 @@
     "mkdirp": "^1.0.4",
     "mocha": "^9.2.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.1.2",
+    "prettier": "^2.6.0",
     "puppeteer": "^13.4.1",
     "qunit": "^2.14.0",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 01a0dc97d81..642afc6b9ae 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1269,16 +1269,16 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@eslint/eslintrc@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
-  integrity sha512-BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ==
+"@eslint/eslintrc@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
+  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.2.0"
+    espree "^9.3.1"
     globals "^13.9.0"
-    ignore "^4.0.6"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
     minimatch "^3.0.4"
@@ -1800,14 +1800,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.0.tgz#e90afea96dff8620892ad216b0e4ccdf8ee32d3a"
-  integrity sha512-XXVKnMsq2fuu9K2KsIxPUGqb6xAImz8MEChClbXmE3VbveFtBUU5bzM6IPVWqzyADIgdkS2Ws/6Xo7W2TeZWjQ==
+"@typescript-eslint/eslint-plugin@^5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a"
+  integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.10.0"
-    "@typescript-eslint/type-utils" "5.10.0"
-    "@typescript-eslint/utils" "5.10.0"
+    "@typescript-eslint/scope-manager" "5.15.0"
+    "@typescript-eslint/type-utils" "5.15.0"
+    "@typescript-eslint/utils" "5.15.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -1815,103 +1815,69 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.13.0.tgz#0394ed8f2f849273c0bf4b811994d177112ced5c"
-  integrity sha512-GdrU4GvBE29tm2RqWOM0P5QfCtgCyN4hXICj/X9ibKED16136l9ZpoJvCL5pSKtmJzA+NRDzQ312wWMejCVVfg==
+"@typescript-eslint/parser@^5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728"
+  integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.13.0"
-    "@typescript-eslint/types" "5.13.0"
-    "@typescript-eslint/typescript-estree" "5.13.0"
+    "@typescript-eslint/scope-manager" "5.15.0"
+    "@typescript-eslint/types" "5.15.0"
+    "@typescript-eslint/typescript-estree" "5.15.0"
     debug "^4.3.2"
 
-"@typescript-eslint/scope-manager@5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.10.0.tgz#bb5d872e8b9e36203908595507fbc4d3105329cb"
-  integrity sha512-tgNgUgb4MhqK6DoKn3RBhyZ9aJga7EQrw+2/OiDk5hKf3pTVZWyqBi7ukP+Z0iEEDMF5FDa64LqODzlfE4O/Dg==
+"@typescript-eslint/scope-manager@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee"
+  integrity sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg==
   dependencies:
-    "@typescript-eslint/types" "5.10.0"
-    "@typescript-eslint/visitor-keys" "5.10.0"
+    "@typescript-eslint/types" "5.15.0"
+    "@typescript-eslint/visitor-keys" "5.15.0"
 
-"@typescript-eslint/scope-manager@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.13.0.tgz#cf6aff61ca497cb19f0397eea8444a58f46156b6"
-  integrity sha512-T4N8UvKYDSfVYdmJq7g2IPJYCRzwtp74KyDZytkR4OL3NRupvswvmJQJ4CX5tDSurW2cvCc1Ia1qM7d0jpa7IA==
+"@typescript-eslint/type-utils@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248"
+  integrity sha512-KGeDoEQ7gHieLydujGEFLyLofipe9PIzfvA/41urz4hv+xVxPEbmMQonKSynZ0Ks2xDhJQ4VYjB3DnRiywvKDA==
   dependencies:
-    "@typescript-eslint/types" "5.13.0"
-    "@typescript-eslint/visitor-keys" "5.13.0"
-
-"@typescript-eslint/type-utils@5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.10.0.tgz#8524b9479c19c478347a7df216827e749e4a51e5"
-  integrity sha512-TzlyTmufJO5V886N+hTJBGIfnjQDQ32rJYxPaeiyWKdjsv2Ld5l8cbS7pxim4DeNs62fKzRSt8Q14Evs4JnZyQ==
-  dependencies:
-    "@typescript-eslint/utils" "5.10.0"
+    "@typescript-eslint/utils" "5.15.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.10.0.tgz#beb3cb345076f5b088afe996d57bcd1dfddaa75c"
-  integrity sha512-wUljCgkqHsMZbw60IbOqT/puLfyqqD5PquGiBo1u1IS3PLxdi3RDGlyf032IJyh+eQoGhz9kzhtZa+VC4eWTlQ==
-
-"@typescript-eslint/types@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.13.0.tgz#da1de4ae905b1b9ff682cab0bed6b2e3be9c04e5"
-  integrity sha512-LmE/KO6DUy0nFY/OoQU0XelnmDt+V8lPQhh8MOVa7Y5k2gGRd6U9Kp3wAjhB4OHg57tUO0nOnwYQhRRyEAyOyg==
-
-"@typescript-eslint/typescript-estree@5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.0.tgz#4be24a3dea0f930bb1397c46187d0efdd955a224"
-  integrity sha512-x+7e5IqfwLwsxTdliHRtlIYkgdtYXzE0CkFeV6ytAqq431ZyxCFzNMNR5sr3WOlIG/ihVZr9K/y71VHTF/DUQA==
-  dependencies:
-    "@typescript-eslint/types" "5.10.0"
-    "@typescript-eslint/visitor-keys" "5.10.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
-    is-glob "^4.0.3"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501"
+  integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA==
 
-"@typescript-eslint/typescript-estree@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.13.0.tgz#b37c07b748ff030a3e93d87c842714e020b78141"
-  integrity sha512-Q9cQow0DeLjnp5DuEDjLZ6JIkwGx3oYZe+BfcNuw/POhtpcxMTy18Icl6BJqTSd+3ftsrfuVb7mNHRZf7xiaNA==
+"@typescript-eslint/typescript-estree@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac"
+  integrity sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA==
   dependencies:
-    "@typescript-eslint/types" "5.13.0"
-    "@typescript-eslint/visitor-keys" "5.13.0"
+    "@typescript-eslint/types" "5.15.0"
+    "@typescript-eslint/visitor-keys" "5.15.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.10.0.tgz#c3d152a85da77c400e37281355561c72fb1b5a65"
-  integrity sha512-IGYwlt1CVcFoE2ueW4/ioEwybR60RAdGeiJX/iDAw0t5w0wK3S7QncDwpmsM70nKgGTuVchEWB8lwZwHqPAWRg==
+"@typescript-eslint/utils@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136"
+  integrity sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.10.0"
-    "@typescript-eslint/types" "5.10.0"
-    "@typescript-eslint/typescript-estree" "5.10.0"
+    "@typescript-eslint/scope-manager" "5.15.0"
+    "@typescript-eslint/types" "5.15.0"
+    "@typescript-eslint/typescript-estree" "5.15.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.10.0":
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.0.tgz#770215497ad67cd15a572b52089991d5dfe06281"
-  integrity sha512-GMxj0K1uyrFLPKASLmZzCuSddmjZVbVj3Ouy5QVuIGKZopxvOr24JsS7gruz6C3GExE01mublZ3mIBOaon9zuQ==
+"@typescript-eslint/visitor-keys@5.15.0":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027"
+  integrity sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ==
   dependencies:
-    "@typescript-eslint/types" "5.10.0"
-    eslint-visitor-keys "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.13.0":
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.13.0.tgz#f45ff55bcce16403b221ac9240fbeeae4764f0fd"
-  integrity sha512-HLKEAS/qA1V7d9EzcpLFykTePmOQqOFim8oCvhY3pZgQ8Hi38hYpHd9e5GN6nQBFQNecNhws5wkS9Y5XIO0s/g==
-  dependencies:
-    "@typescript-eslint/types" "5.13.0"
+    "@typescript-eslint/types" "5.15.0"
     eslint-visitor-keys "^3.0.0"
 
 "@ungap/promise-all-settled@1.1.2":
@@ -4648,10 +4614,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-eslint-config-prettier@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
-  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
+eslint-config-prettier@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
+  integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
 
 eslint-import-resolver-node@^0.3.6:
   version "0.3.6"
@@ -4746,10 +4712,10 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.0.tgz#c1f6ea30ac583031f203d65c73e723b01298f153"
-  integrity sha512-aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg==
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -4778,17 +4744,22 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.2.0:
+eslint-visitor-keys@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
   integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
 
-eslint@^8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.7.0.tgz#22e036842ee5b7cf87b03fe237731675b4d3633c"
-  integrity sha512-ifHYzkBGrzS2iDU7KjhCAVMGCvF6M3Xfs8X8b37cgrUlDt6bWRTpRh6T/gtSXv1HJ/BUGgmjvNvOEGu85Iif7w==
+eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
+eslint@^8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37"
+  integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==
   dependencies:
-    "@eslint/eslintrc" "^1.0.5"
+    "@eslint/eslintrc" "^1.2.1"
     "@humanwhocodes/config-array" "^0.9.2"
     ajv "^6.10.0"
     chalk "^4.0.0"
@@ -4796,10 +4767,10 @@ eslint@^8.7.0:
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.0"
+    eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.2.0"
-    espree "^9.3.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.1"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -4829,14 +4800,14 @@ esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
   integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
 
-espree@^9.2.0, espree@^9.3.0:
-  version "9.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.0.tgz#c1240d79183b72aaee6ccfa5a90bc9111df085a8"
-  integrity sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==
+espree@^9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
+  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
   dependencies:
     acorn "^8.7.0"
     acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^3.1.0"
+    eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
@@ -6161,11 +6132,6 @@ ieee754@1.1.13, ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q= sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw= sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
-
 ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
@@ -8471,16 +8437,16 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5"
-  integrity "sha1-MFBwDa4uTItnxMP2Zs24r0BeHOU= sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg=="
-
 prettier@^2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
   integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
 
+prettier@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
+  integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
+
 pretty-ms@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.1.0.tgz#e9cac9c76bf6ee52fe942dd9c6c4213153b12881"

From 8bf11dd82972a49bd3ddef245844fc84db7028f9 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 09:37:09 -0700
Subject: [PATCH 0955/1405] Bump some minor dependency versions

---
 package.json |  12 +--
 yarn.lock    | 259 +++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 206 insertions(+), 65 deletions(-)

diff --git a/package.json b/package.json
index 09513a90b0f..a0921d9310d 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
     "ember-auto-import": "^2.4.0",
-    "ember-cli-babel": "^7.23.0",
+    "ember-cli-babel": "^7.26.11",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cli-normalize-entity-name": "^1.0.0",
@@ -97,7 +97,7 @@
     "@typescript-eslint/eslint-plugin": "^5.15.0",
     "@typescript-eslint/parser": "^5.15.0",
     "auto-dist-tag": "^2.1.1",
-    "aws-sdk": "^2.1083.0",
+    "aws-sdk": "^2.1095.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
@@ -128,7 +128,7 @@
     "eslint-plugin-qunit": "^7.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.13.0",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "finalhandler": "^1.1.2",
     "fs-extra": "^10.0.1",
     "git-repo-info": "^2.1.1",
@@ -137,17 +137,17 @@
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
-    "mocha": "^9.2.0",
+    "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.0",
-    "puppeteer": "^13.4.1",
+    "puppeteer": "^13.5.1",
     "qunit": "^2.14.0",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
     "router_js": "^8.0.2",
     "rsvp": "^4.8.5",
-    "serve-static": "^1.14.1",
+    "serve-static": "^1.14.2",
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 642afc6b9ae..bcf60fa3197 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -486,7 +486,7 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
   integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
 
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -1023,7 +1023,7 @@
     core-js "^2.6.5"
     regenerator-runtime "^0.13.4"
 
-"@babel/preset-env@^7.12.0", "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
+"@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
   integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
@@ -1895,7 +1895,7 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg= sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -2263,7 +2263,7 @@ auto-dist-tag@^2.1.1:
     pkg-up "^3.0.0"
     semver "^7.0.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.1083.0:
+aws-sdk@^2.0.9:
   version "2.1083.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1083.0.tgz#afdc3d99d035b84b1dc75437f7670af0078ed2ab"
   integrity sha512-o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==
@@ -2278,6 +2278,21 @@ aws-sdk@^2.0.9, aws-sdk@^2.1083.0:
     uuid "3.3.2"
     xml2js "0.4.19"
 
+aws-sdk@^2.1095.0:
+  version "2.1095.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1095.0.tgz#7847493b09a326a0613010ed9db53302f760edf6"
+  integrity sha512-OrZq2pTDsnfOJYsAdRlw+NXTGLQYqWldSZR3HugW8JT4JPWyFZrgB2yPP2ElFHX+4J4SZg5QvkAXl/7s9gLTgA==
+  dependencies:
+    buffer "4.9.2"
+    events "1.1.1"
+    ieee754 "1.1.13"
+    jmespath "0.16.0"
+    querystring "0.2.0"
+    sax "1.2.1"
+    url "0.10.3"
+    uuid "3.3.2"
+    xml2js "0.4.19"
+
 aws-sign2@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz#c57103f7a17fc037f02d7c2e64b602ea223f7d63"
@@ -2592,6 +2607,22 @@ body-parser@1.19.0:
     raw-body "2.4.0"
     type-is "~1.6.17"
 
+body-parser@1.19.2:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
+  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "~1.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    on-finished "~2.3.0"
+    qs "6.9.7"
+    raw-body "2.4.3"
+    type-is "~1.6.18"
+
 body@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069"
@@ -3202,6 +3233,11 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
 
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -3682,6 +3718,13 @@ content-disposition@0.5.3:
   dependencies:
     safe-buffer "5.1.2"
 
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
+  dependencies:
+    safe-buffer "5.2.1"
+
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -3709,7 +3752,7 @@ cookie@0.4.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
   integrity "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo= sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
 
-cookie@~0.4.1:
+cookie@0.4.2, cookie@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
@@ -3992,10 +4035,10 @@ detect-newline@3.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-devtools-protocol@0.0.960912:
-  version "0.0.960912"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.960912.tgz#411c1fa355eddb72f06c4a8743f2808766db6245"
-  integrity sha512-I3hWmV9rWHbdnUdmMKHF2NuYutIM2kXz2mdXW8ha7TbRlGTVs+PF+PsB5QWvpCek4Fy9B+msiispCfwlhG5Sqg==
+devtools-protocol@0.0.969999:
+  version "0.0.969999"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.969999.tgz#3d6be0a126b3607bb399ae2719b471dda71f3478"
+  integrity sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==
 
 diff@1.0.8:
   version "1.0.8"
@@ -4101,40 +4144,7 @@ ember-cli-babel-plugin-helpers@^1.1.1:
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.23.0:
-  version "7.26.6"
-  resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.6.tgz#322fbbd3baad9dd99e3276ff05bc6faef5e54b39"
-  integrity sha512-040svtfj2RC35j/WMwdWJFusZaXmNoytLAMyBDGLMSlRvznudTxZjGlPV6UupmtTBApy58cEF8Fq4a+COWoEmQ==
-  dependencies:
-    "@babel/core" "^7.12.0"
-    "@babel/helper-compilation-targets" "^7.12.0"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-decorators" "^7.13.5"
-    "@babel/plugin-transform-modules-amd" "^7.13.0"
-    "@babel/plugin-transform-runtime" "^7.13.9"
-    "@babel/plugin-transform-typescript" "^7.13.0"
-    "@babel/polyfill" "^7.11.5"
-    "@babel/preset-env" "^7.12.0"
-    "@babel/runtime" "7.12.18"
-    amd-name-resolver "^1.3.1"
-    babel-plugin-debug-macros "^0.3.4"
-    babel-plugin-ember-data-packages-polyfill "^0.1.2"
-    babel-plugin-ember-modules-api-polyfill "^3.5.0"
-    babel-plugin-module-resolver "^3.2.0"
-    broccoli-babel-transpiler "^7.8.0"
-    broccoli-debug "^0.6.4"
-    broccoli-funnel "^2.0.2"
-    broccoli-source "^2.1.2"
-    clone "^2.1.2"
-    ember-cli-babel-plugin-helpers "^1.1.1"
-    ember-cli-version-checker "^4.1.0"
-    ensure-posix-path "^1.0.2"
-    fixturify-project "^1.10.0"
-    resolve-package-path "^3.1.0"
-    rimraf "^3.0.1"
-    semver "^5.5.0"
-
-ember-cli-babel@^7.26.6:
+ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -5013,6 +5023,42 @@ express@^4.10.7, express@^4.13.1, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.17.3:
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
+  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.19.2"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.4.2"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "~1.1.2"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.9.7"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.17.2"
+    serve-static "1.14.2"
+    setprototypeof "1.2.0"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5379,6 +5425,11 @@ form-data@~0.1.0:
     combined-stream "~0.0.4"
     mime "~1.2.11"
 
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -6043,6 +6094,17 @@ http-errors@1.7.2, http-errors@~1.7.2:
     statuses ">= 1.5.0 < 2"
     toidentifier "1.0.0"
 
+http-errors@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
+  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.1"
+
 http-errors@~1.6.2:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
@@ -6168,7 +6230,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6239,6 +6301,11 @@ ipaddr.js@1.9.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
   integrity "sha1-N9905DCg5HVQ/lSi3v4w2KzZX2U= sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
 
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
 irregular-plurals@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766"
@@ -7607,13 +7674,20 @@ mini-css-extract-plugin@^2.5.2:
   dependencies:
     schema-utils "^4.0.0"
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4"
+  integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -7671,10 +7745,10 @@ mktemp@~0.4.0:
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
   integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
-mocha@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.0.tgz#2bfba73d46e392901f877ab9a47b7c9c5d0275cc"
-  integrity sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==
+mocha@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
+  integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==
   dependencies:
     "@ungap/promise-all-settled" "1.1.2"
     ansi-colors "4.1.1"
@@ -7689,9 +7763,9 @@ mocha@^9.2.0:
     he "1.2.0"
     js-yaml "4.1.0"
     log-symbols "4.1.0"
-    minimatch "3.0.4"
+    minimatch "4.2.1"
     ms "2.1.3"
-    nanoid "3.2.0"
+    nanoid "3.3.1"
     serialize-javascript "6.0.0"
     strip-json-comments "3.1.1"
     supports-color "8.1.1"
@@ -7752,7 +7826,12 @@ nanocolors@^0.1.5:
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
   integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
-nanoid@3.2.0, nanoid@^3.1.25:
+nanoid@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
+  integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
+
+nanoid@^3.1.25:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
   integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
@@ -8507,6 +8586,14 @@ proxy-addr@~2.0.5:
     forwarded "~0.1.2"
     ipaddr.js "1.9.0"
 
+proxy-addr@~2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
+  dependencies:
+    forwarded "0.2.0"
+    ipaddr.js "1.9.1"
+
 proxy-from-env@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
@@ -8542,14 +8629,14 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity "sha1-tYsBCsQMIsVldhbI0sLALHv0eew= sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 
-puppeteer@^13.4.1:
-  version "13.4.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.4.1.tgz#495b91d2fae3e9761a31bab1820ad179caac0fd9"
-  integrity sha512-2arcYPEGvLV9HvOw01Zv1b1IAXrMWHqsFJn0Hn00qe9HtCmaF0b8FlrbdLjCIbkaFc6icH5+GqcG8R5KxlJSRg==
+puppeteer@^13.5.1:
+  version "13.5.1"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.5.1.tgz#d0f751bf36120efc2ebf74c7562a204a84e500e9"
+  integrity sha512-wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w==
   dependencies:
     cross-fetch "3.1.5"
     debug "4.3.3"
-    devtools-protocol "0.0.960912"
+    devtools-protocol "0.0.969999"
     extract-zip "2.0.1"
     https-proxy-agent "5.0.0"
     pkg-dir "4.2.0"
@@ -8570,6 +8657,11 @@ qs@6.7.0, qs@^6.4.0:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
 
+qs@6.9.7:
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
+  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+
 qs@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-1.0.2.tgz#50a93e2b5af6691c31bcea5dae78ee6ea1903768"
@@ -8634,6 +8726,16 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+raw-body@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
+  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "1.8.1"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 raw-body@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425"
@@ -9138,7 +9240,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity "sha1-Hq+fqb2x/dTsdfWPnNtOa3gn7sY= sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
@@ -9269,6 +9371,25 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
+send@0.17.2:
+  version "0.17.2"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
+  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+  dependencies:
+    debug "2.6.9"
+    depd "~1.1.2"
+    destroy "~1.0.4"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "1.8.1"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "~2.3.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
+
 serialize-javascript@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
@@ -9276,7 +9397,7 @@ serialize-javascript@6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.14.1, serve-static@^1.14.1:
+serve-static@1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk= sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="
@@ -9286,6 +9407,16 @@ serve-static@1.14.1, serve-static@^1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
+serve-static@1.14.2, serve-static@^1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
+  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.17.2"
+
 set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -9328,6 +9459,11 @@ setprototypeof@1.1.1:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
   integrity "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
 
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -10116,6 +10252,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
 
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
 tough-cookie@>=0.12.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"

From 9451d28335945e6e034280cf091d3ceb89dbbf0e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 09:38:11 -0700
Subject: [PATCH 0956/1405] Bump ember-cli version

---
 package.json |  2 +-
 yarn.lock    | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index a0921d9310d..5d2e722393c 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
-    "ember-cli": "^4.1.1",
+    "ember-cli": "^4.2.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index bcf60fa3197..12d808d4572 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,7 +40,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
   integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
 
-"@babel/core@^7.12.0", "@babel/core@^7.16.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
+"@babel/core@^7.12.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
   version "7.17.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
   integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
@@ -846,7 +846,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
+"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
   integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
@@ -4312,13 +4312,13 @@ ember-cli-yuidoc@^0.9.1:
     rsvp "3.0.14"
     yuidocjs "^0.10.0"
 
-ember-cli@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.1.1.tgz#166a15f44b1ec6d4643261a18c3faa1b2cd4a5a2"
-  integrity sha512-QFgV14wYOPIc4h1szQ8OW5evPUn7B8YZDs/dexRmD6x9+Y/2BH8lmWyO6vFopBhgV91w1/mSiNDsef+MSdBLbQ==
+ember-cli@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.2.0.tgz#5b7fc39d7543fd23056f836f445a3a8307473d72"
+  integrity sha512-HkWw9lqgBoQTHPgHOkKdpw0toPsHnTMg2acCBd7Vneztn2TdDXJQgy4KheB4NoL1NDDFXHOu+PnL4feHUB7wCg==
   dependencies:
-    "@babel/core" "^7.16.0"
-    "@babel/plugin-transform-modules-amd" "^7.12.1"
+    "@babel/core" "^7.16.7"
+    "@babel/plugin-transform-modules-amd" "^7.16.7"
     amd-name-resolver "^1.3.1"
     babel-plugin-module-resolver "^4.1.0"
     bower-config "^1.4.3"
@@ -4358,7 +4358,7 @@ ember-cli@^4.1.1:
     ensure-posix-path "^1.1.1"
     execa "^5.1.1"
     exit "^0.1.2"
-    express "^4.17.1"
+    express "^4.17.2"
     filesize "^8.0.6"
     find-up "^5.0.0"
     find-yarn-workspace-root "^2.0.0"
@@ -4400,7 +4400,7 @@ ember-cli@^4.1.1:
     sort-package-json "^1.49.0"
     symlink-or-copy "^1.3.1"
     temp "0.9.4"
-    testem "^3.2.0"
+    testem "^3.6.0"
     tiny-lr "^2.0.0"
     tree-sync "^2.1.0"
     uuid "^8.3.2"
@@ -4987,7 +4987,7 @@ expect-type@^0.13.0:
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
   integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
 
-express@^4.10.7, express@^4.13.1, express@^4.17.1:
+express@^4.10.7, express@^4.13.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="
@@ -5023,7 +5023,7 @@ express@^4.10.7, express@^4.13.1, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.17.3:
+express@^4.17.2, express@^4.17.3:
   version "4.17.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
   integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
@@ -10084,7 +10084,7 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.2.0, testem@^3.6.0:
+testem@^3.0.0, testem@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-3.6.0.tgz#bf5c86944bafd035c18f41f520195cce5eef33a8"
   integrity sha512-sXwx2IlOadOhrKf0hsV1Yt/yuYhdfrtJ4dpp7T6pFN62GjMyKifjAv2SFm+4zYHee1JwxheO7JUL0+3iN0rlHw==

From 2b80bb00d4054d13c76dac5b1300bd7187e3bd77 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 10:00:13 -0700
Subject: [PATCH 0957/1405] Upgrade QUnit

---
 package.json                                  |  2 +-
 packages/ember-testing/tests/adapters_test.js | 17 +++++--
 packages/ember/tests/error_handler_test.js    | 16 +++----
 yarn.lock                                     | 44 ++++++++-----------
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 5d2e722393c..9cdb31a416b 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.0",
     "puppeteer": "^13.5.1",
-    "qunit": "^2.14.0",
+    "qunit": "^2.18.0",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
diff --git a/packages/ember-testing/tests/adapters_test.js b/packages/ember-testing/tests/adapters_test.js
index 7d94f0dccc5..0b561aecd9f 100644
--- a/packages/ember-testing/tests/adapters_test.js
+++ b/packages/ember-testing/tests/adapters_test.js
@@ -13,7 +13,12 @@ const HAS_UNHANDLED_REJECTION_HANDLER = 'onunhandledrejection' in window;
 const originalDebug = getDebugFunction('debug');
 const noop = function () {};
 
-let App, originalAdapter, originalQUnit, originalWindowOnerror, originalQUnitUnhandledRejection;
+let App,
+  originalAdapter,
+  originalQUnit,
+  originalWindowOnerror,
+  originalWindowUnhandledRejection,
+  originalQUnitUncaughtException;
 
 const originalConsoleError = console.error; // eslint-disable-line no-console
 
@@ -36,7 +41,8 @@ class AdapterSetupAndTearDown extends AbstractTestCase {
     originalAdapter = Test.adapter;
     originalQUnit = QUnit;
     originalWindowOnerror = window.onerror;
-    originalQUnitUnhandledRejection = QUnit.onUnhandledRejection;
+    originalWindowUnhandledRejection = window.onunhandledrejection;
+    originalQUnitUncaughtException = QUnit.onUncaughtException;
   }
 
   afterEach() {
@@ -53,8 +59,11 @@ class AdapterSetupAndTearDown extends AbstractTestCase {
     window.QUnit = originalQUnit;
     window.onerror = originalWindowOnerror;
     setOnerror(undefined);
+    if (HAS_UNHANDLED_REJECTION_HANDLER) {
+      window.onunhandledrejection = originalWindowUnhandledRejection;
+    }
     console.error = originalConsoleError; // eslint-disable-line no-console
-    QUnit.onUnhandledRejection = originalQUnitUnhandledRejection;
+    QUnit.onUncaughtException = originalQUnitUncaughtException;
   }
 }
 
@@ -262,7 +271,7 @@ function testAdapter(message, generatePromise, timeout = 10) {
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (rejection) {
         assert.pushResult({
diff --git a/packages/ember/tests/error_handler_test.js b/packages/ember/tests/error_handler_test.js
index 61eb7386156..02dfaee9347 100644
--- a/packages/ember/tests/error_handler_test.js
+++ b/packages/ember/tests/error_handler_test.js
@@ -5,7 +5,7 @@ import RSVP from 'rsvp';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 const HAS_UNHANDLED_REJECTION_HANDLER = 'onunhandledrejection' in window;
-let QUNIT_ON_UNHANDLED_REJECTION = QUnit.onUnhandledRejection;
+let QUNIT_ON_UNCAUGHT_EXCEPTION = QUnit.onUncaughtException;
 let WINDOW_ONERROR;
 
 function runThatThrowsSync(message = 'Error for testing error handling') {
@@ -28,7 +28,7 @@ moduleFor(
       window.onerror = WINDOW_ONERROR;
 
       setOnerror(undefined);
-      QUnit.onUnhandledRejection = QUNIT_ON_UNHANDLED_REJECTION;
+      QUnit.onUncaughtException = QUNIT_ON_UNCAUGHT_EXCEPTION;
     }
 
     ['@test by default there is no onerror - sync run'](assert) {
@@ -259,7 +259,7 @@ moduleFor(
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (event) {
         assert.pushResult({
@@ -326,7 +326,7 @@ moduleFor(
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (event) {
         assert.pushResult({
@@ -391,7 +391,7 @@ moduleFor(
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (event) {
         assert.pushResult({
@@ -458,7 +458,7 @@ moduleFor(
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (event) {
         assert.pushResult({
@@ -523,7 +523,7 @@ moduleFor(
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (event) {
         assert.pushResult({
@@ -589,7 +589,7 @@ moduleFor(
       });
 
       // prevent QUnit handler from failing test
-      QUnit.onUnhandledRejection = () => {};
+      QUnit.onUncaughtException = () => {};
 
       window.onunhandledrejection = function (event) {
         assert.pushResult({
diff --git a/yarn.lock b/yarn.lock
index 12d808d4572..dc33c36052d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3611,10 +3611,10 @@ commander@2.8.x:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.0.tgz#b990bfb8ac030aedc6d11bc04d1488ffef56db75"
-  integrity "sha1-uZC/uKwDCu3G0RvATRSI/+9W23U= sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="
+commander@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 commander@^2.20.0, commander@^2.6.0:
   version "2.20.3"
@@ -6668,11 +6668,6 @@ jmespath@0.16.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
   integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
-js-reporters@1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/js-reporters/-/js-reporters-1.2.3.tgz#8febcab370539df62e09b95da133da04b11f6168"
-  integrity "sha1-j+vKs3BTnfYuCbldoTPaBLEfYWg= sha512-2YzWkHbbRu6LueEs5ZP3P1LqbECvAeUJYrjw3H4y1ofW06hqCS0AbzBtLwbr+Hke51bt9CUepJ/Fj1hlCRIF6A=="
-
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -7913,10 +7908,10 @@ node-uuid@~1.4.0:
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
   integrity "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc= sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA=="
 
-node-watch@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.1.tgz#0caaa6a6833b0d533487f953c52a6c787769ba7c"
-  integrity "sha1-DKqmpoM7DVM0h/lTxSpseHdpunw= sha512-UWblPYuZYrkCQCW5PxAwYSxaELNBLUckrTBBk8xr1/bUgyOkYYTsUcV4e3ytcazFEOyiRyiUrsG37pu6I0I05g=="
+node-watch@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.3.tgz#6d4db88e39c8d09d3ea61d6568d80e5975abc7ab"
+  integrity sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==
 
 nopt@^3.0.6:
   version "3.0.6"
@@ -8694,15 +8689,14 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit@^2.14.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.14.0.tgz#6f913903e71ebe24ef4a4dada2b796fb52285051"
-  integrity "sha1-b5E5A+ceviTvSk2toreW+1IoUFE= sha512-CYfenbgdpmhl2Ql2rDrrj0felY4h8k6lYhtWwGBCLL4qQC33YOj0psV8MWo85L1i0SIOmEDRXkFopWnGCLmf7g=="
+qunit@^2.18.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.18.0.tgz#5a3efc8ee609e9d8f207a1ad317a9b02bb14bc6b"
+  integrity sha512-Xw/zUm5t1JY8SNErki/qtw4fCuaaOZL+bPloZU+0kto+fO8j1JV9MQWqXO4kATfhEyJohlsKZpfg1HF7GOkpXw==
   dependencies:
-    commander "6.2.0"
-    js-reporters "1.2.3"
-    node-watch "0.7.1"
-    tiny-glob "0.2.8"
+    commander "7.2.0"
+    node-watch "0.7.3"
+    tiny-glob "0.2.9"
 
 randombytes@^2.1.0:
   version "2.1.0"
@@ -10146,10 +10140,10 @@ time-zone@^1.0.0:
   resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d"
   integrity "sha1-mcW/VZWJZq9tBtg73zgA3IL67F0= sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA=="
 
-tiny-glob@0.2.8:
-  version "0.2.8"
-  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.8.tgz#b2792c396cc62db891ffa161fe8b33e76123e531"
-  integrity "sha1-snksOWzGLbiR/6Fh/osz52Ej5TE= sha512-vkQP7qOslq63XRX9kMswlby99kyO5OvKptw7AMwBVMjXEI7Tb61eoI5DydyEMOseyGS5anDN1VPoVxEvH01q8w=="
+tiny-glob@0.2.9:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
+  integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
   dependencies:
     globalyzer "0.1.0"
     globrex "^0.1.2"

From f055ef670efb4b63ff8db3495fcf9a1c91ff3ff1 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 10:00:59 -0700
Subject: [PATCH 0958/1405] Run yarn-deduplicate

---
 yarn.lock | 389 ++++--------------------------------------------------
 1 file changed, 26 insertions(+), 363 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index dc33c36052d..67cb3ff9965 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,45 +2,26 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.0.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.0.tgz#72becdf17ee44b2d1ac5651fb12f1952c336fe23"
-  integrity sha512-d5RysTlJ7hmw5Tw4UxgxcY3lkMe92n8sXCcuLPAyIAHK6j8DefDwtGnVVDgOnv+RnEosulDJ9NPKQL27bDId0g==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.0"
-
-"@ampproject/remapping@^2.1.0":
+"@ampproject/remapping@^2.0.0", "@ampproject/remapping@^2.1.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
   integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
-  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
-  dependencies:
-    "@babel/highlight" "^7.14.5"
-
-"@babel/code-frame@^7.16.7":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.15.0":
+"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
   integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.8.tgz#31560f9f29fdf1868de8cb55049538a1b9732a60"
-  integrity sha512-m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q==
-
-"@babel/core@^7.12.0", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
+"@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
   version "7.17.5"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
   integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
@@ -61,46 +42,7 @@
     json5 "^2.1.2"
     semver "^6.3.0"
 
-"@babel/core@^7.16.10":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337"
-  integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw==
-  dependencies:
-    "@ampproject/remapping" "^2.0.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.2"
-    "@babel/parser" "^7.17.0"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
-    "@babel/types" "^7.17.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-
-"@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
-  dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
-  integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
-  dependencies:
-    "@babel/types" "^7.17.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.17.3":
+"@babel/generator@^7.16.8", "@babel/generator@^7.17.0", "@babel/generator@^7.17.3", "@babel/generator@^7.9.0":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
   integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
@@ -109,24 +51,7 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz#0f67adea4ec39dad6e63345f70eec33014d78c89"
-  integrity sha512-onl4Oy46oGCzymOXtKMQpI7VXtCbTSHK1kqBydZ6AmzuNcacEVqGk9tZtAS+48IA9IstZcDCgIg8hQKnb7suRw==
-  dependencies:
-    "@babel/types" "^7.9.0"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
-  integrity sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-annotate-as-pure@^7.16.7":
+"@babel/helper-annotate-as-pure@^7.15.4", "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
   integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
@@ -141,27 +66,7 @@
     "@babel/helper-explode-assignable-expression" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-compilation-targets@^7.12.0":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
-  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
-  dependencies:
-    "@babel/compat-data" "^7.12.5"
-    "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.14.5"
-    semver "^5.5.0"
-
-"@babel/helper-compilation-targets@^7.13.0":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
-  integrity sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==
-  dependencies:
-    "@babel/compat-data" "^7.15.0"
-    "@babel/helper-validator-option" "^7.14.5"
-    browserslist "^4.16.6"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.16.7":
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
   integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
@@ -171,45 +76,7 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
-  integrity sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.15.4"
-    "@babel/helper-function-name" "^7.15.4"
-    "@babel/helper-member-expression-to-functions" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/helper-replace-supers" "^7.15.4"
-    "@babel/helper-split-export-declaration" "^7.15.4"
-
-"@babel/helper-create-class-features-plugin@^7.16.10":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz#8a6959b9cc818a88815ba3c5474619e9c0f2c21c"
-  integrity sha512-wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-
-"@babel/helper-create-class-features-plugin@^7.16.7":
-  version "7.17.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21"
-  integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-
-"@babel/helper-create-class-features-plugin@^7.17.1":
+"@babel/helper-create-class-features-plugin@^7.15.4", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1":
   version "7.17.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
   integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
@@ -295,14 +162,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
-  integrity sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==
-  dependencies:
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-member-expression-to-functions@^7.16.7":
+"@babel/helper-member-expression-to-functions@^7.15.4", "@babel/helper-member-expression-to-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
   integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
@@ -337,12 +197,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
-  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
-
-"@babel/helper-plugin-utils@^7.16.7":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
@@ -356,17 +211,7 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.15.4":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
-  integrity sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.15.4"
-    "@babel/helper-optimise-call-expression" "^7.15.4"
-    "@babel/traverse" "^7.15.4"
-    "@babel/types" "^7.15.4"
-
-"@babel/helper-replace-supers@^7.16.7":
+"@babel/helper-replace-supers@^7.15.4", "@babel/helper-replace-supers@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
   integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
@@ -427,16 +272,7 @@
     "@babel/traverse" "^7.17.0"
     "@babel/types" "^7.17.0"
 
-"@babel/highlight@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
-  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.5"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.16.7":
+"@babel/highlight@^7.14.5", "@babel/highlight@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
   integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
@@ -445,26 +281,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.7":
-  version "7.16.12"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.12.tgz#9474794f9a650cf5e2f892444227f98e28cdf8b6"
-  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
-
-"@babel/parser@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
-  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
-
-"@babel/parser@^7.17.3":
+"@babel/parser@^7.16.10", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.17.3", "@babel/parser@^7.4.5", "@babel/parser@^7.9.0":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
   integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
 
-"@babel/parser@^7.4.5", "@babel/parser@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz#4e767f424b479c514077544484d1f9bdba7f1158"
-  integrity sha512-2jyvKdoOS1aWAFL2rjJZmamyDDkPCx/AAz4/Wh1Dfxvw8qqnOvek/ZlHQ2noO/o8JpnXa/WiUUFOv48meBKkpA==
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -721,14 +542,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
-  integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.14.5"
-
-"@babel/plugin-syntax-typescript@^7.16.7":
+"@babel/plugin-syntax-typescript@^7.14.5", "@babel/plugin-syntax-typescript@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
   integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
@@ -982,16 +796,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-typescript@^7.13.0":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.4.tgz#db7a062dcf8be5fc096bc0eeb40a13fbfa1fa251"
-  integrity sha512-sM1/FEjwYjXvMwu1PJStH11kJ154zd/lpY56NQJ5qH2D0mabMv1CAy/kdvS9RP4Xgfj9fBBA3JiSLdDHgXdzOA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.15.4"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    "@babel/plugin-syntax-typescript" "^7.14.5"
-
-"@babel/plugin-transform-typescript@^7.16.8":
+"@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0"
   integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==
@@ -1137,39 +942,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.10.tgz#448f940defbe95b5a8029975b051f75993e8239f"
-  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.10"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.15.4", "@babel/traverse@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
-  integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.0"
-    "@babel/types" "^7.17.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.17.3":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
   integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
@@ -1185,38 +958,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.4.5":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
-  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.15.4", "@babel/types@^7.16.7", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.9.0":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.7.tgz#4ed19d51f840ed4bd5645be6ce40775fecf03159"
-  integrity sha512-E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.16.0", "@babel/types@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.8.tgz#0ba5da91dd71e0a4e7781a30f22770831062e3c1"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.17.0":
+"@babel/types@^7.15.4", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.9.0":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
   integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
@@ -1715,12 +1457,7 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
   integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
 
-"@types/minimatch@*", "@types/minimatch@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/minimatch@^3.0.4":
+"@types/minimatch@*", "@types/minimatch@^3.0.3", "@types/minimatch@^3.0.4":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
@@ -2263,22 +2000,7 @@ auto-dist-tag@^2.1.1:
     pkg-up "^3.0.0"
     semver "^7.0.0"
 
-aws-sdk@^2.0.9:
-  version "2.1083.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1083.0.tgz#afdc3d99d035b84b1dc75437f7670af0078ed2ab"
-  integrity sha512-o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==
-  dependencies:
-    buffer "4.9.2"
-    events "1.1.1"
-    ieee754 "1.1.13"
-    jmespath "0.16.0"
-    querystring "0.2.0"
-    sax "1.2.1"
-    url "0.10.3"
-    uuid "3.3.2"
-    xml2js "0.4.19"
-
-aws-sdk@^2.1095.0:
+aws-sdk@^2.0.9, aws-sdk@^2.1095.0:
   version "2.1095.0"
   resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1095.0.tgz#7847493b09a326a0613010ed9db53302f760edf6"
   integrity sha512-OrZq2pTDsnfOJYsAdRlw+NXTGLQYqWldSZR3HugW8JT4JPWyFZrgB2yPP2ElFHX+4J4SZg5QvkAXl/7s9gLTgA==
@@ -4754,12 +4476,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
-eslint-visitor-keys@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz#6fbb166a6798ee5991358bc2daa1ba76cc1254a1"
-  integrity sha512-IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ==
-
-eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
@@ -4987,43 +4704,7 @@ expect-type@^0.13.0:
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
   integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
 
-express@^4.10.7, express@^4.13.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity "sha1-RJH8OGBc9R+GKdOcK10Cb5ikwTQ= sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="
-  dependencies:
-    accepts "~1.3.7"
-    array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
-    content-type "~1.0.4"
-    cookie "0.4.0"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "~1.1.2"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
-express@^4.17.2, express@^4.17.3:
+express@^4.10.7, express@^4.13.1, express@^4.17.2, express@^4.17.3:
   version "4.17.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
   integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
@@ -7821,16 +7502,11 @@ nanocolors@^0.1.5:
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
   integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
-nanoid@3.3.1:
+nanoid@3.3.1, nanoid@^3.1.25:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
   integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
 
-nanoid@^3.1.25:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
-
 nanomatch@^1.2.9:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
@@ -8511,12 +8187,7 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
-  integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
-
-prettier@^2.6.0:
+prettier@^2.5.1, prettier@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
   integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
@@ -8573,15 +8244,7 @@ promise.hash.helper@^1.0.7:
   resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
   integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
 
-proxy-addr@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
-  integrity "sha1-NMvWSi2B9LH9IedvnwbIpFKZ7jQ= sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ=="
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.9.0"
-
-proxy-addr@~2.0.7:
+proxy-addr@~2.0.5, proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -8647,12 +8310,12 @@ q@~0.9.6:
   resolved "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz#4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"
   integrity "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U= sha512-ijt0LhxWClXBtc1RCt8H0WhlZLAdVX26nWbpsJy+Hblmp81d2F/pFsvlrJhJDDruFHM+ECtxP0H0HzGSrARkwg=="
 
-qs@6.7.0, qs@^6.4.0:
+qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
 
-qs@6.9.7:
+qs@6.9.7, qs@^6.4.0:
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
   integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==

From 44bcd6001897cc2fe54702f7f585a3516d7d82bf Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 11:21:23 -0700
Subject: [PATCH 0959/1405] Update yarn.lock

---
 yarn.lock | 159 ++++++++----------------------------------------------
 1 file changed, 23 insertions(+), 136 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 67cb3ff9965..e75f6e59189 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,21 +2,21 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.0.0", "@ampproject/remapping@^2.1.0":
+"@ampproject/remapping@^2.1.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
   integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
   integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
@@ -42,7 +42,7 @@
     json5 "^2.1.2"
     semver "^6.3.0"
 
-"@babel/generator@^7.16.8", "@babel/generator@^7.17.0", "@babel/generator@^7.17.3", "@babel/generator@^7.9.0":
+"@babel/generator@^7.17.3":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
   integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
@@ -51,7 +51,7 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.15.4", "@babel/helper-annotate-as-pure@^7.16.7":
+"@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
   integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
@@ -76,7 +76,7 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.15.4", "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1":
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1":
   version "7.17.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
   integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
@@ -139,7 +139,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-function-name@^7.15.4", "@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.8.3":
+"@babel/helper-function-name@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
   integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
@@ -162,7 +162,7 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-member-expression-to-functions@^7.15.4", "@babel/helper-member-expression-to-functions@^7.16.7":
+"@babel/helper-member-expression-to-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
   integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
@@ -190,7 +190,7 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/helper-optimise-call-expression@^7.15.4", "@babel/helper-optimise-call-expression@^7.16.7":
+"@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
   integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
@@ -211,7 +211,7 @@
     "@babel/helper-wrap-function" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helper-replace-supers@^7.15.4", "@babel/helper-replace-supers@^7.16.7":
+"@babel/helper-replace-supers@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
   integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
@@ -236,19 +236,19 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-split-export-declaration@^7.15.4", "@babel/helper-split-export-declaration@^7.16.7", "@babel/helper-split-export-declaration@^7.8.3":
+"@babel/helper-split-export-declaration@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
   integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
   dependencies:
     "@babel/types" "^7.16.7"
 
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.16.7":
+"@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
-"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.16.7":
+"@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
@@ -272,7 +272,7 @@
     "@babel/traverse" "^7.17.0"
     "@babel/types" "^7.17.0"
 
-"@babel/highlight@^7.14.5", "@babel/highlight@^7.16.7":
+"@babel/highlight@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
   integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
@@ -281,7 +281,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.17.3", "@babel/parser@^7.4.5", "@babel/parser@^7.9.0":
+"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.4.5":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
   integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
@@ -542,7 +542,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.14.5", "@babel/plugin-syntax-typescript@^7.16.7":
+"@babel/plugin-syntax-typescript@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
   integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
@@ -942,7 +942,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
   integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
@@ -958,7 +958,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.15.4", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2", "@babel/types@^7.9.0":
+"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
   integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
@@ -1632,7 +1632,7 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg= sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8:
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -2313,22 +2313,6 @@ blueimp-md5@^2.10.0:
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935"
   integrity "sha1-EVK+EzXwxrORHtnjbbVPPmrFKTU= sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
 
-body-parser@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity "sha1-lrJwnlfJxOCab9Zqj9l5hE9p8Io= sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="
-  dependencies:
-    bytes "3.1.0"
-    content-type "~1.0.4"
-    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
-
 body-parser@1.19.2:
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
@@ -2868,7 +2852,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA= sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
 
-browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1:
+browserslist@^4.17.5, browserslist@^4.19.1:
   version "4.19.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
   integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
@@ -2950,11 +2934,6 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity "sha1-9s95M6Ng4FiPqf3oVlHNx/gF0fY= sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
-
 bytes@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
@@ -3433,13 +3412,6 @@ consolidate@^0.15.1:
   dependencies:
     bluebird "^3.1.1"
 
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity "sha1-4TDK9+cnkIfFYWwgB9BIVpiYT70= sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="
-  dependencies:
-    safe-buffer "5.1.2"
-
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -3469,11 +3441,6 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity "sha1-4wOogrNCzD7oylE6eZmXNNqzriw= sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity "sha1-vrQ35wIrO21JAZ0IhmUwPr6cFLo= sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-
 cookie@0.4.2, cookie@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
@@ -5111,11 +5078,6 @@ forwarded@0.2.0:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= sha512-Ua9xNhH0b8pwE3yRbFfXJvfdWF0UHNCdeyb2sbi9Ul/M+r3PTdrz7Cv4SCfZRMjmzEM9PhraqfZFbGTIg3OMyA=="
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -5764,17 +5726,6 @@ http-cache-semantics@^4.0.0:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-http-errors@1.7.2, http-errors@~1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity "sha1-T1ApzxMjnzEDblsuVSkrz7zIXI8= sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 http-errors@1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
@@ -5977,11 +5928,6 @@ ip-regex@^2.1.0:
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="
 
-ipaddr.js@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
-  integrity "sha1-N9905DCg5HVQ/lSi3v4w2KzZX2U= sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
-
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -7031,7 +6977,7 @@ lodash.values@~2.3.0:
   dependencies:
     lodash.keys "~2.3.0"
 
-lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
+lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7472,11 +7418,6 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity "sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -8244,7 +8185,7 @@ promise.hash.helper@^1.0.7:
   resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
   integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
 
-proxy-addr@~2.0.5, proxy-addr@~2.0.7:
+proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -8310,11 +8251,6 @@ q@~0.9.6:
   resolved "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz#4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"
   integrity "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U= sha512-ijt0LhxWClXBtc1RCt8H0WhlZLAdVX26nWbpsJy+Hblmp81d2F/pFsvlrJhJDDruFHM+ECtxP0H0HzGSrARkwg=="
 
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity "sha1-QdwaAV49WB8WIXdr4xr7KHapsbw= sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
-
 qs@6.9.7, qs@^6.4.0:
   version "6.9.7"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
@@ -8373,16 +8309,6 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
 
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity "sha1-oc5vucm8NWylLoklarWQWeE9AzI= sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="
-  dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
 raw-body@2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
@@ -9009,25 +8935,6 @@ semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity "sha1-wdiwWfeQD3Rm3Uk4vcROEd2zdsg= sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "~1.7.2"
-    mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
-
 send@0.17.2:
   version "0.17.2"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
@@ -9054,16 +8961,6 @@ serialize-javascript@6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity "sha1-Zm5jbcTwEPfvKZcKiKZ0MgiYsvk= sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.1"
-
 serve-static@1.14.2, serve-static@^1.14.2:
   version "1.14.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
@@ -9111,11 +9008,6 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY= sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity "sha1-fpWsskqpL1iF4KvvW6ExMw1K5oM= sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
-
 setprototypeof@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
@@ -9904,11 +9796,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity "sha1-fhvjRw8ed5SLxD2Uo8j013UrpVM= sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
-
 toidentifier@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
@@ -10029,7 +9916,7 @@ type-fest@^0.8.1:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type-is@~1.6.17, type-is@~1.6.18:
+type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity "sha1-TlUs0F3wlGfcvE73Od6J8s83wTE= sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="

From 65744da10ccd2955e2fcb31a586decb7c06bc1f8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 11:24:24 -0700
Subject: [PATCH 0960/1405] Run yarn lint:fix

---
 .../glimmer/lib/component-managers/curly.ts   |   3 +-
 .../glimmer/lib/component-managers/mount.ts   |   3 +-
 .../glimmer/lib/component-managers/outlet.ts  |   9 +-
 .../glimmer/lib/components/internal.ts        |   3 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |   3 +-
 .../-internals/glimmer/lib/helpers/action.ts  |  66 ++++----
 .../glimmer/lib/helpers/unique-id.ts          |   8 +-
 .../glimmer/lib/modifiers/internal.ts         |   3 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |   8 +-
 .../application/debug-render-tree-test.ts     |  14 +-
 .../glimmer/tests/integration/mount-test.js   |   5 +-
 .../@ember/-internals/metal/lib/decorator.ts  |   6 +-
 .../-internals/metal/tests/main_test.js       |   3 +-
 .../-internals/routing/lib/services/router.ts |   2 +-
 .../-internals/routing/lib/system/route.ts    |   7 +-
 .../@ember/-internals/utils/lib/dictionary.ts |   6 +-
 .../-internals/utils/lib/mandatory-setter.ts  |   6 +-
 .../-internals/views/lib/system/utils.ts      |   4 +-
 .../type-tests/set-helper-manager.test.ts     |   3 +-
 .../@ember/object/type-tests/computed.test.ts |   2 +-
 .../runloop/type-tests.ts/debounce.test.ts    |   6 +-
 .../runloop/type-tests.ts/throttle.test.ts    |   6 +-
 .../router_service_test/recognize_test.js     |  11 +-
 .../lib/ember-dev/deprecation.ts              |   5 +-
 tests/node/component-rendering-test.js        |  33 ++--
 tests/node/overrides-test.js                  | 144 +++++++++---------
 tests/node/template-compiler-test.js          |  34 +++--
 tests/node/visit-test.js                      |   3 +-
 28 files changed, 205 insertions(+), 201 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 771bcc80f18..5595a00536c 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -124,7 +124,8 @@ export default class CurlyComponentManager
   implements
     WithCreateInstance<ComponentStateBucket>,
     WithDynamicLayout<ComponentStateBucket, RuntimeResolver>,
-    WithDynamicTagName<ComponentStateBucket> {
+    WithDynamicTagName<ComponentStateBucket>
+{
   protected templateFor(component: Component): CompilableProgram | null {
     let { layout, layoutName } = component;
     let owner = getOwner(component);
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index c1911994289..cf9482bf2d4 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -55,7 +55,8 @@ class MountManager
     WithCreateInstance<EngineState>,
     WithDynamicLayout<EngineState, RuntimeResolver>,
     WithCustomDebugRenderTree<EngineState, EngineDefinitionState>,
-    WithSubOwner<EngineState> {
+    WithSubOwner<EngineState>
+{
   getDynamicLayout(state: EngineState) {
     let templateFactory = state.engine.lookup('template:application') as TemplateFactory;
     return unwrapTemplate(templateFactory(state.engine)).asLayout();
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 0ad930765ba..9613afd3cdb 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -70,7 +70,8 @@ const CAPABILITIES: InternalComponentCapabilities = {
 class OutletComponentManager
   implements
     WithCreateInstance<OutletInstanceState>,
-    WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState> {
+    WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState>
+{
   create(
     _owner: Owner,
     definition: OutletDefinitionState,
@@ -181,7 +182,8 @@ const OUTLET_MANAGER = new OutletComponentManager();
 
 export class OutletComponentDefinition
   implements
-    ComponentDefinition<OutletDefinitionState, OutletInstanceState, OutletComponentManager> {
+    ComponentDefinition<OutletDefinitionState, OutletInstanceState, OutletComponentManager>
+{
   // handle is not used by this custom definition
   public handle = -1;
 
@@ -212,7 +214,8 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
 
     const WrappedOutletComponentManager = class
       extends OutletComponentManager
-      implements WithDynamicTagName<OutletInstanceState> {
+      implements WithDynamicTagName<OutletInstanceState>
+    {
       getTagName() {
         return 'div';
       }
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index fefc60fe016..147f032a443 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -174,7 +174,8 @@ const CAPABILITIES: InternalComponentCapabilities = {
 class InternalManager
   implements
     InternalComponentManager<InternalComponent, OpaqueInternalComponentConstructor>,
-    WithCreateInstance {
+    WithCreateInstance
+{
   getCapabilities(): InternalComponentCapabilities {
     return CAPABILITIES;
   }
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 78d4f929bca..cdfd42b3c47 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -206,7 +206,8 @@ export const CLASSIC_HELPER_MANAGER = getInternalHelperManager(Helper);
 ///////////
 
 class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
-  implements HelperFactory<SimpleHelper<T, P, N>> {
+  implements HelperFactory<SimpleHelper<T, P, N>>
+{
   isHelperFactory: true = true;
 
   constructor(public compute: HelperFunction<T, P, N>) {}
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 5f390323584..eec3995f2f3 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -282,46 +282,38 @@ export const ACTIONS = new _WeakSet();
   @for Ember.Templates.helpers
   @public
 */
-export default internalHelper(
-  (args: CapturedArguments): Reference<Function> => {
-    let { named, positional } = args;
-    // The first two argument slots are reserved.
-    // pos[0] is the context (or `this`)
-    // pos[1] is the action name or function
-    // Anything else is an action argument.
-    let [context, action, ...restArgs] = positional;
-    assert('hash position arguments', context && action);
-
-    let debugKey: string = action.debugLabel!;
-
-    let target = 'target' in named ? named['target'] : context;
-    let processArgs = makeArgsProcessor(('value' in named && named['value']) || false, restArgs);
-
-    let fn: Function;
-
-    if (isInvokableRef(action)) {
-      fn = makeClosureAction(
-        action,
-        action as MaybeActionHandler,
-        invokeRef,
-        processArgs,
-        debugKey
-      );
-    } else {
-      fn = makeDynamicClosureAction(
-        valueForRef(context) as object,
-        target!,
-        action,
-        processArgs,
-        debugKey
-      );
-    }
+export default internalHelper((args: CapturedArguments): Reference<Function> => {
+  let { named, positional } = args;
+  // The first two argument slots are reserved.
+  // pos[0] is the context (or `this`)
+  // pos[1] is the action name or function
+  // Anything else is an action argument.
+  let [context, action, ...restArgs] = positional;
+  assert('hash position arguments', context && action);
+
+  let debugKey: string = action.debugLabel!;
+
+  let target = 'target' in named ? named['target'] : context;
+  let processArgs = makeArgsProcessor(('value' in named && named['value']) || false, restArgs);
 
-    ACTIONS.add(fn);
+  let fn: Function;
 
-    return createUnboundRef(fn, '(result of an `action` helper)');
+  if (isInvokableRef(action)) {
+    fn = makeClosureAction(action, action as MaybeActionHandler, invokeRef, processArgs, debugKey);
+  } else {
+    fn = makeDynamicClosureAction(
+      valueForRef(context) as object,
+      target!,
+      action,
+      processArgs,
+      debugKey
+    );
   }
-);
+
+  ACTIONS.add(fn);
+
+  return createUnboundRef(fn, '(result of an `action` helper)');
+});
 
 function NOOP(args: unknown[]) {
   return args;
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index 640d104f254..831926c75af 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -28,11 +28,9 @@
 import { createConstRef, Reference } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
-export default internalHelper(
-  (): Reference<string> => {
-    return createConstRef(uniqueId(), 'unique-id');
-  }
-);
+export default internalHelper((): Reference<string> => {
+  return createConstRef(uniqueId(), 'unique-id');
+});
 
 // From https://gist.github.com/selfish/fef2c0ba6cdfe07af76e64cecd74888b
 //
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index 04fb84b54b2..c2eae5f222b 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -52,7 +52,8 @@ class InternalModifierState implements Destroyable {
 }
 
 export class InternalModifierManager
-  implements ModifierManager<InternalModifierState, typeof InternalModifier> {
+  implements ModifierManager<InternalModifierState, typeof InternalModifier>
+{
   constructor(private ModifierClass: typeof InternalModifier, private name: string) {}
 
   create(
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 0577231463a..e049e95a7f3 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -468,9 +468,11 @@ export class Renderer {
     }
   }
 
-  getBounds(
-    view: object
-  ): { parentElement: SimpleElement; firstNode: SimpleNode; lastNode: SimpleNode } {
+  getBounds(view: object): {
+    parentElement: SimpleElement;
+    firstNode: SimpleNode;
+    lastNode: SimpleNode;
+  } {
     let bounds: Bounds = view[BOUNDS];
 
     assert('object passed to getBounds must have the BOUNDS symbol as a property', Boolean(bounds));
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 407b760e088..654a5d82bb3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -1371,20 +1371,20 @@ if (ENV._DEBUG_RENDER_TREE) {
 
       nodeBounds(node: Node | null): CapturedBounds {
         return {
-          parentElement: ((expect(
+          parentElement: expect(
             node?.parentNode,
             'BUG: detached node'
-          ) as unknown) as SimpleNode) as SimpleElement,
-          firstNode: (node as unknown) as SimpleNode,
-          lastNode: (node as unknown) as SimpleNode,
+          ) as unknown as SimpleNode as SimpleElement,
+          firstNode: node as unknown as SimpleNode,
+          lastNode: node as unknown as SimpleNode,
         };
       }
 
       elementBounds(element: Element): CapturedBounds {
         return {
-          parentElement: (element as unknown) as SimpleElement,
-          firstNode: (element.firstChild! as unknown) as SimpleNode,
-          lastNode: (element.lastChild! as unknown) as SimpleNode,
+          parentElement: element as unknown as SimpleElement,
+          firstNode: element.firstChild! as unknown as SimpleNode,
+          lastNode: element.lastChild! as unknown as SimpleNode,
         };
       }
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index 5d6e7279026..d373fcc3332 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -301,9 +301,8 @@ moduleFor(
         this.assertInnerHTML('<h2>Foo Engine: Tagless Component</h2>');
 
         let controllerOwnerEventDispatcher = getOwner(controller).lookup('event_dispatcher:main');
-        let taglessComponentOwnerEventDispatcher = getOwner(component).lookup(
-          'event_dispatcher:main'
-        );
+        let taglessComponentOwnerEventDispatcher =
+          getOwner(component).lookup('event_dispatcher:main');
 
         this.assert.strictEqual(
           controllerOwnerEventDispatcher,
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index c13709ed94f..0569f993bdd 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -150,10 +150,8 @@ export function makeComputedDecorator(
 
 /////////////
 
-const DECORATOR_DESCRIPTOR_MAP: WeakMap<
-  ExtendedMethodDecorator,
-  ComputedDescriptor | true
-> = new WeakMap();
+const DECORATOR_DESCRIPTOR_MAP: WeakMap<ExtendedMethodDecorator, ComputedDescriptor | true> =
+  new WeakMap();
 
 /**
   Returns the CP descriptor associated with `obj` and `keyName`, if any.
diff --git a/packages/@ember/-internals/metal/tests/main_test.js b/packages/@ember/-internals/metal/tests/main_test.js
index 555d9708c90..7a0ae2295c8 100644
--- a/packages/@ember/-internals/metal/tests/main_test.js
+++ b/packages/@ember/-internals/metal/tests/main_test.js
@@ -2,7 +2,8 @@ import VERSION from 'ember/version';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 // From https://github.com/semver/semver.org/issues/59 & https://regex101.com/r/vW1jA8/6
-const SEMVER_REGEX = /^((?:0|(?:[1-9]\d*)))\.((?:0|(?:[1-9]\d*)))\.((?:0|(?:[1-9]\d*)))(?:-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$/;
+const SEMVER_REGEX =
+  /^((?:0|(?:[1-9]\d*)))\.((?:0|(?:[1-9]\d*)))\.((?:0|(?:[1-9]\d*)))(?:-([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*))?$/;
 
 moduleFor(
   '@ember/-internals/metal/core/main',
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index ad962dc7c7c..cd284c23d3f 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -11,7 +11,7 @@ import EmberRouter from '../system/router';
 import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
 import { extractRouteArgs, resemblesURL, RouteArgs, RouteOptions, shallowEqual } from '../utils';
 
-const ROUTER = (symbol('ROUTER') as unknown) as string;
+const ROUTER = symbol('ROUTER') as unknown as string;
 
 function cleanURL(url: string, rootURL: string) {
   if (rootURL === '/') {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index e239ee2da3f..5f06749928a 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -70,7 +70,7 @@ type MaybeParameters<T> = T extends (...args: any[]) => any ? Parameters<T> : un
 type MaybeReturnType<T> = T extends (...args: any[]) => any ? ReturnType<T> : unknown;
 
 export const ROUTE_CONNECTIONS = new WeakMap();
-const RENDER = (symbol('render') as unknown) as string;
+const RENDER = symbol('render') as unknown as string;
 
 /**
 @module @ember/routing
@@ -260,7 +260,8 @@ interface Route<T = unknown> extends IRoute<T> {
 
 class Route<T = unknown>
   extends EmberObject.extend(ActionHandler, Evented)
-  implements IRoute, Evented {
+  implements IRoute, Evented
+{
   static isRouteFactory = true;
 
   context = {} as T;
@@ -2265,7 +2266,7 @@ function getQueryParamsFor<R extends Route>(
 function copyDefaultValue<T>(value: T): T {
   if (Array.isArray(value)) {
     // SAFETY: We lost the type data about the array if we don't cast.
-    return (emberA(value.slice()) as unknown) as T;
+    return emberA(value.slice()) as unknown as T;
   }
   return value;
 }
diff --git a/packages/@ember/-internals/utils/lib/dictionary.ts b/packages/@ember/-internals/utils/lib/dictionary.ts
index 08f32b839ff..a1281cfdeb8 100644
--- a/packages/@ember/-internals/utils/lib/dictionary.ts
+++ b/packages/@ember/-internals/utils/lib/dictionary.ts
@@ -3,9 +3,9 @@
 // appears worthwhile in some usecases. Please note, these deletes do increase
 // the cost of creation dramatically over a plain Object.create. And as this
 // only makes sense for long-lived dictionaries that aren't instantiated often.
-export default function makeDictionary<T>(
-  parent: { [key: string]: T } | null
-): { [key: string]: T } {
+export default function makeDictionary<T>(parent: { [key: string]: T } | null): {
+  [key: string]: T;
+} {
   let dict = Object.create(parent);
   dict['_dict'] = null;
   delete dict['_dict'];
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 1240e0ec8cd..89c5cfce61d 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -30,10 +30,8 @@ function isPositiveInt(num: number) {
 if (DEBUG) {
   let SEEN_TAGS = new WeakSet();
 
-  let MANDATORY_SETTERS: WeakMap<
-    object,
-    { [key: string | symbol]: PropertyDescriptorWithMeta }
-  > = new WeakMap();
+  let MANDATORY_SETTERS: WeakMap<object, { [key: string | symbol]: PropertyDescriptorWithMeta }> =
+    new WeakMap();
 
   let propertyIsEnumerable = function (obj: object, key: string | symbol) {
     return Object.prototype.propertyIsEnumerable.call(obj, key);
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 633c76459b4..6bb857789c1 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -167,8 +167,8 @@ export function getViewRange(view: View): Range {
   let bounds = getViewBounds(view);
 
   let range = document.createRange();
-  range.setStartBefore((bounds.firstNode as unknown) as Node);
-  range.setEndAfter((bounds.lastNode as unknown) as Node);
+  range.setStartBefore(bounds.firstNode as unknown as Node);
+  range.setEndAfter(bounds.lastNode as unknown as Node);
 
   return range;
 }
diff --git a/packages/@ember/helper/type-tests/set-helper-manager.test.ts b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
index 9b11f65029f..b32088e1b61 100644
--- a/packages/@ember/helper/type-tests/set-helper-manager.test.ts
+++ b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
@@ -5,7 +5,8 @@ import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
 
 class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
-  implements HelperFactory<SimpleHelper<T, P, N>> {
+  implements HelperFactory<SimpleHelper<T, P, N>>
+{
   isHelperFactory: true = true;
 
   constructor(public compute: HelperFunction<T, P, N>) {}
diff --git a/packages/@ember/object/type-tests/computed.test.ts b/packages/@ember/object/type-tests/computed.test.ts
index e7e70e32280..a38d395f2de 100644
--- a/packages/@ember/object/type-tests/computed.test.ts
+++ b/packages/@ember/object/type-tests/computed.test.ts
@@ -12,7 +12,7 @@ class Foo {
     return `${this.firstName} ${this.lastName}`;
   }
 
-  @(computed('firstName', 'lastName').readOnly())
+  @computed('firstName', 'lastName').readOnly()
   get readonlyFullName() {
     return `${this.firstName} ${this.lastName}`;
   }
diff --git a/packages/@ember/runloop/type-tests.ts/debounce.test.ts b/packages/@ember/runloop/type-tests.ts/debounce.test.ts
index b3b0d1c71f7..47537f7ba29 100644
--- a/packages/@ember/runloop/type-tests.ts/debounce.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/debounce.test.ts
@@ -30,9 +30,9 @@ debounce(myContext, whoRan, 150, true);
 // the debouncee is no longer being watched
 
 // Method only
-expectTypeOf(debounce((_foo: number, _baz?: boolean): void => {}, 1, undefined, 1)).toEqualTypeOf<
-  Timer
->();
+expectTypeOf(
+  debounce((_foo: number, _baz?: boolean): void => {}, 1, undefined, 1)
+).toEqualTypeOf<Timer>();
 
 // @ts-expect-error Requires wait
 debounce((_foo: number, _baz?: boolean): void => {}, 1, true);
diff --git a/packages/@ember/runloop/type-tests.ts/throttle.test.ts b/packages/@ember/runloop/type-tests.ts/throttle.test.ts
index 6888c491a9d..2452d04c1ee 100644
--- a/packages/@ember/runloop/type-tests.ts/throttle.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/throttle.test.ts
@@ -30,9 +30,9 @@ throttle(myContext, whoRan, 150, true);
 // the throttlee is no longer being watched
 
 // Method only
-expectTypeOf(throttle((_foo: number, _baz?: boolean): void => {}, 1, undefined, 1)).toEqualTypeOf<
-  Timer
->();
+expectTypeOf(
+  throttle((_foo: number, _baz?: boolean): void => {}, 1, undefined, 1)
+).toEqualTypeOf<Timer>();
 
 // Wait is optional
 throttle((_foo: number, _baz?: boolean): void => {}, 1, true);
diff --git a/packages/ember/tests/routing/router_service_test/recognize_test.js b/packages/ember/tests/routing/router_service_test/recognize_test.js
index f5a65cd10a8..fa2274b3175 100644
--- a/packages/ember/tests/routing/router_service_test/recognize_test.js
+++ b/packages/ember/tests/routing/router_service_test/recognize_test.js
@@ -97,15 +97,8 @@ moduleFor(
         })
         .then((routeInfoWithAttributes) => {
           assert.ok(routeInfoWithAttributes);
-          let {
-            name,
-            localName,
-            parent,
-            attributes,
-            paramNames,
-            params,
-            queryParams,
-          } = routeInfoWithAttributes;
+          let { name, localName, parent, attributes, paramNames, params, queryParams } =
+            routeInfoWithAttributes;
           assert.equal(name, 'dynamicWithChild.child');
           assert.equal(localName, 'child');
           assert.equal(parent.name, 'dynamicWithChild');
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index cf2a60b5df7..efd129ce387 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -62,9 +62,8 @@ class DeprecationAssert extends DebugAssert {
 
   inject(): void {
     window.expectNoDeprecation = expectNoDeprecation = this.expectNoDeprecation.bind(this);
-    window.expectNoDeprecationAsync = expectNoDeprecationAsync = this.expectNoDeprecationAsync.bind(
-      this
-    );
+    window.expectNoDeprecationAsync = expectNoDeprecationAsync =
+      this.expectNoDeprecationAsync.bind(this);
     window.expectDeprecation = expectDeprecation = this.expectDeprecation.bind(this);
     window.expectDeprecationAsync = expectDeprecationAsync = this.expectDeprecationAsync.bind(this);
     window.ignoreDeprecation = ignoreDeprecation = this.ignoreDeprecation.bind(this);
diff --git a/tests/node/component-rendering-test.js b/tests/node/component-rendering-test.js
index c9398f3707f..e9bc1ef5e03 100644
--- a/tests/node/component-rendering-test.js
+++ b/tests/node/component-rendering-test.js
@@ -17,22 +17,23 @@ QUnit.module('Components can be rendered without a DOM dependency', function (ho
     assert.ok(html.match(/<h1>Hello World<\/h1>/));
   });
 
-  QUnit.test('Ensure undefined attributes requiring protocol sanitization do not error', function (
-    assert
-  ) {
-    this.owner.register(
-      'component:fake-link',
-      this.Ember.Component.extend({
-        tagName: 'link',
-        attributeBindings: ['href', 'rel'],
-        rel: 'canonical',
-      })
-    );
-
-    let html = this.render('{{fake-link}}');
-
-    assert.ok(html.match(/rel="canonical"/));
-  });
+  QUnit.test(
+    'Ensure undefined attributes requiring protocol sanitization do not error',
+    function (assert) {
+      this.owner.register(
+        'component:fake-link',
+        this.Ember.Component.extend({
+          tagName: 'link',
+          attributeBindings: ['href', 'rel'],
+          rel: 'canonical',
+        })
+      );
+
+      let html = this.render('{{fake-link}}');
+
+      assert.ok(html.match(/rel="canonical"/));
+    }
+  );
 
   QUnit.test('attributes requiring protocol sanitization do not error', function (assert) {
     this.set('someHref', 'https://foo.com/');
diff --git a/tests/node/overrides-test.js b/tests/node/overrides-test.js
index 2a28c4e8129..fad26650362 100644
--- a/tests/node/overrides-test.js
+++ b/tests/node/overrides-test.js
@@ -214,24 +214,25 @@ QUnit.module('Overrides', function () {
       );
     });
 
-    QUnit.test('it returns old but compatible babel added by a dormant dependency', function (
-      assert
-    ) {
-      assert.deepEqual(
-        addonsInfoFor(Project.withDep({ emberCliBabel: '^7.0.0', hasJSFiles: false })),
-        [
-          {
-            parent: 'my-addon@1.0.0',
-            topLevel: 'my-addon',
-            version: '7.0.0',
-            requirement: '^7.0.0',
-            compatible: true,
-            dormant: true,
-            path: ['my-addon@1.0.0'],
-          },
-        ]
-      );
-    });
+    QUnit.test(
+      'it returns old but compatible babel added by a dormant dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(Project.withDep({ emberCliBabel: '^7.0.0', hasJSFiles: false })),
+          [
+            {
+              parent: 'my-addon@1.0.0',
+              topLevel: 'my-addon',
+              version: '7.0.0',
+              requirement: '^7.0.0',
+              compatible: true,
+              dormant: true,
+              path: ['my-addon@1.0.0'],
+            },
+          ]
+        );
+      }
+    );
 
     QUnit.test('it does not return new babel added by a dormant dependency', function (assert) {
       assert.deepEqual(
@@ -256,21 +257,22 @@ QUnit.module('Overrides', function () {
       ]);
     });
 
-    QUnit.test('it returns old but compatible babel added by a transient dependency', function (
-      assert
-    ) {
-      assert.deepEqual(addonsInfoFor(Project.withTransientDep({ emberCliBabel: '^7.0.0' })), [
-        {
-          parent: 'my-nested-addon@0.1.0',
-          topLevel: 'my-addon',
-          version: '7.0.0',
-          requirement: '^7.0.0',
-          compatible: true,
-          dormant: false,
-          path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
-        },
-      ]);
-    });
+    QUnit.test(
+      'it returns old but compatible babel added by a transient dependency',
+      function (assert) {
+        assert.deepEqual(addonsInfoFor(Project.withTransientDep({ emberCliBabel: '^7.0.0' })), [
+          {
+            parent: 'my-nested-addon@0.1.0',
+            topLevel: 'my-addon',
+            version: '7.0.0',
+            requirement: '^7.0.0',
+            compatible: true,
+            dormant: false,
+            path: ['my-addon@1.0.0', 'my-nested-addon@0.1.0'],
+          },
+        ]);
+      }
+    );
 
     QUnit.test('it does not return new babel added by a transient dependency', function (assert) {
       assert.deepEqual(addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6' })), []);
@@ -315,14 +317,15 @@ QUnit.module('Overrides', function () {
       }
     );
 
-    QUnit.test('it does not return new babel added by a dormant transient dependency', function (
-      assert
-    ) {
-      assert.deepEqual(
-        addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6', hasJSFiles: false })),
-        []
-      );
-    });
+    QUnit.test(
+      'it does not return new babel added by a dormant transient dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(Project.withDep({ emberCliBabel: '^7.26.6', hasJSFiles: false })),
+          []
+        );
+      }
+    );
 
     // transient dep through a dormant dep
 
@@ -411,36 +414,37 @@ QUnit.module('Overrides', function () {
       );
     });
 
-    QUnit.test('it returns old but compatible babel added by a linked dependency', function (
-      assert
-    ) {
-      assert.deepEqual(
-        addonsInfoFor(
-          new Project({
-            devDependencies: {
-              'ember-source': 'link:3.27.3',
-            },
-            addons: [
-              {
-                name: 'ember-source',
-                emberCliBabel: '^7.0.0',
+    QUnit.test(
+      'it returns old but compatible babel added by a linked dependency',
+      function (assert) {
+        assert.deepEqual(
+          addonsInfoFor(
+            new Project({
+              devDependencies: {
+                'ember-source': 'link:3.27.3',
               },
-            ],
-          })
-        ),
-        [
-          {
-            parent: 'ember-source@3.27.3',
-            topLevel: 'ember-source',
-            version: '7.0.0',
-            requirement: '^7.0.0',
-            compatible: true,
-            dormant: false,
-            path: ['ember-source@3.27.3'],
-          },
-        ]
-      );
-    });
+              addons: [
+                {
+                  name: 'ember-source',
+                  emberCliBabel: '^7.0.0',
+                },
+              ],
+            })
+          ),
+          [
+            {
+              parent: 'ember-source@3.27.3',
+              topLevel: 'ember-source',
+              version: '7.0.0',
+              requirement: '^7.0.0',
+              compatible: true,
+              dormant: false,
+              path: ['ember-source@3.27.3'],
+            },
+          ]
+        );
+      }
+    );
 
     QUnit.test('it does not return new babel added by a linked dependency', function (assert) {
       assert.deepEqual(
diff --git a/tests/node/template-compiler-test.js b/tests/node/template-compiler-test.js
index dca37d6ca12..80db1a0053b 100644
--- a/tests/node/template-compiler-test.js
+++ b/tests/node/template-compiler-test.js
@@ -34,17 +34,27 @@ QUnit.module('ember-template-compiler.js', function () {
       assert.notEqual(typeof templateCompiler._Ember.ENV, null, '_Ember.ENV is not null');
     });
 
-    QUnit.test('can access _Ember.FEATURES (private API used by ember-cli-htmlbars)', function (
-      assert
-    ) {
-      assert.equal(typeof templateCompiler._Ember.FEATURES, 'object', '_Ember.FEATURES is present');
-      assert.notEqual(typeof templateCompiler._Ember.FEATURES, null, '_Ember.FEATURES is not null');
-    });
-
-    QUnit.test('can access _Ember.VERSION (private API used by ember-cli-htmlbars)', function (
-      assert
-    ) {
-      assert.equal(typeof templateCompiler._Ember.VERSION, 'string', '_Ember.VERSION is present');
-    });
+    QUnit.test(
+      'can access _Ember.FEATURES (private API used by ember-cli-htmlbars)',
+      function (assert) {
+        assert.equal(
+          typeof templateCompiler._Ember.FEATURES,
+          'object',
+          '_Ember.FEATURES is present'
+        );
+        assert.notEqual(
+          typeof templateCompiler._Ember.FEATURES,
+          null,
+          '_Ember.FEATURES is not null'
+        );
+      }
+    );
+
+    QUnit.test(
+      'can access _Ember.VERSION (private API used by ember-cli-htmlbars)',
+      function (assert) {
+        assert.equal(typeof templateCompiler._Ember.VERSION, 'string', '_Ember.VERSION is present');
+      }
+    );
   });
 });
diff --git a/tests/node/visit-test.js b/tests/node/visit-test.js
index 2814b298d59..ed2b465745a 100644
--- a/tests/node/visit-test.js
+++ b/tests/node/visit-test.js
@@ -73,8 +73,7 @@ QUnit.module('Ember.Application - visit() Integration Tests', function (hooks) {
       fastbootVisit(App, '/a').then(
         assertFastbootResult(assert, {
           url: '/a',
-          body:
-            '<h1>Hello world</h1>\n<h2>Welcome to <span id=".+" class="ember-view">Page A</span></h2>',
+          body: '<h1>Hello world</h1>\n<h2>Welcome to <span id=".+" class="ember-view">Page A</span></h2>',
         }),
         handleError(assert)
       ),

From 2ca1b720d43bad1df0487a282ed91ee4102ab961 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Feb 2022 10:05:35 -0800
Subject: [PATCH 0961/1405] Convert engines, applications, and more to TS

---
 .../-internals/container/lib/container.ts     |  55 ++-
 .../-internals/container/lib/registry.ts      |  49 ++-
 .../glimmer/lib/component-managers/outlet.ts  |   5 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  24 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  27 +-
 .../-internals/glimmer/lib/views/outlet.ts    |   4 +-
 .../helpers/helper-manager-test.js            |  10 +-
 .../integration/helpers/invoke-helper-test.js |  16 +-
 packages/@ember/-internals/owner/index.ts     |  29 +-
 .../-internals/routing/lib/system/router.ts   |   4 +-
 .../runtime/lib/mixins/container_proxy.d.ts   |  14 +-
 .../runtime/lib/mixins/registry_proxy.d.ts    |  21 +-
 .../runtime/lib/system/core_object.ts         |   2 +-
 .../runtime/lib/system/namespace.d.ts         |   5 -
 .../lib/system/{namespace.js => namespace.ts} |  30 +-
 .../views/lib/system/event_dispatcher.d.ts    |   3 +-
 packages/@ember/application/index.d.ts        |   2 -
 .../@ember/application/{index.js => index.ts} |   0
 packages/@ember/application/instance.d.ts     |  15 -
 .../application/{instance.js => instance.ts}  | 345 ++++++++++--------
 .../@ember/application/lib/application.d.ts   |  19 -
 .../lib/{application.js => application.ts}    | 218 ++++++-----
 .../lib/{lazy_load.js => lazy_load.ts}        |  16 +-
 .../@ember/application/tests/reset_test.js    |   4 +-
 .../application/type-tests/index.test.ts      |   9 +-
 .../application/type-tests/instance.test.ts   |  10 +-
 packages/@ember/engine/index.d.ts             |  17 -
 packages/@ember/engine/{index.js => index.ts} | 294 ++++++++-------
 packages/@ember/engine/instance.d.ts          |  22 --
 .../engine/{instance.js => instance.ts}       | 131 ++++---
 .../engine_instance_initializers_test.js      |   3 +-
 .../@ember/engine/type-tests/index.test.ts    |  17 +-
 .../@ember/engine/type-tests/instance.test.ts |   2 +-
 .../lib/system/compile.ts                     |  12 +-
 .../internal-test-helpers/lib/build-owner.ts  |   3 +-
 .../lib/test-cases/abstract-application.ts    |   2 +-
 .../lib/test-cases/autoboot-application.ts    |   7 +-
 .../lib/test-cases/query-param.ts             |   8 +-
 .../lib/test-cases/rendering.ts               |  10 +-
 .../lib/test-cases/router-non-application.ts  |   3 +-
 .../test-cases/test-resolver-application.ts   |   3 +-
 .../lib/test-resolver.ts                      |  11 +-
 42 files changed, 773 insertions(+), 708 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/namespace.d.ts
 rename packages/@ember/-internals/runtime/lib/system/{namespace.js => namespace.ts} (64%)
 delete mode 100644 packages/@ember/application/index.d.ts
 rename packages/@ember/application/{index.js => index.ts} (100%)
 delete mode 100644 packages/@ember/application/instance.d.ts
 rename packages/@ember/application/{instance.js => instance.ts} (62%)
 delete mode 100644 packages/@ember/application/lib/application.d.ts
 rename packages/@ember/application/lib/{application.js => application.ts} (92%)
 rename packages/@ember/application/lib/{lazy_load.js => lazy_load.ts} (77%)
 delete mode 100644 packages/@ember/engine/index.d.ts
 rename packages/@ember/engine/{index.js => index.ts} (76%)
 delete mode 100644 packages/@ember/engine/instance.d.ts
 rename packages/@ember/engine/{instance.js => instance.ts} (62%)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index d224325690e..33791af8b96 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -9,10 +9,6 @@ interface LeakTracking {
   reset(): void;
 }
 
-interface CacheMember {
-  destroy?: () => void;
-}
-
 let leakTracking: LeakTracking;
 let containers: WeakSet<Container>;
 if (DEBUG) {
@@ -47,7 +43,7 @@ if (DEBUG) {
 
 export interface ContainerOptions {
   owner?: Owner;
-  cache?: { [key: string]: CacheMember };
+  cache?: { [key: string]: object };
   factoryManagerCache?: { [key: string]: FactoryManager<any, any> };
   validationCache?: { [key: string]: boolean };
 }
@@ -70,8 +66,8 @@ export default class Container {
 
   readonly owner: Owner | null;
   readonly registry: Registry & DebugRegistry;
-  cache: { [key: string]: CacheMember };
-  factoryManagerCache!: { [key: string]: FactoryManager<any, any> };
+  cache: { [key: string]: object };
+  factoryManagerCache!: { [key: string]: FactoryManager<object> };
   readonly validationCache!: { [key: string]: boolean };
   isDestroyed: boolean;
   isDestroying: boolean;
@@ -139,11 +135,10 @@ export default class Container {
     @private
    @method lookup
    @param {String} fullName
-   @param {Object} [options]
-   @param {String} [options.source] The fullname of the request source (used for local lookup)
+   @param {TypeOptions} [options]
    @return {any}
    */
-  lookup(fullName: string, options?: TypeOptions): unknown {
+  lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
     }
@@ -208,7 +203,7 @@ export default class Container {
    @param {String} fullName
    @return {any}
    */
-  factoryFor(fullName: string): Factory<unknown> | undefined {
+  factoryFor(fullName: string): FactoryManager<object> | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
     }
@@ -216,9 +211,7 @@ export default class Container {
 
     assert('fullName must be a proper full name', this.registry.isValidFullName(normalizedName));
 
-    // TODO: This needs to return a Factory to be compatible with Owner.
-    // We should correctly the types so that this cast is not necessary.
-    return factoryFor(this, normalizedName, fullName) as Factory<unknown>;
+    return factoryFor(this, normalizedName, fullName);
   }
 }
 
@@ -230,7 +223,9 @@ if (DEBUG) {
  * Wrap a factory manager in a proxy which will not permit properties to be
  * set on the manager.
  */
-function wrapManagerInDeprecationProxy<T, C>(manager: FactoryManager<T, C>): FactoryManager<T, C> {
+function wrapManagerInDeprecationProxy<T extends object, C>(
+  manager: FactoryManager<T, C>
+): FactoryManager<T, C> {
   let validator = {
     set(_obj: T, prop: keyof T) {
       throw new Error(
@@ -261,7 +256,11 @@ function isInstantiatable(container: Container, fullName: string) {
   return container.registry.getOption(fullName, 'instantiate') !== false;
 }
 
-function lookup(container: Container, fullName: string, options: TypeOptions = {}) {
+function lookup(
+  container: Container,
+  fullName: string,
+  options: TypeOptions = {}
+): Factory<object> | object | undefined {
   let normalizedName = fullName;
 
   if (
@@ -281,14 +280,14 @@ function factoryFor(
   container: Container,
   normalizedName: string,
   fullName: string
-): FactoryManager<unknown> | undefined {
+): FactoryManager<object> | undefined {
   let cached = container.factoryManagerCache[normalizedName];
 
   if (cached !== undefined) {
     return cached;
   }
 
-  let factory = container.registry.resolve(normalizedName) as DebugFactory<unknown> | undefined;
+  let factory = container.registry.resolve(normalizedName) as DebugFactory<object> | undefined;
 
   if (factory === undefined) {
     return;
@@ -363,7 +362,7 @@ function instantiateFactory(
   normalizedName: string,
   fullName: string,
   options: TypeOptions
-) {
+): Factory<object> | object | undefined {
   let factoryManager = factoryFor(container, normalizedName, fullName);
 
   if (factoryManager === undefined) {
@@ -373,13 +372,13 @@ function instantiateFactory(
   // SomeClass { singleton: true, instantiate: true } | { singleton: true } | { instantiate: true } | {}
   // By default majority of objects fall into this case
   if (isSingletonInstance(container, fullName, options)) {
-    let instance = (container.cache[normalizedName] = factoryManager.create() as CacheMember);
+    let instance = (container.cache[normalizedName] = factoryManager.create());
 
     // if this lookup happened _during_ destruction (emits a deprecation, but
     // is still possible) ensure that it gets destroyed
     if (container.isDestroying) {
-      if (typeof instance.destroy === 'function') {
-        instance.destroy();
+      if (typeof (instance as any).destroy === 'function') {
+        (instance as any).destroy();
       }
     }
 
@@ -410,8 +409,8 @@ function destroyDestroyables(container: Container): void {
     let value = cache[key];
     assert('has cached value', value);
 
-    if (value.destroy) {
-      value.destroy();
+    if ((value as any).destroy) {
+      (value as any).destroy();
     }
   }
 }
@@ -429,8 +428,8 @@ function resetMember(container: Container, fullName: string) {
   if (member) {
     delete container.cache[fullName];
 
-    if (member.destroy) {
-      member.destroy();
+    if ((member as any).destroy) {
+      (member as any).destroy();
     }
   }
 }
@@ -441,7 +440,7 @@ export interface LazyInjection {
   specifier: string;
 }
 
-declare interface DebugFactory<T, C extends FactoryClass | object = FactoryClass>
+declare interface DebugFactory<T extends object, C extends FactoryClass | object = FactoryClass>
   extends Factory<T, C> {
   _onLookup?: (fullName: string) => void;
   _initFactory?: (factoryManager: FactoryManager<T, C>) => void;
@@ -458,7 +457,7 @@ export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void
   obj[INIT_FACTORY] = factory;
 }
 
-export class FactoryManager<T, C extends FactoryClass | object = FactoryClass> {
+export class FactoryManager<T extends object, C extends FactoryClass | object = FactoryClass> {
   readonly container: Container;
   readonly owner: Owner | null;
   readonly class: Factory<T, C> & DebugFactory<T, C>;
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 373ed93c1f5..b5dc40f591e 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -4,15 +4,12 @@ import { assert, deprecate } from '@ember/debug';
 import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 import Container, { ContainerOptions, LazyInjection } from './container';
+
 export interface Injection {
   property: string;
   specifier: string;
 }
 
-export type ResolveOptions = {
-  specifier?: string;
-};
-
 export interface TypeOptions {
   instantiate?: boolean;
   singleton?: boolean;
@@ -31,9 +28,9 @@ export interface IRegistry {
   getOptions(fullName: string): TypeOptions | undefined;
   getOptionsForType(type: string): TypeOptions | undefined;
   knownForType(type: string): KnownForTypeResult;
-  makeToString<T, C>(factory: Factory<T, C>, fullName: string): string;
+  makeToString(factory: Factory<object>, fullName: string): string;
   normalizeFullName(fullName: string): string;
-  resolve<T, C>(fullName: string, options?: ResolveOptions): Factory<T, C> | undefined;
+  resolve(fullName: string): Factory<object> | object | undefined;
 }
 
 export interface ResolverClass {
@@ -43,9 +40,9 @@ export interface ResolverClass {
 export interface Resolver {
   knownForType?: (type: string) => KnownForTypeResult;
   lookupDescription?: (fullName: string) => string;
-  makeToString?: <T, C>(factory: Factory<T, C>, fullName: string) => string;
+  makeToString?: (factory: Factory<object>, fullName: string) => string;
   normalize?: (fullName: string) => string;
-  resolve<T, C>(name: string): Factory<T, C> | undefined;
+  resolve(name: string): Factory<object> | object | undefined;
 }
 
 export interface RegistryOptions {
@@ -73,11 +70,10 @@ export default class Registry implements IRegistry {
   readonly _failSet: Set<string>;
   resolver: Resolver | null;
   readonly fallback: IRegistry | null;
-  readonly registrations: Record<string, object>;
-  _localLookupCache: Record<string, object>;
+  readonly registrations: Record<string, Factory<object> | object>;
   readonly _normalizeCache: Record<string, string>;
   readonly _options: Record<string, TypeOptions>;
-  readonly _resolveCache: Record<string, object>;
+  readonly _resolveCache: Record<string, Factory<object> | object>;
   readonly _typeOptions: Record<string, TypeOptions>;
 
   set?: typeof set;
@@ -88,7 +84,6 @@ export default class Registry implements IRegistry {
 
     this.registrations = dictionary(options.registrations || null);
 
-    this._localLookupCache = Object.create(null);
     this._normalizeCache = dictionary(null);
     this._resolveCache = dictionary(null);
     this._failSet = new Set();
@@ -179,12 +174,13 @@ export default class Registry implements IRegistry {
    @param {Object} options
    */
   register(fullName: string, factory: object, options: TypeOptions & { instantiate: false }): void;
-  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
-  register(fullName: string, factory: object, options: TypeOptions = {}): void {
+  register(fullName: string, factory: Factory<object>, options?: TypeOptions): void;
+  register(fullName: string, factory: object | Factory<object>, options: TypeOptions = {}): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
     assert(`Attempting to register an unknown factory: '${fullName}'`, factory !== undefined);
 
     let normalizedName = this.normalize(fullName);
+
     assert(
       `Cannot re-register: '${fullName}', as it has already been resolved.`,
       !this._resolveCache[normalizedName]
@@ -217,8 +213,6 @@ export default class Registry implements IRegistry {
 
     let normalizedName = this.normalize(fullName);
 
-    this._localLookupCache = Object.create(null);
-
     delete this.registrations[normalizedName];
     delete this._resolveCache[normalizedName];
     delete this._options[normalizedName];
@@ -256,14 +250,12 @@ export default class Registry implements IRegistry {
    @private
    @method resolve
    @param {String} fullName
-   @param {Object} [options]
-   @param {String} [options.source] the fullname of the request source (used for local lookups)
    @return {Function} fullName's factory
    */
-  resolve<T, C>(fullName: string): Factory<T, C> | undefined {
-    let factory = resolve<T, C>(this, this.normalize(fullName));
+  resolve(fullName: string): Factory<object> | object | undefined {
+    let factory = resolve(this, this.normalize(fullName));
     if (factory === undefined && this.fallback !== null) {
-      factory = (this.fallback as any).resolve(...arguments);
+      factory = this.fallback.resolve(fullName);
     }
     return factory;
   }
@@ -332,7 +324,7 @@ export default class Registry implements IRegistry {
    @param {string} fullName
    @return {function} toString function
    */
-  makeToString<T, C>(factory: Factory<T, C>, fullName: string): string {
+  makeToString(factory: Factory<object>, fullName: string): string {
     if (this.resolver !== null && this.resolver.makeToString) {
       return this.resolver.makeToString(factory, fullName);
     } else if (this.fallback !== null) {
@@ -550,25 +542,28 @@ if (DEBUG) {
   };
 }
 
-function resolve<T, C>(registry: Registry, _normalizedName: string): Factory<T, C> | undefined {
+function resolve(
+  registry: Registry,
+  _normalizedName: string
+): Factory<object> | object | undefined {
   let normalizedName = _normalizedName;
 
   let cached = registry._resolveCache[normalizedName];
   if (cached !== undefined) {
-    return cached as Factory<T, C>;
+    return cached;
   }
   if (registry._failSet.has(normalizedName)) {
     return;
   }
 
-  let resolved: Factory<T, C> | undefined;
+  let resolved: Factory<object> | object | undefined;
 
   if (registry.resolver) {
-    resolved = registry.resolver.resolve<T, C>(normalizedName);
+    resolved = registry.resolver.resolve(normalizedName);
   }
 
   if (resolved === undefined) {
-    resolved = registry.registrations[normalizedName] as Factory<T, C> | undefined;
+    resolved = registry.registrations[normalizedName];
   }
 
   if (resolved === undefined) {
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index 9613afd3cdb..d60f494d666 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -104,7 +104,10 @@ class OutletComponentManager
         let mountPoint = currentOwner.mountPoint;
 
         state.engine = currentOwner;
-        state.engineBucket = { mountPoint };
+
+        if (mountPoint) {
+          state.engineBucket = { mountPoint };
+        }
       }
     }
 
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index cdfd42b3c47..5ca1045cc96 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -6,6 +6,7 @@ import { FactoryManager } from '@ember/-internals/container/lib/container';
 import { Factory, Owner, setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { getDebugName, symbol } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import { join } from '@ember/runloop';
 import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager';
@@ -34,6 +35,14 @@ export interface HelperInstance<T = unknown> {
   destroy(): void;
 }
 
+export function isHelperInstance(obj: unknown): obj is HelperInstance {
+  if (obj !== null && typeof obj === 'object') {
+    let cast = obj as HelperInstance;
+    return typeof cast.compute === 'function' && typeof cast.destroy === 'function';
+  }
+  return false;
+}
+
 const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
 
 export interface SimpleHelper<T, P extends unknown[], N extends Dict<unknown>> {
@@ -104,6 +113,8 @@ class Helper extends FrameworkObject {
   init(properties: object | undefined) {
     super.init(properties);
     this[RECOMPUTE_TAG] = createTag();
+
+    assert('expected compute to be defined', this.compute);
   }
 
   /**
@@ -163,11 +174,16 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
     this.ownerInjection = ownerInjection;
   }
 
-  createHelper<T, C>(definition: typeof Helper | FactoryManager<T, C>, args: Arguments) {
-    let instance = isFactoryManager<T, C>(definition)
+  createHelper(
+    definition: typeof Helper | FactoryManager<object>,
+    args: Arguments
+  ): ClassicHelperStateBucket {
+    let instance = isFactoryManager(definition)
       ? definition.create()
       : definition.create(this.ownerInjection);
 
+    assert('expected HelperInstance', isHelperInstance(instance));
+
     return {
       instance,
       args,
@@ -193,8 +209,8 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
-function isFactoryManager<T, C>(obj: unknown): obj is FactoryManager<T, C> {
-  return obj != null && 'class' in (obj as FactoryManager<T, C>);
+function isFactoryManager(obj: unknown): obj is FactoryManager<object> {
+  return obj != null && 'class' in (obj as FactoryManager<object>);
 }
 
 setHelperManager((owner: Owner | undefined): ClassicHelperManager => {
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 5ef31e03052..cee0ebd9e21 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,7 +1,7 @@
 import { privatize as P } from '@ember/-internals/container';
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { ENV } from '@ember/-internals/environment';
-import { Factory, Owner } from '@ember/-internals/owner';
+import { Factory, isFactory, Owner } from '@ember/-internals/owner';
 import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
@@ -33,13 +33,7 @@ import {
 } from '@glimmer/runtime';
 import { _WeakSet } from '@glimmer/util';
 import { isCurlyManager } from './component-managers/curly';
-import {
-  CLASSIC_HELPER_MANAGER,
-  HelperFactory,
-  HelperInstance,
-  isClassicHelper,
-  SimpleHelper,
-} from './helper';
+import { CLASSIC_HELPER_MANAGER, isClassicHelper } from './helper';
 import { default as disallowDynamicResolution } from './helpers/-disallow-dynamic-resolution';
 import { default as inElementNullCheckHelper } from './helpers/-in-element-null-check';
 import { default as normalizeClassHelper } from './helpers/-normalize-class';
@@ -60,7 +54,7 @@ function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
 }
 
-function componentFor(name: string, owner: Owner): Option<Factory<unknown>> {
+function componentFor(name: string, owner: Owner): Option<Factory<object> | object> {
   let fullName = `component:${name}`;
   return owner.factoryFor(fullName) || null;
 }
@@ -73,11 +67,11 @@ function layoutFor(name: string, owner: Owner, options?: TypeOptions): Option<Te
 
 type LookupResult =
   | {
-      component: Factory<unknown>;
+      component: Factory<object>;
       layout: TemplateFactory;
     }
   | {
-      component: Factory<unknown>;
+      component: Factory<object>;
       layout: null;
     }
   | {
@@ -92,7 +86,7 @@ function lookupComponentPair(
 ): Option<LookupResult> {
   let component = componentFor(name, owner);
 
-  if (component !== null && component.class !== undefined) {
+  if (isFactory(component) && component.class) {
     let layout = getComponentTemplate(component.class);
 
     if (layout !== undefined) {
@@ -175,17 +169,12 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
       !(BUILTIN_HELPERS[name] && owner.hasRegistration(`helper:${name}`))
     );
 
-    const helper = BUILTIN_HELPERS[name];
+    let helper = BUILTIN_HELPERS[name];
     if (helper !== undefined) {
       return helper;
     }
 
-    const factory = owner.factoryFor(`helper:${name}`) as
-      | Factory<
-          SimpleHelper<unknown, unknown[], Record<string, unknown>>,
-          HelperFactory<SimpleHelper<unknown, unknown[], Record<string, unknown>>>
-        >
-      | Factory<HelperInstance, HelperFactory<HelperInstance>>;
+    let factory = owner.factoryFor(`helper:${name}`);
 
     if (factory === undefined) {
       return null;
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index c3a3f863b30..a0e81ec15bf 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,4 +1,5 @@
 import { getOwner, Owner } from '@ember/-internals/owner';
+import { BootOptions } from '@ember/application/instance';
 import { assert } from '@ember/debug';
 import { schedule } from '@ember/runloop';
 import { Template } from '@glimmer/interfaces';
@@ -12,7 +13,8 @@ import { OutletState } from '../utils/outlet';
 export interface BootEnvironment {
   hasDOM: boolean;
   isInteractive: boolean;
-  options: any;
+  _renderMode?: string;
+  options: BootOptions;
 }
 
 const TOP_LEVEL_NAME = '-top-level';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index 7a6119d4b7a..b6fa6f88ca0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -43,6 +43,10 @@ class TestHelper {
   }
 
   willDestroy() {}
+
+  // HelperInstance
+  compute() {}
+  destroy() {}
 }
 
 setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
@@ -319,7 +323,11 @@ moduleFor(
         };
       }
 
-      class TestHelper {}
+      class TestHelper {
+        // HelperInstance
+        compute() {}
+        destroy() {}
+      }
 
       setHelperManager((owner) => new OverrideTestHelperManager(owner), TestHelper);
       this.registerCustomHelper(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index 735a3784f42..ab722105096 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -347,6 +347,9 @@ moduleFor(
           super(...arguments);
           instance = this;
         }
+
+        // HelperInstance
+        compute() {}
       }
 
       let cache = invokeHelper(context, TestHelper);
@@ -373,6 +376,8 @@ moduleFor(
           super(...arguments);
           instance = this;
         }
+
+        compute() {}
       }
 
       let cache = invokeHelper(context, TestHelper);
@@ -414,7 +419,12 @@ moduleFor(
       }
 
       assert.throws(() => {
-        let helper = invokeHelper({}, class extends Helper {});
+        let helper = invokeHelper(
+          {},
+          class extends Helper {
+            compute() {}
+          }
+        );
 
         runTask(() => destroy(helper));
 
@@ -473,6 +483,10 @@ class TestHelper {
   }
 
   willDestroy() {}
+
+  // HelperInstance
+  compute() {}
+  destroy() {}
 }
 
 setHelperManager((owner) => new TestHelperManager(owner), TestHelper);
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 4448d616c1e..45db1099836 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,5 +1,7 @@
 import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner';
 import { TypeOptions } from '../container/lib/registry';
+import { IContainer } from '../runtime/lib/mixins/container_proxy';
+import { IRegistry } from '../runtime/lib/mixins/registry_proxy';
 
 /**
 @module @ember/application
@@ -11,7 +13,7 @@ export interface FactoryClass {
   positionalParams?: string | string[] | undefined | null;
 }
 
-export interface Factory<T, C extends FactoryClass | object = FactoryClass> {
+export interface Factory<T extends object, C extends FactoryClass | object = FactoryClass> {
   class?: C;
   name?: string;
   fullName?: string;
@@ -19,28 +21,13 @@ export interface Factory<T, C extends FactoryClass | object = FactoryClass> {
   create(props?: { [prop: string]: any }): T;
 }
 
-// A combination of the public methods on ContainerProxyMixin and RegistryProxyMixin
-export interface Owner {
-  // From ContainerProxy
-  ownerInjection(): void;
-  lookup(fullName: string, options?: TypeOptions): unknown;
-  factoryFor(fullName: string): Factory<unknown> | undefined;
-
-  // From RegistryProxy
-  resolveRegistration<T, C>(fullName: string): Factory<T, C> | undefined;
-  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
-  unregister(fullName: string): void;
-  hasRegistration(fullName: string): boolean;
-  registeredOption<K extends keyof TypeOptions>(
-    fullName: string,
-    optionName: K
-  ): TypeOptions[K] | undefined;
-  registerOptions(fullName: string, options: TypeOptions): void;
-  registeredOptions(fullName: string): TypeOptions | undefined;
-  registerOptionsForType(type: string, options: TypeOptions): void;
-  registeredOptionsForType(type: string): TypeOptions | undefined;
+export function isFactory(obj: unknown): obj is Factory<object> {
+  return obj != null && typeof (obj as Factory<object>).create === 'function';
 }
 
+// A combination of the public methods on ContainerProxyMixin and RegistryProxyMixin
+export interface Owner extends IRegistry, IContainer {}
+
 /**
   Framework objects in an Ember application (components, services, routes, etc.)
   are created via a factory and dependency injection system. Each of these
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 96a6f41f871..143f904ae23 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -302,9 +302,11 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     return path.join('.');
   }
 
-  constructor(owner: Owner) {
+  constructor(owner?: Owner) {
     super(owner);
 
+    assert('BUG: Missing owner', owner);
+
     this._resetQueuedQueryParameterChanges();
     this.namespace = owner.lookup('application:main');
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
index 49d53cf649e..f62f30bcc2a 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
@@ -1,15 +1,17 @@
-import { Container } from '@ember/-internals/container';
+import Container, { FactoryManager } from '@ember/-internals/container/lib/container';
 import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
 
-interface ContainerProxyMixin {
+export interface IContainer {
+  ownerInjection(): void;
+  lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined;
+  factoryFor(fullName: string): FactoryManager<object> | undefined;
+}
+
+interface ContainerProxyMixin extends IContainer {
   /** @internal */
   __container__: Container;
-
-  ownerInjection(): void;
-  lookup(fullName: string, options?: TypeOptions): unknown;
-  factoryFor(fullName: string): Factory<unknown> | undefined;
 }
 declare const ContainerProxyMixin: Mixin;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
index 8e68a3df3ac..84a0afde922 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
@@ -3,22 +3,33 @@ import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
 
-interface RegistryProxyMixin {
-  /** @internal */
-  __registry__: Registry;
-  resolveRegistration<T, C>(fullName: string): Factory<T, C> | undefined;
-  register(fullName: string, factory: Factory<unknown>, options?: TypeOptions): void;
+export interface IRegistry {
+  resolveRegistration(fullName: string): Factory<object> | object | undefined;
+
+  register(fullName: string, factory: Factory<object> | object, options?: TypeOptions): void;
+
   unregister(fullName: string): void;
+
   hasRegistration(fullName: string): boolean;
+
   registeredOption<K extends keyof TypeOptions>(
     fullName: string,
     optionName: K
   ): TypeOptions[K] | undefined;
+
   registerOptions(fullName: string, options: TypeOptions): void;
+
   registeredOptions(fullName: string): TypeOptions | undefined;
+
   registerOptionsForType(type: string, options: TypeOptions): void;
+
   registeredOptionsForType(type: string): TypeOptions | undefined;
 }
+
+interface RegistryProxyMixin extends IRegistry {
+  /** @internal */
+  __registry__: Registry;
+}
 declare const RegistryProxyMixin: Mixin;
 
 export default RegistryProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.ts b/packages/@ember/-internals/runtime/lib/system/core_object.ts
index 6c72782e4c4..28e5697c876 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.ts
@@ -28,7 +28,7 @@ import { _WeakSet as WeakSet } from '@glimmer/util';
 import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
 import { OWNER } from '@glimmer/owner';
 
-type EmberClassConstructor<T> = new (owner: Owner) => T;
+type EmberClassConstructor<T> = new (owner?: Owner) => T;
 
 type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
   ? T & MergeArray<Rest>
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.d.ts b/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
deleted file mode 100644
index d660535fbdf..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/namespace.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import EmberObject from './object';
-
-export default class Namespace extends EmberObject {
-  static NAMESPACES: Namespace[];
-}
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.js b/packages/@ember/-internals/runtime/lib/system/namespace.ts
similarity index 64%
rename from packages/@ember/-internals/runtime/lib/system/namespace.js
rename to packages/@ember/-internals/runtime/lib/system/namespace.ts
index f76f552f285..fc50a03152d 100644
--- a/packages/@ember/-internals/runtime/lib/system/namespace.js
+++ b/packages/@ember/-internals/runtime/lib/system/namespace.ts
@@ -14,6 +14,7 @@ import {
   removeNamespace,
 } from '@ember/-internals/metal'; // Preloaded into namespaces
 import { getName, guidFor, setName } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import EmberObject from './object';
 
 /**
@@ -34,17 +35,26 @@ import EmberObject from './object';
   @public
 */
 export default class Namespace extends EmberObject {
-  init() {
+  static NAMESPACES = NAMESPACES;
+  static NAMESPACES_BY_ID = NAMESPACES_BY_ID;
+  static processAll = processAllNamespaces;
+  static byName = findNamespace;
+
+  init(properties: object | undefined) {
+    super.init(properties);
     addNamespace(this);
   }
 
-  toString() {
-    let name = get(this, 'name') || get(this, 'modulePrefix');
-    if (name) {
-      return name;
+  readonly isNamespace = true;
+
+  toString(): string {
+    let existing_name = get(this, 'name') || get(this, 'modulePrefix');
+    if (existing_name) {
+      assert("name wasn't a string", typeof existing_name === 'string');
+      return existing_name;
     }
     findNamespaces();
-    name = getName(this);
+    let name = getName(this);
     if (name === undefined) {
       name = guidFor(this);
       setName(this, name);
@@ -58,12 +68,6 @@ export default class Namespace extends EmberObject {
 
   destroy() {
     removeNamespace(this);
-    super.destroy();
+    return super.destroy();
   }
 }
-
-Namespace.prototype.isNamespace = true;
-Namespace.NAMESPACES = NAMESPACES;
-Namespace.NAMESPACES_BY_ID = NAMESPACES_BY_ID;
-Namespace.processAll = processAllNamespaces;
-Namespace.byName = findNamespace;
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
index bb2a7d3a522..29c2439e389 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
@@ -5,6 +5,7 @@ export default class EventDispatcher extends EmberObject {
   lazyEvents: Map<string, string>;
   setupHandlerForBrowserEvent(event: string): void;
   setupHandlerForEmberEvent(event: string): void;
+
   /** @private */
-  setup(addedEvents: Record<string, string | null>, _rootElement: Element): void;
+  setup(addedEvents: Record<string, string | null>, rootElement: string | Element | null): void;
 }
diff --git a/packages/@ember/application/index.d.ts b/packages/@ember/application/index.d.ts
deleted file mode 100644
index d7a56d82c31..00000000000
--- a/packages/@ember/application/index.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { getOwner, setOwner } from '@ember/-internals/owner';
-export { default } from './lib/application';
diff --git a/packages/@ember/application/index.js b/packages/@ember/application/index.ts
similarity index 100%
rename from packages/@ember/application/index.js
rename to packages/@ember/application/index.ts
diff --git a/packages/@ember/application/instance.d.ts b/packages/@ember/application/instance.d.ts
deleted file mode 100644
index 5bf13267ecd..00000000000
--- a/packages/@ember/application/instance.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import EngineInstance from '@ember/engine/instance';
-
-export interface BootOptions {
-  isBrowser?: boolean;
-  shouldRender?: boolean;
-  document?: Document | null;
-  rootElement?: string | Element | null;
-  location?: string | null;
-  // Private?
-  isInteractive?: boolean;
-}
-
-export default class ApplicationInstance extends EngineInstance {
-  visit(url: string): Promise<this>;
-}
diff --git a/packages/@ember/application/instance.js b/packages/@ember/application/instance.ts
similarity index 62%
rename from packages/@ember/application/instance.js
rename to packages/@ember/application/instance.ts
index 9b5841338f2..4d012f15f49 100644
--- a/packages/@ember/application/instance.js
+++ b/packages/@ember/application/instance.ts
@@ -2,10 +2,27 @@
 @module @ember/application
 */
 
-import { get, set, computed } from '@ember/-internals/metal';
+import { get, set } from '@ember/-internals/metal';
 import * as environment from '@ember/-internals/browser-environment';
 import EngineInstance from '@ember/engine/instance';
+import Application from './lib/application';
 import { renderSettled } from '@ember/-internals/glimmer';
+import { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import { assert } from '@ember/debug';
+import { Router } from '@ember/-internals/routing';
+import { EventDispatcher, ViewMixin } from '@ember/-internals/views';
+import { Registry } from '@ember/-internals/container';
+
+export interface BootOptions {
+  isBrowser?: boolean;
+  shouldRender?: boolean;
+  document?: Document | null;
+  rootElement?: string | Element | null;
+  location?: string | null;
+  // Private?
+  isInteractive?: boolean;
+  _renderMode?: string;
+}
 
 /**
   The `ApplicationInstance` encapsulates all of the stateful aspects of a
@@ -32,27 +49,14 @@ import { renderSettled } from '@ember/-internals/glimmer';
   @extends EngineInstance
 */
 
-const ApplicationInstance = EngineInstance.extend({
+class ApplicationInstance extends EngineInstance {
   /**
     The `Application` for which this is an instance.
 
     @property {Application} application
     @private
   */
-  application: null,
-
-  /**
-    The DOM events for which the event dispatcher should listen.
-
-    By default, the application's `Ember.EventDispatcher` listens
-    for a set of standard DOM events, such as `mousedown` and
-    `keyup`, and delegates them to your application's `Ember.View`
-    instances.
-
-    @private
-    @property {Object} customEvents
-  */
-  customEvents: null,
+  declare application: Application;
 
   /**
     The root DOM element of the Application as an element or a
@@ -61,10 +65,10 @@ const ApplicationInstance = EngineInstance.extend({
     @private
     @property {String|DOMElement} rootElement
   */
-  rootElement: null,
+  rootElement: string | Element | null = null;
 
-  init() {
-    this._super(...arguments);
+  init(properties: object | undefined) {
+    super.init(properties);
 
     this.application._watchInstance(this);
 
@@ -76,7 +80,7 @@ const ApplicationInstance = EngineInstance.extend({
     // appended to the rootElement, in the case of apps, to the fixture harness
     // in tests, or rendered to a string in the case of FastBoot.
     this.register('-application-instance:main', this, { instantiate: false });
-  },
+  }
 
   /**
     Overrides the base `EngineInstance._bootSync` method with concerns relevant
@@ -92,12 +96,12 @@ const ApplicationInstance = EngineInstance.extend({
 
     @private
   */
-  _bootSync(options) {
+  _bootSync(options?: BootOptions) {
     if (this._booted) {
       return this;
     }
 
-    options = new BootOptions(options);
+    options = new CBootOptions(options);
 
     this.setupRegistry(options);
 
@@ -120,15 +124,23 @@ const ApplicationInstance = EngineInstance.extend({
     this._booted = true;
 
     return this;
-  },
+  }
 
-  setupRegistry(options) {
-    this.constructor.setupRegistry(this.__registry__, options);
-  },
+  setupRegistry(options: BootOptions) {
+    (this.constructor as typeof ApplicationInstance).setupRegistry(this.__registry__, options);
+  }
+
+  _router?: Router;
 
-  router: computed(function () {
-    return this.lookup('router:main');
-  }).readOnly(),
+  get router() {
+    if (this._router) {
+      return this._router;
+    }
+
+    let router = this.lookup('router:main');
+    assert('expected an instance of Router', router instanceof Router);
+    return (this._router = router);
+  }
 
   /**
     This hook is called by the root-most Route (a.k.a. the ApplicationRoute)
@@ -143,9 +155,9 @@ const ApplicationInstance = EngineInstance.extend({
     @deprecated
     @private
   */
-  didCreateRootView(view) {
-    view.appendTo(this.rootElement);
-  },
+  didCreateRootView(view: ViewMixin) {
+    view.appendTo(this.rootElement!);
+  }
 
   /**
     Tells the router to start routing. The router will ask the location for the
@@ -156,7 +168,7 @@ const ApplicationInstance = EngineInstance.extend({
   */
   startRouting() {
     this.router.startRouting();
-  },
+  }
 
   /**
     Sets up the router, initializing the child router and configuring the
@@ -177,7 +189,7 @@ const ApplicationInstance = EngineInstance.extend({
   */
   setupRouter() {
     this.router.setupRouter();
-  },
+  }
 
   /**
     Directs the router to route to a particular URL. This is useful in tests,
@@ -186,16 +198,18 @@ const ApplicationInstance = EngineInstance.extend({
     @param url {String} the URL the router should route to
     @private
   */
-  handleURL(url) {
+  handleURL(url: string) {
     this.setupRouter();
     return this.router.handleURL(url);
-  },
+  }
 
   /**
     @private
   */
   setupEventDispatcher() {
     let dispatcher = this.lookup('event_dispatcher:main');
+    assert('expected EventDispatcher', dispatcher instanceof EventDispatcher);
+
     let applicationCustomEvents = get(this.application, 'customEvents');
     let instanceCustomEvents = get(this, 'customEvents');
 
@@ -203,7 +217,7 @@ const ApplicationInstance = EngineInstance.extend({
     dispatcher.setup(customEvents, this.rootElement);
 
     return dispatcher;
-  },
+  }
 
   /**
     Returns the current URL of the app instance. This is useful when your
@@ -215,7 +229,7 @@ const ApplicationInstance = EngineInstance.extend({
   */
   getURL() {
     return this.router.url;
-  },
+  }
 
   // `instance.visit(url)` should eventually replace `instance.handleURL()`;
   // the test helpers can probably be switched to use this implementation too
@@ -230,10 +244,10 @@ const ApplicationInstance = EngineInstance.extend({
     @param url {String} the destination URL
     @return {Promise<ApplicationInstance>}
   */
-  visit(url) {
+  visit(url: string) {
     this.setupRouter();
 
-    let bootOptions = this.__container__.lookup('-environment:main');
+    let bootOptions = this.__container__.lookup('-environment:main') as BootEnvironment;
 
     let router = this.router;
 
@@ -247,7 +261,7 @@ const ApplicationInstance = EngineInstance.extend({
       }
     };
 
-    let handleTransitionReject = (error) => {
+    let handleTransitionReject = (error: any): unknown => {
       if (error.error) {
         throw error.error;
       } else if (error.name === 'TransitionAborted' && router._routerMicrolib.activeTransition) {
@@ -263,6 +277,7 @@ const ApplicationInstance = EngineInstance.extend({
     };
 
     let location = get(router, 'location');
+    assert('location has been initialized', typeof location !== 'string');
 
     // Keeps the location adapter's internal URL in-sync
     location.setURL(url);
@@ -271,36 +286,32 @@ const ApplicationInstance = EngineInstance.extend({
     return router
       .handleURL(location.getURL())
       .then(handleTransitionResolve, handleTransitionReject);
-  },
+  }
 
   willDestroy() {
-    this._super(...arguments);
+    super.willDestroy();
     this.application._unwatchInstance(this);
-  },
-});
+  }
 
-ApplicationInstance.reopenClass({
   /**
    @private
    @method setupRegistry
    @param {Registry} registry
    @param {BootOptions} options
   */
-  setupRegistry(registry, options = {}) {
-    if (!options.toEnvironment) {
-      options = new BootOptions(options);
-    }
+  static setupRegistry(registry: Registry, options: BootOptions | CBootOptions = {}) {
+    let coptions = options instanceof CBootOptions ? options : new CBootOptions(options);
 
-    registry.register('-environment:main', options.toEnvironment(), {
+    registry.register('-environment:main', coptions.toEnvironment(), {
       instantiate: false,
     });
-    registry.register('service:-document', options.document, {
+    registry.register('service:-document', coptions.document!, {
       instantiate: false,
     });
 
-    this._super(registry, options);
-  },
-});
+    super.setupRegistry(registry, coptions);
+  }
+}
 
 /**
   A list of boot-time configuration options for customizing the behavior of
@@ -324,51 +335,124 @@ ApplicationInstance.reopenClass({
   @namespace ApplicationInstance
   @public
 */
-class BootOptions {
-  constructor(options = {}) {
-    /**
-      Interactive mode: whether we need to set up event delegation and invoke
-      lifecycle callbacks on Components.
-
-      @property isInteractive
-      @type boolean
-      @default auto-detected
-      @private
-    */
-    this.isInteractive = Boolean(environment.hasDOM); // This default is overridable below
+class CBootOptions {
+  /**
+    Interactive mode: whether we need to set up event delegation and invoke
+    lifecycle callbacks on Components.
 
-    /**
-      @property _renderMode
-      @type string
-      @default undefined
-      @private
-    */
-    this._renderMode = options._renderMode;
+    @property isInteractive
+    @type boolean
+    @default auto-detected
+    @private
+  */
+  readonly isInteractive: boolean;
 
-    /**
-      Run in a full browser environment.
+  /**
+    @property _renderMode
+    @type string
+    @default undefined
+    @private
+  */
+  readonly _renderMode?: string;
+
+  /**
+    Run in a full browser environment.
 
-      When this flag is set to `false`, it will disable most browser-specific
-      and interactive features. Specifically:
+    When this flag is set to `false`, it will disable most browser-specific
+    and interactive features. Specifically:
 
-      * It does not use `jQuery` to append the root view; the `rootElement`
-        (either specified as a subsequent option or on the application itself)
-        must already be an `Element` in the given `document` (as opposed to a
-        string selector).
+    * It does not use `jQuery` to append the root view; the `rootElement`
+      (either specified as a subsequent option or on the application itself)
+      must already be an `Element` in the given `document` (as opposed to a
+      string selector).
 
-      * It does not set up an `EventDispatcher`.
+    * It does not set up an `EventDispatcher`.
 
-      * It does not run any `Component` lifecycle hooks (such as `didInsertElement`).
+    * It does not run any `Component` lifecycle hooks (such as `didInsertElement`).
 
-      * It sets the `location` option to `"none"`. (If you would like to use
-        the location adapter specified in the app's router instead, you can also
-        specify `{ location: null }` to specifically opt-out.)
+    * It sets the `location` option to `"none"`. (If you would like to use
+      the location adapter specified in the app's router instead, you can also
+      specify `{ location: null }` to specifically opt-out.)
+
+    @property isBrowser
+    @type boolean
+    @default auto-detected
+    @public
+  */
+  readonly isBrowser: boolean;
+
+  /**
+    If present, overrides the router's `location` property with this
+    value. This is useful for environments where trying to modify the
+    URL would be inappropriate.
+
+    @property location
+    @type string
+    @default null
+    @public
+  */
+  readonly location: string | null = null;
+
+  /**
+    Disable rendering completely.
+
+    When this flag is set to `false`, it will disable the entire rendering
+    pipeline. Essentially, this puts the app into "routing-only" mode. No
+    templates will be rendered, and no Components will be created.
+
+    @property shouldRender
+    @type boolean
+    @default true
+    @public
+  */
+  readonly shouldRender: boolean;
+
+  /**
+    If present, render into the given `Document` object instead of the
+    global `window.document` object.
+
+    In practice, this is only useful in non-browser environment or in
+    non-interactive mode, because Ember's `jQuery` dependency is
+    implicitly bound to the current document, causing event delegation
+    to not work properly when the app is rendered into a foreign
+    document object (such as an iframe's `contentDocument`).
+
+    In non-browser mode, this could be a "`Document`-like" object as
+    Ember only interact with a small subset of the DOM API in non-
+    interactive mode. While the exact requirements have not yet been
+    formalized, the `SimpleDOM` library's implementation is known to
+    work.
+
+    @property document
+    @type Document
+    @default the global `document` object
+    @public
+  */
+  readonly document: Document | null;
+
+  /**
+    If present, overrides the application's `rootElement` property on
+    the instance. This is useful for testing environment, where you
+    might want to append the root view to a fixture area.
+
+    In non-browser mode, because Ember does not have access to jQuery,
+    this options must be specified as a DOM `Element` object instead of
+    a selector string.
+
+    See the documentation on `Application`'s `rootElement` for
+    details.
+
+    @property rootElement
+    @type String|Element
+    @default null
+    @public
+  */
+  readonly rootElement?: string | Element;
+
+  constructor(options: BootOptions = {}) {
+    this.isInteractive = Boolean(environment.hasDOM); // This default is overridable below
+    this._renderMode = options._renderMode;
 
-      @property isBrowser
-      @type boolean
-      @default auto-detected
-      @public
-    */
     if (options.isBrowser !== undefined) {
       this.isBrowser = Boolean(options.isBrowser);
     } else {
@@ -380,18 +464,6 @@ class BootOptions {
       this.location = 'none';
     }
 
-    /**
-      Disable rendering completely.
-
-      When this flag is set to `false`, it will disable the entire rendering
-      pipeline. Essentially, this puts the app into "routing-only" mode. No
-      templates will be rendered, and no Components will be created.
-
-      @property shouldRender
-      @type boolean
-      @default true
-      @public
-    */
     if (options.shouldRender !== undefined) {
       this.shouldRender = Boolean(options.shouldRender);
     } else {
@@ -402,50 +474,12 @@ class BootOptions {
       this.isInteractive = false;
     }
 
-    /**
-      If present, render into the given `Document` object instead of the
-      global `window.document` object.
-
-      In practice, this is only useful in non-browser environment or in
-      non-interactive mode, because Ember's `jQuery` dependency is
-      implicitly bound to the current document, causing event delegation
-      to not work properly when the app is rendered into a foreign
-      document object (such as an iframe's `contentDocument`).
-
-      In non-browser mode, this could be a "`Document`-like" object as
-      Ember only interact with a small subset of the DOM API in non-
-      interactive mode. While the exact requirements have not yet been
-      formalized, the `SimpleDOM` library's implementation is known to
-      work.
-
-      @property document
-      @type Document
-      @default the global `document` object
-      @public
-    */
     if (options.document) {
       this.document = options.document;
     } else {
       this.document = typeof document !== 'undefined' ? document : null;
     }
 
-    /**
-      If present, overrides the application's `rootElement` property on
-      the instance. This is useful for testing environment, where you
-      might want to append the root view to a fixture area.
-
-      In non-browser mode, because Ember does not have access to jQuery,
-      this options must be specified as a DOM `Element` object instead of
-      a selector string.
-
-      See the documentation on `Application`'s `rootElement` for
-      details.
-
-      @property rootElement
-      @type String|Element
-      @default null
-      @public
-     */
     if (options.rootElement) {
       this.rootElement = options.rootElement;
     }
@@ -454,16 +488,6 @@ class BootOptions {
     // defaults from the "combo" options like `isBrowser` (although in
     // practice, the resulting combination is probably invalid)
 
-    /**
-      If present, overrides the router's `location` property with this
-      value. This is useful for environments where trying to modify the
-      URL would be inappropriate.
-
-      @property location
-      @type string
-      @default null
-      @public
-    */
     if (options.location !== undefined) {
       this.location = options.location;
     }
@@ -473,15 +497,16 @@ class BootOptions {
     }
   }
 
-  toEnvironment() {
+  toEnvironment(): BootEnvironment {
     // Do we really want to assign all of this!?
-    let env = Object.assign({}, environment);
-    // For compatibility with existing code
-    env.hasDOM = this.isBrowser;
-    env.isInteractive = this.isInteractive;
-    env._renderMode = this._renderMode;
-    env.options = this;
-    return env;
+    return {
+      ...environment,
+      // For compatibility with existing code
+      hasDOM: this.isBrowser,
+      isInteractive: this.isInteractive,
+      _renderMode: this._renderMode,
+      options: this,
+    };
   }
 }
 
diff --git a/packages/@ember/application/lib/application.d.ts b/packages/@ember/application/lib/application.d.ts
deleted file mode 100644
index cde593027b5..00000000000
--- a/packages/@ember/application/lib/application.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { EventDispatcher } from '@ember/-internals/views';
-import Engine from '@ember/engine';
-import { EngineInstanceOptions } from '@ember/engine/instance';
-import ApplicationInstance, { BootOptions } from '../instance';
-
-export default class Application extends Engine {
-  rootElement: string | Element;
-  eventDispatcher: EventDispatcher;
-  customEvents: Record<string, string | null> | null;
-  buildInstance(options?: EngineInstanceOptions): ApplicationInstance;
-  deferReadiness(): void;
-  advanceReadiness(): void;
-  boot(): Promise<this>;
-  ready(): void;
-  reset(): void;
-  visit(url: string, options?: BootOptions): Promise<ApplicationInstance>;
-  /** @private */
-  __deprecatedInstance__?: ApplicationInstance;
-}
diff --git a/packages/@ember/application/lib/application.js b/packages/@ember/application/lib/application.ts
similarity index 92%
rename from packages/@ember/application/lib/application.js
rename to packages/@ember/application/lib/application.ts
index 5cbf5076571..20185c7ba69 100644
--- a/packages/@ember/application/lib/application.js
+++ b/packages/@ember/application/lib/application.ts
@@ -21,11 +21,12 @@ import {
   NoneLocation,
   BucketCache,
 } from '@ember/-internals/routing';
-import ApplicationInstance from '../instance';
+import ApplicationInstance, { BootOptions } from '../instance';
 import Engine from '@ember/engine';
-import { privatize as P } from '@ember/-internals/container';
+import { Container, privatize as P, Registry } from '@ember/-internals/container';
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
 import { RouterService } from '@ember/-internals/routing';
+import { EngineInstanceOptions } from '@ember/engine/instance';
 
 /**
   An instance of `Application` is the starting point for every Ember
@@ -177,11 +178,45 @@ import { RouterService } from '@ember/-internals/routing';
 
   @class Application
   @extends Engine
-  @uses RegistryProxyMixin
   @public
 */
 
-const Application = Engine.extend({
+class Application extends Engine {
+  /**
+    This creates a registry with the default Ember naming conventions.
+
+    It also configures the registry:
+
+    * registered views are created every time they are looked up (they are
+      not singletons)
+    * registered templates are not factories; the registered value is
+      returned directly.
+    * the router receives the application as its `namespace` property
+    * all controllers receive the router as their `target` and `controllers`
+      properties
+    * all controllers receive the application as their `namespace` property
+    * the application view receives the application controller as its
+      `controller` property
+    * the application view receives the application template as its
+      `defaultTemplate` property
+
+    @method buildRegistry
+    @static
+    @param {Application} namespace the application for which to
+      build the registry
+    @return {Ember.Registry} the built registry
+    @private
+  */
+  static buildRegistry(namespace: Application) {
+    let registry = super.buildRegistry(namespace);
+
+    commonSetupRegistry(registry);
+
+    setupApplicationRegistry(registry);
+
+    return registry;
+  }
+
   /**
     The root DOM element of the Application. This can be specified as an
     element or a [selector string](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors#reference_table_of_selectors).
@@ -195,7 +230,7 @@ const Application = Engine.extend({
     @default 'body'
     @public
   */
-  rootElement: 'body',
+  declare rootElement: Element | string;
 
   /**
 
@@ -204,7 +239,7 @@ const Application = Engine.extend({
     @default 'window.document'
     @private
   */
-  _document: hasDOM ? window.document : null,
+  declare _document: Document | null;
 
   /**
     The `Ember.EventDispatcher` responsible for delegating events to this
@@ -221,7 +256,7 @@ const Application = Engine.extend({
     @default null
     @public
   */
-  eventDispatcher: null,
+  declare eventDispatcher: EventDispatcher | null;
 
   /**
     The DOM events for which the event dispatcher should listen.
@@ -269,7 +304,7 @@ const Application = Engine.extend({
     @default null
     @public
   */
-  customEvents: null,
+  declare customEvents: Record<string, string | null> | null;
 
   /**
     Whether the application should automatically start routing and render
@@ -283,7 +318,7 @@ const Application = Engine.extend({
     @default true
     @private
   */
-  autoboot: true,
+  declare autoboot: boolean;
 
   /**
     Whether the application should be configured for the legacy "globals mode".
@@ -332,7 +367,7 @@ const Application = Engine.extend({
     @default true
     @private
   */
-  _globalsMode: true,
+  declare _globalsMode: boolean;
 
   /**
     An array of application instances created by `buildInstance()`. Used
@@ -340,19 +375,30 @@ const Application = Engine.extend({
 
     @property _applicationInstances
     @type Array
-    @default null
     @private
   */
-  _applicationInstances: null,
+  declare _applicationInstances: Set<ApplicationInstance>;
+
+  declare _readinessDeferrals: number;
+
+  declare _booted: boolean;
 
-  init() {
-    this._super(...arguments);
+  init(properties: object | undefined) {
+    super.init(properties);
+
+    this.rootElement ??= 'body';
+    this._document ??= null;
+    this.eventDispatcher ??= null;
+    this.customEvents ??= null;
+    this.autoboot ??= true;
+    this._document ??= hasDOM ? window.document : null;
+    this._globalsMode ??= true;
 
     if (DEBUG) {
       if (ENV.LOG_VERSION) {
         // we only need to see this once per Application#init
         ENV.LOG_VERSION = false;
-        libraries.logVersions();
+        libraries.logVersions?.();
       }
     }
 
@@ -371,7 +417,7 @@ const Application = Engine.extend({
     if (this.autoboot) {
       this.waitForDOMReady();
     }
-  },
+  }
 
   /**
     Create an ApplicationInstance for this application.
@@ -380,7 +426,7 @@ const Application = Engine.extend({
     @method buildInstance
     @return {ApplicationInstance} the application instance
   */
-  buildInstance(options = {}) {
+  buildInstance(options: EngineInstanceOptions = {}): ApplicationInstance {
     assert(
       'You cannot build new instances of this application since it has already been destroyed',
       !this.isDestroyed
@@ -391,10 +437,12 @@ const Application = Engine.extend({
       !this.isDestroying
     );
 
-    options.base = this;
-    options.application = this;
-    return ApplicationInstance.create(options);
-  },
+    return ApplicationInstance.create({
+      ...options,
+      base: this,
+      application: this,
+    });
+  }
 
   /**
     Start tracking an ApplicationInstance for this application.
@@ -403,9 +451,9 @@ const Application = Engine.extend({
     @private
     @method _watchInstance
   */
-  _watchInstance(instance) {
+  _watchInstance(instance: ApplicationInstance): void {
     this._applicationInstances.add(instance);
-  },
+  }
 
   /**
     Stop tracking an ApplicationInstance for this application.
@@ -414,9 +462,11 @@ const Application = Engine.extend({
     @private
     @method _unwatchInstance
   */
-  _unwatchInstance(instance) {
+  _unwatchInstance(instance: ApplicationInstance) {
     return this._applicationInstances.delete(instance);
-  },
+  }
+
+  Router?: typeof Router;
 
   /**
     Enable the legacy globals mode by allowing this application to act
@@ -429,14 +479,17 @@ const Application = Engine.extend({
     @private
     @method _prepareForGlobalsMode
   */
-  _prepareForGlobalsMode() {
+  _prepareForGlobalsMode(): void {
     // Create subclass of Router for this Application instance.
     // This is to ensure that someone reopening `App.Router` does not
     // tamper with the default `Router`.
-    this.Router = (this.Router || Router).extend();
+    this.Router = (this.Router || Router).extend() as typeof Router;
 
     this._buildDeprecatedInstance();
-  },
+  }
+
+  __deprecatedInstance__?: ApplicationInstance;
+  __container__?: Container;
 
   /*
     Build the deprecated instance for legacy globals mode support.
@@ -452,7 +505,7 @@ const Application = Engine.extend({
     @private
     @method _buildDeprecatedInstance
   */
-  _buildDeprecatedInstance() {
+  _buildDeprecatedInstance(): void {
     // Build a default instance
     let instance = this.buildInstance();
 
@@ -460,7 +513,7 @@ const Application = Engine.extend({
     // on App that rely on a single, default instance.
     this.__deprecatedInstance__ = instance;
     this.__container__ = instance.__container__;
-  },
+  }
 
   /**
     Automatically kick-off the boot process for the application once the
@@ -476,18 +529,20 @@ const Application = Engine.extend({
     @private
     @method waitForDOMReady
   */
-  waitForDOMReady() {
-    if (this._document === null || this._document.readyState !== 'loading') {
-      schedule('actions', this, 'domReady');
+  waitForDOMReady(): void {
+    const document = this._document;
+
+    if (document === null || document.readyState !== 'loading') {
+      schedule('actions', this, this.domReady);
     } else {
       let callback = () => {
-        this._document.removeEventListener('DOMContentLoaded', callback);
-        run(this, 'domReady');
+        document.removeEventListener('DOMContentLoaded', callback);
+        run(this, this.domReady);
       };
 
-      this._document.addEventListener('DOMContentLoaded', callback);
+      document.addEventListener('DOMContentLoaded', callback);
     }
-  },
+  }
 
   /**
     This is the autoboot flow:
@@ -524,7 +579,7 @@ const Application = Engine.extend({
     @private
     @method domReady
   */
-  domReady() {
+  domReady(): void {
     if (this.isDestroying || this.isDestroyed) {
       return;
     }
@@ -532,7 +587,7 @@ const Application = Engine.extend({
     this._bootSync();
 
     // Continues to `didBecomeReady`
-  },
+  }
 
   /**
     Use this to defer readiness until some condition is true.
@@ -563,7 +618,7 @@ const Application = Engine.extend({
     @method deferReadiness
     @public
   */
-  deferReadiness() {
+  deferReadiness(): void {
     assert(
       'You must call deferReadiness on an instance of Application',
       this instanceof Application
@@ -582,7 +637,7 @@ const Application = Engine.extend({
     );
 
     this._readinessDeferrals++;
-  },
+  }
 
   /**
     Call `advanceReadiness` after any asynchronous setup logic has completed.
@@ -619,7 +674,9 @@ const Application = Engine.extend({
     if (this._readinessDeferrals === 0) {
       once(this, this.didBecomeReady);
     }
-  },
+  }
+
+  _bootPromise: Promise<this> | null = null;
 
   /**
     Initialize the application and return a promise that resolves with the `Application`
@@ -637,7 +694,7 @@ const Application = Engine.extend({
     @method boot
     @return {Promise<Application,Error>}
   */
-  boot() {
+  boot(): Promise<this> {
     assert(
       'You cannot boot this application since it has already been destroyed',
       !this.isDestroyed
@@ -656,8 +713,12 @@ const Application = Engine.extend({
       // in the promise rejection
     }
 
+    assert('has boot promise', this._bootPromise);
+
     return this._bootPromise;
-  },
+  }
+
+  _bootResolver: ReturnType<typeof RSVP['defer']> | null = null;
 
   /**
     Unfortunately, a lot of existing code assumes the booting process is
@@ -682,7 +743,7 @@ const Application = Engine.extend({
     // the boot process, we need to store the error as a rejection on the boot
     // promise so that a future caller of `boot()` can tell what failed.
     let defer = (this._bootResolver = RSVP.defer());
-    this._bootPromise = defer.promise;
+    this._bootPromise = defer.promise as Promise<this>;
 
     try {
       this.runInitializers();
@@ -696,7 +757,7 @@ const Application = Engine.extend({
       // For the synchronous boot path
       throw error;
     }
-  },
+  }
 
   /**
     Reset the application. This is typically used only in tests. It cleans up
@@ -792,14 +853,15 @@ const Application = Engine.extend({
     this._bootResolver = null;
     this._booted = false;
 
-    function handleReset() {
+    function handleReset(this: Application) {
+      assert('expected instance', instance);
       run(instance, 'destroy');
       this._buildDeprecatedInstance();
       schedule('actions', this, '_bootSync');
     }
 
     join(this, handleReset);
-  },
+  }
 
   /**
     @private
@@ -810,6 +872,8 @@ const Application = Engine.extend({
       return;
     }
 
+    assert('expected _bootResolver', this._bootResolver);
+
     try {
       // TODO: Is this still needed for _globalsMode = false?
 
@@ -821,6 +885,7 @@ const Application = Engine.extend({
           // If we already have the __deprecatedInstance__ lying around, boot it to
           // avoid unnecessary work
           instance = this.__deprecatedInstance__;
+          assert('expected instance', instance);
         } else {
           // Otherwise, build an instance and boot it. This is currently unreachable,
           // because we forced _globalsMode to === autoboot; but having this branch
@@ -849,7 +914,7 @@ const Application = Engine.extend({
       // For the synchronous boot path
       throw error;
     }
-  },
+  }
 
   /**
     Called when the Application has become ready, immediately before routing
@@ -860,21 +925,21 @@ const Application = Engine.extend({
   */
   ready() {
     return this;
-  },
+  }
 
   // This method must be moved to the application instance object
   willDestroy() {
-    this._super(...arguments);
+    super.willDestroy();
 
-    if (_loaded.application === this) {
-      _loaded.application = undefined;
+    if (_loaded['application'] === this) {
+      _loaded['application'] = undefined;
     }
 
     if (this._applicationInstances.size) {
       this._applicationInstances.forEach((i) => i.destroy());
       this._applicationInstances.clear();
     }
-  },
+  }
 
   /**
     Boot a new instance of `ApplicationInstance` for the current
@@ -1074,7 +1139,7 @@ const Application = Engine.extend({
     @param options {ApplicationInstance.BootOptions}
     @return {Promise<ApplicationInstance, Error>}
   */
-  visit(url, options) {
+  visit(url: string, options: BootOptions) {
     assert(
       'You cannot visit this application since it has already been destroyed',
       !this.isDestroyed
@@ -1093,47 +1158,10 @@ const Application = Engine.extend({
           throw error;
         });
     });
-  },
-});
-
-Application.reopenClass({
-  /**
-    This creates a registry with the default Ember naming conventions.
-
-    It also configures the registry:
-
-    * registered views are created every time they are looked up (they are
-      not singletons)
-    * registered templates are not factories; the registered value is
-      returned directly.
-    * the router receives the application as its `namespace` property
-    * all controllers receive the router as their `target` and `controllers`
-      properties
-    * all controllers receive the application as their `namespace` property
-    * the application view receives the application controller as its
-      `controller` property
-    * the application view receives the application template as its
-      `defaultTemplate` property
-
-    @method buildRegistry
-    @static
-    @param {Application} namespace the application for which to
-      build the registry
-    @return {Ember.Registry} the built registry
-    @private
-  */
-  buildRegistry() {
-    let registry = this._super(...arguments);
-
-    commonSetupRegistry(registry);
-
-    setupApplicationRegistry(registry);
-
-    return registry;
-  },
-});
+  }
+}
 
-function commonSetupRegistry(registry) {
+function commonSetupRegistry(registry: Registry) {
   registry.register('router:main', Router);
   registry.register('-view-registry:main', {
     create() {
diff --git a/packages/@ember/application/lib/lazy_load.js b/packages/@ember/application/lib/lazy_load.ts
similarity index 77%
rename from packages/@ember/application/lib/lazy_load.js
rename to packages/@ember/application/lib/lazy_load.ts
index 290f66cdeda..cf733e702a8 100644
--- a/packages/@ember/application/lib/lazy_load.js
+++ b/packages/@ember/application/lib/lazy_load.ts
@@ -8,7 +8,7 @@ import { window } from '@ember/-internals/browser-environment';
 */
 
 const loadHooks = ENV.EMBER_LOAD_HOOKS || {};
-const loaded = {};
+const loaded: Record<string, unknown> = {};
 export let _loaded = loaded;
 
 /**
@@ -33,11 +33,11 @@ export let _loaded = loaded;
   @param callback {Function} callback to be called
   @private
 */
-export function onLoad(name, callback) {
+export function onLoad(name: string, callback: (obj: unknown) => void) {
   let object = loaded[name];
 
-  loadHooks[name] = loadHooks[name] || [];
-  loadHooks[name].push(callback);
+  let hooks = (loadHooks[name] ??= []);
+  hooks.push(callback);
 
   if (object) {
     callback(object);
@@ -55,15 +55,13 @@ export function onLoad(name, callback) {
   @param object {Object} object to pass to callbacks
   @private
 */
-export function runLoadHooks(name, object) {
+export function runLoadHooks(name: string, object: unknown) {
   loaded[name] = object;
 
   if (window && typeof CustomEvent === 'function') {
-    let event = new CustomEvent(name, { detail: object, name });
+    let event = new CustomEvent(name, { detail: object });
     window.dispatchEvent(event);
   }
 
-  if (loadHooks[name]) {
-    loadHooks[name].forEach((callback) => callback(object));
-  }
+  loadHooks[name]?.forEach((callback) => callback(object));
 }
diff --git a/packages/@ember/application/tests/reset_test.js b/packages/@ember/application/tests/reset_test.js
index 6e7c852a59a..2282afb6cfa 100644
--- a/packages/@ember/application/tests/reset_test.js
+++ b/packages/@ember/application/tests/reset_test.js
@@ -1,8 +1,8 @@
 import { run } from '@ember/runloop';
 import Controller from '@ember/controller';
 import { Router } from '@ember/-internals/routing';
+import { EventDispatcher } from '@ember/-internals/views';
 import { moduleFor, AutobootApplicationTestCase } from 'internal-test-helpers';
-import { CoreObject } from '@ember/-internals/runtime';
 
 moduleFor(
   'Application - resetting',
@@ -71,7 +71,7 @@ moduleFor(
       let eventDispatcherWasSetup = 0;
       let eventDispatcherWasDestroyed = 0;
 
-      class FakeEventDispatcher extends CoreObject {
+      class FakeEventDispatcher extends EventDispatcher {
         setup() {
           eventDispatcherWasSetup++;
         }
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index 312ccbffc3f..4ec3d6bbd75 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -13,21 +13,22 @@ class App extends Application {
     mouseenter: null,
     paste: 'paste',
   };
-  ready() {
+  ready(): this {
     // I'm ready!
+    return this;
   }
 }
 
 const app = new App(owner);
 
 // You shouldn't really be setting this, so let's at least check that we can read it
-expectTypeOf(app.eventDispatcher).toEqualTypeOf<EventDispatcher>();
+expectTypeOf(app.eventDispatcher).toEqualTypeOf<EventDispatcher | null>();
 
 expectTypeOf(app.buildInstance()).toEqualTypeOf<ApplicationInstance>();
 expectTypeOf(app.deferReadiness()).toEqualTypeOf<void>();
 expectTypeOf(app.advanceReadiness()).toEqualTypeOf<void>();
-expectTypeOf(app.boot()).toEqualTypeOf<Promise<Application>>();
-expectTypeOf(app.ready()).toEqualTypeOf<void>();
+expectTypeOf(app.boot()).resolves.toEqualTypeOf<App>();
+expectTypeOf(app.ready()).toEqualTypeOf<App>();
 expectTypeOf(app.reset()).toEqualTypeOf<void>();
 
 let bootOptions = {
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 92e4632dfb6..6e690e5b661 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import { Factory, Owner } from '@ember/-internals/owner';
 import Application from '@ember/application';
 import ApplicationInstance, { BootOptions } from '@ember/application/instance';
 import EngineInstance from '@ember/engine/instance';
@@ -23,16 +23,18 @@ expectTypeOf(
   instance.register('service:store-singleton', Store, { singleton: true, instantiate: true })
 ).toEqualTypeOf<void>();
 
-expectTypeOf(instance.lookup('service:store')).toEqualTypeOf<unknown>();
+expectTypeOf(instance.lookup('service:store')).toEqualTypeOf<
+  Factory<object> | object | undefined
+>();
 expectTypeOf(
   instance.lookup('service:store', { singleton: true, instantiate: true })
-).toEqualTypeOf<unknown>();
+).toEqualTypeOf<object | Factory<object> | undefined>();
 
 expectTypeOf(instance.hasRegistration('service:store')).toEqualTypeOf<boolean>();
 // @ts-expect-error requires name
 instance.hasRegistration();
 
-expectTypeOf(instance.boot()).toEqualTypeOf<Promise<ApplicationInstance>>();
+expectTypeOf(instance.boot()).resolves.toEqualTypeOf<ApplicationInstance>();
 
 const bootOptions: BootOptions = {
   isBrowser: true,
diff --git a/packages/@ember/engine/index.d.ts b/packages/@ember/engine/index.d.ts
deleted file mode 100644
index ce6f8becfdd..00000000000
--- a/packages/@ember/engine/index.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import EngineInstance, { EngineInstanceOptions } from './instance';
-import { Namespace, RegistryProxyMixin } from '@ember/-internals/runtime';
-import { Registry } from '@ember/-internals/container';
-
-export { getEngineParent } from '@ember/engine/lib/engine-parent';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface Engine extends RegistryProxyMixin {}
-declare class Engine extends Namespace {
-  static buildRegistry(engine: Engine): Registry;
-  buildInstance(options?: EngineInstanceOptions): EngineInstance;
-  initializer: (initializer: unknown) => void;
-  instanceInitializer: (initializer: unknown) => void;
-  Resolver: unknown | null;
-}
-
-export { Engine as default };
diff --git a/packages/@ember/engine/index.js b/packages/@ember/engine/index.ts
similarity index 76%
rename from packages/@ember/engine/index.js
rename to packages/@ember/engine/index.ts
index 3727d65323c..26c5466625b 100644
--- a/packages/@ember/engine/index.js
+++ b/packages/@ember/engine/index.ts
@@ -2,18 +2,20 @@ export { getEngineParent, setEngineParent } from './lib/engine-parent';
 
 import { canInvoke } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
-import { Namespace, RegistryProxyMixin } from '@ember/-internals/runtime';
+import { Namespace } from '@ember/-internals/runtime';
 import { Registry } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
-import EngineInstance from '@ember/engine/instance';
+import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
 import { RoutingService } from '@ember/-internals/routing';
 import { ContainerDebugAdapter } from '@ember/-internals/extension-support';
 import { ComponentLookup } from '@ember/-internals/views';
 import { setupEngineRegistry } from '@ember/-internals/glimmer';
+import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
+import { ResolverClass } from '@ember/-internals/container/lib/registry';
 
-function props(obj) {
+function props(obj: any) {
   let properties = [];
 
   for (let key in obj) {
@@ -23,6 +25,13 @@ function props(obj) {
   return properties;
 }
 
+export interface Initializer<T> {
+  name: string;
+  initialize: (target: T) => void;
+  before?: string | string[];
+  after?: string | string[];
+}
+
 /**
 @module @ember/engine
 */
@@ -40,120 +49,14 @@ function props(obj) {
 
   @class Engine
   @extends Ember.Namespace
-  @uses RegistryProxy
+  @uses RegistryProxyMixin
   @public
 */
-const Engine = Namespace.extend(RegistryProxyMixin, {
-  init() {
-    this._super(...arguments);
-
-    this.buildRegistry();
-  },
-
-  /**
-    A private flag indicating whether an engine's initializers have run yet.
-
-    @private
-    @property _initializersRan
-  */
-  _initializersRan: false,
-
-  /**
-    Ensure that initializers are run once, and only once, per engine.
-
-    @private
-    @method ensureInitializers
-  */
-  ensureInitializers() {
-    if (!this._initializersRan) {
-      this.runInitializers();
-      this._initializersRan = true;
-    }
-  },
-
-  /**
-    Create an EngineInstance for this engine.
-
-    @public
-    @method buildInstance
-    @return {EngineInstance} the engine instance
-  */
-  buildInstance(options = {}) {
-    this.ensureInitializers();
-    options.base = this;
-    return EngineInstance.create(options);
-  },
-
-  /**
-    Build and configure the registry for the current engine.
-
-    @private
-    @method buildRegistry
-    @return {Ember.Registry} the configured registry
-  */
-  buildRegistry() {
-    let registry = (this.__registry__ = this.constructor.buildRegistry(this));
-
-    return registry;
-  },
-
-  /**
-    @private
-    @method initializer
-  */
-  initializer(options) {
-    this.constructor.initializer(options);
-  },
-
-  /**
-    @private
-    @method instanceInitializer
-  */
-  instanceInitializer(options) {
-    this.constructor.instanceInitializer(options);
-  },
-
-  /**
-    @private
-    @method runInitializers
-  */
-  runInitializers() {
-    this._runInitializer('initializers', (name, initializer) => {
-      assert(`No application initializer named '${name}'`, Boolean(initializer));
-      initializer.initialize(this);
-    });
-  },
-
-  /**
-    @private
-    @since 1.12.0
-    @method runInstanceInitializers
-  */
-  runInstanceInitializers(instance) {
-    this._runInitializer('instanceInitializers', (name, initializer) => {
-      assert(`No instance initializer named '${name}'`, Boolean(initializer));
-      initializer.initialize(instance);
-    });
-  },
-
-  _runInitializer(bucketName, cb) {
-    let initializersByName = get(this.constructor, bucketName);
-    let initializers = props(initializersByName);
-    let graph = new DAG();
-    let initializer;
-
-    for (let i = 0; i < initializers.length; i++) {
-      initializer = initializersByName[initializers[i]];
-      graph.add(initializer.name, initializer, initializer.before, initializer.after);
-    }
-
-    graph.topsort(cb);
-  },
-});
-
-Engine.reopenClass({
-  initializers: Object.create(null),
-  instanceInitializers: Object.create(null),
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Engine extends RegistryProxyMixin {}
+class Engine extends Namespace.extend(RegistryProxyMixin) {
+  static initializers: Record<string, Initializer<Engine>> = Object.create(null);
+  static instanceInitializers: Record<string, Initializer<EngineInstance>> = Object.create(null);
 
   /**
     The goal of initializers should be to register dependencies and injections.
@@ -300,7 +203,7 @@ Engine.reopenClass({
     @public
   */
 
-  initializer: buildInitializerMethod('initializers', 'initializer'),
+  static initializer = buildInitializerMethod('initializers', 'initializer');
 
   /**
     Instance initializers run after all initializers have run. Because
@@ -373,7 +276,10 @@ Engine.reopenClass({
     @param instanceInitializer
     @public
   */
-  instanceInitializer: buildInitializerMethod('instanceInitializers', 'instance initializer'),
+  static instanceInitializer = buildInitializerMethod(
+    'instanceInitializers',
+    'instance initializer'
+  );
 
   /**
     This creates a registry with the default Ember naming conventions.
@@ -400,7 +306,7 @@ Engine.reopenClass({
     @return {Ember.Registry} the built registry
     @private
   */
-  buildRegistry(namespace) {
+  static buildRegistry(namespace: Engine) {
     let registry = new Registry({
       resolver: resolverFor(namespace),
     });
@@ -413,7 +319,7 @@ Engine.reopenClass({
     setupEngineRegistry(registry);
 
     return registry;
-  },
+  }
 
   /**
     Set this to provide an alternate class to `DefaultResolver`
@@ -421,8 +327,122 @@ Engine.reopenClass({
     @property resolver
     @public
   */
-  Resolver: null,
-});
+  declare Resolver: ResolverClass;
+
+  init(properties: object | undefined) {
+    super.init(properties);
+    this.buildRegistry();
+  }
+
+  /**
+    A private flag indicating whether an engine's initializers have run yet.
+
+    @private
+    @property _initializersRan
+  */
+  _initializersRan = false;
+
+  /**
+    Ensure that initializers are run once, and only once, per engine.
+
+    @private
+    @method ensureInitializers
+  */
+  ensureInitializers() {
+    if (!this._initializersRan) {
+      this.runInitializers();
+      this._initializersRan = true;
+    }
+  }
+
+  /**
+    Create an EngineInstance for this engine.
+
+    @public
+    @method buildInstance
+    @return {EngineInstance} the engine instance
+  */
+  buildInstance(options: EngineInstanceOptions = {}): EngineInstance {
+    this.ensureInitializers();
+    return EngineInstance.create({ ...options, base: this });
+  }
+
+  /**
+    Build and configure the registry for the current engine.
+
+    @private
+    @method buildRegistry
+    @return {Ember.Registry} the configured registry
+  */
+  buildRegistry() {
+    let registry = (this.__registry__ = (this.constructor as typeof Engine).buildRegistry(this));
+
+    return registry;
+  }
+
+  /**
+    @private
+    @method initializer
+  */
+  initializer(initializer: Initializer<Engine>) {
+    (this.constructor as typeof Engine).initializer(initializer);
+  }
+
+  /**
+    @private
+    @method instanceInitializer
+  */
+  instanceInitializer(initializer: Initializer<EngineInstance>) {
+    (this.constructor as typeof Engine).instanceInitializer(initializer);
+  }
+
+  /**
+    @private
+    @method runInitializers
+  */
+  runInitializers() {
+    this._runInitializer(
+      'initializers',
+      (name: string, initializer: Initializer<this> | undefined) => {
+        assert(`No application initializer named '${name}'`, initializer);
+        initializer.initialize(this);
+      }
+    );
+  }
+
+  /**
+    @private
+    @since 1.12.0
+    @method runInstanceInitializers
+  */
+  runInstanceInitializers<T extends EngineInstance>(instance: T) {
+    this._runInitializer(
+      'instanceInitializers',
+      (name: string, initializer: Initializer<T> | undefined) => {
+        assert(`No instance initializer named '${name}'`, initializer);
+        initializer.initialize(instance);
+      }
+    );
+  }
+
+  _runInitializer<
+    B extends 'initializers' | 'instanceInitializers',
+    T extends B extends 'initializers' ? Engine : EngineInstance
+  >(bucketName: B, cb: (name: string, initializer: Initializer<T> | undefined) => void) {
+    let initializersByName = get(this.constructor, bucketName) as Record<string, Initializer<T>>;
+    let initializers = props(initializersByName);
+    let graph = new DAG<Initializer<T>>();
+    let initializer;
+
+    for (let name of initializers) {
+      initializer = initializersByName[name];
+      assert(`missing ${bucketName}: ${name}`, initializer);
+      graph.add(initializer.name, initializer, initializer.before, initializer.after);
+    }
+
+    graph.topsort(cb);
+  }
+}
 
 /**
   This function defines the default lookup rules for container lookups:
@@ -437,27 +457,30 @@ Engine.reopenClass({
 
   @private
   @method resolverFor
-  @param {Ember.Namespace} namespace the namespace to look for classes
+  @param {Ember.Enginer} namespace the namespace to look for classes
   @return {*} the resolved value for a given lookup
 */
-function resolverFor(namespace) {
-  let ResolverClass = get(namespace, 'Resolver');
+function resolverFor(namespace: Engine) {
+  let ResolverClass = namespace.Resolver;
   let props = { namespace };
   return ResolverClass.create(props);
 }
 
-function buildInitializerMethod(bucketName, humanName) {
-  return function (initializer) {
+function buildInitializerMethod<
+  B extends 'initializers' | 'instanceInitializers',
+  T extends B extends 'initializers' ? Engine : EngineInstance
+>(bucketName: B, humanName: string) {
+  return function (this: typeof Engine, initializer: Initializer<T>) {
     // If this is the first initializer being added to a subclass, we are going to reopen the class
     // to make sure we have a new `initializers` object, which extends from the parent class' using
     // prototypal inheritance. Without this, attempting to add initializers to the subclass would
     // pollute the parent class as well as other subclasses.
-    if (
-      this.superclass[bucketName] !== undefined &&
-      this.superclass[bucketName] === this[bucketName]
-    ) {
-      let attrs = {};
-      attrs[bucketName] = Object.create(this[bucketName]);
+    // SAFETY: The superclass may be an Engine, we don't call unless we confirmed it was ok.
+    let superclass = this.superclass as typeof Engine;
+    if (superclass[bucketName] !== undefined && superclass[bucketName] === this[bucketName]) {
+      let attrs = {
+        [bucketName]: Object.create(this[bucketName]),
+      };
       this.reopenClass(attrs);
     }
 
@@ -474,11 +497,12 @@ function buildInitializerMethod(bucketName, humanName) {
       initializer.name !== undefined
     );
 
-    this[bucketName][initializer.name] = initializer;
+    let initializers = (this as typeof Engine)[bucketName] as Record<string, Initializer<T>>;
+    initializers[initializer.name] = initializer;
   };
 }
 
-function commonSetupRegistry(registry) {
+function commonSetupRegistry(registry: Registry) {
   registry.optionsForType('component', { singleton: false });
   registry.optionsForType('view', { singleton: false });
 
@@ -488,7 +512,7 @@ function commonSetupRegistry(registry) {
   registry.register('service:-routing', RoutingService);
 
   // DEBUGGING
-  registry.register('resolver-for-debugging:main', registry.resolver, {
+  registry.register('resolver-for-debugging:main', registry.resolver!, {
     instantiate: false,
   });
 
diff --git a/packages/@ember/engine/instance.d.ts b/packages/@ember/engine/instance.d.ts
deleted file mode 100644
index 34ee9cf22dd..00000000000
--- a/packages/@ember/engine/instance.d.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
-import { Owner } from '@ember/-internals/owner';
-import { BootOptions } from '@ember/application/instance';
-import EmberObject from '@ember/object';
-import { Registry } from '@ember/-internals/container';
-
-export interface EngineInstanceOptions {
-  mountPoint?: string;
-  routable?: boolean;
-}
-
-interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, Owner {}
-
-declare class EngineInstance extends EmberObject {
-  static setupRegistry(registry: Registry, options: unknown): void;
-  boot(options?: BootOptions): Promise<this>;
-  mountPoint: string;
-  routable: boolean;
-  buildChildEngineInstance(name: string, options?: EngineInstanceOptions): EngineInstance;
-}
-
-export default EngineInstance;
diff --git a/packages/@ember/engine/instance.js b/packages/@ember/engine/instance.ts
similarity index 62%
rename from packages/@ember/engine/instance.js
rename to packages/@ember/engine/instance.ts
index 56d78227726..aa5077ed02c 100644
--- a/packages/@ember/engine/instance.js
+++ b/packages/@ember/engine/instance.ts
@@ -2,17 +2,26 @@
 @module @ember/engine
 */
 
-import {
-  Object as EmberObject,
-  ContainerProxyMixin,
-  RegistryProxyMixin,
-  RSVP,
-} from '@ember/-internals/runtime';
+import { Object as EmberObject, RSVP } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { getEngineParent, setEngineParent } from './lib/engine-parent';
+import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
+import ContainerProxyMixin from '@ember/-internals/runtime/lib/mixins/container_proxy';
+import { isFactory } from '@ember/-internals/owner';
+import Engine from '.';
+import Application from '@ember/application';
+import { BootOptions } from '@ember/application/instance';
+import { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+
+const CEngine = Engine;
+
+export interface EngineInstanceOptions {
+  mountPoint?: string;
+  routable?: boolean;
+}
 
 /**
   The `EngineInstance` encapsulates all of the stateful aspects of a
@@ -25,39 +34,52 @@ import { getEngineParent, setEngineParent } from './lib/engine-parent';
   @uses ContainerProxyMixin
 */
 
-const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin, {
+interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
+class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin) {
+  /**
+   @private
+   @method setupRegistry
+   @param {Registry} registry
+   @param {BootOptions} options
+   */
+  static setupRegistry(_registry: Registry, _options?: BootOptions) {}
+
   /**
     The base `Engine` for which this is an instance.
 
     @property {Engine} engine
     @private
   */
-  base: null,
+  declare base: Engine;
+
+  declare application: Application;
 
-  init() {
-    this._super(...arguments);
+  declare mountPoint?: string;
+  declare routable?: boolean;
+
+  _booted = false;
+
+  init(properties: object | undefined) {
+    super.init(properties);
 
     // Ensure the guid gets setup for this instance
     guidFor(this);
 
-    let base = this.base;
-
-    if (!base) {
-      base = this.application;
-      this.base = base;
-    }
+    this.base ??= this.application;
 
     // Create a per-instance registry that will use the application's registry
     // as a fallback for resolving registrations.
     let registry = (this.__registry__ = new Registry({
-      fallback: base.__registry__,
+      fallback: this.base.__registry__,
     }));
 
     // Create a per-instance container from the instance's registry
     this.__container__ = registry.container({ owner: this });
 
     this._booted = false;
-  },
+  }
+
+  _bootPromise: RSVP.Promise<this> | null = null;
 
   /**
     Initialize the `EngineInstance` and return a promise that resolves
@@ -72,15 +94,17 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
     @param options {Object}
     @return {Promise<EngineInstance,Error>}
   */
-  boot(options) {
+  boot(options?: BootOptions): Promise<this> {
     if (this._bootPromise) {
       return this._bootPromise;
     }
 
-    this._bootPromise = new RSVP.Promise((resolve) => resolve(this._bootSync(options)));
+    this._bootPromise = new RSVP.Promise((resolve) => {
+      resolve(this._bootSync(options));
+    });
 
     return this._bootPromise;
-  },
+  }
 
   /**
     Unfortunately, a lot of existing code assumes booting an instance is
@@ -96,7 +120,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
 
     @private
   */
-  _bootSync(options) {
+  _bootSync(options?: BootOptions): this {
     if (this._booted) {
       return this;
     }
@@ -115,11 +139,13 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
     this._booted = true;
 
     return this;
-  },
+  }
 
-  setupRegistry(options = this.__container__.lookup('-environment:main')) {
-    this.constructor.setupRegistry(this.__registry__, options);
-  },
+  setupRegistry(
+    options: BootOptions = this.__container__.lookup('-environment:main') as BootEnvironment
+  ) {
+    (this.constructor as typeof EngineInstance).setupRegistry(this.__registry__, options);
+  }
 
   /**
    Unregister a factory.
@@ -131,10 +157,12 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
    @method unregister
    @param {String} fullName
    */
-  unregister(fullName) {
+  unregister(fullName: string) {
     this.__container__.reset(fullName);
-    this._super(...arguments);
-  },
+
+    // We overwrote this method from RegistryProxyMixin.
+    this.__registry__.unregister(fullName);
+  }
 
   /**
     Build a new `EngineInstance` that's a child of this instance.
@@ -148,7 +176,7 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
     @param options {Object} options provided to the engine instance.
     @return {EngineInstance,Error}
   */
-  buildChildEngineInstance(name, options = {}) {
+  buildChildEngineInstance(name: string, options: EngineInstanceOptions = {}) {
     let Engine = this.lookup(`engine:${name}`);
 
     if (!Engine) {
@@ -157,12 +185,14 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
       );
     }
 
+    assert('expected an Engine', Engine instanceof CEngine);
+
     let engineInstance = Engine.buildInstance(options);
 
     setEngineParent(engineInstance, this);
 
     return engineInstance;
-  },
+  }
 
   /**
     Clone dependencies shared between an engine instance and its parent.
@@ -171,13 +201,19 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
     @method cloneParentDependencies
   */
   cloneParentDependencies() {
-    let parent = getEngineParent(this);
+    const parent = getEngineParent(this);
+
+    assert('expected parent', parent);
 
     let registrations = ['route:basic', 'service:-routing'];
 
-    registrations.forEach((key) => this.register(key, parent.resolveRegistration(key)));
+    registrations.forEach((key) => {
+      let registration = parent.resolveRegistration(key);
+      assert('expected registration to be a factory', isFactory(registration));
+      this.register(key, registration);
+    });
 
-    let env = parent.lookup('-environment:main');
+    let env = parent.lookup('-environment:main') as Record<string, unknown>;
     this.register('-environment:main', env, { instantiate: false });
 
     let singletons = [
@@ -188,27 +224,16 @@ const EngineInstance = EmberObject.extend(RegistryProxyMixin, ContainerProxyMixi
       'service:-document',
     ];
 
-    if (env.isInteractive) {
+    if (env['isInteractive']) {
       singletons.push('event_dispatcher:main');
     }
 
-    singletons.forEach((key) => this.register(key, parent.lookup(key), { instantiate: false }));
-  },
-});
-
-EngineInstance.reopenClass({
-  /**
-   @private
-   @method setupRegistry
-   @param {Registry} registry
-   @param {BootOptions} options
-   */
-  setupRegistry(registry, options) {
-    // when no options/environment is present, do nothing
-    if (!options) {
-      return;
-    }
-  },
-});
+    singletons.forEach((key) => {
+      // SAFETY: We already expect this to be a singleton
+      let singleton = parent.lookup(key) as object;
+      this.register(key, singleton, { instantiate: false });
+    });
+  }
+}
 
 export default EngineInstance;
diff --git a/packages/@ember/engine/tests/engine_instance_initializers_test.js b/packages/@ember/engine/tests/engine_instance_initializers_test.js
index 0decb91e44a..77e43f11328 100644
--- a/packages/@ember/engine/tests/engine_instance_initializers_test.js
+++ b/packages/@ember/engine/tests/engine_instance_initializers_test.js
@@ -16,7 +16,8 @@ function buildEngineInstance(EngineClass) {
       return {};
     },
     resolveRegistration() {
-      return {};
+      // Implement Factory
+      return { isFake: true, create: () => {} };
     },
   });
   return engineInstance;
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index 0d91282dfd8..ee7d02b39c1 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -1,7 +1,7 @@
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import { ResolverClass, TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Factory, Owner } from '@ember/-internals/owner';
 import Namespace from '@ember/application/namespace';
-import Engine from '@ember/engine';
+import Engine, { Initializer } from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
@@ -26,16 +26,18 @@ engine.buildInstance(1);
 // @ts-expect-error Invalid argument
 engine.buildInstance({ mountPoint: 1, routable: true });
 
-expectTypeOf(engine.initializer).toEqualTypeOf<(initializer: unknown) => void>();
+expectTypeOf(engine.initializer).toEqualTypeOf<(initializer: Initializer<Engine>) => void>();
 
-expectTypeOf(engine.instanceInitializer).toEqualTypeOf<(initializer: unknown) => void>();
+expectTypeOf(engine.instanceInitializer).toEqualTypeOf<
+  (initializer: Initializer<EngineInstance>) => void
+>();
 
-expectTypeOf(engine.Resolver).toEqualTypeOf<unknown | null>();
+expectTypeOf(engine.Resolver).toEqualTypeOf<ResolverClass>();
 
 // RegistryProxy
 
-expectTypeOf(engine.resolveRegistration<unknown, object>('foo')).toEqualTypeOf<
-  Factory<unknown, object> | undefined
+expectTypeOf(engine.resolveRegistration('foo')).toEqualTypeOf<
+  Factory<object> | object | undefined
 >();
 // @ts-expect-error Requires name
 engine.resolveRegistration();
@@ -44,7 +46,6 @@ engine.resolveRegistration('foo', {});
 
 expectTypeOf(engine.register('fruit:favorite', Foo)).toMatchTypeOf<void>();
 engine.register('fruit:favorite', Foo, { singleton: true, instantiate: true });
-// @ts-expect-error requires a Factory object
 engine.register('fruit:foo', Bar);
 // @ts-expect-error requires a string name
 engine.register(1, Foo);
diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts
index 7c29288c546..60ef43ac2ad 100644
--- a/packages/@ember/engine/type-tests/instance.test.ts
+++ b/packages/@ember/engine/type-tests/instance.test.ts
@@ -10,7 +10,7 @@ expectTypeOf<EngineInstance>().toMatchTypeOf<Owner>();
 let owner = {} as Owner;
 let instance = new EngineInstance(owner);
 
-expectTypeOf(instance.boot()).toEqualTypeOf<Promise<EngineInstance>>();
+expectTypeOf(instance.boot()).resolves.toEqualTypeOf<EngineInstance>();
 
 let bootOptions = {
   isBrowser: true,
diff --git a/packages/ember-template-compiler/lib/system/compile.ts b/packages/ember-template-compiler/lib/system/compile.ts
index 493fa33dc18..273512e76ab 100644
--- a/packages/ember-template-compiler/lib/system/compile.ts
+++ b/packages/ember-template-compiler/lib/system/compile.ts
@@ -4,12 +4,10 @@
 import require, { has } from 'require';
 import { EmberPrecompileOptions } from '../types';
 import precompile from './precompile';
+import type { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces';
+import type { templateFactory } from '@glimmer/opcode-compiler';
 
-// FIXME
-type StaticTemplate = unknown;
-type Factory = any;
-
-let template: (templateJS: StaticTemplate) => Factory;
+let template: typeof templateFactory;
 
 /**
   Uses HTMLBars `compile` function to process a string into a compiled template.
@@ -22,7 +20,7 @@ let template: (templateJS: StaticTemplate) => Factory;
 export default function compile(
   templateString: string,
   options: Partial<EmberPrecompileOptions> = {}
-): Factory {
+): TemplateFactory {
   if (!template && has('@ember/-internals/glimmer')) {
     template = require('@ember/-internals/glimmer').template;
   }
@@ -36,6 +34,6 @@ export default function compile(
   return template(evaluate(precompile(templateString, options)));
 }
 
-function evaluate(precompiled: string): StaticTemplate {
+function evaluate(precompiled: string): SerializedTemplateWithLazyBlock {
   return new Function(`return ${precompiled}`)();
 }
diff --git a/packages/internal-test-helpers/lib/build-owner.ts b/packages/internal-test-helpers/lib/build-owner.ts
index dd6a48314dc..3806324a04c 100644
--- a/packages/internal-test-helpers/lib/build-owner.ts
+++ b/packages/internal-test-helpers/lib/build-owner.ts
@@ -39,7 +39,8 @@ export default function buildOwner(
   } else {
     namespace = Engine.create({
       buildRegistry(this: Engine) {
-        return (this.__registry__ = Application.buildRegistry(this));
+        // SAFETY: This cast isn't that safe, but it should be ok for tests.
+        return (this.__registry__ = Application.buildRegistry((this as unknown) as Application));
       },
       Resolver: new ResolverWrapper(resolver),
     });
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
index 35faccc9a96..9c32a709714 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
@@ -80,7 +80,7 @@ export default abstract class AbstractApplicationTestCase extends AbstractTestCa
     return this.application.resolveRegistration('router:main') as typeof Router;
   }
 
-  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}): unknown {
+  compile(templateString: string, options: Partial<EmberPrecompileOptions> = {}): object {
     return compile(templateString, options);
   }
 }
diff --git a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
index 456d5ea9fca..0a8ba85c037 100644
--- a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
@@ -9,8 +9,11 @@ export default abstract class AutobootApplicationTestCase extends TestResolverAp
   resolver?: Resolver;
 
   createApplication(options: object, MyApplication = Application) {
-    let myOptions = Object.assign(this.applicationOptions, options);
-    let application = (this.application = MyApplication.create(myOptions));
+    // SAFETY: Types for `create` are a bit flaky
+    let application = (this.application = MyApplication.create({
+      ...this.applicationOptions,
+      ...options,
+    }));
     let resolver = application.__registry__.resolver;
     assert('expected a resolver', resolver instanceof Resolver);
     this.resolver = resolver;
diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.ts b/packages/internal-test-helpers/lib/test-cases/query-param.ts
index 0296d4b1a20..37a0f005974 100644
--- a/packages/internal-test-helpers/lib/test-cases/query-param.ts
+++ b/packages/internal-test-helpers/lib/test-cases/query-param.ts
@@ -19,7 +19,7 @@ export default abstract class QueryParamTestCase extends ApplicationTestCase {
 
     this.add(
       'location:test',
-      NoneLocation.extend({
+      class extends NoneLocation {
         setURL(path: string) {
           if (testCase.expectedReplaceURL) {
             testCase.assert.ok(false, 'pushState occurred but a replaceState was expected');
@@ -31,7 +31,7 @@ export default abstract class QueryParamTestCase extends ApplicationTestCase {
           }
 
           this.set('path', path);
-        },
+        }
 
         replaceURL(path: string) {
           if (testCase.expectedPushURL) {
@@ -48,8 +48,8 @@ export default abstract class QueryParamTestCase extends ApplicationTestCase {
           }
 
           this.set('path', path);
-        },
-      })
+        }
+      }
     );
   }
 
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index a801ded8203..e80f8b2a12d 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -71,7 +71,7 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     return new ModuleBasedResolver();
   }
 
-  add(specifier: string, factory: unknown) {
+  add(specifier: string, factory: Factory<object> | object) {
     this.resolver.add(specifier, factory);
   }
 
@@ -169,7 +169,7 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerCustomHelper(name: string, definition: Factory<unknown>) {
+  registerCustomHelper(name: string, definition: Factory<object>) {
     this.owner.register(`helper:${name}`, definition);
   }
 
@@ -190,13 +190,13 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerModifier(name: string, ModifierClass: Factory<unknown>) {
+  registerModifier(name: string, ModifierClass: Factory<object>) {
     let { owner } = this;
 
     owner.register(`modifier:${name}`, ModifierClass);
   }
 
-  registerComponentManager(name: string, manager: Factory<unknown>) {
+  registerComponentManager(name: string, manager: Factory<object>) {
     let owner = this.owner;
     owner.register(`component-manager:${name}`, manager);
   }
@@ -215,7 +215,7 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerService(name: string, klass: Factory<unknown>) {
+  registerService(name: string, klass: Factory<object>) {
     this.owner.register(`service:${name}`, klass);
   }
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
index dadc7d2f3e5..86bb6714de0 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
@@ -8,6 +8,7 @@ import buildOwner from '../build-owner';
 import { runAppend, runDestroy } from '../run';
 import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
 import { BootOptions } from '@ember/application/instance';
+import { Factory } from '@ember/-internals/owner';
 
 export default class RouterNonApplicationTestCase extends AbstractTestCase {
   owner: EngineInstance;
@@ -54,7 +55,7 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     return new ModuleBasedResolver();
   }
 
-  add(specifier: string, factory: unknown) {
+  add(specifier: string, factory: Factory<object> | object) {
     this.resolver.add(specifier, factory);
   }
 
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
index 9a4db9b057c..7ab8efe8860 100644
--- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
@@ -1,6 +1,7 @@
 import AbstractApplicationTestCase from './abstract-application';
 import Resolver, { ModuleBasedResolver } from '../test-resolver';
 import { Component } from '@ember/-internals/glimmer';
+import { Factory } from '@ember/-internals/owner';
 
 export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
   abstract resolver?: Resolver;
@@ -11,7 +12,7 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
     });
   }
 
-  add(specifier: string, factory: unknown) {
+  add(specifier: string, factory: Factory<object> | object) {
     this.resolver!.add(specifier, factory);
   }
 
diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts
index c71ee7e69fb..9332e27191f 100644
--- a/packages/internal-test-helpers/lib/test-resolver.ts
+++ b/packages/internal-test-helpers/lib/test-resolver.ts
@@ -1,5 +1,8 @@
 import { compile } from 'ember-template-compiler';
 
+import { Resolver as IResolver } from '@ember/-internals/container/lib/registry';
+import { Factory } from '@ember/-internals/owner';
+
 const DELIMITER = '%';
 
 function serializeKey(specifier: string, source?: unknown, namespace?: unknown) {
@@ -11,18 +14,18 @@ function serializeKey(specifier: string, source?: unknown, namespace?: unknown)
   ].join(DELIMITER)}`;
 }
 
-class Resolver {
-  _registered: Record<string, unknown>;
+class Resolver implements IResolver {
+  _registered: Record<string, Factory<object> | object>;
 
   constructor() {
     this._registered = {};
   }
-  resolve(specifier: string) {
+  resolve(specifier: string): Factory<object> | object | undefined {
     return this._registered[specifier] || this._registered[serializeKey(specifier)];
   }
   add(
     lookup: string | { specifier: string; source: unknown; namespace: unknown },
-    factory: unknown
+    factory: Factory<object> | object
   ) {
     let key;
     switch (typeof lookup) {

From 70058439456e66d659465b481c7d282084418940 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 08:12:17 -0700
Subject: [PATCH 0962/1405] Resolve some issues in TS conversion

---
 .../@ember/-internals/glimmer/lib/helper.ts   | 19 ++++++++++---------
 .../-internals/routing/lib/system/router.ts   |  2 ++
 .../runtime/lib/system/namespace.ts           | 11 ++++++++---
 .../-internals/views/lib/views/core_view.ts   |  9 ++++-----
 packages/@ember/application/instance.ts       | 18 +++++++++---------
 packages/@ember/engine/index.ts               |  2 +-
 6 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 5ca1045cc96..7497ca0fc8e 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -35,14 +35,6 @@ export interface HelperInstance<T = unknown> {
   destroy(): void;
 }
 
-export function isHelperInstance(obj: unknown): obj is HelperInstance {
-  if (obj !== null && typeof obj === 'object') {
-    let cast = obj as HelperInstance;
-    return typeof cast.compute === 'function' && typeof cast.destroy === 'function';
-  }
-  return false;
-}
-
 const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
 
 export interface SimpleHelper<T, P extends unknown[], N extends Dict<unknown>> {
@@ -182,7 +174,16 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
       ? definition.create()
       : definition.create(this.ownerInjection);
 
-    assert('expected HelperInstance', isHelperInstance(instance));
+    assert(
+      'expected HelperInstance',
+      (function (instance: unknown): instance is HelperInstance {
+        if (instance !== null && typeof instance === 'object') {
+          let cast = instance as HelperInstance;
+          return typeof cast.compute === 'function' && typeof cast.destroy === 'function';
+        }
+        return false;
+      })(instance)
+    );
 
     return {
       instance,
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 143f904ae23..134bf794bf5 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -302,6 +302,8 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     return path.join('.');
   }
 
+  // Note that owner is actually required in this scenario, but since it is strictly
+  // optional in other contexts trying to make it required here confuses TS.
   constructor(owner?: Owner) {
     super(owner);
 
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.ts b/packages/@ember/-internals/runtime/lib/system/namespace.ts
index fc50a03152d..d69e0f6b326 100644
--- a/packages/@ember/-internals/runtime/lib/system/namespace.ts
+++ b/packages/@ember/-internals/runtime/lib/system/namespace.ts
@@ -34,19 +34,19 @@ import EmberObject from './object';
   @extends EmberObject
   @public
 */
-export default class Namespace extends EmberObject {
+class Namespace extends EmberObject {
   static NAMESPACES = NAMESPACES;
   static NAMESPACES_BY_ID = NAMESPACES_BY_ID;
   static processAll = processAllNamespaces;
   static byName = findNamespace;
 
+  declare isNamespace: true;
+
   init(properties: object | undefined) {
     super.init(properties);
     addNamespace(this);
   }
 
-  readonly isNamespace = true;
-
   toString(): string {
     let existing_name = get(this, 'name') || get(this, 'modulePrefix');
     if (existing_name) {
@@ -71,3 +71,8 @@ export default class Namespace extends EmberObject {
     return super.destroy();
   }
 }
+
+// Declare on the prototype to have a single shared value.
+Namespace.prototype.isNamespace = true;
+
+export default Namespace;
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 4e883b243c9..835a82ca29b 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -21,11 +21,7 @@ import states from './states';
 */
 
 interface CoreView extends FrameworkObject, Evented, ActionHandler, View {}
-class CoreView extends FrameworkObject.extend(Evented, ActionHandler, {
-  // Continue to declare `_states` here so that we have a single reference on the prototype
-  // instead of one on each instance.
-  _states: states,
-}) {
+class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
   isView = true;
 
   declare _states: typeof states;
@@ -100,4 +96,7 @@ class CoreView extends FrameworkObject.extend(Evented, ActionHandler, {
   static isViewFactory = true;
 }
 
+// Declare on the prototype to have a single shared value.
+CoreView.prototype._states = states;
+
 export default CoreView;
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index 4d012f15f49..4dde2b48960 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -101,7 +101,7 @@ class ApplicationInstance extends EngineInstance {
       return this;
     }
 
-    options = new CBootOptions(options);
+    options = new _BootOptions(options);
 
     this.setupRegistry(options);
 
@@ -133,13 +133,13 @@ class ApplicationInstance extends EngineInstance {
   _router?: Router;
 
   get router() {
-    if (this._router) {
-      return this._router;
+    if (!this._router) {
+      let router = this.lookup('router:main');
+      assert('expected an instance of Router', router instanceof Router);
+      this._router = router;
     }
 
-    let router = this.lookup('router:main');
-    assert('expected an instance of Router', router instanceof Router);
-    return (this._router = router);
+    return this._router;
   }
 
   /**
@@ -299,8 +299,8 @@ class ApplicationInstance extends EngineInstance {
    @param {Registry} registry
    @param {BootOptions} options
   */
-  static setupRegistry(registry: Registry, options: BootOptions | CBootOptions = {}) {
-    let coptions = options instanceof CBootOptions ? options : new CBootOptions(options);
+  static setupRegistry(registry: Registry, options: BootOptions | _BootOptions = {}) {
+    let coptions = options instanceof _BootOptions ? options : new _BootOptions(options);
 
     registry.register('-environment:main', coptions.toEnvironment(), {
       instantiate: false,
@@ -335,7 +335,7 @@ class ApplicationInstance extends EngineInstance {
   @namespace ApplicationInstance
   @public
 */
-class CBootOptions {
+class _BootOptions {
   /**
     Interactive mode: whether we need to set up event delegation and invoke
     lifecycle callbacks on Components.
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index 26c5466625b..b7af1ad96c4 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -15,7 +15,7 @@ import { setupEngineRegistry } from '@ember/-internals/glimmer';
 import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
 import { ResolverClass } from '@ember/-internals/container/lib/registry';
 
-function props(obj: any) {
+function props(obj: object) {
   let properties = [];
 
   for (let key in obj) {

From 6f90da46938ab99c2bca69006c4cfe0ed9e0be6f Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 18 Mar 2022 12:35:56 -0700
Subject: [PATCH 0963/1405] Run yarn lint:fix

---
 packages/internal-test-helpers/lib/build-owner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/internal-test-helpers/lib/build-owner.ts b/packages/internal-test-helpers/lib/build-owner.ts
index 3806324a04c..6b3d16387ef 100644
--- a/packages/internal-test-helpers/lib/build-owner.ts
+++ b/packages/internal-test-helpers/lib/build-owner.ts
@@ -40,7 +40,7 @@ export default function buildOwner(
     namespace = Engine.create({
       buildRegistry(this: Engine) {
         // SAFETY: This cast isn't that safe, but it should be ok for tests.
-        return (this.__registry__ = Application.buildRegistry((this as unknown) as Application));
+        return (this.__registry__ = Application.buildRegistry(this as unknown as Application));
       },
       Resolver: new ResolverWrapper(resolver),
     });

From 14cea1384a0008824c7b9b0c2bbea6e85a1ede15 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 10 Mar 2022 18:26:39 -0500
Subject: [PATCH 0964/1405] Update docs to match native class syntax

The example code snippet here assumes it will be used in a classic-style class body, but all the rest of the docs are updated for native class syntax.

(cherry picked from commit 5e15802d5cb8434b2de46a436b20c0d45bd5c06c)
---
 packages/@ember/-internals/routing/lib/system/route.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 5f06749928a..89e58514783 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -376,7 +376,7 @@ class Route<T = unknown>
     (assuming a query param whose controller property is `page`):
 
     ```javascript
-    queryParams: {
+    queryParams = {
       page: {
         // By default, controller query param properties don't
         // cause a full transition when they are changed, but
@@ -404,7 +404,7 @@ class Route<T = unknown>
         // different URL key.
         as: 'page'
       }
-    }
+    };
     ```
 
     @property queryParams

From 0e2f7e26384eea39bda21111b24b511ee8444525 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 21 Mar 2022 13:50:29 -0400
Subject: [PATCH 0965/1405] Add v4.3.0 to CHANGELOG

---
 CHANGELOG.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb0484ff085..331656e26f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,10 @@
 # Ember Changelog
 
-### v4.3.0-beta.2 (March 1, 2022)
+### v4.3.0 (March 21, 2022)
 
+- [#20025](https://github.com/emberjs/ember.js/pull/20025) [BUGFIX] Fix a memory leak in the Router Service class
 - [#19971](https://github.com/emberjs/ember.js/pull/19971) [BUGFIX] Don't serialize default Query Params on RouterService
-
-### v4.3.0-beta.1 (February 7, 2022)
-
-No public API changes or bugfixes. 
+- [#20024](https://github.com/emberjs/ember.js/pull/20024) [BUGFIX] Correctly associate props with factory and owner in FactoryManager
 
 ### v4.2.0 (February 7, 2022)
 

From 97aa2436b08e7569e4f6d4e8e692e32dc1d0e909 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 24 Mar 2022 13:33:21 -0400
Subject: [PATCH 0966/1405] Add v4.4.0-beta.1 to CHANGELOG

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 331656e26f0..793d9b78657 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Ember Changelog
 
+### v4.4.0-beta.1 (March 24, 2022)
+
+- [#19882](https://github.com/emberjs/ember.js/pull/19882) / [#20005](https://github.com/emberjs/ember.js/pull/20005) [FEATURE] Implement the `unique-id` helper per [RFC #0659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).
+- [#19981](https://github.com/emberjs/ember.js/pull/19981) [FEATURE] Facilitate custom test setups per [RFC #0637](https://github.com/emberjs/rfcs/blob/master/text/0637-customizable-test-setups.md).
+- [#16879](https://github.com/emberjs/ember.js/pull/16879) [BUGFIX] isEmpty on nested objects
+- [#17978](https://github.com/emberjs/ember.js/pull/17978) Make hasListeners public
+- [#20014](https://github.com/emberjs/ember.js/pull/20014) Log `until` for deprecations
+
 ### v4.3.0 (March 21, 2022)
 
 - [#20025](https://github.com/emberjs/ember.js/pull/20025) [BUGFIX] Fix a memory leak in the Router Service class

From 61bce5d66bc1614ca929bcb8a842256c5a292086 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 24 Mar 2022 13:36:15 -0400
Subject: [PATCH 0967/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9cdb31a416b..ae18dd503f0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.4.0-alpha.1",
+  "version": "4.5.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From f2ccae8b2c87d51a585ec498897bba6a90b16e3e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 15:03:24 +0000
Subject: [PATCH 0968/1405] Bump qunit from 2.18.0 to 2.18.1

Bumps [qunit](https://github.com/qunitjs/qunit) from 2.18.0 to 2.18.1.
- [Release notes](https://github.com/qunitjs/qunit/releases)
- [Changelog](https://github.com/qunitjs/qunit/blob/main/History.md)
- [Commits](https://github.com/qunitjs/qunit/compare/2.18.0...2.18.1)

---
updated-dependencies:
- dependency-name: qunit
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ae18dd503f0..c871411c769 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.0",
     "puppeteer": "^13.5.1",
-    "qunit": "^2.18.0",
+    "qunit": "^2.18.1",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
diff --git a/yarn.lock b/yarn.lock
index e75f6e59189..5e8d2292e54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8288,10 +8288,10 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.18.0.tgz#5a3efc8ee609e9d8f207a1ad317a9b02bb14bc6b"
-  integrity sha512-Xw/zUm5t1JY8SNErki/qtw4fCuaaOZL+bPloZU+0kto+fO8j1JV9MQWqXO4kATfhEyJohlsKZpfg1HF7GOkpXw==
+qunit@^2.18.1:
+  version "2.18.1"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.18.1.tgz#9e90e7798216f7275c351c88652816d491391397"
+  integrity sha512-A2Adgr/DeMQOJZFVllyQi2wiGJVVXGSRRwMe39fNfuuftUYHHpGRTWUhBa8wNblunCAOUCt+1uFcg1L7NaxQTA==
   dependencies:
     commander "7.2.0"
     node-watch "0.7.3"

From 4c18f676e12145d273fd07ece6656856cae16bb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 15:03:38 +0000
Subject: [PATCH 0969/1405] Bump typescript from 4.6.2 to 4.6.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.2 to 4.6.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.2...v4.6.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ae18dd503f0..d3eb4d1cb91 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^1.0.0",
-    "typescript": "~4.6.0"
+    "typescript": "~4.6.3"
   },
   "engines": {
     "node": ">= 12.*"
diff --git a/yarn.lock b/yarn.lock
index e75f6e59189..4b21a94fd13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9936,10 +9936,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
-typescript@~4.6.0:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
-  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
+typescript@~4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
+  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From b9436fdeea91613bd49154bd6514d61cc56546bb Mon Sep 17 00:00:00 2001
From: Sam Van Campenhout <sam.van.campenhout@gmail.com>
Date: Sat, 9 Apr 2022 20:24:13 +0200
Subject: [PATCH 0970/1405] [FEATURE default helper manager] Add the default
 helper manager

This updates the Glimmer VM to version 0.84.2 which includes the default helper manager and a feature flag to conditionally enable that feature in Ember.
---
 package.json                                  |  26 +-
 .../-internals/glimmer/lib/environment.ts     |   5 +
 .../helpers/default-helper-manager-test.js    | 162 ++++++++++
 .../integration/helpers/invoke-helper-test.js |   3 +-
 packages/@ember/canary-features/index.ts      |   2 +
 yarn.lock                                     | 284 ++++++++----------
 6 files changed, 311 insertions(+), 171 deletions(-)
 create mode 100644 packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js

diff --git a/package.json b/package.json
index ae18dd503f0..7249c270668 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@babel/helper-module-imports": "^7.16.7",
     "@babel/plugin-transform-block-scoping": "^7.16.0",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.83.1",
+    "@glimmer/vm-babel-plugins": "0.84.2",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.5",
@@ -78,19 +78,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.16.11",
-    "@glimmer/compiler": "0.84.0",
-    "@glimmer/destroyable": "0.83.1",
+    "@glimmer/compiler": "0.84.2",
+    "@glimmer/destroyable": "0.84.2",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.83.1",
-    "@glimmer/interfaces": "0.83.1",
-    "@glimmer/manager": "0.83.1",
-    "@glimmer/node": "0.83.1",
-    "@glimmer/opcode-compiler": "0.83.1",
-    "@glimmer/owner": "0.84.0",
-    "@glimmer/program": "0.83.1",
-    "@glimmer/reference": "0.83.1",
-    "@glimmer/runtime": "0.83.1",
-    "@glimmer/validator": "0.83.1",
+    "@glimmer/global-context": "0.84.2",
+    "@glimmer/interfaces": "0.84.2",
+    "@glimmer/manager": "0.84.2",
+    "@glimmer/node": "0.84.2",
+    "@glimmer/opcode-compiler": "0.84.2",
+    "@glimmer/owner": "0.84.2",
+    "@glimmer/program": "0.84.2",
+    "@glimmer/reference": "0.84.2",
+    "@glimmer/runtime": "0.84.2",
+    "@glimmer/validator": "0.84.2",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index fa1bfb51794..10628457e2f 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -3,6 +3,7 @@ import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
 import { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
+import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import { assert, deprecate, warn } from '@ember/debug';
 import { DeprecationOptions } from '@ember/debug/lib/deprecate';
 import { schedule, _backburner } from '@ember/runloop';
@@ -19,6 +20,10 @@ import toBool from './utils/to-bool';
 // Setup global context
 
 setGlobalContext({
+  FEATURES: {
+    DEFAULT_HELPER_MANAGER: Boolean(EMBER_DEFAULT_HELPER_MANAGER),
+  },
+
   scheduleRevalidate() {
     _backburner.ensureInstance();
   },
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
new file mode 100644
index 00000000000..8ea0256d5ff
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
@@ -0,0 +1,162 @@
+import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
+import { Component } from '@ember/-internals/glimmer';
+import { set } from '@ember/-internals/metal';
+import { action } from '@ember/object';
+
+moduleFor(
+  'Helpers test: default helper manager',
+  class extends RenderingTestCase {
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) plain functions can be used as helpers'() {
+      function hello() {
+        return 'hello';
+      }
+
+      this.render('{{(this.hello)}}', {
+        hello,
+      });
+      this.assertText('hello');
+
+      runTask(() => this.rerender());
+      this.assertText('hello');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) positional arguments are passed as function arguments'(
+      assert
+    ) {
+      function hello(...args) {
+        assert.deepEqual(args, [1, 2, 3]);
+        return args.length;
+      }
+
+      this.render('{{(this.hello 1 2 3)}}', {
+        hello,
+      });
+      this.assertText('3');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) tracks changes to positional arguments'(assert) {
+      let count = 0;
+
+      function hello(firstArgument) {
+        count++;
+        return firstArgument;
+      }
+
+      this.render('{{(this.hello this.foo)}}', {
+        hello,
+        foo: 123,
+      });
+
+      assert.strictEqual(count, 1, 'rendered once');
+      this.assertText('123');
+
+      runTask(() => this.rerender());
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
+
+      runTask(() => set(this.context, 'foo', 456));
+
+      assert.equal(count, 2, 'rendered twice');
+      this.assertText('456');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) named arguments are passed as the last function argument'(
+      assert
+    ) {
+      function hello(positional, named) {
+        assert.strictEqual(positional, 'foo');
+
+        return named.foo;
+      }
+
+      this.render('{{(this.hello "foo" foo="bar")}}', {
+        hello,
+      });
+      this.assertText('bar');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) tracks changes to named arguments'(assert) {
+      let count = 0;
+
+      function hello(named) {
+        count++;
+        return named.foo;
+      }
+
+      this.render('{{(this.hello foo=this.foo)}}', {
+        hello,
+        foo: 123,
+      });
+
+      assert.strictEqual(count, 1, 'rendered once');
+      this.assertText('123');
+
+      runTask(() => this.rerender());
+      assert.equal(count, 1, 'rendered once');
+      this.assertText('123');
+
+      runTask(() => set(this.context, 'foo', 456));
+
+      assert.equal(count, 2, 'rendered twice');
+      this.assertText('456');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) plain functions passed as component arguments can be used as helpers'() {
+      function hello() {
+        return 'hello';
+      }
+
+      this.registerComponent('foo-bar', { template: '{{(@hello)}}' });
+
+      this.render(`<FooBar @hello={{this.hello}} />`, {
+        hello,
+      });
+      this.assertText('hello');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) plain functions stored as class properties can be used as helpers'() {
+      this.registerComponent('foo-bar', {
+        template: '{{(this.hello)}}',
+        ComponentClass: class extends Component {
+          hello = () => {
+            return 'hello';
+          };
+        },
+      });
+
+      this.render(`<FooBar />`);
+      this.assertText('hello');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) class methods can be used as helpers'() {
+      this.registerComponent('foo-bar', {
+        template: '{{(this.hello)}}',
+        ComponentClass: class extends Component {
+          hello() {
+            return 'hello';
+          }
+        },
+      });
+
+      this.render(`<FooBar />`);
+      this.assertText('hello');
+    }
+
+    '@feature(EMBER_DEFAULT_HELPER_MANAGER) actions can be used as helpers'() {
+      this.registerComponent('foo-bar', {
+        template: '{{(this.hello)}}',
+        ComponentClass: class extends Component {
+          someProperty = 'hello';
+
+          @action
+          hello() {
+            return this.someProperty;
+          }
+        },
+      });
+
+      this.render(`<FooBar />`);
+      this.assertText('hello');
+    }
+  }
+);
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index ab722105096..5dd59e68023 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -3,6 +3,7 @@ import { helperCapabilities, setHelperManager } from '@glimmer/manager';
 import { Helper, helper, Component as EmberComponent } from '@ember/-internals/glimmer';
 import { tracked, set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
+import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
@@ -444,7 +445,7 @@ moduleFor(
     }
 
     '@test asserts if no manager exists for the helper definition'(assert) {
-      if (!DEBUG) {
+      if (!DEBUG || EMBER_DEFAULT_HELPER_MANAGER) {
         assert.expect(0);
         return;
       }
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 7fe503807eb..d0c32a5653e 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -15,6 +15,7 @@ export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_UNIQUE_ID_HELPER: true,
+  EMBER_DEFAULT_HELPER_MANAGER: null,
 };
 
 /**
@@ -66,3 +67,4 @@ function featureValue(value: null | boolean) {
 export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
 export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_UNIQUE_ID_HELPER = featureValue(FEATURES.EMBER_UNIQUE_ID_HELPER);
+export const EMBER_DEFAULT_HELPER_MANAGER = featureValue(FEATURES.EMBER_DEFAULT_HELPER_MANAGER);
diff --git a/yarn.lock b/yarn.lock
index e75f6e59189..ef0353b1320 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1026,59 +1026,52 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@glimmer/compiler@0.84.0":
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.84.0.tgz#58b7027d83707e9805a7b7832a9aa59e57d855c6"
-  integrity sha512-DVO8KLgw8dQQF/r1tR3XDBgVsVdCE8e5CyeiCLYTQR5X48Js0LE0bQiY0EtsopyXeswcURf+OVNsNIyHuXAwKQ==
-  dependencies:
-    "@glimmer/interfaces" "0.84.0"
-    "@glimmer/syntax" "0.84.0"
-    "@glimmer/util" "0.84.0"
-    "@glimmer/wire-format" "0.84.0"
+"@glimmer/compiler@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.84.2.tgz#ff4ef4fb244afa254189a579fa4453b2783ae7ab"
+  integrity sha512-rU8qpqbqxIPwrEQH82yDDFi1hgv6ud1agYexmnmCXlaLS5uCVATJAqKsVozc7aHOgmmF4Ukd/LoF4NYfGr8X3w==
+  dependencies:
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/syntax" "0.84.2"
+    "@glimmer/util" "0.84.2"
+    "@glimmer/wire-format" "0.84.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/destroyable@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.83.1.tgz#ccf912bf1d07b1ad47eaf7387af1ee742963470f"
-  integrity sha512-QPTKAg0UToCxtcq+AjhdsSZb4HhYn1CTJ2b2/5Qe9InRCPpnwFsMpLKModCLi3VRKtkBGBprxwP/ht5Ma7ok1A==
+"@glimmer/destroyable@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.84.2.tgz#67009d931346f4988a6dd329cd8b95141726a453"
+  integrity sha512-74L4+jlGUhzhUe87lTxjFdYEEfcDWcza+jqLXoyIb/p4cS0hWsTGlyF+OcuUbHO4yqJd4bXchGOVocoajmSp6w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.83.1"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
+    "@glimmer/global-context" "0.84.2"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/util" "0.84.2"
 
-"@glimmer/encoder@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.83.1.tgz#6c1619462a46980551d6a74f19266230a04eeb59"
-  integrity sha512-PADybj7+khwSyfcvRpmXpYnfZDsSmw/NpSqtCLolAvtnn7uyFfmKirTc89AWi/9iPtbqfe2XtWv3Dz/R5RnAAA==
+"@glimmer/encoder@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.84.2.tgz#3e6038f4115cde40a1252f13ae33774341325d40"
+  integrity sha512-599TMDNDHiw+PhNXy5/AnMjh83NBKy+tl2YmwSRY9qktx4DDOZenzgwZ5haLlzPaceejJ6ZNAoGyV5bBrDY5+w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/vm" "0.83.1"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/vm" "0.84.2"
 
 "@glimmer/env@0.1.7", "@glimmer/env@^0.1.7":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
   integrity sha1-/S0rVakCnGs3psk16MiHGucN+gc=
 
-"@glimmer/global-context@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.83.1.tgz#3e2d97f10ff623bcfb5b7dc29a858d546a6c6d66"
-  integrity sha512-OwlgqpbOJU73EjZOZdftab0fKbtdJ4x/QQeJseL9cvaAUiK3+w52M5ONFxD1T/yPBp2Mf7NCYqA/uL8tRbzY2A==
+"@glimmer/global-context@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/global-context/-/global-context-0.84.2.tgz#cd4612925dbd68787b9270e91b213691150c307f"
+  integrity sha512-6FycLh/Eq0P3LA94bJL6WHPJyOTKeQD4KBWhowZ9TbeO3p4/WUr+POKPVEyfIx6YHybhpL9MGj45Y2r0hqVigw==
   dependencies:
     "@glimmer/env" "^0.1.7"
 
-"@glimmer/interfaces@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.83.1.tgz#fb16f5f683ddc55f130887b6141f58c0751350fe"
-  integrity sha512-rjAztghzX97v8I4rk3+NguM3XGYcFjc/GbJ8qrEj19KF2lUDoDBW1sB7f0tov3BD5HlrGXei/vOh4+DHfjeB5w==
-  dependencies:
-    "@simple-dom/interface" "^1.4.0"
-
-"@glimmer/interfaces@0.84.0":
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.0.tgz#fa5cb7189910c853d473db19133d2180d813c0b7"
-  integrity sha512-+2clm2821gP+LiA4w1GOQtjgLDoqFOYVw3uwTvmzKGislR5lzC9s0la3W7NCqYwApv2aeZry4CJ6um6/Q46mYw==
+"@glimmer/interfaces@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.84.2.tgz#764cf92c954adcd1a851e5dc68ec1f6b654dc3bd"
+  integrity sha512-tMZxQpOddUVmHEOuripkNqVR7ba0K4doiYnFd4WyswqoHPlxqpBujbIamQ+bWCWEF0U4yxsXKa31ekS/JHkiBQ==
   dependencies:
     "@simple-dom/interface" "^1.4.0"
 
@@ -1087,164 +1080,141 @@
   resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.78.2.tgz#bca5f666760ce98345e87c5b3e37096e772cb2de"
   integrity sha512-0S6TWOOd0fzLLysw1pWZN0TgasaHmYs1Sjz9Til1mTByIXU1S+1rhdyr2veSQPO/aRjPuEQyKXZQHvx23Zax6w==
 
-"@glimmer/manager@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.83.1.tgz#07e02a40f89cba3eee86b05a2557daa2ef151f6f"
-  integrity sha512-w3JXvtB/S3Bbiv/zIoUP9QmIliIPlmKrF9r4aVeyq24NIE7Dig/R+7/2pkEbqS3nOWizIRswEPqmvWRpMCilmA==
+"@glimmer/manager@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/manager/-/manager-0.84.2.tgz#a96730388994a57517c45cbacf6ac481bdf1cd47"
+  integrity sha512-cXOnRTH9nwAe/un8hK0x6z1m67Cv5ywAuK7KRxAFTWHgGX/i6BvoZCStr6zJD/U6Frna2c7RJK8JpleP94opEA==
   dependencies:
-    "@glimmer/destroyable" "0.83.1"
+    "@glimmer/destroyable" "0.84.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/reference" "0.83.1"
-    "@glimmer/util" "0.83.1"
-    "@glimmer/validator" "0.83.1"
-
-"@glimmer/node@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.83.1.tgz#a9c87ee9196ab317b9221f4cfe3443a83da447d5"
-  integrity sha512-qog6RV0iLenedxBU2ItLiukP9AP9Wtm/eJK/UbzYHVJjE/9ty4IcrIMHPjs56cGdHfRJO7G9E5XcEBy3W0bKZg==
-  dependencies:
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/runtime" "0.83.1"
-    "@glimmer/util" "0.83.1"
+    "@glimmer/global-context" "0.84.2"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/reference" "0.84.2"
+    "@glimmer/util" "0.84.2"
+    "@glimmer/validator" "0.84.2"
+
+"@glimmer/node@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.84.2.tgz#74d4eb8fc58dbf5ed2b57af39a1f350548cf0469"
+  integrity sha512-kefGxH+0N0xNyb6QovdPzmIBefZwu8TID45qsASgVbFx7mfFiXjQiyaxbRUyam4MAEb8Nzzx1Byxn1FQCYyLdA==
+  dependencies:
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/runtime" "0.84.2"
+    "@glimmer/util" "0.84.2"
     "@simple-dom/document" "^1.4.0"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/opcode-compiler@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.83.1.tgz#22aa25711326a2d9e02f618ea01788349303d15a"
-  integrity sha512-fkkRRp+Xoe8khGqHg4DNtT6IDgxxozo5ZZiy6eG7YtDAOx2ZGO3K3rZrp7v148T0q+u47Z++aotS5z4pakFK/A==
+"@glimmer/opcode-compiler@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.84.2.tgz#df0fb70e2fdacb7c6f6ec3edd1c66a5639f2e2c9"
+  integrity sha512-KwTH9cWEW4Neu3jmD9ANMIQYBiEqPsLx+h55G+wYp5djyjiYwSJ7KhgMAB+wEHuvB6izp3XdSO6jDMgp3pp49A==
   dependencies:
-    "@glimmer/encoder" "0.83.1"
+    "@glimmer/encoder" "0.84.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/reference" "0.83.1"
-    "@glimmer/util" "0.83.1"
-    "@glimmer/vm" "0.83.1"
-    "@glimmer/wire-format" "0.83.1"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/reference" "0.84.2"
+    "@glimmer/util" "0.84.2"
+    "@glimmer/vm" "0.84.2"
+    "@glimmer/wire-format" "0.84.2"
 
-"@glimmer/owner@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.83.1.tgz#b55261035d8a62dc26c9243e5a521c615dea83d1"
-  integrity sha512-OrYPJsn/BZ3Bij17Nnno+GuBgLh7z31DRaRZEZbPCZ1i6FyZMOI1qqZo3taOeOTUTKxLaNhxG5BqyiJPFwxUyA==
+"@glimmer/owner@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.84.2.tgz#423fd5b43fa49e95558456999be3ec0150742474"
+  integrity sha512-maZn642eXRImp/hOSa4nQmzMLEIywXwgahS/ZMuzD4HTTsA2SlEdjXSrVbRQYarYF8LkiJ7fpcKHkyNCe8SHrQ==
   dependencies:
-    "@glimmer/util" "0.83.1"
+    "@glimmer/util" "0.84.2"
 
-"@glimmer/owner@0.84.0":
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/owner/-/owner-0.84.0.tgz#71c6ebbd369c8c4a3cdf91bc53e445d2e92572fa"
-  integrity sha512-JH00K54PSQ14rsTLKj3bZ2fVS0n6OeHdd6rWWogWWA/RCvPPmHi9bRz9KeyVhXiebgy5p/0Fvc0xFcrmMdJwnw==
+"@glimmer/program@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.84.2.tgz#4cfb5bb3a31a221671f35817f31ad175ebf4fad7"
+  integrity sha512-Ohx+7H3+CSVHbC08trUK7fXC6ti9x0SQDC2Lwd7BMXmMyoOZHxdaKNrTJ+CsQ8nV1JkLfXhnvRDG08TqD5VHJw==
   dependencies:
-    "@glimmer/util" "0.84.0"
-
-"@glimmer/program@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.83.1.tgz#2a589f369ce06a37b7a7ec7fd550db708ddc6ee5"
-  integrity sha512-imQx5s6P69simF8oBtruX9Pn9j+aHt6MiAehTiWq+c8kvSsTZnQlYVHCQWfczDRrOcEOb2FvIuuo7C3+TcsKNQ==
-  dependencies:
-    "@glimmer/encoder" "0.83.1"
+    "@glimmer/encoder" "0.84.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/manager" "0.83.1"
-    "@glimmer/opcode-compiler" "0.83.1"
-    "@glimmer/util" "0.83.1"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/manager" "0.84.2"
+    "@glimmer/opcode-compiler" "0.84.2"
+    "@glimmer/util" "0.84.2"
 
-"@glimmer/reference@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.83.1.tgz#0345b95431b5bb19843b308e6311d1ef81e36192"
-  integrity sha512-BThEwDlMkJB1WBPWDrww+VxgGyDbwxh5FFPvGhkovvCZnCb7fAMUCt9pi6CUZtviugkWOBFtE9P4eZZbOLkXeg==
+"@glimmer/reference@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.84.2.tgz#c8d91a3ba0b92a9430b6023d7b6f39dd56c79af1"
+  integrity sha512-hH0VD76OXMsGSHbqaqD64u1aBEqy//jhZtIaHGwAHNpTEX+zDtW3ka298KbAn2CZyDDrNAnuc2U1Vy4COR3zlA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.83.1"
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
-    "@glimmer/validator" "0.83.1"
+    "@glimmer/global-context" "0.84.2"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/util" "0.84.2"
+    "@glimmer/validator" "0.84.2"
 
-"@glimmer/runtime@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.83.1.tgz#fe285189b0ec51e00e558204b53ea761690c620f"
-  integrity sha512-el1SxV6SIq3bEB9h0Tz2RWy9AHpEZOjmeyf/cu4sneoDQi3POURJZWf1ptxBs62A0Ae2Rq32SFtuYte/THucQQ==
+"@glimmer/runtime@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.84.2.tgz#3d4a565cf72762b0aab06982e5151f7e3c1ccdd8"
+  integrity sha512-mUefYwq8l4df61iWYsRKVYQUqAeCgeZ3fuYNRNbvKDudnT9bQXayJLqr6ZxwTVaDoeKjg+7lMjkDSDSvqoxfsA==
   dependencies:
-    "@glimmer/destroyable" "0.83.1"
+    "@glimmer/destroyable" "0.84.2"
     "@glimmer/env" "0.1.7"
-    "@glimmer/global-context" "0.83.1"
-    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/global-context" "0.84.2"
+    "@glimmer/interfaces" "0.84.2"
     "@glimmer/low-level" "0.78.2"
-    "@glimmer/owner" "0.83.1"
-    "@glimmer/program" "0.83.1"
-    "@glimmer/reference" "0.83.1"
-    "@glimmer/util" "0.83.1"
-    "@glimmer/validator" "0.83.1"
-    "@glimmer/vm" "0.83.1"
-    "@glimmer/wire-format" "0.83.1"
+    "@glimmer/owner" "0.84.2"
+    "@glimmer/program" "0.84.2"
+    "@glimmer/reference" "0.84.2"
+    "@glimmer/util" "0.84.2"
+    "@glimmer/validator" "0.84.2"
+    "@glimmer/vm" "0.84.2"
+    "@glimmer/wire-format" "0.84.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/syntax@0.84.0":
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.0.tgz#bf5104fc2be7c853f1e3897dda16a655f6fd7d5f"
-  integrity sha512-TAo1vaO5SPWtstU3XOAeiG5izhlw2v2ASns7f5dwe0hzGPRHPGuatmsVCtw/CS6FH86weboLrOGz0KQwjMaKfQ==
+"@glimmer/syntax@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.84.2.tgz#a3f65e51eec20f6adb79c6159d1ad1166fa5bccd"
+  integrity sha512-SPBd1tpIR9XeaXsXsMRCnKz63eLnIZ0d5G9QC4zIBFBC3pQdtG0F5kWeuRVCdfTIFuR+5WBMfk5jvg+3gbQhjg==
   dependencies:
-    "@glimmer/interfaces" "0.84.0"
-    "@glimmer/util" "0.84.0"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/util" "0.84.2"
     "@handlebars/parser" "~2.0.0"
     simple-html-tokenizer "^0.5.11"
 
-"@glimmer/util@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.83.1.tgz#cc7511b03164d658cf6e3262fce5a0fcb82edceb"
-  integrity sha512-amvjtl9dvrkxsoitXAly9W5NUaLIE3A2J2tWhBWIL1Z6DOFotfX7ytIosOIcPhJLZCtiXPHzMutQRv0G/MSMsA==
+"@glimmer/util@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.2.tgz#2711ba40f25f44b2ea309cad49f5c2622c6211bc"
+  integrity sha512-VbhzE2s4rmU+qJF3gGBTL1IDjq+/G2Th51XErS8MQVMCmE4CU2pdwSzec8PyOowqCGUOrVIWuMzEI6VoPM4L4w==
   dependencies:
     "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.83.1"
+    "@glimmer/interfaces" "0.84.2"
     "@simple-dom/interface" "^1.4.0"
 
-"@glimmer/util@0.84.0":
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.84.0.tgz#a9d3a9471678e5c80470646a70ea54c2cf1f8e2c"
-  integrity sha512-H5OjZXaroV821TLVHXox4t2GICwUA8HdijyAf+wouSfINmm+y4GbbEwoZM9ns8YSZGX7/gG0Z4Znwti0oFbHPw==
-  dependencies:
-    "@glimmer/env" "0.1.7"
-    "@glimmer/interfaces" "0.84.0"
-    "@simple-dom/interface" "^1.4.0"
-
-"@glimmer/validator@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.83.1.tgz#7578cb2284f728c8e9302c51fc6e7660b570ac54"
-  integrity sha512-LaILSNnQgDHZpaUsfjVndbS1JfVn0xdTlJdFJblPbhoVklOBSReZVekens3EQ6xOr3BC612sRm1hBnEPixOY6A==
+"@glimmer/validator@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.84.2.tgz#29394d262cf8373fe20f4e225c1adc9857a4164b"
+  integrity sha512-9tpSmwiktsJDqriNEiFfyP+9prMSdk08THA6Ik71xS/sudBKxoDpul678uvyEYST/+Z23F8MxwKccC+QxCMXNA==
   dependencies:
     "@glimmer/env" "^0.1.7"
-    "@glimmer/global-context" "0.83.1"
+    "@glimmer/global-context" "0.84.2"
 
-"@glimmer/vm-babel-plugins@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.83.1.tgz#5da67e3d84199352bbf0c5bc3f1ce71bf2b2ddfc"
-  integrity sha512-Cz0e/SrOo1gSNA0PXZRYI1WGmlQSAQCpiERBlXjjpwoLgiqx2kvsjfFiCUC/CfpsO6WN6wuPMeTFGJuhSSeL5A==
+"@glimmer/vm-babel-plugins@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm-babel-plugins/-/vm-babel-plugins-0.84.2.tgz#653ce82a6656b4396d87a479d8699450d35a17f0"
+  integrity sha512-HS2dEbJ3CgXn56wk/5QdudM7rE3vtNMvPIoG7Rrg+GhkGMNxBCIRxOeEF2g520j9rwlA2LAZFpc7MCDMFbTjNA==
   dependencies:
     babel-plugin-debug-macros "^0.3.4"
 
-"@glimmer/vm@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.83.1.tgz#ee9611d8a13e7b5923721258600c6085fe165d0b"
-  integrity sha512-mZguahHZJKWwlcU0n5U7mcpxwcIlogHkecYyOsOPPZe2mnAID/8xmZZcFlRAShA/Z98mo4S0WLE6sY/jJ9M1WA==
-  dependencies:
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
-
-"@glimmer/wire-format@0.83.1":
-  version "0.83.1"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.83.1.tgz#a36f0b80d9cf9f57498bfea5ddbf6d118f96475d"
-  integrity sha512-2WZ7c7tqHXDrznnFFguw7QJOgUUglnHEHzpSqPFvw1S46NecFMG0v9Q7LQRjeCKH+cwExeD6LbbF2dpKIhoJcg==
+"@glimmer/vm@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.84.2.tgz#ade992d1e4baea3e88d320ec06f3d3e173c236e9"
+  integrity sha512-IuQeDlh+AUOOX8QXc+ehPv5uFnqstQVZGplqqvPQRcKvsEalog88RC34dAEwFdB756SKjgRSw+N+nT3ZDNVlvA==
   dependencies:
-    "@glimmer/interfaces" "0.83.1"
-    "@glimmer/util" "0.83.1"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/util" "0.84.2"
 
-"@glimmer/wire-format@0.84.0":
-  version "0.84.0"
-  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.84.0.tgz#d70bd970ff877752c1d5e46eabec4a5c6583a319"
-  integrity sha512-vvagH+UteM1A5g0lLPBWmbNTbDfs9wzQUgNFzygX4WxuEwXfGyxDvfFPoRifyrdV1Eft/h/yKtZ/b6WyCLdDLA==
+"@glimmer/wire-format@0.84.2":
+  version "0.84.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.84.2.tgz#fa90d93b2f7c5baa1ef24d82d649892e6a1d8671"
+  integrity sha512-/FmbXSPFJAoIZ6qu28xVXpAdy2Ln++Ewe6mRHFpnudV1lUrBN+Q09A4j/RN/hpAkyz/8ai5W+5rHKuaWxoi4Dg==
   dependencies:
-    "@glimmer/interfaces" "0.84.0"
-    "@glimmer/util" "0.84.0"
+    "@glimmer/interfaces" "0.84.2"
+    "@glimmer/util" "0.84.2"
 
 "@handlebars/parser@~2.0.0":
   version "2.0.0"

From 8343fea0bcdb187cf696dd01ab74caf13c59404f Mon Sep 17 00:00:00 2001
From: Chris Freeman <cfreeman.code@gmail.com>
Date: Wed, 13 Apr 2022 09:56:27 -0600
Subject: [PATCH 0971/1405] export `renderSettled` via renderer package

---
 packages/@ember/renderer/index.ts | 29 +++++++++++++++++++++++++++++
 tests/docs/expected.js            |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 packages/@ember/renderer/index.ts

diff --git a/packages/@ember/renderer/index.ts b/packages/@ember/renderer/index.ts
new file mode 100644
index 00000000000..b8bd548bb40
--- /dev/null
+++ b/packages/@ember/renderer/index.ts
@@ -0,0 +1,29 @@
+/**
+  @module @ember/renderer
+  @public
+*/
+
+/**
+ * @class Renderer
+ * @public
+ */
+
+/**
+  Returns a promise which will resolve when rendering has completed. In
+  this context, rendering is completed when all auto-tracked state that is
+  consumed in the template (including any tracked state in models, services,
+    etc.  that are then used in a template) has been updated in the DOM.
+
+    For example, in a test you might want to update some tracked state and
+    then run some assertions after rendering has completed. You _could_ use
+    `await settled()` in that location, but in some contexts you don't want to
+    wait for full settledness (which includes test waiters, pending AJAX/fetch,
+    run loops, etc) but instead only want to know when that updated value has
+    been rendered in the DOM. **THAT** is what `await rerender()` is _perfect_
+    for.
+  @method renderSettled
+  @returns {Promise<void>} a promise which fulfills when rendering has completed
+  @public
+*/
+
+export { renderSettled } from '@ember/-internals/glimmer';
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 81253774e8f..e57a7e9e118 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -420,6 +420,7 @@ module.exports = {
     'removeObjects',
     'removeObserver',
     'removeTestHelpers',
+    'renderSettled',
     'reopen',
     'reopenClass',
     'replace',

From 7cbb64f38f577660d387fe34282a35a11b3a22c4 Mon Sep 17 00:00:00 2001
From: Godfrey Chan <godfreykfc@gmail.com>
Date: Wed, 13 Apr 2022 21:18:19 -0700
Subject: [PATCH 0972/1405] [feature EMBER_DEFAULT_HELPER_MANAGER] Enable

Tracking #20054
---
 packages/@ember/canary-features/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index d0c32a5653e..9786f6004bd 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -15,7 +15,7 @@ export const DEFAULT_FEATURES = {
   EMBER_LIBRARIES_ISREGISTERED: null,
   EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_UNIQUE_ID_HELPER: true,
-  EMBER_DEFAULT_HELPER_MANAGER: null,
+  EMBER_DEFAULT_HELPER_MANAGER: true,
 };
 
 /**

From 6af9989fdc48551083fef9e9792a05c2f6e30bc3 Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Fri, 15 Apr 2022 14:42:20 +0100
Subject: [PATCH 0973/1405] use Math.sign for spaceship function implementation

---
 packages/@ember/-internals/runtime/lib/compare.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/-internals/runtime/lib/compare.ts
index 480933e9212..31e0a74781f 100644
--- a/packages/@ember/-internals/runtime/lib/compare.ts
+++ b/packages/@ember/-internals/runtime/lib/compare.ts
@@ -36,9 +36,7 @@ type Compare = -1 | 0 | 1;
 //                                `._________`-.   `.   `.___
 //                                              SSt  `------'`
 function spaceship(a: number, b: number): Compare {
-  let diff = a - b;
-  // SAFETY: Number casts true into 1 and false into 0. Therefore, this must end up as one of the Compare values.
-  return (Number(diff > 0) - Number(diff < 0)) as Compare;
+  return Math.sign(a - b) as Compare;
 }
 
 /**

From 6c259fcafa2de6fae3810a6761d04a847f5bd49a Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 19 Apr 2022 16:48:10 -0600
Subject: [PATCH 0974/1405] Add v3.28.9 to CHANGELOG

(cherry picked from commit 40c1849d2230519428c199d2a9b10bf3a3ebf9a6)
---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 793d9b78657..13ac3d535d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
-# Ember Changelog
+# Ember Changelo
+
+## v3.28.9 (April 19, 2022)
+
+- [#20028](https://github.com/emberjs/ember.js/pull/20028) Fix a memory leak in the Router Service class
 
 ### v4.4.0-beta.1 (March 24, 2022)
 

From 9f260af9e5aa7f112a11d6de44f76591435fc455 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Mar 2022 16:01:09 -0800
Subject: [PATCH 0975/1405] Remove suppressImplicitAnyIndexErrors

---
 .../-internals/container/lib/container.ts     |   4 +-
 .../-internals/environment/lib/context.ts     |   6 +-
 .../@ember/-internals/environment/lib/env.ts  |  14 ++-
 .../lib/container_debug_adapter.ts            |   2 +-
 .../extension-support/lib/data_adapter.ts     |   2 +-
 .../glimmer/lib/component-managers/curly.ts   |   8 +-
 .../-internals/glimmer/lib/component.ts       |  14 ++-
 .../glimmer/lib/components/link-to.ts         |   4 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  13 +-
 .../glimmer/lib/modifiers/action.ts           |   6 +-
 .../@ember/-internals/glimmer/lib/renderer.ts |   7 +-
 .../@ember/-internals/glimmer/lib/resolver.ts |  32 ++---
 .../-internals/glimmer/lib/utils/iterator.ts  |  12 +-
 .../glimmer/lib/utils/process-args.ts         |  10 +-
 .../application/debug-render-tree-test.ts     | 117 ++++++++++--------
 packages/@ember/-internals/meta/lib/meta.ts   |   8 +-
 .../@ember/-internals/metal/lib/computed.ts   |   4 +-
 .../-internals/metal/lib/get_properties.ts    |   7 +-
 packages/@ember/-internals/metal/lib/mixin.ts |   2 +
 .../-internals/metal/lib/namespace_search.ts  |  18 ++-
 .../@ember/-internals/metal/lib/properties.ts |   2 +-
 .../-internals/metal/lib/property_events.ts   |   4 +-
 .../-internals/metal/lib/property_get.ts      |   8 +-
 .../-internals/metal/lib/property_set.ts      |   6 +-
 .../-internals/routing/lib/location/api.ts    |  13 +-
 .../routing/lib/location/auto_location.ts     |  19 ++-
 .../-internals/routing/lib/services/router.ts |  13 +-
 .../routing/lib/services/routing.ts           |  14 +--
 .../-internals/routing/lib/system/route.ts    |  59 +++++----
 .../-internals/routing/lib/system/router.ts   |  58 ++++++---
 .../@ember/-internals/routing/lib/utils.ts    |  51 ++++----
 .../@ember/-internals/runtime/lib/compare.ts  |   7 +-
 .../runtime/lib/system/core_object.ts         |  14 ++-
 .../-internals/runtime/lib/system/object.ts   |   4 +-
 .../@ember/-internals/runtime/lib/type-of.ts  |   2 +-
 .../@ember/-internals/utils/lib/inspect.ts    |   6 +-
 .../@ember/-internals/utils/lib/intern.ts     |   2 +-
 .../-internals/utils/lib/mandatory-setter.ts  |   8 +-
 .../-internals/views/lib/compat/attrs.js      |   4 +-
 .../-internals/views/lib/system/utils.ts      |   9 +-
 .../-internals/views/lib/views/core_view.ts   |   4 +-
 .../controller/lib/controller_mixin.d.ts      |   5 +-
 packages/@ember/debug/lib/deprecate.ts        |   2 +-
 packages/@ember/engine/instance.ts            |   4 +-
 packages/@ember/engine/lib/engine-parent.ts   |   3 +-
 .../tests/utils/transform-test-case.ts        |   6 +-
 .../internal-test-helpers/lib/apply-mixins.ts |   7 +-
 .../lib/ember-dev/observers.ts                |   2 +-
 .../lib/ember-dev/run-loop.ts                 |   7 +-
 packages/internal-test-helpers/lib/factory.ts |   6 +-
 .../lib/get-all-property-names.ts             |  10 +-
 .../internal-test-helpers/lib/matchers.ts     |   8 +-
 .../internal-test-helpers/lib/module-for.ts   |  30 ++---
 .../internal-test-helpers/lib/node-query.ts   |  25 ++--
 tsconfig.json                                 |   1 -
 55 files changed, 411 insertions(+), 302 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index eab8b08bd09..976cb3e77a9 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,5 +1,5 @@
 import { Factory, FactoryClass, Owner, setOwner } from '@ember/-internals/owner';
-import { dictionary, symbol } from '@ember/-internals/utils';
+import { dictionary } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import Registry, { DebugRegistry, TypeOptions } from './registry';
@@ -447,7 +447,7 @@ declare interface DebugFactory<T extends object, C extends FactoryClass | object
   _lazyInjections(): { [key: string]: LazyInjection };
 }
 
-export const INIT_FACTORY = symbol('INIT_FACTORY');
+export const INIT_FACTORY = Symbol('INIT_FACTORY');
 
 export function getFactoryFor(obj: any): FactoryManager<any, any> {
   return obj[INIT_FACTORY];
diff --git a/packages/@ember/-internals/environment/lib/context.ts b/packages/@ember/-internals/environment/lib/context.ts
index 0bb69e10d8a..928a543f9d4 100644
--- a/packages/@ember/-internals/environment/lib/context.ts
+++ b/packages/@ember/-internals/environment/lib/context.ts
@@ -3,12 +3,12 @@ import global from './global';
 export interface GlobalContext {
   imports: object;
   exports: object;
-  lookup: object;
+  lookup: Record<string, unknown>;
 }
 
 // legacy imports/exports/lookup stuff (should we keep this??)
 export const context = (function (
-  global: object,
+  global: Record<string, unknown>,
   Ember: Partial<GlobalContext> | undefined
 ): GlobalContext {
   return Ember === undefined
@@ -27,6 +27,6 @@ export function getLookup(): object {
   return context.lookup;
 }
 
-export function setLookup(value: object): void {
+export function setLookup(value: Record<string, unknown>): void {
   context.lookup = value;
 }
diff --git a/packages/@ember/-internals/environment/lib/env.ts b/packages/@ember/-internals/environment/lib/env.ts
index f8b196b7aad..e7a7eb4dda2 100644
--- a/packages/@ember/-internals/environment/lib/env.ts
+++ b/packages/@ember/-internals/environment/lib/env.ts
@@ -164,7 +164,13 @@ export const ENV = {
   },
 };
 
-((EmberENV) => {
+((
+  EmberENV: Record<string, unknown> & {
+    EXTEND_PROTOTYPES?: { Array?: boolean } | boolean;
+    EMBER_LOAD_HOOKS?: Record<string, unknown>;
+    FEATURES?: Record<string, unknown>;
+  }
+) => {
   if (typeof EmberENV !== 'object' || EmberENV === null) return;
 
   for (let flag in EmberENV) {
@@ -174,11 +180,11 @@ export const ENV = {
       flag === 'EMBER_LOAD_HOOKS'
     )
       continue;
-    let defaultValue = ENV[flag];
+    let defaultValue = (ENV as Record<string, unknown>)[flag];
     if (defaultValue === true) {
-      ENV[flag] = EmberENV[flag] !== false;
+      (ENV as Record<string, unknown>)[flag] = EmberENV[flag] !== false;
     } else if (defaultValue === false) {
-      ENV[flag] = EmberENV[flag] === true;
+      (ENV as Record<string, unknown>)[flag] = EmberENV[flag] === true;
     }
   }
 
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
index c7937c66f4b..9d81d7dc569 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
@@ -100,7 +100,7 @@ export default class ContainerDebugAdapter extends EmberObject {
           continue;
         }
         if (typeSuffixRegex.test(key)) {
-          let klass = namespace[key];
+          let klass = (namespace as any)[key];
           if (typeOf(klass) === 'class') {
             types.push(dasherize(key.replace(typeSuffixRegex, '')));
           }
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.ts b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
index 8874c4c2c62..beb965a0e9c 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
@@ -566,7 +566,7 @@ export default class DataAdapter<T> extends EmberObject {
         }
         // Even though we will filter again in `getModelTypes`,
         // we should not call `lookupFactory` on non-models
-        if (!this.detect(namespace[key])) {
+        if (!this.detect((namespace as any)[key])) {
           continue;
         }
         let name = dasherize(key);
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 5595a00536c..ca2471be2d4 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,5 +1,5 @@
 import { Factory, getOwner, Owner, setOwner } from '@ember/-internals/owner';
-import { enumerableSymbol, guidFor, symbol } from '@ember/-internals/utils';
+import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
@@ -56,9 +56,9 @@ import { processComponentArgs } from '../utils/process-args';
 export const ARGS = enumerableSymbol('ARGS');
 export const HAS_BLOCK = enumerableSymbol('HAS_BLOCK');
 
-export const DIRTY_TAG = symbol('DIRTY_TAG');
-export const IS_DISPATCHING_ATTRS = symbol('IS_DISPATCHING_ATTRS');
-export const BOUNDS = symbol('BOUNDS');
+export const DIRTY_TAG = Symbol('DIRTY_TAG');
+export const IS_DISPATCHING_ATTRS = Symbol('IS_DISPATCHING_ATTRS');
+export const BOUNDS = Symbol('BOUNDS');
 
 const EMBER_VIEW_REF = createPrimitiveRef('ember-view');
 
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 6bb58b22c07..4d35e3af659 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -17,7 +17,7 @@ import { Environment, Template, TemplateFactory } from '@glimmer/interfaces';
 import { setInternalComponentManager } from '@glimmer/manager';
 import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
-import { createTag, dirtyTag } from '@glimmer/validator';
+import { createTag, DirtyableTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
 import {
   ARGS,
@@ -789,6 +789,7 @@ interface ComponentMethods {
     @type String
     @public
   */
+  layoutName?: string;
 }
 interface Component
   extends CoreView,
@@ -823,6 +824,9 @@ class Component extends CoreView.extend(
   // SAFTEY: This is set in `init`.
   declare _superRerender: ViewMixin['rerender'];
 
+  declare [IS_DISPATCHING_ATTRS]: boolean;
+  declare [DIRTY_TAG]: DirtyableTag;
+
   init(properties: object | undefined) {
     super.init(properties);
 
@@ -850,7 +854,7 @@ class Component extends CoreView.extend(
         let lazyEvents = eventDispatcher.lazyEvents;
 
         lazyEvents.forEach((mappedEventName: string, event: string) => {
-          if (mappedEventName !== null && typeof this[mappedEventName] === 'function') {
+          if (mappedEventName !== null && typeof (this as any)[mappedEventName] === 'function') {
             eventDispatcher.setupHandlerForBrowserEvent(event);
           }
         });
@@ -866,7 +870,7 @@ class Component extends CoreView.extend(
       for (let key in events) {
         let methodName = events[key];
 
-        if (methodName && typeof this[methodName] === 'function') {
+        if (methodName && typeof (this as any)[methodName] === 'function') {
           eventNames.push(methodName);
         }
       }
@@ -926,7 +930,7 @@ class Component extends CoreView.extend(
       return;
     }
 
-    let args = this[ARGS];
+    let args = (this as any)[ARGS];
     let reference = args !== undefined ? args[key] : undefined;
 
     if (reference !== undefined && isUpdatableRef(reference)) {
@@ -987,7 +991,7 @@ class Component extends CoreView.extend(
       return element.getAttribute(normalized);
     }
 
-    return element[normalized];
+    return (element as any)[normalized];
   }
 
   // --- Declarations which support mixins ---
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 5025ff4ef57..ac5c4eccb52 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -33,7 +33,9 @@ interface QueryParams {
 }
 
 function isQueryParams(value: unknown): value is QueryParams {
-  return typeof value === 'object' && value !== null && value['isQueryParams'] === true;
+  return (
+    typeof value === 'object' && value !== null && (value as QueryParams)['isQueryParams'] === true
+  );
 }
 
 /**
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 7497ca0fc8e..072e5acc111 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -5,14 +5,14 @@
 import { FactoryManager } from '@ember/-internals/container/lib/container';
 import { Factory, Owner, setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
-import { getDebugName, symbol } from '@ember/-internals/utils';
+import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { join } from '@ember/runloop';
 import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager';
-import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
+import { consumeTag, createTag, DirtyableTag, dirtyTag } from '@glimmer/validator';
 
-export const RECOMPUTE_TAG = symbol('RECOMPUTE_TAG');
+export const RECOMPUTE_TAG = Symbol('RECOMPUTE_TAG');
 
 export type HelperFunction<T, P extends unknown[], N extends Dict<unknown>> = (
   positional: P,
@@ -33,6 +33,7 @@ export interface HelperFactory<T> {
 export interface HelperInstance<T = unknown> {
   compute(positional: unknown[], named: Dict<unknown>): T;
   destroy(): void;
+  [RECOMPUTE_TAG]: DirtyableTag;
 }
 
 const IS_CLASSIC_HELPER: unique symbol = Symbol('IS_CLASSIC_HELPER');
@@ -102,6 +103,8 @@ class Helper extends FrameworkObject {
   static isHelperFactory = true;
   static [IS_CLASSIC_HELPER] = true;
 
+  [RECOMPUTE_TAG]: DirtyableTag;
+
   init(properties: object | undefined) {
     super.init(properties);
     this[RECOMPUTE_TAG] = createTag();
@@ -144,7 +147,7 @@ class Helper extends FrameworkObject {
 }
 
 export function isClassicHelper(obj: object): boolean {
-  return obj[IS_CLASSIC_HELPER] === true;
+  return (obj as any)[IS_CLASSIC_HELPER] === true;
 }
 
 interface ClassicHelperStateBucket {
@@ -206,7 +209,7 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 
   getDebugName(definition: ClassHelperFactory) {
-    return getDebugName!((definition.class || definition)!['prototype']);
+    return getDebugName!(((definition.class || definition)! as any)['prototype']);
   }
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 1babc34eaaa..77f87525f50 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -34,7 +34,7 @@ function isAllowedEvent(event: Event, allowedKeys: any) {
   }
 
   for (let i = 0; i < MODIFIERS.length; i++) {
-    if (event[MODIFIERS[i] + 'Key'] && allowedKeys.indexOf(MODIFIERS[i]) === -1) {
+    if ((event as any)[MODIFIERS[i] + 'Key'] && allowedKeys.indexOf(MODIFIERS[i]) === -1) {
       return false;
     }
   }
@@ -50,7 +50,7 @@ export let ActionHelper = {
   registerAction(actionState: ActionState) {
     let { actionId } = actionState;
 
-    ActionManager.registeredActions[actionId] = actionState;
+    (ActionManager.registeredActions as Record<string, unknown>)[actionId] = actionState;
 
     return actionId;
   },
@@ -58,7 +58,7 @@ export let ActionHelper = {
   unregisterAction(actionState: ActionState) {
     let { actionId } = actionState;
 
-    delete ActionManager.registeredActions[actionId];
+    delete (ActionManager.registeredActions as Record<string, unknown>)[actionId];
   },
 };
 
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index e049e95a7f3..200ebbab2e3 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -58,6 +58,7 @@ export interface View {
   elementId: string | null;
   isDestroying: boolean;
   isDestroyed: boolean;
+  [BOUNDS]: Bounds | null;
 }
 
 export class DynamicScope implements GlimmerDynamicScope {
@@ -468,14 +469,14 @@ export class Renderer {
     }
   }
 
-  getBounds(view: object): {
+  getBounds(view: View): {
     parentElement: SimpleElement;
     firstNode: SimpleNode;
     lastNode: SimpleNode;
   } {
-    let bounds: Bounds = view[BOUNDS];
+    let bounds: Bounds | null = view[BOUNDS];
 
-    assert('object passed to getBounds must have the BOUNDS symbol as a property', Boolean(bounds));
+    assert('object passed to getBounds must have the BOUNDS symbol as a property', bounds);
 
     let parentElement = bounds.parentElement();
     let firstNode = bounds.firstNode();
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index cee0ebd9e21..ee02408a79b 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -118,8 +118,17 @@ const BUILTIN_KEYWORD_HELPERS = {
   '-in-el-null': inElementNullCheckHelper,
 };
 
+const BUILTIN_HELPERS: Record<string, object> = {
+  ...BUILTIN_KEYWORD_HELPERS,
+  array,
+  concat,
+  fn,
+  get,
+  hash,
+};
+
 if (DEBUG) {
-  BUILTIN_KEYWORD_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
+  BUILTIN_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
 } else {
   // Bug: this may be a quirk of our test setup?
   // In prod builds, this is a no-op helper and is unused in practice. We shouldn't need
@@ -129,18 +138,9 @@ if (DEBUG) {
   // not really harm anything, since it's just a no-op pass-through helper and the bytes
   // has to be included anyway. In the future, perhaps we can avoid the latter by using
   // `import(...)`?
-  BUILTIN_KEYWORD_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
+  BUILTIN_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
 }
 
-const BUILTIN_HELPERS = {
-  ...BUILTIN_KEYWORD_HELPERS,
-  array,
-  concat,
-  fn,
-  get,
-  hash,
-};
-
 if (EMBER_UNIQUE_ID_HELPER) {
   BUILTIN_HELPERS['unique-id'] = uniqueId;
 }
@@ -149,7 +149,7 @@ const BUILTIN_KEYWORD_MODIFIERS = {
   action: actionModifier,
 };
 
-const BUILTIN_MODIFIERS = {
+const BUILTIN_MODIFIERS: Record<string, object> = {
   ...BUILTIN_KEYWORD_MODIFIERS,
   on,
 };
@@ -209,7 +209,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
   }
 
   lookupBuiltInHelper(name: string): HelperDefinitionState | null {
-    return BUILTIN_KEYWORD_HELPERS[name] ?? null;
+    return (BUILTIN_KEYWORD_HELPERS as Record<string, object>)[name] ?? null;
   }
 
   lookupModifier(name: string, owner: Owner): Option<ModifierDefinitionState> {
@@ -228,8 +228,12 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     return modifier.class || null;
   }
 
+  lookupBuiltInModifier<K extends keyof typeof BUILTIN_KEYWORD_MODIFIERS>(
+    name: K
+  ): typeof BUILTIN_KEYWORD_MODIFIERS[K];
+  lookupBuiltInModifier(name: string): null;
   lookupBuiltInModifier(name: string): ModifierDefinitionState | null {
-    return BUILTIN_KEYWORD_MODIFIERS[name] ?? null;
+    return (BUILTIN_KEYWORD_MODIFIERS as Record<string, ModifierDefinitionState>)[name] ?? null;
   }
 
   lookupComponent(name: string, owner: Owner): ResolvedComponentDefinition | null {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 791925e356d..909d3449fd5 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -21,8 +21,8 @@ function toEachInIterator(iterable: unknown) {
 
   if (Array.isArray(iterable) || isEmberArray(iterable)) {
     return ObjectIterator.fromIndexable(iterable);
-  } else if (isNativeIterable<[unknown, unknown]>(iterable)) {
-    return MapLikeNativeIterator.from(iterable);
+  } else if (isNativeIterable(iterable)) {
+    return MapLikeNativeIterator.from(iterable as Iterable<[unknown, unknown]>);
   } else if (hasForEach(iterable)) {
     return ObjectIterator.fromForEachable(iterable);
   } else {
@@ -251,12 +251,12 @@ interface ForEachable {
   forEach(callback: (item: unknown, key: unknown) => void): void;
 }
 
-function hasForEach(value: object): value is ForEachable {
-  return typeof value['forEach'] === 'function';
+function hasForEach(value: unknown): value is ForEachable {
+  return value != null && typeof (value as ForEachable)['forEach'] === 'function';
 }
 
-function isNativeIterable<T = unknown>(value: object): value is Iterable<T> {
-  return typeof value[Symbol.iterator] === 'function';
+function isNativeIterable(value: unknown): value is Iterable<unknown> {
+  return value != null && typeof (value as Iterable<unknown>)[Symbol.iterator] === 'function';
 }
 
 interface Indexable {
diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
index 5e6eb93f80b..8370c63154c 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
@@ -1,7 +1,6 @@
-import { symbol } from '@ember/-internals/utils';
 import { MUTABLE_CELL } from '@ember/-internals/views';
 import { CapturedNamedArguments } from '@glimmer/interfaces';
-import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
+import { isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
 import { assert } from '@ember/debug';
 import { ARGS } from '../component-managers/curly';
 import { ACTIONS } from '../helpers/action';
@@ -36,11 +35,14 @@ export function processComponentArgs(namedArgs: CapturedNamedArguments) {
   return props;
 }
 
-const REF = symbol('REF');
+const REF = Symbol('REF');
 
 class MutableCell {
   public value: any;
-  constructor(ref: any, value: any) {
+  [MUTABLE_CELL]: boolean;
+  [REF]: Reference<unknown>;
+
+  constructor(ref: Reference<unknown>, value: any) {
     this[MUTABLE_CELL] = true;
     this[REF] = ref;
     this.value = value;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 654a5d82bb3..0a435047c7d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -221,7 +221,9 @@ if (ENV._DEBUG_RENDER_TREE) {
             }
 
             buildInstance(options?: EngineInstanceOptions): EngineInstance {
-              let instance = super.buildInstance(options);
+              let instance: EngineInstance & {
+                isFooEngineInstance?: boolean;
+              } = super.buildInstance(options);
               instance['isFooEngineInstance'] = true;
               return instance;
             }
@@ -257,7 +259,9 @@ if (ENV._DEBUG_RENDER_TREE) {
             }
 
             buildInstance(options?: EngineInstanceOptions): EngineInstance {
-              let instance = super.buildInstance(options);
+              let instance: EngineInstance & {
+                isBarEngineInstance?: boolean;
+              } = super.buildInstance(options);
               instance['isBarEngineInstance'] = true;
               return instance;
             }
@@ -271,9 +275,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static')[0]),
+            bounds: this.elementBounds(this.$('#static')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -282,7 +287,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static')[0]),
+                bounds: this.elementBounds(this.$('#static')[0]!),
                 children: [],
               },
             ],
@@ -298,9 +303,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static')[0]),
+            bounds: this.elementBounds(this.$('#static')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -309,7 +315,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static')[0]),
+                bounds: this.elementBounds(this.$('#static')[0]!),
                 children: [],
               },
             ],
@@ -318,9 +324,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'bar',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isBarEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isBarEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#dynamic')[0]),
+            bounds: this.elementBounds(this.$('#dynamic')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -329,7 +336,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'bar/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#dynamic')[0]),
+                bounds: this.elementBounds(this.$('#dynamic')[0]!),
                 children: [],
               },
             ],
@@ -345,9 +352,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static')[0]),
+            bounds: this.elementBounds(this.$('#static')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -356,7 +364,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static')[0]),
+                bounds: this.elementBounds(this.$('#static')[0]!),
                 children: [],
               },
             ],
@@ -381,9 +389,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static')[0]),
+            bounds: this.elementBounds(this.$('#static')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -392,7 +401,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static')[0]),
+                bounds: this.elementBounds(this.$('#static')[0]!),
                 children: [],
               },
             ],
@@ -401,9 +410,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: { model } },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static-with-model')[0]),
+            bounds: this.elementBounds(this.$('#static-with-model')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -412,7 +422,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static-with-model')[0]),
+                bounds: this.elementBounds(this.$('#static-with-model')[0]!),
                 children: [
                   {
                     type: 'component',
@@ -420,7 +430,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { model } },
                     instance: null,
                     template: 'foo/components/inspect-model.hbs',
-                    bounds: this.nodeBounds(this.$('#static-with-model')[0].lastChild),
+                    bounds: this.nodeBounds(this.$('#static-with-model')[0]!.lastChild),
                     children: [],
                   },
                 ],
@@ -438,9 +448,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static')[0]),
+            bounds: this.elementBounds(this.$('#static')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -449,7 +460,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static')[0]),
+                bounds: this.elementBounds(this.$('#static')[0]!),
                 children: [],
               },
             ],
@@ -458,9 +469,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'bar',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isBarEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isBarEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#dynamic')[0]),
+            bounds: this.elementBounds(this.$('#dynamic')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -469,7 +481,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'bar/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#dynamic')[0]),
+                bounds: this.elementBounds(this.$('#dynamic')[0]!),
                 children: [],
               },
             ],
@@ -478,9 +490,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: { model } },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static-with-model')[0]),
+            bounds: this.elementBounds(this.$('#static-with-model')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -488,7 +501,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 args: { positional: [], named: { model } },
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
-                bounds: this.elementBounds(this.$('#static-with-model')[0]),
+                bounds: this.elementBounds(this.$('#static-with-model')[0]!),
                 template: 'foo/templates/application.hbs',
                 children: [
                   {
@@ -497,7 +510,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { model } },
                     instance: null,
                     template: 'foo/components/inspect-model.hbs',
-                    bounds: this.nodeBounds(this.$('#static-with-model')[0].lastChild),
+                    bounds: this.nodeBounds(this.$('#static-with-model')[0]!.lastChild),
                     children: [],
                   },
                 ],
@@ -508,9 +521,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'bar',
             args: { positional: [], named: { model } },
-            instance: (instance: object) => instance['isBarEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isBarEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#dynamic-with-model')[0]),
+            bounds: this.elementBounds(this.$('#dynamic-with-model')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -519,7 +533,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'bar/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#dynamic-with-model')[0]),
+                bounds: this.elementBounds(this.$('#dynamic-with-model')[0]!),
                 children: [
                   {
                     type: 'component',
@@ -527,7 +541,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                     args: { positional: [], named: { model } },
                     instance: null,
                     template: 'bar/components/inspect-model.hbs',
-                    bounds: this.nodeBounds(this.$('#dynamic-with-model')[0].lastChild),
+                    bounds: this.nodeBounds(this.$('#dynamic-with-model')[0]!.lastChild),
                     children: [],
                   },
                 ],
@@ -548,9 +562,10 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'engine',
             name: 'foo',
             args: { positional: [], named: {} },
-            instance: (instance: object) => instance['isFooEngineInstance'] === true,
+            instance: (instance: Record<string, boolean>) =>
+              instance['isFooEngineInstance'] === true,
             template: null,
-            bounds: this.elementBounds(this.$('#static')[0]),
+            bounds: this.elementBounds(this.$('#static')[0]!),
             children: [
               {
                 type: 'route-template',
@@ -559,7 +574,7 @@ if (ENV._DEBUG_RENDER_TREE) {
                 instance: (instance: object) =>
                   instance.toString() === '(generated application controller)',
                 template: 'foo/templates/application.hbs',
-                bounds: this.elementBounds(this.$('#static')[0]),
+                bounds: this.elementBounds(this.$('#static')[0]!),
                 children: [],
               },
             ],
@@ -1014,7 +1029,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
-            instance: (instance: object) => instance['name'] === 'first',
+            instance: (instance: Record<string, string>) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1030,7 +1045,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
-            instance: (instance: object) => instance['name'] === 'first',
+            instance: (instance: Record<string, string>) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1039,7 +1054,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
-            instance: (instance: object) => instance['name'] === 'second',
+            instance: (instance: Record<string, string>) => instance['name'] === 'second',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
@@ -1055,7 +1070,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
-            instance: (instance: object) => instance['name'] === 'first',
+            instance: (instance: Record<string, string>) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1099,7 +1114,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
-            instance: (instance: object) => instance['name'] === 'first',
+            instance: (instance: Record<string, string>) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1115,7 +1130,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
-            instance: (instance: object) => instance['name'] === 'first',
+            instance: (instance: Record<string, string>) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1124,7 +1139,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'second' } },
-            instance: (instance: object) => instance['name'] === 'second',
+            instance: (instance: Record<string, string>) => instance['name'] === 'second',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
@@ -1140,7 +1155,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'hello-world',
             args: { positional: [], named: { name: 'first' } },
-            instance: (instance: object) => instance['name'] === 'first',
+            instance: (instance: Record<string, string>) => instance['name'] === 'first',
             template: 'my-app/templates/components/hello-world.hbs',
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1235,7 +1250,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'textarea',
             args: { positional: [], named: { value } },
-            instance: (instance: object) => instance['value'] === value,
+            instance: (instance: Record<string, string>) => instance['value'] === value,
             bounds: this.nodeBounds(node),
             template: 'packages/@ember/-internals/glimmer/lib/templates/textarea.hbs',
             children: [],
@@ -1286,7 +1301,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'link-to',
             args: { positional: [], named: { route: 'foo' } },
-            instance: (instance: object) => instance['route'] === 'foo',
+            instance: (instance: Record<string, string>) => instance['route'] === 'foo',
             template,
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1302,7 +1317,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'link-to',
             args: { positional: [], named: { route: 'foo' } },
-            instance: (instance: object) => instance['route'] === 'foo',
+            instance: (instance: Record<string, string>) => instance['route'] === 'foo',
             template,
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
@@ -1311,7 +1326,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'link-to',
             args: { positional: [], named: { route: 'bar' } },
-            instance: (instance: object) => instance['route'] === 'bar',
+            instance: (instance: Record<string, string>) => instance['route'] === 'bar',
             template,
             bounds: this.nodeBounds(this.element!.lastChild),
             children: [],
@@ -1327,7 +1342,7 @@ if (ENV._DEBUG_RENDER_TREE) {
             type: 'component',
             name: 'link-to',
             args: { positional: [], named: { route: 'foo' } },
-            instance: (instance: object) => instance['route'] === 'foo',
+            instance: (instance: Record<string, string>) => instance['route'] === 'foo',
             template,
             bounds: this.nodeBounds(this.element!.firstChild),
             children: [],
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 2493af87198..3cb1194a363 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -169,17 +169,17 @@ export class Meta {
   }
 
   /** @internal */
-  _getOrCreateOwnMap(key: string) {
+  _getOrCreateOwnMap(key: '_values' | '_revisions' | '_lazyChains') {
     return this[key] || (this[key] = Object.create(null));
   }
 
   /** @internal */
-  _getOrCreateOwnSet(key: string) {
+  _getOrCreateOwnSet(key: '_mixins') {
     return this[key] || (this[key] = new Set());
   }
 
   /** @internal */
-  _findInheritedMap(key: string, subkey: string): any | undefined {
+  _findInheritedMap(key: keyof Meta, subkey: string): any | undefined {
     let pointer: Meta | null = this;
     while (pointer !== null) {
       let map: Map<string, any> = pointer[key];
@@ -194,7 +194,7 @@ export class Meta {
   }
 
   /** @internal */
-  _hasInInheritedSet(key: string, value: any) {
+  _hasInInheritedSet(key: keyof Meta, value: any) {
     let pointer: Meta | null = this;
     while (pointer !== null) {
       let set = pointer[key];
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 29fcf665260..e9e3c109f69 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -461,14 +461,14 @@ export class ComputedProperty extends ComputedDescriptor {
       this._dependentKeys !== undefined &&
       this._dependentKeys.length > 0 &&
       // These two properties are set on Ember.Component
-      typeof obj[PROPERTY_DID_CHANGE] === 'function' &&
+      typeof (obj as any)[PROPERTY_DID_CHANGE] === 'function' &&
       (obj as any).isComponent
     ) {
       addObserver(
         obj,
         keyName,
         () => {
-          obj[PROPERTY_DID_CHANGE](keyName);
+          (obj as any)[PROPERTY_DID_CHANGE](keyName);
         },
         undefined,
         true
diff --git a/packages/@ember/-internals/metal/lib/get_properties.ts b/packages/@ember/-internals/metal/lib/get_properties.ts
index 9df246308a7..c2df72b0924 100644
--- a/packages/@ember/-internals/metal/lib/get_properties.ts
+++ b/packages/@ember/-internals/metal/lib/get_properties.ts
@@ -35,15 +35,18 @@ function getProperties<L extends string[]>(obj: unknown, list: L): Record<L[numb
 function getProperties<L extends string[]>(obj: unknown, ...list: L): Record<L[number], unknown>;
 function getProperties<L extends string[]>(obj: unknown, keys?: L): Record<L[number], unknown> {
   let ret = {} as Record<L[number], unknown>;
-  let propertyNames = arguments;
+  let propertyNames: string[];
   let i = 1;
 
   if (arguments.length === 2 && Array.isArray(keys)) {
     i = 0;
     propertyNames = arguments[1];
+  } else {
+    propertyNames = Array.from(arguments);
   }
+
   for (; i < propertyNames.length; i++) {
-    ret[propertyNames[i]] = get(obj, propertyNames[i]);
+    ret[propertyNames[i] as L[number]] = get(obj, propertyNames[i]!);
   }
   return ret;
 }
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index eb2302f1cc0..9f1bfef976b 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -539,6 +539,8 @@ export default class Mixin {
   /** @internal */
   _without: any[] | undefined;
 
+  declare [INIT_FACTORY]?: null;
+
   /** @internal */
   constructor(mixins: Mixin[] | undefined, properties?: { [key: string]: any }) {
     MIXINS.add(this);
diff --git a/packages/@ember/-internals/metal/lib/namespace_search.ts b/packages/@ember/-internals/metal/lib/namespace_search.ts
index c307cf7d8e5..d3290e7b2eb 100644
--- a/packages/@ember/-internals/metal/lib/namespace_search.ts
+++ b/packages/@ember/-internals/metal/lib/namespace_search.ts
@@ -100,7 +100,11 @@ export function setUnprocessedMixins(): void {
   unprocessedMixins = true;
 }
 
-function _processNamespace(paths: string[], root: Namespace, seen: Set<Namespace>): void {
+function _processNamespace<N extends Namespace>(
+  paths: string[],
+  root: N,
+  seen: Set<Namespace>
+): void {
   let idx = paths.length;
 
   let id = paths.join('.');
@@ -113,7 +117,7 @@ function _processNamespace(paths: string[], root: Namespace, seen: Set<Namespace
     if (!hasOwnProperty.call(root, key)) {
       continue;
     }
-    let obj = root[key];
+    let obj: unknown = root[key];
 
     // If we are processing the `Ember` namespace, for example, the
     // `paths` will start with `["Ember"]`. Every iteration through
@@ -123,11 +127,11 @@ function _processNamespace(paths: string[], root: Namespace, seen: Set<Namespace
     paths[idx] = key;
 
     // If we have found an unprocessed class
-    if (obj && getName(obj) === void 0) {
+    if (obj && getName(obj as object) === void 0) {
       // Replace the class' `toString` with the dot-separated path
-      setName(obj, paths.join('.'));
+      setName(obj as object, paths.join('.'));
       // Support nested namespaces
-    } else if (obj && obj.isNamespace) {
+    } else if (obj && isNamespace(obj)) {
       // Skip aliased namespaces
       if (seen.has(obj)) {
         continue;
@@ -141,6 +145,10 @@ function _processNamespace(paths: string[], root: Namespace, seen: Set<Namespace
   paths.length = idx; // cut out last item
 }
 
+function isNamespace(obj: unknown): obj is Namespace {
+  return obj != null && typeof obj === 'object' && (obj as Namespace).isNamespace;
+}
+
 function isUppercase(code: number): boolean {
   return (
     code >= 65 && code <= 90 // A
diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts
index 64525daa14c..5b1a47705de 100644
--- a/packages/@ember/-internals/metal/lib/properties.ts
+++ b/packages/@ember/-internals/metal/lib/properties.ts
@@ -125,7 +125,7 @@ export function defineValue(
     if (DEBUG) {
       setWithMandatorySetter!(obj, keyName, value);
     } else {
-      obj[keyName] = value;
+      (obj as any)[keyName] = value;
     }
   }
 
diff --git a/packages/@ember/-internals/metal/lib/property_events.ts b/packages/@ember/-internals/metal/lib/property_events.ts
index 49e8f020a5f..753ba45466b 100644
--- a/packages/@ember/-internals/metal/lib/property_events.ts
+++ b/packages/@ember/-internals/metal/lib/property_events.ts
@@ -57,9 +57,9 @@ function notifyPropertyChange(
     // that checks its arguments length, so we have to explicitly not call this with `value`
     // if it is not passed to `notifyPropertyChange`
     if (arguments.length === 4) {
-      obj[PROPERTY_DID_CHANGE](keyName, value);
+      (obj as any)[PROPERTY_DID_CHANGE](keyName, value);
     } else {
-      obj[PROPERTY_DID_CHANGE](keyName);
+      (obj as any)[PROPERTY_DID_CHANGE](keyName);
     }
   }
 }
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 7c5214ce6f8..fcb974556c0 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -14,9 +14,9 @@ export let getPossibleMandatoryProxyValue: (obj: object, keyName: string) => any
 
 if (DEBUG) {
   getPossibleMandatoryProxyValue = function getPossibleMandatoryProxyValue(obj, keyName): any {
-    let content = obj[PROXY_CONTENT];
+    let content = (obj as any)[PROXY_CONTENT];
     if (content === undefined) {
-      return obj[keyName];
+      return (obj as any)[keyName];
     } else {
       /* global Reflect */
       return Reflect.get(content, keyName, obj);
@@ -112,7 +112,7 @@ export function _getProp(obj: unknown, keyName: string) {
     if (DEBUG) {
       value = getPossibleMandatoryProxyValue(obj, keyName);
     } else {
-      value = obj[keyName];
+      value = (obj as any)[keyName];
     }
 
     if (
@@ -135,7 +135,7 @@ export function _getProp(obj: unknown, keyName: string) {
     }
   } else {
     // SAFETY: It should be ok to access properties on any non-nullish value
-    value = (obj as object)[keyName];
+    value = (obj as any)[keyName];
   }
 
   return value;
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 911c79218d4..f6a830d991e 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -70,7 +70,7 @@ export function _setProp(obj: object, keyName: string, value: any) {
   let descriptor = lookupDescriptor(obj, keyName);
 
   if (descriptor !== null && COMPUTED_SETTERS.has(descriptor.set!)) {
-    obj[keyName] = value;
+    (obj as any)[keyName] = value;
     return value;
   }
 
@@ -78,7 +78,7 @@ export function _setProp(obj: object, keyName: string, value: any) {
   if (DEBUG) {
     currentValue = getPossibleMandatoryProxyValue(obj, keyName);
   } else {
-    currentValue = obj[keyName];
+    currentValue = (obj as any)[keyName];
   }
 
   if (
@@ -93,7 +93,7 @@ export function _setProp(obj: object, keyName: string, value: any) {
     if (DEBUG) {
       setWithMandatorySetter!(obj, keyName, value);
     } else {
-      obj[keyName] = value;
+      (obj as any)[keyName] = value;
     }
 
     if (currentValue !== value) {
diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
index d13166e5b3a..796528ee738 100644
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ b/packages/@ember/-internals/routing/lib/location/api.ts
@@ -100,16 +100,13 @@ export default {
     need.
     @private
   */
-  create(options: { implementation: string }): EmberLocation {
-    let implementation = options && options.implementation;
-    assert("Location.create: you must specify a 'implementation' option", Boolean(implementation));
+  create(options?: { implementation: string }): EmberLocation {
+    let implementation = options?.implementation;
+    assert("Location.create: you must specify a 'implementation' option", implementation);
 
     let implementationClass = this.implementations[implementation];
 
-    assert(
-      `Location.create: ${implementation} is not a valid implementation`,
-      Boolean(implementationClass)
-    );
+    assert(`Location.create: ${implementation} is not a valid implementation`, implementationClass);
 
     deprecate(
       "Calling `create` on Location class is deprecated. Instead, use `container.lookup('location:my-location')` to lookup the location you need.",
@@ -129,5 +126,5 @@ export default {
     return implementationClass.create(...arguments);
   },
 
-  implementations: {},
+  implementations: {} as Record<string, { create: (...args: any[]) => EmberLocation }>,
 };
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 20306c4a3bd..bb43d0367c8 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -219,14 +219,27 @@ AutoLocation.reopen({
   cancelRouterSetup: false,
 });
 
-function delegateToConcreteImplementation(methodName: string) {
-  return function (this: AutoLocation, ...args: unknown[]) {
+type AnyFn = (...args: any[]) => any;
+
+type MethodNamesOf<T> = {
+  [K in keyof T]: T[K] extends AnyFn ? K : never;
+}[keyof T];
+
+function delegateToConcreteImplementation<N extends MethodNamesOf<Required<EmberLocation>>>(
+  methodName: N
+) {
+  return function (this: AutoLocation, ...args: Parameters<Required<EmberLocation>[N]>) {
     let { concreteImplementation } = this;
     assert(
       "AutoLocation's detect() method should be called before calling any other hooks.",
       concreteImplementation
     );
-    return concreteImplementation[methodName]?.(...args);
+
+    // We need this cast because `Parameters` is deferred so that it is not
+    // possible for TS to see it will always produce the right type. However,
+    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
+    // issue](https://github.com/microsoft/TypeScript/issues/47615).
+    return (concreteImplementation[methodName] as AnyFn | undefined)?.(...args);
   };
 }
 
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index f5a6e61da7e..e6a6458115c 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,6 +1,5 @@
 import { getOwner } from '@ember/-internals/owner';
 import { Evented } from '@ember/-internals/runtime';
-import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
@@ -11,7 +10,7 @@ import EmberRouter from '../system/router';
 import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
 import { extractRouteArgs, resemblesURL, RouteArgs, RouteOptions, shallowEqual } from '../utils';
 
-const ROUTER = symbol('ROUTER') as unknown as string;
+export const ROUTER = Symbol('ROUTER');
 
 function cleanURL(url: string, rootURL: string) {
   if (rootURL === '/') {
@@ -55,6 +54,8 @@ function cleanURL(url: string, rootURL: string) {
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface RouterService<R extends Route> extends Evented {}
 class RouterService<R extends Route> extends Service.extend(Evented) {
+  [ROUTER]?: EmberRouter<R>;
+
   get _router(): EmberRouter<R> {
     let router = this[ROUTER];
     if (router !== undefined) {
@@ -63,18 +64,18 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     let owner = getOwner(this);
     assert('RouterService is unexpectedly missing an owner', owner);
 
-    router = owner.lookup('router:main');
+    let _router = owner.lookup('router:main');
     assert(
       'ROUTER SERVICE BUG: Expected router to be an instance of EmberRouter',
-      router instanceof EmberRouter
+      _router instanceof EmberRouter
     );
-    return (this[ROUTER] = router);
+    return (this[ROUTER] = _router);
   }
 
   willDestroy() {
     super.willDestroy();
 
-    this[ROUTER] = null;
+    this[ROUTER] = undefined;
   }
 
   /**
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 514939114c7..ee89670dd6c 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -3,7 +3,6 @@
 */
 
 import { getOwner } from '@ember/-internals/owner';
-import { symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
@@ -11,8 +10,7 @@ import { ModelFor } from 'router_js';
 import { Route } from '../..';
 import EmberRouter from '../system/router';
 import RouterState from '../system/router_state';
-
-const ROUTER = symbol('ROUTER');
+import { ROUTER } from './router';
 
 /**
   The Routing service is used by LinkTo, and provides facilities for
@@ -30,6 +28,8 @@ export default class RoutingService<R extends Route> extends Service {
   declare currentRouteName: EmberRouter['currentRouteName'];
   declare currentPath: EmberRouter['currentPath'];
 
+  [ROUTER]?: EmberRouter<R>;
+
   get router(): EmberRouter<R> {
     let router = this[ROUTER];
     if (router !== undefined) {
@@ -38,13 +38,13 @@ export default class RoutingService<R extends Route> extends Service {
     let owner = getOwner(this);
     assert('RoutingService is unexpectedly missing an owner', owner);
 
-    router = owner.lookup('router:main');
+    let _router = owner.lookup('router:main');
     assert(
       'ROUTING SERVICE BUG: Expected router to be an instance of EmberRouter',
-      router instanceof EmberRouter
+      _router instanceof EmberRouter
     );
-    router.setupRouter();
-    return (this[ROUTER] = router);
+    _router.setupRouter();
+    return (this[ROUTER] = _router);
   }
 
   hasRoute(routeName: string) {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 89e58514783..9d1668154c7 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -20,8 +20,9 @@ import {
   Object as EmberObject,
   typeOf,
 } from '@ember/-internals/runtime';
-import { isProxy, lookupDescriptor, symbol } from '@ember/-internals/utils';
+import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
+import { ControllerQueryParamType } from '@ember/controller/lib/controller_mixin';
 import { assert, info, isTesting } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { dependentKeyCompat } from '@ember/object/compat';
@@ -39,8 +40,8 @@ import {
 } from 'router_js';
 import {
   calculateCacheKey,
-  ControllerQueryParam,
   deprecateTransitionMethods,
+  ExpandedControllerQueryParam,
   NamedRouteArgs,
   normalizeControllerQueryParams,
   prefixRouteNameArg,
@@ -50,6 +51,10 @@ import {
 import generateController from './generate_controller';
 import EmberRouter, { QueryParam } from './router';
 
+export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRouteInfo<R> {
+  _names?: unknown[];
+}
+
 export type QueryParamMeta = {
   qps: QueryParam[];
   map: Record<string, QueryParam>;
@@ -70,7 +75,7 @@ type MaybeParameters<T> = T extends (...args: any[]) => any ? Parameters<T> : un
 type MaybeReturnType<T> = T extends (...args: any[]) => any ? ReturnType<T> : unknown;
 
 export const ROUTE_CONNECTIONS = new WeakMap();
-const RENDER = symbol('render') as unknown as string;
+const RENDER = Symbol('render');
 
 /**
 @module @ember/routing
@@ -352,7 +357,7 @@ class Route<T = unknown>
       return;
     }
 
-    let object = {};
+    let object: Record<string, unknown> = {};
     if (params.length === 1) {
       let [name] = params;
       assert('has name', name);
@@ -559,11 +564,14 @@ class Route<T = unknown>
 
     @method _stashNames
   */
-  _stashNames(routeInfo: InternalRouteInfo<this>, dynamicParent: InternalRouteInfo<this>) {
+  _stashNames(
+    routeInfo: ExtendedInternalRouteInfo<this>,
+    dynamicParent: ExtendedInternalRouteInfo<this>
+  ) {
     if (this._names) {
       return;
     }
-    let names = (this._names = routeInfo['_names']);
+    let names = (this._names = routeInfo['_names'])!;
 
     if (!names.length) {
       routeInfo = dynamicParent;
@@ -670,7 +678,7 @@ class Route<T = unknown>
     let state = transition ? transition[STATE_SYMBOL] : this._router._routerMicrolib.state;
 
     let fullName = route.fullRouteName;
-    let params = Object.assign({}, state!.params[fullName]);
+    let params = { ...(state!.params[fullName] as Record<string, unknown>) };
     let queryParams = getQueryParamsFor(route, state!);
 
     return Object.entries(queryParams).reduce((params, [key, value]) => {
@@ -1876,7 +1884,7 @@ class Route<T = unknown>
     */
   @computed
   protected get _qp(): QueryParamMeta {
-    let combinedQueryParameterConfiguration;
+    let combinedQueryParameterConfiguration: ReturnType<typeof mergeEachQueryParams> = {};
 
     let controllerName = this.controllerName || this.routeName;
     let owner = getOwner(this);
@@ -1893,8 +1901,8 @@ class Route<T = unknown>
       // merge in the query params for the route. As a mergedProperty,
       // Route#queryParams is always at least `{}`
 
-      let controllerDefinedQueryParameterConfiguration: ControllerQueryParam[] =
-        (get(controller, 'queryParams') as ControllerQueryParam[]) || [];
+      let controllerDefinedQueryParameterConfiguration =
+        (get(controller, 'queryParams') as Controller['queryParams']) || [];
       let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
         controllerDefinedQueryParameterConfiguration
       );
@@ -1926,6 +1934,8 @@ class Route<T = unknown>
       }
 
       let desc = combinedQueryParameterConfiguration[propName];
+      assert(`[BUG] missing query parameter configuration for ${propName}`, desc);
+
       let scope = desc.scope || 'model';
       let parts: string[] | undefined = undefined;
 
@@ -2276,9 +2286,21 @@ function copyDefaultValue<T>(value: T): T {
   a route, returning a new object and avoiding any mutations to
   the existing objects.
 */
-function mergeEachQueryParams(controllerQP: {}, routeQP: {}) {
-  let qps = {};
-  let keysAlreadyMergedOrSkippable = {
+function mergeEachQueryParams(
+  controllerQP: Record<string, ExpandedControllerQueryParam>,
+  routeQP: Route['queryParams']
+) {
+  let qps: Record<
+    string,
+    {
+      type?: ControllerQueryParamType;
+      as?: string | null;
+      replace?: boolean;
+      refreshModel?: boolean;
+      scope?: string;
+    }
+  > = {};
+  let keysAlreadyMergedOrSkippable: Record<string, true> = {
     defaultValue: true,
     type: true,
     scope: true,
@@ -2292,10 +2314,7 @@ function mergeEachQueryParams(controllerQP: {}, routeQP: {}) {
       continue;
     }
 
-    let newControllerParameterConfiguration = {};
-    Object.assign(newControllerParameterConfiguration, controllerQP[cqpName], routeQP[cqpName]);
-
-    qps[cqpName] = newControllerParameterConfiguration;
+    qps[cqpName] = { ...controllerQP[cqpName], ...routeQP[cqpName] };
 
     // allows us to skip this QP when we check route QPs.
     keysAlreadyMergedOrSkippable[cqpName] = true;
@@ -2311,9 +2330,7 @@ function mergeEachQueryParams(controllerQP: {}, routeQP: {}) {
       continue;
     }
 
-    let newRouteParameterConfiguration = {};
-    Object.assign(newRouteParameterConfiguration, routeQP[rqpName], controllerQP[rqpName]);
-    qps[rqpName] = newRouteParameterConfiguration;
+    qps[rqpName] = { ...routeQP[rqpName], ...controllerQP[rqpName] };
   }
 
   return qps;
@@ -2448,7 +2465,7 @@ Route.reopen({
 
     finalizeQueryParamChange<T>(
       this: Route<T>,
-      params: {},
+      params: Record<string, string | null | undefined>,
       finalParams: {}[],
       transition: Transition
     ) {
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 134bf794bf5..93128a9f9a3 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -47,6 +47,15 @@ import Router, {
 import type { Timer } from 'backburner';
 import { EngineRouteInfo } from './engines';
 import EngineInstance from '@ember/engine/instance';
+import { QueryParams } from 'route-recognizer';
+
+type AnyFn = (...args: any[]) => any;
+
+type MethodNamesOf<T> = {
+  [K in keyof T]: T[K] extends AnyFn ? K : never;
+}[keyof T];
+
+type OmitFirst<F> = F extends [any, ...infer R] ? R : [];
 
 function defaultDidTransition<R extends Route>(
   this: EmberRouter<R>,
@@ -415,11 +424,11 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
         router.willTransition<R>(oldInfos, newInfos);
       }
 
-      triggerEvent(
+      triggerEvent<N extends MethodNamesOf<typeof defaultActionHandlers>>(
         routeInfos: InternalRouteInfo<R>[],
         ignoreFailure: boolean,
-        name: string,
-        args: unknown[]
+        name: N,
+        args: OmitFirst<Parameters<typeof defaultActionHandlers[N]>>
       ) {
         return triggerEvent.bind(router)(routeInfos, ignoreFailure, name, args);
       }
@@ -666,7 +675,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     return this._doURLTransition('handleURL', _url);
   }
 
-  _doURLTransition(routerJsMethod: string, url: string) {
+  _doURLTransition<M extends 'handleURL' | 'transitionTo'>(routerJsMethod: M, url: string) {
     this._initialTransitionStarted = true;
     let transition = this._routerMicrolib[routerJsMethod](url || '/');
     didBeginTransition(transition, this);
@@ -1099,7 +1108,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
       return;
     }
 
-    let unchangedQPs: Partial<QueryParamMeta> = {};
+    let unchangedQPs: Record<string, unknown> = {};
     let qpUpdates = this._qpUpdates;
     let params = getFullQueryParams(this, this._routerMicrolib.activeTransition[STATE_SYMBOL]);
     for (let key in params) {
@@ -1177,7 +1186,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     let shouldCache = true;
     let map: QueryParamMeta['map'] = {};
     let qps = [];
-    let qpsByUrlKey = DEBUG ? {} : null;
+    let qpsByUrlKey: Record<string, QueryParam> | null = DEBUG ? {} : null;
     let qpMeta;
     let urlKey;
     let qpOther;
@@ -1230,7 +1239,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     @param {Object} queryParams
     @return {Void}
   */
-  _fullyScopeQueryParams(leafRouteName: string, contexts: ModelFor<R>[], queryParams: {}) {
+  _fullyScopeQueryParams(leafRouteName: string, contexts: ModelFor<R>[], queryParams: QueryParams) {
     let state = calculatePostTransitionState(this, leafRouteName, contexts);
     let routeInfos = state.routeInfos;
     let qpMeta;
@@ -1270,7 +1279,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
   */
   _hydrateUnsuppliedQueryParams(
     state: TransitionState<R>,
-    queryParams: {},
+    queryParams: QueryParams,
     _fromRouterService: boolean
   ): void {
     let routeInfos = state.routeInfos;
@@ -1544,8 +1553,13 @@ let defaultActionHandlers = {
   },
 
   // Attempt to find an appropriate error route or substate to enter.
-  error<R extends Route>(routeInfos: InternalRouteInfo<R>[], error: Error, transition: Transition) {
-    let router: any = this;
+  error<R extends Route>(
+    this: EmberRouter<R>,
+    routeInfos: InternalRouteInfo<R>[],
+    error: Error,
+    transition: Transition
+  ) {
+    let router = this;
 
     let routeInfoWithError = routeInfos[routeInfos.length - 1];
 
@@ -1577,8 +1591,12 @@ let defaultActionHandlers = {
   },
 
   // Attempt to find an appropriate loading route or substate to enter.
-  loading<R extends Route>(routeInfos: InternalRouteInfo<R>[], transition: Transition) {
-    let router: any = this;
+  loading<R extends Route>(
+    this: EmberRouter<R>,
+    routeInfos: InternalRouteInfo<R>[],
+    transition: Transition
+  ) {
+    let router = this;
 
     let routeInfoWithSlowLoading = routeInfos[routeInfos.length - 1];
 
@@ -1697,12 +1715,15 @@ function routeHasBeenDefined(owner: Owner, router: any, localName: string, fullN
   return routerHasRoute && ownerHasRoute;
 }
 
-export function triggerEvent<R extends Route>(
+export function triggerEvent<
+  R extends Route,
+  N extends MethodNamesOf<typeof defaultActionHandlers>
+>(
   this: EmberRouter<R>,
   routeInfos: InternalRouteInfo<R>[],
   ignoreFailure: boolean,
-  name: string,
-  args: any[]
+  name: N,
+  args: OmitFirst<Parameters<typeof defaultActionHandlers[N]>>
 ): void {
   if (!routeInfos) {
     if (ignoreFailure) {
@@ -1719,7 +1740,7 @@ export function triggerEvent<R extends Route>(
 
   for (let i = routeInfos.length - 1; i >= 0; i--) {
     routeInfo = routeInfos[i];
-    assert('has routeInfo', routeInfo);
+    assert('[BUG] Missing routeInfo', routeInfo);
     handler = routeInfo.route;
     actionHandler = handler && handler.actions && handler.actions[name];
     if (actionHandler) {
@@ -1728,7 +1749,8 @@ export function triggerEvent<R extends Route>(
       } else {
         // Should only hit here if a non-bubbling error action is triggered on a route.
         if (name === 'error') {
-          handler!._router._markErrorAsHandled(args[0] as Error);
+          assert('[BUG] Missing handler', handler);
+          handler._router._markErrorAsHandled(args[0] as Error);
         }
         return;
       }
@@ -1737,7 +1759,7 @@ export function triggerEvent<R extends Route>(
 
   let defaultHandler = defaultActionHandlers[name];
   if (defaultHandler) {
-    defaultHandler.apply(this, [routeInfos, ...args]);
+    (defaultHandler as AnyFn).call(this, routeInfos, ...args);
     return;
   }
 
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index cb97efa92fb..c3ce6b943b5 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -1,19 +1,23 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
+import {
+  ControllerQueryParam,
+  ControllerQueryParamType,
+} from '@ember/controller/lib/controller_mixin';
 import { assert, deprecate } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import EmberError from '@ember/error';
 import Router, { STATE_SYMBOL, InternalRouteInfo, ModelFor } from 'router_js';
-import Route from './system/route';
+import Route, { ExtendedInternalRouteInfo } from './system/route';
 import EmberRouter from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
-export type ControllerQueryParam =
-  | string
-  | Record<string, string>
-  | { as?: string; scope?: string };
-type ExpandedControllerQueryParam = { as: string | null; scope: string };
+export type ExpandedControllerQueryParam = {
+  as: string | null;
+  scope: string;
+  type?: ControllerQueryParamType;
+};
 
 export type NamedRouteArgs<R extends Route> =
   | [routeNameOrUrl: string, ...modelsAndOptions: [...ModelFor<R>[], RouteOptions]]
@@ -73,7 +77,7 @@ export function getActiveTargetName(router: Router<Route>): string {
 
 export function stashParamNames<R extends Route>(
   router: EmberRouter<R>,
-  routeInfos: InternalRouteInfo<R>[]
+  routeInfos: Array<ExtendedInternalRouteInfo<R>> & { _namesStashed?: boolean }
 ): void {
   if (routeInfos['_namesStashed']) {
     return;
@@ -147,7 +151,7 @@ export function calculateCacheKey(prefix: string, parts: string[] = [], values:
       if (cacheValuePrefix && cacheValuePrefix in values) {
         let partRemovedPrefix =
           part.indexOf(cacheValuePrefix) === 0 ? part.substr(cacheValuePrefix.length + 1) : part;
-        value = get(values[cacheValuePrefix], partRemovedPrefix);
+        value = get((values as any)[cacheValuePrefix], partRemovedPrefix);
       } else {
         value = get(values, part);
       }
@@ -203,26 +207,18 @@ function accumulateQueryParamDescriptors(
   _desc: ControllerQueryParam,
   accum: Record<string, ExpandedControllerQueryParam>
 ) {
-  let desc: {} = _desc;
-  let tmp: {};
-  if (typeof desc === 'string') {
-    tmp = {};
-    tmp[desc] = { as: null };
-    desc = tmp;
-  }
+  let desc = typeof _desc === 'string' ? { [_desc]: { as: null } } : _desc;
 
   for (let key in desc) {
     if (!Object.prototype.hasOwnProperty.call(desc, key)) {
       return;
     }
 
-    let singleDesc = desc[key];
-    if (typeof singleDesc === 'string') {
-      singleDesc = { as: singleDesc };
-    }
+    let _singleDesc = desc[key];
+    let singleDesc = typeof _singleDesc === 'string' ? { as: _singleDesc } : _singleDesc;
 
-    let val = accum[key] || { as: null, scope: 'model' };
-    Object.assign(val, singleDesc);
+    let partialVal = accum[key] || { as: null, scope: 'model' };
+    let val = { ...partialVal, ...singleDesc };
 
     accum[key] = val;
   }
@@ -268,21 +264,20 @@ export function prefixRouteNameArg<T extends NamedRouteArgs<Route> | UnnamedRout
   return args;
 }
 
-export function shallowEqual(a: {}, b: {}): boolean {
-  let k;
+export function shallowEqual<A extends object, B extends object>(a: A, b: B): boolean {
   let aCount = 0;
   let bCount = 0;
-  for (k in a) {
-    if (Object.prototype.hasOwnProperty.call(a, k)) {
-      if (a[k] !== b[k]) {
+  for (let kA in a) {
+    if (Object.prototype.hasOwnProperty.call(a, kA)) {
+      if (a[kA] !== (b as any)[kA]) {
         return false;
       }
       aCount++;
     }
   }
 
-  for (k in b) {
-    if (Object.prototype.hasOwnProperty.call(b, k)) {
+  for (let kB in b) {
+    if (Object.prototype.hasOwnProperty.call(b, kB)) {
       bCount++;
     }
   }
diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/-internals/runtime/lib/compare.ts
index 480933e9212..12afaeaeae7 100644
--- a/packages/@ember/-internals/runtime/lib/compare.ts
+++ b/packages/@ember/-internals/runtime/lib/compare.ts
@@ -1,8 +1,8 @@
-import { typeOf } from './type-of';
+import { TypeName, typeOf } from './type-of';
 import Comparable from './mixins/comparable';
 import { assert } from '@ember/debug';
 
-const TYPE_ORDER = {
+const TYPE_ORDER: Record<TypeName, number> = {
   undefined: 0,
   null: 1,
   boolean: 2,
@@ -14,6 +14,9 @@ const TYPE_ORDER = {
   function: 8,
   class: 9,
   date: 10,
+  regexp: 11,
+  filelist: 12,
+  error: 13,
 };
 
 type Compare = -1 | 0 | 1;
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.ts b/packages/@ember/-internals/runtime/lib/system/core_object.ts
index 28e5697c876..77075541633 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.ts
@@ -93,7 +93,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
     let keyNames = Object.keys(properties);
 
     for (let keyName of keyNames) {
-      let value = properties[keyName];
+      let value = (properties as any)[keyName];
 
       assert(
         'EmberObject.create no longer supports defining computed ' +
@@ -120,7 +120,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
           concatenatedProperties.length > 0 &&
           concatenatedProperties.includes(keyName)
         ) {
-          let baseValue = obj[keyName];
+          let baseValue = (obj as any)[keyName];
           if (baseValue) {
             value = makeArray(baseValue).concat(value);
           } else {
@@ -133,7 +133,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
           mergedProperties.length > 0 &&
           mergedProperties.includes(keyName)
         ) {
-          let baseValue = obj[keyName];
+          let baseValue = (obj as any)[keyName];
           value = Object.assign({}, baseValue, value);
         }
       }
@@ -146,7 +146,7 @@ function initialize(obj: CoreObject, properties?: unknown) {
         if (DEBUG) {
           defineProperty(obj, keyName, null, value, m); // setup mandatory setter
         } else {
-          obj[keyName] = value;
+          (obj as any)[keyName] = value;
         }
       }
     }
@@ -237,6 +237,8 @@ interface CoreObject {
   _super(...args: any[]): any;
 }
 class CoreObject {
+  [OWNER]?: Owner;
+
   constructor(owner?: Owner) {
     this[OWNER] = owner;
 
@@ -1033,7 +1035,7 @@ class CoreObject {
 }
 
 function flattenProps(this: typeof CoreObject, ...props: Array<Record<string, unknown>>) {
-  let initProperties = {};
+  let initProperties: Record<string, unknown> = {};
 
   for (let properties of props) {
     assert(
@@ -1085,7 +1087,7 @@ if (DEBUG) {
     @private
   */
   CoreObject._lazyInjections = function () {
-    let injections = {};
+    let injections: Record<string, { namespace: unknown; source: unknown; specifier: string }> = {};
     let proto = this.proto();
     let key;
     let desc;
diff --git a/packages/@ember/-internals/runtime/lib/system/object.ts b/packages/@ember/-internals/runtime/lib/system/object.ts
index 6c5850eab58..de9b013111a 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.ts
@@ -35,10 +35,12 @@ interface FrameworkObject extends EmberObject {}
 let FrameworkObject = class FrameworkObject extends EmberObject {};
 
 if (DEBUG) {
-  let INIT_WAS_CALLED = symbol('INIT_WAS_CALLED');
+  const INIT_WAS_CALLED = Symbol('INIT_WAS_CALLED');
   let ASSERT_INIT_WAS_CALLED = symbol('ASSERT_INIT_WAS_CALLED');
 
   FrameworkObject = class DebugFrameworkObject extends EmberObject {
+    [INIT_WAS_CALLED] = false;
+
     init(properties: object | undefined) {
       super.init(properties);
       this[INIT_WAS_CALLED] = true;
diff --git a/packages/@ember/-internals/runtime/lib/type-of.ts b/packages/@ember/-internals/runtime/lib/type-of.ts
index 0f39f4888d2..e8f31b20d1e 100644
--- a/packages/@ember/-internals/runtime/lib/type-of.ts
+++ b/packages/@ember/-internals/runtime/lib/type-of.ts
@@ -1,6 +1,6 @@
 import CoreObject from './system/core_object';
 
-type TypeName =
+export type TypeName =
   | 'undefined'
   | 'null'
   | 'string'
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/-internals/utils/lib/inspect.ts
index fb4dc37613e..c6e532e955b 100644
--- a/packages/@ember/-internals/utils/lib/inspect.ts
+++ b/packages/@ember/-internals/utils/lib/inspect.ts
@@ -82,12 +82,12 @@ function inspectKey(key: string) {
   return SAFE_KEY.test(key) ? key : stringify(key);
 }
 
-function inspectObject(obj: object, depth: number, seen: WeakSet<object>) {
+function inspectObject<T extends object>(obj: T, depth: number, seen: WeakSet<object>) {
   if (depth > DEPTH_LIMIT) {
     return '[Object]';
   }
   let s = '{';
-  let keys = objectKeys(obj);
+  let keys = objectKeys(obj) as Array<keyof T>;
   for (let i = 0; i < keys.length; i++) {
     s += i === 0 ? ' ' : ', ';
 
@@ -98,7 +98,7 @@ function inspectObject(obj: object, depth: number, seen: WeakSet<object>) {
 
     let key = keys[i];
     assert('has key', key); // Looping over array
-    s += `${inspectKey(key)}: ${inspectValue(obj[key], depth, seen)}`;
+    s += `${inspectKey(String(key))}: ${inspectValue(obj[key], depth, seen)}`;
   }
   s += ' }';
   return s;
diff --git a/packages/@ember/-internals/utils/lib/intern.ts b/packages/@ember/-internals/utils/lib/intern.ts
index 80119cc1b82..422ba91e926 100644
--- a/packages/@ember/-internals/utils/lib/intern.ts
+++ b/packages/@ember/-internals/utils/lib/intern.ts
@@ -38,7 +38,7 @@
   @return {String} interned version of the provided string
 */
 export default function intern(str: string): string {
-  let obj = {};
+  let obj: Record<string, number> = {};
   obj[str] = 1;
   for (let key in obj) {
     if (key === str) {
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 89c5cfce61d..0fcdcae0d91 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -8,9 +8,7 @@ export let setupMandatorySetter:
   | ((tag: Tag, obj: object, keyName: string | symbol) => void)
   | undefined;
 export let teardownMandatorySetter: ((obj: object, keyName: string | symbol) => void) | undefined;
-export let setWithMandatorySetter:
-  | ((obj: object, keyName: string | symbol, value: any) => void)
-  | undefined;
+export let setWithMandatorySetter: ((obj: object, keyName: string, value: any) => void) | undefined;
 
 type PropertyDescriptorWithMeta = PropertyDescriptor & { hadOwnProperty?: boolean };
 
@@ -106,7 +104,7 @@ if (DEBUG) {
     }
   };
 
-  setWithMandatorySetter = function (obj: object, keyName: string | symbol, value: any) {
+  setWithMandatorySetter = function (obj: object, keyName: string, value: any) {
     let setters = MANDATORY_SETTERS.get(obj);
 
     if (setters !== undefined && setters[keyName] !== undefined) {
@@ -127,7 +125,7 @@ if (DEBUG) {
         }
       }
     } else {
-      obj[keyName] = value;
+      (obj as any)[keyName] = value;
     }
   };
 }
diff --git a/packages/@ember/-internals/views/lib/compat/attrs.js b/packages/@ember/-internals/views/lib/compat/attrs.js
index 8cd9dcccbc3..5d18e78b713 100644
--- a/packages/@ember/-internals/views/lib/compat/attrs.js
+++ b/packages/@ember/-internals/views/lib/compat/attrs.js
@@ -1,3 +1 @@
-import { symbol } from '@ember/-internals/utils';
-
-export let MUTABLE_CELL = symbol('MUTABLE_CELL');
+export const MUTABLE_CELL = Symbol('MUTABLE_CELL');
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index 6bb857789c1..af5cf64b989 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -214,14 +214,7 @@ export function getViewBoundingClientRect(view: View): ClientRect | DOMRect {
   @param {String} selector
 */
 export const elMatches: typeof Element.prototype.matches | undefined =
-  typeof Element !== 'undefined'
-    ? Element.prototype.matches ||
-      Element.prototype['matchesSelector'] ||
-      Element.prototype['mozMatchesSelector'] ||
-      Element.prototype['msMatchesSelector'] ||
-      Element.prototype['oMatchesSelector'] ||
-      Element.prototype['webkitMatchesSelector']
-    : undefined;
+  typeof Element !== 'undefined' ? Element.prototype.matches : undefined;
 
 export function matches(el: Element, selector: string): boolean {
   assert('cannot call `matches` in fastboot mode', elMatches !== undefined);
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 835a82ca29b..1044de07fc3 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -82,7 +82,7 @@ class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
   // Changed to `trigger` on init
   _trigger(name: string, ...args: any[]) {
     this._superTrigger!(name, ...args);
-    let method = this[name];
+    let method = (this as any)[name];
     if (typeof method === 'function') {
       return method.apply(this, args);
     }
@@ -90,7 +90,7 @@ class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
 
   // Changed to `has` on init
   _has(name: string) {
-    return typeof this[name] === 'function' || this._superHas!(name);
+    return typeof (this as any)[name] === 'function' || this._superHas!(name);
   }
 
   static isViewFactory = true;
diff --git a/packages/@ember/controller/lib/controller_mixin.d.ts b/packages/@ember/controller/lib/controller_mixin.d.ts
index f4740f367d2..9b9e5e5bb71 100644
--- a/packages/@ember/controller/lib/controller_mixin.d.ts
+++ b/packages/@ember/controller/lib/controller_mixin.d.ts
@@ -3,6 +3,9 @@ import Mixin from '@ember/object/mixin';
 import Route from '@ember/routing/route';
 import { Transition } from 'router_js';
 
+export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string';
+export type ControllerQueryParam = string | Record<string, { type: ControllerQueryParamType }>;
+
 /* @internal */
 interface ControllerMixin<T> {
   /** @internal */
@@ -14,7 +17,7 @@ interface ControllerMixin<T> {
 
   // From routing/lib/ext/controller
 
-  queryParams: Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>;
+  queryParams: Array<ControllerQueryParam>;
 
   transitionToRoute(...args: RouteArgs<Route>): Transition;
 
diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 08c3f7a482b..bca4dd3e5b3 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -127,7 +127,7 @@ if (DEBUG) {
 
       if (error instanceof Error) {
         if (error.stack) {
-          if (error['arguments']) {
+          if ((error as any)['arguments']) {
             // Chrome
             stack = error.stack
               .replace(/^\s+at\s+/gm, '')
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index aa5077ed02c..b25ab2c1b99 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -7,7 +7,7 @@ import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
-import { getEngineParent, setEngineParent } from './lib/engine-parent';
+import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
 import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
 import ContainerProxyMixin from '@ember/-internals/runtime/lib/mixins/container_proxy';
 import { isFactory } from '@ember/-internals/owner';
@@ -57,6 +57,8 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
   declare mountPoint?: string;
   declare routable?: boolean;
 
+  [ENGINE_PARENT]?: EngineInstance;
+
   _booted = false;
 
   init(properties: object | undefined) {
diff --git a/packages/@ember/engine/lib/engine-parent.ts b/packages/@ember/engine/lib/engine-parent.ts
index 924b9d54d5b..825a8561d96 100644
--- a/packages/@ember/engine/lib/engine-parent.ts
+++ b/packages/@ember/engine/lib/engine-parent.ts
@@ -1,10 +1,9 @@
 /**
 @module @ember/engine
 */
-import { symbol } from '@ember/-internals/utils';
 import EngineInstance from '../instance';
 
-const ENGINE_PARENT = symbol('ENGINE_PARENT');
+export const ENGINE_PARENT = Symbol('ENGINE_PARENT');
 
 /**
   `getEngineParent` retrieves an engine instance's parent instance.
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index 8f4f2d9dddd..caa2291c297 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -42,10 +42,10 @@ function ast(template: string): AST.Program {
 
 function clone<T extends object>(node: T): T {
   let out = Object.create(null);
-  let keys = Object.keys(node);
+  let keys = Object.keys(node) as Array<keyof T>;
 
   keys.forEach((key) => {
-    let value = node[key];
+    let value: unknown = node[key];
 
     if (value !== null && typeof value === 'object') {
       out[key] = clone(value);
@@ -59,7 +59,7 @@ function clone<T extends object>(node: T): T {
 
 function deloc<T extends object, U extends { loc?: AST.SourceLocation }>(node: T & U): T {
   let out = Object.create(null);
-  let keys = Object.keys(node);
+  let keys = Object.keys(node) as Array<keyof T & U>;
 
   keys.forEach((key) => {
     let value = node[key];
diff --git a/packages/internal-test-helpers/lib/apply-mixins.ts b/packages/internal-test-helpers/lib/apply-mixins.ts
index 1bdf7cfaacd..836ea36a237 100644
--- a/packages/internal-test-helpers/lib/apply-mixins.ts
+++ b/packages/internal-test-helpers/lib/apply-mixins.ts
@@ -40,12 +40,13 @@ export default function applyMixins<T extends Generator>(
 
       Object.assign(TestClass.prototype, mixin);
     } else if (isGeneratorClass(mixinOrGenerator)) {
-      let properties = getAllPropertyNames(mixinOrGenerator);
-      mixin = new mixinOrGenerator();
+      let properties = getAllPropertyNames<T>(mixinOrGenerator);
+      let mOG = new mixinOrGenerator();
+      mixin = mOG;
 
       properties.forEach((name) => {
         TestClass.prototype[name] = function () {
-          return mixin[name].apply(mixin, arguments);
+          return (mOG[name] as any).apply(mixin, arguments);
         };
       });
     } else {
diff --git a/packages/internal-test-helpers/lib/ember-dev/observers.ts b/packages/internal-test-helpers/lib/ember-dev/observers.ts
index bff9c424ded..d61dc796163 100644
--- a/packages/internal-test-helpers/lib/ember-dev/observers.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/observers.ts
@@ -42,5 +42,5 @@ export function setupObserversCheck(hooks: NestedHooks): void {
 }
 
 function isDestroyable(obj: object): obj is { destroy(): void } {
-  return 'destroy' in obj && typeof obj['destroy'] === 'function';
+  return 'destroy' in obj && typeof (obj as any)['destroy'] === 'function';
 }
diff --git a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
index 131fcf67844..5b4b0343832 100644
--- a/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/run-loop.ts
@@ -1,14 +1,15 @@
 import { end, _cancelTimers, _getCurrentRunLoop, _hasScheduledTimers } from '@ember/runloop';
 
 export function setupRunLoopCheck(hooks: NestedHooks) {
-  hooks.afterEach(function (assert) {
+  hooks.afterEach(function (assert: QUnit['assert']) {
     if (_getCurrentRunLoop() || _hasScheduledTimers()) {
       let done = assert.async();
       // use a setTimeout to allow the current run loop to flush via autorun
       setTimeout(() => {
         // increment expected assertion count for the assertions just below
-        if (assert['test'].expected !== null) {
-          assert['test'].expected += 2;
+        let test = (assert as any)['test'];
+        if (test.expected !== null) {
+          test.expected += 2;
         }
 
         // if it is _still_ not completed, we have a problem and the test should be fixed
diff --git a/packages/internal-test-helpers/lib/factory.ts b/packages/internal-test-helpers/lib/factory.ts
index ef4bfebaaf8..996f964997e 100644
--- a/packages/internal-test-helpers/lib/factory.ts
+++ b/packages/internal-test-helpers/lib/factory.ts
@@ -1,7 +1,9 @@
-function setProperties(object: object, properties: object) {
+function setProperties<T extends object>(object: T, properties: Partial<T>) {
   for (let key in properties) {
     if (Object.prototype.hasOwnProperty.call(properties, key)) {
-      object[key] = properties[key];
+      // SAFETY: we know that the property exists on `properties` because we
+      // just checked as much with `hasOwnProperty`.
+      object[key] = properties[key]!;
     }
   }
 }
diff --git a/packages/internal-test-helpers/lib/get-all-property-names.ts b/packages/internal-test-helpers/lib/get-all-property-names.ts
index f5eaa0e85af..a28aa5e5f63 100644
--- a/packages/internal-test-helpers/lib/get-all-property-names.ts
+++ b/packages/internal-test-helpers/lib/get-all-property-names.ts
@@ -1,9 +1,13 @@
-export default function getAllPropertyNames(Klass: Function) {
+// The `& string` here is to enforce that the propreties are strings since this is expected
+// to be the case elsewhere.
+export default function getAllPropertyNames<T>(Klass: { prototype: T }): Set<keyof T & string> {
   let proto = Klass.prototype;
-  let properties: Set<string> = new Set();
+  let properties: Set<keyof T & string> = new Set();
 
   while (proto !== Object.prototype) {
-    let names = Object.getOwnPropertyNames(proto);
+    // SAFETY: Using `getOwnPropertyNames` should only be returning us properties that are `keyof T`.
+    // Additionally, this will only return strings, which is what we're also expecting to work with here.
+    let names = Object.getOwnPropertyNames(proto) as Array<keyof T & string>;
     names.forEach((name) => properties.add(name));
     proto = Object.getPrototypeOf(proto);
   }
diff --git a/packages/internal-test-helpers/lib/matchers.ts b/packages/internal-test-helpers/lib/matchers.ts
index e03330eb055..3faa71aa20e 100644
--- a/packages/internal-test-helpers/lib/matchers.ts
+++ b/packages/internal-test-helpers/lib/matchers.ts
@@ -12,7 +12,7 @@ function isMatcher(obj: unknown): obj is Matcher<unknown> {
   return typeof obj === 'object' && obj !== null && MATCHER_BRAND in obj;
 }
 
-function equalsAttr(expected: unknown) {
+function equalsAttr(expected: unknown): Matcher<unknown> {
   return {
     [MATCHER_BRAND]: true,
 
@@ -120,7 +120,7 @@ export function equalsElement(
     message: `expect tagName to be ${tagName}`,
   });
 
-  let expectedAttrs = {};
+  let expectedAttrs: Record<string, Matcher<unknown>> = {};
   let expectedCount = 0;
 
   for (let name in attributes) {
@@ -134,14 +134,14 @@ export function equalsElement(
     expectedAttrs[name] = matcher;
 
     assert.pushResult({
-      result: expectedAttrs[name].match(element.getAttribute(name)),
+      result: expectedAttrs[name]!.match(element.getAttribute(name)),
       actual: element.getAttribute(name),
       expected: matcher.expected(),
       message: `Element's ${name} attribute ${matcher.message()}`,
     });
   }
 
-  let actualAttributes = {};
+  let actualAttributes: Record<string, unknown> = {};
 
   for (let attribute of element.attributes) {
     actualAttributes[attribute.name] = attribute.value;
diff --git a/packages/internal-test-helpers/lib/module-for.ts b/packages/internal-test-helpers/lib/module-for.ts
index 7fe64a70e2e..e5cc9d05136 100644
--- a/packages/internal-test-helpers/lib/module-for.ts
+++ b/packages/internal-test-helpers/lib/module-for.ts
@@ -12,8 +12,8 @@ interface TestClass<T extends AbstractTestCase> {
   new (assert: QUnit['assert']): T;
 }
 
-interface TestContext {
-  instance: AbstractTestCase | null | undefined;
+interface TestContext<T extends AbstractTestCase> {
+  instance: T | null | undefined;
 }
 
 const ASSERT_DESTROYABLES = (() => {
@@ -50,7 +50,7 @@ export function setupTestClass<T extends AbstractTestCase, G extends Generator>(
   TestClass: TestClass<T>,
   ...mixins: Mixin<G>[]
 ) {
-  hooks.beforeEach(function (this: TestContext, assert: QUnit['assert']) {
+  hooks.beforeEach(function (this: TestContext<T>, assert: QUnit['assert']) {
     if (DEBUG && ASSERT_DESTROYABLES) {
       enableDestroyableTracking!();
     }
@@ -65,7 +65,7 @@ export function setupTestClass<T extends AbstractTestCase, G extends Generator>(
     }
   });
 
-  hooks.afterEach(function (this: TestContext) {
+  hooks.afterEach(function (this: TestContext<T>) {
     let promises = [];
     let instance = this.instance;
     this.instance = null;
@@ -98,8 +98,8 @@ export function setupTestClass<T extends AbstractTestCase, G extends Generator>(
     applyMixins(TestClass, ...mixins);
   }
 
-  let properties = getAllPropertyNames(TestClass);
-  properties.forEach(generateTest);
+  let properties = getAllPropertyNames<T>(TestClass);
+  properties.forEach((name) => generateTest<T>(name));
 
   function shouldTest(features: string[]) {
     return features.every((feature) => {
@@ -111,19 +111,19 @@ export function setupTestClass<T extends AbstractTestCase, G extends Generator>(
     });
   }
 
-  function generateTest(name: string) {
+  function generateTest<T extends AbstractTestCase>(name: keyof T & string) {
     if (name.indexOf('@test ') === 0) {
-      QUnit.test(name.slice(5), function (this: TestContext, assert) {
-        return this.instance![name](assert);
+      QUnit.test(name.slice(5), function (this: TestContext<T>, assert) {
+        return (this.instance![name] as any)(assert);
       });
     } else if (name.indexOf('@only ') === 0) {
       // eslint-disable-next-line qunit/no-only
-      QUnit.only(name.slice(5), function (this: TestContext, assert) {
-        return this.instance![name](assert);
+      QUnit.only(name.slice(5), function (this: TestContext<T>, assert) {
+        return (this.instance![name] as any)(assert);
       });
     } else if (name.indexOf('@skip ') === 0) {
-      QUnit.skip(name.slice(5), function (this: TestContext, assert) {
-        return this.instance![name](assert);
+      QUnit.skip(name.slice(5), function (this: TestContext<T>, assert) {
+        return (this.instance![name] as any)(assert);
       });
     } else {
       let match = /^@feature\(([A-Z_a-z-! ,]+)\) /.exec(name);
@@ -132,8 +132,8 @@ export function setupTestClass<T extends AbstractTestCase, G extends Generator>(
         let features = match[1]!.replace(/ /g, '').split(',');
 
         if (shouldTest(features)) {
-          QUnit.test(name.slice(match[0]!.length), function (this: TestContext, assert) {
-            return this.instance![name](assert);
+          QUnit.test(name.slice(match[0]!.length), function (this: TestContext<T>, assert) {
+            return (this.instance![name] as any)(assert);
           });
         }
       }
diff --git a/packages/internal-test-helpers/lib/node-query.ts b/packages/internal-test-helpers/lib/node-query.ts
index 54ad06f8d15..223a58e7330 100644
--- a/packages/internal-test-helpers/lib/node-query.ts
+++ b/packages/internal-test-helpers/lib/node-query.ts
@@ -24,12 +24,14 @@ export default class NodeQuery {
   nodes: Element[];
   length: number;
 
+  [index: number]: Element;
+
   constructor(nodes: Element[]) {
     assert('NodeQuery must be initialized with a literal array', Array.isArray(nodes));
     this.nodes = nodes;
 
     for (let i = 0; i < nodes.length; i++) {
-      this[i] = nodes[i];
+      this[i] = nodes[i]!;
     }
 
     this.length = nodes.length;
@@ -37,10 +39,13 @@ export default class NodeQuery {
     Object.freeze(this);
   }
 
-  find(selector: string | Element) {
+  find<K extends keyof HTMLElementTagNameMap>(selectors: K): HTMLElementTagNameMap[K] | null;
+  find<K extends keyof SVGElementTagNameMap>(selectors: K): SVGElementTagNameMap[K] | null;
+  find<E extends Element = Element>(selectors: string): E | null;
+  find(selector: string) {
     assertSingle(this);
 
-    return this[0].querySelector(selector);
+    return this[0]!.querySelector(selector);
   }
 
   findAll(selector: string): NodeQuery {
@@ -90,26 +95,28 @@ export default class NodeQuery {
   }
 
   prop(name: string): unknown;
-  prop(name: string, value: unknown): unknown;
-  prop(name: string, value?: unknown) {
+  prop(name: string, value: unknown): this;
+  prop(name: string, value?: unknown): this | unknown {
     if (arguments.length > 1) {
       return this.setProp(name, value);
     }
 
     assertSingle(this);
 
-    return this.nodes[0]![name];
+    // SAFETY: This is not safe. We don't know that the node accepts this key.
+    return (this.nodes[0] as any)[name];
   }
 
   setProp(name: string, value: unknown) {
-    this.nodes.forEach((node) => (node[name] = value));
+    // SAFETY: This is not safe. We don't know that the node accepts this key.
+    this.nodes.forEach((node) => ((node as any)[name] = value));
 
     return this;
   }
 
   val(): unknown;
-  val(value: unknown): unknown;
-  val(value?: unknown): unknown {
+  val(value: unknown): this;
+  val(value?: unknown): this | unknown {
     if (arguments.length === 1) {
       return this.setProp('value', value);
     }
diff --git a/tsconfig.json b/tsconfig.json
index 26e2e9dccf3..240bde985ab 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,7 +15,6 @@
     "strict": true,
     "noImplicitReturns": true,
     "allowUnreachableCode": false,
-    "suppressImplicitAnyIndexErrors": true,
     "noPropertyAccessFromIndexSignature": true,
     "noUnusedLocals": true,
     "noUncheckedIndexedAccess": true,

From 39179a9283328e48a771f02d7c56a09ceda04c74 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 18 Apr 2022 17:22:15 -0700
Subject: [PATCH 0976/1405] Rework PROPERTY_DID_CHANGE types

---
 .../-internals/glimmer/lib/component.ts       | 40 ++++++++++---------
 .../@ember/-internals/metal/lib/computed.ts   | 10 +++--
 .../-internals/metal/lib/property_events.ts   | 25 +++++++++---
 .../runtime/lib/system/array_proxy.d.ts       | 11 ++++-
 4 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 4d35e3af659..145a1794791 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,4 +1,5 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
+import { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
 import {
@@ -801,24 +802,27 @@ interface Component
     ViewMixin,
     ComponentMethods {}
 
-class Component extends CoreView.extend(
-  ChildViewsSupport,
-  ViewStateSupport,
-  ClassNamesSupport,
-  TargetActionSupport,
-  ActionSupport,
-  ViewMixin,
-  {
-    // These need to be overridable via extend/create but should still
-    // have a default. Defining them here is the best way to achieve that.
-    didReceiveAttrs() {},
-    didRender() {},
-    didUpdate() {},
-    didUpdateAttrs() {},
-    willRender() {},
-    willUpdate() {},
-  } as ComponentMethods
-) {
+class Component
+  extends CoreView.extend(
+    ChildViewsSupport,
+    ViewStateSupport,
+    ClassNamesSupport,
+    TargetActionSupport,
+    ActionSupport,
+    ViewMixin,
+    {
+      // These need to be overridable via extend/create but should still
+      // have a default. Defining them here is the best way to achieve that.
+      didReceiveAttrs() {},
+      didRender() {},
+      didUpdate() {},
+      didUpdateAttrs() {},
+      willRender() {},
+      willUpdate() {},
+    } as ComponentMethods
+  )
+  implements PropertyDidChange
+{
   isComponent = true;
 
   // SAFTEY: This is set in `init`.
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index e9e3c109f69..bfbb295f18a 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -33,7 +33,9 @@ import { addObserver, setObserverSuspended } from './observer';
 import {
   beginPropertyChanges,
   endPropertyChanges,
+  hasPropertyDidChange,
   notifyPropertyChange,
+  PropertyDidChange,
   PROPERTY_DID_CHANGE,
 } from './property_events';
 
@@ -460,15 +462,17 @@ export class ComputedProperty extends ComputedDescriptor {
       meta.isInitializing() &&
       this._dependentKeys !== undefined &&
       this._dependentKeys.length > 0 &&
-      // These two properties are set on Ember.Component
-      typeof (obj as any)[PROPERTY_DID_CHANGE] === 'function' &&
+      typeof (obj as PropertyDidChange)[PROPERTY_DID_CHANGE] === 'function' &&
       (obj as any).isComponent
     ) {
+      // It's redundant to do this here, but we don't want to check above so we can avoid an extra function call in prod.
+      assert('property did change hook is invalid', hasPropertyDidChange(obj));
+
       addObserver(
         obj,
         keyName,
         () => {
-          (obj as any)[PROPERTY_DID_CHANGE](keyName);
+          obj[PROPERTY_DID_CHANGE](keyName);
         },
         undefined,
         true
diff --git a/packages/@ember/-internals/metal/lib/property_events.ts b/packages/@ember/-internals/metal/lib/property_events.ts
index 753ba45466b..4c814958631 100644
--- a/packages/@ember/-internals/metal/lib/property_events.ts
+++ b/packages/@ember/-internals/metal/lib/property_events.ts
@@ -1,5 +1,5 @@
 import { Meta, peekMeta } from '@ember/-internals/meta';
-import { enumerableSymbol } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
 import {
   flushSyncObservers,
   resumeObserverDeactivation,
@@ -12,7 +12,19 @@ import { markObjectAsDirty } from './tags';
  @private
  */
 
-export const PROPERTY_DID_CHANGE = enumerableSymbol('PROPERTY_DID_CHANGE');
+export const PROPERTY_DID_CHANGE = Symbol('PROPERTY_DID_CHANGE');
+
+export interface PropertyDidChange {
+  [PROPERTY_DID_CHANGE]: (keyName: string, value?: unknown) => void;
+}
+
+export function hasPropertyDidChange(obj: unknown): obj is PropertyDidChange {
+  return (
+    obj != null &&
+    typeof obj === 'object' &&
+    typeof (obj as PropertyDidChange)[PROPERTY_DID_CHANGE] === 'function'
+  );
+}
 
 let deferred = 0;
 
@@ -53,13 +65,16 @@ function notifyPropertyChange(
   }
 
   if (PROPERTY_DID_CHANGE in obj) {
-    // we need to check the arguments length here; there's a check in `PROPERTY_DID_CHANGE`
+    // It's redundant to do this here, but we don't want to check above so we can avoid an extra function call in prod.
+    assert('property did change hook is invalid', hasPropertyDidChange(obj));
+
+    // we need to check the arguments length here; there's a check in Component's `PROPERTY_DID_CHANGE`
     // that checks its arguments length, so we have to explicitly not call this with `value`
     // if it is not passed to `notifyPropertyChange`
     if (arguments.length === 4) {
-      (obj as any)[PROPERTY_DID_CHANGE](keyName, value);
+      obj[PROPERTY_DID_CHANGE](keyName, value);
     } else {
-      (obj as any)[PROPERTY_DID_CHANGE](keyName);
+      obj[PROPERTY_DID_CHANGE](keyName);
     }
   }
 }
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
index bc164bc6813..512834480bc 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
@@ -1,3 +1,7 @@
+import {
+  PropertyDidChange,
+  PROPERTY_DID_CHANGE,
+} from '@ember/-internals/metal/lib/property_events';
 import EmberArray, { MutableArray } from '../mixins/array';
 import EmberObject from './object';
 
@@ -9,6 +13,11 @@ interface ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>> extends Mutable
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-declare class ArrayProxy<T, C extends EmberArray<T>> extends EmberObject {}
+declare class ArrayProxy<T, C extends EmberArray<T>>
+  extends EmberObject
+  implements PropertyDidChange
+{
+  [PROPERTY_DID_CHANGE](): void;
+}
 
 export { ArrayProxy as default };

From 7987f54f1fcb91628ddf3e572e6f78ed185ef933 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 20 Apr 2022 17:28:35 -0700
Subject: [PATCH 0977/1405] Add type utils

---
 .../-internals/glimmer/lib/helpers/action.ts  |  9 +--
 .../@ember/-internals/metal/lib/events.ts     |  5 +-
 packages/@ember/-internals/metal/lib/mixin.ts |  5 +-
 .../routing/lib/location/auto_location.ts     |  7 +--
 .../-internals/routing/lib/system/route.ts    |  7 ++-
 .../-internals/routing/lib/system/router.ts   |  9 +--
 .../-internals/runtime/lib/mixins/array.d.ts  |  5 +-
 packages/@ember/-internals/utils/types.ts     |  7 +++
 packages/@ember/debug/index.ts                |  3 +-
 packages/@ember/runloop/index.ts              | 56 ++++++++-----------
 10 files changed, 52 insertions(+), 61 deletions(-)
 create mode 100644 packages/@ember/-internals/utils/types.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index eec3995f2f3..47e950ac19f 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -2,6 +2,7 @@
 @module ember
 */
 import { get } from '@ember/-internals/metal';
+import { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
@@ -354,7 +355,7 @@ function makeArgsProcessor(valuePathRef: Reference | false, actionArgsRef: Refer
 function makeDynamicClosureAction(
   context: object,
   targetRef: Reference<MaybeActionHandler>,
-  actionRef: Reference<string | ((...args: any[]) => any)>,
+  actionRef: Reference<string | AnyFn>,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
@@ -381,18 +382,18 @@ function makeDynamicClosureAction(
 }
 
 interface MaybeActionHandler {
-  actions?: Record<string, (...args: any[]) => any>;
+  actions?: Record<string, AnyFn>;
 }
 
 function makeClosureAction(
   context: object,
   target: MaybeActionHandler,
-  action: string | ((...args: any[]) => any),
+  action: string | AnyFn,
   processArgs: (args: unknown[]) => unknown[],
   debugKey: string
 ) {
   let self: object;
-  let fn: (...args: any[]) => any;
+  let fn: AnyFn;
 
   assert(
     `Action passed is null or undefined in (action) from ${target}.`,
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index e5b4127cc1a..743b9864b60 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -3,6 +3,7 @@
 */
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { setListeners } from '@ember/-internals/utils';
+import { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 
 /*
@@ -203,9 +204,7 @@ export function hasListeners(obj: object, eventName: string): boolean {
   @return {Function} the listener function, passed as last argument to on(...)
   @public
 */
-export function on<T extends (...args: any[]) => any>(
-  ...args: [...eventNames: string[], func: T]
-): T {
+export function on<T extends AnyFn>(...args: [...eventNames: string[], func: T]): T {
   let func = args.pop();
   let events = args as string[];
 
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 9f1bfef976b..e6da7a0ae40 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -12,6 +12,7 @@ import {
   setObservers,
   wrap,
 } from '@ember/-internals/utils';
+import { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
@@ -763,7 +764,7 @@ function _keys(mixin: Mixin, ret = new Set(), seen = new Set()) {
 // OBSERVER HELPER
 //
 
-type ObserverDefinition<T extends (...args: any[]) => any> = {
+type ObserverDefinition<T extends AnyFn> = {
   dependentKeys: string[];
   fn: T;
   sync: boolean;
@@ -794,7 +795,7 @@ type ObserverDefinition<T extends (...args: any[]) => any> = {
   @public
   @static
 */
-export function observer<T extends (...args: any[]) => any>(
+export function observer<T extends AnyFn>(
   ...args:
     | [propertyName: string, ...additionalPropertyNames: string[], func: T]
     | [ObserverDefinition<T>]
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index bb43d0367c8..c496bb3e2f4 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -2,6 +2,7 @@ import { history, location, userAgent, window } from '@ember/-internals/browser-
 import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { Object as EmberObject } from '@ember/-internals/runtime';
+import { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import { EmberLocation, UpdateCallback } from './api';
 import {
@@ -219,12 +220,6 @@ AutoLocation.reopen({
   cancelRouterSetup: false,
 });
 
-type AnyFn = (...args: any[]) => any;
-
-type MethodNamesOf<T> = {
-  [K in keyof T]: T[K] extends AnyFn ? K : never;
-}[keyof T];
-
 function delegateToConcreteImplementation<N extends MethodNamesOf<Required<EmberLocation>>>(
   methodName: N
 ) {
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 9d1668154c7..d939aab8e76 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -21,6 +21,7 @@ import {
   typeOf,
 } from '@ember/-internals/runtime';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
+import { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
 import { ControllerQueryParamType } from '@ember/controller/lib/controller_mixin';
 import { assert, info, isTesting } from '@ember/debug';
@@ -71,8 +72,8 @@ type RouteTransitionState<R extends Route> = TransitionState<R> & {
   queryParamsFor?: Record<string, Record<string, unknown>>;
 };
 
-type MaybeParameters<T> = T extends (...args: any[]) => any ? Parameters<T> : unknown[];
-type MaybeReturnType<T> = T extends (...args: any[]) => any ? ReturnType<T> : unknown;
+type MaybeParameters<T> = T extends AnyFn ? Parameters<T> : unknown[];
+type MaybeReturnType<T> = T extends AnyFn ? ReturnType<T> : unknown;
 
 export const ROUTE_CONNECTIONS = new WeakMap();
 const RENDER = Symbol('render');
@@ -2015,7 +2016,7 @@ class Route<T = unknown>
   }
 
   // Set in reopen
-  declare actions: Record<string, (...args: any[]) => any>;
+  declare actions: Record<string, AnyFn>;
 
   /**
     Sends an action to the router, which will delegate it to the currently
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 93128a9f9a3..e1bc1257e00 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -48,14 +48,7 @@ import type { Timer } from 'backburner';
 import { EngineRouteInfo } from './engines';
 import EngineInstance from '@ember/engine/instance';
 import { QueryParams } from 'route-recognizer';
-
-type AnyFn = (...args: any[]) => any;
-
-type MethodNamesOf<T> = {
-  [K in keyof T]: T[K] extends AnyFn ? K : never;
-}[keyof T];
-
-type OmitFirst<F> = F extends [any, ...infer R] ? R : [];
+import { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
 
 function defaultDidTransition<R extends Route>(
   this: EmberRouter<R>,
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index c637c03e709..eb37e3e384a 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -1,4 +1,5 @@
 import { Mixin } from '@ember/-internals/metal';
+import { AnyFn } from '@ember/-internals/utils/types';
 import Enumerable from './enumerable';
 import MutableEnumerable from './mutable_enumerable';
 
@@ -55,8 +56,8 @@ interface EmberArray<T> extends Enumerable {
   ): V;
   invoke<K extends string>(
     methodName: K,
-    ...args: Value<T, K> extends (...args: any[]) => any ? Parameters<Value<T, K>> : unknown[]
-  ): NativeArray<Value<T, K> extends (...args: any[]) => any ? ReturnType<Value<T, K>> : unknown>;
+    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
+  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
   toArray(): T[];
   compact(): NativeArray<Exclude<T, null>>;
   includes(object: T, startAt?: number): boolean;
diff --git a/packages/@ember/-internals/utils/types.ts b/packages/@ember/-internals/utils/types.ts
new file mode 100644
index 00000000000..461c513d5dc
--- /dev/null
+++ b/packages/@ember/-internals/utils/types.ts
@@ -0,0 +1,7 @@
+export type AnyFn = (...args: any[]) => any;
+
+export type MethodNamesOf<T> = {
+  [K in keyof T]: T[K] extends AnyFn ? K : never;
+}[keyof T];
+
+export type OmitFirst<F> = F extends [any, ...infer R] ? R : [];
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index c03c097ffe8..4709047ca6a 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -1,4 +1,5 @@
 import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
+import { AnyFn } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
 import _deprecate, { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
@@ -243,7 +244,7 @@ if (DEBUG) {
   */
   setDebugFunction('deprecateFunc', function deprecateFunc(...args: any[]) {
     if (args.length === 3) {
-      let [message, options, func] = args as [string, DeprecationOptions, (...args: any[]) => any];
+      let [message, options, func] = args as [string, DeprecationOptions, AnyFn];
       return function (this: any, ...args: any[]) {
         deprecate(message, false, options);
         return func.apply(this, args);
diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts
index 6ba792f3ee5..c189f2dbdbf 100644
--- a/packages/@ember/runloop/index.ts
+++ b/packages/@ember/runloop/index.ts
@@ -2,6 +2,7 @@ import { assert } from '@ember/debug';
 import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
 import Backburner, { DeferredActionQueues, Timer } from 'backburner';
+import { AnyFn } from '@ember/-internals/utils/types';
 
 export { Timer };
 
@@ -129,10 +130,7 @@ export const _backburner = new Backburner(_queues, {
   @public
 */
 export function run<F extends () => any>(method: F): ReturnType<F>;
-export function run<F extends (...args: any[]) => any>(
-  method: F,
-  ...args: Parameters<F>
-): ReturnType<F>;
+export function run<F extends AnyFn>(method: F, ...args: Parameters<F>): ReturnType<F>;
 export function run<T, F extends (this: T, ...args: any[]) => any>(
   target: T,
   method: F,
@@ -141,8 +139,8 @@ export function run<T, F extends (this: T, ...args: any[]) => any>(
 export function run<T, U extends keyof T>(
   target: T,
   method: U,
-  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
-): T[U] extends (...args: any[]) => any ? ReturnType<T[U]> : unknown;
+  ...args: T[U] extends AnyFn ? Parameters<T[U]> : []
+): T[U] extends AnyFn ? ReturnType<T[U]> : unknown;
 export function run(...args: any[]): unknown {
   // @ts-expect-error TS doesn't like our spread args
   return _backburner.run(...args);
@@ -192,10 +190,7 @@ export function run(...args: any[]): unknown {
   when called within an existing loop, no return value is possible.
   @public
 */
-export function join<F extends (...args: any[]) => any>(
-  method: F,
-  ...args: Parameters<F>
-): ReturnType<F> | void;
+export function join<F extends AnyFn>(method: F, ...args: Parameters<F>): ReturnType<F> | void;
 export function join<T, F extends (this: T, ...args: any[]) => any>(
   target: T,
   method: F,
@@ -204,8 +199,8 @@ export function join<T, F extends (this: T, ...args: any[]) => any>(
 export function join<T, U extends keyof T>(
   target: T,
   method: U,
-  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
-): T[U] extends (...args: any[]) => any ? ReturnType<T[U]> | void : void;
+  ...args: T[U] extends AnyFn ? Parameters<T[U]> : []
+): T[U] extends AnyFn ? ReturnType<T[U]> | void : void;
 export function join(methodOrTarget: any, methodOrArg?: any, ...additionalArgs: any[]): any {
   return _backburner.join(methodOrTarget, methodOrArg, ...additionalArgs);
 }
@@ -281,19 +276,19 @@ export function bind<
   method: F,
   ...args: A
 ): (...args: RemainingParams<A, Parameters<F>>) => ReturnType<F> | void;
-export function bind<F extends (...args: any[]) => any, A extends PartialParams<Parameters<F>>>(
+export function bind<F extends AnyFn, A extends PartialParams<Parameters<F>>>(
   method: F,
   ...args: A
 ): (...args: RemainingParams<A, Parameters<F>>) => ReturnType<F> | void;
 export function bind<
   T,
   U extends keyof T,
-  A extends T[U] extends (...args: any[]) => any ? PartialParams<Parameters<T[U]>> : []
+  A extends T[U] extends AnyFn ? PartialParams<Parameters<T[U]>> : []
 >(
   target: T,
   method: U,
   ...args: A
-): T[U] extends (...args: any[]) => any
+): T[U] extends AnyFn
   ? (...args: RemainingParams<A, Parameters<T[U]>>) => ReturnType<T[U]> | void
   : never;
 export function bind(...curried: any[]): any {
@@ -411,7 +406,7 @@ export function end() {
   @return {*} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function schedule<F extends (...args: any[]) => any>(
+export function schedule<F extends AnyFn>(
   queueName: string,
   method: F,
   ...args: Parameters<F>
@@ -426,7 +421,7 @@ export function schedule<T, U extends keyof T>(
   queueName: string,
   target: T,
   method: U,
-  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+  ...args: T[U] extends AnyFn ? Parameters<T[U]> : []
 ): Timer;
 export function schedule(...args: any[]): Timer {
   // @ts-expect-error TS doesn't like the rest args here
@@ -478,17 +473,14 @@ export function later<T, F extends (this: T, ...args: any[]) => any>(
   method: F,
   ...args: [...args: Parameters<F>, wait: string | number]
 ): Timer;
-export function later<F extends (...args: any[]) => any>(
+export function later<F extends AnyFn>(
   method: F,
   ...args: [...args: Parameters<F>, wait: string | number]
 ): Timer;
 export function later<T, U extends keyof T>(
   target: T,
   method: U,
-  ...args: [
-    ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : [],
-    wait: string | number
-  ]
+  ...args: [...args: T[U] extends AnyFn ? Parameters<T[U]> : [], wait: string | number]
 ): Timer;
 export function later(...args: any): Timer {
   return _backburner.later(...args);
@@ -509,7 +501,7 @@ export function later(...args: any): Timer {
   @return {Object} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function once<F extends (...args: any[]) => any>(method: F, ...args: Parameters<F>): Timer;
+export function once<F extends AnyFn>(method: F, ...args: Parameters<F>): Timer;
 export function once<T, F extends (this: T, ...args: any[]) => any>(
   target: T,
   method: F,
@@ -518,7 +510,7 @@ export function once<T, F extends (this: T, ...args: any[]) => any>(
 export function once<T, U extends keyof T>(
   target: T,
   method: U,
-  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+  ...args: T[U] extends AnyFn ? Parameters<T[U]> : []
 ): Timer;
 export function once(...args: any[]): Timer {
   // @ts-expect-error TS doesn't like the rest args here
@@ -597,7 +589,7 @@ export function once(...args: any[]): Timer {
   @return {Object} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function scheduleOnce<F extends (...args: any[]) => any>(
+export function scheduleOnce<F extends AnyFn>(
   queueName: string,
   method: F,
   ...args: Parameters<F>
@@ -612,7 +604,7 @@ export function scheduleOnce<T, U extends keyof T>(
   queueName: string,
   target: T,
   method: U,
-  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+  ...args: T[U] extends AnyFn ? Parameters<T[U]> : []
 ): Timer;
 export function scheduleOnce(...args: any[]): Timer {
   // @ts-expect-error TS doesn't like the rest args here
@@ -689,7 +681,7 @@ export function scheduleOnce(...args: any[]): Timer {
   @return {Object} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function next<F extends (...args: any[]) => any>(method: F, ...args: Parameters<F>): Timer;
+export function next<F extends AnyFn>(method: F, ...args: Parameters<F>): Timer;
 export function next<T, F extends (this: T, ...args: any[]) => any>(
   target: T,
   method: F,
@@ -698,7 +690,7 @@ export function next<T, F extends (this: T, ...args: any[]) => any>(
 export function next<T, U extends keyof T>(
   target: T,
   method: U,
-  ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : []
+  ...args: T[U] extends AnyFn ? Parameters<T[U]> : []
 ): Timer;
 export function next(...args: any[]) {
   return _backburner.later(...args, 1);
@@ -849,7 +841,7 @@ export function cancel(timer: Timer): boolean {
   @return {Array} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function debounce<F extends (...args: any[]) => any>(
+export function debounce<F extends AnyFn>(
   method: F,
   ...args: [...args: Parameters<F>, wait: string | number, immediate?: boolean]
 ): Timer;
@@ -862,7 +854,7 @@ export function debounce<T, U extends keyof T>(
   target: T,
   method: U,
   ...args: [
-    ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : [],
+    ...args: T[U] extends AnyFn ? Parameters<T[U]> : [],
     wait: string | number,
     immediate?: boolean
   ]
@@ -915,7 +907,7 @@ export function debounce(...args: any[]) {
   @return {Array} Timer information for use in canceling, see `cancel`.
   @public
 */
-export function throttle<F extends (...args: any[]) => any>(
+export function throttle<F extends AnyFn>(
   method: F,
   ...args: [...args: Parameters<F>, wait?: string | number, immediate?: boolean]
 ): Timer;
@@ -928,7 +920,7 @@ export function throttle<T, U extends keyof T>(
   target: T,
   method: U,
   ...args: [
-    ...args: T[U] extends (...args: any[]) => any ? Parameters<T[U]> : [],
+    ...args: T[U] extends AnyFn ? Parameters<T[U]> : [],
     wait?: string | number,
     immediate?: boolean
   ]

From e0eb44fc655d2f37078b1924c54c14a619efd8b3 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 20 Apr 2022 19:04:59 -0600
Subject: [PATCH 0978/1405] Eliminate an unnecessary cast in resolver.ts

---
 packages/@ember/-internals/glimmer/lib/resolver.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ee02408a79b..f29615e81eb 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -103,7 +103,7 @@ function lookupComponentPair(
   }
 }
 
-const BUILTIN_KEYWORD_HELPERS = {
+const BUILTIN_KEYWORD_HELPERS: Record<string, object> = {
   action,
   mut,
   readonly,
@@ -145,7 +145,7 @@ if (EMBER_UNIQUE_ID_HELPER) {
   BUILTIN_HELPERS['unique-id'] = uniqueId;
 }
 
-const BUILTIN_KEYWORD_MODIFIERS = {
+const BUILTIN_KEYWORD_MODIFIERS: Record<string, ModifierDefinitionState> = {
   action: actionModifier,
 };
 
@@ -209,7 +209,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
   }
 
   lookupBuiltInHelper(name: string): HelperDefinitionState | null {
-    return (BUILTIN_KEYWORD_HELPERS as Record<string, object>)[name] ?? null;
+    return BUILTIN_KEYWORD_HELPERS[name] ?? null;
   }
 
   lookupModifier(name: string, owner: Owner): Option<ModifierDefinitionState> {
@@ -233,7 +233,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
   ): typeof BUILTIN_KEYWORD_MODIFIERS[K];
   lookupBuiltInModifier(name: string): null;
   lookupBuiltInModifier(name: string): ModifierDefinitionState | null {
-    return (BUILTIN_KEYWORD_MODIFIERS as Record<string, ModifierDefinitionState>)[name] ?? null;
+    return BUILTIN_KEYWORD_MODIFIERS[name] ?? null;
   }
 
   lookupComponent(name: string, owner: Owner): ResolvedComponentDefinition | null {

From c1899649562385b1de31642eebcf435fc9aa10ad Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol.pieropan@gmail.com>
Date: Mon, 25 Apr 2022 21:57:05 +0200
Subject: [PATCH 0979/1405] [DOC] Fixing typo in Changelo

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13ac3d535d1..10c448a5037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Ember Changelo
+# Ember Changelog
 
 ## v3.28.9 (April 19, 2022)
 

From 6f9b337d2b477c8aaddae424bf0e5eaec5b579b6 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 19 Apr 2022 14:11:48 -0700
Subject: [PATCH 0980/1405] Convert miscellaneous internals to TS

---
 .../-internals/metal/lib/get_properties.ts    |   5 +-
 .../-internals/runtime/lib/mixins/-proxy.d.ts |  28 ----
 .../lib/mixins/{-proxy.js => -proxy.ts}       |  54 ++++++--
 .../runtime/lib/mixins/action_handler.d.ts    |   9 --
 .../{action_handler.js => action_handler.ts}  |   6 +-
 .../runtime/lib/mixins/comparable.d.ts        |   8 --
 .../mixins/{comparable.js => comparable.ts}   |   7 +-
 .../runtime/lib/mixins/container_proxy.d.ts   |  18 ---
 ...{container_proxy.js => container_proxy.ts} |  25 +++-
 .../runtime/lib/mixins/enumerable.d.ts        |   7 -
 .../mixins/{enumerable.js => enumerable.ts}   |   6 +-
 .../runtime/lib/mixins/evented.d.ts           |  49 -------
 .../lib/mixins/{evented.js => evented.ts}     |  55 +++++++-
 .../lib/mixins/mutable_enumerable.d.ts        |   8 --
 ...le_enumerable.js => mutable_enumerable.ts} |   6 +-
 .../runtime/lib/mixins/observable.d.ts        |  90 -------------
 .../mixins/{observable.js => observable.ts}   | 126 +++++++++++++++---
 .../runtime/lib/mixins/promise_proxy.d.ts     |  24 ----
 .../{promise_proxy.js => promise_proxy.ts}    |  47 +++++--
 .../runtime/lib/mixins/registry_proxy.d.ts    |  35 -----
 .../{registry_proxy.js => registry_proxy.ts}  |  60 ++++++++-
 .../lib/mixins/target_action_support.d.ts     |  12 --
 ...on_support.js => target_action_support.ts} |  32 ++++-
 .../views/lib/compat/{attrs.js => attrs.ts}   |   0
 ...-registry.js => fallback-view-registry.ts} |   0
 ...omponent_lookup.js => component_lookup.ts} |   7 +-
 26 files changed, 369 insertions(+), 355 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{-proxy.js => -proxy.ts} (54%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{action_handler.js => action_handler.ts} (96%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{comparable.js => comparable.ts} (85%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{container_proxy.js => container_proxy.ts} (83%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{enumerable.js => enumerable.ts} (70%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{evented.js => evented.ts} (69%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{mutable_enumerable.js => mutable_enumerable.ts} (66%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{observable.js => observable.ts} (81%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{promise_proxy.js => promise_proxy.ts} (76%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{registry_proxy.js => registry_proxy.ts} (80%)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{target_action_support.js => target_action_support.ts} (81%)
 rename packages/@ember/-internals/views/lib/compat/{attrs.js => attrs.ts} (100%)
 rename packages/@ember/-internals/views/lib/compat/{fallback-view-registry.js => fallback-view-registry.ts} (100%)
 rename packages/@ember/-internals/views/lib/{component_lookup.js => component_lookup.ts} (56%)

diff --git a/packages/@ember/-internals/metal/lib/get_properties.ts b/packages/@ember/-internals/metal/lib/get_properties.ts
index c2df72b0924..c2b54ca0c36 100644
--- a/packages/@ember/-internals/metal/lib/get_properties.ts
+++ b/packages/@ember/-internals/metal/lib/get_properties.ts
@@ -33,7 +33,10 @@ import { get } from './property_get';
 */
 function getProperties<L extends string[]>(obj: unknown, list: L): Record<L[number], unknown>;
 function getProperties<L extends string[]>(obj: unknown, ...list: L): Record<L[number], unknown>;
-function getProperties<L extends string[]>(obj: unknown, keys?: L): Record<L[number], unknown> {
+function getProperties<L extends string[]>(
+  obj: unknown,
+  keys?: L | [L]
+): Record<L[number], unknown> {
   let ret = {} as Record<L[number], unknown>;
   let propertyNames: string[];
   let i = 1;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts
deleted file mode 100644
index bc3b5a0944f..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-export function contentFor<T>(proxy: ProxyMixin<T>): T | null;
-
-interface ProxyMixin<T = unknown> {
-  /**
-    The object whose properties will be forwarded.
-
-    @property content
-    @type {unknown}
-    @default null
-    @public
-  */
-  content: T | null;
-
-  willDestroy(): void;
-
-  isTruthy: boolean;
-
-  unknownProperty<K extends keyof T>(key: K): T[K] | undefined;
-  unknownProperty(key: string): unknown;
-
-  setUnknownProperty<K extends keyof T>(key: K, value: T[K]): T[K];
-  setUnknownProperty<V>(key: string, value: V): V;
-}
-declare const ProxyMixin: Mixin;
-
-export default ProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
similarity index 54%
rename from packages/@ember/-internals/runtime/lib/mixins/-proxy.js
rename to packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
index 6b8c070ccbc..7357ce3ec48 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
@@ -12,35 +12,42 @@ import {
   computed,
   tagForProperty,
 } from '@ember/-internals/metal';
-import { setProxy, setupMandatorySetter, isObject } from '@ember/-internals/utils';
+import { setProxy, setupMandatorySetter, isObject, isProxy } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { setCustomTagFor } from '@glimmer/manager';
-import { combine, updateTag, tagFor, tagMetaFor } from '@glimmer/validator';
+import { combine, updateTag, tagFor, tagMetaFor, UpdatableTag, Tag } from '@glimmer/validator';
 
-export function contentFor(proxy) {
+export function contentFor<T>(proxy: ProxyMixin<T>): T | null {
   let content = get(proxy, 'content');
-  updateTag(tagForObject(proxy), tagForObject(content));
+  // SAFETY: Ideally we'd assert instead of casting, but @glimmer/validator doesn't give us
+  // sufficient public types for this. Previously this code was .js and worked correctly so
+  // hopefully this is sufficiently reliable.
+  updateTag(tagForObject(proxy) as UpdatableTag, tagForObject(content));
   return content;
 }
 
-function customTagForProxy(proxy, key, addMandatorySetter) {
+function customTagForProxy(proxy: object, key: string, addMandatorySetter?: boolean): Tag {
+  assert('Expected a proxy', isProxy(proxy));
+
   let meta = tagMetaFor(proxy);
   let tag = tagFor(proxy, key, meta);
 
   if (DEBUG) {
     // TODO: Replace this with something more first class for tracking tags in DEBUG
-    tag._propertyKey = key;
+    // SAFETY: This is not an officially supported property but setting shouldn't cause issues.
+    (tag as any)._propertyKey = key;
   }
 
   if (key in proxy) {
     if (DEBUG && addMandatorySetter) {
+      assert('[BUG] setupMandatorySetter should be set when debugging', setupMandatorySetter);
       setupMandatorySetter(tag, proxy, key);
     }
 
     return tag;
   } else {
-    let tags = [tag, tagFor(proxy, 'content', meta)];
+    let tags: Tag[] = [tag, tagFor(proxy, 'content', meta)];
 
     let content = contentFor(proxy);
 
@@ -60,7 +67,29 @@ function customTagForProxy(proxy, key, addMandatorySetter) {
   @namespace Ember
   @private
 */
-export default Mixin.create({
+interface ProxyMixin<T = unknown> {
+  /**
+    The object whose properties will be forwarded.
+
+    @property content
+    @type {unknown}
+    @default null
+    @public
+  */
+  content: T | null;
+
+  willDestroy(): void;
+
+  isTruthy: boolean;
+
+  unknownProperty<K extends keyof T>(key: K): T[K] | undefined;
+  unknownProperty(key: string): unknown;
+
+  setUnknownProperty<K extends keyof T>(key: K, value: T[K]): T[K];
+  setUnknownProperty<V>(key: string, value: V): V;
+}
+
+const ProxyMixin = Mixin.create({
   /**
     The object whose properties will be forwarded.
 
@@ -87,14 +116,14 @@ export default Mixin.create({
     return Boolean(get(this, 'content'));
   }),
 
-  unknownProperty(key) {
+  unknownProperty(key: string) {
     let content = contentFor(this);
     if (content) {
       return get(content, key);
     }
   },
 
-  setUnknownProperty(key, value) {
+  setUnknownProperty(key: string, value: unknown) {
     let m = meta(this);
 
     if (m.isInitializing() || m.isPrototypeMeta(this)) {
@@ -111,6 +140,9 @@ export default Mixin.create({
       content
     );
 
-    return set(content, key, value);
+    // SAFETY: We don't actually guarantee that this is an object, so this isn't necessarily safe :(
+    return set(content as object, key, value);
   },
 });
+
+export default ProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
deleted file mode 100644
index c917912e49e..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-interface ActionHandler {
-  actions?: Record<string, (...args: any[]) => unknown>;
-  send(actionName: string, ...args: unknown[]): void;
-}
-declare const ActionHandler: Mixin;
-
-export default ActionHandler;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.js b/packages/@ember/-internals/runtime/lib/mixins/action_handler.ts
similarity index 96%
rename from packages/@ember/-internals/runtime/lib/mixins/action_handler.js
rename to packages/@ember/-internals/runtime/lib/mixins/action_handler.ts
index 47fcff713ae..5f071c26e53 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.ts
@@ -16,6 +16,10 @@ import { assert } from '@ember/debug';
   @namespace Ember
   @private
 */
+interface ActionHandler {
+  actions?: Record<string, (...args: any[]) => unknown>;
+  send(actionName: string, ...args: unknown[]): void;
+}
 const ActionHandler = Mixin.create({
   mergedProperties: ['actions'],
 
@@ -196,7 +200,7 @@ const ActionHandler = Mixin.create({
     @param {*} context a context to send with the action
     @public
   */
-  send(actionName, ...args) {
+  send(actionName: string, ...args: any[]) {
     assert(
       `Attempted to call .send() with the action '${actionName}' on the destroyed object '${this}'.`,
       !this.isDestroying && !this.isDestroyed
diff --git a/packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts
deleted file mode 100644
index 6cb017e9802..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/comparable.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-interface Comparable {
-  compare: ((a: unknown, b: unknown) => -1 | 0 | 1) | null;
-}
-declare const Comparable: Mixin;
-
-export default Comparable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/comparable.js b/packages/@ember/-internals/runtime/lib/mixins/comparable.ts
similarity index 85%
rename from packages/@ember/-internals/runtime/lib/mixins/comparable.js
rename to packages/@ember/-internals/runtime/lib/mixins/comparable.ts
index de7dc8eb5f1..38320f926f3 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/comparable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/comparable.ts
@@ -15,7 +15,10 @@ import { Mixin } from '@ember/-internals/metal';
   @since Ember 0.9
   @private
 */
-export default Mixin.create({
+interface Comparable {
+  compare: ((a: unknown, b: unknown) => -1 | 0 | 1) | null;
+}
+const Comparable = Mixin.create({
   /**
     __Required.__ You must implement this method to apply this mixin.
 
@@ -36,3 +39,5 @@ export default Mixin.create({
   */
   compare: null,
 });
+
+export default Comparable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
deleted file mode 100644
index f62f30bcc2a..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Container, { FactoryManager } from '@ember/-internals/container/lib/container';
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
-import { Mixin } from '@ember/-internals/metal';
-import { Factory } from '@ember/-internals/owner';
-
-export interface IContainer {
-  ownerInjection(): void;
-  lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined;
-  factoryFor(fullName: string): FactoryManager<object> | undefined;
-}
-
-interface ContainerProxyMixin extends IContainer {
-  /** @internal */
-  __container__: Container;
-}
-declare const ContainerProxyMixin: Mixin;
-
-export default ContainerProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
similarity index 83%
rename from packages/@ember/-internals/runtime/lib/mixins/container_proxy.js
rename to packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 0c29413c805..64e257cde89 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -2,7 +2,16 @@ import { schedule, join } from '@ember/runloop';
 /**
 @module ember
 */
+import Container, { FactoryManager } from '@ember/-internals/container/lib/container';
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
+import { Factory } from '@ember/-internals/owner';
+
+export interface IContainer {
+  ownerInjection(): void;
+  lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined;
+  factoryFor(fullName: string): FactoryManager<object> | undefined;
+}
 
 /**
   ContainerProxyMixin is used to provide public access to specific
@@ -11,7 +20,11 @@ import { Mixin } from '@ember/-internals/metal';
   @class ContainerProxyMixin
   @private
 */
-let containerProxyMixin = {
+interface ContainerProxyMixin extends IContainer {
+  /** @internal */
+  __container__: Container;
+}
+const ContainerProxyMixin = Mixin.create({
   /**
    The container stores state.
 
@@ -90,7 +103,7 @@ let containerProxyMixin = {
    @param {Object} options
    @return {any}
    */
-  lookup(fullName, options) {
+  lookup(fullName: string, options: object) {
     return this.__container__.lookup(fullName, options);
   },
 
@@ -150,9 +163,9 @@ let containerProxyMixin = {
   @param {Object} options
   @return {FactoryManager}
   */
-  factoryFor(fullName, options = {}) {
-    return this.__container__.factoryFor(fullName, options);
+  factoryFor(fullName: string) {
+    return this.__container__.factoryFor(fullName);
   },
-};
+});
 
-export default Mixin.create(containerProxyMixin);
+export default ContainerProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts
deleted file mode 100644
index f72ec8e1c1d..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/enumerable.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface Enumerable {}
-declare const Enumerable: Mixin;
-
-export default Enumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/enumerable.js b/packages/@ember/-internals/runtime/lib/mixins/enumerable.ts
similarity index 70%
rename from packages/@ember/-internals/runtime/lib/mixins/enumerable.js
rename to packages/@ember/-internals/runtime/lib/mixins/enumerable.ts
index 2cea5cd037a..f300411cbe2 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/enumerable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/enumerable.ts
@@ -13,4 +13,8 @@ import { Mixin } from '@ember/-internals/metal';
   @class Enumerable
   @private
 */
-export default Mixin.create();
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Enumerable {}
+const Enumerable = Mixin.create();
+
+export default Enumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts b/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
deleted file mode 100644
index 5d0bb160322..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/evented.d.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-/**
- * This mixin allows for Ember objects to subscribe to and emit events.
- */
-interface Evented {
-  /**
-   * Subscribes to a named event with given function.
-   */
-  on<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  on(name: string, method: ((...args: any[]) => void) | string): this;
-  /**
-   * Subscribes a function to a named event and then cancels the subscription
-   * after the first time the event is triggered. It is good to use ``one`` when
-   * you only care about the first time an event has taken place.
-   */
-  one<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  one(name: string, method: string | ((...args: any[]) => void)): this;
-  /**
-   * Triggers a named event for the object. Any additional arguments
-   * will be passed as parameters to the functions that are subscribed to the
-   * event.
-   */
-  trigger(name: string, ...args: any[]): any;
-  /**
-   * Cancels subscription for given name, target, and method.
-   */
-  off<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  off(name: string, method: string | ((...args: any[]) => void)): this;
-  /**
-   * Checks to see if object has any subscriptions for named event.
-   */
-  has(name: string): boolean;
-}
-
-declare const Evented: Mixin;
-export default Evented;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/evented.js b/packages/@ember/-internals/runtime/lib/mixins/evented.ts
similarity index 69%
rename from packages/@ember/-internals/runtime/lib/mixins/evented.js
rename to packages/@ember/-internals/runtime/lib/mixins/evented.ts
index 978c5516265..40657b3f279 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/evented.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/evented.ts
@@ -50,7 +50,48 @@ import {
   @class Evented
   @public
  */
-export default Mixin.create({
+interface Evented {
+  /**
+   * Subscribes to a named event with given function.
+   */
+  on<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  on(name: string, method: ((...args: any[]) => void) | string): this;
+  /**
+   * Subscribes a function to a named event and then cancels the subscription
+   * after the first time the event is triggered. It is good to use ``one`` when
+   * you only care about the first time an event has taken place.
+   */
+  one<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  one(name: string, method: string | ((...args: any[]) => void)): this;
+  /**
+   * Triggers a named event for the object. Any additional arguments
+   * will be passed as parameters to the functions that are subscribed to the
+   * event.
+   */
+  trigger(name: string, ...args: any[]): any;
+  /**
+   * Cancels subscription for given name, target, and method.
+   */
+  off<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  off(name: string, method: string | ((...args: any[]) => void)): this;
+  /**
+   * Checks to see if object has any subscriptions for named event.
+   */
+  has(name: string): boolean;
+}
+const Evented = Mixin.create({
   /**
     Subscribes to a named event with given function.
 
@@ -72,7 +113,7 @@ export default Mixin.create({
     @return this
     @public
   */
-  on(name, target, method) {
+  on(name: string, target: object, method?: string | Function) {
     addListener(this, name, target, method);
     return this;
   },
@@ -93,7 +134,7 @@ export default Mixin.create({
     @return this
     @public
   */
-  one(name, target, method) {
+  one(name: string, target: object, method?: string | Function) {
     addListener(this, name, target, method, true);
     return this;
   },
@@ -117,7 +158,7 @@ export default Mixin.create({
     @param {Object...} args Optional arguments to pass on
     @public
   */
-  trigger(name, ...args) {
+  trigger(name: string, ...args: any[]) {
     sendEvent(this, name, args);
   },
 
@@ -131,7 +172,7 @@ export default Mixin.create({
     @return this
     @public
   */
-  off(name, target, method) {
+  off(name: string, target: object, method?: string | Function) {
     removeListener(this, name, target, method);
     return this;
   },
@@ -144,7 +185,9 @@ export default Mixin.create({
     @return {Boolean} does the object have a subscription for event
     @public
    */
-  has(name) {
+  has(name: string) {
     return hasListeners(this, name);
   },
 });
+
+export default Evented;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts
deleted file mode 100644
index 12a7d5a4db4..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-import Enumerable from './enumerable';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface MutableEnumerable extends Enumerable {}
-declare const MutableEnumerable: Mixin;
-
-export default MutableEnumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.js b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
similarity index 66%
rename from packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.js
rename to packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
index c549687d5ba..39136466eef 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
@@ -15,4 +15,8 @@ import { Mixin } from '@ember/-internals/metal';
   @uses Enumerable
   @private
 */
-export default Mixin.create(Enumerable);
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface MutableEnumerable extends Enumerable {}
+const MutableEnumerable = Mixin.create(Enumerable);
+
+export default MutableEnumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts b/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
deleted file mode 100644
index 6b4825a9e6c..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-export type ObserverMethod<Target, Sender> =
-  | keyof Target
-  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
-
-/**
- * This mixin provides properties and property observing functionality, core features of the Ember object model.
- */
-interface Observable {
-  /**
-   * Retrieves the value of a property from the object.
-   */
-  get(key: string): unknown;
-
-  /**
-   * To get the values of multiple properties at once, call `getProperties`
-   * with a list of strings or an array:
-   */
-  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
-  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
-
-  // NOT TYPE SAFE!
-  /**
-   * Sets the provided key or path to the value.
-   */
-  set<T>(key: string, value: T): T;
-
-  // NOT TYPE SAFE!
-  /**
-   * Sets a list of properties at once. These properties are set inside
-   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
-   * observers will be buffered.
-   */
-  setProperties<T extends Record<string, any>>(hash: T): T;
-
-  /**
-   * Convenience method to call `propertyWillChange` and `propertyDidChange` in
-   * succession.
-   */
-  notifyPropertyChange(keyName: string): this;
-
-  /**
-   * Adds an observer on a property.
-   */
-  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
-  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-
-  /**
-   * Remove an observer you have previously registered on this object. Pass
-   * the same key, target, and method you passed to `addObserver()` and your
-   * target will no longer receive notifications.
-   */
-  removeObserver<Target>(
-    key: keyof this,
-    target: Target,
-    method: ObserverMethod<Target, this>
-  ): this;
-  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-
-  // NOT TYPE SAFE!
-  /**
-   * Set the value of a property to the current value plus some amount.
-   */
-  incrementProperty(keyName: keyof this, increment?: number): number;
-
-  // NOT TYPE SAFE!
-  /**
-   * Set the value of a property to the current value minus some amount.
-   */
-  decrementProperty(keyName: keyof this, decrement?: number): number;
-
-  // NOT TYPE SAFE!
-  /**
-   * Set the value of a boolean property to the opposite of its
-   * current value.
-   */
-  toggleProperty(keyName: keyof this): boolean;
-
-  /**
-   * Returns the cached value of a computed property, if it exists.
-   * This allows you to inspect the value of a computed property
-   * without accidentally invoking it if it is intended to be
-   * generated lazily.
-   */
-  cacheFor<K extends keyof this>(key: K): unknown;
-}
-
-declare const Observable: Mixin;
-export default Observable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.js b/packages/@ember/-internals/runtime/lib/mixins/observable.ts
similarity index 81%
rename from packages/@ember/-internals/runtime/lib/mixins/observable.js
rename to packages/@ember/-internals/runtime/lib/mixins/observable.ts
index c32cedc4cb1..6f53f31de9e 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/observable.ts
@@ -18,6 +18,10 @@ import {
 } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 
+export type ObserverMethod<Target, Sender> =
+  | keyof Target
+  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
+
 /**
   ## Overview
 
@@ -88,7 +92,85 @@ import { assert } from '@ember/debug';
   @class Observable
   @public
 */
-export default Mixin.create({
+interface Observable {
+  /**
+   * Retrieves the value of a property from the object.
+   */
+  get(key: string): unknown;
+
+  /**
+   * To get the values of multiple properties at once, call `getProperties`
+   * with a list of strings or an array:
+   */
+  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
+  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
+
+  // NOT TYPE SAFE!
+  /**
+   * Sets the provided key or path to the value.
+   */
+  set<T>(key: string, value: T): T;
+
+  // NOT TYPE SAFE!
+  /**
+   * Sets a list of properties at once. These properties are set inside
+   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+   * observers will be buffered.
+   */
+  setProperties<T extends Record<string, any>>(hash: T): T;
+
+  /**
+   * Convenience method to call `propertyWillChange` and `propertyDidChange` in
+   * succession.
+   */
+  notifyPropertyChange(keyName: string): this;
+
+  /**
+   * Adds an observer on a property.
+   */
+  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
+  /**
+   * Remove an observer you have previously registered on this object. Pass
+   * the same key, target, and method you passed to `addObserver()` and your
+   * target will no longer receive notifications.
+   */
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method: ObserverMethod<Target, this>
+  ): this;
+  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
+  // NOT TYPE SAFE!
+  /**
+   * Set the value of a property to the current value plus some amount.
+   */
+  incrementProperty(keyName: keyof this, increment?: number): number;
+
+  // NOT TYPE SAFE!
+  /**
+   * Set the value of a property to the current value minus some amount.
+   */
+  decrementProperty(keyName: keyof this, decrement?: number): number;
+
+  // NOT TYPE SAFE!
+  /**
+   * Set the value of a boolean property to the opposite of its
+   * current value.
+   */
+  toggleProperty(keyName: keyof this): boolean;
+
+  /**
+   * Returns the cached value of a computed property, if it exists.
+   * This allows you to inspect the value of a computed property
+   * without accidentally invoking it if it is intended to be
+   * generated lazily.
+   */
+  cacheFor<K extends keyof this>(key: K): unknown;
+}
+const Observable = Mixin.create({
   /**
     Retrieves the value of a property from the object.
 
@@ -130,7 +212,7 @@ export default Mixin.create({
     @return {Object} The property value or undefined.
     @public
   */
-  get(keyName) {
+  get(keyName: string) {
     return get(this, keyName);
   },
 
@@ -155,8 +237,8 @@ export default Mixin.create({
     @return {Object}
     @public
   */
-  getProperties(...args) {
-    return getProperties(...[this].concat(args));
+  getProperties(...args: string[]) {
+    return getProperties(this, ...args);
   },
 
   /**
@@ -203,7 +285,7 @@ export default Mixin.create({
     @return {Object} The passed value
     @public
   */
-  set(keyName, value) {
+  set(keyName: string, value: unknown) {
     return set(this, keyName, value);
   },
 
@@ -221,7 +303,7 @@ export default Mixin.create({
     @return {Object} The passed in hash
     @public
   */
-  setProperties(hash) {
+  setProperties(hash: object) {
     return setProperties(this, hash);
   },
 
@@ -277,7 +359,7 @@ export default Mixin.create({
     @return {Observable}
     @public
   */
-  notifyPropertyChange(keyName) {
+  notifyPropertyChange(keyName: string) {
     notifyPropertyChange(this, keyName);
     return this;
   },
@@ -365,7 +447,12 @@ export default Mixin.create({
     @return {Observable}
     @public
   */
-  addObserver(key, target, method, sync) {
+  addObserver(
+    key: string,
+    target: object | Function | null,
+    method?: string | Function,
+    sync?: boolean
+  ) {
     addObserver(this, key, target, method, sync);
     return this;
   },
@@ -383,7 +470,12 @@ export default Mixin.create({
     @return {Observable}
     @public
   */
-  removeObserver(key, target, method, sync) {
+  removeObserver(
+    key: string,
+    target: object | Function | null,
+    method?: string | Function,
+    sync?: boolean
+  ) {
     removeObserver(this, key, target, method, sync);
     return this;
   },
@@ -399,7 +491,7 @@ export default Mixin.create({
     @return {Boolean}
     @private
   */
-  hasObserverFor(key) {
+  hasObserverFor(key: string) {
     return hasListeners(this, `${key}:change`);
   },
 
@@ -417,10 +509,10 @@ export default Mixin.create({
     @return {Number} The new property value
     @public
   */
-  incrementProperty(keyName, increment = 1) {
+  incrementProperty(keyName: string, increment = 1) {
     assert(
       'Must pass a numeric value to incrementProperty',
-      !isNaN(parseFloat(increment)) && isFinite(increment)
+      !isNaN(parseFloat(String(increment))) && isFinite(increment)
     );
     return set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
   },
@@ -439,10 +531,10 @@ export default Mixin.create({
     @return {Number} The new property value
     @public
   */
-  decrementProperty(keyName, decrement = 1) {
+  decrementProperty(keyName: string, decrement = 1) {
     assert(
       'Must pass a numeric value to decrementProperty',
-      !isNaN(parseFloat(decrement)) && isFinite(decrement)
+      (typeof decrement === 'number' || !isNaN(parseFloat(decrement))) && isFinite(decrement)
     );
     return set(this, keyName, (get(this, keyName) || 0) - decrement);
   },
@@ -460,7 +552,7 @@ export default Mixin.create({
     @return {Boolean} The new property value
     @public
   */
-  toggleProperty(keyName) {
+  toggleProperty(keyName: string) {
     return set(this, keyName, !get(this, keyName));
   },
 
@@ -475,7 +567,7 @@ export default Mixin.create({
     @return {Object} The cached value of the computed property, if any
     @public
   */
-  cacheFor(keyName) {
+  cacheFor(keyName: string) {
     let meta = peekMeta(this);
 
     if (meta !== null) {
@@ -483,3 +575,5 @@ export default Mixin.create({
     }
   },
 });
+
+export default Observable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
deleted file mode 100644
index 5c685022b69..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-interface PromiseProxyMixin<T> {
-  reason: unknown;
-
-  readonly isPending: boolean;
-
-  readonly isSettled: boolean;
-
-  isRejected: boolean;
-
-  isFulfilled: boolean;
-
-  promise: Promise<T>;
-
-  then: this['promise']['then'];
-
-  catch: this['promise']['catch'];
-
-  finally: this['promise']['finally'];
-}
-declare const PromiseProxyMixin: Mixin;
-
-export default PromiseProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
similarity index 76%
rename from packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js
rename to packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
index 3a8d4a12d4f..a97dfd475d4 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
@@ -1,11 +1,14 @@
 import { get, setProperties, computed, Mixin } from '@ember/-internals/metal';
+import { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
+import RSVP from 'rsvp';
+import CoreObject from '../system/core_object';
 
 /**
   @module @ember/object
 */
 
-function tap(proxy, promise) {
+function tap<T>(proxy: PromiseProxyMixin<T>, promise: RSVP.Promise<T>) {
   setProperties(proxy, {
     isFulfilled: false,
     isRejected: false,
@@ -13,7 +16,10 @@ function tap(proxy, promise) {
 
   return promise.then(
     (value) => {
-      if (!proxy.isDestroyed && !proxy.isDestroying) {
+      if (
+        !(proxy as unknown as CoreObject).isDestroyed &&
+        !(proxy as unknown as CoreObject).isDestroying
+      ) {
         setProperties(proxy, {
           content: value,
           isFulfilled: true,
@@ -22,7 +28,10 @@ function tap(proxy, promise) {
       return value;
     },
     (reason) => {
-      if (!proxy.isDestroyed && !proxy.isDestroying) {
+      if (
+        !(proxy as unknown as CoreObject).isDestroyed &&
+        !(proxy as unknown as CoreObject).isDestroying
+      ) {
         setProperties(proxy, {
           reason,
           isRejected: true,
@@ -97,7 +106,22 @@ function tap(proxy, promise) {
   @class PromiseProxyMixin
   @public
 */
-export default Mixin.create({
+interface PromiseProxyMixin<T> {
+  reason: unknown;
+
+  readonly isPending: boolean;
+  readonly isSettled: boolean;
+
+  isRejected: boolean;
+  isFulfilled: boolean;
+
+  promise: Promise<T>;
+
+  then: this['promise']['then'];
+  catch: this['promise']['catch'];
+  finally: this['promise']['finally'];
+}
+const PromiseProxyMixin = Mixin.create({
   /**
     If the proxied promise is rejected this will contain the reason
     provided.
@@ -172,7 +196,7 @@ export default Mixin.create({
     get() {
       throw new EmberError("PromiseProxy's promise must be set");
     },
-    set(key, promise) {
+    set(_key, promise: RSVP.Promise<unknown>) {
       return tap(this, promise);
     },
   }),
@@ -216,9 +240,16 @@ export default Mixin.create({
   finally: promiseAlias('finally'),
 });
 
-function promiseAlias(name) {
-  return function () {
+function promiseAlias<T, N extends MethodNamesOf<Promise<T>>>(name: N) {
+  return function (this: PromiseProxyMixin<T>, ...args: Parameters<Promise<T>[N]>) {
     let promise = get(this, 'promise');
-    return promise[name](...arguments);
+
+    // We need this cast because `Parameters` is deferred so that it is not
+    // possible for TS to see it will always produce the right type. However,
+    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
+    // issue](https://github.com/microsoft/TypeScript/issues/47615).
+    return (promise[name] as AnyFn)(...args);
   };
 }
+
+export default PromiseProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
deleted file mode 100644
index 84a0afde922..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Registry } from '@ember/-internals/container';
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
-import { Mixin } from '@ember/-internals/metal';
-import { Factory } from '@ember/-internals/owner';
-
-export interface IRegistry {
-  resolveRegistration(fullName: string): Factory<object> | object | undefined;
-
-  register(fullName: string, factory: Factory<object> | object, options?: TypeOptions): void;
-
-  unregister(fullName: string): void;
-
-  hasRegistration(fullName: string): boolean;
-
-  registeredOption<K extends keyof TypeOptions>(
-    fullName: string,
-    optionName: K
-  ): TypeOptions[K] | undefined;
-
-  registerOptions(fullName: string, options: TypeOptions): void;
-
-  registeredOptions(fullName: string): TypeOptions | undefined;
-
-  registerOptionsForType(type: string, options: TypeOptions): void;
-
-  registeredOptionsForType(type: string): TypeOptions | undefined;
-}
-
-interface RegistryProxyMixin extends IRegistry {
-  /** @internal */
-  __registry__: Registry;
-}
-declare const RegistryProxyMixin: Mixin;
-
-export default RegistryProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
similarity index 80%
rename from packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
rename to packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index 59d1c4f70e1..b9b4275d63c 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -2,8 +2,35 @@
 @module ember
 */
 
-import { assert } from '@ember/debug';
+import { Registry } from '@ember/-internals/container';
+import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
+import { Factory } from '@ember/-internals/owner';
+import { AnyFn } from '@ember/-internals/utils/types';
+import { assert } from '@ember/debug';
+
+export interface IRegistry {
+  resolveRegistration(fullName: string): Factory<object> | object | undefined;
+
+  register(fullName: string, factory: Factory<object> | object, options?: TypeOptions): void;
+
+  unregister(fullName: string): void;
+
+  hasRegistration(fullName: string): boolean;
+
+  registeredOption<K extends keyof TypeOptions>(
+    fullName: string,
+    optionName: K
+  ): TypeOptions[K] | undefined;
+
+  registerOptions(fullName: string, options: TypeOptions): void;
+
+  registeredOptions(fullName: string): TypeOptions | undefined;
+
+  registerOptionsForType(type: string, options: TypeOptions): void;
+
+  registeredOptionsForType(type: string): TypeOptions | undefined;
+}
 
 /**
   RegistryProxyMixin is used to provide public access to specific
@@ -12,7 +39,11 @@ import { Mixin } from '@ember/-internals/metal';
   @class RegistryProxyMixin
   @private
 */
-export default Mixin.create({
+interface RegistryProxyMixin extends IRegistry {
+  /** @internal */
+  __registry__: Registry;
+}
+const RegistryProxyMixin = Mixin.create({
   __registry__: null,
 
   /**
@@ -23,7 +54,7 @@ export default Mixin.create({
    @param {String} fullName
    @return {Function} fullName's factory
    */
-  resolveRegistration(fullName) {
+  resolveRegistration(fullName: string) {
     assert('fullName must be a proper full name', this.__registry__.isValidFullName(fullName));
     return this.__registry__.resolve(fullName);
   },
@@ -259,8 +290,25 @@ export default Mixin.create({
   inject: registryAlias('injection'),
 });
 
-function registryAlias(name) {
-  return function () {
-    return this.__registry__[name](...arguments);
+type AliasMethods =
+  | 'register'
+  | 'unregister'
+  | 'has'
+  | 'getOption'
+  | 'options'
+  | 'getOptions'
+  | 'optionsForType'
+  | 'getOptionsForType'
+  | 'injection';
+
+function registryAlias<N extends AliasMethods>(name: N) {
+  return function (this: RegistryProxyMixin, ...args: Parameters<Registry[N]>) {
+    // We need this cast because `Parameters` is deferred so that it is not
+    // possible for TS to see it will always produce the right type. However,
+    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
+    // issue](https://github.com/microsoft/TypeScript/issues/47615).
+    return (this.__registry__[name] as AnyFn)(...args);
   };
 }
+
+export default RegistryProxyMixin;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts
deleted file mode 100644
index fc7195ce6b4..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import Mixin from '@ember/object/mixin';
-
-interface TargetActionSupport {
-  target: unknown;
-  action: unknown;
-  actionContext: unknown;
-  actionContextObject: unknown;
-  triggerAction(opts?: object): unknown;
-}
-declare const TargetActionSupport: Mixin;
-
-export default TargetActionSupport;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts
similarity index 81%
rename from packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
rename to packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts
index 17479109eca..3ae1d30aca7 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts
@@ -19,6 +19,16 @@ doing more complex event handling in Components.
 @extends Mixin
 @private
 */
+interface TargetActionSupport {
+  target: unknown;
+  action: string | null;
+  actionContext: unknown;
+  actionContextObject: unknown;
+  triggerAction(opts?: object): unknown;
+
+  /** @internal */
+  _target?: unknown;
+}
 const TargetActionSupport = Mixin.create({
   target: null,
   action: null,
@@ -95,7 +105,7 @@ const TargetActionSupport = Mixin.create({
   @return {Boolean} true if the action was sent successfully and did not return false
   @private
   */
-  triggerAction(opts = {}) {
+  triggerAction(opts: { action?: string; target?: unknown; actionContext?: unknown } = {}) {
     let { action, target, actionContext } = opts;
     action = action || get(this, 'action');
     target = target || getTarget(this);
@@ -104,17 +114,19 @@ const TargetActionSupport = Mixin.create({
       actionContext = get(this, 'actionContextObject') || this;
     }
 
+    let context = Array.isArray(actionContext) ? actionContext : [actionContext];
+
     if (target && action) {
       let ret;
 
-      if (target.send) {
-        ret = target.send(...[action].concat(actionContext));
+      if (isSendable(target)) {
+        ret = target.send(action, ...context);
       } else {
         assert(
           `The action '${action}' did not exist on ${target}`,
-          typeof target[action] === 'function'
+          typeof (target as any)[action] === 'function'
         );
-        ret = target[action](...[].concat(actionContext));
+        ret = (target as any)[action](...context);
       }
 
       if (ret !== false) {
@@ -126,7 +138,15 @@ const TargetActionSupport = Mixin.create({
   },
 });
 
-function getTarget(instance) {
+interface Sendable {
+  send(action: string, ...context: unknown[]): unknown;
+}
+
+function isSendable(obj: unknown): obj is Sendable {
+  return obj != null && typeof obj === 'object' && typeof (obj as Sendable).send === 'function';
+}
+
+function getTarget(instance: TargetActionSupport) {
   let target = get(instance, 'target');
   if (target) {
     if (typeof target === 'string') {
diff --git a/packages/@ember/-internals/views/lib/compat/attrs.js b/packages/@ember/-internals/views/lib/compat/attrs.ts
similarity index 100%
rename from packages/@ember/-internals/views/lib/compat/attrs.js
rename to packages/@ember/-internals/views/lib/compat/attrs.ts
diff --git a/packages/@ember/-internals/views/lib/compat/fallback-view-registry.js b/packages/@ember/-internals/views/lib/compat/fallback-view-registry.ts
similarity index 100%
rename from packages/@ember/-internals/views/lib/compat/fallback-view-registry.js
rename to packages/@ember/-internals/views/lib/compat/fallback-view-registry.ts
diff --git a/packages/@ember/-internals/views/lib/component_lookup.js b/packages/@ember/-internals/views/lib/component_lookup.ts
similarity index 56%
rename from packages/@ember/-internals/views/lib/component_lookup.js
rename to packages/@ember/-internals/views/lib/component_lookup.ts
index f6e1b6025cb..c3d5fe2e0b2 100644
--- a/packages/@ember/-internals/views/lib/component_lookup.js
+++ b/packages/@ember/-internals/views/lib/component_lookup.ts
@@ -1,12 +1,13 @@
+import { Owner, TypeOptions } from '@ember/-internals/owner';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 
 export default EmberObject.extend({
-  componentFor(name, owner, options) {
+  componentFor(name: string, owner: Owner) {
     let fullName = `component:${name}`;
-    return owner.factoryFor(fullName, options);
+    return owner.factoryFor(fullName);
   },
 
-  layoutFor(name, owner, options) {
+  layoutFor(name: string, owner: Owner, options: TypeOptions) {
     let templateFullName = `template:components/${name}`;
     return owner.lookup(templateFullName, options);
   },

From d83f35e5529032028b8e2e06912b86ccc748ba50 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 19 Apr 2022 16:56:53 -0700
Subject: [PATCH 0981/1405] Convert ArrayProxy to TS

---
 packages/@ember/-internals/metal/lib/array.ts |   4 +-
 .../-internals/runtime/lib/mixins/array.d.ts  |   2 +-
 .../-internals/runtime/lib/mixins/array.js    |   2 +-
 .../runtime/lib/system/array_proxy.d.ts       |  23 ---
 .../system/{array_proxy.js => array_proxy.ts} | 156 ++++++++++++------
 packages/@ember/array/type-tests/proxy.ts     |   4 +-
 6 files changed, 109 insertions(+), 82 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
 rename packages/@ember/-internals/runtime/lib/system/{array_proxy.js => array_proxy.ts} (67%)

diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index 1a4e9154b56..f31867d571f 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -20,12 +20,12 @@ export function replace<T>(
   array: NativeArray<T> | MutableArray<T>,
   start: number,
   deleteCount: number,
-  items = EMPTY_ARRAY
+  items: T[] = EMPTY_ARRAY as []
 ): void {
   if (Array.isArray(array)) {
     replaceInNativeArray(array, start, deleteCount, items);
   } else {
-    array.replace(start, deleteCount, items as any);
+    array.replace(start, deleteCount, items);
   }
 }
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index eb37e3e384a..73298652fa9 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -71,7 +71,7 @@ declare const EmberArray: Mixin;
 export default EmberArray;
 
 interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
-  replace(idx: number, amt: number, objects: T[]): void;
+  replace(idx: number, amt: number, objects?: T[]): void;
   clear(): this;
   insertAt(idx: number, object: T): this;
   removeAt(start: number, len: number): this;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.js
index e1c75bc09f4..9333286b292 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.js
@@ -1360,7 +1360,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
       idx >= length, then append to the end of the array.
     @param {Number} amt Number of elements that should be removed from
       the array, starting at *idx*.
-    @param {EmberArray} objects An array of zero or more objects that should be
+    @param {EmberArray} [objects] An optional array of zero or more objects that should be
       inserted into the array at *idx*
     @public
   */
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
deleted file mode 100644
index 512834480bc..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {
-  PropertyDidChange,
-  PROPERTY_DID_CHANGE,
-} from '@ember/-internals/metal/lib/property_events';
-import EmberArray, { MutableArray } from '../mixins/array';
-import EmberObject from './object';
-
-interface ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>> extends MutableArray<T> {
-  content: C;
-  arrangedContent: C;
-  objectAtContent(idx: number): T | undefined;
-  replaceContent(idx: number, amt: number, objects: T[]): void;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-declare class ArrayProxy<T, C extends EmberArray<T>>
-  extends EmberObject
-  implements PropertyDidChange
-{
-  [PROPERTY_DID_CHANGE](): void;
-}
-
-export { ArrayProxy as default };
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.js b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
similarity index 67%
rename from packages/@ember/-internals/runtime/lib/system/array_proxy.js
rename to packages/@ember/-internals/runtime/lib/system/array_proxy.ts
index 7c76d928454..58c1a8b4383 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
@@ -16,25 +16,40 @@ import {
 } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
-import { isArray, MutableArray } from '../mixins/array';
+import EmberArray, { isArray, MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
 import { setCustomTagFor } from '@glimmer/manager';
-import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
+import {
+  combine,
+  consumeTag,
+  validateTag,
+  valueForTag,
+  tagFor,
+  Tag,
+  Revision,
+} from '@glimmer/validator';
+import { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
+
+function isMutable<T>(obj: EmberArray<T>): obj is MutableArray<T> {
+  return Array.isArray(obj) || typeof (obj as MutableArray<T>).replace === 'function';
+}
 
 const ARRAY_OBSERVER_MAPPING = {
   willChange: '_arrangedContentArrayWillChange',
   didChange: '_arrangedContentArrayDidChange',
 };
 
-function customTagForArrayProxy(proxy, key) {
+function customTagForArrayProxy(proxy: object, key: string) {
+  assert('[BUG] Expected a proxy', proxy instanceof ArrayProxy);
+
   if (key === '[]') {
     proxy._revalidate();
 
-    return proxy._arrTag;
+    return proxy._arrTag!;
   } else if (key === 'length') {
     proxy._revalidate();
 
-    return proxy._lengthTag;
+    return proxy._lengthTag!;
   }
 
   return tagFor(proxy, key);
@@ -100,32 +115,47 @@ function customTagForArrayProxy(proxy, key) {
   @uses MutableArray
   @public
 */
-export default class ArrayProxy extends EmberObject {
-  init() {
-    super.init(...arguments);
-
-    /*
-      `this._objectsDirtyIndex` determines which indexes in the `this._objects`
-      cache are dirty.
-
-      If `this._objectsDirtyIndex === -1` then no indexes are dirty.
-      Otherwise, an index `i` is dirty if `i >= this._objectsDirtyIndex`.
-
-      Calling `objectAt` with a dirty index will cause the `this._objects`
-      cache to be recomputed.
-    */
-    this._objectsDirtyIndex = 0;
-    this._objects = null;
-
-    this._lengthDirty = true;
-    this._length = 0;
-
-    this._arrangedContent = null;
-    this._arrangedContentIsUpdating = false;
-    this._arrangedContentTag = null;
-    this._arrangedContentRevision = null;
-    this._lengthTag = null;
-    this._arrTag = null;
+// eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars
+interface ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>> extends MutableArray<T> {}
+class ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>>
+  extends EmberObject
+  implements PropertyDidChange
+{
+  /*
+    `this._objectsDirtyIndex` determines which indexes in the `this._objects`
+    cache are dirty.
+
+    If `this._objectsDirtyIndex === -1` then no indexes are dirty.
+    Otherwise, an index `i` is dirty if `i >= this._objectsDirtyIndex`.
+
+    Calling `objectAt` with a dirty index will cause the `this._objects`
+    cache to be recomputed.
+  */
+  /** @internal */
+  _objectsDirtyIndex = 0;
+  /** @internal */
+  _objects: null | T[] = null;
+
+  /** @internal */
+  _lengthDirty = true;
+  /** @internal */
+  _length = 0;
+
+  /** @internal */
+  _arrangedContent: C | null = null;
+  /** @internal */
+  _arrangedContentIsUpdating = false;
+  /** @internal */
+  _arrangedContentTag: Tag | null = null;
+  /** @internal */
+  _arrangedContentRevision: Revision | null = null;
+  /** @internal */
+  _lengthTag: Tag | null = null;
+  /** @internal */
+  _arrTag: Tag | null = null;
+
+  init(props: object | undefined) {
+    super.init(props);
 
     setCustomTagFor(this, customTagForArrayProxy);
   }
@@ -146,6 +176,9 @@ export default class ArrayProxy extends EmberObject {
     @type EmberArray
     @public
   */
+  declare content: C | null;
+
+  declare arrangedContent: C | null;
 
   /**
     Should actually retrieve the object at the specified index from the
@@ -159,13 +192,15 @@ export default class ArrayProxy extends EmberObject {
     @return {Object} the value or undefined if none found
     @public
   */
-  objectAtContent(idx) {
-    return objectAt(get(this, 'arrangedContent'), idx);
+  objectAtContent(idx: number) {
+    let arrangedContent = get(this, 'arrangedContent');
+    assert('[BUG] Called objectAtContent without content', arrangedContent);
+    return objectAt<T>(arrangedContent, idx);
   }
 
   // See additional docs for `replace` from `MutableArray`:
   // https://api.emberjs.com/ember/release/classes/MutableArray/methods/replace?anchor=replace
-  replace(idx, amt, objects) {
+  replace(idx: number, amt: number, objects?: T[]) {
     assert(
       'Mutating an arranged ArrayProxy is not allowed',
       get(this, 'arrangedContent') === get(this, 'content')
@@ -183,17 +218,19 @@ export default class ArrayProxy extends EmberObject {
     @method replaceContent
     @param {Number} idx The starting index
     @param {Number} amt The number of items to remove from the content.
-    @param {EmberArray} objects Optional array of objects to insert or null if no
-      objects.
+    @param {EmberArray} objects Optional array of objects to insert.
     @return {void}
     @public
   */
-  replaceContent(idx, amt, objects) {
-    get(this, 'content').replace(idx, amt, objects);
+  replaceContent(idx: number, amt: number, objects?: T[]) {
+    let content = get(this, 'content');
+    assert('[BUG] Called objectAtContent without content', content);
+    assert('Mutating a non-mutable array is not allowed', isMutable(content));
+    content.replace(idx, amt, objects);
   }
 
   // Overriding objectAt is not supported.
-  objectAt(idx) {
+  objectAt(idx: number) {
     this._revalidate();
 
     if (this._objects === null) {
@@ -201,12 +238,15 @@ export default class ArrayProxy extends EmberObject {
     }
 
     if (this._objectsDirtyIndex !== -1 && idx >= this._objectsDirtyIndex) {
-      let arrangedContent = get(this, 'arrangedContent');
+      let arrangedContent = get(this, 'arrangedContent') as C | null;
       if (arrangedContent) {
         let length = (this._objects.length = get(arrangedContent, 'length'));
 
         for (let i = this._objectsDirtyIndex; i < length; i++) {
-          this._objects[i] = this.objectAtContent(i);
+          // SAFETY: This is expected to only ever return an instance of T. In other words, there should
+          // be no gaps in the array. Unfortunately, we can't actually assert for it since T could include
+          // any types, including null or undefined.
+          this._objects[i] = this.objectAtContent(i)!;
         }
       } else {
         this._objects.length = 0;
@@ -222,11 +262,12 @@ export default class ArrayProxy extends EmberObject {
     this._revalidate();
 
     if (this._lengthDirty) {
-      let arrangedContent = get(this, 'arrangedContent');
+      let arrangedContent = get(this, 'arrangedContent') as C | null;
       this._length = arrangedContent ? get(arrangedContent, 'length') : 0;
       this._lengthDirty = false;
     }
 
+    assert('[BUG] _lengthTag is not set', this._lengthTag);
     consumeTag(this._lengthTag);
 
     return this._length;
@@ -235,7 +276,7 @@ export default class ArrayProxy extends EmberObject {
   set length(value) {
     let length = this.length;
     let removedCount = length - value;
-    let added;
+    let added: T[] | undefined;
 
     if (removedCount === 0) {
       return;
@@ -244,15 +285,16 @@ export default class ArrayProxy extends EmberObject {
       removedCount = 0;
     }
 
-    let content = get(this, 'content');
+    let content = get(this, 'content') as C | null;
     if (content) {
-      replace(content, value, removedCount, added);
+      assert('Mutating a non-mutable array is not allowed', isMutable(content));
+      replace<T>(content, value, removedCount, added);
 
       this._invalidate();
     }
   }
 
-  _updateArrangedContentArray(arrangedContent) {
+  _updateArrangedContentArray(arrangedContent: C | null) {
     let oldLength = this._objects === null ? 0 : this._objects.length;
     let newLength = arrangedContent ? get(arrangedContent, 'length') : 0;
 
@@ -265,12 +307,13 @@ export default class ArrayProxy extends EmberObject {
     this._addArrangedContentArrayObserver(arrangedContent);
   }
 
-  _addArrangedContentArrayObserver(arrangedContent) {
-    if (arrangedContent && !arrangedContent.isDestroyed) {
+  _addArrangedContentArrayObserver(arrangedContent: C | null) {
+    if (arrangedContent && !(arrangedContent as any).isDestroyed) {
+      // @ts-expect-error This check is still good for ensuring correctness
       assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
       assert(
         `ArrayProxy expects an Array or ArrayProxy, but you passed ${typeof arrangedContent}`,
-        isArray(arrangedContent) || arrangedContent.isDestroyed
+        isArray(arrangedContent) || (arrangedContent as any).isDestroyed
       );
 
       addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING);
@@ -287,12 +330,17 @@ export default class ArrayProxy extends EmberObject {
 
   _arrangedContentArrayWillChange() {}
 
-  _arrangedContentArrayDidChange(proxy, idx, removedCnt, addedCnt) {
+  _arrangedContentArrayDidChange(
+    _proxy: unknown,
+    idx: number,
+    removedCnt: number,
+    addedCnt: number
+  ) {
     arrayContentWillChange(this, idx, removedCnt, addedCnt);
 
     let dirtyIndex = idx;
     if (dirtyIndex < 0) {
-      let length = get(this._arrangedContent, 'length');
+      let length = get(this._arrangedContent!, 'length');
       dirtyIndex += length + removedCnt - addedCnt;
     }
 
@@ -315,9 +363,9 @@ export default class ArrayProxy extends EmberObject {
 
     if (
       this._arrangedContentTag === null ||
-      !validateTag(this._arrangedContentTag, this._arrangedContentRevision)
+      !validateTag(this._arrangedContentTag, this._arrangedContentRevision!)
     ) {
-      let arrangedContent = this.get('arrangedContent');
+      let arrangedContent = this.get('arrangedContent') as C | null;
 
       if (this._arrangedContentTag === null) {
         // This is the first time the proxy has been setup, only add the observer
@@ -353,3 +401,5 @@ ArrayProxy.reopen(MutableArray, {
   */
   arrangedContent: alias('content'),
 });
+
+export default ArrayProxy;
diff --git a/packages/@ember/array/type-tests/proxy.ts b/packages/@ember/array/type-tests/proxy.ts
index f88be3f36b6..7af084812bf 100644
--- a/packages/@ember/array/type-tests/proxy.ts
+++ b/packages/@ember/array/type-tests/proxy.ts
@@ -16,5 +16,5 @@ let proxy = ArrayProxy.create({ content }) as ArrayProxy<Foo, NativeArray<Foo>>;
 expectTypeOf(proxy).toMatchTypeOf<EmberArray<Foo>>();
 expectTypeOf(proxy).toMatchTypeOf<MutableArray<Foo>>();
 
-expectTypeOf(proxy.content).toEqualTypeOf<NativeArray<Foo>>();
-expectTypeOf(proxy.arrangedContent).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(proxy.content).toEqualTypeOf<NativeArray<Foo> | null>();
+expectTypeOf(proxy.arrangedContent).toEqualTypeOf<NativeArray<Foo> | null>();

From 8c9004ece9eed44398a06489dfb561d23710b37d Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 19 Apr 2022 16:58:14 -0700
Subject: [PATCH 0982/1405] Convert ObjectProxy to TS

---
 .../-internals/runtime/lib/system/object_proxy.d.ts       | 8 --------
 .../lib/system/{object_proxy.js => object_proxy.ts}       | 6 +++++-
 2 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts
 rename packages/@ember/-internals/runtime/lib/system/{object_proxy.js => object_proxy.ts} (92%)

diff --git a/packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts b/packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts
deleted file mode 100644
index 7d9462851b7..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/object_proxy.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import FrameworkObject from './object';
-import _ProxyMixin from '../mixins/-proxy';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface ObjectProxy extends _ProxyMixin {}
-declare class ObjectProxy extends FrameworkObject {}
-
-export default ObjectProxy;
diff --git a/packages/@ember/-internals/runtime/lib/system/object_proxy.js b/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
similarity index 92%
rename from packages/@ember/-internals/runtime/lib/system/object_proxy.js
rename to packages/@ember/-internals/runtime/lib/system/object_proxy.ts
index c9929d5547d..ad3549460ee 100644
--- a/packages/@ember/-internals/runtime/lib/system/object_proxy.js
+++ b/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
@@ -77,5 +77,9 @@ import _ProxyMixin from '../mixins/-proxy';
   @uses Ember.ProxyMixin
   @public
 */
-export default class ObjectProxy extends FrameworkObject {}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface ObjectProxy extends _ProxyMixin {}
+class ObjectProxy extends FrameworkObject {}
 ObjectProxy.PrototypeMixin.reopen(_ProxyMixin);
+
+export default ObjectProxy;

From 6123eeb93b24c44aaa8b18eff6ea6e6542a44d06 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 19 Apr 2022 17:26:27 -0700
Subject: [PATCH 0983/1405] Convert ViewStates to TS

---
 .../views/lib/views/{states.js => states.ts}     |  9 +++++++++
 .../lib/views/states/{default.js => default.ts}  |  3 ++-
 .../states/{destroying.js => destroying.ts}      |  8 ++++++--
 .../states/{has_element.js => has_element.ts}    | 16 ++++++++++------
 .../lib/views/states/{in_dom.js => in_dom.ts}    | 15 ++++++++++++---
 .../states/{pre_render.js => pre_render.ts}      |  2 +-
 6 files changed, 40 insertions(+), 13 deletions(-)
 rename packages/@ember/-internals/views/lib/views/{states.js => states.ts} (77%)
 rename packages/@ember/-internals/views/lib/views/states/{default.js => default.ts} (84%)
 rename packages/@ember/-internals/views/lib/views/states/{destroying.js => destroying.ts} (76%)
 rename packages/@ember/-internals/views/lib/views/states/{has_element.js => has_element.ts} (68%)
 rename packages/@ember/-internals/views/lib/views/states/{in_dom.js => in_dom.ts} (71%)
 rename packages/@ember/-internals/views/lib/views/states/{pre_render.js => pre_render.ts} (62%)

diff --git a/packages/@ember/-internals/views/lib/views/states.js b/packages/@ember/-internals/views/lib/views/states.ts
similarity index 77%
rename from packages/@ember/-internals/views/lib/views/states.js
rename to packages/@ember/-internals/views/lib/views/states.ts
index 10158c362ec..2ecbcff82a9 100644
--- a/packages/@ember/-internals/views/lib/views/states.js
+++ b/packages/@ember/-internals/views/lib/views/states.ts
@@ -2,6 +2,15 @@ import preRender from './states/pre_render';
 import hasElement from './states/has_element';
 import inDOM from './states/in_dom';
 import destroying from './states/destroying';
+import Component from '@ember/component';
+
+export interface ViewState {
+  enter?(view: Component): void;
+  appendChild(): void;
+  handleEvent(view: Component, eventName: string, event: Event): boolean;
+  rerender(view: Component): void;
+  destroy(view: Component): void;
+}
 
 /*
   Describe how the specified actions should behave in the various
diff --git a/packages/@ember/-internals/views/lib/views/states/default.js b/packages/@ember/-internals/views/lib/views/states/default.ts
similarity index 84%
rename from packages/@ember/-internals/views/lib/views/states/default.js
rename to packages/@ember/-internals/views/lib/views/states/default.ts
index dc71609b58a..0bd4a1b17a3 100644
--- a/packages/@ember/-internals/views/lib/views/states/default.js
+++ b/packages/@ember/-internals/views/lib/views/states/default.ts
@@ -1,6 +1,7 @@
 import EmberError from '@ember/error';
+import type { ViewState } from '../states';
 
-const _default = {
+const _default: ViewState = {
   // appendChild is only legal while rendering the buffer.
   appendChild() {
     throw new EmberError("You can't use appendChild outside of the rendering process");
diff --git a/packages/@ember/-internals/views/lib/views/states/destroying.js b/packages/@ember/-internals/views/lib/views/states/destroying.ts
similarity index 76%
rename from packages/@ember/-internals/views/lib/views/states/destroying.js
rename to packages/@ember/-internals/views/lib/views/states/destroying.ts
index 92c60e62c8f..11f3a685b41 100644
--- a/packages/@ember/-internals/views/lib/views/states/destroying.js
+++ b/packages/@ember/-internals/views/lib/views/states/destroying.ts
@@ -1,13 +1,17 @@
 import EmberError from '@ember/error';
+import type { ViewState } from '../states';
 import _default from './default';
 
-const destroying = Object.assign({}, _default, {
+const destroying: ViewState = {
+  ..._default,
+
   appendChild() {
     throw new EmberError("You can't call appendChild on a view being destroyed");
   },
+
   rerender() {
     throw new EmberError("You can't call rerender on a view being destroyed");
   },
-});
+};
 
 export default Object.freeze(destroying);
diff --git a/packages/@ember/-internals/views/lib/views/states/has_element.js b/packages/@ember/-internals/views/lib/views/states/has_element.ts
similarity index 68%
rename from packages/@ember/-internals/views/lib/views/states/has_element.js
rename to packages/@ember/-internals/views/lib/views/states/has_element.ts
index 5b7e2c163a3..a16f043044c 100644
--- a/packages/@ember/-internals/views/lib/views/states/has_element.js
+++ b/packages/@ember/-internals/views/lib/views/states/has_element.ts
@@ -1,18 +1,22 @@
 import _default from './default';
 import { join } from '@ember/runloop';
 import { flaggedInstrument } from '@ember/instrumentation';
+import Component from '@ember/component';
+import type { ViewState } from '../states';
 
-const hasElement = Object.assign({}, _default, {
-  rerender(view) {
-    view.renderer.rerender(view);
+const hasElement: ViewState = {
+  ..._default,
+
+  rerender(view: Component) {
+    view.renderer.rerender();
   },
 
-  destroy(view) {
+  destroy(view: Component) {
     view.renderer.remove(view);
   },
 
   // Handle events from `Ember.EventDispatcher`
-  handleEvent(view, eventName, event) {
+  handleEvent(view: Component, eventName: string, event: Event) {
     if (view.has(eventName)) {
       // Handler should be able to re-dispatch events, so we don't
       // preventDefault or stopPropagation.
@@ -23,6 +27,6 @@ const hasElement = Object.assign({}, _default, {
       return true; // continue event propagation
     }
   },
-});
+};
 
 export default Object.freeze(hasElement);
diff --git a/packages/@ember/-internals/views/lib/views/states/in_dom.js b/packages/@ember/-internals/views/lib/views/states/in_dom.ts
similarity index 71%
rename from packages/@ember/-internals/views/lib/views/states/in_dom.js
rename to packages/@ember/-internals/views/lib/views/states/in_dom.ts
index de086e4c845..6a1a6a71897 100644
--- a/packages/@ember/-internals/views/lib/views/states/in_dom.js
+++ b/packages/@ember/-internals/views/lib/views/states/in_dom.ts
@@ -1,10 +1,15 @@
 import { teardownMandatorySetter } from '@ember/-internals/utils';
+import type Component from '@ember/component';
+import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
+import type { ViewState } from '../states';
 import hasElement from './has_element';
 
-const inDOM = Object.assign({}, hasElement, {
-  enter(view) {
+const inDOM: ViewState = {
+  ...hasElement,
+
+  enter(view: Component) {
     // Register the view for event handling. This hash is used by
     // Ember.EventDispatcher to dispatch incoming events.
     view.renderer.register(view);
@@ -12,6 +17,10 @@ const inDOM = Object.assign({}, hasElement, {
     if (DEBUG) {
       let elementId = view.elementId;
 
+      assert(
+        '[BUG] Expected teardownMandatorySetter to be set in DEBUG mode',
+        teardownMandatorySetter
+      );
       teardownMandatorySetter(view, 'elementId');
 
       Object.defineProperty(view, 'elementId', {
@@ -29,6 +38,6 @@ const inDOM = Object.assign({}, hasElement, {
       });
     }
   },
-});
+};
 
 export default Object.freeze(inDOM);
diff --git a/packages/@ember/-internals/views/lib/views/states/pre_render.js b/packages/@ember/-internals/views/lib/views/states/pre_render.ts
similarity index 62%
rename from packages/@ember/-internals/views/lib/views/states/pre_render.js
rename to packages/@ember/-internals/views/lib/views/states/pre_render.ts
index a0a6718b46f..50eafd9edc1 100644
--- a/packages/@ember/-internals/views/lib/views/states/pre_render.js
+++ b/packages/@ember/-internals/views/lib/views/states/pre_render.ts
@@ -1,5 +1,5 @@
 import _default from './default';
 
-const preRender = Object.assign({}, _default);
+const preRender = { ..._default };
 
 export default Object.freeze(preRender);

From 9e82676a46db9aca32e7d130aca249f19f2bf4f5 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 25 Apr 2022 15:18:06 -0700
Subject: [PATCH 0984/1405] Add notes about IContainer and IRegistry

---
 .../@ember/-internals/runtime/lib/mixins/container_proxy.ts     | 2 ++
 packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 64e257cde89..5cf31a359bc 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -7,6 +7,8 @@ import { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
 import { Factory } from '@ember/-internals/owner';
 
+// This is defined as a separate interface so that it can be used in the definition of
+// `Owner` without also including the `__container__` property.
 export interface IContainer {
   ownerInjection(): void;
   lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index b9b4275d63c..373a2fac84b 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -9,6 +9,8 @@ import { Factory } from '@ember/-internals/owner';
 import { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 
+// This is defined as a separate interface so that it can be used in the definition of
+// `Owner` without also including the `__registry__` property.
 export interface IRegistry {
   resolveRegistration(fullName: string): Factory<object> | object | undefined;
 

From 9fb35c41563d450293d991d313bd99f82b4acece Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 20 Apr 2022 11:16:38 -0700
Subject: [PATCH 0985/1405] Convert view internals to TS

---
 .../-internals/glimmer/lib/component.ts       |   2 +-
 .../glimmer/lib/modifiers/action.ts           |   4 +-
 .../views/lib/mixins/action_support.d.ts      |   8 -
 .../{action_support.js => action_support.ts}  |  21 ++-
 .../views/lib/mixins/child_views_support.d.ts |  10 --
 ...iews_support.js => child_views_support.ts} |  13 +-
 .../views/lib/mixins/class_names_support.d.ts |   9 -
 ...ames_support.js => class_names_support.ts} |   8 +-
 .../views/lib/mixins/view_state_support.d.ts  |   8 -
 ...state_support.js => view_state_support.ts} |  12 +-
 .../views/lib/mixins/view_support.d.ts        |  19 ---
 .../{view_support.js => view_support.ts}      |  66 +++++---
 .../{action_manager.js => action_manager.ts}  |   4 +-
 .../views/lib/system/event_dispatcher.d.ts    |  11 --
 ...vent_dispatcher.js => event_dispatcher.ts} | 157 ++++++++++--------
 .../-internals/views/lib/views/core_view.ts   |   6 +-
 .../-internals/views/lib/views/states.ts      |   1 +
 packages/@ember/application/instance.ts       |  15 +-
 .../@ember/application/lib/application.ts     |  18 +-
 19 files changed, 210 insertions(+), 182 deletions(-)
 delete mode 100644 packages/@ember/-internals/views/lib/mixins/action_support.d.ts
 rename packages/@ember/-internals/views/lib/mixins/{action_support.js => action_support.ts} (82%)
 delete mode 100644 packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts
 rename packages/@ember/-internals/views/lib/mixins/{child_views_support.js => child_views_support.ts} (62%)
 delete mode 100644 packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
 rename packages/@ember/-internals/views/lib/mixins/{class_names_support.js => class_names_support.ts} (94%)
 delete mode 100644 packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts
 rename packages/@ember/-internals/views/lib/mixins/{view_state_support.js => view_state_support.ts} (52%)
 delete mode 100644 packages/@ember/-internals/views/lib/mixins/view_support.d.ts
 rename packages/@ember/-internals/views/lib/mixins/{view_support.js => view_support.ts} (87%)
 rename packages/@ember/-internals/views/lib/system/{action_manager.js => action_manager.ts} (50%)
 delete mode 100644 packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
 rename packages/@ember/-internals/views/lib/system/{event_dispatcher.js => event_dispatcher.ts} (65%)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 145a1794791..c512bbb5124 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -857,7 +857,7 @@ class Component
       if (!lazyEventsProcessedForComponentClass.has(proto)) {
         let lazyEvents = eventDispatcher.lazyEvents;
 
-        lazyEvents.forEach((mappedEventName: string, event: string) => {
+        lazyEvents.forEach((mappedEventName: string | null, event: string) => {
           if (mappedEventName !== null && typeof (this as any)[mappedEventName] === 'function') {
             eventDispatcher.setupHandlerForBrowserEvent(event);
           }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 77f87525f50..0ba279258d8 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -50,7 +50,7 @@ export let ActionHelper = {
   registerAction(actionState: ActionState) {
     let { actionId } = actionState;
 
-    (ActionManager.registeredActions as Record<string, unknown>)[actionId] = actionState;
+    ActionManager.registeredActions[actionId] = actionState;
 
     return actionId;
   },
@@ -58,7 +58,7 @@ export let ActionHelper = {
   unregisterAction(actionState: ActionState) {
     let { actionId } = actionState;
 
-    delete (ActionManager.registeredActions as Record<string, unknown>)[actionId];
+    delete ActionManager.registeredActions[actionId];
   },
 };
 
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.d.ts b/packages/@ember/-internals/views/lib/mixins/action_support.d.ts
deleted file mode 100644
index 70ba2cbfaf0..00000000000
--- a/packages/@ember/-internals/views/lib/mixins/action_support.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import Mixin from '@ember/object/mixin';
-
-interface ActionSupport {
-  send(actionName: string, ...args: unknown[]): void;
-}
-declare const ActionSupport: Mixin;
-
-export default ActionSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.js b/packages/@ember/-internals/views/lib/mixins/action_support.ts
similarity index 82%
rename from packages/@ember/-internals/views/lib/mixins/action_support.js
rename to packages/@ember/-internals/views/lib/mixins/action_support.ts
index c8119c1e52b..2e5578d92a9 100644
--- a/packages/@ember/-internals/views/lib/mixins/action_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.ts
@@ -5,8 +5,16 @@ import { inspect } from '@ember/-internals/utils';
 import { Mixin, get } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 
-const mixinObj = {
-  send(actionName, ...args) {
+/**
+ @class ActionSupport
+ @namespace Ember
+ @private
+*/
+interface ActionSupport {
+  send(actionName: string, ...args: unknown[]): void;
+}
+const ActionSupport = Mixin.create({
+  send(actionName: string, ...args: unknown[]) {
     assert(
       `Attempted to call .send() with the action '${actionName}' on the destroyed object '${this}'.`,
       !this.isDestroying && !this.isDestroyed
@@ -32,11 +40,6 @@ const mixinObj = {
       assert(`${inspect(this)} had no action handler for: ${actionName}`, action);
     }
   },
-};
+});
 
-/**
- @class ActionSupport
- @namespace Ember
- @private
-*/
-export default Mixin.create(mixinObj);
+export default ActionSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts b/packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts
deleted file mode 100644
index 5b60b8703d2..00000000000
--- a/packages/@ember/-internals/views/lib/mixins/child_views_support.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { View } from '@ember/-internals/glimmer/lib/renderer';
-import Mixin from '@ember/object/mixin';
-
-interface ChildViewsSupport {
-  readonly childViews: View[];
-  appendChild(view: View): void;
-}
-declare const ChildViewsSupport: Mixin;
-
-export default ChildViewsSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/child_views_support.js b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
similarity index 62%
rename from packages/@ember/-internals/views/lib/mixins/child_views_support.js
rename to packages/@ember/-internals/views/lib/mixins/child_views_support.ts
index 1af78716c2f..ab65bad2383 100644
--- a/packages/@ember/-internals/views/lib/mixins/child_views_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
@@ -1,10 +1,15 @@
 /**
 @module ember
 */
+import { View } from '@ember/-internals/glimmer/lib/renderer';
 import { Mixin, nativeDescDecorator } from '@ember/-internals/metal';
 import { getChildViews, addChildView } from '../system/utils';
 
-export default Mixin.create({
+interface ChildViewsSupport {
+  readonly childViews: View[];
+  appendChild(view: View): void;
+}
+const ChildViewsSupport = Mixin.create({
   /**
     Array of child views. You should never edit this array directly.
 
@@ -16,12 +21,14 @@ export default Mixin.create({
   childViews: nativeDescDecorator({
     configurable: false,
     enumerable: false,
-    get() {
+    get(this: View) {
       return getChildViews(this);
     },
   }),
 
-  appendChild(view) {
+  appendChild(view: View) {
     addChildView(this, view);
   },
 });
+
+export default ChildViewsSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts b/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
deleted file mode 100644
index 6e026424c6b..00000000000
--- a/packages/@ember/-internals/views/lib/mixins/class_names_support.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import Mixin from '@ember/object/mixin';
-
-interface ClassNamesSupport {
-  classNames: string[];
-  classNameBindings: string[];
-}
-declare const ClassNamesSupport: Mixin;
-
-export default ClassNamesSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/class_names_support.js b/packages/@ember/-internals/views/lib/mixins/class_names_support.ts
similarity index 94%
rename from packages/@ember/-internals/views/lib/mixins/class_names_support.js
rename to packages/@ember/-internals/views/lib/mixins/class_names_support.ts
index 0beaa12dd5b..951e15fd404 100644
--- a/packages/@ember/-internals/views/lib/mixins/class_names_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/class_names_support.ts
@@ -11,7 +11,11 @@ const EMPTY_ARRAY = Object.freeze([]);
   @namespace Ember
   @private
 */
-export default Mixin.create({
+interface ClassNamesSupport {
+  classNames: string[];
+  classNameBindings: string[];
+}
+const ClassNamesSupport = Mixin.create({
   concatenatedProperties: ['classNames', 'classNameBindings'],
 
   init() {
@@ -99,3 +103,5 @@ export default Mixin.create({
   */
   classNameBindings: EMPTY_ARRAY,
 });
+
+export default ClassNamesSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts b/packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts
deleted file mode 100644
index 0c92c9b7fa5..00000000000
--- a/packages/@ember/-internals/views/lib/mixins/view_state_support.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import Mixin from '@ember/object/mixin';
-
-interface ViewStateSupport {
-  _transitionTo(state: unknown): void;
-}
-declare const ViewStateSupport: Mixin;
-
-export default ViewStateSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_state_support.js b/packages/@ember/-internals/views/lib/mixins/view_state_support.ts
similarity index 52%
rename from packages/@ember/-internals/views/lib/mixins/view_state_support.js
rename to packages/@ember/-internals/views/lib/mixins/view_state_support.ts
index 0a849b88221..bd0d6159121 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_state_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_state_support.ts
@@ -2,9 +2,15 @@
 @module ember
 */
 import { Mixin } from '@ember/-internals/metal';
+import type Component from '@ember/component';
+import type states from '../views/states';
 
-export default Mixin.create({
-  _transitionTo(state) {
+interface ViewStateSupport {
+  /** @internal */
+  _transitionTo(state: keyof typeof states): void;
+}
+const ViewStateSupport = Mixin.create({
+  _transitionTo(this: Component, state: keyof typeof states) {
     let priorState = this._currentState;
     let currentState = (this._currentState = this._states[state]);
     this._state = state;
@@ -17,3 +23,5 @@ export default Mixin.create({
     }
   },
 });
+
+export default ViewStateSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.d.ts b/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
deleted file mode 100644
index 373ad305d0f..00000000000
--- a/packages/@ember/-internals/views/lib/mixins/view_support.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import Mixin from '@ember/object/mixin';
-
-interface ViewSupport {
-  rerender(): unknown;
-  element: Element;
-  appendTo(selector: string | Element): this;
-  append(): this;
-  elementId: string | null;
-  willInsertElement(): void;
-  didInsertElement(): void;
-  willClearRender(): void;
-  willDestroyElement(): void;
-  parentViewDidChange(): void;
-  tagName: string | null;
-  handleEvent(eventName: string, evt: unknown): unknown;
-}
-declare const ViewSupport: Mixin;
-
-export default ViewSupport;
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.js b/packages/@ember/-internals/views/lib/mixins/view_support.ts
similarity index 87%
rename from packages/@ember/-internals/views/lib/mixins/view_support.js
rename to packages/@ember/-internals/views/lib/mixins/view_support.ts
index 2ac6c6a3cd5..3fc0d624af9 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.js
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.ts
@@ -3,12 +3,34 @@ import { descriptorForProperty, Mixin, nativeDescDecorator } from '@ember/-inter
 import { assert } from '@ember/debug';
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { matches } from '../system/utils';
+import type Component from '@ember/component';
+import { View } from '@ember/-internals/glimmer/lib/renderer';
+import { SimpleElement } from '@simple-dom/interface';
 
-function K() {
+function K(this: unknown) {
   return this;
 }
 
-let mixin = {
+/**
+ @class ViewMixin
+ @namespace Ember
+ @private
+*/
+interface ViewMixin {
+  rerender(): unknown;
+  element: SimpleElement;
+  appendTo(selector: string | Element | SimpleElement): this;
+  append(): this;
+  elementId: string | null;
+  willInsertElement(): void;
+  didInsertElement(): void;
+  willClearRender(): void;
+  willDestroyElement(): void;
+  parentViewDidChange(): void;
+  tagName: string | null;
+  handleEvent(eventName: string, evt: Event): boolean;
+}
+const ViewMixin = Mixin.create({
   /**
    A list of properties of the view to apply as attributes. If the property
    is a string value, the value of that string will be applied as the value
@@ -78,12 +100,12 @@ let mixin = {
    @deprecated use `yield` and contextual components for composition instead.
    @private
    */
-  nearestOfType(klass) {
+  nearestOfType(this: Component, klass: any) {
     let view = this.parentView;
     let isOfType =
       klass instanceof Mixin
-        ? (view) => klass.detect(view)
-        : (view) => klass.detect(view.constructor);
+        ? (view: View) => klass.detect(view)
+        : (view: View) => klass.detect(view.constructor);
 
     while (view) {
       if (isOfType(view)) {
@@ -91,6 +113,8 @@ let mixin = {
       }
       view = view.parentView;
     }
+
+    return;
   },
 
   /**
@@ -102,7 +126,7 @@ let mixin = {
    @deprecated use `yield` and contextual components for composition instead.
    @private
    */
-  nearestWithProperty(property) {
+  nearestWithProperty(property: string) {
     let view = this.parentView;
 
     while (view) {
@@ -148,7 +172,7 @@ let mixin = {
   element: nativeDescDecorator({
     configurable: false,
     enumerable: false,
-    get() {
+    get(this: Component) {
       return this.renderer.getElement(this);
     },
   }),
@@ -170,10 +194,15 @@ let mixin = {
    @return {Ember.View} receiver
    @private
    */
-  appendTo(selector) {
+  appendTo(this: Component, selector: string | Element | SimpleElement) {
     let target;
 
     if (hasDOM) {
+      assert(
+        `Expected a selector or instance of Element`,
+        typeof selector === 'string' || selector instanceof Element
+      );
+
       target = typeof selector === 'string' ? document.querySelector(selector) : selector;
 
       assert(`You tried to append to (${selector}) but that isn't in the DOM`, target);
@@ -182,8 +211,8 @@ let mixin = {
         'You cannot append to an existing Ember.View.',
         (() => {
           let node = target.parentNode;
-          while (node) {
-            if (node.nodeType !== 9 && matches(node, '.ember-view')) {
+          while (node instanceof Element) {
+            if (matches(node, '.ember-view')) {
               return false;
             }
 
@@ -202,11 +231,13 @@ let mixin = {
       );
       assert(
         `You tried to append to a non-Element (${selector}) in an environment without a DOM`,
-        typeof selector.appendChild === 'function'
+        typeof target.appendChild === 'function'
       );
     }
 
-    this.renderer.appendTo(this, target);
+    // SAFETY: SimpleElement is supposed to be a subset of Element so this _should_ be safe.
+    // However, the types are more specific in some places which necessitates the `as`.
+    this.renderer.appendTo(this, target as unknown as SimpleElement);
 
     return this;
   },
@@ -412,14 +443,9 @@ let mixin = {
    @param evt {Event}
    @private
    */
-  handleEvent(eventName, evt) {
+  handleEvent(this: Component, eventName: string, evt: Event) {
     return this._currentState.handleEvent(this, eventName, evt);
   },
-};
+});
 
-/**
- @class ViewMixin
- @namespace Ember
- @private
-*/
-export default Mixin.create(mixin);
+export default ViewMixin;
diff --git a/packages/@ember/-internals/views/lib/system/action_manager.js b/packages/@ember/-internals/views/lib/system/action_manager.ts
similarity index 50%
rename from packages/@ember/-internals/views/lib/system/action_manager.js
rename to packages/@ember/-internals/views/lib/system/action_manager.ts
index 2aa50de4d64..430701cbcb0 100644
--- a/packages/@ember/-internals/views/lib/system/action_manager.js
+++ b/packages/@ember/-internals/views/lib/system/action_manager.ts
@@ -1,3 +1,5 @@
+import type { ActionState } from '@ember/-internals/glimmer/lib/modifiers/action';
+
 /**
 @module ember
 */
@@ -11,4 +13,4 @@ export default function ActionManager() {}
   @property registeredActions
   @type Object
 */
-ActionManager.registeredActions = {};
+ActionManager.registeredActions = {} as Record<string, ActionState>;
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
deleted file mode 100644
index 29c2439e389..00000000000
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import EmberObject from '@ember/object';
-
-export default class EventDispatcher extends EmberObject {
-  finalEventNameMapping: Record<string, string>;
-  lazyEvents: Map<string, string>;
-  setupHandlerForBrowserEvent(event: string): void;
-  setupHandlerForEmberEvent(event: string): void;
-
-  /** @private */
-  setup(addedEvents: Record<string, string | null>, rootElement: string | Element | null): void;
-}
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.js b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
similarity index 65%
rename from packages/@ember/-internals/views/lib/system/event_dispatcher.js
rename to packages/@ember/-internals/views/lib/system/event_dispatcher.ts
index db6821bf29f..f2eedcb650e 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.js
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
@@ -4,6 +4,10 @@ import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { getElementView } from '@ember/-internals/views';
 import ActionManager from './action_manager';
+import { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type Component from '@ember/component';
+import { ActionState } from '@ember/-internals/glimmer/lib/modifiers/action';
+import { SimpleElement } from '@simple-dom/interface';
 
 /**
 @module ember
@@ -23,7 +27,7 @@ const ROOT_ELEMENT_SELECTOR = `.${ROOT_ELEMENT_CLASS}`;
   @private
   @extends Ember.Object
 */
-export default EmberObject.extend({
+export default class EventDispatcher extends EmberObject {
   /**
     The set of events names (and associated handler function names) to be setup
     and dispatched by the `EventDispatcher`. Modifications to this list can be done
@@ -57,7 +61,7 @@ export default EmberObject.extend({
     @type Object
     @private
   */
-  events: {
+  events: Record<string, string> = {
     touchstart: 'touchStart',
     touchmove: 'touchMove',
     touchend: 'touchEnd',
@@ -82,7 +86,7 @@ export default EmberObject.extend({
     dragover: 'dragOver',
     drop: 'drop',
     dragend: 'dragEnd',
-  },
+  };
 
   /**
     The root DOM element to which event listeners should be attached. Event
@@ -98,16 +102,14 @@ export default EmberObject.extend({
     @type DOMElement
     @default 'body'
   */
-  rootElement: 'body',
+  rootElement: string | Element = 'body';
 
-  init() {
-    this._super();
-    this._eventHandlers = Object.create(null);
-    this._didSetup = false;
-    this.finalEventNameMapping = null;
-    this._sanitizedRootElement = null;
-    this.lazyEvents = new Map();
-  },
+  _eventHandlers = Object.create(null);
+  _didSetup = false;
+  finalEventNameMapping: Record<string, string> | null = null;
+  _sanitizedRootElement: Element | null = null;
+  lazyEvents: Map<string, string | null> = new Map();
+  _reverseEventNameMapping: Record<string, string> | null = null;
 
   /**
     Sets up event listeners for standard browser events.
@@ -121,53 +123,57 @@ export default EmberObject.extend({
     @method setup
     @param addedEvents {Object}
   */
-  setup(addedEvents, _rootElement) {
+  setup(addedEvents: Record<string, string | null>, _rootElement: string | Element | null): void {
     assert(
       'EventDispatcher should never be setup in fastboot mode. Please report this as an Ember bug.',
       (() => {
         let owner = getOwner(this);
-        let environment = owner.lookup('-environment:main');
+        assert('[BUG] Missing owner', owner);
+
+        // SAFETY: This is not guaranteed to be safe, but this is what we expect to be returned.
+        let environment = owner.lookup('-environment:main') as BootEnvironment;
 
         return environment.isInteractive;
       })()
     );
 
-    let events = (this.finalEventNameMapping = Object.assign({}, get(this, 'events'), addedEvents));
-    this._reverseEventNameMapping = Object.keys(events).reduce(
-      (result, key) => Object.assign(result, { [events[key]]: key }),
-      {}
-    );
+    let events: Record<string, string | null> = (this.finalEventNameMapping = {
+      ...get(this, 'events'),
+      ...addedEvents,
+    });
+    this._reverseEventNameMapping = Object.keys(events).reduce((result, key) => {
+      let eventName = events[key];
+      return eventName ? { ...result, [eventName]: key } : result;
+    }, {});
     let lazyEvents = this.lazyEvents;
 
     if (_rootElement !== undefined && _rootElement !== null) {
       set(this, 'rootElement', _rootElement);
     }
 
-    let rootElementSelector = get(this, 'rootElement');
-    let rootElement;
-    if (typeof rootElementSelector !== 'string') {
-      rootElement = rootElementSelector;
-    } else {
-      rootElement = document.querySelector(rootElementSelector);
-    }
+    let specifiedRootElement = get(this, 'rootElement');
 
+    let rootElement: Element | null =
+      typeof specifiedRootElement !== 'string'
+        ? specifiedRootElement
+        : document.querySelector(specifiedRootElement);
+
+    assert(`Could not find rootElement (${specifiedRootElement})`, rootElement);
     assert(
-      `You cannot use the same root element (${
-        get(this, 'rootElement') || rootElement.tagName
-      }) multiple times in an Ember.Application`,
+      `You cannot use the same root element (${specifiedRootElement}) multiple times in an Ember.Application`,
       !rootElement.classList.contains(ROOT_ELEMENT_CLASS)
     );
     assert(
       'You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application',
       (() => {
         let target = rootElement.parentNode;
-        do {
+        while (target instanceof Element) {
           if (target.classList.contains(ROOT_ELEMENT_CLASS)) {
             return false;
           }
 
           target = target.parentNode;
-        } while (target && target.nodeType === 1);
+        }
 
         return true;
       })()
@@ -192,12 +198,12 @@ export default EmberObject.extend({
     // setup event listeners for the non-lazily setup events
     for (let event in events) {
       if (Object.prototype.hasOwnProperty.call(events, event)) {
-        lazyEvents.set(event, events[event]);
+        lazyEvents.set(event, events[event] ?? null);
       }
     }
 
     this._didSetup = true;
-  },
+  }
 
   /**
     Setup event listeners for the given browser event name
@@ -206,9 +212,11 @@ export default EmberObject.extend({
     @method setupHandlerForBrowserEvent
     @param event the name of the event in the browser
   */
-  setupHandlerForBrowserEvent(event) {
-    this.setupHandler(this._sanitizedRootElement, event, this.finalEventNameMapping[event]);
-  },
+  setupHandlerForBrowserEvent(event: string) {
+    assert('[BUG] Expected finalEventNameMapping to be set', this.finalEventNameMapping);
+    assert('[BUG] Expected _santizedRootElement to be set', this._sanitizedRootElement);
+    this.setupHandler(this._sanitizedRootElement, event, this.finalEventNameMapping[event] ?? null);
+  }
 
   /**
     Setup event listeners for the given Ember event name (camel case)
@@ -217,13 +225,15 @@ export default EmberObject.extend({
     @method setupHandlerForEmberEvent
     @param eventName
   */
-  setupHandlerForEmberEvent(eventName) {
-    this.setupHandler(
-      this._sanitizedRootElement,
-      this._reverseEventNameMapping[eventName],
-      eventName
-    );
-  },
+  setupHandlerForEmberEvent(eventName: string) {
+    assert('[BUG] Expected _sanitizedRootElement to be set', this._sanitizedRootElement);
+
+    let event = this._reverseEventNameMapping?.[eventName];
+
+    if (event) {
+      this.setupHandler(this._sanitizedRootElement, event, eventName);
+    }
+  }
 
   /**
     Registers an event listener on the rootElement. If the given event is
@@ -239,50 +249,58 @@ export default EmberObject.extend({
     @param {String} event the name of the event in the browser
     @param {String} eventName the name of the method to call on the view
   */
-  setupHandler(rootElement, event, eventName) {
+  setupHandler(rootElement: Element, event: string, eventName: string | null) {
     if (eventName === null || !this.lazyEvents.has(event)) {
       return; // nothing to do
     }
 
-    let viewHandler = (target, event) => {
-      let view = getElementView(target);
+    let viewHandler = (target: Element, event: Event) => {
+      // SAFETY: SimpleElement is supposed to be a subset of Element so this _should_ be safe.
+      // However, the types are more specific in some places which necessitates the `as`.
+      let view = getElementView(target as unknown as SimpleElement);
       let result = true;
 
       if (view) {
-        result = view.handleEvent(eventName, event);
+        // SAFETY: As currently written, this is not safe. Though it seems to always be true.
+        result = (view as Component).handleEvent(eventName, event);
       }
 
       return result;
     };
 
-    let actionHandler = (target, event) => {
+    let actionHandler = (target: Element, event: Event) => {
       let actionId = target.getAttribute('data-ember-action');
-      let actions = ActionManager.registeredActions[actionId];
+      let actions: Array<ActionState> | undefined;
 
       // In Glimmer2 this attribute is set to an empty string and an additional
       // attribute it set for each action on a given element. In this case, the
       // attributes need to be read so that a proper set of action handlers can
       // be coalesced.
       if (actionId === '') {
-        let attributes = target.attributes;
-        let attributeCount = attributes.length;
-
         actions = [];
 
-        for (let i = 0; i < attributeCount; i++) {
-          let attr = attributes.item(i);
+        for (let attr of target.attributes) {
           let attrName = attr.name;
 
           if (attrName.indexOf('data-ember-action-') === 0) {
-            actions = actions.concat(ActionManager.registeredActions[attr.value]);
+            let action = ActionManager.registeredActions[attr.value];
+            assert('[BUG] Missing action', action);
+            actions.push(action);
           }
         }
+      } else if (actionId) {
+        // FIXME: This branch is never called in tests. Improve tests or remove
+        let actionState = ActionManager.registeredActions[actionId];
+        if (actionState) {
+          actions = [actionState];
+        }
       }
 
       // We have to check for actions here since in some cases, jQuery will trigger
       // an event on `removeChild` (i.e. focusout) after we've already torn down the
       // action handlers for the view.
       if (!actions) {
+        // FIXME: This branch is never called in tests. Improve tests or remove
         return;
       }
 
@@ -298,11 +316,18 @@ export default EmberObject.extend({
       return result;
     };
 
-    let handleEvent = (this._eventHandlers[event] = (event) => {
+    let handleEvent = (this._eventHandlers[event] = (event: Event) => {
       let target = event.target;
 
+      assert(
+        `[BUG] Received event without an Element target: ${event.type}, ${target}`,
+        target instanceof Element
+      );
+
       do {
-        if (getElementView(target)) {
+        // SAFETY: SimpleElement is supposed to be a subset of Element so this _should_ be safe.
+        // However, the types are more specific in some places which necessitates the `as`.
+        if (getElementView(target as unknown as SimpleElement)) {
           if (viewHandler(target, event) === false) {
             event.preventDefault();
             event.stopPropagation();
@@ -320,26 +345,20 @@ export default EmberObject.extend({
         }
 
         target = target.parentNode;
-      } while (target && target.nodeType === 1);
+      } while (target instanceof Element);
     });
 
     rootElement.addEventListener(event, handleEvent);
 
     this.lazyEvents.delete(event);
-  },
+  }
 
   destroy() {
     if (this._didSetup === false) {
       return;
     }
 
-    let rootElementSelector = get(this, 'rootElement');
-    let rootElement;
-    if (rootElementSelector.nodeType) {
-      rootElement = rootElementSelector;
-    } else {
-      rootElement = document.querySelector(rootElementSelector);
-    }
+    let rootElement = this._sanitizedRootElement;
 
     if (!rootElement) {
       return;
@@ -352,9 +371,9 @@ export default EmberObject.extend({
     rootElement.classList.remove(ROOT_ELEMENT_CLASS);
 
     return this._super(...arguments);
-  },
+  }
 
   toString() {
     return '(EventDispatcher)';
-  },
-});
+  }
+}
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 1044de07fc3..0c119142f4a 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -1,7 +1,7 @@
 import { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
 import { ActionHandler, Evented, FrameworkObject } from '@ember/-internals/runtime';
-import states from './states';
+import states, { ViewState } from './states';
 
 /**
   `Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -26,8 +26,8 @@ class CoreView extends FrameworkObject.extend(Evented, ActionHandler) {
 
   declare _states: typeof states;
 
-  _state: unknown;
-  _currentState: unknown;
+  declare _state: keyof typeof states;
+  declare _currentState: ViewState;
 
   _superTrigger?: Evented['trigger'];
   _superHas?: Evented['has'];
diff --git a/packages/@ember/-internals/views/lib/views/states.ts b/packages/@ember/-internals/views/lib/views/states.ts
index 2ecbcff82a9..e6dbbc7ee21 100644
--- a/packages/@ember/-internals/views/lib/views/states.ts
+++ b/packages/@ember/-internals/views/lib/views/states.ts
@@ -6,6 +6,7 @@ import Component from '@ember/component';
 
 export interface ViewState {
   enter?(view: Component): void;
+  exit?(view: Component): void;
   appendChild(): void;
   handleEvent(view: Component, eventName: string, event: Event): boolean;
   rerender(view: Component): void;
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index 4dde2b48960..237bf6fe61c 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -12,12 +12,13 @@ import { assert } from '@ember/debug';
 import { Router } from '@ember/-internals/routing';
 import { EventDispatcher, ViewMixin } from '@ember/-internals/views';
 import { Registry } from '@ember/-internals/container';
+import { SimpleElement } from '@simple-dom/interface';
 
 export interface BootOptions {
   isBrowser?: boolean;
   shouldRender?: boolean;
   document?: Document | null;
-  rootElement?: string | Element | null;
+  rootElement?: string | SimpleElement | null;
   location?: string | null;
   // Private?
   isInteractive?: boolean;
@@ -65,7 +66,9 @@ class ApplicationInstance extends EngineInstance {
     @private
     @property {String|DOMElement} rootElement
   */
-  rootElement: string | Element | null = null;
+  rootElement: string | Element | SimpleElement | null = null;
+
+  declare customEvents: Record<string, string | null> | null;
 
   init(properties: object | undefined) {
     super.init(properties);
@@ -214,6 +217,12 @@ class ApplicationInstance extends EngineInstance {
     let instanceCustomEvents = get(this, 'customEvents');
 
     let customEvents = Object.assign({}, applicationCustomEvents, instanceCustomEvents);
+    assert(
+      '[BUG] Tried to set up dispatcher with an invalid root element',
+      this.rootElement === null ||
+        typeof this.rootElement === 'string' ||
+        this.rootElement instanceof Element
+    );
     dispatcher.setup(customEvents, this.rootElement);
 
     return dispatcher;
@@ -447,7 +456,7 @@ class _BootOptions {
     @default null
     @public
   */
-  readonly rootElement?: string | Element;
+  readonly rootElement?: string | SimpleElement;
 
   constructor(options: BootOptions = {}) {
     this.isInteractive = Boolean(environment.hasDOM); // This default is overridable below
diff --git a/packages/@ember/application/lib/application.ts b/packages/@ember/application/lib/application.ts
index 20185c7ba69..e6a7b2aad09 100644
--- a/packages/@ember/application/lib/application.ts
+++ b/packages/@ember/application/lib/application.ts
@@ -27,6 +27,7 @@ import { Container, privatize as P, Registry } from '@ember/-internals/container
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
 import { RouterService } from '@ember/-internals/routing';
 import { EngineInstanceOptions } from '@ember/engine/instance';
+import { SimpleDocument, SimpleElement } from '@simple-dom/interface';
 
 /**
   An instance of `Application` is the starting point for every Ember
@@ -230,7 +231,7 @@ class Application extends Engine {
     @default 'body'
     @public
   */
-  declare rootElement: Element | string;
+  declare rootElement: SimpleElement | Element | string;
 
   /**
 
@@ -239,7 +240,7 @@ class Application extends Engine {
     @default 'window.document'
     @private
   */
-  declare _document: Document | null;
+  declare _document: SimpleDocument | Document | null;
 
   /**
     The `Ember.EventDispatcher` responsible for delegating events to this
@@ -532,9 +533,20 @@ class Application extends Engine {
   waitForDOMReady(): void {
     const document = this._document;
 
-    if (document === null || document.readyState !== 'loading') {
+    // SAFETY: Casting as Document should be safe since we're just reading a property.
+    // If it's not actually a Document then it will evaluate false which is fine for our
+    // purposes.
+    if (document === null || (document as Document).readyState !== 'loading') {
       schedule('actions', this, this.domReady);
     } else {
+      // Ideally we'd just check `document instanceof Document` but currently some tests pass a fake document.
+      assert(
+        '[BUG] Called waitForDOMReady with an invalid document',
+        (function (d: SimpleDocument | Document): d is Document {
+          return typeof (d as Document).removeEventListener === 'function';
+        })(document)
+      );
+
       let callback = () => {
         document.removeEventListener('DOMContentLoaded', callback);
         run(this, this.domReady);

From d53dd190abb686aa7df84c328ef2a36e963a43f3 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Wed, 27 Apr 2022 12:59:42 +0200
Subject: [PATCH 0986/1405] [DOC] Improve `templateName` docs

---
 .../-internals/routing/lib/system/route.ts       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index d939aab8e76..68f1e3d03dd 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -430,27 +430,27 @@ class Route<T = unknown>
   >;
 
   /**
-    The name of the template to use by default when rendering this routes
+    The name of the template to use by default when rendering this route's
     template.
 
     ```app/routes/posts/list.js
     import Route from '@ember/routing/route';
 
-    export default class extends Route {
-      templateName = 'posts/list'
-    });
+    export default class PostsListRoute extends Route {
+      templateName = 'posts/list';
+    }
     ```
 
     ```app/routes/posts/index.js
-    import PostsList from '../posts/list';
+    import PostsListRoute from '../posts/list';
 
-    export default class extends PostsList {};
+    export default class PostsIndexRoute extends PostsListRoute {};
     ```
 
     ```app/routes/posts/archived.js
-    import PostsList from '../posts/list';
+    import PostsListRoute from '../posts/list';
 
-    export default class extends PostsList {};
+    export default class PostsArchivedRoute extends PostsListRoute {};
     ```
 
     @property templateName

From 65fe7d0f3fc951b395750c75c18780780526e26d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 15:02:11 +0000
Subject: [PATCH 0987/1405] Bump express from 4.17.3 to 4.18.1

Bumps [express](https://github.com/expressjs/express) from 4.17.3 to 4.18.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.3...4.18.1)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 158 +++++++++++++++++++++++++++++----------------------
 2 files changed, 91 insertions(+), 69 deletions(-)

diff --git a/package.json b/package.json
index 2dedcfcb95c..1e95584305a 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "eslint-plugin-qunit": "^7.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.13.0",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
     "finalhandler": "^1.1.2",
     "fs-extra": "^10.0.1",
     "git-repo-info": "^2.1.1",
diff --git a/yarn.lock b/yarn.lock
index b5e23403e71..19c92e14430 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2283,21 +2283,23 @@ blueimp-md5@^2.10.0:
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935"
   integrity "sha1-EVK+EzXwxrORHtnjbbVPPmrFKTU= sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
 
-body-parser@1.19.2:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
-  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+body-parser@1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
+  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.7"
-    raw-body "2.4.3"
+    on-finished "2.4.1"
+    qs "6.10.3"
+    raw-body "2.5.1"
     type-is "~1.6.18"
+    unpipe "1.0.0"
 
 body@^5.1.0:
   version "5.1.0"
@@ -3411,7 +3413,12 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity "sha1-4wOogrNCzD7oylE6eZmXNNqzriw= sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
 
-cookie@0.4.2, cookie@~0.4.1:
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+
+cookie@~0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
@@ -3664,20 +3671,20 @@ delegates@^1.0.0:
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
 
+depd@2.0.0, depd@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="
 
-depd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
-  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
-
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg=="
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-file@^1.0.0:
   version "1.0.0"
@@ -4641,38 +4648,39 @@ expect-type@^0.13.0:
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
   integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
 
-express@^4.10.7, express@^4.13.1, express@^4.17.2, express@^4.17.3:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
-  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+express@^4.10.7, express@^4.13.1, express@^4.17.2, express@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
+  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.2"
+    body-parser "1.20.0"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.2"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
     fresh "0.5.2"
+    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.9.7"
+    qs "6.10.3"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
     setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -4860,17 +4868,17 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@^1.1.2, finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity "sha1-t+fQAP/RGTjQ/bBTUG9uur6fWH0= sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="
+finalhandler@1.2.0, finalhandler@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     unpipe "~1.0.0"
 
 find-babel-config@^1.1.0, find-babel-config@^1.2.0:
@@ -5696,15 +5704,15 @@ http-cache-semantics@^4.0.0:
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
   integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
 
-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
-    depd "~1.1.2"
+    depd "2.0.0"
     inherits "2.0.4"
     setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
+    statuses "2.0.1"
     toidentifier "1.0.1"
 
 http-errors@~1.6.2:
@@ -7664,6 +7672,13 @@ object.values@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
+  dependencies:
+    ee-first "1.1.1"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -8221,10 +8236,12 @@ q@~0.9.6:
   resolved "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz#4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"
   integrity "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U= sha512-ijt0LhxWClXBtc1RCt8H0WhlZLAdVX26nWbpsJy+Hblmp81d2F/pFsvlrJhJDDruFHM+ECtxP0H0HzGSrARkwg=="
 
-qs@6.9.7, qs@^6.4.0:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
-  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+qs@6.10.3, qs@^6.4.0:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+  dependencies:
+    side-channel "^1.0.4"
 
 qs@~1.0.0:
   version "1.0.2"
@@ -8279,13 +8296,13 @@ range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity "sha1-PPNwI9GZ4cJNGlW4SADC8+ZGgDE= sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
 
-raw-body@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
-  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
@@ -8905,24 +8922,24 @@ semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
   dependencies:
     lru-cache "^6.0.0"
 
-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
     mime "1.6.0"
     ms "2.1.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"
 
 serialize-javascript@6.0.0:
   version "6.0.0"
@@ -8931,15 +8948,15 @@ serialize-javascript@6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-serve-static@1.14.2, serve-static@^1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+serve-static@1.15.0, serve-static@^1.14.2:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.17.2"
+    send "0.18.0"
 
 set-blocking@~2.0.0:
   version "2.0.0"
@@ -9274,7 +9291,12 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="

From 156744577417c0cbc40d338831fa9ad4560a89ec Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 15:02:25 +0000
Subject: [PATCH 0988/1405] Bump typescript from 4.6.3 to 4.6.4

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.6.3 to 4.6.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.6.3...v4.6.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2dedcfcb95c..47774dfde1e 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.6.0",
     "testem-failure-only-reporter": "^1.0.0",
-    "typescript": "~4.6.3"
+    "typescript": "~4.6.4"
   },
   "engines": {
     "node": ">= 12.*"
diff --git a/yarn.lock b/yarn.lock
index b5e23403e71..4a55a1223cb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9906,10 +9906,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
-typescript@~4.6.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
-  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
+typescript@~4.6.4:
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
+  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From ca015882ffb5e05d3be324ebf68af252bde48dd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 May 2022 15:03:06 +0000
Subject: [PATCH 0989/1405] Bump ember-auto-import from 2.4.0 to 2.4.1

Bumps [ember-auto-import](https://github.com/ef4/ember-auto-import/tree/HEAD/packages/ember-auto-import) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/ef4/ember-auto-import/releases)
- [Changelog](https://github.com/ef4/ember-auto-import/blob/main/packages/ember-auto-import/CHANGELOG.md)
- [Commits](https://github.com/ef4/ember-auto-import/commits/v2.4.1/packages/ember-auto-import)

---
updated-dependencies:
- dependency-name: ember-auto-import
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 31 +++++++++++--------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 2dedcfcb95c..3a22b197236 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-auto-import": "^2.4.0",
+    "ember-auto-import": "^2.4.1",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index b5e23403e71..37fd6a81ba8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3762,10 +3762,10 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
   integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
 
-ember-auto-import@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.0.tgz#91c4797f08315728086e35af954cb60bd23c14bc"
-  integrity sha512-BwF6iTaoSmT2vJ9NEHEGRBCh2+qp+Nlaz/Q7roqNSxl5oL5iMRwenPnHhOoBPTYZvPhcV/KgXR5e+pBQ107plQ==
+ember-auto-import@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.1.tgz#25e1c21d403eed116b21972ccc5336b49a7ca46b"
+  integrity sha512-lyCl2hzIb6Dlcmfm3gI3lAtaOk/nzR2kM4GDJRRu19YJhhSkpiIMSDVjw8ShxmnYiI005R1eOcP3C/GgRRW5mA==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"
@@ -3784,7 +3784,7 @@ ember-auto-import@^2.4.0:
     broccoli-source "^3.0.0"
     css-loader "^5.2.0"
     debug "^4.3.1"
-    fs-extra "^6.0.1"
+    fs-extra "^10.0.0"
     fs-tree-diff "^2.0.0"
     handlebars "^4.3.1"
     js-string-escape "^1.0.1"
@@ -3792,7 +3792,7 @@ ember-auto-import@^2.4.0:
     mini-css-extract-plugin "^2.5.2"
     parse5 "^6.0.1"
     resolve "^1.20.0"
-    resolve-package-path "^3.1.0"
+    resolve-package-path "^4.0.3"
     semver "^7.3.4"
     style-loader "^2.0.0"
     typescript-memoize "^1.0.0-alpha.3"
@@ -5091,10 +5091,10 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
-  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
+fs-extra@^10.0.0, fs-extra@^10.0.1:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
@@ -5118,15 +5118,6 @@ fs-extra@^5.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
-  integrity "sha1-irwSj3lG4xATXdyTuYvdtBDno0s= sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^7.0.0, fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
@@ -8610,7 +8601,7 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
-resolve-package-path@^4.0.1:
+resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
   integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==

From d723329ee9ee2dc278ead43f2302ef01b0aa8e9e Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 2 May 2022 22:41:45 -0400
Subject: [PATCH 0990/1405] Add v4.4.0 to CHANGELOG

(cherry picked from commit 6ae29cade22cf3caf52e7de9aefcc937de4c1f6f)
---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10c448a5037..fb0ba4331e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,6 @@
 # Ember Changelog
 
-## v3.28.9 (April 19, 2022)
-
-- [#20028](https://github.com/emberjs/ember.js/pull/20028) Fix a memory leak in the Router Service class
-
-### v4.4.0-beta.1 (March 24, 2022)
+### v4.4.0 (May 2, 2022)
 
 - [#19882](https://github.com/emberjs/ember.js/pull/19882) / [#20005](https://github.com/emberjs/ember.js/pull/20005) [FEATURE] Implement the `unique-id` helper per [RFC #0659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).
 - [#19981](https://github.com/emberjs/ember.js/pull/19981) [FEATURE] Facilitate custom test setups per [RFC #0637](https://github.com/emberjs/rfcs/blob/master/text/0637-customizable-test-setups.md).
@@ -12,6 +8,10 @@
 - [#17978](https://github.com/emberjs/ember.js/pull/17978) Make hasListeners public
 - [#20014](https://github.com/emberjs/ember.js/pull/20014) Log `until` for deprecations
 
+### v3.28.9 (April 19, 2022)
+
+- [#20028](https://github.com/emberjs/ember.js/pull/20028) Fix a memory leak in the Router Service class
+
 ### v4.3.0 (March 21, 2022)
 
 - [#20025](https://github.com/emberjs/ember.js/pull/20025) [BUGFIX] Fix a memory leak in the Router Service class

From 474057360405daf9d1bb3d402f5742e27e76c8af Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 2 May 2022 23:20:10 -0400
Subject: [PATCH 0991/1405] Add v4.5.0-beta.1 to CHANGELOG

(cherry picked from commit c335315f744fe6921d0a293a48b4f1027cab0cac)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0ba4331e2..3fa4497f963 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.5.0-beta.1 (May 2, 2022)
+
+- [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
+- [#20053](https://github.com/emberjs/ember.js/pull/20053) [FEATURE] Expose `renderSettled` from `@ember/renderer` to enable implementation of [RFC #0785](https://github.com/emberjs/rfcs/blob/master/text/0785-remove-set-get-in-tests.md).
+
 ### v4.4.0 (May 2, 2022)
 
 - [#19882](https://github.com/emberjs/ember.js/pull/19882) / [#20005](https://github.com/emberjs/ember.js/pull/20005) [FEATURE] Implement the `unique-id` helper per [RFC #0659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).

From e2f3a48763d7b2791e8e8417d4852842b39285f8 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 2 May 2022 23:22:37 -0400
Subject: [PATCH 0992/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2dedcfcb95c..417d593bc6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.5.0-alpha.1",
+  "version": "4.6.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 648300a9863662f4f0c4cbebaa404ff9928bd860 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 May 2022 03:26:17 +0000
Subject: [PATCH 0993/1405] Bump @typescript-eslint/eslint-plugin from 5.15.0
 to 5.22.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.15.0 to 5.22.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.22.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  4 +--
 yarn.lock    | 74 ++++++++++++++++++++++++++++++++++++++--------------
 2 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 2dedcfcb95c..a5c5e39d5c1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.5.0-alpha.1",
+  "version": "4.6.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"
@@ -94,7 +94,7 @@
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.3",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.15.0",
+    "@typescript-eslint/eslint-plugin": "^5.22.0",
     "@typescript-eslint/parser": "^5.15.0",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1095.0",
diff --git a/yarn.lock b/yarn.lock
index b5e23403e71..4318435f4d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1507,14 +1507,14 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.15.0.tgz#c28ef7f2e688066db0b6a9d95fb74185c114fb9a"
-  integrity sha512-u6Db5JfF0Esn3tiAKELvoU5TpXVSkOpZ78cEGn/wXtT2RVqs2vkt4ge6N8cRCyw7YVKhmmLDbwI2pg92mlv7cA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.15.0"
-    "@typescript-eslint/type-utils" "5.15.0"
-    "@typescript-eslint/utils" "5.15.0"
+"@typescript-eslint/eslint-plugin@^5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a"
+  integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.22.0"
+    "@typescript-eslint/type-utils" "5.22.0"
+    "@typescript-eslint/utils" "5.22.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -1540,12 +1540,20 @@
     "@typescript-eslint/types" "5.15.0"
     "@typescript-eslint/visitor-keys" "5.15.0"
 
-"@typescript-eslint/type-utils@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.15.0.tgz#d2c02eb2bdf54d0a645ba3a173ceda78346cf248"
-  integrity sha512-KGeDoEQ7gHieLydujGEFLyLofipe9PIzfvA/41urz4hv+xVxPEbmMQonKSynZ0Ks2xDhJQ4VYjB3DnRiywvKDA==
+"@typescript-eslint/scope-manager@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24"
+  integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==
+  dependencies:
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/visitor-keys" "5.22.0"
+
+"@typescript-eslint/type-utils@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19"
+  integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==
   dependencies:
-    "@typescript-eslint/utils" "5.15.0"
+    "@typescript-eslint/utils" "5.22.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
@@ -1554,6 +1562,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501"
   integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA==
 
+"@typescript-eslint/types@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0"
+  integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==
+
 "@typescript-eslint/typescript-estree@5.15.0":
   version "5.15.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac"
@@ -1567,15 +1580,28 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.15.0.tgz#468510a0974d3ced8342f37e6c662778c277f136"
-  integrity sha512-081rWu2IPKOgTOhHUk/QfxuFog8m4wxW43sXNOMSCdh578tGJ1PAaWPsj42LOa7pguh173tNlMigsbrHvh/mtA==
+"@typescript-eslint/typescript-estree@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97"
+  integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==
+  dependencies:
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/visitor-keys" "5.22.0"
+    debug "^4.3.2"
+    globby "^11.0.4"
+    is-glob "^4.0.3"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8"
+  integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.15.0"
-    "@typescript-eslint/types" "5.15.0"
-    "@typescript-eslint/typescript-estree" "5.15.0"
+    "@typescript-eslint/scope-manager" "5.22.0"
+    "@typescript-eslint/types" "5.22.0"
+    "@typescript-eslint/typescript-estree" "5.22.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -1587,6 +1613,14 @@
     "@typescript-eslint/types" "5.15.0"
     eslint-visitor-keys "^3.0.0"
 
+"@typescript-eslint/visitor-keys@5.22.0":
+  version "5.22.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c"
+  integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==
+  dependencies:
+    "@typescript-eslint/types" "5.22.0"
+    eslint-visitor-keys "^3.0.0"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"

From ac6b6e4c225734937312128b2285c83bd5a19bd1 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Tue, 3 May 2022 15:16:27 +0200
Subject: [PATCH 0994/1405] [BUGFIX release] Make sure the `blueprints-js`
 folder is published

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 417d593bc6e..bc7917dda6e 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
   "files": [
     "build-metadata.json",
     "blueprints",
+    "blueprints-js",
     "dist/packages",
     "dist/dependencies",
     "dist/header",

From afdee50cf5c57e05f775799b5c81e3413dba1bbc Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 26 Apr 2022 07:10:55 -0700
Subject: [PATCH 0995/1405] Remove redundant types

---
 packages/@ember/-internals/glimmer/lib/component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index c512bbb5124..27f681b4351 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -857,7 +857,7 @@ class Component
       if (!lazyEventsProcessedForComponentClass.has(proto)) {
         let lazyEvents = eventDispatcher.lazyEvents;
 
-        lazyEvents.forEach((mappedEventName: string | null, event: string) => {
+        lazyEvents.forEach((mappedEventName, event) => {
           if (mappedEventName !== null && typeof (this as any)[mappedEventName] === 'function') {
             eventDispatcher.setupHandlerForBrowserEvent(event);
           }

From 3418c7b9a47cf9cc5fe16000d7388b81976b4601 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 26 Apr 2022 07:13:28 -0700
Subject: [PATCH 0996/1405] Remove K function

---
 packages/@ember/-internals/glimmer/lib/renderer.ts | 10 ++++------
 packages/ember-testing/lib/adapters/adapter.js     |  8 ++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 200ebbab2e3..d3bf5a1f22e 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -86,6 +86,8 @@ export class DynamicScope implements GlimmerDynamicScope {
   }
 }
 
+const NO_OP = () => {};
+
 // This wrapper logic prevents us from rerendering in case of a hard failure
 // during render. This prevents infinite revalidation type loops from occuring,
 // and ensures that errors are not swallowed by subsequent follow on failures.
@@ -218,10 +220,6 @@ function loopBegin(): void {
   }
 }
 
-function K() {
-  /* noop */
-}
-
 let renderSettledDeferred: RSVP.Deferred<void> | null = null;
 /*
   Returns a promise which will resolve when rendering has settled. Settled in
@@ -239,7 +237,7 @@ export function renderSettled() {
     // a chance to resolve (because its resolved in backburner's "end" event)
     if (!_getCurrentRunLoop()) {
       // ensure a runloop has been kicked off
-      _backburner.schedule('actions', null, K);
+      _backburner.schedule('actions', null, NO_OP);
     }
   }
 
@@ -266,7 +264,7 @@ function loopEnd() {
         throw new Error('infinite rendering invalidation detected');
       }
       loops++;
-      return _backburner.join(null, K);
+      return _backburner.join(null, NO_OP);
     }
   }
   loops = 0;
diff --git a/packages/ember-testing/lib/adapters/adapter.js b/packages/ember-testing/lib/adapters/adapter.js
index 874bba926fa..5fde61882b1 100644
--- a/packages/ember-testing/lib/adapters/adapter.js
+++ b/packages/ember-testing/lib/adapters/adapter.js
@@ -1,9 +1,5 @@
 import { Object as EmberObject } from '@ember/-internals/runtime';
 
-function K() {
-  return this;
-}
-
 /**
  @module @ember/test
 */
@@ -25,7 +21,7 @@ export default EmberObject.extend({
     @public
     @method asyncStart
   */
-  asyncStart: K,
+  asyncStart() {},
 
   /**
     This callback will be called whenever an async operation has completed.
@@ -33,7 +29,7 @@ export default EmberObject.extend({
     @public
     @method asyncEnd
   */
-  asyncEnd: K,
+  asyncEnd() {},
 
   /**
     Override this method with your testing framework's false assertion.

From 7f34f1ffe2dfd59b3586d5743160096c251342e0 Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol.pieropan@gmail.com>
Date: Wed, 27 Apr 2022 13:58:57 +0200
Subject: [PATCH 0997/1405] [DOC release] Documenting the @cached decorator

---
 .../glimmer/lib/glimmer-tracking-docs.ts      | 93 +++++++++++++++++++
 tests/docs/expected.js                        |  1 +
 2 files changed, 94 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
index 834f6e0a6eb..1b274bcba52 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
@@ -7,6 +7,14 @@
 
   We can do this by marking the field with the `@tracked` decorator.
 
+  ### Caching a getter value
+
+  The `@cached` decorator can be used on getters in order to cache the
+  return value of the getter.
+
+  This method adds an extra overhead to each memoized getter, therefore caching
+  the values should not be the default strategy, but used in last resort.
+
   @module @glimmer/tracking
   @public
 */
@@ -146,3 +154,88 @@
   @for @glimmer/tracking
   @public
 */
+
+/**
+  Gives the getter a caching behavior. The return value of the getter
+  will be cached until any of the properties it is entangled with
+  are invalidated. This is useful when a getter is expensive and
+  used very often.
+
+  For instance, in this GuestList class, we have the sortedGuests
+  getter that sorts the guests alphabetically:
+
+  ```javascript
+    import { tracked } from '@glimmer/tracking';
+
+    class GuestList {
+      @tracked guests = ['Zoey', 'Tomster'];
+
+      get sortedGuests() {
+        return this.guests.slice().sort()
+      }
+    }
+  ```
+
+  Every time sortedGuests is accessed, a new array will be created and sorted,
+  because JavaScript getters do not cache by default. When the guest list
+  is small, like the one in the example, this is not a problem. However, if
+  the guest list were to grow very large, it would mean that we would be doing
+  a large amount of work each time we accessed sortedGetters. With @cached,
+  we can cache the value instead:
+
+  ```javascript
+    import { tracked, cached } from '@glimmer/tracking';
+
+    class GuestList {
+      @tracked guests = ['Zoey', 'Tomster'];
+
+      @cached
+      get sortedGuests() {
+        return this.guests.slice().sort()
+      }
+    }
+  ```
+
+  Now the sortedGuests getter will be cached based on autotracking.
+  It will only rerun and create a new sorted array when the guests tracked
+  property is updated.
+
+  ### Tradeoffs
+
+  Overuse is discouraged.
+
+  In general, you should avoid using `@cached` unless you have confirmed that
+  the getter you are decorating is computationally expensive. `@cached` adds
+  a small amount of overhead to the getter, making it more expensive.
+  While this overhead is small, if `@cached` is overused it can add up to a
+  large impact overall in your app. Many getters and tracked properties
+  are only accessed once, rendered, and then never rerendered, so adding
+  `@cached` when it is unnecessary can negatively impact performance.
+
+  Also, `@cached` may rerun even if the values themselves have not changed,
+  since tracked properties will always invalidate even if their underlying
+  value did not change.
+  For example updating an integer value from `5` to an other `5`.
+
+  Avoiding a cache invalidation in this case is not something that can
+  be achieved on the `@cached` decorator itself, but rather when updating
+  the underlying values, by applying a diff checking mecanism:
+
+  ```javascript
+  if (newValue !== this.trackedProp) {
+    this.trackedProp = newValue;
+  }
+  ```
+
+  Here equal values won't update the property, therefore not triggering a
+  cache invalidation.
+
+  The cost of these edge-guards adds up to the tradoff calculation of using
+  a caching strategy, hence requiring a very sensitive approach regarding
+  performance.
+
+  @method cached
+  @static
+  @for @glimmer/tracking
+  @public
+*/
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index e57a7e9e118..8599494cccc 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -97,6 +97,7 @@ module.exports = {
     'buildRegistry',
     'buildRouteInfoMetadata',
     'cache',
+    'cached',
     'cacheFor',
     'camelize',
     'canCatalogEntriesByType',

From 11e5c3c377b71fc02ddc1cb4aeffbf12d7bee215 Mon Sep 17 00:00:00 2001
From: Jen Weber <j@jenweber.me>
Date: Thu, 5 May 2022 21:43:52 -0400
Subject: [PATCH 0998/1405] [DOC] Improve API docs for htmlSafe

---
 .../-internals/glimmer/lib/utils/string.ts    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/string.ts b/packages/@ember/-internals/glimmer/lib/utils/string.ts
index 3f9f137dbe0..96e10828a52 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/string.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/string.ts
@@ -59,14 +59,25 @@ export function escapeExpression(string: any): string {
 }
 
 /**
-  Mark a string as safe for unescaped output with Ember templates. If you
-  return HTML from a helper, use this function to
-  ensure Ember's rendering layer does not escape the HTML.
+  Use this method to indicate that a string should be rendered as HTML
+  when the string is used in a template. To say this another way,
+  strings marked with `htmlSafe` will not be HTML escaped.
+
+  A word of warning -   The `htmlSafe` method does not make the string safe;
+  it only tells the framework to treat the string as if it is safe to render
+  as HTML. If a string contains user inputs or other untrusted
+  data, you must sanitize the string before using the `htmlSafe` method.
+  Otherwise your code is vulnerable to
+  [Cross-Site Scripting](https://owasp.org/www-community/attacks/DOM_Based_XSS).
+  There are many open source sanitization libraries to choose from,
+  both for front end and server-side sanitization.
 
   ```javascript
   import { htmlSafe } from '@ember/template';
 
-  htmlSafe('<div>someString</div>')
+  const someTrustedOrSanitizedString = "<div>Hello!</div>"
+
+  htmlSafe(someTrustedorSanitizedString)
   ```
 
   @method htmlSafe

From 8cd0b759a584977c221e6ef19df62cb4b61e63f6 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 6 May 2022 09:41:50 -0700
Subject: [PATCH 0999/1405] Convert more of @ember/controller and @ember/object
 to TS

---
 .../controller/lib/controller_mixin.d.ts      |  28 --
 ...ontroller_mixin.js => controller_mixin.ts} |  28 +-
 packages/@ember/object/computed.d.ts          | 104 -------
 .../object/{computed.js => computed.ts}       |   0
 ...{computed_macros.js => computed_macros.ts} |  55 ++--
 ...ed_macros.js => reduce_computed_macros.ts} | 290 +++++++++++++-----
 .../object/type-tests/computed/filter.test.ts |  11 +-
 .../object/type-tests/computed/uniq.test.ts   |   1 -
 8 files changed, 271 insertions(+), 246 deletions(-)
 delete mode 100644 packages/@ember/controller/lib/controller_mixin.d.ts
 rename packages/@ember/controller/lib/{controller_mixin.js => controller_mixin.ts} (62%)
 delete mode 100644 packages/@ember/object/computed.d.ts
 rename packages/@ember/object/{computed.js => computed.ts} (100%)
 rename packages/@ember/object/lib/computed/{computed_macros.js => computed_macros.ts} (92%)
 rename packages/@ember/object/lib/computed/{reduce_computed_macros.js => reduce_computed_macros.ts} (76%)

diff --git a/packages/@ember/controller/lib/controller_mixin.d.ts b/packages/@ember/controller/lib/controller_mixin.d.ts
deleted file mode 100644
index 9b9e5e5bb71..00000000000
--- a/packages/@ember/controller/lib/controller_mixin.d.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { RouteArgs } from '@ember/-internals/routing/lib/utils';
-import Mixin from '@ember/object/mixin';
-import Route from '@ember/routing/route';
-import { Transition } from 'router_js';
-
-export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string';
-export type ControllerQueryParam = string | Record<string, { type: ControllerQueryParamType }>;
-
-/* @internal */
-interface ControllerMixin<T> {
-  /** @internal */
-  _qpDelegate: unknown | null;
-
-  isController: true;
-  target: unknown | null;
-  model: T;
-
-  // From routing/lib/ext/controller
-
-  queryParams: Array<ControllerQueryParam>;
-
-  transitionToRoute(...args: RouteArgs<Route>): Transition;
-
-  replaceRoute(...args: RouteArgs<Route>): Transition;
-}
-declare const ControllerMixin: Mixin;
-
-export { ControllerMixin as default };
diff --git a/packages/@ember/controller/lib/controller_mixin.js b/packages/@ember/controller/lib/controller_mixin.ts
similarity index 62%
rename from packages/@ember/controller/lib/controller_mixin.js
rename to packages/@ember/controller/lib/controller_mixin.ts
index 6216866eb8f..9996c73af76 100644
--- a/packages/@ember/controller/lib/controller_mixin.js
+++ b/packages/@ember/controller/lib/controller_mixin.ts
@@ -1,6 +1,12 @@
 import { Mixin, computed } from '@ember/-internals/metal';
+import { RouteArgs } from '@ember/-internals/routing/lib/utils';
 import { ActionHandler } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
+import Route from '@ember/routing/route';
+import { Transition } from 'router_js';
+
+export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string';
+export type ControllerQueryParam = string | Record<string, { type: ControllerQueryParamType }>;
 
 const MODEL = symbol('MODEL');
 
@@ -14,7 +20,23 @@ const MODEL = symbol('MODEL');
   @uses Ember.ActionHandler
   @private
 */
-export default Mixin.create(ActionHandler, {
+interface ControllerMixin<T> extends ActionHandler {
+  /** @internal */
+  _qpDelegate: unknown | null;
+
+  isController: true;
+  target: unknown | null;
+  model: T;
+
+  // From routing/lib/ext/controller
+
+  queryParams: Array<ControllerQueryParam>;
+
+  transitionToRoute(...args: RouteArgs<Route>): Transition;
+
+  replaceRoute(...args: RouteArgs<Route>): Transition;
+}
+const ControllerMixin = Mixin.create(ActionHandler, {
   /* ducktype as a controller */
   isController: true,
 
@@ -50,8 +72,10 @@ export default Mixin.create(ActionHandler, {
       return this[MODEL];
     },
 
-    set(key, value) {
+    set(_key, value) {
       return (this[MODEL] = value);
     },
   }),
 });
+
+export default ControllerMixin;
diff --git a/packages/@ember/object/computed.d.ts b/packages/@ember/object/computed.d.ts
deleted file mode 100644
index b7ca23c908e..00000000000
--- a/packages/@ember/object/computed.d.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { DeprecationOptions } from '@ember/debug';
-
-export { alias, expandProperties } from '@ember/-internals/metal';
-
-export function and(dependentKey: string, ...additionalDependentKeys: string[]): PropertyDecorator;
-
-export function bool(dependentKey: string): PropertyDecorator;
-
-export function collect(
-  dependentKey: string,
-  ...additionalDependentKeys: string[]
-): PropertyDecorator;
-
-export function deprecatingAlias(
-  dependentKey: string,
-  options: DeprecationOptions
-): PropertyDecorator;
-
-export function empty(dependentKey: string): PropertyDecorator;
-
-export function equal(dependentKey: string, value: unknown): PropertyDecorator;
-
-export function filter(
-  dependentKey: string,
-  callback: (value: unknown, index: number, array: unknown[]) => boolean
-): PropertyDecorator;
-export function filter(
-  dependentKey: string,
-  additionalDependentKeys: string[],
-  callback: (value: unknown, index: number, array: unknown[]) => boolean
-): PropertyDecorator;
-
-export function filterBy(
-  dependentKey: string,
-  propertyKey: string,
-  value?: unknown
-): PropertyDecorator;
-
-export function gt(dependentKey: string, value: number): PropertyDecorator;
-
-export function gte(dependentKey: string, value: number): PropertyDecorator;
-
-export function intersect(
-  dependentKey: string,
-  ...additionalDependentKeys: string[]
-): PropertyDecorator;
-
-export function lt(dependentKey: string, value: number): PropertyDecorator;
-
-export function lte(dependentKey: string, value: number): PropertyDecorator;
-
-export function map(
-  dependentKey: string,
-  callback: (value: unknown, index: number) => boolean
-): PropertyDecorator;
-export function map(
-  dependentKey: string,
-  additionalDependentKeys: string[],
-  callback: (value: unknown, index: number) => boolean
-): PropertyDecorator;
-
-export function mapBy(dependentKey: string, propertyKey: string): PropertyDecorator;
-
-export function match(dependentKey: string, value: RegExp): PropertyDecorator;
-
-export function max(dependentKey: string): PropertyDecorator;
-
-export function min(dependentKey: string): PropertyDecorator;
-
-export function none(dependentKey: string): PropertyDecorator;
-
-export function not(dependentKey: string): PropertyDecorator;
-
-export function notEmpty(dependentKey: string): PropertyDecorator;
-
-export function oneWay(dependentKey: string): PropertyDecorator;
-
-export function or(dependentKey: string, ...additionalDependentKeys: string[]): PropertyDecorator;
-
-export function readOnly(dependentKey: string): PropertyDecorator;
-
-export function reads(dependentKey: string): PropertyDecorator;
-
-export function setDiff(setAProperty: string, setBProperty: string): PropertyDecorator;
-
-type SortDefinition = (itemA: unknown, itemB: unknown) => number;
-export function sort(itemsKey: string, sortDefinition: SortDefinition | string): PropertyDecorator;
-export function sort(
-  itemsKey: string,
-  additionalDependentKeys: string[],
-  sortDefinition: SortDefinition
-): PropertyDecorator;
-
-export function sum(dependentKey: string): PropertyDecorator;
-
-export function union(
-  dependentKey: string,
-  ...additionalDependentKeys: string[]
-): PropertyDecorator;
-
-// NOTE: Despite documentation, union and uniq are aliases, so uniq actually can take more props
-export function uniq(dependentKey: string): PropertyDecorator;
-
-export function uniqBy(dependentKey: string, propertyKey: string): PropertyDecorator;
diff --git a/packages/@ember/object/computed.js b/packages/@ember/object/computed.ts
similarity index 100%
rename from packages/@ember/object/computed.js
rename to packages/@ember/object/computed.ts
diff --git a/packages/@ember/object/lib/computed/computed_macros.js b/packages/@ember/object/lib/computed/computed_macros.ts
similarity index 92%
rename from packages/@ember/object/lib/computed/computed_macros.js
rename to packages/@ember/object/lib/computed/computed_macros.ts
index b90b08664b0..6e1abb5e82d 100644
--- a/packages/@ember/object/lib/computed/computed_macros.js
+++ b/packages/@ember/object/lib/computed/computed_macros.ts
@@ -8,21 +8,20 @@ import {
   alias,
   expandProperties,
 } from '@ember/-internals/metal';
-import { assert, deprecate } from '@ember/debug';
+import { assert, deprecate, DeprecationOptions } from '@ember/debug';
 
 /**
 @module @ember/object
 */
 
-function expandPropertiesToArray(predicateName, properties) {
-  let expandedProperties = [];
+function expandPropertiesToArray(predicateName: string, properties: string[]) {
+  let expandedProperties: string[] = [];
 
-  function extractProperty(entry) {
+  function extractProperty(entry: string) {
     expandedProperties.push(entry);
   }
 
-  for (let i = 0; i < properties.length; i++) {
-    let property = properties[i];
+  for (let property of properties) {
     assert(
       `Dependent keys passed to \`${predicateName}\` computed macro can't have spaces.`,
       property.indexOf(' ') < 0
@@ -34,8 +33,10 @@ function expandPropertiesToArray(predicateName, properties) {
   return expandedProperties;
 }
 
-function generateComputedWithPredicate(name, predicate) {
-  return (...properties) => {
+function generateComputedWithPredicate(name: string, predicate: (value: unknown) => unknown) {
+  return (dependentKey: string, ...additionalDependentKeys: string[]) => {
+    let properties = [dependentKey, ...additionalDependentKeys];
+
     assert(
       `You attempted to use @${name} as a decorator directly, but it requires at least one dependent key parameter`,
       !isElementDescriptor(properties)
@@ -47,13 +48,15 @@ function generateComputedWithPredicate(name, predicate) {
       let lastIdx = dependentKeys.length - 1;
 
       for (let i = 0; i < lastIdx; i++) {
-        let value = get(this, dependentKeys[i]);
+        // SAFETY: `i` is derived from the length of `dependentKeys`
+        let value = get(this, dependentKeys[i]!);
         if (!predicate(value)) {
           return value;
         }
       }
 
-      return get(this, dependentKeys[lastIdx]);
+      // SAFETY: `lastIdx` is derived from the length of `dependentKeys`
+      return get(this, dependentKeys[lastIdx]!);
     });
 
     return computedFunc;
@@ -98,7 +101,7 @@ function generateComputedWithPredicate(name, predicate) {
 
   @public
 */
-export function empty(dependentKey) {
+export function empty(dependentKey: string) {
   assert(
     'You attempted to use @empty as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -144,7 +147,7 @@ export function empty(dependentKey) {
   value for property is not empty.
   @public
 */
-export function notEmpty(dependentKey) {
+export function notEmpty(dependentKey: string) {
   assert(
     'You attempted to use @notEmpty as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -187,7 +190,7 @@ export function notEmpty(dependentKey) {
   value for property is null or undefined.
   @public
 */
-export function none(dependentKey) {
+export function none(dependentKey: string) {
   assert(
     'You attempted to use @none as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -229,7 +232,7 @@ export function none(dependentKey) {
   original value for property
   @public
 */
-export function not(dependentKey) {
+export function not(dependentKey: string) {
   assert(
     'You attempted to use @not as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -277,7 +280,7 @@ export function not(dependentKey) {
   original value for property
   @public
 */
-export function bool(dependentKey) {
+export function bool(dependentKey: string) {
   assert(
     'You attempted to use @bool as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -323,7 +326,7 @@ export function bool(dependentKey) {
   for property against a given RegExp
   @public
 */
-export function match(dependentKey, regexp) {
+export function match(dependentKey: string, regexp: RegExp) {
   assert(
     'You attempted to use @match as a decorator directly, but it requires `dependentKey` and `regexp` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -369,7 +372,7 @@ export function match(dependentKey, regexp) {
   original value for property is equal to the given value.
   @public
 */
-export function equal(dependentKey, value) {
+export function equal(dependentKey: string, value: unknown) {
   assert(
     'You attempted to use @equal as a decorator directly, but it requires `dependentKey` and `value` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -414,7 +417,7 @@ export function equal(dependentKey, value) {
   original value for property is greater than given value.
   @public
 */
-export function gt(dependentKey, value) {
+export function gt(dependentKey: string, value: number) {
   assert(
     'You attempted to use @gt as a decorator directly, but it requires `dependentKey` and `value` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -459,7 +462,7 @@ export function gt(dependentKey, value) {
   original value for property is greater or equal then given value.
   @public
 */
-export function gte(dependentKey, value) {
+export function gte(dependentKey: string, value: number) {
   assert(
     'You attempted to use @gte as a decorator directly, but it requires `dependentKey` and `value` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -504,7 +507,7 @@ export function gte(dependentKey, value) {
   original value for property is less then given value.
   @public
 */
-export function lt(dependentKey, value) {
+export function lt(dependentKey: string, value: number) {
   assert(
     'You attempted to use @lt as a decorator directly, but it requires `dependentKey` and `value` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -549,7 +552,7 @@ export function lt(dependentKey, value) {
   original value for property is less or equal than given value.
   @public
 */
-export function lte(dependentKey, value) {
+export function lte(dependentKey: string, value: number) {
   assert(
     'You attempted to use @lte as a decorator directly, but it requires `dependentKey` and `value` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -723,13 +726,13 @@ export const or = generateComputedWithPredicate('or', (value) => !value);
   property to the original value for property.
   @public
 */
-export function oneWay(dependentKey) {
+export function oneWay(dependentKey: string) {
   assert(
     'You attempted to use @oneWay as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return alias(dependentKey).oneWay();
+  return alias(dependentKey).oneWay() as PropertyDecorator;
 }
 
 /**
@@ -787,13 +790,13 @@ export function oneWay(dependentKey) {
   @since 1.5.0
   @public
 */
-export function readOnly(dependentKey) {
+export function readOnly(dependentKey: string) {
   assert(
     'You attempted to use @readOnly as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return alias(dependentKey).readOnly();
+  return alias(dependentKey).readOnly() as PropertyDecorator;
 }
 
 /**
@@ -831,7 +834,7 @@ export function readOnly(dependentKey) {
   @since 1.7.0
   @public
 */
-export function deprecatingAlias(dependentKey, options) {
+export function deprecatingAlias(dependentKey: string, options: DeprecationOptions) {
   assert(
     'You attempted to use @deprecatingAlias as a decorator directly, but it requires `dependentKey` and `options` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.js b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
similarity index 76%
rename from packages/@ember/object/lib/computed/reduce_computed_macros.js
rename to packages/@ember/object/lib/computed/reduce_computed_macros.ts
index ca1eb307184..cd2de4991f9 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.js
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -4,9 +4,19 @@
 import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
 import { computed, autoComputed, get, isElementDescriptor } from '@ember/-internals/metal';
-import { compare, isArray, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime';
+import { compare, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime';
+import EmberArray, { NativeArray } from '@ember/-internals/runtime/lib/mixins/array';
 
-function reduceMacro(dependentKey, callback, initialValue, name) {
+function isNativeOrEmberArray(obj: unknown): obj is unknown[] | EmberArray<unknown> {
+  return Array.isArray(obj) || EmberArray.detect(obj);
+}
+
+function reduceMacro(
+  dependentKey: string,
+  callback: (result: number, item: number) => number,
+  initialValue: number,
+  name: string
+) {
   assert(
     `Dependent key passed to \`${name}\` computed macro shouldn't contain brace expanding pattern.`,
     !/[[\]{}]/g.test(dependentKey)
@@ -18,12 +28,16 @@ function reduceMacro(dependentKey, callback, initialValue, name) {
       return initialValue;
     }
     return arr.reduce(callback, initialValue, this);
-  }).readOnly();
+  }).readOnly() as PropertyDecorator;
 }
 
-function arrayMacro(dependentKey, additionalDependentKeys, callback) {
+function arrayMacro(
+  dependentKey: string,
+  additionalDependentKeys: string[],
+  callback: (value: unknown[] | EmberArray<unknown>) => unknown[] | NativeArray<unknown>
+) {
   // This is a bit ugly
-  let propertyName;
+  let propertyName: string;
   if (/@each/.test(dependentKey)) {
     propertyName = dependentKey.replace(/\.@each.*$/, '');
   } else {
@@ -33,15 +47,19 @@ function arrayMacro(dependentKey, additionalDependentKeys, callback) {
 
   return computed(dependentKey, ...additionalDependentKeys, function () {
     let value = get(this, propertyName);
-    if (isArray(value)) {
+    if (isNativeOrEmberArray(value)) {
       return emberA(callback.call(this, value));
     } else {
       return emberA();
     }
-  }).readOnly();
+  }).readOnly() as PropertyDecorator;
 }
 
-function multiArrayMacro(_dependentKeys, callback, name) {
+function multiArrayMacro(
+  _dependentKeys: string[],
+  callback: (dependentKeys: string[]) => unknown[],
+  name: string
+): PropertyDecorator {
   assert(
     `Dependent keys passed to \`${name}\` computed macro shouldn't contain brace expanding pattern.`,
     _dependentKeys.every((dependentKey) => !/[[\]{}]/g.test(dependentKey))
@@ -50,7 +68,7 @@ function multiArrayMacro(_dependentKeys, callback, name) {
 
   return computed(...dependentKeys, function () {
     return emberA(callback.call(this, _dependentKeys));
-  }).readOnly();
+  }).readOnly() as PropertyDecorator;
 }
 
 /**
@@ -81,13 +99,13 @@ function multiArrayMacro(_dependentKeys, callback, name) {
   @since 1.4.0
   @public
 */
-export function sum(dependentKey) {
+export function sum(dependentKey: string) {
   assert(
     'You attempted to use @sum as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  return reduceMacro(dependentKey, (sum, item) => sum + item, 0, 'sum');
+  return reduceMacro(dependentKey, (sum: number, item: number) => sum + item, 0, 'sum');
 }
 
 /**
@@ -145,7 +163,7 @@ export function sum(dependentKey) {
   array
   @public
 */
-export function max(dependentKey) {
+export function max(dependentKey: string) {
   assert(
     'You attempted to use @max as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -208,7 +226,7 @@ export function max(dependentKey) {
   @return {ComputedProperty} computes the smallest value in the dependentKey's array
   @public
 */
-export function min(dependentKey) {
+export function min(dependentKey: string) {
   assert(
     'You attempted to use @min as a decorator directly, but it requires a `dependentKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -292,29 +310,52 @@ export function min(dependentKey) {
   @return {ComputedProperty} an array mapped via the callback
   @public
 */
-export function map(dependentKey, additionalDependentKeys, callback) {
+export function map(
+  dependentKey: string,
+  callback: (value: unknown, index: number) => unknown
+): PropertyDecorator;
+export function map(
+  dependentKey: string,
+  additionalDependentKeys: string[],
+  callback: (value: unknown, index: number) => unknown
+): PropertyDecorator;
+export function map(
+  dependentKey: string,
+  additionalDependentKeysOrCallback: string[] | ((value: unknown, index: number) => unknown),
+  callback?: (value: unknown, index: number) => unknown
+): PropertyDecorator {
   assert(
     'You attempted to use @map as a decorator directly, but it requires atleast `dependentKey` and `callback` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  if (callback === undefined && typeof additionalDependentKeys === 'function') {
-    callback = additionalDependentKeys;
-    additionalDependentKeys = [];
-  }
-
   assert(
     'The final parameter provided to map must be a callback function',
-    typeof callback === 'function'
+    typeof callback === 'function' ||
+      (callback === undefined && typeof additionalDependentKeysOrCallback === 'function')
   );
 
   assert(
     'The second parameter provided to map must either be the callback or an array of additional dependent keys',
-    Array.isArray(additionalDependentKeys)
+    Array.isArray(additionalDependentKeysOrCallback) ||
+      typeof additionalDependentKeysOrCallback === 'function'
   );
 
-  return arrayMacro(dependentKey, additionalDependentKeys, function (value) {
-    return value.map(callback, this);
+  let additionalDependentKeys: string[];
+
+  if (typeof additionalDependentKeysOrCallback === 'function') {
+    callback = additionalDependentKeysOrCallback;
+    additionalDependentKeys = [];
+  } else {
+    additionalDependentKeys = additionalDependentKeysOrCallback;
+  }
+
+  const cCallback = callback;
+  assert('[BUG] Missing callback', cCallback);
+
+  return arrayMacro(dependentKey, additionalDependentKeys, function (this: unknown, value) {
+    // This is so dumb...
+    return Array.isArray(value) ? value.map(cCallback, this) : value.map(cCallback, this);
   });
 }
 
@@ -366,7 +407,7 @@ export function map(dependentKey, additionalDependentKeys, callback) {
   @return {ComputedProperty} an array mapped to the specified key
   @public
 */
-export function mapBy(dependentKey, propertyKey) {
+export function mapBy(dependentKey: string, propertyKey: string) {
   assert(
     'You attempted to use @mapBy as a decorator directly, but it requires `dependentKey` and `propertyKey` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -490,30 +531,66 @@ export function mapBy(dependentKey, propertyKey) {
   @return {ComputedProperty} the filtered array
   @public
 */
-export function filter(dependentKey, additionalDependentKeys, callback) {
+export function filter(
+  dependentKey: string,
+  callback: (value: unknown, index: number, array: unknown[] | EmberArray<unknown>) => unknown
+): PropertyDecorator;
+export function filter(
+  dependentKey: string,
+  additionalDependentKeys: string[],
+  callback: (value: unknown, index: number, array: unknown[] | EmberArray<unknown>) => unknown
+): PropertyDecorator;
+export function filter(
+  dependentKey: string,
+  additionalDependentKeysOrCallback:
+    | string[]
+    | ((value: unknown, index: number, array: unknown[] | EmberArray<unknown>) => unknown),
+  callback?: (value: unknown, index: number, array: unknown[] | EmberArray<unknown>) => unknown
+): PropertyDecorator {
   assert(
     'You attempted to use @filter as a decorator directly, but it requires atleast `dependentKey` and `callback` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
-  if (callback === undefined && typeof additionalDependentKeys === 'function') {
-    callback = additionalDependentKeys;
-    additionalDependentKeys = [];
-  }
-
   assert(
     'The final parameter provided to filter must be a callback function',
-    typeof callback === 'function'
+    typeof callback === 'function' ||
+      (callback === undefined && typeof additionalDependentKeysOrCallback === 'function')
   );
 
   assert(
     'The second parameter provided to filter must either be the callback or an array of additional dependent keys',
-    Array.isArray(additionalDependentKeys)
+    Array.isArray(additionalDependentKeysOrCallback) ||
+      typeof additionalDependentKeysOrCallback === 'function'
   );
 
-  return arrayMacro(dependentKey, additionalDependentKeys, function (value) {
-    return value.filter(callback, this);
-  });
+  let additionalDependentKeys: string[];
+
+  if (typeof additionalDependentKeysOrCallback === 'function') {
+    callback = additionalDependentKeysOrCallback;
+    additionalDependentKeys = [];
+  } else {
+    additionalDependentKeys = additionalDependentKeysOrCallback;
+  }
+
+  const cCallback = callback;
+
+  return arrayMacro(
+    dependentKey,
+    additionalDependentKeys,
+    function (this: unknown, value: unknown[] | EmberArray<unknown>) {
+      // This is a really silly way to keep TS happy
+      return Array.isArray(value)
+        ? value.filter(
+            cCallback as (value: unknown, index: number, array: unknown[]) => unknown,
+            this
+          )
+        : value.filter(
+            cCallback as (value: unknown, index: number, array: EmberArray<unknown>) => unknown,
+            this
+          );
+    }
+  );
 }
 
 /**
@@ -551,7 +628,7 @@ export function filter(dependentKey, additionalDependentKeys, callback) {
   @return {ComputedProperty} the filtered array
   @public
 */
-export function filterBy(dependentKey, propertyKey, value) {
+export function filterBy(dependentKey: string, propertyKey: string, value?: unknown) {
   assert(
     'You attempted to use @filterBy as a decorator directly, but it requires atleast `dependentKey` and `propertyKey` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -564,9 +641,9 @@ export function filterBy(dependentKey, propertyKey, value) {
 
   let callback;
   if (arguments.length === 2) {
-    callback = (item) => get(item, propertyKey);
+    callback = (item: unknown) => get(item, propertyKey);
   } else {
-    callback = (item) => get(item, propertyKey) === value;
+    callback = (item: unknown) => get(item, propertyKey) === value;
   }
 
   return filter(`${dependentKey}.@each.${propertyKey}`, callback);
@@ -608,22 +685,27 @@ export function filterBy(dependentKey, propertyKey, value) {
   unique elements from the dependent array
   @public
 */
-export function uniq(...args) {
+export function uniq(
+  dependentKey: string,
+  ...additionalDependentKeys: string[]
+): PropertyDecorator {
   assert(
     'You attempted to use @uniq/@union as a decorator directly, but it requires atleast one dependent key parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
+  let args = [dependentKey, ...additionalDependentKeys];
+
   return multiArrayMacro(
     args,
-    function (dependentKeys) {
+    function (this: unknown, dependentKeys) {
       let uniq = emberA();
       let seen = new Set();
 
       dependentKeys.forEach((dependentKey) => {
         let value = get(this, dependentKey);
-        if (isArray(value)) {
-          value.forEach((item) => {
+        if (isNativeOrEmberArray(value)) {
+          value.forEach((item: unknown) => {
             if (!seen.has(item)) {
               seen.add(item);
               uniq.push(item);
@@ -675,7 +757,7 @@ export function uniq(...args) {
   unique elements from the dependent array
   @public
 */
-export function uniqBy(dependentKey, propertyKey) {
+export function uniqBy(dependentKey: string, propertyKey: string) {
   assert(
     'You attempted to use @uniqBy as a decorator directly, but it requires `dependentKey` and `propertyKey` parameters',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -688,8 +770,8 @@ export function uniqBy(dependentKey, propertyKey) {
 
   return computed(`${dependentKey}.[]`, function () {
     let list = get(this, dependentKey);
-    return isArray(list) ? uniqByArray(list, propertyKey) : emberA();
-  }).readOnly();
+    return isNativeOrEmberArray(list) ? uniqByArray(list, propertyKey) : emberA();
+  }).readOnly() as PropertyDecorator;
 }
 
 /**
@@ -774,26 +856,33 @@ export let union = uniq;
   elements from the dependent arrays
   @public
 */
-export function intersect(...args) {
+export function intersect(dependentKey: string, ...additionalDependentKeys: string[]) {
   assert(
     'You attempted to use @intersect as a decorator directly, but it requires atleast one dependent key parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
+  let args = [dependentKey, ...additionalDependentKeys];
+
   return multiArrayMacro(
     args,
-    function (dependentKeys) {
-      let arrays = dependentKeys.map((dependentKey) => {
+    function (this: unknown, dependentKeys: string[]) {
+      let arrays = dependentKeys.map((dependentKey: string) => {
         let array = get(this, dependentKey);
-        return isArray(array) ? array : [];
+        return Array.isArray(array) ? array : [];
       });
 
-      let results = arrays.pop().filter((candidate) => {
-        for (let i = 0; i < arrays.length; i++) {
+      let firstArray = arrays.pop();
+      assert(
+        'Attempted to apply multiArrayMacro for intersect without any dependentKeys',
+        firstArray
+      );
+
+      let results = firstArray.filter((candidate: unknown) => {
+        for (let array of arrays) {
           let found = false;
-          let array = arrays[i];
-          for (let j = 0; j < array.length; j++) {
-            if (array[j] === candidate) {
+          for (let item of array) {
+            if (item === candidate) {
               found = true;
               break;
             }
@@ -856,7 +945,7 @@ export function intersect(...args) {
   first dependent array that are not in the second dependent array
   @public
 */
-export function setDiff(setAProperty, setBProperty) {
+export function setDiff(setAProperty: string, setBProperty: string) {
   assert(
     'You attempted to use @setDiff as a decorator directly, but it requires atleast one dependent key parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -872,15 +961,15 @@ export function setDiff(setAProperty, setBProperty) {
     let setA = get(this, setAProperty);
     let setB = get(this, setBProperty);
 
-    if (!isArray(setA)) {
+    if (!isNativeOrEmberArray(setA)) {
       return emberA();
     }
-    if (!isArray(setB)) {
+    if (!isNativeOrEmberArray(setB)) {
       return emberA(setA);
     }
 
     return setA.filter((x) => setB.indexOf(x) === -1);
-  }).readOnly();
+  }).readOnly() as PropertyDecorator;
 }
 
 /**
@@ -914,15 +1003,17 @@ export function setDiff(setAProperty, setBProperty) {
   in properties to an array.
   @public
 */
-export function collect(...dependentKeys) {
+export function collect(dependentKey: string, ...additionalDependentKeys: string[]) {
   assert(
     'You attempted to use @collect as a decorator directly, but it requires atleast one dependent key parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
   );
 
+  let dependentKeys = [dependentKey, ...additionalDependentKeys];
+
   return multiArrayMacro(
     dependentKeys,
-    function () {
+    function (this: unknown) {
       let res = dependentKeys.map((key) => {
         let val = get(this, key);
         return val === undefined ? null : val;
@@ -934,6 +1025,8 @@ export function collect(...dependentKeys) {
   );
 }
 
+type SortDefinition = (itemA: unknown, itemB: unknown) => number;
+
 /**
   A computed property which returns a new array with all the properties from the
   first dependent array sorted based on a property or sort function. The sort
@@ -1073,7 +1166,17 @@ export function collect(...dependentKeys) {
   property array or callback function
   @public
 */
-export function sort(itemsKey, additionalDependentKeys, sortDefinition) {
+export function sort(itemsKey: string, sortDefinition: SortDefinition | string): PropertyDecorator;
+export function sort(
+  itemsKey: string,
+  additionalDependentKeys: string[],
+  sortDefinition: SortDefinition
+): PropertyDecorator;
+export function sort(
+  itemsKey: string,
+  additionalDependentKeysOrDefinition: SortDefinition | string | string[],
+  sortDefinition?: SortDefinition
+): PropertyDecorator {
   assert(
     'You attempted to use @sort as a decorator directly, but it requires atleast an `itemsKey` parameter',
     !isElementDescriptor(Array.prototype.slice.call(arguments))
@@ -1085,14 +1188,14 @@ export function sort(itemsKey, additionalDependentKeys, sortDefinition) {
     if (arguments.length === 2) {
       argumentsValid =
         typeof itemsKey === 'string' &&
-        (typeof additionalDependentKeys === 'string' ||
-          typeof additionalDependentKeys === 'function');
+        (typeof additionalDependentKeysOrDefinition === 'string' ||
+          typeof additionalDependentKeysOrDefinition === 'function');
     }
 
     if (arguments.length === 3) {
       argumentsValid =
         typeof itemsKey === 'string' &&
-        Array.isArray(additionalDependentKeys) &&
+        Array.isArray(additionalDependentKeysOrDefinition) &&
         typeof sortDefinition === 'function';
     }
 
@@ -1102,40 +1205,52 @@ export function sort(itemsKey, additionalDependentKeys, sortDefinition) {
     );
   }
 
-  if (sortDefinition === undefined && !Array.isArray(additionalDependentKeys)) {
-    sortDefinition = additionalDependentKeys;
+  let additionalDependentKeys: string[];
+  let sortDefinitionOrString: SortDefinition | string;
+
+  if (Array.isArray(additionalDependentKeysOrDefinition)) {
+    additionalDependentKeys = additionalDependentKeysOrDefinition;
+    sortDefinitionOrString = sortDefinition!;
+  } else {
     additionalDependentKeys = [];
+    sortDefinitionOrString = additionalDependentKeysOrDefinition;
   }
 
-  if (typeof sortDefinition === 'function') {
-    return customSort(itemsKey, additionalDependentKeys, sortDefinition);
+  if (typeof sortDefinitionOrString === 'function') {
+    return customSort(itemsKey, additionalDependentKeys, sortDefinitionOrString);
   } else {
-    return propertySort(itemsKey, sortDefinition);
+    return propertySort(itemsKey, sortDefinitionOrString);
   }
 }
 
-function customSort(itemsKey, additionalDependentKeys, comparator) {
-  return arrayMacro(itemsKey, additionalDependentKeys, function (value) {
+function customSort(
+  itemsKey: string,
+  additionalDependentKeys: string[],
+  comparator: SortDefinition
+) {
+  return arrayMacro(itemsKey, additionalDependentKeys, function (this: unknown, value) {
     return value.slice().sort((x, y) => comparator.call(this, x, y));
   });
 }
 
 // This one needs to dynamically set up and tear down observers on the itemsKey
 // depending on the sortProperties
-function propertySort(itemsKey, sortPropertiesKey) {
-  let cp = autoComputed(function (key) {
+function propertySort(itemsKey: string, sortPropertiesKey: string): PropertyDecorator {
+  let cp = autoComputed(function (this: unknown, key: string) {
     let sortProperties = get(this, sortPropertiesKey);
 
     assert(
       `The sort definition for '${key}' on ${this} must be a function or an array of strings`,
-      isArray(sortProperties) && sortProperties.every((s) => typeof s === 'string')
+      (function (arr: unknown): arr is string[] | EmberArray<string> {
+        return isNativeOrEmberArray(arr) && arr.every((s) => typeof s === 'string');
+      })(sortProperties)
     );
 
     let itemsKeyIsAtThis = itemsKey === '@this';
     let normalizedSortProperties = normalizeSortProperties(sortProperties);
 
     let items = itemsKeyIsAtThis ? this : get(this, itemsKey);
-    if (!isArray(items)) {
+    if (!isNativeOrEmberArray(items)) {
       return emberA();
     }
 
@@ -1146,23 +1261,30 @@ function propertySort(itemsKey, sortPropertiesKey) {
     }
   }).readOnly();
 
-  return cp;
+  return cp as PropertyDecorator;
 }
 
-function normalizeSortProperties(sortProperties) {
-  return sortProperties.map((p) => {
+function normalizeSortProperties(sortProperties: string[] | EmberArray<string>) {
+  let callback = (p: string): [prop: string, direction: string] => {
     let [prop, direction] = p.split(':');
     direction = direction || 'asc';
 
-    return [prop, direction];
-  });
+    // SAFETY: There will always be at least one value returned by split
+    return [prop!, direction];
+  };
+  // This nonsense is necessary since technically the two map implementations diverge.
+  return Array.isArray(sortProperties)
+    ? sortProperties.map(callback)
+    : sortProperties.map(callback);
 }
 
-function sortByNormalizedSortProperties(items, normalizedSortProperties) {
+function sortByNormalizedSortProperties(
+  items: unknown[] | EmberArray<unknown>,
+  normalizedSortProperties: [prop: string, direction: string][]
+) {
   return emberA(
-    items.slice().sort((itemA, itemB) => {
-      for (let i = 0; i < normalizedSortProperties.length; i++) {
-        let [prop, direction] = normalizedSortProperties[i];
+    items.slice().sort((itemA: unknown, itemB: unknown) => {
+      for (let [prop, direction] of normalizedSortProperties) {
         let result = compare(get(itemA, prop), get(itemB, prop));
         if (result !== 0) {
           return direction === 'desc' ? -1 * result : result;
diff --git a/packages/@ember/object/type-tests/computed/filter.test.ts b/packages/@ember/object/type-tests/computed/filter.test.ts
index eb41768c6b6..2a98922ca41 100644
--- a/packages/@ember/object/type-tests/computed/filter.test.ts
+++ b/packages/@ember/object/type-tests/computed/filter.test.ts
@@ -1,3 +1,4 @@
+import EmberArray from '@ember/array';
 import { filter } from '@ember/object/computed';
 import { expectTypeOf } from 'expect-type';
 
@@ -7,7 +8,15 @@ class Foo {
   @filter('foo', (item: unknown) => Boolean(item))
   declare filter: unknown[];
 
-  @filter('foo', (item: unknown, index: number, array: unknown[]) => item === array[index])
+  @filter('foo', (item: unknown, index: number, array: unknown[] | EmberArray<unknown>) => {
+    let value;
+    if (Array.isArray(array)) {
+      value = array[index];
+    } else {
+      value = array.objectAt(index);
+    }
+    return item === value;
+  })
   declare filter2: unknown[];
 
   @filter('foo', ['baz', 'qux'], (item: unknown) => Boolean(item))
diff --git a/packages/@ember/object/type-tests/computed/uniq.test.ts b/packages/@ember/object/type-tests/computed/uniq.test.ts
index 4275c48b1b4..231196d357e 100644
--- a/packages/@ember/object/type-tests/computed/uniq.test.ts
+++ b/packages/@ember/object/type-tests/computed/uniq.test.ts
@@ -6,7 +6,6 @@ expectTypeOf(uniq('foo')).toEqualTypeOf<PropertyDecorator>();
 class Foo {
   @uniq('foo') declare uniq: unknown[];
 
-  // @ts-expect-error only allows a single key
   @uniq('foo', 'bar') declare uniq2: unknown[];
 
   // @ts-expect-error it requires a key

From 127bbf36028a0980c30be6563a054c1c262c1384 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 6 May 2022 11:12:27 -0700
Subject: [PATCH 1000/1405] Correct some types for internals

---
 packages/@ember/-internals/metal/lib/computed.ts  |  4 ++--
 .../-internals/runtime/lib/mixins/array.d.ts      | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index bfbb295f18a..a8d0c5f8193 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -903,8 +903,8 @@ export function computed(
 }
 
 export function autoComputed(
-  ...config: [ComputedPropertyObj]
-): ComputedDecorator | DecoratorPropertyDescriptor {
+  ...config: [ComputedPropertyObj | ComputedPropertyGetterFunction]
+): ComputedDecorator {
   // SAFETY: We passed in the impl for this class
   return makeComputedDecorator(
     new AutoComputedProperty(config),
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index 73298652fa9..a61eb2cde77 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -26,27 +26,27 @@ interface EmberArray<T> extends Enumerable {
   ): NativeArray<U>;
   mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
   filter<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
   ): NativeArray<T>;
   reject<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
   ): NativeArray<T>;
   filterBy(key: string): NativeArray<T>;
   rejectBy(key: string): NativeArray<T>;
   find<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
   ): T | undefined;
   findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
   every<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
   ): boolean;
   isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
   any<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => boolean,
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
   ): boolean;
   isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
@@ -103,5 +103,8 @@ export function A<A>(arr: A): A extends Array<infer V> ? NativeArray<V> : Native
 export function A<T>(): NativeArray<T>;
 
 export function removeAt<T>(array: T[] | EmberArray<T>, start: number, len: number): EmberArray<T>;
-export function uniqBy<T>(array: T[], keyOrFunc: string | ((item: T) => unknown)): T[];
+export function uniqBy<T>(
+  array: T[] | EmberArray<T>,
+  keyOrFunc: string | ((item: T) => unknown)
+): T[] | EmberArray<T>;
 export function isArray(obj: unknown): boolean;

From 447bb0795efe4b9424f26f91e2fb6b311aa2bf50 Mon Sep 17 00:00:00 2001
From: Scott Newcomer <snewcomer24@gmail.com>
Date: Tue, 10 May 2022 07:26:45 -0500
Subject: [PATCH 1001/1405] feat: import type

---
 .eslintrc.js                                  |  1 +
 .../-internals/container/lib/container.ts     |  6 ++-
 .../-internals/container/lib/registry.ts      |  7 ++--
 .../lib/container_debug_adapter.ts            | 14 +++----
 .../extension-support/lib/data_adapter.ts     | 16 ++++----
 .../glimmer/lib/component-managers/curly.ts   | 22 +++++------
 .../glimmer/lib/component-managers/mount.ts   |  9 +++--
 .../glimmer/lib/component-managers/outlet.ts  | 15 ++++----
 .../glimmer/lib/component-managers/root.ts    |  6 +--
 .../-internals/glimmer/lib/component.ts       |  7 ++--
 .../glimmer/lib/components/abstract-input.ts  |  6 ++-
 .../glimmer/lib/components/internal.ts        |  8 ++--
 .../glimmer/lib/components/link-to.ts         |  6 +--
 .../-internals/glimmer/lib/environment.ts     |  6 +--
 .../@ember/-internals/glimmer/lib/helper.ts   | 10 +++--
 .../helpers/-disallow-dynamic-resolution.ts   |  2 +-
 .../lib/helpers/-in-element-null-check.ts     |  2 +-
 .../glimmer/lib/helpers/-normalize-class.ts   |  2 +-
 .../glimmer/lib/helpers/-resolve.ts           |  4 +-
 .../glimmer/lib/helpers/-track-array.ts       |  2 +-
 .../-internals/glimmer/lib/helpers/action.ts  | 13 ++-----
 .../-internals/glimmer/lib/helpers/each-in.ts |  2 +-
 .../glimmer/lib/helpers/internal-helper.ts    |  4 +-
 .../-internals/glimmer/lib/helpers/mut.ts     |  2 +-
 .../glimmer/lib/helpers/readonly.ts           |  2 +-
 .../-internals/glimmer/lib/helpers/unbound.ts |  2 +-
 .../glimmer/lib/helpers/unique-id.ts          |  3 +-
 .../glimmer/lib/modifiers/action.ts           |  9 +++--
 .../glimmer/lib/modifiers/internal.ts         |  7 ++--
 .../@ember/-internals/glimmer/lib/renderer.ts | 18 +++++----
 .../@ember/-internals/glimmer/lib/resolver.ts |  7 ++--
 .../-internals/glimmer/lib/setup-registry.ts  |  3 +-
 .../-internals/glimmer/lib/syntax/mount.ts    | 11 ++++--
 .../-internals/glimmer/lib/syntax/outlet.ts   | 15 +++++---
 .../-internals/glimmer/lib/syntax/utils.ts    |  2 +-
 .../@ember/-internals/glimmer/lib/template.ts |  6 ++-
 .../glimmer/lib/template_registry.ts          |  2 +-
 .../glimmer/lib/templates/empty.d.ts          |  2 +-
 .../glimmer/lib/templates/input.d.ts          |  2 +-
 .../glimmer/lib/templates/link-to.d.ts        |  2 +-
 .../glimmer/lib/templates/outlet.d.ts         |  2 +-
 .../glimmer/lib/templates/root.d.ts           |  2 +-
 .../glimmer/lib/templates/textarea.d.ts       |  2 +-
 .../-internals/glimmer/lib/utils/bindings.ts  |  6 +--
 .../lib/utils/curly-component-state-bucket.ts | 10 +++--
 .../-internals/glimmer/lib/utils/iterator.ts  |  6 +--
 .../-internals/glimmer/lib/utils/managers.ts  |  4 +-
 .../-internals/glimmer/lib/utils/outlet.ts    |  4 +-
 .../glimmer/lib/utils/process-args.ts         |  5 ++-
 .../-internals/glimmer/lib/views/outlet.ts    | 18 +++++----
 .../application/debug-render-tree-test.ts     | 12 +++---
 packages/@ember/-internals/meta/lib/meta.ts   |  4 +-
 packages/@ember/-internals/metal/lib/alias.ts |  7 ++--
 packages/@ember/-internals/metal/lib/array.ts |  2 +-
 .../@ember/-internals/metal/lib/chain-tags.ts |  6 +--
 .../@ember/-internals/metal/lib/computed.ts   | 15 +++++---
 .../@ember/-internals/metal/lib/decorator.ts  |  3 +-
 .../metal/lib/deprecate_property.ts           |  2 +-
 .../@ember/-internals/metal/lib/events.ts     |  5 ++-
 .../-internals/metal/lib/injected_property.ts |  3 +-
 packages/@ember/-internals/metal/lib/mixin.ts | 17 ++++-----
 .../@ember/-internals/metal/lib/observer.ts   |  3 +-
 .../@ember/-internals/metal/lib/properties.ts |  6 ++-
 .../-internals/metal/lib/property_events.ts   |  3 +-
 .../-internals/metal/lib/property_get.ts      |  2 +-
 packages/@ember/-internals/metal/lib/tags.ts  |  3 +-
 .../@ember/-internals/metal/lib/tracked.ts    | 11 ++----
 packages/@ember/-internals/owner/index.ts     |  4 +-
 .../-internals/routing/lib/ext/controller.ts  |  9 +++--
 .../routing/lib/location/auto_location.ts     |  4 +-
 .../routing/lib/location/hash_location.ts     |  2 +-
 .../routing/lib/location/history_location.ts  |  2 +-
 .../routing/lib/location/none_location.ts     |  2 +-
 .../-internals/routing/lib/services/router.ts |  7 ++--
 .../routing/lib/services/routing.ts           |  6 +--
 .../routing/lib/system/controller_for.ts      |  4 +-
 .../-internals/routing/lib/system/dsl.ts      |  8 ++--
 .../routing/lib/system/generate_controller.ts |  2 +-
 .../-internals/routing/lib/system/route.ts    | 21 +++++-----
 .../-internals/routing/lib/system/router.ts   | 38 +++++++++----------
 .../routing/lib/system/router_state.ts        |  7 ++--
 .../@ember/-internals/routing/lib/utils.ts    | 11 ++++--
 .../@ember/-internals/runtime/lib/compare.ts  |  3 +-
 .../-internals/runtime/lib/mixins/-proxy.ts   |  3 +-
 .../-internals/runtime/lib/mixins/array.d.ts  |  8 ++--
 .../runtime/lib/mixins/container_proxy.ts     |  7 ++--
 .../runtime/lib/mixins/promise_proxy.ts       |  6 +--
 .../runtime/lib/mixins/registry_proxy.ts      |  8 ++--
 .../runtime/lib/system/array_proxy.ts         | 16 +++-----
 .../runtime/lib/system/core_object.ts         |  3 +-
 .../-internals/utils/lib/ember-array.ts       |  2 +-
 .../@ember/-internals/utils/lib/is_proxy.ts   |  2 +-
 .../-internals/utils/lib/mandatory-setter.ts  |  2 +-
 .../-internals/views/lib/component_lookup.ts  |  2 +-
 .../views/lib/mixins/child_views_support.ts   |  2 +-
 .../views/lib/mixins/view_support.ts          |  4 +-
 .../views/lib/system/event_dispatcher.ts      |  6 +--
 .../-internals/views/lib/system/utils.ts      |  9 +++--
 .../-internals/views/lib/views/core_view.ts   |  5 ++-
 .../-internals/views/lib/views/states.ts      |  2 +-
 .../views/lib/views/states/has_element.ts     |  2 +-
 packages/@ember/application/instance.ts       | 11 +++---
 .../@ember/application/lib/application.ts     | 10 +++--
 .../application/type-tests/index.test.ts      |  6 +--
 .../application/type-tests/instance.test.ts   |  7 ++--
 packages/@ember/array/type-tests/index.ts     |  6 ++-
 packages/@ember/array/type-tests/mutable.ts   |  2 +-
 packages/@ember/array/type-tests/proxy.ts     |  6 ++-
 .../type-tests/get-component-template.test.ts |  2 +-
 .../type-tests/helper/helper.test.ts          |  2 +-
 .../component/type-tests/helper/index.test.ts |  4 +-
 .../@ember/component/type-tests/index.test.ts |  4 +-
 .../type-tests/set-component-manager.test.ts  |  4 +-
 .../type-tests/set-component-template.test.ts |  2 +-
 .../type-tests/template-only.test.ts          |  2 +-
 packages/@ember/controller/index.ts           |  2 +-
 .../@ember/controller/lib/controller_mixin.ts |  6 +--
 .../controller/type-tests/index.test.ts       |  2 +-
 packages/@ember/debug/index.ts                |  8 ++--
 .../@ember/debug/lib/capture-render-tree.ts   |  6 +--
 packages/@ember/debug/lib/deprecate.ts        |  3 +-
 packages/@ember/debug/lib/warn.ts             |  3 +-
 .../register-deprecation-handler.test.ts      |  4 +-
 .../type-tests/register-warn-handler.test.ts  |  4 +-
 packages/@ember/engine/index.ts               |  5 ++-
 packages/@ember/engine/instance.ts            |  6 +--
 packages/@ember/engine/lib/engine-parent.ts   |  2 +-
 .../@ember/engine/type-tests/index.test.ts    | 11 +++---
 .../@ember/engine/type-tests/instance.test.ts |  4 +-
 .../helper/type-tests/invoke-helper.test.ts   |  2 +-
 .../type-tests/set-helper-manager.test.ts     |  8 +++-
 packages/@ember/object/compat.ts              |  8 ++--
 .../object/lib/computed/computed_macros.ts    |  3 +-
 .../lib/computed/reduce_computed_macros.ts    |  3 +-
 .../object/type-tests/computed/alias.test.ts  |  2 +-
 .../object/type-tests/computed/filter.test.ts |  2 +-
 .../object/type-tests/core/index.test.ts      |  2 +-
 .../object/type-tests/ember-object.test.ts    |  2 +-
 .../object/type-tests/evented/index.test.ts   |  4 +-
 .../object/type-tests/events/index.test.ts    |  2 +-
 .../type-tests/observable/index.test.ts       |  4 +-
 .../routing/type-tests/auto-location.test.ts  |  6 +--
 .../routing/type-tests/hash-location.test.ts  |  6 +--
 .../type-tests/history-location.test.ts       |  6 +--
 .../@ember/routing/type-tests/link-to.test.ts |  2 +-
 .../routing/type-tests/location.test.ts       |  3 +-
 .../routing/type-tests/none-location.test.ts  |  6 +--
 .../routing/type-tests/route/index.test.ts    |  8 ++--
 .../type-tests/route/overrides.test.ts        |  6 +--
 .../type-tests/route/query-params.test.ts     |  2 +-
 .../routing/type-tests/route/send.test.ts     |  2 +-
 .../routing/type-tests/router-service.test.ts | 12 +++---
 .../routing/type-tests/router/index.test.ts   | 10 ++---
 packages/@ember/runloop/index.ts              |  5 ++-
 .../runloop/type-tests.ts/debounce.test.ts    |  2 +-
 .../runloop/type-tests.ts/later.test.ts       |  3 +-
 .../@ember/runloop/type-tests.ts/next.test.ts |  3 +-
 .../@ember/runloop/type-tests.ts/once.test.ts |  3 +-
 .../type-tests.ts/schedule-once.test.ts       |  3 +-
 .../runloop/type-tests.ts/schedule.test.ts    |  3 +-
 .../runloop/type-tests.ts/throttle.test.ts    |  2 +-
 packages/@ember/service/index.ts              |  7 +---
 .../@ember/service/type-tests/index.test.ts   |  4 +-
 packages/@ember/string/index.ts               |  2 +-
 .../@ember/template/type-tests/index.test.ts  |  2 +-
 .../lib/plugins/assert-against-attrs.ts       |  4 +-
 .../plugins/assert-against-named-outlets.ts   |  4 +-
 .../assert-input-helper-without-block.ts      |  4 +-
 .../assert-reserved-named-arguments.ts        |  4 +-
 .../plugins/assert-splattribute-expression.ts |  4 +-
 .../lib/plugins/transform-action-syntax.ts    |  4 +-
 .../plugins/transform-each-in-into-each.ts    |  4 +-
 .../lib/plugins/transform-each-track-array.ts |  4 +-
 .../lib/plugins/transform-in-element.ts       |  4 +-
 ...form-quoted-bindings-into-just-bindings.ts |  2 +-
 .../lib/plugins/transform-resolutions.ts      |  5 ++-
 .../transform-wrap-mount-and-outlet.ts        |  4 +-
 .../lib/plugins/utils.ts                      |  2 +-
 .../lib/system/bootstrap.ts                   |  2 +-
 .../lib/system/calculate-location-display.ts  |  2 +-
 .../lib/system/compile-options.ts             |  2 +-
 .../lib/system/compile.ts                     |  2 +-
 .../lib/system/precompile.ts                  |  2 +-
 .../ember-template-compiler/lib/types.d.ts    |  2 +-
 .../tests/utils/transform-test-case.ts        |  4 +-
 .../internal-test-helpers/lib/build-owner.ts  |  4 +-
 packages/internal-test-helpers/lib/compile.ts |  5 ++-
 .../lib/define-template-values.ts             |  2 +-
 .../lib/ember-dev/assertion.ts                |  3 +-
 .../lib/ember-dev/debug.ts                    |  2 +-
 .../lib/ember-dev/deprecation.ts              |  3 +-
 .../lib/ember-dev/method-call-tracker.ts      |  3 +-
 .../lib/ember-dev/setup-qunit.ts              |  2 +-
 .../lib/ember-dev/warning.ts                  |  3 +-
 .../internal-test-helpers/lib/module-for.ts   |  5 ++-
 .../internal-test-helpers/lib/node-query.ts   | 10 +----
 .../lib/registry-check.ts                     |  2 +-
 .../lib/test-cases/abstract-application.ts    | 10 +++--
 .../lib/test-cases/application.ts             |  4 +-
 .../lib/test-cases/autoboot-application.ts    |  2 +-
 .../lib/test-cases/query-param.ts             |  4 +-
 .../lib/test-cases/rendering.ts               | 18 +++++----
 .../lib/test-cases/router-non-application.ts  | 16 +++++---
 .../test-cases/test-resolver-application.ts   |  5 ++-
 .../lib/test-resolver.ts                      |  4 +-
 205 files changed, 583 insertions(+), 520 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index fe4278a1baa..921dc164dd6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -56,6 +56,7 @@ module.exports = {
         '@typescript-eslint/no-empty-function': 'off',
         '@typescript-eslint/no-this-alias': 'off',
         '@typescript-eslint/no-var-requires': 'warn',
+        '@typescript-eslint/consistent-type-imports': 'error',
 
         // TODO: Enable and fix these rules
         // Typescript provides better types with these rules enabled
diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 976cb3e77a9..af6e4a5df6f 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,8 +1,10 @@
-import { Factory, FactoryClass, Owner, setOwner } from '@ember/-internals/owner';
+import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
+import { setOwner } from '@ember/-internals/owner';
 import { dictionary } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import Registry, { DebugRegistry, TypeOptions } from './registry';
+import type { DebugRegistry, TypeOptions } from './registry';
+import type Registry from './registry';
 
 interface LeakTracking {
   hasContainers(): boolean;
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index b5dc40f591e..86ecc34ed3a 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,9 +1,10 @@
-import { Factory } from '@ember/-internals/owner';
+import type { Factory } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
-import { set } from '@ember/object';
+import type { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
-import Container, { ContainerOptions, LazyInjection } from './container';
+import type { ContainerOptions, LazyInjection } from './container';
+import Container from './container';
 
 export interface Injection {
   property: string;
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
index 9d81d7dc569..36cdb3aeb42 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
@@ -1,13 +1,9 @@
 import { classify, dasherize } from '@ember/string';
-import {
-  A as emberA,
-  typeOf,
-  Namespace,
-  Object as EmberObject,
-  NativeArray,
-} from '@ember/-internals/runtime';
-import { getOwner, Owner } from '@ember/-internals/owner';
-import { Resolver } from '@ember/-internals/container/lib/registry';
+import type { NativeArray } from '@ember/-internals/runtime';
+import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-internals/runtime';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import type { Resolver } from '@ember/-internals/container/lib/registry';
 
 /**
 @module @ember/debug
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.ts b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
index beb965a0e9c..96a756dd90a 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
@@ -1,15 +1,13 @@
-import { getOwner, Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { _backburner } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
-import {
-  Namespace,
-  Object as EmberObject,
-  A as emberA,
-  NativeArray,
-} from '@ember/-internals/runtime';
-import { consumeTag, createCache, getValue, tagFor, untrack, Cache } from '@glimmer/validator';
-import { ContainerDebugAdapter } from '..';
+import type { NativeArray } from '@ember/-internals/runtime';
+import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import type { Cache } from '@glimmer/validator';
+import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
+import type { ContainerDebugAdapter } from '..';
 
 type RecordColor = 'black' | 'red' | 'blue' | 'green';
 
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index ca2471be2d4..180e2b70293 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,10 +1,11 @@
-import { Factory, getOwner, Owner, setOwner } from '@ember/-internals/owner';
+import type { Factory, Owner } from '@ember/-internals/owner';
+import { getOwner, setOwner } from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
-import {
+import type {
   Bounds,
   CapturedArguments,
   CompilableProgram,
@@ -20,13 +21,8 @@ import {
   WithDynamicLayout,
   WithDynamicTagName,
 } from '@glimmer/interfaces';
-import {
-  childRefFor,
-  createComputeRef,
-  createPrimitiveRef,
-  Reference,
-  valueForRef,
-} from '@glimmer/reference';
+import type { Reference } from '@glimmer/reference';
+import { childRefFor, createComputeRef, createPrimitiveRef, valueForRef } from '@glimmer/reference';
 import { reifyPositional } from '@glimmer/runtime';
 import { EMPTY_ARRAY, unwrapTemplate } from '@glimmer/util';
 import {
@@ -38,10 +34,10 @@ import {
   validateTag,
   valueForTag,
 } from '@glimmer/validator';
-import { SimpleElement } from '@simple-dom/interface';
-import Component from '../component';
-import { DynamicScope } from '../renderer';
-import RuntimeResolver from '../resolver';
+import type { SimpleElement } from '@simple-dom/interface';
+import type Component from '../component';
+import type { DynamicScope } from '../renderer';
+import type RuntimeResolver from '../resolver';
 import { isTemplateFactory } from '../template';
 import {
   createClassNameBindingRef,
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index cf9482bf2d4..eca2486d3b6 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,9 +1,9 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { generateControllerFactory } from '@ember/-internals/routing';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { associateDestroyableChild } from '@glimmer/destroyable';
-import {
+import type {
   CapturedArguments,
   ComponentDefinition,
   CustomRenderNode,
@@ -19,9 +19,10 @@ import {
   WithSubOwner,
 } from '@glimmer/interfaces';
 import { capabilityFlagsFrom } from '@glimmer/manager';
-import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
+import type { Reference } from '@glimmer/reference';
+import { createConstRef, valueForRef } from '@glimmer/reference';
 import { unwrapTemplate } from '@glimmer/util';
-import RuntimeResolver from '../resolver';
+import type RuntimeResolver from '../resolver';
 
 interface EngineState {
   engine: EngineInstance;
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index d60f494d666..df836e6f5ce 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -1,10 +1,10 @@
 import { ENV } from '@ember/-internals/environment';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { _instrumentStart } from '@ember/instrumentation';
-import {
+import type {
   CapturedArguments,
   CompilableProgram,
   ComponentDefinition,
@@ -21,14 +21,15 @@ import {
   WithDynamicTagName,
 } from '@glimmer/interfaces';
 import { capabilityFlagsFrom } from '@glimmer/manager';
-import { createConstRef, Reference, valueForRef } from '@glimmer/reference';
+import type { Reference } from '@glimmer/reference';
+import { createConstRef, valueForRef } from '@glimmer/reference';
 import { EMPTY_ARGS } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 
-import { SimpleElement } from '@simple-dom/interface';
-import { DynamicScope } from '../renderer';
-import { OutletState } from '../utils/outlet';
-import OutletView from '../views/outlet';
+import type { SimpleElement } from '@simple-dom/interface';
+import type { DynamicScope } from '../renderer';
+import type { OutletState } from '../utils/outlet';
+import type OutletView from '../views/outlet';
 
 function instrumentationPayload(def: OutletDefinitionState) {
   return { object: `${def.name}:${def.outlet}` };
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index 2b964149c17..7dc608f6ada 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -1,7 +1,7 @@
 import { getFactoryFor } from '@ember/-internals/container';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
-import {
+import type {
   ComponentDefinition,
   Environment,
   InternalComponentCapabilities,
@@ -11,8 +11,8 @@ import {
 } from '@glimmer/interfaces';
 import { capabilityFlagsFrom } from '@glimmer/manager';
 import { CONSTANT_TAG, consumeTag } from '@glimmer/validator';
-import Component from '../component';
-import { DynamicScope } from '../renderer';
+import type Component from '../component';
+import type { DynamicScope } from '../renderer';
 import ComponentStateBucket from '../utils/curly-component-state-bucket';
 import CurlyComponentManager, {
   DIRTY_TAG,
diff --git a/packages/@ember/-internals/glimmer/lib/component.ts b/packages/@ember/-internals/glimmer/lib/component.ts
index 27f681b4351..12c2ca543e6 100644
--- a/packages/@ember/-internals/glimmer/lib/component.ts
+++ b/packages/@ember/-internals/glimmer/lib/component.ts
@@ -1,5 +1,5 @@
 import { get, PROPERTY_DID_CHANGE } from '@ember/-internals/metal';
-import { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
+import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
 import { getOwner } from '@ember/-internals/owner';
 import { TargetActionSupport } from '@ember/-internals/runtime';
 import {
@@ -14,11 +14,12 @@ import {
 } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { Environment, Template, TemplateFactory } from '@glimmer/interfaces';
+import type { Environment, Template, TemplateFactory } from '@glimmer/interfaces';
 import { setInternalComponentManager } from '@glimmer/manager';
 import { isUpdatableRef, updateRef } from '@glimmer/reference';
 import { normalizeProperty } from '@glimmer/runtime';
-import { createTag, DirtyableTag, dirtyTag } from '@glimmer/validator';
+import type { DirtyableTag } from '@glimmer/validator';
+import { createTag, dirtyTag } from '@glimmer/validator';
 import { Namespace } from '@simple-dom/interface';
 import {
   ARGS,
diff --git a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
index d0c6acdb5e3..01bae28b626 100644
--- a/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/abstract-input.ts
@@ -1,8 +1,10 @@
 import { tracked } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 import { action } from '@ember/object';
-import { isConstRef, isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
-import InternalComponent, { EventListener } from './internal';
+import type { Reference } from '@glimmer/reference';
+import { isConstRef, isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
+import type { EventListener } from './internal';
+import InternalComponent from './internal';
 
 const UNINITIALIZED: unknown = Object.freeze({});
 
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 147f032a443..8d2c66af8ca 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -1,7 +1,8 @@
-import { Owner, setOwner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
+import { setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import {
+import type {
   CapturedArguments,
   Destroyable,
   DynamicScope,
@@ -13,7 +14,8 @@ import {
   WithCreateInstance,
 } from '@glimmer/interfaces';
 import { setComponentTemplate, setInternalComponentManager } from '@glimmer/manager';
-import { createConstRef, isConstRef, Reference, valueForRef } from '@glimmer/reference';
+import type { Reference } from '@glimmer/reference';
+import { createConstRef, isConstRef, valueForRef } from '@glimmer/reference';
 import { untrack } from '@glimmer/validator';
 
 function NOOP(): void {}
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index ac5c4eccb52..7973fb716c6 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,4 +1,4 @@
-import { Route, RouterState, RoutingService } from '@ember/-internals/routing';
+import type { Route, RouterState, RoutingService } from '@ember/-internals/routing';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { getEngineParent } from '@ember/engine';
@@ -7,9 +7,9 @@ import { flaggedInstrument } from '@ember/instrumentation';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import { Maybe, Option } from '@glimmer/interfaces';
+import type { Maybe, Option } from '@glimmer/interfaces';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
-import { Transition } from 'router_js';
+import type { Transition } from 'router_js';
 import LinkToTemplate from '../templates/link-to';
 import InternalComponent, { opaquify } from './internal';
 
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 10628457e2f..4265a73f819 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -1,15 +1,15 @@
 import { ENV } from '@ember/-internals/environment';
 import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import { assert, deprecate, warn } from '@ember/debug';
-import { DeprecationOptions } from '@ember/debug/lib/deprecate';
+import type { DeprecationOptions } from '@ember/debug/lib/deprecate';
 import { schedule, _backburner } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
-import { EnvironmentDelegate } from '@glimmer/runtime';
+import type { EnvironmentDelegate } from '@glimmer/runtime';
 import { setTrackingTransactionEnv } from '@glimmer/validator';
 import toIterator from './utils/iterator';
 import { isHTMLSafe } from './utils/string';
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 072e5acc111..0e652396cf1 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -2,15 +2,17 @@
 @module @ember/component
 */
 
-import { FactoryManager } from '@ember/-internals/container/lib/container';
-import { Factory, Owner, setOwner } from '@ember/-internals/owner';
+import type { FactoryManager } from '@ember/-internals/container/lib/container';
+import type { Factory, Owner } from '@ember/-internals/owner';
+import { setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { join } from '@ember/runloop';
-import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
+import type { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { getInternalHelperManager, helperCapabilities, setHelperManager } from '@glimmer/manager';
-import { consumeTag, createTag, DirtyableTag, dirtyTag } from '@glimmer/validator';
+import type { DirtyableTag } from '@glimmer/validator';
+import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
 
 export const RECOMPUTE_TAG = Symbol('RECOMPUTE_TAG');
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
index f5c484dbd57..6f821c8c171 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { assert } from '@ember/debug';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
index 5649421a363..10fc222f5fe 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-in-element-null-check.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, Helper } from '@glimmer/interfaces';
+import type { CapturedArguments, Helper } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 56533a06d4e..52b2989294b 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
 import { dasherize } from '@ember/string';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
index f06690f2279..91e49504ddd 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
@@ -1,10 +1,10 @@
 /**
 @module ember
 */
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createConstRef, isConstRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
index d69c9466349..c380be4737d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-track-array.ts
@@ -4,7 +4,7 @@
 import { tagForProperty } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
 import { internalHelper } from './internal-helper';
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 47e950ac19f..0cc23151449 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -2,19 +2,14 @@
 @module ember
 */
 import { get } from '@ember/-internals/metal';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments } from '@glimmer/interfaces';
-import {
-  createUnboundRef,
-  isInvokableRef,
-  Reference,
-  updateRef,
-  valueForRef,
-} from '@glimmer/reference';
+import type { CapturedArguments } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
+import { createUnboundRef, isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { _WeakSet } from '@glimmer/util';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
index 2bef9dc0760..682d71b7c8a 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/each-in.ts
@@ -5,7 +5,7 @@ import { tagForObject } from '@ember/-internals/metal';
 import { _contentFor } from '@ember/-internals/runtime';
 import { isProxy } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { consumeTag } from '@glimmer/validator';
 import { internalHelper } from './internal-helper';
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
index deecefd3fe3..979156e0629 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
@@ -1,5 +1,5 @@
-import { Owner } from '@ember/-internals/owner';
-import { Helper, HelperDefinitionState } from '@glimmer/interfaces';
+import type { Owner } from '@ember/-internals/owner';
+import type { Helper, HelperDefinitionState } from '@glimmer/interfaces';
 import { setInternalHelperManager } from '@glimmer/manager';
 
 export function internalHelper(helper: Helper<Owner>): HelperDefinitionState {
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
index cfd3185b6bf..618dd4d2e3d 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/mut.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { assert } from '@ember/debug';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createInvokableRef, isUpdatableRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
index c6f1be38eea..12b9a5b7c54 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/readonly.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createReadOnlyRef } from '@glimmer/reference';
 import { assert } from '@ember/debug';
 import { internalHelper } from './internal-helper';
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
index b7acd0812b8..402604cfbd1 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unbound.ts
@@ -3,7 +3,7 @@
 */
 
 import { assert } from '@ember/debug';
-import { CapturedArguments } from '@glimmer/interfaces';
+import type { CapturedArguments } from '@glimmer/interfaces';
 import { createUnboundRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index 831926c75af..032cd66b6a8 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -25,7 +25,8 @@
   @public
   */
 
-import { createConstRef, Reference } from '@glimmer/reference';
+import type { Reference } from '@glimmer/reference';
+import { createConstRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
 export default internalHelper((): Reference<string> => {
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 0ba279258d8..0512a08942d 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { uuid } from '@ember/-internals/utils';
 import { ActionManager, EventDispatcher, isSimpleClick } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
@@ -6,7 +6,7 @@ import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
 import { registerDestructor } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import {
+import type {
   CapturedArguments,
   CapturedNamedArguments,
   CapturedPositionalArguments,
@@ -14,8 +14,9 @@ import {
 } from '@glimmer/interfaces';
 import { setInternalModifierManager } from '@glimmer/manager';
 import { isInvokableRef, updateRef, valueForRef } from '@glimmer/reference';
-import { createUpdatableTag, UpdatableTag } from '@glimmer/validator';
-import { SimpleElement } from '@simple-dom/interface';
+import type { UpdatableTag } from '@glimmer/validator';
+import { createUpdatableTag } from '@glimmer/validator';
+import type { SimpleElement } from '@simple-dom/interface';
 
 const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl'];
 const POINTER_EVENT_TYPE_REGEX = /^click|mouse|touch/;
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index c2eae5f222b..84a9078dd01 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -1,14 +1,15 @@
-import { Owner, setOwner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
+import { setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { registerDestructor } from '@glimmer/destroyable';
-import {
+import type {
   CapturedArguments,
   Destroyable,
   InternalModifierManager as ModifierManager,
 } from '@glimmer/interfaces';
 import { valueForRef } from '@glimmer/reference';
-import { SimpleElement } from '@simple-dom/interface';
+import type { SimpleElement } from '@simple-dom/interface';
 
 export default class InternalModifier {
   // Override this
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index d3bf5a1f22e..9e7625728f5 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,16 +1,16 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import { getOwner, Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { getViewElement, getViewId } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
 import { _backburner, _getCurrentRunLoop } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import {
+import type {
   Bounds,
   CompileTimeCompilationContext,
-  CurriedType,
   Cursor,
   DebugRenderTree,
   DynamicScope as GlimmerDynamicScope,
@@ -22,12 +22,14 @@ import {
   Template,
   TemplateFactory,
 } from '@glimmer/interfaces';
+import { CurriedType } from '@glimmer/interfaces';
 import { programCompilationContext } from '@glimmer/opcode-compiler';
 import { artifacts } from '@glimmer/program';
-import { createConstRef, Reference, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
+import type { Reference } from '@glimmer/reference';
+import { createConstRef, UNDEFINED_REFERENCE, valueForRef } from '@glimmer/reference';
+import type { CurriedValue } from '@glimmer/runtime';
 import {
   clientBuilder,
-  CurriedValue,
   curry,
   DOMChanges,
   DOMTreeConstruction,
@@ -37,16 +39,16 @@ import {
 } from '@glimmer/runtime';
 import { unwrapTemplate } from '@glimmer/util';
 import { CURRENT_TAG, validateTag, valueForTag } from '@glimmer/validator';
-import { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
+import type { SimpleDocument, SimpleElement, SimpleNode } from '@simple-dom/interface';
 import RSVP from 'rsvp';
-import Component from './component';
+import type Component from './component';
 import { BOUNDS } from './component-managers/curly';
 import { createRootOutlet } from './component-managers/outlet';
 import { RootComponentDefinition } from './component-managers/root';
 import { NodeDOMTreeConstruction } from './dom';
 import { EmberEnvironmentDelegate } from './environment';
 import ResolverImpl from './resolver';
-import { OutletState } from './utils/outlet';
+import type { OutletState } from './utils/outlet';
 import OutletView from './views/outlet';
 
 export type IBuilder = (env: Environment, cursor: Cursor) => ElementBuilder;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index f29615e81eb..d374a7e2727 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,12 +1,13 @@
 import { privatize as P } from '@ember/-internals/container';
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { ENV } from '@ember/-internals/environment';
-import { Factory, isFactory, Owner } from '@ember/-internals/owner';
+import type { Factory, Owner } from '@ember/-internals/owner';
+import { isFactory } from '@ember/-internals/owner';
 import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
-import {
+import type {
   CompileTimeResolver,
   HelperDefinitionState,
   ModifierDefinitionState,
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index 317f26f735b..f30fcf3b4b1 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -1,4 +1,5 @@
-import { privatize as P, Registry } from '@ember/-internals/container';
+import type { Registry } from '@ember/-internals/container';
+import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import { getOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index e176840f7c8..8769597b306 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -1,12 +1,15 @@
 /**
 @module ember
 */
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, CurriedType, Option } from '@glimmer/interfaces';
-import { createComputeRef, Reference, valueForRef } from '@glimmer/reference';
-import { createCapturedArgs, CurriedValue, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
+import type { CapturedArguments, Option } from '@glimmer/interfaces';
+import { CurriedType } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
+import { createComputeRef, valueForRef } from '@glimmer/reference';
+import type { CurriedValue } from '@glimmer/runtime';
+import { createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
 import { MountDefinition } from '../component-managers/mount';
 import { internalHelper } from '../helpers/internal-helper';
 
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index 289193522ac..f7e2b290504 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,20 +1,23 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { CapturedArguments, CurriedType, DynamicScope } from '@glimmer/interfaces';
+import type { CapturedArguments, DynamicScope } from '@glimmer/interfaces';
+import { CurriedType } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
 import {
   childRefFromParts,
   createComputeRef,
   createDebugAliasRef,
-  Reference,
   valueForRef,
 } from '@glimmer/reference';
-import { createCapturedArgs, CurriedValue, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
+import type { CurriedValue } from '@glimmer/runtime';
+import { createCapturedArgs, curry, EMPTY_POSITIONAL } from '@glimmer/runtime';
 import { dict } from '@glimmer/util';
-import { OutletComponentDefinition, OutletDefinitionState } from '../component-managers/outlet';
+import type { OutletDefinitionState } from '../component-managers/outlet';
+import { OutletComponentDefinition } from '../component-managers/outlet';
 import { internalHelper } from '../helpers/internal-helper';
 import { isTemplateFactory } from '../template';
-import { OutletState } from '../utils/outlet';
+import type { OutletState } from '../utils/outlet';
 
 /**
   The `{{outlet}}` helper lets you specify where a child route will render in
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
index c999b09f962..64b1a2dd301 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/utils.ts
@@ -1,4 +1,4 @@
-import { Core, Option, PresentArray } from '@glimmer/interfaces';
+import type { Core, Option, PresentArray } from '@glimmer/interfaces';
 
 export function hashToArgs(hash: Option<Core.Hash>): Option<Core.Hash> {
   if (hash === null) return null;
diff --git a/packages/@ember/-internals/glimmer/lib/template.ts b/packages/@ember/-internals/glimmer/lib/template.ts
index 6b3fb56d8f6..1e2b0fabd8c 100644
--- a/packages/@ember/-internals/glimmer/lib/template.ts
+++ b/packages/@ember/-internals/glimmer/lib/template.ts
@@ -1,4 +1,8 @@
-import { SerializedTemplateWithLazyBlock, Template, TemplateFactory } from '@glimmer/interfaces';
+import type {
+  SerializedTemplateWithLazyBlock,
+  Template,
+  TemplateFactory,
+} from '@glimmer/interfaces';
 
 export type StaticTemplate = SerializedTemplateWithLazyBlock;
 export type OwnedTemplate = Template;
diff --git a/packages/@ember/-internals/glimmer/lib/template_registry.ts b/packages/@ember/-internals/glimmer/lib/template_registry.ts
index 6bc3f2fefc5..ba4ffd4f88c 100644
--- a/packages/@ember/-internals/glimmer/lib/template_registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/template_registry.ts
@@ -1,4 +1,4 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 
 // STATE within a module is frowned upon, this exists
 // to support Ember.TEMPLATES but shield ember internals from this legacy
diff --git a/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts b/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts
index 30e2f374432..8c0dc88a802 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/empty.d.ts
@@ -1,3 +1,3 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/input.d.ts b/packages/@ember/-internals/glimmer/lib/templates/input.d.ts
index 30e2f374432..8c0dc88a802 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/input.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/input.d.ts
@@ -1,3 +1,3 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts b/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts
index 30e2f374432..8c0dc88a802 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/link-to.d.ts
@@ -1,3 +1,3 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts b/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts
index 30e2f374432..8c0dc88a802 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/outlet.d.ts
@@ -1,3 +1,3 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/root.d.ts b/packages/@ember/-internals/glimmer/lib/templates/root.d.ts
index 30e2f374432..8c0dc88a802 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/root.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/root.d.ts
@@ -1,3 +1,3 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts b/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts
index 30e2f374432..8c0dc88a802 100644
--- a/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts
+++ b/packages/@ember/-internals/glimmer/lib/templates/textarea.d.ts
@@ -1,3 +1,3 @@
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 declare const TEMPLATE: TemplateFactory;
 export default TEMPLATE;
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 780e5ee2594..26069564072 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -1,16 +1,16 @@
 import { get } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 import { dasherize } from '@ember/string';
-import { ElementOperations } from '@glimmer/interfaces';
+import type { ElementOperations } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
 import {
   childRefFor,
   childRefFromParts,
   createComputeRef,
   createPrimitiveRef,
-  Reference,
   valueForRef,
 } from '@glimmer/reference';
-import Component from '../component';
+import type Component from '../component';
 
 function referenceForParts(rootRef: Reference<Component>, parts: string[]): Reference {
   let isAttrs = parts[0] === 'attrs';
diff --git a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
index 5ad9fe9aa18..5a4fb529a6f 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.ts
@@ -1,9 +1,11 @@
 import { clearElementView, clearViewElement, getViewElement } from '@ember/-internals/views';
 import { registerDestructor } from '@glimmer/destroyable';
-import { CapturedNamedArguments } from '@glimmer/interfaces';
-import { createConstRef, Reference } from '@glimmer/reference';
-import { beginUntrackFrame, endUntrackFrame, Revision, Tag, valueForTag } from '@glimmer/validator';
-import Component from '../component';
+import type { CapturedNamedArguments } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
+import { createConstRef } from '@glimmer/reference';
+import type { Revision, Tag } from '@glimmer/validator';
+import { beginUntrackFrame, endUntrackFrame, valueForTag } from '@glimmer/validator';
+import type Component from '../component';
 
 type Finalizer = () => void;
 function NOOP() {}
diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 909d3449fd5..abb32a9b85c 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -1,8 +1,8 @@
 import { objectAt } from '@ember/-internals/metal';
-import { Array as EmberArray } from '@ember/-internals/runtime';
+import type { Array as EmberArray } from '@ember/-internals/runtime';
 import { isEmberArray, isObject } from '@ember/-internals/utils';
-import { Option } from '@glimmer/interfaces';
-import { IteratorDelegate } from '@glimmer/reference';
+import type { Option } from '@glimmer/interfaces';
+import type { IteratorDelegate } from '@glimmer/reference';
 import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
 import { EachInWrapper } from '../helpers/each-in';
 
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index a3b88671ccb..5c2876b9ac4 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,5 +1,5 @@
-import { Owner } from '@ember/-internals/owner';
-import { ComponentManager } from '@glimmer/interfaces';
+import type { Owner } from '@ember/-internals/owner';
+import type { ComponentManager } from '@glimmer/interfaces';
 import {
   componentCapabilities as glimmerComponentCapabilities,
   modifierCapabilities as glimmerModifierCapabilities,
diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
index df7e8506007..94d17850c01 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
@@ -1,5 +1,5 @@
-import { Owner } from '@ember/-internals/owner';
-import { Template, TemplateFactory } from '@glimmer/interfaces';
+import type { Owner } from '@ember/-internals/owner';
+import type { Template, TemplateFactory } from '@glimmer/interfaces';
 
 export interface RenderState {
   /**
diff --git a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
index 8370c63154c..51e79131dc5 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/process-args.ts
@@ -1,6 +1,7 @@
 import { MUTABLE_CELL } from '@ember/-internals/views';
-import { CapturedNamedArguments } from '@glimmer/interfaces';
-import { isUpdatableRef, Reference, updateRef, valueForRef } from '@glimmer/reference';
+import type { CapturedNamedArguments } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
+import { isUpdatableRef, updateRef, valueForRef } from '@glimmer/reference';
 import { assert } from '@ember/debug';
 import { ARGS } from '../component-managers/curly';
 import { ACTIONS } from '../helpers/action';
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index a0e81ec15bf..724f9b354a6 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,14 +1,16 @@
-import { getOwner, Owner } from '@ember/-internals/owner';
-import { BootOptions } from '@ember/application/instance';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import type { BootOptions } from '@ember/application/instance';
 import { assert } from '@ember/debug';
 import { schedule } from '@ember/runloop';
-import { Template } from '@glimmer/interfaces';
-import { createComputeRef, Reference, updateRef } from '@glimmer/reference';
+import type { Template } from '@glimmer/interfaces';
+import type { Reference } from '@glimmer/reference';
+import { createComputeRef, updateRef } from '@glimmer/reference';
 import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
-import { SimpleElement } from '@simple-dom/interface';
-import { OutletDefinitionState } from '../component-managers/outlet';
-import { Renderer } from '../renderer';
-import { OutletState } from '../utils/outlet';
+import type { SimpleElement } from '@simple-dom/interface';
+import type { OutletDefinitionState } from '../component-managers/outlet';
+import type { Renderer } from '../renderer';
+import type { OutletState } from '../utils/outlet';
 
 export interface BootEnvironment {
   hasDOM: boolean;
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index 0a435047c7d..b3ed61ad6dd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -7,18 +7,20 @@ import {
 
 import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { assert, captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
-import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
-import { CapturedRenderNode } from '@glimmer/interfaces';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type EngineInstance from '@ember/engine/instance';
+import type { CapturedRenderNode } from '@glimmer/interfaces';
 import { componentCapabilities, setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
 import { expect } from '@glimmer/util';
-import { SimpleElement, SimpleNode } from '@simple-dom/interface';
-import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
+import type { SimpleElement, SimpleNode } from '@simple-dom/interface';
+import type { EmberPrecompileOptions } from 'ember-template-compiler';
+import { compile } from 'ember-template-compiler';
 import { runTask } from 'internal-test-helpers/lib/run';
 
 interface CapturedBounds {
diff --git a/packages/@ember/-internals/meta/lib/meta.ts b/packages/@ember/-internals/meta/lib/meta.ts
index 3cb1194a363..7d429b5f13e 100644
--- a/packages/@ember/-internals/meta/lib/meta.ts
+++ b/packages/@ember/-internals/meta/lib/meta.ts
@@ -1,9 +1,9 @@
-import { ComputedProperty } from '@ember/-internals/metal';
+import type { ComputedProperty } from '@ember/-internals/metal';
 import { symbol, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
-import { Revision, UpdatableTag } from '@glimmer/validator';
+import type { Revision, UpdatableTag } from '@glimmer/validator';
 
 type ObjMap<T> = { [key: string]: T };
 
diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index 8539c065309..f769ef276db 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -1,21 +1,22 @@
-import { Meta, meta as metaFor } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor } from '@ember/-internals/meta';
 import { inspect } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
+import type { UpdatableTag } from '@glimmer/validator';
 import {
   consumeTag,
   tagFor,
   tagMetaFor,
   untrack,
-  UpdatableTag,
   updateTag,
   validateTag,
   valueForTag,
 } from '@glimmer/validator';
 import { CHAIN_PASS_THROUGH, finishLazyChains, getChainTagsForKey } from './chain-tags';
+import type { ExtendedMethodDecorator } from './decorator';
 import {
   ComputedDescriptor,
-  ExtendedMethodDecorator,
   descriptorForDecorator,
   isElementDescriptor,
   makeComputedDecorator,
diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index f31867d571f..2600b39f337 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -1,4 +1,4 @@
-import { Array as EmberArray, MutableArray, NativeArray } from '@ember/-internals/runtime';
+import type { Array as EmberArray, MutableArray, NativeArray } from '@ember/-internals/runtime';
 import { arrayContentDidChange, arrayContentWillChange } from './array_events';
 import { addListener, removeListener } from './events';
 
diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index a5d72f54702..bbcfb80bb0c 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,12 +1,12 @@
-import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { _WeakSet } from '@glimmer/util';
+import type { Tag, TagMeta } from '@glimmer/validator';
 import {
   combine,
   createUpdatableTag,
-  Tag,
-  TagMeta,
   tagMetaFor,
   updateTag,
   validateTag,
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index a8d0c5f8193..64aec6efd21 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,9 +1,11 @@
-import { Meta, meta as metaFor } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor } from '@ember/-internals/meta';
 import { inspect, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
+import type { UpdatableTag } from '@glimmer/validator';
 import {
   ALLOW_CYCLES,
   consumeTag,
@@ -11,31 +13,32 @@ import {
   tagMetaFor,
   track,
   untrack,
-  UpdatableTag,
   updateTag,
   validateTag,
   valueForTag,
 } from '@glimmer/validator';
 import { finishLazyChains, getChainTagsForKeys } from './chain-tags';
-import {
-  ComputedDescriptor,
+import type {
   ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
+  ElementDescriptor,
+} from './decorator';
+import {
+  ComputedDescriptor,
   descriptorForDecorator,
   descriptorForProperty,
-  ElementDescriptor,
   isClassicDecorator,
   isElementDescriptor,
   makeComputedDecorator,
 } from './decorator';
 import expandProperties from './expand_properties';
 import { addObserver, setObserverSuspended } from './observer';
+import type { PropertyDidChange } from './property_events';
 import {
   beginPropertyChanges,
   endPropertyChanges,
   hasPropertyDidChange,
   notifyPropertyChange,
-  PropertyDidChange,
   PROPERTY_DID_CHANGE,
 } from './property_events';
 
diff --git a/packages/@ember/-internals/metal/lib/decorator.ts b/packages/@ember/-internals/metal/lib/decorator.ts
index 0569f993bdd..71bc8ad6494 100644
--- a/packages/@ember/-internals/metal/lib/decorator.ts
+++ b/packages/@ember/-internals/metal/lib/decorator.ts
@@ -1,4 +1,5 @@
-import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
diff --git a/packages/@ember/-internals/metal/lib/deprecate_property.ts b/packages/@ember/-internals/metal/lib/deprecate_property.ts
index c840a18a729..8c2c49dbd59 100644
--- a/packages/@ember/-internals/metal/lib/deprecate_property.ts
+++ b/packages/@ember/-internals/metal/lib/deprecate_property.ts
@@ -3,7 +3,7 @@
 */
 
 import { deprecate } from '@ember/debug';
-import { DeprecationOptions } from '@ember/debug/lib/deprecate';
+import type { DeprecationOptions } from '@ember/debug/lib/deprecate';
 import { get } from './property_get';
 import { set } from './property_set';
 
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index 743b9864b60..efb69e00b5b 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -1,9 +1,10 @@
 /**
 @module @ember/object
 */
-import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { setListeners } from '@ember/-internals/utils';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 
 /*
diff --git a/packages/@ember/-internals/metal/lib/injected_property.ts b/packages/@ember/-internals/metal/lib/injected_property.ts
index 92273f55393..1228bf97454 100644
--- a/packages/@ember/-internals/metal/lib/injected_property.ts
+++ b/packages/@ember/-internals/metal/lib/injected_property.ts
@@ -2,7 +2,8 @@ import { getOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { computed } from './computed';
-import { DecoratorPropertyDescriptor, isElementDescriptor, ElementDescriptor } from './decorator';
+import type { DecoratorPropertyDescriptor, ElementDescriptor } from './decorator';
+import { isElementDescriptor } from './decorator';
 import { defineProperty } from './properties';
 
 export let DEBUG_INJECTION_FUNCTIONS: WeakMap<Function, any>;
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index e6da7a0ae40..656cefaf9c8 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -3,7 +3,8 @@
 */
 import { INIT_FACTORY } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import {
   guidFor,
   makeArray,
@@ -12,23 +13,19 @@ import {
   setObservers,
   wrap,
 } from '@ember/-internals/utils';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
-import {
+import type {
   ComputedDecorator,
-  ComputedProperty,
   ComputedPropertyGetter,
   ComputedPropertyObj,
   ComputedPropertySetter,
 } from './computed';
-import {
-  ComputedDescriptor,
-  descriptorForDecorator,
-  makeComputedDecorator,
-  nativeDescDecorator,
-} from './decorator';
+import { ComputedProperty } from './computed';
+import type { ComputedDescriptor } from './decorator';
+import { descriptorForDecorator, makeComputedDecorator, nativeDescDecorator } from './decorator';
 import { addListener, removeListener } from './events';
 import expandProperties from './expand_properties';
 import { setUnprocessedMixins } from './namespace_search';
diff --git a/packages/@ember/-internals/metal/lib/observer.ts b/packages/@ember/-internals/metal/lib/observer.ts
index 67b5fb678d8..4cae45d4b62 100644
--- a/packages/@ember/-internals/metal/lib/observer.ts
+++ b/packages/@ember/-internals/metal/lib/observer.ts
@@ -2,7 +2,8 @@ import { ENV } from '@ember/-internals/environment';
 import { peekMeta } from '@ember/-internals/meta';
 import { schedule } from '@ember/runloop';
 import { registerDestructor } from '@glimmer/destroyable';
-import { CURRENT_TAG, Tag, tagMetaFor, validateTag, valueForTag } from '@glimmer/validator';
+import type { Tag } from '@glimmer/validator';
+import { CURRENT_TAG, tagMetaFor, validateTag, valueForTag } from '@glimmer/validator';
 import { getChainTagsForKey } from './chain-tags';
 import changeEvent from './change_event';
 import { addListener, removeListener, sendEvent } from './events';
diff --git a/packages/@ember/-internals/metal/lib/properties.ts b/packages/@ember/-internals/metal/lib/properties.ts
index 5b1a47705de..68ec802b1ef 100644
--- a/packages/@ember/-internals/metal/lib/properties.ts
+++ b/packages/@ember/-internals/metal/lib/properties.ts
@@ -2,10 +2,12 @@
 @module @ember/object
 */
 
-import { Meta, meta as metaFor } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor } from '@ember/-internals/meta';
 import { setWithMandatorySetter } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
-import { ExtendedMethodDecorator, descriptorForProperty, isClassicDecorator } from './decorator';
+import type { ExtendedMethodDecorator } from './decorator';
+import { descriptorForProperty, isClassicDecorator } from './decorator';
 import { revalidateObservers } from './observer';
 
 /**
diff --git a/packages/@ember/-internals/metal/lib/property_events.ts b/packages/@ember/-internals/metal/lib/property_events.ts
index 4c814958631..12758ed9858 100644
--- a/packages/@ember/-internals/metal/lib/property_events.ts
+++ b/packages/@ember/-internals/metal/lib/property_events.ts
@@ -1,4 +1,5 @@
-import { Meta, peekMeta } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import { peekMeta } from '@ember/-internals/meta';
 import { assert } from '@ember/debug';
 import {
   flushSyncObservers,
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index fcb974556c0..f31c597f9e0 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -1,7 +1,7 @@
 /**
 @module @ember/object
 */
-import ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
+import type ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
 import { isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/metal/lib/tags.ts b/packages/@ember/-internals/metal/lib/tags.ts
index 3514d9ea0e0..47f028c63ce 100644
--- a/packages/@ember/-internals/metal/lib/tags.ts
+++ b/packages/@ember/-internals/metal/lib/tags.ts
@@ -3,7 +3,8 @@ import { assert } from '@ember/debug';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import { getCustomTagFor } from '@glimmer/manager';
-import { CONSTANT_TAG, dirtyTagFor, Tag, tagFor, TagMeta } from '@glimmer/validator';
+import type { Tag, TagMeta } from '@glimmer/validator';
+import { CONSTANT_TAG, dirtyTagFor, tagFor } from '@glimmer/validator';
 
 /////////
 
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 5272dc3a8a6..143bf6379c6 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -3,15 +3,10 @@ import { isEmberArray } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
-import { ElementDescriptor } from '..';
+import type { ElementDescriptor } from '..';
 import { CHAIN_PASS_THROUGH } from './chain-tags';
-import {
-  COMPUTED_SETTERS,
-  ExtendedMethodDecorator,
-  DecoratorPropertyDescriptor,
-  isElementDescriptor,
-  setClassicDecorator,
-} from './decorator';
+import type { ExtendedMethodDecorator, DecoratorPropertyDescriptor } from './decorator';
+import { COMPUTED_SETTERS, isElementDescriptor, setClassicDecorator } from './decorator';
 import { SELF_TAG } from './tags';
 
 /**
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 45db1099836..82a39200501 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,7 +1,7 @@
 import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner';
 import { TypeOptions } from '../container/lib/registry';
-import { IContainer } from '../runtime/lib/mixins/container_proxy';
-import { IRegistry } from '../runtime/lib/mixins/registry_proxy';
+import type { IContainer } from '../runtime/lib/mixins/container_proxy';
+import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
 
 /**
 @module @ember/application
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
index 71b42e4e517..c12d374b6f0 100644
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ b/packages/@ember/-internals/routing/lib/ext/controller.ts
@@ -1,10 +1,11 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import Controller from '@ember/controller';
+import type Controller from '@ember/controller';
 import ControllerMixin from '@ember/controller/lib/controller_mixin';
-import { Transition } from 'router_js';
-import { Route, Router } from '../..';
-import { deprecateTransitionMethods, prefixRouteNameArg, RouteArgs } from '../utils';
+import type { Transition } from 'router_js';
+import type { Route, Router } from '../..';
+import type { RouteArgs } from '../utils';
+import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
 
 /**
 @module ember
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index c496bb3e2f4..6ab31704b32 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -2,9 +2,9 @@ import { history, location, userAgent, window } from '@ember/-internals/browser-
 import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
+import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
-import { EmberLocation, UpdateCallback } from './api';
+import type { EmberLocation, UpdateCallback } from './api';
 import {
   getFullPath,
   getHash,
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index 3f249865134..728ea7ae202 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -1,7 +1,7 @@
 import { set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { bind } from '@ember/runloop';
-import { EmberLocation, UpdateCallback } from './api';
+import type { EmberLocation, UpdateCallback } from './api';
 import { getHash } from './util';
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index b2e665d5a07..f28763ba882 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -1,6 +1,6 @@
 import { set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
-import { EmberLocation, UpdateCallback } from './api';
+import type { EmberLocation, UpdateCallback } from './api';
 import { getHash } from './util';
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
index 808e0ed9fc1..e00a5fd23d8 100644
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -1,7 +1,7 @@
 import { set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
-import { EmberLocation, UpdateCallback } from './api';
+import type { EmberLocation, UpdateCallback } from './api';
 
 /**
 @module @ember/routing
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index e6a6458115c..73f4a98840a 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -4,11 +4,12 @@ import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
-import { ModelFor, Transition } from 'router_js';
-import Route from '../system/route';
+import type { ModelFor, Transition } from 'router_js';
+import type Route from '../system/route';
 import EmberRouter from '../system/router';
 import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
-import { extractRouteArgs, resemblesURL, RouteArgs, RouteOptions, shallowEqual } from '../utils';
+import type { RouteArgs, RouteOptions } from '../utils';
+import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
 
 export const ROUTER = Symbol('ROUTER');
 
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index ee89670dd6c..b21d22dd523 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -6,10 +6,10 @@ import { getOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
-import { ModelFor } from 'router_js';
-import { Route } from '../..';
+import type { ModelFor } from 'router_js';
+import type { Route } from '../..';
 import EmberRouter from '../system/router';
-import RouterState from '../system/router_state';
+import type RouterState from '../system/router_state';
 import { ROUTER } from './router';
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/system/controller_for.ts b/packages/@ember/-internals/routing/lib/system/controller_for.ts
index 3a04cea3303..1f638a75d29 100644
--- a/packages/@ember/-internals/routing/lib/system/controller_for.ts
+++ b/packages/@ember/-internals/routing/lib/system/controller_for.ts
@@ -1,5 +1,5 @@
-import { Container } from '@ember/-internals/container';
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { Container } from '@ember/-internals/container';
+import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 /**
 @module ember
 */
diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/-internals/routing/lib/system/dsl.ts
index 355c9800301..bad99044a3d 100644
--- a/packages/@ember/-internals/routing/lib/system/dsl.ts
+++ b/packages/@ember/-internals/routing/lib/system/dsl.ts
@@ -1,8 +1,8 @@
-import { Factory } from '@ember/-internals/owner';
+import type { Factory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
-import { Option } from '@glimmer/interfaces';
-import { MatchCallback } from 'route-recognizer';
-import { EngineInfo, EngineRouteInfo } from './engines';
+import type { Option } from '@glimmer/interfaces';
+import type { MatchCallback } from 'route-recognizer';
+import type { EngineInfo, EngineRouteInfo } from './engines';
 
 let uuid = 0;
 
diff --git a/packages/@ember/-internals/routing/lib/system/generate_controller.ts b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
index 968b43eeb7f..c96969714d6 100644
--- a/packages/@ember/-internals/routing/lib/system/generate_controller.ts
+++ b/packages/@ember/-internals/routing/lib/system/generate_controller.ts
@@ -1,5 +1,5 @@
 import { get } from '@ember/-internals/metal';
-import { Factory, Owner } from '@ember/-internals/owner';
+import type { Factory, Owner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import { assert, info } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 68f1e3d03dd..877d3ba23b9 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -11,7 +11,8 @@ import {
   set,
   setProperties,
 } from '@ember/-internals/metal';
-import { getOwner, Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import {
   A as emberA,
@@ -21,36 +22,34 @@ import {
   typeOf,
 } from '@ember/-internals/runtime';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
-import { ControllerQueryParamType } from '@ember/controller/lib/controller_mixin';
+import type { ControllerQueryParamType } from '@ember/controller/lib/controller_mixin';
 import { assert, info, isTesting } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { once } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { Template, TemplateFactory } from '@glimmer/interfaces';
-import {
+import type { Template, TemplateFactory } from '@glimmer/interfaces';
+import type {
   InternalRouteInfo,
   ModelFor,
-  PARAMS_SYMBOL,
   Route as IRoute,
-  STATE_SYMBOL,
   Transition,
   TransitionState,
 } from 'router_js';
+import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
+import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from '../utils';
 import {
   calculateCacheKey,
   deprecateTransitionMethods,
-  ExpandedControllerQueryParam,
-  NamedRouteArgs,
   normalizeControllerQueryParams,
   prefixRouteNameArg,
-  RouteArgs,
   stashParamNames,
 } from '../utils';
 import generateController from './generate_controller';
-import EmberRouter, { QueryParam } from './router';
+import type { QueryParam } from './router';
+import EmberRouter from './router';
 
 export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRouteInfo<R> {
   _names?: unknown[];
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index e1bc1257e00..d3abd115ab1 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -1,30 +1,27 @@
 import { privatize as P } from '@ember/-internals/container';
-import { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
+import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
 import { computed, get, set } from '@ember/-internals/metal';
-import { Factory, FactoryClass, getOwner, Owner } from '@ember/-internals/owner';
+import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
-import RouterService from '@ember/-internals/routing/lib/services/router';
+import type RouterService from '@ember/-internals/routing/lib/services/router';
 import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
 import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import EmberLocation, { EmberLocation as IEmberLocation } from '../location/api';
+import type { EmberLocation as IEmberLocation } from '../location/api';
+import EmberLocation from '../location/api';
+import type { RouteArgs, RouteOptions } from '../utils';
+import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils';
+import type { DSLCallback } from './dsl';
+import DSL from './dsl';
+import type { QueryParamMeta, RenderOptions } from './route';
+import type Route from './route';
 import {
-  calculateCacheKey,
-  extractRouteArgs,
-  getActiveTargetName,
-  resemblesURL,
-  RouteArgs,
-  RouteOptions,
-} from '../utils';
-import DSL, { DSLCallback } from './dsl';
-import Route, {
   defaultSerialize,
   getFullQueryParams,
   hasDefaultSerialize,
-  QueryParamMeta,
-  RenderOptions,
   ROUTE_CONNECTIONS,
 } from './route';
 import RouterState from './router_state';
@@ -33,22 +30,21 @@ import RouterState from './router_state';
 @module @ember/routing
 */
 
-import Router, {
+import type {
   InternalRouteInfo,
-  logAbort,
   ModelFor,
   RouteInfo,
   RouteInfoWithAttributes,
-  STATE_SYMBOL,
   Transition,
   TransitionError,
   TransitionState,
 } from 'router_js';
+import Router, { logAbort, STATE_SYMBOL } from 'router_js';
 import type { Timer } from 'backburner';
-import { EngineRouteInfo } from './engines';
+import type { EngineRouteInfo } from './engines';
 import EngineInstance from '@ember/engine/instance';
-import { QueryParams } from 'route-recognizer';
-import { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
+import type { QueryParams } from 'route-recognizer';
+import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
 
 function defaultDidTransition<R extends Route>(
   this: EmberRouter<R>,
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index f7840c23213..810d1e351de 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -1,7 +1,8 @@
-import Router, { ModelFor, TransitionState } from 'router_js';
+import type { ModelFor, TransitionState } from 'router_js';
+import type Router from 'router_js';
 import { shallowEqual } from '../utils';
-import Route from './route';
-import EmberRouter from './router';
+import type Route from './route';
+import type EmberRouter from './router';
 
 export default class RouterState<R extends Route> {
   router: Router<R>;
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index c3ce6b943b5..0e5e5471687 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -1,15 +1,18 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import {
+import type {
   ControllerQueryParam,
   ControllerQueryParamType,
 } from '@ember/controller/lib/controller_mixin';
 import { assert, deprecate } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import EmberError from '@ember/error';
-import Router, { STATE_SYMBOL, InternalRouteInfo, ModelFor } from 'router_js';
-import Route, { ExtendedInternalRouteInfo } from './system/route';
-import EmberRouter from './system/router';
+import type { InternalRouteInfo, ModelFor } from 'router_js';
+import type Router from 'router_js';
+import { STATE_SYMBOL } from 'router_js';
+import type { ExtendedInternalRouteInfo } from './system/route';
+import type Route from './system/route';
+import type EmberRouter from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/-internals/runtime/lib/compare.ts
index 12afaeaeae7..64a804b21fa 100644
--- a/packages/@ember/-internals/runtime/lib/compare.ts
+++ b/packages/@ember/-internals/runtime/lib/compare.ts
@@ -1,4 +1,5 @@
-import { TypeName, typeOf } from './type-of';
+import type { TypeName } from './type-of';
+import { typeOf } from './type-of';
 import Comparable from './mixins/comparable';
 import { assert } from '@ember/debug';
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
index 7357ce3ec48..5465507604d 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
@@ -16,7 +16,8 @@ import { setProxy, setupMandatorySetter, isObject, isProxy } from '@ember/-inter
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { setCustomTagFor } from '@glimmer/manager';
-import { combine, updateTag, tagFor, tagMetaFor, UpdatableTag, Tag } from '@glimmer/validator';
+import type { UpdatableTag, Tag } from '@glimmer/validator';
+import { combine, updateTag, tagFor, tagMetaFor } from '@glimmer/validator';
 
 export function contentFor<T>(proxy: ProxyMixin<T>): T | null {
   let content = get(proxy, 'content');
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
index a61eb2cde77..385086baf87 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
@@ -1,7 +1,7 @@
-import { Mixin } from '@ember/-internals/metal';
-import { AnyFn } from '@ember/-internals/utils/types';
-import Enumerable from './enumerable';
-import MutableEnumerable from './mutable_enumerable';
+import type { Mixin } from '@ember/-internals/metal';
+import type { AnyFn } from '@ember/-internals/utils/types';
+import type Enumerable from './enumerable';
+import type MutableEnumerable from './mutable_enumerable';
 
 type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 5cf31a359bc..39d411fc915 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -2,10 +2,11 @@ import { schedule, join } from '@ember/runloop';
 /**
 @module ember
 */
-import Container, { FactoryManager } from '@ember/-internals/container/lib/container';
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { FactoryManager } from '@ember/-internals/container/lib/container';
+import type Container from '@ember/-internals/container/lib/container';
+import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
-import { Factory } from '@ember/-internals/owner';
+import type { Factory } from '@ember/-internals/owner';
 
 // This is defined as a separate interface so that it can be used in the definition of
 // `Owner` without also including the `__container__` property.
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
index a97dfd475d4..7e41b6bd327 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
@@ -1,8 +1,8 @@
 import { get, setProperties, computed, Mixin } from '@ember/-internals/metal';
-import { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
+import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
-import RSVP from 'rsvp';
-import CoreObject from '../system/core_object';
+import type RSVP from 'rsvp';
+import type CoreObject from '../system/core_object';
 
 /**
   @module @ember/object
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index 373a2fac84b..10537cde256 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -2,11 +2,11 @@
 @module ember
 */
 
-import { Registry } from '@ember/-internals/container';
-import { TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { Registry } from '@ember/-internals/container';
+import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { Mixin } from '@ember/-internals/metal';
-import { Factory } from '@ember/-internals/owner';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { Factory } from '@ember/-internals/owner';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 
 // This is defined as a separate interface so that it can be used in the definition of
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
index 58c1a8b4383..9b825aee4b6 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
@@ -16,19 +16,13 @@ import {
 } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
-import EmberArray, { isArray, MutableArray } from '../mixins/array';
+import type EmberArray from '../mixins/array';
+import { isArray, MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
 import { setCustomTagFor } from '@glimmer/manager';
-import {
-  combine,
-  consumeTag,
-  validateTag,
-  valueForTag,
-  tagFor,
-  Tag,
-  Revision,
-} from '@glimmer/validator';
-import { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
+import type { Tag, Revision } from '@glimmer/validator';
+import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
+import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
 
 function isMutable<T>(obj: EmberArray<T>): obj is MutableArray<T> {
   return Array.isArray(obj) || typeof (obj as MutableArray<T>).replace === 'function';
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.ts b/packages/@ember/-internals/runtime/lib/system/core_object.ts
index 77075541633..14904e8542b 100644
--- a/packages/@ember/-internals/runtime/lib/system/core_object.ts
+++ b/packages/@ember/-internals/runtime/lib/system/core_object.ts
@@ -7,6 +7,7 @@ import { getOwner } from '@ember/-internals/owner';
 import type { Owner } from '@ember/-internals/owner';
 import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
+import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal';
 import {
   PROXY_CONTENT,
   sendEvent,
@@ -17,8 +18,6 @@ import {
   descriptorForProperty,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
-  ComputedProperty,
-  HasUnknownProperty,
   hasUnknownProperty,
 } from '@ember/-internals/metal';
 import ActionHandler from '../mixins/action_handler';
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index d4305d2ee54..13da81f4b66 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -1,4 +1,4 @@
-import { Array as EmberArray } from '@ember/-internals/runtime';
+import type { Array as EmberArray } from '@ember/-internals/runtime';
 import { _WeakSet } from '@glimmer/util';
 
 const EMBER_ARRAYS = new _WeakSet();
diff --git a/packages/@ember/-internals/utils/lib/is_proxy.ts b/packages/@ember/-internals/utils/lib/is_proxy.ts
index c83ba8186d2..87323a9abec 100644
--- a/packages/@ember/-internals/utils/lib/is_proxy.ts
+++ b/packages/@ember/-internals/utils/lib/is_proxy.ts
@@ -1,4 +1,4 @@
-import ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
+import type ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
 import { _WeakSet as WeakSet } from '@glimmer/util';
 import { isObject } from './spec';
 
diff --git a/packages/@ember/-internals/utils/lib/mandatory-setter.ts b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
index 0fcdcae0d91..e30fe4c9c21 100644
--- a/packages/@ember/-internals/utils/lib/mandatory-setter.ts
+++ b/packages/@ember/-internals/utils/lib/mandatory-setter.ts
@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
-import { Tag } from '@glimmer/validator';
+import type { Tag } from '@glimmer/validator';
 import lookupDescriptor from './lookup-descriptor';
 
 export let setupMandatorySetter:
diff --git a/packages/@ember/-internals/views/lib/component_lookup.ts b/packages/@ember/-internals/views/lib/component_lookup.ts
index c3d5fe2e0b2..232f24d016b 100644
--- a/packages/@ember/-internals/views/lib/component_lookup.ts
+++ b/packages/@ember/-internals/views/lib/component_lookup.ts
@@ -1,4 +1,4 @@
-import { Owner, TypeOptions } from '@ember/-internals/owner';
+import type { Owner, TypeOptions } from '@ember/-internals/owner';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 
 export default EmberObject.extend({
diff --git a/packages/@ember/-internals/views/lib/mixins/child_views_support.ts b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
index ab65bad2383..1495dcada03 100644
--- a/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { View } from '@ember/-internals/glimmer/lib/renderer';
+import type { View } from '@ember/-internals/glimmer/lib/renderer';
 import { Mixin, nativeDescDecorator } from '@ember/-internals/metal';
 import { getChildViews, addChildView } from '../system/utils';
 
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.ts b/packages/@ember/-internals/views/lib/mixins/view_support.ts
index 3fc0d624af9..ad7077ba5db 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.ts
@@ -4,8 +4,8 @@ import { assert } from '@ember/debug';
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { matches } from '../system/utils';
 import type Component from '@ember/component';
-import { View } from '@ember/-internals/glimmer/lib/renderer';
-import { SimpleElement } from '@simple-dom/interface';
+import type { View } from '@ember/-internals/glimmer/lib/renderer';
+import type { SimpleElement } from '@simple-dom/interface';
 
 function K(this: unknown) {
   return this;
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
index f2eedcb650e..30a903f4094 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
@@ -4,10 +4,10 @@ import { get, set } from '@ember/-internals/metal';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { getElementView } from '@ember/-internals/views';
 import ActionManager from './action_manager';
-import { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
 import type Component from '@ember/component';
-import { ActionState } from '@ember/-internals/glimmer/lib/modifiers/action';
-import { SimpleElement } from '@simple-dom/interface';
+import type { ActionState } from '@ember/-internals/glimmer/lib/modifiers/action';
+import type { SimpleElement } from '@simple-dom/interface';
 
 /**
 @module ember
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index af5cf64b989..cbcfc94833b 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -1,9 +1,10 @@
-import { View } from '@ember/-internals/glimmer/lib/renderer';
-import { getOwner, Owner } from '@ember/-internals/owner';
+import type { View } from '@ember/-internals/glimmer/lib/renderer';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import { Dict, Option } from '@glimmer/interfaces';
-import { SimpleElement } from '@simple-dom/interface';
+import type { Dict, Option } from '@glimmer/interfaces';
+import type { SimpleElement } from '@simple-dom/interface';
 
 /**
 @module ember
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 0c119142f4a..bec610a2df9 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -1,7 +1,8 @@
-import { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
+import type { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
 import { ActionHandler, Evented, FrameworkObject } from '@ember/-internals/runtime';
-import states, { ViewState } from './states';
+import type { ViewState } from './states';
+import states from './states';
 
 /**
   `Ember.CoreView` is an abstract class that exists to give view-like behavior
diff --git a/packages/@ember/-internals/views/lib/views/states.ts b/packages/@ember/-internals/views/lib/views/states.ts
index e6dbbc7ee21..631dce0fc5b 100644
--- a/packages/@ember/-internals/views/lib/views/states.ts
+++ b/packages/@ember/-internals/views/lib/views/states.ts
@@ -2,7 +2,7 @@ import preRender from './states/pre_render';
 import hasElement from './states/has_element';
 import inDOM from './states/in_dom';
 import destroying from './states/destroying';
-import Component from '@ember/component';
+import type Component from '@ember/component';
 
 export interface ViewState {
   enter?(view: Component): void;
diff --git a/packages/@ember/-internals/views/lib/views/states/has_element.ts b/packages/@ember/-internals/views/lib/views/states/has_element.ts
index a16f043044c..8e4a8d151af 100644
--- a/packages/@ember/-internals/views/lib/views/states/has_element.ts
+++ b/packages/@ember/-internals/views/lib/views/states/has_element.ts
@@ -1,7 +1,7 @@
 import _default from './default';
 import { join } from '@ember/runloop';
 import { flaggedInstrument } from '@ember/instrumentation';
-import Component from '@ember/component';
+import type Component from '@ember/component';
 import type { ViewState } from '../states';
 
 const hasElement: ViewState = {
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index 237bf6fe61c..b4f2e6a0d03 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -5,14 +5,15 @@
 import { get, set } from '@ember/-internals/metal';
 import * as environment from '@ember/-internals/browser-environment';
 import EngineInstance from '@ember/engine/instance';
-import Application from './lib/application';
+import type Application from './lib/application';
 import { renderSettled } from '@ember/-internals/glimmer';
-import { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
 import { assert } from '@ember/debug';
 import { Router } from '@ember/-internals/routing';
-import { EventDispatcher, ViewMixin } from '@ember/-internals/views';
-import { Registry } from '@ember/-internals/container';
-import { SimpleElement } from '@simple-dom/interface';
+import type { ViewMixin } from '@ember/-internals/views';
+import { EventDispatcher } from '@ember/-internals/views';
+import type { Registry } from '@ember/-internals/container';
+import type { SimpleElement } from '@simple-dom/interface';
 
 export interface BootOptions {
   isBrowser?: boolean;
diff --git a/packages/@ember/application/lib/application.ts b/packages/@ember/application/lib/application.ts
index e6a7b2aad09..87de87ba743 100644
--- a/packages/@ember/application/lib/application.ts
+++ b/packages/@ember/application/lib/application.ts
@@ -21,13 +21,15 @@ import {
   NoneLocation,
   BucketCache,
 } from '@ember/-internals/routing';
-import ApplicationInstance, { BootOptions } from '../instance';
+import type { BootOptions } from '../instance';
+import ApplicationInstance from '../instance';
 import Engine from '@ember/engine';
-import { Container, privatize as P, Registry } from '@ember/-internals/container';
+import type { Container, Registry } from '@ember/-internals/container';
+import { privatize as P } from '@ember/-internals/container';
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
 import { RouterService } from '@ember/-internals/routing';
-import { EngineInstanceOptions } from '@ember/engine/instance';
-import { SimpleDocument, SimpleElement } from '@simple-dom/interface';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
 
 /**
   An instance of `Application` is the starting point for every Ember
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index 4ec3d6bbd75..34cf4dc36d9 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -1,7 +1,7 @@
-import { EventDispatcher } from '@ember/-internals/views';
+import type { EventDispatcher } from '@ember/-internals/views';
 import Application, { getOwner, setOwner } from '@ember/application';
-import ApplicationInstance from '@ember/application/instance';
-import { Owner } from '@ember/-internals/owner';
+import type ApplicationInstance from '@ember/application/instance';
+import type { Owner } from '@ember/-internals/owner';
 
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 6e690e5b661..afd3572c5bb 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -1,7 +1,8 @@
-import { Factory, Owner } from '@ember/-internals/owner';
+import type { Factory, Owner } from '@ember/-internals/owner';
 import Application from '@ember/application';
-import ApplicationInstance, { BootOptions } from '@ember/application/instance';
-import EngineInstance from '@ember/engine/instance';
+import type { BootOptions } from '@ember/application/instance';
+import type ApplicationInstance from '@ember/application/instance';
+import type EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
diff --git a/packages/@ember/array/type-tests/index.ts b/packages/@ember/array/type-tests/index.ts
index 67a31719d42..a15c8c150ef 100644
--- a/packages/@ember/array/type-tests/index.ts
+++ b/packages/@ember/array/type-tests/index.ts
@@ -1,5 +1,7 @@
-import EmberArray, { A, NativeArray, isArray, makeArray } from '@ember/array';
-import MutableArray from '@ember/array/mutable';
+import type { NativeArray } from '@ember/array';
+import type EmberArray from '@ember/array';
+import { A, isArray, makeArray } from '@ember/array';
+import type MutableArray from '@ember/array/mutable';
 
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/array/type-tests/mutable.ts b/packages/@ember/array/type-tests/mutable.ts
index 7728981004c..4672c0be375 100644
--- a/packages/@ember/array/type-tests/mutable.ts
+++ b/packages/@ember/array/type-tests/mutable.ts
@@ -1,4 +1,4 @@
-import MutableArray from '@ember/array/mutable';
+import type MutableArray from '@ember/array/mutable';
 import { A } from '@ember/array';
 
 import { expectTypeOf } from 'expect-type';
diff --git a/packages/@ember/array/type-tests/proxy.ts b/packages/@ember/array/type-tests/proxy.ts
index 7af084812bf..6821586a073 100644
--- a/packages/@ember/array/type-tests/proxy.ts
+++ b/packages/@ember/array/type-tests/proxy.ts
@@ -1,6 +1,8 @@
-import EmberArray, { A, NativeArray } from '@ember/array';
+import type { NativeArray } from '@ember/array';
+import type EmberArray from '@ember/array';
+import { A } from '@ember/array';
 import ArrayProxy from '@ember/array/proxy';
-import MutableArray from '@ember/array/mutable';
+import type MutableArray from '@ember/array/mutable';
 
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/component/type-tests/get-component-template.test.ts b/packages/@ember/component/type-tests/get-component-template.test.ts
index 6a50cf49cb5..2acd0a5a365 100644
--- a/packages/@ember/component/type-tests/get-component-template.test.ts
+++ b/packages/@ember/component/type-tests/get-component-template.test.ts
@@ -1,5 +1,5 @@
 import { getComponentTemplate } from '@ember/component';
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
 
 expectTypeOf(getComponentTemplate({})).toEqualTypeOf<TemplateFactory | undefined>();
diff --git a/packages/@ember/component/type-tests/helper/helper.test.ts b/packages/@ember/component/type-tests/helper/helper.test.ts
index e1e02d26e2a..cdd73f4eedd 100644
--- a/packages/@ember/component/type-tests/helper/helper.test.ts
+++ b/packages/@ember/component/type-tests/helper/helper.test.ts
@@ -1,4 +1,4 @@
-import { HelperFactory, SimpleHelper } from '@ember/-internals/glimmer/lib/helper';
+import type { HelperFactory, SimpleHelper } from '@ember/-internals/glimmer/lib/helper';
 import { helper } from '@ember/component/helper';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts
index e3d3a8e075f..009756cf990 100644
--- a/packages/@ember/component/type-tests/helper/index.test.ts
+++ b/packages/@ember/component/type-tests/helper/index.test.ts
@@ -1,5 +1,5 @@
-import { Owner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/-internals/runtime';
+import type { Owner } from '@ember/-internals/owner';
+import type { FrameworkObject } from '@ember/-internals/runtime';
 import Helper from '@ember/component/helper';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/component/type-tests/index.test.ts b/packages/@ember/component/type-tests/index.test.ts
index 31d080ac528..e8fc4bae0e9 100644
--- a/packages/@ember/component/type-tests/index.test.ts
+++ b/packages/@ember/component/type-tests/index.test.ts
@@ -1,7 +1,7 @@
 import Component from '@ember/component';
-import { CoreView } from '@ember/-internals/views';
+import type { CoreView } from '@ember/-internals/views';
 import { expectTypeOf } from 'expect-type';
-import { View } from '@ember/-internals/glimmer/lib/renderer';
+import type { View } from '@ember/-internals/glimmer/lib/renderer';
 
 const MyComponent = Component.extend();
 
diff --git a/packages/@ember/component/type-tests/set-component-manager.test.ts b/packages/@ember/component/type-tests/set-component-manager.test.ts
index 6e29af3c11f..ee2b87c4d50 100644
--- a/packages/@ember/component/type-tests/set-component-manager.test.ts
+++ b/packages/@ember/component/type-tests/set-component-manager.test.ts
@@ -1,6 +1,6 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { setComponentManager } from '@ember/component';
-import { ComponentManager } from '@glimmer/interfaces';
+import type { ComponentManager } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
 
 // Obviously this is invalid, but it works for our purposes.
diff --git a/packages/@ember/component/type-tests/set-component-template.test.ts b/packages/@ember/component/type-tests/set-component-template.test.ts
index a99a3d3608e..9cf8615b4c4 100644
--- a/packages/@ember/component/type-tests/set-component-template.test.ts
+++ b/packages/@ember/component/type-tests/set-component-template.test.ts
@@ -1,5 +1,5 @@
 import { setComponentTemplate } from '@ember/component';
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for testing
diff --git a/packages/@ember/component/type-tests/template-only.test.ts b/packages/@ember/component/type-tests/template-only.test.ts
index a47ba4153e2..77cfa79575d 100644
--- a/packages/@ember/component/type-tests/template-only.test.ts
+++ b/packages/@ember/component/type-tests/template-only.test.ts
@@ -1,5 +1,5 @@
 import templateOnlyComponent from '@ember/component/template-only';
-import { TemplateOnlyComponentDefinition } from '@glimmer/runtime/dist/types/lib/component/template-only';
+import type { TemplateOnlyComponentDefinition } from '@glimmer/runtime/dist/types/lib/component/template-only';
 import { expectTypeOf } from 'expect-type';
 
 expectTypeOf(templateOnlyComponent()).toEqualTypeOf<TemplateOnlyComponentDefinition>();
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index eab6827c381..4562ee425aa 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,7 +1,7 @@
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { inject as metalInject } from '@ember/-internals/metal';
 import ControllerMixin from './lib/controller_mixin';
-import { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
+import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 
 /**
 @module @ember/controller
diff --git a/packages/@ember/controller/lib/controller_mixin.ts b/packages/@ember/controller/lib/controller_mixin.ts
index 9996c73af76..06d9d58ceda 100644
--- a/packages/@ember/controller/lib/controller_mixin.ts
+++ b/packages/@ember/controller/lib/controller_mixin.ts
@@ -1,9 +1,9 @@
 import { Mixin, computed } from '@ember/-internals/metal';
-import { RouteArgs } from '@ember/-internals/routing/lib/utils';
+import type { RouteArgs } from '@ember/-internals/routing/lib/utils';
 import { ActionHandler } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
-import Route from '@ember/routing/route';
-import { Transition } from 'router_js';
+import type Route from '@ember/routing/route';
+import type { Transition } from 'router_js';
 
 export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string';
 export type ControllerQueryParam = string | Record<string, { type: ControllerQueryParamType }>;
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
index c13669186b1..70874c0f95d 100644
--- a/packages/@ember/controller/type-tests/index.test.ts
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import Controller, { inject } from '@ember/controller';
 
 import { expectTypeOf } from 'expect-type';
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 4709047ca6a..168c0408d3a 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -1,10 +1,12 @@
 import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
-import _deprecate, { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
+import type { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
+import _deprecate from './lib/deprecate';
 import { isTesting } from './lib/testing';
-import _warn, { WarnFunc } from './lib/warn';
+import type { WarnFunc } from './lib/warn';
+import _warn from './lib/warn';
 
 export { inspect } from '@ember/-internals/utils';
 export { registerHandler as registerWarnHandler } from './lib/warn';
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 9b3519f9309..564d4b23cb2 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -1,6 +1,6 @@
-import { Renderer } from '@ember/-internals/glimmer';
-import { Owner } from '@ember/-internals/owner';
-import { CapturedRenderNode } from '@glimmer/interfaces';
+import type { Renderer } from '@ember/-internals/glimmer';
+import type { Owner } from '@ember/-internals/owner';
+import type { CapturedRenderNode } from '@glimmer/interfaces';
 import { expect } from '@glimmer/util';
 
 /**
diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index bca4dd3e5b3..d0f4557dab4 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -2,7 +2,8 @@ import { ENV } from '@ember/-internals/environment';
 import { DEBUG } from '@glimmer/env';
 
 import { assert } from '../index';
-import { HandlerCallback, invoke, registerHandler as genericRegisterHandler } from './handlers';
+import type { HandlerCallback } from './handlers';
+import { invoke, registerHandler as genericRegisterHandler } from './handlers';
 
 declare global {
   const __fail__: {
diff --git a/packages/@ember/debug/lib/warn.ts b/packages/@ember/debug/lib/warn.ts
index 9ef2f7c1eea..6c1711ea765 100644
--- a/packages/@ember/debug/lib/warn.ts
+++ b/packages/@ember/debug/lib/warn.ts
@@ -1,7 +1,8 @@
 import { DEBUG } from '@glimmer/env';
 
 import { assert } from '../index';
-import { HandlerCallback, invoke, registerHandler as genericRegisterHandler } from './handlers';
+import type { HandlerCallback } from './handlers';
+import { invoke, registerHandler as genericRegisterHandler } from './handlers';
 
 export interface WarnOptions {
   id: string;
diff --git a/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts b/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts
index f56f9090f48..a84a85d9425 100644
--- a/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts
+++ b/packages/@ember/debug/type-tests/register-deprecation-handler.test.ts
@@ -1,7 +1,7 @@
 import { registerDeprecationHandler } from '@ember/debug';
 import { expectTypeOf } from 'expect-type';
-import { DeprecationOptions } from '../lib/deprecate';
-import { Handler } from '../lib/handlers';
+import type { DeprecationOptions } from '../lib/deprecate';
+import type { Handler } from '../lib/handlers';
 
 let ret = registerDeprecationHandler((message, options, next) => {
   expectTypeOf(message).toEqualTypeOf<string>();
diff --git a/packages/@ember/debug/type-tests/register-warn-handler.test.ts b/packages/@ember/debug/type-tests/register-warn-handler.test.ts
index 4faf33ff7ff..064f2d5a4cf 100644
--- a/packages/@ember/debug/type-tests/register-warn-handler.test.ts
+++ b/packages/@ember/debug/type-tests/register-warn-handler.test.ts
@@ -1,7 +1,7 @@
 import { registerWarnHandler } from '@ember/debug';
 import { expectTypeOf } from 'expect-type';
-import { Handler } from '../lib/handlers';
-import { WarnOptions } from '../lib/warn';
+import type { Handler } from '../lib/handlers';
+import type { WarnOptions } from '../lib/warn';
 
 let ret = registerWarnHandler((message, options, next) => {
   expectTypeOf(message).toEqualTypeOf<string>();
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index b7af1ad96c4..f27f649bf72 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -7,13 +7,14 @@ import { Registry } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
-import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
+import EngineInstance from '@ember/engine/instance';
 import { RoutingService } from '@ember/-internals/routing';
 import { ContainerDebugAdapter } from '@ember/-internals/extension-support';
 import { ComponentLookup } from '@ember/-internals/views';
 import { setupEngineRegistry } from '@ember/-internals/glimmer';
 import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
-import { ResolverClass } from '@ember/-internals/container/lib/registry';
+import type { ResolverClass } from '@ember/-internals/container/lib/registry';
 
 function props(obj: object) {
   let properties = [];
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index b25ab2c1b99..54f3cd76836 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -12,9 +12,9 @@ import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_pr
 import ContainerProxyMixin from '@ember/-internals/runtime/lib/mixins/container_proxy';
 import { isFactory } from '@ember/-internals/owner';
 import Engine from '.';
-import Application from '@ember/application';
-import { BootOptions } from '@ember/application/instance';
-import { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type Application from '@ember/application';
+import type { BootOptions } from '@ember/application/instance';
+import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
 
 const CEngine = Engine;
 
diff --git a/packages/@ember/engine/lib/engine-parent.ts b/packages/@ember/engine/lib/engine-parent.ts
index 825a8561d96..cabd777b07b 100644
--- a/packages/@ember/engine/lib/engine-parent.ts
+++ b/packages/@ember/engine/lib/engine-parent.ts
@@ -1,7 +1,7 @@
 /**
 @module @ember/engine
 */
-import EngineInstance from '../instance';
+import type EngineInstance from '../instance';
 
 export const ENGINE_PARENT = Symbol('ENGINE_PARENT');
 
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index ee7d02b39c1..6002b05edde 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -1,8 +1,9 @@
-import { ResolverClass, TypeOptions } from '@ember/-internals/container/lib/registry';
-import { Factory, Owner } from '@ember/-internals/owner';
-import Namespace from '@ember/application/namespace';
-import Engine, { Initializer } from '@ember/engine';
-import EngineInstance from '@ember/engine/instance';
+import type { ResolverClass, TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { Factory, Owner } from '@ember/-internals/owner';
+import type Namespace from '@ember/application/namespace';
+import type { Initializer } from '@ember/engine';
+import Engine from '@ember/engine';
+import type EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts
index 60ef43ac2ad..b5e28dda8e5 100644
--- a/packages/@ember/engine/type-tests/instance.test.ts
+++ b/packages/@ember/engine/type-tests/instance.test.ts
@@ -1,6 +1,6 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import EngineInstance from '@ember/engine/instance';
-import EmberObject from '@ember/object';
+import type EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
 expectTypeOf<EngineInstance>().toMatchTypeOf<EmberObject>();
diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts
index dc11df20609..9cec53e2729 100644
--- a/packages/@ember/helper/type-tests/invoke-helper.test.ts
+++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts
@@ -2,7 +2,7 @@ import Component from '@ember/-internals/glimmer/lib/component';
 import { getValue } from '@ember/-internals/metal';
 import Helper from '@ember/component/helper';
 import { invokeHelper } from '@ember/helper';
-import { Cache } from '@glimmer/validator';
+import type { Cache } from '@glimmer/validator';
 import { expectTypeOf } from 'expect-type';
 
 // NOTE: The types should probably be stricter, but they're from glimmer itself
diff --git a/packages/@ember/helper/type-tests/set-helper-manager.test.ts b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
index b32088e1b61..d6138bad37f 100644
--- a/packages/@ember/helper/type-tests/set-helper-manager.test.ts
+++ b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
@@ -1,7 +1,11 @@
-import { HelperFactory, HelperFunction, SimpleHelper } from '@ember/-internals/glimmer/lib/helper';
+import type {
+  HelperFactory,
+  HelperFunction,
+  SimpleHelper,
+} from '@ember/-internals/glimmer/lib/helper';
 import { getDebugName } from '@ember/-internals/utils';
 import { capabilities, setHelperManager } from '@ember/helper';
-import { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
+import type { Arguments, Dict, HelperManager } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
 
 class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 2bf481d61a2..7458b9c0607 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -1,14 +1,14 @@
-import { Meta } from '@ember/-internals/meta';
+import type { Meta } from '@ember/-internals/meta';
+import type { ExtendedMethodDecorator, DecoratorPropertyDescriptor } from '@ember/-internals/metal';
 import {
-  ExtendedMethodDecorator,
-  DecoratorPropertyDescriptor,
   descriptorForProperty,
   isElementDescriptor,
   setClassicDecorator,
 } from '@ember/-internals/metal';
 import type { ElementDescriptor } from '@ember/-internals/metal/lib/decorator';
 import { assert } from '@ember/debug';
-import { consumeTag, tagFor, track, UpdatableTag, updateTag } from '@glimmer/validator';
+import type { UpdatableTag } from '@glimmer/validator';
+import { consumeTag, tagFor, track, updateTag } from '@glimmer/validator';
 
 let wrapGetterSetter = function (target: object, key: string, desc: PropertyDescriptor) {
   let { get: originalGet } = desc;
diff --git a/packages/@ember/object/lib/computed/computed_macros.ts b/packages/@ember/object/lib/computed/computed_macros.ts
index 6e1abb5e82d..b294766d914 100644
--- a/packages/@ember/object/lib/computed/computed_macros.ts
+++ b/packages/@ember/object/lib/computed/computed_macros.ts
@@ -8,7 +8,8 @@ import {
   alias,
   expandProperties,
 } from '@ember/-internals/metal';
-import { assert, deprecate, DeprecationOptions } from '@ember/debug';
+import type { DeprecationOptions } from '@ember/debug';
+import { assert, deprecate } from '@ember/debug';
 
 /**
 @module @ember/object
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index cd2de4991f9..06ee9c2cf2c 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -5,7 +5,8 @@ import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
 import { computed, autoComputed, get, isElementDescriptor } from '@ember/-internals/metal';
 import { compare, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime';
-import EmberArray, { NativeArray } from '@ember/-internals/runtime/lib/mixins/array';
+import type { NativeArray } from '@ember/-internals/runtime/lib/mixins/array';
+import EmberArray from '@ember/-internals/runtime/lib/mixins/array';
 
 function isNativeOrEmberArray(obj: unknown): obj is unknown[] | EmberArray<unknown> {
   return Array.isArray(obj) || EmberArray.detect(obj);
diff --git a/packages/@ember/object/type-tests/computed/alias.test.ts b/packages/@ember/object/type-tests/computed/alias.test.ts
index a08ebe9856b..e04ad389e71 100644
--- a/packages/@ember/object/type-tests/computed/alias.test.ts
+++ b/packages/@ember/object/type-tests/computed/alias.test.ts
@@ -1,4 +1,4 @@
-import { AliasDecorator } from '@ember/-internals/metal/lib/alias';
+import type { AliasDecorator } from '@ember/-internals/metal/lib/alias';
 import { alias } from '@ember/object/computed';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/object/type-tests/computed/filter.test.ts b/packages/@ember/object/type-tests/computed/filter.test.ts
index 2a98922ca41..1b1d8dd2a38 100644
--- a/packages/@ember/object/type-tests/computed/filter.test.ts
+++ b/packages/@ember/object/type-tests/computed/filter.test.ts
@@ -1,4 +1,4 @@
-import EmberArray from '@ember/array';
+import type EmberArray from '@ember/array';
 import { filter } from '@ember/object/computed';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index 279d099a37a..a8efec698f2 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import CoreObject from '@ember/object/core';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index 6237ca702a0..dbe809bdc70 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -1,7 +1,7 @@
 import { expectTypeOf } from 'expect-type';
 
 import EmberObject from '@ember/object';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 
 // Good enough for tests
 let owner = {} as Owner;
diff --git a/packages/@ember/object/type-tests/evented/index.test.ts b/packages/@ember/object/type-tests/evented/index.test.ts
index 7daf6dbf730..7add337dfe6 100644
--- a/packages/@ember/object/type-tests/evented/index.test.ts
+++ b/packages/@ember/object/type-tests/evented/index.test.ts
@@ -1,7 +1,7 @@
 import { expectTypeOf } from 'expect-type';
 
-import Mixin from '@ember/object/mixin';
-import Evented from '@ember/object/evented';
+import type Mixin from '@ember/object/mixin';
+import type Evented from '@ember/object/evented';
 
 // A very naive test that at least makes sure we can import this
 expectTypeOf<typeof Evented>().toMatchTypeOf<Mixin>();
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
index c11e56c32e3..f4c4f5bda8d 100644
--- a/packages/@ember/object/type-tests/events/index.test.ts
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -2,7 +2,7 @@ import { addListener, removeListener, sendEvent } from '@ember/object/events';
 
 import EmberObject from '@ember/object';
 import { on } from '@ember/object/evented';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 
 class Job extends EmberObject {
   logStartOrUpdate = on('started', 'updated', () => {
diff --git a/packages/@ember/object/type-tests/observable/index.test.ts b/packages/@ember/object/type-tests/observable/index.test.ts
index b07c82ecc88..77e3e602b59 100644
--- a/packages/@ember/object/type-tests/observable/index.test.ts
+++ b/packages/@ember/object/type-tests/observable/index.test.ts
@@ -1,7 +1,7 @@
 import { expectTypeOf } from 'expect-type';
 
-import Mixin from '@ember/object/mixin';
-import Observable from '@ember/object/observable';
+import type Mixin from '@ember/object/mixin';
+import type Observable from '@ember/object/observable';
 
 // A very naive test that at least makes sure we can import this
 expectTypeOf<typeof Observable>().toMatchTypeOf<Mixin>();
diff --git a/packages/@ember/routing/type-tests/auto-location.test.ts b/packages/@ember/routing/type-tests/auto-location.test.ts
index 663e00a8a69..ef04fdde681 100644
--- a/packages/@ember/routing/type-tests/auto-location.test.ts
+++ b/packages/@ember/routing/type-tests/auto-location.test.ts
@@ -1,7 +1,7 @@
-import { Owner } from '@ember/-internals/owner';
-import EmberObject from '@ember/object';
+import type { Owner } from '@ember/-internals/owner';
+import type EmberObject from '@ember/object';
 import AutoLocation from '@ember/routing/auto-location';
-import { ILocation } from '@ember/routing/location';
+import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
diff --git a/packages/@ember/routing/type-tests/hash-location.test.ts b/packages/@ember/routing/type-tests/hash-location.test.ts
index d933ce2f89c..3fd50fe8d7a 100644
--- a/packages/@ember/routing/type-tests/hash-location.test.ts
+++ b/packages/@ember/routing/type-tests/hash-location.test.ts
@@ -1,8 +1,8 @@
-import { ILocation } from '@ember/routing/location';
-import EmberObject from '@ember/object';
+import type { ILocation } from '@ember/routing/location';
+import type EmberObject from '@ember/object';
 import HashLocation from '@ember/routing/hash-location';
 import { expectTypeOf } from 'expect-type';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 
 // Good enough for tests
 let owner = {} as Owner;
diff --git a/packages/@ember/routing/type-tests/history-location.test.ts b/packages/@ember/routing/type-tests/history-location.test.ts
index 5a92377efa6..c3fe61e6eeb 100644
--- a/packages/@ember/routing/type-tests/history-location.test.ts
+++ b/packages/@ember/routing/type-tests/history-location.test.ts
@@ -1,7 +1,7 @@
-import { Owner } from '@ember/-internals/owner';
-import EmberObject from '@ember/object';
+import type { Owner } from '@ember/-internals/owner';
+import type EmberObject from '@ember/object';
 import HistoryLocation from '@ember/routing/history-location';
-import { ILocation } from '@ember/routing/location';
+import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
diff --git a/packages/@ember/routing/type-tests/link-to.test.ts b/packages/@ember/routing/type-tests/link-to.test.ts
index 64d01bba8b4..6346c34988f 100644
--- a/packages/@ember/routing/type-tests/link-to.test.ts
+++ b/packages/@ember/routing/type-tests/link-to.test.ts
@@ -1,4 +1,4 @@
-import { OpaqueInternalComponentConstructor } from '@ember/-internals/glimmer/lib/components/internal';
+import type { OpaqueInternalComponentConstructor } from '@ember/-internals/glimmer/lib/components/internal';
 import { LinkTo } from '@ember/routing';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/routing/type-tests/location.test.ts b/packages/@ember/routing/type-tests/location.test.ts
index bca25d0217a..9bfae6cebb7 100644
--- a/packages/@ember/routing/type-tests/location.test.ts
+++ b/packages/@ember/routing/type-tests/location.test.ts
@@ -1,4 +1,5 @@
-import Location, { ILocation } from '@ember/routing/location';
+import type { ILocation } from '@ember/routing/location';
+import Location from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // This is deprecated so let's not bother with more testing
diff --git a/packages/@ember/routing/type-tests/none-location.test.ts b/packages/@ember/routing/type-tests/none-location.test.ts
index 726db4f843b..63fe6cbeca3 100644
--- a/packages/@ember/routing/type-tests/none-location.test.ts
+++ b/packages/@ember/routing/type-tests/none-location.test.ts
@@ -1,8 +1,8 @@
-import EmberObject from '@ember/object';
+import type EmberObject from '@ember/object';
 import NoneLocation from '@ember/routing/none-location';
-import { ILocation } from '@ember/routing/location';
+import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 
 // Good enough for tests
 let owner = {} as Owner;
diff --git a/packages/@ember/routing/type-tests/route/index.test.ts b/packages/@ember/routing/type-tests/route/index.test.ts
index 851004c0ffd..72d4c8dced5 100644
--- a/packages/@ember/routing/type-tests/route/index.test.ts
+++ b/packages/@ember/routing/type-tests/route/index.test.ts
@@ -1,9 +1,9 @@
-import { Owner } from '@ember/-internals/owner';
-import Controller from '@ember/controller';
-import EmberObject from '@ember/object';
+import type { Owner } from '@ember/-internals/owner';
+import type Controller from '@ember/controller';
+import type EmberObject from '@ember/object';
 import Route from '@ember/routing/route';
 import { expectTypeOf } from 'expect-type';
-import { Transition } from 'router_js';
+import type { Transition } from 'router_js';
 
 // NOTE: This is invalid, but acceptable for type tests
 let owner = {} as Owner;
diff --git a/packages/@ember/routing/type-tests/route/overrides.test.ts b/packages/@ember/routing/type-tests/route/overrides.test.ts
index 3c444359301..cdc718ac1f4 100644
--- a/packages/@ember/routing/type-tests/route/overrides.test.ts
+++ b/packages/@ember/routing/type-tests/route/overrides.test.ts
@@ -1,8 +1,8 @@
-import { Owner } from '@ember/-internals/owner';
-import Controller from '@ember/controller';
+import type { Owner } from '@ember/-internals/owner';
+import type Controller from '@ember/controller';
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
-import { Transition } from 'router_js';
+import type { Transition } from 'router_js';
 
 // NOTE: This is invalid, but acceptable for type tests
 let owner = {} as Owner;
diff --git a/packages/@ember/routing/type-tests/route/query-params.test.ts b/packages/@ember/routing/type-tests/route/query-params.test.ts
index f19254b6972..ccb5dd61645 100644
--- a/packages/@ember/routing/type-tests/route/query-params.test.ts
+++ b/packages/@ember/routing/type-tests/route/query-params.test.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import Route from '@ember/routing/route';
 
 // NOTE: This is invalid, but acceptable for type tests
diff --git a/packages/@ember/routing/type-tests/route/send.test.ts b/packages/@ember/routing/type-tests/route/send.test.ts
index 9b068bad279..2ab8c12b9fc 100644
--- a/packages/@ember/routing/type-tests/route/send.test.ts
+++ b/packages/@ember/routing/type-tests/route/send.test.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 
diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts
index 35df8ccf857..cff46275e96 100644
--- a/packages/@ember/routing/type-tests/router-service.test.ts
+++ b/packages/@ember/routing/type-tests/router-service.test.ts
@@ -1,11 +1,13 @@
 /* eslint-disable no-self-assign */
 
-import { Owner } from '@ember/-internals/owner';
-import { EmberLocation } from '@ember/-internals/routing';
-import Route from '@ember/routing/route';
-import RouterService, { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
+import type { Owner } from '@ember/-internals/owner';
+import type { EmberLocation } from '@ember/-internals/routing';
+import type Route from '@ember/routing/route';
+import type { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
+import RouterService from '@ember/routing/router-service';
 import { expectTypeOf } from 'expect-type';
-import { Transition } from 'router_js';
+
+import type { Transition } from 'router_js';
 
 // Good enough for tests
 let owner = {} as Owner;
diff --git a/packages/@ember/routing/type-tests/router/index.test.ts b/packages/@ember/routing/type-tests/router/index.test.ts
index 8a07f166439..bc1f3ab7690 100644
--- a/packages/@ember/routing/type-tests/router/index.test.ts
+++ b/packages/@ember/routing/type-tests/router/index.test.ts
@@ -1,10 +1,10 @@
-import { Owner } from '@ember/-internals/owner';
-import EmberObject from '@ember/object';
-import Evented from '@ember/object/evented';
-import { ILocation } from '@ember/routing/location';
+import type { Owner } from '@ember/-internals/owner';
+import type EmberObject from '@ember/object';
+import type Evented from '@ember/object/evented';
+import type { ILocation } from '@ember/routing/location';
 import Router from '@ember/routing/router';
 import { expectTypeOf } from 'expect-type';
-import { Transition } from 'router_js';
+import type { Transition } from 'router_js';
 
 expectTypeOf<Router>().toMatchTypeOf<EmberObject>();
 expectTypeOf<Router>().toMatchTypeOf<Evented>();
diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts
index c189f2dbdbf..40426afd53e 100644
--- a/packages/@ember/runloop/index.ts
+++ b/packages/@ember/runloop/index.ts
@@ -1,8 +1,9 @@
 import { assert } from '@ember/debug';
 import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
-import Backburner, { DeferredActionQueues, Timer } from 'backburner';
-import { AnyFn } from '@ember/-internals/utils/types';
+import type { DeferredActionQueues } from 'backburner';
+import Backburner, { Timer } from 'backburner';
+import type { AnyFn } from '@ember/-internals/utils/types';
 
 export { Timer };
 
diff --git a/packages/@ember/runloop/type-tests.ts/debounce.test.ts b/packages/@ember/runloop/type-tests.ts/debounce.test.ts
index 47537f7ba29..be0e290798f 100644
--- a/packages/@ember/runloop/type-tests.ts/debounce.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/debounce.test.ts
@@ -1,5 +1,5 @@
 import { debounce } from '@ember/runloop';
-import { Timer } from 'backburner.js';
+import type { Timer } from 'backburner.js';
 import { expectTypeOf } from 'expect-type';
 
 // From Docs
diff --git a/packages/@ember/runloop/type-tests.ts/later.test.ts b/packages/@ember/runloop/type-tests.ts/later.test.ts
index 44019658816..bcd218a19b2 100644
--- a/packages/@ember/runloop/type-tests.ts/later.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/later.test.ts
@@ -1,4 +1,5 @@
-import { later, Timer } from '@ember/runloop';
+import type { Timer } from '@ember/runloop';
+import { later } from '@ember/runloop';
 import { expectTypeOf } from 'expect-type';
 
 class Foo {
diff --git a/packages/@ember/runloop/type-tests.ts/next.test.ts b/packages/@ember/runloop/type-tests.ts/next.test.ts
index 145471531f5..8cccad4614c 100644
--- a/packages/@ember/runloop/type-tests.ts/next.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/next.test.ts
@@ -1,4 +1,5 @@
-import { next, Timer } from '@ember/runloop';
+import type { Timer } from '@ember/runloop';
+import { next } from '@ember/runloop';
 import { expectTypeOf } from 'expect-type';
 
 class Foo {
diff --git a/packages/@ember/runloop/type-tests.ts/once.test.ts b/packages/@ember/runloop/type-tests.ts/once.test.ts
index 1a1ad5dd8bb..e55124820ca 100644
--- a/packages/@ember/runloop/type-tests.ts/once.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/once.test.ts
@@ -1,4 +1,5 @@
-import { once, Timer } from '@ember/runloop';
+import type { Timer } from '@ember/runloop';
+import { once } from '@ember/runloop';
 import { expectTypeOf } from 'expect-type';
 
 class Foo {
diff --git a/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts b/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
index 6137504c06a..091869b1a14 100644
--- a/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
@@ -1,4 +1,5 @@
-import { scheduleOnce, Timer } from '@ember/runloop';
+import type { Timer } from '@ember/runloop';
+import { scheduleOnce } from '@ember/runloop';
 import { expectTypeOf } from 'expect-type';
 
 class Foo {
diff --git a/packages/@ember/runloop/type-tests.ts/schedule.test.ts b/packages/@ember/runloop/type-tests.ts/schedule.test.ts
index 79297cb9eee..7960fd8f736 100644
--- a/packages/@ember/runloop/type-tests.ts/schedule.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/schedule.test.ts
@@ -1,4 +1,5 @@
-import { schedule, Timer } from '@ember/runloop';
+import type { Timer } from '@ember/runloop';
+import { schedule } from '@ember/runloop';
 import { expectTypeOf } from 'expect-type';
 
 class Foo {
diff --git a/packages/@ember/runloop/type-tests.ts/throttle.test.ts b/packages/@ember/runloop/type-tests.ts/throttle.test.ts
index 2452d04c1ee..92e1b7ab165 100644
--- a/packages/@ember/runloop/type-tests.ts/throttle.test.ts
+++ b/packages/@ember/runloop/type-tests.ts/throttle.test.ts
@@ -1,5 +1,5 @@
 import { throttle } from '@ember/runloop';
-import { Timer } from 'backburner.js';
+import type { Timer } from 'backburner.js';
 import { expectTypeOf } from 'expect-type';
 
 // From Docs
diff --git a/packages/@ember/service/index.ts b/packages/@ember/service/index.ts
index 9fae70f4b3c..8337855f18e 100644
--- a/packages/@ember/service/index.ts
+++ b/packages/@ember/service/index.ts
@@ -1,9 +1,6 @@
 import { FrameworkObject } from '@ember/-internals/runtime';
-import {
-  DecoratorPropertyDescriptor,
-  ElementDescriptor,
-  inject as metalInject,
-} from '@ember/-internals/metal';
+import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
+import { inject as metalInject } from '@ember/-internals/metal';
 
 /**
  @module @ember/service
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
index 7a41ad07ff0..0f4bab1fae3 100644
--- a/packages/@ember/service/type-tests/index.test.ts
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -1,5 +1,5 @@
-import { Owner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/-internals/runtime';
+import type { Owner } from '@ember/-internals/owner';
+import type { FrameworkObject } from '@ember/-internals/runtime';
 import EmberObject from '@ember/object';
 import Service, { inject, service } from '@ember/service';
 import { expectTypeOf } from 'expect-type';
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 3474fe000a9..980b299f16d 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -7,10 +7,10 @@ export { getStrings as _getStrings, setStrings as _setStrings } from './lib/stri
 import { Cache } from '@ember/-internals/utils';
 import { deprecate } from '@ember/debug';
 
+import type { SafeString } from '@ember/-internals/glimmer';
 import {
   htmlSafe as internalHtmlSafe,
   isHTMLSafe as internalIsHtmlSafe,
-  SafeString,
 } from '@ember/-internals/glimmer';
 
 const STRING_DASHERIZE_REGEXP = /[ _]/g;
diff --git a/packages/@ember/template/type-tests/index.test.ts b/packages/@ember/template/type-tests/index.test.ts
index 8caa197c852..ded5701a55a 100644
--- a/packages/@ember/template/type-tests/index.test.ts
+++ b/packages/@ember/template/type-tests/index.test.ts
@@ -1,4 +1,4 @@
-import { SafeString } from '@ember/-internals/glimmer';
+import type { SafeString } from '@ember/-internals/glimmer';
 import { htmlSafe, isHTMLSafe } from '@ember/template';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
index 43f95976af9..b955b1af4e0 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 
 /**
  @module ember
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
index 8a0074f4eb5..c680f3b7259 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-named-outlets.ts
@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 
 /**
  @module ember
diff --git a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
index d2811bed62a..f16e76056c4 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-input-helper-without-block.ts
@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 export default function errorOnInputWithContent(env: EmberASTPluginEnvironment): ASTPlugin {
diff --git a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
index 31303396a8b..b769ba64b1b 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.ts
@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 
 export default function assertReservedNamedArguments(env: EmberASTPluginEnvironment): ASTPlugin {
   let moduleName = env.meta?.moduleName;
diff --git a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
index 92ffcd722c4..4859871efdf 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-splattribute-expression.ts
@@ -1,7 +1,7 @@
 import { assert } from '@ember/debug';
-import { ASTPlugin } from '@glimmer/syntax';
+import type { ASTPlugin } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 
 export default function assertSplattributeExpressions(env: EmberASTPluginEnvironment): ASTPlugin {
   let moduleName = env.meta?.moduleName;
diff --git a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
index 69c41a4774c..2ee6fdd4bc4 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-action-syntax.ts
@@ -1,5 +1,5 @@
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import { Builders, EmberASTPluginEnvironment } from '../types';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
+import type { Builders, EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
index 28ea503a147..895721210f2 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-each-in-into-each.ts
@@ -1,5 +1,5 @@
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import { EmberASTPluginEnvironment } from '../types';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
+import type { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
diff --git a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
index c6634f4ac6b..269937a098c 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-each-track-array.ts
@@ -1,6 +1,6 @@
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 import { assert } from '@ember/debug';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
diff --git a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
index 43b135c2ba9..2adeb1c12c8 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-in-element.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import { EmberASTPluginEnvironment } from '../types';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
+import type { EmberASTPluginEnvironment } from '../types';
 import { isPath } from './utils';
 
 /**
diff --git a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
index 032bafd4e7c..d576592a37c 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.ts
@@ -1,4 +1,4 @@
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 
 export default function transformQuotedBindingsIntoJustBindings(/* env */): ASTPlugin {
   return {
diff --git a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
index 454353c8095..513aa05ff69 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-resolutions.ts
@@ -1,8 +1,9 @@
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import { AST, ASTPlugin, print } from '@glimmer/syntax';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
+import { print } from '@glimmer/syntax';
 import calculateLocationDisplay from '../system/calculate-location-display';
-import { EmberASTPluginEnvironment } from '../types';
+import type { EmberASTPluginEnvironment } from '../types';
 import { isPath, isStringLiteral, trackLocals } from './utils';
 
 /**
diff --git a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
index 97a1bd6914c..f6e178878b7 100644
--- a/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
+++ b/packages/ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.ts
@@ -1,5 +1,5 @@
-import { AST, ASTPlugin } from '@glimmer/syntax';
-import { EmberASTPluginEnvironment } from '../types';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
+import type { EmberASTPluginEnvironment } from '../types';
 import { isPath, trackLocals } from './utils';
 
 /**
diff --git a/packages/ember-template-compiler/lib/plugins/utils.ts b/packages/ember-template-compiler/lib/plugins/utils.ts
index a2e42b39ca0..6bfe6240668 100644
--- a/packages/ember-template-compiler/lib/plugins/utils.ts
+++ b/packages/ember-template-compiler/lib/plugins/utils.ts
@@ -1,4 +1,4 @@
-import { AST } from '@glimmer/syntax';
+import type { AST } from '@glimmer/syntax';
 
 export function isPath(node: AST.Node): node is AST.PathExpression {
   return node.type === 'PathExpression';
diff --git a/packages/ember-template-compiler/lib/system/bootstrap.ts b/packages/ember-template-compiler/lib/system/bootstrap.ts
index 7e1dd370fcb..52efec31e18 100644
--- a/packages/ember-template-compiler/lib/system/bootstrap.ts
+++ b/packages/ember-template-compiler/lib/system/bootstrap.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 
-import { TemplateFactory } from '@glimmer/interfaces';
+import type { TemplateFactory } from '@glimmer/interfaces';
 import compile from './compile';
 
 export interface BootstrapOptions {
diff --git a/packages/ember-template-compiler/lib/system/calculate-location-display.ts b/packages/ember-template-compiler/lib/system/calculate-location-display.ts
index f37c55c3404..70d240cb729 100644
--- a/packages/ember-template-compiler/lib/system/calculate-location-display.ts
+++ b/packages/ember-template-compiler/lib/system/calculate-location-display.ts
@@ -1,4 +1,4 @@
-import { AST } from '@glimmer/syntax';
+import type { AST } from '@glimmer/syntax';
 
 export default function calculateLocationDisplay(
   moduleName: string | undefined,
diff --git a/packages/ember-template-compiler/lib/system/compile-options.ts b/packages/ember-template-compiler/lib/system/compile-options.ts
index 79cc6521855..78bd7ca78a7 100644
--- a/packages/ember-template-compiler/lib/system/compile-options.ts
+++ b/packages/ember-template-compiler/lib/system/compile-options.ts
@@ -1,6 +1,6 @@
 import { assert } from '@ember/debug';
 import { RESOLUTION_MODE_TRANSFORMS, STRICT_MODE_TRANSFORMS } from '../plugins/index';
-import { EmberPrecompileOptions, PluginFunc } from '../types';
+import type { EmberPrecompileOptions, PluginFunc } from '../types';
 import COMPONENT_NAME_SIMPLE_DASHERIZE_CACHE from './dasherize-component-name';
 
 let USER_PLUGINS: PluginFunc[] = [];
diff --git a/packages/ember-template-compiler/lib/system/compile.ts b/packages/ember-template-compiler/lib/system/compile.ts
index 273512e76ab..ba112ed1b2d 100644
--- a/packages/ember-template-compiler/lib/system/compile.ts
+++ b/packages/ember-template-compiler/lib/system/compile.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import require, { has } from 'require';
-import { EmberPrecompileOptions } from '../types';
+import type { EmberPrecompileOptions } from '../types';
 import precompile from './precompile';
 import type { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces';
 import type { templateFactory } from '@glimmer/opcode-compiler';
diff --git a/packages/ember-template-compiler/lib/system/precompile.ts b/packages/ember-template-compiler/lib/system/precompile.ts
index 3be8208feb5..85f26c81489 100644
--- a/packages/ember-template-compiler/lib/system/precompile.ts
+++ b/packages/ember-template-compiler/lib/system/precompile.ts
@@ -3,7 +3,7 @@
 */
 
 import { precompile as glimmerPrecompile } from '@glimmer/compiler';
-import { EmberPrecompileOptions } from '../types';
+import type { EmberPrecompileOptions } from '../types';
 import compileOptions from './compile-options';
 
 /**
diff --git a/packages/ember-template-compiler/lib/types.d.ts b/packages/ember-template-compiler/lib/types.d.ts
index 7b2b85eb346..6c068cb74c3 100644
--- a/packages/ember-template-compiler/lib/types.d.ts
+++ b/packages/ember-template-compiler/lib/types.d.ts
@@ -1,4 +1,4 @@
-import {
+import type {
   ASTPluginBuilder,
   ASTPluginEnvironment,
   builders,
diff --git a/packages/ember-template-compiler/tests/utils/transform-test-case.ts b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
index caa2291c297..768a733d1a8 100644
--- a/packages/ember-template-compiler/tests/utils/transform-test-case.ts
+++ b/packages/ember-template-compiler/tests/utils/transform-test-case.ts
@@ -1,6 +1,6 @@
 import { precompile } from '@glimmer/compiler';
-import { Option } from '@glimmer/interfaces';
-import { AST, ASTPlugin } from '@glimmer/syntax';
+import type { Option } from '@glimmer/interfaces';
+import type { AST, ASTPlugin } from '@glimmer/syntax';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { compileOptions } from '../../index';
 
diff --git a/packages/internal-test-helpers/lib/build-owner.ts b/packages/internal-test-helpers/lib/build-owner.ts
index 6b3d16387ef..bf087cc2d38 100644
--- a/packages/internal-test-helpers/lib/build-owner.ts
+++ b/packages/internal-test-helpers/lib/build-owner.ts
@@ -2,8 +2,8 @@ import Application from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
 import { registerDestructor } from '@ember/destroyable';
-import Resolver from './test-resolver';
-import { EngineInstanceOptions } from '@ember/engine/instance';
+import type Resolver from './test-resolver';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
 
 class ResolverWrapper {
   resolver: Resolver | undefined;
diff --git a/packages/internal-test-helpers/lib/compile.ts b/packages/internal-test-helpers/lib/compile.ts
index 29edda0e8de..7fd317a7fe8 100644
--- a/packages/internal-test-helpers/lib/compile.ts
+++ b/packages/internal-test-helpers/lib/compile.ts
@@ -2,9 +2,10 @@
 @module ember
 */
 import { precompileJSON } from '@glimmer/compiler';
-import { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces';
+import type { SerializedTemplateWithLazyBlock, TemplateFactory } from '@glimmer/interfaces';
 import { templateFactory } from '@glimmer/opcode-compiler';
-import { compileOptions, EmberPrecompileOptions } from 'ember-template-compiler';
+import type { EmberPrecompileOptions } from 'ember-template-compiler';
+import { compileOptions } from 'ember-template-compiler';
 
 /**
   Uses HTMLBars `compile` function to process a string into a compiled template.
diff --git a/packages/internal-test-helpers/lib/define-template-values.ts b/packages/internal-test-helpers/lib/define-template-values.ts
index 49ee1752567..a4a93af4c71 100644
--- a/packages/internal-test-helpers/lib/define-template-values.ts
+++ b/packages/internal-test-helpers/lib/define-template-values.ts
@@ -7,7 +7,7 @@ import {
 } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
 
-import {
+import type {
   Arguments,
   ComponentDefinitionState,
   HelperManager,
diff --git a/packages/internal-test-helpers/lib/ember-dev/assertion.ts b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
index ce1c3f2469b..be9d015543a 100644
--- a/packages/internal-test-helpers/lib/ember-dev/assertion.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
@@ -1,5 +1,6 @@
 import { DEBUG } from '@glimmer/env';
-import { callWithStub, checkTest, DebugEnv, Message } from './utils';
+import type { DebugEnv, Message } from './utils';
+import { callWithStub, checkTest } from './utils';
 
 type ExpectAssertionFunc = (func: () => void, expectedMessage: Message) => void;
 type IgnoreAssertionFunc = (func: () => void) => void;
diff --git a/packages/internal-test-helpers/lib/ember-dev/debug.ts b/packages/internal-test-helpers/lib/ember-dev/debug.ts
index 1850683ed5a..b6010b71b9d 100644
--- a/packages/internal-test-helpers/lib/ember-dev/debug.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/debug.ts
@@ -1,5 +1,5 @@
 import MethodCallTracker from './method-call-tracker';
-import { DebugEnv } from './utils';
+import type { DebugEnv } from './utils';
 
 class DebugAssert {
   private tracker: MethodCallTracker | null;
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index efd129ce387..b139b2736b6 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -1,6 +1,7 @@
 import { assert } from '@ember/debug';
 import DebugAssert from './debug';
-import { callWithStub, DebugEnv, Message } from './utils';
+import type { DebugEnv, Message } from './utils';
+import { callWithStub } from './utils';
 declare global {
   interface Window {
     expectNoDeprecation: DeprecationAssert['expectNoDeprecation'] | undefined;
diff --git a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
index 6f7457e66bd..369d1bb2ca9 100644
--- a/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/method-call-tracker.ts
@@ -1,6 +1,7 @@
 import { DEBUG } from '@glimmer/env';
 import { assert as emberAssert } from '@ember/debug';
-import { checkTest, DebugEnv, DebugFunction, DebugFunctionOptions } from './utils';
+import type { DebugEnv, DebugFunction, DebugFunctionOptions } from './utils';
+import { checkTest } from './utils';
 
 type Actual = [string, boolean, DebugFunctionOptions];
 type Message = string | RegExp;
diff --git a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
index f037f515eae..8911bfe363d 100644
--- a/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/setup-qunit.ts
@@ -9,7 +9,7 @@ import { setupDeprecationHelpers } from './deprecation';
 import { setupNamespacesCheck } from './namespaces';
 import { setupObserversCheck } from './observers';
 import { setupRunLoopCheck } from './run-loop';
-import { DebugEnv } from './utils';
+import type { DebugEnv } from './utils';
 import { setupWarningHelpers } from './warning';
 
 declare global {
diff --git a/packages/internal-test-helpers/lib/ember-dev/warning.ts b/packages/internal-test-helpers/lib/ember-dev/warning.ts
index 0c0b1368e8f..31d53e5bd5f 100644
--- a/packages/internal-test-helpers/lib/ember-dev/warning.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/warning.ts
@@ -1,5 +1,6 @@
 import DebugAssert from './debug';
-import { callWithStub, DebugEnv, Message } from './utils';
+import type { DebugEnv, Message } from './utils';
+import { callWithStub } from './utils';
 
 type ExpectNoWarningFunc = (func?: (() => void) | undefined) => void;
 type ExpectWarningFunc = (
diff --git a/packages/internal-test-helpers/lib/module-for.ts b/packages/internal-test-helpers/lib/module-for.ts
index e5cc9d05136..38f2bbdc338 100644
--- a/packages/internal-test-helpers/lib/module-for.ts
+++ b/packages/internal-test-helpers/lib/module-for.ts
@@ -1,12 +1,13 @@
 /* globals URLSearchParams */
 import { DEBUG } from '@glimmer/env';
 import { isEnabled } from '@ember/canary-features';
-import applyMixins, { Mixin, Generator } from './apply-mixins';
+import type { Mixin, Generator } from './apply-mixins';
+import applyMixins from './apply-mixins';
 import getAllPropertyNames from './get-all-property-names';
 import { setContext, unsetContext } from './test-context';
 import { all } from 'rsvp';
 import { enableDestroyableTracking, assertDestroyablesDestroyed } from '@glimmer/destroyable';
-import AbstractTestCase from './test-cases/abstract';
+import type AbstractTestCase from './test-cases/abstract';
 
 interface TestClass<T extends AbstractTestCase> {
   new (assert: QUnit['assert']): T;
diff --git a/packages/internal-test-helpers/lib/node-query.ts b/packages/internal-test-helpers/lib/node-query.ts
index 223a58e7330..ccba8cd6b1e 100644
--- a/packages/internal-test-helpers/lib/node-query.ts
+++ b/packages/internal-test-helpers/lib/node-query.ts
@@ -1,14 +1,8 @@
 /* global Node */
 
 import { assert } from '@ember/debug';
-import {
-  blur,
-  fireEvent,
-  focus,
-  KEYBOARD_EVENT_TYPES,
-  matches,
-  MOUSE_EVENT_TYPES,
-} from './system/synthetic-events';
+import type { KEYBOARD_EVENT_TYPES, MOUSE_EVENT_TYPES } from './system/synthetic-events';
+import { blur, fireEvent, focus, matches } from './system/synthetic-events';
 
 export default class NodeQuery {
   static query(selector: string, context: Document | DocumentFragment | Element = document) {
diff --git a/packages/internal-test-helpers/lib/registry-check.ts b/packages/internal-test-helpers/lib/registry-check.ts
index da4bbf1e864..b6b1f65a7b2 100644
--- a/packages/internal-test-helpers/lib/registry-check.ts
+++ b/packages/internal-test-helpers/lib/registry-check.ts
@@ -1,4 +1,4 @@
-import { Owner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
 
 export function verifyRegistration(assert: QUnit['assert'], owner: Owner, fullName: string) {
   assert.ok(owner.resolveRegistration(fullName), `has registration: ${fullName}`);
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
index 9c32a709714..d1c9f8666d1 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
@@ -1,10 +1,12 @@
-import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
+import type { EmberPrecompileOptions } from 'ember-template-compiler';
+import { compile } from 'ember-template-compiler';
 import { ENV } from '@ember/-internals/environment';
 import AbstractTestCase from './abstract';
 import { runDestroy, runTask, runLoopSettled } from '../run';
-import Application from '@ember/application';
-import ApplicationInstance, { BootOptions } from '@ember/application/instance';
-import Router from '@ember/routing/router';
+import type Application from '@ember/application';
+import type { BootOptions } from '@ember/application/instance';
+import type ApplicationInstance from '@ember/application/instance';
+import type Router from '@ember/routing/router';
 
 export default abstract class AbstractApplicationTestCase extends AbstractTestCase {
   _applicationInstancePromise?: Promise<ApplicationInstance>;
diff --git a/packages/internal-test-helpers/lib/test-cases/application.ts b/packages/internal-test-helpers/lib/test-cases/application.ts
index b4ae19901a6..19b81dfbf5f 100644
--- a/packages/internal-test-helpers/lib/test-cases/application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/application.ts
@@ -5,8 +5,8 @@ import { Router } from '@ember/-internals/routing';
 import { runTask, runLoopSettled } from '../run';
 import Resolver from '../test-resolver';
 import { assert as emberAssert } from '@ember/debug';
-import Controller from '@ember/controller';
-import ApplicationInstance from '@ember/application/instance';
+import type Controller from '@ember/controller';
+import type ApplicationInstance from '@ember/application/instance';
 
 export default abstract class ApplicationTestCase extends TestResolverApplicationTestCase {
   application: Application;
diff --git a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
index 0a8ba85c037..74667568198 100644
--- a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { Router } from '@ember/-internals/routing';
 import Resolver from '../test-resolver';
 import { assert } from '@ember/debug';
-import ApplicationInstance from '@ember/application/instance';
+import type ApplicationInstance from '@ember/application/instance';
 
 export default abstract class AutobootApplicationTestCase extends TestResolverApplicationTestCase {
   resolver?: Resolver;
diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.ts b/packages/internal-test-helpers/lib/test-cases/query-param.ts
index 37a0f005974..503930b0290 100644
--- a/packages/internal-test-helpers/lib/test-cases/query-param.ts
+++ b/packages/internal-test-helpers/lib/test-cases/query-param.ts
@@ -1,6 +1,6 @@
-import { BootOptions } from '@ember/application/instance';
+import type { BootOptions } from '@ember/application/instance';
 import Controller from '@ember/controller';
-import EmberObject from '@ember/object';
+import type EmberObject from '@ember/object';
 import { NoneLocation } from '@ember/-internals/routing';
 
 import ApplicationTestCase from './application';
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index e80f8b2a12d..04d2dd3f7a2 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -1,15 +1,19 @@
-import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
+import type { EmberPrecompileOptions } from 'ember-template-compiler';
+import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
-import { helper, Helper, Component, _resetRenderers, Renderer } from '@ember/-internals/glimmer';
-import Resolver, { ModuleBasedResolver } from '../test-resolver';
+import type { Renderer } from '@ember/-internals/glimmer';
+import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer';
+import type Resolver from '../test-resolver';
+import { ModuleBasedResolver } from '../test-resolver';
 
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy, runTask } from '../run';
-import { Factory } from '@ember/-internals/owner';
-import { BootOptions } from '@ember/application/instance';
-import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
-import { HelperFunction } from '@ember/-internals/glimmer/lib/helper';
+import type { Factory } from '@ember/-internals/owner';
+import type { BootOptions } from '@ember/application/instance';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type EngineInstance from '@ember/engine/instance';
+import type { HelperFunction } from '@ember/-internals/glimmer/lib/helper';
 
 const TextNode = window.Text;
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
index 86bb6714de0..50a89e4381b 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
@@ -1,14 +1,18 @@
-import { compile, EmberPrecompileOptions } from 'ember-template-compiler';
+import type { EmberPrecompileOptions } from 'ember-template-compiler';
+import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
-import { Component, Renderer, _resetRenderers } from '@ember/-internals/glimmer';
-import Resolver, { ModuleBasedResolver } from '../test-resolver';
+import type { Renderer } from '@ember/-internals/glimmer';
+import { Component, _resetRenderers } from '@ember/-internals/glimmer';
+import type Resolver from '../test-resolver';
+import { ModuleBasedResolver } from '../test-resolver';
 
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy } from '../run';
-import EngineInstance, { EngineInstanceOptions } from '@ember/engine/instance';
-import { BootOptions } from '@ember/application/instance';
-import { Factory } from '@ember/-internals/owner';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type EngineInstance from '@ember/engine/instance';
+import type { BootOptions } from '@ember/application/instance';
+import type { Factory } from '@ember/-internals/owner';
 
 export default class RouterNonApplicationTestCase extends AbstractTestCase {
   owner: EngineInstance;
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
index 7ab8efe8860..a068d92ac32 100644
--- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
@@ -1,7 +1,8 @@
 import AbstractApplicationTestCase from './abstract-application';
-import Resolver, { ModuleBasedResolver } from '../test-resolver';
+import type Resolver from '../test-resolver';
+import { ModuleBasedResolver } from '../test-resolver';
 import { Component } from '@ember/-internals/glimmer';
-import { Factory } from '@ember/-internals/owner';
+import type { Factory } from '@ember/-internals/owner';
 
 export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
   abstract resolver?: Resolver;
diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts
index 9332e27191f..e8c8be71390 100644
--- a/packages/internal-test-helpers/lib/test-resolver.ts
+++ b/packages/internal-test-helpers/lib/test-resolver.ts
@@ -1,7 +1,7 @@
 import { compile } from 'ember-template-compiler';
 
-import { Resolver as IResolver } from '@ember/-internals/container/lib/registry';
-import { Factory } from '@ember/-internals/owner';
+import type { Resolver as IResolver } from '@ember/-internals/container/lib/registry';
+import type { Factory } from '@ember/-internals/owner';
 
 const DELIMITER = '%';
 

From 8c6a1594b72ecb9e0f56161e08c815b76f4bb21a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 6 May 2022 09:42:05 -0700
Subject: [PATCH 1002/1405] Improve types for array internals

---
 packages/@ember/-internals/metal/lib/array.ts |  38 +-
 packages/@ember/-internals/metal/lib/mixin.ts |  10 +-
 .../-internals/runtime/lib/mixins/array.d.ts  | 110 ------
 .../runtime/lib/mixins/{array.js => array.ts} | 340 +++++++++++++-----
 .../runtime/lib/system/array_proxy.ts         |  25 +-
 .../lib/computed/reduce_computed_macros.ts    |   2 +-
 6 files changed, 294 insertions(+), 231 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/array.d.ts
 rename packages/@ember/-internals/runtime/lib/mixins/{array.js => array.ts} (81%)

diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index 2600b39f337..4b9bb3e3360 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -1,10 +1,13 @@
-import type { Array as EmberArray, MutableArray, NativeArray } from '@ember/-internals/runtime';
+import type { Array as EmberArray, MutableArray } from '@ember/-internals/runtime';
+import { assert } from '@ember/debug';
 import { arrayContentDidChange, arrayContentWillChange } from './array_events';
 import { addListener, removeListener } from './events';
 
 const EMPTY_ARRAY = Object.freeze([]);
 
-interface ObservedObject<T> extends EmberArray<T> {
+type ObservedArray<T> = (T[] | EmberArray<T>) & ObservedObject;
+
+interface ObservedObject {
   _revalidate?: () => void;
 }
 
@@ -16,16 +19,23 @@ export function objectAt<T>(array: T[] | EmberArray<T>, index: number): T | unde
   }
 }
 
+// Ideally, we'd use MutableArray.detect but for unknown reasons this causes
+// the node tests to fail strangely.
+function isMutableArray<T>(obj: unknown): obj is MutableArray<T> {
+  return obj != null && typeof (obj as MutableArray<T>).replace === 'function';
+}
+
 export function replace<T>(
-  array: NativeArray<T> | MutableArray<T>,
+  array: T[] | MutableArray<T>,
   start: number,
   deleteCount: number,
-  items: T[] = EMPTY_ARRAY as []
+  items: readonly T[] = EMPTY_ARRAY as []
 ): void {
-  if (Array.isArray(array)) {
-    replaceInNativeArray(array, start, deleteCount, items);
-  } else {
+  if (isMutableArray(array)) {
     array.replace(start, deleteCount, items);
+  } else {
+    assert('Can only replace content of a native array or MutableArray', Array.isArray(array));
+    replaceInNativeArray(array, start, deleteCount, items);
   }
 }
 
@@ -34,7 +44,7 @@ const CHUNK_SIZE = 60000;
 // To avoid overflowing the stack, we splice up to CHUNK_SIZE items at a time.
 // See https://code.google.com/p/chromium/issues/detail?id=56588 for more details.
 export function replaceInNativeArray<T>(
-  array: T[] | NativeArray<T>,
+  array: T[],
   start: number,
   deleteCount: number,
   items: ReadonlyArray<T>
@@ -61,18 +71,18 @@ interface ArrayObserverOptions {
 }
 
 type Operation<T> = (
-  obj: ObservedObject<T>,
+  obj: ObservedArray<T>,
   eventName: string,
   target: object | Function | null,
   callbackName: string
 ) => void;
 
 function arrayObserversHelper<T>(
-  obj: ObservedObject<T>,
+  obj: ObservedArray<T>,
   target: object | Function | null,
   opts: ArrayObserverOptions,
   operation: Operation<T>
-): ObservedObject<T> {
+): ObservedArray<T> {
   let { willChange, didChange } = opts;
 
   operation(obj, '@array:before', target, willChange);
@@ -91,14 +101,14 @@ export function addArrayObserver<T>(
   array: EmberArray<T>,
   target: object | Function | null,
   opts: ArrayObserverOptions
-): ObservedObject<T> {
+): ObservedArray<T> {
   return arrayObserversHelper(array, target, opts, addListener);
 }
 
 export function removeArrayObserver<T>(
-  array: EmberArray<T>,
+  array: T[] | EmberArray<T>,
   target: object | Function | null,
   opts: ArrayObserverOptions
-): ObservedObject<T> {
+): ObservedArray<T> {
   return arrayObserversHelper(array, target, opts, removeListener);
 }
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
index 656cefaf9c8..493ffd7d4d0 100644
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ b/packages/@ember/-internals/metal/lib/mixin.ts
@@ -672,7 +672,9 @@ export default class Mixin {
 
   /** @internal */
   keys() {
-    return _keys(this);
+    let keys = _keys(this);
+    assert('[BUG] Missing keys for mixin!', keys);
+    return keys;
   }
 
   /** @internal */
@@ -739,7 +741,7 @@ function _detect(curMixin: Mixin, targetMixin: Mixin, seen = new Set()): boolean
   return false;
 }
 
-function _keys(mixin: Mixin, ret = new Set(), seen = new Set()) {
+function _keys(mixin: Mixin, ret = new Set<string>(), seen = new Set()) {
   if (seen.has(mixin)) {
     return;
   }
@@ -747,8 +749,8 @@ function _keys(mixin: Mixin, ret = new Set(), seen = new Set()) {
 
   if (mixin.properties) {
     let props = Object.keys(mixin.properties);
-    for (let i = 0; i < props.length; i++) {
-      ret.add(props[i]);
+    for (let prop of props) {
+      ret.add(prop);
     }
   } else if (mixin.mixins) {
     mixin.mixins.forEach((x: any) => _keys(x, ret, seen));
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts b/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
deleted file mode 100644
index 385086baf87..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/array.d.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import type { Mixin } from '@ember/-internals/metal';
-import type { AnyFn } from '@ember/-internals/utils/types';
-import type Enumerable from './enumerable';
-import type MutableEnumerable from './mutable_enumerable';
-
-type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
-
-interface EmberArray<T> extends Enumerable {
-  length: number;
-  objectAt(idx: number): T | undefined;
-  objectsAt(indexes: number[]): Array<T | undefined>;
-  firstObject: T | undefined;
-  lastObject: T | undefined;
-  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
-  indexOf(object: T, startAt?: number): number;
-  lastIndexOf(object: T, startAt?: number): number;
-  forEach<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => void,
-    target?: Target
-  ): this;
-  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
-  setEach<K extends string>(key: K, value: Value<T, K>): this;
-  map<U, Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => U,
-    target?: Target
-  ): NativeArray<U>;
-  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
-  filter<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): NativeArray<T>;
-  reject<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): NativeArray<T>;
-  filterBy(key: string): NativeArray<T>;
-  rejectBy(key: string): NativeArray<T>;
-  find<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): T | undefined;
-  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
-  every<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): boolean;
-  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
-  any<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): boolean;
-  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
-  reduce<V>(
-    callback: (summation: V, current: T, index: number, arr: this) => V,
-    initialValue?: V
-  ): V;
-  invoke<K extends string>(
-    methodName: K,
-    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
-  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
-  toArray(): T[];
-  compact(): NativeArray<Exclude<T, null>>;
-  includes(object: T, startAt?: number): boolean;
-  sortBy(key: string): T[];
-  uniq(): NativeArray<T>;
-  uniqBy(key: string): NativeArray<T>;
-  without(value: T): NativeArray<T>;
-}
-
-declare const EmberArray: Mixin;
-export default EmberArray;
-
-interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
-  replace(idx: number, amt: number, objects?: T[]): void;
-  clear(): this;
-  insertAt(idx: number, object: T): this;
-  removeAt(start: number, len: number): this;
-  pushObject(obj: T): this;
-  pushObjects(objects: T[]): this;
-  popObject(): T | undefined;
-  shiftObject(): T | null | undefined;
-  unshiftObject(object: T): this;
-  unshiftObjects(objects: T[]): this;
-  reverseObjects(): this;
-  setObjects(object: T[]): this;
-  removeObject(object: T): this;
-  removeObjects(objects: T[]): this;
-  addObject(obj: T): this;
-  addObjects(objects: T[]): this;
-}
-
-declare const MutableArray: Mixin;
-export { MutableArray };
-
-// NOTE: We have to Omit some definitions from Array because MutableArray defines them differently.
-interface NativeArray<T>
-  extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
-    MutableArray<T> {}
-declare const NativeArray: Array<unknown>;
-export { NativeArray };
-
-export function A<A>(arr: A): A extends Array<infer V> ? NativeArray<V> : NativeArray<unknown>;
-export function A<T>(): NativeArray<T>;
-
-export function removeAt<T>(array: T[] | EmberArray<T>, start: number, len: number): EmberArray<T>;
-export function uniqBy<T>(
-  array: T[] | EmberArray<T>,
-  keyOrFunc: string | ((item: T) => unknown)
-): T[] | EmberArray<T>;
-export function isArray(obj: unknown): boolean;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.js b/packages/@ember/-internals/runtime/lib/mixins/array.ts
similarity index 81%
rename from packages/@ember/-internals/runtime/lib/mixins/array.js
rename to packages/@ember/-internals/runtime/lib/mixins/array.ts
index 9333286b292..e99c23c1cfc 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.js
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.ts
@@ -3,7 +3,7 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { PROXY_CONTENT } from '@ember/-internals/metal';
-import { setEmberArray } from '@ember/-internals/utils';
+import { isEmberArray, setEmberArray } from '@ember/-internals/utils';
 import {
   get,
   set,
@@ -22,17 +22,24 @@ import { ENV } from '@ember/-internals/environment';
 import Observable from '../mixins/observable';
 import MutableEnumerable from './mutable_enumerable';
 import { typeOf } from '../type-of';
+import type { AnyFn } from '@ember/-internals/utils/types';
+import type { ComputedPropertyCallback } from '@ember/-internals/metal/lib/computed';
 
-const EMPTY_ARRAY = Object.freeze([]);
+type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
 
-const identityFunction = (item) => item;
+const EMPTY_ARRAY = Object.freeze([] as const);
 
-export function uniqBy(array, key = identityFunction) {
+const identityFunction = <T>(item: T) => item;
+
+export function uniqBy<T>(
+  array: T[] | EmberArray<T>,
+  keyOrFunc: string | ((item: T) => unknown) = identityFunction
+): T[] | EmberArray<T> {
   assert(`first argument passed to \`uniqBy\` should be array`, isArray(array));
 
-  let ret = A();
+  let ret = A<T>();
   let seen = new Set();
-  let getter = typeof key === 'function' ? key : (item) => get(item, key);
+  let getter = typeof keyOrFunc === 'function' ? keyOrFunc : (item: T) => get(item, keyOrFunc);
 
   array.forEach((item) => {
     let val = getter(item);
@@ -45,15 +52,26 @@ export function uniqBy(array, key = identityFunction) {
   return ret;
 }
 
-function iter(key, value) {
-  let valueProvided = arguments.length === 2;
-  return valueProvided ? (item) => value === get(item, key) : (item) => Boolean(get(item, key));
+function iter<T>(key: string): (item: T) => boolean;
+function iter<T>(key: string, value: unknown): (item: T) => boolean;
+function iter<T>(...args: [key: string] | [key: string, value: unknown]) {
+  let valueProvided = args.length === 2;
+  let [key, value] = args;
+
+  return valueProvided
+    ? (item: T) => value === get(item, key)
+    : (item: T) => Boolean(get(item, key));
 }
 
-function findIndex(array, predicate, startAt) {
+function findIndex<T>(
+  array: EmberArray<T>,
+  predicate: (item: T, index: number, arr: EmberArray<T>) => unknown,
+  startAt: number
+): number {
   let len = array.length;
   for (let index = startAt; index < len; index++) {
-    let item = objectAt(array, index);
+    // SAFETY: Because we're checking the index this value should always be set.
+    let item = objectAt(array, index)!;
     if (predicate(item, index, array)) {
       return index;
     }
@@ -61,24 +79,36 @@ function findIndex(array, predicate, startAt) {
   return -1;
 }
 
-function find(array, callback, target) {
+function find<T, Target>(
+  array: EmberArray<T>,
+  callback: (this: Target | null, item: T, index: number, arr: EmberArray<T>) => unknown,
+  target: Target | null = null
+) {
   let predicate = callback.bind(target);
   let index = findIndex(array, predicate, 0);
   return index === -1 ? undefined : objectAt(array, index);
 }
 
-function any(array, callback, target) {
+function any<T, Target>(
+  array: EmberArray<T>,
+  callback: (this: Target | null, item: T, index: number, arr: EmberArray<T>) => unknown,
+  target: Target | null = null
+) {
   let predicate = callback.bind(target);
   return findIndex(array, predicate, 0) !== -1;
 }
 
-function every(array, callback, target) {
+function every<T, Target>(
+  array: EmberArray<T>,
+  callback: (this: Target | null | void, item: T, index: number, arr: EmberArray<T>) => unknown,
+  target: Target | null = null
+) {
   let cb = callback.bind(target);
-  let predicate = (item, index, array) => !cb(item, index, array);
+  let predicate = (item: T, index: number, array: EmberArray<T>) => !cb(item, index, array);
   return findIndex(array, predicate, 0) === -1;
 }
 
-function indexOf(array, val, startAt = 0, withNaNCheck) {
+function indexOf<T>(array: EmberArray<T>, val: T, startAt = 0, withNaNCheck: boolean) {
   let len = array.length;
 
   if (startAt < 0) {
@@ -86,17 +116,22 @@ function indexOf(array, val, startAt = 0, withNaNCheck) {
   }
 
   // SameValueZero comparison (NaN !== NaN)
-  let predicate = withNaNCheck && val !== val ? (item) => item !== item : (item) => item === val;
+  let predicate =
+    withNaNCheck && val !== val ? (item: T) => item !== item : (item: T) => item === val;
   return findIndex(array, predicate, startAt);
 }
 
-export function removeAt(array, index, len = 1) {
+export function removeAt<T, A extends T[] | MutableArray<T>>(
+  array: A,
+  index: number,
+  len?: number
+): A {
   assert(`\`removeAt\` index provided is out of range`, index > -1 && index < array.length);
-  replace(array, index, len, EMPTY_ARRAY);
+  replace(array, index, len ?? 1, EMPTY_ARRAY);
   return array;
 }
 
-function insertAt(array, index, item) {
+function insertAt<T>(array: MutableArray<T>, index: number, item: T) {
   assert(`\`insertAt\` index provided is out of range`, index > -1 && index <= array.length);
   replace(array, index, 0, [item]);
   return item;
@@ -130,19 +165,21 @@ function insertAt(array, index, item) {
   @return {Boolean} true if the passed object is an array or Array-like
   @public
 */
-export function isArray(_obj) {
-  let obj = _obj;
-  if (DEBUG && typeof _obj === 'object' && _obj !== null) {
-    let possibleProxyContent = _obj[PROXY_CONTENT];
+export function isArray(obj: unknown): obj is ArrayLike<unknown> | EmberArray<unknown> {
+  if (DEBUG && typeof obj === 'object' && obj !== null) {
+    // SAFETY: Property read checks are safe if it's an object
+    let possibleProxyContent = (obj as any)[PROXY_CONTENT];
     if (possibleProxyContent !== undefined) {
       obj = possibleProxyContent;
     }
   }
 
-  if (!obj || obj.setInterval) {
+  // SAFETY: Property read checks are safe if it's an object
+  if (!obj || (obj as any).setInterval) {
     return false;
   }
-  if (Array.isArray(obj) || ArrayMixin.detect(obj)) {
+
+  if (Array.isArray(obj) || EmberArray.detect(obj)) {
     return true;
   }
 
@@ -150,10 +187,13 @@ export function isArray(_obj) {
   if ('array' === type) {
     return true;
   }
-  let length = obj.length;
+
+  // SAFETY: Property read checks are safe if it's an object
+  let length = (obj as any).length;
   if (typeof length === 'number' && length === length && 'object' === type) {
     return true;
   }
+
   return false;
 }
 
@@ -163,13 +203,13 @@ export function isArray(_obj) {
   applied to `Array.prototype` we need to ensure that we do not add _any_
   new enumerable properties.
 */
-function nonEnumerableComputed() {
-  let property = computed(...arguments);
+function nonEnumerableComputed(callback: ComputedPropertyCallback) {
+  let property = computed(callback);
   property.enumerable = false;
   return property;
 }
 
-function mapBy(key) {
+function mapBy<T>(this: EmberArray<T>, key: string) {
   return this.map((next) => get(next, key));
 }
 
@@ -209,7 +249,68 @@ function mapBy(key) {
   @since Ember 0.9.0
   @public
 */
-const ArrayMixin = Mixin.create(Enumerable, {
+interface EmberArray<T> extends Enumerable {
+  length: number;
+  objectAt(idx: number): T | undefined;
+  objectsAt(indexes: number[]): Array<T | undefined>;
+  firstObject: T | undefined;
+  lastObject: T | undefined;
+  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
+  indexOf(object: T, startAt?: number): number;
+  lastIndexOf(object: T, startAt?: number): number;
+  forEach<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => void,
+    target?: Target
+  ): this;
+  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
+  setEach<K extends string>(key: K, value: Value<T, K>): this;
+  map<U, Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => U,
+    target?: Target
+  ): NativeArray<U>;
+  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
+  filter<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): NativeArray<T>;
+  reject<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): NativeArray<T>;
+  filterBy(key: string, value?: unknown): NativeArray<T>;
+  rejectBy(key: string, value?: unknown): NativeArray<T>;
+  find<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): T | undefined;
+  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
+  every<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): boolean;
+  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
+  any<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): boolean;
+  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
+  reduce<V>(
+    callback: (summation: V, current: T, index: number, arr: this) => V,
+    initialValue?: V
+  ): V;
+  invoke<K extends string>(
+    methodName: K,
+    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
+  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
+  toArray(): T[];
+  compact(): NativeArray<Exclude<T, null>>;
+  includes(object: T, startAt?: number): boolean;
+  sortBy(key: string): T[];
+  uniq(): NativeArray<T>;
+  uniqBy(key: string): NativeArray<T>;
+  without(value: T): NativeArray<T>;
+}
+const EmberArray = Mixin.create(Enumerable, {
   init() {
     this._super(...arguments);
     setEmberArray(this);
@@ -265,7 +366,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array}
     @public
    */
-  objectsAt(indexes) {
+  objectsAt(indexes: number[]) {
     return indexes.map((idx) => objectAt(this, idx));
   },
 
@@ -291,7 +392,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     get() {
       return this;
     },
-    set(key, value) {
+    set(_key, value) {
       this.replace(0, this.length, value);
       return this;
     },
@@ -353,7 +454,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} New array with specified slice
     @public
   */
-  slice(beginIndex = 0, endIndex) {
+  slice(beginIndex = 0, endIndex?: number) {
     let ret = A();
     let length = this.length;
 
@@ -361,13 +462,16 @@ const ArrayMixin = Mixin.create(Enumerable, {
       beginIndex = length + beginIndex;
     }
 
+    let validatedEndIndex: number;
     if (endIndex === undefined || endIndex > length) {
-      endIndex = length;
+      validatedEndIndex = length;
     } else if (endIndex < 0) {
-      endIndex = length + endIndex;
+      validatedEndIndex = length + endIndex;
+    } else {
+      validatedEndIndex = endIndex;
     }
 
-    while (beginIndex < endIndex) {
+    while (beginIndex < validatedEndIndex) {
       ret[ret.length] = objectAt(this, beginIndex++);
     }
 
@@ -412,7 +516,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
 
-  indexOf(object, startAt) {
+  indexOf<T>(object: T, startAt?: number) {
     return indexOf(this, object, startAt, false);
   },
 
@@ -450,7 +554,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     if not found
     @public
   */
-  lastIndexOf(object, startAt) {
+  lastIndexOf<T>(object: T, startAt?: number) {
     let len = this.length;
 
     if (startAt === undefined || startAt >= len) {
@@ -517,7 +621,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Object} receiver
     @public
   */
-  forEach(callback, target = null) {
+  forEach(callback: <T>(item: T, index: number, arr: EmberArray<T>) => void, target = null) {
     assert('`forEach` expects a function as first argument.', typeof callback === 'function');
 
     let length = this.length;
@@ -572,8 +676,8 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Object} receiver
     @public
   */
-  setEach(key, value) {
-    return this.forEach((item) => set(item, key, value));
+  setEach(key: string, value: unknown) {
+    return this.forEach((item: object) => set(item, key, value));
   },
 
   /**
@@ -610,7 +714,11 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} The mapped array.
     @public
   */
-  map(callback, target = null) {
+  map<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
     assert('`map` expects a function as first argument.', typeof callback === 'function');
 
     let ret = A();
@@ -700,7 +808,11 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} A filtered array.
     @public
   */
-  filter(callback, target = null) {
+  filter<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
     assert('`filter` expects a function as first argument.', typeof callback === 'function');
 
     let ret = A();
@@ -754,9 +866,14 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} A rejected array.
     @public
   */
-  reject(callback, target = null) {
+  reject<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
     assert('`reject` expects a function as first argument.', typeof callback === 'function');
     return this.filter(function () {
+      // @ts-expect-error TS doesn't like us using arguments like this
       return !callback.apply(target, arguments);
     });
   },
@@ -782,6 +899,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   filterBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
     return this.filter(iter(...arguments));
   },
 
@@ -809,6 +927,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   rejectBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
     return this.reject(iter(...arguments));
   },
 
@@ -854,7 +973,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Object} Found item or `undefined`.
     @public
   */
-  find(callback, target = null) {
+  find(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
     assert('`find` expects a function as first argument.', typeof callback === 'function');
     return find(this, callback, target);
   },
@@ -888,7 +1007,9 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   findBy() {
-    return find(this, iter(...arguments));
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    let callback = iter(...arguments);
+    return find(this, callback);
   },
 
   /**
@@ -928,7 +1049,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Boolean}
     @public
   */
-  every(callback, target = null) {
+  every(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
     assert('`every` expects a function as first argument.', typeof callback === 'function');
     return every(this, callback, target);
   },
@@ -972,7 +1093,9 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   isEvery() {
-    return every(this, iter(...arguments));
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    let callback = iter(...arguments);
+    return every(this, callback);
   },
 
   /**
@@ -1014,7 +1137,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Boolean} `true` if the passed function returns `true` for any item
     @public
   */
-  any(callback, target = null) {
+  any(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
     assert('`any` expects a function as first argument.', typeof callback === 'function');
     return any(this, callback, target);
   },
@@ -1044,7 +1167,9 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   isAny() {
-    return any(this, iter(...arguments));
+    // @ts-expect-error TS doesn't like us using arguments like this
+    let callback = iter(...arguments);
+    return any(this, callback);
   },
 
   /**
@@ -1102,7 +1227,11 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
   // FIXME: When called without initialValue, behavior does not match native behavior
-  reduce(callback, initialValue) {
+  reduce<T, V>(
+    this: EmberArray<T>,
+    callback: (summation: V, current: T, index: number, arr: EmberArray<T>) => V,
+    initialValue: V
+  ) {
     assert('`reduce` expects a function as first argument.', typeof callback === 'function');
 
     let ret = initialValue;
@@ -1144,10 +1273,11 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} return values from calling invoke.
     @public
   */
-  invoke(methodName, ...args) {
+  invoke<T>(this: EmberArray<T>, methodName: string, ...args: unknown[]) {
     let ret = A();
 
-    this.forEach((item) => ret.push(item[methodName]?.(...args)));
+    // SAFETY: This is not entirely safe and the code will not work with Ember proxies
+    this.forEach((item: T) => ret.push((item as any)[methodName]?.(...args)));
 
     return ret;
   },
@@ -1160,8 +1290,8 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} the object as an array.
     @public
   */
-  toArray() {
-    return this.map((item) => item);
+  toArray<T>(this: EmberArray<T>) {
+    return this.map((item: T) => item);
   },
 
   /**
@@ -1176,8 +1306,8 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Array} the array without null and undefined elements.
     @public
   */
-  compact() {
-    return this.filter((value) => value != null);
+  compact<T>(this: EmberArray<T>) {
+    return this.filter((value: T) => value != null);
   },
 
   /**
@@ -1209,7 +1339,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {Boolean} `true` if object is found in the array.
     @public
   */
-  includes(object, startAt) {
+  includes<T>(this: EmberArray<T>, object: T, startAt?: number) {
     return indexOf(this, object, startAt, true) !== -1;
   },
 
@@ -1238,10 +1368,10 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @since 1.2.0
     @public
   */
-  sortBy() {
+  sortBy<T>(this: EmberArray<T>) {
     let sortKeys = arguments;
 
-    return this.toArray().sort((a, b) => {
+    return this.toArray().sort((a: T, b: T) => {
       for (let i = 0; i < sortKeys.length; i++) {
         let key = sortKeys[i];
         let propA = get(a, key);
@@ -1294,7 +1424,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @public
   */
 
-  uniqBy(key) {
+  uniqBy(key: string) {
     return uniqBy(this, key);
   },
 
@@ -1313,13 +1443,13 @@ const ArrayMixin = Mixin.create(Enumerable, {
     @return {EmberArray}
     @public
   */
-  without(value) {
+  without<T>(this: EmberArray<T>, value: T) {
     if (!this.includes(value)) {
       return this; // nothing to do
     }
 
     // SameValueZero comparison (NaN !== NaN)
-    let predicate = value === value ? (item) => item !== value : (item) => item === item;
+    let predicate = value === value ? (item: T) => item !== value : (item: T) => item === item;
     return this.filter(predicate);
   },
 });
@@ -1344,8 +1474,25 @@ const ArrayMixin = Mixin.create(Enumerable, {
   @uses MutableEnumerable
   @public
 */
-
-const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
+interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
+  replace(idx: number, amt: number, objects?: readonly T[]): void;
+  clear(): this;
+  insertAt(idx: number, object: T): this;
+  removeAt(start: number, len?: number): this;
+  pushObject(obj: T): this;
+  pushObjects(objects: T[]): this;
+  popObject(): T | undefined;
+  shiftObject(): T | null | undefined;
+  unshiftObject(object: T): this;
+  unshiftObjects(objects: T[]): this;
+  reverseObjects(): this;
+  setObjects(object: T[]): this;
+  removeObject(object: T): this;
+  removeObjects(objects: T[]): this;
+  addObject(obj: T): this;
+  addObjects(objects: T[]): this;
+}
+const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
   /**
     __Required.__ You must implement this method to apply this mixin.
 
@@ -1408,7 +1555,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  insertAt(idx, object) {
+  insertAt(idx: number, object: unknown) {
     insertAt(this, idx, object);
     return this;
   },
@@ -1434,7 +1581,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  removeAt(start, len) {
+  removeAt(start: number, len?: number) {
     return removeAt(this, start, len);
   },
 
@@ -1454,7 +1601,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return object same object passed as a param
     @public
   */
-  pushObject(obj) {
+  pushObject<T>(this: MutableArray<T>, obj: T) {
     return insertAt(this, this.length, obj);
   },
 
@@ -1469,11 +1616,11 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     ```
 
     @method pushObjects
-    @param {EmberArray} objects the objects to add
-    @return {EmberArray} receiver
+    @param {Array} objects the objects to add
+    @return {MutableArray} receiver
     @public
   */
-  pushObjects(objects) {
+  pushObjects<T>(this: MutableArray<T>, objects: T[]) {
     this.replace(this.length, 0, objects);
     return this;
   },
@@ -1545,7 +1692,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return object same object passed as a param
     @public
   */
-  unshiftObject(obj) {
+  unshiftObject<T>(this: MutableArray<T>, obj: T) {
     return insertAt(this, 0, obj);
   },
 
@@ -1565,7 +1712,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  unshiftObjects(objects) {
+  unshiftObjects<T>(this: MutableArray<T>, objects: T[]) {
     this.replace(0, 0, objects);
     return this;
   },
@@ -1606,7 +1753,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver with the new content
     @public
   */
-  setObjects(objects) {
+  setObjects<T>(this: MutableArray<T>, objects: T[]) {
     if (objects.length === 0) {
       return this.clear();
     }
@@ -1632,7 +1779,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  removeObject(obj) {
+  removeObject<T>(this: MutableArray<T>, obj: T) {
     let loc = this.length || 0;
     while (--loc >= 0) {
       let curObject = objectAt(this, loc);
@@ -1652,10 +1799,11 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  removeObjects(objects) {
+  removeObjects<T>(this: MutableArray<T>, objects: T[]) {
     beginPropertyChanges();
     for (let i = objects.length - 1; i >= 0; i--) {
-      this.removeObject(objects[i]);
+      // SAFETY: Due to the loop structure we know this will always exist.
+      this.removeObject(objects[i]!);
     }
     endPropertyChanges();
     return this;
@@ -1677,7 +1825,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  addObject(obj) {
+  addObject<T>(this: MutableArray<T>, obj: T) {
     let included = this.includes(obj);
 
     if (!included) {
@@ -1695,7 +1843,7 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
     @return {EmberArray} receiver
     @public
   */
-  addObjects(objects) {
+  addObjects<T>(this: MutableArray<T>, objects: T[]) {
     beginPropertyChanges();
     objects.forEach((obj) => this.addObject(obj));
     endPropertyChanges();
@@ -1757,13 +1905,17 @@ const MutableArray = Mixin.create(ArrayMixin, MutableEnumerable, {
   @uses Observable
   @public
 */
+interface NativeArray<T>
+  extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
+    MutableArray<T> {}
+
 let NativeArray = Mixin.create(MutableArray, Observable, {
-  objectAt(idx) {
+  objectAt(idx: number) {
     return this[idx];
   },
 
   // primitive for array support.
-  replace(start, deleteCount, items = EMPTY_ARRAY) {
+  replace(start: number, deleteCount: number, items = EMPTY_ARRAY) {
     assert('The third argument to replace needs to be an array.', Array.isArray(items));
 
     replaceInNativeArray(this, start, deleteCount, items);
@@ -1775,41 +1927,45 @@ let NativeArray = Mixin.create(MutableArray, Observable, {
 // Remove any methods implemented natively so we don't override them
 const ignore = ['length'];
 NativeArray.keys().forEach((methodName) => {
-  if (Array.prototype[methodName]) {
+  // SAFETY: It's safe to read unknown properties from an object
+  if ((Array.prototype as any)[methodName]) {
     ignore.push(methodName);
   }
 });
 
 NativeArray = NativeArray.without(...ignore);
 
-let A;
+let A: <T>(arr?: Array<T>) => NativeArray<T>;
 
 if (ENV.EXTEND_PROTOTYPES.Array) {
   NativeArray.apply(Array.prototype, true);
 
-  A = function (arr) {
+  A = function <T>(this: unknown, arr?: Array<T>) {
     assert(
       'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
       !(this instanceof A)
     );
 
-    return arr || [];
+    // SAFTEY: Since we are extending prototypes all true native arrays are Ember NativeArrays
+    return (arr || []) as NativeArray<T>;
   };
 } else {
-  A = function (arr) {
+  A = function <T>(this: unknown, arr?: Array<T>) {
     assert(
       'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
       !(this instanceof A)
     );
 
-    if (!arr) {
-      arr = [];
+    if (isEmberArray(arr)) {
+      // SAFETY: If it's a true native array and it is also an EmberArray then it should be an Ember NativeArray
+      return arr as NativeArray<T>;
+    } else {
+      // SAFETY: This will return an NativeArray but TS can't infer that.
+      return NativeArray.apply(arr ?? []) as NativeArray<T>;
     }
-
-    return ArrayMixin.detect(arr) ? arr : NativeArray.apply(arr);
   };
 }
 
 export { A, NativeArray, MutableArray };
 
-export default ArrayMixin;
+export default EmberArray;
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
index 9b825aee4b6..b025402f2aa 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
@@ -16,15 +16,14 @@ import {
 } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import EmberObject from './object';
-import type EmberArray from '../mixins/array';
-import { isArray, MutableArray } from '../mixins/array';
+import EmberArray, { MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
 import { setCustomTagFor } from '@glimmer/manager';
 import type { Tag, Revision } from '@glimmer/validator';
 import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
 import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
 
-function isMutable<T>(obj: EmberArray<T>): obj is MutableArray<T> {
+function isMutable<T>(obj: T[] | EmberArray<T>): obj is T[] | MutableArray<T> {
   return Array.isArray(obj) || typeof (obj as MutableArray<T>).replace === 'function';
 }
 
@@ -110,8 +109,8 @@ function customTagForArrayProxy(proxy: object, key: string) {
   @public
 */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars
-interface ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>> extends MutableArray<T> {}
-class ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>>
+interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArray<T> {}
+class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
   extends EmberObject
   implements PropertyDidChange
 {
@@ -212,15 +211,15 @@ class ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>>
     @method replaceContent
     @param {Number} idx The starting index
     @param {Number} amt The number of items to remove from the content.
-    @param {EmberArray} objects Optional array of objects to insert.
+    @param {Array} objects Optional array of objects to insert.
     @return {void}
     @public
   */
   replaceContent(idx: number, amt: number, objects?: T[]) {
     let content = get(this, 'content');
-    assert('[BUG] Called objectAtContent without content', content);
+    assert('[BUG] Called replaceContent without content', content);
     assert('Mutating a non-mutable array is not allowed', isMutable(content));
-    content.replace(idx, amt, objects);
+    replace<T>(content, idx, amt, objects);
   }
 
   // Overriding objectAt is not supported.
@@ -306,8 +305,14 @@ class ArrayProxy<T, C extends EmberArray<T> = EmberArray<T>>
       // @ts-expect-error This check is still good for ensuring correctness
       assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
       assert(
-        `ArrayProxy expects an Array or ArrayProxy, but you passed ${typeof arrangedContent}`,
-        isArray(arrangedContent) || (arrangedContent as any).isDestroyed
+        `ArrayProxy expects a native Array, EmberArray, or ArrayProxy, but you passed ${typeof arrangedContent}`,
+        (function (arr: unknown): arr is EmberArray<unknown> {
+          return Array.isArray(arr) || EmberArray.detect(arr);
+        })(arrangedContent)
+      );
+      assert(
+        'ArrayProxy expected its contents to not be destroyed',
+        !(arrangedContent as any).isDestroyed
       );
 
       addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING);
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index 06ee9c2cf2c..264747c1e1c 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -966,7 +966,7 @@ export function setDiff(setAProperty: string, setBProperty: string) {
       return emberA();
     }
     if (!isNativeOrEmberArray(setB)) {
-      return emberA(setA);
+      return setA;
     }
 
     return setA.filter((x) => setB.indexOf(x) === -1);

From 08a0a4c319f2c1c926bc9a3869cc9d13a361173f Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 9 May 2022 15:06:03 -0700
Subject: [PATCH 1003/1405] Convert @ember/object/index to .ts

---
 packages/@ember/object/index.d.ts             | 14 ----
 packages/@ember/object/{index.js => index.ts} | 65 +++++++++++++++----
 .../@ember/object/type-tests/action.test.ts   |  3 +-
 3 files changed, 56 insertions(+), 26 deletions(-)
 delete mode 100644 packages/@ember/object/index.d.ts
 rename packages/@ember/object/{index.js => index.ts} (74%)

diff --git a/packages/@ember/object/index.d.ts b/packages/@ember/object/index.d.ts
deleted file mode 100644
index d6c9b69cf6c..00000000000
--- a/packages/@ember/object/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export let action: MethodDecorator;
-
-export {
-  computed,
-  defineProperty,
-  get,
-  getProperties,
-  observer,
-  set,
-  setProperties,
-  trySet,
-} from '@ember/-internals/metal';
-
-export { Object as default } from '@ember/-internals/runtime';
diff --git a/packages/@ember/object/index.js b/packages/@ember/object/index.ts
similarity index 74%
rename from packages/@ember/object/index.js
rename to packages/@ember/object/index.ts
index 5542729c9b3..b0528068aea 100644
--- a/packages/@ember/object/index.js
+++ b/packages/@ember/object/index.ts
@@ -1,4 +1,5 @@
 import { assert } from '@ember/debug';
+import type { ElementDescriptor, ExtendedMethodDecorator } from '@ember/-internals/metal';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
 
 export { Object as default } from '@ember/-internals/runtime';
@@ -130,8 +131,30 @@ export {
 
 const BINDINGS_MAP = new WeakMap();
 
-function setupAction(target, key, actionFn) {
-  if (target.constructor !== undefined && typeof target.constructor.proto === 'function') {
+interface HasProto {
+  constructor: {
+    proto(): void;
+  };
+}
+
+function hasProto(obj: unknown): obj is HasProto {
+  return (
+    obj != null &&
+    (obj as any).constructor !== undefined &&
+    typeof ((obj as any).constructor as any).proto === 'function'
+  );
+}
+
+interface HasActions {
+  actions: Record<string | symbol, unknown>;
+}
+
+function setupAction(
+  target: Partial<HasActions>,
+  key: string | symbol,
+  actionFn: Function
+): TypedPropertyDescriptor<unknown> {
+  if (hasProto(target)) {
     target.constructor.proto();
   }
 
@@ -141,6 +164,8 @@ function setupAction(target, key, actionFn) {
     target.actions = parentActions ? Object.assign({}, parentActions) : {};
   }
 
+  assert("[BUG] Somehow the target doesn't have actions!", target.actions != null);
+
   target.actions[key] = actionFn;
 
   return {
@@ -164,13 +189,27 @@ function setupAction(target, key, actionFn) {
   };
 }
 
-export function action(target, key, desc) {
-  let actionFn;
-
-  if (!isElementDescriptor([target, key, desc])) {
-    actionFn = target;
-
-    let decorator = function (target, key, desc, meta, isClassicDecorator) {
+export function action(
+  target: ElementDescriptor[0],
+  key: ElementDescriptor[1],
+  desc: ElementDescriptor[2]
+): PropertyDescriptor;
+export function action(desc: PropertyDescriptor): ExtendedMethodDecorator;
+export function action(
+  ...args: ElementDescriptor | [PropertyDescriptor]
+): PropertyDescriptor | ExtendedMethodDecorator {
+  let actionFn: object | Function;
+
+  if (!isElementDescriptor(args)) {
+    actionFn = args[0];
+
+    let decorator: ExtendedMethodDecorator = function (
+      target,
+      key,
+      _desc,
+      _meta,
+      isClassicDecorator
+    ) {
       assert(
         'The @action decorator may only be passed a method when used in classic classes. You should decorate methods directly in native classes',
         isClassicDecorator
@@ -189,14 +228,18 @@ export function action(target, key, desc) {
     return decorator;
   }
 
-  actionFn = desc.value;
+  let [target, key, desc] = args;
+
+  actionFn = desc?.value;
 
   assert(
     'The @action decorator must be applied to methods when used in native classes',
     typeof actionFn === 'function'
   );
 
+  // SAFETY: TS types are weird with decorators. This should work.
   return setupAction(target, key, actionFn);
 }
 
-setClassicDecorator(action);
+// SAFETY: TS types are weird with decorators. This should work.
+setClassicDecorator(action as ExtendedMethodDecorator);
diff --git a/packages/@ember/object/type-tests/action.test.ts b/packages/@ember/object/type-tests/action.test.ts
index 19932a2250f..3ea07ed7596 100644
--- a/packages/@ember/object/type-tests/action.test.ts
+++ b/packages/@ember/object/type-tests/action.test.ts
@@ -1,8 +1,9 @@
 import { expectTypeOf } from 'expect-type';
 
 import { action } from '@ember/object';
+import type { ExtendedMethodDecorator } from '@ember/-internals/metal/lib/decorator';
 
-expectTypeOf(action).toEqualTypeOf<MethodDecorator>();
+expectTypeOf(action).toMatchTypeOf<ExtendedMethodDecorator>();
 
 class Foo {
   // @ts-expect-error action is a method decorator

From 88a1dcdcc97a458e824591711855bfc5c07beee8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 9 May 2022 15:08:50 -0700
Subject: [PATCH 1004/1405] Change more internal files to .ts

---
 .../object/{promise-proxy-mixin.js => promise-proxy-mixin.ts}   | 0
 packages/@ember/object/{proxy.js => proxy.ts}                   | 0
 .../@ember/routing/{history-location.js => history-location.ts} | 0
 packages/@ember/template-compilation/{index.js => index.ts}     | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename packages/@ember/object/{promise-proxy-mixin.js => promise-proxy-mixin.ts} (100%)
 rename packages/@ember/object/{proxy.js => proxy.ts} (100%)
 rename packages/@ember/routing/{history-location.js => history-location.ts} (100%)
 rename packages/@ember/template-compilation/{index.js => index.ts} (85%)

diff --git a/packages/@ember/object/promise-proxy-mixin.js b/packages/@ember/object/promise-proxy-mixin.ts
similarity index 100%
rename from packages/@ember/object/promise-proxy-mixin.js
rename to packages/@ember/object/promise-proxy-mixin.ts
diff --git a/packages/@ember/object/proxy.js b/packages/@ember/object/proxy.ts
similarity index 100%
rename from packages/@ember/object/proxy.js
rename to packages/@ember/object/proxy.ts
diff --git a/packages/@ember/routing/history-location.js b/packages/@ember/routing/history-location.ts
similarity index 100%
rename from packages/@ember/routing/history-location.js
rename to packages/@ember/routing/history-location.ts
diff --git a/packages/@ember/template-compilation/index.js b/packages/@ember/template-compilation/index.ts
similarity index 85%
rename from packages/@ember/template-compilation/index.js
rename to packages/@ember/template-compilation/index.ts
index 9fdd95c01b3..05536649991 100644
--- a/packages/@ember/template-compilation/index.js
+++ b/packages/@ember/template-compilation/index.ts
@@ -2,7 +2,7 @@ import { DEBUG } from '@glimmer/env';
 
 export { compile as compileTemplate } from 'ember-template-compiler';
 
-export let precompileTemplate;
+export let precompileTemplate: (() => never) | undefined;
 
 if (DEBUG) {
   precompileTemplate = () => {

From ad85de426bcaf75dd2cd61f6750af8f65d2f2cd8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 12 May 2022 12:23:28 -0700
Subject: [PATCH 1005/1405] Convert ember-testing to TS

---
 .../@ember/-internals/error-handling/index.ts |  4 +-
 .../@ember/application/lib/application.ts     | 12 +++-
 packages/@ember/application/lib/lazy_load.ts  |  2 +-
 packages/@ember/debug/index.ts                |  2 +-
 packages/@ember/engine/index.ts               |  3 +-
 packages/ember-testing/{index.js => index.ts} |  0
 .../lib/adapters/{adapter.js => adapter.ts}   | 11 +++-
 .../lib/adapters/{qunit.js => qunit.ts}       | 23 ++++++--
 .../ext/{application.js => application.ts}    | 49 +++++++++++-----
 packages/ember-testing/lib/ext/rsvp.js        | 19 -------
 packages/ember-testing/lib/ext/rsvp.ts        | 22 ++++++++
 .../lib/{helpers.js => helpers.ts}            |  0
 .../ember-testing/lib/helpers/and_then.js     |  3 -
 .../ember-testing/lib/helpers/and_then.ts     |  8 +++
 .../{current_path.js => current_path.ts}      | 12 +++-
 ...nt_route_name.js => current_route_name.ts} | 12 +++-
 .../ember-testing/lib/helpers/current_url.js  | 27 ---------
 .../ember-testing/lib/helpers/current_url.ts  | 37 ++++++++++++
 .../helpers/{pause_test.js => pause_test.ts}  |  2 +-
 packages/ember-testing/lib/helpers/visit.js   | 42 --------------
 packages/ember-testing/lib/helpers/visit.ts   | 56 +++++++++++++++++++
 .../lib/helpers/{wait.js => wait.ts}          | 10 +++-
 packages/ember-testing/lib/initializers.js    | 17 ------
 packages/ember-testing/lib/initializers.ts    | 19 +++++++
 ...up_for_testing.js => setup_for_testing.ts} |  6 +-
 .../ember-testing/lib/{test.js => test.ts}    |  0
 .../lib/test/{adapter.js => adapter.ts}       |  8 ++-
 .../lib/test/{helpers.js => helpers.ts}       | 19 +++++--
 ...inject_helpers.js => on_inject_helpers.ts} | 12 ++--
 ...ending_requests.js => pending_requests.ts} |  6 +-
 .../lib/test/{promise.js => promise.ts}       | 37 +++++++-----
 .../ember-testing/lib/test/{run.js => run.ts} |  2 +-
 .../lib/test/{waiters.js => waiters.ts}       | 36 ++++++++----
 33 files changed, 336 insertions(+), 182 deletions(-)
 rename packages/ember-testing/{index.js => index.ts} (100%)
 rename packages/ember-testing/lib/adapters/{adapter.js => adapter.ts} (83%)
 rename packages/ember-testing/lib/adapters/{qunit.js => qunit.ts} (70%)
 rename packages/ember-testing/lib/ext/{application.js => application.ts} (73%)
 delete mode 100644 packages/ember-testing/lib/ext/rsvp.js
 create mode 100644 packages/ember-testing/lib/ext/rsvp.ts
 rename packages/ember-testing/lib/{helpers.js => helpers.ts} (100%)
 delete mode 100644 packages/ember-testing/lib/helpers/and_then.js
 create mode 100644 packages/ember-testing/lib/helpers/and_then.ts
 rename packages/ember-testing/lib/helpers/{current_path.js => current_path.ts} (55%)
 rename packages/ember-testing/lib/helpers/{current_route_name.js => current_route_name.ts} (57%)
 delete mode 100644 packages/ember-testing/lib/helpers/current_url.js
 create mode 100644 packages/ember-testing/lib/helpers/current_url.ts
 rename packages/ember-testing/lib/helpers/{pause_test.js => pause_test.ts} (95%)
 delete mode 100644 packages/ember-testing/lib/helpers/visit.js
 create mode 100644 packages/ember-testing/lib/helpers/visit.ts
 rename packages/ember-testing/lib/helpers/{wait.js => wait.ts} (83%)
 delete mode 100644 packages/ember-testing/lib/initializers.js
 create mode 100644 packages/ember-testing/lib/initializers.ts
 rename packages/ember-testing/lib/{setup_for_testing.js => setup_for_testing.ts} (79%)
 rename packages/ember-testing/lib/{test.js => test.ts} (100%)
 rename packages/ember-testing/lib/test/{adapter.js => adapter.ts} (73%)
 rename packages/ember-testing/lib/test/{helpers.js => helpers.ts} (82%)
 rename packages/ember-testing/lib/test/{on_inject_helpers.js => on_inject_helpers.ts} (65%)
 rename packages/ember-testing/lib/test/{pending_requests.js => pending_requests.ts} (66%)
 rename packages/ember-testing/lib/test/{promise.js => promise.ts} (59%)
 rename packages/ember-testing/lib/test/{run.js => run.ts} (76%)
 rename packages/ember-testing/lib/test/{waiters.js => waiters.ts} (71%)

diff --git a/packages/@ember/-internals/error-handling/index.ts b/packages/@ember/-internals/error-handling/index.ts
index 6235842fcd0..405322b7b96 100644
--- a/packages/@ember/-internals/error-handling/index.ts
+++ b/packages/@ember/-internals/error-handling/index.ts
@@ -14,12 +14,12 @@ export function setOnerror(handler: Function) {
   onerror = handler;
 }
 
-let dispatchOverride: Function | undefined;
+let dispatchOverride: Function | null = null;
 
 // allows testing adapter to override dispatch
 export function getDispatchOverride() {
   return dispatchOverride;
 }
-export function setDispatchOverride(handler: Function) {
+export function setDispatchOverride(handler: Function | null) {
   dispatchOverride = handler;
 }
diff --git a/packages/@ember/application/lib/application.ts b/packages/@ember/application/lib/application.ts
index 87de87ba743..8a332f6ffa7 100644
--- a/packages/@ember/application/lib/application.ts
+++ b/packages/@ember/application/lib/application.ts
@@ -23,7 +23,7 @@ import {
 } from '@ember/-internals/routing';
 import type { BootOptions } from '../instance';
 import ApplicationInstance from '../instance';
-import Engine from '@ember/engine';
+import Engine, { buildInitializerMethod } from '@ember/engine';
 import type { Container, Registry } from '@ember/-internals/container';
 import { privatize as P } from '@ember/-internals/container';
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
@@ -220,6 +220,16 @@ class Application extends Engine {
     return registry;
   }
 
+  static initializer = buildInitializerMethod<'initializers', Application>(
+    'initializers',
+    'initializer'
+  );
+
+  static instanceInitializer = buildInitializerMethod<'instanceInitializers', ApplicationInstance>(
+    'instanceInitializers',
+    'instance initializer'
+  );
+
   /**
     The root DOM element of the Application. This can be specified as an
     element or a [selector string](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors#reference_table_of_selectors).
diff --git a/packages/@ember/application/lib/lazy_load.ts b/packages/@ember/application/lib/lazy_load.ts
index cf733e702a8..123e971ba2b 100644
--- a/packages/@ember/application/lib/lazy_load.ts
+++ b/packages/@ember/application/lib/lazy_load.ts
@@ -33,7 +33,7 @@ export let _loaded = loaded;
   @param callback {Function} callback to be called
   @private
 */
-export function onLoad(name: string, callback: (obj: unknown) => void) {
+export function onLoad(name: string, callback: (obj: any) => void) {
   let object = loaded[name];
 
   let hooks = (loadHooks[name] ??= []);
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 168c0408d3a..c458b3e4be2 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -30,7 +30,7 @@ export type AssertFunc = (desc: string, condition?: unknown) => asserts conditio
 export type DebugFunc = (message: string) => void;
 export type DebugSealFunc = (obj: object) => void;
 export type DebugFreezeFunc = (obj: object) => void;
-export type InfoFunc = (message: string, options: object) => void;
+export type InfoFunc = (message: string, options?: object) => void;
 export type RunInDebugFunc = (func: () => void) => void;
 export type DeprecateFuncFunc = (
   message: string,
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index f27f649bf72..4c33154b453 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -467,7 +467,8 @@ function resolverFor(namespace: Engine) {
   return ResolverClass.create(props);
 }
 
-function buildInitializerMethod<
+/** @internal */
+export function buildInitializerMethod<
   B extends 'initializers' | 'instanceInitializers',
   T extends B extends 'initializers' ? Engine : EngineInstance
 >(bucketName: B, humanName: string) {
diff --git a/packages/ember-testing/index.js b/packages/ember-testing/index.ts
similarity index 100%
rename from packages/ember-testing/index.js
rename to packages/ember-testing/index.ts
diff --git a/packages/ember-testing/lib/adapters/adapter.js b/packages/ember-testing/lib/adapters/adapter.ts
similarity index 83%
rename from packages/ember-testing/lib/adapters/adapter.js
rename to packages/ember-testing/lib/adapters/adapter.ts
index 5fde61882b1..cba6d525a6e 100644
--- a/packages/ember-testing/lib/adapters/adapter.js
+++ b/packages/ember-testing/lib/adapters/adapter.ts
@@ -11,7 +11,12 @@ import { Object as EmberObject } from '@ember/-internals/runtime';
   @class TestAdapter
   @public
 */
-export default EmberObject.extend({
+interface Adapter extends EmberObject {
+  asyncStart(): void;
+  asyncEnd(): void;
+  exception(error: unknown): never;
+}
+const Adapter = EmberObject.extend({
   /**
     This callback will be called whenever an async operation is about to start.
 
@@ -48,7 +53,9 @@ export default EmberObject.extend({
     @method exception
     @param {String} error The exception to be raised.
   */
-  exception(error) {
+  exception(error: unknown) {
     throw error;
   },
 });
+
+export default Adapter;
diff --git a/packages/ember-testing/lib/adapters/qunit.js b/packages/ember-testing/lib/adapters/qunit.ts
similarity index 70%
rename from packages/ember-testing/lib/adapters/qunit.js
rename to packages/ember-testing/lib/adapters/qunit.ts
index eed764ceeb2..36b61f99da1 100644
--- a/packages/ember-testing/lib/adapters/qunit.js
+++ b/packages/ember-testing/lib/adapters/qunit.ts
@@ -2,6 +2,15 @@
 
 import { inspect } from '@ember/-internals/utils';
 import Adapter from './adapter';
+
+interface VeryOldQunit {
+  stop(): void;
+}
+
+function isVeryOldQunit(obj: unknown): obj is VeryOldQunit {
+  return obj != null && typeof (obj as VeryOldQunit).stop === 'function';
+}
+
 /**
    @module ember
 */
@@ -14,13 +23,15 @@ import Adapter from './adapter';
   @extends TestAdapter
   @public
 */
-export default Adapter.extend({
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface QUnitAdapter extends Adapter {}
+const QUnitAdapter = Adapter.extend({
   init() {
     this.doneCallbacks = [];
   },
 
   asyncStart() {
-    if (typeof QUnit.stop === 'function') {
+    if (isVeryOldQunit(QUnit)) {
       // very old QUnit version
       // eslint-disable-next-line qunit/no-qunit-stop
       QUnit.stop();
@@ -28,11 +39,12 @@ export default Adapter.extend({
       this.doneCallbacks.push(QUnit.config.current ? QUnit.config.current.assert.async() : null);
     }
   },
+
   asyncEnd() {
     // checking for QUnit.stop here (even though we _need_ QUnit.start) because
     // QUnit.start() still exists in QUnit 2.x (it just throws an error when calling
     // inside a test context)
-    if (typeof QUnit.stop === 'function') {
+    if (isVeryOldQunit(QUnit)) {
       QUnit.start();
     } else {
       let done = this.doneCallbacks.pop();
@@ -42,7 +54,10 @@ export default Adapter.extend({
       }
     }
   },
-  exception(error) {
+
+  exception(error: unknown) {
     QUnit.config.current.assert.ok(false, inspect(error));
   },
 });
+
+export default QUnitAdapter;
diff --git a/packages/ember-testing/lib/ext/application.js b/packages/ember-testing/lib/ext/application.ts
similarity index 73%
rename from packages/ember-testing/lib/ext/application.js
rename to packages/ember-testing/lib/ext/application.ts
index aaefc303179..11e497ea548 100644
--- a/packages/ember-testing/lib/ext/application.js
+++ b/packages/ember-testing/lib/ext/application.ts
@@ -5,6 +5,19 @@ import TestPromise, { resolve, getLastPromise } from '../test/promise';
 import run from '../test/run';
 import { invokeInjectHelpersCallbacks } from '../test/on_inject_helpers';
 import { asyncStart, asyncEnd } from '../test/adapter';
+import type Application from '@ember/application';
+import type { AnyFn } from '@ember/-internals/utils/types';
+import { assert } from '@ember/debug';
+
+export interface TestableApp extends Application {
+  testing?: boolean;
+  testHelpers: Record<string, (...args: unknown[]) => unknown>;
+  originalMethods: Record<string, (...args: unknown[]) => unknown>;
+  setupForTesting(): void;
+  helperContainer: object | null;
+  injectTestHelpers(helperContainer: unknown): void;
+  removeTestHelpers(): void;
+}
 
 EmberApplication.reopen({
   /**
@@ -105,7 +118,7 @@ EmberApplication.reopen({
     @method injectTestHelpers
     @public
   */
-  injectTestHelpers(helperContainer) {
+  injectTestHelpers(this: TestableApp, helperContainer: object) {
     if (helperContainer) {
       this.helperContainer = helperContainer;
     } else {
@@ -113,7 +126,7 @@ EmberApplication.reopen({
     }
 
     this.reopen({
-      willDestroy() {
+      willDestroy(this: TestableApp) {
         this._super(...arguments);
         this.removeTestHelpers();
       },
@@ -121,9 +134,12 @@ EmberApplication.reopen({
 
     this.testHelpers = {};
     for (let name in helpers) {
-      this.originalMethods[name] = this.helperContainer[name];
-      this.testHelpers[name] = this.helperContainer[name] = helper(this, name);
-      protoWrap(TestPromise.prototype, name, helper(this, name), helpers[name].meta.wait);
+      // SAFETY: It is safe to access a property on an object
+      this.originalMethods[name] = (this.helperContainer as any)[name];
+      // SAFETY: It is not quite as safe to do this, but it _seems_ to be ok.
+      this.testHelpers[name] = (this.helperContainer as any)[name] = helper(this, name);
+      // SAFETY: We checked that it exists
+      protoWrap(TestPromise.prototype, name, helper(this, name), helpers[name]!.meta.wait);
     }
 
     invokeInjectHelpersCallbacks(this);
@@ -149,7 +165,8 @@ EmberApplication.reopen({
 
     for (let name in helpers) {
       this.helperContainer[name] = this.originalMethods[name];
-      delete TestPromise.prototype[name];
+      // SAFETY: This is a weird thing, but it's not technically unsafe here.
+      delete (TestPromise.prototype as any)[name];
       delete this.testHelpers[name];
       delete this.originalMethods[name];
     }
@@ -159,26 +176,30 @@ EmberApplication.reopen({
 // This method is no longer needed
 // But still here for backwards compatibility
 // of helper chaining
-function protoWrap(proto, name, callback, isAsync) {
-  proto[name] = function (...args) {
+function protoWrap(proto: TestPromise<unknown>, name: string, callback: AnyFn, isAsync: boolean) {
+  // SAFETY: This isn't entirely safe, but it _seems_ to be ok.
+  (proto as any)[name] = function (...args: unknown[]) {
     if (isAsync) {
       return callback.apply(this, args);
     } else {
-      return this.then(function () {
+      // SAFETY: This is not actually safe.
+      return (this as any).then(function (this: any) {
         return callback.apply(this, args);
       });
     }
   };
 }
 
-function helper(app, name) {
-  let fn = helpers[name].method;
-  let meta = helpers[name].meta;
+function helper(app: TestableApp, name: string) {
+  let helper = helpers[name];
+  assert(`[BUG] Missing helper: ${name}`, helper);
+  let fn = helper.method;
+  let meta = helper.meta;
   if (!meta.wait) {
-    return (...args) => fn.apply(app, [app, ...args]);
+    return (...args: unknown[]) => fn.apply(app, [app, ...args]);
   }
 
-  return (...args) => {
+  return (...args: unknown[]) => {
     let lastPromise = run(() => resolve(getLastPromise()));
 
     // wait for last helper's promise to resolve and then
diff --git a/packages/ember-testing/lib/ext/rsvp.js b/packages/ember-testing/lib/ext/rsvp.js
deleted file mode 100644
index 814a40a5f0f..00000000000
--- a/packages/ember-testing/lib/ext/rsvp.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { RSVP } from '@ember/-internals/runtime';
-import { _backburner } from '@ember/runloop';
-import { isTesting } from '@ember/debug';
-import { asyncStart, asyncEnd } from '../test/adapter';
-
-RSVP.configure('async', function (callback, promise) {
-  // if schedule will cause autorun, we need to inform adapter
-  if (isTesting() && !_backburner.currentInstance) {
-    asyncStart();
-    _backburner.schedule('actions', () => {
-      asyncEnd();
-      callback(promise);
-    });
-  } else {
-    _backburner.schedule('actions', () => callback(promise));
-  }
-});
-
-export default RSVP;
diff --git a/packages/ember-testing/lib/ext/rsvp.ts b/packages/ember-testing/lib/ext/rsvp.ts
new file mode 100644
index 00000000000..51302fefeef
--- /dev/null
+++ b/packages/ember-testing/lib/ext/rsvp.ts
@@ -0,0 +1,22 @@
+import { RSVP } from '@ember/-internals/runtime';
+import { _backburner } from '@ember/runloop';
+import { isTesting } from '@ember/debug';
+import { asyncStart, asyncEnd } from '../test/adapter';
+
+RSVP.configure(
+  'async',
+  function (callback: (promise: Promise<unknown>) => void, promise: Promise<unknown>) {
+    // if schedule will cause autorun, we need to inform adapter
+    if (isTesting() && !_backburner.currentInstance) {
+      asyncStart();
+      _backburner.schedule('actions', () => {
+        asyncEnd();
+        callback(promise);
+      });
+    } else {
+      _backburner.schedule('actions', () => callback(promise));
+    }
+  }
+);
+
+export default RSVP;
diff --git a/packages/ember-testing/lib/helpers.js b/packages/ember-testing/lib/helpers.ts
similarity index 100%
rename from packages/ember-testing/lib/helpers.js
rename to packages/ember-testing/lib/helpers.ts
diff --git a/packages/ember-testing/lib/helpers/and_then.js b/packages/ember-testing/lib/helpers/and_then.js
deleted file mode 100644
index 5e451dccb95..00000000000
--- a/packages/ember-testing/lib/helpers/and_then.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function andThen(app, callback) {
-  return app.testHelpers.wait(callback(app));
-}
diff --git a/packages/ember-testing/lib/helpers/and_then.ts b/packages/ember-testing/lib/helpers/and_then.ts
new file mode 100644
index 00000000000..ba38bca6520
--- /dev/null
+++ b/packages/ember-testing/lib/helpers/and_then.ts
@@ -0,0 +1,8 @@
+import { assert } from '@ember/debug';
+import type { TestableApp } from '../ext/application';
+
+export default function andThen(app: TestableApp, callback: (app: TestableApp) => unknown) {
+  let wait = app.testHelpers['wait'];
+  assert('[BUG] Missing wait helper', wait);
+  return wait(callback(app));
+}
diff --git a/packages/ember-testing/lib/helpers/current_path.js b/packages/ember-testing/lib/helpers/current_path.ts
similarity index 55%
rename from packages/ember-testing/lib/helpers/current_path.js
rename to packages/ember-testing/lib/helpers/current_path.ts
index a709da7639e..eb1523ab6ee 100644
--- a/packages/ember-testing/lib/helpers/current_path.js
+++ b/packages/ember-testing/lib/helpers/current_path.ts
@@ -2,6 +2,9 @@
 @module ember
 */
 import { get } from '@ember/-internals/metal';
+import { RoutingService } from '@ember/-internals/routing';
+import type Application from '@ember/application';
+import { assert } from '@ember/debug';
 
 /**
   Returns the current path.
@@ -21,7 +24,14 @@ click('#some-link-id').then(validateURL);
 @since 1.5.0
 @public
 */
-export default function currentPath(app) {
+export default function currentPath(app: Application) {
+  assert('[BUG] app.__container__ is not set', app.__container__);
+
   let routingService = app.__container__.lookup('service:-routing');
+  assert(
+    '[BUG] service:-routing is not a RoutingService',
+    routingService instanceof RoutingService
+  );
+
   return get(routingService, 'currentPath');
 }
diff --git a/packages/ember-testing/lib/helpers/current_route_name.js b/packages/ember-testing/lib/helpers/current_route_name.ts
similarity index 57%
rename from packages/ember-testing/lib/helpers/current_route_name.js
rename to packages/ember-testing/lib/helpers/current_route_name.ts
index 175c432d054..2e0ad85d0cb 100644
--- a/packages/ember-testing/lib/helpers/current_route_name.js
+++ b/packages/ember-testing/lib/helpers/current_route_name.ts
@@ -2,6 +2,9 @@
 @module ember
 */
 import { get } from '@ember/-internals/metal';
+import { RoutingService } from '@ember/-internals/routing';
+import type Application from '@ember/application';
+import { assert } from '@ember/debug';
 /**
   Returns the currently active route name.
 
@@ -19,7 +22,14 @@ visit('/some/path').then(validateRouteName)
 @since 1.5.0
 @public
 */
-export default function currentRouteName(app) {
+export default function currentRouteName(app: Application) {
+  assert('[BUG] app.__container__ is not set', app.__container__);
+
   let routingService = app.__container__.lookup('service:-routing');
+  assert(
+    '[BUG] service:-routing is not a RoutingService',
+    routingService instanceof RoutingService
+  );
+
   return get(routingService, 'currentRouteName');
 }
diff --git a/packages/ember-testing/lib/helpers/current_url.js b/packages/ember-testing/lib/helpers/current_url.js
deleted file mode 100644
index d5dd1ff5ed4..00000000000
--- a/packages/ember-testing/lib/helpers/current_url.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-@module ember
-*/
-import { get } from '@ember/-internals/metal';
-
-/**
-  Returns the current URL.
-
-Example:
-
-```javascript
-function validateURL() {
-  equal(currentURL(), '/some/path', "correct URL was transitioned into.");
-}
-
-click('#some-link-id').then(validateURL);
-```
-
-@method currentURL
-@return {Object} The currently active URL.
-@since 1.5.0
-@public
-*/
-export default function currentURL(app) {
-  let router = app.__container__.lookup('router:main');
-  return get(router, 'location').getURL();
-}
diff --git a/packages/ember-testing/lib/helpers/current_url.ts b/packages/ember-testing/lib/helpers/current_url.ts
new file mode 100644
index 00000000000..69148442667
--- /dev/null
+++ b/packages/ember-testing/lib/helpers/current_url.ts
@@ -0,0 +1,37 @@
+/**
+@module ember
+*/
+import { get } from '@ember/-internals/metal';
+import type Application from '@ember/application';
+import { assert } from '@ember/debug';
+import Router from '@ember/routing/router';
+
+/**
+  Returns the current URL.
+
+Example:
+
+```javascript
+function validateURL() {
+  equal(currentURL(), '/some/path', "correct URL was transitioned into.");
+}
+
+click('#some-link-id').then(validateURL);
+```
+
+@method currentURL
+@return {Object} The currently active URL.
+@since 1.5.0
+@public
+*/
+export default function currentURL(app: Application) {
+  assert('[BUG] app.__container__ is not set', app.__container__);
+
+  let router = app.__container__.lookup('router:main');
+  assert('[BUG] router:main is not a Router', router instanceof Router);
+
+  let location = get(router, 'location');
+  assert('[BUG] location is still a string', typeof location !== 'string');
+
+  return location.getURL();
+}
diff --git a/packages/ember-testing/lib/helpers/pause_test.js b/packages/ember-testing/lib/helpers/pause_test.ts
similarity index 95%
rename from packages/ember-testing/lib/helpers/pause_test.js
rename to packages/ember-testing/lib/helpers/pause_test.ts
index c4dd718035d..b0b2321fc35 100644
--- a/packages/ember-testing/lib/helpers/pause_test.js
+++ b/packages/ember-testing/lib/helpers/pause_test.ts
@@ -4,7 +4,7 @@
 import { RSVP } from '@ember/-internals/runtime';
 import { assert, info } from '@ember/debug';
 
-let resume;
+let resume: undefined | ((value?: unknown) => void);
 
 /**
  Resumes a test paused by `pauseTest`.
diff --git a/packages/ember-testing/lib/helpers/visit.js b/packages/ember-testing/lib/helpers/visit.js
deleted file mode 100644
index 326e61a713b..00000000000
--- a/packages/ember-testing/lib/helpers/visit.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import { run } from '@ember/runloop';
-
-/**
-  Loads a route, sets up any controllers, and renders any templates associated
-  with the route as though a real user had triggered the route change while
-  using your app.
-
-  Example:
-
-  ```javascript
-  visit('posts/index').then(function() {
-    // assert something
-  });
-  ```
-
-  @method visit
-  @param {String} url the name of the route
-  @return {RSVP.Promise<undefined>}
-  @public
-*/
-export default function visit(app, url) {
-  let router = app.__container__.lookup('router:main');
-  let shouldHandleURL = false;
-
-  app.boot().then(() => {
-    router.location.setURL(url);
-
-    if (shouldHandleURL) {
-      run(app.__deprecatedInstance__, 'handleURL', url);
-    }
-  });
-
-  if (app._readinessDeferrals > 0) {
-    router.initialURL = url;
-    run(app, 'advanceReadiness');
-    delete router.initialURL;
-  } else {
-    shouldHandleURL = true;
-  }
-
-  return app.testHelpers.wait();
-}
diff --git a/packages/ember-testing/lib/helpers/visit.ts b/packages/ember-testing/lib/helpers/visit.ts
new file mode 100644
index 00000000000..e882ab7d58b
--- /dev/null
+++ b/packages/ember-testing/lib/helpers/visit.ts
@@ -0,0 +1,56 @@
+import { assert } from '@ember/debug';
+import Router from '@ember/routing/router';
+import { run } from '@ember/runloop';
+import type { TestableApp } from '../ext/application';
+
+/**
+  Loads a route, sets up any controllers, and renders any templates associated
+  with the route as though a real user had triggered the route change while
+  using your app.
+
+  Example:
+
+  ```javascript
+  visit('posts/index').then(function() {
+    // assert something
+  });
+  ```
+
+  @method visit
+  @param {String} url the name of the route
+  @return {RSVP.Promise<undefined>}
+  @public
+*/
+export default function visit(app: TestableApp, url: string) {
+  assert('[BUG] Missing container', app.__container__);
+
+  const router = app.__container__.lookup('router:main');
+  assert('[BUG] router:main is not a Router', router instanceof Router);
+
+  let shouldHandleURL = false;
+
+  app.boot().then(() => {
+    assert('[BUG] router.location is still a string', typeof router.location !== 'string');
+    router.location.setURL(url);
+
+    if (shouldHandleURL) {
+      assert("[BUG] __deprecatedInstance__ isn't set", app.__deprecatedInstance__);
+      run(app.__deprecatedInstance__, 'handleURL', url);
+    }
+  });
+
+  if (app._readinessDeferrals > 0) {
+    // SAFETY: This should be safe, though it is odd.
+    (router as any).initialURL = url;
+    run(app, 'advanceReadiness');
+    delete (router as any).initialURL;
+  } else {
+    shouldHandleURL = true;
+  }
+
+  let wait = app.testHelpers['wait'];
+
+  assert('[BUG] missing wait helper', wait);
+
+  return wait();
+}
diff --git a/packages/ember-testing/lib/helpers/wait.js b/packages/ember-testing/lib/helpers/wait.ts
similarity index 83%
rename from packages/ember-testing/lib/helpers/wait.js
rename to packages/ember-testing/lib/helpers/wait.ts
index 232a76ab9ce..631a76bfc5f 100644
--- a/packages/ember-testing/lib/helpers/wait.js
+++ b/packages/ember-testing/lib/helpers/wait.ts
@@ -5,6 +5,9 @@ import { checkWaiters } from '../test/waiters';
 import { RSVP } from '@ember/-internals/runtime';
 import { _getCurrentRunLoop, _hasScheduledTimers, run } from '@ember/runloop';
 import { pendingRequests } from '../test/pending_requests';
+import type Application from '@ember/application';
+import { assert } from '@ember/debug';
+import Router from '@ember/routing/router';
 
 /**
   Causes the run loop to process any pending events. This is used to ensure that
@@ -36,9 +39,12 @@ import { pendingRequests } from '../test/pending_requests';
   @public
   @since 1.0.0
 */
-export default function wait(app, value) {
+export default function wait<T>(app: Application, value: T): Promise<T> {
   return new RSVP.Promise(function (resolve) {
-    let router = app.__container__.lookup('router:main');
+    assert('[BUG] Missing container', app.__container__);
+
+    const router = app.__container__.lookup('router:main');
+    assert('[BUG] Expected router:main to be a subclass of Ember Router', router instanceof Router);
 
     // Every 10ms, poll for the async thing to have finished
     let watcher = setInterval(() => {
diff --git a/packages/ember-testing/lib/initializers.js b/packages/ember-testing/lib/initializers.js
deleted file mode 100644
index 0ff1d963fb6..00000000000
--- a/packages/ember-testing/lib/initializers.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { onLoad } from '@ember/application';
-
-let name = 'deferReadiness in `testing` mode';
-
-onLoad('Ember.Application', function (Application) {
-  if (!Application.initializers[name]) {
-    Application.initializer({
-      name: name,
-
-      initialize(application) {
-        if (application.testing) {
-          application.deferReadiness();
-        }
-      },
-    });
-  }
-});
diff --git a/packages/ember-testing/lib/initializers.ts b/packages/ember-testing/lib/initializers.ts
new file mode 100644
index 00000000000..debe4fdd517
--- /dev/null
+++ b/packages/ember-testing/lib/initializers.ts
@@ -0,0 +1,19 @@
+import { onLoad } from '@ember/application';
+import type Application from '@ember/application';
+import type { TestableApp } from './ext/application';
+
+let name = 'deferReadiness in `testing` mode';
+
+onLoad('Ember.Application', function (ApplicationClass: typeof Application) {
+  if (!ApplicationClass.initializers[name]) {
+    ApplicationClass.initializer({
+      name: name,
+
+      initialize(application) {
+        if ((application as TestableApp).testing) {
+          application.deferReadiness();
+        }
+      },
+    });
+  }
+});
diff --git a/packages/ember-testing/lib/setup_for_testing.js b/packages/ember-testing/lib/setup_for_testing.ts
similarity index 79%
rename from packages/ember-testing/lib/setup_for_testing.js
rename to packages/ember-testing/lib/setup_for_testing.ts
index 91c615d5fdb..7444158c262 100644
--- a/packages/ember-testing/lib/setup_for_testing.js
+++ b/packages/ember-testing/lib/setup_for_testing.ts
@@ -23,6 +23,10 @@ export default function setupForTesting() {
   let adapter = getAdapter();
   // if adapter is not manually set default to QUnit
   if (!adapter) {
-    setAdapter(typeof self.QUnit === 'undefined' ? Adapter.create() : QUnitAdapter.create());
+    setAdapter(
+      typeof (self as any).QUnit === 'undefined'
+        ? (Adapter.create() as Adapter)
+        : (QUnitAdapter.create() as QUnitAdapter)
+    );
   }
 }
diff --git a/packages/ember-testing/lib/test.js b/packages/ember-testing/lib/test.ts
similarity index 100%
rename from packages/ember-testing/lib/test.js
rename to packages/ember-testing/lib/test.ts
diff --git a/packages/ember-testing/lib/test/adapter.js b/packages/ember-testing/lib/test/adapter.ts
similarity index 73%
rename from packages/ember-testing/lib/test/adapter.js
rename to packages/ember-testing/lib/test/adapter.ts
index bfecab54869..610d7e60cab 100644
--- a/packages/ember-testing/lib/test/adapter.js
+++ b/packages/ember-testing/lib/test/adapter.ts
@@ -1,11 +1,12 @@
 import { setDispatchOverride } from '@ember/-internals/error-handling';
+import type Adapter from '../adapters/adapter';
 
-let adapter;
+let adapter: Adapter;
 export function getAdapter() {
   return adapter;
 }
 
-export function setAdapter(value) {
+export function setAdapter(value: Adapter) {
   adapter = value;
   if (value && typeof value.exception === 'function') {
     setDispatchOverride(adapterDispatch);
@@ -26,8 +27,9 @@ export function asyncEnd() {
   }
 }
 
-function adapterDispatch(error) {
+function adapterDispatch(error: unknown) {
   adapter.exception(error);
 
+  // @ts-expect-error Normally unreachable
   console.error(error.stack); // eslint-disable-line no-console
 }
diff --git a/packages/ember-testing/lib/test/helpers.js b/packages/ember-testing/lib/test/helpers.ts
similarity index 82%
rename from packages/ember-testing/lib/test/helpers.js
rename to packages/ember-testing/lib/test/helpers.ts
index 63a3774a8c9..4d278fd0a0e 100644
--- a/packages/ember-testing/lib/test/helpers.js
+++ b/packages/ember-testing/lib/test/helpers.ts
@@ -1,6 +1,13 @@
+import type { AnyFn } from '@ember/-internals/utils/types';
 import TestPromise from './promise';
 
-export const helpers = {};
+export const helpers: Record<
+  string,
+  {
+    method: AnyFn;
+    meta: { wait: boolean };
+  }
+> = {};
 /**
  @module @ember/test
 */
@@ -42,7 +49,7 @@ export const helpers = {};
   @param {Function} helperMethod
   @param options {Object}
 */
-export function registerHelper(name, helperMethod) {
+export function registerHelper(name: string, helperMethod: AnyFn) {
   helpers[name] = {
     method: helperMethod,
     meta: { wait: false },
@@ -95,7 +102,7 @@ export function registerHelper(name, helperMethod) {
   @param {Function} helperMethod
   @since 1.2.0
 */
-export function registerAsyncHelper(name, helperMethod) {
+export function registerAsyncHelper(name: string, helperMethod: AnyFn) {
   helpers[name] = {
     method: helperMethod,
     meta: { wait: true },
@@ -119,7 +126,9 @@ export function registerAsyncHelper(name, helperMethod) {
   @for @ember/test
   @param {String} name The helper to remove.
 */
-export function unregisterHelper(name) {
+export function unregisterHelper(name: string) {
   delete helpers[name];
-  delete TestPromise.prototype[name];
+  // SAFETY: This isn't necessarily a safe thing to do, but in terms of the immediate types here
+  // it won't error.
+  delete (TestPromise.prototype as any)[name];
 }
diff --git a/packages/ember-testing/lib/test/on_inject_helpers.js b/packages/ember-testing/lib/test/on_inject_helpers.ts
similarity index 65%
rename from packages/ember-testing/lib/test/on_inject_helpers.js
rename to packages/ember-testing/lib/test/on_inject_helpers.ts
index d4679f13855..b6f1c54122e 100644
--- a/packages/ember-testing/lib/test/on_inject_helpers.js
+++ b/packages/ember-testing/lib/test/on_inject_helpers.ts
@@ -1,4 +1,6 @@
-export const callbacks = [];
+import type Application from '@ember/application';
+
+export const callbacks: Array<(app: Application) => void> = [];
 
 /**
   Used to register callbacks to be fired whenever `App.injectTestHelpers`
@@ -27,12 +29,12 @@ export const callbacks = [];
   @method onInjectHelpers
   @param {Function} callback The function to be called.
 */
-export function onInjectHelpers(callback) {
+export function onInjectHelpers(callback: (app: Application) => void) {
   callbacks.push(callback);
 }
 
-export function invokeInjectHelpersCallbacks(app) {
-  for (let i = 0; i < callbacks.length; i++) {
-    callbacks[i](app);
+export function invokeInjectHelpersCallbacks(app: Application) {
+  for (let callback of callbacks) {
+    callback(app);
   }
 }
diff --git a/packages/ember-testing/lib/test/pending_requests.js b/packages/ember-testing/lib/test/pending_requests.ts
similarity index 66%
rename from packages/ember-testing/lib/test/pending_requests.js
rename to packages/ember-testing/lib/test/pending_requests.ts
index 7ebb01b7894..bd8bfbc0b31 100644
--- a/packages/ember-testing/lib/test/pending_requests.js
+++ b/packages/ember-testing/lib/test/pending_requests.ts
@@ -1,4 +1,4 @@
-let requests = [];
+let requests: unknown[] = [];
 
 export function pendingRequests() {
   return requests.length;
@@ -8,11 +8,11 @@ export function clearPendingRequests() {
   requests.length = 0;
 }
 
-export function incrementPendingRequests(_, xhr) {
+export function incrementPendingRequests(_: unknown, xhr: unknown) {
   requests.push(xhr);
 }
 
-export function decrementPendingRequests(_, xhr) {
+export function decrementPendingRequests(_: unknown, xhr: unknown) {
   setTimeout(function () {
     for (let i = 0; i < requests.length; i++) {
       if (xhr === requests[i]) {
diff --git a/packages/ember-testing/lib/test/promise.js b/packages/ember-testing/lib/test/promise.ts
similarity index 59%
rename from packages/ember-testing/lib/test/promise.js
rename to packages/ember-testing/lib/test/promise.ts
index 5ab18027d65..ccd095e98b7 100644
--- a/packages/ember-testing/lib/test/promise.js
+++ b/packages/ember-testing/lib/test/promise.ts
@@ -1,20 +1,31 @@
 import { RSVP } from '@ember/-internals/runtime';
 import run from './run';
 
-let lastPromise;
+let lastPromise: TestPromise<unknown> | null = null;
 
-export default class TestPromise extends RSVP.Promise {
-  constructor() {
-    super(...arguments);
+type Executor<T> = (
+  resolve: (value?: T | PromiseLike<T>) => void,
+  reject: (reason?: any) => void
+) => void;
+
+type OnFulfilled<T, TResult = T> = (value: T) => TResult | PromiseLike<TResult>;
+
+export default class TestPromise<T> extends RSVP.Promise<T> {
+  constructor(executor: Executor<T>, label?: string) {
+    super(executor, label);
     lastPromise = this;
   }
 
-  then(_onFulfillment, ...args) {
-    let onFulfillment =
-      typeof _onFulfillment === 'function'
-        ? (result) => isolate(_onFulfillment, result)
+  then<TResult1 = T, TResult2 = never>(
+    onFulfilled?: OnFulfilled<T, TResult1> | null,
+    onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null,
+    label?: string
+  ): RSVP.Promise<TResult1 | TResult2> {
+    let normalizedOnFulfilled =
+      typeof onFulfilled === 'function'
+        ? (result: T) => isolate<T, TResult1>(onFulfilled, result)
         : undefined;
-    return super.then(onFulfillment, ...args);
+    return super.then<TResult1, TResult2>(normalizedOnFulfilled, onRejected, label);
   }
 }
 
@@ -31,7 +42,7 @@ export default class TestPromise extends RSVP.Promise {
   @param {Function} resolver The function used to resolve the promise.
   @param {String} label An optional string for identifying the promise.
 */
-export function promise(resolver, label) {
+export function promise<T>(resolver: Executor<T>, label: string) {
   let fullLabel = `Ember.Test.promise: ${label || '<Unknown Promise>'}`;
   return new TestPromise(resolver, fullLabel);
 }
@@ -47,7 +58,7 @@ export function promise(resolver, label) {
   @param {Mixed} The value to resolve
   @since 1.2.0
 */
-export function resolve(result, label) {
+export function resolve(result: unknown, label?: string) {
   return TestPromise.resolve(result, label);
 }
 
@@ -61,11 +72,11 @@ export function getLastPromise() {
 // 1. Set `Ember.Test.lastPromise` to null
 // 2. Invoke method
 // 3. Return the last promise created during method
-function isolate(onFulfillment, result) {
+function isolate<T, TResult = T>(onFulfilled: OnFulfilled<T, TResult>, result: T) {
   // Reset lastPromise for nested helpers
   lastPromise = null;
 
-  let value = onFulfillment(result);
+  let value = onFulfilled(result);
 
   let promise = lastPromise;
   lastPromise = null;
diff --git a/packages/ember-testing/lib/test/run.js b/packages/ember-testing/lib/test/run.ts
similarity index 76%
rename from packages/ember-testing/lib/test/run.js
rename to packages/ember-testing/lib/test/run.ts
index d8bcd0592f4..c9ce6a5603d 100644
--- a/packages/ember-testing/lib/test/run.js
+++ b/packages/ember-testing/lib/test/run.ts
@@ -1,6 +1,6 @@
 import { _getCurrentRunLoop, run as emberRun } from '@ember/runloop';
 
-export default function run(fn) {
+export default function run<T>(fn: () => T): T {
   if (!_getCurrentRunLoop()) {
     return emberRun(fn);
   } else {
diff --git a/packages/ember-testing/lib/test/waiters.js b/packages/ember-testing/lib/test/waiters.ts
similarity index 71%
rename from packages/ember-testing/lib/test/waiters.js
rename to packages/ember-testing/lib/test/waiters.ts
index 12f891a1122..5b53310d976 100644
--- a/packages/ember-testing/lib/test/waiters.js
+++ b/packages/ember-testing/lib/test/waiters.ts
@@ -1,8 +1,8 @@
 /**
  @module @ember/test
 */
-const contexts = [];
-const callbacks = [];
+const contexts: unknown[] = [];
+const callbacks: Array<() => unknown> = [];
 
 /**
    This allows ember-testing to play nicely with other asynchronous
@@ -40,16 +40,27 @@ const callbacks = [];
    @param {Function} callback
    @since 1.2.0
 */
-export function registerWaiter(context, callback) {
-  if (arguments.length === 1) {
-    callback = context;
-    context = null;
+export function registerWaiter<T>(context: T, callback: (this: T) => unknown): void;
+export function registerWaiter(callback: (this: null) => unknown): void;
+export function registerWaiter<T>(
+  ...args: [context: T, callback: (this: T) => unknown] | [callback: (this: null) => unknown]
+): void {
+  let checkedCallback: () => unknown;
+  let checkedContext: T | null;
+
+  if (args.length === 1) {
+    checkedContext = null;
+    checkedCallback = args[0];
+  } else {
+    checkedContext = args[0];
+    checkedCallback = args[1];
   }
-  if (indexOf(context, callback) > -1) {
+
+  if (indexOf(checkedContext, checkedCallback) > -1) {
     return;
   }
-  contexts.push(context);
-  callbacks.push(callback);
+  contexts.push(checkedContext);
+  callbacks.push(checkedCallback);
 }
 
 /**
@@ -64,7 +75,7 @@ export function registerWaiter(context, callback) {
    @param {Function} callback
    @since 1.2.0
 */
-export function unregisterWaiter(context, callback) {
+export function unregisterWaiter(context: unknown, callback: unknown) {
   if (!callbacks.length) {
     return;
   }
@@ -100,14 +111,15 @@ export function checkWaiters() {
   for (let i = 0; i < callbacks.length; i++) {
     let context = contexts[i];
     let callback = callbacks[i];
-    if (!callback.call(context)) {
+    // SAFETY: The loop ensures that this exists
+    if (!callback!.call(context)) {
       return true;
     }
   }
   return false;
 }
 
-function indexOf(context, callback) {
+function indexOf(context: unknown, callback: unknown) {
   for (let i = 0; i < callbacks.length; i++) {
     if (callbacks[i] === callback && contexts[i] === context) {
       return i;

From 09a73ada1e5140ea0f0179dcbe6245255c336674 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 12 May 2022 14:51:31 -0700
Subject: [PATCH 1006/1405] Convert @ember/test to TS

---
 packages/@ember/test/adapter.js             |  3 ---
 packages/@ember/test/adapter.ts             |  3 +++
 packages/@ember/test/{index.js => index.ts} | 11 ++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 packages/@ember/test/adapter.js
 create mode 100644 packages/@ember/test/adapter.ts
 rename packages/@ember/test/{index.js => index.ts} (62%)

diff --git a/packages/@ember/test/adapter.js b/packages/@ember/test/adapter.js
deleted file mode 100644
index e0f19949e64..00000000000
--- a/packages/@ember/test/adapter.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Test } from 'ember-testing';
-
-export default Test.Adapter;
diff --git a/packages/@ember/test/adapter.ts b/packages/@ember/test/adapter.ts
new file mode 100644
index 00000000000..1832534f0d7
--- /dev/null
+++ b/packages/@ember/test/adapter.ts
@@ -0,0 +1,3 @@
+import { Adapter } from 'ember-testing';
+
+export default Adapter;
diff --git a/packages/@ember/test/index.js b/packages/@ember/test/index.ts
similarity index 62%
rename from packages/@ember/test/index.js
rename to packages/@ember/test/index.ts
index 3f226dbcac6..2cf30f846ce 100644
--- a/packages/@ember/test/index.js
+++ b/packages/@ember/test/index.ts
@@ -1,10 +1,11 @@
 import require, { has } from 'require';
+import { type Test } from 'ember-testing';
 
-export let registerAsyncHelper;
-export let registerHelper;
-export let registerWaiter;
-export let unregisterHelper;
-export let unregisterWaiter;
+export let registerAsyncHelper: typeof Test['registerAsyncHelper'] | (() => never);
+export let registerHelper: typeof Test['registerHelper'] | (() => never);
+export let registerWaiter: typeof Test['registerWaiter'] | (() => never);
+export let unregisterHelper: typeof Test['unregisterHelper'] | (() => never);
+export let unregisterWaiter: typeof Test['unregisterWaiter'] | (() => never);
 
 if (has('ember-testing')) {
   let { Test } = require('ember-testing');

From a5027fefdcc433eb2ebd50d42fd6b9b5e89d7d01 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 16 May 2022 16:22:21 -0600
Subject: [PATCH 1007/1405] Add updated SAFETY comment to `spaceship` body

---
 packages/@ember/-internals/runtime/lib/compare.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/-internals/runtime/lib/compare.ts
index 31e0a74781f..9f5b6d53841 100644
--- a/packages/@ember/-internals/runtime/lib/compare.ts
+++ b/packages/@ember/-internals/runtime/lib/compare.ts
@@ -36,6 +36,9 @@ type Compare = -1 | 0 | 1;
 //                                `._________`-.   `.   `.___
 //                                              SSt  `------'`
 function spaceship(a: number, b: number): Compare {
+  // SAFETY: `Math.sign` always returns `-1` for negative, `0` for zero, and `1`
+  // for positive numbers. (The extra precision is useful for the way we use
+  // this in the context of `compare`.)
   return Math.sign(a - b) as Compare;
 }
 

From a915bd7d72de9c5c48ad4872bfbf20cc8fb00cee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 May 2022 03:10:53 +0000
Subject: [PATCH 1008/1405] Bump semver from 7.3.5 to 7.3.7

Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.3.7.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.5...v7.3.7)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 60b0f0fa629..2cef4a36e12 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.13.2",
     "resolve": "^1.22.0",
-    "semver": "^7.3.4",
+    "semver": "^7.3.7",
     "silent-error": "^1.1.1"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 87aba1884e6..b91e8473ea2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8923,10 +8923,10 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 

From 6c660391f238111600d20250440584ac01b92dda Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 19 May 2022 12:03:53 +0200
Subject: [PATCH 1009/1405] [DOC] Document that `history` is the default
 `locationType` value

---
 packages/@ember/-internals/routing/lib/system/router.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index d3abd115ab1..f6ebc554c2a 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -166,7 +166,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     * `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)
     * `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`
 
-    This value is defaulted to `auto` by the `locationType` setting of `/config/environment.js`
+    This value is defaulted to `history` by the `locationType` setting of `/config/environment.js`
 
     @property location
     @default 'hash'

From a8d37de0eefeb85c09a6c45f6a903f71b0c8e92e Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 31 May 2022 08:52:45 -0600
Subject: [PATCH 1010/1405] Add v4.4.1 to CHANGELOG

(cherry picked from commit 833db9efacaa60c8a28ebd6de57f4c2f86102889)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fa4497f963..09404d88d5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.4.1 (May 31, 2022)
+
+- [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprints publication
+
 ### v4.5.0-beta.1 (May 2, 2022)
 
 - [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).

From 75cd214c1165ad9c7bec274031eecb6404658225 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 6 Jun 2022 17:54:35 -0400
Subject: [PATCH 1011/1405] Add v4.5.0-beta.2 to CHANGELOG

(cherry picked from commit 4443f5e554bf6353b7f4a2cda4a842bd47fd75ad)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09404d88d5f..a322c5fa77b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.5.0-beta.2 (June 6, 2022)
+
+- [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprint generation
+
 ### v4.4.1 (May 31, 2022)
 
 - [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprints publication

From 62a97d5482f05a8ddc8d16da7e084a70ef4170d9 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sat, 11 Jun 2022 11:12:03 +0200
Subject: [PATCH 1012/1405] [BUGFIX release] Fix generated import paths for
 test setup functions in addons

---
 .../tests/acceptance/__name__-test.js         |  2 +-
 .../tests/acceptance/__name__-test.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  4 +-
 .../__testType__/__path__/__test__.js         |  4 +-
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__collection__/__name__-test.js           |  2 +-
 .../__collection__/__name__-test.js           |  2 +-
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  2 +-
 .../__testType__/__path__/__test__.js         |  2 +-
 blueprints/-utils.js                          |  9 ++
 blueprints/acceptance-test/index.js           |  4 +-
 .../tests/acceptance/__name__-test.ts         |  2 +-
 .../tests/acceptance/__name__-test.ts         |  2 +-
 blueprints/component-test/index.js            |  2 +
 .../__testType__/__path__/__test__.ts         |  4 +-
 .../__testType__/__path__/__test__.ts         |  4 +-
 blueprints/controller-test/index.js           |  2 +
 .../__testType__/__path__/__test__.ts         |  2 +-
 .../__testType__/__path__/__test__.ts         |  2 +-
 blueprints/helper-test/index.js               |  5 +-
 .../__collection__/__name__-test.ts           |  2 +-
 .../__collection__/__name__-test.ts           |  2 +-
 blueprints/route-test/index.js                |  2 +
 .../__testType__/__path__/__test__.ts         |  2 +-
 .../__testType__/__path__/__test__.ts         |  2 +-
 blueprints/service-test/index.js              |  2 +
 .../__testType__/__path__/__test__.ts         |  2 +-
 .../__testType__/__path__/__test__.ts         |  2 +-
 node-tests/blueprints/acceptance-test-test.js | 18 ++++
 node-tests/blueprints/component-test-test.js  | 99 ++++++++++++++-----
 node-tests/blueprints/controller-test-test.js | 67 +++++++++----
 node-tests/blueprints/helper-test-test.js     | 44 +++++++--
 node-tests/blueprints/route-test-test.js      | 53 +++++++---
 node-tests/blueprints/service-test-test.js    | 28 ++++++
 .../acceptance-test/mocha-rfc268-addon.js     | 13 +++
 .../acceptance-test/qunit-rfc268-addon.js     |  2 +-
 .../component-test/mocha-rfc232-addon.js      | 27 +++++
 .../component-test/mocha-rfc232-unit-addon.js | 12 +++
 .../fixtures/component-test/rfc232-addon.js   | 26 +++++
 .../component-test/rfc232-unit-addon.js       | 11 +++
 .../controller-test/mocha-rfc232-addon.js     | 13 +++
 .../fixtures/controller-test/rfc232-addon.js  | 12 +++
 .../helper-test/mocha-rfc232-addon.js         | 18 ++++
 .../fixtures/helper-test/rfc232-addon.js      | 17 ++++
 .../fixtures/route-test/mocha-rfc232-addon.js | 12 +++
 .../fixtures/route-test/rfc232-addon.js       | 11 +++
 .../service-test/mocha-rfc232-addon.js        | 13 +++
 .../fixtures/service-test/rfc232-addon.js     | 12 +++
 51 files changed, 496 insertions(+), 94 deletions(-)
 create mode 100644 blueprints/-utils.js
 create mode 100644 node-tests/fixtures/acceptance-test/mocha-rfc268-addon.js
 create mode 100644 node-tests/fixtures/component-test/mocha-rfc232-addon.js
 create mode 100644 node-tests/fixtures/component-test/mocha-rfc232-unit-addon.js
 create mode 100644 node-tests/fixtures/component-test/rfc232-addon.js
 create mode 100644 node-tests/fixtures/component-test/rfc232-unit-addon.js
 create mode 100644 node-tests/fixtures/controller-test/mocha-rfc232-addon.js
 create mode 100644 node-tests/fixtures/controller-test/rfc232-addon.js
 create mode 100644 node-tests/fixtures/helper-test/mocha-rfc232-addon.js
 create mode 100644 node-tests/fixtures/helper-test/rfc232-addon.js
 create mode 100644 node-tests/fixtures/route-test/mocha-rfc232-addon.js
 create mode 100644 node-tests/fixtures/route-test/rfc232-addon.js
 create mode 100644 node-tests/fixtures/service-test/mocha-rfc232-addon.js
 create mode 100644 node-tests/fixtures/service-test/rfc232-addon.js

diff --git a/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
index c829c1213b4..9f28e50b894 100644
--- a/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints-js/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {
diff --git a/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
index 874340678ec..07ae1fa1048 100644
--- a/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
+++ b/blueprints-js/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 1124f53ec61..09e004001b3 100644
--- a/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 922cc75b599..0140ea71ae8 100644
--- a/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 70beddc7a11..8e0a4be04e8 100644
--- a/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 576450eeeb7..211e4cf497d 100644
--- a/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index caf6e271319..1d317244677 100644
--- a/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
index 5197aa67b56..a04bbbf5077 100644
--- a/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
+++ b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 163dbd6210b..8a55ca6c2f0 100644
--- a/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 1bbe98f8213..942fd41cc9c 100644
--- a/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
index 3c8a84d0323..2124d8d45fa 100644
--- a/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
index fc13a97e339..14ec42e38ad 100644
--- a/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
+++ b/blueprints-js/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/-utils.js b/blueprints/-utils.js
new file mode 100644
index 00000000000..37f7754f770
--- /dev/null
+++ b/blueprints/-utils.js
@@ -0,0 +1,9 @@
+const { dasherize } = require('ember-cli-string-utils');
+
+function modulePrefixForProject(project) {
+  return dasherize(project.config().modulePrefix);
+}
+
+module.exports = {
+  modulePrefixForProject,
+};
diff --git a/blueprints/acceptance-test/index.js b/blueprints/acceptance-test/index.js
index 547f085df20..0f70417307e 100644
--- a/blueprints/acceptance-test/index.js
+++ b/blueprints/acceptance-test/index.js
@@ -6,6 +6,7 @@ const pathUtil = require('ember-cli-path-utils');
 const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -35,7 +36,8 @@ module.exports = useTestFrameworkDetector({
     ].join(' | ');
 
     return {
-      testFolderRoot: testFolderRoot,
+      modulePrefix: modulePrefixForProject(options.project),
+      testFolderRoot,
       friendlyTestName,
       destroyAppExists,
     };
diff --git a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts
index c829c1213b4..9f28e50b894 100644
--- a/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts
+++ b/blueprints/acceptance-test/mocha-rfc-232-files/tests/acceptance/__name__-test.ts
@@ -1,6 +1,6 @@
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 import { visit, currentURL } from '@ember/test-helpers';
 
 describe('<%= friendlyTestName %>', function () {
diff --git a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts
index 874340678ec..07ae1fa1048 100644
--- a/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts
+++ b/blueprints/acceptance-test/qunit-rfc-232-files/tests/acceptance/__name__-test.ts
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupApplicationTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestName %>', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js
index 9f6c3547cc8..1e89db6e6b0 100644
--- a/blueprints/component-test/index.js
+++ b/blueprints/component-test/index.js
@@ -7,6 +7,7 @@ const getPathOption = require('ember-cli-get-component-path-option');
 const semver = require('semver');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 function invocationFor(options) {
@@ -81,6 +82,7 @@ module.exports = useTestFrameworkDetector({
     let selfCloseComponent = (descriptor) => `<${descriptor} />`;
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       path: getPathOption(options),
       testType: testType,
       componentName,
diff --git a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 1124f53ec61..09e004001b3 100644
--- a/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/component-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,6 +1,6 @@
 <% if (testType === 'integration') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -26,7 +26,7 @@ describe('<%= friendlyTestDescription %>', function () {
   });
 });<% } else if (testType === 'unit') { %>import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 00936ce1c73..d2d4e87d1a4 100644
--- a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,5 +1,5 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
@@ -24,7 +24,7 @@ module('<%= friendlyTestDescription %>', function (hooks) {
     assert.dom(this.element).hasText('template block text');
   });
 });<% } else if (testType === 'unit') { %>import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/controller-test/index.js b/blueprints/controller-test/index.js
index f5d2defe4a4..3d2b1f29f9f 100644
--- a/blueprints/controller-test/index.js
+++ b/blueprints/controller-test/index.js
@@ -6,6 +6,7 @@ const useTestFrameworkDetector = require('../test-framework-detector');
 const path = require('path');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a controller unit test.',
@@ -22,6 +23,7 @@ module.exports = useTestFrameworkDetector({
     let controllerPathName = dasherizedModuleName;
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       controllerPathName: controllerPathName,
       friendlyTestDescription: ['Unit', 'Controller', dasherizedModuleName].join(' | '),
     };
diff --git a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 70beddc7a11..8e0a4be04e8 100644
--- a/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 576450eeeb7..211e4cf497d 100644
--- a/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/controller-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index 4a54bd252e1..f8e89935a57 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const stringUtils = require('ember-cli-string-utils');
 const isPackageMissing = require('ember-cli-is-package-missing');
 const semver = require('semver');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -34,15 +34,14 @@ module.exports = useTestFrameworkDetector({
 
   locals: function (options) {
     let friendlyTestName = ['Integration', 'Helper', options.entity.name].join(' | ');
-    let dasherizedModulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
 
     let hbsImportStatement = this._useNamedHbsImport()
       ? "import { hbs } from 'ember-cli-htmlbars';"
       : "import hbs from 'htmlbars-inline-precompile';";
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestName,
-      dasherizedModulePrefix,
       hbsImportStatement,
     };
   },
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
index caf6e271319..1d317244677 100644
--- a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
+++ b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
index 5197aa67b56..a04bbbf5077 100644
--- a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
+++ b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupRenderingTest } from '<%= modulePrefix %>/tests/helpers';
 import { render } from '@ember/test-helpers';
 <%= hbsImportStatement %>
 
diff --git a/blueprints/route-test/index.js b/blueprints/route-test/index.js
index fc79e51b099..e546a8b13c3 100644
--- a/blueprints/route-test/index.js
+++ b/blueprints/route-test/index.js
@@ -5,6 +5,7 @@ const stringUtil = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 
 module.exports = useTestFrameworkDetector({
   description: 'Generates a route unit test.',
@@ -57,6 +58,7 @@ module.exports = useTestFrameworkDetector({
     }
 
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestDescription: ['Unit', 'Route', options.entity.name].join(' | '),
       moduleName: stringUtil.dasherize(moduleName),
     };
diff --git a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 163dbd6210b..8a55ca6c2f0 100644
--- a/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/route-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 1bbe98f8213..942fd41cc9c 100644
--- a/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/route-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/blueprints/service-test/index.js b/blueprints/service-test/index.js
index 308126e7a67..0dd10e1f9b0 100644
--- a/blueprints/service-test/index.js
+++ b/blueprints/service-test/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -26,6 +27,7 @@ module.exports = useTestFrameworkDetector({
 
   locals(options) {
     return {
+      modulePrefix: modulePrefixForProject(options.project),
       friendlyTestDescription: ['Unit', 'Service', options.entity.name].join(' | '),
     };
   },
diff --git a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index 3c8a84d0323..2124d8d45fa 100644
--- a/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/service-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe, it } from 'mocha';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 describe('<%= friendlyTestDescription %>', function () {
   setupTest();
diff --git a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
index fc13a97e339..14ec42e38ad 100644
--- a/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
+++ b/blueprints/service-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.ts
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupTest } from '<%= dasherizedPackageName %>/tests/helpers';
+import { setupTest } from '<%= modulePrefix %>/tests/helpers';
 
 module('<%= friendlyTestDescription %>', function (hooks) {
   setupTest(hooks);
diff --git a/node-tests/blueprints/acceptance-test-test.js b/node-tests/blueprints/acceptance-test-test.js
index 5a7a1c4f577..2ef48c1948f 100644
--- a/node-tests/blueprints/acceptance-test-test.js
+++ b/node-tests/blueprints/acceptance-test-test.js
@@ -144,5 +144,23 @@ describe('Blueprint: acceptance-test', function () {
         });
       });
     });
+
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('acceptance-test foo', function () {
+        return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
+          expect(_file('tests/acceptance/foo-test.js')).to.equal(
+            fixture('acceptance-test/mocha-rfc268-addon.js')
+          );
+        });
+      });
+    });
   });
 });
diff --git a/node-tests/blueprints/component-test-test.js b/node-tests/blueprints/component-test-test.js
index d921f4f6658..ea29b87d637 100644
--- a/node-tests/blueprints/component-test-test.js
+++ b/node-tests/blueprints/component-test-test.js
@@ -193,43 +193,90 @@ describe('Blueprint: component-test', function () {
 
   describe('in addon', function () {
     beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
+      return emberNew({ target: 'addon' });
     });
 
-    it('component-test x-foo', function () {
-      return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default.js')
-        );
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-cli-qunit', dev: true },
+        ]);
+        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
+      });
+
+      it('component-test x-foo', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo'], (_file) => {
+          expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
+            fixture('component-test/default.js')
+          );
 
-        expect(_file('app/component-test/x-foo.js')).to.not.exist;
+          expect(_file('app/component-test/x-foo.js')).to.not.exist;
+        });
+      });
+
+      it('component-test x-foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
+          expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
+            fixture('component-test/unit.js')
+          );
+
+          expect(_file('app/component-test/x-foo.js')).to.not.exist;
+        });
+      });
+
+      it('component-test x-foo --dummy', function () {
+        return emberGenerateDestroy(['component-test', 'x-foo', '--dummy'], (_file) => {
+          expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
+            fixture('component-test/default.js')
+          );
+
+          expect(_file('app/component-test/x-foo.js')).to.not.exist;
+        });
       });
     });
 
-    it('component-test x-foo --unit', function () {
-      return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
-        expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
-          fixture('component-test/unit.js')
-        );
+    describe('with ember-qunit (default)', function () {
+      it('component-test foo', function () {
+        return emberGenerateDestroy(['component-test', 'foo'], (_file) => {
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/rfc232-addon.js')
+          );
+        });
+      });
 
-        expect(_file('app/component-test/x-foo.js')).to.not.exist;
+      it('component-test foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'foo', '--unit'], (_file) => {
+          expect(_file('tests/unit/components/foo-test.js')).to.equal(
+            fixture('component-test/rfc232-unit-addon.js')
+          );
+        });
       });
     });
 
-    it('component-test x-foo --dummy', function () {
-      return emberGenerateDestroy(['component-test', 'x-foo', '--dummy'], (_file) => {
-        expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
-          fixture('component-test/default.js')
-        );
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
 
-        expect(_file('app/component-test/x-foo.js')).to.not.exist;
+      it('component-test foo', function () {
+        return emberGenerateDestroy(['component-test', 'foo'], (_file) => {
+          expect(_file('tests/integration/components/foo-test.js')).to.equal(
+            fixture('component-test/mocha-rfc232-addon.js')
+          );
+        });
+      });
+
+      it('component-test foo --unit', function () {
+        return emberGenerateDestroy(['component-test', 'foo', '--unit'], (_file) => {
+          expect(_file('tests/unit/components/foo-test.js')).to.equal(
+            fixture('component-test/mocha-rfc232-unit-addon.js')
+          );
+        });
       });
     });
   });
diff --git a/node-tests/blueprints/controller-test-test.js b/node-tests/blueprints/controller-test-test.js
index a7569690a18..4d301cae653 100644
--- a/node-tests/blueprints/controller-test-test.js
+++ b/node-tests/blueprints/controller-test-test.js
@@ -153,29 +153,60 @@ describe('Blueprint: controller-test', function () {
 
   describe('in addon', function () {
     beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
+      return emberNew({ target: 'addon' });
     });
 
-    it('controller-test foo', function () {
-      return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
-        expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
-          fixture('controller-test/default.js')
-        );
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-cli-qunit', dev: true },
+        ]);
+        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
+      });
+
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
+            fixture('controller-test/default.js')
+          );
+        });
+      });
+
+      it('controller-test foo/bar', function () {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
+          expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
+            fixture('controller-test/default-nested.js')
+          );
+        });
       });
     });
 
-    it('controller-test foo/bar', function () {
-      return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
-        expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
-          fixture('controller-test/default-nested.js')
-        );
+    describe('with ember-qunit (default)', function () {
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
+            fixture('controller-test/rfc232-addon.js')
+          );
+        });
+      });
+    });
+
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('controller-test foo', function () {
+        return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
+            fixture('controller-test/mocha-rfc232-addon.js')
+          );
+        });
       });
     });
   });
diff --git a/node-tests/blueprints/helper-test-test.js b/node-tests/blueprints/helper-test-test.js
index 2d9004dd9c5..8edbdc5decb 100644
--- a/node-tests/blueprints/helper-test-test.js
+++ b/node-tests/blueprints/helper-test-test.js
@@ -121,20 +121,52 @@ describe('Blueprint: helper-test', function () {
 
   describe('in addon', function () {
     beforeEach(function () {
-      return emberNew({ target: 'addon' }).then(() => {
+      return emberNew({ target: 'addon' });
+    });
+
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
         modifyPackages([
           { name: 'ember-qunit', delete: true },
           { name: 'ember-cli-qunit', dev: true },
         ]);
         generateFakePackageManifest('ember-cli-qunit', '4.1.0');
       });
+
+      it('helper-test foo/bar-baz', function () {
+        return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
+          expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
+            fixture('helper-test/integration.js')
+          );
+        });
+      });
+    });
+
+    describe('with ember-qunit (default)', function () {
+      it('helper-test foo', function () {
+        return emberGenerateDestroy(['helper-test', 'foo'], (_file) => {
+          expect(_file('tests/integration/helpers/foo-test.js')).to.equal(
+            fixture('helper-test/rfc232-addon.js')
+          );
+        });
+      });
     });
 
-    it('helper-test foo/bar-baz', function () {
-      return emberGenerateDestroy(['helper-test', 'foo/bar-baz'], (_file) => {
-        expect(_file('tests/integration/helpers/foo/bar-baz-test.js')).to.equal(
-          fixture('helper-test/integration.js')
-        );
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('helper-test foo', function () {
+        return emberGenerateDestroy(['helper-test', 'foo'], (_file) => {
+          expect(_file('tests/integration/helpers/foo-test.js')).to.equal(
+            fixture('helper-test/mocha-rfc232-addon.js')
+          );
+        });
       });
     });
   });
diff --git a/node-tests/blueprints/route-test-test.js b/node-tests/blueprints/route-test-test.js
index 5d4da686287..ef8eade5e72 100644
--- a/node-tests/blueprints/route-test-test.js
+++ b/node-tests/blueprints/route-test-test.js
@@ -107,19 +107,50 @@ describe('Blueprint: route-test', function () {
 
   describe('in addon', function () {
     beforeEach(function () {
-      return emberNew({ target: 'addon' })
-        .then(() =>
-          modifyPackages([
-            { name: 'ember-qunit', delete: true },
-            { name: 'ember-cli-qunit', dev: true },
-          ])
-        )
-        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
+      return emberNew({ target: 'addon' });
     });
 
-    it('route-test foo', function () {
-      return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
-        expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
+    describe('with ember-cli-qunit@4.1.0', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-cli-qunit', dev: true },
+        ]);
+        generateFakePackageManifest('ember-cli-qunit', '4.1.0');
+      });
+
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/routes/foo-test.js')).to.equal(fixture('route-test/default.js'));
+        });
+      });
+    });
+
+    describe('with ember-qunit (default)', function () {
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/routes/foo-test.js')).to.equal(
+            fixture('route-test/rfc232-addon.js')
+          );
+        });
+      });
+    });
+
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('route-test foo', function () {
+        return emberGenerateDestroy(['route-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/routes/foo-test.js')).to.equal(
+            fixture('route-test/mocha-rfc232-addon.js')
+          );
+        });
       });
     });
   });
diff --git a/node-tests/blueprints/service-test-test.js b/node-tests/blueprints/service-test-test.js
index ff5a3c2dcdd..66dd4feac79 100644
--- a/node-tests/blueprints/service-test-test.js
+++ b/node-tests/blueprints/service-test-test.js
@@ -151,5 +151,33 @@ describe('Blueprint: service-test', function () {
         });
       });
     });
+
+    describe('with ember-qunit (default)', function () {
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/services/foo-test.js')).to.equal(
+            fixture('service-test/rfc232-addon.js')
+          );
+        });
+      });
+    });
+
+    describe('with ember-mocha@0.16.2', function () {
+      beforeEach(function () {
+        modifyPackages([
+          { name: 'ember-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.16.2');
+      });
+
+      it('service-test foo', function () {
+        return emberGenerateDestroy(['service-test', 'foo'], (_file) => {
+          expect(_file('tests/unit/services/foo-test.js')).to.equal(
+            fixture('service-test/mocha-rfc232-addon.js')
+          );
+        });
+      });
+    });
   });
 });
diff --git a/node-tests/fixtures/acceptance-test/mocha-rfc268-addon.js b/node-tests/fixtures/acceptance-test/mocha-rfc268-addon.js
new file mode 100644
index 00000000000..e5779451abc
--- /dev/null
+++ b/node-tests/fixtures/acceptance-test/mocha-rfc268-addon.js
@@ -0,0 +1,13 @@
+import { describe, it } from 'mocha';
+import { expect } from 'chai';
+import { setupApplicationTest } from 'dummy/tests/helpers';
+import { visit, currentURL } from '@ember/test-helpers';
+
+describe('Acceptance | foo', function () {
+  setupApplicationTest();
+
+  it('can visit /foo', async function () {
+    await visit('/foo');
+    expect(currentURL()).to.equal('/foo');
+  });
+});
diff --git a/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js b/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
index 2d001b04e05..88e63811d12 100644
--- a/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
+++ b/node-tests/fixtures/acceptance-test/qunit-rfc268-addon.js
@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { visit, currentURL } from '@ember/test-helpers';
-import { setupApplicationTest } from 'my-addon/tests/helpers';
+import { setupApplicationTest } from 'dummy/tests/helpers';
 
 module('Acceptance | foo', function (hooks) {
   setupApplicationTest(hooks);
diff --git a/node-tests/fixtures/component-test/mocha-rfc232-addon.js b/node-tests/fixtures/component-test/mocha-rfc232-addon.js
new file mode 100644
index 00000000000..0424b8f4429
--- /dev/null
+++ b/node-tests/fixtures/component-test/mocha-rfc232-addon.js
@@ -0,0 +1,27 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+describe('Integration | Component | foo', function () {
+  setupRenderingTest();
+
+  it('renders', async function () {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<Foo />`);
+
+    expect(this.element.textContent.trim()).to.equal('');
+
+    // Template block usage:
+    await render(hbs`
+      <Foo>
+        template block text
+      </Foo>
+    `);
+
+    expect(this.element.textContent.trim()).to.equal('template block text');
+  });
+});
diff --git a/node-tests/fixtures/component-test/mocha-rfc232-unit-addon.js b/node-tests/fixtures/component-test/mocha-rfc232-unit-addon.js
new file mode 100644
index 00000000000..6e0e48fb188
--- /dev/null
+++ b/node-tests/fixtures/component-test/mocha-rfc232-unit-addon.js
@@ -0,0 +1,12 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Component | foo', function () {
+  setupTest();
+
+  it('exists', function () {
+    let component = this.owner.factoryFor('component:foo').create();
+    expect(component).to.be.ok;
+  });
+});
diff --git a/node-tests/fixtures/component-test/rfc232-addon.js b/node-tests/fixtures/component-test/rfc232-addon.js
new file mode 100644
index 00000000000..0c22851c05a
--- /dev/null
+++ b/node-tests/fixtures/component-test/rfc232-addon.js
@@ -0,0 +1,26 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+module('Integration | Component | foo', function (hooks) {
+  setupRenderingTest(hooks);
+
+  test('it renders', async function (assert) {
+    // Set any properties with this.set('myProperty', 'value');
+    // Handle any actions with this.set('myAction', function(val) { ... });
+
+    await render(hbs`<Foo />`);
+
+    assert.dom(this.element).hasText('');
+
+    // Template block usage:
+    await render(hbs`
+      <Foo>
+        template block text
+      </Foo>
+    `);
+
+    assert.dom(this.element).hasText('template block text');
+  });
+});
diff --git a/node-tests/fixtures/component-test/rfc232-unit-addon.js b/node-tests/fixtures/component-test/rfc232-unit-addon.js
new file mode 100644
index 00000000000..818671c1285
--- /dev/null
+++ b/node-tests/fixtures/component-test/rfc232-unit-addon.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Component | foo', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let component = this.owner.factoryFor('component:foo').create();
+    assert.ok(component);
+  });
+});
diff --git a/node-tests/fixtures/controller-test/mocha-rfc232-addon.js b/node-tests/fixtures/controller-test/mocha-rfc232-addon.js
new file mode 100644
index 00000000000..013290ac0f4
--- /dev/null
+++ b/node-tests/fixtures/controller-test/mocha-rfc232-addon.js
@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Controller | foo', function () {
+  setupTest();
+
+  // TODO: Replace this with your real tests.
+  it('exists', function () {
+    let controller = this.owner.lookup('controller:foo');
+    expect(controller).to.be.ok;
+  });
+});
diff --git a/node-tests/fixtures/controller-test/rfc232-addon.js b/node-tests/fixtures/controller-test/rfc232-addon.js
new file mode 100644
index 00000000000..ca8a7adc375
--- /dev/null
+++ b/node-tests/fixtures/controller-test/rfc232-addon.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Controller | foo', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let controller = this.owner.lookup('controller:foo');
+    assert.ok(controller);
+  });
+});
diff --git a/node-tests/fixtures/helper-test/mocha-rfc232-addon.js b/node-tests/fixtures/helper-test/mocha-rfc232-addon.js
new file mode 100644
index 00000000000..2b52c2cb647
--- /dev/null
+++ b/node-tests/fixtures/helper-test/mocha-rfc232-addon.js
@@ -0,0 +1,18 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+describe('Integration | Helper | foo', function () {
+  setupRenderingTest();
+
+  // TODO: Replace this with your real tests.
+  it('renders', async function () {
+    this.set('inputValue', '1234');
+
+    await render(hbs`{{foo this.inputValue}}`);
+
+    expect(this.element.textContent.trim()).to.equal('1234');
+  });
+});
diff --git a/node-tests/fixtures/helper-test/rfc232-addon.js b/node-tests/fixtures/helper-test/rfc232-addon.js
new file mode 100644
index 00000000000..af309a80c63
--- /dev/null
+++ b/node-tests/fixtures/helper-test/rfc232-addon.js
@@ -0,0 +1,17 @@
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'dummy/tests/helpers';
+import { render } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
+
+module('Integration | Helper | foo', function (hooks) {
+  setupRenderingTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it renders', async function (assert) {
+    this.set('inputValue', '1234');
+
+    await render(hbs`{{foo this.inputValue}}`);
+
+    assert.dom(this.element).hasText('1234');
+  });
+});
diff --git a/node-tests/fixtures/route-test/mocha-rfc232-addon.js b/node-tests/fixtures/route-test/mocha-rfc232-addon.js
new file mode 100644
index 00000000000..6234ea8e294
--- /dev/null
+++ b/node-tests/fixtures/route-test/mocha-rfc232-addon.js
@@ -0,0 +1,12 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Route | foo', function () {
+  setupTest();
+
+  it('exists', function () {
+    let route = this.owner.lookup('route:foo');
+    expect(route).to.be.ok;
+  });
+});
diff --git a/node-tests/fixtures/route-test/rfc232-addon.js b/node-tests/fixtures/route-test/rfc232-addon.js
new file mode 100644
index 00000000000..3c342db100a
--- /dev/null
+++ b/node-tests/fixtures/route-test/rfc232-addon.js
@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Route | foo', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:foo');
+    assert.ok(route);
+  });
+});
diff --git a/node-tests/fixtures/service-test/mocha-rfc232-addon.js b/node-tests/fixtures/service-test/mocha-rfc232-addon.js
new file mode 100644
index 00000000000..e3e672f970c
--- /dev/null
+++ b/node-tests/fixtures/service-test/mocha-rfc232-addon.js
@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'dummy/tests/helpers';
+
+describe('Unit | Service | foo', function () {
+  setupTest();
+
+  // TODO: Replace this with your real tests.
+  it('exists', function () {
+    let service = this.owner.lookup('service:foo');
+    expect(service).to.be.ok;
+  });
+});
diff --git a/node-tests/fixtures/service-test/rfc232-addon.js b/node-tests/fixtures/service-test/rfc232-addon.js
new file mode 100644
index 00000000000..9268712dd82
--- /dev/null
+++ b/node-tests/fixtures/service-test/rfc232-addon.js
@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'dummy/tests/helpers';
+
+module('Unit | Service | foo', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let service = this.owner.lookup('service:foo');
+    assert.ok(service);
+  });
+});

From 2a06e7dc1895b78759522dda062d1897b016172d Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sat, 11 Jun 2022 12:07:27 +0200
Subject: [PATCH 1013/1405] Remove internal files in `blueprints-js` folder

---
 blueprints-js/-addon-import.js           | 48 -------------------
 blueprints-js/test-framework-detector.js | 60 ------------------------
 2 files changed, 108 deletions(-)
 delete mode 100644 blueprints-js/-addon-import.js
 delete mode 100644 blueprints-js/test-framework-detector.js

diff --git a/blueprints-js/-addon-import.js b/blueprints-js/-addon-import.js
deleted file mode 100644
index 27cf4f7f6fa..00000000000
--- a/blueprints-js/-addon-import.js
+++ /dev/null
@@ -1,48 +0,0 @@
-'use strict';
-
-const stringUtil = require('ember-cli-string-utils');
-const path = require('path');
-const inflector = require('inflection');
-
-module.exports = {
-  description: 'Generates an import wrapper.',
-
-  fileMapTokens: function () {
-    return {
-      __name__: function (options) {
-        return options.dasherizedModuleName;
-      },
-      __path__: function (options) {
-        return inflector.pluralize(options.locals.blueprintName);
-      },
-      __root__: function (options) {
-        if (options.inRepoAddon) {
-          return path.join('lib', options.inRepoAddon, 'app');
-        }
-        return 'app';
-      },
-    };
-  },
-
-  locals: function (options) {
-    let addonRawName = options.inRepoAddon ? options.inRepoAddon : options.project.name();
-    let addonName = stringUtil.dasherize(addonRawName);
-    let fileName = stringUtil.dasherize(options.entity.name);
-    let blueprintName = options.originBlueprintName;
-    let modulePathSegments = [
-      addonName,
-      inflector.pluralize(options.originBlueprintName),
-      fileName,
-    ];
-
-    if (blueprintName.match(/-addon/)) {
-      blueprintName = blueprintName.substr(0, blueprintName.indexOf('-addon'));
-      modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
-    }
-
-    return {
-      modulePath: modulePathSegments.join('/'),
-      blueprintName: blueprintName,
-    };
-  },
-};
diff --git a/blueprints-js/test-framework-detector.js b/blueprints-js/test-framework-detector.js
deleted file mode 100644
index a294a911dfb..00000000000
--- a/blueprints-js/test-framework-detector.js
+++ /dev/null
@@ -1,60 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const VersionChecker = require('ember-cli-version-checker');
-
-module.exports = function (blueprint) {
-  blueprint.supportsAddon = function () {
-    return false;
-  };
-
-  blueprint.filesPath = function () {
-    let type;
-    const qunitRfcVersion = 'qunit-rfc-232';
-    const mochaRfcVersion = 'mocha-rfc-232';
-    const mochaVersion = 'mocha-0.12';
-
-    let dependencies = this.project.dependencies();
-    if ('ember-qunit' in dependencies) {
-      type = qunitRfcVersion;
-    } else if ('ember-cli-qunit' in dependencies) {
-      let checker = new VersionChecker(this.project);
-      if (
-        fs.existsSync(`${this.path}/${qunitRfcVersion}-files`) &&
-        checker.for('ember-cli-qunit', 'npm').gte('4.2.0')
-      ) {
-        type = qunitRfcVersion;
-      } else {
-        type = 'qunit';
-      }
-    } else if ('ember-mocha' in dependencies) {
-      let checker = new VersionChecker(this.project);
-      if (
-        fs.existsSync(`${this.path}/${mochaRfcVersion}-files`) &&
-        checker.for('ember-mocha', 'npm').gte('0.14.0')
-      ) {
-        type = mochaRfcVersion;
-      } else {
-        type = mochaVersion;
-      }
-    } else if ('ember-cli-mocha' in dependencies) {
-      let checker = new VersionChecker(this.project);
-      if (
-        fs.existsSync(`${this.path}/${mochaVersion}-files`) &&
-        checker.for('ember-cli-mocha', 'npm').gte('0.12.0')
-      ) {
-        type = mochaVersion;
-      } else {
-        type = 'mocha';
-      }
-    } else {
-      this.ui.writeLine("Couldn't determine test style - using QUnit");
-      type = 'qunit';
-    }
-
-    return path.join(this.path, type + '-files');
-  };
-
-  return blueprint;
-};

From 326497b70c274dc4cf128d64477c478a45afa09c Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sun, 12 Jun 2022 21:15:10 +0200
Subject: [PATCH 1014/1405] Consistent determination of `modulePrefix` in
 blueprints

---
 .../qunit-files/__root__/__testType__/__name__-test.js      | 2 +-
 .../__root__/__testType__/__name__-test.js                  | 2 +-
 blueprints/initializer-test/index.js                        | 5 ++---
 blueprints/instance-initializer-test/index.js               | 6 ++----
 blueprints/util-test/index.js                               | 4 ++--
 .../qunit-files/__root__/__testType__/__name__-test.js      | 2 +-
 .../__root__/__testType__/__name__-test.ts                  | 2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
index d9eeb2bbb93..2a10306510e 100644
--- a/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
+++ b/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');
diff --git a/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
index d531b5ee8d0..0278e54bdfb 100644
--- a/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
+++ b/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', function () {
diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
index bc4755eca15..fd0ae11bd87 100644
--- a/blueprints/initializer-test/index.js
+++ b/blueprints/initializer-test/index.js
@@ -2,9 +2,9 @@
 
 const fs = require('fs');
 const path = require('path');
-const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -29,10 +29,9 @@ module.exports = useTestFrameworkDetector({
   },
 
   locals: function (options) {
-    let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
     return {
       friendlyTestName: ['Unit', 'Initializer', options.entity.name].join(' | '),
-      modulePrefix,
+      modulePrefix: modulePrefixForProject(options.project),
       destroyAppExists: fs.existsSync(
         path.join(this.project.root, '/tests/helpers/destroy-app.js')
       ),
diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
index b691b4a8b41..53f87ae56ef 100644
--- a/blueprints/instance-initializer-test/index.js
+++ b/blueprints/instance-initializer-test/index.js
@@ -2,9 +2,9 @@
 
 const fs = require('fs');
 const path = require('path');
-const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -28,11 +28,9 @@ module.exports = useTestFrameworkDetector({
     };
   },
   locals: function (options) {
-    let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
-
     return {
       friendlyTestName: ['Unit', 'Instance Initializer', options.entity.name].join(' | '),
-      modulePrefix,
+      modulePrefix: modulePrefixForProject(options.project),
       destroyAppExists: fs.existsSync(
         path.join(this.project.root, '/tests/helpers/destroy-app.js')
       ),
diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
index 55b63152b02..ebc7e416402 100644
--- a/blueprints/util-test/index.js
+++ b/blueprints/util-test/index.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const stringUtils = require('ember-cli-string-utils');
 const path = require('path');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -30,7 +30,7 @@ module.exports = useTestFrameworkDetector({
   locals: function (options) {
     return {
       friendlyTestName: ['Unit', 'Utility', options.entity.name].join(' | '),
-      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });
diff --git a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
index d9eeb2bbb93..2a10306510e 100644
--- a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
+++ b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');
diff --git a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
index d531b5ee8d0..0278e54bdfb 100644
--- a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
+++ b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', function () {

From c18edfca05598cdc6e683566ac0ffaa64dd9de04 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jun 2022 11:33:15 -0400
Subject: [PATCH 1015/1405] Add v4.4.2 to CHANGELOG

(cherry picked from commit 0527cdfb1380e566424b57f2764ef01998acb810)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a322c5fa77b..5c88a50b81b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.4.2 (June 13, 2022)
+
+- [#20114](https://github.com/emberjs/ember.js/pull/20114) [BUGFIX] Fix generated import paths for test setup functions in addons
+
 ### v4.5.0-beta.2 (June 6, 2022)
 
 - [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprint generation

From fa7db213b2f870bce4b153c1167746bff1f6a209 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jun 2022 11:43:38 -0400
Subject: [PATCH 1016/1405] Add v4.5.0 to CHANGELOG

(cherry picked from commit 311760db432da20977b307b2805e9761b8917228)
---
 CHANGELOG.md | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c88a50b81b..3aecf2f052b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,18 @@
 # Ember Changelog
 
-### v4.4.2 (June 13, 2022)
+### v4.5.0 (June 13, 2022)
 
-- [#20114](https://github.com/emberjs/ember.js/pull/20114) [BUGFIX] Fix generated import paths for test setup functions in addons
+- [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
+- [#20053](https://github.com/emberjs/ember.js/pull/20053) [FEATURE] Expose `renderSettled` from `@ember/renderer` to enable implementation of [RFC #0785](https://github.com/emberjs/rfcs/blob/master/text/0785-remove-set-get-in-tests.md).
 
-### v4.5.0-beta.2 (June 6, 2022)
+### v4.4.2 (June 13, 2022)
 
-- [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprint generation
+- [#20114](https://github.com/emberjs/ember.js/pull/20114) [BUGFIX] Fix generated import paths for test setup functions in addons
 
 ### v4.4.1 (May 31, 2022)
 
 - [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprints publication
 
-### v4.5.0-beta.1 (May 2, 2022)
-
-- [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
-- [#20053](https://github.com/emberjs/ember.js/pull/20053) [FEATURE] Expose `renderSettled` from `@ember/renderer` to enable implementation of [RFC #0785](https://github.com/emberjs/rfcs/blob/master/text/0785-remove-set-get-in-tests.md).
-
 ### v4.4.0 (May 2, 2022)
 
 - [#19882](https://github.com/emberjs/ember.js/pull/19882) / [#20005](https://github.com/emberjs/ember.js/pull/20005) [FEATURE] Implement the `unique-id` helper per [RFC #0659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).

From 5a77a4312accd672f29b48b73db2b78745335ae7 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jun 2022 11:57:06 -0400
Subject: [PATCH 1017/1405] Add v4.6.0-beta.1 to CHANGELOG

(cherry picked from commit e0485faba3e56afe1e3e7a20af4e150b6f962877)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3aecf2f052b..ca26d3acc47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.6.0-beta.1 (June 13, 2022)
+
+No new external changes.
+
 ### v4.5.0 (June 13, 2022)
 
 - [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).

From 58084b81185d0f8973696bf224c61bfa271f9553 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Jun 2022 11:59:54 -0400
Subject: [PATCH 1018/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6b84256d775..408aa60eab4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.6.0-alpha.1",
+  "version": "4.7.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From d75a0cb13cb323165e38c79d1de177a1f747d88d Mon Sep 17 00:00:00 2001
From: Sergey Astapov <SergeAstapov@gmail.com>
Date: Mon, 13 Jun 2022 16:55:30 -0400
Subject: [PATCH 1019/1405] [DOC] Document `helper` and `modifier` keywords

---
 .../-internals/glimmer/lib/helpers/helper.ts  | 41 +++++++++++++++++++
 .../glimmer/lib/helpers/modifier.ts           | 40 ++++++++++++++++++
 tests/docs/expected.js                        |  1 +
 3 files changed, 82 insertions(+)
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/helper.ts
 create mode 100644 packages/@ember/-internals/glimmer/lib/helpers/modifier.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/helper.ts
new file mode 100644
index 00000000000..c13e3b37c2c
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/helper.ts
@@ -0,0 +1,41 @@
+/**
+ @module ember
+ */
+
+/**
+ Use the `{{helper}}` helper to create contextual helper so
+ that it can be passed around as first-class values in templates.
+
+ ```handlebars
+ {{#let (helper "join-words" "foo" "bar" separator=" ") as |foo-bar|}}
+
+   {{!-- this is equivalent to invoking `{{join-words "foo" "bar" separator=" "}}` --}}
+   {{foo-bar}}
+
+   {{!-- this will pass the helper itself into the component, instead of invoking it now --}}
+   <MyComponent @helper={{helper foo-bar "baz"}} />
+
+   {{!-- this will yield the helper itself ("contextual helper"), instead of invoking it now --}}
+   {{yield foo-bar}}
+ {{/let}}
+ ```
+
+ ### Arguments
+
+ The `{{helper}}` helper works similarly to the [`{{component}}`](./component?anchor=component) and
+ [`{{modifier}}`](./modifier?anchor=modifier) helper:
+
+ * When passed a string (e.g. `(helper "foo")`) as the first argument,
+   it will produce an opaque, internal "helper definition" object
+   that can be passed around and invoked elsewhere.
+
+ * Any additional positional and/or named arguments (a.k.a. params and hash)
+   will be stored ("curried") inside the definition object, such that, when invoked,
+   these arguments will be passed along to the referenced helper.
+
+
+ @method helper
+ @for Ember.Templates.helpers
+ @public
+ @since 3.27.0
+ */
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/modifier.ts b/packages/@ember/-internals/glimmer/lib/helpers/modifier.ts
new file mode 100644
index 00000000000..05e51b3af79
--- /dev/null
+++ b/packages/@ember/-internals/glimmer/lib/helpers/modifier.ts
@@ -0,0 +1,40 @@
+/**
+ @module ember
+ */
+
+/**
+ Use the `{{modifier}}` helper to create contextual modifier so
+ that it can be passed around as first-class values in templates.
+
+ ```handlebars
+ {{#let (modifier "click-outside" click=this.submit) as |on-click-outside|}}
+
+   {{!-- this is equivalent to `<MyComponent {{click-outside click=this.submit}} />` --}}
+   <MyComponent {{on-click-outside}} />
+
+   {{!-- this will pass the modifier itself into the component, instead of invoking it now --}}
+   <MyComponent @modifier={{modifier on-click-outside "extra" "args"}} />
+
+   {{!-- this will yield the modifier itself ("contextual modifier"), instead of invoking it now --}}
+   {{yield on-click-outside}}
+ {{/let}}
+ ```
+
+ ### Arguments
+
+ The `{{modifier}}` helper works similarly to the [`{{component}}`](./component?anchor=component) and
+ [`{{helper}}`](./helper?anchor=helper) helper:
+
+ * When passed a string (e.g. `(modifier "foo")`) as the first argument,
+   it will produce an opaque, internal "modifier definition" object
+   that can be passed around and invoked elsewhere.
+
+ * Any additional positional and/or named arguments (a.k.a. params and hash)
+   will be stored ("curried") inside the definition object, such that, when invoked,
+   these arguments will be passed along to the referenced modifier.
+
+ @method modifier
+ @for Ember.Templates.helpers
+ @public
+ @since 3.27.0
+ */
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 8599494cccc..67d8b1d4fbc 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -335,6 +335,7 @@ module.exports = {
     'mixin',
     'model',
     'modelFor',
+    'modifier',
     'mount',
     'mut',
     'name',

From f8812ee1d756d71cb2f3194ff7ec458dcdbd2d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20Nie=C5=BCurawski?= <tommaqs@gmail.com>
Date: Sat, 11 Jun 2022 09:21:50 +0200
Subject: [PATCH 1020/1405] Application class: convert docs to ES6 syntax

---
 .../@ember/application/lib/application.ts     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/application/lib/application.ts b/packages/@ember/application/lib/application.ts
index 8a332f6ffa7..7d42637ae18 100644
--- a/packages/@ember/application/lib/application.ts
+++ b/packages/@ember/application/lib/application.ts
@@ -43,11 +43,11 @@ import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
   initialized.
 
   ```app/app.js
-  const App = Application.extend({
+  export default class App extends Application {
     ready() {
       // your code here
     }
-  })
+  }
   ```
 
   Because `Application` ultimately inherits from `Ember.Namespace`, any classes
@@ -84,12 +84,12 @@ import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
   ```app/app.js
   import Application from '@ember/application';
 
-  let App = Application.extend({
-    customEvents: {
+  export default class App extends Application {
+    customEvents = {
       // add support for the paste event
       paste: 'paste'
     }
-  });
+  }
   ```
 
   To prevent Ember from setting up a listener for a default event,
@@ -99,13 +99,13 @@ import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
   ```app/app.js
   import Application from '@ember/application';
 
-  let App = Application.extend({
-    customEvents: {
+  export default class App extends Application {
+    customEvents = {
       // prevent listeners for mouseenter/mouseleave events
       mouseenter: null,
       mouseleave: null
     }
-  });
+  }
   ```
 
   By default, the application sets up these event listeners on the document
@@ -119,9 +119,9 @@ import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
   ```app/app.js
   import Application from '@ember/application';
 
-  let App = Application.extend({
-    rootElement: '#ember-app'
-  });
+  export default class App extends Application {
+    rootElement = '#ember-app'
+  }
   ```
 
   The `rootElement` can be either a DOM element or a CSS selector

From 39bd7a6989d4b4fa7c362d61ec694251d2dfe808 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Wed, 15 Jun 2022 22:22:27 +0900
Subject: [PATCH 1021/1405] Fix typo in instance.ts

transion -> transition
---
 packages/@ember/application/instance.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index b4f2e6a0d03..5667822c0f9 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -248,7 +248,7 @@ class ApplicationInstance extends EngineInstance {
     Navigate the instance to a particular URL. This is useful in tests, for
     example, or to tell the app to start at a particular URL. This method
     returns a promise that resolves with the app instance when the transition
-    is complete, or rejects if the transion was aborted due to an error.
+    is complete, or rejects if the transition was aborted due to an error.
 
     @public
     @param url {String} the destination URL

From 9be7f687a602f31462a5fad74eac9aeb3209b5b6 Mon Sep 17 00:00:00 2001
From: Kirtan Desai <kirtands44@gmail.com>
Date: Sun, 19 Jun 2022 19:23:25 -0400
Subject: [PATCH 1022/1405] [CLEANUP beta]

---
 packages/@ember/-internals/metal/lib/chain-tags.ts     |  2 +-
 .../-internals/routing/lib/location/auto_location.ts   | 10 +++++-----
 .../-internals/routing/lib/location/hash_location.ts   |  2 +-
 .../@ember/-internals/routing/lib/location/util.ts     |  2 +-
 .../@ember/-internals/routing/lib/services/router.ts   |  2 +-
 packages/@ember/-internals/routing/lib/utils.ts        |  2 +-
 .../lib/plugins/assert-against-attrs.ts                |  2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
index bbcfb80bb0c..14ae5742766 100644
--- a/packages/@ember/-internals/metal/lib/chain-tags.ts
+++ b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -182,7 +182,7 @@ function getChainTags(
       } else {
         // use metaFor here to ensure we have the meta for the instance
         let lazyChains = instanceMeta.writableLazyChainsFor(segment);
-        let rest = path.substr(segmentEnd + 1);
+        let rest = path.substring(segmentEnd + 1);
 
         let placeholderTag = createUpdatableTag();
 
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 6ab31704b32..2ae1b40ad5c 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -275,7 +275,7 @@ function detectImplementation(options: DetectionOptions) {
     // the history location with no redirects.
     if (currentPath === historyPath) {
       implementation = 'history';
-    } else if (currentPath.substr(0, 2) === '/#') {
+    } else if (currentPath.substring(0, 2) === '/#') {
       history.replaceState({ path: historyPath }, '', historyPath);
       implementation = 'history';
     } else {
@@ -326,16 +326,16 @@ export function getHistoryPath(rootURL: string, location: Location): string {
   // By convention, Ember.js routes using HashLocation are required to start
   // with `#/`. Anything else should NOT be considered a route and should
   // be passed straight through, without transformation.
-  if (hash.substr(0, 2) === '#/') {
+  if (hash.substring(0, 2) === '#/') {
     // There could be extra hash segments after the route
-    hashParts = hash.substr(1).split('#');
+    hashParts = hash.substring(1).split('#');
     // The first one is always the route url
     routeHash = hashParts.shift() as string;
 
     // If the path already has a trailing slash, remove the one
     // from the hashed route so we don't double up.
     if (path.charAt(path.length - 1) === '/') {
-      routeHash = routeHash.substr(1);
+      routeHash = routeHash.substring(1);
     }
 
     // This is the "expected" final order
@@ -362,7 +362,7 @@ export function getHistoryPath(rootURL: string, location: Location): string {
 export function getHashPath(rootURL: string, location: Location): string {
   let path = rootURL;
   let historyPath = getHistoryPath(rootURL, location);
-  let routePath = historyPath.substr(rootURL.length);
+  let routePath = historyPath.substring(rootURL.length);
 
   if (routePath !== '') {
     if (routePath[0] !== '/') {
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index 728ea7ae202..6a9c5a4939c 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -72,7 +72,7 @@ export default class HashLocation extends EmberObject implements EmberLocation {
     @method getURL
   */
   getURL(): string {
-    let originalPath = this.getHash().substr(1);
+    let originalPath = this.getHash().substring(1);
     let outPath = originalPath;
 
     if (outPath[0] !== '/') {
diff --git a/packages/@ember/-internals/routing/lib/location/util.ts b/packages/@ember/-internals/routing/lib/location/util.ts
index 7dd1be322a7..5817ff2a0c1 100644
--- a/packages/@ember/-internals/routing/lib/location/util.ts
+++ b/packages/@ember/-internals/routing/lib/location/util.ts
@@ -29,7 +29,7 @@ export function getQuery(location: Location): string {
 */
 export function getHash(location: Location): string {
   if (location.hash !== undefined) {
-    return location.hash.substr(0);
+    return location.hash.substring(0);
   }
 
   return '';
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 73f4a98840a..93701df9781 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -18,7 +18,7 @@ function cleanURL(url: string, rootURL: string) {
     return url;
   }
 
-  return url.substr(rootURL.length, url.length);
+  return url.substring(rootURL.length);
 }
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 0e5e5471687..b981d68a94c 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -153,7 +153,7 @@ export function calculateCacheKey(prefix: string, parts: string[] = [], values:
     if (values) {
       if (cacheValuePrefix && cacheValuePrefix in values) {
         let partRemovedPrefix =
-          part.indexOf(cacheValuePrefix) === 0 ? part.substr(cacheValuePrefix.length + 1) : part;
+          part.indexOf(cacheValuePrefix) === 0 ? part.substring(cacheValuePrefix.length + 1) : part;
         value = get((values as any)[cacheValuePrefix], partRemovedPrefix);
       } else {
         value = get(values, part);
diff --git a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
index b955b1af4e0..9a81ab58736 100644
--- a/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
+++ b/packages/ember-template-compiler/lib/plugins/assert-against-attrs.ts
@@ -56,7 +56,7 @@ export default function assertAgainstAttrs(env: EmberASTPluginEnvironment): ASTP
 
       PathExpression(node: AST.PathExpression): AST.Node | void {
         if (isAttrs(node, stack[stack.length - 1]!)) {
-          let path = b.path(node.original.substr(6));
+          let path = b.path(node.original.substring(6));
 
           assert(
             `Using {{attrs}} to reference named arguments is not supported. {{attrs.${

From b932fd256d4c831a7e1aa574a51cd141f19b0e80 Mon Sep 17 00:00:00 2001
From: Kirtan Desai <kirtands44@gmail.com>
Date: Sun, 19 Jun 2022 23:05:47 -0400
Subject: [PATCH 1023/1405] Removing Firefox detection using InstallTrigger

---
 packages/@ember/-internals/browser-environment/index.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/browser-environment/index.ts b/packages/@ember/-internals/browser-environment/index.ts
index 29bb5ed3154..c3a7a064350 100644
--- a/packages/@ember/-internals/browser-environment/index.ts
+++ b/packages/@ember/-internals/browser-environment/index.ts
@@ -1,6 +1,5 @@
 import hasDom from './lib/has-dom';
 
-declare const InstallTrigger: unknown;
 declare const chrome: unknown;
 declare const opera: unknown;
 declare const MSInputMethodContext: unknown;
@@ -12,7 +11,7 @@ export const location = hasDom ? self.location : null;
 export const history = hasDom ? self.history : null;
 export const userAgent = hasDom ? self.navigator.userAgent : 'Lynx (textmode)';
 export const isChrome = hasDom ? typeof chrome === 'object' && !(typeof opera === 'object') : false;
-export const isFirefox = hasDom ? typeof InstallTrigger !== 'undefined' : false;
+export const isFirefox = hasDom ? /Firefox|FxiOS/.test(userAgent) : false;
 export const isIE = hasDom
   ? typeof MSInputMethodContext !== 'undefined' && typeof documentMode !== 'undefined'
   : false;

From 089a021b1b5c5f8ea1cb574fcd841a73af7b2031 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Tue, 14 Jun 2022 12:31:09 +0200
Subject: [PATCH 1024/1405] [BUGFIX lts] unique-id: Adjust `uniqueId()`
 implementation to only generate valid selectors

Regular UUIDs are allowed to start with numeric digits, but CSS selectors may not start with those. This change adjusts the implementation to only return UUIDs starting with a letter instead of a digit.

(cherry picked from commit 2ffa93deaf5819d1709a78b1363e1e4d6c35909f)
---
 .../glimmer/lib/helpers/unique-id.ts           |  8 +++++---
 .../integration/helpers/unique-id-test.js      | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
index 032cd66b6a8..6320c24a3db 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts
@@ -38,12 +38,14 @@ export default internalHelper((): Reference<string> => {
 // This code should be reasonably fast, and provide a unique value every time
 // it's called, which is what we need here. It produces a string formatted as a
 // standard UUID, which avoids accidentally turning Ember-specific
-// implementation details into an intimate API.
+// implementation details into an intimate API. It also ensures that the UUID
+// always starts with a letter, to avoid creating invalid IDs with a numeric
+// digit at the start.
 function uniqueId() {
   // @ts-expect-error this one-liner abuses weird JavaScript semantics that
   // TypeScript (legitimately) doesn't like, but they're nonetheless valid and
   // specced.
-  return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, (a) =>
-    (a ^ ((Math.random() * 16) >> (a / 4))).toString(16)
+  return ([3e7] + -1e3 + -4e3 + -2e3 + -1e11).replace(/[0-3]/g, (a) =>
+    ((a * 4) ^ ((Math.random() * 16) >> (a & 2))).toString(16)
   );
 }
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
index 763722f49ed..e4f4b2b5942 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
@@ -102,6 +102,24 @@ if (EMBER_UNIQUE_ID_HELPER) {
         });
       }
 
+      ['@test it only generates valid selectors']() {
+        let iterations = 1000;
+        let reNumericStart = /^\d/;
+
+        let template = '<p>{{unique-id}}</p>'.repeat(iterations);
+        super.render(template);
+
+        for (let i = 0; i < iterations; i++) {
+          let textNode = this.nthChild(i).firstChild;
+          let text = textNode.data;
+
+          this.assert.false(
+            reNumericStart.test(text),
+            `{{unique-id}} should produce valid selectors` + text
+          );
+        }
+      }
+
       render(template, ...rest) {
         // If there are three parameters to `render`, the second parameter is the
         // template's arguments.

From 42d018a93e36e0aa41806d3276591c0fe4c14a16 Mon Sep 17 00:00:00 2001
From: Kirtan Desai <kirtands44@gmail.com>
Date: Wed, 22 Jun 2022 14:01:16 -0400
Subject: [PATCH 1025/1405] Remove browser detection for IE

---
 packages/@ember/-internals/browser-environment/index.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/@ember/-internals/browser-environment/index.ts b/packages/@ember/-internals/browser-environment/index.ts
index c3a7a064350..0b8c320bd3d 100644
--- a/packages/@ember/-internals/browser-environment/index.ts
+++ b/packages/@ember/-internals/browser-environment/index.ts
@@ -2,8 +2,6 @@ import hasDom from './lib/has-dom';
 
 declare const chrome: unknown;
 declare const opera: unknown;
-declare const MSInputMethodContext: unknown;
-declare const documentMode: unknown;
 
 export { default as hasDOM } from './lib/has-dom';
 export const window = hasDom ? self : null;
@@ -12,6 +10,3 @@ export const history = hasDom ? self.history : null;
 export const userAgent = hasDom ? self.navigator.userAgent : 'Lynx (textmode)';
 export const isChrome = hasDom ? typeof chrome === 'object' && !(typeof opera === 'object') : false;
 export const isFirefox = hasDom ? /Firefox|FxiOS/.test(userAgent) : false;
-export const isIE = hasDom
-  ? typeof MSInputMethodContext !== 'undefined' && typeof documentMode !== 'undefined'
-  : false;

From 9741caacedb3fec9e82a4752c88345380594571d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 27 Jun 2022 14:04:26 -0400
Subject: [PATCH 1026/1405] Add v4.6.0-beta.2 to CHANGELOG

(cherry picked from commit 3786bcbbf7745c0b69e3e7c8506138411cf28e9c)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca26d3acc47..8574879dedb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.6.0-beta.2 (June 27, 2022)
+
+- [#20125](https://github.com/emberjs/ember.js/pull/20125) [BUGFIX] Replace deprecated substr() method with substring() method.
+- [#20120](https://github.com/emberjs/ember.js/pull/20120) [BUGFIX] Adjust uniqueId() implementation to only generate valid selectors.
+
 ### v4.6.0-beta.1 (June 13, 2022)
 
 No new external changes.

From bee22be998eeef74923366df2e067cdeadcc811d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:03:04 +0000
Subject: [PATCH 1027/1405] Bump aws-sdk from 2.1095.0 to 2.1166.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1095.0 to 2.1166.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1095.0...v2.1166.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 408aa60eab4..dbe470bd572 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "@typescript-eslint/eslint-plugin": "^5.22.0",
     "@typescript-eslint/parser": "^5.15.0",
     "auto-dist-tag": "^2.1.1",
-    "aws-sdk": "^2.1095.0",
+    "aws-sdk": "^2.1166.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.0",
diff --git a/yarn.lock b/yarn.lock
index 1750886f734..bc43eb7c302 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2004,10 +2004,10 @@ auto-dist-tag@^2.1.1:
     pkg-up "^3.0.0"
     semver "^7.0.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.1095.0:
-  version "2.1095.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1095.0.tgz#7847493b09a326a0613010ed9db53302f760edf6"
-  integrity sha512-OrZq2pTDsnfOJYsAdRlw+NXTGLQYqWldSZR3HugW8JT4JPWyFZrgB2yPP2ElFHX+4J4SZg5QvkAXl/7s9gLTgA==
+aws-sdk@^2.0.9, aws-sdk@^2.1166.0:
+  version "2.1166.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1166.0.tgz#9bc5ceb3690d2747b941a2e2b8ebacfffb412f41"
+  integrity sha512-9CJQpMtIv2sxvwYTcMCfuCGU8t5qEppnvmo0uFFOm+1Q1uEv5sPg95wQH3Gfj4Mmv4FKWFofgTLksn0u2pDxsw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -2016,7 +2016,7 @@ aws-sdk@^2.0.9, aws-sdk@^2.1095.0:
     querystring "0.2.0"
     sax "1.2.1"
     url "0.10.3"
-    uuid "3.3.2"
+    uuid "8.0.0"
     xml2js "0.4.19"
 
 aws-sign2@~0.5.0:
@@ -10130,10 +10130,10 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
 
-uuid@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE= sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+uuid@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
+  integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
 uuid@^2.0.2:
   version "2.0.3"

From 6e4865d69c91cb896a3728f69abab231a22b2fdc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:03:53 +0000
Subject: [PATCH 1028/1405] Bump prettier from 2.6.0 to 2.7.1

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.0 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.6.0...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 408aa60eab4..54be3c3eab8 100644
--- a/package.json
+++ b/package.json
@@ -140,7 +140,7 @@
     "mkdirp": "^1.0.4",
     "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.0",
+    "prettier": "^2.7.1",
     "puppeteer": "^13.5.1",
     "qunit": "^2.18.1",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 1750886f734..276371ad7d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8138,10 +8138,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1, prettier@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
-  integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
+prettier@^2.5.1, prettier@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 pretty-ms@^3.1.0:
   version "3.1.0"

From f56f61116673e6f15e3cdcaa4253734e2a4a9cb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:06:47 +0000
Subject: [PATCH 1029/1405] Bump testem from 3.6.0 to 3.8.0

Bumps [testem](https://github.com/testem/testem) from 3.6.0 to 3.8.0.
- [Release notes](https://github.com/testem/testem/releases)
- [Commits](https://github.com/testem/testem/compare/v3.6.0...v3.8.0)

---
updated-dependencies:
- dependency-name: testem
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 237 +++++++++++++++++++++------------------------------
 2 files changed, 99 insertions(+), 140 deletions(-)

diff --git a/package.json b/package.json
index 408aa60eab4..3269909f3f8 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.2",
     "simple-dom": "^1.4.0",
-    "testem": "^3.6.0",
+    "testem": "^3.8.0",
     "testem-failure-only-reporter": "^1.0.0",
     "typescript": "~4.6.4"
   },
diff --git a/yarn.lock b/yarn.lock
index 1750886f734..49470a993dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1626,10 +1626,10 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-"@xmldom/xmldom@^0.7.1":
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.4.tgz#93b2f9486c88b6464e97f76c9ab49b0a548fbe57"
-  integrity sha512-wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw==
+"@xmldom/xmldom@^0.8.0":
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.2.tgz#b695ff674e8216efa632a3d36ad51ae9843380c0"
+  integrity sha512-+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ==
 
 abbrev@1:
   version "1.1.1"
@@ -1817,18 +1817,18 @@ anymatch@^3.1.1, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity "sha1-aALmJk79GMeQobDVF/DyYnvyyUo= sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
-  integrity "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0= sha512-QbMPI8teYlZBIBqDgmIWfDKO149dGtQV2ium8WniCaARFFRd1e+IES1LA4sSGcVTFdVL628+163WUbxev7R/aQ=="
+are-we-there-yet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    readable-stream "^3.6.0"
 
 argparse@^1.0.7, argparse@~1.0.2:
   version "1.0.10"
@@ -2307,10 +2307,10 @@ blank-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/blank-object/-/blank-object-1.0.2.tgz#f990793fbe9a8c8dd013fb3219420bec81d5f4b9"
   integrity sha1-+ZB5P76ajI3QE/syGUIL7IHV9Lk=
 
-bluebird@^3.1.1, bluebird@^3.4.6:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
-  integrity "sha1-2VUfnemPH82h5oPRfukaBgLuLrk= sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA=="
+bluebird@^3.4.6, bluebird@^3.7.2:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 blueimp-md5@^2.10.0:
   version "2.18.0"
@@ -3267,11 +3267,6 @@ coa@0.4.0:
   dependencies:
     q "~0.9.6"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="
-
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -3299,6 +3294,11 @@ color-name@^1.1.1, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -3395,7 +3395,7 @@ connect@^3.6.6:
     parseurl "~1.3.2"
     utils-merge "1.0.1"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
@@ -3411,12 +3411,12 @@ console-ui@^3.0.4, console-ui@^3.1.2:
     ora "^3.4.0"
     through2 "^3.0.1"
 
-consolidate@^0.15.1:
-  version "0.15.1"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
-  integrity "sha1-IasEMjXHGgfUXZqtmFk7DbpWurc= sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="
+consolidate@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
+  integrity sha512-Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ==
   dependencies:
-    bluebird "^3.1.1"
+    bluebird "^3.7.2"
 
 content-disposition@0.5.4:
   version "0.5.4"
@@ -5262,19 +5262,19 @@ functional-red-black-tree@^1.0.1:
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg=="
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -5579,7 +5579,7 @@ has-tostringtag@^1.0.0:
   dependencies:
     has-symbols "^1.0.2"
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
@@ -5865,7 +5865,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6058,13 +6058,6 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity "sha1-754xOG8DGn8NZDr4L95QxFfvAMs= sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -6257,7 +6250,7 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+isarray@1.0.0, isarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
@@ -7431,10 +7424,10 @@ ms@2.1.3, ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-mustache@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mustache/-/mustache-3.0.1.tgz#873855f23aa8a95b150fb96d9836edbc5a1d248a"
-  integrity "sha1-hzhV8jqoqVsVD7ltmDbtvFodJIo= sha512-jFI/4UVRsRYdUbuDTKT7KzfOp7FiD5WzYmmwNwXyUVypC0xjoTL78Fqc0jHUPIvvGD+6DQSPHIt1NE7D1ArsqA=="
+mustache@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
+  integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
 
 mute-stream@0.0.7:
   version "0.0.7"
@@ -7506,16 +7499,16 @@ node-modules-path@^1.0.0, node-modules-path@^1.0.1:
   resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8"
   integrity "sha1-QAlrCM560OoUaAhjr0ScfHWl0cg= sha512-DQTUnpUBWdRcLWJ/dKuYAXoTwofrIi2khgiwpNJ6Ce8JwLpcBWrm9ypOY307ta0o8nzcWwJf1RX7UWys6ahFlQ=="
 
-node-notifier@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-9.0.1.tgz#cea837f4c5e733936c7b9005e6545cea825d1af4"
-  integrity sha512-fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg==
+node-notifier@^10.0.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-10.0.1.tgz#0e82014a15a8456c4cfcdb25858750399ae5f1c7"
+  integrity sha512-YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==
   dependencies:
     growly "^1.3.0"
     is-wsl "^2.2.0"
-    semver "^7.3.2"
+    semver "^7.3.5"
     shellwords "^0.1.1"
-    uuid "^8.3.0"
+    uuid "^8.3.2"
     which "^2.0.2"
 
 node-releases@^2.0.1:
@@ -7615,20 +7608,15 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-npmlog@^4.0.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs= sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="
+npmlog@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
   dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
 
 oauth-sign@~0.3.0:
   version "0.3.0"
@@ -8161,11 +8149,6 @@ private@^0.1.8:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
-process-nextick-args@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
-  integrity "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o= sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
-
 process-relative-require@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
@@ -8377,7 +8360,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0:
+"readable-stream@2 || 3", readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity "sha1-M3u9o63AcGvT4CRCaihtS0sskZg= sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="
@@ -8386,19 +8369,6 @@ read-pkg@^5.2.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8= sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
 readable-stream@~1.0.2:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
@@ -8713,7 +8683,7 @@ rimraf@3.0.2, rimraf@^3.0.1, rimraf@^3.0.2:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+rimraf@^2.1.4, rimraf@^2.2.8, rimraf@^2.3.4, rimraf@^2.4.1, rimraf@^2.4.3, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -8830,7 +8800,7 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.2, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
@@ -8983,7 +8953,7 @@ serve-static@1.15.0, serve-static@^1.14.2:
     parseurl "~1.3.3"
     send "0.18.0"
 
-set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity "sha1-BF+XgtARrppoA93TgrJDkrPYkPc= sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
@@ -9073,6 +9043,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
+signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
 silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/silent-error/-/silent-error-1.1.1.tgz#f72af5b0d73682a2ba1778b7e32cd8aa7c2d8662"
@@ -9343,16 +9318,16 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0= sha512-Yptehjogou2xm4UJbxJ4CxgZx12HBfeystp0y3x7s4Dj32ltVVG1Gg8YhKjHZkHicuKpZX/ffilA8505VbUbpw=="
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0:
+string-width@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4= sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="
@@ -9360,15 +9335,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string.prototype.matchall@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da"
@@ -9420,13 +9386,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g= sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringify-object-es5@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/stringify-object-es5/-/stringify-object-es5-2.5.0.tgz#057c3c9a90a127339bb9d1704a290bb7bd0a1ec5"
@@ -9447,7 +9406,7 @@ strip-ansi@^2.0.1:
   dependencies:
     ansi-regex "^1.0.0"
 
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="
@@ -9650,18 +9609,18 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.6.0.tgz#bf5c86944bafd035c18f41f520195cce5eef33a8"
-  integrity sha512-sXwx2IlOadOhrKf0hsV1Yt/yuYhdfrtJ4dpp7T6pFN62GjMyKifjAv2SFm+4zYHee1JwxheO7JUL0+3iN0rlHw==
+testem@^3.0.0, testem@^3.6.0, testem@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.8.0.tgz#651aeddbd433ef55ecf7262f0e58b89e1dccb9ac"
+  integrity sha512-WEaFOq2ZGqM3IQji+Q2uXHGdln5upKhSZ1pLYe9W4CttDELAo588frNovk8UQmB+Xg2mDI8G2zmm7qKuWsldtw==
   dependencies:
-    "@xmldom/xmldom" "^0.7.1"
+    "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"
     bluebird "^3.4.6"
     charm "^1.0.0"
     commander "^2.6.0"
     compression "^1.7.4"
-    consolidate "^0.15.1"
+    consolidate "^0.16.0"
     execa "^1.0.0"
     express "^4.10.7"
     fireworm "^0.7.0"
@@ -9673,12 +9632,12 @@ testem@^3.0.0, testem@^3.6.0:
     lodash.clonedeep "^4.4.1"
     lodash.find "^4.5.1"
     lodash.uniqby "^4.7.0"
-    mkdirp "^0.5.1"
-    mustache "^3.0.0"
-    node-notifier "^9.0.1"
-    npmlog "^4.0.0"
+    mkdirp "^1.0.4"
+    mustache "^4.2.0"
+    node-notifier "^10.0.0"
+    npmlog "^6.0.0"
     printf "^0.6.1"
-    rimraf "^2.4.4"
+    rimraf "^3.0.2"
     socket.io "^4.1.2"
     spawn-args "^0.2.0"
     styled_string "0.0.1"
@@ -10120,7 +10079,7 @@ username-sync@^1.0.2:
   resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.2.tgz#0a3697909fb7b5768d29e2921f573acfdd427592"
   integrity sha512-ayNkOJdoNSGNDBE46Nkc+l6IXmeugbzahZLSMkwvgRWv5y5ZqNY2IrzcgmkR4z32sj1W3tM3TuTUMqkqBzO+RA==
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
@@ -10140,7 +10099,7 @@ uuid@^2.0.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
   integrity "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= sha512-FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg=="
 
-uuid@^8.3.0, uuid@^8.3.2:
+uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
@@ -10317,12 +10276,12 @@ which@^1.2.14, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc= sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="
+wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
-    string-width "^1.0.2 || 2"
+    string-width "^1.0.2 || 2 || 3 || 4"
 
 word-wrap@^1.2.3:
   version "1.2.3"

From 975fc93add54400a4b0103d38b097bb2b8851fc5 Mon Sep 17 00:00:00 2001
From: Nicole Chung <nicole.chung@gmail.com>
Date: Tue, 5 Jul 2022 20:33:00 -0400
Subject: [PATCH 1030/1405] [DOCS] add examples for yield

- add yield with hash helper
- add yield with hash and component helper
- add yield for multiple block parameters
- add yield with hash and component helper with attributes and args
---
 packages/@ember/-internals/glimmer/index.ts | 151 ++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index c4f5cc31ae3..4793e751c76 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -142,6 +142,157 @@
     First name: <input type="text" />
   </label>
   ```
+
+  `yield` can also be used with the `hash` helper:
+
+  ```app/templates/application.hbs
+  <DateRanges @value={{@model.date}} |range|>
+    Start date: {{range.start}}
+    End date: {{range.end}}
+  </DateRanges>
+  ```
+
+  ```app/components/date-ranges.hbs
+  <div>
+    {{yield (hash start=@value.start end=@value.end)}}
+  </div>
+  ```
+
+  Result:
+
+  ```html
+  <div>
+    Start Date: July 1st
+    End Date: July 30th
+  </div>
+  ```
+
+  Multiple values can be yielded as block params:
+
+  ```app/templates/application.hbs
+  <Banner @value={{@model}} |title subtitle body|>
+    <h1>{{title}}</h1>
+    <h2>{{subtitle}}</h2>
+    {{body}}
+  </Banner>
+  ```
+
+  ```app/components/Banner.hbs
+  <div>
+    {{yield "Hello title" "hello subtitle" "body text"}}
+  </div>
+  ```
+
+  Result:
+
+  ```html
+  <div>
+    <h1>Hello title</h1>
+    <h2>hello subtitle</h2>
+    body text
+  </div>
+  ```
+
+  However, it is preferred to use the hash helper, as this can prevent breaking changes to your component and also simplify the api for the component.
+
+  Multiple components can be yielded with the `hash` and `component` helper:
+
+  ```app/templates/application.hbs
+  <Banner @value={{@model}} |banner|>
+    <banner.Title>Banner title</banner.Title>
+    <banner.Subtitle>Banner subtitle</banner.Subtitle>
+    <banner.Body>A load of body text</banner.Body>
+  </Banner>
+  ```
+
+  ```app/components/banner.ts
+  import Title from './title';
+  import Subtitle from './subtitle';
+  import Body from './body';
+
+  export default class Banner extends Component {
+    Title = Title;
+    Subtitle = Subtitle;
+    Body = Body;
+  }
+  ```
+
+  ```app/components/banner.hbs
+  <div>
+    {{yield (hash
+      Title=this.Title
+      Subtitle=this.Subtitle
+      Body=(component this.Body defaultArg="some value")
+    )}}
+  </div>
+  ```
+
+  Result:
+
+  ```html
+  <div>
+    <h1>Banner title</h1>
+    <h2>Banner subtitle</h2>
+    A load of body text
+  </div>
+  ```
+
+  A benefit of using this pattern is that the user of the component can change the order the components are displayed.
+
+  ```app/templates/application.hbs
+  <Banner @value={{@model}} |banner|>
+    <banner.Subtitle>Banner subtitle</banner.Subtitle>
+    <banner.Title>Banner title</banner.Title>
+    <banner.Body>A load of body text</banner.Body>
+  </Banner>
+  ```
+
+  Result:
+
+  ```html
+  <div>
+    <h2>Banner subtitle</h2>
+    <h1>Banner title</h1>
+    A load of body text
+  </div>
+  ```
+
+  Another benefit to using `yield` with the `hash` and `component` helper
+  is you can pass attributes and arguments to these components:
+
+  ```app/templates/application.hbs
+  <Banner @value={{@model}} |banner|>
+    <banner.Subtitle class="mb-1">Banner subtitle</banner.Subtitle>
+    <banner.Title @variant="loud">Banner title</banner.Title>
+    <banner.Body>A load of body text</banner.Body>
+  </Banner>
+  ```
+
+  ```app/components/banner/subtitle.hbs
+  {{!-- note the use of ..attributes --}}
+  <div ...attributes>
+    {{yield}}
+  </div>
+  ```
+
+  ```app/components/banner/title.hbs
+  {{#if @variant "loud"}}
+      <h1 class="loud">{{yield}}</h1>
+  {{else}}
+      <h1 class="quiet">{{yield}}</h1>
+  {{/if}}
+  ```
+
+  Result:
+
+  ```html
+  <div>
+    <h2 class="mb-1">Banner subtitle</h2>
+    <h1 class="loud">Banner title</h1>
+    A load of body text
+  </div>
+  ```
+
   @method yield
   @for Ember.Templates.helpers
   @param {Hash} options

From a91f7ecacaebda9749f9586f25fc85eb166265d8 Mon Sep 17 00:00:00 2001
From: Nicole Chung <nicole.chung@gmail.com>
Date: Thu, 7 Jul 2022 17:48:02 -0400
Subject: [PATCH 1031/1405] [DOCS] add missing as keyword to yield examples

---
 packages/@ember/-internals/glimmer/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 4793e751c76..94c2ea1641d 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -146,7 +146,7 @@
   `yield` can also be used with the `hash` helper:
 
   ```app/templates/application.hbs
-  <DateRanges @value={{@model.date}} |range|>
+  <DateRanges @value={{@model.date}} as |range|>
     Start date: {{range.start}}
     End date: {{range.end}}
   </DateRanges>
@@ -170,7 +170,7 @@
   Multiple values can be yielded as block params:
 
   ```app/templates/application.hbs
-  <Banner @value={{@model}} |title subtitle body|>
+  <Banner @value={{@model}} as |title subtitle body|>
     <h1>{{title}}</h1>
     <h2>{{subtitle}}</h2>
     {{body}}
@@ -198,7 +198,7 @@
   Multiple components can be yielded with the `hash` and `component` helper:
 
   ```app/templates/application.hbs
-  <Banner @value={{@model}} |banner|>
+  <Banner @value={{@model}} as |banner|>
     <banner.Title>Banner title</banner.Title>
     <banner.Subtitle>Banner subtitle</banner.Subtitle>
     <banner.Body>A load of body text</banner.Body>
@@ -240,7 +240,7 @@
   A benefit of using this pattern is that the user of the component can change the order the components are displayed.
 
   ```app/templates/application.hbs
-  <Banner @value={{@model}} |banner|>
+  <Banner @value={{@model}} as |banner|>
     <banner.Subtitle>Banner subtitle</banner.Subtitle>
     <banner.Title>Banner title</banner.Title>
     <banner.Body>A load of body text</banner.Body>
@@ -261,7 +261,7 @@
   is you can pass attributes and arguments to these components:
 
   ```app/templates/application.hbs
-  <Banner @value={{@model}} |banner|>
+  <Banner @value={{@model}} as |banner|>
     <banner.Subtitle class="mb-1">Banner subtitle</banner.Subtitle>
     <banner.Title @variant="loud">Banner title</banner.Title>
     <banner.Body>A load of body text</banner.Body>

From e80113647ec9a0dfe4a82ebf80da578669183649 Mon Sep 17 00:00:00 2001
From: Nicole Chung <nicole.chung@gmail.com>
Date: Mon, 11 Jul 2022 21:41:25 -0400
Subject: [PATCH 1032/1405] [DOCS]: fix inconsistencies in yield example

---
 packages/@ember/-internals/glimmer/index.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 94c2ea1641d..4e686d3ef68 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -162,8 +162,8 @@
 
   ```html
   <div>
-    Start Date: July 1st
-    End Date: July 30th
+    Start date: July 1st
+    End date: July 30th
   </div>
   ```
 
@@ -177,7 +177,7 @@
   </Banner>
   ```
 
-  ```app/components/Banner.hbs
+  ```app/components/banner.hbs
   <div>
     {{yield "Hello title" "hello subtitle" "body text"}}
   </div>
@@ -205,10 +205,10 @@
   </Banner>
   ```
 
-  ```app/components/banner.ts
-  import Title from './title';
-  import Subtitle from './subtitle';
-  import Body from './body';
+  ```app/components/banner.js
+  import Title from './banner/title';
+  import Subtitle from './banner/subtitle';
+  import Body from './banner/body';
 
   export default class Banner extends Component {
     Title = Title;
@@ -270,13 +270,13 @@
 
   ```app/components/banner/subtitle.hbs
   {{!-- note the use of ..attributes --}}
-  <div ...attributes>
+  <h2 ...attributes>
     {{yield}}
-  </div>
+  </h2>
   ```
 
   ```app/components/banner/title.hbs
-  {{#if @variant "loud"}}
+  {{#if (eq @variant "loud")}}
       <h1 class="loud">{{yield}}</h1>
   {{else}}
       <h1 class="quiet">{{yield}}</h1>

From 45ef19af6c3c6f33811643f5f4a35d0243e3ee0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 09:00:00 +0000
Subject: [PATCH 1033/1405] Bump eslint-plugin-prettier from 4.0.0 to 4.2.1

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 4.0.0 to 4.2.1.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/compare/v4.0.0...v4.2.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 408aa60eab4..157a1ee48c7 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "eslint-plugin-ember-internal": "^2.0.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.13.0",
@@ -140,7 +140,7 @@
     "mkdirp": "^1.0.4",
     "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.0",
+    "prettier": "^2.7.1",
     "puppeteer": "^13.5.1",
     "qunit": "^2.18.1",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 1750886f734..92f6e3e3b63 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4399,10 +4399,10 @@ eslint-plugin-node@^11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
-  integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
+eslint-plugin-prettier@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -8138,10 +8138,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1, prettier@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
-  integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
+prettier@^2.5.1, prettier@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 pretty-ms@^3.1.0:
   version "3.1.0"

From 7741a620490d064a1bf2ae500bad410d86569dea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Jul 2022 09:00:11 +0000
Subject: [PATCH 1034/1405] Bump glob from 7.2.0 to 8.0.3

Bumps [glob](https://github.com/isaacs/node-glob) from 7.2.0 to 8.0.3.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v7.2.0...v8.0.3)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  4 ++--
 yarn.lock    | 33 +++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 408aa60eab4..774b3a70ba6 100644
--- a/package.json
+++ b/package.json
@@ -134,13 +134,13 @@
     "fs-extra": "^10.0.1",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
-    "glob": "^7.2.0",
+    "glob": "^8.0.3",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
     "mkdirp": "^1.0.4",
     "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.6.0",
+    "prettier": "^2.7.1",
     "puppeteer": "^13.5.1",
     "qunit": "^2.18.1",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 1750886f734..aea5df16363 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2377,6 +2377,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
@@ -5403,6 +5410,17 @@ glob@^5.0.10:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -7313,6 +7331,13 @@ minimatch@4.2.1:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.0.1:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -8138,10 +8163,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1, prettier@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
-  integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
+prettier@^2.5.1, prettier@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 pretty-ms@^3.1.0:
   version "3.1.0"

From cc699bd4cd50e808c1c0e95ac10cd60531541c3e Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 25 Jul 2022 13:05:16 -0400
Subject: [PATCH 1035/1405] Add v4.5.1 to CHANGELOG

(cherry picked from commit 6d34f631825acdf9cc0552a2e67b333b0be4445a)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8574879dedb..700b0d4b8b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@
 
 No new external changes.
 
+### v4.5.1 (July 25, 2022)
+
+- [#20120](https://github.com/emberjs/ember.js/pull/20120) [BUGFIX] Adjust uniqueId() implementation to only generate valid selectors.
+
 ### v4.5.0 (June 13, 2022)
 
 - [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).

From 6dbd66eaa82fafcbc443f4f00403deeb7c6f5230 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 25 Jul 2022 13:42:54 -0400
Subject: [PATCH 1036/1405] Add v4.6.0 to CHANGELOG

(cherry picked from commit 4cf212827e5454f1fa720ea0341f8e3c338106bf)
---
 CHANGELOG.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700b0d4b8b6..c3bd56d8eb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,8 @@
 # Ember Changelog
 
-### v4.6.0-beta.2 (June 27, 2022)
+### v4.6.0 (July 25, 2022)
 
 - [#20125](https://github.com/emberjs/ember.js/pull/20125) [BUGFIX] Replace deprecated substr() method with substring() method.
-- [#20120](https://github.com/emberjs/ember.js/pull/20120) [BUGFIX] Adjust uniqueId() implementation to only generate valid selectors.
-
-### v4.6.0-beta.1 (June 13, 2022)
-
-No new external changes.
 
 ### v4.5.1 (July 25, 2022)
 

From debe5f7be0ba6df5dfcee4082f10bee28b5f541c Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 25 Jul 2022 13:53:07 -0400
Subject: [PATCH 1037/1405] Add v4.7.0-beta.1 to CHANGELOG

(cherry picked from commit 92284956ad8008fa177666649db698e4fd82394e)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3bd56d8eb8..6829ad65afb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.7.0-beta.1 (July 25, 2022)
+
+- [#20126](https://github.com/emberjs/ember.js/pull/20126) [BUGFIX] Replacing Firefox detection that used a deprecated browser API
+
 ### v4.6.0 (July 25, 2022)
 
 - [#20125](https://github.com/emberjs/ember.js/pull/20125) [BUGFIX] Replace deprecated substr() method with substring() method.

From c021f21099213798722d489990d9d40f7b7d961b Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 25 Jul 2022 13:54:35 -0400
Subject: [PATCH 1038/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d86ebaa39fd..cd0405fcf77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.7.0-alpha.1",
+  "version": "4.8.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From f8145d9e2aa7eee857b7c456c5960877ef9e06a1 Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol.pieropan@gmail.com>
Date: Thu, 28 Jul 2022 00:33:21 +0200
Subject: [PATCH 1039/1405] [DOC] Enhancing the cached decorator documentation

---
 .../glimmer/lib/glimmer-tracking-docs.ts      | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
index 1b274bcba52..2d4e9e1f370 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
@@ -161,7 +161,7 @@
   are invalidated. This is useful when a getter is expensive and
   used very often.
 
-  For instance, in this GuestList class, we have the sortedGuests
+  For instance, in this `GuestList` class, we have the `sortedGuests`
   getter that sorts the guests alphabetically:
 
   ```javascript
@@ -176,11 +176,11 @@
     }
   ```
 
-  Every time sortedGuests is accessed, a new array will be created and sorted,
+  Every time `sortedGuests` is accessed, a new array will be created and sorted,
   because JavaScript getters do not cache by default. When the guest list
   is small, like the one in the example, this is not a problem. However, if
   the guest list were to grow very large, it would mean that we would be doing
-  a large amount of work each time we accessed sortedGetters. With @cached,
+  a large amount of work each time we accessed `sortedGuests`. With `@cached`,
   we can cache the value instead:
 
   ```javascript
@@ -196,43 +196,46 @@
     }
   ```
 
-  Now the sortedGuests getter will be cached based on autotracking.
+  Now the `sortedGuests` getter will be cached based on autotracking.
   It will only rerun and create a new sorted array when the guests tracked
   property is updated.
 
+
   ### Tradeoffs
 
   Overuse is discouraged.
 
   In general, you should avoid using `@cached` unless you have confirmed that
-  the getter you are decorating is computationally expensive. `@cached` adds
-  a small amount of overhead to the getter, making it more expensive.
-  While this overhead is small, if `@cached` is overused it can add up to a
-  large impact overall in your app. Many getters and tracked properties
-  are only accessed once, rendered, and then never rerendered, so adding
-  `@cached` when it is unnecessary can negatively impact performance.
+  the getter you are decorating is computationally expensive, since `@cached`
+  adds a small amount of overhead to the getter.
+  While the individual costs are small, a systematic use of the `@cached`
+  decorator can add up to a large impact overall in your app.
+  Many getters and tracked properties are only accessed once during rendering,
+  and then never rerendered, so adding `@cached` when unnecessary can
+  negatively impact performance.
 
   Also, `@cached` may rerun even if the values themselves have not changed,
-  since tracked properties will always invalidate even if their underlying
-  value did not change.
-  For example updating an integer value from `5` to an other `5`.
+  since tracked properties will always invalidate.
+  For example updating an integer value from `5` to an other `5` will trigger
+  a rerun of the cached properties building from this integer.
 
   Avoiding a cache invalidation in this case is not something that can
   be achieved on the `@cached` decorator itself, but rather when updating
-  the underlying values, by applying a diff checking mecanism:
+  the underlying tracked values, by applying some diff checking mecanisms:
 
   ```javascript
-  if (newValue !== this.trackedProp) {
-    this.trackedProp = newValue;
+  if (nextValue !== this.trackedProp) {
+    this.trackedProp = nextValue;
   }
   ```
 
-  Here equal values won't update the property, therefore not triggering a
-  cache invalidation.
+  Here equal values won't update the property, therefore not triggering
+  the subsequent cache invalidations of the `@cached` properties who were
+  using this `trackedProp`.
 
   The cost of these edge-guards adds up to the tradoff calculation of using
-  a caching strategy, hence requiring a very sensitive approach regarding
-  performance.
+  a caching strategy, hence requiring a very sensitive and moderate approach
+  regarding performance.
 
   @method cached
   @static

From 70c9c755d949203b5e40a1f5db53c6c0b8fa88c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 15:01:48 +0000
Subject: [PATCH 1040/1405] Bump eslint-plugin-import from 2.25.4 to 2.26.0

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.4 to 2.26.0.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.4...v2.26.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 51 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index cd0405fcf77..7398b220b15 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
     "eslint-plugin-ember-internal": "^2.0.0",
-    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.2.0",
diff --git a/yarn.lock b/yarn.lock
index f38f7b15aec..62ad610ada7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4344,10 +4344,10 @@ eslint-import-resolver-node@^0.3.6:
     debug "^3.2.7"
     resolve "^1.20.0"
 
-eslint-module-utils@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.2.tgz#1d0aa455dcf41052339b63cada8ab5fd57577129"
-  integrity sha512-zquepFnWCY2ISMFwD/DqzaM++H+7PDzOpUvotJWm/y1BAFt5R4oeULgdrTejKqLkz7MA/tgstsUMNYc7wNdTrg==
+eslint-module-utils@^2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
+  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
   dependencies:
     debug "^3.2.7"
     find-up "^2.1.0"
@@ -4375,24 +4375,24 @@ eslint-plugin-es@^3.0.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.25.4:
-  version "2.25.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
-  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
+eslint-plugin-import@^2.26.0:
+  version "2.26.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
+  integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==
   dependencies:
     array-includes "^3.1.4"
     array.prototype.flat "^1.2.5"
     debug "^2.6.9"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.2"
+    eslint-module-utils "^2.7.3"
     has "^1.0.3"
-    is-core-module "^2.8.0"
+    is-core-module "^2.8.1"
     is-glob "^4.0.3"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     object.values "^1.1.5"
-    resolve "^1.20.0"
-    tsconfig-paths "^3.12.0"
+    resolve "^1.22.0"
+    tsconfig-paths "^3.14.1"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -6010,7 +6010,7 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1:
+is-core-module@^2.5.0, is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
   integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
@@ -7310,10 +7310,10 @@ mini-css-extract-plugin@^2.5.2:
   dependencies:
     schema-utils "^4.0.0"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
@@ -7350,6 +7350,11 @@ minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+
 minipass@^2.2.0:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
@@ -9843,14 +9848,14 @@ trim-newlines@^3.0.0:
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-tsconfig-paths@^3.12.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
-  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
+tsconfig-paths@^3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
+  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
   dependencies:
     "@types/json5" "^0.0.29"
     json5 "^1.0.1"
-    minimist "^1.2.0"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
 tslib@^1.8.1, tslib@^1.9.0:

From e48181a646a3584afd9138af81132371d76ab1fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Aug 2022 15:02:11 +0000
Subject: [PATCH 1041/1405] Bump qunit and @types/qunit

Bumps [qunit](https://github.com/qunitjs/qunit) and [@types/qunit](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qunit). These dependencies needed to be updated together.

Updates `qunit` from 2.18.1 to 2.19.1
- [Release notes](https://github.com/qunitjs/qunit/releases)
- [Changelog](https://github.com/qunitjs/qunit/blob/main/History.md)
- [Commits](https://github.com/qunitjs/qunit/compare/2.18.1...2.19.1)

Updates `@types/qunit` from 2.11.3 to 2.19.2
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qunit)

---
updated-dependencies:
- dependency-name: qunit
  dependency-type: direct:development
  update-type: version-update:semver-minor
- dependency-name: "@types/qunit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  4 ++--
 yarn.lock    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index cd0405fcf77..2a9958352bd 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "@glimmer/runtime": "0.84.2",
     "@glimmer/validator": "0.84.2",
     "@simple-dom/document": "^1.4.0",
-    "@types/qunit": "^2.11.3",
+    "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.22.0",
     "@typescript-eslint/parser": "^5.15.0",
@@ -142,7 +142,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "puppeteer": "^13.5.1",
-    "qunit": "^2.18.1",
+    "qunit": "^2.19.1",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
diff --git a/yarn.lock b/yarn.lock
index f38f7b15aec..bce0f9ae7f6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1457,10 +1457,10 @@
   resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
-"@types/qunit@^2.11.3":
-  version "2.11.3"
-  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.3.tgz#2900adb58eee250c96b2d33a923cc4eae70d72ba"
-  integrity sha512-UF/4jDehcpRlMXzKXi2Z59Id48/uYlMeUDhYdjFrVVwy30Eud/e60Ok3yVjSPlHprafj3B315uFTrF6eqQTeSw==
+"@types/qunit@^2.19.2":
+  version "2.19.2"
+  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.19.2.tgz#81404b3c8349594ef25964d532363cd917e60180"
+  integrity sha512-hVOSrAcRtRY2R2iCQopzkiSy6BowuSFuR5llHE9R3FDxBCNP4bMdrPpxkE0jZTknn+cmFMT31RfbZWAdu5Qa1w==
 
 "@types/range-parser@*":
   version "1.2.4"
@@ -8308,10 +8308,10 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8:
     rimraf "^2.5.4"
     underscore.string "~3.3.4"
 
-qunit@^2.18.1:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.18.1.tgz#9e90e7798216f7275c351c88652816d491391397"
-  integrity sha512-A2Adgr/DeMQOJZFVllyQi2wiGJVVXGSRRwMe39fNfuuftUYHHpGRTWUhBa8wNblunCAOUCt+1uFcg1L7NaxQTA==
+qunit@^2.19.1:
+  version "2.19.1"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.1.tgz#eb1afd188da9e47f07c13aa70461a1d9c4505490"
+  integrity sha512-gSGuw0vErE/rNjnlBW/JmE7NNubBlGrDPQvsug32ejYhcVFuZec9yoU0+C30+UgeCGwq6Ap89K65dMGo+kDGZQ==
   dependencies:
     commander "7.2.0"
     node-watch "0.7.3"

From b02fdf8be73d9e3ca2cf72ef447cebe348cfd195 Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol.pieropan@gmail.com>
Date: Sat, 6 Aug 2022 08:56:39 +0200
Subject: [PATCH 1042/1405] Update
 packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts

Co-authored-by: NullVoxPopuli <LPSego3+dev@gmail.com>
---
 packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
index 2d4e9e1f370..30949fc9389 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
@@ -221,7 +221,7 @@
 
   Avoiding a cache invalidation in this case is not something that can
   be achieved on the `@cached` decorator itself, but rather when updating
-  the underlying tracked values, by applying some diff checking mecanisms:
+  the underlying tracked values, by applying some diff checking mechanisms:
 
   ```javascript
   if (nextValue !== this.trackedProp) {

From a7e29887c7698796958c7902a5c53d1f21997d25 Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol.pieropan@gmail.com>
Date: Sat, 6 Aug 2022 09:42:28 +0200
Subject: [PATCH 1043/1405] [DOC] Enhancing the cached decorator documentation

---
 .../@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
index 30949fc9389..20113578f64 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
@@ -233,6 +233,11 @@
   the subsequent cache invalidations of the `@cached` properties who were
   using this `trackedProp`.
 
+  As a reminder, do not use this piece of code inside a tracked getter,
+  as the dependency chain could lead to an infinite loop. Mutating an adjacent
+  property from a getter is not a good practice anyway, even with a caching
+  mechanism reducing reruns.
+
   The cost of these edge-guards adds up to the tradoff calculation of using
   a caching strategy, hence requiring a very sensitive and moderate approach
   regarding performance.

From fc5570310ba2a39725d857ef04ec79edf48d8c3a Mon Sep 17 00:00:00 2001
From: Jarek Radosz <jradosz@gmail.com>
Date: Thu, 18 Aug 2022 13:12:53 +0200
Subject: [PATCH 1044/1405] [DOC] `renderSettled` docs were referring to
 `rerender`

I believe this was incorrect?

Alternatively that whole sentence could go.
---
 packages/@ember/renderer/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/renderer/index.ts b/packages/@ember/renderer/index.ts
index b8bd548bb40..f7a77a88e8a 100644
--- a/packages/@ember/renderer/index.ts
+++ b/packages/@ember/renderer/index.ts
@@ -19,7 +19,7 @@
     `await settled()` in that location, but in some contexts you don't want to
     wait for full settledness (which includes test waiters, pending AJAX/fetch,
     run loops, etc) but instead only want to know when that updated value has
-    been rendered in the DOM. **THAT** is what `await rerender()` is _perfect_
+    been rendered in the DOM. **THAT** is what `await renderSettled()` is _perfect_
     for.
   @method renderSettled
   @returns {Promise<void>} a promise which fulfills when rendering has completed

From 75d556ff87ea8a4e802ab31e3683ffb37ffea9c1 Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol@metrio.net>
Date: Mon, 22 Aug 2022 14:19:44 +0200
Subject: [PATCH 1045/1405] [DOC] Enhancing the cached decorator documentation

Co-authored-by: Geordan Neukum <gneukum1@gmail.com>
---
 packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
index 20113578f64..1380a28fa9d 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
@@ -238,7 +238,7 @@
   property from a getter is not a good practice anyway, even with a caching
   mechanism reducing reruns.
 
-  The cost of these edge-guards adds up to the tradoff calculation of using
+  The cost of these edge-guards adds up to the trad-off calculation of using
   a caching strategy, hence requiring a very sensitive and moderate approach
   regarding performance.
 

From 4f27a5d5c664d6c85eaadb2aac33358576b681c7 Mon Sep 17 00:00:00 2001
From: Aurelien 'Sol' Pieropan <sol@metrio.net>
Date: Mon, 22 Aug 2022 16:59:47 +0200
Subject: [PATCH 1046/1405] [DOC] Enhancing the cached decorator documentation

Co-authored-by: Geordan Neukum <gneukum1@gmail.com>
---
 packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
index 1380a28fa9d..2729fcd3b5a 100644
--- a/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
+++ b/packages/@ember/-internals/glimmer/lib/glimmer-tracking-docs.ts
@@ -238,7 +238,7 @@
   property from a getter is not a good practice anyway, even with a caching
   mechanism reducing reruns.
 
-  The cost of these edge-guards adds up to the trad-off calculation of using
+  The cost of these edge-guards adds up to the trade-off calculation of using
   a caching strategy, hence requiring a very sensitive and moderate approach
   regarding performance.
 

From 11d051a5f960a518fe20f2f2f4134ad99767bca3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 09:19:35 -0700
Subject: [PATCH 1047/1405] Clean up @ember/application

---
 packages/@ember/application/index.ts          | 1215 ++++++++++++++++-
 packages/@ember/application/instance.ts       |    2 +-
 .../@ember/application/lib/application.ts     | 1213 ----------------
 3 files changed, 1214 insertions(+), 1216 deletions(-)
 delete mode 100644 packages/@ember/application/lib/application.ts

diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index ade603041c6..dbb04cb731f 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -1,3 +1,1214 @@
+/**
+@module @ember/application
+*/
+
 export { getOwner, setOwner } from '@ember/-internals/owner';
-export { onLoad, runLoadHooks, _loaded } from './lib/lazy_load';
-export { default } from './lib/application';
+import { dictionary } from '@ember/-internals/utils';
+import { ENV } from '@ember/-internals/environment';
+import { hasDOM } from '@ember/-internals/browser-environment';
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { join, once, run, schedule } from '@ember/runloop';
+import { libraries } from '@ember/-internals/metal';
+import { _loaded, onLoad, runLoadHooks } from './lib/lazy_load';
+import { RSVP } from '@ember/-internals/runtime';
+import { EventDispatcher } from '@ember/-internals/views';
+import {
+  Route,
+  Router,
+  HashLocation,
+  HistoryLocation,
+  AutoLocation,
+  NoneLocation,
+  BucketCache,
+} from '@ember/-internals/routing';
+import type { BootOptions } from '@ember/application/instance';
+import ApplicationInstance from '@ember/application/instance';
+import Engine, { buildInitializerMethod } from '@ember/engine';
+import type { Container, Registry } from '@ember/-internals/container';
+import { privatize as P } from '@ember/-internals/container';
+import { setupApplicationRegistry } from '@ember/-internals/glimmer';
+import { RouterService } from '@ember/-internals/routing';
+import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
+
+/**
+  An instance of `Application` is the starting point for every Ember
+  application. It instantiates, initializes and coordinates the
+  objects that make up your app.
+
+  Each Ember app has one and only one `Application` object. Although
+  Ember CLI creates this object implicitly, the `Application` class
+  is defined in the `app/app.js`. You can define a `ready` method on the
+  `Application` class, which will be run by Ember when the application is
+  initialized.
+
+  ```app/app.js
+  export default class App extends Application {
+    ready() {
+      // your code here
+    }
+  }
+  ```
+
+  Because `Application` ultimately inherits from `Ember.Namespace`, any classes
+  you create will have useful string representations when calling `toString()`.
+  See the `Ember.Namespace` documentation for more information.
+
+  While you can think of your `Application` as a container that holds the
+  other classes in your application, there are several other responsibilities
+  going on under-the-hood that you may want to understand. It is also important
+  to understand that an `Application` is different from an `ApplicationInstance`.
+  Refer to the Guides to understand the difference between these.
+
+  ### Event Delegation
+
+  Ember uses a technique called _event delegation_. This allows the framework
+  to set up a global, shared event listener instead of requiring each view to
+  do it manually. For example, instead of each view registering its own
+  `mousedown` listener on its associated element, Ember sets up a `mousedown`
+  listener on the `body`.
+
+  If a `mousedown` event occurs, Ember will look at the target of the event and
+  start walking up the DOM node tree, finding corresponding views and invoking
+  their `mouseDown` method as it goes.
+
+  `Application` has a number of default events that it listens for, as
+  well as a mapping from lowercase events to camel-cased view method names. For
+  example, the `keypress` event causes the `keyPress` method on the view to be
+  called, the `dblclick` event causes `doubleClick` to be called, and so on.
+
+  If there is a bubbling browser event that Ember does not listen for by
+  default, you can specify custom events and their corresponding view method
+  names by setting the application's `customEvents` property:
+
+  ```app/app.js
+  import Application from '@ember/application';
+
+  export default class App extends Application {
+    customEvents = {
+      // add support for the paste event
+      paste: 'paste'
+    }
+  }
+  ```
+
+  To prevent Ember from setting up a listener for a default event,
+  specify the event name with a `null` value in the `customEvents`
+  property:
+
+  ```app/app.js
+  import Application from '@ember/application';
+
+  export default class App extends Application {
+    customEvents = {
+      // prevent listeners for mouseenter/mouseleave events
+      mouseenter: null,
+      mouseleave: null
+    }
+  }
+  ```
+
+  By default, the application sets up these event listeners on the document
+  body. However, in cases where you are embedding an Ember application inside
+  an existing page, you may want it to set up the listeners on an element
+  inside the body.
+
+  For example, if only events inside a DOM element with the ID of `ember-app`
+  should be delegated, set your application's `rootElement` property:
+
+  ```app/app.js
+  import Application from '@ember/application';
+
+  export default class App extends Application {
+    rootElement = '#ember-app'
+  }
+  ```
+
+  The `rootElement` can be either a DOM element or a CSS selector
+  string. Note that *views appended to the DOM outside the root element will
+  not receive events.* If you specify a custom root element, make sure you only
+  append views inside it!
+
+  To learn more about the events Ember components use, see
+
+  [components/handling-events](https://guides.emberjs.com/release/components/handling-events/#toc_event-names).
+
+  ### Initializers
+
+  To add behavior to the Application's boot process, you can define initializers in
+  the `app/initializers` directory, or with `ember generate initializer` using Ember CLI.
+  These files should export a named `initialize` function which will receive the created `application`
+  object as its first argument.
+
+  ```javascript
+  export function initialize(application) {
+    // application.inject('route', 'foo', 'service:foo');
+  }
+  ```
+
+  Application initializers can be used for a variety of reasons including:
+
+  - setting up external libraries
+  - injecting dependencies
+  - setting up event listeners in embedded apps
+  - deferring the boot process using the `deferReadiness` and `advanceReadiness` APIs.
+
+  ### Routing
+
+  In addition to creating your application's router, `Application` is
+  also responsible for telling the router when to start routing. Transitions
+  between routes can be logged with the `LOG_TRANSITIONS` flag, and more
+  detailed intra-transition logging can be logged with
+  the `LOG_TRANSITIONS_INTERNAL` flag:
+
+  ```javascript
+  import Application from '@ember/application';
+
+  let App = Application.create({
+    LOG_TRANSITIONS: true, // basic logging of successful transitions
+    LOG_TRANSITIONS_INTERNAL: true // detailed logging of all routing steps
+  });
+  ```
+
+  By default, the router will begin trying to translate the current URL into
+  application state once the browser emits the `DOMContentReady` event. If you
+  need to defer routing, you can call the application's `deferReadiness()`
+  method. Once routing can begin, call the `advanceReadiness()` method.
+
+  If there is any setup required before routing begins, you can implement a
+  `ready()` method on your app that will be invoked immediately before routing
+  begins.
+
+  @class Application
+  @extends Engine
+  @public
+*/
+
+class Application extends Engine {
+  /**
+    This creates a registry with the default Ember naming conventions.
+
+    It also configures the registry:
+
+    * registered views are created every time they are looked up (they are
+      not singletons)
+    * registered templates are not factories; the registered value is
+      returned directly.
+    * the router receives the application as its `namespace` property
+    * all controllers receive the router as their `target` and `controllers`
+      properties
+    * all controllers receive the application as their `namespace` property
+    * the application view receives the application controller as its
+      `controller` property
+    * the application view receives the application template as its
+      `defaultTemplate` property
+
+    @method buildRegistry
+    @static
+    @param {Application} namespace the application for which to
+      build the registry
+    @return {Ember.Registry} the built registry
+    @private
+  */
+  static buildRegistry(namespace: Application) {
+    let registry = super.buildRegistry(namespace);
+
+    commonSetupRegistry(registry);
+
+    setupApplicationRegistry(registry);
+
+    return registry;
+  }
+
+  static initializer = buildInitializerMethod<'initializers', Application>(
+    'initializers',
+    'initializer'
+  );
+
+  static instanceInitializer = buildInitializerMethod<'instanceInitializers', ApplicationInstance>(
+    'instanceInitializers',
+    'instance initializer'
+  );
+
+  /**
+    The root DOM element of the Application. This can be specified as an
+    element or a [selector string](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors#reference_table_of_selectors).
+
+    This is the element that will be passed to the Application's,
+    `eventDispatcher`, which sets up the listeners for event delegation. Every
+    view in your application should be a child of the element you specify here.
+
+    @property rootElement
+    @type DOMElement
+    @default 'body'
+    @public
+  */
+  declare rootElement: SimpleElement | Element | string;
+
+  /**
+
+    @property _document
+    @type Document | null
+    @default 'window.document'
+    @private
+  */
+  declare _document: SimpleDocument | Document | null;
+
+  /**
+    The `Ember.EventDispatcher` responsible for delegating events to this
+    application's views.
+
+    The event dispatcher is created by the application at initialization time
+    and sets up event listeners on the DOM element described by the
+    application's `rootElement` property.
+
+    See the documentation for `Ember.EventDispatcher` for more information.
+
+    @property eventDispatcher
+    @type Ember.EventDispatcher
+    @default null
+    @public
+  */
+  declare eventDispatcher: EventDispatcher | null;
+
+  /**
+    The DOM events for which the event dispatcher should listen.
+
+    By default, the application's `Ember.EventDispatcher` listens
+    for a set of standard DOM events, such as `mousedown` and
+    `keyup`, and delegates them to your application's `Ember.View`
+    instances.
+
+    If you would like additional bubbling events to be delegated to your
+    views, set your `Application`'s `customEvents` property
+    to a hash containing the DOM event name as the key and the
+    corresponding view method name as the value. Setting an event to
+    a value of `null` will prevent a default event listener from being
+    added for that event.
+
+    To add new events to be listened to:
+
+    ```app/app.js
+    import Application from '@ember/application';
+
+    let App = Application.extend({
+      customEvents: {
+        // add support for the paste event
+        paste: 'paste'
+      }
+    });
+    ```
+
+    To prevent default events from being listened to:
+
+    ```app/app.js
+    import Application from '@ember/application';
+
+    let App = Application.extend({
+      customEvents: {
+        // remove support for mouseenter / mouseleave events
+        mouseenter: null,
+        mouseleave: null
+      }
+    });
+    ```
+    @property customEvents
+    @type Object
+    @default null
+    @public
+  */
+  declare customEvents: Record<string, string | null> | null;
+
+  /**
+    Whether the application should automatically start routing and render
+    templates to the `rootElement` on DOM ready. While default by true,
+    other environments such as FastBoot or a testing harness can set this
+    property to `false` and control the precise timing and behavior of the boot
+    process.
+
+    @property autoboot
+    @type Boolean
+    @default true
+    @private
+  */
+  declare autoboot: boolean;
+
+  /**
+    Whether the application should be configured for the legacy "globals mode".
+    Under this mode, the Application object serves as a global namespace for all
+    classes.
+
+    ```javascript
+    import Application from '@ember/application';
+    import Component from '@ember/component';
+
+    let App = Application.create({
+      ...
+    });
+
+    App.Router.reopen({
+      location: 'none'
+    });
+
+    App.Router.map({
+      ...
+    });
+
+    App.MyComponent = Component.extend({
+      ...
+    });
+    ```
+
+    This flag also exposes other internal APIs that assumes the existence of
+    a special "default instance", like `App.__container__.lookup(...)`.
+
+    This option is currently not configurable, its value is derived from
+    the `autoboot` flag – disabling `autoboot` also implies opting-out of
+    globals mode support, although they are ultimately orthogonal concerns.
+
+    Some of the global modes features are already deprecated in 1.x. The
+    existence of this flag is to untangle the globals mode code paths from
+    the autoboot code paths, so that these legacy features can be reviewed
+    for deprecation/removal separately.
+
+    Forcing the (autoboot=true, _globalsMode=false) here and running the tests
+    would reveal all the places where we are still relying on these legacy
+    behavior internally (mostly just tests).
+
+    @property _globalsMode
+    @type Boolean
+    @default true
+    @private
+  */
+  declare _globalsMode: boolean;
+
+  /**
+    An array of application instances created by `buildInstance()`. Used
+    internally to ensure that all instances get destroyed.
+
+    @property _applicationInstances
+    @type Array
+    @private
+  */
+  declare _applicationInstances: Set<ApplicationInstance>;
+
+  declare _readinessDeferrals: number;
+
+  declare _booted: boolean;
+
+  init(properties: object | undefined) {
+    super.init(properties);
+
+    this.rootElement ??= 'body';
+    this._document ??= null;
+    this.eventDispatcher ??= null;
+    this.customEvents ??= null;
+    this.autoboot ??= true;
+    this._document ??= hasDOM ? window.document : null;
+    this._globalsMode ??= true;
+
+    if (DEBUG) {
+      if (ENV.LOG_VERSION) {
+        // we only need to see this once per Application#init
+        ENV.LOG_VERSION = false;
+        libraries.logVersions?.();
+      }
+    }
+
+    // Start off the number of deferrals at 1. This will be decremented by
+    // the Application's own `boot` method.
+    this._readinessDeferrals = 1;
+    this._booted = false;
+    this._applicationInstances = new Set();
+
+    this.autoboot = this._globalsMode = Boolean(this.autoboot);
+
+    if (this._globalsMode) {
+      this._prepareForGlobalsMode();
+    }
+
+    if (this.autoboot) {
+      this.waitForDOMReady();
+    }
+  }
+
+  /**
+    Create an ApplicationInstance for this application.
+
+    @public
+    @method buildInstance
+    @return {ApplicationInstance} the application instance
+  */
+  buildInstance(options: EngineInstanceOptions = {}): ApplicationInstance {
+    assert(
+      'You cannot build new instances of this application since it has already been destroyed',
+      !this.isDestroyed
+    );
+
+    assert(
+      'You cannot build new instances of this application since it is being destroyed',
+      !this.isDestroying
+    );
+
+    return ApplicationInstance.create({
+      ...options,
+      base: this,
+      application: this,
+    });
+  }
+
+  /**
+    Start tracking an ApplicationInstance for this application.
+    Used when the ApplicationInstance is created.
+
+    @private
+    @method _watchInstance
+  */
+  _watchInstance(instance: ApplicationInstance): void {
+    this._applicationInstances.add(instance);
+  }
+
+  /**
+    Stop tracking an ApplicationInstance for this application.
+    Used when the ApplicationInstance is about to be destroyed.
+
+    @private
+    @method _unwatchInstance
+  */
+  _unwatchInstance(instance: ApplicationInstance) {
+    return this._applicationInstances.delete(instance);
+  }
+
+  Router?: typeof Router;
+
+  /**
+    Enable the legacy globals mode by allowing this application to act
+    as a global namespace. See the docs on the `_globalsMode` property
+    for details.
+
+    Most of these features are already deprecated in 1.x, so we can
+    stop using them internally and try to remove them.
+
+    @private
+    @method _prepareForGlobalsMode
+  */
+  _prepareForGlobalsMode(): void {
+    // Create subclass of Router for this Application instance.
+    // This is to ensure that someone reopening `App.Router` does not
+    // tamper with the default `Router`.
+    this.Router = (this.Router || Router).extend() as typeof Router;
+
+    this._buildDeprecatedInstance();
+  }
+
+  __deprecatedInstance__?: ApplicationInstance;
+  __container__?: Container;
+
+  /*
+    Build the deprecated instance for legacy globals mode support.
+    Called when creating and resetting the application.
+
+    This is orthogonal to autoboot: the deprecated instance needs to
+    be created at Application construction (not boot) time to expose
+    App.__container__. If autoboot sees that this instance exists,
+    it will continue booting it to avoid doing unncessary work (as
+    opposed to building a new instance at boot time), but they are
+    otherwise unrelated.
+
+    @private
+    @method _buildDeprecatedInstance
+  */
+  _buildDeprecatedInstance(): void {
+    // Build a default instance
+    let instance = this.buildInstance();
+
+    // Legacy support for App.__container__ and other global methods
+    // on App that rely on a single, default instance.
+    this.__deprecatedInstance__ = instance;
+    this.__container__ = instance.__container__;
+  }
+
+  /**
+    Automatically kick-off the boot process for the application once the
+    DOM has become ready.
+
+    The initialization itself is scheduled on the actions queue which
+    ensures that code-loading finishes before booting.
+
+    If you are asynchronously loading code, you should call `deferReadiness()`
+    to defer booting, and then call `advanceReadiness()` once all of your code
+    has finished loading.
+
+    @private
+    @method waitForDOMReady
+  */
+  waitForDOMReady(): void {
+    const document = this._document;
+
+    // SAFETY: Casting as Document should be safe since we're just reading a property.
+    // If it's not actually a Document then it will evaluate false which is fine for our
+    // purposes.
+    if (document === null || (document as Document).readyState !== 'loading') {
+      schedule('actions', this, this.domReady);
+    } else {
+      // Ideally we'd just check `document instanceof Document` but currently some tests pass a fake document.
+      assert(
+        '[BUG] Called waitForDOMReady with an invalid document',
+        (function (d: SimpleDocument | Document): d is Document {
+          return typeof (d as Document).removeEventListener === 'function';
+        })(document)
+      );
+
+      let callback = () => {
+        document.removeEventListener('DOMContentLoaded', callback);
+        run(this, this.domReady);
+      };
+
+      document.addEventListener('DOMContentLoaded', callback);
+    }
+  }
+
+  /**
+    This is the autoboot flow:
+
+    1. Boot the app by calling `this.boot()`
+    2. Create an instance (or use the `__deprecatedInstance__` in globals mode)
+    3. Boot the instance by calling `instance.boot()`
+    4. Invoke the `App.ready()` callback
+    5. Kick-off routing on the instance
+
+    Ideally, this is all we would need to do:
+
+    ```javascript
+    _autoBoot() {
+      this.boot().then(() => {
+        let instance = (this._globalsMode) ? this.__deprecatedInstance__ : this.buildInstance();
+        return instance.boot();
+      }).then((instance) => {
+        App.ready();
+        instance.startRouting();
+      });
+    }
+    ```
+
+    Unfortunately, we cannot actually write this because we need to participate
+    in the "synchronous" boot process. While the code above would work fine on
+    the initial boot (i.e. DOM ready), when `App.reset()` is called, we need to
+    boot a new instance synchronously (see the documentation on `_bootSync()`
+    for details).
+
+    Because of this restriction, the actual logic of this method is located
+    inside `didBecomeReady()`.
+
+    @private
+    @method domReady
+  */
+  domReady(): void {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    this._bootSync();
+
+    // Continues to `didBecomeReady`
+  }
+
+  /**
+    Use this to defer readiness until some condition is true.
+
+    Example:
+
+    ```javascript
+    import Application from '@ember/application';
+
+    let App = Application.create();
+
+    App.deferReadiness();
+
+    fetch('/auth-token')
+    .then(response => response.json())
+    .then(data => {
+      App.token = data.token;
+      App.advanceReadiness();
+    });
+    ```
+
+    This allows you to perform asynchronous setup logic and defer
+    booting your application until the setup has finished.
+
+    However, if the setup requires a loading UI, it might be better
+    to use the router for this purpose.
+
+    @method deferReadiness
+    @public
+  */
+  deferReadiness(): void {
+    assert(
+      'You must call deferReadiness on an instance of Application',
+      this instanceof Application
+    );
+
+    assert('You cannot defer readiness since application has already destroyed', !this.isDestroyed);
+
+    assert(
+      'You cannot defer readiness since the application is being destroyed',
+      !this.isDestroying
+    );
+
+    assert(
+      'You cannot defer readiness since the `ready()` hook has already been called',
+      this._readinessDeferrals > 0
+    );
+
+    this._readinessDeferrals++;
+  }
+
+  /**
+    Call `advanceReadiness` after any asynchronous setup logic has completed.
+    Each call to `deferReadiness` must be matched by a call to `advanceReadiness`
+    or the application will never become ready and routing will not begin.
+
+    @method advanceReadiness
+    @see {Application#deferReadiness}
+    @public
+  */
+  advanceReadiness() {
+    assert(
+      'You must call advanceReadiness on an instance of Application',
+      this instanceof Application
+    );
+
+    assert(
+      'You cannot advance readiness since application has already destroyed',
+      !this.isDestroyed
+    );
+
+    assert(
+      'You cannot advance readiness since the application is being destroyed',
+      !this.isDestroying
+    );
+
+    assert(
+      'You cannot advance readiness since the `ready()` hook has already been called',
+      this._readinessDeferrals > 0
+    );
+
+    this._readinessDeferrals--;
+
+    if (this._readinessDeferrals === 0) {
+      once(this, this.didBecomeReady);
+    }
+  }
+
+  _bootPromise: Promise<this> | null = null;
+
+  /**
+    Initialize the application and return a promise that resolves with the `Application`
+    object when the boot process is complete.
+
+    Run any application initializers and run the application load hook. These hooks may
+    choose to defer readiness. For example, an authentication hook might want to defer
+    readiness until the auth token has been retrieved.
+
+    By default, this method is called automatically on "DOM ready"; however, if autoboot
+    is disabled, this is automatically called when the first application instance is
+    created via `visit`.
+
+    @public
+    @method boot
+    @return {Promise<Application,Error>}
+  */
+  boot(): Promise<this> {
+    assert(
+      'You cannot boot this application since it has already been destroyed',
+      !this.isDestroyed
+    );
+
+    assert('You cannot boot this application since it is being destroyed', !this.isDestroying);
+
+    if (this._bootPromise) {
+      return this._bootPromise;
+    }
+
+    try {
+      this._bootSync();
+    } catch (_) {
+      // Ignore the error: in the asynchronous boot path, the error is already reflected
+      // in the promise rejection
+    }
+
+    assert('has boot promise', this._bootPromise);
+
+    return this._bootPromise;
+  }
+
+  _bootResolver: ReturnType<typeof RSVP['defer']> | null = null;
+
+  /**
+    Unfortunately, a lot of existing code assumes the booting process is
+    "synchronous". Specifically, a lot of tests assumes the last call to
+    `app.advanceReadiness()` or `app.reset()` will result in the app being
+    fully-booted when the current runloop completes.
+
+    We would like new code (like the `visit` API) to stop making this assumption,
+    so we created the asynchronous version above that returns a promise. But until
+    we have migrated all the code, we would have to expose this method for use
+    *internally* in places where we need to boot an app "synchronously".
+
+    @private
+  */
+  _bootSync() {
+    if (this._booted || this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    // Even though this returns synchronously, we still need to make sure the
+    // boot promise exists for book-keeping purposes: if anything went wrong in
+    // the boot process, we need to store the error as a rejection on the boot
+    // promise so that a future caller of `boot()` can tell what failed.
+    let defer = (this._bootResolver = RSVP.defer());
+    this._bootPromise = defer.promise as Promise<this>;
+
+    try {
+      this.runInitializers();
+      runLoadHooks('application', this);
+      this.advanceReadiness();
+      // Continues to `didBecomeReady`
+    } catch (error) {
+      // For the asynchronous boot path
+      defer.reject(error);
+
+      // For the synchronous boot path
+      throw error;
+    }
+  }
+
+  /**
+    Reset the application. This is typically used only in tests. It cleans up
+    the application in the following order:
+
+    1. Deactivate existing routes
+    2. Destroy all objects in the container
+    3. Create a new application container
+    4. Re-route to the existing url
+
+    Typical Example:
+
+    ```javascript
+    import Application from '@ember/application';
+    let App;
+
+    run(function() {
+      App = Application.create();
+    });
+
+    module('acceptance test', {
+      setup: function() {
+        App.reset();
+      }
+    });
+
+    test('first test', function() {
+      // App is freshly reset
+    });
+
+    test('second test', function() {
+      // App is again freshly reset
+    });
+    ```
+
+    Advanced Example:
+
+    Occasionally you may want to prevent the app from initializing during
+    setup. This could enable extra configuration, or enable asserting prior
+    to the app becoming ready.
+
+    ```javascript
+    import Application from '@ember/application';
+    let App;
+
+    run(function() {
+      App = Application.create();
+    });
+
+    module('acceptance test', {
+      setup: function() {
+        run(function() {
+          App.reset();
+          App.deferReadiness();
+        });
+      }
+    });
+
+    test('first test', function() {
+      ok(true, 'something before app is initialized');
+
+      run(function() {
+        App.advanceReadiness();
+      });
+
+      ok(true, 'something after app is initialized');
+    });
+    ```
+
+    @method reset
+    @public
+  */
+  reset() {
+    assert(
+      'You cannot reset this application since it has already been destroyed',
+      !this.isDestroyed
+    );
+
+    assert('You cannot reset this application since it is being destroyed', !this.isDestroying);
+
+    assert(
+      `Calling reset() on instances of \`Application\` is not
+            supported when globals mode is disabled; call \`visit()\` to
+            create new \`ApplicationInstance\`s and dispose them
+            via their \`destroy()\` method instead.`,
+      this._globalsMode && this.autoboot
+    );
+
+    let instance = this.__deprecatedInstance__;
+
+    this._readinessDeferrals = 1;
+    this._bootPromise = null;
+    this._bootResolver = null;
+    this._booted = false;
+
+    function handleReset(this: Application) {
+      assert('expected instance', instance);
+      run(instance, 'destroy');
+      this._buildDeprecatedInstance();
+      schedule('actions', this, '_bootSync');
+    }
+
+    join(this, handleReset);
+  }
+
+  /**
+    @private
+    @method didBecomeReady
+  */
+  didBecomeReady() {
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    assert('expected _bootResolver', this._bootResolver);
+
+    try {
+      // TODO: Is this still needed for _globalsMode = false?
+
+      // See documentation on `_autoboot()` for details
+      if (this.autoboot) {
+        let instance;
+
+        if (this._globalsMode) {
+          // If we already have the __deprecatedInstance__ lying around, boot it to
+          // avoid unnecessary work
+          instance = this.__deprecatedInstance__;
+          assert('expected instance', instance);
+        } else {
+          // Otherwise, build an instance and boot it. This is currently unreachable,
+          // because we forced _globalsMode to === autoboot; but having this branch
+          // allows us to locally toggle that flag for weeding out legacy globals mode
+          // dependencies independently
+          instance = this.buildInstance();
+        }
+
+        instance._bootSync();
+
+        // TODO: App.ready() is not called when autoboot is disabled, is this correct?
+        this.ready();
+
+        instance.startRouting();
+      }
+
+      // For the asynchronous boot path
+      this._bootResolver.resolve(this);
+
+      // For the synchronous boot path
+      this._booted = true;
+    } catch (error) {
+      // For the asynchronous boot path
+      this._bootResolver.reject(error);
+
+      // For the synchronous boot path
+      throw error;
+    }
+  }
+
+  /**
+    Called when the Application has become ready, immediately before routing
+    begins. The call will be delayed until the DOM has become ready.
+
+    @event ready
+    @public
+  */
+  ready() {
+    return this;
+  }
+
+  // This method must be moved to the application instance object
+  willDestroy() {
+    super.willDestroy();
+
+    if (_loaded['application'] === this) {
+      _loaded['application'] = undefined;
+    }
+
+    if (this._applicationInstances.size) {
+      this._applicationInstances.forEach((i) => i.destroy());
+      this._applicationInstances.clear();
+    }
+  }
+
+  /**
+    Boot a new instance of `ApplicationInstance` for the current
+    application and navigate it to the given `url`. Returns a `Promise` that
+    resolves with the instance when the initial routing and rendering is
+    complete, or rejects with any error that occurred during the boot process.
+
+    When `autoboot` is disabled, calling `visit` would first cause the
+    application to boot, which runs the application initializers.
+
+    This method also takes a hash of boot-time configuration options for
+    customizing the instance's behavior. See the documentation on
+    `ApplicationInstance.BootOptions` for details.
+
+    `ApplicationInstance.BootOptions` is an interface class that exists
+    purely to document the available options; you do not need to construct it
+    manually. Simply pass a regular JavaScript object containing of the
+    desired options:
+
+    ```javascript
+    MyApp.visit("/", { location: "none", rootElement: "#container" });
+    ```
+
+    ### Supported Scenarios
+
+    While the `BootOptions` class exposes a large number of knobs, not all
+    combinations of them are valid; certain incompatible combinations might
+    result in unexpected behavior.
+
+    For example, booting the instance in the full browser environment
+    while specifying a foreign `document` object (e.g. `{ isBrowser: true,
+    document: iframe.contentDocument }`) does not work correctly today,
+    largely due to Ember's jQuery dependency.
+
+    Currently, there are three officially supported scenarios/configurations.
+    Usages outside of these scenarios are not guaranteed to work, but please
+    feel free to file bug reports documenting your experience and any issues
+    you encountered to help expand support.
+
+    #### Browser Applications (Manual Boot)
+
+    The setup is largely similar to how Ember works out-of-the-box. Normally,
+    Ember will boot a default instance for your Application on "DOM ready".
+    However, you can customize this behavior by disabling `autoboot`.
+
+    For example, this allows you to render a miniture demo of your application
+    into a specific area on your marketing website:
+
+    ```javascript
+    import MyApp from 'my-app';
+
+    $(function() {
+      let App = MyApp.create({ autoboot: false });
+
+      let options = {
+        // Override the router's location adapter to prevent it from updating
+        // the URL in the address bar
+        location: 'none',
+
+        // Override the default `rootElement` on the app to render into a
+        // specific `div` on the page
+        rootElement: '#demo'
+      };
+
+      // Start the app at the special demo URL
+      App.visit('/demo', options);
+    });
+    ```
+
+    Or perhaps you might want to boot two instances of your app on the same
+    page for a split-screen multiplayer experience:
+
+    ```javascript
+    import MyApp from 'my-app';
+
+    $(function() {
+      let App = MyApp.create({ autoboot: false });
+
+      let sessionId = MyApp.generateSessionID();
+
+      let player1 = App.visit(`/matches/join?name=Player+1&session=${sessionId}`, { rootElement: '#left', location: 'none' });
+      let player2 = App.visit(`/matches/join?name=Player+2&session=${sessionId}`, { rootElement: '#right', location: 'none' });
+
+      Promise.all([player1, player2]).then(() => {
+        // Both apps have completed the initial render
+        $('#loading').fadeOut();
+      });
+    });
+    ```
+
+    Do note that each app instance maintains their own registry/container, so
+    they will run in complete isolation by default.
+
+    #### Server-Side Rendering (also known as FastBoot)
+
+    This setup allows you to run your Ember app in a server environment using
+    Node.js and render its content into static HTML for SEO purposes.
+
+    ```javascript
+    const HTMLSerializer = new SimpleDOM.HTMLSerializer(SimpleDOM.voidMap);
+
+    function renderURL(url) {
+      let dom = new SimpleDOM.Document();
+      let rootElement = dom.body;
+      let options = { isBrowser: false, document: dom, rootElement: rootElement };
+
+      return MyApp.visit(options).then(instance => {
+        try {
+          return HTMLSerializer.serialize(rootElement.firstChild);
+        } finally {
+          instance.destroy();
+        }
+      });
+    }
+    ```
+
+    In this scenario, because Ember does not have access to a global `document`
+    object in the Node.js environment, you must provide one explicitly. In practice,
+    in the non-browser environment, the stand-in `document` object only needs to
+    implement a limited subset of the full DOM API. The `SimpleDOM` library is known
+    to work.
+
+    Since there is no DOM access in the non-browser environment, you must also
+    specify a DOM `Element` object in the same `document` for the `rootElement` option
+    (as opposed to a selector string like `"body"`).
+
+    See the documentation on the `isBrowser`, `document` and `rootElement` properties
+    on `ApplicationInstance.BootOptions` for details.
+
+    #### Server-Side Resource Discovery
+
+    This setup allows you to run the routing layer of your Ember app in a server
+    environment using Node.js and completely disable rendering. This allows you
+    to simulate and discover the resources (i.e. AJAX requests) needed to fulfill
+    a given request and eagerly "push" these resources to the client.
+
+    ```app/initializers/network-service.js
+    import BrowserNetworkService from 'app/services/network/browser';
+    import NodeNetworkService from 'app/services/network/node';
+
+    // Inject a (hypothetical) service for abstracting all AJAX calls and use
+    // the appropriate implementation on the client/server. This also allows the
+    // server to log all the AJAX calls made during a particular request and use
+    // that for resource-discovery purpose.
+
+    export function initialize(application) {
+      if (window) { // browser
+        application.register('service:network', BrowserNetworkService);
+      } else { // node
+        application.register('service:network', NodeNetworkService);
+      }
+    };
+
+    export default {
+      name: 'network-service',
+      initialize: initialize
+    };
+    ```
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+    import { service } from '@ember/service';
+
+    // An example of how the (hypothetical) service is used in routes.
+
+    export default class IndexRoute extends Route {
+      @service network;
+
+      model(params) {
+        return this.network.fetch(`/api/posts/${params.post_id}.json`);
+      }
+
+      afterModel(post) {
+        if (post.isExternalContent) {
+          return this.network.fetch(`/api/external/?url=${post.externalURL}`);
+        } else {
+          return post;
+        }
+      }
+    }
+    ```
+
+    ```javascript
+    // Finally, put all the pieces together
+
+    function discoverResourcesFor(url) {
+      return MyApp.visit(url, { isBrowser: false, shouldRender: false }).then(instance => {
+        let networkService = instance.lookup('service:network');
+        return networkService.requests; // => { "/api/posts/123.json": "..." }
+      });
+    }
+    ```
+
+    @public
+    @method visit
+    @param url {String} The initial URL to navigate to
+    @param options {ApplicationInstance.BootOptions}
+    @return {Promise<ApplicationInstance, Error>}
+  */
+  visit(url: string, options: BootOptions) {
+    assert(
+      'You cannot visit this application since it has already been destroyed',
+      !this.isDestroyed
+    );
+
+    assert('You cannot visit this application since it is being destroyed', !this.isDestroying);
+
+    return this.boot().then(() => {
+      let instance = this.buildInstance();
+
+      return instance
+        .boot(options)
+        .then(() => instance.visit(url))
+        .catch((error) => {
+          run(instance, 'destroy');
+          throw error;
+        });
+    });
+  }
+}
+
+function commonSetupRegistry(registry: Registry) {
+  registry.register('router:main', Router);
+  registry.register('-view-registry:main', {
+    create() {
+      return dictionary(null);
+    },
+  });
+
+  registry.register('route:basic', Route);
+  registry.register('event_dispatcher:main', EventDispatcher);
+
+  registry.register('location:auto', AutoLocation);
+  registry.register('location:hash', HashLocation);
+  registry.register('location:history', HistoryLocation);
+  registry.register('location:none', NoneLocation);
+
+  registry.register(P`-bucket-cache:main`, {
+    create() {
+      return new BucketCache();
+    },
+  });
+
+  registry.register('service:router', RouterService);
+}
+
+export { Application as default, _loaded, onLoad, runLoadHooks };
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index 5667822c0f9..7af9c082788 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -5,7 +5,7 @@
 import { get, set } from '@ember/-internals/metal';
 import * as environment from '@ember/-internals/browser-environment';
 import EngineInstance from '@ember/engine/instance';
-import type Application from './lib/application';
+import type Application from '@ember/application';
 import { renderSettled } from '@ember/-internals/glimmer';
 import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
 import { assert } from '@ember/debug';
diff --git a/packages/@ember/application/lib/application.ts b/packages/@ember/application/lib/application.ts
deleted file mode 100644
index 7d42637ae18..00000000000
--- a/packages/@ember/application/lib/application.ts
+++ /dev/null
@@ -1,1213 +0,0 @@
-/**
-@module @ember/application
-*/
-
-import { dictionary } from '@ember/-internals/utils';
-import { ENV } from '@ember/-internals/environment';
-import { hasDOM } from '@ember/-internals/browser-environment';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import { join, once, run, schedule } from '@ember/runloop';
-import { libraries } from '@ember/-internals/metal';
-import { _loaded, runLoadHooks } from './lazy_load';
-import { RSVP } from '@ember/-internals/runtime';
-import { EventDispatcher } from '@ember/-internals/views';
-import {
-  Route,
-  Router,
-  HashLocation,
-  HistoryLocation,
-  AutoLocation,
-  NoneLocation,
-  BucketCache,
-} from '@ember/-internals/routing';
-import type { BootOptions } from '../instance';
-import ApplicationInstance from '../instance';
-import Engine, { buildInitializerMethod } from '@ember/engine';
-import type { Container, Registry } from '@ember/-internals/container';
-import { privatize as P } from '@ember/-internals/container';
-import { setupApplicationRegistry } from '@ember/-internals/glimmer';
-import { RouterService } from '@ember/-internals/routing';
-import type { EngineInstanceOptions } from '@ember/engine/instance';
-import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
-
-/**
-  An instance of `Application` is the starting point for every Ember
-  application. It instantiates, initializes and coordinates the
-  objects that make up your app.
-
-  Each Ember app has one and only one `Application` object. Although
-  Ember CLI creates this object implicitly, the `Application` class
-  is defined in the `app/app.js`. You can define a `ready` method on the
-  `Application` class, which will be run by Ember when the application is
-  initialized.
-
-  ```app/app.js
-  export default class App extends Application {
-    ready() {
-      // your code here
-    }
-  }
-  ```
-
-  Because `Application` ultimately inherits from `Ember.Namespace`, any classes
-  you create will have useful string representations when calling `toString()`.
-  See the `Ember.Namespace` documentation for more information.
-
-  While you can think of your `Application` as a container that holds the
-  other classes in your application, there are several other responsibilities
-  going on under-the-hood that you may want to understand. It is also important
-  to understand that an `Application` is different from an `ApplicationInstance`.
-  Refer to the Guides to understand the difference between these.
-
-  ### Event Delegation
-
-  Ember uses a technique called _event delegation_. This allows the framework
-  to set up a global, shared event listener instead of requiring each view to
-  do it manually. For example, instead of each view registering its own
-  `mousedown` listener on its associated element, Ember sets up a `mousedown`
-  listener on the `body`.
-
-  If a `mousedown` event occurs, Ember will look at the target of the event and
-  start walking up the DOM node tree, finding corresponding views and invoking
-  their `mouseDown` method as it goes.
-
-  `Application` has a number of default events that it listens for, as
-  well as a mapping from lowercase events to camel-cased view method names. For
-  example, the `keypress` event causes the `keyPress` method on the view to be
-  called, the `dblclick` event causes `doubleClick` to be called, and so on.
-
-  If there is a bubbling browser event that Ember does not listen for by
-  default, you can specify custom events and their corresponding view method
-  names by setting the application's `customEvents` property:
-
-  ```app/app.js
-  import Application from '@ember/application';
-
-  export default class App extends Application {
-    customEvents = {
-      // add support for the paste event
-      paste: 'paste'
-    }
-  }
-  ```
-
-  To prevent Ember from setting up a listener for a default event,
-  specify the event name with a `null` value in the `customEvents`
-  property:
-
-  ```app/app.js
-  import Application from '@ember/application';
-
-  export default class App extends Application {
-    customEvents = {
-      // prevent listeners for mouseenter/mouseleave events
-      mouseenter: null,
-      mouseleave: null
-    }
-  }
-  ```
-
-  By default, the application sets up these event listeners on the document
-  body. However, in cases where you are embedding an Ember application inside
-  an existing page, you may want it to set up the listeners on an element
-  inside the body.
-
-  For example, if only events inside a DOM element with the ID of `ember-app`
-  should be delegated, set your application's `rootElement` property:
-
-  ```app/app.js
-  import Application from '@ember/application';
-
-  export default class App extends Application {
-    rootElement = '#ember-app'
-  }
-  ```
-
-  The `rootElement` can be either a DOM element or a CSS selector
-  string. Note that *views appended to the DOM outside the root element will
-  not receive events.* If you specify a custom root element, make sure you only
-  append views inside it!
-
-  To learn more about the events Ember components use, see
-
-  [components/handling-events](https://guides.emberjs.com/release/components/handling-events/#toc_event-names).
-
-  ### Initializers
-
-  To add behavior to the Application's boot process, you can define initializers in
-  the `app/initializers` directory, or with `ember generate initializer` using Ember CLI.
-  These files should export a named `initialize` function which will receive the created `application`
-  object as its first argument.
-
-  ```javascript
-  export function initialize(application) {
-    // application.inject('route', 'foo', 'service:foo');
-  }
-  ```
-
-  Application initializers can be used for a variety of reasons including:
-
-  - setting up external libraries
-  - injecting dependencies
-  - setting up event listeners in embedded apps
-  - deferring the boot process using the `deferReadiness` and `advanceReadiness` APIs.
-
-  ### Routing
-
-  In addition to creating your application's router, `Application` is
-  also responsible for telling the router when to start routing. Transitions
-  between routes can be logged with the `LOG_TRANSITIONS` flag, and more
-  detailed intra-transition logging can be logged with
-  the `LOG_TRANSITIONS_INTERNAL` flag:
-
-  ```javascript
-  import Application from '@ember/application';
-
-  let App = Application.create({
-    LOG_TRANSITIONS: true, // basic logging of successful transitions
-    LOG_TRANSITIONS_INTERNAL: true // detailed logging of all routing steps
-  });
-  ```
-
-  By default, the router will begin trying to translate the current URL into
-  application state once the browser emits the `DOMContentReady` event. If you
-  need to defer routing, you can call the application's `deferReadiness()`
-  method. Once routing can begin, call the `advanceReadiness()` method.
-
-  If there is any setup required before routing begins, you can implement a
-  `ready()` method on your app that will be invoked immediately before routing
-  begins.
-
-  @class Application
-  @extends Engine
-  @public
-*/
-
-class Application extends Engine {
-  /**
-    This creates a registry with the default Ember naming conventions.
-
-    It also configures the registry:
-
-    * registered views are created every time they are looked up (they are
-      not singletons)
-    * registered templates are not factories; the registered value is
-      returned directly.
-    * the router receives the application as its `namespace` property
-    * all controllers receive the router as their `target` and `controllers`
-      properties
-    * all controllers receive the application as their `namespace` property
-    * the application view receives the application controller as its
-      `controller` property
-    * the application view receives the application template as its
-      `defaultTemplate` property
-
-    @method buildRegistry
-    @static
-    @param {Application} namespace the application for which to
-      build the registry
-    @return {Ember.Registry} the built registry
-    @private
-  */
-  static buildRegistry(namespace: Application) {
-    let registry = super.buildRegistry(namespace);
-
-    commonSetupRegistry(registry);
-
-    setupApplicationRegistry(registry);
-
-    return registry;
-  }
-
-  static initializer = buildInitializerMethod<'initializers', Application>(
-    'initializers',
-    'initializer'
-  );
-
-  static instanceInitializer = buildInitializerMethod<'instanceInitializers', ApplicationInstance>(
-    'instanceInitializers',
-    'instance initializer'
-  );
-
-  /**
-    The root DOM element of the Application. This can be specified as an
-    element or a [selector string](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors#reference_table_of_selectors).
-
-    This is the element that will be passed to the Application's,
-    `eventDispatcher`, which sets up the listeners for event delegation. Every
-    view in your application should be a child of the element you specify here.
-
-    @property rootElement
-    @type DOMElement
-    @default 'body'
-    @public
-  */
-  declare rootElement: SimpleElement | Element | string;
-
-  /**
-
-    @property _document
-    @type Document | null
-    @default 'window.document'
-    @private
-  */
-  declare _document: SimpleDocument | Document | null;
-
-  /**
-    The `Ember.EventDispatcher` responsible for delegating events to this
-    application's views.
-
-    The event dispatcher is created by the application at initialization time
-    and sets up event listeners on the DOM element described by the
-    application's `rootElement` property.
-
-    See the documentation for `Ember.EventDispatcher` for more information.
-
-    @property eventDispatcher
-    @type Ember.EventDispatcher
-    @default null
-    @public
-  */
-  declare eventDispatcher: EventDispatcher | null;
-
-  /**
-    The DOM events for which the event dispatcher should listen.
-
-    By default, the application's `Ember.EventDispatcher` listens
-    for a set of standard DOM events, such as `mousedown` and
-    `keyup`, and delegates them to your application's `Ember.View`
-    instances.
-
-    If you would like additional bubbling events to be delegated to your
-    views, set your `Application`'s `customEvents` property
-    to a hash containing the DOM event name as the key and the
-    corresponding view method name as the value. Setting an event to
-    a value of `null` will prevent a default event listener from being
-    added for that event.
-
-    To add new events to be listened to:
-
-    ```app/app.js
-    import Application from '@ember/application';
-
-    let App = Application.extend({
-      customEvents: {
-        // add support for the paste event
-        paste: 'paste'
-      }
-    });
-    ```
-
-    To prevent default events from being listened to:
-
-    ```app/app.js
-    import Application from '@ember/application';
-
-    let App = Application.extend({
-      customEvents: {
-        // remove support for mouseenter / mouseleave events
-        mouseenter: null,
-        mouseleave: null
-      }
-    });
-    ```
-    @property customEvents
-    @type Object
-    @default null
-    @public
-  */
-  declare customEvents: Record<string, string | null> | null;
-
-  /**
-    Whether the application should automatically start routing and render
-    templates to the `rootElement` on DOM ready. While default by true,
-    other environments such as FastBoot or a testing harness can set this
-    property to `false` and control the precise timing and behavior of the boot
-    process.
-
-    @property autoboot
-    @type Boolean
-    @default true
-    @private
-  */
-  declare autoboot: boolean;
-
-  /**
-    Whether the application should be configured for the legacy "globals mode".
-    Under this mode, the Application object serves as a global namespace for all
-    classes.
-
-    ```javascript
-    import Application from '@ember/application';
-    import Component from '@ember/component';
-
-    let App = Application.create({
-      ...
-    });
-
-    App.Router.reopen({
-      location: 'none'
-    });
-
-    App.Router.map({
-      ...
-    });
-
-    App.MyComponent = Component.extend({
-      ...
-    });
-    ```
-
-    This flag also exposes other internal APIs that assumes the existence of
-    a special "default instance", like `App.__container__.lookup(...)`.
-
-    This option is currently not configurable, its value is derived from
-    the `autoboot` flag – disabling `autoboot` also implies opting-out of
-    globals mode support, although they are ultimately orthogonal concerns.
-
-    Some of the global modes features are already deprecated in 1.x. The
-    existence of this flag is to untangle the globals mode code paths from
-    the autoboot code paths, so that these legacy features can be reviewed
-    for deprecation/removal separately.
-
-    Forcing the (autoboot=true, _globalsMode=false) here and running the tests
-    would reveal all the places where we are still relying on these legacy
-    behavior internally (mostly just tests).
-
-    @property _globalsMode
-    @type Boolean
-    @default true
-    @private
-  */
-  declare _globalsMode: boolean;
-
-  /**
-    An array of application instances created by `buildInstance()`. Used
-    internally to ensure that all instances get destroyed.
-
-    @property _applicationInstances
-    @type Array
-    @private
-  */
-  declare _applicationInstances: Set<ApplicationInstance>;
-
-  declare _readinessDeferrals: number;
-
-  declare _booted: boolean;
-
-  init(properties: object | undefined) {
-    super.init(properties);
-
-    this.rootElement ??= 'body';
-    this._document ??= null;
-    this.eventDispatcher ??= null;
-    this.customEvents ??= null;
-    this.autoboot ??= true;
-    this._document ??= hasDOM ? window.document : null;
-    this._globalsMode ??= true;
-
-    if (DEBUG) {
-      if (ENV.LOG_VERSION) {
-        // we only need to see this once per Application#init
-        ENV.LOG_VERSION = false;
-        libraries.logVersions?.();
-      }
-    }
-
-    // Start off the number of deferrals at 1. This will be decremented by
-    // the Application's own `boot` method.
-    this._readinessDeferrals = 1;
-    this._booted = false;
-    this._applicationInstances = new Set();
-
-    this.autoboot = this._globalsMode = Boolean(this.autoboot);
-
-    if (this._globalsMode) {
-      this._prepareForGlobalsMode();
-    }
-
-    if (this.autoboot) {
-      this.waitForDOMReady();
-    }
-  }
-
-  /**
-    Create an ApplicationInstance for this application.
-
-    @public
-    @method buildInstance
-    @return {ApplicationInstance} the application instance
-  */
-  buildInstance(options: EngineInstanceOptions = {}): ApplicationInstance {
-    assert(
-      'You cannot build new instances of this application since it has already been destroyed',
-      !this.isDestroyed
-    );
-
-    assert(
-      'You cannot build new instances of this application since it is being destroyed',
-      !this.isDestroying
-    );
-
-    return ApplicationInstance.create({
-      ...options,
-      base: this,
-      application: this,
-    });
-  }
-
-  /**
-    Start tracking an ApplicationInstance for this application.
-    Used when the ApplicationInstance is created.
-
-    @private
-    @method _watchInstance
-  */
-  _watchInstance(instance: ApplicationInstance): void {
-    this._applicationInstances.add(instance);
-  }
-
-  /**
-    Stop tracking an ApplicationInstance for this application.
-    Used when the ApplicationInstance is about to be destroyed.
-
-    @private
-    @method _unwatchInstance
-  */
-  _unwatchInstance(instance: ApplicationInstance) {
-    return this._applicationInstances.delete(instance);
-  }
-
-  Router?: typeof Router;
-
-  /**
-    Enable the legacy globals mode by allowing this application to act
-    as a global namespace. See the docs on the `_globalsMode` property
-    for details.
-
-    Most of these features are already deprecated in 1.x, so we can
-    stop using them internally and try to remove them.
-
-    @private
-    @method _prepareForGlobalsMode
-  */
-  _prepareForGlobalsMode(): void {
-    // Create subclass of Router for this Application instance.
-    // This is to ensure that someone reopening `App.Router` does not
-    // tamper with the default `Router`.
-    this.Router = (this.Router || Router).extend() as typeof Router;
-
-    this._buildDeprecatedInstance();
-  }
-
-  __deprecatedInstance__?: ApplicationInstance;
-  __container__?: Container;
-
-  /*
-    Build the deprecated instance for legacy globals mode support.
-    Called when creating and resetting the application.
-
-    This is orthogonal to autoboot: the deprecated instance needs to
-    be created at Application construction (not boot) time to expose
-    App.__container__. If autoboot sees that this instance exists,
-    it will continue booting it to avoid doing unncessary work (as
-    opposed to building a new instance at boot time), but they are
-    otherwise unrelated.
-
-    @private
-    @method _buildDeprecatedInstance
-  */
-  _buildDeprecatedInstance(): void {
-    // Build a default instance
-    let instance = this.buildInstance();
-
-    // Legacy support for App.__container__ and other global methods
-    // on App that rely on a single, default instance.
-    this.__deprecatedInstance__ = instance;
-    this.__container__ = instance.__container__;
-  }
-
-  /**
-    Automatically kick-off the boot process for the application once the
-    DOM has become ready.
-
-    The initialization itself is scheduled on the actions queue which
-    ensures that code-loading finishes before booting.
-
-    If you are asynchronously loading code, you should call `deferReadiness()`
-    to defer booting, and then call `advanceReadiness()` once all of your code
-    has finished loading.
-
-    @private
-    @method waitForDOMReady
-  */
-  waitForDOMReady(): void {
-    const document = this._document;
-
-    // SAFETY: Casting as Document should be safe since we're just reading a property.
-    // If it's not actually a Document then it will evaluate false which is fine for our
-    // purposes.
-    if (document === null || (document as Document).readyState !== 'loading') {
-      schedule('actions', this, this.domReady);
-    } else {
-      // Ideally we'd just check `document instanceof Document` but currently some tests pass a fake document.
-      assert(
-        '[BUG] Called waitForDOMReady with an invalid document',
-        (function (d: SimpleDocument | Document): d is Document {
-          return typeof (d as Document).removeEventListener === 'function';
-        })(document)
-      );
-
-      let callback = () => {
-        document.removeEventListener('DOMContentLoaded', callback);
-        run(this, this.domReady);
-      };
-
-      document.addEventListener('DOMContentLoaded', callback);
-    }
-  }
-
-  /**
-    This is the autoboot flow:
-
-    1. Boot the app by calling `this.boot()`
-    2. Create an instance (or use the `__deprecatedInstance__` in globals mode)
-    3. Boot the instance by calling `instance.boot()`
-    4. Invoke the `App.ready()` callback
-    5. Kick-off routing on the instance
-
-    Ideally, this is all we would need to do:
-
-    ```javascript
-    _autoBoot() {
-      this.boot().then(() => {
-        let instance = (this._globalsMode) ? this.__deprecatedInstance__ : this.buildInstance();
-        return instance.boot();
-      }).then((instance) => {
-        App.ready();
-        instance.startRouting();
-      });
-    }
-    ```
-
-    Unfortunately, we cannot actually write this because we need to participate
-    in the "synchronous" boot process. While the code above would work fine on
-    the initial boot (i.e. DOM ready), when `App.reset()` is called, we need to
-    boot a new instance synchronously (see the documentation on `_bootSync()`
-    for details).
-
-    Because of this restriction, the actual logic of this method is located
-    inside `didBecomeReady()`.
-
-    @private
-    @method domReady
-  */
-  domReady(): void {
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    this._bootSync();
-
-    // Continues to `didBecomeReady`
-  }
-
-  /**
-    Use this to defer readiness until some condition is true.
-
-    Example:
-
-    ```javascript
-    import Application from '@ember/application';
-
-    let App = Application.create();
-
-    App.deferReadiness();
-
-    fetch('/auth-token')
-    .then(response => response.json())
-    .then(data => {
-      App.token = data.token;
-      App.advanceReadiness();
-    });
-    ```
-
-    This allows you to perform asynchronous setup logic and defer
-    booting your application until the setup has finished.
-
-    However, if the setup requires a loading UI, it might be better
-    to use the router for this purpose.
-
-    @method deferReadiness
-    @public
-  */
-  deferReadiness(): void {
-    assert(
-      'You must call deferReadiness on an instance of Application',
-      this instanceof Application
-    );
-
-    assert('You cannot defer readiness since application has already destroyed', !this.isDestroyed);
-
-    assert(
-      'You cannot defer readiness since the application is being destroyed',
-      !this.isDestroying
-    );
-
-    assert(
-      'You cannot defer readiness since the `ready()` hook has already been called',
-      this._readinessDeferrals > 0
-    );
-
-    this._readinessDeferrals++;
-  }
-
-  /**
-    Call `advanceReadiness` after any asynchronous setup logic has completed.
-    Each call to `deferReadiness` must be matched by a call to `advanceReadiness`
-    or the application will never become ready and routing will not begin.
-
-    @method advanceReadiness
-    @see {Application#deferReadiness}
-    @public
-  */
-  advanceReadiness() {
-    assert(
-      'You must call advanceReadiness on an instance of Application',
-      this instanceof Application
-    );
-
-    assert(
-      'You cannot advance readiness since application has already destroyed',
-      !this.isDestroyed
-    );
-
-    assert(
-      'You cannot advance readiness since the application is being destroyed',
-      !this.isDestroying
-    );
-
-    assert(
-      'You cannot advance readiness since the `ready()` hook has already been called',
-      this._readinessDeferrals > 0
-    );
-
-    this._readinessDeferrals--;
-
-    if (this._readinessDeferrals === 0) {
-      once(this, this.didBecomeReady);
-    }
-  }
-
-  _bootPromise: Promise<this> | null = null;
-
-  /**
-    Initialize the application and return a promise that resolves with the `Application`
-    object when the boot process is complete.
-
-    Run any application initializers and run the application load hook. These hooks may
-    choose to defer readiness. For example, an authentication hook might want to defer
-    readiness until the auth token has been retrieved.
-
-    By default, this method is called automatically on "DOM ready"; however, if autoboot
-    is disabled, this is automatically called when the first application instance is
-    created via `visit`.
-
-    @public
-    @method boot
-    @return {Promise<Application,Error>}
-  */
-  boot(): Promise<this> {
-    assert(
-      'You cannot boot this application since it has already been destroyed',
-      !this.isDestroyed
-    );
-
-    assert('You cannot boot this application since it is being destroyed', !this.isDestroying);
-
-    if (this._bootPromise) {
-      return this._bootPromise;
-    }
-
-    try {
-      this._bootSync();
-    } catch (_) {
-      // Ignore the error: in the asynchronous boot path, the error is already reflected
-      // in the promise rejection
-    }
-
-    assert('has boot promise', this._bootPromise);
-
-    return this._bootPromise;
-  }
-
-  _bootResolver: ReturnType<typeof RSVP['defer']> | null = null;
-
-  /**
-    Unfortunately, a lot of existing code assumes the booting process is
-    "synchronous". Specifically, a lot of tests assumes the last call to
-    `app.advanceReadiness()` or `app.reset()` will result in the app being
-    fully-booted when the current runloop completes.
-
-    We would like new code (like the `visit` API) to stop making this assumption,
-    so we created the asynchronous version above that returns a promise. But until
-    we have migrated all the code, we would have to expose this method for use
-    *internally* in places where we need to boot an app "synchronously".
-
-    @private
-  */
-  _bootSync() {
-    if (this._booted || this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    // Even though this returns synchronously, we still need to make sure the
-    // boot promise exists for book-keeping purposes: if anything went wrong in
-    // the boot process, we need to store the error as a rejection on the boot
-    // promise so that a future caller of `boot()` can tell what failed.
-    let defer = (this._bootResolver = RSVP.defer());
-    this._bootPromise = defer.promise as Promise<this>;
-
-    try {
-      this.runInitializers();
-      runLoadHooks('application', this);
-      this.advanceReadiness();
-      // Continues to `didBecomeReady`
-    } catch (error) {
-      // For the asynchronous boot path
-      defer.reject(error);
-
-      // For the synchronous boot path
-      throw error;
-    }
-  }
-
-  /**
-    Reset the application. This is typically used only in tests. It cleans up
-    the application in the following order:
-
-    1. Deactivate existing routes
-    2. Destroy all objects in the container
-    3. Create a new application container
-    4. Re-route to the existing url
-
-    Typical Example:
-
-    ```javascript
-    import Application from '@ember/application';
-    let App;
-
-    run(function() {
-      App = Application.create();
-    });
-
-    module('acceptance test', {
-      setup: function() {
-        App.reset();
-      }
-    });
-
-    test('first test', function() {
-      // App is freshly reset
-    });
-
-    test('second test', function() {
-      // App is again freshly reset
-    });
-    ```
-
-    Advanced Example:
-
-    Occasionally you may want to prevent the app from initializing during
-    setup. This could enable extra configuration, or enable asserting prior
-    to the app becoming ready.
-
-    ```javascript
-    import Application from '@ember/application';
-    let App;
-
-    run(function() {
-      App = Application.create();
-    });
-
-    module('acceptance test', {
-      setup: function() {
-        run(function() {
-          App.reset();
-          App.deferReadiness();
-        });
-      }
-    });
-
-    test('first test', function() {
-      ok(true, 'something before app is initialized');
-
-      run(function() {
-        App.advanceReadiness();
-      });
-
-      ok(true, 'something after app is initialized');
-    });
-    ```
-
-    @method reset
-    @public
-  */
-  reset() {
-    assert(
-      'You cannot reset this application since it has already been destroyed',
-      !this.isDestroyed
-    );
-
-    assert('You cannot reset this application since it is being destroyed', !this.isDestroying);
-
-    assert(
-      `Calling reset() on instances of \`Application\` is not
-            supported when globals mode is disabled; call \`visit()\` to
-            create new \`ApplicationInstance\`s and dispose them
-            via their \`destroy()\` method instead.`,
-      this._globalsMode && this.autoboot
-    );
-
-    let instance = this.__deprecatedInstance__;
-
-    this._readinessDeferrals = 1;
-    this._bootPromise = null;
-    this._bootResolver = null;
-    this._booted = false;
-
-    function handleReset(this: Application) {
-      assert('expected instance', instance);
-      run(instance, 'destroy');
-      this._buildDeprecatedInstance();
-      schedule('actions', this, '_bootSync');
-    }
-
-    join(this, handleReset);
-  }
-
-  /**
-    @private
-    @method didBecomeReady
-  */
-  didBecomeReady() {
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    assert('expected _bootResolver', this._bootResolver);
-
-    try {
-      // TODO: Is this still needed for _globalsMode = false?
-
-      // See documentation on `_autoboot()` for details
-      if (this.autoboot) {
-        let instance;
-
-        if (this._globalsMode) {
-          // If we already have the __deprecatedInstance__ lying around, boot it to
-          // avoid unnecessary work
-          instance = this.__deprecatedInstance__;
-          assert('expected instance', instance);
-        } else {
-          // Otherwise, build an instance and boot it. This is currently unreachable,
-          // because we forced _globalsMode to === autoboot; but having this branch
-          // allows us to locally toggle that flag for weeding out legacy globals mode
-          // dependencies independently
-          instance = this.buildInstance();
-        }
-
-        instance._bootSync();
-
-        // TODO: App.ready() is not called when autoboot is disabled, is this correct?
-        this.ready();
-
-        instance.startRouting();
-      }
-
-      // For the asynchronous boot path
-      this._bootResolver.resolve(this);
-
-      // For the synchronous boot path
-      this._booted = true;
-    } catch (error) {
-      // For the asynchronous boot path
-      this._bootResolver.reject(error);
-
-      // For the synchronous boot path
-      throw error;
-    }
-  }
-
-  /**
-    Called when the Application has become ready, immediately before routing
-    begins. The call will be delayed until the DOM has become ready.
-
-    @event ready
-    @public
-  */
-  ready() {
-    return this;
-  }
-
-  // This method must be moved to the application instance object
-  willDestroy() {
-    super.willDestroy();
-
-    if (_loaded['application'] === this) {
-      _loaded['application'] = undefined;
-    }
-
-    if (this._applicationInstances.size) {
-      this._applicationInstances.forEach((i) => i.destroy());
-      this._applicationInstances.clear();
-    }
-  }
-
-  /**
-    Boot a new instance of `ApplicationInstance` for the current
-    application and navigate it to the given `url`. Returns a `Promise` that
-    resolves with the instance when the initial routing and rendering is
-    complete, or rejects with any error that occurred during the boot process.
-
-    When `autoboot` is disabled, calling `visit` would first cause the
-    application to boot, which runs the application initializers.
-
-    This method also takes a hash of boot-time configuration options for
-    customizing the instance's behavior. See the documentation on
-    `ApplicationInstance.BootOptions` for details.
-
-    `ApplicationInstance.BootOptions` is an interface class that exists
-    purely to document the available options; you do not need to construct it
-    manually. Simply pass a regular JavaScript object containing of the
-    desired options:
-
-    ```javascript
-    MyApp.visit("/", { location: "none", rootElement: "#container" });
-    ```
-
-    ### Supported Scenarios
-
-    While the `BootOptions` class exposes a large number of knobs, not all
-    combinations of them are valid; certain incompatible combinations might
-    result in unexpected behavior.
-
-    For example, booting the instance in the full browser environment
-    while specifying a foreign `document` object (e.g. `{ isBrowser: true,
-    document: iframe.contentDocument }`) does not work correctly today,
-    largely due to Ember's jQuery dependency.
-
-    Currently, there are three officially supported scenarios/configurations.
-    Usages outside of these scenarios are not guaranteed to work, but please
-    feel free to file bug reports documenting your experience and any issues
-    you encountered to help expand support.
-
-    #### Browser Applications (Manual Boot)
-
-    The setup is largely similar to how Ember works out-of-the-box. Normally,
-    Ember will boot a default instance for your Application on "DOM ready".
-    However, you can customize this behavior by disabling `autoboot`.
-
-    For example, this allows you to render a miniture demo of your application
-    into a specific area on your marketing website:
-
-    ```javascript
-    import MyApp from 'my-app';
-
-    $(function() {
-      let App = MyApp.create({ autoboot: false });
-
-      let options = {
-        // Override the router's location adapter to prevent it from updating
-        // the URL in the address bar
-        location: 'none',
-
-        // Override the default `rootElement` on the app to render into a
-        // specific `div` on the page
-        rootElement: '#demo'
-      };
-
-      // Start the app at the special demo URL
-      App.visit('/demo', options);
-    });
-    ```
-
-    Or perhaps you might want to boot two instances of your app on the same
-    page for a split-screen multiplayer experience:
-
-    ```javascript
-    import MyApp from 'my-app';
-
-    $(function() {
-      let App = MyApp.create({ autoboot: false });
-
-      let sessionId = MyApp.generateSessionID();
-
-      let player1 = App.visit(`/matches/join?name=Player+1&session=${sessionId}`, { rootElement: '#left', location: 'none' });
-      let player2 = App.visit(`/matches/join?name=Player+2&session=${sessionId}`, { rootElement: '#right', location: 'none' });
-
-      Promise.all([player1, player2]).then(() => {
-        // Both apps have completed the initial render
-        $('#loading').fadeOut();
-      });
-    });
-    ```
-
-    Do note that each app instance maintains their own registry/container, so
-    they will run in complete isolation by default.
-
-    #### Server-Side Rendering (also known as FastBoot)
-
-    This setup allows you to run your Ember app in a server environment using
-    Node.js and render its content into static HTML for SEO purposes.
-
-    ```javascript
-    const HTMLSerializer = new SimpleDOM.HTMLSerializer(SimpleDOM.voidMap);
-
-    function renderURL(url) {
-      let dom = new SimpleDOM.Document();
-      let rootElement = dom.body;
-      let options = { isBrowser: false, document: dom, rootElement: rootElement };
-
-      return MyApp.visit(options).then(instance => {
-        try {
-          return HTMLSerializer.serialize(rootElement.firstChild);
-        } finally {
-          instance.destroy();
-        }
-      });
-    }
-    ```
-
-    In this scenario, because Ember does not have access to a global `document`
-    object in the Node.js environment, you must provide one explicitly. In practice,
-    in the non-browser environment, the stand-in `document` object only needs to
-    implement a limited subset of the full DOM API. The `SimpleDOM` library is known
-    to work.
-
-    Since there is no DOM access in the non-browser environment, you must also
-    specify a DOM `Element` object in the same `document` for the `rootElement` option
-    (as opposed to a selector string like `"body"`).
-
-    See the documentation on the `isBrowser`, `document` and `rootElement` properties
-    on `ApplicationInstance.BootOptions` for details.
-
-    #### Server-Side Resource Discovery
-
-    This setup allows you to run the routing layer of your Ember app in a server
-    environment using Node.js and completely disable rendering. This allows you
-    to simulate and discover the resources (i.e. AJAX requests) needed to fulfill
-    a given request and eagerly "push" these resources to the client.
-
-    ```app/initializers/network-service.js
-    import BrowserNetworkService from 'app/services/network/browser';
-    import NodeNetworkService from 'app/services/network/node';
-
-    // Inject a (hypothetical) service for abstracting all AJAX calls and use
-    // the appropriate implementation on the client/server. This also allows the
-    // server to log all the AJAX calls made during a particular request and use
-    // that for resource-discovery purpose.
-
-    export function initialize(application) {
-      if (window) { // browser
-        application.register('service:network', BrowserNetworkService);
-      } else { // node
-        application.register('service:network', NodeNetworkService);
-      }
-    };
-
-    export default {
-      name: 'network-service',
-      initialize: initialize
-    };
-    ```
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-    import { service } from '@ember/service';
-
-    // An example of how the (hypothetical) service is used in routes.
-
-    export default class IndexRoute extends Route {
-      @service network;
-
-      model(params) {
-        return this.network.fetch(`/api/posts/${params.post_id}.json`);
-      }
-
-      afterModel(post) {
-        if (post.isExternalContent) {
-          return this.network.fetch(`/api/external/?url=${post.externalURL}`);
-        } else {
-          return post;
-        }
-      }
-    }
-    ```
-
-    ```javascript
-    // Finally, put all the pieces together
-
-    function discoverResourcesFor(url) {
-      return MyApp.visit(url, { isBrowser: false, shouldRender: false }).then(instance => {
-        let networkService = instance.lookup('service:network');
-        return networkService.requests; // => { "/api/posts/123.json": "..." }
-      });
-    }
-    ```
-
-    @public
-    @method visit
-    @param url {String} The initial URL to navigate to
-    @param options {ApplicationInstance.BootOptions}
-    @return {Promise<ApplicationInstance, Error>}
-  */
-  visit(url: string, options: BootOptions) {
-    assert(
-      'You cannot visit this application since it has already been destroyed',
-      !this.isDestroyed
-    );
-
-    assert('You cannot visit this application since it is being destroyed', !this.isDestroying);
-
-    return this.boot().then(() => {
-      let instance = this.buildInstance();
-
-      return instance
-        .boot(options)
-        .then(() => instance.visit(url))
-        .catch((error) => {
-          run(instance, 'destroy');
-          throw error;
-        });
-    });
-  }
-}
-
-function commonSetupRegistry(registry: Registry) {
-  registry.register('router:main', Router);
-  registry.register('-view-registry:main', {
-    create() {
-      return dictionary(null);
-    },
-  });
-
-  registry.register('route:basic', Route);
-  registry.register('event_dispatcher:main', EventDispatcher);
-
-  registry.register('location:auto', AutoLocation);
-  registry.register('location:hash', HashLocation);
-  registry.register('location:history', HistoryLocation);
-  registry.register('location:none', NoneLocation);
-
-  registry.register(P`-bucket-cache:main`, {
-    create() {
-      return new BucketCache();
-    },
-  });
-
-  registry.register('service:router', RouterService);
-}
-
-export default Application;

From 3c66cf43711c47c86029607b1343346acb19cee8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 09:23:29 -0700
Subject: [PATCH 1048/1405] Consolidate @ember/application/namespace

---
 .../lib/container_debug_adapter.ts            |  3 +-
 .../extension-support/lib/data_adapter.ts     |  3 +-
 packages/@ember/-internals/runtime/index.ts   |  1 -
 .../runtime/lib/system/namespace.ts           | 78 ------------------
 .../tests/system/namespace/base_test.js       |  2 +-
 packages/@ember/application/namespace.ts      | 79 ++++++++++++++++++-
 packages/@ember/engine/index.ts               |  2 +-
 packages/ember/index.js                       |  2 +-
 8 files changed, 85 insertions(+), 85 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/namespace.ts

diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
index 36cdb3aeb42..a9488321c65 100644
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
@@ -1,9 +1,10 @@
 import { classify, dasherize } from '@ember/string';
 import type { NativeArray } from '@ember/-internals/runtime';
-import { A as emberA, typeOf, Namespace, Object as EmberObject } from '@ember/-internals/runtime';
+import { A as emberA, typeOf, Object as EmberObject } from '@ember/-internals/runtime';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import type { Resolver } from '@ember/-internals/container/lib/registry';
+import Namespace from '@ember/application/namespace';
 
 /**
 @module @ember/debug
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.ts b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
index 96a756dd90a..de0f3d74e25 100644
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.ts
+++ b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
@@ -3,8 +3,9 @@ import { getOwner } from '@ember/-internals/owner';
 import { _backburner } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
+import Namespace from '@ember/application/namespace';
 import type { NativeArray } from '@ember/-internals/runtime';
-import { Namespace, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
 import type { Cache } from '@glimmer/validator';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type { ContainerDebugAdapter } from '..';
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index d18b70e5122..401b55df76a 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -13,7 +13,6 @@ export {
   isArray,
 } from './lib/mixins/array';
 export { default as Comparable } from './lib/mixins/comparable';
-export { default as Namespace } from './lib/system/namespace';
 export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
 export { default as CoreObject } from './lib/system/core_object';
diff --git a/packages/@ember/-internals/runtime/lib/system/namespace.ts b/packages/@ember/-internals/runtime/lib/system/namespace.ts
deleted file mode 100644
index d69e0f6b326..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/namespace.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
-@module @ember/application
-*/
-
-import {
-  NAMESPACES,
-  NAMESPACES_BY_ID,
-  addNamespace,
-  findNamespace,
-  findNamespaces,
-  get,
-  processNamespace,
-  processAllNamespaces,
-  removeNamespace,
-} from '@ember/-internals/metal'; // Preloaded into namespaces
-import { getName, guidFor, setName } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
-import EmberObject from './object';
-
-/**
-  A Namespace is an object usually used to contain other objects or methods
-  such as an application or framework. Create a namespace anytime you want
-  to define one of these new containers.
-
-  # Example Usage
-
-  ```javascript
-  MyFramework = Ember.Namespace.create({
-    VERSION: '1.0.0'
-  });
-  ```
-
-  @class Namespace
-  @extends EmberObject
-  @public
-*/
-class Namespace extends EmberObject {
-  static NAMESPACES = NAMESPACES;
-  static NAMESPACES_BY_ID = NAMESPACES_BY_ID;
-  static processAll = processAllNamespaces;
-  static byName = findNamespace;
-
-  declare isNamespace: true;
-
-  init(properties: object | undefined) {
-    super.init(properties);
-    addNamespace(this);
-  }
-
-  toString(): string {
-    let existing_name = get(this, 'name') || get(this, 'modulePrefix');
-    if (existing_name) {
-      assert("name wasn't a string", typeof existing_name === 'string');
-      return existing_name;
-    }
-    findNamespaces();
-    let name = getName(this);
-    if (name === undefined) {
-      name = guidFor(this);
-      setName(this, name);
-    }
-    return name;
-  }
-
-  nameClasses() {
-    processNamespace(this);
-  }
-
-  destroy() {
-    removeNamespace(this);
-    return super.destroy();
-  }
-}
-
-// Declare on the prototype to have a single shared value.
-Namespace.prototype.isNamespace = true;
-
-export default Namespace;
diff --git a/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js b/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
index 5c721d6b3a5..a06eae8d48a 100644
--- a/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
@@ -3,7 +3,7 @@ import { run } from '@ember/runloop';
 import { get, setNamespaceSearchDisabled } from '@ember/-internals/metal';
 import { guidFor, getName } from '@ember/-internals/utils';
 import EmberObject from '../../../lib/system/object';
-import Namespace from '../../../lib/system/namespace';
+import Namespace from '@ember/application/namespace';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 const originalLookup = context.lookup;
diff --git a/packages/@ember/application/namespace.ts b/packages/@ember/application/namespace.ts
index 94eb9dd4a54..ac2a0997768 100644
--- a/packages/@ember/application/namespace.ts
+++ b/packages/@ember/application/namespace.ts
@@ -1 +1,78 @@
-export { Namespace as default } from '@ember/-internals/runtime';
+/**
+@module @ember/application
+*/
+
+import {
+  NAMESPACES,
+  NAMESPACES_BY_ID,
+  addNamespace,
+  findNamespace,
+  findNamespaces,
+  get,
+  processNamespace,
+  processAllNamespaces,
+  removeNamespace,
+} from '@ember/-internals/metal'; // Preloaded into namespaces
+import { getName, guidFor, setName } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
+import EmberObject from '@ember/object';
+
+/**
+  A Namespace is an object usually used to contain other objects or methods
+  such as an application or framework. Create a namespace anytime you want
+  to define one of these new containers.
+
+  # Example Usage
+
+  ```javascript
+  MyFramework = Ember.Namespace.create({
+    VERSION: '1.0.0'
+  });
+  ```
+
+  @class Namespace
+  @extends EmberObject
+  @public
+*/
+class Namespace extends EmberObject {
+  static NAMESPACES = NAMESPACES;
+  static NAMESPACES_BY_ID = NAMESPACES_BY_ID;
+  static processAll = processAllNamespaces;
+  static byName = findNamespace;
+
+  declare isNamespace: true;
+
+  init(properties: object | undefined) {
+    super.init(properties);
+    addNamespace(this);
+  }
+
+  toString(): string {
+    let existing_name = get(this, 'name') || get(this, 'modulePrefix');
+    if (existing_name) {
+      assert("name wasn't a string", typeof existing_name === 'string');
+      return existing_name;
+    }
+    findNamespaces();
+    let name = getName(this);
+    if (name === undefined) {
+      name = guidFor(this);
+      setName(this, name);
+    }
+    return name;
+  }
+
+  nameClasses() {
+    processNamespace(this);
+  }
+
+  destroy() {
+    removeNamespace(this);
+    return super.destroy();
+  }
+}
+
+// Declare on the prototype to have a single shared value.
+Namespace.prototype.isNamespace = true;
+
+export default Namespace;
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index 4c33154b453..c1262a176e9 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -2,7 +2,7 @@ export { getEngineParent, setEngineParent } from './lib/engine-parent';
 
 import { canInvoke } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
-import { Namespace } from '@ember/-internals/runtime';
+import Namespace from '@ember/application/namespace';
 import { Registry } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 98e2b6b3593..a8d7fe4b686 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -46,7 +46,6 @@ import {
   _ProxyMixin,
   RSVP,
   Comparable,
-  Namespace,
   Enumerable,
   ArrayProxy,
   ObjectProxy,
@@ -81,6 +80,7 @@ import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import Application, { onLoad, runLoadHooks } from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
+import Namespace from '@ember/application/namespace';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import { assign } from '@ember/polyfills';

From cb4bec63fdca4c02c42dab59b5c92ad88e06aa0b Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 09:27:10 -0700
Subject: [PATCH 1049/1405] Consolidate @ember/controller

---
 packages/@ember/-internals/routing/index.ts   |   4 +-
 .../-internals/routing/lib/ext/controller.ts  | 263 --------------
 .../-internals/routing/lib/system/route.ts    |   2 +-
 .../@ember/-internals/routing/lib/utils.ts    |   5 +-
 .../routing/tests/ext/controller_test.js      | 105 ------
 packages/@ember/controller/index.ts           | 328 +++++++++++++++++-
 .../@ember/controller/lib/controller_mixin.ts |  81 -----
 packages/ember/index.js                       |   3 +-
 packages/ember/tests/controller_test.js       | 112 +++++-
 packages/ember/tests/reexports_test.js        |   2 +-
 10 files changed, 441 insertions(+), 464 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/ext/controller.ts
 delete mode 100644 packages/@ember/-internals/routing/tests/ext/controller_test.js
 delete mode 100644 packages/@ember/controller/lib/controller_mixin.ts

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index b36670bb8a6..fa41ee0dd94 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,6 +1,3 @@
-// ES6TODO: Cleanup modules with side-effects below
-import './lib/ext/controller';
-
 export { default as Location, EmberLocation } from './lib/location/api';
 export { default as NoneLocation } from './lib/location/none_location';
 export { default as HashLocation } from './lib/location/hash_location';
@@ -24,3 +21,4 @@ export {
 } from './lib/services/router';
 export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
+export { deprecateTransitionMethods, prefixRouteNameArg, RouteArgs } from './lib/utils';
diff --git a/packages/@ember/-internals/routing/lib/ext/controller.ts b/packages/@ember/-internals/routing/lib/ext/controller.ts
deleted file mode 100644
index c12d374b6f0..00000000000
--- a/packages/@ember/-internals/routing/lib/ext/controller.ts
+++ /dev/null
@@ -1,263 +0,0 @@
-import { get } from '@ember/-internals/metal';
-import { getOwner } from '@ember/-internals/owner';
-import type Controller from '@ember/controller';
-import ControllerMixin from '@ember/controller/lib/controller_mixin';
-import type { Transition } from 'router_js';
-import type { Route, Router } from '../..';
-import type { RouteArgs } from '../utils';
-import { deprecateTransitionMethods, prefixRouteNameArg } from '../utils';
-
-/**
-@module ember
-*/
-
-ControllerMixin.reopen({
-  concatenatedProperties: ['queryParams'],
-
-  init() {
-    this._super(...arguments);
-    let owner = getOwner(this);
-    if (owner) {
-      this.namespace = owner.lookup('application:main');
-      this.target = owner.lookup('router:main');
-    }
-  },
-
-  /**
-    Defines which query parameters the controller accepts.
-    If you give the names `['category','page']` it will bind
-    the values of these query parameters to the variables
-    `this.category` and `this.page`.
-
-    By default, query parameters are parsed as strings. This
-    may cause unexpected behavior if a query parameter is used with `toggleProperty`,
-    because the initial value set for `param=false` will be the string `"false"`, which is truthy.
-
-    To avoid this, you may specify that the query parameter should be parsed as a boolean
-    by using the following verbose form with a `type` property:
-    ```javascript
-      queryParams: [{
-        category: {
-          type: 'boolean'
-        }
-      }]
-    ```
-    Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
-    If query param type is not specified, it will default to `'string'`.
-
-    @for Ember.ControllerMixin
-    @property queryParams
-    @public
-  */
-  queryParams: null,
-
-  /**
-   This property is updated to various different callback functions depending on
-   the current "state" of the backing route. It is used by
-   `Controller.prototype._qpChanged`.
-
-   The methods backing each state can be found in the `Route.prototype._qp` computed
-   property return value (the `.states` property). The current values are listed here for
-   the sanity of future travelers:
-
-   * `inactive` - This state is used when this controller instance is not part of the active
-     route hierarchy. Set in `Route.prototype._reset` (a `router.js` microlib hook) and
-     `Route.prototype.actions.finalizeQueryParamChange`.
-   * `active` - This state is used when this controller instance is part of the active
-     route hierarchy. Set in `Route.prototype.actions.finalizeQueryParamChange`.
-   * `allowOverrides` - This state is used in `Route.prototype.setup` (`route.js` microlib hook).
-
-    @method _qpDelegate
-    @private
-  */
-  _qpDelegate: null, // set by route
-
-  /**
-   During `Route#setup` observers are created to invoke this method
-   when any of the query params declared in `Controller#queryParams` property
-   are changed.
-
-   When invoked this method uses the currently active query param update delegate
-   (see `Controller.prototype._qpDelegate` for details) and invokes it with
-   the QP key/value being changed.
-
-    @method _qpChanged
-    @private
-  */
-  _qpChanged(controller: any, _prop: string) {
-    let dotIndex = _prop.indexOf('.[]');
-    let prop = dotIndex === -1 ? _prop : _prop.slice(0, dotIndex);
-
-    let delegate = controller._qpDelegate;
-    let value = get(controller, prop);
-    delegate(prop, value);
-  },
-
-  /**
-    Transition the application into another route. The route may
-    be either a single route or route path:
-
-    ```javascript
-    aController.transitionToRoute('blogPosts');
-    aController.transitionToRoute('blogPosts.recentEntries');
-    ```
-
-    Optionally supply a model for the route in question. The model
-    will be serialized into the URL using the `serialize` hook of
-    the route:
-
-    ```javascript
-    aController.transitionToRoute('blogPost', aPost);
-    ```
-
-    If a literal is passed (such as a number or a string), it will
-    be treated as an identifier instead. In this case, the `model`
-    hook of the route will be triggered:
-
-    ```javascript
-    aController.transitionToRoute('blogPost', 1);
-    ```
-
-    Multiple models will be applied last to first recursively up the
-    route tree.
-
-    ```app/router.js
-    Router.map(function() {
-      this.route('blogPost', { path: ':blogPostId' }, function() {
-        this.route('blogComment', { path: ':blogCommentId', resetNamespace: true });
-      });
-    });
-    ```
-
-    ```javascript
-    aController.transitionToRoute('blogComment', aPost, aComment);
-    aController.transitionToRoute('blogComment', 1, 13);
-    ```
-
-    It is also possible to pass a URL (a string that starts with a
-    `/`).
-
-    ```javascript
-    aController.transitionToRoute('/');
-    aController.transitionToRoute('/blog/post/1/comment/13');
-    aController.transitionToRoute('/blog/posts?sort=title');
-    ```
-
-    An options hash with a `queryParams` property may be provided as
-    the final argument to add query parameters to the destination URL.
-
-    ```javascript
-    aController.transitionToRoute('blogPost', 1, {
-      queryParams: { showComments: 'true' }
-    });
-
-    // if you just want to transition the query parameters without changing the route
-    aController.transitionToRoute({ queryParams: { sort: 'date' } });
-    ```
-
-    See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
-
-    @for Ember.ControllerMixin
-    @method transitionToRoute
-    @deprecated Use transitionTo from the Router service instead.
-    @param {String} [name] the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used
-      while transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-      containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @public
-  */
-  transitionToRoute<R extends Route>(...args: RouteArgs<R>): Transition {
-    deprecateTransitionMethods('controller', 'transitionToRoute');
-
-    // target may be either another controller or a router
-    let target = get(this, 'target');
-
-    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
-    // mock out an object that only has the single method. Since this is deprecated, I think it's
-    // ok to be a little less than proper here.
-    let method = (target as Controller).transitionToRoute ?? (target as Router<R>).transitionTo;
-
-    return method.apply(target, prefixRouteNameArg(this, args));
-  },
-
-  /**
-    Transition into another route while replacing the current URL, if possible.
-    This will replace the current history entry instead of adding a new one.
-    Beside that, it is identical to `transitionToRoute` in all other respects.
-
-    ```javascript
-    aController.replaceRoute('blogPosts');
-    aController.replaceRoute('blogPosts.recentEntries');
-    ```
-
-    Optionally supply a model for the route in question. The model
-    will be serialized into the URL using the `serialize` hook of
-    the route:
-
-    ```javascript
-    aController.replaceRoute('blogPost', aPost);
-    ```
-
-    If a literal is passed (such as a number or a string), it will
-    be treated as an identifier instead. In this case, the `model`
-    hook of the route will be triggered:
-
-    ```javascript
-    aController.replaceRoute('blogPost', 1);
-    ```
-
-    Multiple models will be applied last to first recursively up the
-    route tree.
-
-    ```app/router.js
-    Router.map(function() {
-      this.route('blogPost', { path: ':blogPostId' }, function() {
-        this.route('blogComment', { path: ':blogCommentId', resetNamespace: true });
-      });
-    });
-    ```
-
-    ```
-    aController.replaceRoute('blogComment', aPost, aComment);
-    aController.replaceRoute('blogComment', 1, 13);
-    ```
-
-    It is also possible to pass a URL (a string that starts with a
-    `/`).
-
-    ```javascript
-    aController.replaceRoute('/');
-    aController.replaceRoute('/blog/post/1/comment/13');
-    ```
-
-    @for Ember.ControllerMixin
-    @method replaceRoute
-    @deprecated Use replaceWith from the Router service instead.
-    @param {String} [name] the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used
-    while transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-    containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @public
-  */
-
-  replaceRoute<R extends Route>(...args: RouteArgs<R>): Transition {
-    deprecateTransitionMethods('controller', 'replaceRoute');
-    // target may be either another controller or a router
-    let target = get(this, 'target');
-
-    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
-    // mock out an object that only has the single method. Since this is deprecated, I think it's
-    // ok to be a little less than proper here.
-    let method = (target as Controller).replaceRoute ?? (target as Router<R>).replaceWith;
-
-    return method.apply(target, prefixRouteNameArg(this, args));
-  },
-});
-
-export default ControllerMixin;
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 877d3ba23b9..543d810daff 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -24,7 +24,7 @@ import {
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
-import type { ControllerQueryParamType } from '@ember/controller/lib/controller_mixin';
+import type { ControllerQueryParamType } from '@ember/controller';
 import { assert, info, isTesting } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { dependentKeyCompat } from '@ember/object/compat';
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index b981d68a94c..4ee396815ce 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -1,9 +1,6 @@
 import { get } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import type {
-  ControllerQueryParam,
-  ControllerQueryParamType,
-} from '@ember/controller/lib/controller_mixin';
+import type { ControllerQueryParam, ControllerQueryParamType } from '@ember/controller';
 import { assert, deprecate } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import EmberError from '@ember/error';
diff --git a/packages/@ember/-internals/routing/tests/ext/controller_test.js b/packages/@ember/-internals/routing/tests/ext/controller_test.js
deleted file mode 100644
index 0905dddd148..00000000000
--- a/packages/@ember/-internals/routing/tests/ext/controller_test.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { setOwner } from '@ember/-internals/owner';
-import Controller from '@ember/controller';
-import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
-  '@ember/-internals/routing/ext/controller',
-  class extends AbstractTestCase {
-    ["@test transitionToRoute considers an engine's mountPoint"](assert) {
-      let router = {
-        transitionTo(route) {
-          return route;
-        },
-      };
-
-      let engineInstance = buildOwner({
-        ownerOptions: {
-          routable: true,
-          mountPoint: 'foo.bar',
-        },
-      });
-
-      let controller = Controller.create({ target: router });
-      setOwner(controller, engineInstance);
-
-      expectDeprecation(() => {
-        assert.strictEqual(
-          controller.transitionToRoute('application'),
-          'foo.bar.application',
-          'properly prefixes application route'
-        );
-      }, /Calling transitionToRoute on a controller is deprecated/);
-      expectDeprecation(() => {
-        assert.strictEqual(
-          controller.transitionToRoute('posts'),
-          'foo.bar.posts',
-          'properly prefixes child routes'
-        );
-      }, /Calling transitionToRoute on a controller is deprecated/);
-      expectDeprecation(() => {
-        assert.throws(
-          () => controller.transitionToRoute('/posts'),
-          'throws when trying to use a url'
-        );
-      }, /Calling transitionToRoute on a controller is deprecated/);
-
-      let queryParams = {};
-      expectDeprecation(() => {
-        assert.strictEqual(
-          controller.transitionToRoute(queryParams),
-          queryParams,
-          'passes query param only transitions through'
-        );
-      }, /Calling transitionToRoute on a controller is deprecated/);
-
-      runDestroy(engineInstance);
-    }
-
-    ["@test replaceRoute considers an engine's mountPoint"](assert) {
-      let router = {
-        replaceWith(route) {
-          return route;
-        },
-      };
-
-      let engineInstance = buildOwner({
-        ownerOptions: {
-          routable: true,
-          mountPoint: 'foo.bar',
-        },
-      });
-
-      let controller = Controller.create({ target: router });
-      setOwner(controller, engineInstance);
-
-      expectDeprecation(() => {
-        assert.strictEqual(
-          controller.replaceRoute('application'),
-          'foo.bar.application',
-          'properly prefixes application route'
-        );
-      }, /Calling replaceRoute on a controller is deprecated/);
-      expectDeprecation(() => {
-        assert.strictEqual(
-          controller.replaceRoute('posts'),
-          'foo.bar.posts',
-          'properly prefixes child routes'
-        );
-      }, /Calling replaceRoute on a controller is deprecated/);
-      expectDeprecation(() => {
-        assert.throws(() => controller.replaceRoute('/posts'), 'throws when trying to use a url');
-      }, /Calling replaceRoute on a controller is deprecated/);
-
-      let queryParams = {};
-      expectDeprecation(() => {
-        assert.strictEqual(
-          controller.replaceRoute(queryParams),
-          queryParams,
-          'passes query param only transitions through'
-        );
-      }, /Calling replaceRoute on a controller is deprecated/);
-
-      runDestroy(engineInstance);
-    }
-  }
-);
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 4562ee425aa..84a62daa64e 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,11 +1,333 @@
+import { getOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/-internals/runtime';
 import { inject as metalInject } from '@ember/-internals/metal';
-import ControllerMixin from './lib/controller_mixin';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
+import { Mixin, computed, get } from '@ember/-internals/metal';
+import type { RouteArgs } from '@ember/-internals/routing';
+import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/-internals/routing';
+import { ActionHandler } from '@ember/-internals/runtime';
+import { symbol } from '@ember/-internals/utils';
+import type Route from '@ember/routing/route';
+import type Router from '@ember/routing/router';
+import type { Transition } from 'router_js';
+
+export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string';
+export type ControllerQueryParam = string | Record<string, { type: ControllerQueryParamType }>;
+
+const MODEL = symbol('MODEL');
+
+/**
+@module ember/controller
+*/
 
 /**
-@module @ember/controller
+  @class ControllerMixin
+  @namespace Ember
+  @uses Ember.ActionHandler
+  @private
 */
+interface ControllerMixin<T> extends ActionHandler {
+  /** @internal */
+  _qpDelegate: unknown | null;
+
+  isController: true;
+  target: unknown | null;
+  model: T;
+
+  queryParams: Array<ControllerQueryParam>;
+
+  transitionToRoute(...args: RouteArgs<Route>): Transition;
+
+  replaceRoute(...args: RouteArgs<Route>): Transition;
+}
+const ControllerMixin = Mixin.create(ActionHandler, {
+  /* ducktype as a controller */
+  isController: true,
+
+  concatenatedProperties: ['queryParams'],
+
+  /**
+    The object to which actions from the view should be sent.
+
+    For example, when a Handlebars template uses the `{{action}}` helper,
+    it will attempt to send the action to the view's controller's `target`.
+
+    By default, the value of the target property is set to the router, and
+    is injected when a controller is instantiated. This injection is applied
+    as part of the application's initialization process. In most cases the
+    `target` property will automatically be set to the logical consumer of
+    actions for the controller.
+
+    @property target
+    @default null
+    @public
+  */
+  target: null,
+
+  store: null,
+
+  init() {
+    this._super(...arguments);
+    let owner = getOwner(this);
+    if (owner) {
+      this.namespace = owner.lookup('application:main');
+      this.target = owner.lookup('router:main');
+    }
+  },
+
+  /**
+    The controller's current model. When retrieving or modifying a controller's
+    model, this property should be used instead of the `content` property.
+
+    @property model
+    @public
+  */
+  model: computed({
+    get() {
+      return this[MODEL];
+    },
+
+    set(_key, value) {
+      return (this[MODEL] = value);
+    },
+  }),
+
+  /**
+    Defines which query parameters the controller accepts.
+    If you give the names `['category','page']` it will bind
+    the values of these query parameters to the variables
+    `this.category` and `this.page`.
+
+    By default, query parameters are parsed as strings. This
+    may cause unexpected behavior if a query parameter is used with `toggleProperty`,
+    because the initial value set for `param=false` will be the string `"false"`, which is truthy.
+
+    To avoid this, you may specify that the query parameter should be parsed as a boolean
+    by using the following verbose form with a `type` property:
+    ```javascript
+      queryParams: [{
+        category: {
+          type: 'boolean'
+        }
+      }]
+    ```
+    Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
+    If query param type is not specified, it will default to `'string'`.
+
+    @for Ember.ControllerMixin
+    @property queryParams
+    @public
+  */
+  queryParams: null,
+
+  /**
+   This property is updated to various different callback functions depending on
+   the current "state" of the backing route. It is used by
+   `Controller.prototype._qpChanged`.
+
+   The methods backing each state can be found in the `Route.prototype._qp` computed
+   property return value (the `.states` property). The current values are listed here for
+   the sanity of future travelers:
+
+   * `inactive` - This state is used when this controller instance is not part of the active
+     route hierarchy. Set in `Route.prototype._reset` (a `router.js` microlib hook) and
+     `Route.prototype.actions.finalizeQueryParamChange`.
+   * `active` - This state is used when this controller instance is part of the active
+     route hierarchy. Set in `Route.prototype.actions.finalizeQueryParamChange`.
+   * `allowOverrides` - This state is used in `Route.prototype.setup` (`route.js` microlib hook).
+
+    @method _qpDelegate
+    @private
+  */
+  _qpDelegate: null, // set by route
+
+  /**
+   During `Route#setup` observers are created to invoke this method
+   when any of the query params declared in `Controller#queryParams` property
+   are changed.
+
+   When invoked this method uses the currently active query param update delegate
+   (see `Controller.prototype._qpDelegate` for details) and invokes it with
+   the QP key/value being changed.
+
+    @method _qpChanged
+    @private
+  */
+  _qpChanged(controller: any, _prop: string) {
+    let dotIndex = _prop.indexOf('.[]');
+    let prop = dotIndex === -1 ? _prop : _prop.slice(0, dotIndex);
+
+    let delegate = controller._qpDelegate;
+    let value = get(controller, prop);
+    delegate(prop, value);
+  },
+
+  /**
+    Transition the application into another route. The route may
+    be either a single route or route path:
+
+    ```javascript
+    aController.transitionToRoute('blogPosts');
+    aController.transitionToRoute('blogPosts.recentEntries');
+    ```
+
+    Optionally supply a model for the route in question. The model
+    will be serialized into the URL using the `serialize` hook of
+    the route:
+
+    ```javascript
+    aController.transitionToRoute('blogPost', aPost);
+    ```
+
+    If a literal is passed (such as a number or a string), it will
+    be treated as an identifier instead. In this case, the `model`
+    hook of the route will be triggered:
+
+    ```javascript
+    aController.transitionToRoute('blogPost', 1);
+    ```
+
+    Multiple models will be applied last to first recursively up the
+    route tree.
+
+    ```app/router.js
+    Router.map(function() {
+      this.route('blogPost', { path: ':blogPostId' }, function() {
+        this.route('blogComment', { path: ':blogCommentId', resetNamespace: true });
+      });
+    });
+    ```
+
+    ```javascript
+    aController.transitionToRoute('blogComment', aPost, aComment);
+    aController.transitionToRoute('blogComment', 1, 13);
+    ```
+
+    It is also possible to pass a URL (a string that starts with a
+    `/`).
+
+    ```javascript
+    aController.transitionToRoute('/');
+    aController.transitionToRoute('/blog/post/1/comment/13');
+    aController.transitionToRoute('/blog/posts?sort=title');
+    ```
+
+    An options hash with a `queryParams` property may be provided as
+    the final argument to add query parameters to the destination URL.
+
+    ```javascript
+    aController.transitionToRoute('blogPost', 1, {
+      queryParams: { showComments: 'true' }
+    });
+
+    // if you just want to transition the query parameters without changing the route
+    aController.transitionToRoute({ queryParams: { sort: 'date' } });
+    ```
+
+    See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
+
+    @for Ember.ControllerMixin
+    @method transitionToRoute
+    @deprecated Use transitionTo from the Router service instead.
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used
+      while transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @public
+  */
+  transitionToRoute<R extends Route>(...args: RouteArgs<R>): Transition {
+    deprecateTransitionMethods('controller', 'transitionToRoute');
+
+    // target may be either another controller or a router
+    let target = get(this, 'target');
+
+    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
+    // mock out an object that only has the single method. Since this is deprecated, I think it's
+    // ok to be a little less than proper here.
+    let method = (target as Controller).transitionToRoute ?? (target as Router<R>).transitionTo;
+
+    return method.apply(target, prefixRouteNameArg(this, args));
+  },
+
+  /**
+    Transition into another route while replacing the current URL, if possible.
+    This will replace the current history entry instead of adding a new one.
+    Beside that, it is identical to `transitionToRoute` in all other respects.
+
+    ```javascript
+    aController.replaceRoute('blogPosts');
+    aController.replaceRoute('blogPosts.recentEntries');
+    ```
+
+    Optionally supply a model for the route in question. The model
+    will be serialized into the URL using the `serialize` hook of
+    the route:
+
+    ```javascript
+    aController.replaceRoute('blogPost', aPost);
+    ```
+
+    If a literal is passed (such as a number or a string), it will
+    be treated as an identifier instead. In this case, the `model`
+    hook of the route will be triggered:
+
+    ```javascript
+    aController.replaceRoute('blogPost', 1);
+    ```
+
+    Multiple models will be applied last to first recursively up the
+    route tree.
+
+    ```app/router.js
+    Router.map(function() {
+      this.route('blogPost', { path: ':blogPostId' }, function() {
+        this.route('blogComment', { path: ':blogCommentId', resetNamespace: true });
+      });
+    });
+    ```
+
+    ```
+    aController.replaceRoute('blogComment', aPost, aComment);
+    aController.replaceRoute('blogComment', 1, 13);
+    ```
+
+    It is also possible to pass a URL (a string that starts with a
+    `/`).
+
+    ```javascript
+    aController.replaceRoute('/');
+    aController.replaceRoute('/blog/post/1/comment/13');
+    ```
+
+    @for Ember.ControllerMixin
+    @method replaceRoute
+    @deprecated Use replaceWith from the Router service instead.
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used
+    while transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+    containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @public
+  */
+
+  replaceRoute<R extends Route>(...args: RouteArgs<R>): Transition {
+    deprecateTransitionMethods('controller', 'replaceRoute');
+    // target may be either another controller or a router
+    let target = get(this, 'target');
+
+    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
+    // mock out an object that only has the single method. Since this is deprecated, I think it's
+    // ok to be a little less than proper here.
+    let method = (target as Controller).replaceRoute ?? (target as Router<R>).replaceWith;
+
+    return method.apply(target, prefixRouteNameArg(this, args));
+  },
+});
 
 // NOTE: This doesn't actually extend EmberObject.
 /**
@@ -68,4 +390,4 @@ export function inject(
   return metalInject('controller', ...args);
 }
 
-export default Controller;
+export { Controller as default, ControllerMixin };
diff --git a/packages/@ember/controller/lib/controller_mixin.ts b/packages/@ember/controller/lib/controller_mixin.ts
deleted file mode 100644
index 06d9d58ceda..00000000000
--- a/packages/@ember/controller/lib/controller_mixin.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Mixin, computed } from '@ember/-internals/metal';
-import type { RouteArgs } from '@ember/-internals/routing/lib/utils';
-import { ActionHandler } from '@ember/-internals/runtime';
-import { symbol } from '@ember/-internals/utils';
-import type Route from '@ember/routing/route';
-import type { Transition } from 'router_js';
-
-export type ControllerQueryParamType = 'boolean' | 'number' | 'array' | 'string';
-export type ControllerQueryParam = string | Record<string, { type: ControllerQueryParamType }>;
-
-const MODEL = symbol('MODEL');
-
-/**
-@module ember
-*/
-
-/**
-  @class ControllerMixin
-  @namespace Ember
-  @uses Ember.ActionHandler
-  @private
-*/
-interface ControllerMixin<T> extends ActionHandler {
-  /** @internal */
-  _qpDelegate: unknown | null;
-
-  isController: true;
-  target: unknown | null;
-  model: T;
-
-  // From routing/lib/ext/controller
-
-  queryParams: Array<ControllerQueryParam>;
-
-  transitionToRoute(...args: RouteArgs<Route>): Transition;
-
-  replaceRoute(...args: RouteArgs<Route>): Transition;
-}
-const ControllerMixin = Mixin.create(ActionHandler, {
-  /* ducktype as a controller */
-  isController: true,
-
-  /**
-    The object to which actions from the view should be sent.
-
-    For example, when a Handlebars template uses the `{{action}}` helper,
-    it will attempt to send the action to the view's controller's `target`.
-
-    By default, the value of the target property is set to the router, and
-    is injected when a controller is instantiated. This injection is applied
-    as part of the application's initialization process. In most cases the
-    `target` property will automatically be set to the logical consumer of
-    actions for the controller.
-
-    @property target
-    @default null
-    @public
-  */
-  target: null,
-
-  store: null,
-
-  /**
-    The controller's current model. When retrieving or modifying a controller's
-    model, this property should be used instead of the `content` property.
-
-    @property model
-    @public
-  */
-  model: computed({
-    get() {
-      return this[MODEL];
-    },
-
-    set(_key, value) {
-      return (this[MODEL] = value);
-    },
-  }),
-});
-
-export default ControllerMixin;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index a8d7fe4b686..64ac4d9bd23 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -10,8 +10,7 @@ import { FEATURES, isEnabled } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
 import { assert, captureRenderTree, deprecate } from '@ember/debug';
 import Backburner from 'backburner';
-import Controller, { inject as injectController } from '@ember/controller';
-import ControllerMixin from '@ember/controller/lib/controller_mixin';
+import Controller, { inject as injectController, ControllerMixin } from '@ember/controller';
 import {
   _getStrings,
   _setStrings,
diff --git a/packages/ember/tests/controller_test.js b/packages/ember/tests/controller_test.js
index 26c8a020a94..a50fc2c6378 100644
--- a/packages/ember/tests/controller_test.js
+++ b/packages/ember/tests/controller_test.js
@@ -1,5 +1,13 @@
+import { setOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
-import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
+import {
+  buildOwner,
+  moduleFor,
+  AbstractTestCase,
+  ApplicationTestCase,
+  runDestroy,
+  runTask,
+} from 'internal-test-helpers';
 import { Component } from '@ember/-internals/glimmer';
 
 /*
@@ -10,6 +18,108 @@ import { Component } from '@ember/-internals/glimmer';
  from the runtime up to the templating layer.
 */
 
+moduleFor(
+  '@ember/controller',
+  class extends AbstractTestCase {
+    ["@test transitionToRoute considers an engine's mountPoint"](assert) {
+      let router = {
+        transitionTo(route) {
+          return route;
+        },
+      };
+
+      let engineInstance = buildOwner({
+        ownerOptions: {
+          routable: true,
+          mountPoint: 'foo.bar',
+        },
+      });
+
+      let controller = Controller.create({ target: router });
+      setOwner(controller, engineInstance);
+
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.transitionToRoute('application'),
+          'foo.bar.application',
+          'properly prefixes application route'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.transitionToRoute('posts'),
+          'foo.bar.posts',
+          'properly prefixes child routes'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.throws(
+          () => controller.transitionToRoute('/posts'),
+          'throws when trying to use a url'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
+
+      let queryParams = {};
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.transitionToRoute(queryParams),
+          queryParams,
+          'passes query param only transitions through'
+        );
+      }, /Calling transitionToRoute on a controller is deprecated/);
+
+      runDestroy(engineInstance);
+    }
+
+    ["@test replaceRoute considers an engine's mountPoint"](assert) {
+      let router = {
+        replaceWith(route) {
+          return route;
+        },
+      };
+
+      let engineInstance = buildOwner({
+        ownerOptions: {
+          routable: true,
+          mountPoint: 'foo.bar',
+        },
+      });
+
+      let controller = Controller.create({ target: router });
+      setOwner(controller, engineInstance);
+
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.replaceRoute('application'),
+          'foo.bar.application',
+          'properly prefixes application route'
+        );
+      }, /Calling replaceRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.replaceRoute('posts'),
+          'foo.bar.posts',
+          'properly prefixes child routes'
+        );
+      }, /Calling replaceRoute on a controller is deprecated/);
+      expectDeprecation(() => {
+        assert.throws(() => controller.replaceRoute('/posts'), 'throws when trying to use a url');
+      }, /Calling replaceRoute on a controller is deprecated/);
+
+      let queryParams = {};
+      expectDeprecation(() => {
+        assert.strictEqual(
+          controller.replaceRoute(queryParams),
+          queryParams,
+          'passes query param only transitions through'
+        );
+      }, /Calling replaceRoute on a controller is deprecated/);
+
+      runDestroy(engineInstance);
+    }
+  }
+);
+
 moduleFor(
   'Template scoping examples',
   class extends ApplicationTestCase {
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index ab2ae99fa8c..e60b94bca7e 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -101,6 +101,7 @@ let allExports = [
 
   // @ember/controller
   ['Controller', '@ember/controller', 'default'],
+  ['ControllerMixin', '@ember/controller', 'ControllerMixin'],
   ['inject.controller', '@ember/controller', 'inject'],
 
   // @ember/debug
@@ -368,7 +369,6 @@ let allExports = [
   ['ActionHandler', '@ember/-internals/runtime'],
   ['NativeArray', '@ember/-internals/runtime'],
   ['MutableEnumerable', '@ember/-internals/runtime'],
-  ['ControllerMixin', '@ember/controller/lib/controller_mixin', 'default'],
   ['_ProxyMixin', '@ember/-internals/runtime'],
 
   // @ember/-internals/routing

From 1517f425e13f60a76ca32eeb57b39c2a557405be Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 09:57:33 -0700
Subject: [PATCH 1050/1405] Consolidate @ember/debug

---
 .../-internals/extension-support/index.ts     |   2 -
 .../lib/container_debug_adapter.ts            | 109 ---
 .../extension-support/lib/data_adapter.ts     | 658 -----------------
 .../tests/container_debug_adapter_test.js     |  72 --
 .../tests/data_adapter_test.js                | 273 --------
 .../@ember/debug/container-debug-adapter.ts   | 110 ++-
 packages/@ember/debug/data-adapter.ts         | 659 +++++++++++++++++-
 packages/@ember/engine/index.ts               |   2 +-
 packages/ember/index.js                       |   7 +-
 9 files changed, 772 insertions(+), 1120 deletions(-)
 delete mode 100644 packages/@ember/-internals/extension-support/index.ts
 delete mode 100644 packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
 delete mode 100644 packages/@ember/-internals/extension-support/lib/data_adapter.ts
 delete mode 100644 packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js
 delete mode 100644 packages/@ember/-internals/extension-support/tests/data_adapter_test.js

diff --git a/packages/@ember/-internals/extension-support/index.ts b/packages/@ember/-internals/extension-support/index.ts
deleted file mode 100644
index 200b94be232..00000000000
--- a/packages/@ember/-internals/extension-support/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as DataAdapter } from './lib/data_adapter';
-export { default as ContainerDebugAdapter } from './lib/container_debug_adapter';
diff --git a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts b/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
deleted file mode 100644
index a9488321c65..00000000000
--- a/packages/@ember/-internals/extension-support/lib/container_debug_adapter.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { classify, dasherize } from '@ember/string';
-import type { NativeArray } from '@ember/-internals/runtime';
-import { A as emberA, typeOf, Object as EmberObject } from '@ember/-internals/runtime';
-import type { Owner } from '@ember/-internals/owner';
-import { getOwner } from '@ember/-internals/owner';
-import type { Resolver } from '@ember/-internals/container/lib/registry';
-import Namespace from '@ember/application/namespace';
-
-/**
-@module @ember/debug
-*/
-
-/**
-  The `ContainerDebugAdapter` helps the container and resolver interface
-  with tools that debug Ember such as the
-  [Ember Inspector](https://github.com/emberjs/ember-inspector)
-  for Chrome and Firefox.
-
-  This class can be extended by a custom resolver implementer
-  to override some of the methods with library-specific code.
-
-  The methods likely to be overridden are:
-
-  * `canCatalogEntriesByType`
-  * `catalogEntriesByType`
-
-  The adapter will need to be registered
-  in the application's container as `container-debug-adapter:main`.
-
-  Example:
-
-  ```javascript
-  Application.initializer({
-    name: "containerDebugAdapter",
-
-    initialize(application) {
-      application.register('container-debug-adapter:main', require('app/container-debug-adapter'));
-    }
-  });
-  ```
-
-  @class ContainerDebugAdapter
-  @extends EmberObject
-  @since 1.5.0
-  @public
-*/
-export default class ContainerDebugAdapter extends EmberObject {
-  constructor(owner: Owner) {
-    super(owner);
-
-    this.resolver = getOwner(this)!.lookup('resolver-for-debugging:main') as Resolver;
-  }
-
-  /**
-    The resolver instance of the application
-    being debugged. This property will be injected
-    on creation.
-
-    @property resolver
-    @public
-  */
-  resolver: Resolver;
-
-  /**
-    Returns true if it is possible to catalog a list of available
-    classes in the resolver for a given type.
-
-    @method canCatalogEntriesByType
-    @param {String} type The type. e.g. "model", "controller", "route".
-    @return {boolean} whether a list is available for this type.
-    @public
-  */
-  canCatalogEntriesByType(type: string) {
-    if (type === 'model' || type === 'template') {
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-    Returns the available classes a given type.
-
-    @method catalogEntriesByType
-    @param {String} type The type. e.g. "model", "controller", "route".
-    @return {Array} An array of strings.
-    @public
-  */
-  catalogEntriesByType(type: string): NativeArray<string> {
-    let namespaces = emberA(Namespace.NAMESPACES);
-    let types = emberA<string>();
-    let typeSuffixRegex = new RegExp(`${classify(type)}$`);
-
-    namespaces.forEach((namespace) => {
-      for (let key in namespace) {
-        if (!Object.prototype.hasOwnProperty.call(namespace, key)) {
-          continue;
-        }
-        if (typeSuffixRegex.test(key)) {
-          let klass = (namespace as any)[key];
-          if (typeOf(klass) === 'class') {
-            types.push(dasherize(key.replace(typeSuffixRegex, '')));
-          }
-        }
-      }
-    });
-    return types;
-  }
-}
diff --git a/packages/@ember/-internals/extension-support/lib/data_adapter.ts b/packages/@ember/-internals/extension-support/lib/data_adapter.ts
deleted file mode 100644
index de0f3d74e25..00000000000
--- a/packages/@ember/-internals/extension-support/lib/data_adapter.ts
+++ /dev/null
@@ -1,658 +0,0 @@
-import type { Owner } from '@ember/-internals/owner';
-import { getOwner } from '@ember/-internals/owner';
-import { _backburner } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
-import { dasherize } from '@ember/string';
-import Namespace from '@ember/application/namespace';
-import type { NativeArray } from '@ember/-internals/runtime';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import type { Cache } from '@glimmer/validator';
-import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
-import type { ContainerDebugAdapter } from '..';
-
-type RecordColor = 'black' | 'red' | 'blue' | 'green';
-
-type WrappedType<N extends string = string> = {
-  name: N;
-  count: number;
-  columns: unknown[];
-  object: unknown;
-};
-
-type WrappedRecord<T> = {
-  object: T;
-  columnValues: object;
-  searchKeywords: NativeArray<unknown>;
-  filterValues: object;
-  color: RecordColor | null;
-};
-
-type RecordCallback<T> = (records: Array<{ columnValues: object; object: T }>) => void;
-
-function iterate<T>(arr: Array<T>, fn: (value: T) => void): void {
-  if (Symbol.iterator in arr) {
-    for (let item of arr) {
-      fn(item);
-    }
-  } else {
-    arr.forEach(fn);
-  }
-}
-
-class RecordsWatcher<T> {
-  recordCaches: Map<T, Cache<void>> = new Map();
-
-  added: WrappedRecord<T>[] = [];
-  updated: WrappedRecord<T>[] = [];
-  removed: WrappedRecord<T>[] = [];
-
-  declare recordArrayCache: Cache<void>;
-
-  getCacheForItem(record: T) {
-    let recordCache = this.recordCaches.get(record);
-
-    if (!recordCache) {
-      let hasBeenAdded = false;
-
-      recordCache = createCache(() => {
-        if (!hasBeenAdded) {
-          this.added.push(this.wrapRecord(record));
-          hasBeenAdded = true;
-        } else {
-          this.updated.push(this.wrapRecord(record));
-        }
-      });
-
-      this.recordCaches.set(record, recordCache);
-    }
-
-    return recordCache;
-  }
-
-  constructor(
-    records: NativeArray<T>,
-    recordsAdded: RecordCallback<T>,
-    recordsUpdated: RecordCallback<T>,
-    recordsRemoved: RecordCallback<T>,
-    public wrapRecord: (record: T) => WrappedRecord<T>,
-    public release: () => void
-  ) {
-    this.recordArrayCache = createCache(() => {
-      let seen = new Set();
-
-      // Track `[]` for legacy support
-      consumeTag(tagFor(records, '[]'));
-
-      iterate(records, (record) => {
-        getValue(this.getCacheForItem(record));
-        seen.add(record);
-      });
-
-      // Untrack this operation because these records are being removed, they
-      // should not be polled again in the future
-      untrack(() => {
-        this.recordCaches.forEach((_cache, record) => {
-          if (!seen.has(record)) {
-            this.removed.push(wrapRecord(record));
-            this.recordCaches.delete(record);
-          }
-        });
-      });
-
-      if (this.added.length > 0) {
-        recordsAdded(this.added);
-        this.added = [];
-      }
-
-      if (this.updated.length > 0) {
-        recordsUpdated(this.updated);
-        this.updated = [];
-      }
-
-      if (this.removed.length > 0) {
-        recordsRemoved(this.removed);
-        this.removed = [];
-      }
-    });
-  }
-
-  revalidate() {
-    getValue(this.recordArrayCache);
-  }
-}
-
-class TypeWatcher {
-  declare cache: Cache<void>;
-
-  constructor(records: unknown[], onChange: () => void, public release: () => void) {
-    let hasBeenAccessed = false;
-
-    this.cache = createCache(() => {
-      // Empty iteration, we're doing this just
-      // to track changes to the records array
-      iterate(records, () => {});
-
-      // Also track `[]` for legacy support
-      consumeTag(tagFor(records, '[]'));
-
-      if (hasBeenAccessed === true) {
-        onChange();
-      } else {
-        hasBeenAccessed = true;
-      }
-    });
-
-    this.release = release;
-  }
-
-  revalidate() {
-    getValue(this.cache);
-  }
-}
-
-/**
-@module @ember/debug
-*/
-
-/**
-  The `DataAdapter` helps a data persistence library
-  interface with tools that debug Ember such
-  as the [Ember Inspector](https://github.com/emberjs/ember-inspector)
-  for Chrome and Firefox.
-
-  This class will be extended by a persistence library
-  which will override some of the methods with
-  library-specific code.
-
-  The methods likely to be overridden are:
-
-  * `getFilters`
-  * `detect`
-  * `columnsForType`
-  * `getRecords`
-  * `getRecordColumnValues`
-  * `getRecordKeywords`
-  * `getRecordFilterValues`
-  * `getRecordColor`
-
-  The adapter will need to be registered
-  in the application's container as `dataAdapter:main`.
-
-  Example:
-
-  ```javascript
-  Application.initializer({
-    name: "data-adapter",
-
-    initialize: function(application) {
-      application.register('data-adapter:main', DS.DataAdapter);
-    }
-  });
-  ```
-
-  @class DataAdapter
-  @extends EmberObject
-  @public
-*/
-export default class DataAdapter<T> extends EmberObject {
-  releaseMethods = emberA<() => void>();
-  recordsWatchers: Map<unknown, { release: () => void; revalidate: () => void }> = new Map();
-  typeWatchers: Map<unknown, { release: () => void; revalidate: () => void }> = new Map();
-  flushWatchers: (() => void) | null = null;
-
-  // TODO: Revisit this
-  declare containerDebugAdapter: ContainerDebugAdapter;
-
-  constructor(owner: Owner) {
-    super(owner);
-    this.containerDebugAdapter = getOwner(this)!.lookup(
-      'container-debug-adapter:main'
-    ) as ContainerDebugAdapter;
-  }
-
-  /**
-    The container-debug-adapter which is used
-    to list all models.
-
-    @property containerDebugAdapter
-    @default undefined
-    @since 1.5.0
-    @public
-  **/
-
-  /**
-    The number of attributes to send
-    as columns. (Enough to make the record
-    identifiable).
-
-    @private
-    @property attributeLimit
-    @default 3
-    @since 1.3.0
-  */
-  attributeLimit = 3;
-
-  /**
-     Ember Data > v1.0.0-beta.18
-     requires string model names to be passed
-     around instead of the actual factories.
-
-     This is a stamp for the Ember Inspector
-     to differentiate between the versions
-     to be able to support older versions too.
-
-     @public
-     @property acceptsModelName
-   */
-  acceptsModelName = true;
-
-  /**
-     Map from records arrays to RecordsWatcher instances
-
-     @private
-     @property recordsWatchers
-     @since 3.26.0
-   */
-
-  /**
-    Map from records arrays to TypeWatcher instances
-
-    @private
-    @property typeWatchers
-    @since 3.26.0
-   */
-
-  /**
-    Callback that is currently scheduled on backburner end to flush and check
-    all active watchers.
-
-    @private
-    @property flushWatchers
-    @since 3.26.0
-
-   */
-
-  /**
-    Stores all methods that clear observers.
-    These methods will be called on destruction.
-
-    @private
-    @property releaseMethods
-    @since 1.3.0
-  */
-
-  /**
-    Specifies how records can be filtered.
-    Records returned will need to have a `filterValues`
-    property with a key for every name in the returned array.
-
-    @public
-    @method getFilters
-    @return {Array} List of objects defining filters.
-     The object should have a `name` and `desc` property.
-  */
-  getFilters() {
-    return emberA();
-  }
-
-  /**
-    Fetch the model types and observe them for changes.
-
-    @public
-    @method watchModelTypes
-
-    @param {Function} typesAdded Callback to call to add types.
-    Takes an array of objects containing wrapped types (returned from `wrapModelType`).
-
-    @param {Function} typesUpdated Callback to call when a type has changed.
-    Takes an array of objects containing wrapped types.
-
-    @return {Function} Method to call to remove all observers
-  */
-  watchModelTypes(
-    typesAdded: (types: WrappedType[]) => void,
-    typesUpdated: (types: WrappedType[]) => void
-  ) {
-    let modelTypes = this.getModelTypes();
-    let releaseMethods = emberA<() => void>();
-    let typesToSend;
-
-    typesToSend = modelTypes.map((type) => {
-      let klass = type.klass;
-      let wrapped = this.wrapModelType(klass, type.name);
-      releaseMethods.push(this.observeModelType(type.name, typesUpdated));
-      return wrapped;
-    });
-
-    typesAdded(typesToSend);
-
-    let release = () => {
-      releaseMethods.forEach((fn) => fn());
-      this.releaseMethods.removeObject(release);
-    };
-    this.releaseMethods.pushObject(release);
-    return release;
-  }
-
-  _nameToClass(type: unknown): unknown {
-    if (typeof type === 'string') {
-      let owner = getOwner(this)!;
-      let Factory = owner.factoryFor(`model:${type}`);
-      type = Factory && Factory.class;
-    }
-    return type;
-  }
-
-  /**
-    Fetch the records of a given type and observe them for changes.
-
-    @public
-    @method watchRecords
-
-    @param {String} modelName The model name.
-
-    @param {Function} recordsAdded Callback to call to add records.
-    Takes an array of objects containing wrapped records.
-    The object should have the following properties:
-      columnValues: {Object} The key and value of a table cell.
-      object: {Object} The actual record object.
-
-    @param {Function} recordsUpdated Callback to call when a record has changed.
-    Takes an array of objects containing wrapped records.
-
-    @param {Function} recordsRemoved Callback to call when a record has removed.
-    Takes an array of objects containing wrapped records.
-
-    @return {Function} Method to call to remove all observers.
-  */
-  watchRecords(
-    modelName: string,
-    recordsAdded: RecordCallback<T>,
-    recordsUpdated: RecordCallback<T>,
-    recordsRemoved: RecordCallback<T>
-  ) {
-    let klass = this._nameToClass(modelName);
-    let records = this.getRecords(klass, modelName);
-    let { recordsWatchers } = this;
-
-    let recordsWatcher = recordsWatchers.get(records);
-
-    if (!recordsWatcher) {
-      recordsWatcher = new RecordsWatcher<T>(
-        records,
-        recordsAdded,
-        recordsUpdated,
-        recordsRemoved,
-        (record: T) => this.wrapRecord(record),
-        () => {
-          recordsWatchers.delete(records);
-          this.updateFlushWatchers();
-        }
-      );
-
-      recordsWatchers.set(records, recordsWatcher);
-      this.updateFlushWatchers();
-
-      recordsWatcher.revalidate();
-    }
-
-    return recordsWatcher.release;
-  }
-
-  updateFlushWatchers() {
-    if (this.flushWatchers === null) {
-      if (this.typeWatchers.size > 0 || this.recordsWatchers.size > 0) {
-        this.flushWatchers = () => {
-          this.typeWatchers.forEach((watcher) => watcher.revalidate());
-          this.recordsWatchers.forEach((watcher) => watcher.revalidate());
-        };
-
-        _backburner.on('end', this.flushWatchers);
-      }
-    } else if (this.typeWatchers.size === 0 && this.recordsWatchers.size === 0) {
-      _backburner.off('end', this.flushWatchers);
-      this.flushWatchers = null;
-    }
-  }
-
-  /**
-    Clear all observers before destruction
-    @private
-    @method willDestroy
-  */
-  willDestroy() {
-    this._super(...arguments);
-
-    this.typeWatchers.forEach((watcher) => watcher.release());
-    this.recordsWatchers.forEach((watcher) => watcher.release());
-
-    this.releaseMethods.forEach((fn) => fn());
-
-    if (this.flushWatchers) {
-      _backburner.off('end', this.flushWatchers);
-    }
-  }
-
-  /**
-    Detect whether a class is a model.
-
-    Test that against the model class
-    of your persistence library.
-
-    @public
-    @method detect
-    @return boolean Whether the class is a model class or not.
-  */
-  detect(_klass: unknown): boolean {
-    return false;
-  }
-
-  /**
-    Get the columns for a given model type.
-
-    @public
-    @method columnsForType
-    @return {Array} An array of columns of the following format:
-     name: {String} The name of the column.
-     desc: {String} Humanized description (what would show in a table column name).
-  */
-  columnsForType(_klass: unknown) {
-    return emberA();
-  }
-
-  /**
-    Adds observers to a model type class.
-
-    @private
-    @method observeModelType
-    @param {String} modelName The model type name.
-    @param {Function} typesUpdated Called when a type is modified.
-    @return {Function} The function to call to remove observers.
-  */
-
-  observeModelType(modelName: string, typesUpdated: (types: WrappedType[]) => void) {
-    let klass = this._nameToClass(modelName);
-    let records = this.getRecords(klass, modelName);
-
-    let onChange = () => {
-      typesUpdated([this.wrapModelType(klass, modelName)]);
-    };
-
-    let { typeWatchers } = this;
-
-    let typeWatcher = typeWatchers.get(records);
-
-    if (!typeWatcher) {
-      typeWatcher = new TypeWatcher(records, onChange, () => {
-        typeWatchers.delete(records);
-        this.updateFlushWatchers();
-      });
-
-      typeWatchers.set(records, typeWatcher);
-      this.updateFlushWatchers();
-
-      typeWatcher.revalidate();
-    }
-
-    return typeWatcher.release;
-  }
-
-  /**
-    Wraps a given model type and observes changes to it.
-
-    @private
-    @method wrapModelType
-    @param {Class} klass A model class.
-    @param {String} modelName Name of the class.
-    @return {Object} The wrapped type has the following format:
-      name: {String} The name of the type.
-      count: {Integer} The number of records available.
-      columns: {Columns} An array of columns to describe the record.
-      object: {Class} The actual Model type class.
-  */
-  wrapModelType<N extends string>(klass: unknown, name: N): WrappedType<N> {
-    let records = this.getRecords(klass, name);
-
-    return {
-      name,
-      count: get(records, 'length'),
-      columns: this.columnsForType(klass),
-      object: klass,
-    };
-  }
-
-  /**
-    Fetches all models defined in the application.
-
-    @private
-    @method getModelTypes
-    @return {Array} Array of model types.
-  */
-  getModelTypes(): NativeArray<{ klass: unknown; name: string }> {
-    let containerDebugAdapter = this.containerDebugAdapter;
-
-    let stringTypes = containerDebugAdapter.canCatalogEntriesByType('model')
-      ? containerDebugAdapter.catalogEntriesByType('model')
-      : this._getObjectsOnNamespaces();
-
-    // New adapters return strings instead of classes.
-    let klassTypes = emberA(stringTypes).map((name) => {
-      return {
-        klass: this._nameToClass(name),
-        name,
-      };
-    });
-
-    return emberA(klassTypes).filter((type) => this.detect(type.klass));
-  }
-
-  /**
-    Loops over all namespaces and all objects
-    attached to them.
-
-    @private
-    @method _getObjectsOnNamespaces
-    @return {Array} Array of model type strings.
-  */
-  _getObjectsOnNamespaces() {
-    let namespaces = emberA(Namespace.NAMESPACES);
-    let types = emberA<string>();
-
-    namespaces.forEach((namespace) => {
-      for (let key in namespace) {
-        if (!Object.prototype.hasOwnProperty.call(namespace, key)) {
-          continue;
-        }
-        // Even though we will filter again in `getModelTypes`,
-        // we should not call `lookupFactory` on non-models
-        if (!this.detect((namespace as any)[key])) {
-          continue;
-        }
-        let name = dasherize(key);
-        types.push(name);
-      }
-    });
-    return types;
-  }
-
-  /**
-    Fetches all loaded records for a given type.
-
-    @public
-    @method getRecords
-    @return {Array} An array of records.
-     This array will be observed for changes,
-     so it should update when new records are added/removed.
-  */
-  getRecords(_klass: unknown, _name: string): NativeArray<T> {
-    return emberA();
-  }
-
-  /**
-    Wraps a record and observers changes to it.
-
-    @private
-    @method wrapRecord
-    @param {Object} record The record instance.
-    @return {Object} The wrapped record. Format:
-    columnValues: {Array}
-    searchKeywords: {Array}
-  */
-  wrapRecord(record: T): WrappedRecord<T> {
-    return {
-      object: record,
-      columnValues: this.getRecordColumnValues(record),
-      searchKeywords: this.getRecordKeywords(record),
-      filterValues: this.getRecordFilterValues(record),
-      color: this.getRecordColor(record),
-    };
-  }
-
-  /**
-    Gets the values for each column.
-
-    @public
-    @method getRecordColumnValues
-    @return {Object} Keys should match column names defined
-    by the model type.
-  */
-  getRecordColumnValues(_record: T) {
-    return {};
-  }
-
-  /**
-    Returns keywords to match when searching records.
-
-    @public
-    @method getRecordKeywords
-    @return {Array} Relevant keywords for search.
-  */
-  getRecordKeywords(_record: T) {
-    return emberA();
-  }
-
-  /**
-    Returns the values of filters defined by `getFilters`.
-
-    @public
-    @method getRecordFilterValues
-    @param {Object} record The record instance.
-    @return {Object} The filter values.
-  */
-  getRecordFilterValues(_record: T): object {
-    return {};
-  }
-
-  /**
-    Each record can have a color that represents its state.
-
-    @public
-    @method getRecordColor
-    @param {Object} record The record instance
-    @return {String} The records color.
-      Possible options: black, red, blue, green.
-  */
-  getRecordColor(_record: T): RecordColor | null {
-    return null;
-  }
-}
diff --git a/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js b/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js
deleted file mode 100644
index 282c138a84d..00000000000
--- a/packages/@ember/-internals/extension-support/tests/container_debug_adapter_test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
-import { run } from '@ember/runloop';
-import EmberController from '@ember/controller';
-import '../index'; // Must be required to export Ember.ContainerDebugAdapter.
-import { getDebugFunction, setDebugFunction } from '@ember/debug';
-
-const originalDebug = getDebugFunction('debug');
-
-moduleFor(
-  'Container Debug Adapter',
-  class extends ApplicationTestCase {
-    constructor() {
-      setDebugFunction('debug', () => {});
-      super();
-      this.adapter = this.application.__deprecatedInstance__.lookup('container-debug-adapter:main');
-    }
-
-    get applicationOptions() {
-      return Object.assign(super.applicationOptions, {
-        autoboot: true,
-      });
-    }
-
-    teardown() {
-      setDebugFunction('debug', originalDebug);
-      run(() => {
-        this.adapter.destroy();
-      });
-
-      super.teardown();
-    }
-
-    ['@test default ContainerDebugAdapter cannot catalog certain entries by type'](assert) {
-      assert.equal(
-        this.adapter.canCatalogEntriesByType('model'),
-        false,
-        'canCatalogEntriesByType should return false for model'
-      );
-      assert.equal(
-        this.adapter.canCatalogEntriesByType('template'),
-        false,
-        'canCatalogEntriesByType should return false for template'
-      );
-    }
-
-    ['@test default ContainerDebugAdapter can catalog typical entries by type'](assert) {
-      assert.equal(
-        this.adapter.canCatalogEntriesByType('controller'),
-        true,
-        'canCatalogEntriesByType should return true for controller'
-      );
-      assert.equal(
-        this.adapter.canCatalogEntriesByType('route'),
-        true,
-        'canCatalogEntriesByType should return true for route'
-      );
-      assert.equal(
-        this.adapter.canCatalogEntriesByType('view'),
-        true,
-        'canCatalogEntriesByType should return true for view'
-      );
-    }
-
-    ['@test default ContainerDebugAdapter catalogs controller entries'](assert) {
-      this.application.PostController = EmberController.extend();
-      let controllerClasses = this.adapter.catalogEntriesByType('controller');
-
-      assert.equal(controllerClasses.length, 1, 'found 1 class');
-      assert.equal(controllerClasses[0], 'post', 'found the right class');
-    }
-  }
-);
diff --git a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js b/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
deleted file mode 100644
index 9dabc566616..00000000000
--- a/packages/@ember/-internals/extension-support/tests/data_adapter_test.js
+++ /dev/null
@@ -1,273 +0,0 @@
-import { run } from '@ember/runloop';
-import { get, set } from '@ember/-internals/metal';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
-import EmberDataAdapter from '../lib/data_adapter';
-import { moduleFor, ApplicationTestCase, runLoopSettled } from 'internal-test-helpers';
-
-let adapter;
-const Model = EmberObject.extend();
-
-const PostClass = Model.extend();
-
-const DataAdapter = EmberDataAdapter.extend({
-  detect(klass) {
-    return klass !== Model && Model.detect(klass);
-  },
-  init() {
-    this._super(...arguments);
-    this.set('containerDebugAdapter', {
-      canCatalogEntriesByType() {
-        return true;
-      },
-      catalogEntriesByType() {
-        return emberA(['post']);
-      },
-    });
-  },
-});
-
-moduleFor(
-  'Data Adapter',
-  class extends ApplicationTestCase {
-    teardown() {
-      super.teardown();
-      adapter = undefined;
-    }
-
-    ['@test Model types added'](assert) {
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords() {
-            return emberA([1, 2, 3]);
-          },
-          columnsForType() {
-            return [{ name: 'title', desc: 'Title' }];
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(() => {
-        let adapter = this.applicationInstance.lookup('data-adapter:main');
-
-        function modelTypesAdded(types) {
-          assert.equal(types.length, 1);
-          let postType = types[0];
-          assert.equal(postType.name, 'post', 'Correctly sets the name');
-          assert.equal(postType.count, 3, 'Correctly sets the record count');
-          assert.strictEqual(postType.object, PostClass, 'Correctly sets the object');
-          assert.deepEqual(
-            postType.columns,
-            [{ name: 'title', desc: 'Title' }],
-            'Correctly sets the columns'
-          );
-        }
-
-        adapter.watchModelTypes(modelTypesAdded);
-      });
-    }
-
-    ['@test getRecords gets a model name as second argument'](assert) {
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords(klass, name) {
-            assert.equal(name, 'post');
-            return emberA();
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(() => {
-        adapter = this.applicationInstance.lookup('data-adapter:main');
-        adapter.watchModelTypes(function () {});
-      });
-    }
-
-    ['@test Model types added with custom container-debug-adapter'](assert) {
-      let StubContainerDebugAdapter = EmberObject.extend({
-        canCatalogEntriesByType() {
-          return true;
-        },
-        catalogEntriesByType() {
-          return emberA(['post']);
-        },
-      });
-      this.add('container-debug-adapter:main', StubContainerDebugAdapter);
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords() {
-            return emberA([1, 2, 3]);
-          },
-          columnsForType() {
-            return [{ name: 'title', desc: 'Title' }];
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(() => {
-        let adapter = this.applicationInstance.lookup('data-adapter:main');
-
-        function modelTypesAdded(types) {
-          assert.equal(types.length, 1);
-          let postType = types[0];
-          assert.equal(postType.name, 'post', 'Correctly sets the name');
-          assert.equal(postType.count, 3, 'Correctly sets the record count');
-          assert.strictEqual(postType.object, PostClass, 'Correctly sets the object');
-          assert.deepEqual(
-            postType.columns,
-            [{ name: 'title', desc: 'Title' }],
-            'Correctly sets the columns'
-          );
-        }
-
-        adapter.watchModelTypes(modelTypesAdded);
-      });
-    }
-
-    ['@test Model Types Updated'](assert) {
-      let records = emberA([1, 2, 3]);
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords() {
-            return records;
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(() => {
-        adapter = this.applicationInstance.lookup('data-adapter:main');
-
-        function modelTypesAdded() {
-          run(() => {
-            records.pushObject(4);
-          });
-        }
-
-        function modelTypesUpdated(types) {
-          let postType = types[0];
-          assert.equal(postType.count, 4, 'Correctly updates the count');
-        }
-
-        adapter.watchModelTypes(modelTypesAdded, modelTypesUpdated);
-      });
-    }
-
-    ['@test Records Added'](assert) {
-      let countAdded = 1;
-      let post = PostClass.create();
-      let recordList = emberA([post]);
-
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords() {
-            return recordList;
-          },
-          getRecordColor() {
-            return 'blue';
-          },
-          getRecordColumnValues() {
-            return { title: 'Post ' + countAdded };
-          },
-          getRecordKeywords() {
-            return ['Post ' + countAdded];
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(() => {
-        adapter = this.applicationInstance.lookup('data-adapter:main');
-
-        function recordsAdded(records) {
-          let record = records[0];
-          assert.equal(record.color, 'blue', 'Sets the color correctly');
-          assert.deepEqual(
-            record.columnValues,
-            { title: 'Post ' + countAdded },
-            'Sets the column values correctly'
-          );
-          assert.deepEqual(
-            record.searchKeywords,
-            ['Post ' + countAdded],
-            'Sets search keywords correctly'
-          );
-          assert.strictEqual(record.object, post, 'Sets the object to the record instance');
-        }
-
-        adapter.watchRecords('post', recordsAdded);
-        countAdded++;
-        post = PostClass.create();
-        recordList.pushObject(post);
-      });
-    }
-
-    ['@test Observes and releases a record correctly'](assert) {
-      let updatesCalled = 0;
-      let post = PostClass.create({ title: 'Post' });
-      let recordList = emberA([post]);
-
-      this.add(
-        'data-adapter:main',
-        DataAdapter.extend({
-          getRecords() {
-            return recordList;
-          },
-          getRecordColumnValues(record) {
-            return { title: get(record, 'title') };
-          },
-        })
-      );
-      this.add('model:post', PostClass);
-
-      let release;
-
-      return this.visit('/')
-        .then(() => {
-          adapter = this.applicationInstance.lookup('data-adapter:main');
-
-          function recordsAdded(records) {
-            assert.equal(records[0].columnValues.title, 'Post', 'Post added correctly');
-          }
-
-          function recordsUpdated(records) {
-            updatesCalled++;
-            assert.equal(records[0].columnValues.title, 'Post Modified');
-          }
-
-          release = adapter.watchRecords('post', recordsAdded, recordsUpdated);
-
-          return runLoopSettled();
-        })
-        .then(() => {
-          set(post, 'title', 'Post Modified');
-
-          return runLoopSettled();
-        })
-        .then(() => {
-          release();
-          set(post, 'title', 'New Title');
-          assert.equal(updatesCalled, 1, 'Release function removes observers');
-        });
-    }
-
-    ['@test _nameToClass does not error when not found'](assert) {
-      this.add('data-adapter:main', DataAdapter);
-
-      return this.visit('/').then(() => {
-        adapter = this.applicationInstance.lookup('data-adapter:main');
-
-        let klass = adapter._nameToClass('foo');
-
-        assert.equal(klass, undefined, 'returns undefined');
-      });
-    }
-  }
-);
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index b5b9ae0b62a..a9488321c65 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1 +1,109 @@
-export { ContainerDebugAdapter as default } from '@ember/-internals/extension-support';
+import { classify, dasherize } from '@ember/string';
+import type { NativeArray } from '@ember/-internals/runtime';
+import { A as emberA, typeOf, Object as EmberObject } from '@ember/-internals/runtime';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import type { Resolver } from '@ember/-internals/container/lib/registry';
+import Namespace from '@ember/application/namespace';
+
+/**
+@module @ember/debug
+*/
+
+/**
+  The `ContainerDebugAdapter` helps the container and resolver interface
+  with tools that debug Ember such as the
+  [Ember Inspector](https://github.com/emberjs/ember-inspector)
+  for Chrome and Firefox.
+
+  This class can be extended by a custom resolver implementer
+  to override some of the methods with library-specific code.
+
+  The methods likely to be overridden are:
+
+  * `canCatalogEntriesByType`
+  * `catalogEntriesByType`
+
+  The adapter will need to be registered
+  in the application's container as `container-debug-adapter:main`.
+
+  Example:
+
+  ```javascript
+  Application.initializer({
+    name: "containerDebugAdapter",
+
+    initialize(application) {
+      application.register('container-debug-adapter:main', require('app/container-debug-adapter'));
+    }
+  });
+  ```
+
+  @class ContainerDebugAdapter
+  @extends EmberObject
+  @since 1.5.0
+  @public
+*/
+export default class ContainerDebugAdapter extends EmberObject {
+  constructor(owner: Owner) {
+    super(owner);
+
+    this.resolver = getOwner(this)!.lookup('resolver-for-debugging:main') as Resolver;
+  }
+
+  /**
+    The resolver instance of the application
+    being debugged. This property will be injected
+    on creation.
+
+    @property resolver
+    @public
+  */
+  resolver: Resolver;
+
+  /**
+    Returns true if it is possible to catalog a list of available
+    classes in the resolver for a given type.
+
+    @method canCatalogEntriesByType
+    @param {String} type The type. e.g. "model", "controller", "route".
+    @return {boolean} whether a list is available for this type.
+    @public
+  */
+  canCatalogEntriesByType(type: string) {
+    if (type === 'model' || type === 'template') {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+    Returns the available classes a given type.
+
+    @method catalogEntriesByType
+    @param {String} type The type. e.g. "model", "controller", "route".
+    @return {Array} An array of strings.
+    @public
+  */
+  catalogEntriesByType(type: string): NativeArray<string> {
+    let namespaces = emberA(Namespace.NAMESPACES);
+    let types = emberA<string>();
+    let typeSuffixRegex = new RegExp(`${classify(type)}$`);
+
+    namespaces.forEach((namespace) => {
+      for (let key in namespace) {
+        if (!Object.prototype.hasOwnProperty.call(namespace, key)) {
+          continue;
+        }
+        if (typeSuffixRegex.test(key)) {
+          let klass = (namespace as any)[key];
+          if (typeOf(klass) === 'class') {
+            types.push(dasherize(key.replace(typeSuffixRegex, '')));
+          }
+        }
+      }
+    });
+    return types;
+  }
+}
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 8e7b38defc6..1b3c699c047 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -1 +1,658 @@
-export { DataAdapter as default } from '@ember/-internals/extension-support';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import { _backburner } from '@ember/runloop';
+import { get } from '@ember/-internals/metal';
+import { dasherize } from '@ember/string';
+import Namespace from '@ember/application/namespace';
+import type { NativeArray } from '@ember/-internals/runtime';
+import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import type { Cache } from '@glimmer/validator';
+import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
+import type ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+
+type RecordColor = 'black' | 'red' | 'blue' | 'green';
+
+type WrappedType<N extends string = string> = {
+  name: N;
+  count: number;
+  columns: unknown[];
+  object: unknown;
+};
+
+type WrappedRecord<T> = {
+  object: T;
+  columnValues: object;
+  searchKeywords: NativeArray<unknown>;
+  filterValues: object;
+  color: RecordColor | null;
+};
+
+type RecordCallback<T> = (records: Array<{ columnValues: object; object: T }>) => void;
+
+function iterate<T>(arr: Array<T>, fn: (value: T) => void): void {
+  if (Symbol.iterator in arr) {
+    for (let item of arr) {
+      fn(item);
+    }
+  } else {
+    arr.forEach(fn);
+  }
+}
+
+class RecordsWatcher<T> {
+  recordCaches: Map<T, Cache<void>> = new Map();
+
+  added: WrappedRecord<T>[] = [];
+  updated: WrappedRecord<T>[] = [];
+  removed: WrappedRecord<T>[] = [];
+
+  declare recordArrayCache: Cache<void>;
+
+  getCacheForItem(record: T) {
+    let recordCache = this.recordCaches.get(record);
+
+    if (!recordCache) {
+      let hasBeenAdded = false;
+
+      recordCache = createCache(() => {
+        if (!hasBeenAdded) {
+          this.added.push(this.wrapRecord(record));
+          hasBeenAdded = true;
+        } else {
+          this.updated.push(this.wrapRecord(record));
+        }
+      });
+
+      this.recordCaches.set(record, recordCache);
+    }
+
+    return recordCache;
+  }
+
+  constructor(
+    records: NativeArray<T>,
+    recordsAdded: RecordCallback<T>,
+    recordsUpdated: RecordCallback<T>,
+    recordsRemoved: RecordCallback<T>,
+    public wrapRecord: (record: T) => WrappedRecord<T>,
+    public release: () => void
+  ) {
+    this.recordArrayCache = createCache(() => {
+      let seen = new Set();
+
+      // Track `[]` for legacy support
+      consumeTag(tagFor(records, '[]'));
+
+      iterate(records, (record) => {
+        getValue(this.getCacheForItem(record));
+        seen.add(record);
+      });
+
+      // Untrack this operation because these records are being removed, they
+      // should not be polled again in the future
+      untrack(() => {
+        this.recordCaches.forEach((_cache, record) => {
+          if (!seen.has(record)) {
+            this.removed.push(wrapRecord(record));
+            this.recordCaches.delete(record);
+          }
+        });
+      });
+
+      if (this.added.length > 0) {
+        recordsAdded(this.added);
+        this.added = [];
+      }
+
+      if (this.updated.length > 0) {
+        recordsUpdated(this.updated);
+        this.updated = [];
+      }
+
+      if (this.removed.length > 0) {
+        recordsRemoved(this.removed);
+        this.removed = [];
+      }
+    });
+  }
+
+  revalidate() {
+    getValue(this.recordArrayCache);
+  }
+}
+
+class TypeWatcher {
+  declare cache: Cache<void>;
+
+  constructor(records: unknown[], onChange: () => void, public release: () => void) {
+    let hasBeenAccessed = false;
+
+    this.cache = createCache(() => {
+      // Empty iteration, we're doing this just
+      // to track changes to the records array
+      iterate(records, () => {});
+
+      // Also track `[]` for legacy support
+      consumeTag(tagFor(records, '[]'));
+
+      if (hasBeenAccessed === true) {
+        onChange();
+      } else {
+        hasBeenAccessed = true;
+      }
+    });
+
+    this.release = release;
+  }
+
+  revalidate() {
+    getValue(this.cache);
+  }
+}
+
+/**
+@module @ember/debug
+*/
+
+/**
+  The `DataAdapter` helps a data persistence library
+  interface with tools that debug Ember such
+  as the [Ember Inspector](https://github.com/emberjs/ember-inspector)
+  for Chrome and Firefox.
+
+  This class will be extended by a persistence library
+  which will override some of the methods with
+  library-specific code.
+
+  The methods likely to be overridden are:
+
+  * `getFilters`
+  * `detect`
+  * `columnsForType`
+  * `getRecords`
+  * `getRecordColumnValues`
+  * `getRecordKeywords`
+  * `getRecordFilterValues`
+  * `getRecordColor`
+
+  The adapter will need to be registered
+  in the application's container as `dataAdapter:main`.
+
+  Example:
+
+  ```javascript
+  Application.initializer({
+    name: "data-adapter",
+
+    initialize: function(application) {
+      application.register('data-adapter:main', DS.DataAdapter);
+    }
+  });
+  ```
+
+  @class DataAdapter
+  @extends EmberObject
+  @public
+*/
+export default class DataAdapter<T> extends EmberObject {
+  releaseMethods = emberA<() => void>();
+  recordsWatchers: Map<unknown, { release: () => void; revalidate: () => void }> = new Map();
+  typeWatchers: Map<unknown, { release: () => void; revalidate: () => void }> = new Map();
+  flushWatchers: (() => void) | null = null;
+
+  // TODO: Revisit this
+  declare containerDebugAdapter: ContainerDebugAdapter;
+
+  constructor(owner: Owner) {
+    super(owner);
+    this.containerDebugAdapter = getOwner(this)!.lookup(
+      'container-debug-adapter:main'
+    ) as ContainerDebugAdapter;
+  }
+
+  /**
+    The container-debug-adapter which is used
+    to list all models.
+
+    @property containerDebugAdapter
+    @default undefined
+    @since 1.5.0
+    @public
+  **/
+
+  /**
+    The number of attributes to send
+    as columns. (Enough to make the record
+    identifiable).
+
+    @private
+    @property attributeLimit
+    @default 3
+    @since 1.3.0
+  */
+  attributeLimit = 3;
+
+  /**
+     Ember Data > v1.0.0-beta.18
+     requires string model names to be passed
+     around instead of the actual factories.
+
+     This is a stamp for the Ember Inspector
+     to differentiate between the versions
+     to be able to support older versions too.
+
+     @public
+     @property acceptsModelName
+   */
+  acceptsModelName = true;
+
+  /**
+     Map from records arrays to RecordsWatcher instances
+
+     @private
+     @property recordsWatchers
+     @since 3.26.0
+   */
+
+  /**
+    Map from records arrays to TypeWatcher instances
+
+    @private
+    @property typeWatchers
+    @since 3.26.0
+   */
+
+  /**
+    Callback that is currently scheduled on backburner end to flush and check
+    all active watchers.
+
+    @private
+    @property flushWatchers
+    @since 3.26.0
+
+   */
+
+  /**
+    Stores all methods that clear observers.
+    These methods will be called on destruction.
+
+    @private
+    @property releaseMethods
+    @since 1.3.0
+  */
+
+  /**
+    Specifies how records can be filtered.
+    Records returned will need to have a `filterValues`
+    property with a key for every name in the returned array.
+
+    @public
+    @method getFilters
+    @return {Array} List of objects defining filters.
+     The object should have a `name` and `desc` property.
+  */
+  getFilters() {
+    return emberA();
+  }
+
+  /**
+    Fetch the model types and observe them for changes.
+
+    @public
+    @method watchModelTypes
+
+    @param {Function} typesAdded Callback to call to add types.
+    Takes an array of objects containing wrapped types (returned from `wrapModelType`).
+
+    @param {Function} typesUpdated Callback to call when a type has changed.
+    Takes an array of objects containing wrapped types.
+
+    @return {Function} Method to call to remove all observers
+  */
+  watchModelTypes(
+    typesAdded: (types: WrappedType[]) => void,
+    typesUpdated: (types: WrappedType[]) => void
+  ) {
+    let modelTypes = this.getModelTypes();
+    let releaseMethods = emberA<() => void>();
+    let typesToSend;
+
+    typesToSend = modelTypes.map((type) => {
+      let klass = type.klass;
+      let wrapped = this.wrapModelType(klass, type.name);
+      releaseMethods.push(this.observeModelType(type.name, typesUpdated));
+      return wrapped;
+    });
+
+    typesAdded(typesToSend);
+
+    let release = () => {
+      releaseMethods.forEach((fn) => fn());
+      this.releaseMethods.removeObject(release);
+    };
+    this.releaseMethods.pushObject(release);
+    return release;
+  }
+
+  _nameToClass(type: unknown): unknown {
+    if (typeof type === 'string') {
+      let owner = getOwner(this)!;
+      let Factory = owner.factoryFor(`model:${type}`);
+      type = Factory && Factory.class;
+    }
+    return type;
+  }
+
+  /**
+    Fetch the records of a given type and observe them for changes.
+
+    @public
+    @method watchRecords
+
+    @param {String} modelName The model name.
+
+    @param {Function} recordsAdded Callback to call to add records.
+    Takes an array of objects containing wrapped records.
+    The object should have the following properties:
+      columnValues: {Object} The key and value of a table cell.
+      object: {Object} The actual record object.
+
+    @param {Function} recordsUpdated Callback to call when a record has changed.
+    Takes an array of objects containing wrapped records.
+
+    @param {Function} recordsRemoved Callback to call when a record has removed.
+    Takes an array of objects containing wrapped records.
+
+    @return {Function} Method to call to remove all observers.
+  */
+  watchRecords(
+    modelName: string,
+    recordsAdded: RecordCallback<T>,
+    recordsUpdated: RecordCallback<T>,
+    recordsRemoved: RecordCallback<T>
+  ) {
+    let klass = this._nameToClass(modelName);
+    let records = this.getRecords(klass, modelName);
+    let { recordsWatchers } = this;
+
+    let recordsWatcher = recordsWatchers.get(records);
+
+    if (!recordsWatcher) {
+      recordsWatcher = new RecordsWatcher<T>(
+        records,
+        recordsAdded,
+        recordsUpdated,
+        recordsRemoved,
+        (record: T) => this.wrapRecord(record),
+        () => {
+          recordsWatchers.delete(records);
+          this.updateFlushWatchers();
+        }
+      );
+
+      recordsWatchers.set(records, recordsWatcher);
+      this.updateFlushWatchers();
+
+      recordsWatcher.revalidate();
+    }
+
+    return recordsWatcher.release;
+  }
+
+  updateFlushWatchers() {
+    if (this.flushWatchers === null) {
+      if (this.typeWatchers.size > 0 || this.recordsWatchers.size > 0) {
+        this.flushWatchers = () => {
+          this.typeWatchers.forEach((watcher) => watcher.revalidate());
+          this.recordsWatchers.forEach((watcher) => watcher.revalidate());
+        };
+
+        _backburner.on('end', this.flushWatchers);
+      }
+    } else if (this.typeWatchers.size === 0 && this.recordsWatchers.size === 0) {
+      _backburner.off('end', this.flushWatchers);
+      this.flushWatchers = null;
+    }
+  }
+
+  /**
+    Clear all observers before destruction
+    @private
+    @method willDestroy
+  */
+  willDestroy() {
+    this._super(...arguments);
+
+    this.typeWatchers.forEach((watcher) => watcher.release());
+    this.recordsWatchers.forEach((watcher) => watcher.release());
+
+    this.releaseMethods.forEach((fn) => fn());
+
+    if (this.flushWatchers) {
+      _backburner.off('end', this.flushWatchers);
+    }
+  }
+
+  /**
+    Detect whether a class is a model.
+
+    Test that against the model class
+    of your persistence library.
+
+    @public
+    @method detect
+    @return boolean Whether the class is a model class or not.
+  */
+  detect(_klass: unknown): boolean {
+    return false;
+  }
+
+  /**
+    Get the columns for a given model type.
+
+    @public
+    @method columnsForType
+    @return {Array} An array of columns of the following format:
+     name: {String} The name of the column.
+     desc: {String} Humanized description (what would show in a table column name).
+  */
+  columnsForType(_klass: unknown) {
+    return emberA();
+  }
+
+  /**
+    Adds observers to a model type class.
+
+    @private
+    @method observeModelType
+    @param {String} modelName The model type name.
+    @param {Function} typesUpdated Called when a type is modified.
+    @return {Function} The function to call to remove observers.
+  */
+
+  observeModelType(modelName: string, typesUpdated: (types: WrappedType[]) => void) {
+    let klass = this._nameToClass(modelName);
+    let records = this.getRecords(klass, modelName);
+
+    let onChange = () => {
+      typesUpdated([this.wrapModelType(klass, modelName)]);
+    };
+
+    let { typeWatchers } = this;
+
+    let typeWatcher = typeWatchers.get(records);
+
+    if (!typeWatcher) {
+      typeWatcher = new TypeWatcher(records, onChange, () => {
+        typeWatchers.delete(records);
+        this.updateFlushWatchers();
+      });
+
+      typeWatchers.set(records, typeWatcher);
+      this.updateFlushWatchers();
+
+      typeWatcher.revalidate();
+    }
+
+    return typeWatcher.release;
+  }
+
+  /**
+    Wraps a given model type and observes changes to it.
+
+    @private
+    @method wrapModelType
+    @param {Class} klass A model class.
+    @param {String} modelName Name of the class.
+    @return {Object} The wrapped type has the following format:
+      name: {String} The name of the type.
+      count: {Integer} The number of records available.
+      columns: {Columns} An array of columns to describe the record.
+      object: {Class} The actual Model type class.
+  */
+  wrapModelType<N extends string>(klass: unknown, name: N): WrappedType<N> {
+    let records = this.getRecords(klass, name);
+
+    return {
+      name,
+      count: get(records, 'length'),
+      columns: this.columnsForType(klass),
+      object: klass,
+    };
+  }
+
+  /**
+    Fetches all models defined in the application.
+
+    @private
+    @method getModelTypes
+    @return {Array} Array of model types.
+  */
+  getModelTypes(): NativeArray<{ klass: unknown; name: string }> {
+    let containerDebugAdapter = this.containerDebugAdapter;
+
+    let stringTypes = containerDebugAdapter.canCatalogEntriesByType('model')
+      ? containerDebugAdapter.catalogEntriesByType('model')
+      : this._getObjectsOnNamespaces();
+
+    // New adapters return strings instead of classes.
+    let klassTypes = emberA(stringTypes).map((name) => {
+      return {
+        klass: this._nameToClass(name),
+        name,
+      };
+    });
+
+    return emberA(klassTypes).filter((type) => this.detect(type.klass));
+  }
+
+  /**
+    Loops over all namespaces and all objects
+    attached to them.
+
+    @private
+    @method _getObjectsOnNamespaces
+    @return {Array} Array of model type strings.
+  */
+  _getObjectsOnNamespaces() {
+    let namespaces = emberA(Namespace.NAMESPACES);
+    let types = emberA<string>();
+
+    namespaces.forEach((namespace) => {
+      for (let key in namespace) {
+        if (!Object.prototype.hasOwnProperty.call(namespace, key)) {
+          continue;
+        }
+        // Even though we will filter again in `getModelTypes`,
+        // we should not call `lookupFactory` on non-models
+        if (!this.detect((namespace as any)[key])) {
+          continue;
+        }
+        let name = dasherize(key);
+        types.push(name);
+      }
+    });
+    return types;
+  }
+
+  /**
+    Fetches all loaded records for a given type.
+
+    @public
+    @method getRecords
+    @return {Array} An array of records.
+     This array will be observed for changes,
+     so it should update when new records are added/removed.
+  */
+  getRecords(_klass: unknown, _name: string): NativeArray<T> {
+    return emberA();
+  }
+
+  /**
+    Wraps a record and observers changes to it.
+
+    @private
+    @method wrapRecord
+    @param {Object} record The record instance.
+    @return {Object} The wrapped record. Format:
+    columnValues: {Array}
+    searchKeywords: {Array}
+  */
+  wrapRecord(record: T): WrappedRecord<T> {
+    return {
+      object: record,
+      columnValues: this.getRecordColumnValues(record),
+      searchKeywords: this.getRecordKeywords(record),
+      filterValues: this.getRecordFilterValues(record),
+      color: this.getRecordColor(record),
+    };
+  }
+
+  /**
+    Gets the values for each column.
+
+    @public
+    @method getRecordColumnValues
+    @return {Object} Keys should match column names defined
+    by the model type.
+  */
+  getRecordColumnValues(_record: T) {
+    return {};
+  }
+
+  /**
+    Returns keywords to match when searching records.
+
+    @public
+    @method getRecordKeywords
+    @return {Array} Relevant keywords for search.
+  */
+  getRecordKeywords(_record: T) {
+    return emberA();
+  }
+
+  /**
+    Returns the values of filters defined by `getFilters`.
+
+    @public
+    @method getRecordFilterValues
+    @param {Object} record The record instance.
+    @return {Object} The filter values.
+  */
+  getRecordFilterValues(_record: T): object {
+    return {};
+  }
+
+  /**
+    Each record can have a color that represents its state.
+
+    @public
+    @method getRecordColor
+    @param {Object} record The record instance
+    @return {String} The records color.
+      Possible options: black, red, blue, green.
+  */
+  getRecordColor(_record: T): RecordColor | null {
+    return null;
+  }
+}
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index c1262a176e9..fb9c6f4baa6 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -6,11 +6,11 @@ import Namespace from '@ember/application/namespace';
 import { Registry } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
+import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
 import { get, set } from '@ember/-internals/metal';
 import type { EngineInstanceOptions } from '@ember/engine/instance';
 import EngineInstance from '@ember/engine/instance';
 import { RoutingService } from '@ember/-internals/routing';
-import { ContainerDebugAdapter } from '@ember/-internals/extension-support';
 import { ComponentLookup } from '@ember/-internals/views';
 import { setupEngineRegistry } from '@ember/-internals/glimmer';
 import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 64ac4d9bd23..96564bd27d9 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -72,7 +72,8 @@ import {
 import VERSION from './version';
 import * as views from '@ember/-internals/views';
 import * as routing from '@ember/-internals/routing';
-import * as extensionSupport from '@ember/-internals/extension-support';
+import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+import DataAdapter from '@ember/debug/data-adapter';
 import EmberError from '@ember/error';
 import { run } from '@ember/runloop';
 import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
@@ -514,8 +515,8 @@ Ember.Route = routing.Route;
 
 runLoadHooks('Ember.Application', Application);
 
-Ember.DataAdapter = extensionSupport.DataAdapter;
-Ember.ContainerDebugAdapter = extensionSupport.ContainerDebugAdapter;
+Ember.DataAdapter = DataAdapter;
+Ember.ContainerDebugAdapter = ContainerDebugAdapter;
 
 let EmberHandlebars = {
   template,

From b584e5657a86cacb01fa5aa3dd018f9c2f6b0b4d Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 10:02:23 -0700
Subject: [PATCH 1051/1405] Relocate BootOptions interface

---
 .../@ember/-internals/glimmer/lib/views/outlet.ts |  2 +-
 packages/@ember/application/index.ts              |  2 +-
 packages/@ember/application/instance.ts           | 12 +-----------
 .../application/type-tests/instance.test.ts       |  4 ++--
 packages/@ember/engine/instance.ts                | 15 +++++++++++++--
 .../lib/test-cases/abstract-application.ts        |  2 +-
 .../lib/test-cases/query-param.ts                 |  2 +-
 .../lib/test-cases/rendering.ts                   |  3 +--
 .../lib/test-cases/router-non-application.ts      |  3 +--
 9 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 724f9b354a6..8e2153f88cd 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,6 +1,6 @@
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import type { BootOptions } from '@ember/application/instance';
+import type { BootOptions } from '@ember/engine/instance';
 import { assert } from '@ember/debug';
 import { schedule } from '@ember/runloop';
 import type { Template } from '@glimmer/interfaces';
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index dbb04cb731f..dde288c2106 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -22,9 +22,9 @@ import {
   NoneLocation,
   BucketCache,
 } from '@ember/-internals/routing';
-import type { BootOptions } from '@ember/application/instance';
 import ApplicationInstance from '@ember/application/instance';
 import Engine, { buildInitializerMethod } from '@ember/engine';
+import type { BootOptions } from '@ember/engine/instance';
 import type { Container, Registry } from '@ember/-internals/container';
 import { privatize as P } from '@ember/-internals/container';
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index 7af9c082788..32f3171d61e 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -5,6 +5,7 @@
 import { get, set } from '@ember/-internals/metal';
 import * as environment from '@ember/-internals/browser-environment';
 import EngineInstance from '@ember/engine/instance';
+import type { BootOptions } from '@ember/engine/instance';
 import type Application from '@ember/application';
 import { renderSettled } from '@ember/-internals/glimmer';
 import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
@@ -15,17 +16,6 @@ import { EventDispatcher } from '@ember/-internals/views';
 import type { Registry } from '@ember/-internals/container';
 import type { SimpleElement } from '@simple-dom/interface';
 
-export interface BootOptions {
-  isBrowser?: boolean;
-  shouldRender?: boolean;
-  document?: Document | null;
-  rootElement?: string | SimpleElement | null;
-  location?: string | null;
-  // Private?
-  isInteractive?: boolean;
-  _renderMode?: string;
-}
-
 /**
   The `ApplicationInstance` encapsulates all of the stateful aspects of a
   running `Application`.
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index afd3572c5bb..469740690df 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -1,8 +1,8 @@
 import type { Factory, Owner } from '@ember/-internals/owner';
+import type EngineInstance from '@ember/engine/instance';
+import type { BootOptions } from '@ember/engine/instance';
 import Application from '@ember/application';
-import type { BootOptions } from '@ember/application/instance';
 import type ApplicationInstance from '@ember/application/instance';
-import type EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 
 import { expectTypeOf } from 'expect-type';
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 54f3cd76836..e8c5ea45154 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -11,13 +11,24 @@ import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-pa
 import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
 import ContainerProxyMixin from '@ember/-internals/runtime/lib/mixins/container_proxy';
 import { isFactory } from '@ember/-internals/owner';
-import Engine from '.';
+import Engine from '@ember/engine';
 import type Application from '@ember/application';
-import type { BootOptions } from '@ember/application/instance';
 import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type { SimpleElement } from '@simple-dom/interface';
 
 const CEngine = Engine;
 
+export interface BootOptions {
+  isBrowser?: boolean;
+  shouldRender?: boolean;
+  document?: Document | null;
+  rootElement?: string | SimpleElement | null;
+  location?: string | null;
+  // Private?
+  isInteractive?: boolean;
+  _renderMode?: string;
+}
+
 export interface EngineInstanceOptions {
   mountPoint?: string;
   routable?: boolean;
diff --git a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
index d1c9f8666d1..bfae6b31741 100644
--- a/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/abstract-application.ts
@@ -3,8 +3,8 @@ import { compile } from 'ember-template-compiler';
 import { ENV } from '@ember/-internals/environment';
 import AbstractTestCase from './abstract';
 import { runDestroy, runTask, runLoopSettled } from '../run';
+import type { BootOptions } from '@ember/engine/instance';
 import type Application from '@ember/application';
-import type { BootOptions } from '@ember/application/instance';
 import type ApplicationInstance from '@ember/application/instance';
 import type Router from '@ember/routing/router';
 
diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.ts b/packages/internal-test-helpers/lib/test-cases/query-param.ts
index 503930b0290..e5f6f1ce664 100644
--- a/packages/internal-test-helpers/lib/test-cases/query-param.ts
+++ b/packages/internal-test-helpers/lib/test-cases/query-param.ts
@@ -1,4 +1,4 @@
-import type { BootOptions } from '@ember/application/instance';
+import type { BootOptions } from '@ember/engine/instance';
 import Controller from '@ember/controller';
 import type EmberObject from '@ember/object';
 import { NoneLocation } from '@ember/-internals/routing';
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index 04d2dd3f7a2..d3a10c10c90 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -10,8 +10,7 @@ import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy, runTask } from '../run';
 import type { Factory } from '@ember/-internals/owner';
-import type { BootOptions } from '@ember/application/instance';
-import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance';
 import type EngineInstance from '@ember/engine/instance';
 import type { HelperFunction } from '@ember/-internals/glimmer/lib/helper';
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
index 50a89e4381b..a895e9732fd 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
@@ -9,9 +9,8 @@ import { ModuleBasedResolver } from '../test-resolver';
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy } from '../run';
-import type { EngineInstanceOptions } from '@ember/engine/instance';
+import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance';
 import type EngineInstance from '@ember/engine/instance';
-import type { BootOptions } from '@ember/application/instance';
 import type { Factory } from '@ember/-internals/owner';
 
 export default class RouterNonApplicationTestCase extends AbstractTestCase {

From 48397f557ce05dfc5eb575461dbf25a3dcd9011e Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 10:07:17 -0700
Subject: [PATCH 1052/1405] Consolidate @ember/enumerable

---
 packages/@ember/-internals/runtime/index.ts   |  1 -
 .../-internals/runtime/lib/mixins/array.ts    |  2 +-
 .../runtime/lib/mixins/enumerable.ts          | 20 ------------------
 .../runtime/lib/mixins/mutable_enumerable.ts  |  2 +-
 packages/@ember/enumerable/index.ts           | 21 ++++++++++++++++++-
 .../tests}/enumerable_test.js                 |  6 +++---
 packages/ember/index.js                       |  2 +-
 7 files changed, 26 insertions(+), 28 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/enumerable.ts
 rename packages/@ember/{-internals/runtime/tests/mixins => enumerable/tests}/enumerable_test.js (69%)

diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index 401b55df76a..36b621b0578 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -17,7 +17,6 @@ export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
 export { default as CoreObject } from './lib/system/core_object';
 export { default as ActionHandler } from './lib/mixins/action_handler';
-export { default as Enumerable } from './lib/mixins/enumerable';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as Observable } from './lib/mixins/observable';
 export { default as MutableEnumerable } from './lib/mixins/mutable_enumerable';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.ts b/packages/@ember/-internals/runtime/lib/mixins/array.ts
index e99c23c1cfc..8874e343a93 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.ts
@@ -16,7 +16,7 @@ import {
   endPropertyChanges,
 } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
-import Enumerable from './enumerable';
+import Enumerable from '@ember/enumerable';
 import compare from '../compare';
 import { ENV } from '@ember/-internals/environment';
 import Observable from '../mixins/observable';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/enumerable.ts b/packages/@ember/-internals/runtime/lib/mixins/enumerable.ts
deleted file mode 100644
index f300411cbe2..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/enumerable.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Mixin } from '@ember/-internals/metal';
-
-/**
-@module @ember/enumerable
-@private
-*/
-
-/**
-  The methods in this mixin have been moved to [MutableArray](/ember/release/classes/MutableArray). This mixin has
-  been intentionally preserved to avoid breaking Enumerable.detect checks
-  until the community migrates away from them.
-
-  @class Enumerable
-  @private
-*/
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface Enumerable {}
-const Enumerable = Mixin.create();
-
-export default Enumerable;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
index 39136466eef..1b50d895241 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
@@ -1,4 +1,4 @@
-import Enumerable from './enumerable';
+import Enumerable from '@ember/enumerable';
 import { Mixin } from '@ember/-internals/metal';
 
 /**
diff --git a/packages/@ember/enumerable/index.ts b/packages/@ember/enumerable/index.ts
index 804b96ff035..f300411cbe2 100644
--- a/packages/@ember/enumerable/index.ts
+++ b/packages/@ember/enumerable/index.ts
@@ -1 +1,20 @@
-export { Enumerable as default } from '@ember/-internals/runtime';
+import { Mixin } from '@ember/-internals/metal';
+
+/**
+@module @ember/enumerable
+@private
+*/
+
+/**
+  The methods in this mixin have been moved to [MutableArray](/ember/release/classes/MutableArray). This mixin has
+  been intentionally preserved to avoid breaking Enumerable.detect checks
+  until the community migrates away from them.
+
+  @class Enumerable
+  @private
+*/
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface Enumerable {}
+const Enumerable = Mixin.create();
+
+export default Enumerable;
diff --git a/packages/@ember/-internals/runtime/tests/mixins/enumerable_test.js b/packages/@ember/enumerable/tests/enumerable_test.js
similarity index 69%
rename from packages/@ember/-internals/runtime/tests/mixins/enumerable_test.js
rename to packages/@ember/enumerable/tests/enumerable_test.js
index 66700a9f4a5..caf4e226f29 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/enumerable_test.js
+++ b/packages/@ember/enumerable/tests/enumerable_test.js
@@ -1,6 +1,6 @@
-import Enumerable from '../../lib/mixins/enumerable';
-import ArrayProxy from '../../lib/system/array_proxy';
-import { A } from '../../lib/mixins/array';
+import Enumerable from '@ember/enumerable';
+import ArrayProxy from '@ember/array/proxy';
+import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 96564bd27d9..185a6e4ce2a 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -45,7 +45,6 @@ import {
   _ProxyMixin,
   RSVP,
   Comparable,
-  Enumerable,
   ArrayProxy,
   ObjectProxy,
   ActionHandler,
@@ -83,6 +82,7 @@ import ApplicationInstance from '@ember/application/instance';
 import Namespace from '@ember/application/namespace';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
+import Enumerable from '@ember/enumerable';
 import { assign } from '@ember/polyfills';
 
 import {

From 0e6a0545a2e9b45369e99cdabcfa0857214549b3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 10:14:43 -0700
Subject: [PATCH 1053/1405] Consolidate @ember/object/core

---
 packages/@ember/-internals/runtime/index.ts   |    1 -
 .../runtime/lib/mixins/promise_proxy.ts       |    2 +-
 .../runtime/lib/system/core_object.ts         | 1111 ----------------
 .../-internals/runtime/lib/system/object.ts   |    2 +-
 .../@ember/-internals/runtime/lib/type-of.ts  |    2 +-
 .../runtime/tests/mixins/evented_test.js      |    2 +-
 .../runtime/tests/system/core_object_test.js  |    2 +-
 packages/@ember/object/core.ts                | 1112 ++++++++++++++++-
 .../object => object/tests}/reopen_test.js    |    4 +-
 packages/ember/index.js                       |    2 +-
 10 files changed, 1119 insertions(+), 1121 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/core_object.ts
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/reopen_test.js (91%)

diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index 36b621b0578..9c1a22e2223 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -15,7 +15,6 @@ export {
 export { default as Comparable } from './lib/mixins/comparable';
 export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
-export { default as CoreObject } from './lib/system/core_object';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as Observable } from './lib/mixins/observable';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
index 7e41b6bd327..f79946edc3e 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
@@ -2,7 +2,7 @@ import { get, setProperties, computed, Mixin } from '@ember/-internals/metal';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
 import type RSVP from 'rsvp';
-import type CoreObject from '../system/core_object';
+import type CoreObject from '@ember/object/core';
 
 /**
   @module @ember/object
diff --git a/packages/@ember/-internals/runtime/lib/system/core_object.ts b/packages/@ember/-internals/runtime/lib/system/core_object.ts
deleted file mode 100644
index 14904e8542b..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/core_object.ts
+++ /dev/null
@@ -1,1111 +0,0 @@
-/**
-  @module @ember/object
-*/
-
-import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
-import { getOwner } from '@ember/-internals/owner';
-import type { Owner } from '@ember/-internals/owner';
-import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
-import { meta } from '@ember/-internals/meta';
-import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal';
-import {
-  PROXY_CONTENT,
-  sendEvent,
-  Mixin,
-  activateObserver,
-  applyMixin,
-  defineProperty,
-  descriptorForProperty,
-  isClassicDecorator,
-  DEBUG_INJECTION_FUNCTIONS,
-  hasUnknownProperty,
-} from '@ember/-internals/metal';
-import ActionHandler from '../mixins/action_handler';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import { _WeakSet as WeakSet } from '@glimmer/util';
-import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
-import { OWNER } from '@glimmer/owner';
-
-type EmberClassConstructor<T> = new (owner?: Owner) => T;
-
-type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
-  ? T & MergeArray<Rest>
-  : unknown; // TODO: Is this correct?
-
-interface HasSetUnknownProperty {
-  setUnknownProperty: (keyName: string, value: any) => any;
-}
-
-function hasSetUnknownProperty(val: unknown): val is HasSetUnknownProperty {
-  return (
-    typeof val === 'object' &&
-    val !== null &&
-    typeof (val as HasSetUnknownProperty).setUnknownProperty === 'function'
-  );
-}
-
-interface HasToStringExtension {
-  toStringExtension: () => void;
-}
-
-function hasToStringExtension(val: unknown): val is HasToStringExtension {
-  return (
-    typeof val === 'object' &&
-    val !== null &&
-    typeof (val as HasToStringExtension).toStringExtension === 'function'
-  );
-}
-const reopen = Mixin.prototype.reopen;
-
-const wasApplied = new WeakSet();
-const prototypeMixinMap = new WeakMap();
-
-const initCalled = DEBUG ? new WeakSet() : undefined; // only used in debug builds to enable the proxy trap
-
-const destroyCalled = new Set();
-
-function ensureDestroyCalled(instance: CoreObject) {
-  if (!destroyCalled.has(instance)) {
-    instance.destroy();
-  }
-}
-
-function initialize(obj: CoreObject, properties?: unknown) {
-  let m = meta(obj);
-
-  if (properties !== undefined) {
-    assert(
-      'EmberObject.create only accepts objects.',
-      typeof properties === 'object' && properties !== null
-    );
-
-    assert(
-      'EmberObject.create no longer supports mixing in other ' +
-        'definitions, use .extend & .create separately instead.',
-      !(properties instanceof Mixin)
-    );
-
-    let concatenatedProperties = obj.concatenatedProperties;
-    let mergedProperties = obj.mergedProperties;
-
-    let keyNames = Object.keys(properties);
-
-    for (let keyName of keyNames) {
-      let value = (properties as any)[keyName];
-
-      assert(
-        'EmberObject.create no longer supports defining computed ' +
-          'properties. Define computed properties using extend() or reopen() ' +
-          'before calling create().',
-        !isClassicDecorator(value)
-      );
-      assert(
-        'EmberObject.create no longer supports defining methods that call _super.',
-        !(typeof value === 'function' && value.toString().indexOf('._super') !== -1)
-      );
-      assert(
-        '`actions` must be provided at extend time, not at create time, ' +
-          'when Ember.ActionHandler is used (i.e. views, controllers & routes).',
-        !(keyName === 'actions' && ActionHandler.detect(obj))
-      );
-
-      let possibleDesc = descriptorForProperty(obj, keyName, m);
-      let isDescriptor = possibleDesc !== undefined;
-
-      if (!isDescriptor) {
-        if (
-          concatenatedProperties !== undefined &&
-          concatenatedProperties.length > 0 &&
-          concatenatedProperties.includes(keyName)
-        ) {
-          let baseValue = (obj as any)[keyName];
-          if (baseValue) {
-            value = makeArray(baseValue).concat(value);
-          } else {
-            value = makeArray(value);
-          }
-        }
-
-        if (
-          mergedProperties !== undefined &&
-          mergedProperties.length > 0 &&
-          mergedProperties.includes(keyName)
-        ) {
-          let baseValue = (obj as any)[keyName];
-          value = Object.assign({}, baseValue, value);
-        }
-      }
-
-      if (isDescriptor) {
-        possibleDesc.set(obj, keyName, value);
-      } else if (hasSetUnknownProperty(obj) && !(keyName in obj)) {
-        obj.setUnknownProperty(keyName, value);
-      } else {
-        if (DEBUG) {
-          defineProperty(obj, keyName, null, value, m); // setup mandatory setter
-        } else {
-          (obj as any)[keyName] = value;
-        }
-      }
-    }
-  }
-
-  // using DEBUG here to avoid the extraneous variable when not needed
-  if (DEBUG) {
-    initCalled!.add(obj);
-  }
-  obj.init(properties);
-
-  m.unsetInitializing();
-
-  let observerEvents = m.observerEvents();
-
-  if (observerEvents !== undefined) {
-    for (let i = 0; i < observerEvents.length; i++) {
-      activateObserver(obj, observerEvents[i].event, observerEvents[i].sync);
-    }
-  }
-
-  sendEvent(obj, 'init', undefined, undefined, m);
-}
-
-/**
-  `CoreObject` is the base class for all Ember constructs. It establishes a
-  class system based on Ember's Mixin system, and provides the basis for the
-  Ember Object Model. `CoreObject` should generally not be used directly,
-  instead you should use `EmberObject`.
-
-  ## Usage
-
-  You can define a class by extending from `CoreObject` using the `extend`
-  method:
-
-  ```js
-  const Person = CoreObject.extend({
-    name: 'Tomster',
-  });
-  ```
-
-  For detailed usage, see the [Object Model](https://guides.emberjs.com/release/object-model/)
-  section of the guides.
-
-  ## Usage with Native Classes
-
-  Native JavaScript `class` syntax can be used to extend from any `CoreObject`
-  based class:
-
-  ```js
-  class Person extends CoreObject {
-    init() {
-      super.init(...arguments);
-      this.name = 'Tomster';
-    }
-  }
-  ```
-
-  Some notes about `class` usage:
-
-  * `new` syntax is not currently supported with classes that extend from
-    `EmberObject` or `CoreObject`. You must continue to use the `create` method
-    when making new instances of classes, even if they are defined using native
-    class syntax. If you want to use `new` syntax, consider creating classes
-    which do _not_ extend from `EmberObject` or `CoreObject`. Ember features,
-    such as computed properties and decorators, will still work with base-less
-    classes.
-  * Instead of using `this._super()`, you must use standard `super` syntax in
-    native classes. See the [MDN docs on classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes#Super_class_calls_with_super)
-    for more details.
-  * Native classes support using [constructors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes#Constructor)
-    to set up newly-created instances. Ember uses these to, among other things,
-    support features that need to retrieve other entities by name, like Service
-    injection and `getOwner`. To ensure your custom instance setup logic takes
-    place after this important work is done, avoid using the `constructor` in
-    favor of `init`.
-  * Properties passed to `create` will be available on the instance by the time
-    `init` runs, so any code that requires these values should work at that
-    time.
-  * Using native classes, and switching back to the old Ember Object model is
-    fully supported.
-
-  @class CoreObject
-  @public
-*/
-interface CoreObject {
-  /** @internal */
-  _super(...args: any[]): any;
-}
-class CoreObject {
-  [OWNER]?: Owner;
-
-  constructor(owner?: Owner) {
-    this[OWNER] = owner;
-
-    // prepare prototype...
-    (this.constructor as typeof CoreObject).proto();
-
-    let self;
-    if (DEBUG && hasUnknownProperty(this)) {
-      let messageFor = (obj: unknown, property: unknown) => {
-        return (
-          `You attempted to access the \`${String(property)}\` property (of ${obj}).\n` +
-          `Since Ember 3.1, this is usually fine as you no longer need to use \`.get()\`\n` +
-          `to access computed properties. However, in this case, the object in question\n` +
-          `is a special kind of Ember object (a proxy). Therefore, it is still necessary\n` +
-          `to use \`.get('${String(property)}')\` in this case.\n\n` +
-          `If you encountered this error because of third-party code that you don't control,\n` +
-          `there is more information at https://github.com/emberjs/ember.js/issues/16148, and\n` +
-          `you can help us improve this error message by telling us more about what happened in\n` +
-          `this situation.`
-        );
-      };
-
-      /* globals Proxy Reflect */
-      self = new Proxy(this, {
-        get(target: CoreObject & HasUnknownProperty, property, receiver) {
-          if (property === PROXY_CONTENT) {
-            return target;
-          } else if (
-            // init called will be set on the proxy, not the target, so get with the receiver
-            !initCalled!.has(receiver) ||
-            typeof property === 'symbol' ||
-            isInternalSymbol(property) ||
-            property === 'toJSON' ||
-            property === 'toString' ||
-            property === 'toStringExtension' ||
-            property === 'didDefineProperty' ||
-            property === 'willWatchProperty' ||
-            property === 'didUnwatchProperty' ||
-            property === 'didAddListener' ||
-            property === 'didRemoveListener' ||
-            property === 'isDescriptor' ||
-            property === '_onLookup' ||
-            property in target
-          ) {
-            return Reflect.get(target, property, receiver);
-          }
-
-          let value = target.unknownProperty.call(receiver, property);
-
-          if (typeof value !== 'function') {
-            assert(messageFor(receiver, property), value === undefined || value === null);
-          }
-        },
-      });
-    } else {
-      self = this;
-    }
-
-    const destroyable = self;
-    registerDestructor(self, ensureDestroyCalled, true);
-    registerDestructor(self, () => destroyable.willDestroy());
-
-    // disable chains
-    let m = meta(self);
-
-    m.setInitializing();
-
-    // only return when in debug builds and `self` is the proxy created above
-    if (DEBUG && self !== this) {
-      return self;
-    }
-  }
-
-  reopen(...args: Array<Mixin | Record<string, unknown>>) {
-    applyMixin(this, args);
-    return this;
-  }
-
-  /**
-    An overridable method called when objects are instantiated. By default,
-    does nothing unless it is overridden during class definition.
-
-    Example:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend({
-      init() {
-        alert(`Name is ${this.get('name')}`);
-      }
-    });
-
-    let steve = Person.create({
-      name: 'Steve'
-    });
-
-    // alerts 'Name is Steve'.
-    ```
-
-    NOTE: If you do override `init` for a framework class like `Component`
-    from `@ember/component`, be sure to call `this._super(...arguments)`
-    in your `init` declaration!
-    If you don't, Ember may not have an opportunity to
-    do important setup work, and you'll see strange behavior in your
-    application.
-
-    @method init
-    @public
-  */
-  init(_properties: object | undefined) {}
-
-  /**
-    Defines the properties that will be concatenated from the superclass
-    (instead of overridden).
-
-    By default, when you extend an Ember class a property defined in
-    the subclass overrides a property with the same name that is defined
-    in the superclass. However, there are some cases where it is preferable
-    to build up a property's value by combining the superclass' property
-    value with the subclass' value. An example of this in use within Ember
-    is the `classNames` property of `Component` from `@ember/component`.
-
-    Here is some sample code showing the difference between a concatenated
-    property and a normal one:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Bar = EmberObject.extend({
-      // Configure which properties to concatenate
-      concatenatedProperties: ['concatenatedProperty'],
-
-      someNonConcatenatedProperty: ['bar'],
-      concatenatedProperty: ['bar']
-    });
-
-    const FooBar = Bar.extend({
-      someNonConcatenatedProperty: ['foo'],
-      concatenatedProperty: ['foo']
-    });
-
-    let fooBar = FooBar.create();
-    fooBar.get('someNonConcatenatedProperty'); // ['foo']
-    fooBar.get('concatenatedProperty'); // ['bar', 'foo']
-    ```
-
-    This behavior extends to object creation as well. Continuing the
-    above example:
-
-    ```javascript
-    let fooBar = FooBar.create({
-      someNonConcatenatedProperty: ['baz'],
-      concatenatedProperty: ['baz']
-    })
-    fooBar.get('someNonConcatenatedProperty'); // ['baz']
-    fooBar.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
-    ```
-
-    Adding a single property that is not an array will just add it in the array:
-
-    ```javascript
-    let fooBar = FooBar.create({
-      concatenatedProperty: 'baz'
-    })
-    view.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
-    ```
-
-    Using the `concatenatedProperties` property, we can tell Ember to mix the
-    content of the properties.
-
-    In `Component` the `classNames`, `classNameBindings` and
-    `attributeBindings` properties are concatenated.
-
-    This feature is available for you to use throughout the Ember object model,
-    although typical app developers are likely to use it infrequently. Since
-    it changes expectations about behavior of properties, you should properly
-    document its usage in each individual concatenated property (to not
-    mislead your users to think they can override the property in a subclass).
-
-    @property concatenatedProperties
-    @type Array
-    @default null
-    @public
-  */
-
-  /**
-    Defines the properties that will be merged from the superclass
-    (instead of overridden).
-
-    By default, when you extend an Ember class a property defined in
-    the subclass overrides a property with the same name that is defined
-    in the superclass. However, there are some cases where it is preferable
-    to build up a property's value by merging the superclass property value
-    with the subclass property's value. An example of this in use within Ember
-    is the `queryParams` property of routes.
-
-    Here is some sample code showing the difference between a merged
-    property and a normal one:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Bar = EmberObject.extend({
-      // Configure which properties are to be merged
-      mergedProperties: ['mergedProperty'],
-
-      someNonMergedProperty: {
-        nonMerged: 'superclass value of nonMerged'
-      },
-      mergedProperty: {
-        page: { replace: false },
-        limit: { replace: true }
-      }
-    });
-
-    const FooBar = Bar.extend({
-      someNonMergedProperty: {
-        completelyNonMerged: 'subclass value of nonMerged'
-      },
-      mergedProperty: {
-        limit: { replace: false }
-      }
-    });
-
-    let fooBar = FooBar.create();
-
-    fooBar.get('someNonMergedProperty');
-    // => { completelyNonMerged: 'subclass value of nonMerged' }
-    //
-    // Note the entire object, including the nonMerged property of
-    // the superclass object, has been replaced
-
-    fooBar.get('mergedProperty');
-    // => {
-    //   page: {replace: false},
-    //   limit: {replace: false}
-    // }
-    //
-    // Note the page remains from the superclass, and the
-    // `limit` property's value of `false` has been merged from
-    // the subclass.
-    ```
-
-    This behavior is not available during object `create` calls. It is only
-    available at `extend` time.
-
-    In `Route` the `queryParams` property is merged.
-
-    This feature is available for you to use throughout the Ember object model,
-    although typical app developers are likely to use it infrequently. Since
-    it changes expectations about behavior of properties, you should properly
-    document its usage in each individual merged property (to not
-    mislead your users to think they can override the property in a subclass).
-
-    @property mergedProperties
-    @type Array
-    @default null
-    @public
-  */
-
-  /**
-    Destroyed object property flag.
-
-    if this property is `true` the observers and bindings were already
-    removed by the effect of calling the `destroy()` method.
-
-    @property isDestroyed
-    @default false
-    @public
-  */
-  get isDestroyed() {
-    return isDestroyed(this);
-  }
-
-  set isDestroyed(_value) {
-    assert(`You cannot set \`${this}.isDestroyed\` directly, please use \`.destroy()\`.`, false);
-  }
-
-  /**
-    Destruction scheduled flag. The `destroy()` method has been called.
-
-    The object stays intact until the end of the run loop at which point
-    the `isDestroyed` flag is set.
-
-    @property isDestroying
-    @default false
-    @public
-  */
-  get isDestroying() {
-    return isDestroying(this);
-  }
-
-  set isDestroying(_value) {
-    assert(`You cannot set \`${this}.isDestroying\` directly, please use \`.destroy()\`.`, false);
-  }
-
-  /**
-    Destroys an object by setting the `isDestroyed` flag and removing its
-    metadata, which effectively destroys observers and bindings.
-
-    If you try to set a property on a destroyed object, an exception will be
-    raised.
-
-    Note that destruction is scheduled for the end of the run loop and does not
-    happen immediately.  It will set an isDestroying flag immediately.
-
-    @method destroy
-    @return {EmberObject} receiver
-    @public
-  */
-  destroy() {
-    // Used to ensure that manually calling `.destroy()` does not immediately call destroy again
-    destroyCalled.add(this);
-
-    try {
-      destroy(this);
-    } finally {
-      destroyCalled.delete(this);
-    }
-
-    return this;
-  }
-
-  /**
-    Override to implement teardown.
-
-    @method willDestroy
-    @public
-  */
-  willDestroy() {}
-
-  /**
-    Returns a string representation which attempts to provide more information
-    than Javascript's `toString` typically does, in a generic way for all Ember
-    objects.
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend();
-    person = Person.create();
-    person.toString(); //=> "<Person:ember1024>"
-    ```
-
-    If the object's class is not defined on an Ember namespace, it will
-    indicate it is a subclass of the registered superclass:
-
-    ```javascript
-    const Student = Person.extend();
-    let student = Student.create();
-    student.toString(); //=> "<(subclass of Person):ember1025>"
-    ```
-
-    If the method `toStringExtension` is defined, its return value will be
-    included in the output.
-
-    ```javascript
-    const Teacher = Person.extend({
-      toStringExtension() {
-        return this.get('fullName');
-      }
-    });
-    teacher = Teacher.create();
-    teacher.toString(); //=> "<Teacher:ember1026:Tom Dale>"
-    ```
-
-    @method toString
-    @return {String} string representation
-    @public
-  */
-  toString() {
-    let extension = hasToStringExtension(this) ? `:${this.toStringExtension()}` : '';
-
-    return `<${getFactoryFor(this) || '(unknown)'}:${guidFor(this)}${extension}>`;
-  }
-
-  /**
-    Creates a new subclass.
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend({
-      say(thing) {
-        alert(thing);
-       }
-    });
-    ```
-
-    This defines a new subclass of EmberObject: `Person`. It contains one method: `say()`.
-
-    You can also create a subclass from any existing class by calling its `extend()` method.
-    For example, you might want to create a subclass of Ember's built-in `Component` class:
-
-    ```javascript
-    import Component from '@ember/component';
-
-    const PersonComponent = Component.extend({
-      tagName: 'li',
-      classNameBindings: ['isAdministrator']
-    });
-    ```
-
-    When defining a subclass, you can override methods but still access the
-    implementation of your parent class by calling the special `_super()` method:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend({
-      say(thing) {
-        let name = this.get('name');
-        alert(`${name} says: ${thing}`);
-      }
-    });
-
-    const Soldier = Person.extend({
-      say(thing) {
-        this._super(`${thing}, sir!`);
-      },
-      march(numberOfHours) {
-        alert(`${this.get('name')} marches for ${numberOfHours} hours.`);
-      }
-    });
-
-    let yehuda = Soldier.create({
-      name: 'Yehuda Katz'
-    });
-
-    yehuda.say('Yes');  // alerts "Yehuda Katz says: Yes, sir!"
-    ```
-
-    The `create()` on line #17 creates an *instance* of the `Soldier` class.
-    The `extend()` on line #8 creates a *subclass* of `Person`. Any instance
-    of the `Person` class will *not* have the `march()` method.
-
-    You can also pass `Mixin` classes to add additional properties to the subclass.
-
-    ```javascript
-    import EmberObject from '@ember/object';
-    import Mixin from '@ember/object/mixin';
-
-    const Person = EmberObject.extend({
-      say(thing) {
-        alert(`${this.get('name')} says: ${thing}`);
-      }
-    });
-
-    const SingingMixin = Mixin.create({
-      sing(thing) {
-        alert(`${this.get('name')} sings: la la la ${thing}`);
-      }
-    });
-
-    const BroadwayStar = Person.extend(SingingMixin, {
-      dance() {
-        alert(`${this.get('name')} dances: tap tap tap tap `);
-      }
-    });
-    ```
-
-    The `BroadwayStar` class contains three methods: `say()`, `sing()`, and `dance()`.
-
-    @method extend
-    @static
-    @for @ember/object
-    @param {Mixin} [mixins]* One or more Mixin classes
-    @param {Object} [arguments]* Object containing values to use within the new class
-    @public
-  */
-  static extend<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    ...mixins: any[]
-  ): Readonly<Statics> & EmberClassConstructor<Instance>;
-  static extend(...mixins: any[]) {
-    let Class = class extends this {};
-    reopen.apply(Class.PrototypeMixin, mixins);
-    return Class;
-  }
-
-  /**
-    Creates an instance of a class. Accepts either no arguments, or an object
-    containing values to initialize the newly instantiated object with.
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend({
-      helloWorld() {
-        alert(`Hi, my name is ${this.get('name')}`);
-      }
-    });
-
-    let tom = Person.create({
-      name: 'Tom Dale'
-    });
-
-    tom.helloWorld(); // alerts "Hi, my name is Tom Dale".
-    ```
-
-    `create` will call the `init` function if defined during
-    `AnyObject.extend`
-
-    If no arguments are passed to `create`, it will not set values to the new
-    instance during initialization:
-
-    ```javascript
-    let noName = Person.create();
-    noName.helloWorld(); // alerts undefined
-    ```
-
-    NOTE: For performance reasons, you cannot declare methods or computed
-    properties during `create`. You should instead declare methods and computed
-    properties when using `extend`.
-
-    @method create
-    @for @ember/object
-    @static
-    @param [arguments]*
-    @public
-  */
-  static create<Class extends typeof CoreObject, Args extends Array<Record<string, any>>>(
-    this: Class,
-    ...args: Args
-  ): InstanceType<Class> & MergeArray<Args>;
-  static create(...args: Record<string, unknown>[]) {
-    let props = args[0];
-    let instance;
-
-    if (props !== undefined) {
-      instance = new this(getOwner(props));
-      setFactoryFor(instance, getFactoryFor(props));
-    } else {
-      instance = new this();
-    }
-
-    if (args.length <= 1) {
-      initialize(instance, props);
-    } else {
-      initialize(instance, flattenProps.apply(this, args));
-    }
-
-    return instance;
-  }
-
-  /**
-    Augments a constructor's prototype with additional
-    properties and functions:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const MyObject = EmberObject.extend({
-      name: 'an object'
-    });
-
-    o = MyObject.create();
-    o.get('name'); // 'an object'
-
-    MyObject.reopen({
-      say(msg) {
-        console.log(msg);
-      }
-    });
-
-    o2 = MyObject.create();
-    o2.say('hello'); // logs "hello"
-
-    o.say('goodbye'); // logs "goodbye"
-    ```
-
-    To add functions and properties to the constructor itself,
-    see `reopenClass`
-
-    @method reopen
-    @for @ember/object
-    @static
-    @public
-  */
-  static reopen(...args: any[]) {
-    this.willReopen();
-    reopen.apply(this.PrototypeMixin, args);
-    return this;
-  }
-
-  static willReopen() {
-    let p = this.prototype;
-    if (wasApplied.has(p)) {
-      wasApplied.delete(p);
-
-      // If the base mixin already exists and was applied, create a new mixin to
-      // make sure that it gets properly applied. Reusing the same mixin after
-      // the first `proto` call will cause it to get skipped.
-      if (prototypeMixinMap.has(this)) {
-        prototypeMixinMap.set(this, Mixin.create(this.PrototypeMixin));
-      }
-    }
-  }
-
-  /**
-    Augments a constructor's own properties and functions:
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const MyObject = EmberObject.extend({
-      name: 'an object'
-    });
-
-    MyObject.reopenClass({
-      canBuild: false
-    });
-
-    MyObject.canBuild; // false
-    o = MyObject.create();
-    ```
-
-    In other words, this creates static properties and functions for the class.
-    These are only available on the class and not on any instance of that class.
-
-    ```javascript
-    import EmberObject from '@ember/object';
-
-    const Person = EmberObject.extend({
-      name: '',
-      sayHello() {
-        alert(`Hello. My name is ${this.get('name')}`);
-      }
-    });
-
-    Person.reopenClass({
-      species: 'Homo sapiens',
-
-      createPerson(name) {
-        return Person.create({ name });
-      }
-    });
-
-    let tom = Person.create({
-      name: 'Tom Dale'
-    });
-    let yehuda = Person.createPerson('Yehuda Katz');
-
-    tom.sayHello(); // "Hello. My name is Tom Dale"
-    yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
-    alert(Person.species); // "Homo sapiens"
-    ```
-
-    Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
-    variables. They are only valid on `Person`.
-
-    To add functions and properties to instances of
-    a constructor by extending the constructor's prototype
-    see `reopen`
-
-    @method reopenClass
-    @for @ember/object
-    @static
-    @public
-  */
-  static reopenClass(...mixins: Array<Mixin | Record<string, unknown>>) {
-    applyMixin(this, mixins);
-    return this;
-  }
-
-  static detect(obj: unknown) {
-    if ('function' !== typeof obj) {
-      return false;
-    }
-    while (obj) {
-      if (obj === this) {
-        return true;
-      }
-      obj = (obj as typeof CoreObject).superclass;
-    }
-    return false;
-  }
-
-  static detectInstance(obj: unknown) {
-    return obj instanceof this;
-  }
-
-  /**
-    In some cases, you may want to annotate computed properties with additional
-    metadata about how they function or what values they operate on. For
-    example, computed property functions may close over variables that are then
-    no longer available for introspection.
-
-    You can pass a hash of these values to a computed property like this:
-
-    ```javascript
-    import { computed } from '@ember/object';
-
-    person: computed(function() {
-      let personId = this.get('personId');
-      return Person.create({ id: personId });
-    }).meta({ type: Person })
-    ```
-
-    Once you've done this, you can retrieve the values saved to the computed
-    property from your class like this:
-
-    ```javascript
-    MyClass.metaForProperty('person');
-    ```
-
-    This will return the original hash that was passed to `meta()`.
-
-    @static
-    @method metaForProperty
-    @param key {String} property name
-    @private
-  */
-  static metaForProperty(key: string) {
-    let proto = this.proto(); // ensure prototype is initialized
-    let possibleDesc = descriptorForProperty(proto, key);
-
-    assert(
-      `metaForProperty() could not find a computed property with key '${key}'.`,
-      possibleDesc !== undefined
-    );
-
-    return possibleDesc._meta || {};
-  }
-
-  /**
-    Iterate over each computed property for the class, passing its name
-    and any associated metadata (see `metaForProperty`) to the callback.
-
-    @static
-    @method eachComputedProperty
-    @param {Function} callback
-    @param {Object} binding
-    @private
-  */
-  static eachComputedProperty(callback: (name: string, meta: unknown) => void, binding = this) {
-    this.proto(); // ensure prototype is initialized
-    let empty = {};
-
-    meta(this.prototype).forEachDescriptors((name: string, descriptor: ComputedProperty) => {
-      if (descriptor.enumerable) {
-        let meta = descriptor._meta || empty;
-        callback.call(binding, name, meta);
-      }
-    });
-  }
-
-  static get PrototypeMixin() {
-    let prototypeMixin = prototypeMixinMap.get(this);
-    if (prototypeMixin === undefined) {
-      prototypeMixin = Mixin.create();
-      prototypeMixin.ownerConstructor = this;
-      prototypeMixinMap.set(this, prototypeMixin);
-    }
-    return prototypeMixin;
-  }
-
-  static get superclass() {
-    let c = Object.getPrototypeOf(this);
-    return c !== Function.prototype ? c : undefined;
-  }
-
-  static proto() {
-    let p = this.prototype;
-    if (!wasApplied.has(p)) {
-      wasApplied.add(p);
-      let parent = this.superclass;
-      if (parent) {
-        parent.proto();
-      }
-
-      // If the prototype mixin exists, apply it. In the case of native classes,
-      // it will not exist (unless the class has been reopened).
-      if (prototypeMixinMap.has(this)) {
-        this.PrototypeMixin.apply(p);
-      }
-    }
-    return p;
-  }
-
-  static toString() {
-    return `<${getFactoryFor(this) || '(unknown)'}:constructor>`;
-  }
-
-  static isClass = true;
-  static isMethod = false;
-
-  static _onLookup?: (debugContainerKey: string) => void;
-  static _lazyInjections?: () => void;
-
-  declare concatenatedProperties?: string[] | string;
-  declare mergedProperties?: unknown[];
-}
-
-function flattenProps(this: typeof CoreObject, ...props: Array<Record<string, unknown>>) {
-  let initProperties: Record<string, unknown> = {};
-
-  for (let properties of props) {
-    assert(
-      'EmberObject.create no longer supports mixing in other ' +
-        'definitions, use .extend & .create separately instead.',
-      !(properties instanceof Mixin)
-    );
-
-    let keyNames = Object.keys(properties);
-
-    for (let j = 0, k = keyNames.length; j < k; j++) {
-      let keyName = keyNames[j]!;
-      let value = properties[keyName];
-      initProperties[keyName] = value;
-    }
-  }
-
-  return initProperties;
-}
-
-if (DEBUG) {
-  /**
-    Provides lookup-time type validation for injected properties.
-
-    @private
-    @method _onLookup
-  */
-  CoreObject._onLookup = function injectedPropertyAssertion(debugContainerKey: string) {
-    let [type] = debugContainerKey.split(':');
-    let proto = this.proto();
-
-    for (let key in proto) {
-      let desc = descriptorForProperty(proto, key);
-      if (desc && DEBUG_INJECTION_FUNCTIONS.has(desc._getter)) {
-        assert(
-          `Defining \`${key}\` as an injected controller property on a non-controller (\`${debugContainerKey}\`) is not allowed.`,
-          type === 'controller' || DEBUG_INJECTION_FUNCTIONS.get(desc._getter).type !== 'controller'
-        );
-      }
-    }
-  };
-
-  /**
-    Returns a hash of property names and container names that injected
-    properties will lookup on the container lazily.
-
-    @method _lazyInjections
-    @return {Object} Hash of all lazy injected property keys to container names
-    @private
-  */
-  CoreObject._lazyInjections = function () {
-    let injections: Record<string, { namespace: unknown; source: unknown; specifier: string }> = {};
-    let proto = this.proto();
-    let key;
-    let desc;
-
-    for (key in proto) {
-      desc = descriptorForProperty(proto, key);
-      if (desc && DEBUG_INJECTION_FUNCTIONS.has(desc._getter)) {
-        let { namespace, source, type, name } = DEBUG_INJECTION_FUNCTIONS.get(desc._getter);
-
-        injections[key] = {
-          namespace,
-          source,
-          specifier: `${type}:${name || key}`,
-        };
-      }
-    }
-
-    return injections;
-  };
-}
-
-export default CoreObject;
diff --git a/packages/@ember/-internals/runtime/lib/system/object.ts b/packages/@ember/-internals/runtime/lib/system/object.ts
index de9b013111a..fda8166b6b2 100644
--- a/packages/@ember/-internals/runtime/lib/system/object.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object.ts
@@ -5,7 +5,7 @@
 import { getFactoryFor } from '@ember/-internals/container';
 import { symbol } from '@ember/-internals/utils';
 import { addListener } from '@ember/-internals/metal';
-import CoreObject from './core_object';
+import CoreObject from '@ember/object/core';
 import Observable from '../mixins/observable';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/runtime/lib/type-of.ts b/packages/@ember/-internals/runtime/lib/type-of.ts
index e8f31b20d1e..f444bab08b4 100644
--- a/packages/@ember/-internals/runtime/lib/type-of.ts
+++ b/packages/@ember/-internals/runtime/lib/type-of.ts
@@ -1,4 +1,4 @@
-import CoreObject from './system/core_object';
+import CoreObject from '@ember/object/core';
 
 export type TypeName =
   | 'undefined'
diff --git a/packages/@ember/-internals/runtime/tests/mixins/evented_test.js b/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
index 5d621974688..8b2cfcd1ade 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
@@ -1,5 +1,5 @@
 import EventedMixin from '../../lib/mixins/evented';
-import CoreObject from '../../lib/system/core_object';
+import CoreObject from '@ember/object/core';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index 611b863c488..81cd0d157de 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,6 +1,6 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import { get, set, observer } from '@ember/-internals/metal';
-import CoreObject from '../../lib/system/core_object';
+import CoreObject from '@ember/object/core';
 import {
   moduleFor,
   AbstractTestCase,
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index b8ed9e14a82..020c415cb43 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -1 +1,1111 @@
-export { CoreObject as default } from '@ember/-internals/runtime';
+/**
+  @module @ember/object
+*/
+
+import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
+import { getOwner } from '@ember/-internals/owner';
+import type { Owner } from '@ember/-internals/owner';
+import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
+import { meta } from '@ember/-internals/meta';
+import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal';
+import {
+  PROXY_CONTENT,
+  sendEvent,
+  Mixin,
+  activateObserver,
+  applyMixin,
+  defineProperty,
+  descriptorForProperty,
+  isClassicDecorator,
+  DEBUG_INJECTION_FUNCTIONS,
+  hasUnknownProperty,
+} from '@ember/-internals/metal';
+import { ActionHandler } from '@ember/-internals/runtime';
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { _WeakSet as WeakSet } from '@glimmer/util';
+import { destroy, isDestroying, isDestroyed, registerDestructor } from '@glimmer/destroyable';
+import { OWNER } from '@glimmer/owner';
+
+type EmberClassConstructor<T> = new (owner?: Owner) => T;
+
+type MergeArray<Arr extends any[]> = Arr extends [infer T, ...infer Rest]
+  ? T & MergeArray<Rest>
+  : unknown; // TODO: Is this correct?
+
+interface HasSetUnknownProperty {
+  setUnknownProperty: (keyName: string, value: any) => any;
+}
+
+function hasSetUnknownProperty(val: unknown): val is HasSetUnknownProperty {
+  return (
+    typeof val === 'object' &&
+    val !== null &&
+    typeof (val as HasSetUnknownProperty).setUnknownProperty === 'function'
+  );
+}
+
+interface HasToStringExtension {
+  toStringExtension: () => void;
+}
+
+function hasToStringExtension(val: unknown): val is HasToStringExtension {
+  return (
+    typeof val === 'object' &&
+    val !== null &&
+    typeof (val as HasToStringExtension).toStringExtension === 'function'
+  );
+}
+const reopen = Mixin.prototype.reopen;
+
+const wasApplied = new WeakSet();
+const prototypeMixinMap = new WeakMap();
+
+const initCalled = DEBUG ? new WeakSet() : undefined; // only used in debug builds to enable the proxy trap
+
+const destroyCalled = new Set();
+
+function ensureDestroyCalled(instance: CoreObject) {
+  if (!destroyCalled.has(instance)) {
+    instance.destroy();
+  }
+}
+
+function initialize(obj: CoreObject, properties?: unknown) {
+  let m = meta(obj);
+
+  if (properties !== undefined) {
+    assert(
+      'EmberObject.create only accepts objects.',
+      typeof properties === 'object' && properties !== null
+    );
+
+    assert(
+      'EmberObject.create no longer supports mixing in other ' +
+        'definitions, use .extend & .create separately instead.',
+      !(properties instanceof Mixin)
+    );
+
+    let concatenatedProperties = obj.concatenatedProperties;
+    let mergedProperties = obj.mergedProperties;
+
+    let keyNames = Object.keys(properties);
+
+    for (let keyName of keyNames) {
+      let value = (properties as any)[keyName];
+
+      assert(
+        'EmberObject.create no longer supports defining computed ' +
+          'properties. Define computed properties using extend() or reopen() ' +
+          'before calling create().',
+        !isClassicDecorator(value)
+      );
+      assert(
+        'EmberObject.create no longer supports defining methods that call _super.',
+        !(typeof value === 'function' && value.toString().indexOf('._super') !== -1)
+      );
+      assert(
+        '`actions` must be provided at extend time, not at create time, ' +
+          'when Ember.ActionHandler is used (i.e. views, controllers & routes).',
+        !(keyName === 'actions' && ActionHandler.detect(obj))
+      );
+
+      let possibleDesc = descriptorForProperty(obj, keyName, m);
+      let isDescriptor = possibleDesc !== undefined;
+
+      if (!isDescriptor) {
+        if (
+          concatenatedProperties !== undefined &&
+          concatenatedProperties.length > 0 &&
+          concatenatedProperties.includes(keyName)
+        ) {
+          let baseValue = (obj as any)[keyName];
+          if (baseValue) {
+            value = makeArray(baseValue).concat(value);
+          } else {
+            value = makeArray(value);
+          }
+        }
+
+        if (
+          mergedProperties !== undefined &&
+          mergedProperties.length > 0 &&
+          mergedProperties.includes(keyName)
+        ) {
+          let baseValue = (obj as any)[keyName];
+          value = Object.assign({}, baseValue, value);
+        }
+      }
+
+      if (isDescriptor) {
+        possibleDesc.set(obj, keyName, value);
+      } else if (hasSetUnknownProperty(obj) && !(keyName in obj)) {
+        obj.setUnknownProperty(keyName, value);
+      } else {
+        if (DEBUG) {
+          defineProperty(obj, keyName, null, value, m); // setup mandatory setter
+        } else {
+          (obj as any)[keyName] = value;
+        }
+      }
+    }
+  }
+
+  // using DEBUG here to avoid the extraneous variable when not needed
+  if (DEBUG) {
+    initCalled!.add(obj);
+  }
+  obj.init(properties);
+
+  m.unsetInitializing();
+
+  let observerEvents = m.observerEvents();
+
+  if (observerEvents !== undefined) {
+    for (let i = 0; i < observerEvents.length; i++) {
+      activateObserver(obj, observerEvents[i].event, observerEvents[i].sync);
+    }
+  }
+
+  sendEvent(obj, 'init', undefined, undefined, m);
+}
+
+/**
+  `CoreObject` is the base class for all Ember constructs. It establishes a
+  class system based on Ember's Mixin system, and provides the basis for the
+  Ember Object Model. `CoreObject` should generally not be used directly,
+  instead you should use `EmberObject`.
+
+  ## Usage
+
+  You can define a class by extending from `CoreObject` using the `extend`
+  method:
+
+  ```js
+  const Person = CoreObject.extend({
+    name: 'Tomster',
+  });
+  ```
+
+  For detailed usage, see the [Object Model](https://guides.emberjs.com/release/object-model/)
+  section of the guides.
+
+  ## Usage with Native Classes
+
+  Native JavaScript `class` syntax can be used to extend from any `CoreObject`
+  based class:
+
+  ```js
+  class Person extends CoreObject {
+    init() {
+      super.init(...arguments);
+      this.name = 'Tomster';
+    }
+  }
+  ```
+
+  Some notes about `class` usage:
+
+  * `new` syntax is not currently supported with classes that extend from
+    `EmberObject` or `CoreObject`. You must continue to use the `create` method
+    when making new instances of classes, even if they are defined using native
+    class syntax. If you want to use `new` syntax, consider creating classes
+    which do _not_ extend from `EmberObject` or `CoreObject`. Ember features,
+    such as computed properties and decorators, will still work with base-less
+    classes.
+  * Instead of using `this._super()`, you must use standard `super` syntax in
+    native classes. See the [MDN docs on classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes#Super_class_calls_with_super)
+    for more details.
+  * Native classes support using [constructors](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes#Constructor)
+    to set up newly-created instances. Ember uses these to, among other things,
+    support features that need to retrieve other entities by name, like Service
+    injection and `getOwner`. To ensure your custom instance setup logic takes
+    place after this important work is done, avoid using the `constructor` in
+    favor of `init`.
+  * Properties passed to `create` will be available on the instance by the time
+    `init` runs, so any code that requires these values should work at that
+    time.
+  * Using native classes, and switching back to the old Ember Object model is
+    fully supported.
+
+  @class CoreObject
+  @public
+*/
+interface CoreObject {
+  /** @internal */
+  _super(...args: any[]): any;
+}
+class CoreObject {
+  [OWNER]?: Owner;
+
+  constructor(owner?: Owner) {
+    this[OWNER] = owner;
+
+    // prepare prototype...
+    (this.constructor as typeof CoreObject).proto();
+
+    let self;
+    if (DEBUG && hasUnknownProperty(this)) {
+      let messageFor = (obj: unknown, property: unknown) => {
+        return (
+          `You attempted to access the \`${String(property)}\` property (of ${obj}).\n` +
+          `Since Ember 3.1, this is usually fine as you no longer need to use \`.get()\`\n` +
+          `to access computed properties. However, in this case, the object in question\n` +
+          `is a special kind of Ember object (a proxy). Therefore, it is still necessary\n` +
+          `to use \`.get('${String(property)}')\` in this case.\n\n` +
+          `If you encountered this error because of third-party code that you don't control,\n` +
+          `there is more information at https://github.com/emberjs/ember.js/issues/16148, and\n` +
+          `you can help us improve this error message by telling us more about what happened in\n` +
+          `this situation.`
+        );
+      };
+
+      /* globals Proxy Reflect */
+      self = new Proxy(this, {
+        get(target: CoreObject & HasUnknownProperty, property, receiver) {
+          if (property === PROXY_CONTENT) {
+            return target;
+          } else if (
+            // init called will be set on the proxy, not the target, so get with the receiver
+            !initCalled!.has(receiver) ||
+            typeof property === 'symbol' ||
+            isInternalSymbol(property) ||
+            property === 'toJSON' ||
+            property === 'toString' ||
+            property === 'toStringExtension' ||
+            property === 'didDefineProperty' ||
+            property === 'willWatchProperty' ||
+            property === 'didUnwatchProperty' ||
+            property === 'didAddListener' ||
+            property === 'didRemoveListener' ||
+            property === 'isDescriptor' ||
+            property === '_onLookup' ||
+            property in target
+          ) {
+            return Reflect.get(target, property, receiver);
+          }
+
+          let value = target.unknownProperty.call(receiver, property);
+
+          if (typeof value !== 'function') {
+            assert(messageFor(receiver, property), value === undefined || value === null);
+          }
+        },
+      });
+    } else {
+      self = this;
+    }
+
+    const destroyable = self;
+    registerDestructor(self, ensureDestroyCalled, true);
+    registerDestructor(self, () => destroyable.willDestroy());
+
+    // disable chains
+    let m = meta(self);
+
+    m.setInitializing();
+
+    // only return when in debug builds and `self` is the proxy created above
+    if (DEBUG && self !== this) {
+      return self;
+    }
+  }
+
+  reopen(...args: Array<Mixin | Record<string, unknown>>) {
+    applyMixin(this, args);
+    return this;
+  }
+
+  /**
+    An overridable method called when objects are instantiated. By default,
+    does nothing unless it is overridden during class definition.
+
+    Example:
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Person = EmberObject.extend({
+      init() {
+        alert(`Name is ${this.get('name')}`);
+      }
+    });
+
+    let steve = Person.create({
+      name: 'Steve'
+    });
+
+    // alerts 'Name is Steve'.
+    ```
+
+    NOTE: If you do override `init` for a framework class like `Component`
+    from `@ember/component`, be sure to call `this._super(...arguments)`
+    in your `init` declaration!
+    If you don't, Ember may not have an opportunity to
+    do important setup work, and you'll see strange behavior in your
+    application.
+
+    @method init
+    @public
+  */
+  init(_properties: object | undefined) {}
+
+  /**
+    Defines the properties that will be concatenated from the superclass
+    (instead of overridden).
+
+    By default, when you extend an Ember class a property defined in
+    the subclass overrides a property with the same name that is defined
+    in the superclass. However, there are some cases where it is preferable
+    to build up a property's value by combining the superclass' property
+    value with the subclass' value. An example of this in use within Ember
+    is the `classNames` property of `Component` from `@ember/component`.
+
+    Here is some sample code showing the difference between a concatenated
+    property and a normal one:
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Bar = EmberObject.extend({
+      // Configure which properties to concatenate
+      concatenatedProperties: ['concatenatedProperty'],
+
+      someNonConcatenatedProperty: ['bar'],
+      concatenatedProperty: ['bar']
+    });
+
+    const FooBar = Bar.extend({
+      someNonConcatenatedProperty: ['foo'],
+      concatenatedProperty: ['foo']
+    });
+
+    let fooBar = FooBar.create();
+    fooBar.get('someNonConcatenatedProperty'); // ['foo']
+    fooBar.get('concatenatedProperty'); // ['bar', 'foo']
+    ```
+
+    This behavior extends to object creation as well. Continuing the
+    above example:
+
+    ```javascript
+    let fooBar = FooBar.create({
+      someNonConcatenatedProperty: ['baz'],
+      concatenatedProperty: ['baz']
+    })
+    fooBar.get('someNonConcatenatedProperty'); // ['baz']
+    fooBar.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
+    ```
+
+    Adding a single property that is not an array will just add it in the array:
+
+    ```javascript
+    let fooBar = FooBar.create({
+      concatenatedProperty: 'baz'
+    })
+    view.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
+    ```
+
+    Using the `concatenatedProperties` property, we can tell Ember to mix the
+    content of the properties.
+
+    In `Component` the `classNames`, `classNameBindings` and
+    `attributeBindings` properties are concatenated.
+
+    This feature is available for you to use throughout the Ember object model,
+    although typical app developers are likely to use it infrequently. Since
+    it changes expectations about behavior of properties, you should properly
+    document its usage in each individual concatenated property (to not
+    mislead your users to think they can override the property in a subclass).
+
+    @property concatenatedProperties
+    @type Array
+    @default null
+    @public
+  */
+
+  /**
+    Defines the properties that will be merged from the superclass
+    (instead of overridden).
+
+    By default, when you extend an Ember class a property defined in
+    the subclass overrides a property with the same name that is defined
+    in the superclass. However, there are some cases where it is preferable
+    to build up a property's value by merging the superclass property value
+    with the subclass property's value. An example of this in use within Ember
+    is the `queryParams` property of routes.
+
+    Here is some sample code showing the difference between a merged
+    property and a normal one:
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Bar = EmberObject.extend({
+      // Configure which properties are to be merged
+      mergedProperties: ['mergedProperty'],
+
+      someNonMergedProperty: {
+        nonMerged: 'superclass value of nonMerged'
+      },
+      mergedProperty: {
+        page: { replace: false },
+        limit: { replace: true }
+      }
+    });
+
+    const FooBar = Bar.extend({
+      someNonMergedProperty: {
+        completelyNonMerged: 'subclass value of nonMerged'
+      },
+      mergedProperty: {
+        limit: { replace: false }
+      }
+    });
+
+    let fooBar = FooBar.create();
+
+    fooBar.get('someNonMergedProperty');
+    // => { completelyNonMerged: 'subclass value of nonMerged' }
+    //
+    // Note the entire object, including the nonMerged property of
+    // the superclass object, has been replaced
+
+    fooBar.get('mergedProperty');
+    // => {
+    //   page: {replace: false},
+    //   limit: {replace: false}
+    // }
+    //
+    // Note the page remains from the superclass, and the
+    // `limit` property's value of `false` has been merged from
+    // the subclass.
+    ```
+
+    This behavior is not available during object `create` calls. It is only
+    available at `extend` time.
+
+    In `Route` the `queryParams` property is merged.
+
+    This feature is available for you to use throughout the Ember object model,
+    although typical app developers are likely to use it infrequently. Since
+    it changes expectations about behavior of properties, you should properly
+    document its usage in each individual merged property (to not
+    mislead your users to think they can override the property in a subclass).
+
+    @property mergedProperties
+    @type Array
+    @default null
+    @public
+  */
+
+  /**
+    Destroyed object property flag.
+
+    if this property is `true` the observers and bindings were already
+    removed by the effect of calling the `destroy()` method.
+
+    @property isDestroyed
+    @default false
+    @public
+  */
+  get isDestroyed() {
+    return isDestroyed(this);
+  }
+
+  set isDestroyed(_value) {
+    assert(`You cannot set \`${this}.isDestroyed\` directly, please use \`.destroy()\`.`, false);
+  }
+
+  /**
+    Destruction scheduled flag. The `destroy()` method has been called.
+
+    The object stays intact until the end of the run loop at which point
+    the `isDestroyed` flag is set.
+
+    @property isDestroying
+    @default false
+    @public
+  */
+  get isDestroying() {
+    return isDestroying(this);
+  }
+
+  set isDestroying(_value) {
+    assert(`You cannot set \`${this}.isDestroying\` directly, please use \`.destroy()\`.`, false);
+  }
+
+  /**
+    Destroys an object by setting the `isDestroyed` flag and removing its
+    metadata, which effectively destroys observers and bindings.
+
+    If you try to set a property on a destroyed object, an exception will be
+    raised.
+
+    Note that destruction is scheduled for the end of the run loop and does not
+    happen immediately.  It will set an isDestroying flag immediately.
+
+    @method destroy
+    @return {EmberObject} receiver
+    @public
+  */
+  destroy() {
+    // Used to ensure that manually calling `.destroy()` does not immediately call destroy again
+    destroyCalled.add(this);
+
+    try {
+      destroy(this);
+    } finally {
+      destroyCalled.delete(this);
+    }
+
+    return this;
+  }
+
+  /**
+    Override to implement teardown.
+
+    @method willDestroy
+    @public
+  */
+  willDestroy() {}
+
+  /**
+    Returns a string representation which attempts to provide more information
+    than Javascript's `toString` typically does, in a generic way for all Ember
+    objects.
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Person = EmberObject.extend();
+    person = Person.create();
+    person.toString(); //=> "<Person:ember1024>"
+    ```
+
+    If the object's class is not defined on an Ember namespace, it will
+    indicate it is a subclass of the registered superclass:
+
+    ```javascript
+    const Student = Person.extend();
+    let student = Student.create();
+    student.toString(); //=> "<(subclass of Person):ember1025>"
+    ```
+
+    If the method `toStringExtension` is defined, its return value will be
+    included in the output.
+
+    ```javascript
+    const Teacher = Person.extend({
+      toStringExtension() {
+        return this.get('fullName');
+      }
+    });
+    teacher = Teacher.create();
+    teacher.toString(); //=> "<Teacher:ember1026:Tom Dale>"
+    ```
+
+    @method toString
+    @return {String} string representation
+    @public
+  */
+  toString() {
+    let extension = hasToStringExtension(this) ? `:${this.toStringExtension()}` : '';
+
+    return `<${getFactoryFor(this) || '(unknown)'}:${guidFor(this)}${extension}>`;
+  }
+
+  /**
+    Creates a new subclass.
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Person = EmberObject.extend({
+      say(thing) {
+        alert(thing);
+       }
+    });
+    ```
+
+    This defines a new subclass of EmberObject: `Person`. It contains one method: `say()`.
+
+    You can also create a subclass from any existing class by calling its `extend()` method.
+    For example, you might want to create a subclass of Ember's built-in `Component` class:
+
+    ```javascript
+    import Component from '@ember/component';
+
+    const PersonComponent = Component.extend({
+      tagName: 'li',
+      classNameBindings: ['isAdministrator']
+    });
+    ```
+
+    When defining a subclass, you can override methods but still access the
+    implementation of your parent class by calling the special `_super()` method:
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Person = EmberObject.extend({
+      say(thing) {
+        let name = this.get('name');
+        alert(`${name} says: ${thing}`);
+      }
+    });
+
+    const Soldier = Person.extend({
+      say(thing) {
+        this._super(`${thing}, sir!`);
+      },
+      march(numberOfHours) {
+        alert(`${this.get('name')} marches for ${numberOfHours} hours.`);
+      }
+    });
+
+    let yehuda = Soldier.create({
+      name: 'Yehuda Katz'
+    });
+
+    yehuda.say('Yes');  // alerts "Yehuda Katz says: Yes, sir!"
+    ```
+
+    The `create()` on line #17 creates an *instance* of the `Soldier` class.
+    The `extend()` on line #8 creates a *subclass* of `Person`. Any instance
+    of the `Person` class will *not* have the `march()` method.
+
+    You can also pass `Mixin` classes to add additional properties to the subclass.
+
+    ```javascript
+    import EmberObject from '@ember/object';
+    import Mixin from '@ember/object/mixin';
+
+    const Person = EmberObject.extend({
+      say(thing) {
+        alert(`${this.get('name')} says: ${thing}`);
+      }
+    });
+
+    const SingingMixin = Mixin.create({
+      sing(thing) {
+        alert(`${this.get('name')} sings: la la la ${thing}`);
+      }
+    });
+
+    const BroadwayStar = Person.extend(SingingMixin, {
+      dance() {
+        alert(`${this.get('name')} dances: tap tap tap tap `);
+      }
+    });
+    ```
+
+    The `BroadwayStar` class contains three methods: `say()`, `sing()`, and `dance()`.
+
+    @method extend
+    @static
+    @for @ember/object
+    @param {Mixin} [mixins]* One or more Mixin classes
+    @param {Object} [arguments]* Object containing values to use within the new class
+    @public
+  */
+  static extend<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...mixins: any[]
+  ): Readonly<Statics> & EmberClassConstructor<Instance>;
+  static extend(...mixins: any[]) {
+    let Class = class extends this {};
+    reopen.apply(Class.PrototypeMixin, mixins);
+    return Class;
+  }
+
+  /**
+    Creates an instance of a class. Accepts either no arguments, or an object
+    containing values to initialize the newly instantiated object with.
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Person = EmberObject.extend({
+      helloWorld() {
+        alert(`Hi, my name is ${this.get('name')}`);
+      }
+    });
+
+    let tom = Person.create({
+      name: 'Tom Dale'
+    });
+
+    tom.helloWorld(); // alerts "Hi, my name is Tom Dale".
+    ```
+
+    `create` will call the `init` function if defined during
+    `AnyObject.extend`
+
+    If no arguments are passed to `create`, it will not set values to the new
+    instance during initialization:
+
+    ```javascript
+    let noName = Person.create();
+    noName.helloWorld(); // alerts undefined
+    ```
+
+    NOTE: For performance reasons, you cannot declare methods or computed
+    properties during `create`. You should instead declare methods and computed
+    properties when using `extend`.
+
+    @method create
+    @for @ember/object
+    @static
+    @param [arguments]*
+    @public
+  */
+  static create<Class extends typeof CoreObject, Args extends Array<Record<string, any>>>(
+    this: Class,
+    ...args: Args
+  ): InstanceType<Class> & MergeArray<Args>;
+  static create(...args: Record<string, unknown>[]) {
+    let props = args[0];
+    let instance;
+
+    if (props !== undefined) {
+      instance = new this(getOwner(props));
+      setFactoryFor(instance, getFactoryFor(props));
+    } else {
+      instance = new this();
+    }
+
+    if (args.length <= 1) {
+      initialize(instance, props);
+    } else {
+      initialize(instance, flattenProps.apply(this, args));
+    }
+
+    return instance;
+  }
+
+  /**
+    Augments a constructor's prototype with additional
+    properties and functions:
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const MyObject = EmberObject.extend({
+      name: 'an object'
+    });
+
+    o = MyObject.create();
+    o.get('name'); // 'an object'
+
+    MyObject.reopen({
+      say(msg) {
+        console.log(msg);
+      }
+    });
+
+    o2 = MyObject.create();
+    o2.say('hello'); // logs "hello"
+
+    o.say('goodbye'); // logs "goodbye"
+    ```
+
+    To add functions and properties to the constructor itself,
+    see `reopenClass`
+
+    @method reopen
+    @for @ember/object
+    @static
+    @public
+  */
+  static reopen(...args: any[]) {
+    this.willReopen();
+    reopen.apply(this.PrototypeMixin, args);
+    return this;
+  }
+
+  static willReopen() {
+    let p = this.prototype;
+    if (wasApplied.has(p)) {
+      wasApplied.delete(p);
+
+      // If the base mixin already exists and was applied, create a new mixin to
+      // make sure that it gets properly applied. Reusing the same mixin after
+      // the first `proto` call will cause it to get skipped.
+      if (prototypeMixinMap.has(this)) {
+        prototypeMixinMap.set(this, Mixin.create(this.PrototypeMixin));
+      }
+    }
+  }
+
+  /**
+    Augments a constructor's own properties and functions:
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const MyObject = EmberObject.extend({
+      name: 'an object'
+    });
+
+    MyObject.reopenClass({
+      canBuild: false
+    });
+
+    MyObject.canBuild; // false
+    o = MyObject.create();
+    ```
+
+    In other words, this creates static properties and functions for the class.
+    These are only available on the class and not on any instance of that class.
+
+    ```javascript
+    import EmberObject from '@ember/object';
+
+    const Person = EmberObject.extend({
+      name: '',
+      sayHello() {
+        alert(`Hello. My name is ${this.get('name')}`);
+      }
+    });
+
+    Person.reopenClass({
+      species: 'Homo sapiens',
+
+      createPerson(name) {
+        return Person.create({ name });
+      }
+    });
+
+    let tom = Person.create({
+      name: 'Tom Dale'
+    });
+    let yehuda = Person.createPerson('Yehuda Katz');
+
+    tom.sayHello(); // "Hello. My name is Tom Dale"
+    yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+    alert(Person.species); // "Homo sapiens"
+    ```
+
+    Note that `species` and `createPerson` are *not* valid on the `tom` and `yehuda`
+    variables. They are only valid on `Person`.
+
+    To add functions and properties to instances of
+    a constructor by extending the constructor's prototype
+    see `reopen`
+
+    @method reopenClass
+    @for @ember/object
+    @static
+    @public
+  */
+  static reopenClass(...mixins: Array<Mixin | Record<string, unknown>>) {
+    applyMixin(this, mixins);
+    return this;
+  }
+
+  static detect(obj: unknown) {
+    if ('function' !== typeof obj) {
+      return false;
+    }
+    while (obj) {
+      if (obj === this) {
+        return true;
+      }
+      obj = (obj as typeof CoreObject).superclass;
+    }
+    return false;
+  }
+
+  static detectInstance(obj: unknown) {
+    return obj instanceof this;
+  }
+
+  /**
+    In some cases, you may want to annotate computed properties with additional
+    metadata about how they function or what values they operate on. For
+    example, computed property functions may close over variables that are then
+    no longer available for introspection.
+
+    You can pass a hash of these values to a computed property like this:
+
+    ```javascript
+    import { computed } from '@ember/object';
+
+    person: computed(function() {
+      let personId = this.get('personId');
+      return Person.create({ id: personId });
+    }).meta({ type: Person })
+    ```
+
+    Once you've done this, you can retrieve the values saved to the computed
+    property from your class like this:
+
+    ```javascript
+    MyClass.metaForProperty('person');
+    ```
+
+    This will return the original hash that was passed to `meta()`.
+
+    @static
+    @method metaForProperty
+    @param key {String} property name
+    @private
+  */
+  static metaForProperty(key: string) {
+    let proto = this.proto(); // ensure prototype is initialized
+    let possibleDesc = descriptorForProperty(proto, key);
+
+    assert(
+      `metaForProperty() could not find a computed property with key '${key}'.`,
+      possibleDesc !== undefined
+    );
+
+    return possibleDesc._meta || {};
+  }
+
+  /**
+    Iterate over each computed property for the class, passing its name
+    and any associated metadata (see `metaForProperty`) to the callback.
+
+    @static
+    @method eachComputedProperty
+    @param {Function} callback
+    @param {Object} binding
+    @private
+  */
+  static eachComputedProperty(callback: (name: string, meta: unknown) => void, binding = this) {
+    this.proto(); // ensure prototype is initialized
+    let empty = {};
+
+    meta(this.prototype).forEachDescriptors((name: string, descriptor: ComputedProperty) => {
+      if (descriptor.enumerable) {
+        let meta = descriptor._meta || empty;
+        callback.call(binding, name, meta);
+      }
+    });
+  }
+
+  static get PrototypeMixin() {
+    let prototypeMixin = prototypeMixinMap.get(this);
+    if (prototypeMixin === undefined) {
+      prototypeMixin = Mixin.create();
+      prototypeMixin.ownerConstructor = this;
+      prototypeMixinMap.set(this, prototypeMixin);
+    }
+    return prototypeMixin;
+  }
+
+  static get superclass() {
+    let c = Object.getPrototypeOf(this);
+    return c !== Function.prototype ? c : undefined;
+  }
+
+  static proto() {
+    let p = this.prototype;
+    if (!wasApplied.has(p)) {
+      wasApplied.add(p);
+      let parent = this.superclass;
+      if (parent) {
+        parent.proto();
+      }
+
+      // If the prototype mixin exists, apply it. In the case of native classes,
+      // it will not exist (unless the class has been reopened).
+      if (prototypeMixinMap.has(this)) {
+        this.PrototypeMixin.apply(p);
+      }
+    }
+    return p;
+  }
+
+  static toString() {
+    return `<${getFactoryFor(this) || '(unknown)'}:constructor>`;
+  }
+
+  static isClass = true;
+  static isMethod = false;
+
+  static _onLookup?: (debugContainerKey: string) => void;
+  static _lazyInjections?: () => void;
+
+  declare concatenatedProperties?: string[] | string;
+  declare mergedProperties?: unknown[];
+}
+
+function flattenProps(this: typeof CoreObject, ...props: Array<Record<string, unknown>>) {
+  let initProperties: Record<string, unknown> = {};
+
+  for (let properties of props) {
+    assert(
+      'EmberObject.create no longer supports mixing in other ' +
+        'definitions, use .extend & .create separately instead.',
+      !(properties instanceof Mixin)
+    );
+
+    let keyNames = Object.keys(properties);
+
+    for (let j = 0, k = keyNames.length; j < k; j++) {
+      let keyName = keyNames[j]!;
+      let value = properties[keyName];
+      initProperties[keyName] = value;
+    }
+  }
+
+  return initProperties;
+}
+
+if (DEBUG) {
+  /**
+    Provides lookup-time type validation for injected properties.
+
+    @private
+    @method _onLookup
+  */
+  CoreObject._onLookup = function injectedPropertyAssertion(debugContainerKey: string) {
+    let [type] = debugContainerKey.split(':');
+    let proto = this.proto();
+
+    for (let key in proto) {
+      let desc = descriptorForProperty(proto, key);
+      if (desc && DEBUG_INJECTION_FUNCTIONS.has(desc._getter)) {
+        assert(
+          `Defining \`${key}\` as an injected controller property on a non-controller (\`${debugContainerKey}\`) is not allowed.`,
+          type === 'controller' || DEBUG_INJECTION_FUNCTIONS.get(desc._getter).type !== 'controller'
+        );
+      }
+    }
+  };
+
+  /**
+    Returns a hash of property names and container names that injected
+    properties will lookup on the container lazily.
+
+    @method _lazyInjections
+    @return {Object} Hash of all lazy injected property keys to container names
+    @private
+  */
+  CoreObject._lazyInjections = function () {
+    let injections: Record<string, { namespace: unknown; source: unknown; specifier: string }> = {};
+    let proto = this.proto();
+    let key;
+    let desc;
+
+    for (key in proto) {
+      desc = descriptorForProperty(proto, key);
+      if (desc && DEBUG_INJECTION_FUNCTIONS.has(desc._getter)) {
+        let { namespace, source, type, name } = DEBUG_INJECTION_FUNCTIONS.get(desc._getter);
+
+        injections[key] = {
+          namespace,
+          source,
+          specifier: `${type}:${name || key}`,
+        };
+      }
+    }
+
+    return injections;
+  };
+}
+
+export default CoreObject;
diff --git a/packages/@ember/-internals/runtime/tests/system/object/reopen_test.js b/packages/@ember/object/tests/reopen_test.js
similarity index 91%
rename from packages/@ember/-internals/runtime/tests/system/object/reopen_test.js
rename to packages/@ember/object/tests/reopen_test.js
index b9f6f1948ce..f803309e63f 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/reopen_test.js
+++ b/packages/@ember/object/tests/reopen_test.js
@@ -1,7 +1,7 @@
-import { get } from '@ember/-internals/metal';
-import EmberObject from '../../../lib/system/object';
+import EmberObject, { get } from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
+// TODO: Update these tests (or the title) to match each other.
 moduleFor(
   'system/core_object/reopen',
   class extends AbstractTestCase {
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 185a6e4ce2a..3439c6c2418 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -48,7 +48,6 @@ import {
   ArrayProxy,
   ObjectProxy,
   ActionHandler,
-  CoreObject,
   NativeArray,
   A,
 } from '@ember/-internals/runtime';
@@ -83,6 +82,7 @@ import Namespace from '@ember/application/namespace';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import Enumerable from '@ember/enumerable';
+import CoreObject from '@ember/object/core';
 import { assign } from '@ember/polyfills';
 
 import {

From d7c1f84b3171476cc94527339231a73a62fc875b Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 10:26:47 -0700
Subject: [PATCH 1054/1405] Consolidate @ember/object and
 @ember/object/observable

---
 .../@ember/-internals/glimmer/lib/helper.ts   |   2 +-
 .../angle-bracket-invocation-test.js          |   2 +-
 .../components/curly-components-test.js       |   3 +-
 .../components/target-action-test.js          |   2 +-
 .../template-only-components-test.js          |   2 +-
 .../integration/components/tracked-test.js    |   3 +-
 .../glimmer/tests/integration/content-test.js |   3 +-
 .../custom-component-manager-test.js          |   2 +-
 .../custom-modifier-manager-test.js           |   2 +-
 .../helpers/element-action-test.js            |   3 +-
 .../tests/integration/helpers/tracked-test.js |   3 +-
 .../tests/integration/syntax/each-in-test.js  |   3 +-
 .../tests/utils/shared-conditional-tests.js   |   9 +-
 .../metal/tests/accessors/get_test.js         |   2 +-
 .../metal/tests/accessors/set_test.js         |   2 +-
 .../-internals/metal/tests/alias_test.js      |   3 +-
 .../metal/tests/computed_decorator_test.js    |   2 +-
 .../-internals/metal/tests/computed_test.js   |   2 +-
 .../tests/mixin/merged_properties_test.js     |   2 +-
 .../metal/tests/mixin/reopen_test.js          |   2 +-
 .../metal/tests/native_desc_decorator_test.js |   2 +-
 .../routing/lib/location/auto_location.ts     |   2 +-
 .../routing/lib/location/hash_location.ts     |   2 +-
 .../routing/lib/location/history_location.ts  |   2 +-
 .../routing/lib/location/none_location.ts     |   2 +-
 .../-internals/routing/lib/system/route.ts    |   9 +-
 .../-internals/routing/lib/system/router.ts   |   3 +-
 .../routing/tests/system/route_test.js        |   2 +-
 packages/@ember/-internals/runtime/index.ts   |   2 -
 .../-internals/runtime/lib/mixins/array.ts    |   2 +-
 .../runtime/lib/mixins/observable.ts          | 579 -----------------
 .../runtime/lib/system/array_proxy.ts         |   2 +-
 .../-internals/runtime/lib/system/object.ts   |  60 --
 .../runtime/lib/system/object_proxy.ts        |   2 +-
 .../runtime/tests/array/every-test.js         |   2 +-
 .../runtime/tests/array/filter-test.js        |   2 +-
 .../runtime/tests/array/find-test.js          |   2 +-
 .../runtime/tests/array/invoke-test.js        |   3 +-
 .../runtime/tests/array/isAny-test.js         |   2 +-
 .../runtime/tests/array/reject-test.js        |   2 +-
 .../runtime/tests/core/compare_test.js        |   2 +-
 .../runtime/tests/core/is_array_test.js       |   2 +-
 .../runtime/tests/core/type_of_test.js        |   2 +-
 .../-internals/runtime/tests/helpers/array.js |   2 +-
 .../-internals/runtime/tests/inject_test.js   |   2 +-
 .../mixins/observable/chained_test.js         |   2 +-
 .../legacy_1x/system/object/base_test.js      |   2 +-
 .../system/object/concatenated_test.js        |   2 +-
 .../runtime/tests/mixins/array_test.js        |   2 +-
 .../runtime/tests/mixins/comparable_test.js   |   2 +-
 .../tests/mixins/container_proxy_test.js      |   2 +-
 .../runtime/tests/mixins/observable_test.js   |   2 +-
 .../mixins/target_action_support_test.js      |   2 +-
 .../tests/system/array_proxy/length_test.js   |   2 +-
 .../tests/system/namespace/base_test.js       |   2 +-
 .../runtime/tests/system/object_proxy_test.js |   1 +
 .../-internals/views/lib/component_lookup.ts  |   2 +-
 .../views/lib/system/event_dispatcher.ts      |   2 +-
 .../-internals/views/lib/views/core_view.ts   |   3 +-
 .../tests/application_instance_test.js        |   2 +-
 .../application/tests/application_test.js     |   2 +-
 .../tests/dependency_injection_test.js        |   2 +-
 .../@ember/application/tests/visit_test.js    |   3 +-
 .../component/type-tests/helper/index.test.ts |   2 +-
 packages/@ember/controller/index.ts           |   2 +-
 .../controller/tests/controller_test.js       |   2 +-
 .../@ember/debug/container-debug-adapter.ts   |   3 +-
 packages/@ember/debug/data-adapter.ts         |   3 +-
 packages/@ember/debug/tests/main_test.js      |   2 +-
 packages/@ember/engine/instance.ts            |   3 +-
 packages/@ember/engine/tests/engine_test.js   |   2 +-
 packages/@ember/object/index.ts               |  61 +-
 packages/@ember/object/observable.ts          | 580 +++++++++++++++++-
 packages/@ember/object/tests/action_test.js   |   4 +-
 .../tests/computed/computed_macros_test.js    |   3 +-
 .../computed/dependent-key-compat-test.js     |   4 +-
 .../computed/reduce_computed_macros_test.js   |   9 +-
 .../object => object/tests}/computed_test.js  |   6 +-
 .../object => object/tests}/create_test.js    |   2 +-
 .../object => object/tests}/destroy_test.js   |   2 +-
 .../tests}/detectInstance_test.js             |   2 +-
 .../object => object/tests}/detect_test.js    |   2 +-
 .../tests}/es-compatibility-test.js           |   2 +-
 .../object => object/tests}/events_test.js    |   4 +-
 .../object => object/tests}/extend_test.js    |   2 +-
 .../object => object/tests}/framework_test.js |   2 +-
 .../tests}/observable_test.js                 |   6 +-
 .../object => object/tests}/observer_test.js  |   2 +-
 .../tests}/reopenClass_test.js                |   2 +-
 .../tests}/strict-mode-test.js                |   2 +-
 .../object => object/tests}/toString_test.js  |   2 +-
 packages/@ember/service/index.ts              |   2 +-
 packages/@ember/service/tests/service_test.js |   2 +-
 .../@ember/service/tests/service_ts_test.ts   |   2 +-
 .../@ember/service/type-tests/index.test.ts   |   2 +-
 .../ember-testing/lib/adapters/adapter.ts     |   2 +-
 packages/ember/index.js                       |   5 +-
 packages/ember/tests/homepage_example_test.js |   3 +-
 .../tests/routing/decoupled_basic_test.js     |   2 +-
 .../ember/tests/routing/model_loading_test.js |   3 +-
 .../ember/tests/routing/query_params_test.js  |   3 +-
 .../tests/routing/template_rendering_test.js  |   3 +-
 102 files changed, 765 insertions(+), 767 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/observable.ts
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/object.ts
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/computed_test.js (98%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/create_test.js (99%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/destroy_test.js (98%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/detectInstance_test.js (96%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/detect_test.js (95%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/es-compatibility-test.js (99%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/events_test.js (97%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/extend_test.js (98%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/framework_test.js (94%)
 rename packages/@ember/{-internals/runtime/tests/legacy_1x/mixins/observable => object/tests}/observable_test.js (99%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/observer_test.js (99%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/reopenClass_test.js (94%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/strict-mode-test.js (92%)
 rename packages/@ember/{-internals/runtime/tests/system/object => object/tests}/toString_test.js (94%)

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 0e652396cf1..ae5ab669218 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -5,7 +5,7 @@
 import type { FactoryManager } from '@ember/-internals/container/lib/container';
 import type { Factory, Owner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/object';
 import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { join } from '@ember/runloop';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 1bb86b5c4c2..1ab88f336e5 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -1,7 +1,7 @@
 import { moduleFor, RenderingTestCase, strip, classes, runTask } from 'internal-test-helpers';
 import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
 import { ENV } from '@ember/-internals/environment';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 
 import { set, setProperties } from '@ember/-internals/metal';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index dc374855c77..c37716bf2b9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -13,7 +13,8 @@ import { run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import { alias, set, get, observer, on, computed, tracked } from '@ember/-internals/metal';
 import Service, { service } from '@ember/service';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index e40ad1d65be..f7e6748d5bb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -2,7 +2,7 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { set, Mixin } from '@ember/-internals/metal';
 import Controller from '@ember/controller';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
index 033188083ac..e320c2ffed3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/template-only-components-test.js
@@ -3,7 +3,7 @@ import { ENV } from '@ember/-internals/environment';
 import { setComponentTemplate } from '@glimmer/manager';
 import { templateOnlyComponent } from '@glimmer/runtime';
 import { compile } from 'ember-template-compiler';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { Component } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 2c75b46cd0e..1737865e901 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -1,4 +1,5 @@
-import { Object as EmberObject, A, ArrayProxy, PromiseProxyMixin } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A, ArrayProxy, PromiseProxyMixin } from '@ember/-internals/runtime';
 import {
   computed,
   get,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index 6956629ee63..7967fbc844a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -4,8 +4,9 @@ import { RenderingTestCase, moduleFor, applyMixins, classes, runTask } from 'int
 
 import { set, computed } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
+import EmberObject from '@ember/object';
 import { readOnly } from '@ember/object/computed';
-import { Object as EmberObject, ObjectProxy } from '@ember/-internals/runtime';
+import { ObjectProxy } from '@ember/-internals/runtime';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { Component, SafeString, htmlSafe } from '../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 62e9b576a3b..5b3995731a2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -2,7 +2,7 @@ import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { componentCapabilities } from '@glimmer/manager';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { set, setProperties, computed } from '@ember/-internals/metal';
 import { setComponentManager } from '@ember/-internals/glimmer';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index caecb822958..d154456c40b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -9,7 +9,7 @@ import {
 
 import { Component } from '@ember/-internals/glimmer';
 import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../utils/debug-stack';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 74296843a9d..5067de2181e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -6,7 +6,8 @@ import {
   reset as instrumentationReset,
 } from '@ember/instrumentation';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 import { ActionManager } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index 8b42f331c2f..471e5d6f161 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -1,4 +1,5 @@
-import { Object as EmberObject, A, MutableArray } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A, MutableArray } from '@ember/-internals/runtime';
 import {
   tracked,
   nativeDescDecorator as descriptor,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index 97c94cb3042..9910034f0c7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -1,7 +1,8 @@
 import { applyMixins, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { get, set } from '@ember/-internals/metal';
-import { Object as EmberObject, ObjectProxy } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { ObjectProxy } from '@ember/-internals/runtime';
 
 import {
   FalsyGenerator,
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index e6571a274fc..315016a12ef 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -4,13 +4,8 @@ import { RenderingTestCase, applyMixins, runTask } from 'internal-test-helpers';
 
 import { htmlSafe } from '@ember/-internals/glimmer';
 import { get, set } from '@ember/-internals/metal';
-import {
-  Object as EmberObject,
-  ObjectProxy,
-  A as emberA,
-  ArrayProxy,
-  removeAt,
-} from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { ObjectProxy, A as emberA, ArrayProxy, removeAt } from '@ember/-internals/runtime';
 
 import { Component } from './helpers';
 
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index a9a00c87747..a739159026d 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { get, Mixin, observer } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
diff --git a/packages/@ember/-internals/metal/tests/accessors/set_test.js b/packages/@ember/-internals/metal/tests/accessors/set_test.js
index c9a290976ea..7dea073102f 100644
--- a/packages/@ember/-internals/metal/tests/accessors/set_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/set_test.js
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { get, set, trySet, computed } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js
index 2d361e8aada..9afa0d9c3e3 100644
--- a/packages/@ember/-internals/metal/tests/alias_test.js
+++ b/packages/@ember/-internals/metal/tests/alias_test.js
@@ -8,7 +8,8 @@ import {
   removeObserver,
   tagForProperty,
 } from '..';
-import { Object as EmberObject, A } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A } from '@ember/-internals/runtime';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 import { valueForTag, validateTag } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/metal/tests/computed_decorator_test.js b/packages/@ember/-internals/metal/tests/computed_decorator_test.js
index 341c02bec9f..1ae295e7cc6 100644
--- a/packages/@ember/-internals/metal/tests/computed_decorator_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_decorator_test.js
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { computed, get, set, setProperties } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/metal/tests/computed_test.js b/packages/@ember/-internals/metal/tests/computed_test.js
index 76abb0bccce..c7742a655f6 100644
--- a/packages/@ember/-internals/metal/tests/computed_test.js
+++ b/packages/@ember/-internals/metal/tests/computed_test.js
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { meta as metaFor } from '@ember/-internals/meta';
 import {
   computed,
diff --git a/packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js b/packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js
index 48ba6403f02..20042abea75 100644
--- a/packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { get, mixin, Mixin } from '../..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/metal/tests/mixin/reopen_test.js b/packages/@ember/-internals/metal/tests/mixin/reopen_test.js
index 72400914df2..3f96bf79962 100644
--- a/packages/@ember/-internals/metal/tests/mixin/reopen_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/reopen_test.js
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { get, Mixin } from '../..';
 import { run } from '@ember/runloop';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js b/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
index e9f900e277e..a9eda704a6c 100644
--- a/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
+++ b/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { Mixin, defineProperty, nativeDescDecorator } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
index 2ae1b40ad5c..254b94fb8ba 100644
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/auto_location.ts
@@ -1,7 +1,7 @@
 import { history, location, userAgent, window } from '@ember/-internals/browser-environment';
 import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import type { EmberLocation, UpdateCallback } from './api';
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
index 6a9c5a4939c..63559c5f36c 100644
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/hash_location.ts
@@ -1,5 +1,5 @@
 import { set } from '@ember/-internals/metal';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { bind } from '@ember/runloop';
 import type { EmberLocation, UpdateCallback } from './api';
 import { getHash } from './util';
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
index f28763ba882..d6111a338ce 100644
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/history_location.ts
@@ -1,5 +1,5 @@
 import { set } from '@ember/-internals/metal';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import type { EmberLocation, UpdateCallback } from './api';
 import { getHash } from './util';
 
diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
index e00a5fd23d8..1d9cd6bd3ab 100644
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ b/packages/@ember/-internals/routing/lib/location/none_location.ts
@@ -1,5 +1,5 @@
 import { set } from '@ember/-internals/metal';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { assert } from '@ember/debug';
 import type { EmberLocation, UpdateCallback } from './api';
 
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 543d810daff..7294357acd8 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -14,13 +14,8 @@ import {
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
-import {
-  A as emberA,
-  ActionHandler,
-  Evented,
-  Object as EmberObject,
-  typeOf,
-} from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA, ActionHandler, Evented, typeOf } from '@ember/-internals/runtime';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index f6ebc554c2a..d60570fd4c8 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -5,7 +5,8 @@ import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import type RouterService from '@ember/-internals/routing/lib/services/router';
-import { A as emberA, Evented, Object as EmberObject, typeOf } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA, Evented, typeOf } from '@ember/-internals/runtime';
 import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 109d88d2a55..fedd8689161 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -1,7 +1,7 @@
 import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import Service, { service } from '@ember/service';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import EmberRoute from '../../lib/system/route';
 import ObjectProxy from '@ember/-internals/runtime/lib/system/object_proxy';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index 9c1a22e2223..c25b2854acc 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -1,4 +1,3 @@
-export { default as Object, FrameworkObject } from './lib/system/object';
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
 export { default as compare } from './lib/compare';
@@ -17,7 +16,6 @@ export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ObjectProxy } from './lib/system/object_proxy';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
-export { default as Observable } from './lib/mixins/observable';
 export { default as MutableEnumerable } from './lib/mixins/mutable_enumerable';
 export { default as TargetActionSupport } from './lib/mixins/target_action_support';
 export { default as Evented } from './lib/mixins/evented';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.ts b/packages/@ember/-internals/runtime/lib/mixins/array.ts
index 8874e343a93..2ee572322d6 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.ts
@@ -19,7 +19,7 @@ import { assert } from '@ember/debug';
 import Enumerable from '@ember/enumerable';
 import compare from '../compare';
 import { ENV } from '@ember/-internals/environment';
-import Observable from '../mixins/observable';
+import Observable from '@ember/object/observable';
 import MutableEnumerable from './mutable_enumerable';
 import { typeOf } from '../type-of';
 import type { AnyFn } from '@ember/-internals/utils/types';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/observable.ts b/packages/@ember/-internals/runtime/lib/mixins/observable.ts
deleted file mode 100644
index 6f53f31de9e..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/observable.ts
+++ /dev/null
@@ -1,579 +0,0 @@
-/**
-@module @ember/object
-*/
-
-import { peekMeta } from '@ember/-internals/meta';
-import {
-  get,
-  set,
-  getProperties,
-  setProperties,
-  Mixin,
-  hasListeners,
-  beginPropertyChanges,
-  notifyPropertyChange,
-  endPropertyChanges,
-  addObserver,
-  removeObserver,
-} from '@ember/-internals/metal';
-import { assert } from '@ember/debug';
-
-export type ObserverMethod<Target, Sender> =
-  | keyof Target
-  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
-
-/**
-  ## Overview
-
-  This mixin provides properties and property observing functionality, core
-  features of the Ember object model.
-
-  Properties and observers allow one object to observe changes to a
-  property on another object. This is one of the fundamental ways that
-  models, controllers and views communicate with each other in an Ember
-  application.
-
-  Any object that has this mixin applied can be used in observer
-  operations. That includes `EmberObject` and most objects you will
-  interact with as you write your Ember application.
-
-  Note that you will not generally apply this mixin to classes yourself,
-  but you will use the features provided by this module frequently, so it
-  is important to understand how to use it.
-
-  ## Using `get()` and `set()`
-
-  Because of Ember's support for bindings and observers, you will always
-  access properties using the get method, and set properties using the
-  set method. This allows the observing objects to be notified and
-  computed properties to be handled properly.
-
-  More documentation about `get` and `set` are below.
-
-  ## Observing Property Changes
-
-  You typically observe property changes simply by using the `observer`
-  function in classes that you write.
-
-  For example:
-
-  ```javascript
-  import { observer } from '@ember/object';
-  import EmberObject from '@ember/object';
-
-  EmberObject.extend({
-    valueObserver: observer('value', function(sender, key, value, rev) {
-      // Executes whenever the "value" property changes
-      // See the addObserver method for more information about the callback arguments
-    })
-  });
-  ```
-
-  Although this is the most common way to add an observer, this capability
-  is actually built into the `EmberObject` class on top of two methods
-  defined in this mixin: `addObserver` and `removeObserver`. You can use
-  these two methods to add and remove observers yourself if you need to
-  do so at runtime.
-
-  To add an observer for a property, call:
-
-  ```javascript
-  object.addObserver('propertyKey', targetObject, targetAction)
-  ```
-
-  This will call the `targetAction` method on the `targetObject` whenever
-  the value of the `propertyKey` changes.
-
-  Note that if `propertyKey` is a computed property, the observer will be
-  called when any of the property dependencies are changed, even if the
-  resulting value of the computed property is unchanged. This is necessary
-  because computed properties are not computed until `get` is called.
-
-  @class Observable
-  @public
-*/
-interface Observable {
-  /**
-   * Retrieves the value of a property from the object.
-   */
-  get(key: string): unknown;
-
-  /**
-   * To get the values of multiple properties at once, call `getProperties`
-   * with a list of strings or an array:
-   */
-  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
-  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
-
-  // NOT TYPE SAFE!
-  /**
-   * Sets the provided key or path to the value.
-   */
-  set<T>(key: string, value: T): T;
-
-  // NOT TYPE SAFE!
-  /**
-   * Sets a list of properties at once. These properties are set inside
-   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
-   * observers will be buffered.
-   */
-  setProperties<T extends Record<string, any>>(hash: T): T;
-
-  /**
-   * Convenience method to call `propertyWillChange` and `propertyDidChange` in
-   * succession.
-   */
-  notifyPropertyChange(keyName: string): this;
-
-  /**
-   * Adds an observer on a property.
-   */
-  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
-  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-
-  /**
-   * Remove an observer you have previously registered on this object. Pass
-   * the same key, target, and method you passed to `addObserver()` and your
-   * target will no longer receive notifications.
-   */
-  removeObserver<Target>(
-    key: keyof this,
-    target: Target,
-    method: ObserverMethod<Target, this>
-  ): this;
-  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-
-  // NOT TYPE SAFE!
-  /**
-   * Set the value of a property to the current value plus some amount.
-   */
-  incrementProperty(keyName: keyof this, increment?: number): number;
-
-  // NOT TYPE SAFE!
-  /**
-   * Set the value of a property to the current value minus some amount.
-   */
-  decrementProperty(keyName: keyof this, decrement?: number): number;
-
-  // NOT TYPE SAFE!
-  /**
-   * Set the value of a boolean property to the opposite of its
-   * current value.
-   */
-  toggleProperty(keyName: keyof this): boolean;
-
-  /**
-   * Returns the cached value of a computed property, if it exists.
-   * This allows you to inspect the value of a computed property
-   * without accidentally invoking it if it is intended to be
-   * generated lazily.
-   */
-  cacheFor<K extends keyof this>(key: K): unknown;
-}
-const Observable = Mixin.create({
-  /**
-    Retrieves the value of a property from the object.
-
-    This method is usually similar to using `object[keyName]` or `object.keyName`,
-    however it supports both computed properties and the unknownProperty
-    handler.
-
-    Because `get` unifies the syntax for accessing all these kinds
-    of properties, it can make many refactorings easier, such as replacing a
-    simple property with a computed property, or vice versa.
-
-    ### Computed Properties
-
-    Computed properties are methods defined with the `property` modifier
-    declared at the end, such as:
-
-    ```javascript
-    import { computed } from '@ember/object';
-
-    fullName: computed('firstName', 'lastName', function() {
-      return this.get('firstName') + ' ' + this.get('lastName');
-    })
-    ```
-
-    When you call `get` on a computed property, the function will be
-    called and the return value will be returned instead of the function
-    itself.
-
-    ### Unknown Properties
-
-    Likewise, if you try to call `get` on a property whose value is
-    `undefined`, the `unknownProperty()` method will be called on the object.
-    If this method returns any value other than `undefined`, it will be returned
-    instead. This allows you to implement "virtual" properties that are
-    not defined upfront.
-
-    @method get
-    @param {String} keyName The property to retrieve
-    @return {Object} The property value or undefined.
-    @public
-  */
-  get(keyName: string) {
-    return get(this, keyName);
-  },
-
-  /**
-    To get the values of multiple properties at once, call `getProperties`
-    with a list of strings or an array:
-
-    ```javascript
-    record.getProperties('firstName', 'lastName', 'zipCode');
-    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
-    ```
-
-    is equivalent to:
-
-    ```javascript
-    record.getProperties(['firstName', 'lastName', 'zipCode']);
-    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
-    ```
-
-    @method getProperties
-    @param {String...|Array} list of keys to get
-    @return {Object}
-    @public
-  */
-  getProperties(...args: string[]) {
-    return getProperties(this, ...args);
-  },
-
-  /**
-    Sets the provided key or path to the value.
-
-    ```javascript
-    record.set("key", value);
-    ```
-
-    This method is generally very similar to calling `object["key"] = value` or
-    `object.key = value`, except that it provides support for computed
-    properties, the `setUnknownProperty()` method and property observers.
-
-    ### Computed Properties
-
-    If you try to set a value on a key that has a computed property handler
-    defined (see the `get()` method for an example), then `set()` will call
-    that method, passing both the value and key instead of simply changing
-    the value itself. This is useful for those times when you need to
-    implement a property that is composed of one or more member
-    properties.
-
-    ### Unknown Properties
-
-    If you try to set a value on a key that is undefined in the target
-    object, then the `setUnknownProperty()` handler will be called instead. This
-    gives you an opportunity to implement complex "virtual" properties that
-    are not predefined on the object. If `setUnknownProperty()` returns
-    undefined, then `set()` will simply set the value on the object.
-
-    ### Property Observers
-
-    In addition to changing the property, `set()` will also register a property
-    change with the object. Unless you have placed this call inside of a
-    `beginPropertyChanges()` and `endPropertyChanges(),` any "local" observers
-    (i.e. observer methods declared on the same object), will be called
-    immediately. Any "remote" observers (i.e. observer methods declared on
-    another object) will be placed in a queue and called at a later time in a
-    coalesced manner.
-
-    @method set
-    @param {String} keyName The property to set
-    @param {Object} value The value to set or `null`.
-    @return {Object} The passed value
-    @public
-  */
-  set(keyName: string, value: unknown) {
-    return set(this, keyName, value);
-  },
-
-  /**
-    Sets a list of properties at once. These properties are set inside
-    a single `beginPropertyChanges` and `endPropertyChanges` batch, so
-    observers will be buffered.
-
-    ```javascript
-    record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
-    ```
-
-    @method setProperties
-    @param {Object} hash the hash of keys and values to set
-    @return {Object} The passed in hash
-    @public
-  */
-  setProperties(hash: object) {
-    return setProperties(this, hash);
-  },
-
-  /**
-    Begins a grouping of property changes.
-
-    You can use this method to group property changes so that notifications
-    will not be sent until the changes are finished. If you plan to make a
-    large number of changes to an object at one time, you should call this
-    method at the beginning of the changes to begin deferring change
-    notifications. When you are done making changes, call
-    `endPropertyChanges()` to deliver the deferred change notifications and end
-    deferring.
-
-    @method beginPropertyChanges
-    @return {Observable}
-    @private
-  */
-  beginPropertyChanges() {
-    beginPropertyChanges();
-    return this;
-  },
-
-  /**
-    Ends a grouping of property changes.
-
-    You can use this method to group property changes so that notifications
-    will not be sent until the changes are finished. If you plan to make a
-    large number of changes to an object at one time, you should call
-    `beginPropertyChanges()` at the beginning of the changes to defer change
-    notifications. When you are done making changes, call this method to
-    deliver the deferred change notifications and end deferring.
-
-    @method endPropertyChanges
-    @return {Observable}
-    @private
-  */
-  endPropertyChanges() {
-    endPropertyChanges();
-    return this;
-  },
-
-  /**
-    Notify the observer system that a property has just changed.
-
-    Sometimes you need to change a value directly or indirectly without
-    actually calling `get()` or `set()` on it. In this case, you can use this
-    method instead. Calling this method will notify all observers that the
-    property has potentially changed value.
-
-    @method notifyPropertyChange
-    @param {String} keyName The property key to be notified about.
-    @return {Observable}
-    @public
-  */
-  notifyPropertyChange(keyName: string) {
-    notifyPropertyChange(this, keyName);
-    return this;
-  },
-
-  /**
-    Adds an observer on a property.
-
-    This is the core method used to register an observer for a property.
-
-    Once you call this method, any time the key's value is set, your observer
-    will be notified. Note that the observers are triggered any time the
-    value is set, regardless of whether it has actually changed. Your
-    observer should be prepared to handle that.
-
-    There are two common invocation patterns for `.addObserver()`:
-
-    - Passing two arguments:
-      - the name of the property to observe (as a string)
-      - the function to invoke (an actual function)
-    - Passing three arguments:
-      - the name of the property to observe (as a string)
-      - the target object (will be used to look up and invoke a
-        function on)
-      - the name of the function to invoke on the target object
-        (as a string).
-
-    ```app/components/my-component.js
-    import Component from '@ember/component';
-
-    export default Component.extend({
-      init() {
-        this._super(...arguments);
-
-        // the following are equivalent:
-
-        // using three arguments
-        this.addObserver('foo', this, 'fooDidChange');
-
-        // using two arguments
-        this.addObserver('foo', (...args) => {
-          this.fooDidChange(...args);
-        });
-      },
-
-      fooDidChange() {
-        // your custom logic code
-      }
-    });
-    ```
-
-    ### Observer Methods
-
-    Observer methods have the following signature:
-
-    ```app/components/my-component.js
-    import Component from '@ember/component';
-
-    export default Component.extend({
-      init() {
-        this._super(...arguments);
-        this.addObserver('foo', this, 'fooDidChange');
-      },
-
-      fooDidChange(sender, key, value, rev) {
-        // your code
-      }
-    });
-    ```
-
-    The `sender` is the object that changed. The `key` is the property that
-    changes. The `value` property is currently reserved and unused. The `rev`
-    is the last property revision of the object when it changed, which you can
-    use to detect if the key value has really changed or not.
-
-    Usually you will not need the value or revision parameters at
-    the end. In this case, it is common to write observer methods that take
-    only a sender and key value as parameters or, if you aren't interested in
-    any of these values, to write an observer that has no parameters at all.
-
-    @method addObserver
-    @param {String} key The key to observe
-    @param {Object} target The target object to invoke
-    @param {String|Function} method The method to invoke
-    @param {Boolean} sync Whether the observer is sync or not
-    @return {Observable}
-    @public
-  */
-  addObserver(
-    key: string,
-    target: object | Function | null,
-    method?: string | Function,
-    sync?: boolean
-  ) {
-    addObserver(this, key, target, method, sync);
-    return this;
-  },
-
-  /**
-    Remove an observer you have previously registered on this object. Pass
-    the same key, target, and method you passed to `addObserver()` and your
-    target will no longer receive notifications.
-
-    @method removeObserver
-    @param {String} key The key to observe
-    @param {Object} target The target object to invoke
-    @param {String|Function} method The method to invoke
-    @param {Boolean} sync Whether the observer is async or not
-    @return {Observable}
-    @public
-  */
-  removeObserver(
-    key: string,
-    target: object | Function | null,
-    method?: string | Function,
-    sync?: boolean
-  ) {
-    removeObserver(this, key, target, method, sync);
-    return this;
-  },
-
-  /**
-    Returns `true` if the object currently has observers registered for a
-    particular key. You can use this method to potentially defer performing
-    an expensive action until someone begins observing a particular property
-    on the object.
-
-    @method hasObserverFor
-    @param {String} key Key to check
-    @return {Boolean}
-    @private
-  */
-  hasObserverFor(key: string) {
-    return hasListeners(this, `${key}:change`);
-  },
-
-  /**
-    Set the value of a property to the current value plus some amount.
-
-    ```javascript
-    person.incrementProperty('age');
-    team.incrementProperty('score', 2);
-    ```
-
-    @method incrementProperty
-    @param {String} keyName The name of the property to increment
-    @param {Number} increment The amount to increment by. Defaults to 1
-    @return {Number} The new property value
-    @public
-  */
-  incrementProperty(keyName: string, increment = 1) {
-    assert(
-      'Must pass a numeric value to incrementProperty',
-      !isNaN(parseFloat(String(increment))) && isFinite(increment)
-    );
-    return set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
-  },
-
-  /**
-    Set the value of a property to the current value minus some amount.
-
-    ```javascript
-    player.decrementProperty('lives');
-    orc.decrementProperty('health', 5);
-    ```
-
-    @method decrementProperty
-    @param {String} keyName The name of the property to decrement
-    @param {Number} decrement The amount to decrement by. Defaults to 1
-    @return {Number} The new property value
-    @public
-  */
-  decrementProperty(keyName: string, decrement = 1) {
-    assert(
-      'Must pass a numeric value to decrementProperty',
-      (typeof decrement === 'number' || !isNaN(parseFloat(decrement))) && isFinite(decrement)
-    );
-    return set(this, keyName, (get(this, keyName) || 0) - decrement);
-  },
-
-  /**
-    Set the value of a boolean property to the opposite of its
-    current value.
-
-    ```javascript
-    starship.toggleProperty('warpDriveEngaged');
-    ```
-
-    @method toggleProperty
-    @param {String} keyName The name of the property to toggle
-    @return {Boolean} The new property value
-    @public
-  */
-  toggleProperty(keyName: string) {
-    return set(this, keyName, !get(this, keyName));
-  },
-
-  /**
-    Returns the cached value of a computed property, if it exists.
-    This allows you to inspect the value of a computed property
-    without accidentally invoking it if it is intended to be
-    generated lazily.
-
-    @method cacheFor
-    @param {String} keyName
-    @return {Object} The cached value of the computed property, if any
-    @public
-  */
-  cacheFor(keyName: string) {
-    let meta = peekMeta(this);
-
-    if (meta !== null) {
-      return meta.valueFor(keyName);
-    }
-  },
-});
-
-export default Observable;
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
index b025402f2aa..2490c669d1e 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
@@ -15,7 +15,7 @@ import {
   tagForProperty,
 } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
-import EmberObject from './object';
+import EmberObject from '@ember/object';
 import EmberArray, { MutableArray } from '../mixins/array';
 import { assert } from '@ember/debug';
 import { setCustomTagFor } from '@glimmer/manager';
diff --git a/packages/@ember/-internals/runtime/lib/system/object.ts b/packages/@ember/-internals/runtime/lib/system/object.ts
deleted file mode 100644
index fda8166b6b2..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/object.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
-@module @ember/object
-*/
-
-import { getFactoryFor } from '@ember/-internals/container';
-import { symbol } from '@ember/-internals/utils';
-import { addListener } from '@ember/-internals/metal';
-import CoreObject from '@ember/object/core';
-import Observable from '../mixins/observable';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-
-/**
-  `EmberObject` is the main base class for all Ember objects. It is a subclass
-  of `CoreObject` with the `Observable` mixin applied. For details,
-  see the documentation for each of these.
-
-  @class EmberObject
-  @extends CoreObject
-  @uses Observable
-  @public
-*/
-interface EmberObject extends CoreObject, Observable {}
-class EmberObject extends CoreObject.extend(Observable) {
-  get _debugContainerKey() {
-    let factory = getFactoryFor(this);
-    return factory !== undefined && factory.fullName;
-  }
-}
-
-export default EmberObject;
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface FrameworkObject extends EmberObject {}
-let FrameworkObject = class FrameworkObject extends EmberObject {};
-
-if (DEBUG) {
-  const INIT_WAS_CALLED = Symbol('INIT_WAS_CALLED');
-  let ASSERT_INIT_WAS_CALLED = symbol('ASSERT_INIT_WAS_CALLED');
-
-  FrameworkObject = class DebugFrameworkObject extends EmberObject {
-    [INIT_WAS_CALLED] = false;
-
-    init(properties: object | undefined) {
-      super.init(properties);
-      this[INIT_WAS_CALLED] = true;
-    }
-
-    [ASSERT_INIT_WAS_CALLED]() {
-      assert(
-        `You must call \`super.init(...arguments);\` or \`this._super(...arguments)\` when overriding \`init\` on a framework object. Please update ${this} to call \`super.init(...arguments);\` from \`init\` when using native classes or \`this._super(...arguments)\` when using \`EmberObject.extend()\`.`,
-        this[INIT_WAS_CALLED]
-      );
-    }
-  };
-
-  addListener(FrameworkObject.prototype, 'init', null, ASSERT_INIT_WAS_CALLED);
-}
-
-export { FrameworkObject };
diff --git a/packages/@ember/-internals/runtime/lib/system/object_proxy.ts b/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
index ad3549460ee..7e70c27252e 100644
--- a/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
@@ -1,4 +1,4 @@
-import FrameworkObject from './object';
+import { FrameworkObject } from '@ember/object';
 import _ProxyMixin from '../mixins/-proxy';
 
 /**
diff --git a/packages/@ember/-internals/runtime/tests/array/every-test.js b/packages/@ember/-internals/runtime/tests/array/every-test.js
index 53d8e0a7032..a23a6cf81a0 100644
--- a/packages/@ember/-internals/runtime/tests/array/every-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/every-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 
 class EveryTest extends AbstractTestCase {
   '@test every should should invoke callback on each item as long as you return true'() {
diff --git a/packages/@ember/-internals/runtime/tests/array/filter-test.js b/packages/@ember/-internals/runtime/tests/array/filter-test.js
index 610a2bb8798..d0d97028563 100644
--- a/packages/@ember/-internals/runtime/tests/array/filter-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/filter-test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/find-test.js b/packages/@ember/-internals/runtime/tests/array/find-test.js
index c1c6c8a1da3..02b34fe5323 100644
--- a/packages/@ember/-internals/runtime/tests/array/find-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/find-test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/invoke-test.js b/packages/@ember/-internals/runtime/tests/array/invoke-test.js
index bd5033d16ce..6149db3832f 100644
--- a/packages/@ember/-internals/runtime/tests/array/invoke-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/invoke-test.js
@@ -1,4 +1,5 @@
-import { Object as EmberObject, NativeArray } from '../../index';
+import EmberObject from '@ember/object';
+import { NativeArray } from '../../index';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/isAny-test.js b/packages/@ember/-internals/runtime/tests/array/isAny-test.js
index 5043c120060..56fd637dba4 100644
--- a/packages/@ember/-internals/runtime/tests/array/isAny-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/isAny-test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/reject-test.js b/packages/@ember/-internals/runtime/tests/array/reject-test.js
index aa9c9687919..01e5741cd17 100644
--- a/packages/@ember/-internals/runtime/tests/array/reject-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/reject-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 
 class RejectTest extends AbstractTestCase {
   '@test should reject any item that does not meet the condition'() {
diff --git a/packages/@ember/-internals/runtime/tests/core/compare_test.js b/packages/@ember/-internals/runtime/tests/core/compare_test.js
index b2ca1869d2d..192d50f5b47 100644
--- a/packages/@ember/-internals/runtime/tests/core/compare_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/compare_test.js
@@ -1,5 +1,5 @@
 import { typeOf } from '../../lib/type-of';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import compare from '../../lib/compare';
 import Comparable from '../../lib/mixins/comparable';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/core/is_array_test.js b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
index 748b14520b6..6d0f99b5770 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_array_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
@@ -1,6 +1,6 @@
 import { A as emberA, isArray } from '../../lib/mixins/array';
 import ArrayProxy from '../../lib/system/array_proxy';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { window } from '@ember/-internals/browser-environment';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/core/type_of_test.js b/packages/@ember/-internals/runtime/tests/core/type_of_test.js
index a74716c0118..8493e2feb01 100644
--- a/packages/@ember/-internals/runtime/tests/core/type_of_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/type_of_test.js
@@ -1,5 +1,5 @@
 import { typeOf } from '../../lib/type-of';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { window } from '@ember/-internals/browser-environment';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index d7181c94813..d7abef11504 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -9,7 +9,7 @@ import {
   arrayContentWillChange,
   arrayContentDidChange,
 } from '@ember/-internals/metal';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor } from 'internal-test-helpers';
 
 export function newFixture(cnt) {
diff --git a/packages/@ember/-internals/runtime/tests/inject_test.js b/packages/@ember/-internals/runtime/tests/inject_test.js
index 408e2064a7e..db53ca6e2ca 100644
--- a/packages/@ember/-internals/runtime/tests/inject_test.js
+++ b/packages/@ember/-internals/runtime/tests/inject_test.js
@@ -1,6 +1,6 @@
 import { inject } from '@ember/-internals/metal';
 import { DEBUG } from '@glimmer/env';
-import EmberObject from '../lib/system/object';
+import EmberObject from '@ember/object';
 import { buildOwner } from 'internal-test-helpers';
 import { runDestroy, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
index b18523c2b0b..5eca77ee1b8 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
@@ -1,5 +1,5 @@
 import { get, set, addObserver } from '@ember/-internals/metal';
-import EmberObject from '../../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { A as emberA } from '../../../../lib/mixins/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
index bb0834ac988..5ec45dc1309 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
@@ -1,5 +1,5 @@
 import { get, set } from '@ember/-internals/metal';
-import EmberObject from '../../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
index b5c7581ba39..361efdf2f21 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
@@ -1,5 +1,5 @@
 import { get } from '@ember/-internals/metal';
-import EmberObject from '../../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index c72c1cfe94b..bddbfb719e4 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -10,7 +10,7 @@ import {
   arrayContentDidChange,
   arrayContentWillChange,
 } from '@ember/-internals/metal';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import EmberArray, { A as emberA } from '../../lib/mixins/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
index d66703635db..30f4907f29d 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
@@ -1,5 +1,5 @@
 import { get } from '@ember/-internals/metal';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import compare from '../../lib/compare';
 import Comparable from '../../lib/mixins/comparable';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
index 0b45a5e65a9..2497826b3ac 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/container_proxy_test.js
@@ -1,7 +1,7 @@
 import { getOwner } from '@ember/-internals/owner';
 import { Container, Registry } from '@ember/-internals/container';
 import ContainerProxy from '../../lib/mixins/container_proxy';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { run, schedule } from '@ember/runloop';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
diff --git a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
index 70fdf9a7d99..f028b336307 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
@@ -1,5 +1,5 @@
 import { computed, addObserver, get } from '@ember/-internals/metal';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/mixins/target_action_support_test.js b/packages/@ember/-internals/runtime/tests/mixins/target_action_support_test.js
index c6200aee7db..be9eb69ea7b 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/target_action_support_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/target_action_support_test.js
@@ -1,5 +1,5 @@
 import { context } from '@ember/-internals/environment';
-import EmberObject from '../../lib/system/object';
+import EmberObject from '@ember/object';
 import TargetActionSupport from '../../lib/mixins/target_action_support';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
index ae192431922..40f00091f24 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
@@ -1,5 +1,5 @@
 import ArrayProxy from '../../../lib/system/array_proxy';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { observer } from '@ember/-internals/metal';
 import { oneWay as reads, not } from '@ember/object/computed';
 import { A as a } from '../../../lib/mixins/array';
diff --git a/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js b/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
index a06eae8d48a..5eba7ae5d93 100644
--- a/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/namespace/base_test.js
@@ -2,7 +2,7 @@ import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import { get, setNamespaceSearchDisabled } from '@ember/-internals/metal';
 import { guidFor, getName } from '@ember/-internals/utils';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import Namespace from '@ember/application/namespace';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
index 3d9cb140584..83968b6ba88 100644
--- a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
@@ -103,6 +103,7 @@ moduleFor(
       if (DEBUG) {
         let proxy = ObjectProxy.extend({
           init() {
+            this._super();
             if (!this.foobar) {
               this.foobar = function () {
                 let content = get(this, 'content');
diff --git a/packages/@ember/-internals/views/lib/component_lookup.ts b/packages/@ember/-internals/views/lib/component_lookup.ts
index 232f24d016b..542f6375608 100644
--- a/packages/@ember/-internals/views/lib/component_lookup.ts
+++ b/packages/@ember/-internals/views/lib/component_lookup.ts
@@ -1,5 +1,5 @@
 import type { Owner, TypeOptions } from '@ember/-internals/owner';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 
 export default EmberObject.extend({
   componentFor(name: string, owner: Owner) {
diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
index 30a903f4094..00230a463db 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
@@ -1,7 +1,7 @@
 import { getOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { get, set } from '@ember/-internals/metal';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { getElementView } from '@ember/-internals/views';
 import ActionManager from './action_manager';
 import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index bec610a2df9..5142ed756d9 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -1,6 +1,7 @@
 import type { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
-import { ActionHandler, Evented, FrameworkObject } from '@ember/-internals/runtime';
+import { ActionHandler, Evented } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/object';
 import type { ViewState } from './states';
 import states from './states';
 
diff --git a/packages/@ember/application/tests/application_instance_test.js b/packages/@ember/application/tests/application_instance_test.js
index db7e438f0c7..d32de48a385 100644
--- a/packages/@ember/application/tests/application_instance_test.js
+++ b/packages/@ember/application/tests/application_instance_test.js
@@ -4,7 +4,7 @@ import ApplicationInstance from '@ember/application/instance';
 import { run } from '@ember/runloop';
 import { privatize as P } from '@ember/-internals/container';
 import { factory } from 'internal-test-helpers';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import {
   moduleFor,
   ModuleBasedTestResolver,
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index f4c51d8bf27..af9b12c34e1 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -6,7 +6,7 @@ import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { Router, NoneLocation, Route as EmberRoute } from '@ember/-internals/routing';
 import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import {
   moduleFor,
   ApplicationTestCase,
diff --git a/packages/@ember/application/tests/dependency_injection_test.js b/packages/@ember/application/tests/dependency_injection_test.js
index 6ac4de6a61d..066384dc039 100644
--- a/packages/@ember/application/tests/dependency_injection_test.js
+++ b/packages/@ember/application/tests/dependency_injection_test.js
@@ -1,6 +1,6 @@
 import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import EmberApplication from '@ember/application';
 import {
   moduleFor,
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index d6841bbb08f..85271016996 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -5,7 +5,8 @@ import {
   runTask,
 } from 'internal-test-helpers';
 import { service } from '@ember/service';
-import { Object as EmberObject, RSVP, onerrorDefault } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { RSVP, onerrorDefault } from '@ember/-internals/runtime';
 import { later } from '@ember/runloop';
 import Application from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts
index 009756cf990..4384a0ff00f 100644
--- a/packages/@ember/component/type-tests/helper/index.test.ts
+++ b/packages/@ember/component/type-tests/helper/index.test.ts
@@ -1,5 +1,5 @@
 import type { Owner } from '@ember/-internals/owner';
-import type { FrameworkObject } from '@ember/-internals/runtime';
+import type { FrameworkObject } from '@ember/object';
 import Helper from '@ember/component/helper';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 84a62daa64e..2b6011a526b 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,5 +1,5 @@
 import { getOwner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/object';
 import { inject as metalInject } from '@ember/-internals/metal';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 import { Mixin, computed, get } from '@ember/-internals/metal';
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index f6340ae8202..38cd056e4a8 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -1,6 +1,6 @@
 import Controller, { inject as injectController } from '@ember/controller';
 import Service, { service } from '@ember/service';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { Mixin, get } from '@ember/-internals/metal';
 import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner } from 'internal-test-helpers';
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index a9488321c65..5f29bbf0a55 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1,6 +1,7 @@
 import { classify, dasherize } from '@ember/string';
 import type { NativeArray } from '@ember/-internals/runtime';
-import { A as emberA, typeOf, Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA, typeOf } from '@ember/-internals/runtime';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import type { Resolver } from '@ember/-internals/container/lib/registry';
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 1b3c699c047..27f01728b01 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -5,7 +5,8 @@ import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
 import Namespace from '@ember/application/namespace';
 import type { NativeArray } from '@ember/-internals/runtime';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 import type { Cache } from '@glimmer/validator';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
diff --git a/packages/@ember/debug/tests/main_test.js b/packages/@ember/debug/tests/main_test.js
index 74c485c0555..7c600460537 100644
--- a/packages/@ember/debug/tests/main_test.js
+++ b/packages/@ember/debug/tests/main_test.js
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { HANDLERS } from '../lib/handlers';
 import {
   registerHandler,
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index e8c5ea45154..71563f8e39f 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -2,7 +2,8 @@
 @module @ember/engine
 */
 
-import { Object as EmberObject, RSVP } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { RSVP } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
 import EmberError from '@ember/error';
 import { Registry, privatize as P } from '@ember/-internals/container';
diff --git a/packages/@ember/engine/tests/engine_test.js b/packages/@ember/engine/tests/engine_test.js
index 473878418ba..071641e8ff2 100644
--- a/packages/@ember/engine/tests/engine_test.js
+++ b/packages/@ember/engine/tests/engine_test.js
@@ -1,7 +1,7 @@
 import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import Engine from '@ember/engine';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { processAllNamespaces } from '@ember/-internals/metal';
 import { getName } from '@ember/-internals/utils';
 import {
diff --git a/packages/@ember/object/index.ts b/packages/@ember/object/index.ts
index b0528068aea..4d6f37bebeb 100644
--- a/packages/@ember/object/index.ts
+++ b/packages/@ember/object/index.ts
@@ -1,8 +1,12 @@
 import { assert } from '@ember/debug';
 import type { ElementDescriptor, ExtendedMethodDecorator } from '@ember/-internals/metal';
 import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
-
-export { Object as default } from '@ember/-internals/runtime';
+import { getFactoryFor } from '@ember/-internals/container';
+import { symbol } from '@ember/-internals/utils';
+import { addListener } from '@ember/-internals/metal';
+import CoreObject from '@ember/object/core';
+import Observable from '@ember/object/observable';
+import { DEBUG } from '@glimmer/env';
 
 export {
   notifyPropertyChange,
@@ -16,6 +20,59 @@ export {
   trySet,
 } from '@ember/-internals/metal';
 
+/**
+@module @ember/object
+*/
+
+/**
+  `EmberObject` is the main base class for all Ember objects. It is a subclass
+  of `CoreObject` with the `Observable` mixin applied. For details,
+  see the documentation for each of these.
+
+  @class EmberObject
+  @extends CoreObject
+  @uses Observable
+  @public
+*/
+interface EmberObject extends CoreObject, Observable {}
+class EmberObject extends CoreObject.extend(Observable) {
+  get _debugContainerKey() {
+    let factory = getFactoryFor(this);
+    return factory !== undefined && factory.fullName;
+  }
+}
+
+export default EmberObject;
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface FrameworkObject extends EmberObject {}
+let FrameworkObject = class FrameworkObject extends EmberObject {};
+
+if (DEBUG) {
+  const INIT_WAS_CALLED = Symbol('INIT_WAS_CALLED');
+  let ASSERT_INIT_WAS_CALLED = symbol('ASSERT_INIT_WAS_CALLED');
+
+  FrameworkObject = class DebugFrameworkObject extends EmberObject {
+    [INIT_WAS_CALLED] = false;
+
+    init(properties: object | undefined) {
+      super.init(properties);
+      this[INIT_WAS_CALLED] = true;
+    }
+
+    [ASSERT_INIT_WAS_CALLED]() {
+      assert(
+        `You must call \`super.init(...arguments);\` or \`this._super(...arguments)\` when overriding \`init\` on a framework object. Please update ${this} to call \`super.init(...arguments);\` from \`init\` when using native classes or \`this._super(...arguments)\` when using \`EmberObject.extend()\`.`,
+        this[INIT_WAS_CALLED]
+      );
+    }
+  };
+
+  addListener(FrameworkObject.prototype, 'init', null, ASSERT_INIT_WAS_CALLED);
+}
+
+export { FrameworkObject };
+
 /**
   Decorator that turns the target function into an Action which can be accessed
   directly by reference.
diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index 4bbad9b0fd5..6f53f31de9e 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -1 +1,579 @@
-export { Observable as default } from '@ember/-internals/runtime';
+/**
+@module @ember/object
+*/
+
+import { peekMeta } from '@ember/-internals/meta';
+import {
+  get,
+  set,
+  getProperties,
+  setProperties,
+  Mixin,
+  hasListeners,
+  beginPropertyChanges,
+  notifyPropertyChange,
+  endPropertyChanges,
+  addObserver,
+  removeObserver,
+} from '@ember/-internals/metal';
+import { assert } from '@ember/debug';
+
+export type ObserverMethod<Target, Sender> =
+  | keyof Target
+  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
+
+/**
+  ## Overview
+
+  This mixin provides properties and property observing functionality, core
+  features of the Ember object model.
+
+  Properties and observers allow one object to observe changes to a
+  property on another object. This is one of the fundamental ways that
+  models, controllers and views communicate with each other in an Ember
+  application.
+
+  Any object that has this mixin applied can be used in observer
+  operations. That includes `EmberObject` and most objects you will
+  interact with as you write your Ember application.
+
+  Note that you will not generally apply this mixin to classes yourself,
+  but you will use the features provided by this module frequently, so it
+  is important to understand how to use it.
+
+  ## Using `get()` and `set()`
+
+  Because of Ember's support for bindings and observers, you will always
+  access properties using the get method, and set properties using the
+  set method. This allows the observing objects to be notified and
+  computed properties to be handled properly.
+
+  More documentation about `get` and `set` are below.
+
+  ## Observing Property Changes
+
+  You typically observe property changes simply by using the `observer`
+  function in classes that you write.
+
+  For example:
+
+  ```javascript
+  import { observer } from '@ember/object';
+  import EmberObject from '@ember/object';
+
+  EmberObject.extend({
+    valueObserver: observer('value', function(sender, key, value, rev) {
+      // Executes whenever the "value" property changes
+      // See the addObserver method for more information about the callback arguments
+    })
+  });
+  ```
+
+  Although this is the most common way to add an observer, this capability
+  is actually built into the `EmberObject` class on top of two methods
+  defined in this mixin: `addObserver` and `removeObserver`. You can use
+  these two methods to add and remove observers yourself if you need to
+  do so at runtime.
+
+  To add an observer for a property, call:
+
+  ```javascript
+  object.addObserver('propertyKey', targetObject, targetAction)
+  ```
+
+  This will call the `targetAction` method on the `targetObject` whenever
+  the value of the `propertyKey` changes.
+
+  Note that if `propertyKey` is a computed property, the observer will be
+  called when any of the property dependencies are changed, even if the
+  resulting value of the computed property is unchanged. This is necessary
+  because computed properties are not computed until `get` is called.
+
+  @class Observable
+  @public
+*/
+interface Observable {
+  /**
+   * Retrieves the value of a property from the object.
+   */
+  get(key: string): unknown;
+
+  /**
+   * To get the values of multiple properties at once, call `getProperties`
+   * with a list of strings or an array:
+   */
+  getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
+  getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
+
+  // NOT TYPE SAFE!
+  /**
+   * Sets the provided key or path to the value.
+   */
+  set<T>(key: string, value: T): T;
+
+  // NOT TYPE SAFE!
+  /**
+   * Sets a list of properties at once. These properties are set inside
+   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+   * observers will be buffered.
+   */
+  setProperties<T extends Record<string, any>>(hash: T): T;
+
+  /**
+   * Convenience method to call `propertyWillChange` and `propertyDidChange` in
+   * succession.
+   */
+  notifyPropertyChange(keyName: string): this;
+
+  /**
+   * Adds an observer on a property.
+   */
+  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
+  /**
+   * Remove an observer you have previously registered on this object. Pass
+   * the same key, target, and method you passed to `addObserver()` and your
+   * target will no longer receive notifications.
+   */
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method: ObserverMethod<Target, this>
+  ): this;
+  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+
+  // NOT TYPE SAFE!
+  /**
+   * Set the value of a property to the current value plus some amount.
+   */
+  incrementProperty(keyName: keyof this, increment?: number): number;
+
+  // NOT TYPE SAFE!
+  /**
+   * Set the value of a property to the current value minus some amount.
+   */
+  decrementProperty(keyName: keyof this, decrement?: number): number;
+
+  // NOT TYPE SAFE!
+  /**
+   * Set the value of a boolean property to the opposite of its
+   * current value.
+   */
+  toggleProperty(keyName: keyof this): boolean;
+
+  /**
+   * Returns the cached value of a computed property, if it exists.
+   * This allows you to inspect the value of a computed property
+   * without accidentally invoking it if it is intended to be
+   * generated lazily.
+   */
+  cacheFor<K extends keyof this>(key: K): unknown;
+}
+const Observable = Mixin.create({
+  /**
+    Retrieves the value of a property from the object.
+
+    This method is usually similar to using `object[keyName]` or `object.keyName`,
+    however it supports both computed properties and the unknownProperty
+    handler.
+
+    Because `get` unifies the syntax for accessing all these kinds
+    of properties, it can make many refactorings easier, such as replacing a
+    simple property with a computed property, or vice versa.
+
+    ### Computed Properties
+
+    Computed properties are methods defined with the `property` modifier
+    declared at the end, such as:
+
+    ```javascript
+    import { computed } from '@ember/object';
+
+    fullName: computed('firstName', 'lastName', function() {
+      return this.get('firstName') + ' ' + this.get('lastName');
+    })
+    ```
+
+    When you call `get` on a computed property, the function will be
+    called and the return value will be returned instead of the function
+    itself.
+
+    ### Unknown Properties
+
+    Likewise, if you try to call `get` on a property whose value is
+    `undefined`, the `unknownProperty()` method will be called on the object.
+    If this method returns any value other than `undefined`, it will be returned
+    instead. This allows you to implement "virtual" properties that are
+    not defined upfront.
+
+    @method get
+    @param {String} keyName The property to retrieve
+    @return {Object} The property value or undefined.
+    @public
+  */
+  get(keyName: string) {
+    return get(this, keyName);
+  },
+
+  /**
+    To get the values of multiple properties at once, call `getProperties`
+    with a list of strings or an array:
+
+    ```javascript
+    record.getProperties('firstName', 'lastName', 'zipCode');
+    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+    ```
+
+    is equivalent to:
+
+    ```javascript
+    record.getProperties(['firstName', 'lastName', 'zipCode']);
+    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+    ```
+
+    @method getProperties
+    @param {String...|Array} list of keys to get
+    @return {Object}
+    @public
+  */
+  getProperties(...args: string[]) {
+    return getProperties(this, ...args);
+  },
+
+  /**
+    Sets the provided key or path to the value.
+
+    ```javascript
+    record.set("key", value);
+    ```
+
+    This method is generally very similar to calling `object["key"] = value` or
+    `object.key = value`, except that it provides support for computed
+    properties, the `setUnknownProperty()` method and property observers.
+
+    ### Computed Properties
+
+    If you try to set a value on a key that has a computed property handler
+    defined (see the `get()` method for an example), then `set()` will call
+    that method, passing both the value and key instead of simply changing
+    the value itself. This is useful for those times when you need to
+    implement a property that is composed of one or more member
+    properties.
+
+    ### Unknown Properties
+
+    If you try to set a value on a key that is undefined in the target
+    object, then the `setUnknownProperty()` handler will be called instead. This
+    gives you an opportunity to implement complex "virtual" properties that
+    are not predefined on the object. If `setUnknownProperty()` returns
+    undefined, then `set()` will simply set the value on the object.
+
+    ### Property Observers
+
+    In addition to changing the property, `set()` will also register a property
+    change with the object. Unless you have placed this call inside of a
+    `beginPropertyChanges()` and `endPropertyChanges(),` any "local" observers
+    (i.e. observer methods declared on the same object), will be called
+    immediately. Any "remote" observers (i.e. observer methods declared on
+    another object) will be placed in a queue and called at a later time in a
+    coalesced manner.
+
+    @method set
+    @param {String} keyName The property to set
+    @param {Object} value The value to set or `null`.
+    @return {Object} The passed value
+    @public
+  */
+  set(keyName: string, value: unknown) {
+    return set(this, keyName, value);
+  },
+
+  /**
+    Sets a list of properties at once. These properties are set inside
+    a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+    observers will be buffered.
+
+    ```javascript
+    record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
+    ```
+
+    @method setProperties
+    @param {Object} hash the hash of keys and values to set
+    @return {Object} The passed in hash
+    @public
+  */
+  setProperties(hash: object) {
+    return setProperties(this, hash);
+  },
+
+  /**
+    Begins a grouping of property changes.
+
+    You can use this method to group property changes so that notifications
+    will not be sent until the changes are finished. If you plan to make a
+    large number of changes to an object at one time, you should call this
+    method at the beginning of the changes to begin deferring change
+    notifications. When you are done making changes, call
+    `endPropertyChanges()` to deliver the deferred change notifications and end
+    deferring.
+
+    @method beginPropertyChanges
+    @return {Observable}
+    @private
+  */
+  beginPropertyChanges() {
+    beginPropertyChanges();
+    return this;
+  },
+
+  /**
+    Ends a grouping of property changes.
+
+    You can use this method to group property changes so that notifications
+    will not be sent until the changes are finished. If you plan to make a
+    large number of changes to an object at one time, you should call
+    `beginPropertyChanges()` at the beginning of the changes to defer change
+    notifications. When you are done making changes, call this method to
+    deliver the deferred change notifications and end deferring.
+
+    @method endPropertyChanges
+    @return {Observable}
+    @private
+  */
+  endPropertyChanges() {
+    endPropertyChanges();
+    return this;
+  },
+
+  /**
+    Notify the observer system that a property has just changed.
+
+    Sometimes you need to change a value directly or indirectly without
+    actually calling `get()` or `set()` on it. In this case, you can use this
+    method instead. Calling this method will notify all observers that the
+    property has potentially changed value.
+
+    @method notifyPropertyChange
+    @param {String} keyName The property key to be notified about.
+    @return {Observable}
+    @public
+  */
+  notifyPropertyChange(keyName: string) {
+    notifyPropertyChange(this, keyName);
+    return this;
+  },
+
+  /**
+    Adds an observer on a property.
+
+    This is the core method used to register an observer for a property.
+
+    Once you call this method, any time the key's value is set, your observer
+    will be notified. Note that the observers are triggered any time the
+    value is set, regardless of whether it has actually changed. Your
+    observer should be prepared to handle that.
+
+    There are two common invocation patterns for `.addObserver()`:
+
+    - Passing two arguments:
+      - the name of the property to observe (as a string)
+      - the function to invoke (an actual function)
+    - Passing three arguments:
+      - the name of the property to observe (as a string)
+      - the target object (will be used to look up and invoke a
+        function on)
+      - the name of the function to invoke on the target object
+        (as a string).
+
+    ```app/components/my-component.js
+    import Component from '@ember/component';
+
+    export default Component.extend({
+      init() {
+        this._super(...arguments);
+
+        // the following are equivalent:
+
+        // using three arguments
+        this.addObserver('foo', this, 'fooDidChange');
+
+        // using two arguments
+        this.addObserver('foo', (...args) => {
+          this.fooDidChange(...args);
+        });
+      },
+
+      fooDidChange() {
+        // your custom logic code
+      }
+    });
+    ```
+
+    ### Observer Methods
+
+    Observer methods have the following signature:
+
+    ```app/components/my-component.js
+    import Component from '@ember/component';
+
+    export default Component.extend({
+      init() {
+        this._super(...arguments);
+        this.addObserver('foo', this, 'fooDidChange');
+      },
+
+      fooDidChange(sender, key, value, rev) {
+        // your code
+      }
+    });
+    ```
+
+    The `sender` is the object that changed. The `key` is the property that
+    changes. The `value` property is currently reserved and unused. The `rev`
+    is the last property revision of the object when it changed, which you can
+    use to detect if the key value has really changed or not.
+
+    Usually you will not need the value or revision parameters at
+    the end. In this case, it is common to write observer methods that take
+    only a sender and key value as parameters or, if you aren't interested in
+    any of these values, to write an observer that has no parameters at all.
+
+    @method addObserver
+    @param {String} key The key to observe
+    @param {Object} target The target object to invoke
+    @param {String|Function} method The method to invoke
+    @param {Boolean} sync Whether the observer is sync or not
+    @return {Observable}
+    @public
+  */
+  addObserver(
+    key: string,
+    target: object | Function | null,
+    method?: string | Function,
+    sync?: boolean
+  ) {
+    addObserver(this, key, target, method, sync);
+    return this;
+  },
+
+  /**
+    Remove an observer you have previously registered on this object. Pass
+    the same key, target, and method you passed to `addObserver()` and your
+    target will no longer receive notifications.
+
+    @method removeObserver
+    @param {String} key The key to observe
+    @param {Object} target The target object to invoke
+    @param {String|Function} method The method to invoke
+    @param {Boolean} sync Whether the observer is async or not
+    @return {Observable}
+    @public
+  */
+  removeObserver(
+    key: string,
+    target: object | Function | null,
+    method?: string | Function,
+    sync?: boolean
+  ) {
+    removeObserver(this, key, target, method, sync);
+    return this;
+  },
+
+  /**
+    Returns `true` if the object currently has observers registered for a
+    particular key. You can use this method to potentially defer performing
+    an expensive action until someone begins observing a particular property
+    on the object.
+
+    @method hasObserverFor
+    @param {String} key Key to check
+    @return {Boolean}
+    @private
+  */
+  hasObserverFor(key: string) {
+    return hasListeners(this, `${key}:change`);
+  },
+
+  /**
+    Set the value of a property to the current value plus some amount.
+
+    ```javascript
+    person.incrementProperty('age');
+    team.incrementProperty('score', 2);
+    ```
+
+    @method incrementProperty
+    @param {String} keyName The name of the property to increment
+    @param {Number} increment The amount to increment by. Defaults to 1
+    @return {Number} The new property value
+    @public
+  */
+  incrementProperty(keyName: string, increment = 1) {
+    assert(
+      'Must pass a numeric value to incrementProperty',
+      !isNaN(parseFloat(String(increment))) && isFinite(increment)
+    );
+    return set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
+  },
+
+  /**
+    Set the value of a property to the current value minus some amount.
+
+    ```javascript
+    player.decrementProperty('lives');
+    orc.decrementProperty('health', 5);
+    ```
+
+    @method decrementProperty
+    @param {String} keyName The name of the property to decrement
+    @param {Number} decrement The amount to decrement by. Defaults to 1
+    @return {Number} The new property value
+    @public
+  */
+  decrementProperty(keyName: string, decrement = 1) {
+    assert(
+      'Must pass a numeric value to decrementProperty',
+      (typeof decrement === 'number' || !isNaN(parseFloat(decrement))) && isFinite(decrement)
+    );
+    return set(this, keyName, (get(this, keyName) || 0) - decrement);
+  },
+
+  /**
+    Set the value of a boolean property to the opposite of its
+    current value.
+
+    ```javascript
+    starship.toggleProperty('warpDriveEngaged');
+    ```
+
+    @method toggleProperty
+    @param {String} keyName The name of the property to toggle
+    @return {Boolean} The new property value
+    @public
+  */
+  toggleProperty(keyName: string) {
+    return set(this, keyName, !get(this, keyName));
+  },
+
+  /**
+    Returns the cached value of a computed property, if it exists.
+    This allows you to inspect the value of a computed property
+    without accidentally invoking it if it is intended to be
+    generated lazily.
+
+    @method cacheFor
+    @param {String} keyName
+    @return {Object} The cached value of the computed property, if any
+    @public
+  */
+  cacheFor(keyName: string) {
+    let meta = peekMeta(this);
+
+    if (meta !== null) {
+      return meta.valueFor(keyName);
+    }
+  },
+});
+
+export default Observable;
diff --git a/packages/@ember/object/tests/action_test.js b/packages/@ember/object/tests/action_test.js
index 3de82ec35f9..80b26910160 100644
--- a/packages/@ember/object/tests/action_test.js
+++ b/packages/@ember/object/tests/action_test.js
@@ -1,8 +1,8 @@
 import { Component } from '@ember/-internals/glimmer';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { moduleFor, RenderingTestCase, strip } from 'internal-test-helpers';
 
-import { action } from '../index';
+import { action } from '@ember/object';
 
 moduleFor(
   '@action decorator',
diff --git a/packages/@ember/object/tests/computed/computed_macros_test.js b/packages/@ember/object/tests/computed/computed_macros_test.js
index d7a3ba301a2..3d8c04ce0b9 100644
--- a/packages/@ember/object/tests/computed/computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/computed_macros_test.js
@@ -17,7 +17,8 @@ import {
   or,
 } from '@ember/object/computed';
 
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/computed/dependent-key-compat-test.js b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
index 4c18e43ec2c..72bfe5977b0 100644
--- a/packages/@ember/object/tests/computed/dependent-key-compat-test.js
+++ b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
@@ -1,6 +1,6 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { computed, tracked, observer } from '@ember/-internals/metal';
-import { dependentKeyCompat } from '../../compat';
+import { dependentKeyCompat } from '@ember/object/compat';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index 32cde245c2a..4b6bfca2bc1 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -8,13 +8,8 @@ import {
   computed,
   observer,
 } from '@ember/-internals/metal';
-import {
-  Object as EmberObject,
-  ObjectProxy,
-  isArray,
-  A as emberA,
-  removeAt,
-} from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { ObjectProxy, isArray, A as emberA, removeAt } from '@ember/-internals/runtime';
 import {
   sum,
   min,
diff --git a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js b/packages/@ember/object/tests/computed_test.js
similarity index 98%
rename from packages/@ember/-internals/runtime/tests/system/object/computed_test.js
rename to packages/@ember/object/tests/computed_test.js
index e3acf280d7a..203fde34386 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/computed_test.js
+++ b/packages/@ember/object/tests/computed_test.js
@@ -8,8 +8,8 @@ import {
   notifyPropertyChange,
 } from '@ember/-internals/metal';
 import { oneWay as reads } from '@ember/object/computed';
-import { A as EmberArray, isArray } from '../../..';
-import EmberObject from '../../../lib/system/object';
+import { A as emberA, isArray } from '@ember/array';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function K() {
@@ -415,7 +415,7 @@ moduleFor(
       n.set('options', { extra: 'wat', value: 'baz' });
       assert.deepEqual(n.normalized, ['baz']);
 
-      n.set('options', EmberArray([{ value: 'foo' }]));
+      n.set('options', emberA([{ value: 'foo' }]));
       assert.deepEqual(n.normalized, ['foo']);
 
       n.options.pushObject({ value: 'bar' });
diff --git a/packages/@ember/-internals/runtime/tests/system/object/create_test.js b/packages/@ember/object/tests/create_test.js
similarity index 99%
rename from packages/@ember/-internals/runtime/tests/system/object/create_test.js
rename to packages/@ember/object/tests/create_test.js
index 38717ebdc69..f17953075bf 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/create_test.js
+++ b/packages/@ember/object/tests/create_test.js
@@ -3,7 +3,7 @@ import { getOwner, setOwner } from '@ember/-internals/owner';
 import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/destroy_test.js b/packages/@ember/object/tests/destroy_test.js
similarity index 98%
rename from packages/@ember/-internals/runtime/tests/system/object/destroy_test.js
rename to packages/@ember/object/tests/destroy_test.js
index 571a07fba65..429d67fab64 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/destroy_test.js
+++ b/packages/@ember/object/tests/destroy_test.js
@@ -7,7 +7,7 @@ import {
   endPropertyChanges,
 } from '@ember/-internals/metal';
 import { peekMeta } from '@ember/-internals/meta';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/object/detectInstance_test.js b/packages/@ember/object/tests/detectInstance_test.js
similarity index 96%
rename from packages/@ember/-internals/runtime/tests/system/object/detectInstance_test.js
rename to packages/@ember/object/tests/detectInstance_test.js
index 7b8de796fe9..1b194543154 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/detectInstance_test.js
+++ b/packages/@ember/object/tests/detectInstance_test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/detect_test.js b/packages/@ember/object/tests/detect_test.js
similarity index 95%
rename from packages/@ember/-internals/runtime/tests/system/object/detect_test.js
rename to packages/@ember/object/tests/detect_test.js
index f3197847900..4634cca6fbf 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/detect_test.js
+++ b/packages/@ember/object/tests/detect_test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js b/packages/@ember/object/tests/es-compatibility-test.js
similarity index 99%
rename from packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js
rename to packages/@ember/object/tests/es-compatibility-test.js
index 309cc26b1d4..8c01368e4d3 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/es-compatibility-test.js
+++ b/packages/@ember/object/tests/es-compatibility-test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import {
   Mixin,
   defineProperty,
diff --git a/packages/@ember/-internals/runtime/tests/system/object/events_test.js b/packages/@ember/object/tests/events_test.js
similarity index 97%
rename from packages/@ember/-internals/runtime/tests/system/object/events_test.js
rename to packages/@ember/object/tests/events_test.js
index 3f84a46ccbd..e0793522278 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/events_test.js
+++ b/packages/@ember/object/tests/events_test.js
@@ -1,5 +1,5 @@
-import EmberObject from '../../../lib/system/object';
-import Evented from '../../../lib/mixins/evented';
+import EmberObject from '@ember/object';
+import Evented from '@ember/object/evented';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/extend_test.js b/packages/@ember/object/tests/extend_test.js
similarity index 98%
rename from packages/@ember/-internals/runtime/tests/system/object/extend_test.js
rename to packages/@ember/object/tests/extend_test.js
index 11454a238ac..d1b8376850b 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/extend_test.js
+++ b/packages/@ember/object/tests/extend_test.js
@@ -1,5 +1,5 @@
 import { computed, get, observer } from '@ember/-internals/metal';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/framework_test.js b/packages/@ember/object/tests/framework_test.js
similarity index 94%
rename from packages/@ember/-internals/runtime/tests/system/object/framework_test.js
rename to packages/@ember/object/tests/framework_test.js
index bd464012383..6a7d134ca80 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/framework_test.js
+++ b/packages/@ember/object/tests/framework_test.js
@@ -1,5 +1,5 @@
 import { getOwner } from '@ember/-internals/owner';
-import { FrameworkObject } from '../../../index';
+import { FrameworkObject } from '@ember/object';
 import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js b/packages/@ember/object/tests/observable_test.js
similarity index 99%
rename from packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
rename to packages/@ember/object/tests/observable_test.js
index 6c74bd02a90..0169f70c70f 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/observable_test.js
+++ b/packages/@ember/object/tests/observable_test.js
@@ -2,9 +2,9 @@ import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import { get, computed, observer } from '@ember/-internals/metal';
 import { w } from '@ember/string';
-import EmberObject from '../../../../lib/system/object';
-import Observable from '../../../../lib/mixins/observable';
-import { A as emberA } from '../../../../lib/mixins/array';
+import EmberObject from '@ember/object';
+import Observable from '@ember/object/observable';
+import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/system/object/observer_test.js b/packages/@ember/object/tests/observer_test.js
similarity index 99%
rename from packages/@ember/-internals/runtime/tests/system/object/observer_test.js
rename to packages/@ember/object/tests/observer_test.js
index 7ae12caea89..bb5f43b0e27 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/observer_test.js
+++ b/packages/@ember/object/tests/observer_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { alias, observer, get, set } from '@ember/-internals/metal';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/reopenClass_test.js b/packages/@ember/object/tests/reopenClass_test.js
similarity index 94%
rename from packages/@ember/-internals/runtime/tests/system/object/reopenClass_test.js
rename to packages/@ember/object/tests/reopenClass_test.js
index 6b224a55281..ba4db4bd6cd 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/reopenClass_test.js
+++ b/packages/@ember/object/tests/reopenClass_test.js
@@ -1,5 +1,5 @@
 import { get } from '@ember/-internals/metal';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/strict-mode-test.js b/packages/@ember/object/tests/strict-mode-test.js
similarity index 92%
rename from packages/@ember/-internals/runtime/tests/system/object/strict-mode-test.js
rename to packages/@ember/object/tests/strict-mode-test.js
index 6faa326b3e8..a203d4aa3f5 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/strict-mode-test.js
+++ b/packages/@ember/object/tests/strict-mode-test.js
@@ -1,4 +1,4 @@
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js b/packages/@ember/object/tests/toString_test.js
similarity index 94%
rename from packages/@ember/-internals/runtime/tests/system/object/toString_test.js
rename to packages/@ember/object/tests/toString_test.js
index 65d6ac5deba..f661eb4b929 100644
--- a/packages/@ember/-internals/runtime/tests/system/object/toString_test.js
+++ b/packages/@ember/object/tests/toString_test.js
@@ -1,5 +1,5 @@
 import { guidFor, setName } from '@ember/-internals/utils';
-import EmberObject from '../../../lib/system/object';
+import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/service/index.ts b/packages/@ember/service/index.ts
index 8337855f18e..c28867813df 100644
--- a/packages/@ember/service/index.ts
+++ b/packages/@ember/service/index.ts
@@ -1,4 +1,4 @@
-import { FrameworkObject } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/object';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 import { inject as metalInject } from '@ember/-internals/metal';
 
diff --git a/packages/@ember/service/tests/service_test.js b/packages/@ember/service/tests/service_test.js
index 37726a3ace3..0bc2aac7ee4 100644
--- a/packages/@ember/service/tests/service_test.js
+++ b/packages/@ember/service/tests/service_test.js
@@ -1,5 +1,5 @@
 import Service, { inject, service } from '@ember/service';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { buildOwner, runDestroy } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/service/tests/service_ts_test.ts b/packages/@ember/service/tests/service_ts_test.ts
index e0088ba9555..fa36782b953 100644
--- a/packages/@ember/service/tests/service_ts_test.ts
+++ b/packages/@ember/service/tests/service_ts_test.ts
@@ -1,5 +1,5 @@
 import Service, { inject, service } from '@ember/service';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import { buildOwner, runDestroy } from 'internal-test-helpers';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
index 0f4bab1fae3..7a42f0d9f05 100644
--- a/packages/@ember/service/type-tests/index.test.ts
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -1,5 +1,5 @@
 import type { Owner } from '@ember/-internals/owner';
-import type { FrameworkObject } from '@ember/-internals/runtime';
+import type { FrameworkObject } from '@ember/object';
 import EmberObject from '@ember/object';
 import Service, { inject, service } from '@ember/service';
 import { expectTypeOf } from 'expect-type';
diff --git a/packages/ember-testing/lib/adapters/adapter.ts b/packages/ember-testing/lib/adapters/adapter.ts
index cba6d525a6e..26876da9d42 100644
--- a/packages/ember-testing/lib/adapters/adapter.ts
+++ b/packages/ember-testing/lib/adapters/adapter.ts
@@ -1,4 +1,4 @@
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 
 /**
  @module @ember/test
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 3439c6c2418..aae2c614d6f 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -25,11 +25,10 @@ import {
 } from '@ember/string';
 import Service, { service } from '@ember/service';
 
-import { action, computed } from '@ember/object';
+import EmberObject, { action, computed } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 
 import {
-  Object as EmberObject,
   RegistryProxyMixin,
   ContainerProxyMixin,
   compare,
@@ -39,7 +38,6 @@ import {
   MutableArray,
   Evented,
   PromiseProxyMixin,
-  Observable,
   typeOf,
   isArray,
   _ProxyMixin,
@@ -83,6 +81,7 @@ import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import Enumerable from '@ember/enumerable';
 import CoreObject from '@ember/object/core';
+import Observable from '@ember/object/observable';
 import { assign } from '@ember/polyfills';
 
 import {
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index 974d1918fd5..12da2cfe089 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -1,6 +1,7 @@
 import { Route } from '@ember/-internals/routing';
 import { computed } from '@ember/-internals/metal';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 2383ffef257..dbf120cebf1 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -4,7 +4,7 @@ import RSVP from 'rsvp';
 import { compile } from 'ember-template-compiler';
 import { Route, NoneLocation, HistoryLocation } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
-import { Object as EmberObject } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
 import {
   moduleFor,
   ApplicationTestCase,
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 557f27924aa..a14533c89e7 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-console */
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { computed, set } from '@ember/-internals/metal';
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 66f07ea319b..578ab33774a 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1,6 +1,7 @@
 import Controller from '@ember/controller';
 import { dasherize } from '@ember/string';
-import { RSVP, Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { RSVP, A as emberA } from '@ember/-internals/runtime';
 import { run } from '@ember/runloop';
 import { peekMeta } from '@ember/-internals/meta';
 import { get, computed, tracked } from '@ember/-internals/metal';
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 47c51e049b0..29f63d2e179 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -1,7 +1,8 @@
 /* eslint-disable no-console */
 import { Route } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
-import { Object as EmberObject, A as emberA } from '@ember/-internals/runtime';
+import EmberObject from '@ember/object';
+import { A as emberA } from '@ember/-internals/runtime';
 import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';

From 015ebf20aea2fc057d55c4889112186c150a5223 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 10:48:20 -0700
Subject: [PATCH 1055/1405] Consolidate @ember/object/evented

---
 .../-internals/routing/lib/services/router.ts |   2 +-
 .../-internals/routing/lib/system/route.ts    |   3 +-
 .../-internals/routing/lib/system/router.ts   |   3 +-
 packages/@ember/-internals/runtime/index.ts   |   1 -
 .../-internals/runtime/lib/mixins/evented.ts  | 193 -----------------
 .../-internals/views/lib/views/core_view.ts   |   3 +-
 packages/@ember/object/evented.ts             | 195 +++++++++++++++++-
 .../mixins => object/tests}/evented_test.js   |   2 +-
 packages/ember/index.js                       |   2 +-
 9 files changed, 203 insertions(+), 201 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/evented.ts
 rename packages/@ember/{-internals/runtime/tests/mixins => object/tests}/evented_test.js (91%)

diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 93701df9781..af3fe297e25 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -1,5 +1,5 @@
 import { getOwner } from '@ember/-internals/owner';
-import { Evented } from '@ember/-internals/runtime';
+import Evented from '@ember/object/evented';
 import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
index 7294357acd8..37b51a4e620 100644
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ b/packages/@ember/-internals/routing/lib/system/route.ts
@@ -15,7 +15,8 @@ import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import EmberObject from '@ember/object';
-import { A as emberA, ActionHandler, Evented, typeOf } from '@ember/-internals/runtime';
+import Evented from '@ember/object/evented';
+import { A as emberA, ActionHandler, typeOf } from '@ember/-internals/runtime';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index d60570fd4c8..40889c43ced 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -6,7 +6,8 @@ import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import type RouterService from '@ember/-internals/routing/lib/services/router';
 import EmberObject from '@ember/object';
-import { A as emberA, Evented, typeOf } from '@ember/-internals/runtime';
+import { A as emberA, typeOf } from '@ember/-internals/runtime';
+import Evented from '@ember/object/evented';
 import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index c25b2854acc..cc5abeb4c9c 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -18,7 +18,6 @@ export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as MutableEnumerable } from './lib/mixins/mutable_enumerable';
 export { default as TargetActionSupport } from './lib/mixins/target_action_support';
-export { default as Evented } from './lib/mixins/evented';
 export { default as PromiseProxyMixin } from './lib/mixins/promise_proxy';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
diff --git a/packages/@ember/-internals/runtime/lib/mixins/evented.ts b/packages/@ember/-internals/runtime/lib/mixins/evented.ts
deleted file mode 100644
index 40657b3f279..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/evented.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-import {
-  Mixin,
-  addListener,
-  removeListener,
-  hasListeners,
-  sendEvent,
-} from '@ember/-internals/metal';
-
-/**
-@module @ember/object
-*/
-
-/**
-  This mixin allows for Ember objects to subscribe to and emit events.
-
-  ```app/utils/person.js
-  import EmberObject from '@ember/object';
-  import Evented from '@ember/object/evented';
-
-  export default EmberObject.extend(Evented, {
-    greet() {
-      // ...
-      this.trigger('greet');
-    }
-  });
-  ```
-
-  ```javascript
-  var person = Person.create();
-
-  person.on('greet', function() {
-    console.log('Our person has greeted');
-  });
-
-  person.greet();
-
-  // outputs: 'Our person has greeted'
-  ```
-
-  You can also chain multiple event subscriptions:
-
-  ```javascript
-  person.on('greet', function() {
-    console.log('Our person has greeted');
-  }).one('greet', function() {
-    console.log('Offer one-time special');
-  }).off('event', this, forgetThis);
-  ```
-
-  @class Evented
-  @public
- */
-interface Evented {
-  /**
-   * Subscribes to a named event with given function.
-   */
-  on<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  on(name: string, method: ((...args: any[]) => void) | string): this;
-  /**
-   * Subscribes a function to a named event and then cancels the subscription
-   * after the first time the event is triggered. It is good to use ``one`` when
-   * you only care about the first time an event has taken place.
-   */
-  one<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  one(name: string, method: string | ((...args: any[]) => void)): this;
-  /**
-   * Triggers a named event for the object. Any additional arguments
-   * will be passed as parameters to the functions that are subscribed to the
-   * event.
-   */
-  trigger(name: string, ...args: any[]): any;
-  /**
-   * Cancels subscription for given name, target, and method.
-   */
-  off<Target>(
-    name: string,
-    target: Target,
-    method: string | ((this: Target, ...args: any[]) => void)
-  ): this;
-  off(name: string, method: string | ((...args: any[]) => void)): this;
-  /**
-   * Checks to see if object has any subscriptions for named event.
-   */
-  has(name: string): boolean;
-}
-const Evented = Mixin.create({
-  /**
-    Subscribes to a named event with given function.
-
-    ```javascript
-    person.on('didLoad', function() {
-      // fired once the person has loaded
-    });
-    ```
-
-    An optional target can be passed in as the 2nd argument that will
-    be set as the "this" for the callback. This is a good way to give your
-    function access to the object triggering the event. When the target
-    parameter is used the callback method becomes the third argument.
-
-    @method on
-    @param {String} name The name of the event
-    @param {Object} [target] The "this" binding for the callback
-    @param {Function|String} method A function or the name of a function to be called on `target`
-    @return this
-    @public
-  */
-  on(name: string, target: object, method?: string | Function) {
-    addListener(this, name, target, method);
-    return this;
-  },
-
-  /**
-    Subscribes a function to a named event and then cancels the subscription
-    after the first time the event is triggered. It is good to use ``one`` when
-    you only care about the first time an event has taken place.
-
-    This function takes an optional 2nd argument that will become the "this"
-    value for the callback. When the target parameter is used the callback method
-    becomes the third argument.
-
-    @method one
-    @param {String} name The name of the event
-    @param {Object} [target] The "this" binding for the callback
-    @param {Function|String} method A function or the name of a function to be called on `target`
-    @return this
-    @public
-  */
-  one(name: string, target: object, method?: string | Function) {
-    addListener(this, name, target, method, true);
-    return this;
-  },
-
-  /**
-    Triggers a named event for the object. Any additional arguments
-    will be passed as parameters to the functions that are subscribed to the
-    event.
-
-    ```javascript
-    person.on('didEat', function(food) {
-      console.log('person ate some ' + food);
-    });
-
-    person.trigger('didEat', 'broccoli');
-
-    // outputs: person ate some broccoli
-    ```
-    @method trigger
-    @param {String} name The name of the event
-    @param {Object...} args Optional arguments to pass on
-    @public
-  */
-  trigger(name: string, ...args: any[]) {
-    sendEvent(this, name, args);
-  },
-
-  /**
-    Cancels subscription for given name, target, and method.
-
-    @method off
-    @param {String} name The name of the event
-    @param {Object} target The target of the subscription
-    @param {Function|String} method The function or the name of a function of the subscription
-    @return this
-    @public
-  */
-  off(name: string, target: object, method?: string | Function) {
-    removeListener(this, name, target, method);
-    return this;
-  },
-
-  /**
-    Checks to see if object has any subscriptions for named event.
-
-    @method has
-    @param {String} name The name of the event
-    @return {Boolean} does the object have a subscription for event
-    @public
-   */
-  has(name: string) {
-    return hasListeners(this, name);
-  },
-});
-
-export default Evented;
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index 5142ed756d9..c0e9edbadff 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -1,6 +1,7 @@
 import type { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
-import { ActionHandler, Evented } from '@ember/-internals/runtime';
+import { ActionHandler } from '@ember/-internals/runtime';
+import Evented from '@ember/object/evented';
 import { FrameworkObject } from '@ember/object';
 import type { ViewState } from './states';
 import states from './states';
diff --git a/packages/@ember/object/evented.ts b/packages/@ember/object/evented.ts
index 6078d7b5766..9e16da98c9c 100644
--- a/packages/@ember/object/evented.ts
+++ b/packages/@ember/object/evented.ts
@@ -1,2 +1,195 @@
-export { Evented as default } from '@ember/-internals/runtime';
+import {
+  Mixin,
+  addListener,
+  removeListener,
+  hasListeners,
+  sendEvent,
+} from '@ember/-internals/metal';
+
 export { on } from '@ember/-internals/metal';
+
+/**
+@module @ember/object
+*/
+
+/**
+  This mixin allows for Ember objects to subscribe to and emit events.
+
+  ```app/utils/person.js
+  import EmberObject from '@ember/object';
+  import Evented from '@ember/object/evented';
+
+  export default EmberObject.extend(Evented, {
+    greet() {
+      // ...
+      this.trigger('greet');
+    }
+  });
+  ```
+
+  ```javascript
+  var person = Person.create();
+
+  person.on('greet', function() {
+    console.log('Our person has greeted');
+  });
+
+  person.greet();
+
+  // outputs: 'Our person has greeted'
+  ```
+
+  You can also chain multiple event subscriptions:
+
+  ```javascript
+  person.on('greet', function() {
+    console.log('Our person has greeted');
+  }).one('greet', function() {
+    console.log('Offer one-time special');
+  }).off('event', this, forgetThis);
+  ```
+
+  @class Evented
+  @public
+ */
+interface Evented {
+  /**
+   * Subscribes to a named event with given function.
+   */
+  on<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  on(name: string, method: ((...args: any[]) => void) | string): this;
+  /**
+   * Subscribes a function to a named event and then cancels the subscription
+   * after the first time the event is triggered. It is good to use ``one`` when
+   * you only care about the first time an event has taken place.
+   */
+  one<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  one(name: string, method: string | ((...args: any[]) => void)): this;
+  /**
+   * Triggers a named event for the object. Any additional arguments
+   * will be passed as parameters to the functions that are subscribed to the
+   * event.
+   */
+  trigger(name: string, ...args: any[]): any;
+  /**
+   * Cancels subscription for given name, target, and method.
+   */
+  off<Target>(
+    name: string,
+    target: Target,
+    method: string | ((this: Target, ...args: any[]) => void)
+  ): this;
+  off(name: string, method: string | ((...args: any[]) => void)): this;
+  /**
+   * Checks to see if object has any subscriptions for named event.
+   */
+  has(name: string): boolean;
+}
+const Evented = Mixin.create({
+  /**
+    Subscribes to a named event with given function.
+
+    ```javascript
+    person.on('didLoad', function() {
+      // fired once the person has loaded
+    });
+    ```
+
+    An optional target can be passed in as the 2nd argument that will
+    be set as the "this" for the callback. This is a good way to give your
+    function access to the object triggering the event. When the target
+    parameter is used the callback method becomes the third argument.
+
+    @method on
+    @param {String} name The name of the event
+    @param {Object} [target] The "this" binding for the callback
+    @param {Function|String} method A function or the name of a function to be called on `target`
+    @return this
+    @public
+  */
+  on(name: string, target: object, method?: string | Function) {
+    addListener(this, name, target, method);
+    return this;
+  },
+
+  /**
+    Subscribes a function to a named event and then cancels the subscription
+    after the first time the event is triggered. It is good to use ``one`` when
+    you only care about the first time an event has taken place.
+
+    This function takes an optional 2nd argument that will become the "this"
+    value for the callback. When the target parameter is used the callback method
+    becomes the third argument.
+
+    @method one
+    @param {String} name The name of the event
+    @param {Object} [target] The "this" binding for the callback
+    @param {Function|String} method A function or the name of a function to be called on `target`
+    @return this
+    @public
+  */
+  one(name: string, target: object, method?: string | Function) {
+    addListener(this, name, target, method, true);
+    return this;
+  },
+
+  /**
+    Triggers a named event for the object. Any additional arguments
+    will be passed as parameters to the functions that are subscribed to the
+    event.
+
+    ```javascript
+    person.on('didEat', function(food) {
+      console.log('person ate some ' + food);
+    });
+
+    person.trigger('didEat', 'broccoli');
+
+    // outputs: person ate some broccoli
+    ```
+    @method trigger
+    @param {String} name The name of the event
+    @param {Object...} args Optional arguments to pass on
+    @public
+  */
+  trigger(name: string, ...args: any[]) {
+    sendEvent(this, name, args);
+  },
+
+  /**
+    Cancels subscription for given name, target, and method.
+
+    @method off
+    @param {String} name The name of the event
+    @param {Object} target The target of the subscription
+    @param {Function|String} method The function or the name of a function of the subscription
+    @return this
+    @public
+  */
+  off(name: string, target: object, method?: string | Function) {
+    removeListener(this, name, target, method);
+    return this;
+  },
+
+  /**
+    Checks to see if object has any subscriptions for named event.
+
+    @method has
+    @param {String} name The name of the event
+    @return {Boolean} does the object have a subscription for event
+    @public
+   */
+  has(name: string) {
+    return hasListeners(this, name);
+  },
+});
+
+export default Evented;
diff --git a/packages/@ember/-internals/runtime/tests/mixins/evented_test.js b/packages/@ember/object/tests/evented_test.js
similarity index 91%
rename from packages/@ember/-internals/runtime/tests/mixins/evented_test.js
rename to packages/@ember/object/tests/evented_test.js
index 8b2cfcd1ade..cf4fc2c4d9f 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/evented_test.js
+++ b/packages/@ember/object/tests/evented_test.js
@@ -1,5 +1,5 @@
-import EventedMixin from '../../lib/mixins/evented';
 import CoreObject from '@ember/object/core';
+import EventedMixin from '@ember/object/evented';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/ember/index.js b/packages/ember/index.js
index aae2c614d6f..e880fdd560d 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -36,7 +36,6 @@ import {
   Array as EmberArray,
   MutableEnumerable,
   MutableArray,
-  Evented,
   PromiseProxyMixin,
   typeOf,
   isArray,
@@ -81,6 +80,7 @@ import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import Enumerable from '@ember/enumerable';
 import CoreObject from '@ember/object/core';
+import Evented from '@ember/object/evented';
 import Observable from '@ember/object/observable';
 import { assign } from '@ember/polyfills';
 

From 1c1786d268334139b456e2cc011e8f06c8055592 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 11:11:10 -0700
Subject: [PATCH 1056/1405] Consolidate @ember/object/mixin

---
 .../components/curly-components-test.js       |   4 +-
 .../components/target-action-test.js          |   3 +-
 packages/@ember/-internals/metal/index.ts     |  19 +-
 packages/@ember/-internals/metal/lib/mixin.ts | 845 ------------------
 .../metal/tests/accessors/get_test.js         |   5 +-
 .../-internals/metal/tests/events_test.js     |   3 +-
 .../metal/tests/mixin/apply_test.js           |   3 +-
 .../metal/tests/namespace_search_test.js      |   2 +-
 .../metal/tests/native_desc_decorator_test.js |   3 +-
 .../-internals/metal/tests/observer_test.js   |   5 +-
 .../-internals/runtime/lib/mixins/-proxy.ts   |   2 +-
 .../runtime/lib/mixins/action_handler.ts      |   7 +-
 .../-internals/runtime/lib/mixins/array.ts    |   4 +-
 .../runtime/lib/mixins/comparable.ts          |   2 +-
 .../runtime/lib/mixins/container_proxy.ts     |   2 +-
 .../runtime/lib/mixins/mutable_enumerable.ts  |   2 +-
 .../runtime/lib/mixins/promise_proxy.ts       |   3 +-
 .../runtime/lib/mixins/registry_proxy.ts      |   2 +-
 .../lib/mixins/target_action_support.ts       |   3 +-
 .../runtime/tests/mixins/array_test.js        |   3 +-
 .../tests/system/array_proxy/length_test.js   |   3 +-
 .../runtime/tests/system/core_object_test.js  |   3 +-
 .../runtime/tests/system/object_proxy_test.js |   3 +-
 .../views/lib/mixins/action_support.ts        |   3 +-
 .../views/lib/mixins/child_views_support.ts   |   3 +-
 .../views/lib/mixins/class_names_support.ts   |   3 +-
 .../views/lib/mixins/view_state_support.ts    |   2 +-
 .../views/lib/mixins/view_support.ts          |   3 +-
 packages/@ember/controller/index.ts           |   3 +-
 .../controller/tests/controller_test.js       |   3 +-
 packages/@ember/enumerable/index.ts           |   2 +-
 packages/@ember/object/core.ts                |   3 +-
 packages/@ember/object/evented.ts             |   9 +-
 packages/@ember/object/index.ts               |  94 +-
 packages/@ember/object/mixin.ts               | 758 +++++++++++++++-
 packages/@ember/object/observable.ts          |   2 +-
 .../computed/dependent-key-compat-test.js     |   4 +-
 .../computed/reduce_computed_macros_test.js   |   7 +-
 packages/@ember/object/tests/computed_test.js |   3 +-
 packages/@ember/object/tests/create_test.js   |   5 +-
 packages/@ember/object/tests/destroy_test.js  |  10 +-
 .../object/tests/es-compatibility-test.js     |   5 +-
 packages/@ember/object/tests/extend_test.js   |   4 +-
 .../tests/mixin/accessor_test.js              |   2 +-
 .../@ember/object/tests/mixin/apply_test.js   |  41 +
 .../tests/mixin/computed_test.js              |   3 +-
 .../mixin/concatenated_properties_test.js     |   3 +-
 .../tests/mixin/detect_test.js                |   2 +-
 .../tests/mixin/introspection_test.js         |   2 +-
 .../tests/mixin/merged_properties_test.js     |   4 +-
 .../tests/mixin/method_test.js                |   2 +-
 .../tests/mixin/observer_test.js              |   3 +-
 .../tests/mixin/reopen_test.js                |   4 +-
 .../tests/mixin/without_test.js               |   2 +-
 .../@ember/object/tests/observable_test.js    |   4 +-
 packages/@ember/object/tests/observer_test.js |   4 +-
 packages/ember/index.js                       |   9 +-
 .../tests/routing/decoupled_basic_test.js     |   3 +-
 .../overlapping_query_params_test.js          |   2 +-
 59 files changed, 1003 insertions(+), 944 deletions(-)
 delete mode 100644 packages/@ember/-internals/metal/lib/mixin.ts
 rename packages/@ember/{-internals/metal => object}/tests/mixin/accessor_test.js (95%)
 create mode 100644 packages/@ember/object/tests/mixin/apply_test.js
 rename packages/@ember/{-internals/metal => object}/tests/mixin/computed_test.js (97%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/concatenated_properties_test.js (97%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/detect_test.js (96%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/introspection_test.js (96%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/merged_properties_test.js (97%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/method_test.js (99%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/observer_test.js (98%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/reopen_test.js (94%)
 rename packages/@ember/{-internals/metal => object}/tests/mixin/without_test.js (92%)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index c37716bf2b9..12f4f30820b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -11,9 +11,9 @@ import {
 
 import { run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { alias, set, get, observer, on, computed, tracked } from '@ember/-internals/metal';
+import { alias, set, get, on, computed, tracked } from '@ember/-internals/metal';
 import Service, { service } from '@ember/service';
-import EmberObject from '@ember/object';
+import EmberObject, { observer } from '@ember/object';
 import { A as emberA } from '@ember/-internals/runtime';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index f7e6748d5bb..26f7e978683 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -1,6 +1,7 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { set, Mixin } from '@ember/-internals/metal';
+import { set } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 8a434b254d8..5601f7cd4c3 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -1,4 +1,14 @@
-export { default as computed, autoComputed, isComputed, ComputedProperty } from './lib/computed';
+export {
+  default as computed,
+  autoComputed,
+  isComputed,
+  ComputedProperty,
+  ComputedDecorator,
+  ComputedPropertyGetter,
+  ComputedPropertyObj,
+  ComputedPropertySetter,
+  ComputedPropertyCallback,
+} from './lib/computed';
 export { getCachedValueFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
@@ -33,10 +43,11 @@ export {
   notifyPropertyChange,
   PROPERTY_DID_CHANGE,
 } from './lib/property_events';
-export { defineProperty } from './lib/properties';
+export { defineProperty, defineDecorator, defineValue } from './lib/properties';
 export {
   ExtendedMethodDecorator,
   DecoratorPropertyDescriptor,
+  ComputedDescriptor,
   ElementDescriptor,
   isElementDescriptor,
   nativeDescDecorator,
@@ -44,6 +55,7 @@ export {
   descriptorForProperty,
   isClassicDecorator,
   setClassicDecorator,
+  makeComputedDecorator,
 } from './lib/decorator';
 export { default as libraries, Libraries } from './lib/libraries';
 export { default as getProperties } from './lib/get_properties';
@@ -57,8 +69,8 @@ export {
   activateObserver,
   removeObserver,
   flushAsyncObservers,
+  revalidateObservers,
 } from './lib/observer';
-export { Mixin, mixin, observer, applyMixin } from './lib/mixin';
 export { default as inject, DEBUG_INJECTION_FUNCTIONS } from './lib/injected_property';
 export { tagForProperty, tagForObject, markObjectAsDirty } from './lib/tags';
 export { tracked, TrackedDescriptor } from './lib/tracked';
@@ -76,4 +88,5 @@ export {
   removeNamespace,
   isSearchDisabled as isNamespaceSearchDisabled,
   setSearchDisabled as setNamespaceSearchDisabled,
+  setUnprocessedMixins,
 } from './lib/namespace_search';
diff --git a/packages/@ember/-internals/metal/lib/mixin.ts b/packages/@ember/-internals/metal/lib/mixin.ts
deleted file mode 100644
index 493ffd7d4d0..00000000000
--- a/packages/@ember/-internals/metal/lib/mixin.ts
+++ /dev/null
@@ -1,845 +0,0 @@
-/**
-@module @ember/object
-*/
-import { INIT_FACTORY } from '@ember/-internals/container';
-import { ENV } from '@ember/-internals/environment';
-import type { Meta } from '@ember/-internals/meta';
-import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
-import {
-  guidFor,
-  makeArray,
-  observerListenerMetaFor,
-  ROOT,
-  setObservers,
-  wrap,
-} from '@ember/-internals/utils';
-import type { AnyFn } from '@ember/-internals/utils/types';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import { _WeakSet } from '@glimmer/util';
-import type {
-  ComputedDecorator,
-  ComputedPropertyGetter,
-  ComputedPropertyObj,
-  ComputedPropertySetter,
-} from './computed';
-import { ComputedProperty } from './computed';
-import type { ComputedDescriptor } from './decorator';
-import { descriptorForDecorator, makeComputedDecorator, nativeDescDecorator } from './decorator';
-import { addListener, removeListener } from './events';
-import expandProperties from './expand_properties';
-import { setUnprocessedMixins } from './namespace_search';
-import { addObserver, removeObserver, revalidateObservers } from './observer';
-import { defineDecorator, defineValue } from './properties';
-
-const a_concat = Array.prototype.concat;
-const { isArray } = Array;
-
-function extractAccessors(properties: { [key: string]: any } | undefined) {
-  if (properties !== undefined) {
-    for (let key of Object.keys(properties)) {
-      let desc = Object.getOwnPropertyDescriptor(properties, key)!;
-
-      if (desc.get !== undefined || desc.set !== undefined) {
-        Object.defineProperty(properties, key, { value: nativeDescDecorator(desc) });
-      }
-    }
-  }
-
-  return properties;
-}
-
-function concatenatedMixinProperties(
-  concatProp: string,
-  props: { [key: string]: any },
-  values: { [key: string]: any },
-  base: { [key: string]: any }
-) {
-  // reset before adding each new mixin to pickup concats from previous
-  let concats = values[concatProp] || base[concatProp];
-  if (props[concatProp]) {
-    concats = concats ? a_concat.call(concats, props[concatProp]) : props[concatProp];
-  }
-  return concats;
-}
-
-function giveDecoratorSuper(
-  key: string,
-  decorator: ComputedDecorator,
-  property: ComputedProperty | true,
-  descs: { [key: string]: any }
-): ComputedDecorator {
-  if (property === true) {
-    return decorator;
-  }
-
-  let originalGetter = property._getter;
-
-  if (originalGetter === undefined) {
-    return decorator;
-  }
-
-  let superDesc = descs[key];
-
-  // Check to see if the super property is a decorator first, if so load its descriptor
-  let superProperty: ComputedProperty | true | undefined =
-    typeof superDesc === 'function' ? descriptorForDecorator(superDesc) : superDesc;
-
-  if (superProperty === undefined || superProperty === true) {
-    return decorator;
-  }
-
-  let superGetter = superProperty._getter;
-
-  if (superGetter === undefined) {
-    return decorator;
-  }
-
-  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter;
-  let set;
-  let originalSetter = property._setter;
-  let superSetter = superProperty._setter;
-
-  if (superSetter !== undefined) {
-    if (originalSetter !== undefined) {
-      set = wrap(originalSetter, superSetter) as ComputedPropertySetter;
-    } else {
-      // If the super property has a setter, we default to using it no matter what.
-      // This is clearly very broken and weird, but it's what was here so we have
-      // to keep it until the next major at least.
-      //
-      // TODO: Add a deprecation here.
-      set = superSetter;
-    }
-  } else {
-    set = originalSetter;
-  }
-
-  // only create a new CP if we must
-  if (get !== originalGetter || set !== originalSetter) {
-    // Since multiple mixins may inherit from the same parent, we need
-    // to clone the computed property so that other mixins do not receive
-    // the wrapped version.
-    let dependentKeys = property._dependentKeys || [];
-    let newProperty = new ComputedProperty([
-      ...dependentKeys,
-      {
-        get,
-        set,
-      } as ComputedPropertyObj,
-    ]);
-
-    newProperty._readOnly = property._readOnly;
-    newProperty._meta = property._meta;
-    newProperty.enumerable = property.enumerable;
-
-    // SAFETY: We passed in the impl for this class
-    return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator;
-  }
-
-  return decorator;
-}
-
-function giveMethodSuper(
-  key: string,
-  method: Function,
-  values: { [key: string]: any },
-  descs: { [key: string]: any }
-) {
-  // Methods overwrite computed properties, and do not call super to them.
-  if (descs[key] !== undefined) {
-    return method;
-  }
-
-  // Find the original method in a parent mixin
-  let superMethod = values[key];
-
-  // Only wrap the new method if the original method was a function
-  if (typeof superMethod === 'function') {
-    return wrap(method, superMethod);
-  }
-
-  return method;
-}
-
-function applyConcatenatedProperties(key: string, value: any, values: { [key: string]: any }) {
-  let baseValue = values[key];
-  let ret = makeArray(baseValue).concat(makeArray(value));
-
-  if (DEBUG) {
-    // it is possible to use concatenatedProperties with strings (which cannot be frozen)
-    // only freeze objects...
-    if (typeof ret === 'object' && ret !== null) {
-      // prevent mutating `concatenatedProperties` array after it is applied
-      Object.freeze(ret);
-    }
-  }
-
-  return ret;
-}
-
-function applyMergedProperties(
-  key: string,
-  value: { [key: string]: any },
-  values: { [key: string]: any }
-): { [key: string]: any } {
-  let baseValue = values[key];
-
-  assert(
-    `You passed in \`${JSON.stringify(
-      value
-    )}\` as the value for \`${key}\` but \`${key}\` cannot be an Array`,
-    !isArray(value)
-  );
-
-  if (!baseValue) {
-    return value;
-  }
-
-  let newBase = Object.assign({}, baseValue);
-  let hasFunction = false;
-
-  let props = Object.keys(value);
-
-  for (let prop of props) {
-    let propValue = value[prop];
-
-    if (typeof propValue === 'function') {
-      hasFunction = true;
-      newBase[prop] = giveMethodSuper(prop, propValue, baseValue, {});
-    } else {
-      newBase[prop] = propValue;
-    }
-  }
-
-  if (hasFunction) {
-    newBase._super = ROOT;
-  }
-
-  return newBase;
-}
-
-function mergeMixins(
-  mixins: MixinLike[],
-  meta: Meta,
-  descs: { [key: string]: object },
-  values: { [key: string]: object },
-  base: { [key: string]: object },
-  keys: string[],
-  keysWithSuper: string[]
-): void {
-  let currentMixin;
-
-  for (let i = 0; i < mixins.length; i++) {
-    currentMixin = mixins[i];
-    assert(
-      `Expected hash or Mixin instance, got ${Object.prototype.toString.call(currentMixin)}`,
-      typeof currentMixin === 'object' &&
-        currentMixin !== null &&
-        Object.prototype.toString.call(currentMixin) !== '[object Array]'
-    );
-
-    if (MIXINS.has(currentMixin)) {
-      if (meta.hasMixin(currentMixin)) {
-        continue;
-      }
-      meta.addMixin(currentMixin);
-
-      let { properties, mixins } = currentMixin;
-
-      if (properties !== undefined) {
-        mergeProps(meta, properties, descs, values, base, keys, keysWithSuper);
-      } else if (mixins !== undefined) {
-        mergeMixins(mixins, meta, descs, values, base, keys, keysWithSuper);
-
-        if (currentMixin instanceof Mixin && currentMixin._without !== undefined) {
-          currentMixin._without.forEach((keyName: string) => {
-            // deleting the key means we won't process the value
-            let index = keys.indexOf(keyName);
-
-            if (index !== -1) {
-              keys.splice(index, 1);
-            }
-          });
-        }
-      }
-    } else {
-      mergeProps(
-        meta,
-        currentMixin as Record<string, unknown>,
-        descs,
-        values,
-        base,
-        keys,
-        keysWithSuper
-      );
-    }
-  }
-}
-
-function mergeProps(
-  meta: Meta,
-  props: { [key: string]: unknown },
-  descs: { [key: string]: unknown },
-  values: { [key: string]: unknown },
-  base: { [key: string]: unknown },
-  keys: string[],
-  keysWithSuper: string[]
-) {
-  let concats = concatenatedMixinProperties('concatenatedProperties', props, values, base);
-  let mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
-
-  let propKeys = Object.keys(props);
-
-  for (let key of propKeys) {
-    let value = props[key];
-
-    if (value === undefined) continue;
-
-    if (keys.indexOf(key) === -1) {
-      keys.push(key);
-
-      let desc = meta.peekDescriptors(key);
-
-      if (desc === undefined) {
-        // The superclass did not have a CP, which means it may have
-        // observers or listeners on that property.
-        let prev = (values[key] = base[key]);
-
-        if (typeof prev === 'function') {
-          updateObserversAndListeners(base, key, prev, false);
-        }
-      } else {
-        descs[key] = desc;
-
-        // The super desc will be overwritten on descs, so save off the fact that
-        // there was a super so we know to Object.defineProperty when writing
-        // the value
-        keysWithSuper.push(key);
-
-        desc.teardown(base, key, meta);
-      }
-    }
-
-    let isFunction = typeof value === 'function';
-
-    if (isFunction) {
-      let desc: ComputedDescriptor | undefined | true = descriptorForDecorator(value as Function);
-
-      if (desc !== undefined) {
-        // Wrap descriptor function to implement _super() if needed
-        descs[key] = giveDecoratorSuper(
-          key,
-          value as ComputedDecorator,
-          desc as ComputedProperty,
-          descs
-        );
-        values[key] = undefined;
-
-        continue;
-      }
-    }
-
-    if (
-      (concats && concats.indexOf(key) >= 0) ||
-      key === 'concatenatedProperties' ||
-      key === 'mergedProperties'
-    ) {
-      value = applyConcatenatedProperties(key, value, values);
-    } else if (mergings && mergings.indexOf(key) > -1) {
-      value = applyMergedProperties(key, value as object, values);
-    } else if (isFunction) {
-      value = giveMethodSuper(key, value as Function, values, descs);
-    }
-
-    values[key] = value;
-    descs[key] = undefined;
-  }
-}
-
-function updateObserversAndListeners(obj: object, key: string, fn: Function, add: boolean) {
-  let meta = observerListenerMetaFor(fn);
-
-  if (meta === undefined) return;
-
-  let { observers, listeners } = meta;
-
-  if (observers !== undefined) {
-    let updateObserver = add ? addObserver : removeObserver;
-
-    for (let path of observers.paths) {
-      updateObserver(obj, path, null, key, observers.sync);
-    }
-  }
-
-  if (listeners !== undefined) {
-    let updateListener = add ? addListener : removeListener;
-
-    for (let listener of listeners) {
-      updateListener(obj, listener, null, key);
-    }
-  }
-}
-
-export function applyMixin(
-  obj: Record<string, any>,
-  mixins: Array<Mixin | Record<string, unknown>>,
-  _hideKeys = false
-) {
-  let descs = Object.create(null);
-  let values = Object.create(null);
-  let meta = metaFor(obj);
-  let keys: string[] = [];
-  let keysWithSuper: string[] = [];
-
-  (obj as any)._super = ROOT;
-
-  // Go through all mixins and hashes passed in, and:
-  //
-  // * Handle concatenated properties
-  // * Handle merged properties
-  // * Set up _super wrapping if necessary
-  // * Set up computed property descriptors
-  // * Copying `toString` in broken browsers
-  mergeMixins(mixins, meta, descs, values, obj, keys, keysWithSuper);
-
-  for (let key of keys) {
-    let value = values[key];
-    let desc = descs[key];
-
-    if (value !== undefined) {
-      if (typeof value === 'function') {
-        updateObserversAndListeners(obj, key, value, true);
-      }
-
-      defineValue(obj, key, value, keysWithSuper.indexOf(key) !== -1, !_hideKeys);
-    } else if (desc !== undefined) {
-      defineDecorator(obj, key, desc, meta);
-    }
-  }
-
-  if (!meta.isPrototypeMeta(obj)) {
-    revalidateObservers(obj);
-  }
-
-  return obj;
-}
-
-/**
-  @method mixin
-  @param obj
-  @param mixins*
-  @return obj
-  @private
-*/
-export function mixin(obj: object, ...args: any[]) {
-  applyMixin(obj, args);
-  return obj;
-}
-
-const MIXINS = new _WeakSet();
-
-/**
-  The `Mixin` class allows you to create mixins, whose properties can be
-  added to other classes. For instance,
-
-  ```javascript
-  import Mixin from '@ember/object/mixin';
-
-  const EditableMixin = Mixin.create({
-    edit() {
-      console.log('starting to edit');
-      this.set('isEditing', true);
-    },
-    isEditing: false
-  });
-  ```
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import EditableMixin from '../mixins/editable';
-
-  // Mix mixins into classes by passing them as the first arguments to
-  // `.extend.`
-  const Comment = EmberObject.extend(EditableMixin, {
-    post: null
-  });
-
-  let comment = Comment.create({
-    post: somePost
-  });
-
-  comment.edit(); // outputs 'starting to edit'
-  ```
-
-  Note that Mixins are created with `Mixin.create`, not
-  `Mixin.extend`.
-
-  Note that mixins extend a constructor's prototype so arrays and object literals
-  defined as properties will be shared amongst objects that implement the mixin.
-  If you want to define a property in a mixin that is not shared, you can define
-  it either as a computed property or have it be created on initialization of the object.
-
-  ```javascript
-  // filters array will be shared amongst any object implementing mixin
-  import Mixin from '@ember/object/mixin';
-  import { A } from '@ember/array';
-
-  const FilterableMixin = Mixin.create({
-    filters: A()
-  });
-  ```
-
-  ```javascript
-  import Mixin from '@ember/object/mixin';
-  import { A } from '@ember/array';
-  import { computed } from '@ember/object';
-
-  // filters will be a separate array for every object implementing the mixin
-  const FilterableMixin = Mixin.create({
-    filters: computed(function() {
-      return A();
-    })
-  });
-  ```
-
-  ```javascript
-  import Mixin from '@ember/object/mixin';
-  import { A } from '@ember/array';
-
-  // filters will be created as a separate array during the object's initialization
-  const Filterable = Mixin.create({
-    filters: null,
-
-    init() {
-      this._super(...arguments);
-      this.set("filters", A());
-    }
-  });
-  ```
-
-  @class Mixin
-  @public
-*/
-export default class Mixin {
-  /** @internal */
-  declare static _disableDebugSeal?: boolean;
-
-  /** @internal */
-  mixins: Mixin[] | undefined;
-
-  /** @internal */
-  properties: { [key: string]: any } | undefined;
-
-  /** @internal */
-  ownerConstructor: any;
-
-  /** @internal */
-  _without: any[] | undefined;
-
-  declare [INIT_FACTORY]?: null;
-
-  /** @internal */
-  constructor(mixins: Mixin[] | undefined, properties?: { [key: string]: any }) {
-    MIXINS.add(this);
-    this.properties = extractAccessors(properties);
-    this.mixins = buildMixinsArray(mixins);
-    this.ownerConstructor = undefined;
-    this._without = undefined;
-
-    if (DEBUG) {
-      // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
-      this[INIT_FACTORY] = null;
-      /*
-        In debug builds, we seal mixins to help avoid performance pitfalls.
-
-        In IE11 there is a quirk that prevents sealed objects from being added
-        to a WeakMap. Unfortunately, the mixin system currently relies on
-        weak maps in `guidFor`, so we need to prime the guid cache weak map.
-      */
-      guidFor(this);
-
-      if (Mixin._disableDebugSeal !== true) {
-        Object.seal(this);
-      }
-    }
-  }
-
-  /**
-    @method create
-    @for @ember/object/mixin
-    @static
-    @param arguments*
-    @public
-  */
-  static create(...args: any[]): Mixin {
-    setUnprocessedMixins();
-    let M = this;
-    return new M(args, undefined);
-  }
-
-  // returns the mixins currently applied to the specified object
-  // TODO: Make `mixin`
-  /** @internal */
-  static mixins(obj: object): Mixin[] {
-    let meta = peekMeta(obj);
-    let ret: Mixin[] = [];
-    if (meta === null) {
-      return ret;
-    }
-
-    meta.forEachMixins((currentMixin: Mixin) => {
-      // skip primitive mixins since these are always anonymous
-      if (!currentMixin.properties) {
-        ret.push(currentMixin);
-      }
-    });
-
-    return ret;
-  }
-
-  /**
-    @method reopen
-    @param arguments*
-    @private
-    @internal
-  */
-  reopen(...args: any[]): this | undefined {
-    if (args.length === 0) {
-      return;
-    }
-
-    if (this.properties) {
-      let currentMixin = new Mixin(undefined, this.properties);
-      this.properties = undefined;
-      this.mixins = [currentMixin];
-    } else if (!this.mixins) {
-      this.mixins = [];
-    }
-
-    this.mixins = this.mixins.concat(buildMixinsArray(args) as Mixin[]);
-    return this;
-  }
-
-  /**
-    @method apply
-    @param obj
-    @return applied object
-    @private
-    @internal
-  */
-  apply(obj: object, _hideKeys = false) {
-    // Ember.NativeArray is a normal Ember.Mixin that we mix into `Array.prototype` when prototype extensions are enabled
-    // mutating a native object prototype like this should _not_ result in enumerable properties being added (or we have significant
-    // issues with things like deep equality checks from test frameworks, or things like jQuery.extend(true, [], [])).
-    //
-    // _hideKeys disables enumerablity when applying the mixin. This is a hack, and we should stop mutating the array prototype by default 😫
-    return applyMixin(obj, [this], _hideKeys);
-  }
-
-  /** @internal */
-  applyPartial(obj: object) {
-    return applyMixin(obj, [this]);
-  }
-
-  /**
-    @method detect
-    @param obj
-    @return {Boolean}
-    @private
-    @internal
-  */
-  detect(obj: any): boolean {
-    if (typeof obj !== 'object' || obj === null) {
-      return false;
-    }
-    if (MIXINS.has(obj)) {
-      return _detect(obj, this);
-    }
-    let meta = peekMeta(obj);
-    if (meta === null) {
-      return false;
-    }
-    return meta.hasMixin(this);
-  }
-
-  /** @internal */
-  without(...args: any[]) {
-    let ret = new Mixin([this]);
-    ret._without = args;
-    return ret;
-  }
-
-  /** @internal */
-  keys() {
-    let keys = _keys(this);
-    assert('[BUG] Missing keys for mixin!', keys);
-    return keys;
-  }
-
-  /** @internal */
-  toString() {
-    return '(unknown mixin)';
-  }
-}
-
-if (DEBUG) {
-  Object.defineProperty(Mixin, '_disableDebugSeal', {
-    configurable: true,
-    enumerable: false,
-    writable: true,
-    value: false,
-  });
-}
-
-function buildMixinsArray(mixins: MixinLike[] | undefined): Mixin[] | undefined {
-  let length = (mixins && mixins.length) || 0;
-  let m: Mixin[] | undefined = undefined;
-
-  if (length > 0) {
-    m = new Array(length);
-    for (let i = 0; i < length; i++) {
-      let x = mixins![i];
-      assert(
-        `Expected hash or Mixin instance, got ${Object.prototype.toString.call(x)}`,
-        typeof x === 'object' &&
-          x !== null &&
-          Object.prototype.toString.call(x) !== '[object Array]'
-      );
-
-      if (MIXINS.has(x)) {
-        m[i] = x as Mixin;
-      } else {
-        m[i] = new Mixin(undefined, x);
-      }
-    }
-  }
-
-  return m;
-}
-
-type MixinLike = Mixin | { [key: string]: any };
-
-if (DEBUG) {
-  Object.seal(Mixin.prototype);
-}
-
-function _detect(curMixin: Mixin, targetMixin: Mixin, seen = new Set()): boolean {
-  if (seen.has(curMixin)) {
-    return false;
-  }
-  seen.add(curMixin);
-
-  if (curMixin === targetMixin) {
-    return true;
-  }
-  let mixins = curMixin.mixins;
-  if (mixins) {
-    return mixins.some((mixin) => _detect(mixin, targetMixin, seen));
-  }
-
-  return false;
-}
-
-function _keys(mixin: Mixin, ret = new Set<string>(), seen = new Set()) {
-  if (seen.has(mixin)) {
-    return;
-  }
-  seen.add(mixin);
-
-  if (mixin.properties) {
-    let props = Object.keys(mixin.properties);
-    for (let prop of props) {
-      ret.add(prop);
-    }
-  } else if (mixin.mixins) {
-    mixin.mixins.forEach((x: any) => _keys(x, ret, seen));
-  }
-
-  return ret;
-}
-
-// ..........................................................
-// OBSERVER HELPER
-//
-
-type ObserverDefinition<T extends AnyFn> = {
-  dependentKeys: string[];
-  fn: T;
-  sync: boolean;
-};
-
-/**
-  Specify a method that observes property changes.
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import { observer } from '@ember/object';
-
-  export default EmberObject.extend({
-    valueObserver: observer('value', function() {
-      // Executes whenever the "value" property changes
-    })
-  });
-  ```
-
-  Also available as `Function.prototype.observes` if prototype extensions are
-  enabled.
-
-  @method observer
-  @for @ember/object
-  @param {String} propertyNames*
-  @param {Function} func
-  @return func
-  @public
-  @static
-*/
-export function observer<T extends AnyFn>(
-  ...args:
-    | [propertyName: string, ...additionalPropertyNames: string[], func: T]
-    | [ObserverDefinition<T>]
-): T {
-  let funcOrDef = args.pop();
-
-  assert(
-    'observer must be provided a function or an observer definition',
-    typeof funcOrDef === 'function' || (typeof funcOrDef === 'object' && funcOrDef !== null)
-  );
-
-  let func: T;
-  let dependentKeys: string[];
-  let sync: boolean;
-
-  if (typeof funcOrDef === 'function') {
-    func = funcOrDef;
-    dependentKeys = args as string[];
-    sync = !ENV._DEFAULT_ASYNC_OBSERVERS;
-  } else {
-    func = funcOrDef.fn;
-    dependentKeys = funcOrDef.dependentKeys;
-    sync = funcOrDef.sync;
-  }
-
-  assert('observer called without a function', typeof func === 'function');
-  assert(
-    'observer called without valid path',
-    Array.isArray(dependentKeys) &&
-      dependentKeys.length > 0 &&
-      dependentKeys.every((p) => typeof p === 'string' && Boolean(p.length))
-  );
-  assert('observer called without sync', typeof sync === 'boolean');
-
-  let paths: string[] = [];
-
-  for (let dependentKey of dependentKeys) {
-    expandProperties(dependentKey, (path: string) => paths.push(path));
-  }
-
-  setObservers(func as Function, {
-    paths,
-    sync,
-  });
-  return func;
-}
-
-export { Mixin };
diff --git a/packages/@ember/-internals/metal/tests/accessors/get_test.js b/packages/@ember/-internals/metal/tests/accessors/get_test.js
index a739159026d..1012aa3f515 100644
--- a/packages/@ember/-internals/metal/tests/accessors/get_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/get_test.js
@@ -1,6 +1,7 @@
 import { ENV } from '@ember/-internals/environment';
-import EmberObject from '@ember/object';
-import { get, Mixin, observer } from '../..';
+import EmberObject, { observer } from '@ember/object';
+import { get } from '../..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { destroy } from '@glimmer/destroyable';
diff --git a/packages/@ember/-internals/metal/tests/events_test.js b/packages/@ember/-internals/metal/tests/events_test.js
index 3db7f4065ad..109792c39b7 100644
--- a/packages/@ember/-internals/metal/tests/events_test.js
+++ b/packages/@ember/-internals/metal/tests/events_test.js
@@ -1,4 +1,5 @@
-import { Mixin, on, addListener, removeListener, sendEvent, hasListeners } from '..';
+import { on, addListener, removeListener, sendEvent, hasListeners } from '..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/mixin/apply_test.js b/packages/@ember/-internals/metal/tests/mixin/apply_test.js
index e829b61f47c..67a96bf8b2e 100644
--- a/packages/@ember/-internals/metal/tests/mixin/apply_test.js
+++ b/packages/@ember/-internals/metal/tests/mixin/apply_test.js
@@ -1,4 +1,5 @@
-import { get, Mixin, mixin } from '../..';
+import { get } from '@ember/object';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function K() {}
diff --git a/packages/@ember/-internals/metal/tests/namespace_search_test.js b/packages/@ember/-internals/metal/tests/namespace_search_test.js
index 0e60cf4758a..29e94ea83ac 100644
--- a/packages/@ember/-internals/metal/tests/namespace_search_test.js
+++ b/packages/@ember/-internals/metal/tests/namespace_search_test.js
@@ -1,4 +1,4 @@
-import { Mixin } from '..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js b/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
index a9eda704a6c..6d955965051 100644
--- a/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
+++ b/packages/@ember/-internals/metal/tests/native_desc_decorator_test.js
@@ -1,5 +1,6 @@
 import EmberObject from '@ember/object';
-import { Mixin, defineProperty, nativeDescDecorator } from '..';
+import { defineProperty, nativeDescDecorator } from '..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let classes = [
diff --git a/packages/@ember/-internals/metal/tests/observer_test.js b/packages/@ember/-internals/metal/tests/observer_test.js
index ea4dfd1dd02..9a9db59312d 100644
--- a/packages/@ember/-internals/metal/tests/observer_test.js
+++ b/packages/@ember/-internals/metal/tests/observer_test.js
@@ -5,14 +5,13 @@ import {
   notifyPropertyChange,
   defineProperty,
   computed,
-  Mixin,
-  mixin,
-  observer,
   beginPropertyChanges,
   endPropertyChanges,
   get,
   set,
 } from '..';
+import { observer } from '@ember/object';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 import { meta as metaFor } from '@ember/-internals/meta';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
index 5465507604d..be3e6a31267 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/-proxy.ts
@@ -3,11 +3,11 @@
 */
 
 import { meta } from '@ember/-internals/meta';
+import Mixin from '@ember/object/mixin';
 import {
   get,
   set,
   defineProperty,
-  Mixin,
   tagForObject,
   computed,
   tagForProperty,
diff --git a/packages/@ember/-internals/runtime/lib/mixins/action_handler.ts b/packages/@ember/-internals/runtime/lib/mixins/action_handler.ts
index 5f071c26e53..29c13f32c7c 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/action_handler.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/action_handler.ts
@@ -2,7 +2,8 @@
 @module ember
 */
 
-import { Mixin, get } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
+import { get } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 
 /**
@@ -38,7 +39,7 @@ const ActionHandler = Mixin.create({
     or mixins rather than just replace the entire hash, e.g.:
 
     ```app/mixins/can-display-banner.js
-    import Mixin from '@ember/mixin';
+    import Mixin from '@ember/object/mixin';
 
     export default Mixin.create({
       actions: {
@@ -93,7 +94,7 @@ const ActionHandler = Mixin.create({
     Take for example the following routes:
 
     ```app/mixins/debug-route.js
-    import Mixin from '@ember/mixin';
+    import Mixin from '@ember/object/mixin';
 
     export default Mixin.create({
       actions: {
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.ts b/packages/@ember/-internals/runtime/lib/mixins/array.ts
index 2ee572322d6..7189a913f50 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/array.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/array.ts
@@ -11,10 +11,10 @@ import {
   replaceInNativeArray,
   replace,
   computed,
-  Mixin,
   beginPropertyChanges,
   endPropertyChanges,
 } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 import Enumerable from '@ember/enumerable';
 import compare from '../compare';
@@ -23,7 +23,7 @@ import Observable from '@ember/object/observable';
 import MutableEnumerable from './mutable_enumerable';
 import { typeOf } from '../type-of';
 import type { AnyFn } from '@ember/-internals/utils/types';
-import type { ComputedPropertyCallback } from '@ember/-internals/metal/lib/computed';
+import type { ComputedPropertyCallback } from '@ember/-internals/metal';
 
 type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/comparable.ts b/packages/@ember/-internals/runtime/lib/mixins/comparable.ts
index 38320f926f3..451fd1d4885 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/comparable.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/comparable.ts
@@ -1,4 +1,4 @@
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 
 /**
 @module ember
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 39d411fc915..517fcb876bd 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -5,7 +5,7 @@ import { schedule, join } from '@ember/runloop';
 import type { FactoryManager } from '@ember/-internals/container/lib/container';
 import type Container from '@ember/-internals/container/lib/container';
 import type { TypeOptions } from '@ember/-internals/container/lib/registry';
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import type { Factory } from '@ember/-internals/owner';
 
 // This is defined as a separate interface so that it can be used in the definition of
diff --git a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
index 1b50d895241..30847d50dee 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
@@ -1,5 +1,5 @@
 import Enumerable from '@ember/enumerable';
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 
 /**
 @module ember
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
index f79946edc3e..f197195a713 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
@@ -1,4 +1,5 @@
-import { get, setProperties, computed, Mixin } from '@ember/-internals/metal';
+import { get, setProperties, computed } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
 import type RSVP from 'rsvp';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index 10537cde256..d5555d8f0a2 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -4,7 +4,7 @@
 
 import type { Registry } from '@ember/-internals/container';
 import type { TypeOptions } from '@ember/-internals/container/lib/registry';
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import type { Factory } from '@ember/-internals/owner';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts
index 3ae1d30aca7..e4448ab7392 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/target_action_support.ts
@@ -3,7 +3,8 @@
 */
 
 import { context } from '@ember/-internals/environment';
-import { get, Mixin, computed } from '@ember/-internals/metal';
+import { get, computed } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index bddbfb719e4..e7c99c53fdd 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -3,14 +3,13 @@ import {
   set,
   objectAt,
   addObserver,
-  observer as emberObserver,
   computed,
   addArrayObserver,
   removeArrayObserver,
   arrayContentDidChange,
   arrayContentWillChange,
 } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import EmberObject, { observer as emberObserver } from '@ember/object';
 import EmberArray, { A as emberA } from '../../lib/mixins/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
index 40f00091f24..73ae5962a4e 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
@@ -1,6 +1,5 @@
 import ArrayProxy from '../../../lib/system/array_proxy';
-import EmberObject from '@ember/object';
-import { observer } from '@ember/-internals/metal';
+import EmberObject, { observer } from '@ember/object';
 import { oneWay as reads, not } from '@ember/object/computed';
 import { A as a } from '../../../lib/mixins/array';
 import { moduleFor, AbstractTestCase, runTask, runLoopSettled } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index 81cd0d157de..779a0073b85 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,5 +1,6 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { get, set, observer } from '@ember/-internals/metal';
+import { get, set } from '@ember/-internals/metal';
+import { observer } from '@ember/object';
 import CoreObject from '@ember/object/core';
 import {
   moduleFor,
diff --git a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
index 83968b6ba88..d889fd6fc86 100644
--- a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
@@ -1,5 +1,6 @@
 import { DEBUG } from '@glimmer/env';
-import { addObserver, observer, computed, get, set, removeObserver } from '@ember/-internals/metal';
+import { addObserver, computed, get, set, removeObserver } from '@ember/-internals/metal';
+import { observer } from '@ember/object';
 import ObjectProxy from '../../lib/system/object_proxy';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.ts b/packages/@ember/-internals/views/lib/mixins/action_support.ts
index 2e5578d92a9..6c72300e8cb 100644
--- a/packages/@ember/-internals/views/lib/mixins/action_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.ts
@@ -2,7 +2,8 @@
  @module ember
 */
 import { inspect } from '@ember/-internals/utils';
-import { Mixin, get } from '@ember/-internals/metal';
+import { get } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 
 /**
diff --git a/packages/@ember/-internals/views/lib/mixins/child_views_support.ts b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
index 1495dcada03..0cde2a25738 100644
--- a/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/child_views_support.ts
@@ -2,7 +2,8 @@
 @module ember
 */
 import type { View } from '@ember/-internals/glimmer/lib/renderer';
-import { Mixin, nativeDescDecorator } from '@ember/-internals/metal';
+import { nativeDescDecorator } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { getChildViews, addChildView } from '../system/utils';
 
 interface ChildViewsSupport {
diff --git a/packages/@ember/-internals/views/lib/mixins/class_names_support.ts b/packages/@ember/-internals/views/lib/mixins/class_names_support.ts
index 951e15fd404..87cc85e70b1 100644
--- a/packages/@ember/-internals/views/lib/mixins/class_names_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/class_names_support.ts
@@ -1,7 +1,8 @@
 /**
 @module ember
 */
-import { descriptorForProperty, Mixin } from '@ember/-internals/metal';
+import { descriptorForProperty } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 
 const EMPTY_ARRAY = Object.freeze([]);
diff --git a/packages/@ember/-internals/views/lib/mixins/view_state_support.ts b/packages/@ember/-internals/views/lib/mixins/view_state_support.ts
index bd0d6159121..aec7ccb5e0b 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_state_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/view_state_support.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import type Component from '@ember/component';
 import type states from '../views/states';
 
diff --git a/packages/@ember/-internals/views/lib/mixins/view_support.ts b/packages/@ember/-internals/views/lib/mixins/view_support.ts
index ad7077ba5db..1e84ef34066 100644
--- a/packages/@ember/-internals/views/lib/mixins/view_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/view_support.ts
@@ -1,5 +1,6 @@
 import { guidFor } from '@ember/-internals/utils';
-import { descriptorForProperty, Mixin, nativeDescDecorator } from '@ember/-internals/metal';
+import { descriptorForProperty, nativeDescDecorator } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 import { hasDOM } from '@ember/-internals/browser-environment';
 import { matches } from '../system/utils';
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 2b6011a526b..c2341087864 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -2,7 +2,8 @@ import { getOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/object';
 import { inject as metalInject } from '@ember/-internals/metal';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
-import { Mixin, computed, get } from '@ember/-internals/metal';
+import { computed, get } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import type { RouteArgs } from '@ember/-internals/routing';
 import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/-internals/routing';
 import { ActionHandler } from '@ember/-internals/runtime';
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index 38cd056e4a8..68c33bea73b 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -1,7 +1,8 @@
 import Controller, { inject as injectController } from '@ember/controller';
 import Service, { service } from '@ember/service';
 import EmberObject from '@ember/object';
-import { Mixin, get } from '@ember/-internals/metal';
+import { get } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner } from 'internal-test-helpers';
 import { moduleFor, ApplicationTestCase, AbstractTestCase, runTask } from 'internal-test-helpers';
diff --git a/packages/@ember/enumerable/index.ts b/packages/@ember/enumerable/index.ts
index f300411cbe2..271e589391f 100644
--- a/packages/@ember/enumerable/index.ts
+++ b/packages/@ember/enumerable/index.ts
@@ -1,4 +1,4 @@
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 
 /**
 @module @ember/enumerable
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index 020c415cb43..2eb4f9beff0 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -11,15 +11,14 @@ import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/met
 import {
   PROXY_CONTENT,
   sendEvent,
-  Mixin,
   activateObserver,
-  applyMixin,
   defineProperty,
   descriptorForProperty,
   isClassicDecorator,
   DEBUG_INJECTION_FUNCTIONS,
   hasUnknownProperty,
 } from '@ember/-internals/metal';
+import Mixin, { applyMixin } from '@ember/object/mixin';
 import { ActionHandler } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/object/evented.ts b/packages/@ember/object/evented.ts
index 9e16da98c9c..e56fecf0c11 100644
--- a/packages/@ember/object/evented.ts
+++ b/packages/@ember/object/evented.ts
@@ -1,10 +1,5 @@
-import {
-  Mixin,
-  addListener,
-  removeListener,
-  hasListeners,
-  sendEvent,
-} from '@ember/-internals/metal';
+import { addListener, removeListener, hasListeners, sendEvent } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 
 export { on } from '@ember/-internals/metal';
 
diff --git a/packages/@ember/object/index.ts b/packages/@ember/object/index.ts
index 4d6f37bebeb..aee7b173b96 100644
--- a/packages/@ember/object/index.ts
+++ b/packages/@ember/object/index.ts
@@ -1,8 +1,14 @@
 import { assert } from '@ember/debug';
+import { ENV } from '@ember/-internals/environment';
 import type { ElementDescriptor, ExtendedMethodDecorator } from '@ember/-internals/metal';
-import { isElementDescriptor, setClassicDecorator } from '@ember/-internals/metal';
+import {
+  isElementDescriptor,
+  expandProperties,
+  setClassicDecorator,
+} from '@ember/-internals/metal';
 import { getFactoryFor } from '@ember/-internals/container';
-import { symbol } from '@ember/-internals/utils';
+import { setObservers, symbol } from '@ember/-internals/utils';
+import type { AnyFn } from '@ember/-internals/utils/types';
 import { addListener } from '@ember/-internals/metal';
 import CoreObject from '@ember/object/core';
 import Observable from '@ember/object/observable';
@@ -15,7 +21,6 @@ export {
   set,
   getProperties,
   setProperties,
-  observer,
   computed,
   trySet,
 } from '@ember/-internals/metal';
@@ -300,3 +305,86 @@ export function action(
 
 // SAFETY: TS types are weird with decorators. This should work.
 setClassicDecorator(action as ExtendedMethodDecorator);
+
+// ..........................................................
+// OBSERVER HELPER
+//
+
+type ObserverDefinition<T extends AnyFn> = {
+  dependentKeys: string[];
+  fn: T;
+  sync: boolean;
+};
+
+/**
+  Specify a method that observes property changes.
+
+  ```javascript
+  import EmberObject from '@ember/object';
+  import { observer } from '@ember/object';
+
+  export default EmberObject.extend({
+    valueObserver: observer('value', function() {
+      // Executes whenever the "value" property changes
+    })
+  });
+  ```
+
+  Also available as `Function.prototype.observes` if prototype extensions are
+  enabled.
+
+  @method observer
+  @for @ember/object
+  @param {String} propertyNames*
+  @param {Function} func
+  @return func
+  @public
+  @static
+*/
+export function observer<T extends AnyFn>(
+  ...args:
+    | [propertyName: string, ...additionalPropertyNames: string[], func: T]
+    | [ObserverDefinition<T>]
+): T {
+  let funcOrDef = args.pop();
+
+  assert(
+    'observer must be provided a function or an observer definition',
+    typeof funcOrDef === 'function' || (typeof funcOrDef === 'object' && funcOrDef !== null)
+  );
+
+  let func: T;
+  let dependentKeys: string[];
+  let sync: boolean;
+
+  if (typeof funcOrDef === 'function') {
+    func = funcOrDef;
+    dependentKeys = args as string[];
+    sync = !ENV._DEFAULT_ASYNC_OBSERVERS;
+  } else {
+    func = funcOrDef.fn;
+    dependentKeys = funcOrDef.dependentKeys;
+    sync = funcOrDef.sync;
+  }
+
+  assert('observer called without a function', typeof func === 'function');
+  assert(
+    'observer called without valid path',
+    Array.isArray(dependentKeys) &&
+      dependentKeys.length > 0 &&
+      dependentKeys.every((p) => typeof p === 'string' && Boolean(p.length))
+  );
+  assert('observer called without sync', typeof sync === 'boolean');
+
+  let paths: string[] = [];
+
+  for (let dependentKey of dependentKeys) {
+    expandProperties(dependentKey, (path: string) => paths.push(path));
+  }
+
+  setObservers(func as Function, {
+    paths,
+    sync,
+  });
+  return func;
+}
diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index 0ffc8e5ed78..70a842a168a 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -1 +1,757 @@
-export { Mixin as default } from '@ember/-internals/metal';
+/**
+@module @ember/object
+*/
+import { INIT_FACTORY } from '@ember/-internals/container';
+import type { Meta } from '@ember/-internals/meta';
+import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
+import { guidFor, makeArray, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/utils';
+import { assert } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+import { _WeakSet } from '@glimmer/util';
+import type {
+  ComputedDecorator,
+  ComputedPropertyGetter,
+  ComputedPropertyObj,
+  ComputedPropertySetter,
+  ComputedDescriptor,
+} from '@ember/-internals/metal';
+import {
+  ComputedProperty,
+  descriptorForDecorator,
+  makeComputedDecorator,
+  nativeDescDecorator,
+  setUnprocessedMixins,
+  addObserver,
+  removeObserver,
+  revalidateObservers,
+  defineDecorator,
+  defineValue,
+} from '@ember/-internals/metal';
+import { addListener, removeListener } from '@ember/object/events';
+
+const a_concat = Array.prototype.concat;
+const { isArray } = Array;
+
+function extractAccessors(properties: { [key: string]: any } | undefined) {
+  if (properties !== undefined) {
+    for (let key of Object.keys(properties)) {
+      let desc = Object.getOwnPropertyDescriptor(properties, key)!;
+
+      if (desc.get !== undefined || desc.set !== undefined) {
+        Object.defineProperty(properties, key, { value: nativeDescDecorator(desc) });
+      }
+    }
+  }
+
+  return properties;
+}
+
+function concatenatedMixinProperties(
+  concatProp: string,
+  props: { [key: string]: any },
+  values: { [key: string]: any },
+  base: { [key: string]: any }
+) {
+  // reset before adding each new mixin to pickup concats from previous
+  let concats = values[concatProp] || base[concatProp];
+  if (props[concatProp]) {
+    concats = concats ? a_concat.call(concats, props[concatProp]) : props[concatProp];
+  }
+  return concats;
+}
+
+function giveDecoratorSuper(
+  key: string,
+  decorator: ComputedDecorator,
+  property: ComputedProperty | true,
+  descs: { [key: string]: any }
+): ComputedDecorator {
+  if (property === true) {
+    return decorator;
+  }
+
+  let originalGetter = property._getter;
+
+  if (originalGetter === undefined) {
+    return decorator;
+  }
+
+  let superDesc = descs[key];
+
+  // Check to see if the super property is a decorator first, if so load its descriptor
+  let superProperty: ComputedProperty | true | undefined =
+    typeof superDesc === 'function' ? descriptorForDecorator(superDesc) : superDesc;
+
+  if (superProperty === undefined || superProperty === true) {
+    return decorator;
+  }
+
+  let superGetter = superProperty._getter;
+
+  if (superGetter === undefined) {
+    return decorator;
+  }
+
+  let get = wrap(originalGetter, superGetter) as ComputedPropertyGetter;
+  let set;
+  let originalSetter = property._setter;
+  let superSetter = superProperty._setter;
+
+  if (superSetter !== undefined) {
+    if (originalSetter !== undefined) {
+      set = wrap(originalSetter, superSetter) as ComputedPropertySetter;
+    } else {
+      // If the super property has a setter, we default to using it no matter what.
+      // This is clearly very broken and weird, but it's what was here so we have
+      // to keep it until the next major at least.
+      //
+      // TODO: Add a deprecation here.
+      set = superSetter;
+    }
+  } else {
+    set = originalSetter;
+  }
+
+  // only create a new CP if we must
+  if (get !== originalGetter || set !== originalSetter) {
+    // Since multiple mixins may inherit from the same parent, we need
+    // to clone the computed property so that other mixins do not receive
+    // the wrapped version.
+    let dependentKeys = property._dependentKeys || [];
+    let newProperty = new ComputedProperty([
+      ...dependentKeys,
+      {
+        get,
+        set,
+      } as ComputedPropertyObj,
+    ]);
+
+    newProperty._readOnly = property._readOnly;
+    newProperty._meta = property._meta;
+    newProperty.enumerable = property.enumerable;
+
+    // SAFETY: We passed in the impl for this class
+    return makeComputedDecorator(newProperty, ComputedProperty) as ComputedDecorator;
+  }
+
+  return decorator;
+}
+
+function giveMethodSuper(
+  key: string,
+  method: Function,
+  values: { [key: string]: any },
+  descs: { [key: string]: any }
+) {
+  // Methods overwrite computed properties, and do not call super to them.
+  if (descs[key] !== undefined) {
+    return method;
+  }
+
+  // Find the original method in a parent mixin
+  let superMethod = values[key];
+
+  // Only wrap the new method if the original method was a function
+  if (typeof superMethod === 'function') {
+    return wrap(method, superMethod);
+  }
+
+  return method;
+}
+
+function applyConcatenatedProperties(key: string, value: any, values: { [key: string]: any }) {
+  let baseValue = values[key];
+  let ret = makeArray(baseValue).concat(makeArray(value));
+
+  if (DEBUG) {
+    // it is possible to use concatenatedProperties with strings (which cannot be frozen)
+    // only freeze objects...
+    if (typeof ret === 'object' && ret !== null) {
+      // prevent mutating `concatenatedProperties` array after it is applied
+      Object.freeze(ret);
+    }
+  }
+
+  return ret;
+}
+
+function applyMergedProperties(
+  key: string,
+  value: { [key: string]: any },
+  values: { [key: string]: any }
+): { [key: string]: any } {
+  let baseValue = values[key];
+
+  assert(
+    `You passed in \`${JSON.stringify(
+      value
+    )}\` as the value for \`${key}\` but \`${key}\` cannot be an Array`,
+    !isArray(value)
+  );
+
+  if (!baseValue) {
+    return value;
+  }
+
+  let newBase = Object.assign({}, baseValue);
+  let hasFunction = false;
+
+  let props = Object.keys(value);
+
+  for (let prop of props) {
+    let propValue = value[prop];
+
+    if (typeof propValue === 'function') {
+      hasFunction = true;
+      newBase[prop] = giveMethodSuper(prop, propValue, baseValue, {});
+    } else {
+      newBase[prop] = propValue;
+    }
+  }
+
+  if (hasFunction) {
+    newBase._super = ROOT;
+  }
+
+  return newBase;
+}
+
+function mergeMixins(
+  mixins: MixinLike[],
+  meta: Meta,
+  descs: { [key: string]: object },
+  values: { [key: string]: object },
+  base: { [key: string]: object },
+  keys: string[],
+  keysWithSuper: string[]
+): void {
+  let currentMixin;
+
+  for (let i = 0; i < mixins.length; i++) {
+    currentMixin = mixins[i];
+    assert(
+      `Expected hash or Mixin instance, got ${Object.prototype.toString.call(currentMixin)}`,
+      typeof currentMixin === 'object' &&
+        currentMixin !== null &&
+        Object.prototype.toString.call(currentMixin) !== '[object Array]'
+    );
+
+    if (MIXINS.has(currentMixin)) {
+      if (meta.hasMixin(currentMixin)) {
+        continue;
+      }
+      meta.addMixin(currentMixin);
+
+      let { properties, mixins } = currentMixin;
+
+      if (properties !== undefined) {
+        mergeProps(meta, properties, descs, values, base, keys, keysWithSuper);
+      } else if (mixins !== undefined) {
+        mergeMixins(mixins, meta, descs, values, base, keys, keysWithSuper);
+
+        if (currentMixin instanceof Mixin && currentMixin._without !== undefined) {
+          currentMixin._without.forEach((keyName: string) => {
+            // deleting the key means we won't process the value
+            let index = keys.indexOf(keyName);
+
+            if (index !== -1) {
+              keys.splice(index, 1);
+            }
+          });
+        }
+      }
+    } else {
+      mergeProps(
+        meta,
+        currentMixin as Record<string, unknown>,
+        descs,
+        values,
+        base,
+        keys,
+        keysWithSuper
+      );
+    }
+  }
+}
+
+function mergeProps(
+  meta: Meta,
+  props: { [key: string]: unknown },
+  descs: { [key: string]: unknown },
+  values: { [key: string]: unknown },
+  base: { [key: string]: unknown },
+  keys: string[],
+  keysWithSuper: string[]
+) {
+  let concats = concatenatedMixinProperties('concatenatedProperties', props, values, base);
+  let mergings = concatenatedMixinProperties('mergedProperties', props, values, base);
+
+  let propKeys = Object.keys(props);
+
+  for (let key of propKeys) {
+    let value = props[key];
+
+    if (value === undefined) continue;
+
+    if (keys.indexOf(key) === -1) {
+      keys.push(key);
+
+      let desc = meta.peekDescriptors(key);
+
+      if (desc === undefined) {
+        // The superclass did not have a CP, which means it may have
+        // observers or listeners on that property.
+        let prev = (values[key] = base[key]);
+
+        if (typeof prev === 'function') {
+          updateObserversAndListeners(base, key, prev, false);
+        }
+      } else {
+        descs[key] = desc;
+
+        // The super desc will be overwritten on descs, so save off the fact that
+        // there was a super so we know to Object.defineProperty when writing
+        // the value
+        keysWithSuper.push(key);
+
+        desc.teardown(base, key, meta);
+      }
+    }
+
+    let isFunction = typeof value === 'function';
+
+    if (isFunction) {
+      let desc: ComputedDescriptor | undefined | true = descriptorForDecorator(value as Function);
+
+      if (desc !== undefined) {
+        // Wrap descriptor function to implement _super() if needed
+        descs[key] = giveDecoratorSuper(
+          key,
+          value as ComputedDecorator,
+          desc as ComputedProperty,
+          descs
+        );
+        values[key] = undefined;
+
+        continue;
+      }
+    }
+
+    if (
+      (concats && concats.indexOf(key) >= 0) ||
+      key === 'concatenatedProperties' ||
+      key === 'mergedProperties'
+    ) {
+      value = applyConcatenatedProperties(key, value, values);
+    } else if (mergings && mergings.indexOf(key) > -1) {
+      value = applyMergedProperties(key, value as object, values);
+    } else if (isFunction) {
+      value = giveMethodSuper(key, value as Function, values, descs);
+    }
+
+    values[key] = value;
+    descs[key] = undefined;
+  }
+}
+
+function updateObserversAndListeners(obj: object, key: string, fn: Function, add: boolean) {
+  let meta = observerListenerMetaFor(fn);
+
+  if (meta === undefined) return;
+
+  let { observers, listeners } = meta;
+
+  if (observers !== undefined) {
+    let updateObserver = add ? addObserver : removeObserver;
+
+    for (let path of observers.paths) {
+      updateObserver(obj, path, null, key, observers.sync);
+    }
+  }
+
+  if (listeners !== undefined) {
+    let updateListener = add ? addListener : removeListener;
+
+    for (let listener of listeners) {
+      updateListener(obj, listener, null, key);
+    }
+  }
+}
+
+export function applyMixin(
+  obj: Record<string, any>,
+  mixins: Array<Mixin | Record<string, unknown>>,
+  _hideKeys = false
+) {
+  let descs = Object.create(null);
+  let values = Object.create(null);
+  let meta = metaFor(obj);
+  let keys: string[] = [];
+  let keysWithSuper: string[] = [];
+
+  (obj as any)._super = ROOT;
+
+  // Go through all mixins and hashes passed in, and:
+  //
+  // * Handle concatenated properties
+  // * Handle merged properties
+  // * Set up _super wrapping if necessary
+  // * Set up computed property descriptors
+  // * Copying `toString` in broken browsers
+  mergeMixins(mixins, meta, descs, values, obj, keys, keysWithSuper);
+
+  for (let key of keys) {
+    let value = values[key];
+    let desc = descs[key];
+
+    if (value !== undefined) {
+      if (typeof value === 'function') {
+        updateObserversAndListeners(obj, key, value, true);
+      }
+
+      defineValue(obj, key, value, keysWithSuper.indexOf(key) !== -1, !_hideKeys);
+    } else if (desc !== undefined) {
+      defineDecorator(obj, key, desc, meta);
+    }
+  }
+
+  if (!meta.isPrototypeMeta(obj)) {
+    revalidateObservers(obj);
+  }
+
+  return obj;
+}
+
+/**
+  @method mixin
+  @param obj
+  @param mixins*
+  @return obj
+  @private
+*/
+export function mixin(obj: object, ...args: any[]) {
+  applyMixin(obj, args);
+  return obj;
+}
+
+const MIXINS = new _WeakSet();
+
+/**
+  The `Mixin` class allows you to create mixins, whose properties can be
+  added to other classes. For instance,
+
+  ```javascript
+  import Mixin from '@ember/object/mixin';
+
+  const EditableMixin = Mixin.create({
+    edit() {
+      console.log('starting to edit');
+      this.set('isEditing', true);
+    },
+    isEditing: false
+  });
+  ```
+
+  ```javascript
+  import EmberObject from '@ember/object';
+  import EditableMixin from '../mixins/editable';
+
+  // Mix mixins into classes by passing them as the first arguments to
+  // `.extend.`
+  const Comment = EmberObject.extend(EditableMixin, {
+    post: null
+  });
+
+  let comment = Comment.create({
+    post: somePost
+  });
+
+  comment.edit(); // outputs 'starting to edit'
+  ```
+
+  Note that Mixins are created with `Mixin.create`, not
+  `Mixin.extend`.
+
+  Note that mixins extend a constructor's prototype so arrays and object literals
+  defined as properties will be shared amongst objects that implement the mixin.
+  If you want to define a property in a mixin that is not shared, you can define
+  it either as a computed property or have it be created on initialization of the object.
+
+  ```javascript
+  // filters array will be shared amongst any object implementing mixin
+  import Mixin from '@ember/object/mixin';
+  import { A } from '@ember/array';
+
+  const FilterableMixin = Mixin.create({
+    filters: A()
+  });
+  ```
+
+  ```javascript
+  import Mixin from '@ember/object/mixin';
+  import { A } from '@ember/array';
+  import { computed } from '@ember/object';
+
+  // filters will be a separate array for every object implementing the mixin
+  const FilterableMixin = Mixin.create({
+    filters: computed(function() {
+      return A();
+    })
+  });
+  ```
+
+  ```javascript
+  import Mixin from '@ember/object/mixin';
+  import { A } from '@ember/array';
+
+  // filters will be created as a separate array during the object's initialization
+  const Filterable = Mixin.create({
+    filters: null,
+
+    init() {
+      this._super(...arguments);
+      this.set("filters", A());
+    }
+  });
+  ```
+
+  @class Mixin
+  @public
+*/
+export default class Mixin {
+  /** @internal */
+  declare static _disableDebugSeal?: boolean;
+
+  /** @internal */
+  mixins: Mixin[] | undefined;
+
+  /** @internal */
+  properties: { [key: string]: any } | undefined;
+
+  /** @internal */
+  ownerConstructor: any;
+
+  /** @internal */
+  _without: any[] | undefined;
+
+  declare [INIT_FACTORY]?: null;
+
+  /** @internal */
+  constructor(mixins: Mixin[] | undefined, properties?: { [key: string]: any }) {
+    MIXINS.add(this);
+    this.properties = extractAccessors(properties);
+    this.mixins = buildMixinsArray(mixins);
+    this.ownerConstructor = undefined;
+    this._without = undefined;
+
+    if (DEBUG) {
+      // Eagerly add INIT_FACTORY to avoid issues in DEBUG as a result of Object.seal(mixin)
+      this[INIT_FACTORY] = null;
+      /*
+        In debug builds, we seal mixins to help avoid performance pitfalls.
+
+        In IE11 there is a quirk that prevents sealed objects from being added
+        to a WeakMap. Unfortunately, the mixin system currently relies on
+        weak maps in `guidFor`, so we need to prime the guid cache weak map.
+      */
+      guidFor(this);
+
+      if (Mixin._disableDebugSeal !== true) {
+        Object.seal(this);
+      }
+    }
+  }
+
+  /**
+    @method create
+    @for @ember/object/mixin
+    @static
+    @param arguments*
+    @public
+  */
+  static create(...args: any[]): Mixin {
+    setUnprocessedMixins();
+    let M = this;
+    return new M(args, undefined);
+  }
+
+  // returns the mixins currently applied to the specified object
+  // TODO: Make `mixin`
+  /** @internal */
+  static mixins(obj: object): Mixin[] {
+    let meta = peekMeta(obj);
+    let ret: Mixin[] = [];
+    if (meta === null) {
+      return ret;
+    }
+
+    meta.forEachMixins((currentMixin: Mixin) => {
+      // skip primitive mixins since these are always anonymous
+      if (!currentMixin.properties) {
+        ret.push(currentMixin);
+      }
+    });
+
+    return ret;
+  }
+
+  /**
+    @method reopen
+    @param arguments*
+    @private
+    @internal
+  */
+  reopen(...args: any[]): this | undefined {
+    if (args.length === 0) {
+      return;
+    }
+
+    if (this.properties) {
+      let currentMixin = new Mixin(undefined, this.properties);
+      this.properties = undefined;
+      this.mixins = [currentMixin];
+    } else if (!this.mixins) {
+      this.mixins = [];
+    }
+
+    this.mixins = this.mixins.concat(buildMixinsArray(args) as Mixin[]);
+    return this;
+  }
+
+  /**
+    @method apply
+    @param obj
+    @return applied object
+    @private
+    @internal
+  */
+  apply(obj: object, _hideKeys = false) {
+    // Ember.NativeArray is a normal Ember.Mixin that we mix into `Array.prototype` when prototype extensions are enabled
+    // mutating a native object prototype like this should _not_ result in enumerable properties being added (or we have significant
+    // issues with things like deep equality checks from test frameworks, or things like jQuery.extend(true, [], [])).
+    //
+    // _hideKeys disables enumerablity when applying the mixin. This is a hack, and we should stop mutating the array prototype by default 😫
+    return applyMixin(obj, [this], _hideKeys);
+  }
+
+  /** @internal */
+  applyPartial(obj: object) {
+    return applyMixin(obj, [this]);
+  }
+
+  /**
+    @method detect
+    @param obj
+    @return {Boolean}
+    @private
+    @internal
+  */
+  detect(obj: any): boolean {
+    if (typeof obj !== 'object' || obj === null) {
+      return false;
+    }
+    if (MIXINS.has(obj)) {
+      return _detect(obj, this);
+    }
+    let meta = peekMeta(obj);
+    if (meta === null) {
+      return false;
+    }
+    return meta.hasMixin(this);
+  }
+
+  /** @internal */
+  without(...args: any[]) {
+    let ret = new Mixin([this]);
+    ret._without = args;
+    return ret;
+  }
+
+  /** @internal */
+  keys() {
+    let keys = _keys(this);
+    assert('[BUG] Missing keys for mixin!', keys);
+    return keys;
+  }
+
+  /** @internal */
+  toString() {
+    return '(unknown mixin)';
+  }
+}
+
+if (DEBUG) {
+  Object.defineProperty(Mixin, '_disableDebugSeal', {
+    configurable: true,
+    enumerable: false,
+    writable: true,
+    value: false,
+  });
+}
+
+function buildMixinsArray(mixins: MixinLike[] | undefined): Mixin[] | undefined {
+  let length = (mixins && mixins.length) || 0;
+  let m: Mixin[] | undefined = undefined;
+
+  if (length > 0) {
+    m = new Array(length);
+    for (let i = 0; i < length; i++) {
+      let x = mixins![i];
+      assert(
+        `Expected hash or Mixin instance, got ${Object.prototype.toString.call(x)}`,
+        typeof x === 'object' &&
+          x !== null &&
+          Object.prototype.toString.call(x) !== '[object Array]'
+      );
+
+      if (MIXINS.has(x)) {
+        m[i] = x as Mixin;
+      } else {
+        m[i] = new Mixin(undefined, x);
+      }
+    }
+  }
+
+  return m;
+}
+
+type MixinLike = Mixin | { [key: string]: any };
+
+if (DEBUG) {
+  Object.seal(Mixin.prototype);
+}
+
+function _detect(curMixin: Mixin, targetMixin: Mixin, seen = new Set()): boolean {
+  if (seen.has(curMixin)) {
+    return false;
+  }
+  seen.add(curMixin);
+
+  if (curMixin === targetMixin) {
+    return true;
+  }
+  let mixins = curMixin.mixins;
+  if (mixins) {
+    return mixins.some((mixin) => _detect(mixin, targetMixin, seen));
+  }
+
+  return false;
+}
+
+function _keys(mixin: Mixin, ret = new Set<string>(), seen = new Set()) {
+  if (seen.has(mixin)) {
+    return;
+  }
+  seen.add(mixin);
+
+  if (mixin.properties) {
+    let props = Object.keys(mixin.properties);
+    for (let prop of props) {
+      ret.add(prop);
+    }
+  } else if (mixin.mixins) {
+    mixin.mixins.forEach((x: any) => _keys(x, ret, seen));
+  }
+
+  return ret;
+}
diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index 6f53f31de9e..efc4b2dd48c 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -8,7 +8,6 @@ import {
   set,
   getProperties,
   setProperties,
-  Mixin,
   hasListeners,
   beginPropertyChanges,
   notifyPropertyChange,
@@ -16,6 +15,7 @@ import {
   addObserver,
   removeObserver,
 } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 
 export type ObserverMethod<Target, Sender> =
diff --git a/packages/@ember/object/tests/computed/dependent-key-compat-test.js b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
index 72bfe5977b0..cee1c29850f 100644
--- a/packages/@ember/object/tests/computed/dependent-key-compat-test.js
+++ b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
@@ -1,5 +1,5 @@
-import EmberObject from '@ember/object';
-import { computed, tracked, observer } from '@ember/-internals/metal';
+import EmberObject, { observer } from '@ember/object';
+import { computed, tracked } from '@ember/-internals/metal';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index 4b6bfca2bc1..cea5f309744 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -6,10 +6,11 @@ import {
   set,
   addObserver,
   computed,
-  observer,
 } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
-import { ObjectProxy, isArray, A as emberA, removeAt } from '@ember/-internals/runtime';
+import { removeAt } from '@ember/-internals/runtime';
+import EmberObject, { observer } from '@ember/object';
+import ObjectProxy from '@ember/object/proxy';
+import { isArray, A as emberA } from '@ember/array';
 import {
   sum,
   min,
diff --git a/packages/@ember/object/tests/computed_test.js b/packages/@ember/object/tests/computed_test.js
index 203fde34386..7268fa9cecf 100644
--- a/packages/@ember/object/tests/computed_test.js
+++ b/packages/@ember/object/tests/computed_test.js
@@ -3,13 +3,12 @@ import {
   computed,
   set,
   get,
-  observer,
   defineProperty,
   notifyPropertyChange,
 } from '@ember/-internals/metal';
 import { oneWay as reads } from '@ember/object/computed';
 import { A as emberA, isArray } from '@ember/array';
-import EmberObject from '@ember/object';
+import EmberObject, { observer } from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function K() {
diff --git a/packages/@ember/object/tests/create_test.js b/packages/@ember/object/tests/create_test.js
index f17953075bf..414f90d30e6 100644
--- a/packages/@ember/object/tests/create_test.js
+++ b/packages/@ember/object/tests/create_test.js
@@ -1,9 +1,10 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { computed, Mixin, observer, addObserver, alias } from '@ember/-internals/metal';
+import { computed, addObserver, alias } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import EmberObject from '@ember/object';
+import EmberObject, { observer } from '@ember/object';
 import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
diff --git a/packages/@ember/object/tests/destroy_test.js b/packages/@ember/object/tests/destroy_test.js
index 429d67fab64..cc0300f432e 100644
--- a/packages/@ember/object/tests/destroy_test.js
+++ b/packages/@ember/object/tests/destroy_test.js
@@ -1,13 +1,7 @@
 import { run } from '@ember/runloop';
-import {
-  observer,
-  get,
-  set,
-  beginPropertyChanges,
-  endPropertyChanges,
-} from '@ember/-internals/metal';
+import { get, set, beginPropertyChanges, endPropertyChanges } from '@ember/-internals/metal';
 import { peekMeta } from '@ember/-internals/meta';
-import EmberObject from '@ember/object';
+import EmberObject, { observer } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/es-compatibility-test.js b/packages/@ember/object/tests/es-compatibility-test.js
index 8c01368e4d3..c17152576c8 100644
--- a/packages/@ember/object/tests/es-compatibility-test.js
+++ b/packages/@ember/object/tests/es-compatibility-test.js
@@ -1,9 +1,7 @@
-import EmberObject from '@ember/object';
+import EmberObject, { observer } from '@ember/object';
 import {
-  Mixin,
   defineProperty,
   computed,
-  observer,
   on,
   addObserver,
   removeObserver,
@@ -11,6 +9,7 @@ import {
   removeListener,
   sendEvent,
 } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/extend_test.js b/packages/@ember/object/tests/extend_test.js
index d1b8376850b..bed09aa8d3e 100644
--- a/packages/@ember/object/tests/extend_test.js
+++ b/packages/@ember/object/tests/extend_test.js
@@ -1,5 +1,5 @@
-import { computed, get, observer } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import { computed, get } from '@ember/-internals/metal';
+import EmberObject, { observer } from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/mixin/accessor_test.js b/packages/@ember/object/tests/mixin/accessor_test.js
similarity index 95%
rename from packages/@ember/-internals/metal/tests/mixin/accessor_test.js
rename to packages/@ember/object/tests/mixin/accessor_test.js
index 5bdfd07031a..7eb0759be81 100644
--- a/packages/@ember/-internals/metal/tests/mixin/accessor_test.js
+++ b/packages/@ember/object/tests/mixin/accessor_test.js
@@ -1,4 +1,4 @@
-import { Mixin } from '../..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/mixin/apply_test.js b/packages/@ember/object/tests/mixin/apply_test.js
new file mode 100644
index 00000000000..a19e7432957
--- /dev/null
+++ b/packages/@ember/object/tests/mixin/apply_test.js
@@ -0,0 +1,41 @@
+import { get } from '../..';
+import Mixin, { mixin } from '@ember/object/mixin';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+function K() {}
+
+moduleFor(
+  'Mixin.apply',
+  class extends AbstractTestCase {
+    ['@test using apply() should apply properties'](assert) {
+      let MixinA = Mixin.create({ foo: 'FOO', baz: K });
+      let obj = {};
+      mixin(obj, MixinA);
+
+      assert.equal(get(obj, 'foo'), 'FOO', 'should apply foo');
+      assert.equal(get(obj, 'baz'), K, 'should apply foo');
+    }
+
+    ['@test applying anonymous properties'](assert) {
+      let obj = {};
+      mixin(obj, {
+        foo: 'FOO',
+        baz: K,
+      });
+
+      assert.equal(get(obj, 'foo'), 'FOO', 'should apply foo');
+      assert.equal(get(obj, 'baz'), K, 'should apply foo');
+    }
+
+    ['@test applying null values']() {
+      expectAssertion(() => mixin({}, null));
+    }
+
+    ['@test applying a property with an undefined value'](assert) {
+      let obj = { tagName: '' };
+      mixin(obj, { tagName: undefined });
+
+      assert.strictEqual(get(obj, 'tagName'), '');
+    }
+  }
+);
diff --git a/packages/@ember/-internals/metal/tests/mixin/computed_test.js b/packages/@ember/object/tests/mixin/computed_test.js
similarity index 97%
rename from packages/@ember/-internals/metal/tests/mixin/computed_test.js
rename to packages/@ember/object/tests/mixin/computed_test.js
index a6d8014e045..ac566ce831e 100644
--- a/packages/@ember/-internals/metal/tests/mixin/computed_test.js
+++ b/packages/@ember/object/tests/mixin/computed_test.js
@@ -1,4 +1,5 @@
-import { get, set, Mixin, computed, defineProperty } from '../..';
+import { get, set, computed, defineProperty } from '@ember/object';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function K() {
diff --git a/packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js b/packages/@ember/object/tests/mixin/concatenated_properties_test.js
similarity index 97%
rename from packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js
rename to packages/@ember/object/tests/mixin/concatenated_properties_test.js
index 43de4d2b826..82f417532f6 100644
--- a/packages/@ember/-internals/metal/tests/mixin/concatenated_properties_test.js
+++ b/packages/@ember/object/tests/mixin/concatenated_properties_test.js
@@ -1,4 +1,5 @@
-import { Mixin, mixin, get } from '../..';
+import { get } from '@ember/object';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/mixin/detect_test.js b/packages/@ember/object/tests/mixin/detect_test.js
similarity index 96%
rename from packages/@ember/-internals/metal/tests/mixin/detect_test.js
rename to packages/@ember/object/tests/mixin/detect_test.js
index d99caae6043..0f44fc85ce7 100644
--- a/packages/@ember/-internals/metal/tests/mixin/detect_test.js
+++ b/packages/@ember/object/tests/mixin/detect_test.js
@@ -1,4 +1,4 @@
-import { Mixin } from '../..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/mixin/introspection_test.js b/packages/@ember/object/tests/mixin/introspection_test.js
similarity index 96%
rename from packages/@ember/-internals/metal/tests/mixin/introspection_test.js
rename to packages/@ember/object/tests/mixin/introspection_test.js
index bb15e9fb2ab..d8b2002204e 100644
--- a/packages/@ember/-internals/metal/tests/mixin/introspection_test.js
+++ b/packages/@ember/object/tests/mixin/introspection_test.js
@@ -3,7 +3,7 @@
 // current impl doesn't care about the differences as much...
 
 import { guidFor } from '@ember/-internals/utils';
-import { mixin, Mixin } from '../..';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 const PrivateProperty = Mixin.create({
diff --git a/packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js b/packages/@ember/object/tests/mixin/merged_properties_test.js
similarity index 97%
rename from packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js
rename to packages/@ember/object/tests/mixin/merged_properties_test.js
index 20042abea75..e589ee25195 100644
--- a/packages/@ember/-internals/metal/tests/mixin/merged_properties_test.js
+++ b/packages/@ember/object/tests/mixin/merged_properties_test.js
@@ -1,5 +1,5 @@
-import EmberObject from '@ember/object';
-import { get, mixin, Mixin } from '../..';
+import EmberObject, { get } from '@ember/object';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/mixin/method_test.js b/packages/@ember/object/tests/mixin/method_test.js
similarity index 99%
rename from packages/@ember/-internals/metal/tests/mixin/method_test.js
rename to packages/@ember/object/tests/mixin/method_test.js
index dfc9b4d2c50..944b9a32702 100644
--- a/packages/@ember/-internals/metal/tests/mixin/method_test.js
+++ b/packages/@ember/object/tests/mixin/method_test.js
@@ -1,4 +1,4 @@
-import { mixin, Mixin } from '../..';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/metal/tests/mixin/observer_test.js b/packages/@ember/object/tests/mixin/observer_test.js
similarity index 98%
rename from packages/@ember/-internals/metal/tests/mixin/observer_test.js
rename to packages/@ember/object/tests/mixin/observer_test.js
index 10926e467ff..b7e70e9a381 100644
--- a/packages/@ember/-internals/metal/tests/mixin/observer_test.js
+++ b/packages/@ember/object/tests/mixin/observer_test.js
@@ -1,4 +1,5 @@
-import { set, get, observer, mixin, Mixin } from '../..';
+import { set, get, observer } from '@ember/object';
+import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
diff --git a/packages/@ember/-internals/metal/tests/mixin/reopen_test.js b/packages/@ember/object/tests/mixin/reopen_test.js
similarity index 94%
rename from packages/@ember/-internals/metal/tests/mixin/reopen_test.js
rename to packages/@ember/object/tests/mixin/reopen_test.js
index 3f96bf79962..60d7897a908 100644
--- a/packages/@ember/-internals/metal/tests/mixin/reopen_test.js
+++ b/packages/@ember/object/tests/mixin/reopen_test.js
@@ -1,5 +1,5 @@
-import EmberObject from '@ember/object';
-import { get, Mixin } from '../..';
+import EmberObject, { get } from '@ember/object';
+import Mixin from '@ember/object/mixin';
 import { run } from '@ember/runloop';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/metal/tests/mixin/without_test.js b/packages/@ember/object/tests/mixin/without_test.js
similarity index 92%
rename from packages/@ember/-internals/metal/tests/mixin/without_test.js
rename to packages/@ember/object/tests/mixin/without_test.js
index 138c0b52f98..4ee50760ac8 100644
--- a/packages/@ember/-internals/metal/tests/mixin/without_test.js
+++ b/packages/@ember/object/tests/mixin/without_test.js
@@ -1,4 +1,4 @@
-import { Mixin } from '../..';
+import Mixin from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/observable_test.js b/packages/@ember/object/tests/observable_test.js
index 0169f70c70f..a9d6c3cb8a5 100644
--- a/packages/@ember/object/tests/observable_test.js
+++ b/packages/@ember/object/tests/observable_test.js
@@ -1,8 +1,8 @@
 import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
-import { get, computed, observer } from '@ember/-internals/metal';
+import { get, computed } from '@ember/-internals/metal';
 import { w } from '@ember/string';
-import EmberObject from '@ember/object';
+import EmberObject, { observer } from '@ember/object';
 import Observable from '@ember/object/observable';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
diff --git a/packages/@ember/object/tests/observer_test.js b/packages/@ember/object/tests/observer_test.js
index bb5f43b0e27..24d5b0869a9 100644
--- a/packages/@ember/object/tests/observer_test.js
+++ b/packages/@ember/object/tests/observer_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
-import { alias, observer, get, set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import { alias, get, set } from '@ember/-internals/metal';
+import EmberObject, { observer } from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/ember/index.js b/packages/ember/index.js
index e880fdd560d..a795111f361 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -25,7 +25,7 @@ import {
 } from '@ember/string';
 import Service, { service } from '@ember/service';
 
-import EmberObject, { action, computed } from '@ember/object';
+import EmberObject, { action, computed, observer } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 
 import {
@@ -81,6 +81,7 @@ import EngineInstance from '@ember/engine/instance';
 import Enumerable from '@ember/enumerable';
 import CoreObject from '@ember/object/core';
 import Evented from '@ember/object/evented';
+import Mixin, { mixin } from '@ember/object/mixin';
 import Observable from '@ember/object/observable';
 import { assign } from '@ember/polyfills';
 
@@ -237,9 +238,9 @@ Ember.setProperties = metal.setProperties;
 Ember.expandProperties = metal.expandProperties;
 Ember.addObserver = metal.addObserver;
 Ember.removeObserver = metal.removeObserver;
-Ember.observer = metal.observer;
-Ember.mixin = metal.mixin;
-Ember.Mixin = metal.Mixin;
+Ember.observer = observer;
+Ember.mixin = mixin;
+Ember.Mixin = Mixin;
 
 Ember._createCache = metal.createCache;
 Ember._cacheGetValue = metal.getValue;
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index dbf120cebf1..b422a3a107c 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -14,7 +14,8 @@ import {
   runTask,
 } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
-import { Mixin, set, addObserver } from '@ember/-internals/metal';
+import { set, addObserver } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import Engine from '@ember/engine';
 import { InternalTransition as Transition } from 'router_js';
 
diff --git a/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js b/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
index 0f7578952bb..52bc340828a 100644
--- a/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { Route } from '@ember/-internals/routing';
-import { Mixin } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
 import { QueryParamTestCase, moduleFor, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(

From 2b0bcc5f345cbed3286489db81fdf6d23ba95204 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 12:15:59 -0700
Subject: [PATCH 1057/1405] Consolidate @ember/object/proxy

---
 .../glimmer/tests/integration/content-test.js |  2 +-
 .../tests/integration/syntax/each-in-test.js  |  2 +-
 .../tests/integration/syntax/let-test.js      |  3 +-
 .../tests/utils/shared-conditional-tests.js   |  3 +-
 .../-internals/metal/tests/is_empty_test.js   |  2 +-
 .../routing/tests/system/route_test.js        |  2 +-
 packages/@ember/-internals/runtime/index.ts   |  1 -
 .../runtime/lib/system/object_proxy.ts        | 85 ------------------
 .../runtime/tests/core/is_empty_test.js       |  2 +-
 .../tests/mixins/promise_proxy_test.js        |  2 +-
 .../runtime/tests/system/object_proxy_test.js |  2 +-
 packages/@ember/object/proxy.ts               | 86 ++++++++++++++++++-
 packages/ember/index.js                       |  2 +-
 13 files changed, 97 insertions(+), 97 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/object_proxy.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index 7967fbc844a..c3c8b0e2d79 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -6,7 +6,7 @@ import { set, computed } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import EmberObject from '@ember/object';
 import { readOnly } from '@ember/object/computed';
-import { ObjectProxy } from '@ember/-internals/runtime';
+import ObjectProxy from '@ember/object/proxy';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { Component, SafeString, htmlSafe } from '../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index 9910034f0c7..e18de761e35 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -2,7 +2,7 @@ import { applyMixins, moduleFor, RenderingTestCase, runTask, strip } from 'inter
 
 import { get, set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
-import { ObjectProxy } from '@ember/-internals/runtime';
+import ObjectProxy from '@ember/object/proxy';
 
 import {
   FalsyGenerator,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index a3f8ef73c9f..0ad01bf2a42 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -1,7 +1,8 @@
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
 import { get, set } from '@ember/-internals/metal';
-import { A as emberA, ObjectProxy, removeAt } from '@ember/-internals/runtime';
+import { A as emberA, removeAt } from '@ember/-internals/runtime';
+import ObjectProxy from '@ember/object/proxy';
 
 moduleFor(
   'Syntax test: {{#let as}}',
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 315016a12ef..693369f57c2 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -5,7 +5,8 @@ import { RenderingTestCase, applyMixins, runTask } from 'internal-test-helpers';
 import { htmlSafe } from '@ember/-internals/glimmer';
 import { get, set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
-import { ObjectProxy, A as emberA, ArrayProxy, removeAt } from '@ember/-internals/runtime';
+import ObjectProxy from '@ember/object/proxy';
+import { A as emberA, ArrayProxy, removeAt } from '@ember/-internals/runtime';
 
 import { Component } from './helpers';
 
diff --git a/packages/@ember/-internals/metal/tests/is_empty_test.js b/packages/@ember/-internals/metal/tests/is_empty_test.js
index 25c00835369..d937a09fe0f 100644
--- a/packages/@ember/-internals/metal/tests/is_empty_test.js
+++ b/packages/@ember/-internals/metal/tests/is_empty_test.js
@@ -1,6 +1,6 @@
 import { isEmpty } from '..';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-import ObjectProxy from '../../runtime/lib/system/object_proxy';
+import ObjectProxy from '@ember/object/proxy';
 
 moduleFor(
   'isEmpty',
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index fedd8689161..213698f6750 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -3,7 +3,7 @@ import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-te
 import Service, { service } from '@ember/service';
 import EmberObject from '@ember/object';
 import EmberRoute from '../../lib/system/route';
-import ObjectProxy from '@ember/-internals/runtime/lib/system/object_proxy';
+import ObjectProxy from '@ember/object/proxy';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
 let route, routeOne, routeTwo, lookupHash;
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index cc5abeb4c9c..7f7f39b475b 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -13,7 +13,6 @@ export {
 } from './lib/mixins/array';
 export { default as Comparable } from './lib/mixins/comparable';
 export { default as ArrayProxy } from './lib/system/array_proxy';
-export { default as ObjectProxy } from './lib/system/object_proxy';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as MutableEnumerable } from './lib/mixins/mutable_enumerable';
diff --git a/packages/@ember/-internals/runtime/lib/system/object_proxy.ts b/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
deleted file mode 100644
index 7e70c27252e..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/object_proxy.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { FrameworkObject } from '@ember/object';
-import _ProxyMixin from '../mixins/-proxy';
-
-/**
-  `ObjectProxy` forwards all properties not defined by the proxy itself
-  to a proxied `content` object.
-
-  ```javascript
-  import EmberObject from '@ember/object';
-  import ObjectProxy from '@ember/object/proxy';
-
-  let exampleObject = EmberObject.create({
-    name: 'Foo'
-  });
-
-  let exampleProxy = ObjectProxy.create({
-    content: exampleObject
-  });
-
-  // Access and change existing properties
-  exampleProxy.get('name');          // 'Foo'
-  exampleProxy.set('name', 'Bar');
-  exampleObject.get('name');         // 'Bar'
-
-  // Create new 'description' property on `exampleObject`
-  exampleProxy.set('description', 'Foo is a whizboo baz');
-  exampleObject.get('description');  // 'Foo is a whizboo baz'
-  ```
-
-  While `content` is unset, setting a property to be delegated will throw an
-  Error.
-
-  ```javascript
-  import ObjectProxy from '@ember/object/proxy';
-
-  let exampleProxy = ObjectProxy.create({
-    content: null,
-    flag: null
-  });
-  exampleProxy.set('flag', true);
-  exampleProxy.get('flag');         // true
-  exampleProxy.get('foo');          // undefined
-  exampleProxy.set('foo', 'data');  // throws Error
-  ```
-
-  Delegated properties can be bound to and will change when content is updated.
-
-  Computed properties on the proxy itself can depend on delegated properties.
-
-  ```javascript
-  import { computed } from '@ember/object';
-  import ObjectProxy from '@ember/object/proxy';
-
-  ProxyWithComputedProperty = ObjectProxy.extend({
-    fullName: computed('firstName', 'lastName', function() {
-      var firstName = this.get('firstName'),
-          lastName = this.get('lastName');
-      if (firstName && lastName) {
-        return firstName + ' ' + lastName;
-      }
-      return firstName || lastName;
-    })
-  });
-
-  let exampleProxy = ProxyWithComputedProperty.create();
-
-  exampleProxy.get('fullName');  // undefined
-  exampleProxy.set('content', {
-    firstName: 'Tom', lastName: 'Dale'
-  }); // triggers property change for fullName on proxy
-
-  exampleProxy.get('fullName');  // 'Tom Dale'
-  ```
-
-  @class ObjectProxy
-  @extends EmberObject
-  @uses Ember.ProxyMixin
-  @public
-*/
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface ObjectProxy extends _ProxyMixin {}
-class ObjectProxy extends FrameworkObject {}
-ObjectProxy.PrototypeMixin.reopen(_ProxyMixin);
-
-export default ObjectProxy;
diff --git a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
index 1d32bc85eab..b3ffe30f122 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
@@ -1,6 +1,6 @@
 import { isEmpty } from '@ember/-internals/metal';
 import ArrayProxy from '../../lib/system/array_proxy';
-import ObjectProxy from '../../lib/system/object_proxy';
+import ObjectProxy from '@ember/object/proxy';
 import { A as emberA } from '../../lib/mixins/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
index 794f70f0b77..e5749e3917f 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
-import ObjectProxy from '../../lib/system/object_proxy';
+import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '../../lib/mixins/promise_proxy';
 import EmberRSVP from '../../lib/ext/rsvp';
 import { onerrorDefault } from '../../lib/ext/rsvp';
diff --git a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
index d889fd6fc86..51fc6e7c27e 100644
--- a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
@@ -1,7 +1,7 @@
 import { DEBUG } from '@glimmer/env';
 import { addObserver, computed, get, set, removeObserver } from '@ember/-internals/metal';
 import { observer } from '@ember/object';
-import ObjectProxy from '../../lib/system/object_proxy';
+import ObjectProxy from '@ember/object/proxy';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/proxy.ts b/packages/@ember/object/proxy.ts
index ce3fbabc7ec..5bb78cdbf05 100644
--- a/packages/@ember/object/proxy.ts
+++ b/packages/@ember/object/proxy.ts
@@ -1 +1,85 @@
-export { ObjectProxy as default } from '@ember/-internals/runtime';
+import { FrameworkObject } from '@ember/object';
+import { _ProxyMixin } from '@ember/-internals/runtime';
+
+/**
+  `ObjectProxy` forwards all properties not defined by the proxy itself
+  to a proxied `content` object.
+
+  ```javascript
+  import EmberObject from '@ember/object';
+  import ObjectProxy from '@ember/object/proxy';
+
+  let exampleObject = EmberObject.create({
+    name: 'Foo'
+  });
+
+  let exampleProxy = ObjectProxy.create({
+    content: exampleObject
+  });
+
+  // Access and change existing properties
+  exampleProxy.get('name');          // 'Foo'
+  exampleProxy.set('name', 'Bar');
+  exampleObject.get('name');         // 'Bar'
+
+  // Create new 'description' property on `exampleObject`
+  exampleProxy.set('description', 'Foo is a whizboo baz');
+  exampleObject.get('description');  // 'Foo is a whizboo baz'
+  ```
+
+  While `content` is unset, setting a property to be delegated will throw an
+  Error.
+
+  ```javascript
+  import ObjectProxy from '@ember/object/proxy';
+
+  let exampleProxy = ObjectProxy.create({
+    content: null,
+    flag: null
+  });
+  exampleProxy.set('flag', true);
+  exampleProxy.get('flag');         // true
+  exampleProxy.get('foo');          // undefined
+  exampleProxy.set('foo', 'data');  // throws Error
+  ```
+
+  Delegated properties can be bound to and will change when content is updated.
+
+  Computed properties on the proxy itself can depend on delegated properties.
+
+  ```javascript
+  import { computed } from '@ember/object';
+  import ObjectProxy from '@ember/object/proxy';
+
+  ProxyWithComputedProperty = ObjectProxy.extend({
+    fullName: computed('firstName', 'lastName', function() {
+      var firstName = this.get('firstName'),
+          lastName = this.get('lastName');
+      if (firstName && lastName) {
+        return firstName + ' ' + lastName;
+      }
+      return firstName || lastName;
+    })
+  });
+
+  let exampleProxy = ProxyWithComputedProperty.create();
+
+  exampleProxy.get('fullName');  // undefined
+  exampleProxy.set('content', {
+    firstName: 'Tom', lastName: 'Dale'
+  }); // triggers property change for fullName on proxy
+
+  exampleProxy.get('fullName');  // 'Tom Dale'
+  ```
+
+  @class ObjectProxy
+  @extends EmberObject
+  @uses Ember.ProxyMixin
+  @public
+*/
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface ObjectProxy extends _ProxyMixin {}
+class ObjectProxy extends FrameworkObject {}
+ObjectProxy.PrototypeMixin.reopen(_ProxyMixin);
+
+export default ObjectProxy;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index a795111f361..539d1d1ded6 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -43,7 +43,6 @@ import {
   RSVP,
   Comparable,
   ArrayProxy,
-  ObjectProxy,
   ActionHandler,
   NativeArray,
   A,
@@ -83,6 +82,7 @@ import CoreObject from '@ember/object/core';
 import Evented from '@ember/object/evented';
 import Mixin, { mixin } from '@ember/object/mixin';
 import Observable from '@ember/object/observable';
+import ObjectProxy from '@ember/object/proxy';
 import { assign } from '@ember/polyfills';
 
 import {

From 865ebeeffbc70195b46124696269bcb03e9384af Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 12:18:48 -0700
Subject: [PATCH 1058/1405] Consolidate @ember/objet/promise-proxy-mixin

---
 .../integration/components/tracked-test.js    |   3 +-
 packages/@ember/-internals/runtime/index.ts   |   1 -
 .../runtime/lib/mixins/promise_proxy.ts       | 256 -----------------
 .../tests/mixins/promise_proxy_test.js        |   2 +-
 packages/@ember/object/promise-proxy-mixin.ts | 257 +++++++++++++++++-
 packages/ember/index.js                       |   2 +-
 6 files changed, 260 insertions(+), 261 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 1737865e901..7fa92702f26 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -1,5 +1,6 @@
 import EmberObject from '@ember/object';
-import { A, ArrayProxy, PromiseProxyMixin } from '@ember/-internals/runtime';
+import { A, ArrayProxy } from '@ember/-internals/runtime';
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import {
   computed,
   get,
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index 7f7f39b475b..de62bba053f 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -17,7 +17,6 @@ export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as MutableEnumerable } from './lib/mixins/mutable_enumerable';
 export { default as TargetActionSupport } from './lib/mixins/target_action_support';
-export { default as PromiseProxyMixin } from './lib/mixins/promise_proxy';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
 export { typeOf } from './lib/type-of';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
deleted file mode 100644
index f197195a713..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/promise_proxy.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { get, setProperties, computed } from '@ember/-internals/metal';
-import Mixin from '@ember/object/mixin';
-import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
-import EmberError from '@ember/error';
-import type RSVP from 'rsvp';
-import type CoreObject from '@ember/object/core';
-
-/**
-  @module @ember/object
-*/
-
-function tap<T>(proxy: PromiseProxyMixin<T>, promise: RSVP.Promise<T>) {
-  setProperties(proxy, {
-    isFulfilled: false,
-    isRejected: false,
-  });
-
-  return promise.then(
-    (value) => {
-      if (
-        !(proxy as unknown as CoreObject).isDestroyed &&
-        !(proxy as unknown as CoreObject).isDestroying
-      ) {
-        setProperties(proxy, {
-          content: value,
-          isFulfilled: true,
-        });
-      }
-      return value;
-    },
-    (reason) => {
-      if (
-        !(proxy as unknown as CoreObject).isDestroyed &&
-        !(proxy as unknown as CoreObject).isDestroying
-      ) {
-        setProperties(proxy, {
-          reason,
-          isRejected: true,
-        });
-      }
-      throw reason;
-    },
-    'Ember: PromiseProxy'
-  );
-}
-
-/**
-  A low level mixin making ObjectProxy promise-aware.
-
-  ```javascript
-  import { resolve } from 'rsvp';
-  import $ from 'jquery';
-  import ObjectProxy from '@ember/object/proxy';
-  import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
-
-  let ObjectPromiseProxy = ObjectProxy.extend(PromiseProxyMixin);
-
-  let proxy = ObjectPromiseProxy.create({
-    promise: resolve($.getJSON('/some/remote/data.json'))
-  });
-
-  proxy.then(function(json){
-     // the json
-  }, function(reason) {
-     // the reason why you have no json
-  });
-  ```
-
-  the proxy has bindable attributes which
-  track the promises life cycle
-
-  ```javascript
-  proxy.get('isPending')   //=> true
-  proxy.get('isSettled')  //=> false
-  proxy.get('isRejected')  //=> false
-  proxy.get('isFulfilled') //=> false
-  ```
-
-  When the $.getJSON completes, and the promise is fulfilled
-  with json, the life cycle attributes will update accordingly.
-  Note that $.getJSON doesn't return an ECMA specified promise,
-  it is useful to wrap this with an `RSVP.resolve` so that it behaves
-  as a spec compliant promise.
-
-  ```javascript
-  proxy.get('isPending')   //=> false
-  proxy.get('isSettled')   //=> true
-  proxy.get('isRejected')  //=> false
-  proxy.get('isFulfilled') //=> true
-  ```
-
-  As the proxy is an ObjectProxy, and the json now its content,
-  all the json properties will be available directly from the proxy.
-
-  ```javascript
-  // Assuming the following json:
-  {
-    firstName: 'Stefan',
-    lastName: 'Penner'
-  }
-
-  // both properties will accessible on the proxy
-  proxy.get('firstName') //=> 'Stefan'
-  proxy.get('lastName')  //=> 'Penner'
-  ```
-
-  @class PromiseProxyMixin
-  @public
-*/
-interface PromiseProxyMixin<T> {
-  reason: unknown;
-
-  readonly isPending: boolean;
-  readonly isSettled: boolean;
-
-  isRejected: boolean;
-  isFulfilled: boolean;
-
-  promise: Promise<T>;
-
-  then: this['promise']['then'];
-  catch: this['promise']['catch'];
-  finally: this['promise']['finally'];
-}
-const PromiseProxyMixin = Mixin.create({
-  /**
-    If the proxied promise is rejected this will contain the reason
-    provided.
-
-    @property reason
-    @default null
-    @public
-  */
-  reason: null,
-
-  /**
-    Once the proxied promise has settled this will become `false`.
-
-    @property isPending
-    @default true
-    @public
-  */
-  isPending: computed('isSettled', function () {
-    return !get(this, 'isSettled');
-  }).readOnly(),
-
-  /**
-    Once the proxied promise has settled this will become `true`.
-
-    @property isSettled
-    @default false
-    @public
-  */
-  isSettled: computed('isRejected', 'isFulfilled', function () {
-    return get(this, 'isRejected') || get(this, 'isFulfilled');
-  }).readOnly(),
-
-  /**
-    Will become `true` if the proxied promise is rejected.
-
-    @property isRejected
-    @default false
-    @public
-  */
-  isRejected: false,
-
-  /**
-    Will become `true` if the proxied promise is fulfilled.
-
-    @property isFulfilled
-    @default false
-    @public
-  */
-  isFulfilled: false,
-
-  /**
-    The promise whose fulfillment value is being proxied by this object.
-
-    This property must be specified upon creation, and should not be
-    changed once created.
-
-    Example:
-
-    ```javascript
-    import ObjectProxy from '@ember/object/proxy';
-    import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
-
-    ObjectProxy.extend(PromiseProxyMixin).create({
-      promise: <thenable>
-    });
-    ```
-
-    @property promise
-    @public
-  */
-  promise: computed({
-    get() {
-      throw new EmberError("PromiseProxy's promise must be set");
-    },
-    set(_key, promise: RSVP.Promise<unknown>) {
-      return tap(this, promise);
-    },
-  }),
-
-  /**
-    An alias to the proxied promise's `then`.
-
-    See RSVP.Promise.then.
-
-    @method then
-    @param {Function} callback
-    @return {RSVP.Promise}
-    @public
-  */
-  then: promiseAlias('then'),
-
-  /**
-    An alias to the proxied promise's `catch`.
-
-    See RSVP.Promise.catch.
-
-    @method catch
-    @param {Function} callback
-    @return {RSVP.Promise}
-    @since 1.3.0
-    @public
-  */
-  catch: promiseAlias('catch'),
-
-  /**
-    An alias to the proxied promise's `finally`.
-
-    See RSVP.Promise.finally.
-
-    @method finally
-    @param {Function} callback
-    @return {RSVP.Promise}
-    @since 1.3.0
-    @public
-  */
-  finally: promiseAlias('finally'),
-});
-
-function promiseAlias<T, N extends MethodNamesOf<Promise<T>>>(name: N) {
-  return function (this: PromiseProxyMixin<T>, ...args: Parameters<Promise<T>[N]>) {
-    let promise = get(this, 'promise');
-
-    // We need this cast because `Parameters` is deferred so that it is not
-    // possible for TS to see it will always produce the right type. However,
-    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
-    // issue](https://github.com/microsoft/TypeScript/issues/47615).
-    return (promise[name] as AnyFn)(...args);
-  };
-}
-
-export default PromiseProxyMixin;
diff --git a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
index e5749e3917f..38e8bcce835 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
@@ -1,7 +1,7 @@
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import ObjectProxy from '@ember/object/proxy';
-import PromiseProxyMixin from '../../lib/mixins/promise_proxy';
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import EmberRSVP from '../../lib/ext/rsvp';
 import { onerrorDefault } from '../../lib/ext/rsvp';
 import * as RSVP from 'rsvp';
diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index ecf044def98..f197195a713 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -1 +1,256 @@
-export { PromiseProxyMixin as default } from '@ember/-internals/runtime';
+import { get, setProperties, computed } from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
+import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
+import EmberError from '@ember/error';
+import type RSVP from 'rsvp';
+import type CoreObject from '@ember/object/core';
+
+/**
+  @module @ember/object
+*/
+
+function tap<T>(proxy: PromiseProxyMixin<T>, promise: RSVP.Promise<T>) {
+  setProperties(proxy, {
+    isFulfilled: false,
+    isRejected: false,
+  });
+
+  return promise.then(
+    (value) => {
+      if (
+        !(proxy as unknown as CoreObject).isDestroyed &&
+        !(proxy as unknown as CoreObject).isDestroying
+      ) {
+        setProperties(proxy, {
+          content: value,
+          isFulfilled: true,
+        });
+      }
+      return value;
+    },
+    (reason) => {
+      if (
+        !(proxy as unknown as CoreObject).isDestroyed &&
+        !(proxy as unknown as CoreObject).isDestroying
+      ) {
+        setProperties(proxy, {
+          reason,
+          isRejected: true,
+        });
+      }
+      throw reason;
+    },
+    'Ember: PromiseProxy'
+  );
+}
+
+/**
+  A low level mixin making ObjectProxy promise-aware.
+
+  ```javascript
+  import { resolve } from 'rsvp';
+  import $ from 'jquery';
+  import ObjectProxy from '@ember/object/proxy';
+  import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
+
+  let ObjectPromiseProxy = ObjectProxy.extend(PromiseProxyMixin);
+
+  let proxy = ObjectPromiseProxy.create({
+    promise: resolve($.getJSON('/some/remote/data.json'))
+  });
+
+  proxy.then(function(json){
+     // the json
+  }, function(reason) {
+     // the reason why you have no json
+  });
+  ```
+
+  the proxy has bindable attributes which
+  track the promises life cycle
+
+  ```javascript
+  proxy.get('isPending')   //=> true
+  proxy.get('isSettled')  //=> false
+  proxy.get('isRejected')  //=> false
+  proxy.get('isFulfilled') //=> false
+  ```
+
+  When the $.getJSON completes, and the promise is fulfilled
+  with json, the life cycle attributes will update accordingly.
+  Note that $.getJSON doesn't return an ECMA specified promise,
+  it is useful to wrap this with an `RSVP.resolve` so that it behaves
+  as a spec compliant promise.
+
+  ```javascript
+  proxy.get('isPending')   //=> false
+  proxy.get('isSettled')   //=> true
+  proxy.get('isRejected')  //=> false
+  proxy.get('isFulfilled') //=> true
+  ```
+
+  As the proxy is an ObjectProxy, and the json now its content,
+  all the json properties will be available directly from the proxy.
+
+  ```javascript
+  // Assuming the following json:
+  {
+    firstName: 'Stefan',
+    lastName: 'Penner'
+  }
+
+  // both properties will accessible on the proxy
+  proxy.get('firstName') //=> 'Stefan'
+  proxy.get('lastName')  //=> 'Penner'
+  ```
+
+  @class PromiseProxyMixin
+  @public
+*/
+interface PromiseProxyMixin<T> {
+  reason: unknown;
+
+  readonly isPending: boolean;
+  readonly isSettled: boolean;
+
+  isRejected: boolean;
+  isFulfilled: boolean;
+
+  promise: Promise<T>;
+
+  then: this['promise']['then'];
+  catch: this['promise']['catch'];
+  finally: this['promise']['finally'];
+}
+const PromiseProxyMixin = Mixin.create({
+  /**
+    If the proxied promise is rejected this will contain the reason
+    provided.
+
+    @property reason
+    @default null
+    @public
+  */
+  reason: null,
+
+  /**
+    Once the proxied promise has settled this will become `false`.
+
+    @property isPending
+    @default true
+    @public
+  */
+  isPending: computed('isSettled', function () {
+    return !get(this, 'isSettled');
+  }).readOnly(),
+
+  /**
+    Once the proxied promise has settled this will become `true`.
+
+    @property isSettled
+    @default false
+    @public
+  */
+  isSettled: computed('isRejected', 'isFulfilled', function () {
+    return get(this, 'isRejected') || get(this, 'isFulfilled');
+  }).readOnly(),
+
+  /**
+    Will become `true` if the proxied promise is rejected.
+
+    @property isRejected
+    @default false
+    @public
+  */
+  isRejected: false,
+
+  /**
+    Will become `true` if the proxied promise is fulfilled.
+
+    @property isFulfilled
+    @default false
+    @public
+  */
+  isFulfilled: false,
+
+  /**
+    The promise whose fulfillment value is being proxied by this object.
+
+    This property must be specified upon creation, and should not be
+    changed once created.
+
+    Example:
+
+    ```javascript
+    import ObjectProxy from '@ember/object/proxy';
+    import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
+
+    ObjectProxy.extend(PromiseProxyMixin).create({
+      promise: <thenable>
+    });
+    ```
+
+    @property promise
+    @public
+  */
+  promise: computed({
+    get() {
+      throw new EmberError("PromiseProxy's promise must be set");
+    },
+    set(_key, promise: RSVP.Promise<unknown>) {
+      return tap(this, promise);
+    },
+  }),
+
+  /**
+    An alias to the proxied promise's `then`.
+
+    See RSVP.Promise.then.
+
+    @method then
+    @param {Function} callback
+    @return {RSVP.Promise}
+    @public
+  */
+  then: promiseAlias('then'),
+
+  /**
+    An alias to the proxied promise's `catch`.
+
+    See RSVP.Promise.catch.
+
+    @method catch
+    @param {Function} callback
+    @return {RSVP.Promise}
+    @since 1.3.0
+    @public
+  */
+  catch: promiseAlias('catch'),
+
+  /**
+    An alias to the proxied promise's `finally`.
+
+    See RSVP.Promise.finally.
+
+    @method finally
+    @param {Function} callback
+    @return {RSVP.Promise}
+    @since 1.3.0
+    @public
+  */
+  finally: promiseAlias('finally'),
+});
+
+function promiseAlias<T, N extends MethodNamesOf<Promise<T>>>(name: N) {
+  return function (this: PromiseProxyMixin<T>, ...args: Parameters<Promise<T>[N]>) {
+    let promise = get(this, 'promise');
+
+    // We need this cast because `Parameters` is deferred so that it is not
+    // possible for TS to see it will always produce the right type. However,
+    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
+    // issue](https://github.com/microsoft/TypeScript/issues/47615).
+    return (promise[name] as AnyFn)(...args);
+  };
+}
+
+export default PromiseProxyMixin;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 539d1d1ded6..b8d5cfe0fbc 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -36,7 +36,6 @@ import {
   Array as EmberArray,
   MutableEnumerable,
   MutableArray,
-  PromiseProxyMixin,
   typeOf,
   isArray,
   _ProxyMixin,
@@ -83,6 +82,7 @@ import Evented from '@ember/object/evented';
 import Mixin, { mixin } from '@ember/object/mixin';
 import Observable from '@ember/object/observable';
 import ObjectProxy from '@ember/object/proxy';
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
 
 import {

From 71e7f00c3d42839c6a9e2ad06c798f9a357e78e2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 13:29:23 -0700
Subject: [PATCH 1059/1405] Consolidate @ember/routing/route

---
 .../glimmer/lib/components/link-to.ts         |    3 +-
 .../application/debug-render-tree-test.ts     |    2 +-
 .../integration/application/engine-test.js    |    2 +-
 .../integration/application/rendering-test.js |    2 +-
 .../link-to/query-params-angle-test.js        |    2 +-
 .../link-to/query-params-curly-test.js        |    2 +-
 .../link-to/rendering-angle-test.js           |    3 +-
 .../components/link-to/routing-angle-test.js  |    3 +-
 .../components/link-to/routing-curly-test.js  |    3 +-
 .../transitioning-classes-angle-test.js       |    2 +-
 .../transitioning-classes-curly-test.js       |    2 +-
 packages/@ember/-internals/routing/index.ts   |   12 +-
 .../-internals/routing/lib/services/router.ts |    2 +-
 .../routing/lib/services/routing.ts           |    2 +-
 .../-internals/routing/lib/system/route.ts    | 2571 ----------------
 .../-internals/routing/lib/system/router.ts   |    6 +-
 .../routing/lib/system/router_state.ts        |    2 +-
 .../@ember/-internals/routing/lib/utils.ts    |    4 +-
 .../routing/tests/system/route_test.js        |    2 +-
 packages/@ember/application/index.ts          |    2 +-
 .../application/tests/application_test.js     |    3 +-
 .../@ember/application/tests/logging_test.js  |    2 +-
 .../@ember/application/tests/visit_test.js    |    2 +-
 packages/@ember/routing/route.ts              | 2576 ++++++++++++++++-
 packages/ember/index.js                       |    3 +-
 .../ember/tests/application_lifecycle_test.js |    3 +-
 packages/ember/tests/homepage_example_test.js |    2 +-
 .../tests/routing/decoupled_basic_test.js     |    3 +-
 .../ember/tests/routing/model_loading_test.js |    2 +-
 .../ember/tests/routing/query_params_test.js  |    2 +-
 ..._dependent_state_with_query_params_test.js |    2 +-
 .../overlapping_query_params_test.js          |    2 +-
 .../query_param_async_get_handler_test.js     |    2 +-
 .../routing/router_service_test/basic_test.js |    3 +-
 .../build_routeinfo_metadata_test.js          |    2 +-
 .../currenturl_lifecycle_test.js              |    2 +-
 .../router_service_test/events_test.js        |    2 +-
 .../router_service_test/recognize_test.js     |    2 +-
 .../router_service_test/refresh_test.js       |    2 +-
 .../router_service_test/transitionTo_test.js  |    3 +-
 .../router_service_test/urlFor_test.js        |    2 +-
 .../ember/tests/routing/substates_test.js     |    2 +-
 .../tests/routing/template_rendering_test.js  |    2 +-
 43 files changed, 2638 insertions(+), 2617 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/system/route.ts

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 7973fb716c6..bdea14b30d7 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,4 +1,5 @@
-import type { Route, RouterState, RoutingService } from '@ember/-internals/routing';
+import type Route from '@ember/routing/route';
+import type { RouterState, RoutingService } from '@ember/-internals/routing';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { getEngineParent } from '@ember/engine';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index b3ed61ad6dd..b0513a5fe9e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -8,7 +8,7 @@ import {
 import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
 import type { Owner } from '@ember/-internals/owner';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import { assert, captureRenderTree } from '@ember/debug';
 import Engine from '@ember/engine';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
index e321647ffe9..247c9c27674 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js
@@ -7,7 +7,7 @@ import {
 } from 'internal-test-helpers';
 
 import { Component } from '@ember/-internals/glimmer';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { RSVP } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
 import Engine from '@ember/engine';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 2eee0f6cf63..6a93568543b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -2,7 +2,7 @@ import { moduleFor, ApplicationTestCase, strip } from 'internal-test-helpers';
 
 import { ENV } from '@ember/-internals/environment';
 import Controller from '@ember/controller';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { Component } from '@ember/-internals/glimmer';
 import { set, tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
index 47ad96e478f..3f259d307c2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { RSVP } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import {
   ApplicationTestCase,
   classes as classMatcher,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
index 913f600b9b5..b78c4070faf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/query-params-curly-test.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { RSVP } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import {
   ApplicationTestCase,
   classes as classMatcher,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 137c3783bed..b292bb2e740 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -5,7 +5,8 @@ import {
   RouterNonApplicationTestCase,
   runTask,
 } from 'internal-test-helpers';
-import { Router, Route } from '@ember/-internals/routing';
+import { Router } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index f065021e355..f24717066c0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -7,7 +7,8 @@ import {
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
-import { Route, NoneLocation } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import { NoneLocation } from '@ember/-internals/routing';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 9ff56f064f8..6e524b1668c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -7,7 +7,8 @@ import {
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
-import { Route, NoneLocation } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import { NoneLocation } from '@ember/-internals/routing';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
index 53c7f32cf8f..bd96a1b80b1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-angle-test.js
@@ -1,5 +1,5 @@
 import { RSVP } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 function assertHasClass(assert, selector, label) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
index 75d54006ec5..743bb2c5dbf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/transitioning-classes-curly-test.js
@@ -1,5 +1,5 @@
 import { RSVP } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
 
 function assertHasClass(assert, selector, label) {
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index fa41ee0dd94..4ea3ad643dd 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -11,7 +11,6 @@ export {
 export { default as controllerFor } from './lib/system/controller_for';
 export { default as RouterDSL } from './lib/system/dsl';
 export { default as Router, QueryParam } from './lib/system/router';
-export { default as Route } from './lib/system/route';
 export { default as QueryParams } from './lib/system/query_params';
 export { default as RoutingService } from './lib/services/routing';
 export {
@@ -21,4 +20,13 @@ export {
 } from './lib/services/router';
 export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
-export { deprecateTransitionMethods, prefixRouteNameArg, RouteArgs } from './lib/utils';
+export {
+  calculateCacheKey,
+  deprecateTransitionMethods,
+  normalizeControllerQueryParams,
+  prefixRouteNameArg,
+  stashParamNames,
+  ExpandedControllerQueryParam,
+  NamedRouteArgs,
+  RouteArgs,
+} from './lib/utils';
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index af3fe297e25..5a5e0df057a 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -5,7 +5,7 @@ import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
 import type { ModelFor, Transition } from 'router_js';
-import type Route from '../system/route';
+import type Route from '@ember/routing/route';
 import EmberRouter from '../system/router';
 import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
 import type { RouteArgs, RouteOptions } from '../utils';
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index b21d22dd523..2fec4b0813f 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -7,7 +7,7 @@ import { assert } from '@ember/debug';
 import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import type { ModelFor } from 'router_js';
-import type { Route } from '../..';
+import type Route from '@ember/routing/route';
 import EmberRouter from '../system/router';
 import type RouterState from '../system/router_state';
 import { ROUTER } from './router';
diff --git a/packages/@ember/-internals/routing/lib/system/route.ts b/packages/@ember/-internals/routing/lib/system/route.ts
deleted file mode 100644
index 37b51a4e620..00000000000
--- a/packages/@ember/-internals/routing/lib/system/route.ts
+++ /dev/null
@@ -1,2571 +0,0 @@
-import { privatize as P } from '@ember/-internals/container';
-import {
-  addObserver,
-  computed,
-  defineProperty,
-  descriptorForProperty,
-  flushAsyncObservers,
-  get,
-  getProperties,
-  isEmpty,
-  set,
-  setProperties,
-} from '@ember/-internals/metal';
-import type { Owner } from '@ember/-internals/owner';
-import { getOwner } from '@ember/-internals/owner';
-import { BucketCache } from '@ember/-internals/routing';
-import EmberObject from '@ember/object';
-import Evented from '@ember/object/evented';
-import { A as emberA, ActionHandler, typeOf } from '@ember/-internals/runtime';
-import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
-import type { AnyFn } from '@ember/-internals/utils/types';
-import Controller from '@ember/controller';
-import type { ControllerQueryParamType } from '@ember/controller';
-import { assert, info, isTesting } from '@ember/debug';
-import EngineInstance from '@ember/engine/instance';
-import { dependentKeyCompat } from '@ember/object/compat';
-import { once } from '@ember/runloop';
-import { DEBUG } from '@glimmer/env';
-import type { Template, TemplateFactory } from '@glimmer/interfaces';
-import type {
-  InternalRouteInfo,
-  ModelFor,
-  Route as IRoute,
-  Transition,
-  TransitionState,
-} from 'router_js';
-import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
-import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from '../utils';
-import {
-  calculateCacheKey,
-  deprecateTransitionMethods,
-  normalizeControllerQueryParams,
-  prefixRouteNameArg,
-  stashParamNames,
-} from '../utils';
-import generateController from './generate_controller';
-import type { QueryParam } from './router';
-import EmberRouter from './router';
-
-export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRouteInfo<R> {
-  _names?: unknown[];
-}
-
-export type QueryParamMeta = {
-  qps: QueryParam[];
-  map: Record<string, QueryParam>;
-  propertyNames: string[];
-  states: {
-    inactive(prop: string, value: unknown): void;
-    active(prop: string, value: unknown): any;
-    allowOverrides(prop: string, value: unknown): any;
-  };
-};
-
-type RouteTransitionState<R extends Route> = TransitionState<R> & {
-  fullQueryParams?: Record<string, unknown>;
-  queryParamsFor?: Record<string, Record<string, unknown>>;
-};
-
-type MaybeParameters<T> = T extends AnyFn ? Parameters<T> : unknown[];
-type MaybeReturnType<T> = T extends AnyFn ? ReturnType<T> : unknown;
-
-export const ROUTE_CONNECTIONS = new WeakMap();
-const RENDER = Symbol('render');
-
-/**
-@module @ember/routing
-*/
-
-/**
-  The `Route` class is used to define individual routes. Refer to
-  the [routing guide](https://guides.emberjs.com/release/routing/) for documentation.
-
-  @class Route
-  @extends EmberObject
-  @uses ActionHandler
-  @uses Evented
-  @since 1.0.0
-  @public
-*/
-interface Route<T = unknown> extends IRoute<T> {
-  /**
-    The `willTransition` action is fired at the beginning of any
-    attempted transition with a `Transition` object as the sole
-    argument. This action can be used for aborting, redirecting,
-    or decorating the transition from the currently active routes.
-
-    A good example is preventing navigation when a form is
-    half-filled out:
-
-    ```app/routes/contact-form.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ContactFormRoute extends Route {
-      @action
-      willTransition(transition) {
-        if (this.controller.get('userHasEnteredData')) {
-          this.controller.displayNavigationConfirm();
-          transition.abort();
-        }
-      }
-    }
-    ```
-
-    You can also redirect elsewhere by calling
-    `this.transitionTo('elsewhere')` from within `willTransition`.
-    Note that `willTransition` will not be fired for the
-    redirecting `transitionTo`, since `willTransition` doesn't
-    fire when there is already a transition underway. If you want
-    subsequent `willTransition` actions to fire for the redirecting
-    transition, you must first explicitly call
-    `transition.abort()`.
-
-    To allow the `willTransition` event to continue bubbling to the parent
-    route, use `return true;`. When the `willTransition` method has a
-    return value of `true` then the parent route's `willTransition` method
-    will be fired, enabling "bubbling" behavior for the event.
-
-    @event willTransition
-    @param {Transition} transition
-    @since 1.0.0
-    @public
-  */
-  willTransition?(transition: Transition): boolean | void;
-
-  /**
-    The `didTransition` action is fired after a transition has
-    successfully been completed. This occurs after the normal model
-    hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
-    have resolved. The `didTransition` action has no arguments,
-    however, it can be useful for tracking page views or resetting
-    state on the controller.
-
-    ```app/routes/login.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class LoginRoute extends Route {
-      @action
-      didTransition() {
-        this.controller.get('errors.base').clear();
-        return true; // Bubble the didTransition event
-      }
-    }
-    ```
-
-    @event didTransition
-    @since 1.2.0
-    @public
-  */
-  didTransition?(): boolean | void;
-
-  /**
-    The `loading` action is fired on the route when a route's `model`
-    hook returns a promise that is not already resolved. The current
-    `Transition` object is the first parameter and the route that
-    triggered the loading event is the second parameter.
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      loading(transition, route) {
-        let controller = this.controllerFor('foo');
-
-        // The controller may not be instantiated when initially loading
-        if (controller) {
-          controller.currentlyLoading = true;
-
-          transition.finally(function() {
-            controller.currentlyLoading = false;
-          });
-        }
-      }
-    }
-    ```
-
-    @event loading
-    @param {Transition} transition
-    @param {Route} route The route that triggered the loading event
-    @since 1.2.0
-    @public
-  */
-  loading?(transition: Transition, route: Route): boolean | void;
-
-  /**
-    When attempting to transition into a route, any of the hooks
-    may return a promise that rejects, at which point an `error`
-    action will be fired on the partially-entered routes, allowing
-    for per-route error handling logic, or shared error handling
-    logic defined on a parent route.
-
-    Here is an example of an error handler that will be invoked
-    for rejected promises from the various hooks on the route,
-    as well as any unhandled errors from child routes:
-
-    ```app/routes/admin.js
-    import { reject } from 'rsvp';
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class AdminRoute extends Route {
-      beforeModel() {
-        return reject('bad things!');
-      }
-
-      @action
-      error(error, transition) {
-        // Assuming we got here due to the error in `beforeModel`,
-        // we can expect that error === "bad things!",
-        // but a promise model rejecting would also
-        // call this hook, as would any errors encountered
-        // in `afterModel`.
-
-        // The `error` hook is also provided the failed
-        // `transition`, which can be stored and later
-        // `.retry()`d if desired.
-
-        this.transitionTo('login');
-      }
-    }
-    ```
-
-    `error` actions that bubble up all the way to `ApplicationRoute`
-    will fire a default error handler that logs the error. You can
-    specify your own global default error handler by overriding the
-    `error` handler on `ApplicationRoute`:
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      error(error, transition) {
-        this.controllerFor('banner').displayError(error.message);
-      }
-    }
-    ```
-    @event error
-    @param {Error} error
-    @param {Transition} transition
-    @since 1.0.0
-    @public
-  */
-  error?(error: Error, transition: Transition): boolean | void;
-}
-
-class Route<T = unknown>
-  extends EmberObject.extend(ActionHandler, Evented)
-  implements IRoute, Evented
-{
-  static isRouteFactory = true;
-
-  context = {} as T;
-  declare currentModel: T;
-
-  _bucketCache!: BucketCache;
-  _internalName!: string;
-
-  private _names: unknown;
-
-  _router!: EmberRouter;
-  declare _topLevelViewTemplate: any;
-  declare _environment: any;
-
-  constructor(owner: Owner) {
-    super(owner);
-
-    if (owner) {
-      let router = owner.lookup('router:main');
-      let bucketCache = owner.lookup(P`-bucket-cache:main`);
-
-      assert(
-        'ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!',
-        router instanceof EmberRouter && bucketCache instanceof BucketCache
-      );
-
-      this._router = router;
-      this._bucketCache = bucketCache;
-      this._topLevelViewTemplate = owner.lookup('template:-outlet');
-      this._environment = owner.lookup('-environment:main');
-    }
-  }
-
-  // Implement Evented
-  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
-  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
-  declare trigger: (name: string, ...args: any[]) => any;
-  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
-  declare has: (name: string) => boolean;
-
-  /**
-    A hook you can implement to convert the route's model into parameters
-    for the URL.
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('post', { path: '/posts/:post_id' });
-    });
-
-    ```
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class PostRoute extends Route {
-      model({ post_id }) {
-        // the server returns `{ id: 12 }`
-        return fetch(`/posts/${post_id}`;
-      }
-
-      serialize(model) {
-        // this will make the URL `/posts/12`
-        return { post_id: model.id };
-      }
-    }
-    ```
-
-    The default `serialize` method will insert the model's `id` into the
-    route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-    If the route has multiple dynamic segments or does not contain '_id', `serialize`
-    will return `getProperties(model, params)`
-
-    This method is called when `transitionTo` is called with a context
-    in order to populate the URL.
-
-    @method serialize
-    @param {Object} model the routes model
-    @param {Array} params an Array of parameter names for the current
-      route (in the example, `['post_id']`.
-    @return {Object} the serialized parameters
-    @since 1.0.0
-    @public
-  */
-  serialize(model: T | undefined, params: string[]): { [key: string]: unknown } | undefined {
-    if (params.length < 1 || !model) {
-      return;
-    }
-
-    let object: Record<string, unknown> = {};
-    if (params.length === 1) {
-      let [name] = params;
-      assert('has name', name);
-      if (name in model) {
-        object[name] = get(model, name);
-      } else if (/_id$/.test(name)) {
-        object[name] = get(model, 'id');
-      } else if (isProxy(model)) {
-        object[name] = get(model, name);
-      }
-    } else {
-      object = getProperties(model, params);
-    }
-
-    return object;
-  }
-
-  /**
-    Configuration hash for this route's queryParams. The possible
-    configuration options and their defaults are as follows
-    (assuming a query param whose controller property is `page`):
-
-    ```javascript
-    queryParams = {
-      page: {
-        // By default, controller query param properties don't
-        // cause a full transition when they are changed, but
-        // rather only cause the URL to update. Setting
-        // `refreshModel` to true will cause an "in-place"
-        // transition to occur, whereby the model hooks for
-        // this route (and any child routes) will re-fire, allowing
-        // you to reload models (e.g., from the server) using the
-        // updated query param values.
-        refreshModel: false,
-
-        // By default, changes to controller query param properties
-        // cause the URL to update via `pushState`, which means an
-        // item will be added to the browser's history, allowing
-        // you to use the back button to restore the app to the
-        // previous state before the query param property was changed.
-        // Setting `replace` to true will use `replaceState` (or its
-        // hash location equivalent), which causes no browser history
-        // item to be added. This options name and default value are
-        // the same as the `link-to` helper's `replace` option.
-        replace: false,
-
-        // By default, the query param URL key is the same name as
-        // the controller property name. Use `as` to specify a
-        // different URL key.
-        as: 'page'
-      }
-    };
-    ```
-
-    @property queryParams
-    @for Route
-    @type Object
-    @since 1.6.0
-    @public
-  */
-  // Set in reopen so it can be overriden with extend
-  declare queryParams: Record<
-    string,
-    {
-      refreshModel?: boolean;
-      replace?: boolean;
-      as?: string;
-    }
-  >;
-
-  /**
-    The name of the template to use by default when rendering this route's
-    template.
-
-    ```app/routes/posts/list.js
-    import Route from '@ember/routing/route';
-
-    export default class PostsListRoute extends Route {
-      templateName = 'posts/list';
-    }
-    ```
-
-    ```app/routes/posts/index.js
-    import PostsListRoute from '../posts/list';
-
-    export default class PostsIndexRoute extends PostsListRoute {};
-    ```
-
-    ```app/routes/posts/archived.js
-    import PostsListRoute from '../posts/list';
-
-    export default class PostsArchivedRoute extends PostsListRoute {};
-    ```
-
-    @property templateName
-    @type String
-    @default null
-    @since 1.4.0
-    @public
-  */
-  // Set in reopen so it can be overriden with extend
-  declare templateName: string | null;
-
-  /**
-    The name of the controller to associate with this route.
-
-    By default, Ember will lookup a route's controller that matches the name
-    of the route (i.e. `posts.new`). However,
-    if you would like to define a specific controller to use, you can do so
-    using this property.
-
-    This is useful in many ways, as the controller specified will be:
-
-    * passed to the `setupController` method.
-    * used as the controller for the template being rendered by the route.
-    * returned from a call to `controllerFor` for the route.
-
-    @property controllerName
-    @type String
-    @default null
-    @since 1.4.0
-    @public
-  */
-  // Set in reopen so it can be overriden with extend
-  declare controllerName: string | null;
-
-  /**
-    The controller associated with this route.
-
-    Example
-
-    ```app/routes/form.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class FormRoute extends Route {
-      @action
-      willTransition(transition) {
-        if (this.controller.get('userHasEnteredData') &&
-            !confirm('Are you sure you want to abandon progress?')) {
-          transition.abort();
-        } else {
-          // Bubble the `willTransition` action so that
-          // parent routes can decide whether or not to abort.
-          return true;
-        }
-      }
-    }
-    ```
-
-    @property controller
-    @type Controller
-    @since 1.6.0
-    @public
-  */
-  declare controller: Controller;
-
-  /**
-    The name of the route, dot-delimited.
-
-    For example, a route found at `app/routes/posts/post.js` will have
-    a `routeName` of `posts.post`.
-
-    @property routeName
-    @for Route
-    @type String
-    @since 1.0.0
-    @public
-  */
-  declare routeName: string;
-
-  /**
-    The name of the route, dot-delimited, including the engine prefix
-    if applicable.
-
-    For example, a route found at `addon/routes/posts/post.js` within an
-    engine named `admin` will have a `fullRouteName` of `admin.posts.post`.
-
-    @property fullRouteName
-    @for Route
-    @type String
-    @since 2.10.0
-    @public
-  */
-  declare fullRouteName: string;
-
-  /**
-    Sets the name for this route, including a fully resolved name for routes
-    inside engines.
-
-    @private
-    @method _setRouteName
-    @param {String} name
-  */
-  _setRouteName(name: string) {
-    this.routeName = name;
-    let owner = getOwner(this);
-    assert('Expected route to have EngineInstance as owner', owner instanceof EngineInstance);
-    this.fullRouteName = getEngineRouteName(owner, name)!;
-  }
-
-  /**
-    @private
-
-    @method _stashNames
-  */
-  _stashNames(
-    routeInfo: ExtendedInternalRouteInfo<this>,
-    dynamicParent: ExtendedInternalRouteInfo<this>
-  ) {
-    if (this._names) {
-      return;
-    }
-    let names = (this._names = routeInfo['_names'])!;
-
-    if (!names.length) {
-      routeInfo = dynamicParent;
-      names = (routeInfo && routeInfo['_names']) || [];
-    }
-
-    // SAFETY: Since `_qp` is protected we can't infer the type
-    let qps = (get(this, '_qp') as Route<T>['_qp']).qps;
-
-    let namePaths = new Array(names.length);
-    for (let a = 0; a < names.length; ++a) {
-      namePaths[a] = `${routeInfo.name}.${names[a]}`;
-    }
-
-    for (let qp of qps) {
-      if (qp.scope === 'model') {
-        qp.parts = namePaths;
-      }
-    }
-  }
-
-  /**
-    @private
-
-    @property _activeQPChanged
-  */
-  _activeQPChanged(qp: QueryParam, value: unknown) {
-    this._router._activeQPChanged(qp.scopedPropertyName, value);
-  }
-
-  /**
-    @private
-    @method _updatingQPChanged
-  */
-  _updatingQPChanged(qp: QueryParam) {
-    this._router._updatingQPChanged(qp.urlKey);
-  }
-
-  /**
-    Returns a hash containing the parameters of an ancestor route.
-
-    You may notice that `this.paramsFor` sometimes works when referring to a
-    child route, but this behavior should not be relied upon as only ancestor
-    routes are certain to be loaded in time.
-
-    Example
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('member', { path: ':name' }, function() {
-        this.route('interest', { path: ':interest' });
-      });
-    });
-    ```
-
-    ```app/routes/member.js
-    import Route from '@ember/routing/route';
-
-    export default class MemberRoute extends Route {
-      queryParams = {
-        memberQp: { refreshModel: true }
-      }
-    }
-    ```
-
-    ```app/routes/member/interest.js
-    import Route from '@ember/routing/route';
-
-    export default class MemberInterestRoute extends Route {
-      queryParams = {
-        interestQp: { refreshModel: true }
-      }
-
-      model() {
-        return this.paramsFor('member');
-      }
-    }
-    ```
-
-    If we visit `/turing/maths?memberQp=member&interestQp=interest` the model for
-    the `member.interest` route is a hash with:
-
-    * `name`: `turing`
-    * `memberQp`: `member`
-
-    @method paramsFor
-    @param {String} name
-    @return {Object} hash containing the parameters of the route `name`
-    @since 1.4.0
-    @public
-  */
-  paramsFor(name: string): Record<string, unknown> {
-    let owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
-    let route = owner.lookup(`route:${name}`) as Route;
-
-    if (route === undefined) {
-      return {};
-    }
-
-    let transition = this._router._routerMicrolib.activeTransition;
-    let state = transition ? transition[STATE_SYMBOL] : this._router._routerMicrolib.state;
-
-    let fullName = route.fullRouteName;
-    let params = { ...(state!.params[fullName] as Record<string, unknown>) };
-    let queryParams = getQueryParamsFor(route, state!);
-
-    return Object.entries(queryParams).reduce((params, [key, value]) => {
-      assert(
-        `The route '${this.routeName}' has both a dynamic segment and query param with name '${key}'. Please rename one to avoid collisions.`,
-        !params[key]
-      );
-      params[key] = value;
-      return params;
-    }, params);
-  }
-
-  /**
-    Serializes the query parameter key
-
-    @method serializeQueryParamKey
-    @param {String} controllerPropertyName
-    @private
-  */
-  serializeQueryParamKey(controllerPropertyName: string) {
-    return controllerPropertyName;
-  }
-
-  /**
-    Serializes value of the query parameter based on defaultValueType
-
-    @method serializeQueryParam
-    @param {Object} value
-    @param {String} urlKey
-    @param {String} defaultValueType
-    @private
-  */
-  serializeQueryParam(value: unknown, _urlKey: string, defaultValueType: string) {
-    // urlKey isn't used here, but anyone overriding
-    // can use it to provide serialization specific
-    // to a certain query param.
-    return this._router._serializeQueryParam(value, defaultValueType);
-  }
-
-  /**
-    Deserializes value of the query parameter based on defaultValueType
-
-    @method deserializeQueryParam
-    @param {Object} value
-    @param {String} urlKey
-    @param {String} defaultValueType
-    @private
-  */
-  deserializeQueryParam(value: unknown, _urlKey: string, defaultValueType: string) {
-    // urlKey isn't used here, but anyone overriding
-    // can use it to provide deserialization specific
-    // to a certain query param.
-    return this._router._deserializeQueryParam(value, defaultValueType);
-  }
-
-  /**
-    @private
-
-    @property _optionsForQueryParam
-  */
-  _optionsForQueryParam(qp: QueryParam): {} {
-    const queryParams = get(this, 'queryParams');
-    return (
-      get(queryParams, qp.urlKey) ||
-      get(queryParams, qp.prop) ||
-      queryParams[qp.urlKey] ||
-      queryParams[qp.prop] ||
-      {}
-    );
-  }
-
-  /**
-    A hook you can use to reset controller values either when the model
-    changes or the route is exiting.
-
-    ```app/routes/articles.js
-    import Route from '@ember/routing/route';
-
-    export default class ArticlesRoute extends Route {
-      resetController(controller, isExiting, transition) {
-        if (isExiting && transition.targetName !== 'error') {
-          controller.set('page', 1);
-        }
-      }
-    }
-    ```
-
-    @method resetController
-    @param {Controller} controller instance
-    @param {Boolean} isExiting
-    @param {Object} transition
-    @since 1.7.0
-    @public
-  */
-  resetController(_controller: Controller, _isExiting: boolean, _transition: Transition) {
-    return this;
-  }
-
-  /**
-    @private
-
-    @method exit
-  */
-  exit(transition?: Transition) {
-    this.deactivate(transition);
-    this.trigger('deactivate', transition);
-    this.teardownViews();
-  }
-
-  /**
-    @private
-
-    @method _internalReset
-    @since 3.6.0
-  */
-  _internalReset(isExiting: boolean, transition: Transition) {
-    let controller = this.controller;
-    // SAFETY: Since `_qp` is protected we can't infer the type
-    controller['_qpDelegate'] = (get(this, '_qp') as Route<T>['_qp']).states.inactive;
-
-    this.resetController(controller, isExiting, transition);
-  }
-
-  /**
-    @private
-
-    @method enter
-  */
-  enter(transition: Transition) {
-    ROUTE_CONNECTIONS.set(this, []);
-    this.activate(transition);
-    this.trigger('activate', transition);
-  }
-
-  /**
-    This event is triggered when the router enters the route. It is
-    not executed when the model for the route changes.
-
-    ```app/routes/application.js
-    import { on } from '@ember/object/evented';
-    import Route from '@ember/routing/route';
-
-    export default Route.extend({
-      collectAnalytics: on('activate', function(){
-        collectAnalytics();
-      })
-    });
-    ```
-
-    @event activate
-    @since 1.9.0
-    @public
-  */
-
-  /**
-    This event is triggered when the router completely exits this
-    route. It is not executed when the model for the route changes.
-
-    ```app/routes/index.js
-    import { on } from '@ember/object/evented';
-    import Route from '@ember/routing/route';
-
-    export default Route.extend({
-      trackPageLeaveAnalytics: on('deactivate', function(){
-        trackPageLeaveAnalytics();
-      })
-    });
-    ```
-
-    @event deactivate
-    @since 1.9.0
-    @public
-  */
-
-  /**
-    This hook is executed when the router completely exits this route. It is
-    not executed when the model for the route changes.
-
-    @method deactivate
-    @param {Transition} transition
-    @since 1.0.0
-    @public
-  */
-  deactivate(_transition?: Transition) {}
-
-  /**
-    This hook is executed when the router enters the route. It is not executed
-    when the model for the route changes.
-
-    @method activate
-    @param {Transition} transition
-    @since 1.0.0
-    @public
-  */
-  activate(_transition: Transition) {}
-
-  /**
-    Transition the application into another route. The route may
-    be either a single route or route path:
-
-    ```javascript
-    this.transitionTo('blogPosts');
-    this.transitionTo('blogPosts.recentEntries');
-    ```
-
-    Optionally supply a model for the route in question. The model
-    will be serialized into the URL using the `serialize` hook of
-    the route:
-
-    ```javascript
-    this.transitionTo('blogPost', aPost);
-    ```
-
-    If a literal is passed (such as a number or a string), it will
-    be treated as an identifier instead. In this case, the `model`
-    hook of the route will be triggered:
-
-    ```javascript
-    this.transitionTo('blogPost', 1);
-    ```
-
-    Multiple models will be applied last to first recursively up the
-    route tree.
-
-    ```app/routes.js
-    // ...
-
-    Router.map(function() {
-      this.route('blogPost', { path:':blogPostId' }, function() {
-        this.route('blogComment', { path: ':blogCommentId' });
-      });
-    });
-
-    export default Router;
-    ```
-
-    ```javascript
-    this.transitionTo('blogComment', aPost, aComment);
-    this.transitionTo('blogComment', 1, 13);
-    ```
-
-    It is also possible to pass a URL (a string that starts with a
-    `/`).
-
-    ```javascript
-    this.transitionTo('/');
-    this.transitionTo('/blog/post/1/comment/13');
-    this.transitionTo('/blog/posts?sort=title');
-    ```
-
-    An options hash with a `queryParams` property may be provided as
-    the final argument to add query parameters to the destination URL.
-
-    ```javascript
-    this.transitionTo('blogPost', 1, {
-      queryParams: { showComments: 'true' }
-    });
-
-    // if you just want to transition the query parameters without changing the route
-    this.transitionTo({ queryParams: { sort: 'date' } });
-    ```
-
-    See also [replaceWith](#method_replaceWith).
-
-    Simple Transition Example
-
-    ```app/routes.js
-    // ...
-
-    Router.map(function() {
-      this.route('index');
-      this.route('secret');
-      this.route('fourOhFour', { path: '*:' });
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/index.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class IndexRoute extends Route {
-      @action
-      moveToSecret(context) {
-        if (authorized()) {
-          this.transitionTo('secret', context);
-        } else {
-          this.transitionTo('fourOhFour');
-        }
-      }
-    }
-    ```
-
-    Transition to a nested route
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('articles', { path: '/articles' }, function() {
-        this.route('new');
-      });
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/index.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class IndexRoute extends Route {
-      @action
-      transitionToNewArticle() {
-        this.transitionTo('articles.new');
-      }
-    }
-    ```
-
-    Multiple Models Example
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('index');
-
-      this.route('breakfast', { path: ':breakfastId' }, function() {
-        this.route('cereal', { path: ':cerealId' });
-      });
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/index.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class IndexRoute extends Route {
-      @action
-      moveToChocolateCereal() {
-        let cereal = { cerealId: 'ChocolateYumminess' };
-        let breakfast = { breakfastId: 'CerealAndMilk' };
-
-        this.transitionTo('breakfast.cereal', breakfast, cereal);
-      }
-    }
-    ```
-
-    Nested Route with Query String Example
-
-    ```app/routes.js
-    // ...
-
-    Router.map(function() {
-      this.route('fruits', function() {
-        this.route('apples');
-      });
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/index.js
-    import Route from '@ember/routing/route';
-
-    export default class IndexRoute extends Route {
-      @action
-      transitionToApples() {
-        this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
-      }
-    }
-    ```
-
-    @method transitionTo
-    @param {String} [name] the name of the route or a URL.
-    @param {...Object} [models] the model(s) or identifier(s) to be used while
-      transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-      containing a mapping of query parameters. May be supplied as the only
-      parameter to trigger a query-parameter-only transition.
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @since 1.0.0
-    @deprecated Use transitionTo from the Router service instead.
-    @public
-  */
-  transitionTo(...args: RouteArgs<this>): Transition {
-    deprecateTransitionMethods('route', 'transitionTo');
-    return this._router.transitionTo(...prefixRouteNameArg(this, args));
-  }
-
-  /**
-    Perform a synchronous transition into another route without attempting
-    to resolve promises, update the URL, or abort any currently active
-    asynchronous transitions (i.e. regular transitions caused by
-    `transitionTo` or URL changes).
-
-    This method is handy for performing intermediate transitions on the
-    way to a final destination route, and is called internally by the
-    default implementations of the `error` and `loading` handlers.
-
-    @method intermediateTransitionTo
-    @param {String} name the name of the route
-    @param {...Object} models the model(s) to be used while transitioning
-    to the route.
-    @since 1.2.0
-    @public
-   */
-  intermediateTransitionTo(...args: NamedRouteArgs<this>): void {
-    let [name, ...preparedArgs] = prefixRouteNameArg(this, args);
-    this._router.intermediateTransitionTo(name, ...preparedArgs);
-  }
-
-  /**
-    Refresh the model on this route and any child routes, firing the
-    `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-    to how routes are entered when transitioning in from other route.
-    The current route params (e.g. `article_id`) will be passed in
-    to the respective model hooks, and if a different model is returned,
-    `setupController` and associated route hooks will re-fire as well.
-
-    An example usage of this method is re-querying the server for the
-    latest information using the same parameters as when the route
-    was first entered.
-
-    Note that this will cause `model` hooks to fire even on routes
-    that were provided a model object when the route was initially
-    entered.
-
-    @method refresh
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @since 1.4.0
-    @public
-   */
-  refresh(): Transition {
-    return this._router._routerMicrolib.refresh(this);
-  }
-
-  /**
-    Transition into another route while replacing the current URL, if possible.
-    This will replace the current history entry instead of adding a new one.
-    Beside that, it is identical to `transitionTo` in all other respects. See
-    'transitionTo' for additional information regarding multiple models.
-
-    Example
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('index');
-      this.route('secret');
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/secret.js
-    import Route from '@ember/routing/route';
-
-    export default class SecretRoute Route {
-      afterModel() {
-        if (!authorized()){
-          this.replaceWith('index');
-        }
-      }
-    }
-    ```
-
-    @method replaceWith
-    @param {String} name the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used while
-      transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-      containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @since 1.0.0
-    @deprecated Use replaceWith from the Router service instead.
-    @public
-  */
-  replaceWith(...args: any[]): Transition {
-    deprecateTransitionMethods('route', 'replaceWith');
-    return this._router.replaceWith(...prefixRouteNameArg(this, args));
-  }
-
-  /**
-    This hook is the entry point for router.js
-
-    @private
-    @method setup
-  */
-  setup(context: T | undefined, transition: Transition) {
-    let controllerName = this.controllerName || this.routeName;
-    let definedController = this.controllerFor(controllerName, true);
-    let controller = definedController ?? this.generateController(controllerName);
-
-    // SAFETY: Since `_qp` is protected we can't infer the type
-    let queryParams = get(this, '_qp') as Route<T>['_qp'];
-
-    // Assign the route's controller so that it can more easily be
-    // referenced in action handlers. Side effects. Side effects everywhere.
-    if (!this.controller) {
-      let propNames = queryParams.propertyNames;
-      addQueryParamsObservers(controller, propNames);
-      this.controller = controller;
-    }
-
-    let states = queryParams.states;
-
-    controller._qpDelegate = states.allowOverrides;
-
-    if (transition) {
-      // Update the model dep values used to calculate cache keys.
-      stashParamNames(this._router, transition[STATE_SYMBOL]!.routeInfos);
-
-      let cache = this._bucketCache;
-      let params = transition[PARAMS_SYMBOL];
-      let allParams = queryParams.propertyNames;
-
-      allParams.forEach((prop: string) => {
-        let aQp = queryParams.map[prop];
-        assert('expected aQp', aQp);
-        aQp.values = params;
-
-        let cacheKey = calculateCacheKey(aQp.route.fullRouteName, aQp.parts, aQp.values);
-        let value = cache.lookup(cacheKey, prop, aQp.undecoratedDefaultValue);
-        set(controller, prop, value);
-      });
-
-      let qpValues = getQueryParamsFor(this, transition[STATE_SYMBOL]!);
-      setProperties(controller, qpValues);
-    }
-
-    this.setupController(controller, context, transition);
-
-    if (this._environment.options.shouldRender) {
-      this[RENDER]();
-    }
-
-    // Setup can cause changes to QPs which need to be propogated immediately in
-    // some situations. Eventually, we should work on making these async somehow.
-    flushAsyncObservers(false);
-  }
-
-  /*
-    Called when a query parameter for this route changes, regardless of whether the route
-    is currently part of the active route hierarchy. This will update the query parameter's
-    value in the cache so if this route becomes active, the cache value has been updated.
-  */
-  _qpChanged(prop: string, value: unknown, qp: QueryParam) {
-    if (!qp) {
-      return;
-    }
-
-    // Update model-dep cache
-    let cache = this._bucketCache;
-    let cacheKey = calculateCacheKey(qp.route.fullRouteName, qp.parts, qp.values);
-    cache.stash(cacheKey, prop, value);
-  }
-
-  /**
-    This hook is the first of the route entry validation hooks
-    called when an attempt is made to transition into a route
-    or one of its children. It is called before `model` and
-    `afterModel`, and is appropriate for cases when:
-
-    1) A decision can be made to redirect elsewhere without
-       needing to resolve the model first.
-    2) Any async operations need to occur first before the
-       model is attempted to be resolved.
-
-    This hook is provided the current `transition` attempt
-    as a parameter, which can be used to `.abort()` the transition,
-    save it for a later `.retry()`, or retrieve values set
-    on it from a previous hook. You can also just call
-    `this.transitionTo` to another route to implicitly
-    abort the `transition`.
-
-    You can return a promise from this hook to pause the
-    transition until the promise resolves (or rejects). This could
-    be useful, for instance, for retrieving async code from
-    the server that is required to enter a route.
-
-    @method beforeModel
-    @param {Transition} transition
-    @return {any | Promise<any>} if the value returned from this hook is
-      a promise, the transition will pause until the transition
-      resolves. Otherwise, non-promise return values are not
-      utilized in any way.
-    @since 1.0.0
-    @public
-  */
-  beforeModel(_transition: Transition): unknown | Promise<unknown>;
-  beforeModel(_transition: Transition): void {}
-
-  /**
-    This hook is called after this route's model has resolved.
-    It follows identical async/promise semantics to `beforeModel`
-    but is provided the route's resolved model in addition to
-    the `transition`, and is therefore suited to performing
-    logic that can only take place after the model has already
-    resolved.
-
-    ```app/routes/posts.js
-    import Route from '@ember/routing/route';
-
-    export default class PostsRoute extends Route {
-      afterModel(posts, transition) {
-        if (posts.get('length') === 1) {
-          this.transitionTo('post.show', posts.get('firstObject'));
-        }
-      }
-    }
-    ```
-
-    Refer to documentation for `beforeModel` for a description
-    of transition-pausing semantics when a promise is returned
-    from this hook.
-
-    @method afterModel
-    @param {Object} resolvedModel the value returned from `model`,
-      or its resolved value if it was a promise
-    @param {Transition} transition
-    @return {any | Promise<any>} if the value returned from this hook is
-      a promise, the transition will pause until the transition
-      resolves. Otherwise, non-promise return values are not
-      utilized in any way.
-    @since 1.0.0
-    @public
-   */
-  afterModel(_resolvedModel: T | undefined, _transition: Transition): unknown | Promise<unknown>;
-  afterModel(_resolvedModel: T | undefined, _transition: Transition): void {}
-
-  /**
-    A hook you can implement to optionally redirect to another route.
-
-    Calling `this.transitionTo` from inside of the `redirect` hook will
-    abort the current transition (into the route that has implemented `redirect`).
-
-    `redirect` and `afterModel` behave very similarly and are
-    called almost at the same time, but they have an important
-    distinction when calling `this.transitionTo` to a child route
-    of the current route. From `afterModel`, this new transition
-    invalidates the current transition, causing `beforeModel`,
-    `model`, and `afterModel` hooks to be called again. But the
-    same transition started from `redirect` does _not_ invalidate
-    the current transition. In other words, by the time the `redirect`
-    hook has been called, both the resolved model and the attempted
-    entry into this route are considered fully validated.
-
-    @method redirect
-    @param {Object} model the model for this route
-    @param {Transition} transition the transition object associated with the current transition
-    @since 1.0.0
-    @public
-  */
-  redirect(_model: T, _transition: Transition) {}
-
-  /**
-    Called when the context is changed by router.js.
-
-    @private
-    @method contextDidChange
-  */
-  contextDidChange() {
-    this.currentModel = this.context;
-  }
-
-  /**
-    A hook you can implement to convert the URL into the model for
-    this route.
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('post', { path: '/posts/:post_id' });
-    });
-
-    export default Router;
-    ```
-
-    The model for the `post` route is `store.findRecord('post', params.post_id)`.
-
-    By default, if your route has a dynamic segment ending in `_id`:
-
-    * The model class is determined from the segment (`post_id`'s
-      class is `App.Post`)
-    * The find method is called on the model class with the value of
-      the dynamic segment.
-
-    Note that for routes with dynamic segments, this hook is not always
-    executed. If the route is entered through a transition (e.g. when
-    using the `link-to` Handlebars helper or the `transitionTo` method
-    of routes), and a model context is already provided this hook
-    is not called.
-
-    A model context does not include a primitive string or number,
-    which does cause the model hook to be called.
-
-    Routes without dynamic segments will always execute the model hook.
-
-    ```javascript
-    // no dynamic segment, model hook always called
-    this.transitionTo('posts');
-
-    // model passed in, so model hook not called
-    thePost = store.findRecord('post', 1);
-    this.transitionTo('post', thePost);
-
-    // integer passed in, model hook is called
-    this.transitionTo('post', 1);
-
-    // model id passed in, model hook is called
-    // useful for forcing the hook to execute
-    thePost = store.findRecord('post', 1);
-    this.transitionTo('post', thePost.id);
-    ```
-
-    This hook follows the asynchronous/promise semantics
-    described in the documentation for `beforeModel`. In particular,
-    if a promise returned from `model` fails, the error will be
-    handled by the `error` hook on `Route`.
-
-    Example
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class PostRoute extends Route {
-      model(params) {
-        return this.store.findRecord('post', params.post_id);
-      }
-    }
-    ```
-
-    @method model
-    @param {Object} params the parameters extracted from the URL
-    @param {Transition} transition
-    @return {any | Promise<any>} the model for this route. If
-      a promise is returned, the transition will pause until
-      the promise resolves, and the resolved value of the promise
-      will be used as the model for this route.
-    @since 1.0.0
-    @public
-  */
-  model(params: Record<string, unknown>, transition: Transition): T | PromiseLike<T> | undefined {
-    let name, sawParams, value;
-    // SAFETY: Since `_qp` is protected we can't infer the type
-    let queryParams = (get(this, '_qp') as Route<T>['_qp']).map;
-
-    for (let prop in params) {
-      if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
-        continue;
-      }
-
-      let match = prop.match(/^(.*)_id$/);
-      if (match !== null) {
-        name = match[1];
-        value = params[prop];
-      }
-      sawParams = true;
-    }
-
-    if (!name) {
-      if (sawParams) {
-        // SAFETY: This should be equivalent
-        return Object.assign({}, params) as T;
-      } else {
-        if (transition.resolveIndex < 1) {
-          return;
-        }
-        // SAFETY: This should be correct, but TS is unable to infer this.
-        return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1]!.context as
-          | T
-          | PromiseLike<T>
-          | undefined;
-      }
-    }
-
-    return this.findModel(name, value);
-  }
-
-  /**
-    @private
-    @method deserialize
-    @param {Object} params the parameters extracted from the URL
-    @param {Transition} transition
-    @return {any | Promise<any>} the model for this route.
-
-    Router.js hook.
-   */
-  deserialize(_params: {}, transition: Transition) {
-    return this.model(this._paramsFor(this.routeName, _params), transition);
-  }
-
-  /**
-
-    @method findModel
-    @param {String} type the model type
-    @param {Object} value the value passed to find
-    @private
-  */
-  findModel(...args: any[]) {
-    return (get(this, 'store') as any).find(...args);
-  }
-
-  /**
-    A hook you can use to setup the controller for the current route.
-
-    This method is called with the controller for the current route and the
-    model supplied by the `model` hook.
-
-    By default, the `setupController` hook sets the `model` property of
-    the controller to the specified `model` when it is not `undefined`.
-
-    If you implement the `setupController` hook in your Route, it will
-    prevent this default behavior. If you want to preserve that behavior
-    when implementing your `setupController` function, make sure to call
-    `super`:
-
-    ```app/routes/photos.js
-    import Route from '@ember/routing/route';
-
-    export default class PhotosRoute extends Route {
-      model() {
-        return this.store.findAll('photo');
-      }
-
-      setupController(controller, model) {
-        super.setupController(controller, model);
-
-        this.controllerFor('application').set('showingPhotos', true);
-      }
-    }
-    ```
-
-    The provided controller will be one resolved based on the name
-    of this route.
-
-    If no explicit controller is defined, Ember will automatically create one.
-
-    As an example, consider the router:
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('post', { path: '/posts/:post_id' });
-    });
-
-    export default Router;
-    ```
-
-    If you have defined a file for the post controller,
-    the framework will use it.
-    If it is not defined, a basic `Controller` instance would be used.
-
-    @example Behavior of a basic Controller
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class PostRoute extends Route {
-      setupController(controller, model) {
-        controller.set('model', model);
-      }
-    });
-    ```
-
-    @method setupController
-    @param {Controller} controller instance
-    @param {Object} model
-    @param {Transition} [transition]
-    @since 1.0.0
-    @public
-  */
-  setupController(controller: Controller, context: T | undefined, _transition?: Transition) {
-    if (controller && context !== undefined) {
-      set(controller, 'model', context);
-    }
-  }
-
-  /**
-    Returns the controller of the current route, or a parent (or any ancestor)
-    route in a route hierarchy.
-
-    The controller instance must already have been created, either through entering the
-    associated route or using `generateController`.
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class PostRoute extends Route {
-      setupController(controller, post) {
-        super.setupController(controller, post);
-
-        this.controllerFor('posts').set('currentPost', post);
-      }
-    }
-    ```
-
-    @method controllerFor
-    @param {String} name the name of the route or controller
-    @return {Controller | undefined}
-    @since 1.0.0
-    @public
-  */
-  controllerFor(name: string, _skipAssert: true): Controller | undefined;
-  controllerFor(name: string, _skipAssert?: false): Controller;
-  controllerFor(name: string, _skipAssert = false): Controller | undefined {
-    let owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
-    let route = owner.lookup(`route:${name}`) as Route;
-
-    if (route && route.controllerName) {
-      name = route.controllerName;
-    }
-
-    let controller = owner.lookup(`controller:${name}`);
-
-    // NOTE: We're specifically checking that skipAssert is true, because according
-    //   to the old API the second parameter was model. We do not want people who
-    //   passed a model to skip the assertion.
-    assert(
-      `The controller named '${name}' could not be found. Make sure that this route exists and has already been entered at least once. If you are accessing a controller not associated with a route, make sure the controller class is explicitly defined.`,
-      controller !== undefined || _skipAssert === true
-    );
-
-    assert(
-      `Expected controller:${name} to be an instance of Controller`,
-      controller === undefined || controller instanceof Controller
-    );
-
-    return controller;
-  }
-
-  /**
-    Generates a controller for a route.
-
-    Example
-
-    ```app/routes/post.js
-    import Route from '@ember/routing/route';
-
-    export default class Post extends Route {
-      setupController(controller, post) {
-        super.setupController(controller, post);
-
-        this.generateController('posts');
-      }
-    }
-    ```
-
-    @method generateController
-    @param {String} name the name of the controller
-    @private
-  */
-  generateController(name: string) {
-    let owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
-
-    return generateController(owner, name);
-  }
-
-  /**
-    Returns the resolved model of a parent (or any ancestor) route
-    in a route hierarchy.  During a transition, all routes
-    must resolve a model object, and if a route
-    needs access to a parent route's model in order to
-    resolve a model (or just reuse the model from a parent),
-    it can call `this.modelFor(theNameOfParentRoute)` to
-    retrieve it. If the ancestor route's model was a promise,
-    its resolved result is returned.
-
-    Example
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('post', { path: '/posts/:post_id' }, function() {
-        this.route('comments');
-      });
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/post/comments.js
-    import Route from '@ember/routing/route';
-
-    export default class PostCommentsRoute extends Route {
-      model() {
-        let post = this.modelFor('post');
-
-        return post.comments;
-      }
-    }
-    ```
-
-    @method modelFor
-    @param {String} name the name of the route
-    @return {Object} the model object
-    @since 1.0.0
-    @public
-  */
-  modelFor(_name: string): unknown | undefined {
-    let name;
-    let owner = getOwner(this);
-    assert('Expected router owner to be an EngineInstance', owner instanceof EngineInstance);
-    let transition =
-      this._router && this._router._routerMicrolib
-        ? this._router._routerMicrolib.activeTransition
-        : undefined;
-
-    // Only change the route name when there is an active transition.
-    // Otherwise, use the passed in route name.
-    if (owner.routable && transition !== undefined) {
-      name = getEngineRouteName(owner, _name);
-    } else {
-      name = _name;
-    }
-
-    let route = owner.lookup(`route:${name}`) as Route;
-    // If we are mid-transition, we want to try and look up
-    // resolved parent contexts on the current transitionEvent.
-    if (transition !== undefined && transition !== null) {
-      let modelLookupName = (route && route.routeName) || name;
-      if (Object.prototype.hasOwnProperty.call(transition.resolvedModels, modelLookupName!)) {
-        return transition.resolvedModels[modelLookupName!];
-      }
-    }
-
-    return route?.currentModel;
-  }
-
-  /**
-    `this[RENDER]` is used to render a template into a region of another template
-    (indicated by an `{{outlet}}`).
-
-    @method this[RENDER]
-    @param {String} name the name of the template to render
-    @param {Object} [options] the options
-    @param {String} [options.into] the template to render into,
-                    referenced by name. Defaults to the parent template
-    @param {String} [options.outlet] the outlet inside `options.into` to render into.
-                    Defaults to 'main'
-    @param {String|Object} [options.controller] the controller to use for this template,
-                    referenced by name or as a controller instance. Defaults to the Route's paired controller
-    @param {Object} [options.model] the model object to set on `options.controller`.
-                    Defaults to the return value of the Route's model hook
-    @private
-   */
-  [RENDER](name?: string, options?: PartialRenderOptions) {
-    let renderOptions = buildRenderOptions(this, name, options);
-    ROUTE_CONNECTIONS.get(this).push(renderOptions);
-    once(this._router, '_setOutlets');
-  }
-
-  willDestroy() {
-    this.teardownViews();
-  }
-
-  /**
-    @private
-
-    @method teardownViews
-  */
-  teardownViews() {
-    let connections = ROUTE_CONNECTIONS.get(this);
-    if (connections !== undefined && connections.length > 0) {
-      ROUTE_CONNECTIONS.set(this, []);
-      once(this._router, '_setOutlets');
-    }
-  }
-
-  /**
-    Allows you to produce custom metadata for the route.
-    The return value of this method will be attached to
-    its corresponding RouteInfoWithAttributes object.
-
-    Example
-
-    ```app/routes/posts/index.js
-    import Route from '@ember/routing/route';
-
-    export default class PostsIndexRoute extends Route {
-      buildRouteInfoMetadata() {
-        return { title: 'Posts Page' }
-      }
-    }
-    ```
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { service } from '@ember/service';
-
-    export default class ApplicationRoute extends Route {
-      @service router
-
-      constructor() {
-        super(...arguments);
-
-        this.router.on('routeDidChange', transition => {
-          document.title = transition.to.metadata.title;
-          // would update document's title to "Posts Page"
-        });
-      }
-    }
-    ```
-    @method buildRouteInfoMetadata
-    @return any
-    @since 3.10.0
-    @public
-   */
-  buildRouteInfoMetadata(): unknown;
-  buildRouteInfoMetadata(): void {}
-
-  private _paramsFor(routeName: string, params: {}) {
-    let transition = this._router._routerMicrolib.activeTransition;
-    if (transition !== undefined) {
-      return this.paramsFor(routeName);
-    }
-
-    return params;
-  }
-
-  /**
-    Store property provides a hook for data persistence libraries to inject themselves.
-
-    By default, this store property provides the exact same functionality previously
-    in the model hook.
-
-    Currently, the required interface is:
-
-    `store.find(modelName, findArguments)`
-
-    @property store
-    @type {Object}
-    @private
-  */
-  @computed
-  protected get store() {
-    const owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
-    let routeName = this.routeName;
-
-    return {
-      find(name: string, value: unknown) {
-        let modelClass: any = owner.factoryFor(`model:${name}`);
-
-        assert(
-          `You used the dynamic segment \`${name}_id\` in your route ` +
-            `\`${routeName}\` for which Ember requires you provide a ` +
-            `data-loading implementation. Commonly, that is done by ` +
-            `adding a model hook implementation on the route ` +
-            `(\`model({${name}_id}) {\`) or by injecting an implemention of ` +
-            `a data store: \`@service store;\`.`,
-          Boolean(modelClass)
-        );
-
-        if (!modelClass) {
-          return;
-        }
-
-        modelClass = modelClass.class;
-
-        assert(
-          `You used the dynamic segment \`${name}_id\` in your route ` +
-            `\`${routeName}\` for which Ember requires you provide a ` +
-            `data-loading implementation. Commonly, that is done by ` +
-            `adding a model hook implementation on the route ` +
-            `(\`model({${name}_id}) {\`) or by injecting an implemention of ` +
-            `a data store: \`@service store;\`.\n\n` +
-            `Rarely, applications may attempt to use a legacy behavior where ` +
-            `the model class (in this case \`${name}\`) is resolved and the ` +
-            `\`find\` method on that class is invoked to load data. In this ` +
-            `application, a model of \`${name}\` was found but it did not ` +
-            `provide a \`find\` method. You should not add a \`find\` ` +
-            `method to your model. Instead, please implement an appropriate ` +
-            `\`model\` hook on the \`${routeName}\` route.`,
-          typeof modelClass.find === 'function'
-        );
-
-        return modelClass.find(value);
-      },
-    };
-  }
-
-  protected set store(value: any) {
-    defineProperty(this, 'store', null, value);
-  }
-
-  /**
-    @private
-    @property _qp
-    */
-  @computed
-  protected get _qp(): QueryParamMeta {
-    let combinedQueryParameterConfiguration: ReturnType<typeof mergeEachQueryParams> = {};
-
-    let controllerName = this.controllerName || this.routeName;
-    let owner = getOwner(this);
-    assert('Route is unexpectedly missing an owner', owner);
-    let controller = owner.lookup(`controller:${controllerName}`);
-    let queryParameterConfiguraton = get(this, 'queryParams');
-    let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
-
-    if (controller) {
-      assert('Expected an instance of controller', controller instanceof Controller);
-
-      // the developer has authored a controller class in their application for
-      // this route find its query params and normalize their object shape them
-      // merge in the query params for the route. As a mergedProperty,
-      // Route#queryParams is always at least `{}`
-
-      let controllerDefinedQueryParameterConfiguration =
-        (get(controller, 'queryParams') as Controller['queryParams']) || [];
-      let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
-        controllerDefinedQueryParameterConfiguration
-      );
-      combinedQueryParameterConfiguration = mergeEachQueryParams(
-        normalizedControllerQueryParameterConfiguration,
-        queryParameterConfiguraton
-      );
-    } else if (hasRouterDefinedQueryParams) {
-      // the developer has not defined a controller but *has* supplied route query params.
-      // Generate a class for them so we can later insert default values
-      controller = generateController(owner, controllerName);
-      combinedQueryParameterConfiguration = queryParameterConfiguraton;
-    }
-
-    let qps: QueryParam[] = [];
-    let map: Record<string, QueryParam> = {};
-    let propertyNames: string[] = [];
-
-    for (let propName in combinedQueryParameterConfiguration) {
-      if (!Object.prototype.hasOwnProperty.call(combinedQueryParameterConfiguration, propName)) {
-        continue;
-      }
-
-      // to support the dubious feature of using unknownProperty
-      // on queryParams configuration
-      if (propName === 'unknownProperty' || propName === '_super') {
-        // possible todo: issue deprecation warning?
-        continue;
-      }
-
-      let desc = combinedQueryParameterConfiguration[propName];
-      assert(`[BUG] missing query parameter configuration for ${propName}`, desc);
-
-      let scope = desc.scope || 'model';
-      let parts: string[] | undefined = undefined;
-
-      if (scope === 'controller') {
-        parts = [];
-      }
-
-      let urlKey = desc.as || this.serializeQueryParamKey(propName);
-      let defaultValue = get(controller!, propName);
-
-      defaultValue = copyDefaultValue(defaultValue);
-
-      let type = desc.type || typeOf(defaultValue);
-
-      let defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
-      let scopedPropertyName = `${controllerName}:${propName}`;
-      let qp: QueryParam = {
-        undecoratedDefaultValue: get(controller!, propName),
-        defaultValue,
-        serializedDefaultValue: defaultValueSerialized,
-        serializedValue: defaultValueSerialized,
-
-        type,
-        urlKey,
-        prop: propName,
-        scopedPropertyName,
-        controllerName,
-        route: this,
-        parts, // provided later when stashNames is called if 'model' scope
-        values: null, // provided later when setup is called. no idea why.
-        scope,
-      };
-
-      map[propName] = map[urlKey] = map[scopedPropertyName] = qp;
-      qps.push(qp);
-      propertyNames.push(propName);
-    }
-
-    return {
-      qps,
-      map,
-      propertyNames,
-      states: {
-        /*
-          Called when a query parameter changes in the URL, this route cares
-          about that query parameter, but the route is not currently
-          in the active route hierarchy.
-        */
-        inactive: (prop: string, value: unknown) => {
-          let qp = map[prop];
-          assert('expected inactive callback to only be called for registered qps', qp);
-          this._qpChanged(prop, value, qp);
-        },
-        /*
-          Called when a query parameter changes in the URL, this route cares
-          about that query parameter, and the route is currently
-          in the active route hierarchy.
-        */
-        active: (prop: string, value: unknown) => {
-          let qp = map[prop];
-          assert('expected active callback to only be called for registered qps', qp);
-          this._qpChanged(prop, value, qp);
-          return this._activeQPChanged(qp, value);
-        },
-        /*
-          Called when a value of a query parameter this route handles changes in a controller
-          and the route is currently in the active route hierarchy.
-        */
-        allowOverrides: (prop: string, value: unknown) => {
-          let qp = map[prop];
-          assert('expected allowOverrides callback to only be called for registered qps', qp);
-          this._qpChanged(prop, value, qp);
-          return this._updatingQPChanged(qp);
-        },
-      },
-    };
-  }
-
-  // Set in reopen
-  declare actions: Record<string, AnyFn>;
-
-  /**
-    Sends an action to the router, which will delegate it to the currently
-    active route hierarchy per the bubbling rules explained under `actions`.
-
-    Example
-
-    ```app/router.js
-    // ...
-
-    Router.map(function() {
-      this.route('index');
-    });
-
-    export default Router;
-    ```
-
-    ```app/routes/application.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class ApplicationRoute extends Route {
-      @action
-      track(arg) {
-        console.log(arg, 'was clicked');
-      }
-    }
-    ```
-
-    ```app/routes/index.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class IndexRoute extends Route {
-      @action
-      trackIfDebug(arg) {
-        if (debug) {
-          this.send('track', arg);
-        }
-      }
-    }
-    ```
-
-    @method send
-    @param {String} name the name of the action to trigger
-    @param {...*} args
-    @since 1.0.0
-    @public
-  */
-  // Set with reopen to override parent behavior
-  declare send: <K extends keyof this | keyof this['actions']>(
-    name: K,
-    ...args: MaybeParameters<
-      K extends keyof this ? this[K] : K extends keyof this['actions'] ? this['actions'][K] : never
-    >
-  ) => MaybeReturnType<
-    K extends keyof this ? this[K] : K extends keyof this['actions'] ? this['actions'][K] : never
-  >;
-}
-
-function parentRoute(route: Route) {
-  let routeInfo = routeInfoFor(route, route._router._routerMicrolib.state!.routeInfos, -1);
-  return routeInfo && routeInfo.route;
-}
-
-function routeInfoFor(route: Route, routeInfos: InternalRouteInfo<Route>[], offset = 0) {
-  if (!routeInfos) {
-    return;
-  }
-
-  let current: Route | undefined;
-  for (let i = 0; i < routeInfos.length; i++) {
-    let routeInfo = routeInfos[i];
-    assert('has current routeInfo', routeInfo);
-    current = routeInfo.route;
-    if (current === route) {
-      return routeInfos[i + offset];
-    }
-  }
-
-  return;
-}
-
-function buildRenderOptions(
-  route: Route,
-  nameOrOptions?: string | PartialRenderOptions,
-  options?: PartialRenderOptions
-): RenderOptions {
-  let isDefaultRender = !nameOrOptions && !options;
-  let _name;
-  if (!isDefaultRender) {
-    if (typeof nameOrOptions === 'object' && !options) {
-      _name = route.templateName || route.routeName;
-      options = nameOrOptions;
-    } else {
-      assert(
-        'The name in the given arguments is undefined or empty string',
-        !isEmpty(nameOrOptions)
-      );
-      _name = nameOrOptions!;
-    }
-  }
-  assert(
-    'You passed undefined as the outlet name.',
-    isDefaultRender || !(options && 'outlet' in options && options.outlet === undefined)
-  );
-
-  let owner = getOwner(route);
-  assert('Route is unexpectedly missing an owner', owner);
-  let name, templateName, into, outlet, model;
-  let controller;
-
-  if (options) {
-    into = options.into && options.into.replace(/\//g, '.');
-    outlet = options.outlet;
-    controller = options.controller;
-    model = options.model;
-  }
-  outlet = outlet || 'main';
-
-  if (isDefaultRender) {
-    name = route.routeName;
-    templateName = route.templateName || name;
-  } else {
-    name = _name!.replace(/\//g, '.');
-    templateName = name;
-  }
-
-  if (controller === undefined) {
-    if (isDefaultRender) {
-      controller = route.controllerName || owner.lookup(`controller:${name}`);
-    } else {
-      controller = owner.lookup(`controller:${name}`) || route.controllerName || route.routeName;
-    }
-  }
-
-  if (typeof controller === 'string') {
-    let controllerName = controller;
-    controller = owner.lookup(`controller:${controllerName}`);
-    assert(
-      `You passed \`controller: '${controllerName}'\` into the \`render\` method, but no such controller could be found.`,
-      isDefaultRender || controller !== undefined
-    );
-  }
-
-  assert('Expected an instance of controller', controller instanceof Controller);
-
-  if (model === undefined) {
-    model = route.currentModel;
-  } else {
-    controller.set('model', model);
-  }
-
-  let template = owner.lookup(`template:${templateName}`) as TemplateFactory;
-  assert(
-    `Could not find "${templateName}" template, view, or component.`,
-    isDefaultRender || template !== undefined
-  );
-
-  let parent: any;
-  if (into && (parent = parentRoute(route)) && into === parent.routeName) {
-    into = undefined;
-  }
-
-  let renderOptions: RenderOptions = {
-    owner,
-    into,
-    outlet,
-    name,
-    controller,
-    model,
-    template: template !== undefined ? template(owner) : route._topLevelViewTemplate(owner),
-  };
-
-  if (DEBUG) {
-    let LOG_VIEW_LOOKUPS = get(route._router, 'namespace.LOG_VIEW_LOOKUPS');
-    if (LOG_VIEW_LOOKUPS && !template) {
-      info(`Could not find "${name}" template. Nothing will be rendered`, {
-        fullName: `template:${name}`,
-      });
-    }
-  }
-
-  return renderOptions;
-}
-
-export interface RenderOptions {
-  owner: Owner;
-  into?: string;
-  outlet: string;
-  name: string;
-  controller: Controller | string | undefined;
-  model: unknown;
-  template: Template;
-}
-
-type PartialRenderOptions = Partial<
-  Pick<RenderOptions, 'into' | 'outlet' | 'controller' | 'model'>
->;
-
-export function getFullQueryParams<R extends Route>(
-  router: EmberRouter<R>,
-  state: RouteTransitionState<R>
-) {
-  if (state.fullQueryParams) {
-    return state.fullQueryParams;
-  }
-
-  let haveAllRouteInfosResolved = state.routeInfos.every((routeInfo) => routeInfo.route);
-
-  let fullQueryParamsState: Record<string, unknown> = {
-    ...state.queryParams,
-  };
-
-  router._deserializeQueryParams(state.routeInfos, fullQueryParamsState);
-
-  // only cache query params state if all routeinfos have resolved; it's possible
-  // for lazy routes to not have resolved when `getFullQueryParams` is called, so
-  // we wait until all routes have resolved prior to caching query params state
-  if (haveAllRouteInfosResolved) {
-    state.fullQueryParams = fullQueryParamsState;
-  }
-
-  return fullQueryParamsState;
-}
-
-function getQueryParamsFor<R extends Route>(
-  route: R,
-  state: RouteTransitionState<R>
-): Record<string, unknown> {
-  state.queryParamsFor = state.queryParamsFor || {};
-  let name = route.fullRouteName;
-
-  let existing = state.queryParamsFor[name];
-  if (existing) {
-    return existing;
-  }
-
-  let fullQueryParams = getFullQueryParams(route._router, state);
-
-  let params: Record<string, unknown> = (state.queryParamsFor[name] = {});
-
-  // Copy over all the query params for this route/controller into params hash.
-  // SAFETY: Since `_qp` is protected we can't infer the type
-  let qps = (get(route, '_qp') as Route<ModelFor<R>>['_qp']).qps;
-  for (let qp of qps) {
-    // Put deserialized qp on params hash.
-    let qpValueWasPassedIn = qp.prop in fullQueryParams;
-    params[qp.prop] = qpValueWasPassedIn
-      ? fullQueryParams[qp.prop]
-      : copyDefaultValue(qp.defaultValue);
-  }
-
-  return params;
-}
-
-// FIXME: This should probably actually return a `NativeArray` if the passed in value is an Array.
-function copyDefaultValue<T>(value: T): T {
-  if (Array.isArray(value)) {
-    // SAFETY: We lost the type data about the array if we don't cast.
-    return emberA(value.slice()) as unknown as T;
-  }
-  return value;
-}
-
-/*
-  Merges all query parameters from a controller with those from
-  a route, returning a new object and avoiding any mutations to
-  the existing objects.
-*/
-function mergeEachQueryParams(
-  controllerQP: Record<string, ExpandedControllerQueryParam>,
-  routeQP: Route['queryParams']
-) {
-  let qps: Record<
-    string,
-    {
-      type?: ControllerQueryParamType;
-      as?: string | null;
-      replace?: boolean;
-      refreshModel?: boolean;
-      scope?: string;
-    }
-  > = {};
-  let keysAlreadyMergedOrSkippable: Record<string, true> = {
-    defaultValue: true,
-    type: true,
-    scope: true,
-    as: true,
-  };
-
-  // first loop over all controller qps, merging them with any matching route qps
-  // into a new empty object to avoid mutating.
-  for (let cqpName in controllerQP) {
-    if (!Object.prototype.hasOwnProperty.call(controllerQP, cqpName)) {
-      continue;
-    }
-
-    qps[cqpName] = { ...controllerQP[cqpName], ...routeQP[cqpName] };
-
-    // allows us to skip this QP when we check route QPs.
-    keysAlreadyMergedOrSkippable[cqpName] = true;
-  }
-
-  // loop over all route qps, skipping those that were merged in the first pass
-  // because they also appear in controller qps
-  for (let rqpName in routeQP) {
-    if (
-      !Object.prototype.hasOwnProperty.call(routeQP, rqpName) ||
-      keysAlreadyMergedOrSkippable[rqpName]
-    ) {
-      continue;
-    }
-
-    qps[rqpName] = { ...routeQP[rqpName], ...controllerQP[rqpName] };
-  }
-
-  return qps;
-}
-
-function addQueryParamsObservers(controller: any, propNames: string[]) {
-  propNames.forEach((prop) => {
-    if (descriptorForProperty(controller, prop) === undefined) {
-      let desc = lookupDescriptor(controller, prop);
-
-      if (desc !== null && (typeof desc.get === 'function' || typeof desc.set === 'function')) {
-        defineProperty(
-          controller,
-          prop,
-          dependentKeyCompat({
-            get: desc.get,
-            set: desc.set,
-          })
-        );
-      }
-    }
-
-    addObserver(controller, `${prop}.[]`, controller, controller._qpChanged, false);
-  });
-}
-
-function getEngineRouteName(engine: EngineInstance, routeName: string) {
-  if (engine.routable) {
-    let prefix = engine.mountPoint;
-
-    if (routeName === 'application') {
-      return prefix;
-    } else {
-      return `${prefix}.${routeName}`;
-    }
-  }
-
-  return routeName;
-}
-
-const defaultSerialize = Route.prototype.serialize;
-
-export { defaultSerialize };
-
-export function hasDefaultSerialize(route: Route): boolean {
-  return route.serialize === defaultSerialize;
-}
-
-// Set these here so they can be overridden with extend
-Route.reopen({
-  mergedProperties: ['queryParams'],
-  queryParams: {},
-  templateName: null,
-  controllerName: null,
-
-  send(...args: any[]) {
-    assert(
-      `Attempted to call .send() with the action '${args[0]}' on the destroyed route '${this.routeName}'.`,
-      !this.isDestroying && !this.isDestroyed
-    );
-    if ((this._router && this._router._routerMicrolib) || !isTesting()) {
-      this._router.send(...args);
-    } else {
-      let name = args.shift();
-      let action = this.actions[name];
-      if (action) {
-        return action.apply(this, args);
-      }
-    }
-  },
-
-  /**
-    The controller associated with this route.
-
-    Example
-
-    ```app/routes/form.js
-    import Route from '@ember/routing/route';
-    import { action } from '@ember/object';
-
-    export default class FormRoute extends Route {
-      @action
-      willTransition(transition) {
-        if (this.controller.get('userHasEnteredData') &&
-            !confirm('Are you sure you want to abandon progress?')) {
-          transition.abort();
-        } else {
-          // Bubble the `willTransition` action so that
-          // parent routes can decide whether or not to abort.
-          return true;
-        }
-      }
-    }
-    ```
-
-    @property controller
-    @type Controller
-    @since 1.6.0
-    @public
-  */
-
-  actions: {
-    /**
-    This action is called when one or more query params have changed. Bubbles.
-
-    @method queryParamsDidChange
-    @param changed {Object} Keys are names of query params that have changed.
-    @param totalPresent {Object} Keys are names of query params that are currently set.
-    @param removed {Object} Keys are names of query params that have been removed.
-    @returns {boolean}
-    @private
-   */
-    queryParamsDidChange<T>(this: Route<T>, changed: {}, _totalPresent: unknown, removed: {}) {
-      // SAFETY: Since `_qp` is protected we can't infer the type
-      let qpMap = (get(this, '_qp') as Route<T>['_qp']).map;
-
-      let totalChanged = Object.keys(changed).concat(Object.keys(removed));
-      for (let change of totalChanged) {
-        let qp = qpMap[change];
-        if (qp) {
-          let options = this._optionsForQueryParam(qp);
-          assert('options exists', options && typeof options === 'object');
-          if ((get(options, 'refreshModel') as boolean) && this._router.currentState) {
-            this.refresh();
-            break;
-          }
-        }
-      }
-
-      return true;
-    },
-
-    finalizeQueryParamChange<T>(
-      this: Route<T>,
-      params: Record<string, string | null | undefined>,
-      finalParams: {}[],
-      transition: Transition
-    ) {
-      if (this.fullRouteName !== 'application') {
-        return true;
-      }
-
-      // Transition object is absent for intermediate transitions.
-      if (!transition) {
-        return;
-      }
-
-      let routeInfos = transition[STATE_SYMBOL]!.routeInfos;
-      let router = this._router;
-      let qpMeta = router._queryParamsFor(routeInfos);
-      let changes = router._qpUpdates;
-      let qpUpdated = false;
-      let replaceUrl;
-
-      stashParamNames(router, routeInfos);
-
-      for (let qp of qpMeta.qps) {
-        let route = qp.route;
-        let controller = route.controller;
-        let presentKey = qp.urlKey in params && qp.urlKey;
-
-        // Do a reverse lookup to see if the changed query
-        // param URL key corresponds to a QP property on
-        // this controller.
-        let value;
-        let svalue: string | null | undefined;
-        if (changes.has(qp.urlKey)) {
-          // Value updated in/before setupController
-          value = get(controller, qp.prop);
-          svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
-        } else {
-          if (presentKey) {
-            svalue = params[presentKey];
-
-            if (svalue !== undefined) {
-              value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
-            }
-          } else {
-            // No QP provided; use default value.
-            svalue = qp.serializedDefaultValue;
-            value = copyDefaultValue(qp.defaultValue);
-          }
-        }
-
-        // SAFETY: Since `_qp` is protected we can't infer the type
-        controller._qpDelegate = (get(route, '_qp') as Route<T>['_qp']).states.inactive;
-
-        let thisQueryParamChanged = svalue !== qp.serializedValue;
-        if (thisQueryParamChanged) {
-          if (transition.queryParamsOnly && replaceUrl !== false) {
-            let options = route._optionsForQueryParam(qp);
-            let replaceConfigValue = get(options, 'replace');
-            if (replaceConfigValue) {
-              replaceUrl = true;
-            } else if (replaceConfigValue === false) {
-              // Explicit pushState wins over any other replaceStates.
-              replaceUrl = false;
-            }
-          }
-
-          set(controller, qp.prop, value);
-
-          qpUpdated = true;
-        }
-
-        // Stash current serialized value of controller.
-        qp.serializedValue = svalue;
-
-        let thisQueryParamHasDefaultValue = qp.serializedDefaultValue === svalue;
-        if (!thisQueryParamHasDefaultValue) {
-          finalParams.push({
-            value: svalue,
-            visible: true,
-            key: presentKey || qp.urlKey,
-          });
-        }
-      }
-
-      // Some QPs have been updated, and those changes need to be propogated
-      // immediately. Eventually, we should work on making this async somehow.
-      if (qpUpdated === true) {
-        flushAsyncObservers(false);
-      }
-
-      if (replaceUrl) {
-        transition.method('replace');
-      }
-
-      qpMeta.qps.forEach((qp: QueryParam) => {
-        // SAFETY: Since `_qp` is protected we can't infer the type
-        let routeQpMeta = get(qp.route, '_qp') as Route<T>['_qp'];
-        let finalizedController = qp.route.controller;
-        finalizedController['_qpDelegate'] = get(routeQpMeta, 'states.active');
-      });
-
-      router._qpUpdates.clear();
-      return;
-    },
-  },
-});
-
-export default Route;
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
index 40889c43ced..8b856ceae27 100644
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ b/packages/@ember/-internals/routing/lib/system/router.ts
@@ -18,14 +18,14 @@ import type { RouteArgs, RouteOptions } from '../utils';
 import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils';
 import type { DSLCallback } from './dsl';
 import DSL from './dsl';
-import type { QueryParamMeta, RenderOptions } from './route';
-import type Route from './route';
+import type { QueryParamMeta, RenderOptions } from '@ember/routing/route';
+import type Route from '@ember/routing/route';
 import {
   defaultSerialize,
   getFullQueryParams,
   hasDefaultSerialize,
   ROUTE_CONNECTIONS,
-} from './route';
+} from '@ember/routing/route';
 import RouterState from './router_state';
 
 /**
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index 810d1e351de..cd6f6f0596a 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -1,7 +1,7 @@
 import type { ModelFor, TransitionState } from 'router_js';
 import type Router from 'router_js';
 import { shallowEqual } from '../utils';
-import type Route from './route';
+import type Route from '@ember/routing/route';
 import type EmberRouter from './router';
 
 export default class RouterState<R extends Route> {
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 4ee396815ce..575761b7d0d 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -7,8 +7,8 @@ import EmberError from '@ember/error';
 import type { InternalRouteInfo, ModelFor } from 'router_js';
 import type Router from 'router_js';
 import { STATE_SYMBOL } from 'router_js';
-import type { ExtendedInternalRouteInfo } from './system/route';
-import type Route from './system/route';
+import type { ExtendedInternalRouteInfo } from '@ember/routing/route';
+import type Route from '@ember/routing/route';
 import type EmberRouter from './system/router';
 
 const ALL_PERIODS_REGEX = /\./g;
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/-internals/routing/tests/system/route_test.js
index 213698f6750..51ccd2c5fdc 100644
--- a/packages/@ember/-internals/routing/tests/system/route_test.js
+++ b/packages/@ember/-internals/routing/tests/system/route_test.js
@@ -2,7 +2,7 @@ import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 import Service, { service } from '@ember/service';
 import EmberObject from '@ember/object';
-import EmberRoute from '../../lib/system/route';
+import EmberRoute from '@ember/routing/route';
 import ObjectProxy from '@ember/object/proxy';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index dde288c2106..d3039e1ddb7 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -13,8 +13,8 @@ import { libraries } from '@ember/-internals/metal';
 import { _loaded, onLoad, runLoadHooks } from './lib/lazy_load';
 import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher } from '@ember/-internals/views';
+import Route from '@ember/routing/route';
 import {
-  Route,
   Router,
   HashLocation,
   HistoryLocation,
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index af9b12c34e1..00bd0db92bd 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -3,7 +3,8 @@ import VERSION from 'ember/version';
 import { ENV } from '@ember/-internals/environment';
 import { libraries } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
-import { Router, NoneLocation, Route as EmberRoute } from '@ember/-internals/routing';
+import EmberRoute from '@ember/routing/route';
+import { Router, NoneLocation } from '@ember/-internals/routing';
 import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/application/tests/logging_test.js b/packages/@ember/application/tests/logging_test.js
index b9ea7363a07..640175d4cec 100644
--- a/packages/@ember/application/tests/logging_test.js
+++ b/packages/@ember/application/tests/logging_test.js
@@ -3,7 +3,7 @@ import { DEBUG } from '@glimmer/env';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 
 import Controller from '@ember/controller';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 
 class LoggingApplicationTestCase extends ApplicationTestCase {
   constructor() {
diff --git a/packages/@ember/application/tests/visit_test.js b/packages/@ember/application/tests/visit_test.js
index 85271016996..e7ef9ced2eb 100644
--- a/packages/@ember/application/tests/visit_test.js
+++ b/packages/@ember/application/tests/visit_test.js
@@ -11,7 +11,7 @@ import { later } from '@ember/runloop';
 import Application from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
 import Engine from '@ember/engine';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { Component, helper, isSerializationFirstNode } from '@ember/-internals/glimmer';
 import { compile } from 'ember-template-compiler';
 import { ENV } from '@ember/-internals/environment';
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 35b65594a65..2c9ae25681c 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -1 +1,2575 @@
-export { Route as default } from '@ember/-internals/routing';
+import { privatize as P } from '@ember/-internals/container';
+import {
+  addObserver,
+  computed,
+  defineProperty,
+  descriptorForProperty,
+  flushAsyncObservers,
+  get,
+  getProperties,
+  isEmpty,
+  set,
+  setProperties,
+} from '@ember/-internals/metal';
+import type { Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import { BucketCache } from '@ember/-internals/routing';
+import EmberObject from '@ember/object';
+import Evented from '@ember/object/evented';
+import { A as emberA, ActionHandler, typeOf } from '@ember/-internals/runtime';
+import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
+import type { AnyFn } from '@ember/-internals/utils/types';
+import Controller from '@ember/controller';
+import type { ControllerQueryParamType } from '@ember/controller';
+import { assert, info, isTesting } from '@ember/debug';
+import EngineInstance from '@ember/engine/instance';
+import { dependentKeyCompat } from '@ember/object/compat';
+import { once } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
+import type { Template, TemplateFactory } from '@glimmer/interfaces';
+import type {
+  InternalRouteInfo,
+  ModelFor,
+  Route as IRoute,
+  Transition,
+  TransitionState,
+} from 'router_js';
+import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
+import type {
+  ExpandedControllerQueryParam,
+  NamedRouteArgs,
+  QueryParam,
+  RouteArgs,
+} from '@ember/-internals/routing';
+import {
+  calculateCacheKey,
+  deprecateTransitionMethods,
+  generateController,
+  normalizeControllerQueryParams,
+  prefixRouteNameArg,
+  stashParamNames,
+  Router as EmberRouter,
+} from '@ember/-internals/routing';
+
+export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRouteInfo<R> {
+  _names?: unknown[];
+}
+
+export type QueryParamMeta = {
+  qps: QueryParam[];
+  map: Record<string, QueryParam>;
+  propertyNames: string[];
+  states: {
+    inactive(prop: string, value: unknown): void;
+    active(prop: string, value: unknown): any;
+    allowOverrides(prop: string, value: unknown): any;
+  };
+};
+
+type RouteTransitionState<R extends Route> = TransitionState<R> & {
+  fullQueryParams?: Record<string, unknown>;
+  queryParamsFor?: Record<string, Record<string, unknown>>;
+};
+
+type MaybeParameters<T> = T extends AnyFn ? Parameters<T> : unknown[];
+type MaybeReturnType<T> = T extends AnyFn ? ReturnType<T> : unknown;
+
+export const ROUTE_CONNECTIONS = new WeakMap();
+const RENDER = Symbol('render');
+
+/**
+@module @ember/routing
+*/
+
+/**
+  The `Route` class is used to define individual routes. Refer to
+  the [routing guide](https://guides.emberjs.com/release/routing/) for documentation.
+
+  @class Route
+  @extends EmberObject
+  @uses ActionHandler
+  @uses Evented
+  @since 1.0.0
+  @public
+*/
+interface Route<T = unknown> extends IRoute<T> {
+  /**
+    The `willTransition` action is fired at the beginning of any
+    attempted transition with a `Transition` object as the sole
+    argument. This action can be used for aborting, redirecting,
+    or decorating the transition from the currently active routes.
+
+    A good example is preventing navigation when a form is
+    half-filled out:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ContactFormRoute extends Route {
+      @action
+      willTransition(transition) {
+        if (this.controller.get('userHasEnteredData')) {
+          this.controller.displayNavigationConfirm();
+          transition.abort();
+        }
+      }
+    }
+    ```
+
+    You can also redirect elsewhere by calling
+    `this.transitionTo('elsewhere')` from within `willTransition`.
+    Note that `willTransition` will not be fired for the
+    redirecting `transitionTo`, since `willTransition` doesn't
+    fire when there is already a transition underway. If you want
+    subsequent `willTransition` actions to fire for the redirecting
+    transition, you must first explicitly call
+    `transition.abort()`.
+
+    To allow the `willTransition` event to continue bubbling to the parent
+    route, use `return true;`. When the `willTransition` method has a
+    return value of `true` then the parent route's `willTransition` method
+    will be fired, enabling "bubbling" behavior for the event.
+
+    @event willTransition
+    @param {Transition} transition
+    @since 1.0.0
+    @public
+  */
+  willTransition?(transition: Transition): boolean | void;
+
+  /**
+    The `didTransition` action is fired after a transition has
+    successfully been completed. This occurs after the normal model
+    hooks (`beforeModel`, `model`, `afterModel`, `setupController`)
+    have resolved. The `didTransition` action has no arguments,
+    however, it can be useful for tracking page views or resetting
+    state on the controller.
+
+    ```app/routes/login.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class LoginRoute extends Route {
+      @action
+      didTransition() {
+        this.controller.get('errors.base').clear();
+        return true; // Bubble the didTransition event
+      }
+    }
+    ```
+
+    @event didTransition
+    @since 1.2.0
+    @public
+  */
+  didTransition?(): boolean | void;
+
+  /**
+    The `loading` action is fired on the route when a route's `model`
+    hook returns a promise that is not already resolved. The current
+    `Transition` object is the first parameter and the route that
+    triggered the loading event is the second parameter.
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ApplicationRoute extends Route {
+      @action
+      loading(transition, route) {
+        let controller = this.controllerFor('foo');
+
+        // The controller may not be instantiated when initially loading
+        if (controller) {
+          controller.currentlyLoading = true;
+
+          transition.finally(function() {
+            controller.currentlyLoading = false;
+          });
+        }
+      }
+    }
+    ```
+
+    @event loading
+    @param {Transition} transition
+    @param {Route} route The route that triggered the loading event
+    @since 1.2.0
+    @public
+  */
+  loading?(transition: Transition, route: Route): boolean | void;
+
+  /**
+    When attempting to transition into a route, any of the hooks
+    may return a promise that rejects, at which point an `error`
+    action will be fired on the partially-entered routes, allowing
+    for per-route error handling logic, or shared error handling
+    logic defined on a parent route.
+
+    Here is an example of an error handler that will be invoked
+    for rejected promises from the various hooks on the route,
+    as well as any unhandled errors from child routes:
+
+    ```app/routes/admin.js
+    import { reject } from 'rsvp';
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class AdminRoute extends Route {
+      beforeModel() {
+        return reject('bad things!');
+      }
+
+      @action
+      error(error, transition) {
+        // Assuming we got here due to the error in `beforeModel`,
+        // we can expect that error === "bad things!",
+        // but a promise model rejecting would also
+        // call this hook, as would any errors encountered
+        // in `afterModel`.
+
+        // The `error` hook is also provided the failed
+        // `transition`, which can be stored and later
+        // `.retry()`d if desired.
+
+        this.transitionTo('login');
+      }
+    }
+    ```
+
+    `error` actions that bubble up all the way to `ApplicationRoute`
+    will fire a default error handler that logs the error. You can
+    specify your own global default error handler by overriding the
+    `error` handler on `ApplicationRoute`:
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ApplicationRoute extends Route {
+      @action
+      error(error, transition) {
+        this.controllerFor('banner').displayError(error.message);
+      }
+    }
+    ```
+    @event error
+    @param {Error} error
+    @param {Transition} transition
+    @since 1.0.0
+    @public
+  */
+  error?(error: Error, transition: Transition): boolean | void;
+}
+
+class Route<T = unknown>
+  extends EmberObject.extend(ActionHandler, Evented)
+  implements IRoute, Evented
+{
+  static isRouteFactory = true;
+
+  context = {} as T;
+  declare currentModel: T;
+
+  _bucketCache!: BucketCache;
+  _internalName!: string;
+
+  private _names: unknown;
+
+  _router!: EmberRouter;
+  declare _topLevelViewTemplate: any;
+  declare _environment: any;
+
+  constructor(owner: Owner) {
+    super(owner);
+
+    if (owner) {
+      let router = owner.lookup('router:main');
+      let bucketCache = owner.lookup(P`-bucket-cache:main`);
+
+      assert(
+        'ROUTER BUG: Expected route injections to be defined on the route. This is an internal bug, please open an issue on Github if you see this message!',
+        router instanceof EmberRouter && bucketCache instanceof BucketCache
+      );
+
+      this._router = router;
+      this._bucketCache = bucketCache;
+      this._topLevelViewTemplate = owner.lookup('template:-outlet');
+      this._environment = owner.lookup('-environment:main');
+    }
+  }
+
+  // Implement Evented
+  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
+  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare trigger: (name: string, ...args: any[]) => any;
+  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare has: (name: string) => boolean;
+
+  /**
+    A hook you can implement to convert the route's model into parameters
+    for the URL.
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('post', { path: '/posts/:post_id' });
+    });
+
+    ```
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+
+    export default class PostRoute extends Route {
+      model({ post_id }) {
+        // the server returns `{ id: 12 }`
+        return fetch(`/posts/${post_id}`;
+      }
+
+      serialize(model) {
+        // this will make the URL `/posts/12`
+        return { post_id: model.id };
+      }
+    }
+    ```
+
+    The default `serialize` method will insert the model's `id` into the
+    route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+    If the route has multiple dynamic segments or does not contain '_id', `serialize`
+    will return `getProperties(model, params)`
+
+    This method is called when `transitionTo` is called with a context
+    in order to populate the URL.
+
+    @method serialize
+    @param {Object} model the routes model
+    @param {Array} params an Array of parameter names for the current
+      route (in the example, `['post_id']`.
+    @return {Object} the serialized parameters
+    @since 1.0.0
+    @public
+  */
+  serialize(model: T | undefined, params: string[]): { [key: string]: unknown } | undefined {
+    if (params.length < 1 || !model) {
+      return;
+    }
+
+    let object: Record<string, unknown> = {};
+    if (params.length === 1) {
+      let [name] = params;
+      assert('has name', name);
+      if (name in model) {
+        object[name] = get(model, name);
+      } else if (/_id$/.test(name)) {
+        object[name] = get(model, 'id');
+      } else if (isProxy(model)) {
+        object[name] = get(model, name);
+      }
+    } else {
+      object = getProperties(model, params);
+    }
+
+    return object;
+  }
+
+  /**
+    Configuration hash for this route's queryParams. The possible
+    configuration options and their defaults are as follows
+    (assuming a query param whose controller property is `page`):
+
+    ```javascript
+    queryParams = {
+      page: {
+        // By default, controller query param properties don't
+        // cause a full transition when they are changed, but
+        // rather only cause the URL to update. Setting
+        // `refreshModel` to true will cause an "in-place"
+        // transition to occur, whereby the model hooks for
+        // this route (and any child routes) will re-fire, allowing
+        // you to reload models (e.g., from the server) using the
+        // updated query param values.
+        refreshModel: false,
+
+        // By default, changes to controller query param properties
+        // cause the URL to update via `pushState`, which means an
+        // item will be added to the browser's history, allowing
+        // you to use the back button to restore the app to the
+        // previous state before the query param property was changed.
+        // Setting `replace` to true will use `replaceState` (or its
+        // hash location equivalent), which causes no browser history
+        // item to be added. This options name and default value are
+        // the same as the `link-to` helper's `replace` option.
+        replace: false,
+
+        // By default, the query param URL key is the same name as
+        // the controller property name. Use `as` to specify a
+        // different URL key.
+        as: 'page'
+      }
+    };
+    ```
+
+    @property queryParams
+    @for Route
+    @type Object
+    @since 1.6.0
+    @public
+  */
+  // Set in reopen so it can be overriden with extend
+  declare queryParams: Record<
+    string,
+    {
+      refreshModel?: boolean;
+      replace?: boolean;
+      as?: string;
+    }
+  >;
+
+  /**
+    The name of the template to use by default when rendering this route's
+    template.
+
+    ```app/routes/posts/list.js
+    import Route from '@ember/routing/route';
+
+    export default class PostsListRoute extends Route {
+      templateName = 'posts/list';
+    }
+    ```
+
+    ```app/routes/posts/index.js
+    import PostsListRoute from '../posts/list';
+
+    export default class PostsIndexRoute extends PostsListRoute {};
+    ```
+
+    ```app/routes/posts/archived.js
+    import PostsListRoute from '../posts/list';
+
+    export default class PostsArchivedRoute extends PostsListRoute {};
+    ```
+
+    @property templateName
+    @type String
+    @default null
+    @since 1.4.0
+    @public
+  */
+  // Set in reopen so it can be overriden with extend
+  declare templateName: string | null;
+
+  /**
+    The name of the controller to associate with this route.
+
+    By default, Ember will lookup a route's controller that matches the name
+    of the route (i.e. `posts.new`). However,
+    if you would like to define a specific controller to use, you can do so
+    using this property.
+
+    This is useful in many ways, as the controller specified will be:
+
+    * passed to the `setupController` method.
+    * used as the controller for the template being rendered by the route.
+    * returned from a call to `controllerFor` for the route.
+
+    @property controllerName
+    @type String
+    @default null
+    @since 1.4.0
+    @public
+  */
+  // Set in reopen so it can be overriden with extend
+  declare controllerName: string | null;
+
+  /**
+    The controller associated with this route.
+
+    Example
+
+    ```app/routes/form.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class FormRoute extends Route {
+      @action
+      willTransition(transition) {
+        if (this.controller.get('userHasEnteredData') &&
+            !confirm('Are you sure you want to abandon progress?')) {
+          transition.abort();
+        } else {
+          // Bubble the `willTransition` action so that
+          // parent routes can decide whether or not to abort.
+          return true;
+        }
+      }
+    }
+    ```
+
+    @property controller
+    @type Controller
+    @since 1.6.0
+    @public
+  */
+  declare controller: Controller;
+
+  /**
+    The name of the route, dot-delimited.
+
+    For example, a route found at `app/routes/posts/post.js` will have
+    a `routeName` of `posts.post`.
+
+    @property routeName
+    @for Route
+    @type String
+    @since 1.0.0
+    @public
+  */
+  declare routeName: string;
+
+  /**
+    The name of the route, dot-delimited, including the engine prefix
+    if applicable.
+
+    For example, a route found at `addon/routes/posts/post.js` within an
+    engine named `admin` will have a `fullRouteName` of `admin.posts.post`.
+
+    @property fullRouteName
+    @for Route
+    @type String
+    @since 2.10.0
+    @public
+  */
+  declare fullRouteName: string;
+
+  /**
+    Sets the name for this route, including a fully resolved name for routes
+    inside engines.
+
+    @private
+    @method _setRouteName
+    @param {String} name
+  */
+  _setRouteName(name: string) {
+    this.routeName = name;
+    let owner = getOwner(this);
+    assert('Expected route to have EngineInstance as owner', owner instanceof EngineInstance);
+    this.fullRouteName = getEngineRouteName(owner, name)!;
+  }
+
+  /**
+    @private
+
+    @method _stashNames
+  */
+  _stashNames(
+    routeInfo: ExtendedInternalRouteInfo<this>,
+    dynamicParent: ExtendedInternalRouteInfo<this>
+  ) {
+    if (this._names) {
+      return;
+    }
+    let names = (this._names = routeInfo['_names'])!;
+
+    if (!names.length) {
+      routeInfo = dynamicParent;
+      names = (routeInfo && routeInfo['_names']) || [];
+    }
+
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    let qps = (get(this, '_qp') as Route<T>['_qp']).qps;
+
+    let namePaths = new Array(names.length);
+    for (let a = 0; a < names.length; ++a) {
+      namePaths[a] = `${routeInfo.name}.${names[a]}`;
+    }
+
+    for (let qp of qps) {
+      if (qp.scope === 'model') {
+        qp.parts = namePaths;
+      }
+    }
+  }
+
+  /**
+    @private
+
+    @property _activeQPChanged
+  */
+  _activeQPChanged(qp: QueryParam, value: unknown) {
+    this._router._activeQPChanged(qp.scopedPropertyName, value);
+  }
+
+  /**
+    @private
+    @method _updatingQPChanged
+  */
+  _updatingQPChanged(qp: QueryParam) {
+    this._router._updatingQPChanged(qp.urlKey);
+  }
+
+  /**
+    Returns a hash containing the parameters of an ancestor route.
+
+    You may notice that `this.paramsFor` sometimes works when referring to a
+    child route, but this behavior should not be relied upon as only ancestor
+    routes are certain to be loaded in time.
+
+    Example
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('member', { path: ':name' }, function() {
+        this.route('interest', { path: ':interest' });
+      });
+    });
+    ```
+
+    ```app/routes/member.js
+    import Route from '@ember/routing/route';
+
+    export default class MemberRoute extends Route {
+      queryParams = {
+        memberQp: { refreshModel: true }
+      }
+    }
+    ```
+
+    ```app/routes/member/interest.js
+    import Route from '@ember/routing/route';
+
+    export default class MemberInterestRoute extends Route {
+      queryParams = {
+        interestQp: { refreshModel: true }
+      }
+
+      model() {
+        return this.paramsFor('member');
+      }
+    }
+    ```
+
+    If we visit `/turing/maths?memberQp=member&interestQp=interest` the model for
+    the `member.interest` route is a hash with:
+
+    * `name`: `turing`
+    * `memberQp`: `member`
+
+    @method paramsFor
+    @param {String} name
+    @return {Object} hash containing the parameters of the route `name`
+    @since 1.4.0
+    @public
+  */
+  paramsFor(name: string): Record<string, unknown> {
+    let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+    let route = owner.lookup(`route:${name}`) as Route;
+
+    if (route === undefined) {
+      return {};
+    }
+
+    let transition = this._router._routerMicrolib.activeTransition;
+    let state = transition ? transition[STATE_SYMBOL] : this._router._routerMicrolib.state;
+
+    let fullName = route.fullRouteName;
+    let params = { ...(state!.params[fullName] as Record<string, unknown>) };
+    let queryParams = getQueryParamsFor(route, state!);
+
+    return Object.entries(queryParams).reduce((params, [key, value]) => {
+      assert(
+        `The route '${this.routeName}' has both a dynamic segment and query param with name '${key}'. Please rename one to avoid collisions.`,
+        !params[key]
+      );
+      params[key] = value;
+      return params;
+    }, params);
+  }
+
+  /**
+    Serializes the query parameter key
+
+    @method serializeQueryParamKey
+    @param {String} controllerPropertyName
+    @private
+  */
+  serializeQueryParamKey(controllerPropertyName: string) {
+    return controllerPropertyName;
+  }
+
+  /**
+    Serializes value of the query parameter based on defaultValueType
+
+    @method serializeQueryParam
+    @param {Object} value
+    @param {String} urlKey
+    @param {String} defaultValueType
+    @private
+  */
+  serializeQueryParam(value: unknown, _urlKey: string, defaultValueType: string) {
+    // urlKey isn't used here, but anyone overriding
+    // can use it to provide serialization specific
+    // to a certain query param.
+    return this._router._serializeQueryParam(value, defaultValueType);
+  }
+
+  /**
+    Deserializes value of the query parameter based on defaultValueType
+
+    @method deserializeQueryParam
+    @param {Object} value
+    @param {String} urlKey
+    @param {String} defaultValueType
+    @private
+  */
+  deserializeQueryParam(value: unknown, _urlKey: string, defaultValueType: string) {
+    // urlKey isn't used here, but anyone overriding
+    // can use it to provide deserialization specific
+    // to a certain query param.
+    return this._router._deserializeQueryParam(value, defaultValueType);
+  }
+
+  /**
+    @private
+
+    @property _optionsForQueryParam
+  */
+  _optionsForQueryParam(qp: QueryParam): {} {
+    const queryParams = get(this, 'queryParams');
+    return (
+      get(queryParams, qp.urlKey) ||
+      get(queryParams, qp.prop) ||
+      queryParams[qp.urlKey] ||
+      queryParams[qp.prop] ||
+      {}
+    );
+  }
+
+  /**
+    A hook you can use to reset controller values either when the model
+    changes or the route is exiting.
+
+    ```app/routes/articles.js
+    import Route from '@ember/routing/route';
+
+    export default class ArticlesRoute extends Route {
+      resetController(controller, isExiting, transition) {
+        if (isExiting && transition.targetName !== 'error') {
+          controller.set('page', 1);
+        }
+      }
+    }
+    ```
+
+    @method resetController
+    @param {Controller} controller instance
+    @param {Boolean} isExiting
+    @param {Object} transition
+    @since 1.7.0
+    @public
+  */
+  resetController(_controller: Controller, _isExiting: boolean, _transition: Transition) {
+    return this;
+  }
+
+  /**
+    @private
+
+    @method exit
+  */
+  exit(transition?: Transition) {
+    this.deactivate(transition);
+    this.trigger('deactivate', transition);
+    this.teardownViews();
+  }
+
+  /**
+    @private
+
+    @method _internalReset
+    @since 3.6.0
+  */
+  _internalReset(isExiting: boolean, transition: Transition) {
+    let controller = this.controller;
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    controller['_qpDelegate'] = (get(this, '_qp') as Route<T>['_qp']).states.inactive;
+
+    this.resetController(controller, isExiting, transition);
+  }
+
+  /**
+    @private
+
+    @method enter
+  */
+  enter(transition: Transition) {
+    ROUTE_CONNECTIONS.set(this, []);
+    this.activate(transition);
+    this.trigger('activate', transition);
+  }
+
+  /**
+    This event is triggered when the router enters the route. It is
+    not executed when the model for the route changes.
+
+    ```app/routes/application.js
+    import { on } from '@ember/object/evented';
+    import Route from '@ember/routing/route';
+
+    export default Route.extend({
+      collectAnalytics: on('activate', function(){
+        collectAnalytics();
+      })
+    });
+    ```
+
+    @event activate
+    @since 1.9.0
+    @public
+  */
+
+  /**
+    This event is triggered when the router completely exits this
+    route. It is not executed when the model for the route changes.
+
+    ```app/routes/index.js
+    import { on } from '@ember/object/evented';
+    import Route from '@ember/routing/route';
+
+    export default Route.extend({
+      trackPageLeaveAnalytics: on('deactivate', function(){
+        trackPageLeaveAnalytics();
+      })
+    });
+    ```
+
+    @event deactivate
+    @since 1.9.0
+    @public
+  */
+
+  /**
+    This hook is executed when the router completely exits this route. It is
+    not executed when the model for the route changes.
+
+    @method deactivate
+    @param {Transition} transition
+    @since 1.0.0
+    @public
+  */
+  deactivate(_transition?: Transition) {}
+
+  /**
+    This hook is executed when the router enters the route. It is not executed
+    when the model for the route changes.
+
+    @method activate
+    @param {Transition} transition
+    @since 1.0.0
+    @public
+  */
+  activate(_transition: Transition) {}
+
+  /**
+    Transition the application into another route. The route may
+    be either a single route or route path:
+
+    ```javascript
+    this.transitionTo('blogPosts');
+    this.transitionTo('blogPosts.recentEntries');
+    ```
+
+    Optionally supply a model for the route in question. The model
+    will be serialized into the URL using the `serialize` hook of
+    the route:
+
+    ```javascript
+    this.transitionTo('blogPost', aPost);
+    ```
+
+    If a literal is passed (such as a number or a string), it will
+    be treated as an identifier instead. In this case, the `model`
+    hook of the route will be triggered:
+
+    ```javascript
+    this.transitionTo('blogPost', 1);
+    ```
+
+    Multiple models will be applied last to first recursively up the
+    route tree.
+
+    ```app/routes.js
+    // ...
+
+    Router.map(function() {
+      this.route('blogPost', { path:':blogPostId' }, function() {
+        this.route('blogComment', { path: ':blogCommentId' });
+      });
+    });
+
+    export default Router;
+    ```
+
+    ```javascript
+    this.transitionTo('blogComment', aPost, aComment);
+    this.transitionTo('blogComment', 1, 13);
+    ```
+
+    It is also possible to pass a URL (a string that starts with a
+    `/`).
+
+    ```javascript
+    this.transitionTo('/');
+    this.transitionTo('/blog/post/1/comment/13');
+    this.transitionTo('/blog/posts?sort=title');
+    ```
+
+    An options hash with a `queryParams` property may be provided as
+    the final argument to add query parameters to the destination URL.
+
+    ```javascript
+    this.transitionTo('blogPost', 1, {
+      queryParams: { showComments: 'true' }
+    });
+
+    // if you just want to transition the query parameters without changing the route
+    this.transitionTo({ queryParams: { sort: 'date' } });
+    ```
+
+    See also [replaceWith](#method_replaceWith).
+
+    Simple Transition Example
+
+    ```app/routes.js
+    // ...
+
+    Router.map(function() {
+      this.route('index');
+      this.route('secret');
+      this.route('fourOhFour', { path: '*:' });
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/index.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class IndexRoute extends Route {
+      @action
+      moveToSecret(context) {
+        if (authorized()) {
+          this.transitionTo('secret', context);
+        } else {
+          this.transitionTo('fourOhFour');
+        }
+      }
+    }
+    ```
+
+    Transition to a nested route
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('articles', { path: '/articles' }, function() {
+        this.route('new');
+      });
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/index.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class IndexRoute extends Route {
+      @action
+      transitionToNewArticle() {
+        this.transitionTo('articles.new');
+      }
+    }
+    ```
+
+    Multiple Models Example
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('index');
+
+      this.route('breakfast', { path: ':breakfastId' }, function() {
+        this.route('cereal', { path: ':cerealId' });
+      });
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/index.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class IndexRoute extends Route {
+      @action
+      moveToChocolateCereal() {
+        let cereal = { cerealId: 'ChocolateYumminess' };
+        let breakfast = { breakfastId: 'CerealAndMilk' };
+
+        this.transitionTo('breakfast.cereal', breakfast, cereal);
+      }
+    }
+    ```
+
+    Nested Route with Query String Example
+
+    ```app/routes.js
+    // ...
+
+    Router.map(function() {
+      this.route('fruits', function() {
+        this.route('apples');
+      });
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/index.js
+    import Route from '@ember/routing/route';
+
+    export default class IndexRoute extends Route {
+      @action
+      transitionToApples() {
+        this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
+      }
+    }
+    ```
+
+    @method transitionTo
+    @param {String} [name] the name of the route or a URL.
+    @param {...Object} [models] the model(s) or identifier(s) to be used while
+      transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters. May be supplied as the only
+      parameter to trigger a query-parameter-only transition.
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @since 1.0.0
+    @deprecated Use transitionTo from the Router service instead.
+    @public
+  */
+  transitionTo(...args: RouteArgs<this>): Transition {
+    deprecateTransitionMethods('route', 'transitionTo');
+    return this._router.transitionTo(...prefixRouteNameArg(this, args));
+  }
+
+  /**
+    Perform a synchronous transition into another route without attempting
+    to resolve promises, update the URL, or abort any currently active
+    asynchronous transitions (i.e. regular transitions caused by
+    `transitionTo` or URL changes).
+
+    This method is handy for performing intermediate transitions on the
+    way to a final destination route, and is called internally by the
+    default implementations of the `error` and `loading` handlers.
+
+    @method intermediateTransitionTo
+    @param {String} name the name of the route
+    @param {...Object} models the model(s) to be used while transitioning
+    to the route.
+    @since 1.2.0
+    @public
+   */
+  intermediateTransitionTo(...args: NamedRouteArgs<this>): void {
+    let [name, ...preparedArgs] = prefixRouteNameArg(this, args);
+    this._router.intermediateTransitionTo(name, ...preparedArgs);
+  }
+
+  /**
+    Refresh the model on this route and any child routes, firing the
+    `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+    to how routes are entered when transitioning in from other route.
+    The current route params (e.g. `article_id`) will be passed in
+    to the respective model hooks, and if a different model is returned,
+    `setupController` and associated route hooks will re-fire as well.
+
+    An example usage of this method is re-querying the server for the
+    latest information using the same parameters as when the route
+    was first entered.
+
+    Note that this will cause `model` hooks to fire even on routes
+    that were provided a model object when the route was initially
+    entered.
+
+    @method refresh
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @since 1.4.0
+    @public
+   */
+  refresh(): Transition {
+    return this._router._routerMicrolib.refresh(this);
+  }
+
+  /**
+    Transition into another route while replacing the current URL, if possible.
+    This will replace the current history entry instead of adding a new one.
+    Beside that, it is identical to `transitionTo` in all other respects. See
+    'transitionTo' for additional information regarding multiple models.
+
+    Example
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('index');
+      this.route('secret');
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/secret.js
+    import Route from '@ember/routing/route';
+
+    export default class SecretRoute Route {
+      afterModel() {
+        if (!authorized()){
+          this.replaceWith('index');
+        }
+      }
+    }
+    ```
+
+    @method replaceWith
+    @param {String} name the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used while
+      transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @since 1.0.0
+    @deprecated Use replaceWith from the Router service instead.
+    @public
+  */
+  replaceWith(...args: any[]): Transition {
+    deprecateTransitionMethods('route', 'replaceWith');
+    return this._router.replaceWith(...prefixRouteNameArg(this, args));
+  }
+
+  /**
+    This hook is the entry point for router.js
+
+    @private
+    @method setup
+  */
+  setup(context: T | undefined, transition: Transition) {
+    let controllerName = this.controllerName || this.routeName;
+    let definedController = this.controllerFor(controllerName, true);
+    let controller = definedController ?? this.generateController(controllerName);
+
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    let queryParams = get(this, '_qp') as Route<T>['_qp'];
+
+    // Assign the route's controller so that it can more easily be
+    // referenced in action handlers. Side effects. Side effects everywhere.
+    if (!this.controller) {
+      let propNames = queryParams.propertyNames;
+      addQueryParamsObservers(controller, propNames);
+      this.controller = controller;
+    }
+
+    let states = queryParams.states;
+
+    controller._qpDelegate = states.allowOverrides;
+
+    if (transition) {
+      // Update the model dep values used to calculate cache keys.
+      stashParamNames(this._router, transition[STATE_SYMBOL]!.routeInfos);
+
+      let cache = this._bucketCache;
+      let params = transition[PARAMS_SYMBOL];
+      let allParams = queryParams.propertyNames;
+
+      allParams.forEach((prop: string) => {
+        let aQp = queryParams.map[prop];
+        assert('expected aQp', aQp);
+        aQp.values = params;
+
+        let cacheKey = calculateCacheKey(aQp.route.fullRouteName, aQp.parts, aQp.values);
+        let value = cache.lookup(cacheKey, prop, aQp.undecoratedDefaultValue);
+        set(controller, prop, value);
+      });
+
+      let qpValues = getQueryParamsFor(this, transition[STATE_SYMBOL]!);
+      setProperties(controller, qpValues);
+    }
+
+    this.setupController(controller, context, transition);
+
+    if (this._environment.options.shouldRender) {
+      this[RENDER]();
+    }
+
+    // Setup can cause changes to QPs which need to be propogated immediately in
+    // some situations. Eventually, we should work on making these async somehow.
+    flushAsyncObservers(false);
+  }
+
+  /*
+    Called when a query parameter for this route changes, regardless of whether the route
+    is currently part of the active route hierarchy. This will update the query parameter's
+    value in the cache so if this route becomes active, the cache value has been updated.
+  */
+  _qpChanged(prop: string, value: unknown, qp: QueryParam) {
+    if (!qp) {
+      return;
+    }
+
+    // Update model-dep cache
+    let cache = this._bucketCache;
+    let cacheKey = calculateCacheKey(qp.route.fullRouteName, qp.parts, qp.values);
+    cache.stash(cacheKey, prop, value);
+  }
+
+  /**
+    This hook is the first of the route entry validation hooks
+    called when an attempt is made to transition into a route
+    or one of its children. It is called before `model` and
+    `afterModel`, and is appropriate for cases when:
+
+    1) A decision can be made to redirect elsewhere without
+       needing to resolve the model first.
+    2) Any async operations need to occur first before the
+       model is attempted to be resolved.
+
+    This hook is provided the current `transition` attempt
+    as a parameter, which can be used to `.abort()` the transition,
+    save it for a later `.retry()`, or retrieve values set
+    on it from a previous hook. You can also just call
+    `this.transitionTo` to another route to implicitly
+    abort the `transition`.
+
+    You can return a promise from this hook to pause the
+    transition until the promise resolves (or rejects). This could
+    be useful, for instance, for retrieving async code from
+    the server that is required to enter a route.
+
+    @method beforeModel
+    @param {Transition} transition
+    @return {any | Promise<any>} if the value returned from this hook is
+      a promise, the transition will pause until the transition
+      resolves. Otherwise, non-promise return values are not
+      utilized in any way.
+    @since 1.0.0
+    @public
+  */
+  beforeModel(_transition: Transition): unknown | Promise<unknown>;
+  beforeModel(_transition: Transition): void {}
+
+  /**
+    This hook is called after this route's model has resolved.
+    It follows identical async/promise semantics to `beforeModel`
+    but is provided the route's resolved model in addition to
+    the `transition`, and is therefore suited to performing
+    logic that can only take place after the model has already
+    resolved.
+
+    ```app/routes/posts.js
+    import Route from '@ember/routing/route';
+
+    export default class PostsRoute extends Route {
+      afterModel(posts, transition) {
+        if (posts.get('length') === 1) {
+          this.transitionTo('post.show', posts.get('firstObject'));
+        }
+      }
+    }
+    ```
+
+    Refer to documentation for `beforeModel` for a description
+    of transition-pausing semantics when a promise is returned
+    from this hook.
+
+    @method afterModel
+    @param {Object} resolvedModel the value returned from `model`,
+      or its resolved value if it was a promise
+    @param {Transition} transition
+    @return {any | Promise<any>} if the value returned from this hook is
+      a promise, the transition will pause until the transition
+      resolves. Otherwise, non-promise return values are not
+      utilized in any way.
+    @since 1.0.0
+    @public
+   */
+  afterModel(_resolvedModel: T | undefined, _transition: Transition): unknown | Promise<unknown>;
+  afterModel(_resolvedModel: T | undefined, _transition: Transition): void {}
+
+  /**
+    A hook you can implement to optionally redirect to another route.
+
+    Calling `this.transitionTo` from inside of the `redirect` hook will
+    abort the current transition (into the route that has implemented `redirect`).
+
+    `redirect` and `afterModel` behave very similarly and are
+    called almost at the same time, but they have an important
+    distinction when calling `this.transitionTo` to a child route
+    of the current route. From `afterModel`, this new transition
+    invalidates the current transition, causing `beforeModel`,
+    `model`, and `afterModel` hooks to be called again. But the
+    same transition started from `redirect` does _not_ invalidate
+    the current transition. In other words, by the time the `redirect`
+    hook has been called, both the resolved model and the attempted
+    entry into this route are considered fully validated.
+
+    @method redirect
+    @param {Object} model the model for this route
+    @param {Transition} transition the transition object associated with the current transition
+    @since 1.0.0
+    @public
+  */
+  redirect(_model: T, _transition: Transition) {}
+
+  /**
+    Called when the context is changed by router.js.
+
+    @private
+    @method contextDidChange
+  */
+  contextDidChange() {
+    this.currentModel = this.context;
+  }
+
+  /**
+    A hook you can implement to convert the URL into the model for
+    this route.
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('post', { path: '/posts/:post_id' });
+    });
+
+    export default Router;
+    ```
+
+    The model for the `post` route is `store.findRecord('post', params.post_id)`.
+
+    By default, if your route has a dynamic segment ending in `_id`:
+
+    * The model class is determined from the segment (`post_id`'s
+      class is `App.Post`)
+    * The find method is called on the model class with the value of
+      the dynamic segment.
+
+    Note that for routes with dynamic segments, this hook is not always
+    executed. If the route is entered through a transition (e.g. when
+    using the `link-to` Handlebars helper or the `transitionTo` method
+    of routes), and a model context is already provided this hook
+    is not called.
+
+    A model context does not include a primitive string or number,
+    which does cause the model hook to be called.
+
+    Routes without dynamic segments will always execute the model hook.
+
+    ```javascript
+    // no dynamic segment, model hook always called
+    this.transitionTo('posts');
+
+    // model passed in, so model hook not called
+    thePost = store.findRecord('post', 1);
+    this.transitionTo('post', thePost);
+
+    // integer passed in, model hook is called
+    this.transitionTo('post', 1);
+
+    // model id passed in, model hook is called
+    // useful for forcing the hook to execute
+    thePost = store.findRecord('post', 1);
+    this.transitionTo('post', thePost.id);
+    ```
+
+    This hook follows the asynchronous/promise semantics
+    described in the documentation for `beforeModel`. In particular,
+    if a promise returned from `model` fails, the error will be
+    handled by the `error` hook on `Route`.
+
+    Example
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+
+    export default class PostRoute extends Route {
+      model(params) {
+        return this.store.findRecord('post', params.post_id);
+      }
+    }
+    ```
+
+    @method model
+    @param {Object} params the parameters extracted from the URL
+    @param {Transition} transition
+    @return {any | Promise<any>} the model for this route. If
+      a promise is returned, the transition will pause until
+      the promise resolves, and the resolved value of the promise
+      will be used as the model for this route.
+    @since 1.0.0
+    @public
+  */
+  model(params: Record<string, unknown>, transition: Transition): T | PromiseLike<T> | undefined {
+    let name, sawParams, value;
+    // SAFETY: Since `_qp` is protected we can't infer the type
+    let queryParams = (get(this, '_qp') as Route<T>['_qp']).map;
+
+    for (let prop in params) {
+      if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
+        continue;
+      }
+
+      let match = prop.match(/^(.*)_id$/);
+      if (match !== null) {
+        name = match[1];
+        value = params[prop];
+      }
+      sawParams = true;
+    }
+
+    if (!name) {
+      if (sawParams) {
+        // SAFETY: This should be equivalent
+        return Object.assign({}, params) as T;
+      } else {
+        if (transition.resolveIndex < 1) {
+          return;
+        }
+        // SAFETY: This should be correct, but TS is unable to infer this.
+        return transition[STATE_SYMBOL]!.routeInfos[transition.resolveIndex - 1]!.context as
+          | T
+          | PromiseLike<T>
+          | undefined;
+      }
+    }
+
+    return this.findModel(name, value);
+  }
+
+  /**
+    @private
+    @method deserialize
+    @param {Object} params the parameters extracted from the URL
+    @param {Transition} transition
+    @return {any | Promise<any>} the model for this route.
+
+    Router.js hook.
+   */
+  deserialize(_params: {}, transition: Transition) {
+    return this.model(this._paramsFor(this.routeName, _params), transition);
+  }
+
+  /**
+
+    @method findModel
+    @param {String} type the model type
+    @param {Object} value the value passed to find
+    @private
+  */
+  findModel(...args: any[]) {
+    return (get(this, 'store') as any).find(...args);
+  }
+
+  /**
+    A hook you can use to setup the controller for the current route.
+
+    This method is called with the controller for the current route and the
+    model supplied by the `model` hook.
+
+    By default, the `setupController` hook sets the `model` property of
+    the controller to the specified `model` when it is not `undefined`.
+
+    If you implement the `setupController` hook in your Route, it will
+    prevent this default behavior. If you want to preserve that behavior
+    when implementing your `setupController` function, make sure to call
+    `super`:
+
+    ```app/routes/photos.js
+    import Route from '@ember/routing/route';
+
+    export default class PhotosRoute extends Route {
+      model() {
+        return this.store.findAll('photo');
+      }
+
+      setupController(controller, model) {
+        super.setupController(controller, model);
+
+        this.controllerFor('application').set('showingPhotos', true);
+      }
+    }
+    ```
+
+    The provided controller will be one resolved based on the name
+    of this route.
+
+    If no explicit controller is defined, Ember will automatically create one.
+
+    As an example, consider the router:
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('post', { path: '/posts/:post_id' });
+    });
+
+    export default Router;
+    ```
+
+    If you have defined a file for the post controller,
+    the framework will use it.
+    If it is not defined, a basic `Controller` instance would be used.
+
+    @example Behavior of a basic Controller
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+
+    export default class PostRoute extends Route {
+      setupController(controller, model) {
+        controller.set('model', model);
+      }
+    });
+    ```
+
+    @method setupController
+    @param {Controller} controller instance
+    @param {Object} model
+    @param {Transition} [transition]
+    @since 1.0.0
+    @public
+  */
+  setupController(controller: Controller, context: T | undefined, _transition?: Transition) {
+    if (controller && context !== undefined) {
+      set(controller, 'model', context);
+    }
+  }
+
+  /**
+    Returns the controller of the current route, or a parent (or any ancestor)
+    route in a route hierarchy.
+
+    The controller instance must already have been created, either through entering the
+    associated route or using `generateController`.
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+
+    export default class PostRoute extends Route {
+      setupController(controller, post) {
+        super.setupController(controller, post);
+
+        this.controllerFor('posts').set('currentPost', post);
+      }
+    }
+    ```
+
+    @method controllerFor
+    @param {String} name the name of the route or controller
+    @return {Controller | undefined}
+    @since 1.0.0
+    @public
+  */
+  controllerFor(name: string, _skipAssert: true): Controller | undefined;
+  controllerFor(name: string, _skipAssert?: false): Controller;
+  controllerFor(name: string, _skipAssert = false): Controller | undefined {
+    let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+    let route = owner.lookup(`route:${name}`) as Route;
+
+    if (route && route.controllerName) {
+      name = route.controllerName;
+    }
+
+    let controller = owner.lookup(`controller:${name}`);
+
+    // NOTE: We're specifically checking that skipAssert is true, because according
+    //   to the old API the second parameter was model. We do not want people who
+    //   passed a model to skip the assertion.
+    assert(
+      `The controller named '${name}' could not be found. Make sure that this route exists and has already been entered at least once. If you are accessing a controller not associated with a route, make sure the controller class is explicitly defined.`,
+      controller !== undefined || _skipAssert === true
+    );
+
+    assert(
+      `Expected controller:${name} to be an instance of Controller`,
+      controller === undefined || controller instanceof Controller
+    );
+
+    return controller;
+  }
+
+  /**
+    Generates a controller for a route.
+
+    Example
+
+    ```app/routes/post.js
+    import Route from '@ember/routing/route';
+
+    export default class Post extends Route {
+      setupController(controller, post) {
+        super.setupController(controller, post);
+
+        this.generateController('posts');
+      }
+    }
+    ```
+
+    @method generateController
+    @param {String} name the name of the controller
+    @private
+  */
+  generateController(name: string) {
+    let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+
+    return generateController(owner, name);
+  }
+
+  /**
+    Returns the resolved model of a parent (or any ancestor) route
+    in a route hierarchy.  During a transition, all routes
+    must resolve a model object, and if a route
+    needs access to a parent route's model in order to
+    resolve a model (or just reuse the model from a parent),
+    it can call `this.modelFor(theNameOfParentRoute)` to
+    retrieve it. If the ancestor route's model was a promise,
+    its resolved result is returned.
+
+    Example
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('post', { path: '/posts/:post_id' }, function() {
+        this.route('comments');
+      });
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/post/comments.js
+    import Route from '@ember/routing/route';
+
+    export default class PostCommentsRoute extends Route {
+      model() {
+        let post = this.modelFor('post');
+
+        return post.comments;
+      }
+    }
+    ```
+
+    @method modelFor
+    @param {String} name the name of the route
+    @return {Object} the model object
+    @since 1.0.0
+    @public
+  */
+  modelFor(_name: string): unknown | undefined {
+    let name;
+    let owner = getOwner(this);
+    assert('Expected router owner to be an EngineInstance', owner instanceof EngineInstance);
+    let transition =
+      this._router && this._router._routerMicrolib
+        ? this._router._routerMicrolib.activeTransition
+        : undefined;
+
+    // Only change the route name when there is an active transition.
+    // Otherwise, use the passed in route name.
+    if (owner.routable && transition !== undefined) {
+      name = getEngineRouteName(owner, _name);
+    } else {
+      name = _name;
+    }
+
+    let route = owner.lookup(`route:${name}`) as Route;
+    // If we are mid-transition, we want to try and look up
+    // resolved parent contexts on the current transitionEvent.
+    if (transition !== undefined && transition !== null) {
+      let modelLookupName = (route && route.routeName) || name;
+      if (Object.prototype.hasOwnProperty.call(transition.resolvedModels, modelLookupName!)) {
+        return transition.resolvedModels[modelLookupName!];
+      }
+    }
+
+    return route?.currentModel;
+  }
+
+  /**
+    `this[RENDER]` is used to render a template into a region of another template
+    (indicated by an `{{outlet}}`).
+
+    @method this[RENDER]
+    @param {String} name the name of the template to render
+    @param {Object} [options] the options
+    @param {String} [options.into] the template to render into,
+                    referenced by name. Defaults to the parent template
+    @param {String} [options.outlet] the outlet inside `options.into` to render into.
+                    Defaults to 'main'
+    @param {String|Object} [options.controller] the controller to use for this template,
+                    referenced by name or as a controller instance. Defaults to the Route's paired controller
+    @param {Object} [options.model] the model object to set on `options.controller`.
+                    Defaults to the return value of the Route's model hook
+    @private
+   */
+  [RENDER](name?: string, options?: PartialRenderOptions) {
+    let renderOptions = buildRenderOptions(this, name, options);
+    ROUTE_CONNECTIONS.get(this).push(renderOptions);
+    once(this._router, '_setOutlets');
+  }
+
+  willDestroy() {
+    this.teardownViews();
+  }
+
+  /**
+    @private
+
+    @method teardownViews
+  */
+  teardownViews() {
+    let connections = ROUTE_CONNECTIONS.get(this);
+    if (connections !== undefined && connections.length > 0) {
+      ROUTE_CONNECTIONS.set(this, []);
+      once(this._router, '_setOutlets');
+    }
+  }
+
+  /**
+    Allows you to produce custom metadata for the route.
+    The return value of this method will be attached to
+    its corresponding RouteInfoWithAttributes object.
+
+    Example
+
+    ```app/routes/posts/index.js
+    import Route from '@ember/routing/route';
+
+    export default class PostsIndexRoute extends Route {
+      buildRouteInfoMetadata() {
+        return { title: 'Posts Page' }
+      }
+    }
+    ```
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { service } from '@ember/service';
+
+    export default class ApplicationRoute extends Route {
+      @service router
+
+      constructor() {
+        super(...arguments);
+
+        this.router.on('routeDidChange', transition => {
+          document.title = transition.to.metadata.title;
+          // would update document's title to "Posts Page"
+        });
+      }
+    }
+    ```
+    @method buildRouteInfoMetadata
+    @return any
+    @since 3.10.0
+    @public
+   */
+  buildRouteInfoMetadata(): unknown;
+  buildRouteInfoMetadata(): void {}
+
+  private _paramsFor(routeName: string, params: {}) {
+    let transition = this._router._routerMicrolib.activeTransition;
+    if (transition !== undefined) {
+      return this.paramsFor(routeName);
+    }
+
+    return params;
+  }
+
+  /**
+    Store property provides a hook for data persistence libraries to inject themselves.
+
+    By default, this store property provides the exact same functionality previously
+    in the model hook.
+
+    Currently, the required interface is:
+
+    `store.find(modelName, findArguments)`
+
+    @property store
+    @type {Object}
+    @private
+  */
+  @computed
+  protected get store() {
+    const owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+    let routeName = this.routeName;
+
+    return {
+      find(name: string, value: unknown) {
+        let modelClass: any = owner.factoryFor(`model:${name}`);
+
+        assert(
+          `You used the dynamic segment \`${name}_id\` in your route ` +
+            `\`${routeName}\` for which Ember requires you provide a ` +
+            `data-loading implementation. Commonly, that is done by ` +
+            `adding a model hook implementation on the route ` +
+            `(\`model({${name}_id}) {\`) or by injecting an implemention of ` +
+            `a data store: \`@service store;\`.`,
+          Boolean(modelClass)
+        );
+
+        if (!modelClass) {
+          return;
+        }
+
+        modelClass = modelClass.class;
+
+        assert(
+          `You used the dynamic segment \`${name}_id\` in your route ` +
+            `\`${routeName}\` for which Ember requires you provide a ` +
+            `data-loading implementation. Commonly, that is done by ` +
+            `adding a model hook implementation on the route ` +
+            `(\`model({${name}_id}) {\`) or by injecting an implemention of ` +
+            `a data store: \`@service store;\`.\n\n` +
+            `Rarely, applications may attempt to use a legacy behavior where ` +
+            `the model class (in this case \`${name}\`) is resolved and the ` +
+            `\`find\` method on that class is invoked to load data. In this ` +
+            `application, a model of \`${name}\` was found but it did not ` +
+            `provide a \`find\` method. You should not add a \`find\` ` +
+            `method to your model. Instead, please implement an appropriate ` +
+            `\`model\` hook on the \`${routeName}\` route.`,
+          typeof modelClass.find === 'function'
+        );
+
+        return modelClass.find(value);
+      },
+    };
+  }
+
+  protected set store(value: any) {
+    defineProperty(this, 'store', null, value);
+  }
+
+  /**
+    @private
+    @property _qp
+    */
+  @computed
+  protected get _qp(): QueryParamMeta {
+    let combinedQueryParameterConfiguration: ReturnType<typeof mergeEachQueryParams> = {};
+
+    let controllerName = this.controllerName || this.routeName;
+    let owner = getOwner(this);
+    assert('Route is unexpectedly missing an owner', owner);
+    let controller = owner.lookup(`controller:${controllerName}`);
+    let queryParameterConfiguraton = get(this, 'queryParams');
+    let hasRouterDefinedQueryParams = Object.keys(queryParameterConfiguraton).length > 0;
+
+    if (controller) {
+      assert('Expected an instance of controller', controller instanceof Controller);
+
+      // the developer has authored a controller class in their application for
+      // this route find its query params and normalize their object shape them
+      // merge in the query params for the route. As a mergedProperty,
+      // Route#queryParams is always at least `{}`
+
+      let controllerDefinedQueryParameterConfiguration =
+        (get(controller, 'queryParams') as Controller['queryParams']) || [];
+      let normalizedControllerQueryParameterConfiguration = normalizeControllerQueryParams(
+        controllerDefinedQueryParameterConfiguration
+      );
+      combinedQueryParameterConfiguration = mergeEachQueryParams(
+        normalizedControllerQueryParameterConfiguration,
+        queryParameterConfiguraton
+      );
+    } else if (hasRouterDefinedQueryParams) {
+      // the developer has not defined a controller but *has* supplied route query params.
+      // Generate a class for them so we can later insert default values
+      controller = generateController(owner, controllerName);
+      combinedQueryParameterConfiguration = queryParameterConfiguraton;
+    }
+
+    let qps: QueryParam[] = [];
+    let map: Record<string, QueryParam> = {};
+    let propertyNames: string[] = [];
+
+    for (let propName in combinedQueryParameterConfiguration) {
+      if (!Object.prototype.hasOwnProperty.call(combinedQueryParameterConfiguration, propName)) {
+        continue;
+      }
+
+      // to support the dubious feature of using unknownProperty
+      // on queryParams configuration
+      if (propName === 'unknownProperty' || propName === '_super') {
+        // possible todo: issue deprecation warning?
+        continue;
+      }
+
+      let desc = combinedQueryParameterConfiguration[propName];
+      assert(`[BUG] missing query parameter configuration for ${propName}`, desc);
+
+      let scope = desc.scope || 'model';
+      let parts: string[] | undefined = undefined;
+
+      if (scope === 'controller') {
+        parts = [];
+      }
+
+      let urlKey = desc.as || this.serializeQueryParamKey(propName);
+      let defaultValue = get(controller!, propName);
+
+      defaultValue = copyDefaultValue(defaultValue);
+
+      let type = desc.type || typeOf(defaultValue);
+
+      let defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
+      let scopedPropertyName = `${controllerName}:${propName}`;
+      let qp: QueryParam = {
+        undecoratedDefaultValue: get(controller!, propName),
+        defaultValue,
+        serializedDefaultValue: defaultValueSerialized,
+        serializedValue: defaultValueSerialized,
+
+        type,
+        urlKey,
+        prop: propName,
+        scopedPropertyName,
+        controllerName,
+        route: this,
+        parts, // provided later when stashNames is called if 'model' scope
+        values: null, // provided later when setup is called. no idea why.
+        scope,
+      };
+
+      map[propName] = map[urlKey] = map[scopedPropertyName] = qp;
+      qps.push(qp);
+      propertyNames.push(propName);
+    }
+
+    return {
+      qps,
+      map,
+      propertyNames,
+      states: {
+        /*
+          Called when a query parameter changes in the URL, this route cares
+          about that query parameter, but the route is not currently
+          in the active route hierarchy.
+        */
+        inactive: (prop: string, value: unknown) => {
+          let qp = map[prop];
+          assert('expected inactive callback to only be called for registered qps', qp);
+          this._qpChanged(prop, value, qp);
+        },
+        /*
+          Called when a query parameter changes in the URL, this route cares
+          about that query parameter, and the route is currently
+          in the active route hierarchy.
+        */
+        active: (prop: string, value: unknown) => {
+          let qp = map[prop];
+          assert('expected active callback to only be called for registered qps', qp);
+          this._qpChanged(prop, value, qp);
+          return this._activeQPChanged(qp, value);
+        },
+        /*
+          Called when a value of a query parameter this route handles changes in a controller
+          and the route is currently in the active route hierarchy.
+        */
+        allowOverrides: (prop: string, value: unknown) => {
+          let qp = map[prop];
+          assert('expected allowOverrides callback to only be called for registered qps', qp);
+          this._qpChanged(prop, value, qp);
+          return this._updatingQPChanged(qp);
+        },
+      },
+    };
+  }
+
+  // Set in reopen
+  declare actions: Record<string, AnyFn>;
+
+  /**
+    Sends an action to the router, which will delegate it to the currently
+    active route hierarchy per the bubbling rules explained under `actions`.
+
+    Example
+
+    ```app/router.js
+    // ...
+
+    Router.map(function() {
+      this.route('index');
+    });
+
+    export default Router;
+    ```
+
+    ```app/routes/application.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class ApplicationRoute extends Route {
+      @action
+      track(arg) {
+        console.log(arg, 'was clicked');
+      }
+    }
+    ```
+
+    ```app/routes/index.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class IndexRoute extends Route {
+      @action
+      trackIfDebug(arg) {
+        if (debug) {
+          this.send('track', arg);
+        }
+      }
+    }
+    ```
+
+    @method send
+    @param {String} name the name of the action to trigger
+    @param {...*} args
+    @since 1.0.0
+    @public
+  */
+  // Set with reopen to override parent behavior
+  declare send: <K extends keyof this | keyof this['actions']>(
+    name: K,
+    ...args: MaybeParameters<
+      K extends keyof this ? this[K] : K extends keyof this['actions'] ? this['actions'][K] : never
+    >
+  ) => MaybeReturnType<
+    K extends keyof this ? this[K] : K extends keyof this['actions'] ? this['actions'][K] : never
+  >;
+}
+
+function parentRoute(route: Route) {
+  let routeInfo = routeInfoFor(route, route._router._routerMicrolib.state!.routeInfos, -1);
+  return routeInfo && routeInfo.route;
+}
+
+function routeInfoFor(route: Route, routeInfos: InternalRouteInfo<Route>[], offset = 0) {
+  if (!routeInfos) {
+    return;
+  }
+
+  let current: Route | undefined;
+  for (let i = 0; i < routeInfos.length; i++) {
+    let routeInfo = routeInfos[i];
+    assert('has current routeInfo', routeInfo);
+    current = routeInfo.route;
+    if (current === route) {
+      return routeInfos[i + offset];
+    }
+  }
+
+  return;
+}
+
+function buildRenderOptions(
+  route: Route,
+  nameOrOptions?: string | PartialRenderOptions,
+  options?: PartialRenderOptions
+): RenderOptions {
+  let isDefaultRender = !nameOrOptions && !options;
+  let _name;
+  if (!isDefaultRender) {
+    if (typeof nameOrOptions === 'object' && !options) {
+      _name = route.templateName || route.routeName;
+      options = nameOrOptions;
+    } else {
+      assert(
+        'The name in the given arguments is undefined or empty string',
+        !isEmpty(nameOrOptions)
+      );
+      _name = nameOrOptions!;
+    }
+  }
+  assert(
+    'You passed undefined as the outlet name.',
+    isDefaultRender || !(options && 'outlet' in options && options.outlet === undefined)
+  );
+
+  let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
+  let name, templateName, into, outlet, model;
+  let controller;
+
+  if (options) {
+    into = options.into && options.into.replace(/\//g, '.');
+    outlet = options.outlet;
+    controller = options.controller;
+    model = options.model;
+  }
+  outlet = outlet || 'main';
+
+  if (isDefaultRender) {
+    name = route.routeName;
+    templateName = route.templateName || name;
+  } else {
+    name = _name!.replace(/\//g, '.');
+    templateName = name;
+  }
+
+  if (controller === undefined) {
+    if (isDefaultRender) {
+      controller = route.controllerName || owner.lookup(`controller:${name}`);
+    } else {
+      controller = owner.lookup(`controller:${name}`) || route.controllerName || route.routeName;
+    }
+  }
+
+  if (typeof controller === 'string') {
+    let controllerName = controller;
+    controller = owner.lookup(`controller:${controllerName}`);
+    assert(
+      `You passed \`controller: '${controllerName}'\` into the \`render\` method, but no such controller could be found.`,
+      isDefaultRender || controller !== undefined
+    );
+  }
+
+  assert('Expected an instance of controller', controller instanceof Controller);
+
+  if (model === undefined) {
+    model = route.currentModel;
+  } else {
+    controller.set('model', model);
+  }
+
+  let template = owner.lookup(`template:${templateName}`) as TemplateFactory;
+  assert(
+    `Could not find "${templateName}" template, view, or component.`,
+    isDefaultRender || template !== undefined
+  );
+
+  let parent: any;
+  if (into && (parent = parentRoute(route)) && into === parent.routeName) {
+    into = undefined;
+  }
+
+  let renderOptions: RenderOptions = {
+    owner,
+    into,
+    outlet,
+    name,
+    controller,
+    model,
+    template: template !== undefined ? template(owner) : route._topLevelViewTemplate(owner),
+  };
+
+  if (DEBUG) {
+    let LOG_VIEW_LOOKUPS = get(route._router, 'namespace.LOG_VIEW_LOOKUPS');
+    if (LOG_VIEW_LOOKUPS && !template) {
+      info(`Could not find "${name}" template. Nothing will be rendered`, {
+        fullName: `template:${name}`,
+      });
+    }
+  }
+
+  return renderOptions;
+}
+
+export interface RenderOptions {
+  owner: Owner;
+  into?: string;
+  outlet: string;
+  name: string;
+  controller: Controller | string | undefined;
+  model: unknown;
+  template: Template;
+}
+
+type PartialRenderOptions = Partial<
+  Pick<RenderOptions, 'into' | 'outlet' | 'controller' | 'model'>
+>;
+
+export function getFullQueryParams<R extends Route>(
+  router: EmberRouter<R>,
+  state: RouteTransitionState<R>
+) {
+  if (state.fullQueryParams) {
+    return state.fullQueryParams;
+  }
+
+  let haveAllRouteInfosResolved = state.routeInfos.every((routeInfo) => routeInfo.route);
+
+  let fullQueryParamsState: Record<string, unknown> = {
+    ...state.queryParams,
+  };
+
+  router._deserializeQueryParams(state.routeInfos, fullQueryParamsState);
+
+  // only cache query params state if all routeinfos have resolved; it's possible
+  // for lazy routes to not have resolved when `getFullQueryParams` is called, so
+  // we wait until all routes have resolved prior to caching query params state
+  if (haveAllRouteInfosResolved) {
+    state.fullQueryParams = fullQueryParamsState;
+  }
+
+  return fullQueryParamsState;
+}
+
+function getQueryParamsFor<R extends Route>(
+  route: R,
+  state: RouteTransitionState<R>
+): Record<string, unknown> {
+  state.queryParamsFor = state.queryParamsFor || {};
+  let name = route.fullRouteName;
+
+  let existing = state.queryParamsFor[name];
+  if (existing) {
+    return existing;
+  }
+
+  let fullQueryParams = getFullQueryParams(route._router, state);
+
+  let params: Record<string, unknown> = (state.queryParamsFor[name] = {});
+
+  // Copy over all the query params for this route/controller into params hash.
+  // SAFETY: Since `_qp` is protected we can't infer the type
+  let qps = (get(route, '_qp') as Route<ModelFor<R>>['_qp']).qps;
+  for (let qp of qps) {
+    // Put deserialized qp on params hash.
+    let qpValueWasPassedIn = qp.prop in fullQueryParams;
+    params[qp.prop] = qpValueWasPassedIn
+      ? fullQueryParams[qp.prop]
+      : copyDefaultValue(qp.defaultValue);
+  }
+
+  return params;
+}
+
+// FIXME: This should probably actually return a `NativeArray` if the passed in value is an Array.
+function copyDefaultValue<T>(value: T): T {
+  if (Array.isArray(value)) {
+    // SAFETY: We lost the type data about the array if we don't cast.
+    return emberA(value.slice()) as unknown as T;
+  }
+  return value;
+}
+
+/*
+  Merges all query parameters from a controller with those from
+  a route, returning a new object and avoiding any mutations to
+  the existing objects.
+*/
+function mergeEachQueryParams(
+  controllerQP: Record<string, ExpandedControllerQueryParam>,
+  routeQP: Route['queryParams']
+) {
+  let qps: Record<
+    string,
+    {
+      type?: ControllerQueryParamType;
+      as?: string | null;
+      replace?: boolean;
+      refreshModel?: boolean;
+      scope?: string;
+    }
+  > = {};
+  let keysAlreadyMergedOrSkippable: Record<string, true> = {
+    defaultValue: true,
+    type: true,
+    scope: true,
+    as: true,
+  };
+
+  // first loop over all controller qps, merging them with any matching route qps
+  // into a new empty object to avoid mutating.
+  for (let cqpName in controllerQP) {
+    if (!Object.prototype.hasOwnProperty.call(controllerQP, cqpName)) {
+      continue;
+    }
+
+    qps[cqpName] = { ...controllerQP[cqpName], ...routeQP[cqpName] };
+
+    // allows us to skip this QP when we check route QPs.
+    keysAlreadyMergedOrSkippable[cqpName] = true;
+  }
+
+  // loop over all route qps, skipping those that were merged in the first pass
+  // because they also appear in controller qps
+  for (let rqpName in routeQP) {
+    if (
+      !Object.prototype.hasOwnProperty.call(routeQP, rqpName) ||
+      keysAlreadyMergedOrSkippable[rqpName]
+    ) {
+      continue;
+    }
+
+    qps[rqpName] = { ...routeQP[rqpName], ...controllerQP[rqpName] };
+  }
+
+  return qps;
+}
+
+function addQueryParamsObservers(controller: any, propNames: string[]) {
+  propNames.forEach((prop) => {
+    if (descriptorForProperty(controller, prop) === undefined) {
+      let desc = lookupDescriptor(controller, prop);
+
+      if (desc !== null && (typeof desc.get === 'function' || typeof desc.set === 'function')) {
+        defineProperty(
+          controller,
+          prop,
+          dependentKeyCompat({
+            get: desc.get,
+            set: desc.set,
+          })
+        );
+      }
+    }
+
+    addObserver(controller, `${prop}.[]`, controller, controller._qpChanged, false);
+  });
+}
+
+function getEngineRouteName(engine: EngineInstance, routeName: string) {
+  if (engine.routable) {
+    let prefix = engine.mountPoint;
+
+    if (routeName === 'application') {
+      return prefix;
+    } else {
+      return `${prefix}.${routeName}`;
+    }
+  }
+
+  return routeName;
+}
+
+const defaultSerialize = Route.prototype.serialize;
+
+export { defaultSerialize };
+
+export function hasDefaultSerialize(route: Route): boolean {
+  return route.serialize === defaultSerialize;
+}
+
+// Set these here so they can be overridden with extend
+Route.reopen({
+  mergedProperties: ['queryParams'],
+  queryParams: {},
+  templateName: null,
+  controllerName: null,
+
+  send(...args: any[]) {
+    assert(
+      `Attempted to call .send() with the action '${args[0]}' on the destroyed route '${this.routeName}'.`,
+      !this.isDestroying && !this.isDestroyed
+    );
+    if ((this._router && this._router._routerMicrolib) || !isTesting()) {
+      this._router.send(...args);
+    } else {
+      let name = args.shift();
+      let action = this.actions[name];
+      if (action) {
+        return action.apply(this, args);
+      }
+    }
+  },
+
+  /**
+    The controller associated with this route.
+
+    Example
+
+    ```app/routes/form.js
+    import Route from '@ember/routing/route';
+    import { action } from '@ember/object';
+
+    export default class FormRoute extends Route {
+      @action
+      willTransition(transition) {
+        if (this.controller.get('userHasEnteredData') &&
+            !confirm('Are you sure you want to abandon progress?')) {
+          transition.abort();
+        } else {
+          // Bubble the `willTransition` action so that
+          // parent routes can decide whether or not to abort.
+          return true;
+        }
+      }
+    }
+    ```
+
+    @property controller
+    @type Controller
+    @since 1.6.0
+    @public
+  */
+
+  actions: {
+    /**
+    This action is called when one or more query params have changed. Bubbles.
+
+    @method queryParamsDidChange
+    @param changed {Object} Keys are names of query params that have changed.
+    @param totalPresent {Object} Keys are names of query params that are currently set.
+    @param removed {Object} Keys are names of query params that have been removed.
+    @returns {boolean}
+    @private
+   */
+    queryParamsDidChange<T>(this: Route<T>, changed: {}, _totalPresent: unknown, removed: {}) {
+      // SAFETY: Since `_qp` is protected we can't infer the type
+      let qpMap = (get(this, '_qp') as Route<T>['_qp']).map;
+
+      let totalChanged = Object.keys(changed).concat(Object.keys(removed));
+      for (let change of totalChanged) {
+        let qp = qpMap[change];
+        if (qp) {
+          let options = this._optionsForQueryParam(qp);
+          assert('options exists', options && typeof options === 'object');
+          if ((get(options, 'refreshModel') as boolean) && this._router.currentState) {
+            this.refresh();
+            break;
+          }
+        }
+      }
+
+      return true;
+    },
+
+    finalizeQueryParamChange<T>(
+      this: Route<T>,
+      params: Record<string, string | null | undefined>,
+      finalParams: {}[],
+      transition: Transition
+    ) {
+      if (this.fullRouteName !== 'application') {
+        return true;
+      }
+
+      // Transition object is absent for intermediate transitions.
+      if (!transition) {
+        return;
+      }
+
+      let routeInfos = transition[STATE_SYMBOL]!.routeInfos;
+      let router = this._router;
+      let qpMeta = router._queryParamsFor(routeInfos);
+      let changes = router._qpUpdates;
+      let qpUpdated = false;
+      let replaceUrl;
+
+      stashParamNames(router, routeInfos);
+
+      for (let qp of qpMeta.qps) {
+        let route = qp.route;
+        let controller = route.controller;
+        let presentKey = qp.urlKey in params && qp.urlKey;
+
+        // Do a reverse lookup to see if the changed query
+        // param URL key corresponds to a QP property on
+        // this controller.
+        let value;
+        let svalue: string | null | undefined;
+        if (changes.has(qp.urlKey)) {
+          // Value updated in/before setupController
+          value = get(controller, qp.prop);
+          svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
+        } else {
+          if (presentKey) {
+            svalue = params[presentKey];
+
+            if (svalue !== undefined) {
+              value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
+            }
+          } else {
+            // No QP provided; use default value.
+            svalue = qp.serializedDefaultValue;
+            value = copyDefaultValue(qp.defaultValue);
+          }
+        }
+
+        // SAFETY: Since `_qp` is protected we can't infer the type
+        controller._qpDelegate = (get(route, '_qp') as Route<T>['_qp']).states.inactive;
+
+        let thisQueryParamChanged = svalue !== qp.serializedValue;
+        if (thisQueryParamChanged) {
+          if (transition.queryParamsOnly && replaceUrl !== false) {
+            let options = route._optionsForQueryParam(qp);
+            let replaceConfigValue = get(options, 'replace');
+            if (replaceConfigValue) {
+              replaceUrl = true;
+            } else if (replaceConfigValue === false) {
+              // Explicit pushState wins over any other replaceStates.
+              replaceUrl = false;
+            }
+          }
+
+          set(controller, qp.prop, value);
+
+          qpUpdated = true;
+        }
+
+        // Stash current serialized value of controller.
+        qp.serializedValue = svalue;
+
+        let thisQueryParamHasDefaultValue = qp.serializedDefaultValue === svalue;
+        if (!thisQueryParamHasDefaultValue) {
+          finalParams.push({
+            value: svalue,
+            visible: true,
+            key: presentKey || qp.urlKey,
+          });
+        }
+      }
+
+      // Some QPs have been updated, and those changes need to be propogated
+      // immediately. Eventually, we should work on making this async somehow.
+      if (qpUpdated === true) {
+        flushAsyncObservers(false);
+      }
+
+      if (replaceUrl) {
+        transition.method('replace');
+      }
+
+      qpMeta.qps.forEach((qp: QueryParam) => {
+        // SAFETY: Since `_qp` is protected we can't infer the type
+        let routeQpMeta = get(qp.route, '_qp') as Route<T>['_qp'];
+        let finalizedController = qp.route.controller;
+        finalizedController['_qpDelegate'] = get(routeQpMeta, 'states.active');
+      });
+
+      router._qpUpdates.clear();
+      return;
+    },
+  },
+});
+
+export default Route;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index b8d5cfe0fbc..306bed7e5bf 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -84,6 +84,7 @@ import Observable from '@ember/object/observable';
 import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
+import Route from '@ember/routing/route';
 
 import {
   templateOnlyComponent,
@@ -511,7 +512,7 @@ Ember.generateControllerFactory = routing.generateControllerFactory;
 Ember.generateController = routing.generateController;
 Ember.RouterDSL = routing.RouterDSL;
 Ember.Router = routing.Router;
-Ember.Route = routing.Route;
+Ember.Route = Route;
 
 runLoadHooks('Ember.Application', Application);
 
diff --git a/packages/ember/tests/application_lifecycle_test.js b/packages/ember/tests/application_lifecycle_test.js
index 54970ce1e9b..53111b39cac 100644
--- a/packages/ember/tests/application_lifecycle_test.js
+++ b/packages/ember/tests/application_lifecycle_test.js
@@ -1,6 +1,7 @@
 import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
 import Application from '@ember/application';
-import { Route, Router } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import { Router } from '@ember/-internals/routing';
 import { Component } from '@ember/-internals/glimmer';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index 12da2cfe089..8e210876337 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -1,4 +1,4 @@
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { computed } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/-internals/runtime';
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index b422a3a107c..65fba98b39c 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -2,7 +2,8 @@
 import { getOwner } from '@ember/-internals/owner';
 import RSVP from 'rsvp';
 import { compile } from 'ember-template-compiler';
-import { Route, NoneLocation, HistoryLocation } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import { NoneLocation, HistoryLocation } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 import {
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index a14533c89e7..0c9273afa72 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/-internals/runtime';
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 578ab33774a..52a096c97f6 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -5,7 +5,7 @@ import { RSVP, A as emberA } from '@ember/-internals/runtime';
 import { run } from '@ember/runloop';
 import { peekMeta } from '@ember/-internals/meta';
 import { get, computed, tracked } from '@ember/-internals/metal';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { PARAMS_SYMBOL } from 'router_js';
 
 import { QueryParamTestCase, moduleFor, getTextOf, runLoopSettled } from 'internal-test-helpers';
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index ad99d04f6fa..97b28be6518 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { A as emberA } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { computed } from '@ember/-internals/metal';
 import { QueryParamTestCase, moduleFor, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js b/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
index 52bc340828a..e49943210a3 100644
--- a/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/overlapping_query_params_test.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import Mixin from '@ember/object/mixin';
 import { QueryParamTestCase, moduleFor, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index 7c78124c955..25efe401ee3 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -1,6 +1,6 @@
 import { get } from '@ember/-internals/metal';
 import { RSVP } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 
 import { QueryParamTestCase, moduleFor } from 'internal-test-helpers';
 
diff --git a/packages/ember/tests/routing/router_service_test/basic_test.js b/packages/ember/tests/routing/router_service_test/basic_test.js
index a3dd983f08f..eaf771ccdaa 100644
--- a/packages/ember/tests/routing/router_service_test/basic_test.js
+++ b/packages/ember/tests/routing/router_service_test/basic_test.js
@@ -1,4 +1,5 @@
-import { Route, NoneLocation } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import { NoneLocation } from '@ember/-internals/routing';
 import { set } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { service } from '@ember/service';
diff --git a/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js b/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
index 3c0a9483800..0ca6c63b7d8 100644
--- a/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
+++ b/packages/ember/tests/routing/router_service_test/build_routeinfo_metadata_test.js
@@ -1,6 +1,6 @@
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { service } from '@ember/service';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 
 moduleFor(
   'buildRouteInfoMetadata',
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index 2c27c1cdaeb..6302176ea1e 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -1,7 +1,7 @@
 import { service } from '@ember/service';
 import { readOnly } from '@ember/object/computed';
 import { Component } from '@ember/-internals/glimmer';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { get } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { RSVP } from '@ember/-internals/runtime';
diff --git a/packages/ember/tests/routing/router_service_test/events_test.js b/packages/ember/tests/routing/router_service_test/events_test.js
index 2f2946d184a..0fc95d6a87d 100644
--- a/packages/ember/tests/routing/router_service_test/events_test.js
+++ b/packages/ember/tests/routing/router_service_test/events_test.js
@@ -1,6 +1,6 @@
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { service } from '@ember/service';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { later } from '@ember/runloop';
 
 moduleFor(
diff --git a/packages/ember/tests/routing/router_service_test/recognize_test.js b/packages/ember/tests/routing/router_service_test/recognize_test.js
index fa2274b3175..b7f33cf82fa 100644
--- a/packages/ember/tests/routing/router_service_test/recognize_test.js
+++ b/packages/ember/tests/routing/router_service_test/recognize_test.js
@@ -1,5 +1,5 @@
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 
 moduleFor(
   'Router Service - recognize',
diff --git a/packages/ember/tests/routing/router_service_test/refresh_test.js b/packages/ember/tests/routing/router_service_test/refresh_test.js
index 9b0d08c06e2..a45400d58c8 100644
--- a/packages/ember/tests/routing/router_service_test/refresh_test.js
+++ b/packages/ember/tests/routing/router_service_test/refresh_test.js
@@ -1,4 +1,4 @@
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index a5c84311586..4ffa7a4dcf4 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -1,6 +1,7 @@
 import { service } from '@ember/service';
 import { Component } from '@ember/-internals/glimmer';
-import { Route, NoneLocation } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
+import { NoneLocation } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
diff --git a/packages/ember/tests/routing/router_service_test/urlFor_test.js b/packages/ember/tests/routing/router_service_test/urlFor_test.js
index 7eef0f561d8..99222ac1fa4 100644
--- a/packages/ember/tests/routing/router_service_test/urlFor_test.js
+++ b/packages/ember/tests/routing/router_service_test/urlFor_test.js
@@ -1,6 +1,6 @@
 import Controller from '@ember/controller';
 import { capitalize } from '@ember/string';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import { get } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 
diff --git a/packages/ember/tests/routing/substates_test.js b/packages/ember/tests/routing/substates_test.js
index 494a3bd5542..0dfbc1755e6 100644
--- a/packages/ember/tests/routing/substates_test.js
+++ b/packages/ember/tests/routing/substates_test.js
@@ -1,5 +1,5 @@
 import { RSVP } from '@ember/-internals/runtime';
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 
 import { moduleFor, ApplicationTestCase, runTask } from 'internal-test-helpers';
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index 29f63d2e179..ab9be48996d 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import { Route } from '@ember/-internals/routing';
+import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/-internals/runtime';

From 42c7ceaafbd613c9101f1d9a00ae908c0d6f02ba Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 13:43:14 -0700
Subject: [PATCH 1060/1405] Consolidate @ember/routing/router

---
 .../link-to/rendering-angle-test.js           |    2 +-
 packages/@ember/-internals/routing/index.ts   |    8 +-
 .../-internals/routing/lib/services/router.ts |    2 +-
 .../routing/lib/services/routing.ts           |    2 +-
 .../-internals/routing/lib/system/router.ts   | 1930 ----------------
 .../routing/lib/system/router_state.ts        |    2 +-
 .../@ember/-internals/routing/lib/utils.ts    |    2 +-
 .../routing/tests/system/dsl_test.js          |    2 +-
 .../routing/tests/system/router_test.js       |    2 +-
 packages/@ember/application/index.ts          |    2 +-
 packages/@ember/application/instance.ts       |    2 +-
 .../application/tests/application_test.js     |    3 +-
 .../@ember/application/tests/reset_test.js    |    2 +-
 packages/@ember/routing/route.ts              |    4 +-
 packages/@ember/routing/router.ts             | 1938 ++++++++++++++++-
 packages/ember/index.js                       |    3 +-
 .../ember/tests/application_lifecycle_test.js |    2 +-
 .../ember/tests/routing/router_map_test.js    |    2 +-
 .../non_application_test_test.js              |    3 +-
 .../lib/test-cases/application.ts             |    2 +-
 .../lib/test-cases/autoboot-application.ts    |    2 +-
 21 files changed, 1965 insertions(+), 1952 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/system/router.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index b292bb2e740..6a9fb10a5f0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -5,7 +5,7 @@ import {
   RouterNonApplicationTestCase,
   runTask,
 } from 'internal-test-helpers';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import { set } from '@ember/-internals/metal';
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 4ea3ad643dd..6820fa385b3 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -9,8 +9,8 @@ export {
   generateControllerFactory,
 } from './lib/system/generate_controller';
 export { default as controllerFor } from './lib/system/controller_for';
-export { default as RouterDSL } from './lib/system/dsl';
-export { default as Router, QueryParam } from './lib/system/router';
+export { default as RouterDSL, DSLCallback } from './lib/system/dsl';
+export { EngineRouteInfo } from './lib/system/engines';
 export { default as QueryParams } from './lib/system/query_params';
 export { default as RoutingService } from './lib/services/routing';
 export {
@@ -23,10 +23,14 @@ export { default as BucketCache } from './lib/system/cache';
 export {
   calculateCacheKey,
   deprecateTransitionMethods,
+  extractRouteArgs,
+  getActiveTargetName,
   normalizeControllerQueryParams,
   prefixRouteNameArg,
+  resemblesURL,
   stashParamNames,
   ExpandedControllerQueryParam,
   NamedRouteArgs,
   RouteArgs,
+  RouteOptions,
 } from './lib/utils';
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
index 5a5e0df057a..20127f6a6fb 100644
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ b/packages/@ember/-internals/routing/lib/services/router.ts
@@ -6,7 +6,7 @@ import Service from '@ember/service';
 import { consumeTag, tagFor } from '@glimmer/validator';
 import type { ModelFor, Transition } from 'router_js';
 import type Route from '@ember/routing/route';
-import EmberRouter from '../system/router';
+import EmberRouter from '@ember/routing/router';
 import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
 import type { RouteArgs, RouteOptions } from '../utils';
 import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index 2fec4b0813f..c6ad663c864 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -8,7 +8,7 @@ import { readOnly } from '@ember/object/computed';
 import Service from '@ember/service';
 import type { ModelFor } from 'router_js';
 import type Route from '@ember/routing/route';
-import EmberRouter from '../system/router';
+import EmberRouter from '@ember/routing/router';
 import type RouterState from '../system/router_state';
 import { ROUTER } from './router';
 
diff --git a/packages/@ember/-internals/routing/lib/system/router.ts b/packages/@ember/-internals/routing/lib/system/router.ts
deleted file mode 100644
index 8b856ceae27..00000000000
--- a/packages/@ember/-internals/routing/lib/system/router.ts
+++ /dev/null
@@ -1,1930 +0,0 @@
-import { privatize as P } from '@ember/-internals/container';
-import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
-import { computed, get, set } from '@ember/-internals/metal';
-import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
-import { getOwner } from '@ember/-internals/owner';
-import { BucketCache } from '@ember/-internals/routing';
-import type RouterService from '@ember/-internals/routing/lib/services/router';
-import EmberObject from '@ember/object';
-import { A as emberA, typeOf } from '@ember/-internals/runtime';
-import Evented from '@ember/object/evented';
-import { assert, deprecate, info } from '@ember/debug';
-import EmberError from '@ember/error';
-import { cancel, once, run, scheduleOnce } from '@ember/runloop';
-import { DEBUG } from '@glimmer/env';
-import type { EmberLocation as IEmberLocation } from '../location/api';
-import EmberLocation from '../location/api';
-import type { RouteArgs, RouteOptions } from '../utils';
-import { calculateCacheKey, extractRouteArgs, getActiveTargetName, resemblesURL } from '../utils';
-import type { DSLCallback } from './dsl';
-import DSL from './dsl';
-import type { QueryParamMeta, RenderOptions } from '@ember/routing/route';
-import type Route from '@ember/routing/route';
-import {
-  defaultSerialize,
-  getFullQueryParams,
-  hasDefaultSerialize,
-  ROUTE_CONNECTIONS,
-} from '@ember/routing/route';
-import RouterState from './router_state';
-
-/**
-@module @ember/routing
-*/
-
-import type {
-  InternalRouteInfo,
-  ModelFor,
-  RouteInfo,
-  RouteInfoWithAttributes,
-  Transition,
-  TransitionError,
-  TransitionState,
-} from 'router_js';
-import Router, { logAbort, STATE_SYMBOL } from 'router_js';
-import type { Timer } from 'backburner';
-import type { EngineRouteInfo } from './engines';
-import EngineInstance from '@ember/engine/instance';
-import type { QueryParams } from 'route-recognizer';
-import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
-
-function defaultDidTransition<R extends Route>(
-  this: EmberRouter<R>,
-  infos: InternalRouteInfo<R>[]
-) {
-  updatePaths(this);
-
-  this._cancelSlowTransitionTimer();
-
-  this.notifyPropertyChange('url');
-  this.set('currentState', this.targetState);
-
-  if (DEBUG) {
-    // @ts-expect-error namespace isn't public
-    if (this.namespace.LOG_TRANSITIONS) {
-      // eslint-disable-next-line no-console
-      console.log(`Transitioned into '${EmberRouter._routePath(infos)}'`);
-    }
-  }
-}
-
-function defaultWillTransition<R extends Route>(
-  this: EmberRouter<R>,
-  oldInfos: InternalRouteInfo<R>[],
-  newInfos: InternalRouteInfo<R>[]
-) {
-  if (DEBUG) {
-    // @ts-expect-error namespace isn't public
-    if (this.namespace.LOG_TRANSITIONS) {
-      // eslint-disable-next-line no-console
-      console.log(
-        `Preparing to transition from '${EmberRouter._routePath(
-          oldInfos
-        )}' to '${EmberRouter._routePath(newInfos)}'`
-      );
-    }
-  }
-}
-
-let freezeRouteInfo: Function;
-if (DEBUG) {
-  freezeRouteInfo = (transition: Transition) => {
-    if (transition.from !== null && !Object.isFrozen(transition.from)) {
-      Object.freeze(transition.from);
-    }
-
-    if (transition.to !== null && !Object.isFrozen(transition.to)) {
-      Object.freeze(transition.to);
-    }
-  };
-}
-
-interface RenderOutletState {
-  name: string;
-  outlet: string;
-}
-
-interface NestedOutletState {
-  [key: string]: OutletState;
-}
-
-interface OutletState<T extends RenderOutletState = RenderOutletState> {
-  render: T;
-  outlets: NestedOutletState;
-  wasUsed?: boolean;
-}
-
-export interface QueryParam {
-  prop: string;
-  urlKey: string;
-  type: string;
-  route: Route;
-  parts?: string[];
-  values: {} | null;
-  scopedPropertyName: string;
-  scope: string;
-  defaultValue: unknown;
-  undecoratedDefaultValue: unknown;
-  serializedValue: string | null | undefined;
-  serializedDefaultValue: string | null | undefined;
-  controllerName: string;
-}
-
-function K(this: Router<Route>) {
-  return this;
-}
-
-const { slice } = Array.prototype;
-
-/**
-  The `EmberRouter` class manages the application state and URLs. Refer to
-  the [routing guide](https://guides.emberjs.com/release/routing/) for documentation.
-
-  @class EmberRouter
-  @extends EmberObject
-  @uses Evented
-  @public
-*/
-class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) implements Evented {
-  /**
-   Represents the URL of the root of the application, often '/'. This prefix is
-    assumed on all routes defined on this router.
-
-    @property rootURL
-    @default '/'
-    @public
-  */
-  // Set with reopen to allow overriding via extend
-  declare rootURL: string;
-
-  /**
-   The `location` property determines the type of URL's that your
-    application will use.
-
-    The following location types are currently available:
-
-    * `history` - use the browser's history API to make the URLs look just like any standard URL
-    * `hash` - use `#` to separate the server part of the URL from the Ember part: `/blog/#/posts/new`
-    * `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)
-    * `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`
-
-    This value is defaulted to `history` by the `locationType` setting of `/config/environment.js`
-
-    @property location
-    @default 'hash'
-    @see {Location}
-    @public
-  */
-  // Set with reopen to allow overriding via extend
-  declare location: string | IEmberLocation;
-
-  _routerMicrolib!: Router<R>;
-  _didSetupRouter = false;
-  _initialTransitionStarted = false;
-
-  currentURL: string | null = null;
-  currentRouteName: string | null = null;
-  currentPath: string | null = null;
-  currentRoute: RouteInfo | RouteInfoWithAttributes | null = null;
-
-  _qpCache: Record<string, { qps: QueryParam[]; map: QueryParamMeta['map'] }> = Object.create(null);
-
-  // Set of QueryParam['urlKey']
-  _qpUpdates: Set<string> = new Set();
-  _queuedQPChanges: Record<string, unknown> = {};
-
-  _bucketCache: BucketCache;
-  _toplevelView: OutletView | null = null;
-  _handledErrors = new Set();
-  _engineInstances: Record<string, Record<string, EngineInstance>> = Object.create(null);
-  _engineInfoByRoute = Object.create(null);
-  _routerService: RouterService<R>;
-
-  _slowTransitionTimer: Timer | null = null;
-
-  private namespace: any;
-
-  // Begin Evented
-  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
-  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
-  declare trigger: (name: string, ...args: any[]) => unknown;
-  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
-  declare has: (name: string) => boolean;
-  // End Evented
-
-  // Set with reopenClass
-  private static dslCallbacks?: DSLCallback[];
-
-  /**
-    The `Router.map` function allows you to define mappings from URLs to routes
-    in your application. These mappings are defined within the
-    supplied callback function using `this.route`.
-
-    The first parameter is the name of the route which is used by default as the
-    path name as well.
-
-    The second parameter is the optional options hash. Available options are:
-
-      * `path`: allows you to provide your own path as well as mark dynamic
-        segments.
-      * `resetNamespace`: false by default; when nesting routes, ember will
-        combine the route names to form the fully-qualified route name, which is
-        used with `{{link-to}}` or manually transitioning to routes. Setting
-        `resetNamespace: true` will cause the route not to inherit from its
-        parent route's names. This is handy for preventing extremely long route names.
-        Keep in mind that the actual URL path behavior is still retained.
-
-    The third parameter is a function, which can be used to nest routes.
-    Nested routes, by default, will have the parent route tree's route name and
-    path prepended to it's own.
-
-    ```app/router.js
-    Router.map(function(){
-      this.route('post', { path: '/post/:post_id' }, function() {
-        this.route('edit');
-        this.route('comments', { resetNamespace: true }, function() {
-          this.route('new');
-        });
-      });
-    });
-    ```
-
-    @method map
-    @param callback
-    @public
-  */
-  static map(callback: DSLCallback) {
-    if (!this.dslCallbacks) {
-      this.dslCallbacks = [];
-      // FIXME: Can we remove this?
-      this.reopenClass({ dslCallbacks: this.dslCallbacks });
-    }
-
-    this.dslCallbacks.push(callback);
-
-    return this;
-  }
-
-  static _routePath(routeInfos: InternalRouteInfo<Route>[]) {
-    let path: string[] = [];
-
-    // We have to handle coalescing resource names that
-    // are prefixed with their parent's names, e.g.
-    // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
-
-    function intersectionMatches(a1: string[], a2: string[]) {
-      for (let i = 0; i < a1.length; ++i) {
-        if (a1[i] !== a2[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    let name, nameParts, oldNameParts;
-    for (let i = 1; i < routeInfos.length; i++) {
-      let routeInfo = routeInfos[i];
-      assert('has routeInfo', routeInfo);
-      name = routeInfo.name;
-      nameParts = name.split('.');
-      oldNameParts = slice.call(path);
-
-      while (oldNameParts.length) {
-        if (intersectionMatches(oldNameParts, nameParts)) {
-          break;
-        }
-        oldNameParts.shift();
-      }
-
-      path.push(...nameParts.slice(oldNameParts.length));
-    }
-
-    return path.join('.');
-  }
-
-  // Note that owner is actually required in this scenario, but since it is strictly
-  // optional in other contexts trying to make it required here confuses TS.
-  constructor(owner?: Owner) {
-    super(owner);
-
-    assert('BUG: Missing owner', owner);
-
-    this._resetQueuedQueryParameterChanges();
-    this.namespace = owner.lookup('application:main');
-
-    let bucketCache = owner.lookup(P`-bucket-cache:main`);
-    assert('BUG: BucketCache should always be present', bucketCache instanceof BucketCache);
-    this._bucketCache = bucketCache;
-
-    let routerService = owner.lookup('service:router') as RouterService<R> | undefined;
-    assert('BUG: RouterService should always be present', routerService !== undefined);
-    this._routerService = routerService;
-  }
-
-  _initRouterJs(): void {
-    let location = get(this, 'location') as IEmberLocation;
-    let router = this;
-    const owner = getOwner(this);
-    assert('Router is unexpectedly missing an owner', owner);
-    let seen = Object.create(null);
-
-    class PrivateRouter extends Router<R> {
-      getRoute(name: string): R {
-        let routeName = name;
-        let routeOwner = owner;
-        let engineInfo = router._engineInfoByRoute[routeName];
-
-        if (engineInfo) {
-          let engineInstance = router._getEngineInstance(engineInfo);
-
-          routeOwner = engineInstance;
-          routeName = engineInfo.localFullName;
-        }
-
-        let fullRouteName = `route:${routeName}`;
-
-        assert('Route is unexpectedly missing an owner', routeOwner);
-
-        let route = routeOwner.lookup(fullRouteName) as R | undefined;
-
-        if (seen[name]) {
-          assert('seen routes should exist', route);
-          return route;
-        }
-
-        seen[name] = true;
-
-        if (!route) {
-          // SAFETY: this is configured in `commonSetupRegistry` in the
-          // `@ember/application/lib` package.
-          let DefaultRoute: any = routeOwner.factoryFor('route:basic')!.class;
-          routeOwner.register(fullRouteName, DefaultRoute.extend());
-          route = routeOwner.lookup(fullRouteName) as R;
-
-          if (DEBUG) {
-            if (router.namespace.LOG_ACTIVE_GENERATION) {
-              info(`generated -> ${fullRouteName}`, { fullName: fullRouteName });
-            }
-          }
-        }
-
-        route._setRouteName(routeName);
-
-        if (engineInfo && !hasDefaultSerialize(route)) {
-          throw new Error(
-            'Defining a custom serialize method on an Engine route is not supported.'
-          );
-        }
-
-        return route;
-      }
-
-      getSerializer(name: string) {
-        let engineInfo = router._engineInfoByRoute[name];
-
-        // If this is not an Engine route, we fall back to the handler for serialization
-        if (!engineInfo) {
-          return;
-        }
-
-        return engineInfo.serializeMethod || defaultSerialize;
-      }
-
-      updateURL(path: string) {
-        once(() => {
-          location.setURL(path);
-          set(router, 'currentURL', path);
-        });
-      }
-
-      // TODO: merge into routeDidChange
-      didTransition(infos: InternalRouteInfo<R>[]) {
-        assert(
-          'You attempted to override the "didTransition" method which has been deprecated. Please inject the router service and listen to the "routeDidChange" event.',
-          router.didTransition === defaultDidTransition
-        );
-        router.didTransition<R>(infos);
-      }
-
-      // TODO: merge into routeWillChange
-      willTransition(oldInfos: InternalRouteInfo<R>[], newInfos: InternalRouteInfo<R>[]) {
-        assert(
-          'You attempted to override the "willTransition" method which has been deprecated. Please inject the router service and listen to the "routeWillChange" event.',
-          router.willTransition === defaultWillTransition
-        );
-        router.willTransition<R>(oldInfos, newInfos);
-      }
-
-      triggerEvent<N extends MethodNamesOf<typeof defaultActionHandlers>>(
-        routeInfos: InternalRouteInfo<R>[],
-        ignoreFailure: boolean,
-        name: N,
-        args: OmitFirst<Parameters<typeof defaultActionHandlers[N]>>
-      ) {
-        return triggerEvent.bind(router)(routeInfos, ignoreFailure, name, args);
-      }
-
-      routeWillChange(transition: Transition) {
-        router.trigger('routeWillChange', transition);
-
-        if (DEBUG) {
-          freezeRouteInfo(transition);
-        }
-        router._routerService.trigger('routeWillChange', transition);
-
-        // in case of intermediate transition we update the current route
-        // to make router.currentRoute.name consistent with router.currentRouteName
-        // see https://github.com/emberjs/ember.js/issues/19449
-        if (transition.isIntermediate) {
-          router.set('currentRoute', transition.to);
-        }
-      }
-
-      routeDidChange(transition: Transition) {
-        router.set('currentRoute', transition.to);
-        once(() => {
-          router.trigger('routeDidChange', transition);
-
-          if (DEBUG) {
-            freezeRouteInfo(transition);
-          }
-          router._routerService.trigger('routeDidChange', transition);
-        });
-      }
-
-      transitionDidError(error: TransitionError, transition: Transition) {
-        if (error.wasAborted || transition.isAborted) {
-          // If the error was a transition erorr or the transition aborted
-          // log the abort.
-          return logAbort(transition);
-        } else {
-          // Otherwise trigger the "error" event to attempt an intermediate
-          // transition into an error substate
-          transition.trigger(false, 'error', error.error, transition, error.route);
-          if (router._isErrorHandled(error.error)) {
-            // If we handled the error with a substate just roll the state back on
-            // the transition and send the "routeDidChange" event for landing on
-            // the error substate and return the error.
-            transition.rollback();
-            this.routeDidChange(transition);
-            return error.error;
-          } else {
-            // If it was not handled, abort the transition completely and return
-            // the error.
-            transition.abort();
-            return error.error;
-          }
-        }
-      }
-
-      replaceURL(url: string) {
-        if (location.replaceURL) {
-          let doReplaceURL = () => {
-            location.replaceURL!(url);
-            set(router, 'currentURL', url);
-          };
-          once(doReplaceURL);
-        } else {
-          this.updateURL(url);
-        }
-      }
-    }
-
-    let routerMicrolib = (this._routerMicrolib = new PrivateRouter());
-
-    let dslCallbacks = (this.constructor as any).dslCallbacks || [K];
-    let dsl = this._buildDSL();
-
-    dsl.route(
-      'application',
-      { path: '/', resetNamespace: true, overrideNameAssertion: true },
-      function () {
-        for (let i = 0; i < dslCallbacks.length; i++) {
-          dslCallbacks[i].call(this);
-        }
-      }
-    );
-
-    if (DEBUG) {
-      if (this.namespace.LOG_TRANSITIONS_INTERNAL) {
-        routerMicrolib.log = console.log.bind(console); // eslint-disable-line no-console
-      }
-    }
-
-    routerMicrolib.map(dsl.generate());
-  }
-
-  _buildDSL(): DSL {
-    let enableLoadingSubstates = this._hasModuleBasedResolver();
-    let router = this;
-    const owner = getOwner(this);
-    assert('Router is unexpectedly missing an owner', owner);
-    let options = {
-      enableLoadingSubstates,
-      resolveRouteMap(name: string) {
-        return owner.factoryFor(`route-map:${name}`)!;
-      },
-      addRouteForEngine(name: string, engineInfo: EngineRouteInfo) {
-        if (!router._engineInfoByRoute[name]) {
-          router._engineInfoByRoute[name] = engineInfo;
-        }
-      },
-    };
-
-    return new DSL(null, options);
-  }
-
-  /*
-    Resets all pending query parameter changes.
-    Called after transitioning to a new route
-    based on query parameter changes.
-  */
-  _resetQueuedQueryParameterChanges() {
-    this._queuedQPChanges = {};
-  }
-
-  _hasModuleBasedResolver() {
-    let owner = getOwner(this);
-    assert('Router is unexpectedly missing an owner', owner);
-    let resolver = get(owner, 'application.__registry__.resolver.moduleBasedResolver');
-    return Boolean(resolver);
-  }
-
-  /**
-    Initializes the current router instance and sets up the change handling
-    event listeners used by the instances `location` implementation.
-
-    A property named `initialURL` will be used to determine the initial URL.
-    If no value is found `/` will be used.
-
-    @method startRouting
-    @private
-  */
-  startRouting() {
-    if (this.setupRouter()) {
-      let initialURL = get(this, 'initialURL') as string | undefined;
-      if (initialURL === undefined) {
-        initialURL = (get(this, 'location') as IEmberLocation).getURL();
-      }
-      let initialTransition = this.handleURL(initialURL);
-      if (initialTransition && initialTransition.error) {
-        throw initialTransition.error;
-      }
-    }
-  }
-
-  setupRouter() {
-    if (this._didSetupRouter) {
-      return false;
-    }
-    this._didSetupRouter = true;
-    this._setupLocation();
-
-    let location = get(this, 'location') as IEmberLocation;
-
-    // Allow the Location class to cancel the router setup while it refreshes
-    // the page
-    if (get(location, 'cancelRouterSetup')) {
-      return false;
-    }
-
-    this._initRouterJs();
-
-    location.onUpdateURL((url: string) => {
-      this.handleURL(url);
-    });
-
-    return true;
-  }
-
-  _setOutlets() {
-    // This is triggered async during Route#willDestroy.
-    // If the router is also being destroyed we do not want to
-    // to create another this._toplevelView (and leak the renderer)
-    if (this.isDestroying || this.isDestroyed) {
-      return;
-    }
-
-    let routeInfos = this._routerMicrolib.currentRouteInfos;
-    if (!routeInfos) {
-      return;
-    }
-
-    let defaultParentState: OutletState | undefined;
-    let liveRoutes = null;
-
-    for (let routeInfo of routeInfos) {
-      let route = routeInfo.route!;
-      let connections = ROUTE_CONNECTIONS.get(route);
-      let ownState: OutletState;
-      if (connections.length === 0) {
-        ownState = representEmptyRoute(liveRoutes, defaultParentState, route);
-      } else {
-        for (let j = 0; j < connections.length; j++) {
-          let appended = appendLiveRoute(liveRoutes, defaultParentState, connections[j]);
-          liveRoutes = appended.liveRoutes;
-          let { name, outlet } = appended.ownState.render;
-          if (name === route.routeName || outlet === 'main') {
-            ownState = appended.ownState;
-          }
-        }
-      }
-      defaultParentState = ownState!;
-    }
-
-    // when a transitionTo happens after the validation phase
-    // during the initial transition _setOutlets is called
-    // when no routes are active. However, it will get called
-    // again with the correct values during the next turn of
-    // the runloop
-    if (!liveRoutes) {
-      return;
-    }
-
-    if (!this._toplevelView) {
-      let owner = getOwner(this);
-      assert('Router is unexpectedly missing an owner', owner);
-      let OutletView = owner.factoryFor('view:-outlet') as Factory<OutletView, FactoryClass>;
-      let application = owner.lookup('application:main');
-      let environment = owner.lookup('-environment:main');
-      let template = owner.lookup('template:-outlet');
-      this._toplevelView = OutletView.create({ environment, template, application });
-      this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
-      let instance: any = owner.lookup('-application-instance:main');
-      if (instance) {
-        instance.didCreateRootView(this._toplevelView);
-      }
-    } else {
-      this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
-    }
-  }
-
-  handleURL(url: string) {
-    // Until we have an ember-idiomatic way of accessing #hashes, we need to
-    // remove it because router.js doesn't know how to handle it.
-    let _url = url.split(/#(.+)?/)[0]!;
-    return this._doURLTransition('handleURL', _url);
-  }
-
-  _doURLTransition<M extends 'handleURL' | 'transitionTo'>(routerJsMethod: M, url: string) {
-    this._initialTransitionStarted = true;
-    let transition = this._routerMicrolib[routerJsMethod](url || '/');
-    didBeginTransition(transition, this);
-    return transition;
-  }
-
-  /**
-    Transition the application into another route. The route may
-    be either a single route or route path:
-
-    @method transitionTo
-    @param {String} [name] the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used while
-      transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-      containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @public
-  */
-  transitionTo(...args: RouteArgs<R>): Transition {
-    if (resemblesURL(args[0])) {
-      assert(
-        `A transition was attempted from '${this.currentRouteName}' to '${args[0]}' but the application instance has already been destroyed.`,
-        !this.isDestroying && !this.isDestroyed
-      );
-      return this._doURLTransition('transitionTo', args[0]);
-    }
-    let { routeName, models, queryParams } = extractRouteArgs<R>(args);
-    assert(
-      `A transition was attempted from '${this.currentRouteName}' to '${routeName}' but the application instance has already been destroyed.`,
-      !this.isDestroying && !this.isDestroyed
-    );
-    return this._doTransition(routeName, models, queryParams);
-  }
-
-  intermediateTransitionTo(name: string, ...args: any[]) {
-    this._routerMicrolib.intermediateTransitionTo(name, ...args);
-
-    updatePaths(this);
-
-    if (DEBUG) {
-      let infos = this._routerMicrolib.currentRouteInfos;
-      if (this.namespace.LOG_TRANSITIONS) {
-        assert('expected infos to be set', infos);
-        // eslint-disable-next-line no-console
-        console.log(`Intermediate-transitioned into '${EmberRouter._routePath(infos)}'`);
-      }
-    }
-  }
-
-  /**
-    Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
-    it replaces the entry for the current route.
-    When the user clicks the "back" button in the browser, there will be fewer steps.
-    This is most commonly used to manage redirects in a way that does not cause confusing additions
-    to the user's browsing history.
-
-    @method replaceWith
-    @param {String} [name] the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used while
-      transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-      containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @public
-  */
-  replaceWith(...args: RouteArgs<R>): Transition {
-    return this.transitionTo(...args).method('replace');
-  }
-
-  generate(name: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]) {
-    let url = this._routerMicrolib.generate(name, ...args);
-    assert('expected non-string location', typeof this.location !== 'string');
-    return this.location.formatURL(url);
-  }
-
-  /**
-    Determines if the supplied route is currently active.
-
-    @method isActive
-    @param routeName
-    @return {Boolean}
-    @private
-  */
-  isActive(routeName: string) {
-    return this._routerMicrolib.isActive(routeName);
-  }
-
-  /**
-    An alternative form of `isActive` that doesn't require
-    manual concatenation of the arguments into a single
-    array.
-
-    @method isActiveIntent
-    @param routeName
-    @param models
-    @param queryParams
-    @return {Boolean}
-    @private
-    @since 1.7.0
-  */
-  isActiveIntent(routeName: string, models: ModelFor<R>[], queryParams: Record<string, unknown>) {
-    return this.currentState!.isActiveIntent(routeName, models, queryParams);
-  }
-
-  send(name: string, ...args: any[]) {
-    /*name, context*/
-    this._routerMicrolib.trigger(name, ...args);
-  }
-
-  /**
-    Does this router instance have the given route.
-
-    @method hasRoute
-    @return {Boolean}
-    @private
-  */
-  hasRoute(route: string) {
-    return this._routerMicrolib.hasRoute(route);
-  }
-
-  /**
-    Resets the state of the router by clearing the current route
-    handlers and deactivating them.
-
-    @private
-    @method reset
-   */
-  reset() {
-    this._didSetupRouter = false;
-    this._initialTransitionStarted = false;
-    if (this._routerMicrolib) {
-      this._routerMicrolib.reset();
-    }
-  }
-
-  willDestroy() {
-    if (this._toplevelView) {
-      this._toplevelView.destroy();
-      this._toplevelView = null;
-    }
-
-    super.willDestroy();
-
-    this.reset();
-
-    let instances = this._engineInstances;
-    for (let name in instances) {
-      let instanceMap = instances[name];
-      assert('has instanceMap', instanceMap);
-      for (let id in instanceMap) {
-        let instance = instanceMap[id];
-        assert('has instance', instance);
-        run(instance, 'destroy');
-      }
-    }
-  }
-
-  /*
-    Called when an active route's query parameter has changed.
-    These changes are batched into a runloop run and trigger
-    a single transition.
-  */
-  _activeQPChanged(queryParameterName: string, newValue: unknown) {
-    this._queuedQPChanges[queryParameterName] = newValue;
-    once(this, this._fireQueryParamTransition);
-  }
-
-  // The queryParameterName is QueryParam['urlKey']
-  _updatingQPChanged(queryParameterName: string) {
-    this._qpUpdates.add(queryParameterName);
-  }
-
-  /*
-    Triggers a transition to a route based on query parameter changes.
-    This is called once per runloop, to batch changes.
-
-    e.g.
-
-    if these methods are called in succession:
-    this._activeQPChanged('foo', '10');
-      // results in _queuedQPChanges = { foo: '10' }
-    this._activeQPChanged('bar', false);
-      // results in _queuedQPChanges = { foo: '10', bar: false }
-
-    _queuedQPChanges will represent both of these changes
-    and the transition using `transitionTo` will be triggered
-    once.
-  */
-  _fireQueryParamTransition() {
-    this.transitionTo({ queryParams: this._queuedQPChanges });
-    this._resetQueuedQueryParameterChanges();
-  }
-
-  _setupLocation() {
-    let location = this.location;
-    let rootURL = this.rootURL;
-    let owner = getOwner(this);
-    assert('Router is unexpectedly missing an owner', owner);
-
-    if ('string' === typeof location) {
-      let resolvedLocation = owner.lookup(`location:${location}`) as IEmberLocation;
-
-      if (location === 'auto') {
-        deprecate(
-          "Router location 'auto' is deprecated. Most users will want to set `locationType` to 'history' in config/environment.js for no change in behavior. See deprecation docs for details.",
-          false,
-          {
-            id: 'deprecate-auto-location',
-            until: '5.0.0',
-            url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
-            for: 'ember-source',
-            since: {
-              available: '4.1.0',
-              enabled: '4.1.0',
-            },
-          }
-        );
-      }
-
-      if (resolvedLocation !== undefined) {
-        location = set(this, 'location', resolvedLocation);
-      } else {
-        // Allow for deprecated registration of custom location API's
-        let options = {
-          implementation: location,
-        };
-
-        location = set(this, 'location', EmberLocation.create(options));
-      }
-    }
-
-    if (location !== null && typeof location === 'object') {
-      if (rootURL) {
-        set(location, 'rootURL', rootURL);
-      }
-
-      // Allow the location to do any feature detection, such as AutoLocation
-      // detecting history support. This gives it a chance to set its
-      // `cancelRouterSetup` property which aborts routing.
-      if (typeof location.detect === 'function') {
-        if (this.location !== 'auto') {
-          deprecate(
-            'The `detect` method on the Location object is deprecated. If you need detection you can run your detection code in app.js, before setting the location type.',
-            false,
-            {
-              id: 'deprecate-auto-location',
-              until: '5.0.0',
-              url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
-              for: 'ember-source',
-              since: {
-                available: '4.1.0',
-                enabled: '4.1.0',
-              },
-            }
-          );
-        }
-
-        location.detect();
-      }
-
-      // ensure that initState is called AFTER the rootURL is set on
-      // the location instance
-      if (typeof location.initState === 'function') {
-        location.initState();
-      }
-    }
-  }
-
-  /**
-    Serializes the given query params according to their QP meta information.
-
-    @private
-    @method _serializeQueryParams
-    @param {Arrray<RouteInfo>} routeInfos
-    @param {Object} queryParams
-    @return {Void}
-  */
-  _serializeQueryParams(
-    routeInfos: InternalRouteInfo<R>[],
-    queryParams: Record<string, unknown>
-  ): asserts queryParams is Record<string, string | null | undefined> {
-    forEachQueryParam(
-      this,
-      routeInfos,
-      queryParams,
-      (key: string, value: unknown, qp: QueryParam | undefined) => {
-        if (qp) {
-          delete queryParams[key];
-          queryParams[qp.urlKey] = qp.route.serializeQueryParam(value, qp.urlKey, qp.type);
-        } else if (value === undefined) {
-          return; // We don't serialize undefined values
-        } else {
-          queryParams[key] = this._serializeQueryParam(value, typeOf(value));
-        }
-      }
-    );
-  }
-
-  /**
-    Serializes the value of a query parameter based on a type
-
-    @private
-    @method _serializeQueryParam
-    @param {Object} value
-    @param {String} type
-  */
-  _serializeQueryParam(value: unknown, type: string) {
-    if (value === null || value === undefined) {
-      return value;
-    } else if (type === 'array') {
-      return JSON.stringify(value);
-    }
-
-    return `${value}`;
-  }
-
-  /**
-    Deserializes the given query params according to their QP meta information.
-
-    @private
-    @method _deserializeQueryParams
-    @param {Array<RouteInfo>} routeInfos
-    @param {Object} queryParams
-    @return {Void}
-  */
-  _deserializeQueryParams(
-    routeInfos: InternalRouteInfo<R>[],
-    queryParams: Record<string, unknown>
-  ) {
-    forEachQueryParam(
-      this,
-      routeInfos,
-      queryParams,
-      (key: string, value: unknown, qp: QueryParam | undefined) => {
-        // If we don't have QP meta info for a given key, then we do nothing
-        // because all values will be treated as strings
-        if (qp) {
-          delete queryParams[key];
-          queryParams[qp.prop] = qp.route.deserializeQueryParam(value, qp.urlKey, qp.type);
-        }
-      }
-    );
-  }
-
-  /**
-    Deserializes the value of a query parameter based on a default type
-
-    @private
-    @method _deserializeQueryParam
-    @param {Object} value
-    @param {String} defaultType
-  */
-  _deserializeQueryParam(value: unknown, defaultType: string) {
-    if (value === null || value === undefined) {
-      return value;
-    } else if (defaultType === 'boolean') {
-      return value === 'true';
-    } else if (defaultType === 'number') {
-      return Number(value).valueOf();
-    } else if (defaultType === 'array') {
-      return emberA(JSON.parse(value as string));
-    }
-    return value;
-  }
-
-  /**
-    Removes (prunes) any query params with default values from the given QP
-    object. Default values are determined from the QP meta information per key.
-
-    @private
-    @method _pruneDefaultQueryParamValues
-    @param {Array<RouteInfo>} routeInfos
-    @param {Object} queryParams
-    @return {Void}
-  */
-  _pruneDefaultQueryParamValues(
-    routeInfos: InternalRouteInfo<R>[],
-    queryParams: Record<string, string | null | undefined>
-  ) {
-    let qps = this._queryParamsFor(routeInfos);
-    for (let key in queryParams) {
-      let qp = qps.map[key];
-      if (qp && qp.serializedDefaultValue === queryParams[key]) {
-        delete queryParams[key];
-      }
-    }
-  }
-
-  _doTransition(
-    _targetRouteName: string | undefined,
-    models: ModelFor<R>[],
-    _queryParams: Record<string, unknown>,
-    _fromRouterService?: boolean
-  ): Transition {
-    let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
-    assert(
-      `The route ${targetRouteName} was not found`,
-      Boolean(targetRouteName) && this._routerMicrolib.hasRoute(targetRouteName)
-    );
-
-    this._initialTransitionStarted = true;
-
-    let queryParams: Record<string, unknown> = {};
-
-    this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);
-
-    Object.assign(queryParams, _queryParams);
-
-    this._prepareQueryParams(targetRouteName, models, queryParams, Boolean(_fromRouterService));
-
-    let transition = this._routerMicrolib.transitionTo(targetRouteName, ...models, { queryParams });
-
-    didBeginTransition(transition, this);
-
-    return transition;
-  }
-
-  _processActiveTransitionQueryParams(
-    targetRouteName: string,
-    models: ModelFor<R>[],
-    queryParams: Record<string, unknown>,
-    _queryParams: {}
-  ) {
-    // merge in any queryParams from the active transition which could include
-    // queryParams from the url on initial load.
-    if (!this._routerMicrolib.activeTransition) {
-      return;
-    }
-
-    let unchangedQPs: Record<string, unknown> = {};
-    let qpUpdates = this._qpUpdates;
-    let params = getFullQueryParams(this, this._routerMicrolib.activeTransition[STATE_SYMBOL]);
-    for (let key in params) {
-      if (!qpUpdates.has(key)) {
-        unchangedQPs[key] = params[key];
-      }
-    }
-
-    // We need to fully scope queryParams so that we can create one object
-    // that represents both passed-in queryParams and ones that aren't changed
-    // from the active transition.
-    this._fullyScopeQueryParams(targetRouteName, models, _queryParams);
-    this._fullyScopeQueryParams(targetRouteName, models, unchangedQPs);
-    Object.assign(queryParams, unchangedQPs);
-  }
-
-  /**
-    Prepares the query params for a URL or Transition. Restores any undefined QP
-    keys/values, serializes all values, and then prunes any default values.
-
-    @private
-    @method _prepareQueryParams
-    @param {String} targetRouteName
-    @param {Array<Object>} models
-    @param {Object} queryParams
-    @param {boolean} keepDefaultQueryParamValues
-    @return {Void}
-  */
-  _prepareQueryParams(
-    targetRouteName: string,
-    models: ModelFor<R>[],
-    queryParams: Record<string, unknown>,
-    _fromRouterService?: boolean
-  ) {
-    let state = calculatePostTransitionState(this, targetRouteName, models);
-    this._hydrateUnsuppliedQueryParams(state, queryParams, Boolean(_fromRouterService));
-    this._serializeQueryParams(state.routeInfos, queryParams);
-
-    if (!_fromRouterService) {
-      this._pruneDefaultQueryParamValues(state.routeInfos, queryParams);
-    }
-  }
-
-  /**
-    Returns the meta information for the query params of a given route. This
-    will be overridden to allow support for lazy routes.
-
-    @private
-    @method _getQPMeta
-    @param {RouteInfo} routeInfo
-    @return {Object}
-  */
-  _getQPMeta(routeInfo: InternalRouteInfo<R>) {
-    let route = routeInfo.route;
-    return route && (get(route, '_qp') as Route['_qp']);
-  }
-
-  /**
-    Returns a merged query params meta object for a given set of routeInfos.
-    Useful for knowing what query params are available for a given route hierarchy.
-
-    @private
-    @method _queryParamsFor
-    @param {Array<RouteInfo>} routeInfos
-    @return {Object}
-   */
-  _queryParamsFor(routeInfos: InternalRouteInfo<R>[]) {
-    let routeInfoLength = routeInfos.length;
-    let leafRouteName = routeInfos[routeInfoLength - 1]!.name;
-    let cached = this._qpCache[leafRouteName];
-    if (cached !== undefined) {
-      return cached;
-    }
-
-    let shouldCache = true;
-    let map: QueryParamMeta['map'] = {};
-    let qps = [];
-    let qpsByUrlKey: Record<string, QueryParam> | null = DEBUG ? {} : null;
-    let qpMeta;
-    let urlKey;
-    let qpOther;
-
-    for (let routeInfo of routeInfos) {
-      qpMeta = this._getQPMeta(routeInfo);
-
-      if (!qpMeta) {
-        shouldCache = false;
-        continue;
-      }
-
-      // Loop over each QP to make sure we don't have any collisions by urlKey
-      for (let qp of qpMeta.qps) {
-        if (DEBUG) {
-          urlKey = qp.urlKey;
-          qpOther = qpsByUrlKey![urlKey];
-          if (qpOther && qpOther.controllerName !== qp.controllerName) {
-            assert(
-              `You're not allowed to have more than one controller property map to the same query param key, but both \`${qpOther.scopedPropertyName}\` and \`${qp.scopedPropertyName}\` map to \`${urlKey}\`. You can fix this by mapping one of the controller properties to a different query param key via the \`as\` config option, e.g. \`${qpOther.prop}: { as: 'other-${qpOther.prop}' }\``,
-              false
-            );
-          }
-          qpsByUrlKey![urlKey] = qp;
-        }
-
-        qps.push(qp);
-      }
-
-      Object.assign(map, qpMeta.map);
-    }
-
-    let finalQPMeta = { qps, map };
-
-    if (shouldCache) {
-      this._qpCache[leafRouteName] = finalQPMeta;
-    }
-
-    return finalQPMeta;
-  }
-
-  /**
-    Maps all query param keys to their fully scoped property name of the form
-    `controllerName:propName`.
-
-    @private
-    @method _fullyScopeQueryParams
-    @param {String} leafRouteName
-    @param {Array<Object>} contexts
-    @param {Object} queryParams
-    @return {Void}
-  */
-  _fullyScopeQueryParams(leafRouteName: string, contexts: ModelFor<R>[], queryParams: QueryParams) {
-    let state = calculatePostTransitionState(this, leafRouteName, contexts);
-    let routeInfos = state.routeInfos;
-    let qpMeta;
-    for (let routeInfo of routeInfos) {
-      qpMeta = this._getQPMeta(routeInfo);
-
-      if (!qpMeta) {
-        continue;
-      }
-
-      for (let qp of qpMeta.qps) {
-        let presentProp =
-          (qp.prop in queryParams && qp.prop) ||
-          (qp.scopedPropertyName in queryParams && qp.scopedPropertyName) ||
-          (qp.urlKey in queryParams && qp.urlKey);
-
-        if (presentProp) {
-          if (presentProp !== qp.scopedPropertyName) {
-            queryParams[qp.scopedPropertyName] = queryParams[presentProp];
-            delete queryParams[presentProp];
-          }
-        }
-      }
-    }
-  }
-
-  /**
-    Hydrates (adds/restores) any query params that have pre-existing values into
-    the given queryParams hash. This is what allows query params to be "sticky"
-    and restore their last known values for their scope.
-
-    @private
-    @method _hydrateUnsuppliedQueryParams
-    @param {TransitionState} state
-    @param {Object} queryParams
-    @return {Void}
-  */
-  _hydrateUnsuppliedQueryParams(
-    state: TransitionState<R>,
-    queryParams: QueryParams,
-    _fromRouterService: boolean
-  ): void {
-    let routeInfos = state.routeInfos;
-    let appCache = this._bucketCache;
-    let qpMeta;
-    let qp;
-    let presentProp;
-
-    for (let routeInfo of routeInfos) {
-      qpMeta = this._getQPMeta(routeInfo);
-
-      if (!qpMeta) {
-        continue;
-      }
-
-      // Needs to stay for index loop to avoid throwIfClosureRequired
-      for (let j = 0, qpLen = qpMeta.qps.length; j < qpLen; ++j) {
-        qp = qpMeta.qps[j];
-        assert('expected qp', qp);
-
-        presentProp =
-          (qp.prop in queryParams && qp.prop) ||
-          (qp.scopedPropertyName in queryParams && qp.scopedPropertyName) ||
-          (qp.urlKey in queryParams && qp.urlKey);
-
-        assert(
-          `You passed the \`${presentProp}\` query parameter during a transition into ${qp.route.routeName}, please update to ${qp.urlKey}`,
-          (function () {
-            if (qp.urlKey === presentProp || qp.scopedPropertyName === presentProp) {
-              return true;
-            }
-
-            if (_fromRouterService && presentProp !== false && qp.urlKey !== qp.prop) {
-              // assumptions (mainly from current transitionTo_test):
-              // - this is only supposed to be run when there is an alias to a query param and the alias is used to set the param
-              // - when there is no alias: qp.urlKey == qp.prop
-              return false;
-            }
-
-            return true;
-          })()
-        );
-
-        if (presentProp) {
-          if (presentProp !== qp.scopedPropertyName) {
-            queryParams[qp.scopedPropertyName] = queryParams[presentProp];
-            delete queryParams[presentProp];
-          }
-        } else {
-          let cacheKey = calculateCacheKey(qp.route.fullRouteName, qp.parts, state.params);
-
-          assert(
-            'ROUTER BUG: expected appCache to be defined. This is an internal bug, please open an issue on Github if you see this message!',
-            appCache
-          );
-
-          queryParams[qp.scopedPropertyName] = appCache.lookup(cacheKey, qp.prop, qp.defaultValue);
-        }
-      }
-    }
-  }
-
-  _scheduleLoadingEvent(transition: Transition, originRoute: Route) {
-    this._cancelSlowTransitionTimer();
-    this._slowTransitionTimer = scheduleOnce(
-      'routerTransitions',
-      this,
-      this._handleSlowTransition,
-      transition,
-      originRoute
-    );
-  }
-
-  currentState: null | RouterState<R> = null;
-  targetState = null;
-
-  _handleSlowTransition(transition: Transition, originRoute: Route) {
-    if (!this._routerMicrolib.activeTransition) {
-      // Don't fire an event if we've since moved on from
-      // the transition that put us in a loading state.
-      return;
-    }
-    let targetState = new RouterState(
-      this,
-      this._routerMicrolib,
-      this._routerMicrolib.activeTransition[STATE_SYMBOL]!
-    );
-    this.set('targetState', targetState);
-
-    transition.trigger(true, 'loading', transition, originRoute);
-  }
-
-  _cancelSlowTransitionTimer() {
-    if (this._slowTransitionTimer) {
-      cancel(this._slowTransitionTimer);
-    }
-    this._slowTransitionTimer = null;
-  }
-
-  // These three helper functions are used to ensure errors aren't
-  // re-raised if they're handled in a route's error action.
-  _markErrorAsHandled(error: Error) {
-    this._handledErrors.add(error);
-  }
-
-  _isErrorHandled(error: Error) {
-    return this._handledErrors.has(error);
-  }
-
-  _clearHandledError(error: Error) {
-    this._handledErrors.delete(error);
-  }
-
-  _getEngineInstance({
-    name,
-    instanceId,
-    mountPoint,
-  }: {
-    name: string;
-    instanceId: number;
-    mountPoint: string;
-  }) {
-    let engineInstances = this._engineInstances;
-    let namedInstances = engineInstances[name];
-
-    if (!namedInstances) {
-      namedInstances = Object.create(null);
-      engineInstances[name] = namedInstances!;
-    }
-
-    // We just set these!
-    assert('has namedInstances', namedInstances);
-
-    let engineInstance = namedInstances[instanceId];
-
-    if (!engineInstance) {
-      let owner = getOwner(this);
-      assert('Expected router to have EngineInstance as owner', owner instanceof EngineInstance);
-
-      assert(
-        `You attempted to mount the engine '${name}' in your router map, but the engine can not be found.`,
-        owner.hasRegistration(`engine:${name}`)
-      );
-
-      engineInstance = owner.buildChildEngineInstance(name, {
-        routable: true,
-        mountPoint,
-      });
-
-      engineInstance.boot();
-
-      namedInstances[instanceId] = engineInstance;
-    }
-
-    return engineInstance;
-  }
-
-  /**
-    Handles updating the paths and notifying any listeners of the URL
-    change.
-
-    Triggers the router level `didTransition` hook.
-
-    For example, to notify google analytics when the route changes,
-    you could use this hook.  (Note: requires also including GA scripts, etc.)
-
-    ```javascript
-    import config from './config/environment';
-    import EmberRouter from '@ember/routing/router';
-    import { service } from '@ember/service';
-
-    let Router = EmberRouter.extend({
-      location: config.locationType,
-
-      router: service(),
-
-      didTransition: function() {
-        this._super(...arguments);
-
-        ga('send', 'pageview', {
-          page: this.router.currentURL,
-          title: this.router.currentRouteName,
-        });
-      }
-    });
-    ```
-
-    @method didTransition
-    @private
-    @since 1.2.0
-  */
-  // Set with reopen to allow overriding via extend
-  declare didTransition: typeof defaultDidTransition;
-
-  /**
-    Handles notifying any listeners of an impending URL
-    change.
-
-    Triggers the router level `willTransition` hook.
-
-    @method willTransition
-    @private
-    @since 1.11.0
-  */
-  // Set with reopen to allow overriding via extend
-  declare willTransition: typeof defaultWillTransition;
-
-  /**
-   Represents the current URL.
-
-    @property url
-    @type {String}
-    @private
-  */
-  // Set with reopen to allow overriding via extend
-  declare url: string;
-}
-
-/*
-  Helper function for iterating over routes in a set of routeInfos that are
-  at or above the given origin route. Example: if `originRoute` === 'foo.bar'
-  and the routeInfos given were for 'foo.bar.baz', then the given callback
-  will be invoked with the routes for 'foo.bar', 'foo', and 'application'
-  individually.
-
-  If the callback returns anything other than `true`, then iteration will stop.
-
-  @private
-  @param {Route} originRoute
-  @param {Array<RouteInfo>} routeInfos
-  @param {Function} callback
-  @return {Void}
- */
-function forEachRouteAbove<R extends Route>(
-  routeInfos: InternalRouteInfo<R>[],
-  callback: (route: R, routeInfo: InternalRouteInfo<R>) => boolean
-) {
-  for (let i = routeInfos.length - 1; i >= 0; --i) {
-    let routeInfo = routeInfos[i];
-    assert('has routeInfo', routeInfo);
-
-    let route = routeInfo.route;
-
-    // routeInfo.handler being `undefined` generally means either:
-    //
-    // 1. an error occurred during creation of the route in question
-    // 2. the route is across an async boundary (e.g. within an engine)
-    //
-    // In both of these cases, we cannot invoke the callback on that specific
-    // route, because it just doesn't exist...
-    if (route === undefined) {
-      continue;
-    }
-
-    if (callback(route, routeInfo) !== true) {
-      return;
-    }
-  }
-}
-
-// These get invoked when an action bubbles above ApplicationRoute
-// and are not meant to be overridable.
-let defaultActionHandlers = {
-  willResolveModel<R extends Route>(
-    this: EmberRouter<R>,
-    _routeInfos: InternalRouteInfo<R>[],
-    transition: Transition,
-    originRoute: R
-  ) {
-    this._scheduleLoadingEvent(transition, originRoute);
-  },
-
-  // Attempt to find an appropriate error route or substate to enter.
-  error<R extends Route>(
-    this: EmberRouter<R>,
-    routeInfos: InternalRouteInfo<R>[],
-    error: Error,
-    transition: Transition
-  ) {
-    let router = this;
-
-    let routeInfoWithError = routeInfos[routeInfos.length - 1];
-
-    forEachRouteAbove(routeInfos, (route: R, routeInfo: InternalRouteInfo<R>) => {
-      // We don't check the leaf most routeInfo since that would
-      // technically be below where we're at in the route hierarchy.
-      if (routeInfo !== routeInfoWithError) {
-        // Check for the existence of an 'error' route.
-        let errorRouteName = findRouteStateName(route, 'error');
-        if (errorRouteName) {
-          router._markErrorAsHandled(error);
-          router.intermediateTransitionTo(errorRouteName, error);
-          return false;
-        }
-      }
-
-      // Check for an 'error' substate route
-      let errorSubstateName = findRouteSubstateName(route, 'error');
-      if (errorSubstateName) {
-        router._markErrorAsHandled(error);
-        router.intermediateTransitionTo(errorSubstateName, error);
-        return false;
-      }
-
-      return true;
-    });
-
-    logError(error, `Error while processing route: ${transition.targetName}`);
-  },
-
-  // Attempt to find an appropriate loading route or substate to enter.
-  loading<R extends Route>(
-    this: EmberRouter<R>,
-    routeInfos: InternalRouteInfo<R>[],
-    transition: Transition
-  ) {
-    let router = this;
-
-    let routeInfoWithSlowLoading = routeInfos[routeInfos.length - 1];
-
-    forEachRouteAbove(routeInfos, (route: R, routeInfo: InternalRouteInfo<R>) => {
-      // We don't check the leaf most routeInfos since that would
-      // technically be below where we're at in the route hierarchy.
-      if (routeInfo !== routeInfoWithSlowLoading) {
-        // Check for the existence of a 'loading' route.
-        let loadingRouteName = findRouteStateName(route, 'loading');
-        if (loadingRouteName) {
-          router.intermediateTransitionTo(loadingRouteName);
-          return false;
-        }
-      }
-
-      // Check for loading substate
-      let loadingSubstateName = findRouteSubstateName(route, 'loading');
-      if (loadingSubstateName) {
-        router.intermediateTransitionTo(loadingSubstateName);
-        return false;
-      }
-
-      // Don't bubble above pivot route.
-      return (transition.pivotHandler as any) !== route;
-    });
-  },
-};
-
-function logError(_error: any, initialMessage: string) {
-  let errorArgs = [];
-  let error;
-  if (_error && typeof _error === 'object' && typeof _error.errorThrown === 'object') {
-    error = _error.errorThrown;
-  } else {
-    error = _error;
-  }
-
-  if (initialMessage) {
-    errorArgs.push(initialMessage);
-  }
-
-  if (error) {
-    if (error.message) {
-      errorArgs.push(error.message);
-    }
-    if (error.stack) {
-      errorArgs.push(error.stack);
-    }
-
-    if (typeof error === 'string') {
-      errorArgs.push(error);
-    }
-  }
-
-  console.error(...errorArgs); //eslint-disable-line no-console
-}
-
-/**
-  Finds the name of the substate route if it exists for the given route. A
-  substate route is of the form `route_state`, such as `foo_loading`.
-
-  @private
-  @param {Route} route
-  @param {String} state
-  @return {String}
-*/
-function findRouteSubstateName(route: Route, state: string) {
-  let owner = getOwner(route);
-  assert('Route is unexpectedly missing an owner', owner);
-
-  let { routeName, fullRouteName, _router: router } = route;
-
-  let substateName = `${routeName}_${state}`;
-  let substateNameFull = `${fullRouteName}_${state}`;
-
-  return routeHasBeenDefined(owner, router, substateName, substateNameFull) ? substateNameFull : '';
-}
-
-/**
-  Finds the name of the state route if it exists for the given route. A state
-  route is of the form `route.state`, such as `foo.loading`. Properly Handles
-  `application` named routes.
-
-  @private
-  @param {Route} route
-  @param {String} state
-  @return {String}
-*/
-function findRouteStateName(route: Route, state: string) {
-  let owner = getOwner(route);
-  assert('Route is unexpectedly missing an owner', owner);
-
-  let { routeName, fullRouteName, _router: router } = route;
-
-  let stateName = routeName === 'application' ? state : `${routeName}.${state}`;
-  let stateNameFull = fullRouteName === 'application' ? state : `${fullRouteName}.${state}`;
-
-  return routeHasBeenDefined(owner, router, stateName, stateNameFull) ? stateNameFull : '';
-}
-
-/**
-  Determines whether or not a route has been defined by checking that the route
-  is in the Router's map and the owner has a registration for that route.
-
-  @private
-  @param {Owner} owner
-  @param {Router} router
-  @param {String} localName
-  @param {String} fullName
-  @return {Boolean}
-*/
-function routeHasBeenDefined(owner: Owner, router: any, localName: string, fullName: string) {
-  let routerHasRoute = router.hasRoute(fullName);
-  let ownerHasRoute =
-    owner.hasRegistration(`template:${localName}`) || owner.hasRegistration(`route:${localName}`);
-  return routerHasRoute && ownerHasRoute;
-}
-
-export function triggerEvent<
-  R extends Route,
-  N extends MethodNamesOf<typeof defaultActionHandlers>
->(
-  this: EmberRouter<R>,
-  routeInfos: InternalRouteInfo<R>[],
-  ignoreFailure: boolean,
-  name: N,
-  args: OmitFirst<Parameters<typeof defaultActionHandlers[N]>>
-): void {
-  if (!routeInfos) {
-    if (ignoreFailure) {
-      return;
-    }
-    // TODO: update?
-    throw new EmberError(
-      `Can't trigger action '${name}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`
-    );
-  }
-
-  let eventWasHandled = false;
-  let routeInfo, handler, actionHandler;
-
-  for (let i = routeInfos.length - 1; i >= 0; i--) {
-    routeInfo = routeInfos[i];
-    assert('[BUG] Missing routeInfo', routeInfo);
-    handler = routeInfo.route;
-    actionHandler = handler && handler.actions && handler.actions[name];
-    if (actionHandler) {
-      if (actionHandler.apply(handler, args) === true) {
-        eventWasHandled = true;
-      } else {
-        // Should only hit here if a non-bubbling error action is triggered on a route.
-        if (name === 'error') {
-          assert('[BUG] Missing handler', handler);
-          handler._router._markErrorAsHandled(args[0] as Error);
-        }
-        return;
-      }
-    }
-  }
-
-  let defaultHandler = defaultActionHandlers[name];
-  if (defaultHandler) {
-    (defaultHandler as AnyFn).call(this, routeInfos, ...args);
-    return;
-  }
-
-  if (!eventWasHandled && !ignoreFailure) {
-    throw new EmberError(
-      `Nothing handled the action '${name}'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.`
-    );
-  }
-}
-
-function calculatePostTransitionState<R extends Route>(
-  emberRouter: EmberRouter<R>,
-  leafRouteName: string,
-  contexts: ModelFor<R>[]
-) {
-  let state = emberRouter._routerMicrolib.applyIntent(leafRouteName, contexts);
-  let { routeInfos, params } = state;
-
-  for (let routeInfo of routeInfos) {
-    // If the routeInfo is not resolved, we serialize the context into params
-    if (!routeInfo.isResolved) {
-      params[routeInfo.name] = routeInfo.serialize(routeInfo.context as ModelFor<R> | undefined);
-    } else {
-      params[routeInfo.name] = routeInfo.params;
-    }
-  }
-  return state;
-}
-
-function updatePaths(router: EmberRouter) {
-  let infos = router._routerMicrolib.currentRouteInfos!;
-  if (infos.length === 0) {
-    return;
-  }
-
-  let path = EmberRouter._routePath(infos);
-  let info = infos[infos.length - 1];
-  assert('expected info', info);
-  let currentRouteName = info.name;
-  let location = router.location;
-  assert('expected location to not be a string', typeof location !== 'string');
-  let currentURL = location.getURL();
-
-  set(router, 'currentPath', path);
-  set(router, 'currentRouteName', currentRouteName);
-  set(router, 'currentURL', currentURL);
-}
-
-function didBeginTransition(transition: Transition, router: EmberRouter) {
-  let routerState = new RouterState(router, router._routerMicrolib, transition[STATE_SYMBOL]!);
-
-  if (!router.currentState) {
-    router.set('currentState', routerState);
-  }
-  router.set('targetState', routerState);
-
-  transition.promise = transition.catch((error: any) => {
-    if (router._isErrorHandled(error)) {
-      router._clearHandledError(error);
-    } else {
-      throw error;
-    }
-  }, 'Transition Error');
-}
-
-function forEachQueryParam<R extends Route>(
-  router: EmberRouter<R>,
-  routeInfos: InternalRouteInfo<R>[],
-  queryParams: Record<string, unknown>,
-  callback: (key: string, value: unknown, qp: QueryParam | undefined) => void
-) {
-  let qpCache = router._queryParamsFor(routeInfos);
-
-  for (let key in queryParams) {
-    if (!Object.prototype.hasOwnProperty.call(queryParams, key)) {
-      continue;
-    }
-    let value = queryParams[key];
-    let qp = qpCache.map[key];
-
-    callback(key, value, qp);
-  }
-}
-
-function findLiveRoute(liveRoutes: OutletState | null, name: string) {
-  if (!liveRoutes) {
-    return;
-  }
-  let stack = [liveRoutes];
-  while (stack.length > 0) {
-    let test = stack.shift()!;
-    if (test.render.name === name) {
-      return test;
-    }
-    let outlets = test.outlets;
-    for (let outletName in outlets) {
-      stack.push(outlets[outletName]!);
-    }
-  }
-
-  return;
-}
-
-function appendLiveRoute(
-  liveRoutes: OutletState | null,
-  defaultParentState: OutletState | undefined,
-  renderOptions: RenderOptions
-) {
-  let ownState: OutletState = {
-    render: renderOptions,
-    outlets: Object.create(null),
-    wasUsed: false,
-  };
-  let target: OutletState | undefined;
-  if (renderOptions.into) {
-    target = findLiveRoute(liveRoutes, renderOptions.into);
-  } else {
-    target = defaultParentState;
-  }
-  if (target) {
-    set(target.outlets, renderOptions.outlet, ownState);
-  } else {
-    liveRoutes = ownState;
-  }
-
-  return {
-    liveRoutes,
-    ownState,
-  };
-}
-
-function representEmptyRoute(
-  liveRoutes: OutletState | null,
-  defaultParentState: OutletState | undefined,
-  { routeName }: Route
-): OutletState {
-  // the route didn't render anything
-  let alreadyAppended = findLiveRoute(liveRoutes, routeName);
-  if (alreadyAppended) {
-    // But some other route has already rendered our default
-    // template, so that becomes the default target for any
-    // children we may have.
-    return alreadyAppended;
-  } else {
-    // Create an entry to represent our default template name,
-    // just so other routes can target it and inherit its place
-    // in the outlet hierarchy.
-    defaultParentState!.outlets['main'] = {
-      render: {
-        name: routeName,
-        outlet: 'main',
-      },
-      outlets: {},
-    };
-    return defaultParentState!;
-  }
-}
-
-EmberRouter.reopen({
-  didTransition: defaultDidTransition,
-  willTransition: defaultWillTransition,
-  rootURL: '/',
-  location: 'hash',
-
-  // FIXME: Does this need to be overrideable via extend?
-  url: computed(function (this: EmberRouter) {
-    let location = get(this, 'location') as string | IEmberLocation;
-
-    if (typeof location === 'string') {
-      return undefined;
-    }
-
-    return location.getURL();
-  }),
-});
-
-export default EmberRouter;
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/-internals/routing/lib/system/router_state.ts
index cd6f6f0596a..f7da3a6f857 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/-internals/routing/lib/system/router_state.ts
@@ -2,7 +2,7 @@ import type { ModelFor, TransitionState } from 'router_js';
 import type Router from 'router_js';
 import { shallowEqual } from '../utils';
 import type Route from '@ember/routing/route';
-import type EmberRouter from './router';
+import type EmberRouter from '@ember/routing/router';
 
 export default class RouterState<R extends Route> {
   router: Router<R>;
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/-internals/routing/lib/utils.ts
index 575761b7d0d..a02ac49c0c2 100644
--- a/packages/@ember/-internals/routing/lib/utils.ts
+++ b/packages/@ember/-internals/routing/lib/utils.ts
@@ -9,7 +9,7 @@ import type Router from 'router_js';
 import { STATE_SYMBOL } from 'router_js';
 import type { ExtendedInternalRouteInfo } from '@ember/routing/route';
 import type Route from '@ember/routing/route';
-import type EmberRouter from './system/router';
+import type EmberRouter from '@ember/routing/router';
 
 const ALL_PERIODS_REGEX = /\./g;
 
diff --git a/packages/@ember/-internals/routing/tests/system/dsl_test.js b/packages/@ember/-internals/routing/tests/system/dsl_test.js
index 2da4e2281cd..fb788569c6f 100644
--- a/packages/@ember/-internals/routing/tests/system/dsl_test.js
+++ b/packages/@ember/-internals/routing/tests/system/dsl_test.js
@@ -1,4 +1,4 @@
-import EmberRouter from '../../lib/system/router';
+import EmberRouter from '@ember/routing/router';
 import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index fcad45e2bc6..d1ff0e76992 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -2,7 +2,7 @@ import HashLocation from '../../lib/location/hash_location';
 import HistoryLocation from '../../lib/location/history_location';
 import AutoLocation from '../../lib/location/auto_location';
 import NoneLocation from '../../lib/location/none_location';
-import Router, { triggerEvent } from '../../lib/system/router';
+import Router, { triggerEvent } from '@ember/routing/router';
 import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let owner;
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index d3039e1ddb7..ad028957cae 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -14,8 +14,8 @@ import { _loaded, onLoad, runLoadHooks } from './lib/lazy_load';
 import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher } from '@ember/-internals/views';
 import Route from '@ember/routing/route';
+import Router from '@ember/routing/router';
 import {
-  Router,
   HashLocation,
   HistoryLocation,
   AutoLocation,
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index 32f3171d61e..f606a8ebb3b 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -10,7 +10,7 @@ import type Application from '@ember/application';
 import { renderSettled } from '@ember/-internals/glimmer';
 import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
 import { assert } from '@ember/debug';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 import type { ViewMixin } from '@ember/-internals/views';
 import { EventDispatcher } from '@ember/-internals/views';
 import type { Registry } from '@ember/-internals/container';
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 00bd0db92bd..852125c0ffd 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -4,7 +4,8 @@ import { ENV } from '@ember/-internals/environment';
 import { libraries } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import EmberRoute from '@ember/routing/route';
-import { Router, NoneLocation } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
+import { NoneLocation } from '@ember/-internals/routing';
 import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/application/tests/reset_test.js b/packages/@ember/application/tests/reset_test.js
index 2282afb6cfa..0a26828a753 100644
--- a/packages/@ember/application/tests/reset_test.js
+++ b/packages/@ember/application/tests/reset_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import Controller from '@ember/controller';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 import { EventDispatcher } from '@ember/-internals/views';
 import { moduleFor, AutobootApplicationTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 2c9ae25681c..6dc3624c34a 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -38,9 +38,10 @@ import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
 import type {
   ExpandedControllerQueryParam,
   NamedRouteArgs,
-  QueryParam,
   RouteArgs,
 } from '@ember/-internals/routing';
+import type { QueryParam } from '@ember/routing/router';
+import EmberRouter from '@ember/routing/router';
 import {
   calculateCacheKey,
   deprecateTransitionMethods,
@@ -48,7 +49,6 @@ import {
   normalizeControllerQueryParams,
   prefixRouteNameArg,
   stashParamNames,
-  Router as EmberRouter,
 } from '@ember/-internals/routing';
 
 export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRouteInfo<R> {
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index f009a436959..b8f3788934b 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -1 +1,1937 @@
-export { Router as default } from '@ember/-internals/routing';
+import { privatize as P } from '@ember/-internals/container';
+import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
+import { computed, get, set } from '@ember/-internals/metal';
+import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/-internals/owner';
+import {
+  BucketCache,
+  Location as EmberLocation,
+  RouterDSL as DSL,
+  RouterState,
+  calculateCacheKey,
+  extractRouteArgs,
+  getActiveTargetName,
+  resemblesURL,
+} from '@ember/-internals/routing';
+import type {
+  DSLCallback,
+  EmberLocation as IEmberLocation,
+  EngineRouteInfo,
+  RouteArgs,
+  RouteOptions,
+  RouterService,
+} from '@ember/-internals/routing';
+import EmberObject from '@ember/object';
+import { A as emberA, typeOf } from '@ember/-internals/runtime';
+import Evented from '@ember/object/evented';
+import { assert, deprecate, info } from '@ember/debug';
+import EmberError from '@ember/error';
+import { cancel, once, run, scheduleOnce } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
+import type { QueryParamMeta, RenderOptions } from '@ember/routing/route';
+import type Route from '@ember/routing/route';
+import {
+  defaultSerialize,
+  getFullQueryParams,
+  hasDefaultSerialize,
+  ROUTE_CONNECTIONS,
+} from '@ember/routing/route';
+import type {
+  InternalRouteInfo,
+  ModelFor,
+  RouteInfo,
+  RouteInfoWithAttributes,
+  Transition,
+  TransitionError,
+  TransitionState,
+} from 'router_js';
+import Router, { logAbort, STATE_SYMBOL } from 'router_js';
+import type { Timer } from 'backburner';
+import EngineInstance from '@ember/engine/instance';
+import type { QueryParams } from 'route-recognizer';
+import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
+
+/**
+@module @ember/routing
+*/
+
+function defaultDidTransition<R extends Route>(
+  this: EmberRouter<R>,
+  infos: InternalRouteInfo<R>[]
+) {
+  updatePaths(this);
+
+  this._cancelSlowTransitionTimer();
+
+  this.notifyPropertyChange('url');
+  this.set('currentState', this.targetState);
+
+  if (DEBUG) {
+    // @ts-expect-error namespace isn't public
+    if (this.namespace.LOG_TRANSITIONS) {
+      // eslint-disable-next-line no-console
+      console.log(`Transitioned into '${EmberRouter._routePath(infos)}'`);
+    }
+  }
+}
+
+function defaultWillTransition<R extends Route>(
+  this: EmberRouter<R>,
+  oldInfos: InternalRouteInfo<R>[],
+  newInfos: InternalRouteInfo<R>[]
+) {
+  if (DEBUG) {
+    // @ts-expect-error namespace isn't public
+    if (this.namespace.LOG_TRANSITIONS) {
+      // eslint-disable-next-line no-console
+      console.log(
+        `Preparing to transition from '${EmberRouter._routePath(
+          oldInfos
+        )}' to '${EmberRouter._routePath(newInfos)}'`
+      );
+    }
+  }
+}
+
+let freezeRouteInfo: Function;
+if (DEBUG) {
+  freezeRouteInfo = (transition: Transition) => {
+    if (transition.from !== null && !Object.isFrozen(transition.from)) {
+      Object.freeze(transition.from);
+    }
+
+    if (transition.to !== null && !Object.isFrozen(transition.to)) {
+      Object.freeze(transition.to);
+    }
+  };
+}
+
+interface RenderOutletState {
+  name: string;
+  outlet: string;
+}
+
+interface NestedOutletState {
+  [key: string]: OutletState;
+}
+
+interface OutletState<T extends RenderOutletState = RenderOutletState> {
+  render: T;
+  outlets: NestedOutletState;
+  wasUsed?: boolean;
+}
+
+export interface QueryParam {
+  prop: string;
+  urlKey: string;
+  type: string;
+  route: Route;
+  parts?: string[];
+  values: {} | null;
+  scopedPropertyName: string;
+  scope: string;
+  defaultValue: unknown;
+  undecoratedDefaultValue: unknown;
+  serializedValue: string | null | undefined;
+  serializedDefaultValue: string | null | undefined;
+  controllerName: string;
+}
+
+function K(this: Router<Route>) {
+  return this;
+}
+
+const { slice } = Array.prototype;
+
+/**
+  The `EmberRouter` class manages the application state and URLs. Refer to
+  the [routing guide](https://guides.emberjs.com/release/routing/) for documentation.
+
+  @class EmberRouter
+  @extends EmberObject
+  @uses Evented
+  @public
+*/
+class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) implements Evented {
+  /**
+   Represents the URL of the root of the application, often '/'. This prefix is
+    assumed on all routes defined on this router.
+
+    @property rootURL
+    @default '/'
+    @public
+  */
+  // Set with reopen to allow overriding via extend
+  declare rootURL: string;
+
+  /**
+   The `location` property determines the type of URL's that your
+    application will use.
+
+    The following location types are currently available:
+
+    * `history` - use the browser's history API to make the URLs look just like any standard URL
+    * `hash` - use `#` to separate the server part of the URL from the Ember part: `/blog/#/posts/new`
+    * `none` - do not store the Ember URL in the actual browser URL (mainly used for testing)
+    * `auto` - use the best option based on browser capabilities: `history` if possible, then `hash` if possible, otherwise `none`
+
+    This value is defaulted to `history` by the `locationType` setting of `/config/environment.js`
+
+    @property location
+    @default 'hash'
+    @see {Location}
+    @public
+  */
+  // Set with reopen to allow overriding via extend
+  declare location: string | IEmberLocation;
+
+  _routerMicrolib!: Router<R>;
+  _didSetupRouter = false;
+  _initialTransitionStarted = false;
+
+  currentURL: string | null = null;
+  currentRouteName: string | null = null;
+  currentPath: string | null = null;
+  currentRoute: RouteInfo | RouteInfoWithAttributes | null = null;
+
+  _qpCache: Record<string, { qps: QueryParam[]; map: QueryParamMeta['map'] }> = Object.create(null);
+
+  // Set of QueryParam['urlKey']
+  _qpUpdates: Set<string> = new Set();
+  _queuedQPChanges: Record<string, unknown> = {};
+
+  _bucketCache: BucketCache;
+  _toplevelView: OutletView | null = null;
+  _handledErrors = new Set();
+  _engineInstances: Record<string, Record<string, EngineInstance>> = Object.create(null);
+  _engineInfoByRoute = Object.create(null);
+  _routerService: RouterService<R>;
+
+  _slowTransitionTimer: Timer | null = null;
+
+  private namespace: any;
+
+  // Begin Evented
+  declare on: (name: string, method: ((...args: any[]) => void) | string) => this;
+  declare one: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare trigger: (name: string, ...args: any[]) => unknown;
+  declare off: (name: string, method: string | ((...args: any[]) => void)) => this;
+  declare has: (name: string) => boolean;
+  // End Evented
+
+  // Set with reopenClass
+  private static dslCallbacks?: DSLCallback[];
+
+  /**
+    The `Router.map` function allows you to define mappings from URLs to routes
+    in your application. These mappings are defined within the
+    supplied callback function using `this.route`.
+
+    The first parameter is the name of the route which is used by default as the
+    path name as well.
+
+    The second parameter is the optional options hash. Available options are:
+
+      * `path`: allows you to provide your own path as well as mark dynamic
+        segments.
+      * `resetNamespace`: false by default; when nesting routes, ember will
+        combine the route names to form the fully-qualified route name, which is
+        used with `{{link-to}}` or manually transitioning to routes. Setting
+        `resetNamespace: true` will cause the route not to inherit from its
+        parent route's names. This is handy for preventing extremely long route names.
+        Keep in mind that the actual URL path behavior is still retained.
+
+    The third parameter is a function, which can be used to nest routes.
+    Nested routes, by default, will have the parent route tree's route name and
+    path prepended to it's own.
+
+    ```app/router.js
+    Router.map(function(){
+      this.route('post', { path: '/post/:post_id' }, function() {
+        this.route('edit');
+        this.route('comments', { resetNamespace: true }, function() {
+          this.route('new');
+        });
+      });
+    });
+    ```
+
+    @method map
+    @param callback
+    @public
+  */
+  static map(callback: DSLCallback) {
+    if (!this.dslCallbacks) {
+      this.dslCallbacks = [];
+      // FIXME: Can we remove this?
+      this.reopenClass({ dslCallbacks: this.dslCallbacks });
+    }
+
+    this.dslCallbacks.push(callback);
+
+    return this;
+  }
+
+  static _routePath(routeInfos: InternalRouteInfo<Route>[]) {
+    let path: string[] = [];
+
+    // We have to handle coalescing resource names that
+    // are prefixed with their parent's names, e.g.
+    // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz'
+
+    function intersectionMatches(a1: string[], a2: string[]) {
+      for (let i = 0; i < a1.length; ++i) {
+        if (a1[i] !== a2[i]) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    let name, nameParts, oldNameParts;
+    for (let i = 1; i < routeInfos.length; i++) {
+      let routeInfo = routeInfos[i];
+      assert('has routeInfo', routeInfo);
+      name = routeInfo.name;
+      nameParts = name.split('.');
+      oldNameParts = slice.call(path);
+
+      while (oldNameParts.length) {
+        if (intersectionMatches(oldNameParts, nameParts)) {
+          break;
+        }
+        oldNameParts.shift();
+      }
+
+      path.push(...nameParts.slice(oldNameParts.length));
+    }
+
+    return path.join('.');
+  }
+
+  // Note that owner is actually required in this scenario, but since it is strictly
+  // optional in other contexts trying to make it required here confuses TS.
+  constructor(owner?: Owner) {
+    super(owner);
+
+    assert('BUG: Missing owner', owner);
+
+    this._resetQueuedQueryParameterChanges();
+    this.namespace = owner.lookup('application:main');
+
+    let bucketCache = owner.lookup(P`-bucket-cache:main`);
+    assert('BUG: BucketCache should always be present', bucketCache instanceof BucketCache);
+    this._bucketCache = bucketCache;
+
+    let routerService = owner.lookup('service:router') as RouterService<R> | undefined;
+    assert('BUG: RouterService should always be present', routerService !== undefined);
+    this._routerService = routerService;
+  }
+
+  _initRouterJs(): void {
+    let location = get(this, 'location') as IEmberLocation;
+    let router = this;
+    const owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
+    let seen = Object.create(null);
+
+    class PrivateRouter extends Router<R> {
+      getRoute(name: string): R {
+        let routeName = name;
+        let routeOwner = owner;
+        let engineInfo = router._engineInfoByRoute[routeName];
+
+        if (engineInfo) {
+          let engineInstance = router._getEngineInstance(engineInfo);
+
+          routeOwner = engineInstance;
+          routeName = engineInfo.localFullName;
+        }
+
+        let fullRouteName = `route:${routeName}`;
+
+        assert('Route is unexpectedly missing an owner', routeOwner);
+
+        let route = routeOwner.lookup(fullRouteName) as R | undefined;
+
+        if (seen[name]) {
+          assert('seen routes should exist', route);
+          return route;
+        }
+
+        seen[name] = true;
+
+        if (!route) {
+          // SAFETY: this is configured in `commonSetupRegistry` in the
+          // `@ember/application/lib` package.
+          let DefaultRoute: any = routeOwner.factoryFor('route:basic')!.class;
+          routeOwner.register(fullRouteName, DefaultRoute.extend());
+          route = routeOwner.lookup(fullRouteName) as R;
+
+          if (DEBUG) {
+            if (router.namespace.LOG_ACTIVE_GENERATION) {
+              info(`generated -> ${fullRouteName}`, { fullName: fullRouteName });
+            }
+          }
+        }
+
+        route._setRouteName(routeName);
+
+        if (engineInfo && !hasDefaultSerialize(route)) {
+          throw new Error(
+            'Defining a custom serialize method on an Engine route is not supported.'
+          );
+        }
+
+        return route;
+      }
+
+      getSerializer(name: string) {
+        let engineInfo = router._engineInfoByRoute[name];
+
+        // If this is not an Engine route, we fall back to the handler for serialization
+        if (!engineInfo) {
+          return;
+        }
+
+        return engineInfo.serializeMethod || defaultSerialize;
+      }
+
+      updateURL(path: string) {
+        once(() => {
+          location.setURL(path);
+          set(router, 'currentURL', path);
+        });
+      }
+
+      // TODO: merge into routeDidChange
+      didTransition(infos: InternalRouteInfo<R>[]) {
+        assert(
+          'You attempted to override the "didTransition" method which has been deprecated. Please inject the router service and listen to the "routeDidChange" event.',
+          router.didTransition === defaultDidTransition
+        );
+        router.didTransition<R>(infos);
+      }
+
+      // TODO: merge into routeWillChange
+      willTransition(oldInfos: InternalRouteInfo<R>[], newInfos: InternalRouteInfo<R>[]) {
+        assert(
+          'You attempted to override the "willTransition" method which has been deprecated. Please inject the router service and listen to the "routeWillChange" event.',
+          router.willTransition === defaultWillTransition
+        );
+        router.willTransition<R>(oldInfos, newInfos);
+      }
+
+      triggerEvent<N extends MethodNamesOf<typeof defaultActionHandlers>>(
+        routeInfos: InternalRouteInfo<R>[],
+        ignoreFailure: boolean,
+        name: N,
+        args: OmitFirst<Parameters<typeof defaultActionHandlers[N]>>
+      ) {
+        return triggerEvent.bind(router)(routeInfos, ignoreFailure, name, args);
+      }
+
+      routeWillChange(transition: Transition) {
+        router.trigger('routeWillChange', transition);
+
+        if (DEBUG) {
+          freezeRouteInfo(transition);
+        }
+        router._routerService.trigger('routeWillChange', transition);
+
+        // in case of intermediate transition we update the current route
+        // to make router.currentRoute.name consistent with router.currentRouteName
+        // see https://github.com/emberjs/ember.js/issues/19449
+        if (transition.isIntermediate) {
+          router.set('currentRoute', transition.to);
+        }
+      }
+
+      routeDidChange(transition: Transition) {
+        router.set('currentRoute', transition.to);
+        once(() => {
+          router.trigger('routeDidChange', transition);
+
+          if (DEBUG) {
+            freezeRouteInfo(transition);
+          }
+          router._routerService.trigger('routeDidChange', transition);
+        });
+      }
+
+      transitionDidError(error: TransitionError, transition: Transition) {
+        if (error.wasAborted || transition.isAborted) {
+          // If the error was a transition erorr or the transition aborted
+          // log the abort.
+          return logAbort(transition);
+        } else {
+          // Otherwise trigger the "error" event to attempt an intermediate
+          // transition into an error substate
+          transition.trigger(false, 'error', error.error, transition, error.route);
+          if (router._isErrorHandled(error.error)) {
+            // If we handled the error with a substate just roll the state back on
+            // the transition and send the "routeDidChange" event for landing on
+            // the error substate and return the error.
+            transition.rollback();
+            this.routeDidChange(transition);
+            return error.error;
+          } else {
+            // If it was not handled, abort the transition completely and return
+            // the error.
+            transition.abort();
+            return error.error;
+          }
+        }
+      }
+
+      replaceURL(url: string) {
+        if (location.replaceURL) {
+          let doReplaceURL = () => {
+            location.replaceURL!(url);
+            set(router, 'currentURL', url);
+          };
+          once(doReplaceURL);
+        } else {
+          this.updateURL(url);
+        }
+      }
+    }
+
+    let routerMicrolib = (this._routerMicrolib = new PrivateRouter());
+
+    let dslCallbacks = (this.constructor as any).dslCallbacks || [K];
+    let dsl = this._buildDSL();
+
+    dsl.route(
+      'application',
+      { path: '/', resetNamespace: true, overrideNameAssertion: true },
+      function () {
+        for (let i = 0; i < dslCallbacks.length; i++) {
+          dslCallbacks[i].call(this);
+        }
+      }
+    );
+
+    if (DEBUG) {
+      if (this.namespace.LOG_TRANSITIONS_INTERNAL) {
+        routerMicrolib.log = console.log.bind(console); // eslint-disable-line no-console
+      }
+    }
+
+    routerMicrolib.map(dsl.generate());
+  }
+
+  _buildDSL(): DSL {
+    let enableLoadingSubstates = this._hasModuleBasedResolver();
+    let router = this;
+    const owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
+    let options = {
+      enableLoadingSubstates,
+      resolveRouteMap(name: string) {
+        return owner.factoryFor(`route-map:${name}`)!;
+      },
+      addRouteForEngine(name: string, engineInfo: EngineRouteInfo) {
+        if (!router._engineInfoByRoute[name]) {
+          router._engineInfoByRoute[name] = engineInfo;
+        }
+      },
+    };
+
+    return new DSL(null, options);
+  }
+
+  /*
+    Resets all pending query parameter changes.
+    Called after transitioning to a new route
+    based on query parameter changes.
+  */
+  _resetQueuedQueryParameterChanges() {
+    this._queuedQPChanges = {};
+  }
+
+  _hasModuleBasedResolver() {
+    let owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
+    let resolver = get(owner, 'application.__registry__.resolver.moduleBasedResolver');
+    return Boolean(resolver);
+  }
+
+  /**
+    Initializes the current router instance and sets up the change handling
+    event listeners used by the instances `location` implementation.
+
+    A property named `initialURL` will be used to determine the initial URL.
+    If no value is found `/` will be used.
+
+    @method startRouting
+    @private
+  */
+  startRouting() {
+    if (this.setupRouter()) {
+      let initialURL = get(this, 'initialURL') as string | undefined;
+      if (initialURL === undefined) {
+        initialURL = (get(this, 'location') as IEmberLocation).getURL();
+      }
+      let initialTransition = this.handleURL(initialURL);
+      if (initialTransition && initialTransition.error) {
+        throw initialTransition.error;
+      }
+    }
+  }
+
+  setupRouter() {
+    if (this._didSetupRouter) {
+      return false;
+    }
+    this._didSetupRouter = true;
+    this._setupLocation();
+
+    let location = get(this, 'location') as IEmberLocation;
+
+    // Allow the Location class to cancel the router setup while it refreshes
+    // the page
+    if (get(location, 'cancelRouterSetup')) {
+      return false;
+    }
+
+    this._initRouterJs();
+
+    location.onUpdateURL((url: string) => {
+      this.handleURL(url);
+    });
+
+    return true;
+  }
+
+  _setOutlets() {
+    // This is triggered async during Route#willDestroy.
+    // If the router is also being destroyed we do not want to
+    // to create another this._toplevelView (and leak the renderer)
+    if (this.isDestroying || this.isDestroyed) {
+      return;
+    }
+
+    let routeInfos = this._routerMicrolib.currentRouteInfos;
+    if (!routeInfos) {
+      return;
+    }
+
+    let defaultParentState: OutletState | undefined;
+    let liveRoutes = null;
+
+    for (let routeInfo of routeInfos) {
+      let route = routeInfo.route!;
+      let connections = ROUTE_CONNECTIONS.get(route);
+      let ownState: OutletState;
+      if (connections.length === 0) {
+        ownState = representEmptyRoute(liveRoutes, defaultParentState, route);
+      } else {
+        for (let j = 0; j < connections.length; j++) {
+          let appended = appendLiveRoute(liveRoutes, defaultParentState, connections[j]);
+          liveRoutes = appended.liveRoutes;
+          let { name, outlet } = appended.ownState.render;
+          if (name === route.routeName || outlet === 'main') {
+            ownState = appended.ownState;
+          }
+        }
+      }
+      defaultParentState = ownState!;
+    }
+
+    // when a transitionTo happens after the validation phase
+    // during the initial transition _setOutlets is called
+    // when no routes are active. However, it will get called
+    // again with the correct values during the next turn of
+    // the runloop
+    if (!liveRoutes) {
+      return;
+    }
+
+    if (!this._toplevelView) {
+      let owner = getOwner(this);
+      assert('Router is unexpectedly missing an owner', owner);
+      let OutletView = owner.factoryFor('view:-outlet') as Factory<OutletView, FactoryClass>;
+      let application = owner.lookup('application:main');
+      let environment = owner.lookup('-environment:main');
+      let template = owner.lookup('template:-outlet');
+      this._toplevelView = OutletView.create({ environment, template, application });
+      this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
+      let instance: any = owner.lookup('-application-instance:main');
+      if (instance) {
+        instance.didCreateRootView(this._toplevelView);
+      }
+    } else {
+      this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
+    }
+  }
+
+  handleURL(url: string) {
+    // Until we have an ember-idiomatic way of accessing #hashes, we need to
+    // remove it because router.js doesn't know how to handle it.
+    let _url = url.split(/#(.+)?/)[0]!;
+    return this._doURLTransition('handleURL', _url);
+  }
+
+  _doURLTransition<M extends 'handleURL' | 'transitionTo'>(routerJsMethod: M, url: string) {
+    this._initialTransitionStarted = true;
+    let transition = this._routerMicrolib[routerJsMethod](url || '/');
+    didBeginTransition(transition, this);
+    return transition;
+  }
+
+  /**
+    Transition the application into another route. The route may
+    be either a single route or route path:
+
+    @method transitionTo
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used while
+      transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @public
+  */
+  transitionTo(...args: RouteArgs<R>): Transition {
+    if (resemblesURL(args[0])) {
+      assert(
+        `A transition was attempted from '${this.currentRouteName}' to '${args[0]}' but the application instance has already been destroyed.`,
+        !this.isDestroying && !this.isDestroyed
+      );
+      return this._doURLTransition('transitionTo', args[0]);
+    }
+    let { routeName, models, queryParams } = extractRouteArgs<R>(args);
+    assert(
+      `A transition was attempted from '${this.currentRouteName}' to '${routeName}' but the application instance has already been destroyed.`,
+      !this.isDestroying && !this.isDestroyed
+    );
+    return this._doTransition(routeName, models, queryParams);
+  }
+
+  intermediateTransitionTo(name: string, ...args: any[]) {
+    this._routerMicrolib.intermediateTransitionTo(name, ...args);
+
+    updatePaths(this);
+
+    if (DEBUG) {
+      let infos = this._routerMicrolib.currentRouteInfos;
+      if (this.namespace.LOG_TRANSITIONS) {
+        assert('expected infos to be set', infos);
+        // eslint-disable-next-line no-console
+        console.log(`Intermediate-transitioned into '${EmberRouter._routePath(infos)}'`);
+      }
+    }
+  }
+
+  /**
+    Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
+    it replaces the entry for the current route.
+    When the user clicks the "back" button in the browser, there will be fewer steps.
+    This is most commonly used to manage redirects in a way that does not cause confusing additions
+    to the user's browsing history.
+
+    @method replaceWith
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used while
+      transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
+    @public
+  */
+  replaceWith(...args: RouteArgs<R>): Transition {
+    return this.transitionTo(...args).method('replace');
+  }
+
+  generate(name: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]) {
+    let url = this._routerMicrolib.generate(name, ...args);
+    assert('expected non-string location', typeof this.location !== 'string');
+    return this.location.formatURL(url);
+  }
+
+  /**
+    Determines if the supplied route is currently active.
+
+    @method isActive
+    @param routeName
+    @return {Boolean}
+    @private
+  */
+  isActive(routeName: string) {
+    return this._routerMicrolib.isActive(routeName);
+  }
+
+  /**
+    An alternative form of `isActive` that doesn't require
+    manual concatenation of the arguments into a single
+    array.
+
+    @method isActiveIntent
+    @param routeName
+    @param models
+    @param queryParams
+    @return {Boolean}
+    @private
+    @since 1.7.0
+  */
+  isActiveIntent(routeName: string, models: ModelFor<R>[], queryParams: Record<string, unknown>) {
+    return this.currentState!.isActiveIntent(routeName, models, queryParams);
+  }
+
+  send(name: string, ...args: any[]) {
+    /*name, context*/
+    this._routerMicrolib.trigger(name, ...args);
+  }
+
+  /**
+    Does this router instance have the given route.
+
+    @method hasRoute
+    @return {Boolean}
+    @private
+  */
+  hasRoute(route: string) {
+    return this._routerMicrolib.hasRoute(route);
+  }
+
+  /**
+    Resets the state of the router by clearing the current route
+    handlers and deactivating them.
+
+    @private
+    @method reset
+   */
+  reset() {
+    this._didSetupRouter = false;
+    this._initialTransitionStarted = false;
+    if (this._routerMicrolib) {
+      this._routerMicrolib.reset();
+    }
+  }
+
+  willDestroy() {
+    if (this._toplevelView) {
+      this._toplevelView.destroy();
+      this._toplevelView = null;
+    }
+
+    super.willDestroy();
+
+    this.reset();
+
+    let instances = this._engineInstances;
+    for (let name in instances) {
+      let instanceMap = instances[name];
+      assert('has instanceMap', instanceMap);
+      for (let id in instanceMap) {
+        let instance = instanceMap[id];
+        assert('has instance', instance);
+        run(instance, 'destroy');
+      }
+    }
+  }
+
+  /*
+    Called when an active route's query parameter has changed.
+    These changes are batched into a runloop run and trigger
+    a single transition.
+  */
+  _activeQPChanged(queryParameterName: string, newValue: unknown) {
+    this._queuedQPChanges[queryParameterName] = newValue;
+    once(this, this._fireQueryParamTransition);
+  }
+
+  // The queryParameterName is QueryParam['urlKey']
+  _updatingQPChanged(queryParameterName: string) {
+    this._qpUpdates.add(queryParameterName);
+  }
+
+  /*
+    Triggers a transition to a route based on query parameter changes.
+    This is called once per runloop, to batch changes.
+
+    e.g.
+
+    if these methods are called in succession:
+    this._activeQPChanged('foo', '10');
+      // results in _queuedQPChanges = { foo: '10' }
+    this._activeQPChanged('bar', false);
+      // results in _queuedQPChanges = { foo: '10', bar: false }
+
+    _queuedQPChanges will represent both of these changes
+    and the transition using `transitionTo` will be triggered
+    once.
+  */
+  _fireQueryParamTransition() {
+    this.transitionTo({ queryParams: this._queuedQPChanges });
+    this._resetQueuedQueryParameterChanges();
+  }
+
+  _setupLocation() {
+    let location = this.location;
+    let rootURL = this.rootURL;
+    let owner = getOwner(this);
+    assert('Router is unexpectedly missing an owner', owner);
+
+    if ('string' === typeof location) {
+      let resolvedLocation = owner.lookup(`location:${location}`) as IEmberLocation;
+
+      if (location === 'auto') {
+        deprecate(
+          "Router location 'auto' is deprecated. Most users will want to set `locationType` to 'history' in config/environment.js for no change in behavior. See deprecation docs for details.",
+          false,
+          {
+            id: 'deprecate-auto-location',
+            until: '5.0.0',
+            url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
+            for: 'ember-source',
+            since: {
+              available: '4.1.0',
+              enabled: '4.1.0',
+            },
+          }
+        );
+      }
+
+      if (resolvedLocation !== undefined) {
+        location = set(this, 'location', resolvedLocation);
+      } else {
+        // Allow for deprecated registration of custom location API's
+        let options = {
+          implementation: location,
+        };
+
+        location = set(this, 'location', EmberLocation.create(options));
+      }
+    }
+
+    if (location !== null && typeof location === 'object') {
+      if (rootURL) {
+        set(location, 'rootURL', rootURL);
+      }
+
+      // Allow the location to do any feature detection, such as AutoLocation
+      // detecting history support. This gives it a chance to set its
+      // `cancelRouterSetup` property which aborts routing.
+      if (typeof location.detect === 'function') {
+        if (this.location !== 'auto') {
+          deprecate(
+            'The `detect` method on the Location object is deprecated. If you need detection you can run your detection code in app.js, before setting the location type.',
+            false,
+            {
+              id: 'deprecate-auto-location',
+              until: '5.0.0',
+              url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
+              for: 'ember-source',
+              since: {
+                available: '4.1.0',
+                enabled: '4.1.0',
+              },
+            }
+          );
+        }
+
+        location.detect();
+      }
+
+      // ensure that initState is called AFTER the rootURL is set on
+      // the location instance
+      if (typeof location.initState === 'function') {
+        location.initState();
+      }
+    }
+  }
+
+  /**
+    Serializes the given query params according to their QP meta information.
+
+    @private
+    @method _serializeQueryParams
+    @param {Arrray<RouteInfo>} routeInfos
+    @param {Object} queryParams
+    @return {Void}
+  */
+  _serializeQueryParams(
+    routeInfos: InternalRouteInfo<R>[],
+    queryParams: Record<string, unknown>
+  ): asserts queryParams is Record<string, string | null | undefined> {
+    forEachQueryParam(
+      this,
+      routeInfos,
+      queryParams,
+      (key: string, value: unknown, qp: QueryParam | undefined) => {
+        if (qp) {
+          delete queryParams[key];
+          queryParams[qp.urlKey] = qp.route.serializeQueryParam(value, qp.urlKey, qp.type);
+        } else if (value === undefined) {
+          return; // We don't serialize undefined values
+        } else {
+          queryParams[key] = this._serializeQueryParam(value, typeOf(value));
+        }
+      }
+    );
+  }
+
+  /**
+    Serializes the value of a query parameter based on a type
+
+    @private
+    @method _serializeQueryParam
+    @param {Object} value
+    @param {String} type
+  */
+  _serializeQueryParam(value: unknown, type: string) {
+    if (value === null || value === undefined) {
+      return value;
+    } else if (type === 'array') {
+      return JSON.stringify(value);
+    }
+
+    return `${value}`;
+  }
+
+  /**
+    Deserializes the given query params according to their QP meta information.
+
+    @private
+    @method _deserializeQueryParams
+    @param {Array<RouteInfo>} routeInfos
+    @param {Object} queryParams
+    @return {Void}
+  */
+  _deserializeQueryParams(
+    routeInfos: InternalRouteInfo<R>[],
+    queryParams: Record<string, unknown>
+  ) {
+    forEachQueryParam(
+      this,
+      routeInfos,
+      queryParams,
+      (key: string, value: unknown, qp: QueryParam | undefined) => {
+        // If we don't have QP meta info for a given key, then we do nothing
+        // because all values will be treated as strings
+        if (qp) {
+          delete queryParams[key];
+          queryParams[qp.prop] = qp.route.deserializeQueryParam(value, qp.urlKey, qp.type);
+        }
+      }
+    );
+  }
+
+  /**
+    Deserializes the value of a query parameter based on a default type
+
+    @private
+    @method _deserializeQueryParam
+    @param {Object} value
+    @param {String} defaultType
+  */
+  _deserializeQueryParam(value: unknown, defaultType: string) {
+    if (value === null || value === undefined) {
+      return value;
+    } else if (defaultType === 'boolean') {
+      return value === 'true';
+    } else if (defaultType === 'number') {
+      return Number(value).valueOf();
+    } else if (defaultType === 'array') {
+      return emberA(JSON.parse(value as string));
+    }
+    return value;
+  }
+
+  /**
+    Removes (prunes) any query params with default values from the given QP
+    object. Default values are determined from the QP meta information per key.
+
+    @private
+    @method _pruneDefaultQueryParamValues
+    @param {Array<RouteInfo>} routeInfos
+    @param {Object} queryParams
+    @return {Void}
+  */
+  _pruneDefaultQueryParamValues(
+    routeInfos: InternalRouteInfo<R>[],
+    queryParams: Record<string, string | null | undefined>
+  ) {
+    let qps = this._queryParamsFor(routeInfos);
+    for (let key in queryParams) {
+      let qp = qps.map[key];
+      if (qp && qp.serializedDefaultValue === queryParams[key]) {
+        delete queryParams[key];
+      }
+    }
+  }
+
+  _doTransition(
+    _targetRouteName: string | undefined,
+    models: ModelFor<R>[],
+    _queryParams: Record<string, unknown>,
+    _fromRouterService?: boolean
+  ): Transition {
+    let targetRouteName = _targetRouteName || getActiveTargetName(this._routerMicrolib);
+    assert(
+      `The route ${targetRouteName} was not found`,
+      Boolean(targetRouteName) && this._routerMicrolib.hasRoute(targetRouteName)
+    );
+
+    this._initialTransitionStarted = true;
+
+    let queryParams: Record<string, unknown> = {};
+
+    this._processActiveTransitionQueryParams(targetRouteName, models, queryParams, _queryParams);
+
+    Object.assign(queryParams, _queryParams);
+
+    this._prepareQueryParams(targetRouteName, models, queryParams, Boolean(_fromRouterService));
+
+    let transition = this._routerMicrolib.transitionTo(targetRouteName, ...models, { queryParams });
+
+    didBeginTransition(transition, this);
+
+    return transition;
+  }
+
+  _processActiveTransitionQueryParams(
+    targetRouteName: string,
+    models: ModelFor<R>[],
+    queryParams: Record<string, unknown>,
+    _queryParams: {}
+  ) {
+    // merge in any queryParams from the active transition which could include
+    // queryParams from the url on initial load.
+    if (!this._routerMicrolib.activeTransition) {
+      return;
+    }
+
+    let unchangedQPs: Record<string, unknown> = {};
+    let qpUpdates = this._qpUpdates;
+    let params = getFullQueryParams(this, this._routerMicrolib.activeTransition[STATE_SYMBOL]);
+    for (let key in params) {
+      if (!qpUpdates.has(key)) {
+        unchangedQPs[key] = params[key];
+      }
+    }
+
+    // We need to fully scope queryParams so that we can create one object
+    // that represents both passed-in queryParams and ones that aren't changed
+    // from the active transition.
+    this._fullyScopeQueryParams(targetRouteName, models, _queryParams);
+    this._fullyScopeQueryParams(targetRouteName, models, unchangedQPs);
+    Object.assign(queryParams, unchangedQPs);
+  }
+
+  /**
+    Prepares the query params for a URL or Transition. Restores any undefined QP
+    keys/values, serializes all values, and then prunes any default values.
+
+    @private
+    @method _prepareQueryParams
+    @param {String} targetRouteName
+    @param {Array<Object>} models
+    @param {Object} queryParams
+    @param {boolean} keepDefaultQueryParamValues
+    @return {Void}
+  */
+  _prepareQueryParams(
+    targetRouteName: string,
+    models: ModelFor<R>[],
+    queryParams: Record<string, unknown>,
+    _fromRouterService?: boolean
+  ) {
+    let state = calculatePostTransitionState(this, targetRouteName, models);
+    this._hydrateUnsuppliedQueryParams(state, queryParams, Boolean(_fromRouterService));
+    this._serializeQueryParams(state.routeInfos, queryParams);
+
+    if (!_fromRouterService) {
+      this._pruneDefaultQueryParamValues(state.routeInfos, queryParams);
+    }
+  }
+
+  /**
+    Returns the meta information for the query params of a given route. This
+    will be overridden to allow support for lazy routes.
+
+    @private
+    @method _getQPMeta
+    @param {RouteInfo} routeInfo
+    @return {Object}
+  */
+  _getQPMeta(routeInfo: InternalRouteInfo<R>) {
+    let route = routeInfo.route;
+    return route && (get(route, '_qp') as Route['_qp']);
+  }
+
+  /**
+    Returns a merged query params meta object for a given set of routeInfos.
+    Useful for knowing what query params are available for a given route hierarchy.
+
+    @private
+    @method _queryParamsFor
+    @param {Array<RouteInfo>} routeInfos
+    @return {Object}
+   */
+  _queryParamsFor(routeInfos: InternalRouteInfo<R>[]) {
+    let routeInfoLength = routeInfos.length;
+    let leafRouteName = routeInfos[routeInfoLength - 1]!.name;
+    let cached = this._qpCache[leafRouteName];
+    if (cached !== undefined) {
+      return cached;
+    }
+
+    let shouldCache = true;
+    let map: QueryParamMeta['map'] = {};
+    let qps = [];
+    let qpsByUrlKey: Record<string, QueryParam> | null = DEBUG ? {} : null;
+    let qpMeta;
+    let urlKey;
+    let qpOther;
+
+    for (let routeInfo of routeInfos) {
+      qpMeta = this._getQPMeta(routeInfo);
+
+      if (!qpMeta) {
+        shouldCache = false;
+        continue;
+      }
+
+      // Loop over each QP to make sure we don't have any collisions by urlKey
+      for (let qp of qpMeta.qps) {
+        if (DEBUG) {
+          urlKey = qp.urlKey;
+          qpOther = qpsByUrlKey![urlKey];
+          if (qpOther && qpOther.controllerName !== qp.controllerName) {
+            assert(
+              `You're not allowed to have more than one controller property map to the same query param key, but both \`${qpOther.scopedPropertyName}\` and \`${qp.scopedPropertyName}\` map to \`${urlKey}\`. You can fix this by mapping one of the controller properties to a different query param key via the \`as\` config option, e.g. \`${qpOther.prop}: { as: 'other-${qpOther.prop}' }\``,
+              false
+            );
+          }
+          qpsByUrlKey![urlKey] = qp;
+        }
+
+        qps.push(qp);
+      }
+
+      Object.assign(map, qpMeta.map);
+    }
+
+    let finalQPMeta = { qps, map };
+
+    if (shouldCache) {
+      this._qpCache[leafRouteName] = finalQPMeta;
+    }
+
+    return finalQPMeta;
+  }
+
+  /**
+    Maps all query param keys to their fully scoped property name of the form
+    `controllerName:propName`.
+
+    @private
+    @method _fullyScopeQueryParams
+    @param {String} leafRouteName
+    @param {Array<Object>} contexts
+    @param {Object} queryParams
+    @return {Void}
+  */
+  _fullyScopeQueryParams(leafRouteName: string, contexts: ModelFor<R>[], queryParams: QueryParams) {
+    let state = calculatePostTransitionState(this, leafRouteName, contexts);
+    let routeInfos = state.routeInfos;
+    let qpMeta;
+    for (let routeInfo of routeInfos) {
+      qpMeta = this._getQPMeta(routeInfo);
+
+      if (!qpMeta) {
+        continue;
+      }
+
+      for (let qp of qpMeta.qps) {
+        let presentProp =
+          (qp.prop in queryParams && qp.prop) ||
+          (qp.scopedPropertyName in queryParams && qp.scopedPropertyName) ||
+          (qp.urlKey in queryParams && qp.urlKey);
+
+        if (presentProp) {
+          if (presentProp !== qp.scopedPropertyName) {
+            queryParams[qp.scopedPropertyName] = queryParams[presentProp];
+            delete queryParams[presentProp];
+          }
+        }
+      }
+    }
+  }
+
+  /**
+    Hydrates (adds/restores) any query params that have pre-existing values into
+    the given queryParams hash. This is what allows query params to be "sticky"
+    and restore their last known values for their scope.
+
+    @private
+    @method _hydrateUnsuppliedQueryParams
+    @param {TransitionState} state
+    @param {Object} queryParams
+    @return {Void}
+  */
+  _hydrateUnsuppliedQueryParams(
+    state: TransitionState<R>,
+    queryParams: QueryParams,
+    _fromRouterService: boolean
+  ): void {
+    let routeInfos = state.routeInfos;
+    let appCache = this._bucketCache;
+    let qpMeta;
+    let qp;
+    let presentProp;
+
+    for (let routeInfo of routeInfos) {
+      qpMeta = this._getQPMeta(routeInfo);
+
+      if (!qpMeta) {
+        continue;
+      }
+
+      // Needs to stay for index loop to avoid throwIfClosureRequired
+      for (let j = 0, qpLen = qpMeta.qps.length; j < qpLen; ++j) {
+        qp = qpMeta.qps[j];
+        assert('expected qp', qp);
+
+        presentProp =
+          (qp.prop in queryParams && qp.prop) ||
+          (qp.scopedPropertyName in queryParams && qp.scopedPropertyName) ||
+          (qp.urlKey in queryParams && qp.urlKey);
+
+        assert(
+          `You passed the \`${presentProp}\` query parameter during a transition into ${qp.route.routeName}, please update to ${qp.urlKey}`,
+          (function () {
+            if (qp.urlKey === presentProp || qp.scopedPropertyName === presentProp) {
+              return true;
+            }
+
+            if (_fromRouterService && presentProp !== false && qp.urlKey !== qp.prop) {
+              // assumptions (mainly from current transitionTo_test):
+              // - this is only supposed to be run when there is an alias to a query param and the alias is used to set the param
+              // - when there is no alias: qp.urlKey == qp.prop
+              return false;
+            }
+
+            return true;
+          })()
+        );
+
+        if (presentProp) {
+          if (presentProp !== qp.scopedPropertyName) {
+            queryParams[qp.scopedPropertyName] = queryParams[presentProp];
+            delete queryParams[presentProp];
+          }
+        } else {
+          let cacheKey = calculateCacheKey(qp.route.fullRouteName, qp.parts, state.params);
+
+          assert(
+            'ROUTER BUG: expected appCache to be defined. This is an internal bug, please open an issue on Github if you see this message!',
+            appCache
+          );
+
+          queryParams[qp.scopedPropertyName] = appCache.lookup(cacheKey, qp.prop, qp.defaultValue);
+        }
+      }
+    }
+  }
+
+  _scheduleLoadingEvent(transition: Transition, originRoute: Route) {
+    this._cancelSlowTransitionTimer();
+    this._slowTransitionTimer = scheduleOnce(
+      'routerTransitions',
+      this,
+      this._handleSlowTransition,
+      transition,
+      originRoute
+    );
+  }
+
+  currentState: null | RouterState<R> = null;
+  targetState = null;
+
+  _handleSlowTransition(transition: Transition, originRoute: Route) {
+    if (!this._routerMicrolib.activeTransition) {
+      // Don't fire an event if we've since moved on from
+      // the transition that put us in a loading state.
+      return;
+    }
+    let targetState = new RouterState(
+      this,
+      this._routerMicrolib,
+      this._routerMicrolib.activeTransition[STATE_SYMBOL]!
+    );
+    this.set('targetState', targetState);
+
+    transition.trigger(true, 'loading', transition, originRoute);
+  }
+
+  _cancelSlowTransitionTimer() {
+    if (this._slowTransitionTimer) {
+      cancel(this._slowTransitionTimer);
+    }
+    this._slowTransitionTimer = null;
+  }
+
+  // These three helper functions are used to ensure errors aren't
+  // re-raised if they're handled in a route's error action.
+  _markErrorAsHandled(error: Error) {
+    this._handledErrors.add(error);
+  }
+
+  _isErrorHandled(error: Error) {
+    return this._handledErrors.has(error);
+  }
+
+  _clearHandledError(error: Error) {
+    this._handledErrors.delete(error);
+  }
+
+  _getEngineInstance({
+    name,
+    instanceId,
+    mountPoint,
+  }: {
+    name: string;
+    instanceId: number;
+    mountPoint: string;
+  }) {
+    let engineInstances = this._engineInstances;
+    let namedInstances = engineInstances[name];
+
+    if (!namedInstances) {
+      namedInstances = Object.create(null);
+      engineInstances[name] = namedInstances!;
+    }
+
+    // We just set these!
+    assert('has namedInstances', namedInstances);
+
+    let engineInstance = namedInstances[instanceId];
+
+    if (!engineInstance) {
+      let owner = getOwner(this);
+      assert('Expected router to have EngineInstance as owner', owner instanceof EngineInstance);
+
+      assert(
+        `You attempted to mount the engine '${name}' in your router map, but the engine can not be found.`,
+        owner.hasRegistration(`engine:${name}`)
+      );
+
+      engineInstance = owner.buildChildEngineInstance(name, {
+        routable: true,
+        mountPoint,
+      });
+
+      engineInstance.boot();
+
+      namedInstances[instanceId] = engineInstance;
+    }
+
+    return engineInstance;
+  }
+
+  /**
+    Handles updating the paths and notifying any listeners of the URL
+    change.
+
+    Triggers the router level `didTransition` hook.
+
+    For example, to notify google analytics when the route changes,
+    you could use this hook.  (Note: requires also including GA scripts, etc.)
+
+    ```javascript
+    import config from './config/environment';
+    import EmberRouter from '@ember/routing/router';
+    import { service } from '@ember/service';
+
+    let Router = EmberRouter.extend({
+      location: config.locationType,
+
+      router: service(),
+
+      didTransition: function() {
+        this._super(...arguments);
+
+        ga('send', 'pageview', {
+          page: this.router.currentURL,
+          title: this.router.currentRouteName,
+        });
+      }
+    });
+    ```
+
+    @method didTransition
+    @private
+    @since 1.2.0
+  */
+  // Set with reopen to allow overriding via extend
+  declare didTransition: typeof defaultDidTransition;
+
+  /**
+    Handles notifying any listeners of an impending URL
+    change.
+
+    Triggers the router level `willTransition` hook.
+
+    @method willTransition
+    @private
+    @since 1.11.0
+  */
+  // Set with reopen to allow overriding via extend
+  declare willTransition: typeof defaultWillTransition;
+
+  /**
+   Represents the current URL.
+
+    @property url
+    @type {String}
+    @private
+  */
+  // Set with reopen to allow overriding via extend
+  declare url: string;
+}
+
+/*
+  Helper function for iterating over routes in a set of routeInfos that are
+  at or above the given origin route. Example: if `originRoute` === 'foo.bar'
+  and the routeInfos given were for 'foo.bar.baz', then the given callback
+  will be invoked with the routes for 'foo.bar', 'foo', and 'application'
+  individually.
+
+  If the callback returns anything other than `true`, then iteration will stop.
+
+  @private
+  @param {Route} originRoute
+  @param {Array<RouteInfo>} routeInfos
+  @param {Function} callback
+  @return {Void}
+ */
+function forEachRouteAbove<R extends Route>(
+  routeInfos: InternalRouteInfo<R>[],
+  callback: (route: R, routeInfo: InternalRouteInfo<R>) => boolean
+) {
+  for (let i = routeInfos.length - 1; i >= 0; --i) {
+    let routeInfo = routeInfos[i];
+    assert('has routeInfo', routeInfo);
+
+    let route = routeInfo.route;
+
+    // routeInfo.handler being `undefined` generally means either:
+    //
+    // 1. an error occurred during creation of the route in question
+    // 2. the route is across an async boundary (e.g. within an engine)
+    //
+    // In both of these cases, we cannot invoke the callback on that specific
+    // route, because it just doesn't exist...
+    if (route === undefined) {
+      continue;
+    }
+
+    if (callback(route, routeInfo) !== true) {
+      return;
+    }
+  }
+}
+
+// These get invoked when an action bubbles above ApplicationRoute
+// and are not meant to be overridable.
+let defaultActionHandlers = {
+  willResolveModel<R extends Route>(
+    this: EmberRouter<R>,
+    _routeInfos: InternalRouteInfo<R>[],
+    transition: Transition,
+    originRoute: R
+  ) {
+    this._scheduleLoadingEvent(transition, originRoute);
+  },
+
+  // Attempt to find an appropriate error route or substate to enter.
+  error<R extends Route>(
+    this: EmberRouter<R>,
+    routeInfos: InternalRouteInfo<R>[],
+    error: Error,
+    transition: Transition
+  ) {
+    let router = this;
+
+    let routeInfoWithError = routeInfos[routeInfos.length - 1];
+
+    forEachRouteAbove(routeInfos, (route: R, routeInfo: InternalRouteInfo<R>) => {
+      // We don't check the leaf most routeInfo since that would
+      // technically be below where we're at in the route hierarchy.
+      if (routeInfo !== routeInfoWithError) {
+        // Check for the existence of an 'error' route.
+        let errorRouteName = findRouteStateName(route, 'error');
+        if (errorRouteName) {
+          router._markErrorAsHandled(error);
+          router.intermediateTransitionTo(errorRouteName, error);
+          return false;
+        }
+      }
+
+      // Check for an 'error' substate route
+      let errorSubstateName = findRouteSubstateName(route, 'error');
+      if (errorSubstateName) {
+        router._markErrorAsHandled(error);
+        router.intermediateTransitionTo(errorSubstateName, error);
+        return false;
+      }
+
+      return true;
+    });
+
+    logError(error, `Error while processing route: ${transition.targetName}`);
+  },
+
+  // Attempt to find an appropriate loading route or substate to enter.
+  loading<R extends Route>(
+    this: EmberRouter<R>,
+    routeInfos: InternalRouteInfo<R>[],
+    transition: Transition
+  ) {
+    let router = this;
+
+    let routeInfoWithSlowLoading = routeInfos[routeInfos.length - 1];
+
+    forEachRouteAbove(routeInfos, (route: R, routeInfo: InternalRouteInfo<R>) => {
+      // We don't check the leaf most routeInfos since that would
+      // technically be below where we're at in the route hierarchy.
+      if (routeInfo !== routeInfoWithSlowLoading) {
+        // Check for the existence of a 'loading' route.
+        let loadingRouteName = findRouteStateName(route, 'loading');
+        if (loadingRouteName) {
+          router.intermediateTransitionTo(loadingRouteName);
+          return false;
+        }
+      }
+
+      // Check for loading substate
+      let loadingSubstateName = findRouteSubstateName(route, 'loading');
+      if (loadingSubstateName) {
+        router.intermediateTransitionTo(loadingSubstateName);
+        return false;
+      }
+
+      // Don't bubble above pivot route.
+      return (transition.pivotHandler as any) !== route;
+    });
+  },
+};
+
+function logError(_error: any, initialMessage: string) {
+  let errorArgs = [];
+  let error;
+  if (_error && typeof _error === 'object' && typeof _error.errorThrown === 'object') {
+    error = _error.errorThrown;
+  } else {
+    error = _error;
+  }
+
+  if (initialMessage) {
+    errorArgs.push(initialMessage);
+  }
+
+  if (error) {
+    if (error.message) {
+      errorArgs.push(error.message);
+    }
+    if (error.stack) {
+      errorArgs.push(error.stack);
+    }
+
+    if (typeof error === 'string') {
+      errorArgs.push(error);
+    }
+  }
+
+  console.error(...errorArgs); //eslint-disable-line no-console
+}
+
+/**
+  Finds the name of the substate route if it exists for the given route. A
+  substate route is of the form `route_state`, such as `foo_loading`.
+
+  @private
+  @param {Route} route
+  @param {String} state
+  @return {String}
+*/
+function findRouteSubstateName(route: Route, state: string) {
+  let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
+
+  let { routeName, fullRouteName, _router: router } = route;
+
+  let substateName = `${routeName}_${state}`;
+  let substateNameFull = `${fullRouteName}_${state}`;
+
+  return routeHasBeenDefined(owner, router, substateName, substateNameFull) ? substateNameFull : '';
+}
+
+/**
+  Finds the name of the state route if it exists for the given route. A state
+  route is of the form `route.state`, such as `foo.loading`. Properly Handles
+  `application` named routes.
+
+  @private
+  @param {Route} route
+  @param {String} state
+  @return {String}
+*/
+function findRouteStateName(route: Route, state: string) {
+  let owner = getOwner(route);
+  assert('Route is unexpectedly missing an owner', owner);
+
+  let { routeName, fullRouteName, _router: router } = route;
+
+  let stateName = routeName === 'application' ? state : `${routeName}.${state}`;
+  let stateNameFull = fullRouteName === 'application' ? state : `${fullRouteName}.${state}`;
+
+  return routeHasBeenDefined(owner, router, stateName, stateNameFull) ? stateNameFull : '';
+}
+
+/**
+  Determines whether or not a route has been defined by checking that the route
+  is in the Router's map and the owner has a registration for that route.
+
+  @private
+  @param {Owner} owner
+  @param {Router} router
+  @param {String} localName
+  @param {String} fullName
+  @return {Boolean}
+*/
+function routeHasBeenDefined(owner: Owner, router: any, localName: string, fullName: string) {
+  let routerHasRoute = router.hasRoute(fullName);
+  let ownerHasRoute =
+    owner.hasRegistration(`template:${localName}`) || owner.hasRegistration(`route:${localName}`);
+  return routerHasRoute && ownerHasRoute;
+}
+
+export function triggerEvent<
+  R extends Route,
+  N extends MethodNamesOf<typeof defaultActionHandlers>
+>(
+  this: EmberRouter<R>,
+  routeInfos: InternalRouteInfo<R>[],
+  ignoreFailure: boolean,
+  name: N,
+  args: OmitFirst<Parameters<typeof defaultActionHandlers[N]>>
+): void {
+  if (!routeInfos) {
+    if (ignoreFailure) {
+      return;
+    }
+    // TODO: update?
+    throw new EmberError(
+      `Can't trigger action '${name}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`
+    );
+  }
+
+  let eventWasHandled = false;
+  let routeInfo, handler, actionHandler;
+
+  for (let i = routeInfos.length - 1; i >= 0; i--) {
+    routeInfo = routeInfos[i];
+    assert('[BUG] Missing routeInfo', routeInfo);
+    handler = routeInfo.route;
+    actionHandler = handler && handler.actions && handler.actions[name];
+    if (actionHandler) {
+      if (actionHandler.apply(handler, args) === true) {
+        eventWasHandled = true;
+      } else {
+        // Should only hit here if a non-bubbling error action is triggered on a route.
+        if (name === 'error') {
+          assert('[BUG] Missing handler', handler);
+          handler._router._markErrorAsHandled(args[0] as Error);
+        }
+        return;
+      }
+    }
+  }
+
+  let defaultHandler = defaultActionHandlers[name];
+  if (defaultHandler) {
+    (defaultHandler as AnyFn).call(this, routeInfos, ...args);
+    return;
+  }
+
+  if (!eventWasHandled && !ignoreFailure) {
+    throw new EmberError(
+      `Nothing handled the action '${name}'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.`
+    );
+  }
+}
+
+function calculatePostTransitionState<R extends Route>(
+  emberRouter: EmberRouter<R>,
+  leafRouteName: string,
+  contexts: ModelFor<R>[]
+) {
+  let state = emberRouter._routerMicrolib.applyIntent(leafRouteName, contexts);
+  let { routeInfos, params } = state;
+
+  for (let routeInfo of routeInfos) {
+    // If the routeInfo is not resolved, we serialize the context into params
+    if (!routeInfo.isResolved) {
+      params[routeInfo.name] = routeInfo.serialize(routeInfo.context as ModelFor<R> | undefined);
+    } else {
+      params[routeInfo.name] = routeInfo.params;
+    }
+  }
+  return state;
+}
+
+function updatePaths(router: EmberRouter) {
+  let infos = router._routerMicrolib.currentRouteInfos!;
+  if (infos.length === 0) {
+    return;
+  }
+
+  let path = EmberRouter._routePath(infos);
+  let info = infos[infos.length - 1];
+  assert('expected info', info);
+  let currentRouteName = info.name;
+  let location = router.location;
+  assert('expected location to not be a string', typeof location !== 'string');
+  let currentURL = location.getURL();
+
+  set(router, 'currentPath', path);
+  set(router, 'currentRouteName', currentRouteName);
+  set(router, 'currentURL', currentURL);
+}
+
+function didBeginTransition(transition: Transition, router: EmberRouter) {
+  let routerState = new RouterState(router, router._routerMicrolib, transition[STATE_SYMBOL]!);
+
+  if (!router.currentState) {
+    router.set('currentState', routerState);
+  }
+  router.set('targetState', routerState);
+
+  transition.promise = transition.catch((error: any) => {
+    if (router._isErrorHandled(error)) {
+      router._clearHandledError(error);
+    } else {
+      throw error;
+    }
+  }, 'Transition Error');
+}
+
+function forEachQueryParam<R extends Route>(
+  router: EmberRouter<R>,
+  routeInfos: InternalRouteInfo<R>[],
+  queryParams: Record<string, unknown>,
+  callback: (key: string, value: unknown, qp: QueryParam | undefined) => void
+) {
+  let qpCache = router._queryParamsFor(routeInfos);
+
+  for (let key in queryParams) {
+    if (!Object.prototype.hasOwnProperty.call(queryParams, key)) {
+      continue;
+    }
+    let value = queryParams[key];
+    let qp = qpCache.map[key];
+
+    callback(key, value, qp);
+  }
+}
+
+function findLiveRoute(liveRoutes: OutletState | null, name: string) {
+  if (!liveRoutes) {
+    return;
+  }
+  let stack = [liveRoutes];
+  while (stack.length > 0) {
+    let test = stack.shift()!;
+    if (test.render.name === name) {
+      return test;
+    }
+    let outlets = test.outlets;
+    for (let outletName in outlets) {
+      stack.push(outlets[outletName]!);
+    }
+  }
+
+  return;
+}
+
+function appendLiveRoute(
+  liveRoutes: OutletState | null,
+  defaultParentState: OutletState | undefined,
+  renderOptions: RenderOptions
+) {
+  let ownState: OutletState = {
+    render: renderOptions,
+    outlets: Object.create(null),
+    wasUsed: false,
+  };
+  let target: OutletState | undefined;
+  if (renderOptions.into) {
+    target = findLiveRoute(liveRoutes, renderOptions.into);
+  } else {
+    target = defaultParentState;
+  }
+  if (target) {
+    set(target.outlets, renderOptions.outlet, ownState);
+  } else {
+    liveRoutes = ownState;
+  }
+
+  return {
+    liveRoutes,
+    ownState,
+  };
+}
+
+function representEmptyRoute(
+  liveRoutes: OutletState | null,
+  defaultParentState: OutletState | undefined,
+  { routeName }: Route
+): OutletState {
+  // the route didn't render anything
+  let alreadyAppended = findLiveRoute(liveRoutes, routeName);
+  if (alreadyAppended) {
+    // But some other route has already rendered our default
+    // template, so that becomes the default target for any
+    // children we may have.
+    return alreadyAppended;
+  } else {
+    // Create an entry to represent our default template name,
+    // just so other routes can target it and inherit its place
+    // in the outlet hierarchy.
+    defaultParentState!.outlets['main'] = {
+      render: {
+        name: routeName,
+        outlet: 'main',
+      },
+      outlets: {},
+    };
+    return defaultParentState!;
+  }
+}
+
+EmberRouter.reopen({
+  didTransition: defaultDidTransition,
+  willTransition: defaultWillTransition,
+  rootURL: '/',
+  location: 'hash',
+
+  // FIXME: Does this need to be overrideable via extend?
+  url: computed(function (this: EmberRouter) {
+    let location = get(this, 'location') as string | IEmberLocation;
+
+    if (typeof location === 'string') {
+      return undefined;
+    }
+
+    return location.getURL();
+  }),
+});
+
+export default EmberRouter;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 306bed7e5bf..1b5fbe014d4 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -85,6 +85,7 @@ import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
 import Route from '@ember/routing/route';
+import Router from '@ember/routing/router';
 
 import {
   templateOnlyComponent,
@@ -511,7 +512,7 @@ Ember.controllerFor = routing.controllerFor;
 Ember.generateControllerFactory = routing.generateControllerFactory;
 Ember.generateController = routing.generateController;
 Ember.RouterDSL = routing.RouterDSL;
-Ember.Router = routing.Router;
+Ember.Router = Router;
 Ember.Route = Route;
 
 runLoadHooks('Ember.Application', Application);
diff --git a/packages/ember/tests/application_lifecycle_test.js b/packages/ember/tests/application_lifecycle_test.js
index 53111b39cac..0b7d080b7ab 100644
--- a/packages/ember/tests/application_lifecycle_test.js
+++ b/packages/ember/tests/application_lifecycle_test.js
@@ -1,7 +1,7 @@
 import { moduleFor, AutobootApplicationTestCase, runTask } from 'internal-test-helpers';
 import Application from '@ember/application';
 import Route from '@ember/routing/route';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 import { Component } from '@ember/-internals/glimmer';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
diff --git a/packages/ember/tests/routing/router_map_test.js b/packages/ember/tests/routing/router_map_test.js
index b6595e11b71..69cb8f3c6d7 100644
--- a/packages/ember/tests/routing/router_map_test.js
+++ b/packages/ember/tests/routing/router_map_test.js
@@ -1,6 +1,6 @@
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 
 moduleFor(
   'Router.map',
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index 2e33cc9fad3..e272af206c9 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -1,5 +1,6 @@
 import { service } from '@ember/service';
-import { Router, NoneLocation } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
+import { NoneLocation } from '@ember/-internals/routing';
 import { get } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';
diff --git a/packages/internal-test-helpers/lib/test-cases/application.ts b/packages/internal-test-helpers/lib/test-cases/application.ts
index 19b81dfbf5f..81a09b77ce0 100644
--- a/packages/internal-test-helpers/lib/test-cases/application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/application.ts
@@ -1,6 +1,6 @@
 import TestResolverApplicationTestCase from './test-resolver-application';
 import Application from '@ember/application';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 
 import { runTask, runLoopSettled } from '../run';
 import Resolver from '../test-resolver';
diff --git a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
index 74667568198..eaac5b77e2e 100644
--- a/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/autoboot-application.ts
@@ -1,6 +1,6 @@
 import TestResolverApplicationTestCase from './test-resolver-application';
 import Application from '@ember/application';
-import { Router } from '@ember/-internals/routing';
+import Router from '@ember/routing/router';
 import Resolver from '../test-resolver';
 import { assert } from '@ember/debug';
 import type ApplicationInstance from '@ember/application/instance';

From 5071bcf1efd95abc2c500fc70b15113eed22fec3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 13:51:24 -0700
Subject: [PATCH 1061/1405] Consolidate @ember/routing/router-service

---
 packages/@ember/-internals/routing/index.ts   |   7 +-
 .../-internals/routing/lib/services/router.ts | 744 -----------------
 .../routing/lib/services/routing.ts           |   2 +-
 packages/@ember/application/index.ts          |   2 +-
 packages/@ember/routing/router-service.ts     | 749 +++++++++++++++++-
 packages/@ember/routing/router.ts             |   2 +-
 6 files changed, 749 insertions(+), 757 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/services/router.ts

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 6820fa385b3..494e9696545 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -12,12 +12,8 @@ export { default as controllerFor } from './lib/system/controller_for';
 export { default as RouterDSL, DSLCallback } from './lib/system/dsl';
 export { EngineRouteInfo } from './lib/system/engines';
 export { default as QueryParams } from './lib/system/query_params';
+export { RouteInfo, RouteInfoWithAttributes } from './lib/system/route-info';
 export { default as RoutingService } from './lib/services/routing';
-export {
-  default as RouterService,
-  RouteInfo,
-  RouteInfoWithAttributes,
-} from './lib/services/router';
 export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
 export {
@@ -28,6 +24,7 @@ export {
   normalizeControllerQueryParams,
   prefixRouteNameArg,
   resemblesURL,
+  shallowEqual,
   stashParamNames,
   ExpandedControllerQueryParam,
   NamedRouteArgs,
diff --git a/packages/@ember/-internals/routing/lib/services/router.ts b/packages/@ember/-internals/routing/lib/services/router.ts
deleted file mode 100644
index 20127f6a6fb..00000000000
--- a/packages/@ember/-internals/routing/lib/services/router.ts
+++ /dev/null
@@ -1,744 +0,0 @@
-import { getOwner } from '@ember/-internals/owner';
-import Evented from '@ember/object/evented';
-import { assert } from '@ember/debug';
-import { readOnly } from '@ember/object/computed';
-import Service from '@ember/service';
-import { consumeTag, tagFor } from '@glimmer/validator';
-import type { ModelFor, Transition } from 'router_js';
-import type Route from '@ember/routing/route';
-import EmberRouter from '@ember/routing/router';
-import { RouteInfo, RouteInfoWithAttributes } from '../system/route-info';
-import type { RouteArgs, RouteOptions } from '../utils';
-import { extractRouteArgs, resemblesURL, shallowEqual } from '../utils';
-
-export const ROUTER = Symbol('ROUTER');
-
-function cleanURL(url: string, rootURL: string) {
-  if (rootURL === '/') {
-    return url;
-  }
-
-  return url.substring(rootURL.length);
-}
-
-/**
-   The Router service is the public API that provides access to the router.
-
-   The immediate benefit of the Router service is that you can inject it into components,
-   giving them a friendly way to initiate transitions and ask questions about the current
-   global router state.
-
-   In this example, the Router service is injected into a component to initiate a transition
-   to a dedicated route:
-
-   ```app/components/example.js
-   import Component from '@glimmer/component';
-   import { action } from '@ember/object';
-   import { service } from '@ember/service';
-
-   export default class ExampleComponent extends Component {
-     @service router;
-
-     @action
-     next() {
-       this.router.transitionTo('other.route');
-     }
-   }
-   ```
-
-   Like any service, it can also be injected into helpers, routes, etc.
-
-   @public
-   @extends Service
-   @class RouterService
- */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface RouterService<R extends Route> extends Evented {}
-class RouterService<R extends Route> extends Service.extend(Evented) {
-  [ROUTER]?: EmberRouter<R>;
-
-  get _router(): EmberRouter<R> {
-    let router = this[ROUTER];
-    if (router !== undefined) {
-      return router;
-    }
-    let owner = getOwner(this);
-    assert('RouterService is unexpectedly missing an owner', owner);
-
-    let _router = owner.lookup('router:main');
-    assert(
-      'ROUTER SERVICE BUG: Expected router to be an instance of EmberRouter',
-      _router instanceof EmberRouter
-    );
-    return (this[ROUTER] = _router);
-  }
-
-  willDestroy() {
-    super.willDestroy();
-
-    this[ROUTER] = undefined;
-  }
-
-  /**
-     Transition the application into another route. The route may
-     be either a single route or route path:
-
-     Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
-     This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
-     See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
-
-     In the following example we use the Router service to navigate to a route with a
-     specific model from a Component in the first action, and in the second we trigger
-     a query-params only transition.
-
-     ```app/components/example.js
-     import Component from '@glimmer/component';
-     import { action } from '@ember/object';
-     import { service } from '@ember/service';
-
-     export default class extends Component {
-       @service router;
-
-       @action
-       goToComments(post) {
-         this.router.transitionTo('comments', post);
-       }
-
-       @action
-       fetchMoreComments(latestComment) {
-         this.router.transitionTo({
-           queryParams: { commentsAfter: latestComment }
-         });
-       }
-     }
-     ```
-
-     @method transitionTo
-     @param {String} [routeNameOrUrl] the name of the route or a URL
-     @param {...Object} [models] the model(s) or identifier(s) to be used while
-       transitioning to the route.
-     @param {Object} [options] optional hash with a queryParams property
-       containing a mapping of query parameters. May be supplied as the only
-      parameter to trigger a query-parameter-only transition.
-     @return {Transition} the transition object associated with this
-       attempted transition
-     @public
-   */
-  transitionTo(...args: RouteArgs<R>): Transition {
-    if (resemblesURL(args[0])) {
-      // NOTE: this `args[0] as string` cast is safe and TS correctly infers it
-      // in 3.6+, so it can be removed when TS is upgraded.
-      return this._router._doURLTransition('transitionTo', args[0]);
-    }
-
-    let { routeName, models, queryParams } = extractRouteArgs(args);
-
-    let transition = this._router._doTransition(routeName, models, queryParams, true);
-
-    return transition;
-  }
-
-  /**
-     Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
-     it replaces the entry for the current route.
-     When the user clicks the "back" button in the browser, there will be fewer steps.
-     This is most commonly used to manage redirects in a way that does not cause confusing additions
-     to the user's browsing history.
-
-     Calling `replaceWith` from the Router service will cause default query parameter values to be included in the URL.
-     This behavior is different from calling `replaceWith` on a route.
-     See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
-
-     Usage example:
-
-     ```app/routes/application.js
-     import Route from '@ember/routing/route';
-
-     export default class extends Route {
-       beforeModel() {
-         if (!authorized()){
-           this.replaceWith('unauthorized');
-         }
-       }
-     });
-     ```
-
-     @method replaceWith
-     @param {String} routeNameOrUrl the name of the route or a URL of the desired destination
-     @param {...Object} models the model(s) or identifier(s) to be used while
-       transitioning to the route i.e. an object of params to pass to the destination route
-     @param {Object} [options] optional hash with a queryParams property
-       containing a mapping of query parameters
-     @return {Transition} the transition object associated with this
-       attempted transition
-     @public
-   */
-  replaceWith(...args: RouteArgs<R>): Transition {
-    return this.transitionTo(...args).method('replace');
-  }
-
-  /**
-    Generate a URL based on the supplied route name and optionally a model. The
-    URL is returned as a string that can be used for any purpose.
-
-    In this example, the URL for the `author.books` route for a given author
-    is copied to the clipboard.
-
-    ```app/templates/application.hbs
-    <CopyLink @author={{hash id="tomster" name="Tomster"}} />
-    ```
-
-    ```app/components/copy-link.js
-    import Component from '@glimmer/component';
-    import { service } from '@ember/service';
-    import { action } from '@ember/object';
-
-    export default class CopyLinkComponent extends Component {
-      @service router;
-      @service clipboard;
-
-      @action
-      copyBooksURL() {
-        if (this.author) {
-          const url = this.router.urlFor('author.books', this.args.author);
-          this.clipboard.set(url);
-          // Clipboard now has /author/tomster/books
-        }
-      }
-    }
-    ```
-
-    Just like with `transitionTo` and `replaceWith`, `urlFor` can also handle
-    query parameters.
-
-    ```app/templates/application.hbs
-    <CopyLink @author={{hash id="tomster" name="Tomster"}} />
-    ```
-
-    ```app/components/copy-link.js
-    import Component from '@glimmer/component';
-    import { service } from '@ember/service';
-    import { action } from '@ember/object';
-
-    export default class CopyLinkComponent extends Component {
-      @service router;
-      @service clipboard;
-
-      @action
-      copyOnlyEmberBooksURL() {
-        if (this.author) {
-          const url = this.router.urlFor('author.books', this.author, {
-            queryParams: { filter: 'emberjs' }
-          });
-          this.clipboard.set(url);
-          // Clipboard now has /author/tomster/books?filter=emberjs
-        }
-      }
-    }
-    ```
-
-     @method urlFor
-     @param {String} routeName the name of the route
-     @param {...Object} models the model(s) for the route.
-     @param {Object} [options] optional hash with a queryParams property
-       containing a mapping of query parameters
-     @return {String} the string representing the generated URL
-     @public
-   */
-  urlFor(routeName: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]) {
-    this._router.setupRouter();
-    return this._router.generate(routeName, ...args);
-  }
-
-  /**
-     Returns `true` if `routeName/models/queryParams` is the active route, where `models` and `queryParams` are optional.
-     See [model](api/ember/release/classes/Route/methods/model?anchor=model) and
-     [queryParams](/api/ember/3.7/classes/Route/properties/queryParams?anchor=queryParams) for more information about these arguments.
-
-     In the following example, `isActive` will return `true` if the current route is `/posts`.
-
-     ```app/components/posts.js
-     import Component from '@glimmer/component';
-     import { service } from '@ember/service';
-
-     export default class extends Component {
-       @service router;
-
-       displayComments() {
-         return this.router.isActive('posts');
-       }
-     });
-     ```
-
-     The next example includes a dynamic segment, and will return `true` if the current route is `/posts/1`,
-     assuming the post has an id of 1:
-
-     ```app/components/posts.js
-     import Component from '@glimmer/component';
-     import { service } from '@ember/service';
-
-     export default class extends Component {
-       @service router;
-
-       displayComments(post) {
-         return this.router.isActive('posts', post.id);
-       }
-     });
-     ```
-
-     Where `post.id` is the id of a specific post, which is represented in the route as /posts/[post.id].
-     If `post.id` is equal to 1, then isActive will return true if the current route is /posts/1, and false if the route is anything else.
-
-     @method isActive
-     @param {String} routeName the name of the route
-     @param {...Object} models the model(s) or identifier(s) to be used when determining the active route.
-     @param {Object} [options] optional hash with a queryParams property
-       containing a mapping of query parameters
-     @return {boolean} true if the provided routeName/models/queryParams are active
-     @public
-   */
-  isActive(...args: RouteArgs<R>) {
-    let { routeName, models, queryParams } = extractRouteArgs(args);
-    let routerMicrolib = this._router._routerMicrolib;
-
-    // When using isActive() in a getter, we want to entagle with the auto-tracking system
-    // for example,
-    // in
-    // get isBarActive() {
-    //   return isActive('foo.bar');
-    // }
-    //
-    // you'd expect isBarActive to be dirtied when the route changes.
-    //
-    // https://github.com/emberjs/ember.js/issues/19004
-    consumeTag(tagFor(this._router, 'currentURL'));
-
-    // UNSAFE: casting `routeName as string` here encodes the existing
-    // assumption but may be wrong: `extractRouteArgs` correctly returns it as
-    // `string | undefined`. There may be bugs if `isActiveIntent` does
-    // not correctly account for `undefined` values for `routeName`. Spoilers:
-    // it *does not* account for this being `undefined`.
-    if (!routerMicrolib.isActiveIntent(routeName as string, models)) {
-      return false;
-    }
-    let hasQueryParams = Object.keys(queryParams).length > 0;
-
-    if (hasQueryParams) {
-      // UNSAFE: casting `routeName as string` here encodes the existing
-      // assumption but may be wrong: `extractRouteArgs` correctly returns it
-      // as `string | undefined`. There may be bugs if `_prepareQueryParams`
-      // does not correctly account for `undefined` values for `routeName`.
-      //  Spoilers: under the hood this currently uses router.js APIs which
-      // *do not* account for this being `undefined`.
-      let targetRouteName = routeName as string;
-
-      queryParams = Object.assign({}, queryParams);
-      this._router._prepareQueryParams(
-        targetRouteName,
-        models,
-        queryParams,
-        true /* fromRouterService */
-      );
-
-      let currentQueryParams = Object.assign({}, routerMicrolib.state!.queryParams);
-      this._router._prepareQueryParams(
-        targetRouteName,
-        models,
-        currentQueryParams,
-        true /* fromRouterService */
-      );
-
-      return shallowEqual(queryParams, currentQueryParams);
-    }
-
-    return true;
-  }
-
-  /**
-     Takes a string URL and returns a `RouteInfo` for the leafmost route represented
-     by the URL. Returns `null` if the URL is not recognized. This method expects to
-     receive the actual URL as seen by the browser including the app's `rootURL`.
-
-     See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
-
-     In the following example `recognize` is used to verify if a path belongs to our
-     application before transitioning to it.
-
-     ```
-     import Component from '@ember/component';
-     import { service } from '@ember/service';
-
-     export default class extends Component {
-       @service router;
-       path = '/';
-
-       click() {
-         if (this.router.recognize(this.path)) {
-           this.router.transitionTo(this.path);
-         }
-       }
-     }
-     ```
-
-      @method recognize
-      @param {String} url
-      @return {RouteInfo | null}
-      @public
-    */
-  recognize(url: string): RouteInfo | null {
-    assert(
-      `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
-      url.indexOf(this.rootURL) === 0
-    );
-    this._router.setupRouter();
-    let internalURL = cleanURL(url, this.rootURL);
-    return this._router._routerMicrolib.recognize(internalURL);
-  }
-
-  /**
-    Takes a string URL and returns a promise that resolves to a
-    `RouteInfoWithAttributes` for the leafmost route represented by the URL.
-    The promise rejects if the URL is not recognized or an unhandled exception
-    is encountered. This method expects to receive the actual URL as seen by
-    the browser including the app's `rootURL`.
-
-      @method recognizeAndLoad
-      @param {String} url
-      @return {RouteInfo}
-      @public
-   */
-  recognizeAndLoad(url: string): Promise<RouteInfoWithAttributes> {
-    assert(
-      `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
-      url.indexOf(this.rootURL) === 0
-    );
-    this._router.setupRouter();
-    let internalURL = cleanURL(url, this.rootURL);
-    return this._router._routerMicrolib.recognizeAndLoad(internalURL);
-  }
-
-  /**
-    You can register a listener for events emitted by this service with `.on()`:
-
-    ```app/routes/contact-form.js
-    import Route from '@ember/routing';
-    import { service } from '@ember/service';
-
-    export default class extends Route {
-      @service router;
-
-      activate() {
-        this.router.on('routeWillChange', (transition) => {
-          if (!transition.to.find(route => route.name === this.routeName)) {
-            alert("Please save or cancel your changes.");
-            transition.abort();
-          }
-        })
-      }
-    }
-    ```
-
-    @method on
-    @param {String} eventName
-    @param {Function} callback
-    @public
-  */
-
-  /**
-    You can unregister a listener for events emitted by this service with `.off()`:
-
-    ```app/routes/contact-form.js
-    import Route from '@ember/routing';
-    import { service } from '@ember/service';
-
-    export default class extends Route {
-      @service router;
-
-      callback = (transition) =>  {
-        if (!transition.to.find(route => route.name === this.routeName)) {
-          alert("Please save or cancel your changes.");
-          transition.abort();
-        }
-      };
-
-      activate() {
-        this.router.on('routeWillChange', this.callback);
-      }
-
-      deactivate() {
-        this.router.off('routeWillChange', this.callback);
-    }
-    ```
-
-    @method off
-    @param {String} eventName
-    @param {Function} callback
-    @public
-  */
-
-  /**
-    The `routeWillChange` event is fired at the beginning of any
-    attempted transition with a `Transition` object as the sole
-    argument. This action can be used for aborting, redirecting,
-    or decorating the transition from the currently active routes.
-
-    A good example is preventing navigation when a form is
-    half-filled out:
-
-    ```app/routes/contact-form.js
-    import Route from '@ember/routing';
-    import { service } from '@ember/service';
-
-    export default class extends Route {
-      @service router;
-
-      activate() {
-        this.router.on('routeWillChange', (transition) => {
-          if (!transition.to.find(route => route.name === this.routeName)) {
-            alert("Please save or cancel your changes.");
-            transition.abort();
-          }
-        })
-      }
-    }
-    ```
-
-    The `routeWillChange` event fires whenever a new route is chosen as the desired target of a transition. This includes `transitionTo`, `replaceWith`, all redirection for any reason including error handling, and abort. Aborting implies changing the desired target back to where you already were. Once a transition has completed, `routeDidChange` fires.
-
-    @event routeWillChange
-    @param {Transition} transition
-    @public
-  */
-
-  /**
-    The `routeDidChange` event only fires once a transition has settled.
-    This includes aborts and error substates. Like the `routeWillChange` event
-    it receives a Transition as the sole argument.
-
-    A good example is sending some analytics when the route has transitioned:
-
-    ```app/routes/contact-form.js
-    import Route from '@ember/routing';
-    import { service } from '@ember/service';
-
-    export default class extends Route {
-      @service router;
-
-      activate() {
-        this.router.on('routeDidChange', (transition) => {
-          ga.send('pageView', {
-            current: transition.to.name,
-            from: transition.from.name
-          });
-        })
-      }
-    }
-    ```
-
-    `routeDidChange` will be called after any `Route`'s
-    [didTransition](/ember/release/classes/Route/events/didTransition?anchor=didTransition)
-    action has been fired.
-    The updates of properties
-    [currentURL](/ember/release/classes/RouterService/properties/currentURL?anchor=currentURL),
-    [currentRouteName](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRouteName)
-    and
-    [currentRoute](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRoute)
-    are completed at the time `routeDidChange` is called.
-
-    @event routeDidChange
-    @param {Transition} transition
-    @public
-  */
-
-  /**
-   * Refreshes all currently active routes, doing a full transition.
-   * If a route name is provided and refers to a currently active route,
-   * it will refresh only that route and its descendents.
-   * Returns a promise that will be resolved once the refresh is complete.
-   * All resetController, beforeModel, model, afterModel, redirect, and setupController
-   * hooks will be called again. You will get new data from the model hook.
-   *
-   * @method refresh
-   * @param {String} [routeName] the route to refresh (along with all child routes)
-   * @return Transition
-   * @public
-   */
-  refresh(pivotRouteName?: string): Transition {
-    if (!pivotRouteName) {
-      return this._router._routerMicrolib.refresh();
-    }
-
-    assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
-    assert(`The route "${pivotRouteName}" is currently not active`, this.isActive(pivotRouteName));
-
-    let owner = getOwner(this);
-    assert('RouterService is unexpectedly missing an owner', owner);
-    let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
-
-    // R could be instantiated with a different sub-type
-    // @ts-ignore
-    return this._router._routerMicrolib.refresh(pivotRoute);
-  }
-
-  /**
-   Name of the current route.
-
-    This property represents the logical name of the route,
-    which is dot separated.
-    For the following router:
-
-    ```app/router.js
-    Router.map(function() {
-      this.route('about');
-      this.route('blog', function () {
-        this.route('post', { path: ':post_id' });
-      });
-    });
-    ```
-
-    It will return:
-
-    * `index` when you visit `/`
-    * `about` when you visit `/about`
-    * `blog.index` when you visit `/blog`
-    * `blog.post` when you visit `/blog/some-post-id`
-
-    @property currentRouteName
-    @type {String | null}
-    @public
-  */
-  @readOnly('_router.currentRouteName')
-  declare readonly currentRouteName: this['_router']['currentRouteName'];
-
-  /**
-   Current URL for the application.
-
-  This property represents the URL path for this route.
-  For the following router:
-
-    ```app/router.js
-    Router.map(function() {
-      this.route('about');
-      this.route('blog', function () {
-        this.route('post', { path: ':post_id' });
-      });
-    });
-    ```
-
-    It will return:
-
-    * `/` when you visit `/`
-    * `/about` when you visit `/about`
-    * `/blog` when you visit `/blog`
-    * `/blog/some-post-id` when you visit `/blog/some-post-id`
-
-    @property currentURL
-    @type String
-    @public
-  */
-  @readOnly('_router.currentURL')
-  declare readonly currentURL: this['_router']['currentURL'];
-
-  /**
-    The `location` property returns what implementation of the `location` API
-    your application is using, which determines what type of URL is being used.
-
-    See [Location](/ember/release/classes/Location) for more information.
-
-    To force a particular `location` API implementation to be used in your
-    application you can set a location type on your `config/environment`.
-    For example, to set the `history` type:
-
-    ```config/environment.js
-    'use strict';
-
-    module.exports = function(environment) {
-      let ENV = {
-        modulePrefix: 'router-service',
-        environment,
-        rootURL: '/',
-        locationType: 'history',
-        ...
-      }
-    }
-    ```
-
-    The following location types are available by default:
-    `auto`, `hash`, `history`, `none`.
-
-    See [HashLocation](/ember/release/classes/HashLocation).
-    See [HistoryLocation](/ember/release/classes/HistoryLocation).
-    See [NoneLocation](/ember/release/classes/NoneLocation).
-    See [AutoLocation](/ember/release/classes/AutoLocation).
-
-    @property location
-    @default 'hash'
-    @see {Location}
-    @public
-  */
-  @readOnly('_router.location')
-  declare readonly location: this['_router']['location'];
-
-  /**
-    The `rootURL` property represents the URL of the root of
-    the application, '/' by default.
-    This prefix is assumed on all routes defined on this app.
-
-    If you change the `rootURL` in your environment configuration
-    like so:
-
-    ```config/environment.js
-    'use strict';
-
-    module.exports = function(environment) {
-      let ENV = {
-        modulePrefix: 'router-service',
-        environment,
-        rootURL: '/my-root',
-      …
-      }
-    ]
-    ```
-
-    This property will return `/my-root`.
-
-    @property rootURL
-    @default '/'
-    @public
-  */
-  @readOnly('_router.rootURL')
-  declare readonly rootURL: this['_router']['rootURL'];
-
-  /**
-    The `currentRoute` property contains metadata about the current leaf route.
-    It returns a `RouteInfo` object that has information like the route name,
-    params, query params and more.
-
-    See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
-
-    This property is guaranteed to change whenever a route transition
-    happens (even when that transition only changes parameters
-    and doesn't change the active route).
-
-    Usage example:
-    ```app/components/header.js
-      import Component from '@glimmer/component';
-      import { service } from '@ember/service';
-      import { notEmpty } from '@ember/object/computed';
-
-      export default class extends Component {
-        @service router;
-
-        @notEmpty('router.currentRoute.child') isChildRoute;
-      });
-    ```
-
-    @property currentRoute
-    @type RouteInfo
-    @public
-  */
-  @readOnly('_router.currentRoute')
-  declare readonly currentRoute: this['_router']['currentRoute'];
-}
-
-export { RouterService as default, RouteInfo, RouteInfoWithAttributes };
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/-internals/routing/lib/services/routing.ts
index c6ad663c864..fbc9f1c9e69 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/-internals/routing/lib/services/routing.ts
@@ -10,7 +10,7 @@ import type { ModelFor } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
 import type RouterState from '../system/router_state';
-import { ROUTER } from './router';
+import { ROUTER } from '@ember/routing/router-service';
 
 /**
   The Routing service is used by LinkTo, and provides facilities for
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index ad028957cae..79f05ee3147 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -28,7 +28,7 @@ import type { BootOptions } from '@ember/engine/instance';
 import type { Container, Registry } from '@ember/-internals/container';
 import { privatize as P } from '@ember/-internals/container';
 import { setupApplicationRegistry } from '@ember/-internals/glimmer';
-import { RouterService } from '@ember/-internals/routing';
+import RouterService from '@ember/routing/router-service';
 import type { EngineInstanceOptions } from '@ember/engine/instance';
 import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
 
diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
index 2f48ca37564..c84746c1dc8 100644
--- a/packages/@ember/routing/router-service.ts
+++ b/packages/@ember/routing/router-service.ts
@@ -1,5 +1,744 @@
-export {
-  RouterService as default,
-  RouteInfo,
-  RouteInfoWithAttributes,
-} from '@ember/-internals/routing';
+import { getOwner } from '@ember/-internals/owner';
+import Evented from '@ember/object/evented';
+import { assert } from '@ember/debug';
+import { readOnly } from '@ember/object/computed';
+import Service from '@ember/service';
+import { consumeTag, tagFor } from '@glimmer/validator';
+import type { ModelFor, Transition } from 'router_js';
+import type Route from '@ember/routing/route';
+import EmberRouter from '@ember/routing/router';
+import type { RouteArgs, RouteOptions } from '@ember/-internals/routing';
+import { RouteInfo, RouteInfoWithAttributes } from '@ember/-internals/routing';
+import { extractRouteArgs, resemblesURL, shallowEqual } from '@ember/-internals/routing';
+
+export const ROUTER = Symbol('ROUTER');
+
+function cleanURL(url: string, rootURL: string) {
+  if (rootURL === '/') {
+    return url;
+  }
+
+  return url.substring(rootURL.length);
+}
+
+/**
+   The Router service is the public API that provides access to the router.
+
+   The immediate benefit of the Router service is that you can inject it into components,
+   giving them a friendly way to initiate transitions and ask questions about the current
+   global router state.
+
+   In this example, the Router service is injected into a component to initiate a transition
+   to a dedicated route:
+
+   ```app/components/example.js
+   import Component from '@glimmer/component';
+   import { action } from '@ember/object';
+   import { service } from '@ember/service';
+
+   export default class ExampleComponent extends Component {
+     @service router;
+
+     @action
+     next() {
+       this.router.transitionTo('other.route');
+     }
+   }
+   ```
+
+   Like any service, it can also be injected into helpers, routes, etc.
+
+   @public
+   @extends Service
+   @class RouterService
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface RouterService<R extends Route> extends Evented {}
+class RouterService<R extends Route> extends Service.extend(Evented) {
+  [ROUTER]?: EmberRouter<R>;
+
+  get _router(): EmberRouter<R> {
+    let router = this[ROUTER];
+    if (router !== undefined) {
+      return router;
+    }
+    let owner = getOwner(this);
+    assert('RouterService is unexpectedly missing an owner', owner);
+
+    let _router = owner.lookup('router:main');
+    assert(
+      'ROUTER SERVICE BUG: Expected router to be an instance of EmberRouter',
+      _router instanceof EmberRouter
+    );
+    return (this[ROUTER] = _router);
+  }
+
+  willDestroy() {
+    super.willDestroy();
+
+    this[ROUTER] = undefined;
+  }
+
+  /**
+     Transition the application into another route. The route may
+     be either a single route or route path:
+
+     Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
+     This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
+     See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
+
+     In the following example we use the Router service to navigate to a route with a
+     specific model from a Component in the first action, and in the second we trigger
+     a query-params only transition.
+
+     ```app/components/example.js
+     import Component from '@glimmer/component';
+     import { action } from '@ember/object';
+     import { service } from '@ember/service';
+
+     export default class extends Component {
+       @service router;
+
+       @action
+       goToComments(post) {
+         this.router.transitionTo('comments', post);
+       }
+
+       @action
+       fetchMoreComments(latestComment) {
+         this.router.transitionTo({
+           queryParams: { commentsAfter: latestComment }
+         });
+       }
+     }
+     ```
+
+     @method transitionTo
+     @param {String} [routeNameOrUrl] the name of the route or a URL
+     @param {...Object} [models] the model(s) or identifier(s) to be used while
+       transitioning to the route.
+     @param {Object} [options] optional hash with a queryParams property
+       containing a mapping of query parameters. May be supplied as the only
+      parameter to trigger a query-parameter-only transition.
+     @return {Transition} the transition object associated with this
+       attempted transition
+     @public
+   */
+  transitionTo(...args: RouteArgs<R>): Transition {
+    if (resemblesURL(args[0])) {
+      // NOTE: this `args[0] as string` cast is safe and TS correctly infers it
+      // in 3.6+, so it can be removed when TS is upgraded.
+      return this._router._doURLTransition('transitionTo', args[0]);
+    }
+
+    let { routeName, models, queryParams } = extractRouteArgs(args);
+
+    let transition = this._router._doTransition(routeName, models, queryParams, true);
+
+    return transition;
+  }
+
+  /**
+     Similar to `transitionTo`, but instead of adding the destination to the browser's URL history,
+     it replaces the entry for the current route.
+     When the user clicks the "back" button in the browser, there will be fewer steps.
+     This is most commonly used to manage redirects in a way that does not cause confusing additions
+     to the user's browsing history.
+
+     Calling `replaceWith` from the Router service will cause default query parameter values to be included in the URL.
+     This behavior is different from calling `replaceWith` on a route.
+     See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
+
+     Usage example:
+
+     ```app/routes/application.js
+     import Route from '@ember/routing/route';
+
+     export default class extends Route {
+       beforeModel() {
+         if (!authorized()){
+           this.replaceWith('unauthorized');
+         }
+       }
+     });
+     ```
+
+     @method replaceWith
+     @param {String} routeNameOrUrl the name of the route or a URL of the desired destination
+     @param {...Object} models the model(s) or identifier(s) to be used while
+       transitioning to the route i.e. an object of params to pass to the destination route
+     @param {Object} [options] optional hash with a queryParams property
+       containing a mapping of query parameters
+     @return {Transition} the transition object associated with this
+       attempted transition
+     @public
+   */
+  replaceWith(...args: RouteArgs<R>): Transition {
+    return this.transitionTo(...args).method('replace');
+  }
+
+  /**
+    Generate a URL based on the supplied route name and optionally a model. The
+    URL is returned as a string that can be used for any purpose.
+
+    In this example, the URL for the `author.books` route for a given author
+    is copied to the clipboard.
+
+    ```app/templates/application.hbs
+    <CopyLink @author={{hash id="tomster" name="Tomster"}} />
+    ```
+
+    ```app/components/copy-link.js
+    import Component from '@glimmer/component';
+    import { service } from '@ember/service';
+    import { action } from '@ember/object';
+
+    export default class CopyLinkComponent extends Component {
+      @service router;
+      @service clipboard;
+
+      @action
+      copyBooksURL() {
+        if (this.author) {
+          const url = this.router.urlFor('author.books', this.args.author);
+          this.clipboard.set(url);
+          // Clipboard now has /author/tomster/books
+        }
+      }
+    }
+    ```
+
+    Just like with `transitionTo` and `replaceWith`, `urlFor` can also handle
+    query parameters.
+
+    ```app/templates/application.hbs
+    <CopyLink @author={{hash id="tomster" name="Tomster"}} />
+    ```
+
+    ```app/components/copy-link.js
+    import Component from '@glimmer/component';
+    import { service } from '@ember/service';
+    import { action } from '@ember/object';
+
+    export default class CopyLinkComponent extends Component {
+      @service router;
+      @service clipboard;
+
+      @action
+      copyOnlyEmberBooksURL() {
+        if (this.author) {
+          const url = this.router.urlFor('author.books', this.author, {
+            queryParams: { filter: 'emberjs' }
+          });
+          this.clipboard.set(url);
+          // Clipboard now has /author/tomster/books?filter=emberjs
+        }
+      }
+    }
+    ```
+
+     @method urlFor
+     @param {String} routeName the name of the route
+     @param {...Object} models the model(s) for the route.
+     @param {Object} [options] optional hash with a queryParams property
+       containing a mapping of query parameters
+     @return {String} the string representing the generated URL
+     @public
+   */
+  urlFor(routeName: string, ...args: ModelFor<R>[] | [...ModelFor<R>[], RouteOptions]) {
+    this._router.setupRouter();
+    return this._router.generate(routeName, ...args);
+  }
+
+  /**
+     Returns `true` if `routeName/models/queryParams` is the active route, where `models` and `queryParams` are optional.
+     See [model](api/ember/release/classes/Route/methods/model?anchor=model) and
+     [queryParams](/api/ember/3.7/classes/Route/properties/queryParams?anchor=queryParams) for more information about these arguments.
+
+     In the following example, `isActive` will return `true` if the current route is `/posts`.
+
+     ```app/components/posts.js
+     import Component from '@glimmer/component';
+     import { service } from '@ember/service';
+
+     export default class extends Component {
+       @service router;
+
+       displayComments() {
+         return this.router.isActive('posts');
+       }
+     });
+     ```
+
+     The next example includes a dynamic segment, and will return `true` if the current route is `/posts/1`,
+     assuming the post has an id of 1:
+
+     ```app/components/posts.js
+     import Component from '@glimmer/component';
+     import { service } from '@ember/service';
+
+     export default class extends Component {
+       @service router;
+
+       displayComments(post) {
+         return this.router.isActive('posts', post.id);
+       }
+     });
+     ```
+
+     Where `post.id` is the id of a specific post, which is represented in the route as /posts/[post.id].
+     If `post.id` is equal to 1, then isActive will return true if the current route is /posts/1, and false if the route is anything else.
+
+     @method isActive
+     @param {String} routeName the name of the route
+     @param {...Object} models the model(s) or identifier(s) to be used when determining the active route.
+     @param {Object} [options] optional hash with a queryParams property
+       containing a mapping of query parameters
+     @return {boolean} true if the provided routeName/models/queryParams are active
+     @public
+   */
+  isActive(...args: RouteArgs<R>) {
+    let { routeName, models, queryParams } = extractRouteArgs(args);
+    let routerMicrolib = this._router._routerMicrolib;
+
+    // When using isActive() in a getter, we want to entagle with the auto-tracking system
+    // for example,
+    // in
+    // get isBarActive() {
+    //   return isActive('foo.bar');
+    // }
+    //
+    // you'd expect isBarActive to be dirtied when the route changes.
+    //
+    // https://github.com/emberjs/ember.js/issues/19004
+    consumeTag(tagFor(this._router, 'currentURL'));
+
+    // UNSAFE: casting `routeName as string` here encodes the existing
+    // assumption but may be wrong: `extractRouteArgs` correctly returns it as
+    // `string | undefined`. There may be bugs if `isActiveIntent` does
+    // not correctly account for `undefined` values for `routeName`. Spoilers:
+    // it *does not* account for this being `undefined`.
+    if (!routerMicrolib.isActiveIntent(routeName as string, models)) {
+      return false;
+    }
+    let hasQueryParams = Object.keys(queryParams).length > 0;
+
+    if (hasQueryParams) {
+      // UNSAFE: casting `routeName as string` here encodes the existing
+      // assumption but may be wrong: `extractRouteArgs` correctly returns it
+      // as `string | undefined`. There may be bugs if `_prepareQueryParams`
+      // does not correctly account for `undefined` values for `routeName`.
+      //  Spoilers: under the hood this currently uses router.js APIs which
+      // *do not* account for this being `undefined`.
+      let targetRouteName = routeName as string;
+
+      queryParams = Object.assign({}, queryParams);
+      this._router._prepareQueryParams(
+        targetRouteName,
+        models,
+        queryParams,
+        true /* fromRouterService */
+      );
+
+      let currentQueryParams = Object.assign({}, routerMicrolib.state!.queryParams);
+      this._router._prepareQueryParams(
+        targetRouteName,
+        models,
+        currentQueryParams,
+        true /* fromRouterService */
+      );
+
+      return shallowEqual(queryParams, currentQueryParams);
+    }
+
+    return true;
+  }
+
+  /**
+     Takes a string URL and returns a `RouteInfo` for the leafmost route represented
+     by the URL. Returns `null` if the URL is not recognized. This method expects to
+     receive the actual URL as seen by the browser including the app's `rootURL`.
+
+     See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
+
+     In the following example `recognize` is used to verify if a path belongs to our
+     application before transitioning to it.
+
+     ```
+     import Component from '@ember/component';
+     import { service } from '@ember/service';
+
+     export default class extends Component {
+       @service router;
+       path = '/';
+
+       click() {
+         if (this.router.recognize(this.path)) {
+           this.router.transitionTo(this.path);
+         }
+       }
+     }
+     ```
+
+      @method recognize
+      @param {String} url
+      @return {RouteInfo | null}
+      @public
+    */
+  recognize(url: string): RouteInfo | null {
+    assert(
+      `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
+      url.indexOf(this.rootURL) === 0
+    );
+    this._router.setupRouter();
+    let internalURL = cleanURL(url, this.rootURL);
+    return this._router._routerMicrolib.recognize(internalURL);
+  }
+
+  /**
+    Takes a string URL and returns a promise that resolves to a
+    `RouteInfoWithAttributes` for the leafmost route represented by the URL.
+    The promise rejects if the URL is not recognized or an unhandled exception
+    is encountered. This method expects to receive the actual URL as seen by
+    the browser including the app's `rootURL`.
+
+      @method recognizeAndLoad
+      @param {String} url
+      @return {RouteInfo}
+      @public
+   */
+  recognizeAndLoad(url: string): Promise<RouteInfoWithAttributes> {
+    assert(
+      `You must pass a url that begins with the application's rootURL "${this.rootURL}"`,
+      url.indexOf(this.rootURL) === 0
+    );
+    this._router.setupRouter();
+    let internalURL = cleanURL(url, this.rootURL);
+    return this._router._routerMicrolib.recognizeAndLoad(internalURL);
+  }
+
+  /**
+    You can register a listener for events emitted by this service with `.on()`:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing';
+    import { service } from '@ember/service';
+
+    export default class extends Route {
+      @service router;
+
+      activate() {
+        this.router.on('routeWillChange', (transition) => {
+          if (!transition.to.find(route => route.name === this.routeName)) {
+            alert("Please save or cancel your changes.");
+            transition.abort();
+          }
+        })
+      }
+    }
+    ```
+
+    @method on
+    @param {String} eventName
+    @param {Function} callback
+    @public
+  */
+
+  /**
+    You can unregister a listener for events emitted by this service with `.off()`:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing';
+    import { service } from '@ember/service';
+
+    export default class extends Route {
+      @service router;
+
+      callback = (transition) =>  {
+        if (!transition.to.find(route => route.name === this.routeName)) {
+          alert("Please save or cancel your changes.");
+          transition.abort();
+        }
+      };
+
+      activate() {
+        this.router.on('routeWillChange', this.callback);
+      }
+
+      deactivate() {
+        this.router.off('routeWillChange', this.callback);
+    }
+    ```
+
+    @method off
+    @param {String} eventName
+    @param {Function} callback
+    @public
+  */
+
+  /**
+    The `routeWillChange` event is fired at the beginning of any
+    attempted transition with a `Transition` object as the sole
+    argument. This action can be used for aborting, redirecting,
+    or decorating the transition from the currently active routes.
+
+    A good example is preventing navigation when a form is
+    half-filled out:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing';
+    import { service } from '@ember/service';
+
+    export default class extends Route {
+      @service router;
+
+      activate() {
+        this.router.on('routeWillChange', (transition) => {
+          if (!transition.to.find(route => route.name === this.routeName)) {
+            alert("Please save or cancel your changes.");
+            transition.abort();
+          }
+        })
+      }
+    }
+    ```
+
+    The `routeWillChange` event fires whenever a new route is chosen as the desired target of a transition. This includes `transitionTo`, `replaceWith`, all redirection for any reason including error handling, and abort. Aborting implies changing the desired target back to where you already were. Once a transition has completed, `routeDidChange` fires.
+
+    @event routeWillChange
+    @param {Transition} transition
+    @public
+  */
+
+  /**
+    The `routeDidChange` event only fires once a transition has settled.
+    This includes aborts and error substates. Like the `routeWillChange` event
+    it receives a Transition as the sole argument.
+
+    A good example is sending some analytics when the route has transitioned:
+
+    ```app/routes/contact-form.js
+    import Route from '@ember/routing';
+    import { service } from '@ember/service';
+
+    export default class extends Route {
+      @service router;
+
+      activate() {
+        this.router.on('routeDidChange', (transition) => {
+          ga.send('pageView', {
+            current: transition.to.name,
+            from: transition.from.name
+          });
+        })
+      }
+    }
+    ```
+
+    `routeDidChange` will be called after any `Route`'s
+    [didTransition](/ember/release/classes/Route/events/didTransition?anchor=didTransition)
+    action has been fired.
+    The updates of properties
+    [currentURL](/ember/release/classes/RouterService/properties/currentURL?anchor=currentURL),
+    [currentRouteName](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRouteName)
+    and
+    [currentRoute](/ember/release/classes/RouterService/properties/currentURL?anchor=currentRoute)
+    are completed at the time `routeDidChange` is called.
+
+    @event routeDidChange
+    @param {Transition} transition
+    @public
+  */
+
+  /**
+   * Refreshes all currently active routes, doing a full transition.
+   * If a route name is provided and refers to a currently active route,
+   * it will refresh only that route and its descendents.
+   * Returns a promise that will be resolved once the refresh is complete.
+   * All resetController, beforeModel, model, afterModel, redirect, and setupController
+   * hooks will be called again. You will get new data from the model hook.
+   *
+   * @method refresh
+   * @param {String} [routeName] the route to refresh (along with all child routes)
+   * @return Transition
+   * @public
+   */
+  refresh(pivotRouteName?: string): Transition {
+    if (!pivotRouteName) {
+      return this._router._routerMicrolib.refresh();
+    }
+
+    assert(`The route "${pivotRouteName}" was not found`, this._router.hasRoute(pivotRouteName));
+    assert(`The route "${pivotRouteName}" is currently not active`, this.isActive(pivotRouteName));
+
+    let owner = getOwner(this);
+    assert('RouterService is unexpectedly missing an owner', owner);
+    let pivotRoute = owner.lookup(`route:${pivotRouteName}`) as Route;
+
+    // R could be instantiated with a different sub-type
+    // @ts-ignore
+    return this._router._routerMicrolib.refresh(pivotRoute);
+  }
+
+  /**
+   Name of the current route.
+
+    This property represents the logical name of the route,
+    which is dot separated.
+    For the following router:
+
+    ```app/router.js
+    Router.map(function() {
+      this.route('about');
+      this.route('blog', function () {
+        this.route('post', { path: ':post_id' });
+      });
+    });
+    ```
+
+    It will return:
+
+    * `index` when you visit `/`
+    * `about` when you visit `/about`
+    * `blog.index` when you visit `/blog`
+    * `blog.post` when you visit `/blog/some-post-id`
+
+    @property currentRouteName
+    @type {String | null}
+    @public
+  */
+  @readOnly('_router.currentRouteName')
+  declare readonly currentRouteName: this['_router']['currentRouteName'];
+
+  /**
+   Current URL for the application.
+
+  This property represents the URL path for this route.
+  For the following router:
+
+    ```app/router.js
+    Router.map(function() {
+      this.route('about');
+      this.route('blog', function () {
+        this.route('post', { path: ':post_id' });
+      });
+    });
+    ```
+
+    It will return:
+
+    * `/` when you visit `/`
+    * `/about` when you visit `/about`
+    * `/blog` when you visit `/blog`
+    * `/blog/some-post-id` when you visit `/blog/some-post-id`
+
+    @property currentURL
+    @type String
+    @public
+  */
+  @readOnly('_router.currentURL')
+  declare readonly currentURL: this['_router']['currentURL'];
+
+  /**
+    The `location` property returns what implementation of the `location` API
+    your application is using, which determines what type of URL is being used.
+
+    See [Location](/ember/release/classes/Location) for more information.
+
+    To force a particular `location` API implementation to be used in your
+    application you can set a location type on your `config/environment`.
+    For example, to set the `history` type:
+
+    ```config/environment.js
+    'use strict';
+
+    module.exports = function(environment) {
+      let ENV = {
+        modulePrefix: 'router-service',
+        environment,
+        rootURL: '/',
+        locationType: 'history',
+        ...
+      }
+    }
+    ```
+
+    The following location types are available by default:
+    `auto`, `hash`, `history`, `none`.
+
+    See [HashLocation](/ember/release/classes/HashLocation).
+    See [HistoryLocation](/ember/release/classes/HistoryLocation).
+    See [NoneLocation](/ember/release/classes/NoneLocation).
+    See [AutoLocation](/ember/release/classes/AutoLocation).
+
+    @property location
+    @default 'hash'
+    @see {Location}
+    @public
+  */
+  @readOnly('_router.location')
+  declare readonly location: this['_router']['location'];
+
+  /**
+    The `rootURL` property represents the URL of the root of
+    the application, '/' by default.
+    This prefix is assumed on all routes defined on this app.
+
+    If you change the `rootURL` in your environment configuration
+    like so:
+
+    ```config/environment.js
+    'use strict';
+
+    module.exports = function(environment) {
+      let ENV = {
+        modulePrefix: 'router-service',
+        environment,
+        rootURL: '/my-root',
+      …
+      }
+    ]
+    ```
+
+    This property will return `/my-root`.
+
+    @property rootURL
+    @default '/'
+    @public
+  */
+  @readOnly('_router.rootURL')
+  declare readonly rootURL: this['_router']['rootURL'];
+
+  /**
+    The `currentRoute` property contains metadata about the current leaf route.
+    It returns a `RouteInfo` object that has information like the route name,
+    params, query params and more.
+
+    See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
+
+    This property is guaranteed to change whenever a route transition
+    happens (even when that transition only changes parameters
+    and doesn't change the active route).
+
+    Usage example:
+    ```app/components/header.js
+      import Component from '@glimmer/component';
+      import { service } from '@ember/service';
+      import { notEmpty } from '@ember/object/computed';
+
+      export default class extends Component {
+        @service router;
+
+        @notEmpty('router.currentRoute.child') isChildRoute;
+      });
+    ```
+
+    @property currentRoute
+    @type RouteInfo
+    @public
+  */
+  @readOnly('_router.currentRoute')
+  declare readonly currentRoute: this['_router']['currentRoute'];
+}
+
+export { RouterService as default, RouteInfo, RouteInfoWithAttributes };
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index b8f3788934b..935d2810c32 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -19,8 +19,8 @@ import type {
   EngineRouteInfo,
   RouteArgs,
   RouteOptions,
-  RouterService,
 } from '@ember/-internals/routing';
+import type RouterService from '@ember/routing/router-service';
 import EmberObject from '@ember/object';
 import { A as emberA, typeOf } from '@ember/-internals/runtime';
 import Evented from '@ember/object/evented';

From a3b1dbdfa2c174490895849187cd42f899594d52 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 13:56:35 -0700
Subject: [PATCH 1062/1405] Consolidate @ember/routing/none-location

---
 .../components/link-to/routing-angle-test.js  |   2 +-
 .../components/link-to/routing-curly-test.js  |   2 +-
 packages/@ember/-internals/routing/index.ts   |   3 +-
 .../routing/lib/location/none_location.ts     | 136 -----------------
 .../tests/location/auto_location_test.js      |   2 +-
 .../tests/location/none_location_test.js      |   2 +-
 .../routing/tests/system/router_test.js       |   2 +-
 packages/@ember/application/index.ts          |   2 +-
 .../application/tests/application_test.js     |   2 +-
 packages/@ember/routing/none-location.ts      | 137 +++++++++++++++++-
 packages/ember/index.js                       |   3 +-
 .../tests/routing/decoupled_basic_test.js     |   3 +-
 .../routing/router_service_test/basic_test.js |   2 +-
 .../non_application_test_test.js              |   2 +-
 .../router_service_test/replaceWith_test.js   |   2 +-
 .../router_service_test/transitionTo_test.js  |   2 +-
 .../lib/test-cases/query-param.ts             |   2 +-
 17 files changed, 153 insertions(+), 153 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/location/none_location.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index f24717066c0..87b6a044467 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -8,7 +8,7 @@ import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import Route from '@ember/routing/route';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 6e524b1668c..6ebedb4ee16 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -8,7 +8,7 @@ import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA, RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import Route from '@ember/routing/route';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 494e9696545..f6aa226712e 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,5 +1,4 @@
-export { default as Location, EmberLocation } from './lib/location/api';
-export { default as NoneLocation } from './lib/location/none_location';
+export { default as Location, EmberLocation, UpdateCallback } from './lib/location/api';
 export { default as HashLocation } from './lib/location/hash_location';
 export { default as HistoryLocation } from './lib/location/history_location';
 export { default as AutoLocation } from './lib/location/auto_location';
diff --git a/packages/@ember/-internals/routing/lib/location/none_location.ts b/packages/@ember/-internals/routing/lib/location/none_location.ts
deleted file mode 100644
index 1d9cd6bd3ab..00000000000
--- a/packages/@ember/-internals/routing/lib/location/none_location.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import { set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
-import { assert } from '@ember/debug';
-import type { EmberLocation, UpdateCallback } from './api';
-
-/**
-@module @ember/routing
-*/
-
-/**
-  NoneLocation does not interact with the browser. It is useful for
-  testing, or when you need to manage state with your Router, but temporarily
-  don't want it to muck with the URL (for example when you embed your
-  application in a larger page).
-
-  Using `NoneLocation` causes Ember to not store the applications URL state
-  in the actual URL. This is generally used for testing purposes, and is one
-  of the changes made when calling `App.setupForTesting()`.
-
-  @class NoneLocation
-  @extends EmberObject
-  @protected
-*/
-export default class NoneLocation extends EmberObject implements EmberLocation {
-  declare updateCallback: UpdateCallback;
-  implementation = 'none';
-
-  // Set in reopen so it can be overwritten with extend
-  declare path: string;
-
-  /**
-    Will be pre-pended to path.
-
-    @private
-    @property rootURL
-    @default '/'
-  */
-  // Set in reopen so it can be overwritten with extend
-  declare rootURL: string;
-
-  initState(): void {
-    this._super(...arguments);
-
-    let { rootURL } = this;
-
-    // This assert doesn't have anything to do with state initialization,
-    // but we're hijacking this method since it's called after the route has
-    // set the rootURL property on its Location instance.
-    assert(
-      'rootURL must end with a trailing forward slash e.g. "/app/"',
-      rootURL.charAt(rootURL.length - 1) === '/'
-    );
-  }
-
-  /**
-    Returns the current path without `rootURL`.
-
-    @private
-    @method getURL
-    @return {String} path
-  */
-  getURL(): string {
-    let { path, rootURL } = this;
-
-    // remove trailing slashes if they exists
-    rootURL = rootURL.replace(/\/$/, '');
-
-    // remove rootURL from url
-    return path.replace(new RegExp(`^${rootURL}(?=/|$)`), '');
-  }
-
-  /**
-    Set the path and remembers what was set. Using this method
-    to change the path will not invoke the `updateURL` callback.
-
-    @private
-    @method setURL
-    @param path {String}
-  */
-  setURL(path: string): void {
-    set(this, 'path', path);
-  }
-
-  /**
-    Register a callback to be invoked when the path changes. These
-    callbacks will execute when the user presses the back or forward
-    button, but not after `setURL` is invoked.
-
-    @private
-    @method onUpdateURL
-    @param callback {Function}
-  */
-  onUpdateURL(callback: (url: string) => void): void {
-    this.updateCallback = callback;
-  }
-
-  /**
-    Sets the path and calls the `updateURL` callback.
-
-    @private
-    @method handleURL
-    @param url {String}
-  */
-  handleURL(url: string): void {
-    set(this, 'path', url);
-    this.updateCallback(url);
-  }
-
-  /**
-    Given a URL, formats it to be placed into the page as part
-    of an element's `href` attribute.
-
-    This is used, for example, when using the {{action}} helper
-    to generate a URL based on an event.
-
-    @private
-    @method formatURL
-    @param url {String}
-    @return {String} url
-  */
-  formatURL(url: string): string {
-    let { rootURL } = this;
-
-    if (url !== '') {
-      // remove trailing slashes if they exists
-      rootURL = rootURL.replace(/\/$/, '');
-    }
-
-    return rootURL + url;
-  }
-}
-
-NoneLocation.reopen({
-  path: '',
-  rootURL: '/',
-});
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index cb33a2401e6..9db6960f03f 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -6,7 +6,7 @@ import AutoLocation from '../../lib/location/auto_location';
 import { getHistoryPath, getHashPath } from '../../lib/location/auto_location';
 import HistoryLocation from '../../lib/location/history_location';
 import HashLocation from '../../lib/location/hash_location';
-import NoneLocation from '../../lib/location/none_location';
+import NoneLocation from '@ember/routing/none-location';
 import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function mockBrowserLocation(overrides, assert) {
diff --git a/packages/@ember/-internals/routing/tests/location/none_location_test.js b/packages/@ember/-internals/routing/tests/location/none_location_test.js
index dbae3e40c78..4268274cec7 100644
--- a/packages/@ember/-internals/routing/tests/location/none_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/none_location_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { set } from '@ember/-internals/metal';
-import NoneLocation from '../../lib/location/none_location';
+import NoneLocation from '@ember/routing/none-location';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let NoneTestLocation, location;
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index d1ff0e76992..18f41d7d7c4 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -1,7 +1,7 @@
 import HashLocation from '../../lib/location/hash_location';
 import HistoryLocation from '../../lib/location/history_location';
 import AutoLocation from '../../lib/location/auto_location';
-import NoneLocation from '../../lib/location/none_location';
+import NoneLocation from '@ember/routing/none-location';
 import Router, { triggerEvent } from '@ember/routing/router';
 import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index 79f05ee3147..b9afec522f0 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -15,11 +15,11 @@ import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher } from '@ember/-internals/views';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
+import NoneLocation from '@ember/routing/none-location';
 import {
   HashLocation,
   HistoryLocation,
   AutoLocation,
-  NoneLocation,
   BucketCache,
 } from '@ember/-internals/routing';
 import ApplicationInstance from '@ember/application/instance';
diff --git a/packages/@ember/application/tests/application_test.js b/packages/@ember/application/tests/application_test.js
index 852125c0ffd..f3281cbaefd 100644
--- a/packages/@ember/application/tests/application_test.js
+++ b/packages/@ember/application/tests/application_test.js
@@ -5,7 +5,7 @@ import { libraries } from '@ember/-internals/metal';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import EmberRoute from '@ember/routing/route';
 import Router from '@ember/routing/router';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import { _loaded } from '@ember/application';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/routing/none-location.ts b/packages/@ember/routing/none-location.ts
index 2934ac9b8a8..b44af6df12f 100644
--- a/packages/@ember/routing/none-location.ts
+++ b/packages/@ember/routing/none-location.ts
@@ -1 +1,136 @@
-export { NoneLocation as default } from '@ember/-internals/routing';
+import { set } from '@ember/-internals/metal';
+import EmberObject from '@ember/object';
+import { assert } from '@ember/debug';
+import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+
+/**
+@module @ember/routing
+*/
+
+/**
+  NoneLocation does not interact with the browser. It is useful for
+  testing, or when you need to manage state with your Router, but temporarily
+  don't want it to muck with the URL (for example when you embed your
+  application in a larger page).
+
+  Using `NoneLocation` causes Ember to not store the applications URL state
+  in the actual URL. This is generally used for testing purposes, and is one
+  of the changes made when calling `App.setupForTesting()`.
+
+  @class NoneLocation
+  @extends EmberObject
+  @protected
+*/
+export default class NoneLocation extends EmberObject implements EmberLocation {
+  declare updateCallback: UpdateCallback;
+  implementation = 'none';
+
+  // Set in reopen so it can be overwritten with extend
+  declare path: string;
+
+  /**
+    Will be pre-pended to path.
+
+    @private
+    @property rootURL
+    @default '/'
+  */
+  // Set in reopen so it can be overwritten with extend
+  declare rootURL: string;
+
+  initState(): void {
+    this._super(...arguments);
+
+    let { rootURL } = this;
+
+    // This assert doesn't have anything to do with state initialization,
+    // but we're hijacking this method since it's called after the route has
+    // set the rootURL property on its Location instance.
+    assert(
+      'rootURL must end with a trailing forward slash e.g. "/app/"',
+      rootURL.charAt(rootURL.length - 1) === '/'
+    );
+  }
+
+  /**
+    Returns the current path without `rootURL`.
+
+    @private
+    @method getURL
+    @return {String} path
+  */
+  getURL(): string {
+    let { path, rootURL } = this;
+
+    // remove trailing slashes if they exists
+    rootURL = rootURL.replace(/\/$/, '');
+
+    // remove rootURL from url
+    return path.replace(new RegExp(`^${rootURL}(?=/|$)`), '');
+  }
+
+  /**
+    Set the path and remembers what was set. Using this method
+    to change the path will not invoke the `updateURL` callback.
+
+    @private
+    @method setURL
+    @param path {String}
+  */
+  setURL(path: string): void {
+    set(this, 'path', path);
+  }
+
+  /**
+    Register a callback to be invoked when the path changes. These
+    callbacks will execute when the user presses the back or forward
+    button, but not after `setURL` is invoked.
+
+    @private
+    @method onUpdateURL
+    @param callback {Function}
+  */
+  onUpdateURL(callback: (url: string) => void): void {
+    this.updateCallback = callback;
+  }
+
+  /**
+    Sets the path and calls the `updateURL` callback.
+
+    @private
+    @method handleURL
+    @param url {String}
+  */
+  handleURL(url: string): void {
+    set(this, 'path', url);
+    this.updateCallback(url);
+  }
+
+  /**
+    Given a URL, formats it to be placed into the page as part
+    of an element's `href` attribute.
+
+    This is used, for example, when using the {{action}} helper
+    to generate a URL based on an event.
+
+    @private
+    @method formatURL
+    @param url {String}
+    @return {String} url
+  */
+  formatURL(url: string): string {
+    let { rootURL } = this;
+
+    if (url !== '') {
+      // remove trailing slashes if they exists
+      rootURL = rootURL.replace(/\/$/, '');
+    }
+
+    return rootURL + url;
+  }
+}
+
+NoneLocation.reopen({
+  path: '',
+  rootURL: '/',
+});
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 1b5fbe014d4..7be74241089 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -84,6 +84,7 @@ import Observable from '@ember/object/observable';
 import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
+import NoneLocation from '@ember/routing/none-location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
 
@@ -507,7 +508,7 @@ Ember.Location = routing.Location;
 Ember.AutoLocation = routing.AutoLocation;
 Ember.HashLocation = routing.HashLocation;
 Ember.HistoryLocation = routing.HistoryLocation;
-Ember.NoneLocation = routing.NoneLocation;
+Ember.NoneLocation = NoneLocation;
 Ember.controllerFor = routing.controllerFor;
 Ember.generateControllerFactory = routing.generateControllerFactory;
 Ember.generateController = routing.generateController;
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 65fba98b39c..7f9b254a7f6 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -3,7 +3,8 @@ import { getOwner } from '@ember/-internals/owner';
 import RSVP from 'rsvp';
 import { compile } from 'ember-template-compiler';
 import Route from '@ember/routing/route';
-import { NoneLocation, HistoryLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
+import { HistoryLocation } from '@ember/-internals/routing';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 import {
diff --git a/packages/ember/tests/routing/router_service_test/basic_test.js b/packages/ember/tests/routing/router_service_test/basic_test.js
index eaf771ccdaa..cf4a57a064b 100644
--- a/packages/ember/tests/routing/router_service_test/basic_test.js
+++ b/packages/ember/tests/routing/router_service_test/basic_test.js
@@ -1,5 +1,5 @@
 import Route from '@ember/routing/route';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import { set } from '@ember/-internals/metal';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { service } from '@ember/service';
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index e272af206c9..e2f699d80a9 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -1,6 +1,6 @@
 import { service } from '@ember/service';
 import Router from '@ember/routing/router';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import { get } from '@ember/-internals/metal';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';
diff --git a/packages/ember/tests/routing/router_service_test/replaceWith_test.js b/packages/ember/tests/routing/router_service_test/replaceWith_test.js
index ea0683b13a3..cd98bf46ed0 100644
--- a/packages/ember/tests/routing/router_service_test/replaceWith_test.js
+++ b/packages/ember/tests/routing/router_service_test/replaceWith_test.js
@@ -1,4 +1,4 @@
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { InternalTransition as Transition } from 'router_js';
 import Controller from '@ember/controller';
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index 4ffa7a4dcf4..13828add368 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -1,7 +1,7 @@
 import { service } from '@ember/service';
 import { Component } from '@ember/-internals/glimmer';
 import Route from '@ember/routing/route';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 import Controller from '@ember/controller';
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
diff --git a/packages/internal-test-helpers/lib/test-cases/query-param.ts b/packages/internal-test-helpers/lib/test-cases/query-param.ts
index e5f6f1ce664..18cddb58c0a 100644
--- a/packages/internal-test-helpers/lib/test-cases/query-param.ts
+++ b/packages/internal-test-helpers/lib/test-cases/query-param.ts
@@ -1,7 +1,7 @@
 import type { BootOptions } from '@ember/engine/instance';
 import Controller from '@ember/controller';
 import type EmberObject from '@ember/object';
-import { NoneLocation } from '@ember/-internals/routing';
+import NoneLocation from '@ember/routing/none-location';
 
 import ApplicationTestCase from './application';
 import { runLoopSettled } from '../run';

From d90635698a12121dc92dbd2da4cc9c5256ad2086 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 14:03:06 -0700
Subject: [PATCH 1063/1405] Consolidate @ember/routing/auto-location

---
 packages/@ember/-internals/routing/index.ts   |  11 +-
 .../routing/lib/location/auto_location.ts     | 376 -----------------
 .../tests/location/auto_location_test.js      |   3 +-
 .../routing/tests/system/router_test.js       |   2 +-
 packages/@ember/application/index.ts          |   8 +-
 packages/@ember/routing/auto-location.ts      | 377 +++++++++++++++++-
 packages/ember/index.js                       |   3 +-
 7 files changed, 391 insertions(+), 389 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/location/auto_location.ts

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index f6aa226712e..94297c5a8b0 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,8 +1,15 @@
 export { default as Location, EmberLocation, UpdateCallback } from './lib/location/api';
 export { default as HashLocation } from './lib/location/hash_location';
 export { default as HistoryLocation } from './lib/location/history_location';
-export { default as AutoLocation } from './lib/location/auto_location';
-
+export {
+  getFullPath,
+  getHash,
+  getPath,
+  getQuery,
+  replacePath,
+  supportsHashChange,
+  supportsHistory,
+} from './lib/location/util';
 export {
   default as generateController,
   generateControllerFactory,
diff --git a/packages/@ember/-internals/routing/lib/location/auto_location.ts b/packages/@ember/-internals/routing/lib/location/auto_location.ts
deleted file mode 100644
index 254b94fb8ba..00000000000
--- a/packages/@ember/-internals/routing/lib/location/auto_location.ts
+++ /dev/null
@@ -1,376 +0,0 @@
-import { history, location, userAgent, window } from '@ember/-internals/browser-environment';
-import { set } from '@ember/-internals/metal';
-import { getOwner } from '@ember/-internals/owner';
-import EmberObject from '@ember/object';
-import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
-import { assert } from '@ember/debug';
-import type { EmberLocation, UpdateCallback } from './api';
-import {
-  getFullPath,
-  getHash,
-  getPath,
-  getQuery,
-  replacePath,
-  supportsHashChange,
-  supportsHistory,
-} from './util';
-
-/**
-@module @ember/routing
-*/
-
-/**
-  AutoLocation will select the best location option based off browser
-  support with the priority order: history, hash, none.
-
-  Clean pushState paths accessed by hashchange-only browsers will be redirected
-  to the hash-equivalent and vice versa so future transitions are consistent.
-
-  Keep in mind that since some of your users will use `HistoryLocation`, your
-  server must serve the Ember app at all the routes you define.
-
-  Browsers that support the `history` API will use `HistoryLocation`, those that
-  do not, but still support the `hashchange` event will use `HashLocation`, and
-  in the rare case neither is supported will use `NoneLocation`.
-
-  Example:
-
-  ```app/router.js
-  Router.map(function() {
-    this.route('posts', function() {
-      this.route('new');
-    });
-  });
-
-  Router.reopen({
-    location: 'auto'
-  });
-  ```
-
-  This will result in a posts.new url of `/posts/new` for modern browsers that
-  support the `history` api or `/#/posts/new` for older ones, like Internet
-  Explorer 9 and below.
-
-  When a user visits a link to your application, they will be automatically
-  upgraded or downgraded to the appropriate `Location` class, with the URL
-  transformed accordingly, if needed.
-
-  Keep in mind that since some of your users will use `HistoryLocation`, your
-  server must serve the Ember app at all the routes you define.
-
-  @class AutoLocation
-  @static
-  @protected
-*/
-export default class AutoLocation extends EmberObject implements EmberLocation {
-  declare getURL: () => string;
-  declare setURL: (url: string) => void;
-  declare onUpdateURL: (callback: UpdateCallback) => void;
-  declare formatURL: (url: string) => string;
-
-  concreteImplementation?: EmberLocation;
-
-  implementation = 'auto';
-
-  // FIXME: This is never set
-  // See https://github.com/emberjs/ember.js/issues/19515
-  /** @internal */
-  documentMode: number | undefined;
-
-  /**
-    @private
-
-    Will be pre-pended to path upon state change.
-
-    @since 1.5.1
-    @property rootURL
-    @default '/'
-  */
-  // Added in reopen to allow overriding via extend
-  declare rootURL: string;
-
-  /**
-    @private
-
-    The browser's `location` object. This is typically equivalent to
-    `window.location`, but may be overridden for testing.
-
-    @property location
-    @default environment.location
-  */
-  // Added in reopen to allow overriding via extend
-  declare location: Location;
-
-  /**
-    @private
-
-    The browser's `history` object. This is typically equivalent to
-    `window.history`, but may be overridden for testing.
-
-    @since 1.5.1
-    @property history
-    @default environment.history
-  */
-  // Added in reopen to allow overriding via extend
-  declare history: any;
-
-  /**
-   @private
-
-    The user agent's global variable. In browsers, this will be `window`.
-
-    @since 1.11
-    @property global
-    @default window
-  */
-  // Added in reopen to allow overriding via extend
-  declare global: any;
-
-  /**
-    @private
-
-    The browser's `userAgent`. This is typically equivalent to
-    `navigator.userAgent`, but may be overridden for testing.
-
-    @since 1.5.1
-    @property userAgent
-    @default environment.history
-  */
-  // Added in reopen to allow overriding via extend
-  declare userAgent: string;
-
-  /**
-    @private
-
-    This property is used by the router to know whether to cancel the routing
-    setup process, which is needed while we redirect the browser.
-
-    @since 1.5.1
-    @property cancelRouterSetup
-    @default false
-  */
-  // Added in reopen to allow overriding via extend
-  declare cancelRouterSetup: boolean;
-
-  /**
-   Called by the router to instruct the location to do any feature detection
-   necessary. In the case of AutoLocation, we detect whether to use history
-   or hash concrete implementations.
-
-   @private
-  */
-  detect(): void {
-    let rootURL = this.rootURL;
-
-    assert(
-      'rootURL must end with a trailing forward slash e.g. "/app/"',
-      rootURL.charAt(rootURL.length - 1) === '/'
-    );
-
-    let implementation = detectImplementation({
-      location: this.location,
-      history: this.history,
-      userAgent: this.userAgent,
-      rootURL,
-      documentMode: this.documentMode,
-      global: this.global,
-    });
-
-    if (implementation === false) {
-      set(this, 'cancelRouterSetup', true);
-      implementation = 'none';
-    }
-
-    let owner = getOwner(this);
-    assert('AutoLocation is unexpectedly missing an owner', owner);
-    let concrete = owner.lookup(`location:${implementation}`) as EmberLocation;
-    assert(`Could not find location '${implementation}'.`, concrete !== undefined);
-
-    set(concrete, 'rootURL', rootURL);
-    set(this, 'concreteImplementation', concrete);
-  }
-
-  willDestroy(): void {
-    let { concreteImplementation } = this;
-
-    if (concreteImplementation) {
-      concreteImplementation.destroy();
-    }
-  }
-}
-
-AutoLocation.reopen({
-  rootURL: '/',
-
-  initState: delegateToConcreteImplementation('initState'),
-  getURL: delegateToConcreteImplementation('getURL'),
-  setURL: delegateToConcreteImplementation('setURL'),
-  replaceURL: delegateToConcreteImplementation('replaceURL'),
-  onUpdateURL: delegateToConcreteImplementation('onUpdateURL'),
-  formatURL: delegateToConcreteImplementation('formatURL'),
-
-  location: location,
-
-  history: history,
-
-  global: window,
-
-  userAgent: userAgent,
-
-  cancelRouterSetup: false,
-});
-
-function delegateToConcreteImplementation<N extends MethodNamesOf<Required<EmberLocation>>>(
-  methodName: N
-) {
-  return function (this: AutoLocation, ...args: Parameters<Required<EmberLocation>[N]>) {
-    let { concreteImplementation } = this;
-    assert(
-      "AutoLocation's detect() method should be called before calling any other hooks.",
-      concreteImplementation
-    );
-
-    // We need this cast because `Parameters` is deferred so that it is not
-    // possible for TS to see it will always produce the right type. However,
-    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
-    // issue](https://github.com/microsoft/TypeScript/issues/47615).
-    return (concreteImplementation[methodName] as AnyFn | undefined)?.(...args);
-  };
-}
-
-/*
-  Given the browser's `location`, `history` and `userAgent`, and a configured
-  root URL, this function detects whether the browser supports the [History
-  API](https://developer.mozilla.org/en-US/docs/Web/API/History) and returns a
-  string representing the Location object to use based on its determination.
-
-  For example, if the page loads in an evergreen browser, this function would
-  return the string "history", meaning the history API and thus HistoryLocation
-  should be used. If the page is loaded in IE8, it will return the string
-  "hash," indicating that the History API should be simulated by manipulating the
-  hash portion of the location.
-
-*/
-
-interface DetectionOptions {
-  location: Location;
-  history: History;
-  userAgent: string;
-  rootURL: string;
-  documentMode: number | undefined;
-  global: Window | null;
-}
-
-function detectImplementation(options: DetectionOptions) {
-  let { location, userAgent, history, documentMode, global, rootURL } = options;
-
-  let implementation = 'none';
-  let cancelRouterSetup = false;
-  let currentPath = getFullPath(location);
-
-  if (supportsHistory(userAgent, history)) {
-    let historyPath = getHistoryPath(rootURL, location);
-
-    // If the browser supports history and we have a history path, we can use
-    // the history location with no redirects.
-    if (currentPath === historyPath) {
-      implementation = 'history';
-    } else if (currentPath.substring(0, 2) === '/#') {
-      history.replaceState({ path: historyPath }, '', historyPath);
-      implementation = 'history';
-    } else {
-      cancelRouterSetup = true;
-      replacePath(location, historyPath);
-    }
-  } else if (supportsHashChange(documentMode, global)) {
-    let hashPath = getHashPath(rootURL, location);
-
-    // Be sure we're using a hashed path, otherwise let's switch over it to so
-    // we start off clean and consistent. We'll count an index path with no
-    // hash as "good enough" as well.
-    if (currentPath === hashPath || (currentPath === '/' && hashPath === '/#/')) {
-      implementation = 'hash';
-    } else {
-      // Our URL isn't in the expected hash-supported format, so we want to
-      // cancel the router setup and replace the URL to start off clean
-      cancelRouterSetup = true;
-      replacePath(location, hashPath);
-    }
-  }
-
-  if (cancelRouterSetup) {
-    return false;
-  }
-
-  return implementation;
-}
-
-/**
-  @private
-
-  Returns the current path as it should appear for HistoryLocation supported
-  browsers. This may very well differ from the real current path (e.g. if it
-  starts off as a hashed URL)
-*/
-export function getHistoryPath(rootURL: string, location: Location): string {
-  let path = getPath(location);
-  let hash = getHash(location);
-  let query = getQuery(location);
-  let rootURLIndex = path.indexOf(rootURL);
-
-  let routeHash: string;
-  let hashParts;
-
-  assert(`Path ${path} does not start with the provided rootURL ${rootURL}`, rootURLIndex === 0);
-
-  // By convention, Ember.js routes using HashLocation are required to start
-  // with `#/`. Anything else should NOT be considered a route and should
-  // be passed straight through, without transformation.
-  if (hash.substring(0, 2) === '#/') {
-    // There could be extra hash segments after the route
-    hashParts = hash.substring(1).split('#');
-    // The first one is always the route url
-    routeHash = hashParts.shift() as string;
-
-    // If the path already has a trailing slash, remove the one
-    // from the hashed route so we don't double up.
-    if (path.charAt(path.length - 1) === '/') {
-      routeHash = routeHash.substring(1);
-    }
-
-    // This is the "expected" final order
-    path += routeHash + query;
-
-    if (hashParts.length) {
-      path += `#${hashParts.join('#')}`;
-    }
-  } else {
-    path += query + hash;
-  }
-
-  return path;
-}
-
-/**
-  @private
-
-  Returns the current path as it should appear for HashLocation supported
-  browsers. This may very well differ from the real current path.
-
-  @method _getHashPath
-*/
-export function getHashPath(rootURL: string, location: Location): string {
-  let path = rootURL;
-  let historyPath = getHistoryPath(rootURL, location);
-  let routePath = historyPath.substring(rootURL.length);
-
-  if (routePath !== '') {
-    if (routePath[0] !== '/') {
-      routePath = `/${routePath}`;
-    }
-
-    path += `#${routePath}`;
-  }
-
-  return path;
-}
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index 9db6960f03f..64a2da83831 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -2,8 +2,7 @@ import { window } from '@ember/-internals/browser-environment';
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { setOwner } from '@glimmer/owner';
-import AutoLocation from '../../lib/location/auto_location';
-import { getHistoryPath, getHashPath } from '../../lib/location/auto_location';
+import AutoLocation, { getHistoryPath, getHashPath } from '@ember/routing/auto-location';
 import HistoryLocation from '../../lib/location/history_location';
 import HashLocation from '../../lib/location/hash_location';
 import NoneLocation from '@ember/routing/none-location';
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index 18f41d7d7c4..e72feab77ab 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -1,6 +1,6 @@
 import HashLocation from '../../lib/location/hash_location';
 import HistoryLocation from '../../lib/location/history_location';
-import AutoLocation from '../../lib/location/auto_location';
+import AutoLocation from '@ember/routing/auto-location';
 import NoneLocation from '@ember/routing/none-location';
 import Router, { triggerEvent } from '@ember/routing/router';
 import { runDestroy, buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index b9afec522f0..ee5dfc9d40f 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -15,13 +15,9 @@ import { RSVP } from '@ember/-internals/runtime';
 import { EventDispatcher } from '@ember/-internals/views';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
+import AutoLocation from '@ember/routing/auto-location';
 import NoneLocation from '@ember/routing/none-location';
-import {
-  HashLocation,
-  HistoryLocation,
-  AutoLocation,
-  BucketCache,
-} from '@ember/-internals/routing';
+import { HashLocation, HistoryLocation, BucketCache } from '@ember/-internals/routing';
 import ApplicationInstance from '@ember/application/instance';
 import Engine, { buildInitializerMethod } from '@ember/engine';
 import type { BootOptions } from '@ember/engine/instance';
diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts
index e6aa00cd8dd..5d764f0744b 100644
--- a/packages/@ember/routing/auto-location.ts
+++ b/packages/@ember/routing/auto-location.ts
@@ -1 +1,376 @@
-export { AutoLocation as default } from '@ember/-internals/routing';
+import { history, location, userAgent, window } from '@ember/-internals/browser-environment';
+import { set } from '@ember/-internals/metal';
+import { getOwner } from '@ember/-internals/owner';
+import EmberObject from '@ember/object';
+import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
+import { assert } from '@ember/debug';
+import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import {
+  getFullPath,
+  getHash,
+  getPath,
+  getQuery,
+  replacePath,
+  supportsHashChange,
+  supportsHistory,
+} from '@ember/-internals/routing';
+
+/**
+@module @ember/routing
+*/
+
+/**
+  AutoLocation will select the best location option based off browser
+  support with the priority order: history, hash, none.
+
+  Clean pushState paths accessed by hashchange-only browsers will be redirected
+  to the hash-equivalent and vice versa so future transitions are consistent.
+
+  Keep in mind that since some of your users will use `HistoryLocation`, your
+  server must serve the Ember app at all the routes you define.
+
+  Browsers that support the `history` API will use `HistoryLocation`, those that
+  do not, but still support the `hashchange` event will use `HashLocation`, and
+  in the rare case neither is supported will use `NoneLocation`.
+
+  Example:
+
+  ```app/router.js
+  Router.map(function() {
+    this.route('posts', function() {
+      this.route('new');
+    });
+  });
+
+  Router.reopen({
+    location: 'auto'
+  });
+  ```
+
+  This will result in a posts.new url of `/posts/new` for modern browsers that
+  support the `history` api or `/#/posts/new` for older ones, like Internet
+  Explorer 9 and below.
+
+  When a user visits a link to your application, they will be automatically
+  upgraded or downgraded to the appropriate `Location` class, with the URL
+  transformed accordingly, if needed.
+
+  Keep in mind that since some of your users will use `HistoryLocation`, your
+  server must serve the Ember app at all the routes you define.
+
+  @class AutoLocation
+  @static
+  @protected
+*/
+export default class AutoLocation extends EmberObject implements EmberLocation {
+  declare getURL: () => string;
+  declare setURL: (url: string) => void;
+  declare onUpdateURL: (callback: UpdateCallback) => void;
+  declare formatURL: (url: string) => string;
+
+  concreteImplementation?: EmberLocation;
+
+  implementation = 'auto';
+
+  // FIXME: This is never set
+  // See https://github.com/emberjs/ember.js/issues/19515
+  /** @internal */
+  documentMode: number | undefined;
+
+  /**
+    @private
+
+    Will be pre-pended to path upon state change.
+
+    @since 1.5.1
+    @property rootURL
+    @default '/'
+  */
+  // Added in reopen to allow overriding via extend
+  declare rootURL: string;
+
+  /**
+    @private
+
+    The browser's `location` object. This is typically equivalent to
+    `window.location`, but may be overridden for testing.
+
+    @property location
+    @default environment.location
+  */
+  // Added in reopen to allow overriding via extend
+  declare location: Location;
+
+  /**
+    @private
+
+    The browser's `history` object. This is typically equivalent to
+    `window.history`, but may be overridden for testing.
+
+    @since 1.5.1
+    @property history
+    @default environment.history
+  */
+  // Added in reopen to allow overriding via extend
+  declare history: any;
+
+  /**
+   @private
+
+    The user agent's global variable. In browsers, this will be `window`.
+
+    @since 1.11
+    @property global
+    @default window
+  */
+  // Added in reopen to allow overriding via extend
+  declare global: any;
+
+  /**
+    @private
+
+    The browser's `userAgent`. This is typically equivalent to
+    `navigator.userAgent`, but may be overridden for testing.
+
+    @since 1.5.1
+    @property userAgent
+    @default environment.history
+  */
+  // Added in reopen to allow overriding via extend
+  declare userAgent: string;
+
+  /**
+    @private
+
+    This property is used by the router to know whether to cancel the routing
+    setup process, which is needed while we redirect the browser.
+
+    @since 1.5.1
+    @property cancelRouterSetup
+    @default false
+  */
+  // Added in reopen to allow overriding via extend
+  declare cancelRouterSetup: boolean;
+
+  /**
+   Called by the router to instruct the location to do any feature detection
+   necessary. In the case of AutoLocation, we detect whether to use history
+   or hash concrete implementations.
+
+   @private
+  */
+  detect(): void {
+    let rootURL = this.rootURL;
+
+    assert(
+      'rootURL must end with a trailing forward slash e.g. "/app/"',
+      rootURL.charAt(rootURL.length - 1) === '/'
+    );
+
+    let implementation = detectImplementation({
+      location: this.location,
+      history: this.history,
+      userAgent: this.userAgent,
+      rootURL,
+      documentMode: this.documentMode,
+      global: this.global,
+    });
+
+    if (implementation === false) {
+      set(this, 'cancelRouterSetup', true);
+      implementation = 'none';
+    }
+
+    let owner = getOwner(this);
+    assert('AutoLocation is unexpectedly missing an owner', owner);
+    let concrete = owner.lookup(`location:${implementation}`) as EmberLocation;
+    assert(`Could not find location '${implementation}'.`, concrete !== undefined);
+
+    set(concrete, 'rootURL', rootURL);
+    set(this, 'concreteImplementation', concrete);
+  }
+
+  willDestroy(): void {
+    let { concreteImplementation } = this;
+
+    if (concreteImplementation) {
+      concreteImplementation.destroy();
+    }
+  }
+}
+
+AutoLocation.reopen({
+  rootURL: '/',
+
+  initState: delegateToConcreteImplementation('initState'),
+  getURL: delegateToConcreteImplementation('getURL'),
+  setURL: delegateToConcreteImplementation('setURL'),
+  replaceURL: delegateToConcreteImplementation('replaceURL'),
+  onUpdateURL: delegateToConcreteImplementation('onUpdateURL'),
+  formatURL: delegateToConcreteImplementation('formatURL'),
+
+  location: location,
+
+  history: history,
+
+  global: window,
+
+  userAgent: userAgent,
+
+  cancelRouterSetup: false,
+});
+
+function delegateToConcreteImplementation<N extends MethodNamesOf<Required<EmberLocation>>>(
+  methodName: N
+) {
+  return function (this: AutoLocation, ...args: Parameters<Required<EmberLocation>[N]>) {
+    let { concreteImplementation } = this;
+    assert(
+      "AutoLocation's detect() method should be called before calling any other hooks.",
+      concreteImplementation
+    );
+
+    // We need this cast because `Parameters` is deferred so that it is not
+    // possible for TS to see it will always produce the right type. However,
+    // since `AnyFn` has a rest type, it is allowed. See discussion on [this
+    // issue](https://github.com/microsoft/TypeScript/issues/47615).
+    return (concreteImplementation[methodName] as AnyFn | undefined)?.(...args);
+  };
+}
+
+/*
+  Given the browser's `location`, `history` and `userAgent`, and a configured
+  root URL, this function detects whether the browser supports the [History
+  API](https://developer.mozilla.org/en-US/docs/Web/API/History) and returns a
+  string representing the Location object to use based on its determination.
+
+  For example, if the page loads in an evergreen browser, this function would
+  return the string "history", meaning the history API and thus HistoryLocation
+  should be used. If the page is loaded in IE8, it will return the string
+  "hash," indicating that the History API should be simulated by manipulating the
+  hash portion of the location.
+
+*/
+
+interface DetectionOptions {
+  location: Location;
+  history: History;
+  userAgent: string;
+  rootURL: string;
+  documentMode: number | undefined;
+  global: Window | null;
+}
+
+function detectImplementation(options: DetectionOptions) {
+  let { location, userAgent, history, documentMode, global, rootURL } = options;
+
+  let implementation = 'none';
+  let cancelRouterSetup = false;
+  let currentPath = getFullPath(location);
+
+  if (supportsHistory(userAgent, history)) {
+    let historyPath = getHistoryPath(rootURL, location);
+
+    // If the browser supports history and we have a history path, we can use
+    // the history location with no redirects.
+    if (currentPath === historyPath) {
+      implementation = 'history';
+    } else if (currentPath.substring(0, 2) === '/#') {
+      history.replaceState({ path: historyPath }, '', historyPath);
+      implementation = 'history';
+    } else {
+      cancelRouterSetup = true;
+      replacePath(location, historyPath);
+    }
+  } else if (supportsHashChange(documentMode, global)) {
+    let hashPath = getHashPath(rootURL, location);
+
+    // Be sure we're using a hashed path, otherwise let's switch over it to so
+    // we start off clean and consistent. We'll count an index path with no
+    // hash as "good enough" as well.
+    if (currentPath === hashPath || (currentPath === '/' && hashPath === '/#/')) {
+      implementation = 'hash';
+    } else {
+      // Our URL isn't in the expected hash-supported format, so we want to
+      // cancel the router setup and replace the URL to start off clean
+      cancelRouterSetup = true;
+      replacePath(location, hashPath);
+    }
+  }
+
+  if (cancelRouterSetup) {
+    return false;
+  }
+
+  return implementation;
+}
+
+/**
+  @private
+
+  Returns the current path as it should appear for HistoryLocation supported
+  browsers. This may very well differ from the real current path (e.g. if it
+  starts off as a hashed URL)
+*/
+export function getHistoryPath(rootURL: string, location: Location): string {
+  let path = getPath(location);
+  let hash = getHash(location);
+  let query = getQuery(location);
+  let rootURLIndex = path.indexOf(rootURL);
+
+  let routeHash: string;
+  let hashParts;
+
+  assert(`Path ${path} does not start with the provided rootURL ${rootURL}`, rootURLIndex === 0);
+
+  // By convention, Ember.js routes using HashLocation are required to start
+  // with `#/`. Anything else should NOT be considered a route and should
+  // be passed straight through, without transformation.
+  if (hash.substring(0, 2) === '#/') {
+    // There could be extra hash segments after the route
+    hashParts = hash.substring(1).split('#');
+    // The first one is always the route url
+    routeHash = hashParts.shift() as string;
+
+    // If the path already has a trailing slash, remove the one
+    // from the hashed route so we don't double up.
+    if (path.charAt(path.length - 1) === '/') {
+      routeHash = routeHash.substring(1);
+    }
+
+    // This is the "expected" final order
+    path += routeHash + query;
+
+    if (hashParts.length) {
+      path += `#${hashParts.join('#')}`;
+    }
+  } else {
+    path += query + hash;
+  }
+
+  return path;
+}
+
+/**
+  @private
+
+  Returns the current path as it should appear for HashLocation supported
+  browsers. This may very well differ from the real current path.
+
+  @method _getHashPath
+*/
+export function getHashPath(rootURL: string, location: Location): string {
+  let path = rootURL;
+  let historyPath = getHistoryPath(rootURL, location);
+  let routePath = historyPath.substring(rootURL.length);
+
+  if (routePath !== '') {
+    if (routePath[0] !== '/') {
+      routePath = `/${routePath}`;
+    }
+
+    path += `#${routePath}`;
+  }
+
+  return path;
+}
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 7be74241089..25adac4c640 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -84,6 +84,7 @@ import Observable from '@ember/object/observable';
 import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
+import AutoLocation from '@ember/routing/auto-location';
 import NoneLocation from '@ember/routing/none-location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
@@ -505,7 +506,7 @@ Ember.EventDispatcher = views.EventDispatcher;
 
 // ****@ember/-internals/routing****
 Ember.Location = routing.Location;
-Ember.AutoLocation = routing.AutoLocation;
+Ember.AutoLocation = AutoLocation;
 Ember.HashLocation = routing.HashLocation;
 Ember.HistoryLocation = routing.HistoryLocation;
 Ember.NoneLocation = NoneLocation;

From a3512204668fa7a3a46fc2abf943b116fb99da9a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 14:06:13 -0700
Subject: [PATCH 1064/1405] Consolidate @ember/routing/hash-location

---
 packages/@ember/-internals/routing/index.ts   |   1 -
 .../routing/lib/location/hash_location.ts     | 177 -----------------
 .../tests/location/auto_location_test.js      |   2 +-
 .../tests/location/hash_location_test.js      |   2 +-
 .../routing/tests/system/router_test.js       |   2 +-
 packages/@ember/application/index.ts          |   3 +-
 packages/@ember/routing/hash-location.ts      | 178 +++++++++++++++++-
 packages/ember/index.js                       |   3 +-
 8 files changed, 184 insertions(+), 184 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/location/hash_location.ts

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 94297c5a8b0..c419c2b2e14 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,5 +1,4 @@
 export { default as Location, EmberLocation, UpdateCallback } from './lib/location/api';
-export { default as HashLocation } from './lib/location/hash_location';
 export { default as HistoryLocation } from './lib/location/history_location';
 export {
   getFullPath,
diff --git a/packages/@ember/-internals/routing/lib/location/hash_location.ts b/packages/@ember/-internals/routing/lib/location/hash_location.ts
deleted file mode 100644
index 63559c5f36c..00000000000
--- a/packages/@ember/-internals/routing/lib/location/hash_location.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import { set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
-import { bind } from '@ember/runloop';
-import type { EmberLocation, UpdateCallback } from './api';
-import { getHash } from './util';
-
-/**
-@module @ember/routing
-*/
-
-/**
-  `HashLocation` implements the location API using the browser's
-  hash. At present, it relies on a `hashchange` event existing in the
-  browser.
-
-  Using `HashLocation` results in URLs with a `#` (hash sign) separating the
-  server side URL portion of the URL from the portion that is used by Ember.
-
-  Example:
-
-  ```app/router.js
-  Router.map(function() {
-    this.route('posts', function() {
-      this.route('new');
-    });
-  });
-
-  Router.reopen({
-    location: 'hash'
-  });
-  ```
-
-  This will result in a posts.new url of `/#/posts/new`.
-
-  @class HashLocation
-  @extends EmberObject
-  @protected
-*/
-export default class HashLocation extends EmberObject implements EmberLocation {
-  implementation = 'hash';
-  _hashchangeHandler?: EventListener;
-
-  private _location?: Location;
-  declare location: Location;
-
-  init(): void {
-    set(this, 'location', this._location || window.location);
-    this._hashchangeHandler = undefined;
-  }
-
-  /**
-    @private
-
-    Returns normalized location.hash
-
-    @since 1.5.1
-    @method getHash
-  */
-  getHash(): string {
-    return getHash(this.location);
-  }
-
-  /**
-    Returns the normalized URL, constructed from `location.hash`.
-
-    e.g. `#/foo` => `/foo` as well as `#/foo#bar` => `/foo#bar`.
-
-    By convention, hashed paths must begin with a forward slash, otherwise they
-    are not treated as a path so we can distinguish intent.
-
-    @private
-    @method getURL
-  */
-  getURL(): string {
-    let originalPath = this.getHash().substring(1);
-    let outPath = originalPath;
-
-    if (outPath[0] !== '/') {
-      outPath = '/';
-
-      // Only add the # if the path isn't empty.
-      // We do NOT want `/#` since the ampersand
-      // is only included (conventionally) when
-      // the location.hash has a value
-      if (originalPath) {
-        outPath += `#${originalPath}`;
-      }
-    }
-
-    return outPath;
-  }
-
-  /**
-    Set the `location.hash` and remembers what was set. This prevents
-    `onUpdateURL` callbacks from triggering when the hash was set by
-    `HashLocation`.
-
-    @private
-    @method setURL
-    @param path {String}
-  */
-  setURL(path: string): void {
-    this.location.hash = path;
-    set(this, 'lastSetURL', path);
-  }
-
-  /**
-    Uses location.replace to update the url without a page reload
-    or history modification.
-
-    @private
-    @method replaceURL
-    @param path {String}
-  */
-  replaceURL(path: string): void {
-    this.location.replace(`#${path}`);
-    set(this, 'lastSetURL', path);
-  }
-
-  lastSetURL: string | null = null;
-
-  /**
-    Register a callback to be invoked when the hash changes. These
-    callbacks will execute when the user presses the back or forward
-    button, but not after `setURL` is invoked.
-
-    @private
-    @method onUpdateURL
-    @param callback {Function}
-  */
-  onUpdateURL(callback: UpdateCallback): void {
-    this._removeEventListener();
-    this._hashchangeHandler = bind(this, function (this: HashLocation, _event: Event) {
-      let path = this.getURL();
-      if (this.lastSetURL === path) {
-        return;
-      }
-
-      set(this, 'lastSetURL', null);
-
-      callback(path);
-    });
-
-    window.addEventListener('hashchange', this._hashchangeHandler);
-  }
-
-  /**
-    Given a URL, formats it to be placed into the page as part
-    of an element's `href` attribute.
-
-    This is used, for example, when using the {{action}} helper
-    to generate a URL based on an event.
-
-    @private
-    @method formatURL
-    @param url {String}
-  */
-  formatURL(url: string): string {
-    return `#${url}`;
-  }
-
-  /**
-    Cleans up the HashLocation event listener.
-
-    @private
-    @method willDestroy
-  */
-  willDestroy(): void {
-    this._removeEventListener();
-  }
-
-  _removeEventListener(): void {
-    if (this._hashchangeHandler) {
-      window.removeEventListener('hashchange', this._hashchangeHandler);
-    }
-  }
-}
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index 64a2da83831..73521bd84df 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -4,7 +4,7 @@ import { get } from '@ember/-internals/metal';
 import { setOwner } from '@glimmer/owner';
 import AutoLocation, { getHistoryPath, getHashPath } from '@ember/routing/auto-location';
 import HistoryLocation from '../../lib/location/history_location';
-import HashLocation from '../../lib/location/hash_location';
+import HashLocation from '@ember/routing/hash-location';
 import NoneLocation from '@ember/routing/none-location';
 import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/routing/tests/location/hash_location_test.js b/packages/@ember/-internals/routing/tests/location/hash_location_test.js
index 735b16be695..fbb32f3ec2a 100644
--- a/packages/@ember/-internals/routing/tests/location/hash_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/hash_location_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
-import HashLocation from '../../lib/location/hash_location';
+import HashLocation from '@ember/routing/hash-location';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let location;
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index e72feab77ab..f3c2b5e1b96 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -1,4 +1,4 @@
-import HashLocation from '../../lib/location/hash_location';
+import HashLocation from '@ember/routing/hash-location';
 import HistoryLocation from '../../lib/location/history_location';
 import AutoLocation from '@ember/routing/auto-location';
 import NoneLocation from '@ember/routing/none-location';
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index ee5dfc9d40f..efa698731ca 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -16,8 +16,9 @@ import { EventDispatcher } from '@ember/-internals/views';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
 import AutoLocation from '@ember/routing/auto-location';
+import HashLocation from '@ember/routing/hash-location';
 import NoneLocation from '@ember/routing/none-location';
-import { HashLocation, HistoryLocation, BucketCache } from '@ember/-internals/routing';
+import { HistoryLocation, BucketCache } from '@ember/-internals/routing';
 import ApplicationInstance from '@ember/application/instance';
 import Engine, { buildInitializerMethod } from '@ember/engine';
 import type { BootOptions } from '@ember/engine/instance';
diff --git a/packages/@ember/routing/hash-location.ts b/packages/@ember/routing/hash-location.ts
index 9ec62be5373..cfde70f81e2 100644
--- a/packages/@ember/routing/hash-location.ts
+++ b/packages/@ember/routing/hash-location.ts
@@ -1 +1,177 @@
-export { HashLocation as default } from '@ember/-internals/routing';
+import { set } from '@ember/-internals/metal';
+import EmberObject from '@ember/object';
+import { bind } from '@ember/runloop';
+import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import { getHash } from '@ember/-internals/routing';
+
+/**
+@module @ember/routing
+*/
+
+/**
+  `HashLocation` implements the location API using the browser's
+  hash. At present, it relies on a `hashchange` event existing in the
+  browser.
+
+  Using `HashLocation` results in URLs with a `#` (hash sign) separating the
+  server side URL portion of the URL from the portion that is used by Ember.
+
+  Example:
+
+  ```app/router.js
+  Router.map(function() {
+    this.route('posts', function() {
+      this.route('new');
+    });
+  });
+
+  Router.reopen({
+    location: 'hash'
+  });
+  ```
+
+  This will result in a posts.new url of `/#/posts/new`.
+
+  @class HashLocation
+  @extends EmberObject
+  @protected
+*/
+export default class HashLocation extends EmberObject implements EmberLocation {
+  implementation = 'hash';
+  _hashchangeHandler?: EventListener;
+
+  private _location?: Location;
+  declare location: Location;
+
+  init(): void {
+    set(this, 'location', this._location || window.location);
+    this._hashchangeHandler = undefined;
+  }
+
+  /**
+    @private
+
+    Returns normalized location.hash
+
+    @since 1.5.1
+    @method getHash
+  */
+  getHash(): string {
+    return getHash(this.location);
+  }
+
+  /**
+    Returns the normalized URL, constructed from `location.hash`.
+
+    e.g. `#/foo` => `/foo` as well as `#/foo#bar` => `/foo#bar`.
+
+    By convention, hashed paths must begin with a forward slash, otherwise they
+    are not treated as a path so we can distinguish intent.
+
+    @private
+    @method getURL
+  */
+  getURL(): string {
+    let originalPath = this.getHash().substring(1);
+    let outPath = originalPath;
+
+    if (outPath[0] !== '/') {
+      outPath = '/';
+
+      // Only add the # if the path isn't empty.
+      // We do NOT want `/#` since the ampersand
+      // is only included (conventionally) when
+      // the location.hash has a value
+      if (originalPath) {
+        outPath += `#${originalPath}`;
+      }
+    }
+
+    return outPath;
+  }
+
+  /**
+    Set the `location.hash` and remembers what was set. This prevents
+    `onUpdateURL` callbacks from triggering when the hash was set by
+    `HashLocation`.
+
+    @private
+    @method setURL
+    @param path {String}
+  */
+  setURL(path: string): void {
+    this.location.hash = path;
+    set(this, 'lastSetURL', path);
+  }
+
+  /**
+    Uses location.replace to update the url without a page reload
+    or history modification.
+
+    @private
+    @method replaceURL
+    @param path {String}
+  */
+  replaceURL(path: string): void {
+    this.location.replace(`#${path}`);
+    set(this, 'lastSetURL', path);
+  }
+
+  lastSetURL: string | null = null;
+
+  /**
+    Register a callback to be invoked when the hash changes. These
+    callbacks will execute when the user presses the back or forward
+    button, but not after `setURL` is invoked.
+
+    @private
+    @method onUpdateURL
+    @param callback {Function}
+  */
+  onUpdateURL(callback: UpdateCallback): void {
+    this._removeEventListener();
+    this._hashchangeHandler = bind(this, function (this: HashLocation, _event: Event) {
+      let path = this.getURL();
+      if (this.lastSetURL === path) {
+        return;
+      }
+
+      set(this, 'lastSetURL', null);
+
+      callback(path);
+    });
+
+    window.addEventListener('hashchange', this._hashchangeHandler);
+  }
+
+  /**
+    Given a URL, formats it to be placed into the page as part
+    of an element's `href` attribute.
+
+    This is used, for example, when using the {{action}} helper
+    to generate a URL based on an event.
+
+    @private
+    @method formatURL
+    @param url {String}
+  */
+  formatURL(url: string): string {
+    return `#${url}`;
+  }
+
+  /**
+    Cleans up the HashLocation event listener.
+
+    @private
+    @method willDestroy
+  */
+  willDestroy(): void {
+    this._removeEventListener();
+  }
+
+  _removeEventListener(): void {
+    if (this._hashchangeHandler) {
+      window.removeEventListener('hashchange', this._hashchangeHandler);
+    }
+  }
+}
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 25adac4c640..8d720bf3d51 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -85,6 +85,7 @@ import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
 import AutoLocation from '@ember/routing/auto-location';
+import HashLocation from '@ember/routing/hash-location';
 import NoneLocation from '@ember/routing/none-location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
@@ -507,7 +508,7 @@ Ember.EventDispatcher = views.EventDispatcher;
 // ****@ember/-internals/routing****
 Ember.Location = routing.Location;
 Ember.AutoLocation = AutoLocation;
-Ember.HashLocation = routing.HashLocation;
+Ember.HashLocation = HashLocation;
 Ember.HistoryLocation = routing.HistoryLocation;
 Ember.NoneLocation = NoneLocation;
 Ember.controllerFor = routing.controllerFor;

From 819d049992dc4f8cc5e63ba98c941c04f34d0ef1 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 14:10:43 -0700
Subject: [PATCH 1065/1405] Consolidate @ember/routing/history-location

---
 packages/@ember/-internals/routing/index.ts   |   1 -
 .../routing/lib/location/history_location.ts  | 282 -----------------
 .../tests/location/auto_location_test.js      |   2 +-
 .../tests/location/history_location_test.js   |   2 +-
 .../routing/tests/system/router_test.js       |   2 +-
 packages/@ember/application/index.ts          |   3 +-
 packages/@ember/routing/history-location.ts   | 283 +++++++++++++++++-
 packages/ember/index.js                       |   3 +-
 .../tests/routing/decoupled_basic_test.js     |   2 +-
 9 files changed, 290 insertions(+), 290 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/location/history_location.ts

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index c419c2b2e14..779b859b394 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,5 +1,4 @@
 export { default as Location, EmberLocation, UpdateCallback } from './lib/location/api';
-export { default as HistoryLocation } from './lib/location/history_location';
 export {
   getFullPath,
   getHash,
diff --git a/packages/@ember/-internals/routing/lib/location/history_location.ts b/packages/@ember/-internals/routing/lib/location/history_location.ts
deleted file mode 100644
index d6111a338ce..00000000000
--- a/packages/@ember/-internals/routing/lib/location/history_location.ts
+++ /dev/null
@@ -1,282 +0,0 @@
-import { set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
-import type { EmberLocation, UpdateCallback } from './api';
-import { getHash } from './util';
-
-/**
-@module @ember/routing
-*/
-
-let popstateFired = false;
-
-function _uuid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    let r, v;
-    r = (Math.random() * 16) | 0;
-    v = c === 'x' ? r : (r & 3) | 8;
-    return v.toString(16);
-  });
-}
-
-/**
-  HistoryLocation implements the location API using the browser's
-  history.pushState API.
-
-  Using `HistoryLocation` results in URLs that are indistinguishable from a
-  standard URL. This relies upon the browser's `history` API.
-
-  Example:
-
-  ```app/router.js
-  Router.map(function() {
-    this.route('posts', function() {
-      this.route('new');
-    });
-  });
-
-  Router.reopen({
-    location: 'history'
-  });
-  ```
-
-  This will result in a posts.new url of `/posts/new`.
-
-  Keep in mind that your server must serve the Ember app at all the routes you
-  define.
-
-  Using `HistoryLocation` will also result in location states being recorded by
-  the browser `history` API with the following schema:
-
-  ```
-  window.history.state -> { path: '/', uuid: '3552e730-b4a6-46bd-b8bf-d8c3c1a97e0a' }
-  ```
-
-  This allows each in-app location state to be tracked uniquely across history
-  state changes via the `uuid` field.
-
-  @class HistoryLocation
-  @extends EmberObject
-  @protected
-*/
-export default class HistoryLocation extends EmberObject implements EmberLocation {
-  declare location: Location;
-  declare baseURL: string;
-
-  history?: any;
-
-  implementation = 'history';
-  _previousURL?: string;
-  _popstateHandler?: EventListener;
-
-  /**
-    Will be pre-pended to path upon state change
-
-    @property rootURL
-    @default '/'
-    @private
-  */
-  rootURL = '/';
-  /**
-    @private
-
-    Returns normalized location.hash
-
-    @method getHash
-  */
-  getHash(): string {
-    return getHash(this.location);
-  }
-
-  init(): void {
-    this._super(...arguments);
-
-    let base = document.querySelector('base');
-    let baseURL = '';
-    if (base !== null && base.hasAttribute('href')) {
-      baseURL = base.getAttribute('href') ?? '';
-    }
-
-    set(this, 'baseURL', baseURL);
-    set(this, 'location', this.location || window.location);
-
-    this._popstateHandler = undefined;
-  }
-
-  /**
-    Used to set state on first call to setURL
-
-    @private
-    @method initState
-  */
-  initState(): void {
-    let history = this.history || window.history;
-    set(this, 'history', history);
-
-    let { state } = history;
-    let path = this.formatURL(this.getURL());
-    if (state && state.path === path) {
-      // preserve existing state
-      // used for webkit workaround, since there will be no initial popstate event
-      this._previousURL = this.getURL();
-    } else {
-      this.replaceState(path);
-    }
-  }
-
-  /**
-    Returns the current `location.pathname` without `rootURL` or `baseURL`
-
-    @private
-    @method getURL
-    @return url {String}
-  */
-  getURL(): string {
-    let { location, rootURL, baseURL } = this;
-    let path = location.pathname;
-
-    // remove trailing slashes if they exists
-    rootURL = rootURL.replace(/\/$/, '');
-    baseURL = baseURL.replace(/\/$/, '');
-
-    // remove baseURL and rootURL from start of path
-    let url = path
-      .replace(new RegExp(`^${baseURL}(?=/|$)`), '')
-      .replace(new RegExp(`^${rootURL}(?=/|$)`), '')
-      .replace(/\/\//g, '/'); // remove extra slashes
-
-    let search = location.search || '';
-    url += search + this.getHash();
-
-    return url;
-  }
-
-  /**
-    Uses `history.pushState` to update the url without a page reload.
-
-    @private
-    @method setURL
-    @param path {String}
-  */
-  setURL(path: string): void {
-    let { state } = this.history;
-    path = this.formatURL(path);
-
-    if (!state || state.path !== path) {
-      this.pushState(path);
-    }
-  }
-
-  /**
-    Uses `history.replaceState` to update the url without a page reload
-    or history modification.
-
-    @private
-    @method replaceURL
-    @param path {String}
-  */
-  replaceURL(path: string): void {
-    let { state } = this.history;
-    path = this.formatURL(path);
-
-    if (!state || state.path !== path) {
-      this.replaceState(path);
-    }
-  }
-
-  /**
-   Pushes a new state.
-
-   @private
-   @method pushState
-   @param path {String}
-  */
-  pushState(path: string): void {
-    let state = { path, uuid: _uuid() };
-
-    this.history.pushState(state, null, path);
-
-    // used for webkit workaround
-    this._previousURL = this.getURL();
-  }
-
-  /**
-   Replaces the current state.
-
-   @private
-   @method replaceState
-   @param path {String}
-  */
-  replaceState(path: string): void {
-    let state = { path, uuid: _uuid() };
-
-    this.history.replaceState(state, null, path);
-
-    // used for webkit workaround
-    this._previousURL = this.getURL();
-  }
-
-  /**
-    Register a callback to be invoked whenever the browser
-    history changes, including using forward and back buttons.
-
-    @private
-    @method onUpdateURL
-    @param callback {Function}
-  */
-  onUpdateURL(callback: UpdateCallback): void {
-    this._removeEventListener();
-
-    this._popstateHandler = () => {
-      // Ignore initial page load popstate event in Chrome
-      if (!popstateFired) {
-        popstateFired = true;
-        if (this.getURL() === this._previousURL) {
-          return;
-        }
-      }
-      callback(this.getURL());
-    };
-
-    window.addEventListener('popstate', this._popstateHandler);
-  }
-
-  /**
-    Used when using `{{action}}` helper.  The url is always appended to the rootURL.
-
-    @private
-    @method formatURL
-    @param url {String}
-    @return formatted url {String}
-  */
-  formatURL(url: string): string {
-    let { rootURL, baseURL } = this;
-
-    if (url !== '') {
-      // remove trailing slashes if they exists
-      rootURL = rootURL.replace(/\/$/, '');
-      baseURL = baseURL.replace(/\/$/, '');
-    } else if (baseURL[0] === '/' && rootURL[0] === '/') {
-      // if baseURL and rootURL both start with a slash
-      // ... remove trailing slash from baseURL if it exists
-      baseURL = baseURL.replace(/\/$/, '');
-    }
-
-    return baseURL + rootURL + url;
-  }
-
-  /**
-    Cleans up the HistoryLocation event listener.
-
-    @private
-    @method willDestroy
-  */
-  willDestroy(): void {
-    this._removeEventListener();
-  }
-
-  _removeEventListener(): void {
-    if (this._popstateHandler) {
-      window.removeEventListener('popstate', this._popstateHandler);
-    }
-  }
-}
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index 73521bd84df..ffa578b3f38 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -3,7 +3,7 @@ import { run } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { setOwner } from '@glimmer/owner';
 import AutoLocation, { getHistoryPath, getHashPath } from '@ember/routing/auto-location';
-import HistoryLocation from '../../lib/location/history_location';
+import HistoryLocation from '@ember/routing/history-location';
 import HashLocation from '@ember/routing/hash-location';
 import NoneLocation from '@ember/routing/none-location';
 import { buildOwner, moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/routing/tests/location/history_location_test.js b/packages/@ember/-internals/routing/tests/location/history_location_test.js
index 6efad8dd768..9884f0b1add 100644
--- a/packages/@ember/-internals/routing/tests/location/history_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/history_location_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { set } from '@ember/-internals/metal';
-import HistoryLocation from '../../lib/location/history_location';
+import HistoryLocation from '@ember/routing/history-location';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let FakeHistory, HistoryTestLocation, location;
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/-internals/routing/tests/system/router_test.js
index f3c2b5e1b96..3cc34559398 100644
--- a/packages/@ember/-internals/routing/tests/system/router_test.js
+++ b/packages/@ember/-internals/routing/tests/system/router_test.js
@@ -1,5 +1,5 @@
 import HashLocation from '@ember/routing/hash-location';
-import HistoryLocation from '../../lib/location/history_location';
+import HistoryLocation from '@ember/routing/history-location';
 import AutoLocation from '@ember/routing/auto-location';
 import NoneLocation from '@ember/routing/none-location';
 import Router, { triggerEvent } from '@ember/routing/router';
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index efa698731ca..7afbb632a61 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -17,8 +17,9 @@ import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
 import AutoLocation from '@ember/routing/auto-location';
 import HashLocation from '@ember/routing/hash-location';
+import HistoryLocation from '@ember/routing/history-location';
 import NoneLocation from '@ember/routing/none-location';
-import { HistoryLocation, BucketCache } from '@ember/-internals/routing';
+import { BucketCache } from '@ember/-internals/routing';
 import ApplicationInstance from '@ember/application/instance';
 import Engine, { buildInitializerMethod } from '@ember/engine';
 import type { BootOptions } from '@ember/engine/instance';
diff --git a/packages/@ember/routing/history-location.ts b/packages/@ember/routing/history-location.ts
index 61668339a68..3bb74d42a29 100644
--- a/packages/@ember/routing/history-location.ts
+++ b/packages/@ember/routing/history-location.ts
@@ -1 +1,282 @@
-export { HistoryLocation as default } from '@ember/-internals/routing';
+import { set } from '@ember/-internals/metal';
+import EmberObject from '@ember/object';
+import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import { getHash } from '@ember/-internals/routing';
+
+/**
+@module @ember/routing
+*/
+
+let popstateFired = false;
+
+function _uuid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    let r, v;
+    r = (Math.random() * 16) | 0;
+    v = c === 'x' ? r : (r & 3) | 8;
+    return v.toString(16);
+  });
+}
+
+/**
+  HistoryLocation implements the location API using the browser's
+  history.pushState API.
+
+  Using `HistoryLocation` results in URLs that are indistinguishable from a
+  standard URL. This relies upon the browser's `history` API.
+
+  Example:
+
+  ```app/router.js
+  Router.map(function() {
+    this.route('posts', function() {
+      this.route('new');
+    });
+  });
+
+  Router.reopen({
+    location: 'history'
+  });
+  ```
+
+  This will result in a posts.new url of `/posts/new`.
+
+  Keep in mind that your server must serve the Ember app at all the routes you
+  define.
+
+  Using `HistoryLocation` will also result in location states being recorded by
+  the browser `history` API with the following schema:
+
+  ```
+  window.history.state -> { path: '/', uuid: '3552e730-b4a6-46bd-b8bf-d8c3c1a97e0a' }
+  ```
+
+  This allows each in-app location state to be tracked uniquely across history
+  state changes via the `uuid` field.
+
+  @class HistoryLocation
+  @extends EmberObject
+  @protected
+*/
+export default class HistoryLocation extends EmberObject implements EmberLocation {
+  declare location: Location;
+  declare baseURL: string;
+
+  history?: any;
+
+  implementation = 'history';
+  _previousURL?: string;
+  _popstateHandler?: EventListener;
+
+  /**
+    Will be pre-pended to path upon state change
+
+    @property rootURL
+    @default '/'
+    @private
+  */
+  rootURL = '/';
+  /**
+    @private
+
+    Returns normalized location.hash
+
+    @method getHash
+  */
+  getHash(): string {
+    return getHash(this.location);
+  }
+
+  init(): void {
+    this._super(...arguments);
+
+    let base = document.querySelector('base');
+    let baseURL = '';
+    if (base !== null && base.hasAttribute('href')) {
+      baseURL = base.getAttribute('href') ?? '';
+    }
+
+    set(this, 'baseURL', baseURL);
+    set(this, 'location', this.location || window.location);
+
+    this._popstateHandler = undefined;
+  }
+
+  /**
+    Used to set state on first call to setURL
+
+    @private
+    @method initState
+  */
+  initState(): void {
+    let history = this.history || window.history;
+    set(this, 'history', history);
+
+    let { state } = history;
+    let path = this.formatURL(this.getURL());
+    if (state && state.path === path) {
+      // preserve existing state
+      // used for webkit workaround, since there will be no initial popstate event
+      this._previousURL = this.getURL();
+    } else {
+      this.replaceState(path);
+    }
+  }
+
+  /**
+    Returns the current `location.pathname` without `rootURL` or `baseURL`
+
+    @private
+    @method getURL
+    @return url {String}
+  */
+  getURL(): string {
+    let { location, rootURL, baseURL } = this;
+    let path = location.pathname;
+
+    // remove trailing slashes if they exists
+    rootURL = rootURL.replace(/\/$/, '');
+    baseURL = baseURL.replace(/\/$/, '');
+
+    // remove baseURL and rootURL from start of path
+    let url = path
+      .replace(new RegExp(`^${baseURL}(?=/|$)`), '')
+      .replace(new RegExp(`^${rootURL}(?=/|$)`), '')
+      .replace(/\/\//g, '/'); // remove extra slashes
+
+    let search = location.search || '';
+    url += search + this.getHash();
+
+    return url;
+  }
+
+  /**
+    Uses `history.pushState` to update the url without a page reload.
+
+    @private
+    @method setURL
+    @param path {String}
+  */
+  setURL(path: string): void {
+    let { state } = this.history;
+    path = this.formatURL(path);
+
+    if (!state || state.path !== path) {
+      this.pushState(path);
+    }
+  }
+
+  /**
+    Uses `history.replaceState` to update the url without a page reload
+    or history modification.
+
+    @private
+    @method replaceURL
+    @param path {String}
+  */
+  replaceURL(path: string): void {
+    let { state } = this.history;
+    path = this.formatURL(path);
+
+    if (!state || state.path !== path) {
+      this.replaceState(path);
+    }
+  }
+
+  /**
+   Pushes a new state.
+
+   @private
+   @method pushState
+   @param path {String}
+  */
+  pushState(path: string): void {
+    let state = { path, uuid: _uuid() };
+
+    this.history.pushState(state, null, path);
+
+    // used for webkit workaround
+    this._previousURL = this.getURL();
+  }
+
+  /**
+   Replaces the current state.
+
+   @private
+   @method replaceState
+   @param path {String}
+  */
+  replaceState(path: string): void {
+    let state = { path, uuid: _uuid() };
+
+    this.history.replaceState(state, null, path);
+
+    // used for webkit workaround
+    this._previousURL = this.getURL();
+  }
+
+  /**
+    Register a callback to be invoked whenever the browser
+    history changes, including using forward and back buttons.
+
+    @private
+    @method onUpdateURL
+    @param callback {Function}
+  */
+  onUpdateURL(callback: UpdateCallback): void {
+    this._removeEventListener();
+
+    this._popstateHandler = () => {
+      // Ignore initial page load popstate event in Chrome
+      if (!popstateFired) {
+        popstateFired = true;
+        if (this.getURL() === this._previousURL) {
+          return;
+        }
+      }
+      callback(this.getURL());
+    };
+
+    window.addEventListener('popstate', this._popstateHandler);
+  }
+
+  /**
+    Used when using `{{action}}` helper.  The url is always appended to the rootURL.
+
+    @private
+    @method formatURL
+    @param url {String}
+    @return formatted url {String}
+  */
+  formatURL(url: string): string {
+    let { rootURL, baseURL } = this;
+
+    if (url !== '') {
+      // remove trailing slashes if they exists
+      rootURL = rootURL.replace(/\/$/, '');
+      baseURL = baseURL.replace(/\/$/, '');
+    } else if (baseURL[0] === '/' && rootURL[0] === '/') {
+      // if baseURL and rootURL both start with a slash
+      // ... remove trailing slash from baseURL if it exists
+      baseURL = baseURL.replace(/\/$/, '');
+    }
+
+    return baseURL + rootURL + url;
+  }
+
+  /**
+    Cleans up the HistoryLocation event listener.
+
+    @private
+    @method willDestroy
+  */
+  willDestroy(): void {
+    this._removeEventListener();
+  }
+
+  _removeEventListener(): void {
+    if (this._popstateHandler) {
+      window.removeEventListener('popstate', this._popstateHandler);
+    }
+  }
+}
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 8d720bf3d51..61aaa4e349c 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -86,6 +86,7 @@ import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import { assign } from '@ember/polyfills';
 import AutoLocation from '@ember/routing/auto-location';
 import HashLocation from '@ember/routing/hash-location';
+import HistoryLocation from '@ember/routing/history-location';
 import NoneLocation from '@ember/routing/none-location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
@@ -509,7 +510,7 @@ Ember.EventDispatcher = views.EventDispatcher;
 Ember.Location = routing.Location;
 Ember.AutoLocation = AutoLocation;
 Ember.HashLocation = HashLocation;
-Ember.HistoryLocation = routing.HistoryLocation;
+Ember.HistoryLocation = HistoryLocation;
 Ember.NoneLocation = NoneLocation;
 Ember.controllerFor = routing.controllerFor;
 Ember.generateControllerFactory = routing.generateControllerFactory;
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 7f9b254a7f6..6ea77a10e92 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -4,7 +4,7 @@ import RSVP from 'rsvp';
 import { compile } from 'ember-template-compiler';
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
-import { HistoryLocation } from '@ember/-internals/routing';
+import HistoryLocation from '@ember/routing/history-location';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
 import {

From c6363744818f7615b56518c0435fb7a61a0cfa45 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 14:16:39 -0700
Subject: [PATCH 1066/1405] Consolidate @ember/routing/location

---
 packages/@ember/-internals/routing/index.ts   |   1 -
 .../-internals/routing/lib/location/api.ts    | 130 -----------------
 packages/@ember/routing/auto-location.ts      |   2 +-
 packages/@ember/routing/hash-location.ts      |   2 +-
 packages/@ember/routing/history-location.ts   |   2 +-
 packages/@ember/routing/location.ts           | 131 +++++++++++++++++-
 packages/@ember/routing/none-location.ts      |   2 +-
 packages/@ember/routing/router.ts             |   4 +-
 .../routing/type-tests/router-service.test.ts |   2 +-
 packages/ember/index.js                       |   3 +-
 10 files changed, 139 insertions(+), 140 deletions(-)
 delete mode 100644 packages/@ember/-internals/routing/lib/location/api.ts

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 779b859b394..bf656a460ca 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,4 +1,3 @@
-export { default as Location, EmberLocation, UpdateCallback } from './lib/location/api';
 export {
   getFullPath,
   getHash,
diff --git a/packages/@ember/-internals/routing/lib/location/api.ts b/packages/@ember/-internals/routing/lib/location/api.ts
deleted file mode 100644
index 796528ee738..00000000000
--- a/packages/@ember/-internals/routing/lib/location/api.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { assert, deprecate } from '@ember/debug';
-
-export interface EmberLocation {
-  implementation: string;
-  cancelRouterSetup?: boolean;
-  getURL(): string;
-  setURL(url: string): void;
-  replaceURL?(url: string): void;
-  onUpdateURL(callback: UpdateCallback): void;
-  formatURL(url: string): string;
-  detect?(): void;
-  initState?(): void;
-  destroy(): void;
-}
-
-export type UpdateCallback = (url: string) => void;
-/**
-@module @ember/routing
-*/
-
-/**
-  Location returns an instance of the correct implementation of
-  the `location` API.
-
-  ## Implementations
-
-  You can pass an implementation name (`hash`, `history`, `none`, `auto`) to force a
-  particular implementation to be used in your application.
-
-  See [HashLocation](/ember/release/classes/HashLocation).
-  See [HistoryLocation](/ember/release/classes/HistoryLocation).
-  See [NoneLocation](/ember/release/classes/NoneLocation).
-  See [AutoLocation](/ember/release/classes/AutoLocation).
-
-  ## Location API
-
-  Each location implementation must provide the following methods:
-
-  * implementation: returns the string name used to reference the implementation.
-  * getURL: returns the current URL.
-  * setURL(path): sets the current URL.
-  * replaceURL(path): replace the current URL (optional).
-  * onUpdateURL(callback): triggers the callback when the URL changes.
-  * formatURL(url): formats `url` to be placed into `href` attribute.
-  * detect() (optional): instructs the location to do any feature detection
-      necessary. If the location needs to redirect to a different URL, it
-      can cancel routing by setting the `cancelRouterSetup` property on itself
-      to `false`.
-
-  Calling setURL or replaceURL will not trigger onUpdateURL callbacks.
-
-  ## Custom implementation
-
-  Ember scans `app/locations/*` for extending the Location API.
-
-  Example:
-
-  ```javascript
-  import HistoryLocation from '@ember/routing/history-location';
-
-  export default class MyHistory {
-    implementation = 'my-custom-history';
-
-    constructor() {
-      this._history = HistoryLocation.create(...arguments);
-    }
-
-    create() {
-      return new this(...arguments);
-    }
-
-    pushState(path) {
-       this._history.pushState(path);
-    }
-  }
-  ```
-
-  @class Location
-  @private
-*/
-export default {
-  /**
-   This is deprecated in favor of using the container to lookup the location
-   implementation as desired.
-
-   For example:
-
-   ```javascript
-   // Given a location registered as follows:
-   container.register('location:history-test', HistoryTestLocation);
-
-   // You could create a new instance via:
-   container.lookup('location:history-test');
-   ```
-
-    @method create
-    @param {Object} options
-    @return {Object} an instance of an implementation of the `location` API
-    @deprecated Use the container to lookup the location implementation that you
-    need.
-    @private
-  */
-  create(options?: { implementation: string }): EmberLocation {
-    let implementation = options?.implementation;
-    assert("Location.create: you must specify a 'implementation' option", implementation);
-
-    let implementationClass = this.implementations[implementation];
-
-    assert(`Location.create: ${implementation} is not a valid implementation`, implementationClass);
-
-    deprecate(
-      "Calling `create` on Location class is deprecated. Instead, use `container.lookup('location:my-location')` to lookup the location you need.",
-      false,
-      {
-        id: 'deprecate-auto-location',
-        until: '5.0.0',
-        url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
-        for: 'ember-source',
-        since: {
-          available: '4.1.0',
-          enabled: '4.1.0',
-        },
-      }
-    );
-
-    return implementationClass.create(...arguments);
-  },
-
-  implementations: {} as Record<string, { create: (...args: any[]) => EmberLocation }>,
-};
diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts
index 5d764f0744b..b11d2aa333d 100644
--- a/packages/@ember/routing/auto-location.ts
+++ b/packages/@ember/routing/auto-location.ts
@@ -4,7 +4,7 @@ import { getOwner } from '@ember/-internals/owner';
 import EmberObject from '@ember/object';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
-import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 import {
   getFullPath,
   getHash,
diff --git a/packages/@ember/routing/hash-location.ts b/packages/@ember/routing/hash-location.ts
index cfde70f81e2..f01507aa594 100644
--- a/packages/@ember/routing/hash-location.ts
+++ b/packages/@ember/routing/hash-location.ts
@@ -1,7 +1,7 @@
 import { set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
 import { bind } from '@ember/runloop';
-import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 import { getHash } from '@ember/-internals/routing';
 
 /**
diff --git a/packages/@ember/routing/history-location.ts b/packages/@ember/routing/history-location.ts
index 3bb74d42a29..282c8e09d12 100644
--- a/packages/@ember/routing/history-location.ts
+++ b/packages/@ember/routing/history-location.ts
@@ -1,6 +1,6 @@
 import { set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
-import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 import { getHash } from '@ember/-internals/routing';
 
 /**
diff --git a/packages/@ember/routing/location.ts b/packages/@ember/routing/location.ts
index 081191b6941..28d152e8f70 100644
--- a/packages/@ember/routing/location.ts
+++ b/packages/@ember/routing/location.ts
@@ -1 +1,130 @@
-export { Location as default, EmberLocation as ILocation } from '@ember/-internals/routing';
+import { assert, deprecate } from '@ember/debug';
+
+export interface ILocation {
+  implementation: string;
+  cancelRouterSetup?: boolean;
+  getURL(): string;
+  setURL(url: string): void;
+  replaceURL?(url: string): void;
+  onUpdateURL(callback: UpdateCallback): void;
+  formatURL(url: string): string;
+  detect?(): void;
+  initState?(): void;
+  destroy(): void;
+}
+
+export type UpdateCallback = (url: string) => void;
+/**
+@module @ember/routing
+*/
+
+/**
+  Location returns an instance of the correct implementation of
+  the `location` API.
+
+  ## Implementations
+
+  You can pass an implementation name (`hash`, `history`, `none`, `auto`) to force a
+  particular implementation to be used in your application.
+
+  See [HashLocation](/ember/release/classes/HashLocation).
+  See [HistoryLocation](/ember/release/classes/HistoryLocation).
+  See [NoneLocation](/ember/release/classes/NoneLocation).
+  See [AutoLocation](/ember/release/classes/AutoLocation).
+
+  ## Location API
+
+  Each location implementation must provide the following methods:
+
+  * implementation: returns the string name used to reference the implementation.
+  * getURL: returns the current URL.
+  * setURL(path): sets the current URL.
+  * replaceURL(path): replace the current URL (optional).
+  * onUpdateURL(callback): triggers the callback when the URL changes.
+  * formatURL(url): formats `url` to be placed into `href` attribute.
+  * detect() (optional): instructs the location to do any feature detection
+      necessary. If the location needs to redirect to a different URL, it
+      can cancel routing by setting the `cancelRouterSetup` property on itself
+      to `false`.
+
+  Calling setURL or replaceURL will not trigger onUpdateURL callbacks.
+
+  ## Custom implementation
+
+  Ember scans `app/locations/*` for extending the Location API.
+
+  Example:
+
+  ```javascript
+  import HistoryLocation from '@ember/routing/history-location';
+
+  export default class MyHistory {
+    implementation = 'my-custom-history';
+
+    constructor() {
+      this._history = HistoryLocation.create(...arguments);
+    }
+
+    create() {
+      return new this(...arguments);
+    }
+
+    pushState(path) {
+       this._history.pushState(path);
+    }
+  }
+  ```
+
+  @class Location
+  @private
+*/
+export default {
+  /**
+   This is deprecated in favor of using the container to lookup the location
+   implementation as desired.
+
+   For example:
+
+   ```javascript
+   // Given a location registered as follows:
+   container.register('location:history-test', HistoryTestLocation);
+
+   // You could create a new instance via:
+   container.lookup('location:history-test');
+   ```
+
+    @method create
+    @param {Object} options
+    @return {Object} an instance of an implementation of the `location` API
+    @deprecated Use the container to lookup the location implementation that you
+    need.
+    @private
+  */
+  create(options?: { implementation: string }): ILocation {
+    let implementation = options?.implementation;
+    assert("Location.create: you must specify a 'implementation' option", implementation);
+
+    let implementationClass = this.implementations[implementation];
+
+    assert(`Location.create: ${implementation} is not a valid implementation`, implementationClass);
+
+    deprecate(
+      "Calling `create` on Location class is deprecated. Instead, use `container.lookup('location:my-location')` to lookup the location you need.",
+      false,
+      {
+        id: 'deprecate-auto-location',
+        until: '5.0.0',
+        url: 'https://emberjs.com/deprecations/v4.x#toc_deprecate-auto-location',
+        for: 'ember-source',
+        since: {
+          available: '4.1.0',
+          enabled: '4.1.0',
+        },
+      }
+    );
+
+    return implementationClass.create(...arguments);
+  },
+
+  implementations: {} as Record<string, { create: (...args: any[]) => ILocation }>,
+};
diff --git a/packages/@ember/routing/none-location.ts b/packages/@ember/routing/none-location.ts
index b44af6df12f..8163966813d 100644
--- a/packages/@ember/routing/none-location.ts
+++ b/packages/@ember/routing/none-location.ts
@@ -1,7 +1,7 @@
 import { set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
 import { assert } from '@ember/debug';
-import type { EmberLocation, UpdateCallback } from '@ember/-internals/routing';
+import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 
 /**
 @module @ember/routing
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 935d2810c32..895f9feed0c 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -5,7 +5,6 @@ import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import {
   BucketCache,
-  Location as EmberLocation,
   RouterDSL as DSL,
   RouterState,
   calculateCacheKey,
@@ -15,11 +14,12 @@ import {
 } from '@ember/-internals/routing';
 import type {
   DSLCallback,
-  EmberLocation as IEmberLocation,
   EngineRouteInfo,
   RouteArgs,
   RouteOptions,
 } from '@ember/-internals/routing';
+import EmberLocation from '@ember/routing/location';
+import type { ILocation as IEmberLocation } from '@ember/routing/location';
 import type RouterService from '@ember/routing/router-service';
 import EmberObject from '@ember/object';
 import { A as emberA, typeOf } from '@ember/-internals/runtime';
diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts
index cff46275e96..af38e67e211 100644
--- a/packages/@ember/routing/type-tests/router-service.test.ts
+++ b/packages/@ember/routing/type-tests/router-service.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-self-assign */
 
 import type { Owner } from '@ember/-internals/owner';
-import type { EmberLocation } from '@ember/-internals/routing';
+import type { ILocation as EmberLocation } from '@ember/routing/location';
 import type Route from '@ember/routing/route';
 import type { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
 import RouterService from '@ember/routing/router-service';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 61aaa4e349c..586dc830ef4 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -88,6 +88,7 @@ import AutoLocation from '@ember/routing/auto-location';
 import HashLocation from '@ember/routing/hash-location';
 import HistoryLocation from '@ember/routing/history-location';
 import NoneLocation from '@ember/routing/none-location';
+import EmberLocation from '@ember/routing/location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
 
@@ -507,7 +508,7 @@ Ember.ComponentLookup = views.ComponentLookup;
 Ember.EventDispatcher = views.EventDispatcher;
 
 // ****@ember/-internals/routing****
-Ember.Location = routing.Location;
+Ember.Location = EmberLocation;
 Ember.AutoLocation = AutoLocation;
 Ember.HashLocation = HashLocation;
 Ember.HistoryLocation = HistoryLocation;

From 2e5d77a10280e6b6480deb23d53ffc535e816a1c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 14:57:49 -0700
Subject: [PATCH 1067/1405] Consolidate @ember/array

---
 .../-internals/glimmer/lib/utils/iterator.ts  |    2 +-
 .../-internals/glimmer/lib/utils/to-bool.ts   |    2 +-
 .../components/contextual-components-test.js  |    2 +-
 .../components/curly-components-test.js       |    2 +-
 .../integration/components/life-cycle-test.js |    2 +-
 .../components/link-to/routing-angle-test.js  |    3 +-
 .../components/link-to/routing-curly-test.js  |    3 +-
 .../integration/components/tracked-test.js    |    3 +-
 .../helpers/element-action-test.js            |    2 +-
 .../tests/integration/helpers/tracked-test.js |    3 +-
 .../tests/integration/helpers/unbound-test.js |    2 +-
 .../tests/integration/syntax/each-test.js     |    3 +-
 .../integration/syntax/if-unless-test.js      |    2 +-
 .../tests/integration/syntax/let-test.js      |    2 +-
 .../tests/utils/shared-conditional-tests.js   |    3 +-
 packages/@ember/-internals/metal/lib/array.ts |    3 +-
 .../-internals/metal/tests/alias_test.js      |    2 +-
 packages/@ember/-internals/runtime/index.ts   |   12 +-
 .../-internals/runtime/lib/mixins/array.ts    | 1971 ----------------
 .../runtime/lib/system/array_proxy.ts         |    3 +-
 .../runtime/tests/array/any-test.js           |    2 +-
 .../runtime/tests/array/apply-test.js         |    2 +-
 .../runtime/tests/array/invoke-test.js        |    2 +-
 .../runtime/tests/core/is_array_test.js       |    2 +-
 .../runtime/tests/core/is_empty_test.js       |    2 +-
 .../-internals/runtime/tests/helpers/array.js |    3 +-
 .../mixins/observable/chained_test.js         |    2 +-
 .../runtime/tests/mixins/array_test.js        |    2 +-
 .../tests/mixins/mutable_enumerable_test.js   |    4 +-
 .../tests/mutable-array/removeAt-test.js      |    2 +-
 .../tests/mutable-array/removeObjects-test.js |    2 +-
 .../array_proxy/arranged_content_test.js      |    2 +-
 .../system/array_proxy/content_change_test.js |    2 +-
 .../tests/system/array_proxy/length_test.js   |    2 +-
 .../watching_and_listening_test.js            |    2 +-
 .../tests/system/native_array/a_test.js       |    4 +-
 .../tests/system/native_array/replace_test.js |    2 +-
 .../-internals/utils/lib/ember-array.ts       |    2 +-
 packages/@ember/array/index.ts                | 1972 ++++++++++++++++-
 packages/@ember/array/mutable.ts              |    2 +-
 .../@ember/debug/container-debug-adapter.ts   |    5 +-
 packages/@ember/debug/data-adapter.ts         |    4 +-
 .../mutable.ts}                               |    0
 .../lib/computed/reduce_computed_macros.ts    |    6 +-
 .../tests/computed/computed_macros_test.js    |    2 +-
 .../computed/reduce_computed_macros_test.js   |    3 +-
 packages/@ember/routing/route.ts              |    3 +-
 packages/@ember/routing/router.ts             |    3 +-
 packages/ember/index.js                       |    9 +-
 packages/ember/tests/homepage_example_test.js |    2 +-
 .../ember/tests/routing/model_loading_test.js |    2 +-
 .../ember/tests/routing/query_params_test.js  |    3 +-
 ..._dependent_state_with_query_params_test.js |    2 +-
 .../tests/routing/template_rendering_test.js  |    2 +-
 54 files changed, 2044 insertions(+), 2044 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/mixins/array.ts
 rename packages/@ember/{-internals/runtime/lib/mixins/mutable_enumerable.ts => enumerable/mutable.ts} (100%)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index abb32a9b85c..6cb3d1d5dd5 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -1,5 +1,5 @@
 import { objectAt } from '@ember/-internals/metal';
-import type { Array as EmberArray } from '@ember/-internals/runtime';
+import type EmberArray from '@ember/array';
 import { isEmberArray, isObject } from '@ember/-internals/utils';
 import type { Option } from '@glimmer/interfaces';
 import type { IteratorDelegate } from '@glimmer/reference';
diff --git a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
index 5e6133ef246..e3521eacadf 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/to-bool.ts
@@ -1,6 +1,6 @@
 import { isHTMLSafe } from '@ember/-internals/glimmer';
 import { get, tagForProperty } from '@ember/-internals/metal';
-import { isArray } from '@ember/-internals/runtime';
+import { isArray } from '@ember/array';
 import { isProxy } from '@ember/-internals/utils';
 import { consumeTag } from '@glimmer/validator';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index 4d102a4b072..4f065ef36e8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -2,7 +2,7 @@ import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
 
 import { isEmpty } from '@ember/-internals/metal';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 12f4f30820b..42b06c88748 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -14,7 +14,7 @@ import { DEBUG } from '@glimmer/env';
 import { alias, set, get, on, computed, tracked } from '@ember/-internals/metal';
 import Service, { service } from '@ember/service';
 import EmberObject, { observer } from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index 0198ddaf45b..5dea0caa535 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -2,7 +2,7 @@ import { classes, moduleFor, RenderingTestCase, runTask, strip } from 'internal-
 
 import { schedule } from '@ember/runloop';
 import { set, setProperties } from '@ember/-internals/metal';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { getViewElement, getViewId } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 87b6a044467..606349be153 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -5,7 +5,8 @@ import {
   runTask,
 } from 'internal-test-helpers';
 import Controller, { inject as injectController } from '@ember/controller';
-import { A as emberA, RSVP } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import { RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 6ebedb4ee16..3f1c9c7bcc2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -5,7 +5,8 @@ import {
   runTask,
 } from 'internal-test-helpers';
 import Controller, { inject as injectController } from '@ember/controller';
-import { A as emberA, RSVP } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import { RSVP } from '@ember/-internals/runtime';
 import { subscribe, reset } from '@ember/instrumentation';
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 7fa92702f26..481599207ed 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -1,5 +1,6 @@
 import EmberObject from '@ember/object';
-import { A, ArrayProxy } from '@ember/-internals/runtime';
+import { A } from '@ember/array';
+import { ArrayProxy } from '@ember/-internals/runtime';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import {
   computed,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index 5067de2181e..febbc344141 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -7,7 +7,7 @@ import {
 } from '@ember/instrumentation';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { ActionManager } from '@ember/-internals/views';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
index 471e5d6f161..8fe282cbbbc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/tracked-test.js
@@ -1,5 +1,6 @@
 import EmberObject from '@ember/object';
-import { A, MutableArray } from '@ember/-internals/runtime';
+import { A } from '@ember/array';
+import MutableArray from '@ember/array/mutable';
 import {
   tracked,
   nativeDescDecorator as descriptor,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
index 9ec93c88307..869b4f95adf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
@@ -7,7 +7,7 @@ import {
 } from 'internal-test-helpers';
 
 import { set, get, setProperties } from '@ember/-internals/metal';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 0781841d78c..8de22d80cf1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -1,7 +1,8 @@
 import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
 
 import { get, set, notifyPropertyChange, computed, on } from '@ember/-internals/metal';
-import { A as emberA, ArrayProxy, RSVP } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import { ArrayProxy, RSVP } from '@ember/-internals/runtime';
 
 import { Component, htmlSafe } from '../../utils/helpers';
 import {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
index 7834913b13f..a2a55bad548 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { set } from '@ember/-internals/metal';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index 0ad01bf2a42..1b24e2385c1 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -1,7 +1,7 @@
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
 import { get, set } from '@ember/-internals/metal';
-import { A as emberA, removeAt } from '@ember/-internals/runtime';
+import { A as emberA, removeAt } from '@ember/array';
 import ObjectProxy from '@ember/object/proxy';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 693369f57c2..2ab5cb5cdca 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -6,7 +6,8 @@ import { htmlSafe } from '@ember/-internals/glimmer';
 import { get, set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
-import { A as emberA, ArrayProxy, removeAt } from '@ember/-internals/runtime';
+import { A as emberA, removeAt } from '@ember/array';
+import { ArrayProxy } from '@ember/-internals/runtime';
 
 import { Component } from './helpers';
 
diff --git a/packages/@ember/-internals/metal/lib/array.ts b/packages/@ember/-internals/metal/lib/array.ts
index 4b9bb3e3360..6049a15fa62 100644
--- a/packages/@ember/-internals/metal/lib/array.ts
+++ b/packages/@ember/-internals/metal/lib/array.ts
@@ -1,4 +1,5 @@
-import type { Array as EmberArray, MutableArray } from '@ember/-internals/runtime';
+import type EmberArray from '@ember/array';
+import type MutableArray from '@ember/array/mutable';
 import { assert } from '@ember/debug';
 import { arrayContentDidChange, arrayContentWillChange } from './array_events';
 import { addListener, removeListener } from './events';
diff --git a/packages/@ember/-internals/metal/tests/alias_test.js b/packages/@ember/-internals/metal/tests/alias_test.js
index 9afa0d9c3e3..d2c01515e62 100644
--- a/packages/@ember/-internals/metal/tests/alias_test.js
+++ b/packages/@ember/-internals/metal/tests/alias_test.js
@@ -9,7 +9,7 @@ import {
   tagForProperty,
 } from '..';
 import EmberObject from '@ember/object';
-import { A } from '@ember/-internals/runtime';
+import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 import { valueForTag, validateTag } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index de62bba053f..94cf95c8073 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -2,20 +2,12 @@ export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
 export { default as compare } from './lib/compare';
 export { default as isEqual } from './lib/is-equal';
-export {
-  default as Array,
-  NativeArray,
-  A,
-  MutableArray,
-  removeAt,
-  uniqBy,
-  isArray,
-} from './lib/mixins/array';
 export { default as Comparable } from './lib/mixins/comparable';
+export { NativeArray } from '@ember/array';
 export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
-export { default as MutableEnumerable } from './lib/mixins/mutable_enumerable';
+export { default as MutableEnumerable } from '@ember/enumerable/mutable';
 export { default as TargetActionSupport } from './lib/mixins/target_action_support';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
diff --git a/packages/@ember/-internals/runtime/lib/mixins/array.ts b/packages/@ember/-internals/runtime/lib/mixins/array.ts
deleted file mode 100644
index 7189a913f50..00000000000
--- a/packages/@ember/-internals/runtime/lib/mixins/array.ts
+++ /dev/null
@@ -1,1971 +0,0 @@
-/**
-@module @ember/array
-*/
-import { DEBUG } from '@glimmer/env';
-import { PROXY_CONTENT } from '@ember/-internals/metal';
-import { isEmberArray, setEmberArray } from '@ember/-internals/utils';
-import {
-  get,
-  set,
-  objectAt,
-  replaceInNativeArray,
-  replace,
-  computed,
-  beginPropertyChanges,
-  endPropertyChanges,
-} from '@ember/-internals/metal';
-import Mixin from '@ember/object/mixin';
-import { assert } from '@ember/debug';
-import Enumerable from '@ember/enumerable';
-import compare from '../compare';
-import { ENV } from '@ember/-internals/environment';
-import Observable from '@ember/object/observable';
-import MutableEnumerable from './mutable_enumerable';
-import { typeOf } from '../type-of';
-import type { AnyFn } from '@ember/-internals/utils/types';
-import type { ComputedPropertyCallback } from '@ember/-internals/metal';
-
-type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
-
-const EMPTY_ARRAY = Object.freeze([] as const);
-
-const identityFunction = <T>(item: T) => item;
-
-export function uniqBy<T>(
-  array: T[] | EmberArray<T>,
-  keyOrFunc: string | ((item: T) => unknown) = identityFunction
-): T[] | EmberArray<T> {
-  assert(`first argument passed to \`uniqBy\` should be array`, isArray(array));
-
-  let ret = A<T>();
-  let seen = new Set();
-  let getter = typeof keyOrFunc === 'function' ? keyOrFunc : (item: T) => get(item, keyOrFunc);
-
-  array.forEach((item) => {
-    let val = getter(item);
-    if (!seen.has(val)) {
-      seen.add(val);
-      ret.push(item);
-    }
-  });
-
-  return ret;
-}
-
-function iter<T>(key: string): (item: T) => boolean;
-function iter<T>(key: string, value: unknown): (item: T) => boolean;
-function iter<T>(...args: [key: string] | [key: string, value: unknown]) {
-  let valueProvided = args.length === 2;
-  let [key, value] = args;
-
-  return valueProvided
-    ? (item: T) => value === get(item, key)
-    : (item: T) => Boolean(get(item, key));
-}
-
-function findIndex<T>(
-  array: EmberArray<T>,
-  predicate: (item: T, index: number, arr: EmberArray<T>) => unknown,
-  startAt: number
-): number {
-  let len = array.length;
-  for (let index = startAt; index < len; index++) {
-    // SAFETY: Because we're checking the index this value should always be set.
-    let item = objectAt(array, index)!;
-    if (predicate(item, index, array)) {
-      return index;
-    }
-  }
-  return -1;
-}
-
-function find<T, Target>(
-  array: EmberArray<T>,
-  callback: (this: Target | null, item: T, index: number, arr: EmberArray<T>) => unknown,
-  target: Target | null = null
-) {
-  let predicate = callback.bind(target);
-  let index = findIndex(array, predicate, 0);
-  return index === -1 ? undefined : objectAt(array, index);
-}
-
-function any<T, Target>(
-  array: EmberArray<T>,
-  callback: (this: Target | null, item: T, index: number, arr: EmberArray<T>) => unknown,
-  target: Target | null = null
-) {
-  let predicate = callback.bind(target);
-  return findIndex(array, predicate, 0) !== -1;
-}
-
-function every<T, Target>(
-  array: EmberArray<T>,
-  callback: (this: Target | null | void, item: T, index: number, arr: EmberArray<T>) => unknown,
-  target: Target | null = null
-) {
-  let cb = callback.bind(target);
-  let predicate = (item: T, index: number, array: EmberArray<T>) => !cb(item, index, array);
-  return findIndex(array, predicate, 0) === -1;
-}
-
-function indexOf<T>(array: EmberArray<T>, val: T, startAt = 0, withNaNCheck: boolean) {
-  let len = array.length;
-
-  if (startAt < 0) {
-    startAt += len;
-  }
-
-  // SameValueZero comparison (NaN !== NaN)
-  let predicate =
-    withNaNCheck && val !== val ? (item: T) => item !== item : (item: T) => item === val;
-  return findIndex(array, predicate, startAt);
-}
-
-export function removeAt<T, A extends T[] | MutableArray<T>>(
-  array: A,
-  index: number,
-  len?: number
-): A {
-  assert(`\`removeAt\` index provided is out of range`, index > -1 && index < array.length);
-  replace(array, index, len ?? 1, EMPTY_ARRAY);
-  return array;
-}
-
-function insertAt<T>(array: MutableArray<T>, index: number, item: T) {
-  assert(`\`insertAt\` index provided is out of range`, index > -1 && index <= array.length);
-  replace(array, index, 0, [item]);
-  return item;
-}
-
-/**
-  Returns true if the passed object is an array or Array-like.
-
-  Objects are considered Array-like if any of the following are true:
-
-    - the object is a native Array
-    - the object has an objectAt property
-    - the object is an Object, and has a length property
-
-  Unlike `typeOf` this method returns true even if the passed object is
-  not formally an array but appears to be array-like (i.e. implements `Array`)
-
-  ```javascript
-  import { isArray } from '@ember/array';
-  import ArrayProxy from '@ember/array/proxy';
-
-  isArray();                                      // false
-  isArray([]);                                    // true
-  isArray(ArrayProxy.create({ content: [] }));    // true
-  ```
-
-  @method isArray
-  @static
-  @for @ember/array
-  @param {Object} obj The object to test
-  @return {Boolean} true if the passed object is an array or Array-like
-  @public
-*/
-export function isArray(obj: unknown): obj is ArrayLike<unknown> | EmberArray<unknown> {
-  if (DEBUG && typeof obj === 'object' && obj !== null) {
-    // SAFETY: Property read checks are safe if it's an object
-    let possibleProxyContent = (obj as any)[PROXY_CONTENT];
-    if (possibleProxyContent !== undefined) {
-      obj = possibleProxyContent;
-    }
-  }
-
-  // SAFETY: Property read checks are safe if it's an object
-  if (!obj || (obj as any).setInterval) {
-    return false;
-  }
-
-  if (Array.isArray(obj) || EmberArray.detect(obj)) {
-    return true;
-  }
-
-  let type = typeOf(obj);
-  if ('array' === type) {
-    return true;
-  }
-
-  // SAFETY: Property read checks are safe if it's an object
-  let length = (obj as any).length;
-  if (typeof length === 'number' && length === length && 'object' === type) {
-    return true;
-  }
-
-  return false;
-}
-
-/*
-  This allows us to define computed properties that are not enumerable.
-  The primary reason this is important is that when `NativeArray` is
-  applied to `Array.prototype` we need to ensure that we do not add _any_
-  new enumerable properties.
-*/
-function nonEnumerableComputed(callback: ComputedPropertyCallback) {
-  let property = computed(callback);
-  property.enumerable = false;
-  return property;
-}
-
-function mapBy<T>(this: EmberArray<T>, key: string) {
-  return this.map((next) => get(next, key));
-}
-
-// ..........................................................
-// ARRAY
-//
-/**
-  This mixin implements Observer-friendly Array-like behavior. It is not a
-  concrete implementation, but it can be used up by other classes that want
-  to appear like arrays.
-
-  For example, ArrayProxy is a concrete class that can be instantiated to
-  implement array-like behavior. This class uses the Array Mixin by way of
-  the MutableArray mixin, which allows observable changes to be made to the
-  underlying array.
-
-  This mixin defines methods specifically for collections that provide
-  index-ordered access to their contents. When you are designing code that
-  needs to accept any kind of Array-like object, you should use these methods
-  instead of Array primitives because these will properly notify observers of
-  changes to the array.
-
-  Although these methods are efficient, they do add a layer of indirection to
-  your application so it is a good idea to use them only when you need the
-  flexibility of using both true JavaScript arrays and "virtual" arrays such
-  as controllers and collections.
-
-  You can use the methods defined in this module to access and modify array
-  contents in an observable-friendly way. You can also be notified whenever
-  the membership of an array changes by using `.observes('myArray.[]')`.
-
-  To support `EmberArray` in your own class, you must override two
-  primitives to use it: `length()` and `objectAt()`.
-
-  @class EmberArray
-  @uses Enumerable
-  @since Ember 0.9.0
-  @public
-*/
-interface EmberArray<T> extends Enumerable {
-  length: number;
-  objectAt(idx: number): T | undefined;
-  objectsAt(indexes: number[]): Array<T | undefined>;
-  firstObject: T | undefined;
-  lastObject: T | undefined;
-  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
-  indexOf(object: T, startAt?: number): number;
-  lastIndexOf(object: T, startAt?: number): number;
-  forEach<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => void,
-    target?: Target
-  ): this;
-  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
-  setEach<K extends string>(key: K, value: Value<T, K>): this;
-  map<U, Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => U,
-    target?: Target
-  ): NativeArray<U>;
-  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
-  filter<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): NativeArray<T>;
-  reject<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): NativeArray<T>;
-  filterBy(key: string, value?: unknown): NativeArray<T>;
-  rejectBy(key: string, value?: unknown): NativeArray<T>;
-  find<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): T | undefined;
-  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
-  every<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): boolean;
-  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
-  any<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): boolean;
-  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
-  reduce<V>(
-    callback: (summation: V, current: T, index: number, arr: this) => V,
-    initialValue?: V
-  ): V;
-  invoke<K extends string>(
-    methodName: K,
-    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
-  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
-  toArray(): T[];
-  compact(): NativeArray<Exclude<T, null>>;
-  includes(object: T, startAt?: number): boolean;
-  sortBy(key: string): T[];
-  uniq(): NativeArray<T>;
-  uniqBy(key: string): NativeArray<T>;
-  without(value: T): NativeArray<T>;
-}
-const EmberArray = Mixin.create(Enumerable, {
-  init() {
-    this._super(...arguments);
-    setEmberArray(this);
-  },
-
-  /**
-    __Required.__ You must implement this method to apply this mixin.
-
-    Your array must support the `length` property. Your replace methods should
-    set this property whenever it changes.
-
-    @property {Number} length
-    @public
-  */
-
-  /**
-    Returns the object at the given `index`. If the given `index` is negative
-    or is greater or equal than the array length, returns `undefined`.
-
-    This is one of the primitives you must implement to support `EmberArray`.
-    If your object supports retrieving the value of an array item using `get()`
-    (i.e. `myArray.get(0)`), then you do not need to implement this method
-    yourself.
-
-    ```javascript
-    let arr = ['a', 'b', 'c', 'd'];
-
-    arr.objectAt(0);   // 'a'
-    arr.objectAt(3);   // 'd'
-    arr.objectAt(-1);  // undefined
-    arr.objectAt(4);   // undefined
-    arr.objectAt(5);   // undefined
-    ```
-
-    @method objectAt
-    @param {Number} idx The index of the item to return.
-    @return {*} item at index or undefined
-    @public
-  */
-
-  /**
-    This returns the objects at the specified indexes, using `objectAt`.
-
-    ```javascript
-    let arr = ['a', 'b', 'c', 'd'];
-
-    arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
-    arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
-    ```
-
-    @method objectsAt
-    @param {Array} indexes An array of indexes of items to return.
-    @return {Array}
-    @public
-   */
-  objectsAt(indexes: number[]) {
-    return indexes.map((idx) => objectAt(this, idx));
-  },
-
-  /**
-    This is the handler for the special array content property. If you get
-    this property, it will return this. If you set this property to a new
-    array, it will replace the current content.
-
-    ```javascript
-    let peopleToMoon = ['Armstrong', 'Aldrin'];
-
-    peopleToMoon.get('[]'); // ['Armstrong', 'Aldrin']
-
-    peopleToMoon.set('[]', ['Collins']); // ['Collins']
-    peopleToMoon.get('[]'); // ['Collins']
-    ```
-
-    @property []
-    @return this
-    @public
-  */
-  '[]': nonEnumerableComputed({
-    get() {
-      return this;
-    },
-    set(_key, value) {
-      this.replace(0, this.length, value);
-      return this;
-    },
-  }),
-
-  /**
-    The first object in the array, or `undefined` if the array is empty.
-
-    ```javascript
-    let vowels = ['a', 'e', 'i', 'o', 'u'];
-    vowels.firstObject; // 'a'
-
-    vowels.shiftObject();
-    vowels.firstObject; // 'e'
-
-    vowels.reverseObjects();
-    vowels.firstObject; // 'u'
-
-    vowels.clear();
-    vowels.firstObject; // undefined
-    ```
-
-    @property firstObject
-    @return {Object | undefined} The first object in the array
-    @public
-  */
-  firstObject: nonEnumerableComputed(function () {
-    return objectAt(this, 0);
-  }).readOnly(),
-
-  /**
-    The last object in the array, or `undefined` if the array is empty.
-
-    @property lastObject
-    @return {Object | undefined} The last object in the array
-    @public
-  */
-  lastObject: nonEnumerableComputed(function () {
-    return objectAt(this, this.length - 1);
-  }).readOnly(),
-
-  // Add any extra methods to EmberArray that are native to the built-in Array.
-  /**
-    Returns a new array that is a slice of the receiver. This implementation
-    uses the observable array methods to retrieve the objects for the new
-    slice.
-
-    ```javascript
-    let arr = ['red', 'green', 'blue'];
-
-    arr.slice(0);       // ['red', 'green', 'blue']
-    arr.slice(0, 2);    // ['red', 'green']
-    arr.slice(1, 100);  // ['green', 'blue']
-    ```
-
-    @method slice
-    @param {Number} beginIndex (Optional) index to begin slicing from.
-    @param {Number} endIndex (Optional) index to end the slice at (but not included).
-    @return {Array} New array with specified slice
-    @public
-  */
-  slice(beginIndex = 0, endIndex?: number) {
-    let ret = A();
-    let length = this.length;
-
-    if (beginIndex < 0) {
-      beginIndex = length + beginIndex;
-    }
-
-    let validatedEndIndex: number;
-    if (endIndex === undefined || endIndex > length) {
-      validatedEndIndex = length;
-    } else if (endIndex < 0) {
-      validatedEndIndex = length + endIndex;
-    } else {
-      validatedEndIndex = endIndex;
-    }
-
-    while (beginIndex < validatedEndIndex) {
-      ret[ret.length] = objectAt(this, beginIndex++);
-    }
-
-    return ret;
-  },
-
-  /**
-    Used to determine the passed object's first occurrence in the array.
-    Returns the index if found, -1 if no match is found.
-
-    The optional `startAt` argument can be used to pass a starting
-    index to search from, effectively slicing the searchable portion
-    of the array. If it's negative it will add the array length to
-    the startAt value passed in as the index to search from. If less
-    than or equal to `-1 * array.length` the entire array is searched.
-
-    ```javascript
-    let arr = ['a', 'b', 'c', 'd', 'a'];
-
-    arr.indexOf('a');       //  0
-    arr.indexOf('z');       // -1
-    arr.indexOf('a', 2);    //  4
-    arr.indexOf('a', -1);   //  4, equivalent to indexOf('a', 4)
-    arr.indexOf('a', -100); //  0, searches entire array
-    arr.indexOf('b', 3);    // -1
-    arr.indexOf('a', 100);  // -1
-
-    let people = [{ name: 'Zoey' }, { name: 'Bob' }]
-    let newPerson = { name: 'Tom' };
-    people = [newPerson, ...people, newPerson];
-
-    people.indexOf(newPerson);     //  0
-    people.indexOf(newPerson, 1);  //  3
-    people.indexOf(newPerson, -4); //  0
-    people.indexOf(newPerson, 10); // -1
-    ```
-
-    @method indexOf
-    @param {Object} object the item to search for
-    @param {Number} startAt optional starting location to search, default 0
-    @return {Number} index or -1 if not found
-    @public
-  */
-
-  indexOf<T>(object: T, startAt?: number) {
-    return indexOf(this, object, startAt, false);
-  },
-
-  /**
-    Returns the index of the given `object`'s last occurrence.
-
-    - If no `startAt` argument is given, the search starts from
-    the last position.
-    - If it's greater than or equal to the length of the array,
-    the search starts from the last position.
-    - If it's negative, it is taken as the offset from the end
-    of the array i.e. `startAt + array.length`.
-    - If it's any other positive number, will search backwards
-    from that index of the array.
-
-    Returns -1 if no match is found.
-
-    ```javascript
-    let arr = ['a', 'b', 'c', 'd', 'a'];
-
-    arr.lastIndexOf('a');       //  4
-    arr.lastIndexOf('z');       // -1
-    arr.lastIndexOf('a', 2);    //  0
-    arr.lastIndexOf('a', -1);   //  4
-    arr.lastIndexOf('a', -3);   //  0
-    arr.lastIndexOf('b', 3);    //  1
-    arr.lastIndexOf('a', 100);  //  4
-    ```
-
-    @method lastIndexOf
-    @param {Object} object the item to search for
-    @param {Number} startAt optional starting location to search from
-    backwards, defaults to `(array.length - 1)`
-    @return {Number} The last index of the `object` in the array or -1
-    if not found
-    @public
-  */
-  lastIndexOf<T>(object: T, startAt?: number) {
-    let len = this.length;
-
-    if (startAt === undefined || startAt >= len) {
-      startAt = len - 1;
-    }
-
-    if (startAt < 0) {
-      startAt += len;
-    }
-
-    for (let idx = startAt; idx >= 0; idx--) {
-      if (objectAt(this, idx) === object) {
-        return idx;
-      }
-    }
-
-    return -1;
-  },
-
-  /**
-    Iterates through the array, calling the passed function on each
-    item. This method corresponds to the `forEach()` method defined in
-    JavaScript 1.6.
-
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. This is a good way
-    to give your iterator function access to the current object.
-
-    Example Usage:
-
-    ```javascript
-    let foods = [
-      { name: 'apple', eaten: false },
-      { name: 'banana', eaten: false },
-      { name: 'carrot', eaten: false }
-    ];
-
-    foods.forEach((food) => food.eaten = true);
-
-    let output = '';
-    foods.forEach((item, index, array) =>
-      output += `${index + 1}/${array.length} ${item.name}\n`;
-    );
-    console.log(output);
-    // 1/3 apple
-    // 2/3 banana
-    // 3/3 carrot
-    ```
-
-    @method forEach
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Object} receiver
-    @public
-  */
-  forEach(callback: <T>(item: T, index: number, arr: EmberArray<T>) => void, target = null) {
-    assert('`forEach` expects a function as first argument.', typeof callback === 'function');
-
-    let length = this.length;
-
-    for (let index = 0; index < length; index++) {
-      let item = this.objectAt(index);
-      callback.call(target, item, index, this);
-    }
-
-    return this;
-  },
-
-  /**
-    Alias for `mapBy`.
-
-    Returns the value of the named
-    property on all items in the enumeration.
-
-    ```javascript
-    let people = [{name: 'Joe'}, {name: 'Matt'}];
-
-    people.getEach('name');
-    // ['Joe', 'Matt'];
-
-    people.getEach('nonexistentProperty');
-    // [undefined, undefined];
-    ```
-
-    @method getEach
-    @param {String} key name of the property
-    @return {Array} The mapped array.
-    @public
-  */
-  getEach: mapBy,
-
-  /**
-    Sets the value on the named property for each member. This is more
-    ergonomic than using other methods defined on this helper. If the object
-    implements Observable, the value will be changed to `set(),` otherwise
-    it will be set directly. `null` objects are skipped.
-
-    ```javascript
-    let people = [{name: 'Joe'}, {name: 'Matt'}];
-
-    people.setEach('zipCode', '10011');
-    // [{name: 'Joe', zipCode: '10011'}, {name: 'Matt', zipCode: '10011'}];
-    ```
-
-    @method setEach
-    @param {String} key The key to set
-    @param {Object} value The object to set
-    @return {Object} receiver
-    @public
-  */
-  setEach(key: string, value: unknown) {
-    return this.forEach((item: object) => set(item, key, value));
-  },
-
-  /**
-    Maps all of the items in the enumeration to another value, returning
-    a new array. This method corresponds to `map()` defined in JavaScript 1.6.
-
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-
-    ```javascript
-    function(item, index, array);
-    let arr = [1, 2, 3, 4, 5, 6];
-
-    arr.map(element => element * element);
-    // [1, 4, 9, 16, 25, 36];
-
-    arr.map((element, index) => element + index);
-    // [1, 3, 5, 7, 9, 11];
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    It should return the mapped value.
-
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. This is a good way
-    to give your iterator function access to the current object.
-
-    @method map
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Array} The mapped array.
-    @public
-  */
-  map<T>(
-    this: EmberArray<T>,
-    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
-    target = null
-  ) {
-    assert('`map` expects a function as first argument.', typeof callback === 'function');
-
-    let ret = A();
-
-    this.forEach((x, idx, i) => (ret[idx] = callback.call(target, x, idx, i)));
-
-    return ret;
-  },
-
-  /**
-    Similar to map, this specialized function returns the value of the named
-    property on all items in the enumeration.
-
-    ```javascript
-    let people = [{name: 'Joe'}, {name: 'Matt'}];
-
-    people.mapBy('name');
-    // ['Joe', 'Matt'];
-
-    people.mapBy('unknownProperty');
-    // [undefined, undefined];
-    ```
-
-    @method mapBy
-    @param {String} key name of the property
-    @return {Array} The mapped array.
-    @public
-  */
-  mapBy,
-
-  /**
-    Returns a new array with all of the items in the enumeration that the provided
-    callback function returns true for. This method corresponds to [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
-
-    The callback method should have the following signature:
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    All parameters are optional. The function should return `true` to include the item
-    in the results, and `false` otherwise.
-
-    Example:
-
-    ```javascript
-    function isAdult(person) {
-      return person.age > 18;
-    };
-
-    let people = Ember.A([{ name: 'John', age: 14 }, { name: 'Joan', age: 45 }]);
-
-    people.filter(isAdult); // returns [{ name: 'Joan', age: 45 }];
-    ```
-
-    Note that in addition to a callback, you can pass an optional target object
-    that will be set as `this` on the context. This is a good way to give your
-    iterator function access to the current object. For example:
-
-    ```javascript
-    function isAdultAndEngineer(person) {
-      return person.age > 18 && this.engineering;
-    }
-
-    class AdultsCollection {
-      engineering = false;
-
-      constructor(opts = {}) {
-        super(...arguments);
-
-        this.engineering = opts.engineering;
-        this.people = Ember.A([{ name: 'John', age: 14 }, { name: 'Joan', age: 45 }]);
-      }
-    }
-
-    let collection = new AdultsCollection({ engineering: true });
-    collection.people.filter(isAdultAndEngineer, { target: collection });
-    ```
-
-    @method filter
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Array} A filtered array.
-    @public
-  */
-  filter<T>(
-    this: EmberArray<T>,
-    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
-    target = null
-  ) {
-    assert('`filter` expects a function as first argument.', typeof callback === 'function');
-
-    let ret = A();
-
-    this.forEach((x, idx, i) => {
-      if (callback.call(target, x, idx, i)) {
-        ret.push(x);
-      }
-    });
-
-    return ret;
-  },
-
-  /**
-    Returns an array with all of the items in the enumeration where the passed
-    function returns false. This method is the inverse of filter().
-
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - *item* is the current item in the iteration.
-    - *index* is the current index in the iteration
-    - *array* is the array itself.
-
-    It should return a falsey value to include the item in the results.
-
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as "this" on the context. This is a good way
-    to give your iterator function access to the current object.
-
-    Example Usage:
-
-    ```javascript
-    const food = [
-      { food: 'apple', isFruit: true },
-      { food: 'bread', isFruit: false },
-      { food: 'banana', isFruit: true }
-    ];
-    const nonFruits = food.reject(function(thing) {
-      return thing.isFruit;
-    }); // [{food: 'bread', isFruit: false}]
-    ```
-
-    @method reject
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Array} A rejected array.
-    @public
-  */
-  reject<T>(
-    this: EmberArray<T>,
-    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
-    target = null
-  ) {
-    assert('`reject` expects a function as first argument.', typeof callback === 'function');
-    return this.filter(function () {
-      // @ts-expect-error TS doesn't like us using arguments like this
-      return !callback.apply(target, arguments);
-    });
-  },
-
-  /**
-    Filters the array by the property and an optional value. If a value is given, it returns
-    the items that have said value for the property. If not, it returns all the items that
-    have a truthy value for the property.
-
-    Example Usage:
-
-    ```javascript
-    let things = Ember.A([{ food: 'apple', isFruit: true }, { food: 'beans', isFruit: false }]);
-
-    things.filterBy('food', 'beans'); // [{ food: 'beans', isFruit: false }]
-    things.filterBy('isFruit'); // [{ food: 'apple', isFruit: true }]
-    ```
-
-    @method filterBy
-    @param {String} key the property to test
-    @param {*} [value] optional value to test against.
-    @return {Array} filtered array
-    @public
-  */
-  filterBy() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    return this.filter(iter(...arguments));
-  },
-
-  /**
-    Returns an array with the items that do not have truthy values for the provided key.
-    You can pass an optional second argument with a target value to reject for the key.
-    Otherwise this will reject objects where the provided property evaluates to false.
-
-    Example Usage:
-
-    ```javascript
-      let food = [
-        { name: "apple", isFruit: true },
-        { name: "carrot", isFruit: false },
-        { name: "bread", isFruit: false },
-      ];
-      food.rejectBy('isFruit'); // [{ name: "carrot", isFruit: false }, { name: "bread", isFruit: false }]
-      food.rejectBy('name', 'carrot'); // [{ name: "apple", isFruit: true }}, { name: "bread", isFruit: false }]
-    ```
-
-    @method rejectBy
-    @param {String} key the property to test
-    @param {*} [value] optional value to test against.
-    @return {Array} rejected array
-    @public
-  */
-  rejectBy() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    return this.reject(iter(...arguments));
-  },
-
-  /**
-    Returns the first item in the array for which the callback returns true.
-    This method is similar to the `find()` method defined in ECMAScript 2015.
-
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    It should return the `true` to include the item in the results, `false`
-    otherwise.
-
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. This is a good way
-    to give your iterator function access to the current object.
-
-    Example Usage:
-
-    ```javascript
-    let users = [
-      { id: 1, name: 'Yehuda' },
-      { id: 2, name: 'Tom' },
-      { id: 3, name: 'Melanie' },
-      { id: 4, name: 'Leah' }
-    ];
-
-    users.find((user) => user.name == 'Tom'); // [{ id: 2, name: 'Tom' }]
-    users.find(({ id }) => id == 3); // [{ id: 3, name: 'Melanie' }]
-    ```
-
-    @method find
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Object} Found item or `undefined`.
-    @public
-  */
-  find(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
-    assert('`find` expects a function as first argument.', typeof callback === 'function');
-    return find(this, callback, target);
-  },
-
-  /**
-    Returns the first item with a property matching the passed value. You
-    can pass an optional second argument with the target value. Otherwise
-    this will match any property that evaluates to `true`.
-
-    This method works much like the more generic `find()` method.
-
-    Usage Example:
-
-    ```javascript
-    let users = [
-      { id: 1, name: 'Yehuda', isTom: false },
-      { id: 2, name: 'Tom', isTom: true },
-      { id: 3, name: 'Melanie', isTom: false },
-      { id: 4, name: 'Leah', isTom: false }
-    ];
-
-    users.findBy('id', 4); // { id: 4, name: 'Leah', isTom: false }
-    users.findBy('name', 'Melanie'); // { id: 3, name: 'Melanie', isTom: false }
-    users.findBy('isTom'); // { id: 2, name: 'Tom', isTom: true }
-    ```
-
-    @method findBy
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against.
-    @return {Object} found item or `undefined`
-    @public
-  */
-  findBy() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    let callback = iter(...arguments);
-    return find(this, callback);
-  },
-
-  /**
-    Returns `true` if the passed function returns true for every item in the
-    enumeration. This corresponds with the `Array.prototype.every()` method defined in ES5.
-
-    The callback method should have the following signature:
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    All params are optional. The method should return `true` or `false`.
-
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. This is a good way
-    to give your iterator function access to the current object.
-
-    Usage example:
-
-    ```javascript
-    function isAdult(person) {
-      return person.age > 18;
-    };
-
-    const people = Ember.A([{ name: 'John', age: 24 }, { name: 'Joan', age: 45 }]);
-    const areAllAdults = people.every(isAdult);
-    ```
-
-    @method every
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Boolean}
-    @public
-  */
-  every(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
-    assert('`every` expects a function as first argument.', typeof callback === 'function');
-    return every(this, callback, target);
-  },
-
-  /**
-    Returns `true` if the passed property resolves to the value of the second
-    argument for all items in the array. This method is often simpler/faster
-    than using a callback.
-
-    Note that like the native `Array.every`, `isEvery` will return true when called
-    on any empty array.
-    ```javascript
-    class Language {
-      constructor(name, isProgrammingLanguage) {
-        this.name = name;
-        this.programmingLanguage = isProgrammingLanguage;
-      }
-    }
-
-    const compiledLanguages = [
-      new Language('Java', true),
-      new Language('Go', true),
-      new Language('Rust', true)
-    ]
-
-    const languagesKnownByMe = [
-      new Language('Javascript', true),
-      new Language('English', false),
-      new Language('Ruby', true)
-    ]
-
-    compiledLanguages.isEvery('programmingLanguage'); // true
-    languagesKnownByMe.isEvery('programmingLanguage'); // false
-    ```
-
-    @method isEvery
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against. Defaults to `true`
-    @return {Boolean}
-    @since 1.3.0
-    @public
-  */
-  isEvery() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    let callback = iter(...arguments);
-    return every(this, callback);
-  },
-
-  /**
-    The any() method executes the callback function once for each element
-    present in the array until it finds the one where callback returns a truthy
-    value (i.e. `true`). If such an element is found, any() immediately returns
-    true. Otherwise, any() returns false.
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array object itself.
-
-    Note that in addition to a callback, you can also pass an optional target
-    object that will be set as `this` on the context. It can be a good way
-    to give your iterator function access to an object in cases where an ES6
-    arrow function would not be appropriate.
-
-    Usage Example:
-
-    ```javascript
-    let includesManager = people.any(this.findPersonInManagersList, this);
-
-    let includesStockHolder = people.any(person => {
-      return this.findPersonInStockHoldersList(person)
-    });
-
-    if (includesManager || includesStockHolder) {
-      Paychecks.addBiggerBonus();
-    }
-    ```
-
-    @method any
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Boolean} `true` if the passed function returns `true` for any item
-    @public
-  */
-  any(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
-    assert('`any` expects a function as first argument.', typeof callback === 'function');
-    return any(this, callback, target);
-  },
-
-  /**
-    Returns `true` if the passed property resolves to the value of the second
-    argument for any item in the array. This method is often simpler/faster
-    than using a callback.
-
-    Example usage:
-
-    ```javascript
-    const food = [
-      { food: 'apple', isFruit: true },
-      { food: 'bread', isFruit: false },
-      { food: 'banana', isFruit: true }
-    ];
-
-    food.isAny('isFruit'); // true
-    ```
-
-    @method isAny
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against. Defaults to `true`
-    @return {Boolean}
-    @since 1.3.0
-    @public
-  */
-  isAny() {
-    // @ts-expect-error TS doesn't like us using arguments like this
-    let callback = iter(...arguments);
-    return any(this, callback);
-  },
-
-  /**
-    This will combine the values of the array into a single value. It
-    is a useful way to collect a summary value from an array. This
-    corresponds to the `reduce()` method defined in JavaScript 1.8.
-
-    The callback method you provide should have the following signature (all
-    parameters are optional):
-
-    ```javascript
-    function(previousValue, item, index, array);
-    ```
-
-    - `previousValue` is the value returned by the last call to the iterator.
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    Return the new cumulative value.
-
-    In addition to the callback you can also pass an `initialValue`. An error
-    will be raised if you do not pass an initial value and the enumerator is
-    empty.
-
-    Note that unlike the other methods, this method does not allow you to
-    pass a target object to set as this for the callback. It's part of the
-    spec. Sorry.
-
-    Example Usage:
-
-    ```javascript
-      let numbers = [1, 2, 3, 4, 5];
-
-      numbers.reduce(function(summation, current) {
-        return summation + current;
-      }); // 15 (1 + 2 + 3 + 4 + 5)
-
-      numbers.reduce(function(summation, current) {
-        return summation + current;
-      }, -15); // 0 (-15 + 1 + 2 + 3 + 4 + 5)
-
-
-      let binaryValues = [true, false, false];
-
-      binaryValues.reduce(function(truthValue, current) {
-        return truthValue && current;
-      }); // false (true && false && false)
-    ```
-
-    @method reduce
-    @param {Function} callback The callback to execute
-    @param {Object} initialValue Initial value for the reduce
-    @return {Object} The reduced value.
-    @public
-  */
-  // FIXME: When called without initialValue, behavior does not match native behavior
-  reduce<T, V>(
-    this: EmberArray<T>,
-    callback: (summation: V, current: T, index: number, arr: EmberArray<T>) => V,
-    initialValue: V
-  ) {
-    assert('`reduce` expects a function as first argument.', typeof callback === 'function');
-
-    let ret = initialValue;
-
-    this.forEach(function (item, i) {
-      ret = callback(ret, item, i, this);
-    }, this);
-
-    return ret;
-  },
-
-  /**
-    Invokes the named method on every object in the receiver that
-    implements it. This method corresponds to the implementation in
-    Prototype 1.6.
-
-    ```javascript
-    class Person {
-      name = null;
-
-      constructor(name) {
-        this.name = name;
-      }
-
-      greet(prefix='Hello') {
-        return `${prefix} ${this.name}`;
-      }
-    }
-
-    let people = [new Person('Joe'), new Person('Matt')];
-
-    people.invoke('greet'); // ['Hello Joe', 'Hello Matt']
-    people.invoke('greet', 'Bonjour'); // ['Bonjour Joe', 'Bonjour Matt']
-    ```
-
-    @method invoke
-    @param {String} methodName the name of the method
-    @param {Object...} args optional arguments to pass as well.
-    @return {Array} return values from calling invoke.
-    @public
-  */
-  invoke<T>(this: EmberArray<T>, methodName: string, ...args: unknown[]) {
-    let ret = A();
-
-    // SAFETY: This is not entirely safe and the code will not work with Ember proxies
-    this.forEach((item: T) => ret.push((item as any)[methodName]?.(...args)));
-
-    return ret;
-  },
-
-  /**
-    Simply converts the object into a genuine array. The order is not
-    guaranteed. Corresponds to the method implemented by Prototype.
-
-    @method toArray
-    @return {Array} the object as an array.
-    @public
-  */
-  toArray<T>(this: EmberArray<T>) {
-    return this.map((item: T) => item);
-  },
-
-  /**
-    Returns a copy of the array with all `null` and `undefined` elements removed.
-
-    ```javascript
-    let arr = ['a', null, 'c', undefined];
-    arr.compact();  // ['a', 'c']
-    ```
-
-    @method compact
-    @return {Array} the array without null and undefined elements.
-    @public
-  */
-  compact<T>(this: EmberArray<T>) {
-    return this.filter((value: T) => value != null);
-  },
-
-  /**
-    Used to determine if the array contains the passed object.
-    Returns `true` if found, `false` otherwise.
-
-    The optional `startAt` argument can be used to pass a starting
-    index to search from, effectively slicing the searchable portion
-    of the array. If it's negative it will add the array length to
-    the startAt value passed in as the index to search from. If less
-    than or equal to `-1 * array.length` the entire array is searched.
-
-    This method has the same behavior of JavaScript's [Array.includes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
-
-    ```javascript
-    [1, 2, 3].includes(2);     // true
-    [1, 2, 3].includes(4);     // false
-    [1, 2, 3].includes(3, 2);  // true
-    [1, 2, 3].includes(3, 3);  // false
-    [1, 2, 3].includes(3, -1); // true
-    [1, 2, 3].includes(1, -1); // false
-    [1, 2, 3].includes(1, -4); // true
-    [1, 2, NaN].includes(NaN); // true
-    ```
-
-    @method includes
-    @param {Object} object The object to search for.
-    @param {Number} startAt optional starting location to search, default 0
-    @return {Boolean} `true` if object is found in the array.
-    @public
-  */
-  includes<T>(this: EmberArray<T>, object: T, startAt?: number) {
-    return indexOf(this, object, startAt, true) !== -1;
-  },
-
-  /**
-    Sorts the array by the keys specified in the argument.
-
-    You may provide multiple arguments to sort by multiple properties.
-
-    ```javascript
-   let colors = [
-     { name: 'red', weight: 500 },
-     { name: 'green', weight: 600 },
-     { name: 'blue', weight: 500 }
-    ];
-
-   colors.sortBy('name');
-   // [{name: 'blue', weight: 500}, {name: 'green', weight: 600}, {name: 'red', weight: 500}]
-
-   colors.sortBy('weight', 'name');
-   // [{name: 'blue', weight: 500}, {name: 'red', weight: 500}, {name: 'green', weight: 600}]
-   ```
-
-    @method sortBy
-    @param {String} property name(s) to sort on
-    @return {Array} The sorted array.
-    @since 1.2.0
-    @public
-  */
-  sortBy<T>(this: EmberArray<T>) {
-    let sortKeys = arguments;
-
-    return this.toArray().sort((a: T, b: T) => {
-      for (let i = 0; i < sortKeys.length; i++) {
-        let key = sortKeys[i];
-        let propA = get(a, key);
-        let propB = get(b, key);
-        // return 1 or -1 else continue to the next sortKey
-        let compareValue = compare(propA, propB);
-
-        if (compareValue) {
-          return compareValue;
-        }
-      }
-      return 0;
-    });
-  },
-
-  /**
-    Returns a new array that contains only unique values. The default
-    implementation returns an array regardless of the receiver type.
-
-    ```javascript
-    let arr = ['a', 'a', 'b', 'b'];
-    arr.uniq();  // ['a', 'b']
-    ```
-
-    This only works on primitive data types, e.g. Strings, Numbers, etc.
-
-    @method uniq
-    @return {EmberArray}
-    @public
-  */
-  uniq() {
-    return uniqBy(this);
-  },
-
-  /**
-    Returns a new array that contains only items containing a unique property value.
-    The default implementation returns an array regardless of the receiver type.
-
-    ```javascript
-    let arr = [{ value: 'a' }, { value: 'a' }, { value: 'b' }, { value: 'b' }];
-    arr.uniqBy('value');  // [{ value: 'a' }, { value: 'b' }]
-
-    let arr = [2.2, 2.1, 3.2, 3.3];
-    arr.uniqBy(Math.floor);  // [2.2, 3.2];
-    ```
-
-    @method uniqBy
-    @param {String,Function} key
-    @return {EmberArray}
-    @public
-  */
-
-  uniqBy(key: string) {
-    return uniqBy(this, key);
-  },
-
-  /**
-    Returns a new array that excludes the passed value. The default
-    implementation returns an array regardless of the receiver type.
-    If the receiver does not contain the value it returns the original array.
-
-    ```javascript
-    let arr = ['a', 'b', 'a', 'c'];
-    arr.without('a');  // ['b', 'c']
-    ```
-
-    @method without
-    @param {Object} value
-    @return {EmberArray}
-    @public
-  */
-  without<T>(this: EmberArray<T>, value: T) {
-    if (!this.includes(value)) {
-      return this; // nothing to do
-    }
-
-    // SameValueZero comparison (NaN !== NaN)
-    let predicate = value === value ? (item: T) => item !== value : (item: T) => item === item;
-    return this.filter(predicate);
-  },
-});
-
-/**
-  This mixin defines the API for modifying array-like objects. These methods
-  can be applied only to a collection that keeps its items in an ordered set.
-  It builds upon the Array mixin and adds methods to modify the array.
-  One concrete implementations of this class include ArrayProxy.
-
-  It is important to use the methods in this class to modify arrays so that
-  changes are observable. This allows the binding system in Ember to function
-  correctly.
-
-
-  Note that an Array can change even if it does not implement this mixin.
-  For example, one might implement a SparseArray that cannot be directly
-  modified, but if its underlying enumerable changes, it will change also.
-
-  @class MutableArray
-  @uses EmberArray
-  @uses MutableEnumerable
-  @public
-*/
-interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
-  replace(idx: number, amt: number, objects?: readonly T[]): void;
-  clear(): this;
-  insertAt(idx: number, object: T): this;
-  removeAt(start: number, len?: number): this;
-  pushObject(obj: T): this;
-  pushObjects(objects: T[]): this;
-  popObject(): T | undefined;
-  shiftObject(): T | null | undefined;
-  unshiftObject(object: T): this;
-  unshiftObjects(objects: T[]): this;
-  reverseObjects(): this;
-  setObjects(object: T[]): this;
-  removeObject(object: T): this;
-  removeObjects(objects: T[]): this;
-  addObject(obj: T): this;
-  addObjects(objects: T[]): this;
-}
-const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
-  /**
-    __Required.__ You must implement this method to apply this mixin.
-
-    This is one of the primitives you must implement to support `Array`.
-    You should replace amt objects started at idx with the objects in the
-    passed array.
-
-    Note that this method is expected to validate the type(s) of objects that it expects.
-
-    @method replace
-    @param {Number} idx Starting index in the array to replace. If
-      idx >= length, then append to the end of the array.
-    @param {Number} amt Number of elements that should be removed from
-      the array, starting at *idx*.
-    @param {EmberArray} [objects] An optional array of zero or more objects that should be
-      inserted into the array at *idx*
-    @public
-  */
-
-  /**
-    Remove all elements from the array. This is useful if you
-    want to reuse an existing array without having to recreate it.
-
-    ```javascript
-    let colors = ['red', 'green', 'blue'];
-
-    colors.length;  // 3
-    colors.clear(); // []
-    colors.length;  // 0
-    ```
-
-    @method clear
-    @return {Array} An empty Array.
-    @public
-  */
-  clear() {
-    let len = this.length;
-    if (len === 0) {
-      return this;
-    }
-
-    this.replace(0, len, EMPTY_ARRAY);
-    return this;
-  },
-
-  /**
-    This will use the primitive `replace()` method to insert an object at the
-    specified index.
-
-    ```javascript
-    let colors = ['red', 'green', 'blue'];
-
-    colors.insertAt(2, 'yellow');  // ['red', 'green', 'yellow', 'blue']
-    colors.insertAt(5, 'orange');  // Error: Index out of range
-    ```
-
-    @method insertAt
-    @param {Number} idx index of insert the object at.
-    @param {Object} object object to insert
-    @return {EmberArray} receiver
-    @public
-  */
-  insertAt(idx: number, object: unknown) {
-    insertAt(this, idx, object);
-    return this;
-  },
-
-  /**
-    Remove an object at the specified index using the `replace()` primitive
-    method. You can pass either a single index, or a start and a length.
-
-    If you pass a start and length that is beyond the
-    length this method will throw an assertion.
-
-    ```javascript
-    let colors = ['red', 'green', 'blue', 'yellow', 'orange'];
-
-    colors.removeAt(0);     // ['green', 'blue', 'yellow', 'orange']
-    colors.removeAt(2, 2);  // ['green', 'blue']
-    colors.removeAt(4, 2);  // Error: Index out of range
-    ```
-
-    @method removeAt
-    @param {Number} start index, start of range
-    @param {Number} len length of passing range
-    @return {EmberArray} receiver
-    @public
-  */
-  removeAt(start: number, len?: number) {
-    return removeAt(this, start, len);
-  },
-
-  /**
-    Push the object onto the end of the array. Works just like `push()` but it
-    is KVO-compliant.
-
-    ```javascript
-    let colors = ['red', 'green'];
-
-    colors.pushObject('black');     // ['red', 'green', 'black']
-    colors.pushObject(['yellow']);  // ['red', 'green', ['yellow']]
-    ```
-
-    @method pushObject
-    @param {*} obj object to push
-    @return object same object passed as a param
-    @public
-  */
-  pushObject<T>(this: MutableArray<T>, obj: T) {
-    return insertAt(this, this.length, obj);
-  },
-
-  /**
-    Add the objects in the passed array to the end of the array. Defers
-    notifying observers of the change until all objects are added.
-
-    ```javascript
-    let colors = ['red'];
-
-    colors.pushObjects(['yellow', 'orange']);  // ['red', 'yellow', 'orange']
-    ```
-
-    @method pushObjects
-    @param {Array} objects the objects to add
-    @return {MutableArray} receiver
-    @public
-  */
-  pushObjects<T>(this: MutableArray<T>, objects: T[]) {
-    this.replace(this.length, 0, objects);
-    return this;
-  },
-
-  /**
-    Pop object from array or nil if none are left. Works just like `pop()` but
-    it is KVO-compliant.
-
-    ```javascript
-    let colors = ['red', 'green', 'blue'];
-
-    colors.popObject();   // 'blue'
-    console.log(colors);  // ['red', 'green']
-    ```
-
-    @method popObject
-    @return object
-    @public
-  */
-  popObject() {
-    let len = this.length;
-    if (len === 0) {
-      return null;
-    }
-
-    let ret = objectAt(this, len - 1);
-    this.removeAt(len - 1, 1);
-    return ret;
-  },
-
-  /**
-    Shift an object from start of array or nil if none are left. Works just
-    like `shift()` but it is KVO-compliant.
-
-    ```javascript
-    let colors = ['red', 'green', 'blue'];
-
-    colors.shiftObject();  // 'red'
-    console.log(colors);   // ['green', 'blue']
-    ```
-
-    @method shiftObject
-    @return object
-    @public
-  */
-  shiftObject() {
-    if (this.length === 0) {
-      return null;
-    }
-
-    let ret = objectAt(this, 0);
-    this.removeAt(0);
-    return ret;
-  },
-
-  /**
-    Unshift an object to start of array. Works just like `unshift()` but it is
-    KVO-compliant.
-
-    ```javascript
-    let colors = ['red'];
-
-    colors.unshiftObject('yellow');    // ['yellow', 'red']
-    colors.unshiftObject(['black']);   // [['black'], 'yellow', 'red']
-    ```
-
-    @method unshiftObject
-    @param {*} obj object to unshift
-    @return object same object passed as a param
-    @public
-  */
-  unshiftObject<T>(this: MutableArray<T>, obj: T) {
-    return insertAt(this, 0, obj);
-  },
-
-  /**
-    Adds the named objects to the beginning of the array. Defers notifying
-    observers until all objects have been added.
-
-    ```javascript
-    let colors = ['red'];
-
-    colors.unshiftObjects(['black', 'white']);   // ['black', 'white', 'red']
-    colors.unshiftObjects('yellow'); // Type Error: 'undefined' is not a function
-    ```
-
-    @method unshiftObjects
-    @param {Enumerable} objects the objects to add
-    @return {EmberArray} receiver
-    @public
-  */
-  unshiftObjects<T>(this: MutableArray<T>, objects: T[]) {
-    this.replace(0, 0, objects);
-    return this;
-  },
-
-  /**
-    Reverse objects in the array. Works just like `reverse()` but it is
-    KVO-compliant.
-
-    @method reverseObjects
-    @return {EmberArray} receiver
-     @public
-  */
-  reverseObjects() {
-    let len = this.length;
-    if (len === 0) {
-      return this;
-    }
-
-    let objects = this.toArray().reverse();
-    this.replace(0, len, objects);
-    return this;
-  },
-
-  /**
-    Replace all the receiver's content with content of the argument.
-    If argument is an empty array receiver will be cleared.
-
-    ```javascript
-    let colors = ['red', 'green', 'blue'];
-
-    colors.setObjects(['black', 'white']);  // ['black', 'white']
-    colors.setObjects([]);                  // []
-    ```
-
-    @method setObjects
-    @param {EmberArray} objects array whose content will be used for replacing
-        the content of the receiver
-    @return {EmberArray} receiver with the new content
-    @public
-  */
-  setObjects<T>(this: MutableArray<T>, objects: T[]) {
-    if (objects.length === 0) {
-      return this.clear();
-    }
-
-    let len = this.length;
-    this.replace(0, len, objects);
-    return this;
-  },
-
-  /**
-    Remove all occurrences of an object in the array.
-
-    ```javascript
-    let cities = ['Chicago', 'Berlin', 'Lima', 'Chicago'];
-
-    cities.removeObject('Chicago');  // ['Berlin', 'Lima']
-    cities.removeObject('Lima');     // ['Berlin']
-    cities.removeObject('Tokyo')     // ['Berlin']
-    ```
-
-    @method removeObject
-    @param {*} obj object to remove
-    @return {EmberArray} receiver
-    @public
-  */
-  removeObject<T>(this: MutableArray<T>, obj: T) {
-    let loc = this.length || 0;
-    while (--loc >= 0) {
-      let curObject = objectAt(this, loc);
-
-      if (curObject === obj) {
-        this.removeAt(loc);
-      }
-    }
-    return this;
-  },
-
-  /**
-    Removes each object in the passed array from the receiver.
-
-    @method removeObjects
-    @param {EmberArray} objects the objects to remove
-    @return {EmberArray} receiver
-    @public
-  */
-  removeObjects<T>(this: MutableArray<T>, objects: T[]) {
-    beginPropertyChanges();
-    for (let i = objects.length - 1; i >= 0; i--) {
-      // SAFETY: Due to the loop structure we know this will always exist.
-      this.removeObject(objects[i]!);
-    }
-    endPropertyChanges();
-    return this;
-  },
-
-  /**
-    Push the object onto the end of the array if it is not already
-    present in the array.
-
-    ```javascript
-    let cities = ['Chicago', 'Berlin'];
-
-    cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
-    cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
-    ```
-
-    @method addObject
-    @param {*} obj object to add, if not already present
-    @return {EmberArray} receiver
-    @public
-  */
-  addObject<T>(this: MutableArray<T>, obj: T) {
-    let included = this.includes(obj);
-
-    if (!included) {
-      this.pushObject(obj);
-    }
-
-    return this;
-  },
-
-  /**
-    Adds each object in the passed array to the receiver.
-
-    @method addObjects
-    @param {EmberArray} objects the objects to add.
-    @return {EmberArray} receiver
-    @public
-  */
-  addObjects<T>(this: MutableArray<T>, objects: T[]) {
-    beginPropertyChanges();
-    objects.forEach((obj) => this.addObject(obj));
-    endPropertyChanges();
-    return this;
-  },
-});
-
-/**
-  Creates an `Ember.NativeArray` from an Array-like object.
-  Does not modify the original object's contents. `A()` is not needed if
-  `EmberENV.EXTEND_PROTOTYPES` is `true` (the default value). However,
-  it is recommended that you use `A()` when creating addons for
-  ember or when you can not guarantee that `EmberENV.EXTEND_PROTOTYPES`
-  will be `true`.
-
-  Example
-
-  ```app/components/my-component.js
-  import Component from '@ember/component';
-  import { A } from '@ember/array';
-
-  export default Component.extend({
-    tagName: 'ul',
-    classNames: ['pagination'],
-
-    init() {
-      this._super(...arguments);
-
-      if (!this.get('content')) {
-        this.set('content', A());
-        this.set('otherContent', A([1,2,3]));
-      }
-    }
-  });
-  ```
-
-  @method A
-  @static
-  @for @ember/array
-  @return {Ember.NativeArray}
-  @public
-*/
-
-// Add Ember.Array to Array.prototype. Remove methods with native
-// implementations and supply some more optimized versions of generic methods
-// because they are so common.
-/**
-@module ember
-*/
-/**
-  The NativeArray mixin contains the properties needed to make the native
-  Array support MutableArray and all of its dependent APIs. Unless you
-  have `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Array` set to
-  false, this will be applied automatically. Otherwise you can apply the mixin
-  at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
-
-  @class Ember.NativeArray
-  @uses MutableArray
-  @uses Observable
-  @public
-*/
-interface NativeArray<T>
-  extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
-    MutableArray<T> {}
-
-let NativeArray = Mixin.create(MutableArray, Observable, {
-  objectAt(idx: number) {
-    return this[idx];
-  },
-
-  // primitive for array support.
-  replace(start: number, deleteCount: number, items = EMPTY_ARRAY) {
-    assert('The third argument to replace needs to be an array.', Array.isArray(items));
-
-    replaceInNativeArray(this, start, deleteCount, items);
-
-    return this;
-  },
-});
-
-// Remove any methods implemented natively so we don't override them
-const ignore = ['length'];
-NativeArray.keys().forEach((methodName) => {
-  // SAFETY: It's safe to read unknown properties from an object
-  if ((Array.prototype as any)[methodName]) {
-    ignore.push(methodName);
-  }
-});
-
-NativeArray = NativeArray.without(...ignore);
-
-let A: <T>(arr?: Array<T>) => NativeArray<T>;
-
-if (ENV.EXTEND_PROTOTYPES.Array) {
-  NativeArray.apply(Array.prototype, true);
-
-  A = function <T>(this: unknown, arr?: Array<T>) {
-    assert(
-      'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
-      !(this instanceof A)
-    );
-
-    // SAFTEY: Since we are extending prototypes all true native arrays are Ember NativeArrays
-    return (arr || []) as NativeArray<T>;
-  };
-} else {
-  A = function <T>(this: unknown, arr?: Array<T>) {
-    assert(
-      'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
-      !(this instanceof A)
-    );
-
-    if (isEmberArray(arr)) {
-      // SAFETY: If it's a true native array and it is also an EmberArray then it should be an Ember NativeArray
-      return arr as NativeArray<T>;
-    } else {
-      // SAFETY: This will return an NativeArray but TS can't infer that.
-      return NativeArray.apply(arr ?? []) as NativeArray<T>;
-    }
-  };
-}
-
-export { A, NativeArray, MutableArray };
-
-export default EmberArray;
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
index 2490c669d1e..19ca0cc33c7 100644
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
@@ -16,7 +16,8 @@ import {
 } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import EmberObject from '@ember/object';
-import EmberArray, { MutableArray } from '../mixins/array';
+import EmberArray from '@ember/array';
+import MutableArray from '@ember/array/mutable';
 import { assert } from '@ember/debug';
 import { setCustomTagFor } from '@glimmer/manager';
 import type { Tag, Revision } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/runtime/tests/array/any-test.js b/packages/@ember/-internals/runtime/tests/array/any-test.js
index 54e50ca2a88..58928a04fe2 100644
--- a/packages/@ember/-internals/runtime/tests/array/any-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/any-test.js
@@ -1,4 +1,4 @@
-import { A as emberA } from '../../lib/mixins/array';
+import { A as emberA } from '@ember/array';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/apply-test.js b/packages/@ember/-internals/runtime/tests/array/apply-test.js
index e40068c55b1..aeff3fc25f9 100644
--- a/packages/@ember/-internals/runtime/tests/array/apply-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/apply-test.js
@@ -1,4 +1,4 @@
-import { NativeArray } from '../../lib/mixins/array';
+import { NativeArray } from '@ember/array';
 import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 
 class ArrayPrototypeExtensionSelfReferenceTests extends AbstractTestCase {
diff --git a/packages/@ember/-internals/runtime/tests/array/invoke-test.js b/packages/@ember/-internals/runtime/tests/array/invoke-test.js
index 6149db3832f..a8e7a7e55fc 100644
--- a/packages/@ember/-internals/runtime/tests/array/invoke-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/invoke-test.js
@@ -1,5 +1,5 @@
 import EmberObject from '@ember/object';
-import { NativeArray } from '../../index';
+import { NativeArray } from '@ember/array';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/core/is_array_test.js b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
index 6d0f99b5770..d53f1cb1eff 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_array_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
@@ -1,4 +1,4 @@
-import { A as emberA, isArray } from '../../lib/mixins/array';
+import { A as emberA, isArray } from '@ember/array';
 import ArrayProxy from '../../lib/system/array_proxy';
 import EmberObject from '@ember/object';
 import { window } from '@ember/-internals/browser-environment';
diff --git a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
index b3ffe30f122..64da70de489 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
@@ -1,7 +1,7 @@
 import { isEmpty } from '@ember/-internals/metal';
 import ArrayProxy from '../../lib/system/array_proxy';
 import ObjectProxy from '@ember/object/proxy';
-import { A as emberA } from '../../lib/mixins/array';
+import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index d7abef11504..c11d0976419 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -1,5 +1,6 @@
 import ArrayProxy from '../../lib/system/array_proxy';
-import EmberArray, { A as emberA, MutableArray } from '../../lib/mixins/array';
+import EmberArray, { A as emberA } from '@ember/array'
+import MutableArray from '@ember/array/mutable';
 import { generateGuid, guidFor } from '@ember/-internals/utils';
 import {
   get,
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
index 5eca77ee1b8..1b04eba8f21 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
@@ -1,6 +1,6 @@
 import { get, set, addObserver } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
-import { A as emberA } from '../../../../lib/mixins/array';
+import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index e7c99c53fdd..246f1073aaa 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -10,7 +10,7 @@ import {
   arrayContentWillChange,
 } from '@ember/-internals/metal';
 import EmberObject, { observer as emberObserver } from '@ember/object';
-import EmberArray, { A as emberA } from '../../lib/mixins/array';
+import EmberArray, { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js b/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js
index 4741c89a476..ee931c30b73 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js
@@ -1,6 +1,6 @@
-import MutableEnumerable from '../../lib/mixins/mutable_enumerable';
+import MutableEnumerable from '@ember/enumerable/mutable';
 import ArrayProxy from '../../lib/system/array_proxy';
-import { A } from '../../lib/mixins/array';
+import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js
index 752ab2335d3..7f8712ed759 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
-import { removeAt } from '../../lib/mixins/array';
+import { removeAt } from '@ember/array';
 import { get } from '@ember/-internals/metal';
 
 class RemoveAtTests extends AbstractTestCase {
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
index a8b0dba4ee8..c7f1bc1cc69 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
@@ -1,7 +1,7 @@
 import { get } from '@ember/-internals/metal';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture, newObjectsFixture } from '../helpers/array';
-import { A as emberA } from '../../lib/mixins/array';
+import { A as emberA } from '@ember/array';
 import { destroy } from '@glimmer/destroyable';
 
 class RemoveObjectsTests extends AbstractTestCase {
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
index 2f682c8e221..89d1989cc2f 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
@@ -1,7 +1,7 @@
 import { run } from '@ember/runloop';
 import { computed, objectAt } from '@ember/-internals/metal';
 import ArrayProxy from '../../../lib/system/array_proxy';
-import { A as emberA } from '../../../lib/mixins/array';
+import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let array;
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
index 06c2b89a7f1..b7ac7fde365 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
@@ -1,7 +1,7 @@
 import { run } from '@ember/runloop';
 import { set, changeProperties } from '@ember/-internals/metal';
 import ArrayProxy from '../../../lib/system/array_proxy';
-import { A as emberA } from '../../../lib/mixins/array';
+import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
index 73ae5962a4e..47af11fbe7f 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
@@ -1,7 +1,7 @@
 import ArrayProxy from '../../../lib/system/array_proxy';
 import EmberObject, { observer } from '@ember/object';
 import { oneWay as reads, not } from '@ember/object/computed';
-import { A as a } from '../../../lib/mixins/array';
+import { A as a } from '@ember/array';
 import { moduleFor, AbstractTestCase, runTask, runLoopSettled } from 'internal-test-helpers';
 import { set, get } from '@ember/-internals/metal';
 import { createCache, getValue } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js
index 0717a429bd7..fff64ebb835 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js
@@ -1,6 +1,6 @@
 import { peekMeta } from '@ember/-internals/meta';
 import ArrayProxy from '../../../lib/system/array_proxy';
-import { A } from '../../../lib/mixins/array';
+import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function sortedListenersFor(obj, eventName) {
diff --git a/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js b/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js
index df2ed0d1da3..e9b72d65d1a 100644
--- a/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/native_array/a_test.js
@@ -1,5 +1,5 @@
-import EmberArray from '../../../lib/mixins/array';
-import { A } from '../../../lib/mixins/array';
+import EmberArray from '@ember/array';
+import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js b/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js
index b8dd9217379..dbcdba82f50 100644
--- a/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/native_array/replace_test.js
@@ -1,4 +1,4 @@
-import { A } from '../../../lib/mixins/array';
+import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index 13da81f4b66..aadea305ec7 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -1,4 +1,4 @@
-import type { Array as EmberArray } from '@ember/-internals/runtime';
+import type EmberArray from '@ember/array';
 import { _WeakSet } from '@glimmer/util';
 
 const EMBER_ARRAYS = new _WeakSet();
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index bacb74f0967..1078202d218 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -1,2 +1,1972 @@
-export { Array as default, NativeArray, isArray, A } from '@ember/-internals/runtime';
+/**
+@module @ember/array
+*/
+import { DEBUG } from '@glimmer/env';
+import { PROXY_CONTENT } from '@ember/-internals/metal';
+import { isEmberArray, setEmberArray } from '@ember/-internals/utils';
+import {
+  get,
+  set,
+  objectAt,
+  replaceInNativeArray,
+  replace,
+  computed,
+  beginPropertyChanges,
+  endPropertyChanges,
+} from '@ember/-internals/metal';
+import Mixin from '@ember/object/mixin';
+import { assert } from '@ember/debug';
+import Enumerable from '@ember/enumerable';
+import MutableEnumerable from '@ember/enumerable/mutable';
+import { compare, typeOf } from '@ember/-internals/runtime';
+import { ENV } from '@ember/-internals/environment';
+import Observable from '@ember/object/observable';
+import type { AnyFn } from '@ember/-internals/utils/types';
+import type { ComputedPropertyCallback } from '@ember/-internals/metal';
+
 export { makeArray } from '@ember/-internals/utils';
+
+type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
+
+const EMPTY_ARRAY = Object.freeze([] as const);
+
+const identityFunction = <T>(item: T) => item;
+
+export function uniqBy<T>(
+  array: T[] | EmberArray<T>,
+  keyOrFunc: string | ((item: T) => unknown) = identityFunction
+): T[] | EmberArray<T> {
+  assert(`first argument passed to \`uniqBy\` should be array`, isArray(array));
+
+  let ret = A<T>();
+  let seen = new Set();
+  let getter = typeof keyOrFunc === 'function' ? keyOrFunc : (item: T) => get(item, keyOrFunc);
+
+  array.forEach((item) => {
+    let val = getter(item);
+    if (!seen.has(val)) {
+      seen.add(val);
+      ret.push(item);
+    }
+  });
+
+  return ret;
+}
+
+function iter<T>(key: string): (item: T) => boolean;
+function iter<T>(key: string, value: unknown): (item: T) => boolean;
+function iter<T>(...args: [key: string] | [key: string, value: unknown]) {
+  let valueProvided = args.length === 2;
+  let [key, value] = args;
+
+  return valueProvided
+    ? (item: T) => value === get(item, key)
+    : (item: T) => Boolean(get(item, key));
+}
+
+function findIndex<T>(
+  array: EmberArray<T>,
+  predicate: (item: T, index: number, arr: EmberArray<T>) => unknown,
+  startAt: number
+): number {
+  let len = array.length;
+  for (let index = startAt; index < len; index++) {
+    // SAFETY: Because we're checking the index this value should always be set.
+    let item = objectAt(array, index)!;
+    if (predicate(item, index, array)) {
+      return index;
+    }
+  }
+  return -1;
+}
+
+function find<T, Target>(
+  array: EmberArray<T>,
+  callback: (this: Target | null, item: T, index: number, arr: EmberArray<T>) => unknown,
+  target: Target | null = null
+) {
+  let predicate = callback.bind(target);
+  let index = findIndex(array, predicate, 0);
+  return index === -1 ? undefined : objectAt(array, index);
+}
+
+function any<T, Target>(
+  array: EmberArray<T>,
+  callback: (this: Target | null, item: T, index: number, arr: EmberArray<T>) => unknown,
+  target: Target | null = null
+) {
+  let predicate = callback.bind(target);
+  return findIndex(array, predicate, 0) !== -1;
+}
+
+function every<T, Target>(
+  array: EmberArray<T>,
+  callback: (this: Target | null | void, item: T, index: number, arr: EmberArray<T>) => unknown,
+  target: Target | null = null
+) {
+  let cb = callback.bind(target);
+  let predicate = (item: T, index: number, array: EmberArray<T>) => !cb(item, index, array);
+  return findIndex(array, predicate, 0) === -1;
+}
+
+function indexOf<T>(array: EmberArray<T>, val: T, startAt = 0, withNaNCheck: boolean) {
+  let len = array.length;
+
+  if (startAt < 0) {
+    startAt += len;
+  }
+
+  // SameValueZero comparison (NaN !== NaN)
+  let predicate =
+    withNaNCheck && val !== val ? (item: T) => item !== item : (item: T) => item === val;
+  return findIndex(array, predicate, startAt);
+}
+
+export function removeAt<T, A extends T[] | MutableArray<T>>(
+  array: A,
+  index: number,
+  len?: number
+): A {
+  assert(`\`removeAt\` index provided is out of range`, index > -1 && index < array.length);
+  replace(array, index, len ?? 1, EMPTY_ARRAY);
+  return array;
+}
+
+function insertAt<T>(array: MutableArray<T>, index: number, item: T) {
+  assert(`\`insertAt\` index provided is out of range`, index > -1 && index <= array.length);
+  replace(array, index, 0, [item]);
+  return item;
+}
+
+/**
+  Returns true if the passed object is an array or Array-like.
+
+  Objects are considered Array-like if any of the following are true:
+
+    - the object is a native Array
+    - the object has an objectAt property
+    - the object is an Object, and has a length property
+
+  Unlike `typeOf` this method returns true even if the passed object is
+  not formally an array but appears to be array-like (i.e. implements `Array`)
+
+  ```javascript
+  import { isArray } from '@ember/array';
+  import ArrayProxy from '@ember/array/proxy';
+
+  isArray();                                      // false
+  isArray([]);                                    // true
+  isArray(ArrayProxy.create({ content: [] }));    // true
+  ```
+
+  @method isArray
+  @static
+  @for @ember/array
+  @param {Object} obj The object to test
+  @return {Boolean} true if the passed object is an array or Array-like
+  @public
+*/
+export function isArray(obj: unknown): obj is ArrayLike<unknown> | EmberArray<unknown> {
+  if (DEBUG && typeof obj === 'object' && obj !== null) {
+    // SAFETY: Property read checks are safe if it's an object
+    let possibleProxyContent = (obj as any)[PROXY_CONTENT];
+    if (possibleProxyContent !== undefined) {
+      obj = possibleProxyContent;
+    }
+  }
+
+  // SAFETY: Property read checks are safe if it's an object
+  if (!obj || (obj as any).setInterval) {
+    return false;
+  }
+
+  if (Array.isArray(obj) || EmberArray.detect(obj)) {
+    return true;
+  }
+
+  let type = typeOf(obj);
+  if ('array' === type) {
+    return true;
+  }
+
+  // SAFETY: Property read checks are safe if it's an object
+  let length = (obj as any).length;
+  if (typeof length === 'number' && length === length && 'object' === type) {
+    return true;
+  }
+
+  return false;
+}
+
+/*
+  This allows us to define computed properties that are not enumerable.
+  The primary reason this is important is that when `NativeArray` is
+  applied to `Array.prototype` we need to ensure that we do not add _any_
+  new enumerable properties.
+*/
+function nonEnumerableComputed(callback: ComputedPropertyCallback) {
+  let property = computed(callback);
+  property.enumerable = false;
+  return property;
+}
+
+function mapBy<T>(this: EmberArray<T>, key: string) {
+  return this.map((next) => get(next, key));
+}
+
+// ..........................................................
+// ARRAY
+//
+/**
+  This mixin implements Observer-friendly Array-like behavior. It is not a
+  concrete implementation, but it can be used up by other classes that want
+  to appear like arrays.
+
+  For example, ArrayProxy is a concrete class that can be instantiated to
+  implement array-like behavior. This class uses the Array Mixin by way of
+  the MutableArray mixin, which allows observable changes to be made to the
+  underlying array.
+
+  This mixin defines methods specifically for collections that provide
+  index-ordered access to their contents. When you are designing code that
+  needs to accept any kind of Array-like object, you should use these methods
+  instead of Array primitives because these will properly notify observers of
+  changes to the array.
+
+  Although these methods are efficient, they do add a layer of indirection to
+  your application so it is a good idea to use them only when you need the
+  flexibility of using both true JavaScript arrays and "virtual" arrays such
+  as controllers and collections.
+
+  You can use the methods defined in this module to access and modify array
+  contents in an observable-friendly way. You can also be notified whenever
+  the membership of an array changes by using `.observes('myArray.[]')`.
+
+  To support `EmberArray` in your own class, you must override two
+  primitives to use it: `length()` and `objectAt()`.
+
+  @class EmberArray
+  @uses Enumerable
+  @since Ember 0.9.0
+  @public
+*/
+interface EmberArray<T> extends Enumerable {
+  length: number;
+  objectAt(idx: number): T | undefined;
+  objectsAt(indexes: number[]): Array<T | undefined>;
+  firstObject: T | undefined;
+  lastObject: T | undefined;
+  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
+  indexOf(object: T, startAt?: number): number;
+  lastIndexOf(object: T, startAt?: number): number;
+  forEach<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => void,
+    target?: Target
+  ): this;
+  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
+  setEach<K extends string>(key: K, value: Value<T, K>): this;
+  map<U, Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => U,
+    target?: Target
+  ): NativeArray<U>;
+  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
+  filter<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): NativeArray<T>;
+  reject<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): NativeArray<T>;
+  filterBy(key: string, value?: unknown): NativeArray<T>;
+  rejectBy(key: string, value?: unknown): NativeArray<T>;
+  find<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): T | undefined;
+  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
+  every<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): boolean;
+  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
+  any<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): boolean;
+  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
+  reduce<V>(
+    callback: (summation: V, current: T, index: number, arr: this) => V,
+    initialValue?: V
+  ): V;
+  invoke<K extends string>(
+    methodName: K,
+    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
+  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
+  toArray(): T[];
+  compact(): NativeArray<Exclude<T, null>>;
+  includes(object: T, startAt?: number): boolean;
+  sortBy(key: string): T[];
+  uniq(): NativeArray<T>;
+  uniqBy(key: string): NativeArray<T>;
+  without(value: T): NativeArray<T>;
+}
+const EmberArray = Mixin.create(Enumerable, {
+  init() {
+    this._super(...arguments);
+    setEmberArray(this);
+  },
+
+  /**
+    __Required.__ You must implement this method to apply this mixin.
+
+    Your array must support the `length` property. Your replace methods should
+    set this property whenever it changes.
+
+    @property {Number} length
+    @public
+  */
+
+  /**
+    Returns the object at the given `index`. If the given `index` is negative
+    or is greater or equal than the array length, returns `undefined`.
+
+    This is one of the primitives you must implement to support `EmberArray`.
+    If your object supports retrieving the value of an array item using `get()`
+    (i.e. `myArray.get(0)`), then you do not need to implement this method
+    yourself.
+
+    ```javascript
+    let arr = ['a', 'b', 'c', 'd'];
+
+    arr.objectAt(0);   // 'a'
+    arr.objectAt(3);   // 'd'
+    arr.objectAt(-1);  // undefined
+    arr.objectAt(4);   // undefined
+    arr.objectAt(5);   // undefined
+    ```
+
+    @method objectAt
+    @param {Number} idx The index of the item to return.
+    @return {*} item at index or undefined
+    @public
+  */
+
+  /**
+    This returns the objects at the specified indexes, using `objectAt`.
+
+    ```javascript
+    let arr = ['a', 'b', 'c', 'd'];
+
+    arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
+    arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
+    ```
+
+    @method objectsAt
+    @param {Array} indexes An array of indexes of items to return.
+    @return {Array}
+    @public
+   */
+  objectsAt(indexes: number[]) {
+    return indexes.map((idx) => objectAt(this, idx));
+  },
+
+  /**
+    This is the handler for the special array content property. If you get
+    this property, it will return this. If you set this property to a new
+    array, it will replace the current content.
+
+    ```javascript
+    let peopleToMoon = ['Armstrong', 'Aldrin'];
+
+    peopleToMoon.get('[]'); // ['Armstrong', 'Aldrin']
+
+    peopleToMoon.set('[]', ['Collins']); // ['Collins']
+    peopleToMoon.get('[]'); // ['Collins']
+    ```
+
+    @property []
+    @return this
+    @public
+  */
+  '[]': nonEnumerableComputed({
+    get() {
+      return this;
+    },
+    set(_key, value) {
+      this.replace(0, this.length, value);
+      return this;
+    },
+  }),
+
+  /**
+    The first object in the array, or `undefined` if the array is empty.
+
+    ```javascript
+    let vowels = ['a', 'e', 'i', 'o', 'u'];
+    vowels.firstObject; // 'a'
+
+    vowels.shiftObject();
+    vowels.firstObject; // 'e'
+
+    vowels.reverseObjects();
+    vowels.firstObject; // 'u'
+
+    vowels.clear();
+    vowels.firstObject; // undefined
+    ```
+
+    @property firstObject
+    @return {Object | undefined} The first object in the array
+    @public
+  */
+  firstObject: nonEnumerableComputed(function () {
+    return objectAt(this, 0);
+  }).readOnly(),
+
+  /**
+    The last object in the array, or `undefined` if the array is empty.
+
+    @property lastObject
+    @return {Object | undefined} The last object in the array
+    @public
+  */
+  lastObject: nonEnumerableComputed(function () {
+    return objectAt(this, this.length - 1);
+  }).readOnly(),
+
+  // Add any extra methods to EmberArray that are native to the built-in Array.
+  /**
+    Returns a new array that is a slice of the receiver. This implementation
+    uses the observable array methods to retrieve the objects for the new
+    slice.
+
+    ```javascript
+    let arr = ['red', 'green', 'blue'];
+
+    arr.slice(0);       // ['red', 'green', 'blue']
+    arr.slice(0, 2);    // ['red', 'green']
+    arr.slice(1, 100);  // ['green', 'blue']
+    ```
+
+    @method slice
+    @param {Number} beginIndex (Optional) index to begin slicing from.
+    @param {Number} endIndex (Optional) index to end the slice at (but not included).
+    @return {Array} New array with specified slice
+    @public
+  */
+  slice(beginIndex = 0, endIndex?: number) {
+    let ret = A();
+    let length = this.length;
+
+    if (beginIndex < 0) {
+      beginIndex = length + beginIndex;
+    }
+
+    let validatedEndIndex: number;
+    if (endIndex === undefined || endIndex > length) {
+      validatedEndIndex = length;
+    } else if (endIndex < 0) {
+      validatedEndIndex = length + endIndex;
+    } else {
+      validatedEndIndex = endIndex;
+    }
+
+    while (beginIndex < validatedEndIndex) {
+      ret[ret.length] = objectAt(this, beginIndex++);
+    }
+
+    return ret;
+  },
+
+  /**
+    Used to determine the passed object's first occurrence in the array.
+    Returns the index if found, -1 if no match is found.
+
+    The optional `startAt` argument can be used to pass a starting
+    index to search from, effectively slicing the searchable portion
+    of the array. If it's negative it will add the array length to
+    the startAt value passed in as the index to search from. If less
+    than or equal to `-1 * array.length` the entire array is searched.
+
+    ```javascript
+    let arr = ['a', 'b', 'c', 'd', 'a'];
+
+    arr.indexOf('a');       //  0
+    arr.indexOf('z');       // -1
+    arr.indexOf('a', 2);    //  4
+    arr.indexOf('a', -1);   //  4, equivalent to indexOf('a', 4)
+    arr.indexOf('a', -100); //  0, searches entire array
+    arr.indexOf('b', 3);    // -1
+    arr.indexOf('a', 100);  // -1
+
+    let people = [{ name: 'Zoey' }, { name: 'Bob' }]
+    let newPerson = { name: 'Tom' };
+    people = [newPerson, ...people, newPerson];
+
+    people.indexOf(newPerson);     //  0
+    people.indexOf(newPerson, 1);  //  3
+    people.indexOf(newPerson, -4); //  0
+    people.indexOf(newPerson, 10); // -1
+    ```
+
+    @method indexOf
+    @param {Object} object the item to search for
+    @param {Number} startAt optional starting location to search, default 0
+    @return {Number} index or -1 if not found
+    @public
+  */
+
+  indexOf<T>(object: T, startAt?: number) {
+    return indexOf(this, object, startAt, false);
+  },
+
+  /**
+    Returns the index of the given `object`'s last occurrence.
+
+    - If no `startAt` argument is given, the search starts from
+    the last position.
+    - If it's greater than or equal to the length of the array,
+    the search starts from the last position.
+    - If it's negative, it is taken as the offset from the end
+    of the array i.e. `startAt + array.length`.
+    - If it's any other positive number, will search backwards
+    from that index of the array.
+
+    Returns -1 if no match is found.
+
+    ```javascript
+    let arr = ['a', 'b', 'c', 'd', 'a'];
+
+    arr.lastIndexOf('a');       //  4
+    arr.lastIndexOf('z');       // -1
+    arr.lastIndexOf('a', 2);    //  0
+    arr.lastIndexOf('a', -1);   //  4
+    arr.lastIndexOf('a', -3);   //  0
+    arr.lastIndexOf('b', 3);    //  1
+    arr.lastIndexOf('a', 100);  //  4
+    ```
+
+    @method lastIndexOf
+    @param {Object} object the item to search for
+    @param {Number} startAt optional starting location to search from
+    backwards, defaults to `(array.length - 1)`
+    @return {Number} The last index of the `object` in the array or -1
+    if not found
+    @public
+  */
+  lastIndexOf<T>(object: T, startAt?: number) {
+    let len = this.length;
+
+    if (startAt === undefined || startAt >= len) {
+      startAt = len - 1;
+    }
+
+    if (startAt < 0) {
+      startAt += len;
+    }
+
+    for (let idx = startAt; idx >= 0; idx--) {
+      if (objectAt(this, idx) === object) {
+        return idx;
+      }
+    }
+
+    return -1;
+  },
+
+  /**
+    Iterates through the array, calling the passed function on each
+    item. This method corresponds to the `forEach()` method defined in
+    JavaScript 1.6.
+
+    The callback method you provide should have the following signature (all
+    parameters are optional):
+
+    ```javascript
+    function(item, index, array);
+    ```
+
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array itself.
+
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as `this` on the context. This is a good way
+    to give your iterator function access to the current object.
+
+    Example Usage:
+
+    ```javascript
+    let foods = [
+      { name: 'apple', eaten: false },
+      { name: 'banana', eaten: false },
+      { name: 'carrot', eaten: false }
+    ];
+
+    foods.forEach((food) => food.eaten = true);
+
+    let output = '';
+    foods.forEach((item, index, array) =>
+      output += `${index + 1}/${array.length} ${item.name}\n`;
+    );
+    console.log(output);
+    // 1/3 apple
+    // 2/3 banana
+    // 3/3 carrot
+    ```
+
+    @method forEach
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Object} receiver
+    @public
+  */
+  forEach(callback: <T>(item: T, index: number, arr: EmberArray<T>) => void, target = null) {
+    assert('`forEach` expects a function as first argument.', typeof callback === 'function');
+
+    let length = this.length;
+
+    for (let index = 0; index < length; index++) {
+      let item = this.objectAt(index);
+      callback.call(target, item, index, this);
+    }
+
+    return this;
+  },
+
+  /**
+    Alias for `mapBy`.
+
+    Returns the value of the named
+    property on all items in the enumeration.
+
+    ```javascript
+    let people = [{name: 'Joe'}, {name: 'Matt'}];
+
+    people.getEach('name');
+    // ['Joe', 'Matt'];
+
+    people.getEach('nonexistentProperty');
+    // [undefined, undefined];
+    ```
+
+    @method getEach
+    @param {String} key name of the property
+    @return {Array} The mapped array.
+    @public
+  */
+  getEach: mapBy,
+
+  /**
+    Sets the value on the named property for each member. This is more
+    ergonomic than using other methods defined on this helper. If the object
+    implements Observable, the value will be changed to `set(),` otherwise
+    it will be set directly. `null` objects are skipped.
+
+    ```javascript
+    let people = [{name: 'Joe'}, {name: 'Matt'}];
+
+    people.setEach('zipCode', '10011');
+    // [{name: 'Joe', zipCode: '10011'}, {name: 'Matt', zipCode: '10011'}];
+    ```
+
+    @method setEach
+    @param {String} key The key to set
+    @param {Object} value The object to set
+    @return {Object} receiver
+    @public
+  */
+  setEach(key: string, value: unknown) {
+    return this.forEach((item: object) => set(item, key, value));
+  },
+
+  /**
+    Maps all of the items in the enumeration to another value, returning
+    a new array. This method corresponds to `map()` defined in JavaScript 1.6.
+
+    The callback method you provide should have the following signature (all
+    parameters are optional):
+
+    ```javascript
+    function(item, index, array);
+    let arr = [1, 2, 3, 4, 5, 6];
+
+    arr.map(element => element * element);
+    // [1, 4, 9, 16, 25, 36];
+
+    arr.map((element, index) => element + index);
+    // [1, 3, 5, 7, 9, 11];
+    ```
+
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array itself.
+
+    It should return the mapped value.
+
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as `this` on the context. This is a good way
+    to give your iterator function access to the current object.
+
+    @method map
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Array} The mapped array.
+    @public
+  */
+  map<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
+    assert('`map` expects a function as first argument.', typeof callback === 'function');
+
+    let ret = A();
+
+    this.forEach((x, idx, i) => (ret[idx] = callback.call(target, x, idx, i)));
+
+    return ret;
+  },
+
+  /**
+    Similar to map, this specialized function returns the value of the named
+    property on all items in the enumeration.
+
+    ```javascript
+    let people = [{name: 'Joe'}, {name: 'Matt'}];
+
+    people.mapBy('name');
+    // ['Joe', 'Matt'];
+
+    people.mapBy('unknownProperty');
+    // [undefined, undefined];
+    ```
+
+    @method mapBy
+    @param {String} key name of the property
+    @return {Array} The mapped array.
+    @public
+  */
+  mapBy,
+
+  /**
+    Returns a new array with all of the items in the enumeration that the provided
+    callback function returns true for. This method corresponds to [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
+
+    The callback method should have the following signature:
+
+    ```javascript
+    function(item, index, array);
+    ```
+
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array itself.
+
+    All parameters are optional. The function should return `true` to include the item
+    in the results, and `false` otherwise.
+
+    Example:
+
+    ```javascript
+    function isAdult(person) {
+      return person.age > 18;
+    };
+
+    let people = Ember.A([{ name: 'John', age: 14 }, { name: 'Joan', age: 45 }]);
+
+    people.filter(isAdult); // returns [{ name: 'Joan', age: 45 }];
+    ```
+
+    Note that in addition to a callback, you can pass an optional target object
+    that will be set as `this` on the context. This is a good way to give your
+    iterator function access to the current object. For example:
+
+    ```javascript
+    function isAdultAndEngineer(person) {
+      return person.age > 18 && this.engineering;
+    }
+
+    class AdultsCollection {
+      engineering = false;
+
+      constructor(opts = {}) {
+        super(...arguments);
+
+        this.engineering = opts.engineering;
+        this.people = Ember.A([{ name: 'John', age: 14 }, { name: 'Joan', age: 45 }]);
+      }
+    }
+
+    let collection = new AdultsCollection({ engineering: true });
+    collection.people.filter(isAdultAndEngineer, { target: collection });
+    ```
+
+    @method filter
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Array} A filtered array.
+    @public
+  */
+  filter<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
+    assert('`filter` expects a function as first argument.', typeof callback === 'function');
+
+    let ret = A();
+
+    this.forEach((x, idx, i) => {
+      if (callback.call(target, x, idx, i)) {
+        ret.push(x);
+      }
+    });
+
+    return ret;
+  },
+
+  /**
+    Returns an array with all of the items in the enumeration where the passed
+    function returns false. This method is the inverse of filter().
+
+    The callback method you provide should have the following signature (all
+    parameters are optional):
+
+    ```javascript
+    function(item, index, array);
+    ```
+
+    - *item* is the current item in the iteration.
+    - *index* is the current index in the iteration
+    - *array* is the array itself.
+
+    It should return a falsey value to include the item in the results.
+
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as "this" on the context. This is a good way
+    to give your iterator function access to the current object.
+
+    Example Usage:
+
+    ```javascript
+    const food = [
+      { food: 'apple', isFruit: true },
+      { food: 'bread', isFruit: false },
+      { food: 'banana', isFruit: true }
+    ];
+    const nonFruits = food.reject(function(thing) {
+      return thing.isFruit;
+    }); // [{food: 'bread', isFruit: false}]
+    ```
+
+    @method reject
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Array} A rejected array.
+    @public
+  */
+  reject<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
+    assert('`reject` expects a function as first argument.', typeof callback === 'function');
+    return this.filter(function () {
+      // @ts-expect-error TS doesn't like us using arguments like this
+      return !callback.apply(target, arguments);
+    });
+  },
+
+  /**
+    Filters the array by the property and an optional value. If a value is given, it returns
+    the items that have said value for the property. If not, it returns all the items that
+    have a truthy value for the property.
+
+    Example Usage:
+
+    ```javascript
+    let things = Ember.A([{ food: 'apple', isFruit: true }, { food: 'beans', isFruit: false }]);
+
+    things.filterBy('food', 'beans'); // [{ food: 'beans', isFruit: false }]
+    things.filterBy('isFruit'); // [{ food: 'apple', isFruit: true }]
+    ```
+
+    @method filterBy
+    @param {String} key the property to test
+    @param {*} [value] optional value to test against.
+    @return {Array} filtered array
+    @public
+  */
+  filterBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    return this.filter(iter(...arguments));
+  },
+
+  /**
+    Returns an array with the items that do not have truthy values for the provided key.
+    You can pass an optional second argument with a target value to reject for the key.
+    Otherwise this will reject objects where the provided property evaluates to false.
+
+    Example Usage:
+
+    ```javascript
+      let food = [
+        { name: "apple", isFruit: true },
+        { name: "carrot", isFruit: false },
+        { name: "bread", isFruit: false },
+      ];
+      food.rejectBy('isFruit'); // [{ name: "carrot", isFruit: false }, { name: "bread", isFruit: false }]
+      food.rejectBy('name', 'carrot'); // [{ name: "apple", isFruit: true }}, { name: "bread", isFruit: false }]
+    ```
+
+    @method rejectBy
+    @param {String} key the property to test
+    @param {*} [value] optional value to test against.
+    @return {Array} rejected array
+    @public
+  */
+  rejectBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    return this.reject(iter(...arguments));
+  },
+
+  /**
+    Returns the first item in the array for which the callback returns true.
+    This method is similar to the `find()` method defined in ECMAScript 2015.
+
+    The callback method you provide should have the following signature (all
+    parameters are optional):
+
+    ```javascript
+    function(item, index, array);
+    ```
+
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array itself.
+
+    It should return the `true` to include the item in the results, `false`
+    otherwise.
+
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as `this` on the context. This is a good way
+    to give your iterator function access to the current object.
+
+    Example Usage:
+
+    ```javascript
+    let users = [
+      { id: 1, name: 'Yehuda' },
+      { id: 2, name: 'Tom' },
+      { id: 3, name: 'Melanie' },
+      { id: 4, name: 'Leah' }
+    ];
+
+    users.find((user) => user.name == 'Tom'); // [{ id: 2, name: 'Tom' }]
+    users.find(({ id }) => id == 3); // [{ id: 3, name: 'Melanie' }]
+    ```
+
+    @method find
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Object} Found item or `undefined`.
+    @public
+  */
+  find(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
+    assert('`find` expects a function as first argument.', typeof callback === 'function');
+    return find(this, callback, target);
+  },
+
+  /**
+    Returns the first item with a property matching the passed value. You
+    can pass an optional second argument with the target value. Otherwise
+    this will match any property that evaluates to `true`.
+
+    This method works much like the more generic `find()` method.
+
+    Usage Example:
+
+    ```javascript
+    let users = [
+      { id: 1, name: 'Yehuda', isTom: false },
+      { id: 2, name: 'Tom', isTom: true },
+      { id: 3, name: 'Melanie', isTom: false },
+      { id: 4, name: 'Leah', isTom: false }
+    ];
+
+    users.findBy('id', 4); // { id: 4, name: 'Leah', isTom: false }
+    users.findBy('name', 'Melanie'); // { id: 3, name: 'Melanie', isTom: false }
+    users.findBy('isTom'); // { id: 2, name: 'Tom', isTom: true }
+    ```
+
+    @method findBy
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against.
+    @return {Object} found item or `undefined`
+    @public
+  */
+  findBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    let callback = iter(...arguments);
+    return find(this, callback);
+  },
+
+  /**
+    Returns `true` if the passed function returns true for every item in the
+    enumeration. This corresponds with the `Array.prototype.every()` method defined in ES5.
+
+    The callback method should have the following signature:
+
+    ```javascript
+    function(item, index, array);
+    ```
+
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array itself.
+
+    All params are optional. The method should return `true` or `false`.
+
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as `this` on the context. This is a good way
+    to give your iterator function access to the current object.
+
+    Usage example:
+
+    ```javascript
+    function isAdult(person) {
+      return person.age > 18;
+    };
+
+    const people = Ember.A([{ name: 'John', age: 24 }, { name: 'Joan', age: 45 }]);
+    const areAllAdults = people.every(isAdult);
+    ```
+
+    @method every
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Boolean}
+    @public
+  */
+  every(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
+    assert('`every` expects a function as first argument.', typeof callback === 'function');
+    return every(this, callback, target);
+  },
+
+  /**
+    Returns `true` if the passed property resolves to the value of the second
+    argument for all items in the array. This method is often simpler/faster
+    than using a callback.
+
+    Note that like the native `Array.every`, `isEvery` will return true when called
+    on any empty array.
+    ```javascript
+    class Language {
+      constructor(name, isProgrammingLanguage) {
+        this.name = name;
+        this.programmingLanguage = isProgrammingLanguage;
+      }
+    }
+
+    const compiledLanguages = [
+      new Language('Java', true),
+      new Language('Go', true),
+      new Language('Rust', true)
+    ]
+
+    const languagesKnownByMe = [
+      new Language('Javascript', true),
+      new Language('English', false),
+      new Language('Ruby', true)
+    ]
+
+    compiledLanguages.isEvery('programmingLanguage'); // true
+    languagesKnownByMe.isEvery('programmingLanguage'); // false
+    ```
+
+    @method isEvery
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against. Defaults to `true`
+    @return {Boolean}
+    @since 1.3.0
+    @public
+  */
+  isEvery() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    let callback = iter(...arguments);
+    return every(this, callback);
+  },
+
+  /**
+    The any() method executes the callback function once for each element
+    present in the array until it finds the one where callback returns a truthy
+    value (i.e. `true`). If such an element is found, any() immediately returns
+    true. Otherwise, any() returns false.
+
+    ```javascript
+    function(item, index, array);
+    ```
+
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array object itself.
+
+    Note that in addition to a callback, you can also pass an optional target
+    object that will be set as `this` on the context. It can be a good way
+    to give your iterator function access to an object in cases where an ES6
+    arrow function would not be appropriate.
+
+    Usage Example:
+
+    ```javascript
+    let includesManager = people.any(this.findPersonInManagersList, this);
+
+    let includesStockHolder = people.any(person => {
+      return this.findPersonInStockHoldersList(person)
+    });
+
+    if (includesManager || includesStockHolder) {
+      Paychecks.addBiggerBonus();
+    }
+    ```
+
+    @method any
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Boolean} `true` if the passed function returns `true` for any item
+    @public
+  */
+  any(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
+    assert('`any` expects a function as first argument.', typeof callback === 'function');
+    return any(this, callback, target);
+  },
+
+  /**
+    Returns `true` if the passed property resolves to the value of the second
+    argument for any item in the array. This method is often simpler/faster
+    than using a callback.
+
+    Example usage:
+
+    ```javascript
+    const food = [
+      { food: 'apple', isFruit: true },
+      { food: 'bread', isFruit: false },
+      { food: 'banana', isFruit: true }
+    ];
+
+    food.isAny('isFruit'); // true
+    ```
+
+    @method isAny
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against. Defaults to `true`
+    @return {Boolean}
+    @since 1.3.0
+    @public
+  */
+  isAny() {
+    // @ts-expect-error TS doesn't like us using arguments like this
+    let callback = iter(...arguments);
+    return any(this, callback);
+  },
+
+  /**
+    This will combine the values of the array into a single value. It
+    is a useful way to collect a summary value from an array. This
+    corresponds to the `reduce()` method defined in JavaScript 1.8.
+
+    The callback method you provide should have the following signature (all
+    parameters are optional):
+
+    ```javascript
+    function(previousValue, item, index, array);
+    ```
+
+    - `previousValue` is the value returned by the last call to the iterator.
+    - `item` is the current item in the iteration.
+    - `index` is the current index in the iteration.
+    - `array` is the array itself.
+
+    Return the new cumulative value.
+
+    In addition to the callback you can also pass an `initialValue`. An error
+    will be raised if you do not pass an initial value and the enumerator is
+    empty.
+
+    Note that unlike the other methods, this method does not allow you to
+    pass a target object to set as this for the callback. It's part of the
+    spec. Sorry.
+
+    Example Usage:
+
+    ```javascript
+      let numbers = [1, 2, 3, 4, 5];
+
+      numbers.reduce(function(summation, current) {
+        return summation + current;
+      }); // 15 (1 + 2 + 3 + 4 + 5)
+
+      numbers.reduce(function(summation, current) {
+        return summation + current;
+      }, -15); // 0 (-15 + 1 + 2 + 3 + 4 + 5)
+
+
+      let binaryValues = [true, false, false];
+
+      binaryValues.reduce(function(truthValue, current) {
+        return truthValue && current;
+      }); // false (true && false && false)
+    ```
+
+    @method reduce
+    @param {Function} callback The callback to execute
+    @param {Object} initialValue Initial value for the reduce
+    @return {Object} The reduced value.
+    @public
+  */
+  // FIXME: When called without initialValue, behavior does not match native behavior
+  reduce<T, V>(
+    this: EmberArray<T>,
+    callback: (summation: V, current: T, index: number, arr: EmberArray<T>) => V,
+    initialValue: V
+  ) {
+    assert('`reduce` expects a function as first argument.', typeof callback === 'function');
+
+    let ret = initialValue;
+
+    this.forEach(function (item, i) {
+      ret = callback(ret, item, i, this);
+    }, this);
+
+    return ret;
+  },
+
+  /**
+    Invokes the named method on every object in the receiver that
+    implements it. This method corresponds to the implementation in
+    Prototype 1.6.
+
+    ```javascript
+    class Person {
+      name = null;
+
+      constructor(name) {
+        this.name = name;
+      }
+
+      greet(prefix='Hello') {
+        return `${prefix} ${this.name}`;
+      }
+    }
+
+    let people = [new Person('Joe'), new Person('Matt')];
+
+    people.invoke('greet'); // ['Hello Joe', 'Hello Matt']
+    people.invoke('greet', 'Bonjour'); // ['Bonjour Joe', 'Bonjour Matt']
+    ```
+
+    @method invoke
+    @param {String} methodName the name of the method
+    @param {Object...} args optional arguments to pass as well.
+    @return {Array} return values from calling invoke.
+    @public
+  */
+  invoke<T>(this: EmberArray<T>, methodName: string, ...args: unknown[]) {
+    let ret = A();
+
+    // SAFETY: This is not entirely safe and the code will not work with Ember proxies
+    this.forEach((item: T) => ret.push((item as any)[methodName]?.(...args)));
+
+    return ret;
+  },
+
+  /**
+    Simply converts the object into a genuine array. The order is not
+    guaranteed. Corresponds to the method implemented by Prototype.
+
+    @method toArray
+    @return {Array} the object as an array.
+    @public
+  */
+  toArray<T>(this: EmberArray<T>) {
+    return this.map((item: T) => item);
+  },
+
+  /**
+    Returns a copy of the array with all `null` and `undefined` elements removed.
+
+    ```javascript
+    let arr = ['a', null, 'c', undefined];
+    arr.compact();  // ['a', 'c']
+    ```
+
+    @method compact
+    @return {Array} the array without null and undefined elements.
+    @public
+  */
+  compact<T>(this: EmberArray<T>) {
+    return this.filter((value: T) => value != null);
+  },
+
+  /**
+    Used to determine if the array contains the passed object.
+    Returns `true` if found, `false` otherwise.
+
+    The optional `startAt` argument can be used to pass a starting
+    index to search from, effectively slicing the searchable portion
+    of the array. If it's negative it will add the array length to
+    the startAt value passed in as the index to search from. If less
+    than or equal to `-1 * array.length` the entire array is searched.
+
+    This method has the same behavior of JavaScript's [Array.includes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes).
+
+    ```javascript
+    [1, 2, 3].includes(2);     // true
+    [1, 2, 3].includes(4);     // false
+    [1, 2, 3].includes(3, 2);  // true
+    [1, 2, 3].includes(3, 3);  // false
+    [1, 2, 3].includes(3, -1); // true
+    [1, 2, 3].includes(1, -1); // false
+    [1, 2, 3].includes(1, -4); // true
+    [1, 2, NaN].includes(NaN); // true
+    ```
+
+    @method includes
+    @param {Object} object The object to search for.
+    @param {Number} startAt optional starting location to search, default 0
+    @return {Boolean} `true` if object is found in the array.
+    @public
+  */
+  includes<T>(this: EmberArray<T>, object: T, startAt?: number) {
+    return indexOf(this, object, startAt, true) !== -1;
+  },
+
+  /**
+    Sorts the array by the keys specified in the argument.
+
+    You may provide multiple arguments to sort by multiple properties.
+
+    ```javascript
+   let colors = [
+     { name: 'red', weight: 500 },
+     { name: 'green', weight: 600 },
+     { name: 'blue', weight: 500 }
+    ];
+
+   colors.sortBy('name');
+   // [{name: 'blue', weight: 500}, {name: 'green', weight: 600}, {name: 'red', weight: 500}]
+
+   colors.sortBy('weight', 'name');
+   // [{name: 'blue', weight: 500}, {name: 'red', weight: 500}, {name: 'green', weight: 600}]
+   ```
+
+    @method sortBy
+    @param {String} property name(s) to sort on
+    @return {Array} The sorted array.
+    @since 1.2.0
+    @public
+  */
+  sortBy<T>(this: EmberArray<T>) {
+    let sortKeys = arguments;
+
+    return this.toArray().sort((a: T, b: T) => {
+      for (let i = 0; i < sortKeys.length; i++) {
+        let key = sortKeys[i];
+        let propA = get(a, key);
+        let propB = get(b, key);
+        // return 1 or -1 else continue to the next sortKey
+        let compareValue = compare(propA, propB);
+
+        if (compareValue) {
+          return compareValue;
+        }
+      }
+      return 0;
+    });
+  },
+
+  /**
+    Returns a new array that contains only unique values. The default
+    implementation returns an array regardless of the receiver type.
+
+    ```javascript
+    let arr = ['a', 'a', 'b', 'b'];
+    arr.uniq();  // ['a', 'b']
+    ```
+
+    This only works on primitive data types, e.g. Strings, Numbers, etc.
+
+    @method uniq
+    @return {EmberArray}
+    @public
+  */
+  uniq() {
+    return uniqBy(this);
+  },
+
+  /**
+    Returns a new array that contains only items containing a unique property value.
+    The default implementation returns an array regardless of the receiver type.
+
+    ```javascript
+    let arr = [{ value: 'a' }, { value: 'a' }, { value: 'b' }, { value: 'b' }];
+    arr.uniqBy('value');  // [{ value: 'a' }, { value: 'b' }]
+
+    let arr = [2.2, 2.1, 3.2, 3.3];
+    arr.uniqBy(Math.floor);  // [2.2, 3.2];
+    ```
+
+    @method uniqBy
+    @param {String,Function} key
+    @return {EmberArray}
+    @public
+  */
+
+  uniqBy(key: string) {
+    return uniqBy(this, key);
+  },
+
+  /**
+    Returns a new array that excludes the passed value. The default
+    implementation returns an array regardless of the receiver type.
+    If the receiver does not contain the value it returns the original array.
+
+    ```javascript
+    let arr = ['a', 'b', 'a', 'c'];
+    arr.without('a');  // ['b', 'c']
+    ```
+
+    @method without
+    @param {Object} value
+    @return {EmberArray}
+    @public
+  */
+  without<T>(this: EmberArray<T>, value: T) {
+    if (!this.includes(value)) {
+      return this; // nothing to do
+    }
+
+    // SameValueZero comparison (NaN !== NaN)
+    let predicate = value === value ? (item: T) => item !== value : (item: T) => item === item;
+    return this.filter(predicate);
+  },
+});
+
+/**
+  This mixin defines the API for modifying array-like objects. These methods
+  can be applied only to a collection that keeps its items in an ordered set.
+  It builds upon the Array mixin and adds methods to modify the array.
+  One concrete implementations of this class include ArrayProxy.
+
+  It is important to use the methods in this class to modify arrays so that
+  changes are observable. This allows the binding system in Ember to function
+  correctly.
+
+
+  Note that an Array can change even if it does not implement this mixin.
+  For example, one might implement a SparseArray that cannot be directly
+  modified, but if its underlying enumerable changes, it will change also.
+
+  @class MutableArray
+  @uses EmberArray
+  @uses MutableEnumerable
+  @public
+*/
+interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
+  replace(idx: number, amt: number, objects?: readonly T[]): void;
+  clear(): this;
+  insertAt(idx: number, object: T): this;
+  removeAt(start: number, len?: number): this;
+  pushObject(obj: T): this;
+  pushObjects(objects: T[]): this;
+  popObject(): T | undefined;
+  shiftObject(): T | null | undefined;
+  unshiftObject(object: T): this;
+  unshiftObjects(objects: T[]): this;
+  reverseObjects(): this;
+  setObjects(object: T[]): this;
+  removeObject(object: T): this;
+  removeObjects(objects: T[]): this;
+  addObject(obj: T): this;
+  addObjects(objects: T[]): this;
+}
+const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
+  /**
+    __Required.__ You must implement this method to apply this mixin.
+
+    This is one of the primitives you must implement to support `Array`.
+    You should replace amt objects started at idx with the objects in the
+    passed array.
+
+    Note that this method is expected to validate the type(s) of objects that it expects.
+
+    @method replace
+    @param {Number} idx Starting index in the array to replace. If
+      idx >= length, then append to the end of the array.
+    @param {Number} amt Number of elements that should be removed from
+      the array, starting at *idx*.
+    @param {EmberArray} [objects] An optional array of zero or more objects that should be
+      inserted into the array at *idx*
+    @public
+  */
+
+  /**
+    Remove all elements from the array. This is useful if you
+    want to reuse an existing array without having to recreate it.
+
+    ```javascript
+    let colors = ['red', 'green', 'blue'];
+
+    colors.length;  // 3
+    colors.clear(); // []
+    colors.length;  // 0
+    ```
+
+    @method clear
+    @return {Array} An empty Array.
+    @public
+  */
+  clear() {
+    let len = this.length;
+    if (len === 0) {
+      return this;
+    }
+
+    this.replace(0, len, EMPTY_ARRAY);
+    return this;
+  },
+
+  /**
+    This will use the primitive `replace()` method to insert an object at the
+    specified index.
+
+    ```javascript
+    let colors = ['red', 'green', 'blue'];
+
+    colors.insertAt(2, 'yellow');  // ['red', 'green', 'yellow', 'blue']
+    colors.insertAt(5, 'orange');  // Error: Index out of range
+    ```
+
+    @method insertAt
+    @param {Number} idx index of insert the object at.
+    @param {Object} object object to insert
+    @return {EmberArray} receiver
+    @public
+  */
+  insertAt(idx: number, object: unknown) {
+    insertAt(this, idx, object);
+    return this;
+  },
+
+  /**
+    Remove an object at the specified index using the `replace()` primitive
+    method. You can pass either a single index, or a start and a length.
+
+    If you pass a start and length that is beyond the
+    length this method will throw an assertion.
+
+    ```javascript
+    let colors = ['red', 'green', 'blue', 'yellow', 'orange'];
+
+    colors.removeAt(0);     // ['green', 'blue', 'yellow', 'orange']
+    colors.removeAt(2, 2);  // ['green', 'blue']
+    colors.removeAt(4, 2);  // Error: Index out of range
+    ```
+
+    @method removeAt
+    @param {Number} start index, start of range
+    @param {Number} len length of passing range
+    @return {EmberArray} receiver
+    @public
+  */
+  removeAt(start: number, len?: number) {
+    return removeAt(this, start, len);
+  },
+
+  /**
+    Push the object onto the end of the array. Works just like `push()` but it
+    is KVO-compliant.
+
+    ```javascript
+    let colors = ['red', 'green'];
+
+    colors.pushObject('black');     // ['red', 'green', 'black']
+    colors.pushObject(['yellow']);  // ['red', 'green', ['yellow']]
+    ```
+
+    @method pushObject
+    @param {*} obj object to push
+    @return object same object passed as a param
+    @public
+  */
+  pushObject<T>(this: MutableArray<T>, obj: T) {
+    return insertAt(this, this.length, obj);
+  },
+
+  /**
+    Add the objects in the passed array to the end of the array. Defers
+    notifying observers of the change until all objects are added.
+
+    ```javascript
+    let colors = ['red'];
+
+    colors.pushObjects(['yellow', 'orange']);  // ['red', 'yellow', 'orange']
+    ```
+
+    @method pushObjects
+    @param {Array} objects the objects to add
+    @return {MutableArray} receiver
+    @public
+  */
+  pushObjects<T>(this: MutableArray<T>, objects: T[]) {
+    this.replace(this.length, 0, objects);
+    return this;
+  },
+
+  /**
+    Pop object from array or nil if none are left. Works just like `pop()` but
+    it is KVO-compliant.
+
+    ```javascript
+    let colors = ['red', 'green', 'blue'];
+
+    colors.popObject();   // 'blue'
+    console.log(colors);  // ['red', 'green']
+    ```
+
+    @method popObject
+    @return object
+    @public
+  */
+  popObject() {
+    let len = this.length;
+    if (len === 0) {
+      return null;
+    }
+
+    let ret = objectAt(this, len - 1);
+    this.removeAt(len - 1, 1);
+    return ret;
+  },
+
+  /**
+    Shift an object from start of array or nil if none are left. Works just
+    like `shift()` but it is KVO-compliant.
+
+    ```javascript
+    let colors = ['red', 'green', 'blue'];
+
+    colors.shiftObject();  // 'red'
+    console.log(colors);   // ['green', 'blue']
+    ```
+
+    @method shiftObject
+    @return object
+    @public
+  */
+  shiftObject() {
+    if (this.length === 0) {
+      return null;
+    }
+
+    let ret = objectAt(this, 0);
+    this.removeAt(0);
+    return ret;
+  },
+
+  /**
+    Unshift an object to start of array. Works just like `unshift()` but it is
+    KVO-compliant.
+
+    ```javascript
+    let colors = ['red'];
+
+    colors.unshiftObject('yellow');    // ['yellow', 'red']
+    colors.unshiftObject(['black']);   // [['black'], 'yellow', 'red']
+    ```
+
+    @method unshiftObject
+    @param {*} obj object to unshift
+    @return object same object passed as a param
+    @public
+  */
+  unshiftObject<T>(this: MutableArray<T>, obj: T) {
+    return insertAt(this, 0, obj);
+  },
+
+  /**
+    Adds the named objects to the beginning of the array. Defers notifying
+    observers until all objects have been added.
+
+    ```javascript
+    let colors = ['red'];
+
+    colors.unshiftObjects(['black', 'white']);   // ['black', 'white', 'red']
+    colors.unshiftObjects('yellow'); // Type Error: 'undefined' is not a function
+    ```
+
+    @method unshiftObjects
+    @param {Enumerable} objects the objects to add
+    @return {EmberArray} receiver
+    @public
+  */
+  unshiftObjects<T>(this: MutableArray<T>, objects: T[]) {
+    this.replace(0, 0, objects);
+    return this;
+  },
+
+  /**
+    Reverse objects in the array. Works just like `reverse()` but it is
+    KVO-compliant.
+
+    @method reverseObjects
+    @return {EmberArray} receiver
+     @public
+  */
+  reverseObjects() {
+    let len = this.length;
+    if (len === 0) {
+      return this;
+    }
+
+    let objects = this.toArray().reverse();
+    this.replace(0, len, objects);
+    return this;
+  },
+
+  /**
+    Replace all the receiver's content with content of the argument.
+    If argument is an empty array receiver will be cleared.
+
+    ```javascript
+    let colors = ['red', 'green', 'blue'];
+
+    colors.setObjects(['black', 'white']);  // ['black', 'white']
+    colors.setObjects([]);                  // []
+    ```
+
+    @method setObjects
+    @param {EmberArray} objects array whose content will be used for replacing
+        the content of the receiver
+    @return {EmberArray} receiver with the new content
+    @public
+  */
+  setObjects<T>(this: MutableArray<T>, objects: T[]) {
+    if (objects.length === 0) {
+      return this.clear();
+    }
+
+    let len = this.length;
+    this.replace(0, len, objects);
+    return this;
+  },
+
+  /**
+    Remove all occurrences of an object in the array.
+
+    ```javascript
+    let cities = ['Chicago', 'Berlin', 'Lima', 'Chicago'];
+
+    cities.removeObject('Chicago');  // ['Berlin', 'Lima']
+    cities.removeObject('Lima');     // ['Berlin']
+    cities.removeObject('Tokyo')     // ['Berlin']
+    ```
+
+    @method removeObject
+    @param {*} obj object to remove
+    @return {EmberArray} receiver
+    @public
+  */
+  removeObject<T>(this: MutableArray<T>, obj: T) {
+    let loc = this.length || 0;
+    while (--loc >= 0) {
+      let curObject = objectAt(this, loc);
+
+      if (curObject === obj) {
+        this.removeAt(loc);
+      }
+    }
+    return this;
+  },
+
+  /**
+    Removes each object in the passed array from the receiver.
+
+    @method removeObjects
+    @param {EmberArray} objects the objects to remove
+    @return {EmberArray} receiver
+    @public
+  */
+  removeObjects<T>(this: MutableArray<T>, objects: T[]) {
+    beginPropertyChanges();
+    for (let i = objects.length - 1; i >= 0; i--) {
+      // SAFETY: Due to the loop structure we know this will always exist.
+      this.removeObject(objects[i]!);
+    }
+    endPropertyChanges();
+    return this;
+  },
+
+  /**
+    Push the object onto the end of the array if it is not already
+    present in the array.
+
+    ```javascript
+    let cities = ['Chicago', 'Berlin'];
+
+    cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
+    cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
+    ```
+
+    @method addObject
+    @param {*} obj object to add, if not already present
+    @return {EmberArray} receiver
+    @public
+  */
+  addObject<T>(this: MutableArray<T>, obj: T) {
+    let included = this.includes(obj);
+
+    if (!included) {
+      this.pushObject(obj);
+    }
+
+    return this;
+  },
+
+  /**
+    Adds each object in the passed array to the receiver.
+
+    @method addObjects
+    @param {EmberArray} objects the objects to add.
+    @return {EmberArray} receiver
+    @public
+  */
+  addObjects<T>(this: MutableArray<T>, objects: T[]) {
+    beginPropertyChanges();
+    objects.forEach((obj) => this.addObject(obj));
+    endPropertyChanges();
+    return this;
+  },
+});
+
+/**
+  Creates an `Ember.NativeArray` from an Array-like object.
+  Does not modify the original object's contents. `A()` is not needed if
+  `EmberENV.EXTEND_PROTOTYPES` is `true` (the default value). However,
+  it is recommended that you use `A()` when creating addons for
+  ember or when you can not guarantee that `EmberENV.EXTEND_PROTOTYPES`
+  will be `true`.
+
+  Example
+
+  ```app/components/my-component.js
+  import Component from '@ember/component';
+  import { A } from '@ember/array';
+
+  export default Component.extend({
+    tagName: 'ul',
+    classNames: ['pagination'],
+
+    init() {
+      this._super(...arguments);
+
+      if (!this.get('content')) {
+        this.set('content', A());
+        this.set('otherContent', A([1,2,3]));
+      }
+    }
+  });
+  ```
+
+  @method A
+  @static
+  @for @ember/array
+  @return {Ember.NativeArray}
+  @public
+*/
+
+// Add Ember.Array to Array.prototype. Remove methods with native
+// implementations and supply some more optimized versions of generic methods
+// because they are so common.
+/**
+@module ember
+*/
+/**
+  The NativeArray mixin contains the properties needed to make the native
+  Array support MutableArray and all of its dependent APIs. Unless you
+  have `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Array` set to
+  false, this will be applied automatically. Otherwise you can apply the mixin
+  at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
+
+  @class Ember.NativeArray
+  @uses MutableArray
+  @uses Observable
+  @public
+*/
+interface NativeArray<T>
+  extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
+    MutableArray<T> {}
+
+let NativeArray = Mixin.create(MutableArray, Observable, {
+  objectAt(idx: number) {
+    return this[idx];
+  },
+
+  // primitive for array support.
+  replace(start: number, deleteCount: number, items = EMPTY_ARRAY) {
+    assert('The third argument to replace needs to be an array.', Array.isArray(items));
+
+    replaceInNativeArray(this, start, deleteCount, items);
+
+    return this;
+  },
+});
+
+// Remove any methods implemented natively so we don't override them
+const ignore = ['length'];
+NativeArray.keys().forEach((methodName) => {
+  // SAFETY: It's safe to read unknown properties from an object
+  if ((Array.prototype as any)[methodName]) {
+    ignore.push(methodName);
+  }
+});
+
+NativeArray = NativeArray.without(...ignore);
+
+let A: <T>(arr?: Array<T>) => NativeArray<T>;
+
+if (ENV.EXTEND_PROTOTYPES.Array) {
+  NativeArray.apply(Array.prototype, true);
+
+  A = function <T>(this: unknown, arr?: Array<T>) {
+    assert(
+      'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
+      !(this instanceof A)
+    );
+
+    // SAFTEY: Since we are extending prototypes all true native arrays are Ember NativeArrays
+    return (arr || []) as NativeArray<T>;
+  };
+} else {
+  A = function <T>(this: unknown, arr?: Array<T>) {
+    assert(
+      'You cannot create an Ember Array with `new A()`, please update to calling A as a function: `A()`',
+      !(this instanceof A)
+    );
+
+    if (isEmberArray(arr)) {
+      // SAFETY: If it's a true native array and it is also an EmberArray then it should be an Ember NativeArray
+      return arr as NativeArray<T>;
+    } else {
+      // SAFETY: This will return an NativeArray but TS can't infer that.
+      return NativeArray.apply(arr ?? []) as NativeArray<T>;
+    }
+  };
+}
+
+export { A, NativeArray, MutableArray };
+
+export default EmberArray;
diff --git a/packages/@ember/array/mutable.ts b/packages/@ember/array/mutable.ts
index b0c602bb11c..6f996faf8c0 100644
--- a/packages/@ember/array/mutable.ts
+++ b/packages/@ember/array/mutable.ts
@@ -1 +1 @@
-export { MutableArray as default } from '@ember/-internals/runtime';
+export { MutableArray as default } from '@ember/array';
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 5f29bbf0a55..93fb004c87c 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1,7 +1,8 @@
 import { classify, dasherize } from '@ember/string';
-import type { NativeArray } from '@ember/-internals/runtime';
+import type { NativeArray } from '@ember/array';
 import EmberObject from '@ember/object';
-import { A as emberA, typeOf } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import { typeOf } from '@ember/-internals/runtime';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import type { Resolver } from '@ember/-internals/container/lib/registry';
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 27f01728b01..8b8f9c43b91 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -4,9 +4,9 @@ import { _backburner } from '@ember/runloop';
 import { get } from '@ember/-internals/metal';
 import { dasherize } from '@ember/string';
 import Namespace from '@ember/application/namespace';
-import type { NativeArray } from '@ember/-internals/runtime';
+import type { NativeArray } from '@ember/array';
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import type { Cache } from '@glimmer/validator';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
diff --git a/packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts b/packages/@ember/enumerable/mutable.ts
similarity index 100%
rename from packages/@ember/-internals/runtime/lib/mixins/mutable_enumerable.ts
rename to packages/@ember/enumerable/mutable.ts
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index 264747c1e1c..29d162b84b3 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -4,9 +4,9 @@
 import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
 import { computed, autoComputed, get, isElementDescriptor } from '@ember/-internals/metal';
-import { compare, A as emberA, uniqBy as uniqByArray } from '@ember/-internals/runtime';
-import type { NativeArray } from '@ember/-internals/runtime/lib/mixins/array';
-import EmberArray from '@ember/-internals/runtime/lib/mixins/array';
+import { compare } from '@ember/-internals/runtime';
+import EmberArray, { A as emberA, uniqBy as uniqByArray } from '@ember/array';
+import type { NativeArray } from '@ember/array';
 
 function isNativeOrEmberArray(obj: unknown): obj is unknown[] | EmberArray<unknown> {
   return Array.isArray(obj) || EmberArray.detect(obj);
diff --git a/packages/@ember/object/tests/computed/computed_macros_test.js b/packages/@ember/object/tests/computed/computed_macros_test.js
index 3d8c04ce0b9..745fc481b36 100644
--- a/packages/@ember/object/tests/computed/computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/computed_macros_test.js
@@ -18,7 +18,7 @@ import {
 } from '@ember/object/computed';
 
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index cea5f309744..ffd41421fca 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -7,10 +7,9 @@ import {
   addObserver,
   computed,
 } from '@ember/-internals/metal';
-import { removeAt } from '@ember/-internals/runtime';
 import EmberObject, { observer } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
-import { isArray, A as emberA } from '@ember/array';
+import { isArray, A as emberA, removeAt } from '@ember/array';
 import {
   sum,
   min,
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 6dc3624c34a..f41aed5f9d7 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -16,7 +16,8 @@ import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
 import EmberObject from '@ember/object';
 import Evented from '@ember/object/evented';
-import { A as emberA, ActionHandler, typeOf } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import { ActionHandler, typeOf } from '@ember/-internals/runtime';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 895f9feed0c..6978d96dab9 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -22,7 +22,8 @@ import EmberLocation from '@ember/routing/location';
 import type { ILocation as IEmberLocation } from '@ember/routing/location';
 import type RouterService from '@ember/routing/router-service';
 import EmberObject from '@ember/object';
-import { A as emberA, typeOf } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
+import { typeOf } from '@ember/-internals/runtime';
 import Evented from '@ember/object/evented';
 import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 586dc830ef4..3d782035077 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -33,18 +33,12 @@ import {
   ContainerProxyMixin,
   compare,
   isEqual,
-  Array as EmberArray,
-  MutableEnumerable,
-  MutableArray,
   typeOf,
-  isArray,
   _ProxyMixin,
   RSVP,
   Comparable,
   ArrayProxy,
   ActionHandler,
-  NativeArray,
-  A,
 } from '@ember/-internals/runtime';
 import {
   Component,
@@ -71,12 +65,15 @@ import EmberError from '@ember/error';
 import { run } from '@ember/runloop';
 import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 import { getOwner, setOwner } from '@ember/-internals/owner';
+import EmberArray, { A, NativeArray, isArray } from '@ember/array';
+import MutableArray from '@ember/array/mutable';
 import Application, { onLoad, runLoadHooks } from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
 import Namespace from '@ember/application/namespace';
 import Engine from '@ember/engine';
 import EngineInstance from '@ember/engine/instance';
 import Enumerable from '@ember/enumerable';
+import MutableEnumerable from '@ember/enumerable/mutable';
 import CoreObject from '@ember/object/core';
 import Evented from '@ember/object/evented';
 import Mixin, { mixin } from '@ember/object/mixin';
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index 8e210876337..925350fecc7 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -1,7 +1,7 @@
 import Route from '@ember/routing/route';
 import { computed } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 0c9273afa72..4903011c625 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -2,7 +2,7 @@
 import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { computed, set } from '@ember/-internals/metal';
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 52a096c97f6..2e0b2c890dc 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1,7 +1,8 @@
 import Controller from '@ember/controller';
 import { dasherize } from '@ember/string';
 import EmberObject from '@ember/object';
-import { RSVP, A as emberA } from '@ember/-internals/runtime';
+import { RSVP } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { run } from '@ember/runloop';
 import { peekMeta } from '@ember/-internals/meta';
 import { get, computed, tracked } from '@ember/-internals/metal';
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index 97b28be6518..093426cdc80 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import Route from '@ember/routing/route';
 import { computed } from '@ember/-internals/metal';
 import { QueryParamTestCase, moduleFor, runLoopSettled } from 'internal-test-helpers';
diff --git a/packages/ember/tests/routing/template_rendering_test.js b/packages/ember/tests/routing/template_rendering_test.js
index ab9be48996d..9be3064f212 100644
--- a/packages/ember/tests/routing/template_rendering_test.js
+++ b/packages/ember/tests/routing/template_rendering_test.js
@@ -2,7 +2,7 @@
 import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/-internals/runtime';
+import { A as emberA } from '@ember/array';
 import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';

From e4e97ecd3a5b79369eab7c43674aac372bf93265 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 15:10:40 -0700
Subject: [PATCH 1068/1405] Consolidate @ember/array/proxy

---
 .../integration/components/tracked-test.js    |   2 +-
 .../tests/integration/syntax/each-test.js     |   3 +-
 .../tests/utils/shared-conditional-tests.js   |   2 +-
 packages/@ember/-internals/metal/index.ts     |   1 +
 packages/@ember/-internals/runtime/index.ts   |   1 -
 .../runtime/lib/system/array_proxy.ts         | 405 -----------------
 .../runtime/tests/core/is_array_test.js       |   2 +-
 .../runtime/tests/core/is_empty_test.js       |   2 +-
 .../-internals/runtime/tests/helpers/array.js |   2 +-
 .../tests/mixins/mutable_enumerable_test.js   |   2 +-
 .../array_proxy/arranged_content_test.js      |   2 +-
 .../system/array_proxy/content_change_test.js |   2 +-
 .../tests/system/array_proxy/length_test.js   |   2 +-
 .../watching_and_listening_test.js            |   2 +-
 packages/@ember/array/proxy.ts                | 406 +++++++++++++++++-
 packages/ember/index.js                       |   2 +-
 16 files changed, 419 insertions(+), 419 deletions(-)
 delete mode 100644 packages/@ember/-internals/runtime/lib/system/array_proxy.ts

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 481599207ed..7609bb9a91f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -1,6 +1,6 @@
 import EmberObject from '@ember/object';
 import { A } from '@ember/array';
-import { ArrayProxy } from '@ember/-internals/runtime';
+import ArrayProxy from '@ember/array/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import {
   computed,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 8de22d80cf1..8648becbde8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -2,7 +2,8 @@ import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'inter
 
 import { get, set, notifyPropertyChange, computed, on } from '@ember/-internals/metal';
 import { A as emberA } from '@ember/array';
-import { ArrayProxy, RSVP } from '@ember/-internals/runtime';
+import ArrayProxy from '@ember/array/proxy';
+import { RSVP } from '@ember/-internals/runtime';
 
 import { Component, htmlSafe } from '../../utils/helpers';
 import {
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 2ab5cb5cdca..101afb78af9 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -7,7 +7,7 @@ import { get, set } from '@ember/-internals/metal';
 import EmberObject from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import { A as emberA, removeAt } from '@ember/array';
-import { ArrayProxy } from '@ember/-internals/runtime';
+import ArrayProxy from '@ember/array/proxy';
 
 import { Component } from './helpers';
 
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 5601f7cd4c3..62f180e2053 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -41,6 +41,7 @@ export {
   changeProperties,
   endPropertyChanges,
   notifyPropertyChange,
+  PropertyDidChange,
   PROPERTY_DID_CHANGE,
 } from './lib/property_events';
 export { defineProperty, defineDecorator, defineValue } from './lib/properties';
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index 94cf95c8073..138f3bacbb0 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -4,7 +4,6 @@ export { default as compare } from './lib/compare';
 export { default as isEqual } from './lib/is-equal';
 export { default as Comparable } from './lib/mixins/comparable';
 export { NativeArray } from '@ember/array';
-export { default as ArrayProxy } from './lib/system/array_proxy';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as MutableEnumerable } from '@ember/enumerable/mutable';
diff --git a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts b/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
deleted file mode 100644
index 19ca0cc33c7..00000000000
--- a/packages/@ember/-internals/runtime/lib/system/array_proxy.ts
+++ /dev/null
@@ -1,405 +0,0 @@
-/**
-@module @ember/array
-*/
-
-import {
-  get,
-  objectAt,
-  alias,
-  PROPERTY_DID_CHANGE,
-  addArrayObserver,
-  removeArrayObserver,
-  replace,
-  arrayContentDidChange,
-  arrayContentWillChange,
-  tagForProperty,
-} from '@ember/-internals/metal';
-import { isObject } from '@ember/-internals/utils';
-import EmberObject from '@ember/object';
-import EmberArray from '@ember/array';
-import MutableArray from '@ember/array/mutable';
-import { assert } from '@ember/debug';
-import { setCustomTagFor } from '@glimmer/manager';
-import type { Tag, Revision } from '@glimmer/validator';
-import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
-import type { PropertyDidChange } from '@ember/-internals/metal/lib/property_events';
-
-function isMutable<T>(obj: T[] | EmberArray<T>): obj is T[] | MutableArray<T> {
-  return Array.isArray(obj) || typeof (obj as MutableArray<T>).replace === 'function';
-}
-
-const ARRAY_OBSERVER_MAPPING = {
-  willChange: '_arrangedContentArrayWillChange',
-  didChange: '_arrangedContentArrayDidChange',
-};
-
-function customTagForArrayProxy(proxy: object, key: string) {
-  assert('[BUG] Expected a proxy', proxy instanceof ArrayProxy);
-
-  if (key === '[]') {
-    proxy._revalidate();
-
-    return proxy._arrTag!;
-  } else if (key === 'length') {
-    proxy._revalidate();
-
-    return proxy._lengthTag!;
-  }
-
-  return tagFor(proxy, key);
-}
-
-/**
-  An ArrayProxy wraps any other object that implements `Array` and/or
-  `MutableArray,` forwarding all requests. This makes it very useful for
-  a number of binding use cases or other cases where being able to swap
-  out the underlying array is useful.
-
-  A simple example of usage:
-
-  ```javascript
-  import { A } from '@ember/array';
-  import ArrayProxy from '@ember/array/proxy';
-
-  let pets = ['dog', 'cat', 'fish'];
-  let ap = ArrayProxy.create({ content: A(pets) });
-
-  ap.get('firstObject');                        // 'dog'
-  ap.set('content', ['amoeba', 'paramecium']);
-  ap.get('firstObject');                        // 'amoeba'
-  ```
-
-  This class can also be useful as a layer to transform the contents of
-  an array, as they are accessed. This can be done by overriding
-  `objectAtContent`:
-
-  ```javascript
-  import { A } from '@ember/array';
-  import ArrayProxy from '@ember/array/proxy';
-
-  let pets = ['dog', 'cat', 'fish'];
-  let ap = ArrayProxy.create({
-      content: A(pets),
-      objectAtContent: function(idx) {
-          return this.get('content').objectAt(idx).toUpperCase();
-      }
-  });
-
-  ap.get('firstObject'); // . 'DOG'
-  ```
-
-  When overriding this class, it is important to place the call to
-  `_super` *after* setting `content` so the internal observers have
-  a chance to fire properly:
-
-  ```javascript
-  import { A } from '@ember/array';
-  import ArrayProxy from '@ember/array/proxy';
-
-  export default ArrayProxy.extend({
-    init() {
-      this.set('content', A(['dog', 'cat', 'fish']));
-      this._super(...arguments);
-    }
-  });
-  ```
-
-  @class ArrayProxy
-  @extends EmberObject
-  @uses MutableArray
-  @public
-*/
-// eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars
-interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArray<T> {}
-class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
-  extends EmberObject
-  implements PropertyDidChange
-{
-  /*
-    `this._objectsDirtyIndex` determines which indexes in the `this._objects`
-    cache are dirty.
-
-    If `this._objectsDirtyIndex === -1` then no indexes are dirty.
-    Otherwise, an index `i` is dirty if `i >= this._objectsDirtyIndex`.
-
-    Calling `objectAt` with a dirty index will cause the `this._objects`
-    cache to be recomputed.
-  */
-  /** @internal */
-  _objectsDirtyIndex = 0;
-  /** @internal */
-  _objects: null | T[] = null;
-
-  /** @internal */
-  _lengthDirty = true;
-  /** @internal */
-  _length = 0;
-
-  /** @internal */
-  _arrangedContent: C | null = null;
-  /** @internal */
-  _arrangedContentIsUpdating = false;
-  /** @internal */
-  _arrangedContentTag: Tag | null = null;
-  /** @internal */
-  _arrangedContentRevision: Revision | null = null;
-  /** @internal */
-  _lengthTag: Tag | null = null;
-  /** @internal */
-  _arrTag: Tag | null = null;
-
-  init(props: object | undefined) {
-    super.init(props);
-
-    setCustomTagFor(this, customTagForArrayProxy);
-  }
-
-  [PROPERTY_DID_CHANGE]() {
-    this._revalidate();
-  }
-
-  willDestroy() {
-    this._removeArrangedContentArrayObserver();
-  }
-
-  /**
-    The content array. Must be an object that implements `Array` and/or
-    `MutableArray.`
-
-    @property content
-    @type EmberArray
-    @public
-  */
-  declare content: C | null;
-
-  declare arrangedContent: C | null;
-
-  /**
-    Should actually retrieve the object at the specified index from the
-    content. You can override this method in subclasses to transform the
-    content item to something new.
-
-    This method will only be called if content is non-`null`.
-
-    @method objectAtContent
-    @param {Number} idx The index to retrieve.
-    @return {Object} the value or undefined if none found
-    @public
-  */
-  objectAtContent(idx: number) {
-    let arrangedContent = get(this, 'arrangedContent');
-    assert('[BUG] Called objectAtContent without content', arrangedContent);
-    return objectAt<T>(arrangedContent, idx);
-  }
-
-  // See additional docs for `replace` from `MutableArray`:
-  // https://api.emberjs.com/ember/release/classes/MutableArray/methods/replace?anchor=replace
-  replace(idx: number, amt: number, objects?: T[]) {
-    assert(
-      'Mutating an arranged ArrayProxy is not allowed',
-      get(this, 'arrangedContent') === get(this, 'content')
-    );
-    this.replaceContent(idx, amt, objects);
-  }
-
-  /**
-    Should actually replace the specified objects on the content array.
-    You can override this method in subclasses to transform the content item
-    into something new.
-
-    This method will only be called if content is non-`null`.
-
-    @method replaceContent
-    @param {Number} idx The starting index
-    @param {Number} amt The number of items to remove from the content.
-    @param {Array} objects Optional array of objects to insert.
-    @return {void}
-    @public
-  */
-  replaceContent(idx: number, amt: number, objects?: T[]) {
-    let content = get(this, 'content');
-    assert('[BUG] Called replaceContent without content', content);
-    assert('Mutating a non-mutable array is not allowed', isMutable(content));
-    replace<T>(content, idx, amt, objects);
-  }
-
-  // Overriding objectAt is not supported.
-  objectAt(idx: number) {
-    this._revalidate();
-
-    if (this._objects === null) {
-      this._objects = [];
-    }
-
-    if (this._objectsDirtyIndex !== -1 && idx >= this._objectsDirtyIndex) {
-      let arrangedContent = get(this, 'arrangedContent') as C | null;
-      if (arrangedContent) {
-        let length = (this._objects.length = get(arrangedContent, 'length'));
-
-        for (let i = this._objectsDirtyIndex; i < length; i++) {
-          // SAFETY: This is expected to only ever return an instance of T. In other words, there should
-          // be no gaps in the array. Unfortunately, we can't actually assert for it since T could include
-          // any types, including null or undefined.
-          this._objects[i] = this.objectAtContent(i)!;
-        }
-      } else {
-        this._objects.length = 0;
-      }
-      this._objectsDirtyIndex = -1;
-    }
-
-    return this._objects[idx];
-  }
-
-  // Overriding length is not supported.
-  get length() {
-    this._revalidate();
-
-    if (this._lengthDirty) {
-      let arrangedContent = get(this, 'arrangedContent') as C | null;
-      this._length = arrangedContent ? get(arrangedContent, 'length') : 0;
-      this._lengthDirty = false;
-    }
-
-    assert('[BUG] _lengthTag is not set', this._lengthTag);
-    consumeTag(this._lengthTag);
-
-    return this._length;
-  }
-
-  set length(value) {
-    let length = this.length;
-    let removedCount = length - value;
-    let added: T[] | undefined;
-
-    if (removedCount === 0) {
-      return;
-    } else if (removedCount < 0) {
-      added = new Array(-removedCount);
-      removedCount = 0;
-    }
-
-    let content = get(this, 'content') as C | null;
-    if (content) {
-      assert('Mutating a non-mutable array is not allowed', isMutable(content));
-      replace<T>(content, value, removedCount, added);
-
-      this._invalidate();
-    }
-  }
-
-  _updateArrangedContentArray(arrangedContent: C | null) {
-    let oldLength = this._objects === null ? 0 : this._objects.length;
-    let newLength = arrangedContent ? get(arrangedContent, 'length') : 0;
-
-    this._removeArrangedContentArrayObserver();
-    arrayContentWillChange(this, 0, oldLength, newLength);
-
-    this._invalidate();
-
-    arrayContentDidChange(this, 0, oldLength, newLength, false);
-    this._addArrangedContentArrayObserver(arrangedContent);
-  }
-
-  _addArrangedContentArrayObserver(arrangedContent: C | null) {
-    if (arrangedContent && !(arrangedContent as any).isDestroyed) {
-      // @ts-expect-error This check is still good for ensuring correctness
-      assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
-      assert(
-        `ArrayProxy expects a native Array, EmberArray, or ArrayProxy, but you passed ${typeof arrangedContent}`,
-        (function (arr: unknown): arr is EmberArray<unknown> {
-          return Array.isArray(arr) || EmberArray.detect(arr);
-        })(arrangedContent)
-      );
-      assert(
-        'ArrayProxy expected its contents to not be destroyed',
-        !(arrangedContent as any).isDestroyed
-      );
-
-      addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING);
-
-      this._arrangedContent = arrangedContent;
-    }
-  }
-
-  _removeArrangedContentArrayObserver() {
-    if (this._arrangedContent) {
-      removeArrayObserver(this._arrangedContent, this, ARRAY_OBSERVER_MAPPING);
-    }
-  }
-
-  _arrangedContentArrayWillChange() {}
-
-  _arrangedContentArrayDidChange(
-    _proxy: unknown,
-    idx: number,
-    removedCnt: number,
-    addedCnt: number
-  ) {
-    arrayContentWillChange(this, idx, removedCnt, addedCnt);
-
-    let dirtyIndex = idx;
-    if (dirtyIndex < 0) {
-      let length = get(this._arrangedContent!, 'length');
-      dirtyIndex += length + removedCnt - addedCnt;
-    }
-
-    if (this._objectsDirtyIndex === -1 || this._objectsDirtyIndex > dirtyIndex) {
-      this._objectsDirtyIndex = dirtyIndex;
-    }
-
-    this._lengthDirty = true;
-
-    arrayContentDidChange(this, idx, removedCnt, addedCnt, false);
-  }
-
-  _invalidate() {
-    this._objectsDirtyIndex = 0;
-    this._lengthDirty = true;
-  }
-
-  _revalidate() {
-    if (this._arrangedContentIsUpdating === true) return;
-
-    if (
-      this._arrangedContentTag === null ||
-      !validateTag(this._arrangedContentTag, this._arrangedContentRevision!)
-    ) {
-      let arrangedContent = this.get('arrangedContent') as C | null;
-
-      if (this._arrangedContentTag === null) {
-        // This is the first time the proxy has been setup, only add the observer
-        // don't trigger any events
-        this._addArrangedContentArrayObserver(arrangedContent);
-      } else {
-        this._arrangedContentIsUpdating = true;
-        this._updateArrangedContentArray(arrangedContent);
-        this._arrangedContentIsUpdating = false;
-      }
-
-      let arrangedContentTag = (this._arrangedContentTag = tagFor(this, 'arrangedContent'));
-      this._arrangedContentRevision = valueForTag(this._arrangedContentTag);
-
-      if (isObject(arrangedContent)) {
-        this._lengthTag = combine([arrangedContentTag, tagForProperty(arrangedContent, 'length')]);
-        this._arrTag = combine([arrangedContentTag, tagForProperty(arrangedContent, '[]')]);
-      } else {
-        this._lengthTag = this._arrTag = arrangedContentTag;
-      }
-    }
-  }
-}
-
-ArrayProxy.reopen(MutableArray, {
-  /**
-    The array that the proxy pretends to be. In the default `ArrayProxy`
-    implementation, this and `content` are the same. Subclasses of `ArrayProxy`
-    can override this property to provide things like sorting and filtering.
-
-    @property arrangedContent
-    @public
-  */
-  arrangedContent: alias('content'),
-});
-
-export default ArrayProxy;
diff --git a/packages/@ember/-internals/runtime/tests/core/is_array_test.js b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
index d53f1cb1eff..089c8bfd9cb 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_array_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_array_test.js
@@ -1,5 +1,5 @@
 import { A as emberA, isArray } from '@ember/array';
-import ArrayProxy from '../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import EmberObject from '@ember/object';
 import { window } from '@ember/-internals/browser-environment';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
index 64da70de489..65a8687af7a 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
@@ -1,5 +1,5 @@
 import { isEmpty } from '@ember/-internals/metal';
-import ArrayProxy from '../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import ObjectProxy from '@ember/object/proxy';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index c11d0976419..02d33016bff 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -1,4 +1,4 @@
-import ArrayProxy from '../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import EmberArray, { A as emberA } from '@ember/array'
 import MutableArray from '@ember/array/mutable';
 import { generateGuid, guidFor } from '@ember/-internals/utils';
diff --git a/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js b/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js
index ee931c30b73..0a8af297f24 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/mutable_enumerable_test.js
@@ -1,5 +1,5 @@
 import MutableEnumerable from '@ember/enumerable/mutable';
-import ArrayProxy from '../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
index 89d1989cc2f..0cd45599ebe 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { computed, objectAt } from '@ember/-internals/metal';
-import ArrayProxy from '../../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
index b7ac7fde365..44f20a1ab6d 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
 import { set, changeProperties } from '@ember/-internals/metal';
-import ArrayProxy from '../../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
index 47af11fbe7f..e234c83243c 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
@@ -1,4 +1,4 @@
-import ArrayProxy from '../../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import EmberObject, { observer } from '@ember/object';
 import { oneWay as reads, not } from '@ember/object/computed';
 import { A as a } from '@ember/array';
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js
index fff64ebb835..8ff87454e2b 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/watching_and_listening_test.js
@@ -1,5 +1,5 @@
 import { peekMeta } from '@ember/-internals/meta';
-import ArrayProxy from '../../../lib/system/array_proxy';
+import ArrayProxy from '@ember/array/proxy';
 import { A } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts
index d59edcba733..46b500cf244 100644
--- a/packages/@ember/array/proxy.ts
+++ b/packages/@ember/array/proxy.ts
@@ -1 +1,405 @@
-export { ArrayProxy as default } from '@ember/-internals/runtime';
+/**
+@module @ember/array
+*/
+
+import {
+  get,
+  objectAt,
+  alias,
+  PROPERTY_DID_CHANGE,
+  addArrayObserver,
+  removeArrayObserver,
+  replace,
+  arrayContentDidChange,
+  arrayContentWillChange,
+  tagForProperty,
+} from '@ember/-internals/metal';
+import type { PropertyDidChange } from '@ember/-internals/metal';
+import { isObject } from '@ember/-internals/utils';
+import EmberObject from '@ember/object';
+import EmberArray from '@ember/array';
+import MutableArray from '@ember/array/mutable';
+import { assert } from '@ember/debug';
+import { setCustomTagFor } from '@glimmer/manager';
+import type { Tag, Revision } from '@glimmer/validator';
+import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
+
+function isMutable<T>(obj: T[] | EmberArray<T>): obj is T[] | MutableArray<T> {
+  return Array.isArray(obj) || typeof (obj as MutableArray<T>).replace === 'function';
+}
+
+const ARRAY_OBSERVER_MAPPING = {
+  willChange: '_arrangedContentArrayWillChange',
+  didChange: '_arrangedContentArrayDidChange',
+};
+
+function customTagForArrayProxy(proxy: object, key: string) {
+  assert('[BUG] Expected a proxy', proxy instanceof ArrayProxy);
+
+  if (key === '[]') {
+    proxy._revalidate();
+
+    return proxy._arrTag!;
+  } else if (key === 'length') {
+    proxy._revalidate();
+
+    return proxy._lengthTag!;
+  }
+
+  return tagFor(proxy, key);
+}
+
+/**
+  An ArrayProxy wraps any other object that implements `Array` and/or
+  `MutableArray,` forwarding all requests. This makes it very useful for
+  a number of binding use cases or other cases where being able to swap
+  out the underlying array is useful.
+
+  A simple example of usage:
+
+  ```javascript
+  import { A } from '@ember/array';
+  import ArrayProxy from '@ember/array/proxy';
+
+  let pets = ['dog', 'cat', 'fish'];
+  let ap = ArrayProxy.create({ content: A(pets) });
+
+  ap.get('firstObject');                        // 'dog'
+  ap.set('content', ['amoeba', 'paramecium']);
+  ap.get('firstObject');                        // 'amoeba'
+  ```
+
+  This class can also be useful as a layer to transform the contents of
+  an array, as they are accessed. This can be done by overriding
+  `objectAtContent`:
+
+  ```javascript
+  import { A } from '@ember/array';
+  import ArrayProxy from '@ember/array/proxy';
+
+  let pets = ['dog', 'cat', 'fish'];
+  let ap = ArrayProxy.create({
+      content: A(pets),
+      objectAtContent: function(idx) {
+          return this.get('content').objectAt(idx).toUpperCase();
+      }
+  });
+
+  ap.get('firstObject'); // . 'DOG'
+  ```
+
+  When overriding this class, it is important to place the call to
+  `_super` *after* setting `content` so the internal observers have
+  a chance to fire properly:
+
+  ```javascript
+  import { A } from '@ember/array';
+  import ArrayProxy from '@ember/array/proxy';
+
+  export default ArrayProxy.extend({
+    init() {
+      this.set('content', A(['dog', 'cat', 'fish']));
+      this._super(...arguments);
+    }
+  });
+  ```
+
+  @class ArrayProxy
+  @extends EmberObject
+  @uses MutableArray
+  @public
+*/
+// eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars
+interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArray<T> {}
+class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
+  extends EmberObject
+  implements PropertyDidChange
+{
+  /*
+    `this._objectsDirtyIndex` determines which indexes in the `this._objects`
+    cache are dirty.
+
+    If `this._objectsDirtyIndex === -1` then no indexes are dirty.
+    Otherwise, an index `i` is dirty if `i >= this._objectsDirtyIndex`.
+
+    Calling `objectAt` with a dirty index will cause the `this._objects`
+    cache to be recomputed.
+  */
+  /** @internal */
+  _objectsDirtyIndex = 0;
+  /** @internal */
+  _objects: null | T[] = null;
+
+  /** @internal */
+  _lengthDirty = true;
+  /** @internal */
+  _length = 0;
+
+  /** @internal */
+  _arrangedContent: C | null = null;
+  /** @internal */
+  _arrangedContentIsUpdating = false;
+  /** @internal */
+  _arrangedContentTag: Tag | null = null;
+  /** @internal */
+  _arrangedContentRevision: Revision | null = null;
+  /** @internal */
+  _lengthTag: Tag | null = null;
+  /** @internal */
+  _arrTag: Tag | null = null;
+
+  init(props: object | undefined) {
+    super.init(props);
+
+    setCustomTagFor(this, customTagForArrayProxy);
+  }
+
+  [PROPERTY_DID_CHANGE]() {
+    this._revalidate();
+  }
+
+  willDestroy() {
+    this._removeArrangedContentArrayObserver();
+  }
+
+  /**
+    The content array. Must be an object that implements `Array` and/or
+    `MutableArray.`
+
+    @property content
+    @type EmberArray
+    @public
+  */
+  declare content: C | null;
+
+  declare arrangedContent: C | null;
+
+  /**
+    Should actually retrieve the object at the specified index from the
+    content. You can override this method in subclasses to transform the
+    content item to something new.
+
+    This method will only be called if content is non-`null`.
+
+    @method objectAtContent
+    @param {Number} idx The index to retrieve.
+    @return {Object} the value or undefined if none found
+    @public
+  */
+  objectAtContent(idx: number) {
+    let arrangedContent = get(this, 'arrangedContent');
+    assert('[BUG] Called objectAtContent without content', arrangedContent);
+    return objectAt<T>(arrangedContent, idx);
+  }
+
+  // See additional docs for `replace` from `MutableArray`:
+  // https://api.emberjs.com/ember/release/classes/MutableArray/methods/replace?anchor=replace
+  replace(idx: number, amt: number, objects?: T[]) {
+    assert(
+      'Mutating an arranged ArrayProxy is not allowed',
+      get(this, 'arrangedContent') === get(this, 'content')
+    );
+    this.replaceContent(idx, amt, objects);
+  }
+
+  /**
+    Should actually replace the specified objects on the content array.
+    You can override this method in subclasses to transform the content item
+    into something new.
+
+    This method will only be called if content is non-`null`.
+
+    @method replaceContent
+    @param {Number} idx The starting index
+    @param {Number} amt The number of items to remove from the content.
+    @param {Array} objects Optional array of objects to insert.
+    @return {void}
+    @public
+  */
+  replaceContent(idx: number, amt: number, objects?: T[]) {
+    let content = get(this, 'content');
+    assert('[BUG] Called replaceContent without content', content);
+    assert('Mutating a non-mutable array is not allowed', isMutable(content));
+    replace<T>(content, idx, amt, objects);
+  }
+
+  // Overriding objectAt is not supported.
+  objectAt(idx: number) {
+    this._revalidate();
+
+    if (this._objects === null) {
+      this._objects = [];
+    }
+
+    if (this._objectsDirtyIndex !== -1 && idx >= this._objectsDirtyIndex) {
+      let arrangedContent = get(this, 'arrangedContent') as C | null;
+      if (arrangedContent) {
+        let length = (this._objects.length = get(arrangedContent, 'length'));
+
+        for (let i = this._objectsDirtyIndex; i < length; i++) {
+          // SAFETY: This is expected to only ever return an instance of T. In other words, there should
+          // be no gaps in the array. Unfortunately, we can't actually assert for it since T could include
+          // any types, including null or undefined.
+          this._objects[i] = this.objectAtContent(i)!;
+        }
+      } else {
+        this._objects.length = 0;
+      }
+      this._objectsDirtyIndex = -1;
+    }
+
+    return this._objects[idx];
+  }
+
+  // Overriding length is not supported.
+  get length() {
+    this._revalidate();
+
+    if (this._lengthDirty) {
+      let arrangedContent = get(this, 'arrangedContent') as C | null;
+      this._length = arrangedContent ? get(arrangedContent, 'length') : 0;
+      this._lengthDirty = false;
+    }
+
+    assert('[BUG] _lengthTag is not set', this._lengthTag);
+    consumeTag(this._lengthTag);
+
+    return this._length;
+  }
+
+  set length(value) {
+    let length = this.length;
+    let removedCount = length - value;
+    let added: T[] | undefined;
+
+    if (removedCount === 0) {
+      return;
+    } else if (removedCount < 0) {
+      added = new Array(-removedCount);
+      removedCount = 0;
+    }
+
+    let content = get(this, 'content') as C | null;
+    if (content) {
+      assert('Mutating a non-mutable array is not allowed', isMutable(content));
+      replace<T>(content, value, removedCount, added);
+
+      this._invalidate();
+    }
+  }
+
+  _updateArrangedContentArray(arrangedContent: C | null) {
+    let oldLength = this._objects === null ? 0 : this._objects.length;
+    let newLength = arrangedContent ? get(arrangedContent, 'length') : 0;
+
+    this._removeArrangedContentArrayObserver();
+    arrayContentWillChange(this, 0, oldLength, newLength);
+
+    this._invalidate();
+
+    arrayContentDidChange(this, 0, oldLength, newLength, false);
+    this._addArrangedContentArrayObserver(arrangedContent);
+  }
+
+  _addArrangedContentArrayObserver(arrangedContent: C | null) {
+    if (arrangedContent && !(arrangedContent as any).isDestroyed) {
+      // @ts-expect-error This check is still good for ensuring correctness
+      assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
+      assert(
+        `ArrayProxy expects a native Array, EmberArray, or ArrayProxy, but you passed ${typeof arrangedContent}`,
+        (function (arr: unknown): arr is EmberArray<unknown> {
+          return Array.isArray(arr) || EmberArray.detect(arr);
+        })(arrangedContent)
+      );
+      assert(
+        'ArrayProxy expected its contents to not be destroyed',
+        !(arrangedContent as any).isDestroyed
+      );
+
+      addArrayObserver(arrangedContent, this, ARRAY_OBSERVER_MAPPING);
+
+      this._arrangedContent = arrangedContent;
+    }
+  }
+
+  _removeArrangedContentArrayObserver() {
+    if (this._arrangedContent) {
+      removeArrayObserver(this._arrangedContent, this, ARRAY_OBSERVER_MAPPING);
+    }
+  }
+
+  _arrangedContentArrayWillChange() {}
+
+  _arrangedContentArrayDidChange(
+    _proxy: unknown,
+    idx: number,
+    removedCnt: number,
+    addedCnt: number
+  ) {
+    arrayContentWillChange(this, idx, removedCnt, addedCnt);
+
+    let dirtyIndex = idx;
+    if (dirtyIndex < 0) {
+      let length = get(this._arrangedContent!, 'length');
+      dirtyIndex += length + removedCnt - addedCnt;
+    }
+
+    if (this._objectsDirtyIndex === -1 || this._objectsDirtyIndex > dirtyIndex) {
+      this._objectsDirtyIndex = dirtyIndex;
+    }
+
+    this._lengthDirty = true;
+
+    arrayContentDidChange(this, idx, removedCnt, addedCnt, false);
+  }
+
+  _invalidate() {
+    this._objectsDirtyIndex = 0;
+    this._lengthDirty = true;
+  }
+
+  _revalidate() {
+    if (this._arrangedContentIsUpdating === true) return;
+
+    if (
+      this._arrangedContentTag === null ||
+      !validateTag(this._arrangedContentTag, this._arrangedContentRevision!)
+    ) {
+      let arrangedContent = this.get('arrangedContent') as C | null;
+
+      if (this._arrangedContentTag === null) {
+        // This is the first time the proxy has been setup, only add the observer
+        // don't trigger any events
+        this._addArrangedContentArrayObserver(arrangedContent);
+      } else {
+        this._arrangedContentIsUpdating = true;
+        this._updateArrangedContentArray(arrangedContent);
+        this._arrangedContentIsUpdating = false;
+      }
+
+      let arrangedContentTag = (this._arrangedContentTag = tagFor(this, 'arrangedContent'));
+      this._arrangedContentRevision = valueForTag(this._arrangedContentTag);
+
+      if (isObject(arrangedContent)) {
+        this._lengthTag = combine([arrangedContentTag, tagForProperty(arrangedContent, 'length')]);
+        this._arrTag = combine([arrangedContentTag, tagForProperty(arrangedContent, '[]')]);
+      } else {
+        this._lengthTag = this._arrTag = arrangedContentTag;
+      }
+    }
+  }
+}
+
+ArrayProxy.reopen(MutableArray, {
+  /**
+    The array that the proxy pretends to be. In the default `ArrayProxy`
+    implementation, this and `content` are the same. Subclasses of `ArrayProxy`
+    can override this property to provide things like sorting and filtering.
+
+    @property arrangedContent
+    @public
+  */
+  arrangedContent: alias('content'),
+});
+
+export default ArrayProxy;
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 3d782035077..d7419d296bf 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -37,7 +37,6 @@ import {
   _ProxyMixin,
   RSVP,
   Comparable,
-  ArrayProxy,
   ActionHandler,
 } from '@ember/-internals/runtime';
 import {
@@ -67,6 +66,7 @@ import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
 import { getOwner, setOwner } from '@ember/-internals/owner';
 import EmberArray, { A, NativeArray, isArray } from '@ember/array';
 import MutableArray from '@ember/array/mutable';
+import ArrayProxy from '@ember/array/proxy';
 import Application, { onLoad, runLoadHooks } from '@ember/application';
 import ApplicationInstance from '@ember/application/instance';
 import Namespace from '@ember/application/namespace';

From 77f4722d01d70c82d4088ab616ceda650a77c582 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 21:27:41 -0700
Subject: [PATCH 1069/1405] Simplify internals imports

---
 packages/@ember/-internals/container/index.ts       | 2 +-
 packages/@ember/-internals/glimmer/index.ts         | 2 +-
 packages/@ember/application/instance.ts             | 2 +-
 packages/@ember/debug/container-debug-adapter.ts    | 2 +-
 packages/@ember/engine/index.ts                     | 4 ++--
 packages/@ember/engine/instance.ts                  | 5 ++---
 packages/@ember/object/compat.ts                    | 2 +-
 packages/internal-test-helpers/lib/test-resolver.ts | 2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/@ember/-internals/container/index.ts b/packages/@ember/-internals/container/index.ts
index d3c5006ba40..94526572718 100644
--- a/packages/@ember/-internals/container/index.ts
+++ b/packages/@ember/-internals/container/index.ts
@@ -5,5 +5,5 @@ The public API, specified on the application namespace should be considered the
   @private
 */
 
-export { default as Registry, privatize } from './lib/registry';
+export { default as Registry, Resolver, ResolverClass, privatize } from './lib/registry';
 export { default as Container, getFactoryFor, setFactoryFor, INIT_FACTORY } from './lib/container';
diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index c4f5cc31ae3..825c26f6dbf 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -316,7 +316,7 @@ export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/
 // TODO just test these through public API
 // a lot of these are testing how a problem was solved
 // rather than the problem was solved
-export { default as OutletView } from './lib/views/outlet';
+export { default as OutletView, BootEnvironment } from './lib/views/outlet';
 export { OutletState } from './lib/utils/outlet';
 export {
   componentCapabilities,
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index f606a8ebb3b..ff297848244 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -8,7 +8,7 @@ import EngineInstance from '@ember/engine/instance';
 import type { BootOptions } from '@ember/engine/instance';
 import type Application from '@ember/application';
 import { renderSettled } from '@ember/-internals/glimmer';
-import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type { BootEnvironment } from '@ember/-internals/glimmer';
 import { assert } from '@ember/debug';
 import Router from '@ember/routing/router';
 import type { ViewMixin } from '@ember/-internals/views';
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 93fb004c87c..c69b1b2c433 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -5,7 +5,7 @@ import { A as emberA } from '@ember/array';
 import { typeOf } from '@ember/-internals/runtime';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import type { Resolver } from '@ember/-internals/container/lib/registry';
+import type { Resolver } from '@ember/-internals/container';
 import Namespace from '@ember/application/namespace';
 
 /**
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index fb9c6f4baa6..296eae2d1ac 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -4,6 +4,7 @@ import { canInvoke } from '@ember/-internals/utils';
 import Controller from '@ember/controller';
 import Namespace from '@ember/application/namespace';
 import { Registry } from '@ember/-internals/container';
+import type { ResolverClass } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
 import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
@@ -13,8 +14,7 @@ import EngineInstance from '@ember/engine/instance';
 import { RoutingService } from '@ember/-internals/routing';
 import { ComponentLookup } from '@ember/-internals/views';
 import { setupEngineRegistry } from '@ember/-internals/glimmer';
-import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
-import type { ResolverClass } from '@ember/-internals/container/lib/registry';
+import { RegistryProxyMixin } from '@ember/-internals/runtime';
 
 function props(obj: object) {
   let properties = [];
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 71563f8e39f..f49594c0a78 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -9,12 +9,11 @@ import EmberError from '@ember/error';
 import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
-import RegistryProxyMixin from '@ember/-internals/runtime/lib/mixins/registry_proxy';
-import ContainerProxyMixin from '@ember/-internals/runtime/lib/mixins/container_proxy';
+import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
 import { isFactory } from '@ember/-internals/owner';
 import Engine from '@ember/engine';
 import type Application from '@ember/application';
-import type { BootEnvironment } from '@ember/-internals/glimmer/lib/views/outlet';
+import type { BootEnvironment } from '@ember/-internals/glimmer';
 import type { SimpleElement } from '@simple-dom/interface';
 
 const CEngine = Engine;
diff --git a/packages/@ember/object/compat.ts b/packages/@ember/object/compat.ts
index 7458b9c0607..39265d27b66 100644
--- a/packages/@ember/object/compat.ts
+++ b/packages/@ember/object/compat.ts
@@ -5,7 +5,7 @@ import {
   isElementDescriptor,
   setClassicDecorator,
 } from '@ember/-internals/metal';
-import type { ElementDescriptor } from '@ember/-internals/metal/lib/decorator';
+import type { ElementDescriptor } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
 import type { UpdatableTag } from '@glimmer/validator';
 import { consumeTag, tagFor, track, updateTag } from '@glimmer/validator';
diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts
index e8c8be71390..df332029560 100644
--- a/packages/internal-test-helpers/lib/test-resolver.ts
+++ b/packages/internal-test-helpers/lib/test-resolver.ts
@@ -1,6 +1,6 @@
 import { compile } from 'ember-template-compiler';
 
-import type { Resolver as IResolver } from '@ember/-internals/container/lib/registry';
+import type { Resolver as IResolver } from '@ember/-internals/container';
 import type { Factory } from '@ember/-internals/owner';
 
 const DELIMITER = '%';

From 41f12234bc5d620698d3c22a1036aa615996e978 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 21:47:10 -0700
Subject: [PATCH 1070/1405] Standardize some @ember/object imports

---
 .../tests/integration/application/rendering-test.js   |  3 ++-
 .../components/angle-bracket-invocation-test.js       |  2 +-
 .../tests/integration/components/append-test.js       |  2 +-
 .../integration/components/attribute-bindings-test.js |  2 +-
 .../tests/integration/components/attrs-lookup-test.js |  2 +-
 .../integration/components/class-bindings-test.js     |  2 +-
 .../integration/components/curly-components-test.js   |  3 ++-
 .../integration/components/dynamic-components-test.js |  2 +-
 .../integration/components/error-handling-test.js     |  2 +-
 .../components/fragment-components-test.js            |  2 +-
 .../tests/integration/components/input-angle-test.js  |  2 +-
 .../tests/integration/components/input-curly-test.js  |  2 +-
 .../integration/components/instrumentation-test.js    |  2 +-
 .../tests/integration/components/life-cycle-test.js   |  2 +-
 .../components/link-to/rendering-angle-test.js        |  2 +-
 .../components/link-to/rendering-curly-test.js        |  2 +-
 .../integration/components/target-action-test.js      |  2 +-
 .../integration/components/textarea-angle-test.js     |  2 +-
 .../integration/components/textarea-curly-test.js     |  2 +-
 .../tests/integration/components/tracked-test.js      |  9 ++-------
 .../components/web-component-fallback-test.js         |  2 +-
 .../components/will-destroy-element-hook-test.js      |  2 +-
 .../glimmer/tests/integration/content-test.js         |  2 +-
 .../integration/custom-component-manager-test.js      |  2 +-
 .../tests/integration/custom-modifier-manager-test.js |  4 ++--
 .../glimmer/tests/integration/helpers/array-test.js   |  2 +-
 .../tests/integration/helpers/closure-action-test.js  |  2 +-
 .../glimmer/tests/integration/helpers/concat-test.js  |  2 +-
 .../tests/integration/helpers/custom-helper-test.js   |  2 +-
 .../helpers/default-helper-manager-test.js            |  2 +-
 .../tests/integration/helpers/element-action-test.js  |  2 +-
 .../glimmer/tests/integration/helpers/fn-test.js      |  2 +-
 .../glimmer/tests/integration/helpers/get-test.js     |  2 +-
 .../glimmer/tests/integration/helpers/hash-test.js    |  2 +-
 .../tests/integration/helpers/helper-manager-test.js  |  3 ++-
 .../tests/integration/helpers/invoke-helper-test.js   |  3 ++-
 .../glimmer/tests/integration/helpers/mut-test.js     |  2 +-
 .../tests/integration/helpers/readonly-test.js        |  2 +-
 .../glimmer/tests/integration/helpers/unbound-test.js |  2 +-
 .../tests/integration/helpers/unique-id-test.js       |  2 +-
 .../glimmer/tests/integration/helpers/yield-test.js   |  2 +-
 .../glimmer/tests/integration/input-test.js           |  2 +-
 .../glimmer/tests/integration/mount-test.js           |  2 +-
 .../glimmer/tests/integration/refinements-test.js     |  2 +-
 .../-internals/glimmer/tests/integration/svg-test.js  |  2 +-
 .../glimmer/tests/integration/syntax/each-in-test.js  |  2 +-
 .../glimmer/tests/integration/syntax/each-test.js     |  3 ++-
 .../tests/integration/syntax/if-unless-test.js        |  2 +-
 .../glimmer/tests/integration/syntax/let-test.js      |  2 +-
 .../integration/syntax/public-in-element-test.js      |  2 +-
 .../glimmer/tests/unit/runtime-resolver-cache-test.js |  2 +-
 .../glimmer/tests/utils/shared-conditional-tests.js   |  2 +-
 .../routing/tests/location/auto_location_test.js      |  2 +-
 .../routing/tests/location/hash_location_test.js      |  2 +-
 .../routing/tests/location/history_location_test.js   |  2 +-
 .../routing/tests/location/none_location_test.js      |  2 +-
 .../runtime/tests/array/firstObject-test.js           |  2 +-
 .../-internals/runtime/tests/array/forEach-test.js    |  2 +-
 .../runtime/tests/array/lastIndexOf-test.js           |  2 +-
 .../-internals/runtime/tests/array/lastObject-test.js |  2 +-
 .../@ember/-internals/runtime/tests/array/map-test.js |  2 +-
 .../-internals/runtime/tests/array/sortBy-test.js     |  2 +-
 .../@ember/-internals/runtime/tests/helpers/array.js  |  6 ++----
 .../tests/legacy_1x/mixins/observable/chained_test.js |  4 ++--
 .../tests/legacy_1x/system/object/base_test.js        |  2 +-
 .../legacy_1x/system/object/concatenated_test.js      |  2 +-
 .../-internals/runtime/tests/mixins/array_test.js     |  5 +----
 .../runtime/tests/mixins/comparable_test.js           |  2 +-
 .../runtime/tests/mixins/observable_test.js           |  4 ++--
 .../runtime/tests/mixins/promise_proxy_test.js        |  2 +-
 .../runtime/tests/mutable-array/addObject-test.js     |  2 +-
 .../runtime/tests/mutable-array/clear-test.js         |  2 +-
 .../runtime/tests/mutable-array/insertAt-test.js      |  2 +-
 .../runtime/tests/mutable-array/popObject-test.js     |  2 +-
 .../runtime/tests/mutable-array/pushObject-test.js    |  2 +-
 .../runtime/tests/mutable-array/removeAt-test.js      |  2 +-
 .../runtime/tests/mutable-array/removeObject-test.js  |  2 +-
 .../runtime/tests/mutable-array/removeObjects-test.js |  2 +-
 .../tests/mutable-array/reverseObjects-test.js        |  2 +-
 .../runtime/tests/mutable-array/setObjects-test.js    |  2 +-
 .../runtime/tests/mutable-array/shiftObject-test.js   |  2 +-
 .../runtime/tests/mutable-array/unshiftObject-test.js |  2 +-
 .../tests/mutable-array/unshiftObjects-test.js        |  2 +-
 .../tests/system/array_proxy/arranged_content_test.js |  3 ++-
 .../tests/system/array_proxy/content_change_test.js   |  3 ++-
 .../runtime/tests/system/array_proxy/length_test.js   |  2 +-
 .../runtime/tests/system/core_object_test.js          |  2 +-
 .../runtime/tests/system/object_proxy_test.js         |  4 ++--
 packages/@ember/application/instance.ts               |  2 +-
 packages/@ember/application/namespace.ts              |  2 +-
 packages/@ember/array/index.ts                        |  3 +--
 packages/@ember/array/proxy.ts                        |  2 +-
 packages/@ember/controller/index.ts                   |  3 +--
 packages/@ember/controller/tests/controller_test.js   |  2 +-
 packages/@ember/debug/data-adapter.ts                 |  2 +-
 packages/@ember/engine/index.ts                       |  2 +-
 .../@ember/object/lib/computed/computed_macros.ts     |  3 +--
 .../object/lib/computed/reduce_computed_macros.ts     |  3 ++-
 packages/@ember/object/observable.ts                  |  5 +----
 packages/@ember/object/promise-proxy-mixin.ts         |  2 +-
 .../object/tests/computed/computed_macros_test.js     |  4 ++--
 .../tests/computed/dependent-key-compat-test.js       |  4 ++--
 .../tests/computed/reduce_computed_macros_test.js     | 11 ++---------
 packages/@ember/object/tests/computed_test.js         | 11 ++---------
 packages/@ember/object/tests/create_test.js           |  4 ++--
 packages/@ember/object/tests/destroy_test.js          |  4 ++--
 packages/@ember/object/tests/es-compatibility-test.js |  3 +--
 packages/@ember/object/tests/extend_test.js           |  2 +-
 packages/@ember/object/tests/mixin/apply_test.js      |  2 +-
 packages/@ember/object/tests/observable_test.js       |  2 +-
 packages/@ember/object/tests/observer_test.js         |  4 ++--
 packages/@ember/object/tests/reopenClass_test.js      |  2 +-
 packages/@ember/routing/auto-location.ts              |  3 +--
 packages/@ember/routing/hash-location.ts              |  3 +--
 packages/@ember/routing/history-location.ts           |  3 +--
 packages/@ember/routing/none-location.ts              |  3 +--
 packages/@ember/routing/route.ts                      |  7 +------
 packages/@ember/routing/router.ts                     |  2 +-
 packages/ember-testing/lib/helpers/current_path.ts    |  2 +-
 .../ember-testing/lib/helpers/current_route_name.ts   |  2 +-
 packages/ember-testing/lib/helpers/current_url.ts     |  2 +-
 packages/ember/tests/homepage_example_test.js         |  3 +--
 packages/ember/tests/routing/decoupled_basic_test.js  |  4 ++--
 packages/ember/tests/routing/model_loading_test.js    |  2 +-
 packages/ember/tests/routing/query_params_test.js     |  4 ++--
 .../model_dependent_state_with_query_params_test.js   |  2 +-
 .../query_param_async_get_handler_test.js             |  2 +-
 .../tests/routing/router_service_test/basic_test.js   |  2 +-
 .../router_service_test/currenturl_lifecycle_test.js  |  2 +-
 .../router_service_test/non_application_test_test.js  |  2 +-
 .../routing/router_service_test/transitionTo_test.js  |  2 +-
 .../tests/routing/router_service_test/urlFor_test.js  |  2 +-
 packages/ember/tests/service_injection_test.js        |  2 +-
 133 files changed, 156 insertions(+), 189 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
index 6a93568543b..c2c26f167dd 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js
@@ -4,7 +4,8 @@ import { ENV } from '@ember/-internals/environment';
 import Controller from '@ember/controller';
 import Route from '@ember/routing/route';
 import { Component } from '@ember/-internals/glimmer';
-import { set, tracked } from '@ember/-internals/metal';
+import { tracked } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
 import { runTask } from '../../../../../../internal-test-helpers/lib/run';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
index 1ab88f336e5..5003545500f 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/angle-bracket-invocation-test.js
@@ -3,7 +3,7 @@ import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
 import { ENV } from '@ember/-internals/environment';
 import EmberObject from '@ember/object';
 
-import { set, setProperties } from '@ember/-internals/metal';
+import { set, setProperties } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
index 3534464a556..ae7cbd22079 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/append-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component, compile } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
index fcd5e9e10eb..5e2c967b96b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/attribute-bindings-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
index fc5b5519f6f..bc8c9f3e834 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/attrs-lookup-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, styles, runTask } from 'internal-test-helpers';
 
-import { set, computed } from '@ember/-internals/metal';
+import { set, computed } from '@ember/object';
 
 import { Component, htmlSafe } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
index b451caa8db5..cd46ec0e85c 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/class-bindings-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, strip, classes, runTask } from 'internal-test-helpers';
 
-import { set, computed } from '@ember/-internals/metal';
+import { set, computed } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index 42b06c88748..a2b3934e293 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -11,7 +11,8 @@ import {
 
 import { run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { alias, set, get, on, computed, tracked } from '@ember/-internals/metal';
+import { alias, on, tracked } from '@ember/-internals/metal';
+import { set, get, computed } from '@ember/object';
 import Service, { service } from '@ember/service';
 import EmberObject, { observer } from '@ember/object';
 import { A as emberA } from '@ember/array';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
index 6068811a1d9..7cf3d5aae22 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/dynamic-components-test.js
@@ -1,7 +1,7 @@
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { set, computed } from '@ember/-internals/metal';
+import { set, computed } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
index 0e7e2cb78a1..fa59168eb41 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/error-handling-test.js
@@ -2,7 +2,7 @@ import { DEBUG } from '@glimmer/env';
 
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
index 5d5fb77ae21..31de1c8dd44 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/fragment-components-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
index 8eb24a843b2..88f20df47da 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-angle-test.js
@@ -1,5 +1,5 @@
 import { moduleFor, RenderingTestCase, runDestroy, runTask } from 'internal-test-helpers';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 class InputRenderingTest extends RenderingTestCase {
   $input() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
index 8cabd37b8ec..1e8c4589cd9 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/input-curly-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runDestroy, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 class InputRenderingTest extends RenderingTestCase {
   $input() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js
index 2b925614848..8fa040151a7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/instrumentation-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import {
   subscribe as instrumentationSubscribe,
   reset as instrumentationReset,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
index 5dea0caa535..548375eac90 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/life-cycle-test.js
@@ -1,7 +1,7 @@
 import { classes, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
 import { schedule } from '@ember/runloop';
-import { set, setProperties } from '@ember/-internals/metal';
+import { set, setProperties } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { getViewElement, getViewId } from '@ember/-internals/views';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
index 6a9fb10a5f0..9af60c19238 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-angle-test.js
@@ -8,7 +8,7 @@ import {
 import Router from '@ember/routing/router';
 import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
index ffd4d892d0d..1cd6dd80ff0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/rendering-curly-test.js
@@ -1,7 +1,7 @@
 import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import Controller from '@ember/controller';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
index 26f7e978683..9500a1c2acc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/target-action-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import Controller from '@ember/controller';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
index 8969d9507ce..9be9d9d23e7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-angle-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, classes, applyMixins, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 class TextAreaRenderingTest extends RenderingTestCase {
   assertTextArea({ attrs, value } = {}) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
index 61b75addccf..adfbf2497cb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/textarea-curly-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, classes, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 class TextAreaRenderingTest extends RenderingTestCase {
   assertTextArea({ attrs, value } = {}) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
index 7609bb9a91f..8a17d5d007b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/tracked-test.js
@@ -2,13 +2,8 @@ import EmberObject from '@ember/object';
 import { A } from '@ember/array';
 import ArrayProxy from '@ember/array/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
-import {
-  computed,
-  get,
-  set,
-  tracked,
-  nativeDescDecorator as descriptor,
-} from '@ember/-internals/metal';
+import { tracked, nativeDescDecorator as descriptor } from '@ember/-internals/metal';
+import { computed, get, set } from '@ember/object';
 import { Promise } from 'rsvp';
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 import GlimmerishComponent from '../../utils/glimmerish-component';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js
index 18421b2951d..09721bf365a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/web-component-fallback-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   'Components test: web component fallback',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js
index b6d026aa1c6..952fee76ff8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/will-destroy-element-hook-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/content-test.js b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
index c3c8b0e2d79..de6d3127c14 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/content-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/content-test.js
@@ -2,7 +2,7 @@ import { DEBUG } from '@glimmer/env';
 
 import { RenderingTestCase, moduleFor, applyMixins, classes, runTask } from 'internal-test-helpers';
 
-import { set, computed } from '@ember/-internals/metal';
+import { set, computed } from '@ember/object';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import EmberObject from '@ember/object';
 import { readOnly } from '@ember/object/computed';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
index 5b3995731a2..4c42d0f6616 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-component-manager-test.js
@@ -3,7 +3,7 @@ import { moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-help
 
 import { componentCapabilities } from '@glimmer/manager';
 import EmberObject from '@ember/object';
-import { set, setProperties, computed } from '@ember/-internals/metal';
+import { set, setProperties, computed } from '@ember/object';
 import { setComponentManager } from '@ember/-internals/glimmer';
 
 const BasicComponentManager = EmberObject.extend({
diff --git a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
index d154456c40b..acea50be7db 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/custom-modifier-manager-test.js
@@ -9,8 +9,8 @@ import {
 
 import { Component } from '@ember/-internals/glimmer';
 import { setModifierManager, modifierCapabilities } from '@glimmer/manager';
-import EmberObject from '@ember/object';
-import { set, tracked } from '@ember/-internals/metal';
+import EmberObject, { set } from '@ember/object';
+import { tracked } from '@ember/-internals/metal';
 import { backtrackingMessageFor } from '../utils/debug-stack';
 
 class ModifierManagerTest extends RenderingTestCase {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
index fd16448b8bd..1b223a10522 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/array-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index 898638fa445..1b949c0ff91 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -5,7 +5,7 @@ import {
   unsubscribe as instrumentationUnsubscribe,
 } from '@ember/instrumentation';
 import { _getCurrentRunLoop } from '@ember/runloop';
-import { set, computed } from '@ember/-internals/metal';
+import { set, computed } from '@ember/object';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/concat-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/concat-test.js
index 1bd11730838..7f1565e6220 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/concat-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/concat-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   'Helpers test: {{concat}}',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
index 48c57757f00..6d9008deff3 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/custom-helper-test.js
@@ -8,7 +8,7 @@ import {
   defineSimpleHelper,
 } from 'internal-test-helpers';
 import { Helper, Component } from '@ember/-internals/glimmer';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   'Helpers test: custom helpers',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
index 8ea0256d5ff..86df21957ea 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { Component } from '@ember/-internals/glimmer';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { action } from '@ember/object';
 
 moduleFor(
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index febbc344141..ee13d29cf6b 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import {
   subscribe as instrumentationSubscribe,
   reset as instrumentationReset,
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
index c5b80ad52be..a2aa0b74eda 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/fn-test.js
@@ -1,4 +1,4 @@
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
index 9854393608f..d2946f5ea2e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/get-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
-import { set, get } from '@ember/-internals/metal';
+import { set, get } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 import GlimmerishComponent from '../../utils/glimmerish-component';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
index 342257212cf..decbbb138f4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/hash-test.js
@@ -2,7 +2,7 @@ import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
 import { Component } from '../../utils/helpers';
 
-import { set, computed } from '@ember/-internals/metal';
+import { set, computed } from '@ember/object';
 
 moduleFor(
   'Helpers test: {{hash}}',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
index b6fa6f88ca0..d5798d6a287 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/helper-manager-test.js
@@ -1,7 +1,8 @@
 import { DEBUG } from '@glimmer/env';
 import { helperCapabilities, setHelperManager, setModifierManager } from '@glimmer/manager';
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
-import { tracked, set } from '@ember/-internals/metal';
+import { tracked } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { setOwner } from '@ember/-internals/owner';
 import Service, { service } from '@ember/service';
 import { registerDestructor } from '@glimmer/destroyable';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index 5dd59e68023..68e09f62931 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -1,7 +1,8 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 import { helperCapabilities, setHelperManager } from '@glimmer/manager';
 import { Helper, helper, Component as EmberComponent } from '@ember/-internals/glimmer';
-import { tracked, set } from '@ember/-internals/metal';
+import { tracked } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { getOwner } from '@ember/-internals/owner';
 import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { service } from '@ember/service';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
index 78ca70f0d7c..01ace324f8d 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/mut-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, styles, runTask } from 'internal-test-helpers';
 
-import { set, get, computed } from '@ember/-internals/metal';
+import { set, get, computed } from '@ember/object';
 
 import { Component, htmlSafe } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js
index 842b354fdb7..aa6415d37cc 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/readonly-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
-import { set, get } from '@ember/-internals/metal';
+import { set, get } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
index 869b4f95adf..c0889c74b32 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unbound-test.js
@@ -6,7 +6,7 @@ import {
   runLoopSettled,
 } from 'internal-test-helpers';
 
-import { set, get, setProperties } from '@ember/-internals/metal';
+import { set, get, setProperties } from '@ember/object';
 import { A as emberA } from '@ember/array';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
index e4f4b2b5942..65fe72f9347 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
@@ -1,5 +1,5 @@
 import { RenderingTestCase, strip, moduleFor, runTask } from 'internal-test-helpers';
-import { setProperties } from '@ember/-internals/metal';
+import { setProperties } from '@ember/object';
 import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 
 if (EMBER_UNIQUE_ID_HELPER) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
index 05d4c392ff9..068c09aae5e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/yield-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/input-test.js b/packages/@ember/-internals/glimmer/tests/integration/input-test.js
index 9244468c0fe..731a01763b8 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/input-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/input-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   'Input element tests',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
index d373fcc3332..8cd45ed8d94 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/mount-test.js
@@ -7,7 +7,7 @@ import {
 } from 'internal-test-helpers';
 
 import { DEBUG } from '@ember/debug';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { getOwner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import Engine, { getEngineParent } from '@ember/engine';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js b/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
index 241b5806c0b..9ea183396f0 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/refinements-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   'syntax refinements',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/svg-test.js b/packages/@ember/-internals/glimmer/tests/integration/svg-test.js
index 9151fafe34b..4c1fe44016a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/svg-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/svg-test.js
@@ -1,6 +1,6 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   'SVG element tests',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
index e18de761e35..25d6dd32c20 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-in-test.js
@@ -1,6 +1,6 @@
 import { applyMixins, moduleFor, RenderingTestCase, runTask, strip } from 'internal-test-helpers';
 
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import EmberObject from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
index 8648becbde8..4d7b4edb2d7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/each-test.js
@@ -1,6 +1,7 @@
 import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
 
-import { get, set, notifyPropertyChange, computed, on } from '@ember/-internals/metal';
+import { notifyPropertyChange, on } from '@ember/-internals/metal';
+import { get, set, computed } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import ArrayProxy from '@ember/array/proxy';
 import { RSVP } from '@ember/-internals/runtime';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
index a2a55bad548..709ff0ee3eb 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/if-unless-test.js
@@ -1,7 +1,7 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
 import { A as emberA } from '@ember/array';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 import { Component } from '../../utils/helpers';
 import { IfUnlessWithSyntaxTest } from '../../utils/shared-conditional-tests';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
index 1b24e2385c1..f2516061932 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/let-test.js
@@ -1,6 +1,6 @@
 import { moduleFor, RenderingTestCase, strip, runTask } from 'internal-test-helpers';
 
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import { A as emberA, removeAt } from '@ember/array';
 import ObjectProxy from '@ember/object/proxy';
 
diff --git a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
index 610f8adb597..b071ea95e3a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/syntax/public-in-element-test.js
@@ -1,7 +1,7 @@
 import { moduleFor, RenderingTestCase, strip, equalTokens, runTask } from 'internal-test-helpers';
 
 import { Component } from '@ember/-internals/glimmer';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 
 moduleFor(
   '{{in-element}}',
diff --git a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
index 5d90edc2ebf..60b0ae934a8 100644
--- a/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
+++ b/packages/@ember/-internals/glimmer/tests/unit/runtime-resolver-cache-test.js
@@ -7,7 +7,7 @@ import {
   runTask,
 } from 'internal-test-helpers';
 
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { templateCacheCounters } from '@ember/-internals/glimmer';
 import { Component } from '../utils/helpers';
 
diff --git a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
index 101afb78af9..6fe3dfabf37 100644
--- a/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
+++ b/packages/@ember/-internals/glimmer/tests/utils/shared-conditional-tests.js
@@ -3,7 +3,7 @@
 import { RenderingTestCase, applyMixins, runTask } from 'internal-test-helpers';
 
 import { htmlSafe } from '@ember/-internals/glimmer';
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import EmberObject from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import { A as emberA, removeAt } from '@ember/array';
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
index ffa578b3f38..f535f0717ba 100644
--- a/packages/@ember/-internals/routing/tests/location/auto_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/auto_location_test.js
@@ -1,6 +1,6 @@
 import { window } from '@ember/-internals/browser-environment';
 import { run } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { setOwner } from '@glimmer/owner';
 import AutoLocation, { getHistoryPath, getHashPath } from '@ember/routing/auto-location';
 import HistoryLocation from '@ember/routing/history-location';
diff --git a/packages/@ember/-internals/routing/tests/location/hash_location_test.js b/packages/@ember/-internals/routing/tests/location/hash_location_test.js
index fbb32f3ec2a..0d0192701a3 100644
--- a/packages/@ember/-internals/routing/tests/location/hash_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/hash_location_test.js
@@ -1,5 +1,5 @@
 import { run } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import HashLocation from '@ember/routing/hash-location';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/routing/tests/location/history_location_test.js b/packages/@ember/-internals/routing/tests/location/history_location_test.js
index 9884f0b1add..036b59f9f4e 100644
--- a/packages/@ember/-internals/routing/tests/location/history_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/history_location_test.js
@@ -1,5 +1,5 @@
 import { run } from '@ember/runloop';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import HistoryLocation from '@ember/routing/history-location';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/routing/tests/location/none_location_test.js b/packages/@ember/-internals/routing/tests/location/none_location_test.js
index 4268274cec7..37f9fc72a16 100644
--- a/packages/@ember/-internals/routing/tests/location/none_location_test.js
+++ b/packages/@ember/-internals/routing/tests/location/none_location_test.js
@@ -1,5 +1,5 @@
 import { run } from '@ember/runloop';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import NoneLocation from '@ember/routing/none-location';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/firstObject-test.js b/packages/@ember/-internals/runtime/tests/array/firstObject-test.js
index 186cc03c90f..b44ce9c2a04 100644
--- a/packages/@ember/-internals/runtime/tests/array/firstObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/firstObject-test.js
@@ -1,4 +1,4 @@
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/forEach-test.js b/packages/@ember/-internals/runtime/tests/array/forEach-test.js
index 062a1302c36..c381fdcfa19 100644
--- a/packages/@ember/-internals/runtime/tests/array/forEach-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/forEach-test.js
@@ -1,5 +1,5 @@
 import { guidFor } from '@ember/-internals/utils';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/lastIndexOf-test.js b/packages/@ember/-internals/runtime/tests/array/lastIndexOf-test.js
index 0b38a58a03a..88ff7ec93a2 100644
--- a/packages/@ember/-internals/runtime/tests/array/lastIndexOf-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/lastIndexOf-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/lastObject-test.js b/packages/@ember/-internals/runtime/tests/array/lastObject-test.js
index 94c4c9ef98d..35f52092453 100644
--- a/packages/@ember/-internals/runtime/tests/array/lastObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/lastObject-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 
 class LastObjectTests extends AbstractTestCase {
   '@test returns last item in enumerable'() {
diff --git a/packages/@ember/-internals/runtime/tests/array/map-test.js b/packages/@ember/-internals/runtime/tests/array/map-test.js
index bb1ff9f1202..03e5fc98354 100644
--- a/packages/@ember/-internals/runtime/tests/array/map-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/map-test.js
@@ -1,7 +1,7 @@
 import { guidFor } from '@ember/-internals/utils';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 
 const mapFunc = (item) => (item ? item.toString() : null);
 
diff --git a/packages/@ember/-internals/runtime/tests/array/sortBy-test.js b/packages/@ember/-internals/runtime/tests/array/sortBy-test.js
index e28610a39f4..2cd4bda7e10 100644
--- a/packages/@ember/-internals/runtime/tests/array/sortBy-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/sortBy-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/helpers/array.js b/packages/@ember/-internals/runtime/tests/helpers/array.js
index 02d33016bff..657ba9fa775 100644
--- a/packages/@ember/-internals/runtime/tests/helpers/array.js
+++ b/packages/@ember/-internals/runtime/tests/helpers/array.js
@@ -1,16 +1,14 @@
 import ArrayProxy from '@ember/array/proxy';
-import EmberArray, { A as emberA } from '@ember/array'
+import EmberArray, { A as emberA } from '@ember/array';
 import MutableArray from '@ember/array/mutable';
 import { generateGuid, guidFor } from '@ember/-internals/utils';
 import {
-  get,
-  computed,
   addArrayObserver,
   removeArrayObserver,
   arrayContentWillChange,
   arrayContentDidChange,
 } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import EmberObject, { get, computed } from '@ember/object';
 import { moduleFor } from 'internal-test-helpers';
 
 export function newFixture(cnt) {
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
index 1b04eba8f21..a650428eee4 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/mixins/observable/chained_test.js
@@ -1,5 +1,5 @@
-import { get, set, addObserver } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import { addObserver } from '@ember/-internals/metal';
+import EmberObject, { get, set } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
index 5ec45dc1309..073c96f7d32 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
@@ -1,4 +1,4 @@
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
index 361efdf2f21..5a2c16b88cf 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/array_test.js b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
index 246f1073aaa..6247620ffcd 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/array_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/array_test.js
@@ -1,15 +1,12 @@
 import {
-  get,
-  set,
   objectAt,
   addObserver,
-  computed,
   addArrayObserver,
   removeArrayObserver,
   arrayContentDidChange,
   arrayContentWillChange,
 } from '@ember/-internals/metal';
-import EmberObject, { observer as emberObserver } from '@ember/object';
+import EmberObject, { get, set, computed, observer as emberObserver } from '@ember/object';
 import EmberArray, { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
index 30f4907f29d..bf02f3f50f1 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import EmberObject from '@ember/object';
 import compare from '../../lib/compare';
 import Comparable from '../../lib/mixins/comparable';
diff --git a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
index f028b336307..dad7e61e4d1 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/observable_test.js
@@ -1,5 +1,5 @@
-import { computed, addObserver, get } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import { addObserver } from '@ember/-internals/metal';
+import EmberObject, { computed, get } from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
index 38e8bcce835..99822d559fd 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/promise_proxy_test.js
@@ -1,5 +1,5 @@
 import { run } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
 import EmberRSVP from '../../lib/ext/rsvp';
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/addObject-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/addObject-test.js
index 774b13ea17e..383e15d654b 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/addObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/addObject-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/clear-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/clear-test.js
index 1777df83171..3b9726d8b00 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/clear-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/clear-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js
index 4f85abb50e6..1182812c2ab 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/insertAt-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/popObject-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/popObject-test.js
index d5af6ebeba2..c5d463b6ff0 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/popObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/popObject-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/pushObject-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/pushObject-test.js
index 430693bf82a..b8b55554ff0 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/pushObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/pushObject-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js
index 7f8712ed759..fedf2195d05 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeAt-test.js
@@ -1,7 +1,7 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 import { removeAt } from '@ember/array';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 
 class RemoveAtTests extends AbstractTestCase {
   async '@test removeAt([X], 0) => [] + notify'() {
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeObject-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeObject-test.js
index e67d6a20fe0..86e828e2b09 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeObject-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
index c7f1bc1cc69..13d71267781 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/removeObjects-test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture, newObjectsFixture } from '../helpers/array';
 import { A as emberA } from '@ember/array';
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/reverseObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/reverseObjects-test.js
index 0b979253254..ee16585bd5b 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/reverseObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/reverseObjects-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 
 class ReverseObjectsTests extends AbstractTestCase {
   async '@test [A,B,C].reverseObjects() => [] + notify'() {
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/setObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/setObjects-test.js
index 8a611ac5c1e..91385a04737 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/setObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/setObjects-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 
 class SetObjectsTests extends AbstractTestCase {
   async '@test [A,B,C].setObjects([]) = > [] + notify'() {
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/shiftObject-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/shiftObject-test.js
index 8761fdd508f..39217ecae91 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/shiftObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/shiftObject-test.js
@@ -1,6 +1,6 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 import { runArrayTests, newFixture } from '../helpers/array';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 
 class ShiftObjectTests extends AbstractTestCase {
   async '@test [].shiftObject() => [] + returns undefined + NO notify'() {
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObject-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObject-test.js
index 9457c7807f6..2e94387e2b5 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObject-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObject-test.js
@@ -1,5 +1,5 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { runArrayTests, newFixture } from '../helpers/array';
 
 class UnshiftObjectTests extends AbstractTestCase {
diff --git a/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObjects-test.js b/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObjects-test.js
index 613e3ecfac7..44b92473ad3 100644
--- a/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObjects-test.js
+++ b/packages/@ember/-internals/runtime/tests/mutable-array/unshiftObjects-test.js
@@ -1,5 +1,5 @@
 import { AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { runArrayTests, newFixture } from '../helpers/array';
 
 class UnshiftObjectsTests extends AbstractTestCase {
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
index 0cd45599ebe..af3683687f3 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/arranged_content_test.js
@@ -1,5 +1,6 @@
 import { run } from '@ember/runloop';
-import { computed, objectAt } from '@ember/-internals/metal';
+import { objectAt } from '@ember/-internals/metal';
+import { computed } from '@ember/object';
 import ArrayProxy from '@ember/array/proxy';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
index 44f20a1ab6d..268f79dcd48 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/content_change_test.js
@@ -1,5 +1,6 @@
 import { run } from '@ember/runloop';
-import { set, changeProperties } from '@ember/-internals/metal';
+import { changeProperties } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import ArrayProxy from '@ember/array/proxy';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
index e234c83243c..103dc16cc2e 100644
--- a/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/array_proxy/length_test.js
@@ -3,7 +3,7 @@ import EmberObject, { observer } from '@ember/object';
 import { oneWay as reads, not } from '@ember/object/computed';
 import { A as a } from '@ember/array';
 import { moduleFor, AbstractTestCase, runTask, runLoopSettled } from 'internal-test-helpers';
-import { set, get } from '@ember/-internals/metal';
+import { set, get } from '@ember/object';
 import { createCache, getValue } from '@glimmer/validator';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index 779a0073b85..c4e57c3c31f 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,5 +1,5 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import { observer } from '@ember/object';
 import CoreObject from '@ember/object/core';
 import {
diff --git a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
index 51fc6e7c27e..c81ef398066 100644
--- a/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/object_proxy_test.js
@@ -1,6 +1,6 @@
 import { DEBUG } from '@glimmer/env';
-import { addObserver, computed, get, set, removeObserver } from '@ember/-internals/metal';
-import { observer } from '@ember/object';
+import { addObserver, removeObserver } from '@ember/-internals/metal';
+import { computed, get, set, observer } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/application/instance.ts b/packages/@ember/application/instance.ts
index ff297848244..ecf6924be3c 100644
--- a/packages/@ember/application/instance.ts
+++ b/packages/@ember/application/instance.ts
@@ -2,7 +2,7 @@
 @module @ember/application
 */
 
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import * as environment from '@ember/-internals/browser-environment';
 import EngineInstance from '@ember/engine/instance';
 import type { BootOptions } from '@ember/engine/instance';
diff --git a/packages/@ember/application/namespace.ts b/packages/@ember/application/namespace.ts
index ac2a0997768..a776f04330f 100644
--- a/packages/@ember/application/namespace.ts
+++ b/packages/@ember/application/namespace.ts
@@ -8,11 +8,11 @@ import {
   addNamespace,
   findNamespace,
   findNamespaces,
-  get,
   processNamespace,
   processAllNamespaces,
   removeNamespace,
 } from '@ember/-internals/metal'; // Preloaded into namespaces
+import { get } from '@ember/object';
 import { getName, guidFor, setName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 1078202d218..f3397acdf57 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -5,8 +5,6 @@ import { DEBUG } from '@glimmer/env';
 import { PROXY_CONTENT } from '@ember/-internals/metal';
 import { isEmberArray, setEmberArray } from '@ember/-internals/utils';
 import {
-  get,
-  set,
   objectAt,
   replaceInNativeArray,
   replace,
@@ -14,6 +12,7 @@ import {
   beginPropertyChanges,
   endPropertyChanges,
 } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 import Enumerable from '@ember/enumerable';
diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts
index 46b500cf244..c086c4a2af9 100644
--- a/packages/@ember/array/proxy.ts
+++ b/packages/@ember/array/proxy.ts
@@ -3,7 +3,6 @@
 */
 
 import {
-  get,
   objectAt,
   alias,
   PROPERTY_DID_CHANGE,
@@ -14,6 +13,7 @@ import {
   arrayContentWillChange,
   tagForProperty,
 } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import type { PropertyDidChange } from '@ember/-internals/metal';
 import { isObject } from '@ember/-internals/utils';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index c2341087864..cc17d527e85 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,8 +1,7 @@
 import { getOwner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/object';
+import { FrameworkObject, computed, get } from '@ember/object';
 import { inject as metalInject } from '@ember/-internals/metal';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
-import { computed, get } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
 import type { RouteArgs } from '@ember/-internals/routing';
 import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/-internals/routing';
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index 68c33bea73b..b1eb3b889f8 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -1,7 +1,7 @@
 import Controller, { inject as injectController } from '@ember/controller';
 import Service, { service } from '@ember/service';
 import EmberObject from '@ember/object';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner } from 'internal-test-helpers';
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 8b8f9c43b91..ac635a84ad1 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -1,7 +1,7 @@
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { _backburner } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { dasherize } from '@ember/string';
 import Namespace from '@ember/application/namespace';
 import type { NativeArray } from '@ember/array';
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index 296eae2d1ac..27aa2e0484e 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -8,7 +8,7 @@ import type { ResolverClass } from '@ember/-internals/container';
 import DAG from 'dag-map';
 import { assert } from '@ember/debug';
 import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
-import { get, set } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import type { EngineInstanceOptions } from '@ember/engine/instance';
 import EngineInstance from '@ember/engine/instance';
 import { RoutingService } from '@ember/-internals/routing';
diff --git a/packages/@ember/object/lib/computed/computed_macros.ts b/packages/@ember/object/lib/computed/computed_macros.ts
index b294766d914..f2ab377302f 100644
--- a/packages/@ember/object/lib/computed/computed_macros.ts
+++ b/packages/@ember/object/lib/computed/computed_macros.ts
@@ -1,6 +1,4 @@
 import {
-  get,
-  set,
   computed,
   isElementDescriptor,
   isEmpty,
@@ -8,6 +6,7 @@ import {
   alias,
   expandProperties,
 } from '@ember/-internals/metal';
+import { get, set } from '@ember/object';
 import type { DeprecationOptions } from '@ember/debug';
 import { assert, deprecate } from '@ember/debug';
 
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index 29d162b84b3..7a1c6ff7fa2 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -3,7 +3,8 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
-import { computed, autoComputed, get, isElementDescriptor } from '@ember/-internals/metal';
+import { autoComputed, isElementDescriptor } from '@ember/-internals/metal';
+import { computed, get } from '@ember/object';
 import { compare } from '@ember/-internals/runtime';
 import EmberArray, { A as emberA, uniqBy as uniqByArray } from '@ember/array';
 import type { NativeArray } from '@ember/array';
diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index efc4b2dd48c..cff52fbdbef 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -4,10 +4,6 @@
 
 import { peekMeta } from '@ember/-internals/meta';
 import {
-  get,
-  set,
-  getProperties,
-  setProperties,
   hasListeners,
   beginPropertyChanges,
   notifyPropertyChange,
@@ -15,6 +11,7 @@ import {
   addObserver,
   removeObserver,
 } from '@ember/-internals/metal';
+import { get, set, getProperties, setProperties } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 
diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index f197195a713..d1fa1199922 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -1,4 +1,4 @@
-import { get, setProperties, computed } from '@ember/-internals/metal';
+import { get, setProperties, computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import EmberError from '@ember/error';
diff --git a/packages/@ember/object/tests/computed/computed_macros_test.js b/packages/@ember/object/tests/computed/computed_macros_test.js
index 745fc481b36..39941b66183 100644
--- a/packages/@ember/object/tests/computed/computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/computed_macros_test.js
@@ -1,4 +1,4 @@
-import { get, set, computed, alias, defineProperty } from '@ember/-internals/metal';
+import { alias, defineProperty } from '@ember/-internals/metal';
 import {
   empty,
   notEmpty,
@@ -17,7 +17,7 @@ import {
   or,
 } from '@ember/object/computed';
 
-import EmberObject from '@ember/object';
+import EmberObject, { get, set, computed } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/computed/dependent-key-compat-test.js b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
index cee1c29850f..7a1fc958621 100644
--- a/packages/@ember/object/tests/computed/dependent-key-compat-test.js
+++ b/packages/@ember/object/tests/computed/dependent-key-compat-test.js
@@ -1,5 +1,5 @@
-import EmberObject, { observer } from '@ember/object';
-import { computed, tracked } from '@ember/-internals/metal';
+import EmberObject, { computed, observer } from '@ember/object';
+import { tracked } from '@ember/-internals/metal';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index ffd41421fca..5e24bbb52c4 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -1,13 +1,6 @@
 import { run } from '@ember/runloop';
-import {
-  defineProperty,
-  setProperties,
-  get,
-  set,
-  addObserver,
-  computed,
-} from '@ember/-internals/metal';
-import EmberObject, { observer } from '@ember/object';
+import { defineProperty, setProperties, addObserver } from '@ember/-internals/metal';
+import EmberObject, { get, set, computed, observer } from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import { isArray, A as emberA, removeAt } from '@ember/array';
 import {
diff --git a/packages/@ember/object/tests/computed_test.js b/packages/@ember/object/tests/computed_test.js
index 7268fa9cecf..c79e5edc87d 100644
--- a/packages/@ember/object/tests/computed_test.js
+++ b/packages/@ember/object/tests/computed_test.js
@@ -1,14 +1,7 @@
-import {
-  alias,
-  computed,
-  set,
-  get,
-  defineProperty,
-  notifyPropertyChange,
-} from '@ember/-internals/metal';
+import { alias, defineProperty, notifyPropertyChange } from '@ember/-internals/metal';
 import { oneWay as reads } from '@ember/object/computed';
 import { A as emberA, isArray } from '@ember/array';
-import EmberObject, { observer } from '@ember/object';
+import EmberObject, { get, set, computed, observer } from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function K() {
diff --git a/packages/@ember/object/tests/create_test.js b/packages/@ember/object/tests/create_test.js
index 414f90d30e6..7fbc3a98dc0 100644
--- a/packages/@ember/object/tests/create_test.js
+++ b/packages/@ember/object/tests/create_test.js
@@ -1,10 +1,10 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { computed, addObserver, alias } from '@ember/-internals/metal';
+import { addObserver, alias } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
-import EmberObject, { observer } from '@ember/object';
+import EmberObject, { computed, observer } from '@ember/object';
 import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
diff --git a/packages/@ember/object/tests/destroy_test.js b/packages/@ember/object/tests/destroy_test.js
index cc0300f432e..eea3ccdd957 100644
--- a/packages/@ember/object/tests/destroy_test.js
+++ b/packages/@ember/object/tests/destroy_test.js
@@ -1,7 +1,7 @@
 import { run } from '@ember/runloop';
-import { get, set, beginPropertyChanges, endPropertyChanges } from '@ember/-internals/metal';
+import { beginPropertyChanges, endPropertyChanges } from '@ember/-internals/metal';
 import { peekMeta } from '@ember/-internals/meta';
-import EmberObject, { observer } from '@ember/object';
+import EmberObject, { get, set, observer } from '@ember/object';
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/es-compatibility-test.js b/packages/@ember/object/tests/es-compatibility-test.js
index c17152576c8..6141d28a430 100644
--- a/packages/@ember/object/tests/es-compatibility-test.js
+++ b/packages/@ember/object/tests/es-compatibility-test.js
@@ -1,7 +1,6 @@
-import EmberObject, { observer } from '@ember/object';
+import EmberObject, { computed, observer } from '@ember/object';
 import {
   defineProperty,
-  computed,
   on,
   addObserver,
   removeObserver,
diff --git a/packages/@ember/object/tests/extend_test.js b/packages/@ember/object/tests/extend_test.js
index bed09aa8d3e..a99259276a7 100644
--- a/packages/@ember/object/tests/extend_test.js
+++ b/packages/@ember/object/tests/extend_test.js
@@ -1,4 +1,4 @@
-import { computed, get } from '@ember/-internals/metal';
+import { computed, get } from '@ember/object';
 import EmberObject, { observer } from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/mixin/apply_test.js b/packages/@ember/object/tests/mixin/apply_test.js
index a19e7432957..67a96bf8b2e 100644
--- a/packages/@ember/object/tests/mixin/apply_test.js
+++ b/packages/@ember/object/tests/mixin/apply_test.js
@@ -1,4 +1,4 @@
-import { get } from '../..';
+import { get } from '@ember/object';
 import Mixin, { mixin } from '@ember/object/mixin';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/observable_test.js b/packages/@ember/object/tests/observable_test.js
index a9d6c3cb8a5..a000ec06e9e 100644
--- a/packages/@ember/object/tests/observable_test.js
+++ b/packages/@ember/object/tests/observable_test.js
@@ -1,6 +1,6 @@
 import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
-import { get, computed } from '@ember/-internals/metal';
+import { get, computed } from '@ember/object';
 import { w } from '@ember/string';
 import EmberObject, { observer } from '@ember/object';
 import Observable from '@ember/object/observable';
diff --git a/packages/@ember/object/tests/observer_test.js b/packages/@ember/object/tests/observer_test.js
index 24d5b0869a9..3e181e2e007 100644
--- a/packages/@ember/object/tests/observer_test.js
+++ b/packages/@ember/object/tests/observer_test.js
@@ -1,6 +1,6 @@
 import { run } from '@ember/runloop';
-import { alias, get, set } from '@ember/-internals/metal';
-import EmberObject, { observer } from '@ember/object';
+import { alias } from '@ember/-internals/metal';
+import EmberObject, { get, set, observer } from '@ember/object';
 import { moduleFor, AbstractTestCase, runLoopSettled } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/tests/reopenClass_test.js b/packages/@ember/object/tests/reopenClass_test.js
index ba4db4bd6cd..af8a1e51da2 100644
--- a/packages/@ember/object/tests/reopenClass_test.js
+++ b/packages/@ember/object/tests/reopenClass_test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import EmberObject from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts
index b11d2aa333d..d633153dd41 100644
--- a/packages/@ember/routing/auto-location.ts
+++ b/packages/@ember/routing/auto-location.ts
@@ -1,7 +1,6 @@
 import { history, location, userAgent, window } from '@ember/-internals/browser-environment';
-import { set } from '@ember/-internals/metal';
 import { getOwner } from '@ember/-internals/owner';
-import EmberObject from '@ember/object';
+import EmberObject, { set } from '@ember/object';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
diff --git a/packages/@ember/routing/hash-location.ts b/packages/@ember/routing/hash-location.ts
index f01507aa594..8787116bfd6 100644
--- a/packages/@ember/routing/hash-location.ts
+++ b/packages/@ember/routing/hash-location.ts
@@ -1,5 +1,4 @@
-import { set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import EmberObject, { set } from '@ember/object';
 import { bind } from '@ember/runloop';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 import { getHash } from '@ember/-internals/routing';
diff --git a/packages/@ember/routing/history-location.ts b/packages/@ember/routing/history-location.ts
index 282c8e09d12..d7786809040 100644
--- a/packages/@ember/routing/history-location.ts
+++ b/packages/@ember/routing/history-location.ts
@@ -1,5 +1,4 @@
-import { set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import EmberObject, { set } from '@ember/object';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 import { getHash } from '@ember/-internals/routing';
 
diff --git a/packages/@ember/routing/none-location.ts b/packages/@ember/routing/none-location.ts
index 8163966813d..c1c0defc71b 100644
--- a/packages/@ember/routing/none-location.ts
+++ b/packages/@ember/routing/none-location.ts
@@ -1,5 +1,4 @@
-import { set } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import EmberObject, { set } from '@ember/object';
 import { assert } from '@ember/debug';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index f41aed5f9d7..50fcbf21a24 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -1,20 +1,15 @@
 import { privatize as P } from '@ember/-internals/container';
 import {
   addObserver,
-  computed,
   defineProperty,
   descriptorForProperty,
   flushAsyncObservers,
-  get,
-  getProperties,
   isEmpty,
-  set,
-  setProperties,
 } from '@ember/-internals/metal';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/-internals/routing';
-import EmberObject from '@ember/object';
+import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object';
 import Evented from '@ember/object/evented';
 import { A as emberA } from '@ember/array';
 import { ActionHandler, typeOf } from '@ember/-internals/runtime';
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 6978d96dab9..e2b87753195 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -1,6 +1,6 @@
 import { privatize as P } from '@ember/-internals/container';
 import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
-import { computed, get, set } from '@ember/-internals/metal';
+import { computed, get, set } from '@ember/object';
 import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import {
diff --git a/packages/ember-testing/lib/helpers/current_path.ts b/packages/ember-testing/lib/helpers/current_path.ts
index eb1523ab6ee..b5a7369ef55 100644
--- a/packages/ember-testing/lib/helpers/current_path.ts
+++ b/packages/ember-testing/lib/helpers/current_path.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { RoutingService } from '@ember/-internals/routing';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
diff --git a/packages/ember-testing/lib/helpers/current_route_name.ts b/packages/ember-testing/lib/helpers/current_route_name.ts
index 2e0ad85d0cb..8f3af5df8dc 100644
--- a/packages/ember-testing/lib/helpers/current_route_name.ts
+++ b/packages/ember-testing/lib/helpers/current_route_name.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { RoutingService } from '@ember/-internals/routing';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
diff --git a/packages/ember-testing/lib/helpers/current_url.ts b/packages/ember-testing/lib/helpers/current_url.ts
index 69148442667..eef2f3f0db7 100644
--- a/packages/ember-testing/lib/helpers/current_url.ts
+++ b/packages/ember-testing/lib/helpers/current_url.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
 import Router from '@ember/routing/router';
diff --git a/packages/ember/tests/homepage_example_test.js b/packages/ember/tests/homepage_example_test.js
index 925350fecc7..ba84c3ca973 100644
--- a/packages/ember/tests/homepage_example_test.js
+++ b/packages/ember/tests/homepage_example_test.js
@@ -1,6 +1,5 @@
 import Route from '@ember/routing/route';
-import { computed } from '@ember/-internals/metal';
-import EmberObject from '@ember/object';
+import EmberObject, { computed } from '@ember/object';
 import { A as emberA } from '@ember/array';
 
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
diff --git a/packages/ember/tests/routing/decoupled_basic_test.js b/packages/ember/tests/routing/decoupled_basic_test.js
index 6ea77a10e92..7a66fda851d 100644
--- a/packages/ember/tests/routing/decoupled_basic_test.js
+++ b/packages/ember/tests/routing/decoupled_basic_test.js
@@ -6,7 +6,7 @@ import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
 import HistoryLocation from '@ember/routing/history-location';
 import Controller from '@ember/controller';
-import EmberObject from '@ember/object';
+import EmberObject, { set } from '@ember/object';
 import {
   moduleFor,
   ApplicationTestCase,
@@ -16,7 +16,7 @@ import {
   runTask,
 } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
-import { set, addObserver } from '@ember/-internals/metal';
+import { addObserver } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
 import Engine from '@ember/engine';
 import { InternalTransition as Transition } from 'router_js';
diff --git a/packages/ember/tests/routing/model_loading_test.js b/packages/ember/tests/routing/model_loading_test.js
index 4903011c625..16ba2acb900 100644
--- a/packages/ember/tests/routing/model_loading_test.js
+++ b/packages/ember/tests/routing/model_loading_test.js
@@ -5,7 +5,7 @@ import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { moduleFor, ApplicationTestCase, getTextOf } from 'internal-test-helpers';
 import { run } from '@ember/runloop';
-import { computed, set } from '@ember/-internals/metal';
+import { computed, set } from '@ember/object';
 
 let originalConsoleError;
 
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 2e0b2c890dc..618e4a4b6e4 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1,11 +1,11 @@
 import Controller from '@ember/controller';
 import { dasherize } from '@ember/string';
-import EmberObject from '@ember/object';
+import EmberObject, { get, computed } from '@ember/object';
 import { RSVP } from '@ember/-internals/runtime';
 import { A as emberA } from '@ember/array';
 import { run } from '@ember/runloop';
 import { peekMeta } from '@ember/-internals/meta';
-import { get, computed, tracked } from '@ember/-internals/metal';
+import { tracked } from '@ember/-internals/metal';
 import Route from '@ember/routing/route';
 import { PARAMS_SYMBOL } from 'router_js';
 
diff --git a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
index 093426cdc80..111ab12cebf 100644
--- a/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test/model_dependent_state_with_query_params_test.js
@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { A as emberA } from '@ember/array';
 import Route from '@ember/routing/route';
-import { computed } from '@ember/-internals/metal';
+import { computed } from '@ember/object';
 import { QueryParamTestCase, moduleFor, runLoopSettled } from 'internal-test-helpers';
 
 class ModelDependentQPTestCase extends QueryParamTestCase {
diff --git a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
index 25efe401ee3..edd352592e7 100644
--- a/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
+++ b/packages/ember/tests/routing/query_params_test/query_param_async_get_handler_test.js
@@ -1,4 +1,4 @@
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { RSVP } from '@ember/-internals/runtime';
 import Route from '@ember/routing/route';
 
diff --git a/packages/ember/tests/routing/router_service_test/basic_test.js b/packages/ember/tests/routing/router_service_test/basic_test.js
index cf4a57a064b..cfd3b8acdec 100644
--- a/packages/ember/tests/routing/router_service_test/basic_test.js
+++ b/packages/ember/tests/routing/router_service_test/basic_test.js
@@ -1,6 +1,6 @@
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
-import { set } from '@ember/-internals/metal';
+import { set } from '@ember/object';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { service } from '@ember/service';
 
diff --git a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
index 6302176ea1e..3c9934dc288 100644
--- a/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
+++ b/packages/ember/tests/routing/router_service_test/currenturl_lifecycle_test.js
@@ -2,7 +2,7 @@ import { service } from '@ember/service';
 import { readOnly } from '@ember/object/computed';
 import { Component } from '@ember/-internals/glimmer';
 import Route from '@ember/routing/route';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { RSVP } from '@ember/-internals/runtime';
 
diff --git a/packages/ember/tests/routing/router_service_test/non_application_test_test.js b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
index e2f699d80a9..d6104784600 100644
--- a/packages/ember/tests/routing/router_service_test/non_application_test_test.js
+++ b/packages/ember/tests/routing/router_service_test/non_application_test_test.js
@@ -1,7 +1,7 @@
 import { service } from '@ember/service';
 import Router from '@ember/routing/router';
 import NoneLocation from '@ember/routing/none-location';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { run } from '@ember/runloop';
 import { Component } from '@ember/-internals/glimmer';
 import { RouterNonApplicationTestCase, moduleFor } from 'internal-test-helpers';
diff --git a/packages/ember/tests/routing/router_service_test/transitionTo_test.js b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
index 13828add368..71409cbe433 100644
--- a/packages/ember/tests/routing/router_service_test/transitionTo_test.js
+++ b/packages/ember/tests/routing/router_service_test/transitionTo_test.js
@@ -4,7 +4,7 @@ import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
 import Controller from '@ember/controller';
 import { run } from '@ember/runloop';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 import { InternalTransition as Transition } from 'router_js';
 
diff --git a/packages/ember/tests/routing/router_service_test/urlFor_test.js b/packages/ember/tests/routing/router_service_test/urlFor_test.js
index 99222ac1fa4..8b091812e58 100644
--- a/packages/ember/tests/routing/router_service_test/urlFor_test.js
+++ b/packages/ember/tests/routing/router_service_test/urlFor_test.js
@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { capitalize } from '@ember/string';
 import Route from '@ember/routing/route';
-import { get } from '@ember/-internals/metal';
+import { get } from '@ember/object';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 
 function setupController(app, name) {
diff --git a/packages/ember/tests/service_injection_test.js b/packages/ember/tests/service_injection_test.js
index cd267732837..6eaf9e66165 100644
--- a/packages/ember/tests/service_injection_test.js
+++ b/packages/ember/tests/service_injection_test.js
@@ -3,7 +3,7 @@ import Controller from '@ember/controller';
 import Service, { service } from '@ember/service';
 import { _ProxyMixin } from '@ember/-internals/runtime';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
-import { computed } from '@ember/-internals/metal';
+import { computed } from '@ember/object';
 
 moduleFor(
   'Service Injection',

From 69470a8464017b26937a845e2015ac22d8f0f974 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 17 May 2022 22:05:11 -0700
Subject: [PATCH 1071/1405] Consolidate @ember/utils

---
 .../components/contextual-components-test.js         |  2 +-
 packages/@ember/-internals/metal/index.ts            |  4 ----
 packages/@ember/-internals/runtime/index.ts          |  3 ---
 .../-internals/runtime/tests/core/isEqual_test.js    |  2 +-
 .../-internals/runtime/tests/core/is_empty_test.js   |  2 +-
 .../runtime/tests/mixins/comparable_test.js          |  2 +-
 packages/@ember/array/index.ts                       |  2 +-
 packages/@ember/debug/container-debug-adapter.ts     |  2 +-
 .../@ember/object/lib/computed/computed_macros.ts    | 10 ++--------
 .../object/lib/computed/reduce_computed_macros.ts    |  2 +-
 packages/@ember/routing/route.ts                     |  4 ++--
 packages/@ember/routing/router.ts                    |  2 +-
 packages/@ember/utils/index.ts                       |  9 +++++++--
 .../{-internals/runtime => utils}/lib/compare.ts     |  4 ++--
 .../{-internals/runtime => utils}/lib/is-equal.ts    |  0
 .../{-internals/metal => utils}/lib/is_blank.ts      |  0
 .../{-internals/metal => utils}/lib/is_empty.ts      |  3 ++-
 .../{-internals/metal => utils}/lib/is_none.ts       |  0
 .../{-internals/metal => utils}/lib/is_present.ts    |  0
 .../{-internals/runtime => utils}/lib/type-of.ts     |  4 +++-
 .../tests/core => utils/tests}/compare_test.js       |  5 ++---
 .../metal => utils}/tests/is_blank_test.js           |  0
 .../metal => utils}/tests/is_empty_test.js           |  0
 .../metal => utils}/tests/is_none_test.js            |  0
 .../metal => utils}/tests/is_present_test.js         |  0
 .../tests/core => utils/tests}/type_of_test.js       |  2 +-
 packages/ember/index.js                              | 12 +++++-------
 27 files changed, 34 insertions(+), 42 deletions(-)
 rename packages/@ember/{-internals/runtime => utils}/lib/compare.ts (98%)
 rename packages/@ember/{-internals/runtime => utils}/lib/is-equal.ts (100%)
 rename packages/@ember/{-internals/metal => utils}/lib/is_blank.ts (100%)
 rename packages/@ember/{-internals/metal => utils}/lib/is_empty.ts (94%)
 rename packages/@ember/{-internals/metal => utils}/lib/is_none.ts (100%)
 rename packages/@ember/{-internals/metal => utils}/lib/is_present.ts (100%)
 rename packages/@ember/{-internals/runtime => utils}/lib/type-of.ts (98%)
 rename packages/@ember/{-internals/runtime/tests/core => utils/tests}/compare_test.js (94%)
 rename packages/@ember/{-internals/metal => utils}/tests/is_blank_test.js (100%)
 rename packages/@ember/{-internals/metal => utils}/tests/is_empty_test.js (100%)
 rename packages/@ember/{-internals/metal => utils}/tests/is_none_test.js (100%)
 rename packages/@ember/{-internals/metal => utils}/tests/is_present_test.js (100%)
 rename packages/@ember/{-internals/runtime/tests/core => utils/tests}/type_of_test.js (98%)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
index 4f065ef36e8..074e4e4a5c2 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/contextual-components-test.js
@@ -1,7 +1,7 @@
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, RenderingTestCase, applyMixins, strip, runTask } from 'internal-test-helpers';
 
-import { isEmpty } from '@ember/-internals/metal';
+import { isEmpty } from '@ember/utils';
 import { A as emberA } from '@ember/array';
 
 import { Component } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/metal/index.ts b/packages/@ember/-internals/metal/index.ts
index 62f180e2053..6c869f1e47f 100644
--- a/packages/@ember/-internals/metal/index.ts
+++ b/packages/@ember/-internals/metal/index.ts
@@ -32,10 +32,6 @@ export { arrayContentWillChange, arrayContentDidChange } from './lib/array_event
 export { eachProxyArrayWillChange, eachProxyArrayDidChange } from './lib/each_proxy_events';
 export { addListener, hasListeners, on, removeListener, sendEvent } from './lib/events';
 
-export { default as isNone } from './lib/is_none';
-export { default as isEmpty } from './lib/is_empty';
-export { default as isBlank } from './lib/is_blank';
-export { default as isPresent } from './lib/is_present';
 export {
   beginPropertyChanges,
   changeProperties,
diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index 138f3bacbb0..cab34b691ae 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -1,7 +1,5 @@
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
-export { default as compare } from './lib/compare';
-export { default as isEqual } from './lib/is-equal';
 export { default as Comparable } from './lib/mixins/comparable';
 export { NativeArray } from '@ember/array';
 export { default as ActionHandler } from './lib/mixins/action_handler';
@@ -10,4 +8,3 @@ export { default as MutableEnumerable } from '@ember/enumerable/mutable';
 export { default as TargetActionSupport } from './lib/mixins/target_action_support';
 
 export { default as RSVP, onerrorDefault } from './lib/ext/rsvp'; // just for side effect of extending Ember.RSVP
-export { typeOf } from './lib/type-of';
diff --git a/packages/@ember/-internals/runtime/tests/core/isEqual_test.js b/packages/@ember/-internals/runtime/tests/core/isEqual_test.js
index c84c271c15a..e4c38b599f4 100644
--- a/packages/@ember/-internals/runtime/tests/core/isEqual_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/isEqual_test.js
@@ -1,4 +1,4 @@
-import isEqual from '../../lib/is-equal';
+import { isEqual } from '@ember/utils';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
index 65a8687af7a..cb8108de479 100644
--- a/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
+++ b/packages/@ember/-internals/runtime/tests/core/is_empty_test.js
@@ -1,4 +1,4 @@
-import { isEmpty } from '@ember/-internals/metal';
+import { isEmpty } from '@ember/utils';
 import ArrayProxy from '@ember/array/proxy';
 import ObjectProxy from '@ember/object/proxy';
 import { A as emberA } from '@ember/array';
diff --git a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
index bf02f3f50f1..aa670b93bf3 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
@@ -1,6 +1,6 @@
 import { get } from '@ember/object';
 import EmberObject from '@ember/object';
-import compare from '../../lib/compare';
+import { compare } from '@ember/utils';
 import Comparable from '../../lib/mixins/comparable';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index f3397acdf57..f3c1d72de66 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -17,7 +17,7 @@ import Mixin from '@ember/object/mixin';
 import { assert } from '@ember/debug';
 import Enumerable from '@ember/enumerable';
 import MutableEnumerable from '@ember/enumerable/mutable';
-import { compare, typeOf } from '@ember/-internals/runtime';
+import { compare, typeOf } from '@ember/utils';
 import { ENV } from '@ember/-internals/environment';
 import Observable from '@ember/object/observable';
 import type { AnyFn } from '@ember/-internals/utils/types';
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index c69b1b2c433..f94abec01d5 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -2,7 +2,7 @@ import { classify, dasherize } from '@ember/string';
 import type { NativeArray } from '@ember/array';
 import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/array';
-import { typeOf } from '@ember/-internals/runtime';
+import { typeOf } from '@ember/utils';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import type { Resolver } from '@ember/-internals/container';
diff --git a/packages/@ember/object/lib/computed/computed_macros.ts b/packages/@ember/object/lib/computed/computed_macros.ts
index f2ab377302f..0c71a2967e0 100644
--- a/packages/@ember/object/lib/computed/computed_macros.ts
+++ b/packages/@ember/object/lib/computed/computed_macros.ts
@@ -1,14 +1,8 @@
-import {
-  computed,
-  isElementDescriptor,
-  isEmpty,
-  isNone,
-  alias,
-  expandProperties,
-} from '@ember/-internals/metal';
+import { computed, isElementDescriptor, alias, expandProperties } from '@ember/-internals/metal';
 import { get, set } from '@ember/object';
 import type { DeprecationOptions } from '@ember/debug';
 import { assert, deprecate } from '@ember/debug';
+import { isEmpty, isNone } from '@ember/utils';
 
 /**
 @module @ember/object
diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index 7a1c6ff7fa2..49edc710457 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -5,7 +5,7 @@ import { DEBUG } from '@glimmer/env';
 import { assert } from '@ember/debug';
 import { autoComputed, isElementDescriptor } from '@ember/-internals/metal';
 import { computed, get } from '@ember/object';
-import { compare } from '@ember/-internals/runtime';
+import { compare } from '@ember/utils';
 import EmberArray, { A as emberA, uniqBy as uniqByArray } from '@ember/array';
 import type { NativeArray } from '@ember/array';
 
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 50fcbf21a24..4d1543340a3 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -4,7 +4,6 @@ import {
   defineProperty,
   descriptorForProperty,
   flushAsyncObservers,
-  isEmpty,
 } from '@ember/-internals/metal';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
@@ -12,7 +11,8 @@ import { BucketCache } from '@ember/-internals/routing';
 import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object';
 import Evented from '@ember/object/evented';
 import { A as emberA } from '@ember/array';
-import { ActionHandler, typeOf } from '@ember/-internals/runtime';
+import { ActionHandler } from '@ember/-internals/runtime';
+import { isEmpty, typeOf } from '@ember/utils';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import Controller from '@ember/controller';
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index e2b87753195..852e3c08589 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -23,7 +23,7 @@ import type { ILocation as IEmberLocation } from '@ember/routing/location';
 import type RouterService from '@ember/routing/router-service';
 import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/array';
-import { typeOf } from '@ember/-internals/runtime';
+import { typeOf } from '@ember/utils';
 import Evented from '@ember/object/evented';
 import { assert, deprecate, info } from '@ember/debug';
 import EmberError from '@ember/error';
diff --git a/packages/@ember/utils/index.ts b/packages/@ember/utils/index.ts
index 492bce4c78b..4181f9e7ce9 100644
--- a/packages/@ember/utils/index.ts
+++ b/packages/@ember/utils/index.ts
@@ -1,2 +1,7 @@
-export { isNone, isBlank, isEmpty, isPresent } from '@ember/-internals/metal';
-export { compare, isEqual, typeOf } from '@ember/-internals/runtime';
+export { default as isNone } from './lib/is_none';
+export { default as isBlank } from './lib/is_blank';
+export { default as isEmpty } from './lib/is_empty';
+export { default as isPresent } from './lib/is_present';
+export { default as isEqual } from './lib/is-equal';
+export { default as typeOf } from './lib/type-of';
+export { default as compare } from './lib/compare';
diff --git a/packages/@ember/-internals/runtime/lib/compare.ts b/packages/@ember/utils/lib/compare.ts
similarity index 98%
rename from packages/@ember/-internals/runtime/lib/compare.ts
rename to packages/@ember/utils/lib/compare.ts
index c6f7775e1b8..d4d963b0516 100644
--- a/packages/@ember/-internals/runtime/lib/compare.ts
+++ b/packages/@ember/utils/lib/compare.ts
@@ -1,6 +1,6 @@
 import type { TypeName } from './type-of';
-import { typeOf } from './type-of';
-import Comparable from './mixins/comparable';
+import typeOf from './type-of';
+import { Comparable } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
 
 const TYPE_ORDER: Record<TypeName, number> = {
diff --git a/packages/@ember/-internals/runtime/lib/is-equal.ts b/packages/@ember/utils/lib/is-equal.ts
similarity index 100%
rename from packages/@ember/-internals/runtime/lib/is-equal.ts
rename to packages/@ember/utils/lib/is-equal.ts
diff --git a/packages/@ember/-internals/metal/lib/is_blank.ts b/packages/@ember/utils/lib/is_blank.ts
similarity index 100%
rename from packages/@ember/-internals/metal/lib/is_blank.ts
rename to packages/@ember/utils/lib/is_blank.ts
diff --git a/packages/@ember/-internals/metal/lib/is_empty.ts b/packages/@ember/utils/lib/is_empty.ts
similarity index 94%
rename from packages/@ember/-internals/metal/lib/is_empty.ts
rename to packages/@ember/utils/lib/is_empty.ts
index a520c044915..9bc46e82c08 100644
--- a/packages/@ember/-internals/metal/lib/is_empty.ts
+++ b/packages/@ember/utils/lib/is_empty.ts
@@ -1,4 +1,5 @@
-import { get, hasUnknownProperty } from './property_get';
+import { get } from '@ember/object';
+import { hasUnknownProperty } from '@ember/-internals/metal';
 /**
  @module @ember/utils
 */
diff --git a/packages/@ember/-internals/metal/lib/is_none.ts b/packages/@ember/utils/lib/is_none.ts
similarity index 100%
rename from packages/@ember/-internals/metal/lib/is_none.ts
rename to packages/@ember/utils/lib/is_none.ts
diff --git a/packages/@ember/-internals/metal/lib/is_present.ts b/packages/@ember/utils/lib/is_present.ts
similarity index 100%
rename from packages/@ember/-internals/metal/lib/is_present.ts
rename to packages/@ember/utils/lib/is_present.ts
diff --git a/packages/@ember/-internals/runtime/lib/type-of.ts b/packages/@ember/utils/lib/type-of.ts
similarity index 98%
rename from packages/@ember/-internals/runtime/lib/type-of.ts
rename to packages/@ember/utils/lib/type-of.ts
index f444bab08b4..df4a3c0d5bc 100644
--- a/packages/@ember/-internals/runtime/lib/type-of.ts
+++ b/packages/@ember/utils/lib/type-of.ts
@@ -98,7 +98,7 @@ const { toString } = Object.prototype;
   @public
   @static
 */
-export function typeOf(item: unknown): TypeName {
+function typeOf(item: unknown): TypeName {
   if (item === null) {
     return 'null';
   }
@@ -123,3 +123,5 @@ export function typeOf(item: unknown): TypeName {
 
   return ret;
 }
+
+export default typeOf;
diff --git a/packages/@ember/-internals/runtime/tests/core/compare_test.js b/packages/@ember/utils/tests/compare_test.js
similarity index 94%
rename from packages/@ember/-internals/runtime/tests/core/compare_test.js
rename to packages/@ember/utils/tests/compare_test.js
index 192d50f5b47..9be6181a23f 100644
--- a/packages/@ember/-internals/runtime/tests/core/compare_test.js
+++ b/packages/@ember/utils/tests/compare_test.js
@@ -1,7 +1,6 @@
-import { typeOf } from '../../lib/type-of';
+import { compare, typeOf } from '@ember/utils';
 import EmberObject from '@ember/object';
-import compare from '../../lib/compare';
-import Comparable from '../../lib/mixins/comparable';
+import { Comparable } from '@ember/-internals/runtime';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let data = [];
diff --git a/packages/@ember/-internals/metal/tests/is_blank_test.js b/packages/@ember/utils/tests/is_blank_test.js
similarity index 100%
rename from packages/@ember/-internals/metal/tests/is_blank_test.js
rename to packages/@ember/utils/tests/is_blank_test.js
diff --git a/packages/@ember/-internals/metal/tests/is_empty_test.js b/packages/@ember/utils/tests/is_empty_test.js
similarity index 100%
rename from packages/@ember/-internals/metal/tests/is_empty_test.js
rename to packages/@ember/utils/tests/is_empty_test.js
diff --git a/packages/@ember/-internals/metal/tests/is_none_test.js b/packages/@ember/utils/tests/is_none_test.js
similarity index 100%
rename from packages/@ember/-internals/metal/tests/is_none_test.js
rename to packages/@ember/utils/tests/is_none_test.js
diff --git a/packages/@ember/-internals/metal/tests/is_present_test.js b/packages/@ember/utils/tests/is_present_test.js
similarity index 100%
rename from packages/@ember/-internals/metal/tests/is_present_test.js
rename to packages/@ember/utils/tests/is_present_test.js
diff --git a/packages/@ember/-internals/runtime/tests/core/type_of_test.js b/packages/@ember/utils/tests/type_of_test.js
similarity index 98%
rename from packages/@ember/-internals/runtime/tests/core/type_of_test.js
rename to packages/@ember/utils/tests/type_of_test.js
index 8493e2feb01..f63116620b0 100644
--- a/packages/@ember/-internals/runtime/tests/core/type_of_test.js
+++ b/packages/@ember/utils/tests/type_of_test.js
@@ -1,4 +1,4 @@
-import { typeOf } from '../../lib/type-of';
+import { typeOf } from '@ember/utils';
 import EmberObject from '@ember/object';
 import { window } from '@ember/-internals/browser-environment';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/ember/index.js b/packages/ember/index.js
index d7419d296bf..9bd832f81a6 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -31,9 +31,6 @@ import { dependentKeyCompat } from '@ember/object/compat';
 import {
   RegistryProxyMixin,
   ContainerProxyMixin,
-  compare,
-  isEqual,
-  typeOf,
   _ProxyMixin,
   RSVP,
   Comparable,
@@ -88,6 +85,7 @@ import NoneLocation from '@ember/routing/none-location';
 import EmberLocation from '@ember/routing/location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
+import { isNone, isBlank, isEmpty, isPresent, isEqual, typeOf, compare } from '@ember/utils';
 
 import {
   templateOnlyComponent,
@@ -222,10 +220,10 @@ Ember.addListener = metal.addListener;
 Ember.removeListener = metal.removeListener;
 Ember.sendEvent = metal.sendEvent;
 Ember.hasListeners = metal.hasListeners;
-Ember.isNone = metal.isNone;
-Ember.isEmpty = metal.isEmpty;
-Ember.isBlank = metal.isBlank;
-Ember.isPresent = metal.isPresent;
+Ember.isNone = isNone;
+Ember.isEmpty = isEmpty;
+Ember.isBlank = isBlank;
+Ember.isPresent = isPresent;
 Ember.notifyPropertyChange = metal.notifyPropertyChange;
 Ember.beginPropertyChanges = metal.beginPropertyChanges;
 Ember.endPropertyChanges = metal.endPropertyChanges;

From c91bd15d61a42feff693444ea250cbf8750f5a1d Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 18 May 2022 08:50:22 -0700
Subject: [PATCH 1072/1405] Move RoutingService into @ember/routing

---
 packages/@ember/-internals/glimmer/lib/components/link-to.ts   | 3 ++-
 packages/@ember/-internals/routing/index.ts                    | 1 -
 packages/@ember/engine/index.ts                                | 2 +-
 packages/@ember/routing/internals.ts                           | 1 +
 .../lib/services/routing.ts => routing/lib/routing-service.ts} | 2 +-
 packages/ember-testing/lib/helpers/current_path.ts             | 2 +-
 packages/ember-testing/lib/helpers/current_route_name.ts       | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 packages/@ember/routing/internals.ts
 rename packages/@ember/{-internals/routing/lib/services/routing.ts => routing/lib/routing-service.ts} (98%)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index bdea14b30d7..451dd7d651e 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,5 +1,6 @@
 import type Route from '@ember/routing/route';
-import type { RouterState, RoutingService } from '@ember/-internals/routing';
+import type { RouterState } from '@ember/-internals/routing';
+import type { RoutingService } from '@ember/routing/internals';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { getEngineParent } from '@ember/engine';
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index bf656a460ca..523c5202241 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -16,7 +16,6 @@ export { default as RouterDSL, DSLCallback } from './lib/system/dsl';
 export { EngineRouteInfo } from './lib/system/engines';
 export { default as QueryParams } from './lib/system/query_params';
 export { RouteInfo, RouteInfoWithAttributes } from './lib/system/route-info';
-export { default as RoutingService } from './lib/services/routing';
 export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
 export {
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index 27aa2e0484e..f5c94558a62 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -11,7 +11,7 @@ import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
 import { get, set } from '@ember/object';
 import type { EngineInstanceOptions } from '@ember/engine/instance';
 import EngineInstance from '@ember/engine/instance';
-import { RoutingService } from '@ember/-internals/routing';
+import { RoutingService } from '@ember/routing/internals';
 import { ComponentLookup } from '@ember/-internals/views';
 import { setupEngineRegistry } from '@ember/-internals/glimmer';
 import { RegistryProxyMixin } from '@ember/-internals/runtime';
diff --git a/packages/@ember/routing/internals.ts b/packages/@ember/routing/internals.ts
new file mode 100644
index 00000000000..eb185bd26e6
--- /dev/null
+++ b/packages/@ember/routing/internals.ts
@@ -0,0 +1 @@
+export { default as RoutingService } from './lib/routing-service';
diff --git a/packages/@ember/-internals/routing/lib/services/routing.ts b/packages/@ember/routing/lib/routing-service.ts
similarity index 98%
rename from packages/@ember/-internals/routing/lib/services/routing.ts
rename to packages/@ember/routing/lib/routing-service.ts
index fbc9f1c9e69..17c09a00a0e 100644
--- a/packages/@ember/-internals/routing/lib/services/routing.ts
+++ b/packages/@ember/routing/lib/routing-service.ts
@@ -9,7 +9,7 @@ import Service from '@ember/service';
 import type { ModelFor } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
-import type RouterState from '../system/router_state';
+import type { RouterState } from '@ember/-internals/routing';
 import { ROUTER } from '@ember/routing/router-service';
 
 /**
diff --git a/packages/ember-testing/lib/helpers/current_path.ts b/packages/ember-testing/lib/helpers/current_path.ts
index b5a7369ef55..253b770a161 100644
--- a/packages/ember-testing/lib/helpers/current_path.ts
+++ b/packages/ember-testing/lib/helpers/current_path.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { get } from '@ember/object';
-import { RoutingService } from '@ember/-internals/routing';
+import { RoutingService } from '@ember/routing/internals';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
 
diff --git a/packages/ember-testing/lib/helpers/current_route_name.ts b/packages/ember-testing/lib/helpers/current_route_name.ts
index 8f3af5df8dc..812deb9b74b 100644
--- a/packages/ember-testing/lib/helpers/current_route_name.ts
+++ b/packages/ember-testing/lib/helpers/current_route_name.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { get } from '@ember/object';
-import { RoutingService } from '@ember/-internals/routing';
+import { RoutingService } from '@ember/routing/internals';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
 /**

From 6d5fabe48d226a679324ad2b788666179a6ad0e6 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 18 May 2022 08:53:39 -0700
Subject: [PATCH 1073/1405] Move RouterState into @ember/routing

---
 packages/@ember/-internals/glimmer/lib/components/link-to.ts   | 3 +--
 packages/@ember/-internals/routing/index.ts                    | 1 -
 packages/@ember/routing/internals.ts                           | 1 +
 .../routing/lib/system => routing/lib}/router_state.ts         | 2 +-
 packages/@ember/routing/lib/routing-service.ts                 | 2 +-
 packages/@ember/routing/router.ts                              | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/router_state.ts (95%)

diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 451dd7d651e..58327eb9e27 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,6 +1,5 @@
 import type Route from '@ember/routing/route';
-import type { RouterState } from '@ember/-internals/routing';
-import type { RoutingService } from '@ember/routing/internals';
+import type { RouterState, RoutingService } from '@ember/routing/internals';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { getEngineParent } from '@ember/engine';
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 523c5202241..7d4ea9b02e1 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -16,7 +16,6 @@ export { default as RouterDSL, DSLCallback } from './lib/system/dsl';
 export { EngineRouteInfo } from './lib/system/engines';
 export { default as QueryParams } from './lib/system/query_params';
 export { RouteInfo, RouteInfoWithAttributes } from './lib/system/route-info';
-export { default as RouterState } from './lib/system/router_state';
 export { default as BucketCache } from './lib/system/cache';
 export {
   calculateCacheKey,
diff --git a/packages/@ember/routing/internals.ts b/packages/@ember/routing/internals.ts
index eb185bd26e6..c2eae335c2a 100644
--- a/packages/@ember/routing/internals.ts
+++ b/packages/@ember/routing/internals.ts
@@ -1 +1,2 @@
+export { default as RouterState } from './lib/router_state';
 export { default as RoutingService } from './lib/routing-service';
diff --git a/packages/@ember/-internals/routing/lib/system/router_state.ts b/packages/@ember/routing/lib/router_state.ts
similarity index 95%
rename from packages/@ember/-internals/routing/lib/system/router_state.ts
rename to packages/@ember/routing/lib/router_state.ts
index f7da3a6f857..0461d980e47 100644
--- a/packages/@ember/-internals/routing/lib/system/router_state.ts
+++ b/packages/@ember/routing/lib/router_state.ts
@@ -1,6 +1,6 @@
 import type { ModelFor, TransitionState } from 'router_js';
 import type Router from 'router_js';
-import { shallowEqual } from '../utils';
+import { shallowEqual } from '@ember/-internals/routing';
 import type Route from '@ember/routing/route';
 import type EmberRouter from '@ember/routing/router';
 
diff --git a/packages/@ember/routing/lib/routing-service.ts b/packages/@ember/routing/lib/routing-service.ts
index 17c09a00a0e..ed8cce38805 100644
--- a/packages/@ember/routing/lib/routing-service.ts
+++ b/packages/@ember/routing/lib/routing-service.ts
@@ -9,7 +9,7 @@ import Service from '@ember/service';
 import type { ModelFor } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
-import type { RouterState } from '@ember/-internals/routing';
+import type { RouterState } from '@ember/routing/internals';
 import { ROUTER } from '@ember/routing/router-service';
 
 /**
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 852e3c08589..ed179cabc40 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -6,12 +6,12 @@ import { getOwner } from '@ember/-internals/owner';
 import {
   BucketCache,
   RouterDSL as DSL,
-  RouterState,
   calculateCacheKey,
   extractRouteArgs,
   getActiveTargetName,
   resemblesURL,
 } from '@ember/-internals/routing';
+import { RouterState } from '@ember/routing/internals';
 import type {
   DSLCallback,
   EngineRouteInfo,

From 1660548f52c1fa37c69ed49bd4176752ce41b337 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 18 May 2022 08:56:09 -0700
Subject: [PATCH 1074/1405] Move location utils to @ember/routing

---
 packages/@ember/-internals/routing/index.ts              | 9 ---------
 packages/@ember/routing/auto-location.ts                 | 2 +-
 packages/@ember/routing/hash-location.ts                 | 2 +-
 packages/@ember/routing/history-location.ts              | 2 +-
 .../location/util.ts => routing/lib/location-utils.ts}   | 0
 5 files changed, 3 insertions(+), 12 deletions(-)
 rename packages/@ember/{-internals/routing/lib/location/util.ts => routing/lib/location-utils.ts} (100%)

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 7d4ea9b02e1..42aca798aef 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,12 +1,3 @@
-export {
-  getFullPath,
-  getHash,
-  getPath,
-  getQuery,
-  replacePath,
-  supportsHashChange,
-  supportsHistory,
-} from './lib/location/util';
 export {
   default as generateController,
   generateControllerFactory,
diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts
index d633153dd41..8f6a732ce61 100644
--- a/packages/@ember/routing/auto-location.ts
+++ b/packages/@ember/routing/auto-location.ts
@@ -12,7 +12,7 @@ import {
   replacePath,
   supportsHashChange,
   supportsHistory,
-} from '@ember/-internals/routing';
+} from './lib/location-utils';
 
 /**
 @module @ember/routing
diff --git a/packages/@ember/routing/hash-location.ts b/packages/@ember/routing/hash-location.ts
index 8787116bfd6..302493c7733 100644
--- a/packages/@ember/routing/hash-location.ts
+++ b/packages/@ember/routing/hash-location.ts
@@ -1,7 +1,7 @@
 import EmberObject, { set } from '@ember/object';
 import { bind } from '@ember/runloop';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
-import { getHash } from '@ember/-internals/routing';
+import { getHash } from './lib/location-utils';
 
 /**
 @module @ember/routing
diff --git a/packages/@ember/routing/history-location.ts b/packages/@ember/routing/history-location.ts
index d7786809040..96d623a09be 100644
--- a/packages/@ember/routing/history-location.ts
+++ b/packages/@ember/routing/history-location.ts
@@ -1,6 +1,6 @@
 import EmberObject, { set } from '@ember/object';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
-import { getHash } from '@ember/-internals/routing';
+import { getHash } from './lib/location-utils';
 
 /**
 @module @ember/routing
diff --git a/packages/@ember/-internals/routing/lib/location/util.ts b/packages/@ember/routing/lib/location-utils.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/location/util.ts
rename to packages/@ember/routing/lib/location-utils.ts

From cd32d233b6185ffad443f48db3f1280203c97838 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 18 May 2022 09:01:57 -0700
Subject: [PATCH 1075/1405] Move utils to @ember/routing

---
 packages/@ember/-internals/routing/index.ts       | 15 ---------------
 packages/@ember/controller/index.ts               |  4 ++--
 packages/@ember/routing/internals.ts              |  1 +
 packages/@ember/routing/lib/router_state.ts       |  2 +-
 .../@ember/{-internals => }/routing/lib/utils.ts  |  0
 packages/@ember/routing/route.ts                  | 10 +++-------
 packages/@ember/routing/router-service.ts         |  4 ++--
 packages/@ember/routing/router.ts                 | 15 +++++----------
 8 files changed, 14 insertions(+), 37 deletions(-)
 rename packages/@ember/{-internals => }/routing/lib/utils.ts (100%)

diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index 42aca798aef..cc17eb2b6df 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -8,18 +8,3 @@ export { EngineRouteInfo } from './lib/system/engines';
 export { default as QueryParams } from './lib/system/query_params';
 export { RouteInfo, RouteInfoWithAttributes } from './lib/system/route-info';
 export { default as BucketCache } from './lib/system/cache';
-export {
-  calculateCacheKey,
-  deprecateTransitionMethods,
-  extractRouteArgs,
-  getActiveTargetName,
-  normalizeControllerQueryParams,
-  prefixRouteNameArg,
-  resemblesURL,
-  shallowEqual,
-  stashParamNames,
-  ExpandedControllerQueryParam,
-  NamedRouteArgs,
-  RouteArgs,
-  RouteOptions,
-} from './lib/utils';
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index cc17d527e85..28574db2d24 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -3,8 +3,8 @@ import { FrameworkObject, computed, get } from '@ember/object';
 import { inject as metalInject } from '@ember/-internals/metal';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
-import type { RouteArgs } from '@ember/-internals/routing';
-import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/-internals/routing';
+import type { RouteArgs } from '@ember/routing/internals';
+import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/routing/internals';
 import { ActionHandler } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
 import type Route from '@ember/routing/route';
diff --git a/packages/@ember/routing/internals.ts b/packages/@ember/routing/internals.ts
index c2eae335c2a..356d7200ff8 100644
--- a/packages/@ember/routing/internals.ts
+++ b/packages/@ember/routing/internals.ts
@@ -1,2 +1,3 @@
 export { default as RouterState } from './lib/router_state';
 export { default as RoutingService } from './lib/routing-service';
+export { RouteArgs, deprecateTransitionMethods, prefixRouteNameArg } from './lib/utils';
diff --git a/packages/@ember/routing/lib/router_state.ts b/packages/@ember/routing/lib/router_state.ts
index 0461d980e47..7a5be9eb204 100644
--- a/packages/@ember/routing/lib/router_state.ts
+++ b/packages/@ember/routing/lib/router_state.ts
@@ -1,6 +1,6 @@
 import type { ModelFor, TransitionState } from 'router_js';
 import type Router from 'router_js';
-import { shallowEqual } from '@ember/-internals/routing';
+import { shallowEqual } from './utils';
 import type Route from '@ember/routing/route';
 import type EmberRouter from '@ember/routing/router';
 
diff --git a/packages/@ember/-internals/routing/lib/utils.ts b/packages/@ember/routing/lib/utils.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/utils.ts
rename to packages/@ember/routing/lib/utils.ts
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 4d1543340a3..8607127f65f 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -31,21 +31,17 @@ import type {
   TransitionState,
 } from 'router_js';
 import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
-import type {
-  ExpandedControllerQueryParam,
-  NamedRouteArgs,
-  RouteArgs,
-} from '@ember/-internals/routing';
 import type { QueryParam } from '@ember/routing/router';
 import EmberRouter from '@ember/routing/router';
+import { generateController } from '@ember/-internals/routing';
+import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from './lib/utils';
 import {
   calculateCacheKey,
   deprecateTransitionMethods,
-  generateController,
   normalizeControllerQueryParams,
   prefixRouteNameArg,
   stashParamNames,
-} from '@ember/-internals/routing';
+} from './lib/utils';
 
 export interface ExtendedInternalRouteInfo<R extends Route> extends InternalRouteInfo<R> {
   _names?: unknown[];
diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
index c84746c1dc8..70455993f76 100644
--- a/packages/@ember/routing/router-service.ts
+++ b/packages/@ember/routing/router-service.ts
@@ -7,9 +7,9 @@ import { consumeTag, tagFor } from '@glimmer/validator';
 import type { ModelFor, Transition } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
-import type { RouteArgs, RouteOptions } from '@ember/-internals/routing';
 import { RouteInfo, RouteInfoWithAttributes } from '@ember/-internals/routing';
-import { extractRouteArgs, resemblesURL, shallowEqual } from '@ember/-internals/routing';
+import type { RouteArgs, RouteOptions } from './lib/utils';
+import { extractRouteArgs, resemblesURL, shallowEqual } from './lib/utils';
 
 export const ROUTER = Symbol('ROUTER');
 
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index ed179cabc40..ac5facd33b6 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -3,21 +3,16 @@ import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-inte
 import { computed, get, set } from '@ember/object';
 import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
+import { BucketCache, RouterDSL as DSL } from '@ember/-internals/routing';
+import type { DSLCallback, EngineRouteInfo } from '@ember/-internals/routing';
+import { RouterState } from '@ember/routing/internals';
 import {
-  BucketCache,
-  RouterDSL as DSL,
   calculateCacheKey,
   extractRouteArgs,
   getActiveTargetName,
   resemblesURL,
-} from '@ember/-internals/routing';
-import { RouterState } from '@ember/routing/internals';
-import type {
-  DSLCallback,
-  EngineRouteInfo,
-  RouteArgs,
-  RouteOptions,
-} from '@ember/-internals/routing';
+} from './lib/utils';
+import type { RouteArgs, RouteOptions } from './lib/utils';
 import EmberLocation from '@ember/routing/location';
 import type { ILocation as IEmberLocation } from '@ember/routing/location';
 import type RouterService from '@ember/routing/router-service';

From 8a5379c430490ecf0a791fa4c89a135ffd332a90 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 18 May 2022 09:23:43 -0700
Subject: [PATCH 1076/1405] Move remaining routing code into @ember/routing

---
 .../glimmer/lib/component-managers/mount.ts      |  2 +-
 packages/@ember/-internals/routing/index.ts      | 12 ++++--------
 packages/@ember/application/index.ts             |  2 +-
 packages/@ember/routing/internals.ts             |  9 +++++++++
 .../routing/lib/system => routing/lib}/cache.ts  |  0
 .../lib/system => routing/lib}/controller_for.ts |  0
 .../routing/lib/system => routing/lib}/dsl.ts    |  0
 .../lib/system => routing/lib}/engines.ts        |  0
 .../lib}/generate_controller.ts                  |  0
 .../lib/system => routing/lib}/query_params.ts   |  0
 .../lib/system => routing/lib}/route-info.ts     |  0
 .../lib/system => routing/lib}/transition.ts     |  0
 packages/@ember/routing/route.ts                 |  4 ++--
 packages/@ember/routing/router-service.ts        |  2 +-
 packages/@ember/routing/router.ts                |  4 ++--
 .../routing/tests/location/auto_location_test.js |  0
 .../routing/tests/location/hash_location_test.js |  0
 .../tests/location/history_location_test.js      |  0
 .../routing/tests/location/none_location_test.js |  0
 .../routing/tests/location/util_test.js          |  4 ++--
 .../routing/tests/system/cache_test.js           |  2 +-
 .../routing/tests/system/controller_for_test.js  |  3 +--
 .../routing/tests/system/dsl_test.js             |  0
 .../routing/tests/system/route_test.js           |  0
 .../routing/tests/system/router_test.js          |  0
 .../{-internals => }/routing/tests/utils_test.js |  0
 packages/ember/index.js                          | 16 ++++++++++------
 27 files changed, 34 insertions(+), 26 deletions(-)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/cache.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/controller_for.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/dsl.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/engines.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/generate_controller.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/query_params.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/route-info.ts (100%)
 rename packages/@ember/{-internals/routing/lib/system => routing/lib}/transition.ts (100%)
 rename packages/@ember/{-internals => }/routing/tests/location/auto_location_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/location/hash_location_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/location/history_location_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/location/none_location_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/location/util_test.js (99%)
 rename packages/@ember/{-internals => }/routing/tests/system/cache_test.js (96%)
 rename packages/@ember/{-internals => }/routing/tests/system/controller_for_test.js (94%)
 rename packages/@ember/{-internals => }/routing/tests/system/dsl_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/system/route_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/system/router_test.js (100%)
 rename packages/@ember/{-internals => }/routing/tests/utils_test.js (100%)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index eca2486d3b6..7732dfaae5b 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,5 +1,5 @@
 import type { Owner } from '@ember/-internals/owner';
-import { generateControllerFactory } from '@ember/-internals/routing';
+import { generateControllerFactory } from '@ember/routing/internals';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { associateDestroyableChild } from '@glimmer/destroyable';
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index cc17eb2b6df..cdb04f4cc1d 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -1,10 +1,6 @@
 export {
-  default as generateController,
+  controllerFor,
+  generateController,
   generateControllerFactory,
-} from './lib/system/generate_controller';
-export { default as controllerFor } from './lib/system/controller_for';
-export { default as RouterDSL, DSLCallback } from './lib/system/dsl';
-export { EngineRouteInfo } from './lib/system/engines';
-export { default as QueryParams } from './lib/system/query_params';
-export { RouteInfo, RouteInfoWithAttributes } from './lib/system/route-info';
-export { default as BucketCache } from './lib/system/cache';
+  DSL as RouterDSL,
+} from '@ember/routing/internals';
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index 7afbb632a61..23ad87e4388 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -19,7 +19,7 @@ import AutoLocation from '@ember/routing/auto-location';
 import HashLocation from '@ember/routing/hash-location';
 import HistoryLocation from '@ember/routing/history-location';
 import NoneLocation from '@ember/routing/none-location';
-import { BucketCache } from '@ember/-internals/routing';
+import { BucketCache } from '@ember/routing/internals';
 import ApplicationInstance from '@ember/application/instance';
 import Engine, { buildInitializerMethod } from '@ember/engine';
 import type { BootOptions } from '@ember/engine/instance';
diff --git a/packages/@ember/routing/internals.ts b/packages/@ember/routing/internals.ts
index 356d7200ff8..3e59d44cd00 100644
--- a/packages/@ember/routing/internals.ts
+++ b/packages/@ember/routing/internals.ts
@@ -1,3 +1,12 @@
 export { default as RouterState } from './lib/router_state';
 export { default as RoutingService } from './lib/routing-service';
 export { RouteArgs, deprecateTransitionMethods, prefixRouteNameArg } from './lib/utils';
+export {
+  default as generateController,
+  generateControllerFactory,
+} from './lib/generate_controller';
+export { default as BucketCache } from './lib/cache';
+export { default as DSL, DSLCallback } from './lib/dsl';
+export { EngineRouteInfo } from './lib/engines';
+export { RouteInfo, RouteInfoWithAttributes } from './lib/route-info';
+export { default as controllerFor } from './lib/controller_for';
diff --git a/packages/@ember/-internals/routing/lib/system/cache.ts b/packages/@ember/routing/lib/cache.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/cache.ts
rename to packages/@ember/routing/lib/cache.ts
diff --git a/packages/@ember/-internals/routing/lib/system/controller_for.ts b/packages/@ember/routing/lib/controller_for.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/controller_for.ts
rename to packages/@ember/routing/lib/controller_for.ts
diff --git a/packages/@ember/-internals/routing/lib/system/dsl.ts b/packages/@ember/routing/lib/dsl.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/dsl.ts
rename to packages/@ember/routing/lib/dsl.ts
diff --git a/packages/@ember/-internals/routing/lib/system/engines.ts b/packages/@ember/routing/lib/engines.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/engines.ts
rename to packages/@ember/routing/lib/engines.ts
diff --git a/packages/@ember/-internals/routing/lib/system/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/generate_controller.ts
rename to packages/@ember/routing/lib/generate_controller.ts
diff --git a/packages/@ember/-internals/routing/lib/system/query_params.ts b/packages/@ember/routing/lib/query_params.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/query_params.ts
rename to packages/@ember/routing/lib/query_params.ts
diff --git a/packages/@ember/-internals/routing/lib/system/route-info.ts b/packages/@ember/routing/lib/route-info.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/route-info.ts
rename to packages/@ember/routing/lib/route-info.ts
diff --git a/packages/@ember/-internals/routing/lib/system/transition.ts b/packages/@ember/routing/lib/transition.ts
similarity index 100%
rename from packages/@ember/-internals/routing/lib/system/transition.ts
rename to packages/@ember/routing/lib/transition.ts
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 8607127f65f..f833eae1d90 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -7,7 +7,7 @@ import {
 } from '@ember/-internals/metal';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import { BucketCache } from '@ember/-internals/routing';
+import { BucketCache } from '@ember/routing/internals';
 import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object';
 import Evented from '@ember/object/evented';
 import { A as emberA } from '@ember/array';
@@ -33,7 +33,7 @@ import type {
 import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
 import type { QueryParam } from '@ember/routing/router';
 import EmberRouter from '@ember/routing/router';
-import { generateController } from '@ember/-internals/routing';
+import { generateController } from '@ember/routing/internals';
 import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from './lib/utils';
 import {
   calculateCacheKey,
diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
index 70455993f76..422aab6f6fb 100644
--- a/packages/@ember/routing/router-service.ts
+++ b/packages/@ember/routing/router-service.ts
@@ -7,7 +7,7 @@ import { consumeTag, tagFor } from '@glimmer/validator';
 import type { ModelFor, Transition } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
-import { RouteInfo, RouteInfoWithAttributes } from '@ember/-internals/routing';
+import { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/internals';
 import type { RouteArgs, RouteOptions } from './lib/utils';
 import { extractRouteArgs, resemblesURL, shallowEqual } from './lib/utils';
 
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index ac5facd33b6..281d0d308e8 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -3,8 +3,8 @@ import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-inte
 import { computed, get, set } from '@ember/object';
 import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import { BucketCache, RouterDSL as DSL } from '@ember/-internals/routing';
-import type { DSLCallback, EngineRouteInfo } from '@ember/-internals/routing';
+import { BucketCache, DSL } from '@ember/routing/internals';
+import type { DSLCallback, EngineRouteInfo } from '@ember/routing/internals';
 import { RouterState } from '@ember/routing/internals';
 import {
   calculateCacheKey,
diff --git a/packages/@ember/-internals/routing/tests/location/auto_location_test.js b/packages/@ember/routing/tests/location/auto_location_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/location/auto_location_test.js
rename to packages/@ember/routing/tests/location/auto_location_test.js
diff --git a/packages/@ember/-internals/routing/tests/location/hash_location_test.js b/packages/@ember/routing/tests/location/hash_location_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/location/hash_location_test.js
rename to packages/@ember/routing/tests/location/hash_location_test.js
diff --git a/packages/@ember/-internals/routing/tests/location/history_location_test.js b/packages/@ember/routing/tests/location/history_location_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/location/history_location_test.js
rename to packages/@ember/routing/tests/location/history_location_test.js
diff --git a/packages/@ember/-internals/routing/tests/location/none_location_test.js b/packages/@ember/routing/tests/location/none_location_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/location/none_location_test.js
rename to packages/@ember/routing/tests/location/none_location_test.js
diff --git a/packages/@ember/-internals/routing/tests/location/util_test.js b/packages/@ember/routing/tests/location/util_test.js
similarity index 99%
rename from packages/@ember/-internals/routing/tests/location/util_test.js
rename to packages/@ember/routing/tests/location/util_test.js
index cd257058713..ba957725058 100644
--- a/packages/@ember/-internals/routing/tests/location/util_test.js
+++ b/packages/@ember/routing/tests/location/util_test.js
@@ -1,5 +1,5 @@
-import { replacePath, getPath, getQuery, getFullPath } from '../../lib/location/util';
-import { supportsHistory, supportsHashChange } from '../../lib/location/util';
+import { replacePath, getPath, getQuery, getFullPath } from '../../lib/location-utils';
+import { supportsHistory, supportsHashChange } from '../../lib/location-utils';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function mockBrowserLocation(overrides, assert) {
diff --git a/packages/@ember/-internals/routing/tests/system/cache_test.js b/packages/@ember/routing/tests/system/cache_test.js
similarity index 96%
rename from packages/@ember/-internals/routing/tests/system/cache_test.js
rename to packages/@ember/routing/tests/system/cache_test.js
index 0eaf6d0e9df..8f587f68d07 100644
--- a/packages/@ember/-internals/routing/tests/system/cache_test.js
+++ b/packages/@ember/routing/tests/system/cache_test.js
@@ -1,4 +1,4 @@
-import BucketCache from '../../lib/system/cache';
+import { BucketCache } from '@ember/routing/internals';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/-internals/routing/tests/system/controller_for_test.js b/packages/@ember/routing/tests/system/controller_for_test.js
similarity index 94%
rename from packages/@ember/-internals/routing/tests/system/controller_for_test.js
rename to packages/@ember/routing/tests/system/controller_for_test.js
index f2a3990ea1c..cee8fcb5236 100644
--- a/packages/@ember/-internals/routing/tests/system/controller_for_test.js
+++ b/packages/@ember/routing/tests/system/controller_for_test.js
@@ -1,6 +1,5 @@
 import Controller from '@ember/controller';
-import controllerFor from '../../lib/system/controller_for';
-import generateController from '../../lib/system/generate_controller';
+import { controllerFor, generateController } from '@ember/routing/internals';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
diff --git a/packages/@ember/-internals/routing/tests/system/dsl_test.js b/packages/@ember/routing/tests/system/dsl_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/system/dsl_test.js
rename to packages/@ember/routing/tests/system/dsl_test.js
diff --git a/packages/@ember/-internals/routing/tests/system/route_test.js b/packages/@ember/routing/tests/system/route_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/system/route_test.js
rename to packages/@ember/routing/tests/system/route_test.js
diff --git a/packages/@ember/-internals/routing/tests/system/router_test.js b/packages/@ember/routing/tests/system/router_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/system/router_test.js
rename to packages/@ember/routing/tests/system/router_test.js
diff --git a/packages/@ember/-internals/routing/tests/utils_test.js b/packages/@ember/routing/tests/utils_test.js
similarity index 100%
rename from packages/@ember/-internals/routing/tests/utils_test.js
rename to packages/@ember/routing/tests/utils_test.js
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 9bd832f81a6..23a498a19ce 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -54,7 +54,6 @@ import {
 } from '@ember/-internals/glimmer';
 import VERSION from './version';
 import * as views from '@ember/-internals/views';
-import * as routing from '@ember/-internals/routing';
 import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
 import DataAdapter from '@ember/debug/data-adapter';
 import EmberError from '@ember/error';
@@ -85,6 +84,12 @@ import NoneLocation from '@ember/routing/none-location';
 import EmberLocation from '@ember/routing/location';
 import Route from '@ember/routing/route';
 import Router from '@ember/routing/router';
+import {
+  controllerFor,
+  generateController,
+  generateControllerFactory,
+  DSL as RouterDSL,
+} from '@ember/routing/internals';
 import { isNone, isBlank, isEmpty, isPresent, isEqual, typeOf, compare } from '@ember/utils';
 
 import {
@@ -502,16 +507,15 @@ Ember.ViewUtils = {
 Ember.ComponentLookup = views.ComponentLookup;
 Ember.EventDispatcher = views.EventDispatcher;
 
-// ****@ember/-internals/routing****
 Ember.Location = EmberLocation;
 Ember.AutoLocation = AutoLocation;
 Ember.HashLocation = HashLocation;
 Ember.HistoryLocation = HistoryLocation;
 Ember.NoneLocation = NoneLocation;
-Ember.controllerFor = routing.controllerFor;
-Ember.generateControllerFactory = routing.generateControllerFactory;
-Ember.generateController = routing.generateController;
-Ember.RouterDSL = routing.RouterDSL;
+Ember.controllerFor = controllerFor;
+Ember.generateControllerFactory = generateControllerFactory;
+Ember.generateController = generateController;
+Ember.RouterDSL = RouterDSL;
 Ember.Router = Router;
 Ember.Route = Route;
 

From 74057e95d8a4297a4949c607e658cfb0cea0c599 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 24 Aug 2022 09:48:14 -0700
Subject: [PATCH 1077/1405] Move FrameworkObject, rename object/-internals

---
 .../@ember/-internals/glimmer/lib/helper.ts   |  2 +-
 .../-internals/views/lib/views/core_view.ts   |  2 +-
 .../component/type-tests/helper/index.test.ts |  2 +-
 packages/@ember/controller/index.ts           |  3 +-
 packages/@ember/object/-internals.ts          | 37 +++++++++++++++++++
 packages/@ember/object/index.ts               | 33 +----------------
 packages/@ember/object/internals.ts           |  6 ++-
 packages/@ember/object/proxy.ts               |  2 +-
 .../@ember/object/tests/framework_test.js     |  2 +-
 .../type-tests/internals/cache-for.test.ts    |  2 +-
 .../type-tests/internals/guid-for.test.ts     |  2 +-
 packages/@ember/service/index.ts              |  2 +-
 .../@ember/service/type-tests/index.test.ts   |  2 +-
 13 files changed, 53 insertions(+), 44 deletions(-)
 create mode 100644 packages/@ember/object/-internals.ts

diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index ae5ab669218..9f720559e17 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -5,7 +5,7 @@
 import type { FactoryManager } from '@ember/-internals/container/lib/container';
 import type { Factory, Owner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/object';
+import { FrameworkObject } from '@ember/object/-internals';
 import { getDebugName } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { join } from '@ember/runloop';
diff --git a/packages/@ember/-internals/views/lib/views/core_view.ts b/packages/@ember/-internals/views/lib/views/core_view.ts
index c0e9edbadff..1eefce9682d 100644
--- a/packages/@ember/-internals/views/lib/views/core_view.ts
+++ b/packages/@ember/-internals/views/lib/views/core_view.ts
@@ -2,7 +2,7 @@ import type { Renderer, View } from '@ember/-internals/glimmer/lib/renderer';
 import { inject } from '@ember/-internals/metal';
 import { ActionHandler } from '@ember/-internals/runtime';
 import Evented from '@ember/object/evented';
-import { FrameworkObject } from '@ember/object';
+import { FrameworkObject } from '@ember/object/-internals';
 import type { ViewState } from './states';
 import states from './states';
 
diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts
index 4384a0ff00f..d1e121d367f 100644
--- a/packages/@ember/component/type-tests/helper/index.test.ts
+++ b/packages/@ember/component/type-tests/helper/index.test.ts
@@ -1,5 +1,5 @@
 import type { Owner } from '@ember/-internals/owner';
-import type { FrameworkObject } from '@ember/object';
+import type { FrameworkObject } from '@ember/object/-internals';
 import Helper from '@ember/component/helper';
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 28574db2d24..7167ed8e952 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,5 +1,6 @@
 import { getOwner } from '@ember/-internals/owner';
-import { FrameworkObject, computed, get } from '@ember/object';
+import { computed, get } from '@ember/object';
+import { FrameworkObject } from '@ember/object/-internals';
 import { inject as metalInject } from '@ember/-internals/metal';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
diff --git a/packages/@ember/object/-internals.ts b/packages/@ember/object/-internals.ts
new file mode 100644
index 00000000000..d38dbca73e3
--- /dev/null
+++ b/packages/@ember/object/-internals.ts
@@ -0,0 +1,37 @@
+export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
+export { guidFor } from '@ember/-internals/utils';
+
+import { addListener } from '@ember/-internals/metal';
+import { assert } from '@ember/debug';
+import { symbol } from '@ember/-internals/utils';
+import { DEBUG } from '@glimmer/env';
+import EmberObject from '.';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+interface FrameworkObject extends EmberObject {}
+let FrameworkObject = class FrameworkObject extends EmberObject {};
+
+if (DEBUG) {
+  const INIT_WAS_CALLED = Symbol('INIT_WAS_CALLED');
+  let ASSERT_INIT_WAS_CALLED = symbol('ASSERT_INIT_WAS_CALLED');
+
+  FrameworkObject = class DebugFrameworkObject extends EmberObject {
+    [INIT_WAS_CALLED] = false;
+
+    init(properties: object | undefined) {
+      super.init(properties);
+      this[INIT_WAS_CALLED] = true;
+    }
+
+    [ASSERT_INIT_WAS_CALLED]() {
+      assert(
+        `You must call \`super.init(...arguments);\` or \`this._super(...arguments)\` when overriding \`init\` on a framework object. Please update ${this} to call \`super.init(...arguments);\` from \`init\` when using native classes or \`this._super(...arguments)\` when using \`EmberObject.extend()\`.`,
+        this[INIT_WAS_CALLED]
+      );
+    }
+  };
+
+  addListener(FrameworkObject.prototype, 'init', null, ASSERT_INIT_WAS_CALLED);
+}
+
+export { FrameworkObject };
diff --git a/packages/@ember/object/index.ts b/packages/@ember/object/index.ts
index aee7b173b96..99978ce96e9 100644
--- a/packages/@ember/object/index.ts
+++ b/packages/@ember/object/index.ts
@@ -7,12 +7,10 @@ import {
   setClassicDecorator,
 } from '@ember/-internals/metal';
 import { getFactoryFor } from '@ember/-internals/container';
-import { setObservers, symbol } from '@ember/-internals/utils';
+import { setObservers } from '@ember/-internals/utils';
 import type { AnyFn } from '@ember/-internals/utils/types';
-import { addListener } from '@ember/-internals/metal';
 import CoreObject from '@ember/object/core';
 import Observable from '@ember/object/observable';
-import { DEBUG } from '@glimmer/env';
 
 export {
   notifyPropertyChange,
@@ -49,35 +47,6 @@ class EmberObject extends CoreObject.extend(Observable) {
 
 export default EmberObject;
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface FrameworkObject extends EmberObject {}
-let FrameworkObject = class FrameworkObject extends EmberObject {};
-
-if (DEBUG) {
-  const INIT_WAS_CALLED = Symbol('INIT_WAS_CALLED');
-  let ASSERT_INIT_WAS_CALLED = symbol('ASSERT_INIT_WAS_CALLED');
-
-  FrameworkObject = class DebugFrameworkObject extends EmberObject {
-    [INIT_WAS_CALLED] = false;
-
-    init(properties: object | undefined) {
-      super.init(properties);
-      this[INIT_WAS_CALLED] = true;
-    }
-
-    [ASSERT_INIT_WAS_CALLED]() {
-      assert(
-        `You must call \`super.init(...arguments);\` or \`this._super(...arguments)\` when overriding \`init\` on a framework object. Please update ${this} to call \`super.init(...arguments);\` from \`init\` when using native classes or \`this._super(...arguments)\` when using \`EmberObject.extend()\`.`,
-        this[INIT_WAS_CALLED]
-      );
-    }
-  };
-
-  addListener(FrameworkObject.prototype, 'init', null, ASSERT_INIT_WAS_CALLED);
-}
-
-export { FrameworkObject };
-
 /**
   Decorator that turns the target function into an Action which can be accessed
   directly by reference.
diff --git a/packages/@ember/object/internals.ts b/packages/@ember/object/internals.ts
index 8093f908605..633e37fb2ad 100644
--- a/packages/@ember/object/internals.ts
+++ b/packages/@ember/object/internals.ts
@@ -1,2 +1,4 @@
-export { getCachedValueFor as cacheFor } from '@ember/-internals/metal';
-export { guidFor } from '@ember/-internals/utils';
+// This is a legacy location to keep the reexports test happy.
+// Don't add anything new here.
+
+export { cacheFor, guidFor } from './-internals';
diff --git a/packages/@ember/object/proxy.ts b/packages/@ember/object/proxy.ts
index 5bb78cdbf05..9dc54dd557b 100644
--- a/packages/@ember/object/proxy.ts
+++ b/packages/@ember/object/proxy.ts
@@ -1,4 +1,4 @@
-import { FrameworkObject } from '@ember/object';
+import { FrameworkObject } from '@ember/object/-internals';
 import { _ProxyMixin } from '@ember/-internals/runtime';
 
 /**
diff --git a/packages/@ember/object/tests/framework_test.js b/packages/@ember/object/tests/framework_test.js
index 6a7d134ca80..bca1c3fb477 100644
--- a/packages/@ember/object/tests/framework_test.js
+++ b/packages/@ember/object/tests/framework_test.js
@@ -1,5 +1,5 @@
 import { getOwner } from '@ember/-internals/owner';
-import { FrameworkObject } from '@ember/object';
+import { FrameworkObject } from '@ember/object/-internals';
 import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/object/type-tests/internals/cache-for.test.ts b/packages/@ember/object/type-tests/internals/cache-for.test.ts
index 3f9fec828e6..fcfcebe7e16 100644
--- a/packages/@ember/object/type-tests/internals/cache-for.test.ts
+++ b/packages/@ember/object/type-tests/internals/cache-for.test.ts
@@ -1,6 +1,6 @@
 import { expectTypeOf } from 'expect-type';
 
-import { cacheFor } from '@ember/object/internals';
+import { cacheFor } from '@ember/object/-internals';
 
 expectTypeOf(cacheFor).toEqualTypeOf<(obj: object, key: string) => unknown>();
 
diff --git a/packages/@ember/object/type-tests/internals/guid-for.test.ts b/packages/@ember/object/type-tests/internals/guid-for.test.ts
index 69e7fb50d55..d2f7c213d6e 100644
--- a/packages/@ember/object/type-tests/internals/guid-for.test.ts
+++ b/packages/@ember/object/type-tests/internals/guid-for.test.ts
@@ -1,6 +1,6 @@
 import { expectTypeOf } from 'expect-type';
 
-import { guidFor } from '@ember/object/internals';
+import { guidFor } from '@ember/object/-internals';
 
 expectTypeOf(guidFor('foo')).toEqualTypeOf<string>();
 expectTypeOf(guidFor(1)).toEqualTypeOf<string>();
diff --git a/packages/@ember/service/index.ts b/packages/@ember/service/index.ts
index c28867813df..36f1e9009b4 100644
--- a/packages/@ember/service/index.ts
+++ b/packages/@ember/service/index.ts
@@ -1,4 +1,4 @@
-import { FrameworkObject } from '@ember/object';
+import { FrameworkObject } from '@ember/object/-internals';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 import { inject as metalInject } from '@ember/-internals/metal';
 
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
index 7a42f0d9f05..9a40d164ffc 100644
--- a/packages/@ember/service/type-tests/index.test.ts
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -1,5 +1,5 @@
 import type { Owner } from '@ember/-internals/owner';
-import type { FrameworkObject } from '@ember/object';
+import type { FrameworkObject } from '@ember/object/-internals';
 import EmberObject from '@ember/object';
 import Service, { inject, service } from '@ember/service';
 import { expectTypeOf } from 'expect-type';

From ff0826c8e2e24b77da603e33e3019366307238c3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 24 Aug 2022 09:51:43 -0700
Subject: [PATCH 1078/1405] Move routing internals

---
 .../-internals/glimmer/lib/component-managers/mount.ts       | 2 +-
 packages/@ember/-internals/glimmer/lib/components/link-to.ts | 2 +-
 packages/@ember/-internals/routing/index.ts                  | 2 +-
 packages/@ember/application/index.ts                         | 2 +-
 packages/@ember/controller/index.ts                          | 4 ++--
 packages/@ember/engine/index.ts                              | 2 +-
 packages/@ember/routing/{internals.ts => -internals.ts}      | 0
 packages/@ember/routing/lib/routing-service.ts               | 2 +-
 packages/@ember/routing/route.ts                             | 4 ++--
 packages/@ember/routing/router-service.ts                    | 2 +-
 packages/@ember/routing/router.ts                            | 5 ++---
 packages/@ember/routing/tests/system/cache_test.js           | 2 +-
 packages/@ember/routing/tests/system/controller_for_test.js  | 2 +-
 packages/ember-testing/lib/helpers/current_path.ts           | 2 +-
 packages/ember-testing/lib/helpers/current_route_name.ts     | 2 +-
 packages/ember/index.js                                      | 2 +-
 16 files changed, 18 insertions(+), 19 deletions(-)
 rename packages/@ember/routing/{internals.ts => -internals.ts} (100%)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index 7732dfaae5b..c16e9660589 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,5 +1,5 @@
 import type { Owner } from '@ember/-internals/owner';
-import { generateControllerFactory } from '@ember/routing/internals';
+import { generateControllerFactory } from '@ember/routing/-internals';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
 import { associateDestroyableChild } from '@glimmer/destroyable';
diff --git a/packages/@ember/-internals/glimmer/lib/components/link-to.ts b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
index 58327eb9e27..f90bcfc951c 100644
--- a/packages/@ember/-internals/glimmer/lib/components/link-to.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/link-to.ts
@@ -1,5 +1,5 @@
 import type Route from '@ember/routing/route';
-import type { RouterState, RoutingService } from '@ember/routing/internals';
+import type { RouterState, RoutingService } from '@ember/routing/-internals';
 import { isSimpleClick } from '@ember/-internals/views';
 import { assert, debugFreeze, inspect, warn } from '@ember/debug';
 import { getEngineParent } from '@ember/engine';
diff --git a/packages/@ember/-internals/routing/index.ts b/packages/@ember/-internals/routing/index.ts
index cdb04f4cc1d..a55d506a555 100644
--- a/packages/@ember/-internals/routing/index.ts
+++ b/packages/@ember/-internals/routing/index.ts
@@ -3,4 +3,4 @@ export {
   generateController,
   generateControllerFactory,
   DSL as RouterDSL,
-} from '@ember/routing/internals';
+} from '@ember/routing/-internals';
diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index 23ad87e4388..40818eadccd 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -19,7 +19,7 @@ import AutoLocation from '@ember/routing/auto-location';
 import HashLocation from '@ember/routing/hash-location';
 import HistoryLocation from '@ember/routing/history-location';
 import NoneLocation from '@ember/routing/none-location';
-import { BucketCache } from '@ember/routing/internals';
+import { BucketCache } from '@ember/routing/-internals';
 import ApplicationInstance from '@ember/application/instance';
 import Engine, { buildInitializerMethod } from '@ember/engine';
 import type { BootOptions } from '@ember/engine/instance';
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 7167ed8e952..a6d7cb476ee 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -4,8 +4,8 @@ import { FrameworkObject } from '@ember/object/-internals';
 import { inject as metalInject } from '@ember/-internals/metal';
 import type { DecoratorPropertyDescriptor, ElementDescriptor } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
-import type { RouteArgs } from '@ember/routing/internals';
-import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/routing/internals';
+import type { RouteArgs } from '@ember/routing/-internals';
+import { deprecateTransitionMethods, prefixRouteNameArg } from '@ember/routing/-internals';
 import { ActionHandler } from '@ember/-internals/runtime';
 import { symbol } from '@ember/-internals/utils';
 import type Route from '@ember/routing/route';
diff --git a/packages/@ember/engine/index.ts b/packages/@ember/engine/index.ts
index f5c94558a62..27bfd5ba94b 100644
--- a/packages/@ember/engine/index.ts
+++ b/packages/@ember/engine/index.ts
@@ -11,7 +11,7 @@ import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
 import { get, set } from '@ember/object';
 import type { EngineInstanceOptions } from '@ember/engine/instance';
 import EngineInstance from '@ember/engine/instance';
-import { RoutingService } from '@ember/routing/internals';
+import { RoutingService } from '@ember/routing/-internals';
 import { ComponentLookup } from '@ember/-internals/views';
 import { setupEngineRegistry } from '@ember/-internals/glimmer';
 import { RegistryProxyMixin } from '@ember/-internals/runtime';
diff --git a/packages/@ember/routing/internals.ts b/packages/@ember/routing/-internals.ts
similarity index 100%
rename from packages/@ember/routing/internals.ts
rename to packages/@ember/routing/-internals.ts
diff --git a/packages/@ember/routing/lib/routing-service.ts b/packages/@ember/routing/lib/routing-service.ts
index ed8cce38805..92bb0392cfb 100644
--- a/packages/@ember/routing/lib/routing-service.ts
+++ b/packages/@ember/routing/lib/routing-service.ts
@@ -9,7 +9,7 @@ import Service from '@ember/service';
 import type { ModelFor } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
-import type { RouterState } from '@ember/routing/internals';
+import type { RouterState } from '@ember/routing/-internals';
 import { ROUTER } from '@ember/routing/router-service';
 
 /**
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index f833eae1d90..a06f93dbddf 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -7,7 +7,7 @@ import {
 } from '@ember/-internals/metal';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import { BucketCache } from '@ember/routing/internals';
+import { BucketCache } from '@ember/routing/-internals';
 import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object';
 import Evented from '@ember/object/evented';
 import { A as emberA } from '@ember/array';
@@ -33,7 +33,7 @@ import type {
 import { PARAMS_SYMBOL, STATE_SYMBOL } from 'router_js';
 import type { QueryParam } from '@ember/routing/router';
 import EmberRouter from '@ember/routing/router';
-import { generateController } from '@ember/routing/internals';
+import { generateController } from '@ember/routing/-internals';
 import type { ExpandedControllerQueryParam, NamedRouteArgs, RouteArgs } from './lib/utils';
 import {
   calculateCacheKey,
diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
index 422aab6f6fb..600e8a13254 100644
--- a/packages/@ember/routing/router-service.ts
+++ b/packages/@ember/routing/router-service.ts
@@ -7,7 +7,7 @@ import { consumeTag, tagFor } from '@glimmer/validator';
 import type { ModelFor, Transition } from 'router_js';
 import type Route from '@ember/routing/route';
 import EmberRouter from '@ember/routing/router';
-import { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/internals';
+import { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/-internals';
 import type { RouteArgs, RouteOptions } from './lib/utils';
 import { extractRouteArgs, resemblesURL, shallowEqual } from './lib/utils';
 
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 281d0d308e8..7956236845c 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -3,9 +3,8 @@ import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-inte
 import { computed, get, set } from '@ember/object';
 import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import { BucketCache, DSL } from '@ember/routing/internals';
-import type { DSLCallback, EngineRouteInfo } from '@ember/routing/internals';
-import { RouterState } from '@ember/routing/internals';
+import { BucketCache, DSL, RouterState } from '@ember/routing/-internals';
+import type { DSLCallback, EngineRouteInfo } from '@ember/routing/-internals';
 import {
   calculateCacheKey,
   extractRouteArgs,
diff --git a/packages/@ember/routing/tests/system/cache_test.js b/packages/@ember/routing/tests/system/cache_test.js
index 8f587f68d07..33721ad7f7e 100644
--- a/packages/@ember/routing/tests/system/cache_test.js
+++ b/packages/@ember/routing/tests/system/cache_test.js
@@ -1,4 +1,4 @@
-import { BucketCache } from '@ember/routing/internals';
+import { BucketCache } from '@ember/routing/-internals';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/packages/@ember/routing/tests/system/controller_for_test.js b/packages/@ember/routing/tests/system/controller_for_test.js
index cee8fcb5236..3584ce098d2 100644
--- a/packages/@ember/routing/tests/system/controller_for_test.js
+++ b/packages/@ember/routing/tests/system/controller_for_test.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { controllerFor, generateController } from '@ember/routing/internals';
+import { controllerFor, generateController } from '@ember/routing/-internals';
 import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 
diff --git a/packages/ember-testing/lib/helpers/current_path.ts b/packages/ember-testing/lib/helpers/current_path.ts
index 253b770a161..986ab6f03e7 100644
--- a/packages/ember-testing/lib/helpers/current_path.ts
+++ b/packages/ember-testing/lib/helpers/current_path.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { get } from '@ember/object';
-import { RoutingService } from '@ember/routing/internals';
+import { RoutingService } from '@ember/routing/-internals';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
 
diff --git a/packages/ember-testing/lib/helpers/current_route_name.ts b/packages/ember-testing/lib/helpers/current_route_name.ts
index 812deb9b74b..a03c11eede3 100644
--- a/packages/ember-testing/lib/helpers/current_route_name.ts
+++ b/packages/ember-testing/lib/helpers/current_route_name.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { get } from '@ember/object';
-import { RoutingService } from '@ember/routing/internals';
+import { RoutingService } from '@ember/routing/-internals';
 import type Application from '@ember/application';
 import { assert } from '@ember/debug';
 /**
diff --git a/packages/ember/index.js b/packages/ember/index.js
index 23a498a19ce..76febd1bef6 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -89,7 +89,7 @@ import {
   generateController,
   generateControllerFactory,
   DSL as RouterDSL,
-} from '@ember/routing/internals';
+} from '@ember/routing/-internals';
 import { isNone, isBlank, isEmpty, isPresent, isEqual, typeOf, compare } from '@ember/utils';
 
 import {

From 0fea53ede1f787e1d89631ec92d12eb0514a4a39 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 24 Aug 2022 09:52:09 -0700
Subject: [PATCH 1079/1405] Clean up imports

---
 .../integration/components/curly-components-test.js   |  7 ++++---
 .../tests/integration/helpers/element-action-test.js  |  3 +--
 .../-internals/runtime/tests/array/forEach-test.js    |  2 +-
 .../tests/legacy_1x/system/object/base_test.js        |  3 +--
 .../legacy_1x/system/object/concatenated_test.js      |  3 +--
 .../runtime/tests/mixins/comparable_test.js           |  3 +--
 .../runtime/tests/system/core_object_test.js          |  3 +--
 packages/@ember/array/proxy.ts                        | 11 +++++++++--
 packages/@ember/controller/index.ts                   |  2 +-
 packages/@ember/controller/tests/controller_test.js   |  3 +--
 packages/@ember/object/tests/action_test.js           |  4 +---
 .../object/tests/computed/computed_macros_test.js     |  5 ++---
 .../tests/computed/reduce_computed_macros_test.js     | 11 +++++++++--
 packages/@ember/object/tests/computed_test.js         |  6 +++---
 packages/@ember/object/tests/create_test.js           |  3 ++-
 packages/@ember/routing/router.ts                     |  3 +--
 16 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
index a2b3934e293..d3646a33074 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/curly-components-test.js
@@ -11,10 +11,11 @@ import {
 
 import { run } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
-import { alias, on, tracked } from '@ember/-internals/metal';
-import { set, get, computed } from '@ember/object';
+import { tracked } from '@ember/-internals/metal';
+import { alias } from '@ember/object/computed';
+import { on } from '@ember/object/evented';
 import Service, { service } from '@ember/service';
-import EmberObject, { observer } from '@ember/object';
+import EmberObject, { set, get, computed, observer } from '@ember/object';
 import { A as emberA } from '@ember/array';
 
 import { Component, compile, htmlSafe } from '../../utils/helpers';
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index ee13d29cf6b..d4709e76bbf 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -1,12 +1,11 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import { set } from '@ember/object';
 import {
   subscribe as instrumentationSubscribe,
   reset as instrumentationReset,
 } from '@ember/instrumentation';
 import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
-import EmberObject from '@ember/object';
+import EmberObject, { set } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { ActionManager } from '@ember/-internals/views';
 
diff --git a/packages/@ember/-internals/runtime/tests/array/forEach-test.js b/packages/@ember/-internals/runtime/tests/array/forEach-test.js
index c381fdcfa19..062a1302c36 100644
--- a/packages/@ember/-internals/runtime/tests/array/forEach-test.js
+++ b/packages/@ember/-internals/runtime/tests/array/forEach-test.js
@@ -1,5 +1,5 @@
 import { guidFor } from '@ember/-internals/utils';
-import { get } from '@ember/object';
+import { get } from '@ember/-internals/metal';
 import { AbstractTestCase } from 'internal-test-helpers';
 import { runArrayTests } from '../helpers/array';
 
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
index 073c96f7d32..35ab94d2a17 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/base_test.js
@@ -1,5 +1,4 @@
-import { get, set } from '@ember/object';
-import EmberObject from '@ember/object';
+import EmberObject, { get, set } from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
index 5a2c16b88cf..b20600f4be2 100644
--- a/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
+++ b/packages/@ember/-internals/runtime/tests/legacy_1x/system/object/concatenated_test.js
@@ -1,5 +1,4 @@
-import { get } from '@ember/object';
-import EmberObject from '@ember/object';
+import EmberObject, { get } from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 /*
diff --git a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
index aa670b93bf3..eca8df99bdb 100644
--- a/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
+++ b/packages/@ember/-internals/runtime/tests/mixins/comparable_test.js
@@ -1,5 +1,4 @@
-import { get } from '@ember/object';
-import EmberObject from '@ember/object';
+import EmberObject, { get } from '@ember/object';
 import { compare } from '@ember/utils';
 import Comparable from '../../lib/mixins/comparable';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
diff --git a/packages/@ember/-internals/runtime/tests/system/core_object_test.js b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
index c4e57c3c31f..56f0f7d3a10 100644
--- a/packages/@ember/-internals/runtime/tests/system/core_object_test.js
+++ b/packages/@ember/-internals/runtime/tests/system/core_object_test.js
@@ -1,6 +1,5 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { get, set } from '@ember/object';
-import { observer } from '@ember/object';
+import { get, set, observer } from '@ember/object';
 import CoreObject from '@ember/object/core';
 import {
   moduleFor,
diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts
index c086c4a2af9..ee35b95edb3 100644
--- a/packages/@ember/array/proxy.ts
+++ b/packages/@ember/array/proxy.ts
@@ -21,8 +21,15 @@ import EmberArray from '@ember/array';
 import MutableArray from '@ember/array/mutable';
 import { assert } from '@ember/debug';
 import { setCustomTagFor } from '@glimmer/manager';
-import type { Tag, Revision } from '@glimmer/validator';
-import { combine, consumeTag, validateTag, valueForTag, tagFor } from '@glimmer/validator';
+import {
+  combine,
+  consumeTag,
+  validateTag,
+  valueForTag,
+  tagFor,
+  type Tag,
+  type Revision,
+} from '@glimmer/validator';
 
 function isMutable<T>(obj: T[] | EmberArray<T>): obj is T[] | MutableArray<T> {
   return Array.isArray(obj) || typeof (obj as MutableArray<T>).replace === 'function';
diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index a6d7cb476ee..91f19feb48b 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,4 +1,4 @@
-import { getOwner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/application';
 import { computed, get } from '@ember/object';
 import { FrameworkObject } from '@ember/object/-internals';
 import { inject as metalInject } from '@ember/-internals/metal';
diff --git a/packages/@ember/controller/tests/controller_test.js b/packages/@ember/controller/tests/controller_test.js
index b1eb3b889f8..4ad4dffb0ce 100644
--- a/packages/@ember/controller/tests/controller_test.js
+++ b/packages/@ember/controller/tests/controller_test.js
@@ -1,7 +1,6 @@
 import Controller, { inject as injectController } from '@ember/controller';
 import Service, { service } from '@ember/service';
-import EmberObject from '@ember/object';
-import { get } from '@ember/object';
+import EmberObject, { get } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import { setOwner } from '@ember/-internals/owner';
 import { runDestroy, buildOwner } from 'internal-test-helpers';
diff --git a/packages/@ember/object/tests/action_test.js b/packages/@ember/object/tests/action_test.js
index 80b26910160..8acc0dca4de 100644
--- a/packages/@ember/object/tests/action_test.js
+++ b/packages/@ember/object/tests/action_test.js
@@ -1,9 +1,7 @@
 import { Component } from '@ember/-internals/glimmer';
-import EmberObject from '@ember/object';
+import EmberObject, { action } from '@ember/object';
 import { moduleFor, RenderingTestCase, strip } from 'internal-test-helpers';
 
-import { action } from '@ember/object';
-
 moduleFor(
   '@action decorator',
   class extends RenderingTestCase {
diff --git a/packages/@ember/object/tests/computed/computed_macros_test.js b/packages/@ember/object/tests/computed/computed_macros_test.js
index 39941b66183..b8989d13a93 100644
--- a/packages/@ember/object/tests/computed/computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/computed_macros_test.js
@@ -1,5 +1,5 @@
-import { alias, defineProperty } from '@ember/-internals/metal';
 import {
+  alias,
   empty,
   notEmpty,
   not,
@@ -16,8 +16,7 @@ import {
   and,
   or,
 } from '@ember/object/computed';
-
-import EmberObject, { get, set, computed } from '@ember/object';
+import EmberObject, { get, set, computed, defineProperty } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
diff --git a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
index 5e24bbb52c4..40ee458a6dc 100644
--- a/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
+++ b/packages/@ember/object/tests/computed/reduce_computed_macros_test.js
@@ -1,6 +1,13 @@
 import { run } from '@ember/runloop';
-import { defineProperty, setProperties, addObserver } from '@ember/-internals/metal';
-import EmberObject, { get, set, computed, observer } from '@ember/object';
+import { addObserver } from '@ember/-internals/metal';
+import EmberObject, {
+  defineProperty,
+  get,
+  set,
+  setProperties,
+  computed,
+  observer,
+} from '@ember/object';
 import ObjectProxy from '@ember/object/proxy';
 import { isArray, A as emberA, removeAt } from '@ember/array';
 import {
diff --git a/packages/@ember/object/tests/computed_test.js b/packages/@ember/object/tests/computed_test.js
index c79e5edc87d..c5c3dbadf23 100644
--- a/packages/@ember/object/tests/computed_test.js
+++ b/packages/@ember/object/tests/computed_test.js
@@ -1,7 +1,7 @@
-import { alias, defineProperty, notifyPropertyChange } from '@ember/-internals/metal';
-import { oneWay as reads } from '@ember/object/computed';
+import { notifyPropertyChange } from '@ember/-internals/metal';
+import { alias, oneWay as reads } from '@ember/object/computed';
 import { A as emberA, isArray } from '@ember/array';
-import EmberObject, { get, set, computed, observer } from '@ember/object';
+import EmberObject, { defineProperty, get, set, computed, observer } from '@ember/object';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function K() {
diff --git a/packages/@ember/object/tests/create_test.js b/packages/@ember/object/tests/create_test.js
index 7fbc3a98dc0..e6b23098fbe 100644
--- a/packages/@ember/object/tests/create_test.js
+++ b/packages/@ember/object/tests/create_test.js
@@ -1,10 +1,11 @@
 import { getFactoryFor, Registry } from '@ember/-internals/container';
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import { addObserver, alias } from '@ember/-internals/metal';
+import { addObserver } from '@ember/object/observers';
 import Mixin from '@ember/object/mixin';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import EmberObject, { computed, observer } from '@ember/object';
+import { alias } from '@ember/object/computed';
 import { buildOwner, moduleFor, runDestroy, AbstractTestCase } from 'internal-test-helpers';
 import { destroy } from '@glimmer/destroyable';
 
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 7956236845c..084a541d5bb 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -12,8 +12,7 @@ import {
   resemblesURL,
 } from './lib/utils';
 import type { RouteArgs, RouteOptions } from './lib/utils';
-import EmberLocation from '@ember/routing/location';
-import type { ILocation as IEmberLocation } from '@ember/routing/location';
+import EmberLocation, { type ILocation as IEmberLocation } from '@ember/routing/location';
 import type RouterService from '@ember/routing/router-service';
 import EmberObject from '@ember/object';
 import { A as emberA } from '@ember/array';

From 63e01acb5b03ed98d0fe0d27e4581edde72697ba Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 24 Aug 2022 09:53:25 -0700
Subject: [PATCH 1080/1405] Fix YUIDoc module names

---
 packages/@ember/application/namespace.ts         | 2 +-
 packages/@ember/array/proxy.ts                   | 2 +-
 packages/@ember/debug/container-debug-adapter.ts | 2 +-
 packages/@ember/debug/data-adapter.ts            | 8 ++++----
 packages/@ember/object/core.ts                   | 2 +-
 packages/@ember/object/evented.ts                | 2 +-
 packages/@ember/object/mixin.ts                  | 2 +-
 packages/@ember/object/observable.ts             | 2 +-
 packages/@ember/object/promise-proxy-mixin.ts    | 2 +-
 packages/@ember/object/proxy.ts                  | 4 ++++
 packages/@ember/routing/auto-location.ts         | 2 +-
 packages/@ember/routing/hash-location.ts         | 2 +-
 packages/@ember/routing/history-location.ts      | 2 +-
 packages/@ember/routing/location.ts              | 2 +-
 packages/@ember/routing/none-location.ts         | 2 +-
 packages/@ember/routing/route.ts                 | 2 +-
 packages/@ember/routing/router-service.ts        | 3 +++
 packages/@ember/routing/router.ts                | 2 +-
 18 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/packages/@ember/application/namespace.ts b/packages/@ember/application/namespace.ts
index a776f04330f..f561d4281bb 100644
--- a/packages/@ember/application/namespace.ts
+++ b/packages/@ember/application/namespace.ts
@@ -1,5 +1,5 @@
 /**
-@module @ember/application
+@module @ember/application/namespace
 */
 
 import {
diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts
index ee35b95edb3..5f1fe145e99 100644
--- a/packages/@ember/array/proxy.ts
+++ b/packages/@ember/array/proxy.ts
@@ -1,5 +1,5 @@
 /**
-@module @ember/array
+@module @ember/array/proxy
 */
 
 import {
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index f94abec01d5..5a49aa5ec12 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -9,7 +9,7 @@ import type { Resolver } from '@ember/-internals/container';
 import Namespace from '@ember/application/namespace';
 
 /**
-@module @ember/debug
+@module @ember/debug/container-debug-adapter
 */
 
 /**
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index ac635a84ad1..49f1243d92d 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -11,6 +11,10 @@ import type { Cache } from '@glimmer/validator';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
 
+/**
+@module @ember/debug/data-adapter
+*/
+
 type RecordColor = 'black' | 'red' | 'blue' | 'green';
 
 type WrappedType<N extends string = string> = {
@@ -151,10 +155,6 @@ class TypeWatcher {
   }
 }
 
-/**
-@module @ember/debug
-*/
-
 /**
   The `DataAdapter` helps a data persistence library
   interface with tools that debug Ember such
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index 2eb4f9beff0..f616ca0bb7b 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -1,5 +1,5 @@
 /**
-  @module @ember/object
+  @module @ember/object/core
 */
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
diff --git a/packages/@ember/object/evented.ts b/packages/@ember/object/evented.ts
index e56fecf0c11..775870071de 100644
--- a/packages/@ember/object/evented.ts
+++ b/packages/@ember/object/evented.ts
@@ -4,7 +4,7 @@ import Mixin from '@ember/object/mixin';
 export { on } from '@ember/-internals/metal';
 
 /**
-@module @ember/object
+@module @ember/object/evented
 */
 
 /**
diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index 70a842a168a..d874914a250 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -1,5 +1,5 @@
 /**
-@module @ember/object
+@module @ember/object/mixin
 */
 import { INIT_FACTORY } from '@ember/-internals/container';
 import type { Meta } from '@ember/-internals/meta';
diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index cff52fbdbef..94cdafe1fe4 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -1,5 +1,5 @@
 /**
-@module @ember/object
+@module @ember/object/observable
 */
 
 import { peekMeta } from '@ember/-internals/meta';
diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index d1fa1199922..d053a20a98f 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -6,7 +6,7 @@ import type RSVP from 'rsvp';
 import type CoreObject from '@ember/object/core';
 
 /**
-  @module @ember/object
+  @module @ember/object/promise-proxy-mixin
 */
 
 function tap<T>(proxy: PromiseProxyMixin<T>, promise: RSVP.Promise<T>) {
diff --git a/packages/@ember/object/proxy.ts b/packages/@ember/object/proxy.ts
index 9dc54dd557b..9fb314c258d 100644
--- a/packages/@ember/object/proxy.ts
+++ b/packages/@ember/object/proxy.ts
@@ -1,3 +1,7 @@
+/**
+@module @ember/object/proxy
+*/
+
 import { FrameworkObject } from '@ember/object/-internals';
 import { _ProxyMixin } from '@ember/-internals/runtime';
 
diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts
index 8f6a732ce61..fa0aaaf4323 100644
--- a/packages/@ember/routing/auto-location.ts
+++ b/packages/@ember/routing/auto-location.ts
@@ -15,7 +15,7 @@ import {
 } from './lib/location-utils';
 
 /**
-@module @ember/routing
+@module @ember/routing/auto-location
 */
 
 /**
diff --git a/packages/@ember/routing/hash-location.ts b/packages/@ember/routing/hash-location.ts
index 302493c7733..b545e203d9d 100644
--- a/packages/@ember/routing/hash-location.ts
+++ b/packages/@ember/routing/hash-location.ts
@@ -4,7 +4,7 @@ import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/
 import { getHash } from './lib/location-utils';
 
 /**
-@module @ember/routing
+@module @ember/routing/hash-location
 */
 
 /**
diff --git a/packages/@ember/routing/history-location.ts b/packages/@ember/routing/history-location.ts
index 96d623a09be..8d459888511 100644
--- a/packages/@ember/routing/history-location.ts
+++ b/packages/@ember/routing/history-location.ts
@@ -3,7 +3,7 @@ import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/
 import { getHash } from './lib/location-utils';
 
 /**
-@module @ember/routing
+@module @ember/routing/history-location
 */
 
 let popstateFired = false;
diff --git a/packages/@ember/routing/location.ts b/packages/@ember/routing/location.ts
index 28d152e8f70..0138328c497 100644
--- a/packages/@ember/routing/location.ts
+++ b/packages/@ember/routing/location.ts
@@ -15,7 +15,7 @@ export interface ILocation {
 
 export type UpdateCallback = (url: string) => void;
 /**
-@module @ember/routing
+@module @ember/routing/location
 */
 
 /**
diff --git a/packages/@ember/routing/none-location.ts b/packages/@ember/routing/none-location.ts
index c1c0defc71b..23202fd56c1 100644
--- a/packages/@ember/routing/none-location.ts
+++ b/packages/@ember/routing/none-location.ts
@@ -3,7 +3,7 @@ import { assert } from '@ember/debug';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 
 /**
-@module @ember/routing
+@module @ember/routing/none-location
 */
 
 /**
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index a06f93dbddf..1e22eebda1d 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -70,7 +70,7 @@ export const ROUTE_CONNECTIONS = new WeakMap();
 const RENDER = Symbol('render');
 
 /**
-@module @ember/routing
+@module @ember/routing/route
 */
 
 /**
diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
index 600e8a13254..8da73347904 100644
--- a/packages/@ember/routing/router-service.ts
+++ b/packages/@ember/routing/router-service.ts
@@ -1,3 +1,6 @@
+/**
+ * @module @ember/routing/router-service
+ */
 import { getOwner } from '@ember/-internals/owner';
 import Evented from '@ember/object/evented';
 import { assert } from '@ember/debug';
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 084a541d5bb..73947ae2c30 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -46,7 +46,7 @@ import type { QueryParams } from 'route-recognizer';
 import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
 
 /**
-@module @ember/routing
+@module @ember/routing/router
 */
 
 function defaultDidTransition<R extends Route>(

From 5feedc858ae43a64ca555fd227ec7429581e8952 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 24 Aug 2022 09:53:39 -0700
Subject: [PATCH 1081/1405] Clean up export

---
 packages/@ember/utils/lib/type-of.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/@ember/utils/lib/type-of.ts b/packages/@ember/utils/lib/type-of.ts
index df4a3c0d5bc..b43888a3bf8 100644
--- a/packages/@ember/utils/lib/type-of.ts
+++ b/packages/@ember/utils/lib/type-of.ts
@@ -98,7 +98,7 @@ const { toString } = Object.prototype;
   @public
   @static
 */
-function typeOf(item: unknown): TypeName {
+export default function typeOf(item: unknown): TypeName {
   if (item === null) {
     return 'null';
   }
@@ -123,5 +123,3 @@ function typeOf(item: unknown): TypeName {
 
   return ret;
 }
-
-export default typeOf;

From 0ec0df9435748a5c3e37003fbe359a78c2c8b9f2 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 26 Aug 2022 09:07:12 -0700
Subject: [PATCH 1082/1405] Upgrade router_js

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cd0405fcf77..f232b29a9ae 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
-    "router_js": "^8.0.2",
+    "router_js": "^8.0.3",
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.2",
     "simple-dom": "^1.4.0",
diff --git a/yarn.lock b/yarn.lock
index f38f7b15aec..c51f83e4b7b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8779,10 +8779,10 @@ route-recognizer@^0.3.4:
   resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz#39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"
   integrity "sha1-Oasf+84cWebSvcpBbwkyYR5PPKM= sha512-2+MhsfPhvauN1O8KaXpXAOfR/fwe8dnUXVM+xw7yt40lJRfPVQxV6yryZm0cgRvAj5fMF/mdRZbL2ptwbs5i2g=="
 
-router_js@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/router_js/-/router_js-8.0.2.tgz#ea0e011ac050d41cae896e3bd18c542456bec910"
-  integrity sha512-l0RUYT61Z7xtmTrEJh4pP6Y4TvFfp6OdCWAV0i+3wQZpAZOnX/OQR8wsbyPRjM3iJIddCJYkX3ayySKMfCzdGw==
+router_js@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/router_js/-/router_js-8.0.3.tgz#c00912925839bd2a427c8e12b6cec6bc0f496947"
+  integrity sha512-lSgNMksk/wp8nspLX3Pn6QD499FUjwYMkgP99RxqKEScil4DKC/59YezpEZ318zGtkq8WR01VBhH+/u3InlLgg==
   dependencies:
     "@glimmer/env" "^0.1.7"
 

From 99a90a23cc204f1006ca429c2b7a9ea1a651a4c9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 25 Aug 2022 17:32:23 -0600
Subject: [PATCH 1083/1405] [internal] improve Cache TS and implementation

I happened to look at this while working on publishing preview types,
and noticed that the types here were using a non-null assertion, and
switched it to an explicit cast with a `// SAFETY: ...` comment.

Next, use the optional parameter initialization shorthand to make the
constructor more clear (a constructor which defines properties *and*
has a body is extremely confusing to contributors, including me!) and
avoid doing something in the body which the language can do for us.

Finally, switch one use of `any` to `unknown`, in one of the usage sites
for `Cache`.
---
 packages/@ember/-internals/metal/lib/path_cache.ts |  2 +-
 packages/@ember/-internals/utils/lib/cache.ts      | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/path_cache.ts b/packages/@ember/-internals/metal/lib/path_cache.ts
index a4bfcea194c..1859f03272a 100644
--- a/packages/@ember/-internals/metal/lib/path_cache.ts
+++ b/packages/@ember/-internals/metal/lib/path_cache.ts
@@ -2,6 +2,6 @@ import { Cache } from '@ember/-internals/utils';
 
 const firstDotIndexCache = new Cache<string, number>(1000, (key) => key.indexOf('.'));
 
-export function isPath(path: any): boolean {
+export function isPath(path: unknown): boolean {
   return typeof path === 'string' && firstDotIndexCache.get(path) !== -1;
 }
diff --git a/packages/@ember/-internals/utils/lib/cache.ts b/packages/@ember/-internals/utils/lib/cache.ts
index 049a830e5a5..39f0c370e2e 100644
--- a/packages/@ember/-internals/utils/lib/cache.ts
+++ b/packages/@ember/-internals/utils/lib/cache.ts
@@ -3,15 +3,17 @@ export default class Cache<T, V> {
   public misses = 0;
   public hits = 0;
 
-  constructor(private limit: number, private func: (obj: T) => V, private store?: any) {
-    this.store = store || new Map();
-  }
+  constructor(
+    private limit: number,
+    private func: (obj: T) => V,
+    private store: Map<T, V> = new Map()
+  ) {}
 
   get(key: T): V {
     if (this.store.has(key)) {
       this.hits++;
-
-      return this.store.get(key);
+      // SAFETY: we know the value is present because `.has(key)` was `true`.
+      return this.store.get(key) as V;
     } else {
       this.misses++;
       return this.set(key, this.func(key));

From 7bad4388304b61be2f09de2ab0177986bbaf9bf1 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Tue, 30 Aug 2022 21:46:54 +0200
Subject: [PATCH 1084/1405] Clean up `helper` and `helper-test` blueprints

---
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__.js       |  0
 .../mu-files/__root__/__collection__/__name__.js  |  7 -------
 blueprints/helper-test/index.js                   |  3 ---
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.ts  |  0
 .../{__collection__ => helpers}/__name__-test.js  |  0
 .../{__collection__ => helpers}/__name__-test.ts  |  0
 .../{__collection__ => helpers}/__name__.ts       |  0
 blueprints/helper/index.js                        | 15 ---------------
 .../mu-files/__root__/__collection__/__name__.js  |  7 -------
 16 files changed, 32 deletions(-)
 rename blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints-js/helper-test/mocha-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints-js/helper-test/qunit-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints-js/helper/files/__root__/{__collection__ => helpers}/__name__.js (100%)
 delete mode 100644 blueprints-js/helper/mu-files/__root__/__collection__/__name__.js
 rename blueprints/helper-test/mocha-0.12-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints/helper-test/mocha-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.ts (100%)
 rename blueprints/helper-test/qunit-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.js (100%)
 rename blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/{__collection__ => helpers}/__name__-test.ts (100%)
 rename blueprints/helper/files/__root__/{__collection__ => helpers}/__name__.ts (100%)
 delete mode 100644 blueprints/helper/mu-files/__root__/__collection__/__name__.js

diff --git a/blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints-js/helper-test/mocha-0.12-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints-js/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints-js/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints-js/helper-test/mocha-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints-js/helper-test/mocha-rfc-232-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints-js/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints-js/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints-js/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints-js/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints-js/helper/files/__root__/__collection__/__name__.js b/blueprints-js/helper/files/__root__/helpers/__name__.js
similarity index 100%
rename from blueprints-js/helper/files/__root__/__collection__/__name__.js
rename to blueprints-js/helper/files/__root__/helpers/__name__.js
diff --git a/blueprints-js/helper/mu-files/__root__/__collection__/__name__.js b/blueprints-js/helper/mu-files/__root__/__collection__/__name__.js
deleted file mode 100644
index d737dfc8868..00000000000
--- a/blueprints-js/helper/mu-files/__root__/__collection__/__name__.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { helper as buildHelper } from '@ember/component/helper';
-
-export function <%= camelizedModuleName %>(positional /*, named*/) {
-  return positional;
-}
-
-export const helper = buildHelper(<%= camelizedModuleName %>);
diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
index f8e89935a57..8456913d99a 100644
--- a/blueprints/helper-test/index.js
+++ b/blueprints/helper-test/index.js
@@ -26,9 +26,6 @@ module.exports = useTestFrameworkDetector({
       __testType__() {
         return 'integration';
       },
-      __collection__() {
-        return 'helpers';
-      },
     };
   },
 
diff --git a/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-0.12-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints/helper-test/mocha-0.12-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints/helper-test/mocha-0.12-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/mocha-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints/helper-test/mocha-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints/helper-test/mocha-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts b/blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts
similarity index 100%
rename from blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
rename to blueprints/helper-test/mocha-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts
diff --git a/blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js b/blueprints/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js
similarity index 100%
rename from blueprints/helper-test/qunit-files/__root__/__testType__/__collection__/__name__-test.js
rename to blueprints/helper-test/qunit-files/__root__/__testType__/helpers/__name__-test.js
diff --git a/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts b/blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts
similarity index 100%
rename from blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/__collection__/__name__-test.ts
rename to blueprints/helper-test/qunit-rfc-232-files/__root__/__testType__/helpers/__name__-test.ts
diff --git a/blueprints/helper/files/__root__/__collection__/__name__.ts b/blueprints/helper/files/__root__/helpers/__name__.ts
similarity index 100%
rename from blueprints/helper/files/__root__/__collection__/__name__.ts
rename to blueprints/helper/files/__root__/helpers/__name__.ts
diff --git a/blueprints/helper/index.js b/blueprints/helper/index.js
index 6bc5b1497d0..5965e7767cf 100644
--- a/blueprints/helper/index.js
+++ b/blueprints/helper/index.js
@@ -4,8 +4,6 @@ const normalizeEntityName = require('ember-cli-normalize-entity-name');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
-const path = require('path');
-
 module.exports = {
   description: 'Generates a helper function.',
 
@@ -16,19 +14,6 @@ module.exports = {
     maybePolyfillTypeScriptBlueprints(this);
   },
 
-  filesPath() {
-    let rootPath = 'files';
-    return path.join(this.path, rootPath);
-  },
-
-  fileMapTokens() {
-    return {
-      __collection__() {
-        return 'helpers';
-      },
-    };
-  },
-
   normalizeEntityName: function (entityName) {
     return normalizeEntityName(
       entityName.replace(/\.js$/, '') //Prevent generation of ".js.js" files
diff --git a/blueprints/helper/mu-files/__root__/__collection__/__name__.js b/blueprints/helper/mu-files/__root__/__collection__/__name__.js
deleted file mode 100644
index d737dfc8868..00000000000
--- a/blueprints/helper/mu-files/__root__/__collection__/__name__.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { helper as buildHelper } from '@ember/component/helper';
-
-export function <%= camelizedModuleName %>(positional /*, named*/) {
-  return positional;
-}
-
-export const helper = buildHelper(<%= camelizedModuleName %>);

From 6278a8b7cfe55ef2b138ec7d1324bc5cc79544c3 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 22 Aug 2022 21:32:04 -0600
Subject: [PATCH 1085/1405] [FEATURE] Introduce a preview types package

Copy the types from DefinitelyTyped, and set up a bare minimum config
to make it possible to iterate on them. This particular commit fails all
type checking and has an enormous amount of work to do, but provides a
foundation on which we can iterate.
---
 .eslintrc.js                                  |  21 +
 package.json                                  |   5 +
 .../-private/event-dispatcher.d.ts            |  16 +
 .../@ember/application/-private/registry.d.ts |   9 +
 .../@ember/application/deprecations.d.ts      |  23 +
 types/preview/@ember/application/index.d.ts   | 159 ++++++
 .../preview/@ember/application/instance.d.ts  |   7 +
 .../application/test/application-instance.ts  |  44 ++
 .../@ember/application/test/application.ts    |  43 ++
 .../@ember/application/test/deprecations.ts   |  17 +
 .../preview/@ember/application/test/index.ts  |  28 +
 .../preview/@ember/application/tsconfig.json  |   3 +
 types/preview/@ember/application/types.d.ts   |  27 +
 .../@ember/array/-private/enumerable.d.ts     | 179 ++++++
 .../array/-private/mutable-enumerable.d.ts    |  28 +
 .../@ember/array/-private/native-array.d.ts   |  23 +
 types/preview/@ember/array/index.d.ts         |  79 +++
 types/preview/@ember/array/mutable.d.ts       |  75 +++
 types/preview/@ember/array/proxy.d.ts         |  31 ++
 types/preview/@ember/array/test/array-ext.ts  |  23 +
 .../preview/@ember/array/test/array-proxy.ts  |  57 ++
 types/preview/@ember/array/test/array.ts      |  65 +++
 types/preview/@ember/array/test/lib/assert.ts |   2 +
 types/preview/@ember/array/tsconfig.json      |   3 +
 .../array/types/prototype-extensions.d.ts     |   5 +
 .../-private/class-names-support.d.ts         |  25 +
 .../@ember/component/-private/core-view.d.ts  |  12 +
 .../-private/glimmer-interfaces.d.ts          |  44 ++
 .../@ember/component/-private/view-mixin.d.ts |  57 ++
 types/preview/@ember/component/helper.d.ts    | 198 +++++++
 types/preview/@ember/component/index.d.ts     | 131 +++++
 .../@ember/component/template-only.d.ts       |  46 ++
 .../@ember/component/test/built-ins.ts        |   4 +
 .../@ember/component/test/component.ts        | 157 ++++++
 types/preview/@ember/component/test/helper.ts | 128 +++++
 .../@ember/component/test/lib/assert.ts       |   2 +
 .../@ember/component/test/template-only.ts    |  28 +
 types/preview/@ember/component/tsconfig.json  |   3 +
 types/preview/@ember/controller/index.d.ts    |  47 ++
 types/preview/@ember/controller/test/main.ts  |  14 +
 .../preview/@ember/controller/test/octane.ts  |  36 ++
 types/preview/@ember/controller/tsconfig.json |   3 +
 .../@ember/debug/container-debug-adapter.d.ts |  11 +
 types/preview/@ember/debug/data-adapter.d.ts  |  62 +++
 .../@ember/debug/ember__debug-tests.ts        | 237 ++++++++
 types/preview/@ember/debug/index.d.ts         | 100 ++++
 types/preview/@ember/debug/tsconfig.json      |   3 +
 types/preview/@ember/destroyable/index.d.ts   |  29 +
 .../@ember/destroyable/test/lib/assert.ts     |   2 +
 types/preview/@ember/destroyable/test/main.ts |  91 +++
 .../preview/@ember/destroyable/tsconfig.json  |   3 +
 .../-private/container-proxy-mixin.d.ts       |  15 +
 .../engine/-private/registry-proxy-mixin.d.ts |  52 ++
 .../engine/-private/types/initializer.d.ts    |   6 +
 types/preview/@ember/engine/index.d.ts        |  65 +++
 types/preview/@ember/engine/instance.d.ts     |  22 +
 .../@ember/engine/test/engine-instance.ts     |  26 +
 types/preview/@ember/engine/test/engine.ts    |  43 ++
 types/preview/@ember/engine/tsconfig.json     |   3 +
 .../@ember/error/ember__error-tests.ts        |   7 +
 types/preview/@ember/error/index.d.ts         |  12 +
 types/preview/@ember/error/tsconfig.json      |   3 +
 .../@ember/helper/ember__helper-tests.ts      |   7 +
 types/preview/@ember/helper/index.d.ts        |  55 ++
 types/preview/@ember/helper/tsconfig.json     |   3 +
 .../@ember/modifier/ember__modifier-tests.ts  |   8 +
 types/preview/@ember/modifier/index.d.ts      |  39 ++
 types/preview/@ember/modifier/tsconfig.json   |   3 +
 .../object/-private/action-handler.d.ts       |  28 +
 .../preview/@ember/object/-private/types.d.ts |  61 ++
 types/preview/@ember/object/compat.d.ts       |   7 +
 types/preview/@ember/object/computed.d.ts     | 261 +++++++++
 types/preview/@ember/object/core.d.ts         |  82 +++
 types/preview/@ember/object/evented.d.ts      |  60 ++
 types/preview/@ember/object/events.d.ts       |  49 ++
 types/preview/@ember/object/index.d.ts        | 116 ++++
 types/preview/@ember/object/internals.d.ts    |  15 +
 types/preview/@ember/object/mixin.d.ts        |  17 +
 types/preview/@ember/object/observable.d.ts   |  78 +++
 types/preview/@ember/object/observers.d.ts    |  32 ++
 .../@ember/object/promise-proxy-mixin.d.ts    |  35 ++
 types/preview/@ember/object/proxy.d.ts        |  25 +
 .../@ember/object/test/access-modifier.ts     |  29 +
 types/preview/@ember/object/test/compat.ts    |  12 +
 types/preview/@ember/object/test/computed.ts  | 231 ++++++++
 types/preview/@ember/object/test/core.ts      | 218 ++++++++
 .../@ember/object/test/create-negative.ts     |  11 +
 types/preview/@ember/object/test/create.ts    |  54 ++
 types/preview/@ember/object/test/event.ts     |  92 +++
 types/preview/@ember/object/test/extend.ts    |  61 ++
 types/preview/@ember/object/test/get-set.ts   |  14 +
 types/preview/@ember/object/test/internals.ts |  10 +
 .../preview/@ember/object/test/lib/assert.ts  |   2 +
 types/preview/@ember/object/test/object.ts    | 102 ++++
 .../preview/@ember/object/test/observable.ts  | 102 ++++
 types/preview/@ember/object/test/octane.ts    | 331 +++++++++++
 types/preview/@ember/object/test/proxy.ts     | 103 ++++
 types/preview/@ember/object/test/reopen.ts    |  75 +++
 types/preview/@ember/object/tsconfig.json     |   3 +
 .../@ember/owner/ember__owner-tests.ts        | 135 +++++
 types/preview/@ember/owner/index.d.ts         | 104 ++++
 types/preview/@ember/owner/tsconfig.json      |   3 +
 .../polyfills/ember__polyfills-tests.ts       |  23 +
 types/preview/@ember/polyfills/index.d.ts     |  29 +
 types/preview/@ember/polyfills/tsconfig.json  |   3 +
 types/preview/@ember/polyfills/types.d.ts     |   4 +
 .../-private/route-info-with-attributes.d.ts  |   1 +
 .../@ember/routing/-private/route-info.d.ts   |   1 +
 .../@ember/routing/-private/router-dsl.d.ts   |  18 +
 .../@ember/routing/-private/transition.d.ts   |   1 +
 .../preview/@ember/routing/auto-location.d.ts |   6 +
 .../preview/@ember/routing/hash-location.d.ts |   8 +
 .../@ember/routing/history-location.d.ts      |   7 +
 types/preview/@ember/routing/index.d.ts       |  26 +
 .../preview/@ember/routing/none-location.d.ts |   9 +
 types/preview/@ember/routing/route-info.d.ts  |  72 +++
 types/preview/@ember/routing/route.d.ts       | 525 ++++++++++++++++++
 .../@ember/routing/router-service.d.ts        | 360 ++++++++++++
 types/preview/@ember/routing/router.d.ts      |  43 ++
 .../preview/@ember/routing/test/built-ins.ts  |   3 +
 .../preview/@ember/routing/test/lib/assert.ts |   2 +
 types/preview/@ember/routing/test/route.ts    | 227 ++++++++
 .../@ember/routing/test/router-service.ts     | 120 ++++
 types/preview/@ember/routing/test/router.ts   |  81 +++
 types/preview/@ember/routing/transition.d.ts  | 124 +++++
 types/preview/@ember/routing/tsconfig.json    |   3 +
 types/preview/@ember/routing/types.d.ts       |  13 +
 .../@ember/runloop/-private/backburner.d.ts   |  41 ++
 .../@ember/runloop/-private/types.d.ts        |   1 +
 .../@ember/runloop/ember__runloop-tests.ts    | 279 ++++++++++
 types/preview/@ember/runloop/index.d.ts       | 179 ++++++
 types/preview/@ember/runloop/tsconfig.json    |   3 +
 types/preview/@ember/runloop/types.d.ts       |   3 +
 types/preview/@ember/service/index.d.ts       |  32 ++
 types/preview/@ember/service/test/main.ts     |  58 ++
 types/preview/@ember/service/test/octane.ts   |  34 ++
 types/preview/@ember/service/tsconfig.json    |   3 +
 .../@ember/template/-private/handlebars.d.ts  |   5 +
 .../@ember/template/ember__template-tests.ts  |  15 +
 types/preview/@ember/template/index.d.ts      |  11 +
 types/preview/@ember/template/tsconfig.json   |   3 +
 types/preview/@ember/test/adapter.d.ts        |  20 +
 .../preview/@ember/test/ember__test-tests.ts  |  42 ++
 types/preview/@ember/test/index.d.ts          |  55 ++
 types/preview/@ember/test/tsconfig.json       |   3 +
 .../preview/@ember/utils/-private/types.d.ts  |  36 ++
 .../@ember/utils/ember__utils-tests.ts        | 145 +++++
 types/preview/@ember/utils/index.d.ts         |  49 ++
 types/preview/@ember/utils/tsconfig.json      |   3 +
 types/preview/ember/-private/type-utils.d.ts  |  52 ++
 types/preview/ember/index.d.ts                | 401 +++++++++++++
 types/preview/ember/test/access-modifier.ts   |  42 ++
 .../ember/test/application-instance.ts        |  29 +
 types/preview/ember/test/application.ts       |  43 ++
 types/preview/ember/test/array-ext.ts         |  21 +
 types/preview/ember/test/array-proxy.ts       |  26 +
 types/preview/ember/test/array.ts             |  50 ++
 types/preview/ember/test/component.ts         | 124 +++++
 types/preview/ember/test/computed.ts          | 192 +++++++
 types/preview/ember/test/controller.ts        |  11 +
 types/preview/ember/test/core-object.ts       | 218 ++++++++
 types/preview/ember/test/create-negative.ts   |  14 +
 types/preview/ember/test/create.ts            |  55 ++
 types/preview/ember/test/data-adapter.ts      |  59 ++
 types/preview/ember/test/debug.ts             |  99 ++++
 .../preview/ember/test/ember-module-tests.ts  | 295 ++++++++++
 types/preview/ember/test/ember-tests.ts       | 190 +++++++
 types/preview/ember/test/engine-instance.ts   |  27 +
 types/preview/ember/test/engine.ts            |  43 ++
 types/preview/ember/test/error.ts             |   5 +
 types/preview/ember/test/event.ts             |  60 ++
 types/preview/ember/test/extend.ts            |  61 ++
 types/preview/ember/test/helper.ts            |  45 ++
 types/preview/ember/test/inject.ts            |  60 ++
 types/preview/ember/test/lib/assert.ts        |   2 +
 types/preview/ember/test/mixin.ts             |  57 ++
 types/preview/ember/test/object.ts            |  84 +++
 types/preview/ember/test/observable.ts        | 116 ++++
 .../ember/test/private/computed-tests.ts      |  92 +++
 .../ember/test/private/observable-tests.ts    | 200 +++++++
 types/preview/ember/test/reopen.ts            |  64 +++
 types/preview/ember/test/route.ts             |  97 ++++
 types/preview/ember/test/router.ts            |  49 ++
 types/preview/ember/test/run.ts               | 220 ++++++++
 types/preview/ember/test/string.ts            |  51 ++
 .../test/techniques/properties-from-this.ts   |  71 +++
 types/preview/ember/test/test.ts              |  32 ++
 types/preview/ember/test/transition.ts        |  29 +
 types/preview/ember/test/utils.ts             | 146 +++++
 types/preview/ember/test/view-utils.ts        |   7 +
 types/preview/ember/tsconfig.json             |   3 +
 types/preview/tsconfig.json                   |   6 +
 yarn.lock                                     | 339 ++++++++++-
 193 files changed, 11981 insertions(+), 7 deletions(-)
 create mode 100644 types/preview/@ember/application/-private/event-dispatcher.d.ts
 create mode 100644 types/preview/@ember/application/-private/registry.d.ts
 create mode 100644 types/preview/@ember/application/deprecations.d.ts
 create mode 100644 types/preview/@ember/application/index.d.ts
 create mode 100644 types/preview/@ember/application/instance.d.ts
 create mode 100644 types/preview/@ember/application/test/application-instance.ts
 create mode 100755 types/preview/@ember/application/test/application.ts
 create mode 100644 types/preview/@ember/application/test/deprecations.ts
 create mode 100644 types/preview/@ember/application/test/index.ts
 create mode 100644 types/preview/@ember/application/tsconfig.json
 create mode 100644 types/preview/@ember/application/types.d.ts
 create mode 100644 types/preview/@ember/array/-private/enumerable.d.ts
 create mode 100644 types/preview/@ember/array/-private/mutable-enumerable.d.ts
 create mode 100644 types/preview/@ember/array/-private/native-array.d.ts
 create mode 100644 types/preview/@ember/array/index.d.ts
 create mode 100644 types/preview/@ember/array/mutable.d.ts
 create mode 100644 types/preview/@ember/array/proxy.d.ts
 create mode 100755 types/preview/@ember/array/test/array-ext.ts
 create mode 100644 types/preview/@ember/array/test/array-proxy.ts
 create mode 100755 types/preview/@ember/array/test/array.ts
 create mode 100755 types/preview/@ember/array/test/lib/assert.ts
 create mode 100644 types/preview/@ember/array/tsconfig.json
 create mode 100644 types/preview/@ember/array/types/prototype-extensions.d.ts
 create mode 100644 types/preview/@ember/component/-private/class-names-support.d.ts
 create mode 100644 types/preview/@ember/component/-private/core-view.d.ts
 create mode 100644 types/preview/@ember/component/-private/glimmer-interfaces.d.ts
 create mode 100644 types/preview/@ember/component/-private/view-mixin.d.ts
 create mode 100644 types/preview/@ember/component/helper.d.ts
 create mode 100644 types/preview/@ember/component/index.d.ts
 create mode 100644 types/preview/@ember/component/template-only.d.ts
 create mode 100644 types/preview/@ember/component/test/built-ins.ts
 create mode 100644 types/preview/@ember/component/test/component.ts
 create mode 100644 types/preview/@ember/component/test/helper.ts
 create mode 100755 types/preview/@ember/component/test/lib/assert.ts
 create mode 100644 types/preview/@ember/component/test/template-only.ts
 create mode 100644 types/preview/@ember/component/tsconfig.json
 create mode 100644 types/preview/@ember/controller/index.d.ts
 create mode 100644 types/preview/@ember/controller/test/main.ts
 create mode 100644 types/preview/@ember/controller/test/octane.ts
 create mode 100644 types/preview/@ember/controller/tsconfig.json
 create mode 100644 types/preview/@ember/debug/container-debug-adapter.d.ts
 create mode 100644 types/preview/@ember/debug/data-adapter.d.ts
 create mode 100644 types/preview/@ember/debug/ember__debug-tests.ts
 create mode 100644 types/preview/@ember/debug/index.d.ts
 create mode 100644 types/preview/@ember/debug/tsconfig.json
 create mode 100644 types/preview/@ember/destroyable/index.d.ts
 create mode 100644 types/preview/@ember/destroyable/test/lib/assert.ts
 create mode 100644 types/preview/@ember/destroyable/test/main.ts
 create mode 100644 types/preview/@ember/destroyable/tsconfig.json
 create mode 100644 types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
 create mode 100644 types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
 create mode 100644 types/preview/@ember/engine/-private/types/initializer.d.ts
 create mode 100644 types/preview/@ember/engine/index.d.ts
 create mode 100644 types/preview/@ember/engine/instance.d.ts
 create mode 100644 types/preview/@ember/engine/test/engine-instance.ts
 create mode 100755 types/preview/@ember/engine/test/engine.ts
 create mode 100644 types/preview/@ember/engine/tsconfig.json
 create mode 100644 types/preview/@ember/error/ember__error-tests.ts
 create mode 100644 types/preview/@ember/error/index.d.ts
 create mode 100644 types/preview/@ember/error/tsconfig.json
 create mode 100644 types/preview/@ember/helper/ember__helper-tests.ts
 create mode 100644 types/preview/@ember/helper/index.d.ts
 create mode 100644 types/preview/@ember/helper/tsconfig.json
 create mode 100644 types/preview/@ember/modifier/ember__modifier-tests.ts
 create mode 100644 types/preview/@ember/modifier/index.d.ts
 create mode 100644 types/preview/@ember/modifier/tsconfig.json
 create mode 100644 types/preview/@ember/object/-private/action-handler.d.ts
 create mode 100644 types/preview/@ember/object/-private/types.d.ts
 create mode 100644 types/preview/@ember/object/compat.d.ts
 create mode 100644 types/preview/@ember/object/computed.d.ts
 create mode 100644 types/preview/@ember/object/core.d.ts
 create mode 100644 types/preview/@ember/object/evented.d.ts
 create mode 100644 types/preview/@ember/object/events.d.ts
 create mode 100644 types/preview/@ember/object/index.d.ts
 create mode 100644 types/preview/@ember/object/internals.d.ts
 create mode 100644 types/preview/@ember/object/mixin.d.ts
 create mode 100644 types/preview/@ember/object/observable.d.ts
 create mode 100644 types/preview/@ember/object/observers.d.ts
 create mode 100644 types/preview/@ember/object/promise-proxy-mixin.d.ts
 create mode 100644 types/preview/@ember/object/proxy.d.ts
 create mode 100644 types/preview/@ember/object/test/access-modifier.ts
 create mode 100644 types/preview/@ember/object/test/compat.ts
 create mode 100644 types/preview/@ember/object/test/computed.ts
 create mode 100644 types/preview/@ember/object/test/core.ts
 create mode 100644 types/preview/@ember/object/test/create-negative.ts
 create mode 100644 types/preview/@ember/object/test/create.ts
 create mode 100644 types/preview/@ember/object/test/event.ts
 create mode 100644 types/preview/@ember/object/test/extend.ts
 create mode 100644 types/preview/@ember/object/test/get-set.ts
 create mode 100644 types/preview/@ember/object/test/internals.ts
 create mode 100644 types/preview/@ember/object/test/lib/assert.ts
 create mode 100644 types/preview/@ember/object/test/object.ts
 create mode 100644 types/preview/@ember/object/test/observable.ts
 create mode 100644 types/preview/@ember/object/test/octane.ts
 create mode 100644 types/preview/@ember/object/test/proxy.ts
 create mode 100644 types/preview/@ember/object/test/reopen.ts
 create mode 100644 types/preview/@ember/object/tsconfig.json
 create mode 100644 types/preview/@ember/owner/ember__owner-tests.ts
 create mode 100644 types/preview/@ember/owner/index.d.ts
 create mode 100644 types/preview/@ember/owner/tsconfig.json
 create mode 100644 types/preview/@ember/polyfills/ember__polyfills-tests.ts
 create mode 100644 types/preview/@ember/polyfills/index.d.ts
 create mode 100644 types/preview/@ember/polyfills/tsconfig.json
 create mode 100644 types/preview/@ember/polyfills/types.d.ts
 create mode 100644 types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
 create mode 100644 types/preview/@ember/routing/-private/route-info.d.ts
 create mode 100644 types/preview/@ember/routing/-private/router-dsl.d.ts
 create mode 100644 types/preview/@ember/routing/-private/transition.d.ts
 create mode 100644 types/preview/@ember/routing/auto-location.d.ts
 create mode 100644 types/preview/@ember/routing/hash-location.d.ts
 create mode 100644 types/preview/@ember/routing/history-location.d.ts
 create mode 100644 types/preview/@ember/routing/index.d.ts
 create mode 100644 types/preview/@ember/routing/none-location.d.ts
 create mode 100644 types/preview/@ember/routing/route-info.d.ts
 create mode 100644 types/preview/@ember/routing/route.d.ts
 create mode 100644 types/preview/@ember/routing/router-service.d.ts
 create mode 100644 types/preview/@ember/routing/router.d.ts
 create mode 100644 types/preview/@ember/routing/test/built-ins.ts
 create mode 100755 types/preview/@ember/routing/test/lib/assert.ts
 create mode 100755 types/preview/@ember/routing/test/route.ts
 create mode 100644 types/preview/@ember/routing/test/router-service.ts
 create mode 100755 types/preview/@ember/routing/test/router.ts
 create mode 100644 types/preview/@ember/routing/transition.d.ts
 create mode 100644 types/preview/@ember/routing/tsconfig.json
 create mode 100644 types/preview/@ember/routing/types.d.ts
 create mode 100644 types/preview/@ember/runloop/-private/backburner.d.ts
 create mode 100644 types/preview/@ember/runloop/-private/types.d.ts
 create mode 100644 types/preview/@ember/runloop/ember__runloop-tests.ts
 create mode 100644 types/preview/@ember/runloop/index.d.ts
 create mode 100644 types/preview/@ember/runloop/tsconfig.json
 create mode 100644 types/preview/@ember/runloop/types.d.ts
 create mode 100644 types/preview/@ember/service/index.d.ts
 create mode 100644 types/preview/@ember/service/test/main.ts
 create mode 100644 types/preview/@ember/service/test/octane.ts
 create mode 100644 types/preview/@ember/service/tsconfig.json
 create mode 100644 types/preview/@ember/template/-private/handlebars.d.ts
 create mode 100644 types/preview/@ember/template/ember__template-tests.ts
 create mode 100644 types/preview/@ember/template/index.d.ts
 create mode 100644 types/preview/@ember/template/tsconfig.json
 create mode 100644 types/preview/@ember/test/adapter.d.ts
 create mode 100644 types/preview/@ember/test/ember__test-tests.ts
 create mode 100644 types/preview/@ember/test/index.d.ts
 create mode 100644 types/preview/@ember/test/tsconfig.json
 create mode 100644 types/preview/@ember/utils/-private/types.d.ts
 create mode 100644 types/preview/@ember/utils/ember__utils-tests.ts
 create mode 100644 types/preview/@ember/utils/index.d.ts
 create mode 100644 types/preview/@ember/utils/tsconfig.json
 create mode 100644 types/preview/ember/-private/type-utils.d.ts
 create mode 100755 types/preview/ember/index.d.ts
 create mode 100644 types/preview/ember/test/access-modifier.ts
 create mode 100644 types/preview/ember/test/application-instance.ts
 create mode 100755 types/preview/ember/test/application.ts
 create mode 100755 types/preview/ember/test/array-ext.ts
 create mode 100644 types/preview/ember/test/array-proxy.ts
 create mode 100755 types/preview/ember/test/array.ts
 create mode 100755 types/preview/ember/test/component.ts
 create mode 100755 types/preview/ember/test/computed.ts
 create mode 100755 types/preview/ember/test/controller.ts
 create mode 100644 types/preview/ember/test/core-object.ts
 create mode 100644 types/preview/ember/test/create-negative.ts
 create mode 100755 types/preview/ember/test/create.ts
 create mode 100644 types/preview/ember/test/data-adapter.ts
 create mode 100644 types/preview/ember/test/debug.ts
 create mode 100644 types/preview/ember/test/ember-module-tests.ts
 create mode 100755 types/preview/ember/test/ember-tests.ts
 create mode 100644 types/preview/ember/test/engine-instance.ts
 create mode 100755 types/preview/ember/test/engine.ts
 create mode 100644 types/preview/ember/test/error.ts
 create mode 100755 types/preview/ember/test/event.ts
 create mode 100755 types/preview/ember/test/extend.ts
 create mode 100755 types/preview/ember/test/helper.ts
 create mode 100755 types/preview/ember/test/inject.ts
 create mode 100755 types/preview/ember/test/lib/assert.ts
 create mode 100755 types/preview/ember/test/mixin.ts
 create mode 100755 types/preview/ember/test/object.ts
 create mode 100755 types/preview/ember/test/observable.ts
 create mode 100644 types/preview/ember/test/private/computed-tests.ts
 create mode 100644 types/preview/ember/test/private/observable-tests.ts
 create mode 100755 types/preview/ember/test/reopen.ts
 create mode 100755 types/preview/ember/test/route.ts
 create mode 100755 types/preview/ember/test/router.ts
 create mode 100755 types/preview/ember/test/run.ts
 create mode 100644 types/preview/ember/test/string.ts
 create mode 100644 types/preview/ember/test/techniques/properties-from-this.ts
 create mode 100755 types/preview/ember/test/test.ts
 create mode 100755 types/preview/ember/test/transition.ts
 create mode 100755 types/preview/ember/test/utils.ts
 create mode 100644 types/preview/ember/test/view-utils.ts
 create mode 100755 types/preview/ember/tsconfig.json
 create mode 100644 types/preview/tsconfig.json

diff --git a/.eslintrc.js b/.eslintrc.js
index 921dc164dd6..07cabcb5d36 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -65,6 +65,27 @@ module.exports = {
         'prefer-rest-params': 'off',
       },
     },
+    {
+      files: ['types/preview/**/*.ts'],
+
+      extends: ['plugin:@typescript-eslint/recommended'],
+
+      parserOptions: {
+        sourceType: 'module',
+        project: './types/preview/tsconfig.json',
+        tsconfigRootDir: __dirname,
+      },
+
+      rules: {
+        'import/export': 'off',
+        '@typescript-eslint/ban-ts-comment': 'off',
+        '@typescript-eslint/no-empty-interface': 'off',
+        'import/no-unresolved': 'off',
+        '@typescript-eslint/no-this-alias': 'off',
+        '@typescript-eslint/consistent-type-imports': 'error',
+        '@typescript-eslint/no-empty-function': 'off',
+      },
+    },
     {
       // TODO: files: ['packages/**/*.[jt]s'],
       files: ['packages/**/*.js'],
diff --git a/package.json b/package.json
index af8309ccb97..21640d79066 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.16.11",
     "@glimmer/compiler": "0.84.2",
+    "@glimmer/component": "^1.1.2",
     "@glimmer/destroyable": "0.84.2",
     "@glimmer/env": "^0.1.7",
     "@glimmer/global-context": "0.84.2",
@@ -93,6 +94,7 @@
     "@glimmer/runtime": "0.84.2",
     "@glimmer/validator": "0.84.2",
     "@simple-dom/document": "^1.4.0",
+    "@tsconfig/ember": "^1.0.1",
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.22.0",
@@ -154,6 +156,9 @@
     "testem-failure-only-reporter": "^1.0.0",
     "typescript": "~4.6.4"
   },
+  "peerDependencies": {
+    "@glimmer/component": "^1.1.2"
+  },
   "engines": {
     "node": ">= 12.*"
   },
diff --git a/types/preview/@ember/application/-private/event-dispatcher.d.ts b/types/preview/@ember/application/-private/event-dispatcher.d.ts
new file mode 100644
index 00000000000..3df6d612ad7
--- /dev/null
+++ b/types/preview/@ember/application/-private/event-dispatcher.d.ts
@@ -0,0 +1,16 @@
+import { EventDispatcherEvents } from '@ember/application/types';
+
+/**
+ * `Ember.EventDispatcher` handles delegating browser events to their
+ * corresponding `Ember.Views.` For example, when you click on a view,
+ * `Ember.EventDispatcher` ensures that that view's `mouseDown` method gets
+ * called.
+ */
+export default class EventDispatcher extends Object {
+    /**
+     * The set of events names (and associated handler function names) to be setup
+     * and dispatched by the `EventDispatcher`. Modifications to this list can be done
+     * at setup time, generally via the `Ember.Application.customEvents` hash.
+     */
+    events: EventDispatcherEvents;
+}
diff --git a/types/preview/@ember/application/-private/registry.d.ts b/types/preview/@ember/application/-private/registry.d.ts
new file mode 100644
index 00000000000..dc5ca32d531
--- /dev/null
+++ b/types/preview/@ember/application/-private/registry.d.ts
@@ -0,0 +1,9 @@
+import { EmberClassConstructor } from '@ember/object/-private/types';
+
+/**
+ * A registry used to store factory and option information keyed
+ * by type.
+ */
+export default class Registry {
+    register(fullName: string, factory: EmberClassConstructor<unknown>, options?: { singleton?: boolean | undefined }): void;
+}
diff --git a/types/preview/@ember/application/deprecations.d.ts b/types/preview/@ember/application/deprecations.d.ts
new file mode 100644
index 00000000000..0ed913f11b6
--- /dev/null
+++ b/types/preview/@ember/application/deprecations.d.ts
@@ -0,0 +1,23 @@
+import { AnyFn } from 'ember/-private/type-utils';
+
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface DeprecationOptions {
+  id: string;
+  until: string;
+  url?: string | undefined;
+}
+
+/**
+ * Display a deprecation warning with the provided message and a stack trace
+ * (Chrome and Firefox only).
+ */
+export function deprecate(message: string, test: boolean, options: DeprecationOptions): void;
+
+/**
+ * Alias an old, deprecated method with its new counterpart.
+ */
+export function deprecateFunc<Func extends AnyFn>(
+  message: string,
+  options: DeprecationOptions,
+  func: Func
+): Func;
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
new file mode 100644
index 00000000000..16b359ce356
--- /dev/null
+++ b/types/preview/@ember/application/index.d.ts
@@ -0,0 +1,159 @@
+// Type definitions for non-npm package @ember/application 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fapplication
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import Engine from '@ember/engine';
+import ApplicationInstance from '@ember/application/instance';
+import EventDispatcher from '@ember/application/-private/event-dispatcher';
+import { EventDispatcherEvents } from '@ember/application/types';
+import { Router } from '@ember/routing';
+import Registry from '@ember/application/-private/registry';
+import { Resolver } from '@ember/engine';
+import { AnyFn } from 'ember/-private/type-utils';
+import Owner from '@ember/owner';
+import type GlimmerComponent from '@glimmer/component';
+import EmberObject from '@ember/object';
+
+// Shut off default exporting; we don't want anything but the *intended*
+// public API present.
+export {};
+
+/**
+ * An instance of Ember.Application is the starting point for every Ember application. It helps to
+ * instantiate, initialize and coordinate the many objects that make up your app.
+ */
+export default class Application extends Engine {
+  /**
+   * Call advanceReadiness after any asynchronous setup logic has completed.
+   * Each call to deferReadiness must be matched by a call to advanceReadiness
+   * or the application will never become ready and routing will not begin.
+   */
+  advanceReadiness(): void;
+  /**
+   * Use this to defer readiness until some condition is true.
+   *
+   * This allows you to perform asynchronous setup logic and defer
+   * booting your application until the setup has finished.
+   *
+   * However, if the setup requires a loading UI, it might be better
+   * to use the router for this purpose.
+   */
+  deferReadiness(): void;
+  /**
+   * defines an injection or typeInjection
+   */
+  inject(factoryNameOrType: string, property: string, injectionName: string): void;
+  /**
+   * This injects the test helpers into the window's scope. If a function of the
+   * same name has already been defined it will be cached (so that it can be reset
+   * if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
+   * Any callbacks registered with `onInjectHelpers` will be called once the
+   * helpers have been injected.
+   */
+  injectTestHelpers(): void;
+  /**
+   * registers a factory for later injection
+   * @param fullName type:name (e.g., 'model:user')
+   * @param factory (e.g., App.Person)
+   */
+  register(
+    fullName: string,
+    factory: unknown,
+    options?: { singleton?: boolean | undefined; instantiate?: boolean | undefined }
+  ): void;
+  /**
+   * This removes all helpers that have been registered, and resets and functions
+   * that were overridden by the helpers.
+   */
+  removeTestHelpers(): void;
+  /**
+   * Reset the application. This is typically used only in tests.
+   */
+  reset(): void;
+  /**
+   * This hook defers the readiness of the application, so that you can start
+   * the app when your tests are ready to run. It also sets the router's
+   * location to 'none', so that the window's location will not be modified
+   * (preventing both accidental leaking of state between tests and interference
+   * with your testing framework).
+   */
+  setupForTesting(): void;
+  /**
+   * The DOM events for which the event dispatcher should listen.
+   */
+  customEvents: EventDispatcherEvents;
+  /**
+   * The Ember.EventDispatcher responsible for delegating events to this application's views.
+   */
+  eventDispatcher: EventDispatcher;
+  /**
+   * Set this to provide an alternate class to `DefaultResolver`
+   */
+  resolver: Resolver | null;
+  /**
+   * The root DOM element of the Application. This can be specified as an
+   * element or a jQuery-compatible selector string.
+   *
+   * This is the element that will be passed to the Application's, eventDispatcher,
+   * which sets up the listeners for event delegation. Every view in your application
+   * should be a child of the element you specify here.
+   */
+  rootElement: HTMLElement | string;
+  /**
+   * Called when the Application has become ready.
+   * The call will be delayed until the DOM has become ready.
+   */
+  ready: AnyFn;
+  /**
+   * Application's router.
+   */
+  Router: Router;
+  registry: Registry;
+  /**
+   *  Initialize the application and return a promise that resolves with the `Application`
+   *  object when the boot process is complete.
+   */
+  boot(): Promise<Application>;
+  /**
+   * Create an ApplicationInstance for this Application.
+   */
+  buildInstance(options?: object): ApplicationInstance;
+}
+
+// Known framework objects, so that `getOwner` can always, accurately, return
+// `Owner` when working with one of these classes, which the framework *does*
+// guarantee will always have an `Owner`. NOTE: this must be kept up to date
+// whenever we add new base classes to the framework. For example, if we
+// introduce a standalone `Service` or `Route` base class which *does not*
+// extend from `EmberObject`, it will need to be added here.
+type FrameworkObject = EmberObject | GlimmerComponent;
+
+/**
+ * Framework objects in an Ember application (components, services, routes, etc.)
+ * are created via a factory and dependency injection system. Each of these
+ * objects is the responsibility of an "owner", which handled its
+ * instantiation and manages its lifetime.
+ */
+export function getOwner(object: FrameworkObject): Owner;
+export function getOwner(object: unknown): Owner | undefined;
+/**
+ * `setOwner` forces a new owner on a given object instance. This is primarily
+ * useful in some testing cases.
+ */
+export function setOwner(object: unknown, owner: Owner): void;
+
+/**
+ * Detects when a specific package of Ember (e.g. 'Ember.Application')
+ * has fully loaded and is available for extension.
+ */
+export function onLoad(name: string, callback: AnyFn): unknown;
+
+/**
+ * Called when an Ember.js package (e.g Ember.Application) has finished
+ * loading. Triggers any callbacks registered for this event.
+ */
+export function runLoadHooks(name: string, object?: {}): unknown;
diff --git a/types/preview/@ember/application/instance.d.ts b/types/preview/@ember/application/instance.d.ts
new file mode 100644
index 00000000000..db5f37fcd5f
--- /dev/null
+++ b/types/preview/@ember/application/instance.d.ts
@@ -0,0 +1,7 @@
+import EngineInstance from "@ember/engine/instance";
+
+/**
+ * The `ApplicationInstance` encapsulates all of the stateful aspects of a
+ * running `Application`.
+ */
+export default class ApplicationInstance extends EngineInstance {}
diff --git a/types/preview/@ember/application/test/application-instance.ts b/types/preview/@ember/application/test/application-instance.ts
new file mode 100644
index 00000000000..32748ca0d96
--- /dev/null
+++ b/types/preview/@ember/application/test/application-instance.ts
@@ -0,0 +1,44 @@
+import ApplicationInstance from '@ember/application/instance';
+import hbs from 'htmlbars-inline-precompile';
+
+const appInstance = ApplicationInstance.create();
+appInstance.register('some:injection', class Foo {});
+
+appInstance.register('some:injection', class Foo {}, {
+  singleton: true,
+});
+
+appInstance.register('some:injection', class Foo {}, {
+  instantiate: false,
+});
+
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`);
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`, {
+  singleton: true,
+});
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`, {
+  instantiate: true,
+});
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`, {
+  singleton: true,
+  instantiate: true,
+});
+// @ts-expect-error
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`, {
+  singleton: 'true',
+  instantiate: true,
+});
+
+appInstance.register('some:injection', class Foo {}, {
+  singleton: false,
+  instantiate: true,
+});
+
+appInstance.factoryFor('router:main');
+appInstance.lookup('route:basic');
+
+appInstance.boot();
+
+(async () => {
+  await appInstance.boot();
+})();
diff --git a/types/preview/@ember/application/test/application.ts b/types/preview/@ember/application/test/application.ts
new file mode 100755
index 00000000000..8654afe83e4
--- /dev/null
+++ b/types/preview/@ember/application/test/application.ts
@@ -0,0 +1,43 @@
+import Application from '@ember/application';
+import EmberObject from '@ember/object';
+
+const BaseApp = Application.extend({
+    modulePrefix: 'my-app',
+});
+
+class Obj extends EmberObject.extend({ foo: 'bar' }) {}
+
+BaseApp.initializer({
+    name: 'my-initializer',
+    initialize(app) {
+        app.register('foo:bar', Obj);
+    },
+});
+
+BaseApp.instanceInitializer({
+    name: 'my-instance-initializer',
+    initialize(app) {
+        (app.lookup('foo:bar') as Obj).get('foo');
+    },
+});
+
+const App1 = BaseApp.create({
+    rootElement: '#app-one',
+    customEvents: {
+        paste: 'paste',
+    },
+});
+
+const App2 = BaseApp.create({
+    rootElement: '#app-two',
+    customEvents: {
+        mouseenter: null,
+        mouseleave: null,
+    },
+});
+
+const App3 = BaseApp.create();
+
+const App3Instance1 = App3.buildInstance(); // $ExpectType ApplicationInstance
+
+const App3Instance2 = App3.buildInstance({ foo: 'bar' }); // $ExpectType ApplicationInstance
diff --git a/types/preview/@ember/application/test/deprecations.ts b/types/preview/@ember/application/test/deprecations.ts
new file mode 100644
index 00000000000..e9bb19ed390
--- /dev/null
+++ b/types/preview/@ember/application/test/deprecations.ts
@@ -0,0 +1,17 @@
+import { deprecate, deprecateFunc } from '@ember/application/deprecations';
+
+deprecate('this is no longer advised', false, {
+    id: 'no-longer-advised',
+    until: 'v4.0',
+});
+deprecate('this is no longer advised', false, {
+    id: 'no-longer-advised',
+    until: 'v4.0',
+    url: 'https://emberjs.com',
+});
+// @ts-expect-error
+deprecate('this is no longer advised', false);
+
+// @ts-expect-error
+deprecateFunc('this is no longer advised', () => {});
+deprecateFunc('this is no longer advised', { id: 'no-longer-do-this', until: 'v4.0' }, () => {});
diff --git a/types/preview/@ember/application/test/index.ts b/types/preview/@ember/application/test/index.ts
new file mode 100644
index 00000000000..521a4b6936d
--- /dev/null
+++ b/types/preview/@ember/application/test/index.ts
@@ -0,0 +1,28 @@
+import { getOwner, setOwner } from '@ember/application';
+import EngineInstance from '@ember/engine/instance';
+import Owner from '@ember/owner';
+import ApplicationInstance from '@ember/application/instance';
+import Service from '@ember/service';
+
+// $ExpectType Owner | undefined
+getOwner({});
+
+// Confirm that random subclasses work as expected.
+declare class MyService extends Service {
+    withStuff: true;
+}
+declare let myService: MyService;
+// $ExpectType Owner
+getOwner(myService);
+
+// @ts-expect-error
+getOwner();
+
+declare let baseOwner: Owner;
+setOwner({}, baseOwner);
+
+declare let engine: EngineInstance;
+setOwner({}, engine);
+
+declare let application: ApplicationInstance;
+setOwner({}, application);
diff --git a/types/preview/@ember/application/tsconfig.json b/types/preview/@ember/application/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/application/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/application/types.d.ts b/types/preview/@ember/application/types.d.ts
new file mode 100644
index 00000000000..f03863c4d29
--- /dev/null
+++ b/types/preview/@ember/application/types.d.ts
@@ -0,0 +1,27 @@
+export interface EventDispatcherEvents {
+    touchstart?: string | null | undefined;
+    touchmove?: string | null | undefined;
+    touchend?: string | null | undefined;
+    touchcancel?: string | null | undefined;
+    keydown?: string | null | undefined;
+    keyup?: string | null | undefined;
+    keypress?: string | null | undefined;
+    mousedown?: string | null | undefined;
+    mouseup?: string | null | undefined;
+    contextmenu?: string | null | undefined;
+    click?: string | null | undefined;
+    dblclick?: string | null | undefined;
+    focusin?: string | null | undefined;
+    focusout?: string | null | undefined;
+    submit?: string | null | undefined;
+    input?: string | null | undefined;
+    change?: string | null | undefined;
+    dragstart?: string | null | undefined;
+    drag?: string | null | undefined;
+    dragenter?: string | null | undefined;
+    dragleave?: string | null | undefined;
+    dragover?: string | null | undefined;
+    drop?: string | null | undefined;
+    dragend?: string | null | undefined;
+    [event: string]: string | null | undefined;
+}
diff --git a/types/preview/@ember/array/-private/enumerable.d.ts b/types/preview/@ember/array/-private/enumerable.d.ts
new file mode 100644
index 00000000000..ca22d5a29fc
--- /dev/null
+++ b/types/preview/@ember/array/-private/enumerable.d.ts
@@ -0,0 +1,179 @@
+import ComputedProperty from '@ember/object/computed';
+import Mixin from '@ember/object/mixin';
+import NativeArray from '@ember/array/-private/native-array';
+import EmberArray from '@ember/array';
+import {
+  AnyFn,
+  MethodNamesOf,
+  MethodParams,
+  MethodReturns,
+  MethodsOf,
+} from 'ember/-private/type-utils';
+
+/**
+ * This mixin defines the common interface implemented by enumerable objects
+ * in Ember. Most of these methods follow the standard Array iteration
+ * API defined up to JavaScript 1.8 (excluding language-specific features that
+ * cannot be emulated in older versions of JavaScript).
+ */
+interface Enumerable<T> {
+  /**
+   * Helper method returns the first object from a collection. This is usually
+   * used by bindings and other parts of the framework to extract a single
+   * object if the enumerable contains only one item.
+   */
+  firstObject: T | undefined;
+  /**
+   * Helper method returns the last object from a collection. If your enumerable
+   * contains only one object, this method should always return that object.
+   * If your enumerable is empty, this method should return `undefined`.
+   */
+  lastObject: T | undefined;
+  /**
+   * Iterates through the enumerable, calling the passed function on each
+   * item. This method corresponds to the `forEach()` method defined in
+   * JavaScript 1.6.
+   */
+  forEach: T[]['forEach'];
+  /**
+   * Alias for `mapBy`
+   */
+  getEach<K extends keyof T>(key: K): Array<T[K]>;
+  /**
+   * Sets the value on the named property for each member. This is more
+   * ergonomic than using other methods defined on this helper. If the object
+   * implements Ember.Observable, the value will be changed to `set(),` otherwise
+   * it will be set directly. `null` objects are skipped.
+   */
+  setEach<K extends keyof T>(key: K, value: T[K]): void;
+  /**
+   * Maps all of the items in the enumeration to another value, returning
+   * a new array. This method corresponds to `map()` defined in JavaScript 1.6.
+   */
+  map: T[]['map'];
+  /**
+   * Similar to map, this specialized function returns the value of the named
+   * property on all items in the enumeration.
+   */
+  mapBy<K extends keyof T>(key: K): Array<T[K]>;
+  mapBy(key: string): unknown[];
+  /**
+   * Returns an array with all of the items in the enumeration that the passed
+   * function returns true for. This method corresponds to `filter()` defined in
+   * JavaScript 1.6.
+   */
+  filter: T[]['filter'];
+  /**
+   * Returns an array with all of the items in the enumeration where the passed
+   * function returns false. This method is the inverse of filter().
+   */
+  reject(
+    callbackfn: (value: T, index: number, array: T[]) => unknown,
+    thisArg?: any
+  ): NativeArray<T>;
+  /**
+   * Returns an array with just the items with the matched property. You
+   * can pass an optional second argument with the target value. Otherwise
+   * this will match any property that evaluates to `true`.
+   */
+  filterBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
+  /**
+   * Returns an array with the items that do not have truthy values for
+   * key.  You can pass an optional second argument with the target value.  Otherwise
+   * this will match any property that evaluates to false.
+   */
+  rejectBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
+  /**
+   * Returns the first item in the array for which the callback returns true.
+   * This method works similar to the `filter()` method defined in JavaScript 1.6
+   * except that it will stop working on the array once a match is found.
+   */
+  find: T[]['find'];
+  /**
+   * Returns the first item with a property matching the passed value. You
+   * can pass an optional second argument with the target value. Otherwise
+   * this will match any property that evaluates to `true`.
+   */
+  findBy<K extends keyof T>(key: K, value?: T[K]): T | undefined;
+  /**
+   * Returns `true` if the passed function returns true for every item in the
+   * enumeration. This corresponds with the `every()` method in JavaScript 1.6.
+   */
+  every: T[]['every'];
+  /**
+   * Returns `true` if the passed property resolves to the value of the second
+   * argument for all items in the enumerable. This method is often simpler/faster
+   * than using a callback.
+   */
+  isEvery<K extends keyof T>(key: K, value?: T[K]): boolean;
+  /**
+   * Returns `true` if the passed function returns true for any item in the
+   * enumeration.
+   */
+  any(callback: (value: T, index: number, array: T[]) => boolean, target?: {}): boolean;
+  /**
+   * Returns `true` if the passed property resolves to the value of the second
+   * argument for any item in the enumerable. This method is often simpler/faster
+   * than using a callback.
+   */
+  isAny<K extends keyof T>(key: K, value?: T[K]): boolean;
+  /**
+   * This will combine the values of the enumerator into a single value. It
+   * is a useful way to collect a summary value from an enumeration. This
+   * corresponds to the `reduce()` method defined in JavaScript 1.8.
+   */
+  reduce: T[]['reduce'];
+  /**
+   * Invokes the named method on every object in the receiver that
+   * implements it. This method corresponds to the implementation in
+   * Prototype 1.6.
+   */
+  invoke<M extends MethodNamesOf<T>>(
+    methodName: M,
+    ...args: MethodParams<T, M>
+  ): Array<MethodReturns<T, M>>;
+  /**
+   * Simply converts the enumerable into a genuine array. The order is not
+   * guaranteed. Corresponds to the method implemented by Prototype.
+   */
+  toArray(): T[];
+  /**
+   * Returns a copy of the array with all `null` and `undefined` elements removed.
+   */
+  compact(): NativeArray<NonNullable<T>>;
+  /**
+   * Returns a new enumerable that excludes the passed value. The default
+   * implementation returns an array regardless of the receiver type.
+   * If the receiver does not contain the value it returns the original enumerable.
+   */
+  without(value: T): NativeArray<T>;
+  /**
+   * Returns a new enumerable that contains only unique values. The default
+   * implementation returns an array regardless of the receiver type.
+   */
+  uniq(): NativeArray<T>;
+  /**
+   * Converts the enumerable into an array and sorts by the keys
+   * specified in the argument.
+   */
+  sortBy(...properties: string[]): NativeArray<T>;
+  /**
+   * Returns a new enumerable that contains only items containing a unique property value.
+   * The default implementation returns an array regardless of the receiver type.
+   */
+  uniqBy(property: string): NativeArray<T>;
+  uniqBy(callback: (value: T) => unknown): NativeArray<T>;
+  /**
+   * Returns `true` if the passed object can be found in the enumerable.
+   */
+  includes(searchElement: T, fromIndex?: number): boolean;
+  /**
+   * This is the handler for the special array content property. If you get
+   * this property, it will return this. If you set this property to a new
+   * array, it will replace the current content.
+   */
+  '[]': ComputedProperty<this>;
+}
+
+declare const Enumerable: Mixin<Enumerable<unknown>>;
+export default Enumerable;
diff --git a/types/preview/@ember/array/-private/mutable-enumerable.d.ts b/types/preview/@ember/array/-private/mutable-enumerable.d.ts
new file mode 100644
index 00000000000..c2786508b29
--- /dev/null
+++ b/types/preview/@ember/array/-private/mutable-enumerable.d.ts
@@ -0,0 +1,28 @@
+import Mixin from '@ember/object/mixin';
+import Enumerable from '@ember/array/-private/enumerable';
+
+/**
+ * This mixin defines the API for modifying generic enumerables. These methods
+ * can be applied to an object regardless of whether it is ordered or
+ * unordered.
+ */
+interface MutableEnumerable<T> extends Enumerable<T> {
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    addObject(object: T): T;
+    /**
+     * Adds each object in the passed enumerable to the receiver.
+     */
+    addObjects(objects: Enumerable<T>): this;
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    removeObject(object: T): T;
+    /**
+     * Removes each object in the passed enumerable from the receiver.
+     */
+    removeObjects(objects: Enumerable<T>): this;
+}
+declare const MutableEnumerable: Mixin<MutableEnumerable<unknown>>;
+export default MutableEnumerable;
diff --git a/types/preview/@ember/array/-private/native-array.d.ts b/types/preview/@ember/array/-private/native-array.d.ts
new file mode 100644
index 00000000000..c44ffbc1887
--- /dev/null
+++ b/types/preview/@ember/array/-private/native-array.d.ts
@@ -0,0 +1,23 @@
+import MutableArray from '@ember/array/mutable';
+import Observable from '@ember/object/observable';
+import Mixin from '@ember/object/mixin';
+
+// Get an alias to the global Array type to use in inner scope below.
+type GlobalArray<T> = T[];
+
+/**
+ * The NativeArray mixin contains the properties needed to make the native
+ * Array support Ember.MutableArray and all of its dependent APIs. Unless you
+ * have `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Array` set to
+ * false, this will be applied automatically. Otherwise you can apply the mixin
+ * at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
+ */
+interface NativeArray<T> extends GlobalArray<T>, MutableArray<T>, Observable {
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    length: number;
+}
+
+declare const NativeArray: Mixin<NativeArray<unknown>>;
+export default NativeArray;
diff --git a/types/preview/@ember/array/index.d.ts b/types/preview/@ember/array/index.d.ts
new file mode 100644
index 00000000000..10b58c75dda
--- /dev/null
+++ b/types/preview/@ember/array/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for non-npm package @ember/array 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Farray
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import ComputedProperty from "@ember/object/computed";
+import Mixin from "@ember/object/mixin";
+import Enumerable from "@ember/array/-private/enumerable";
+import NativeArray from "@ember/array/-private/native-array";
+
+/**
+ * This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
+ * Array class as well as other controllers, etc. that want to appear to be arrays.
+ */
+interface Array<T> extends Enumerable<T> {
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    length: number | ComputedProperty<number>;
+    /**
+     * Returns the object at the given `index`. If the given `index` is negative
+     * or is greater or equal than the array length, returns `undefined`.
+     */
+    objectAt(idx: number): T | undefined;
+    /**
+     * This returns the objects at the specified indexes, using `objectAt`.
+     */
+    // tslint:disable-next-line:array-type
+    objectsAt(indexes: number[]): Array<T | undefined>;
+    /**
+     * Returns a new array that is a slice of the receiver. This implementation
+     * uses the observable array methods to retrieve the objects for the new
+     * slice.
+     */
+    slice(beginIndex?: number, endIndex?: number): T[];
+    /**
+     * Returns the index of the given object's first occurrence.
+     * If no `startAt` argument is given, the starting location to
+     * search is 0. If it's negative, will count backward from
+     * the end of the array. Returns -1 if no match is found.
+     */
+    indexOf(searchElement: T, fromIndex?: number): number;
+    /**
+     * Returns the index of the given object's last occurrence.
+     * If no `startAt` argument is given, the search starts from
+     * the last position. If it's negative, will count backward
+     * from the end of the array. Returns -1 if no match is found.
+     */
+    lastIndexOf(searchElement: T, fromIndex?: number): number;
+    /**
+     * Returns a special object that can be used to observe individual properties
+     * on the array. Just get an equivalent property on this object and it will
+     * return an enumerable that maps automatically to the named key on the
+     * member objects.
+     */
+    '@each': ComputedProperty<T>;
+}
+// Ember.Array rather than Array because the `array-type` lint rule doesn't realize the global is shadowed
+// tslint:disable-next-line:array-type
+declare const Array: Mixin<Array<unknown>>;
+export default Array;
+
+/**
+ * Creates an `Ember.NativeArray` from an Array like object.
+ * Does not modify the original object's contents. Ember.A is not needed if
+ * `EmberENV.EXTEND_PROTOTYPES` is `true` (the default value). However,
+ * it is recommended that you use Ember.A when creating addons for
+ * ember or when you can not guarantee that `EmberENV.EXTEND_PROTOTYPES`
+ * will be `true`.
+ */
+export function A<T>(arr?: T[]): NativeArray<T>;
+
+/**
+ * Returns true if the passed object is an array or Array-like.
+ */
+export function isArray(obj: unknown): obj is ArrayLike<unknown>;
diff --git a/types/preview/@ember/array/mutable.d.ts b/types/preview/@ember/array/mutable.d.ts
new file mode 100644
index 00000000000..505408a66be
--- /dev/null
+++ b/types/preview/@ember/array/mutable.d.ts
@@ -0,0 +1,75 @@
+import Mixin from "@ember/object/mixin";
+import MutableEnumerable from "@ember/array/-private/mutable-enumerable";
+import EmberArray from '@ember/array';
+import Enumerable from "@ember/array/-private/enumerable";
+
+/**
+ * This mixin defines the API for modifying array-like objects. These methods
+ * can be applied only to a collection that keeps its items in an ordered set.
+ * It builds upon the Array mixin and adds methods to modify the array.
+ * One concrete implementations of this class include ArrayProxy.
+ */
+interface MutableArray<T> extends EmberArray<T>, MutableEnumerable<T> {
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    replace(idx: number, amt: number, objects: T[]): this;
+    /**
+     * Remove all elements from the array. This is useful if you
+     * want to reuse an existing array without having to recreate it.
+     */
+    clear(): this;
+    /**
+     * This will use the primitive `replace()` method to insert an object at the
+     * specified index.
+     */
+    insertAt(idx: number, object: T): this;
+    /**
+     * Remove an object at the specified index using the `replace()` primitive
+     * method. You can pass either a single index, or a start and a length.
+     */
+    removeAt(start: number, len?: number): this;
+    /**
+     * Push the object onto the end of the array. Works just like `push()` but it
+     * is KVO-compliant.
+     */
+    pushObject(obj: T): T;
+    /**
+     * Add the objects in the passed numerable to the end of the array. Defers
+     * notifying observers of the change until all objects are added.
+     */
+    pushObjects(objects: Enumerable<T>): this;
+    /**
+     * Pop object from array or nil if none are left. Works just like `pop()` but
+     * it is KVO-compliant.
+     */
+    popObject(): T;
+    /**
+     * Shift an object from start of array or nil if none are left. Works just
+     * like `shift()` but it is KVO-compliant.
+     */
+    shiftObject(): T;
+    /**
+     * Unshift an object to start of array. Works just like `unshift()` but it is
+     * KVO-compliant.
+     */
+    unshiftObject(obj: T): T;
+    /**
+     * Adds the named objects to the beginning of the array. Defers notifying
+     * observers until all objects have been added.
+     */
+    unshiftObjects(objects: Enumerable<T>): this;
+    /**
+     * Reverse objects in the array. Works just like `reverse()` but it is
+     * KVO-compliant.
+     */
+    reverseObjects(): this;
+    /**
+     * Replace all the receiver's content with content of the argument.
+     * If argument is an empty array receiver will be cleared.
+     */
+    setObjects(objects: EmberArray<T>): this;
+}
+
+declare const MutableArray: Mixin<MutableArray<unknown>>;
+export default MutableArray;
diff --git a/types/preview/@ember/array/proxy.d.ts b/types/preview/@ember/array/proxy.d.ts
new file mode 100644
index 00000000000..590f65fc2e7
--- /dev/null
+++ b/types/preview/@ember/array/proxy.d.ts
@@ -0,0 +1,31 @@
+import type MutableArray from '@ember/array/mutable';
+import EmberObject from '@ember/object';
+
+interface EmberArrayLike<T> {
+  length: number;
+  objectAt(idx: number): T | undefined;
+}
+
+/**
+ * An ArrayProxy wraps any other object that is a native or Ember `Array`
+ * (checked with [`Ember.isArray`](https://api.emberjs.com/ember/release/functions/@ember%2Farray/isArray)),
+ * forwarding all requests. This makes it very useful for a number of
+ * binding use cases or other cases where being able to swap out the
+ * underlying array is useful.
+ *
+ * NOTE: Attempting to mutate the underlying content of an object that
+ * is not a `MutableArray` (e.g. a native Javascript Array) may not
+ * behave as expected. [`Ember.A`](https://api.emberjs.com/ember/release/functions/@ember%2Farray/A)
+ * may be used in this case.
+ */
+export default interface ArrayProxy<T> extends MutableArray<T> {}
+export default class ArrayProxy<T> extends EmberObject {
+  content: T[] | EmberArrayLike<T>;
+
+  /**
+   * Should actually retrieve the object at the specified index from the
+   * content. You can override this method in subclasses to transform the
+   * content item to something new.
+   */
+  objectAtContent(idx: number): T | undefined;
+}
diff --git a/types/preview/@ember/array/test/array-ext.ts b/types/preview/@ember/array/test/array-ext.ts
new file mode 100755
index 00000000000..d4fa40cf36c
--- /dev/null
+++ b/types/preview/@ember/array/test/array-ext.ts
@@ -0,0 +1,23 @@
+import { assertType } from './lib/assert';
+import EmberObject from '@ember/object';
+import ArrayPrototypeExtensions from '@ember/array/types/prototype-extensions';
+
+declare global {
+    interface Array<T> extends ArrayPrototypeExtensions<T> {}
+}
+
+class Person extends EmberObject {
+    declare name: string;
+}
+
+const person = Person.create({ name: 'Joe' });
+const array = [person];
+
+assertType<number>(array.get('length'));
+assertType<Person | undefined>(array.get('firstObject'));
+assertType<string[]>(array.mapBy('name'));
+assertType<string[]>(array.map(p => p.get('name')));
+assertType<Person[]>(array.sortBy('name'));
+assertType<Person[]>(array.uniq());
+assertType<Person[]>(array.uniqBy('name'));
+assertType<Person[]>(array.uniqBy(p => p.get('name')));
diff --git a/types/preview/@ember/array/test/array-proxy.ts b/types/preview/@ember/array/test/array-proxy.ts
new file mode 100644
index 00000000000..397f08183f7
--- /dev/null
+++ b/types/preview/@ember/array/test/array-proxy.ts
@@ -0,0 +1,57 @@
+import { assertType } from './lib/assert';
+import ArrayProxy from '@ember/array/proxy';
+import EmberArray, { A } from '@ember/array';
+import EmberObject from '@ember/object';
+
+const pets = ['dog', 'cat', 'fish'];
+const proxy = ArrayProxy.create({ content: A(pets) });
+
+proxy.get('firstObject'); // 'dog'
+proxy.set('content', A(['amoeba', 'paramecium']));
+proxy.get('firstObject'); // 'amoeba'
+
+const overridden = ArrayProxy.create({
+    content: A(pets),
+    objectAtContent(idx: number): string | undefined {
+        return this.get('content').objectAt(idx)?.toUpperCase();
+    },
+});
+
+overridden.get('firstObject'); // 'DOG'
+
+class MyNewProxy<T> extends ArrayProxy<T> {
+    isNew = true;
+}
+
+const x = MyNewProxy.create({ content: A([1, 2, 3]) }) as MyNewProxy<number>;
+assertType<number | undefined>(x.get('firstObject'));
+assertType<boolean>(x.isNew);
+
+// Custom EmberArray
+class MyArray<T> extends EmberObject.extend(EmberArray) {
+    constructor(content: ArrayLike<T>) {
+        super();
+        this._content = content;
+    }
+
+    _content: ArrayLike<T>;
+
+    get length() {
+        return this._content.length;
+    }
+
+    objectAt(idx: number) {
+        return this._content[idx];
+    }
+}
+
+const customArrayProxy = ArrayProxy.create({ content: new MyArray(pets) });
+customArrayProxy.get('firstObject'); // 'dog'
+
+// Vanilla array
+const vanillaArrayProxy = ArrayProxy.create({ content: pets });
+vanillaArrayProxy.get('firstObject'); // 'dog'
+
+// Nested ArrayProxy
+const nestedArrayProxy = ArrayProxy.create({ content: proxy });
+nestedArrayProxy.get('firstObject'); // 'amoeba'
diff --git a/types/preview/@ember/array/test/array.ts b/types/preview/@ember/array/test/array.ts
new file mode 100755
index 00000000000..f035b6fdaa5
--- /dev/null
+++ b/types/preview/@ember/array/test/array.ts
@@ -0,0 +1,65 @@
+import { assertType } from './lib/assert';
+import EmberObject from '@ember/object';
+import EmberArray, { A } from '@ember/array';
+import MutableArray from '@ember/array/mutable';
+
+type Person = typeof Person.prototype;
+const Person = EmberObject.extend({
+    name: '',
+    isHappy: false,
+});
+
+const people = A([Person.create({ name: 'Yehuda', isHappy: true }), Person.create({ name: 'Majd', isHappy: false })]);
+
+assertType<number>(people.get('length'));
+assertType<Person>(people.get('lastObject'));
+assertType<Person>(people.get('firstObject'));
+assertType<boolean>(people.isAny('isHappy'));
+assertType<boolean>(people.isAny('isHappy', false));
+// @ts-expect-error
+assertType<boolean>(people.isAny('isHappy', "false"));
+
+assertType<Person | undefined>(people.objectAt(0));
+assertType<EmberArray<Person | undefined>>(people.objectsAt([1, 2, 3]));
+
+const persons1: Person[] = people.filterBy('isHappy');
+const persons2: MutableArray<Person> = people.filterBy('isHappy');
+const persons3: Person[] = people.rejectBy('isHappy');
+const persons4: MutableArray<Person> = people.rejectBy('isHappy');
+const persons5: Person[] = people.filter(person => person.get('name') === 'Yehuda');
+const persons6: MutableArray<Person> = people.filter(person => person.get('name') === 'Yehuda');
+
+assertType<typeof people>(people.get('[]'));
+assertType<Person>(people.get('[]').get('firstObject'));
+
+assertType<boolean[]>(people.mapBy('isHappy'));
+assertType<unknown[]>(people.mapBy('name.length'));
+
+const last = people.get('lastObject'); // $ExpectType ({ name: string; isHappy: boolean; } & EmberObject & { name: string; isHappy: boolean; }) | undefined
+if (last) {
+    assertType<string>(last.get('name'));
+}
+
+const first = people.get('lastObject');
+if (first) {
+    assertType<boolean>(first.get('isHappy'));
+}
+
+const letters: EmberArray<string> = A(['a', 'b', 'c']);
+const codes: number[] = letters.map((item, index, enumerable) => {
+    assertType<string>(item);
+    assertType<number>(index);
+    return item.charCodeAt(0);
+});
+
+const value = '1,2,3';
+const filters = A(value.split(','));
+filters.push('4');
+filters.sort();
+
+const multiSortArr = A([
+    { k: 'a', v: 'z' },
+    { k: 'a', v: 'y' },
+    { k: 'b', v: 'c' },
+]);
+multiSortArr.sortBy('k', 'v');
diff --git a/types/preview/@ember/array/test/lib/assert.ts b/types/preview/@ember/array/test/lib/assert.ts
new file mode 100755
index 00000000000..dad227ab5e9
--- /dev/null
+++ b/types/preview/@ember/array/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/array/tsconfig.json b/types/preview/@ember/array/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/array/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/array/types/prototype-extensions.d.ts b/types/preview/@ember/array/types/prototype-extensions.d.ts
new file mode 100644
index 00000000000..4609906857a
--- /dev/null
+++ b/types/preview/@ember/array/types/prototype-extensions.d.ts
@@ -0,0 +1,5 @@
+// import Ember from 'ember';
+import Observable from '@ember/object/observable';
+import MutableArray from '@ember/array/mutable';
+
+export default interface ArrayPrototypeExtensions<T> extends MutableArray<T>, Observable {}
diff --git a/types/preview/@ember/component/-private/class-names-support.d.ts b/types/preview/@ember/component/-private/class-names-support.d.ts
new file mode 100644
index 00000000000..59fabab2fda
--- /dev/null
+++ b/types/preview/@ember/component/-private/class-names-support.d.ts
@@ -0,0 +1,25 @@
+import Mixin from '@ember/object/mixin';
+
+interface ClassNamesSupport {
+    /**
+     * A list of properties of the view to apply as class names. If the property is a string value,
+     * the value of that string will be applied as a class name.
+     *
+     * If the value of the property is a Boolean, the name of that property is added as a dasherized
+     * class name.
+     *
+     * If you would prefer to use a custom value instead of the dasherized property name, you can
+     * pass a binding like this: `classNameBindings: ['isUrgent:urgent']`
+     *
+     * This list of properties is inherited from the component's superclasses as well.
+     */
+    classNameBindings: string[];
+    /**
+     * Standard CSS class names to apply to the view's outer element. This
+     * property automatically inherits any class names defined by the view's
+     * superclasses as well.
+     */
+    classNames: string[];
+}
+declare const ClassNamesSupport: Mixin<ClassNamesSupport>;
+export default ClassNamesSupport;
diff --git a/types/preview/@ember/component/-private/core-view.d.ts b/types/preview/@ember/component/-private/core-view.d.ts
new file mode 100644
index 00000000000..6a98d1716fb
--- /dev/null
+++ b/types/preview/@ember/component/-private/core-view.d.ts
@@ -0,0 +1,12 @@
+import EmberObject from '@ember/object';
+import type Evented from '@ember/object/evented';
+import type ActionHandler from '@ember/object/-private/action-handler';
+
+/**
+ * Ember.CoreView is an abstract class that exists to give view-like behavior to both Ember's main
+ * view class Ember.Component and other classes that don't need the full functionality of Ember.Component.
+ *
+ * Unless you have specific needs for CoreView, you will use Ember.Component in your applications.
+ */
+export default class CoreView extends EmberObject {}
+export default interface CoreView extends Evented, ActionHandler {}
diff --git a/types/preview/@ember/component/-private/glimmer-interfaces.d.ts b/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
new file mode 100644
index 00000000000..1b27d8f716f
--- /dev/null
+++ b/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
@@ -0,0 +1,44 @@
+// NOTE: this is a bare-minimum subset of the definitions of the types in
+// `@glimmer/interfaces`, supplied to make the public types in this package
+// accurate.
+
+// This is only present to "brand" the type, and it brands it in a way that
+// matches [the implementation][1], which *also* uses it as a type-only brand.
+//
+// [1]: https://github.com/glimmerjs/glimmer-vm/blob/d6d776cf3797dafa923bcdad47e1897231ef6539/packages/%40glimmer/interfaces/lib/managers/capabilities.d.ts#L1
+// tslint:disable-next-line:strict-export-declare-modifiers
+declare const CAPABILITIES: unique symbol;
+
+export interface Capabilities {
+  [CAPABILITIES]: true;
+}
+
+export interface Arguments {
+  positional: readonly unknown[];
+  named: Record<string, unknown>;
+}
+
+export interface ComponentCapabilitiesVersions {
+  '3.4': {
+    asyncLifecycleCallbacks?: boolean;
+    destructor?: boolean;
+  };
+
+  '3.13': {
+    asyncLifecycleCallbacks?: boolean;
+    destructor?: boolean;
+    updateHook?: boolean;
+  };
+}
+
+export interface ComponentCapabilities extends Capabilities {
+  asyncLifeCycleCallbacks: boolean;
+  destructor: boolean;
+  updateHook: boolean;
+}
+
+export interface ComponentManager<ComponentStateBucket> {
+  capabilities: ComponentCapabilities;
+  createComponent(factory: object, args: Arguments): ComponentStateBucket;
+  getContext(instance: ComponentStateBucket): unknown;
+}
diff --git a/types/preview/@ember/component/-private/view-mixin.d.ts b/types/preview/@ember/component/-private/view-mixin.d.ts
new file mode 100644
index 00000000000..72b78927dad
--- /dev/null
+++ b/types/preview/@ember/component/-private/view-mixin.d.ts
@@ -0,0 +1,57 @@
+import Mixin from '@ember/object/mixin';
+
+interface ViewMixin {
+    /**
+     * A list of properties of the view to apply as attributes. If the property
+     * is a string value, the value of that string will be applied as the value
+     * for an attribute of the property's name.
+     */
+    attributeBindings: string[];
+    /**
+     * Returns the current DOM element for the view.
+     */
+    element: Element;
+    /**
+     * The HTML `id` of the view's element in the DOM. You can provide this
+     * value yourself but it must be unique (just as in HTML):
+     */
+    elementId: string;
+    /**
+     * Tag name for the view's outer element. The tag name is only used when an
+     * element is first created. If you change the `tagName` for an element, you
+     * must destroy and recreate the view element.
+     */
+    tagName: string;
+    /**
+     * Renders the view again. This will work regardless of whether the
+     * view is already in the DOM or not. If the view is in the DOM, the
+     * rendering process will be deferred to give bindings a chance
+     * to synchronize.
+     */
+    rerender(): void;
+    /**
+     * Called when a view is going to insert an element into the DOM.
+     */
+    willInsertElement(): void;
+    /**
+     * Called when the element of the view has been inserted into the DOM.
+     * Override this function to do any set up that requires an element
+     * in the document body.
+     */
+    didInsertElement(): void;
+    /**
+     * Called when the view is about to rerender, but before anything has
+     * been torn down. This is a good opportunity to tear down any manual
+     * observers you have installed based on the DOM state
+     */
+    willClearRender(): void;
+    /**
+     * Called when the element of the view is going to be destroyed. Override
+     * this function to do any teardown that requires an element, like removing
+     * event listeners.
+     */
+    willDestroyElement(): void;
+}
+declare const ViewMixin: Mixin<ViewMixin>;
+
+export default ViewMixin;
diff --git a/types/preview/@ember/component/helper.d.ts b/types/preview/@ember/component/helper.d.ts
new file mode 100644
index 00000000000..28a8cf37ec8
--- /dev/null
+++ b/types/preview/@ember/component/helper.d.ts
@@ -0,0 +1,198 @@
+import EmberObject from '@ember/object';
+import { Opaque } from 'ember/-private/type-utils';
+
+// --- Type utilities for signatures --- //
+// Type-only "symbol" to use with `EmptyObject` below, so that it is *not*
+// equivalent to an empty interface.
+declare const Empty: unique symbol;
+
+/**
+ * This provides us a way to have a "fallback" which represents an empty object,
+ * without the downsides of how TS treats `{}`. Specifically: this will
+ * correctly leverage "excess property checking" so that, given a component
+ * which has no named args, if someone invokes it with any named args, they will
+ * get a type error.
+ *
+ * @internal This is exported so declaration emit works (if it were not emitted,
+ *   declarations which fall back to it would not work). It is *not* intended for
+ *   public usage, and the specific mechanics it uses may change at any time.
+ *   The location of this export *is* part of the public API, because moving it
+ *   will break existing declarations, but is not legal for end users to import
+ *   themselves, so ***DO NOT RELY ON IT***.
+ */
+export interface EmptyObject {
+    [Empty]?: true;
+}
+
+type DefaultPositional = unknown[];
+type DefaultNamed = EmptyObject;
+
+/**
+ * The public shape of a helper.
+ * @deprecated Do not use this directly. Instead, write a `Signature` with the
+ *   "normal" signature shape: `Args: { Named: { ... }, Positional: [...] }`.
+ */
+export interface HelperSignature {
+    NamedArgs?: DefaultNamed;
+    PositionalArgs?: DefaultPositional;
+    Return?: unknown;
+}
+
+type GetOrElse<Obj, K, Fallback> = K extends keyof Obj ? Obj[K] : Fallback;
+
+/** Given a signature `S`, get back the `Args` type. */
+type ArgsFor<S> = 'Args' extends keyof S
+    ? {
+          Named: GetOrElse<S['Args'], 'Named', DefaultNamed>;
+          Positional: GetOrElse<S['Args'], 'Positional', []>;
+      }
+    : { Named: DefaultNamed; Positional: [] };
+
+interface LegacyArgsFor<T> {
+    Named: GetOrElse<T, 'NamedArgs', DefaultNamed>;
+    Positional: GetOrElse<T, 'PositionalArgs', DefaultPositional>;
+}
+
+// This type allows us to present a slightly-less-obtuse error message
+// when attempting to resolve the signature of a helper that doesn't have
+// one declared from within a tool like Glint.
+declare const BadType: unique symbol;
+interface BadType<Message> {
+    [BadType]: Message;
+}
+
+interface MissingSignatureArgs {
+    Named: BadType<'This helper is missing a signature'>;
+    Positional: unknown[];
+}
+
+/**
+ * Given any allowed shorthand form of a signature, desugars it to its full
+ * expanded type.
+ *
+ * @internal This is only exported so we can avoid duplicating it in
+ *   [Glint](https://github.com/typed-ember/glint) or other such tooling. It is
+ *   *not* intended for public usage, and the specific mechanics it uses may
+ *   change at any time. Although the signature produced by is part of Glimmer's
+ *   public API the existence and mechanics of this specific symbol are *not*,
+ *   so ***DO NOT RELY ON IT***.
+ */
+// This is similar but not identical to the `ExpandSignature` type used in the
+// Glimmer Component API: it uses the same basic mechanics, but does not have
+// an identical signature because we had not yet normalized the `Signature` when
+// we designed the first pass of this. In the future, we will be able to make
+// all `ExpandSignature` types fully general to work with *any* invokable. But
+// "future" here probably means Ember v5. :sobbing:
+export interface ExpandSignature<T> {
+    Args: unknown extends T // Is this the default (i.e. unspecified) signature?
+        ? MissingSignatureArgs // Then return our special "missing signature" type
+        : keyof T extends 'Args' | 'Return' // Is this a `Signature`?
+        ? ArgsFor<T> // Then use `Signature` args
+        : LegacyArgsFor<T>; // Otherwise fall back to classic `Args`.
+    Return: 'Return' extends keyof T ? T['Return'] : unknown;
+}
+
+// The `unknown extends S` checks on both of these are here to preserve backward
+// compatibility with the existing non-`Signature` definition. When migrating
+// into Ember or otherwise making a breaking change, we can drop the "default"
+// in favor of just using `ExpandSignature`.
+type NamedArgs<S> = unknown extends S ? Record<string, unknown> : ExpandSignature<S>['Args']['Named'];
+type PositionalArgs<S> = unknown extends S ? unknown[] : ExpandSignature<S>['Args']['Positional'];
+
+type Return<S> = GetOrElse<S, 'Return', unknown>;
+
+/**
+ * Ember Helpers are functions that can compute values, and are used in templates.
+ * For example, this code calls a helper named `format-currency`:
+ */
+export default class Helper<S = unknown> extends EmberObject {
+    /**
+     * In many cases, the ceremony of a full `Ember.Helper` class is not required.
+     * The `helper` method create pure-function helpers without instances. For
+     * example:
+     */
+    static helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
+        helper: (positional: P, named: N) => R,
+    ): Helper<{ Args: { Positional: P; Named: N }; Return: R }>;
+    /**
+     * Override this function when writing a class-based helper.
+     */
+    compute(positional: PositionalArgs<S>, named: NamedArgs<S>): Return<S>;
+    /**
+     * On a class-based helper, it may be useful to force a recomputation of that
+     * helpers value. This is akin to `rerender` on a component.
+     */
+    recompute(): void;
+}
+
+// The generic here is for a *signature: a way to hang information for tools
+// like Glint which can provide typey checking for component templates using
+// information supplied via this generic. While it may appear useless on this
+// class definition and extension, it is used by external tools and should not
+// be removed.
+// tslint:disable-next-line:no-unnecessary-generics
+export default interface Helper<S> extends Opaque<S> {}
+
+// This type exists to provide a non-user-constructible, non-subclassable
+// type representing the conceptual "instance type" of a function helper.
+// The abstract field of type `never` presents subclassing in userspace of
+// the value returned from `helper()`. By extending `Helper<S>`, any
+// augmentations of the `Helper` type performed by tools like Glint will
+// also apply to function-based helpers as well.
+export abstract class FunctionBasedHelperInstance<S> extends Helper<S> {
+    protected abstract __concrete__: never;
+}
+
+/**
+ * The type of a function-based helper.
+ *
+ * @note This is *not* user-constructible: it is exported only so that the type
+ *   returned by the `helper` function can be named (and indeed can be exported
+ *   like `export default helper(...)` safely).
+ */
+// Making `FunctionBasedHelper` a bare constructor type allows for type
+// parameters to be preserved when `helper()` is passed a generic function.
+// By making it `abstract` and impossible to subclass (see above), we prevent
+// users from attempting to instantiate a return value from `helper()`.
+export type FunctionBasedHelper<S> = abstract new () => FunctionBasedHelperInstance<S>;
+
+/**
+ * In many cases, the ceremony of a full `Helper` class is not required.
+ * The `helper` method create pure-function helpers without instances. For
+ * example:
+ * ```app/helpers/format-currency.js
+ * import { helper } from '@ember/component/helper';
+ * export default helper(function(params, hash) {
+ *   let cents = params[0];
+ *   let currency = hash.currency;
+ *   return `${currency}${cents * 0.01}`;
+ * });
+ * ```
+ */
+// This overload allows users to write types directly on the callback passed to
+// the `helper` function and infer the resulting type correctly.
+export function helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
+    helperFn: (positional: P, named: N) => R,
+): FunctionBasedHelper<{
+    Args: {
+        Positional: P;
+        Named: N;
+    };
+    Return: R;
+}>;
+
+// This overload allows users to provide a `Signature` type explicitly at the
+// helper definition site, e.g. `helper<Sig>((pos, named) => {...})`. **Note:**
+// this overload must appear second, since TS' inference engine will not
+// correctly infer the type of `S` here from the types on the supplied callback.
+export function helper<S>(
+    helperFn: (positional: PositionalArgs<S>, named: NamedArgs<S>) => Return<S>,
+): FunctionBasedHelper<{
+    Args: {
+        Positional: PositionalArgs<S>;
+        Named: NamedArgs<S>;
+    };
+    Return: Return<S>;
+}>;
+
+export {};
diff --git a/types/preview/@ember/component/index.d.ts b/types/preview/@ember/component/index.d.ts
new file mode 100644
index 00000000000..069e9d2c923
--- /dev/null
+++ b/types/preview/@ember/component/index.d.ts
@@ -0,0 +1,131 @@
+import CoreView from '@ember/component/-private/core-view';
+import ClassNamesSupport from '@ember/component/-private/class-names-support';
+import ViewMixin from '@ember/component/-private/view-mixin';
+import { ComponentManager, Capabilities } from './-private/glimmer-interfaces';
+import { Opaque } from 'ember/-private/type-utils';
+
+// Re-export these types so people can use them!
+export { ComponentManager, Capabilities };
+
+interface TemplateFactory {
+  __htmlbars_inline_precompile_template_factory: any;
+}
+
+// The generic here is for a *signature: a way to hang information for tools
+// like Glint which can provide typey checking for component templates using
+// information supplied via this generic. While it may appear useless on this
+// class definition and extension, it is used by external tools and should not
+// be removed.
+// tslint:disable-next-line:no-unnecessary-generics
+export default interface Component<S = unknown> extends ViewMixin, ClassNamesSupport, Opaque<S> {}
+export default class Component<S = unknown> extends CoreView {
+  // methods
+  readDOMAttr(name: string): string;
+  // properties
+  /**
+   * The WAI-ARIA role of the control represented by this view. For example, a button may have a
+   * role of type 'button', or a pane may have a role of type 'alertdialog'. This property is
+   * used by assistive software to help visually challenged users navigate rich web applications.
+   */
+  ariaRole: string;
+  /**
+   * The HTML id of the component's element in the DOM. You can provide this value yourself but
+   * it must be unique (just as in HTML):
+   *
+   * If not manually set a default value will be provided by the framework. Once rendered an
+   * element's elementId is considered immutable and you should never change it. If you need
+   * to compute a dynamic value for the elementId, you should do this when the component or
+   * element is being instantiated:
+   */
+  elementId: string;
+  /**
+   * A component may contain a layout. A layout is a regular template but supersedes the template
+   * property during rendering. It is the responsibility of the layout template to retrieve the
+   * template property from the component (or alternatively, call Handlebars.helpers.yield,
+   * {{yield}}) to render it in the correct location. This is useful for a component that has a
+   * shared wrapper, but which delegates the rendering of the contents of the wrapper to the
+   * template property on a subclass.
+   */
+  layout: TemplateFactory | string;
+  /**
+   * Enables components to take a list of parameters as arguments.
+   */
+  static positionalParams: string[] | string;
+  // events
+  /**
+   * Called when the attributes passed into the component have been updated. Called both during the
+   * initial render of a container and during a rerender. Can be used in place of an observer; code
+   * placed here will be executed every time any attribute updates.
+   */
+  didReceiveAttrs(): void;
+  /**
+   * Called after a component has been rendered, both on initial render and in subsequent rerenders.
+   */
+  didRender(): void;
+  /**
+   * Called when the component has updated and rerendered itself. Called only during a rerender,
+   * not during an initial render.
+   */
+  didUpdate(): void;
+  /**
+   * Called when the attributes passed into the component have been changed. Called only during a
+   * rerender, not during an initial render.
+   */
+  didUpdateAttrs(): void;
+  /**
+   * Called before a component has been rendered, both on initial render and in subsequent rerenders.
+   */
+  willRender(): void;
+  /**
+   * Called when the component is about to update and rerender itself. Called only during a rerender,
+   * not during an initial render.
+   */
+  willUpdate(): void;
+
+  /**
+   * `reopen()` was deprecated and removed from `Component`. It is given an
+   * illegitimate type in these types so that you cannot call it or use it!
+   * Unfortunately, it cannot actually be *removed* from this type, because TS
+   * rightly complains that `Component` is no longer a valid subtype of the
+   * `EmberObject` base class, and will not let you use it.
+   */
+  static reopen(): never;
+}
+
+/**
+ * Associate a class with a component manager (an object that is responsible for
+ * coordinating the lifecycle events that occurs when invoking, rendering and
+ * re-rendering a component).
+ *
+ * @param managerFactory a function to create the owner for an object
+ * @param object the object to associate with the componetn manager
+ * @return the same object passed in, now associated with the manager
+ */
+export function setComponentManager<T>(
+  managerFactory: (owner: unknown) => ComponentManager<unknown>,
+  object: T
+): T;
+
+// In normal TypeScript, these built-in components are essentially opaque tokens
+// that just need to be importable. Declaring them with unique interfaces
+// like this, however, gives tools like Glint (that DO have a richer
+// notion of what they are) a place to install more detailed type information.
+export interface Input extends Opaque<'component:input'> {}
+export interface Textarea extends Opaque<'component:textarea'> {}
+
+/**
+ * The `Input` component lets you create an HTML `<input>` element.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/Input?anchor=Input
+ */
+export const Input: Input;
+
+/**
+ * The `Textarea` component inserts a new instance of `<textarea>` tag into the template.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/Textarea?anchor=Textarea
+ */
+export const Textarea: Textarea;
+
+// Do not export anything but what we *explicitly* say to export.
+export {};
diff --git a/types/preview/@ember/component/template-only.d.ts b/types/preview/@ember/component/template-only.d.ts
new file mode 100644
index 00000000000..6f652be7b20
--- /dev/null
+++ b/types/preview/@ember/component/template-only.d.ts
@@ -0,0 +1,46 @@
+import { Opaque } from 'ember/-private/type-utils';
+
+/**
+ * Template-only components have no backing class instance, so this in their
+ * templates is null. This means that you can only reference passed in arguments
+ * via named argument syntax (e.g. `{{@arg}}`):
+ *
+ * ```hbs
+ * {{!--
+ *   This does not work, since `this` does not exist
+ * --}}
+ * <label for="title">Title</label>
+ * <Input @value={{this.value}} id="title" />
+ * ```
+ *
+ * Additionally, the mut helper generally can't be used for the same reason:
+ *
+ * ```hbs
+ * {{!-- This does not work --}}
+ * <input
+ *   value={{this.value}}
+ *   onkeyup={{action (mut this.value) target="value"}}
+ * />
+ * ```
+ *
+ * Since Octane, a template-only component shares a subset of features that are
+ * available in `@glimmer/component`. Such component can be seamlessly
+ * "upgraded" to a Glimmer component, when you add a JavaScript file alongside
+ * the template.
+ */
+export interface TemplateOnlyComponent<S = unknown> extends Opaque<S> {
+    toString(): string;
+}
+
+/**
+ * A convenience alias for {@link TemplateOnlyComponent}
+ */
+export type TOC<S> = TemplateOnlyComponent<S>;
+
+// The generic here is for a *signature: a way to hang information for tools
+// like Glint which can provide typey checking for component templates using
+// information supplied via this generic. While it may appear useless on this
+// class definition and extension, it is used by external tools and should not
+// be removed.
+// tslint:disable-next-line:no-unnecessary-generics
+export default function templateOnly<S>(moduleName?: string): TemplateOnlyComponent<S>;
diff --git a/types/preview/@ember/component/test/built-ins.ts b/types/preview/@ember/component/test/built-ins.ts
new file mode 100644
index 00000000000..ec95d1b50a6
--- /dev/null
+++ b/types/preview/@ember/component/test/built-ins.ts
@@ -0,0 +1,4 @@
+import { Input, Textarea } from '@ember/component';
+
+Input; // $ExpectType Input
+Textarea; // $ExpectType Textarea
diff --git a/types/preview/@ember/component/test/component.ts b/types/preview/@ember/component/test/component.ts
new file mode 100644
index 00000000000..64596a83fa6
--- /dev/null
+++ b/types/preview/@ember/component/test/component.ts
@@ -0,0 +1,157 @@
+import Component from '@ember/component';
+import Object, { computed, get } from '@ember/object';
+import hbs from 'htmlbars-inline-precompile';
+import { assertType } from './lib/assert';
+
+Component.extend({
+    layout: hbs`
+        <div>
+          {{yield}}
+        </div>
+    `,
+});
+
+Component.extend({
+    layout: 'my-layout',
+});
+
+const MyComponent = Component.extend();
+assertType<string | string[]>(get(MyComponent, 'positionalParams'));
+
+const component1 = Component.extend({
+    actions: {
+        hello(name: string) {
+            console.log('Hello', name);
+        },
+    },
+});
+
+Component.extend({
+    name: '',
+    hello(name: string) {
+        this.set('name', name);
+    },
+});
+
+Component.extend({
+    tagName: 'em',
+});
+
+Component.extend({
+    classNames: ['my-class', 'my-other-class'],
+});
+
+Component.extend({
+    classNameBindings: ['propertyA', 'propertyB'],
+    propertyA: 'from-a',
+    propertyB: computed(function () {
+        if (!this.get('propertyA')) {
+            return 'from-b';
+        }
+    }),
+});
+
+Component.extend({
+    classNameBindings: ['hovered'],
+    hovered: true,
+});
+
+Component.extend({
+    classNameBindings: ['messages.empty'],
+    messages: Object.create({
+        empty: true,
+    }),
+});
+
+Component.extend({
+    classNameBindings: ['isEnabled:enabled:disabled'],
+    isEnabled: true,
+});
+
+Component.extend({
+    classNameBindings: ['isEnabled::disabled'],
+    isEnabled: true,
+});
+
+Component.extend({
+    tagName: 'a',
+    attributeBindings: ['href'],
+    href: 'http://google.com',
+});
+
+Component.extend({
+    tagName: 'a',
+    attributeBindings: ['url:href'],
+    url: 'http://google.com',
+});
+
+Component.extend({
+    tagName: 'use',
+    attributeBindings: ['xlinkHref:xlink:href'],
+    xlinkHref: '#triangle',
+});
+
+Component.extend({
+    tagName: 'input',
+    attributeBindings: ['disabled'],
+    disabled: false,
+});
+
+Component.extend({
+    tagName: 'input',
+    attributeBindings: ['disabled'],
+    disabled: computed(() => {
+        if ('someLogic') {
+            return true;
+        } else {
+            return false;
+        }
+    }),
+});
+
+Component.extend({
+    tagName: 'form',
+    attributeBindings: ['novalidate'],
+    novalidate: null,
+});
+
+Component.extend({
+    click(event: object) {
+        // will be called when an instance's
+        // rendered element is clicked
+    },
+});
+
+// @ts-expect-error
+Component.reopen({
+    attributeBindings: ['metadata:data-my-metadata'],
+    metadata: '',
+});
+
+interface MySig {
+    Args: {
+        Named: {
+            name: string;
+            age: number;
+        };
+        Positional: [action: () => void];
+    };
+}
+
+// These type helpers are stolen (and tweaked) from Glimmer and Glint internals
+// just to demo that this actually has the expected behavior with a signature
+// and an Ember component
+type GetWithFallback<T, K, Fallback> = K extends keyof T ? T[K] : Fallback;
+type NamedArgsFor<T> = GetWithFallback<GetWithFallback<T, 'Args', {}>, 'Named', object>;
+
+interface SigExample extends NamedArgsFor<MySig> {}
+class SigExample extends Component<MySig> {
+    get accessArgs() {
+        const {
+            name, // $ExpectType string
+            age, // $ExpectType number
+        } = this;
+
+        return `${name} is ${age} years old`;
+    }
+}
diff --git a/types/preview/@ember/component/test/helper.ts b/types/preview/@ember/component/test/helper.ts
new file mode 100644
index 00000000000..301a167ffb2
--- /dev/null
+++ b/types/preview/@ember/component/test/helper.ts
@@ -0,0 +1,128 @@
+import Helper, { ExpandSignature, helper } from '@ember/component/helper';
+
+class DeprecatedSignatureForm extends Helper<{
+    PositionalArgs: [offset: Date];
+    Return: Date;
+}> {
+    timer?: ReturnType<typeof setInterval> | undefined;
+    now = new Date();
+    init() {
+        super.init();
+        this.timer = setInterval(() => {
+            this.set('now', new Date());
+            this.recompute();
+        }, 100);
+    }
+    compute([offset]: [Date]): Date {
+        return new Date(this.now.getTime() + offset.getTime());
+    }
+    willDestroy() {
+        clearInterval(this.timer);
+    }
+}
+
+interface DemoSig {
+    Args: {
+        Named: {
+            name: string;
+            age: number;
+        };
+        Positional: [i18nizer: (s: string) => string];
+    };
+    Return: string;
+}
+
+function testMissingSignature({ Args, Return }: ExpandSignature<unknown>) {
+    // $ExpectType BadType<"This helper is missing a signature">
+    Args.Named;
+
+    // $ExpectType unknown[]
+    Args.Positional;
+
+    // $ExpectType unknown
+    Return;
+}
+
+class SignatureForm extends Helper<DemoSig> {
+    compute([i18nizer]: [i18nizer: (s: string) => string], { name, age }: { name: string; age: number }): string {
+        return i18nizer(`${name} is ${age} years old`);
+    }
+}
+
+class NoSignatureForm extends Helper {
+    compute([i18nizer]: [i18nizer: (s: string) => string], { name, age }: { name: string; age: number }): string {
+        return i18nizer(`${name} is ${age} years old`);
+    }
+}
+
+class BadPosSigForm extends Helper<DemoSig> {
+    compute(
+        // @ts-expect-error
+        [i18nizer, extra]: [i18nizer: (s: string) => string],
+        { name, age }: { name: string; age: number },
+    ): string {
+        return i18nizer(`${name} is ${age} years old`);
+    }
+}
+
+class BadNamedSigForm extends Helper<DemoSig> {
+    compute(
+        [i18nizer]: [i18nizer: (s: string) => string],
+        // @ts-expect-error
+        { name, age, potato }: { name: string; age: number },
+    ): string {
+        return i18nizer(`${name} is ${age} years old`);
+    }
+}
+
+class BadReturnForm extends Helper<DemoSig> {
+    compute([i18nizer]: [i18nizer: (s: string) => string], { name, age }: { name: string; age: number }): string {
+        // @ts-expect-error
+        return Boolean(i18nizer(`${name} is ${age} years old`));
+    }
+}
+
+// $ExpectType FunctionBasedHelper<{ Args: { Positional: [number, number]; Named: EmptyObject; }; Return: number; }>
+const inferenceOnPositional = helper(function add([a, b]: [number, number]) {
+    return a + b;
+});
+
+const coolHelper = helper(([], named) => {
+    // $ExpectType EmptyObject
+    named;
+});
+
+// $ExpectType FunctionBasedHelper<{ Args: { Positional: DefaultPositional; Named: { cool: boolean; }; }; Return: 123 | "neat"; }>
+const typeInferenceOnNamed = helper(([], { cool }: { cool: boolean }) => {
+    // $ExpectType boolean
+    cool;
+
+    return cool ? 123 : 'neat';
+});
+
+// $ExpectType FunctionBasedHelper<{ Args: { Positional: [string]; Named: { delim?: string; }; }; Return: string; }>
+const dasherizeHelper = helper(function dasherize([str]: [string], { delim = '-' }: { delim?: string }) {
+    return str.split(/[\s\n\_\.]+/g).join(delim);
+});
+
+const signatureForm = helper<DemoSig>(([i18nizer], { name, age }) => i18nizer(`${name} is ${age} years old`));
+
+// @ts-expect-error
+const badPosArgsSig = helper<DemoSig>(([i18nizer, extra], { name, age }) => i18nizer(`${name} is ${age} years old`));
+
+// @ts-expect-error
+const badNamedArgsSig = helper<DemoSig>(([i18nizer], { name, age, potato }) => i18nizer(`${name} is ${age} years old`));
+
+// @ts-expect-error
+const badReturnSig = helper<DemoSig>(([i18nizer], { name, age }) => Boolean(i18nizer(`${name} is ${age} years old`)));
+
+const greet = helper(([name]: [string]) => `Hello, ${name}`);
+
+// @ts-expect-error
+new greet();
+
+// @ts-expect-error
+class Subgreet extends greet {}
+
+// $ExpectType abstract new <T>() => FunctionBasedHelperInstance<{ Args: { Positional: [T]; Named: EmptyObject; }; Return: [T, T]; }>
+const pair = helper(<T>([item]: [T]): [T, T] => [item, item]);
diff --git a/types/preview/@ember/component/test/lib/assert.ts b/types/preview/@ember/component/test/lib/assert.ts
new file mode 100755
index 00000000000..dad227ab5e9
--- /dev/null
+++ b/types/preview/@ember/component/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/component/test/template-only.ts b/types/preview/@ember/component/test/template-only.ts
new file mode 100644
index 00000000000..ce494a181a8
--- /dev/null
+++ b/types/preview/@ember/component/test/template-only.ts
@@ -0,0 +1,28 @@
+import templateOnly, { TemplateOnlyComponent, TOC } from '@ember/component/template-only';
+
+const to = templateOnly(); // $ExpectType TemplateOnlyComponent<unknown>
+
+to.toString(); // $ExpectType string
+
+// @ts-expect-error
+new TemplateOnlyComponent();
+
+interface MySig {
+    Element: HTMLAnchorElement;
+    Args: {
+        name: string;
+        age: number;
+    };
+    Blocks: {
+        default: [(newName: string) => void];
+    };
+}
+
+// $ExpectType TemplateOnlyComponent<MySig>
+const toc: TOC<MySig> = templateOnly();
+
+// $ExpectType TemplateOnlyComponent<MySig>
+const tocInferred = templateOnly<MySig>();
+
+// $ExpectType TemplateOnlyComponent<MySig>
+const longToc: TemplateOnlyComponent<MySig> = templateOnly();
diff --git a/types/preview/@ember/component/tsconfig.json b/types/preview/@ember/component/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/component/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
new file mode 100644
index 00000000000..da29c40835e
--- /dev/null
+++ b/types/preview/@ember/controller/index.d.ts
@@ -0,0 +1,47 @@
+import ActionHandler from '@ember/object/-private/action-handler';
+import Mixin from '@ember/object/mixin';
+import EmberObject from '@ember/object';
+import ComputedProperty from '@ember/object/computed';
+
+type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
+type QueryParamScopeTypes = 'controller' | 'model';
+
+interface QueryParamConfig {
+  type?: QueryParamTypes | undefined;
+  scope?: QueryParamScopeTypes | undefined;
+  as?: string | undefined;
+}
+
+/**
+ * Additional methods for the Controller.
+ */
+export interface ControllerMixin extends ActionHandler {
+  /**
+   * @deprecated until 5.0. Use `RouterService.replaceWith` instead.
+   */
+  replaceRoute(name: string, ...args: any[]): void;
+  /**
+   * @deprecated until 5.0. Use `RouterService.transitionTo` instead.
+   */
+  transitionToRoute(name: string, ...args: any[]): void;
+  /**
+   * @deprecated until 5.0. Use `RouterService.transitionTo` instead.
+   */
+  transitionToRoute(...args: any[]): void;
+  model: unknown;
+  queryParams: Array<string | Record<string, QueryParamConfig | string | undefined>>;
+  target: object;
+}
+export const ControllerMixin: Mixin<ControllerMixin>;
+
+export default class Controller extends EmberObject {}
+export default interface Controller extends ControllerMixin {}
+
+export function inject(): ComputedProperty<Controller>;
+export function inject<K extends keyof Registry>(name: K): ComputedProperty<Registry[K]>;
+export function inject(target: object, propertyKey: string | symbol): void;
+
+// A type registry for Ember `Controller`s. Meant to be declaration-merged
+// so string lookups resolve to the correct type.
+// tslint:disable-next-line no-empty-interface
+export interface Registry {}
diff --git a/types/preview/@ember/controller/test/main.ts b/types/preview/@ember/controller/test/main.ts
new file mode 100644
index 00000000000..e34d763e167
--- /dev/null
+++ b/types/preview/@ember/controller/test/main.ts
@@ -0,0 +1,14 @@
+import Controller, { inject } from '@ember/controller';
+
+Controller.extend({
+    queryParams: ['category'],
+    category: null,
+    isExpanded: false,
+
+    first: inject(),
+    second: inject('second'),
+
+    toggleBody() {
+        this.toggleProperty('isExpanded');
+    },
+});
diff --git a/types/preview/@ember/controller/test/octane.ts b/types/preview/@ember/controller/test/octane.ts
new file mode 100644
index 00000000000..1ce829a275b
--- /dev/null
+++ b/types/preview/@ember/controller/test/octane.ts
@@ -0,0 +1,36 @@
+import Controller, { inject } from '@ember/controller';
+
+class FirstController extends Controller {
+    foo = 'bar';
+    @inject declare second: InstanceType<typeof SecondController>;
+    @inject() declare otherSecond: InstanceType<typeof SecondController>;
+    @inject('second') declare moreSecond: InstanceType<typeof SecondController>;
+
+    queryParams = [
+        'category',
+        {
+            searchTerm: {
+                as: 'search',
+            },
+            subCategory: 'sub-category',
+        },
+    ];
+
+    first() {
+        return '';
+    }
+}
+const SecondController = Controller.extend({
+    foo: 'bar',
+
+    second() {
+        return '';
+    },
+});
+
+declare module '@ember/controller' {
+    interface Registry {
+        first: FirstController;
+        second: InstanceType<typeof SecondController>;
+    }
+}
diff --git a/types/preview/@ember/controller/tsconfig.json b/types/preview/@ember/controller/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/controller/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
new file mode 100644
index 00000000000..3e03e0923fd
--- /dev/null
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -0,0 +1,11 @@
+import Resolver from 'ember-resolver';
+
+/**
+ * The ContainerDebugAdapter helps the container and resolver interface
+ * with tools that debug Ember such as the Ember Inspector for Chrome and Firefox.
+ */
+export default class ContainerDebugAdapter extends Object {
+    resolver: Resolver;
+    canCatalogEntriesByType(type: string): boolean;
+    catalogEntriesByType(type: string): string[];
+}
diff --git a/types/preview/@ember/debug/data-adapter.d.ts b/types/preview/@ember/debug/data-adapter.d.ts
new file mode 100644
index 00000000000..9ed2f3c7515
--- /dev/null
+++ b/types/preview/@ember/debug/data-adapter.d.ts
@@ -0,0 +1,62 @@
+import ContainerDebugAdapter from "@ember/debug/container-debug-adapter";
+import EmberObject from "@ember/object";
+
+declare namespace DataAdapter {
+    interface Column {
+        name: string;
+        desc: string;
+    }
+    interface WrappedRecord {
+        columnValues: object;
+        object: object;
+    }
+    interface WrappedType {
+        type: {
+            name: string;
+            count: number;
+            columns: Column[];
+            object: typeof Object;
+        };
+        release: () => void;
+    }
+}
+
+/**
+ * The `DataAdapter` helps a data persistence library
+ * interface with tools that debug Ember such as Chrome and Firefox.
+ */
+export default class DataAdapter extends EmberObject {
+    /**
+     * The container-debug-adapter which is used
+     * to list all models.
+     */
+    containerDebugAdapter: ContainerDebugAdapter;
+    /**
+     * Ember Data > v1.0.0-beta.18
+     * requires string model names to be passed
+     * around instead of the actual factories.
+     */
+    acceptsModelName: boolean;
+    /**
+     * Specifies how records can be filtered.
+     * Records returned will need to have a `filterValues`
+     * property with a key for every name in the returned array.
+     */
+    getFilters(): DataAdapter.Column[];
+    /**
+     * Fetch the model types and observe them for changes.
+     */
+    watchModelTypes(
+        typesAdded: (types: DataAdapter.WrappedType[]) => void,
+        typesUpdated: (types: DataAdapter.WrappedType[]) => void
+    ): () => void;
+    /**
+     * Fetch the records of a given type and observe them for changes.
+     */
+    watchRecords(
+        modelName: string,
+        recordsAdded: (records: DataAdapter.WrappedRecord[]) => void,
+        recordsUpdated: (records: DataAdapter.WrappedRecord[]) => void,
+        recordsRemoved: (idx: number, count: number) => void
+    ): () => void;
+}
diff --git a/types/preview/@ember/debug/ember__debug-tests.ts b/types/preview/@ember/debug/ember__debug-tests.ts
new file mode 100644
index 00000000000..9df7cf532de
--- /dev/null
+++ b/types/preview/@ember/debug/ember__debug-tests.ts
@@ -0,0 +1,237 @@
+import {
+    runInDebug,
+    warn,
+    debug,
+    assert,
+    registerWarnHandler,
+    registerDeprecationHandler,
+    deprecate,
+} from '@ember/debug';
+
+/**
+ * @ember/debug tests
+ */
+// @ts-expect-error
+runInDebug();
+runInDebug(() => console.log('Should not show up in prod')); // $ExpectType void
+
+// Log a warning if we have more than 3 tomsters
+const tomsterCount = 2;
+// @ts-expect-error
+warn('Too many tomsters!');
+warn('Too many tomsters!', { id: 'some-warning' }); // $ExpectType void
+// @ts-expect-error
+warn('Too many tomsters!', tomsterCount <= 3);
+warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' }); // $ExpectType void
+warn('Too many tomsters!', tomsterCount <= 3, { // $ExpectType void
+    id: 'ember-debug.too-many-tomsters'
+});
+
+// @ts-expect-error
+debug();
+debug('Too many tomsters!'); // $ExpectType void
+// @ts-expect-error
+debug('Too many tomsters!', 'foo');
+
+// Test for truthiness
+const str: unknown = 'hello';
+assert('Must pass a string', typeof str === 'string'); // $ExpectType void
+str; // $ExpectType string
+
+const anObject = {};
+assert('Must pass an object', anObject); // $ExpectType void
+
+// Test with null and undefined
+assert('Can handle falsiness', null); // $ExpectType void
+assert('Can handle falsiness', undefined); // $ExpectType void
+
+// Fail unconditionally
+assert('This code path should never be run'); // $ExpectType never
+
+// Require first argument
+// @ts-expect-error
+assert();
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerWarnHandler();
+registerWarnHandler(() => {}); // $ExpectType void
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
+});
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    // @ts-expect-error
+    next();
+});
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    next(message); // $ExpectType void
+});
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    next(message, options); // $ExpectType void
+});
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerDeprecationHandler();
+registerDeprecationHandler(() => {}); // $ExpectType void
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
+});
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    // @ts-expect-error
+    next();
+});
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    next(message); // $ExpectType void
+});
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    next(message, options); // $ExpectType void
+});
+
+// @ts-expect-error
+deprecate();
+// @ts-expect-error
+deprecate('missing test and options');
+// @ts-expect-error
+deprecate('missing options', true);
+// @ts-expect-error
+deprecate('missing options', false);
+// @ts-expect-error
+deprecate('missing options body', true, {});
+// @ts-expect-error
+deprecate('missing options id', true, { until: 'v4.0.0' });
+// @ts-expect-error
+deprecate('missing options until', true, { id: 'some.deprecation' });
+deprecate('a valid deprecation without `url`', true, { // $ExpectType void
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    available: 'some.early.version',
+    enabled: 'some.version',
+  },
+});
+deprecate('incorrect options `url`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  // @ts-expect-error
+  url: 123,
+  for: 'some.namespace',
+  since: {
+    available: 'some.earlier.version',
+    enabled: 'some.version',
+  },
+});
+deprecate('a valid deprecation with `url`', true, { // $ExpectType void
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  url: 'https://example.com/ember-deprecations-yo',
+  for: 'some.namespace',
+  since: {
+    available: 'some.earlier.version',
+    enabled: 'some.version',
+  },
+});
+deprecate('a valid deprecation with `for`', true, { // $ExpectType void
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    available: 'some.earlier.version',
+    enabled: 'some.version',
+  },
+});
+deprecate('incorrect options `for`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  // @ts-expect-error
+  for: 123,
+  since: {
+    available: 'some.earlier.version',
+    enabled: 'some.version',
+  },
+});
+deprecate('a valid deprecation with `since`', true, { // $ExpectType void
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    available: 'some.version',
+  },
+});
+deprecate('a valid deprecation with `since`', true, { // $ExpectType void
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    available: 'some.version',
+    enabled: 'some.version',
+  },
+});
+deprecate('incorrect options `since`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  // @ts-expect-error
+  since: 123,
+});
+deprecate('incorrect options `since`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    // @ts-expect-error
+    wrongKey: 'some.version',
+  },
+});
+deprecate('incorrect options `since` available', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    // @ts-expect-error
+    available: 123,
+  },
+});
+deprecate('incorrect options `since` enabled', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+      available: 'some.earlier.version',
+      // @ts-expect-error
+      enabled: 123,
+  },
+});
+deprecate('incorrect options `since` empty', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  // @ts-expect-error
+  since: {},
+});
+deprecate('incorrect options `since` enabled w/o available', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  // @ts-expect-error
+  since: {
+      enabled: 'some.version',
+  },
+});
diff --git a/types/preview/@ember/debug/index.d.ts b/types/preview/@ember/debug/index.d.ts
new file mode 100644
index 00000000000..0500927bc3b
--- /dev/null
+++ b/types/preview/@ember/debug/index.d.ts
@@ -0,0 +1,100 @@
+// Type definitions for non-npm package @ember/debug 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fdebug
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+/**
+ * Define an assertion that will throw an exception if the condition is not met.
+ */
+export function assert(desc: string): never;
+export function assert(desc: string, test: unknown): asserts test;
+
+/**
+ * Display a debug notice.
+ */
+export function debug(message: string): void;
+
+/**
+ * Allows for runtime registration of handler functions that override the default deprecation behavior.
+ * Deprecations are invoked by calls to [Ember.deprecate](http://emberjs.com/api/classes/Ember.html#method_deprecate).
+ * The following example demonstrates its usage by registering a handler that throws an error if the
+ * message contains the word "should", otherwise defers to the default handler.
+ */
+export function registerDeprecationHandler(
+    handler: (
+        message: string,
+        options: { id: string; until: string } | undefined,
+        next: (message: string, options?: { id: string; until: string }) => void,
+    ) => void,
+): void;
+/**
+ * Allows for runtime registration of handler functions that override the default warning behavior.
+ * Warnings are invoked by calls made to [Ember.warn](http://emberjs.com/api/classes/Ember.html#method_warn).
+ * The following example demonstrates its usage by registering a handler that does nothing overriding Ember's
+ * default warning behavior.
+ */
+export function registerWarnHandler(
+    handler: (
+        message: string,
+        options: { id: string } | undefined,
+        next: (message: string, options?: { id: string }) => void,
+    ) => void,
+): void;
+
+/**
+ * Run a function meant for debugging.
+ */
+export function runInDebug(func: () => unknown): void;
+
+/**
+ * Display a warning with the provided message.
+ */
+export function warn(message: string, test: boolean, options: { id: string }): void;
+export function warn(message: string, options: { id: string }): void;
+
+/**
+ * Display a deprecation warning with the provided message and a stack trace
+ * (Chrome and Firefox only).
+ *
+ * In a production build, this method is defined as an empty function (NOP).
+ * Uses of this method in Ember itself are stripped from the ember.prod.js build.
+ *
+ * @param message A description of the deprecation.
+ * @param test If falsy, the deprecation will be displayed.
+ * @param options The deprecation options.
+ */
+export function deprecate(
+    message: string,
+    test: boolean,
+    options: {
+        /**
+         * A unique id for this deprecation. The id can be used by Ember debugging
+         * tools to change the behavior (raise, log or silence) for that specific
+         * deprecation. The id should be namespaced by dots, e.g.
+         * `"view.helper.select"`.
+         */
+        id: string;
+        /**
+         * The version of Ember when this deprecation warning will be removed.
+         */
+        until: string;
+        /**
+         * An optional url to the transition guide on the emberjs.com website.
+         */
+        url?: string | undefined;
+        /**
+         * A namespace for the deprecation, usually the package name.
+         */
+        for: string;
+        /**
+         * Describes when the deprecation became available and enabled.
+         */
+        since: Available | Enabled;
+    },
+): void;
+
+export interface Available { available: string; }
+export interface Enabled extends Available { enabled: string; }
diff --git a/types/preview/@ember/debug/tsconfig.json b/types/preview/@ember/debug/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/debug/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/destroyable/index.d.ts b/types/preview/@ember/destroyable/index.d.ts
new file mode 100644
index 00000000000..855508cbbcf
--- /dev/null
+++ b/types/preview/@ember/destroyable/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for non-npm package @ember/destroyable 4.0
+// Project: https://api.emberjs.com/ember/3.22/modules/@ember%2Fdestroyable
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+export function associateDestroyableChild<T extends object>(parent: object, child: T): T;
+
+export function isDestroying(destroyable: object): boolean;
+
+export function isDestroyed(destroyable: object): boolean;
+
+export function destroy(destroyable: object): void;
+
+export function assertDestroyablesDestroyed(): void;
+
+export function enableDestroyableTracking(): void;
+
+export function registerDestructor<T extends object>(
+destroyable: T,
+destructor: (destroyable: T) => void
+): (destroyable: T) => void;
+
+export function unregisterDestructor<T extends object>(
+destroyable: T,
+destructor: (destroyable: T) => void
+): void;
diff --git a/types/preview/@ember/destroyable/test/lib/assert.ts b/types/preview/@ember/destroyable/test/lib/assert.ts
new file mode 100644
index 00000000000..dad227ab5e9
--- /dev/null
+++ b/types/preview/@ember/destroyable/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/destroyable/test/main.ts b/types/preview/@ember/destroyable/test/main.ts
new file mode 100644
index 00000000000..4c5e3619045
--- /dev/null
+++ b/types/preview/@ember/destroyable/test/main.ts
@@ -0,0 +1,91 @@
+import {
+    assertDestroyablesDestroyed,
+    associateDestroyableChild,
+    destroy,
+    enableDestroyableTracking,
+    isDestroyed,
+    isDestroying,
+    registerDestructor,
+    unregisterDestructor
+} from '@ember/destroyable';
+
+import { assertType } from './lib/assert';
+
+// @ts-expect-error
+enableDestroyableTracking(true);
+// @ts-expect-error
+enableDestroyableTracking({});
+// @ts-expect-error
+enableDestroyableTracking('foo');
+// @ts-expect-error
+enableDestroyableTracking(1);
+enableDestroyableTracking();
+
+class Child {
+    state: boolean;
+    constructor() {
+        this.state = true;
+        // @ts-expect-error
+        registerDestructor();
+        // @ts-expect-error
+        registerDestructor(this);
+        // @ts-expect-error
+        registerDestructor(this.stateDestructor);
+        registerDestructor(this, this.stateDestructor);
+    }
+
+    stateDestructor() {
+        this.state = !this.state;
+    }
+
+    keepForever() {
+        // @ts-expect-error
+        unregisterDestructor();
+        // @ts-expect-error
+        unregisterDestructor(this);
+        // @ts-expect-error
+        unregisterDestructor(this.stateDestructor);
+        unregisterDestructor(this, this.stateDestructor);
+    }
+}
+
+class Parent {
+    child: object;
+
+    constructor(child: object) {
+        // @ts-expect-error
+        this.child = associateDestroyableChild();
+        // @ts-expect-error
+        this.child = associateDestroyableChild(this);
+        // @ts-expect-error
+        this.child = associateDestroyableChild(child);
+        this.child = associateDestroyableChild(this, child);
+    }
+}
+
+const c = new Child();
+const p = new Parent(c);
+
+// @ts-expect-error
+destroy();
+
+assertType<boolean>(isDestroyed(c));
+assertType<boolean>(isDestroyed(p));
+
+destroy(p);
+
+assertType<boolean>(isDestroying(c));
+assertType<boolean>(isDestroying(p));
+
+assertType<boolean>(isDestroyed(c));
+assertType<boolean>(isDestroyed(p));
+
+// @ts-expect-error
+assertDestroyablesDestroyed(true);
+// @ts-expect-error
+assertDestroyablesDestroyed({});
+// @ts-expect-error
+assertDestroyablesDestroyed('foo');
+// @ts-expect-error
+assertDestroyablesDestroyed(1);
+assertDestroyablesDestroyed();
diff --git a/types/preview/@ember/destroyable/tsconfig.json b/types/preview/@ember/destroyable/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/destroyable/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
new file mode 100644
index 00000000000..27463373dc1
--- /dev/null
+++ b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
@@ -0,0 +1,15 @@
+import Owner from '@ember/owner';
+import Mixin from '@ember/object/mixin';
+
+/**
+ * Given a fullName return a factory manager.
+ */
+interface ContainerProxyMixin extends Owner {
+    /**
+     * Returns an object that can be used to provide an owner to a
+     * manually created instance.
+     */
+    ownerInjection(): {};
+}
+declare const ContainerProxyMixin: Mixin<ContainerProxyMixin>;
+export default ContainerProxyMixin;
diff --git a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
new file mode 100644
index 00000000000..f0718b2a83d
--- /dev/null
+++ b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
@@ -0,0 +1,52 @@
+import Owner from '@ember/owner';
+import Mixin from '@ember/object/mixin';
+
+/**
+ * RegistryProxyMixin is used to provide public access to specific
+ * registry functionality.
+ */
+interface RegistryProxyMixin extends Owner {
+    /**
+     * Given a fullName return the corresponding factory.
+     */
+    resolveRegistration(fullName: string): unknown;
+    /**
+     * Unregister a factory.
+     */
+    unregister(fullName: string): unknown;
+    /**
+     * Check if a factory is registered.
+     */
+    hasRegistration(fullName: string): boolean;
+    /**
+     * Register an option for a particular factory.
+     */
+    registerOption(fullName: string, optionName: string, options: {}): unknown;
+    /**
+     * Return a specific registered option for a particular factory.
+     */
+    registeredOption(fullName: string, optionName: string): {};
+    /**
+     * Register options for a particular factory.
+     */
+    registerOptions(fullName: string, options: {}): unknown;
+    /**
+     * Return registered options for a particular factory.
+     */
+    registeredOptions(fullName: string): {};
+    /**
+     * Allow registering options for all factories of a type.
+     */
+    registerOptionsForType(type: string, options: {}): unknown;
+    /**
+     * Return the registered options for all factories of a type.
+     */
+    registeredOptionsForType(type: string): {};
+    /**
+     * Define a dependency injection onto a specific factory or all factories
+     * of a type.
+     */
+    inject(factoryNameOrType: string, property: string, injectionName: string): unknown;
+}
+declare const RegistryProxyMixin: Mixin<RegistryProxyMixin>;
+export default RegistryProxyMixin;
diff --git a/types/preview/@ember/engine/-private/types/initializer.d.ts b/types/preview/@ember/engine/-private/types/initializer.d.ts
new file mode 100644
index 00000000000..515c89f5194
--- /dev/null
+++ b/types/preview/@ember/engine/-private/types/initializer.d.ts
@@ -0,0 +1,6 @@
+export default interface Initializer<T> {
+    name: string;
+    before?: string[] | undefined;
+    after?: string[] | undefined;
+    initialize(application: T): void;
+}
diff --git a/types/preview/@ember/engine/index.d.ts b/types/preview/@ember/engine/index.d.ts
new file mode 100644
index 00000000000..130449d87de
--- /dev/null
+++ b/types/preview/@ember/engine/index.d.ts
@@ -0,0 +1,65 @@
+import EmberObject from '@ember/object';
+import type RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
+import type Initializer from '@ember/engine/-private/types/initializer';
+import type EngineInstance from '@ember/engine/instance';
+import type { Factory, FullName } from '@ember/owner';
+
+export type KnownForTypeResult<Type extends string> = {
+  [fullName in `${Type}:${string}`]: boolean | undefined;
+};
+
+/**
+ * A `Resolver` the mechanism responsible for looking up code in your
+ * application and converting its naming conventions into the actual classes,
+ * functions, and templates that Ember needs to resolve its dependencies, for
+ * example, what template to render for a given route. It is a system that helps
+ * the app resolve the lookup of JavaScript modules agnostic of what kind of
+ * module system is used, which can be AMD, CommonJS or just plain globals. It
+ * is used to lookup routes, models, components, templates, or anything that is
+ * used in your Ember app.
+ */
+export interface Resolver {
+  knownForType?: <TypeName extends string>(type: TypeName) => KnownForTypeResult<TypeName>;
+  lookupDescription?: (fullName: FullName) => string;
+  makeToString?: (factory: Factory<object>, fullName: FullName) => string;
+  normalize?: (fullName: FullName) => string;
+  resolve(name: string): Factory<object> | object | undefined;
+}
+
+/**
+ * The `Engine` class contains core functionality for both applications and
+ * engines.
+ */
+export default class Engine extends EmberObject {
+  /**
+   * The goal of initializers should be to register dependencies and injections.
+   * This phase runs once. Because these initializers may load code, they are
+   * allowed to defer application readiness and advance it. If you need to access
+   * the container or store you should use an InstanceInitializer that will be run
+   * after all initializers and therefore after all code is loaded and the app is
+   * ready.
+   */
+  static initializer(initializer: Initializer<Engine>): void;
+  /**
+   * Instance initializers run after all initializers have run. Because
+   * instance initializers run after the app is fully set up. We have access
+   * to the store, container, and other items. However, these initializers run
+   * after code has loaded and are not allowed to defer readiness.
+   */
+  static instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
+  /**
+   * Set this to provide an alternate class to `DefaultResolver`
+   */
+  resolver: Resolver | null;
+  /**
+   * Create an EngineInstance for this Engine.
+   */
+  buildInstance(options?: object): EngineInstance;
+}
+
+export default interface Engine extends RegistryProxyMixin {}
+
+/**
+ * `getEngineParent` retrieves an engine instance's parent instance.
+ */
+export function getEngineParent(engine: EngineInstance): EngineInstance;
diff --git a/types/preview/@ember/engine/instance.d.ts b/types/preview/@ember/engine/instance.d.ts
new file mode 100644
index 00000000000..84c65b47581
--- /dev/null
+++ b/types/preview/@ember/engine/instance.d.ts
@@ -0,0 +1,22 @@
+import ContainerProxyMixin from "@ember/engine/-private/container-proxy-mixin";
+import RegistryProxyMixin from "@ember/engine/-private/registry-proxy-mixin";
+import EmberObject from "@ember/object";
+
+/**
+ * The `EngineInstance` encapsulates all of the stateful aspects of a
+ * running `Engine`.
+ */
+export default class EngineInstance extends EmberObject {
+    /**
+     * Unregister a factory.
+     */
+    unregister(fullName: string): unknown;
+
+    /**
+     *  Initialize the `EngineInstance` and return a promise that resolves
+     *  with the instance itself when the boot process is complete.
+     */
+    boot(): Promise<EngineInstance>;
+}
+
+export default interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
diff --git a/types/preview/@ember/engine/test/engine-instance.ts b/types/preview/@ember/engine/test/engine-instance.ts
new file mode 100644
index 00000000000..2663ba996ff
--- /dev/null
+++ b/types/preview/@ember/engine/test/engine-instance.ts
@@ -0,0 +1,26 @@
+import EngineInstance from '@ember/engine/instance';
+
+const engineInstance = EngineInstance.create();
+engineInstance.register('some:injection', class Foo {});
+
+engineInstance.register('some:injection', class Foo {}, {
+    singleton: true,
+});
+
+engineInstance.register('some:injection', class Foo {}, {
+    instantiate: false,
+});
+
+engineInstance.register('some:injection', class Foo {}, {
+    singleton: false,
+    instantiate: true,
+});
+
+engineInstance.factoryFor('router:main');
+engineInstance.lookup('route:basic');
+
+engineInstance.boot();
+
+(async () => {
+    await engineInstance.boot();
+})();
diff --git a/types/preview/@ember/engine/test/engine.ts b/types/preview/@ember/engine/test/engine.ts
new file mode 100755
index 00000000000..cf01e987b7e
--- /dev/null
+++ b/types/preview/@ember/engine/test/engine.ts
@@ -0,0 +1,43 @@
+import Engine from '@ember/engine';
+import EmberObject from '@ember/object';
+
+const BaseEngine = Engine.extend({
+    modulePrefix: 'my-engine',
+});
+
+class Obj extends EmberObject.extend({ foo: 'bar' }) {}
+
+BaseEngine.initializer({
+    name: 'my-initializer',
+    initialize(engine) {
+        engine.register('foo:bar', Obj);
+    },
+});
+
+BaseEngine.instanceInitializer({
+    name: 'my-instance-initializer',
+    initialize(engine) {
+        (engine.lookup('foo:bar') as Obj).get('foo');
+    },
+});
+
+const Engine1 = BaseEngine.create({
+    rootElement: '#engine-one',
+    customEvents: {
+        paste: 'paste',
+    },
+});
+
+const Engine2 = BaseEngine.create({
+    rootElement: '#engine-two',
+    customEvents: {
+        mouseenter: null,
+        mouseleave: null,
+    },
+});
+
+const Engine3 = BaseEngine.create();
+
+const Engine3Instance1 = Engine3.buildInstance();
+
+const Engine3Instance2 = Engine3.buildInstance({ foo: 'bar' });
diff --git a/types/preview/@ember/engine/tsconfig.json b/types/preview/@ember/engine/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/engine/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/error/ember__error-tests.ts b/types/preview/@ember/error/ember__error-tests.ts
new file mode 100644
index 00000000000..503d16ee5af
--- /dev/null
+++ b/types/preview/@ember/error/ember__error-tests.ts
@@ -0,0 +1,7 @@
+import Error from '@ember/error';
+
+new Error('Fuuuuuuuu'); // $ExpectType EmberError
+
+// allows to extend from EmberError
+class AjaxError extends Error {
+}
diff --git a/types/preview/@ember/error/index.d.ts b/types/preview/@ember/error/index.d.ts
new file mode 100644
index 00000000000..e1a44683d6f
--- /dev/null
+++ b/types/preview/@ember/error/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for non-npm package @ember/error 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Ferror
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+/**
+ * A subclass of the JavaScript Error object for use in Ember.
+ */
+export default class EmberError extends Error {}
diff --git a/types/preview/@ember/error/tsconfig.json b/types/preview/@ember/error/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/error/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/helper/ember__helper-tests.ts b/types/preview/@ember/helper/ember__helper-tests.ts
new file mode 100644
index 00000000000..56b0f5743f8
--- /dev/null
+++ b/types/preview/@ember/helper/ember__helper-tests.ts
@@ -0,0 +1,7 @@
+import { array, concat, fn, get, hash } from '@ember/helper';
+
+array; // $ExpectType ArrayHelper
+concat; // $ExpectType ConcatHelper
+fn; // $ExpectType FnHelper
+get; // $ExpectType GetHelper
+hash; // $ExpectType HashHelper
diff --git a/types/preview/@ember/helper/index.d.ts b/types/preview/@ember/helper/index.d.ts
new file mode 100644
index 00000000000..7081b026074
--- /dev/null
+++ b/types/preview/@ember/helper/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for non-npm package @ember/helper 4.0
+// Project: https://github.com/emberjs/ember.js
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import type { Opaque } from 'ember/-private/type-utils';
+
+// In normal TypeScript, these helpers are essentially opaque tokens that just
+// need to be importable. Declaring them with unique interfaces like this,
+// however, gives tools like Glint (that DO have a richer notion of what they
+// are) a place to install more detailed type information.
+export interface ArrayHelper extends Opaque<'helper:array'> {}
+export interface ConcatHelper extends Opaque<'helper:concat'> {}
+export interface FnHelper extends Opaque<'helper:fn'> {}
+export interface GetHelper extends Opaque<'helper:get'> {}
+export interface HashHelper extends Opaque<'helper:hash'> {}
+
+/**
+ * Use the `{{array}}` helper to create an array to pass as an option to your components.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/array?anchor=array
+ */
+export const array: ArrayHelper;
+
+/**
+ * Concatenates the given arguments into a string.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/concat?anchor=concat
+ */
+export const concat: ConcatHelper;
+
+/**
+ * The `fn` helper allows you to ensure a function that you are passing off to another component, helper, or modifier
+ * has access to arguments that are available in the template.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/fn?anchor=fn
+ */
+export const fn: FnHelper;
+
+/**
+ * Dynamically look up a property on an object.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/get?anchor=get
+ */
+export const get: GetHelper;
+
+/**
+ * Use the `{{hash}}` helper to create a hash to pass as an option to your components.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/hash?anchor=hash
+ */
+export const hash: HashHelper;
diff --git a/types/preview/@ember/helper/tsconfig.json b/types/preview/@ember/helper/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/helper/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/modifier/ember__modifier-tests.ts b/types/preview/@ember/modifier/ember__modifier-tests.ts
new file mode 100644
index 00000000000..3dc6865fb40
--- /dev/null
+++ b/types/preview/@ember/modifier/ember__modifier-tests.ts
@@ -0,0 +1,8 @@
+import { setModifierManager, capabilities, on } from '@ember/modifier';
+import Owner from '@ember/owner';
+
+declare let owner: Owner;
+
+on; // $ExpectType OnModifier
+setModifierManager((owner) => {}, {}); // $ExpectType {}
+capabilities('3.24'); // $ExpectType unknown
diff --git a/types/preview/@ember/modifier/index.d.ts b/types/preview/@ember/modifier/index.d.ts
new file mode 100644
index 00000000000..6d197ae5ee6
--- /dev/null
+++ b/types/preview/@ember/modifier/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for non-npm package @ember/modifier 4.0
+// Project: https://github.com/emberjs/ember.js
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import type Owner from '@ember/owner';
+import type { Opaque } from 'ember/-private/type-utils';
+
+// In normal TypeScript, this modifier is essentially an opaque token
+// that just needs to be importable. Declaring it with a unique interface
+// like this, however, gives tools like Glint (that DO have a richer
+// notion of what it is) a place to install more detailed type information.
+export interface OnModifier extends Opaque<'modifier:on'> {}
+
+/**
+ * The `{{on}}` modifier lets you easily add event listeners.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/on?anchor=on
+ */
+export const on: OnModifier;
+
+/**
+ * Given a modifier manager factory and a modifier, tell Ember to set the
+ * manager returned by that factory as the manager for the modifier.
+ *
+ * @param factory A function which takes an `owner` and returns a [modifier
+ *   manager](https://emberjs.github.io/rfcs/0373-Element-Modifier-Managers.html).
+ * @param modifier The modifier definition to associate with the manager.
+ */
+export function setModifierManager<T>(factory: (owner: Owner) => unknown, modifier: T): T;
+
+/**
+ * Given a target version of Ember, return an opaque token which Ember can use
+ * to determine what a given modifier manager supports.
+ */
+export function capabilities(version: string): unknown;
diff --git a/types/preview/@ember/modifier/tsconfig.json b/types/preview/@ember/modifier/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/modifier/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/object/-private/action-handler.d.ts b/types/preview/@ember/object/-private/action-handler.d.ts
new file mode 100644
index 00000000000..dae8f951509
--- /dev/null
+++ b/types/preview/@ember/object/-private/action-handler.d.ts
@@ -0,0 +1,28 @@
+import type Mixin from '../mixin';
+
+interface ActionsHash {
+  [index: string]: (...params: any[]) => any;
+}
+
+/**
+ * Ember.ActionHandler is available on some familiar classes including Ember.Route,
+ * Ember.Component, and Ember.Controller. (Internally the mixin is used by Ember.CoreView,
+ * Ember.ControllerMixin, and Ember.Route and available to the above classes through inheritance.)
+ */
+interface ActionHandler {
+  /**
+   * Triggers a named action on the ActionHandler. Any parameters supplied after the actionName
+   * string will be passed as arguments to the action target function.
+   *
+   * If the ActionHandler has its target property set, actions may bubble to the target.
+   * Bubbling happens when an actionName can not be found in the ActionHandler's actions
+   * hash or if the action target function returns true.
+   */
+  send(actionName: string, ...args: any[]): void;
+  /**
+   * The collection of functions, keyed by name, available on this ActionHandler as action targets.
+   */
+  actions: ActionsHash;
+}
+declare const ActionHandler: Mixin<ActionHandler>;
+export default ActionHandler;
diff --git a/types/preview/@ember/object/-private/types.d.ts b/types/preview/@ember/object/-private/types.d.ts
new file mode 100644
index 00000000000..5945629ca89
--- /dev/null
+++ b/types/preview/@ember/object/-private/types.d.ts
@@ -0,0 +1,61 @@
+import type Mixin from '../mixin';
+
+/**
+ * Map type `T` to a plain object hash with the identity mapping.
+ *
+ * Discards any additional object identity like the ability to `new()` up the class.
+ * The `new()` capability is added back later by merging `EmberClassConstructor<T>`
+ *
+ * Implementation is carefully chosen for the reasons described in
+ * https://github.com/typed-ember/ember-typings/pull/29
+ */
+export type Objectify<T> = Readonly<T>;
+
+export type ExtractPropertyNamesOfType<T, S> = {
+  [K in keyof T]: T[K] extends S ? K : never;
+}[keyof T];
+
+export type Fix<T> = { [K in keyof T]: T[K] };
+
+/**
+ * Used to infer the type of ember classes of type `T`.
+ *
+ * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
+ *
+ * The single-arg constructor is required by the typescript compiler.
+ * The multi-arg constructor is included for better ergonomics.
+ *
+ * Implementation is carefully chosen for the reasons described in
+ * https://github.com/typed-ember/ember-typings/pull/29
+ */
+export type EmberClassConstructor<T> = (new (properties?: object) => T) &
+  (new (...args: any[]) => T);
+
+/**
+ * Check that any arguments to `create()` match the type's properties.
+ *
+ * Accept any additional properties and add merge them into the instance.
+ */
+export type EmberInstanceArguments<T> = Partial<T> & {
+  [key: string]: unknown;
+};
+
+/**
+ * Accept any additional properties and add merge them into the prototype.
+ */
+export interface EmberClassArguments {
+  [key: string]: unknown;
+}
+
+/**
+ * Ember.Object.extend(...) accepts any number of mixins or literals.
+ */
+export type MixinOrLiteral<T> = Mixin | T;
+
+export type ObserverMethod<Target, Sender> =
+  | keyof Target
+  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
+
+// This type looks weird, but is correct: from a list of "bottom" to "top", in
+// type theory terms.
+export type AnyFunction = (...args: never[]) => unknown;
diff --git a/types/preview/@ember/object/compat.d.ts b/types/preview/@ember/object/compat.d.ts
new file mode 100644
index 00000000000..291097ab67a
--- /dev/null
+++ b/types/preview/@ember/object/compat.d.ts
@@ -0,0 +1,7 @@
+/**
+ * `@dependentKeyCompat` is a decorator that can be used on native getters that
+ * use tracked properties. It exposes the getter to Ember's classic computed
+ * property and observer systems, so they can watch it for changes. It can be
+ * used in both native and classic classes.
+ */
+export const dependentKeyCompat: PropertyDecorator;
diff --git a/types/preview/@ember/object/computed.d.ts b/types/preview/@ember/object/computed.d.ts
new file mode 100644
index 00000000000..c283b1bf86e
--- /dev/null
+++ b/types/preview/@ember/object/computed.d.ts
@@ -0,0 +1,261 @@
+/**
+ * A computed property transforms an objects function into a property.
+ * By default the function backing the computed property will only be called once and the result
+ * will be cached. You can specify various properties that your computed property is dependent on.
+ * This will force the cached result to be recomputed if the dependencies are modified.
+ */
+export default class ComputedProperty {
+  /**
+   * Call on a computed property to set it into read-only mode. When in this
+   * mode the computed property will throw an error when set.
+   */
+  readOnly(): this;
+  /**
+   * In some cases, you may want to annotate computed properties with additional
+   * metadata about how they function or what values they operate on. For example,
+   * computed property functions may close over variables that are then no longer
+   * available for introspection.
+   */
+  meta(meta: Record<string, unknown>): this;
+  meta(): Record<string, unknown>;
+}
+
+// Computed property definitions also act as property decorators, including those
+// returned from "macros" in third-party code.
+export type BasicComputedProperty = ComputedProperty & PropertyDecorator;
+
+/**
+ * Creates a new property that is an alias for another property
+ * on an object. Calls to `get` or `set` this property behave as
+ * though they were called on the original property.
+ */
+export function alias(dependentKey: string): BasicComputedProperty;
+/**
+ * A computed property that performs a logical `and` on the
+ * original values for the provided dependent properties.
+ */
+export function and(...dependentKeys: string[]): BasicComputedProperty;
+/**
+ * A computed property that converts the provided dependent property
+ * into a boolean value.
+ */
+export function bool(dependentKey: string): BasicComputedProperty;
+
+/**
+ * A computed property that returns the array of values
+ * for the provided dependent properties.
+ */
+export function collect(...dependentKeys: string[]): BasicComputedProperty;
+
+/**
+ * Creates a new property that is an alias for another property
+ * on an object. Calls to `get` or `set` this property behave as
+ * though they were called on the original property, but also
+ * print a deprecation warning.
+ */
+export function deprecatingAlias(
+  dependentKey: string,
+  options: { id: string; until: string }
+): BasicComputedProperty;
+
+/**
+ * A computed property that returns true if the value of the dependent
+ * property is null, an empty string, empty array, or empty function.
+ */
+export function empty(dependentKey: string): BasicComputedProperty;
+/**
+ * A computed property that returns true if the provided dependent property
+ * is equal to the given value.
+ */
+export function equal(dependentKey: string, value: unknown): BasicComputedProperty;
+/**
+ * Expands `pattern`, invoking `callback` for each expansion.
+ */
+export function expandProperties(pattern: string, callback: (expanded: string) => void): void;
+
+/**
+ * Filters the array by the callback.
+ */
+export function filter(
+  dependentKey: string,
+  callback: (value: unknown, index: number, array: unknown[]) => boolean
+): BasicComputedProperty;
+
+/**
+ * Filters the array by the callback and an array of additional dependent keys.
+ */
+export function filter(
+  dependentKey: string,
+  additionalDependentKeys: string[],
+  callback: (value: unknown, index: number, array: unknown[]) => boolean
+): BasicComputedProperty;
+
+/**
+ * Filters the array by the property and value
+ */
+export function filterBy(
+  dependentKey: string,
+  propertyKey: string,
+  value?: unknown
+): BasicComputedProperty;
+
+/**
+ * A computed property that returns true if the provided dependent property
+ * is greater than the provided value.
+ */
+export function gt(dependentKey: string, value: number): BasicComputedProperty;
+/**
+ * A computed property that returns true if the provided dependent property
+ * is greater than or equal to the provided value.
+ */
+export function gte(dependentKey: string, value: number): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the elements
+ * two or more dependent arrays have in common.
+ */
+export function intersect(...propertyKeys: string[]): BasicComputedProperty;
+
+/**
+ * A computed property that returns true if the provided dependent property
+ * is less than the provided value.
+ */
+export function lt(dependentKey: string, value: number): BasicComputedProperty;
+/**
+ * A computed property that returns true if the provided dependent property
+ * is less than or equal to the provided value.
+ */
+export function lte(dependentKey: string, value: number): BasicComputedProperty;
+
+/**
+ * Returns an array mapped via the callback
+ */
+export function map(
+  dependentKey: string,
+  callback: (value: unknown, index: number, array: unknown[]) => unknown
+): BasicComputedProperty;
+
+/**
+ * Returns an array mapped to the specified key.
+ */
+export function mapBy(dependentKey: string, propertyKey: string): BasicComputedProperty;
+
+/**
+ * A computed property which matches the original value for the
+ * dependent property against a given RegExp, returning `true`
+ * if the value matches the RegExp and `false` if it does not.
+ */
+export function match(dependentKey: string, regexp: RegExp): BasicComputedProperty;
+
+/**
+ * A computed property that calculates the maximum value in the
+ * dependent array. This will return `-Infinity` when the dependent
+ * array is empty.
+ */
+export function max(dependentKey: string): BasicComputedProperty;
+
+/**
+ * A computed property that calculates the minimum value in the
+ * dependent array. This will return `Infinity` when the dependent
+ * array is empty.
+ */
+export function min(dependentKey: string): BasicComputedProperty;
+
+/**
+ * A computed property that returns true if the value of the dependent
+ * property is null or undefined. This avoids errors from JSLint complaining
+ * about use of ==, which can be technically confusing.
+ */
+export function none(dependentKey: string): BasicComputedProperty;
+/**
+ * A computed property that returns the inverse boolean value
+ * of the original value for the dependent property.
+ */
+export function not(dependentKey: string): BasicComputedProperty;
+/**
+ * A computed property that returns true if the value of the dependent
+ * property is NOT null, an empty string, empty array, or empty function.
+ */
+export function notEmpty(dependentKey: string): BasicComputedProperty;
+/**
+ * Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
+ * data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
+ * not mutate the upstream property, rather causes the current property to
+ * become the value set. This causes the downstream property to permanently
+ * diverge from the upstream property.
+ */
+export function oneWay(dependentKey: string): BasicComputedProperty;
+/**
+ * A computed property which performs a logical `or` on the
+ * original values for the provided dependent properties.
+ */
+export function or(...dependentKeys: string[]): BasicComputedProperty;
+/**
+ * Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
+ * a readOnly one way binding. Very often when using `computed.oneWay` one does
+ * not also want changes to propagate back up, as they will replace the value.
+ */
+export function readOnly(dependentKey: string): BasicComputedProperty;
+/**
+ * This is a more semantically meaningful alias of `computed.oneWay`,
+ * whose name is somewhat ambiguous as to which direction the data flows.
+ */
+export function reads(dependentKey: string): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the
+ * properties from the first dependent array that are not in the second
+ * dependent array.
+ */
+export function setDiff(setAProperty: string, setBProperty: string): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the properties from
+ * the first dependent array sorted based on a property or sort function.
+ *
+ * If used with an array of sort properties, it must receive exactly two
+ * arguments: the key of the array to sort, and the key of the array of sort
+ * properties. Alternatively the key of the array to sort, and a the sort
+ * function may be used.
+ */
+export function sort<T>(
+  itemsKey: string,
+  sortDefinition: string | ((itemA: T, itemB: T) => number)
+): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the properties from
+ * the first dependent array sorted based on a property or sort function.
+ *
+ * It may receive three arguments: the key of the array to sort, an array of
+ * dependent keys for the computed property, and the sort function.
+ */
+export function sort<T>(
+  itemsKey: string,
+  dependentKeys: string[],
+  sortDefinition: string | ((itemA: T, itemB: T) => number)
+): BasicComputedProperty;
+
+/**
+ * A computed property that returns the sum of the values
+ * in the dependent array.
+ */
+export function sum(dependentKey: string): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the unique
+ * elements from one or more dependent arrays.
+ */
+export function uniq(propertyKey: string): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the unique
+ * elements from one or more dependent arrays.
+ */
+export function union(...propertyKeys: string[]): BasicComputedProperty;
+
+/**
+ * A computed property which returns a new array with all the unique
+ * elements from an array, with uniqueness determined by specific key.
+ */
+export function uniqBy(dependentKey: string, propertyKey: string): BasicComputedProperty;
diff --git a/types/preview/@ember/object/core.d.ts b/types/preview/@ember/object/core.d.ts
new file mode 100644
index 00000000000..c8dbc893d7a
--- /dev/null
+++ b/types/preview/@ember/object/core.d.ts
@@ -0,0 +1,82 @@
+import type { EmberClassConstructor, Objectify } from './-private/types';
+import type Mixin from './mixin';
+
+export default class CoreObject {
+  /**
+   * As of Ember 3.1, CoreObject constructor takes initial object properties as an argument.
+   * See: https://github.com/emberjs/ember.js/commit/4709935854d4c29b0d2c054614d53fa2c55309b1
+   */
+  constructor(properties?: object);
+
+  _super(...args: any[]): any;
+
+  /**
+   * An overridable method called when objects are instantiated. By default,
+   * does nothing unless it is overridden during class definition.
+   */
+  init(): void;
+
+  /**
+   * Defines the properties that will be concatenated from the superclass (instead of overridden).
+   * @default null
+   */
+  concatenatedProperties: string[] | null;
+
+  /**
+   * Destroyed object property flag. If this property is true the observers and bindings were
+   * already removed by the effect of calling the destroy() method.
+   * @default false
+   */
+  isDestroyed: boolean;
+  /**
+   * Destruction scheduled flag. The destroy() method has been called. The object stays intact
+   * until the end of the run loop at which point the isDestroyed flag is set.
+   * @default false
+   */
+  isDestroying: boolean;
+
+  /**
+   * Destroys an object by setting the `isDestroyed` flag and removing its
+   * metadata, which effectively destroys observers and bindings.
+   * If you try to set a property on a destroyed object, an exception will be
+   * raised.
+   * Note that destruction is scheduled for the end of the run loop and does not
+   * happen immediately.  It will set an isDestroying flag immediately.
+   * @return receiver
+   */
+  destroy(): CoreObject;
+
+  /**
+   * Override to implement teardown.
+   */
+  willDestroy(): void;
+
+  /**
+   * Returns a string representation which attempts to provide more information than Javascript's toString
+   * typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
+   * @return string representation
+   */
+  toString(): string;
+
+  static create<Class extends typeof CoreObject>(
+    ...initialValues: Array<Mixin | Record<string, unknown>>
+  ): InstanceType<Class>;
+
+  static extend<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...mixins: Array<Mixin | Record<string, unknown>>
+  ): Objectify<Statics> & EmberClassConstructor<Instance>;
+
+  static reopen<Statics, Instance>(
+    this: Statics & EmberClassConstructor<Instance>,
+    ...mixins: Array<Mixin | Record<string, unknown>>
+  ): Objectify<Statics> & EmberClassConstructor<Instance>;
+
+  static reopenClass<Statics>(
+    this: Statics,
+    ...extraStatics: Array<Mixin | Record<string, unknown>>
+  ): Statics;
+
+  static isClass: boolean;
+  static isMethod: boolean;
+}
diff --git a/types/preview/@ember/object/evented.d.ts b/types/preview/@ember/object/evented.d.ts
new file mode 100644
index 00000000000..d888571eeed
--- /dev/null
+++ b/types/preview/@ember/object/evented.d.ts
@@ -0,0 +1,60 @@
+import Mixin from '@ember/object/mixin';
+import { AnyFn, EmberMethod, MethodNamesOf, MethodParams, MethodsOf } from 'ember/-private/type-utils';
+
+/**
+ * This mixin allows for Ember objects to subscribe to and emit events.
+ */
+interface Evented {
+    /**
+     * Subscribes to a named event with given function.
+     */
+    on<T>(
+        name: string,
+        target: T,
+        method: EmberMethod<T>
+    ): this;
+    on(name: string, method: EmberMethod<this>): this;
+    /**
+     * Subscribes a function to a named event and then cancels the subscription
+     * after the first time the event is triggered. It is good to use ``one`` when
+     * you only care about the first time an event has taken place.
+     */
+    one<T>(
+        name: string,
+        target: T,
+        method: EmberMethod<T>
+    ): this;
+    one(name: string, method: EmberMethod<this>): this;
+    /**
+     * Triggers a named event for the object. Any additional arguments
+     * will be passed as parameters to the functions that are subscribed to the
+     * event.
+     */
+    trigger(name: string, ...args: unknown[]): any;
+    /**
+     * Cancels subscription for given name, target, and method.
+     */
+    off<T>(
+        name: string,
+        target: T,
+        method: EmberMethod<T>
+    ): this;
+    off(name: string, method: EmberMethod<this>): this;
+    /**
+     * Checks to see if object has any subscriptions for named event.
+     */
+    has(name: string): boolean;
+}
+declare const Evented: Mixin<Evented>;
+export default Evented;
+
+/**
+ * Define a property as a function that should be executed when
+ * a specified event or events are triggered.
+ */
+export function on<F extends AnyFn>(
+    ...args: [
+        ...eventNames: string[],
+        func: F
+    ]
+): F;
diff --git a/types/preview/@ember/object/events.d.ts b/types/preview/@ember/object/events.d.ts
new file mode 100644
index 00000000000..04fd9b029ca
--- /dev/null
+++ b/types/preview/@ember/object/events.d.ts
@@ -0,0 +1,49 @@
+import { AnyFunction } from '@ember/object/-private/types';
+
+/**
+ * Add an event listener
+ */
+export function addListener<Context>(
+    obj: Context,
+    eventName: string,
+    target: unknown,
+    method: keyof Context | AnyFunction,
+    once?: boolean
+): void;
+export function addListener<Context>(
+    obj: Context,
+    eventName: string,
+    method: keyof Context | AnyFunction,
+    once?: boolean
+): void;
+
+/**
+ * Remove an event listener
+ */
+export function removeListener<Context>(
+    obj: Context,
+    eventName: string,
+    target: unknown,
+    method: keyof Context | AnyFunction
+): void;
+export function removeListener<Context>(
+    obj: Context,
+    eventName: string,
+    method: keyof Context | AnyFunction
+): void;
+
+/**
+ * Send an event. The execution of suspended listeners
+ * is skipped, and once listeners are removed. A listener without
+ * a target is executed on the passed object. If an array of actions
+ * is not passed, the actions stored on the passed object are invoked.
+ *
+ * @param eventName
+ * @param params Optional parameters for each listener.
+ * @returns if the event was delivered to one or more actions
+ */
+export function sendEvent(
+    obj: unknown,
+    eventName: string,
+    params?: unknown[],
+): boolean;
diff --git a/types/preview/@ember/object/index.d.ts b/types/preview/@ember/object/index.d.ts
new file mode 100644
index 00000000000..09348748992
--- /dev/null
+++ b/types/preview/@ember/object/index.d.ts
@@ -0,0 +1,116 @@
+import CoreObject from './core';
+import type Observable from './observable';
+import type ComputedProperty from './computed';
+import type { BasicComputedProperty } from './computed';
+import type { AnyFunction } from './-private/types';
+
+/**
+ * `Ember.Object` is the main base class for all Ember objects. It is a subclass
+ * of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
+ * see the documentation for each of these.
+ */
+export default class EmberObject extends CoreObject {}
+export default interface EmberObject extends Observable {}
+
+/**
+ * This helper returns a new property descriptor that wraps the passed computed
+ * property function. You can use this helper to define properties with native
+ * decorator syntax, mixins, or via `defineProperty()`.
+ *
+ * @param dependentKeys Optional dependent keys that trigger this computed
+ *   property.
+ */
+export function computed(...dependentKeys: string[]): ComputedProperty & MethodDecorator;
+
+export function computed(
+  ...args: [...dependentKeys: string[], callback: AnyFunction]
+): BasicComputedProperty;
+
+/**
+ * Specify a method that observes property changes.
+ */
+export function observer<Fn extends (target: any, key: string) => void>(
+  ...args: [...propertyNames: string[], func: Fn]
+): Fn;
+
+/**
+ * Gets the value of a property on an object. If the property is computed,
+ * the function will be invoked. If the property is not defined but the
+ * object implements the `unknownProperty` method then that will be invoked.
+ */
+export function get<T, K extends keyof T>(obj: T, key: K): T[K];
+export function get(obj: unknown, key: string): unknown;
+
+/**
+ * Sets the value of a property on an object, respecting computed properties
+ * and notifying observers and other listeners of the change. If the
+ * property is not defined but the object implements the `setUnknownProperty`
+ * method then that will be invoked as well.
+ */
+export function set<T, K extends keyof T>(obj: T, key: K, value: T[K]): T[K];
+
+/**
+ * To get multiple properties at once, call `getProperties` with an object
+ * followed by a list of strings or an array.
+ */
+export function getProperties<T, K extends keyof T>(obj: T, list: K[]): Pick<T, K>;
+export function getProperties<T, K extends keyof T>(obj: T, ...list: K[]): Pick<T, K>;
+
+/**
+ * Set a list of properties on an object. These properties are set inside
+ * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+ * observers will be buffered.
+ */
+export function setProperties<T, K extends keyof T>(obj: T, hash: Pick<T, K>): Pick<T, K>;
+
+/**
+ * Error-tolerant form of `Ember.set`. Will not blow up if any part of the
+ * chain is `undefined`, `null`, or destroyed.
+ */
+export function trySet(root: object, path: string, value: unknown): unknown;
+
+/**
+ * NOTE: This is a low-level method used by other parts of the API. You almost
+ * never want to call this method directly. Instead you should use mixin() to
+ * define new properties.
+ *
+ * @param obj the object to define this property on. This may be a prototype.
+ * @param keyName the name of the property
+ * @param desc an instance of `Descriptor` (typically a computed property) or an
+ *   ES5 descriptor. You must provide this or `data` but not both.
+ * @param meta Normally this method takes only three parameters. However if you
+ *   pass an instance of Descriptor as the third param then you can pass an
+ *   optional value as the fourth parameter. This is often more efficient than
+ *   creating new descriptor hashes for each property.
+ */
+export function defineProperty(
+  obj: object,
+  keyName: string,
+  desc: PropertyDescriptor | ComputedProperty,
+  meta?: unknown
+): void;
+
+/**
+ * NOTE: This is a low-level method used by other parts of the API. You almost
+ * never want to call this method directly. Instead you should use mixin() to
+ * define new properties.
+ *
+ * @param obj the object to define this property on. This may be a prototype.
+ * @param keyName the name of the property
+ * @param desc an instance of `Descriptor` (typically a computed property) or an
+ *   ES5 descriptor. You must provide this or `data` but not both.
+ * @param data something other than a descriptor, that will become the explicit
+ *   value of this property.
+ */
+export function defineProperty(obj: object, keyName: string, desc: undefined, data: unknown): void;
+
+export function notifyPropertyChange(obj: object, keyName: string): void;
+
+export const action: MethodDecorator;
+
+declare module '@ember/utils/-private/types' {
+  interface TypeLookup {
+    class: typeof EmberObject;
+    instance: EmberObject;
+  }
+}
diff --git a/types/preview/@ember/object/internals.d.ts b/types/preview/@ember/object/internals.d.ts
new file mode 100644
index 00000000000..bb9ccc5be99
--- /dev/null
+++ b/types/preview/@ember/object/internals.d.ts
@@ -0,0 +1,15 @@
+/**
+ * Returns the cached value for a property, if one exists.
+ * This can be useful for peeking at the value of a computed
+ * property that is generated lazily, without accidentally causing
+ * it to be created.
+ */
+export function cacheFor<T, K extends keyof T>(obj: T, key: K): T[K] | undefined;
+
+/**
+ * Returns a unique id for the object. If the object does not yet have a guid,
+ * one will be assigned to it. You can call this on any object,
+ * `Ember.Object`-based or not, but be aware that it will add a `_guid`
+ * property.
+ */
+export function guidFor(obj: unknown): string;
diff --git a/types/preview/@ember/object/mixin.d.ts b/types/preview/@ember/object/mixin.d.ts
new file mode 100644
index 00000000000..4ddb16700f7
--- /dev/null
+++ b/types/preview/@ember/object/mixin.d.ts
@@ -0,0 +1,17 @@
+declare const __ember_mixin__: unique symbol;
+
+/**
+ * The `Ember.Mixin` class allows you to create mixins, whose properties can be
+ * added to other classes.
+ */
+export default class Mixin {
+  /**
+   * Mixin needs to have *something* on its prototype, otherwise it's treated
+   * like an empty interface. It cannot be private, sadly. We can use this to
+   * carry around the types of the mixin so they don't get lost, though, so
+   * that's... something?
+   */
+  [__ember_mixin__]: never;
+
+  static create(...args: Array<Record<string, unknown> | Mixin>): Mixin;
+}
diff --git a/types/preview/@ember/object/observable.d.ts b/types/preview/@ember/object/observable.d.ts
new file mode 100644
index 00000000000..bffceba42cb
--- /dev/null
+++ b/types/preview/@ember/object/observable.d.ts
@@ -0,0 +1,78 @@
+import { ObserverMethod } from './-private/types';
+import Mixin from './mixin';
+import CoreObject from './core';
+
+/**
+ * This mixin provides properties and property observing functionality, core features of the Ember object model.
+ */
+interface Observable {
+  /**
+   * Retrieves the value of a property from the object.
+   */
+  get<K extends keyof this>(key: K): this[K];
+  /**
+   * To get the values of multiple properties at once, call `getProperties`
+   * with a list of strings or an array:
+   */
+  getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
+  getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
+  /**
+   * Sets the provided key or path to the value.
+   */
+  set<K extends keyof this>(key: K, value: this[K]): this[K];
+  set<T>(key: keyof this, value: T): T;
+  /**
+   * Sets a list of properties at once. These properties are set inside
+   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+   * observers will be buffered.
+   */
+  setProperties<K extends keyof this>(hash: Pick<this, K>): Pick<this, K>;
+  setProperties<K extends keyof this>(hash: Record<K, unknown>): Pick<this, K>;
+  /**
+   * Notify the observer system that a property has just changed.
+   *
+   * Sometimes you need to change a value directly or indirectly without
+   * actually calling `get()` or `set()` on it. In this case, you can use this
+   * method instead. Calling this method will notify all observers that the
+   * property has potentially changed value.
+   */
+  notifyPropertyChange(keyName: string): this;
+  /**
+   * Adds an observer on a property.
+   */
+  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
+  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  /**
+   * Remove an observer you have previously registered on this object. Pass
+   * the same key, target, and method you passed to `addObserver()` and your
+   * target will no longer receive notifications.
+   */
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method: ObserverMethod<Target, this>
+  ): this;
+  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+  /**
+   * Set the value of a property to the current value plus some amount.
+   */
+  incrementProperty(keyName: keyof this, increment?: number): number;
+  /**
+   * Set the value of a property to the current value minus some amount.
+   */
+  decrementProperty(keyName: keyof this, decrement?: number): number;
+  /**
+   * Set the value of a boolean property to the opposite of its
+   * current value.
+   */
+  toggleProperty(keyName: keyof this): boolean;
+  /**
+   * Returns the cached value of a computed property, if it exists.
+   * This allows you to inspect the value of a computed property
+   * without accidentally invoking it if it is intended to be
+   * generated lazily.
+   */
+  cacheFor<K extends keyof this>(key: K): this[K] | undefined;
+}
+declare const Observable: Mixin<Observable, CoreObject>;
+export default Observable;
diff --git a/types/preview/@ember/object/observers.d.ts b/types/preview/@ember/object/observers.d.ts
new file mode 100644
index 00000000000..f1decdb96fe
--- /dev/null
+++ b/types/preview/@ember/object/observers.d.ts
@@ -0,0 +1,32 @@
+import { ObserverMethod } from "@ember/object/-private/types";
+
+/**
+ * Adds an observer on a property.
+ */
+export function addObserver<Context, Target>(
+    obj: Context,
+    key: keyof Context,
+    target: Target,
+    method: ObserverMethod<Target, Context>
+): void;
+export function addObserver<Context>(
+    obj: Context,
+    key: keyof Context,
+    method: ObserverMethod<Context, Context>
+): void;
+/**
+ * Remove an observer you have previously registered on this object. Pass
+ * the same key, target, and method you passed to `addObserver()` and your
+ * target will no longer receive notifications.
+ */
+export function removeObserver<Context, Target>(
+    obj: Context,
+    key: keyof Context,
+    target: Target,
+    method: ObserverMethod<Target, Context>
+): any;
+export function removeObserver<Context>(
+    obj: Context,
+    key: keyof Context,
+    method: ObserverMethod<Context, Context>
+): any;
diff --git a/types/preview/@ember/object/promise-proxy-mixin.d.ts b/types/preview/@ember/object/promise-proxy-mixin.d.ts
new file mode 100644
index 00000000000..c23f8e75494
--- /dev/null
+++ b/types/preview/@ember/object/promise-proxy-mixin.d.ts
@@ -0,0 +1,35 @@
+import Mixin from "@ember/object/mixin";
+import RSVP from "rsvp";
+
+/**
+ * A low level mixin making ObjectProxy promise-aware.
+ */
+interface PromiseProxyMixin<T> extends RSVP.Promise<T> {
+    /**
+     * If the proxied promise is rejected this will contain the reason
+     * provided.
+     */
+    reason: unknown;
+    /**
+     * Once the proxied promise has settled this will become `false`.
+     */
+    isPending: boolean;
+    /**
+     * Once the proxied promise has settled this will become `true`.
+     */
+    isSettled: boolean;
+    /**
+     * Will become `true` if the proxied promise is rejected.
+     */
+    isRejected: boolean;
+    /**
+     * Will become `true` if the proxied promise is fulfilled.
+     */
+    isFulfilled: boolean;
+    /**
+     * The promise whose fulfillment value is being proxied by this object.
+     */
+    promise: RSVP.Promise<T>;
+}
+declare const PromiseProxyMixin: Mixin<PromiseProxyMixin<any>>;
+export default PromiseProxyMixin;
diff --git a/types/preview/@ember/object/proxy.d.ts b/types/preview/@ember/object/proxy.d.ts
new file mode 100644
index 00000000000..266b34d3c81
--- /dev/null
+++ b/types/preview/@ember/object/proxy.d.ts
@@ -0,0 +1,25 @@
+import EmberObject from './index';
+
+/**
+ * `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
+ * to a proxied `content` object.
+ */
+export default class ObjectProxy<T extends object = object> extends EmberObject {
+  /**
+   * The object whose properties will be forwarded.
+   */
+  content: T | undefined;
+
+  get<K extends keyof this>(key: K): this[K];
+  get<K extends keyof T>(key: K): T[K] | undefined;
+
+  getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
+  getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
+  getProperties<K extends keyof T>(list: K[]): Pick<Partial<T>, K>;
+  getProperties<K extends keyof T>(...list: K[]): Pick<Partial<T>, K>;
+
+  set<K extends keyof this>(key: K, value: this[K]): this[K];
+  set<K extends keyof T>(key: K, value: T[K]): T[K];
+
+  setProperties<K extends keyof this | keyof T>(hash: Pick<this & T, K>): Pick<this & T, K>;
+}
diff --git a/types/preview/@ember/object/test/access-modifier.ts b/types/preview/@ember/object/test/access-modifier.ts
new file mode 100644
index 00000000000..3551a20dd36
--- /dev/null
+++ b/types/preview/@ember/object/test/access-modifier.ts
@@ -0,0 +1,29 @@
+import { assertType } from './lib/assert';
+import EmberObject from '@ember/object';
+
+class Foo extends EmberObject {
+    hello() {
+        return 'world';
+    }
+    protected bar() {
+        return 'bar';
+    }
+    private baz() {
+        return 'baz';
+    }
+}
+const f = new Foo();
+assertType<string>(f.hello());
+// @ts-expect-error
+assertType<string>(f.bar());
+// @ts-expect-error
+assertType<string>(f.baz());
+
+// TODO: enable after TS 3.0 https://github.com/typed-ember/ember-cli-typescript/issues/291
+// class Foo2 extends EmberObject.extend({
+//     bar: ''
+// }) {
+//     hello() { return 'world'; }
+//     protected bar() { return 'bar'; } // @ts-expect-error
+//     private baz() { return 'baz'; }
+// }
diff --git a/types/preview/@ember/object/test/compat.ts b/types/preview/@ember/object/test/compat.ts
new file mode 100644
index 00000000000..f661c37529a
--- /dev/null
+++ b/types/preview/@ember/object/test/compat.ts
@@ -0,0 +1,12 @@
+import { dependentKeyCompat } from '@ember/object/compat';
+
+// Example (without irrelevant details) from https://api.emberjs.com/ember/3.18/functions/@ember%2Fobject%2Fcompat/dependentKeyCompat
+class Person {
+    declare firstName: string;
+    declare lastName: string;
+
+    @dependentKeyCompat
+    get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+}
diff --git a/types/preview/@ember/object/test/computed.ts b/types/preview/@ember/object/test/computed.ts
new file mode 100644
index 00000000000..fa99c5ede92
--- /dev/null
+++ b/types/preview/@ember/object/test/computed.ts
@@ -0,0 +1,231 @@
+import EmberObject, { computed } from '@ember/object';
+import ComputedProperty, {
+    alias,
+    or,
+    and,
+    filter,
+    equal,
+    empty,
+    filterBy,
+    notEmpty,
+    none,
+    not,
+    min,
+    max,
+    gt,
+    gte,
+    lt,
+    lte,
+    readOnly,
+    reads,
+    setDiff,
+    sort,
+    intersect,
+    mapBy,
+    match,
+    map,
+    oneWay,
+    sum,
+    union,
+    uniqBy,
+    uniq,
+    deprecatingAlias,
+    bool,
+    collect,
+} from '@ember/object/computed';
+import { assertType } from './lib/assert';
+
+const Person = EmberObject.extend({
+    firstName: '',
+    lastName: '',
+    age: 0,
+
+    noArgs: computed<string>(() => 'test'),
+
+    fullName: computed<string>('firstName', 'lastName', function () {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }),
+
+    fullNameReadonly: computed<string>('fullName', function () {
+        return this.get('fullName');
+    }).readOnly(),
+
+    fullNameWritable: computed<string>('firstName', 'lastName', {
+        get() {
+            return this.get('fullName');
+        },
+        set(key, value) {
+            const [first, last] = value.split(' ');
+            this.set('firstName', first);
+            this.set('lastName', last);
+            return value;
+        },
+    }),
+
+    fullNameGetOnly: computed<string>('fullName', {
+        get() {
+            return this.get('fullName');
+        },
+    }),
+
+    fullNameSetOnly: computed<string>('firstName', 'lastName', {
+        set(key, value) {
+            const [first, last] = value.split(' ');
+            this.set('firstName', first);
+            this.set('lastName', last);
+            return value;
+        },
+    }),
+
+    combinators: computed<string>(function () {
+        return this.get('firstName');
+    })
+        .property('firstName')
+        .meta({ foo: 'bar' })
+        .volatile()
+        .readOnly(),
+
+    explicitlyDeclared: alias('fullName') as ComputedProperty<string>,
+});
+
+const person = Person.create({
+    firstName: 'Fred',
+    lastName: 'Smith',
+    age: 29,
+});
+
+assertType<string>(person.firstName);
+assertType<number>(person.age);
+assertType<ComputedProperty<string>>(person.noArgs);
+assertType<ComputedProperty<string>>(person.fullName);
+assertType<ComputedProperty<string>>(person.fullNameReadonly);
+assertType<ComputedProperty<string>>(person.fullNameWritable);
+assertType<ComputedProperty<string>>(person.fullNameGetOnly);
+assertType<ComputedProperty<string>>(person.fullNameSetOnly);
+assertType<ComputedProperty<string>>(person.combinators);
+assertType<ComputedProperty<string>>(person.explicitlyDeclared);
+
+assertType<string>(person.get('firstName'));
+assertType<number>(person.get('age'));
+assertType<string>(person.get('noArgs'));
+assertType<string>(person.get('fullName'));
+assertType<string>(person.get('fullNameReadonly'));
+assertType<string>(person.get('fullNameWritable'));
+assertType<string>(person.get('fullNameGetOnly'));
+assertType<string>(person.get('fullNameSetOnly'));
+assertType<string>(person.get('combinators'));
+assertType<string>(person.get('explicitlyDeclared'));
+
+assertType<{ firstName: string; fullName: string; age: number }>(person.getProperties('firstName', 'fullName', 'age'));
+
+const person2 = Person.create({
+    fullName: 'Fred Smith',
+});
+
+assertType<string>(person2.get('firstName'));
+assertType<string>(person2.get('fullName'));
+
+const person3 = Person.extend({
+    firstName: 'Fred',
+    fullName: 'Fred Smith',
+}).create();
+
+assertType<string>(person3.get('firstName'));
+assertType<string>(person3.get('fullName'));
+
+const person4 = Person.extend({
+    firstName: computed(() => 'Fred'),
+    fullName: computed(() => 'Fred Smith'),
+}).create();
+
+assertType<string>(person4.get('firstName'));
+assertType<string>(person4.get('fullName'));
+
+// computed property macros
+const objectWithComputedProperties = EmberObject.extend({
+    alias: alias('foo'),
+    and: and('foo', 'bar', 'baz', 'qux'),
+    bool: bool('foo'),
+    collect: collect('foo', 'bar', 'baz', 'qux'),
+    deprecatingAlias: deprecatingAlias('foo', {
+        id: 'hamster.deprecate-banana',
+        until: '3.0.0',
+    }),
+    empty: empty('foo'),
+    equalNumber: equal('foo', 1),
+    equalString: equal('foo', 'bar'),
+    equalObject: equal('foo', {}),
+    filter1: filter('foo', item => item === 'bar'),
+    filter2: filter('foo', ['bar', 'baz'], item => item === 'bar'),
+    filterBy1: filterBy('foo', 'bar'),
+    filterBy2: filterBy('foo', 'bar', false),
+    gt: gt('foo', 3),
+    gte: gte('foo', 3),
+    intersect: intersect('foo', 'bar', 'baz', 'qux'),
+    lt: lt('foo', 3),
+    lte: lte('foo', 3),
+    map: map('foo', (item, index) => item),
+    mapBy: mapBy('foo', 'bar'),
+    match: match('foo', /^tom.ter$/),
+    max: max('foo'),
+    min: min('foo'),
+    none: none('foo'),
+    not: not('foo'),
+    notEmpty: notEmpty('foo'),
+    oneWay: oneWay('foo'),
+    or: or('foo', 'bar', 'baz', 'qux'),
+    readOnly: readOnly('foo'),
+    reads: reads('foo'),
+    setDiff: setDiff('foo', 'bar'),
+    sort1: sort('foo', 'bar'),
+    sort2: sort('foo', (itemA, itemB) => {
+      return `${itemA}`.length - `${itemB}`.length;
+    }),
+    sort3: sort('foo', ['bar', 'baz'], (itemA, itemB) => {
+      return `${itemA}`.length - `${itemB}`.length;
+    }),
+
+    sum: sum('foo'),
+    union: union('foo', 'bar', 'baz', 'qux'),
+    uniq: uniq('foo'),
+    uniqBy: uniqBy('foo', 'bar'),
+}).create();
+
+assertType<unknown>(objectWithComputedProperties.get('alias'));
+assertType<unknown>(objectWithComputedProperties.get('and'));
+assertType<boolean>(objectWithComputedProperties.get('bool'));
+assertType<unknown[]>(objectWithComputedProperties.get('collect'));
+assertType<unknown>(objectWithComputedProperties.get('deprecatingAlias'));
+assertType<boolean>(objectWithComputedProperties.get('empty'));
+assertType<boolean>(objectWithComputedProperties.get('equalNumber'));
+assertType<boolean>(objectWithComputedProperties.get('equalString'));
+assertType<boolean>(objectWithComputedProperties.get('equalObject'));
+assertType<unknown[]>(objectWithComputedProperties.get('filter1'));
+assertType<unknown[]>(objectWithComputedProperties.get('filter2'));
+assertType<unknown[]>(objectWithComputedProperties.get('filterBy1'));
+assertType<unknown[]>(objectWithComputedProperties.get('filterBy2'));
+assertType<boolean>(objectWithComputedProperties.get('gt'));
+assertType<boolean>(objectWithComputedProperties.get('gte'));
+assertType<unknown[]>(objectWithComputedProperties.get('intersect'));
+assertType<boolean>(objectWithComputedProperties.get('lt'));
+assertType<boolean>(objectWithComputedProperties.get('lte'));
+assertType<unknown[]>(objectWithComputedProperties.get('map'));
+assertType<unknown[]>(objectWithComputedProperties.get('mapBy'));
+assertType<boolean>(objectWithComputedProperties.get('match'));
+assertType<number>(objectWithComputedProperties.get('max'));
+assertType<number>(objectWithComputedProperties.get('min'));
+assertType<boolean>(objectWithComputedProperties.get('none'));
+assertType<boolean>(objectWithComputedProperties.get('not'));
+assertType<boolean>(objectWithComputedProperties.get('notEmpty'));
+assertType<unknown>(objectWithComputedProperties.get('oneWay'));
+assertType<unknown>(objectWithComputedProperties.get('or'));
+assertType<unknown>(objectWithComputedProperties.get('readOnly'));
+assertType<unknown>(objectWithComputedProperties.get('reads'));
+assertType<unknown[]>(objectWithComputedProperties.get('setDiff'));
+assertType<unknown[]>(objectWithComputedProperties.get('sort1'));
+assertType<unknown[]>(objectWithComputedProperties.get('sort2'));
+assertType<unknown[]>(objectWithComputedProperties.get('sort3'));
+assertType<number>(objectWithComputedProperties.get('sum'));
+assertType<unknown[]>(objectWithComputedProperties.get('union'));
+assertType<unknown[]>(objectWithComputedProperties.get('uniq'));
+assertType<unknown[]>(objectWithComputedProperties.get('uniqBy'));
diff --git a/types/preview/@ember/object/test/core.ts b/types/preview/@ember/object/test/core.ts
new file mode 100644
index 00000000000..650e2c22066
--- /dev/null
+++ b/types/preview/@ember/object/test/core.ts
@@ -0,0 +1,218 @@
+import { assertType } from './lib/assert';
+import CoreObject from '@ember/object/core';
+
+/** Newable tests */
+const co1 = new CoreObject();
+
+// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// co1.concatenatedProperties; // $ExpectType string[]
+co1.isDestroyed; // $ExpectType boolean
+co1.isDestroying; // $ExpectType boolean
+co1.destroy(); // $ExpectType CoreObject
+co1.toString(); // $ExpectType string
+
+/** .create tests */
+const co2 = CoreObject.create();
+// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// co2.concatenatedProperties; // $ExpectType string[]
+co2.isDestroyed; // $ExpectType boolean
+co2.isDestroying; // $ExpectType boolean
+co2.destroy(); // $ExpectType CoreObject
+co2.toString(); // $ExpectType string
+
+/** .create tests w/ initial instance data passed in */
+const co3 = CoreObject.create({ foo: '123', bar: 456 });
+
+co3.foo; // $ExpectType string
+co3.bar; // $ExpectType number
+
+/** .extend with a zero-argument .create()  */
+const co4 = CoreObject.extend({
+    foo: '123',
+    bar: 456,
+    baz(): [string, number] {
+        return [this.foo, this.bar];
+    },
+}).create();
+
+co4.foo; // $ExpectType string
+co4.bar; // $ExpectType number
+co4.baz; // $ExpectType () => [string, number]
+
+/** .extend with inconsistent arguments passed into .create()  */
+const class05 = CoreObject.extend({
+    foo: '123' as string | boolean,
+    bar: 456,
+    baz() {
+        return [this.foo, this.bar];
+    },
+});
+// @ts-expect-error
+const c05 = class05.create({ foo: 99 });
+const c05b = class05.create({ foo: true });
+const c05c = class05.create({ foo: 'abc' });
+// @ts-expect-error
+assertType<string>(c05b.foo);
+// @ts-expect-error
+assertType<boolean>(c05c.foo);
+
+/** two .extend arguments with a zero-argument .create() */
+const co6 = CoreObject.extend(
+    {
+        foo: '123',
+        bar: 456,
+        baz() {
+            return [this.foo, this.bar];
+        },
+        func1() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.foo; // $ExpectType string
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.bee;
+        },
+    },
+    {
+        foo: 99,
+        bee: 'honey',
+        func2() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+            this.foo;
+            // this includes stuff from earlier extend-args
+            this.bar; // $ExpectType number
+        },
+    },
+).create();
+
+// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// assertType<string>(co6.foo); // @ts-expect-error
+assertType<number>(co6.bar); // $ExpectType number
+assertType<() => Array<string | number>>(co6.baz); // $ExpectType () => (string | number)[]
+
+/** three .extend arguments with a zero-argument .create() */
+const co7 = CoreObject.extend(
+    {
+        foo: '123',
+        bar: 456,
+        baz() {
+            return [this.foo, this.bar];
+        },
+        func1() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.foo; // $ExpectType string
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.bee;
+        },
+    },
+    {
+        foo: 99,
+        bee: 'honey',
+        func2() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+            this.foo;
+            // this includes stuff from earlier extend-args
+            this.bar; // $ExpectType number
+        },
+    },
+    {
+        foo: '99',
+        money: 'in the banana stand',
+        func3() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.money; // $ExpectType string
+            // this includes stuff from earlier extend-args
+            this.bee; // $ExpectType string
+            this.bar; // $ExpectType number
+        },
+    },
+).create();
+// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// assertType<number>(co7.foo); // @ts-expect-error
+assertType<number>(co7.bar); // $ExpectType number
+assertType<string>(co7.money); // $ExpectType string
+assertType<() => Array<string | number>>(co7.baz); // $ExpectType () => (string | number)[]
+
+/** four .extend arguments with a zero-argument .create() */
+const co8 = CoreObject.extend(
+    {
+        foo: '123',
+        bar: 456,
+        baz() {
+            return [this.foo, this.bar];
+        },
+        func1() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.foo; // $ExpectType string
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.bee;
+        },
+    },
+    {
+        foo: 99,
+        bee: 'honey',
+        func2() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+            this.foo;
+            // this includes stuff from earlier extend-args
+            this.bar; // $ExpectType number
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.money;
+        },
+    },
+    {
+        foo: '99',
+        money: 'in the banana stand',
+        func3() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.money; // $ExpectType string
+            // this includes stuff from earlier extend-args
+            this.bee; // $ExpectType string
+            this.bar; // $ExpectType number
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.neighborhood;
+        },
+    },
+    {
+        foo: '99',
+        neighborhood: 'sudden valley',
+        func4() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.neighborhood; // $ExpectType string
+            // this includes stuff from earlier extend-args
+            this.bee; // $ExpectType string
+            this.bar; // $ExpectType number
+            this.money; // $ExpectType string
+        },
+    },
+).create();
+
+// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// assertType<number>(co8.foo); // @ts-expect-error
+assertType<number>(co8.bar); // $ExpectType number
+assertType<string>(co8.money); // $ExpectType string
+assertType<() => Array<string | number>>(co8.baz); // $ExpectType () => (string | number)[]
diff --git a/types/preview/@ember/object/test/create-negative.ts b/types/preview/@ember/object/test/create-negative.ts
new file mode 100644
index 00000000000..e1e01ff9a13
--- /dev/null
+++ b/types/preview/@ember/object/test/create-negative.ts
@@ -0,0 +1,11 @@
+import { assertType } from './lib/assert';
+import { PersonWithNumberName, Person } from './create';
+
+// @ts-expect-error
+Person.create({ firstName: 99 });
+// @ts-expect-error
+Person.create({}, { firstName: 99 });
+// @ts-expect-error
+Person.create({}, {}, { firstName: 99 });
+
+const p4 = new PersonWithNumberName();
diff --git a/types/preview/@ember/object/test/create.ts b/types/preview/@ember/object/test/create.ts
new file mode 100644
index 00000000000..a508679fa12
--- /dev/null
+++ b/types/preview/@ember/object/test/create.ts
@@ -0,0 +1,54 @@
+import { assertType } from './lib/assert';
+import EmberObject, { computed } from '@ember/object';
+import ComputedProperty from '@ember/object/computed';
+
+/**
+ * Zero-argument case
+ */
+const o = EmberObject.create();
+// create returns an object
+assertType<object>(o);
+// object returned by create type-checks as an instance of Ember.Object
+assertType<boolean>(o.isDestroyed); // from instance
+assertType<boolean>(o.isDestroying); // from instance
+assertType<(key: keyof EmberObject) => any>(o.get); // from prototype
+
+/**
+ * One-argument case
+ */
+const o1 = EmberObject.create({ x: 9, y: 'hello', z: false });
+assertType<number>(o1.x);
+assertType<string>(o1.y);
+o1.y; // $ExpectType string
+o1.z; // $ExpectType boolean
+
+const obj = EmberObject.create({ a: 1 }, { b: 2 }, { c: 3 });
+assertType<number>(obj.b);
+assertType<number>(obj.a);
+assertType<number>(obj.c);
+
+export class Person extends EmberObject {
+    fullName = computed('firstName', 'lastName', function () {
+        return [this.firstName + this.lastName].join(' ');
+    });
+    declare firstName: string;
+    declare lastName: string;
+    declare age: number;
+}
+const p = new Person();
+
+assertType<string>(p.firstName);
+assertType<ComputedProperty<string>>(p.fullName);
+assertType<string>(p.get('fullName'));
+
+const p2 = Person.create({ firstName: 'string' });
+const p2b = Person.create({}, { firstName: 'string' });
+const p2c = Person.create({}, {}, { firstName: 'string' });
+
+export class PersonWithNumberName extends Person.extend({
+    fullName: 6,
+}) {}
+
+const p4 = new PersonWithNumberName();
+assertType<string>(p4.firstName);
+assertType<number>(p4.fullName);
diff --git a/types/preview/@ember/object/test/event.ts b/types/preview/@ember/object/test/event.ts
new file mode 100644
index 00000000000..386735b5098
--- /dev/null
+++ b/types/preview/@ember/object/test/event.ts
@@ -0,0 +1,92 @@
+import EmberObject, { observer } from '@ember/object';
+import { sendEvent, addListener, removeListener } from '@ember/object/events';
+import Evented, { on } from '@ember/object/evented';
+
+function testOn() {
+    const Job = EmberObject.extend({
+        logStartOrUpdate: on('started', 'updated', () => {
+            console.log('Job updated!');
+        }),
+        logCompleted: on('completed', () => {
+            console.log('Job completed!');
+        }),
+    });
+
+    const job = Job.create();
+
+    sendEvent(job, 'started'); // Logs 'Job started!'
+    sendEvent(job, 'updated'); // Logs 'Job updated!'
+    sendEvent(job, 'completed'); // Logs 'Job completed!'
+}
+
+function testEvented() {
+    const Person = EmberObject.extend(Evented, {
+        greet() {
+            this.trigger('greet');
+        },
+    });
+
+    const person = Person.create();
+
+    person.on('potato', 'greet');
+
+    const target = {
+        hi() {
+            console.log('Hello!');
+        },
+    };
+
+    person.on('greet', () => {
+        console.log('Our person has greeted');
+    });
+
+    person
+        .on('greet', () => {
+            console.log('Our person has greeted');
+        })
+        .one('greet', () => {
+            console.log('Offer one-time special');
+        })
+        .off('event', {}, () => {});
+
+    person.on('greet', target, 'hi').one('greet', target, 'hi').off('event', target, 'hi');
+
+    person.on('greet', target, target.hi).one('greet', target, target.hi).off('event', target, target.hi);
+
+    person.greet();
+}
+
+function testObserver() {
+    EmberObject.extend({
+        // TODO: enable after https://github.com/typed-ember/ember-cli-typescript/issues/290
+        // valueObserver: observer('value', () => {
+        //     // Executes whenever the "value" property changes
+        // })
+    });
+}
+
+function testListener() {
+    function willDestroyListener() {}
+
+    EmberObject.extend({
+        init() {
+            addListener(this, 'willDestroy', this, 'willDestroyListener');
+            addListener(this, 'willDestroy', this, 'willDestroyListener', true);
+            addListener(this, 'willDestroy', this, willDestroyListener);
+            addListener(this, 'willDestroy', this, willDestroyListener, true);
+            removeListener(this, 'willDestroy', this, 'willDestroyListener');
+            removeListener(this, 'willDestroy', this, willDestroyListener);
+
+            addListener(this, 'willDestroy', 'willDestroyListener');
+            addListener(this, 'willDestroy', 'willDestroyListener', true);
+            addListener(this, 'willDestroy', willDestroyListener);
+            addListener(this, 'willDestroy', willDestroyListener, true);
+            removeListener(this, 'willDestroy', 'willDestroyListener');
+            removeListener(this, 'willDestroy', willDestroyListener);
+        },
+
+        willDestroyListener() {
+            willDestroyListener();
+        },
+    });
+}
diff --git a/types/preview/@ember/object/test/extend.ts b/types/preview/@ember/object/test/extend.ts
new file mode 100644
index 00000000000..c70d2e24b18
--- /dev/null
+++ b/types/preview/@ember/object/test/extend.ts
@@ -0,0 +1,61 @@
+import EmberObject from '@ember/object';
+import { assertType } from './lib/assert';
+
+const Person = EmberObject.extend({
+    firstName: '',
+    lastName: '',
+
+    getFullName() {
+        return `${this.firstName} ${this.lastName}`;
+    },
+    getFullName2(): string {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    },
+});
+
+assertType<string>(Person.prototype.firstName);
+assertType<() => string>(Person.prototype.getFullName);
+
+const person = Person.create({
+    firstName: 'Joe',
+    lastName: 'Blow',
+    extra: 42,
+});
+
+assertType<string>(person.getFullName());
+assertType<number>(person.extra);
+
+class ES6Person extends EmberObject {
+    declare firstName: string;
+    declare lastName: string;
+
+    get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+    get fullName2(): string {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }
+}
+
+assertType<string>(ES6Person.prototype.firstName);
+assertType<string>(ES6Person.prototype.fullName);
+
+const es6Person = ES6Person.create({
+    firstName: 'Joe',
+    lastName: 'Blow',
+    extra: 42,
+});
+
+assertType<string>(es6Person.fullName);
+assertType<number>(es6Person.extra);
+
+class PersonWithStatics extends EmberObject {
+    static isPerson = true;
+}
+const PersonWithStatics2 = PersonWithStatics.extend({});
+class PersonWithStatics3 extends PersonWithStatics {}
+class PersonWithStatics4 extends PersonWithStatics2 {}
+assertType<boolean>(PersonWithStatics.isPerson);
+assertType<boolean>(PersonWithStatics2.isPerson);
+assertType<boolean>(PersonWithStatics3.isPerson);
+assertType<boolean>(PersonWithStatics4.isPerson);
diff --git a/types/preview/@ember/object/test/get-set.ts b/types/preview/@ember/object/test/get-set.ts
new file mode 100644
index 00000000000..86c801e7b63
--- /dev/null
+++ b/types/preview/@ember/object/test/get-set.ts
@@ -0,0 +1,14 @@
+import { get, set } from '@ember/object';
+
+const basicPojo = { greeting: 'hello' };
+
+get(basicPojo, 'greeting'); // $ExpectType string
+get(basicPojo, 'salutation'); // $ExpectType unknown
+set(basicPojo, 'greeting', 'ahoy'); // $ExpectType string
+// @ts-expect-error
+set(basicPojo, 'salutation', 'heyo');
+
+declare let whoKnows: unknown;
+get(whoKnows, 'any-string'); // $ExpectType unknown
+// @ts-expect-error
+set(whoKnows, 'any-string', 123);
diff --git a/types/preview/@ember/object/test/internals.ts b/types/preview/@ember/object/test/internals.ts
new file mode 100644
index 00000000000..fcfb55c2bcb
--- /dev/null
+++ b/types/preview/@ember/object/test/internals.ts
@@ -0,0 +1,10 @@
+import { guidFor } from '@ember/object/internals';
+
+// $ExpectType string
+const strGuid = guidFor('a string');
+// $ExpectType string
+const numGuid = guidFor(123);
+// $ExpectType string
+const objGuid = guidFor({ hello: 'world' });
+// $ExpectType string
+const arrGuid = guidFor([1, 2, 3]);
diff --git a/types/preview/@ember/object/test/lib/assert.ts b/types/preview/@ember/object/test/lib/assert.ts
new file mode 100644
index 00000000000..dad227ab5e9
--- /dev/null
+++ b/types/preview/@ember/object/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/object/test/object.ts b/types/preview/@ember/object/test/object.ts
new file mode 100644
index 00000000000..703ab737616
--- /dev/null
+++ b/types/preview/@ember/object/test/object.ts
@@ -0,0 +1,102 @@
+import EmberObject, { computed, notifyPropertyChange } from '@ember/object';
+
+const LifetimeHooks = EmberObject.extend({
+    resource: undefined as {} | undefined,
+
+    init() {
+        this._super();
+        this.resource = {};
+    },
+
+    willDestroy() {
+        this.resource = undefined;
+        this._super();
+    },
+});
+
+class MyObject30 extends EmberObject {
+    constructor() {
+        super();
+    }
+}
+
+class MyObject31 extends EmberObject {
+    constructor(properties: object) {
+        super(properties);
+    }
+}
+
+class Foo extends EmberObject {
+    a = computed({
+        get() {
+            return '';
+        },
+        set(key: string, newVal: string) {
+            return '';
+        },
+    });
+    b = 5;
+    c = computed({
+        get() {
+            return '';
+        },
+        set(key: string, newVal: string | number) {
+            return '';
+        }
+    });
+    baz() {
+        const x = this.a; // $ExpectType ComputedProperty<string, string>
+        const y = this.b; // $ExpectType number
+        const z = this.c; // $ExpectType ComputedProperty<string, string | number>
+        this.b = 10;
+        this.get('b').toFixed(4); // $ExpectType string
+        this.set('a', 'abc').split(','); // $ExpectType string[]
+        this.set('b', 10).toFixed(4); // $ExpectType string
+        this.get('c').split(','); // $ExpectType string[]
+        this.set('c', '10').split(','); // $ExpectType string[]
+        this.set('c', 10);
+        // @ts-expect-error
+        this.set('c', 10).split(',');
+
+        this.setProperties({ b: 11 });
+        // this.setProperties({ b: '11' }); // @ts-expect-error
+        this.setProperties({
+            a: 'def',
+            b: 11,
+        });
+    }
+    bar() {
+        notifyPropertyChange(this, 'name');
+        // @ts-expect-error
+        notifyPropertyChange(this);
+        // @ts-expect-error
+        notifyPropertyChange('name');
+        // @ts-expect-error
+        notifyPropertyChange(this, 'name', 'bar');
+    }
+}
+
+// TODO: enable after TS 3.0 https://github.com/typed-ember/ember-cli-typescript/issues/291
+// class Foo extends EmberObject.extend({
+//     a: computed({
+//         get() { return ''; },
+//         set(key: string, newVal: string) { return ''; }
+//     })
+// }) {
+//     b = 5;
+//     baz() {
+//         const y = this.b; // $ExpectType number
+//         const z = this.a; // $ExpectType ComputedProperty<string, string>
+//         this.b = 10;
+//         this.get('b').toFixed(4); // $ExpectType string
+//         this.set('a', 'abc').split(','); // $ExpectType string[]
+//         this.set('b', 10).toFixed(4); // $ExpectType string
+
+//         this.setProperties({ b: 11 });
+//         // this.setProperties({ b: '11' }); // @ts-expect-error
+//         this.setProperties({
+//             a: 'def',
+//             b: 11
+//         });
+//     }
+// }
diff --git a/types/preview/@ember/object/test/observable.ts b/types/preview/@ember/object/test/observable.ts
new file mode 100644
index 00000000000..9d82e8de043
--- /dev/null
+++ b/types/preview/@ember/object/test/observable.ts
@@ -0,0 +1,102 @@
+import { assertType } from './lib/assert';
+import EmberObject, { computed, getProperties, get, setProperties, set } from '@ember/object';
+import { removeObserver, addObserver } from '@ember/object/observers';
+
+class MyComponent extends EmberObject {
+    foo = 'bar';
+
+    init() {
+        this._super.apply(this);
+        this.addObserver('foo', this, 'fooDidChange');
+        this.addObserver('foo', this, this.fooDidChange);
+        addObserver(this, 'foo', this, 'fooDidChange');
+        addObserver(this, 'foo', this, this.fooDidChange);
+        this.removeObserver('foo', this, 'fooDidChange');
+        this.removeObserver('foo', this, this.fooDidChange);
+        removeObserver(this, 'foo', this, 'fooDidChange');
+        removeObserver(this, 'foo', this, this.fooDidChange);
+        const lambda = () => {
+            this.fooDidChange(this, 'foo');
+        };
+        this.addObserver('foo', lambda);
+        this.removeObserver('foo', lambda);
+        addObserver(this, 'foo', lambda);
+        removeObserver(this, 'foo', lambda);
+    }
+
+    fooDidChange(sender: this, key: string) {
+        // your code
+    }
+}
+
+const myComponent = MyComponent.create();
+myComponent.addObserver('foo', null, () => {});
+myComponent.set('foo', 'baz');
+
+const person = EmberObject.create({
+    name: 'Fred',
+    age: 29,
+    capitalized: computed<string>(function () {
+        return this.get('name').toUpperCase();
+    }),
+});
+
+const pojo = { name: 'Fred', age: 29 };
+
+function testGet() {
+    assertType<string>(get(person, 'name'));
+    assertType<number>(get(person, 'age'));
+    assertType<string>(get(person, 'capitalized'));
+    assertType<string>(person.get('name'));
+    assertType<number>(person.get('age'));
+    assertType<string>(person.get('capitalized'));
+    assertType<string>(get(pojo, 'name'));
+}
+
+function testGetProperties() {
+    assertType<{ name: string }>(getProperties(person, 'name'));
+    assertType<{ name: string; age: number }>(getProperties(person, 'name', 'age'));
+    assertType<{ name: string; age: number }>(getProperties(person, ['name', 'age']));
+    assertType<{ name: string; age: number; capitalized: string }>(getProperties(person, 'name', 'age', 'capitalized'));
+    assertType<{ name: string }>(person.getProperties('name'));
+    assertType<{ name: string; age: number }>(person.getProperties('name', 'age'));
+    assertType<{ name: string; age: number }>(person.getProperties(['name', 'age']));
+    assertType<{ name: string; age: number; capitalized: string }>(person.getProperties('name', 'age', 'capitalized'));
+    assertType<{ name: string; age: number }>(getProperties(pojo, 'name', 'age'));
+}
+
+function testSet() {
+    assertType<string>(set(person, 'name', 'Joe'));
+    assertType<number>(set(person, 'age', 35));
+    assertType<string>(set(person, 'capitalized', 'JOE'));
+    assertType<string>(person.set('name', 'Joe'));
+    assertType<number>(person.set('age', 35));
+    assertType<string>(person.set('capitalized', 'JOE'));
+    assertType<string>(set(pojo, 'name', 'Joe'));
+}
+
+function testSetProperties() {
+    assertType<{ name: string }>(setProperties(person, { name: 'Joe' }));
+    assertType<{ name: string; age: number }>(setProperties(person, { name: 'Joe', age: 35 }));
+    assertType<{ name: string; capitalized: string }>(setProperties(person, { name: 'Joe', capitalized: 'JOE' }));
+    assertType<{ name: string }>(person.setProperties({ name: 'Joe' }));
+    assertType<{ name: string; age: number }>(person.setProperties({ name: 'Joe', age: 35 }));
+    assertType<{ name: string; capitalized: string }>(person.setProperties({ name: 'Joe', capitalized: 'JOE' }));
+    assertType<{ name: string; age: number }>(setProperties(pojo, { name: 'Joe', age: 35 }));
+}
+
+function testDynamic() {
+    const obj: any = {};
+    const dynamicKey: string = 'dummy'; // tslint:disable-line:no-inferrable-types
+
+    assertType<any>(get(obj, 'dummy'));
+    assertType<any>(get(obj, dynamicKey));
+    assertType<{ dummy: any }>(getProperties(obj, 'dummy'));
+    assertType<{ dummy: any }>(getProperties(obj, ['dummy']));
+    assertType<object>(getProperties(obj, dynamicKey));
+    assertType<object>(getProperties(obj, [dynamicKey]));
+    assertType<string>(set(obj, 'dummy', 'value'));
+    assertType<string>(set(obj, dynamicKey, 'value'));
+    assertType<{ dummy: string }>(setProperties(obj, { dummy: 'value ' }));
+    assertType<object>(setProperties(obj, { [dynamicKey]: 'value' }));
+}
diff --git a/types/preview/@ember/object/test/octane.ts b/types/preview/@ember/object/test/octane.ts
new file mode 100644
index 00000000000..adc1526aff8
--- /dev/null
+++ b/types/preview/@ember/object/test/octane.ts
@@ -0,0 +1,331 @@
+import { action, computed, default as EmberObject } from '@ember/object';
+import {
+  alias,
+  and,
+  bool,
+  collect,
+  deprecatingAlias,
+  empty,
+  equal,
+  filter,
+  filterBy,
+  gt,
+  gte,
+  intersect,
+  lt,
+  lte,
+  map,
+  mapBy,
+  match,
+  max,
+  min,
+  none,
+  not,
+  notEmpty,
+  oneWay,
+  or,
+  readOnly,
+  reads,
+  setDiff,
+  sort,
+  sum,
+  union,
+  uniq,
+  uniqBy,
+} from '@ember/object/computed';
+
+function customMacro(message: string) {
+  return computed(() => {
+    return [message, message];
+  });
+}
+
+// Native class syntax
+class Foo extends EmberObject {
+  declare firstName: string;
+  declare lastName: string;
+
+  // @ts-expect-error -- action only works on methods
+  @action
+  bar!: string;
+
+  @computed('firstName', 'lastName')
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+
+  // @ts-expect-error -- we require this to be with a getter.
+  @computed('firstName', 'lastName')
+  declare badFullName: string;
+
+  @computed('fullName', function (this: Foo) {
+    return this.fullName.toUpperCase();
+  })
+  declare bigFullName: string;
+
+  @customMacro('hi')
+  declare hiTwice: string[];
+
+  @action
+  foo() {
+    /* no op demo */
+  }
+}
+
+// Computed property macros
+
+class Bar extends EmberObject {
+  declare firstName: string;
+  declare last: string;
+
+  declare values: number[];
+
+  // @ts-expect-error
+  @alias declare aliasTest0: string;
+  // @ts-expect-error
+  @alias() declare aliasTest1: string;
+  @alias('firstName') declare aliasTest2: string;
+
+  // @ts-expect-error
+  @and declare andTest0: boolean;
+  @and() declare andTest1: boolean;
+  @and('firstName') declare andTest2: boolean;
+  @and('firstName', 'lastName') declare andTest3: boolean;
+
+  // @ts-expect-error
+  @bool declare boolTest0: boolean;
+  // @ts-expect-error
+  @bool() declare boolTest1: boolean;
+  @bool('firstName') declare boolTest2: boolean;
+
+  // @ts-expect-error
+  @collect declare collectTest0: any;
+  @collect() declare collectTest1: any;
+  @collect('firstName') declare collectTest2: any;
+
+  // @ts-expect-error
+  @deprecatingAlias declare deprecatingAliasTest0: string;
+  // @ts-expect-error
+  @deprecatingAlias() declare deprecatingAliasTest1: string;
+  // @ts-expect-error
+  @deprecatingAlias('firstName') declare deprecatingAliasTest2: string;
+  @deprecatingAlias('firstName', { id: 'deprecate-everything', until: 'v5.0.0' })
+  declare deprecatingAliasTest3: string;
+
+  // @ts-expect-error
+  @empty declare emptyTest0: boolean;
+  // @ts-expect-error
+  @empty() declare emptyTest1: boolean;
+  @empty('firstName') declare emptyTest2: boolean;
+
+  // @ts-expect-error
+  @equal declare equalTest0: boolean;
+  // @ts-expect-error
+  @equal() declare equalTest1: boolean;
+  // @ts-expect-error
+  @equal('firstName') declare equalTest2: boolean;
+  @equal('firstName', 'lastName') declare equalTest3: boolean;
+
+  // @ts-expect-error
+  @filter declare filterTest1: string[];
+  // @ts-expect-error
+  @filter() declare filterTest2: string[];
+  // @ts-expect-error
+  @filter('firstName') declare filterTest3: string[];
+  @filter('firstName', Boolean) declare filterTest4: string[];
+  // @ts-expect-error
+  @filter('firstName', 'secondName', (x) => x) declare filterTest5: string[];
+  @filter('firstName', ['secondName'], Boolean) declare filterTest6: string[];
+
+  // @ts-expect-error
+  @filterBy declare filterByTest1: any[];
+  // @ts-expect-error
+  @filterBy() declare filterByTest2: any[];
+  // @ts-expect-error
+  @filterBy('firstName') declare filterByTest3: any[];
+  @filterBy('firstName', 'id') declare filterByTest4: any[];
+
+  // @ts-expect-error
+  @gt declare gtTest1: boolean;
+  // @ts-expect-error
+  @gt() declare gtTest2: boolean;
+  // @ts-expect-error
+  @gt('firstName') declare gtTest3: boolean;
+  @gt('firstName', 3) declare gtTest4: boolean;
+
+  // @ts-expect-error
+  @gte declare gteTest1: boolean;
+  // @ts-expect-error
+  @gte() declare gteTest2: boolean;
+  // @ts-expect-error
+  @gte('firstName') declare gteTest3: boolean;
+  @gte('firstName', 3) declare gteTest4: boolean;
+
+  // @ts-expect-error
+  @intersect declare intersectTest1: any;
+  @intersect() declare intersectTest2: any;
+  @intersect('firstName') declare intersectTest3: any;
+  @intersect('firstName', 'lastName') declare intersectTest4: any;
+
+  // @ts-expect-error
+  @lt declare ltTest1: boolean;
+  // @ts-expect-error
+  @lt() declare ltTest2: boolean;
+  // @ts-expect-error
+  @lt('firstName') declare ltTest3: boolean;
+  @lt('firstName', 3) declare ltTest4: boolean;
+
+  // @ts-expect-error
+  @lte declare lteTest1: boolean;
+  // @ts-expect-error
+  @lte() declare lteTest2: boolean;
+  // @ts-expect-error
+  @lte('firstName') declare lteTest3: boolean;
+  @lte('firstName', 3) declare lteTest4: boolean;
+
+  // @ts-expect-error
+  @map declare mapTest1: string[];
+  // @ts-expect-error
+  @map() declare mapTest2: string[];
+  // @ts-expect-error
+  @map('firstName') declare mapTest3: string[];
+  @map('firstName', (x) => x) declare mapTest4: string[];
+
+  // @ts-expect-error
+  @mapBy declare mapByTest1: any[];
+  // @ts-expect-error
+  @mapBy() declare mapByTest2: any[];
+  // @ts-expect-error
+  @mapBy('firstName') declare mapByTest3: any[];
+  @mapBy('firstName', 'id') declare mapByTest4: any[];
+
+  // @ts-expect-error
+  @match declare matchTest1: boolean;
+  // @ts-expect-error
+  @match() declare matchTest2: boolean;
+  // @ts-expect-error
+  @match('firstName') declare matchTest3: boolean;
+  // @ts-expect-error
+  @match('firstName', 'abc') declare matchTest4: boolean;
+  @match('firstName', /\s+/) declare matchTest5: boolean;
+
+  // @ts-expect-error
+  @max declare maxTest1: number;
+  // @ts-expect-error
+  @max() declare maxTest2: number;
+  @max('values') declare maxTest3: number;
+  // @ts-expect-error
+  @max('values', 'a') declare maxTest4: number;
+
+  // @ts-expect-error
+  @min declare minTest1: number;
+  // @ts-expect-error
+  @min() declare minTest2: number;
+  @min('values') declare minTest3: number;
+  // @ts-expect-error
+  @min('values', 'a') declare minTest4: number;
+
+  // @ts-expect-error
+  @none declare noneTest1: number;
+  // @ts-expect-error
+  @none() declare noneTest2: number;
+  @none('values') declare noneTest3: number;
+  // @ts-expect-error
+  @none('values', 'a') declare noneTest4: number;
+
+  // @ts-expect-error
+  @not declare notTest1: number;
+  // @ts-expect-error
+  @not() declare notTest2: number;
+  @not('values') declare notTest3: number;
+  // @ts-expect-error
+  @not('values', 'a') declare notTest4: number;
+
+  // @ts-expect-error
+  @notEmpty declare notEmptyTest1: boolean;
+  // @ts-expect-error
+  @notEmpty() declare notEmptyTest2: boolean;
+  @notEmpty('firstName') declare notEmptyTest3: boolean;
+  // @ts-expect-error
+  @notEmpty('firstName', 'a') declare notEmptyTest4: boolean;
+
+  // @ts-expect-error
+  @oneWay declare oneWayTest1: boolean;
+  // @ts-expect-error
+  @oneWay() declare oneWayTest2: boolean;
+  @oneWay('firstName') declare oneWayTest3: boolean;
+  // @ts-expect-error
+  @oneWay('firstName', 'b') declare oneWayTest4: boolean;
+
+  // @ts-expect-error
+  @or declare orTest1: boolean;
+  @or() declare orTest2: boolean;
+  @or('firstName') declare orTest3: boolean;
+  @or('firstName', 'lastName') declare orTest4: boolean;
+
+  // @ts-expect-error
+  @readOnly declare readOnlyTest1: boolean;
+  // @ts-expect-error
+  @readOnly() declare readOnlyTest2: boolean;
+  @readOnly('firstName') declare readOnlyTest3: boolean;
+
+  // @ts-expect-error
+  @reads declare readsTest1: boolean;
+  // @ts-expect-error
+  @reads() declare readsTest2: boolean;
+  @reads('firstName') declare readsTest3: boolean;
+  // @ts-expect-error
+  @reads('firstName', 'a') declare readsTest4: boolean;
+
+  // @ts-expect-error
+  @setDiff declare setDiffTest1: number;
+  // @ts-expect-error
+  @setDiff() declare setDiffTest2: number;
+  // @ts-expect-error
+  @setDiff('values') declare setDiffTest3: number;
+  @setDiff('values', 'otherThing') declare setDiffTest4: number;
+  // @ts-expect-error
+  @setDiff('values', 'otherThing', 'a') declare setDiffTest5: number;
+
+  // @ts-expect-error
+  @sort declare sortTest1: number;
+  // @ts-expect-error
+  @sort() declare sortTest2: number;
+  // @ts-expect-error
+  @sort('values') declare sortTest3: number;
+  @sort('values', 'id') declare sortTest4: number;
+  // @ts-expect-error
+  @sort('values', 'id', 'a') declare sortTest5: number;
+  @sort('values', (a: number, b: number) => a - b) declare sortTest6: number;
+  @sort('values', ['id'], (a: number, b: number) => a - b) declare sortTest7: number;
+  // @ts-expect-error
+  @sort('values', 'id', (a, b) => a - b) declare sortTest8: number;
+  // @ts-expect-error
+  @sort(['id'], (a, b) => a - b) declare sortTest9: number;
+
+  // @ts-expect-error
+  @sum declare sumTest1: number;
+  // @ts-expect-error
+  @sum() declare sumTest2: number;
+  @sum('values') declare sumTest3: number;
+
+  // @ts-expect-error
+  @union declare unionTest1: any;
+  @union() declare unionTest2: any;
+  @union('firstName') declare unionTest3: any;
+  @union('firstName', 'lastName') declare unionTest4: any;
+
+  // @ts-expect-error
+  @uniq declare uniqTest1: number;
+  // @ts-expect-error
+  @uniq() declare uniqTest2: number;
+  @uniq('values') declare uniqTest3: number;
+
+  // @ts-expect-error
+  @uniqBy declare uniqByTest1: number;
+  // @ts-expect-error
+  @uniqBy() declare uniqByTest2: number;
+  // @ts-expect-error
+  @uniqBy('values') declare uniqByTest3: number;
+  @uniqBy('values', 'id') declare uniqByTest4: number;
+}
diff --git a/types/preview/@ember/object/test/proxy.ts b/types/preview/@ember/object/test/proxy.ts
new file mode 100644
index 00000000000..14a8a386570
--- /dev/null
+++ b/types/preview/@ember/object/test/proxy.ts
@@ -0,0 +1,103 @@
+import Ember from 'ember';
+import ObjectProxy from '@ember/object/proxy';
+
+interface Book {
+    title: string;
+    subtitle: string;
+    chapters: Array<{ title: string }>;
+}
+
+class DefaultProxy extends ObjectProxy {}
+DefaultProxy.create().content; // $ExpectType object | undefined
+
+class BookProxy extends ObjectProxy<Book> {
+    private readonly baz = 'baz';
+
+    altTitle = 'Alt';
+
+    getTitle() {
+        return this.get('title');
+    }
+
+    getPropertiesTitleSubtitle() {
+        return this.getProperties('title', 'subtitle');
+    }
+}
+
+const book = BookProxy.create();
+book.content; // $ExpectType Book | undefined
+
+// @ts-expect-error
+book.get('unknownProperty');
+book.get('title'); // $ExpectType string | undefined
+book.get('altTitle'); // $ExpectType string
+book.getTitle(); // $ExpectType string | undefined
+
+// @ts-expect-error
+book.getProperties('title', 'unknownProperty');
+book.getProperties('title', 'subtitle'); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "title" | "subtitle">
+book.getPropertiesTitleSubtitle(); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "title" | "subtitle">
+// tslint:disable-next-line
+book.getProperties(['subtitle', 'chapters']); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "subtitle" | "chapters"> || Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "chapters" | "subtitle">
+// @ts-expect-error
+book.getProperties(['title', 'unknownProperty']);
+
+// @ts-expect-error
+book.get('baz');
+
+book.set('title', 'New');
+// @ts-expect-error
+book.set('title', 1);
+book.set('altTitle', 'Alternate');
+// @ts-expect-error
+book.set('altTitle', 1);
+book.setProperties({
+    title: 'new',
+    subtitle: 'and improved',
+    altTitle: 'Alternate2',
+});
+// @ts-expect-error
+book.setProperties({ title: 1 });
+// @ts-expect-error
+book.setProperties({ altTitle: 1 });
+// @ts-expect-error
+book.setProperties({ invalid: true });
+
+class Person extends Ember.Object {
+    firstName = 'Peter';
+
+    lastName = 'Wagenet';
+
+    fullName = Ember.computed('firstName', 'lastName', {
+        get() {
+          return `${this.firstName} ${this.lastName}`;
+        },
+
+        set(key, value: string) {
+          const [firstName, lastName] = value.split(' ');
+
+          Ember.set(this, 'firstName', firstName);
+          Ember.set(this, 'lastName', lastName);
+
+          return value;
+        }
+    });
+}
+
+class PersonProxy extends ObjectProxy<Person> { }
+
+const person = PersonProxy.create();
+
+person.get('firstName'); // $ExpectType string | undefined
+person.get('fullName'); // $ExpectType string | undefined
+person.set('fullName', 'John Doe'); // $ExpectType string
+// @ts-expect-error
+person.set('fullName', 1);
+// @ts-expect-error
+person.set('invalid', true);
+person.setProperties({ fullName: 'John Doe' }); // $ExpectType Pick<UnwrapComputedPropertySetters<PersonProxy & Person>, "fullName">
+person.setProperties({ fullName: 'John Doe' }).fullName; // $ExpectType string
+// @ts-expect-error
+person.setProperties({ fullName: 1 });
+// @ts-expect-error
+person.setProperties({ fullName: 'John Doe', invalid: true });
diff --git a/types/preview/@ember/object/test/reopen.ts b/types/preview/@ember/object/test/reopen.ts
new file mode 100644
index 00000000000..10a2e9e1845
--- /dev/null
+++ b/types/preview/@ember/object/test/reopen.ts
@@ -0,0 +1,75 @@
+import { assertType } from './lib/assert';
+import EmberObject from '@ember/object';
+import Mixin from '@ember/object/mixin';
+
+type Person = typeof Person.prototype;
+const Person = EmberObject.extend({
+    name: '',
+    sayHello() {
+        alert(`Hello. My name is ${this.get('name')}`);
+    },
+});
+
+assertType<Person>(Person.reopen());
+
+assertType<string>(Person.create().name);
+// tslint:disable-next-line no-void-expression
+assertType<void>(Person.create().sayHello());
+
+const Person2 = Person.reopenClass({
+    species: 'Homo sapiens',
+
+    createPerson(name: string): Person {
+        return Person.create({ name });
+    },
+});
+
+assertType<string>(Person2.create().name);
+// tslint:disable-next-line no-void-expression
+assertType<void>(Person2.create().sayHello());
+assertType<string>(Person2.species);
+
+const tom = Person2.create({
+    name: 'Tom Dale',
+});
+
+// @ts-expect-error
+const badTom = Person2.create({ name: 99 });
+
+const yehuda = Person2.createPerson('Yehuda Katz');
+
+tom.sayHello(); // "Hello. My name is Tom Dale"
+yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+alert(Person2.species); // "Homo sapiens"
+
+const Person3 = Person2.reopen({
+    goodbyeMessage: 'goodbye',
+
+    sayGoodbye() {
+        alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
+    },
+});
+
+const person3 = Person3.create();
+person3.get('name');
+person3.get('goodbyeMessage');
+person3.sayHello();
+person3.sayGoodbye();
+
+interface AutoResizeMixin {
+    resizable: true;
+}
+declare const AutoResizeMixin: Mixin<AutoResizeMixin>;
+
+const ResizableTextArea = EmberObject.reopen(AutoResizeMixin, {
+    scaling: 1.0,
+});
+const text = ResizableTextArea.create();
+// TODO fix upstream
+// assertType<boolean>(text.resizable);
+assertType<number>(text.scaling);
+
+const Reopened = EmberObject.reopenClass({ a: 1 }, { b: 2 }, { c: 3 });
+assertType<number>(Reopened.a);
+assertType<number>(Reopened.b);
+assertType<number>(Reopened.c);
diff --git a/types/preview/@ember/object/tsconfig.json b/types/preview/@ember/object/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/object/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/owner/ember__owner-tests.ts b/types/preview/@ember/owner/ember__owner-tests.ts
new file mode 100644
index 00000000000..27b57933cca
--- /dev/null
+++ b/types/preview/@ember/owner/ember__owner-tests.ts
@@ -0,0 +1,135 @@
+import Owner, { Factory, FactoryManager, FullName, RegisterOptions } from '@ember/owner';
+
+// Just a class we can construct in the Factory and FactoryManager tests
+declare class ConstructThis {
+    hasProps: boolean;
+}
+
+// ----- RegisterOptions ----- //
+declare let regOptionsA: RegisterOptions;
+regOptionsA.instantiate; // $ExpectType boolean | undefined
+regOptionsA.singleton; // $ExpectType boolean | undefined
+
+// ----- Factory ----- //
+// This gives us coverage for the cases where you are *casting*.
+declare let aFactory: Factory<ConstructThis>;
+
+aFactory.create();
+aFactory.create({});
+aFactory.create({
+    hasProps: true,
+});
+aFactory.create({
+    hasProps: false,
+});
+
+// These should be rejected by way of EPC
+// @ts-expect-error
+aFactory.create({ unrelatedNonsense: 'yep yep yep' });
+// @ts-expect-error
+aFactory.create({ hasProps: true, unrelatedNonsense: 'yep yep yep' });
+
+// But this should be legal.
+const goodPojo = { hasProps: true, unrelatedNonsense: 'also true' };
+aFactory.create(goodPojo);
+
+// while this should be rejected for *type error* reasons, not EPC
+const badPojo = { hasProps: 'huzzah', unrelatedNonsense: 'also true' };
+// @ts-expect-error
+aFactory.create(badPojo);
+
+// ----- FactoryManager ----- //
+declare let aFactoryManager: FactoryManager<ConstructThis>;
+aFactoryManager.class; // $ExpectType Factory<ConstructThis>
+aFactoryManager.create({}); // $ExpectType ConstructThis
+aFactoryManager.create({ hasProps: true }); // $ExpectType ConstructThis
+aFactoryManager.create({ hasProps: false }); // $ExpectType ConstructThis
+// @ts-expect-error
+aFactoryManager.create({ otherStuff: 'nope' });
+// @ts-expect-error
+aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
+aFactoryManager.create(goodPojo); // $ExpectType ConstructThis
+// @ts-expect-error
+aFactoryManager.create(badPojo);
+
+// This one is last so it can reuse the bits from above!
+// ----- Owner ----- //
+declare let owner: Owner;
+
+// @ts-expect-error
+owner.lookup();
+owner.lookup('type:name'); // $ExpectType unknown
+// @ts-expect-error
+owner.lookup('non-namespace-string');
+owner.lookup('namespace@type:name'); // $ExpectType unknown
+
+owner.register('type:name', aFactory); // $ExpectType void
+owner.register('type:name', aFactory, {}); // $ExpectType void
+owner.register('type:name', aFactory, { instantiate: true }); // $ExpectType void
+owner.register('type:name', aFactory, { instantiate: false }); // $ExpectType void
+owner.register('type:name', aFactory, { singleton: true }); // $ExpectType void
+owner.register('type:name', aFactory, { singleton: false }); // $ExpectType void
+owner.register('type:name', aFactory, { instantiate: true, singleton: true }); // $ExpectType void
+owner.register('type:name', aFactory, { instantiate: true, singleton: false }); // $ExpectType void
+owner.register('type:name', aFactory, { instantiate: false, singleton: true }); // $ExpectType void
+owner.register('type:name', aFactory, { instantiate: false, singleton: false }); // $ExpectType void
+// @ts-expect-error
+owner.register('non-namespace-string', aFactory);
+owner.register('namespace@type:name', aFactory); // $ExpectType void
+
+owner.factoryFor('type:name'); // $ExpectType FactoryManager<unknown> | undefined
+owner.factoryFor('type:name')?.class; // $ExpectType Factory<unknown> | undefined
+owner.factoryFor('type:name')?.create(); // $ExpectType unknown
+owner.factoryFor('type:name')?.create({}); // $ExpectType unknown
+owner.factoryFor('type:name')?.create({ anythingGoes: true }); // $ExpectType unknown
+// @ts-expect-error
+owner.factoryFor('non-namespace-string');
+owner.factoryFor('namespace@type:name'); // $ExpectType FactoryManager<unknown> | undefined
+
+// Tests deal with the fact that string literals are a special case! `let`
+// bindings will accordingly not "just work" as a result. The separate
+// assignments both satisfy the linter and show why it matters.
+let aName;
+aName = 'type:name';
+// @ts-expect-error
+owner.lookup(aName);
+
+let aTypedName: FullName;
+aTypedName = 'type:name';
+owner.lookup(aTypedName); // $ExpectType unknown
+
+// Nor will callbacks work "out of the box". But they can work if they have the
+// correct type.
+declare const justStrings: string[];
+// @ts-expect-error
+justStrings.map(aString => owner.lookup(aString));
+declare let typedStrings: FullName[];
+typedStrings.map(aString => owner.lookup(aString));
+
+// Also make sure it keeps working with const bindings
+const aConstName = 'type:name';
+owner.lookup(aConstName); // $ExpectType unknown
+
+// ----- Minimal further coverage for POJOs ----- //
+// `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
+const Creatable = {
+    hasProps: true,
+};
+
+const pojoFactory: Factory<typeof Creatable> = {
+    create(initialValues?) {
+        const instance = Creatable;
+        if (initialValues) {
+            if (initialValues.hasProps) {
+                Object.defineProperty(instance, 'hasProps', {
+                    value: initialValues.hasProps,
+                    enumerable: true,
+                    writable: true,
+                });
+            }
+        }
+        return instance;
+    },
+};
+
+pojoFactory.create(); // $ExpectType { hasProps: boolean; }
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
new file mode 100644
index 00000000000..db9b3dbb28a
--- /dev/null
+++ b/types/preview/@ember/owner/index.d.ts
@@ -0,0 +1,104 @@
+// Type definitions for non-npm package @ember/owner 4.0
+// Project: https://emberjs.com/api/ember/4.0/
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+/**
+ * The name for a factory consists of a namespace and the name of a specific
+ * type within that namespace, like `'service:session'`.
+ */
+export type FullName = `${string}:${string}`;
+
+// TODO: when migrating into Ember proper, evaluate whether we should introduce
+// a registry which users can provide to resolve known types, so e.g.
+// `owner.lookup('service:session')` can return the right thing.
+/**
+ * Framework objects in an Ember application (components, services, routes,
+ * etc.) are created via a factory and dependency injection system. Each of
+ * these objects is the responsibility of an "owner", which handled its
+ * instantiation and manages its lifetime.
+ */
+export default interface Owner {
+    /**
+     * Given a {@linkcode FullName} return a corresponding instance.
+     */
+    lookup(fullName: FullName): unknown;
+
+    /**
+     * Registers a factory or value that can be used for dependency injection
+     * (with `inject`) or for service lookup. Each factory is registered with a
+     * full name including two parts: `'type:name'`.
+     *
+     * - To override the default of instantiating the class on the `Factory`,
+     *   pass the `{ instantiate: false }` option. This is useful when you have
+     *   already instantiated the class to use with this factory.
+     * - To override the default singleton behavior and instead create multiple
+     *   instances, pass the `{ singleton: false }` option.
+     */
+    // Dear future maintainer: yes, I know that `Factory<unknown> | object` is
+    // an exceedingly weird type here. This is how we type it internally in
+    // Ember itself. We actually allow more or less *anything* to be passed
+    // here. In the future, we may possibly be able to update this to actually
+    // take advantage of the `FullName` here to require that the registered
+    // factory and corresponding options do the right thing (passing an *actual*
+    // factory, not needing `create` if `options.instantiate` is `false`, etc.)
+    // but doing so will require rationalizing Ember's own internals and may
+    // need a full Ember RFC.
+    register(fullName: FullName, factory: Factory<unknown> | object, options?: RegisterOptions): void;
+
+    /**
+     * Given a fullName of the form `'type:name'`, like `'route:application'`,
+     * return a corresponding factory manager.
+     *
+     * Any instances created via the factory's `.create()` method must be
+     * destroyed manually by the caller of `.create()`. Typically, this is done
+     * during the creating objects own `destroy` or `willDestroy` methods.
+     */
+    factoryFor(fullName: FullName): FactoryManager<unknown> | undefined;
+}
+
+export interface RegisterOptions {
+    instantiate?: boolean | undefined;
+    singleton?: boolean | undefined;
+}
+
+/**
+ * Registered factories are instantiated by having create called on them.
+ * Additionally they are singletons by default, so each time they are looked up
+ * they return the same instance.
+ *
+ * However, that behavior can be modified with the `instantiate` and `singleton`
+ * options to the {@linkcode Owner.register} method.
+ */
+export interface Factory<T> {
+    /**
+     * A function that will create an instance of the class with any
+     * dependencies injected.
+     *
+     * @param initialValues Any values to set on an instance of the class
+     */
+    create(initialValues?: Partial<T>): T;
+}
+
+/**
+ * A manager which can be used for introspection of the factory's class or for
+ * the creation of factory instances with initial properties. The manager is an
+ * object with the following properties:
+ *
+ * - `class` - The registered or resolved class.
+ * - `create` - A function that will create an instance of the class with any
+ *   dependencies injected.
+ *
+ * @note `FactoryManager` is *not* user-constructible; the only legal way to get
+ *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
+ */
+export interface FactoryManager<T> extends Factory<T> {
+    /** The registered or resolved class. */
+    readonly class: Factory<T>;
+}
+
+// Don't export things unless we *intend* to.
+export {};
diff --git a/types/preview/@ember/owner/tsconfig.json b/types/preview/@ember/owner/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/owner/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/polyfills/ember__polyfills-tests.ts b/types/preview/@ember/polyfills/ember__polyfills-tests.ts
new file mode 100644
index 00000000000..859ca779645
--- /dev/null
+++ b/types/preview/@ember/polyfills/ember__polyfills-tests.ts
@@ -0,0 +1,23 @@
+import { assign } from '@ember/polyfills';
+
+(() => {
+    /* assign */
+    assign({}, { a: 'b' });
+    assign({}, { a: 'b' }).a; // $ExpectType string
+    assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
+    assign({ a: 6 }, {}).a; // $ExpectType number
+    // @ts-expect-error
+    assign({ b: 6 }, {}).a;
+    assign({}, { b: 6 }, {}).b; // $ExpectType number
+    assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
+    assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
+    // @ts-expect-error
+    assign({ a: 'hello' }, '', { a: true }).a;
+    assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
+    // @ts-expect-error
+    assign({}, { a: 0 }, { b: 1 }, { c: 2 }, { d: 3 }).a;
+
+    // matches Object.assign
+    assign({}, null); // $ExpectType never
+    assign({}, undefined); // $ExpectType never
+})();
diff --git a/types/preview/@ember/polyfills/index.d.ts b/types/preview/@ember/polyfills/index.d.ts
new file mode 100644
index 00000000000..487bc2cf648
--- /dev/null
+++ b/types/preview/@ember/polyfills/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for non-npm package @ember/polyfills 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fpolyfills
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import type { Mix, Mix3, Mix4 } from './types';
+
+/**
+ * Copy properties from a source object to a target object.
+ * @deprecated until v5.0. You should replace any calls to `Ember.assign` with
+ *   `Object.assign` or use the object spread operator.
+ */
+export function assign<T extends object, U extends object>(target: T, source: U): Mix<T, U>;
+export function assign<T extends object, U extends object, V extends object>(
+  target: T,
+  source1: U,
+  source2: V
+): Mix3<T, U, V>;
+export function assign<T extends object, U extends object, V extends object, W extends object>(
+  target: T,
+  source1: U,
+  source2: V,
+  source3: W
+): Mix4<T, U, V, W>;
+export function assign(target: object, ...sources: object[]): unknown;
+export function assign(target: object, final: undefined | null): never;
diff --git a/types/preview/@ember/polyfills/tsconfig.json b/types/preview/@ember/polyfills/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/polyfills/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/polyfills/types.d.ts b/types/preview/@ember/polyfills/types.d.ts
new file mode 100644
index 00000000000..d1c8cf23063
--- /dev/null
+++ b/types/preview/@ember/polyfills/types.d.ts
@@ -0,0 +1,4 @@
+export type Mix<A, B> = B & Pick<A, Exclude<keyof A, keyof B>>;
+export type Mix3<A, B, C> = Mix<Mix<A, B>, C>;
+export type Mix4<A, B, C, D> = Mix3<Mix<A, B>, C, D>;
+export default Mix;
diff --git a/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts b/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
new file mode 100644
index 00000000000..4977630e2ef
--- /dev/null
+++ b/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
@@ -0,0 +1 @@
+export { RouteInfoWithAttributes as default } from '../route-info';
diff --git a/types/preview/@ember/routing/-private/route-info.d.ts b/types/preview/@ember/routing/-private/route-info.d.ts
new file mode 100644
index 00000000000..8c186376518
--- /dev/null
+++ b/types/preview/@ember/routing/-private/route-info.d.ts
@@ -0,0 +1 @@
+export { default as default } from '../route-info';
diff --git a/types/preview/@ember/routing/-private/router-dsl.d.ts b/types/preview/@ember/routing/-private/router-dsl.d.ts
new file mode 100644
index 00000000000..86c6b086494
--- /dev/null
+++ b/types/preview/@ember/routing/-private/router-dsl.d.ts
@@ -0,0 +1,18 @@
+export default class RouterDSL {
+    constructor(name: string | null, options: object);
+    route(name: string, callback: (this: RouterDSL) => void): void;
+    route(
+        name: string,
+        options?: { path?: string | undefined; resetNamespace?: boolean | undefined },
+        callback?: (this: RouterDSL) => void,
+    ): void;
+    mount(
+        name: string,
+        options?: {
+            as?: string | undefined;
+            path?: string | undefined;
+            resetNamespace?: boolean | undefined;
+            engineInfo?: unknown;
+        },
+    ): void;
+}
diff --git a/types/preview/@ember/routing/-private/transition.d.ts b/types/preview/@ember/routing/-private/transition.d.ts
new file mode 100644
index 00000000000..b825aaed5a7
--- /dev/null
+++ b/types/preview/@ember/routing/-private/transition.d.ts
@@ -0,0 +1 @@
+export { default as default } from '../transition';
diff --git a/types/preview/@ember/routing/auto-location.d.ts b/types/preview/@ember/routing/auto-location.d.ts
new file mode 100644
index 00000000000..86be671620b
--- /dev/null
+++ b/types/preview/@ember/routing/auto-location.d.ts
@@ -0,0 +1,6 @@
+import EmberObject from "@ember/object";
+
+/**
+ * AutoLocation will select the best location option based off browser support with the priority order: history, hash, none.
+ */
+export default class AutoLocation extends EmberObject {}
diff --git a/types/preview/@ember/routing/hash-location.d.ts b/types/preview/@ember/routing/hash-location.d.ts
new file mode 100644
index 00000000000..a045285fbc6
--- /dev/null
+++ b/types/preview/@ember/routing/hash-location.d.ts
@@ -0,0 +1,8 @@
+import EmberObject from "@ember/object";
+
+/**
+ * `Ember.HashLocation` implements the location API using the browser's
+ * hash. At present, it relies on a `hashchange` event existing in the
+ * browser.
+ */
+export default class HashLocation extends EmberObject {}
diff --git a/types/preview/@ember/routing/history-location.d.ts b/types/preview/@ember/routing/history-location.d.ts
new file mode 100644
index 00000000000..8921fdb15e2
--- /dev/null
+++ b/types/preview/@ember/routing/history-location.d.ts
@@ -0,0 +1,7 @@
+import EmberObject from "@ember/object";
+
+/**
+ * Ember.HistoryLocation implements the location API using the browser's
+ * history.pushState API.
+ */
+export default class HistoryLocation extends EmberObject {}
diff --git a/types/preview/@ember/routing/index.d.ts b/types/preview/@ember/routing/index.d.ts
new file mode 100644
index 00000000000..923ca316b6b
--- /dev/null
+++ b/types/preview/@ember/routing/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for non-npm package @ember/routing 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Frouting
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+export { default as Route } from '@ember/routing/route';
+export { default as Router } from '@ember/routing/router';
+
+import { Opaque } from 'ember/-private/type-utils';
+
+// In normal TypeScript, this component is essentially an opaque token
+// that just needs to be importable. Declaring it with a unique interface
+// like this, however, gives tools like Glint (that DO have a richer
+// notion of what it is) a place to install more detailed type information.
+export interface LinkTo extends Opaque<'component:link-to'> {}
+
+/**
+ * The `LinkTo` component renders a link to the supplied `route` passing
+ * an optionally supplied model to the route as its `model` context of the route.
+ *
+ * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/LinkTo?anchor=LinkTo
+ */
+export const LinkTo: LinkTo;
diff --git a/types/preview/@ember/routing/none-location.d.ts b/types/preview/@ember/routing/none-location.d.ts
new file mode 100644
index 00000000000..22934d7cece
--- /dev/null
+++ b/types/preview/@ember/routing/none-location.d.ts
@@ -0,0 +1,9 @@
+import EmberObject from "@ember/object";
+
+/**
+ * Ember.NoneLocation does not interact with the browser. It is useful for
+ * testing, or when you need to manage state with your Router, but temporarily
+ * don't want it to muck with the URL (for example when you embed your
+ * application in a larger page).
+ */
+export default class NoneLocation extends EmberObject {}
diff --git a/types/preview/@ember/routing/route-info.d.ts b/types/preview/@ember/routing/route-info.d.ts
new file mode 100644
index 00000000000..2261063b669
--- /dev/null
+++ b/types/preview/@ember/routing/route-info.d.ts
@@ -0,0 +1,72 @@
+// https://api.emberjs.com/ember/4.0/classes/RouteInfo
+/**
+ * A `RouteInfo` is an object that contains metadata about a specific route within a `Transition`.
+ * It is read-only and internally immutable.
+ * It is also not observable, because a `Transition` instance is never changed after creation.
+ */
+export default interface RouteInfo {
+    /**
+     * A reference to the childe route's `RouteInfo`.
+     * This can be used to traverse downward to the leafmost `RouteInfo`.
+     */
+    readonly child: RouteInfo | null;
+    /**
+     * The final segment of the fully-qualified name of the route, like "index".
+     */
+    readonly localName: string;
+    /**
+     * The dot-separated, fully-qualified name of the route, like "people.index".
+     */
+    readonly name: string;
+    /**
+     * The ordered list of the names of the params required for this route.
+     * It will contain the same strings as `Object.keys(params)`, but here the order is significant.
+     * This allows users to correctly pass params into routes programmatically.
+     */
+    readonly paramNames: string[];
+    /**
+     * The values of the route's parameters.
+     * These are the same params that are received as arguments to the route's `model` hook.
+     * Contains only the parameters valid for this route, if any (params for parent or child routes are not merged).
+     */
+    readonly params: { [key: string]: string | undefined };
+    /**
+     * A reference to the parent route's `RouteInfo`.
+     * This can be used to traverse upward to the topmost `RouteInfo`.
+     */
+    readonly parent: RouteInfo | null;
+    /**
+     * The values of any query params on this route.
+     */
+    readonly queryParams: { [key: string]: string | undefined };
+    /**
+     * Will contain the result `Route#buildRouteInfoMetadata`
+     * for the corresponding Route.
+     */
+    readonly metadata: unknown;
+    /**
+     * Allows you to traverse through the linked list of `RouteInfo`s from the topmost to leafmost.
+     * Returns the first `RouteInfo` in the linked list for which the callback returns true.
+     *
+     * @param callback the callback to execute.
+     */
+    find(callback: (item: RouteInfo) => boolean): RouteInfo | undefined;
+}
+
+// https://api.emberjs.com/ember/4.0/classes/RouteInfoWithAttributes
+/**
+ * A `RouteInfoWithAttributes` is an object that contains
+ * metadata, including the resolved value from the routes
+ * `model` hook. Like `RouteInfo`, a `RouteInfoWithAttributes`
+ * represents a specific route within a Transition.
+ * It is read-only and internally immutable. It is also not
+ * observable, because a Transition instance is never
+ * changed after creation.
+ */
+export interface RouteInfoWithAttributes extends RouteInfo {
+    /**
+     * This is the resolved return value from the
+     * route's model hook.
+     */
+    readonly attributes: unknown;
+}
diff --git a/types/preview/@ember/routing/route.d.ts b/types/preview/@ember/routing/route.d.ts
new file mode 100644
index 00000000000..07c4c5c9156
--- /dev/null
+++ b/types/preview/@ember/routing/route.d.ts
@@ -0,0 +1,525 @@
+import EmberObject from '@ember/object';
+import ActionHandler from '@ember/object/-private/action-handler';
+import Transition from '@ember/routing/transition';
+import Evented from '@ember/object/evented';
+import { RenderOptions, RouteQueryParam } from '@ember/routing/types';
+import Controller from '@ember/controller';
+
+// tslint:disable-next-line:strict-export-declare-modifiers
+type RouteModel = object | string | number;
+
+/**
+ * The `Ember.Route` class is used to define individual routes. Refer to
+ * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+ */
+export default class Route<Model = unknown, Params extends object = object>
+    extends EmberObject.extend(ActionHandler, Evented) {
+    // methods
+    /**
+     * This hook is called after this route's model has resolved. It follows
+     * identical async/promise semantics to `beforeModel` but is provided the
+     * route's resolved model in addition to the `transition`, and is therefore
+     * suited to performing logic that can only take place after the model has
+     * already resolved.
+     *
+     * @returns if the value returned from this hook is a promise, the
+     *   transition will pause until the transition resolves. Otherwise,
+     *   non-promise return values are not utilized in any way.
+     */
+    afterModel(resolvedModel: Model, transition: Transition): Promise<unknown> | void;
+
+    /**
+     * This hook is the first of the route entry validation hooks called when an
+     * attempt is made to transition into a route or one of its children. It is
+     * called before `model` and `afterModel`, and is appropriate for cases
+     * when:
+     *
+     * 1. A decision can be made to redirect elsewhere without needing to
+     *     resolve the model first.
+     * 2. Any async operations need to occur first before the model is attempted
+     *     to be resolved.
+     *
+     * This hook is provided the current `transition` attempt as a parameter,
+     * which can be used to `.abort()` the transition, save it for a later
+     * `.retry()`, or retrieve values set on it from a previous hook. You can
+     * also just call `this.transitionTo` to another route to implicitly abort
+     * the `transition`. You can return a promise from this hook to pause the
+     * transition until the promise resolves (or rejects). This could be useful,
+     * for instance, for retrieving async code from the server that is required
+     * to enter a route.
+     *
+     * @returns if the value returned from this hook is a promise, the
+     *   transition will pause until the transition resolves. Otherwise,
+     *   non-promise return values are not utilized in any way.
+     */
+    beforeModel(transition: Transition): Promise<unknown> | void;
+
+    /**
+     * Returns the controller of the current route, or a parent (or any
+     * ancestor) route in a route hierarchy.
+     *
+     * The controller instance must already have been created, either through
+     * entering the associated route or using `generateController`.
+     *
+     * @param name the name of the route or controller
+     */
+    controllerFor(name: string): Controller;
+
+    /**
+     * A hook you can implement to convert the URL into the model for
+     * this route.
+     */
+    model(params: Params, transition: Transition): Model | PromiseLike<Model>;
+
+    /**
+     * Returns the model of a parent (or any ancestor) route
+     * in a route hierarchy.  During a transition, all routes
+     * must resolve a model object, and if a route
+     * needs access to a parent route's model in order to
+     * resolve a model (or just reuse the model from a parent),
+     * it can call `this.modelFor(theNameOfParentRoute)` to
+     * retrieve it.
+     */
+    modelFor(name: string): unknown;
+
+    /**
+     * Retrieves parameters, for current route using the state.params
+     * variable and getQueryParamsFor, using the supplied routeName.
+     */
+    paramsFor(name: string): object;
+
+    /**
+     * A hook you can implement to optionally redirect to another route.
+     *
+     * If you call `this.transitionTo` from inside of this hook, this route
+     * will not be entered in favor of the other hook.
+     *
+     * `redirect` and `afterModel` behave very similarly and are
+     * called almost at the same time, but they have an important
+     * distinction in the case that, from one of these hooks, a
+     * redirect into a child route of this route occurs: redirects
+     * from `afterModel` essentially invalidate the current attempt
+     * to enter this route, and will result in this route's `beforeModel`,
+     * `model`, and `afterModel` hooks being fired again within
+     * the new, redirecting transition. Redirects that occur within
+     * the `redirect` hook, on the other hand, will _not_ cause
+     * these hooks to be fired again the second time around; in
+     * other words, by the time the `redirect` hook has been called,
+     * both the resolved model and attempted entry into this route
+     * are considered to be fully validated.
+     */
+    redirect(model: Model, transition: Transition): void;
+
+    /**
+     * Refresh the model on this route and any child routes, firing the
+     * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+     * to how routes are entered when transitioning in from other route.
+     * The current route params (e.g. `article_id`) will be passed in
+     * to the respective model hooks, and if a different model is returned,
+     * `setupController` and associated route hooks will re-fire as well.
+     * An example usage of this method is re-querying the server for the
+     * latest information using the same parameters as when the route
+     * was first entered.
+     * Note that this will cause `model` hooks to fire even on routes
+     * that were provided a model object when the route was initially
+     * entered.
+     */
+    refresh(): Transition;
+
+    /**
+     * Transition into another route while replacing the current URL, if possible.
+     * This will replace the current history entry instead of adding a new one.
+     * Beside that, it is identical to `transitionTo` in all other respects. See
+     * 'transitionTo' for additional information regarding multiple models.
+     *
+     * @param name    the name of the route or a URL
+     * @param models  the model(s) or identifier(s) to be used while
+     *                transitioning to the route.
+     * @param options optional hash with a queryParams property
+     *                containing a mapping of query parameters. May be supplied
+     *                as the only parameter to trigger a query-parameter-only
+     *                transition.
+     * @returns       the Transition object associated with this attempted
+     *                transition
+     * @deprecated    until 5.0. Inject the router service and use its methods.
+     */
+    replaceWith(name: string, ...args: unknown[]): Transition;
+
+    /**
+     * A hook you can use to reset controller values either when the model
+     * changes or the route is exiting.
+     */
+    resetController(controller: Controller, isExiting: boolean, transition: Transition): void;
+
+    /**
+     * Sends an action to the router, which will delegate it to the currently active
+     * route hierarchy per the bubbling rules explained under actions.
+     */
+    send(name: string, ...args: unknown[]): void;
+
+    /**
+     * A hook you can implement to convert the route's model into parameters
+     * for the URL.
+     *
+     * The default `serialize` method will insert the model's `id` into the
+     * route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+     * If the route has multiple dynamic segments or does not contain '_id', `serialize`
+     * will return `Ember.getProperties(model, params)`
+     * This method is called when `transitionTo` is called with a context
+     * in order to populate the URL.
+     */
+    serialize(model: Model, params: string[]): string | object;
+
+    /**
+     * A hook you can use to setup the controller for the current route.
+     * This method is called with the controller for the current route and the
+     * model supplied by the `model` hook.
+     * By default, the `setupController` hook sets the `model` property of
+     * the controller to the `model`.
+     * If you implement the `setupController` hook in your Route, it will
+     * prevent this default behavior. If you want to preserve that behavior
+     * when implementing your `setupController` function, make sure to call
+     * `_super`
+     */
+    setupController(controller: Controller, model: Model, transition: Transition): void;
+
+    /**
+     * Transition the application into another route. The route may
+     * be either a single route or route path:
+     *
+     * ```javascript
+     * this.transitionTo('blogPosts');
+     * this.transitionTo('blogPosts.recentEntries');
+     * ```
+     *
+     * Optionally supply a model for the route in question. The model
+     * will be serialized into the URL using the `serialize` hook of
+     * the route:
+     *
+     * ```javascript
+     * this.transitionTo('blogPost', aPost);
+     * ```
+     *
+     * If a literal is passed (such as a number or a string), it will
+     * be treated as an identifier instead. In this case, the `model`
+     * hook of the route will be triggered:
+     *
+     * ```javascript
+     * this.transitionTo('blogPost', 1);
+     * ```
+     *
+     * Multiple models will be applied last to first recursively up the
+     * route tree.
+     *
+     * ```app/routes.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('blogPost', { path:':blogPostId' }, function() {
+     *     this.route('blogComment', { path: ':blogCommentId' });
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```javascript
+     * this.transitionTo('blogComment', aPost, aComment);
+     * this.transitionTo('blogComment', 1, 13);
+     * ```
+     *
+     * It is also possible to pass a URL (a string that starts with a
+     * `/`).
+     *
+     * ```javascript
+     * this.transitionTo('/');
+     * this.transitionTo('/blog/post/1/comment/13');
+     * this.transitionTo('/blog/posts?sort=title');
+     * ```
+     *
+     * An options hash with a `queryParams` property may be provided as
+     * the final argument to add query parameters to the destination URL.
+     *
+     * ```javascript
+     * this.transitionTo('blogPost', 1, {
+     *   queryParams: { showComments: 'true' }
+     * });
+     *
+     * // if you just want to transition the query parameters without changing the route
+     * this.transitionTo({ queryParams: { sort: 'date' } });
+     * ```
+     *
+     * See also [replaceWith](#method_replaceWith).
+     *
+     * Simple Transition Example
+     *
+     * ```app/routes.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('index');
+     *   this.route('secret');
+     *   this.route('fourOhFour', { path: '*:' });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     * import { action } from '@ember/object';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   moveToSecret(context) {
+     *     if (authorized()) {
+     *       this.transitionTo('secret', context);
+     *     } else {
+     *       this.transitionTo('fourOhFour');
+     *     }
+     *   }
+     * }
+     * ```
+     *
+     * Transition to a nested route
+     *
+     * ```app/router.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('articles', { path: '/articles' }, function() {
+     *     this.route('new');
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     * import { action } from '@ember/object';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   transitionToNewArticle() {
+     *     this.transitionTo('articles.new');
+     *   }
+     * }
+     * ```
+     *
+     * Multiple Models Example
+     *
+     * ```app/router.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('index');
+     *
+     *   this.route('breakfast', { path: ':breakfastId' }, function() {
+     *     this.route('cereal', { path: ':cerealId' });
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     * import { action } from '@ember/object';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   moveToChocolateCereal() {
+     *     let cereal = { cerealId: 'ChocolateYumminess' };
+     *     let breakfast = { breakfastId: 'CerealAndMilk' };
+     *
+     *     this.transitionTo('breakfast.cereal', breakfast, cereal);
+     *   }
+     * }
+     * ```
+     *
+     * Nested Route with Query String Example
+     *
+     * ```app/routes.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('fruits', function() {
+     *     this.route('apples');
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   transitionToApples() {
+     *     this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
+     *   }
+     * }
+     * ```
+     *
+     * @param name    the name of the route or a URL.
+     * @param models  the model(s) or identifier(s) to be used while
+     *                transitioning to the route.
+     * @param options optional hash with a queryParams property
+     *                containing a mapping of query parameters. May be supplied
+     *                as the only parameter to trigger a query-parameter-only
+     *                transition.
+     * @returns       the Transition object associated with this attempted
+     *                transition
+     * @deprecated    until 5.0. Inject the router service and use its methods.
+     */
+    transitionTo(name: string, options?: { queryParams: object }): Transition;
+    transitionTo(name: string, modelsA: RouteModel, options?: { queryParams: object }): Transition;
+    transitionTo(name: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Transition;
+    transitionTo(
+        name: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        options?: { queryParams: object },
+    ): Transition;
+    transitionTo(
+        name: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        modelsD: RouteModel,
+        options?: { queryParams: object },
+    ): Transition;
+    transitionTo(options: { queryParams: object }): Transition;
+
+    // https://emberjs.com/api/ember/release/classes/Route/methods/intermediateTransitionTo?anchor=intermediateTransitionTo
+    /**
+     * Perform a synchronous transition into another route without attempting to resolve promises,
+     * update the URL, or abort any currently active asynchronous transitions
+     * (i.e. regular transitions caused by transitionTo or URL changes).
+     *
+     * @param name           the name of the route or a URL
+     * @param models         the model(s) or identifier(s) to be used while
+     *                       transitioning to the route.
+     * @returns              the Transition object associated with this attempted transition
+     */
+    intermediateTransitionTo(name: string, ...models: unknown[]): Transition;
+
+    // properties
+    /**
+     * The controller associated with this route.
+     */
+    controller: Controller;
+
+    /**
+     * The name of the controller to associate with this route.
+     * By default, Ember will lookup a route's controller that matches the name
+     * of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+     * if you would like to define a specific controller to use, you can do so
+     * using this property.
+     * This is useful in many ways, as the controller specified will be:
+     * * p assed to the `setupController` method.
+     * * used as the controller for the view being rendered by the route.
+     * * returned from a call to `controllerFor` for the route.
+     */
+    controllerName: string;
+
+    /**
+     * The name of the route, dot-delimited, including the engine prefix if applicable.
+     */
+    fullRouteName: string;
+
+    /**
+     * Configuration hash for this route's queryParams.
+     */
+    queryParams: { [key: string]: RouteQueryParam };
+
+    /**
+     * The name of the route, dot-delimited
+     */
+    routeName: string;
+
+    /**
+     * The name of the template to use by default when rendering this routes
+     * template.
+     * This is similar with `viewName`, but is useful when you just want a custom
+     * template without a view.
+     */
+    templateName: string;
+
+    // events
+    /**
+     * This hook is executed when the router enters the route. It is not executed
+     * when the model for the route changes.
+     */
+    activate(transition: Transition): void;
+
+    /**
+     * This hook is executed when the router completely exits this route. It is
+     * not executed when the model for the route changes.
+     */
+    deactivate(transition: Transition): void;
+
+    /**
+     * The didTransition action is fired after a transition has successfully been
+     * completed. This occurs after the normal model hooks (beforeModel, model,
+     * afterModel, setupController) have resolved. The didTransition action has
+     * no arguments, however, it can be useful for tracking page views or resetting
+     * state on the controller.
+     */
+    didTransition(): void;
+
+    /**
+     * When attempting to transition into a route, any of the hooks may return a promise
+     * that rejects, at which point an error action will be fired on the partially-entered
+     * routes, allowing for per-route error handling logic, or shared error handling logic
+     * defined on a parent route.
+     */
+    error(error: unknown, transition: Transition): void;
+
+    /**
+     * The loading action is fired on the route when a route's model hook returns a
+     * promise that is not already resolved. The current Transition object is the first
+     * parameter and the route that triggered the loading event is the second parameter.
+     */
+    loading(transition: Transition, route: Route): void;
+
+    /**
+     * The willTransition action is fired at the beginning of any attempted transition
+     * with a Transition object as the sole argument. This action can be used for aborting,
+     * redirecting, or decorating the transition from the currently active routes.
+     */
+    willTransition(transition: Transition): void;
+
+    /**
+     * Allows you to produce custom metadata for the route.
+     * The return value of this method will be attached to
+     * its corresponding RouteInfoWithAttributes object.
+     * Example
+     * ```app/routes/posts/index.js
+     * import Route from '@ember/routing/route';
+     * export default class PostsIndexRoute extends Route {
+     *   buildRouteInfoMetadata() {
+     *     return { title: 'Posts Page' }
+     *   }
+     * }
+     * ```
+     * ```app/routes/application.js
+     * import Route from '@ember/routing/route';
+     * import { inject as service } from '@ember/service';
+     * export default class ApplicationRoute extends Route {
+     *   @service router
+     *   constructor() {
+     *     super(...arguments);
+     *     this.router.on('routeDidChange', transition => {
+     *       document.title = transition.to.metadata.title;
+     *       // would update document's title to "Posts Page"
+     *     });
+     *   }
+     * }
+     * ```
+     */
+    buildRouteInfoMetadata(): unknown;
+}
diff --git a/types/preview/@ember/routing/router-service.d.ts b/types/preview/@ember/routing/router-service.d.ts
new file mode 100644
index 00000000000..827d40dbb92
--- /dev/null
+++ b/types/preview/@ember/routing/router-service.d.ts
@@ -0,0 +1,360 @@
+import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
+import Transition from '@ember/routing/transition';
+import Service from '@ember/service';
+
+// tslint:disable-next-line:strict-export-declare-modifiers
+type RouteModel = object | string | number;
+
+// https://emberjs.com/api/ember/release/classes/RouterService
+/**
+ * The Router service is the public API that provides component/view layer access to the router.
+ */
+export default class RouterService extends Service {
+    //
+    /**
+     * A `RouteInfo` that represents the current leaf route.
+     * It is guaranteed to change whenever a route transition happens
+     * (even when that transition only changes parameters and doesn't change the active route)
+     */
+    readonly currentRoute: RouteInfo;
+    /**
+     * Name of the current route.
+     * This property represent the logical name of the route,
+     * which is comma separated.
+     * For the following router:
+     * ```app/router.js
+     * Router.map(function() {
+     * this.route('about');
+     * this.route('blog', function () {
+     *     this.route('post', { path: ':post_id' });
+     * });
+     * });
+     * ```
+     * It will return:
+     * * `index` when you visit `/`
+     * * `about` when you visit `/about`
+     * * `blog.index` when you visit `/blog`
+     * * `blog.post` when you visit `/blog/some-post-id`
+     */
+    readonly currentRouteName: string;
+    //
+    /**
+     * Current URL for the application.
+     * This property represent the URL path for this route.
+     * For the following router:
+     * ```app/router.js
+     * Router.map(function() {
+     * this.route('about');
+     * this.route('blog', function () {
+     *     this.route('post', { path: ':post_id' });
+     * });
+     * });
+     * ```
+     * It will return:
+     * * `/` when you visit `/`
+     * * `/about` when you visit `/about`
+     * * `/blog` when you visit `/blog`
+     * * `/blog/some-post-id` when you visit `/blog/some-post-id`
+     */
+    readonly currentURL: string;
+
+    /**
+     * The `rootURL` property represents the URL of the root of
+     * the application, '/' by default.
+     * This prefix is assumed on all routes defined on this app.
+     * If you change the `rootURL` in your environment configuration
+     * like so:
+     * ```config/environment.js
+     * 'use strict';
+     * module.exports = function(environment) {
+     *   let ENV = {
+     *     modulePrefix: 'router-service',
+     *     environment,
+     *     rootURL: '/my-root',
+     *   …
+     *   }
+     * ]
+     * ```
+     * This property will return `/my-root`.
+     */
+    readonly rootURL: string;
+
+    /**
+     * Determines whether a route is active.
+     *
+     * @param routeName the name of the route
+     * @param models    the model(s) or identifier(s) to be used while
+     *                  transitioning to the route
+     * @param options   optional hash with a queryParams property containing a
+     *                  mapping of query parameters
+     */
+    isActive(routeName: string, options?: { queryParams: object }): boolean;
+    isActive(
+        routeName: string,
+        models: RouteModel,
+        options?: { queryParams: object }
+    ): boolean;
+    isActive(
+        routeName: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        options?: { queryParams: object }
+    ): boolean;
+    isActive(
+        routeName: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        options?: { queryParams: object }
+    ): boolean;
+    isActive(
+        routeName: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        modelsD: RouteModel,
+        options?: { queryParams: object }
+    ): boolean;
+
+    // https://emberjs.com/api/ember/4.0/classes/RouterService/methods/isActive?anchor=replaceWith
+    /**
+     * Transition into another route while replacing the current URL, if
+     * possible. The route may be either a single route or route path.
+     *
+     * @param routeNameOrUrl the name of the route or a URL
+     * @param models         the model(s) or identifier(s) to be used while
+     *                       transitioning to the route.
+     * @param options        optional hash with a queryParams property
+     *                       containing a mapping of query parameters
+     * @returns              the Transition object associated with this attempted transition
+     */
+    replaceWith(
+        routeNameOrUrl: string,
+        options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+        routeNameOrUrl: string,
+        models: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+        routeNameOrUrl: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+        routeNameOrUrl: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+        routeNameOrUrl: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        modelsD: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+
+    // https://emberjs.com/api/ember/release/classes/RouterService/methods/isActive?anchor=transitionTo
+    /**
+     * Transition the application into another route. The route may
+     * be either a single route or route path:
+     *
+     * See [transitionTo](https://api.emberjs.com/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
+     *
+     * Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
+     * This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
+     * See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
+     *
+     * In the following example we use the Router service to navigate to a route with a
+     * specific model from a Component.
+     *
+     * ```app/components/example.js
+     * import Component from '@glimmer/component';
+     * import { action } from '@ember/object';
+     * import { inject as service } from '@ember/service';
+     *
+     * export default class extends Component {
+     *   @service router;
+     *
+     *   @action
+     *   goToComments(post) {
+     *     this.router.transitionTo('comments', post);
+     *   }
+     * }
+     * ```
+     *
+     * @param routeNameOrUrl the name of the route or a URL
+     * @param models         the model(s) or identifier(s) to be used while
+     *                       transitioning to the route.
+     * @param options        optional hash with a queryParams property
+     *                       containing a mapping of query parameters. May be
+     *                       supplied as the only parameter to trigger a
+     *                       query-parameter-only transition.
+     * @returns              the Transition object associated with this attempted transition
+     */
+    transitionTo(
+        routeNameOrUrl: string,
+        options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+        routeNameOrUrl: string,
+        models: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+        routeNameOrUrl: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+        routeNameOrUrl: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+        routeNameOrUrl: string,
+        modelsA: RouteModel,
+        modelsB: RouteModel,
+        modelsC: RouteModel,
+        modelsD: RouteModel,
+        options?: { queryParams: object }
+    ): Transition;
+    transitionTo(options: { queryParams: object }): Transition;
+
+    // https://emberjs.com/api/ember/4.3.0/classes/RouterService/methods/isActive?anchor=urlFor
+    /**
+     * Generate a URL based on the supplied route name.
+     *
+     * @param routeName the name of the route or a URL
+     * @param models    the model(s) or identifier(s) to be used while
+     *                  transitioning to the route.
+     * @param options   optional hash with a queryParams property containing
+     *                  a mapping of query parameters
+     * @returns         the string representing the generated URL
+     */
+    urlFor(routeName: string, ...args: RouteModel[] | [...RouteModel[], { queryParams: object }]): string;
+
+    // https://api.emberjs.com/ember/3.6/classes/RouterService/events/routeDidChange?anchor=routeDidChange
+    /**
+     * Register a callback for an event.
+     *
+     * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
+     * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
+     *
+     * The `routeDidChange` event only fires once a transition has settled.
+     * This includes aborts and error substates.
+     * Like the `routeWillChange` event it recieves a `Transition` as the sole argument.
+     *
+     * @param name     the name of the event
+     * @param callback the callback to execute
+     */
+    on(
+        name: 'routeDidChange' | 'routeWillChange',
+        callback: (transition: Transition) => void
+    ): RouterService;
+
+     // https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=off
+    /**
+     * Removes a callback for an event.
+     *
+     * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
+     * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
+     *
+     * The `routeDidChange` event only fires once a transition has settled.
+     * This includes aborts and error substates.
+     *
+     * @param name     the name of the event 'routeWillChange' | 'routeDidChange'
+     * @param callback the callback to remove
+     */
+    off(
+        name: 'routeDidChange' | 'routeWillChange',
+        callback: (transition: Transition) => void
+    ): RouterService;
+
+    /**
+     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=has
+     *
+     * Checks to see if object has any subscriptions for named event.
+     *
+     * @param name
+     */
+    has(name: string): boolean;
+
+    /**
+     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=one
+     *
+     * Subscribes a function to a named event and then cancels the subscription after the first time the
+     * event is triggered. It is good to use one when you only care about the first time an event has taken place.
+     *
+     * @param name     the name of the event
+     * @param callback the callback to execute
+     */
+    one(
+        name: 'routeDidChange' | 'routeWillChange',
+        callback: (transition: Transition) => void
+    ): RouterService;
+
+    /**
+     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=trigger
+     *
+     * Triggers a named event for the object.
+     * Any additional arguments will be passed as parameters to the functions that are subscribed to the event.
+     *
+     * @param name the name of the event
+     * @param args arguments to pass to the event
+     */
+    trigger(
+        name: string,
+        args: any
+    ): void;
+
+    /**
+     * Takes a string URL and returns a `RouteInfo` for the leafmost route represented
+     * by the URL. Returns `null` if the URL is not recognized. This method expects to
+     * receive the actual URL as seen by the browser including the app's `rootURL`.
+     * See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
+     * In the following example `recognize` is used to verify if a path belongs to our
+     * application before transitioning to it.
+     * ```
+     * import Component from '@ember/component';
+     * import { inject as service } from '@ember/service';
+     * export default class extends Component {
+     *   @service router;
+     *   path = '/';
+     *   click() {
+     *     if (this.router.recognize(this.path)) {
+     *       this.router.transitionTo(this.path);
+     *     }
+     *   }
+     * }
+     * ```
+     */
+    recognize(url: string): RouteInfo;
+
+    /**
+     * Takes a string URL and returns a promise that resolves to a
+     * `RouteInfoWithAttributes` for the leafmost route represented by the URL.
+     * The promise rejects if the URL is not recognized or an unhandled exception
+     * is encountered. This method expects to receive the actual URL as seen by
+     * the browser including the app's `rootURL`.
+     */
+    recognizeAndLoad(url: string): RouteInfoWithAttributes;
+
+    /**
+     * Refreshes all currently active routes, doing a full transition.
+     * If a route name is provided and refers to a currently active route,
+     * it will refresh only that route and its descendents.
+     * Returns a promise that will be resolved once the refresh is complete.
+     * All resetController, beforeModel, model, afterModel, redirect, and setupController
+     * hooks will be called again. You will get new data from the model hook.
+     */
+    refresh(pivotRouteName?: string): Transition;
+}
diff --git a/types/preview/@ember/routing/router.d.ts b/types/preview/@ember/routing/router.d.ts
new file mode 100644
index 00000000000..ca70289b2b7
--- /dev/null
+++ b/types/preview/@ember/routing/router.d.ts
@@ -0,0 +1,43 @@
+import EmberObject from "@ember/object";
+import Evented from "@ember/object/evented";
+import RouterDSL from "@ember/routing/-private/router-dsl";
+import Transition from "@ember/routing/transition";
+import RouterService from "@ember/routing/router-service";
+
+/**
+ * The `Ember.Router` class manages the application state and URLs. Refer to
+ * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
+ */
+export default class Router extends EmberObject.extend(Evented) {
+    /**
+     * The `Router.map` function allows you to define mappings from URLs to routes
+     * in your application. These mappings are defined within the
+     * supplied callback function using `this.route`.
+     */
+    static map(callback: (this: RouterDSL) => void): void;
+    /**
+     * The `location` property determines the type of URL's that your
+     * application will use.
+     *
+     * @note the `'auto'` location is [deprecated](https://deprecations.emberjs.com/v4.x/#toc_deprecate-auto-location).
+     */
+    location: 'history' | 'hash' | 'none' | 'auto';
+    /**
+     * Represents the URL of the root of the application, often '/'. This prefix is
+     * assumed on all routes defined on this router.
+     */
+    rootURL: string;
+    /**
+     * Transition the application into another route. The route may
+     * be either a single route or route path:
+     */
+    transitionTo(name: string, options?: {}): Transition;
+    transitionTo(name: string, ...models: any[]): Transition;
+    transitionTo(name: string, options: {}): Transition;
+}
+
+declare module '@ember/service' {
+    interface Registry {
+        'router': RouterService;
+    }
+}
diff --git a/types/preview/@ember/routing/test/built-ins.ts b/types/preview/@ember/routing/test/built-ins.ts
new file mode 100644
index 00000000000..40db98e07cf
--- /dev/null
+++ b/types/preview/@ember/routing/test/built-ins.ts
@@ -0,0 +1,3 @@
+import { LinkTo } from '@ember/routing';
+
+LinkTo; // $ExpectType LinkTo
diff --git a/types/preview/@ember/routing/test/lib/assert.ts b/types/preview/@ember/routing/test/lib/assert.ts
new file mode 100755
index 00000000000..dad227ab5e9
--- /dev/null
+++ b/types/preview/@ember/routing/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/routing/test/route.ts b/types/preview/@ember/routing/test/route.ts
new file mode 100755
index 00000000000..42c53d4e73b
--- /dev/null
+++ b/types/preview/@ember/routing/test/route.ts
@@ -0,0 +1,227 @@
+import Route from '@ember/routing/route';
+import Array from '@ember/array';
+import EmberObject from '@ember/object';
+import Controller from '@ember/controller';
+import Transition from '@ember/routing/transition';
+import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
+
+class Post extends EmberObject {}
+
+interface Posts extends Array<Post> {}
+
+Route.extend({
+    beforeModel(transition: Transition) {
+        this.transitionTo('someOtherRoute');
+    },
+});
+
+Route.extend({
+    afterModel(posts: Posts, transition: Transition) {
+        if (posts.firstObject) {
+            this.transitionTo('post.show', posts.firstObject);
+        }
+    },
+});
+
+Route.extend({
+    model() {
+        return this.modelFor('post');
+    },
+});
+
+Route.extend({
+    queryParams: {
+        memberQp: { refreshModel: true },
+    },
+});
+
+Route.extend({
+    resetController(controller: Controller, isExiting: boolean, transition: Transition) {
+        if (isExiting) {
+            //   controller.set('page', 1);
+            transition.abort();
+        }
+    },
+});
+
+class ActivateRoute extends Route {
+    activate(transition: Transition) {
+        this.transitionTo('someOtherRoute');
+    }
+}
+
+class DeactivateRoute extends Route {
+    deactivate(transition: Transition) {
+        this.transitionTo('someOtherRoute');
+    }
+}
+
+class RedirectRoute extends Route {
+    redirect(model: {}, a: Transition) {
+        if (!model) {
+            this.transitionTo('there');
+        }
+    }
+}
+
+class InvalidRedirect extends Route {
+    // @ts-expect-error
+    redirect(model: {}, a: Transition, anOddArg: unknown) {
+        if (!model) {
+            this.transitionTo('there');
+        }
+    }
+}
+
+class TransitionToExamples extends Route {
+    // NOTE: this one won't check that `queryParams` has the right shape,
+    // because the overload for the version where `models` are passed
+    // necessarily includes all objects.
+    transitionToModelAndQP() {
+        // $ExpectType Transition<unknown>
+        this.transitionTo('somewhere', { queryParams: { neat: true } });
+    }
+
+    transitionToJustQP() {
+        // $ExpectType Transition<unknown>
+        this.transitionTo({ queryParams: { neat: 'true' } });
+    }
+
+    transitionToNonsense() {
+        // @ts-expect-error
+        this.transitionTo({ cannotDoModelHere: true });
+    }
+
+    transitionToBadQP() {
+        // @ts-expect-error
+        this.transitionTo({ queryParams: 12 });
+    }
+
+    transitionToId() {
+        // $ExpectType Transition<unknown>
+        this.transitionTo('blog-post', 1);
+    }
+
+    transitionToIdWithQP() {
+        // $ExpectType Transition<unknown>
+        this.transitionTo('blog-post', 1, { queryParams: { includeComments: true } });
+    }
+
+    transitionToIds() {
+        // $ExpectType Transition<unknown>
+        this.transitionTo('blog-comment', 1, '13');
+    }
+
+    transitionToIdsWithQP() {
+        // $ExpectType Transition<unknown>
+        this.transitionTo('blog-comment', 1, '13', { queryParams: { includePost: true } });
+    }
+
+    buildRouteInfoMetadata() {
+        return { foo: 'bar' };
+    }
+}
+
+class ApplicationController extends Controller {}
+declare module '@ember/controller' {
+    interface Registry {
+        application: ApplicationController;
+    }
+}
+
+Route.extend({
+    setupController(controller: Controller, model: {}, transition: Transition) {
+        this._super(controller, model);
+        this.controllerFor('application').set('model', model);
+        transition.abort();
+    },
+});
+
+const route = Route.create();
+route.controllerFor('whatever'); // $ExpectType Controller
+route.paramsFor('whatever'); // $ExpectType object
+
+class RouteUsingClass extends Route.extend({
+    randomProperty: 'the .extend + extends bit type-checks properly',
+}) {
+    beforeModel() {
+        return Promise.resolve('beforeModel can return promises');
+    }
+    afterModel(resolvedModel: unknown, transition: Transition) {
+        return Promise.resolve('afterModel can also return promises');
+    }
+    intermediateTransitionWithoutModel() {
+        this.intermediateTransitionTo('some-route');
+    }
+    intermediateTransitionWithModel() {
+        this.intermediateTransitionTo('some.other.route', {});
+    }
+    intermediateTransitionWithMultiModel() {
+        this.intermediateTransitionTo('some.other.route', 1, 2, {});
+    }
+}
+
+class WithNonReturningBeforeAndModelHooks extends Route {
+    beforeModel(transition: Transition): void | Promise<unknown> {
+        return;
+    }
+
+    afterModel(resolvedModel: unknown, transition: Transition): void {
+        return;
+    }
+}
+
+class WithBadReturningBeforeAndModelHooks extends Route {
+    beforeModel(transition: Transition): void | Promise<unknown> {
+        // @ts-expect-error
+        return "returning anything else is nonsensical (if 'legal')";
+    }
+
+    afterModel(resolvedModel: unknown, transition: Transition): void {
+        // @ts-expect-error
+        return "returning anything else is nonsensical (if 'legal')";
+    }
+}
+
+interface RouteParams {
+    cool: string;
+}
+
+class WithParamsInModel extends Route<boolean, RouteParams> {
+    model(params: RouteParams, transition: Transition) {
+        return true;
+    }
+}
+
+// @ts-expect-error
+class WithNonsenseParams extends Route<boolean, number> {}
+
+class WithImplicitParams extends Route {
+    model(params: RouteParams) {
+        return { whatUp: 'dog' };
+    }
+}
+
+// $ExpectType RouteParams
+type ImplicitParams = WithImplicitParams extends Route<any, infer T> ? T : never;
+
+// back-compat for existing users of these
+// NOTE: we will *not* migrate the private import locations when moving to
+// publish from Ember itself.
+import PrivateTransition from '@ember/routing/-private/transition';
+declare let publicTransition: Transition;
+declare let oldPrivateTransition: PrivateTransition;
+publicTransition = oldPrivateTransition;
+oldPrivateTransition = publicTransition;
+
+import PrivateRouteInfo from '@ember/routing/-private/route-info';
+declare let publicRouteInfo: RouteInfo;
+declare let privateRouteInfo: PrivateRouteInfo;
+publicRouteInfo = privateRouteInfo;
+privateRouteInfo = publicRouteInfo;
+
+import PrivateRouteInfoWithAttributes from '@ember/routing/-private/route-info-with-attributes';
+declare let publicRouteInfoWithAttributes: RouteInfoWithAttributes;
+declare let privateRouteInfoWithAttributes: PrivateRouteInfoWithAttributes;
+publicRouteInfoWithAttributes = privateRouteInfoWithAttributes;
+privateRouteInfoWithAttributes = publicRouteInfoWithAttributes;
diff --git a/types/preview/@ember/routing/test/router-service.ts b/types/preview/@ember/routing/test/router-service.ts
new file mode 100644
index 00000000000..10875f86b1d
--- /dev/null
+++ b/types/preview/@ember/routing/test/router-service.ts
@@ -0,0 +1,120 @@
+import RouterService from '@ember/routing/router-service';
+
+declare let router: RouterService;
+
+router.transitionTo('someRoute');
+router.transitionTo('someRoute', { withModel: true });
+router.transitionTo('someRoute', { withModel: true }, { queryParams: {} });
+router.transitionTo(
+    'someRoute',
+    { withModel: true },
+    { withMultipleModels: 'still checks correctly' },
+    { queryParams: {} },
+);
+
+const routeWillChangeHandler = () => {};
+
+// $ExpectType RouterService
+router.on('routeWillChange', routeWillChangeHandler);
+
+// $ExpectType boolean
+router.has('routeWillChange');
+
+// $ExpectType RouterService
+router.off('routeWillChange', routeWillChangeHandler);
+
+// $ExpectType RouterService
+router.one('routeWillChange', routeWillChangeHandler);
+
+// $ExpectType void
+router.trigger('routeWillChange', 'boo');
+
+const transition = router.transitionTo('someRoute');
+
+// $ExpectType Transition<unknown>
+transition.abort();
+
+// $ExpectType Promise<unknown>
+transition.catch();
+transition.catch(err => console.log(err), 'label');
+
+// $ExpectType Promise<unknown>
+transition.finally();
+transition.finally(() => console.log('finally!'));
+transition.finally(() => console.log('finally!'), 'label');
+
+// $ExpectType Promise<unknown>
+transition.followRedirects();
+
+// $ExpectType Transition<unknown>
+transition.method();
+transition.method('replace');
+
+// $ExpectType Transition<unknown>
+transition.retry();
+
+// $ExpectType Promise<unknown>
+transition.then();
+transition.then(
+    result => console.log(result),
+    err => console.log(err),
+    'label',
+);
+
+// $ExpectType void
+transition.trigger(false, 'error');
+
+// $ExpectType void
+transition.send(false, 'error');
+
+transition.data = { some: 'data' };
+
+// $ExpectType RouteInfoWithAttributes | null
+transition.from;
+// @ts-expect-error
+transition.from = 'from';
+
+// $ExpectType Promise<unknown>
+transition.promise;
+// @ts-expect-error
+transition.promise = 'promise';
+
+// $ExpectType RouteInfo | RouteInfoWithAttributes
+transition.to;
+// @ts-expect-error
+transition.to = 'to';
+
+// $ExpectType unknown
+transition.to.metadata;
+// @ts-expect-error
+transition.to.metadata = 'foo';
+
+// NOTE: we cannot check the validity of invocations with just route name and
+// query params beyond that the second argument is an object of some sort,
+// because TS will always resolve it to the `models` variant if the
+// `queryParams` variant fails.
+// $ExpectType Transition<unknown>
+router.transitionTo('someRoute', { queryParams: { shouldWork: true } });
+// $ExpectType Transition<unknown>
+router.transitionTo({ queryParams: { areSupported: true } });
+// @ts-expect-error
+router.transitionTo({ queryParams: 'potato' });
+// $ExpectType Transition<unknown>
+router.transitionTo('someRoute', 1);
+// $ExpectType Transition<unknown>
+router.transitionTo('someRoute', 1, { queryParams: { areSupported: true } });
+// $ExpectType Transition<unknown>
+router.transitionTo('someRoute', 1, '13');
+// $ExpectType Transition<unknown>
+router.transitionTo('someRoute', 1, '13', { queryParams: { areSupported: true } });
+
+router.recognize('foo/bar'); // $ExpectType RouteInfo
+
+router.recognizeAndLoad('foo/bar'); // $ExpectType RouteInfoWithAttributes
+
+router.rootURL; // $ExpectType string
+// @ts-expect-error
+router.rootURL = 'foo';
+
+router.refresh(); // $ExpectType Transition<unknown>
+router.refresh('my-route'); // $ExpectType Transition<unknown>
diff --git a/types/preview/@ember/routing/test/router.ts b/types/preview/@ember/routing/test/router.ts
new file mode 100755
index 00000000000..0ef27748380
--- /dev/null
+++ b/types/preview/@ember/routing/test/router.ts
@@ -0,0 +1,81 @@
+import Router from '@ember/routing/router';
+import Service, { inject as service } from '@ember/service';
+import EmberObject, { get } from '@ember/object';
+
+const AppRouter = Router.extend({});
+
+AppRouter.map(function () {
+    this.route('index', { path: '/' });
+    this.route('about');
+    this.route('favorites', { path: '/favs' });
+    this.route('posts', function () {
+        this.route('index', { path: '/' });
+        this.route('new');
+        this.route('post', { path: '/post/:post_id', resetNamespace: true });
+        this.route('comments', { resetNamespace: true }, function () {
+            this.route('new');
+        });
+    });
+    this.route('photo', { path: '/photo/:id' }, function () {
+        this.route('comment', { path: '/comment/:id' });
+    });
+    this.route('not-found', { path: '/*path' });
+    this.mount('my-engine');
+    this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine' });
+});
+
+const RouterServiceConsumer = Service.extend({
+    router: service('router'),
+    currentRouteName() {
+        const x: string = get(this, 'router').currentRouteName;
+    },
+    currentURL() {
+        const x: string = get(this, 'router').currentURL;
+    },
+    rootURL() {
+        const x: string = get(this, 'router').rootURL;
+    },
+    transitionWithoutModel() {
+        get(this, 'router').transitionTo('some-route');
+    },
+    transitionWithModel() {
+        const model = EmberObject.create();
+        get(this, 'router').transitionTo('some.other.route', model);
+    },
+    transitionWithMultiModel() {
+        const model = EmberObject.create();
+        get(this, 'router').transitionTo('some.other.route', model, model);
+    },
+    transitionWithModelAndOptions() {
+        const model = EmberObject.create();
+        get(this, 'router').transitionTo('index', model, { queryParams: { search: 'ember' } });
+    },
+    onAndRouteInfo() {
+        const router = get(this, 'router');
+        router
+            .on('routeWillChange', transition => {
+                const to = transition.to;
+                to.child; // $ExpectType RouteInfo | null
+                to.localName; // $ExpectType string
+                to.name; // $ExpectType string
+                to.paramNames; // $ExpectType string[]
+                to.params.foo; // $ExpectType string | undefined
+                to.parent; // $ExpectType RouteInfo | null
+                to.queryParams.foo; // $ExpectType string | undefined
+                to.find(info => info.name === 'foo'); // $ExpectType RouteInfo | undefined
+            })
+            .on('routeDidChange', transition => {
+                const from = transition.from;
+                if (from) {
+                    from.child; // $ExpectType RouteInfo | null
+                    from.localName; // $ExpectType string
+                    from.name; // $ExpectType string
+                    from.paramNames; // $ExpectType string[]
+                    from.params.foo; // $ExpectType string | undefined
+                    from.parent; // $ExpectType RouteInfo | null
+                    from.queryParams.foo; // $ExpectType string | undefined
+                    from.find(info => info.name === 'foo'); // $ExpectType RouteInfo | undefined
+                }
+            });
+    },
+});
diff --git a/types/preview/@ember/routing/transition.d.ts b/types/preview/@ember/routing/transition.d.ts
new file mode 100644
index 00000000000..b623b76b634
--- /dev/null
+++ b/types/preview/@ember/routing/transition.d.ts
@@ -0,0 +1,124 @@
+import RouteInfo, { RouteInfoWithAttributes } from './route-info';
+
+/**
+ * A Transition is a thennable (a promise-like object) that represents an
+ * attempt to transition to another route. It can be aborted, either explicitly
+ * via `abort` or by attempting another transition while a previous one is still
+ * underway. An aborted transition can also be `retry()`d later.
+ *
+ * @note This is a non-user-constructible type. The only legal way to get a
+ *   transition is using one of the public API methods on routes, controllers,
+ *   the router service, etc.
+ */
+export default interface Transition<T = unknown> extends Partial<Promise<T>> {
+    /**
+     * Custom state can be stored on a Transition's `data` object.
+     * This can be useful for decorating a Transition within an earlier hook and shared with a later hook.
+     * Properties set on `data` will be copied to new transitions generated by calling `retry` on this transition.
+     */
+    data: Record<string, unknown>;
+    /**
+     * This property is a `RouteInfo` object that represents where transition originated from.
+     * It's important to note that a `RouteInfo` is a linked list and this property is simply the head node of the list.
+     * In the case of an initial render, `from` will be set to `null`.
+     */
+    readonly from: RouteInfoWithAttributes | null;
+    /**
+     * The Transition's internal promise.
+     * Calling `.then` on this property is that same as calling `.then` on the Transition object itself,
+     * but this property is exposed for when you want to pass around a Transition's promise,
+     * but not the Transition object itself, since Transition object can be externally `abort`ed,
+     * while the promise cannot.
+     */
+    readonly promise: Promise<T>;
+    /**
+     * This property is a `RouteInfo` object that represents where the router is transitioning to.
+     * It's important to note that a `RouteInfo` is a linked list and this property is simply the leafmost route.
+     */
+    readonly to: RouteInfo | RouteInfoWithAttributes;
+    /**
+     * Aborts the Transition. Note you can also implicitly abort a transition
+     * by initiating another transition while a previous one is underway.
+     */
+    abort(): Transition<T>;
+    /**
+     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+     * but not the Transition itself.
+     *
+     * @param onRejection
+     * @param label optional string for labeling the promise. Useful for tooling.
+     */
+    catch<TResult = never>(
+        onRejected?: (reason: unknown) => TResult | PromiseLike<TResult>,
+        label?: string,
+    ): Promise<TResult | T>;
+    /**
+     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+     * but not the Transition itself.
+     *
+     * @param onFinally
+     * @param label optional string for labeling the promise. Useful for tooling.
+     */
+    finally(onFinally?: () => void, label?: string): Promise<T>;
+    /**
+     * Transitions are aborted and their promises rejected when redirects occur;
+     * this method returns a promise that will follow any redirects that occur and
+     * fulfill with the value fulfilled by any redirecting transitions that occur.
+     *
+     * @return a promise that fulfills with the same value that the final redirecting transition fulfills with
+     */
+    followRedirects(): Promise<T>;
+    /**
+     * Sets the URL-changing method to be employed at the end of a successful transition.
+     * By default, a new Transition will just use `updateURL`,
+     * but passing 'replace' to this method will cause the URL to update using 'replaceWith' instead.
+     * Omitting a parameter will disable the URL change,
+     * allowing for transitions that don't update the URL at completion
+     * (this is also used for handleURL, since the URL has already changed before the transition took place).
+     *
+     * @param  method the type of URL-changing method to use at the end of a transition. Accepted values are 'replace',
+     *                falsy values, or any other non-falsy value (which is interpreted as an updateURL transition).
+     * @return        This transition
+     */
+    method(method?: string): Transition<T>;
+    /**
+     * Retries a previously-aborted transition (making sure to abort the
+     * transition if it's still active). Returns a new transition that
+     * represents the new attempt to transition.
+     */
+    retry(): Transition<T>;
+    /**
+     * A standard promise hook that resolves if the transition succeeds and rejects if it fails/redirects/aborts.
+     *
+     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+     * but not the Transition itself.
+     *
+     * @param  onFulfilled
+     * @param  onRejected
+     * @param  label label optional string for labeling the promise. Useful for tooling.
+     */
+    then<TResult1 = T, TResult2 = never>(
+        onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>,
+        onrejected?: (reason: unknown) => TResult2 | PromiseLike<TResult2>,
+        label?: string,
+    ): Promise<TResult1 | TResult2>;
+    /**
+     * Fires an event on the current list of resolved/resolving handlers within this transition.
+     * Useful for firing events on route hierarchies that haven't fully been entered yet.
+     *
+     * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
+     * @param  name          the name of the event to fire
+     */
+    send(ignoreFailure: boolean, name: string): void;
+    /**
+     * Fires an event on the current list of resolved/resolving handlers within this transition.
+     * Useful for firing events on route hierarchies that haven't fully been entered yet.
+     * Note: This method is also aliased as `send`
+     *
+     * @alias send
+     *
+     * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
+     * @param  name          the name of the event to fire
+     */
+    trigger(ignoreFailure: boolean, name: string): void;
+}
diff --git a/types/preview/@ember/routing/tsconfig.json b/types/preview/@ember/routing/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/routing/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/routing/types.d.ts b/types/preview/@ember/routing/types.d.ts
new file mode 100644
index 00000000000..251a295fcc4
--- /dev/null
+++ b/types/preview/@ember/routing/types.d.ts
@@ -0,0 +1,13 @@
+export interface RenderOptions {
+    into?: string | undefined;
+    controller?: string | undefined;
+    model?: unknown;
+    outlet?: string | undefined;
+    view?: string | undefined;
+}
+
+export interface RouteQueryParam {
+    refreshModel?: boolean | undefined;
+    replace?: boolean | undefined;
+    as?: string | undefined;
+}
diff --git a/types/preview/@ember/runloop/-private/backburner.d.ts b/types/preview/@ember/runloop/-private/backburner.d.ts
new file mode 100644
index 00000000000..676a3b36ada
--- /dev/null
+++ b/types/preview/@ember/runloop/-private/backburner.d.ts
@@ -0,0 +1,41 @@
+import { EmberMethod, EmberMethodParams } from "ember/-private/type-utils";
+
+export interface QueueItem {
+    method: string;
+    target: object;
+    args: object[];
+    stack: string | undefined;
+}
+
+export interface DeferredActionQueues {
+    [index: string]: unknown;
+    queues: object;
+    schedule<T, M extends EmberMethod<T>>(
+        ...args: [
+            queueName: string,
+            target: T,
+            method: M,
+            ...methodArgs: EmberMethodParams<T, M>,
+            onceFlag: boolean,
+            stack: unknown
+        ]
+    ): any;
+    flush(fromAutorun: boolean): any;
+}
+
+export interface DebugInfo {
+    autorun: Error | undefined | null;
+    counters: object;
+    timers: QueueItem[];
+    instanceStack: DeferredActionQueues[];
+}
+
+export interface Backburner {
+    join(...args: any[]): void;
+    on(...args: any[]): void;
+    scheduleOnce(...args: any[]): void;
+    schedule(queueName: string, target: object | null, method: () => void | string): void;
+    ensureInstance(): void;
+    DEBUG: boolean;
+    getDebugInfo(): DebugInfo;
+}
diff --git a/types/preview/@ember/runloop/-private/types.d.ts b/types/preview/@ember/runloop/-private/types.d.ts
new file mode 100644
index 00000000000..48384ec84bb
--- /dev/null
+++ b/types/preview/@ember/runloop/-private/types.d.ts
@@ -0,0 +1 @@
+export type EmberRunQueues = 'sync' | 'actions' | 'routerTransitions' | 'render' | 'afterRender' | 'destroy';
diff --git a/types/preview/@ember/runloop/ember__runloop-tests.ts b/types/preview/@ember/runloop/ember__runloop-tests.ts
new file mode 100644
index 00000000000..5192db4bcae
--- /dev/null
+++ b/types/preview/@ember/runloop/ember__runloop-tests.ts
@@ -0,0 +1,279 @@
+import {
+  run,
+  begin,
+  bind,
+  cancel,
+  debounce,
+  end,
+  join,
+  later,
+  next,
+  once,
+  schedule,
+  scheduleOnce,
+  throttle,
+  // private, supported via `declare module` below
+  _backburner
+} from '@ember/runloop';
+import EmberObject from '@ember/object';
+import { Backburner, DebugInfo, QueueItem, DeferredActionQueues } from '@ember/runloop/-private/backburner';
+
+// It will be the responsibility of each consuming package that needs access to the backburner property
+// to merge the private types in the public API.
+declare module '@ember/runloop' {
+  const _backburner: Backburner;
+}
+
+function testRun() {
+    run(() => { // $ExpectType number
+        // code to be executed within a RunLoop
+        return 123;
+    });
+
+    // run(target, method)
+    run({}, () => {
+        // code to be executed within a RunLoop
+        return 123;
+    });
+
+    // run(target, method, ...args)
+    run(
+        {},
+        (beforeExecute: () => void, extraLog: string, misc: unknown) => {
+            // code to be executed within a RunLoop
+            beforeExecute();
+            console.log(extraLog);
+            console.info(misc);
+            return 123;
+        },
+        () => {
+            console.log('foo');
+        },
+        'bar',
+        {}
+    );
+
+    function destroyApp(application: EmberObject) {
+        run(application, 'destroy');
+        run(application, function() {
+            this.destroy();
+        });
+    }
+}
+
+function testBind() {
+    EmberObject.extend({
+        init() {
+            const bound = bind(this, this.setupEditor);
+            bound();
+        },
+
+        editor: null as string | null,
+
+        setupEditor(editor: string) {
+            this.set('editor', editor);
+        }
+    });
+}
+
+function testCancel() {
+    const myContext = {
+        method(arg: string, another: number): number {
+            return arg.length + another;
+        }
+    };
+
+    cancel(undefined);
+
+    const runNext = next(myContext, () => {
+        // will not be executed
+    });
+
+    cancel(runNext);
+
+    const anotherRunNext = next(myContext, 'method', "hello", 123);
+    // @ts-expect-error
+    const aBadRunNext = next(myContext, 'method', false, "goodbye");
+
+    const aSimpleNext = next((name: string) => name.length, "hello");
+
+    const runLater = later(myContext, () => {
+        // will not be executed
+    }, 500);
+
+    cancel(runLater);
+
+    const runScheduleOnce = scheduleOnce('afterRender', myContext, () => {
+        // will not be executed
+    });
+
+    cancel(runScheduleOnce);
+
+    const anotherScheduleOnce =
+        scheduleOnce('render', myContext, 'method', "hello", 123);
+
+    const aBadScheduleOnce =
+        // @ts-expect-error
+        scheduleOnce('render', myContext, 'method', true, "boo");
+
+    const runOnce = once(myContext, () => {
+        // will not be executed
+    });
+
+    cancel(runOnce);
+
+    const throttled = throttle(myContext, () => {
+        // will not be executed
+    }, 1, false);
+
+    cancel(throttled);
+
+    const aGoodThrottled = throttle(myContext, 'method', "hello", 123, 1_000);
+    const anotherGoodThrottled = throttle(myContext, 'method', "hello", 123, 1_000, true);
+    // @ts-expect-error
+    const aBadThrottled = throttle(myContext, 'method', 1_000);
+    // @ts-expect-error
+    const anotherBadThrottled = throttle(myContext, 'method', false, {}, 1_000);
+
+    const debounced = debounce(myContext, () => {
+        // will not be executed
+    }, 1);
+
+    cancel(debounced);
+
+    const debounceImmediate = debounce(myContext, () => {
+        // will be executed since we passed in true (immediate)
+    }, 100, true);
+
+    // the 100ms delay until this method can be called again will be canceled
+    cancel(debounceImmediate);
+}
+
+function testDebounce() {
+    function runIt() {
+    }
+
+    const myContext = { name: 'debounce' };
+
+    debounce(runIt, 150);
+    debounce(myContext, runIt, 150);
+    debounce(myContext, runIt, 150, true);
+
+    EmberObject.extend({
+        searchValue: 'test',
+        fetchResults(value: string) {},
+
+        actions: {
+            handleTyping() {
+                // the fetchResults function is passed into the component from its parent
+                debounce(this, this.get('fetchResults'), this.get('searchValue'), 250);
+            }
+        }
+    });
+}
+
+function testBegin() {
+    begin();
+    // code to be executed within a RunLoop
+    end();
+}
+
+function testJoin() {
+    join(() => {
+        // creates a new run-loop
+    });
+
+    run(() => {
+        // creates a new run-loop
+        join(() => {
+            // joins with the existing run-loop, and queues for invocation on
+            // the existing run-loops action queue.
+        });
+    });
+
+    later(() => {
+        console.log({ msg: 'Hold Your Horses' });
+    }, 3000);
+}
+
+function testLater() {
+    const myContext = {};
+    later(myContext, () => {
+        // code here will execute within a RunLoop in about 500ms with this == myContext
+    }, 500);
+}
+
+function testNext() {
+    const myContext = {};
+    next(myContext, () => {
+        // code to be executed in the next run loop,
+        // which will be scheduled after the current one
+    });
+    next(() => {
+        // code to be executed in the next run loop,
+        // which will be scheduled after the current one
+    });
+}
+
+function testOnce() {
+    EmberObject.extend({
+        init() {
+            once(this, 'processFullName');
+        },
+
+        processFullName() {
+        }
+    });
+}
+
+function testSchedule() {
+    EmberObject.extend({
+        init() {
+            schedule('sync', this, () => {
+                // this will be executed in the first RunLoop queue, when bindings are synced
+                console.log('scheduled on sync queue');
+            });
+
+            schedule('actions', this, () => {
+                // this will be executed in the 'actions' queue, after bindings have synced.
+                console.log('scheduled on actions queue');
+            });
+        }
+    });
+
+    schedule('actions', () => {
+        // Do more things
+    });
+}
+
+function testScheduleOnce() {
+    function sayHi() {
+        console.log('hi');
+    }
+
+    const myContext = {};
+    run(() => {
+        scheduleOnce('afterRender', myContext, sayHi);
+        scheduleOnce('afterRender', myContext, sayHi);
+        // sayHi will only be executed once, in the afterRender queue of the RunLoop
+    });
+    scheduleOnce('actions', myContext, () => {
+        console.log('Closure');
+    });
+}
+
+function testThrottle() {
+    function runIt() {
+    }
+
+    const myContext = { name: 'throttle' };
+
+    throttle(runIt, 150);
+    throttle(myContext, runIt, 150);
+}
+
+function testBackburner() {
+  const debugInfo: DebugInfo = _backburner.getDebugInfo();
+  const queueItems: QueueItem[] = debugInfo.timers;
+  const deferredActionQueues: DeferredActionQueues[] = debugInfo.instanceStack;
+}
diff --git a/types/preview/@ember/runloop/index.d.ts b/types/preview/@ember/runloop/index.d.ts
new file mode 100644
index 00000000000..7265638796a
--- /dev/null
+++ b/types/preview/@ember/runloop/index.d.ts
@@ -0,0 +1,179 @@
+// Type definitions for non-npm package @ember/runloop 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Frunloop
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import { EmberMethod, EmberMethodParams, AnyFn, EmberMethodReturn } from "ember/-private/type-utils";
+import { EmberRunQueues } from './-private/types';
+import { EmberRunTimer } from "@ember/runloop/types";
+import '@ember/runloop/-private/backburner';
+
+/**
+ * Runs the passed target and method inside of a RunLoop, ensuring any
+ * deferred actions including bindings and views updates are flushed at the
+ * end.
+ */
+export function run<M extends AnyFn>(method: M): ReturnType<M>;
+export function run<T, M extends EmberMethod<T>>(target: T, method: M, ...args: EmberMethodParams<T, M>): EmberMethodReturn<T, M>;
+
+/**
+ * If no run-loop is present, it creates a new one. If a run loop is
+ * present it will queue itself to run on the existing run-loops action
+ * queue.
+ */
+export function join<M extends AnyFn>(method: M, ...args: Parameters<M>): ReturnType<M> | undefined;
+export function join<T, M extends EmberMethod<T>>(
+   target: T,
+   method: M,
+   ...args: EmberMethodParams<T, M>
+): EmberMethodReturn<T, M> | undefined;
+
+/**
+ * Allows you to specify which context to call the specified function in while
+ * adding the execution of that function to the Ember run loop. This ability
+ * makes this method a great way to asynchronously integrate third-party libraries
+ * into your Ember application.
+ */
+// NOTE: it would be nice to make this curry arguments, which is how it actually
+// works, but that is a *lot* of type shenanigans, and also diverges from the
+// `Function.prototype.bind` implementation. We should track the latter, despite
+// the loss of safety, because it makes interop cleaner.
+export function bind<T, M extends EmberMethod<T>>(
+   target: T,
+   method: M,
+   ...args: any[]
+): (...args: any[]) => EmberMethodReturn<T, M>;
+
+/**
+ * Begins a new RunLoop. Any deferred actions invoked after the begin will
+ * be buffered until you invoke a matching call to `run.end()`. This is
+ * a lower-level way to use a RunLoop instead of using `run()`.
+ */
+export function begin(): void;
+
+/**
+ * Ends a RunLoop. This must be called sometime after you call
+ * `run.begin()` to flush any deferred actions. This is a lower-level way
+ * to use a RunLoop instead of using `run()`.
+ */
+export function end(): void;
+
+/**
+ * Adds the passed target/method and any optional arguments to the named
+ * queue to be executed at the end of the RunLoop. If you have not already
+ * started a RunLoop when calling this method one will be started for you
+ * automatically.
+ */
+export function schedule<T, M extends EmberMethod<T>>(
+   queue: EmberRunQueues,
+   target: T,
+   method: M,
+   ...args: EmberMethodParams<T, M>
+): EmberRunTimer;
+export function schedule<M extends AnyFn>(
+   queue: EmberRunQueues,
+   method: M,
+   ...args: Parameters<M>
+): EmberRunTimer;
+
+/**
+ * Invokes the passed target/method and optional arguments after a specified
+ * period of time. The last parameter of this method must always be a number
+ * of milliseconds.
+ */
+export function later(method: AnyFn, wait: number): EmberRunTimer;
+export function later<T, M extends EmberMethod<T>>(
+    ...args: [
+        target: T,
+        method: M,
+        ...args: EmberMethodParams<T, M>,
+        wait: number,
+    ]
+): EmberRunTimer;
+
+/**
+ * Schedule a function to run one time during the current RunLoop. This is equivalent
+ * to calling `scheduleOnce` with the "actions" queue.
+ */
+export function once<T, M extends EmberMethod<T>>(
+   target: T,
+   method: M,
+   ...args: EmberMethodParams<T, M>
+): EmberRunTimer;
+
+/**
+ * Schedules a function to run one time in a given queue of the current RunLoop.
+ * Calling this method with the same queue/target/method combination will have
+ * no effect (past the initial call).
+ */
+export function scheduleOnce<T, M extends EmberMethod<T>>(
+   queue: EmberRunQueues,
+   target: T,
+   method: M,
+   ...args: EmberMethodParams<T, M>
+): EmberRunTimer;
+
+/**
+ * Schedules an item to run from within a separate run loop, after
+ * control has been returned to the system. This is equivalent to calling
+ * `run.later` with a wait time of 1ms.
+ */
+export function next<T, M extends EmberMethod<T>>(
+   target: T,
+   method: M,
+   ...args: EmberMethodParams<T, M>
+): EmberRunTimer;
+export function next<M extends AnyFn>(
+ method: M,
+ ...args: Parameters<M>
+): EmberRunTimer;
+
+/**
+ * Cancels a scheduled item. Must be a value returned by `run.later()`,
+ * `run.once()`, `run.scheduleOnce()`, `run.next()`, `run.debounce()`, or
+ * `run.throttle()`.
+ */
+export function cancel(timer?: EmberRunTimer): boolean;
+
+/**
+ * Delay calling the target method until the debounce period has elapsed
+ * with no additional debounce calls. If `debounce` is called again before
+ * the specified time has elapsed, the timer is reset and the entire period
+ * must pass again before the target method is called.
+ */
+export function debounce(
+   method: AnyFn,
+   wait: number,
+   immediate?: boolean
+): EmberRunTimer;
+export function debounce<Target, M extends EmberMethod<Target>>(
+    ...args: [
+        target: Target,
+        method: M,
+        ...args: EmberMethodParams<Target, M>,
+        wait: number,
+        immediate?: boolean
+    ]
+): EmberRunTimer;
+
+/**
+ * Ensure that the target method is never called more frequently than
+ * the specified spacing period. The target method is called immediately.
+ */
+export function throttle(
+   method: AnyFn,
+   spacing: number,
+   immediate?: boolean
+): EmberRunTimer;
+export function throttle<T, M extends EmberMethod<T>>(
+    ...args: [
+        target: T,
+        method: M,
+        ...methodArgs: EmberMethodParams<T, M>,
+        spacing: number,
+        immediate?: boolean
+    ]
+): EmberRunTimer;
diff --git a/types/preview/@ember/runloop/tsconfig.json b/types/preview/@ember/runloop/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/runloop/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/runloop/types.d.ts b/types/preview/@ember/runloop/types.d.ts
new file mode 100644
index 00000000000..2aeaa44726a
--- /dev/null
+++ b/types/preview/@ember/runloop/types.d.ts
@@ -0,0 +1,3 @@
+export interface EmberRunTimer {
+    __ember_run_timer_brand__: boolean;
+}
diff --git a/types/preview/@ember/service/index.d.ts b/types/preview/@ember/service/index.d.ts
new file mode 100644
index 00000000000..798774107b8
--- /dev/null
+++ b/types/preview/@ember/service/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for non-npm package @ember/service 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fservice
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import EmberObject from '@ember/object';
+import ComputedProperty from '@ember/object/computed';
+
+export default class Service extends EmberObject {}
+/**
+ * Creates a property that lazily looks up a service in the container. There
+ * are no restrictions as to what objects a service can be injected into.
+ */
+export function inject(): ComputedProperty<Service>; // @inject() foo, foo: inject()
+export function inject(target: object, propertyKey: string | symbol): void; // @inject foo
+export function inject<K extends keyof Registry>(name: K): ComputedProperty<Registry[K]>; // @inject('store') foo      @inject() foo
+
+/**
+ * Creates a property that lazily looks up a service in the container. There
+ * are no restrictions as to what objects a service can be injected into.
+ */
+export function service(): ComputedProperty<Service>; // @service() foo, foo: service()
+export function service(target: object, propertyKey: string | symbol): void; // @service foo
+export function service<K extends keyof Registry>(name: K): ComputedProperty<Registry[K]>; // @service('store') foo      @service() foo
+
+// A type registry for Ember `Service`s. Meant to be declaration-merged so
+// string lookups resolve to the correct type.
+// tslint:disable-next-line no-empty-interface strict-export-declare-modifiers
+interface Registry {}
diff --git a/types/preview/@ember/service/test/main.ts b/types/preview/@ember/service/test/main.ts
new file mode 100644
index 00000000000..3fca6a674aa
--- /dev/null
+++ b/types/preview/@ember/service/test/main.ts
@@ -0,0 +1,58 @@
+import Service, { inject, service } from '@ember/service';
+import EmberObject from '@ember/object';
+
+class FirstSvc extends Service {
+    foo = 'bar';
+    first() {
+        return '';
+    }
+}
+const SecondSvc = Service.extend({
+    foo: 'bar',
+    second() {
+        return '';
+    },
+});
+
+class ThirdSvc extends Service.extend({
+    foo: 'bar',
+    third() {
+        return '';
+    },
+}) {}
+
+declare module '@ember/service' {
+    interface Registry {
+        first: FirstSvc;
+        second: InstanceType<typeof SecondSvc>;
+        third: ThirdSvc;
+    }
+}
+
+const ServiceTriplet = EmberObject.extend({
+    sFirst: inject('first'),
+    sSecond: inject('second'),
+    sThird: inject('third'),
+    unknownService: inject(),
+});
+
+const obj = ServiceTriplet.create();
+
+obj.get('sFirst'); // $ExpectType FirstSvc
+obj.get('sSecond').second(); // $ExpectType ""
+obj.get('sThird'); // $ExpectType ThirdSvc
+obj.get('unknownService'); // $ExpectType Service
+
+const ServiceTripletService = EmberObject.extend({
+    sFirst: service('first'),
+    sSecond: service('second'),
+    sThird: service('third'),
+    unknownService: service(),
+});
+
+const objService = ServiceTripletService.create();
+
+objService.get('sFirst'); // $ExpectType FirstSvc
+objService.get('sSecond').second(); // $ExpectType ""
+objService.get('sThird'); // $ExpectType ThirdSvc
+objService.get('unknownService'); // $ExpectType Service
diff --git a/types/preview/@ember/service/test/octane.ts b/types/preview/@ember/service/test/octane.ts
new file mode 100644
index 00000000000..e176dece15b
--- /dev/null
+++ b/types/preview/@ember/service/test/octane.ts
@@ -0,0 +1,34 @@
+import Service, { inject, service } from '@ember/service';
+import EmberObject from '@ember/object';
+
+class FirstSvc extends Service {
+    foo = 'bar';
+    first() {
+        return '';
+    }
+}
+const SecondSvc = Service.extend({
+    foo: 'bar',
+    second() {
+        return '';
+    },
+});
+
+declare module '@ember/service' {
+    interface Registry {
+        first: FirstSvc;
+        second: InstanceType<typeof SecondSvc>;
+    }
+}
+
+class Foo extends EmberObject {
+    @inject declare foo: FirstSvc;
+    @inject('first') declare baz: FirstSvc;
+    @inject() declare bar: FirstSvc;
+}
+
+class FooService extends EmberObject {
+    @service declare foo: FirstSvc;
+    @service('first') declare baz: FirstSvc;
+    @service() declare bar: FirstSvc;
+}
diff --git a/types/preview/@ember/service/tsconfig.json b/types/preview/@ember/service/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/service/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/template/-private/handlebars.d.ts b/types/preview/@ember/template/-private/handlebars.d.ts
new file mode 100644
index 00000000000..ac9a7eb6fb3
--- /dev/null
+++ b/types/preview/@ember/template/-private/handlebars.d.ts
@@ -0,0 +1,5 @@
+export class SafeString {
+  constructor(str: string);
+  toString(): string;
+  toHTML(): string;
+}
diff --git a/types/preview/@ember/template/ember__template-tests.ts b/types/preview/@ember/template/ember__template-tests.ts
new file mode 100644
index 00000000000..4ed95f22c74
--- /dev/null
+++ b/types/preview/@ember/template/ember__template-tests.ts
@@ -0,0 +1,15 @@
+import { SafeString } from '@ember/template/-private/handlebars';
+import { htmlSafe, isHTMLSafe } from '@ember/template';
+
+const handlebarsSafeString: SafeString = htmlSafe('lorem ipsum...');
+htmlSafe('lorem ipsum...'); // $ExpectType SafeString
+// @ts-expect-error
+const regularString: string = htmlSafe('lorem ipsum...');
+
+function isSafeTest(a: string | SafeString) {
+    if (isHTMLSafe(a)) {
+        a = a.toString();
+    }
+
+    a.toLowerCase();
+}
diff --git a/types/preview/@ember/template/index.d.ts b/types/preview/@ember/template/index.d.ts
new file mode 100644
index 00000000000..40a7f0c2408
--- /dev/null
+++ b/types/preview/@ember/template/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for non-npm package @ember/template 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Ftemplate
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import { SafeString } from './-private/handlebars';
+export function htmlSafe(str: string): SafeString;
+export function isHTMLSafe(str: unknown): str is SafeString;
diff --git a/types/preview/@ember/template/tsconfig.json b/types/preview/@ember/template/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/template/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/test/adapter.d.ts b/types/preview/@ember/test/adapter.d.ts
new file mode 100644
index 00000000000..b991607531e
--- /dev/null
+++ b/types/preview/@ember/test/adapter.d.ts
@@ -0,0 +1,20 @@
+/**
+ * The primary purpose of this class is to create hooks that can be implemented
+ * by an adapter for various test frameworks.
+ */
+export default class Adapter {
+    /**
+     * This callback will be called whenever an async operation is about to start.
+     */
+    asyncStart(): unknown;
+    /**
+     * This callback will be called whenever an async operation has completed.
+     */
+    asyncEnd(): unknown;
+    /**
+     * Override this method with your testing framework's false assertion.
+     * This function is called whenever an exception occurs causing the testing
+     * promise to fail.
+     */
+    exception(error: string): unknown;
+}
diff --git a/types/preview/@ember/test/ember__test-tests.ts b/types/preview/@ember/test/ember__test-tests.ts
new file mode 100644
index 00000000000..5833196292c
--- /dev/null
+++ b/types/preview/@ember/test/ember__test-tests.ts
@@ -0,0 +1,42 @@
+import { registerWaiter, registerHelper, registerAsyncHelper } from '@ember/test';
+import TestAdapter from '@ember/test/adapter';
+
+const pending = 0;
+registerWaiter(() => pending !== 0);
+
+declare const MyDb: {
+    hasPendingTransactions(): boolean;
+};
+
+registerWaiter(MyDb, MyDb.hasPendingTransactions);
+// @ts-expect-error
+registerWaiter();
+
+registerHelper('boot', app => {
+    app.advanceReadiness(); // $ExpectType void
+    app.deferReadiness(); // $ExpectType void
+    app.register('foo', class {}); // $ExpectType void
+    // @ts-expect-error
+    app.register('foo');
+    // @ts-expect-error
+    app.register();
+});
+
+registerAsyncHelper('boot', app => {
+    app.advanceReadiness();
+    app.deferReadiness();
+    app.register('foo', class {});
+});
+
+registerAsyncHelper('waitForPromise', (app, promise) => {
+    app.advanceReadiness();
+    app.deferReadiness();
+    app.register('foo', class {});
+    return new Promise(() => {
+        const adapter = new TestAdapter();
+        adapter.asyncStart();
+        return promise.then(() => {
+            adapter.asyncEnd();
+        });
+    });
+});
diff --git a/types/preview/@ember/test/index.d.ts b/types/preview/@ember/test/index.d.ts
new file mode 100644
index 00000000000..d3a6c468f7a
--- /dev/null
+++ b/types/preview/@ember/test/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for non-npm package @ember/test 4.0
+// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Ftest
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import Application from '@ember/application';
+
+/**
+ * `registerHelper` is used to register a test helper that will be injected
+ * when `App.injectTestHelpers` is called.
+ */
+export function registerHelper(
+    name: string,
+    helperMethod: (app: Application, ...args: any[]) => unknown,
+    options?: object
+): unknown;
+/**
+ * `registerAsyncHelper` is used to register an async test helper that will be injected
+ * when `App.injectTestHelpers` is called.
+ */
+export function registerAsyncHelper(
+    name: string,
+    helperMethod: (app: Application, ...args: any[]) => unknown
+): void;
+
+/**
+ * Remove a previously added helper method.
+ */
+export function unregisterHelper(name: string): void;
+
+/**
+ * This allows ember-testing to play nicely with other asynchronous
+ * events, such as an application that is waiting for a CSS3
+ * transition or an IndexDB transaction. The waiter runs periodically
+ * after each async helper (i.e. `click`, `andThen`, `visit`, etc) has executed,
+ * until the returning result is truthy. After the waiters finish, the next async helper
+ * is executed and the process repeats.
+ */
+export function registerWaiter(callback: () => boolean): unknown;
+export function registerWaiter<Context>(
+    context: Context,
+    callback: (this: Context) => boolean
+): unknown;
+/**
+ * `unregisterWaiter` is used to unregister a callback that was
+ * registered with `registerWaiter`.
+ */
+export function unregisterWaiter(callback: () => boolean): unknown;
+export function unregisterWaiter<Context>(
+    context: Context,
+    callback: (this: Context) => boolean
+): unknown;
diff --git a/types/preview/@ember/test/tsconfig.json b/types/preview/@ember/test/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/test/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/@ember/utils/-private/types.d.ts b/types/preview/@ember/utils/-private/types.d.ts
new file mode 100644
index 00000000000..a09307c2c40
--- /dev/null
+++ b/types/preview/@ember/utils/-private/types.d.ts
@@ -0,0 +1,36 @@
+import type { AnyFn } from 'ember/-private/type-utils';
+
+// prettier-ignore
+type _KeysOfType<Key extends keyof TypeLookup, Type> =
+    // Checks non-`const` versions, and correctly resolves those types
+    // constructed via e.g. the `Number` constructor.
+    TypeLookup[Key] extends Type ? Key :
+    // Checks `const` versions, e.g. handling strict function types when also
+    // using a const-valued function like `const x = () => 4 as const`.
+    Type extends TypeLookup[Key] ? Key : never;
+
+// prettier-ignore
+type KeysOfType<Type> =
+    { [Key in keyof TypeLookup]: _KeysOfType<Key, Type> }[keyof TypeLookup];
+
+// Since `TypeLookup` resolves all *other* types, including `null` and
+// `undefined`, we can assume that if the type does *not* resolve from
+// `KeysOfType`, it is safe to treat it as 'object'.
+export type TypeOf<T> = KeysOfType<T> extends never ? 'object' : KeysOfType<T>;
+
+export interface TypeLookup {
+  string: string;
+  number: number;
+  boolean: boolean;
+  regexp: RegExp;
+  function: AnyFn;
+  array: unknown[];
+  error: Error;
+  filelist: FileList;
+  date: Date;
+  null: null;
+  undefined: undefined;
+}
+
+// Don't export anything but the required type util
+export {};
diff --git a/types/preview/@ember/utils/ember__utils-tests.ts b/types/preview/@ember/utils/ember__utils-tests.ts
new file mode 100644
index 00000000000..5c9c0787704
--- /dev/null
+++ b/types/preview/@ember/utils/ember__utils-tests.ts
@@ -0,0 +1,145 @@
+/* eslint-disable no-new-wrappers */ // we have to test the new-wrappers!
+
+import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@ember/utils';
+
+(function () {
+  /** isNone */
+  const maybeUndefined: string | undefined = 'not actually undefined';
+  if (isNone(maybeUndefined)) {
+    return;
+  }
+  const anotherString = maybeUndefined + 'another string';
+  isNone(); // $ExpectType boolean
+  isNone(null); // $ExpectType boolean
+  isNone(undefined); // $ExpectType boolean
+  isNone(''); // $ExpectType boolean
+  isNone([]); // $ExpectType boolean
+  isNone(function () {}); // $ExpectType boolean
+})();
+
+(function () {
+  /** isPresent */
+  isPresent(); // $ExpectType boolean
+  isPresent(null); // $ExpectType boolean
+  isPresent(undefined); // $ExpectType boolean
+  isPresent(''); // $ExpectType boolean
+  isPresent('  '); // $ExpectType boolean
+  isPresent('\n\t'); // $ExpectType boolean
+  isPresent([]); // $ExpectType boolean
+  isPresent({ length: 0 }); // $ExpectType boolean
+  isPresent(false); // $ExpectType boolean
+  isPresent(true); // $ExpectType boolean
+  isPresent('string'); // $ExpectType boolean
+  isPresent(0); // $ExpectType boolean
+  isPresent(function () {}); // $ExpectType boolean
+  isPresent({}); // $ExpectType boolean
+  isPresent(false); // $ExpectType boolean
+  isPresent('\n\t Hello'); // $ExpectType boolean
+  isPresent([1, 2, 3]); // $ExpectType boolean
+})();
+
+(function () {
+  /** typeOf */
+  typeOf(null); // $ExpectType "null"
+  typeOf(undefined); // $ExpectType "undefined"
+  typeOf('michael'); // $ExpectType "string"
+  // tslint:disable-next-line:no-construct
+  typeOf(new String('michael')); // $ExpectType "string"
+  typeOf(101); // $ExpectType "number"
+  // tslint:disable-next-line:no-construct
+  typeOf(new Number(101)); // $ExpectType "number"
+  typeOf(true); // $ExpectType "boolean"
+  // tslint:disable-next-line:no-construct
+  typeOf(new Boolean(true)); // $ExpectType "boolean"
+  typeOf(() => 4); // $ExpectType "function"
+  typeOf([1, 2, 90]); // $ExpectType "array"
+  typeOf(/abc/); // $ExpectType "regexp"
+  typeOf(new Date()); // $ExpectType "date"
+  typeOf(new FileList()); // $ExpectType "filelist"
+  // typeOf(EmberObject.extend());   // $ExpectType "class"
+  // typeOf(EmberObject.create());   // $ExpectType "instance"
+  typeOf(new Error('teamocil')); // $ExpectType "error"
+  typeOf({ justAPojo: true }); // $ExpectType "object"
+
+  typeOf();
+  typeOf(null);
+  typeOf(undefined);
+  typeOf('michael');
+  // tslint:disable-next-line:no-construct
+  typeOf(new String('michael'));
+  typeOf(101);
+  // tslint:disable-next-line:no-construct
+  typeOf(new Number(101));
+  typeOf(true);
+  // tslint:disable-next-line:no-construct
+  typeOf(new Boolean(true));
+  typeOf(() => 4);
+  typeOf([1, 2, 90]);
+  typeOf(/abc/);
+  typeOf(new Date());
+  typeOf(FileList);
+  typeOf(new Error('teamocil'));
+})();
+
+(function () {
+  /** isEqual */
+  isEqual('foo', 'bar'); // $ExpectType boolean
+  isEqual(14, 37); // $ExpectType boolean
+  isEqual(14, '1'); // $ExpectType boolean
+  isEqual(
+    () => 4,
+    () => 37
+  ); // $ExpectType boolean
+  // @ts-expect-error
+  isEqual(14);
+  // @ts-expect-error
+  isEqual();
+})();
+
+(function () {
+  /** compare */
+  compare('foo', 'bar'); // $ExpectType number
+  compare(14, 37); // $ExpectType number
+  compare(class {}, class {}); // $ExpectType number
+  compare([], class {}); // $ExpectType number
+  compare([], undefined); // $ExpectType number
+  compare({}, () => 4); // $ExpectType number
+  // @ts-expect-error
+  compare(14);
+  // @ts-expect-error
+  compare();
+})();
+
+(function () {
+  /** isBlank */
+
+  isBlank(); // $ExpectType boolean
+  isBlank(null); // $ExpectType boolean
+  isBlank(undefined); // $ExpectType boolean
+  isBlank(''); // $ExpectType boolean
+  isBlank([]); // $ExpectType boolean
+  isBlank('\n\t'); // $ExpectType boolean
+  isBlank('  '); // $ExpectType boolean
+  isBlank({}); // $ExpectType boolean
+  isBlank('\n\t Hello'); // $ExpectType boolean
+  isBlank('Hello world'); // $ExpectType boolean
+  isBlank([1, 2, 3]); // $ExpectType boolean
+})();
+
+(function () {
+  /** isEmpty */
+
+  isEmpty(); // $ExpectType boolean
+  isEmpty(null); // $ExpectType boolean
+  isEmpty(undefined); // $ExpectType boolean
+  isEmpty(''); // $ExpectType boolean
+  isEmpty([]); // $ExpectType boolean
+  isEmpty({ size: 0 }); // $ExpectType boolean
+  isEmpty({}); // $ExpectType boolean
+  isEmpty('Adam Hawkins'); // $ExpectType boolean
+  isEmpty([0, 1, 2]); // $ExpectType boolean
+  isEmpty('\n\t'); // $ExpectType boolean
+  isEmpty('  '); // $ExpectType boolean
+  isEmpty({ size: 1 }); // $ExpectType boolean
+  isEmpty({ size: () => 0 }); // $ExpectType boolean
+})();
diff --git a/types/preview/@ember/utils/index.d.ts b/types/preview/@ember/utils/index.d.ts
new file mode 100644
index 00000000000..353be5f0e34
--- /dev/null
+++ b/types/preview/@ember/utils/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for non-npm package @ember/utils 4.0
+// Project: https://api.emberjs.com/ember/3.16/modules/@ember%2Futils
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+import type { TypeOf } from './-private/types';
+
+/**
+ * Compares two javascript values and returns:
+ */
+export function compare(v: unknown, w: unknown): number;
+
+/**
+ * A value is blank if it is empty or a whitespace string.
+ */
+export function isBlank(obj?: unknown): boolean;
+
+/**
+ * Verifies that a value is `null` or an empty string, empty array,
+ * or empty function.
+ */
+export function isEmpty(obj?: unknown): boolean;
+
+/**
+ * Compares two objects, returning true if they are equal.
+ */
+export function isEqual(a: unknown, b: unknown): boolean;
+
+/**
+ * Returns true if the passed value is null or undefined. This avoids errors
+ * from JSLint complaining about use of ==, which can be technically
+ * confusing.
+ */
+export function isNone(obj?: unknown): obj is null | undefined;
+
+/**
+ * A value is present if it not `isBlank`.
+ */
+export function isPresent(obj?: unknown): boolean;
+
+/**
+ * Returns a consistent type for the passed object.
+ */
+export function typeOf<T>(value: T): TypeOf<T>;
+export function typeOf(): 'undefined';
+export function typeOf(item: unknown): string;
diff --git a/types/preview/@ember/utils/tsconfig.json b/types/preview/@ember/utils/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/utils/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/ember/-private/type-utils.d.ts b/types/preview/ember/-private/type-utils.d.ts
new file mode 100644
index 00000000000..a40275e657b
--- /dev/null
+++ b/types/preview/ember/-private/type-utils.d.ts
@@ -0,0 +1,52 @@
+// These are utility types used throughout the Ember type definitions. They
+// should *never* be used in end user code.
+
+/** A safe-ish type representing any function. */
+export type AnyFn = (...args: any[]) => unknown;
+
+export type AnyMethod<Target> = (this: Target, ...args: any[]) => unknown;
+
+export type MethodsOf<O> = {
+  [K in keyof O]: O[K] extends AnyFn ? O[K] : never;
+};
+
+// Not just `keyof MethodsOf<O>` because that doesn't correctly exclude all the
+// `never` fields.
+export type MethodNamesOf<O> = {
+  [K in keyof O]: O[K] extends AnyFn ? K : never;
+}[keyof O];
+
+export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
+
+export type MethodReturns<T, M extends MethodNamesOf<T>> = ReturnType<MethodsOf<T>[M]>;
+
+// prettier-ignore
+/** Get the return value of a method string name or a function. */
+export type EmberMethodParams<T, M extends EmberMethod<T>> =
+  M extends AnyMethod<T> ? Parameters<M> :
+  M extends keyof T ? T[M] extends AnyMethod<T> ? Parameters<MethodsOf<T>[M]> : never :
+  never;
+
+// prettier-ignore
+/** Get the return value of a method string name or a function. */
+export type EmberMethodReturn<T, M extends EmberMethod<T>> =
+  M extends AnyMethod<T> ? ReturnType<M> :
+  M extends keyof T ? T[M] extends AnyMethod<T> ? ReturnType<MethodsOf<T>[M]> : never :
+  never;
+
+/**
+ * A type utility for Ember's common name-of-object-on-target-or-function
+ * pattern for e.g. event handlers.
+ */
+export type EmberMethod<Target> = AnyMethod<Target> | keyof Target;
+
+// A way of representing non-user-constructible types. You can conveniently use
+// this by doing `interface Type extends Data<'some-type-name'> { ... }` for
+// simple types, and/or you can type-parameterize it as makes sense for your use
+// case (see e.g. `@ember/component/helper`'s use with functional helpers).
+declare const Data: unique symbol;
+export class Opaque<Data> {
+  private declare [Data]: Data;
+}
+
+export {};
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
new file mode 100755
index 00000000000..1d5ba10445c
--- /dev/null
+++ b/types/preview/ember/index.d.ts
@@ -0,0 +1,401 @@
+// Type definitions for Ember.js 4.0
+// Project: https://emberjs.com/, https://github.com/emberjs/ember
+// Definitions by: Chris Krycho <https://github.com/chriskrycho>
+//                 James C. Davis <https://github.com/jamescdavis>
+//                 Dan Freeman <https://github.com/dfreeman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Minimum TypeScript Version: 4.4
+
+// Capitalization is intentional: this makes it much easier to re-export RSVP on
+// the Ember namespace.
+import Rsvp from 'rsvp';
+
+import { TemplateFactory } from 'htmlbars-inline-precompile';
+
+import { Registry as ServiceRegistry } from '@ember/service';
+import type { Registry as ControllerRegistry } from '@ember/controller';
+import type * as EmberStringNs from '@ember/string';
+import type * as EmberTemplateNs from '@ember/template';
+import * as EmberTemplateHandlebarsNs from '@ember/template/-private/handlebars';
+// tslint:disable-next-line:no-duplicate-imports
+import type * as EmberServiceNs from '@ember/service';
+import type * as EmberPolyfillsNs from '@ember/polyfills';
+import type * as EmberUtilsNs from '@ember/utils';
+import type * as EmberRunloopNs from '@ember/runloop';
+import * as EmberObjectNs from '@ember/object';
+import type * as EmberObjectObserversNs from '@ember/object/observers';
+import * as EmberObjectMixinNs from '@ember/object/mixin';
+import * as EmberObjectProxyNs from '@ember/object/proxy';
+import type * as EmberObjectPromiseProxyNs from '@ember/object/promise-proxy-mixin';
+import type * as EmberObjectInternalsNs from '@ember/object/internals';
+import * as EmberObjectComputedNs from '@ember/object/computed';
+import type * as EmberObjectEventedNs from '@ember/object/evented';
+import type * as EmberObjectEventsNs from '@ember/object/events';
+// @ember/debug
+import type * as EmberDebugNs from '@ember/debug';
+import _ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+import EmberDataAdapter from '@ember/debug/data-adapter';
+// @ember/engine
+import * as EmberEngineNs from '@ember/engine';
+import * as EmberEngineInstanceNs from '@ember/engine/instance';
+import _ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
+import _RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
+import EmberCoreObject from '@ember/object/core';
+import * as EmberApplicationNs from '@ember/application';
+import * as EmberApplicationInstanceNs from '@ember/application/instance';
+import type * as EmberApplicationDeprecateNs from '@ember/application/deprecations';
+import type * as EmberTestNs from '@ember/test';
+// tslint:disable-next-line:no-duplicate-imports
+import * as EmberControllerNs from '@ember/controller';
+// tslint:disable-next-line:no-duplicate-imports
+import EmberMixin from '@ember/object/mixin';
+import type EmberObservable from '@ember/object/observable';
+// @ember/array
+import type * as EmberArrayNs from '@ember/array';
+import type EmberMutableArray from '@ember/array/mutable';
+import type EmberNativeArray from '@ember/array/-private/native-array';
+import EmberArrayProxy from '@ember/array/proxy';
+import type EmberEnumerable from '@ember/array/-private/enumerable';
+import type EmberMutableEnumerable from '@ember/array/-private/mutable-enumerable';
+import type EmberArrayProtoExtensions from '@ember/array/types/prototype-extensions';
+// @ember/error
+import type EmberError from '@ember/error';
+
+type EmberArray<T> = EmberArrayNs.default<T>;
+import type EmberActionHandler from '@ember/object/-private/action-handler';
+import EmberComponent from '@ember/component';
+import EmberHelper from '@ember/component/helper';
+// @ember/routing
+import EmberRoutingRouter from '@ember/routing/router';
+import EmberRoutingRoute from '@ember/routing/route';
+import EmberRoutingTransition from '@ember/routing/transition';
+import EmberRoutingRouterService from '@ember/routing/router-service';
+import EmberRoutingHashLocation from '@ember/routing/hash-location';
+import EmberRoutingAutoLocation from '@ember/routing/auto-location';
+import EmberRoutingHistoryLocation from '@ember/routing/history-location';
+import EmberRoutingNoneLocation from '@ember/routing/none-location';
+// @ember/application
+import EmberEventDispatcher from '@ember/application/-private/event-dispatcher';
+import EmberRegistry from '@ember/application/-private/registry';
+// @ember/test
+import EmberTestAdapter from '@ember/test/adapter';
+
+export namespace Ember {
+  const A: typeof EmberArrayNs.A;
+  const isArray: typeof EmberArrayNs.isArray;
+  type Enumerable<T> = EmberEnumerable<T>;
+  const Enumerable: typeof EmberEnumerable;
+  class ArrayProxy<T> extends EmberArrayProxy<T> {}
+  type Array<T> = EmberArray<T>;
+  const Array: typeof EmberArrayNs.default;
+  type MutableArray<T> = EmberMutableArray<T>;
+  const MutableArray: typeof EmberMutableArray;
+  type NativeArray<T> = EmberNativeArray<T>;
+  const NativeArray: typeof EmberNativeArray;
+  type MutableEnumerable<T> = EmberMutableEnumerable<T>;
+  const MutableEnumerable: typeof EmberMutableEnumerable;
+  class Router extends EmberRoutingRouter {}
+  class Route extends EmberRoutingRoute {}
+  const ActionHandler: typeof EmberActionHandler;
+  class Controller extends EmberControllerNs.default {}
+  class Component extends EmberComponent {}
+  class Helper extends EmberHelper {}
+
+  class HashLocation extends EmberRoutingHashLocation {}
+  class NoneLocation extends EmberRoutingNoneLocation {}
+  class HistoryLocation extends EmberRoutingHistoryLocation {}
+  const deprecateFunc: typeof EmberApplicationDeprecateNs.deprecateFunc;
+  const deprecate: typeof EmberApplicationDeprecateNs.deprecate;
+  const getOwner: typeof EmberApplicationNs.getOwner;
+  const setOwner: typeof EmberApplicationNs.setOwner;
+  class EventDispatcher extends EmberEventDispatcher {}
+  class Registry extends EmberRegistry {}
+  interface ArrayPrototypeExtensions<T> extends EmberArrayProtoExtensions<T> {}
+
+  /**
+   * Implements some standard methods for comparing objects. Add this mixin to
+   * any class you create that can compare its instances.
+   */
+  interface Comparable {
+    compare(a: unknown, b: unknown): number;
+  }
+  const Comparable: EmberMixin<Comparable>;
+  class ComputedProperty extends EmberObjectComputedNs.default {}
+  /**
+   * A container used to instantiate and cache objects.
+   */
+  class Container {
+    /**
+     * Given a fullName, return the corresponding factory. The consumer of the factory
+     * is responsible for the destruction of any factory instances, as there is no
+     * way for the container to ensure instances are destroyed when it itself is
+     * destroyed.
+     */
+    factoryFor(fullName: string, options?: {}): unknown;
+  }
+  class ContainerDebugAdapter extends _ContainerDebugAdapter {}
+
+  // TODO: replace with a proper ES6 reexport once we remove declare module 'ember' {}
+  class Object extends EmberObjectNs.default {}
+  class ObjectProxy extends EmberObjectProxyNs.default {}
+  const Observable: typeof EmberObservable;
+  const PromiseProxyMixin: typeof EmberObjectPromiseProxyNs.default;
+  class CoreObject extends EmberCoreObject {}
+  class DataAdapter extends EmberDataAdapter {}
+  const Debug: {
+    registerDeprecationHandler: typeof EmberDebugNs.registerDeprecationHandler;
+    registerWarnHandler: typeof EmberDebugNs.registerWarnHandler;
+  };
+  class EngineInstance extends EmberEngineInstanceNs.default {}
+  class Engine extends EmberEngineNs.default {}
+
+  /**
+   * A subclass of the JavaScript Error object for use in Ember.
+   */
+  const Error: typeof EmberError;
+
+  const Evented: typeof EmberObjectEventedNs.default;
+
+  class Mixin<T, Base = EmberObjectNs.default> extends EmberMixin<T, Base> {}
+
+  /**
+   * A Namespace is an object usually used to contain other objects or methods
+   * such as an application or framework. Create a namespace anytime you want
+   * to define one of these new containers.
+   */
+  class Namespace extends Object {}
+
+  class Service extends Object {}
+
+  interface ViewTargetActionSupport {
+    target: unknown;
+    actionContext: unknown;
+  }
+  const ViewTargetActionSupport: Mixin<ViewTargetActionSupport>;
+  const ViewUtils: {
+    isSimpleClick(event: Event): boolean;
+  };
+
+  // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
+  const RSVP: typeof Rsvp;
+  namespace RSVP {
+    type Promise<T> = Rsvp.Promise<T>;
+  }
+  class Application extends EmberApplicationNs.default {}
+  class ApplicationInstance extends EmberApplicationInstanceNs.default {}
+  /**
+   * This is a container for an assortment of testing related functionality
+   */
+  namespace Test {
+    class Adapter extends EmberTestAdapter {}
+    const registerHelper: typeof EmberTestNs.registerHelper;
+    const unregisterHelper: typeof EmberTestNs.unregisterHelper;
+    const registerWaiter: typeof EmberTestNs.registerWaiter;
+    const unregisterWaiter: typeof EmberTestNs.unregisterWaiter;
+    const registerAsyncHelper: typeof EmberTestNs.registerAsyncHelper;
+    /**
+     * Used to register callbacks to be fired whenever `App.injectTestHelpers`
+     * is called.
+     */
+    function onInjectHelpers(callback: (app: Application) => void): void;
+    /**
+     * This returns a thenable tailored for testing.  It catches failed
+     * `onSuccess` callbacks and invokes the `Ember.Test.adapter.exception`
+     * callback in the last chained then.
+     */
+    function promise<T>(
+      resolver: (
+        resolve: (value?: T | PromiseLike<T>) => void,
+        reject: (reason?: unknown) => void
+      ) => void,
+      label?: string
+    ): Promise<T>;
+    /**
+     * Replacement for `Ember.RSVP.resolve`
+     * The only difference is this uses
+     * an instance of `Ember.Test.Promise`
+     */
+    function resolve<T>(value?: T | PromiseLike<T>, label?: string): Promise<T>;
+
+    /**
+     * Iterates through each registered test waiter, and invokes
+     * its callback. If any waiter returns false, this method will return
+     * true indicating that the waiters have not settled yet.
+     */
+    function checkWaiters(): boolean;
+    /**
+     * Used to allow ember-testing to communicate with a specific testing
+     * framework.
+     */
+    const adapter: EmberTestAdapter;
+
+    /**
+     * This class implements the methods defined by Ember.Test.Adapter for the
+     * QUnit testing framework.
+     */
+    class QUnitAdapter extends EmberTestAdapter {}
+    class Promise<T> extends Rsvp.Promise<T> {
+      constructor(
+        executor: (
+          resolve: (value?: T | PromiseLike<T>) => void,
+          reject: (reason?: unknown) => void
+        ) => void
+      );
+    }
+  }
+  /**
+   * Namespace for injection helper methods.
+   */
+  namespace inject {
+    /**
+     * Creates a property that lazily looks up another controller in the container.
+     * Can only be used when defining another controller.
+     */
+    function controller(): ComputedProperty<Controller>;
+    function controller<K extends keyof ControllerRegistry>(
+      name: K
+    ): ComputedProperty<ControllerRegistry[K]>;
+    const service: typeof EmberServiceNs.inject;
+  }
+  namespace ENV {
+    const EXTEND_PROTOTYPES: {
+      Array: boolean;
+      Function: boolean;
+      String: boolean;
+    };
+    const LOG_BINDINGS: boolean;
+    const LOG_STACKTRACE_ON_DEPRECATION: boolean;
+    const LOG_VERSION: boolean;
+    const MODEL_FACTORY_INJECTIONS: boolean;
+    const RAISE_ON_DEPRECATION: boolean;
+  }
+  namespace Handlebars {
+    function compile(string: string): (...args: any[]) => any;
+    function compile(environment: any, options?: any, context?: any, asObject?: any): any;
+    function precompile(string: string, options: any): void;
+    class Compiler {}
+    class JavaScriptCompiler {}
+    function registerPartial(name: string, str: any): void;
+    function createFrame(objec: any): any;
+    function Exception(message: string): void;
+    class SafeString extends EmberTemplateHandlebarsNs.SafeString {}
+    function parse(string: string): any;
+    function print(ast: any): void;
+    function log(level: string, str: string): void;
+    function registerHelper(name: string, helper: any): void;
+  }
+  namespace String {
+    const camelize: typeof EmberStringNs.camelize;
+    const capitalize: typeof EmberStringNs.capitalize;
+    const classify: typeof EmberStringNs.classify;
+    const dasherize: typeof EmberStringNs.dasherize;
+    const decamelize: typeof EmberStringNs.decamelize;
+    function fmt(...args: string[]): string;
+    const htmlSafe: typeof EmberTemplateNs.htmlSafe;
+    const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
+    const underscore: typeof EmberStringNs.underscore;
+    const w: typeof EmberStringNs.w;
+  }
+  namespace Template {
+    const htmlSafe: typeof EmberTemplateNs.htmlSafe;
+    const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
+  }
+  const computed: typeof EmberObjectNs.computed & typeof EmberObjectComputedNs;
+
+  // Shenanigans to make `run` both callable and a namespace safely, while not
+  // making the `run.bind` call resolve to `Function.prototype.bind`. (Yes,
+  // insert :upside-down-smiley: here.)
+  // 1. Get the type side of the namespace.
+  type EmberRunloop = typeof EmberRunloopNs;
+  // 2. Use it to get an interface representing the callable side of `run`.
+  type RunFn = EmberRunloop['run'];
+  // type RunFn = Pick<EmberRunloop, 'run'>['run'];
+  // 3. Merge the two together so that the public-facing type of `run` is both
+  //    the plucked-off run type *and* the namespace.
+  interface Run extends RunFn, EmberRunloop {}
+  const run: Run;
+
+  const platform: {
+    defineProperty: boolean;
+    hasPropertyAccessors: boolean;
+  };
+
+  /**
+   * `getEngineParent` retrieves an engine instance's parent instance.
+   */
+  function getEngineParent(engine: EngineInstance): EngineInstance;
+
+  const assert: typeof EmberDebugNs.assert;
+  const debug: typeof EmberDebugNs.debug;
+  const defineProperty: typeof EmberObjectNs.defineProperty;
+
+  const runInDebug: typeof EmberDebugNs.runInDebug;
+  const warn: typeof EmberDebugNs.warn;
+  const cacheFor: typeof EmberObjectInternalsNs.cacheFor;
+  const addListener: typeof EmberObjectEventsNs.addListener;
+  const removeListener: typeof EmberObjectEventsNs.removeListener;
+  const sendEvent: typeof EmberObjectEventsNs.sendEvent;
+  const on: typeof EmberObjectEventedNs.on;
+
+  const htmlSafe: typeof EmberTemplateNs.htmlSafe;
+  const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
+
+  const isBlank: typeof EmberUtilsNs.isBlank;
+  const isEmpty: typeof EmberUtilsNs.isEmpty;
+  const isNone: typeof EmberUtilsNs.isNone;
+  const isPresent: typeof EmberUtilsNs.isPresent;
+
+  const observer: typeof EmberObjectNs.observer;
+  const addObserver: typeof EmberObjectObserversNs.addObserver;
+  const removeObserver: typeof EmberObjectObserversNs.removeObserver;
+  const get: typeof EmberObjectNs.get;
+  const notifyPropertyChange: typeof EmberObjectNs.notifyPropertyChange;
+  const getProperties: typeof EmberObjectNs.getProperties;
+  const setProperties: typeof EmberObjectNs.setProperties;
+  const set: typeof EmberObjectNs.set;
+  const trySet: typeof EmberObjectNs.trySet;
+  const compare: typeof EmberUtilsNs.compare;
+  /**
+   * Creates a shallow copy of the passed object. A deep copy of the object is
+   * returned if the optional `deep` argument is `true`.
+   */
+  const isEqual: typeof EmberUtilsNs.isEqual;
+  const typeOf: typeof EmberUtilsNs.typeOf;
+  // TODO: replace with an es6 reexport when declare module 'ember' is removed
+  /**
+   * Copy properties from a source object to a target object.
+   * @deprecated until v5.0. You should replace any calls to `Ember.assign`
+   *   with `Object.assign` or use the object spread operator.
+   */
+  const assign: typeof EmberPolyfillsNs.assign;
+  const guidFor: typeof EmberObjectInternalsNs.guidFor;
+
+  /**
+   * A function may be assigned to `Ember.onerror` to be called when Ember
+   * internals encounter an error. This is useful for specialized error handling
+   * and reporting code.
+   */
+  let onerror: ((error: Error) => void) | undefined;
+
+  /**
+   * The semantic version
+   */
+  const VERSION: string;
+  /**
+   * This property indicates whether or not this application is currently in
+   * testing mode. This is set when `setupForTesting` is called on the current
+   * application.
+   */
+  const testing: boolean;
+
+  const expandProperties: typeof EmberObjectComputedNs.expandProperties;
+}
+
+export default Ember;
+
+declare module 'htmlbars-inline-precompile' {
+  interface TemplateFactory {
+    __htmlbars_inline_precompile_template_factory: any;
+  }
+  export default function hbs(tagged: TemplateStringsArray): TemplateFactory;
+}
diff --git a/types/preview/ember/test/access-modifier.ts b/types/preview/ember/test/access-modifier.ts
new file mode 100644
index 00000000000..3b3a27f6641
--- /dev/null
+++ b/types/preview/ember/test/access-modifier.ts
@@ -0,0 +1,42 @@
+/**
+ * Tests to ensure that access modifier keywords are appropriately
+ * respected and supported
+ */
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+class Foo extends Ember.Object {
+    hello() {
+        return 'world';
+    }
+    protected bar() {
+        return 'bar';
+    }
+    private baz() {
+        return 'baz';
+    }
+}
+const f = new Foo();
+assertType<string>(f.hello());
+// protected property should not be visible from outside of Foo
+// @ts-expect-error
+assertType<string>(f.bar());
+// private property should not be visible from outside of Foo
+// @ts-expect-error
+assertType<string>(f.baz());
+
+class Foo2 extends Ember.Object.extend({
+    bar: '',
+}) {
+    hello() {
+        return 'world';
+    }
+    // Cannot override with a mis-matched property type
+    // @ts-expect-error
+    protected bar() {
+        return 'bar';
+    }
+    private baz() {
+        return 'baz';
+    }
+}
diff --git a/types/preview/ember/test/application-instance.ts b/types/preview/ember/test/application-instance.ts
new file mode 100644
index 00000000000..e151828fa60
--- /dev/null
+++ b/types/preview/ember/test/application-instance.ts
@@ -0,0 +1,29 @@
+import ApplicationInstance from '@ember/application/instance';
+import hbs from 'htmlbars-inline-precompile';
+
+const appInstance = ApplicationInstance.create();
+appInstance.register('some:injection', class Foo {});
+
+appInstance.register('some:injection', class Foo {}, {
+    singleton: true,
+});
+
+appInstance.register('some:injection', class Foo {}, {
+    instantiate: false,
+});
+
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`);
+
+appInstance.register('some:injection', class Foo {}, {
+    singleton: false,
+    instantiate: true,
+});
+
+appInstance.factoryFor('router:main');
+appInstance.lookup('route:basic');
+
+appInstance.boot();
+
+(async () => {
+    await appInstance.boot();
+})();
diff --git a/types/preview/ember/test/application.ts b/types/preview/ember/test/application.ts
new file mode 100755
index 00000000000..fcc65a70009
--- /dev/null
+++ b/types/preview/ember/test/application.ts
@@ -0,0 +1,43 @@
+import EmberObject from '@ember/object';
+import Ember from 'ember';
+
+const BaseApp = Ember.Application.extend({
+    modulePrefix: 'my-app',
+});
+
+class Obj extends EmberObject.extend({ foo: 'bar' }) {}
+
+BaseApp.initializer({
+    name: 'my-initializer',
+    initialize(app) {
+        app.register('foo:bar', Obj);
+    },
+});
+
+BaseApp.instanceInitializer({
+    name: 'my-instance-initializer',
+    initialize(app) {
+        (app.lookup('foo:bar') as Obj).get('foo');
+    },
+});
+
+const App1 = BaseApp.create({
+    rootElement: '#app-one',
+    customEvents: {
+        paste: 'paste',
+    },
+});
+
+const App2 = BaseApp.create({
+    rootElement: '#app-two',
+    customEvents: {
+        mouseenter: null,
+        mouseleave: null,
+    },
+});
+
+const App3 = BaseApp.create();
+
+const App3Instance1 = App3.buildInstance();
+
+const App3Instance2 = App3.buildInstance({ foo: 'bar' });
diff --git a/types/preview/ember/test/array-ext.ts b/types/preview/ember/test/array-ext.ts
new file mode 100755
index 00000000000..50698a70292
--- /dev/null
+++ b/types/preview/ember/test/array-ext.ts
@@ -0,0 +1,21 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+declare global {
+    interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
+}
+
+class Person extends Ember.Object {
+    declare name: string;
+}
+
+const person = Person.create({ name: 'Joe' });
+const array = [person];
+
+assertType<number>(array.get('length'));
+assertType<Person | undefined>(array.get('firstObject'));
+assertType<string[]>(array.mapBy('name'));
+assertType<string[]>(array.map(p => p.get('name')));
+assertType<Person[]>(array.sortBy('name'));
+assertType<Person[]>(array.uniq());
+assertType<Person[]>(array.uniqBy('name'));
diff --git a/types/preview/ember/test/array-proxy.ts b/types/preview/ember/test/array-proxy.ts
new file mode 100644
index 00000000000..53b6ec7e0a9
--- /dev/null
+++ b/types/preview/ember/test/array-proxy.ts
@@ -0,0 +1,26 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const pets = ['dog', 'cat', 'fish'];
+const proxy = Ember.ArrayProxy.create({ content: Ember.A(pets) });
+
+proxy.get('firstObject'); // 'dog'
+proxy.set('content', Ember.A(['amoeba', 'paramecium']));
+proxy.get('firstObject'); // 'amoeba'
+
+const overridden = Ember.ArrayProxy.create({
+    content: Ember.A(pets),
+    objectAtContent(idx: number): string {
+        return this.get('content').objectAt(idx)!.toUpperCase();
+    },
+});
+
+overridden.get('firstObject'); // 'DOG'
+
+class MyNewProxy<T> extends Ember.ArrayProxy<T> {
+    isNew = true;
+}
+
+const x = MyNewProxy.create({ content: Ember.A([1, 2, 3]) }) as MyNewProxy<number>;
+assertType<number | undefined>(x.get('firstObject'));
+assertType<boolean>(x.isNew);
diff --git a/types/preview/ember/test/array.ts b/types/preview/ember/test/array.ts
new file mode 100755
index 00000000000..f4cbaae2d83
--- /dev/null
+++ b/types/preview/ember/test/array.ts
@@ -0,0 +1,50 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+type Person = typeof Person.prototype;
+const Person = Ember.Object.extend({
+    name: '',
+    isHappy: false,
+});
+
+const people = Ember.A([
+    Person.create({ name: 'Yehuda', isHappy: true }),
+    Person.create({ name: 'Majd', isHappy: false }),
+]);
+
+assertType<number>(people.get('length'));
+assertType<Person>(people.get('lastObject'));
+assertType<boolean>(people.isAny('isHappy'));
+// @ts-expect-error
+assertType<boolean>(people.isAny('isHappy', 'false'));
+assertType<boolean>(people.isAny('isHappy', false));
+assertType<Ember.Enumerable<Person>>(people.filterBy('isHappy'));
+assertType<Ember.Enumerable<Person>>(people.rejectBy('isHappy'));
+assertType<Ember.Enumerable<Person>>(people.filter(person => person.get('name') === 'Yehuda'));
+assertType<typeof people>(people.get('[]'));
+assertType<Person>(people.get('[]').get('firstObject'));
+
+assertType<Ember.Array<boolean>>(people.mapBy('isHappy'));
+assertType<unknown[]>(people.mapBy('name.length'));
+
+const last = people.get('lastObject');
+if (last) {
+    assertType<string>(last.get('name'));
+}
+
+const first = people.get('lastObject');
+if (first) {
+    assertType<boolean>(first.get('isHappy'));
+}
+
+const letters: Ember.Enumerable<string> = Ember.A(['a', 'b', 'c']);
+const codes: number[] = letters.map((item, index, enumerable) => {
+    assertType<string>(item);
+    assertType<number>(index);
+    return item.charCodeAt(0);
+});
+
+const value = '1,2,3';
+const filters = Ember.A(value.split(','));
+filters.push('4');
+filters.sort();
diff --git a/types/preview/ember/test/component.ts b/types/preview/ember/test/component.ts
new file mode 100755
index 00000000000..925a2e7b451
--- /dev/null
+++ b/types/preview/ember/test/component.ts
@@ -0,0 +1,124 @@
+import Ember from 'ember';
+import Component from '@ember/component';
+import Object, { computed } from '@ember/object';
+import hbs from 'htmlbars-inline-precompile';
+import { assertType } from './lib/assert';
+
+Component.extend({
+    layout: hbs`
+        <div>
+          {{yield}}
+        </div>
+    `,
+});
+
+Component.extend({
+    layout: 'my-layout',
+});
+
+const MyComponent = Component.extend();
+assertType<string | string[]>(Ember.get(MyComponent, 'positionalParams'));
+
+const component1 = Component.extend({
+    actions: {
+        hello(name: string) {
+            console.log('Hello', name);
+        },
+    },
+});
+
+Component.extend({
+    name: '',
+    hello(name: string) {
+        this.set('name', name);
+    },
+});
+
+Component.extend({
+    tagName: 'em',
+});
+
+Component.extend({
+    classNames: ['my-class', 'my-other-class'],
+});
+
+Component.extend({
+    classNameBindings: ['propertyA', 'propertyB'],
+    propertyA: 'from-a',
+    propertyB: computed(function () {
+        if (!this.get('propertyA')) {
+            return 'from-b';
+        }
+    }),
+});
+
+Component.extend({
+    classNameBindings: ['hovered'],
+    hovered: true,
+});
+
+Component.extend({
+    classNameBindings: ['messages.empty'],
+    messages: Object.create({
+        empty: true,
+    }),
+});
+
+Component.extend({
+    classNameBindings: ['isEnabled:enabled:disabled'],
+    isEnabled: true,
+});
+
+Component.extend({
+    classNameBindings: ['isEnabled::disabled'],
+    isEnabled: true,
+});
+
+Component.extend({
+    tagName: 'a',
+    attributeBindings: ['href'],
+    href: 'http://google.com',
+});
+
+Component.extend({
+    tagName: 'a',
+    attributeBindings: ['url:href'],
+    url: 'http://google.com',
+});
+
+Component.extend({
+    tagName: 'use',
+    attributeBindings: ['xlinkHref:xlink:href'],
+    xlinkHref: '#triangle',
+});
+
+Component.extend({
+    tagName: 'input',
+    attributeBindings: ['disabled'],
+    disabled: false,
+});
+
+Component.extend({
+    tagName: 'input',
+    attributeBindings: ['disabled'],
+    disabled: computed(() => {
+        if ('someLogic') {
+            return true;
+        } else {
+            return false;
+        }
+    }),
+});
+
+Component.extend({
+    tagName: 'form',
+    attributeBindings: ['novalidate'],
+    novalidate: null,
+});
+
+Component.extend({
+    click(event: object) {
+        // will be called when an instance's
+        // rendered element is clicked
+    },
+});
diff --git a/types/preview/ember/test/computed.ts b/types/preview/ember/test/computed.ts
new file mode 100755
index 00000000000..8d5ff6f0eec
--- /dev/null
+++ b/types/preview/ember/test/computed.ts
@@ -0,0 +1,192 @@
+import Ember from 'ember';
+import Component from '@ember/component';
+import Computed, { alias, or } from '@ember/object/computed';
+import { assertType } from './lib/assert';
+
+const Person = Ember.Object.extend({
+    firstName: '',
+    lastName: '',
+    age: 0,
+
+    noArgs: Ember.computed<string>(() => 'test'),
+
+    fullName: Ember.computed<string>('firstName', 'lastName', function () {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }),
+
+    fullNameReadonly: Ember.computed<string>('fullName', function () {
+        return this.get('fullName');
+    }).readOnly(),
+
+    fullNameWritable: Ember.computed<string>('firstName', 'lastName', {
+        get() {
+            return this.get('fullName');
+        },
+        set(key, value) {
+            const [first, last] = value.split(' ');
+            this.set('firstName', first);
+            this.set('lastName', last);
+            return value;
+        },
+    }),
+
+    fullNameGetOnly: Ember.computed<string>('fullName', {
+        get() {
+            return this.get('fullName');
+        },
+    }),
+
+    fullNameSetOnly: Ember.computed<string>('firstName', 'lastName', {
+        set(key, value) {
+            const [first, last] = value.split(' ');
+            this.set('firstName', first);
+            this.set('lastName', last);
+            return value;
+        },
+    }),
+
+    combinators: Ember.computed<string>(function () {
+        return this.get('firstName');
+    })
+        .property('firstName')
+        .meta({ foo: 'bar' })
+        .volatile()
+        .readOnly(),
+
+    explicitlyDeclared: alias('fullName') as Computed<string>,
+});
+
+const person = Person.create({
+    firstName: 'Fred',
+    lastName: 'Smith',
+    age: 29,
+});
+
+assertType<string>(person.firstName);
+assertType<number>(person.age);
+assertType<Ember.ComputedProperty<string>>(person.noArgs);
+assertType<Ember.ComputedProperty<string>>(person.fullName);
+assertType<Ember.ComputedProperty<string>>(person.fullNameReadonly);
+assertType<Ember.ComputedProperty<string>>(person.fullNameWritable);
+assertType<Ember.ComputedProperty<string>>(person.fullNameGetOnly);
+assertType<Ember.ComputedProperty<string>>(person.fullNameSetOnly);
+assertType<Ember.ComputedProperty<string>>(person.combinators);
+assertType<Ember.ComputedProperty<string>>(person.explicitlyDeclared);
+
+assertType<string>(person.get('firstName'));
+assertType<number>(person.get('age'));
+assertType<string>(person.get('noArgs'));
+assertType<string>(person.get('fullName'));
+assertType<string>(person.get('fullNameReadonly'));
+assertType<string>(person.get('fullNameWritable'));
+assertType<string>(person.get('fullNameGetOnly'));
+assertType<string>(person.get('fullNameSetOnly'));
+assertType<string>(person.get('combinators'));
+assertType<string>(person.get('explicitlyDeclared'));
+
+assertType<{ firstName: string; fullName: string; age: number }>(person.getProperties('firstName', 'fullName', 'age'));
+
+const person2 = Person.create({
+    fullName: 'Fred Smith',
+});
+
+assertType<string>(person2.get('firstName'));
+assertType<string>(person2.get('fullName'));
+
+const person3 = Person.extend({
+    firstName: 'Fred',
+    fullName: 'Fred Smith',
+}).create();
+
+assertType<string>(person3.get('firstName'));
+assertType<string>(person3.get('fullName'));
+
+const person4 = Person.extend({
+    firstName: Ember.computed(() => 'Fred'),
+    fullName: Ember.computed(() => 'Fred Smith'),
+}).create();
+
+assertType<string>(person4.get('firstName'));
+assertType<string>(person4.get('fullName'));
+
+// computed property macros
+const objectWithComputedProperties = Ember.Object.extend({
+    alias: Ember.computed.alias('foo'),
+    and: Ember.computed.and('foo', 'bar', 'baz', 'qux'),
+    bool: Ember.computed.bool('foo'),
+    collect: Ember.computed.collect('foo', 'bar', 'baz', 'qux'),
+    deprecatingAlias: Ember.computed.deprecatingAlias('foo', {
+        id: 'hamster.deprecate-banana',
+        until: '3.0.0',
+    }),
+    empty: Ember.computed.empty('foo'),
+    equalNumber: Ember.computed.equal('foo', 1),
+    equalString: Ember.computed.equal('foo', 'bar'),
+    equalObject: Ember.computed.equal('foo', {}),
+    filter: Ember.computed.filter('foo', item => item === 'bar'),
+    filterBy1: Ember.computed.filterBy('foo', 'bar'),
+    filterBy2: Ember.computed.filterBy('foo', 'bar', false),
+    gt: Ember.computed.gt('foo', 3),
+    gte: Ember.computed.gte('foo', 3),
+    intersect: Ember.computed.intersect('foo', 'bar', 'baz', 'qux'),
+    lt: Ember.computed.lt('foo', 3),
+    lte: Ember.computed.lte('foo', 3),
+    map: Ember.computed.map('foo', (item, index) => item),
+    mapBy: Ember.computed.mapBy('foo', 'bar'),
+    match: Ember.computed.match('foo', /^tom.ter$/),
+    max: Ember.computed.max('foo'),
+    min: Ember.computed.min('foo'),
+    none: Ember.computed.none('foo'),
+    not: Ember.computed.not('foo'),
+    notEmpty: Ember.computed.notEmpty('foo'),
+    oneWay: Ember.computed.oneWay('foo'),
+    or: Ember.computed.or('foo', 'bar', 'baz', 'qux'),
+    readOnly: Ember.computed.readOnly('foo'),
+    reads: Ember.computed.reads('foo'),
+    setDiff: Ember.computed.setDiff('foo', 'bar'),
+    sort1: Ember.computed.sort('foo', 'bar'),
+    sort2: Ember.computed.sort('foo', (itemA, itemB) => {
+        return `${itemA}`.length - `${itemB}`.length;
+    }),
+    sum: Ember.computed.sum('foo'),
+    union: Ember.computed.union('foo', 'bar', 'baz', 'qux'),
+    uniq: Ember.computed.uniq('foo'),
+    uniqBy: Ember.computed.uniqBy('foo', 'bar'),
+}).create();
+
+assertType<unknown>(objectWithComputedProperties.get('alias'));
+assertType<unknown>(objectWithComputedProperties.get('and'));
+assertType<boolean>(objectWithComputedProperties.get('bool'));
+assertType<unknown[]>(objectWithComputedProperties.get('collect'));
+assertType<unknown>(objectWithComputedProperties.get('deprecatingAlias'));
+assertType<boolean>(objectWithComputedProperties.get('empty'));
+assertType<boolean>(objectWithComputedProperties.get('equalNumber'));
+assertType<boolean>(objectWithComputedProperties.get('equalString'));
+assertType<boolean>(objectWithComputedProperties.get('equalObject'));
+assertType<unknown[]>(objectWithComputedProperties.get('filter'));
+assertType<unknown[]>(objectWithComputedProperties.get('filterBy1'));
+assertType<unknown[]>(objectWithComputedProperties.get('filterBy2'));
+assertType<boolean>(objectWithComputedProperties.get('gt'));
+assertType<boolean>(objectWithComputedProperties.get('gte'));
+assertType<unknown[]>(objectWithComputedProperties.get('intersect'));
+assertType<boolean>(objectWithComputedProperties.get('lt'));
+assertType<boolean>(objectWithComputedProperties.get('lte'));
+assertType<unknown[]>(objectWithComputedProperties.get('map'));
+assertType<unknown[]>(objectWithComputedProperties.get('mapBy'));
+assertType<boolean>(objectWithComputedProperties.get('match'));
+assertType<number>(objectWithComputedProperties.get('max'));
+assertType<number>(objectWithComputedProperties.get('min'));
+assertType<boolean>(objectWithComputedProperties.get('none'));
+assertType<boolean>(objectWithComputedProperties.get('not'));
+assertType<boolean>(objectWithComputedProperties.get('notEmpty'));
+assertType<unknown>(objectWithComputedProperties.get('oneWay'));
+assertType<unknown>(objectWithComputedProperties.get('or'));
+assertType<unknown>(objectWithComputedProperties.get('readOnly'));
+assertType<unknown>(objectWithComputedProperties.get('reads'));
+assertType<unknown[]>(objectWithComputedProperties.get('setDiff'));
+assertType<unknown[]>(objectWithComputedProperties.get('sort1'));
+assertType<unknown[]>(objectWithComputedProperties.get('sort2'));
+assertType<number>(objectWithComputedProperties.get('sum'));
+assertType<unknown[]>(objectWithComputedProperties.get('union'));
+assertType<unknown[]>(objectWithComputedProperties.get('uniq'));
+assertType<unknown[]>(objectWithComputedProperties.get('uniqBy'));
diff --git a/types/preview/ember/test/controller.ts b/types/preview/ember/test/controller.ts
new file mode 100755
index 00000000000..208babb8fd1
--- /dev/null
+++ b/types/preview/ember/test/controller.ts
@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+
+Controller.extend({
+    queryParams: ['category'],
+    category: null,
+    isExpanded: false,
+
+    toggleBody() {
+        this.toggleProperty('isExpanded');
+    },
+});
diff --git a/types/preview/ember/test/core-object.ts b/types/preview/ember/test/core-object.ts
new file mode 100644
index 00000000000..df469143166
--- /dev/null
+++ b/types/preview/ember/test/core-object.ts
@@ -0,0 +1,218 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+/** Newable tests */
+const co1 = new Ember.CoreObject();
+
+// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// co1.concatenatedProperties; // $ExpectType string[]
+co1.isDestroyed; // $ExpectType boolean
+co1.isDestroying; // $ExpectType boolean
+co1.destroy(); // $ExpectType CoreObject
+co1.toString(); // $ExpectType string
+
+/** .create tests */
+const co2 = Ember.CoreObject.create();
+// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// co2.concatenatedProperties; // $ExpectType string[]
+co2.isDestroyed; // $ExpectType boolean
+co2.isDestroying; // $ExpectType boolean
+co2.destroy(); // $ExpectType CoreObject
+co2.toString(); // $ExpectType string
+
+/** .create tests w/ initial instance data passed in */
+const co3 = Ember.CoreObject.create({ foo: '123', bar: 456 });
+
+co3.foo; // $ExpectType string
+co3.bar; // $ExpectType number
+
+/** .extend with a zero-argument .create()  */
+const co4 = Ember.CoreObject.extend({
+    foo: '123',
+    bar: 456,
+    baz(): [string, number] {
+        return [this.foo, this.bar];
+    },
+}).create();
+
+co4.foo; // $ExpectType string
+co4.bar; // $ExpectType number
+co4.baz; // $ExpectType () => [string, number]
+
+/** .extend with inconsistent arguments passed into .create()  */
+const class05 = Ember.CoreObject.extend({
+    foo: '123' as string | boolean,
+    bar: 456,
+    baz() {
+        return [this.foo, this.bar];
+    },
+});
+// @ts-expect-error
+const c05 = class05.create({ foo: 99 });
+const c05b = class05.create({ foo: true });
+const c05c = class05.create({ foo: 'abc' });
+// @ts-expect-error
+assertType<string>(c05b.foo);
+// @ts-expect-error
+assertType<boolean>(c05c.foo);
+
+/** two .extend arguments with a zero-argument .create() */
+const co6 = Ember.CoreObject.extend(
+    {
+        foo: '123',
+        bar: 456,
+        baz() {
+            return [this.foo, this.bar];
+        },
+        func1() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.foo; // $ExpectType string
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.bee;
+        },
+    },
+    {
+        foo: 99,
+        bee: 'honey',
+        func2() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+            this.foo;
+            // this includes stuff from earlier extend-args
+            this.bar; // $ExpectType number
+        },
+    },
+).create();
+
+// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// assertType<string>(co6.foo); // @ts-expect-error
+assertType<number>(co6.bar); // $ExpectType number
+assertType<() => Array<string | number>>(co6.baz); // $ExpectType () => (string | number)[]
+
+/** three .extend arguments with a zero-argument .create() */
+const co7 = Ember.CoreObject.extend(
+    {
+        foo: '123',
+        bar: 456,
+        baz() {
+            return [this.foo, this.bar];
+        },
+        func1() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.foo; // $ExpectType string
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.bee;
+        },
+    },
+    {
+        foo: 99,
+        bee: 'honey',
+        func2() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+            this.foo;
+            // this includes stuff from earlier extend-args
+            this.bar; // $ExpectType number
+        },
+    },
+    {
+        foo: '99',
+        money: 'in the banana stand',
+        func3() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.money; // $ExpectType string
+            // this includes stuff from earlier extend-args
+            this.bee; // $ExpectType string
+            this.bar; // $ExpectType number
+        },
+    },
+).create();
+// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// assertType<number>(co7.foo); // @ts-expect-error
+assertType<number>(co7.bar); // $ExpectType number
+assertType<string>(co7.money); // $ExpectType string
+assertType<() => Array<string | number>>(co7.baz); // $ExpectType () => (string | number)[]
+
+/** four .extend arguments with a zero-argument .create() */
+const co8 = Ember.CoreObject.extend(
+    {
+        foo: '123',
+        bar: 456,
+        baz() {
+            return [this.foo, this.bar];
+        },
+        func1() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.foo; // $ExpectType string
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.bee;
+        },
+    },
+    {
+        foo: 99,
+        bee: 'honey',
+        func2() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+            this.foo;
+            // this includes stuff from earlier extend-args
+            this.bar; // $ExpectType number
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.money;
+        },
+    },
+    {
+        foo: '99',
+        money: 'in the banana stand',
+        func3() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.money; // $ExpectType string
+            // this includes stuff from earlier extend-args
+            this.bee; // $ExpectType string
+            this.bar; // $ExpectType number
+            // this does not include stuff from later extend args
+            // @ts-expect-error
+            this.neighborhood;
+        },
+    },
+    {
+        foo: '99',
+        neighborhood: 'sudden valley',
+        func4() {
+            // this includes stuff from CoreObject
+            this.init; // $ExpectType () => void
+            // this includes stuff from this extend-arg
+            this.neighborhood; // $ExpectType string
+            // this includes stuff from earlier extend-args
+            this.bee; // $ExpectType string
+            this.bar; // $ExpectType number
+            this.money; // $ExpectType string
+        },
+    },
+).create();
+
+// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+// assertType<number>(co8.foo); // @ts-expect-error
+assertType<number>(co8.bar); // $ExpectType number
+assertType<string>(co8.money); // $ExpectType string
+assertType<() => Array<string | number>>(co8.baz); // $ExpectType () => (string | number)[]
diff --git a/types/preview/ember/test/create-negative.ts b/types/preview/ember/test/create-negative.ts
new file mode 100644
index 00000000000..ff86313e31a
--- /dev/null
+++ b/types/preview/ember/test/create-negative.ts
@@ -0,0 +1,14 @@
+import { assertType } from './lib/assert';
+import Ember from 'ember';
+import { PersonWithNumberName, Person } from './create';
+
+// @ts-expect-error
+Person.create({ firstName: 99 });
+// @ts-expect-error
+Person.create({}, { firstName: 99 });
+// @ts-expect-error
+Person.create({}, {}, { firstName: 99 });
+
+const p4 = new PersonWithNumberName();
+
+// assertType<Ember.ComputedProperty<string, string>>(p4.fullName); // @ts-expect-error
diff --git a/types/preview/ember/test/create.ts b/types/preview/ember/test/create.ts
new file mode 100755
index 00000000000..2412309691f
--- /dev/null
+++ b/types/preview/ember/test/create.ts
@@ -0,0 +1,55 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+import { UnwrapComputedPropertyGetter } from "@ember/object/-private/types";
+
+/**
+ * Zero-argument case
+ */
+const o = Ember.Object.create();
+// create returns an object
+assertType<object>(o);
+// object returned by create type-checks as an instance of Ember.Object
+assertType<boolean>(o.isDestroyed); // from instance
+assertType<boolean>(o.isDestroying); // from instance
+assertType<<K extends keyof Ember.Object>(key: K) => UnwrapComputedPropertyGetter<Ember.Object[K]>>(o.get); // from prototype
+
+/**
+ * One-argument case
+ */
+const o1 = Ember.Object.create({ x: 9, y: 'hello', z: false });
+assertType<number>(o1.x);
+assertType<string>(o1.y);
+o1.y; // $ExpectType string
+o1.z; // $ExpectType boolean
+
+const obj = Ember.Object.create({ a: 1 }, { b: 2 }, { c: 3 });
+assertType<number>(obj.b);
+assertType<number>(obj.a);
+assertType<number>(obj.c);
+
+export class Person extends Ember.Object.extend({
+    fullName: Ember.computed('firstName', 'lastName', function () {
+        return [this.firstName + this.lastName].join(' ');
+    }),
+}) {
+    declare firstName: string;
+    declare lastName: string;
+    declare age: number;
+}
+const p = new Person();
+
+assertType<string>(p.firstName);
+assertType<Ember.ComputedProperty<string>>(p.fullName);
+assertType<string>(p.get('fullName'));
+
+const p2 = Person.create({ firstName: 'string' });
+const p2b = Person.create({}, { firstName: 'string' });
+const p2c = Person.create({}, {}, { firstName: 'string' });
+
+export class PersonWithNumberName extends Person.extend({
+    fullName: 6,
+}) {}
+
+const p4 = new PersonWithNumberName();
+assertType<string>(p4.firstName);
+assertType<number>(p4.fullName);
diff --git a/types/preview/ember/test/data-adapter.ts b/types/preview/ember/test/data-adapter.ts
new file mode 100644
index 00000000000..a77e6b66a14
--- /dev/null
+++ b/types/preview/ember/test/data-adapter.ts
@@ -0,0 +1,59 @@
+import Ember from 'ember';
+
+const da = Ember.DataAdapter.create();
+
+const filters = da.getFilters();
+filters.includes({ name: 'foo', desc: 'bar' }); // $ExpectType boolean
+// @ts-expect-error
+filters.includes({});
+
+filters[0].name; // $ExpectType string
+filters[0].desc; // $ExpectType string
+
+// $ExpectType () => void
+da.watchModelTypes(
+    function added(wrappedTypes) {
+        wrappedTypes;
+        wrappedTypes[0].release; // $ExpectType () => void
+        wrappedTypes[0].type.columns[0].desc; // $ExpectType string
+        wrappedTypes[0].type.columns[0].name; // $ExpectType string
+        wrappedTypes[0].type.count; // $ExpectType number
+        wrappedTypes[0].type.name; // $ExpectType string
+    },
+    function updated(wrappedTypes) {
+        wrappedTypes;
+        wrappedTypes[0].release; // $ExpectType () => void
+        wrappedTypes[0].type.columns[0].desc; // $ExpectType string
+        wrappedTypes[0].type.columns[0].name; // $ExpectType string
+        wrappedTypes[0].type.count; // $ExpectType number
+        wrappedTypes[0].type.name; // $ExpectType string
+    },
+);
+// @ts-expect-error
+da.watchModelTypes(() => {});
+
+// $ExpectType () => void
+da.watchRecords(
+    'house',
+    function added(records) {
+        records[0].object; // $ExpectType object
+        records[0].columnValues; // $ExpectType object
+    },
+    function updated(records) {
+        records[0].object; // $ExpectType object
+        records[0].columnValues; // $ExpectType object
+    },
+    function removed(idx, count) {
+        idx; // $ExpectType number
+        count; // $ExpectType number
+    },
+);
+// @ts-expect-error
+da.watchRecords(() => {});
+
+da.acceptsModelName; // $ExpectType boolean
+da.containerDebugAdapter; // $ExpectType ContainerDebugAdapter
+
+const ca: Ember.ContainerDebugAdapter = da.containerDebugAdapter;
+ca.canCatalogEntriesByType('controller'); // $ExpectType boolean
+ca.catalogEntriesByType('controller'); // $ExpectType string[]
diff --git a/types/preview/ember/test/debug.ts b/types/preview/ember/test/debug.ts
new file mode 100644
index 00000000000..5220e793301
--- /dev/null
+++ b/types/preview/ember/test/debug.ts
@@ -0,0 +1,99 @@
+import Ember from 'ember';
+
+const {
+    runInDebug,
+    warn,
+    debug,
+    Debug: { registerDeprecationHandler, registerWarnHandler },
+} = Ember;
+
+// Workaround for https://github.com/microsoft/TypeScript/issues/36931.
+const assert: typeof Ember.assert = Ember.assert;
+
+/**
+ * @ember/debug tests
+ */
+// @ts-expect-error
+runInDebug();
+runInDebug(() => console.log('Should not show up in prod')); // $ExpectType void
+
+// Log a warning if we have more than 3 tomsters
+const tomsterCount = 2;
+// @ts-expect-error
+warn('Too many tomsters!');
+warn('Too many tomsters!', { id: 'some-warning' }); // $ExpectType void
+// @ts-expect-error
+warn('Too many tomsters!', tomsterCount <= 3);
+warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' }); // $ExpectType void
+// $ExpectType void
+warn('Too many tomsters!', tomsterCount <= 3, {
+    id: 'ember-debug.too-many-tomsters',
+});
+
+// @ts-expect-error
+debug();
+debug('Too many tomsters!'); // $ExpectType void
+// @ts-expect-error
+debug('Too many tomsters!', 'foo');
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerWarnHandler();
+registerWarnHandler(() => {}); // $ExpectType void
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
+});
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    // @ts-expect-error
+    next();
+});
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    next(message); // $ExpectType void
+});
+registerWarnHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; } | undefined
+    next(message, options); // $ExpectType void
+});
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerDeprecationHandler();
+registerDeprecationHandler(() => {}); // $ExpectType void
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
+});
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    // @ts-expect-error
+    next();
+});
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    next(message); // $ExpectType void
+});
+registerDeprecationHandler((message, options, next) => { // $ExpectType void
+    message; // $ExpectType string
+    options; // $ExpectType { id: string; until: string; } | undefined
+    next(message, options); // $ExpectType void
+});
+
+// Test for truthiness
+const str: unknown = 'hello';
+assert('Must pass a string', typeof str === 'string');
+str; // $ExpectType string
+
+// Fail unconditionally
+// This has to be last because `assert never` will raise TS's checks for
+// unreachable code.
+assert('This code path should never be run'); // $ExpectType never
diff --git a/types/preview/ember/test/ember-module-tests.ts b/types/preview/ember/test/ember-module-tests.ts
new file mode 100644
index 00000000000..63e49dc2c40
--- /dev/null
+++ b/types/preview/ember/test/ember-module-tests.ts
@@ -0,0 +1,295 @@
+import Ember from 'ember';
+
+const top = (<T>(x?: T): T => x!)();
+type Top = typeof top;
+declare function expectTypeNativeArrayTop(x: Ember.NativeArray<Top>): void;
+// A
+expectTypeNativeArrayTop(Ember.A());
+Ember.A([1, 2]); // $ExpectType NativeArray<number>
+// addListener
+Ember.addListener({ a: 'foo' }, 'event', {}, () => {});
+Ember.addListener({ a: 'foo' }, 'event', {}, 'a');
+// @ts-expect-error
+Ember.addListener({ a: 'foo' }, 'event', {}, 'b');
+Ember.addListener({ a: 'foo' }, 'event', null, () => {});
+// addObserver
+Ember.addObserver({ a: 'foo' }, 'a', null, () => {});
+Ember.addObserver({ a: 'foo' }, 'a', {}, () => {});
+// assert
+Ember.assert('2+2 should always be 4', 2 + 2 === 4);
+// assign
+const o1 = Ember.assign({ a: 1 }, { b: 2 });
+o1.a; // $ExpectType number
+o1.b; // $ExpectType number
+// @ts-expect-error
+o1.c;
+// Ember.bind // @ts-expect-error
+// cacheFor
+Ember.cacheFor({ a: 123 }, 'a'); // $ExpectType number | undefined
+// @ts-expect-error
+Ember.cacheFor({ a: 123 }, 'x');
+// compare
+Ember.compare('31', '114'); // $ExpectType number
+// debug
+Ember.debug('some info for developers');
+// deprecate
+Ember.deprecate("you shouldn't use this anymore", 3 === 3, {
+    id: 'no-longer-allowed',
+    until: '99.0.0',
+});
+// get
+Ember.get({ z: 23 }, 'z'); // $ExpectType number
+Ember.get({ z: 23 }, 'zz'); // $ExpectType unknown
+// getEngineParent
+Ember.getEngineParent(new Ember.EngineInstance()); // $ExpectType EngineInstance
+// getOwner
+Ember.getOwner(new Ember.Component()); // $ExpectType Owner
+// getProperties
+Ember.getProperties({ z: 23 }, 'z').z; // $ExpectType number
+Ember.getProperties({ z: 23 }, 'z', 'z').z; // $ExpectType number
+// @ts-expect-error
+Ember.getProperties({ z: 23 }, 'z', 'a').z;
+Ember.getProperties({ z: 23 }, ['z', 'z']).z; // $ExpectType number
+// @ts-expect-error
+Ember.getProperties({ z: 23 }, ['z', 'a']).z;
+
+// guidFor
+Ember.guidFor({}); // $ExpectType string
+Ember.guidFor(''); // $ExpectType string
+// isArray
+Ember.isArray(''); // $ExpectType boolean
+Ember.isArray([]); // $ExpectType boolean
+// isBlank
+Ember.isBlank(''); // $ExpectType boolean
+Ember.isBlank([]); // $ExpectType boolean
+// isEmpty
+Ember.isEmpty(''); // $ExpectType boolean
+Ember.isEmpty([]); // $ExpectType boolean
+// isEqual
+Ember.isEqual('', 'foo'); // $ExpectType boolean
+Ember.isEqual([], ''); // $ExpectType boolean
+// isNone
+Ember.isNone(''); // $ExpectType boolean
+Ember.isNone([]); // $ExpectType boolean
+// isPresent
+Ember.isPresent(''); // $ExpectType boolean
+Ember.isPresent([]); // $ExpectType boolean
+// observer
+const o2 = Ember.Object.extend({
+    name: 'foo',
+    age: 3,
+    nameWatcher: Ember.observer('name', () => {}),
+    nameWatcher2: Ember.observer('name', 'fullName', () => {}),
+});
+// on
+const o3 = Ember.Object.extend({
+    name: 'foo',
+    nameWatcher: Ember.on('init', () => {}),
+    nameWatcher2: Ember.on('destroy', () => {}),
+});
+// removeListener
+Ember.removeListener(o2, 'create', null, () => {});
+Ember.removeListener(o2, 'create', null, 'create');
+// @ts-expect-error
+Ember.removeListener({}, 'create', null, 'blah');
+// removeObserver
+Ember.removeObserver(o2, 'create', () => {});
+// @ts-expect-error
+Ember.removeObserver({}, 'create', () => {});
+// runInDebug
+Ember.runInDebug(() => {});
+// sendEvent
+Ember.sendEvent(o2, 'clicked', [1, 2]); // $ExpectType boolean
+// set
+Ember.set(o2.create(), 'name', 'bar'); // $ExpectType string
+Ember.set(o2.create(), 'age', 4); // $ExpectType number
+// @ts-expect-error
+Ember.set(o2.create(), 'nam', 'bar');
+// setOwner
+declare let app: Ember.ApplicationInstance;
+Ember.setOwner(o2.create(), app);
+// setProperties
+Ember.setProperties(o2.create(), { name: 'bar' }).name; // $ExpectType string
+// trySet
+Ember.trySet(o2, 'nam', ''); // $ExpectType any
+// typeOf
+Ember.typeOf(''); // $ExpectType "string"
+Ember.typeOf(Ember.A()); // $ExpectType "array"
+// warn
+// @ts-expect-error
+Ember.warn('be caseful!');
+Ember.warn('be caseful!', { id: 'some-warning' });
+// VERSION
+Ember.VERSION; // $ExpectType string
+
+// onerror
+
+Ember.onerror = (err: Error) => console.error(err);
+// @ts-expect-error
+Ember.onerror = (num: number, err: Error) => console.error(err);
+Ember.onerror = undefined;
+
+// Classes
+// TODO ContainerProxyMixin
+// Ember
+// Ember.Application
+new Ember.Application(); // $ExpectType Application
+Ember.Application.create(); // $ExpectType Application
+// Ember.ApplicationInstance
+new Ember.ApplicationInstance(); // $ExpectType ApplicationInstance
+Ember.ApplicationInstance.create(); // $ExpectType ApplicationInstance
+// TODO: Ember.ApplicationInstance.BootOptions
+// Ember.Array
+const a1: Ember.Array<string> = [];
+// @ts-expect-error
+const a2: Ember.Array<string> = {};
+// Ember.ArrayProxy
+new Ember.ArrayProxy<number>([3, 3, 2]); // $ExpectType ArrayProxy<number>
+// Ember.Component
+const C1 = Ember.Component.extend({ classNames: ['foo'] });
+class C2 extends Ember.Component {
+    classNames = ['foo'];
+}
+const c1 = new C1();
+const c2 = new C2();
+C1.create();
+C2.create();
+c1.didInsertElement();
+c2.didInsertElement();
+// Ember.ComputedProperty
+const cp: Ember.ComputedProperty<string, string> = Ember.computed('foo', {
+    get(): string {
+        return '';
+    },
+    set(_key: string, newVal: string): string {
+        return '';
+    },
+});
+// Ember.ContainerDebugAdapter
+const cda = new Ember.ContainerDebugAdapter(); // $ExpectType ContainerDebugAdapter
+// Ember.Controller
+const con = new Ember.Controller(); // $ExpectType Controller
+// Ember.CoreObject
+const co = new Ember.CoreObject(); // $ExpectType CoreObject
+// Ember.DataAdapter
+const da = new Ember.DataAdapter(); // $ExpectType DataAdapter
+// Ember.Debug
+Ember.Debug.registerDeprecationHandler(() => {});
+Ember.Debug.registerWarnHandler(() => {});
+// Ember.Engine
+const e1 = new Ember.Engine();
+e1.register('data:foo', {}, { instantiate: false });
+// Ember.EngineInstance
+const ei1 = new Ember.EngineInstance();
+ei1.lookup('data:foo');
+// Ember.Error
+new Ember.Error('Halp!');
+// Ember.Evented
+const oe1 = Ember.Object.extend(Ember.Evented).create();
+oe1.trigger('foo');
+oe1.on('bar', () => {});
+oe1.on('bar', { foo() {} }, () => {});
+// Ember.HashLocation
+const hl = new Ember.HashLocation(); // $ExpectType HashLocation
+// Ember.Helper
+const h1 = Ember.Helper.extend({
+    compute() {
+        this.recompute();
+        return '';
+    },
+});
+// Ember.HistoryLocation
+const hil = new Ember.HistoryLocation(); // $ExpectType HistoryLocation
+// Ember.Mixin
+Ember.Object.extend(Ember.Mixin.create({ foo: 'bar' }), {
+    baz() {
+        this.foo; // $ExpectType string
+    },
+});
+// Ember.MutableArray
+const ma1: Ember.MutableArray<string> = ['money', 'in', 'the', 'bananna', 'stand'];
+ma1.addObject('!'); // $ExpectType string
+// @ts-expect-error
+ma1.filterBy('');
+ma1.firstObject; // $ExpectType string | undefined
+ma1.lastObject; // $ExpectType string | undefined
+const ma2: Ember.MutableArray<{ name: string }> = [{ name: 'chris' }, { name: 'dan' }, { name: 'james' }];
+ma2.filterBy('name', 'chris'); // $ExpectType NativeArray<{ name: string; }>
+// Ember.MutableEnumerable
+const me1: Ember.MutableEnumerable<string | null | undefined> = ['foo', undefined, null];
+me1.compact(); // $ExpectType NativeArray<string>
+// Ember.Namespace
+const myNs = Ember.Namespace.extend({});
+// Ember.NativeArray
+const na: Ember.NativeArray<number> = Ember.A([2, 3, 4]);
+na; // $ExpectType NativeArray<number>
+na.clear(); // $ExpectType NativeArray<number>
+// Ember.NoneLocation
+new Ember.NoneLocation(); // $ExpectType NoneLocation
+// Ember.Object
+new Ember.Object();
+// Ember.ObjectProxy
+new Ember.ObjectProxy(); // $ExpectType ObjectProxy
+// Ember.Observable
+Ember.Object.extend(Ember.Observable, {});
+// Ember.PromiseProxyMixin
+Ember.Object.extend(Ember.PromiseProxyMixin, {
+    foo() {
+        this.reason; // $ExpectType unknown
+        this.isPending; // $ExpectType boolean
+    },
+});
+// Ember.Route
+new Ember.Route();
+// Ember.Router
+new Ember.Router();
+// Ember.Service
+new Ember.Service();
+// Ember.Test
+Ember.Test;
+// Ember.Test.Adapter
+new Ember.Test.Adapter();
+// Ember.Test.QUnitAdapter
+new Ember.Test.QUnitAdapter();
+// Ember.Helper
+// helper
+Ember.Helper.helper(([a, b]: [number, number]) => a + b);
+// Ember.String
+Ember.String;
+// htmlSafe
+Ember.String.htmlSafe('foo'); // $ExpectType SafeString
+// isHTMLSafe
+Ember.String.isHTMLSafe('foo'); // $ExpectType boolean
+// Ember.Test
+Ember.Test.checkWaiters(); // $ExpectType boolean
+// checkWaiters
+
+/**
+ * == REMOVED FEATURES ==
+ * These are deprecated and/or private things that have been removed from the
+ * Ember.* namespace. These tests asserts that the types of these things
+ * stay gone
+ */
+
+// @ts-expect-error
+Ember.bind;
+// @ts-expect-error
+Ember.deprecate('foo', 'bar');
+// @ts-expect-error
+Ember.K;
+// @ts-expect-error
+Ember.Binding;
+// @ts-expect-error
+Ember.Transition;
+// @ts-expect-error
+Ember.create;
+// @ts-expect-error
+Ember.reset;
+// @ts-expect-error
+Ember.unsubscribe;
+// @ts-expect-error
+Ember.subscribe;
+// @ts-expect-error
+Ember.instrument;
+// @ts-expect-error
+Ember.Instrumentation;
diff --git a/types/preview/ember/test/ember-tests.ts b/types/preview/ember/test/ember-tests.ts
new file mode 100755
index 00000000000..493d98f9c82
--- /dev/null
+++ b/types/preview/ember/test/ember-tests.ts
@@ -0,0 +1,190 @@
+import Ember from 'ember';
+import { AnyFn } from 'ember/-private/type-utils';
+import { assertType } from './lib/assert';
+
+let App: any;
+
+App = Ember.Application.create();
+App.president = Ember.Object.create({
+  name: 'Barack Obama',
+});
+App.country = Ember.Object.create({
+  presidentNameBinding: 'MyApp.president.name',
+});
+App.country.get('presidentName');
+App.president = Ember.Object.create({
+  firstName: 'Barack',
+  lastName: 'Obama',
+  fullName: Ember.computed(function () {
+    return `${this.get('firstName')} ${this.get('lastName')}`;
+  }),
+});
+App.president.get('fullName');
+
+declare class MyPerson extends Ember.Object {
+  static createMan(): MyPerson;
+}
+MyPerson.createMan();
+
+const Person1 = Ember.Object.extend({
+  say: (thing: string) => {
+    alert(thing);
+  },
+});
+
+declare class MyPerson2 extends Ember.Object {
+  helloWorld(): void;
+}
+MyPerson2.create().helloWorld();
+
+const tom = Person1.create({
+  name: 'Tom Dale',
+  helloWorld() {
+    this.say('Hi my name is ' + this.get('name'));
+  },
+});
+tom.helloWorld();
+
+const PersonReopened = Person1.reopen({ isPerson: true });
+PersonReopened.create().get('isPerson');
+
+App.todosController = Ember.Object.create({
+  todos: [Ember.Object.create({ isDone: false })],
+  remaining: Ember.computed('todos.@each.isDone', function () {
+    const todos = this.get('todos');
+    return todos.filterProperty('isDone', false).get('length');
+  }),
+});
+
+const todos = App.todosController.get('todos');
+let todo = todos.objectAt(0);
+todo.set('isDone', true);
+App.todosController.get('remaining');
+todo = Ember.Object.create({ isDone: false });
+todos.pushObject(todo);
+App.todosController.get('remaining');
+
+App.wife = Ember.Object.create({
+  householdIncome: 80000,
+});
+App.husband = Ember.Object.create({
+  householdIncomeBinding: 'App.wife.householdIncome',
+});
+App.husband.get('householdIncome');
+App.husband.set('householdIncome', 90000);
+App.wife.get('householdIncome');
+
+App.user = Ember.Object.create({
+  fullName: 'Kara Gates',
+});
+App.user.set('fullName', 'Krang Gates');
+App.userView.set('userName', 'Truckasaurus Gates');
+App.user.get('fullName');
+
+App = Ember.Application.create({
+  rootElement: '#sidebar',
+});
+
+App.userController = Ember.Object.create({
+  content: Ember.Object.create({
+    firstName: 'Albert',
+    lastName: 'Hofmann',
+    posts: 25,
+    hobbies: 'Riding bicycles',
+  }),
+});
+
+Ember.Handlebars.registerHelper(
+  'highlight',
+  (property: string, options: any) =>
+    new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
+);
+
+const coolView = App.CoolView.create();
+
+const Person2 = Ember.Object.extend({
+  name: '',
+  sayHello() {
+    console.log('Hello from ' + this.get('name'));
+  },
+});
+const people = Ember.A([
+  Person2.create({ name: 'Juan' }),
+  Person2.create({ name: 'Charles' }),
+  Person2.create({ name: 'Majd' }),
+]);
+people.invoke('sayHello');
+// @ts-expect-error
+people.invoke('name');
+
+type Arr = Ember.NativeArray<
+  Ember.Object & {
+    name?: string;
+  }
+>;
+const arr: Arr = Ember.A([Ember.Object.create(), Ember.Object.create()]);
+arr.setEach('name', 'unknown'); // $ExpectType void
+arr.setEach('name', undefined); // $ExpectType void
+arr.getEach('name'); // $ExpectType (string | undefined)[]
+// @ts-expect-error
+arr.setEach('age', 123);
+// @ts-expect-error
+arr.getEach('age');
+
+const Person3 = Ember.Object.extend({
+  name: '',
+  isHappy: false,
+});
+const people2 = Ember.A([
+  Person3.create({ name: 'Yehuda', isHappy: true }),
+  Person3.create({ name: 'Majd', isHappy: false }),
+]);
+const isHappy = (person: typeof Person3.prototype): boolean => {
+  return !!person.get('isHappy');
+};
+people2.every(isHappy);
+people2.any(isHappy);
+people2.isEvery('isHappy');
+people2.isEvery('isHappy', true);
+// @ts-expect-error
+people2.isAny('isHappy', 'true');
+people2.isAny('isHappy', true);
+people2.isAny('isHappy');
+
+// Examples taken from http://emberjs.com/api/classes/Em.RSVP.Promise.html
+const promise = new Ember.RSVP.Promise<string>((resolve: AnyFn, reject: AnyFn) => {
+  // on success
+  resolve('ok!');
+
+  // on failure
+  reject('no-k!');
+});
+
+promise.then(
+  (value) => {
+    // on fulfillment
+    assertType<string>(value);
+  },
+  (reason: unknown) => {
+    // on rejection
+  }
+);
+
+// make sure Ember.RSVP.Promise can be reference as a type
+declare function promiseReturningFunction(urn: string): Ember.RSVP.Promise<string>;
+
+const mix1 = Ember.Mixin.create({
+  foo: 1,
+});
+
+const mix2 = Ember.Mixin.create({
+  bar: 2,
+});
+
+const component1 = Ember.Component.extend(mix1, mix2, {
+  lyft: Ember.inject.service(),
+  cars: Ember.computed.readOnly('lyft.cars'),
+});
+
+// make sure htmlSafe returns a SafeString
+Ember.String.htmlSafe('hello'); // $ExpectType SafeString
diff --git a/types/preview/ember/test/engine-instance.ts b/types/preview/ember/test/engine-instance.ts
new file mode 100644
index 00000000000..e3f8c0b3aae
--- /dev/null
+++ b/types/preview/ember/test/engine-instance.ts
@@ -0,0 +1,27 @@
+import Ember from 'ember';
+const { EngineInstance } = Ember;
+
+const engineInstance = EngineInstance.create();
+engineInstance.register('some:injection', class Foo {});
+
+engineInstance.register('some:injection', class Foo {}, {
+    singleton: true,
+});
+
+engineInstance.register('some:injection', class Foo {}, {
+    instantiate: false,
+});
+
+engineInstance.register('some:injection', class Foo {}, {
+    singleton: false,
+    instantiate: true,
+});
+
+engineInstance.factoryFor('router:main');
+engineInstance.lookup('route:basic');
+
+engineInstance.boot();
+
+(async () => {
+    await engineInstance.boot();
+})();
diff --git a/types/preview/ember/test/engine.ts b/types/preview/ember/test/engine.ts
new file mode 100755
index 00000000000..094cbfcc82d
--- /dev/null
+++ b/types/preview/ember/test/engine.ts
@@ -0,0 +1,43 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const BaseEngine = Ember.Engine.extend({
+    modulePrefix: 'my-engine',
+});
+
+class Obj extends Ember.Object.extend({ foo: 'bar' }) {}
+
+BaseEngine.initializer({
+    name: 'my-initializer',
+    initialize(engine) {
+        engine.register('foo:bar', Obj);
+    },
+});
+
+BaseEngine.instanceInitializer({
+    name: 'my-instance-initializer',
+    initialize(engine) {
+        (engine.lookup('foo:bar') as Obj).get('foo');
+    },
+});
+
+const Engine1 = BaseEngine.create({
+    rootElement: '#engine-one',
+    customEvents: {
+        paste: 'paste',
+    },
+});
+
+const Engine2 = BaseEngine.create({
+    rootElement: '#engine-two',
+    customEvents: {
+        mouseenter: null,
+        mouseleave: null,
+    },
+});
+
+const Engine3 = BaseEngine.create();
+
+const Engine3Instance1 = Engine3.buildInstance();
+
+const Engine3Instance2 = Engine3.buildInstance({ foo: 'bar' });
diff --git a/types/preview/ember/test/error.ts b/types/preview/ember/test/error.ts
new file mode 100644
index 00000000000..3e8de002ad9
--- /dev/null
+++ b/types/preview/ember/test/error.ts
@@ -0,0 +1,5 @@
+import { assertType } from './lib/assert';
+
+import Ember from 'ember';
+
+assertType<typeof Ember.Error>(Ember.Error);
diff --git a/types/preview/ember/test/event.ts b/types/preview/ember/test/event.ts
new file mode 100755
index 00000000000..ab53935c8f5
--- /dev/null
+++ b/types/preview/ember/test/event.ts
@@ -0,0 +1,60 @@
+import Ember from 'ember';
+
+function testOn() {
+    const Job = Ember.Object.extend({
+        logCompleted: Ember.on('completed', () => {
+            console.log('Job completed!');
+        }),
+    });
+
+    const job = Job.create();
+
+    Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
+}
+
+function testEvented() {
+    const Person = Ember.Object.extend(Ember.Evented, {
+        greet() {
+            this.trigger('greet');
+        },
+    });
+
+    const person = Person.create();
+
+    person.on('greet', () => {
+        console.log('Our person has greeted');
+    });
+
+    person
+        .on('greet', () => {
+            console.log('Our person has greeted');
+        })
+        .one('greet', () => {
+            console.log('Offer one-time special');
+        })
+        .off('event', {}, () => {});
+
+    person.greet();
+}
+
+function testObserver() {
+    Ember.Object.extend({
+        valueObserver: Ember.observer('value', () => {
+            // Executes whenever the "value" property changes
+        }),
+    });
+}
+
+function testListener() {
+    Ember.Component.extend({
+        init() {
+            Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener');
+            Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener', true);
+            Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener);
+            Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener, true);
+            Ember.removeListener(this, 'willDestroyElement', this, 'willDestroyListener');
+            Ember.removeListener(this, 'willDestroyElement', this, this.willDestroyListener);
+        },
+        willDestroyListener() {},
+    });
+}
diff --git a/types/preview/ember/test/extend.ts b/types/preview/ember/test/extend.ts
new file mode 100755
index 00000000000..61dd852accb
--- /dev/null
+++ b/types/preview/ember/test/extend.ts
@@ -0,0 +1,61 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const Person = Ember.Object.extend({
+    firstName: '',
+    lastName: '',
+
+    getFullName() {
+        return `${this.firstName} ${this.lastName}`;
+    },
+    getFullName2(): string {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    },
+});
+
+assertType<string>(Person.prototype.firstName);
+assertType<() => string>(Person.prototype.getFullName);
+
+const person = Person.create({
+    firstName: 'Joe',
+    lastName: 'Blow',
+    extra: 42,
+});
+
+assertType<string>(person.getFullName());
+assertType<number>(person.extra);
+
+class ES6Person extends Ember.Object {
+    declare firstName: string;
+    declare lastName: string;
+
+    get fullName() {
+        return `${this.firstName} ${this.lastName}`;
+    }
+    get fullName2(): string {
+        return `${this.get('firstName')} ${this.get('lastName')}`;
+    }
+}
+
+assertType<string>(ES6Person.prototype.firstName);
+assertType<string>(ES6Person.prototype.fullName);
+
+const es6Person = ES6Person.create({
+    firstName: 'Joe',
+    lastName: 'Blow',
+    extra: 42,
+});
+
+assertType<string>(es6Person.fullName);
+assertType<number>(es6Person.extra);
+
+class PersonWithStatics extends Ember.Object {
+    static isPerson = true;
+}
+const PersonWithStatics2 = PersonWithStatics.extend({});
+class PersonWithStatics3 extends PersonWithStatics {}
+class PersonWithStatics4 extends PersonWithStatics2 {}
+assertType<boolean>(PersonWithStatics.isPerson);
+assertType<boolean>(PersonWithStatics2.isPerson);
+assertType<boolean>(PersonWithStatics3.isPerson);
+assertType<boolean>(PersonWithStatics4.isPerson);
diff --git a/types/preview/ember/test/helper.ts b/types/preview/ember/test/helper.ts
new file mode 100755
index 00000000000..433ddbd0637
--- /dev/null
+++ b/types/preview/ember/test/helper.ts
@@ -0,0 +1,45 @@
+import Ember from 'ember';
+
+const FormatCurrencyHelper = Ember.Helper.helper((params: [number], hash: { currency: string }) => {
+    const cents = params[0];
+    const currency = hash.currency;
+    return `${currency}${cents * 0.01}`;
+});
+
+class User extends Ember.Object {
+    declare email: string;
+}
+
+class SessionService extends Ember.Service {
+    declare currentUser: User;
+}
+
+declare module '@ember/service' {
+    interface Registry {
+        session: SessionService;
+    }
+}
+
+const CurrentUserEmailHelper = Ember.Helper.extend({
+    session: Ember.inject.service('session'),
+    onNewUser: Ember.observer('session.currentUser', function (this: Ember.Helper) {
+        this.recompute();
+    }),
+    compute(): string {
+        return this.get('session').get('currentUser').get('email');
+    },
+});
+
+import { helper } from '@ember/component/helper';
+
+function typedHelp(/*params, hash*/) {
+    return 'my type of help';
+}
+
+export default helper(typedHelp);
+
+function arrayNumHelp(/*params, hash*/) {
+    return [1, 2, 3];
+}
+
+helper(arrayNumHelp);
diff --git a/types/preview/ember/test/inject.ts b/types/preview/ember/test/inject.ts
new file mode 100755
index 00000000000..961923c03ba
--- /dev/null
+++ b/types/preview/ember/test/inject.ts
@@ -0,0 +1,60 @@
+import Ember from 'ember';
+
+class AuthService extends Ember.Service {
+    declare isAuthenticated: boolean;
+}
+
+class ApplicationController extends Ember.Controller {
+    model = {};
+    declare string: string;
+    transitionToLogin() {}
+}
+
+declare module '@ember/service' {
+    interface Registry {
+        auth: AuthService;
+    }
+}
+
+declare module '@ember/controller' {
+    interface Registry {
+        application: ApplicationController;
+    }
+}
+
+class LoginRoute extends Ember.Route {
+    auth = Ember.inject.service('auth');
+    application = Ember.inject.controller('application');
+
+    didTransition() {
+        if (!this.get('auth').get('isAuthenticated')) {
+            this.get('application').transitionToLogin();
+        }
+    }
+
+    anyOldMethod() {
+        this.get('application').set('string', 'must be a string');
+        this.controllerFor('application'); // $ExpectType Controller
+    }
+}
+
+// New module injection style.
+import Controller, { inject as controller } from '@ember/controller';
+import Service, { inject as service } from '@ember/service';
+import { assertType } from './lib/assert';
+
+class ComponentInjection extends Ember.Component {
+    applicationController = controller('application');
+    auth = service('auth');
+    router = service('router');
+    misc = service();
+
+    testem() {
+        assertType<Ember.Service>(this.get('misc'));
+        const url = this.get('router').urlFor('some-route', 1, 2, 3, { queryParams: { seriously: 'yes' } });
+        assertType<string>(url);
+        if (!this.get('auth').isAuthenticated) {
+            this.get('applicationController').transitionToLogin();
+        }
+    }
+}
diff --git a/types/preview/ember/test/lib/assert.ts b/types/preview/ember/test/lib/assert.ts
new file mode 100755
index 00000000000..dad227ab5e9
--- /dev/null
+++ b/types/preview/ember/test/lib/assert.ts
@@ -0,0 +1,2 @@
+/** Static assertion that `value` has type `T` */
+export declare function assertType<T>(value: T): T;
diff --git a/types/preview/ember/test/mixin.ts b/types/preview/ember/test/mixin.ts
new file mode 100755
index 00000000000..ccb71d14ef1
--- /dev/null
+++ b/types/preview/ember/test/mixin.ts
@@ -0,0 +1,57 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+interface EditableMixin {
+    edit(): void;
+    isEditing: boolean;
+}
+
+const EditableMixin = Ember.Mixin.create<EditableMixin, Ember.Route>({
+    edit() {
+        this.get('controller');
+        console.log('starting to edit');
+        this.set('isEditing', true);
+    },
+    isEditing: false,
+});
+
+const EditableComment = Ember.Route.extend(EditableMixin, {
+    postId: 0,
+
+    canEdit() {
+        return !this.isEditing;
+    },
+
+    tryEdit() {
+        if (this.canEdit()) {
+            this.edit();
+        }
+    },
+});
+
+const comment = EditableComment.create({
+    postId: 42,
+});
+
+comment.edit();
+comment.canEdit();
+comment.tryEdit();
+assertType<boolean>(comment.isEditing);
+assertType<number>(comment.postId);
+
+const LiteralMixins = Ember.Object.extend({ a: 1 }, { b: 2 }, { c: 3 });
+const obj = LiteralMixins.create();
+assertType<number>(obj.a);
+assertType<number>(obj.b);
+assertType<number>(obj.c);
+
+/* Test composition of mixins */
+const EditableAndCancelableMixin = Ember.Mixin.create(EditableMixin, {
+    cancelled: false,
+});
+
+const EditableAndCancelableComment = Ember.Route.extend(EditableAndCancelableMixin);
+
+const editableAndCancelable = EditableAndCancelableComment.create();
+assertType<boolean>(editableAndCancelable.isEditing);
+assertType<boolean>(editableAndCancelable.cancelled);
diff --git a/types/preview/ember/test/object.ts b/types/preview/ember/test/object.ts
new file mode 100755
index 00000000000..9deb3df638d
--- /dev/null
+++ b/types/preview/ember/test/object.ts
@@ -0,0 +1,84 @@
+import Ember from 'ember';
+
+const LifetimeHooks = Ember.Object.extend({
+    resource: undefined as {} | undefined,
+
+    init() {
+        this._super();
+        this.resource = {};
+    },
+
+    willDestroy() {
+        this.resource = undefined;
+        this._super();
+    },
+});
+
+class MyObject30 extends Ember.Object {
+    constructor() {
+        super();
+    }
+}
+
+class MyObject31 extends Ember.Object {
+    constructor(properties: object) {
+        super(properties);
+    }
+}
+
+class Foo extends Ember.Object.extend({
+    a: Ember.computed({
+        get() {
+            return '';
+        },
+        set(key: string, newVal: string) {
+            return '';
+        },
+    }),
+}) {
+    b = 5;
+    baz() {
+        const y = this.b; // $ExpectType number
+        const z = this.a; // $ExpectType ComputedProperty<string, string>
+        this.b = 10;
+        this.get('b').toFixed(4); // $ExpectType string
+        this.set('a', 'abc').split(','); // $ExpectType string[]
+        this.set('b', 10).toFixed(4); // $ExpectType string
+
+        this.setProperties({ b: 11 });
+        // this.setProperties({ b: '11' }); // @ts-expect-error
+        this.setProperties({
+            a: 'def',
+            b: 11,
+        });
+    }
+}
+
+export class Foo2 extends Ember.Object {
+    name!: string;
+
+    changeName(name: string) {
+        const a: string = this.set('name', name);
+        // @ts-expect-error
+        const b: number = this.set('name', name);
+        const x: string = Ember.set(this, 'name', name);
+        // @ts-expect-error
+        const y: number = Ember.set(this, 'name', name);
+        this.setProperties({
+            name,
+        });
+        Ember.setProperties(this, {
+            name,
+        });
+    }
+
+    bar() {
+        Ember.notifyPropertyChange(this, 'name');
+        // @ts-expect-error
+        Ember.notifyPropertyChange(this);
+        // @ts-expect-error
+        Ember.notifyPropertyChange('name');
+        // @ts-expect-error
+        Ember.notifyPropertyChange(this, 'name', 'bar');
+    }
+}
diff --git a/types/preview/ember/test/observable.ts b/types/preview/ember/test/observable.ts
new file mode 100755
index 00000000000..b8c339b4aed
--- /dev/null
+++ b/types/preview/ember/test/observable.ts
@@ -0,0 +1,116 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
+
+class MyComponent extends Ember.Component {
+  foo = 'bar';
+
+  init() {
+    this._super();
+    this.addObserver('foo', this, 'fooDidChange');
+    this.addObserver('foo', this, this.fooDidChange);
+    Ember.addObserver(this, 'foo', this, 'fooDidChange');
+    Ember.addObserver(this, 'foo', this, this.fooDidChange);
+    this.removeObserver('foo', this, 'fooDidChange');
+    this.removeObserver('foo', this, this.fooDidChange);
+    Ember.removeObserver(this, 'foo', this, 'fooDidChange');
+    Ember.removeObserver(this, 'foo', this, this.fooDidChange);
+    const lambda = () => {
+      this.fooDidChange(this, 'foo');
+    };
+    this.addObserver('foo', lambda);
+    this.removeObserver('foo', lambda);
+    Ember.addObserver(this, 'foo', lambda);
+    Ember.removeObserver(this, 'foo', lambda);
+  }
+
+  @Ember.computed('foo')
+  get bar(): string {
+    return this.foo;
+  }
+
+  fooDidChange(sender: MyComponent, key: string) {
+    // your code
+  }
+}
+
+const myComponent = MyComponent.create();
+myComponent.addObserver('foo', null, () => {});
+myComponent.set('foo', 'baz');
+expectTypeOf(myComponent.get('foo')).toEqualTypeOf<string>();
+
+const person = Ember.Object.create({
+  name: 'Fred',
+  age: 29,
+  capitalized: Ember.computed<string>(function () {
+    return this.get('name').toUpperCase();
+  }),
+});
+
+const pojo = { name: 'Fred', age: 29 };
+
+function testGet() {
+  assertType<string>(Ember.get(person, 'name'));
+  assertType<number>(Ember.get(person, 'age'));
+  assertType<string>(Ember.get(person, 'capitalized'));
+  assertType<string>(person.get('name'));
+  assertType<number>(person.get('age'));
+  assertType<string>(person.get('capitalized'));
+  assertType<string>(Ember.get(pojo, 'name'));
+}
+
+function testGetProperties() {
+  assertType<{ name: string }>(Ember.getProperties(person, 'name'));
+  assertType<{ name: string; age: number }>(Ember.getProperties(person, 'name', 'age'));
+  assertType<{ name: string; age: number }>(Ember.getProperties(person, ['name', 'age']));
+  assertType<{ name: string; age: number; capitalized: string }>(
+    Ember.getProperties(person, 'name', 'age', 'capitalized')
+  );
+  assertType<{ name: string }>(person.getProperties('name'));
+  assertType<{ name: string; age: number }>(person.getProperties('name', 'age'));
+  assertType<{ name: string; age: number }>(person.getProperties(['name', 'age']));
+  assertType<{ name: string; age: number; capitalized: string }>(
+    person.getProperties('name', 'age', 'capitalized')
+  );
+  assertType<{ name: string; age: number }>(Ember.getProperties(pojo, 'name', 'age'));
+}
+
+function testSet() {
+  assertType<string>(Ember.set(person, 'name', 'Joe'));
+  assertType<number>(Ember.set(person, 'age', 35));
+  assertType<string>(Ember.set(person, 'capitalized', 'JOE'));
+  assertType<string>(person.set('name', 'Joe'));
+  assertType<number>(person.set('age', 35));
+  assertType<string>(person.set('capitalized', 'JOE'));
+  assertType<string>(Ember.set(pojo, 'name', 'Joe'));
+}
+
+function testSetProperties() {
+  assertType<{ name: string }>(Ember.setProperties(person, { name: 'Joe' }));
+  assertType<{ name: string; age: number }>(Ember.setProperties(person, { name: 'Joe', age: 35 }));
+  assertType<{ name: string; capitalized: string }>(
+    Ember.setProperties(person, { name: 'Joe', capitalized: 'JOE' })
+  );
+  assertType<{ name: string }>(person.setProperties({ name: 'Joe' }));
+  assertType<{ name: string; age: number }>(person.setProperties({ name: 'Joe', age: 35 }));
+  assertType<{ name: string; capitalized: string }>(
+    person.setProperties({ name: 'Joe', capitalized: 'JOE' })
+  );
+  assertType<{ name: string; age: number }>(Ember.setProperties(pojo, { name: 'Joe', age: 35 }));
+}
+
+function testDynamic() {
+  const obj: Record<string, string> = {};
+  const dynamicKey: string = 'dummy'; // tslint:disable-line:no-inferrable-types
+
+  assertType<string | undefined>(Ember.get(obj, 'dummy'));
+  assertType<string | undefined>(Ember.get(obj, dynamicKey));
+  assertType<{ dummy: string | undefined }>(Ember.getProperties(obj, 'dummy'));
+  assertType<{ dummy: string | undefined }>(Ember.getProperties(obj, ['dummy']));
+  assertType<Record<string, string>>(Ember.getProperties(obj, dynamicKey));
+  assertType<Record<string, string>>(Ember.getProperties(obj, [dynamicKey]));
+  assertType<string | undefined>(Ember.set(obj, 'dummy', 'value'));
+  assertType<string | undefined>(Ember.set(obj, dynamicKey, 'value'));
+  assertType<{ dummy: string | undefined }>(Ember.setProperties(obj, { dummy: 'value ' }));
+  assertType<Record<string, string>>(Ember.setProperties(obj, { [dynamicKey]: 'value' }));
+}
diff --git a/types/preview/ember/test/private/computed-tests.ts b/types/preview/ember/test/private/computed-tests.ts
new file mode 100644
index 00000000000..c0c83772383
--- /dev/null
+++ b/types/preview/ember/test/private/computed-tests.ts
@@ -0,0 +1,92 @@
+import Ember from 'ember';
+import {
+    UnwrapComputedPropertySetters,
+    UnwrapComputedPropertyGetters,
+    UnwrapComputedPropertySetter,
+    UnwrapComputedPropertyGetter,
+} from '@ember/object/-private/types';
+import { assertType } from '../lib/assert';
+
+class Example1 extends Ember.Object.extend({
+    firstName: '',
+    lastName: '',
+    allNames: Ember.computed('fullName', function () {
+        return [this.fullName];
+    }) as Ember.ComputedProperty<string[]>,
+    fullName: Ember.computed('firstName', 'lastName', function () {
+        // tslint:disable-next-line:no-unnecessary-type-assertion
+        return `${this.firstName} ${this.lastName}` as string;
+    }),
+}) {}
+
+declare const unwrappedGetters1: UnwrapComputedPropertyGetters<Example1>;
+unwrappedGetters1.firstName; // $ExpectType string
+unwrappedGetters1.lastName; // $ExpectType string
+unwrappedGetters1.fullName; // $ExpectType string
+unwrappedGetters1.allNames; // $ExpectType string[]
+
+declare const unwrappedSetters1: UnwrapComputedPropertySetters<Example1>;
+unwrappedSetters1.firstName; // $ExpectType string
+unwrappedSetters1.lastName; // $ExpectType string
+unwrappedSetters1.fullName; // $ExpectType string
+unwrappedSetters1.allNames; // $ExpectType string[]
+
+class Example2 extends Ember.Object.extend({
+    allNames: Ember.computed('fullName', function () {
+        return [this.fullName + ''];
+    }),
+    fullName: Ember.computed('firstName', 'lastName', function () {
+        // tslint:disable-next-line:no-unnecessary-type-assertion
+        return `${this.firstName} ${this.lastName}` as string;
+    }),
+}) {
+    firstName = '';
+    lastName = '';
+    foo() {
+        this.fullName; // $ExpectType ComputedProperty<string, string>
+        this.allNames; // $ExpectType ComputedProperty<string[], string[]>
+        this.firstName; // $ExpectType string
+        this.lastName; // $ExpectType string
+
+        this.get('fullName').split(','); // $ExpectType string[]
+        this.get('allNames')[0]; // $ExpectType string
+        this.get('firstName').split(','); // $ExpectType string[]
+        this.get('lastName').split(','); // $ExpectType string[]
+    }
+}
+const ex2 = new Example2();
+
+declare const unwrappedGetters2: UnwrapComputedPropertyGetters<typeof ex2>;
+assertType<string>(unwrappedGetters2.firstName); // $ExpectType string
+assertType<string>(unwrappedGetters2.lastName); // $ExpectType string
+assertType<string>(unwrappedGetters2.fullName); // $ExpectType string
+assertType<string[]>(unwrappedGetters2.allNames); // $ExpectType string[]
+
+declare const unwrappedSetters2: UnwrapComputedPropertySetters<typeof ex2>;
+assertType<string>(unwrappedSetters2.firstName); // $ExpectType string
+assertType<string>(unwrappedSetters2.lastName); // $ExpectType string
+assertType<string>(unwrappedSetters2.fullName); // $ExpectType string
+assertType<string[]>(unwrappedSetters2.allNames); // $ExpectType string[]
+
+ex2.fullName; // $ExpectType ComputedProperty<string, string>
+ex2.allNames; // $ExpectType ComputedProperty<string[], string[]>
+ex2.firstName; // $ExpectType string
+
+type UnwStringSet = UnwrapComputedPropertySetter<string>; // $ExpectType string
+type UnwStringGet = UnwrapComputedPropertyGetter<string>; // $ExpectType string
+// $ExpectType string
+type UnwCpStringSet1 = UnwrapComputedPropertySetter<Ember.ComputedProperty<string>>;
+// $ExpectType string
+type UnwCpStringGet1 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<string>>;
+// $ExpectType string
+type UnwCpStringSet2 = UnwrapComputedPropertySetter<Ember.ComputedProperty<string, string>>;
+// $ExpectType string
+type UnwCpStringGet2 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<string, string>>;
+// $ExpectType string
+type UnwCpStringSet3 = UnwrapComputedPropertySetter<Ember.ComputedProperty<number, string>>;
+// $ExpectType number
+type UnwCpStringGet3 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<number, string>>;
+// $ExpectType number
+type UnwCpStringSet4 = UnwrapComputedPropertySetter<Ember.ComputedProperty<string, number>>;
+// $ExpectType string
+type UnwCpStringGet4 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<string, number>>;
diff --git a/types/preview/ember/test/private/observable-tests.ts b/types/preview/ember/test/private/observable-tests.ts
new file mode 100644
index 00000000000..ed4a2371a9a
--- /dev/null
+++ b/types/preview/ember/test/private/observable-tests.ts
@@ -0,0 +1,200 @@
+// tslint-disable-next-line
+import { assertType } from '../lib/assert';
+import Ember from 'ember';
+import { ExtractPropertyNamesOfType } from '@ember/object/-private/types';
+import Observable from '@ember/object/observable';
+
+class OtherThing {
+  observerOfDemo(target: DemoObservable, key: string) {}
+}
+
+class DemoObservable implements Observable {
+  foo: string;
+  isFoo = true;
+  bar: [boolean, boolean];
+  baz?: number | undefined;
+  constructor() {
+    this.foo = 'hello';
+    this.bar = [false, true];
+    this.baz = 9;
+    this.addObserver('foo', this, 'fooDidChange');
+    // @ts-expect-error
+    this.addObserver('foo', this, 'fooDidChangeProtected');
+    this.addObserver('foo', this, this.fooDidChange);
+    this.addObserver('foo', this, this.fooDidChangeProtected);
+    const ot = new OtherThing();
+    this.addObserver('foo', ot, ot.observerOfDemo);
+    Ember.addObserver(this, 'foo', this, 'fooDidChange');
+    // @ts-expect-error
+    Ember.addObserver(this, 'foo', this, 'fooDidChangeProtected');
+    Ember.addObserver(this, 'foo', this, this.fooDidChange);
+    Ember.addObserver(this, 'foo', this, this.fooDidChangeProtected);
+    this.removeObserver('foo', this, 'fooDidChange');
+    // @ts-expect-error
+    this.removeObserver('foo', this, 'fooDidChangeProtected');
+    this.removeObserver('foo', this, this.fooDidChange);
+    this.removeObserver('foo', this, this.fooDidChangeProtected);
+    Ember.removeObserver(this, 'foo', this, 'fooDidChange');
+    // @ts-expect-error
+    Ember.removeObserver(this, 'foo', this, 'fooDidChangeProtected');
+    Ember.removeObserver(this, 'foo', this, this.fooDidChange);
+    const lambda = () => {
+      this.fooDidChange(this, 'foo');
+    };
+    this.addObserver('foo', lambda);
+    this.addObserver('foo', (sender, key, value, rev) => {
+      assertType<DemoObservable>(sender);
+      assertType<'foo'>(key);
+      assertType<string>(value);
+      assertType<number>(rev);
+    });
+    this.removeObserver('foo', lambda);
+    Ember.addObserver(this, 'foo', lambda);
+    Ember.removeObserver(this, 'foo', lambda);
+  }
+
+  fooDidChange(obj: this, propName: string) {}
+  protected fooDidChangeProtected(obj: this, propName: string) {}
+  get<K extends keyof this>(key: K): this[K] {
+    throw new Error('Method not implemented.');
+  }
+  getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
+  getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
+  getProperties(...rest: any[]): any {
+    throw new Error('Method not implemented.');
+  }
+  set<K extends keyof this>(key: K, value: this[K]): this[K] {
+    throw new Error('Method not implemented.');
+  }
+  setProperties<K extends keyof this>(hash: Pick<this, K>): Pick<this, K> {
+    throw new Error('Method not implemented.');
+  }
+  notifyPropertyChange(keyName: string): this {
+    throw new Error('Method not implemented.');
+  }
+  addObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method:
+      | keyof Target
+      | ((this: Target, sender: this, key: string, value: any, rev: number) => void)
+  ): any;
+  addObserver<K extends keyof this>(
+    key: K,
+    method: keyof this | ((this: this, sender: this, key: K, value: this[K], rev: number) => void)
+  ): any;
+  addObserver(key: any, target: any, method?: any) {
+    throw new Error('Method not implemented.');
+  }
+  removeObserver<Target>(
+    key: keyof this,
+    target: Target,
+    method:
+      | keyof Target
+      | ((this: Target, sender: this, key: string, value: any, rev: number) => void)
+  ): any;
+  removeObserver(
+    key: keyof this,
+    method: keyof this | ((this: this, sender: this, key: string, value: any, rev: number) => void)
+  ): any;
+  removeObserver(key: any, target: any, method?: any): void {
+    throw new Error('Method not implemented.');
+  }
+  incrementProperty(
+    keyName: ExtractPropertyNamesOfType<this, number | undefined>,
+    increment?: number
+  ): number {
+    throw new Error('Method not implemented.');
+  }
+  decrementProperty(
+    keyName: ExtractPropertyNamesOfType<this, number | undefined>,
+    decrement?: number
+  ): number {
+    throw new Error('Method not implemented.');
+  }
+  toggleProperty(keyName: ExtractPropertyNamesOfType<this, boolean | undefined>): boolean {
+    throw new Error('Method not implemented.');
+  }
+  cacheFor<K extends keyof this>(key: K): this[K] | undefined {
+    throw new Error('Method not implemented.');
+  }
+}
+const o = new DemoObservable();
+
+/**
+ * get
+ */
+assertType<string>(o.get('foo')); // $ExpectType string
+assertType<[boolean, boolean]>(o.get('bar')); // $ExpectType [boolean, boolean]
+assertType<number | undefined>(o.get('baz')); // $ExpectType number | undefined
+
+/**
+ * incrementProperty, decrementProperty
+ */
+assertType<number>(o.incrementProperty('baz')); // $ExpectType number
+assertType<number>(o.decrementProperty('baz')); // $ExpectType number
+assertType<number>(o.incrementProperty('baz', 3)); // $ExpectType number
+assertType<number>(o.decrementProperty('baz', 12)); // $ExpectType number
+// non-numeric property case
+// @ts-expect-error
+assertType<number>(o.incrementProperty('bar'));
+// @ts-expect-error
+assertType<number>(o.decrementProperty('bar'));
+// empty case
+// @ts-expect-error
+assertType<number>(o.incrementProperty());
+// @ts-expect-error
+assertType<number>(o.decrementProperty());
+
+/**
+ * toggleProperty
+ */
+o.toggleProperty('isFoo'); // $ExpectType boolean
+// @ts-expect-error
+o.toggleProperty();
+
+/**
+ * getProperties
+ */
+// ('foo', 'bar')
+assertType<{ foo: string; bar: [boolean, boolean] }>(o.getProperties('foo', 'bar')); // $ExpectType { foo: string; bar: [boolean, boolean]; }
+// ['foo', 'bar']
+assertType<{ foo: string; bar: [boolean, boolean] }>(o.getProperties(['foo', 'bar'])); // $ExpectType { foo: string; bar: [boolean, boolean]; }
+// empty cases
+assertType<{}>(o.getProperties()); // $ExpectType {}
+assertType<{}>(o.getProperties([])); // $ExpectType {}
+// property that doesn't exist
+// @ts-expect-error
+o.getProperties('jeanShorts', 'foo');
+// @ts-expect-error
+o.getProperties(['foo', 'jeanShorts']);
+
+/**
+ * set
+ */
+assertType<string>(o.set('foo', 'abc')); // $ExpectType string
+assertType<[boolean, boolean]>(o.set('bar', [false, false])); // $ExpectType [boolean, boolean]
+assertType<number | undefined>(o.set('baz', undefined)); // $ExpectType number | undefined
+assertType<number | undefined>(o.set('baz', 10)); // $ExpectType number | undefined
+// property that doesn't exist
+// @ts-expect-error
+o.set('jeanShorts', 10);
+
+/**
+ * setProperties
+ */
+assertType<{ foo: string; bar: [boolean, boolean] }>(
+  o.setProperties({ foo: 'abc', bar: [true, true] })
+); // $ExpectType { foo: string; bar: [boolean, boolean]; }
+// empty case
+assertType<{}>(o.setProperties({})); // $ExpectType {}
+// property that doesn't exist
+// @ts-expect-error
+o.setProperties({ jeanShorts: 'under the pants' });
+
+/**
+ * notifyPropertyChange
+ */
+assertType<DemoObservable>(o.notifyPropertyChange('foo')); // $ExpectType DemoObservable
+// @ts-expect-error
+assertType<Observable>(o.notifyPropertyChange('jeanShorts'));
diff --git a/types/preview/ember/test/reopen.ts b/types/preview/ember/test/reopen.ts
new file mode 100755
index 00000000000..08300aec1ca
--- /dev/null
+++ b/types/preview/ember/test/reopen.ts
@@ -0,0 +1,64 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+type Person = typeof Person.prototype;
+const Person = Ember.Object.extend({
+    name: '',
+    sayHello() {
+        alert(`Hello. My name is ${this.get('name')}`);
+    },
+});
+
+assertType<Person>(Person.reopen());
+
+assertType<string>(Person.create().name);
+Person.create().sayHello(); // $ExpectType void
+
+const Person2 = Person.reopenClass({
+    species: 'Homo sapiens',
+
+    createPerson(name: string): Person {
+        return Person.create({ name });
+    },
+});
+
+assertType<string>(Person2.create().name);
+Person2.create().sayHello(); // $ExpectType void
+assertType<string>(Person2.species);
+
+const tom = Person2.create({
+    name: 'Tom Dale',
+});
+
+// @ts-expect-error
+const badTom = Person2.create({ name: 99 });
+
+const yehuda = Person2.createPerson('Yehuda Katz');
+
+tom.sayHello(); // "Hello. My name is Tom Dale"
+yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+alert(Person2.species); // "Homo sapiens"
+
+const Person3 = Person2.reopen({
+    goodbyeMessage: 'goodbye',
+
+    sayGoodbye() {
+        alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
+    },
+});
+
+const person3 = Person3.create();
+person3.get('name');
+person3.get('goodbyeMessage');
+person3.sayHello();
+person3.sayGoodbye();
+
+interface AutoResizeMixin {
+    resizable: true;
+}
+const AutoResizeMixin = Ember.Mixin.create({ resizable: true });
+
+const Reopened = Ember.Object.reopenClass({ a: 1 }, { b: 2 }, { c: 3 });
+assertType<number>(Reopened.a);
+assertType<number>(Reopened.b);
+assertType<number>(Reopened.c);
diff --git a/types/preview/ember/test/route.ts b/types/preview/ember/test/route.ts
new file mode 100755
index 00000000000..28f127888b4
--- /dev/null
+++ b/types/preview/ember/test/route.ts
@@ -0,0 +1,97 @@
+import Route from '@ember/routing/route';
+import Array from '@ember/array';
+import Ember from 'ember'; // currently needed for Transition
+import Transition from '@ember/routing/transition';
+
+// Ensure that Ember.Transition is private
+// @ts-expect-error
+Ember.Transition;
+
+interface Post extends Ember.Object {
+    title: string;
+}
+
+interface Posts extends Array<Post> {}
+
+Route.extend({
+    beforeModel(transition: Transition) {
+        this.transitionTo('someOtherRoute');
+    },
+});
+
+Route.extend({
+    afterModel(posts: Posts, transition: Transition) {
+        if (posts.firstObject) {
+            this.transitionTo('post.show', posts.firstObject);
+        }
+    },
+});
+
+Ember.Route.extend({
+    model() {
+        return this.modelFor('post');
+    },
+});
+
+Route.extend({
+    queryParams: {
+        memberQp: { refreshModel: true },
+    },
+});
+
+Route.extend({
+    resetController(controller: Ember.Controller, isExiting: boolean, transition: boolean) {
+        if (isExiting) {
+            //   controller.set('page', 1);
+        }
+    },
+});
+
+Route.extend({
+    setupController(controller: Ember.Controller, model: {}) {
+        this._super(controller, model);
+        this.controllerFor('application').set('model', model);
+    },
+});
+
+class RouteUsingClass extends Route.extend({
+    randomProperty: 'the .extend + extends bit type-checks properly',
+}) {
+    beforeModel() {
+        return Promise.resolve('beforeModel can return promises');
+    }
+    afterModel(resolvedModel: unknown, transition: Transition) {
+        return Promise.resolve('afterModel can also return promises');
+    }
+    intermediateTransitionWithoutModel() {
+        this.intermediateTransitionTo('some-route');
+    }
+    intermediateTransitionWithModel() {
+        this.intermediateTransitionTo('some.other.route', {});
+    }
+    intermediateTransitionWithMultiModel() {
+        this.intermediateTransitionTo('some.other.route', 1, 2, {});
+    }
+}
+
+class WithNonReturningBeforeAndModelHooks extends Route {
+    beforeModel(transition: Transition): void | Promise<unknown> {
+        return;
+    }
+
+    afterModel(resolvedModel: unknown, transition: Transition): void {
+        return;
+    }
+}
+
+class WithBadReturningBeforeAndModelHooks extends Route {
+    beforeModel(transition: Transition): void | Promise<unknown> {
+        // @ts-expect-error
+        return "returning anything else is nonsensical (if 'legal')";
+    }
+
+    afterModel(resolvedModel: unknown, transition: Transition): void {
+        // @ts-expect-error
+        return "returning anything else is nonsensical (if 'legal')";
+    }
+}
diff --git a/types/preview/ember/test/router.ts b/types/preview/ember/test/router.ts
new file mode 100755
index 00000000000..105a8d75264
--- /dev/null
+++ b/types/preview/ember/test/router.ts
@@ -0,0 +1,49 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const AppRouter = Ember.Router.extend({});
+
+AppRouter.map(function () {
+    this.route('index', { path: '/' });
+    this.route('about');
+    this.route('favorites', { path: '/favs' });
+    this.route('posts', function () {
+        this.route('index', { path: '/' });
+        this.route('new');
+        this.route('post', { path: '/post/:post_id', resetNamespace: true });
+        this.route('comments', { resetNamespace: true }, function () {
+            this.route('new');
+        });
+    });
+    this.route('photo', { path: '/photo/:id' }, function () {
+        this.route('comment', { path: '/comment/:id' });
+    });
+    this.route('not-found', { path: '/*path' });
+    this.mount('my-engine');
+    this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine' });
+});
+
+const RouterServiceConsumer = Ember.Service.extend({
+    router: Ember.inject.service('router'),
+    currentRouteName() {
+        const x: string = Ember.get(this, 'router').currentRouteName;
+    },
+    currentURL() {
+        const x: string = Ember.get(this, 'router').currentURL;
+    },
+    transitionWithoutModel() {
+        Ember.get(this, 'router').transitionTo('some-route');
+    },
+    transitionWithModel() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router').transitionTo('some.other.route', model);
+    },
+    transitionWithMultiModel() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router').transitionTo('some.other.route', model, model);
+    },
+    transitionWithModelAndOptions() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router').transitionTo('index', model, { queryParams: { search: 'ember' } });
+    },
+});
diff --git a/types/preview/ember/test/run.ts b/types/preview/ember/test/run.ts
new file mode 100755
index 00000000000..bba22edd2c7
--- /dev/null
+++ b/types/preview/ember/test/run.ts
@@ -0,0 +1,220 @@
+import Ember from 'ember';
+import RSVP from 'rsvp';
+import { assertType } from './lib/assert';
+
+function testRun() {
+    const r = Ember.run(() => {
+        // code to be executed within a RunLoop
+        return 123;
+    });
+    assertType<number>(r);
+
+    function destroyApp(application: Ember.Application) {
+        Ember.run(application, 'destroy');
+        Ember.run(application, function () {
+            this.destroy();
+        });
+    }
+}
+
+function testBind() {
+    Ember.Component.extend({
+        init() {
+            const bound = Ember.run.bind(this, this.setupEditor);
+            bound();
+        },
+
+        editor: null as string | null,
+
+        setupEditor(editor: string) {
+            this.set('editor', editor);
+        },
+    });
+}
+
+function testCancel() {
+    const myContext = {};
+
+    const runNext = Ember.run.next(myContext, () => {
+        // will not be executed
+    });
+
+    Ember.run.cancel(runNext);
+
+    const runLater = Ember.run.later(
+        myContext,
+        () => {
+            // will not be executed
+        },
+        500,
+    );
+
+    Ember.run.cancel(runLater);
+
+    const runScheduleOnce = Ember.run.scheduleOnce('afterRender', myContext, () => {
+        // will not be executed
+    });
+
+    Ember.run.cancel(runScheduleOnce);
+
+    const runOnce = Ember.run.once(myContext, () => {
+        // will not be executed
+    });
+
+    Ember.run.cancel(runOnce);
+
+    const throttle = Ember.run.throttle(
+        myContext,
+        () => {
+            // will not be executed
+        },
+        1,
+        false,
+    );
+
+    Ember.run.cancel(throttle);
+
+    const debounce = Ember.run.debounce(
+        myContext,
+        () => {
+            // will not be executed
+        },
+        1,
+    );
+
+    Ember.run.cancel(debounce);
+
+    const debounceImmediate = Ember.run.debounce(
+        myContext,
+        () => {
+            // will be executed since we passed in true (immediate)
+        },
+        100,
+        true,
+    );
+
+    // the 100ms delay until this method can be called again will be canceled
+    Ember.run.cancel(debounceImmediate);
+}
+
+function testDebounce() {
+    function runIt() {}
+
+    const myContext = { name: 'debounce' };
+
+    Ember.run.debounce(runIt, 150);
+    Ember.run.debounce(myContext, runIt, 150);
+    Ember.run.debounce(myContext, runIt, 150, true);
+
+    Ember.Component.extend({
+        searchValue: 'test',
+        fetchResults(value: string) {},
+
+        actions: {
+            handleTyping() {
+                // the fetchResults function is passed into the component from its parent
+                Ember.run.debounce(this, this.get('fetchResults'), this.get('searchValue'), 250);
+            },
+        },
+    });
+}
+
+function testBegin() {
+    Ember.run.begin();
+    // code to be executed within a RunLoop
+    Ember.run.end();
+}
+
+function testJoin() {
+    Ember.run.join(() => {
+        // creates a new run-loop
+    });
+
+    Ember.run(() => {
+        // creates a new run-loop
+        Ember.run.join(() => {
+            // joins with the existing run-loop, and queues for invocation on
+            // the existing run-loops action queue.
+        });
+    });
+
+    new RSVP.Promise(resolve => {
+        Ember.run.later(() => {
+            resolve({ msg: 'Hold Your Horses' });
+        }, 3000);
+    });
+}
+
+function testLater() {
+    const myContext = {};
+    Ember.run.later(
+        myContext,
+        () => {
+            // code here will execute within a RunLoop in about 500ms with this == myContext
+        },
+        500,
+    );
+}
+
+function testNext() {
+    const myContext = {};
+    Ember.run.next(myContext, () => {
+        // code to be executed in the next run loop,
+        // which will be scheduled after the current one
+    });
+}
+
+function testOnce() {
+    Ember.Component.extend({
+        init() {
+            Ember.run.once(this, 'processFullName');
+        },
+
+        processFullName() {},
+    });
+}
+
+function testSchedule() {
+    Ember.Component.extend({
+        init() {
+            Ember.run.schedule('sync', this, () => {
+                // this will be executed in the first RunLoop queue, when bindings are synced
+                console.log('scheduled on sync queue');
+            });
+
+            Ember.run.schedule('actions', this, () => {
+                // this will be executed in the 'actions' queue, after bindings have synced.
+                console.log('scheduled on actions queue');
+            });
+        },
+    });
+
+    Ember.run.schedule('actions', () => {
+        // Do more things
+    });
+}
+
+function testScheduleOnce() {
+    function sayHi() {
+        console.log('hi');
+    }
+
+    const myContext = {};
+    Ember.run(() => {
+        Ember.run.scheduleOnce('afterRender', myContext, sayHi);
+        Ember.run.scheduleOnce('afterRender', myContext, sayHi);
+        // sayHi will only be executed once, in the afterRender queue of the RunLoop
+    });
+    Ember.run.scheduleOnce('actions', myContext, () => {
+        console.log('Closure');
+    });
+}
+
+function testThrottle() {
+    function runIt() {}
+
+    const myContext = { name: 'throttle' };
+
+    Ember.run.throttle(runIt, 150);
+    Ember.run.throttle(myContext, runIt, 150);
+}
diff --git a/types/preview/ember/test/string.ts b/types/preview/ember/test/string.ts
new file mode 100644
index 00000000000..c05f68f1a3d
--- /dev/null
+++ b/types/preview/ember/test/string.ts
@@ -0,0 +1,51 @@
+import Ember from 'ember';
+import { SafeString } from '@ember/template/-private/handlebars';
+
+const { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, underscore, w } = Ember.String;
+
+// @ts-expect-error
+dasherize();
+dasherize('blue man group'); // $ExpectType string
+// @ts-expect-error
+dasherize('', '');
+
+// @ts-expect-error
+camelize();
+camelize('blue man group'); // $ExpectType string
+// @ts-expect-error
+camelize('', '');
+
+// @ts-expect-error
+decamelize();
+decamelize('blue man group'); // $ExpectType string
+// @ts-expect-error
+decamelize('', '');
+
+// @ts-expect-error
+underscore();
+underscore('blue man group'); // $ExpectType string
+// @ts-expect-error
+underscore('', '');
+
+// @ts-expect-error
+w();
+w('blue man group'); // $ExpectType string[]
+// @ts-expect-error
+w('', '');
+
+// @ts-expect-error
+classify();
+classify('blue man group'); // $ExpectType string
+// @ts-expect-error
+classify('', '');
+
+// @ts-expect-error
+capitalize();
+capitalize('blue man group'); // $ExpectType string
+// @ts-expect-error
+capitalize('', '');
+
+const handlebarsSafeString: SafeString = Ember.String.htmlSafe('lorem ipsum...');
+Ember.String.htmlSafe('lorem ipsum...'); // $ExpectType SafeString
+// @ts-expect-error
+const regularString: string = Ember.String.htmlSafe('lorem ipsum...');
diff --git a/types/preview/ember/test/techniques/properties-from-this.ts b/types/preview/ember/test/techniques/properties-from-this.ts
new file mode 100644
index 00000000000..78b5b96dd1d
--- /dev/null
+++ b/types/preview/ember/test/techniques/properties-from-this.ts
@@ -0,0 +1,71 @@
+/**
+ * These tests validate that the method of pulling property types off of this
+ * continues to work. We use this technique in the critical Observable interface
+ * that serves to implement a lot of Ember.CoreObject's functionality
+ */
+
+class BoxedProperty<Get, Set = Get> {
+    declare private [GetType]: Get;
+    declare private [SetType]: Set;
+}
+
+declare const GetType: unique symbol;
+declare const SetType: unique symbol;
+
+type UnboxGetProperty<T> = T extends BoxedProperty<infer V, unknown> ? V : T;
+type UnboxSetProperty<T> = T extends BoxedProperty<unknown, infer V> ? V : T;
+
+class GetAndSet {
+    get<K extends keyof this>(key: K): UnboxGetProperty<this[K]> {
+        return this[key] as UnboxGetProperty<this[K]>;
+    }
+    set<K extends keyof this>(key: K, newVal: UnboxSetProperty<this[K]>): UnboxSetProperty<this[K]> {
+        const rawVal = this[key];
+        if (rawVal instanceof BoxedProperty) {
+            rawVal[SetType] = newVal;
+        }
+        this[key] = newVal as this[K];
+        return newVal;
+    }
+}
+
+class Foo123 extends GetAndSet {
+    a: number;
+    b: [boolean, boolean];
+    c: string;
+    cpA!: BoxedProperty<string>;
+    constructor() {
+        super();
+        this.a = 1;
+        this.b = [true, false];
+        this.c = 'hello';
+    }
+}
+
+let f = new Foo123();
+
+f.get('a'); // $ExpectType number
+// @ts-expect-error
+f.set('a');
+// @ts-expect-error
+f.set('a', '1');
+f.set('a', 1); // $ExpectType number
+
+f.get('b'); // $ExpectType [boolean, boolean]
+// @ts-expect-error
+f.set('b', 1);
+// @ts-expect-error
+f.set('b', []);
+// @ts-expect-error
+f.set('b', [true]);
+f.set('b', [false, true]); // $ExpectType [boolean, boolean]
+// @ts-expect-error
+f.set('b', [false, true, false]);
+
+f.get('c'); // $ExpectType string
+f.set('c', '1'); // $ExpectType string
+
+f.get('cpA'); // $ExpectType string
+// @ts-expect-error
+f.set('cpA', ['newValue']);
+f.set('cpA', 'newValue'); // $ExpectType string
diff --git a/types/preview/ember/test/test.ts b/types/preview/ember/test/test.ts
new file mode 100755
index 00000000000..d3eecc5a2b5
--- /dev/null
+++ b/types/preview/ember/test/test.ts
@@ -0,0 +1,32 @@
+import Ember from 'ember';
+
+const pending = 0;
+Ember.Test.registerWaiter(() => pending !== 0);
+
+declare const MyDb: {
+    hasPendingTransactions(): boolean;
+};
+Ember.Test.registerWaiter(MyDb, MyDb.hasPendingTransactions);
+
+Ember.Test.promise(resolve => {
+    window.setTimeout(resolve, 500);
+});
+
+Ember.Test.registerHelper('boot', app => {
+    Ember.run(app, app.advanceReadiness);
+});
+
+Ember.Test.registerAsyncHelper('boot', app => {
+    Ember.run(app, app.advanceReadiness);
+});
+
+Ember.Test.registerAsyncHelper('waitForPromise', (app, promise) => {
+    return new Ember.Test.Promise(resolve => {
+        Ember.Test.adapter.asyncStart();
+
+        promise.then(() => {
+            Ember.run.schedule('afterRender', null, resolve);
+            Ember.Test.adapter.asyncEnd();
+        });
+    });
+});
diff --git a/types/preview/ember/test/transition.ts b/types/preview/ember/test/transition.ts
new file mode 100755
index 00000000000..53eb4397764
--- /dev/null
+++ b/types/preview/ember/test/transition.ts
@@ -0,0 +1,29 @@
+import Ember from 'ember';
+import Transition from '@ember/routing/transition';
+
+Ember.Route.extend({
+    beforeModel(transition: Transition) {
+        if (new Date() > new Date('January 1, 1980')) {
+            alert('Sorry, you need a time machine to enter this route.');
+            transition.abort();
+        }
+    },
+});
+
+Ember.Controller.extend({
+    previousTransition: null as Transition | null,
+
+    actions: {
+        login() {
+            // Log the user in, then reattempt previous transition if it exists.
+            const previousTransition = this.get('previousTransition');
+            if (previousTransition) {
+                this.set('previousTransition', null);
+                previousTransition.retry();
+            } else {
+                // Default back to homepage
+                this.transitionToRoute('index');
+            }
+        },
+    },
+});
diff --git a/types/preview/ember/test/utils.ts b/types/preview/ember/test/utils.ts
new file mode 100755
index 00000000000..ef0504eba30
--- /dev/null
+++ b/types/preview/ember/test/utils.ts
@@ -0,0 +1,146 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+function testTypeOf() {
+    Ember.typeOf(); // $ExpectType "undefined"
+    const str: string = Ember.typeOf({});
+}
+
+function testIsNoneType() {
+    const maybeUndefined: string | undefined = 'not actually undefined';
+    if (Ember.isNone(maybeUndefined)) {
+        return;
+    }
+
+    const anotherString = maybeUndefined + 'another string';
+    Ember.isNone(); // $ExpectType boolean
+}
+
+function testIsBlank() {
+    Ember.isBlank(); // $ExpectType boolean
+    Ember.isBlank(''); // $ExpectType boolean
+    // @ts-expect-error
+    Ember.isBlank('', '');
+}
+
+function testIsEmpty() {
+    Ember.isEmpty(); // $ExpectType boolean
+    Ember.isEmpty(''); // $ExpectType boolean
+    // @ts-expect-error
+    Ember.isEmpty('', '');
+}
+
+function testIsPresent() {
+    Ember.isPresent(); // $ExpectType boolean
+    Ember.isPresent(''); // $ExpectType boolean
+    // @ts-expect-error
+    Ember.isPresent('', '');
+}
+
+function testIsNone() {
+    Ember.isNone(); // $ExpectType boolean
+    Ember.isNone(''); // $ExpectType boolean
+    // @ts-expect-error
+    Ember.isNone('', '');
+}
+
+function testAssign() {
+    assertType<{ first: string; middle: string; last: string }>(
+        Ember.assign({ first: 'Tom' }, { middle: 'M' }, { last: 'Dale' }),
+    );
+}
+
+function testOnError() {
+    Ember.onerror = error => {
+        fetch('/report-error', {
+            method: 'POST',
+            body: JSON.stringify({
+                stack: error.stack,
+                otherInformation: 'whatever app state you want to provide',
+            })
+        });
+    };
+}
+
+function testDeprecateFunc() {
+    function newMethod(first: string, second: number): string {
+        return '';
+    }
+
+    const oldMethod = Ember.deprecateFunc(
+        'Please use the new method',
+        { id: 'deprecated.id', until: '6.0' },
+        newMethod,
+    );
+    assertType<string>(newMethod('first', 123));
+    assertType<string>(oldMethod('first', 123));
+}
+
+function testDefineProperty() {
+    const contact = {};
+
+    // ES5 compatible mode
+    Ember.defineProperty(contact, 'firstName', {
+        writable: true,
+        configurable: false,
+        enumerable: true,
+        value: 'Charles',
+    });
+
+    // define a simple property
+    Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
+
+    // define a computed property
+    Ember.defineProperty(
+        contact,
+        'fullName',
+        Ember.computed('firstName', 'lastName', function () {
+            return `${this.firstName} ${this.lastName}`;
+        }),
+    );
+}
+
+// For use in IIFE below.
+declare const fileList: FileList;
+
+(() => {
+    /** typeOf */
+    Ember.typeOf(); // $ExpectType "undefined"
+    Ember.typeOf(null); // $ExpectType "null"
+    Ember.typeOf(undefined); // $ExpectType "undefined"
+    Ember.typeOf('michael'); // $ExpectType "string"
+    // tslint:disable-next-line:no-construct
+    Ember.typeOf(new String('michael')); // $ExpectType "string"
+    Ember.typeOf(101); // $ExpectType "number"
+    // tslint:disable-next-line:no-construct
+    Ember.typeOf(new Number(101)); // $ExpectType "number"
+    Ember.typeOf(true); // $ExpectType "boolean"
+    // tslint:disable-next-line:no-construct
+    Ember.typeOf(new Boolean(true)); // $ExpectType "boolean"
+    Ember.typeOf(() => 4); // $ExpectType "function"
+    Ember.typeOf([1, 2, 90]); // $ExpectType "array"
+    Ember.typeOf(/abc/); // $ExpectType "regexp"
+    Ember.typeOf(new Date()); // $ExpectType "date"
+    Ember.typeOf(fileList); // $ExpectType "filelist"
+    Ember.typeOf(Ember.Object.extend()); // $ExpectType "class"
+    Ember.typeOf(Ember.Object.create()); // $ExpectType "instance"
+    Ember.typeOf(new Error('teamocil')); // $ExpectType "error"
+    Ember.typeOf(new Date() as RegExp | Date); // "regexp" | "date"
+    Ember.typeOf({ randomObject: true }); // $ExpectType "object"
+})();
+
+(() => {
+    /* assign */
+    Ember.assign({}, { a: 'b' });
+    Ember.assign({}, { a: 'b' }).a; // $ExpectType string
+    Ember.assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
+    Ember.assign({ a: 6 }, {}).a; // $ExpectType number
+    // @ts-expect-error
+    Ember.assign({ b: 6 }, {}).a;
+    Ember.assign({}, { b: 6 }, {}).b; // $ExpectType number
+    Ember.assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
+    Ember.assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
+    // @ts-expect-error
+    Ember.assign({ a: 'hello' }, '', { a: true }).a;
+    Ember.assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
+})();
diff --git a/types/preview/ember/test/view-utils.ts b/types/preview/ember/test/view-utils.ts
new file mode 100644
index 00000000000..a45f4f3ce59
--- /dev/null
+++ b/types/preview/ember/test/view-utils.ts
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+import { assertType } from './lib/assert';
+
+const {
+    ViewUtils: { isSimpleClick },
+} = Ember;
+assertType<boolean>(isSimpleClick(new Event('wat')));
diff --git a/types/preview/ember/tsconfig.json b/types/preview/ember/tsconfig.json
new file mode 100755
index 00000000000..3c43903cfdd
--- /dev/null
+++ b/types/preview/ember/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tsconfig.json"
+}
diff --git a/types/preview/tsconfig.json b/types/preview/tsconfig.json
new file mode 100644
index 00000000000..8fa576671fd
--- /dev/null
+++ b/types/preview/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+  "compilerOptions": {
+    "baseUrl": "."
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 695e9003ca4..9d217f1714b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,13 @@
   dependencies:
     "@babel/highlight" "^7.16.7"
 
+"@babel/code-frame@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
@@ -51,6 +58,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.18.13":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
+  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
+  dependencies:
+    "@babel/types" "^7.18.13"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -58,6 +74,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
@@ -89,6 +112,19 @@
     "@babel/helper-replace-supers" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
 
+"@babel/helper-create-class-features-plugin@^7.5.5":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298"
+  integrity sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+
 "@babel/helper-create-regexp-features-plugin@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
@@ -132,6 +168,11 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
 "@babel/helper-explode-assignable-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
@@ -148,6 +189,14 @@
     "@babel/template" "^7.16.7"
     "@babel/types" "^7.16.7"
 
+"@babel/helper-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
+  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+  dependencies:
+    "@babel/template" "^7.18.6"
+    "@babel/types" "^7.18.9"
+
 "@babel/helper-get-function-arity@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
@@ -162,6 +211,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-member-expression-to-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
@@ -169,6 +225,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
+  dependencies:
+    "@babel/types" "^7.18.9"
+
 "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
@@ -197,11 +260,23 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
   integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
 
+"@babel/helper-plugin-utils@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
+  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
+
 "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
@@ -222,6 +297,17 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
+"@babel/helper-replace-supers@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6"
+  integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.18.9"
+    "@babel/types" "^7.18.9"
+
 "@babel/helper-simple-access@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
@@ -243,11 +329,28 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-string-parser@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
+  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
   integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
 
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
+  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
+
 "@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
@@ -281,11 +384,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.4.5":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
   integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
 
+"@babel/parser@^7.18.10", "@babel/parser@^7.18.13":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
+  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -549,6 +666,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
+"@babel/plugin-syntax-typescript@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
+  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-transform-arrow-functions@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
@@ -805,6 +929,15 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-typescript" "^7.16.7"
 
+"@babel/plugin-transform-typescript@~7.5.0":
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.5.tgz#6d862766f09b2da1cb1f7d505fe2aedab6b7d4b8"
+  integrity sha512-pehKf4m640myZu5B2ZviLaiBlxMCjSZ1qTEO459AXKX5GnPueyulJeCqZFs1nz/Ya2dDzXQ1NxZ/kKNWyD4h6w==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.5.5"
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@babel/plugin-syntax-typescript" "^7.2.0"
+
 "@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
@@ -942,6 +1075,15 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
+"@babel/template@^7.18.6":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.18.10"
+    "@babel/types" "^7.18.10"
+
 "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
@@ -958,6 +1100,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.18.9":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
+  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.18.13"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.18.13"
+    "@babel/types" "^7.18.13"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
@@ -966,6 +1124,15 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
+  version "7.18.13"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
+  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
+  dependencies:
+    "@babel/helper-string-parser" "^7.18.10"
+    "@babel/helper-validator-identifier" "^7.18.6"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -1037,6 +1204,26 @@
     "@glimmer/wire-format" "0.84.2"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/component@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@glimmer/component/-/component-1.1.2.tgz#892ec0c9f0b6b3e41c112be502fde073cf24d17c"
+  integrity sha512-XyAsEEa4kWOPy+gIdMjJ8XlzA3qrGH55ZDv6nA16ibalCR17k74BI0CztxuRds+Rm6CtbUVgheCVlcCULuqD7A==
+  dependencies:
+    "@glimmer/di" "^0.1.9"
+    "@glimmer/env" "^0.1.7"
+    "@glimmer/util" "^0.44.0"
+    broccoli-file-creator "^2.1.1"
+    broccoli-merge-trees "^3.0.2"
+    ember-cli-babel "^7.7.3"
+    ember-cli-get-component-path-option "^1.0.0"
+    ember-cli-is-package-missing "^1.0.0"
+    ember-cli-normalize-entity-name "^1.0.0"
+    ember-cli-path-utils "^1.0.0"
+    ember-cli-string-utils "^1.1.0"
+    ember-cli-typescript "3.0.0"
+    ember-cli-version-checker "^3.1.3"
+    ember-compatibility-helpers "^1.1.2"
+
 "@glimmer/destroyable@0.84.2":
   version "0.84.2"
   resolved "https://registry.yarnpkg.com/@glimmer/destroyable/-/destroyable-0.84.2.tgz#67009d931346f4988a6dd329cd8b95141726a453"
@@ -1047,6 +1234,11 @@
     "@glimmer/interfaces" "0.84.2"
     "@glimmer/util" "0.84.2"
 
+"@glimmer/di@^0.1.9":
+  version "0.1.11"
+  resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280"
+  integrity sha512-moRwafNDwHTnTHzyyZC9D+mUSvYrs1Ak0tRPjjmCghdoHHIvMshVbEnwKb/1WmW5CUlKc2eL9rlAV32n3GiItg==
+
 "@glimmer/encoder@0.84.2":
   version "0.84.2"
   resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.84.2.tgz#3e6038f4115cde40a1252f13ae33774341325d40"
@@ -1185,6 +1377,11 @@
     "@glimmer/interfaces" "0.84.2"
     "@simple-dom/interface" "^1.4.0"
 
+"@glimmer/util@^0.44.0":
+  version "0.44.0"
+  resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.44.0.tgz#45df98d73812440206ae7bda87cfe04aaae21ed9"
+  integrity sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==
+
 "@glimmer/validator@0.84.2":
   version "0.84.2"
   resolved "https://registry.yarnpkg.com/@glimmer/validator/-/validator-0.84.2.tgz#29394d262cf8373fe20f4e225c1adc9857a4164b"
@@ -1235,11 +1432,25 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
   integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
 
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
 "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.10"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
@@ -1253,6 +1464,14 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
+  integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -1317,6 +1536,11 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
+"@tsconfig/ember@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/ember/-/ember-1.0.1.tgz#d7556d81f108438c17e4030acb4e1be6b2974e88"
+  integrity sha512-aPzLw5BfQxsFPrh5fNDOK4SbSkp2q5fMlrKVeniVjMz1lAcyOh2eH5THkKKcBi1YN1/fbMdAWN/dKGW6lg2+8g==
+
 "@types/acorn@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd"
@@ -1796,6 +2020,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-to-html@^0.6.6:
+  version "0.6.15"
+  resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
+  integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
+  dependencies:
+    entities "^2.0.0"
+
 ansicolors@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.2.1.tgz#be089599097b74a5c9c4a84a0cdbcdb62bd87aef"
@@ -2055,6 +2286,13 @@ babel-messages@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-debug-macros@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz#0120ac20ce06ccc57bf493b667cf24b85c28da7a"
+  integrity sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==
+  dependencies:
+    semver "^5.3.0"
+
 babel-plugin-debug-macros@^0.3.4:
   version "0.3.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.3.4.tgz#22961d0cb851a80654cece807a8b4b73d85c6075"
@@ -3607,6 +3845,13 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.0.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -3846,12 +4091,12 @@ ember-auto-import@^2.4.1:
     typescript-memoize "^1.0.0-alpha.3"
     walk-sync "^3.0.0"
 
-ember-cli-babel-plugin-helpers@^1.1.1:
+ember-cli-babel-plugin-helpers@^1.0.0, ember-cli-babel-plugin-helpers@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ember-cli-babel-plugin-helpers/-/ember-cli-babel-plugin-helpers-1.1.1.tgz#5016b80cdef37036c4282eef2d863e1d73576879"
   integrity sha512-sKvOiPNHr5F/60NLd7SFzMpYPte/nnGkq/tMIfXejfKHIhaiIkYFqX8Z9UFTKWLLn+V7NOaby6niNPZUdvKCRw==
 
-ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6:
+ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.6, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -3990,6 +4235,31 @@ ember-cli-typescript-blueprint-polyfill@^0.1.0:
     chalk "^4.0.0"
     remove-types "^1.0.0"
 
+ember-cli-typescript@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-3.0.0.tgz#3b838d1ce9e4d22a98e68da22ceac6dc0cfd9bfc"
+  integrity sha512-lo5YArbJzJi5ssvaGqTt6+FnhTALnSvYVuxM7lfyL1UCMudyNJ94ovH5C7n5il7ATd6WsNiAPRUO/v+s5Jq/aA==
+  dependencies:
+    "@babel/plugin-transform-typescript" "~7.5.0"
+    ansi-to-html "^0.6.6"
+    debug "^4.0.0"
+    ember-cli-babel-plugin-helpers "^1.0.0"
+    execa "^2.0.0"
+    fs-extra "^8.0.0"
+    resolve "^1.5.0"
+    rsvp "^4.8.1"
+    semver "^6.0.0"
+    stagehand "^1.0.0"
+    walk-sync "^2.0.0"
+
+ember-cli-version-checker@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-3.1.3.tgz#7c9b4f5ff30fdebcd480b1c06c4de43bb51c522c"
+  integrity sha512-PZNSvpzwWgv68hcXxyjREpj3WWb81A7rtYNQq1lLEgrWIchF8ApKJjWP3NBpHjaatwILkZAV8klair5WFlXAKg==
+  dependencies:
+    resolve-package-path "^1.2.6"
+    semver "^5.6.0"
+
 ember-cli-version-checker@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-4.1.0.tgz#7fc9836bdbc87451d286ba6a9a89b23591d8bbb7"
@@ -3999,7 +4269,7 @@ ember-cli-version-checker@^4.1.0:
     semver "^6.3.0"
     silent-error "^1.1.1"
 
-ember-cli-version-checker@^5.1.2:
+ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
   integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
@@ -4116,6 +4386,17 @@ ember-cli@^4.2.0:
     workerpool "^6.1.4"
     yam "^1.0.0"
 
+ember-compatibility-helpers@^1.1.2:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.2.6.tgz#603579ab2fb14be567ef944da3fc2d355f779cd8"
+  integrity sha512-2UBUa5SAuPg8/kRVaiOfTwlXdeVweal1zdNPibwItrhR0IvPrXpaqwJDlEZnWKEoB+h33V0JIfiWleSG6hGkkA==
+  dependencies:
+    babel-plugin-debug-macros "^0.2.0"
+    ember-cli-version-checker "^5.1.1"
+    find-up "^5.0.0"
+    fs-extra "^9.1.0"
+    semver "^5.4.1"
+
 ember-publisher@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ember-publisher/-/ember-publisher-0.0.7.tgz#865ca69ef47bafb38120a84244aa58b950ca4850"
@@ -4191,6 +4472,11 @@ ensure-posix-path@^1.0.0, ensure-posix-path@^1.0.1, ensure-posix-path@^1.0.2, en
   resolved "https://registry.yarnpkg.com/ensure-posix-path/-/ensure-posix-path-1.1.1.tgz#3c62bdb19fa4681544289edb2b382adc029179ce"
   integrity sha512-VWU0/zXzVbeJNXvME/5EmLuEj2TauvoaTz6aFYK1Z92JCBlDlZ3Gu0tuGR42kpW1754ywTs+QB0g5TP0oj9Zaw==
 
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -4624,6 +4910,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99"
+  integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^3.0.0"
+    onetime "^5.1.0"
+    p-finally "^2.0.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 execa@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
@@ -5176,7 +5477,7 @@ fs-extra@^7.0.0, fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^8.0.1, fs-extra@^8.1.0:
+fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
   integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
@@ -7626,6 +7927,13 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
+npm-run-path@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5"
+  integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==
+  dependencies:
+    path-key "^3.0.0"
+
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -7807,6 +8115,11 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="
 
+p-finally@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
+  integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
+
 p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@@ -8623,7 +8936,7 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
 
-resolve-package-path@^1.0.11:
+resolve-package-path@^1.0.11, resolve-package-path@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e"
   integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q==
@@ -8796,7 +9109,7 @@ rsvp@^3.0.14, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
   integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
-rsvp@^4.7.0, rsvp@^4.8.4, rsvp@^4.8.5:
+rsvp@^4.7.0, rsvp@^4.8.1, rsvp@^4.8.4, rsvp@^4.8.5:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
@@ -8930,6 +9243,11 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@^5.4.1, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -9308,6 +9626,13 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
 
+stagehand@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/stagehand/-/stagehand-1.0.0.tgz#79515e2ad3a02c63f8720c7df9b6077ae14276d9"
+  integrity sha512-zrXl0QixAtSHFyN1iv04xOBgplbT4HgC8T7g+q8ESZbDNi5uZbMtxLukFVXPJ5Nl7zCYvYcrT3Mj24WYCH93hw==
+  dependencies:
+    debug "^4.1.0"
+
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -10206,7 +10531,7 @@ walk-sync@^1.0.0, walk-sync@^1.1.3:
     ensure-posix-path "^1.1.0"
     matcher-collection "^1.1.1"
 
-walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
+walk-sync@^2.0.0, walk-sync@^2.0.2, walk-sync@^2.1.0, walk-sync@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-2.2.0.tgz#80786b0657fcc8c0e1c0b1a042a09eae2966387a"
   integrity sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==

From 414a7638c4081a3e38ce80996907b59e29c27ce9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 25 Aug 2022 17:19:31 -0600
Subject: [PATCH 1086/1405] Begin iterating on object and application preview
 types

---
 .eslintrc.js                                  |   5 +-
 package.json                                  |   5 +-
 tsconfig.json                                 |   2 +-
 .../preview/@ember/application/instance.d.ts  |   2 +-
 .../application/test/application-instance.ts  |   5 +-
 .../@ember/application/test/application.ts    |  36 +-
 .../-private/container-proxy-mixin.d.ts       |  12 +-
 types/preview/@ember/engine/instance.d.ts     |  24 +-
 types/preview/@ember/object/core.d.ts         |   1 +
 types/preview/@ember/object/observable.d.ts   |   5 +
 types/preview/@ember/runloop/index.d.ts       | 113 +++---
 .../@ember/utils/ember__utils-tests.ts        | 111 +++---
 types/preview/ember/index.d.ts                |  71 ++--
 types/preview/ember/test/run.ts               | 336 +++++++++---------
 types/preview/ember/test/string.ts            |   3 +-
 types/preview/ember/test/transition.ts        |  28 +-
 types/preview/ember/test/utils.ts             | 210 +++++------
 17 files changed, 470 insertions(+), 499 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 07cabcb5d36..25aece7add1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -78,12 +78,15 @@ module.exports = {
 
       rules: {
         'import/export': 'off',
+        'disable-features/disable-async-await': 'off',
         '@typescript-eslint/ban-ts-comment': 'off',
+        '@typescript-eslint/ban-types': 'off',
         '@typescript-eslint/no-empty-interface': 'off',
         'import/no-unresolved': 'off',
         '@typescript-eslint/no-this-alias': 'off',
-        '@typescript-eslint/consistent-type-imports': 'error',
+        '@typescript-eslint/consistent-type-imports': 'off',
         '@typescript-eslint/no-empty-function': 'off',
+        'no-console': 'off',
       },
     },
     {
diff --git a/package.json b/package.json
index 21640d79066..771014a287e 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,8 @@
     "dist/ember-testing.js",
     "dist/ember-testing.map",
     "docs/data.json",
-    "lib"
+    "lib",
+    "types"
   ],
   "repository": {
     "type": "git",
@@ -40,7 +41,7 @@
     "lint:docs": "qunit tests/docs/coverage-test.js",
     "lint:eslint": "eslint --report-unused-disable-directives --cache .",
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
-    "lint:tsc": "tsc --noEmit",
+    "lint:tsc": "tsc --noEmit && tsc --noEmit --project types/preview",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
     "test:blueprints:js": "mocha node-tests/blueprints/**/*-test.js",
diff --git a/tsconfig.json b/tsconfig.json
index 240bde985ab..7b0a17746e1 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -35,5 +35,5 @@
 
   "include": ["packages/**/*.ts"],
 
-  "exclude": ["dist", "node_modules", "tmp"]
+  "exclude": ["dist", "node_modules", "tmp", "types"]
 }
diff --git a/types/preview/@ember/application/instance.d.ts b/types/preview/@ember/application/instance.d.ts
index db5f37fcd5f..74215a39a46 100644
--- a/types/preview/@ember/application/instance.d.ts
+++ b/types/preview/@ember/application/instance.d.ts
@@ -1,4 +1,4 @@
-import EngineInstance from "@ember/engine/instance";
+import EngineInstance from '@ember/engine/instance';
 
 /**
  * The `ApplicationInstance` encapsulates all of the stateful aspects of a
diff --git a/types/preview/@ember/application/test/application-instance.ts b/types/preview/@ember/application/test/application-instance.ts
index 32748ca0d96..07bbf776dee 100644
--- a/types/preview/@ember/application/test/application-instance.ts
+++ b/types/preview/@ember/application/test/application-instance.ts
@@ -1,5 +1,6 @@
 import ApplicationInstance from '@ember/application/instance';
-import hbs from 'htmlbars-inline-precompile';
+
+declare function hbs(strings: TemplateStringsArray): object;
 
 const appInstance = ApplicationInstance.create();
 appInstance.register('some:injection', class Foo {});
@@ -23,8 +24,8 @@ appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`, {
   singleton: true,
   instantiate: true,
 });
-// @ts-expect-error
 appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`, {
+  // @ts-expect-error
   singleton: 'true',
   instantiate: true,
 });
diff --git a/types/preview/@ember/application/test/application.ts b/types/preview/@ember/application/test/application.ts
index 8654afe83e4..e3bb601c492 100755
--- a/types/preview/@ember/application/test/application.ts
+++ b/types/preview/@ember/application/test/application.ts
@@ -2,38 +2,38 @@ import Application from '@ember/application';
 import EmberObject from '@ember/object';
 
 const BaseApp = Application.extend({
-    modulePrefix: 'my-app',
+  modulePrefix: 'my-app',
 });
 
 class Obj extends EmberObject.extend({ foo: 'bar' }) {}
 
 BaseApp.initializer({
-    name: 'my-initializer',
-    initialize(app) {
-        app.register('foo:bar', Obj);
-    },
+  name: 'my-initializer',
+  initialize(app) {
+    app.register('foo:bar', Obj);
+  },
 });
 
 BaseApp.instanceInitializer({
-    name: 'my-instance-initializer',
-    initialize(app) {
-        (app.lookup('foo:bar') as Obj).get('foo');
-    },
+  name: 'my-instance-initializer',
+  initialize(app) {
+    (app.lookup('foo:bar') as Obj).get('foo');
+  },
 });
 
 const App1 = BaseApp.create({
-    rootElement: '#app-one',
-    customEvents: {
-        paste: 'paste',
-    },
+  rootElement: '#app-one',
+  customEvents: {
+    paste: 'paste',
+  },
 });
 
 const App2 = BaseApp.create({
-    rootElement: '#app-two',
-    customEvents: {
-        mouseenter: null,
-        mouseleave: null,
-    },
+  rootElement: '#app-two',
+  customEvents: {
+    mouseenter: null,
+    mouseleave: null,
+  },
 });
 
 const App3 = BaseApp.create();
diff --git a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
index 27463373dc1..d281c67be69 100644
--- a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
@@ -5,11 +5,11 @@ import Mixin from '@ember/object/mixin';
  * Given a fullName return a factory manager.
  */
 interface ContainerProxyMixin extends Owner {
-    /**
-     * Returns an object that can be used to provide an owner to a
-     * manually created instance.
-     */
-    ownerInjection(): {};
+  /**
+   * Returns an object that can be used to provide an owner to a
+   * manually created instance.
+   */
+  ownerInjection(): {};
 }
-declare const ContainerProxyMixin: Mixin<ContainerProxyMixin>;
+declare const ContainerProxyMixin: Mixin;
 export default ContainerProxyMixin;
diff --git a/types/preview/@ember/engine/instance.d.ts b/types/preview/@ember/engine/instance.d.ts
index 84c65b47581..482e66b6caa 100644
--- a/types/preview/@ember/engine/instance.d.ts
+++ b/types/preview/@ember/engine/instance.d.ts
@@ -1,22 +1,22 @@
-import ContainerProxyMixin from "@ember/engine/-private/container-proxy-mixin";
-import RegistryProxyMixin from "@ember/engine/-private/registry-proxy-mixin";
-import EmberObject from "@ember/object";
+import ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
+import RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
+import EmberObject from '@ember/object';
 
 /**
  * The `EngineInstance` encapsulates all of the stateful aspects of a
  * running `Engine`.
  */
 export default class EngineInstance extends EmberObject {
-    /**
-     * Unregister a factory.
-     */
-    unregister(fullName: string): unknown;
+  /**
+   * Unregister a factory.
+   */
+  unregister(fullName: string): unknown;
 
-    /**
-     *  Initialize the `EngineInstance` and return a promise that resolves
-     *  with the instance itself when the boot process is complete.
-     */
-    boot(): Promise<EngineInstance>;
+  /**
+   *  Initialize the `EngineInstance` and return a promise that resolves
+   *  with the instance itself when the boot process is complete.
+   */
+  boot(): Promise<EngineInstance>;
 }
 
 export default interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
diff --git a/types/preview/@ember/object/core.d.ts b/types/preview/@ember/object/core.d.ts
index c8dbc893d7a..58d719ad6cc 100644
--- a/types/preview/@ember/object/core.d.ts
+++ b/types/preview/@ember/object/core.d.ts
@@ -59,6 +59,7 @@ export default class CoreObject {
   toString(): string;
 
   static create<Class extends typeof CoreObject>(
+    this: Class,
     ...initialValues: Array<Mixin | Record<string, unknown>>
   ): InstanceType<Class>;
 
diff --git a/types/preview/@ember/object/observable.d.ts b/types/preview/@ember/object/observable.d.ts
index bffceba42cb..d0bbc08f1ff 100644
--- a/types/preview/@ember/object/observable.d.ts
+++ b/types/preview/@ember/object/observable.d.ts
@@ -10,17 +10,21 @@ interface Observable {
    * Retrieves the value of a property from the object.
    */
   get<K extends keyof this>(key: K): this[K];
+  get(key: string): unknown;
   /**
    * To get the values of multiple properties at once, call `getProperties`
    * with a list of strings or an array:
    */
   getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
   getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
+  getProperties(list: string[]): Record<string, unknown>;
+  getProperties(...list: string[]): Record<string, unknown>;
   /**
    * Sets the provided key or path to the value.
    */
   set<K extends keyof this>(key: K, value: this[K]): this[K];
   set<T>(key: keyof this, value: T): T;
+  set<T>(key: string, value: T): T;
   /**
    * Sets a list of properties at once. These properties are set inside
    * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
@@ -28,6 +32,7 @@ interface Observable {
    */
   setProperties<K extends keyof this>(hash: Pick<this, K>): Pick<this, K>;
   setProperties<K extends keyof this>(hash: Record<K, unknown>): Pick<this, K>;
+  setProperties<R extends Record<string, unknown>>(hash: R): R;
   /**
    * Notify the observer system that a property has just changed.
    *
diff --git a/types/preview/@ember/runloop/index.d.ts b/types/preview/@ember/runloop/index.d.ts
index 7265638796a..25cd870cf0d 100644
--- a/types/preview/@ember/runloop/index.d.ts
+++ b/types/preview/@ember/runloop/index.d.ts
@@ -6,9 +6,14 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Minimum TypeScript Version: 4.4
 
-import { EmberMethod, EmberMethodParams, AnyFn, EmberMethodReturn } from "ember/-private/type-utils";
+import {
+  EmberMethod,
+  EmberMethodParams,
+  AnyFn,
+  EmberMethodReturn,
+} from 'ember/-private/type-utils';
 import { EmberRunQueues } from './-private/types';
-import { EmberRunTimer } from "@ember/runloop/types";
+import { EmberRunTimer } from '@ember/runloop/types';
 import '@ember/runloop/-private/backburner';
 
 /**
@@ -17,7 +22,11 @@ import '@ember/runloop/-private/backburner';
  * end.
  */
 export function run<M extends AnyFn>(method: M): ReturnType<M>;
-export function run<T, M extends EmberMethod<T>>(target: T, method: M, ...args: EmberMethodParams<T, M>): EmberMethodReturn<T, M>;
+export function run<T, M extends EmberMethod<T>>(
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
+): EmberMethodReturn<T, M>;
 
 /**
  * If no run-loop is present, it creates a new one. If a run loop is
@@ -26,9 +35,9 @@ export function run<T, M extends EmberMethod<T>>(target: T, method: M, ...args:
  */
 export function join<M extends AnyFn>(method: M, ...args: Parameters<M>): ReturnType<M> | undefined;
 export function join<T, M extends EmberMethod<T>>(
-   target: T,
-   method: M,
-   ...args: EmberMethodParams<T, M>
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
 ): EmberMethodReturn<T, M> | undefined;
 
 /**
@@ -42,9 +51,9 @@ export function join<T, M extends EmberMethod<T>>(
 // `Function.prototype.bind` implementation. We should track the latter, despite
 // the loss of safety, because it makes interop cleaner.
 export function bind<T, M extends EmberMethod<T>>(
-   target: T,
-   method: M,
-   ...args: any[]
+  target: T,
+  method: M,
+  ...args: any[]
 ): (...args: any[]) => EmberMethodReturn<T, M>;
 
 /**
@@ -68,15 +77,15 @@ export function end(): void;
  * automatically.
  */
 export function schedule<T, M extends EmberMethod<T>>(
-   queue: EmberRunQueues,
-   target: T,
-   method: M,
-   ...args: EmberMethodParams<T, M>
+  queue: EmberRunQueues,
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
 ): EmberRunTimer;
 export function schedule<M extends AnyFn>(
-   queue: EmberRunQueues,
-   method: M,
-   ...args: Parameters<M>
+  queue: EmberRunQueues,
+  method: M,
+  ...args: Parameters<M>
 ): EmberRunTimer;
 
 /**
@@ -86,12 +95,7 @@ export function schedule<M extends AnyFn>(
  */
 export function later(method: AnyFn, wait: number): EmberRunTimer;
 export function later<T, M extends EmberMethod<T>>(
-    ...args: [
-        target: T,
-        method: M,
-        ...args: EmberMethodParams<T, M>,
-        wait: number,
-    ]
+  ...args: [target: T, method: M, ...args: EmberMethodParams<T, M>, wait: number]
 ): EmberRunTimer;
 
 /**
@@ -99,9 +103,9 @@ export function later<T, M extends EmberMethod<T>>(
  * to calling `scheduleOnce` with the "actions" queue.
  */
 export function once<T, M extends EmberMethod<T>>(
-   target: T,
-   method: M,
-   ...args: EmberMethodParams<T, M>
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
 ): EmberRunTimer;
 
 /**
@@ -110,10 +114,10 @@ export function once<T, M extends EmberMethod<T>>(
  * no effect (past the initial call).
  */
 export function scheduleOnce<T, M extends EmberMethod<T>>(
-   queue: EmberRunQueues,
-   target: T,
-   method: M,
-   ...args: EmberMethodParams<T, M>
+  queue: EmberRunQueues,
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
 ): EmberRunTimer;
 
 /**
@@ -122,14 +126,11 @@ export function scheduleOnce<T, M extends EmberMethod<T>>(
  * `run.later` with a wait time of 1ms.
  */
 export function next<T, M extends EmberMethod<T>>(
-   target: T,
-   method: M,
-   ...args: EmberMethodParams<T, M>
-): EmberRunTimer;
-export function next<M extends AnyFn>(
- method: M,
- ...args: Parameters<M>
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
 ): EmberRunTimer;
+export function next<M extends AnyFn>(method: M, ...args: Parameters<M>): EmberRunTimer;
 
 /**
  * Cancels a scheduled item. Must be a value returned by `run.later()`,
@@ -144,36 +145,28 @@ export function cancel(timer?: EmberRunTimer): boolean;
  * the specified time has elapsed, the timer is reset and the entire period
  * must pass again before the target method is called.
  */
-export function debounce(
-   method: AnyFn,
-   wait: number,
-   immediate?: boolean
-): EmberRunTimer;
+export function debounce(method: AnyFn, wait: number, immediate?: boolean): EmberRunTimer;
 export function debounce<Target, M extends EmberMethod<Target>>(
-    ...args: [
-        target: Target,
-        method: M,
-        ...args: EmberMethodParams<Target, M>,
-        wait: number,
-        immediate?: boolean
-    ]
+  ...args: [
+    target: Target,
+    method: M,
+    ...args: EmberMethodParams<Target, M>,
+    wait: number,
+    immediate?: boolean
+  ]
 ): EmberRunTimer;
 
 /**
  * Ensure that the target method is never called more frequently than
  * the specified spacing period. The target method is called immediately.
  */
-export function throttle(
-   method: AnyFn,
-   spacing: number,
-   immediate?: boolean
-): EmberRunTimer;
+export function throttle(method: AnyFn, spacing: number, immediate?: boolean): EmberRunTimer;
 export function throttle<T, M extends EmberMethod<T>>(
-    ...args: [
-        target: T,
-        method: M,
-        ...methodArgs: EmberMethodParams<T, M>,
-        spacing: number,
-        immediate?: boolean
-    ]
+  ...args: [
+    target: T,
+    method: M,
+    ...methodArgs: EmberMethodParams<T, M>,
+    spacing: number,
+    immediate?: boolean
+  ]
 ): EmberRunTimer;
diff --git a/types/preview/@ember/utils/ember__utils-tests.ts b/types/preview/@ember/utils/ember__utils-tests.ts
index 5c9c0787704..b9be7a5b34d 100644
--- a/types/preview/@ember/utils/ember__utils-tests.ts
+++ b/types/preview/@ember/utils/ember__utils-tests.ts
@@ -1,4 +1,5 @@
 /* eslint-disable no-new-wrappers */ // we have to test the new-wrappers!
+import { expectTypeOf } from 'expect-type';
 
 import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@ember/utils';
 
@@ -9,33 +10,33 @@ import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@
     return;
   }
   const anotherString = maybeUndefined + 'another string';
-  isNone(); // $ExpectType boolean
-  isNone(null); // $ExpectType boolean
-  isNone(undefined); // $ExpectType boolean
-  isNone(''); // $ExpectType boolean
-  isNone([]); // $ExpectType boolean
-  isNone(function () {}); // $ExpectType boolean
+  expectTypeOf(isNone()).toEqualTypeOf<boolean>();
+  expectTypeOf(isNone(null)).toEqualTypeOf<boolean>();
+  expectTypeOf(isNone(undefined)).toEqualTypeOf<boolean>();
+  expectTypeOf(isNone('')).toEqualTypeOf<boolean>();
+  expectTypeOf(isNone([])).toEqualTypeOf<boolean>();
+  expectTypeOf(isNone(function () {})).toEqualTypeOf<boolean>();
 })();
 
 (function () {
   /** isPresent */
-  isPresent(); // $ExpectType boolean
-  isPresent(null); // $ExpectType boolean
-  isPresent(undefined); // $ExpectType boolean
-  isPresent(''); // $ExpectType boolean
-  isPresent('  '); // $ExpectType boolean
-  isPresent('\n\t'); // $ExpectType boolean
-  isPresent([]); // $ExpectType boolean
-  isPresent({ length: 0 }); // $ExpectType boolean
-  isPresent(false); // $ExpectType boolean
-  isPresent(true); // $ExpectType boolean
-  isPresent('string'); // $ExpectType boolean
-  isPresent(0); // $ExpectType boolean
-  isPresent(function () {}); // $ExpectType boolean
-  isPresent({}); // $ExpectType boolean
-  isPresent(false); // $ExpectType boolean
-  isPresent('\n\t Hello'); // $ExpectType boolean
-  isPresent([1, 2, 3]); // $ExpectType boolean
+  expectTypeOf(isPresent()).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(null)).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(undefined)).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent('')).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent('  ')).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent('\n\t')).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent([])).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent({ length: 0 })).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(false)).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(true)).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent('string')).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(0)).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(function () {})).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent({})).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent(false)).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent('\n\t Hello')).toEqualTypeOf<boolean>();
+  expectTypeOf(isPresent([1, 2, 3])).toEqualTypeOf<boolean>();
 })();
 
 (function () {
@@ -83,13 +84,15 @@ import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@
 
 (function () {
   /** isEqual */
-  isEqual('foo', 'bar'); // $ExpectType boolean
-  isEqual(14, 37); // $ExpectType boolean
-  isEqual(14, '1'); // $ExpectType boolean
-  isEqual(
-    () => 4,
-    () => 37
-  ); // $ExpectType boolean
+  expectTypeOf(isEqual('foo', 'bar')).toEqualTypeOf<boolean>();
+  expectTypeOf(isEqual(14, 37)).toEqualTypeOf<boolean>();
+  expectTypeOf(isEqual(14, '1')).toEqualTypeOf<boolean>();
+  expectTypeOf(
+    isEqual(
+      () => 4,
+      () => 37
+    )
+  ).toEqualTypeOf<boolean>();
   // @ts-expect-error
   isEqual(14);
   // @ts-expect-error
@@ -113,33 +116,33 @@ import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@
 (function () {
   /** isBlank */
 
-  isBlank(); // $ExpectType boolean
-  isBlank(null); // $ExpectType boolean
-  isBlank(undefined); // $ExpectType boolean
-  isBlank(''); // $ExpectType boolean
-  isBlank([]); // $ExpectType boolean
-  isBlank('\n\t'); // $ExpectType boolean
-  isBlank('  '); // $ExpectType boolean
-  isBlank({}); // $ExpectType boolean
-  isBlank('\n\t Hello'); // $ExpectType boolean
-  isBlank('Hello world'); // $ExpectType boolean
-  isBlank([1, 2, 3]); // $ExpectType boolean
+  expectTypeOf(isBlank()).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank(null)).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank(undefined)).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank('')).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank([])).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank('\n\t')).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank('  ')).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank({})).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank('\n\t Hello')).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank('Hello world')).toEqualTypeOf<boolean>();
+  expectTypeOf(isBlank([1, 2, 3])).toEqualTypeOf<boolean>();
 })();
 
 (function () {
   /** isEmpty */
 
-  isEmpty(); // $ExpectType boolean
-  isEmpty(null); // $ExpectType boolean
-  isEmpty(undefined); // $ExpectType boolean
-  isEmpty(''); // $ExpectType boolean
-  isEmpty([]); // $ExpectType boolean
-  isEmpty({ size: 0 }); // $ExpectType boolean
-  isEmpty({}); // $ExpectType boolean
-  isEmpty('Adam Hawkins'); // $ExpectType boolean
-  isEmpty([0, 1, 2]); // $ExpectType boolean
-  isEmpty('\n\t'); // $ExpectType boolean
-  isEmpty('  '); // $ExpectType boolean
-  isEmpty({ size: 1 }); // $ExpectType boolean
-  isEmpty({ size: () => 0 }); // $ExpectType boolean
+  expectTypeOf(isEmpty()).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty(null)).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty(undefined)).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty('')).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty([])).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty({ size: 0 })).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty({})).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty('Adam Hawkins')).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty([0, 1, 2])).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty('\n\t')).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty('  ')).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty({ size: 1 })).toEqualTypeOf<boolean>();
+  expectTypeOf(isEmpty({ size: () => 0 })).toEqualTypeOf<boolean>();
 })();
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index 1d5ba10445c..7fa5d54e922 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -10,9 +10,6 @@
 // the Ember namespace.
 import Rsvp from 'rsvp';
 
-import { TemplateFactory } from 'htmlbars-inline-precompile';
-
-import { Registry as ServiceRegistry } from '@ember/service';
 import type { Registry as ControllerRegistry } from '@ember/controller';
 import type * as EmberStringNs from '@ember/string';
 import type * as EmberTemplateNs from '@ember/template';
@@ -24,7 +21,6 @@ import type * as EmberUtilsNs from '@ember/utils';
 import type * as EmberRunloopNs from '@ember/runloop';
 import * as EmberObjectNs from '@ember/object';
 import type * as EmberObjectObserversNs from '@ember/object/observers';
-import * as EmberObjectMixinNs from '@ember/object/mixin';
 import * as EmberObjectProxyNs from '@ember/object/proxy';
 import type * as EmberObjectPromiseProxyNs from '@ember/object/promise-proxy-mixin';
 import type * as EmberObjectInternalsNs from '@ember/object/internals';
@@ -38,8 +34,6 @@ import EmberDataAdapter from '@ember/debug/data-adapter';
 // @ember/engine
 import * as EmberEngineNs from '@ember/engine';
 import * as EmberEngineInstanceNs from '@ember/engine/instance';
-import _ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
-import _RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
 import EmberCoreObject from '@ember/object/core';
 import * as EmberApplicationNs from '@ember/application';
 import * as EmberApplicationInstanceNs from '@ember/application/instance';
@@ -68,10 +62,7 @@ import EmberHelper from '@ember/component/helper';
 // @ember/routing
 import EmberRoutingRouter from '@ember/routing/router';
 import EmberRoutingRoute from '@ember/routing/route';
-import EmberRoutingTransition from '@ember/routing/transition';
-import EmberRoutingRouterService from '@ember/routing/router-service';
 import EmberRoutingHashLocation from '@ember/routing/hash-location';
-import EmberRoutingAutoLocation from '@ember/routing/auto-location';
 import EmberRoutingHistoryLocation from '@ember/routing/history-location';
 import EmberRoutingNoneLocation from '@ember/routing/none-location';
 // @ember/application
@@ -81,45 +72,45 @@ import EmberRegistry from '@ember/application/-private/registry';
 import EmberTestAdapter from '@ember/test/adapter';
 
 export namespace Ember {
-  const A: typeof EmberArrayNs.A;
-  const isArray: typeof EmberArrayNs.isArray;
-  type Enumerable<T> = EmberEnumerable<T>;
-  const Enumerable: typeof EmberEnumerable;
-  class ArrayProxy<T> extends EmberArrayProxy<T> {}
-  type Array<T> = EmberArray<T>;
-  const Array: typeof EmberArrayNs.default;
-  type MutableArray<T> = EmberMutableArray<T>;
-  const MutableArray: typeof EmberMutableArray;
-  type NativeArray<T> = EmberNativeArray<T>;
-  const NativeArray: typeof EmberNativeArray;
-  type MutableEnumerable<T> = EmberMutableEnumerable<T>;
-  const MutableEnumerable: typeof EmberMutableEnumerable;
-  class Router extends EmberRoutingRouter {}
-  class Route extends EmberRoutingRoute {}
-  const ActionHandler: typeof EmberActionHandler;
-  class Controller extends EmberControllerNs.default {}
-  class Component extends EmberComponent {}
-  class Helper extends EmberHelper {}
+  export const A: typeof EmberArrayNs.A;
+  export const isArray: typeof EmberArrayNs.isArray;
+  export type Enumerable<T> = EmberEnumerable<T>;
+  export const Enumerable: typeof EmberEnumerable;
+  export class ArrayProxy<T> extends EmberArrayProxy<T> {}
+  export type Array<T> = EmberArray<T>;
+  export const Array: typeof EmberArrayNs.default;
+  export type MutableArray<T> = EmberMutableArray<T>;
+  export const MutableArray: typeof EmberMutableArray;
+  export type NativeArray<T> = EmberNativeArray<T>;
+  export const NativeArray: typeof EmberNativeArray;
+  export type MutableEnumerable<T> = EmberMutableEnumerable<T>;
+  export const MutableEnumerable: typeof EmberMutableEnumerable;
+  export class Router extends EmberRoutingRouter {}
+  export class Route extends EmberRoutingRoute {}
+  export const ActionHandler: typeof EmberActionHandler;
+  export class Controller extends EmberControllerNs.default {}
+  export class Component extends EmberComponent {}
+  export class Helper extends EmberHelper {}
 
-  class HashLocation extends EmberRoutingHashLocation {}
-  class NoneLocation extends EmberRoutingNoneLocation {}
-  class HistoryLocation extends EmberRoutingHistoryLocation {}
-  const deprecateFunc: typeof EmberApplicationDeprecateNs.deprecateFunc;
-  const deprecate: typeof EmberApplicationDeprecateNs.deprecate;
-  const getOwner: typeof EmberApplicationNs.getOwner;
-  const setOwner: typeof EmberApplicationNs.setOwner;
-  class EventDispatcher extends EmberEventDispatcher {}
-  class Registry extends EmberRegistry {}
-  interface ArrayPrototypeExtensions<T> extends EmberArrayProtoExtensions<T> {}
+  export class HashLocation extends EmberRoutingHashLocation {}
+  export class NoneLocation extends EmberRoutingNoneLocation {}
+  export class HistoryLocation extends EmberRoutingHistoryLocation {}
+  export const deprecateFunc: typeof EmberApplicationDeprecateNs.deprecateFunc;
+  export const deprecate: typeof EmberApplicationDeprecateNs.deprecate;
+  export const getOwner: typeof EmberApplicationNs.getOwner;
+  export const setOwner: typeof EmberApplicationNs.setOwner;
+  export class EventDispatcher extends EmberEventDispatcher {}
+  export class Registry extends EmberRegistry {}
+  export interface ArrayPrototypeExtensions<T> extends EmberArrayProtoExtensions<T> {}
 
   /**
    * Implements some standard methods for comparing objects. Add this mixin to
    * any class you create that can compare its instances.
    */
-  interface Comparable {
+  export interface Comparable {
     compare(a: unknown, b: unknown): number;
   }
-  const Comparable: EmberMixin<Comparable>;
+  const Comparable: EmberMixin;
   class ComputedProperty extends EmberObjectComputedNs.default {}
   /**
    * A container used to instantiate and cache objects.
diff --git a/types/preview/ember/test/run.ts b/types/preview/ember/test/run.ts
index bba22edd2c7..aa86a35ddc2 100755
--- a/types/preview/ember/test/run.ts
+++ b/types/preview/ember/test/run.ts
@@ -1,220 +1,214 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 import RSVP from 'rsvp';
-import { assertType } from './lib/assert';
 
 function testRun() {
-    const r = Ember.run(() => {
-        // code to be executed within a RunLoop
-        return 123;
+  const r = Ember.run(() => {
+    // code to be executed within a RunLoop
+    return 123;
+  });
+  expectTypeOf(r).toEqualTypeOf<number>();
+
+  function destroyApp(application: Ember.Application) {
+    Ember.run(application, 'destroy');
+    Ember.run(application, function () {
+      this.destroy();
     });
-    assertType<number>(r);
-
-    function destroyApp(application: Ember.Application) {
-        Ember.run(application, 'destroy');
-        Ember.run(application, function () {
-            this.destroy();
-        });
-    }
+  }
 }
 
-function testBind() {
-    Ember.Component.extend({
-        init() {
-            const bound = Ember.run.bind(this, this.setupEditor);
-            bound();
-        },
+class TestBind extends Ember.Component {
+  init() {
+    const bound = Ember.run.bind(this, this.setupEditor);
+    bound();
+  }
 
-        editor: null as string | null,
+  editor: string | null = null;
 
-        setupEditor(editor: string) {
-            this.set('editor', editor);
-        },
-    });
+  setupEditor(editor: string) {
+    this.set('editor', editor);
+  }
 }
 
 function testCancel() {
-    const myContext = {};
-
-    const runNext = Ember.run.next(myContext, () => {
-        // will not be executed
-    });
-
-    Ember.run.cancel(runNext);
-
-    const runLater = Ember.run.later(
-        myContext,
-        () => {
-            // will not be executed
-        },
-        500,
-    );
-
-    Ember.run.cancel(runLater);
-
-    const runScheduleOnce = Ember.run.scheduleOnce('afterRender', myContext, () => {
-        // will not be executed
-    });
-
-    Ember.run.cancel(runScheduleOnce);
-
-    const runOnce = Ember.run.once(myContext, () => {
-        // will not be executed
-    });
-
-    Ember.run.cancel(runOnce);
-
-    const throttle = Ember.run.throttle(
-        myContext,
-        () => {
-            // will not be executed
-        },
-        1,
-        false,
-    );
-
-    Ember.run.cancel(throttle);
-
-    const debounce = Ember.run.debounce(
-        myContext,
-        () => {
-            // will not be executed
-        },
-        1,
-    );
-
-    Ember.run.cancel(debounce);
-
-    const debounceImmediate = Ember.run.debounce(
-        myContext,
-        () => {
-            // will be executed since we passed in true (immediate)
-        },
-        100,
-        true,
-    );
-
-    // the 100ms delay until this method can be called again will be canceled
-    Ember.run.cancel(debounceImmediate);
+  const myContext = {};
+
+  const runNext = Ember.run.next(myContext, () => {
+    // will not be executed
+  });
+
+  Ember.run.cancel(runNext);
+
+  const runLater = Ember.run.later(
+    myContext,
+    () => {
+      // will not be executed
+    },
+    500
+  );
+
+  Ember.run.cancel(runLater);
+
+  const runScheduleOnce = Ember.run.scheduleOnce('afterRender', myContext, () => {
+    // will not be executed
+  });
+
+  Ember.run.cancel(runScheduleOnce);
+
+  const runOnce = Ember.run.once(myContext, () => {
+    // will not be executed
+  });
+
+  Ember.run.cancel(runOnce);
+
+  const throttle = Ember.run.throttle(
+    myContext,
+    () => {
+      // will not be executed
+    },
+    1,
+    false
+  );
+
+  Ember.run.cancel(throttle);
+
+  const debounce = Ember.run.debounce(
+    myContext,
+    () => {
+      // will not be executed
+    },
+    1
+  );
+
+  Ember.run.cancel(debounce);
+
+  const debounceImmediate = Ember.run.debounce(
+    myContext,
+    () => {
+      // will be executed since we passed in true (immediate)
+    },
+    100,
+    true
+  );
+
+  // the 100ms delay until this method can be called again will be canceled
+  Ember.run.cancel(debounceImmediate);
 }
 
 function testDebounce() {
-    function runIt() {}
+  function runIt() {}
 
-    const myContext = { name: 'debounce' };
+  const myContext = { name: 'debounce' };
 
-    Ember.run.debounce(runIt, 150);
-    Ember.run.debounce(myContext, runIt, 150);
-    Ember.run.debounce(myContext, runIt, 150, true);
+  Ember.run.debounce(runIt, 150);
+  Ember.run.debounce(myContext, runIt, 150);
+  Ember.run.debounce(myContext, runIt, 150, true);
 
-    Ember.Component.extend({
-        searchValue: 'test',
-        fetchResults(value: string) {},
+  class TestDebounce extends Ember.Component {
+    searchValue = 'test';
+    declare fetchResults: (value: string) => void;
 
-        actions: {
-            handleTyping() {
-                // the fetchResults function is passed into the component from its parent
-                Ember.run.debounce(this, this.get('fetchResults'), this.get('searchValue'), 250);
-            },
-        },
-    });
+    handleTyping() {
+      // the fetchResults function is passed into the component from its parent
+      Ember.run.debounce(this, this.fetchResults, this.get('searchValue'), 250);
+    }
+  }
 }
 
 function testBegin() {
-    Ember.run.begin();
-    // code to be executed within a RunLoop
-    Ember.run.end();
+  Ember.run.begin();
+  // code to be executed within a RunLoop
+  Ember.run.end();
 }
 
 function testJoin() {
-    Ember.run.join(() => {
-        // creates a new run-loop
-    });
+  Ember.run.join(() => {
+    // creates a new run-loop
+  });
 
-    Ember.run(() => {
-        // creates a new run-loop
-        Ember.run.join(() => {
-            // joins with the existing run-loop, and queues for invocation on
-            // the existing run-loops action queue.
-        });
+  Ember.run(() => {
+    // creates a new run-loop
+    Ember.run.join(() => {
+      // joins with the existing run-loop, and queues for invocation on
+      // the existing run-loops action queue.
     });
+  });
 
-    new RSVP.Promise(resolve => {
-        Ember.run.later(() => {
-            resolve({ msg: 'Hold Your Horses' });
-        }, 3000);
-    });
+  new RSVP.Promise((resolve) => {
+    Ember.run.later(() => {
+      resolve({ msg: 'Hold Your Horses' });
+    }, 3000);
+  });
 }
 
 function testLater() {
-    const myContext = {};
-    Ember.run.later(
-        myContext,
-        () => {
-            // code here will execute within a RunLoop in about 500ms with this == myContext
-        },
-        500,
-    );
+  const myContext = {};
+  Ember.run.later(
+    myContext,
+    () => {
+      // code here will execute within a RunLoop in about 500ms with this == myContext
+    },
+    500
+  );
 }
 
 function testNext() {
-    const myContext = {};
-    Ember.run.next(myContext, () => {
-        // code to be executed in the next run loop,
-        // which will be scheduled after the current one
-    });
+  const myContext = {};
+  Ember.run.next(myContext, () => {
+    // code to be executed in the next run loop,
+    // which will be scheduled after the current one
+  });
 }
 
-function testOnce() {
-    Ember.Component.extend({
-        init() {
-            Ember.run.once(this, 'processFullName');
-        },
+class TestOnce extends Ember.Component {
+  init() {
+    Ember.run.once(this, 'processFullName');
+  }
 
-        processFullName() {},
-    });
+  processFullName() {}
 }
 
-function testSchedule() {
-    Ember.Component.extend({
-        init() {
-            Ember.run.schedule('sync', this, () => {
-                // this will be executed in the first RunLoop queue, when bindings are synced
-                console.log('scheduled on sync queue');
-            });
-
-            Ember.run.schedule('actions', this, () => {
-                // this will be executed in the 'actions' queue, after bindings have synced.
-                console.log('scheduled on actions queue');
-            });
-        },
-    });
+{
+  class TestSchedule {
+    init() {
+      Ember.run.schedule('sync', this, () => {
+        // this will be executed in the first RunLoop queue, when bindings are synced
+        console.log('scheduled on sync queue');
+      });
+
+      Ember.run.schedule('actions', this, () => {
+        // this will be executed in the 'actions' queue, after bindings have synced.
+        console.log('scheduled on actions queue');
+      });
+    }
+  }
 
-    Ember.run.schedule('actions', () => {
-        // Do more things
-    });
+  Ember.run.schedule('actions', () => {
+    // Do more things
+  });
 }
 
 function testScheduleOnce() {
-    function sayHi() {
-        console.log('hi');
-    }
-
-    const myContext = {};
-    Ember.run(() => {
-        Ember.run.scheduleOnce('afterRender', myContext, sayHi);
-        Ember.run.scheduleOnce('afterRender', myContext, sayHi);
-        // sayHi will only be executed once, in the afterRender queue of the RunLoop
-    });
-    Ember.run.scheduleOnce('actions', myContext, () => {
-        console.log('Closure');
-    });
+  function sayHi() {
+    console.log('hi');
+  }
+
+  const myContext = {};
+  Ember.run(() => {
+    Ember.run.scheduleOnce('afterRender', myContext, sayHi);
+    Ember.run.scheduleOnce('afterRender', myContext, sayHi);
+    // sayHi will only be executed once, in the afterRender queue of the RunLoop
+  });
+  Ember.run.scheduleOnce('actions', myContext, () => {
+    console.log('Closure');
+  });
 }
 
 function testThrottle() {
-    function runIt() {}
+  function runIt() {}
 
-    const myContext = { name: 'throttle' };
+  const myContext = { name: 'throttle' };
 
-    Ember.run.throttle(runIt, 150);
-    Ember.run.throttle(myContext, runIt, 150);
+  Ember.run.throttle(runIt, 150);
+  Ember.run.throttle(myContext, runIt, 150);
 }
diff --git a/types/preview/ember/test/string.ts b/types/preview/ember/test/string.ts
index c05f68f1a3d..d494d78a94e 100644
--- a/types/preview/ember/test/string.ts
+++ b/types/preview/ember/test/string.ts
@@ -1,7 +1,8 @@
 import Ember from 'ember';
 import { SafeString } from '@ember/template/-private/handlebars';
 
-const { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, underscore, w } = Ember.String;
+const { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, underscore, w } =
+  Ember.String;
 
 // @ts-expect-error
 dasherize();
diff --git a/types/preview/ember/test/transition.ts b/types/preview/ember/test/transition.ts
index 53eb4397764..303fe28ecdb 100755
--- a/types/preview/ember/test/transition.ts
+++ b/types/preview/ember/test/transition.ts
@@ -1,29 +1,5 @@
 import Ember from 'ember';
 import Transition from '@ember/routing/transition';
+import { expectTypeOf } from 'expect-type';
 
-Ember.Route.extend({
-    beforeModel(transition: Transition) {
-        if (new Date() > new Date('January 1, 1980')) {
-            alert('Sorry, you need a time machine to enter this route.');
-            transition.abort();
-        }
-    },
-});
-
-Ember.Controller.extend({
-    previousTransition: null as Transition | null,
-
-    actions: {
-        login() {
-            // Log the user in, then reattempt previous transition if it exists.
-            const previousTransition = this.get('previousTransition');
-            if (previousTransition) {
-                this.set('previousTransition', null);
-                previousTransition.retry();
-            } else {
-                // Default back to homepage
-                this.transitionToRoute('index');
-            }
-        },
-    },
-});
+expectTypeOf<Parameters<Ember.Route['beforeModel']>[0]>().toEqualTypeOf<Transition>();
diff --git a/types/preview/ember/test/utils.ts b/types/preview/ember/test/utils.ts
index ef0504eba30..91796516054 100755
--- a/types/preview/ember/test/utils.ts
+++ b/types/preview/ember/test/utils.ts
@@ -1,146 +1,148 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 import { assertType } from './lib/assert';
 
 function testTypeOf() {
-    Ember.typeOf(); // $ExpectType "undefined"
-    const str: string = Ember.typeOf({});
+  Ember.typeOf(); // $ExpectType "undefined"
+  const str: string = Ember.typeOf({});
 }
 
 function testIsNoneType() {
-    const maybeUndefined: string | undefined = 'not actually undefined';
-    if (Ember.isNone(maybeUndefined)) {
-        return;
-    }
+  const maybeUndefined: string | undefined = 'not actually undefined';
+  if (Ember.isNone(maybeUndefined)) {
+    return;
+  }
 
-    const anotherString = maybeUndefined + 'another string';
-    Ember.isNone(); // $ExpectType boolean
+  const anotherString = maybeUndefined + 'another string';
+  Ember.isNone(); // $ExpectType boolean
 }
 
 function testIsBlank() {
-    Ember.isBlank(); // $ExpectType boolean
-    Ember.isBlank(''); // $ExpectType boolean
-    // @ts-expect-error
-    Ember.isBlank('', '');
+  Ember.isBlank(); // $ExpectType boolean
+  Ember.isBlank(''); // $ExpectType boolean
+  // @ts-expect-error
+  Ember.isBlank('', '');
 }
 
 function testIsEmpty() {
-    Ember.isEmpty(); // $ExpectType boolean
-    Ember.isEmpty(''); // $ExpectType boolean
-    // @ts-expect-error
-    Ember.isEmpty('', '');
+  Ember.isEmpty(); // $ExpectType boolean
+  Ember.isEmpty(''); // $ExpectType boolean
+  // @ts-expect-error
+  Ember.isEmpty('', '');
 }
 
 function testIsPresent() {
-    Ember.isPresent(); // $ExpectType boolean
-    Ember.isPresent(''); // $ExpectType boolean
-    // @ts-expect-error
-    Ember.isPresent('', '');
+  Ember.isPresent(); // $ExpectType boolean
+  Ember.isPresent(''); // $ExpectType boolean
+  // @ts-expect-error
+  Ember.isPresent('', '');
 }
 
 function testIsNone() {
-    Ember.isNone(); // $ExpectType boolean
-    Ember.isNone(''); // $ExpectType boolean
-    // @ts-expect-error
-    Ember.isNone('', '');
+  Ember.isNone(); // $ExpectType boolean
+  Ember.isNone(''); // $ExpectType boolean
+  // @ts-expect-error
+  Ember.isNone('', '');
 }
 
 function testAssign() {
-    assertType<{ first: string; middle: string; last: string }>(
-        Ember.assign({ first: 'Tom' }, { middle: 'M' }, { last: 'Dale' }),
-    );
+  assertType<{ first: string; middle: string; last: string }>(
+    Ember.assign({ first: 'Tom' }, { middle: 'M' }, { last: 'Dale' })
+  );
 }
 
 function testOnError() {
-    Ember.onerror = error => {
-        fetch('/report-error', {
-            method: 'POST',
-            body: JSON.stringify({
-                stack: error.stack,
-                otherInformation: 'whatever app state you want to provide',
-            })
-        });
-    };
+  Ember.onerror = (error) => {
+    fetch('/report-error', {
+      method: 'POST',
+      body: JSON.stringify({
+        stack: error.stack,
+        otherInformation: 'whatever app state you want to provide',
+      }),
+    });
+  };
 }
 
 function testDeprecateFunc() {
-    function newMethod(first: string, second: number): string {
-        return '';
-    }
-
-    const oldMethod = Ember.deprecateFunc(
-        'Please use the new method',
-        { id: 'deprecated.id', until: '6.0' },
-        newMethod,
-    );
-    assertType<string>(newMethod('first', 123));
-    assertType<string>(oldMethod('first', 123));
+  function newMethod(first: string, second: number): string {
+    return '';
+  }
+
+  const oldMethod = Ember.deprecateFunc(
+    'Please use the new method',
+    { id: 'deprecated.id', until: '6.0' },
+    newMethod
+  );
+  expectTypeOf(newMethod('first', 123)).toEqualTypeOf<string>();
+  expectTypeOf(oldMethod('first', 123)).toEqualTypeOf<string>();
 }
 
 function testDefineProperty() {
-    const contact = {};
-
-    // ES5 compatible mode
-    Ember.defineProperty(contact, 'firstName', {
-        writable: true,
-        configurable: false,
-        enumerable: true,
-        value: 'Charles',
-    });
-
-    // define a simple property
-    Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
-
-    // define a computed property
-    Ember.defineProperty(
-        contact,
-        'fullName',
-        Ember.computed('firstName', 'lastName', function () {
-            return `${this.firstName} ${this.lastName}`;
-        }),
-    );
+  type Contact = { firstName?: string; lastName?: string };
+  const contact: Contact = {};
+
+  // ES5 compatible mode
+  Ember.defineProperty(contact, 'firstName', {
+    writable: true,
+    configurable: false,
+    enumerable: true,
+    value: 'Charles',
+  });
+
+  // define a simple property
+  Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
+
+  // define a computed property
+  Ember.defineProperty(
+    contact,
+    'fullName',
+    Ember.computed('firstName', 'lastName', function (this: Contact) {
+      return `${this.firstName} ${this.lastName}`;
+    })
+  );
 }
 
 // For use in IIFE below.
 declare const fileList: FileList;
 
 (() => {
-    /** typeOf */
-    Ember.typeOf(); // $ExpectType "undefined"
-    Ember.typeOf(null); // $ExpectType "null"
-    Ember.typeOf(undefined); // $ExpectType "undefined"
-    Ember.typeOf('michael'); // $ExpectType "string"
-    // tslint:disable-next-line:no-construct
-    Ember.typeOf(new String('michael')); // $ExpectType "string"
-    Ember.typeOf(101); // $ExpectType "number"
-    // tslint:disable-next-line:no-construct
-    Ember.typeOf(new Number(101)); // $ExpectType "number"
-    Ember.typeOf(true); // $ExpectType "boolean"
-    // tslint:disable-next-line:no-construct
-    Ember.typeOf(new Boolean(true)); // $ExpectType "boolean"
-    Ember.typeOf(() => 4); // $ExpectType "function"
-    Ember.typeOf([1, 2, 90]); // $ExpectType "array"
-    Ember.typeOf(/abc/); // $ExpectType "regexp"
-    Ember.typeOf(new Date()); // $ExpectType "date"
-    Ember.typeOf(fileList); // $ExpectType "filelist"
-    Ember.typeOf(Ember.Object.extend()); // $ExpectType "class"
-    Ember.typeOf(Ember.Object.create()); // $ExpectType "instance"
-    Ember.typeOf(new Error('teamocil')); // $ExpectType "error"
-    Ember.typeOf(new Date() as RegExp | Date); // "regexp" | "date"
-    Ember.typeOf({ randomObject: true }); // $ExpectType "object"
+  /** typeOf */
+  Ember.typeOf(); // $ExpectType "undefined"
+  Ember.typeOf(null); // $ExpectType "null"
+  Ember.typeOf(undefined); // $ExpectType "undefined"
+  Ember.typeOf('michael'); // $ExpectType "string"
+  // tslint:disable-next-line:no-construct
+  Ember.typeOf(new String('michael')); // $ExpectType "string"
+  Ember.typeOf(101); // $ExpectType "number"
+  // tslint:disable-next-line:no-construct
+  Ember.typeOf(new Number(101)); // $ExpectType "number"
+  Ember.typeOf(true); // $ExpectType "boolean"
+  // tslint:disable-next-line:no-construct
+  Ember.typeOf(new Boolean(true)); // $ExpectType "boolean"
+  Ember.typeOf(() => 4); // $ExpectType "function"
+  Ember.typeOf([1, 2, 90]); // $ExpectType "array"
+  Ember.typeOf(/abc/); // $ExpectType "regexp"
+  Ember.typeOf(new Date()); // $ExpectType "date"
+  Ember.typeOf(fileList); // $ExpectType "filelist"
+  Ember.typeOf(Ember.Object.extend()); // $ExpectType "class"
+  Ember.typeOf(Ember.Object.create()); // $ExpectType "instance"
+  Ember.typeOf(new Error('teamocil')); // $ExpectType "error"
+  Ember.typeOf(new Date() as RegExp | Date); // "regexp" | "date"
+  Ember.typeOf({ randomObject: true }); // $ExpectType "object"
 })();
 
 (() => {
-    /* assign */
-    Ember.assign({}, { a: 'b' });
-    Ember.assign({}, { a: 'b' }).a; // $ExpectType string
-    Ember.assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
-    Ember.assign({ a: 6 }, {}).a; // $ExpectType number
-    // @ts-expect-error
-    Ember.assign({ b: 6 }, {}).a;
-    Ember.assign({}, { b: 6 }, {}).b; // $ExpectType number
-    Ember.assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
-    Ember.assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
-    // @ts-expect-error
-    Ember.assign({ a: 'hello' }, '', { a: true }).a;
-    Ember.assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
+  /* assign */
+  Ember.assign({}, { a: 'b' });
+  Ember.assign({}, { a: 'b' }).a; // $ExpectType string
+  Ember.assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
+  Ember.assign({ a: 6 }, {}).a; // $ExpectType number
+  // @ts-expect-error
+  Ember.assign({ b: 6 }, {}).a;
+  Ember.assign({}, { b: 6 }, {}).b; // $ExpectType number
+  Ember.assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
+  Ember.assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
+  // @ts-expect-error
+  Ember.assign({ a: 'hello' }, '', { a: true }).a;
+  Ember.assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
 })();

From 14acfd7ee471e21680daa643526621172b0c1b39 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 26 Aug 2022 13:49:55 -0600
Subject: [PATCH 1087/1405] Fix many errors in types preview

- Improve the way we do a minimal representation of the Ember Object
  primitives and utilities.
- Introduce our own copy of `@ember/string`.
- Start workk on many of the tests for `Ember` namespace re-exports.
- Stop distinguishing between Octane and everything else: we only care
  about Octane anyway in our public *TS* API, per RFC 0800.
---
 .../@ember/array/-private/enumerable.d.ts     |  13 +-
 .../array/-private/mutable-enumerable.d.ts    |  34 +-
 types/preview/@ember/object/core.d.ts         |   6 +-
 types/preview/@ember/object/test/computed.ts  | 585 +++++++++++-------
 types/preview/@ember/object/test/core.ts      | 268 ++++----
 types/preview/@ember/object/test/octane.ts    | 331 ----------
 types/preview/@ember/routing/test/router.ts   | 146 ++---
 .../@ember/string/ember__string-tests.ts      |  52 ++
 types/preview/@ember/string/index.d.ts        |   7 +
 types/preview/@ember/string/tsconfig.json     |   3 +
 types/preview/ember/index.d.ts                |  10 +-
 types/preview/ember/test/computed.ts          | 258 +++-----
 types/preview/ember/test/helper.ts            |  37 +-
 types/preview/ember/test/mixin.ts             |  63 +-
 types/preview/ember/test/object.ts            | 136 ++--
 types/preview/ember/test/observable.ts        |  42 +-
 .../ember/test/private/computed-tests.ts      | 110 +---
 types/preview/ember/test/reopen.ts            |  67 +-
 types/preview/ember/test/route.ts             | 125 ++--
 types/preview/ember/test/router.ts            |  83 +--
 20 files changed, 1072 insertions(+), 1304 deletions(-)
 delete mode 100644 types/preview/@ember/object/test/octane.ts
 create mode 100644 types/preview/@ember/string/ember__string-tests.ts
 create mode 100644 types/preview/@ember/string/index.d.ts
 create mode 100644 types/preview/@ember/string/tsconfig.json

diff --git a/types/preview/@ember/array/-private/enumerable.d.ts b/types/preview/@ember/array/-private/enumerable.d.ts
index ca22d5a29fc..eb33abcf7df 100644
--- a/types/preview/@ember/array/-private/enumerable.d.ts
+++ b/types/preview/@ember/array/-private/enumerable.d.ts
@@ -1,14 +1,7 @@
 import ComputedProperty from '@ember/object/computed';
 import Mixin from '@ember/object/mixin';
 import NativeArray from '@ember/array/-private/native-array';
-import EmberArray from '@ember/array';
-import {
-  AnyFn,
-  MethodNamesOf,
-  MethodParams,
-  MethodReturns,
-  MethodsOf,
-} from 'ember/-private/type-utils';
+import { MethodNamesOf, MethodParams, MethodReturns } from 'ember/-private/type-utils';
 
 /**
  * This mixin defines the common interface implemented by enumerable objects
@@ -172,8 +165,8 @@ interface Enumerable<T> {
    * this property, it will return this. If you set this property to a new
    * array, it will replace the current content.
    */
-  '[]': ComputedProperty<this>;
+  '[]': ComputedProperty;
 }
 
-declare const Enumerable: Mixin<Enumerable<unknown>>;
+declare const Enumerable: Mixin;
 export default Enumerable;
diff --git a/types/preview/@ember/array/-private/mutable-enumerable.d.ts b/types/preview/@ember/array/-private/mutable-enumerable.d.ts
index c2786508b29..b6785f8fe33 100644
--- a/types/preview/@ember/array/-private/mutable-enumerable.d.ts
+++ b/types/preview/@ember/array/-private/mutable-enumerable.d.ts
@@ -7,22 +7,22 @@ import Enumerable from '@ember/array/-private/enumerable';
  * unordered.
  */
 interface MutableEnumerable<T> extends Enumerable<T> {
-    /**
-     * __Required.__ You must implement this method to apply this mixin.
-     */
-    addObject(object: T): T;
-    /**
-     * Adds each object in the passed enumerable to the receiver.
-     */
-    addObjects(objects: Enumerable<T>): this;
-    /**
-     * __Required.__ You must implement this method to apply this mixin.
-     */
-    removeObject(object: T): T;
-    /**
-     * Removes each object in the passed enumerable from the receiver.
-     */
-    removeObjects(objects: Enumerable<T>): this;
+  /**
+   * __Required.__ You must implement this method to apply this mixin.
+   */
+  addObject(object: T): T;
+  /**
+   * Adds each object in the passed enumerable to the receiver.
+   */
+  addObjects(objects: Enumerable<T>): this;
+  /**
+   * __Required.__ You must implement this method to apply this mixin.
+   */
+  removeObject(object: T): T;
+  /**
+   * Removes each object in the passed enumerable from the receiver.
+   */
+  removeObjects(objects: Enumerable<T>): this;
 }
-declare const MutableEnumerable: Mixin<MutableEnumerable<unknown>>;
+declare const MutableEnumerable: Mixin;
 export default MutableEnumerable;
diff --git a/types/preview/@ember/object/core.d.ts b/types/preview/@ember/object/core.d.ts
index 58d719ad6cc..f9ecbbb256a 100644
--- a/types/preview/@ember/object/core.d.ts
+++ b/types/preview/@ember/object/core.d.ts
@@ -60,7 +60,7 @@ export default class CoreObject {
 
   static create<Class extends typeof CoreObject>(
     this: Class,
-    ...initialValues: Array<Mixin | Record<string, unknown>>
+    ...initialValues: Array<Mixin | MembersOf<Class>>
   ): InstanceType<Class>;
 
   static extend<Statics, Instance>(
@@ -81,3 +81,7 @@ export default class CoreObject {
   static isClass: boolean;
   static isMethod: boolean;
 }
+
+type MembersOf<Class extends typeof CoreObject> = {
+  [Key in keyof InstanceType<Class>]?: InstanceType<Class>[Key];
+};
diff --git a/types/preview/@ember/object/test/computed.ts b/types/preview/@ember/object/test/computed.ts
index fa99c5ede92..cbb90910b6d 100644
--- a/types/preview/@ember/object/test/computed.ts
+++ b/types/preview/@ember/object/test/computed.ts
@@ -1,231 +1,396 @@
 import EmberObject, { computed } from '@ember/object';
-import ComputedProperty, {
-    alias,
-    or,
-    and,
-    filter,
-    equal,
-    empty,
-    filterBy,
-    notEmpty,
-    none,
-    not,
-    min,
-    max,
-    gt,
-    gte,
-    lt,
-    lte,
-    readOnly,
-    reads,
-    setDiff,
-    sort,
-    intersect,
-    mapBy,
-    match,
-    map,
-    oneWay,
-    sum,
-    union,
-    uniqBy,
-    uniq,
-    deprecatingAlias,
-    bool,
-    collect,
+import {
+  alias,
+  or,
+  and,
+  filter,
+  equal,
+  empty,
+  filterBy,
+  notEmpty,
+  none,
+  not,
+  min,
+  max,
+  gt,
+  gte,
+  lt,
+  lte,
+  readOnly,
+  reads,
+  setDiff,
+  sort,
+  intersect,
+  mapBy,
+  match,
+  map,
+  oneWay,
+  sum,
+  union,
+  uniqBy,
+  uniq,
+  deprecatingAlias,
+  bool,
+  collect,
 } from '@ember/object/computed';
-import { assertType } from './lib/assert';
-
-const Person = EmberObject.extend({
-    firstName: '',
-    lastName: '',
-    age: 0,
-
-    noArgs: computed<string>(() => 'test'),
-
-    fullName: computed<string>('firstName', 'lastName', function () {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    }),
-
-    fullNameReadonly: computed<string>('fullName', function () {
-        return this.get('fullName');
-    }).readOnly(),
-
-    fullNameWritable: computed<string>('firstName', 'lastName', {
-        get() {
-            return this.get('fullName');
-        },
-        set(key, value) {
-            const [first, last] = value.split(' ');
-            this.set('firstName', first);
-            this.set('lastName', last);
-            return value;
-        },
-    }),
-
-    fullNameGetOnly: computed<string>('fullName', {
-        get() {
-            return this.get('fullName');
-        },
-    }),
-
-    fullNameSetOnly: computed<string>('firstName', 'lastName', {
-        set(key, value) {
-            const [first, last] = value.split(' ');
-            this.set('firstName', first);
-            this.set('lastName', last);
-            return value;
-        },
-    }),
-
-    combinators: computed<string>(function () {
-        return this.get('firstName');
-    })
-        .property('firstName')
-        .meta({ foo: 'bar' })
-        .volatile()
-        .readOnly(),
-
-    explicitlyDeclared: alias('fullName') as ComputedProperty<string>,
-});
+import { expectTypeOf } from 'expect-type';
+
+function customMacro(message: string) {
+  return computed(() => {
+    return [message, message];
+  });
+}
+
+class Person extends EmberObject {
+  firstName = '';
+  lastName = '';
+  age = 0;
+
+  // Equivalent to a per-instance `defineProperty` call.
+  @computed()
+  get noArgs() {
+    return 'test';
+  }
+
+  @computed('firstName', 'lastName')
+  get fullName(): string {
+    return `${this.get('firstName')} ${this.get('lastName')}`;
+  }
+
+  @computed('fullName').readOnly()
+  get fullNameReadonly() {
+    return this.get('fullName');
+  }
+
+  @computed('firstName', 'lastName')
+  get fullNameWritable(): string {
+    return this.get('fullName');
+  }
+
+  set fullNameWritable(value: string) {
+    const [first, last] = value.split(' ');
+    this.set('firstName', first);
+    this.set('lastName', last);
+  }
+
+  @computed().meta({ foo: 'bar' }).readOnly()
+  get combinators() {
+    return this.get('firstName');
+  }
+
+  @alias('fullName')
+  declare explicitlyDeclared: string;
+
+  @customMacro('hi')
+  declare hiTwice: string[];
+}
 
 const person = Person.create({
-    firstName: 'Fred',
-    lastName: 'Smith',
-    age: 29,
+  firstName: 'Fred',
+  lastName: 'Smith',
+  age: 29,
 });
 
-assertType<string>(person.firstName);
-assertType<number>(person.age);
-assertType<ComputedProperty<string>>(person.noArgs);
-assertType<ComputedProperty<string>>(person.fullName);
-assertType<ComputedProperty<string>>(person.fullNameReadonly);
-assertType<ComputedProperty<string>>(person.fullNameWritable);
-assertType<ComputedProperty<string>>(person.fullNameGetOnly);
-assertType<ComputedProperty<string>>(person.fullNameSetOnly);
-assertType<ComputedProperty<string>>(person.combinators);
-assertType<ComputedProperty<string>>(person.explicitlyDeclared);
-
-assertType<string>(person.get('firstName'));
-assertType<number>(person.get('age'));
-assertType<string>(person.get('noArgs'));
-assertType<string>(person.get('fullName'));
-assertType<string>(person.get('fullNameReadonly'));
-assertType<string>(person.get('fullNameWritable'));
-assertType<string>(person.get('fullNameGetOnly'));
-assertType<string>(person.get('fullNameSetOnly'));
-assertType<string>(person.get('combinators'));
-assertType<string>(person.get('explicitlyDeclared'));
-
-assertType<{ firstName: string; fullName: string; age: number }>(person.getProperties('firstName', 'fullName', 'age'));
+expectTypeOf(person.firstName).toEqualTypeOf<string>();
+expectTypeOf(person.age).toEqualTypeOf<number>();
+expectTypeOf(person.noArgs).toEqualTypeOf<string>();
+expectTypeOf(person.fullName).toEqualTypeOf<string>();
+expectTypeOf(person.fullNameReadonly).toEqualTypeOf<string>();
+expectTypeOf(person.fullNameWritable).toEqualTypeOf<string>();
+expectTypeOf(person.combinators).toEqualTypeOf<string>();
+expectTypeOf(person.explicitlyDeclared).toEqualTypeOf<string>();
+
+expectTypeOf(person.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person.get('age')).toEqualTypeOf<number>();
+expectTypeOf(person.get('noArgs')).toEqualTypeOf<string>();
+expectTypeOf(person.get('fullName')).toEqualTypeOf<string>();
+expectTypeOf(person.get('fullNameReadonly')).toEqualTypeOf<string>();
+expectTypeOf(person.get('fullNameWritable')).toEqualTypeOf<string>();
+expectTypeOf(person.get('combinators')).toEqualTypeOf<string>();
+expectTypeOf(person.get('explicitlyDeclared')).toEqualTypeOf<string>();
+
+expectTypeOf(person.getProperties('firstName', 'fullName', 'age')).toMatchTypeOf<{
+  firstName: string;
+  fullName: string;
+  age: number;
+}>();
 
 const person2 = Person.create({
-    fullName: 'Fred Smith',
+  fullName: 'Fred Smith',
 });
 
-assertType<string>(person2.get('firstName'));
-assertType<string>(person2.get('fullName'));
+expectTypeOf(person2.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person2.get('fullName')).toEqualTypeOf<string>();
 
 const person3 = Person.extend({
-    firstName: 'Fred',
-    fullName: 'Fred Smith',
+  firstName: 'Fred',
+  fullName: 'Fred Smith',
 }).create();
 
-assertType<string>(person3.get('firstName'));
-assertType<string>(person3.get('fullName'));
+expectTypeOf(person3.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person3.get('fullName')).toEqualTypeOf<string>();
 
 const person4 = Person.extend({
-    firstName: computed(() => 'Fred'),
-    fullName: computed(() => 'Fred Smith'),
+  firstName: computed(() => 'Fred'),
+  fullName: computed(() => 'Fred Smith'),
 }).create();
 
-assertType<string>(person4.get('firstName'));
-assertType<string>(person4.get('fullName'));
+expectTypeOf(person4.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person4.get('fullName')).toEqualTypeOf<string>();
 
 // computed property macros
-const objectWithComputedProperties = EmberObject.extend({
-    alias: alias('foo'),
-    and: and('foo', 'bar', 'baz', 'qux'),
-    bool: bool('foo'),
-    collect: collect('foo', 'bar', 'baz', 'qux'),
-    deprecatingAlias: deprecatingAlias('foo', {
-        id: 'hamster.deprecate-banana',
-        until: '3.0.0',
-    }),
-    empty: empty('foo'),
-    equalNumber: equal('foo', 1),
-    equalString: equal('foo', 'bar'),
-    equalObject: equal('foo', {}),
-    filter1: filter('foo', item => item === 'bar'),
-    filter2: filter('foo', ['bar', 'baz'], item => item === 'bar'),
-    filterBy1: filterBy('foo', 'bar'),
-    filterBy2: filterBy('foo', 'bar', false),
-    gt: gt('foo', 3),
-    gte: gte('foo', 3),
-    intersect: intersect('foo', 'bar', 'baz', 'qux'),
-    lt: lt('foo', 3),
-    lte: lte('foo', 3),
-    map: map('foo', (item, index) => item),
-    mapBy: mapBy('foo', 'bar'),
-    match: match('foo', /^tom.ter$/),
-    max: max('foo'),
-    min: min('foo'),
-    none: none('foo'),
-    not: not('foo'),
-    notEmpty: notEmpty('foo'),
-    oneWay: oneWay('foo'),
-    or: or('foo', 'bar', 'baz', 'qux'),
-    readOnly: readOnly('foo'),
-    reads: reads('foo'),
-    setDiff: setDiff('foo', 'bar'),
-    sort1: sort('foo', 'bar'),
-    sort2: sort('foo', (itemA, itemB) => {
-      return `${itemA}`.length - `${itemB}`.length;
-    }),
-    sort3: sort('foo', ['bar', 'baz'], (itemA, itemB) => {
-      return `${itemA}`.length - `${itemB}`.length;
-    }),
-
-    sum: sum('foo'),
-    union: union('foo', 'bar', 'baz', 'qux'),
-    uniq: uniq('foo'),
-    uniqBy: uniqBy('foo', 'bar'),
-}).create();
+class Bar extends EmberObject {
+  declare firstName: string;
+  declare last: string;
+
+  declare values: number[];
+
+  // @ts-expect-error
+  @alias declare aliasTest0: string;
+  // @ts-expect-error
+  @alias() declare aliasTest1: string;
+  @alias('firstName') declare aliasTest2: string;
+
+  // @ts-expect-error
+  @and declare andTest0: boolean;
+  @and() declare andTest1: boolean;
+  @and('firstName') declare andTest2: boolean;
+  @and('firstName', 'lastName') declare andTest3: boolean;
+
+  // @ts-expect-error
+  @bool declare boolTest0: boolean;
+  // @ts-expect-error
+  @bool() declare boolTest1: boolean;
+  @bool('firstName') declare boolTest2: boolean;
+
+  // @ts-expect-error
+  @collect declare collectTest0: unknown[];
+  @collect() declare collectTest1: unknown[];
+  @collect('firstName') declare collectTest2: string[];
+
+  // @ts-expect-error
+  @deprecatingAlias declare deprecatingAliasTest0: string;
+  // @ts-expect-error
+  @deprecatingAlias() declare deprecatingAliasTest1: string;
+  // @ts-expect-error
+  @deprecatingAlias('firstName') declare deprecatingAliasTest2: string;
+  @deprecatingAlias('firstName', { id: 'deprecate-everything', until: 'v5.0.0' })
+  declare deprecatingAliasTest3: string;
+
+  // @ts-expect-error
+  @empty declare emptyTest0: boolean;
+  // @ts-expect-error
+  @empty() declare emptyTest1: boolean;
+  @empty('firstName') declare emptyTest2: boolean;
+
+  // @ts-expect-error
+  @equal declare equalTest0: boolean;
+  // @ts-expect-error
+  @equal() declare equalTest1: boolean;
+  // @ts-expect-error
+  @equal('firstName') declare equalTest2: boolean;
+  @equal('firstName', 'lastName') declare equalTest3: boolean;
+
+  // @ts-expect-error
+  @filter declare filterTest1: string[];
+  // @ts-expect-error
+  @filter() declare filterTest2: string[];
+  // @ts-expect-error
+  @filter('firstName') declare filterTest3: string[];
+  @filter('firstName', Boolean) declare filterTest4: string[];
+  // @ts-expect-error
+  @filter('firstName', 'secondName', (x) => x) declare filterTest5: string[];
+  @filter('firstName', ['secondName'], Boolean) declare filterTest6: string[];
+
+  // @ts-expect-error
+  @filterBy declare filterByTest1: unknown[];
+  // @ts-expect-error
+  @filterBy() declare filterByTest2: unknown[];
+  // @ts-expect-error
+  @filterBy('firstName') declare filterByTest3: string[];
+  @filterBy('firstName', 'id') declare filterByTest4: string[];
+
+  // @ts-expect-error
+  @gt declare gtTest1: boolean;
+  // @ts-expect-error
+  @gt() declare gtTest2: boolean;
+  // @ts-expect-error
+  @gt('firstName') declare gtTest3: boolean;
+  @gt('firstName', 3) declare gtTest4: boolean;
+
+  // @ts-expect-error
+  @gte declare gteTest1: boolean;
+  // @ts-expect-error
+  @gte() declare gteTest2: boolean;
+  // @ts-expect-error
+  @gte('firstName') declare gteTest3: boolean;
+  @gte('firstName', 3) declare gteTest4: boolean;
+
+  // @ts-expect-error
+  @intersect declare intersectTest1: any;
+  @intersect() declare intersectTest2: any;
+  @intersect('firstName') declare intersectTest3: any;
+  @intersect('firstName', 'lastName') declare intersectTest4: any;
+
+  // @ts-expect-error
+  @lt declare ltTest1: boolean;
+  // @ts-expect-error
+  @lt() declare ltTest2: boolean;
+  // @ts-expect-error
+  @lt('firstName') declare ltTest3: boolean;
+  @lt('firstName', 3) declare ltTest4: boolean;
+
+  // @ts-expect-error
+  @lte declare lteTest1: boolean;
+  // @ts-expect-error
+  @lte() declare lteTest2: boolean;
+  // @ts-expect-error
+  @lte('firstName') declare lteTest3: boolean;
+  @lte('firstName', 3) declare lteTest4: boolean;
+
+  // @ts-expect-error
+  @map declare mapTest1: string[];
+  // @ts-expect-error
+  @map() declare mapTest2: string[];
+  // @ts-expect-error
+  @map('firstName') declare mapTest3: string[];
+  @map('firstName', (x) => x) declare mapTest4: string[];
+
+  // @ts-expect-error
+  @mapBy declare mapByTest1: any[];
+  // @ts-expect-error
+  @mapBy() declare mapByTest2: any[];
+  // @ts-expect-error
+  @mapBy('firstName') declare mapByTest3: any[];
+  @mapBy('firstName', 'id') declare mapByTest4: any[];
+
+  // @ts-expect-error
+  @match declare matchTest1: boolean;
+  // @ts-expect-error
+  @match() declare matchTest2: boolean;
+  // @ts-expect-error
+  @match('firstName') declare matchTest3: boolean;
+  // @ts-expect-error
+  @match('firstName', 'abc') declare matchTest4: boolean;
+  @match('firstName', /\s+/) declare matchTest5: boolean;
+
+  // @ts-expect-error
+  @max declare maxTest1: number;
+  // @ts-expect-error
+  @max() declare maxTest2: number;
+  @max('values') declare maxTest3: number;
+  // @ts-expect-error
+  @max('values', 'a') declare maxTest4: number;
+
+  // @ts-expect-error
+  @min declare minTest1: number;
+  // @ts-expect-error
+  @min() declare minTest2: number;
+  @min('values') declare minTest3: number;
+  // @ts-expect-error
+  @min('values', 'a') declare minTest4: number;
+
+  // @ts-expect-error
+  @none declare noneTest1: number;
+  // @ts-expect-error
+  @none() declare noneTest2: number;
+  @none('values') declare noneTest3: number;
+  // @ts-expect-error
+  @none('values', 'a') declare noneTest4: number;
+
+  // @ts-expect-error
+  @not declare notTest1: number;
+  // @ts-expect-error
+  @not() declare notTest2: number;
+  @not('values') declare notTest3: number;
+  // @ts-expect-error
+  @not('values', 'a') declare notTest4: number;
+
+  // @ts-expect-error
+  @notEmpty declare notEmptyTest1: boolean;
+  // @ts-expect-error
+  @notEmpty() declare notEmptyTest2: boolean;
+  @notEmpty('firstName') declare notEmptyTest3: boolean;
+  // @ts-expect-error
+  @notEmpty('firstName', 'a') declare notEmptyTest4: boolean;
+
+  // @ts-expect-error
+  @oneWay declare oneWayTest1: boolean;
+  // @ts-expect-error
+  @oneWay() declare oneWayTest2: boolean;
+  @oneWay('firstName') declare oneWayTest3: boolean;
+  // @ts-expect-error
+  @oneWay('firstName', 'b') declare oneWayTest4: boolean;
+
+  // @ts-expect-error
+  @or declare orTest1: boolean;
+  @or() declare orTest2: boolean;
+  @or('firstName') declare orTest3: boolean;
+  @or('firstName', 'lastName') declare orTest4: boolean;
+
+  // @ts-expect-error
+  @readOnly declare readOnlyTest1: boolean;
+  // @ts-expect-error
+  @readOnly() declare readOnlyTest2: boolean;
+  @readOnly('firstName') declare readOnlyTest3: boolean;
+
+  // @ts-expect-error
+  @reads declare readsTest1: boolean;
+  // @ts-expect-error
+  @reads() declare readsTest2: boolean;
+  @reads('firstName') declare readsTest3: boolean;
+  // @ts-expect-error
+  @reads('firstName', 'a') declare readsTest4: boolean;
+
+  // @ts-expect-error
+  @setDiff declare setDiffTest1: number;
+  // @ts-expect-error
+  @setDiff() declare setDiffTest2: number;
+  // @ts-expect-error
+  @setDiff('values') declare setDiffTest3: number;
+  @setDiff('values', 'otherThing') declare setDiffTest4: number;
+  // @ts-expect-error
+  @setDiff('values', 'otherThing', 'a') declare setDiffTest5: number;
+
+  // @ts-expect-error
+  @sort declare sortTest1: number;
+  // @ts-expect-error
+  @sort() declare sortTest2: number;
+  // @ts-expect-error
+  @sort('values') declare sortTest3: number;
+  @sort('values', 'id') declare sortTest4: number;
+  // @ts-expect-error
+  @sort('values', 'id', 'a') declare sortTest5: number;
+  @sort('values', (a: number, b: number) => a - b) declare sortTest6: number;
+  @sort('values', ['id'], (a: number, b: number) => a - b) declare sortTest7: number;
+  // @ts-expect-error
+  @sort('values', 'id', (a, b) => a - b) declare sortTest8: number;
+  // @ts-expect-error
+  @sort(['id'], (a, b) => a - b) declare sortTest9: number;
+
+  // @ts-expect-error
+  @sum declare sumTest1: number;
+  // @ts-expect-error
+  @sum() declare sumTest2: number;
+  @sum('values') declare sumTest3: number;
+
+  // @ts-expect-error
+  @union declare unionTest1: never;
+  @union() declare unionTest2: [];
+  @union('firstName') declare unionTest3: string[];
+  @union('firstName', 'lastName') declare unionTest4: string[];
+
+  // @ts-expect-error
+  @uniq declare uniqTest1: number;
+  // @ts-expect-error
+  @uniq() declare uniqTest2: number;
+  @uniq('values') declare uniqTest3: number;
 
-assertType<unknown>(objectWithComputedProperties.get('alias'));
-assertType<unknown>(objectWithComputedProperties.get('and'));
-assertType<boolean>(objectWithComputedProperties.get('bool'));
-assertType<unknown[]>(objectWithComputedProperties.get('collect'));
-assertType<unknown>(objectWithComputedProperties.get('deprecatingAlias'));
-assertType<boolean>(objectWithComputedProperties.get('empty'));
-assertType<boolean>(objectWithComputedProperties.get('equalNumber'));
-assertType<boolean>(objectWithComputedProperties.get('equalString'));
-assertType<boolean>(objectWithComputedProperties.get('equalObject'));
-assertType<unknown[]>(objectWithComputedProperties.get('filter1'));
-assertType<unknown[]>(objectWithComputedProperties.get('filter2'));
-assertType<unknown[]>(objectWithComputedProperties.get('filterBy1'));
-assertType<unknown[]>(objectWithComputedProperties.get('filterBy2'));
-assertType<boolean>(objectWithComputedProperties.get('gt'));
-assertType<boolean>(objectWithComputedProperties.get('gte'));
-assertType<unknown[]>(objectWithComputedProperties.get('intersect'));
-assertType<boolean>(objectWithComputedProperties.get('lt'));
-assertType<boolean>(objectWithComputedProperties.get('lte'));
-assertType<unknown[]>(objectWithComputedProperties.get('map'));
-assertType<unknown[]>(objectWithComputedProperties.get('mapBy'));
-assertType<boolean>(objectWithComputedProperties.get('match'));
-assertType<number>(objectWithComputedProperties.get('max'));
-assertType<number>(objectWithComputedProperties.get('min'));
-assertType<boolean>(objectWithComputedProperties.get('none'));
-assertType<boolean>(objectWithComputedProperties.get('not'));
-assertType<boolean>(objectWithComputedProperties.get('notEmpty'));
-assertType<unknown>(objectWithComputedProperties.get('oneWay'));
-assertType<unknown>(objectWithComputedProperties.get('or'));
-assertType<unknown>(objectWithComputedProperties.get('readOnly'));
-assertType<unknown>(objectWithComputedProperties.get('reads'));
-assertType<unknown[]>(objectWithComputedProperties.get('setDiff'));
-assertType<unknown[]>(objectWithComputedProperties.get('sort1'));
-assertType<unknown[]>(objectWithComputedProperties.get('sort2'));
-assertType<unknown[]>(objectWithComputedProperties.get('sort3'));
-assertType<number>(objectWithComputedProperties.get('sum'));
-assertType<unknown[]>(objectWithComputedProperties.get('union'));
-assertType<unknown[]>(objectWithComputedProperties.get('uniq'));
-assertType<unknown[]>(objectWithComputedProperties.get('uniqBy'));
+  // @ts-expect-error
+  @uniqBy declare uniqByTest1: number;
+  // @ts-expect-error
+  @uniqBy() declare uniqByTest2: number;
+  // @ts-expect-error
+  @uniqBy('values') declare uniqByTest3: number;
+  @uniqBy('values', 'id') declare uniqByTest4: number;
+}
diff --git a/types/preview/@ember/object/test/core.ts b/types/preview/@ember/object/test/core.ts
index 650e2c22066..ce913dcf889 100644
--- a/types/preview/@ember/object/test/core.ts
+++ b/types/preview/@ember/object/test/core.ts
@@ -28,11 +28,11 @@ co3.bar; // $ExpectType number
 
 /** .extend with a zero-argument .create()  */
 const co4 = CoreObject.extend({
-    foo: '123',
-    bar: 456,
-    baz(): [string, number] {
-        return [this.foo, this.bar];
-    },
+  foo: '123',
+  bar: 456,
+  baz(): [string, number] {
+    return [this.foo, this.bar];
+  },
 }).create();
 
 co4.foo; // $ExpectType string
@@ -41,11 +41,11 @@ co4.baz; // $ExpectType () => [string, number]
 
 /** .extend with inconsistent arguments passed into .create()  */
 const class05 = CoreObject.extend({
-    foo: '123' as string | boolean,
-    bar: 456,
-    baz() {
-        return [this.foo, this.bar];
-    },
+  foo: '123' as string | boolean,
+  bar: 456,
+  baz() {
+    return [this.foo, this.bar];
+  },
 });
 // @ts-expect-error
 const c05 = class05.create({ foo: 99 });
@@ -58,35 +58,35 @@ assertType<boolean>(c05c.foo);
 
 /** two .extend arguments with a zero-argument .create() */
 const co6 = CoreObject.extend(
-    {
-        foo: '123',
-        bar: 456,
-        baz() {
-            return [this.foo, this.bar];
-        },
-        func1() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.foo; // $ExpectType string
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.bee;
-        },
+  {
+    foo: '123',
+    bar: 456,
+    baz() {
+      return [this.foo, this.bar];
     },
-    {
-        foo: 99,
-        bee: 'honey',
-        func2() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-            this.foo;
-            // this includes stuff from earlier extend-args
-            this.bar; // $ExpectType number
-        },
+    func1() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      this.foo; // $ExpectType string
+      // this does not include stuff from later extend args
+      // @ts-expect-error
+      this.bee;
     },
+  },
+  {
+    foo: 99,
+    bee: 'honey',
+    func2() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+      this.foo;
+      // this includes stuff from earlier extend-args
+      this.bar; // $ExpectType number
+    },
+  }
 ).create();
 
 // TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
@@ -96,48 +96,48 @@ assertType<() => Array<string | number>>(co6.baz); // $ExpectType () => (string
 
 /** three .extend arguments with a zero-argument .create() */
 const co7 = CoreObject.extend(
-    {
-        foo: '123',
-        bar: 456,
-        baz() {
-            return [this.foo, this.bar];
-        },
-        func1() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.foo; // $ExpectType string
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.bee;
-        },
+  {
+    foo: '123',
+    bar: 456,
+    baz() {
+      return [this.foo, this.bar];
+    },
+    func1() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      this.foo; // $ExpectType string
+      // this does not include stuff from later extend args
+      // @ts-expect-error
+      this.bee;
     },
-    {
-        foo: 99,
-        bee: 'honey',
-        func2() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-            this.foo;
-            // this includes stuff from earlier extend-args
-            this.bar; // $ExpectType number
-        },
+  },
+  {
+    foo: 99,
+    bee: 'honey',
+    func2() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+      this.foo;
+      // this includes stuff from earlier extend-args
+      this.bar; // $ExpectType number
     },
-    {
-        foo: '99',
-        money: 'in the banana stand',
-        func3() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.money; // $ExpectType string
-            // this includes stuff from earlier extend-args
-            this.bee; // $ExpectType string
-            this.bar; // $ExpectType number
-        },
+  },
+  {
+    foo: '99',
+    money: 'in the banana stand',
+    func3() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      this.money; // $ExpectType string
+      // this includes stuff from earlier extend-args
+      this.bee; // $ExpectType string
+      this.bar; // $ExpectType number
     },
+  }
 ).create();
 // TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
 // assertType<number>(co7.foo); // @ts-expect-error
@@ -147,68 +147,68 @@ assertType<() => Array<string | number>>(co7.baz); // $ExpectType () => (string
 
 /** four .extend arguments with a zero-argument .create() */
 const co8 = CoreObject.extend(
-    {
-        foo: '123',
-        bar: 456,
-        baz() {
-            return [this.foo, this.bar];
-        },
-        func1() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.foo; // $ExpectType string
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.bee;
-        },
+  {
+    foo: '123',
+    bar: 456,
+    baz() {
+      return [this.foo, this.bar];
+    },
+    func1() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      this.foo; // $ExpectType string
+      // this does not include stuff from later extend args
+      // @ts-expect-error
+      this.bee;
     },
-    {
-        foo: 99,
-        bee: 'honey',
-        func2() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-            this.foo;
-            // this includes stuff from earlier extend-args
-            this.bar; // $ExpectType number
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.money;
-        },
+  },
+  {
+    foo: 99,
+    bee: 'honey',
+    func2() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
+      this.foo;
+      // this includes stuff from earlier extend-args
+      this.bar; // $ExpectType number
+      // this does not include stuff from later extend args
+      // @ts-expect-error
+      this.money;
     },
-    {
-        foo: '99',
-        money: 'in the banana stand',
-        func3() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.money; // $ExpectType string
-            // this includes stuff from earlier extend-args
-            this.bee; // $ExpectType string
-            this.bar; // $ExpectType number
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.neighborhood;
-        },
+  },
+  {
+    foo: '99',
+    money: 'in the banana stand',
+    func3() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      this.money; // $ExpectType string
+      // this includes stuff from earlier extend-args
+      this.bee; // $ExpectType string
+      this.bar; // $ExpectType number
+      // this does not include stuff from later extend args
+      // @ts-expect-error
+      this.neighborhood;
     },
-    {
-        foo: '99',
-        neighborhood: 'sudden valley',
-        func4() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.neighborhood; // $ExpectType string
-            // this includes stuff from earlier extend-args
-            this.bee; // $ExpectType string
-            this.bar; // $ExpectType number
-            this.money; // $ExpectType string
-        },
+  },
+  {
+    foo: '99',
+    neighborhood: 'sudden valley',
+    func4() {
+      // this includes stuff from CoreObject
+      this.init; // $ExpectType () => void
+      // this includes stuff from this extend-arg
+      this.neighborhood; // $ExpectType string
+      // this includes stuff from earlier extend-args
+      this.bee; // $ExpectType string
+      this.bar; // $ExpectType number
+      this.money; // $ExpectType string
     },
+  }
 ).create();
 
 // TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
diff --git a/types/preview/@ember/object/test/octane.ts b/types/preview/@ember/object/test/octane.ts
deleted file mode 100644
index adc1526aff8..00000000000
--- a/types/preview/@ember/object/test/octane.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-import { action, computed, default as EmberObject } from '@ember/object';
-import {
-  alias,
-  and,
-  bool,
-  collect,
-  deprecatingAlias,
-  empty,
-  equal,
-  filter,
-  filterBy,
-  gt,
-  gte,
-  intersect,
-  lt,
-  lte,
-  map,
-  mapBy,
-  match,
-  max,
-  min,
-  none,
-  not,
-  notEmpty,
-  oneWay,
-  or,
-  readOnly,
-  reads,
-  setDiff,
-  sort,
-  sum,
-  union,
-  uniq,
-  uniqBy,
-} from '@ember/object/computed';
-
-function customMacro(message: string) {
-  return computed(() => {
-    return [message, message];
-  });
-}
-
-// Native class syntax
-class Foo extends EmberObject {
-  declare firstName: string;
-  declare lastName: string;
-
-  // @ts-expect-error -- action only works on methods
-  @action
-  bar!: string;
-
-  @computed('firstName', 'lastName')
-  get fullName() {
-    return `${this.firstName} ${this.lastName}`;
-  }
-
-  // @ts-expect-error -- we require this to be with a getter.
-  @computed('firstName', 'lastName')
-  declare badFullName: string;
-
-  @computed('fullName', function (this: Foo) {
-    return this.fullName.toUpperCase();
-  })
-  declare bigFullName: string;
-
-  @customMacro('hi')
-  declare hiTwice: string[];
-
-  @action
-  foo() {
-    /* no op demo */
-  }
-}
-
-// Computed property macros
-
-class Bar extends EmberObject {
-  declare firstName: string;
-  declare last: string;
-
-  declare values: number[];
-
-  // @ts-expect-error
-  @alias declare aliasTest0: string;
-  // @ts-expect-error
-  @alias() declare aliasTest1: string;
-  @alias('firstName') declare aliasTest2: string;
-
-  // @ts-expect-error
-  @and declare andTest0: boolean;
-  @and() declare andTest1: boolean;
-  @and('firstName') declare andTest2: boolean;
-  @and('firstName', 'lastName') declare andTest3: boolean;
-
-  // @ts-expect-error
-  @bool declare boolTest0: boolean;
-  // @ts-expect-error
-  @bool() declare boolTest1: boolean;
-  @bool('firstName') declare boolTest2: boolean;
-
-  // @ts-expect-error
-  @collect declare collectTest0: any;
-  @collect() declare collectTest1: any;
-  @collect('firstName') declare collectTest2: any;
-
-  // @ts-expect-error
-  @deprecatingAlias declare deprecatingAliasTest0: string;
-  // @ts-expect-error
-  @deprecatingAlias() declare deprecatingAliasTest1: string;
-  // @ts-expect-error
-  @deprecatingAlias('firstName') declare deprecatingAliasTest2: string;
-  @deprecatingAlias('firstName', { id: 'deprecate-everything', until: 'v5.0.0' })
-  declare deprecatingAliasTest3: string;
-
-  // @ts-expect-error
-  @empty declare emptyTest0: boolean;
-  // @ts-expect-error
-  @empty() declare emptyTest1: boolean;
-  @empty('firstName') declare emptyTest2: boolean;
-
-  // @ts-expect-error
-  @equal declare equalTest0: boolean;
-  // @ts-expect-error
-  @equal() declare equalTest1: boolean;
-  // @ts-expect-error
-  @equal('firstName') declare equalTest2: boolean;
-  @equal('firstName', 'lastName') declare equalTest3: boolean;
-
-  // @ts-expect-error
-  @filter declare filterTest1: string[];
-  // @ts-expect-error
-  @filter() declare filterTest2: string[];
-  // @ts-expect-error
-  @filter('firstName') declare filterTest3: string[];
-  @filter('firstName', Boolean) declare filterTest4: string[];
-  // @ts-expect-error
-  @filter('firstName', 'secondName', (x) => x) declare filterTest5: string[];
-  @filter('firstName', ['secondName'], Boolean) declare filterTest6: string[];
-
-  // @ts-expect-error
-  @filterBy declare filterByTest1: any[];
-  // @ts-expect-error
-  @filterBy() declare filterByTest2: any[];
-  // @ts-expect-error
-  @filterBy('firstName') declare filterByTest3: any[];
-  @filterBy('firstName', 'id') declare filterByTest4: any[];
-
-  // @ts-expect-error
-  @gt declare gtTest1: boolean;
-  // @ts-expect-error
-  @gt() declare gtTest2: boolean;
-  // @ts-expect-error
-  @gt('firstName') declare gtTest3: boolean;
-  @gt('firstName', 3) declare gtTest4: boolean;
-
-  // @ts-expect-error
-  @gte declare gteTest1: boolean;
-  // @ts-expect-error
-  @gte() declare gteTest2: boolean;
-  // @ts-expect-error
-  @gte('firstName') declare gteTest3: boolean;
-  @gte('firstName', 3) declare gteTest4: boolean;
-
-  // @ts-expect-error
-  @intersect declare intersectTest1: any;
-  @intersect() declare intersectTest2: any;
-  @intersect('firstName') declare intersectTest3: any;
-  @intersect('firstName', 'lastName') declare intersectTest4: any;
-
-  // @ts-expect-error
-  @lt declare ltTest1: boolean;
-  // @ts-expect-error
-  @lt() declare ltTest2: boolean;
-  // @ts-expect-error
-  @lt('firstName') declare ltTest3: boolean;
-  @lt('firstName', 3) declare ltTest4: boolean;
-
-  // @ts-expect-error
-  @lte declare lteTest1: boolean;
-  // @ts-expect-error
-  @lte() declare lteTest2: boolean;
-  // @ts-expect-error
-  @lte('firstName') declare lteTest3: boolean;
-  @lte('firstName', 3) declare lteTest4: boolean;
-
-  // @ts-expect-error
-  @map declare mapTest1: string[];
-  // @ts-expect-error
-  @map() declare mapTest2: string[];
-  // @ts-expect-error
-  @map('firstName') declare mapTest3: string[];
-  @map('firstName', (x) => x) declare mapTest4: string[];
-
-  // @ts-expect-error
-  @mapBy declare mapByTest1: any[];
-  // @ts-expect-error
-  @mapBy() declare mapByTest2: any[];
-  // @ts-expect-error
-  @mapBy('firstName') declare mapByTest3: any[];
-  @mapBy('firstName', 'id') declare mapByTest4: any[];
-
-  // @ts-expect-error
-  @match declare matchTest1: boolean;
-  // @ts-expect-error
-  @match() declare matchTest2: boolean;
-  // @ts-expect-error
-  @match('firstName') declare matchTest3: boolean;
-  // @ts-expect-error
-  @match('firstName', 'abc') declare matchTest4: boolean;
-  @match('firstName', /\s+/) declare matchTest5: boolean;
-
-  // @ts-expect-error
-  @max declare maxTest1: number;
-  // @ts-expect-error
-  @max() declare maxTest2: number;
-  @max('values') declare maxTest3: number;
-  // @ts-expect-error
-  @max('values', 'a') declare maxTest4: number;
-
-  // @ts-expect-error
-  @min declare minTest1: number;
-  // @ts-expect-error
-  @min() declare minTest2: number;
-  @min('values') declare minTest3: number;
-  // @ts-expect-error
-  @min('values', 'a') declare minTest4: number;
-
-  // @ts-expect-error
-  @none declare noneTest1: number;
-  // @ts-expect-error
-  @none() declare noneTest2: number;
-  @none('values') declare noneTest3: number;
-  // @ts-expect-error
-  @none('values', 'a') declare noneTest4: number;
-
-  // @ts-expect-error
-  @not declare notTest1: number;
-  // @ts-expect-error
-  @not() declare notTest2: number;
-  @not('values') declare notTest3: number;
-  // @ts-expect-error
-  @not('values', 'a') declare notTest4: number;
-
-  // @ts-expect-error
-  @notEmpty declare notEmptyTest1: boolean;
-  // @ts-expect-error
-  @notEmpty() declare notEmptyTest2: boolean;
-  @notEmpty('firstName') declare notEmptyTest3: boolean;
-  // @ts-expect-error
-  @notEmpty('firstName', 'a') declare notEmptyTest4: boolean;
-
-  // @ts-expect-error
-  @oneWay declare oneWayTest1: boolean;
-  // @ts-expect-error
-  @oneWay() declare oneWayTest2: boolean;
-  @oneWay('firstName') declare oneWayTest3: boolean;
-  // @ts-expect-error
-  @oneWay('firstName', 'b') declare oneWayTest4: boolean;
-
-  // @ts-expect-error
-  @or declare orTest1: boolean;
-  @or() declare orTest2: boolean;
-  @or('firstName') declare orTest3: boolean;
-  @or('firstName', 'lastName') declare orTest4: boolean;
-
-  // @ts-expect-error
-  @readOnly declare readOnlyTest1: boolean;
-  // @ts-expect-error
-  @readOnly() declare readOnlyTest2: boolean;
-  @readOnly('firstName') declare readOnlyTest3: boolean;
-
-  // @ts-expect-error
-  @reads declare readsTest1: boolean;
-  // @ts-expect-error
-  @reads() declare readsTest2: boolean;
-  @reads('firstName') declare readsTest3: boolean;
-  // @ts-expect-error
-  @reads('firstName', 'a') declare readsTest4: boolean;
-
-  // @ts-expect-error
-  @setDiff declare setDiffTest1: number;
-  // @ts-expect-error
-  @setDiff() declare setDiffTest2: number;
-  // @ts-expect-error
-  @setDiff('values') declare setDiffTest3: number;
-  @setDiff('values', 'otherThing') declare setDiffTest4: number;
-  // @ts-expect-error
-  @setDiff('values', 'otherThing', 'a') declare setDiffTest5: number;
-
-  // @ts-expect-error
-  @sort declare sortTest1: number;
-  // @ts-expect-error
-  @sort() declare sortTest2: number;
-  // @ts-expect-error
-  @sort('values') declare sortTest3: number;
-  @sort('values', 'id') declare sortTest4: number;
-  // @ts-expect-error
-  @sort('values', 'id', 'a') declare sortTest5: number;
-  @sort('values', (a: number, b: number) => a - b) declare sortTest6: number;
-  @sort('values', ['id'], (a: number, b: number) => a - b) declare sortTest7: number;
-  // @ts-expect-error
-  @sort('values', 'id', (a, b) => a - b) declare sortTest8: number;
-  // @ts-expect-error
-  @sort(['id'], (a, b) => a - b) declare sortTest9: number;
-
-  // @ts-expect-error
-  @sum declare sumTest1: number;
-  // @ts-expect-error
-  @sum() declare sumTest2: number;
-  @sum('values') declare sumTest3: number;
-
-  // @ts-expect-error
-  @union declare unionTest1: any;
-  @union() declare unionTest2: any;
-  @union('firstName') declare unionTest3: any;
-  @union('firstName', 'lastName') declare unionTest4: any;
-
-  // @ts-expect-error
-  @uniq declare uniqTest1: number;
-  // @ts-expect-error
-  @uniq() declare uniqTest2: number;
-  @uniq('values') declare uniqTest3: number;
-
-  // @ts-expect-error
-  @uniqBy declare uniqByTest1: number;
-  // @ts-expect-error
-  @uniqBy() declare uniqByTest2: number;
-  // @ts-expect-error
-  @uniqBy('values') declare uniqByTest3: number;
-  @uniqBy('values', 'id') declare uniqByTest4: number;
-}
diff --git a/types/preview/@ember/routing/test/router.ts b/types/preview/@ember/routing/test/router.ts
index 0ef27748380..fab3ba98b8b 100755
--- a/types/preview/@ember/routing/test/router.ts
+++ b/types/preview/@ember/routing/test/router.ts
@@ -1,81 +1,87 @@
 import Router from '@ember/routing/router';
 import Service, { inject as service } from '@ember/service';
 import EmberObject, { get } from '@ember/object';
+import RouterService from '@ember/routing/router-service';
+import RouteInfo from '@ember/routing/route-info';
+
+import { expectTypeOf } from 'expect-type';
 
 const AppRouter = Router.extend({});
 
 AppRouter.map(function () {
+  this.route('index', { path: '/' });
+  this.route('about');
+  this.route('favorites', { path: '/favs' });
+  this.route('posts', function () {
     this.route('index', { path: '/' });
-    this.route('about');
-    this.route('favorites', { path: '/favs' });
-    this.route('posts', function () {
-        this.route('index', { path: '/' });
-        this.route('new');
-        this.route('post', { path: '/post/:post_id', resetNamespace: true });
-        this.route('comments', { resetNamespace: true }, function () {
-            this.route('new');
-        });
-    });
-    this.route('photo', { path: '/photo/:id' }, function () {
-        this.route('comment', { path: '/comment/:id' });
+    this.route('new');
+    this.route('post', { path: '/post/:post_id', resetNamespace: true });
+    this.route('comments', { resetNamespace: true }, function () {
+      this.route('new');
     });
-    this.route('not-found', { path: '/*path' });
-    this.mount('my-engine');
-    this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine' });
+  });
+  this.route('photo', { path: '/photo/:id' }, function () {
+    this.route('comment', { path: '/comment/:id' });
+  });
+  this.route('not-found', { path: '/*path' });
+  this.mount('my-engine');
+  this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine' });
 });
 
-const RouterServiceConsumer = Service.extend({
-    router: service('router'),
-    currentRouteName() {
-        const x: string = get(this, 'router').currentRouteName;
-    },
-    currentURL() {
-        const x: string = get(this, 'router').currentURL;
-    },
-    rootURL() {
-        const x: string = get(this, 'router').rootURL;
-    },
-    transitionWithoutModel() {
-        get(this, 'router').transitionTo('some-route');
-    },
-    transitionWithModel() {
-        const model = EmberObject.create();
-        get(this, 'router').transitionTo('some.other.route', model);
-    },
-    transitionWithMultiModel() {
-        const model = EmberObject.create();
-        get(this, 'router').transitionTo('some.other.route', model, model);
-    },
-    transitionWithModelAndOptions() {
-        const model = EmberObject.create();
-        get(this, 'router').transitionTo('index', model, { queryParams: { search: 'ember' } });
-    },
-    onAndRouteInfo() {
-        const router = get(this, 'router');
-        router
-            .on('routeWillChange', transition => {
-                const to = transition.to;
-                to.child; // $ExpectType RouteInfo | null
-                to.localName; // $ExpectType string
-                to.name; // $ExpectType string
-                to.paramNames; // $ExpectType string[]
-                to.params.foo; // $ExpectType string | undefined
-                to.parent; // $ExpectType RouteInfo | null
-                to.queryParams.foo; // $ExpectType string | undefined
-                to.find(info => info.name === 'foo'); // $ExpectType RouteInfo | undefined
-            })
-            .on('routeDidChange', transition => {
-                const from = transition.from;
-                if (from) {
-                    from.child; // $ExpectType RouteInfo | null
-                    from.localName; // $ExpectType string
-                    from.name; // $ExpectType string
-                    from.paramNames; // $ExpectType string[]
-                    from.params.foo; // $ExpectType string | undefined
-                    from.parent; // $ExpectType RouteInfo | null
-                    from.queryParams.foo; // $ExpectType string | undefined
-                    from.find(info => info.name === 'foo'); // $ExpectType RouteInfo | undefined
-                }
-            });
-    },
-});
+class RouterServiceConsumer extends Service {
+  @service('router') declare router: RouterService;
+  currentRouteName() {
+    expectTypeOf(get(this, 'router').currentRouteName).toEqualTypeOf<string>();
+  }
+  currentURL() {
+    expectTypeOf(get(this, 'router').currentURL).toEqualTypeOf<string>();
+  }
+  rootURL() {
+    expectTypeOf(get(this, 'router').rootURL).toEqualTypeOf<string>();
+  }
+  transitionWithoutModel() {
+    get(this, 'router').transitionTo('some-route');
+  }
+  transitionWithModel() {
+    const model = EmberObject.create();
+    get(this, 'router').transitionTo('some.other.route', model);
+  }
+  transitionWithMultiModel() {
+    const model = EmberObject.create();
+    get(this, 'router').transitionTo('some.other.route', model, model);
+  }
+  transitionWithModelAndOptions() {
+    const model = EmberObject.create();
+    get(this, 'router').transitionTo('index', model, { queryParams: { search: 'ember' } });
+  }
+  onAndRouteInfo() {
+    const router = get(this, 'router');
+    router
+      .on('routeWillChange', (transition) => {
+        const to = transition.to;
+        expectTypeOf(to.child).toEqualTypeOf<RouteInfo | null>();
+        expectTypeOf(to.localName).toEqualTypeOf<string>();
+        expectTypeOf(to.name).toEqualTypeOf<string>();
+        expectTypeOf(to.paramNames).toEqualTypeOf<string[]>();
+        expectTypeOf(to.params['foo']).toEqualTypeOf<string | undefined>();
+        expectTypeOf(to.parent).toEqualTypeOf<RouteInfo | null>();
+        expectTypeOf(to.queryParams['foo']).toEqualTypeOf<string | undefined>();
+        expectTypeOf(to.find((info) => info.name === 'foo')).toEqualTypeOf<RouteInfo | undefined>();
+      })
+      .on('routeDidChange', (transition) => {
+        const from = transition.from;
+        if (from) {
+          expectTypeOf(from.child).toEqualTypeOf<RouteInfo | null>();
+          expectTypeOf(from.localName).toEqualTypeOf<string>();
+          expectTypeOf(from.name).toEqualTypeOf<string>();
+          expectTypeOf(from.paramNames).toEqualTypeOf<string[]>();
+          expectTypeOf(from.params['foo']).toEqualTypeOf<string | undefined>();
+          expectTypeOf(from.parent).toEqualTypeOf<RouteInfo | null>();
+          expectTypeOf(from.queryParams['foo']).toEqualTypeOf<string | undefined>();
+          expectTypeOf(from.find((info) => info.name === 'foo')).toEqualTypeOf<
+            RouteInfo | undefined
+          >();
+        }
+      });
+  }
+}
diff --git a/types/preview/@ember/string/ember__string-tests.ts b/types/preview/@ember/string/ember__string-tests.ts
new file mode 100644
index 00000000000..bd5f513b4c2
--- /dev/null
+++ b/types/preview/@ember/string/ember__string-tests.ts
@@ -0,0 +1,52 @@
+import {
+  dasherize,
+  camelize,
+  capitalize,
+  classify,
+  decamelize,
+  underscore,
+  w,
+} from '@ember/string';
+import { expectTypeOf } from 'expect-type';
+
+// @ts-expect-error
+dasherize();
+expectTypeOf(dasherize('blue man group')).toEqualTypeOf<string>();
+// @ts-expect-error
+dasherize('', '');
+
+// @ts-expect-error
+camelize();
+expectTypeOf(camelize('blue man group')).toEqualTypeOf<string>();
+// @ts-expect-error
+camelize('', '');
+
+// @ts-expect-error
+decamelize();
+expectTypeOf(decamelize('blue man group')).toEqualTypeOf<string>();
+// @ts-expect-error
+decamelize('', '');
+
+// @ts-expect-error
+underscore();
+expectTypeOf(underscore('blue man group')).toEqualTypeOf<string>();
+// @ts-expect-error
+underscore('', '');
+
+// @ts-expect-error
+w();
+expectTypeOf(w('blue man group')).toEqualTypeOf<Array<string>>();
+// @ts-expect-error
+w('', '');
+
+// @ts-expect-error
+classify();
+expectTypeOf(classify('blue man group')).toEqualTypeOf<string>();
+// @ts-expect-error
+classify('', '');
+
+// @ts-expect-error
+capitalize();
+expectTypeOf(capitalize('blue man group')).toEqualTypeOf<string>();
+// @ts-expect-error
+capitalize('', '');
diff --git a/types/preview/@ember/string/index.d.ts b/types/preview/@ember/string/index.d.ts
new file mode 100644
index 00000000000..6a6f95b8ed5
--- /dev/null
+++ b/types/preview/@ember/string/index.d.ts
@@ -0,0 +1,7 @@
+export function camelize(str: string): string;
+export function capitalize(str: string): string;
+export function classify(str: string): string;
+export function dasherize(str: string): string;
+export function decamelize(str: string): string;
+export function underscore(str: string): string;
+export function w(str: string): string[];
diff --git a/types/preview/@ember/string/tsconfig.json b/types/preview/@ember/string/tsconfig.json
new file mode 100644
index 00000000000..4082f16a5d9
--- /dev/null
+++ b/types/preview/@ember/string/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../../tsconfig.json"
+}
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index 7fa5d54e922..a3210233f40 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -147,7 +147,7 @@ export namespace Ember {
 
   const Evented: typeof EmberObjectEventedNs.default;
 
-  class Mixin<T, Base = EmberObjectNs.default> extends EmberMixin<T, Base> {}
+  class Mixin extends EmberMixin {}
 
   /**
    * A Namespace is an object usually used to contain other objects or methods
@@ -162,7 +162,7 @@ export namespace Ember {
     target: unknown;
     actionContext: unknown;
   }
-  const ViewTargetActionSupport: Mixin<ViewTargetActionSupport>;
+  const ViewTargetActionSupport: Mixin;
   const ViewUtils: {
     isSimpleClick(event: Event): boolean;
   };
@@ -242,10 +242,8 @@ export namespace Ember {
      * Creates a property that lazily looks up another controller in the container.
      * Can only be used when defining another controller.
      */
-    function controller(): ComputedProperty<Controller>;
-    function controller<K extends keyof ControllerRegistry>(
-      name: K
-    ): ComputedProperty<ControllerRegistry[K]>;
+    function controller(): Controller;
+    function controller<K extends keyof ControllerRegistry>(name: K): ControllerRegistry[K];
     const service: typeof EmberServiceNs.inject;
   }
   namespace ENV {
diff --git a/types/preview/ember/test/computed.ts b/types/preview/ember/test/computed.ts
index 8d5ff6f0eec..24cbba4eaf0 100755
--- a/types/preview/ember/test/computed.ts
+++ b/types/preview/ember/test/computed.ts
@@ -1,192 +1,100 @@
 import Ember from 'ember';
-import Component from '@ember/component';
-import Computed, { alias, or } from '@ember/object/computed';
-import { assertType } from './lib/assert';
-
-const Person = Ember.Object.extend({
-    firstName: '',
-    lastName: '',
-    age: 0,
-
-    noArgs: Ember.computed<string>(() => 'test'),
-
-    fullName: Ember.computed<string>('firstName', 'lastName', function () {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    }),
-
-    fullNameReadonly: Ember.computed<string>('fullName', function () {
-        return this.get('fullName');
-    }).readOnly(),
-
-    fullNameWritable: Ember.computed<string>('firstName', 'lastName', {
-        get() {
-            return this.get('fullName');
-        },
-        set(key, value) {
-            const [first, last] = value.split(' ');
-            this.set('firstName', first);
-            this.set('lastName', last);
-            return value;
-        },
-    }),
-
-    fullNameGetOnly: Ember.computed<string>('fullName', {
-        get() {
-            return this.get('fullName');
-        },
-    }),
-
-    fullNameSetOnly: Ember.computed<string>('firstName', 'lastName', {
-        set(key, value) {
-            const [first, last] = value.split(' ');
-            this.set('firstName', first);
-            this.set('lastName', last);
-            return value;
-        },
-    }),
-
-    combinators: Ember.computed<string>(function () {
-        return this.get('firstName');
-    })
-        .property('firstName')
-        .meta({ foo: 'bar' })
-        .volatile()
-        .readOnly(),
-
-    explicitlyDeclared: alias('fullName') as Computed<string>,
-});
+import { expectTypeOf } from 'expect-type';
+
+function customMacro(message: string) {
+  return Ember.computed(() => {
+    return [message, message];
+  });
+}
+
+class Person extends Ember.Object {
+  firstName = '';
+  lastName = '';
+  age = 0;
+
+  // Equivalent to a per-instance `defineProperty` call.
+  @Ember.computed()
+  get noArgs() {
+    return 'test';
+  }
+
+  @Ember.computed('firstName', 'lastName')
+  get fullName(): string {
+    return `${this.get('firstName')} ${this.get('lastName')}`;
+  }
+
+  @Ember.computed('fullName').readOnly()
+  get fullNameReadonly() {
+    return this.get('fullName');
+  }
+
+  @Ember.computed('firstName', 'lastName')
+  get fullNameWritable(): string {
+    return this.get('fullName');
+  }
+
+  set fullNameWritable(value: string) {
+    const [first, last] = value.split(' ');
+    this.set('firstName', first);
+    this.set('lastName', last);
+  }
+
+  @Ember.computed().meta({ foo: 'bar' }).readOnly()
+  get combinators() {
+    return this.get('firstName');
+  }
+
+  @customMacro('hi')
+  declare hiTwice: string[];
+}
 
 const person = Person.create({
-    firstName: 'Fred',
-    lastName: 'Smith',
-    age: 29,
+  firstName: 'Fred',
+  lastName: 'Smith',
+  age: 29,
 });
 
-assertType<string>(person.firstName);
-assertType<number>(person.age);
-assertType<Ember.ComputedProperty<string>>(person.noArgs);
-assertType<Ember.ComputedProperty<string>>(person.fullName);
-assertType<Ember.ComputedProperty<string>>(person.fullNameReadonly);
-assertType<Ember.ComputedProperty<string>>(person.fullNameWritable);
-assertType<Ember.ComputedProperty<string>>(person.fullNameGetOnly);
-assertType<Ember.ComputedProperty<string>>(person.fullNameSetOnly);
-assertType<Ember.ComputedProperty<string>>(person.combinators);
-assertType<Ember.ComputedProperty<string>>(person.explicitlyDeclared);
-
-assertType<string>(person.get('firstName'));
-assertType<number>(person.get('age'));
-assertType<string>(person.get('noArgs'));
-assertType<string>(person.get('fullName'));
-assertType<string>(person.get('fullNameReadonly'));
-assertType<string>(person.get('fullNameWritable'));
-assertType<string>(person.get('fullNameGetOnly'));
-assertType<string>(person.get('fullNameSetOnly'));
-assertType<string>(person.get('combinators'));
-assertType<string>(person.get('explicitlyDeclared'));
-
-assertType<{ firstName: string; fullName: string; age: number }>(person.getProperties('firstName', 'fullName', 'age'));
+expectTypeOf(person.firstName).toEqualTypeOf<string>();
+expectTypeOf(person.age).toEqualTypeOf<number>();
+expectTypeOf(person.noArgs).toEqualTypeOf<string>();
+expectTypeOf(person.fullName).toEqualTypeOf<string>();
+expectTypeOf(person.fullNameReadonly).toEqualTypeOf<string>();
+expectTypeOf(person.fullNameWritable).toEqualTypeOf<string>();
+expectTypeOf(person.combinators).toEqualTypeOf<string>();
+
+expectTypeOf(person.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person.get('age')).toEqualTypeOf<number>();
+expectTypeOf(person.get('noArgs')).toEqualTypeOf<string>();
+expectTypeOf(person.get('fullName')).toEqualTypeOf<string>();
+expectTypeOf(person.get('fullNameReadonly')).toEqualTypeOf<string>();
+expectTypeOf(person.get('fullNameWritable')).toEqualTypeOf<string>();
+expectTypeOf(person.get('combinators')).toEqualTypeOf<string>();
+
+expectTypeOf(person.getProperties('firstName', 'fullName', 'age')).toMatchTypeOf<{
+  firstName: string;
+  fullName: string;
+  age: number;
+}>();
 
 const person2 = Person.create({
-    fullName: 'Fred Smith',
+  fullName: 'Fred Smith',
 });
 
-assertType<string>(person2.get('firstName'));
-assertType<string>(person2.get('fullName'));
+expectTypeOf(person2.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person2.get('fullName')).toEqualTypeOf<string>();
 
 const person3 = Person.extend({
-    firstName: 'Fred',
-    fullName: 'Fred Smith',
+  firstName: 'Fred',
+  fullName: 'Fred Smith',
 }).create();
 
-assertType<string>(person3.get('firstName'));
-assertType<string>(person3.get('fullName'));
+expectTypeOf(person3.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person3.get('fullName')).toEqualTypeOf<string>();
 
 const person4 = Person.extend({
-    firstName: Ember.computed(() => 'Fred'),
-    fullName: Ember.computed(() => 'Fred Smith'),
-}).create();
-
-assertType<string>(person4.get('firstName'));
-assertType<string>(person4.get('fullName'));
-
-// computed property macros
-const objectWithComputedProperties = Ember.Object.extend({
-    alias: Ember.computed.alias('foo'),
-    and: Ember.computed.and('foo', 'bar', 'baz', 'qux'),
-    bool: Ember.computed.bool('foo'),
-    collect: Ember.computed.collect('foo', 'bar', 'baz', 'qux'),
-    deprecatingAlias: Ember.computed.deprecatingAlias('foo', {
-        id: 'hamster.deprecate-banana',
-        until: '3.0.0',
-    }),
-    empty: Ember.computed.empty('foo'),
-    equalNumber: Ember.computed.equal('foo', 1),
-    equalString: Ember.computed.equal('foo', 'bar'),
-    equalObject: Ember.computed.equal('foo', {}),
-    filter: Ember.computed.filter('foo', item => item === 'bar'),
-    filterBy1: Ember.computed.filterBy('foo', 'bar'),
-    filterBy2: Ember.computed.filterBy('foo', 'bar', false),
-    gt: Ember.computed.gt('foo', 3),
-    gte: Ember.computed.gte('foo', 3),
-    intersect: Ember.computed.intersect('foo', 'bar', 'baz', 'qux'),
-    lt: Ember.computed.lt('foo', 3),
-    lte: Ember.computed.lte('foo', 3),
-    map: Ember.computed.map('foo', (item, index) => item),
-    mapBy: Ember.computed.mapBy('foo', 'bar'),
-    match: Ember.computed.match('foo', /^tom.ter$/),
-    max: Ember.computed.max('foo'),
-    min: Ember.computed.min('foo'),
-    none: Ember.computed.none('foo'),
-    not: Ember.computed.not('foo'),
-    notEmpty: Ember.computed.notEmpty('foo'),
-    oneWay: Ember.computed.oneWay('foo'),
-    or: Ember.computed.or('foo', 'bar', 'baz', 'qux'),
-    readOnly: Ember.computed.readOnly('foo'),
-    reads: Ember.computed.reads('foo'),
-    setDiff: Ember.computed.setDiff('foo', 'bar'),
-    sort1: Ember.computed.sort('foo', 'bar'),
-    sort2: Ember.computed.sort('foo', (itemA, itemB) => {
-        return `${itemA}`.length - `${itemB}`.length;
-    }),
-    sum: Ember.computed.sum('foo'),
-    union: Ember.computed.union('foo', 'bar', 'baz', 'qux'),
-    uniq: Ember.computed.uniq('foo'),
-    uniqBy: Ember.computed.uniqBy('foo', 'bar'),
+  firstName: Ember.computed(() => 'Fred'),
+  fullName: Ember.computed(() => 'Fred Smith'),
 }).create();
 
-assertType<unknown>(objectWithComputedProperties.get('alias'));
-assertType<unknown>(objectWithComputedProperties.get('and'));
-assertType<boolean>(objectWithComputedProperties.get('bool'));
-assertType<unknown[]>(objectWithComputedProperties.get('collect'));
-assertType<unknown>(objectWithComputedProperties.get('deprecatingAlias'));
-assertType<boolean>(objectWithComputedProperties.get('empty'));
-assertType<boolean>(objectWithComputedProperties.get('equalNumber'));
-assertType<boolean>(objectWithComputedProperties.get('equalString'));
-assertType<boolean>(objectWithComputedProperties.get('equalObject'));
-assertType<unknown[]>(objectWithComputedProperties.get('filter'));
-assertType<unknown[]>(objectWithComputedProperties.get('filterBy1'));
-assertType<unknown[]>(objectWithComputedProperties.get('filterBy2'));
-assertType<boolean>(objectWithComputedProperties.get('gt'));
-assertType<boolean>(objectWithComputedProperties.get('gte'));
-assertType<unknown[]>(objectWithComputedProperties.get('intersect'));
-assertType<boolean>(objectWithComputedProperties.get('lt'));
-assertType<boolean>(objectWithComputedProperties.get('lte'));
-assertType<unknown[]>(objectWithComputedProperties.get('map'));
-assertType<unknown[]>(objectWithComputedProperties.get('mapBy'));
-assertType<boolean>(objectWithComputedProperties.get('match'));
-assertType<number>(objectWithComputedProperties.get('max'));
-assertType<number>(objectWithComputedProperties.get('min'));
-assertType<boolean>(objectWithComputedProperties.get('none'));
-assertType<boolean>(objectWithComputedProperties.get('not'));
-assertType<boolean>(objectWithComputedProperties.get('notEmpty'));
-assertType<unknown>(objectWithComputedProperties.get('oneWay'));
-assertType<unknown>(objectWithComputedProperties.get('or'));
-assertType<unknown>(objectWithComputedProperties.get('readOnly'));
-assertType<unknown>(objectWithComputedProperties.get('reads'));
-assertType<unknown[]>(objectWithComputedProperties.get('setDiff'));
-assertType<unknown[]>(objectWithComputedProperties.get('sort1'));
-assertType<unknown[]>(objectWithComputedProperties.get('sort2'));
-assertType<number>(objectWithComputedProperties.get('sum'));
-assertType<unknown[]>(objectWithComputedProperties.get('union'));
-assertType<unknown[]>(objectWithComputedProperties.get('uniq'));
-assertType<unknown[]>(objectWithComputedProperties.get('uniqBy'));
+expectTypeOf(person4.get('firstName')).toEqualTypeOf<string>();
+expectTypeOf(person4.get('fullName')).toEqualTypeOf<string>();
diff --git a/types/preview/ember/test/helper.ts b/types/preview/ember/test/helper.ts
index 433ddbd0637..2cfc4141a60 100755
--- a/types/preview/ember/test/helper.ts
+++ b/types/preview/ember/test/helper.ts
@@ -1,45 +1,44 @@
 import Ember from 'ember';
 
 const FormatCurrencyHelper = Ember.Helper.helper((params: [number], hash: { currency: string }) => {
-    const cents = params[0];
-    const currency = hash.currency;
-    return `${currency}${cents * 0.01}`;
+  const cents = params[0];
+  const currency = hash.currency;
+  return `${currency}${cents * 0.01}`;
 });
 
 class User extends Ember.Object {
-    declare email: string;
+  declare email: string;
 }
 
 class SessionService extends Ember.Service {
-    declare currentUser: User;
+  declare currentUser: User;
 }
 
 declare module '@ember/service' {
-    interface Registry {
-        session: SessionService;
-    }
+  interface Registry {
+    session: SessionService;
+  }
 }
 
-const CurrentUserEmailHelper = Ember.Helper.extend({
-    session: Ember.inject.service('session'),
-    onNewUser: Ember.observer('session.currentUser', function (this: Ember.Helper) {
-        this.recompute();
-    }),
-    compute(): string {
-        return this.get('session').get('currentUser').get('email');
-    },
-});
+class CurrentUserEmailHelper extends Ember.Helper {
+  @Ember.inject.service('session')
+  declare session: SessionService;
+
+  compute(): string {
+    return this.get('session').get('currentUser').get('email');
+  }
+}
 
 import { helper } from '@ember/component/helper';
 
 function typedHelp(/*params, hash*/) {
-    return 'my type of help';
+  return 'my type of help';
 }
 
 export default helper(typedHelp);
 
 function arrayNumHelp(/*params, hash*/) {
-    return [1, 2, 3];
+  return [1, 2, 3];
 }
 
 helper(arrayNumHelp);
diff --git a/types/preview/ember/test/mixin.ts b/types/preview/ember/test/mixin.ts
index ccb71d14ef1..1fb85c78d9d 100755
--- a/types/preview/ember/test/mixin.ts
+++ b/types/preview/ember/test/mixin.ts
@@ -1,36 +1,37 @@
 import Ember from 'ember';
 import { assertType } from './lib/assert';
 
-interface EditableMixin {
-    edit(): void;
-    isEditing: boolean;
+interface EditableMixin extends Ember.Mixin {
+  edit(): void;
+  isEditing: boolean;
 }
 
-const EditableMixin = Ember.Mixin.create<EditableMixin, Ember.Route>({
-    edit() {
-        this.get('controller');
-        console.log('starting to edit');
-        this.set('isEditing', true);
-    },
-    isEditing: false,
+const EditableMixin = Ember.Mixin.create({
+  edit(this: EditableMixin & Ember.Object) {
+    this.get('controller');
+    console.log('starting to edit');
+    this.set('isEditing', true);
+  },
+  isEditing: false,
 });
 
-const EditableComment = Ember.Route.extend(EditableMixin, {
-    postId: 0,
+interface EditableComment extends EditableMixin {}
+class EditableComment extends Ember.Route.extend(EditableMixin) {
+  postId = 0;
 
-    canEdit() {
-        return !this.isEditing;
-    },
+  canEdit() {
+    return !this.isEditing;
+  }
 
-    tryEdit() {
-        if (this.canEdit()) {
-            this.edit();
-        }
-    },
-});
+  tryEdit() {
+    if (this.canEdit()) {
+      this.edit();
+    }
+  }
+}
 
 const comment = EditableComment.create({
-    postId: 42,
+  postId: 42,
 });
 
 comment.edit();
@@ -39,18 +40,26 @@ comment.tryEdit();
 assertType<boolean>(comment.isEditing);
 assertType<number>(comment.postId);
 
+// We do not expect this to update the type; we do expect it to minimally check
 const LiteralMixins = Ember.Object.extend({ a: 1 }, { b: 2 }, { c: 3 });
 const obj = LiteralMixins.create();
-assertType<number>(obj.a);
-assertType<number>(obj.b);
-assertType<number>(obj.c);
+// @ts-expect-error
+obj.a;
+// @ts-expect-error
+obj.b;
+// @ts-expect-error
+obj.c;
 
 /* Test composition of mixins */
+interface EditableAndCancelableMixin extends EditableMixin {
+  cancelled: boolean;
+}
 const EditableAndCancelableMixin = Ember.Mixin.create(EditableMixin, {
-    cancelled: false,
+  cancelled: false,
 });
 
-const EditableAndCancelableComment = Ember.Route.extend(EditableAndCancelableMixin);
+interface EditableAndCancelableComment extends EditableAndCancelableMixin {}
+class EditableAndCancelableComment extends Ember.Route.extend(EditableAndCancelableMixin) {}
 
 const editableAndCancelable = EditableAndCancelableComment.create();
 assertType<boolean>(editableAndCancelable.isEditing);
diff --git a/types/preview/ember/test/object.ts b/types/preview/ember/test/object.ts
index 9deb3df638d..98a8cd909b7 100755
--- a/types/preview/ember/test/object.ts
+++ b/types/preview/ember/test/object.ts
@@ -1,84 +1,88 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 
-const LifetimeHooks = Ember.Object.extend({
-    resource: undefined as {} | undefined,
+class LifetimeHooks extends Ember.Object {
+  resource: {} | undefined;
 
-    init() {
-        this._super();
-        this.resource = {};
-    },
+  init() {
+    this._super();
+    this.resource = {};
+  }
 
-    willDestroy() {
-        this.resource = undefined;
-        this._super();
-    },
-});
+  willDestroy() {
+    this.resource = undefined;
+    this._super();
+  }
+}
 
 class MyObject30 extends Ember.Object {
-    constructor() {
-        super();
-    }
+  constructor() {
+    super();
+  }
 }
 
 class MyObject31 extends Ember.Object {
-    constructor(properties: object) {
-        super(properties);
-    }
+  constructor(properties: object) {
+    super(properties);
+  }
 }
 
-class Foo extends Ember.Object.extend({
-    a: Ember.computed({
-        get() {
-            return '';
-        },
-        set(key: string, newVal: string) {
-            return '';
-        },
-    }),
-}) {
-    b = 5;
-    baz() {
-        const y = this.b; // $ExpectType number
-        const z = this.a; // $ExpectType ComputedProperty<string, string>
-        this.b = 10;
-        this.get('b').toFixed(4); // $ExpectType string
-        this.set('a', 'abc').split(','); // $ExpectType string[]
-        this.set('b', 10).toFixed(4); // $ExpectType string
+class Foo extends Ember.Object {
+  @Ember.computed()
+  get a() {
+    return '';
+  }
+
+  set a(newVal: string) {
+    /* no-op */
+  }
+
+  b = 5;
+
+  baz() {
+    const y = this.b; // $ExpectType number
+    const z = this.a; // $ExpectType ComputedProperty<string, string>
+    this.b = 10;
+    this.get('b').toFixed(4); // $ExpectType string
+    this.set('a', 'abc').split(','); // $ExpectType string[]
+    this.set('b', 10).toFixed(4); // $ExpectType string
 
-        this.setProperties({ b: 11 });
-        // this.setProperties({ b: '11' }); // @ts-expect-error
-        this.setProperties({
-            a: 'def',
-            b: 11,
-        });
-    }
+    this.setProperties({ b: 11 });
+    // this.setProperties({ b: '11' }); // @ts-expect-error
+    this.setProperties({
+      a: 'def',
+      b: 11,
+    });
+  }
 }
 
 export class Foo2 extends Ember.Object {
-    name!: string;
+  name = '';
 
-    changeName(name: string) {
-        const a: string = this.set('name', name);
-        // @ts-expect-error
-        const b: number = this.set('name', name);
-        const x: string = Ember.set(this, 'name', name);
-        // @ts-expect-error
-        const y: number = Ember.set(this, 'name', name);
-        this.setProperties({
-            name,
-        });
-        Ember.setProperties(this, {
-            name,
-        });
-    }
+  changeName(name: string) {
+    expectTypeOf(this.set('name', name)).toEqualTypeOf<string>();
+    // This is checking for assignability; `expectTypeOf` doesn't work correctly
+    // here because TS isn't resolving `this['name']` eagerly, and so it is not
+    // (currently) possible for the type utility to match it.
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const x: string = Ember.set(this, 'name', name);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const y: string = Ember.get(this, 'name');
+    this.setProperties({
+      name,
+    });
+    Ember.setProperties(this, {
+      name,
+    });
+  }
 
-    bar() {
-        Ember.notifyPropertyChange(this, 'name');
-        // @ts-expect-error
-        Ember.notifyPropertyChange(this);
-        // @ts-expect-error
-        Ember.notifyPropertyChange('name');
-        // @ts-expect-error
-        Ember.notifyPropertyChange(this, 'name', 'bar');
-    }
+  bar() {
+    Ember.notifyPropertyChange(this, 'name');
+    // @ts-expect-error
+    Ember.notifyPropertyChange(this);
+    // @ts-expect-error
+    Ember.notifyPropertyChange('name');
+    // @ts-expect-error
+    Ember.notifyPropertyChange(this, 'name', 'bar');
+  }
 }
diff --git a/types/preview/ember/test/observable.ts b/types/preview/ember/test/observable.ts
index b8c339b4aed..afb5aadf508 100755
--- a/types/preview/ember/test/observable.ts
+++ b/types/preview/ember/test/observable.ts
@@ -39,24 +39,30 @@ myComponent.addObserver('foo', null, () => {});
 myComponent.set('foo', 'baz');
 expectTypeOf(myComponent.get('foo')).toEqualTypeOf<string>();
 
-const person = Ember.Object.create({
+class Person extends Ember.Object {
+  name = '';
+  age = 0;
+
+  @Ember.computed()
+  get capitalized() {
+    return this.get('name').toUpperCase();
+  }
+}
+const person = Person.create({
   name: 'Fred',
   age: 29,
-  capitalized: Ember.computed<string>(function () {
-    return this.get('name').toUpperCase();
-  }),
 });
 
 const pojo = { name: 'Fred', age: 29 };
 
 function testGet() {
-  assertType<string>(Ember.get(person, 'name'));
-  assertType<number>(Ember.get(person, 'age'));
-  assertType<string>(Ember.get(person, 'capitalized'));
-  assertType<string>(person.get('name'));
-  assertType<number>(person.get('age'));
-  assertType<string>(person.get('capitalized'));
-  assertType<string>(Ember.get(pojo, 'name'));
+  expectTypeOf(Ember.get(person, 'name')).toEqualTypeOf<string>();
+  expectTypeOf(Ember.get(person, 'age')).toEqualTypeOf<number>();
+  expectTypeOf(Ember.get(person, 'capitalized')).toEqualTypeOf<string>();
+  expectTypeOf(person.get('name')).toEqualTypeOf<string>();
+  expectTypeOf(person.get('age')).toEqualTypeOf<number>();
+  expectTypeOf(person.get('capitalized')).toEqualTypeOf<string>();
+  expectTypeOf(Ember.get(pojo, 'name')).toEqualTypeOf<string>();
 }
 
 function testGetProperties() {
@@ -101,14 +107,14 @@ function testSetProperties() {
 
 function testDynamic() {
   const obj: Record<string, string> = {};
-  const dynamicKey: string = 'dummy'; // tslint:disable-line:no-inferrable-types
+  const dynamicKey = 'dummy' as string;
 
-  assertType<string | undefined>(Ember.get(obj, 'dummy'));
-  assertType<string | undefined>(Ember.get(obj, dynamicKey));
-  assertType<{ dummy: string | undefined }>(Ember.getProperties(obj, 'dummy'));
-  assertType<{ dummy: string | undefined }>(Ember.getProperties(obj, ['dummy']));
-  assertType<Record<string, string>>(Ember.getProperties(obj, dynamicKey));
-  assertType<Record<string, string>>(Ember.getProperties(obj, [dynamicKey]));
+  expectTypeOf(Ember.get(obj, 'dummy')).toEqualTypeOf<string | undefined>();
+  expectTypeOf(Ember.get(obj, dynamicKey)).toEqualTypeOf<string | undefined>();
+  expectTypeOf(Ember.getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string | undefined }>();
+  expectTypeOf(Ember.getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
+  expectTypeOf(Ember.getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(Ember.getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
   assertType<string | undefined>(Ember.set(obj, 'dummy', 'value'));
   assertType<string | undefined>(Ember.set(obj, dynamicKey, 'value'));
   assertType<{ dummy: string | undefined }>(Ember.setProperties(obj, { dummy: 'value ' }));
diff --git a/types/preview/ember/test/private/computed-tests.ts b/types/preview/ember/test/private/computed-tests.ts
index c0c83772383..a3f61025ac2 100644
--- a/types/preview/ember/test/private/computed-tests.ts
+++ b/types/preview/ember/test/private/computed-tests.ts
@@ -1,92 +1,30 @@
 import Ember from 'ember';
-import {
-    UnwrapComputedPropertySetters,
-    UnwrapComputedPropertyGetters,
-    UnwrapComputedPropertySetter,
-    UnwrapComputedPropertyGetter,
-} from '@ember/object/-private/types';
-import { assertType } from '../lib/assert';
 
-class Example1 extends Ember.Object.extend({
-    firstName: '',
-    lastName: '',
-    allNames: Ember.computed('fullName', function () {
-        return [this.fullName];
-    }) as Ember.ComputedProperty<string[]>,
-    fullName: Ember.computed('firstName', 'lastName', function () {
-        // tslint:disable-next-line:no-unnecessary-type-assertion
-        return `${this.firstName} ${this.lastName}` as string;
-    }),
-}) {}
+class Example1 extends Ember.Object {
+  firstName = '';
+  lastName = '';
 
-declare const unwrappedGetters1: UnwrapComputedPropertyGetters<Example1>;
-unwrappedGetters1.firstName; // $ExpectType string
-unwrappedGetters1.lastName; // $ExpectType string
-unwrappedGetters1.fullName; // $ExpectType string
-unwrappedGetters1.allNames; // $ExpectType string[]
+  @Ember.computed('fullName')
+  get allNames() {
+    return [this.fullName];
+  }
 
-declare const unwrappedSetters1: UnwrapComputedPropertySetters<Example1>;
-unwrappedSetters1.firstName; // $ExpectType string
-unwrappedSetters1.lastName; // $ExpectType string
-unwrappedSetters1.fullName; // $ExpectType string
-unwrappedSetters1.allNames; // $ExpectType string[]
-
-class Example2 extends Ember.Object.extend({
-    allNames: Ember.computed('fullName', function () {
-        return [this.fullName + ''];
-    }),
-    fullName: Ember.computed('firstName', 'lastName', function () {
-        // tslint:disable-next-line:no-unnecessary-type-assertion
-        return `${this.firstName} ${this.lastName}` as string;
-    }),
-}) {
-    firstName = '';
-    lastName = '';
-    foo() {
-        this.fullName; // $ExpectType ComputedProperty<string, string>
-        this.allNames; // $ExpectType ComputedProperty<string[], string[]>
-        this.firstName; // $ExpectType string
-        this.lastName; // $ExpectType string
-
-        this.get('fullName').split(','); // $ExpectType string[]
-        this.get('allNames')[0]; // $ExpectType string
-        this.get('firstName').split(','); // $ExpectType string[]
-        this.get('lastName').split(','); // $ExpectType string[]
-    }
+  @Ember.computed('firstName', 'lastName')
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
 }
-const ex2 = new Example2();
-
-declare const unwrappedGetters2: UnwrapComputedPropertyGetters<typeof ex2>;
-assertType<string>(unwrappedGetters2.firstName); // $ExpectType string
-assertType<string>(unwrappedGetters2.lastName); // $ExpectType string
-assertType<string>(unwrappedGetters2.fullName); // $ExpectType string
-assertType<string[]>(unwrappedGetters2.allNames); // $ExpectType string[]
 
-declare const unwrappedSetters2: UnwrapComputedPropertySetters<typeof ex2>;
-assertType<string>(unwrappedSetters2.firstName); // $ExpectType string
-assertType<string>(unwrappedSetters2.lastName); // $ExpectType string
-assertType<string>(unwrappedSetters2.fullName); // $ExpectType string
-assertType<string[]>(unwrappedSetters2.allNames); // $ExpectType string[]
-
-ex2.fullName; // $ExpectType ComputedProperty<string, string>
-ex2.allNames; // $ExpectType ComputedProperty<string[], string[]>
-ex2.firstName; // $ExpectType string
-
-type UnwStringSet = UnwrapComputedPropertySetter<string>; // $ExpectType string
-type UnwStringGet = UnwrapComputedPropertyGetter<string>; // $ExpectType string
-// $ExpectType string
-type UnwCpStringSet1 = UnwrapComputedPropertySetter<Ember.ComputedProperty<string>>;
-// $ExpectType string
-type UnwCpStringGet1 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<string>>;
-// $ExpectType string
-type UnwCpStringSet2 = UnwrapComputedPropertySetter<Ember.ComputedProperty<string, string>>;
-// $ExpectType string
-type UnwCpStringGet2 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<string, string>>;
-// $ExpectType string
-type UnwCpStringSet3 = UnwrapComputedPropertySetter<Ember.ComputedProperty<number, string>>;
-// $ExpectType number
-type UnwCpStringGet3 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<number, string>>;
-// $ExpectType number
-type UnwCpStringSet4 = UnwrapComputedPropertySetter<Ember.ComputedProperty<string, number>>;
-// $ExpectType string
-type UnwCpStringGet4 = UnwrapComputedPropertyGetter<Ember.ComputedProperty<string, number>>;
+class Example2 extends Example1 {
+  foo() {
+    this.fullName; // $ExpectType ComputedProperty<string, string>
+    this.allNames; // $ExpectType ComputedProperty<string[], string[]>
+    this.firstName; // $ExpectType string
+    this.lastName; // $ExpectType string
+
+    this.get('fullName').split(','); // $ExpectType string[]
+    this.get('allNames')[0]; // $ExpectType string
+    this.get('firstName').split(','); // $ExpectType string[]
+    this.get('lastName').split(','); // $ExpectType string[]
+  }
+}
diff --git a/types/preview/ember/test/reopen.ts b/types/preview/ember/test/reopen.ts
index 08300aec1ca..2df9f538d16 100755
--- a/types/preview/ember/test/reopen.ts
+++ b/types/preview/ember/test/reopen.ts
@@ -1,64 +1,79 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 import { assertType } from './lib/assert';
 
-type Person = typeof Person.prototype;
-const Person = Ember.Object.extend({
-    name: '',
-    sayHello() {
-        alert(`Hello. My name is ${this.get('name')}`);
-    },
-});
+class Person extends Ember.Object {
+  name = '';
+
+  sayHello() {
+    alert(`Hello. My name is ${this.get('name')}`);
+  }
+}
 
-assertType<Person>(Person.reopen());
+expectTypeOf(Person.reopen()).toMatchTypeOf<typeof Person>();
 
-assertType<string>(Person.create().name);
-Person.create().sayHello(); // $ExpectType void
+expectTypeOf(Person.create().name).toEqualTypeOf<string>();
+expectTypeOf(Person.create().sayHello()).toBeVoid();
 
+// Here, a basic check that `reopenClass` *works*, but we intentionally do not
+// provide types for how it changes the original class (as spec'd in RFC 0800).
 const Person2 = Person.reopenClass({
-    species: 'Homo sapiens',
+  species: 'Homo sapiens',
 
-    createPerson(name: string): Person {
-        return Person.create({ name });
-    },
+  createPerson(name: string): Person {
+    return Person.create({ name });
+  },
 });
 
-assertType<string>(Person2.create().name);
-Person2.create().sayHello(); // $ExpectType void
-assertType<string>(Person2.species);
+// The original class types are carried along
+expectTypeOf(Person2.create().name).toEqualTypeOf<string>();
+expectTypeOf(Person2.create().sayHello()).toBeVoid();
+// But we aren't trying to merge in new classes anymore.
+// @ts-expect-error
+Person2.species;
 
 const tom = Person2.create({
-    name: 'Tom Dale',
+  name: 'Tom Dale',
 });
 
 // @ts-expect-error
 const badTom = Person2.create({ name: 99 });
 
+// @ts-expect-error
 const yehuda = Person2.createPerson('Yehuda Katz');
 
 tom.sayHello(); // "Hello. My name is Tom Dale"
 yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+// @ts-expect-error
 alert(Person2.species); // "Homo sapiens"
 
+// The same goes for `.reopen()`: it will "work" in a bare minimum sense, but it
+// will not try to change the types.
 const Person3 = Person2.reopen({
-    goodbyeMessage: 'goodbye',
+  goodbyeMessage: 'goodbye',
 
-    sayGoodbye() {
-        alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
-    },
+  sayGoodbye(this: Person) {
+    alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
+  },
 });
 
 const person3 = Person3.create();
 person3.get('name');
 person3.get('goodbyeMessage');
 person3.sayHello();
+// @ts-expect-error
 person3.sayGoodbye();
 
 interface AutoResizeMixin {
-    resizable: true;
+  resizable: true;
 }
 const AutoResizeMixin = Ember.Mixin.create({ resizable: true });
 
+// And the same here.
 const Reopened = Ember.Object.reopenClass({ a: 1 }, { b: 2 }, { c: 3 });
-assertType<number>(Reopened.a);
-assertType<number>(Reopened.b);
-assertType<number>(Reopened.c);
+// @ts-expect-error
+Reopened.a;
+// @ts-expect-error
+Reopened.b;
+// @ts-expect-error
+Reopened.c;
diff --git a/types/preview/ember/test/route.ts b/types/preview/ember/test/route.ts
index 28f127888b4..e532cfbbc05 100755
--- a/types/preview/ember/test/route.ts
+++ b/types/preview/ember/test/route.ts
@@ -8,90 +8,79 @@ import Transition from '@ember/routing/transition';
 Ember.Transition;
 
 interface Post extends Ember.Object {
-    title: string;
+  title: string;
 }
 
 interface Posts extends Array<Post> {}
 
-Route.extend({
-    beforeModel(transition: Transition) {
-        this.transitionTo('someOtherRoute');
-    },
-});
+class Test extends Route {
+  queryParams = {
+    memberQp: { refreshModel: true },
+  };
 
-Route.extend({
-    afterModel(posts: Posts, transition: Transition) {
-        if (posts.firstObject) {
-            this.transitionTo('post.show', posts.firstObject);
-        }
-    },
-});
+  beforeModel(transition: Transition) {
+    this.transitionTo('someOtherRoute');
+  }
 
-Ember.Route.extend({
-    model() {
-        return this.modelFor('post');
-    },
-});
+  model() {
+    return this.modelFor('post');
+  }
 
-Route.extend({
-    queryParams: {
-        memberQp: { refreshModel: true },
-    },
-});
-
-Route.extend({
-    resetController(controller: Ember.Controller, isExiting: boolean, transition: boolean) {
-        if (isExiting) {
-            //   controller.set('page', 1);
-        }
-    },
-});
+  afterModel(posts: Posts, transition: Transition) {
+    if (posts.firstObject) {
+      this.transitionTo('post.show', posts.firstObject);
+    }
+  }
 
-Route.extend({
-    setupController(controller: Ember.Controller, model: {}) {
-        this._super(controller, model);
-        this.controllerFor('application').set('model', model);
-    },
-});
+  setupController(controller: Ember.Controller, model: {}) {
+    this._super(controller, model);
+    this.controllerFor('application').set('model', model);
+  }
 
-class RouteUsingClass extends Route.extend({
-    randomProperty: 'the .extend + extends bit type-checks properly',
-}) {
-    beforeModel() {
-        return Promise.resolve('beforeModel can return promises');
-    }
-    afterModel(resolvedModel: unknown, transition: Transition) {
-        return Promise.resolve('afterModel can also return promises');
-    }
-    intermediateTransitionWithoutModel() {
-        this.intermediateTransitionTo('some-route');
-    }
-    intermediateTransitionWithModel() {
-        this.intermediateTransitionTo('some.other.route', {});
-    }
-    intermediateTransitionWithMultiModel() {
-        this.intermediateTransitionTo('some.other.route', 1, 2, {});
+  resetController(controller: Ember.Controller, isExiting: boolean, transition: Transition) {
+    if (isExiting) {
+      //   controller.set('page', 1);
     }
+  }
+
+  intermediateTransitionWithoutModel() {
+    this.intermediateTransitionTo('some-route');
+  }
+  intermediateTransitionWithModel() {
+    this.intermediateTransitionTo('some.other.route', {});
+  }
+  intermediateTransitionWithMultiModel() {
+    this.intermediateTransitionTo('some.other.route', 1, 2, {});
+  }
+}
+
+class ReturningPromises extends Route {
+  beforeModel() {
+    return Promise.resolve('beforeModel can return promises');
+  }
+  afterModel(resolvedModel: unknown, transition: Transition) {
+    return Promise.resolve('afterModel can also return promises');
+  }
 }
 
 class WithNonReturningBeforeAndModelHooks extends Route {
-    beforeModel(transition: Transition): void | Promise<unknown> {
-        return;
-    }
+  beforeModel(transition: Transition): void | Promise<unknown> {
+    return;
+  }
 
-    afterModel(resolvedModel: unknown, transition: Transition): void {
-        return;
-    }
+  afterModel(resolvedModel: unknown, transition: Transition): void {
+    return;
+  }
 }
 
 class WithBadReturningBeforeAndModelHooks extends Route {
-    beforeModel(transition: Transition): void | Promise<unknown> {
-        // @ts-expect-error
-        return "returning anything else is nonsensical (if 'legal')";
-    }
+  beforeModel(transition: Transition): void | Promise<unknown> {
+    // @ts-expect-error
+    return "returning anything else is nonsensical (if 'legal')";
+  }
 
-    afterModel(resolvedModel: unknown, transition: Transition): void {
-        // @ts-expect-error
-        return "returning anything else is nonsensical (if 'legal')";
-    }
+  afterModel(resolvedModel: unknown, transition: Transition): void {
+    // @ts-expect-error
+    return "returning anything else is nonsensical (if 'legal')";
+  }
 }
diff --git a/types/preview/ember/test/router.ts b/types/preview/ember/test/router.ts
index 105a8d75264..2519b2af204 100755
--- a/types/preview/ember/test/router.ts
+++ b/types/preview/ember/test/router.ts
@@ -1,49 +1,52 @@
+import RouterService from '@ember/routing/router-service';
 import Ember from 'ember';
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 
 const AppRouter = Ember.Router.extend({});
 
 AppRouter.map(function () {
+  this.route('index', { path: '/' });
+  this.route('about');
+  this.route('favorites', { path: '/favs' });
+  this.route('posts', function () {
     this.route('index', { path: '/' });
-    this.route('about');
-    this.route('favorites', { path: '/favs' });
-    this.route('posts', function () {
-        this.route('index', { path: '/' });
-        this.route('new');
-        this.route('post', { path: '/post/:post_id', resetNamespace: true });
-        this.route('comments', { resetNamespace: true }, function () {
-            this.route('new');
-        });
+    this.route('new');
+    this.route('post', { path: '/post/:post_id', resetNamespace: true });
+    this.route('comments', { resetNamespace: true }, function () {
+      this.route('new');
     });
-    this.route('photo', { path: '/photo/:id' }, function () {
-        this.route('comment', { path: '/comment/:id' });
-    });
-    this.route('not-found', { path: '/*path' });
-    this.mount('my-engine');
-    this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine' });
+  });
+  this.route('photo', { path: '/photo/:id' }, function () {
+    this.route('comment', { path: '/comment/:id' });
+  });
+  this.route('not-found', { path: '/*path' });
+  this.mount('my-engine');
+  this.mount('my-engine', { as: 'some-other-engine', path: '/some-other-engine' });
 });
 
-const RouterServiceConsumer = Ember.Service.extend({
-    router: Ember.inject.service('router'),
-    currentRouteName() {
-        const x: string = Ember.get(this, 'router').currentRouteName;
-    },
-    currentURL() {
-        const x: string = Ember.get(this, 'router').currentURL;
-    },
-    transitionWithoutModel() {
-        Ember.get(this, 'router').transitionTo('some-route');
-    },
-    transitionWithModel() {
-        const model = Ember.Object.create();
-        Ember.get(this, 'router').transitionTo('some.other.route', model);
-    },
-    transitionWithMultiModel() {
-        const model = Ember.Object.create();
-        Ember.get(this, 'router').transitionTo('some.other.route', model, model);
-    },
-    transitionWithModelAndOptions() {
-        const model = Ember.Object.create();
-        Ember.get(this, 'router').transitionTo('index', model, { queryParams: { search: 'ember' } });
-    },
-});
+class RouterServiceConsumer extends Ember.Service {
+  @Ember.inject.service('router')
+  declare router: RouterService;
+
+  currentRouteName() {
+    expectTypeOf(Ember.get(this, 'router').currentRouteName).toEqualTypeOf<string>();
+  }
+  currentURL() {
+    expectTypeOf(Ember.get(this, 'router').currentURL).toEqualTypeOf<string>();
+  }
+  transitionWithoutModel() {
+    Ember.get(this, 'router').transitionTo('some-route');
+  }
+  transitionWithModel() {
+    const model = Ember.Object.create();
+    Ember.get(this, 'router').transitionTo('some.other.route', model);
+  }
+  transitionWithMultiModel() {
+    const model = Ember.Object.create();
+    Ember.get(this, 'router').transitionTo('some.other.route', model, model);
+  }
+  transitionWithModelAndOptions() {
+    const model = Ember.Object.create();
+    Ember.get(this, 'router').transitionTo('index', model, { queryParams: { search: 'ember' } });
+  }
+}

From 061f2b3ee7601df64f72ce0f0f84f77afd015dd0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Sun, 28 Aug 2022 20:43:39 -0600
Subject: [PATCH 1088/1405] Rework preview type tests for `@ember/object/core`

---
 types/preview/@ember/object/test/core.ts | 199 +++--------------------
 1 file changed, 19 insertions(+), 180 deletions(-)

diff --git a/types/preview/@ember/object/test/core.ts b/types/preview/@ember/object/test/core.ts
index ce913dcf889..2030d672887 100644
--- a/types/preview/@ember/object/test/core.ts
+++ b/types/preview/@ember/object/test/core.ts
@@ -1,5 +1,5 @@
-import { assertType } from './lib/assert';
 import CoreObject from '@ember/object/core';
+import { expectTypeOf } from 'expect-type';
 
 /** Newable tests */
 const co1 = new CoreObject();
@@ -21,198 +21,37 @@ co2.destroy(); // $ExpectType CoreObject
 co2.toString(); // $ExpectType string
 
 /** .create tests w/ initial instance data passed in */
-const co3 = CoreObject.create({ foo: '123', bar: 456 });
+declare class CO3 extends CoreObject {
+  foo: string;
+  bar: number;
+}
+const co3 = CO3.create({ foo: '123', bar: 456 });
 
 co3.foo; // $ExpectType string
 co3.bar; // $ExpectType number
 
 /** .extend with a zero-argument .create()  */
-const co4 = CoreObject.extend({
-  foo: '123',
-  bar: 456,
+class CO4 extends CO3 {
   baz(): [string, number] {
     return [this.foo, this.bar];
-  },
-}).create();
+  }
+}
+const co4 = CO4.create();
 
 co4.foo; // $ExpectType string
 co4.bar; // $ExpectType number
 co4.baz; // $ExpectType () => [string, number]
 
 /** .extend with inconsistent arguments passed into .create()  */
-const class05 = CoreObject.extend({
-  foo: '123' as string | boolean,
-  bar: 456,
+class CO5 extends CoreObject {
+  foo: string | boolean = 'hello';
+  bar = 123;
   baz() {
     return [this.foo, this.bar];
-  },
-});
-// @ts-expect-error
-const c05 = class05.create({ foo: 99 });
-const c05b = class05.create({ foo: true });
-const c05c = class05.create({ foo: 'abc' });
-// @ts-expect-error
-assertType<string>(c05b.foo);
-// @ts-expect-error
-assertType<boolean>(c05c.foo);
-
-/** two .extend arguments with a zero-argument .create() */
-const co6 = CoreObject.extend(
-  {
-    foo: '123',
-    bar: 456,
-    baz() {
-      return [this.foo, this.bar];
-    },
-    func1() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      this.foo; // $ExpectType string
-      // this does not include stuff from later extend args
-      // @ts-expect-error
-      this.bee;
-    },
-  },
-  {
-    foo: 99,
-    bee: 'honey',
-    func2() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-      this.foo;
-      // this includes stuff from earlier extend-args
-      this.bar; // $ExpectType number
-    },
-  }
-).create();
-
-// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// assertType<string>(co6.foo); // @ts-expect-error
-assertType<number>(co6.bar); // $ExpectType number
-assertType<() => Array<string | number>>(co6.baz); // $ExpectType () => (string | number)[]
-
-/** three .extend arguments with a zero-argument .create() */
-const co7 = CoreObject.extend(
-  {
-    foo: '123',
-    bar: 456,
-    baz() {
-      return [this.foo, this.bar];
-    },
-    func1() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      this.foo; // $ExpectType string
-      // this does not include stuff from later extend args
-      // @ts-expect-error
-      this.bee;
-    },
-  },
-  {
-    foo: 99,
-    bee: 'honey',
-    func2() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-      this.foo;
-      // this includes stuff from earlier extend-args
-      this.bar; // $ExpectType number
-    },
-  },
-  {
-    foo: '99',
-    money: 'in the banana stand',
-    func3() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      this.money; // $ExpectType string
-      // this includes stuff from earlier extend-args
-      this.bee; // $ExpectType string
-      this.bar; // $ExpectType number
-    },
-  }
-).create();
-// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// assertType<number>(co7.foo); // @ts-expect-error
-assertType<number>(co7.bar); // $ExpectType number
-assertType<string>(co7.money); // $ExpectType string
-assertType<() => Array<string | number>>(co7.baz); // $ExpectType () => (string | number)[]
-
-/** four .extend arguments with a zero-argument .create() */
-const co8 = CoreObject.extend(
-  {
-    foo: '123',
-    bar: 456,
-    baz() {
-      return [this.foo, this.bar];
-    },
-    func1() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      this.foo; // $ExpectType string
-      // this does not include stuff from later extend args
-      // @ts-expect-error
-      this.bee;
-    },
-  },
-  {
-    foo: 99,
-    bee: 'honey',
-    func2() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-      this.foo;
-      // this includes stuff from earlier extend-args
-      this.bar; // $ExpectType number
-      // this does not include stuff from later extend args
-      // @ts-expect-error
-      this.money;
-    },
-  },
-  {
-    foo: '99',
-    money: 'in the banana stand',
-    func3() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      this.money; // $ExpectType string
-      // this includes stuff from earlier extend-args
-      this.bee; // $ExpectType string
-      this.bar; // $ExpectType number
-      // this does not include stuff from later extend args
-      // @ts-expect-error
-      this.neighborhood;
-    },
-  },
-  {
-    foo: '99',
-    neighborhood: 'sudden valley',
-    func4() {
-      // this includes stuff from CoreObject
-      this.init; // $ExpectType () => void
-      // this includes stuff from this extend-arg
-      this.neighborhood; // $ExpectType string
-      // this includes stuff from earlier extend-args
-      this.bee; // $ExpectType string
-      this.bar; // $ExpectType number
-      this.money; // $ExpectType string
-    },
   }
-).create();
-
-// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// assertType<number>(co8.foo); // @ts-expect-error
-assertType<number>(co8.bar); // $ExpectType number
-assertType<string>(co8.money); // $ExpectType string
-assertType<() => Array<string | number>>(co8.baz); // $ExpectType () => (string | number)[]
+}
+// @ts-expect-error
+class05.create({ foo: 99 });
+expectTypeOf(CO5.create({ foo: true })).toEqualTypeOf<CO5>();
+expectTypeOf(CO5.create({ foo: 'abc' })).toEqualTypeOf<CO5>();
+expectTypeOf(CO5.create().foo).toEqualTypeOf<boolean | string>();

From 19507dede997b7136ceb2bdba3d479d1005162c0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Sun, 28 Aug 2022 20:45:06 -0600
Subject: [PATCH 1089/1405] Support the same type tests in the Ember namespace
 as in `@ember/object`

---
 types/preview/ember/test/core-object.ts | 213 +++---------------------
 1 file changed, 27 insertions(+), 186 deletions(-)

diff --git a/types/preview/ember/test/core-object.ts b/types/preview/ember/test/core-object.ts
index df469143166..3cc7862c645 100644
--- a/types/preview/ember/test/core-object.ts
+++ b/types/preview/ember/test/core-object.ts
@@ -1,8 +1,10 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
+
+const { CoreObject } = Ember;
 
 /** Newable tests */
-const co1 = new Ember.CoreObject();
+const co1 = new CoreObject();
 
 // TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
 // co1.concatenatedProperties; // $ExpectType string[]
@@ -12,7 +14,7 @@ co1.destroy(); // $ExpectType CoreObject
 co1.toString(); // $ExpectType string
 
 /** .create tests */
-const co2 = Ember.CoreObject.create();
+const co2 = CoreObject.create();
 // TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
 // co2.concatenatedProperties; // $ExpectType string[]
 co2.isDestroyed; // $ExpectType boolean
@@ -21,198 +23,37 @@ co2.destroy(); // $ExpectType CoreObject
 co2.toString(); // $ExpectType string
 
 /** .create tests w/ initial instance data passed in */
-const co3 = Ember.CoreObject.create({ foo: '123', bar: 456 });
+declare class CO3 extends CoreObject {
+  foo: string;
+  bar: number;
+}
+const co3 = CO3.create({ foo: '123', bar: 456 });
 
 co3.foo; // $ExpectType string
 co3.bar; // $ExpectType number
 
 /** .extend with a zero-argument .create()  */
-const co4 = Ember.CoreObject.extend({
-    foo: '123',
-    bar: 456,
-    baz(): [string, number] {
-        return [this.foo, this.bar];
-    },
-}).create();
+class CO4 extends CO3 {
+  baz(): [string, number] {
+    return [this.foo, this.bar];
+  }
+}
+const co4 = CO4.create();
 
 co4.foo; // $ExpectType string
 co4.bar; // $ExpectType number
 co4.baz; // $ExpectType () => [string, number]
 
 /** .extend with inconsistent arguments passed into .create()  */
-const class05 = Ember.CoreObject.extend({
-    foo: '123' as string | boolean,
-    bar: 456,
-    baz() {
-        return [this.foo, this.bar];
-    },
-});
-// @ts-expect-error
-const c05 = class05.create({ foo: 99 });
-const c05b = class05.create({ foo: true });
-const c05c = class05.create({ foo: 'abc' });
+class CO5 extends CoreObject {
+  foo: string | boolean = 'hello';
+  bar = 123;
+  baz() {
+    return [this.foo, this.bar];
+  }
+}
 // @ts-expect-error
-assertType<string>(c05b.foo);
-// @ts-expect-error
-assertType<boolean>(c05c.foo);
-
-/** two .extend arguments with a zero-argument .create() */
-const co6 = Ember.CoreObject.extend(
-    {
-        foo: '123',
-        bar: 456,
-        baz() {
-            return [this.foo, this.bar];
-        },
-        func1() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.foo; // $ExpectType string
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.bee;
-        },
-    },
-    {
-        foo: 99,
-        bee: 'honey',
-        func2() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-            this.foo;
-            // this includes stuff from earlier extend-args
-            this.bar; // $ExpectType number
-        },
-    },
-).create();
-
-// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// assertType<string>(co6.foo); // @ts-expect-error
-assertType<number>(co6.bar); // $ExpectType number
-assertType<() => Array<string | number>>(co6.baz); // $ExpectType () => (string | number)[]
-
-/** three .extend arguments with a zero-argument .create() */
-const co7 = Ember.CoreObject.extend(
-    {
-        foo: '123',
-        bar: 456,
-        baz() {
-            return [this.foo, this.bar];
-        },
-        func1() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.foo; // $ExpectType string
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.bee;
-        },
-    },
-    {
-        foo: 99,
-        bee: 'honey',
-        func2() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-            this.foo;
-            // this includes stuff from earlier extend-args
-            this.bar; // $ExpectType number
-        },
-    },
-    {
-        foo: '99',
-        money: 'in the banana stand',
-        func3() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.money; // $ExpectType string
-            // this includes stuff from earlier extend-args
-            this.bee; // $ExpectType string
-            this.bar; // $ExpectType number
-        },
-    },
-).create();
-// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// assertType<number>(co7.foo); // @ts-expect-error
-assertType<number>(co7.bar); // $ExpectType number
-assertType<string>(co7.money); // $ExpectType string
-assertType<() => Array<string | number>>(co7.baz); // $ExpectType () => (string | number)[]
-
-/** four .extend arguments with a zero-argument .create() */
-const co8 = Ember.CoreObject.extend(
-    {
-        foo: '123',
-        bar: 456,
-        baz() {
-            return [this.foo, this.bar];
-        },
-        func1() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.foo; // $ExpectType string
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.bee;
-        },
-    },
-    {
-        foo: 99,
-        bee: 'honey',
-        func2() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            // TODO: switch to "$ExpectType number" in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-            this.foo;
-            // this includes stuff from earlier extend-args
-            this.bar; // $ExpectType number
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.money;
-        },
-    },
-    {
-        foo: '99',
-        money: 'in the banana stand',
-        func3() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.money; // $ExpectType string
-            // this includes stuff from earlier extend-args
-            this.bee; // $ExpectType string
-            this.bar; // $ExpectType number
-            // this does not include stuff from later extend args
-            // @ts-expect-error
-            this.neighborhood;
-        },
-    },
-    {
-        foo: '99',
-        neighborhood: 'sudden valley',
-        func4() {
-            // this includes stuff from CoreObject
-            this.init; // $ExpectType () => void
-            // this includes stuff from this extend-arg
-            this.neighborhood; // $ExpectType string
-            // this includes stuff from earlier extend-args
-            this.bee; // $ExpectType string
-            this.bar; // $ExpectType number
-            this.money; // $ExpectType string
-        },
-    },
-).create();
-
-// TODO: enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// assertType<number>(co8.foo); // @ts-expect-error
-assertType<number>(co8.bar); // $ExpectType number
-assertType<string>(co8.money); // $ExpectType string
-assertType<() => Array<string | number>>(co8.baz); // $ExpectType () => (string | number)[]
+class05.create({ foo: 99 });
+expectTypeOf(CO5.create({ foo: true })).toEqualTypeOf<CO5>();
+expectTypeOf(CO5.create({ foo: 'abc' })).toEqualTypeOf<CO5>();
+expectTypeOf(CO5.create().foo).toEqualTypeOf<boolean | string>();

From f730d9e0d1121e946de7c383b2089a5d951be15f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Sun, 28 Aug 2022 21:35:08 -0600
Subject: [PATCH 1090/1405] Fix preview type tests for @ember/object/observable

---
 .../preview/@ember/object/test/observable.ts  | 170 ++++++++++--------
 1 file changed, 98 insertions(+), 72 deletions(-)

diff --git a/types/preview/@ember/object/test/observable.ts b/types/preview/@ember/object/test/observable.ts
index 9d82e8de043..f28fe064ed7 100644
--- a/types/preview/@ember/object/test/observable.ts
+++ b/types/preview/@ember/object/test/observable.ts
@@ -1,102 +1,128 @@
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 import EmberObject, { computed, getProperties, get, setProperties, set } from '@ember/object';
 import { removeObserver, addObserver } from '@ember/object/observers';
 
 class MyComponent extends EmberObject {
-    foo = 'bar';
+  foo = 'bar';
 
-    init() {
-        this._super.apply(this);
-        this.addObserver('foo', this, 'fooDidChange');
-        this.addObserver('foo', this, this.fooDidChange);
-        addObserver(this, 'foo', this, 'fooDidChange');
-        addObserver(this, 'foo', this, this.fooDidChange);
-        this.removeObserver('foo', this, 'fooDidChange');
-        this.removeObserver('foo', this, this.fooDidChange);
-        removeObserver(this, 'foo', this, 'fooDidChange');
-        removeObserver(this, 'foo', this, this.fooDidChange);
-        const lambda = () => {
-            this.fooDidChange(this, 'foo');
-        };
-        this.addObserver('foo', lambda);
-        this.removeObserver('foo', lambda);
-        addObserver(this, 'foo', lambda);
-        removeObserver(this, 'foo', lambda);
-    }
+  init() {
+    this._super.apply(this);
+    this.addObserver('foo', this, 'fooDidChange');
+    this.addObserver('foo', this, this.fooDidChange);
+    addObserver(this, 'foo', this, 'fooDidChange');
+    addObserver(this, 'foo', this, this.fooDidChange);
+    this.removeObserver('foo', this, 'fooDidChange');
+    this.removeObserver('foo', this, this.fooDidChange);
+    removeObserver(this, 'foo', this, 'fooDidChange');
+    removeObserver(this, 'foo', this, this.fooDidChange);
+    const lambda = () => {
+      this.fooDidChange(this, 'foo');
+    };
+    this.addObserver('foo', lambda);
+    this.removeObserver('foo', lambda);
+    addObserver(this, 'foo', lambda);
+    removeObserver(this, 'foo', lambda);
+  }
 
-    fooDidChange(sender: this, key: string) {
-        // your code
-    }
+  fooDidChange(sender: this, key: string) {
+    // your code
+  }
 }
 
 const myComponent = MyComponent.create();
 myComponent.addObserver('foo', null, () => {});
 myComponent.set('foo', 'baz');
 
-const person = EmberObject.create({
-    name: 'Fred',
-    age: 29,
-    capitalized: computed<string>(function () {
-        return this.get('name').toUpperCase();
-    }),
-});
+class Person extends EmberObject {
+  name = 'Fred';
+  age = 29;
+
+  @computed()
+  get capitalized() {
+    return this.get('name').toUpperCase();
+  }
+}
+const person = Person.create();
 
 const pojo = { name: 'Fred', age: 29 };
 
 function testGet() {
-    assertType<string>(get(person, 'name'));
-    assertType<number>(get(person, 'age'));
-    assertType<string>(get(person, 'capitalized'));
-    assertType<string>(person.get('name'));
-    assertType<number>(person.get('age'));
-    assertType<string>(person.get('capitalized'));
-    assertType<string>(get(pojo, 'name'));
+  expectTypeOf(get(person, 'name')).toEqualTypeOf<string>();
+  expectTypeOf(get(person, 'age')).toEqualTypeOf<number>();
+  expectTypeOf(get(person, 'capitalized')).toEqualTypeOf<string>();
+  expectTypeOf(person.get('name')).toEqualTypeOf<string>();
+  expectTypeOf(person.get('age')).toEqualTypeOf<number>();
+  expectTypeOf(person.get('capitalized')).toEqualTypeOf<string>();
+  expectTypeOf(get(pojo, 'name')).toEqualTypeOf<string>();
 }
 
 function testGetProperties() {
-    assertType<{ name: string }>(getProperties(person, 'name'));
-    assertType<{ name: string; age: number }>(getProperties(person, 'name', 'age'));
-    assertType<{ name: string; age: number }>(getProperties(person, ['name', 'age']));
-    assertType<{ name: string; age: number; capitalized: string }>(getProperties(person, 'name', 'age', 'capitalized'));
-    assertType<{ name: string }>(person.getProperties('name'));
-    assertType<{ name: string; age: number }>(person.getProperties('name', 'age'));
-    assertType<{ name: string; age: number }>(person.getProperties(['name', 'age']));
-    assertType<{ name: string; age: number; capitalized: string }>(person.getProperties('name', 'age', 'capitalized'));
-    assertType<{ name: string; age: number }>(getProperties(pojo, 'name', 'age'));
+  expectTypeOf(getProperties(person, 'name')).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(getProperties(person, 'name', 'age')).toEqualTypeOf<{ name: string; age: number }>();
+  expectTypeOf(getProperties(person, ['name', 'age'])).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(getProperties(person, 'name', 'age', 'capitalized')).toEqualTypeOf<
+    Pick<Person, 'name' | 'age' | 'capitalized'>
+  >();
+  expectTypeOf(person.getProperties('name')).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(person.getProperties('name', 'age')).toEqualTypeOf<{ name: string; age: number }>();
+  expectTypeOf(person.getProperties(['name', 'age'])).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(person.getProperties('name', 'age', 'capitalized')).toEqualTypeOf<
+    Pick<Person, 'name' | 'age' | 'capitalized'>
+  >();
+  expectTypeOf(getProperties(pojo, 'name', 'age')).toEqualTypeOf<{ name: string; age: number }>();
 }
 
 function testSet() {
-    assertType<string>(set(person, 'name', 'Joe'));
-    assertType<number>(set(person, 'age', 35));
-    assertType<string>(set(person, 'capitalized', 'JOE'));
-    assertType<string>(person.set('name', 'Joe'));
-    assertType<number>(person.set('age', 35));
-    assertType<string>(person.set('capitalized', 'JOE'));
-    assertType<string>(set(pojo, 'name', 'Joe'));
+  expectTypeOf(set(person, 'name', 'Joe')).toEqualTypeOf<string>();
+  expectTypeOf(set(person, 'age', 35)).toEqualTypeOf<number>();
+  expectTypeOf(set(person, 'capitalized', 'JOE')).toEqualTypeOf<string>();
+  expectTypeOf(person.set('name', 'Joe')).toEqualTypeOf<string>();
+  expectTypeOf(person.set('age', 35)).toEqualTypeOf<number>();
+  expectTypeOf(person.set('capitalized', 'JOE')).toEqualTypeOf<string>();
+  expectTypeOf(set(pojo, 'name', 'Joe')).toEqualTypeOf<string>();
 }
 
 function testSetProperties() {
-    assertType<{ name: string }>(setProperties(person, { name: 'Joe' }));
-    assertType<{ name: string; age: number }>(setProperties(person, { name: 'Joe', age: 35 }));
-    assertType<{ name: string; capitalized: string }>(setProperties(person, { name: 'Joe', capitalized: 'JOE' }));
-    assertType<{ name: string }>(person.setProperties({ name: 'Joe' }));
-    assertType<{ name: string; age: number }>(person.setProperties({ name: 'Joe', age: 35 }));
-    assertType<{ name: string; capitalized: string }>(person.setProperties({ name: 'Joe', capitalized: 'JOE' }));
-    assertType<{ name: string; age: number }>(setProperties(pojo, { name: 'Joe', age: 35 }));
+  expectTypeOf(setProperties(person, { name: 'Joe' })).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(setProperties(person, { name: 'Joe', age: 35 })).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(setProperties(person, { name: 'Joe', capitalized: 'JOE' })).toEqualTypeOf<
+    Pick<Person, 'name' | 'capitalized'>
+  >();
+  expectTypeOf(person.setProperties({ name: 'Joe' })).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(person.setProperties({ name: 'Joe', age: 35 })).toEqualTypeOf<
+    Pick<Person, 'name' | 'age'>
+  >();
+  expectTypeOf(person.setProperties({ name: 'Joe', capitalized: 'JOE' })).toEqualTypeOf<
+    Pick<Person, 'name' | 'capitalized'>
+  >();
+  expectTypeOf(setProperties(pojo, { name: 'Joe', age: 35 })).toEqualTypeOf<
+    Pick<Person, 'name' | 'age'>
+  >();
 }
 
 function testDynamic() {
-    const obj: any = {};
-    const dynamicKey: string = 'dummy'; // tslint:disable-line:no-inferrable-types
+  const obj: any = {};
+  const dynamicKey: string = 'dummy'; // eslint-disable-line @typescript-eslint/no-inferrable-types
 
-    assertType<any>(get(obj, 'dummy'));
-    assertType<any>(get(obj, dynamicKey));
-    assertType<{ dummy: any }>(getProperties(obj, 'dummy'));
-    assertType<{ dummy: any }>(getProperties(obj, ['dummy']));
-    assertType<object>(getProperties(obj, dynamicKey));
-    assertType<object>(getProperties(obj, [dynamicKey]));
-    assertType<string>(set(obj, 'dummy', 'value'));
-    assertType<string>(set(obj, dynamicKey, 'value'));
-    assertType<{ dummy: string }>(setProperties(obj, { dummy: 'value ' }));
-    assertType<object>(setProperties(obj, { [dynamicKey]: 'value' }));
+  expectTypeOf(get(obj, 'dummy')).toBeAny();
+  expectTypeOf(get(obj, dynamicKey)).toBeAny();
+  expectTypeOf(getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: any }>();
+  expectTypeOf(getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: any }>();
+  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, any>>();
+  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, any>>();
+  expectTypeOf(set(obj, 'dummy', 'value')).toBeAny();
+  expectTypeOf(set(obj, dynamicKey, 'value')).toBeAny();
+  expectTypeOf(setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<Record<'dummy', any>>();
+  expectTypeOf(setProperties(obj, { [dynamicKey]: 'value' })).toEqualTypeOf<
+    Record<string | number, any>
+  >();
 }

From 66c28fc4ee6793d4e3933dccfa9cfd5650600940 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Sun, 28 Aug 2022 21:52:45 -0600
Subject: [PATCH 1091/1405] type test fixes for 'ember-tests'

This file is a hot mess, and provides more and further evidence of two
increasingly-obvious realities from a TS POV:

- The Ember namespace is 99% useless; people should just use the
  module imports instead.
- The Classic types are *awful*, because Classic *code* was a mess
  compared to Octane, because ES5 was a mess.
---
 types/preview/ember/test/ember-tests.ts | 131 +++++++++++-------------
 1 file changed, 62 insertions(+), 69 deletions(-)

diff --git a/types/preview/ember/test/ember-tests.ts b/types/preview/ember/test/ember-tests.ts
index 493d98f9c82..e59a3436191 100755
--- a/types/preview/ember/test/ember-tests.ts
+++ b/types/preview/ember/test/ember-tests.ts
@@ -2,23 +2,33 @@ import Ember from 'ember';
 import { AnyFn } from 'ember/-private/type-utils';
 import { assertType } from './lib/assert';
 
-let App: any;
+class President extends Ember.Object {
+  name = 'Barack Obama';
+}
 
-App = Ember.Application.create();
-App.president = Ember.Object.create({
-  name: 'Barack Obama',
-});
-App.country = Ember.Object.create({
-  presidentNameBinding: 'MyApp.president.name',
-});
-App.country.get('presidentName');
-App.president = Ember.Object.create({
-  firstName: 'Barack',
-  lastName: 'Obama',
-  fullName: Ember.computed(function () {
+class DetailedPresident extends President {
+  firstName = 'Barack';
+  lastName = 'Obama';
+  @Ember.computed()
+  get fullName() {
     return `${this.get('firstName')} ${this.get('lastName')}`;
-  }),
-});
+  }
+}
+
+class Country extends Ember.Object {
+  presidentNameBinding = 'MyApp.president.name';
+}
+
+class MyApp extends Ember.Application {
+  president = President.create();
+  country = Country.create();
+
+  todosController?: TodosController;
+}
+
+const App = MyApp.create();
+App.country.get('presidentName');
+App.president = DetailedPresident.create();
 App.president.get('fullName');
 
 declare class MyPerson extends Ember.Object {
@@ -26,88 +36,71 @@ declare class MyPerson extends Ember.Object {
 }
 MyPerson.createMan();
 
-const Person1 = Ember.Object.extend({
-  say: (thing: string) => {
+class Person1 extends Ember.Object {
+  name?: string;
+  say = (thing: string) => {
     alert(thing);
-  },
-});
+  };
+}
 
 declare class MyPerson2 extends Ember.Object {
   helloWorld(): void;
 }
 MyPerson2.create().helloWorld();
 
-const tom = Person1.create({
-  name: 'Tom Dale',
+class Tom extends Person1 {
+  name = 'Tom Dale';
   helloWorld() {
     this.say('Hi my name is ' + this.get('name'));
-  },
-});
+  }
+}
+const tom = Tom.create();
 tom.helloWorld();
 
 const PersonReopened = Person1.reopen({ isPerson: true });
 PersonReopened.create().get('isPerson');
 
-App.todosController = Ember.Object.create({
-  todos: [Ember.Object.create({ isDone: false })],
-  remaining: Ember.computed('todos.@each.isDone', function () {
+class Todo extends Ember.Object {
+  isDone = false;
+}
+
+class TodosController extends Ember.Object {
+  todos = [Todo.create()];
+
+  @Ember.computed('todos.@each.isDone')
+  get remaining() {
     const todos = this.get('todos');
-    return todos.filterProperty('isDone', false).get('length');
-  }),
-});
+    return todos.filterBy('isDone', false).get('length');
+  }
+}
+
+App.todosController = TodosController.create();
 
 const todos = App.todosController.get('todos');
 let todo = todos.objectAt(0);
-todo.set('isDone', true);
+todo?.set('isDone', true);
 App.todosController.get('remaining');
-todo = Ember.Object.create({ isDone: false });
+todo = Todo.create({ isDone: true });
 todos.pushObject(todo);
 App.todosController.get('remaining');
 
-App.wife = Ember.Object.create({
-  householdIncome: 80000,
-});
-App.husband = Ember.Object.create({
-  householdIncomeBinding: 'App.wife.householdIncome',
-});
-App.husband.get('householdIncome');
-App.husband.set('householdIncome', 90000);
-App.wife.get('householdIncome');
-
-App.user = Ember.Object.create({
-  fullName: 'Kara Gates',
-});
-App.user.set('fullName', 'Krang Gates');
-App.userView.set('userName', 'Truckasaurus Gates');
-App.user.get('fullName');
-
-App = Ember.Application.create({
+const NormalApp = Ember.Application.create({
   rootElement: '#sidebar',
 });
 
-App.userController = Ember.Object.create({
-  content: Ember.Object.create({
-    firstName: 'Albert',
-    lastName: 'Hofmann',
-    posts: 25,
-    hobbies: 'Riding bicycles',
-  }),
-});
-
 Ember.Handlebars.registerHelper(
   'highlight',
   (property: string, options: any) =>
     new Ember.Handlebars.SafeString('<span class="highlight">' + 'some value' + '</span>')
 );
 
-const coolView = App.CoolView.create();
+class Person2 extends Ember.Object {
+  name = '';
 
-const Person2 = Ember.Object.extend({
-  name: '',
   sayHello() {
     console.log('Hello from ' + this.get('name'));
-  },
-});
+  }
+}
 const people = Ember.A([
   Person2.create({ name: 'Juan' }),
   Person2.create({ name: 'Charles' }),
@@ -131,16 +124,16 @@ arr.setEach('age', 123);
 // @ts-expect-error
 arr.getEach('age');
 
-const Person3 = Ember.Object.extend({
-  name: '',
-  isHappy: false,
-});
+class Person3 extends Ember.Object {
+  name?: string;
+  isHappy = false;
+}
 const people2 = Ember.A([
   Person3.create({ name: 'Yehuda', isHappy: true }),
   Person3.create({ name: 'Majd', isHappy: false }),
 ]);
-const isHappy = (person: typeof Person3.prototype): boolean => {
-  return !!person.get('isHappy');
+const isHappy = (person: Person3): boolean => {
+  return Boolean(person.get('isHappy'));
 };
 people2.every(isHappy);
 people2.any(isHappy);

From 71e1e3f5d293f44a5f7e481e02770f4386f88f6d Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 08:17:59 -0600
Subject: [PATCH 1092/1405] Update preview type tests for Ember.DataAdapter

---
 types/preview/ember/test/data-adapter.ts | 65 ++++++++++++------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/types/preview/ember/test/data-adapter.ts b/types/preview/ember/test/data-adapter.ts
index a77e6b66a14..e7a42b6a5cd 100644
--- a/types/preview/ember/test/data-adapter.ts
+++ b/types/preview/ember/test/data-adapter.ts
@@ -1,52 +1,53 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 
 const da = Ember.DataAdapter.create();
 
 const filters = da.getFilters();
-filters.includes({ name: 'foo', desc: 'bar' }); // $ExpectType boolean
+expectTypeOf(filters.includes({ name: 'foo', desc: 'bar' })).toBeBoolean();
 // @ts-expect-error
 filters.includes({});
 
-filters[0].name; // $ExpectType string
-filters[0].desc; // $ExpectType string
+expectTypeOf(filters[0]?.name).toEqualTypeOf<string | undefined>();
+expectTypeOf(filters[0]?.desc).toEqualTypeOf<string | undefined>();
 
 // $ExpectType () => void
 da.watchModelTypes(
-    function added(wrappedTypes) {
-        wrappedTypes;
-        wrappedTypes[0].release; // $ExpectType () => void
-        wrappedTypes[0].type.columns[0].desc; // $ExpectType string
-        wrappedTypes[0].type.columns[0].name; // $ExpectType string
-        wrappedTypes[0].type.count; // $ExpectType number
-        wrappedTypes[0].type.name; // $ExpectType string
-    },
-    function updated(wrappedTypes) {
-        wrappedTypes;
-        wrappedTypes[0].release; // $ExpectType () => void
-        wrappedTypes[0].type.columns[0].desc; // $ExpectType string
-        wrappedTypes[0].type.columns[0].name; // $ExpectType string
-        wrappedTypes[0].type.count; // $ExpectType number
-        wrappedTypes[0].type.name; // $ExpectType string
-    },
+  function added(wrappedTypes) {
+    wrappedTypes;
+    expectTypeOf(wrappedTypes[0]?.release).toEqualTypeOf<(() => void) | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.desc).toEqualTypeOf<string | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.name).toEqualTypeOf<string | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.count).toEqualTypeOf<number | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.name).toEqualTypeOf<string | undefined>();
+  },
+  function updated(wrappedTypes) {
+    wrappedTypes;
+    expectTypeOf(wrappedTypes[0]?.release).toEqualTypeOf<(() => void) | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.desc).toEqualTypeOf<string | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.name).toEqualTypeOf<string | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.count).toEqualTypeOf<number | undefined>();
+    expectTypeOf(wrappedTypes[0]?.type.name).toEqualTypeOf<string | undefined>();
+  }
 );
 // @ts-expect-error
 da.watchModelTypes(() => {});
 
 // $ExpectType () => void
 da.watchRecords(
-    'house',
-    function added(records) {
-        records[0].object; // $ExpectType object
-        records[0].columnValues; // $ExpectType object
-    },
-    function updated(records) {
-        records[0].object; // $ExpectType object
-        records[0].columnValues; // $ExpectType object
-    },
-    function removed(idx, count) {
-        idx; // $ExpectType number
-        count; // $ExpectType number
-    },
+  'house',
+  function added(records) {
+    expectTypeOf(records[0]?.object).toEqualTypeOf<object | undefined>();
+    expectTypeOf(records[0]?.columnValues).toEqualTypeOf<object | undefined>();
+  },
+  function updated(records) {
+    expectTypeOf(records[0]?.object).toEqualTypeOf<object | undefined>();
+    expectTypeOf(records[0]?.columnValues).toEqualTypeOf<object | undefined>();
+  },
+  function removed(idx, count) {
+    idx; // $ExpectType number
+    count; // $ExpectType number
+  }
 );
 // @ts-expect-error
 da.watchRecords(() => {});

From 81655aed415b191188bb9a960fd4ec58ad74c7db Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 09:30:09 -0600
Subject: [PATCH 1093/1405] Update preview type tests for EmberObject.create()

---
 types/preview/@ember/object/test/create.ts | 77 +++++++++++----------
 types/preview/ember/test/create.ts         | 78 +++++++++++-----------
 2 files changed, 80 insertions(+), 75 deletions(-)

diff --git a/types/preview/@ember/object/test/create.ts b/types/preview/@ember/object/test/create.ts
index a508679fa12..e615991b6b4 100644
--- a/types/preview/@ember/object/test/create.ts
+++ b/types/preview/@ember/object/test/create.ts
@@ -1,54 +1,57 @@
-import { assertType } from './lib/assert';
 import EmberObject, { computed } from '@ember/object';
-import ComputedProperty from '@ember/object/computed';
+import { expectTypeOf } from 'expect-type';
 
 /**
  * Zero-argument case
  */
 const o = EmberObject.create();
 // create returns an object
-assertType<object>(o);
-// object returned by create type-checks as an instance of Ember.Object
-assertType<boolean>(o.isDestroyed); // from instance
-assertType<boolean>(o.isDestroying); // from instance
-assertType<(key: keyof EmberObject) => any>(o.get); // from prototype
+expectTypeOf(o).toBeObject();
+// object returned by create type-checks as an instance of EmberObject
+expectTypeOf(o.isDestroyed).toBeBoolean();
+expectTypeOf(o.isDestroying).toBeBoolean();
+expectTypeOf(o.get).toMatchTypeOf<<K extends keyof EmberObject>(key: K) => EmberObject[K]>();
 
 /**
  * One-argument case
  */
-const o1 = EmberObject.create({ x: 9, y: 'hello', z: false });
-assertType<number>(o1.x);
-assertType<string>(o1.y);
-o1.y; // $ExpectType string
-o1.z; // $ExpectType boolean
+class O1 extends EmberObject {
+  declare x: number;
+  declare y: string;
+  declare z: boolean;
+}
 
-const obj = EmberObject.create({ a: 1 }, { b: 2 }, { c: 3 });
-assertType<number>(obj.b);
-assertType<number>(obj.a);
-assertType<number>(obj.c);
+const o1 = O1.create({ x: 9, y: 'hello', z: false });
+expectTypeOf(o1.x).toBeNumber();
+expectTypeOf(o1.y).toBeString();
+expectTypeOf(o1.z).toBeBoolean();
 
-export class Person extends EmberObject {
-    fullName = computed('firstName', 'lastName', function () {
-        return [this.firstName + this.lastName].join(' ');
-    });
-    declare firstName: string;
-    declare lastName: string;
-    declare age: number;
+class O2 extends EmberObject {
+  declare a: number;
+  declare b: number;
+  declare c: number;
 }
-const p = new Person();
-
-assertType<string>(p.firstName);
-assertType<ComputedProperty<string>>(p.fullName);
-assertType<string>(p.get('fullName'));
+const obj = O2.create({ a: 1 }, { b: 2 }, { c: 3 });
+expectTypeOf(obj.b).toBeNumber();
+expectTypeOf(obj.a).toBeNumber();
+expectTypeOf(obj.c).toBeNumber();
 
-const p2 = Person.create({ firstName: 'string' });
-const p2b = Person.create({}, { firstName: 'string' });
-const p2c = Person.create({}, {}, { firstName: 'string' });
+export class Person extends EmberObject {
+  declare firstName: string;
+  declare lastName: string;
+  declare age: number;
+
+  @computed('firstName', 'lastName')
+  get fullName() {
+    return [this.firstName + this.lastName].join(' ');
+  }
+}
+const p = Person.create();
 
-export class PersonWithNumberName extends Person.extend({
-    fullName: 6,
-}) {}
+expectTypeOf(p.firstName).toBeString();
+expectTypeOf(p.fullName).toBeString();
+expectTypeOf(p.get('fullName')).toBeString();
 
-const p4 = new PersonWithNumberName();
-assertType<string>(p4.firstName);
-assertType<number>(p4.fullName);
+Person.create({ firstName: 'string' });
+Person.create({}, { firstName: 'string' });
+Person.create({}, {}, { firstName: 'string' });
diff --git a/types/preview/ember/test/create.ts b/types/preview/ember/test/create.ts
index 2412309691f..5846fd2b037 100755
--- a/types/preview/ember/test/create.ts
+++ b/types/preview/ember/test/create.ts
@@ -1,55 +1,57 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
-import { UnwrapComputedPropertyGetter } from "@ember/object/-private/types";
+import { expectTypeOf } from 'expect-type';
 
 /**
  * Zero-argument case
  */
 const o = Ember.Object.create();
 // create returns an object
-assertType<object>(o);
+expectTypeOf(o).toBeObject();
 // object returned by create type-checks as an instance of Ember.Object
-assertType<boolean>(o.isDestroyed); // from instance
-assertType<boolean>(o.isDestroying); // from instance
-assertType<<K extends keyof Ember.Object>(key: K) => UnwrapComputedPropertyGetter<Ember.Object[K]>>(o.get); // from prototype
+expectTypeOf(o.isDestroyed).toBeBoolean();
+expectTypeOf(o.isDestroying).toBeBoolean();
+expectTypeOf(o.get).toMatchTypeOf<<K extends keyof Ember.Object>(key: K) => Ember.Object[K]>();
 
 /**
  * One-argument case
  */
-const o1 = Ember.Object.create({ x: 9, y: 'hello', z: false });
-assertType<number>(o1.x);
-assertType<string>(o1.y);
-o1.y; // $ExpectType string
-o1.z; // $ExpectType boolean
-
-const obj = Ember.Object.create({ a: 1 }, { b: 2 }, { c: 3 });
-assertType<number>(obj.b);
-assertType<number>(obj.a);
-assertType<number>(obj.c);
-
-export class Person extends Ember.Object.extend({
-    fullName: Ember.computed('firstName', 'lastName', function () {
-        return [this.firstName + this.lastName].join(' ');
-    }),
-}) {
-    declare firstName: string;
-    declare lastName: string;
-    declare age: number;
+class O1 extends Ember.Object {
+  declare x: number;
+  declare y: string;
+  declare z: boolean;
 }
-const p = new Person();
 
-assertType<string>(p.firstName);
-assertType<Ember.ComputedProperty<string>>(p.fullName);
-assertType<string>(p.get('fullName'));
+const o1 = O1.create({ x: 9, y: 'hello', z: false });
+expectTypeOf(o1.x).toBeNumber();
+expectTypeOf(o1.y).toBeString();
+expectTypeOf(o1.z).toBeBoolean();
 
-const p2 = Person.create({ firstName: 'string' });
-const p2b = Person.create({}, { firstName: 'string' });
-const p2c = Person.create({}, {}, { firstName: 'string' });
+class O2 extends Ember.Object {
+  declare a: number;
+  declare b: number;
+  declare c: number;
+}
+const obj = O2.create({ a: 1 }, { b: 2 }, { c: 3 });
+expectTypeOf(obj.b).toBeNumber();
+expectTypeOf(obj.a).toBeNumber();
+expectTypeOf(obj.c).toBeNumber();
+
+export class Person extends Ember.Object {
+  declare firstName: string;
+  declare lastName: string;
+  declare age: number;
+
+  @Ember.computed('firstName', 'lastName')
+  get fullName() {
+    return [this.firstName + this.lastName].join(' ');
+  }
+}
+const p = Person.create();
 
-export class PersonWithNumberName extends Person.extend({
-    fullName: 6,
-}) {}
+expectTypeOf(p.firstName).toBeString();
+expectTypeOf(p.fullName).toBeString();
+expectTypeOf(p.get('fullName')).toBeString();
 
-const p4 = new PersonWithNumberName();
-assertType<string>(p4.firstName);
-assertType<number>(p4.fullName);
+Person.create({ firstName: 'string' });
+Person.create({}, { firstName: 'string' });
+Person.create({}, {}, { firstName: 'string' });

From 920901efa8a9734fdbdf26192ea7cf288d803d2e Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 09:33:50 -0600
Subject: [PATCH 1094/1405] Update preview type tests for EmberObject.reopen()

---
 types/preview/@ember/object/test/reopen.ts | 80 ++++++++++++----------
 types/preview/ember/test/reopen.ts         |  1 -
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/types/preview/@ember/object/test/reopen.ts b/types/preview/@ember/object/test/reopen.ts
index 10a2e9e1845..cd361c11d5f 100644
--- a/types/preview/@ember/object/test/reopen.ts
+++ b/types/preview/@ember/object/test/reopen.ts
@@ -1,75 +1,79 @@
-import { assertType } from './lib/assert';
 import EmberObject from '@ember/object';
 import Mixin from '@ember/object/mixin';
+import { expectTypeOf } from 'expect-type';
 
-type Person = typeof Person.prototype;
-const Person = EmberObject.extend({
-    name: '',
-    sayHello() {
-        alert(`Hello. My name is ${this.get('name')}`);
-    },
-});
+class Person extends EmberObject {
+  name = '';
+
+  sayHello() {
+    alert(`Hello. My name is ${this.get('name')}`);
+  }
+}
 
-assertType<Person>(Person.reopen());
+expectTypeOf(Person.reopen()).toMatchTypeOf<typeof Person>();
 
-assertType<string>(Person.create().name);
-// tslint:disable-next-line no-void-expression
-assertType<void>(Person.create().sayHello());
+expectTypeOf(Person.create().name).toEqualTypeOf<string>();
+expectTypeOf(Person.create().sayHello()).toBeVoid();
 
+// Here, a basic check that `reopenClass` *works*, but we intentionally do not
+// provide types for how it changes the original class (as spec'd in RFC 0800).
 const Person2 = Person.reopenClass({
-    species: 'Homo sapiens',
+  species: 'Homo sapiens',
 
-    createPerson(name: string): Person {
-        return Person.create({ name });
-    },
+  createPerson(name: string): Person {
+    return Person.create({ name });
+  },
 });
 
-assertType<string>(Person2.create().name);
-// tslint:disable-next-line no-void-expression
-assertType<void>(Person2.create().sayHello());
-assertType<string>(Person2.species);
+// The original class types are carried along
+expectTypeOf(Person2.create().name).toEqualTypeOf<string>();
+expectTypeOf(Person2.create().sayHello()).toBeVoid();
+// But we aren't trying to merge in new classes anymore.
+// @ts-expect-error
+Person2.species;
 
 const tom = Person2.create({
-    name: 'Tom Dale',
+  name: 'Tom Dale',
 });
 
 // @ts-expect-error
 const badTom = Person2.create({ name: 99 });
 
+// @ts-expect-error
 const yehuda = Person2.createPerson('Yehuda Katz');
 
 tom.sayHello(); // "Hello. My name is Tom Dale"
 yehuda.sayHello(); // "Hello. My name is Yehuda Katz"
+// @ts-expect-error
 alert(Person2.species); // "Homo sapiens"
 
+// The same goes for `.reopen()`: it will "work" in a bare minimum sense, but it
+// will not try to change the types.
 const Person3 = Person2.reopen({
-    goodbyeMessage: 'goodbye',
+  goodbyeMessage: 'goodbye',
 
-    sayGoodbye() {
-        alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
-    },
+  sayGoodbye(this: Person) {
+    alert(`${this.get('goodbyeMessage')}, ${this.get('name')}`);
+  },
 });
 
 const person3 = Person3.create();
 person3.get('name');
 person3.get('goodbyeMessage');
 person3.sayHello();
+// @ts-expect-error
 person3.sayGoodbye();
 
 interface AutoResizeMixin {
-    resizable: true;
+  resizable: true;
 }
-declare const AutoResizeMixin: Mixin<AutoResizeMixin>;
-
-const ResizableTextArea = EmberObject.reopen(AutoResizeMixin, {
-    scaling: 1.0,
-});
-const text = ResizableTextArea.create();
-// TODO fix upstream
-// assertType<boolean>(text.resizable);
-assertType<number>(text.scaling);
+const AutoResizeMixin = Mixin.create({ resizable: true });
 
+// And the same here.
 const Reopened = EmberObject.reopenClass({ a: 1 }, { b: 2 }, { c: 3 });
-assertType<number>(Reopened.a);
-assertType<number>(Reopened.b);
-assertType<number>(Reopened.c);
+// @ts-expect-error
+Reopened.a;
+// @ts-expect-error
+Reopened.b;
+// @ts-expect-error
+Reopened.c;
diff --git a/types/preview/ember/test/reopen.ts b/types/preview/ember/test/reopen.ts
index 2df9f538d16..a4cf4673dcf 100755
--- a/types/preview/ember/test/reopen.ts
+++ b/types/preview/ember/test/reopen.ts
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import { expectTypeOf } from 'expect-type';
-import { assertType } from './lib/assert';
 
 class Person extends Ember.Object {
   name = '';

From a5e36423469108db1b49a9a04d2a752182904054 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 09:43:33 -0600
Subject: [PATCH 1095/1405] Update preview type tests for many Mixin types

---
 .../-private/class-names-support.d.ts         |  40 +++----
 .../@ember/component/-private/view-mixin.d.ts | 102 +++++++++---------
 .../@ember/debug/container-debug-adapter.d.ts |   6 +-
 .../engine/-private/registry-proxy-mixin.d.ts |  84 +++++++--------
 types/preview/@ember/engine/test/engine.ts    |  44 ++++----
 .../object/-private/action-handler.d.ts       |   5 +-
 types/preview/@ember/object/evented.d.ts      |  77 ++++++-------
 types/preview/@ember/object/observable.d.ts   |   4 +-
 .../@ember/object/promise-proxy-mixin.d.ts    |  56 +++++-----
 9 files changed, 202 insertions(+), 216 deletions(-)

diff --git a/types/preview/@ember/component/-private/class-names-support.d.ts b/types/preview/@ember/component/-private/class-names-support.d.ts
index 59fabab2fda..0944d06a3ad 100644
--- a/types/preview/@ember/component/-private/class-names-support.d.ts
+++ b/types/preview/@ember/component/-private/class-names-support.d.ts
@@ -1,25 +1,25 @@
 import Mixin from '@ember/object/mixin';
 
 interface ClassNamesSupport {
-    /**
-     * A list of properties of the view to apply as class names. If the property is a string value,
-     * the value of that string will be applied as a class name.
-     *
-     * If the value of the property is a Boolean, the name of that property is added as a dasherized
-     * class name.
-     *
-     * If you would prefer to use a custom value instead of the dasherized property name, you can
-     * pass a binding like this: `classNameBindings: ['isUrgent:urgent']`
-     *
-     * This list of properties is inherited from the component's superclasses as well.
-     */
-    classNameBindings: string[];
-    /**
-     * Standard CSS class names to apply to the view's outer element. This
-     * property automatically inherits any class names defined by the view's
-     * superclasses as well.
-     */
-    classNames: string[];
+  /**
+   * A list of properties of the view to apply as class names. If the property is a string value,
+   * the value of that string will be applied as a class name.
+   *
+   * If the value of the property is a Boolean, the name of that property is added as a dasherized
+   * class name.
+   *
+   * If you would prefer to use a custom value instead of the dasherized property name, you can
+   * pass a binding like this: `classNameBindings: ['isUrgent:urgent']`
+   *
+   * This list of properties is inherited from the component's superclasses as well.
+   */
+  classNameBindings: string[];
+  /**
+   * Standard CSS class names to apply to the view's outer element. This
+   * property automatically inherits any class names defined by the view's
+   * superclasses as well.
+   */
+  classNames: string[];
 }
-declare const ClassNamesSupport: Mixin<ClassNamesSupport>;
+declare const ClassNamesSupport: Mixin;
 export default ClassNamesSupport;
diff --git a/types/preview/@ember/component/-private/view-mixin.d.ts b/types/preview/@ember/component/-private/view-mixin.d.ts
index 72b78927dad..d330e420e46 100644
--- a/types/preview/@ember/component/-private/view-mixin.d.ts
+++ b/types/preview/@ember/component/-private/view-mixin.d.ts
@@ -1,57 +1,57 @@
 import Mixin from '@ember/object/mixin';
 
 interface ViewMixin {
-    /**
-     * A list of properties of the view to apply as attributes. If the property
-     * is a string value, the value of that string will be applied as the value
-     * for an attribute of the property's name.
-     */
-    attributeBindings: string[];
-    /**
-     * Returns the current DOM element for the view.
-     */
-    element: Element;
-    /**
-     * The HTML `id` of the view's element in the DOM. You can provide this
-     * value yourself but it must be unique (just as in HTML):
-     */
-    elementId: string;
-    /**
-     * Tag name for the view's outer element. The tag name is only used when an
-     * element is first created. If you change the `tagName` for an element, you
-     * must destroy and recreate the view element.
-     */
-    tagName: string;
-    /**
-     * Renders the view again. This will work regardless of whether the
-     * view is already in the DOM or not. If the view is in the DOM, the
-     * rendering process will be deferred to give bindings a chance
-     * to synchronize.
-     */
-    rerender(): void;
-    /**
-     * Called when a view is going to insert an element into the DOM.
-     */
-    willInsertElement(): void;
-    /**
-     * Called when the element of the view has been inserted into the DOM.
-     * Override this function to do any set up that requires an element
-     * in the document body.
-     */
-    didInsertElement(): void;
-    /**
-     * Called when the view is about to rerender, but before anything has
-     * been torn down. This is a good opportunity to tear down any manual
-     * observers you have installed based on the DOM state
-     */
-    willClearRender(): void;
-    /**
-     * Called when the element of the view is going to be destroyed. Override
-     * this function to do any teardown that requires an element, like removing
-     * event listeners.
-     */
-    willDestroyElement(): void;
+  /**
+   * A list of properties of the view to apply as attributes. If the property
+   * is a string value, the value of that string will be applied as the value
+   * for an attribute of the property's name.
+   */
+  attributeBindings: string[];
+  /**
+   * Returns the current DOM element for the view.
+   */
+  element: Element;
+  /**
+   * The HTML `id` of the view's element in the DOM. You can provide this
+   * value yourself but it must be unique (just as in HTML):
+   */
+  elementId: string;
+  /**
+   * Tag name for the view's outer element. The tag name is only used when an
+   * element is first created. If you change the `tagName` for an element, you
+   * must destroy and recreate the view element.
+   */
+  tagName: string;
+  /**
+   * Renders the view again. This will work regardless of whether the
+   * view is already in the DOM or not. If the view is in the DOM, the
+   * rendering process will be deferred to give bindings a chance
+   * to synchronize.
+   */
+  rerender(): void;
+  /**
+   * Called when a view is going to insert an element into the DOM.
+   */
+  willInsertElement(): void;
+  /**
+   * Called when the element of the view has been inserted into the DOM.
+   * Override this function to do any set up that requires an element
+   * in the document body.
+   */
+  didInsertElement(): void;
+  /**
+   * Called when the view is about to rerender, but before anything has
+   * been torn down. This is a good opportunity to tear down any manual
+   * observers you have installed based on the DOM state
+   */
+  willClearRender(): void;
+  /**
+   * Called when the element of the view is going to be destroyed. Override
+   * this function to do any teardown that requires an element, like removing
+   * event listeners.
+   */
+  willDestroyElement(): void;
 }
-declare const ViewMixin: Mixin<ViewMixin>;
+declare const ViewMixin: Mixin;
 
 export default ViewMixin;
diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
index 3e03e0923fd..7789b086d1f 100644
--- a/types/preview/@ember/debug/container-debug-adapter.d.ts
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -5,7 +5,7 @@ import Resolver from 'ember-resolver';
  * with tools that debug Ember such as the Ember Inspector for Chrome and Firefox.
  */
 export default class ContainerDebugAdapter extends Object {
-    resolver: Resolver;
-    canCatalogEntriesByType(type: string): boolean;
-    catalogEntriesByType(type: string): string[];
+  resolver: Resolver;
+  canCatalogEntriesByType(type: string): boolean;
+  catalogEntriesByType(type: string): string[];
 }
diff --git a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
index f0718b2a83d..801abf8b0cf 100644
--- a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
@@ -6,47 +6,47 @@ import Mixin from '@ember/object/mixin';
  * registry functionality.
  */
 interface RegistryProxyMixin extends Owner {
-    /**
-     * Given a fullName return the corresponding factory.
-     */
-    resolveRegistration(fullName: string): unknown;
-    /**
-     * Unregister a factory.
-     */
-    unregister(fullName: string): unknown;
-    /**
-     * Check if a factory is registered.
-     */
-    hasRegistration(fullName: string): boolean;
-    /**
-     * Register an option for a particular factory.
-     */
-    registerOption(fullName: string, optionName: string, options: {}): unknown;
-    /**
-     * Return a specific registered option for a particular factory.
-     */
-    registeredOption(fullName: string, optionName: string): {};
-    /**
-     * Register options for a particular factory.
-     */
-    registerOptions(fullName: string, options: {}): unknown;
-    /**
-     * Return registered options for a particular factory.
-     */
-    registeredOptions(fullName: string): {};
-    /**
-     * Allow registering options for all factories of a type.
-     */
-    registerOptionsForType(type: string, options: {}): unknown;
-    /**
-     * Return the registered options for all factories of a type.
-     */
-    registeredOptionsForType(type: string): {};
-    /**
-     * Define a dependency injection onto a specific factory or all factories
-     * of a type.
-     */
-    inject(factoryNameOrType: string, property: string, injectionName: string): unknown;
+  /**
+   * Given a fullName return the corresponding factory.
+   */
+  resolveRegistration(fullName: string): unknown;
+  /**
+   * Unregister a factory.
+   */
+  unregister(fullName: string): unknown;
+  /**
+   * Check if a factory is registered.
+   */
+  hasRegistration(fullName: string): boolean;
+  /**
+   * Register an option for a particular factory.
+   */
+  registerOption(fullName: string, optionName: string, options: {}): unknown;
+  /**
+   * Return a specific registered option for a particular factory.
+   */
+  registeredOption(fullName: string, optionName: string): {};
+  /**
+   * Register options for a particular factory.
+   */
+  registerOptions(fullName: string, options: {}): unknown;
+  /**
+   * Return registered options for a particular factory.
+   */
+  registeredOptions(fullName: string): {};
+  /**
+   * Allow registering options for all factories of a type.
+   */
+  registerOptionsForType(type: string, options: {}): unknown;
+  /**
+   * Return the registered options for all factories of a type.
+   */
+  registeredOptionsForType(type: string): {};
+  /**
+   * Define a dependency injection onto a specific factory or all factories
+   * of a type.
+   */
+  inject(factoryNameOrType: string, property: string, injectionName: string): unknown;
 }
-declare const RegistryProxyMixin: Mixin<RegistryProxyMixin>;
+declare const RegistryProxyMixin: Mixin;
 export default RegistryProxyMixin;
diff --git a/types/preview/@ember/engine/test/engine.ts b/types/preview/@ember/engine/test/engine.ts
index cf01e987b7e..4426b7d8f3c 100755
--- a/types/preview/@ember/engine/test/engine.ts
+++ b/types/preview/@ember/engine/test/engine.ts
@@ -1,39 +1,41 @@
 import Engine from '@ember/engine';
 import EmberObject from '@ember/object';
 
-const BaseEngine = Engine.extend({
-    modulePrefix: 'my-engine',
-});
+class BaseEngine extends Engine {
+  modulePrefix = 'my-engine';
+}
 
-class Obj extends EmberObject.extend({ foo: 'bar' }) {}
+class Obj extends EmberObject {
+  foo = 'bar';
+}
 
 BaseEngine.initializer({
-    name: 'my-initializer',
-    initialize(engine) {
-        engine.register('foo:bar', Obj);
-    },
+  name: 'my-initializer',
+  initialize(engine) {
+    engine.register('foo:bar', Obj);
+  },
 });
 
 BaseEngine.instanceInitializer({
-    name: 'my-instance-initializer',
-    initialize(engine) {
-        (engine.lookup('foo:bar') as Obj).get('foo');
-    },
+  name: 'my-instance-initializer',
+  initialize(engine) {
+    (engine.lookup('foo:bar') as Obj).get('foo');
+  },
 });
 
 const Engine1 = BaseEngine.create({
-    rootElement: '#engine-one',
-    customEvents: {
-        paste: 'paste',
-    },
+  rootElement: '#engine-one',
+  customEvents: {
+    paste: 'paste',
+  },
 });
 
 const Engine2 = BaseEngine.create({
-    rootElement: '#engine-two',
-    customEvents: {
-        mouseenter: null,
-        mouseleave: null,
-    },
+  rootElement: '#engine-two',
+  customEvents: {
+    mouseenter: null,
+    mouseleave: null,
+  },
 });
 
 const Engine3 = BaseEngine.create();
diff --git a/types/preview/@ember/object/-private/action-handler.d.ts b/types/preview/@ember/object/-private/action-handler.d.ts
index dae8f951509..ab1f89e9119 100644
--- a/types/preview/@ember/object/-private/action-handler.d.ts
+++ b/types/preview/@ember/object/-private/action-handler.d.ts
@@ -1,7 +1,8 @@
+import { AnyFn } from 'ember/-private/type-utils';
 import type Mixin from '../mixin';
 
 interface ActionsHash {
-  [index: string]: (...params: any[]) => any;
+  [index: string]: AnyFn;
 }
 
 /**
@@ -24,5 +25,5 @@ interface ActionHandler {
    */
   actions: ActionsHash;
 }
-declare const ActionHandler: Mixin<ActionHandler>;
+declare const ActionHandler: Mixin;
 export default ActionHandler;
diff --git a/types/preview/@ember/object/evented.d.ts b/types/preview/@ember/object/evented.d.ts
index d888571eeed..f3be2682036 100644
--- a/types/preview/@ember/object/evented.d.ts
+++ b/types/preview/@ember/object/evented.d.ts
@@ -1,60 +1,43 @@
 import Mixin from '@ember/object/mixin';
-import { AnyFn, EmberMethod, MethodNamesOf, MethodParams, MethodsOf } from 'ember/-private/type-utils';
+import { AnyFn, EmberMethod } from 'ember/-private/type-utils';
 
 /**
  * This mixin allows for Ember objects to subscribe to and emit events.
  */
 interface Evented {
-    /**
-     * Subscribes to a named event with given function.
-     */
-    on<T>(
-        name: string,
-        target: T,
-        method: EmberMethod<T>
-    ): this;
-    on(name: string, method: EmberMethod<this>): this;
-    /**
-     * Subscribes a function to a named event and then cancels the subscription
-     * after the first time the event is triggered. It is good to use ``one`` when
-     * you only care about the first time an event has taken place.
-     */
-    one<T>(
-        name: string,
-        target: T,
-        method: EmberMethod<T>
-    ): this;
-    one(name: string, method: EmberMethod<this>): this;
-    /**
-     * Triggers a named event for the object. Any additional arguments
-     * will be passed as parameters to the functions that are subscribed to the
-     * event.
-     */
-    trigger(name: string, ...args: unknown[]): any;
-    /**
-     * Cancels subscription for given name, target, and method.
-     */
-    off<T>(
-        name: string,
-        target: T,
-        method: EmberMethod<T>
-    ): this;
-    off(name: string, method: EmberMethod<this>): this;
-    /**
-     * Checks to see if object has any subscriptions for named event.
-     */
-    has(name: string): boolean;
+  /**
+   * Subscribes to a named event with given function.
+   */
+  on<T>(name: string, target: T, method: EmberMethod<T>): this;
+  on(name: string, method: EmberMethod<this>): this;
+  /**
+   * Subscribes a function to a named event and then cancels the subscription
+   * after the first time the event is triggered. It is good to use ``one`` when
+   * you only care about the first time an event has taken place.
+   */
+  one<T>(name: string, target: T, method: EmberMethod<T>): this;
+  one(name: string, method: EmberMethod<this>): this;
+  /**
+   * Triggers a named event for the object. Any additional arguments
+   * will be passed as parameters to the functions that are subscribed to the
+   * event.
+   */
+  trigger(name: string, ...args: unknown[]): any;
+  /**
+   * Cancels subscription for given name, target, and method.
+   */
+  off<T>(name: string, target: T, method: EmberMethod<T>): this;
+  off(name: string, method: EmberMethod<this>): this;
+  /**
+   * Checks to see if object has any subscriptions for named event.
+   */
+  has(name: string): boolean;
 }
-declare const Evented: Mixin<Evented>;
+declare const Evented: Mixin;
 export default Evented;
 
 /**
  * Define a property as a function that should be executed when
  * a specified event or events are triggered.
  */
-export function on<F extends AnyFn>(
-    ...args: [
-        ...eventNames: string[],
-        func: F
-    ]
-): F;
+export function on<F extends AnyFn>(...args: [...eventNames: string[], func: F]): F;
diff --git a/types/preview/@ember/object/observable.d.ts b/types/preview/@ember/object/observable.d.ts
index d0bbc08f1ff..74ed10570dd 100644
--- a/types/preview/@ember/object/observable.d.ts
+++ b/types/preview/@ember/object/observable.d.ts
@@ -5,7 +5,7 @@ import CoreObject from './core';
 /**
  * This mixin provides properties and property observing functionality, core features of the Ember object model.
  */
-interface Observable {
+interface Observable extends CoreObject {
   /**
    * Retrieves the value of a property from the object.
    */
@@ -79,5 +79,5 @@ interface Observable {
    */
   cacheFor<K extends keyof this>(key: K): this[K] | undefined;
 }
-declare const Observable: Mixin<Observable, CoreObject>;
+declare const Observable: Mixin;
 export default Observable;
diff --git a/types/preview/@ember/object/promise-proxy-mixin.d.ts b/types/preview/@ember/object/promise-proxy-mixin.d.ts
index c23f8e75494..2ccc0ca5694 100644
--- a/types/preview/@ember/object/promise-proxy-mixin.d.ts
+++ b/types/preview/@ember/object/promise-proxy-mixin.d.ts
@@ -1,35 +1,35 @@
-import Mixin from "@ember/object/mixin";
-import RSVP from "rsvp";
+import Mixin from '@ember/object/mixin';
+import RSVP from 'rsvp';
 
 /**
  * A low level mixin making ObjectProxy promise-aware.
  */
 interface PromiseProxyMixin<T> extends RSVP.Promise<T> {
-    /**
-     * If the proxied promise is rejected this will contain the reason
-     * provided.
-     */
-    reason: unknown;
-    /**
-     * Once the proxied promise has settled this will become `false`.
-     */
-    isPending: boolean;
-    /**
-     * Once the proxied promise has settled this will become `true`.
-     */
-    isSettled: boolean;
-    /**
-     * Will become `true` if the proxied promise is rejected.
-     */
-    isRejected: boolean;
-    /**
-     * Will become `true` if the proxied promise is fulfilled.
-     */
-    isFulfilled: boolean;
-    /**
-     * The promise whose fulfillment value is being proxied by this object.
-     */
-    promise: RSVP.Promise<T>;
+  /**
+   * If the proxied promise is rejected this will contain the reason
+   * provided.
+   */
+  reason: unknown;
+  /**
+   * Once the proxied promise has settled this will become `false`.
+   */
+  isPending: boolean;
+  /**
+   * Once the proxied promise has settled this will become `true`.
+   */
+  isSettled: boolean;
+  /**
+   * Will become `true` if the proxied promise is rejected.
+   */
+  isRejected: boolean;
+  /**
+   * Will become `true` if the proxied promise is fulfilled.
+   */
+  isFulfilled: boolean;
+  /**
+   * The promise whose fulfillment value is being proxied by this object.
+   */
+  promise: RSVP.Promise<T>;
 }
-declare const PromiseProxyMixin: Mixin<PromiseProxyMixin<any>>;
+declare const PromiseProxyMixin: Mixin;
 export default PromiseProxyMixin;

From 9ca3053f1cc61b184c8f4de0886e7282bed34b03 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 10:11:16 -0600
Subject: [PATCH 1096/1405] Update preview type tests for arrays/array mixins

---
 .../@ember/array/-private/native-array.d.ts   | 10 +-
 types/preview/@ember/array/index.d.ts         | 99 +++++++++----------
 2 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/types/preview/@ember/array/-private/native-array.d.ts b/types/preview/@ember/array/-private/native-array.d.ts
index c44ffbc1887..1a2c8fcf113 100644
--- a/types/preview/@ember/array/-private/native-array.d.ts
+++ b/types/preview/@ember/array/-private/native-array.d.ts
@@ -13,11 +13,11 @@ type GlobalArray<T> = T[];
  * at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
  */
 interface NativeArray<T> extends GlobalArray<T>, MutableArray<T>, Observable {
-    /**
-     * __Required.__ You must implement this method to apply this mixin.
-     */
-    length: number;
+  /**
+   * __Required.__ You must implement this method to apply this mixin.
+   */
+  length: number;
 }
 
-declare const NativeArray: Mixin<NativeArray<unknown>>;
+declare const NativeArray: Mixin;
 export default NativeArray;
diff --git a/types/preview/@ember/array/index.d.ts b/types/preview/@ember/array/index.d.ts
index 10b58c75dda..13f7597c5ce 100644
--- a/types/preview/@ember/array/index.d.ts
+++ b/types/preview/@ember/array/index.d.ts
@@ -1,66 +1,57 @@
-// Type definitions for non-npm package @ember/array 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Farray
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
-import ComputedProperty from "@ember/object/computed";
-import Mixin from "@ember/object/mixin";
-import Enumerable from "@ember/array/-private/enumerable";
-import NativeArray from "@ember/array/-private/native-array";
+import Mixin from '@ember/object/mixin';
+import Enumerable from '@ember/array/-private/enumerable';
+import NativeArray from '@ember/array/-private/native-array';
 
 /**
  * This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
  * Array class as well as other controllers, etc. that want to appear to be arrays.
  */
 interface Array<T> extends Enumerable<T> {
-    /**
-     * __Required.__ You must implement this method to apply this mixin.
-     */
-    length: number | ComputedProperty<number>;
-    /**
-     * Returns the object at the given `index`. If the given `index` is negative
-     * or is greater or equal than the array length, returns `undefined`.
-     */
-    objectAt(idx: number): T | undefined;
-    /**
-     * This returns the objects at the specified indexes, using `objectAt`.
-     */
-    // tslint:disable-next-line:array-type
-    objectsAt(indexes: number[]): Array<T | undefined>;
-    /**
-     * Returns a new array that is a slice of the receiver. This implementation
-     * uses the observable array methods to retrieve the objects for the new
-     * slice.
-     */
-    slice(beginIndex?: number, endIndex?: number): T[];
-    /**
-     * Returns the index of the given object's first occurrence.
-     * If no `startAt` argument is given, the starting location to
-     * search is 0. If it's negative, will count backward from
-     * the end of the array. Returns -1 if no match is found.
-     */
-    indexOf(searchElement: T, fromIndex?: number): number;
-    /**
-     * Returns the index of the given object's last occurrence.
-     * If no `startAt` argument is given, the search starts from
-     * the last position. If it's negative, will count backward
-     * from the end of the array. Returns -1 if no match is found.
-     */
-    lastIndexOf(searchElement: T, fromIndex?: number): number;
-    /**
-     * Returns a special object that can be used to observe individual properties
-     * on the array. Just get an equivalent property on this object and it will
-     * return an enumerable that maps automatically to the named key on the
-     * member objects.
-     */
-    '@each': ComputedProperty<T>;
+  /**
+   * __Required.__ You must implement this method to apply this mixin.
+   */
+  length: number;
+  /**
+   * Returns the object at the given `index`. If the given `index` is negative
+   * or is greater or equal than the array length, returns `undefined`.
+   */
+  objectAt(idx: number): T | undefined;
+  /**
+   * This returns the objects at the specified indexes, using `objectAt`.
+   */
+  // tslint:disable-next-line:array-type
+  objectsAt(indexes: number[]): Array<T | undefined>;
+  /**
+   * Returns a new array that is a slice of the receiver. This implementation
+   * uses the observable array methods to retrieve the objects for the new
+   * slice.
+   */
+  slice(beginIndex?: number, endIndex?: number): T[];
+  /**
+   * Returns the index of the given object's first occurrence.
+   * If no `startAt` argument is given, the starting location to
+   * search is 0. If it's negative, will count backward from
+   * the end of the array. Returns -1 if no match is found.
+   */
+  indexOf(searchElement: T, fromIndex?: number): number;
+  /**
+   * Returns the index of the given object's last occurrence.
+   * If no `startAt` argument is given, the search starts from
+   * the last position. If it's negative, will count backward
+   * from the end of the array. Returns -1 if no match is found.
+   */
+  lastIndexOf(searchElement: T, fromIndex?: number): number;
+  /**
+   * Returns a special object that can be used to observe individual properties
+   * on the array. Just get an equivalent property on this object and it will
+   * return an enumerable that maps automatically to the named key on the
+   * member objects.
+   */
+  '@each': T;
 }
 // Ember.Array rather than Array because the `array-type` lint rule doesn't realize the global is shadowed
 // tslint:disable-next-line:array-type
-declare const Array: Mixin<Array<unknown>>;
+declare const Array: Mixin;
 export default Array;
 
 /**

From d845d4a84b981b0b5c7df4985362ac94ffd2c9c5 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 10:12:43 -0600
Subject: [PATCH 1097/1405] Lint autofix and remove DT headers from a bunch of
 preview types

---
 types/preview/@ember/application/index.d.ts |  8 --
 types/preview/@ember/debug/index.d.ts       | 90 +++++++++----------
 types/preview/@ember/destroyable/index.d.ts | 16 +---
 types/preview/@ember/error/index.d.ts       |  8 --
 types/preview/@ember/helper/index.d.ts      |  8 --
 types/preview/@ember/modifier/index.d.ts    |  8 --
 types/preview/@ember/owner/index.d.ts       | 98 ++++++++++-----------
 types/preview/@ember/polyfills/index.d.ts   |  8 --
 types/preview/@ember/routing/index.d.ts     |  8 --
 types/preview/@ember/runloop/index.d.ts     |  8 --
 types/preview/@ember/service/index.d.ts     |  8 --
 types/preview/@ember/template/index.d.ts    |  8 --
 types/preview/@ember/test/index.d.ts        | 26 ++----
 types/preview/@ember/utils/index.d.ts       |  8 --
 types/preview/ember/index.d.ts              |  8 --
 15 files changed, 101 insertions(+), 217 deletions(-)

diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 16b359ce356..bc0826caeac 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/application 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fapplication
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import Engine from '@ember/engine';
 import ApplicationInstance from '@ember/application/instance';
 import EventDispatcher from '@ember/application/-private/event-dispatcher';
diff --git a/types/preview/@ember/debug/index.d.ts b/types/preview/@ember/debug/index.d.ts
index 0500927bc3b..6554a0d082b 100644
--- a/types/preview/@ember/debug/index.d.ts
+++ b/types/preview/@ember/debug/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/debug 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fdebug
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 /**
  * Define an assertion that will throw an exception if the condition is not met.
  */
@@ -24,11 +16,11 @@ export function debug(message: string): void;
  * message contains the word "should", otherwise defers to the default handler.
  */
 export function registerDeprecationHandler(
-    handler: (
-        message: string,
-        options: { id: string; until: string } | undefined,
-        next: (message: string, options?: { id: string; until: string }) => void,
-    ) => void,
+  handler: (
+    message: string,
+    options: { id: string; until: string } | undefined,
+    next: (message: string, options?: { id: string; until: string }) => void
+  ) => void
 ): void;
 /**
  * Allows for runtime registration of handler functions that override the default warning behavior.
@@ -37,11 +29,11 @@ export function registerDeprecationHandler(
  * default warning behavior.
  */
 export function registerWarnHandler(
-    handler: (
-        message: string,
-        options: { id: string } | undefined,
-        next: (message: string, options?: { id: string }) => void,
-    ) => void,
+  handler: (
+    message: string,
+    options: { id: string } | undefined,
+    next: (message: string, options?: { id: string }) => void
+  ) => void
 ): void;
 
 /**
@@ -67,34 +59,38 @@ export function warn(message: string, options: { id: string }): void;
  * @param options The deprecation options.
  */
 export function deprecate(
-    message: string,
-    test: boolean,
-    options: {
-        /**
-         * A unique id for this deprecation. The id can be used by Ember debugging
-         * tools to change the behavior (raise, log or silence) for that specific
-         * deprecation. The id should be namespaced by dots, e.g.
-         * `"view.helper.select"`.
-         */
-        id: string;
-        /**
-         * The version of Ember when this deprecation warning will be removed.
-         */
-        until: string;
-        /**
-         * An optional url to the transition guide on the emberjs.com website.
-         */
-        url?: string | undefined;
-        /**
-         * A namespace for the deprecation, usually the package name.
-         */
-        for: string;
-        /**
-         * Describes when the deprecation became available and enabled.
-         */
-        since: Available | Enabled;
-    },
+  message: string,
+  test: boolean,
+  options: {
+    /**
+     * A unique id for this deprecation. The id can be used by Ember debugging
+     * tools to change the behavior (raise, log or silence) for that specific
+     * deprecation. The id should be namespaced by dots, e.g.
+     * `"view.helper.select"`.
+     */
+    id: string;
+    /**
+     * The version of Ember when this deprecation warning will be removed.
+     */
+    until: string;
+    /**
+     * An optional url to the transition guide on the emberjs.com website.
+     */
+    url?: string | undefined;
+    /**
+     * A namespace for the deprecation, usually the package name.
+     */
+    for: string;
+    /**
+     * Describes when the deprecation became available and enabled.
+     */
+    since: Available | Enabled;
+  }
 ): void;
 
-export interface Available { available: string; }
-export interface Enabled extends Available { enabled: string; }
+export interface Available {
+  available: string;
+}
+export interface Enabled extends Available {
+  enabled: string;
+}
diff --git a/types/preview/@ember/destroyable/index.d.ts b/types/preview/@ember/destroyable/index.d.ts
index 855508cbbcf..e8dfee90dd9 100644
--- a/types/preview/@ember/destroyable/index.d.ts
+++ b/types/preview/@ember/destroyable/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/destroyable 4.0
-// Project: https://api.emberjs.com/ember/3.22/modules/@ember%2Fdestroyable
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 export function associateDestroyableChild<T extends object>(parent: object, child: T): T;
 
 export function isDestroying(destroyable: object): boolean;
@@ -19,11 +11,11 @@ export function assertDestroyablesDestroyed(): void;
 export function enableDestroyableTracking(): void;
 
 export function registerDestructor<T extends object>(
-destroyable: T,
-destructor: (destroyable: T) => void
+  destroyable: T,
+  destructor: (destroyable: T) => void
 ): (destroyable: T) => void;
 
 export function unregisterDestructor<T extends object>(
-destroyable: T,
-destructor: (destroyable: T) => void
+  destroyable: T,
+  destructor: (destroyable: T) => void
 ): void;
diff --git a/types/preview/@ember/error/index.d.ts b/types/preview/@ember/error/index.d.ts
index e1a44683d6f..8d13769d1f2 100644
--- a/types/preview/@ember/error/index.d.ts
+++ b/types/preview/@ember/error/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/error 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Ferror
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 /**
  * A subclass of the JavaScript Error object for use in Ember.
  */
diff --git a/types/preview/@ember/helper/index.d.ts b/types/preview/@ember/helper/index.d.ts
index 7081b026074..8b6f38d351f 100644
--- a/types/preview/@ember/helper/index.d.ts
+++ b/types/preview/@ember/helper/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/helper 4.0
-// Project: https://github.com/emberjs/ember.js
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import type { Opaque } from 'ember/-private/type-utils';
 
 // In normal TypeScript, these helpers are essentially opaque tokens that just
diff --git a/types/preview/@ember/modifier/index.d.ts b/types/preview/@ember/modifier/index.d.ts
index 6d197ae5ee6..2281a7ea20e 100644
--- a/types/preview/@ember/modifier/index.d.ts
+++ b/types/preview/@ember/modifier/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/modifier 4.0
-// Project: https://github.com/emberjs/ember.js
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import type Owner from '@ember/owner';
 import type { Opaque } from 'ember/-private/type-utils';
 
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
index db9b3dbb28a..414de7abe1c 100644
--- a/types/preview/@ember/owner/index.d.ts
+++ b/types/preview/@ember/owner/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/owner 4.0
-// Project: https://emberjs.com/api/ember/4.0/
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 /**
  * The name for a factory consists of a namespace and the name of a specific
  * type within that namespace, like `'service:session'`.
@@ -22,47 +14,47 @@ export type FullName = `${string}:${string}`;
  * instantiation and manages its lifetime.
  */
 export default interface Owner {
-    /**
-     * Given a {@linkcode FullName} return a corresponding instance.
-     */
-    lookup(fullName: FullName): unknown;
+  /**
+   * Given a {@linkcode FullName} return a corresponding instance.
+   */
+  lookup(fullName: FullName): unknown;
 
-    /**
-     * Registers a factory or value that can be used for dependency injection
-     * (with `inject`) or for service lookup. Each factory is registered with a
-     * full name including two parts: `'type:name'`.
-     *
-     * - To override the default of instantiating the class on the `Factory`,
-     *   pass the `{ instantiate: false }` option. This is useful when you have
-     *   already instantiated the class to use with this factory.
-     * - To override the default singleton behavior and instead create multiple
-     *   instances, pass the `{ singleton: false }` option.
-     */
-    // Dear future maintainer: yes, I know that `Factory<unknown> | object` is
-    // an exceedingly weird type here. This is how we type it internally in
-    // Ember itself. We actually allow more or less *anything* to be passed
-    // here. In the future, we may possibly be able to update this to actually
-    // take advantage of the `FullName` here to require that the registered
-    // factory and corresponding options do the right thing (passing an *actual*
-    // factory, not needing `create` if `options.instantiate` is `false`, etc.)
-    // but doing so will require rationalizing Ember's own internals and may
-    // need a full Ember RFC.
-    register(fullName: FullName, factory: Factory<unknown> | object, options?: RegisterOptions): void;
+  /**
+   * Registers a factory or value that can be used for dependency injection
+   * (with `inject`) or for service lookup. Each factory is registered with a
+   * full name including two parts: `'type:name'`.
+   *
+   * - To override the default of instantiating the class on the `Factory`,
+   *   pass the `{ instantiate: false }` option. This is useful when you have
+   *   already instantiated the class to use with this factory.
+   * - To override the default singleton behavior and instead create multiple
+   *   instances, pass the `{ singleton: false }` option.
+   */
+  // Dear future maintainer: yes, I know that `Factory<unknown> | object` is
+  // an exceedingly weird type here. This is how we type it internally in
+  // Ember itself. We actually allow more or less *anything* to be passed
+  // here. In the future, we may possibly be able to update this to actually
+  // take advantage of the `FullName` here to require that the registered
+  // factory and corresponding options do the right thing (passing an *actual*
+  // factory, not needing `create` if `options.instantiate` is `false`, etc.)
+  // but doing so will require rationalizing Ember's own internals and may
+  // need a full Ember RFC.
+  register(fullName: FullName, factory: Factory<unknown> | object, options?: RegisterOptions): void;
 
-    /**
-     * Given a fullName of the form `'type:name'`, like `'route:application'`,
-     * return a corresponding factory manager.
-     *
-     * Any instances created via the factory's `.create()` method must be
-     * destroyed manually by the caller of `.create()`. Typically, this is done
-     * during the creating objects own `destroy` or `willDestroy` methods.
-     */
-    factoryFor(fullName: FullName): FactoryManager<unknown> | undefined;
+  /**
+   * Given a fullName of the form `'type:name'`, like `'route:application'`,
+   * return a corresponding factory manager.
+   *
+   * Any instances created via the factory's `.create()` method must be
+   * destroyed manually by the caller of `.create()`. Typically, this is done
+   * during the creating objects own `destroy` or `willDestroy` methods.
+   */
+  factoryFor(fullName: FullName): FactoryManager<unknown> | undefined;
 }
 
 export interface RegisterOptions {
-    instantiate?: boolean | undefined;
-    singleton?: boolean | undefined;
+  instantiate?: boolean | undefined;
+  singleton?: boolean | undefined;
 }
 
 /**
@@ -74,13 +66,13 @@ export interface RegisterOptions {
  * options to the {@linkcode Owner.register} method.
  */
 export interface Factory<T> {
-    /**
-     * A function that will create an instance of the class with any
-     * dependencies injected.
-     *
-     * @param initialValues Any values to set on an instance of the class
-     */
-    create(initialValues?: Partial<T>): T;
+  /**
+   * A function that will create an instance of the class with any
+   * dependencies injected.
+   *
+   * @param initialValues Any values to set on an instance of the class
+   */
+  create(initialValues?: Partial<T>): T;
 }
 
 /**
@@ -96,8 +88,8 @@ export interface Factory<T> {
  *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
  */
 export interface FactoryManager<T> extends Factory<T> {
-    /** The registered or resolved class. */
-    readonly class: Factory<T>;
+  /** The registered or resolved class. */
+  readonly class: Factory<T>;
 }
 
 // Don't export things unless we *intend* to.
diff --git a/types/preview/@ember/polyfills/index.d.ts b/types/preview/@ember/polyfills/index.d.ts
index 487bc2cf648..8bc9e03dd30 100644
--- a/types/preview/@ember/polyfills/index.d.ts
+++ b/types/preview/@ember/polyfills/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/polyfills 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fpolyfills
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import type { Mix, Mix3, Mix4 } from './types';
 
 /**
diff --git a/types/preview/@ember/routing/index.d.ts b/types/preview/@ember/routing/index.d.ts
index 923ca316b6b..bc33c70dae5 100644
--- a/types/preview/@ember/routing/index.d.ts
+++ b/types/preview/@ember/routing/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/routing 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Frouting
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 export { default as Route } from '@ember/routing/route';
 export { default as Router } from '@ember/routing/router';
 
diff --git a/types/preview/@ember/runloop/index.d.ts b/types/preview/@ember/runloop/index.d.ts
index 25cd870cf0d..6e5159af0e5 100644
--- a/types/preview/@ember/runloop/index.d.ts
+++ b/types/preview/@ember/runloop/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/runloop 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Frunloop
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import {
   EmberMethod,
   EmberMethodParams,
diff --git a/types/preview/@ember/service/index.d.ts b/types/preview/@ember/service/index.d.ts
index 798774107b8..c87f86f0346 100644
--- a/types/preview/@ember/service/index.d.ts
+++ b/types/preview/@ember/service/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/service 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Fservice
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import EmberObject from '@ember/object';
 import ComputedProperty from '@ember/object/computed';
 
diff --git a/types/preview/@ember/template/index.d.ts b/types/preview/@ember/template/index.d.ts
index 40a7f0c2408..9079f7a96f4 100644
--- a/types/preview/@ember/template/index.d.ts
+++ b/types/preview/@ember/template/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/template 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Ftemplate
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import { SafeString } from './-private/handlebars';
 export function htmlSafe(str: string): SafeString;
 export function isHTMLSafe(str: unknown): str is SafeString;
diff --git a/types/preview/@ember/test/index.d.ts b/types/preview/@ember/test/index.d.ts
index d3a6c468f7a..7e78f264120 100644
--- a/types/preview/@ember/test/index.d.ts
+++ b/types/preview/@ember/test/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/test 4.0
-// Project: https://emberjs.com/api/ember/4.0/modules/@ember%2Ftest
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import Application from '@ember/application';
 
 /**
@@ -13,17 +5,17 @@ import Application from '@ember/application';
  * when `App.injectTestHelpers` is called.
  */
 export function registerHelper(
-    name: string,
-    helperMethod: (app: Application, ...args: any[]) => unknown,
-    options?: object
+  name: string,
+  helperMethod: (app: Application, ...args: any[]) => unknown,
+  options?: object
 ): unknown;
 /**
  * `registerAsyncHelper` is used to register an async test helper that will be injected
  * when `App.injectTestHelpers` is called.
  */
 export function registerAsyncHelper(
-    name: string,
-    helperMethod: (app: Application, ...args: any[]) => unknown
+  name: string,
+  helperMethod: (app: Application, ...args: any[]) => unknown
 ): void;
 
 /**
@@ -41,8 +33,8 @@ export function unregisterHelper(name: string): void;
  */
 export function registerWaiter(callback: () => boolean): unknown;
 export function registerWaiter<Context>(
-    context: Context,
-    callback: (this: Context) => boolean
+  context: Context,
+  callback: (this: Context) => boolean
 ): unknown;
 /**
  * `unregisterWaiter` is used to unregister a callback that was
@@ -50,6 +42,6 @@ export function registerWaiter<Context>(
  */
 export function unregisterWaiter(callback: () => boolean): unknown;
 export function unregisterWaiter<Context>(
-    context: Context,
-    callback: (this: Context) => boolean
+  context: Context,
+  callback: (this: Context) => boolean
 ): unknown;
diff --git a/types/preview/@ember/utils/index.d.ts b/types/preview/@ember/utils/index.d.ts
index 353be5f0e34..d28098e176b 100644
--- a/types/preview/@ember/utils/index.d.ts
+++ b/types/preview/@ember/utils/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for non-npm package @ember/utils 4.0
-// Project: https://api.emberjs.com/ember/3.16/modules/@ember%2Futils
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 Dan Freeman <https://github.com/dfreeman>
-//                 James C. Davis <https://github.com/jamescdavis>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 import type { TypeOf } from './-private/types';
 
 /**
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index a3210233f40..f6172c80012 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -1,11 +1,3 @@
-// Type definitions for Ember.js 4.0
-// Project: https://emberjs.com/, https://github.com/emberjs/ember
-// Definitions by: Chris Krycho <https://github.com/chriskrycho>
-//                 James C. Davis <https://github.com/jamescdavis>
-//                 Dan Freeman <https://github.com/dfreeman>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Minimum TypeScript Version: 4.4
-
 // Capitalization is intentional: this makes it much easier to re-export RSVP on
 // the Ember namespace.
 import Rsvp from 'rsvp';

From bb0811dbf4928e251d897e2572d653680a46cdb1 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 10:16:19 -0600
Subject: [PATCH 1098/1405] Update preview type tests for array and mutable

---
 types/preview/@ember/array/mutable.d.ts       | 126 +++++++++---------
 .../preview/@ember/array/test/array-proxy.ts  |  32 ++---
 2 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/types/preview/@ember/array/mutable.d.ts b/types/preview/@ember/array/mutable.d.ts
index 505408a66be..e047a73974c 100644
--- a/types/preview/@ember/array/mutable.d.ts
+++ b/types/preview/@ember/array/mutable.d.ts
@@ -1,7 +1,7 @@
-import Mixin from "@ember/object/mixin";
-import MutableEnumerable from "@ember/array/-private/mutable-enumerable";
+import Mixin from '@ember/object/mixin';
+import MutableEnumerable from '@ember/array/-private/mutable-enumerable';
 import EmberArray from '@ember/array';
-import Enumerable from "@ember/array/-private/enumerable";
+import Enumerable from '@ember/array/-private/enumerable';
 
 /**
  * This mixin defines the API for modifying array-like objects. These methods
@@ -10,66 +10,66 @@ import Enumerable from "@ember/array/-private/enumerable";
  * One concrete implementations of this class include ArrayProxy.
  */
 interface MutableArray<T> extends EmberArray<T>, MutableEnumerable<T> {
-    /**
-     * __Required.__ You must implement this method to apply this mixin.
-     */
-    replace(idx: number, amt: number, objects: T[]): this;
-    /**
-     * Remove all elements from the array. This is useful if you
-     * want to reuse an existing array without having to recreate it.
-     */
-    clear(): this;
-    /**
-     * This will use the primitive `replace()` method to insert an object at the
-     * specified index.
-     */
-    insertAt(idx: number, object: T): this;
-    /**
-     * Remove an object at the specified index using the `replace()` primitive
-     * method. You can pass either a single index, or a start and a length.
-     */
-    removeAt(start: number, len?: number): this;
-    /**
-     * Push the object onto the end of the array. Works just like `push()` but it
-     * is KVO-compliant.
-     */
-    pushObject(obj: T): T;
-    /**
-     * Add the objects in the passed numerable to the end of the array. Defers
-     * notifying observers of the change until all objects are added.
-     */
-    pushObjects(objects: Enumerable<T>): this;
-    /**
-     * Pop object from array or nil if none are left. Works just like `pop()` but
-     * it is KVO-compliant.
-     */
-    popObject(): T;
-    /**
-     * Shift an object from start of array or nil if none are left. Works just
-     * like `shift()` but it is KVO-compliant.
-     */
-    shiftObject(): T;
-    /**
-     * Unshift an object to start of array. Works just like `unshift()` but it is
-     * KVO-compliant.
-     */
-    unshiftObject(obj: T): T;
-    /**
-     * Adds the named objects to the beginning of the array. Defers notifying
-     * observers until all objects have been added.
-     */
-    unshiftObjects(objects: Enumerable<T>): this;
-    /**
-     * Reverse objects in the array. Works just like `reverse()` but it is
-     * KVO-compliant.
-     */
-    reverseObjects(): this;
-    /**
-     * Replace all the receiver's content with content of the argument.
-     * If argument is an empty array receiver will be cleared.
-     */
-    setObjects(objects: EmberArray<T>): this;
+  /**
+   * __Required.__ You must implement this method to apply this mixin.
+   */
+  replace(idx: number, amt: number, objects: T[]): this;
+  /**
+   * Remove all elements from the array. This is useful if you
+   * want to reuse an existing array without having to recreate it.
+   */
+  clear(): this;
+  /**
+   * This will use the primitive `replace()` method to insert an object at the
+   * specified index.
+   */
+  insertAt(idx: number, object: T): this;
+  /**
+   * Remove an object at the specified index using the `replace()` primitive
+   * method. You can pass either a single index, or a start and a length.
+   */
+  removeAt(start: number, len?: number): this;
+  /**
+   * Push the object onto the end of the array. Works just like `push()` but it
+   * is KVO-compliant.
+   */
+  pushObject(obj: T): T;
+  /**
+   * Add the objects in the passed numerable to the end of the array. Defers
+   * notifying observers of the change until all objects are added.
+   */
+  pushObjects(objects: Enumerable<T>): this;
+  /**
+   * Pop object from array or nil if none are left. Works just like `pop()` but
+   * it is KVO-compliant.
+   */
+  popObject(): T;
+  /**
+   * Shift an object from start of array or nil if none are left. Works just
+   * like `shift()` but it is KVO-compliant.
+   */
+  shiftObject(): T;
+  /**
+   * Unshift an object to start of array. Works just like `unshift()` but it is
+   * KVO-compliant.
+   */
+  unshiftObject(obj: T): T;
+  /**
+   * Adds the named objects to the beginning of the array. Defers notifying
+   * observers until all objects have been added.
+   */
+  unshiftObjects(objects: Enumerable<T>): this;
+  /**
+   * Reverse objects in the array. Works just like `reverse()` but it is
+   * KVO-compliant.
+   */
+  reverseObjects(): this;
+  /**
+   * Replace all the receiver's content with content of the argument.
+   * If argument is an empty array receiver will be cleared.
+   */
+  setObjects(objects: EmberArray<T>): this;
 }
 
-declare const MutableArray: Mixin<MutableArray<unknown>>;
+declare const MutableArray: Mixin;
 export default MutableArray;
diff --git a/types/preview/@ember/array/test/array-proxy.ts b/types/preview/@ember/array/test/array-proxy.ts
index 397f08183f7..4aa3714dc08 100644
--- a/types/preview/@ember/array/test/array-proxy.ts
+++ b/types/preview/@ember/array/test/array-proxy.ts
@@ -11,16 +11,16 @@ proxy.set('content', A(['amoeba', 'paramecium']));
 proxy.get('firstObject'); // 'amoeba'
 
 const overridden = ArrayProxy.create({
-    content: A(pets),
-    objectAtContent(idx: number): string | undefined {
-        return this.get('content').objectAt(idx)?.toUpperCase();
-    },
+  content: A(pets),
+  objectAtContent(this: ArrayProxy<string>, idx: number): string | undefined {
+    return this.get('content').objectAt(idx)?.toUpperCase();
+  },
 });
 
 overridden.get('firstObject'); // 'DOG'
 
 class MyNewProxy<T> extends ArrayProxy<T> {
-    isNew = true;
+  isNew = true;
 }
 
 const x = MyNewProxy.create({ content: A([1, 2, 3]) }) as MyNewProxy<number>;
@@ -29,20 +29,20 @@ assertType<boolean>(x.isNew);
 
 // Custom EmberArray
 class MyArray<T> extends EmberObject.extend(EmberArray) {
-    constructor(content: ArrayLike<T>) {
-        super();
-        this._content = content;
-    }
+  constructor(content: ArrayLike<T>) {
+    super();
+    this._content = content;
+  }
 
-    _content: ArrayLike<T>;
+  _content: ArrayLike<T>;
 
-    get length() {
-        return this._content.length;
-    }
+  get length() {
+    return this._content.length;
+  }
 
-    objectAt(idx: number) {
-        return this._content[idx];
-    }
+  objectAt(idx: number) {
+    return this._content[idx];
+  }
 }
 
 const customArrayProxy = ArrayProxy.create({ content: new MyArray(pets) });

From 52abdf166e8a5c80063a6a6f59a6dfb7682d6287 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 10:24:05 -0600
Subject: [PATCH 1099/1405] Update preview types for @ember/controller

---
 types/preview/@ember/controller/index.d.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
index da29c40835e..1be720b28f6 100644
--- a/types/preview/@ember/controller/index.d.ts
+++ b/types/preview/@ember/controller/index.d.ts
@@ -1,7 +1,6 @@
 import ActionHandler from '@ember/object/-private/action-handler';
 import Mixin from '@ember/object/mixin';
 import EmberObject from '@ember/object';
-import ComputedProperty from '@ember/object/computed';
 
 type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
 type QueryParamScopeTypes = 'controller' | 'model';
@@ -32,13 +31,13 @@ export interface ControllerMixin extends ActionHandler {
   queryParams: Array<string | Record<string, QueryParamConfig | string | undefined>>;
   target: object;
 }
-export const ControllerMixin: Mixin<ControllerMixin>;
+export const ControllerMixin: Mixin;
 
 export default class Controller extends EmberObject {}
 export default interface Controller extends ControllerMixin {}
 
-export function inject(): ComputedProperty<Controller>;
-export function inject<K extends keyof Registry>(name: K): ComputedProperty<Registry[K]>;
+export function inject(): Controller;
+export function inject<K extends keyof Registry>(name: K): Registry[K];
 export function inject(target: object, propertyKey: string | symbol): void;
 
 // A type registry for Ember `Controller`s. Meant to be declaration-merged

From 2dab32225421bda5a988c91174821ea0091e69a3 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 10:50:39 -0600
Subject: [PATCH 1100/1405] Fix more preview types and types tests for
 EmberArray

---
 .../@ember/array/-private/enumerable.d.ts     |  3 +-
 types/preview/@ember/array/test/array.ts      | 76 ++++++++++---------
 types/preview/ember/test/array.ts             | 73 +++++++++++-------
 3 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/types/preview/@ember/array/-private/enumerable.d.ts b/types/preview/@ember/array/-private/enumerable.d.ts
index eb33abcf7df..876e81a3d08 100644
--- a/types/preview/@ember/array/-private/enumerable.d.ts
+++ b/types/preview/@ember/array/-private/enumerable.d.ts
@@ -165,7 +165,8 @@ interface Enumerable<T> {
    * this property, it will return this. If you set this property to a new
    * array, it will replace the current content.
    */
-  '[]': ComputedProperty;
+  get '[]'(): this;
+  set '[]'(newValue: Enumerable<T>);
 }
 
 declare const Enumerable: Mixin;
diff --git a/types/preview/@ember/array/test/array.ts b/types/preview/@ember/array/test/array.ts
index f035b6fdaa5..1f63d8f9eb7 100755
--- a/types/preview/@ember/array/test/array.ts
+++ b/types/preview/@ember/array/test/array.ts
@@ -1,56 +1,62 @@
-import { assertType } from './lib/assert';
 import EmberObject from '@ember/object';
 import EmberArray, { A } from '@ember/array';
 import MutableArray from '@ember/array/mutable';
+import { expectTypeOf } from 'expect-type';
 
-type Person = typeof Person.prototype;
-const Person = EmberObject.extend({
-    name: '',
-    isHappy: false,
-});
+class Person extends EmberObject {
+  name = '';
+  isHappy = false;
+}
 
-const people = A([Person.create({ name: 'Yehuda', isHappy: true }), Person.create({ name: 'Majd', isHappy: false })]);
+const people = A([
+  Person.create({ name: 'Yehuda', isHappy: true }),
+  Person.create({ name: 'Majd', isHappy: false }),
+]);
 
-assertType<number>(people.get('length'));
-assertType<Person>(people.get('lastObject'));
-assertType<Person>(people.get('firstObject'));
-assertType<boolean>(people.isAny('isHappy'));
-assertType<boolean>(people.isAny('isHappy', false));
+expectTypeOf(people.get('length')).toBeNumber();
+expectTypeOf(people.get('lastObject')).toEqualTypeOf<Person | undefined>();
+expectTypeOf(people.get('firstObject')).toEqualTypeOf<Person | undefined>();
+expectTypeOf(people.isAny('isHappy')).toBeBoolean();
+expectTypeOf(people.isAny('isHappy', false)).toBeBoolean();
 // @ts-expect-error
-assertType<boolean>(people.isAny('isHappy', "false"));
+people.isAny('isHappy', 'false');
 
-assertType<Person | undefined>(people.objectAt(0));
-assertType<EmberArray<Person | undefined>>(people.objectsAt([1, 2, 3]));
+expectTypeOf(people.objectAt(0)).toEqualTypeOf<Person | undefined>();
+expectTypeOf(people.objectsAt([1, 2, 3])).toEqualTypeOf<EmberArray<Person | undefined>>();
 
-const persons1: Person[] = people.filterBy('isHappy');
-const persons2: MutableArray<Person> = people.filterBy('isHappy');
-const persons3: Person[] = people.rejectBy('isHappy');
-const persons4: MutableArray<Person> = people.rejectBy('isHappy');
-const persons5: Person[] = people.filter(person => person.get('name') === 'Yehuda');
-const persons6: MutableArray<Person> = people.filter(person => person.get('name') === 'Yehuda');
+expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Person[]>();
+expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<MutableArray<Person>>();
+expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Person[]>();
+expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<MutableArray<Person>>();
+expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<Person[]>();
+expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<
+  MutableArray<Person>
+>();
 
-assertType<typeof people>(people.get('[]'));
-assertType<Person>(people.get('[]').get('firstObject'));
+expectTypeOf(people.get('[]')).toEqualTypeOf<typeof people>();
+expectTypeOf(people.get('[]').get('firstObject')).toEqualTypeOf<Person | undefined>();
 
-assertType<boolean[]>(people.mapBy('isHappy'));
-assertType<unknown[]>(people.mapBy('name.length'));
+expectTypeOf(people.mapBy('isHappy')).toEqualTypeOf<boolean[]>();
+expectTypeOf(people.mapBy('name.length')).toEqualTypeOf<unknown[]>();
 
-const last = people.get('lastObject'); // $ExpectType ({ name: string; isHappy: boolean; } & EmberObject & { name: string; isHappy: boolean; }) | undefined
+const last = people.get('lastObject');
+expectTypeOf(last).toEqualTypeOf<Person | undefined>();
 if (last) {
-    assertType<string>(last.get('name'));
+  expectTypeOf(last.get('name')).toBeString();
 }
 
 const first = people.get('lastObject');
 if (first) {
-    assertType<boolean>(first.get('isHappy'));
+  expectTypeOf(first.get('isHappy')).toBeBoolean();
 }
 
 const letters: EmberArray<string> = A(['a', 'b', 'c']);
-const codes: number[] = letters.map((item, index, enumerable) => {
-    assertType<string>(item);
-    assertType<number>(index);
-    return item.charCodeAt(0);
+const codes = letters.map((item, index, enumerable) => {
+  expectTypeOf(item).toBeString();
+  expectTypeOf(index).toBeNumber();
+  return item.charCodeAt(0);
 });
+expectTypeOf(codes).toEqualTypeOf<number[]>();
 
 const value = '1,2,3';
 const filters = A(value.split(','));
@@ -58,8 +64,8 @@ filters.push('4');
 filters.sort();
 
 const multiSortArr = A([
-    { k: 'a', v: 'z' },
-    { k: 'a', v: 'y' },
-    { k: 'b', v: 'c' },
+  { k: 'a', v: 'z' },
+  { k: 'a', v: 'y' },
+  { k: 'b', v: 'c' },
 ]);
 multiSortArr.sortBy('k', 'v');
diff --git a/types/preview/ember/test/array.ts b/types/preview/ember/test/array.ts
index f4cbaae2d83..5c1588211e2 100755
--- a/types/preview/ember/test/array.ts
+++ b/types/preview/ember/test/array.ts
@@ -1,50 +1,69 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 
-type Person = typeof Person.prototype;
-const Person = Ember.Object.extend({
-    name: '',
-    isHappy: false,
-});
+class Person extends Ember.Object {
+  name = '';
+  isHappy = false;
+}
 
 const people = Ember.A([
-    Person.create({ name: 'Yehuda', isHappy: true }),
-    Person.create({ name: 'Majd', isHappy: false }),
+  Person.create({ name: 'Yehuda', isHappy: true }),
+  Person.create({ name: 'Majd', isHappy: false }),
 ]);
 
-assertType<number>(people.get('length'));
-assertType<Person>(people.get('lastObject'));
-assertType<boolean>(people.isAny('isHappy'));
+expectTypeOf(people.get('length')).toBeNumber();
+expectTypeOf(people.get('lastObject')).toEqualTypeOf<Person | undefined>();
+expectTypeOf(people.get('firstObject')).toEqualTypeOf<Person | undefined>();
+expectTypeOf(people.isAny('isHappy')).toBeBoolean();
+expectTypeOf(people.isAny('isHappy', false)).toBeBoolean();
 // @ts-expect-error
-assertType<boolean>(people.isAny('isHappy', 'false'));
-assertType<boolean>(people.isAny('isHappy', false));
-assertType<Ember.Enumerable<Person>>(people.filterBy('isHappy'));
-assertType<Ember.Enumerable<Person>>(people.rejectBy('isHappy'));
-assertType<Ember.Enumerable<Person>>(people.filter(person => person.get('name') === 'Yehuda'));
-assertType<typeof people>(people.get('[]'));
-assertType<Person>(people.get('[]').get('firstObject'));
+people.isAny('isHappy', 'false');
+
+expectTypeOf(people.objectAt(0)).toEqualTypeOf<Person | undefined>();
+expectTypeOf(people.objectsAt([1, 2, 3])).toEqualTypeOf<Ember.Array<Person | undefined>>();
+
+expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Person[]>();
+expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Ember.MutableArray<Person>>();
+expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Person[]>();
+expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Ember.MutableArray<Person>>();
+expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<Person[]>();
+expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<
+  Ember.MutableArray<Person>
+>();
 
-assertType<Ember.Array<boolean>>(people.mapBy('isHappy'));
-assertType<unknown[]>(people.mapBy('name.length'));
+expectTypeOf(people.get('[]')).toEqualTypeOf<typeof people>();
+expectTypeOf(people.get('[]').get('firstObject')).toEqualTypeOf<Person | undefined>();
+
+expectTypeOf(people.mapBy('isHappy')).toEqualTypeOf<boolean[]>();
+expectTypeOf(people.mapBy('name.length')).toEqualTypeOf<unknown[]>();
 
 const last = people.get('lastObject');
+expectTypeOf(last).toEqualTypeOf<Person | undefined>();
 if (last) {
-    assertType<string>(last.get('name'));
+  expectTypeOf(last.get('name')).toBeString();
 }
 
 const first = people.get('lastObject');
 if (first) {
-    assertType<boolean>(first.get('isHappy'));
+  expectTypeOf(first.get('isHappy')).toBeBoolean();
 }
 
-const letters: Ember.Enumerable<string> = Ember.A(['a', 'b', 'c']);
-const codes: number[] = letters.map((item, index, enumerable) => {
-    assertType<string>(item);
-    assertType<number>(index);
-    return item.charCodeAt(0);
+const letters: Ember.Array<string> = Ember.A(['a', 'b', 'c']);
+const codes = letters.map((item, index, enumerable) => {
+  expectTypeOf(item).toBeString();
+  expectTypeOf(index).toBeNumber();
+  return item.charCodeAt(0);
 });
+expectTypeOf(codes).toEqualTypeOf<number[]>();
 
 const value = '1,2,3';
 const filters = Ember.A(value.split(','));
 filters.push('4');
 filters.sort();
+
+const multiSortArr = Ember.A([
+  { k: 'a', v: 'z' },
+  { k: 'a', v: 'y' },
+  { k: 'b', v: 'c' },
+]);
+multiSortArr.sortBy('k', 'v');

From 4730ecd8b7a8e6b7b3f560fb7dabd3de605c3753 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 10:58:59 -0600
Subject: [PATCH 1101/1405] Fix preview types and tests for `Evented`

---
 types/preview/@ember/object/test/event.ts | 160 +++++++++++-----------
 types/preview/ember/index.d.ts            |   1 +
 types/preview/ember/test/event.ts         |  91 ++++++------
 3 files changed, 129 insertions(+), 123 deletions(-)

diff --git a/types/preview/@ember/object/test/event.ts b/types/preview/@ember/object/test/event.ts
index 386735b5098..dc80b26f1ec 100644
--- a/types/preview/@ember/object/test/event.ts
+++ b/types/preview/@ember/object/test/event.ts
@@ -1,92 +1,96 @@
-import EmberObject, { observer } from '@ember/object';
+import EmberObject from '@ember/object';
 import { sendEvent, addListener, removeListener } from '@ember/object/events';
 import Evented, { on } from '@ember/object/evented';
 
 function testOn() {
-    const Job = EmberObject.extend({
-        logStartOrUpdate: on('started', 'updated', () => {
-            console.log('Job updated!');
-        }),
-        logCompleted: on('completed', () => {
-            console.log('Job completed!');
-        }),
-    });
-
-    const job = Job.create();
-
-    sendEvent(job, 'started'); // Logs 'Job started!'
-    sendEvent(job, 'updated'); // Logs 'Job updated!'
-    sendEvent(job, 'completed'); // Logs 'Job completed!'
+  const Job = EmberObject.extend({
+    logStartOrUpdate: on('started', 'updated', () => {
+      console.log('Job updated!');
+    }),
+    logCompleted: on('completed', () => {
+      console.log('Job completed!');
+    }),
+  });
+
+  const job = Job.create();
+
+  sendEvent(job, 'started'); // Logs 'Job started!'
+  sendEvent(job, 'updated'); // Logs 'Job updated!'
+  sendEvent(job, 'completed'); // Logs 'Job completed!'
 }
 
 function testEvented() {
-    const Person = EmberObject.extend(Evented, {
-        greet() {
-            this.trigger('greet');
-        },
-    });
-
-    const person = Person.create();
-
-    person.on('potato', 'greet');
-
-    const target = {
-        hi() {
-            console.log('Hello!');
-        },
-    };
-
-    person.on('greet', () => {
-        console.log('Our person has greeted');
-    });
-
-    person
-        .on('greet', () => {
-            console.log('Our person has greeted');
-        })
-        .one('greet', () => {
-            console.log('Offer one-time special');
-        })
-        .off('event', {}, () => {});
-
-    person.on('greet', target, 'hi').one('greet', target, 'hi').off('event', target, 'hi');
-
-    person.on('greet', target, target.hi).one('greet', target, target.hi).off('event', target, target.hi);
-
-    person.greet();
+  interface Person extends Evented {}
+  class Person extends EmberObject {
+    greet() {
+      this.trigger('greet');
+    }
+  }
+
+  const person = Person.create();
+
+  person.on('potato', 'greet');
+
+  const target = {
+    hi() {
+      console.log('Hello!');
+    },
+  };
+
+  person.on('greet', () => {
+    console.log('Our person has greeted');
+  });
+
+  person
+    .on('greet', () => {
+      console.log('Our person has greeted');
+    })
+    .one('greet', () => {
+      console.log('Offer one-time special');
+    })
+    .off('event', {}, () => {});
+
+  person.on('greet', target, 'hi').one('greet', target, 'hi').off('event', target, 'hi');
+
+  person
+    .on('greet', target, target.hi)
+    .one('greet', target, target.hi)
+    .off('event', target, target.hi);
+
+  person.greet();
 }
 
 function testObserver() {
-    EmberObject.extend({
-        // TODO: enable after https://github.com/typed-ember/ember-cli-typescript/issues/290
-        // valueObserver: observer('value', () => {
-        //     // Executes whenever the "value" property changes
-        // })
-    });
+  EmberObject.extend({
+    // TODO: enable after https://github.com/typed-ember/ember-cli-typescript/issues/290
+    // valueObserver: observer('value', () => {
+    //     // Executes whenever the "value" property changes
+    // })
+  });
 }
 
 function testListener() {
-    function willDestroyListener() {}
-
-    EmberObject.extend({
-        init() {
-            addListener(this, 'willDestroy', this, 'willDestroyListener');
-            addListener(this, 'willDestroy', this, 'willDestroyListener', true);
-            addListener(this, 'willDestroy', this, willDestroyListener);
-            addListener(this, 'willDestroy', this, willDestroyListener, true);
-            removeListener(this, 'willDestroy', this, 'willDestroyListener');
-            removeListener(this, 'willDestroy', this, willDestroyListener);
-
-            addListener(this, 'willDestroy', 'willDestroyListener');
-            addListener(this, 'willDestroy', 'willDestroyListener', true);
-            addListener(this, 'willDestroy', willDestroyListener);
-            addListener(this, 'willDestroy', willDestroyListener, true);
-            removeListener(this, 'willDestroy', 'willDestroyListener');
-            removeListener(this, 'willDestroy', willDestroyListener);
-        },
-
-        willDestroyListener() {
-            willDestroyListener();
-        },
-    });
+  function willDestroyListener() {}
+
+  class Destroy extends EmberObject {
+    init() {
+      addListener(this, 'willDestroy', this, 'willDestroyListener');
+      addListener(this, 'willDestroy', this, 'willDestroyListener', true);
+      addListener(this, 'willDestroy', this, willDestroyListener);
+      addListener(this, 'willDestroy', this, willDestroyListener, true);
+      removeListener(this, 'willDestroy', this, 'willDestroyListener');
+      removeListener(this, 'willDestroy', this, willDestroyListener);
+
+      addListener(this, 'willDestroy', 'willDestroyListener');
+      addListener(this, 'willDestroy', 'willDestroyListener', true);
+      addListener(this, 'willDestroy', willDestroyListener);
+      addListener(this, 'willDestroy', willDestroyListener, true);
+      removeListener(this, 'willDestroy', 'willDestroyListener');
+      removeListener(this, 'willDestroy', willDestroyListener);
+    }
+
+    willDestroyListener() {
+      willDestroyListener();
+    }
+  }
 }
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index f6172c80012..ff367607257 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -138,6 +138,7 @@ export namespace Ember {
   const Error: typeof EmberError;
 
   const Evented: typeof EmberObjectEventedNs.default;
+  interface Evented extends EmberObjectEventedNs.default {}
 
   class Mixin extends EmberMixin {}
 
diff --git a/types/preview/ember/test/event.ts b/types/preview/ember/test/event.ts
index ab53935c8f5..90580d8ba9a 100755
--- a/types/preview/ember/test/event.ts
+++ b/types/preview/ember/test/event.ts
@@ -1,60 +1,61 @@
 import Ember from 'ember';
 
 function testOn() {
-    const Job = Ember.Object.extend({
-        logCompleted: Ember.on('completed', () => {
-            console.log('Job completed!');
-        }),
-    });
+  const Job = Ember.Object.extend({
+    logCompleted: Ember.on('completed', () => {
+      console.log('Job completed!');
+    }),
+  });
 
-    const job = Job.create();
+  const job = Job.create();
 
-    Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
+  Ember.sendEvent(job, 'completed'); // Logs 'Job completed!'
 }
 
 function testEvented() {
-    const Person = Ember.Object.extend(Ember.Evented, {
-        greet() {
-            this.trigger('greet');
-        },
-    });
-
-    const person = Person.create();
-
-    person.on('greet', () => {
-        console.log('Our person has greeted');
-    });
-
-    person
-        .on('greet', () => {
-            console.log('Our person has greeted');
-        })
-        .one('greet', () => {
-            console.log('Offer one-time special');
-        })
-        .off('event', {}, () => {});
-
-    person.greet();
+  interface Person extends Ember.Evented {}
+  class Person extends Ember.Object {
+    greet() {
+      this.trigger('greet');
+    }
+  }
+
+  const person = Person.create();
+
+  person.on('greet', () => {
+    console.log('Our person has greeted');
+  });
+
+  person
+    .on('greet', () => {
+      console.log('Our person has greeted');
+    })
+    .one('greet', () => {
+      console.log('Offer one-time special');
+    })
+    .off('event', {}, () => {});
+
+  person.greet();
 }
 
 function testObserver() {
-    Ember.Object.extend({
-        valueObserver: Ember.observer('value', () => {
-            // Executes whenever the "value" property changes
-        }),
-    });
+  Ember.Object.extend({
+    valueObserver: Ember.observer('value', () => {
+      // Executes whenever the "value" property changes
+    }),
+  });
 }
 
 function testListener() {
-    Ember.Component.extend({
-        init() {
-            Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener');
-            Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener', true);
-            Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener);
-            Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener, true);
-            Ember.removeListener(this, 'willDestroyElement', this, 'willDestroyListener');
-            Ember.removeListener(this, 'willDestroyElement', this, this.willDestroyListener);
-        },
-        willDestroyListener() {},
-    });
+  class TestListener extends Ember.Component {
+    init() {
+      Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener');
+      Ember.addListener(this, 'willDestroyElement', this, 'willDestroyListener', true);
+      Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener);
+      Ember.addListener(this, 'willDestroyElement', this, this.willDestroyListener, true);
+      Ember.removeListener(this, 'willDestroyElement', this, 'willDestroyListener');
+      Ember.removeListener(this, 'willDestroyElement', this, this.willDestroyListener);
+    }
+    willDestroyListener() {}
+  }
 }

From b450bc81479a0225771eefe7aa4a30c47c24bc2d Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:05:36 -0600
Subject: [PATCH 1102/1405] Fix preview types and tests for `.create()` and
 `.extend()`

---
 types/preview/@ember/object/test/extend.ts | 76 ++++++++--------------
 types/preview/ember/test/extend.ts         | 76 ++++++++--------------
 2 files changed, 54 insertions(+), 98 deletions(-)

diff --git a/types/preview/@ember/object/test/extend.ts b/types/preview/@ember/object/test/extend.ts
index c70d2e24b18..235271801e9 100644
--- a/types/preview/@ember/object/test/extend.ts
+++ b/types/preview/@ember/object/test/extend.ts
@@ -1,61 +1,39 @@
 import EmberObject from '@ember/object';
-import { assertType } from './lib/assert';
-
-const Person = EmberObject.extend({
-    firstName: '',
-    lastName: '',
-
-    getFullName() {
-        return `${this.firstName} ${this.lastName}`;
-    },
-    getFullName2(): string {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    },
-});
-
-assertType<string>(Person.prototype.firstName);
-assertType<() => string>(Person.prototype.getFullName);
-
-const person = Person.create({
-    firstName: 'Joe',
-    lastName: 'Blow',
-    extra: 42,
-});
-
-assertType<string>(person.getFullName());
-assertType<number>(person.extra);
-
-class ES6Person extends EmberObject {
-    declare firstName: string;
-    declare lastName: string;
-
-    get fullName() {
-        return `${this.firstName} ${this.lastName}`;
-    }
-    get fullName2(): string {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    }
+import { expectTypeOf } from 'expect-type';
+
+class Person extends EmberObject {
+  declare firstName: string;
+  declare lastName: string;
+
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+  get fullName2(): string {
+    return `${this.get('firstName')} ${this.get('lastName')}`;
+  }
 }
 
-assertType<string>(ES6Person.prototype.firstName);
-assertType<string>(ES6Person.prototype.fullName);
+expectTypeOf(Person.prototype.firstName).toBeString();
+expectTypeOf(Person.prototype.fullName).toBeString();
 
-const es6Person = ES6Person.create({
-    firstName: 'Joe',
-    lastName: 'Blow',
-    extra: 42,
+const person = Person.create({
+  firstName: 'Joe',
+  lastName: 'Blow',
+  // @ts-expect-error
+  extra: 42,
 });
 
-assertType<string>(es6Person.fullName);
-assertType<number>(es6Person.extra);
+expectTypeOf(person.fullName).toBeString();
+// @ts-expect-error
+person.extra;
 
 class PersonWithStatics extends EmberObject {
-    static isPerson = true;
+  static isPerson = true;
 }
 const PersonWithStatics2 = PersonWithStatics.extend({});
 class PersonWithStatics3 extends PersonWithStatics {}
 class PersonWithStatics4 extends PersonWithStatics2 {}
-assertType<boolean>(PersonWithStatics.isPerson);
-assertType<boolean>(PersonWithStatics2.isPerson);
-assertType<boolean>(PersonWithStatics3.isPerson);
-assertType<boolean>(PersonWithStatics4.isPerson);
+expectTypeOf(PersonWithStatics.isPerson).toBeBoolean();
+expectTypeOf(PersonWithStatics2.isPerson).toBeBoolean();
+expectTypeOf(PersonWithStatics3.isPerson).toBeBoolean();
+expectTypeOf(PersonWithStatics4.isPerson).toBeBoolean();
diff --git a/types/preview/ember/test/extend.ts b/types/preview/ember/test/extend.ts
index 61dd852accb..a8a50e1b0de 100755
--- a/types/preview/ember/test/extend.ts
+++ b/types/preview/ember/test/extend.ts
@@ -1,61 +1,39 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
-
-const Person = Ember.Object.extend({
-    firstName: '',
-    lastName: '',
-
-    getFullName() {
-        return `${this.firstName} ${this.lastName}`;
-    },
-    getFullName2(): string {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    },
-});
-
-assertType<string>(Person.prototype.firstName);
-assertType<() => string>(Person.prototype.getFullName);
-
-const person = Person.create({
-    firstName: 'Joe',
-    lastName: 'Blow',
-    extra: 42,
-});
-
-assertType<string>(person.getFullName());
-assertType<number>(person.extra);
-
-class ES6Person extends Ember.Object {
-    declare firstName: string;
-    declare lastName: string;
-
-    get fullName() {
-        return `${this.firstName} ${this.lastName}`;
-    }
-    get fullName2(): string {
-        return `${this.get('firstName')} ${this.get('lastName')}`;
-    }
+import { expectTypeOf } from 'expect-type';
+
+class Person extends Ember.Object {
+  declare firstName: string;
+  declare lastName: string;
+
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+  get fullName2(): string {
+    return `${this.get('firstName')} ${this.get('lastName')}`;
+  }
 }
 
-assertType<string>(ES6Person.prototype.firstName);
-assertType<string>(ES6Person.prototype.fullName);
+expectTypeOf(Person.prototype.firstName).toBeString();
+expectTypeOf(Person.prototype.fullName).toBeString();
 
-const es6Person = ES6Person.create({
-    firstName: 'Joe',
-    lastName: 'Blow',
-    extra: 42,
+const person = Person.create({
+  firstName: 'Joe',
+  lastName: 'Blow',
+  // @ts-expect-error
+  extra: 42,
 });
 
-assertType<string>(es6Person.fullName);
-assertType<number>(es6Person.extra);
+expectTypeOf(person.fullName).toBeString();
+// @ts-expect-error
+person.extra;
 
 class PersonWithStatics extends Ember.Object {
-    static isPerson = true;
+  static isPerson = true;
 }
 const PersonWithStatics2 = PersonWithStatics.extend({});
 class PersonWithStatics3 extends PersonWithStatics {}
 class PersonWithStatics4 extends PersonWithStatics2 {}
-assertType<boolean>(PersonWithStatics.isPerson);
-assertType<boolean>(PersonWithStatics2.isPerson);
-assertType<boolean>(PersonWithStatics3.isPerson);
-assertType<boolean>(PersonWithStatics4.isPerson);
+expectTypeOf(PersonWithStatics.isPerson).toBeBoolean();
+expectTypeOf(PersonWithStatics2.isPerson).toBeBoolean();
+expectTypeOf(PersonWithStatics3.isPerson).toBeBoolean();
+expectTypeOf(PersonWithStatics4.isPerson).toBeBoolean();

From cb5fb2b1f13558a05e11c358072691ecc2bc4fc0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:07:03 -0600
Subject: [PATCH 1103/1405] Fix preview type tests for
 `@ember/object/observable`

---
 .../ember/test/private/observable-tests.ts     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/types/preview/ember/test/private/observable-tests.ts b/types/preview/ember/test/private/observable-tests.ts
index ed4a2371a9a..7e48fd3f785 100644
--- a/types/preview/ember/test/private/observable-tests.ts
+++ b/types/preview/ember/test/private/observable-tests.ts
@@ -52,6 +52,24 @@ class DemoObservable implements Observable {
     Ember.addObserver(this, 'foo', lambda);
     Ember.removeObserver(this, 'foo', lambda);
   }
+  _super(...args: any[]) {
+    throw new Error('Method not implemented.');
+  }
+  init(): void {
+    throw new Error('Method not implemented.');
+  }
+  declare concatenatedProperties: string[] | null;
+  declare isDestroyed: boolean;
+  declare isDestroying: boolean;
+  destroy(): this {
+    throw new Error('Method not implemented.');
+  }
+  willDestroy(): void {
+    throw new Error('Method not implemented.');
+  }
+  toString(): string {
+    throw new Error('Method not implemented.');
+  }
 
   fooDidChange(obj: this, propName: string) {}
   protected fooDidChangeProtected(obj: this, propName: string) {}

From fe030dc5df8d2dee15f1a9ad68df4d77deccf516 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:17:56 -0600
Subject: [PATCH 1104/1405] Fix a few more preview type test issues around
 observable

---
 .../preview/@ember/object/test/observable.ts  | 24 +++++++++----------
 types/preview/ember/test/observable.ts        | 12 ++++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/types/preview/@ember/object/test/observable.ts b/types/preview/@ember/object/test/observable.ts
index f28fe064ed7..fc9ccdcc146 100644
--- a/types/preview/@ember/object/test/observable.ts
+++ b/types/preview/@ember/object/test/observable.ts
@@ -110,19 +110,19 @@ function testSetProperties() {
 }
 
 function testDynamic() {
-  const obj: any = {};
-  const dynamicKey: string = 'dummy'; // eslint-disable-line @typescript-eslint/no-inferrable-types
+  const obj: Record<string, string> = {};
+  const dynamicKey = 'dummy' as string;
 
-  expectTypeOf(get(obj, 'dummy')).toBeAny();
-  expectTypeOf(get(obj, dynamicKey)).toBeAny();
-  expectTypeOf(getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: any }>();
-  expectTypeOf(getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: any }>();
-  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, any>>();
-  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, any>>();
-  expectTypeOf(set(obj, 'dummy', 'value')).toBeAny();
-  expectTypeOf(set(obj, dynamicKey, 'value')).toBeAny();
-  expectTypeOf(setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<Record<'dummy', any>>();
+  expectTypeOf(get(obj, 'dummy')).toEqualTypeOf<string | undefined>();
+  expectTypeOf(get(obj, dynamicKey)).toEqualTypeOf<string | undefined>();
+  expectTypeOf(getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string | undefined }>();
+  expectTypeOf(getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
+  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(set(obj, 'dummy', 'value')).toBeString();
+  expectTypeOf(set(obj, dynamicKey, 'value')).toBeString();
+  expectTypeOf(setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<Record<'dummy', string>>();
   expectTypeOf(setProperties(obj, { [dynamicKey]: 'value' })).toEqualTypeOf<
-    Record<string | number, any>
+    Record<string, string>
   >();
 }
diff --git a/types/preview/ember/test/observable.ts b/types/preview/ember/test/observable.ts
index afb5aadf508..c4ccd9c4469 100755
--- a/types/preview/ember/test/observable.ts
+++ b/types/preview/ember/test/observable.ts
@@ -115,8 +115,12 @@ function testDynamic() {
   expectTypeOf(Ember.getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
   expectTypeOf(Ember.getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
   expectTypeOf(Ember.getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
-  assertType<string | undefined>(Ember.set(obj, 'dummy', 'value'));
-  assertType<string | undefined>(Ember.set(obj, dynamicKey, 'value'));
-  assertType<{ dummy: string | undefined }>(Ember.setProperties(obj, { dummy: 'value ' }));
-  assertType<Record<string, string>>(Ember.setProperties(obj, { [dynamicKey]: 'value' }));
+  expectTypeOf(Ember.set(obj, 'dummy', 'value')).toBeString();
+  expectTypeOf(Ember.set(obj, dynamicKey, 'value')).toBeString();
+  expectTypeOf(Ember.setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<
+    Record<'dummy', string>
+  >();
+  expectTypeOf(Ember.setProperties(obj, { [dynamicKey]: 'value' })).toEqualTypeOf<
+    Record<string, string>
+  >();
 }

From d95a927fdcd851bbada245190f94d024734d6d30 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:33:20 -0600
Subject: [PATCH 1105/1405] Fix preview type tests for Ember Component

---
 .../@ember/component/test/component.ts        | 167 +++++++++--------
 types/preview/ember/test/component.ts         | 173 +++++++++---------
 2 files changed, 166 insertions(+), 174 deletions(-)

diff --git a/types/preview/@ember/component/test/component.ts b/types/preview/@ember/component/test/component.ts
index 64596a83fa6..adb2a269a90 100644
--- a/types/preview/@ember/component/test/component.ts
+++ b/types/preview/@ember/component/test/component.ts
@@ -1,141 +1,138 @@
 import Component from '@ember/component';
 import Object, { computed, get } from '@ember/object';
-import hbs from 'htmlbars-inline-precompile';
 import { assertType } from './lib/assert';
 
 Component.extend({
-    layout: hbs`
-        <div>
-          {{yield}}
-        </div>
-    `,
-});
-
-Component.extend({
-    layout: 'my-layout',
+  layout: 'my-layout',
 });
 
 const MyComponent = Component.extend();
 assertType<string | string[]>(get(MyComponent, 'positionalParams'));
 
 const component1 = Component.extend({
-    actions: {
-        hello(name: string) {
-            console.log('Hello', name);
-        },
-    },
-});
-
-Component.extend({
-    name: '',
+  actions: {
     hello(name: string) {
-        this.set('name', name);
+      console.log('Hello', name);
     },
+  },
 });
 
-Component.extend({
-    tagName: 'em',
-});
+class AnotherComponent extends Component {
+  name = '';
+
+  hello(name: string) {
+    this.set('name', name);
+    this.name = name;
+  }
+}
 
 Component.extend({
-    classNames: ['my-class', 'my-other-class'],
+  tagName: 'em',
 });
 
 Component.extend({
-    classNameBindings: ['propertyA', 'propertyB'],
-    propertyA: 'from-a',
-    propertyB: computed(function () {
-        if (!this.get('propertyA')) {
-            return 'from-b';
-        }
-    }),
+  classNames: ['my-class', 'my-other-class'],
 });
 
+class Bindings extends Component {
+  classNameBindings = ['propertyA', 'propertyB'];
+  propertyA = 'from-a';
+
+  @computed()
+  get propertyB() {
+    if (!this.get('propertyA')) {
+      return 'from-b';
+    }
+  }
+}
+
 Component.extend({
-    classNameBindings: ['hovered'],
-    hovered: true,
+  classNameBindings: ['hovered'],
+  hovered: true,
 });
 
+class Message extends Object {
+  empty = false;
+}
+
 Component.extend({
-    classNameBindings: ['messages.empty'],
-    messages: Object.create({
-        empty: true,
-    }),
+  classNameBindings: ['messages.empty'],
+  messages: Message.create({
+    empty: true,
+  }),
 });
 
 Component.extend({
-    classNameBindings: ['isEnabled:enabled:disabled'],
-    isEnabled: true,
+  classNameBindings: ['isEnabled:enabled:disabled'],
+  isEnabled: true,
 });
 
 Component.extend({
-    classNameBindings: ['isEnabled::disabled'],
-    isEnabled: true,
+  classNameBindings: ['isEnabled::disabled'],
+  isEnabled: true,
 });
 
 Component.extend({
-    tagName: 'a',
-    attributeBindings: ['href'],
-    href: 'http://google.com',
+  tagName: 'a',
+  attributeBindings: ['href'],
+  href: 'http://google.com',
 });
 
 Component.extend({
-    tagName: 'a',
-    attributeBindings: ['url:href'],
-    url: 'http://google.com',
+  tagName: 'a',
+  attributeBindings: ['url:href'],
+  url: 'http://google.com',
 });
 
 Component.extend({
-    tagName: 'use',
-    attributeBindings: ['xlinkHref:xlink:href'],
-    xlinkHref: '#triangle',
+  tagName: 'use',
+  attributeBindings: ['xlinkHref:xlink:href'],
+  xlinkHref: '#triangle',
 });
 
 Component.extend({
-    tagName: 'input',
-    attributeBindings: ['disabled'],
-    disabled: false,
+  tagName: 'input',
+  attributeBindings: ['disabled'],
+  disabled: false,
 });
 
 Component.extend({
-    tagName: 'input',
-    attributeBindings: ['disabled'],
-    disabled: computed(() => {
-        if ('someLogic') {
-            return true;
-        } else {
-            return false;
-        }
-    }),
+  tagName: 'input',
+  attributeBindings: ['disabled'],
+  disabled: computed(() => {
+    return someLogic();
+  }),
 });
 
+declare function someLogic(): boolean;
+
 Component.extend({
-    tagName: 'form',
-    attributeBindings: ['novalidate'],
-    novalidate: null,
+  tagName: 'form',
+  attributeBindings: ['novalidate'],
+  novalidate: null,
 });
 
 Component.extend({
-    click(event: object) {
-        // will be called when an instance's
-        // rendered element is clicked
-    },
+  click(event: object) {
+    // will be called when an instance's
+    // rendered element is clicked
+  },
 });
 
 // @ts-expect-error
 Component.reopen({
-    attributeBindings: ['metadata:data-my-metadata'],
-    metadata: '',
+  attributeBindings: ['metadata:data-my-metadata'],
+  metadata: '',
 });
 
 interface MySig {
-    Args: {
-        Named: {
-            name: string;
-            age: number;
-        };
-        Positional: [action: () => void];
+  Args: {
+    Named: {
+      name: string;
+      age: number;
     };
+    Positional: [action: () => void];
+  };
 }
 
 // These type helpers are stolen (and tweaked) from Glimmer and Glint internals
@@ -146,12 +143,12 @@ type NamedArgsFor<T> = GetWithFallback<GetWithFallback<T, 'Args', {}>, 'Named',
 
 interface SigExample extends NamedArgsFor<MySig> {}
 class SigExample extends Component<MySig> {
-    get accessArgs() {
-        const {
-            name, // $ExpectType string
-            age, // $ExpectType number
-        } = this;
-
-        return `${name} is ${age} years old`;
-    }
+  get accessArgs() {
+    const {
+      name, // $ExpectType string
+      age, // $ExpectType number
+    } = this;
+
+    return `${name} is ${age} years old`;
+  }
 }
diff --git a/types/preview/ember/test/component.ts b/types/preview/ember/test/component.ts
index 925a2e7b451..493645d31e2 100755
--- a/types/preview/ember/test/component.ts
+++ b/types/preview/ember/test/component.ts
@@ -1,124 +1,119 @@
 import Ember from 'ember';
-import Component from '@ember/component';
-import Object, { computed } from '@ember/object';
-import hbs from 'htmlbars-inline-precompile';
-import { assertType } from './lib/assert';
-
-Component.extend({
-    layout: hbs`
-        <div>
-          {{yield}}
-        </div>
-    `,
-});
+import { expectTypeOf } from 'expect-type';
 
-Component.extend({
-    layout: 'my-layout',
+Ember.Component.extend({
+  layout: 'my-layout',
 });
 
-const MyComponent = Component.extend();
-assertType<string | string[]>(Ember.get(MyComponent, 'positionalParams'));
-
-const component1 = Component.extend({
-    actions: {
-        hello(name: string) {
-            console.log('Hello', name);
-        },
-    },
-});
+const MyComponent = Ember.Component.extend();
+expectTypeOf(Ember.get(MyComponent, 'positionalParams')).toEqualTypeOf<string | string[]>();
 
-Component.extend({
-    name: '',
+const component1 = Ember.Component.extend({
+  actions: {
     hello(name: string) {
-        this.set('name', name);
+      console.log('Hello', name);
     },
+  },
 });
 
-Component.extend({
-    tagName: 'em',
-});
+class AnotherComponent extends Ember.Component {
+  name = '';
+
+  hello(name: string) {
+    this.set('name', name);
+    this.name = name;
+  }
+}
 
-Component.extend({
-    classNames: ['my-class', 'my-other-class'],
+Ember.Component.extend({
+  tagName: 'em',
 });
 
-Component.extend({
-    classNameBindings: ['propertyA', 'propertyB'],
-    propertyA: 'from-a',
-    propertyB: computed(function () {
-        if (!this.get('propertyA')) {
-            return 'from-b';
-        }
-    }),
+Ember.Component.extend({
+  classNames: ['my-class', 'my-other-class'],
 });
 
-Component.extend({
-    classNameBindings: ['hovered'],
-    hovered: true,
+class Bindings extends Ember.Component {
+  classNameBindings = ['propertyA', 'propertyB'];
+  propertyA = 'from-a';
+
+  @Ember.computed()
+  get propertyB() {
+    if (!this.get('propertyA')) {
+      return 'from-b';
+    }
+  }
+}
+
+Ember.Component.extend({
+  classNameBindings: ['hovered'],
+  hovered: true,
 });
 
-Component.extend({
-    classNameBindings: ['messages.empty'],
-    messages: Object.create({
-        empty: true,
-    }),
+class Message extends Ember.Object {
+  empty = false;
+}
+
+Ember.Component.extend({
+  classNameBindings: ['messages.empty'],
+  messages: Message.create({
+    empty: true,
+  }),
 });
 
-Component.extend({
-    classNameBindings: ['isEnabled:enabled:disabled'],
-    isEnabled: true,
+Ember.Component.extend({
+  classNameBindings: ['isEnabled:enabled:disabled'],
+  isEnabled: true,
 });
 
-Component.extend({
-    classNameBindings: ['isEnabled::disabled'],
-    isEnabled: true,
+Ember.Component.extend({
+  classNameBindings: ['isEnabled::disabled'],
+  isEnabled: true,
 });
 
-Component.extend({
-    tagName: 'a',
-    attributeBindings: ['href'],
-    href: 'http://google.com',
+Ember.Component.extend({
+  tagName: 'a',
+  attributeBindings: ['href'],
+  href: 'http://google.com',
 });
 
-Component.extend({
-    tagName: 'a',
-    attributeBindings: ['url:href'],
-    url: 'http://google.com',
+Ember.Component.extend({
+  tagName: 'a',
+  attributeBindings: ['url:href'],
+  url: 'http://google.com',
 });
 
-Component.extend({
-    tagName: 'use',
-    attributeBindings: ['xlinkHref:xlink:href'],
-    xlinkHref: '#triangle',
+Ember.Component.extend({
+  tagName: 'use',
+  attributeBindings: ['xlinkHref:xlink:href'],
+  xlinkHref: '#triangle',
 });
 
-Component.extend({
-    tagName: 'input',
-    attributeBindings: ['disabled'],
-    disabled: false,
+Ember.Component.extend({
+  tagName: 'input',
+  attributeBindings: ['disabled'],
+  disabled: false,
 });
 
-Component.extend({
-    tagName: 'input',
-    attributeBindings: ['disabled'],
-    disabled: computed(() => {
-        if ('someLogic') {
-            return true;
-        } else {
-            return false;
-        }
-    }),
+Ember.Component.extend({
+  tagName: 'input',
+  attributeBindings: ['disabled'],
+  disabled: Ember.computed(() => {
+    return someLogic();
+  }),
 });
 
-Component.extend({
-    tagName: 'form',
-    attributeBindings: ['novalidate'],
-    novalidate: null,
+declare function someLogic(): boolean;
+
+Ember.Component.extend({
+  tagName: 'form',
+  attributeBindings: ['novalidate'],
+  novalidate: null,
 });
 
-Component.extend({
-    click(event: object) {
-        // will be called when an instance's
-        // rendered element is clicked
-    },
+Ember.Component.extend({
+  click(event: object) {
+    // will be called when an instance's
+    // rendered element is clicked
+  },
 });

From 69eda9f3e0271cd2bd5d309a3f8ed22b175e34ef Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:43:00 -0600
Subject: [PATCH 1106/1405] Improve preview types and tests for helper

---
 types/preview/@ember/component/helper.d.ts    | 104 ++++++------
 types/preview/@ember/component/test/helper.ts | 160 ++++++++++--------
 2 files changed, 144 insertions(+), 120 deletions(-)

diff --git a/types/preview/@ember/component/helper.d.ts b/types/preview/@ember/component/helper.d.ts
index 28a8cf37ec8..1e41c007ce0 100644
--- a/types/preview/@ember/component/helper.d.ts
+++ b/types/preview/@ember/component/helper.d.ts
@@ -21,7 +21,7 @@ declare const Empty: unique symbol;
  *   themselves, so ***DO NOT RELY ON IT***.
  */
 export interface EmptyObject {
-    [Empty]?: true;
+  [Empty]?: true;
 }
 
 type DefaultPositional = unknown[];
@@ -33,24 +33,24 @@ type DefaultNamed = EmptyObject;
  *   "normal" signature shape: `Args: { Named: { ... }, Positional: [...] }`.
  */
 export interface HelperSignature {
-    NamedArgs?: DefaultNamed;
-    PositionalArgs?: DefaultPositional;
-    Return?: unknown;
+  NamedArgs?: DefaultNamed;
+  PositionalArgs?: DefaultPositional;
+  Return?: unknown;
 }
 
 type GetOrElse<Obj, K, Fallback> = K extends keyof Obj ? Obj[K] : Fallback;
 
 /** Given a signature `S`, get back the `Args` type. */
 type ArgsFor<S> = 'Args' extends keyof S
-    ? {
-          Named: GetOrElse<S['Args'], 'Named', DefaultNamed>;
-          Positional: GetOrElse<S['Args'], 'Positional', []>;
-      }
-    : { Named: DefaultNamed; Positional: [] };
+  ? {
+      Named: GetOrElse<S['Args'], 'Named', DefaultNamed>;
+      Positional: GetOrElse<S['Args'], 'Positional', []>;
+    }
+  : { Named: DefaultNamed; Positional: [] };
 
 interface LegacyArgsFor<T> {
-    Named: GetOrElse<T, 'NamedArgs', DefaultNamed>;
-    Positional: GetOrElse<T, 'PositionalArgs', DefaultPositional>;
+  Named: GetOrElse<T, 'NamedArgs', DefaultNamed>;
+  Positional: GetOrElse<T, 'PositionalArgs', DefaultPositional>;
 }
 
 // This type allows us to present a slightly-less-obtuse error message
@@ -58,12 +58,12 @@ interface LegacyArgsFor<T> {
 // one declared from within a tool like Glint.
 declare const BadType: unique symbol;
 interface BadType<Message> {
-    [BadType]: Message;
+  [BadType]: Message;
 }
 
 interface MissingSignatureArgs {
-    Named: BadType<'This helper is missing a signature'>;
-    Positional: unknown[];
+  Named: BadType<'This helper is missing a signature'>;
+  Positional: unknown[];
 }
 
 /**
@@ -84,19 +84,21 @@ interface MissingSignatureArgs {
 // all `ExpandSignature` types fully general to work with *any* invokable. But
 // "future" here probably means Ember v5. :sobbing:
 export interface ExpandSignature<T> {
-    Args: unknown extends T // Is this the default (i.e. unspecified) signature?
-        ? MissingSignatureArgs // Then return our special "missing signature" type
-        : keyof T extends 'Args' | 'Return' // Is this a `Signature`?
-        ? ArgsFor<T> // Then use `Signature` args
-        : LegacyArgsFor<T>; // Otherwise fall back to classic `Args`.
-    Return: 'Return' extends keyof T ? T['Return'] : unknown;
+  Args: unknown extends T // Is this the default (i.e. unspecified) signature?
+    ? MissingSignatureArgs // Then return our special "missing signature" type
+    : keyof T extends 'Args' | 'Return' // Is this a `Signature`?
+    ? ArgsFor<T> // Then use `Signature` args
+    : LegacyArgsFor<T>; // Otherwise fall back to classic `Args`.
+  Return: 'Return' extends keyof T ? T['Return'] : unknown;
 }
 
 // The `unknown extends S` checks on both of these are here to preserve backward
 // compatibility with the existing non-`Signature` definition. When migrating
 // into Ember or otherwise making a breaking change, we can drop the "default"
 // in favor of just using `ExpandSignature`.
-type NamedArgs<S> = unknown extends S ? Record<string, unknown> : ExpandSignature<S>['Args']['Named'];
+type NamedArgs<S> = unknown extends S
+  ? Record<string, unknown>
+  : ExpandSignature<S>['Args']['Named'];
 type PositionalArgs<S> = unknown extends S ? unknown[] : ExpandSignature<S>['Args']['Positional'];
 
 type Return<S> = GetOrElse<S, 'Return', unknown>;
@@ -106,23 +108,23 @@ type Return<S> = GetOrElse<S, 'Return', unknown>;
  * For example, this code calls a helper named `format-currency`:
  */
 export default class Helper<S = unknown> extends EmberObject {
-    /**
-     * In many cases, the ceremony of a full `Ember.Helper` class is not required.
-     * The `helper` method create pure-function helpers without instances. For
-     * example:
-     */
-    static helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
-        helper: (positional: P, named: N) => R,
-    ): Helper<{ Args: { Positional: P; Named: N }; Return: R }>;
-    /**
-     * Override this function when writing a class-based helper.
-     */
-    compute(positional: PositionalArgs<S>, named: NamedArgs<S>): Return<S>;
-    /**
-     * On a class-based helper, it may be useful to force a recomputation of that
-     * helpers value. This is akin to `rerender` on a component.
-     */
-    recompute(): void;
+  /**
+   * In many cases, the ceremony of a full `Ember.Helper` class is not required.
+   * The `helper` method create pure-function helpers without instances. For
+   * example:
+   */
+  static helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
+    helper: (positional: P, named: N) => R
+  ): Helper<{ Args: { Positional: P; Named: N }; Return: R }>;
+  /**
+   * Override this function when writing a class-based helper.
+   */
+  compute(positional: PositionalArgs<S>, named: NamedArgs<S>): Return<S>;
+  /**
+   * On a class-based helper, it may be useful to force a recomputation of that
+   * helpers value. This is akin to `rerender` on a component.
+   */
+  recompute(): void;
 }
 
 // The generic here is for a *signature: a way to hang information for tools
@@ -140,7 +142,7 @@ export default interface Helper<S> extends Opaque<S> {}
 // augmentations of the `Helper` type performed by tools like Glint will
 // also apply to function-based helpers as well.
 export abstract class FunctionBasedHelperInstance<S> extends Helper<S> {
-    protected abstract __concrete__: never;
+  protected abstract __concrete__: never;
 }
 
 /**
@@ -172,13 +174,13 @@ export type FunctionBasedHelper<S> = abstract new () => FunctionBasedHelperInsta
 // This overload allows users to write types directly on the callback passed to
 // the `helper` function and infer the resulting type correctly.
 export function helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
-    helperFn: (positional: P, named: N) => R,
+  helperFn: (positional: P, named: N) => R
 ): FunctionBasedHelper<{
-    Args: {
-        Positional: P;
-        Named: N;
-    };
-    Return: R;
+  Args: {
+    Positional: P;
+    Named: N;
+  };
+  Return: R;
 }>;
 
 // This overload allows users to provide a `Signature` type explicitly at the
@@ -186,13 +188,13 @@ export function helper<P extends DefaultPositional, N = EmptyObject, R = unknown
 // this overload must appear second, since TS' inference engine will not
 // correctly infer the type of `S` here from the types on the supplied callback.
 export function helper<S>(
-    helperFn: (positional: PositionalArgs<S>, named: NamedArgs<S>) => Return<S>,
+  helperFn: (positional: PositionalArgs<S>, named: NamedArgs<S>) => Return<S>
 ): FunctionBasedHelper<{
-    Args: {
-        Positional: PositionalArgs<S>;
-        Named: NamedArgs<S>;
-    };
-    Return: Return<S>;
+  Args: {
+    Positional: PositionalArgs<S>;
+    Named: NamedArgs<S>;
+  };
+  Return: Return<S>;
 }>;
 
 export {};
diff --git a/types/preview/@ember/component/test/helper.ts b/types/preview/@ember/component/test/helper.ts
index 301a167ffb2..2371fd666da 100644
--- a/types/preview/@ember/component/test/helper.ts
+++ b/types/preview/@ember/component/test/helper.ts
@@ -1,120 +1,142 @@
 import Helper, { ExpandSignature, helper } from '@ember/component/helper';
 
 class DeprecatedSignatureForm extends Helper<{
-    PositionalArgs: [offset: Date];
-    Return: Date;
+  PositionalArgs: [offset: Date];
+  Return: Date;
 }> {
-    timer?: ReturnType<typeof setInterval> | undefined;
-    now = new Date();
-    init() {
-        super.init();
-        this.timer = setInterval(() => {
-            this.set('now', new Date());
-            this.recompute();
-        }, 100);
-    }
-    compute([offset]: [Date]): Date {
-        return new Date(this.now.getTime() + offset.getTime());
-    }
-    willDestroy() {
-        clearInterval(this.timer);
+  timer?: ReturnType<typeof setInterval> | undefined;
+  now = new Date();
+  init() {
+    super.init();
+    this.timer = setInterval(() => {
+      this.set('now', new Date());
+      this.recompute();
+    }, 100);
+  }
+  compute([offset]: [Date]): Date {
+    return new Date(this.now.getTime() + offset.getTime());
+  }
+  willDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
     }
+  }
 }
 
 interface DemoSig {
-    Args: {
-        Named: {
-            name: string;
-            age: number;
-        };
-        Positional: [i18nizer: (s: string) => string];
+  Args: {
+    Named: {
+      name: string;
+      age: number;
     };
-    Return: string;
+    Positional: [i18nizer: (s: string) => string];
+  };
+  Return: string;
 }
 
 function testMissingSignature({ Args, Return }: ExpandSignature<unknown>) {
-    // $ExpectType BadType<"This helper is missing a signature">
-    Args.Named;
+  // $ExpectType BadType<"This helper is missing a signature">
+  Args.Named;
 
-    // $ExpectType unknown[]
-    Args.Positional;
+  // $ExpectType unknown[]
+  Args.Positional;
 
-    // $ExpectType unknown
-    Return;
+  // $ExpectType unknown
+  Return;
 }
 
 class SignatureForm extends Helper<DemoSig> {
-    compute([i18nizer]: [i18nizer: (s: string) => string], { name, age }: { name: string; age: number }): string {
-        return i18nizer(`${name} is ${age} years old`);
-    }
+  compute(
+    [i18nizer]: [i18nizer: (s: string) => string],
+    { name, age }: { name: string; age: number }
+  ): string {
+    return i18nizer(`${name} is ${age} years old`);
+  }
 }
 
 class NoSignatureForm extends Helper {
-    compute([i18nizer]: [i18nizer: (s: string) => string], { name, age }: { name: string; age: number }): string {
-        return i18nizer(`${name} is ${age} years old`);
-    }
+  compute(
+    [i18nizer]: [i18nizer: (s: string) => string],
+    { name, age }: { name: string; age: number }
+  ): string {
+    return i18nizer(`${name} is ${age} years old`);
+  }
 }
 
 class BadPosSigForm extends Helper<DemoSig> {
-    compute(
-        // @ts-expect-error
-        [i18nizer, extra]: [i18nizer: (s: string) => string],
-        { name, age }: { name: string; age: number },
-    ): string {
-        return i18nizer(`${name} is ${age} years old`);
-    }
+  compute(
+    // @ts-expect-error
+    [i18nizer, extra]: [i18nizer: (s: string) => string],
+    { name, age }: { name: string; age: number }
+  ): string {
+    return i18nizer(`${name} is ${age} years old`);
+  }
 }
 
 class BadNamedSigForm extends Helper<DemoSig> {
-    compute(
-        [i18nizer]: [i18nizer: (s: string) => string],
-        // @ts-expect-error
-        { name, age, potato }: { name: string; age: number },
-    ): string {
-        return i18nizer(`${name} is ${age} years old`);
-    }
+  compute(
+    [i18nizer]: [i18nizer: (s: string) => string],
+    // @ts-expect-error
+    { name, age, potato }: { name: string; age: number }
+  ): string {
+    return i18nizer(`${name} is ${age} years old`);
+  }
 }
 
 class BadReturnForm extends Helper<DemoSig> {
-    compute([i18nizer]: [i18nizer: (s: string) => string], { name, age }: { name: string; age: number }): string {
-        // @ts-expect-error
-        return Boolean(i18nizer(`${name} is ${age} years old`));
-    }
+  compute(
+    [i18nizer]: [i18nizer: (s: string) => string],
+    { name, age }: { name: string; age: number }
+  ): string {
+    // @ts-expect-error
+    return Boolean(i18nizer(`${name} is ${age} years old`));
+  }
 }
 
 // $ExpectType FunctionBasedHelper<{ Args: { Positional: [number, number]; Named: EmptyObject; }; Return: number; }>
 const inferenceOnPositional = helper(function add([a, b]: [number, number]) {
-    return a + b;
+  return a + b;
 });
 
-const coolHelper = helper(([], named) => {
-    // $ExpectType EmptyObject
-    named;
+const coolHelper = helper((_, named) => {
+  // $ExpectType EmptyObject
+  named;
 });
 
 // $ExpectType FunctionBasedHelper<{ Args: { Positional: DefaultPositional; Named: { cool: boolean; }; }; Return: 123 | "neat"; }>
-const typeInferenceOnNamed = helper(([], { cool }: { cool: boolean }) => {
-    // $ExpectType boolean
-    cool;
+const typeInferenceOnNamed = helper((_, { cool }: { cool: boolean }) => {
+  // $ExpectType boolean
+  cool;
 
-    return cool ? 123 : 'neat';
+  return cool ? 123 : 'neat';
 });
 
 // $ExpectType FunctionBasedHelper<{ Args: { Positional: [string]; Named: { delim?: string; }; }; Return: string; }>
-const dasherizeHelper = helper(function dasherize([str]: [string], { delim = '-' }: { delim?: string }) {
-    return str.split(/[\s\n\_\.]+/g).join(delim);
+const dasherizeHelper = helper(function dasherize(
+  [str]: [string],
+  { delim = '-' }: { delim?: string }
+) {
+  return str.split(/[\s\n_.]+/g).join(delim);
 });
 
-const signatureForm = helper<DemoSig>(([i18nizer], { name, age }) => i18nizer(`${name} is ${age} years old`));
-
-// @ts-expect-error
-const badPosArgsSig = helper<DemoSig>(([i18nizer, extra], { name, age }) => i18nizer(`${name} is ${age} years old`));
+const signatureForm = helper<DemoSig>(([i18nizer], { name, age }) =>
+  i18nizer(`${name} is ${age} years old`)
+);
 
 // @ts-expect-error
-const badNamedArgsSig = helper<DemoSig>(([i18nizer], { name, age, potato }) => i18nizer(`${name} is ${age} years old`));
+const badPosArgsSig = helper<DemoSig>(([i18nizer, extra], { name, age }) =>
+  i18nizer(`${name} is ${age} years old`)
+);
 
 // @ts-expect-error
-const badReturnSig = helper<DemoSig>(([i18nizer], { name, age }) => Boolean(i18nizer(`${name} is ${age} years old`)));
+const badNamedArgsSig = helper<DemoSig>(([i18nizer], { name, age, potato }) =>
+  i18nizer(`${name} is ${age} years old`)
+);
+
+const badReturnSig = helper<DemoSig>(([i18nizer], { name, age }) =>
+  // @ts-expect-error
+  Boolean(i18nizer(`${name} is ${age} years old`))
+);
 
 const greet = helper(([name]: [string]) => `Hello, ${name}`);
 

From d32122b36f28c0781ba3da5d84a4689d975c1b7a Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:43:15 -0600
Subject: [PATCH 1107/1405] Improve preview types and tests for controllers

---
 types/preview/@ember/controller/index.d.ts    |  3 +-
 types/preview/@ember/controller/test/main.ts  | 20 ++++----
 .../preview/@ember/controller/test/octane.ts  | 48 +++++++++----------
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
index 1be720b28f6..44d6c65edef 100644
--- a/types/preview/@ember/controller/index.d.ts
+++ b/types/preview/@ember/controller/index.d.ts
@@ -1,6 +1,7 @@
 import ActionHandler from '@ember/object/-private/action-handler';
 import Mixin from '@ember/object/mixin';
 import EmberObject from '@ember/object';
+import type { BasicComputedProperty } from '@ember/object/computed';
 
 type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
 type QueryParamScopeTypes = 'controller' | 'model';
@@ -37,7 +38,7 @@ export default class Controller extends EmberObject {}
 export default interface Controller extends ControllerMixin {}
 
 export function inject(): Controller;
-export function inject<K extends keyof Registry>(name: K): Registry[K];
+export function inject<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty;
 export function inject(target: object, propertyKey: string | symbol): void;
 
 // A type registry for Ember `Controller`s. Meant to be declaration-merged
diff --git a/types/preview/@ember/controller/test/main.ts b/types/preview/@ember/controller/test/main.ts
index e34d763e167..4fc8c2f0347 100644
--- a/types/preview/@ember/controller/test/main.ts
+++ b/types/preview/@ember/controller/test/main.ts
@@ -1,14 +1,14 @@
 import Controller, { inject } from '@ember/controller';
 
-Controller.extend({
-    queryParams: ['category'],
-    category: null,
-    isExpanded: false,
+class MyController extends Controller {
+  queryParams = ['category'];
+  category = null;
+  isExpanded = false;
 
-    first: inject(),
-    second: inject('second'),
+  @inject declare first: Controller;
+  @inject('second') declare second: Controller;
 
-    toggleBody() {
-        this.toggleProperty('isExpanded');
-    },
-});
+  toggleBody() {
+    this.toggleProperty('isExpanded');
+  }
+}
diff --git a/types/preview/@ember/controller/test/octane.ts b/types/preview/@ember/controller/test/octane.ts
index 1ce829a275b..9d22f33f37b 100644
--- a/types/preview/@ember/controller/test/octane.ts
+++ b/types/preview/@ember/controller/test/octane.ts
@@ -1,36 +1,36 @@
 import Controller, { inject } from '@ember/controller';
 
 class FirstController extends Controller {
-    foo = 'bar';
-    @inject declare second: InstanceType<typeof SecondController>;
-    @inject() declare otherSecond: InstanceType<typeof SecondController>;
-    @inject('second') declare moreSecond: InstanceType<typeof SecondController>;
+  foo = 'bar';
+  @inject declare second: InstanceType<typeof SecondController>;
+  @inject declare otherSecond: InstanceType<typeof SecondController>;
+  @inject('second') declare moreSecond: InstanceType<typeof SecondController>;
 
-    queryParams = [
-        'category',
-        {
-            searchTerm: {
-                as: 'search',
-            },
-            subCategory: 'sub-category',
-        },
-    ];
+  queryParams = [
+    'category',
+    {
+      searchTerm: {
+        as: 'search',
+      },
+      subCategory: 'sub-category',
+    },
+  ];
 
-    first() {
-        return '';
-    }
+  first() {
+    return '';
+  }
 }
 const SecondController = Controller.extend({
-    foo: 'bar',
+  foo: 'bar',
 
-    second() {
-        return '';
-    },
+  second() {
+    return '';
+  },
 });
 
 declare module '@ember/controller' {
-    interface Registry {
-        first: FirstController;
-        second: InstanceType<typeof SecondController>;
-    }
+  interface Registry {
+    first: FirstController;
+    second: InstanceType<typeof SecondController>;
+  }
 }

From 20c6148c42df5514e8e8a5712e3dbe522a952d8f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 11:47:33 -0600
Subject: [PATCH 1108/1405] Fix preview types/tests for @ember/service

---
 types/preview/@ember/service/index.d.ts     | 10 ++--
 types/preview/@ember/service/test/main.ts   | 58 ------------------
 types/preview/@ember/service/test/octane.ts | 34 -----------
 types/preview/ember/test/inject.ts          | 66 +++++++++++----------
 4 files changed, 39 insertions(+), 129 deletions(-)
 delete mode 100644 types/preview/@ember/service/test/main.ts
 delete mode 100644 types/preview/@ember/service/test/octane.ts

diff --git a/types/preview/@ember/service/index.d.ts b/types/preview/@ember/service/index.d.ts
index c87f86f0346..a9fe6f68536 100644
--- a/types/preview/@ember/service/index.d.ts
+++ b/types/preview/@ember/service/index.d.ts
@@ -1,22 +1,22 @@
 import EmberObject from '@ember/object';
-import ComputedProperty from '@ember/object/computed';
+import type { BasicComputedProperty } from '@ember/object/computed';
 
 export default class Service extends EmberObject {}
 /**
  * Creates a property that lazily looks up a service in the container. There
  * are no restrictions as to what objects a service can be injected into.
  */
-export function inject(): ComputedProperty<Service>; // @inject() foo, foo: inject()
+export function inject(): Service; // @inject() foo, foo: inject()
 export function inject(target: object, propertyKey: string | symbol): void; // @inject foo
-export function inject<K extends keyof Registry>(name: K): ComputedProperty<Registry[K]>; // @inject('store') foo      @inject() foo
+export function inject<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty; // @inject('store') foo      @inject() foo
 
 /**
  * Creates a property that lazily looks up a service in the container. There
  * are no restrictions as to what objects a service can be injected into.
  */
-export function service(): ComputedProperty<Service>; // @service() foo, foo: service()
+export function service(): Service; // @service() foo, foo: service()
 export function service(target: object, propertyKey: string | symbol): void; // @service foo
-export function service<K extends keyof Registry>(name: K): ComputedProperty<Registry[K]>; // @service('store') foo      @service() foo
+export function service<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty; // @service('store') foo      @service() foo
 
 // A type registry for Ember `Service`s. Meant to be declaration-merged so
 // string lookups resolve to the correct type.
diff --git a/types/preview/@ember/service/test/main.ts b/types/preview/@ember/service/test/main.ts
deleted file mode 100644
index 3fca6a674aa..00000000000
--- a/types/preview/@ember/service/test/main.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import Service, { inject, service } from '@ember/service';
-import EmberObject from '@ember/object';
-
-class FirstSvc extends Service {
-    foo = 'bar';
-    first() {
-        return '';
-    }
-}
-const SecondSvc = Service.extend({
-    foo: 'bar',
-    second() {
-        return '';
-    },
-});
-
-class ThirdSvc extends Service.extend({
-    foo: 'bar',
-    third() {
-        return '';
-    },
-}) {}
-
-declare module '@ember/service' {
-    interface Registry {
-        first: FirstSvc;
-        second: InstanceType<typeof SecondSvc>;
-        third: ThirdSvc;
-    }
-}
-
-const ServiceTriplet = EmberObject.extend({
-    sFirst: inject('first'),
-    sSecond: inject('second'),
-    sThird: inject('third'),
-    unknownService: inject(),
-});
-
-const obj = ServiceTriplet.create();
-
-obj.get('sFirst'); // $ExpectType FirstSvc
-obj.get('sSecond').second(); // $ExpectType ""
-obj.get('sThird'); // $ExpectType ThirdSvc
-obj.get('unknownService'); // $ExpectType Service
-
-const ServiceTripletService = EmberObject.extend({
-    sFirst: service('first'),
-    sSecond: service('second'),
-    sThird: service('third'),
-    unknownService: service(),
-});
-
-const objService = ServiceTripletService.create();
-
-objService.get('sFirst'); // $ExpectType FirstSvc
-objService.get('sSecond').second(); // $ExpectType ""
-objService.get('sThird'); // $ExpectType ThirdSvc
-objService.get('unknownService'); // $ExpectType Service
diff --git a/types/preview/@ember/service/test/octane.ts b/types/preview/@ember/service/test/octane.ts
deleted file mode 100644
index e176dece15b..00000000000
--- a/types/preview/@ember/service/test/octane.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import Service, { inject, service } from '@ember/service';
-import EmberObject from '@ember/object';
-
-class FirstSvc extends Service {
-    foo = 'bar';
-    first() {
-        return '';
-    }
-}
-const SecondSvc = Service.extend({
-    foo: 'bar',
-    second() {
-        return '';
-    },
-});
-
-declare module '@ember/service' {
-    interface Registry {
-        first: FirstSvc;
-        second: InstanceType<typeof SecondSvc>;
-    }
-}
-
-class Foo extends EmberObject {
-    @inject declare foo: FirstSvc;
-    @inject('first') declare baz: FirstSvc;
-    @inject() declare bar: FirstSvc;
-}
-
-class FooService extends EmberObject {
-    @service declare foo: FirstSvc;
-    @service('first') declare baz: FirstSvc;
-    @service() declare bar: FirstSvc;
-}
diff --git a/types/preview/ember/test/inject.ts b/types/preview/ember/test/inject.ts
index 961923c03ba..491ad8def50 100755
--- a/types/preview/ember/test/inject.ts
+++ b/types/preview/ember/test/inject.ts
@@ -1,41 +1,41 @@
 import Ember from 'ember';
 
 class AuthService extends Ember.Service {
-    declare isAuthenticated: boolean;
+  declare isAuthenticated: boolean;
 }
 
 class ApplicationController extends Ember.Controller {
-    model = {};
-    declare string: string;
-    transitionToLogin() {}
+  model = {};
+  declare string: string;
+  transitionToLogin() {}
 }
 
 declare module '@ember/service' {
-    interface Registry {
-        auth: AuthService;
-    }
+  interface Registry {
+    auth: AuthService;
+  }
 }
 
 declare module '@ember/controller' {
-    interface Registry {
-        application: ApplicationController;
-    }
+  interface Registry {
+    application: ApplicationController;
+  }
 }
 
 class LoginRoute extends Ember.Route {
-    auth = Ember.inject.service('auth');
-    application = Ember.inject.controller('application');
+  auth = Ember.inject.service('auth');
+  application = Ember.inject.controller('application');
 
-    didTransition() {
-        if (!this.get('auth').get('isAuthenticated')) {
-            this.get('application').transitionToLogin();
-        }
+  didTransition() {
+    if (!this.get('auth').get('isAuthenticated')) {
+      this.get('application').transitionToLogin();
     }
+  }
 
-    anyOldMethod() {
-        this.get('application').set('string', 'must be a string');
-        this.controllerFor('application'); // $ExpectType Controller
-    }
+  anyOldMethod() {
+    this.get('application').set('string', 'must be a string');
+    this.controllerFor('application'); // $ExpectType Controller
+  }
 }
 
 // New module injection style.
@@ -44,17 +44,19 @@ import Service, { inject as service } from '@ember/service';
 import { assertType } from './lib/assert';
 
 class ComponentInjection extends Ember.Component {
-    applicationController = controller('application');
-    auth = service('auth');
-    router = service('router');
-    misc = service();
-
-    testem() {
-        assertType<Ember.Service>(this.get('misc'));
-        const url = this.get('router').urlFor('some-route', 1, 2, 3, { queryParams: { seriously: 'yes' } });
-        assertType<string>(url);
-        if (!this.get('auth').isAuthenticated) {
-            this.get('applicationController').transitionToLogin();
-        }
+  applicationController = controller('application');
+  auth = service('auth');
+  router = service('router');
+  misc = service();
+
+  testem() {
+    assertType<Ember.Service>(this.get('misc'));
+    const url = this.get('router').urlFor('some-route', 1, 2, 3, {
+      queryParams: { seriously: 'yes' },
+    });
+    assertType<string>(url);
+    if (!this.get('auth').isAuthenticated) {
+      this.get('applicationController').transitionToLogin();
     }
+  }
 }

From 94716e41eab8e88eeb1d94dfd72f068005afe2ff Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 19:26:33 -0600
Subject: [PATCH 1109/1405] Introduce type utilities for safe `get(Properties)`

These allows us to make `get` or `getProperties` correctly handle index
access the same way direct field access would. This gets us back to the
same level of safety we had with our old `UnwrapComputedProperty*`
types for this kind of index access: those types did *many* things, but
included among them was distributing across the requested properties.
---
 types/preview/@ember/object/index.d.ts        | 28 +++++++++++++++++--
 .../preview/@ember/object/test/observable.ts  | 24 ++++++++++++----
 types/preview/ember/test/object.ts            |  1 -
 types/preview/ember/test/observable.ts        |  8 ++++--
 4 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/types/preview/@ember/object/index.d.ts b/types/preview/@ember/object/index.d.ts
index 09348748992..5a6a0370eb9 100644
--- a/types/preview/@ember/object/index.d.ts
+++ b/types/preview/@ember/object/index.d.ts
@@ -33,12 +33,34 @@ export function observer<Fn extends (target: any, key: string) => void>(
   ...args: [...propertyNames: string[], func: Fn]
 ): Fn;
 
+// Allows us to split apart `Record` types which have distinct keys (e.g. using
+// an enum or a union of specific keys) from those which just have an index type
+// and therefore to get the same behavior with `get` and friends as we would
+// when indexing directly with JS.
+// See https://stackoverflow.com/a/68261113/564181
+type RemoveIndex<T> = {
+  [K in keyof T as {} extends Record<K, 1> ? never : K]: T[K];
+};
+
+// Using `RemoveIndex` here then allows us to keep the desired behavior under
+// `noUncheckedIndexedAccess` as direct property access.
+type Get<T, K extends keyof T> = K extends keyof RemoveIndex<T> ? T[K] : T[K] | undefined;
+
+// We do the same here. Additionally, this uses an array type so that we can
+// distribute over each item in the list (accessing with `[number]`) instead of
+// over the list as a union, so that doing an index access gets the type for
+// that specific key rather then a union of the types associated with all the
+// keys.
+type GetProperties<T, Keys extends Array<keyof T>> = {
+  [K in Keys[number]]: Get<T, K>;
+};
+
 /**
  * Gets the value of a property on an object. If the property is computed,
  * the function will be invoked. If the property is not defined but the
  * object implements the `unknownProperty` method then that will be invoked.
  */
-export function get<T, K extends keyof T>(obj: T, key: K): T[K];
+export function get<T, K extends keyof T>(obj: T, key: K): Get<T, K>;
 export function get(obj: unknown, key: string): unknown;
 
 /**
@@ -53,8 +75,8 @@ export function set<T, K extends keyof T>(obj: T, key: K, value: T[K]): T[K];
  * To get multiple properties at once, call `getProperties` with an object
  * followed by a list of strings or an array.
  */
-export function getProperties<T, K extends keyof T>(obj: T, list: K[]): Pick<T, K>;
-export function getProperties<T, K extends keyof T>(obj: T, ...list: K[]): Pick<T, K>;
+export function getProperties<T, K extends Array<keyof T>>(obj: T, list: K): GetProperties<T, K>;
+export function getProperties<T, K extends Array<keyof T>>(obj: T, ...list: K): GetProperties<T, K>;
 
 /**
  * Set a list of properties on an object. These properties are set inside
diff --git a/types/preview/@ember/object/test/observable.ts b/types/preview/@ember/object/test/observable.ts
index fc9ccdcc146..11fb46016d5 100644
--- a/types/preview/@ember/object/test/observable.ts
+++ b/types/preview/@ember/object/test/observable.ts
@@ -63,9 +63,11 @@ function testGetProperties() {
     name: string;
     age: number;
   }>();
-  expectTypeOf(getProperties(person, 'name', 'age', 'capitalized')).toEqualTypeOf<
-    Pick<Person, 'name' | 'age' | 'capitalized'>
-  >();
+  expectTypeOf(getProperties(person, 'name', 'age', 'capitalized')).toEqualTypeOf<{
+    name: string;
+    age: number;
+    capitalized: string;
+  }>();
   expectTypeOf(person.getProperties('name')).toEqualTypeOf<{ name: string }>();
   expectTypeOf(person.getProperties('name', 'age')).toEqualTypeOf<{ name: string; age: number }>();
   expectTypeOf(person.getProperties(['name', 'age'])).toEqualTypeOf<{
@@ -117,12 +119,24 @@ function testDynamic() {
   expectTypeOf(get(obj, dynamicKey)).toEqualTypeOf<string | undefined>();
   expectTypeOf(getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string | undefined }>();
   expectTypeOf(getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
-  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
-  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string | undefined>>();
+  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<
+    Record<string, string | undefined>
+  >();
   expectTypeOf(set(obj, 'dummy', 'value')).toBeString();
   expectTypeOf(set(obj, dynamicKey, 'value')).toBeString();
   expectTypeOf(setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<Record<'dummy', string>>();
   expectTypeOf(setProperties(obj, { [dynamicKey]: 'value' })).toEqualTypeOf<
     Record<string, string>
   >();
+
+  // Test records with known types.
+  const x: Record<'a' | 'b', string> = {
+    a: 'a',
+    b: 'b',
+  };
+
+  expectTypeOf(get(x, 'a')).toBeString();
+  expectTypeOf(get(x, 'b')).toBeString();
+  expectTypeOf(get(x, 'anything else')).toBeUnknown();
 }
diff --git a/types/preview/ember/test/object.ts b/types/preview/ember/test/object.ts
index 98a8cd909b7..edeff03fb92 100755
--- a/types/preview/ember/test/object.ts
+++ b/types/preview/ember/test/object.ts
@@ -60,7 +60,6 @@ export class Foo2 extends Ember.Object {
   name = '';
 
   changeName(name: string) {
-    expectTypeOf(this.set('name', name)).toEqualTypeOf<string>();
     // This is checking for assignability; `expectTypeOf` doesn't work correctly
     // here because TS isn't resolving `this['name']` eagerly, and so it is not
     // (currently) possible for the type utility to match it.
diff --git a/types/preview/ember/test/observable.ts b/types/preview/ember/test/observable.ts
index c4ccd9c4469..1707e9ed58e 100755
--- a/types/preview/ember/test/observable.ts
+++ b/types/preview/ember/test/observable.ts
@@ -113,8 +113,12 @@ function testDynamic() {
   expectTypeOf(Ember.get(obj, dynamicKey)).toEqualTypeOf<string | undefined>();
   expectTypeOf(Ember.getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string | undefined }>();
   expectTypeOf(Ember.getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
-  expectTypeOf(Ember.getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
-  expectTypeOf(Ember.getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(Ember.getProperties(obj, dynamicKey)).toEqualTypeOf<
+    Record<string, string | undefined>
+  >();
+  expectTypeOf(Ember.getProperties(obj, [dynamicKey])).toEqualTypeOf<
+    Record<string, string | undefined>
+  >();
   expectTypeOf(Ember.set(obj, 'dummy', 'value')).toBeString();
   expectTypeOf(Ember.set(obj, dynamicKey, 'value')).toBeString();
   expectTypeOf(Ember.setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<

From 2dc87a1060efe1dbe8616a7c50d68fa78ed4149b Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 19:28:57 -0600
Subject: [PATCH 1110/1405] Add sundry improvements to preview types.

---
 .../runtime/lib/mixins/registry_proxy.ts      |  16 +-
 types/preview/@ember/engine/test/engine.ts    |  20 +-
 .../@ember/object/test/create-negative.ts     |   5 +-
 types/preview/@ember/object/test/object.ts    | 166 +++++-----
 types/preview/@ember/object/test/proxy.ts     |  89 +++---
 types/preview/@ember/routing/test/route.ts    | 288 +++++++++---------
 types/preview/@ember/runloop/index.d.ts       |   7 +
 types/preview/@ember/service/service-test.ts  |  34 +++
 types/preview/ember/index.d.ts                |   4 +-
 types/preview/ember/test/access-modifier.ts   |  42 ---
 .../ember/test/application-instance.ts        |  10 +-
 types/preview/ember/test/array-proxy.ts       |  10 +-
 types/preview/ember/test/controller.ts        |  18 +-
 types/preview/ember/test/create-negative.ts   |   8 +-
 .../preview/ember/test/ember-module-tests.ts  |  60 ++--
 types/preview/ember/test/engine.ts            |  55 ++--
 types/preview/ember/test/inject.ts            |  36 ++-
 17 files changed, 435 insertions(+), 433 deletions(-)
 create mode 100644 types/preview/@ember/service/service-test.ts
 delete mode 100644 types/preview/ember/test/access-modifier.ts

diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index d5555d8f0a2..2c7ccfdea70 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -12,6 +12,14 @@ import { assert } from '@ember/debug';
 // This is defined as a separate interface so that it can be used in the definition of
 // `Owner` without also including the `__registry__` property.
 export interface IRegistry {
+  /**
+   Given a fullName return the corresponding factory.
+
+   @public
+   @method resolveRegistration
+   @param {String} fullName
+   @return {Function} fullName's factory
+   */
   resolveRegistration(fullName: string): Factory<object> | object | undefined;
 
   register(fullName: string, factory: Factory<object> | object, options?: TypeOptions): void;
@@ -48,14 +56,6 @@ interface RegistryProxyMixin extends IRegistry {
 const RegistryProxyMixin = Mixin.create({
   __registry__: null,
 
-  /**
-   Given a fullName return the corresponding factory.
-
-   @public
-   @method resolveRegistration
-   @param {String} fullName
-   @return {Function} fullName's factory
-   */
   resolveRegistration(fullName: string) {
     assert('fullName must be a proper full name', this.__registry__.isValidFullName(fullName));
     return this.__registry__.resolve(fullName);
diff --git a/types/preview/@ember/engine/test/engine.ts b/types/preview/@ember/engine/test/engine.ts
index 4426b7d8f3c..994ff9da610 100755
--- a/types/preview/@ember/engine/test/engine.ts
+++ b/types/preview/@ember/engine/test/engine.ts
@@ -23,20 +23,20 @@ BaseEngine.instanceInitializer({
   },
 });
 
-const Engine1 = BaseEngine.create({
-  rootElement: '#engine-one',
-  customEvents: {
+class Engine1 extends BaseEngine {
+  rootElement = '#engine-one';
+  customEvents = {
     paste: 'paste',
-  },
-});
+  };
+}
 
-const Engine2 = BaseEngine.create({
-  rootElement: '#engine-two',
-  customEvents: {
+class Engine2 extends BaseEngine {
+  rootElement = '#engine-two';
+  customEvents = {
     mouseenter: null,
     mouseleave: null,
-  },
-});
+  };
+}
 
 const Engine3 = BaseEngine.create();
 
diff --git a/types/preview/@ember/object/test/create-negative.ts b/types/preview/@ember/object/test/create-negative.ts
index e1e01ff9a13..86557265951 100644
--- a/types/preview/@ember/object/test/create-negative.ts
+++ b/types/preview/@ember/object/test/create-negative.ts
@@ -1,5 +1,4 @@
-import { assertType } from './lib/assert';
-import { PersonWithNumberName, Person } from './create';
+import { Person } from './create';
 
 // @ts-expect-error
 Person.create({ firstName: 99 });
@@ -7,5 +6,3 @@ Person.create({ firstName: 99 });
 Person.create({}, { firstName: 99 });
 // @ts-expect-error
 Person.create({}, {}, { firstName: 99 });
-
-const p4 = new PersonWithNumberName();
diff --git a/types/preview/@ember/object/test/object.ts b/types/preview/@ember/object/test/object.ts
index 703ab737616..44abefa12fa 100644
--- a/types/preview/@ember/object/test/object.ts
+++ b/types/preview/@ember/object/test/object.ts
@@ -1,102 +1,88 @@
-import EmberObject, { computed, notifyPropertyChange } from '@ember/object';
+import Object, { computed, get, notifyPropertyChange, set, setProperties } from '@ember/object';
+import { expectTypeOf } from 'expect-type';
 
-const LifetimeHooks = EmberObject.extend({
-    resource: undefined as {} | undefined,
+class LifetimeHooks extends Object {
+  resource: {} | undefined;
 
-    init() {
-        this._super();
-        this.resource = {};
-    },
+  init() {
+    this._super();
+    this.resource = {};
+  }
 
-    willDestroy() {
-        this.resource = undefined;
-        this._super();
-    },
-});
+  willDestroy() {
+    this.resource = undefined;
+    this._super();
+  }
+}
 
-class MyObject30 extends EmberObject {
-    constructor() {
-        super();
-    }
+class MyObject30 extends Object {
+  constructor() {
+    super();
+  }
 }
 
-class MyObject31 extends EmberObject {
-    constructor(properties: object) {
-        super(properties);
-    }
+class MyObject31 extends Object {
+  constructor(properties: object) {
+    super(properties);
+  }
 }
 
-class Foo extends EmberObject {
-    a = computed({
-        get() {
-            return '';
-        },
-        set(key: string, newVal: string) {
-            return '';
-        },
-    });
-    b = 5;
-    c = computed({
-        get() {
-            return '';
-        },
-        set(key: string, newVal: string | number) {
-            return '';
-        }
-    });
-    baz() {
-        const x = this.a; // $ExpectType ComputedProperty<string, string>
-        const y = this.b; // $ExpectType number
-        const z = this.c; // $ExpectType ComputedProperty<string, string | number>
-        this.b = 10;
-        this.get('b').toFixed(4); // $ExpectType string
-        this.set('a', 'abc').split(','); // $ExpectType string[]
-        this.set('b', 10).toFixed(4); // $ExpectType string
-        this.get('c').split(','); // $ExpectType string[]
-        this.set('c', '10').split(','); // $ExpectType string[]
-        this.set('c', 10);
-        // @ts-expect-error
-        this.set('c', 10).split(',');
+class Foo extends Object {
+  @computed()
+  get a() {
+    return '';
+  }
+
+  set a(newVal: string) {
+    /* no-op */
+  }
+
+  b = 5;
+
+  baz() {
+    const y = this.b; // $ExpectType number
+    const z = this.a; // $ExpectType ComputedProperty<string, string>
+    this.b = 10;
+    this.get('b').toFixed(4); // $ExpectType string
+    this.set('a', 'abc').split(','); // $ExpectType string[]
+    this.set('b', 10).toFixed(4); // $ExpectType string
 
-        this.setProperties({ b: 11 });
-        // this.setProperties({ b: '11' }); // @ts-expect-error
-        this.setProperties({
-            a: 'def',
-            b: 11,
-        });
-    }
-    bar() {
-        notifyPropertyChange(this, 'name');
-        // @ts-expect-error
-        notifyPropertyChange(this);
-        // @ts-expect-error
-        notifyPropertyChange('name');
-        // @ts-expect-error
-        notifyPropertyChange(this, 'name', 'bar');
-    }
+    this.setProperties({ b: 11 });
+    // this.setProperties({ b: '11' }); // @ts-expect-error
+    this.setProperties({
+      a: 'def',
+      b: 11,
+    });
+  }
 }
 
-// TODO: enable after TS 3.0 https://github.com/typed-ember/ember-cli-typescript/issues/291
-// class Foo extends EmberObject.extend({
-//     a: computed({
-//         get() { return ''; },
-//         set(key: string, newVal: string) { return ''; }
-//     })
-// }) {
-//     b = 5;
-//     baz() {
-//         const y = this.b; // $ExpectType number
-//         const z = this.a; // $ExpectType ComputedProperty<string, string>
-//         this.b = 10;
-//         this.get('b').toFixed(4); // $ExpectType string
-//         this.set('a', 'abc').split(','); // $ExpectType string[]
-//         this.set('b', 10).toFixed(4); // $ExpectType string
+export class Foo2 extends Object {
+  name = '';
 
-//         this.setProperties({ b: 11 });
-//         // this.setProperties({ b: '11' }); // @ts-expect-error
-//         this.setProperties({
-//             a: 'def',
-//             b: 11
-//         });
-//     }
-// }
+  changeName(name: string) {
+    expectTypeOf(this.set('name', name)).toEqualTypeOf<string>();
+    // This is checking for assignability; `expectTypeOf` doesn't work correctly
+    // here because TS isn't resolving `this['name']` eagerly, and so it is not
+    // (currently) possible for the type utility to match it.
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const x: string = set(this, 'name', name);
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const y: string = get(this, 'name');
+    this.setProperties({
+      name,
+    });
+    setProperties(this, {
+      name,
+    });
+  }
+
+  bar() {
+    notifyPropertyChange(this, 'name');
+    // @ts-expect-error
+    notifyPropertyChange(this);
+    // @ts-expect-error
+    notifyPropertyChange('name');
+    // @ts-expect-error
+    notifyPropertyChange(this, 'name', 'bar');
+  }
+}
diff --git a/types/preview/@ember/object/test/proxy.ts b/types/preview/@ember/object/test/proxy.ts
index 14a8a386570..d05aa51917d 100644
--- a/types/preview/@ember/object/test/proxy.ts
+++ b/types/preview/@ember/object/test/proxy.ts
@@ -1,44 +1,50 @@
 import Ember from 'ember';
 import ObjectProxy from '@ember/object/proxy';
+import { expectTypeOf } from 'expect-type';
 
 interface Book {
-    title: string;
-    subtitle: string;
-    chapters: Array<{ title: string }>;
+  title: string;
+  subtitle: string;
+  chapters: Array<{ title: string }>;
 }
 
 class DefaultProxy extends ObjectProxy {}
 DefaultProxy.create().content; // $ExpectType object | undefined
 
 class BookProxy extends ObjectProxy<Book> {
-    private readonly baz = 'baz';
+  private readonly baz = 'baz';
 
-    altTitle = 'Alt';
+  altTitle = 'Alt';
 
-    getTitle() {
-        return this.get('title');
-    }
+  getTitle() {
+    return this.get('title');
+  }
 
-    getPropertiesTitleSubtitle() {
-        return this.getProperties('title', 'subtitle');
-    }
+  getPropertiesTitleSubtitle() {
+    return this.getProperties('title', 'subtitle');
+  }
 }
 
 const book = BookProxy.create();
-book.content; // $ExpectType Book | undefined
+expectTypeOf(book.content).toEqualTypeOf<Book | undefined>(); // $ExpectType Book | undefined
 
 // @ts-expect-error
 book.get('unknownProperty');
-book.get('title'); // $ExpectType string | undefined
-book.get('altTitle'); // $ExpectType string
-book.getTitle(); // $ExpectType string | undefined
+expectTypeOf(book.get('title')).toEqualTypeOf<string | undefined>();
+expectTypeOf(book.get('altTitle')).toBeString();
+expectTypeOf(book.getTitle()).toEqualTypeOf<string | undefined>();
 
 // @ts-expect-error
 book.getProperties('title', 'unknownProperty');
-book.getProperties('title', 'subtitle'); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "title" | "subtitle">
-book.getPropertiesTitleSubtitle(); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "title" | "subtitle">
-// tslint:disable-next-line
-book.getProperties(['subtitle', 'chapters']); // $ExpectType Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "subtitle" | "chapters"> || Pick<Partial<UnwrapComputedPropertyGetters<Book>>, "chapters" | "subtitle">
+expectTypeOf(book.getProperties('title', 'subtitle')).toEqualTypeOf<
+  Pick<Partial<Book>, 'title' | 'subtitle'>
+>();
+expectTypeOf(book.getPropertiesTitleSubtitle()).toEqualTypeOf<
+  Pick<Partial<Book>, 'title' | 'subtitle'>
+>();
+expectTypeOf(book.getProperties(['subtitle', 'chapters'])).toEqualTypeOf<
+  Pick<Partial<Book>, 'subtitle' | 'chapters'>
+>();
 // @ts-expect-error
 book.getProperties(['title', 'unknownProperty']);
 
@@ -52,9 +58,9 @@ book.set('altTitle', 'Alternate');
 // @ts-expect-error
 book.set('altTitle', 1);
 book.setProperties({
-    title: 'new',
-    subtitle: 'and improved',
-    altTitle: 'Alternate2',
+  title: 'new',
+  subtitle: 'and improved',
+  altTitle: 'Alternate2',
 });
 // @ts-expect-error
 book.setProperties({ title: 1 });
@@ -64,39 +70,38 @@ book.setProperties({ altTitle: 1 });
 book.setProperties({ invalid: true });
 
 class Person extends Ember.Object {
-    firstName = 'Peter';
+  firstName = 'Peter';
 
-    lastName = 'Wagenet';
+  lastName = 'Wagenet';
 
-    fullName = Ember.computed('firstName', 'lastName', {
-        get() {
-          return `${this.firstName} ${this.lastName}`;
-        },
+  @Ember.computed('firstName', 'lastName')
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
 
-        set(key, value: string) {
-          const [firstName, lastName] = value.split(' ');
+  set fullName(value: string) {
+    const [firstName, lastName] = value.split(' ');
 
-          Ember.set(this, 'firstName', firstName);
-          Ember.set(this, 'lastName', lastName);
-
-          return value;
-        }
-    });
+    Ember.set(this, 'firstName', firstName ?? '');
+    Ember.set(this, 'lastName', lastName ?? '');
+  }
 }
 
-class PersonProxy extends ObjectProxy<Person> { }
+class PersonProxy extends ObjectProxy<Person> {}
 
 const person = PersonProxy.create();
 
-person.get('firstName'); // $ExpectType string | undefined
-person.get('fullName'); // $ExpectType string | undefined
-person.set('fullName', 'John Doe'); // $ExpectType string
+expectTypeOf(person.get('firstName')).toEqualTypeOf<string | undefined>();
+expectTypeOf(person.get('fullName')).toEqualTypeOf<string | undefined>();
+expectTypeOf(person.set('fullName', 'John Doe')).toBeString();
 // @ts-expect-error
 person.set('fullName', 1);
 // @ts-expect-error
 person.set('invalid', true);
-person.setProperties({ fullName: 'John Doe' }); // $ExpectType Pick<UnwrapComputedPropertySetters<PersonProxy & Person>, "fullName">
-person.setProperties({ fullName: 'John Doe' }).fullName; // $ExpectType string
+expectTypeOf(person.setProperties({ fullName: 'John Doe' })).toEqualTypeOf<
+  Pick<PersonProxy & Person, 'fullName'>
+>();
+expectTypeOf(person.setProperties({ fullName: 'John Doe' }).fullName).toBeString();
 // @ts-expect-error
 person.setProperties({ fullName: 1 });
 // @ts-expect-error
diff --git a/types/preview/@ember/routing/test/route.ts b/types/preview/@ember/routing/test/route.ts
index 42c53d4e73b..fea2b336b2e 100755
--- a/types/preview/@ember/routing/test/route.ts
+++ b/types/preview/@ember/routing/test/route.ts
@@ -1,3 +1,4 @@
+/* eslint-disable prefer-const */
 import Route from '@ember/routing/route';
 import Array from '@ember/array';
 import EmberObject from '@ember/object';
@@ -9,201 +10,201 @@ class Post extends EmberObject {}
 
 interface Posts extends Array<Post> {}
 
-Route.extend({
-    beforeModel(transition: Transition) {
-        this.transitionTo('someOtherRoute');
-    },
-});
-
-Route.extend({
-    afterModel(posts: Posts, transition: Transition) {
-        if (posts.firstObject) {
-            this.transitionTo('post.show', posts.firstObject);
-        }
-    },
-});
-
-Route.extend({
-    model() {
-        return this.modelFor('post');
-    },
-});
-
-Route.extend({
-    queryParams: {
-        memberQp: { refreshModel: true },
-    },
-});
-
-Route.extend({
-    resetController(controller: Controller, isExiting: boolean, transition: Transition) {
-        if (isExiting) {
-            //   controller.set('page', 1);
-            transition.abort();
-        }
-    },
-});
-
-class ActivateRoute extends Route {
-    activate(transition: Transition) {
-        this.transitionTo('someOtherRoute');
-    }
+class BeforeModelText extends Route {
+  beforeModel(transition: Transition) {
+    this.transitionTo('someOtherRoute');
+  }
 }
 
-class DeactivateRoute extends Route {
-    deactivate(transition: Transition) {
-        this.transitionTo('someOtherRoute');
+class AfterModel extends Route {
+  afterModel(posts: Posts, transition: Transition) {
+    if (posts.firstObject) {
+      this.transitionTo('post.show', posts.firstObject);
     }
+  }
 }
 
-class RedirectRoute extends Route {
-    redirect(model: {}, a: Transition) {
-        if (!model) {
-            this.transitionTo('there');
-        }
-    }
+class ModelTest extends Route {
+  model() {
+    return this.modelFor('post');
+  }
 }
 
-class InvalidRedirect extends Route {
-    // @ts-expect-error
-    redirect(model: {}, a: Transition, anOddArg: unknown) {
-        if (!model) {
-            this.transitionTo('there');
-        }
-    }
+class QPsTest extends Route {
+  queryParams = {
+    memberQp: { refreshModel: true },
+  };
 }
 
-class TransitionToExamples extends Route {
-    // NOTE: this one won't check that `queryParams` has the right shape,
-    // because the overload for the version where `models` are passed
-    // necessarily includes all objects.
-    transitionToModelAndQP() {
-        // $ExpectType Transition<unknown>
-        this.transitionTo('somewhere', { queryParams: { neat: true } });
-    }
-
-    transitionToJustQP() {
-        // $ExpectType Transition<unknown>
-        this.transitionTo({ queryParams: { neat: 'true' } });
-    }
-
-    transitionToNonsense() {
-        // @ts-expect-error
-        this.transitionTo({ cannotDoModelHere: true });
+class ResetControllerTest extends Route {
+  resetController(controller: Controller, isExiting: boolean, transition: Transition) {
+    if (isExiting) {
+      //   controller.set('page', 1);
+      transition.abort();
     }
+  }
+}
 
-    transitionToBadQP() {
-        // @ts-expect-error
-        this.transitionTo({ queryParams: 12 });
-    }
+class ActivateRoute extends Route {
+  activate(transition: Transition) {
+    this.transitionTo('someOtherRoute');
+  }
+}
 
-    transitionToId() {
-        // $ExpectType Transition<unknown>
-        this.transitionTo('blog-post', 1);
-    }
+class DeactivateRoute extends Route {
+  deactivate(transition: Transition) {
+    this.transitionTo('someOtherRoute');
+  }
+}
 
-    transitionToIdWithQP() {
-        // $ExpectType Transition<unknown>
-        this.transitionTo('blog-post', 1, { queryParams: { includeComments: true } });
+class RedirectRoute extends Route {
+  redirect(model: {}, a: Transition) {
+    if (!model) {
+      this.transitionTo('there');
     }
+  }
+}
 
-    transitionToIds() {
-        // $ExpectType Transition<unknown>
-        this.transitionTo('blog-comment', 1, '13');
+class InvalidRedirect extends Route {
+  // @ts-expect-error
+  redirect(model: {}, a: Transition, anOddArg: unknown) {
+    if (!model) {
+      this.transitionTo('there');
     }
+  }
+}
 
-    transitionToIdsWithQP() {
-        // $ExpectType Transition<unknown>
-        this.transitionTo('blog-comment', 1, '13', { queryParams: { includePost: true } });
-    }
+class TransitionToExamples extends Route {
+  // NOTE: this one won't check that `queryParams` has the right shape,
+  // because the overload for the version where `models` are passed
+  // necessarily includes all objects.
+  transitionToModelAndQP() {
+    expectTypeOf(
+      this.transitionTo('somewhere', { queryParams: { neat: true } })
+    ).toEqualTypeOf<Transition>();
+  }
+
+  transitionToJustQP() {
+    expectTypeOf(this.transitionTo({ queryParams: { neat: 'true' } })).toEqualTypeOf<Transition>();
+  }
+
+  transitionToNonsense() {
+    // @ts-expect-error
+    this.transitionTo({ cannotDoModelHere: true });
+  }
 
-    buildRouteInfoMetadata() {
-        return { foo: 'bar' };
-    }
+  transitionToBadQP() {
+    // @ts-expect-error
+    this.transitionTo({ queryParams: 12 });
+  }
+
+  transitionToId() {
+    // $ExpectType Transition<unknown>
+    this.transitionTo('blog-post', 1);
+  }
+
+  transitionToIdWithQP() {
+    // $ExpectType Transition<unknown>
+    this.transitionTo('blog-post', 1, { queryParams: { includeComments: true } });
+  }
+
+  transitionToIds() {
+    // $ExpectType Transition<unknown>
+    this.transitionTo('blog-comment', 1, '13');
+  }
+
+  transitionToIdsWithQP() {
+    // $ExpectType Transition<unknown>
+    this.transitionTo('blog-comment', 1, '13', { queryParams: { includePost: true } });
+  }
+
+  buildRouteInfoMetadata() {
+    return { foo: 'bar' };
+  }
 }
 
 class ApplicationController extends Controller {}
 declare module '@ember/controller' {
-    interface Registry {
-        application: ApplicationController;
-    }
+  interface Registry {
+    application: ApplicationController;
+  }
 }
 
-Route.extend({
-    setupController(controller: Controller, model: {}, transition: Transition) {
-        this._super(controller, model);
-        this.controllerFor('application').set('model', model);
-        transition.abort();
-    },
-});
+class SetupControllerTest extends Route {
+  setupController(controller: Controller, model: {}, transition: Transition) {
+    this._super(controller, model);
+    this.controllerFor('application').set('model', model);
+    transition.abort();
+  }
+}
 
 const route = Route.create();
-route.controllerFor('whatever'); // $ExpectType Controller
-route.paramsFor('whatever'); // $ExpectType object
+expectTypeOf(route.controllerFor('whatever')).toEqualTypeOf<Controller>();
+expectTypeOf(route.paramsFor('whatever')).toEqualTypeOf<object>();
 
 class RouteUsingClass extends Route.extend({
-    randomProperty: 'the .extend + extends bit type-checks properly',
+  randomProperty: 'the .extend + extends bit type-checks properly',
 }) {
-    beforeModel() {
-        return Promise.resolve('beforeModel can return promises');
-    }
-    afterModel(resolvedModel: unknown, transition: Transition) {
-        return Promise.resolve('afterModel can also return promises');
-    }
-    intermediateTransitionWithoutModel() {
-        this.intermediateTransitionTo('some-route');
-    }
-    intermediateTransitionWithModel() {
-        this.intermediateTransitionTo('some.other.route', {});
-    }
-    intermediateTransitionWithMultiModel() {
-        this.intermediateTransitionTo('some.other.route', 1, 2, {});
-    }
+  beforeModel() {
+    return Promise.resolve('beforeModel can return promises');
+  }
+  afterModel(resolvedModel: unknown, transition: Transition) {
+    return Promise.resolve('afterModel can also return promises');
+  }
+  intermediateTransitionWithoutModel() {
+    this.intermediateTransitionTo('some-route');
+  }
+  intermediateTransitionWithModel() {
+    this.intermediateTransitionTo('some.other.route', {});
+  }
+  intermediateTransitionWithMultiModel() {
+    this.intermediateTransitionTo('some.other.route', 1, 2, {});
+  }
 }
 
 class WithNonReturningBeforeAndModelHooks extends Route {
-    beforeModel(transition: Transition): void | Promise<unknown> {
-        return;
-    }
+  beforeModel(transition: Transition): void | Promise<unknown> {
+    return;
+  }
 
-    afterModel(resolvedModel: unknown, transition: Transition): void {
-        return;
-    }
+  afterModel(resolvedModel: unknown, transition: Transition): void {
+    return;
+  }
 }
 
 class WithBadReturningBeforeAndModelHooks extends Route {
-    beforeModel(transition: Transition): void | Promise<unknown> {
-        // @ts-expect-error
-        return "returning anything else is nonsensical (if 'legal')";
-    }
+  beforeModel(transition: Transition): void | Promise<unknown> {
+    // @ts-expect-error
+    return "returning anything else is nonsensical (if 'legal')";
+  }
 
-    afterModel(resolvedModel: unknown, transition: Transition): void {
-        // @ts-expect-error
-        return "returning anything else is nonsensical (if 'legal')";
-    }
+  afterModel(resolvedModel: unknown, transition: Transition): void {
+    // @ts-expect-error
+    return "returning anything else is nonsensical (if 'legal')";
+  }
 }
 
 interface RouteParams {
-    cool: string;
+  cool: string;
 }
 
 class WithParamsInModel extends Route<boolean, RouteParams> {
-    model(params: RouteParams, transition: Transition) {
-        return true;
-    }
+  model(params: RouteParams, transition: Transition) {
+    return true;
+  }
 }
 
 // @ts-expect-error
 class WithNonsenseParams extends Route<boolean, number> {}
 
 class WithImplicitParams extends Route {
-    model(params: RouteParams) {
-        return { whatUp: 'dog' };
-    }
+  model(params: RouteParams) {
+    return { whatUp: 'dog' };
+  }
 }
 
-// $ExpectType RouteParams
 type ImplicitParams = WithImplicitParams extends Route<any, infer T> ? T : never;
+expectTypeOf<ImplicitParams>().toEqualTypeOf<RouteParams>();
 
 // back-compat for existing users of these
 // NOTE: we will *not* migrate the private import locations when moving to
@@ -221,6 +222,7 @@ publicRouteInfo = privateRouteInfo;
 privateRouteInfo = publicRouteInfo;
 
 import PrivateRouteInfoWithAttributes from '@ember/routing/-private/route-info-with-attributes';
+import { expectTypeOf } from 'expect-type';
 declare let publicRouteInfoWithAttributes: RouteInfoWithAttributes;
 declare let privateRouteInfoWithAttributes: PrivateRouteInfoWithAttributes;
 publicRouteInfoWithAttributes = privateRouteInfoWithAttributes;
diff --git a/types/preview/@ember/runloop/index.d.ts b/types/preview/@ember/runloop/index.d.ts
index 6e5159af0e5..372df3a5fa4 100644
--- a/types/preview/@ember/runloop/index.d.ts
+++ b/types/preview/@ember/runloop/index.d.ts
@@ -3,6 +3,7 @@ import {
   EmberMethodParams,
   AnyFn,
   EmberMethodReturn,
+  AnyMethod,
 } from 'ember/-private/type-utils';
 import { EmberRunQueues } from './-private/types';
 import { EmberRunTimer } from '@ember/runloop/types';
@@ -100,6 +101,12 @@ export function once<T, M extends EmberMethod<T>>(
   ...args: EmberMethodParams<T, M>
 ): EmberRunTimer;
 
+export function once<T, M extends keyof T>(
+  target: T,
+  method: M,
+  ...args: EmberMethodParams<T, M>
+): EmberRunTimer;
+
 /**
  * Schedules a function to run one time in a given queue of the current RunLoop.
  * Calling this method with the same queue/target/method combination will have
diff --git a/types/preview/@ember/service/service-test.ts b/types/preview/@ember/service/service-test.ts
new file mode 100644
index 00000000000..7ba6f553a86
--- /dev/null
+++ b/types/preview/@ember/service/service-test.ts
@@ -0,0 +1,34 @@
+import Service, { inject, service } from '@ember/service';
+import EmberObject from '@ember/object';
+
+class FirstSvc extends Service {
+  foo = 'bar';
+  first() {
+    return '';
+  }
+}
+const SecondSvc = Service.extend({
+  foo: 'bar',
+  second() {
+    return '';
+  },
+});
+
+declare module '@ember/service' {
+  interface Registry {
+    first: FirstSvc;
+    second: InstanceType<typeof SecondSvc>;
+  }
+}
+
+class Foo extends EmberObject {
+  @inject declare foo: FirstSvc;
+  @inject('first') declare baz: FirstSvc;
+  @inject declare bar: FirstSvc;
+}
+
+class FooService extends EmberObject {
+  @service declare foo: FirstSvc;
+  @service('first') declare baz: FirstSvc;
+  @service declare bar: FirstSvc;
+}
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index ff367607257..c2fdf3e1af8 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -236,7 +236,9 @@ export namespace Ember {
      * Can only be used when defining another controller.
      */
     function controller(): Controller;
-    function controller<K extends keyof ControllerRegistry>(name: K): ControllerRegistry[K];
+    function controller<K extends keyof ControllerRegistry>(
+      name: K
+    ): ControllerRegistry[K] & EmberObjectComputedNs.BasicComputedProperty;
     const service: typeof EmberServiceNs.inject;
   }
   namespace ENV {
diff --git a/types/preview/ember/test/access-modifier.ts b/types/preview/ember/test/access-modifier.ts
deleted file mode 100644
index 3b3a27f6641..00000000000
--- a/types/preview/ember/test/access-modifier.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Tests to ensure that access modifier keywords are appropriately
- * respected and supported
- */
-import Ember from 'ember';
-import { assertType } from './lib/assert';
-
-class Foo extends Ember.Object {
-    hello() {
-        return 'world';
-    }
-    protected bar() {
-        return 'bar';
-    }
-    private baz() {
-        return 'baz';
-    }
-}
-const f = new Foo();
-assertType<string>(f.hello());
-// protected property should not be visible from outside of Foo
-// @ts-expect-error
-assertType<string>(f.bar());
-// private property should not be visible from outside of Foo
-// @ts-expect-error
-assertType<string>(f.baz());
-
-class Foo2 extends Ember.Object.extend({
-    bar: '',
-}) {
-    hello() {
-        return 'world';
-    }
-    // Cannot override with a mis-matched property type
-    // @ts-expect-error
-    protected bar() {
-        return 'bar';
-    }
-    private baz() {
-        return 'baz';
-    }
-}
diff --git a/types/preview/ember/test/application-instance.ts b/types/preview/ember/test/application-instance.ts
index e151828fa60..e8893defbf8 100644
--- a/types/preview/ember/test/application-instance.ts
+++ b/types/preview/ember/test/application-instance.ts
@@ -5,18 +5,18 @@ const appInstance = ApplicationInstance.create();
 appInstance.register('some:injection', class Foo {});
 
 appInstance.register('some:injection', class Foo {}, {
-    singleton: true,
+  singleton: true,
 });
 
 appInstance.register('some:injection', class Foo {}, {
-    instantiate: false,
+  instantiate: false,
 });
 
 appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`);
 
 appInstance.register('some:injection', class Foo {}, {
-    singleton: false,
-    instantiate: true,
+  singleton: false,
+  instantiate: true,
 });
 
 appInstance.factoryFor('router:main');
@@ -25,5 +25,5 @@ appInstance.lookup('route:basic');
 appInstance.boot();
 
 (async () => {
-    await appInstance.boot();
+  await appInstance.boot();
 })();
diff --git a/types/preview/ember/test/array-proxy.ts b/types/preview/ember/test/array-proxy.ts
index 53b6ec7e0a9..8099af3aa98 100644
--- a/types/preview/ember/test/array-proxy.ts
+++ b/types/preview/ember/test/array-proxy.ts
@@ -9,16 +9,16 @@ proxy.set('content', Ember.A(['amoeba', 'paramecium']));
 proxy.get('firstObject'); // 'amoeba'
 
 const overridden = Ember.ArrayProxy.create({
-    content: Ember.A(pets),
-    objectAtContent(idx: number): string {
-        return this.get('content').objectAt(idx)!.toUpperCase();
-    },
+  content: Ember.A(pets),
+  objectAtContent(this: Ember.ArrayProxy<string>, idx: number): string {
+    return this.get('content').objectAt(idx)!.toUpperCase();
+  },
 });
 
 overridden.get('firstObject'); // 'DOG'
 
 class MyNewProxy<T> extends Ember.ArrayProxy<T> {
-    isNew = true;
+  isNew = true;
 }
 
 const x = MyNewProxy.create({ content: Ember.A([1, 2, 3]) }) as MyNewProxy<number>;
diff --git a/types/preview/ember/test/controller.ts b/types/preview/ember/test/controller.ts
index 208babb8fd1..7e89a8d8334 100755
--- a/types/preview/ember/test/controller.ts
+++ b/types/preview/ember/test/controller.ts
@@ -1,11 +1,11 @@
-import Controller from '@ember/controller';
+import Ember from 'ember';
 
-Controller.extend({
-    queryParams: ['category'],
-    category: null,
-    isExpanded: false,
+class MyController extends Ember.Controller {
+  queryParams = ['category'];
+  category = null;
+  isExpanded = false;
 
-    toggleBody() {
-        this.toggleProperty('isExpanded');
-    },
-});
+  toggleBody() {
+    this.toggleProperty('isExpanded');
+  }
+}
diff --git a/types/preview/ember/test/create-negative.ts b/types/preview/ember/test/create-negative.ts
index ff86313e31a..86557265951 100644
--- a/types/preview/ember/test/create-negative.ts
+++ b/types/preview/ember/test/create-negative.ts
@@ -1,6 +1,4 @@
-import { assertType } from './lib/assert';
-import Ember from 'ember';
-import { PersonWithNumberName, Person } from './create';
+import { Person } from './create';
 
 // @ts-expect-error
 Person.create({ firstName: 99 });
@@ -8,7 +6,3 @@ Person.create({ firstName: 99 });
 Person.create({}, { firstName: 99 });
 // @ts-expect-error
 Person.create({}, {}, { firstName: 99 });
-
-const p4 = new PersonWithNumberName();
-
-// assertType<Ember.ComputedProperty<string, string>>(p4.fullName); // @ts-expect-error
diff --git a/types/preview/ember/test/ember-module-tests.ts b/types/preview/ember/test/ember-module-tests.ts
index 63e49dc2c40..89d645a63de 100644
--- a/types/preview/ember/test/ember-module-tests.ts
+++ b/types/preview/ember/test/ember-module-tests.ts
@@ -34,8 +34,8 @@ Ember.compare('31', '114'); // $ExpectType number
 Ember.debug('some info for developers');
 // deprecate
 Ember.deprecate("you shouldn't use this anymore", 3 === 3, {
-    id: 'no-longer-allowed',
-    until: '99.0.0',
+  id: 'no-longer-allowed',
+  until: '99.0.0',
 });
 // get
 Ember.get({ z: 23 }, 'z'); // $ExpectType number
@@ -76,16 +76,16 @@ Ember.isPresent(''); // $ExpectType boolean
 Ember.isPresent([]); // $ExpectType boolean
 // observer
 const o2 = Ember.Object.extend({
-    name: 'foo',
-    age: 3,
-    nameWatcher: Ember.observer('name', () => {}),
-    nameWatcher2: Ember.observer('name', 'fullName', () => {}),
+  name: 'foo',
+  age: 3,
+  nameWatcher: Ember.observer('name', () => {}),
+  nameWatcher2: Ember.observer('name', 'fullName', () => {}),
 });
 // on
 const o3 = Ember.Object.extend({
-    name: 'foo',
-    nameWatcher: Ember.on('init', () => {}),
-    nameWatcher2: Ember.on('destroy', () => {}),
+  name: 'foo',
+  nameWatcher: Ember.on('init', () => {}),
+  nameWatcher2: Ember.on('destroy', () => {}),
 });
 // removeListener
 Ember.removeListener(o2, 'create', null, () => {});
@@ -148,7 +148,7 @@ new Ember.ArrayProxy<number>([3, 3, 2]); // $ExpectType ArrayProxy<number>
 // Ember.Component
 const C1 = Ember.Component.extend({ classNames: ['foo'] });
 class C2 extends Ember.Component {
-    classNames = ['foo'];
+  classNames = ['foo'];
 }
 const c1 = new C1();
 const c2 = new C2();
@@ -158,12 +158,12 @@ c1.didInsertElement();
 c2.didInsertElement();
 // Ember.ComputedProperty
 const cp: Ember.ComputedProperty<string, string> = Ember.computed('foo', {
-    get(): string {
-        return '';
-    },
-    set(_key: string, newVal: string): string {
-        return '';
-    },
+  get(): string {
+    return '';
+  },
+  set(_key: string, newVal: string): string {
+    return '';
+  },
 });
 // Ember.ContainerDebugAdapter
 const cda = new Ember.ContainerDebugAdapter(); // $ExpectType ContainerDebugAdapter
@@ -193,18 +193,18 @@ oe1.on('bar', { foo() {} }, () => {});
 const hl = new Ember.HashLocation(); // $ExpectType HashLocation
 // Ember.Helper
 const h1 = Ember.Helper.extend({
-    compute() {
-        this.recompute();
-        return '';
-    },
+  compute() {
+    this.recompute();
+    return '';
+  },
 });
 // Ember.HistoryLocation
 const hil = new Ember.HistoryLocation(); // $ExpectType HistoryLocation
 // Ember.Mixin
 Ember.Object.extend(Ember.Mixin.create({ foo: 'bar' }), {
-    baz() {
-        this.foo; // $ExpectType string
-    },
+  baz() {
+    this.foo; // $ExpectType string
+  },
 });
 // Ember.MutableArray
 const ma1: Ember.MutableArray<string> = ['money', 'in', 'the', 'bananna', 'stand'];
@@ -213,7 +213,11 @@ ma1.addObject('!'); // $ExpectType string
 ma1.filterBy('');
 ma1.firstObject; // $ExpectType string | undefined
 ma1.lastObject; // $ExpectType string | undefined
-const ma2: Ember.MutableArray<{ name: string }> = [{ name: 'chris' }, { name: 'dan' }, { name: 'james' }];
+const ma2: Ember.MutableArray<{ name: string }> = [
+  { name: 'chris' },
+  { name: 'dan' },
+  { name: 'james' },
+];
 ma2.filterBy('name', 'chris'); // $ExpectType NativeArray<{ name: string; }>
 // Ember.MutableEnumerable
 const me1: Ember.MutableEnumerable<string | null | undefined> = ['foo', undefined, null];
@@ -234,10 +238,10 @@ new Ember.ObjectProxy(); // $ExpectType ObjectProxy
 Ember.Object.extend(Ember.Observable, {});
 // Ember.PromiseProxyMixin
 Ember.Object.extend(Ember.PromiseProxyMixin, {
-    foo() {
-        this.reason; // $ExpectType unknown
-        this.isPending; // $ExpectType boolean
-    },
+  foo() {
+    this.reason; // $ExpectType unknown
+    this.isPending; // $ExpectType boolean
+  },
 });
 // Ember.Route
 new Ember.Route();
diff --git a/types/preview/ember/test/engine.ts b/types/preview/ember/test/engine.ts
index 094cbfcc82d..f8ebea2ce65 100755
--- a/types/preview/ember/test/engine.ts
+++ b/types/preview/ember/test/engine.ts
@@ -1,40 +1,41 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
 
-const BaseEngine = Ember.Engine.extend({
-    modulePrefix: 'my-engine',
-});
+class BaseEngine extends Ember.Engine {
+  modulePrefix = 'my-engine';
+}
 
-class Obj extends Ember.Object.extend({ foo: 'bar' }) {}
+class Obj extends Ember.Object {
+  foo = 'bar';
+}
 
 BaseEngine.initializer({
-    name: 'my-initializer',
-    initialize(engine) {
-        engine.register('foo:bar', Obj);
-    },
+  name: 'my-initializer',
+  initialize(engine) {
+    engine.register('foo:bar', Obj);
+  },
 });
 
 BaseEngine.instanceInitializer({
-    name: 'my-instance-initializer',
-    initialize(engine) {
-        (engine.lookup('foo:bar') as Obj).get('foo');
-    },
-});
-
-const Engine1 = BaseEngine.create({
-    rootElement: '#engine-one',
-    customEvents: {
-        paste: 'paste',
-    },
+  name: 'my-instance-initializer',
+  initialize(engine) {
+    (engine.lookup('foo:bar') as Obj).get('foo');
+  },
 });
 
-const Engine2 = BaseEngine.create({
-    rootElement: '#engine-two',
-    customEvents: {
-        mouseenter: null,
-        mouseleave: null,
-    },
-});
+class Engine1 extends BaseEngine {
+  rootElement = '#engine-one';
+  customEvents = {
+    paste: 'paste',
+  };
+}
+
+class Engine2 extends BaseEngine {
+  rootElement = '#engine-two';
+  customEvents = {
+    mouseenter: null,
+    mouseleave: null,
+  };
+}
 
 const Engine3 = BaseEngine.create();
 
diff --git a/types/preview/ember/test/inject.ts b/types/preview/ember/test/inject.ts
index 491ad8def50..34858b5ef20 100755
--- a/types/preview/ember/test/inject.ts
+++ b/types/preview/ember/test/inject.ts
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 
 class AuthService extends Ember.Service {
   declare isAuthenticated: boolean;
@@ -18,13 +19,16 @@ declare module '@ember/service' {
 
 declare module '@ember/controller' {
   interface Registry {
-    application: ApplicationController;
+    emberApplication: ApplicationController;
   }
 }
 
 class LoginRoute extends Ember.Route {
-  auth = Ember.inject.service('auth');
-  application = Ember.inject.controller('application');
+  @Ember.inject.service('auth')
+  declare auth: AuthService;
+
+  @Ember.inject.controller('emberApplication')
+  declare application: ApplicationController;
 
   didTransition() {
     if (!this.get('auth').get('isAuthenticated')) {
@@ -34,24 +38,32 @@ class LoginRoute extends Ember.Route {
 
   anyOldMethod() {
     this.get('application').set('string', 'must be a string');
-    this.controllerFor('application'); // $ExpectType Controller
+    expectTypeOf(this.controllerFor('emberApplication')).toEqualTypeOf<Controller>();
   }
 }
 
 // New module injection style.
-import Controller, { inject as controller } from '@ember/controller';
-import Service, { inject as service } from '@ember/service';
 import { assertType } from './lib/assert';
+import RouterService from '@ember/routing/router-service';
+import Controller from '@ember/controller';
 
 class ComponentInjection extends Ember.Component {
-  applicationController = controller('application');
-  auth = service('auth');
-  router = service('router');
-  misc = service();
+  @Ember.inject.controller('emberApplication')
+  declare applicationController: ApplicationController;
+
+  @Ember.inject.service('auth')
+  declare auth: AuthService;
+
+  @Ember.inject.service('router')
+  declare router: RouterService;
+
+  @Ember.inject.service
+  declare misc: Ember.Service;
 
   testem() {
-    assertType<Ember.Service>(this.get('misc'));
-    const url = this.get('router').urlFor('some-route', 1, 2, 3, {
+    expectTypeOf(this.misc).toEqualTypeOf<Ember.Service>();
+
+    const url = this.router.urlFor('some-route', 1, 2, 3, {
       queryParams: { seriously: 'yes' },
     });
     assertType<string>(url);

From a0fd30ad4ea3927e23f0563002a4f2c8fc77f7ab Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 29 Aug 2022 20:36:16 -0600
Subject: [PATCH 1111/1405] Ignore a case where Ember.get is distinct from get

While we would prefer this to work, it is not a hard necessity, for (at
least) two reasons:

1. Use of `Ember.get` vs. the import from `@ember/object` is rare and
   should be discouraged.

2. Use of `get` is itself fairly unusual to *need* these days; most
   uses either will not hit this case, as in the deep key lookup (which
   is always just `unknown` anyways) or should be trivially replaced
   with direct property access (since Ember 3.1!).
---
 types/preview/ember/test/object.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/types/preview/ember/test/object.ts b/types/preview/ember/test/object.ts
index edeff03fb92..d9405d4dae8 100755
--- a/types/preview/ember/test/object.ts
+++ b/types/preview/ember/test/object.ts
@@ -65,8 +65,18 @@ export class Foo2 extends Ember.Object {
     // (currently) possible for the type utility to match it.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const x: string = Ember.set(this, 'name', name);
+
+    // TODO: it would be nice if we can get this to work correctly; it is
+    // unclear why the version on the namespace does *not* work correctly but
+    // the standalone version *does*. However, the Ember namespace should be
+    // little used (and hopefully we will deprecate it soon), and `get` itself
+    // is in much the same bucket: 99% of cases are *either* totally unsafe deep
+    // key access like `get(foo, 'bar.baz.quux')` which we do not support at all
+    // *or* they can be trivially codemodded to direct property access.
+    // @ts-ignore
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const y: string = Ember.get(this, 'name');
+
     this.setProperties({
       name,
     });

From 241a9181007fe07d1a904bc9eb8ab41e6b0ec534 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 30 Aug 2022 09:29:01 -0600
Subject: [PATCH 1112/1405] Simplify handling of preview types for
 get(Properties)

Unlike in the previous pass, this does not try to handle index access
'correctly', instead choosing to just push people to use normal JS if
they want that safety.
---
 types/preview/@ember/object/index.d.ts        | 30 ++------------
 types/preview/@ember/object/test/object.ts    | 40 ++++++++++++-------
 .../preview/@ember/object/test/observable.ts  | 22 +++++-----
 types/preview/ember/test/object.ts            | 31 +++++---------
 types/preview/ember/test/observable.ts        | 20 +++++-----
 5 files changed, 59 insertions(+), 84 deletions(-)

diff --git a/types/preview/@ember/object/index.d.ts b/types/preview/@ember/object/index.d.ts
index 5a6a0370eb9..05a3cbb5129 100644
--- a/types/preview/@ember/object/index.d.ts
+++ b/types/preview/@ember/object/index.d.ts
@@ -33,34 +33,12 @@ export function observer<Fn extends (target: any, key: string) => void>(
   ...args: [...propertyNames: string[], func: Fn]
 ): Fn;
 
-// Allows us to split apart `Record` types which have distinct keys (e.g. using
-// an enum or a union of specific keys) from those which just have an index type
-// and therefore to get the same behavior with `get` and friends as we would
-// when indexing directly with JS.
-// See https://stackoverflow.com/a/68261113/564181
-type RemoveIndex<T> = {
-  [K in keyof T as {} extends Record<K, 1> ? never : K]: T[K];
-};
-
-// Using `RemoveIndex` here then allows us to keep the desired behavior under
-// `noUncheckedIndexedAccess` as direct property access.
-type Get<T, K extends keyof T> = K extends keyof RemoveIndex<T> ? T[K] : T[K] | undefined;
-
-// We do the same here. Additionally, this uses an array type so that we can
-// distribute over each item in the list (accessing with `[number]`) instead of
-// over the list as a union, so that doing an index access gets the type for
-// that specific key rather then a union of the types associated with all the
-// keys.
-type GetProperties<T, Keys extends Array<keyof T>> = {
-  [K in Keys[number]]: Get<T, K>;
-};
-
 /**
  * Gets the value of a property on an object. If the property is computed,
  * the function will be invoked. If the property is not defined but the
  * object implements the `unknownProperty` method then that will be invoked.
  */
-export function get<T, K extends keyof T>(obj: T, key: K): Get<T, K>;
+export function get<T, K extends keyof T>(obj: T, key: K): T[K];
 export function get(obj: unknown, key: string): unknown;
 
 /**
@@ -69,14 +47,14 @@ export function get(obj: unknown, key: string): unknown;
  * property is not defined but the object implements the `setUnknownProperty`
  * method then that will be invoked as well.
  */
-export function set<T, K extends keyof T>(obj: T, key: K, value: T[K]): T[K];
+export function set<T, K extends keyof T, V extends T[K]>(obj: T, key: K, value: V): V;
 
 /**
  * To get multiple properties at once, call `getProperties` with an object
  * followed by a list of strings or an array.
  */
-export function getProperties<T, K extends Array<keyof T>>(obj: T, list: K): GetProperties<T, K>;
-export function getProperties<T, K extends Array<keyof T>>(obj: T, ...list: K): GetProperties<T, K>;
+export function getProperties<T, K extends keyof T>(obj: T, list: K[]): Pick<T, K>;
+export function getProperties<T, K extends keyof T>(obj: T, ...list: K[]): Pick<T, K>;
 
 /**
  * Set a list of properties on an object. These properties are set inside
diff --git a/types/preview/@ember/object/test/object.ts b/types/preview/@ember/object/test/object.ts
index 44abefa12fa..1ff499ba089 100644
--- a/types/preview/@ember/object/test/object.ts
+++ b/types/preview/@ember/object/test/object.ts
@@ -40,9 +40,18 @@ class Foo extends Object {
   b = 5;
 
   baz() {
-    const y = this.b; // $ExpectType number
-    const z = this.a; // $ExpectType ComputedProperty<string, string>
+    expectTypeOf(this.b).toBeNumber();
+    expectTypeOf(this.a).toBeString();
     this.b = 10;
+
+    // For some reason, `this` type lookup does not resolve correctly here. Used
+    // outside a class, like `get(someFoo, 'name')`, this works correctly. Since
+    // there are basically no cases inside a class where you *have* to use `get`
+    // today, this is an acceptable workaround for now. It is assignable *or*
+    // castable.
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const a: number = this.get('b');
+
     this.get('b').toFixed(4); // $ExpectType string
     this.set('a', 'abc').split(','); // $ExpectType string[]
     this.set('b', 10).toFixed(4); // $ExpectType string
@@ -60,20 +69,21 @@ export class Foo2 extends Object {
   name = '';
 
   changeName(name: string) {
-    expectTypeOf(this.set('name', name)).toEqualTypeOf<string>();
-    // This is checking for assignability; `expectTypeOf` doesn't work correctly
-    // here because TS isn't resolving `this['name']` eagerly, and so it is not
-    // (currently) possible for the type utility to match it.
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const x: string = set(this, 'name', name);
+    expectTypeOf(this.set('name', name)).toBeString();
+    expectTypeOf(set(this, 'name', name)).toBeString();
+
+    // For some reason, `this` type lookup does not resolve correctly here. Used
+    // outside a class, like `get(someFoo, 'name')`, this works correctly. Since
+    // there are basically no cases inside a class where you *have* to use `get`
+    // today, this is an acceptable workaround for now. It is assignable *or*
+    // castable.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const y: string = get(this, 'name');
-    this.setProperties({
-      name,
-    });
-    setProperties(this, {
-      name,
-    });
+    const s: string = this.get('name');
+    expectTypeOf(get(this as Foo2, 'name')).toBeString();
+    expectTypeOf((this as Foo2).get('name')).toBeString();
+
+    expectTypeOf(this.setProperties({ name })).toEqualTypeOf<Pick<this, 'name'>>();
+    expectTypeOf(setProperties(this, { name })).toEqualTypeOf<Pick<this, 'name'>>();
   }
 
   bar() {
diff --git a/types/preview/@ember/object/test/observable.ts b/types/preview/@ember/object/test/observable.ts
index 11fb46016d5..cec5a0f11c5 100644
--- a/types/preview/@ember/object/test/observable.ts
+++ b/types/preview/@ember/object/test/observable.ts
@@ -63,11 +63,9 @@ function testGetProperties() {
     name: string;
     age: number;
   }>();
-  expectTypeOf(getProperties(person, 'name', 'age', 'capitalized')).toEqualTypeOf<{
-    name: string;
-    age: number;
-    capitalized: string;
-  }>();
+  expectTypeOf(getProperties(person, 'name', 'age', 'capitalized')).toEqualTypeOf<
+    Pick<Person, 'name' | 'age' | 'capitalized'>
+  >();
   expectTypeOf(person.getProperties('name')).toEqualTypeOf<{ name: string }>();
   expectTypeOf(person.getProperties('name', 'age')).toEqualTypeOf<{ name: string; age: number }>();
   expectTypeOf(person.getProperties(['name', 'age'])).toEqualTypeOf<{
@@ -115,14 +113,12 @@ function testDynamic() {
   const obj: Record<string, string> = {};
   const dynamicKey = 'dummy' as string;
 
-  expectTypeOf(get(obj, 'dummy')).toEqualTypeOf<string | undefined>();
-  expectTypeOf(get(obj, dynamicKey)).toEqualTypeOf<string | undefined>();
-  expectTypeOf(getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string | undefined }>();
-  expectTypeOf(getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
-  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string | undefined>>();
-  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<
-    Record<string, string | undefined>
-  >();
+  expectTypeOf(get(obj, 'dummy')).toEqualTypeOf<string>();
+  expectTypeOf(get(obj, dynamicKey)).toEqualTypeOf<string>();
+  expectTypeOf(getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string }>();
+  expectTypeOf(getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string }>();
+  expectTypeOf(getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
   expectTypeOf(set(obj, 'dummy', 'value')).toBeString();
   expectTypeOf(set(obj, dynamicKey, 'value')).toBeString();
   expectTypeOf(setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<Record<'dummy', string>>();
diff --git a/types/preview/ember/test/object.ts b/types/preview/ember/test/object.ts
index d9405d4dae8..e3f4a6cfaec 100755
--- a/types/preview/ember/test/object.ts
+++ b/types/preview/ember/test/object.ts
@@ -60,29 +60,20 @@ export class Foo2 extends Ember.Object {
   name = '';
 
   changeName(name: string) {
-    // This is checking for assignability; `expectTypeOf` doesn't work correctly
-    // here because TS isn't resolving `this['name']` eagerly, and so it is not
-    // (currently) possible for the type utility to match it.
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const x: string = Ember.set(this, 'name', name);
+    expectTypeOf(Ember.set(this, 'name', name)).toBeString();
 
-    // TODO: it would be nice if we can get this to work correctly; it is
-    // unclear why the version on the namespace does *not* work correctly but
-    // the standalone version *does*. However, the Ember namespace should be
-    // little used (and hopefully we will deprecate it soon), and `get` itself
-    // is in much the same bucket: 99% of cases are *either* totally unsafe deep
-    // key access like `get(foo, 'bar.baz.quux')` which we do not support at all
-    // *or* they can be trivially codemodded to direct property access.
-    // @ts-ignore
+    // For some reason, `this` type lookup does not resolve correctly here. Used
+    // outside a class, like `get(someFoo, 'name')`, this works correctly. Since
+    // there are basically no cases inside a class where you *have* to use `get`
+    // today, this is an acceptable workaround for now. It is assignable *or*
+    // castable.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const y: string = Ember.get(this, 'name');
+    const s: string = this.get('name');
+    expectTypeOf(Ember.get(this as Foo2, 'name')).toBeString();
+    expectTypeOf((this as Foo2).get('name')).toBeString();
 
-    this.setProperties({
-      name,
-    });
-    Ember.setProperties(this, {
-      name,
-    });
+    expectTypeOf(this.setProperties({ name })).toEqualTypeOf<Pick<this, 'name'>>();
+    expectTypeOf(Ember.setProperties(this, { name })).toEqualTypeOf<Pick<this, 'name'>>();
   }
 
   bar() {
diff --git a/types/preview/ember/test/observable.ts b/types/preview/ember/test/observable.ts
index 1707e9ed58e..c2371d8f789 100755
--- a/types/preview/ember/test/observable.ts
+++ b/types/preview/ember/test/observable.ts
@@ -109,16 +109,16 @@ function testDynamic() {
   const obj: Record<string, string> = {};
   const dynamicKey = 'dummy' as string;
 
-  expectTypeOf(Ember.get(obj, 'dummy')).toEqualTypeOf<string | undefined>();
-  expectTypeOf(Ember.get(obj, dynamicKey)).toEqualTypeOf<string | undefined>();
-  expectTypeOf(Ember.getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string | undefined }>();
-  expectTypeOf(Ember.getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string | undefined }>();
-  expectTypeOf(Ember.getProperties(obj, dynamicKey)).toEqualTypeOf<
-    Record<string, string | undefined>
-  >();
-  expectTypeOf(Ember.getProperties(obj, [dynamicKey])).toEqualTypeOf<
-    Record<string, string | undefined>
-  >();
+  // These all are "too loose" in `noUncheckedIndexedAccess`, but `get` has
+  // never properly supported that flag, and there is no path to doing so. If
+  // someone wants that support, they should switch to using direct property
+  // access instead of using `get` (which has many other advantages).
+  expectTypeOf(Ember.get(obj, 'dummy')).toEqualTypeOf<string>();
+  expectTypeOf(Ember.get(obj, dynamicKey)).toEqualTypeOf<string>();
+  expectTypeOf(Ember.getProperties(obj, 'dummy')).toEqualTypeOf<{ dummy: string }>();
+  expectTypeOf(Ember.getProperties(obj, ['dummy'])).toEqualTypeOf<{ dummy: string }>();
+  expectTypeOf(Ember.getProperties(obj, dynamicKey)).toEqualTypeOf<Record<string, string>>();
+  expectTypeOf(Ember.getProperties(obj, [dynamicKey])).toEqualTypeOf<Record<string, string>>();
   expectTypeOf(Ember.set(obj, 'dummy', 'value')).toBeString();
   expectTypeOf(Ember.set(obj, dynamicKey, 'value')).toBeString();
   expectTypeOf(Ember.setProperties(obj, { dummy: 'value ' })).toEqualTypeOf<

From d7667a508d76189336952a7ea113f8e0b2415afe Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 30 Aug 2022 17:03:02 -0600
Subject: [PATCH 1113/1405] Finish getting preview types type checking

- fix runloop test
- provide an internal-only type for Resolver` that should be
  compatible with the one in `@types/ember-resolver`
---
 types/preview/@ember/-internals/resolver.d.ts | 33 +++++++
 types/preview/@ember/application/index.d.ts   |  2 +-
 .../@ember/debug/container-debug-adapter.d.ts |  2 +-
 types/preview/@ember/engine/index.d.ts        | 24 +----
 .../@ember/runloop/ember__runloop-tests.ts    | 64 ++++++------
 types/preview/ember/index.d.ts                |  1 +
 .../ember/test/application-instance.ts        |  4 +-
 .../preview/ember/test/ember-module-tests.ts  | 97 +++++++++++--------
 types/preview/ember/test/run.ts               |  8 +-
 9 files changed, 138 insertions(+), 97 deletions(-)
 create mode 100644 types/preview/@ember/-internals/resolver.d.ts

diff --git a/types/preview/@ember/-internals/resolver.d.ts b/types/preview/@ember/-internals/resolver.d.ts
new file mode 100644
index 00000000000..715f3f0168d
--- /dev/null
+++ b/types/preview/@ember/-internals/resolver.d.ts
@@ -0,0 +1,33 @@
+/**
+ * @module
+ * @private This is not a public API module, and in fact ***there is no such
+ *   module at runtime***. This module exists only to provide a public API for
+ *   `Resolver`, which will get a dedicated home as part of Ember's public API
+ *   via a future RFC. As an end user, if you need access to `Resolver` for now
+ *   you should ordinarily get it via `ember-resolver`.
+ */
+
+import EmberObject from '@ember/object';
+import type { Factory, FullName } from '@ember/owner';
+ 
+export type KnownForTypeResult<Type extends string> = {
+  [fullName in `${Type}:${string}`]: boolean | undefined;
+};
+ 
+/**
+ * A `Resolver` is the mechanism responsible for looking up code in your
+ * application and converting its naming conventions into the actual classes,
+ * functions, and templates that Ember needs to resolve its dependencies, for
+ * example, what template to render for a given route. It is a system that helps
+ * the app resolve the lookup of JavaScript modules agnostic of what kind of
+ * module system is used, which can be AMD, CommonJS or just plain globals. It
+ * is used to lookup routes, models, components, templates, or anything that is
+ * used in your Ember app.
+ */
+export interface Resolver extends EmberObject {
+  knownForType?: <TypeName extends string>(type: TypeName) => KnownForTypeResult<TypeName>;
+  lookupDescription?: (fullName: FullName) => string;
+  makeToString?: (factory: Factory<object>, fullName: FullName) => string;
+  normalize?: (fullName: FullName) => string;
+  resolve(name: string): Factory<object> | object | undefined;
+}
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index bc0826caeac..3a2265ac053 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -4,7 +4,7 @@ import EventDispatcher from '@ember/application/-private/event-dispatcher';
 import { EventDispatcherEvents } from '@ember/application/types';
 import { Router } from '@ember/routing';
 import Registry from '@ember/application/-private/registry';
-import { Resolver } from '@ember/engine';
+import type { Resolver } from '@ember/-internals/resolver';
 import { AnyFn } from 'ember/-private/type-utils';
 import Owner from '@ember/owner';
 import type GlimmerComponent from '@glimmer/component';
diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
index 7789b086d1f..d8528cc934b 100644
--- a/types/preview/@ember/debug/container-debug-adapter.d.ts
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -1,4 +1,4 @@
-import Resolver from 'ember-resolver';
+import type { Resolver} from '@ember/-internals/resolver';
 
 /**
  * The ContainerDebugAdapter helps the container and resolver interface
diff --git a/types/preview/@ember/engine/index.d.ts b/types/preview/@ember/engine/index.d.ts
index 130449d87de..03e729f808a 100644
--- a/types/preview/@ember/engine/index.d.ts
+++ b/types/preview/@ember/engine/index.d.ts
@@ -2,29 +2,7 @@ import EmberObject from '@ember/object';
 import type RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
 import type Initializer from '@ember/engine/-private/types/initializer';
 import type EngineInstance from '@ember/engine/instance';
-import type { Factory, FullName } from '@ember/owner';
-
-export type KnownForTypeResult<Type extends string> = {
-  [fullName in `${Type}:${string}`]: boolean | undefined;
-};
-
-/**
- * A `Resolver` the mechanism responsible for looking up code in your
- * application and converting its naming conventions into the actual classes,
- * functions, and templates that Ember needs to resolve its dependencies, for
- * example, what template to render for a given route. It is a system that helps
- * the app resolve the lookup of JavaScript modules agnostic of what kind of
- * module system is used, which can be AMD, CommonJS or just plain globals. It
- * is used to lookup routes, models, components, templates, or anything that is
- * used in your Ember app.
- */
-export interface Resolver {
-  knownForType?: <TypeName extends string>(type: TypeName) => KnownForTypeResult<TypeName>;
-  lookupDescription?: (fullName: FullName) => string;
-  makeToString?: (factory: Factory<object>, fullName: FullName) => string;
-  normalize?: (fullName: FullName) => string;
-  resolve(name: string): Factory<object> | object | undefined;
-}
+import type { Resolver} from '@ember/-internals/resolver';
 
 /**
  * The `Engine` class contains core functionality for both applications and
diff --git a/types/preview/@ember/runloop/ember__runloop-tests.ts b/types/preview/@ember/runloop/ember__runloop-tests.ts
index 5192db4bcae..a36e1b46ac9 100644
--- a/types/preview/@ember/runloop/ember__runloop-tests.ts
+++ b/types/preview/@ember/runloop/ember__runloop-tests.ts
@@ -15,7 +15,7 @@ import {
   // private, supported via `declare module` below
   _backburner
 } from '@ember/runloop';
-import EmberObject from '@ember/object';
+import EmberObject, { action } from '@ember/object';
 import { Backburner, DebugInfo, QueueItem, DeferredActionQueues } from '@ember/runloop/-private/backburner';
 
 // It will be the responsibility of each consuming package that needs access to the backburner property
@@ -61,19 +61,21 @@ function testRun() {
     }
 }
 
-function testBind() {
-    EmberObject.extend({
-        init() {
-            const bound = bind(this, this.setupEditor);
-            bound();
-        },
-
-        editor: null as string | null,
-
-        setupEditor(editor: string) {
-            this.set('editor', editor);
-        }
-    });
+class TestBind extends EmberObject {
+  init() {
+      // NOTE: these don't actually preserve the underlying type. Critically,
+      // though, our types have *never* supported that for `bind`.
+      const bound = bind(this, this.setupEditor);
+      bound("hello");
+      const boundAgain = bind(this, 'setupEditor');
+      boundAgain("hello");
+  }
+
+  editor: string | null = null;
+
+  setupEditor(editor: string) {
+      this.set('editor', editor);
+  }
 }
 
 function testCancel() {
@@ -158,17 +160,23 @@ function testDebounce() {
     debounce(runIt, 150);
     debounce(myContext, runIt, 150);
     debounce(myContext, runIt, 150, true);
+    
+    class DebounceExample extends EmberObject {
+      searchValue = 'test';
+      fetchResults(value: string) {}
+      
+      @action
+      handleTyping() {
+          // the fetchResults function is passed into the component from its parent
+          debounce(this, this.fetchResults, this.searchValue, 250);
+      }
+    }
 
     EmberObject.extend({
         searchValue: 'test',
         fetchResults(value: string) {},
 
-        actions: {
-            handleTyping() {
-                // the fetchResults function is passed into the component from its parent
-                debounce(this, this.get('fetchResults'), this.get('searchValue'), 250);
-            }
-        }
+        
     });
 }
 
@@ -215,17 +223,17 @@ function testNext() {
     });
 }
 
-function testOnce() {
-    EmberObject.extend({
-        init() {
-            once(this, 'processFullName');
-        },
+class TestOnce extends EmberObject {
+  init() {
+      once(this as TestOnce, 'processFullName');
+      once(this, this.processFullName);
+  }
 
-        processFullName() {
-        }
-    });
+  processFullName() {
+  }
 }
 
+
 function testSchedule() {
     EmberObject.extend({
         init() {
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index c2fdf3e1af8..81f76ca76f1 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -123,6 +123,7 @@ export namespace Ember {
   class ObjectProxy extends EmberObjectProxyNs.default {}
   const Observable: typeof EmberObservable;
   const PromiseProxyMixin: typeof EmberObjectPromiseProxyNs.default;
+  interface PromiseProxyMixin<T> extends EmberObjectPromiseProxyNs.default<T> {}
   class CoreObject extends EmberCoreObject {}
   class DataAdapter extends EmberDataAdapter {}
   const Debug: {
diff --git a/types/preview/ember/test/application-instance.ts b/types/preview/ember/test/application-instance.ts
index e8893defbf8..ecff4b7b087 100644
--- a/types/preview/ember/test/application-instance.ts
+++ b/types/preview/ember/test/application-instance.ts
@@ -1,5 +1,4 @@
 import ApplicationInstance from '@ember/application/instance';
-import hbs from 'htmlbars-inline-precompile';
 
 const appInstance = ApplicationInstance.create();
 appInstance.register('some:injection', class Foo {});
@@ -12,7 +11,8 @@ appInstance.register('some:injection', class Foo {}, {
   instantiate: false,
 });
 
-appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`);
+// just check basic registration, doesn't yet have to be a template
+appInstance.register('templates:foo/bar', {});
 
 appInstance.register('some:injection', class Foo {}, {
   singleton: false,
diff --git a/types/preview/ember/test/ember-module-tests.ts b/types/preview/ember/test/ember-module-tests.ts
index 89d645a63de..b4953f4948c 100644
--- a/types/preview/ember/test/ember-module-tests.ts
+++ b/types/preview/ember/test/ember-module-tests.ts
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
 
 const top = (<T>(x?: T): T => x!)();
 type Top = typeof top;
@@ -75,43 +76,49 @@ Ember.isNone([]); // $ExpectType boolean
 Ember.isPresent(''); // $ExpectType boolean
 Ember.isPresent([]); // $ExpectType boolean
 // observer
-const o2 = Ember.Object.extend({
+class O2 extends Ember.Object {
+  name = 'foo'
+  age = 3;
+  
+  nameWatcher = Ember.observer('name', () => {});
+  nameWatcher2 = Ember.observer('name', 'fullName', () => {});
+}
+const o2 = O2.create({
   name: 'foo',
   age: 3,
-  nameWatcher: Ember.observer('name', () => {}),
-  nameWatcher2: Ember.observer('name', 'fullName', () => {}),
 });
 // on
-const o3 = Ember.Object.extend({
-  name: 'foo',
-  nameWatcher: Ember.on('init', () => {}),
-  nameWatcher2: Ember.on('destroy', () => {}),
-});
+class O3 extends Ember.Object {
+  name = 'foo';
+  nameWatcher = Ember.on('init', () => {});
+  nameWatcher2 = Ember.on('destroy', () => {});
+}
+const o3 = O3.create();
 // removeListener
-Ember.removeListener(o2, 'create', null, () => {});
-Ember.removeListener(o2, 'create', null, 'create');
+Ember.removeListener(O2, 'create', null, () => {});
+Ember.removeListener(O2, 'create', null, 'create');
 // @ts-expect-error
 Ember.removeListener({}, 'create', null, 'blah');
 // removeObserver
-Ember.removeObserver(o2, 'create', () => {});
+Ember.removeObserver(O2, 'create', () => {});
 // @ts-expect-error
 Ember.removeObserver({}, 'create', () => {});
 // runInDebug
 Ember.runInDebug(() => {});
 // sendEvent
-Ember.sendEvent(o2, 'clicked', [1, 2]); // $ExpectType boolean
+expectTypeOf(Ember.sendEvent(o2, 'clicked', [1, 2])).toBeBoolean();
 // set
-Ember.set(o2.create(), 'name', 'bar'); // $ExpectType string
-Ember.set(o2.create(), 'age', 4); // $ExpectType number
+Ember.set(O2.create(), 'name', 'bar'); // $ExpectType string
+Ember.set(O2.create(), 'age', 4); // $ExpectType number
 // @ts-expect-error
-Ember.set(o2.create(), 'nam', 'bar');
+Ember.set(O2.create(), 'nam', 'bar');
 // setOwner
 declare let app: Ember.ApplicationInstance;
-Ember.setOwner(o2.create(), app);
+Ember.setOwner(O2.create(), app);
 // setProperties
-Ember.setProperties(o2.create(), { name: 'bar' }).name; // $ExpectType string
+Ember.setProperties(O2.create(), { name: 'bar' }).name; // $ExpectType string
 // trySet
-Ember.trySet(o2, 'nam', ''); // $ExpectType any
+Ember.trySet(O2, 'nam', ''); // $ExpectType any
 // typeOf
 Ember.typeOf(''); // $ExpectType "string"
 Ember.typeOf(Ember.A()); // $ExpectType "array"
@@ -156,15 +163,20 @@ C1.create();
 C2.create();
 c1.didInsertElement();
 c2.didInsertElement();
-// Ember.ComputedProperty
-const cp: Ember.ComputedProperty<string, string> = Ember.computed('foo', {
-  get(): string {
-    return '';
-  },
-  set(_key: string, newVal: string): string {
-    return '';
-  },
-});
+
+class Foo {
+  foo = '';
+  
+  @Ember.computed('foo')
+  get wat(): string {
+    return this.foo
+  }
+  
+  set wat(newValue: string) {
+    this.foo = newValue;
+  }
+}
+
 // Ember.ContainerDebugAdapter
 const cda = new Ember.ContainerDebugAdapter(); // $ExpectType ContainerDebugAdapter
 // Ember.Controller
@@ -185,27 +197,33 @@ ei1.lookup('data:foo');
 // Ember.Error
 new Ember.Error('Halp!');
 // Ember.Evented
-const oe1 = Ember.Object.extend(Ember.Evented).create();
+interface OE1 extends Ember.Evented {}
+class OE1 extends Ember.Object.extend(Ember.Evented) {}
+const oe1 = OE1.create();
 oe1.trigger('foo');
 oe1.on('bar', () => {});
 oe1.on('bar', { foo() {} }, () => {});
 // Ember.HashLocation
 const hl = new Ember.HashLocation(); // $ExpectType HashLocation
 // Ember.Helper
-const h1 = Ember.Helper.extend({
+class H1 extends Ember.Helper {
   compute() {
     this.recompute();
     return '';
-  },
-});
+  }
+}
 // Ember.HistoryLocation
-const hil = new Ember.HistoryLocation(); // $ExpectType HistoryLocation
+const hil = Ember.HistoryLocation.create();
+expectTypeOf(hil).toEqualTypeOf<Ember.HistoryLocation>();
 // Ember.Mixin
-Ember.Object.extend(Ember.Mixin.create({ foo: 'bar' }), {
+interface UsesMixin {
+  foo: string
+}
+class UsesMixin extends Ember.Object {
   baz() {
-    this.foo; // $ExpectType string
-  },
-});
+    expectTypeOf(this.foo).toBeString();
+  }
+}
 // Ember.MutableArray
 const ma1: Ember.MutableArray<string> = ['money', 'in', 'the', 'bananna', 'stand'];
 ma1.addObject('!'); // $ExpectType string
@@ -237,12 +255,13 @@ new Ember.ObjectProxy(); // $ExpectType ObjectProxy
 // Ember.Observable
 Ember.Object.extend(Ember.Observable, {});
 // Ember.PromiseProxyMixin
-Ember.Object.extend(Ember.PromiseProxyMixin, {
+interface PPM<T> extends Ember.PromiseProxyMixin<T> {}
+class PPM<T> extends Ember.Object.extend(Ember.PromiseProxyMixin) {
   foo() {
     this.reason; // $ExpectType unknown
     this.isPending; // $ExpectType boolean
-  },
-});
+  }
+}
 // Ember.Route
 new Ember.Route();
 // Ember.Router
diff --git a/types/preview/ember/test/run.ts b/types/preview/ember/test/run.ts
index aa86a35ddc2..2bebd3e019e 100755
--- a/types/preview/ember/test/run.ts
+++ b/types/preview/ember/test/run.ts
@@ -160,12 +160,14 @@ function testNext() {
   });
 }
 
-class TestOnce extends Ember.Component {
+class TestOnce extends Ember.Object {
   init() {
-    Ember.run.once(this, 'processFullName');
+      Ember.run.once(this as TestOnce, 'processFullName');
+      Ember.run.once(this, this.processFullName);
   }
 
-  processFullName() {}
+  processFullName() {
+  }
 }
 
 {

From 225c291060c5ca630cee019d6624ec1a28182dcb Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 30 Aug 2022 17:03:19 -0600
Subject: [PATCH 1114/1405] Run Prettier on types/preview directory

---
 types/preview/@ember/-internals/resolver.d.ts |   4 +-
 .../-private/event-dispatcher.d.ts            |  12 +-
 .../@ember/application/-private/registry.d.ts |   6 +-
 .../@ember/application/test/deprecations.ts   |  10 +-
 .../preview/@ember/application/test/index.ts  |   2 +-
 types/preview/@ember/application/types.d.ts   |  50 +-
 types/preview/@ember/array/test/array-ext.ts  |   8 +-
 .../@ember/component/template-only.d.ts       |   2 +-
 .../@ember/component/test/template-only.ts    |  16 +-
 .../@ember/debug/container-debug-adapter.d.ts |   2 +-
 types/preview/@ember/debug/data-adapter.d.ts  | 104 +-
 .../@ember/debug/ember__debug-tests.ts        | 122 ++-
 types/preview/@ember/destroyable/test/main.ts |  82 +-
 .../engine/-private/types/initializer.d.ts    |   8 +-
 types/preview/@ember/engine/index.d.ts        |   2 +-
 .../@ember/engine/test/engine-instance.ts     |  10 +-
 .../@ember/error/ember__error-tests.ts        |   3 +-
 types/preview/@ember/object/events.d.ts       |  38 +-
 types/preview/@ember/object/observers.d.ts    |  30 +-
 .../@ember/object/test/access-modifier.ts     |  18 +-
 types/preview/@ember/object/test/compat.ts    |  12 +-
 .../@ember/owner/ember__owner-tests.ts        |  38 +-
 .../polyfills/ember__polyfills-tests.ts       |  36 +-
 .../@ember/routing/-private/router-dsl.d.ts   |  32 +-
 .../preview/@ember/routing/auto-location.d.ts |   2 +-
 .../preview/@ember/routing/hash-location.d.ts |   2 +-
 .../@ember/routing/history-location.d.ts      |   2 +-
 .../preview/@ember/routing/none-location.d.ts |   2 +-
 types/preview/@ember/routing/route-info.d.ts  | 102 +-
 types/preview/@ember/routing/route.d.ts       | 973 +++++++++---------
 .../@ember/routing/router-service.d.ts        | 658 ++++++------
 types/preview/@ember/routing/router.d.ts      |  66 +-
 .../@ember/routing/test/router-service.ts     |  16 +-
 types/preview/@ember/routing/transition.d.ts  | 220 ++--
 types/preview/@ember/routing/types.d.ts       |  16 +-
 .../@ember/runloop/-private/backburner.d.ts   |  58 +-
 .../@ember/runloop/-private/types.d.ts        |   8 +-
 .../@ember/runloop/ember__runloop-tests.ts    | 397 +++----
 types/preview/@ember/runloop/types.d.ts       |   2 +-
 .../@ember/template/ember__template-tests.ts  |   8 +-
 types/preview/@ember/test/adapter.d.ts        |  28 +-
 .../preview/@ember/test/ember__test-tests.ts  |  44 +-
 types/preview/ember/test/application.ts       |  36 +-
 types/preview/ember/test/array-ext.ts         |   6 +-
 types/preview/ember/test/debug.ts             |  86 +-
 .../preview/ember/test/ember-module-tests.ts  |  12 +-
 types/preview/ember/test/engine-instance.ts   |  10 +-
 types/preview/ember/test/run.ts               |   7 +-
 .../test/techniques/properties-from-this.ts   |  44 +-
 types/preview/ember/test/test.ts              |  26 +-
 types/preview/ember/test/view-utils.ts        |   2 +-
 51 files changed, 1762 insertions(+), 1718 deletions(-)

diff --git a/types/preview/@ember/-internals/resolver.d.ts b/types/preview/@ember/-internals/resolver.d.ts
index 715f3f0168d..a32bc036942 100644
--- a/types/preview/@ember/-internals/resolver.d.ts
+++ b/types/preview/@ember/-internals/resolver.d.ts
@@ -9,11 +9,11 @@
 
 import EmberObject from '@ember/object';
 import type { Factory, FullName } from '@ember/owner';
- 
+
 export type KnownForTypeResult<Type extends string> = {
   [fullName in `${Type}:${string}`]: boolean | undefined;
 };
- 
+
 /**
  * A `Resolver` is the mechanism responsible for looking up code in your
  * application and converting its naming conventions into the actual classes,
diff --git a/types/preview/@ember/application/-private/event-dispatcher.d.ts b/types/preview/@ember/application/-private/event-dispatcher.d.ts
index 3df6d612ad7..3f72b1653b4 100644
--- a/types/preview/@ember/application/-private/event-dispatcher.d.ts
+++ b/types/preview/@ember/application/-private/event-dispatcher.d.ts
@@ -7,10 +7,10 @@ import { EventDispatcherEvents } from '@ember/application/types';
  * called.
  */
 export default class EventDispatcher extends Object {
-    /**
-     * The set of events names (and associated handler function names) to be setup
-     * and dispatched by the `EventDispatcher`. Modifications to this list can be done
-     * at setup time, generally via the `Ember.Application.customEvents` hash.
-     */
-    events: EventDispatcherEvents;
+  /**
+   * The set of events names (and associated handler function names) to be setup
+   * and dispatched by the `EventDispatcher`. Modifications to this list can be done
+   * at setup time, generally via the `Ember.Application.customEvents` hash.
+   */
+  events: EventDispatcherEvents;
 }
diff --git a/types/preview/@ember/application/-private/registry.d.ts b/types/preview/@ember/application/-private/registry.d.ts
index dc5ca32d531..60604ceae87 100644
--- a/types/preview/@ember/application/-private/registry.d.ts
+++ b/types/preview/@ember/application/-private/registry.d.ts
@@ -5,5 +5,9 @@ import { EmberClassConstructor } from '@ember/object/-private/types';
  * by type.
  */
 export default class Registry {
-    register(fullName: string, factory: EmberClassConstructor<unknown>, options?: { singleton?: boolean | undefined }): void;
+  register(
+    fullName: string,
+    factory: EmberClassConstructor<unknown>,
+    options?: { singleton?: boolean | undefined }
+  ): void;
 }
diff --git a/types/preview/@ember/application/test/deprecations.ts b/types/preview/@ember/application/test/deprecations.ts
index e9bb19ed390..414e38af111 100644
--- a/types/preview/@ember/application/test/deprecations.ts
+++ b/types/preview/@ember/application/test/deprecations.ts
@@ -1,13 +1,13 @@
 import { deprecate, deprecateFunc } from '@ember/application/deprecations';
 
 deprecate('this is no longer advised', false, {
-    id: 'no-longer-advised',
-    until: 'v4.0',
+  id: 'no-longer-advised',
+  until: 'v4.0',
 });
 deprecate('this is no longer advised', false, {
-    id: 'no-longer-advised',
-    until: 'v4.0',
-    url: 'https://emberjs.com',
+  id: 'no-longer-advised',
+  until: 'v4.0',
+  url: 'https://emberjs.com',
 });
 // @ts-expect-error
 deprecate('this is no longer advised', false);
diff --git a/types/preview/@ember/application/test/index.ts b/types/preview/@ember/application/test/index.ts
index 521a4b6936d..f04751e2290 100644
--- a/types/preview/@ember/application/test/index.ts
+++ b/types/preview/@ember/application/test/index.ts
@@ -9,7 +9,7 @@ getOwner({});
 
 // Confirm that random subclasses work as expected.
 declare class MyService extends Service {
-    withStuff: true;
+  withStuff: true;
 }
 declare let myService: MyService;
 // $ExpectType Owner
diff --git a/types/preview/@ember/application/types.d.ts b/types/preview/@ember/application/types.d.ts
index f03863c4d29..75e3f6d8487 100644
--- a/types/preview/@ember/application/types.d.ts
+++ b/types/preview/@ember/application/types.d.ts
@@ -1,27 +1,27 @@
 export interface EventDispatcherEvents {
-    touchstart?: string | null | undefined;
-    touchmove?: string | null | undefined;
-    touchend?: string | null | undefined;
-    touchcancel?: string | null | undefined;
-    keydown?: string | null | undefined;
-    keyup?: string | null | undefined;
-    keypress?: string | null | undefined;
-    mousedown?: string | null | undefined;
-    mouseup?: string | null | undefined;
-    contextmenu?: string | null | undefined;
-    click?: string | null | undefined;
-    dblclick?: string | null | undefined;
-    focusin?: string | null | undefined;
-    focusout?: string | null | undefined;
-    submit?: string | null | undefined;
-    input?: string | null | undefined;
-    change?: string | null | undefined;
-    dragstart?: string | null | undefined;
-    drag?: string | null | undefined;
-    dragenter?: string | null | undefined;
-    dragleave?: string | null | undefined;
-    dragover?: string | null | undefined;
-    drop?: string | null | undefined;
-    dragend?: string | null | undefined;
-    [event: string]: string | null | undefined;
+  touchstart?: string | null | undefined;
+  touchmove?: string | null | undefined;
+  touchend?: string | null | undefined;
+  touchcancel?: string | null | undefined;
+  keydown?: string | null | undefined;
+  keyup?: string | null | undefined;
+  keypress?: string | null | undefined;
+  mousedown?: string | null | undefined;
+  mouseup?: string | null | undefined;
+  contextmenu?: string | null | undefined;
+  click?: string | null | undefined;
+  dblclick?: string | null | undefined;
+  focusin?: string | null | undefined;
+  focusout?: string | null | undefined;
+  submit?: string | null | undefined;
+  input?: string | null | undefined;
+  change?: string | null | undefined;
+  dragstart?: string | null | undefined;
+  drag?: string | null | undefined;
+  dragenter?: string | null | undefined;
+  dragleave?: string | null | undefined;
+  dragover?: string | null | undefined;
+  drop?: string | null | undefined;
+  dragend?: string | null | undefined;
+  [event: string]: string | null | undefined;
 }
diff --git a/types/preview/@ember/array/test/array-ext.ts b/types/preview/@ember/array/test/array-ext.ts
index d4fa40cf36c..beeba72a113 100755
--- a/types/preview/@ember/array/test/array-ext.ts
+++ b/types/preview/@ember/array/test/array-ext.ts
@@ -3,11 +3,11 @@ import EmberObject from '@ember/object';
 import ArrayPrototypeExtensions from '@ember/array/types/prototype-extensions';
 
 declare global {
-    interface Array<T> extends ArrayPrototypeExtensions<T> {}
+  interface Array<T> extends ArrayPrototypeExtensions<T> {}
 }
 
 class Person extends EmberObject {
-    declare name: string;
+  declare name: string;
 }
 
 const person = Person.create({ name: 'Joe' });
@@ -16,8 +16,8 @@ const array = [person];
 assertType<number>(array.get('length'));
 assertType<Person | undefined>(array.get('firstObject'));
 assertType<string[]>(array.mapBy('name'));
-assertType<string[]>(array.map(p => p.get('name')));
+assertType<string[]>(array.map((p) => p.get('name')));
 assertType<Person[]>(array.sortBy('name'));
 assertType<Person[]>(array.uniq());
 assertType<Person[]>(array.uniqBy('name'));
-assertType<Person[]>(array.uniqBy(p => p.get('name')));
+assertType<Person[]>(array.uniqBy((p) => p.get('name')));
diff --git a/types/preview/@ember/component/template-only.d.ts b/types/preview/@ember/component/template-only.d.ts
index 6f652be7b20..853d3a0e1c9 100644
--- a/types/preview/@ember/component/template-only.d.ts
+++ b/types/preview/@ember/component/template-only.d.ts
@@ -29,7 +29,7 @@ import { Opaque } from 'ember/-private/type-utils';
  * the template.
  */
 export interface TemplateOnlyComponent<S = unknown> extends Opaque<S> {
-    toString(): string;
+  toString(): string;
 }
 
 /**
diff --git a/types/preview/@ember/component/test/template-only.ts b/types/preview/@ember/component/test/template-only.ts
index ce494a181a8..6a9e0d01c19 100644
--- a/types/preview/@ember/component/test/template-only.ts
+++ b/types/preview/@ember/component/test/template-only.ts
@@ -8,14 +8,14 @@ to.toString(); // $ExpectType string
 new TemplateOnlyComponent();
 
 interface MySig {
-    Element: HTMLAnchorElement;
-    Args: {
-        name: string;
-        age: number;
-    };
-    Blocks: {
-        default: [(newName: string) => void];
-    };
+  Element: HTMLAnchorElement;
+  Args: {
+    name: string;
+    age: number;
+  };
+  Blocks: {
+    default: [(newName: string) => void];
+  };
 }
 
 // $ExpectType TemplateOnlyComponent<MySig>
diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
index d8528cc934b..d0f9c8aa6ae 100644
--- a/types/preview/@ember/debug/container-debug-adapter.d.ts
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -1,4 +1,4 @@
-import type { Resolver} from '@ember/-internals/resolver';
+import type { Resolver } from '@ember/-internals/resolver';
 
 /**
  * The ContainerDebugAdapter helps the container and resolver interface
diff --git a/types/preview/@ember/debug/data-adapter.d.ts b/types/preview/@ember/debug/data-adapter.d.ts
index 9ed2f3c7515..6dcae185384 100644
--- a/types/preview/@ember/debug/data-adapter.d.ts
+++ b/types/preview/@ember/debug/data-adapter.d.ts
@@ -1,24 +1,24 @@
-import ContainerDebugAdapter from "@ember/debug/container-debug-adapter";
-import EmberObject from "@ember/object";
+import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+import EmberObject from '@ember/object';
 
 declare namespace DataAdapter {
-    interface Column {
-        name: string;
-        desc: string;
-    }
-    interface WrappedRecord {
-        columnValues: object;
-        object: object;
-    }
-    interface WrappedType {
-        type: {
-            name: string;
-            count: number;
-            columns: Column[];
-            object: typeof Object;
-        };
-        release: () => void;
-    }
+  interface Column {
+    name: string;
+    desc: string;
+  }
+  interface WrappedRecord {
+    columnValues: object;
+    object: object;
+  }
+  interface WrappedType {
+    type: {
+      name: string;
+      count: number;
+      columns: Column[];
+      object: typeof Object;
+    };
+    release: () => void;
+  }
 }
 
 /**
@@ -26,37 +26,37 @@ declare namespace DataAdapter {
  * interface with tools that debug Ember such as Chrome and Firefox.
  */
 export default class DataAdapter extends EmberObject {
-    /**
-     * The container-debug-adapter which is used
-     * to list all models.
-     */
-    containerDebugAdapter: ContainerDebugAdapter;
-    /**
-     * Ember Data > v1.0.0-beta.18
-     * requires string model names to be passed
-     * around instead of the actual factories.
-     */
-    acceptsModelName: boolean;
-    /**
-     * Specifies how records can be filtered.
-     * Records returned will need to have a `filterValues`
-     * property with a key for every name in the returned array.
-     */
-    getFilters(): DataAdapter.Column[];
-    /**
-     * Fetch the model types and observe them for changes.
-     */
-    watchModelTypes(
-        typesAdded: (types: DataAdapter.WrappedType[]) => void,
-        typesUpdated: (types: DataAdapter.WrappedType[]) => void
-    ): () => void;
-    /**
-     * Fetch the records of a given type and observe them for changes.
-     */
-    watchRecords(
-        modelName: string,
-        recordsAdded: (records: DataAdapter.WrappedRecord[]) => void,
-        recordsUpdated: (records: DataAdapter.WrappedRecord[]) => void,
-        recordsRemoved: (idx: number, count: number) => void
-    ): () => void;
+  /**
+   * The container-debug-adapter which is used
+   * to list all models.
+   */
+  containerDebugAdapter: ContainerDebugAdapter;
+  /**
+   * Ember Data > v1.0.0-beta.18
+   * requires string model names to be passed
+   * around instead of the actual factories.
+   */
+  acceptsModelName: boolean;
+  /**
+   * Specifies how records can be filtered.
+   * Records returned will need to have a `filterValues`
+   * property with a key for every name in the returned array.
+   */
+  getFilters(): DataAdapter.Column[];
+  /**
+   * Fetch the model types and observe them for changes.
+   */
+  watchModelTypes(
+    typesAdded: (types: DataAdapter.WrappedType[]) => void,
+    typesUpdated: (types: DataAdapter.WrappedType[]) => void
+  ): () => void;
+  /**
+   * Fetch the records of a given type and observe them for changes.
+   */
+  watchRecords(
+    modelName: string,
+    recordsAdded: (records: DataAdapter.WrappedRecord[]) => void,
+    recordsUpdated: (records: DataAdapter.WrappedRecord[]) => void,
+    recordsRemoved: (idx: number, count: number) => void
+  ): () => void;
 }
diff --git a/types/preview/@ember/debug/ember__debug-tests.ts b/types/preview/@ember/debug/ember__debug-tests.ts
index 9df7cf532de..3a803dae675 100644
--- a/types/preview/@ember/debug/ember__debug-tests.ts
+++ b/types/preview/@ember/debug/ember__debug-tests.ts
@@ -1,11 +1,11 @@
 import {
-    runInDebug,
-    warn,
-    debug,
-    assert,
-    registerWarnHandler,
-    registerDeprecationHandler,
-    deprecate,
+  runInDebug,
+  warn,
+  debug,
+  assert,
+  registerWarnHandler,
+  registerDeprecationHandler,
+  deprecate,
 } from '@ember/debug';
 
 /**
@@ -23,8 +23,9 @@ warn('Too many tomsters!', { id: 'some-warning' }); // $ExpectType void
 // @ts-expect-error
 warn('Too many tomsters!', tomsterCount <= 3);
 warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' }); // $ExpectType void
-warn('Too many tomsters!', tomsterCount <= 3, { // $ExpectType void
-    id: 'ember-debug.too-many-tomsters'
+warn('Too many tomsters!', tomsterCount <= 3, {
+  // $ExpectType void
+  id: 'ember-debug.too-many-tomsters',
 });
 
 // @ts-expect-error
@@ -56,52 +57,60 @@ assert();
 // @ts-expect-error
 registerWarnHandler();
 registerWarnHandler(() => {}); // $ExpectType void
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
-});
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    // @ts-expect-error
-    next();
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
+});
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  // @ts-expect-error
+  next();
 });
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    next(message); // $ExpectType void
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  next(message); // $ExpectType void
 });
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    next(message, options); // $ExpectType void
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  next(message, options); // $ExpectType void
 });
 
 // next is not called, so no warnings get the default behavior
 // @ts-expect-error
 registerDeprecationHandler();
 registerDeprecationHandler(() => {}); // $ExpectType void
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
-});
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    // @ts-expect-error
-    next();
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
+});
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  // @ts-expect-error
+  next();
 });
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    next(message); // $ExpectType void
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  next(message); // $ExpectType void
 });
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    next(message, options); // $ExpectType void
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  next(message, options); // $ExpectType void
 });
 
 // @ts-expect-error
@@ -118,7 +127,8 @@ deprecate('missing options body', true, {});
 deprecate('missing options id', true, { until: 'v4.0.0' });
 // @ts-expect-error
 deprecate('missing options until', true, { id: 'some.deprecation' });
-deprecate('a valid deprecation without `url`', true, { // $ExpectType void
+deprecate('a valid deprecation without `url`', true, {
+  // $ExpectType void
   id: 'some.deprecation',
   until: 'v4.0.0',
   for: 'some.namespace',
@@ -138,7 +148,8 @@ deprecate('incorrect options `url`', true, {
     enabled: 'some.version',
   },
 });
-deprecate('a valid deprecation with `url`', true, { // $ExpectType void
+deprecate('a valid deprecation with `url`', true, {
+  // $ExpectType void
   id: 'some.deprecation',
   until: 'v4.0.0',
   url: 'https://example.com/ember-deprecations-yo',
@@ -148,7 +159,8 @@ deprecate('a valid deprecation with `url`', true, { // $ExpectType void
     enabled: 'some.version',
   },
 });
-deprecate('a valid deprecation with `for`', true, { // $ExpectType void
+deprecate('a valid deprecation with `for`', true, {
+  // $ExpectType void
   id: 'some.deprecation',
   until: 'v4.0.0',
   for: 'some.namespace',
@@ -167,7 +179,8 @@ deprecate('incorrect options `for`', true, {
     enabled: 'some.version',
   },
 });
-deprecate('a valid deprecation with `since`', true, { // $ExpectType void
+deprecate('a valid deprecation with `since`', true, {
+  // $ExpectType void
   id: 'some.deprecation',
   until: 'v4.0.0',
   for: 'some.namespace',
@@ -175,7 +188,8 @@ deprecate('a valid deprecation with `since`', true, { // $ExpectType void
     available: 'some.version',
   },
 });
-deprecate('a valid deprecation with `since`', true, { // $ExpectType void
+deprecate('a valid deprecation with `since`', true, {
+  // $ExpectType void
   id: 'some.deprecation',
   until: 'v4.0.0',
   for: 'some.namespace',
@@ -214,9 +228,9 @@ deprecate('incorrect options `since` enabled', true, {
   until: 'v4.0.0',
   for: 'some.namespace',
   since: {
-      available: 'some.earlier.version',
-      // @ts-expect-error
-      enabled: 123,
+    available: 'some.earlier.version',
+    // @ts-expect-error
+    enabled: 123,
   },
 });
 deprecate('incorrect options `since` empty', true, {
@@ -232,6 +246,6 @@ deprecate('incorrect options `since` enabled w/o available', true, {
   for: 'some.namespace',
   // @ts-expect-error
   since: {
-      enabled: 'some.version',
+    enabled: 'some.version',
   },
 });
diff --git a/types/preview/@ember/destroyable/test/main.ts b/types/preview/@ember/destroyable/test/main.ts
index 4c5e3619045..c852d7c303d 100644
--- a/types/preview/@ember/destroyable/test/main.ts
+++ b/types/preview/@ember/destroyable/test/main.ts
@@ -1,12 +1,12 @@
 import {
-    assertDestroyablesDestroyed,
-    associateDestroyableChild,
-    destroy,
-    enableDestroyableTracking,
-    isDestroyed,
-    isDestroying,
-    registerDestructor,
-    unregisterDestructor
+  assertDestroyablesDestroyed,
+  associateDestroyableChild,
+  destroy,
+  enableDestroyableTracking,
+  isDestroyed,
+  isDestroying,
+  registerDestructor,
+  unregisterDestructor,
 } from '@ember/destroyable';
 
 import { assertType } from './lib/assert';
@@ -22,45 +22,45 @@ enableDestroyableTracking(1);
 enableDestroyableTracking();
 
 class Child {
-    state: boolean;
-    constructor() {
-        this.state = true;
-        // @ts-expect-error
-        registerDestructor();
-        // @ts-expect-error
-        registerDestructor(this);
-        // @ts-expect-error
-        registerDestructor(this.stateDestructor);
-        registerDestructor(this, this.stateDestructor);
-    }
+  state: boolean;
+  constructor() {
+    this.state = true;
+    // @ts-expect-error
+    registerDestructor();
+    // @ts-expect-error
+    registerDestructor(this);
+    // @ts-expect-error
+    registerDestructor(this.stateDestructor);
+    registerDestructor(this, this.stateDestructor);
+  }
 
-    stateDestructor() {
-        this.state = !this.state;
-    }
+  stateDestructor() {
+    this.state = !this.state;
+  }
 
-    keepForever() {
-        // @ts-expect-error
-        unregisterDestructor();
-        // @ts-expect-error
-        unregisterDestructor(this);
-        // @ts-expect-error
-        unregisterDestructor(this.stateDestructor);
-        unregisterDestructor(this, this.stateDestructor);
-    }
+  keepForever() {
+    // @ts-expect-error
+    unregisterDestructor();
+    // @ts-expect-error
+    unregisterDestructor(this);
+    // @ts-expect-error
+    unregisterDestructor(this.stateDestructor);
+    unregisterDestructor(this, this.stateDestructor);
+  }
 }
 
 class Parent {
-    child: object;
+  child: object;
 
-    constructor(child: object) {
-        // @ts-expect-error
-        this.child = associateDestroyableChild();
-        // @ts-expect-error
-        this.child = associateDestroyableChild(this);
-        // @ts-expect-error
-        this.child = associateDestroyableChild(child);
-        this.child = associateDestroyableChild(this, child);
-    }
+  constructor(child: object) {
+    // @ts-expect-error
+    this.child = associateDestroyableChild();
+    // @ts-expect-error
+    this.child = associateDestroyableChild(this);
+    // @ts-expect-error
+    this.child = associateDestroyableChild(child);
+    this.child = associateDestroyableChild(this, child);
+  }
 }
 
 const c = new Child();
diff --git a/types/preview/@ember/engine/-private/types/initializer.d.ts b/types/preview/@ember/engine/-private/types/initializer.d.ts
index 515c89f5194..2a7f29ccb85 100644
--- a/types/preview/@ember/engine/-private/types/initializer.d.ts
+++ b/types/preview/@ember/engine/-private/types/initializer.d.ts
@@ -1,6 +1,6 @@
 export default interface Initializer<T> {
-    name: string;
-    before?: string[] | undefined;
-    after?: string[] | undefined;
-    initialize(application: T): void;
+  name: string;
+  before?: string[] | undefined;
+  after?: string[] | undefined;
+  initialize(application: T): void;
 }
diff --git a/types/preview/@ember/engine/index.d.ts b/types/preview/@ember/engine/index.d.ts
index 03e729f808a..6cae348a092 100644
--- a/types/preview/@ember/engine/index.d.ts
+++ b/types/preview/@ember/engine/index.d.ts
@@ -2,7 +2,7 @@ import EmberObject from '@ember/object';
 import type RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
 import type Initializer from '@ember/engine/-private/types/initializer';
 import type EngineInstance from '@ember/engine/instance';
-import type { Resolver} from '@ember/-internals/resolver';
+import type { Resolver } from '@ember/-internals/resolver';
 
 /**
  * The `Engine` class contains core functionality for both applications and
diff --git a/types/preview/@ember/engine/test/engine-instance.ts b/types/preview/@ember/engine/test/engine-instance.ts
index 2663ba996ff..eaec71e5722 100644
--- a/types/preview/@ember/engine/test/engine-instance.ts
+++ b/types/preview/@ember/engine/test/engine-instance.ts
@@ -4,16 +4,16 @@ const engineInstance = EngineInstance.create();
 engineInstance.register('some:injection', class Foo {});
 
 engineInstance.register('some:injection', class Foo {}, {
-    singleton: true,
+  singleton: true,
 });
 
 engineInstance.register('some:injection', class Foo {}, {
-    instantiate: false,
+  instantiate: false,
 });
 
 engineInstance.register('some:injection', class Foo {}, {
-    singleton: false,
-    instantiate: true,
+  singleton: false,
+  instantiate: true,
 });
 
 engineInstance.factoryFor('router:main');
@@ -22,5 +22,5 @@ engineInstance.lookup('route:basic');
 engineInstance.boot();
 
 (async () => {
-    await engineInstance.boot();
+  await engineInstance.boot();
 })();
diff --git a/types/preview/@ember/error/ember__error-tests.ts b/types/preview/@ember/error/ember__error-tests.ts
index 503d16ee5af..d54bd7e0aad 100644
--- a/types/preview/@ember/error/ember__error-tests.ts
+++ b/types/preview/@ember/error/ember__error-tests.ts
@@ -3,5 +3,4 @@ import Error from '@ember/error';
 new Error('Fuuuuuuuu'); // $ExpectType EmberError
 
 // allows to extend from EmberError
-class AjaxError extends Error {
-}
+class AjaxError extends Error {}
diff --git a/types/preview/@ember/object/events.d.ts b/types/preview/@ember/object/events.d.ts
index 04fd9b029ca..17d6df2cbf3 100644
--- a/types/preview/@ember/object/events.d.ts
+++ b/types/preview/@ember/object/events.d.ts
@@ -4,32 +4,32 @@ import { AnyFunction } from '@ember/object/-private/types';
  * Add an event listener
  */
 export function addListener<Context>(
-    obj: Context,
-    eventName: string,
-    target: unknown,
-    method: keyof Context | AnyFunction,
-    once?: boolean
+  obj: Context,
+  eventName: string,
+  target: unknown,
+  method: keyof Context | AnyFunction,
+  once?: boolean
 ): void;
 export function addListener<Context>(
-    obj: Context,
-    eventName: string,
-    method: keyof Context | AnyFunction,
-    once?: boolean
+  obj: Context,
+  eventName: string,
+  method: keyof Context | AnyFunction,
+  once?: boolean
 ): void;
 
 /**
  * Remove an event listener
  */
 export function removeListener<Context>(
-    obj: Context,
-    eventName: string,
-    target: unknown,
-    method: keyof Context | AnyFunction
+  obj: Context,
+  eventName: string,
+  target: unknown,
+  method: keyof Context | AnyFunction
 ): void;
 export function removeListener<Context>(
-    obj: Context,
-    eventName: string,
-    method: keyof Context | AnyFunction
+  obj: Context,
+  eventName: string,
+  method: keyof Context | AnyFunction
 ): void;
 
 /**
@@ -42,8 +42,4 @@ export function removeListener<Context>(
  * @param params Optional parameters for each listener.
  * @returns if the event was delivered to one or more actions
  */
-export function sendEvent(
-    obj: unknown,
-    eventName: string,
-    params?: unknown[],
-): boolean;
+export function sendEvent(obj: unknown, eventName: string, params?: unknown[]): boolean;
diff --git a/types/preview/@ember/object/observers.d.ts b/types/preview/@ember/object/observers.d.ts
index f1decdb96fe..bbf57e4b3fa 100644
--- a/types/preview/@ember/object/observers.d.ts
+++ b/types/preview/@ember/object/observers.d.ts
@@ -1,18 +1,18 @@
-import { ObserverMethod } from "@ember/object/-private/types";
+import { ObserverMethod } from '@ember/object/-private/types';
 
 /**
  * Adds an observer on a property.
  */
 export function addObserver<Context, Target>(
-    obj: Context,
-    key: keyof Context,
-    target: Target,
-    method: ObserverMethod<Target, Context>
+  obj: Context,
+  key: keyof Context,
+  target: Target,
+  method: ObserverMethod<Target, Context>
 ): void;
 export function addObserver<Context>(
-    obj: Context,
-    key: keyof Context,
-    method: ObserverMethod<Context, Context>
+  obj: Context,
+  key: keyof Context,
+  method: ObserverMethod<Context, Context>
 ): void;
 /**
  * Remove an observer you have previously registered on this object. Pass
@@ -20,13 +20,13 @@ export function addObserver<Context>(
  * target will no longer receive notifications.
  */
 export function removeObserver<Context, Target>(
-    obj: Context,
-    key: keyof Context,
-    target: Target,
-    method: ObserverMethod<Target, Context>
+  obj: Context,
+  key: keyof Context,
+  target: Target,
+  method: ObserverMethod<Target, Context>
 ): any;
 export function removeObserver<Context>(
-    obj: Context,
-    key: keyof Context,
-    method: ObserverMethod<Context, Context>
+  obj: Context,
+  key: keyof Context,
+  method: ObserverMethod<Context, Context>
 ): any;
diff --git a/types/preview/@ember/object/test/access-modifier.ts b/types/preview/@ember/object/test/access-modifier.ts
index 3551a20dd36..04e6dc510b5 100644
--- a/types/preview/@ember/object/test/access-modifier.ts
+++ b/types/preview/@ember/object/test/access-modifier.ts
@@ -2,15 +2,15 @@ import { assertType } from './lib/assert';
 import EmberObject from '@ember/object';
 
 class Foo extends EmberObject {
-    hello() {
-        return 'world';
-    }
-    protected bar() {
-        return 'bar';
-    }
-    private baz() {
-        return 'baz';
-    }
+  hello() {
+    return 'world';
+  }
+  protected bar() {
+    return 'bar';
+  }
+  private baz() {
+    return 'baz';
+  }
 }
 const f = new Foo();
 assertType<string>(f.hello());
diff --git a/types/preview/@ember/object/test/compat.ts b/types/preview/@ember/object/test/compat.ts
index f661c37529a..e6b08c0d7b4 100644
--- a/types/preview/@ember/object/test/compat.ts
+++ b/types/preview/@ember/object/test/compat.ts
@@ -2,11 +2,11 @@ import { dependentKeyCompat } from '@ember/object/compat';
 
 // Example (without irrelevant details) from https://api.emberjs.com/ember/3.18/functions/@ember%2Fobject%2Fcompat/dependentKeyCompat
 class Person {
-    declare firstName: string;
-    declare lastName: string;
+  declare firstName: string;
+  declare lastName: string;
 
-    @dependentKeyCompat
-    get fullName() {
-        return `${this.firstName} ${this.lastName}`;
-    }
+  @dependentKeyCompat
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
 }
diff --git a/types/preview/@ember/owner/ember__owner-tests.ts b/types/preview/@ember/owner/ember__owner-tests.ts
index 27b57933cca..f5a6603df5a 100644
--- a/types/preview/@ember/owner/ember__owner-tests.ts
+++ b/types/preview/@ember/owner/ember__owner-tests.ts
@@ -2,7 +2,7 @@ import Owner, { Factory, FactoryManager, FullName, RegisterOptions } from '@embe
 
 // Just a class we can construct in the Factory and FactoryManager tests
 declare class ConstructThis {
-    hasProps: boolean;
+  hasProps: boolean;
 }
 
 // ----- RegisterOptions ----- //
@@ -17,10 +17,10 @@ declare let aFactory: Factory<ConstructThis>;
 aFactory.create();
 aFactory.create({});
 aFactory.create({
-    hasProps: true,
+  hasProps: true,
 });
 aFactory.create({
-    hasProps: false,
+  hasProps: false,
 });
 
 // These should be rejected by way of EPC
@@ -102,9 +102,9 @@ owner.lookup(aTypedName); // $ExpectType unknown
 // correct type.
 declare const justStrings: string[];
 // @ts-expect-error
-justStrings.map(aString => owner.lookup(aString));
+justStrings.map((aString) => owner.lookup(aString));
 declare let typedStrings: FullName[];
-typedStrings.map(aString => owner.lookup(aString));
+typedStrings.map((aString) => owner.lookup(aString));
 
 // Also make sure it keeps working with const bindings
 const aConstName = 'type:name';
@@ -113,23 +113,23 @@ owner.lookup(aConstName); // $ExpectType unknown
 // ----- Minimal further coverage for POJOs ----- //
 // `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
 const Creatable = {
-    hasProps: true,
+  hasProps: true,
 };
 
 const pojoFactory: Factory<typeof Creatable> = {
-    create(initialValues?) {
-        const instance = Creatable;
-        if (initialValues) {
-            if (initialValues.hasProps) {
-                Object.defineProperty(instance, 'hasProps', {
-                    value: initialValues.hasProps,
-                    enumerable: true,
-                    writable: true,
-                });
-            }
-        }
-        return instance;
-    },
+  create(initialValues?) {
+    const instance = Creatable;
+    if (initialValues) {
+      if (initialValues.hasProps) {
+        Object.defineProperty(instance, 'hasProps', {
+          value: initialValues.hasProps,
+          enumerable: true,
+          writable: true,
+        });
+      }
+    }
+    return instance;
+  },
 };
 
 pojoFactory.create(); // $ExpectType { hasProps: boolean; }
diff --git a/types/preview/@ember/polyfills/ember__polyfills-tests.ts b/types/preview/@ember/polyfills/ember__polyfills-tests.ts
index 859ca779645..06f1261b6e6 100644
--- a/types/preview/@ember/polyfills/ember__polyfills-tests.ts
+++ b/types/preview/@ember/polyfills/ember__polyfills-tests.ts
@@ -1,23 +1,23 @@
 import { assign } from '@ember/polyfills';
 
 (() => {
-    /* assign */
-    assign({}, { a: 'b' });
-    assign({}, { a: 'b' }).a; // $ExpectType string
-    assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
-    assign({ a: 6 }, {}).a; // $ExpectType number
-    // @ts-expect-error
-    assign({ b: 6 }, {}).a;
-    assign({}, { b: 6 }, {}).b; // $ExpectType number
-    assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
-    assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
-    // @ts-expect-error
-    assign({ a: 'hello' }, '', { a: true }).a;
-    assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
-    // @ts-expect-error
-    assign({}, { a: 0 }, { b: 1 }, { c: 2 }, { d: 3 }).a;
+  /* assign */
+  assign({}, { a: 'b' });
+  assign({}, { a: 'b' }).a; // $ExpectType string
+  assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
+  assign({ a: 6 }, {}).a; // $ExpectType number
+  // @ts-expect-error
+  assign({ b: 6 }, {}).a;
+  assign({}, { b: 6 }, {}).b; // $ExpectType number
+  assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
+  assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
+  // @ts-expect-error
+  assign({ a: 'hello' }, '', { a: true }).a;
+  assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
+  // @ts-expect-error
+  assign({}, { a: 0 }, { b: 1 }, { c: 2 }, { d: 3 }).a;
 
-    // matches Object.assign
-    assign({}, null); // $ExpectType never
-    assign({}, undefined); // $ExpectType never
+  // matches Object.assign
+  assign({}, null); // $ExpectType never
+  assign({}, undefined); // $ExpectType never
 })();
diff --git a/types/preview/@ember/routing/-private/router-dsl.d.ts b/types/preview/@ember/routing/-private/router-dsl.d.ts
index 86c6b086494..00c91f826df 100644
--- a/types/preview/@ember/routing/-private/router-dsl.d.ts
+++ b/types/preview/@ember/routing/-private/router-dsl.d.ts
@@ -1,18 +1,18 @@
 export default class RouterDSL {
-    constructor(name: string | null, options: object);
-    route(name: string, callback: (this: RouterDSL) => void): void;
-    route(
-        name: string,
-        options?: { path?: string | undefined; resetNamespace?: boolean | undefined },
-        callback?: (this: RouterDSL) => void,
-    ): void;
-    mount(
-        name: string,
-        options?: {
-            as?: string | undefined;
-            path?: string | undefined;
-            resetNamespace?: boolean | undefined;
-            engineInfo?: unknown;
-        },
-    ): void;
+  constructor(name: string | null, options: object);
+  route(name: string, callback: (this: RouterDSL) => void): void;
+  route(
+    name: string,
+    options?: { path?: string | undefined; resetNamespace?: boolean | undefined },
+    callback?: (this: RouterDSL) => void
+  ): void;
+  mount(
+    name: string,
+    options?: {
+      as?: string | undefined;
+      path?: string | undefined;
+      resetNamespace?: boolean | undefined;
+      engineInfo?: unknown;
+    }
+  ): void;
 }
diff --git a/types/preview/@ember/routing/auto-location.d.ts b/types/preview/@ember/routing/auto-location.d.ts
index 86be671620b..eb17614eb76 100644
--- a/types/preview/@ember/routing/auto-location.d.ts
+++ b/types/preview/@ember/routing/auto-location.d.ts
@@ -1,4 +1,4 @@
-import EmberObject from "@ember/object";
+import EmberObject from '@ember/object';
 
 /**
  * AutoLocation will select the best location option based off browser support with the priority order: history, hash, none.
diff --git a/types/preview/@ember/routing/hash-location.d.ts b/types/preview/@ember/routing/hash-location.d.ts
index a045285fbc6..55b92d265ee 100644
--- a/types/preview/@ember/routing/hash-location.d.ts
+++ b/types/preview/@ember/routing/hash-location.d.ts
@@ -1,4 +1,4 @@
-import EmberObject from "@ember/object";
+import EmberObject from '@ember/object';
 
 /**
  * `Ember.HashLocation` implements the location API using the browser's
diff --git a/types/preview/@ember/routing/history-location.d.ts b/types/preview/@ember/routing/history-location.d.ts
index 8921fdb15e2..67d4399f038 100644
--- a/types/preview/@ember/routing/history-location.d.ts
+++ b/types/preview/@ember/routing/history-location.d.ts
@@ -1,4 +1,4 @@
-import EmberObject from "@ember/object";
+import EmberObject from '@ember/object';
 
 /**
  * Ember.HistoryLocation implements the location API using the browser's
diff --git a/types/preview/@ember/routing/none-location.d.ts b/types/preview/@ember/routing/none-location.d.ts
index 22934d7cece..286860db69f 100644
--- a/types/preview/@ember/routing/none-location.d.ts
+++ b/types/preview/@ember/routing/none-location.d.ts
@@ -1,4 +1,4 @@
-import EmberObject from "@ember/object";
+import EmberObject from '@ember/object';
 
 /**
  * Ember.NoneLocation does not interact with the browser. It is useful for
diff --git a/types/preview/@ember/routing/route-info.d.ts b/types/preview/@ember/routing/route-info.d.ts
index 2261063b669..acc8095ed2e 100644
--- a/types/preview/@ember/routing/route-info.d.ts
+++ b/types/preview/@ember/routing/route-info.d.ts
@@ -5,52 +5,52 @@
  * It is also not observable, because a `Transition` instance is never changed after creation.
  */
 export default interface RouteInfo {
-    /**
-     * A reference to the childe route's `RouteInfo`.
-     * This can be used to traverse downward to the leafmost `RouteInfo`.
-     */
-    readonly child: RouteInfo | null;
-    /**
-     * The final segment of the fully-qualified name of the route, like "index".
-     */
-    readonly localName: string;
-    /**
-     * The dot-separated, fully-qualified name of the route, like "people.index".
-     */
-    readonly name: string;
-    /**
-     * The ordered list of the names of the params required for this route.
-     * It will contain the same strings as `Object.keys(params)`, but here the order is significant.
-     * This allows users to correctly pass params into routes programmatically.
-     */
-    readonly paramNames: string[];
-    /**
-     * The values of the route's parameters.
-     * These are the same params that are received as arguments to the route's `model` hook.
-     * Contains only the parameters valid for this route, if any (params for parent or child routes are not merged).
-     */
-    readonly params: { [key: string]: string | undefined };
-    /**
-     * A reference to the parent route's `RouteInfo`.
-     * This can be used to traverse upward to the topmost `RouteInfo`.
-     */
-    readonly parent: RouteInfo | null;
-    /**
-     * The values of any query params on this route.
-     */
-    readonly queryParams: { [key: string]: string | undefined };
-    /**
-     * Will contain the result `Route#buildRouteInfoMetadata`
-     * for the corresponding Route.
-     */
-    readonly metadata: unknown;
-    /**
-     * Allows you to traverse through the linked list of `RouteInfo`s from the topmost to leafmost.
-     * Returns the first `RouteInfo` in the linked list for which the callback returns true.
-     *
-     * @param callback the callback to execute.
-     */
-    find(callback: (item: RouteInfo) => boolean): RouteInfo | undefined;
+  /**
+   * A reference to the childe route's `RouteInfo`.
+   * This can be used to traverse downward to the leafmost `RouteInfo`.
+   */
+  readonly child: RouteInfo | null;
+  /**
+   * The final segment of the fully-qualified name of the route, like "index".
+   */
+  readonly localName: string;
+  /**
+   * The dot-separated, fully-qualified name of the route, like "people.index".
+   */
+  readonly name: string;
+  /**
+   * The ordered list of the names of the params required for this route.
+   * It will contain the same strings as `Object.keys(params)`, but here the order is significant.
+   * This allows users to correctly pass params into routes programmatically.
+   */
+  readonly paramNames: string[];
+  /**
+   * The values of the route's parameters.
+   * These are the same params that are received as arguments to the route's `model` hook.
+   * Contains only the parameters valid for this route, if any (params for parent or child routes are not merged).
+   */
+  readonly params: { [key: string]: string | undefined };
+  /**
+   * A reference to the parent route's `RouteInfo`.
+   * This can be used to traverse upward to the topmost `RouteInfo`.
+   */
+  readonly parent: RouteInfo | null;
+  /**
+   * The values of any query params on this route.
+   */
+  readonly queryParams: { [key: string]: string | undefined };
+  /**
+   * Will contain the result `Route#buildRouteInfoMetadata`
+   * for the corresponding Route.
+   */
+  readonly metadata: unknown;
+  /**
+   * Allows you to traverse through the linked list of `RouteInfo`s from the topmost to leafmost.
+   * Returns the first `RouteInfo` in the linked list for which the callback returns true.
+   *
+   * @param callback the callback to execute.
+   */
+  find(callback: (item: RouteInfo) => boolean): RouteInfo | undefined;
 }
 
 // https://api.emberjs.com/ember/4.0/classes/RouteInfoWithAttributes
@@ -64,9 +64,9 @@ export default interface RouteInfo {
  * changed after creation.
  */
 export interface RouteInfoWithAttributes extends RouteInfo {
-    /**
-     * This is the resolved return value from the
-     * route's model hook.
-     */
-    readonly attributes: unknown;
+  /**
+   * This is the resolved return value from the
+   * route's model hook.
+   */
+  readonly attributes: unknown;
 }
diff --git a/types/preview/@ember/routing/route.d.ts b/types/preview/@ember/routing/route.d.ts
index 07c4c5c9156..7735a954299 100644
--- a/types/preview/@ember/routing/route.d.ts
+++ b/types/preview/@ember/routing/route.d.ts
@@ -12,514 +12,521 @@ type RouteModel = object | string | number;
  * The `Ember.Route` class is used to define individual routes. Refer to
  * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
  */
-export default class Route<Model = unknown, Params extends object = object>
-    extends EmberObject.extend(ActionHandler, Evented) {
-    // methods
-    /**
-     * This hook is called after this route's model has resolved. It follows
-     * identical async/promise semantics to `beforeModel` but is provided the
-     * route's resolved model in addition to the `transition`, and is therefore
-     * suited to performing logic that can only take place after the model has
-     * already resolved.
-     *
-     * @returns if the value returned from this hook is a promise, the
-     *   transition will pause until the transition resolves. Otherwise,
-     *   non-promise return values are not utilized in any way.
-     */
-    afterModel(resolvedModel: Model, transition: Transition): Promise<unknown> | void;
+export default class Route<
+  Model = unknown,
+  Params extends object = object
+> extends EmberObject.extend(ActionHandler, Evented) {
+  // methods
+  /**
+   * This hook is called after this route's model has resolved. It follows
+   * identical async/promise semantics to `beforeModel` but is provided the
+   * route's resolved model in addition to the `transition`, and is therefore
+   * suited to performing logic that can only take place after the model has
+   * already resolved.
+   *
+   * @returns if the value returned from this hook is a promise, the
+   *   transition will pause until the transition resolves. Otherwise,
+   *   non-promise return values are not utilized in any way.
+   */
+  afterModel(resolvedModel: Model, transition: Transition): Promise<unknown> | void;
 
-    /**
-     * This hook is the first of the route entry validation hooks called when an
-     * attempt is made to transition into a route or one of its children. It is
-     * called before `model` and `afterModel`, and is appropriate for cases
-     * when:
-     *
-     * 1. A decision can be made to redirect elsewhere without needing to
-     *     resolve the model first.
-     * 2. Any async operations need to occur first before the model is attempted
-     *     to be resolved.
-     *
-     * This hook is provided the current `transition` attempt as a parameter,
-     * which can be used to `.abort()` the transition, save it for a later
-     * `.retry()`, or retrieve values set on it from a previous hook. You can
-     * also just call `this.transitionTo` to another route to implicitly abort
-     * the `transition`. You can return a promise from this hook to pause the
-     * transition until the promise resolves (or rejects). This could be useful,
-     * for instance, for retrieving async code from the server that is required
-     * to enter a route.
-     *
-     * @returns if the value returned from this hook is a promise, the
-     *   transition will pause until the transition resolves. Otherwise,
-     *   non-promise return values are not utilized in any way.
-     */
-    beforeModel(transition: Transition): Promise<unknown> | void;
+  /**
+   * This hook is the first of the route entry validation hooks called when an
+   * attempt is made to transition into a route or one of its children. It is
+   * called before `model` and `afterModel`, and is appropriate for cases
+   * when:
+   *
+   * 1. A decision can be made to redirect elsewhere without needing to
+   *     resolve the model first.
+   * 2. Any async operations need to occur first before the model is attempted
+   *     to be resolved.
+   *
+   * This hook is provided the current `transition` attempt as a parameter,
+   * which can be used to `.abort()` the transition, save it for a later
+   * `.retry()`, or retrieve values set on it from a previous hook. You can
+   * also just call `this.transitionTo` to another route to implicitly abort
+   * the `transition`. You can return a promise from this hook to pause the
+   * transition until the promise resolves (or rejects). This could be useful,
+   * for instance, for retrieving async code from the server that is required
+   * to enter a route.
+   *
+   * @returns if the value returned from this hook is a promise, the
+   *   transition will pause until the transition resolves. Otherwise,
+   *   non-promise return values are not utilized in any way.
+   */
+  beforeModel(transition: Transition): Promise<unknown> | void;
 
-    /**
-     * Returns the controller of the current route, or a parent (or any
-     * ancestor) route in a route hierarchy.
-     *
-     * The controller instance must already have been created, either through
-     * entering the associated route or using `generateController`.
-     *
-     * @param name the name of the route or controller
-     */
-    controllerFor(name: string): Controller;
+  /**
+   * Returns the controller of the current route, or a parent (or any
+   * ancestor) route in a route hierarchy.
+   *
+   * The controller instance must already have been created, either through
+   * entering the associated route or using `generateController`.
+   *
+   * @param name the name of the route or controller
+   */
+  controllerFor(name: string): Controller;
 
-    /**
-     * A hook you can implement to convert the URL into the model for
-     * this route.
-     */
-    model(params: Params, transition: Transition): Model | PromiseLike<Model>;
+  /**
+   * A hook you can implement to convert the URL into the model for
+   * this route.
+   */
+  model(params: Params, transition: Transition): Model | PromiseLike<Model>;
 
-    /**
-     * Returns the model of a parent (or any ancestor) route
-     * in a route hierarchy.  During a transition, all routes
-     * must resolve a model object, and if a route
-     * needs access to a parent route's model in order to
-     * resolve a model (or just reuse the model from a parent),
-     * it can call `this.modelFor(theNameOfParentRoute)` to
-     * retrieve it.
-     */
-    modelFor(name: string): unknown;
+  /**
+   * Returns the model of a parent (or any ancestor) route
+   * in a route hierarchy.  During a transition, all routes
+   * must resolve a model object, and if a route
+   * needs access to a parent route's model in order to
+   * resolve a model (or just reuse the model from a parent),
+   * it can call `this.modelFor(theNameOfParentRoute)` to
+   * retrieve it.
+   */
+  modelFor(name: string): unknown;
 
-    /**
-     * Retrieves parameters, for current route using the state.params
-     * variable and getQueryParamsFor, using the supplied routeName.
-     */
-    paramsFor(name: string): object;
+  /**
+   * Retrieves parameters, for current route using the state.params
+   * variable and getQueryParamsFor, using the supplied routeName.
+   */
+  paramsFor(name: string): object;
 
-    /**
-     * A hook you can implement to optionally redirect to another route.
-     *
-     * If you call `this.transitionTo` from inside of this hook, this route
-     * will not be entered in favor of the other hook.
-     *
-     * `redirect` and `afterModel` behave very similarly and are
-     * called almost at the same time, but they have an important
-     * distinction in the case that, from one of these hooks, a
-     * redirect into a child route of this route occurs: redirects
-     * from `afterModel` essentially invalidate the current attempt
-     * to enter this route, and will result in this route's `beforeModel`,
-     * `model`, and `afterModel` hooks being fired again within
-     * the new, redirecting transition. Redirects that occur within
-     * the `redirect` hook, on the other hand, will _not_ cause
-     * these hooks to be fired again the second time around; in
-     * other words, by the time the `redirect` hook has been called,
-     * both the resolved model and attempted entry into this route
-     * are considered to be fully validated.
-     */
-    redirect(model: Model, transition: Transition): void;
+  /**
+   * A hook you can implement to optionally redirect to another route.
+   *
+   * If you call `this.transitionTo` from inside of this hook, this route
+   * will not be entered in favor of the other hook.
+   *
+   * `redirect` and `afterModel` behave very similarly and are
+   * called almost at the same time, but they have an important
+   * distinction in the case that, from one of these hooks, a
+   * redirect into a child route of this route occurs: redirects
+   * from `afterModel` essentially invalidate the current attempt
+   * to enter this route, and will result in this route's `beforeModel`,
+   * `model`, and `afterModel` hooks being fired again within
+   * the new, redirecting transition. Redirects that occur within
+   * the `redirect` hook, on the other hand, will _not_ cause
+   * these hooks to be fired again the second time around; in
+   * other words, by the time the `redirect` hook has been called,
+   * both the resolved model and attempted entry into this route
+   * are considered to be fully validated.
+   */
+  redirect(model: Model, transition: Transition): void;
 
-    /**
-     * Refresh the model on this route and any child routes, firing the
-     * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-     * to how routes are entered when transitioning in from other route.
-     * The current route params (e.g. `article_id`) will be passed in
-     * to the respective model hooks, and if a different model is returned,
-     * `setupController` and associated route hooks will re-fire as well.
-     * An example usage of this method is re-querying the server for the
-     * latest information using the same parameters as when the route
-     * was first entered.
-     * Note that this will cause `model` hooks to fire even on routes
-     * that were provided a model object when the route was initially
-     * entered.
-     */
-    refresh(): Transition;
+  /**
+   * Refresh the model on this route and any child routes, firing the
+   * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+   * to how routes are entered when transitioning in from other route.
+   * The current route params (e.g. `article_id`) will be passed in
+   * to the respective model hooks, and if a different model is returned,
+   * `setupController` and associated route hooks will re-fire as well.
+   * An example usage of this method is re-querying the server for the
+   * latest information using the same parameters as when the route
+   * was first entered.
+   * Note that this will cause `model` hooks to fire even on routes
+   * that were provided a model object when the route was initially
+   * entered.
+   */
+  refresh(): Transition;
 
-    /**
-     * Transition into another route while replacing the current URL, if possible.
-     * This will replace the current history entry instead of adding a new one.
-     * Beside that, it is identical to `transitionTo` in all other respects. See
-     * 'transitionTo' for additional information regarding multiple models.
-     *
-     * @param name    the name of the route or a URL
-     * @param models  the model(s) or identifier(s) to be used while
-     *                transitioning to the route.
-     * @param options optional hash with a queryParams property
-     *                containing a mapping of query parameters. May be supplied
-     *                as the only parameter to trigger a query-parameter-only
-     *                transition.
-     * @returns       the Transition object associated with this attempted
-     *                transition
-     * @deprecated    until 5.0. Inject the router service and use its methods.
-     */
-    replaceWith(name: string, ...args: unknown[]): Transition;
+  /**
+   * Transition into another route while replacing the current URL, if possible.
+   * This will replace the current history entry instead of adding a new one.
+   * Beside that, it is identical to `transitionTo` in all other respects. See
+   * 'transitionTo' for additional information regarding multiple models.
+   *
+   * @param name    the name of the route or a URL
+   * @param models  the model(s) or identifier(s) to be used while
+   *                transitioning to the route.
+   * @param options optional hash with a queryParams property
+   *                containing a mapping of query parameters. May be supplied
+   *                as the only parameter to trigger a query-parameter-only
+   *                transition.
+   * @returns       the Transition object associated with this attempted
+   *                transition
+   * @deprecated    until 5.0. Inject the router service and use its methods.
+   */
+  replaceWith(name: string, ...args: unknown[]): Transition;
 
-    /**
-     * A hook you can use to reset controller values either when the model
-     * changes or the route is exiting.
-     */
-    resetController(controller: Controller, isExiting: boolean, transition: Transition): void;
+  /**
+   * A hook you can use to reset controller values either when the model
+   * changes or the route is exiting.
+   */
+  resetController(controller: Controller, isExiting: boolean, transition: Transition): void;
 
-    /**
-     * Sends an action to the router, which will delegate it to the currently active
-     * route hierarchy per the bubbling rules explained under actions.
-     */
-    send(name: string, ...args: unknown[]): void;
+  /**
+   * Sends an action to the router, which will delegate it to the currently active
+   * route hierarchy per the bubbling rules explained under actions.
+   */
+  send(name: string, ...args: unknown[]): void;
 
-    /**
-     * A hook you can implement to convert the route's model into parameters
-     * for the URL.
-     *
-     * The default `serialize` method will insert the model's `id` into the
-     * route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-     * If the route has multiple dynamic segments or does not contain '_id', `serialize`
-     * will return `Ember.getProperties(model, params)`
-     * This method is called when `transitionTo` is called with a context
-     * in order to populate the URL.
-     */
-    serialize(model: Model, params: string[]): string | object;
+  /**
+   * A hook you can implement to convert the route's model into parameters
+   * for the URL.
+   *
+   * The default `serialize` method will insert the model's `id` into the
+   * route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+   * If the route has multiple dynamic segments or does not contain '_id', `serialize`
+   * will return `Ember.getProperties(model, params)`
+   * This method is called when `transitionTo` is called with a context
+   * in order to populate the URL.
+   */
+  serialize(model: Model, params: string[]): string | object;
 
-    /**
-     * A hook you can use to setup the controller for the current route.
-     * This method is called with the controller for the current route and the
-     * model supplied by the `model` hook.
-     * By default, the `setupController` hook sets the `model` property of
-     * the controller to the `model`.
-     * If you implement the `setupController` hook in your Route, it will
-     * prevent this default behavior. If you want to preserve that behavior
-     * when implementing your `setupController` function, make sure to call
-     * `_super`
-     */
-    setupController(controller: Controller, model: Model, transition: Transition): void;
+  /**
+   * A hook you can use to setup the controller for the current route.
+   * This method is called with the controller for the current route and the
+   * model supplied by the `model` hook.
+   * By default, the `setupController` hook sets the `model` property of
+   * the controller to the `model`.
+   * If you implement the `setupController` hook in your Route, it will
+   * prevent this default behavior. If you want to preserve that behavior
+   * when implementing your `setupController` function, make sure to call
+   * `_super`
+   */
+  setupController(controller: Controller, model: Model, transition: Transition): void;
 
-    /**
-     * Transition the application into another route. The route may
-     * be either a single route or route path:
-     *
-     * ```javascript
-     * this.transitionTo('blogPosts');
-     * this.transitionTo('blogPosts.recentEntries');
-     * ```
-     *
-     * Optionally supply a model for the route in question. The model
-     * will be serialized into the URL using the `serialize` hook of
-     * the route:
-     *
-     * ```javascript
-     * this.transitionTo('blogPost', aPost);
-     * ```
-     *
-     * If a literal is passed (such as a number or a string), it will
-     * be treated as an identifier instead. In this case, the `model`
-     * hook of the route will be triggered:
-     *
-     * ```javascript
-     * this.transitionTo('blogPost', 1);
-     * ```
-     *
-     * Multiple models will be applied last to first recursively up the
-     * route tree.
-     *
-     * ```app/routes.js
-     * // ...
-     *
-     * Router.map(function() {
-     *   this.route('blogPost', { path:':blogPostId' }, function() {
-     *     this.route('blogComment', { path: ':blogCommentId' });
-     *   });
-     * });
-     *
-     * export default Router;
-     * ```
-     *
-     * ```javascript
-     * this.transitionTo('blogComment', aPost, aComment);
-     * this.transitionTo('blogComment', 1, 13);
-     * ```
-     *
-     * It is also possible to pass a URL (a string that starts with a
-     * `/`).
-     *
-     * ```javascript
-     * this.transitionTo('/');
-     * this.transitionTo('/blog/post/1/comment/13');
-     * this.transitionTo('/blog/posts?sort=title');
-     * ```
-     *
-     * An options hash with a `queryParams` property may be provided as
-     * the final argument to add query parameters to the destination URL.
-     *
-     * ```javascript
-     * this.transitionTo('blogPost', 1, {
-     *   queryParams: { showComments: 'true' }
-     * });
-     *
-     * // if you just want to transition the query parameters without changing the route
-     * this.transitionTo({ queryParams: { sort: 'date' } });
-     * ```
-     *
-     * See also [replaceWith](#method_replaceWith).
-     *
-     * Simple Transition Example
-     *
-     * ```app/routes.js
-     * // ...
-     *
-     * Router.map(function() {
-     *   this.route('index');
-     *   this.route('secret');
-     *   this.route('fourOhFour', { path: '*:' });
-     * });
-     *
-     * export default Router;
-     * ```
-     *
-     * ```app/routes/index.js
-     * import Route from '@ember/routing/route';
-     * import { action } from '@ember/object';
-     *
-     * export default class IndexRoute extends Route {
-     *   @action
-     *   moveToSecret(context) {
-     *     if (authorized()) {
-     *       this.transitionTo('secret', context);
-     *     } else {
-     *       this.transitionTo('fourOhFour');
-     *     }
-     *   }
-     * }
-     * ```
-     *
-     * Transition to a nested route
-     *
-     * ```app/router.js
-     * // ...
-     *
-     * Router.map(function() {
-     *   this.route('articles', { path: '/articles' }, function() {
-     *     this.route('new');
-     *   });
-     * });
-     *
-     * export default Router;
-     * ```
-     *
-     * ```app/routes/index.js
-     * import Route from '@ember/routing/route';
-     * import { action } from '@ember/object';
-     *
-     * export default class IndexRoute extends Route {
-     *   @action
-     *   transitionToNewArticle() {
-     *     this.transitionTo('articles.new');
-     *   }
-     * }
-     * ```
-     *
-     * Multiple Models Example
-     *
-     * ```app/router.js
-     * // ...
-     *
-     * Router.map(function() {
-     *   this.route('index');
-     *
-     *   this.route('breakfast', { path: ':breakfastId' }, function() {
-     *     this.route('cereal', { path: ':cerealId' });
-     *   });
-     * });
-     *
-     * export default Router;
-     * ```
-     *
-     * ```app/routes/index.js
-     * import Route from '@ember/routing/route';
-     * import { action } from '@ember/object';
-     *
-     * export default class IndexRoute extends Route {
-     *   @action
-     *   moveToChocolateCereal() {
-     *     let cereal = { cerealId: 'ChocolateYumminess' };
-     *     let breakfast = { breakfastId: 'CerealAndMilk' };
-     *
-     *     this.transitionTo('breakfast.cereal', breakfast, cereal);
-     *   }
-     * }
-     * ```
-     *
-     * Nested Route with Query String Example
-     *
-     * ```app/routes.js
-     * // ...
-     *
-     * Router.map(function() {
-     *   this.route('fruits', function() {
-     *     this.route('apples');
-     *   });
-     * });
-     *
-     * export default Router;
-     * ```
-     *
-     * ```app/routes/index.js
-     * import Route from '@ember/routing/route';
-     *
-     * export default class IndexRoute extends Route {
-     *   @action
-     *   transitionToApples() {
-     *     this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
-     *   }
-     * }
-     * ```
-     *
-     * @param name    the name of the route or a URL.
-     * @param models  the model(s) or identifier(s) to be used while
-     *                transitioning to the route.
-     * @param options optional hash with a queryParams property
-     *                containing a mapping of query parameters. May be supplied
-     *                as the only parameter to trigger a query-parameter-only
-     *                transition.
-     * @returns       the Transition object associated with this attempted
-     *                transition
-     * @deprecated    until 5.0. Inject the router service and use its methods.
-     */
-    transitionTo(name: string, options?: { queryParams: object }): Transition;
-    transitionTo(name: string, modelsA: RouteModel, options?: { queryParams: object }): Transition;
-    transitionTo(name: string, modelsA: RouteModel, modelsB: RouteModel, options?: { queryParams: object }): Transition;
-    transitionTo(
-        name: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        options?: { queryParams: object },
-    ): Transition;
-    transitionTo(
-        name: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        modelsD: RouteModel,
-        options?: { queryParams: object },
-    ): Transition;
-    transitionTo(options: { queryParams: object }): Transition;
+  /**
+   * Transition the application into another route. The route may
+   * be either a single route or route path:
+   *
+   * ```javascript
+   * this.transitionTo('blogPosts');
+   * this.transitionTo('blogPosts.recentEntries');
+   * ```
+   *
+   * Optionally supply a model for the route in question. The model
+   * will be serialized into the URL using the `serialize` hook of
+   * the route:
+   *
+   * ```javascript
+   * this.transitionTo('blogPost', aPost);
+   * ```
+   *
+   * If a literal is passed (such as a number or a string), it will
+   * be treated as an identifier instead. In this case, the `model`
+   * hook of the route will be triggered:
+   *
+   * ```javascript
+   * this.transitionTo('blogPost', 1);
+   * ```
+   *
+   * Multiple models will be applied last to first recursively up the
+   * route tree.
+   *
+   * ```app/routes.js
+   * // ...
+   *
+   * Router.map(function() {
+   *   this.route('blogPost', { path:':blogPostId' }, function() {
+   *     this.route('blogComment', { path: ':blogCommentId' });
+   *   });
+   * });
+   *
+   * export default Router;
+   * ```
+   *
+   * ```javascript
+   * this.transitionTo('blogComment', aPost, aComment);
+   * this.transitionTo('blogComment', 1, 13);
+   * ```
+   *
+   * It is also possible to pass a URL (a string that starts with a
+   * `/`).
+   *
+   * ```javascript
+   * this.transitionTo('/');
+   * this.transitionTo('/blog/post/1/comment/13');
+   * this.transitionTo('/blog/posts?sort=title');
+   * ```
+   *
+   * An options hash with a `queryParams` property may be provided as
+   * the final argument to add query parameters to the destination URL.
+   *
+   * ```javascript
+   * this.transitionTo('blogPost', 1, {
+   *   queryParams: { showComments: 'true' }
+   * });
+   *
+   * // if you just want to transition the query parameters without changing the route
+   * this.transitionTo({ queryParams: { sort: 'date' } });
+   * ```
+   *
+   * See also [replaceWith](#method_replaceWith).
+   *
+   * Simple Transition Example
+   *
+   * ```app/routes.js
+   * // ...
+   *
+   * Router.map(function() {
+   *   this.route('index');
+   *   this.route('secret');
+   *   this.route('fourOhFour', { path: '*:' });
+   * });
+   *
+   * export default Router;
+   * ```
+   *
+   * ```app/routes/index.js
+   * import Route from '@ember/routing/route';
+   * import { action } from '@ember/object';
+   *
+   * export default class IndexRoute extends Route {
+   *   @action
+   *   moveToSecret(context) {
+   *     if (authorized()) {
+   *       this.transitionTo('secret', context);
+   *     } else {
+   *       this.transitionTo('fourOhFour');
+   *     }
+   *   }
+   * }
+   * ```
+   *
+   * Transition to a nested route
+   *
+   * ```app/router.js
+   * // ...
+   *
+   * Router.map(function() {
+   *   this.route('articles', { path: '/articles' }, function() {
+   *     this.route('new');
+   *   });
+   * });
+   *
+   * export default Router;
+   * ```
+   *
+   * ```app/routes/index.js
+   * import Route from '@ember/routing/route';
+   * import { action } from '@ember/object';
+   *
+   * export default class IndexRoute extends Route {
+   *   @action
+   *   transitionToNewArticle() {
+   *     this.transitionTo('articles.new');
+   *   }
+   * }
+   * ```
+   *
+   * Multiple Models Example
+   *
+   * ```app/router.js
+   * // ...
+   *
+   * Router.map(function() {
+   *   this.route('index');
+   *
+   *   this.route('breakfast', { path: ':breakfastId' }, function() {
+   *     this.route('cereal', { path: ':cerealId' });
+   *   });
+   * });
+   *
+   * export default Router;
+   * ```
+   *
+   * ```app/routes/index.js
+   * import Route from '@ember/routing/route';
+   * import { action } from '@ember/object';
+   *
+   * export default class IndexRoute extends Route {
+   *   @action
+   *   moveToChocolateCereal() {
+   *     let cereal = { cerealId: 'ChocolateYumminess' };
+   *     let breakfast = { breakfastId: 'CerealAndMilk' };
+   *
+   *     this.transitionTo('breakfast.cereal', breakfast, cereal);
+   *   }
+   * }
+   * ```
+   *
+   * Nested Route with Query String Example
+   *
+   * ```app/routes.js
+   * // ...
+   *
+   * Router.map(function() {
+   *   this.route('fruits', function() {
+   *     this.route('apples');
+   *   });
+   * });
+   *
+   * export default Router;
+   * ```
+   *
+   * ```app/routes/index.js
+   * import Route from '@ember/routing/route';
+   *
+   * export default class IndexRoute extends Route {
+   *   @action
+   *   transitionToApples() {
+   *     this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
+   *   }
+   * }
+   * ```
+   *
+   * @param name    the name of the route or a URL.
+   * @param models  the model(s) or identifier(s) to be used while
+   *                transitioning to the route.
+   * @param options optional hash with a queryParams property
+   *                containing a mapping of query parameters. May be supplied
+   *                as the only parameter to trigger a query-parameter-only
+   *                transition.
+   * @returns       the Transition object associated with this attempted
+   *                transition
+   * @deprecated    until 5.0. Inject the router service and use its methods.
+   */
+  transitionTo(name: string, options?: { queryParams: object }): Transition;
+  transitionTo(name: string, modelsA: RouteModel, options?: { queryParams: object }): Transition;
+  transitionTo(
+    name: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(
+    name: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(
+    name: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    modelsD: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(options: { queryParams: object }): Transition;
 
-    // https://emberjs.com/api/ember/release/classes/Route/methods/intermediateTransitionTo?anchor=intermediateTransitionTo
-    /**
-     * Perform a synchronous transition into another route without attempting to resolve promises,
-     * update the URL, or abort any currently active asynchronous transitions
-     * (i.e. regular transitions caused by transitionTo or URL changes).
-     *
-     * @param name           the name of the route or a URL
-     * @param models         the model(s) or identifier(s) to be used while
-     *                       transitioning to the route.
-     * @returns              the Transition object associated with this attempted transition
-     */
-    intermediateTransitionTo(name: string, ...models: unknown[]): Transition;
+  // https://emberjs.com/api/ember/release/classes/Route/methods/intermediateTransitionTo?anchor=intermediateTransitionTo
+  /**
+   * Perform a synchronous transition into another route without attempting to resolve promises,
+   * update the URL, or abort any currently active asynchronous transitions
+   * (i.e. regular transitions caused by transitionTo or URL changes).
+   *
+   * @param name           the name of the route or a URL
+   * @param models         the model(s) or identifier(s) to be used while
+   *                       transitioning to the route.
+   * @returns              the Transition object associated with this attempted transition
+   */
+  intermediateTransitionTo(name: string, ...models: unknown[]): Transition;
 
-    // properties
-    /**
-     * The controller associated with this route.
-     */
-    controller: Controller;
+  // properties
+  /**
+   * The controller associated with this route.
+   */
+  controller: Controller;
 
-    /**
-     * The name of the controller to associate with this route.
-     * By default, Ember will lookup a route's controller that matches the name
-     * of the route (i.e. `App.PostController` for `App.PostRoute`). However,
-     * if you would like to define a specific controller to use, you can do so
-     * using this property.
-     * This is useful in many ways, as the controller specified will be:
-     * * p assed to the `setupController` method.
-     * * used as the controller for the view being rendered by the route.
-     * * returned from a call to `controllerFor` for the route.
-     */
-    controllerName: string;
+  /**
+   * The name of the controller to associate with this route.
+   * By default, Ember will lookup a route's controller that matches the name
+   * of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+   * if you would like to define a specific controller to use, you can do so
+   * using this property.
+   * This is useful in many ways, as the controller specified will be:
+   * * p assed to the `setupController` method.
+   * * used as the controller for the view being rendered by the route.
+   * * returned from a call to `controllerFor` for the route.
+   */
+  controllerName: string;
 
-    /**
-     * The name of the route, dot-delimited, including the engine prefix if applicable.
-     */
-    fullRouteName: string;
+  /**
+   * The name of the route, dot-delimited, including the engine prefix if applicable.
+   */
+  fullRouteName: string;
 
-    /**
-     * Configuration hash for this route's queryParams.
-     */
-    queryParams: { [key: string]: RouteQueryParam };
+  /**
+   * Configuration hash for this route's queryParams.
+   */
+  queryParams: { [key: string]: RouteQueryParam };
 
-    /**
-     * The name of the route, dot-delimited
-     */
-    routeName: string;
+  /**
+   * The name of the route, dot-delimited
+   */
+  routeName: string;
 
-    /**
-     * The name of the template to use by default when rendering this routes
-     * template.
-     * This is similar with `viewName`, but is useful when you just want a custom
-     * template without a view.
-     */
-    templateName: string;
+  /**
+   * The name of the template to use by default when rendering this routes
+   * template.
+   * This is similar with `viewName`, but is useful when you just want a custom
+   * template without a view.
+   */
+  templateName: string;
 
-    // events
-    /**
-     * This hook is executed when the router enters the route. It is not executed
-     * when the model for the route changes.
-     */
-    activate(transition: Transition): void;
+  // events
+  /**
+   * This hook is executed when the router enters the route. It is not executed
+   * when the model for the route changes.
+   */
+  activate(transition: Transition): void;
 
-    /**
-     * This hook is executed when the router completely exits this route. It is
-     * not executed when the model for the route changes.
-     */
-    deactivate(transition: Transition): void;
+  /**
+   * This hook is executed when the router completely exits this route. It is
+   * not executed when the model for the route changes.
+   */
+  deactivate(transition: Transition): void;
 
-    /**
-     * The didTransition action is fired after a transition has successfully been
-     * completed. This occurs after the normal model hooks (beforeModel, model,
-     * afterModel, setupController) have resolved. The didTransition action has
-     * no arguments, however, it can be useful for tracking page views or resetting
-     * state on the controller.
-     */
-    didTransition(): void;
+  /**
+   * The didTransition action is fired after a transition has successfully been
+   * completed. This occurs after the normal model hooks (beforeModel, model,
+   * afterModel, setupController) have resolved. The didTransition action has
+   * no arguments, however, it can be useful for tracking page views or resetting
+   * state on the controller.
+   */
+  didTransition(): void;
 
-    /**
-     * When attempting to transition into a route, any of the hooks may return a promise
-     * that rejects, at which point an error action will be fired on the partially-entered
-     * routes, allowing for per-route error handling logic, or shared error handling logic
-     * defined on a parent route.
-     */
-    error(error: unknown, transition: Transition): void;
+  /**
+   * When attempting to transition into a route, any of the hooks may return a promise
+   * that rejects, at which point an error action will be fired on the partially-entered
+   * routes, allowing for per-route error handling logic, or shared error handling logic
+   * defined on a parent route.
+   */
+  error(error: unknown, transition: Transition): void;
 
-    /**
-     * The loading action is fired on the route when a route's model hook returns a
-     * promise that is not already resolved. The current Transition object is the first
-     * parameter and the route that triggered the loading event is the second parameter.
-     */
-    loading(transition: Transition, route: Route): void;
+  /**
+   * The loading action is fired on the route when a route's model hook returns a
+   * promise that is not already resolved. The current Transition object is the first
+   * parameter and the route that triggered the loading event is the second parameter.
+   */
+  loading(transition: Transition, route: Route): void;
 
-    /**
-     * The willTransition action is fired at the beginning of any attempted transition
-     * with a Transition object as the sole argument. This action can be used for aborting,
-     * redirecting, or decorating the transition from the currently active routes.
-     */
-    willTransition(transition: Transition): void;
+  /**
+   * The willTransition action is fired at the beginning of any attempted transition
+   * with a Transition object as the sole argument. This action can be used for aborting,
+   * redirecting, or decorating the transition from the currently active routes.
+   */
+  willTransition(transition: Transition): void;
 
-    /**
-     * Allows you to produce custom metadata for the route.
-     * The return value of this method will be attached to
-     * its corresponding RouteInfoWithAttributes object.
-     * Example
-     * ```app/routes/posts/index.js
-     * import Route from '@ember/routing/route';
-     * export default class PostsIndexRoute extends Route {
-     *   buildRouteInfoMetadata() {
-     *     return { title: 'Posts Page' }
-     *   }
-     * }
-     * ```
-     * ```app/routes/application.js
-     * import Route from '@ember/routing/route';
-     * import { inject as service } from '@ember/service';
-     * export default class ApplicationRoute extends Route {
-     *   @service router
-     *   constructor() {
-     *     super(...arguments);
-     *     this.router.on('routeDidChange', transition => {
-     *       document.title = transition.to.metadata.title;
-     *       // would update document's title to "Posts Page"
-     *     });
-     *   }
-     * }
-     * ```
-     */
-    buildRouteInfoMetadata(): unknown;
+  /**
+   * Allows you to produce custom metadata for the route.
+   * The return value of this method will be attached to
+   * its corresponding RouteInfoWithAttributes object.
+   * Example
+   * ```app/routes/posts/index.js
+   * import Route from '@ember/routing/route';
+   * export default class PostsIndexRoute extends Route {
+   *   buildRouteInfoMetadata() {
+   *     return { title: 'Posts Page' }
+   *   }
+   * }
+   * ```
+   * ```app/routes/application.js
+   * import Route from '@ember/routing/route';
+   * import { inject as service } from '@ember/service';
+   * export default class ApplicationRoute extends Route {
+   *   @service router
+   *   constructor() {
+   *     super(...arguments);
+   *     this.router.on('routeDidChange', transition => {
+   *       document.title = transition.to.metadata.title;
+   *       // would update document's title to "Posts Page"
+   *     });
+   *   }
+   * }
+   * ```
+   */
+  buildRouteInfoMetadata(): unknown;
 }
diff --git a/types/preview/@ember/routing/router-service.d.ts b/types/preview/@ember/routing/router-service.d.ts
index 827d40dbb92..2d8ff069df9 100644
--- a/types/preview/@ember/routing/router-service.d.ts
+++ b/types/preview/@ember/routing/router-service.d.ts
@@ -10,351 +10,341 @@ type RouteModel = object | string | number;
  * The Router service is the public API that provides component/view layer access to the router.
  */
 export default class RouterService extends Service {
-    //
-    /**
-     * A `RouteInfo` that represents the current leaf route.
-     * It is guaranteed to change whenever a route transition happens
-     * (even when that transition only changes parameters and doesn't change the active route)
-     */
-    readonly currentRoute: RouteInfo;
-    /**
-     * Name of the current route.
-     * This property represent the logical name of the route,
-     * which is comma separated.
-     * For the following router:
-     * ```app/router.js
-     * Router.map(function() {
-     * this.route('about');
-     * this.route('blog', function () {
-     *     this.route('post', { path: ':post_id' });
-     * });
-     * });
-     * ```
-     * It will return:
-     * * `index` when you visit `/`
-     * * `about` when you visit `/about`
-     * * `blog.index` when you visit `/blog`
-     * * `blog.post` when you visit `/blog/some-post-id`
-     */
-    readonly currentRouteName: string;
-    //
-    /**
-     * Current URL for the application.
-     * This property represent the URL path for this route.
-     * For the following router:
-     * ```app/router.js
-     * Router.map(function() {
-     * this.route('about');
-     * this.route('blog', function () {
-     *     this.route('post', { path: ':post_id' });
-     * });
-     * });
-     * ```
-     * It will return:
-     * * `/` when you visit `/`
-     * * `/about` when you visit `/about`
-     * * `/blog` when you visit `/blog`
-     * * `/blog/some-post-id` when you visit `/blog/some-post-id`
-     */
-    readonly currentURL: string;
+  //
+  /**
+   * A `RouteInfo` that represents the current leaf route.
+   * It is guaranteed to change whenever a route transition happens
+   * (even when that transition only changes parameters and doesn't change the active route)
+   */
+  readonly currentRoute: RouteInfo;
+  /**
+   * Name of the current route.
+   * This property represent the logical name of the route,
+   * which is comma separated.
+   * For the following router:
+   * ```app/router.js
+   * Router.map(function() {
+   * this.route('about');
+   * this.route('blog', function () {
+   *     this.route('post', { path: ':post_id' });
+   * });
+   * });
+   * ```
+   * It will return:
+   * * `index` when you visit `/`
+   * * `about` when you visit `/about`
+   * * `blog.index` when you visit `/blog`
+   * * `blog.post` when you visit `/blog/some-post-id`
+   */
+  readonly currentRouteName: string;
+  //
+  /**
+   * Current URL for the application.
+   * This property represent the URL path for this route.
+   * For the following router:
+   * ```app/router.js
+   * Router.map(function() {
+   * this.route('about');
+   * this.route('blog', function () {
+   *     this.route('post', { path: ':post_id' });
+   * });
+   * });
+   * ```
+   * It will return:
+   * * `/` when you visit `/`
+   * * `/about` when you visit `/about`
+   * * `/blog` when you visit `/blog`
+   * * `/blog/some-post-id` when you visit `/blog/some-post-id`
+   */
+  readonly currentURL: string;
 
-    /**
-     * The `rootURL` property represents the URL of the root of
-     * the application, '/' by default.
-     * This prefix is assumed on all routes defined on this app.
-     * If you change the `rootURL` in your environment configuration
-     * like so:
-     * ```config/environment.js
-     * 'use strict';
-     * module.exports = function(environment) {
-     *   let ENV = {
-     *     modulePrefix: 'router-service',
-     *     environment,
-     *     rootURL: '/my-root',
-     *   …
-     *   }
-     * ]
-     * ```
-     * This property will return `/my-root`.
-     */
-    readonly rootURL: string;
+  /**
+   * The `rootURL` property represents the URL of the root of
+   * the application, '/' by default.
+   * This prefix is assumed on all routes defined on this app.
+   * If you change the `rootURL` in your environment configuration
+   * like so:
+   * ```config/environment.js
+   * 'use strict';
+   * module.exports = function(environment) {
+   *   let ENV = {
+   *     modulePrefix: 'router-service',
+   *     environment,
+   *     rootURL: '/my-root',
+   *   …
+   *   }
+   * ]
+   * ```
+   * This property will return `/my-root`.
+   */
+  readonly rootURL: string;
 
-    /**
-     * Determines whether a route is active.
-     *
-     * @param routeName the name of the route
-     * @param models    the model(s) or identifier(s) to be used while
-     *                  transitioning to the route
-     * @param options   optional hash with a queryParams property containing a
-     *                  mapping of query parameters
-     */
-    isActive(routeName: string, options?: { queryParams: object }): boolean;
-    isActive(
-        routeName: string,
-        models: RouteModel,
-        options?: { queryParams: object }
-    ): boolean;
-    isActive(
-        routeName: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        options?: { queryParams: object }
-    ): boolean;
-    isActive(
-        routeName: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        options?: { queryParams: object }
-    ): boolean;
-    isActive(
-        routeName: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        modelsD: RouteModel,
-        options?: { queryParams: object }
-    ): boolean;
+  /**
+   * Determines whether a route is active.
+   *
+   * @param routeName the name of the route
+   * @param models    the model(s) or identifier(s) to be used while
+   *                  transitioning to the route
+   * @param options   optional hash with a queryParams property containing a
+   *                  mapping of query parameters
+   */
+  isActive(routeName: string, options?: { queryParams: object }): boolean;
+  isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
+  isActive(
+    routeName: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    options?: { queryParams: object }
+  ): boolean;
+  isActive(
+    routeName: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    options?: { queryParams: object }
+  ): boolean;
+  isActive(
+    routeName: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    modelsD: RouteModel,
+    options?: { queryParams: object }
+  ): boolean;
 
-    // https://emberjs.com/api/ember/4.0/classes/RouterService/methods/isActive?anchor=replaceWith
-    /**
-     * Transition into another route while replacing the current URL, if
-     * possible. The route may be either a single route or route path.
-     *
-     * @param routeNameOrUrl the name of the route or a URL
-     * @param models         the model(s) or identifier(s) to be used while
-     *                       transitioning to the route.
-     * @param options        optional hash with a queryParams property
-     *                       containing a mapping of query parameters
-     * @returns              the Transition object associated with this attempted transition
-     */
-    replaceWith(
-        routeNameOrUrl: string,
-        options?: { queryParams: object }
-    ): Transition;
-    replaceWith(
-        routeNameOrUrl: string,
-        models: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    replaceWith(
-        routeNameOrUrl: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    replaceWith(
-        routeNameOrUrl: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    replaceWith(
-        routeNameOrUrl: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        modelsD: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
+  // https://emberjs.com/api/ember/4.0/classes/RouterService/methods/isActive?anchor=replaceWith
+  /**
+   * Transition into another route while replacing the current URL, if
+   * possible. The route may be either a single route or route path.
+   *
+   * @param routeNameOrUrl the name of the route or a URL
+   * @param models         the model(s) or identifier(s) to be used while
+   *                       transitioning to the route.
+   * @param options        optional hash with a queryParams property
+   *                       containing a mapping of query parameters
+   * @returns              the Transition object associated with this attempted transition
+   */
+  replaceWith(routeNameOrUrl: string, options?: { queryParams: object }): Transition;
+  replaceWith(
+    routeNameOrUrl: string,
+    models: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  replaceWith(
+    routeNameOrUrl: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  replaceWith(
+    routeNameOrUrl: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  replaceWith(
+    routeNameOrUrl: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    modelsD: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
 
-    // https://emberjs.com/api/ember/release/classes/RouterService/methods/isActive?anchor=transitionTo
-    /**
-     * Transition the application into another route. The route may
-     * be either a single route or route path:
-     *
-     * See [transitionTo](https://api.emberjs.com/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
-     *
-     * Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
-     * This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
-     * See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
-     *
-     * In the following example we use the Router service to navigate to a route with a
-     * specific model from a Component.
-     *
-     * ```app/components/example.js
-     * import Component from '@glimmer/component';
-     * import { action } from '@ember/object';
-     * import { inject as service } from '@ember/service';
-     *
-     * export default class extends Component {
-     *   @service router;
-     *
-     *   @action
-     *   goToComments(post) {
-     *     this.router.transitionTo('comments', post);
-     *   }
-     * }
-     * ```
-     *
-     * @param routeNameOrUrl the name of the route or a URL
-     * @param models         the model(s) or identifier(s) to be used while
-     *                       transitioning to the route.
-     * @param options        optional hash with a queryParams property
-     *                       containing a mapping of query parameters. May be
-     *                       supplied as the only parameter to trigger a
-     *                       query-parameter-only transition.
-     * @returns              the Transition object associated with this attempted transition
-     */
-    transitionTo(
-        routeNameOrUrl: string,
-        options?: { queryParams: object }
-    ): Transition;
-    transitionTo(
-        routeNameOrUrl: string,
-        models: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    transitionTo(
-        routeNameOrUrl: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    transitionTo(
-        routeNameOrUrl: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    transitionTo(
-        routeNameOrUrl: string,
-        modelsA: RouteModel,
-        modelsB: RouteModel,
-        modelsC: RouteModel,
-        modelsD: RouteModel,
-        options?: { queryParams: object }
-    ): Transition;
-    transitionTo(options: { queryParams: object }): Transition;
+  // https://emberjs.com/api/ember/release/classes/RouterService/methods/isActive?anchor=transitionTo
+  /**
+   * Transition the application into another route. The route may
+   * be either a single route or route path:
+   *
+   * See [transitionTo](https://api.emberjs.com/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
+   *
+   * Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
+   * This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
+   * See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
+   *
+   * In the following example we use the Router service to navigate to a route with a
+   * specific model from a Component.
+   *
+   * ```app/components/example.js
+   * import Component from '@glimmer/component';
+   * import { action } from '@ember/object';
+   * import { inject as service } from '@ember/service';
+   *
+   * export default class extends Component {
+   *   @service router;
+   *
+   *   @action
+   *   goToComments(post) {
+   *     this.router.transitionTo('comments', post);
+   *   }
+   * }
+   * ```
+   *
+   * @param routeNameOrUrl the name of the route or a URL
+   * @param models         the model(s) or identifier(s) to be used while
+   *                       transitioning to the route.
+   * @param options        optional hash with a queryParams property
+   *                       containing a mapping of query parameters. May be
+   *                       supplied as the only parameter to trigger a
+   *                       query-parameter-only transition.
+   * @returns              the Transition object associated with this attempted transition
+   */
+  transitionTo(routeNameOrUrl: string, options?: { queryParams: object }): Transition;
+  transitionTo(
+    routeNameOrUrl: string,
+    models: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(
+    routeNameOrUrl: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(
+    routeNameOrUrl: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(
+    routeNameOrUrl: string,
+    modelsA: RouteModel,
+    modelsB: RouteModel,
+    modelsC: RouteModel,
+    modelsD: RouteModel,
+    options?: { queryParams: object }
+  ): Transition;
+  transitionTo(options: { queryParams: object }): Transition;
 
-    // https://emberjs.com/api/ember/4.3.0/classes/RouterService/methods/isActive?anchor=urlFor
-    /**
-     * Generate a URL based on the supplied route name.
-     *
-     * @param routeName the name of the route or a URL
-     * @param models    the model(s) or identifier(s) to be used while
-     *                  transitioning to the route.
-     * @param options   optional hash with a queryParams property containing
-     *                  a mapping of query parameters
-     * @returns         the string representing the generated URL
-     */
-    urlFor(routeName: string, ...args: RouteModel[] | [...RouteModel[], { queryParams: object }]): string;
+  // https://emberjs.com/api/ember/4.3.0/classes/RouterService/methods/isActive?anchor=urlFor
+  /**
+   * Generate a URL based on the supplied route name.
+   *
+   * @param routeName the name of the route or a URL
+   * @param models    the model(s) or identifier(s) to be used while
+   *                  transitioning to the route.
+   * @param options   optional hash with a queryParams property containing
+   *                  a mapping of query parameters
+   * @returns         the string representing the generated URL
+   */
+  urlFor(
+    routeName: string,
+    ...args: RouteModel[] | [...RouteModel[], { queryParams: object }]
+  ): string;
 
-    // https://api.emberjs.com/ember/3.6/classes/RouterService/events/routeDidChange?anchor=routeDidChange
-    /**
-     * Register a callback for an event.
-     *
-     * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
-     * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
-     *
-     * The `routeDidChange` event only fires once a transition has settled.
-     * This includes aborts and error substates.
-     * Like the `routeWillChange` event it recieves a `Transition` as the sole argument.
-     *
-     * @param name     the name of the event
-     * @param callback the callback to execute
-     */
-    on(
-        name: 'routeDidChange' | 'routeWillChange',
-        callback: (transition: Transition) => void
-    ): RouterService;
+  // https://api.emberjs.com/ember/3.6/classes/RouterService/events/routeDidChange?anchor=routeDidChange
+  /**
+   * Register a callback for an event.
+   *
+   * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
+   * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
+   *
+   * The `routeDidChange` event only fires once a transition has settled.
+   * This includes aborts and error substates.
+   * Like the `routeWillChange` event it recieves a `Transition` as the sole argument.
+   *
+   * @param name     the name of the event
+   * @param callback the callback to execute
+   */
+  on(
+    name: 'routeDidChange' | 'routeWillChange',
+    callback: (transition: Transition) => void
+  ): RouterService;
 
-     // https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=off
-    /**
-     * Removes a callback for an event.
-     *
-     * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
-     * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
-     *
-     * The `routeDidChange` event only fires once a transition has settled.
-     * This includes aborts and error substates.
-     *
-     * @param name     the name of the event 'routeWillChange' | 'routeDidChange'
-     * @param callback the callback to remove
-     */
-    off(
-        name: 'routeDidChange' | 'routeWillChange',
-        callback: (transition: Transition) => void
-    ): RouterService;
+  // https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=off
+  /**
+   * Removes a callback for an event.
+   *
+   * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
+   * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
+   *
+   * The `routeDidChange` event only fires once a transition has settled.
+   * This includes aborts and error substates.
+   *
+   * @param name     the name of the event 'routeWillChange' | 'routeDidChange'
+   * @param callback the callback to remove
+   */
+  off(
+    name: 'routeDidChange' | 'routeWillChange',
+    callback: (transition: Transition) => void
+  ): RouterService;
 
-    /**
-     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=has
-     *
-     * Checks to see if object has any subscriptions for named event.
-     *
-     * @param name
-     */
-    has(name: string): boolean;
+  /**
+   * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=has
+   *
+   * Checks to see if object has any subscriptions for named event.
+   *
+   * @param name
+   */
+  has(name: string): boolean;
 
-    /**
-     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=one
-     *
-     * Subscribes a function to a named event and then cancels the subscription after the first time the
-     * event is triggered. It is good to use one when you only care about the first time an event has taken place.
-     *
-     * @param name     the name of the event
-     * @param callback the callback to execute
-     */
-    one(
-        name: 'routeDidChange' | 'routeWillChange',
-        callback: (transition: Transition) => void
-    ): RouterService;
+  /**
+   * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=one
+   *
+   * Subscribes a function to a named event and then cancels the subscription after the first time the
+   * event is triggered. It is good to use one when you only care about the first time an event has taken place.
+   *
+   * @param name     the name of the event
+   * @param callback the callback to execute
+   */
+  one(
+    name: 'routeDidChange' | 'routeWillChange',
+    callback: (transition: Transition) => void
+  ): RouterService;
 
-    /**
-     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=trigger
-     *
-     * Triggers a named event for the object.
-     * Any additional arguments will be passed as parameters to the functions that are subscribed to the event.
-     *
-     * @param name the name of the event
-     * @param args arguments to pass to the event
-     */
-    trigger(
-        name: string,
-        args: any
-    ): void;
+  /**
+   * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=trigger
+   *
+   * Triggers a named event for the object.
+   * Any additional arguments will be passed as parameters to the functions that are subscribed to the event.
+   *
+   * @param name the name of the event
+   * @param args arguments to pass to the event
+   */
+  trigger(name: string, args: any): void;
 
-    /**
-     * Takes a string URL and returns a `RouteInfo` for the leafmost route represented
-     * by the URL. Returns `null` if the URL is not recognized. This method expects to
-     * receive the actual URL as seen by the browser including the app's `rootURL`.
-     * See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
-     * In the following example `recognize` is used to verify if a path belongs to our
-     * application before transitioning to it.
-     * ```
-     * import Component from '@ember/component';
-     * import { inject as service } from '@ember/service';
-     * export default class extends Component {
-     *   @service router;
-     *   path = '/';
-     *   click() {
-     *     if (this.router.recognize(this.path)) {
-     *       this.router.transitionTo(this.path);
-     *     }
-     *   }
-     * }
-     * ```
-     */
-    recognize(url: string): RouteInfo;
+  /**
+   * Takes a string URL and returns a `RouteInfo` for the leafmost route represented
+   * by the URL. Returns `null` if the URL is not recognized. This method expects to
+   * receive the actual URL as seen by the browser including the app's `rootURL`.
+   * See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
+   * In the following example `recognize` is used to verify if a path belongs to our
+   * application before transitioning to it.
+   * ```
+   * import Component from '@ember/component';
+   * import { inject as service } from '@ember/service';
+   * export default class extends Component {
+   *   @service router;
+   *   path = '/';
+   *   click() {
+   *     if (this.router.recognize(this.path)) {
+   *       this.router.transitionTo(this.path);
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  recognize(url: string): RouteInfo;
 
-    /**
-     * Takes a string URL and returns a promise that resolves to a
-     * `RouteInfoWithAttributes` for the leafmost route represented by the URL.
-     * The promise rejects if the URL is not recognized or an unhandled exception
-     * is encountered. This method expects to receive the actual URL as seen by
-     * the browser including the app's `rootURL`.
-     */
-    recognizeAndLoad(url: string): RouteInfoWithAttributes;
+  /**
+   * Takes a string URL and returns a promise that resolves to a
+   * `RouteInfoWithAttributes` for the leafmost route represented by the URL.
+   * The promise rejects if the URL is not recognized or an unhandled exception
+   * is encountered. This method expects to receive the actual URL as seen by
+   * the browser including the app's `rootURL`.
+   */
+  recognizeAndLoad(url: string): RouteInfoWithAttributes;
 
-    /**
-     * Refreshes all currently active routes, doing a full transition.
-     * If a route name is provided and refers to a currently active route,
-     * it will refresh only that route and its descendents.
-     * Returns a promise that will be resolved once the refresh is complete.
-     * All resetController, beforeModel, model, afterModel, redirect, and setupController
-     * hooks will be called again. You will get new data from the model hook.
-     */
-    refresh(pivotRouteName?: string): Transition;
+  /**
+   * Refreshes all currently active routes, doing a full transition.
+   * If a route name is provided and refers to a currently active route,
+   * it will refresh only that route and its descendents.
+   * Returns a promise that will be resolved once the refresh is complete.
+   * All resetController, beforeModel, model, afterModel, redirect, and setupController
+   * hooks will be called again. You will get new data from the model hook.
+   */
+  refresh(pivotRouteName?: string): Transition;
 }
diff --git a/types/preview/@ember/routing/router.d.ts b/types/preview/@ember/routing/router.d.ts
index ca70289b2b7..348c410a0b6 100644
--- a/types/preview/@ember/routing/router.d.ts
+++ b/types/preview/@ember/routing/router.d.ts
@@ -1,43 +1,43 @@
-import EmberObject from "@ember/object";
-import Evented from "@ember/object/evented";
-import RouterDSL from "@ember/routing/-private/router-dsl";
-import Transition from "@ember/routing/transition";
-import RouterService from "@ember/routing/router-service";
+import EmberObject from '@ember/object';
+import Evented from '@ember/object/evented';
+import RouterDSL from '@ember/routing/-private/router-dsl';
+import Transition from '@ember/routing/transition';
+import RouterService from '@ember/routing/router-service';
 
 /**
  * The `Ember.Router` class manages the application state and URLs. Refer to
  * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
  */
 export default class Router extends EmberObject.extend(Evented) {
-    /**
-     * The `Router.map` function allows you to define mappings from URLs to routes
-     * in your application. These mappings are defined within the
-     * supplied callback function using `this.route`.
-     */
-    static map(callback: (this: RouterDSL) => void): void;
-    /**
-     * The `location` property determines the type of URL's that your
-     * application will use.
-     *
-     * @note the `'auto'` location is [deprecated](https://deprecations.emberjs.com/v4.x/#toc_deprecate-auto-location).
-     */
-    location: 'history' | 'hash' | 'none' | 'auto';
-    /**
-     * Represents the URL of the root of the application, often '/'. This prefix is
-     * assumed on all routes defined on this router.
-     */
-    rootURL: string;
-    /**
-     * Transition the application into another route. The route may
-     * be either a single route or route path:
-     */
-    transitionTo(name: string, options?: {}): Transition;
-    transitionTo(name: string, ...models: any[]): Transition;
-    transitionTo(name: string, options: {}): Transition;
+  /**
+   * The `Router.map` function allows you to define mappings from URLs to routes
+   * in your application. These mappings are defined within the
+   * supplied callback function using `this.route`.
+   */
+  static map(callback: (this: RouterDSL) => void): void;
+  /**
+   * The `location` property determines the type of URL's that your
+   * application will use.
+   *
+   * @note the `'auto'` location is [deprecated](https://deprecations.emberjs.com/v4.x/#toc_deprecate-auto-location).
+   */
+  location: 'history' | 'hash' | 'none' | 'auto';
+  /**
+   * Represents the URL of the root of the application, often '/'. This prefix is
+   * assumed on all routes defined on this router.
+   */
+  rootURL: string;
+  /**
+   * Transition the application into another route. The route may
+   * be either a single route or route path:
+   */
+  transitionTo(name: string, options?: {}): Transition;
+  transitionTo(name: string, ...models: any[]): Transition;
+  transitionTo(name: string, options: {}): Transition;
 }
 
 declare module '@ember/service' {
-    interface Registry {
-        'router': RouterService;
-    }
+  interface Registry {
+    router: RouterService;
+  }
 }
diff --git a/types/preview/@ember/routing/test/router-service.ts b/types/preview/@ember/routing/test/router-service.ts
index 10875f86b1d..5abf1b622e6 100644
--- a/types/preview/@ember/routing/test/router-service.ts
+++ b/types/preview/@ember/routing/test/router-service.ts
@@ -6,10 +6,10 @@ router.transitionTo('someRoute');
 router.transitionTo('someRoute', { withModel: true });
 router.transitionTo('someRoute', { withModel: true }, { queryParams: {} });
 router.transitionTo(
-    'someRoute',
-    { withModel: true },
-    { withMultipleModels: 'still checks correctly' },
-    { queryParams: {} },
+  'someRoute',
+  { withModel: true },
+  { withMultipleModels: 'still checks correctly' },
+  { queryParams: {} }
 );
 
 const routeWillChangeHandler = () => {};
@@ -36,7 +36,7 @@ transition.abort();
 
 // $ExpectType Promise<unknown>
 transition.catch();
-transition.catch(err => console.log(err), 'label');
+transition.catch((err) => console.log(err), 'label');
 
 // $ExpectType Promise<unknown>
 transition.finally();
@@ -56,9 +56,9 @@ transition.retry();
 // $ExpectType Promise<unknown>
 transition.then();
 transition.then(
-    result => console.log(result),
-    err => console.log(err),
-    'label',
+  (result) => console.log(result),
+  (err) => console.log(err),
+  'label'
 );
 
 // $ExpectType void
diff --git a/types/preview/@ember/routing/transition.d.ts b/types/preview/@ember/routing/transition.d.ts
index b623b76b634..f575b9da974 100644
--- a/types/preview/@ember/routing/transition.d.ts
+++ b/types/preview/@ember/routing/transition.d.ts
@@ -11,114 +11,114 @@ import RouteInfo, { RouteInfoWithAttributes } from './route-info';
  *   the router service, etc.
  */
 export default interface Transition<T = unknown> extends Partial<Promise<T>> {
-    /**
-     * Custom state can be stored on a Transition's `data` object.
-     * This can be useful for decorating a Transition within an earlier hook and shared with a later hook.
-     * Properties set on `data` will be copied to new transitions generated by calling `retry` on this transition.
-     */
-    data: Record<string, unknown>;
-    /**
-     * This property is a `RouteInfo` object that represents where transition originated from.
-     * It's important to note that a `RouteInfo` is a linked list and this property is simply the head node of the list.
-     * In the case of an initial render, `from` will be set to `null`.
-     */
-    readonly from: RouteInfoWithAttributes | null;
-    /**
-     * The Transition's internal promise.
-     * Calling `.then` on this property is that same as calling `.then` on the Transition object itself,
-     * but this property is exposed for when you want to pass around a Transition's promise,
-     * but not the Transition object itself, since Transition object can be externally `abort`ed,
-     * while the promise cannot.
-     */
-    readonly promise: Promise<T>;
-    /**
-     * This property is a `RouteInfo` object that represents where the router is transitioning to.
-     * It's important to note that a `RouteInfo` is a linked list and this property is simply the leafmost route.
-     */
-    readonly to: RouteInfo | RouteInfoWithAttributes;
-    /**
-     * Aborts the Transition. Note you can also implicitly abort a transition
-     * by initiating another transition while a previous one is underway.
-     */
-    abort(): Transition<T>;
-    /**
-     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
-     * but not the Transition itself.
-     *
-     * @param onRejection
-     * @param label optional string for labeling the promise. Useful for tooling.
-     */
-    catch<TResult = never>(
-        onRejected?: (reason: unknown) => TResult | PromiseLike<TResult>,
-        label?: string,
-    ): Promise<TResult | T>;
-    /**
-     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
-     * but not the Transition itself.
-     *
-     * @param onFinally
-     * @param label optional string for labeling the promise. Useful for tooling.
-     */
-    finally(onFinally?: () => void, label?: string): Promise<T>;
-    /**
-     * Transitions are aborted and their promises rejected when redirects occur;
-     * this method returns a promise that will follow any redirects that occur and
-     * fulfill with the value fulfilled by any redirecting transitions that occur.
-     *
-     * @return a promise that fulfills with the same value that the final redirecting transition fulfills with
-     */
-    followRedirects(): Promise<T>;
-    /**
-     * Sets the URL-changing method to be employed at the end of a successful transition.
-     * By default, a new Transition will just use `updateURL`,
-     * but passing 'replace' to this method will cause the URL to update using 'replaceWith' instead.
-     * Omitting a parameter will disable the URL change,
-     * allowing for transitions that don't update the URL at completion
-     * (this is also used for handleURL, since the URL has already changed before the transition took place).
-     *
-     * @param  method the type of URL-changing method to use at the end of a transition. Accepted values are 'replace',
-     *                falsy values, or any other non-falsy value (which is interpreted as an updateURL transition).
-     * @return        This transition
-     */
-    method(method?: string): Transition<T>;
-    /**
-     * Retries a previously-aborted transition (making sure to abort the
-     * transition if it's still active). Returns a new transition that
-     * represents the new attempt to transition.
-     */
-    retry(): Transition<T>;
-    /**
-     * A standard promise hook that resolves if the transition succeeds and rejects if it fails/redirects/aborts.
-     *
-     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
-     * but not the Transition itself.
-     *
-     * @param  onFulfilled
-     * @param  onRejected
-     * @param  label label optional string for labeling the promise. Useful for tooling.
-     */
-    then<TResult1 = T, TResult2 = never>(
-        onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>,
-        onrejected?: (reason: unknown) => TResult2 | PromiseLike<TResult2>,
-        label?: string,
-    ): Promise<TResult1 | TResult2>;
-    /**
-     * Fires an event on the current list of resolved/resolving handlers within this transition.
-     * Useful for firing events on route hierarchies that haven't fully been entered yet.
-     *
-     * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
-     * @param  name          the name of the event to fire
-     */
-    send(ignoreFailure: boolean, name: string): void;
-    /**
-     * Fires an event on the current list of resolved/resolving handlers within this transition.
-     * Useful for firing events on route hierarchies that haven't fully been entered yet.
-     * Note: This method is also aliased as `send`
-     *
-     * @alias send
-     *
-     * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
-     * @param  name          the name of the event to fire
-     */
-    trigger(ignoreFailure: boolean, name: string): void;
+  /**
+   * Custom state can be stored on a Transition's `data` object.
+   * This can be useful for decorating a Transition within an earlier hook and shared with a later hook.
+   * Properties set on `data` will be copied to new transitions generated by calling `retry` on this transition.
+   */
+  data: Record<string, unknown>;
+  /**
+   * This property is a `RouteInfo` object that represents where transition originated from.
+   * It's important to note that a `RouteInfo` is a linked list and this property is simply the head node of the list.
+   * In the case of an initial render, `from` will be set to `null`.
+   */
+  readonly from: RouteInfoWithAttributes | null;
+  /**
+   * The Transition's internal promise.
+   * Calling `.then` on this property is that same as calling `.then` on the Transition object itself,
+   * but this property is exposed for when you want to pass around a Transition's promise,
+   * but not the Transition object itself, since Transition object can be externally `abort`ed,
+   * while the promise cannot.
+   */
+  readonly promise: Promise<T>;
+  /**
+   * This property is a `RouteInfo` object that represents where the router is transitioning to.
+   * It's important to note that a `RouteInfo` is a linked list and this property is simply the leafmost route.
+   */
+  readonly to: RouteInfo | RouteInfoWithAttributes;
+  /**
+   * Aborts the Transition. Note you can also implicitly abort a transition
+   * by initiating another transition while a previous one is underway.
+   */
+  abort(): Transition<T>;
+  /**
+   * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+   * but not the Transition itself.
+   *
+   * @param onRejection
+   * @param label optional string for labeling the promise. Useful for tooling.
+   */
+  catch<TResult = never>(
+    onRejected?: (reason: unknown) => TResult | PromiseLike<TResult>,
+    label?: string
+  ): Promise<TResult | T>;
+  /**
+   * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+   * but not the Transition itself.
+   *
+   * @param onFinally
+   * @param label optional string for labeling the promise. Useful for tooling.
+   */
+  finally(onFinally?: () => void, label?: string): Promise<T>;
+  /**
+   * Transitions are aborted and their promises rejected when redirects occur;
+   * this method returns a promise that will follow any redirects that occur and
+   * fulfill with the value fulfilled by any redirecting transitions that occur.
+   *
+   * @return a promise that fulfills with the same value that the final redirecting transition fulfills with
+   */
+  followRedirects(): Promise<T>;
+  /**
+   * Sets the URL-changing method to be employed at the end of a successful transition.
+   * By default, a new Transition will just use `updateURL`,
+   * but passing 'replace' to this method will cause the URL to update using 'replaceWith' instead.
+   * Omitting a parameter will disable the URL change,
+   * allowing for transitions that don't update the URL at completion
+   * (this is also used for handleURL, since the URL has already changed before the transition took place).
+   *
+   * @param  method the type of URL-changing method to use at the end of a transition. Accepted values are 'replace',
+   *                falsy values, or any other non-falsy value (which is interpreted as an updateURL transition).
+   * @return        This transition
+   */
+  method(method?: string): Transition<T>;
+  /**
+   * Retries a previously-aborted transition (making sure to abort the
+   * transition if it's still active). Returns a new transition that
+   * represents the new attempt to transition.
+   */
+  retry(): Transition<T>;
+  /**
+   * A standard promise hook that resolves if the transition succeeds and rejects if it fails/redirects/aborts.
+   *
+   * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+   * but not the Transition itself.
+   *
+   * @param  onFulfilled
+   * @param  onRejected
+   * @param  label label optional string for labeling the promise. Useful for tooling.
+   */
+  then<TResult1 = T, TResult2 = never>(
+    onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>,
+    onrejected?: (reason: unknown) => TResult2 | PromiseLike<TResult2>,
+    label?: string
+  ): Promise<TResult1 | TResult2>;
+  /**
+   * Fires an event on the current list of resolved/resolving handlers within this transition.
+   * Useful for firing events on route hierarchies that haven't fully been entered yet.
+   *
+   * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
+   * @param  name          the name of the event to fire
+   */
+  send(ignoreFailure: boolean, name: string): void;
+  /**
+   * Fires an event on the current list of resolved/resolving handlers within this transition.
+   * Useful for firing events on route hierarchies that haven't fully been entered yet.
+   * Note: This method is also aliased as `send`
+   *
+   * @alias send
+   *
+   * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
+   * @param  name          the name of the event to fire
+   */
+  trigger(ignoreFailure: boolean, name: string): void;
 }
diff --git a/types/preview/@ember/routing/types.d.ts b/types/preview/@ember/routing/types.d.ts
index 251a295fcc4..0895070ec9a 100644
--- a/types/preview/@ember/routing/types.d.ts
+++ b/types/preview/@ember/routing/types.d.ts
@@ -1,13 +1,13 @@
 export interface RenderOptions {
-    into?: string | undefined;
-    controller?: string | undefined;
-    model?: unknown;
-    outlet?: string | undefined;
-    view?: string | undefined;
+  into?: string | undefined;
+  controller?: string | undefined;
+  model?: unknown;
+  outlet?: string | undefined;
+  view?: string | undefined;
 }
 
 export interface RouteQueryParam {
-    refreshModel?: boolean | undefined;
-    replace?: boolean | undefined;
-    as?: string | undefined;
+  refreshModel?: boolean | undefined;
+  replace?: boolean | undefined;
+  as?: string | undefined;
 }
diff --git a/types/preview/@ember/runloop/-private/backburner.d.ts b/types/preview/@ember/runloop/-private/backburner.d.ts
index 676a3b36ada..146cdcb611c 100644
--- a/types/preview/@ember/runloop/-private/backburner.d.ts
+++ b/types/preview/@ember/runloop/-private/backburner.d.ts
@@ -1,41 +1,41 @@
-import { EmberMethod, EmberMethodParams } from "ember/-private/type-utils";
+import { EmberMethod, EmberMethodParams } from 'ember/-private/type-utils';
 
 export interface QueueItem {
-    method: string;
-    target: object;
-    args: object[];
-    stack: string | undefined;
+  method: string;
+  target: object;
+  args: object[];
+  stack: string | undefined;
 }
 
 export interface DeferredActionQueues {
-    [index: string]: unknown;
-    queues: object;
-    schedule<T, M extends EmberMethod<T>>(
-        ...args: [
-            queueName: string,
-            target: T,
-            method: M,
-            ...methodArgs: EmberMethodParams<T, M>,
-            onceFlag: boolean,
-            stack: unknown
-        ]
-    ): any;
-    flush(fromAutorun: boolean): any;
+  [index: string]: unknown;
+  queues: object;
+  schedule<T, M extends EmberMethod<T>>(
+    ...args: [
+      queueName: string,
+      target: T,
+      method: M,
+      ...methodArgs: EmberMethodParams<T, M>,
+      onceFlag: boolean,
+      stack: unknown
+    ]
+  ): any;
+  flush(fromAutorun: boolean): any;
 }
 
 export interface DebugInfo {
-    autorun: Error | undefined | null;
-    counters: object;
-    timers: QueueItem[];
-    instanceStack: DeferredActionQueues[];
+  autorun: Error | undefined | null;
+  counters: object;
+  timers: QueueItem[];
+  instanceStack: DeferredActionQueues[];
 }
 
 export interface Backburner {
-    join(...args: any[]): void;
-    on(...args: any[]): void;
-    scheduleOnce(...args: any[]): void;
-    schedule(queueName: string, target: object | null, method: () => void | string): void;
-    ensureInstance(): void;
-    DEBUG: boolean;
-    getDebugInfo(): DebugInfo;
+  join(...args: any[]): void;
+  on(...args: any[]): void;
+  scheduleOnce(...args: any[]): void;
+  schedule(queueName: string, target: object | null, method: () => void | string): void;
+  ensureInstance(): void;
+  DEBUG: boolean;
+  getDebugInfo(): DebugInfo;
 }
diff --git a/types/preview/@ember/runloop/-private/types.d.ts b/types/preview/@ember/runloop/-private/types.d.ts
index 48384ec84bb..5bdf61ef241 100644
--- a/types/preview/@ember/runloop/-private/types.d.ts
+++ b/types/preview/@ember/runloop/-private/types.d.ts
@@ -1 +1,7 @@
-export type EmberRunQueues = 'sync' | 'actions' | 'routerTransitions' | 'render' | 'afterRender' | 'destroy';
+export type EmberRunQueues =
+  | 'sync'
+  | 'actions'
+  | 'routerTransitions'
+  | 'render'
+  | 'afterRender'
+  | 'destroy';
diff --git a/types/preview/@ember/runloop/ember__runloop-tests.ts b/types/preview/@ember/runloop/ember__runloop-tests.ts
index a36e1b46ac9..f62a8889f8e 100644
--- a/types/preview/@ember/runloop/ember__runloop-tests.ts
+++ b/types/preview/@ember/runloop/ember__runloop-tests.ts
@@ -13,10 +13,15 @@ import {
   scheduleOnce,
   throttle,
   // private, supported via `declare module` below
-  _backburner
+  _backburner,
 } from '@ember/runloop';
 import EmberObject, { action } from '@ember/object';
-import { Backburner, DebugInfo, QueueItem, DeferredActionQueues } from '@ember/runloop/-private/backburner';
+import {
+  Backburner,
+  DebugInfo,
+  QueueItem,
+  DeferredActionQueues,
+} from '@ember/runloop/-private/backburner';
 
 // It will be the responsibility of each consuming package that needs access to the backburner property
 // to merge the private types in the public API.
@@ -25,259 +30,275 @@ declare module '@ember/runloop' {
 }
 
 function testRun() {
-    run(() => { // $ExpectType number
-        // code to be executed within a RunLoop
-        return 123;
-    });
+  run(() => {
+    // $ExpectType number
+    // code to be executed within a RunLoop
+    return 123;
+  });
 
-    // run(target, method)
-    run({}, () => {
-        // code to be executed within a RunLoop
-        return 123;
+  // run(target, method)
+  run({}, () => {
+    // code to be executed within a RunLoop
+    return 123;
+  });
+
+  // run(target, method, ...args)
+  run(
+    {},
+    (beforeExecute: () => void, extraLog: string, misc: unknown) => {
+      // code to be executed within a RunLoop
+      beforeExecute();
+      console.log(extraLog);
+      console.info(misc);
+      return 123;
+    },
+    () => {
+      console.log('foo');
+    },
+    'bar',
+    {}
+  );
+
+  function destroyApp(application: EmberObject) {
+    run(application, 'destroy');
+    run(application, function () {
+      this.destroy();
     });
-
-    // run(target, method, ...args)
-    run(
-        {},
-        (beforeExecute: () => void, extraLog: string, misc: unknown) => {
-            // code to be executed within a RunLoop
-            beforeExecute();
-            console.log(extraLog);
-            console.info(misc);
-            return 123;
-        },
-        () => {
-            console.log('foo');
-        },
-        'bar',
-        {}
-    );
-
-    function destroyApp(application: EmberObject) {
-        run(application, 'destroy');
-        run(application, function() {
-            this.destroy();
-        });
-    }
+  }
 }
 
 class TestBind extends EmberObject {
   init() {
-      // NOTE: these don't actually preserve the underlying type. Critically,
-      // though, our types have *never* supported that for `bind`.
-      const bound = bind(this, this.setupEditor);
-      bound("hello");
-      const boundAgain = bind(this, 'setupEditor');
-      boundAgain("hello");
+    // NOTE: these don't actually preserve the underlying type. Critically,
+    // though, our types have *never* supported that for `bind`.
+    const bound = bind(this, this.setupEditor);
+    bound('hello');
+    const boundAgain = bind(this, 'setupEditor');
+    boundAgain('hello');
   }
 
   editor: string | null = null;
 
   setupEditor(editor: string) {
-      this.set('editor', editor);
+    this.set('editor', editor);
   }
 }
 
 function testCancel() {
-    const myContext = {
-        method(arg: string, another: number): number {
-            return arg.length + another;
-        }
-    };
+  const myContext = {
+    method(arg: string, another: number): number {
+      return arg.length + another;
+    },
+  };
 
-    cancel(undefined);
+  cancel(undefined);
 
-    const runNext = next(myContext, () => {
-        // will not be executed
-    });
+  const runNext = next(myContext, () => {
+    // will not be executed
+  });
 
-    cancel(runNext);
+  cancel(runNext);
 
-    const anotherRunNext = next(myContext, 'method', "hello", 123);
-    // @ts-expect-error
-    const aBadRunNext = next(myContext, 'method', false, "goodbye");
+  const anotherRunNext = next(myContext, 'method', 'hello', 123);
+  // @ts-expect-error
+  const aBadRunNext = next(myContext, 'method', false, 'goodbye');
 
-    const aSimpleNext = next((name: string) => name.length, "hello");
+  const aSimpleNext = next((name: string) => name.length, 'hello');
 
-    const runLater = later(myContext, () => {
-        // will not be executed
-    }, 500);
+  const runLater = later(
+    myContext,
+    () => {
+      // will not be executed
+    },
+    500
+  );
 
-    cancel(runLater);
-
-    const runScheduleOnce = scheduleOnce('afterRender', myContext, () => {
-        // will not be executed
-    });
+  cancel(runLater);
 
-    cancel(runScheduleOnce);
+  const runScheduleOnce = scheduleOnce('afterRender', myContext, () => {
+    // will not be executed
+  });
 
-    const anotherScheduleOnce =
-        scheduleOnce('render', myContext, 'method', "hello", 123);
+  cancel(runScheduleOnce);
 
-    const aBadScheduleOnce =
-        // @ts-expect-error
-        scheduleOnce('render', myContext, 'method', true, "boo");
+  const anotherScheduleOnce = scheduleOnce('render', myContext, 'method', 'hello', 123);
 
-    const runOnce = once(myContext, () => {
-        // will not be executed
-    });
-
-    cancel(runOnce);
-
-    const throttled = throttle(myContext, () => {
-        // will not be executed
-    }, 1, false);
-
-    cancel(throttled);
-
-    const aGoodThrottled = throttle(myContext, 'method', "hello", 123, 1_000);
-    const anotherGoodThrottled = throttle(myContext, 'method', "hello", 123, 1_000, true);
+  const aBadScheduleOnce =
     // @ts-expect-error
-    const aBadThrottled = throttle(myContext, 'method', 1_000);
-    // @ts-expect-error
-    const anotherBadThrottled = throttle(myContext, 'method', false, {}, 1_000);
-
-    const debounced = debounce(myContext, () => {
-        // will not be executed
-    }, 1);
+    scheduleOnce('render', myContext, 'method', true, 'boo');
+
+  const runOnce = once(myContext, () => {
+    // will not be executed
+  });
+
+  cancel(runOnce);
+
+  const throttled = throttle(
+    myContext,
+    () => {
+      // will not be executed
+    },
+    1,
+    false
+  );
+
+  cancel(throttled);
+
+  const aGoodThrottled = throttle(myContext, 'method', 'hello', 123, 1_000);
+  const anotherGoodThrottled = throttle(myContext, 'method', 'hello', 123, 1_000, true);
+  // @ts-expect-error
+  const aBadThrottled = throttle(myContext, 'method', 1_000);
+  // @ts-expect-error
+  const anotherBadThrottled = throttle(myContext, 'method', false, {}, 1_000);
+
+  const debounced = debounce(
+    myContext,
+    () => {
+      // will not be executed
+    },
+    1
+  );
+
+  cancel(debounced);
+
+  const debounceImmediate = debounce(
+    myContext,
+    () => {
+      // will be executed since we passed in true (immediate)
+    },
+    100,
+    true
+  );
+
+  // the 100ms delay until this method can be called again will be canceled
+  cancel(debounceImmediate);
+}
 
-    cancel(debounced);
+function testDebounce() {
+  function runIt() {}
 
-    const debounceImmediate = debounce(myContext, () => {
-        // will be executed since we passed in true (immediate)
-    }, 100, true);
+  const myContext = { name: 'debounce' };
 
-    // the 100ms delay until this method can be called again will be canceled
-    cancel(debounceImmediate);
-}
+  debounce(runIt, 150);
+  debounce(myContext, runIt, 150);
+  debounce(myContext, runIt, 150, true);
 
-function testDebounce() {
-    function runIt() {
-    }
+  class DebounceExample extends EmberObject {
+    searchValue = 'test';
+    fetchResults(value: string) {}
 
-    const myContext = { name: 'debounce' };
-
-    debounce(runIt, 150);
-    debounce(myContext, runIt, 150);
-    debounce(myContext, runIt, 150, true);
-    
-    class DebounceExample extends EmberObject {
-      searchValue = 'test';
-      fetchResults(value: string) {}
-      
-      @action
-      handleTyping() {
-          // the fetchResults function is passed into the component from its parent
-          debounce(this, this.fetchResults, this.searchValue, 250);
-      }
+    @action
+    handleTyping() {
+      // the fetchResults function is passed into the component from its parent
+      debounce(this, this.fetchResults, this.searchValue, 250);
     }
+  }
 
-    EmberObject.extend({
-        searchValue: 'test',
-        fetchResults(value: string) {},
-
-        
-    });
+  EmberObject.extend({
+    searchValue: 'test',
+    fetchResults(value: string) {},
+  });
 }
 
 function testBegin() {
-    begin();
-    // code to be executed within a RunLoop
-    end();
+  begin();
+  // code to be executed within a RunLoop
+  end();
 }
 
 function testJoin() {
-    join(() => {
-        // creates a new run-loop
-    });
+  join(() => {
+    // creates a new run-loop
+  });
 
-    run(() => {
-        // creates a new run-loop
-        join(() => {
-            // joins with the existing run-loop, and queues for invocation on
-            // the existing run-loops action queue.
-        });
+  run(() => {
+    // creates a new run-loop
+    join(() => {
+      // joins with the existing run-loop, and queues for invocation on
+      // the existing run-loops action queue.
     });
+  });
 
-    later(() => {
-        console.log({ msg: 'Hold Your Horses' });
-    }, 3000);
+  later(() => {
+    console.log({ msg: 'Hold Your Horses' });
+  }, 3000);
 }
 
 function testLater() {
-    const myContext = {};
-    later(myContext, () => {
-        // code here will execute within a RunLoop in about 500ms with this == myContext
-    }, 500);
+  const myContext = {};
+  later(
+    myContext,
+    () => {
+      // code here will execute within a RunLoop in about 500ms with this == myContext
+    },
+    500
+  );
 }
 
 function testNext() {
-    const myContext = {};
-    next(myContext, () => {
-        // code to be executed in the next run loop,
-        // which will be scheduled after the current one
-    });
-    next(() => {
-        // code to be executed in the next run loop,
-        // which will be scheduled after the current one
-    });
+  const myContext = {};
+  next(myContext, () => {
+    // code to be executed in the next run loop,
+    // which will be scheduled after the current one
+  });
+  next(() => {
+    // code to be executed in the next run loop,
+    // which will be scheduled after the current one
+  });
 }
 
 class TestOnce extends EmberObject {
   init() {
-      once(this as TestOnce, 'processFullName');
-      once(this, this.processFullName);
+    once(this as TestOnce, 'processFullName');
+    once(this, this.processFullName);
   }
 
-  processFullName() {
-  }
+  processFullName() {}
 }
 
-
 function testSchedule() {
-    EmberObject.extend({
-        init() {
-            schedule('sync', this, () => {
-                // this will be executed in the first RunLoop queue, when bindings are synced
-                console.log('scheduled on sync queue');
-            });
-
-            schedule('actions', this, () => {
-                // this will be executed in the 'actions' queue, after bindings have synced.
-                console.log('scheduled on actions queue');
-            });
-        }
-    });
-
-    schedule('actions', () => {
-        // Do more things
-    });
+  EmberObject.extend({
+    init() {
+      schedule('sync', this, () => {
+        // this will be executed in the first RunLoop queue, when bindings are synced
+        console.log('scheduled on sync queue');
+      });
+
+      schedule('actions', this, () => {
+        // this will be executed in the 'actions' queue, after bindings have synced.
+        console.log('scheduled on actions queue');
+      });
+    },
+  });
+
+  schedule('actions', () => {
+    // Do more things
+  });
 }
 
 function testScheduleOnce() {
-    function sayHi() {
-        console.log('hi');
-    }
+  function sayHi() {
+    console.log('hi');
+  }
 
-    const myContext = {};
-    run(() => {
-        scheduleOnce('afterRender', myContext, sayHi);
-        scheduleOnce('afterRender', myContext, sayHi);
-        // sayHi will only be executed once, in the afterRender queue of the RunLoop
-    });
-    scheduleOnce('actions', myContext, () => {
-        console.log('Closure');
-    });
+  const myContext = {};
+  run(() => {
+    scheduleOnce('afterRender', myContext, sayHi);
+    scheduleOnce('afterRender', myContext, sayHi);
+    // sayHi will only be executed once, in the afterRender queue of the RunLoop
+  });
+  scheduleOnce('actions', myContext, () => {
+    console.log('Closure');
+  });
 }
 
 function testThrottle() {
-    function runIt() {
-    }
+  function runIt() {}
 
-    const myContext = { name: 'throttle' };
+  const myContext = { name: 'throttle' };
 
-    throttle(runIt, 150);
-    throttle(myContext, runIt, 150);
+  throttle(runIt, 150);
+  throttle(myContext, runIt, 150);
 }
 
 function testBackburner() {
diff --git a/types/preview/@ember/runloop/types.d.ts b/types/preview/@ember/runloop/types.d.ts
index 2aeaa44726a..0ba5585ad72 100644
--- a/types/preview/@ember/runloop/types.d.ts
+++ b/types/preview/@ember/runloop/types.d.ts
@@ -1,3 +1,3 @@
 export interface EmberRunTimer {
-    __ember_run_timer_brand__: boolean;
+  __ember_run_timer_brand__: boolean;
 }
diff --git a/types/preview/@ember/template/ember__template-tests.ts b/types/preview/@ember/template/ember__template-tests.ts
index 4ed95f22c74..ae0a832925b 100644
--- a/types/preview/@ember/template/ember__template-tests.ts
+++ b/types/preview/@ember/template/ember__template-tests.ts
@@ -7,9 +7,9 @@ htmlSafe('lorem ipsum...'); // $ExpectType SafeString
 const regularString: string = htmlSafe('lorem ipsum...');
 
 function isSafeTest(a: string | SafeString) {
-    if (isHTMLSafe(a)) {
-        a = a.toString();
-    }
+  if (isHTMLSafe(a)) {
+    a = a.toString();
+  }
 
-    a.toLowerCase();
+  a.toLowerCase();
 }
diff --git a/types/preview/@ember/test/adapter.d.ts b/types/preview/@ember/test/adapter.d.ts
index b991607531e..a1573f0d416 100644
--- a/types/preview/@ember/test/adapter.d.ts
+++ b/types/preview/@ember/test/adapter.d.ts
@@ -3,18 +3,18 @@
  * by an adapter for various test frameworks.
  */
 export default class Adapter {
-    /**
-     * This callback will be called whenever an async operation is about to start.
-     */
-    asyncStart(): unknown;
-    /**
-     * This callback will be called whenever an async operation has completed.
-     */
-    asyncEnd(): unknown;
-    /**
-     * Override this method with your testing framework's false assertion.
-     * This function is called whenever an exception occurs causing the testing
-     * promise to fail.
-     */
-    exception(error: string): unknown;
+  /**
+   * This callback will be called whenever an async operation is about to start.
+   */
+  asyncStart(): unknown;
+  /**
+   * This callback will be called whenever an async operation has completed.
+   */
+  asyncEnd(): unknown;
+  /**
+   * Override this method with your testing framework's false assertion.
+   * This function is called whenever an exception occurs causing the testing
+   * promise to fail.
+   */
+  exception(error: string): unknown;
 }
diff --git a/types/preview/@ember/test/ember__test-tests.ts b/types/preview/@ember/test/ember__test-tests.ts
index 5833196292c..29a689158b1 100644
--- a/types/preview/@ember/test/ember__test-tests.ts
+++ b/types/preview/@ember/test/ember__test-tests.ts
@@ -5,38 +5,38 @@ const pending = 0;
 registerWaiter(() => pending !== 0);
 
 declare const MyDb: {
-    hasPendingTransactions(): boolean;
+  hasPendingTransactions(): boolean;
 };
 
 registerWaiter(MyDb, MyDb.hasPendingTransactions);
 // @ts-expect-error
 registerWaiter();
 
-registerHelper('boot', app => {
-    app.advanceReadiness(); // $ExpectType void
-    app.deferReadiness(); // $ExpectType void
-    app.register('foo', class {}); // $ExpectType void
-    // @ts-expect-error
-    app.register('foo');
-    // @ts-expect-error
-    app.register();
+registerHelper('boot', (app) => {
+  app.advanceReadiness(); // $ExpectType void
+  app.deferReadiness(); // $ExpectType void
+  app.register('foo', class {}); // $ExpectType void
+  // @ts-expect-error
+  app.register('foo');
+  // @ts-expect-error
+  app.register();
 });
 
-registerAsyncHelper('boot', app => {
-    app.advanceReadiness();
-    app.deferReadiness();
-    app.register('foo', class {});
+registerAsyncHelper('boot', (app) => {
+  app.advanceReadiness();
+  app.deferReadiness();
+  app.register('foo', class {});
 });
 
 registerAsyncHelper('waitForPromise', (app, promise) => {
-    app.advanceReadiness();
-    app.deferReadiness();
-    app.register('foo', class {});
-    return new Promise(() => {
-        const adapter = new TestAdapter();
-        adapter.asyncStart();
-        return promise.then(() => {
-            adapter.asyncEnd();
-        });
+  app.advanceReadiness();
+  app.deferReadiness();
+  app.register('foo', class {});
+  return new Promise(() => {
+    const adapter = new TestAdapter();
+    adapter.asyncStart();
+    return promise.then(() => {
+      adapter.asyncEnd();
     });
+  });
 });
diff --git a/types/preview/ember/test/application.ts b/types/preview/ember/test/application.ts
index fcc65a70009..a59fc150578 100755
--- a/types/preview/ember/test/application.ts
+++ b/types/preview/ember/test/application.ts
@@ -2,38 +2,38 @@ import EmberObject from '@ember/object';
 import Ember from 'ember';
 
 const BaseApp = Ember.Application.extend({
-    modulePrefix: 'my-app',
+  modulePrefix: 'my-app',
 });
 
 class Obj extends EmberObject.extend({ foo: 'bar' }) {}
 
 BaseApp.initializer({
-    name: 'my-initializer',
-    initialize(app) {
-        app.register('foo:bar', Obj);
-    },
+  name: 'my-initializer',
+  initialize(app) {
+    app.register('foo:bar', Obj);
+  },
 });
 
 BaseApp.instanceInitializer({
-    name: 'my-instance-initializer',
-    initialize(app) {
-        (app.lookup('foo:bar') as Obj).get('foo');
-    },
+  name: 'my-instance-initializer',
+  initialize(app) {
+    (app.lookup('foo:bar') as Obj).get('foo');
+  },
 });
 
 const App1 = BaseApp.create({
-    rootElement: '#app-one',
-    customEvents: {
-        paste: 'paste',
-    },
+  rootElement: '#app-one',
+  customEvents: {
+    paste: 'paste',
+  },
 });
 
 const App2 = BaseApp.create({
-    rootElement: '#app-two',
-    customEvents: {
-        mouseenter: null,
-        mouseleave: null,
-    },
+  rootElement: '#app-two',
+  customEvents: {
+    mouseenter: null,
+    mouseleave: null,
+  },
 });
 
 const App3 = BaseApp.create();
diff --git a/types/preview/ember/test/array-ext.ts b/types/preview/ember/test/array-ext.ts
index 50698a70292..0b87d139900 100755
--- a/types/preview/ember/test/array-ext.ts
+++ b/types/preview/ember/test/array-ext.ts
@@ -2,11 +2,11 @@ import Ember from 'ember';
 import { assertType } from './lib/assert';
 
 declare global {
-    interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
+  interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
 }
 
 class Person extends Ember.Object {
-    declare name: string;
+  declare name: string;
 }
 
 const person = Person.create({ name: 'Joe' });
@@ -15,7 +15,7 @@ const array = [person];
 assertType<number>(array.get('length'));
 assertType<Person | undefined>(array.get('firstObject'));
 assertType<string[]>(array.mapBy('name'));
-assertType<string[]>(array.map(p => p.get('name')));
+assertType<string[]>(array.map((p) => p.get('name')));
 assertType<Person[]>(array.sortBy('name'));
 assertType<Person[]>(array.uniq());
 assertType<Person[]>(array.uniqBy('name'));
diff --git a/types/preview/ember/test/debug.ts b/types/preview/ember/test/debug.ts
index 5220e793301..69396503e07 100644
--- a/types/preview/ember/test/debug.ts
+++ b/types/preview/ember/test/debug.ts
@@ -1,10 +1,10 @@
 import Ember from 'ember';
 
 const {
-    runInDebug,
-    warn,
-    debug,
-    Debug: { registerDeprecationHandler, registerWarnHandler },
+  runInDebug,
+  warn,
+  debug,
+  Debug: { registerDeprecationHandler, registerWarnHandler },
 } = Ember;
 
 // Workaround for https://github.com/microsoft/TypeScript/issues/36931.
@@ -27,7 +27,7 @@ warn('Too many tomsters!', tomsterCount <= 3);
 warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' }); // $ExpectType void
 // $ExpectType void
 warn('Too many tomsters!', tomsterCount <= 3, {
-    id: 'ember-debug.too-many-tomsters',
+  id: 'ember-debug.too-many-tomsters',
 });
 
 // @ts-expect-error
@@ -40,52 +40,60 @@ debug('Too many tomsters!', 'foo');
 // @ts-expect-error
 registerWarnHandler();
 registerWarnHandler(() => {}); // $ExpectType void
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
 });
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    // @ts-expect-error
-    next();
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  // @ts-expect-error
+  next();
 });
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    next(message); // $ExpectType void
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  next(message); // $ExpectType void
 });
-registerWarnHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; } | undefined
-    next(message, options); // $ExpectType void
+registerWarnHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; } | undefined
+  next(message, options); // $ExpectType void
 });
 
 // next is not called, so no warnings get the default behavior
 // @ts-expect-error
 registerDeprecationHandler();
 registerDeprecationHandler(() => {}); // $ExpectType void
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
 });
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    // @ts-expect-error
-    next();
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  // @ts-expect-error
+  next();
 });
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    next(message); // $ExpectType void
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  next(message); // $ExpectType void
 });
-registerDeprecationHandler((message, options, next) => { // $ExpectType void
-    message; // $ExpectType string
-    options; // $ExpectType { id: string; until: string; } | undefined
-    next(message, options); // $ExpectType void
+registerDeprecationHandler((message, options, next) => {
+  // $ExpectType void
+  message; // $ExpectType string
+  options; // $ExpectType { id: string; until: string; } | undefined
+  next(message, options); // $ExpectType void
 });
 
 // Test for truthiness
diff --git a/types/preview/ember/test/ember-module-tests.ts b/types/preview/ember/test/ember-module-tests.ts
index b4953f4948c..cc361b97a8b 100644
--- a/types/preview/ember/test/ember-module-tests.ts
+++ b/types/preview/ember/test/ember-module-tests.ts
@@ -77,9 +77,9 @@ Ember.isPresent(''); // $ExpectType boolean
 Ember.isPresent([]); // $ExpectType boolean
 // observer
 class O2 extends Ember.Object {
-  name = 'foo'
+  name = 'foo';
   age = 3;
-  
+
   nameWatcher = Ember.observer('name', () => {});
   nameWatcher2 = Ember.observer('name', 'fullName', () => {});
 }
@@ -166,12 +166,12 @@ c2.didInsertElement();
 
 class Foo {
   foo = '';
-  
+
   @Ember.computed('foo')
   get wat(): string {
-    return this.foo
+    return this.foo;
   }
-  
+
   set wat(newValue: string) {
     this.foo = newValue;
   }
@@ -217,7 +217,7 @@ const hil = Ember.HistoryLocation.create();
 expectTypeOf(hil).toEqualTypeOf<Ember.HistoryLocation>();
 // Ember.Mixin
 interface UsesMixin {
-  foo: string
+  foo: string;
 }
 class UsesMixin extends Ember.Object {
   baz() {
diff --git a/types/preview/ember/test/engine-instance.ts b/types/preview/ember/test/engine-instance.ts
index e3f8c0b3aae..0da036e13af 100644
--- a/types/preview/ember/test/engine-instance.ts
+++ b/types/preview/ember/test/engine-instance.ts
@@ -5,16 +5,16 @@ const engineInstance = EngineInstance.create();
 engineInstance.register('some:injection', class Foo {});
 
 engineInstance.register('some:injection', class Foo {}, {
-    singleton: true,
+  singleton: true,
 });
 
 engineInstance.register('some:injection', class Foo {}, {
-    instantiate: false,
+  instantiate: false,
 });
 
 engineInstance.register('some:injection', class Foo {}, {
-    singleton: false,
-    instantiate: true,
+  singleton: false,
+  instantiate: true,
 });
 
 engineInstance.factoryFor('router:main');
@@ -23,5 +23,5 @@ engineInstance.lookup('route:basic');
 engineInstance.boot();
 
 (async () => {
-    await engineInstance.boot();
+  await engineInstance.boot();
 })();
diff --git a/types/preview/ember/test/run.ts b/types/preview/ember/test/run.ts
index 2bebd3e019e..9a6d829a2a1 100755
--- a/types/preview/ember/test/run.ts
+++ b/types/preview/ember/test/run.ts
@@ -162,12 +162,11 @@ function testNext() {
 
 class TestOnce extends Ember.Object {
   init() {
-      Ember.run.once(this as TestOnce, 'processFullName');
-      Ember.run.once(this, this.processFullName);
+    Ember.run.once(this as TestOnce, 'processFullName');
+    Ember.run.once(this, this.processFullName);
   }
 
-  processFullName() {
-  }
+  processFullName() {}
 }
 
 {
diff --git a/types/preview/ember/test/techniques/properties-from-this.ts b/types/preview/ember/test/techniques/properties-from-this.ts
index 78b5b96dd1d..7dc3e618f67 100644
--- a/types/preview/ember/test/techniques/properties-from-this.ts
+++ b/types/preview/ember/test/techniques/properties-from-this.ts
@@ -5,8 +5,8 @@
  */
 
 class BoxedProperty<Get, Set = Get> {
-    declare private [GetType]: Get;
-    declare private [SetType]: Set;
+  private declare [GetType]: Get;
+  private declare [SetType]: Set;
 }
 
 declare const GetType: unique symbol;
@@ -16,30 +16,30 @@ type UnboxGetProperty<T> = T extends BoxedProperty<infer V, unknown> ? V : T;
 type UnboxSetProperty<T> = T extends BoxedProperty<unknown, infer V> ? V : T;
 
 class GetAndSet {
-    get<K extends keyof this>(key: K): UnboxGetProperty<this[K]> {
-        return this[key] as UnboxGetProperty<this[K]>;
-    }
-    set<K extends keyof this>(key: K, newVal: UnboxSetProperty<this[K]>): UnboxSetProperty<this[K]> {
-        const rawVal = this[key];
-        if (rawVal instanceof BoxedProperty) {
-            rawVal[SetType] = newVal;
-        }
-        this[key] = newVal as this[K];
-        return newVal;
+  get<K extends keyof this>(key: K): UnboxGetProperty<this[K]> {
+    return this[key] as UnboxGetProperty<this[K]>;
+  }
+  set<K extends keyof this>(key: K, newVal: UnboxSetProperty<this[K]>): UnboxSetProperty<this[K]> {
+    const rawVal = this[key];
+    if (rawVal instanceof BoxedProperty) {
+      rawVal[SetType] = newVal;
     }
+    this[key] = newVal as this[K];
+    return newVal;
+  }
 }
 
 class Foo123 extends GetAndSet {
-    a: number;
-    b: [boolean, boolean];
-    c: string;
-    cpA!: BoxedProperty<string>;
-    constructor() {
-        super();
-        this.a = 1;
-        this.b = [true, false];
-        this.c = 'hello';
-    }
+  a: number;
+  b: [boolean, boolean];
+  c: string;
+  cpA!: BoxedProperty<string>;
+  constructor() {
+    super();
+    this.a = 1;
+    this.b = [true, false];
+    this.c = 'hello';
+  }
 }
 
 let f = new Foo123();
diff --git a/types/preview/ember/test/test.ts b/types/preview/ember/test/test.ts
index d3eecc5a2b5..f91b8c54f09 100755
--- a/types/preview/ember/test/test.ts
+++ b/types/preview/ember/test/test.ts
@@ -4,29 +4,29 @@ const pending = 0;
 Ember.Test.registerWaiter(() => pending !== 0);
 
 declare const MyDb: {
-    hasPendingTransactions(): boolean;
+  hasPendingTransactions(): boolean;
 };
 Ember.Test.registerWaiter(MyDb, MyDb.hasPendingTransactions);
 
-Ember.Test.promise(resolve => {
-    window.setTimeout(resolve, 500);
+Ember.Test.promise((resolve) => {
+  window.setTimeout(resolve, 500);
 });
 
-Ember.Test.registerHelper('boot', app => {
-    Ember.run(app, app.advanceReadiness);
+Ember.Test.registerHelper('boot', (app) => {
+  Ember.run(app, app.advanceReadiness);
 });
 
-Ember.Test.registerAsyncHelper('boot', app => {
-    Ember.run(app, app.advanceReadiness);
+Ember.Test.registerAsyncHelper('boot', (app) => {
+  Ember.run(app, app.advanceReadiness);
 });
 
 Ember.Test.registerAsyncHelper('waitForPromise', (app, promise) => {
-    return new Ember.Test.Promise(resolve => {
-        Ember.Test.adapter.asyncStart();
+  return new Ember.Test.Promise((resolve) => {
+    Ember.Test.adapter.asyncStart();
 
-        promise.then(() => {
-            Ember.run.schedule('afterRender', null, resolve);
-            Ember.Test.adapter.asyncEnd();
-        });
+    promise.then(() => {
+      Ember.run.schedule('afterRender', null, resolve);
+      Ember.Test.adapter.asyncEnd();
     });
+  });
 });
diff --git a/types/preview/ember/test/view-utils.ts b/types/preview/ember/test/view-utils.ts
index a45f4f3ce59..7cce69bc61f 100644
--- a/types/preview/ember/test/view-utils.ts
+++ b/types/preview/ember/test/view-utils.ts
@@ -2,6 +2,6 @@ import Ember from 'ember';
 import { assertType } from './lib/assert';
 
 const {
-    ViewUtils: { isSimpleClick },
+  ViewUtils: { isSimpleClick },
 } = Ember;
 assertType<boolean>(isSimpleClick(new Event('wat')));

From 33fb32b850830ed0898e8f7c7c846dc87030f209 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 09:09:04 -0600
Subject: [PATCH 1115/1405] Implement publishable types preview layout

1.  Introduce a root import, `types/preview/index.d.ts`, which itself
    imports every module which is part of Ember's type definitions.
    Then wrap each module definition in a `declare module '<name>' {}`
    so that importing it makes the module visible in the type system.
    This makes it so that users can use the types by simply writing a
    single import:

    ```ts
    import 'ember-source/types/preview';
    ```

    This approach will scale forward to all sorts of future work in TS
    in Ember, including publishing at `ember-source/types/stable`, or
    for future editions e.g. at `ember-source/types/polaris`. Moreover,
    this allows these to happen *simultaneously*. That is, as we publish
    types from source, those can go directly into the `stable` directory
    and users can simply have both imports present:

    ```ts
    import 'ember-source/types/preview';
    import 'ember-source/types/stable';
    ```

    Similarly, because this relies on module declarations, module
    merging works and this will allow us to at some point publish
    stable types supporting *only* new editions, with the default type
    import being at `stable` but users being able to opt into types
    which support the old edition:

    ```ts
    import 'ember-source/types/stable';
    import 'ember-source/types/classic';
    ```

2.  Extract the type tests for the published types into a `type-tests`
    directory, which actually *uses* those mechanics to validate that
    the types are all importable and usable as expected with that
    single import statement.

    Do *not* include that directory in `files` in `package.json`, so the
    tests are never published, only the type definitions themselves.

Making those changes and getting the test suite passing also
highlighted a number of errors in the existing type definitions (and
tests!) for `EmberArray` and its related types, which had historically
been masked by the way our tests incorporated the prototype extensions:
*all* arrays appeared to act as a `NativeArray`. Fixing that involved
pulling those type tests out into a dedicated test package, and then
fixing all the bugs in the existing type definitions, including
restructuring to match the *actual* structure of Ember's internals.

However, fixing the *regular* types for arrays *also* highlighted that
it is currently impossible to properly represent the array prototype
extensions. Accordingly, those are excluded from this, and will be
addressed in some other way.
---
 .eslintrc.js                                  |   24 +
 packages/@ember/array/index.ts                |    7 +-
 .../application-test}/application-instance.ts |    0
 .../@ember/application-test}/application.ts   |    7 +-
 .../@ember/application-test}/deprecations.ts  |    0
 .../preview/@ember/application-test}/index.ts |   13 +-
 .../preview/@ember/array-test}/array-proxy.ts |   11 +-
 .../preview/@ember/array-test}/array.ts       |   20 +-
 .../@ember/component-test/built-ins.ts        |    6 +
 .../@ember/component-test}/component.ts       |   12 +-
 .../preview/@ember/component-test}/helper.ts  |   51 +-
 .../@ember/component-test}/template-only.ts   |   12 +-
 .../preview/@ember/controller-test}/main.ts   |    0
 .../preview/@ember/controller-test}/octane.ts |    0
 type-tests/preview/@ember/debug-tests.ts      |  273 +++++
 .../preview/@ember/destroyable-test.ts        |   15 +-
 .../@ember/engine-test}/engine-instance.ts    |    0
 .../preview/@ember/engine-test}/engine.ts     |    0
 .../preview/@ember/error-tests.ts             |    3 +-
 type-tests/preview/@ember/helper-tests.ts     |   19 +
 type-tests/preview/@ember/modifier-tests.ts   |    6 +
 .../preview/@ember/object-test}/compat.ts     |    0
 .../preview/@ember/object-test}/computed.ts   |    0
 .../preview/@ember/object-test}/core.ts       |   30 +-
 .../@ember/object-test}/create-negative.ts    |    0
 .../preview/@ember/object-test}/create.ts     |    0
 .../preview/@ember/object-test}/event.ts      |    0
 .../preview/@ember/object-test}/extend.ts     |    0
 .../preview/@ember/object-test/get-set.ts     |   15 +
 .../preview/@ember/object-test/internals.ts   |    7 +
 .../preview/@ember/object-test}/object.ts     |    6 +-
 .../preview/@ember/object-test}/observable.ts |    0
 .../preview/@ember/object-test}/proxy.ts      |    4 +-
 .../preview/@ember/object-test}/reopen.ts     |    0
 .../preview/@ember/owner-tests.ts             |   75 +-
 type-tests/preview/@ember/polyfills-tests.ts  |   26 +
 .../preview/@ember/routing-test/built-ins.ts  |    5 +
 .../preview/@ember/routing-test}/route.ts     |   30 +-
 .../@ember/routing-test/router-service.ts     |  102 ++
 .../preview/@ember/routing-test}/router.ts    |    0
 .../preview/@ember/runloop-tests.ts           |    3 +-
 .../preview/@ember}/service-test.ts           |    0
 .../preview/@ember/string-tests.ts            |    0
 .../preview/@ember/template-tests.ts          |    5 +-
 .../preview/@ember/test-tests.ts              |    7 +-
 .../preview/@ember/utils-tests.ts             |   55 +-
 .../preview/ember}/application-instance.ts    |    0
 .../preview/ember}/application.ts             |    0
 .../preview/ember}/array-proxy.ts             |   11 +-
 .../preview/ember}/array.ts                   |   10 +-
 .../preview/ember}/component.ts               |    0
 .../preview/ember}/computed.ts                |    0
 .../preview/ember}/controller.ts              |    0
 .../preview/ember}/core-object.ts             |   30 +-
 .../preview/ember}/create-negative.ts         |    0
 .../preview/ember}/create.ts                  |    0
 type-tests/preview/ember/data-adapter.ts      |   62 +
 type-tests/preview/ember/debug.ts             |  121 ++
 .../preview/ember}/ember-module-tests.ts      |  133 +--
 .../preview/ember}/ember-tests.ts             |   18 +-
 .../preview/ember}/engine-instance.ts         |    0
 .../preview/ember}/engine.ts                  |    0
 type-tests/preview/ember/error.ts             |    5 +
 .../preview/ember}/event.ts                   |    0
 .../preview/ember}/extend.ts                  |    0
 .../preview/ember}/helper.ts                  |    0
 .../preview/ember}/inject.ts                  |    3 +-
 .../preview/ember}/mixin.ts                   |   10 +-
 .../preview/ember}/object.ts                  |    8 +-
 .../preview/ember}/observable.ts              |   81 +-
 .../preview/ember/private/computed-tests.ts   |   26 +
 .../ember}/private/observable-tests.ts        |   80 +-
 .../preview/ember}/reopen.ts                  |    0
 .../preview/ember}/route.ts                   |    0
 .../preview/ember}/router.ts                  |    0
 .../test => type-tests/preview/ember}/run.ts  |    0
 .../preview/ember}/string.ts                  |   22 +-
 .../ember}/techniques/properties-from-this.ts |   18 +-
 .../test => type-tests/preview/ember}/test.ts |    0
 .../preview/ember}/transition.ts              |    0
 type-tests/preview/ember/utils.ts             |  154 +++
 type-tests/preview/ember/view-utils.ts        |    7 +
 type-tests/preview/index.d.ts                 |    1 +
 type-tests/preview/tsconfig.json              |    3 +
 types/preview/@ember/-internals/resolver.d.ts |   60 +-
 .../-private/event-dispatcher.d.ts            |   26 +-
 .../@ember/application/-private/registry.d.ts |   24 +-
 .../@ember/application/deprecations.d.ts      |   41 +-
 types/preview/@ember/application/index.d.ts   |  280 ++---
 .../preview/@ember/application/instance.d.ts  |   14 +-
 types/preview/@ember/application/types.d.ts   |   54 +-
 .../@ember/array/-private/enumerable.d.ts     |  178 +--
 .../array/-private/mutable-enumerable.d.ts    |   33 +-
 .../@ember/array/-private/native-array.d.ts   |   36 +-
 types/preview/@ember/array/index.d.ts         |  298 ++++-
 types/preview/@ember/array/mutable.d.ts       |  161 +--
 types/preview/@ember/array/proxy.d.ts         |   52 +-
 types/preview/@ember/array/test/array-ext.ts  |   23 -
 types/preview/@ember/array/test/lib/assert.ts |    2 -
 .../array/types/prototype-extensions.d.ts     |    9 +-
 .../-private/class-names-support.d.ts         |   48 +-
 .../@ember/component/-private/core-view.d.ts  |   24 +-
 .../-private/glimmer-interfaces.d.ts          |   74 +-
 .../component/-private/signature-utils.d.ts   |  107 ++
 .../@ember/component/-private/view-mixin.d.ts |  112 +-
 types/preview/@ember/component/helper.d.ts    |  304 ++---
 types/preview/@ember/component/index.d.ts     |  240 ++--
 .../@ember/component/template-only.d.ts       |   87 +-
 .../@ember/component/test/built-ins.ts        |    4 -
 .../@ember/component/test/lib/assert.ts       |    2 -
 types/preview/@ember/controller/index.d.ts    |   80 +-
 .../@ember/debug/container-debug-adapter.d.ts |   20 +-
 types/preview/@ember/debug/data-adapter.d.ts  |  112 +-
 .../@ember/debug/ember__debug-tests.ts        |  251 -----
 types/preview/@ember/debug/index.d.ts         |  180 +--
 types/preview/@ember/destroyable/index.d.ts   |   30 +-
 .../@ember/destroyable/test/lib/assert.ts     |    2 -
 .../-private/container-proxy-mixin.d.ts       |   24 +-
 .../engine/-private/registry-proxy-mixin.d.ts |  100 +-
 .../engine/-private/types/initializer.d.ts    |   12 +-
 types/preview/@ember/engine/index.d.ts        |   76 +-
 types/preview/@ember/engine/instance.d.ts     |   36 +-
 types/preview/@ember/error/index.d.ts         |   10 +-
 .../@ember/helper/ember__helper-tests.ts      |    7 -
 types/preview/@ember/helper/index.d.ts        |   84 +-
 .../@ember/modifier/ember__modifier-tests.ts  |    8 -
 types/preview/@ember/modifier/index.d.ts      |   56 +-
 .../object/-private/action-handler.d.ts       |   50 +-
 .../preview/@ember/object/-private/types.d.ts |  122 +-
 types/preview/@ember/object/compat.d.ts       |   16 +-
 types/preview/@ember/object/computed.d.ts     |  476 ++++----
 types/preview/@ember/object/core.d.ts         |  148 +--
 types/preview/@ember/object/evented.d.ts      |   76 +-
 types/preview/@ember/object/events.d.ts       |   86 +-
 types/preview/@ember/object/index.d.ts        |  202 ++--
 types/preview/@ember/object/internals.d.ts    |   30 +-
 types/preview/@ember/object/mixin.d.ts        |   26 +-
 types/preview/@ember/object/observable.d.ts   |  164 +--
 types/preview/@ember/object/observers.d.ts    |   64 +-
 .../@ember/object/promise-proxy-mixin.d.ts    |   64 +-
 types/preview/@ember/object/proxy.d.ts        |   36 +-
 .../@ember/object/test/access-modifier.ts     |   29 -
 types/preview/@ember/object/test/get-set.ts   |   14 -
 types/preview/@ember/object/test/internals.ts |   10 -
 .../preview/@ember/object/test/lib/assert.ts  |    2 -
 types/preview/@ember/owner/index.d.ts         |  168 +--
 .../polyfills/ember__polyfills-tests.ts       |   23 -
 types/preview/@ember/polyfills/index.d.ts     |   42 +-
 types/preview/@ember/polyfills/types.d.ts     |   10 +-
 .../-private/route-info-with-attributes.d.ts  |    4 +-
 .../@ember/routing/-private/route-info.d.ts   |    4 +-
 .../@ember/routing/-private/router-dsl.d.ts   |   36 +-
 .../@ember/routing/-private/transition.d.ts   |    4 +-
 .../preview/@ember/routing/auto-location.d.ts |   12 +-
 .../preview/@ember/routing/hash-location.d.ts |   16 +-
 .../@ember/routing/history-location.d.ts      |   14 +-
 types/preview/@ember/routing/index.d.ts       |   32 +-
 .../preview/@ember/routing/none-location.d.ts |   18 +-
 types/preview/@ember/routing/route-info.d.ts  |  134 +--
 types/preview/@ember/routing/route.d.ts       | 1002 +++++++++--------
 .../@ember/routing/router-service.d.ts        |  666 +++++------
 types/preview/@ember/routing/router.d.ts      |   72 +-
 .../preview/@ember/routing/test/built-ins.ts  |    3 -
 .../preview/@ember/routing/test/lib/assert.ts |    2 -
 .../@ember/routing/test/router-service.ts     |  120 --
 types/preview/@ember/routing/transition.d.ts  |  240 ++--
 types/preview/@ember/routing/types.d.ts       |   24 +-
 .../@ember/runloop/-private/backburner.d.ts   |   74 +-
 .../@ember/runloop/-private/types.d.ts        |   16 +-
 types/preview/@ember/runloop/index.d.ts       |  318 +++---
 types/preview/@ember/runloop/types.d.ts       |    6 +-
 types/preview/@ember/service/index.d.ts       |   44 +-
 types/preview/@ember/string/index.d.ts        |   16 +-
 .../@ember/template/-private/handlebars.d.ts  |   10 +-
 types/preview/@ember/template/index.d.ts      |    8 +-
 types/preview/@ember/test/adapter.d.ts        |   36 +-
 types/preview/@ember/test/index.d.ts          |   90 +-
 .../preview/@ember/utils/-private/types.d.ts  |   51 +-
 types/preview/@ember/utils/index.d.ts         |   69 +-
 types/preview/ember/-private/type-utils.d.ts  |   74 +-
 types/preview/ember/index.d.ts                |  688 +++++------
 types/preview/ember/test/array-ext.ts         |   21 -
 types/preview/ember/test/data-adapter.ts      |   60 -
 types/preview/ember/test/debug.ts             |  107 --
 types/preview/ember/test/error.ts             |    5 -
 types/preview/ember/test/lib/assert.ts        |    2 -
 .../ember/test/private/computed-tests.ts      |   30 -
 types/preview/ember/test/utils.ts             |  148 ---
 types/preview/ember/test/view-utils.ts        |    7 -
 types/preview/index.d.ts                      |  121 ++
 190 files changed, 5841 insertions(+), 5454 deletions(-)
 rename {types/preview/@ember/application/test => type-tests/preview/@ember/application-test}/application-instance.ts (100%)
 rename {types/preview/@ember/application/test => type-tests/preview/@ember/application-test}/application.ts (73%)
 rename {types/preview/@ember/application/test => type-tests/preview/@ember/application-test}/deprecations.ts (100%)
 rename {types/preview/@ember/application/test => type-tests/preview/@ember/application-test}/index.ts (63%)
 rename {types/preview/@ember/array/test => type-tests/preview/@ember/array-test}/array-proxy.ts (77%)
 rename {types/preview/@ember/array/test => type-tests/preview/@ember/array-test}/array.ts (77%)
 create mode 100644 type-tests/preview/@ember/component-test/built-ins.ts
 rename {types/preview/@ember/component/test => type-tests/preview/@ember/component-test}/component.ts (92%)
 rename {types/preview/@ember/component/test => type-tests/preview/@ember/component-test}/helper.ts (72%)
 rename {types/preview/@ember/component/test => type-tests/preview/@ember/component-test}/template-only.ts (53%)
 rename {types/preview/@ember/controller/test => type-tests/preview/@ember/controller-test}/main.ts (100%)
 rename {types/preview/@ember/controller/test => type-tests/preview/@ember/controller-test}/octane.ts (100%)
 create mode 100644 type-tests/preview/@ember/debug-tests.ts
 rename types/preview/@ember/destroyable/test/main.ts => type-tests/preview/@ember/destroyable-test.ts (85%)
 rename {types/preview/@ember/engine/test => type-tests/preview/@ember/engine-test}/engine-instance.ts (100%)
 rename {types/preview/@ember/engine/test => type-tests/preview/@ember/engine-test}/engine.ts (100%)
 rename types/preview/@ember/error/ember__error-tests.ts => type-tests/preview/@ember/error-tests.ts (50%)
 create mode 100644 type-tests/preview/@ember/helper-tests.ts
 create mode 100644 type-tests/preview/@ember/modifier-tests.ts
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/compat.ts (100%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/computed.ts (100%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/core.ts (55%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/create-negative.ts (100%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/create.ts (100%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/event.ts (100%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/extend.ts (100%)
 create mode 100644 type-tests/preview/@ember/object-test/get-set.ts
 create mode 100644 type-tests/preview/@ember/object-test/internals.ts
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/object.ts (92%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/observable.ts (100%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/proxy.ts (94%)
 rename {types/preview/@ember/object/test => type-tests/preview/@ember/object-test}/reopen.ts (100%)
 rename types/preview/@ember/owner/ember__owner-tests.ts => type-tests/preview/@ember/owner-tests.ts (53%)
 create mode 100644 type-tests/preview/@ember/polyfills-tests.ts
 create mode 100644 type-tests/preview/@ember/routing-test/built-ins.ts
 rename {types/preview/@ember/routing/test => type-tests/preview/@ember/routing-test}/route.ts (84%)
 create mode 100644 type-tests/preview/@ember/routing-test/router-service.ts
 rename {types/preview/@ember/routing/test => type-tests/preview/@ember/routing-test}/router.ts (100%)
 rename types/preview/@ember/runloop/ember__runloop-tests.ts => type-tests/preview/@ember/runloop-tests.ts (99%)
 rename {types/preview/@ember/service => type-tests/preview/@ember}/service-test.ts (100%)
 rename types/preview/@ember/string/ember__string-tests.ts => type-tests/preview/@ember/string-tests.ts (100%)
 rename types/preview/@ember/template/ember__template-tests.ts => type-tests/preview/@ember/template-tests.ts (68%)
 rename types/preview/@ember/test/ember__test-tests.ts => type-tests/preview/@ember/test-tests.ts (81%)
 rename types/preview/@ember/utils/ember__utils-tests.ts => type-tests/preview/@ember/utils-tests.ts (73%)
 rename {types/preview/ember/test => type-tests/preview/ember}/application-instance.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/application.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/array-proxy.ts (67%)
 rename {types/preview/ember/test => type-tests/preview/ember}/array.ts (84%)
 rename {types/preview/ember/test => type-tests/preview/ember}/component.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/computed.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/controller.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/core-object.ts (55%)
 rename {types/preview/ember/test => type-tests/preview/ember}/create-negative.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/create.ts (100%)
 create mode 100644 type-tests/preview/ember/data-adapter.ts
 create mode 100644 type-tests/preview/ember/debug.ts
 rename {types/preview/ember/test => type-tests/preview/ember}/ember-module-tests.ts (57%)
 rename {types/preview/ember/test => type-tests/preview/ember}/ember-tests.ts (87%)
 rename {types/preview/ember/test => type-tests/preview/ember}/engine-instance.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/engine.ts (100%)
 create mode 100644 type-tests/preview/ember/error.ts
 rename {types/preview/ember/test => type-tests/preview/ember}/event.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/extend.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/helper.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/inject.ts (96%)
 rename {types/preview/ember/test => type-tests/preview/ember}/mixin.ts (84%)
 rename {types/preview/ember/test => type-tests/preview/ember}/object.ts (87%)
 rename {types/preview/ember/test => type-tests/preview/ember}/observable.ts (59%)
 create mode 100644 type-tests/preview/ember/private/computed-tests.ts
 rename {types/preview/ember/test => type-tests/preview/ember}/private/observable-tests.ts (73%)
 rename {types/preview/ember/test => type-tests/preview/ember}/reopen.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/route.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/router.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/run.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/string.ts (50%)
 rename {types/preview/ember/test => type-tests/preview/ember}/techniques/properties-from-this.ts (74%)
 rename {types/preview/ember/test => type-tests/preview/ember}/test.ts (100%)
 rename {types/preview/ember/test => type-tests/preview/ember}/transition.ts (100%)
 create mode 100755 type-tests/preview/ember/utils.ts
 create mode 100644 type-tests/preview/ember/view-utils.ts
 create mode 100644 type-tests/preview/index.d.ts
 create mode 100644 type-tests/preview/tsconfig.json
 delete mode 100755 types/preview/@ember/array/test/array-ext.ts
 delete mode 100755 types/preview/@ember/array/test/lib/assert.ts
 create mode 100644 types/preview/@ember/component/-private/signature-utils.d.ts
 delete mode 100644 types/preview/@ember/component/test/built-ins.ts
 delete mode 100755 types/preview/@ember/component/test/lib/assert.ts
 delete mode 100644 types/preview/@ember/debug/ember__debug-tests.ts
 delete mode 100644 types/preview/@ember/destroyable/test/lib/assert.ts
 delete mode 100644 types/preview/@ember/helper/ember__helper-tests.ts
 delete mode 100644 types/preview/@ember/modifier/ember__modifier-tests.ts
 delete mode 100644 types/preview/@ember/object/test/access-modifier.ts
 delete mode 100644 types/preview/@ember/object/test/get-set.ts
 delete mode 100644 types/preview/@ember/object/test/internals.ts
 delete mode 100644 types/preview/@ember/object/test/lib/assert.ts
 delete mode 100644 types/preview/@ember/polyfills/ember__polyfills-tests.ts
 delete mode 100644 types/preview/@ember/routing/test/built-ins.ts
 delete mode 100755 types/preview/@ember/routing/test/lib/assert.ts
 delete mode 100644 types/preview/@ember/routing/test/router-service.ts
 delete mode 100755 types/preview/ember/test/array-ext.ts
 delete mode 100644 types/preview/ember/test/data-adapter.ts
 delete mode 100644 types/preview/ember/test/debug.ts
 delete mode 100644 types/preview/ember/test/error.ts
 delete mode 100755 types/preview/ember/test/lib/assert.ts
 delete mode 100644 types/preview/ember/test/private/computed-tests.ts
 delete mode 100755 types/preview/ember/test/utils.ts
 delete mode 100644 types/preview/ember/test/view-utils.ts
 create mode 100644 types/preview/index.d.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 25aece7add1..a768459eaee 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -89,6 +89,30 @@ module.exports = {
         'no-console': 'off',
       },
     },
+    {
+      files: ['type-tests/preview/**/*.ts'],
+      parserOptions: {
+        sourceType: 'module',
+        project: './type-tests/preview/tsconfig.json',
+        tsconfigRootDir: __dirname,
+      },
+      rules: {
+        'no-console': 'off',
+        '@typescript-eslint/no-empty-interface': 'off',
+      },
+    },
+    {
+      files: ['type-tests/preview-prototype-extensions/**/*.ts'],
+      parserOptions: {
+        sourceType: 'module',
+        project: './type-tests/preview-prototype-extensions/tsconfig.json',
+        tsconfigRootDir: __dirname,
+      },
+      rules: {
+        'no-console': 'off',
+        '@typescript-eslint/no-empty-interface': 'off',
+      },
+    },
     {
       // TODO: files: ['packages/**/*.[jt]s'],
       files: ['packages/**/*.js'],
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index f3c1d72de66..3de3d1605e8 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -279,6 +279,10 @@ interface EmberArray<T> extends Enumerable {
   ): NativeArray<T>;
   filterBy(key: string, value?: unknown): NativeArray<T>;
   rejectBy(key: string, value?: unknown): NativeArray<T>;
+  find<S extends T, Target = void>(
+    predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
+    thisArg?: Target
+  ): S | undefined;
   find<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
@@ -1907,7 +1911,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
 */
 interface NativeArray<T>
   extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
-    MutableArray<T> {}
+    MutableArray<T>,
+    Observable {}
 
 let NativeArray = Mixin.create(MutableArray, Observable, {
   objectAt(idx: number) {
diff --git a/types/preview/@ember/application/test/application-instance.ts b/type-tests/preview/@ember/application-test/application-instance.ts
similarity index 100%
rename from types/preview/@ember/application/test/application-instance.ts
rename to type-tests/preview/@ember/application-test/application-instance.ts
diff --git a/types/preview/@ember/application/test/application.ts b/type-tests/preview/@ember/application-test/application.ts
similarity index 73%
rename from types/preview/@ember/application/test/application.ts
rename to type-tests/preview/@ember/application-test/application.ts
index e3bb601c492..fa90f68b203 100755
--- a/types/preview/@ember/application/test/application.ts
+++ b/type-tests/preview/@ember/application-test/application.ts
@@ -1,5 +1,7 @@
 import Application from '@ember/application';
+import ApplicationInstance from '@ember/application/instance';
 import EmberObject from '@ember/object';
+import { expectTypeOf } from 'expect-type';
 
 const BaseApp = Application.extend({
   modulePrefix: 'my-app',
@@ -38,6 +40,5 @@ const App2 = BaseApp.create({
 
 const App3 = BaseApp.create();
 
-const App3Instance1 = App3.buildInstance(); // $ExpectType ApplicationInstance
-
-const App3Instance2 = App3.buildInstance({ foo: 'bar' }); // $ExpectType ApplicationInstance
+expectTypeOf(App3.buildInstance()).toEqualTypeOf<ApplicationInstance>();
+expectTypeOf(App3.buildInstance({ foo: 'bar' })).toEqualTypeOf<ApplicationInstance>();
diff --git a/types/preview/@ember/application/test/deprecations.ts b/type-tests/preview/@ember/application-test/deprecations.ts
similarity index 100%
rename from types/preview/@ember/application/test/deprecations.ts
rename to type-tests/preview/@ember/application-test/deprecations.ts
diff --git a/types/preview/@ember/application/test/index.ts b/type-tests/preview/@ember/application-test/index.ts
similarity index 63%
rename from types/preview/@ember/application/test/index.ts
rename to type-tests/preview/@ember/application-test/index.ts
index f04751e2290..aa0d14e762d 100644
--- a/types/preview/@ember/application/test/index.ts
+++ b/type-tests/preview/@ember/application-test/index.ts
@@ -3,26 +3,25 @@ import EngineInstance from '@ember/engine/instance';
 import Owner from '@ember/owner';
 import ApplicationInstance from '@ember/application/instance';
 import Service from '@ember/service';
+import { expectTypeOf } from 'expect-type';
 
-// $ExpectType Owner | undefined
-getOwner({});
+expectTypeOf(getOwner({})).toEqualTypeOf<Owner | undefined>();
 
 // Confirm that random subclasses work as expected.
 declare class MyService extends Service {
   withStuff: true;
 }
 declare let myService: MyService;
-// $ExpectType Owner
-getOwner(myService);
+expectTypeOf(getOwner(myService)).toEqualTypeOf<Owner>();
 
 // @ts-expect-error
 getOwner();
 
 declare let baseOwner: Owner;
-setOwner({}, baseOwner);
+expectTypeOf(setOwner({}, baseOwner)).toBeVoid();
 
 declare let engine: EngineInstance;
-setOwner({}, engine);
+expectTypeOf(setOwner({}, engine)).toBeVoid();
 
 declare let application: ApplicationInstance;
-setOwner({}, application);
+expectTypeOf(setOwner({}, application)).toBeVoid();
diff --git a/types/preview/@ember/array/test/array-proxy.ts b/type-tests/preview/@ember/array-test/array-proxy.ts
similarity index 77%
rename from types/preview/@ember/array/test/array-proxy.ts
rename to type-tests/preview/@ember/array-test/array-proxy.ts
index 4aa3714dc08..9b2c81782ff 100644
--- a/types/preview/@ember/array/test/array-proxy.ts
+++ b/type-tests/preview/@ember/array-test/array-proxy.ts
@@ -1,7 +1,7 @@
-import { assertType } from './lib/assert';
 import ArrayProxy from '@ember/array/proxy';
 import EmberArray, { A } from '@ember/array';
 import EmberObject from '@ember/object';
+import { expectTypeOf } from 'expect-type';
 
 const pets = ['dog', 'cat', 'fish'];
 const proxy = ArrayProxy.create({ content: A(pets) });
@@ -13,7 +13,9 @@ proxy.get('firstObject'); // 'amoeba'
 const overridden = ArrayProxy.create({
   content: A(pets),
   objectAtContent(this: ArrayProxy<string>, idx: number): string | undefined {
-    return this.get('content').objectAt(idx)?.toUpperCase();
+    // NOTE: cast is necessary because `this` is not managed correctly in the
+    // `.create()` body anymore.
+    return (this.get('content') as EmberArray<string>).objectAt(idx)?.toUpperCase();
   },
 });
 
@@ -24,10 +26,11 @@ class MyNewProxy<T> extends ArrayProxy<T> {
 }
 
 const x = MyNewProxy.create({ content: A([1, 2, 3]) }) as MyNewProxy<number>;
-assertType<number | undefined>(x.get('firstObject'));
-assertType<boolean>(x.isNew);
+expectTypeOf(x.get('firstObject')).toEqualTypeOf<number | undefined>();
+expectTypeOf(x.isNew).toBeBoolean();
 
 // Custom EmberArray
+interface MyArray<T> extends EmberObject, EmberArray<T> {}
 class MyArray<T> extends EmberObject.extend(EmberArray) {
   constructor(content: ArrayLike<T>) {
     super();
diff --git a/types/preview/@ember/array/test/array.ts b/type-tests/preview/@ember/array-test/array.ts
similarity index 77%
rename from types/preview/@ember/array/test/array.ts
rename to type-tests/preview/@ember/array-test/array.ts
index 1f63d8f9eb7..8f7df294f56 100755
--- a/types/preview/@ember/array/test/array.ts
+++ b/type-tests/preview/@ember/array-test/array.ts
@@ -1,6 +1,7 @@
 import EmberObject from '@ember/object';
-import EmberArray, { A } from '@ember/array';
-import MutableArray from '@ember/array/mutable';
+import type Array from '@ember/array';
+import { A } from '@ember/array';
+import type MutableArray from '@ember/array/mutable';
 import { expectTypeOf } from 'expect-type';
 
 class Person extends EmberObject {
@@ -18,11 +19,11 @@ expectTypeOf(people.get('lastObject')).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.get('firstObject')).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.isAny('isHappy')).toBeBoolean();
 expectTypeOf(people.isAny('isHappy', false)).toBeBoolean();
-// @ts-expect-error
+// @ts-expect-error -- string != boolean
 people.isAny('isHappy', 'false');
 
 expectTypeOf(people.objectAt(0)).toEqualTypeOf<Person | undefined>();
-expectTypeOf(people.objectsAt([1, 2, 3])).toEqualTypeOf<EmberArray<Person | undefined>>();
+expectTypeOf(people.objectsAt([1, 2, 3])).toEqualTypeOf<Array<Person | undefined>>();
 
 expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Person[]>();
 expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<MutableArray<Person>>();
@@ -36,8 +37,8 @@ expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatch
 expectTypeOf(people.get('[]')).toEqualTypeOf<typeof people>();
 expectTypeOf(people.get('[]').get('firstObject')).toEqualTypeOf<Person | undefined>();
 
-expectTypeOf(people.mapBy('isHappy')).toEqualTypeOf<boolean[]>();
-expectTypeOf(people.mapBy('name.length')).toEqualTypeOf<unknown[]>();
+expectTypeOf(people.mapBy('isHappy')).toMatchTypeOf<boolean[]>();
+expectTypeOf(people.mapBy('name.length')).toMatchTypeOf<unknown[]>();
 
 const last = people.get('lastObject');
 expectTypeOf(last).toEqualTypeOf<Person | undefined>();
@@ -50,13 +51,14 @@ if (first) {
   expectTypeOf(first.get('isHappy')).toBeBoolean();
 }
 
-const letters: EmberArray<string> = A(['a', 'b', 'c']);
-const codes = letters.map((item, index, enumerable) => {
+const letters = A(['a', 'b', 'c']);
+const codes = letters.map((item, index, array) => {
   expectTypeOf(item).toBeString();
   expectTypeOf(index).toBeNumber();
+  expectTypeOf(array).toMatchTypeOf<string[]>();
   return item.charCodeAt(0);
 });
-expectTypeOf(codes).toEqualTypeOf<number[]>();
+expectTypeOf(codes).toMatchTypeOf<number[]>();
 
 const value = '1,2,3';
 const filters = A(value.split(','));
diff --git a/type-tests/preview/@ember/component-test/built-ins.ts b/type-tests/preview/@ember/component-test/built-ins.ts
new file mode 100644
index 00000000000..e920b295baa
--- /dev/null
+++ b/type-tests/preview/@ember/component-test/built-ins.ts
@@ -0,0 +1,6 @@
+import { Input, Textarea } from '@ember/component';
+import { expectTypeOf } from 'expect-type';
+
+// Minimal check that we are exporting both type and value
+expectTypeOf(Input).toEqualTypeOf<Input>();
+expectTypeOf(Textarea).toEqualTypeOf<Textarea>();
diff --git a/types/preview/@ember/component/test/component.ts b/type-tests/preview/@ember/component-test/component.ts
similarity index 92%
rename from types/preview/@ember/component/test/component.ts
rename to type-tests/preview/@ember/component-test/component.ts
index adb2a269a90..3df213d853c 100644
--- a/types/preview/@ember/component/test/component.ts
+++ b/type-tests/preview/@ember/component-test/component.ts
@@ -1,13 +1,13 @@
 import Component from '@ember/component';
 import Object, { computed, get } from '@ember/object';
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 
 Component.extend({
   layout: 'my-layout',
 });
 
 const MyComponent = Component.extend();
-assertType<string | string[]>(get(MyComponent, 'positionalParams'));
+expectTypeOf(get(MyComponent, 'positionalParams')).toEqualTypeOf<string | string[]>();
 
 const component1 = Component.extend({
   actions: {
@@ -144,10 +144,10 @@ type NamedArgsFor<T> = GetWithFallback<GetWithFallback<T, 'Args', {}>, 'Named',
 interface SigExample extends NamedArgsFor<MySig> {}
 class SigExample extends Component<MySig> {
   get accessArgs() {
-    const {
-      name, // $ExpectType string
-      age, // $ExpectType number
-    } = this;
+    const { name, age } = this;
+
+    expectTypeOf(name).toBeString();
+    expectTypeOf(age).toBeNumber();
 
     return `${name} is ${age} years old`;
   }
diff --git a/types/preview/@ember/component/test/helper.ts b/type-tests/preview/@ember/component-test/helper.ts
similarity index 72%
rename from types/preview/@ember/component/test/helper.ts
rename to type-tests/preview/@ember/component-test/helper.ts
index 2371fd666da..f63a4c6077f 100644
--- a/types/preview/@ember/component/test/helper.ts
+++ b/type-tests/preview/@ember/component-test/helper.ts
@@ -1,4 +1,11 @@
-import Helper, { ExpandSignature, helper } from '@ember/component/helper';
+import { BadType, DefaultPositional, EmptyObject } from '@ember/component/-private/signature-utils';
+import Helper, {
+  ExpandSignature,
+  FunctionBasedHelper,
+  FunctionBasedHelperInstance,
+  helper,
+} from '@ember/component/helper';
+import { expectTypeOf } from 'expect-type';
 
 class DeprecatedSignatureForm extends Helper<{
   PositionalArgs: [offset: Date];
@@ -35,14 +42,10 @@ interface DemoSig {
 }
 
 function testMissingSignature({ Args, Return }: ExpandSignature<unknown>) {
-  // $ExpectType BadType<"This helper is missing a signature">
-  Args.Named;
+  expectTypeOf(Args.Named).toEqualTypeOf<BadType<'This helper is missing a signature'>>();
 
-  // $ExpectType unknown[]
-  Args.Positional;
-
-  // $ExpectType unknown
-  Return;
+  expectTypeOf(Args.Positional).toEqualTypeOf<unknown[]>();
+  expectTypeOf(Return).toBeUnknown();
 }
 
 class SignatureForm extends Helper<DemoSig> {
@@ -93,31 +96,42 @@ class BadReturnForm extends Helper<DemoSig> {
   }
 }
 
-// $ExpectType FunctionBasedHelper<{ Args: { Positional: [number, number]; Named: EmptyObject; }; Return: number; }>
 const inferenceOnPositional = helper(function add([a, b]: [number, number]) {
   return a + b;
 });
 
+expectTypeOf(inferenceOnPositional).toEqualTypeOf<
+  FunctionBasedHelper<{
+    Args: { Positional: [number, number]; Named: EmptyObject };
+    Return: number;
+  }>
+>();
+
 const coolHelper = helper((_, named) => {
-  // $ExpectType EmptyObject
-  named;
+  expectTypeOf(named).toEqualTypeOf<EmptyObject>();
 });
 
-// $ExpectType FunctionBasedHelper<{ Args: { Positional: DefaultPositional; Named: { cool: boolean; }; }; Return: 123 | "neat"; }>
 const typeInferenceOnNamed = helper((_, { cool }: { cool: boolean }) => {
-  // $ExpectType boolean
-  cool;
+  expectTypeOf(cool).toBeBoolean();
 
   return cool ? 123 : 'neat';
 });
+expectTypeOf(typeInferenceOnNamed).toEqualTypeOf<
+  FunctionBasedHelper<{
+    Args: { Positional: DefaultPositional; Named: { cool: boolean } };
+    Return: 123 | 'neat';
+  }>
+>();
 
-// $ExpectType FunctionBasedHelper<{ Args: { Positional: [string]; Named: { delim?: string; }; }; Return: string; }>
 const dasherizeHelper = helper(function dasherize(
   [str]: [string],
   { delim = '-' }: { delim?: string }
 ) {
   return str.split(/[\s\n_.]+/g).join(delim);
 });
+expectTypeOf(dasherizeHelper).toEqualTypeOf<
+  FunctionBasedHelper<{ Args: { Positional: [string]; Named: { delim?: string } }; Return: string }>
+>();
 
 const signatureForm = helper<DemoSig>(([i18nizer], { name, age }) =>
   i18nizer(`${name} is ${age} years old`)
@@ -146,5 +160,10 @@ new greet();
 // @ts-expect-error
 class Subgreet extends greet {}
 
-// $ExpectType abstract new <T>() => FunctionBasedHelperInstance<{ Args: { Positional: [T]; Named: EmptyObject; }; Return: [T, T]; }>
 const pair = helper(<T>([item]: [T]): [T, T] => [item, item]);
+expectTypeOf(pair).toEqualTypeOf<
+  abstract new <T>() => FunctionBasedHelperInstance<{
+    Args: { Positional: [T]; Named: EmptyObject };
+    Return: [T, T];
+  }>
+>();
diff --git a/types/preview/@ember/component/test/template-only.ts b/type-tests/preview/@ember/component-test/template-only.ts
similarity index 53%
rename from types/preview/@ember/component/test/template-only.ts
rename to type-tests/preview/@ember/component-test/template-only.ts
index 6a9e0d01c19..1e06e9bf369 100644
--- a/types/preview/@ember/component/test/template-only.ts
+++ b/type-tests/preview/@ember/component-test/template-only.ts
@@ -1,8 +1,10 @@
 import templateOnly, { TemplateOnlyComponent, TOC } from '@ember/component/template-only';
+import { expectTypeOf } from 'expect-type';
 
-const to = templateOnly(); // $ExpectType TemplateOnlyComponent<unknown>
+const to = templateOnly();
+expectTypeOf(to).toEqualTypeOf<TemplateOnlyComponent<unknown>>();
 
-to.toString(); // $ExpectType string
+expectTypeOf(to.toString()).toBeString();
 
 // @ts-expect-error
 new TemplateOnlyComponent();
@@ -18,11 +20,11 @@ interface MySig {
   };
 }
 
-// $ExpectType TemplateOnlyComponent<MySig>
 const toc: TOC<MySig> = templateOnly();
+expectTypeOf(toc).toEqualTypeOf<TemplateOnlyComponent<MySig>>();
 
-// $ExpectType TemplateOnlyComponent<MySig>
 const tocInferred = templateOnly<MySig>();
+expectTypeOf(tocInferred).toEqualTypeOf<TemplateOnlyComponent<MySig>>();
 
-// $ExpectType TemplateOnlyComponent<MySig>
 const longToc: TemplateOnlyComponent<MySig> = templateOnly();
+expectTypeOf(longToc).toEqualTypeOf<TemplateOnlyComponent<MySig>>();
diff --git a/types/preview/@ember/controller/test/main.ts b/type-tests/preview/@ember/controller-test/main.ts
similarity index 100%
rename from types/preview/@ember/controller/test/main.ts
rename to type-tests/preview/@ember/controller-test/main.ts
diff --git a/types/preview/@ember/controller/test/octane.ts b/type-tests/preview/@ember/controller-test/octane.ts
similarity index 100%
rename from types/preview/@ember/controller/test/octane.ts
rename to type-tests/preview/@ember/controller-test/octane.ts
diff --git a/type-tests/preview/@ember/debug-tests.ts b/type-tests/preview/@ember/debug-tests.ts
new file mode 100644
index 00000000000..bf5c8f39fbe
--- /dev/null
+++ b/type-tests/preview/@ember/debug-tests.ts
@@ -0,0 +1,273 @@
+import {
+  runInDebug,
+  warn,
+  debug,
+  assert,
+  registerWarnHandler,
+  registerDeprecationHandler,
+  deprecate,
+} from '@ember/debug';
+import { expectTypeOf } from 'expect-type';
+
+/**
+ * @ember/debug tests
+ */
+// @ts-expect-error
+runInDebug();
+expectTypeOf(runInDebug(() => console.log('Should not show up in prod'))).toBeVoid();
+
+// Log a warning if we have more than 3 tomsters
+const tomsterCount = 2;
+// @ts-expect-error
+warn('Too many tomsters!');
+expectTypeOf(warn('Too many tomsters!', { id: 'some-warning' })).toBeVoid();
+// @ts-expect-error
+warn('Too many tomsters!', tomsterCount <= 3);
+expectTypeOf(warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' })).toBeVoid();
+expectTypeOf(
+  warn('Too many tomsters!', tomsterCount <= 3, {
+    id: 'ember-debug.too-many-tomsters',
+  })
+).toBeVoid();
+
+// @ts-expect-error
+debug();
+expectTypeOf(debug('Too many tomsters!')).toBeVoid();
+// @ts-expect-error
+debug('Too many tomsters!', 'foo');
+
+// Test for truthiness
+const str: unknown = 'hello';
+expectTypeOf(assert('Must pass a string', typeof str === 'string')).toBeVoid();
+assert('Must pass a string', typeof str === 'string');
+expectTypeOf(str).toBeString();
+
+const anObject = {};
+expectTypeOf(assert('Must pass an object', anObject)).toBeVoid();
+
+// Test with null and undefined
+expectTypeOf(assert('Can handle falsiness', null)).toBeVoid();
+expectTypeOf(assert('Can handle falsiness', undefined)).toBeVoid();
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerWarnHandler();
+expectTypeOf(registerWarnHandler(() => {})).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    expectTypeOf(next).toEqualTypeOf<
+      (message: string, options?: { id: string } | undefined) => void
+    >();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    // @ts-expect-error
+    next();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    expectTypeOf(next(message)).toBeVoid();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    expectTypeOf(next(message, options)).toBeVoid();
+  })
+).toBeVoid();
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerDeprecationHandler();
+expectTypeOf(registerDeprecationHandler(() => {})).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    expectTypeOf(next).toEqualTypeOf<
+      (message: string, options?: { id: string; until: string } | undefined) => void
+    >();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    // @ts-expect-error
+    next();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    expectTypeOf(next(message)).toBeVoid();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    expectTypeOf(next(message, options)).toBeVoid();
+  })
+).toBeVoid();
+
+// @ts-expect-error
+deprecate();
+// @ts-expect-error
+deprecate('missing test and options');
+// @ts-expect-error
+deprecate('missing options', true);
+// @ts-expect-error
+deprecate('missing options', false);
+// @ts-expect-error
+deprecate('missing options body', true, {});
+// @ts-expect-error
+deprecate('missing options id', true, { until: 'v4.0.0' });
+// @ts-expect-error
+deprecate('missing options until', true, { id: 'some.deprecation' });
+expectTypeOf(
+  deprecate('a valid deprecation without `url`', true, {
+    id: 'some.deprecation',
+    until: 'v4.0.0',
+    for: 'some.namespace',
+    since: {
+      available: 'some.early.version',
+      enabled: 'some.version',
+    },
+  })
+).toBeVoid();
+deprecate('incorrect options `url`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  // @ts-expect-error
+  url: 123,
+  for: 'some.namespace',
+  since: {
+    available: 'some.earlier.version',
+    enabled: 'some.version',
+  },
+});
+expectTypeOf(
+  deprecate('a valid deprecation with `url`', true, {
+    id: 'some.deprecation',
+    until: 'v4.0.0',
+    url: 'https://example.com/ember-deprecations-yo',
+    for: 'some.namespace',
+    since: {
+      available: 'some.earlier.version',
+      enabled: 'some.version',
+    },
+  })
+).toBeVoid();
+expectTypeOf(
+  deprecate('a valid deprecation with `for`', true, {
+    id: 'some.deprecation',
+    until: 'v4.0.0',
+    for: 'some.namespace',
+    since: {
+      available: 'some.earlier.version',
+      enabled: 'some.version',
+    },
+  })
+).toBeVoid();
+deprecate('incorrect options `for`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  // @ts-expect-error
+  for: 123,
+  since: {
+    available: 'some.earlier.version',
+    enabled: 'some.version',
+  },
+});
+expectTypeOf(
+  deprecate('a valid deprecation with `since`', true, {
+    id: 'some.deprecation',
+    until: 'v4.0.0',
+    for: 'some.namespace',
+    since: {
+      available: 'some.version',
+    },
+  })
+).toBeVoid();
+expectTypeOf(
+  deprecate('a valid deprecation with `since`', true, {
+    id: 'some.deprecation',
+    until: 'v4.0.0',
+    for: 'some.namespace',
+    since: {
+      available: 'some.version',
+      enabled: 'some.version',
+    },
+  })
+).toBeVoid();
+deprecate('incorrect options `since`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  // @ts-expect-error
+  since: 123,
+});
+deprecate('incorrect options `since`', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    // @ts-expect-error
+    wrongKey: 'some.version',
+  },
+});
+deprecate('incorrect options `since` available', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    // @ts-expect-error
+    available: 123,
+  },
+});
+deprecate('incorrect options `since` enabled', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  since: {
+    available: 'some.earlier.version',
+    // @ts-expect-error
+    enabled: 123,
+  },
+});
+deprecate('incorrect options `since` empty', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  // @ts-expect-error
+  since: {},
+});
+deprecate('incorrect options `since` enabled w/o available', true, {
+  id: 'some.deprecation',
+  until: 'v4.0.0',
+  for: 'some.namespace',
+  // @ts-expect-error
+  since: {
+    enabled: 'some.version',
+  },
+});
+
+// NOTE: these are at the bottom so they don't have the super annoying effect
+// of throwing up TS warnings about all the *other* tests above
+// Fail unconditionally
+expectTypeOf(assert('This code path should never be run')).toBeNever();
+
+// Require first argument
+// @ts-expect-error
+assert();
diff --git a/types/preview/@ember/destroyable/test/main.ts b/type-tests/preview/@ember/destroyable-test.ts
similarity index 85%
rename from types/preview/@ember/destroyable/test/main.ts
rename to type-tests/preview/@ember/destroyable-test.ts
index c852d7c303d..918f34296ce 100644
--- a/types/preview/@ember/destroyable/test/main.ts
+++ b/type-tests/preview/@ember/destroyable-test.ts
@@ -8,8 +8,7 @@ import {
   registerDestructor,
   unregisterDestructor,
 } from '@ember/destroyable';
-
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 
 // @ts-expect-error
 enableDestroyableTracking(true);
@@ -69,16 +68,16 @@ const p = new Parent(c);
 // @ts-expect-error
 destroy();
 
-assertType<boolean>(isDestroyed(c));
-assertType<boolean>(isDestroyed(p));
+expectTypeOf(isDestroyed(c)).toBeBoolean();
+expectTypeOf(isDestroyed(p)).toBeBoolean();
 
 destroy(p);
 
-assertType<boolean>(isDestroying(c));
-assertType<boolean>(isDestroying(p));
+expectTypeOf(isDestroying(c)).toBeBoolean();
+expectTypeOf(isDestroying(p)).toBeBoolean();
 
-assertType<boolean>(isDestroyed(c));
-assertType<boolean>(isDestroyed(p));
+expectTypeOf(isDestroyed(c)).toBeBoolean();
+expectTypeOf(isDestroyed(p)).toBeBoolean();
 
 // @ts-expect-error
 assertDestroyablesDestroyed(true);
diff --git a/types/preview/@ember/engine/test/engine-instance.ts b/type-tests/preview/@ember/engine-test/engine-instance.ts
similarity index 100%
rename from types/preview/@ember/engine/test/engine-instance.ts
rename to type-tests/preview/@ember/engine-test/engine-instance.ts
diff --git a/types/preview/@ember/engine/test/engine.ts b/type-tests/preview/@ember/engine-test/engine.ts
similarity index 100%
rename from types/preview/@ember/engine/test/engine.ts
rename to type-tests/preview/@ember/engine-test/engine.ts
diff --git a/types/preview/@ember/error/ember__error-tests.ts b/type-tests/preview/@ember/error-tests.ts
similarity index 50%
rename from types/preview/@ember/error/ember__error-tests.ts
rename to type-tests/preview/@ember/error-tests.ts
index d54bd7e0aad..3ffd32c5af9 100644
--- a/types/preview/@ember/error/ember__error-tests.ts
+++ b/type-tests/preview/@ember/error-tests.ts
@@ -1,6 +1,7 @@
 import Error from '@ember/error';
+import { expectTypeOf } from 'expect-type';
 
-new Error('Fuuuuuuuu'); // $ExpectType EmberError
+expectTypeOf(new Error('Fuuuuuuuu')).toEqualTypeOf<Error>();
 
 // allows to extend from EmberError
 class AjaxError extends Error {}
diff --git a/type-tests/preview/@ember/helper-tests.ts b/type-tests/preview/@ember/helper-tests.ts
new file mode 100644
index 00000000000..d68bce04dcf
--- /dev/null
+++ b/type-tests/preview/@ember/helper-tests.ts
@@ -0,0 +1,19 @@
+import {
+  array,
+  ArrayHelper,
+  concat,
+  ConcatHelper,
+  fn,
+  FnHelper,
+  get,
+  GetHelper,
+  hash,
+  HashHelper,
+} from '@ember/helper';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(array).toEqualTypeOf<ArrayHelper>();
+expectTypeOf(concat).toEqualTypeOf<ConcatHelper>();
+expectTypeOf(fn).toEqualTypeOf<FnHelper>();
+expectTypeOf(get).toEqualTypeOf<GetHelper>();
+expectTypeOf(hash).toEqualTypeOf<HashHelper>();
diff --git a/type-tests/preview/@ember/modifier-tests.ts b/type-tests/preview/@ember/modifier-tests.ts
new file mode 100644
index 00000000000..b90b0356d27
--- /dev/null
+++ b/type-tests/preview/@ember/modifier-tests.ts
@@ -0,0 +1,6 @@
+import { setModifierManager, capabilities, on, OnModifier } from '@ember/modifier';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(on).toEqualTypeOf<OnModifier>();
+expectTypeOf(setModifierManager((_owner) => {}, {})).toEqualTypeOf<{}>();
+expectTypeOf(capabilities('3.24')).toBeUnknown();
diff --git a/types/preview/@ember/object/test/compat.ts b/type-tests/preview/@ember/object-test/compat.ts
similarity index 100%
rename from types/preview/@ember/object/test/compat.ts
rename to type-tests/preview/@ember/object-test/compat.ts
diff --git a/types/preview/@ember/object/test/computed.ts b/type-tests/preview/@ember/object-test/computed.ts
similarity index 100%
rename from types/preview/@ember/object/test/computed.ts
rename to type-tests/preview/@ember/object-test/computed.ts
diff --git a/types/preview/@ember/object/test/core.ts b/type-tests/preview/@ember/object-test/core.ts
similarity index 55%
rename from types/preview/@ember/object/test/core.ts
rename to type-tests/preview/@ember/object-test/core.ts
index 2030d672887..bc028dc41e4 100644
--- a/types/preview/@ember/object/test/core.ts
+++ b/type-tests/preview/@ember/object-test/core.ts
@@ -4,21 +4,17 @@ import { expectTypeOf } from 'expect-type';
 /** Newable tests */
 const co1 = new CoreObject();
 
-// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// co1.concatenatedProperties; // $ExpectType string[]
-co1.isDestroyed; // $ExpectType boolean
-co1.isDestroying; // $ExpectType boolean
-co1.destroy(); // $ExpectType CoreObject
-co1.toString(); // $ExpectType string
+expectTypeOf(co1.isDestroyed).toEqualTypeOf<boolean>();
+expectTypeOf(co1.isDestroying).toEqualTypeOf<boolean>();
+expectTypeOf(co1.destroy()).toEqualTypeOf<CoreObject>();
+expectTypeOf(co1.toString()).toEqualTypeOf<string>();
 
 /** .create tests */
 const co2 = CoreObject.create();
-// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// co2.concatenatedProperties; // $ExpectType string[]
-co2.isDestroyed; // $ExpectType boolean
-co2.isDestroying; // $ExpectType boolean
-co2.destroy(); // $ExpectType CoreObject
-co2.toString(); // $ExpectType string
+expectTypeOf(co2.isDestroyed).toEqualTypeOf<boolean>();
+expectTypeOf(co2.isDestroying).toEqualTypeOf<boolean>();
+expectTypeOf(co2.destroy()).toEqualTypeOf<CoreObject>();
+expectTypeOf(co2.toString()).toEqualTypeOf<string>();
 
 /** .create tests w/ initial instance data passed in */
 declare class CO3 extends CoreObject {
@@ -27,8 +23,8 @@ declare class CO3 extends CoreObject {
 }
 const co3 = CO3.create({ foo: '123', bar: 456 });
 
-co3.foo; // $ExpectType string
-co3.bar; // $ExpectType number
+expectTypeOf(co3.foo).toEqualTypeOf<string>();
+expectTypeOf(co3.bar).toEqualTypeOf<number>();
 
 /** .extend with a zero-argument .create()  */
 class CO4 extends CO3 {
@@ -38,9 +34,9 @@ class CO4 extends CO3 {
 }
 const co4 = CO4.create();
 
-co4.foo; // $ExpectType string
-co4.bar; // $ExpectType number
-co4.baz; // $ExpectType () => [string, number]
+expectTypeOf(co4.foo).toEqualTypeOf<string>();
+expectTypeOf(co4.bar).toEqualTypeOf<number>();
+expectTypeOf(co4.baz).toEqualTypeOf<() => [string, number]>();
 
 /** .extend with inconsistent arguments passed into .create()  */
 class CO5 extends CoreObject {
diff --git a/types/preview/@ember/object/test/create-negative.ts b/type-tests/preview/@ember/object-test/create-negative.ts
similarity index 100%
rename from types/preview/@ember/object/test/create-negative.ts
rename to type-tests/preview/@ember/object-test/create-negative.ts
diff --git a/types/preview/@ember/object/test/create.ts b/type-tests/preview/@ember/object-test/create.ts
similarity index 100%
rename from types/preview/@ember/object/test/create.ts
rename to type-tests/preview/@ember/object-test/create.ts
diff --git a/types/preview/@ember/object/test/event.ts b/type-tests/preview/@ember/object-test/event.ts
similarity index 100%
rename from types/preview/@ember/object/test/event.ts
rename to type-tests/preview/@ember/object-test/event.ts
diff --git a/types/preview/@ember/object/test/extend.ts b/type-tests/preview/@ember/object-test/extend.ts
similarity index 100%
rename from types/preview/@ember/object/test/extend.ts
rename to type-tests/preview/@ember/object-test/extend.ts
diff --git a/type-tests/preview/@ember/object-test/get-set.ts b/type-tests/preview/@ember/object-test/get-set.ts
new file mode 100644
index 00000000000..d17a7d3bb05
--- /dev/null
+++ b/type-tests/preview/@ember/object-test/get-set.ts
@@ -0,0 +1,15 @@
+import { get, set } from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+
+const basicPojo = { greeting: 'hello' };
+
+expectTypeOf(get(basicPojo, 'greeting')).toEqualTypeOf<string>();
+expectTypeOf(get(basicPojo, 'salutation')).toEqualTypeOf<unknown>();
+expectTypeOf(set(basicPojo, 'greeting', 'ahoy')).toEqualTypeOf<string>();
+// @ts-expect-error
+set(basicPojo, 'salutation', 'heyo');
+
+declare let whoKnows: unknown;
+expectTypeOf(get(whoKnows, 'any-string')).toEqualTypeOf<unknown>();
+// @ts-expect-error
+set(whoKnows, 'any-string', 123);
diff --git a/type-tests/preview/@ember/object-test/internals.ts b/type-tests/preview/@ember/object-test/internals.ts
new file mode 100644
index 00000000000..5c70b399e5c
--- /dev/null
+++ b/type-tests/preview/@ember/object-test/internals.ts
@@ -0,0 +1,7 @@
+import { guidFor } from '@ember/object/internals';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(guidFor('a string')).toBeString();
+expectTypeOf(guidFor(123)).toBeString();
+expectTypeOf(guidFor({ hello: 'world' })).toBeString();
+expectTypeOf(guidFor([1, 2, 3])).toBeString();
diff --git a/types/preview/@ember/object/test/object.ts b/type-tests/preview/@ember/object-test/object.ts
similarity index 92%
rename from types/preview/@ember/object/test/object.ts
rename to type-tests/preview/@ember/object-test/object.ts
index 1ff499ba089..6a022f01099 100644
--- a/types/preview/@ember/object/test/object.ts
+++ b/type-tests/preview/@ember/object-test/object.ts
@@ -52,9 +52,9 @@ class Foo extends Object {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const a: number = this.get('b');
 
-    this.get('b').toFixed(4); // $ExpectType string
-    this.set('a', 'abc').split(','); // $ExpectType string[]
-    this.set('b', 10).toFixed(4); // $ExpectType string
+    expectTypeOf(this.get('b').toFixed(4)).toEqualTypeOf<string>();
+    expectTypeOf(this.set('a', 'abc').split(',')).toEqualTypeOf<string[]>();
+    expectTypeOf(this.set('b', 10).toFixed(4)).toEqualTypeOf<string>();
 
     this.setProperties({ b: 11 });
     // this.setProperties({ b: '11' }); // @ts-expect-error
diff --git a/types/preview/@ember/object/test/observable.ts b/type-tests/preview/@ember/object-test/observable.ts
similarity index 100%
rename from types/preview/@ember/object/test/observable.ts
rename to type-tests/preview/@ember/object-test/observable.ts
diff --git a/types/preview/@ember/object/test/proxy.ts b/type-tests/preview/@ember/object-test/proxy.ts
similarity index 94%
rename from types/preview/@ember/object/test/proxy.ts
rename to type-tests/preview/@ember/object-test/proxy.ts
index d05aa51917d..fec756a37c3 100644
--- a/types/preview/@ember/object/test/proxy.ts
+++ b/type-tests/preview/@ember/object-test/proxy.ts
@@ -9,7 +9,7 @@ interface Book {
 }
 
 class DefaultProxy extends ObjectProxy {}
-DefaultProxy.create().content; // $ExpectType object | undefined
+expectTypeOf(DefaultProxy.create().content).toEqualTypeOf<object | undefined>();
 
 class BookProxy extends ObjectProxy<Book> {
   private readonly baz = 'baz';
@@ -26,7 +26,7 @@ class BookProxy extends ObjectProxy<Book> {
 }
 
 const book = BookProxy.create();
-expectTypeOf(book.content).toEqualTypeOf<Book | undefined>(); // $ExpectType Book | undefined
+expectTypeOf(book.content).toEqualTypeOf<Book | undefined>();
 
 // @ts-expect-error
 book.get('unknownProperty');
diff --git a/types/preview/@ember/object/test/reopen.ts b/type-tests/preview/@ember/object-test/reopen.ts
similarity index 100%
rename from types/preview/@ember/object/test/reopen.ts
rename to type-tests/preview/@ember/object-test/reopen.ts
diff --git a/types/preview/@ember/owner/ember__owner-tests.ts b/type-tests/preview/@ember/owner-tests.ts
similarity index 53%
rename from types/preview/@ember/owner/ember__owner-tests.ts
rename to type-tests/preview/@ember/owner-tests.ts
index f5a6603df5a..4effdfb996b 100644
--- a/types/preview/@ember/owner/ember__owner-tests.ts
+++ b/type-tests/preview/@ember/owner-tests.ts
@@ -1,4 +1,5 @@
 import Owner, { Factory, FactoryManager, FullName, RegisterOptions } from '@ember/owner';
+import { expectTypeOf } from 'expect-type';
 
 // Just a class we can construct in the Factory and FactoryManager tests
 declare class ConstructThis {
@@ -7,8 +8,8 @@ declare class ConstructThis {
 
 // ----- RegisterOptions ----- //
 declare let regOptionsA: RegisterOptions;
-regOptionsA.instantiate; // $ExpectType boolean | undefined
-regOptionsA.singleton; // $ExpectType boolean | undefined
+expectTypeOf(regOptionsA.instantiate).toEqualTypeOf<boolean | undefined>();
+expectTypeOf(regOptionsA.singleton).toEqualTypeOf<boolean | undefined>();
 
 // ----- Factory ----- //
 // This gives us coverage for the cases where you are *casting*.
@@ -40,15 +41,15 @@ aFactory.create(badPojo);
 
 // ----- FactoryManager ----- //
 declare let aFactoryManager: FactoryManager<ConstructThis>;
-aFactoryManager.class; // $ExpectType Factory<ConstructThis>
-aFactoryManager.create({}); // $ExpectType ConstructThis
-aFactoryManager.create({ hasProps: true }); // $ExpectType ConstructThis
-aFactoryManager.create({ hasProps: false }); // $ExpectType ConstructThis
+expectTypeOf(aFactoryManager.class).toEqualTypeOf<Factory<ConstructThis>>();
+expectTypeOf(aFactoryManager.create({})).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: true })).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: false })).toEqualTypeOf<ConstructThis>();
 // @ts-expect-error
 aFactoryManager.create({ otherStuff: 'nope' });
 // @ts-expect-error
 aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
-aFactoryManager.create(goodPojo); // $ExpectType ConstructThis
+expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
 // @ts-expect-error
 aFactoryManager.create(badPojo);
 
@@ -58,33 +59,45 @@ declare let owner: Owner;
 
 // @ts-expect-error
 owner.lookup();
-owner.lookup('type:name'); // $ExpectType unknown
+expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
 // @ts-expect-error
 owner.lookup('non-namespace-string');
-owner.lookup('namespace@type:name'); // $ExpectType unknown
-
-owner.register('type:name', aFactory); // $ExpectType void
-owner.register('type:name', aFactory, {}); // $ExpectType void
-owner.register('type:name', aFactory, { instantiate: true }); // $ExpectType void
-owner.register('type:name', aFactory, { instantiate: false }); // $ExpectType void
-owner.register('type:name', aFactory, { singleton: true }); // $ExpectType void
-owner.register('type:name', aFactory, { singleton: false }); // $ExpectType void
-owner.register('type:name', aFactory, { instantiate: true, singleton: true }); // $ExpectType void
-owner.register('type:name', aFactory, { instantiate: true, singleton: false }); // $ExpectType void
-owner.register('type:name', aFactory, { instantiate: false, singleton: true }); // $ExpectType void
-owner.register('type:name', aFactory, { instantiate: false, singleton: false }); // $ExpectType void
+expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
+
+expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: false })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: false })).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: false })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: false })
+).toEqualTypeOf<void>();
 // @ts-expect-error
 owner.register('non-namespace-string', aFactory);
-owner.register('namespace@type:name', aFactory); // $ExpectType void
-
-owner.factoryFor('type:name'); // $ExpectType FactoryManager<unknown> | undefined
-owner.factoryFor('type:name')?.class; // $ExpectType Factory<unknown> | undefined
-owner.factoryFor('type:name')?.create(); // $ExpectType unknown
-owner.factoryFor('type:name')?.create({}); // $ExpectType unknown
-owner.factoryFor('type:name')?.create({ anythingGoes: true }); // $ExpectType unknown
+expectTypeOf(owner.register('namespace@type:name', aFactory)).toEqualTypeOf<void>();
+
+expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<unknown> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<unknown> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<unknown>();
+expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<unknown>();
+expectTypeOf(
+  owner.factoryFor('type:name')?.create({ anythingGoes: true })
+).toEqualTypeOf<unknown>();
 // @ts-expect-error
 owner.factoryFor('non-namespace-string');
-owner.factoryFor('namespace@type:name'); // $ExpectType FactoryManager<unknown> | undefined
+expectTypeOf(owner.factoryFor('namespace@type:name')).toEqualTypeOf<
+  FactoryManager<unknown> | undefined
+>();
 
 // Tests deal with the fact that string literals are a special case! `let`
 // bindings will accordingly not "just work" as a result. The separate
@@ -96,7 +109,7 @@ owner.lookup(aName);
 
 let aTypedName: FullName;
 aTypedName = 'type:name';
-owner.lookup(aTypedName); // $ExpectType unknown
+expectTypeOf(owner.lookup(aTypedName)).toBeUnknown();
 
 // Nor will callbacks work "out of the box". But they can work if they have the
 // correct type.
@@ -108,7 +121,7 @@ typedStrings.map((aString) => owner.lookup(aString));
 
 // Also make sure it keeps working with const bindings
 const aConstName = 'type:name';
-owner.lookup(aConstName); // $ExpectType unknown
+expectTypeOf(owner.lookup(aConstName)).toBeUnknown();
 
 // ----- Minimal further coverage for POJOs ----- //
 // `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
@@ -132,4 +145,4 @@ const pojoFactory: Factory<typeof Creatable> = {
   },
 };
 
-pojoFactory.create(); // $ExpectType { hasProps: boolean; }
+expectTypeOf(pojoFactory.create()).toEqualTypeOf<{ hasProps: boolean }>();
diff --git a/type-tests/preview/@ember/polyfills-tests.ts b/type-tests/preview/@ember/polyfills-tests.ts
new file mode 100644
index 00000000000..b15e22e10b2
--- /dev/null
+++ b/type-tests/preview/@ember/polyfills-tests.ts
@@ -0,0 +1,26 @@
+import { assign } from '@ember/polyfills';
+import { expectTypeOf } from 'expect-type';
+
+(() => {
+  /* assign */
+  assign({}, { a: 'b' });
+  expectTypeOf(assign({}, { a: 'b' }).a).toBeString();
+  expectTypeOf(assign({ a: 6 }, { a: 'b' }).a).toBeString();
+  expectTypeOf(assign({ a: 6 }, {}).a).toBeNumber();
+  // @ts-expect-error
+  assign({ b: 6 }, {}).a;
+  expectTypeOf(assign({}, { b: 6 }, {}).b).toBeNumber();
+  expectTypeOf(assign({ a: 'hello' }, { b: 6 }, {}).a).toBeString();
+  expectTypeOf(assign({ a: 'hello' }, { b: 6 }, { a: true }).a).toBeBoolean();
+  // @ts-expect-error
+  assign({ a: 'hello' }, '', { a: true }).a;
+  expectTypeOf(
+    assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d
+  ).toEqualTypeOf<string[]>();
+  // @ts-expect-error
+  assign({}, { a: 0 }, { b: 1 }, { c: 2 }, { d: 3 }).a;
+
+  // matches Object.assign
+  expectTypeOf(assign({}, null)).toBeNever();
+  expectTypeOf(assign({}, undefined)).toBeNever();
+})();
diff --git a/type-tests/preview/@ember/routing-test/built-ins.ts b/type-tests/preview/@ember/routing-test/built-ins.ts
new file mode 100644
index 00000000000..80efe6516b6
--- /dev/null
+++ b/type-tests/preview/@ember/routing-test/built-ins.ts
@@ -0,0 +1,5 @@
+import { LinkTo } from '@ember/routing';
+import { expectTypeOf } from 'expect-type';
+
+// Basic check taht we export both type and value correctly.
+expectTypeOf(LinkTo).toEqualTypeOf<LinkTo>();
diff --git a/types/preview/@ember/routing/test/route.ts b/type-tests/preview/@ember/routing-test/route.ts
similarity index 84%
rename from types/preview/@ember/routing/test/route.ts
rename to type-tests/preview/@ember/routing-test/route.ts
index fea2b336b2e..b550e7180f6 100755
--- a/types/preview/@ember/routing/test/route.ts
+++ b/type-tests/preview/@ember/routing-test/route.ts
@@ -1,10 +1,12 @@
+/* eslint-disable @typescript-eslint/no-empty-interface */
 /* eslint-disable prefer-const */
 import Route from '@ember/routing/route';
-import Array from '@ember/array';
+import type Array from '@ember/array';
 import EmberObject from '@ember/object';
 import Controller from '@ember/controller';
-import Transition from '@ember/routing/transition';
-import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
+import type Transition from '@ember/routing/transition';
+import type { RouteInfoWithAttributes } from '@ember/routing/route-info';
+import type RouteInfo from '@ember/routing/route-info';
 
 class Post extends EmberObject {}
 
@@ -99,23 +101,23 @@ class TransitionToExamples extends Route {
   }
 
   transitionToId() {
-    // $ExpectType Transition<unknown>
-    this.transitionTo('blog-post', 1);
+    expectTypeOf(this.transitionTo('blog-post', 1)).toEqualTypeOf<Transition<unknown>>();
   }
 
   transitionToIdWithQP() {
-    // $ExpectType Transition<unknown>
-    this.transitionTo('blog-post', 1, { queryParams: { includeComments: true } });
+    expectTypeOf(
+      this.transitionTo('blog-post', 1, { queryParams: { includeComments: true } })
+    ).toEqualTypeOf<Transition<unknown>>();
   }
 
   transitionToIds() {
-    // $ExpectType Transition<unknown>
-    this.transitionTo('blog-comment', 1, '13');
+    expectTypeOf(this.transitionTo('blog-comment', 1, '13')).toEqualTypeOf<Transition<unknown>>();
   }
 
   transitionToIdsWithQP() {
-    // $ExpectType Transition<unknown>
-    this.transitionTo('blog-comment', 1, '13', { queryParams: { includePost: true } });
+    expectTypeOf(
+      this.transitionTo('blog-comment', 1, '13', { queryParams: { includePost: true } })
+    ).toEqualTypeOf<Transition<unknown>>();
   }
 
   buildRouteInfoMetadata() {
@@ -209,19 +211,19 @@ expectTypeOf<ImplicitParams>().toEqualTypeOf<RouteParams>();
 // back-compat for existing users of these
 // NOTE: we will *not* migrate the private import locations when moving to
 // publish from Ember itself.
-import PrivateTransition from '@ember/routing/-private/transition';
+import type PrivateTransition from '@ember/routing/-private/transition';
 declare let publicTransition: Transition;
 declare let oldPrivateTransition: PrivateTransition;
 publicTransition = oldPrivateTransition;
 oldPrivateTransition = publicTransition;
 
-import PrivateRouteInfo from '@ember/routing/-private/route-info';
+import type PrivateRouteInfo from '@ember/routing/-private/route-info';
 declare let publicRouteInfo: RouteInfo;
 declare let privateRouteInfo: PrivateRouteInfo;
 publicRouteInfo = privateRouteInfo;
 privateRouteInfo = publicRouteInfo;
 
-import PrivateRouteInfoWithAttributes from '@ember/routing/-private/route-info-with-attributes';
+import type PrivateRouteInfoWithAttributes from '@ember/routing/-private/route-info-with-attributes';
 import { expectTypeOf } from 'expect-type';
 declare let publicRouteInfoWithAttributes: RouteInfoWithAttributes;
 declare let privateRouteInfoWithAttributes: PrivateRouteInfoWithAttributes;
diff --git a/type-tests/preview/@ember/routing-test/router-service.ts b/type-tests/preview/@ember/routing-test/router-service.ts
new file mode 100644
index 00000000000..7bd771ca82f
--- /dev/null
+++ b/type-tests/preview/@ember/routing-test/router-service.ts
@@ -0,0 +1,102 @@
+import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
+import RouterService from '@ember/routing/router-service';
+import Transition from '@ember/routing/transition';
+import { expectTypeOf } from 'expect-type';
+
+declare let router: RouterService;
+
+router.transitionTo('someRoute');
+router.transitionTo('someRoute', { withModel: true });
+router.transitionTo('someRoute', { withModel: true }, { queryParams: {} });
+router.transitionTo(
+  'someRoute',
+  { withModel: true },
+  { withMultipleModels: 'still checks correctly' },
+  { queryParams: {} }
+);
+
+const routeWillChangeHandler = () => {};
+expectTypeOf(router.on('routeWillChange', routeWillChangeHandler)).toEqualTypeOf<RouterService>();
+expectTypeOf(router.has('routeWillChange')).toEqualTypeOf<boolean>();
+expectTypeOf(router.off('routeWillChange', routeWillChangeHandler)).toEqualTypeOf<RouterService>();
+expectTypeOf(router.one('routeWillChange', routeWillChangeHandler)).toEqualTypeOf<RouterService>();
+expectTypeOf(router.trigger('routeWillChange', 'boo')).toEqualTypeOf<void>();
+
+const transition = router.transitionTo('someRoute');
+
+expectTypeOf(transition.abort()).toEqualTypeOf<Transition<unknown>>();
+
+expectTypeOf(transition.catch()).toEqualTypeOf<Promise<unknown>>();
+transition.catch((err) => console.log(err), 'label');
+
+expectTypeOf(transition.finally()).toEqualTypeOf<Promise<unknown>>();
+transition.finally(() => console.log('finally!'));
+transition.finally(() => console.log('finally!'), 'label');
+
+expectTypeOf(transition.followRedirects()).toEqualTypeOf<Promise<unknown>>();
+
+expectTypeOf(transition.method()).toEqualTypeOf<Transition<unknown>>();
+transition.method('replace');
+
+expectTypeOf(transition.retry()).toEqualTypeOf<Transition<unknown>>();
+
+expectTypeOf(transition.then()).toEqualTypeOf<Promise<unknown>>();
+transition.then(
+  (result) => console.log(result),
+  (err) => console.log(err),
+  'label'
+);
+
+expectTypeOf(transition.trigger(false, 'error')).toEqualTypeOf<void>();
+
+expectTypeOf(transition.send(false, 'error')).toEqualTypeOf<void>();
+
+transition.data = { some: 'data' };
+
+expectTypeOf(transition.from).toEqualTypeOf<RouteInfoWithAttributes | null>();
+// @ts-expect-error
+transition.from = 'from';
+
+expectTypeOf(transition.promise).toEqualTypeOf<Promise<unknown>>();
+// @ts-expect-error
+transition.promise = 'promise';
+
+expectTypeOf(transition.to).toEqualTypeOf<RouteInfo | RouteInfoWithAttributes>();
+// @ts-expect-error
+transition.to = 'to';
+
+expectTypeOf(transition.to.metadata).toEqualTypeOf<unknown>();
+// @ts-expect-error
+transition.to.metadata = 'foo';
+
+// NOTE: we cannot check the validity of invocations with just route name and
+// query params beyond that the second argument is an object of some sort,
+// because TS will always resolve it to the `models` variant if the
+// `queryParams` variant fails.
+expectTypeOf(router.transitionTo('someRoute', { queryParams: { shouldWork: true } })).toEqualTypeOf<
+  Transition<unknown>
+>();
+expectTypeOf(router.transitionTo({ queryParams: { areSupported: true } })).toEqualTypeOf<
+  Transition<unknown>
+>();
+// @ts-expect-error
+router.transitionTo({ queryParams: 'potato' });
+expectTypeOf(router.transitionTo('someRoute', 1)).toEqualTypeOf<Transition<unknown>>();
+expectTypeOf(
+  router.transitionTo('someRoute', 1, { queryParams: { areSupported: true } })
+).toEqualTypeOf<Transition<unknown>>();
+expectTypeOf(router.transitionTo('someRoute', 1, '13')).toEqualTypeOf<Transition<unknown>>();
+expectTypeOf(
+  router.transitionTo('someRoute', 1, '13', { queryParams: { areSupported: true } })
+).toEqualTypeOf<Transition<unknown>>();
+
+expectTypeOf(router.recognize('foo/bar')).toEqualTypeOf<RouteInfo>();
+
+expectTypeOf(router.recognizeAndLoad('foo/bar')).toEqualTypeOf<RouteInfoWithAttributes>();
+
+expectTypeOf(router.rootURL).toEqualTypeOf<string>();
+// @ts-expect-error
+router.rootURL = 'foo';
+
+expectTypeOf(router.refresh()).toEqualTypeOf<Transition<unknown>>();
+expectTypeOf(router.refresh('my-route')).toEqualTypeOf<Transition<unknown>>();
diff --git a/types/preview/@ember/routing/test/router.ts b/type-tests/preview/@ember/routing-test/router.ts
similarity index 100%
rename from types/preview/@ember/routing/test/router.ts
rename to type-tests/preview/@ember/routing-test/router.ts
diff --git a/types/preview/@ember/runloop/ember__runloop-tests.ts b/type-tests/preview/@ember/runloop-tests.ts
similarity index 99%
rename from types/preview/@ember/runloop/ember__runloop-tests.ts
rename to type-tests/preview/@ember/runloop-tests.ts
index f62a8889f8e..799d86ef5c6 100644
--- a/types/preview/@ember/runloop/ember__runloop-tests.ts
+++ b/type-tests/preview/@ember/runloop-tests.ts
@@ -16,7 +16,7 @@ import {
   _backburner,
 } from '@ember/runloop';
 import EmberObject, { action } from '@ember/object';
-import {
+import type {
   Backburner,
   DebugInfo,
   QueueItem,
@@ -31,7 +31,6 @@ declare module '@ember/runloop' {
 
 function testRun() {
   run(() => {
-    // $ExpectType number
     // code to be executed within a RunLoop
     return 123;
   });
diff --git a/types/preview/@ember/service/service-test.ts b/type-tests/preview/@ember/service-test.ts
similarity index 100%
rename from types/preview/@ember/service/service-test.ts
rename to type-tests/preview/@ember/service-test.ts
diff --git a/types/preview/@ember/string/ember__string-tests.ts b/type-tests/preview/@ember/string-tests.ts
similarity index 100%
rename from types/preview/@ember/string/ember__string-tests.ts
rename to type-tests/preview/@ember/string-tests.ts
diff --git a/types/preview/@ember/template/ember__template-tests.ts b/type-tests/preview/@ember/template-tests.ts
similarity index 68%
rename from types/preview/@ember/template/ember__template-tests.ts
rename to type-tests/preview/@ember/template-tests.ts
index ae0a832925b..7c38e72387e 100644
--- a/types/preview/@ember/template/ember__template-tests.ts
+++ b/type-tests/preview/@ember/template-tests.ts
@@ -1,11 +1,14 @@
 import { SafeString } from '@ember/template/-private/handlebars';
 import { htmlSafe, isHTMLSafe } from '@ember/template';
+import { expectTypeOf } from 'expect-type';
 
 const handlebarsSafeString: SafeString = htmlSafe('lorem ipsum...');
-htmlSafe('lorem ipsum...'); // $ExpectType SafeString
+expectTypeOf(htmlSafe('lorem ipsum...')).toEqualTypeOf<SafeString>();
 // @ts-expect-error
 const regularString: string = htmlSafe('lorem ipsum...');
 
+expectTypeOf(isHTMLSafe).guards.toEqualTypeOf<SafeString>();
+
 function isSafeTest(a: string | SafeString) {
   if (isHTMLSafe(a)) {
     a = a.toString();
diff --git a/types/preview/@ember/test/ember__test-tests.ts b/type-tests/preview/@ember/test-tests.ts
similarity index 81%
rename from types/preview/@ember/test/ember__test-tests.ts
rename to type-tests/preview/@ember/test-tests.ts
index 29a689158b1..c21818e92aa 100644
--- a/types/preview/@ember/test/ember__test-tests.ts
+++ b/type-tests/preview/@ember/test-tests.ts
@@ -1,5 +1,6 @@
 import { registerWaiter, registerHelper, registerAsyncHelper } from '@ember/test';
 import TestAdapter from '@ember/test/adapter';
+import { expectTypeOf } from 'expect-type';
 
 const pending = 0;
 registerWaiter(() => pending !== 0);
@@ -13,9 +14,9 @@ registerWaiter(MyDb, MyDb.hasPendingTransactions);
 registerWaiter();
 
 registerHelper('boot', (app) => {
-  app.advanceReadiness(); // $ExpectType void
-  app.deferReadiness(); // $ExpectType void
-  app.register('foo', class {}); // $ExpectType void
+  expectTypeOf(app.advanceReadiness()).toBeVoid();
+  expectTypeOf(app.deferReadiness()).toBeVoid();
+  expectTypeOf(app.register('foo', class {})).toBeVoid();
   // @ts-expect-error
   app.register('foo');
   // @ts-expect-error
diff --git a/types/preview/@ember/utils/ember__utils-tests.ts b/type-tests/preview/@ember/utils-tests.ts
similarity index 73%
rename from types/preview/@ember/utils/ember__utils-tests.ts
rename to type-tests/preview/@ember/utils-tests.ts
index b9be7a5b34d..506dfb94b1b 100644
--- a/types/preview/@ember/utils/ember__utils-tests.ts
+++ b/type-tests/preview/@ember/utils-tests.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-new-wrappers */ // we have to test the new-wrappers!
 import { expectTypeOf } from 'expect-type';
+import EmberObject from '@ember/object';
 
 import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@ember/utils';
 
@@ -9,7 +10,7 @@ import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@
   if (isNone(maybeUndefined)) {
     return;
   }
-  const anotherString = maybeUndefined + 'another string';
+  expectTypeOf(maybeUndefined).toBeString();
   expectTypeOf(isNone()).toEqualTypeOf<boolean>();
   expectTypeOf(isNone(null)).toEqualTypeOf<boolean>();
   expectTypeOf(isNone(undefined)).toEqualTypeOf<boolean>();
@@ -41,38 +42,32 @@ import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@
 
 (function () {
   /** typeOf */
-  typeOf(null); // $ExpectType "null"
-  typeOf(undefined); // $ExpectType "undefined"
-  typeOf('michael'); // $ExpectType "string"
-  // tslint:disable-next-line:no-construct
-  typeOf(new String('michael')); // $ExpectType "string"
-  typeOf(101); // $ExpectType "number"
-  // tslint:disable-next-line:no-construct
-  typeOf(new Number(101)); // $ExpectType "number"
-  typeOf(true); // $ExpectType "boolean"
-  // tslint:disable-next-line:no-construct
-  typeOf(new Boolean(true)); // $ExpectType "boolean"
-  typeOf(() => 4); // $ExpectType "function"
-  typeOf([1, 2, 90]); // $ExpectType "array"
-  typeOf(/abc/); // $ExpectType "regexp"
-  typeOf(new Date()); // $ExpectType "date"
-  typeOf(new FileList()); // $ExpectType "filelist"
-  // typeOf(EmberObject.extend());   // $ExpectType "class"
-  // typeOf(EmberObject.create());   // $ExpectType "instance"
-  typeOf(new Error('teamocil')); // $ExpectType "error"
-  typeOf({ justAPojo: true }); // $ExpectType "object"
+  expectTypeOf(typeOf(null)).toEqualTypeOf<'null'>();
+  expectTypeOf(typeOf(undefined)).toEqualTypeOf<'undefined'>();
+  expectTypeOf(typeOf('michael')).toEqualTypeOf<'string'>();
+  expectTypeOf(typeOf(new String('michael'))).toEqualTypeOf<'string'>();
+  expectTypeOf(typeOf(101)).toEqualTypeOf<'number'>();
+  expectTypeOf(typeOf(new Number(101))).toEqualTypeOf<'number'>();
+  expectTypeOf(typeOf(true)).toEqualTypeOf<'boolean'>();
+  expectTypeOf(typeOf(new Boolean(true))).toEqualTypeOf<'boolean'>();
+  expectTypeOf(typeOf(() => 4)).toEqualTypeOf<'function'>();
+  expectTypeOf(typeOf([1, 2, 90])).toEqualTypeOf<'array'>();
+  expectTypeOf(typeOf(/abc/)).toEqualTypeOf<'regexp'>();
+  expectTypeOf(typeOf(new Date())).toEqualTypeOf<'date'>();
+  expectTypeOf(typeOf(new FileList())).toEqualTypeOf<'filelist'>();
+  expectTypeOf(typeOf(EmberObject.extend())).toEqualTypeOf<'class'>();
+  expectTypeOf(typeOf(EmberObject.create())).toEqualTypeOf<'instance'>();
+  expectTypeOf(typeOf(new Error('teamocil'))).toEqualTypeOf<'error'>();
+  expectTypeOf(typeOf({ justAPojo: true })).toEqualTypeOf<'object'>();
 
   typeOf();
   typeOf(null);
   typeOf(undefined);
   typeOf('michael');
-  // tslint:disable-next-line:no-construct
   typeOf(new String('michael'));
   typeOf(101);
-  // tslint:disable-next-line:no-construct
   typeOf(new Number(101));
   typeOf(true);
-  // tslint:disable-next-line:no-construct
   typeOf(new Boolean(true));
   typeOf(() => 4);
   typeOf([1, 2, 90]);
@@ -101,12 +96,12 @@ import { compare, isBlank, isEmpty, isEqual, isNone, isPresent, typeOf } from '@
 
 (function () {
   /** compare */
-  compare('foo', 'bar'); // $ExpectType number
-  compare(14, 37); // $ExpectType number
-  compare(class {}, class {}); // $ExpectType number
-  compare([], class {}); // $ExpectType number
-  compare([], undefined); // $ExpectType number
-  compare({}, () => 4); // $ExpectType number
+  expectTypeOf(compare('foo', 'bar')).toBeNumber();
+  expectTypeOf(compare(14, 37)).toBeNumber();
+  expectTypeOf(compare(class {}, class {})).toBeNumber();
+  expectTypeOf(compare([], class {})).toBeNumber();
+  expectTypeOf(compare([], undefined)).toBeNumber();
+  expectTypeOf(compare({}, () => 4)).toBeNumber();
   // @ts-expect-error
   compare(14);
   // @ts-expect-error
diff --git a/types/preview/ember/test/application-instance.ts b/type-tests/preview/ember/application-instance.ts
similarity index 100%
rename from types/preview/ember/test/application-instance.ts
rename to type-tests/preview/ember/application-instance.ts
diff --git a/types/preview/ember/test/application.ts b/type-tests/preview/ember/application.ts
similarity index 100%
rename from types/preview/ember/test/application.ts
rename to type-tests/preview/ember/application.ts
diff --git a/types/preview/ember/test/array-proxy.ts b/type-tests/preview/ember/array-proxy.ts
similarity index 67%
rename from types/preview/ember/test/array-proxy.ts
rename to type-tests/preview/ember/array-proxy.ts
index 8099af3aa98..d88fe73fff8 100644
--- a/types/preview/ember/test/array-proxy.ts
+++ b/type-tests/preview/ember/array-proxy.ts
@@ -1,5 +1,6 @@
+import type Array from '@ember/array';
 import Ember from 'ember';
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 
 const pets = ['dog', 'cat', 'fish'];
 const proxy = Ember.ArrayProxy.create({ content: Ember.A(pets) });
@@ -10,8 +11,8 @@ proxy.get('firstObject'); // 'amoeba'
 
 const overridden = Ember.ArrayProxy.create({
   content: Ember.A(pets),
-  objectAtContent(this: Ember.ArrayProxy<string>, idx: number): string {
-    return this.get('content').objectAt(idx)!.toUpperCase();
+  objectAtContent(this: Ember.ArrayProxy<string>, idx: number): string | undefined {
+    return (this.get('content') as Array<string>).objectAt(idx)?.toUpperCase();
   },
 });
 
@@ -22,5 +23,5 @@ class MyNewProxy<T> extends Ember.ArrayProxy<T> {
 }
 
 const x = MyNewProxy.create({ content: Ember.A([1, 2, 3]) }) as MyNewProxy<number>;
-assertType<number | undefined>(x.get('firstObject'));
-assertType<boolean>(x.isNew);
+expectTypeOf(x.get('firstObject')).toEqualTypeOf<number | undefined>();
+expectTypeOf(x.isNew).toBeBoolean();
diff --git a/types/preview/ember/test/array.ts b/type-tests/preview/ember/array.ts
similarity index 84%
rename from types/preview/ember/test/array.ts
rename to type-tests/preview/ember/array.ts
index 5c1588211e2..b5db931246a 100755
--- a/types/preview/ember/test/array.ts
+++ b/type-tests/preview/ember/array.ts
@@ -34,8 +34,8 @@ expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatch
 expectTypeOf(people.get('[]')).toEqualTypeOf<typeof people>();
 expectTypeOf(people.get('[]').get('firstObject')).toEqualTypeOf<Person | undefined>();
 
-expectTypeOf(people.mapBy('isHappy')).toEqualTypeOf<boolean[]>();
-expectTypeOf(people.mapBy('name.length')).toEqualTypeOf<unknown[]>();
+expectTypeOf(people.mapBy('isHappy')).toEqualTypeOf<Ember.NativeArray<boolean>>();
+expectTypeOf(people.mapBy('name.length')).toEqualTypeOf<Ember.NativeArray<unknown>>();
 
 const last = people.get('lastObject');
 expectTypeOf(last).toEqualTypeOf<Person | undefined>();
@@ -49,12 +49,14 @@ if (first) {
 }
 
 const letters: Ember.Array<string> = Ember.A(['a', 'b', 'c']);
-const codes = letters.map((item, index, enumerable) => {
+const codes = letters.map((item, index, array) => {
   expectTypeOf(item).toBeString();
   expectTypeOf(index).toBeNumber();
+  expectTypeOf(array).toEqualTypeOf<Ember.Array<string>>();
   return item.charCodeAt(0);
 });
-expectTypeOf(codes).toEqualTypeOf<number[]>();
+expectTypeOf(codes).toMatchTypeOf<number[]>();
+expectTypeOf(codes).toEqualTypeOf<Ember.NativeArray<number>>();
 
 const value = '1,2,3';
 const filters = Ember.A(value.split(','));
diff --git a/types/preview/ember/test/component.ts b/type-tests/preview/ember/component.ts
similarity index 100%
rename from types/preview/ember/test/component.ts
rename to type-tests/preview/ember/component.ts
diff --git a/types/preview/ember/test/computed.ts b/type-tests/preview/ember/computed.ts
similarity index 100%
rename from types/preview/ember/test/computed.ts
rename to type-tests/preview/ember/computed.ts
diff --git a/types/preview/ember/test/controller.ts b/type-tests/preview/ember/controller.ts
similarity index 100%
rename from types/preview/ember/test/controller.ts
rename to type-tests/preview/ember/controller.ts
diff --git a/types/preview/ember/test/core-object.ts b/type-tests/preview/ember/core-object.ts
similarity index 55%
rename from types/preview/ember/test/core-object.ts
rename to type-tests/preview/ember/core-object.ts
index 3cc7862c645..98dfc21a3a1 100644
--- a/types/preview/ember/test/core-object.ts
+++ b/type-tests/preview/ember/core-object.ts
@@ -6,21 +6,17 @@ const { CoreObject } = Ember;
 /** Newable tests */
 const co1 = new CoreObject();
 
-// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// co1.concatenatedProperties; // $ExpectType string[]
-co1.isDestroyed; // $ExpectType boolean
-co1.isDestroying; // $ExpectType boolean
-co1.destroy(); // $ExpectType CoreObject
-co1.toString(); // $ExpectType string
+expectTypeOf(co1.isDestroyed).toBeBoolean();
+expectTypeOf(co1.isDestroying).toBeBoolean();
+expectTypeOf(co1.destroy()).toEqualTypeOf<Ember.CoreObject>();
+expectTypeOf(co1.toString()).toBeString();
 
 /** .create tests */
 const co2 = CoreObject.create();
-// TODO: Enable in TS 3.0  see: https://github.com/typed-ember/ember-cli-typescript/issues/291
-// co2.concatenatedProperties; // $ExpectType string[]
-co2.isDestroyed; // $ExpectType boolean
-co2.isDestroying; // $ExpectType boolean
-co2.destroy(); // $ExpectType CoreObject
-co2.toString(); // $ExpectType string
+expectTypeOf(co2.isDestroyed).toBeBoolean();
+expectTypeOf(co2.isDestroying).toBeBoolean();
+expectTypeOf(co2.destroy()).toEqualTypeOf<Ember.CoreObject>();
+expectTypeOf(co2.toString()).toBeString();
 
 /** .create tests w/ initial instance data passed in */
 declare class CO3 extends CoreObject {
@@ -29,8 +25,8 @@ declare class CO3 extends CoreObject {
 }
 const co3 = CO3.create({ foo: '123', bar: 456 });
 
-co3.foo; // $ExpectType string
-co3.bar; // $ExpectType number
+expectTypeOf(co3.foo).toBeString();
+expectTypeOf(co3.bar).toBeNumber();
 
 /** .extend with a zero-argument .create()  */
 class CO4 extends CO3 {
@@ -40,9 +36,9 @@ class CO4 extends CO3 {
 }
 const co4 = CO4.create();
 
-co4.foo; // $ExpectType string
-co4.bar; // $ExpectType number
-co4.baz; // $ExpectType () => [string, number]
+expectTypeOf(co4.foo).toBeString();
+expectTypeOf(co4.bar).toBeNumber();
+expectTypeOf(co4.baz).toEqualTypeOf<() => [string, number]>();
 
 /** .extend with inconsistent arguments passed into .create()  */
 class CO5 extends CoreObject {
diff --git a/types/preview/ember/test/create-negative.ts b/type-tests/preview/ember/create-negative.ts
similarity index 100%
rename from types/preview/ember/test/create-negative.ts
rename to type-tests/preview/ember/create-negative.ts
diff --git a/types/preview/ember/test/create.ts b/type-tests/preview/ember/create.ts
similarity index 100%
rename from types/preview/ember/test/create.ts
rename to type-tests/preview/ember/create.ts
diff --git a/type-tests/preview/ember/data-adapter.ts b/type-tests/preview/ember/data-adapter.ts
new file mode 100644
index 00000000000..2334803ccbb
--- /dev/null
+++ b/type-tests/preview/ember/data-adapter.ts
@@ -0,0 +1,62 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+const da = Ember.DataAdapter.create();
+
+const filters = da.getFilters();
+expectTypeOf(filters.includes({ name: 'foo', desc: 'bar' })).toBeBoolean();
+// @ts-expect-error
+filters.includes({});
+
+expectTypeOf(filters[0]?.name).toEqualTypeOf<string | undefined>();
+expectTypeOf(filters[0]?.desc).toEqualTypeOf<string | undefined>();
+
+expectTypeOf(
+  da.watchModelTypes(
+    function added(wrappedTypes) {
+      wrappedTypes;
+      expectTypeOf(wrappedTypes[0]?.release).toEqualTypeOf<(() => void) | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.columns[0]?.desc).toEqualTypeOf<string | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.columns[0]?.name).toEqualTypeOf<string | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.count).toEqualTypeOf<number | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.name).toEqualTypeOf<string | undefined>();
+    },
+    function updated(wrappedTypes) {
+      wrappedTypes;
+      expectTypeOf(wrappedTypes[0]?.release).toEqualTypeOf<(() => void) | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.columns[0]?.desc).toEqualTypeOf<string | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.columns[0]?.name).toEqualTypeOf<string | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.count).toEqualTypeOf<number | undefined>();
+      expectTypeOf(wrappedTypes[0]?.type.name).toEqualTypeOf<string | undefined>();
+    }
+  )
+).toEqualTypeOf<() => void>();
+// @ts-expect-error
+da.watchModelTypes(() => {});
+
+expectTypeOf(
+  da.watchRecords(
+    'house',
+    function added(records) {
+      expectTypeOf(records[0]?.object).toEqualTypeOf<object | undefined>();
+      expectTypeOf(records[0]?.columnValues).toEqualTypeOf<object | undefined>();
+    },
+    function updated(records) {
+      expectTypeOf(records[0]?.object).toEqualTypeOf<object | undefined>();
+      expectTypeOf(records[0]?.columnValues).toEqualTypeOf<object | undefined>();
+    },
+    function removed(idx, count) {
+      expectTypeOf(idx).toBeNumber();
+      expectTypeOf(count).toBeNumber();
+    }
+  )
+).toEqualTypeOf<() => void>();
+// @ts-expect-error
+da.watchRecords(() => {});
+
+expectTypeOf(da.acceptsModelName).toEqualTypeOf<boolean>();
+expectTypeOf(da.containerDebugAdapter).toEqualTypeOf<Ember.ContainerDebugAdapter>();
+
+const ca: Ember.ContainerDebugAdapter = da.containerDebugAdapter;
+expectTypeOf(ca.canCatalogEntriesByType('controller')).toEqualTypeOf<boolean>();
+expectTypeOf(ca.catalogEntriesByType('controller')).toEqualTypeOf<string[]>();
diff --git a/type-tests/preview/ember/debug.ts b/type-tests/preview/ember/debug.ts
new file mode 100644
index 00000000000..4c7f02ce410
--- /dev/null
+++ b/type-tests/preview/ember/debug.ts
@@ -0,0 +1,121 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+const {
+  runInDebug,
+  warn,
+  debug,
+  Debug: { registerDeprecationHandler, registerWarnHandler },
+} = Ember;
+
+// Workaround for https://github.com/microsoft/TypeScript/issues/36931.
+const assert: typeof Ember.assert = Ember.assert;
+
+/**
+ * @ember/debug tests
+ */
+// @ts-expect-error
+runInDebug();
+expectTypeOf(runInDebug(() => console.log('Should not show up in prod'))).toBeVoid();
+
+// Log a warning if we have more than 3 tomsters
+const tomsterCount = 2;
+// @ts-expect-error
+warn('Too many tomsters!');
+expectTypeOf(warn('Too many tomsters!', { id: 'some-warning' })).toBeVoid();
+// @ts-expect-error
+warn('Too many tomsters!', tomsterCount <= 3);
+expectTypeOf(warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' })).toBeVoid();
+expectTypeOf(
+  warn('Too many tomsters!', tomsterCount <= 3, {
+    id: 'ember-debug.too-many-tomsters',
+  })
+).toBeVoid();
+
+// @ts-expect-error
+debug();
+expectTypeOf(debug('Too many tomsters!')).toBeVoid();
+// @ts-expect-error
+debug('Too many tomsters!', 'foo');
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerWarnHandler();
+expectTypeOf(registerWarnHandler(() => {})).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toEqualTypeOf<string>();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    expectTypeOf(next).toEqualTypeOf<
+      (message: string, options?: { id: string } | undefined) => void
+    >();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toEqualTypeOf<string>();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    // @ts-expect-error
+    next();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toEqualTypeOf<string>();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    expectTypeOf(next(message)).toBeVoid();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerWarnHandler((message, options, next) => {
+    expectTypeOf(message).toEqualTypeOf<string>();
+    expectTypeOf(options).toEqualTypeOf<{ id: string } | undefined>();
+    expectTypeOf(next(message, options)).toBeVoid();
+  })
+).toBeVoid();
+
+// next is not called, so no warnings get the default behavior
+// @ts-expect-error
+registerDeprecationHandler();
+expectTypeOf(registerDeprecationHandler(() => {})).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    expectTypeOf(next).toEqualTypeOf<
+      (message: string, options?: { id: string; until: string } | undefined) => void
+    >();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    // @ts-expect-error
+    next();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    expectTypeOf(next(message)).toBeVoid();
+  })
+).toBeVoid();
+expectTypeOf(
+  registerDeprecationHandler((message, options, next) => {
+    expectTypeOf(message).toBeString();
+    expectTypeOf(options).toEqualTypeOf<{ id: string; until: string } | undefined>();
+    expectTypeOf(next(message, options)).toBeVoid();
+  })
+).toBeVoid();
+
+// Test for truthiness
+const str: unknown = 'hello';
+assert('Must pass a string', typeof str === 'string');
+expectTypeOf(str).toBeString();
+
+// Fail unconditionally
+// This has to be last because `assert never` will raise TS's checks for
+// unreachable code.
+expectTypeOf(assert('This code path should never be run')).toBeNever();
diff --git a/types/preview/ember/test/ember-module-tests.ts b/type-tests/preview/ember/ember-module-tests.ts
similarity index 57%
rename from types/preview/ember/test/ember-module-tests.ts
rename to type-tests/preview/ember/ember-module-tests.ts
index cc361b97a8b..fd01363e59a 100644
--- a/types/preview/ember/test/ember-module-tests.ts
+++ b/type-tests/preview/ember/ember-module-tests.ts
@@ -1,3 +1,5 @@
+import type Owner from '@ember/owner';
+import type { SafeString } from '@ember/template/-private/handlebars';
 import Ember from 'ember';
 import { expectTypeOf } from 'expect-type';
 
@@ -6,7 +8,7 @@ type Top = typeof top;
 declare function expectTypeNativeArrayTop(x: Ember.NativeArray<Top>): void;
 // A
 expectTypeNativeArrayTop(Ember.A());
-Ember.A([1, 2]); // $ExpectType NativeArray<number>
+expectTypeOf(Ember.A([1, 2])).toEqualTypeOf<Ember.NativeArray<number>>();
 // addListener
 Ember.addListener({ a: 'foo' }, 'event', {}, () => {});
 Ember.addListener({ a: 'foo' }, 'event', {}, 'a');
@@ -20,17 +22,17 @@ Ember.addObserver({ a: 'foo' }, 'a', {}, () => {});
 Ember.assert('2+2 should always be 4', 2 + 2 === 4);
 // assign
 const o1 = Ember.assign({ a: 1 }, { b: 2 });
-o1.a; // $ExpectType number
-o1.b; // $ExpectType number
+expectTypeOf(o1.a).toBeNumber();
+expectTypeOf(o1.b).toBeNumber();
 // @ts-expect-error
 o1.c;
 // Ember.bind // @ts-expect-error
 // cacheFor
-Ember.cacheFor({ a: 123 }, 'a'); // $ExpectType number | undefined
+expectTypeOf(Ember.cacheFor({ a: 123 }, 'a')).toEqualTypeOf<number | undefined>();
 // @ts-expect-error
 Ember.cacheFor({ a: 123 }, 'x');
 // compare
-Ember.compare('31', '114'); // $ExpectType number
+expectTypeOf(Ember.compare('31', '114')).toEqualTypeOf<number>();
 // debug
 Ember.debug('some info for developers');
 // deprecate
@@ -39,42 +41,44 @@ Ember.deprecate("you shouldn't use this anymore", 3 === 3, {
   until: '99.0.0',
 });
 // get
-Ember.get({ z: 23 }, 'z'); // $ExpectType number
-Ember.get({ z: 23 }, 'zz'); // $ExpectType unknown
+expectTypeOf(Ember.get({ z: 23 }, 'z')).toEqualTypeOf<number>();
+expectTypeOf(Ember.get({ z: 23 }, 'zz')).toEqualTypeOf<unknown>();
 // getEngineParent
-Ember.getEngineParent(new Ember.EngineInstance()); // $ExpectType EngineInstance
+expectTypeOf(
+  Ember.getEngineParent(new Ember.EngineInstance())
+).toEqualTypeOf<Ember.EngineInstance>();
 // getOwner
-Ember.getOwner(new Ember.Component()); // $ExpectType Owner
+expectTypeOf(Ember.getOwner(new Ember.Component())).toEqualTypeOf<Owner>();
 // getProperties
-Ember.getProperties({ z: 23 }, 'z').z; // $ExpectType number
-Ember.getProperties({ z: 23 }, 'z', 'z').z; // $ExpectType number
+expectTypeOf(Ember.getProperties({ z: 23 }, 'z').z).toEqualTypeOf<number>();
+expectTypeOf(Ember.getProperties({ z: 23 }, 'z', 'z').z).toEqualTypeOf<number>();
 // @ts-expect-error
 Ember.getProperties({ z: 23 }, 'z', 'a').z;
-Ember.getProperties({ z: 23 }, ['z', 'z']).z; // $ExpectType number
+expectTypeOf(Ember.getProperties({ z: 23 }, ['z', 'z']).z).toEqualTypeOf<number>();
 // @ts-expect-error
 Ember.getProperties({ z: 23 }, ['z', 'a']).z;
 
 // guidFor
-Ember.guidFor({}); // $ExpectType string
-Ember.guidFor(''); // $ExpectType string
+expectTypeOf(Ember.guidFor({})).toEqualTypeOf<string>();
+expectTypeOf(Ember.guidFor('')).toEqualTypeOf<string>();
 // isArray
-Ember.isArray(''); // $ExpectType boolean
-Ember.isArray([]); // $ExpectType boolean
+expectTypeOf(Ember.isArray('')).toEqualTypeOf<boolean>();
+expectTypeOf(Ember.isArray([])).toEqualTypeOf<boolean>();
 // isBlank
-Ember.isBlank(''); // $ExpectType boolean
-Ember.isBlank([]); // $ExpectType boolean
+expectTypeOf(Ember.isBlank('')).toEqualTypeOf<boolean>();
+expectTypeOf(Ember.isBlank([])).toEqualTypeOf<boolean>();
 // isEmpty
-Ember.isEmpty(''); // $ExpectType boolean
-Ember.isEmpty([]); // $ExpectType boolean
+expectTypeOf(Ember.isEmpty('')).toEqualTypeOf<boolean>();
+expectTypeOf(Ember.isEmpty([])).toEqualTypeOf<boolean>();
 // isEqual
-Ember.isEqual('', 'foo'); // $ExpectType boolean
-Ember.isEqual([], ''); // $ExpectType boolean
+expectTypeOf(Ember.isEqual('', 'foo')).toEqualTypeOf<boolean>();
+expectTypeOf(Ember.isEqual([], '')).toEqualTypeOf<boolean>();
 // isNone
-Ember.isNone(''); // $ExpectType boolean
-Ember.isNone([]); // $ExpectType boolean
+expectTypeOf(Ember.isNone('')).toEqualTypeOf<boolean>();
+expectTypeOf(Ember.isNone([])).toEqualTypeOf<boolean>();
 // isPresent
-Ember.isPresent(''); // $ExpectType boolean
-Ember.isPresent([]); // $ExpectType boolean
+expectTypeOf(Ember.isPresent('')).toEqualTypeOf<boolean>();
+expectTypeOf(Ember.isPresent([])).toEqualTypeOf<boolean>();
 // observer
 class O2 extends Ember.Object {
   name = 'foo';
@@ -108,26 +112,29 @@ Ember.runInDebug(() => {});
 // sendEvent
 expectTypeOf(Ember.sendEvent(o2, 'clicked', [1, 2])).toBeBoolean();
 // set
-Ember.set(O2.create(), 'name', 'bar'); // $ExpectType string
-Ember.set(O2.create(), 'age', 4); // $ExpectType number
+expectTypeOf(Ember.set(O2.create(), 'name', 'bar')).toEqualTypeOf<string>();
+expectTypeOf(Ember.set(O2.create(), 'age', 4)).toEqualTypeOf<number>();
 // @ts-expect-error
 Ember.set(O2.create(), 'nam', 'bar');
 // setOwner
 declare let app: Ember.ApplicationInstance;
 Ember.setOwner(O2.create(), app);
 // setProperties
-Ember.setProperties(O2.create(), { name: 'bar' }).name; // $ExpectType string
+expectTypeOf(Ember.setProperties(O2.create(), { name: 'bar' }).name).toEqualTypeOf<string>();
 // trySet
-Ember.trySet(O2, 'nam', ''); // $ExpectType any
+expectTypeOf(Ember.trySet(O2, 'nam', '')).toBeUnknown();
 // typeOf
-Ember.typeOf(''); // $ExpectType "string"
-Ember.typeOf(Ember.A()); // $ExpectType "array"
+expectTypeOf(Ember.typeOf('')).toEqualTypeOf<'string'>();
+// @ts-ignore -- this *should* work but the namespace version is not carrying
+// it through correctly. However, people can *and should* simply use the
+// module import instead!
+expectTypeOf(Ember.typeOf(Ember.A())).toEqualTypeOf<'array'>();
 // warn
 // @ts-expect-error
 Ember.warn('be caseful!');
 Ember.warn('be caseful!', { id: 'some-warning' });
 // VERSION
-Ember.VERSION; // $ExpectType string
+expectTypeOf(Ember.VERSION).toEqualTypeOf<string>();
 
 // onerror
 
@@ -140,18 +147,17 @@ Ember.onerror = undefined;
 // TODO ContainerProxyMixin
 // Ember
 // Ember.Application
-new Ember.Application(); // $ExpectType Application
-Ember.Application.create(); // $ExpectType Application
+expectTypeOf(new Ember.Application()).toEqualTypeOf<Ember.Application>();
+expectTypeOf(Ember.Application.create()).toEqualTypeOf<Ember.Application>();
 // Ember.ApplicationInstance
-new Ember.ApplicationInstance(); // $ExpectType ApplicationInstance
-Ember.ApplicationInstance.create(); // $ExpectType ApplicationInstance
-// TODO: Ember.ApplicationInstance.BootOptions
+expectTypeOf(new Ember.ApplicationInstance()).toEqualTypeOf<Ember.ApplicationInstance>();
+expectTypeOf(Ember.ApplicationInstance.create()).toEqualTypeOf<Ember.ApplicationInstance>();
 // Ember.Array
-const a1: Ember.Array<string> = [];
+const a1: Ember.Array<string> = Ember.A([]);
 // @ts-expect-error
 const a2: Ember.Array<string> = {};
 // Ember.ArrayProxy
-new Ember.ArrayProxy<number>([3, 3, 2]); // $ExpectType ArrayProxy<number>
+expectTypeOf(new Ember.ArrayProxy<number>([3, 3, 2])).toEqualTypeOf<Ember.ArrayProxy<number>>();
 // Ember.Component
 const C1 = Ember.Component.extend({ classNames: ['foo'] });
 class C2 extends Ember.Component {
@@ -178,13 +184,13 @@ class Foo {
 }
 
 // Ember.ContainerDebugAdapter
-const cda = new Ember.ContainerDebugAdapter(); // $ExpectType ContainerDebugAdapter
+expectTypeOf(new Ember.ContainerDebugAdapter()).toEqualTypeOf<Ember.ContainerDebugAdapter>();
 // Ember.Controller
-const con = new Ember.Controller(); // $ExpectType Controller
+expectTypeOf(new Ember.Controller()).toEqualTypeOf<Ember.Controller>();
 // Ember.CoreObject
-const co = new Ember.CoreObject(); // $ExpectType CoreObject
+expectTypeOf(new Ember.CoreObject()).toEqualTypeOf<Ember.CoreObject>();
 // Ember.DataAdapter
-const da = new Ember.DataAdapter(); // $ExpectType DataAdapter
+expectTypeOf(new Ember.DataAdapter()).toEqualTypeOf<Ember.DataAdapter>();
 // Ember.Debug
 Ember.Debug.registerDeprecationHandler(() => {});
 Ember.Debug.registerWarnHandler(() => {});
@@ -204,7 +210,8 @@ oe1.trigger('foo');
 oe1.on('bar', () => {});
 oe1.on('bar', { foo() {} }, () => {});
 // Ember.HashLocation
-const hl = new Ember.HashLocation(); // $ExpectType HashLocation
+const hl = new Ember.HashLocation();
+expectTypeOf(hl).toEqualTypeOf<Ember.HashLocation>();
 // Ember.Helper
 class H1 extends Ember.Helper {
   compute() {
@@ -225,41 +232,41 @@ class UsesMixin extends Ember.Object {
   }
 }
 // Ember.MutableArray
-const ma1: Ember.MutableArray<string> = ['money', 'in', 'the', 'bananna', 'stand'];
-ma1.addObject('!'); // $ExpectType string
+const ma1: Ember.MutableArray<string> = Ember.A(['money', 'in', 'the', 'bananna', 'stand']);
+expectTypeOf(ma1.addObject('!')).toBeString();
 // @ts-expect-error
 ma1.filterBy('');
-ma1.firstObject; // $ExpectType string | undefined
-ma1.lastObject; // $ExpectType string | undefined
-const ma2: Ember.MutableArray<{ name: string }> = [
+expectTypeOf(ma1.firstObject).toEqualTypeOf<string | undefined>();
+expectTypeOf(ma1.lastObject).toEqualTypeOf<string | undefined>();
+const ma2: Ember.MutableArray<{ name: string }> = Ember.A([
   { name: 'chris' },
   { name: 'dan' },
   { name: 'james' },
-];
-ma2.filterBy('name', 'chris'); // $ExpectType NativeArray<{ name: string; }>
+]);
+expectTypeOf(ma2.filterBy('name', 'chris')).toEqualTypeOf<Ember.NativeArray<{ name: string }>>();
 // Ember.MutableEnumerable
-const me1: Ember.MutableEnumerable<string | null | undefined> = ['foo', undefined, null];
-me1.compact(); // $ExpectType NativeArray<string>
+const me1 = Ember.A(['foo', undefined, null]);
+expectTypeOf(me1.compact()).toEqualTypeOf<Ember.NativeArray<string>>();
 // Ember.Namespace
 const myNs = Ember.Namespace.extend({});
 // Ember.NativeArray
 const na: Ember.NativeArray<number> = Ember.A([2, 3, 4]);
-na; // $ExpectType NativeArray<number>
-na.clear(); // $ExpectType NativeArray<number>
+expectTypeOf(na).toEqualTypeOf<Ember.NativeArray<number>>();
+expectTypeOf(na.clear()).toEqualTypeOf<Ember.NativeArray<number>>();
 // Ember.NoneLocation
-new Ember.NoneLocation(); // $ExpectType NoneLocation
+expectTypeOf(new Ember.NoneLocation()).toEqualTypeOf<Ember.NoneLocation>();
 // Ember.Object
 new Ember.Object();
 // Ember.ObjectProxy
-new Ember.ObjectProxy(); // $ExpectType ObjectProxy
+expectTypeOf(new Ember.ObjectProxy()).toEqualTypeOf<Ember.ObjectProxy>();
 // Ember.Observable
 Ember.Object.extend(Ember.Observable, {});
 // Ember.PromiseProxyMixin
 interface PPM<T> extends Ember.PromiseProxyMixin<T> {}
 class PPM<T> extends Ember.Object.extend(Ember.PromiseProxyMixin) {
   foo() {
-    this.reason; // $ExpectType unknown
-    this.isPending; // $ExpectType boolean
+    expectTypeOf(this.reason).toEqualTypeOf<unknown>();
+    expectTypeOf(this.isPending).toEqualTypeOf<boolean>();
   }
 }
 // Ember.Route
@@ -280,11 +287,11 @@ Ember.Helper.helper(([a, b]: [number, number]) => a + b);
 // Ember.String
 Ember.String;
 // htmlSafe
-Ember.String.htmlSafe('foo'); // $ExpectType SafeString
+expectTypeOf(Ember.String.htmlSafe('foo')).toEqualTypeOf<SafeString>();
 // isHTMLSafe
-Ember.String.isHTMLSafe('foo'); // $ExpectType boolean
+expectTypeOf(Ember.String.isHTMLSafe('foo')).toEqualTypeOf<boolean>();
 // Ember.Test
-Ember.Test.checkWaiters(); // $ExpectType boolean
+expectTypeOf(Ember.Test.checkWaiters()).toEqualTypeOf<boolean>();
 // checkWaiters
 
 /**
diff --git a/types/preview/ember/test/ember-tests.ts b/type-tests/preview/ember/ember-tests.ts
similarity index 87%
rename from types/preview/ember/test/ember-tests.ts
rename to type-tests/preview/ember/ember-tests.ts
index e59a3436191..18bfa6cccc7 100755
--- a/types/preview/ember/test/ember-tests.ts
+++ b/type-tests/preview/ember/ember-tests.ts
@@ -1,6 +1,8 @@
+import { A } from '@ember/array';
+import type { SafeString } from '@ember/template/-private/handlebars';
 import Ember from 'ember';
-import { AnyFn } from 'ember/-private/type-utils';
-import { assertType } from './lib/assert';
+import type { AnyFn } from 'ember/-private/type-utils';
+import { expectTypeOf } from 'expect-type';
 
 class President extends Ember.Object {
   name = 'Barack Obama';
@@ -65,7 +67,7 @@ class Todo extends Ember.Object {
 }
 
 class TodosController extends Ember.Object {
-  todos = [Todo.create()];
+  todos = A([Todo.create()]);
 
   @Ember.computed('todos.@each.isDone')
   get remaining() {
@@ -116,9 +118,9 @@ type Arr = Ember.NativeArray<
   }
 >;
 const arr: Arr = Ember.A([Ember.Object.create(), Ember.Object.create()]);
-arr.setEach('name', 'unknown'); // $ExpectType void
-arr.setEach('name', undefined); // $ExpectType void
-arr.getEach('name'); // $ExpectType (string | undefined)[]
+expectTypeOf(arr.setEach('name', 'unknown')).toEqualTypeOf<void>();
+expectTypeOf(arr.setEach('name', undefined)).toEqualTypeOf<void>();
+expectTypeOf(arr.getEach('name')).toEqualTypeOf<Ember.NativeArray<string | undefined>>();
 // @ts-expect-error
 arr.setEach('age', 123);
 // @ts-expect-error
@@ -156,7 +158,7 @@ const promise = new Ember.RSVP.Promise<string>((resolve: AnyFn, reject: AnyFn) =
 promise.then(
   (value) => {
     // on fulfillment
-    assertType<string>(value);
+    expectTypeOf(value).toBeString();
   },
   (reason: unknown) => {
     // on rejection
@@ -180,4 +182,4 @@ const component1 = Ember.Component.extend(mix1, mix2, {
 });
 
 // make sure htmlSafe returns a SafeString
-Ember.String.htmlSafe('hello'); // $ExpectType SafeString
+expectTypeOf(Ember.String.htmlSafe('hello')).toEqualTypeOf<SafeString>();
diff --git a/types/preview/ember/test/engine-instance.ts b/type-tests/preview/ember/engine-instance.ts
similarity index 100%
rename from types/preview/ember/test/engine-instance.ts
rename to type-tests/preview/ember/engine-instance.ts
diff --git a/types/preview/ember/test/engine.ts b/type-tests/preview/ember/engine.ts
similarity index 100%
rename from types/preview/ember/test/engine.ts
rename to type-tests/preview/ember/engine.ts
diff --git a/type-tests/preview/ember/error.ts b/type-tests/preview/ember/error.ts
new file mode 100644
index 00000000000..b87de9ddddd
--- /dev/null
+++ b/type-tests/preview/ember/error.ts
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+// uhhh, yeah.
+expectTypeOf(Ember.Error).toEqualTypeOf<typeof Ember.Error>();
diff --git a/types/preview/ember/test/event.ts b/type-tests/preview/ember/event.ts
similarity index 100%
rename from types/preview/ember/test/event.ts
rename to type-tests/preview/ember/event.ts
diff --git a/types/preview/ember/test/extend.ts b/type-tests/preview/ember/extend.ts
similarity index 100%
rename from types/preview/ember/test/extend.ts
rename to type-tests/preview/ember/extend.ts
diff --git a/types/preview/ember/test/helper.ts b/type-tests/preview/ember/helper.ts
similarity index 100%
rename from types/preview/ember/test/helper.ts
rename to type-tests/preview/ember/helper.ts
diff --git a/types/preview/ember/test/inject.ts b/type-tests/preview/ember/inject.ts
similarity index 96%
rename from types/preview/ember/test/inject.ts
rename to type-tests/preview/ember/inject.ts
index 34858b5ef20..42df94317e7 100755
--- a/types/preview/ember/test/inject.ts
+++ b/type-tests/preview/ember/inject.ts
@@ -43,7 +43,6 @@ class LoginRoute extends Ember.Route {
 }
 
 // New module injection style.
-import { assertType } from './lib/assert';
 import RouterService from '@ember/routing/router-service';
 import Controller from '@ember/controller';
 
@@ -66,7 +65,7 @@ class ComponentInjection extends Ember.Component {
     const url = this.router.urlFor('some-route', 1, 2, 3, {
       queryParams: { seriously: 'yes' },
     });
-    assertType<string>(url);
+    expectTypeOf(url).toBeString();
     if (!this.get('auth').isAuthenticated) {
       this.get('applicationController').transitionToLogin();
     }
diff --git a/types/preview/ember/test/mixin.ts b/type-tests/preview/ember/mixin.ts
similarity index 84%
rename from types/preview/ember/test/mixin.ts
rename to type-tests/preview/ember/mixin.ts
index 1fb85c78d9d..55176a725ce 100755
--- a/types/preview/ember/test/mixin.ts
+++ b/type-tests/preview/ember/mixin.ts
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
+import { expectTypeOf } from 'expect-type';
 
 interface EditableMixin extends Ember.Mixin {
   edit(): void;
@@ -37,8 +37,8 @@ const comment = EditableComment.create({
 comment.edit();
 comment.canEdit();
 comment.tryEdit();
-assertType<boolean>(comment.isEditing);
-assertType<number>(comment.postId);
+expectTypeOf(comment.isEditing).toBeBoolean();
+expectTypeOf(comment.postId).toBeNumber();
 
 // We do not expect this to update the type; we do expect it to minimally check
 const LiteralMixins = Ember.Object.extend({ a: 1 }, { b: 2 }, { c: 3 });
@@ -62,5 +62,5 @@ interface EditableAndCancelableComment extends EditableAndCancelableMixin {}
 class EditableAndCancelableComment extends Ember.Route.extend(EditableAndCancelableMixin) {}
 
 const editableAndCancelable = EditableAndCancelableComment.create();
-assertType<boolean>(editableAndCancelable.isEditing);
-assertType<boolean>(editableAndCancelable.cancelled);
+expectTypeOf(editableAndCancelable.isEditing).toBeBoolean();
+expectTypeOf(editableAndCancelable.cancelled).toBeBoolean();
diff --git a/types/preview/ember/test/object.ts b/type-tests/preview/ember/object.ts
similarity index 87%
rename from types/preview/ember/test/object.ts
rename to type-tests/preview/ember/object.ts
index e3f4a6cfaec..ada59c9eff4 100755
--- a/types/preview/ember/test/object.ts
+++ b/type-tests/preview/ember/object.ts
@@ -40,12 +40,10 @@ class Foo extends Ember.Object {
   b = 5;
 
   baz() {
-    const y = this.b; // $ExpectType number
-    const z = this.a; // $ExpectType ComputedProperty<string, string>
     this.b = 10;
-    this.get('b').toFixed(4); // $ExpectType string
-    this.set('a', 'abc').split(','); // $ExpectType string[]
-    this.set('b', 10).toFixed(4); // $ExpectType string
+    expectTypeOf(this.get('b').toFixed(4)).toEqualTypeOf<string>();
+    expectTypeOf(this.set('a', 'abc').split(',')).toEqualTypeOf<string[]>();
+    expectTypeOf(this.set('b', 10).toFixed(4)).toEqualTypeOf<string>();
 
     this.setProperties({ b: 11 });
     // this.setProperties({ b: '11' }); // @ts-expect-error
diff --git a/types/preview/ember/test/observable.ts b/type-tests/preview/ember/observable.ts
similarity index 59%
rename from types/preview/ember/test/observable.ts
rename to type-tests/preview/ember/observable.ts
index c2371d8f789..013bf77e61b 100755
--- a/types/preview/ember/test/observable.ts
+++ b/type-tests/preview/ember/observable.ts
@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import { assertType } from './lib/assert';
 import { expectTypeOf } from 'expect-type';
 
 class MyComponent extends Ember.Component {
@@ -66,43 +65,61 @@ function testGet() {
 }
 
 function testGetProperties() {
-  assertType<{ name: string }>(Ember.getProperties(person, 'name'));
-  assertType<{ name: string; age: number }>(Ember.getProperties(person, 'name', 'age'));
-  assertType<{ name: string; age: number }>(Ember.getProperties(person, ['name', 'age']));
-  assertType<{ name: string; age: number; capitalized: string }>(
-    Ember.getProperties(person, 'name', 'age', 'capitalized')
-  );
-  assertType<{ name: string }>(person.getProperties('name'));
-  assertType<{ name: string; age: number }>(person.getProperties('name', 'age'));
-  assertType<{ name: string; age: number }>(person.getProperties(['name', 'age']));
-  assertType<{ name: string; age: number; capitalized: string }>(
-    person.getProperties('name', 'age', 'capitalized')
-  );
-  assertType<{ name: string; age: number }>(Ember.getProperties(pojo, 'name', 'age'));
+  expectTypeOf(Ember.getProperties(person, 'name')).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(Ember.getProperties(person, 'name', 'age')).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(Ember.getProperties(person, ['name', 'age'])).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(Ember.getProperties(person, 'name', 'age', 'capitalized')).toEqualTypeOf<
+    Pick<Person, 'name' | 'age' | 'capitalized'>
+  >();
+  expectTypeOf(person.getProperties('name')).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(person.getProperties('name', 'age')).toEqualTypeOf<{ name: string; age: number }>();
+  expectTypeOf(person.getProperties(['name', 'age'])).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(person.getProperties('name', 'age', 'capitalized')).toEqualTypeOf<
+    Pick<Person, 'name' | 'age' | 'capitalized'>
+  >();
+  expectTypeOf(Ember.getProperties(pojo, 'name', 'age')).toEqualTypeOf<
+    Pick<typeof pojo, 'name' | 'age'>
+  >();
 }
 
 function testSet() {
-  assertType<string>(Ember.set(person, 'name', 'Joe'));
-  assertType<number>(Ember.set(person, 'age', 35));
-  assertType<string>(Ember.set(person, 'capitalized', 'JOE'));
-  assertType<string>(person.set('name', 'Joe'));
-  assertType<number>(person.set('age', 35));
-  assertType<string>(person.set('capitalized', 'JOE'));
-  assertType<string>(Ember.set(pojo, 'name', 'Joe'));
+  expectTypeOf(Ember.set(person, 'name', 'Joe')).toBeString();
+  expectTypeOf(Ember.set(person, 'age', 35)).toBeNumber();
+  expectTypeOf(Ember.set(person, 'capitalized', 'JOE')).toBeString();
+  expectTypeOf(person.set('name', 'Joe')).toBeString();
+  expectTypeOf(person.set('age', 35)).toBeNumber();
+  expectTypeOf(person.set('capitalized', 'JOE')).toBeString();
+  expectTypeOf(Ember.set(pojo, 'name', 'Joe')).toBeString();
 }
 
 function testSetProperties() {
-  assertType<{ name: string }>(Ember.setProperties(person, { name: 'Joe' }));
-  assertType<{ name: string; age: number }>(Ember.setProperties(person, { name: 'Joe', age: 35 }));
-  assertType<{ name: string; capitalized: string }>(
-    Ember.setProperties(person, { name: 'Joe', capitalized: 'JOE' })
-  );
-  assertType<{ name: string }>(person.setProperties({ name: 'Joe' }));
-  assertType<{ name: string; age: number }>(person.setProperties({ name: 'Joe', age: 35 }));
-  assertType<{ name: string; capitalized: string }>(
-    person.setProperties({ name: 'Joe', capitalized: 'JOE' })
-  );
-  assertType<{ name: string; age: number }>(Ember.setProperties(pojo, { name: 'Joe', age: 35 }));
+  expectTypeOf(Ember.setProperties(person, { name: 'Joe' })).toEqualTypeOf<{ name: string }>();
+  expectTypeOf(Ember.setProperties(person, { name: 'Joe', age: 35 })).toEqualTypeOf<{
+    name: string;
+    age: number;
+  }>();
+  expectTypeOf(Ember.setProperties(person, { name: 'Joe', capitalized: 'JOE' })).toEqualTypeOf<
+    Pick<Person, 'name' | 'capitalized'>
+  >();
+  expectTypeOf(person.setProperties({ name: 'Joe' })).toEqualTypeOf<Pick<Person, 'name'>>();
+  expectTypeOf(person.setProperties({ name: 'Joe', age: 35 })).toEqualTypeOf<
+    Pick<Person, 'name' | 'age'>
+  >();
+  expectTypeOf(person.setProperties({ name: 'Joe', capitalized: 'JOE' })).toEqualTypeOf<
+    Pick<Person, 'name' | 'capitalized'>
+  >();
+  expectTypeOf(Ember.setProperties(pojo, { name: 'Joe', age: 35 })).toEqualTypeOf<
+    Pick<typeof pojo, 'name' | 'age'>
+  >();
 }
 
 function testDynamic() {
diff --git a/type-tests/preview/ember/private/computed-tests.ts b/type-tests/preview/ember/private/computed-tests.ts
new file mode 100644
index 00000000000..7a5448faa93
--- /dev/null
+++ b/type-tests/preview/ember/private/computed-tests.ts
@@ -0,0 +1,26 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+class Example1 extends Ember.Object {
+  firstName = '';
+  lastName = '';
+
+  @Ember.computed('fullName')
+  get allNames() {
+    return [this.fullName];
+  }
+
+  @Ember.computed('firstName', 'lastName')
+  get fullName() {
+    return `${this.firstName} ${this.lastName}`;
+  }
+}
+
+class Example2 extends Example1 {
+  foo() {
+    expectTypeOf(this.get('fullName').split(',')).toEqualTypeOf<string[]>();
+    expectTypeOf(this.get('allNames')[0]).toEqualTypeOf<string | undefined>();
+    expectTypeOf(this.get('firstName').split(',')).toEqualTypeOf<string[]>();
+    expectTypeOf(this.get('lastName').split(',')).toEqualTypeOf<string[]>();
+  }
+}
diff --git a/types/preview/ember/test/private/observable-tests.ts b/type-tests/preview/ember/private/observable-tests.ts
similarity index 73%
rename from types/preview/ember/test/private/observable-tests.ts
rename to type-tests/preview/ember/private/observable-tests.ts
index 7e48fd3f785..abc323ed238 100644
--- a/types/preview/ember/test/private/observable-tests.ts
+++ b/type-tests/preview/ember/private/observable-tests.ts
@@ -1,8 +1,7 @@
-// tslint-disable-next-line
-import { assertType } from '../lib/assert';
 import Ember from 'ember';
 import { ExtractPropertyNamesOfType } from '@ember/object/-private/types';
 import Observable from '@ember/object/observable';
+import { expectTypeOf } from 'expect-type';
 
 class OtherThing {
   observerOfDemo(target: DemoObservable, key: string) {}
@@ -43,10 +42,18 @@ class DemoObservable implements Observable {
     };
     this.addObserver('foo', lambda);
     this.addObserver('foo', (sender, key, value, rev) => {
-      assertType<DemoObservable>(sender);
-      assertType<'foo'>(key);
-      assertType<string>(value);
-      assertType<number>(rev);
+      // cannot check type equality with `this`, can only check assignability
+      let self = this;
+      self = sender;
+      sender = this;
+
+      expectTypeOf(key).toEqualTypeOf<'foo'>();
+      expectTypeOf(rev).toBeNumber();
+
+      // same issue with assignability and `this` types since `value` derives
+      // from `this['foo']`
+      this.foo = value;
+      value = this.foo;
     });
     this.removeObserver('foo', lambda);
     Ember.addObserver(this, 'foo', lambda);
@@ -76,6 +83,7 @@ class DemoObservable implements Observable {
   get<K extends keyof this>(key: K): this[K] {
     throw new Error('Method not implemented.');
   }
+  getProperties(): {};
   getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
   getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
   getProperties(...rest: any[]): any {
@@ -142,32 +150,32 @@ const o = new DemoObservable();
 /**
  * get
  */
-assertType<string>(o.get('foo')); // $ExpectType string
-assertType<[boolean, boolean]>(o.get('bar')); // $ExpectType [boolean, boolean]
-assertType<number | undefined>(o.get('baz')); // $ExpectType number | undefined
+expectTypeOf(o.get('foo')).toBeString();
+expectTypeOf(o.get('bar')).toEqualTypeOf<[boolean, boolean]>();
+expectTypeOf(o.get('baz')).toEqualTypeOf<number | undefined>();
 
 /**
  * incrementProperty, decrementProperty
  */
-assertType<number>(o.incrementProperty('baz')); // $ExpectType number
-assertType<number>(o.decrementProperty('baz')); // $ExpectType number
-assertType<number>(o.incrementProperty('baz', 3)); // $ExpectType number
-assertType<number>(o.decrementProperty('baz', 12)); // $ExpectType number
+expectTypeOf(o.incrementProperty('baz')).toBeNumber();
+expectTypeOf(o.decrementProperty('baz')).toBeNumber();
+expectTypeOf(o.incrementProperty('baz', 3)).toBeNumber();
+expectTypeOf(o.decrementProperty('baz', 12)).toBeNumber();
 // non-numeric property case
 // @ts-expect-error
-assertType<number>(o.incrementProperty('bar'));
+o.incrementProperty('bar');
 // @ts-expect-error
-assertType<number>(o.decrementProperty('bar'));
+o.decrementProperty('bar');
 // empty case
 // @ts-expect-error
-assertType<number>(o.incrementProperty());
+o.incrementProperty();
 // @ts-expect-error
-assertType<number>(o.decrementProperty());
+o.decrementProperty();
 
 /**
  * toggleProperty
  */
-o.toggleProperty('isFoo'); // $ExpectType boolean
+expectTypeOf(o.toggleProperty('isFoo')).toBeBoolean();
 // @ts-expect-error
 o.toggleProperty();
 
@@ -175,12 +183,18 @@ o.toggleProperty();
  * getProperties
  */
 // ('foo', 'bar')
-assertType<{ foo: string; bar: [boolean, boolean] }>(o.getProperties('foo', 'bar')); // $ExpectType { foo: string; bar: [boolean, boolean]; }
+expectTypeOf(o.getProperties('foo', 'bar')).toEqualTypeOf<{
+  foo: string;
+  bar: [boolean, boolean];
+}>();
 // ['foo', 'bar']
-assertType<{ foo: string; bar: [boolean, boolean] }>(o.getProperties(['foo', 'bar'])); // $ExpectType { foo: string; bar: [boolean, boolean]; }
+expectTypeOf(o.getProperties(['foo', 'bar'])).toEqualTypeOf<{
+  foo: string;
+  bar: [boolean, boolean];
+}>();
 // empty cases
-assertType<{}>(o.getProperties()); // $ExpectType {}
-assertType<{}>(o.getProperties([])); // $ExpectType {}
+expectTypeOf(o.getProperties()).toEqualTypeOf<{}>();
+expectTypeOf(o.getProperties([])).toEqualTypeOf<{}>();
 // property that doesn't exist
 // @ts-expect-error
 o.getProperties('jeanShorts', 'foo');
@@ -190,10 +204,10 @@ o.getProperties(['foo', 'jeanShorts']);
 /**
  * set
  */
-assertType<string>(o.set('foo', 'abc')); // $ExpectType string
-assertType<[boolean, boolean]>(o.set('bar', [false, false])); // $ExpectType [boolean, boolean]
-assertType<number | undefined>(o.set('baz', undefined)); // $ExpectType number | undefined
-assertType<number | undefined>(o.set('baz', 10)); // $ExpectType number | undefined
+expectTypeOf(o.set('foo', 'abc')).toBeString();
+expectTypeOf(o.set('bar', [false, false])).toEqualTypeOf<[boolean, boolean]>();
+expectTypeOf(o.set('baz', undefined)).toEqualTypeOf<number | undefined>();
+expectTypeOf(o.set('baz', 10)).toEqualTypeOf<number | undefined>();
 // property that doesn't exist
 // @ts-expect-error
 o.set('jeanShorts', 10);
@@ -201,11 +215,12 @@ o.set('jeanShorts', 10);
 /**
  * setProperties
  */
-assertType<{ foo: string; bar: [boolean, boolean] }>(
-  o.setProperties({ foo: 'abc', bar: [true, true] })
-); // $ExpectType { foo: string; bar: [boolean, boolean]; }
+expectTypeOf(o.setProperties({ foo: 'abc', bar: [true, true] })).toEqualTypeOf<{
+  foo: string;
+  bar: [boolean, boolean];
+}>();
 // empty case
-assertType<{}>(o.setProperties({})); // $ExpectType {}
+expectTypeOf(o.setProperties({})).toEqualTypeOf<{}>();
 // property that doesn't exist
 // @ts-expect-error
 o.setProperties({ jeanShorts: 'under the pants' });
@@ -213,6 +228,5 @@ o.setProperties({ jeanShorts: 'under the pants' });
 /**
  * notifyPropertyChange
  */
-assertType<DemoObservable>(o.notifyPropertyChange('foo')); // $ExpectType DemoObservable
-// @ts-expect-error
-assertType<Observable>(o.notifyPropertyChange('jeanShorts'));
+expectTypeOf(o.notifyPropertyChange('foo')).toEqualTypeOf<DemoObservable>();
+expectTypeOf(o.notifyPropertyChange('jeanShorts')).not.toMatchTypeOf<Observable>();
diff --git a/types/preview/ember/test/reopen.ts b/type-tests/preview/ember/reopen.ts
similarity index 100%
rename from types/preview/ember/test/reopen.ts
rename to type-tests/preview/ember/reopen.ts
diff --git a/types/preview/ember/test/route.ts b/type-tests/preview/ember/route.ts
similarity index 100%
rename from types/preview/ember/test/route.ts
rename to type-tests/preview/ember/route.ts
diff --git a/types/preview/ember/test/router.ts b/type-tests/preview/ember/router.ts
similarity index 100%
rename from types/preview/ember/test/router.ts
rename to type-tests/preview/ember/router.ts
diff --git a/types/preview/ember/test/run.ts b/type-tests/preview/ember/run.ts
similarity index 100%
rename from types/preview/ember/test/run.ts
rename to type-tests/preview/ember/run.ts
diff --git a/types/preview/ember/test/string.ts b/type-tests/preview/ember/string.ts
similarity index 50%
rename from types/preview/ember/test/string.ts
rename to type-tests/preview/ember/string.ts
index d494d78a94e..5770a3a469a 100644
--- a/types/preview/ember/test/string.ts
+++ b/type-tests/preview/ember/string.ts
@@ -1,52 +1,52 @@
 import Ember from 'ember';
 import { SafeString } from '@ember/template/-private/handlebars';
+import { expectTypeOf } from 'expect-type';
 
 const { dasherize, camelize, capitalize, classify, decamelize, htmlSafe, underscore, w } =
   Ember.String;
 
 // @ts-expect-error
 dasherize();
-dasherize('blue man group'); // $ExpectType string
+expectTypeOf(dasherize('blue man group')).toEqualTypeOf<string>();
 // @ts-expect-error
 dasherize('', '');
 
 // @ts-expect-error
 camelize();
-camelize('blue man group'); // $ExpectType string
+expectTypeOf(camelize('blue man group')).toEqualTypeOf<string>();
 // @ts-expect-error
 camelize('', '');
 
 // @ts-expect-error
 decamelize();
-decamelize('blue man group'); // $ExpectType string
+expectTypeOf(decamelize('blue man group')).toEqualTypeOf<string>();
 // @ts-expect-error
 decamelize('', '');
 
 // @ts-expect-error
 underscore();
-underscore('blue man group'); // $ExpectType string
+expectTypeOf(underscore('blue man group')).toEqualTypeOf<string>();
 // @ts-expect-error
 underscore('', '');
 
 // @ts-expect-error
 w();
-w('blue man group'); // $ExpectType string[]
+expectTypeOf(w('blue man group')).toEqualTypeOf<string[]>();
 // @ts-expect-error
 w('', '');
 
 // @ts-expect-error
 classify();
-classify('blue man group'); // $ExpectType string
+expectTypeOf(classify('blue man group')).toEqualTypeOf<string>();
 // @ts-expect-error
 classify('', '');
 
 // @ts-expect-error
 capitalize();
-capitalize('blue man group'); // $ExpectType string
+expectTypeOf(capitalize('blue man group')).toEqualTypeOf<string>();
 // @ts-expect-error
 capitalize('', '');
 
-const handlebarsSafeString: SafeString = Ember.String.htmlSafe('lorem ipsum...');
-Ember.String.htmlSafe('lorem ipsum...'); // $ExpectType SafeString
-// @ts-expect-error
-const regularString: string = Ember.String.htmlSafe('lorem ipsum...');
+const handlebarsSafeString = htmlSafe('lorem ipsum...');
+expectTypeOf(handlebarsSafeString).toEqualTypeOf<SafeString>();
+expectTypeOf(handlebarsSafeString).not.toEqualTypeOf<string>();
diff --git a/types/preview/ember/test/techniques/properties-from-this.ts b/type-tests/preview/ember/techniques/properties-from-this.ts
similarity index 74%
rename from types/preview/ember/test/techniques/properties-from-this.ts
rename to type-tests/preview/ember/techniques/properties-from-this.ts
index 7dc3e618f67..1c3b78a9f83 100644
--- a/types/preview/ember/test/techniques/properties-from-this.ts
+++ b/type-tests/preview/ember/techniques/properties-from-this.ts
@@ -4,6 +4,8 @@
  * that serves to implement a lot of Ember.CoreObject's functionality
  */
 
+import { expectTypeOf } from 'expect-type';
+
 class BoxedProperty<Get, Set = Get> {
   private declare [GetType]: Get;
   private declare [SetType]: Set;
@@ -44,28 +46,28 @@ class Foo123 extends GetAndSet {
 
 let f = new Foo123();
 
-f.get('a'); // $ExpectType number
+expectTypeOf(f.get('a')).toEqualTypeOf<number>();
 // @ts-expect-error
 f.set('a');
 // @ts-expect-error
 f.set('a', '1');
-f.set('a', 1); // $ExpectType number
+expectTypeOf(f.set('a', 1)).toEqualTypeOf<number>();
 
-f.get('b'); // $ExpectType [boolean, boolean]
+expectTypeOf(f.get('b')).toEqualTypeOf<[boolean, boolean]>();
 // @ts-expect-error
 f.set('b', 1);
 // @ts-expect-error
 f.set('b', []);
 // @ts-expect-error
 f.set('b', [true]);
-f.set('b', [false, true]); // $ExpectType [boolean, boolean]
+expectTypeOf(f.set('b', [false, true])).toEqualTypeOf<[boolean, boolean]>();
 // @ts-expect-error
 f.set('b', [false, true, false]);
 
-f.get('c'); // $ExpectType string
-f.set('c', '1'); // $ExpectType string
+expectTypeOf(f.get('c')).toEqualTypeOf<string>();
+expectTypeOf(f.set('c', '1')).toEqualTypeOf<string>();
 
-f.get('cpA'); // $ExpectType string
+expectTypeOf(f.get('cpA')).toEqualTypeOf<string>();
 // @ts-expect-error
 f.set('cpA', ['newValue']);
-f.set('cpA', 'newValue'); // $ExpectType string
+expectTypeOf(f.set('cpA', 'newValue')).toEqualTypeOf<string>();
diff --git a/types/preview/ember/test/test.ts b/type-tests/preview/ember/test.ts
similarity index 100%
rename from types/preview/ember/test/test.ts
rename to type-tests/preview/ember/test.ts
diff --git a/types/preview/ember/test/transition.ts b/type-tests/preview/ember/transition.ts
similarity index 100%
rename from types/preview/ember/test/transition.ts
rename to type-tests/preview/ember/transition.ts
diff --git a/type-tests/preview/ember/utils.ts b/type-tests/preview/ember/utils.ts
new file mode 100755
index 00000000000..5bc51392f0b
--- /dev/null
+++ b/type-tests/preview/ember/utils.ts
@@ -0,0 +1,154 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+function testTypeOf() {
+  expectTypeOf(Ember.typeOf()).toEqualTypeOf<'undefined'>();
+  const str: string = Ember.typeOf({});
+}
+
+function testIsNoneType() {
+  const maybeUndefined: string | undefined = 'not actually undefined';
+  if (Ember.isNone(maybeUndefined)) {
+    return;
+  }
+
+  const anotherString = maybeUndefined + 'another string';
+  expectTypeOf(Ember.isNone()).toBeBoolean();
+}
+
+function testIsBlank() {
+  expectTypeOf(Ember.isBlank()).toBeBoolean();
+  expectTypeOf(Ember.isBlank('')).toBeBoolean();
+  // @ts-expect-error
+  Ember.isBlank('', '');
+}
+
+function testIsEmpty() {
+  expectTypeOf(Ember.isEmpty()).toBeBoolean();
+  expectTypeOf(Ember.isEmpty('')).toBeBoolean();
+  // @ts-expect-error
+  Ember.isEmpty('', '');
+}
+
+function testIsPresent() {
+  expectTypeOf(Ember.isPresent()).toBeBoolean();
+  expectTypeOf(Ember.isPresent('')).toBeBoolean();
+  // @ts-expect-error
+  Ember.isPresent('', '');
+}
+
+function testIsNone() {
+  expectTypeOf(Ember.isNone()).toBeBoolean();
+  expectTypeOf(Ember.isNone('')).toBeBoolean();
+  // @ts-expect-error
+  Ember.isNone('', '');
+}
+
+function testAssign() {
+  expectTypeOf(Ember.assign({ first: 'Tom' }, { middle: 'M' }, { last: 'Dale' })).toEqualTypeOf<{
+    first: string;
+    middle: string;
+    last: string;
+  }>();
+}
+
+function testOnError() {
+  Ember.onerror = (error) => {
+    fetch('/report-error', {
+      method: 'POST',
+      body: JSON.stringify({
+        stack: error.stack,
+        otherInformation: 'whatever app state you want to provide',
+      }),
+    });
+  };
+}
+
+function testDeprecateFunc() {
+  function newMethod(first: string, second: number): string {
+    return '';
+  }
+
+  const oldMethod = Ember.deprecateFunc(
+    'Please use the new method',
+    { id: 'deprecated.id', until: '6.0' },
+    newMethod
+  );
+  expectTypeOf(newMethod('first', 123)).toEqualTypeOf<string>();
+  expectTypeOf(oldMethod('first', 123)).toEqualTypeOf<string>();
+}
+
+function testDefineProperty() {
+  type Contact = { firstName?: string; lastName?: string };
+  const contact: Contact = {};
+
+  // ES5 compatible mode
+  Ember.defineProperty(contact, 'firstName', {
+    writable: true,
+    configurable: false,
+    enumerable: true,
+    value: 'Charles',
+  });
+
+  // define a simple property
+  Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
+
+  // define a computed property
+  Ember.defineProperty(
+    contact,
+    'fullName',
+    Ember.computed('firstName', 'lastName', function (this: Contact) {
+      return `${this.firstName} ${this.lastName}`;
+    })
+  );
+}
+
+// For use in IIFE below.
+declare const fileList: FileList;
+
+(() => {
+  /** typeOf */
+  expectTypeOf(Ember.typeOf()).toEqualTypeOf<'undefined'>();
+  expectTypeOf(Ember.typeOf(null)).toEqualTypeOf<'null'>();
+  expectTypeOf(Ember.typeOf(undefined)).toEqualTypeOf<'undefined'>();
+  expectTypeOf(Ember.typeOf('michael')).toEqualTypeOf<'string'>();
+  expectTypeOf(Ember.typeOf(new String('michael'))).toEqualTypeOf<'string'>();
+  expectTypeOf(Ember.typeOf(101)).toEqualTypeOf<'number'>();
+  expectTypeOf(Ember.typeOf(new Number(101))).toEqualTypeOf<'number'>();
+  expectTypeOf(Ember.typeOf(true)).toEqualTypeOf<'boolean'>();
+  expectTypeOf(Ember.typeOf(new Boolean(true))).toEqualTypeOf<'boolean'>();
+  expectTypeOf(Ember.typeOf(() => 4)).toEqualTypeOf<'function'>();
+  // @ts-ignore -- this *should* work but the namespace version is not carrying
+  // it through correctly. However, people can *and should* simply use the
+  // module import instead!
+  expectTypeOf(Ember.typeOf([1, 2, 90])).toEqualTypeOf<'array'>();
+  expectTypeOf(Ember.typeOf(/abc/)).toEqualTypeOf<'regexp'>();
+  expectTypeOf(Ember.typeOf(new Date())).toEqualTypeOf<'date'>();
+  expectTypeOf(Ember.typeOf(fileList)).toEqualTypeOf<'filelist'>();
+  expectTypeOf(Ember.typeOf(Ember.Object.extend())).toEqualTypeOf<'class'>();
+  // @ts-ignore -- this *should* work but the namespace version is not carrying
+  // it through correctly. However, people can *and should* simply use the
+  // module import instead!
+  expectTypeOf(Ember.typeOf(Ember.Object.create())).toEqualTypeOf<'instance'>();
+  expectTypeOf(Ember.typeOf(new Error('teamocil'))).toEqualTypeOf<'error'>();
+  expectTypeOf(Ember.typeOf(new Date() as RegExp | Date)).toEqualTypeOf<'regexp' | 'date'>();
+  expectTypeOf(Ember.typeOf({ randomObject: true })).toEqualTypeOf<'object'>();
+})();
+
+(() => {
+  /* assign */
+  Ember.assign({}, { a: 'b' });
+  expectTypeOf(Ember.assign({}, { a: 'b' }).a).toBeString();
+  expectTypeOf(Ember.assign({ a: 6 }, { a: 'b' }).a).toBeString();
+  expectTypeOf(Ember.assign({ a: 6 }, {}).a).toBeNumber();
+  // @ts-expect-error
+  Ember.assign({ b: 6 }, {}).a;
+  expectTypeOf(Ember.assign({}, { b: 6 }, {}).b).toBeNumber();
+  expectTypeOf(Ember.assign({ a: 'hello' }, { b: 6 }, {}).a).toBeString();
+  expectTypeOf(Ember.assign({ a: 'hello' }, { b: 6 }, { a: true }).a).toBeBoolean();
+  // @ts-expect-error
+  Ember.assign({ a: 'hello' }, '', { a: true }).a;
+  expectTypeOf(
+    Ember.assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d
+  ).toEqualTypeOf<string[]>();
+})();
diff --git a/type-tests/preview/ember/view-utils.ts b/type-tests/preview/ember/view-utils.ts
new file mode 100644
index 00000000000..d032ede90dc
--- /dev/null
+++ b/type-tests/preview/ember/view-utils.ts
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+const {
+  ViewUtils: { isSimpleClick },
+} = Ember;
+expectTypeOf(isSimpleClick(new Event('wat'))).toBeBoolean();
diff --git a/type-tests/preview/index.d.ts b/type-tests/preview/index.d.ts
new file mode 100644
index 00000000000..6b492f831fb
--- /dev/null
+++ b/type-tests/preview/index.d.ts
@@ -0,0 +1 @@
+import '../../types/preview';
diff --git a/type-tests/preview/tsconfig.json b/type-tests/preview/tsconfig.json
new file mode 100644
index 00000000000..a205f6579ab
--- /dev/null
+++ b/type-tests/preview/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+}
diff --git a/types/preview/@ember/-internals/resolver.d.ts b/types/preview/@ember/-internals/resolver.d.ts
index a32bc036942..9bb05c01fce 100644
--- a/types/preview/@ember/-internals/resolver.d.ts
+++ b/types/preview/@ember/-internals/resolver.d.ts
@@ -1,33 +1,35 @@
-/**
- * @module
- * @private This is not a public API module, and in fact ***there is no such
- *   module at runtime***. This module exists only to provide a public API for
- *   `Resolver`, which will get a dedicated home as part of Ember's public API
- *   via a future RFC. As an end user, if you need access to `Resolver` for now
- *   you should ordinarily get it via `ember-resolver`.
- */
+declare module '@ember/-internals/resolver' {
+  /**
+   * @module
+   * @private This is not a public API module, and in fact ***there is no such
+   *   module at runtime***. This module exists only to provide a public API for
+   *   `Resolver`, which will get a dedicated home as part of Ember's public API
+   *   via a future RFC. As an end user, if you need access to `Resolver` for now
+   *   you should ordinarily get it via `ember-resolver`.
+   */
 
-import EmberObject from '@ember/object';
-import type { Factory, FullName } from '@ember/owner';
+  import EmberObject from '@ember/object';
+  import type { Factory, FullName } from '@ember/owner';
 
-export type KnownForTypeResult<Type extends string> = {
-  [fullName in `${Type}:${string}`]: boolean | undefined;
-};
+  export type KnownForTypeResult<Type extends string> = {
+    [fullName in `${Type}:${string}`]: boolean | undefined;
+  };
 
-/**
- * A `Resolver` is the mechanism responsible for looking up code in your
- * application and converting its naming conventions into the actual classes,
- * functions, and templates that Ember needs to resolve its dependencies, for
- * example, what template to render for a given route. It is a system that helps
- * the app resolve the lookup of JavaScript modules agnostic of what kind of
- * module system is used, which can be AMD, CommonJS or just plain globals. It
- * is used to lookup routes, models, components, templates, or anything that is
- * used in your Ember app.
- */
-export interface Resolver extends EmberObject {
-  knownForType?: <TypeName extends string>(type: TypeName) => KnownForTypeResult<TypeName>;
-  lookupDescription?: (fullName: FullName) => string;
-  makeToString?: (factory: Factory<object>, fullName: FullName) => string;
-  normalize?: (fullName: FullName) => string;
-  resolve(name: string): Factory<object> | object | undefined;
+  /**
+   * A `Resolver` is the mechanism responsible for looking up code in your
+   * application and converting its naming conventions into the actual classes,
+   * functions, and templates that Ember needs to resolve its dependencies, for
+   * example, what template to render for a given route. It is a system that helps
+   * the app resolve the lookup of JavaScript modules agnostic of what kind of
+   * module system is used, which can be AMD, CommonJS or just plain globals. It
+   * is used to lookup routes, models, components, templates, or anything that is
+   * used in your Ember app.
+   */
+  export interface Resolver extends EmberObject {
+    knownForType?: <TypeName extends string>(type: TypeName) => KnownForTypeResult<TypeName>;
+    lookupDescription?: (fullName: FullName) => string;
+    makeToString?: (factory: Factory<object>, fullName: FullName) => string;
+    normalize?: (fullName: FullName) => string;
+    resolve(name: string): Factory<object> | object | undefined;
+  }
 }
diff --git a/types/preview/@ember/application/-private/event-dispatcher.d.ts b/types/preview/@ember/application/-private/event-dispatcher.d.ts
index 3f72b1653b4..f88ebe85a7c 100644
--- a/types/preview/@ember/application/-private/event-dispatcher.d.ts
+++ b/types/preview/@ember/application/-private/event-dispatcher.d.ts
@@ -1,16 +1,18 @@
-import { EventDispatcherEvents } from '@ember/application/types';
+declare module '@ember/application/-private/event-dispatcher' {
+  import { EventDispatcherEvents } from '@ember/application/types';
 
-/**
- * `Ember.EventDispatcher` handles delegating browser events to their
- * corresponding `Ember.Views.` For example, when you click on a view,
- * `Ember.EventDispatcher` ensures that that view's `mouseDown` method gets
- * called.
- */
-export default class EventDispatcher extends Object {
   /**
-   * The set of events names (and associated handler function names) to be setup
-   * and dispatched by the `EventDispatcher`. Modifications to this list can be done
-   * at setup time, generally via the `Ember.Application.customEvents` hash.
+   * `Ember.EventDispatcher` handles delegating browser events to their
+   * corresponding `Ember.Views.` For example, when you click on a view,
+   * `Ember.EventDispatcher` ensures that that view's `mouseDown` method gets
+   * called.
    */
-  events: EventDispatcherEvents;
+  export default class EventDispatcher extends Object {
+    /**
+     * The set of events names (and associated handler function names) to be setup
+     * and dispatched by the `EventDispatcher`. Modifications to this list can be done
+     * at setup time, generally via the `Ember.Application.customEvents` hash.
+     */
+    events: EventDispatcherEvents;
+  }
 }
diff --git a/types/preview/@ember/application/-private/registry.d.ts b/types/preview/@ember/application/-private/registry.d.ts
index 60604ceae87..1af8dff3ef8 100644
--- a/types/preview/@ember/application/-private/registry.d.ts
+++ b/types/preview/@ember/application/-private/registry.d.ts
@@ -1,13 +1,15 @@
-import { EmberClassConstructor } from '@ember/object/-private/types';
+declare module '@ember/application/-private/registry' {
+  import { EmberClassConstructor } from '@ember/object/-private/types';
 
-/**
- * A registry used to store factory and option information keyed
- * by type.
- */
-export default class Registry {
-  register(
-    fullName: string,
-    factory: EmberClassConstructor<unknown>,
-    options?: { singleton?: boolean | undefined }
-  ): void;
+  /**
+   * A registry used to store factory and option information keyed
+   * by type.
+   */
+  export default class Registry {
+    register(
+      fullName: string,
+      factory: EmberClassConstructor<unknown>,
+      options?: { singleton?: boolean | undefined }
+    ): void;
+  }
 }
diff --git a/types/preview/@ember/application/deprecations.d.ts b/types/preview/@ember/application/deprecations.d.ts
index 0ed913f11b6..272cdbfc726 100644
--- a/types/preview/@ember/application/deprecations.d.ts
+++ b/types/preview/@ember/application/deprecations.d.ts
@@ -1,23 +1,24 @@
-import { AnyFn } from 'ember/-private/type-utils';
+declare module '@ember/application/deprecations' {
+  import { AnyFn } from 'ember/-private/type-utils';
 
-// tslint:disable-next-line:strict-export-declare-modifiers
-interface DeprecationOptions {
-  id: string;
-  until: string;
-  url?: string | undefined;
-}
+  interface DeprecationOptions {
+    id: string;
+    until: string;
+    url?: string | undefined;
+  }
 
-/**
- * Display a deprecation warning with the provided message and a stack trace
- * (Chrome and Firefox only).
- */
-export function deprecate(message: string, test: boolean, options: DeprecationOptions): void;
+  /**
+   * Display a deprecation warning with the provided message and a stack trace
+   * (Chrome and Firefox only).
+   */
+  export function deprecate(message: string, test: boolean, options: DeprecationOptions): void;
 
-/**
- * Alias an old, deprecated method with its new counterpart.
- */
-export function deprecateFunc<Func extends AnyFn>(
-  message: string,
-  options: DeprecationOptions,
-  func: Func
-): Func;
+  /**
+   * Alias an old, deprecated method with its new counterpart.
+   */
+  export function deprecateFunc<Func extends AnyFn>(
+    message: string,
+    options: DeprecationOptions,
+    func: Func
+  ): Func;
+}
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 3a2265ac053..d4d9cd8c09b 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -1,151 +1,153 @@
-import Engine from '@ember/engine';
-import ApplicationInstance from '@ember/application/instance';
-import EventDispatcher from '@ember/application/-private/event-dispatcher';
-import { EventDispatcherEvents } from '@ember/application/types';
-import { Router } from '@ember/routing';
-import Registry from '@ember/application/-private/registry';
-import type { Resolver } from '@ember/-internals/resolver';
-import { AnyFn } from 'ember/-private/type-utils';
-import Owner from '@ember/owner';
-import type GlimmerComponent from '@glimmer/component';
-import EmberObject from '@ember/object';
+declare module '@ember/application' {
+  import Engine from '@ember/engine';
+  import ApplicationInstance from '@ember/application/instance';
+  import EventDispatcher from '@ember/application/-private/event-dispatcher';
+  import { EventDispatcherEvents } from '@ember/application/types';
+  import { Router } from '@ember/routing';
+  import Registry from '@ember/application/-private/registry';
+  import type { Resolver } from '@ember/-internals/resolver';
+  import { AnyFn } from 'ember/-private/type-utils';
+  import Owner from '@ember/owner';
+  import type GlimmerComponent from '@glimmer/component';
+  import EmberObject from '@ember/object';
 
-// Shut off default exporting; we don't want anything but the *intended*
-// public API present.
-export {};
+  // Shut off default exporting; we don't want anything but the *intended*
+  // public API present.
+  export {};
 
-/**
- * An instance of Ember.Application is the starting point for every Ember application. It helps to
- * instantiate, initialize and coordinate the many objects that make up your app.
- */
-export default class Application extends Engine {
   /**
-   * Call advanceReadiness after any asynchronous setup logic has completed.
-   * Each call to deferReadiness must be matched by a call to advanceReadiness
-   * or the application will never become ready and routing will not begin.
-   */
-  advanceReadiness(): void;
-  /**
-   * Use this to defer readiness until some condition is true.
-   *
-   * This allows you to perform asynchronous setup logic and defer
-   * booting your application until the setup has finished.
-   *
-   * However, if the setup requires a loading UI, it might be better
-   * to use the router for this purpose.
-   */
-  deferReadiness(): void;
-  /**
-   * defines an injection or typeInjection
-   */
-  inject(factoryNameOrType: string, property: string, injectionName: string): void;
-  /**
-   * This injects the test helpers into the window's scope. If a function of the
-   * same name has already been defined it will be cached (so that it can be reset
-   * if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
-   * Any callbacks registered with `onInjectHelpers` will be called once the
-   * helpers have been injected.
-   */
-  injectTestHelpers(): void;
-  /**
-   * registers a factory for later injection
-   * @param fullName type:name (e.g., 'model:user')
-   * @param factory (e.g., App.Person)
-   */
-  register(
-    fullName: string,
-    factory: unknown,
-    options?: { singleton?: boolean | undefined; instantiate?: boolean | undefined }
-  ): void;
-  /**
-   * This removes all helpers that have been registered, and resets and functions
-   * that were overridden by the helpers.
-   */
-  removeTestHelpers(): void;
-  /**
-   * Reset the application. This is typically used only in tests.
-   */
-  reset(): void;
-  /**
-   * This hook defers the readiness of the application, so that you can start
-   * the app when your tests are ready to run. It also sets the router's
-   * location to 'none', so that the window's location will not be modified
-   * (preventing both accidental leaking of state between tests and interference
-   * with your testing framework).
-   */
-  setupForTesting(): void;
-  /**
-   * The DOM events for which the event dispatcher should listen.
-   */
-  customEvents: EventDispatcherEvents;
-  /**
-   * The Ember.EventDispatcher responsible for delegating events to this application's views.
-   */
-  eventDispatcher: EventDispatcher;
-  /**
-   * Set this to provide an alternate class to `DefaultResolver`
-   */
-  resolver: Resolver | null;
-  /**
-   * The root DOM element of the Application. This can be specified as an
-   * element or a jQuery-compatible selector string.
-   *
-   * This is the element that will be passed to the Application's, eventDispatcher,
-   * which sets up the listeners for event delegation. Every view in your application
-   * should be a child of the element you specify here.
-   */
-  rootElement: HTMLElement | string;
+   * An instance of Ember.Application is the starting point for every Ember application. It helps to
+   * instantiate, initialize and coordinate the many objects that make up your app.
+   */
+  export default class Application extends Engine {
+    /**
+     * Call advanceReadiness after any asynchronous setup logic has completed.
+     * Each call to deferReadiness must be matched by a call to advanceReadiness
+     * or the application will never become ready and routing will not begin.
+     */
+    advanceReadiness(): void;
+    /**
+     * Use this to defer readiness until some condition is true.
+     *
+     * This allows you to perform asynchronous setup logic and defer
+     * booting your application until the setup has finished.
+     *
+     * However, if the setup requires a loading UI, it might be better
+     * to use the router for this purpose.
+     */
+    deferReadiness(): void;
+    /**
+     * defines an injection or typeInjection
+     */
+    inject(factoryNameOrType: string, property: string, injectionName: string): void;
+    /**
+     * This injects the test helpers into the window's scope. If a function of the
+     * same name has already been defined it will be cached (so that it can be reset
+     * if the helper is removed with `unregisterHelper` or `removeTestHelpers`).
+     * Any callbacks registered with `onInjectHelpers` will be called once the
+     * helpers have been injected.
+     */
+    injectTestHelpers(): void;
+    /**
+     * registers a factory for later injection
+     * @param fullName type:name (e.g., 'model:user')
+     * @param factory (e.g., App.Person)
+     */
+    register(
+      fullName: string,
+      factory: unknown,
+      options?: { singleton?: boolean | undefined; instantiate?: boolean | undefined }
+    ): void;
+    /**
+     * This removes all helpers that have been registered, and resets and functions
+     * that were overridden by the helpers.
+     */
+    removeTestHelpers(): void;
+    /**
+     * Reset the application. This is typically used only in tests.
+     */
+    reset(): void;
+    /**
+     * This hook defers the readiness of the application, so that you can start
+     * the app when your tests are ready to run. It also sets the router's
+     * location to 'none', so that the window's location will not be modified
+     * (preventing both accidental leaking of state between tests and interference
+     * with your testing framework).
+     */
+    setupForTesting(): void;
+    /**
+     * The DOM events for which the event dispatcher should listen.
+     */
+    customEvents: EventDispatcherEvents;
+    /**
+     * The Ember.EventDispatcher responsible for delegating events to this application's views.
+     */
+    eventDispatcher: EventDispatcher;
+    /**
+     * Set this to provide an alternate class to `DefaultResolver`
+     */
+    resolver: Resolver | null;
+    /**
+     * The root DOM element of the Application. This can be specified as an
+     * element or a jQuery-compatible selector string.
+     *
+     * This is the element that will be passed to the Application's, eventDispatcher,
+     * which sets up the listeners for event delegation. Every view in your application
+     * should be a child of the element you specify here.
+     */
+    rootElement: HTMLElement | string;
+    /**
+     * Called when the Application has become ready.
+     * The call will be delayed until the DOM has become ready.
+     */
+    ready: AnyFn;
+    /**
+     * Application's router.
+     */
+    Router: Router;
+    registry: Registry;
+    /**
+     *  Initialize the application and return a promise that resolves with the `Application`
+     *  object when the boot process is complete.
+     */
+    boot(): Promise<Application>;
+    /**
+     * Create an ApplicationInstance for this Application.
+     */
+    buildInstance(options?: object): ApplicationInstance;
+  }
+
+  // Known framework objects, so that `getOwner` can always, accurately, return
+  // `Owner` when working with one of these classes, which the framework *does*
+  // guarantee will always have an `Owner`. NOTE: this must be kept up to date
+  // whenever we add new base classes to the framework. For example, if we
+  // introduce a standalone `Service` or `Route` base class which *does not*
+  // extend from `EmberObject`, it will need to be added here.
+  type FrameworkObject = EmberObject | GlimmerComponent;
+
   /**
-   * Called when the Application has become ready.
-   * The call will be delayed until the DOM has become ready.
+   * Framework objects in an Ember application (components, services, routes, etc.)
+   * are created via a factory and dependency injection system. Each of these
+   * objects is the responsibility of an "owner", which handled its
+   * instantiation and manages its lifetime.
    */
-  ready: AnyFn;
+  export function getOwner(object: FrameworkObject): Owner;
+  export function getOwner(object: unknown): Owner | undefined;
   /**
-   * Application's router.
+   * `setOwner` forces a new owner on a given object instance. This is primarily
+   * useful in some testing cases.
    */
-  Router: Router;
-  registry: Registry;
+  export function setOwner(object: unknown, owner: Owner): void;
+
   /**
-   *  Initialize the application and return a promise that resolves with the `Application`
-   *  object when the boot process is complete.
+   * Detects when a specific package of Ember (e.g. 'Ember.Application')
+   * has fully loaded and is available for extension.
    */
-  boot(): Promise<Application>;
+  export function onLoad(name: string, callback: AnyFn): unknown;
+
   /**
-   * Create an ApplicationInstance for this Application.
+   * Called when an Ember.js package (e.g Ember.Application) has finished
+   * loading. Triggers any callbacks registered for this event.
    */
-  buildInstance(options?: object): ApplicationInstance;
+  export function runLoadHooks(name: string, object?: {}): unknown;
 }
-
-// Known framework objects, so that `getOwner` can always, accurately, return
-// `Owner` when working with one of these classes, which the framework *does*
-// guarantee will always have an `Owner`. NOTE: this must be kept up to date
-// whenever we add new base classes to the framework. For example, if we
-// introduce a standalone `Service` or `Route` base class which *does not*
-// extend from `EmberObject`, it will need to be added here.
-type FrameworkObject = EmberObject | GlimmerComponent;
-
-/**
- * Framework objects in an Ember application (components, services, routes, etc.)
- * are created via a factory and dependency injection system. Each of these
- * objects is the responsibility of an "owner", which handled its
- * instantiation and manages its lifetime.
- */
-export function getOwner(object: FrameworkObject): Owner;
-export function getOwner(object: unknown): Owner | undefined;
-/**
- * `setOwner` forces a new owner on a given object instance. This is primarily
- * useful in some testing cases.
- */
-export function setOwner(object: unknown, owner: Owner): void;
-
-/**
- * Detects when a specific package of Ember (e.g. 'Ember.Application')
- * has fully loaded and is available for extension.
- */
-export function onLoad(name: string, callback: AnyFn): unknown;
-
-/**
- * Called when an Ember.js package (e.g Ember.Application) has finished
- * loading. Triggers any callbacks registered for this event.
- */
-export function runLoadHooks(name: string, object?: {}): unknown;
diff --git a/types/preview/@ember/application/instance.d.ts b/types/preview/@ember/application/instance.d.ts
index 74215a39a46..37b60353c6f 100644
--- a/types/preview/@ember/application/instance.d.ts
+++ b/types/preview/@ember/application/instance.d.ts
@@ -1,7 +1,9 @@
-import EngineInstance from '@ember/engine/instance';
+declare module '@ember/application/instance' {
+  import EngineInstance from '@ember/engine/instance';
 
-/**
- * The `ApplicationInstance` encapsulates all of the stateful aspects of a
- * running `Application`.
- */
-export default class ApplicationInstance extends EngineInstance {}
+  /**
+   * The `ApplicationInstance` encapsulates all of the stateful aspects of a
+   * running `Application`.
+   */
+  export default class ApplicationInstance extends EngineInstance {}
+}
diff --git a/types/preview/@ember/application/types.d.ts b/types/preview/@ember/application/types.d.ts
index 75e3f6d8487..fa3692e2458 100644
--- a/types/preview/@ember/application/types.d.ts
+++ b/types/preview/@ember/application/types.d.ts
@@ -1,27 +1,29 @@
-export interface EventDispatcherEvents {
-  touchstart?: string | null | undefined;
-  touchmove?: string | null | undefined;
-  touchend?: string | null | undefined;
-  touchcancel?: string | null | undefined;
-  keydown?: string | null | undefined;
-  keyup?: string | null | undefined;
-  keypress?: string | null | undefined;
-  mousedown?: string | null | undefined;
-  mouseup?: string | null | undefined;
-  contextmenu?: string | null | undefined;
-  click?: string | null | undefined;
-  dblclick?: string | null | undefined;
-  focusin?: string | null | undefined;
-  focusout?: string | null | undefined;
-  submit?: string | null | undefined;
-  input?: string | null | undefined;
-  change?: string | null | undefined;
-  dragstart?: string | null | undefined;
-  drag?: string | null | undefined;
-  dragenter?: string | null | undefined;
-  dragleave?: string | null | undefined;
-  dragover?: string | null | undefined;
-  drop?: string | null | undefined;
-  dragend?: string | null | undefined;
-  [event: string]: string | null | undefined;
+declare module '@ember/application/types' {
+  export interface EventDispatcherEvents {
+    touchstart?: string | null | undefined;
+    touchmove?: string | null | undefined;
+    touchend?: string | null | undefined;
+    touchcancel?: string | null | undefined;
+    keydown?: string | null | undefined;
+    keyup?: string | null | undefined;
+    keypress?: string | null | undefined;
+    mousedown?: string | null | undefined;
+    mouseup?: string | null | undefined;
+    contextmenu?: string | null | undefined;
+    click?: string | null | undefined;
+    dblclick?: string | null | undefined;
+    focusin?: string | null | undefined;
+    focusout?: string | null | undefined;
+    submit?: string | null | undefined;
+    input?: string | null | undefined;
+    change?: string | null | undefined;
+    dragstart?: string | null | undefined;
+    drag?: string | null | undefined;
+    dragenter?: string | null | undefined;
+    dragleave?: string | null | undefined;
+    dragover?: string | null | undefined;
+    drop?: string | null | undefined;
+    dragend?: string | null | undefined;
+    [event: string]: string | null | undefined;
+  }
 }
diff --git a/types/preview/@ember/array/-private/enumerable.d.ts b/types/preview/@ember/array/-private/enumerable.d.ts
index 876e81a3d08..36b0120eb94 100644
--- a/types/preview/@ember/array/-private/enumerable.d.ts
+++ b/types/preview/@ember/array/-private/enumerable.d.ts
@@ -1,173 +1,13 @@
-import ComputedProperty from '@ember/object/computed';
-import Mixin from '@ember/object/mixin';
-import NativeArray from '@ember/array/-private/native-array';
-import { MethodNamesOf, MethodParams, MethodReturns } from 'ember/-private/type-utils';
+declare module '@ember/array/-private/enumerable' {
+  import Mixin from '@ember/object/mixin';
 
-/**
- * This mixin defines the common interface implemented by enumerable objects
- * in Ember. Most of these methods follow the standard Array iteration
- * API defined up to JavaScript 1.8 (excluding language-specific features that
- * cannot be emulated in older versions of JavaScript).
- */
-interface Enumerable<T> {
   /**
-   * Helper method returns the first object from a collection. This is usually
-   * used by bindings and other parts of the framework to extract a single
-   * object if the enumerable contains only one item.
+   * The methods in this mixin have been moved to `MutableArray`. This mixin has
+   * been intentionally preserved to avoid breaking `Enumerable.detect` checks
+   * until the community migrates away from them.
    */
-  firstObject: T | undefined;
-  /**
-   * Helper method returns the last object from a collection. If your enumerable
-   * contains only one object, this method should always return that object.
-   * If your enumerable is empty, this method should return `undefined`.
-   */
-  lastObject: T | undefined;
-  /**
-   * Iterates through the enumerable, calling the passed function on each
-   * item. This method corresponds to the `forEach()` method defined in
-   * JavaScript 1.6.
-   */
-  forEach: T[]['forEach'];
-  /**
-   * Alias for `mapBy`
-   */
-  getEach<K extends keyof T>(key: K): Array<T[K]>;
-  /**
-   * Sets the value on the named property for each member. This is more
-   * ergonomic than using other methods defined on this helper. If the object
-   * implements Ember.Observable, the value will be changed to `set(),` otherwise
-   * it will be set directly. `null` objects are skipped.
-   */
-  setEach<K extends keyof T>(key: K, value: T[K]): void;
-  /**
-   * Maps all of the items in the enumeration to another value, returning
-   * a new array. This method corresponds to `map()` defined in JavaScript 1.6.
-   */
-  map: T[]['map'];
-  /**
-   * Similar to map, this specialized function returns the value of the named
-   * property on all items in the enumeration.
-   */
-  mapBy<K extends keyof T>(key: K): Array<T[K]>;
-  mapBy(key: string): unknown[];
-  /**
-   * Returns an array with all of the items in the enumeration that the passed
-   * function returns true for. This method corresponds to `filter()` defined in
-   * JavaScript 1.6.
-   */
-  filter: T[]['filter'];
-  /**
-   * Returns an array with all of the items in the enumeration where the passed
-   * function returns false. This method is the inverse of filter().
-   */
-  reject(
-    callbackfn: (value: T, index: number, array: T[]) => unknown,
-    thisArg?: any
-  ): NativeArray<T>;
-  /**
-   * Returns an array with just the items with the matched property. You
-   * can pass an optional second argument with the target value. Otherwise
-   * this will match any property that evaluates to `true`.
-   */
-  filterBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
-  /**
-   * Returns an array with the items that do not have truthy values for
-   * key.  You can pass an optional second argument with the target value.  Otherwise
-   * this will match any property that evaluates to false.
-   */
-  rejectBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
-  /**
-   * Returns the first item in the array for which the callback returns true.
-   * This method works similar to the `filter()` method defined in JavaScript 1.6
-   * except that it will stop working on the array once a match is found.
-   */
-  find: T[]['find'];
-  /**
-   * Returns the first item with a property matching the passed value. You
-   * can pass an optional second argument with the target value. Otherwise
-   * this will match any property that evaluates to `true`.
-   */
-  findBy<K extends keyof T>(key: K, value?: T[K]): T | undefined;
-  /**
-   * Returns `true` if the passed function returns true for every item in the
-   * enumeration. This corresponds with the `every()` method in JavaScript 1.6.
-   */
-  every: T[]['every'];
-  /**
-   * Returns `true` if the passed property resolves to the value of the second
-   * argument for all items in the enumerable. This method is often simpler/faster
-   * than using a callback.
-   */
-  isEvery<K extends keyof T>(key: K, value?: T[K]): boolean;
-  /**
-   * Returns `true` if the passed function returns true for any item in the
-   * enumeration.
-   */
-  any(callback: (value: T, index: number, array: T[]) => boolean, target?: {}): boolean;
-  /**
-   * Returns `true` if the passed property resolves to the value of the second
-   * argument for any item in the enumerable. This method is often simpler/faster
-   * than using a callback.
-   */
-  isAny<K extends keyof T>(key: K, value?: T[K]): boolean;
-  /**
-   * This will combine the values of the enumerator into a single value. It
-   * is a useful way to collect a summary value from an enumeration. This
-   * corresponds to the `reduce()` method defined in JavaScript 1.8.
-   */
-  reduce: T[]['reduce'];
-  /**
-   * Invokes the named method on every object in the receiver that
-   * implements it. This method corresponds to the implementation in
-   * Prototype 1.6.
-   */
-  invoke<M extends MethodNamesOf<T>>(
-    methodName: M,
-    ...args: MethodParams<T, M>
-  ): Array<MethodReturns<T, M>>;
-  /**
-   * Simply converts the enumerable into a genuine array. The order is not
-   * guaranteed. Corresponds to the method implemented by Prototype.
-   */
-  toArray(): T[];
-  /**
-   * Returns a copy of the array with all `null` and `undefined` elements removed.
-   */
-  compact(): NativeArray<NonNullable<T>>;
-  /**
-   * Returns a new enumerable that excludes the passed value. The default
-   * implementation returns an array regardless of the receiver type.
-   * If the receiver does not contain the value it returns the original enumerable.
-   */
-  without(value: T): NativeArray<T>;
-  /**
-   * Returns a new enumerable that contains only unique values. The default
-   * implementation returns an array regardless of the receiver type.
-   */
-  uniq(): NativeArray<T>;
-  /**
-   * Converts the enumerable into an array and sorts by the keys
-   * specified in the argument.
-   */
-  sortBy(...properties: string[]): NativeArray<T>;
-  /**
-   * Returns a new enumerable that contains only items containing a unique property value.
-   * The default implementation returns an array regardless of the receiver type.
-   */
-  uniqBy(property: string): NativeArray<T>;
-  uniqBy(callback: (value: T) => unknown): NativeArray<T>;
-  /**
-   * Returns `true` if the passed object can be found in the enumerable.
-   */
-  includes(searchElement: T, fromIndex?: number): boolean;
-  /**
-   * This is the handler for the special array content property. If you get
-   * this property, it will return this. If you set this property to a new
-   * array, it will replace the current content.
-   */
-  get '[]'(): this;
-  set '[]'(newValue: Enumerable<T>);
-}
+  interface Enumerable {}
 
-declare const Enumerable: Mixin;
-export default Enumerable;
+  const Enumerable: Mixin;
+  export default Enumerable;
+}
diff --git a/types/preview/@ember/array/-private/mutable-enumerable.d.ts b/types/preview/@ember/array/-private/mutable-enumerable.d.ts
index b6785f8fe33..d3bc4972cc3 100644
--- a/types/preview/@ember/array/-private/mutable-enumerable.d.ts
+++ b/types/preview/@ember/array/-private/mutable-enumerable.d.ts
@@ -1,28 +1,13 @@
-import Mixin from '@ember/object/mixin';
-import Enumerable from '@ember/array/-private/enumerable';
+declare module '@ember/array/-private/mutable-enumerable' {
+  import Mixin from '@ember/object/mixin';
+  import Enumerable from '@ember/array/-private/enumerable';
 
-/**
- * This mixin defines the API for modifying generic enumerables. These methods
- * can be applied to an object regardless of whether it is ordered or
- * unordered.
- */
-interface MutableEnumerable<T> extends Enumerable<T> {
   /**
-   * __Required.__ You must implement this method to apply this mixin.
+   * This Mixin exists for historical purposes only, and so that someone walking
+   * the types for Ember's arrays sees the same types as those which appear in
+   * the runtime hierarchy.
    */
-  addObject(object: T): T;
-  /**
-   * Adds each object in the passed enumerable to the receiver.
-   */
-  addObjects(objects: Enumerable<T>): this;
-  /**
-   * __Required.__ You must implement this method to apply this mixin.
-   */
-  removeObject(object: T): T;
-  /**
-   * Removes each object in the passed enumerable from the receiver.
-   */
-  removeObjects(objects: Enumerable<T>): this;
+  interface MutableEnumerable extends Enumerable {}
+  const MutableEnumerable: Mixin;
+  export default MutableEnumerable;
 }
-declare const MutableEnumerable: Mixin;
-export default MutableEnumerable;
diff --git a/types/preview/@ember/array/-private/native-array.d.ts b/types/preview/@ember/array/-private/native-array.d.ts
index 1a2c8fcf113..814eb825abd 100644
--- a/types/preview/@ember/array/-private/native-array.d.ts
+++ b/types/preview/@ember/array/-private/native-array.d.ts
@@ -1,23 +1,23 @@
-import MutableArray from '@ember/array/mutable';
-import Observable from '@ember/object/observable';
-import Mixin from '@ember/object/mixin';
+declare module '@ember/array/-private/native-array' {
+  import Observable from '@ember/object/observable';
+  import MutableArray from '@ember/array/mutable';
+  import Mixin from '@ember/object/mixin';
 
-// Get an alias to the global Array type to use in inner scope below.
-type GlobalArray<T> = T[];
+  // Get an alias to the global Array type to use in inner scope below.
+  type Array<T> = T[];
 
-/**
- * The NativeArray mixin contains the properties needed to make the native
- * Array support Ember.MutableArray and all of its dependent APIs. Unless you
- * have `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Array` set to
- * false, this will be applied automatically. Otherwise you can apply the mixin
- * at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
- */
-interface NativeArray<T> extends GlobalArray<T>, MutableArray<T>, Observable {
   /**
-   * __Required.__ You must implement this method to apply this mixin.
+   * The NativeArray mixin contains the properties needed to make the native
+   * Array support Ember.MutableArray and all of its dependent APIs. Unless you
+   * have `EmberENV.EXTEND_PROTOTYPES` or `EmberENV.EXTEND_PROTOTYPES.Array` set to
+   * false, this will be applied automatically. Otherwise you can apply the mixin
+   * at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
    */
-  length: number;
-}
+  interface NativeArray<T>
+    extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
+      Observable,
+      MutableArray<T> {}
 
-declare const NativeArray: Mixin;
-export default NativeArray;
+  const NativeArray: Mixin;
+  export default NativeArray;
+}
diff --git a/types/preview/@ember/array/index.d.ts b/types/preview/@ember/array/index.d.ts
index 13f7597c5ce..2667e7289f1 100644
--- a/types/preview/@ember/array/index.d.ts
+++ b/types/preview/@ember/array/index.d.ts
@@ -1,70 +1,244 @@
-import Mixin from '@ember/object/mixin';
-import Enumerable from '@ember/array/-private/enumerable';
-import NativeArray from '@ember/array/-private/native-array';
+declare module '@ember/array' {
+  import { MethodNamesOf, MethodParams, MethodReturns } from 'ember/-private/type-utils';
+  import Mixin from '@ember/object/mixin';
+  import Enumerable from '@ember/array/-private/enumerable';
+  import NativeArray from '@ember/array/-private/native-array';
 
-/**
- * This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
- * Array class as well as other controllers, etc. that want to appear to be arrays.
- */
-interface Array<T> extends Enumerable<T> {
   /**
-   * __Required.__ You must implement this method to apply this mixin.
+   * This module implements Observer-friendly Array-like behavior. This mixin is picked up by the
+   * Array class as well as other controllers, etc. that want to appear to be arrays.
    */
-  length: number;
-  /**
-   * Returns the object at the given `index`. If the given `index` is negative
-   * or is greater or equal than the array length, returns `undefined`.
-   */
-  objectAt(idx: number): T | undefined;
-  /**
-   * This returns the objects at the specified indexes, using `objectAt`.
-   */
-  // tslint:disable-next-line:array-type
-  objectsAt(indexes: number[]): Array<T | undefined>;
-  /**
-   * Returns a new array that is a slice of the receiver. This implementation
-   * uses the observable array methods to retrieve the objects for the new
-   * slice.
-   */
-  slice(beginIndex?: number, endIndex?: number): T[];
-  /**
-   * Returns the index of the given object's first occurrence.
-   * If no `startAt` argument is given, the starting location to
-   * search is 0. If it's negative, will count backward from
-   * the end of the array. Returns -1 if no match is found.
-   */
-  indexOf(searchElement: T, fromIndex?: number): number;
+  interface Array<T> extends Enumerable {
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    length: number;
+    /**
+     * Returns the object at the given `index`. If the given `index` is negative
+     * or is greater or equal than the array length, returns `undefined`.
+     */
+    objectAt(idx: number): T | undefined;
+    /**
+     * This returns the objects at the specified indexes, using `objectAt`.
+     */
+    // tslint:disable-next-line:array-type
+    objectsAt(indexes: number[]): Array<T | undefined>;
+    /**
+     * Helper method returns the first object from a collection. This is usually
+     * used by bindings and other parts of the framework to extract a single
+     * object if the enumerable contains only one item.
+     */
+    firstObject: T | undefined;
+    /**
+     * Helper method returns the last object from a collection. If your enumerable
+     * contains only one object, this method should always return that object.
+     * If your enumerable is empty, this method should return `undefined`.
+     */
+    lastObject: T | undefined;
+    /**
+     * Returns a new array that is a slice of the receiver. This implementation
+     * uses the observable array methods to retrieve the objects for the new
+     * slice.
+     */
+    slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
+    /**
+     * Returns the index of the given object's first occurrence.
+     * If no `startAt` argument is given, the starting location to
+     * search is 0. If it's negative, will count backward from
+     * the end of the array. Returns -1 if no match is found.
+     */
+    indexOf(searchElement: T, fromIndex?: number): number;
+    /**
+     * Returns the index of the given object's last occurrence.
+     * If no `startAt` argument is given, the search starts from
+     * the last position. If it's negative, will count backward
+     * from the end of the array. Returns -1 if no match is found.
+     */
+    lastIndexOf(searchElement: T, fromIndex?: number): number;
+    /**
+     * Iterates through the enumerable, calling the passed function on each
+     * item. This method corresponds to the `forEach()` method defined in
+     * JavaScript 1.6.
+     */
+    forEach<Target>(
+      callback: (this: Target, item: T, index: number, arr: this) => void,
+      target?: Target
+    ): this;
+    /**
+     * Alias for `mapBy`
+     */
+    getEach<K extends keyof T>(key: K): NativeArray<T[K]>;
+    /**
+     * Sets the value on the named property for each member. This is more
+     * ergonomic than using other methods defined on this helper. If the object
+     * implements Ember.Observable, the value will be changed to `set(),` otherwise
+     * it will be set directly. `null` objects are skipped.
+     */
+    setEach<K extends keyof T>(key: K, value: T[K]): void;
+    /**
+     * Maps all of the items in the enumeration to another value, returning
+     * a new array. This method corresponds to `map()` defined in JavaScript 1.6.
+     */
+    map<U, Target>(
+      callback: (this: Target, item: T, index: number, arr: this) => U,
+      target?: Target
+    ): NativeArray<U>;
+    /**
+     * Similar to map, this specialized function returns the value of the named
+     * property on all items in the enumeration.
+     */
+    mapBy<K extends keyof T>(key: K): NativeArray<T[K]>;
+    mapBy(key: string): NativeArray<unknown>;
+    /**
+     * Returns an array with all of the items in the enumeration that the passed
+     * function returns true for. This method corresponds to `filter()` defined in
+     * JavaScript 1.6.
+     */
+    filter<Target>(
+      callback: (this: Target, item: T, index: number, arr: this) => unknown,
+      target?: Target
+    ): NativeArray<T>;
+    /**
+     * Returns an array with all of the items in the enumeration where the passed
+     * function returns false. This method is the inverse of filter().
+     */
+    reject<Target>(
+      callback: (this: Target, item: T, index: number, arr: this) => unknown,
+      target?: Target
+    ): NativeArray<T>;
+    /**
+     * Returns an array with just the items with the matched property. You
+     * can pass an optional second argument with the target value. Otherwise
+     * this will match any property that evaluates to `true`.
+     */
+    filterBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
+    /**
+     * Returns an array with the items that do not have truthy values for
+     * key.  You can pass an optional second argument with the target value.  Otherwise
+     * this will match any property that evaluates to false.
+     */
+    rejectBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
+    /**
+     * Returns the first item in the array for which the callback returns true.
+     * This method works similar to the `filter()` method defined in JavaScript 1.6
+     * except that it will stop working on the array once a match is found.
+     */
+    find<S extends T, Target = void>(
+      predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
+      thisArg?: Target
+    ): S | undefined;
+    find<Target = void>(
+      callback: (this: Target, item: T, index: number, arr: this) => unknown,
+      target?: Target
+    ): T | undefined;
+    /**
+     * Returns the first item with a property matching the passed value. You
+     * can pass an optional second argument with the target value. Otherwise
+     * this will match any property that evaluates to `true`.
+     */
+    findBy<K extends keyof T>(key: K, value?: T[K]): T | undefined;
+    /**
+     * Returns `true` if the passed function returns true for every item in the
+     * enumeration. This corresponds with the `every()` method in JavaScript 1.6.
+     */
+    every<Target = void>(
+      callback: (this: Target, item: T, index: number, arr: this) => unknown,
+      target?: Target
+    ): boolean;
+    /**
+     * Returns `true` if the passed property resolves to the value of the second
+     * argument for all items in the enumerable. This method is often simpler/faster
+     * than using a callback.
+     */
+    isEvery<K extends keyof T>(key: K, value?: T[K]): boolean;
+    /**
+     * Returns `true` if the passed function returns true for any item in the
+     * enumeration.
+     */
+    any<Target = void>(
+      callback: (this: Target, item: T, index: number, arr: this) => unknown,
+      target?: Target
+    ): boolean;
+    /**
+     * Returns `true` if the passed property resolves to the value of the second
+     * argument for any item in the enumerable. This method is often simpler/faster
+     * than using a callback.
+     */
+    isAny<K extends keyof T>(key: K, value?: T[K]): boolean;
+    /**
+     * This will combine the values of the enumerator into a single value. It
+     * is a useful way to collect a summary value from an enumeration. This
+     * corresponds to the `reduce()` method defined in JavaScript 1.8.
+     */
+    reduce: T[]['reduce'];
+    /**
+     * Invokes the named method on every object in the receiver that
+     * implements it. This method corresponds to the implementation in
+     * Prototype 1.6.
+     */
+    invoke<M extends MethodNamesOf<T>>(
+      methodName: M,
+      ...args: MethodParams<T, M>
+    ): Array<MethodReturns<T, M>>;
+    /**
+     * Simply converts the enumerable into a genuine array. The order is not
+     * guaranteed. Corresponds to the method implemented by Prototype.
+     */
+    toArray(): T[];
+    /**
+     * Returns a copy of the array with all `null` and `undefined` elements removed.
+     */
+    compact(): NativeArray<NonNullable<T>>;
+    /**
+     * Returns `true` if the passed object can be found in the enumerable.
+     */
+    includes(searchElement: T, fromIndex?: number): boolean;
+    /**
+     * Converts the enumerable into an array and sorts by the keys
+     * specified in the argument.
+     */
+    sortBy(...properties: string[]): NativeArray<T>;
+    /**
+     * Returns a new enumerable that excludes the passed value. The default
+     * implementation returns an array regardless of the receiver type.
+     * If the receiver does not contain the value it returns the original enumerable.
+     */
+    without(value: T): NativeArray<T>;
+    /**
+     * Returns a new enumerable that contains only unique values. The default
+     * implementation returns an array regardless of the receiver type.
+     */
+    uniq(): NativeArray<T>;
+    /**
+     * Returns a new enumerable that contains only items containing a unique property value.
+     * The default implementation returns an array regardless of the receiver type.
+     */
+    uniqBy(property: string): NativeArray<T>;
+    uniqBy(callback: (value: T) => unknown): NativeArray<T>;
+    /**
+     * This is the handler for the special array content property. If you get
+     * this property, it will return this. If you set this property to a new
+     * array, it will replace the current content.
+     */
+    get '[]'(): NativeArray<T>;
+    set '[]'(newValue: NativeArray<T>);
+  }
+  // Ember.Array rather than Array because the `array-type` lint rule doesn't realize the global is shadowed
+  const Array: Mixin;
+  export default Array;
+
   /**
-   * Returns the index of the given object's last occurrence.
-   * If no `startAt` argument is given, the search starts from
-   * the last position. If it's negative, will count backward
-   * from the end of the array. Returns -1 if no match is found.
+   * Creates an `Ember.NativeArray` from an Array like object.
+   * Does not modify the original object's contents. Ember.A is not needed if
+   * `EmberENV.EXTEND_PROTOTYPES` is `true` (the default value). However,
+   * it is recommended that you use Ember.A when creating addons for
+   * ember or when you can not guarantee that `EmberENV.EXTEND_PROTOTYPES`
+   * will be `true`.
    */
-  lastIndexOf(searchElement: T, fromIndex?: number): number;
+  export function A<T>(arr?: T[]): NativeArray<T>;
+
   /**
-   * Returns a special object that can be used to observe individual properties
-   * on the array. Just get an equivalent property on this object and it will
-   * return an enumerable that maps automatically to the named key on the
-   * member objects.
+   * Returns true if the passed object is an array or Array-like.
    */
-  '@each': T;
+  export function isArray(obj: unknown): obj is ArrayLike<unknown>;
 }
-// Ember.Array rather than Array because the `array-type` lint rule doesn't realize the global is shadowed
-// tslint:disable-next-line:array-type
-declare const Array: Mixin;
-export default Array;
-
-/**
- * Creates an `Ember.NativeArray` from an Array like object.
- * Does not modify the original object's contents. Ember.A is not needed if
- * `EmberENV.EXTEND_PROTOTYPES` is `true` (the default value). However,
- * it is recommended that you use Ember.A when creating addons for
- * ember or when you can not guarantee that `EmberENV.EXTEND_PROTOTYPES`
- * will be `true`.
- */
-export function A<T>(arr?: T[]): NativeArray<T>;
-
-/**
- * Returns true if the passed object is an array or Array-like.
- */
-export function isArray(obj: unknown): obj is ArrayLike<unknown>;
diff --git a/types/preview/@ember/array/mutable.d.ts b/types/preview/@ember/array/mutable.d.ts
index e047a73974c..30c365bb953 100644
--- a/types/preview/@ember/array/mutable.d.ts
+++ b/types/preview/@ember/array/mutable.d.ts
@@ -1,75 +1,94 @@
-import Mixin from '@ember/object/mixin';
-import MutableEnumerable from '@ember/array/-private/mutable-enumerable';
-import EmberArray from '@ember/array';
-import Enumerable from '@ember/array/-private/enumerable';
+declare module '@ember/array/mutable' {
+  import Mixin from '@ember/object/mixin';
+  import MutableEnumerable from '@ember/array/-private/mutable-enumerable';
+  import EmberArray from '@ember/array';
+
+  type AnyArray<T> = EmberArray<T> | Array<T>;
 
-/**
- * This mixin defines the API for modifying array-like objects. These methods
- * can be applied only to a collection that keeps its items in an ordered set.
- * It builds upon the Array mixin and adds methods to modify the array.
- * One concrete implementations of this class include ArrayProxy.
- */
-interface MutableArray<T> extends EmberArray<T>, MutableEnumerable<T> {
-  /**
-   * __Required.__ You must implement this method to apply this mixin.
-   */
-  replace(idx: number, amt: number, objects: T[]): this;
-  /**
-   * Remove all elements from the array. This is useful if you
-   * want to reuse an existing array without having to recreate it.
-   */
-  clear(): this;
-  /**
-   * This will use the primitive `replace()` method to insert an object at the
-   * specified index.
-   */
-  insertAt(idx: number, object: T): this;
-  /**
-   * Remove an object at the specified index using the `replace()` primitive
-   * method. You can pass either a single index, or a start and a length.
-   */
-  removeAt(start: number, len?: number): this;
-  /**
-   * Push the object onto the end of the array. Works just like `push()` but it
-   * is KVO-compliant.
-   */
-  pushObject(obj: T): T;
-  /**
-   * Add the objects in the passed numerable to the end of the array. Defers
-   * notifying observers of the change until all objects are added.
-   */
-  pushObjects(objects: Enumerable<T>): this;
-  /**
-   * Pop object from array or nil if none are left. Works just like `pop()` but
-   * it is KVO-compliant.
-   */
-  popObject(): T;
-  /**
-   * Shift an object from start of array or nil if none are left. Works just
-   * like `shift()` but it is KVO-compliant.
-   */
-  shiftObject(): T;
-  /**
-   * Unshift an object to start of array. Works just like `unshift()` but it is
-   * KVO-compliant.
-   */
-  unshiftObject(obj: T): T;
-  /**
-   * Adds the named objects to the beginning of the array. Defers notifying
-   * observers until all objects have been added.
-   */
-  unshiftObjects(objects: Enumerable<T>): this;
-  /**
-   * Reverse objects in the array. Works just like `reverse()` but it is
-   * KVO-compliant.
-   */
-  reverseObjects(): this;
   /**
-   * Replace all the receiver's content with content of the argument.
-   * If argument is an empty array receiver will be cleared.
+   * This mixin defines the API for modifying array-like objects. These methods
+   * can be applied only to a collection that keeps its items in an ordered set.
+   * It builds upon the Array mixin and adds methods to modify the array.
+   * One concrete implementations of this class include ArrayProxy.
    */
-  setObjects(objects: EmberArray<T>): this;
-}
+  interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    replace(idx: number, amt: number, objects: T[]): this;
+    /**
+     * Remove all elements from the array. This is useful if you
+     * want to reuse an existing array without having to recreate it.
+     */
+    clear(): this;
+    /**
+     * This will use the primitive `replace()` method to insert an object at the
+     * specified index.
+     */
+    insertAt(idx: number, object: T): this;
+    /**
+     * Remove an object at the specified index using the `replace()` primitive
+     * method. You can pass either a single index, or a start and a length.
+     */
+    removeAt(start: number, len?: number): this;
+    /**
+     * Push the object onto the end of the array. Works just like `push()` but it
+     * is KVO-compliant.
+     */
+    pushObject(obj: T): T;
+    /**
+     * Add the objects in the passed numerable to the end of the array. Defers
+     * notifying observers of the change until all objects are added.
+     */
+    pushObjects(objects: AnyArray<T>): this;
+    /**
+     * Pop object from array or nil if none are left. Works just like `pop()` but
+     * it is KVO-compliant.
+     */
+    popObject(): T;
+    /**
+     * Shift an object from start of array or nil if none are left. Works just
+     * like `shift()` but it is KVO-compliant.
+     */
+    shiftObject(): T;
+    /**
+     * Unshift an object to start of array. Works just like `unshift()` but it is
+     * KVO-compliant.
+     */
+    unshiftObject(obj: T): T;
+    /**
+     * Adds the named objects to the beginning of the array. Defers notifying
+     * observers until all objects have been added.
+     */
+    unshiftObjects(objects: AnyArray<T>): this;
+    /**
+     * Reverse objects in the array. Works just like `reverse()` but it is
+     * KVO-compliant.
+     */
+    reverseObjects(): this;
+    /**
+     * Replace all the receiver's content with content of the argument.
+     * If argument is an empty array receiver will be cleared.
+     */
+    setObjects(objects: AnyArray<T>): this;
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    removeObject(object: T): T;
+    /**
+     * Removes each object in the passed array from the receiver.
+     */
+    removeObjects(objects: AnyArray<T>): this;
+    /**
+     * __Required.__ You must implement this method to apply this mixin.
+     */
+    addObject(object: T): T;
+    /**
+     * Adds each object in the passed enumerable to the receiver.
+     */
+    addObjects(objects: AnyArray<T>): this;
+  }
 
-declare const MutableArray: Mixin;
-export default MutableArray;
+  const MutableArray: Mixin;
+  export default MutableArray;
+}
diff --git a/types/preview/@ember/array/proxy.d.ts b/types/preview/@ember/array/proxy.d.ts
index 590f65fc2e7..37efc898204 100644
--- a/types/preview/@ember/array/proxy.d.ts
+++ b/types/preview/@ember/array/proxy.d.ts
@@ -1,31 +1,29 @@
-import type MutableArray from '@ember/array/mutable';
-import EmberObject from '@ember/object';
-
-interface EmberArrayLike<T> {
-  length: number;
-  objectAt(idx: number): T | undefined;
-}
-
-/**
- * An ArrayProxy wraps any other object that is a native or Ember `Array`
- * (checked with [`Ember.isArray`](https://api.emberjs.com/ember/release/functions/@ember%2Farray/isArray)),
- * forwarding all requests. This makes it very useful for a number of
- * binding use cases or other cases where being able to swap out the
- * underlying array is useful.
- *
- * NOTE: Attempting to mutate the underlying content of an object that
- * is not a `MutableArray` (e.g. a native Javascript Array) may not
- * behave as expected. [`Ember.A`](https://api.emberjs.com/ember/release/functions/@ember%2Farray/A)
- * may be used in this case.
- */
-export default interface ArrayProxy<T> extends MutableArray<T> {}
-export default class ArrayProxy<T> extends EmberObject {
-  content: T[] | EmberArrayLike<T>;
+declare module '@ember/array/proxy' {
+  import Array from '@ember/array';
+  import type MutableArray from '@ember/array/mutable';
+  import EmberObject from '@ember/object';
 
   /**
-   * Should actually retrieve the object at the specified index from the
-   * content. You can override this method in subclasses to transform the
-   * content item to something new.
+   * An ArrayProxy wraps any other object that is a native or Ember `Array`
+   * (checked with [`Ember.isArray`](https://api.emberjs.com/ember/release/functions/@ember%2Farray/isArray)),
+   * forwarding all requests. This makes it very useful for a number of
+   * binding use cases or other cases where being able to swap out the
+   * underlying array is useful.
+   *
+   * NOTE: Attempting to mutate the underlying content of an object that
+   * is not a `MutableArray` (e.g. a native Javascript Array) may not
+   * behave as expected. [`Ember.A`](https://api.emberjs.com/ember/release/functions/@ember%2Farray/A)
+   * may be used in this case.
    */
-  objectAtContent(idx: number): T | undefined;
+  export default interface ArrayProxy<T> extends MutableArray<T> {}
+  export default class ArrayProxy<T> extends EmberObject {
+    content: T[] | Array<T>;
+
+    /**
+     * Should actually retrieve the object at the specified index from the
+     * content. You can override this method in subclasses to transform the
+     * content item to something new.
+     */
+    objectAtContent(idx: number): T | undefined;
+  }
 }
diff --git a/types/preview/@ember/array/test/array-ext.ts b/types/preview/@ember/array/test/array-ext.ts
deleted file mode 100755
index beeba72a113..00000000000
--- a/types/preview/@ember/array/test/array-ext.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { assertType } from './lib/assert';
-import EmberObject from '@ember/object';
-import ArrayPrototypeExtensions from '@ember/array/types/prototype-extensions';
-
-declare global {
-  interface Array<T> extends ArrayPrototypeExtensions<T> {}
-}
-
-class Person extends EmberObject {
-  declare name: string;
-}
-
-const person = Person.create({ name: 'Joe' });
-const array = [person];
-
-assertType<number>(array.get('length'));
-assertType<Person | undefined>(array.get('firstObject'));
-assertType<string[]>(array.mapBy('name'));
-assertType<string[]>(array.map((p) => p.get('name')));
-assertType<Person[]>(array.sortBy('name'));
-assertType<Person[]>(array.uniq());
-assertType<Person[]>(array.uniqBy('name'));
-assertType<Person[]>(array.uniqBy((p) => p.get('name')));
diff --git a/types/preview/@ember/array/test/lib/assert.ts b/types/preview/@ember/array/test/lib/assert.ts
deleted file mode 100755
index dad227ab5e9..00000000000
--- a/types/preview/@ember/array/test/lib/assert.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Static assertion that `value` has type `T` */
-export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/array/types/prototype-extensions.d.ts b/types/preview/@ember/array/types/prototype-extensions.d.ts
index 4609906857a..20db9620ebd 100644
--- a/types/preview/@ember/array/types/prototype-extensions.d.ts
+++ b/types/preview/@ember/array/types/prototype-extensions.d.ts
@@ -1,5 +1,6 @@
-// import Ember from 'ember';
-import Observable from '@ember/object/observable';
-import MutableArray from '@ember/array/mutable';
+declare module '@ember/array/types/prototype-extensions' {
+  import Observable from '@ember/object/observable';
+  import MutableArray from '@ember/array/mutable';
 
-export default interface ArrayPrototypeExtensions<T> extends MutableArray<T>, Observable {}
+  export default interface ArrayPrototypeExtensions<T> extends MutableArray<T>, Observable {}
+}
diff --git a/types/preview/@ember/component/-private/class-names-support.d.ts b/types/preview/@ember/component/-private/class-names-support.d.ts
index 0944d06a3ad..a8dc9cf4e28 100644
--- a/types/preview/@ember/component/-private/class-names-support.d.ts
+++ b/types/preview/@ember/component/-private/class-names-support.d.ts
@@ -1,25 +1,27 @@
-import Mixin from '@ember/object/mixin';
+declare module '@ember/component/-private/class-names-support' {
+  import Mixin from '@ember/object/mixin';
 
-interface ClassNamesSupport {
-  /**
-   * A list of properties of the view to apply as class names. If the property is a string value,
-   * the value of that string will be applied as a class name.
-   *
-   * If the value of the property is a Boolean, the name of that property is added as a dasherized
-   * class name.
-   *
-   * If you would prefer to use a custom value instead of the dasherized property name, you can
-   * pass a binding like this: `classNameBindings: ['isUrgent:urgent']`
-   *
-   * This list of properties is inherited from the component's superclasses as well.
-   */
-  classNameBindings: string[];
-  /**
-   * Standard CSS class names to apply to the view's outer element. This
-   * property automatically inherits any class names defined by the view's
-   * superclasses as well.
-   */
-  classNames: string[];
+  interface ClassNamesSupport {
+    /**
+     * A list of properties of the view to apply as class names. If the property is a string value,
+     * the value of that string will be applied as a class name.
+     *
+     * If the value of the property is a Boolean, the name of that property is added as a dasherized
+     * class name.
+     *
+     * If you would prefer to use a custom value instead of the dasherized property name, you can
+     * pass a binding like this: `classNameBindings: ['isUrgent:urgent']`
+     *
+     * This list of properties is inherited from the component's superclasses as well.
+     */
+    classNameBindings: string[];
+    /**
+     * Standard CSS class names to apply to the view's outer element. This
+     * property automatically inherits any class names defined by the view's
+     * superclasses as well.
+     */
+    classNames: string[];
+  }
+  const ClassNamesSupport: Mixin;
+  export default ClassNamesSupport;
 }
-declare const ClassNamesSupport: Mixin;
-export default ClassNamesSupport;
diff --git a/types/preview/@ember/component/-private/core-view.d.ts b/types/preview/@ember/component/-private/core-view.d.ts
index 6a98d1716fb..cc1b307640f 100644
--- a/types/preview/@ember/component/-private/core-view.d.ts
+++ b/types/preview/@ember/component/-private/core-view.d.ts
@@ -1,12 +1,14 @@
-import EmberObject from '@ember/object';
-import type Evented from '@ember/object/evented';
-import type ActionHandler from '@ember/object/-private/action-handler';
+declare module '@ember/component/-private/core-view' {
+  import EmberObject from '@ember/object';
+  import type Evented from '@ember/object/evented';
+  import type ActionHandler from '@ember/object/-private/action-handler';
 
-/**
- * Ember.CoreView is an abstract class that exists to give view-like behavior to both Ember's main
- * view class Ember.Component and other classes that don't need the full functionality of Ember.Component.
- *
- * Unless you have specific needs for CoreView, you will use Ember.Component in your applications.
- */
-export default class CoreView extends EmberObject {}
-export default interface CoreView extends Evented, ActionHandler {}
+  /**
+   * Ember.CoreView is an abstract class that exists to give view-like behavior to both Ember's main
+   * view class Ember.Component and other classes that don't need the full functionality of Ember.Component.
+   *
+   * Unless you have specific needs for CoreView, you will use Ember.Component in your applications.
+   */
+  export default class CoreView extends EmberObject {}
+  export default interface CoreView extends Evented, ActionHandler {}
+}
diff --git a/types/preview/@ember/component/-private/glimmer-interfaces.d.ts b/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
index 1b27d8f716f..e77e6f1eb89 100644
--- a/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
+++ b/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
@@ -1,44 +1,46 @@
-// NOTE: this is a bare-minimum subset of the definitions of the types in
-// `@glimmer/interfaces`, supplied to make the public types in this package
-// accurate.
+declare module '@ember/component/-private/glimmer-interfaces' {
+  // NOTE: this is a bare-minimum subset of the definitions of the types in
+  // `@glimmer/interfaces`, supplied to make the public types in this package
+  // accurate.
 
-// This is only present to "brand" the type, and it brands it in a way that
-// matches [the implementation][1], which *also* uses it as a type-only brand.
-//
-// [1]: https://github.com/glimmerjs/glimmer-vm/blob/d6d776cf3797dafa923bcdad47e1897231ef6539/packages/%40glimmer/interfaces/lib/managers/capabilities.d.ts#L1
-// tslint:disable-next-line:strict-export-declare-modifiers
-declare const CAPABILITIES: unique symbol;
+  // This is only present to "brand" the type, and it brands it in a way that
+  // matches [the implementation][1], which *also* uses it as a type-only brand.
+  //
+  // [1]: https://github.com/glimmerjs/glimmer-vm/blob/d6d776cf3797dafa923bcdad47e1897231ef6539/packages/%40glimmer/interfaces/lib/managers/capabilities.d.ts#L1
+  // tslint:disable-next-line:strict-export-declare-modifiers
+  const CAPABILITIES: unique symbol;
 
-export interface Capabilities {
-  [CAPABILITIES]: true;
-}
+  export interface Capabilities {
+    [CAPABILITIES]: true;
+  }
 
-export interface Arguments {
-  positional: readonly unknown[];
-  named: Record<string, unknown>;
-}
+  export interface Arguments {
+    positional: readonly unknown[];
+    named: Record<string, unknown>;
+  }
 
-export interface ComponentCapabilitiesVersions {
-  '3.4': {
-    asyncLifecycleCallbacks?: boolean;
-    destructor?: boolean;
-  };
+  export interface ComponentCapabilitiesVersions {
+    '3.4': {
+      asyncLifecycleCallbacks?: boolean;
+      destructor?: boolean;
+    };
 
-  '3.13': {
-    asyncLifecycleCallbacks?: boolean;
-    destructor?: boolean;
-    updateHook?: boolean;
-  };
-}
+    '3.13': {
+      asyncLifecycleCallbacks?: boolean;
+      destructor?: boolean;
+      updateHook?: boolean;
+    };
+  }
 
-export interface ComponentCapabilities extends Capabilities {
-  asyncLifeCycleCallbacks: boolean;
-  destructor: boolean;
-  updateHook: boolean;
-}
+  export interface ComponentCapabilities extends Capabilities {
+    asyncLifeCycleCallbacks: boolean;
+    destructor: boolean;
+    updateHook: boolean;
+  }
 
-export interface ComponentManager<ComponentStateBucket> {
-  capabilities: ComponentCapabilities;
-  createComponent(factory: object, args: Arguments): ComponentStateBucket;
-  getContext(instance: ComponentStateBucket): unknown;
+  export interface ComponentManager<ComponentStateBucket> {
+    capabilities: ComponentCapabilities;
+    createComponent(factory: object, args: Arguments): ComponentStateBucket;
+    getContext(instance: ComponentStateBucket): unknown;
+  }
 }
diff --git a/types/preview/@ember/component/-private/signature-utils.d.ts b/types/preview/@ember/component/-private/signature-utils.d.ts
new file mode 100644
index 00000000000..e21679429e4
--- /dev/null
+++ b/types/preview/@ember/component/-private/signature-utils.d.ts
@@ -0,0 +1,107 @@
+declare module '@ember/component/-private/signature-utils' {
+  /**
+   * @module Type utilities for signatures
+   */
+
+  // Type-only "symbol" to use with `EmptyObject` below, so that it is *not*
+  // equivalent to an empty interface.
+  const Empty: unique symbol;
+
+  /**
+   * This provides us a way to have a "fallback" which represents an empty object,
+   * without the downsides of how TS treats `{}`. Specifically: this will
+   * correctly leverage "excess property checking" so that, given a component
+   * which has no named args, if someone invokes it with any named args, they will
+   * get a type error.
+   *
+   * @internal This is exported so declaration emit works (if it were not emitted,
+   *   declarations which fall back to it would not work). It is *not* intended for
+   *   public usage, and the specific mechanics it uses may change at any time.
+   *   The location of this export *is* part of the public API, because moving it
+   *   will break existing declarations, but is not legal for end users to import
+   *   themselves, so ***DO NOT RELY ON IT***.
+   */
+  export interface EmptyObject {
+    [Empty]?: true;
+  }
+
+  type DefaultPositional = unknown[];
+  type DefaultNamed = EmptyObject;
+
+  type GetOrElse<Obj, K, Fallback> = K extends keyof Obj ? Obj[K] : Fallback;
+
+  /** Given a signature `S`, get back the `Args` type. */
+  type ArgsFor<S> = 'Args' extends keyof S
+    ? {
+        Named: GetOrElse<S['Args'], 'Named', DefaultNamed>;
+        Positional: GetOrElse<S['Args'], 'Positional', []>;
+      }
+    : { Named: DefaultNamed; Positional: [] };
+
+  interface LegacyArgsFor<T> {
+    Named: GetOrElse<T, 'NamedArgs', DefaultNamed>;
+    Positional: GetOrElse<T, 'PositionalArgs', DefaultPositional>;
+  }
+
+  // This type allows us to present a slightly-less-obtuse error message
+  // when attempting to resolve the signature of a helper that doesn't have
+  // one declared from within a tool like Glint.
+  const BadType: unique symbol;
+  /** @internal This is *only* exported to use in tests! */
+  export interface BadType<Message> {
+    [BadType]: Message;
+  }
+
+  interface MissingSignatureArgs {
+    Named: BadType<'This helper is missing a signature'>;
+    Positional: unknown[];
+  }
+
+  /**
+   * Given any allowed shorthand form of a signature, desugars it to its full
+   * expanded type.
+   *
+   * @internal This is only exported so we can avoid duplicating it in
+   *   [Glint](https://github.com/typed-ember/glint) or other such tooling. It is
+   *   *not* intended for public usage, and the specific mechanics it uses may
+   *   change at any time. Although the signature produced by is part of Glimmer's
+   *   public API the existence and mechanics of this specific symbol are *not*,
+   *   so ***DO NOT RELY ON IT***.
+   */
+  // This is similar but not identical to the `ExpandSignature` type used in the
+  // Glimmer Component API: it uses the same basic mechanics, but does not have
+  // an identical signature because we had not yet normalized the `Signature` when
+  // we designed the first pass of this. In the future, we will be able to make
+  // all `ExpandSignature` types fully general to work with *any* invokable. But
+  // "future" here probably means Ember v5. :sobbing:
+  // prettier-ignore
+  export interface ExpandSignature<T> {
+  Args:
+    // Is this the default (i.e. unspecified) signature?
+    // Then return our special "missing signature" type
+    unknown extends T ? MissingSignatureArgs :
+    // Is this a `Signature`? Then use `Signature` args
+    keyof T extends 'Args' | 'Return' ? ArgsFor<T> :
+    // Otherwise fall back to classic `Args`.
+    LegacyArgsFor<T>;
+  Return: 'Return' extends keyof T ? T['Return'] : unknown;
+}
+
+  // The `unknown extends S` checks on both of these are here to preserve backward
+  // compatibility with the existing non-`Signature` definition. When migrating
+  // into Ember or otherwise making a breaking change, we can drop the "default"
+  // in favor of just using `ExpandSignature`.
+  // prettier-ignore
+  export type NamedArgs<S> =
+  unknown extends S
+  ? Record<string, unknown>
+  : ExpandSignature<S>['Args']['Named'];
+
+  // prettier-ignore
+  export type PositionalArgs<S> =
+  unknown extends S
+  ? unknown[]
+  : ExpandSignature<S>['Args']['Positional'];
+
+  export type Return<S> = GetOrElse<S, 'Return', unknown>;
+}
diff --git a/types/preview/@ember/component/-private/view-mixin.d.ts b/types/preview/@ember/component/-private/view-mixin.d.ts
index d330e420e46..152f75af973 100644
--- a/types/preview/@ember/component/-private/view-mixin.d.ts
+++ b/types/preview/@ember/component/-private/view-mixin.d.ts
@@ -1,57 +1,59 @@
-import Mixin from '@ember/object/mixin';
+declare module '@ember/component/-private/view-mixin' {
+  import Mixin from '@ember/object/mixin';
 
-interface ViewMixin {
-  /**
-   * A list of properties of the view to apply as attributes. If the property
-   * is a string value, the value of that string will be applied as the value
-   * for an attribute of the property's name.
-   */
-  attributeBindings: string[];
-  /**
-   * Returns the current DOM element for the view.
-   */
-  element: Element;
-  /**
-   * The HTML `id` of the view's element in the DOM. You can provide this
-   * value yourself but it must be unique (just as in HTML):
-   */
-  elementId: string;
-  /**
-   * Tag name for the view's outer element. The tag name is only used when an
-   * element is first created. If you change the `tagName` for an element, you
-   * must destroy and recreate the view element.
-   */
-  tagName: string;
-  /**
-   * Renders the view again. This will work regardless of whether the
-   * view is already in the DOM or not. If the view is in the DOM, the
-   * rendering process will be deferred to give bindings a chance
-   * to synchronize.
-   */
-  rerender(): void;
-  /**
-   * Called when a view is going to insert an element into the DOM.
-   */
-  willInsertElement(): void;
-  /**
-   * Called when the element of the view has been inserted into the DOM.
-   * Override this function to do any set up that requires an element
-   * in the document body.
-   */
-  didInsertElement(): void;
-  /**
-   * Called when the view is about to rerender, but before anything has
-   * been torn down. This is a good opportunity to tear down any manual
-   * observers you have installed based on the DOM state
-   */
-  willClearRender(): void;
-  /**
-   * Called when the element of the view is going to be destroyed. Override
-   * this function to do any teardown that requires an element, like removing
-   * event listeners.
-   */
-  willDestroyElement(): void;
-}
-declare const ViewMixin: Mixin;
+  interface ViewMixin {
+    /**
+     * A list of properties of the view to apply as attributes. If the property
+     * is a string value, the value of that string will be applied as the value
+     * for an attribute of the property's name.
+     */
+    attributeBindings: string[];
+    /**
+     * Returns the current DOM element for the view.
+     */
+    element: Element;
+    /**
+     * The HTML `id` of the view's element in the DOM. You can provide this
+     * value yourself but it must be unique (just as in HTML):
+     */
+    elementId: string;
+    /**
+     * Tag name for the view's outer element. The tag name is only used when an
+     * element is first created. If you change the `tagName` for an element, you
+     * must destroy and recreate the view element.
+     */
+    tagName: string;
+    /**
+     * Renders the view again. This will work regardless of whether the
+     * view is already in the DOM or not. If the view is in the DOM, the
+     * rendering process will be deferred to give bindings a chance
+     * to synchronize.
+     */
+    rerender(): void;
+    /**
+     * Called when a view is going to insert an element into the DOM.
+     */
+    willInsertElement(): void;
+    /**
+     * Called when the element of the view has been inserted into the DOM.
+     * Override this function to do any set up that requires an element
+     * in the document body.
+     */
+    didInsertElement(): void;
+    /**
+     * Called when the view is about to rerender, but before anything has
+     * been torn down. This is a good opportunity to tear down any manual
+     * observers you have installed based on the DOM state
+     */
+    willClearRender(): void;
+    /**
+     * Called when the element of the view is going to be destroyed. Override
+     * this function to do any teardown that requires an element, like removing
+     * event listeners.
+     */
+    willDestroyElement(): void;
+  }
+  const ViewMixin: Mixin;
 
-export default ViewMixin;
+  export default ViewMixin;
+}
diff --git a/types/preview/@ember/component/helper.d.ts b/types/preview/@ember/component/helper.d.ts
index 1e41c007ce0..d4c00902a8c 100644
--- a/types/preview/@ember/component/helper.d.ts
+++ b/types/preview/@ember/component/helper.d.ts
@@ -1,200 +1,122 @@
-import EmberObject from '@ember/object';
-import { Opaque } from 'ember/-private/type-utils';
+declare module '@ember/component/helper' {
+  import EmberObject from '@ember/object';
+  import { Opaque } from 'ember/-private/type-utils';
+  import {
+    DefaultNamed,
+    DefaultPositional,
+    EmptyObject,
+    ExpandSignature,
+    NamedArgs,
+    PositionalArgs,
+    Return,
+  } from '@ember/component/-private/signature-utils';
+
+  // Immediately re-export these.
+  export { EmptyObject, ExpandSignature };
 
-// --- Type utilities for signatures --- //
-// Type-only "symbol" to use with `EmptyObject` below, so that it is *not*
-// equivalent to an empty interface.
-declare const Empty: unique symbol;
-
-/**
- * This provides us a way to have a "fallback" which represents an empty object,
- * without the downsides of how TS treats `{}`. Specifically: this will
- * correctly leverage "excess property checking" so that, given a component
- * which has no named args, if someone invokes it with any named args, they will
- * get a type error.
- *
- * @internal This is exported so declaration emit works (if it were not emitted,
- *   declarations which fall back to it would not work). It is *not* intended for
- *   public usage, and the specific mechanics it uses may change at any time.
- *   The location of this export *is* part of the public API, because moving it
- *   will break existing declarations, but is not legal for end users to import
- *   themselves, so ***DO NOT RELY ON IT***.
- */
-export interface EmptyObject {
-  [Empty]?: true;
-}
-
-type DefaultPositional = unknown[];
-type DefaultNamed = EmptyObject;
-
-/**
- * The public shape of a helper.
- * @deprecated Do not use this directly. Instead, write a `Signature` with the
- *   "normal" signature shape: `Args: { Named: { ... }, Positional: [...] }`.
- */
-export interface HelperSignature {
-  NamedArgs?: DefaultNamed;
-  PositionalArgs?: DefaultPositional;
-  Return?: unknown;
-}
-
-type GetOrElse<Obj, K, Fallback> = K extends keyof Obj ? Obj[K] : Fallback;
-
-/** Given a signature `S`, get back the `Args` type. */
-type ArgsFor<S> = 'Args' extends keyof S
-  ? {
-      Named: GetOrElse<S['Args'], 'Named', DefaultNamed>;
-      Positional: GetOrElse<S['Args'], 'Positional', []>;
-    }
-  : { Named: DefaultNamed; Positional: [] };
-
-interface LegacyArgsFor<T> {
-  Named: GetOrElse<T, 'NamedArgs', DefaultNamed>;
-  Positional: GetOrElse<T, 'PositionalArgs', DefaultPositional>;
-}
-
-// This type allows us to present a slightly-less-obtuse error message
-// when attempting to resolve the signature of a helper that doesn't have
-// one declared from within a tool like Glint.
-declare const BadType: unique symbol;
-interface BadType<Message> {
-  [BadType]: Message;
-}
-
-interface MissingSignatureArgs {
-  Named: BadType<'This helper is missing a signature'>;
-  Positional: unknown[];
-}
-
-/**
- * Given any allowed shorthand form of a signature, desugars it to its full
- * expanded type.
- *
- * @internal This is only exported so we can avoid duplicating it in
- *   [Glint](https://github.com/typed-ember/glint) or other such tooling. It is
- *   *not* intended for public usage, and the specific mechanics it uses may
- *   change at any time. Although the signature produced by is part of Glimmer's
- *   public API the existence and mechanics of this specific symbol are *not*,
- *   so ***DO NOT RELY ON IT***.
- */
-// This is similar but not identical to the `ExpandSignature` type used in the
-// Glimmer Component API: it uses the same basic mechanics, but does not have
-// an identical signature because we had not yet normalized the `Signature` when
-// we designed the first pass of this. In the future, we will be able to make
-// all `ExpandSignature` types fully general to work with *any* invokable. But
-// "future" here probably means Ember v5. :sobbing:
-export interface ExpandSignature<T> {
-  Args: unknown extends T // Is this the default (i.e. unspecified) signature?
-    ? MissingSignatureArgs // Then return our special "missing signature" type
-    : keyof T extends 'Args' | 'Return' // Is this a `Signature`?
-    ? ArgsFor<T> // Then use `Signature` args
-    : LegacyArgsFor<T>; // Otherwise fall back to classic `Args`.
-  Return: 'Return' extends keyof T ? T['Return'] : unknown;
-}
-
-// The `unknown extends S` checks on both of these are here to preserve backward
-// compatibility with the existing non-`Signature` definition. When migrating
-// into Ember or otherwise making a breaking change, we can drop the "default"
-// in favor of just using `ExpandSignature`.
-type NamedArgs<S> = unknown extends S
-  ? Record<string, unknown>
-  : ExpandSignature<S>['Args']['Named'];
-type PositionalArgs<S> = unknown extends S ? unknown[] : ExpandSignature<S>['Args']['Positional'];
-
-type Return<S> = GetOrElse<S, 'Return', unknown>;
-
-/**
- * Ember Helpers are functions that can compute values, and are used in templates.
- * For example, this code calls a helper named `format-currency`:
- */
-export default class Helper<S = unknown> extends EmberObject {
   /**
-   * In many cases, the ceremony of a full `Ember.Helper` class is not required.
-   * The `helper` method create pure-function helpers without instances. For
-   * example:
+   * The public shape of a helper.
+   * @deprecated Do not use this directly. Instead, write a `Signature` with the
+   *   "normal" signature shape: `Args: { Named: { ... }, Positional: [...] }`.
    */
-  static helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
-    helper: (positional: P, named: N) => R
-  ): Helper<{ Args: { Positional: P; Named: N }; Return: R }>;
+  export interface HelperSignature {
+    NamedArgs?: DefaultNamed;
+    PositionalArgs?: DefaultPositional;
+    Return?: unknown;
+  }
+
   /**
-   * Override this function when writing a class-based helper.
+   * Ember Helpers are functions that can compute values, and are used in templates.
+   * For example, this code calls a helper named `format-currency`:
    */
-  compute(positional: PositionalArgs<S>, named: NamedArgs<S>): Return<S>;
+  export default class Helper<S = unknown> extends EmberObject {
+    /**
+     * In many cases, the ceremony of a full `Ember.Helper` class is not required.
+     * The `helper` method create pure-function helpers without instances. For
+     * example:
+     */
+    static helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
+      helper: (positional: P, named: N) => R
+    ): Helper<{ Args: { Positional: P; Named: N }; Return: R }>;
+    /**
+     * Override this function when writing a class-based helper.
+     */
+    compute(positional: PositionalArgs<S>, named: NamedArgs<S>): Return<S>;
+    /**
+     * On a class-based helper, it may be useful to force a recomputation of that
+     * helpers value. This is akin to `rerender` on a component.
+     */
+    recompute(): void;
+  }
+
+  // The generic here is for a *signature*: a way to hang information for tools
+  // like Glint which can provide type checking for component templates using
+  // information supplied via this generic. While it may appear useless on this
+  // class definition and extension, it is used by external tools and should not
+  // be removed.
+  export default interface Helper<S> extends Opaque<S> {}
+
+  // This type exists to provide a non-user-constructible, non-subclassable
+  // type representing the conceptual "instance type" of a function helper.
+  // The abstract field of type `never` presents subclassing in userspace of
+  // the value returned from `helper()`. By extending `Helper<S>`, any
+  // augmentations of the `Helper` type performed by tools like Glint will
+  // also apply to function-based helpers as well.
+  export abstract class FunctionBasedHelperInstance<S> extends Helper<S> {
+    protected abstract __concrete__: never;
+  }
+
   /**
-   * On a class-based helper, it may be useful to force a recomputation of that
-   * helpers value. This is akin to `rerender` on a component.
+   * The type of a function-based helper.
+   *
+   * @note This is *not* user-constructible: it is exported only so that the type
+   *   returned by the `helper` function can be named (and indeed can be exported
+   *   like `export default helper(...)` safely).
    */
-  recompute(): void;
-}
-
-// The generic here is for a *signature: a way to hang information for tools
-// like Glint which can provide typey checking for component templates using
-// information supplied via this generic. While it may appear useless on this
-// class definition and extension, it is used by external tools and should not
-// be removed.
-// tslint:disable-next-line:no-unnecessary-generics
-export default interface Helper<S> extends Opaque<S> {}
+  // Making `FunctionBasedHelper` a bare constructor type allows for type
+  // parameters to be preserved when `helper()` is passed a generic function.
+  // By making it `abstract` and impossible to subclass (see above), we prevent
+  // users from attempting to instantiate a return value from `helper()`.
+  export type FunctionBasedHelper<S> = abstract new () => FunctionBasedHelperInstance<S>;
 
-// This type exists to provide a non-user-constructible, non-subclassable
-// type representing the conceptual "instance type" of a function helper.
-// The abstract field of type `never` presents subclassing in userspace of
-// the value returned from `helper()`. By extending `Helper<S>`, any
-// augmentations of the `Helper` type performed by tools like Glint will
-// also apply to function-based helpers as well.
-export abstract class FunctionBasedHelperInstance<S> extends Helper<S> {
-  protected abstract __concrete__: never;
+  /**
+   * In many cases, the ceremony of a full `Helper` class is not required.
+   * The `helper` method create pure-function helpers without instances. For
+   * example:
+   * ```app/helpers/format-currency.js
+   * import { helper } from '@ember/component/helper';
+   * export default helper(function(params, hash) {
+   *   let cents = params[0];
+   *   let currency = hash.currency;
+   *   return `${currency}${cents * 0.01}`;
+   * });
+   * ```
+   */
+  // This overload allows users to write types directly on the callback passed to
+  // the `helper` function and infer the resulting type correctly.
+  export function helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
+    helperFn: (positional: P, named: N) => R
+  ): FunctionBasedHelper<{
+    Args: {
+      Positional: P;
+      Named: N;
+    };
+    Return: R;
+  }>;
+
+  // This overload allows users to provide a `Signature` type explicitly at the
+  // helper definition site, e.g. `helper<Sig>((pos, named) => {...})`. **Note:**
+  // this overload must appear second, since TS' inference engine will not
+  // correctly infer the type of `S` here from the types on the supplied callback.
+  export function helper<S>(
+    helperFn: (positional: PositionalArgs<S>, named: NamedArgs<S>) => Return<S>
+  ): FunctionBasedHelper<{
+    Args: {
+      Positional: PositionalArgs<S>;
+      Named: NamedArgs<S>;
+    };
+    Return: Return<S>;
+  }>;
+
+  export {};
 }
-
-/**
- * The type of a function-based helper.
- *
- * @note This is *not* user-constructible: it is exported only so that the type
- *   returned by the `helper` function can be named (and indeed can be exported
- *   like `export default helper(...)` safely).
- */
-// Making `FunctionBasedHelper` a bare constructor type allows for type
-// parameters to be preserved when `helper()` is passed a generic function.
-// By making it `abstract` and impossible to subclass (see above), we prevent
-// users from attempting to instantiate a return value from `helper()`.
-export type FunctionBasedHelper<S> = abstract new () => FunctionBasedHelperInstance<S>;
-
-/**
- * In many cases, the ceremony of a full `Helper` class is not required.
- * The `helper` method create pure-function helpers without instances. For
- * example:
- * ```app/helpers/format-currency.js
- * import { helper } from '@ember/component/helper';
- * export default helper(function(params, hash) {
- *   let cents = params[0];
- *   let currency = hash.currency;
- *   return `${currency}${cents * 0.01}`;
- * });
- * ```
- */
-// This overload allows users to write types directly on the callback passed to
-// the `helper` function and infer the resulting type correctly.
-export function helper<P extends DefaultPositional, N = EmptyObject, R = unknown>(
-  helperFn: (positional: P, named: N) => R
-): FunctionBasedHelper<{
-  Args: {
-    Positional: P;
-    Named: N;
-  };
-  Return: R;
-}>;
-
-// This overload allows users to provide a `Signature` type explicitly at the
-// helper definition site, e.g. `helper<Sig>((pos, named) => {...})`. **Note:**
-// this overload must appear second, since TS' inference engine will not
-// correctly infer the type of `S` here from the types on the supplied callback.
-export function helper<S>(
-  helperFn: (positional: PositionalArgs<S>, named: NamedArgs<S>) => Return<S>
-): FunctionBasedHelper<{
-  Args: {
-    Positional: PositionalArgs<S>;
-    Named: NamedArgs<S>;
-  };
-  Return: Return<S>;
-}>;
-
-export {};
diff --git a/types/preview/@ember/component/index.d.ts b/types/preview/@ember/component/index.d.ts
index 069e9d2c923..c78cb25c62a 100644
--- a/types/preview/@ember/component/index.d.ts
+++ b/types/preview/@ember/component/index.d.ts
@@ -1,131 +1,133 @@
-import CoreView from '@ember/component/-private/core-view';
-import ClassNamesSupport from '@ember/component/-private/class-names-support';
-import ViewMixin from '@ember/component/-private/view-mixin';
-import { ComponentManager, Capabilities } from './-private/glimmer-interfaces';
-import { Opaque } from 'ember/-private/type-utils';
+declare module '@ember/component' {
+  import CoreView from '@ember/component/-private/core-view';
+  import ClassNamesSupport from '@ember/component/-private/class-names-support';
+  import ViewMixin from '@ember/component/-private/view-mixin';
+  import { ComponentManager, Capabilities } from '@ember/component/-private/glimmer-interfaces';
+  import { Opaque } from 'ember/-private/type-utils';
 
-// Re-export these types so people can use them!
-export { ComponentManager, Capabilities };
+  // Re-export these types so people can use them!
+  export { ComponentManager, Capabilities };
 
-interface TemplateFactory {
-  __htmlbars_inline_precompile_template_factory: any;
-}
+  interface TemplateFactory {
+    __htmlbars_inline_precompile_template_factory: any;
+  }
+
+  // The generic here is for a *signature: a way to hang information for tools
+  // like Glint which can provide typey checking for component templates using
+  // information supplied via this generic. While it may appear useless on this
+  // class definition and extension, it is used by external tools and should not
+  // be removed.
+  // tslint:disable-next-line:no-unnecessary-generics
+  export default interface Component<S = unknown> extends ViewMixin, ClassNamesSupport, Opaque<S> { }
+  export default class Component<S = unknown> extends CoreView {
+    // methods
+    readDOMAttr(name: string): string;
+    // properties
+    /**
+     * The WAI-ARIA role of the control represented by this view. For example, a button may have a
+     * role of type 'button', or a pane may have a role of type 'alertdialog'. This property is
+     * used by assistive software to help visually challenged users navigate rich web applications.
+     */
+    ariaRole: string;
+    /**
+     * The HTML id of the component's element in the DOM. You can provide this value yourself but
+     * it must be unique (just as in HTML):
+     *
+     * If not manually set a default value will be provided by the framework. Once rendered an
+     * element's elementId is considered immutable and you should never change it. If you need
+     * to compute a dynamic value for the elementId, you should do this when the component or
+     * element is being instantiated:
+     */
+    elementId: string;
+    /**
+     * A component may contain a layout. A layout is a regular template but supersedes the template
+     * property during rendering. It is the responsibility of the layout template to retrieve the
+     * template property from the component (or alternatively, call Handlebars.helpers.yield,
+     * {{yield}}) to render it in the correct location. This is useful for a component that has a
+     * shared wrapper, but which delegates the rendering of the contents of the wrapper to the
+     * template property on a subclass.
+     */
+    layout: TemplateFactory | string;
+    /**
+     * Enables components to take a list of parameters as arguments.
+     */
+    static positionalParams: string[] | string;
+    // events
+    /**
+     * Called when the attributes passed into the component have been updated. Called both during the
+     * initial render of a container and during a rerender. Can be used in place of an observer; code
+     * placed here will be executed every time any attribute updates.
+     */
+    didReceiveAttrs(): void;
+    /**
+     * Called after a component has been rendered, both on initial render and in subsequent rerenders.
+     */
+    didRender(): void;
+    /**
+     * Called when the component has updated and rerendered itself. Called only during a rerender,
+     * not during an initial render.
+     */
+    didUpdate(): void;
+    /**
+     * Called when the attributes passed into the component have been changed. Called only during a
+     * rerender, not during an initial render.
+     */
+    didUpdateAttrs(): void;
+    /**
+     * Called before a component has been rendered, both on initial render and in subsequent rerenders.
+     */
+    willRender(): void;
+    /**
+     * Called when the component is about to update and rerender itself. Called only during a rerender,
+     * not during an initial render.
+     */
+    willUpdate(): void;
+
+    /**
+     * `reopen()` was deprecated and removed from `Component`. It is given an
+     * illegitimate type in these types so that you cannot call it or use it!
+     * Unfortunately, it cannot actually be *removed* from this type, because TS
+     * rightly complains that `Component` is no longer a valid subtype of the
+     * `EmberObject` base class, and will not let you use it.
+     */
+    static reopen(): never;
+  }
 
-// The generic here is for a *signature: a way to hang information for tools
-// like Glint which can provide typey checking for component templates using
-// information supplied via this generic. While it may appear useless on this
-// class definition and extension, it is used by external tools and should not
-// be removed.
-// tslint:disable-next-line:no-unnecessary-generics
-export default interface Component<S = unknown> extends ViewMixin, ClassNamesSupport, Opaque<S> {}
-export default class Component<S = unknown> extends CoreView {
-  // methods
-  readDOMAttr(name: string): string;
-  // properties
-  /**
-   * The WAI-ARIA role of the control represented by this view. For example, a button may have a
-   * role of type 'button', or a pane may have a role of type 'alertdialog'. This property is
-   * used by assistive software to help visually challenged users navigate rich web applications.
-   */
-  ariaRole: string;
   /**
-   * The HTML id of the component's element in the DOM. You can provide this value yourself but
-   * it must be unique (just as in HTML):
+   * Associate a class with a component manager (an object that is responsible for
+   * coordinating the lifecycle events that occurs when invoking, rendering and
+   * re-rendering a component).
    *
-   * If not manually set a default value will be provided by the framework. Once rendered an
-   * element's elementId is considered immutable and you should never change it. If you need
-   * to compute a dynamic value for the elementId, you should do this when the component or
-   * element is being instantiated:
-   */
-  elementId: string;
-  /**
-   * A component may contain a layout. A layout is a regular template but supersedes the template
-   * property during rendering. It is the responsibility of the layout template to retrieve the
-   * template property from the component (or alternatively, call Handlebars.helpers.yield,
-   * {{yield}}) to render it in the correct location. This is useful for a component that has a
-   * shared wrapper, but which delegates the rendering of the contents of the wrapper to the
-   * template property on a subclass.
-   */
-  layout: TemplateFactory | string;
-  /**
-   * Enables components to take a list of parameters as arguments.
-   */
-  static positionalParams: string[] | string;
-  // events
-  /**
-   * Called when the attributes passed into the component have been updated. Called both during the
-   * initial render of a container and during a rerender. Can be used in place of an observer; code
-   * placed here will be executed every time any attribute updates.
-   */
-  didReceiveAttrs(): void;
-  /**
-   * Called after a component has been rendered, both on initial render and in subsequent rerenders.
-   */
-  didRender(): void;
-  /**
-   * Called when the component has updated and rerendered itself. Called only during a rerender,
-   * not during an initial render.
+   * @param managerFactory a function to create the owner for an object
+   * @param object the object to associate with the componetn manager
+   * @return the same object passed in, now associated with the manager
    */
-  didUpdate(): void;
-  /**
-   * Called when the attributes passed into the component have been changed. Called only during a
-   * rerender, not during an initial render.
-   */
-  didUpdateAttrs(): void;
-  /**
-   * Called before a component has been rendered, both on initial render and in subsequent rerenders.
-   */
-  willRender(): void;
+  export function setComponentManager<T>(
+    managerFactory: (owner: unknown) => ComponentManager<unknown>,
+    object: T
+  ): T;
+
+  // In normal TypeScript, these built-in components are essentially opaque tokens
+  // that just need to be importable. Declaring them with unique interfaces
+  // like this, however, gives tools like Glint (that DO have a richer
+  // notion of what they are) a place to install more detailed type information.
+  export interface Input extends Opaque<'component:input'> { }
+  export interface Textarea extends Opaque<'component:textarea'> { }
+
   /**
-   * Called when the component is about to update and rerender itself. Called only during a rerender,
-   * not during an initial render.
+   * The `Input` component lets you create an HTML `<input>` element.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/Input?anchor=Input
    */
-  willUpdate(): void;
+  export const Input: Input;
 
   /**
-   * `reopen()` was deprecated and removed from `Component`. It is given an
-   * illegitimate type in these types so that you cannot call it or use it!
-   * Unfortunately, it cannot actually be *removed* from this type, because TS
-   * rightly complains that `Component` is no longer a valid subtype of the
-   * `EmberObject` base class, and will not let you use it.
+   * The `Textarea` component inserts a new instance of `<textarea>` tag into the template.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/Textarea?anchor=Textarea
    */
-  static reopen(): never;
-}
-
-/**
- * Associate a class with a component manager (an object that is responsible for
- * coordinating the lifecycle events that occurs when invoking, rendering and
- * re-rendering a component).
- *
- * @param managerFactory a function to create the owner for an object
- * @param object the object to associate with the componetn manager
- * @return the same object passed in, now associated with the manager
- */
-export function setComponentManager<T>(
-  managerFactory: (owner: unknown) => ComponentManager<unknown>,
-  object: T
-): T;
-
-// In normal TypeScript, these built-in components are essentially opaque tokens
-// that just need to be importable. Declaring them with unique interfaces
-// like this, however, gives tools like Glint (that DO have a richer
-// notion of what they are) a place to install more detailed type information.
-export interface Input extends Opaque<'component:input'> {}
-export interface Textarea extends Opaque<'component:textarea'> {}
+  export const Textarea: Textarea;
 
-/**
- * The `Input` component lets you create an HTML `<input>` element.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/Input?anchor=Input
- */
-export const Input: Input;
-
-/**
- * The `Textarea` component inserts a new instance of `<textarea>` tag into the template.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/Textarea?anchor=Textarea
- */
-export const Textarea: Textarea;
-
-// Do not export anything but what we *explicitly* say to export.
-export {};
+  // Do not export anything but what we *explicitly* say to export.
+  export { };
+}
diff --git a/types/preview/@ember/component/template-only.d.ts b/types/preview/@ember/component/template-only.d.ts
index 853d3a0e1c9..86762e3dab8 100644
--- a/types/preview/@ember/component/template-only.d.ts
+++ b/types/preview/@ember/component/template-only.d.ts
@@ -1,46 +1,47 @@
-import { Opaque } from 'ember/-private/type-utils';
+declare module '@ember/component/template-only' {
+  import { Opaque } from 'ember/-private/type-utils';
 
-/**
- * Template-only components have no backing class instance, so this in their
- * templates is null. This means that you can only reference passed in arguments
- * via named argument syntax (e.g. `{{@arg}}`):
- *
- * ```hbs
- * {{!--
- *   This does not work, since `this` does not exist
- * --}}
- * <label for="title">Title</label>
- * <Input @value={{this.value}} id="title" />
- * ```
- *
- * Additionally, the mut helper generally can't be used for the same reason:
- *
- * ```hbs
- * {{!-- This does not work --}}
- * <input
- *   value={{this.value}}
- *   onkeyup={{action (mut this.value) target="value"}}
- * />
- * ```
- *
- * Since Octane, a template-only component shares a subset of features that are
- * available in `@glimmer/component`. Such component can be seamlessly
- * "upgraded" to a Glimmer component, when you add a JavaScript file alongside
- * the template.
- */
-export interface TemplateOnlyComponent<S = unknown> extends Opaque<S> {
-  toString(): string;
-}
+  /**
+   * Template-only components have no backing class instance, so this in their
+   * templates is null. This means that you can only reference passed in arguments
+   * via named argument syntax (e.g. `{{@arg}}`):
+   *
+   * ```hbs
+   * {{!--
+   *   This does not work, since `this` does not exist
+   * --}}
+   * <label for="title">Title</label>
+   * <Input @value={{this.value}} id="title" />
+   * ```
+   *
+   * Additionally, the mut helper generally can't be used for the same reason:
+   *
+   * ```hbs
+   * {{!-- This does not work --}}
+   * <input
+   *   value={{this.value}}
+   *   onkeyup={{action (mut this.value) target="value"}}
+   * />
+   * ```
+   *
+   * Since Octane, a template-only component shares a subset of features that are
+   * available in `@glimmer/component`. Such component can be seamlessly
+   * "upgraded" to a Glimmer component, when you add a JavaScript file alongside
+   * the template.
+   */
+  export interface TemplateOnlyComponent<S = unknown> extends Opaque<S> {
+    toString(): string;
+  }
 
-/**
- * A convenience alias for {@link TemplateOnlyComponent}
- */
-export type TOC<S> = TemplateOnlyComponent<S>;
+  /**
+   * A convenience alias for {@link TemplateOnlyComponent}
+   */
+  export type TOC<S> = TemplateOnlyComponent<S>;
 
-// The generic here is for a *signature: a way to hang information for tools
-// like Glint which can provide typey checking for component templates using
-// information supplied via this generic. While it may appear useless on this
-// class definition and extension, it is used by external tools and should not
-// be removed.
-// tslint:disable-next-line:no-unnecessary-generics
-export default function templateOnly<S>(moduleName?: string): TemplateOnlyComponent<S>;
+  // The generic here is for a *signature: a way to hang information for tools
+  // like Glint which can provide typey checking for component templates using
+  // information supplied via this generic. While it may appear useless on this
+  // class definition and extension, it is used by external tools and should not
+  // be removed.
+  export default function templateOnly<S>(moduleName?: string): TemplateOnlyComponent<S>;
+}
diff --git a/types/preview/@ember/component/test/built-ins.ts b/types/preview/@ember/component/test/built-ins.ts
deleted file mode 100644
index ec95d1b50a6..00000000000
--- a/types/preview/@ember/component/test/built-ins.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { Input, Textarea } from '@ember/component';
-
-Input; // $ExpectType Input
-Textarea; // $ExpectType Textarea
diff --git a/types/preview/@ember/component/test/lib/assert.ts b/types/preview/@ember/component/test/lib/assert.ts
deleted file mode 100755
index dad227ab5e9..00000000000
--- a/types/preview/@ember/component/test/lib/assert.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Static assertion that `value` has type `T` */
-export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
index 44d6c65edef..d270a29ecee 100644
--- a/types/preview/@ember/controller/index.d.ts
+++ b/types/preview/@ember/controller/index.d.ts
@@ -1,47 +1,49 @@
-import ActionHandler from '@ember/object/-private/action-handler';
-import Mixin from '@ember/object/mixin';
-import EmberObject from '@ember/object';
-import type { BasicComputedProperty } from '@ember/object/computed';
+declare module '@ember/controller' {
+  import ActionHandler from '@ember/object/-private/action-handler';
+  import Mixin from '@ember/object/mixin';
+  import EmberObject from '@ember/object';
+  import type { BasicComputedProperty } from '@ember/object/computed';
 
-type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
-type QueryParamScopeTypes = 'controller' | 'model';
+  type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
+  type QueryParamScopeTypes = 'controller' | 'model';
 
-interface QueryParamConfig {
-  type?: QueryParamTypes | undefined;
-  scope?: QueryParamScopeTypes | undefined;
-  as?: string | undefined;
-}
+  interface QueryParamConfig {
+    type?: QueryParamTypes | undefined;
+    scope?: QueryParamScopeTypes | undefined;
+    as?: string | undefined;
+  }
 
-/**
- * Additional methods for the Controller.
- */
-export interface ControllerMixin extends ActionHandler {
-  /**
-   * @deprecated until 5.0. Use `RouterService.replaceWith` instead.
-   */
-  replaceRoute(name: string, ...args: any[]): void;
   /**
-   * @deprecated until 5.0. Use `RouterService.transitionTo` instead.
+   * Additional methods for the Controller.
    */
-  transitionToRoute(name: string, ...args: any[]): void;
-  /**
-   * @deprecated until 5.0. Use `RouterService.transitionTo` instead.
-   */
-  transitionToRoute(...args: any[]): void;
-  model: unknown;
-  queryParams: Array<string | Record<string, QueryParamConfig | string | undefined>>;
-  target: object;
-}
-export const ControllerMixin: Mixin;
+  export interface ControllerMixin extends ActionHandler {
+    /**
+     * @deprecated until 5.0. Use `RouterService.replaceWith` instead.
+     */
+    replaceRoute(name: string, ...args: any[]): void;
+    /**
+     * @deprecated until 5.0. Use `RouterService.transitionTo` instead.
+     */
+    transitionToRoute(name: string, ...args: any[]): void;
+    /**
+     * @deprecated until 5.0. Use `RouterService.transitionTo` instead.
+     */
+    transitionToRoute(...args: any[]): void;
+    model: unknown;
+    queryParams: Array<string | Record<string, QueryParamConfig | string | undefined>>;
+    target: object;
+  }
+  export const ControllerMixin: Mixin;
 
-export default class Controller extends EmberObject {}
-export default interface Controller extends ControllerMixin {}
+  export default class Controller extends EmberObject {}
+  export default interface Controller extends ControllerMixin {}
 
-export function inject(): Controller;
-export function inject<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty;
-export function inject(target: object, propertyKey: string | symbol): void;
+  export function inject(): Controller;
+  export function inject<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty;
+  export function inject(target: object, propertyKey: string | symbol): void;
 
-// A type registry for Ember `Controller`s. Meant to be declaration-merged
-// so string lookups resolve to the correct type.
-// tslint:disable-next-line no-empty-interface
-export interface Registry {}
+  // A type registry for Ember `Controller`s. Meant to be declaration-merged
+  // so string lookups resolve to the correct type.
+  // tslint:disable-next-line no-empty-interface
+  export interface Registry {}
+}
diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
index d0f9c8aa6ae..edc16cc568b 100644
--- a/types/preview/@ember/debug/container-debug-adapter.d.ts
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -1,11 +1,13 @@
-import type { Resolver } from '@ember/-internals/resolver';
+declare module '@ember/debug/container-debug-adapter' {
+  import type { Resolver } from '@ember/-internals/resolver';
 
-/**
- * The ContainerDebugAdapter helps the container and resolver interface
- * with tools that debug Ember such as the Ember Inspector for Chrome and Firefox.
- */
-export default class ContainerDebugAdapter extends Object {
-  resolver: Resolver;
-  canCatalogEntriesByType(type: string): boolean;
-  catalogEntriesByType(type: string): string[];
+  /**
+   * The ContainerDebugAdapter helps the container and resolver interface
+   * with tools that debug Ember such as the Ember Inspector for Chrome and Firefox.
+   */
+  export default class ContainerDebugAdapter extends Object {
+    resolver: Resolver;
+    canCatalogEntriesByType(type: string): boolean;
+    catalogEntriesByType(type: string): string[];
+  }
 }
diff --git a/types/preview/@ember/debug/data-adapter.d.ts b/types/preview/@ember/debug/data-adapter.d.ts
index 6dcae185384..0159212085b 100644
--- a/types/preview/@ember/debug/data-adapter.d.ts
+++ b/types/preview/@ember/debug/data-adapter.d.ts
@@ -1,62 +1,64 @@
-import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
-import EmberObject from '@ember/object';
+declare module '@ember/debug/data-adapter' {
+  import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+  import EmberObject from '@ember/object';
 
-declare namespace DataAdapter {
-  interface Column {
-    name: string;
-    desc: string;
-  }
-  interface WrappedRecord {
-    columnValues: object;
-    object: object;
-  }
-  interface WrappedType {
-    type: {
+  namespace DataAdapter {
+    interface Column {
       name: string;
-      count: number;
-      columns: Column[];
-      object: typeof Object;
-    };
-    release: () => void;
+      desc: string;
+    }
+    interface WrappedRecord {
+      columnValues: object;
+      object: object;
+    }
+    interface WrappedType {
+      type: {
+        name: string;
+        count: number;
+        columns: Column[];
+        object: typeof Object;
+      };
+      release: () => void;
+    }
   }
-}
 
-/**
- * The `DataAdapter` helps a data persistence library
- * interface with tools that debug Ember such as Chrome and Firefox.
- */
-export default class DataAdapter extends EmberObject {
-  /**
-   * The container-debug-adapter which is used
-   * to list all models.
-   */
-  containerDebugAdapter: ContainerDebugAdapter;
-  /**
-   * Ember Data > v1.0.0-beta.18
-   * requires string model names to be passed
-   * around instead of the actual factories.
-   */
-  acceptsModelName: boolean;
-  /**
-   * Specifies how records can be filtered.
-   * Records returned will need to have a `filterValues`
-   * property with a key for every name in the returned array.
-   */
-  getFilters(): DataAdapter.Column[];
   /**
-   * Fetch the model types and observe them for changes.
+   * The `DataAdapter` helps a data persistence library
+   * interface with tools that debug Ember such as Chrome and Firefox.
    */
-  watchModelTypes(
-    typesAdded: (types: DataAdapter.WrappedType[]) => void,
-    typesUpdated: (types: DataAdapter.WrappedType[]) => void
-  ): () => void;
-  /**
-   * Fetch the records of a given type and observe them for changes.
-   */
-  watchRecords(
-    modelName: string,
-    recordsAdded: (records: DataAdapter.WrappedRecord[]) => void,
-    recordsUpdated: (records: DataAdapter.WrappedRecord[]) => void,
-    recordsRemoved: (idx: number, count: number) => void
-  ): () => void;
+  export default class DataAdapter extends EmberObject {
+    /**
+     * The container-debug-adapter which is used
+     * to list all models.
+     */
+    containerDebugAdapter: ContainerDebugAdapter;
+    /**
+     * Ember Data > v1.0.0-beta.18
+     * requires string model names to be passed
+     * around instead of the actual factories.
+     */
+    acceptsModelName: boolean;
+    /**
+     * Specifies how records can be filtered.
+     * Records returned will need to have a `filterValues`
+     * property with a key for every name in the returned array.
+     */
+    getFilters(): DataAdapter.Column[];
+    /**
+     * Fetch the model types and observe them for changes.
+     */
+    watchModelTypes(
+      typesAdded: (types: DataAdapter.WrappedType[]) => void,
+      typesUpdated: (types: DataAdapter.WrappedType[]) => void
+    ): () => void;
+    /**
+     * Fetch the records of a given type and observe them for changes.
+     */
+    watchRecords(
+      modelName: string,
+      recordsAdded: (records: DataAdapter.WrappedRecord[]) => void,
+      recordsUpdated: (records: DataAdapter.WrappedRecord[]) => void,
+      recordsRemoved: (idx: number, count: number) => void
+    ): () => void;
+  }
 }
diff --git a/types/preview/@ember/debug/ember__debug-tests.ts b/types/preview/@ember/debug/ember__debug-tests.ts
deleted file mode 100644
index 3a803dae675..00000000000
--- a/types/preview/@ember/debug/ember__debug-tests.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import {
-  runInDebug,
-  warn,
-  debug,
-  assert,
-  registerWarnHandler,
-  registerDeprecationHandler,
-  deprecate,
-} from '@ember/debug';
-
-/**
- * @ember/debug tests
- */
-// @ts-expect-error
-runInDebug();
-runInDebug(() => console.log('Should not show up in prod')); // $ExpectType void
-
-// Log a warning if we have more than 3 tomsters
-const tomsterCount = 2;
-// @ts-expect-error
-warn('Too many tomsters!');
-warn('Too many tomsters!', { id: 'some-warning' }); // $ExpectType void
-// @ts-expect-error
-warn('Too many tomsters!', tomsterCount <= 3);
-warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' }); // $ExpectType void
-warn('Too many tomsters!', tomsterCount <= 3, {
-  // $ExpectType void
-  id: 'ember-debug.too-many-tomsters',
-});
-
-// @ts-expect-error
-debug();
-debug('Too many tomsters!'); // $ExpectType void
-// @ts-expect-error
-debug('Too many tomsters!', 'foo');
-
-// Test for truthiness
-const str: unknown = 'hello';
-assert('Must pass a string', typeof str === 'string'); // $ExpectType void
-str; // $ExpectType string
-
-const anObject = {};
-assert('Must pass an object', anObject); // $ExpectType void
-
-// Test with null and undefined
-assert('Can handle falsiness', null); // $ExpectType void
-assert('Can handle falsiness', undefined); // $ExpectType void
-
-// Fail unconditionally
-assert('This code path should never be run'); // $ExpectType never
-
-// Require first argument
-// @ts-expect-error
-assert();
-
-// next is not called, so no warnings get the default behavior
-// @ts-expect-error
-registerWarnHandler();
-registerWarnHandler(() => {}); // $ExpectType void
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
-});
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  // @ts-expect-error
-  next();
-});
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  next(message); // $ExpectType void
-});
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  next(message, options); // $ExpectType void
-});
-
-// next is not called, so no warnings get the default behavior
-// @ts-expect-error
-registerDeprecationHandler();
-registerDeprecationHandler(() => {}); // $ExpectType void
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
-});
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  // @ts-expect-error
-  next();
-});
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  next(message); // $ExpectType void
-});
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  next(message, options); // $ExpectType void
-});
-
-// @ts-expect-error
-deprecate();
-// @ts-expect-error
-deprecate('missing test and options');
-// @ts-expect-error
-deprecate('missing options', true);
-// @ts-expect-error
-deprecate('missing options', false);
-// @ts-expect-error
-deprecate('missing options body', true, {});
-// @ts-expect-error
-deprecate('missing options id', true, { until: 'v4.0.0' });
-// @ts-expect-error
-deprecate('missing options until', true, { id: 'some.deprecation' });
-deprecate('a valid deprecation without `url`', true, {
-  // $ExpectType void
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    available: 'some.early.version',
-    enabled: 'some.version',
-  },
-});
-deprecate('incorrect options `url`', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  // @ts-expect-error
-  url: 123,
-  for: 'some.namespace',
-  since: {
-    available: 'some.earlier.version',
-    enabled: 'some.version',
-  },
-});
-deprecate('a valid deprecation with `url`', true, {
-  // $ExpectType void
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  url: 'https://example.com/ember-deprecations-yo',
-  for: 'some.namespace',
-  since: {
-    available: 'some.earlier.version',
-    enabled: 'some.version',
-  },
-});
-deprecate('a valid deprecation with `for`', true, {
-  // $ExpectType void
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    available: 'some.earlier.version',
-    enabled: 'some.version',
-  },
-});
-deprecate('incorrect options `for`', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  // @ts-expect-error
-  for: 123,
-  since: {
-    available: 'some.earlier.version',
-    enabled: 'some.version',
-  },
-});
-deprecate('a valid deprecation with `since`', true, {
-  // $ExpectType void
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    available: 'some.version',
-  },
-});
-deprecate('a valid deprecation with `since`', true, {
-  // $ExpectType void
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    available: 'some.version',
-    enabled: 'some.version',
-  },
-});
-deprecate('incorrect options `since`', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  // @ts-expect-error
-  since: 123,
-});
-deprecate('incorrect options `since`', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    // @ts-expect-error
-    wrongKey: 'some.version',
-  },
-});
-deprecate('incorrect options `since` available', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    // @ts-expect-error
-    available: 123,
-  },
-});
-deprecate('incorrect options `since` enabled', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  since: {
-    available: 'some.earlier.version',
-    // @ts-expect-error
-    enabled: 123,
-  },
-});
-deprecate('incorrect options `since` empty', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  // @ts-expect-error
-  since: {},
-});
-deprecate('incorrect options `since` enabled w/o available', true, {
-  id: 'some.deprecation',
-  until: 'v4.0.0',
-  for: 'some.namespace',
-  // @ts-expect-error
-  since: {
-    enabled: 'some.version',
-  },
-});
diff --git a/types/preview/@ember/debug/index.d.ts b/types/preview/@ember/debug/index.d.ts
index 6554a0d082b..6febb97a22d 100644
--- a/types/preview/@ember/debug/index.d.ts
+++ b/types/preview/@ember/debug/index.d.ts
@@ -1,96 +1,98 @@
-/**
- * Define an assertion that will throw an exception if the condition is not met.
- */
-export function assert(desc: string): never;
-export function assert(desc: string, test: unknown): asserts test;
+declare module '@ember/debug' {
+  /**
+   * Define an assertion that will throw an exception if the condition is not met.
+   */
+  export function assert(desc: string): never;
+  export function assert(desc: string, test: unknown): asserts test;
 
-/**
- * Display a debug notice.
- */
-export function debug(message: string): void;
+  /**
+   * Display a debug notice.
+   */
+  export function debug(message: string): void;
 
-/**
- * Allows for runtime registration of handler functions that override the default deprecation behavior.
- * Deprecations are invoked by calls to [Ember.deprecate](http://emberjs.com/api/classes/Ember.html#method_deprecate).
- * The following example demonstrates its usage by registering a handler that throws an error if the
- * message contains the word "should", otherwise defers to the default handler.
- */
-export function registerDeprecationHandler(
-  handler: (
-    message: string,
-    options: { id: string; until: string } | undefined,
-    next: (message: string, options?: { id: string; until: string }) => void
-  ) => void
-): void;
-/**
- * Allows for runtime registration of handler functions that override the default warning behavior.
- * Warnings are invoked by calls made to [Ember.warn](http://emberjs.com/api/classes/Ember.html#method_warn).
- * The following example demonstrates its usage by registering a handler that does nothing overriding Ember's
- * default warning behavior.
- */
-export function registerWarnHandler(
-  handler: (
-    message: string,
-    options: { id: string } | undefined,
-    next: (message: string, options?: { id: string }) => void
-  ) => void
-): void;
+  /**
+   * Allows for runtime registration of handler functions that override the default deprecation behavior.
+   * Deprecations are invoked by calls to [Ember.deprecate](http://emberjs.com/api/classes/Ember.html#method_deprecate).
+   * The following example demonstrates its usage by registering a handler that throws an error if the
+   * message contains the word "should", otherwise defers to the default handler.
+   */
+  export function registerDeprecationHandler(
+    handler: (
+      message: string,
+      options: { id: string; until: string } | undefined,
+      next: (message: string, options?: { id: string; until: string }) => void
+    ) => void
+  ): void;
+  /**
+   * Allows for runtime registration of handler functions that override the default warning behavior.
+   * Warnings are invoked by calls made to [Ember.warn](http://emberjs.com/api/classes/Ember.html#method_warn).
+   * The following example demonstrates its usage by registering a handler that does nothing overriding Ember's
+   * default warning behavior.
+   */
+  export function registerWarnHandler(
+    handler: (
+      message: string,
+      options: { id: string } | undefined,
+      next: (message: string, options?: { id: string }) => void
+    ) => void
+  ): void;
 
-/**
- * Run a function meant for debugging.
- */
-export function runInDebug(func: () => unknown): void;
+  /**
+   * Run a function meant for debugging.
+   */
+  export function runInDebug(func: () => unknown): void;
 
-/**
- * Display a warning with the provided message.
- */
-export function warn(message: string, test: boolean, options: { id: string }): void;
-export function warn(message: string, options: { id: string }): void;
+  /**
+   * Display a warning with the provided message.
+   */
+  export function warn(message: string, test: boolean, options: { id: string }): void;
+  export function warn(message: string, options: { id: string }): void;
 
-/**
- * Display a deprecation warning with the provided message and a stack trace
- * (Chrome and Firefox only).
- *
- * In a production build, this method is defined as an empty function (NOP).
- * Uses of this method in Ember itself are stripped from the ember.prod.js build.
- *
- * @param message A description of the deprecation.
- * @param test If falsy, the deprecation will be displayed.
- * @param options The deprecation options.
- */
-export function deprecate(
-  message: string,
-  test: boolean,
-  options: {
-    /**
-     * A unique id for this deprecation. The id can be used by Ember debugging
-     * tools to change the behavior (raise, log or silence) for that specific
-     * deprecation. The id should be namespaced by dots, e.g.
-     * `"view.helper.select"`.
-     */
-    id: string;
-    /**
-     * The version of Ember when this deprecation warning will be removed.
-     */
-    until: string;
-    /**
-     * An optional url to the transition guide on the emberjs.com website.
-     */
-    url?: string | undefined;
-    /**
-     * A namespace for the deprecation, usually the package name.
-     */
-    for: string;
-    /**
-     * Describes when the deprecation became available and enabled.
-     */
-    since: Available | Enabled;
-  }
-): void;
+  /**
+   * Display a deprecation warning with the provided message and a stack trace
+   * (Chrome and Firefox only).
+   *
+   * In a production build, this method is defined as an empty function (NOP).
+   * Uses of this method in Ember itself are stripped from the ember.prod.js build.
+   *
+   * @param message A description of the deprecation.
+   * @param test If falsy, the deprecation will be displayed.
+   * @param options The deprecation options.
+   */
+  export function deprecate(
+    message: string,
+    test: boolean,
+    options: {
+      /**
+       * A unique id for this deprecation. The id can be used by Ember debugging
+       * tools to change the behavior (raise, log or silence) for that specific
+       * deprecation. The id should be namespaced by dots, e.g.
+       * `"view.helper.select"`.
+       */
+      id: string;
+      /**
+       * The version of Ember when this deprecation warning will be removed.
+       */
+      until: string;
+      /**
+       * An optional url to the transition guide on the emberjs.com website.
+       */
+      url?: string | undefined;
+      /**
+       * A namespace for the deprecation, usually the package name.
+       */
+      for: string;
+      /**
+       * Describes when the deprecation became available and enabled.
+       */
+      since: Available | Enabled;
+    }
+  ): void;
 
-export interface Available {
-  available: string;
-}
-export interface Enabled extends Available {
-  enabled: string;
+  export interface Available {
+    available: string;
+  }
+  export interface Enabled extends Available {
+    enabled: string;
+  }
 }
diff --git a/types/preview/@ember/destroyable/index.d.ts b/types/preview/@ember/destroyable/index.d.ts
index e8dfee90dd9..302dd6d4240 100644
--- a/types/preview/@ember/destroyable/index.d.ts
+++ b/types/preview/@ember/destroyable/index.d.ts
@@ -1,21 +1,23 @@
-export function associateDestroyableChild<T extends object>(parent: object, child: T): T;
+declare module '@ember/destroyable' {
+  export function associateDestroyableChild<T extends object>(parent: object, child: T): T;
 
-export function isDestroying(destroyable: object): boolean;
+  export function isDestroying(destroyable: object): boolean;
 
-export function isDestroyed(destroyable: object): boolean;
+  export function isDestroyed(destroyable: object): boolean;
 
-export function destroy(destroyable: object): void;
+  export function destroy(destroyable: object): void;
 
-export function assertDestroyablesDestroyed(): void;
+  export function assertDestroyablesDestroyed(): void;
 
-export function enableDestroyableTracking(): void;
+  export function enableDestroyableTracking(): void;
 
-export function registerDestructor<T extends object>(
-  destroyable: T,
-  destructor: (destroyable: T) => void
-): (destroyable: T) => void;
+  export function registerDestructor<T extends object>(
+    destroyable: T,
+    destructor: (destroyable: T) => void
+  ): (destroyable: T) => void;
 
-export function unregisterDestructor<T extends object>(
-  destroyable: T,
-  destructor: (destroyable: T) => void
-): void;
+  export function unregisterDestructor<T extends object>(
+    destroyable: T,
+    destructor: (destroyable: T) => void
+  ): void;
+}
diff --git a/types/preview/@ember/destroyable/test/lib/assert.ts b/types/preview/@ember/destroyable/test/lib/assert.ts
deleted file mode 100644
index dad227ab5e9..00000000000
--- a/types/preview/@ember/destroyable/test/lib/assert.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Static assertion that `value` has type `T` */
-export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
index d281c67be69..fbedd3127a9 100644
--- a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
@@ -1,15 +1,17 @@
-import Owner from '@ember/owner';
-import Mixin from '@ember/object/mixin';
+declare module '@ember/engine/-private/container-proxy-mixin' {
+  import Owner from '@ember/owner';
+  import Mixin from '@ember/object/mixin';
 
-/**
- * Given a fullName return a factory manager.
- */
-interface ContainerProxyMixin extends Owner {
   /**
-   * Returns an object that can be used to provide an owner to a
-   * manually created instance.
+   * Given a fullName return a factory manager.
    */
-  ownerInjection(): {};
+  interface ContainerProxyMixin extends Owner {
+    /**
+     * Returns an object that can be used to provide an owner to a
+     * manually created instance.
+     */
+    ownerInjection(): {};
+  }
+  const ContainerProxyMixin: Mixin;
+  export default ContainerProxyMixin;
 }
-declare const ContainerProxyMixin: Mixin;
-export default ContainerProxyMixin;
diff --git a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
index 801abf8b0cf..a9f9599f8f3 100644
--- a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
@@ -1,52 +1,54 @@
-import Owner from '@ember/owner';
-import Mixin from '@ember/object/mixin';
+declare module '@ember/engine/-private/registry-proxy-mixin' {
+  import Owner from '@ember/owner';
+  import Mixin from '@ember/object/mixin';
 
-/**
- * RegistryProxyMixin is used to provide public access to specific
- * registry functionality.
- */
-interface RegistryProxyMixin extends Owner {
   /**
-   * Given a fullName return the corresponding factory.
-   */
-  resolveRegistration(fullName: string): unknown;
-  /**
-   * Unregister a factory.
-   */
-  unregister(fullName: string): unknown;
-  /**
-   * Check if a factory is registered.
-   */
-  hasRegistration(fullName: string): boolean;
-  /**
-   * Register an option for a particular factory.
-   */
-  registerOption(fullName: string, optionName: string, options: {}): unknown;
-  /**
-   * Return a specific registered option for a particular factory.
-   */
-  registeredOption(fullName: string, optionName: string): {};
-  /**
-   * Register options for a particular factory.
-   */
-  registerOptions(fullName: string, options: {}): unknown;
-  /**
-   * Return registered options for a particular factory.
-   */
-  registeredOptions(fullName: string): {};
-  /**
-   * Allow registering options for all factories of a type.
-   */
-  registerOptionsForType(type: string, options: {}): unknown;
-  /**
-   * Return the registered options for all factories of a type.
-   */
-  registeredOptionsForType(type: string): {};
-  /**
-   * Define a dependency injection onto a specific factory or all factories
-   * of a type.
-   */
-  inject(factoryNameOrType: string, property: string, injectionName: string): unknown;
+   * RegistryProxyMixin is used to provide public access to specific
+   * registry functionality.
+   */
+  interface RegistryProxyMixin extends Owner {
+    /**
+     * Given a fullName return the corresponding factory.
+     */
+    resolveRegistration(fullName: string): unknown;
+    /**
+     * Unregister a factory.
+     */
+    unregister(fullName: string): unknown;
+    /**
+     * Check if a factory is registered.
+     */
+    hasRegistration(fullName: string): boolean;
+    /**
+     * Register an option for a particular factory.
+     */
+    registerOption(fullName: string, optionName: string, options: {}): unknown;
+    /**
+     * Return a specific registered option for a particular factory.
+     */
+    registeredOption(fullName: string, optionName: string): {};
+    /**
+     * Register options for a particular factory.
+     */
+    registerOptions(fullName: string, options: {}): unknown;
+    /**
+     * Return registered options for a particular factory.
+     */
+    registeredOptions(fullName: string): {};
+    /**
+     * Allow registering options for all factories of a type.
+     */
+    registerOptionsForType(type: string, options: {}): unknown;
+    /**
+     * Return the registered options for all factories of a type.
+     */
+    registeredOptionsForType(type: string): {};
+    /**
+     * Define a dependency injection onto a specific factory or all factories
+     * of a type.
+     */
+    inject(factoryNameOrType: string, property: string, injectionName: string): unknown;
+  }
+  const RegistryProxyMixin: Mixin;
+  export default RegistryProxyMixin;
 }
-declare const RegistryProxyMixin: Mixin;
-export default RegistryProxyMixin;
diff --git a/types/preview/@ember/engine/-private/types/initializer.d.ts b/types/preview/@ember/engine/-private/types/initializer.d.ts
index 2a7f29ccb85..25953dee71b 100644
--- a/types/preview/@ember/engine/-private/types/initializer.d.ts
+++ b/types/preview/@ember/engine/-private/types/initializer.d.ts
@@ -1,6 +1,8 @@
-export default interface Initializer<T> {
-  name: string;
-  before?: string[] | undefined;
-  after?: string[] | undefined;
-  initialize(application: T): void;
+declare module '@ember/engine/-private/types/initializer' {
+  export default interface Initializer<T> {
+    name: string;
+    before?: string[] | undefined;
+    after?: string[] | undefined;
+    initialize(application: T): void;
+  }
 }
diff --git a/types/preview/@ember/engine/index.d.ts b/types/preview/@ember/engine/index.d.ts
index 6cae348a092..561e251d620 100644
--- a/types/preview/@ember/engine/index.d.ts
+++ b/types/preview/@ember/engine/index.d.ts
@@ -1,43 +1,45 @@
-import EmberObject from '@ember/object';
-import type RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
-import type Initializer from '@ember/engine/-private/types/initializer';
-import type EngineInstance from '@ember/engine/instance';
-import type { Resolver } from '@ember/-internals/resolver';
+declare module '@ember/engine' {
+  import EmberObject from '@ember/object';
+  import type RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
+  import type Initializer from '@ember/engine/-private/types/initializer';
+  import type EngineInstance from '@ember/engine/instance';
+  import type { Resolver } from '@ember/-internals/resolver';
 
-/**
- * The `Engine` class contains core functionality for both applications and
- * engines.
- */
-export default class Engine extends EmberObject {
   /**
-   * The goal of initializers should be to register dependencies and injections.
-   * This phase runs once. Because these initializers may load code, they are
-   * allowed to defer application readiness and advance it. If you need to access
-   * the container or store you should use an InstanceInitializer that will be run
-   * after all initializers and therefore after all code is loaded and the app is
-   * ready.
+   * The `Engine` class contains core functionality for both applications and
+   * engines.
    */
-  static initializer(initializer: Initializer<Engine>): void;
-  /**
-   * Instance initializers run after all initializers have run. Because
-   * instance initializers run after the app is fully set up. We have access
-   * to the store, container, and other items. However, these initializers run
-   * after code has loaded and are not allowed to defer readiness.
-   */
-  static instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
-  /**
-   * Set this to provide an alternate class to `DefaultResolver`
-   */
-  resolver: Resolver | null;
+  export default class Engine extends EmberObject {
+    /**
+     * The goal of initializers should be to register dependencies and injections.
+     * This phase runs once. Because these initializers may load code, they are
+     * allowed to defer application readiness and advance it. If you need to access
+     * the container or store you should use an InstanceInitializer that will be run
+     * after all initializers and therefore after all code is loaded and the app is
+     * ready.
+     */
+    static initializer(initializer: Initializer<Engine>): void;
+    /**
+     * Instance initializers run after all initializers have run. Because
+     * instance initializers run after the app is fully set up. We have access
+     * to the store, container, and other items. However, these initializers run
+     * after code has loaded and are not allowed to defer readiness.
+     */
+    static instanceInitializer(instanceInitializer: Initializer<EngineInstance>): void;
+    /**
+     * Set this to provide an alternate class to `DefaultResolver`
+     */
+    resolver: Resolver | null;
+    /**
+     * Create an EngineInstance for this Engine.
+     */
+    buildInstance(options?: object): EngineInstance;
+  }
+
+  export default interface Engine extends RegistryProxyMixin {}
+
   /**
-   * Create an EngineInstance for this Engine.
+   * `getEngineParent` retrieves an engine instance's parent instance.
    */
-  buildInstance(options?: object): EngineInstance;
+  export function getEngineParent(engine: EngineInstance): EngineInstance;
 }
-
-export default interface Engine extends RegistryProxyMixin {}
-
-/**
- * `getEngineParent` retrieves an engine instance's parent instance.
- */
-export function getEngineParent(engine: EngineInstance): EngineInstance;
diff --git a/types/preview/@ember/engine/instance.d.ts b/types/preview/@ember/engine/instance.d.ts
index 482e66b6caa..2f8c03015da 100644
--- a/types/preview/@ember/engine/instance.d.ts
+++ b/types/preview/@ember/engine/instance.d.ts
@@ -1,22 +1,24 @@
-import ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
-import RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
-import EmberObject from '@ember/object';
+declare module '@ember/engine/instance' {
+  import ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
+  import RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
+  import EmberObject from '@ember/object';
 
-/**
- * The `EngineInstance` encapsulates all of the stateful aspects of a
- * running `Engine`.
- */
-export default class EngineInstance extends EmberObject {
   /**
-   * Unregister a factory.
+   * The `EngineInstance` encapsulates all of the stateful aspects of a
+   * running `Engine`.
    */
-  unregister(fullName: string): unknown;
+  export default class EngineInstance extends EmberObject {
+    /**
+     * Unregister a factory.
+     */
+    unregister(fullName: string): unknown;
 
-  /**
-   *  Initialize the `EngineInstance` and return a promise that resolves
-   *  with the instance itself when the boot process is complete.
-   */
-  boot(): Promise<EngineInstance>;
-}
+    /**
+     *  Initialize the `EngineInstance` and return a promise that resolves
+     *  with the instance itself when the boot process is complete.
+     */
+    boot(): Promise<EngineInstance>;
+  }
 
-export default interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
+  export default interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
+}
diff --git a/types/preview/@ember/error/index.d.ts b/types/preview/@ember/error/index.d.ts
index 8d13769d1f2..6a8636372b6 100644
--- a/types/preview/@ember/error/index.d.ts
+++ b/types/preview/@ember/error/index.d.ts
@@ -1,4 +1,6 @@
-/**
- * A subclass of the JavaScript Error object for use in Ember.
- */
-export default class EmberError extends Error {}
+declare module '@ember/error' {
+  /**
+   * A subclass of the JavaScript Error object for use in Ember.
+   */
+  export default class EmberError extends Error {}
+}
diff --git a/types/preview/@ember/helper/ember__helper-tests.ts b/types/preview/@ember/helper/ember__helper-tests.ts
deleted file mode 100644
index 56b0f5743f8..00000000000
--- a/types/preview/@ember/helper/ember__helper-tests.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { array, concat, fn, get, hash } from '@ember/helper';
-
-array; // $ExpectType ArrayHelper
-concat; // $ExpectType ConcatHelper
-fn; // $ExpectType FnHelper
-get; // $ExpectType GetHelper
-hash; // $ExpectType HashHelper
diff --git a/types/preview/@ember/helper/index.d.ts b/types/preview/@ember/helper/index.d.ts
index 8b6f38d351f..01977dc729c 100644
--- a/types/preview/@ember/helper/index.d.ts
+++ b/types/preview/@ember/helper/index.d.ts
@@ -1,47 +1,49 @@
-import type { Opaque } from 'ember/-private/type-utils';
+declare module '@ember/helper' {
+  import type { Opaque } from 'ember/-private/type-utils';
 
-// In normal TypeScript, these helpers are essentially opaque tokens that just
-// need to be importable. Declaring them with unique interfaces like this,
-// however, gives tools like Glint (that DO have a richer notion of what they
-// are) a place to install more detailed type information.
-export interface ArrayHelper extends Opaque<'helper:array'> {}
-export interface ConcatHelper extends Opaque<'helper:concat'> {}
-export interface FnHelper extends Opaque<'helper:fn'> {}
-export interface GetHelper extends Opaque<'helper:get'> {}
-export interface HashHelper extends Opaque<'helper:hash'> {}
+  // In normal TypeScript, these helpers are essentially opaque tokens that just
+  // need to be importable. Declaring them with unique interfaces like this,
+  // however, gives tools like Glint (that DO have a richer notion of what they
+  // are) a place to install more detailed type information.
+  export interface ArrayHelper extends Opaque<'helper:array'> {}
+  export interface ConcatHelper extends Opaque<'helper:concat'> {}
+  export interface FnHelper extends Opaque<'helper:fn'> {}
+  export interface GetHelper extends Opaque<'helper:get'> {}
+  export interface HashHelper extends Opaque<'helper:hash'> {}
 
-/**
- * Use the `{{array}}` helper to create an array to pass as an option to your components.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/array?anchor=array
- */
-export const array: ArrayHelper;
+  /**
+   * Use the `{{array}}` helper to create an array to pass as an option to your components.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/array?anchor=array
+   */
+  export const array: ArrayHelper;
 
-/**
- * Concatenates the given arguments into a string.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/concat?anchor=concat
- */
-export const concat: ConcatHelper;
+  /**
+   * Concatenates the given arguments into a string.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/concat?anchor=concat
+   */
+  export const concat: ConcatHelper;
 
-/**
- * The `fn` helper allows you to ensure a function that you are passing off to another component, helper, or modifier
- * has access to arguments that are available in the template.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/fn?anchor=fn
- */
-export const fn: FnHelper;
+  /**
+   * The `fn` helper allows you to ensure a function that you are passing off to another component, helper, or modifier
+   * has access to arguments that are available in the template.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/fn?anchor=fn
+   */
+  export const fn: FnHelper;
 
-/**
- * Dynamically look up a property on an object.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/get?anchor=get
- */
-export const get: GetHelper;
+  /**
+   * Dynamically look up a property on an object.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/get?anchor=get
+   */
+  export const get: GetHelper;
 
-/**
- * Use the `{{hash}}` helper to create a hash to pass as an option to your components.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/hash?anchor=hash
- */
-export const hash: HashHelper;
+  /**
+   * Use the `{{hash}}` helper to create a hash to pass as an option to your components.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/hash?anchor=hash
+   */
+  export const hash: HashHelper;
+}
diff --git a/types/preview/@ember/modifier/ember__modifier-tests.ts b/types/preview/@ember/modifier/ember__modifier-tests.ts
deleted file mode 100644
index 3dc6865fb40..00000000000
--- a/types/preview/@ember/modifier/ember__modifier-tests.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { setModifierManager, capabilities, on } from '@ember/modifier';
-import Owner from '@ember/owner';
-
-declare let owner: Owner;
-
-on; // $ExpectType OnModifier
-setModifierManager((owner) => {}, {}); // $ExpectType {}
-capabilities('3.24'); // $ExpectType unknown
diff --git a/types/preview/@ember/modifier/index.d.ts b/types/preview/@ember/modifier/index.d.ts
index 2281a7ea20e..5a4f782b24d 100644
--- a/types/preview/@ember/modifier/index.d.ts
+++ b/types/preview/@ember/modifier/index.d.ts
@@ -1,31 +1,33 @@
-import type Owner from '@ember/owner';
-import type { Opaque } from 'ember/-private/type-utils';
+declare module '@ember/modifier' {
+  import type Owner from '@ember/owner';
+  import type { Opaque } from 'ember/-private/type-utils';
 
-// In normal TypeScript, this modifier is essentially an opaque token
-// that just needs to be importable. Declaring it with a unique interface
-// like this, however, gives tools like Glint (that DO have a richer
-// notion of what it is) a place to install more detailed type information.
-export interface OnModifier extends Opaque<'modifier:on'> {}
+  // In normal TypeScript, this modifier is essentially an opaque token
+  // that just needs to be importable. Declaring it with a unique interface
+  // like this, however, gives tools like Glint (that DO have a richer
+  // notion of what it is) a place to install more detailed type information.
+  export interface OnModifier extends Opaque<'modifier:on'> {}
 
-/**
- * The `{{on}}` modifier lets you easily add event listeners.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/on?anchor=on
- */
-export const on: OnModifier;
+  /**
+   * The `{{on}}` modifier lets you easily add event listeners.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.helpers/methods/on?anchor=on
+   */
+  export const on: OnModifier;
 
-/**
- * Given a modifier manager factory and a modifier, tell Ember to set the
- * manager returned by that factory as the manager for the modifier.
- *
- * @param factory A function which takes an `owner` and returns a [modifier
- *   manager](https://emberjs.github.io/rfcs/0373-Element-Modifier-Managers.html).
- * @param modifier The modifier definition to associate with the manager.
- */
-export function setModifierManager<T>(factory: (owner: Owner) => unknown, modifier: T): T;
+  /**
+   * Given a modifier manager factory and a modifier, tell Ember to set the
+   * manager returned by that factory as the manager for the modifier.
+   *
+   * @param factory A function which takes an `owner` and returns a [modifier
+   *   manager](https://emberjs.github.io/rfcs/0373-Element-Modifier-Managers.html).
+   * @param modifier The modifier definition to associate with the manager.
+   */
+  export function setModifierManager<T>(factory: (owner: Owner) => unknown, modifier: T): T;
 
-/**
- * Given a target version of Ember, return an opaque token which Ember can use
- * to determine what a given modifier manager supports.
- */
-export function capabilities(version: string): unknown;
+  /**
+   * Given a target version of Ember, return an opaque token which Ember can use
+   * to determine what a given modifier manager supports.
+   */
+  export function capabilities(version: string): unknown;
+}
diff --git a/types/preview/@ember/object/-private/action-handler.d.ts b/types/preview/@ember/object/-private/action-handler.d.ts
index ab1f89e9119..331207994f7 100644
--- a/types/preview/@ember/object/-private/action-handler.d.ts
+++ b/types/preview/@ember/object/-private/action-handler.d.ts
@@ -1,29 +1,31 @@
-import { AnyFn } from 'ember/-private/type-utils';
-import type Mixin from '../mixin';
+declare module '@ember/object/-private/action-handler' {
+  import { AnyFn } from 'ember/-private/type-utils';
+  import type Mixin from '@ember/object/mixin';
 
-interface ActionsHash {
-  [index: string]: AnyFn;
-}
+  interface ActionsHash {
+    [index: string]: AnyFn;
+  }
 
-/**
- * Ember.ActionHandler is available on some familiar classes including Ember.Route,
- * Ember.Component, and Ember.Controller. (Internally the mixin is used by Ember.CoreView,
- * Ember.ControllerMixin, and Ember.Route and available to the above classes through inheritance.)
- */
-interface ActionHandler {
-  /**
-   * Triggers a named action on the ActionHandler. Any parameters supplied after the actionName
-   * string will be passed as arguments to the action target function.
-   *
-   * If the ActionHandler has its target property set, actions may bubble to the target.
-   * Bubbling happens when an actionName can not be found in the ActionHandler's actions
-   * hash or if the action target function returns true.
-   */
-  send(actionName: string, ...args: any[]): void;
   /**
-   * The collection of functions, keyed by name, available on this ActionHandler as action targets.
+   * Ember.ActionHandler is available on some familiar classes including Ember.Route,
+   * Ember.Component, and Ember.Controller. (Internally the mixin is used by Ember.CoreView,
+   * Ember.ControllerMixin, and Ember.Route and available to the above classes through inheritance.)
    */
-  actions: ActionsHash;
+  interface ActionHandler {
+    /**
+     * Triggers a named action on the ActionHandler. Any parameters supplied after the actionName
+     * string will be passed as arguments to the action target function.
+     *
+     * If the ActionHandler has its target property set, actions may bubble to the target.
+     * Bubbling happens when an actionName can not be found in the ActionHandler's actions
+     * hash or if the action target function returns true.
+     */
+    send(actionName: string, ...args: any[]): void;
+    /**
+     * The collection of functions, keyed by name, available on this ActionHandler as action targets.
+     */
+    actions: ActionsHash;
+  }
+  const ActionHandler: Mixin;
+  export default ActionHandler;
 }
-declare const ActionHandler: Mixin;
-export default ActionHandler;
diff --git a/types/preview/@ember/object/-private/types.d.ts b/types/preview/@ember/object/-private/types.d.ts
index 5945629ca89..efe9bb7a7b9 100644
--- a/types/preview/@ember/object/-private/types.d.ts
+++ b/types/preview/@ember/object/-private/types.d.ts
@@ -1,61 +1,63 @@
-import type Mixin from '../mixin';
-
-/**
- * Map type `T` to a plain object hash with the identity mapping.
- *
- * Discards any additional object identity like the ability to `new()` up the class.
- * The `new()` capability is added back later by merging `EmberClassConstructor<T>`
- *
- * Implementation is carefully chosen for the reasons described in
- * https://github.com/typed-ember/ember-typings/pull/29
- */
-export type Objectify<T> = Readonly<T>;
-
-export type ExtractPropertyNamesOfType<T, S> = {
-  [K in keyof T]: T[K] extends S ? K : never;
-}[keyof T];
-
-export type Fix<T> = { [K in keyof T]: T[K] };
-
-/**
- * Used to infer the type of ember classes of type `T`.
- *
- * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
- *
- * The single-arg constructor is required by the typescript compiler.
- * The multi-arg constructor is included for better ergonomics.
- *
- * Implementation is carefully chosen for the reasons described in
- * https://github.com/typed-ember/ember-typings/pull/29
- */
-export type EmberClassConstructor<T> = (new (properties?: object) => T) &
-  (new (...args: any[]) => T);
-
-/**
- * Check that any arguments to `create()` match the type's properties.
- *
- * Accept any additional properties and add merge them into the instance.
- */
-export type EmberInstanceArguments<T> = Partial<T> & {
-  [key: string]: unknown;
-};
-
-/**
- * Accept any additional properties and add merge them into the prototype.
- */
-export interface EmberClassArguments {
-  [key: string]: unknown;
+declare module '@ember/object/-private/types' {
+  import type Mixin from '@ember/object/mixin';
+
+  /**
+   * Map type `T` to a plain object hash with the identity mapping.
+   *
+   * Discards any additional object identity like the ability to `new()` up the class.
+   * The `new()` capability is added back later by merging `EmberClassConstructor<T>`
+   *
+   * Implementation is carefully chosen for the reasons described in
+   * https://github.com/typed-ember/ember-typings/pull/29
+   */
+  export type Objectify<T> = Readonly<T>;
+
+  export type ExtractPropertyNamesOfType<T, S> = {
+    [K in keyof T]: T[K] extends S ? K : never;
+  }[keyof T];
+
+  export type Fix<T> = { [K in keyof T]: T[K] };
+
+  /**
+   * Used to infer the type of ember classes of type `T`.
+   *
+   * Generally you would use `EmberClass.create()` instead of `new EmberClass()`.
+   *
+   * The single-arg constructor is required by the typescript compiler.
+   * The multi-arg constructor is included for better ergonomics.
+   *
+   * Implementation is carefully chosen for the reasons described in
+   * https://github.com/typed-ember/ember-typings/pull/29
+   */
+  export type EmberClassConstructor<T> = (new (properties?: object) => T) &
+    (new (...args: any[]) => T);
+
+  /**
+   * Check that any arguments to `create()` match the type's properties.
+   *
+   * Accept any additional properties and add merge them into the instance.
+   */
+  export type EmberInstanceArguments<T> = Partial<T> & {
+    [key: string]: unknown;
+  };
+
+  /**
+   * Accept any additional properties and add merge them into the prototype.
+   */
+  export interface EmberClassArguments {
+    [key: string]: unknown;
+  }
+
+  /**
+   * Ember.Object.extend(...) accepts any number of mixins or literals.
+   */
+  export type MixinOrLiteral<T> = Mixin | T;
+
+  export type ObserverMethod<Target, Sender> =
+    | keyof Target
+    | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
+
+  // This type looks weird, but is correct: from a list of "bottom" to "top", in
+  // type theory terms.
+  export type AnyFunction = (...args: never[]) => unknown;
 }
-
-/**
- * Ember.Object.extend(...) accepts any number of mixins or literals.
- */
-export type MixinOrLiteral<T> = Mixin | T;
-
-export type ObserverMethod<Target, Sender> =
-  | keyof Target
-  | ((this: Target, sender: Sender, key: string, value: any, rev: number) => void);
-
-// This type looks weird, but is correct: from a list of "bottom" to "top", in
-// type theory terms.
-export type AnyFunction = (...args: never[]) => unknown;
diff --git a/types/preview/@ember/object/compat.d.ts b/types/preview/@ember/object/compat.d.ts
index 291097ab67a..fbc5605ec02 100644
--- a/types/preview/@ember/object/compat.d.ts
+++ b/types/preview/@ember/object/compat.d.ts
@@ -1,7 +1,9 @@
-/**
- * `@dependentKeyCompat` is a decorator that can be used on native getters that
- * use tracked properties. It exposes the getter to Ember's classic computed
- * property and observer systems, so they can watch it for changes. It can be
- * used in both native and classic classes.
- */
-export const dependentKeyCompat: PropertyDecorator;
+declare module '@ember/object/compat' {
+  /**
+   * `@dependentKeyCompat` is a decorator that can be used on native getters that
+   * use tracked properties. It exposes the getter to Ember's classic computed
+   * property and observer systems, so they can watch it for changes. It can be
+   * used in both native and classic classes.
+   */
+  export const dependentKeyCompat: PropertyDecorator;
+}
diff --git a/types/preview/@ember/object/computed.d.ts b/types/preview/@ember/object/computed.d.ts
index c283b1bf86e..30fa4938739 100644
--- a/types/preview/@ember/object/computed.d.ts
+++ b/types/preview/@ember/object/computed.d.ts
@@ -1,261 +1,263 @@
-/**
- * A computed property transforms an objects function into a property.
- * By default the function backing the computed property will only be called once and the result
- * will be cached. You can specify various properties that your computed property is dependent on.
- * This will force the cached result to be recomputed if the dependencies are modified.
- */
-export default class ComputedProperty {
-  /**
-   * Call on a computed property to set it into read-only mode. When in this
-   * mode the computed property will throw an error when set.
-   */
-  readOnly(): this;
-  /**
-   * In some cases, you may want to annotate computed properties with additional
-   * metadata about how they function or what values they operate on. For example,
-   * computed property functions may close over variables that are then no longer
-   * available for introspection.
-   */
-  meta(meta: Record<string, unknown>): this;
-  meta(): Record<string, unknown>;
-}
+declare module '@ember/object/computed' {
+  /**
+   * A computed property transforms an objects function into a property.
+   * By default the function backing the computed property will only be called once and the result
+   * will be cached. You can specify various properties that your computed property is dependent on.
+   * This will force the cached result to be recomputed if the dependencies are modified.
+   */
+  export default class ComputedProperty {
+    /**
+     * Call on a computed property to set it into read-only mode. When in this
+     * mode the computed property will throw an error when set.
+     */
+    readOnly(): this;
+    /**
+     * In some cases, you may want to annotate computed properties with additional
+     * metadata about how they function or what values they operate on. For example,
+     * computed property functions may close over variables that are then no longer
+     * available for introspection.
+     */
+    meta(meta: Record<string, unknown>): this;
+    meta(): Record<string, unknown>;
+  }
 
-// Computed property definitions also act as property decorators, including those
-// returned from "macros" in third-party code.
-export type BasicComputedProperty = ComputedProperty & PropertyDecorator;
+  // Computed property definitions also act as property decorators, including those
+  // returned from "macros" in third-party code.
+  export type BasicComputedProperty = ComputedProperty & PropertyDecorator;
 
-/**
- * Creates a new property that is an alias for another property
- * on an object. Calls to `get` or `set` this property behave as
- * though they were called on the original property.
- */
-export function alias(dependentKey: string): BasicComputedProperty;
-/**
- * A computed property that performs a logical `and` on the
- * original values for the provided dependent properties.
- */
-export function and(...dependentKeys: string[]): BasicComputedProperty;
-/**
- * A computed property that converts the provided dependent property
- * into a boolean value.
- */
-export function bool(dependentKey: string): BasicComputedProperty;
+  /**
+   * Creates a new property that is an alias for another property
+   * on an object. Calls to `get` or `set` this property behave as
+   * though they were called on the original property.
+   */
+  export function alias(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that performs a logical `and` on the
+   * original values for the provided dependent properties.
+   */
+  export function and(...dependentKeys: string[]): BasicComputedProperty;
+  /**
+   * A computed property that converts the provided dependent property
+   * into a boolean value.
+   */
+  export function bool(dependentKey: string): BasicComputedProperty;
 
-/**
- * A computed property that returns the array of values
- * for the provided dependent properties.
- */
-export function collect(...dependentKeys: string[]): BasicComputedProperty;
+  /**
+   * A computed property that returns the array of values
+   * for the provided dependent properties.
+   */
+  export function collect(...dependentKeys: string[]): BasicComputedProperty;
 
-/**
- * Creates a new property that is an alias for another property
- * on an object. Calls to `get` or `set` this property behave as
- * though they were called on the original property, but also
- * print a deprecation warning.
- */
-export function deprecatingAlias(
-  dependentKey: string,
-  options: { id: string; until: string }
-): BasicComputedProperty;
+  /**
+   * Creates a new property that is an alias for another property
+   * on an object. Calls to `get` or `set` this property behave as
+   * though they were called on the original property, but also
+   * print a deprecation warning.
+   */
+  export function deprecatingAlias(
+    dependentKey: string,
+    options: { id: string; until: string }
+  ): BasicComputedProperty;
 
-/**
- * A computed property that returns true if the value of the dependent
- * property is null, an empty string, empty array, or empty function.
- */
-export function empty(dependentKey: string): BasicComputedProperty;
-/**
- * A computed property that returns true if the provided dependent property
- * is equal to the given value.
- */
-export function equal(dependentKey: string, value: unknown): BasicComputedProperty;
-/**
- * Expands `pattern`, invoking `callback` for each expansion.
- */
-export function expandProperties(pattern: string, callback: (expanded: string) => void): void;
+  /**
+   * A computed property that returns true if the value of the dependent
+   * property is null, an empty string, empty array, or empty function.
+   */
+  export function empty(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the provided dependent property
+   * is equal to the given value.
+   */
+  export function equal(dependentKey: string, value: unknown): BasicComputedProperty;
+  /**
+   * Expands `pattern`, invoking `callback` for each expansion.
+   */
+  export function expandProperties(pattern: string, callback: (expanded: string) => void): void;
 
-/**
- * Filters the array by the callback.
- */
-export function filter(
-  dependentKey: string,
-  callback: (value: unknown, index: number, array: unknown[]) => boolean
-): BasicComputedProperty;
+  /**
+   * Filters the array by the callback.
+   */
+  export function filter(
+    dependentKey: string,
+    callback: (value: unknown, index: number, array: unknown[]) => boolean
+  ): BasicComputedProperty;
 
-/**
- * Filters the array by the callback and an array of additional dependent keys.
- */
-export function filter(
-  dependentKey: string,
-  additionalDependentKeys: string[],
-  callback: (value: unknown, index: number, array: unknown[]) => boolean
-): BasicComputedProperty;
+  /**
+   * Filters the array by the callback and an array of additional dependent keys.
+   */
+  export function filter(
+    dependentKey: string,
+    additionalDependentKeys: string[],
+    callback: (value: unknown, index: number, array: unknown[]) => boolean
+  ): BasicComputedProperty;
 
-/**
- * Filters the array by the property and value
- */
-export function filterBy(
-  dependentKey: string,
-  propertyKey: string,
-  value?: unknown
-): BasicComputedProperty;
+  /**
+   * Filters the array by the property and value
+   */
+  export function filterBy(
+    dependentKey: string,
+    propertyKey: string,
+    value?: unknown
+  ): BasicComputedProperty;
 
-/**
- * A computed property that returns true if the provided dependent property
- * is greater than the provided value.
- */
-export function gt(dependentKey: string, value: number): BasicComputedProperty;
-/**
- * A computed property that returns true if the provided dependent property
- * is greater than or equal to the provided value.
- */
-export function gte(dependentKey: string, value: number): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the provided dependent property
+   * is greater than the provided value.
+   */
+  export function gt(dependentKey: string, value: number): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the provided dependent property
+   * is greater than or equal to the provided value.
+   */
+  export function gte(dependentKey: string, value: number): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the elements
- * two or more dependent arrays have in common.
- */
-export function intersect(...propertyKeys: string[]): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the elements
+   * two or more dependent arrays have in common.
+   */
+  export function intersect(...propertyKeys: string[]): BasicComputedProperty;
 
-/**
- * A computed property that returns true if the provided dependent property
- * is less than the provided value.
- */
-export function lt(dependentKey: string, value: number): BasicComputedProperty;
-/**
- * A computed property that returns true if the provided dependent property
- * is less than or equal to the provided value.
- */
-export function lte(dependentKey: string, value: number): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the provided dependent property
+   * is less than the provided value.
+   */
+  export function lt(dependentKey: string, value: number): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the provided dependent property
+   * is less than or equal to the provided value.
+   */
+  export function lte(dependentKey: string, value: number): BasicComputedProperty;
 
-/**
- * Returns an array mapped via the callback
- */
-export function map(
-  dependentKey: string,
-  callback: (value: unknown, index: number, array: unknown[]) => unknown
-): BasicComputedProperty;
+  /**
+   * Returns an array mapped via the callback
+   */
+  export function map(
+    dependentKey: string,
+    callback: (value: unknown, index: number, array: unknown[]) => unknown
+  ): BasicComputedProperty;
 
-/**
- * Returns an array mapped to the specified key.
- */
-export function mapBy(dependentKey: string, propertyKey: string): BasicComputedProperty;
+  /**
+   * Returns an array mapped to the specified key.
+   */
+  export function mapBy(dependentKey: string, propertyKey: string): BasicComputedProperty;
 
-/**
- * A computed property which matches the original value for the
- * dependent property against a given RegExp, returning `true`
- * if the value matches the RegExp and `false` if it does not.
- */
-export function match(dependentKey: string, regexp: RegExp): BasicComputedProperty;
+  /**
+   * A computed property which matches the original value for the
+   * dependent property against a given RegExp, returning `true`
+   * if the value matches the RegExp and `false` if it does not.
+   */
+  export function match(dependentKey: string, regexp: RegExp): BasicComputedProperty;
 
-/**
- * A computed property that calculates the maximum value in the
- * dependent array. This will return `-Infinity` when the dependent
- * array is empty.
- */
-export function max(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that calculates the maximum value in the
+   * dependent array. This will return `-Infinity` when the dependent
+   * array is empty.
+   */
+  export function max(dependentKey: string): BasicComputedProperty;
 
-/**
- * A computed property that calculates the minimum value in the
- * dependent array. This will return `Infinity` when the dependent
- * array is empty.
- */
-export function min(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that calculates the minimum value in the
+   * dependent array. This will return `Infinity` when the dependent
+   * array is empty.
+   */
+  export function min(dependentKey: string): BasicComputedProperty;
 
-/**
- * A computed property that returns true if the value of the dependent
- * property is null or undefined. This avoids errors from JSLint complaining
- * about use of ==, which can be technically confusing.
- */
-export function none(dependentKey: string): BasicComputedProperty;
-/**
- * A computed property that returns the inverse boolean value
- * of the original value for the dependent property.
- */
-export function not(dependentKey: string): BasicComputedProperty;
-/**
- * A computed property that returns true if the value of the dependent
- * property is NOT null, an empty string, empty array, or empty function.
- */
-export function notEmpty(dependentKey: string): BasicComputedProperty;
-/**
- * Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
- * data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
- * not mutate the upstream property, rather causes the current property to
- * become the value set. This causes the downstream property to permanently
- * diverge from the upstream property.
- */
-export function oneWay(dependentKey: string): BasicComputedProperty;
-/**
- * A computed property which performs a logical `or` on the
- * original values for the provided dependent properties.
- */
-export function or(...dependentKeys: string[]): BasicComputedProperty;
-/**
- * Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
- * a readOnly one way binding. Very often when using `computed.oneWay` one does
- * not also want changes to propagate back up, as they will replace the value.
- */
-export function readOnly(dependentKey: string): BasicComputedProperty;
-/**
- * This is a more semantically meaningful alias of `computed.oneWay`,
- * whose name is somewhat ambiguous as to which direction the data flows.
- */
-export function reads(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the value of the dependent
+   * property is null or undefined. This avoids errors from JSLint complaining
+   * about use of ==, which can be technically confusing.
+   */
+  export function none(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that returns the inverse boolean value
+   * of the original value for the dependent property.
+   */
+  export function not(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that returns true if the value of the dependent
+   * property is NOT null, an empty string, empty array, or empty function.
+   */
+  export function notEmpty(dependentKey: string): BasicComputedProperty;
+  /**
+   * Where `computed.alias` aliases `get` and `set`, and allows for bidirectional
+   * data flow, `computed.oneWay` only provides an aliased `get`. The `set` will
+   * not mutate the upstream property, rather causes the current property to
+   * become the value set. This causes the downstream property to permanently
+   * diverge from the upstream property.
+   */
+  export function oneWay(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property which performs a logical `or` on the
+   * original values for the provided dependent properties.
+   */
+  export function or(...dependentKeys: string[]): BasicComputedProperty;
+  /**
+   * Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
+   * a readOnly one way binding. Very often when using `computed.oneWay` one does
+   * not also want changes to propagate back up, as they will replace the value.
+   */
+  export function readOnly(dependentKey: string): BasicComputedProperty;
+  /**
+   * This is a more semantically meaningful alias of `computed.oneWay`,
+   * whose name is somewhat ambiguous as to which direction the data flows.
+   */
+  export function reads(dependentKey: string): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the
- * properties from the first dependent array that are not in the second
- * dependent array.
- */
-export function setDiff(setAProperty: string, setBProperty: string): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the
+   * properties from the first dependent array that are not in the second
+   * dependent array.
+   */
+  export function setDiff(setAProperty: string, setBProperty: string): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the properties from
- * the first dependent array sorted based on a property or sort function.
- *
- * If used with an array of sort properties, it must receive exactly two
- * arguments: the key of the array to sort, and the key of the array of sort
- * properties. Alternatively the key of the array to sort, and a the sort
- * function may be used.
- */
-export function sort<T>(
-  itemsKey: string,
-  sortDefinition: string | ((itemA: T, itemB: T) => number)
-): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the properties from
+   * the first dependent array sorted based on a property or sort function.
+   *
+   * If used with an array of sort properties, it must receive exactly two
+   * arguments: the key of the array to sort, and the key of the array of sort
+   * properties. Alternatively the key of the array to sort, and a the sort
+   * function may be used.
+   */
+  export function sort<T>(
+    itemsKey: string,
+    sortDefinition: string | ((itemA: T, itemB: T) => number)
+  ): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the properties from
- * the first dependent array sorted based on a property or sort function.
- *
- * It may receive three arguments: the key of the array to sort, an array of
- * dependent keys for the computed property, and the sort function.
- */
-export function sort<T>(
-  itemsKey: string,
-  dependentKeys: string[],
-  sortDefinition: string | ((itemA: T, itemB: T) => number)
-): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the properties from
+   * the first dependent array sorted based on a property or sort function.
+   *
+   * It may receive three arguments: the key of the array to sort, an array of
+   * dependent keys for the computed property, and the sort function.
+   */
+  export function sort<T>(
+    itemsKey: string,
+    dependentKeys: string[],
+    sortDefinition: string | ((itemA: T, itemB: T) => number)
+  ): BasicComputedProperty;
 
-/**
- * A computed property that returns the sum of the values
- * in the dependent array.
- */
-export function sum(dependentKey: string): BasicComputedProperty;
+  /**
+   * A computed property that returns the sum of the values
+   * in the dependent array.
+   */
+  export function sum(dependentKey: string): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the unique
- * elements from one or more dependent arrays.
- */
-export function uniq(propertyKey: string): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the unique
+   * elements from one or more dependent arrays.
+   */
+  export function uniq(propertyKey: string): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the unique
- * elements from one or more dependent arrays.
- */
-export function union(...propertyKeys: string[]): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the unique
+   * elements from one or more dependent arrays.
+   */
+  export function union(...propertyKeys: string[]): BasicComputedProperty;
 
-/**
- * A computed property which returns a new array with all the unique
- * elements from an array, with uniqueness determined by specific key.
- */
-export function uniqBy(dependentKey: string, propertyKey: string): BasicComputedProperty;
+  /**
+   * A computed property which returns a new array with all the unique
+   * elements from an array, with uniqueness determined by specific key.
+   */
+  export function uniqBy(dependentKey: string, propertyKey: string): BasicComputedProperty;
+}
diff --git a/types/preview/@ember/object/core.d.ts b/types/preview/@ember/object/core.d.ts
index f9ecbbb256a..ea8506f9b01 100644
--- a/types/preview/@ember/object/core.d.ts
+++ b/types/preview/@ember/object/core.d.ts
@@ -1,87 +1,89 @@
-import type { EmberClassConstructor, Objectify } from './-private/types';
-import type Mixin from './mixin';
+declare module '@ember/object/core' {
+  import type { EmberClassConstructor, Objectify } from '@ember/object/-private/types';
+  import type Mixin from '@ember/object/mixin';
 
-export default class CoreObject {
-  /**
-   * As of Ember 3.1, CoreObject constructor takes initial object properties as an argument.
-   * See: https://github.com/emberjs/ember.js/commit/4709935854d4c29b0d2c054614d53fa2c55309b1
-   */
-  constructor(properties?: object);
+  export default class CoreObject {
+    /**
+     * As of Ember 3.1, CoreObject constructor takes initial object properties as an argument.
+     * See: https://github.com/emberjs/ember.js/commit/4709935854d4c29b0d2c054614d53fa2c55309b1
+     */
+    constructor(properties?: object);
 
-  _super(...args: any[]): any;
+    _super(...args: any[]): any;
 
-  /**
-   * An overridable method called when objects are instantiated. By default,
-   * does nothing unless it is overridden during class definition.
-   */
-  init(): void;
+    /**
+     * An overridable method called when objects are instantiated. By default,
+     * does nothing unless it is overridden during class definition.
+     */
+    init(): void;
 
-  /**
-   * Defines the properties that will be concatenated from the superclass (instead of overridden).
-   * @default null
-   */
-  concatenatedProperties: string[] | null;
+    /**
+     * Defines the properties that will be concatenated from the superclass (instead of overridden).
+     * @default null
+     */
+    concatenatedProperties: string[] | null;
 
-  /**
-   * Destroyed object property flag. If this property is true the observers and bindings were
-   * already removed by the effect of calling the destroy() method.
-   * @default false
-   */
-  isDestroyed: boolean;
-  /**
-   * Destruction scheduled flag. The destroy() method has been called. The object stays intact
-   * until the end of the run loop at which point the isDestroyed flag is set.
-   * @default false
-   */
-  isDestroying: boolean;
+    /**
+     * Destroyed object property flag. If this property is true the observers and bindings were
+     * already removed by the effect of calling the destroy() method.
+     * @default false
+     */
+    isDestroyed: boolean;
+    /**
+     * Destruction scheduled flag. The destroy() method has been called. The object stays intact
+     * until the end of the run loop at which point the isDestroyed flag is set.
+     * @default false
+     */
+    isDestroying: boolean;
 
-  /**
-   * Destroys an object by setting the `isDestroyed` flag and removing its
-   * metadata, which effectively destroys observers and bindings.
-   * If you try to set a property on a destroyed object, an exception will be
-   * raised.
-   * Note that destruction is scheduled for the end of the run loop and does not
-   * happen immediately.  It will set an isDestroying flag immediately.
-   * @return receiver
-   */
-  destroy(): CoreObject;
+    /**
+     * Destroys an object by setting the `isDestroyed` flag and removing its
+     * metadata, which effectively destroys observers and bindings.
+     * If you try to set a property on a destroyed object, an exception will be
+     * raised.
+     * Note that destruction is scheduled for the end of the run loop and does not
+     * happen immediately.  It will set an isDestroying flag immediately.
+     * @return receiver
+     */
+    destroy(): CoreObject;
 
-  /**
-   * Override to implement teardown.
-   */
-  willDestroy(): void;
+    /**
+     * Override to implement teardown.
+     */
+    willDestroy(): void;
 
-  /**
-   * Returns a string representation which attempts to provide more information than Javascript's toString
-   * typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
-   * @return string representation
-   */
-  toString(): string;
+    /**
+     * Returns a string representation which attempts to provide more information than Javascript's toString
+     * typically does, in a generic way for all Ember objects (e.g., "<App.Person:ember1024>").
+     * @return string representation
+     */
+    toString(): string;
 
-  static create<Class extends typeof CoreObject>(
-    this: Class,
-    ...initialValues: Array<Mixin | MembersOf<Class>>
-  ): InstanceType<Class>;
+    static create<Class extends typeof CoreObject>(
+      this: Class,
+      ...initialValues: Array<Mixin | MembersOf<Class>>
+    ): InstanceType<Class>;
 
-  static extend<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    ...mixins: Array<Mixin | Record<string, unknown>>
-  ): Objectify<Statics> & EmberClassConstructor<Instance>;
+    static extend<Statics, Instance>(
+      this: Statics & EmberClassConstructor<Instance>,
+      ...mixins: Array<Mixin | Record<string, unknown>>
+    ): Objectify<Statics> & EmberClassConstructor<Instance>;
 
-  static reopen<Statics, Instance>(
-    this: Statics & EmberClassConstructor<Instance>,
-    ...mixins: Array<Mixin | Record<string, unknown>>
-  ): Objectify<Statics> & EmberClassConstructor<Instance>;
+    static reopen<Statics, Instance>(
+      this: Statics & EmberClassConstructor<Instance>,
+      ...mixins: Array<Mixin | Record<string, unknown>>
+    ): Objectify<Statics> & EmberClassConstructor<Instance>;
 
-  static reopenClass<Statics>(
-    this: Statics,
-    ...extraStatics: Array<Mixin | Record<string, unknown>>
-  ): Statics;
+    static reopenClass<Statics>(
+      this: Statics,
+      ...extraStatics: Array<Mixin | Record<string, unknown>>
+    ): Statics;
 
-  static isClass: boolean;
-  static isMethod: boolean;
-}
+    static isClass: boolean;
+    static isMethod: boolean;
+  }
 
-type MembersOf<Class extends typeof CoreObject> = {
-  [Key in keyof InstanceType<Class>]?: InstanceType<Class>[Key];
-};
+  type MembersOf<Class extends typeof CoreObject> = {
+    [Key in keyof InstanceType<Class>]?: InstanceType<Class>[Key];
+  };
+}
diff --git a/types/preview/@ember/object/evented.d.ts b/types/preview/@ember/object/evented.d.ts
index f3be2682036..d60f3524b00 100644
--- a/types/preview/@ember/object/evented.d.ts
+++ b/types/preview/@ember/object/evented.d.ts
@@ -1,43 +1,45 @@
-import Mixin from '@ember/object/mixin';
-import { AnyFn, EmberMethod } from 'ember/-private/type-utils';
+declare module '@ember/object/evented' {
+  import Mixin from '@ember/object/mixin';
+  import { AnyFn, EmberMethod } from 'ember/-private/type-utils';
 
-/**
- * This mixin allows for Ember objects to subscribe to and emit events.
- */
-interface Evented {
   /**
-   * Subscribes to a named event with given function.
+   * This mixin allows for Ember objects to subscribe to and emit events.
    */
-  on<T>(name: string, target: T, method: EmberMethod<T>): this;
-  on(name: string, method: EmberMethod<this>): this;
-  /**
-   * Subscribes a function to a named event and then cancels the subscription
-   * after the first time the event is triggered. It is good to use ``one`` when
-   * you only care about the first time an event has taken place.
-   */
-  one<T>(name: string, target: T, method: EmberMethod<T>): this;
-  one(name: string, method: EmberMethod<this>): this;
-  /**
-   * Triggers a named event for the object. Any additional arguments
-   * will be passed as parameters to the functions that are subscribed to the
-   * event.
-   */
-  trigger(name: string, ...args: unknown[]): any;
-  /**
-   * Cancels subscription for given name, target, and method.
-   */
-  off<T>(name: string, target: T, method: EmberMethod<T>): this;
-  off(name: string, method: EmberMethod<this>): this;
+  interface Evented {
+    /**
+     * Subscribes to a named event with given function.
+     */
+    on<T>(name: string, target: T, method: EmberMethod<T>): this;
+    on(name: string, method: EmberMethod<this>): this;
+    /**
+     * Subscribes a function to a named event and then cancels the subscription
+     * after the first time the event is triggered. It is good to use ``one`` when
+     * you only care about the first time an event has taken place.
+     */
+    one<T>(name: string, target: T, method: EmberMethod<T>): this;
+    one(name: string, method: EmberMethod<this>): this;
+    /**
+     * Triggers a named event for the object. Any additional arguments
+     * will be passed as parameters to the functions that are subscribed to the
+     * event.
+     */
+    trigger(name: string, ...args: unknown[]): unknown;
+    /**
+     * Cancels subscription for given name, target, and method.
+     */
+    off<T>(name: string, target: T, method: EmberMethod<T>): this;
+    off(name: string, method: EmberMethod<this>): this;
+    /**
+     * Checks to see if object has any subscriptions for named event.
+     */
+    has(name: string): boolean;
+  }
+  const Evented: Mixin;
+  export default Evented;
+
   /**
-   * Checks to see if object has any subscriptions for named event.
+   * Define a property as a function that should be executed when
+   * a specified event or events are triggered.
    */
-  has(name: string): boolean;
+  export function on<F extends AnyFn>(...args: [...eventNames: string[], func: F]): F;
 }
-declare const Evented: Mixin;
-export default Evented;
-
-/**
- * Define a property as a function that should be executed when
- * a specified event or events are triggered.
- */
-export function on<F extends AnyFn>(...args: [...eventNames: string[], func: F]): F;
diff --git a/types/preview/@ember/object/events.d.ts b/types/preview/@ember/object/events.d.ts
index 17d6df2cbf3..281ec80aab4 100644
--- a/types/preview/@ember/object/events.d.ts
+++ b/types/preview/@ember/object/events.d.ts
@@ -1,45 +1,47 @@
-import { AnyFunction } from '@ember/object/-private/types';
+declare module '@ember/object/events' {
+  import { AnyFunction } from '@ember/object/-private/types';
 
-/**
- * Add an event listener
- */
-export function addListener<Context>(
-  obj: Context,
-  eventName: string,
-  target: unknown,
-  method: keyof Context | AnyFunction,
-  once?: boolean
-): void;
-export function addListener<Context>(
-  obj: Context,
-  eventName: string,
-  method: keyof Context | AnyFunction,
-  once?: boolean
-): void;
+  /**
+   * Add an event listener
+   */
+  export function addListener<Context>(
+    obj: Context,
+    eventName: string,
+    target: unknown,
+    method: keyof Context | AnyFunction,
+    once?: boolean
+  ): void;
+  export function addListener<Context>(
+    obj: Context,
+    eventName: string,
+    method: keyof Context | AnyFunction,
+    once?: boolean
+  ): void;
 
-/**
- * Remove an event listener
- */
-export function removeListener<Context>(
-  obj: Context,
-  eventName: string,
-  target: unknown,
-  method: keyof Context | AnyFunction
-): void;
-export function removeListener<Context>(
-  obj: Context,
-  eventName: string,
-  method: keyof Context | AnyFunction
-): void;
+  /**
+   * Remove an event listener
+   */
+  export function removeListener<Context>(
+    obj: Context,
+    eventName: string,
+    target: unknown,
+    method: keyof Context | AnyFunction
+  ): void;
+  export function removeListener<Context>(
+    obj: Context,
+    eventName: string,
+    method: keyof Context | AnyFunction
+  ): void;
 
-/**
- * Send an event. The execution of suspended listeners
- * is skipped, and once listeners are removed. A listener without
- * a target is executed on the passed object. If an array of actions
- * is not passed, the actions stored on the passed object are invoked.
- *
- * @param eventName
- * @param params Optional parameters for each listener.
- * @returns if the event was delivered to one or more actions
- */
-export function sendEvent(obj: unknown, eventName: string, params?: unknown[]): boolean;
+  /**
+   * Send an event. The execution of suspended listeners
+   * is skipped, and once listeners are removed. A listener without
+   * a target is executed on the passed object. If an array of actions
+   * is not passed, the actions stored on the passed object are invoked.
+   *
+   * @param eventName
+   * @param params Optional parameters for each listener.
+   * @returns if the event was delivered to one or more actions
+   */
+  export function sendEvent(obj: unknown, eventName: string, params?: unknown[]): boolean;
+}
diff --git a/types/preview/@ember/object/index.d.ts b/types/preview/@ember/object/index.d.ts
index 05a3cbb5129..5eb4d03ce46 100644
--- a/types/preview/@ember/object/index.d.ts
+++ b/types/preview/@ember/object/index.d.ts
@@ -1,114 +1,124 @@
-import CoreObject from './core';
-import type Observable from './observable';
-import type ComputedProperty from './computed';
-import type { BasicComputedProperty } from './computed';
-import type { AnyFunction } from './-private/types';
+declare module '@ember/object' {
+  import CoreObject from '@ember/object/core';
+  import type Observable from '@ember/object/observable';
+  import type ComputedProperty from '@ember/object/computed';
+  import type { BasicComputedProperty } from '@ember/object/computed';
+  import type { AnyFunction } from '@ember/object/-private/types';
 
-/**
- * `Ember.Object` is the main base class for all Ember objects. It is a subclass
- * of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
- * see the documentation for each of these.
- */
-export default class EmberObject extends CoreObject {}
-export default interface EmberObject extends Observable {}
+  /**
+   * `Ember.Object` is the main base class for all Ember objects. It is a subclass
+   * of `Ember.CoreObject` with the `Ember.Observable` mixin applied. For details,
+   * see the documentation for each of these.
+   */
+  export default class EmberObject extends CoreObject {}
+  export default interface EmberObject extends Observable {}
 
-/**
- * This helper returns a new property descriptor that wraps the passed computed
- * property function. You can use this helper to define properties with native
- * decorator syntax, mixins, or via `defineProperty()`.
- *
- * @param dependentKeys Optional dependent keys that trigger this computed
- *   property.
- */
-export function computed(...dependentKeys: string[]): ComputedProperty & MethodDecorator;
+  /**
+   * This helper returns a new property descriptor that wraps the passed computed
+   * property function. You can use this helper to define properties with native
+   * decorator syntax, mixins, or via `defineProperty()`.
+   *
+   * @param dependentKeys Optional dependent keys that trigger this computed
+   *   property.
+   */
+  export function computed(...dependentKeys: string[]): ComputedProperty & MethodDecorator;
 
-export function computed(
-  ...args: [...dependentKeys: string[], callback: AnyFunction]
-): BasicComputedProperty;
+  export function computed(
+    ...args: [...dependentKeys: string[], callback: AnyFunction]
+  ): BasicComputedProperty;
 
-/**
- * Specify a method that observes property changes.
- */
-export function observer<Fn extends (target: any, key: string) => void>(
-  ...args: [...propertyNames: string[], func: Fn]
-): Fn;
+  /**
+   * Specify a method that observes property changes.
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  export function observer<Fn extends (target: any, key: string) => void>(
+    ...args: [...propertyNames: string[], func: Fn]
+  ): Fn;
 
-/**
- * Gets the value of a property on an object. If the property is computed,
- * the function will be invoked. If the property is not defined but the
- * object implements the `unknownProperty` method then that will be invoked.
- */
-export function get<T, K extends keyof T>(obj: T, key: K): T[K];
-export function get(obj: unknown, key: string): unknown;
+  /**
+   * Gets the value of a property on an object. If the property is computed,
+   * the function will be invoked. If the property is not defined but the
+   * object implements the `unknownProperty` method then that will be invoked.
+   */
+  export function get<T, K extends keyof T>(obj: T, key: K): T[K];
+  export function get(obj: unknown, key: string): unknown;
 
-/**
- * Sets the value of a property on an object, respecting computed properties
- * and notifying observers and other listeners of the change. If the
- * property is not defined but the object implements the `setUnknownProperty`
- * method then that will be invoked as well.
- */
-export function set<T, K extends keyof T, V extends T[K]>(obj: T, key: K, value: V): V;
+  /**
+   * Sets the value of a property on an object, respecting computed properties
+   * and notifying observers and other listeners of the change. If the
+   * property is not defined but the object implements the `setUnknownProperty`
+   * method then that will be invoked as well.
+   */
+  export function set<T, K extends keyof T, V extends T[K]>(obj: T, key: K, value: V): V;
 
-/**
- * To get multiple properties at once, call `getProperties` with an object
- * followed by a list of strings or an array.
- */
-export function getProperties<T, K extends keyof T>(obj: T, list: K[]): Pick<T, K>;
-export function getProperties<T, K extends keyof T>(obj: T, ...list: K[]): Pick<T, K>;
+  /**
+   * To get multiple properties at once, call `getProperties` with an object
+   * followed by a list of strings or an array.
+   */
+  export function getProperties<T, K extends keyof T>(obj: T, list: K[]): Pick<T, K>;
+  export function getProperties<T, K extends keyof T>(obj: T, ...list: K[]): Pick<T, K>;
 
-/**
- * Set a list of properties on an object. These properties are set inside
- * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
- * observers will be buffered.
- */
-export function setProperties<T, K extends keyof T>(obj: T, hash: Pick<T, K>): Pick<T, K>;
+  /**
+   * Set a list of properties on an object. These properties are set inside
+   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+   * observers will be buffered.
+   */
+  export function setProperties<T, K extends keyof T>(obj: T, hash: Pick<T, K>): Pick<T, K>;
 
-/**
- * Error-tolerant form of `Ember.set`. Will not blow up if any part of the
- * chain is `undefined`, `null`, or destroyed.
- */
-export function trySet(root: object, path: string, value: unknown): unknown;
+  /**
+   * Error-tolerant form of `Ember.set`. Will not blow up if any part of the
+   * chain is `undefined`, `null`, or destroyed.
+   */
+  export function trySet(root: object, path: string, value: unknown): unknown;
 
-/**
- * NOTE: This is a low-level method used by other parts of the API. You almost
- * never want to call this method directly. Instead you should use mixin() to
- * define new properties.
- *
- * @param obj the object to define this property on. This may be a prototype.
- * @param keyName the name of the property
- * @param desc an instance of `Descriptor` (typically a computed property) or an
- *   ES5 descriptor. You must provide this or `data` but not both.
- * @param meta Normally this method takes only three parameters. However if you
- *   pass an instance of Descriptor as the third param then you can pass an
- *   optional value as the fourth parameter. This is often more efficient than
- *   creating new descriptor hashes for each property.
- */
-export function defineProperty(
-  obj: object,
-  keyName: string,
-  desc: PropertyDescriptor | ComputedProperty,
-  meta?: unknown
-): void;
+  /**
+   * NOTE: This is a low-level method used by other parts of the API. You almost
+   * never want to call this method directly. Instead you should use mixin() to
+   * define new properties.
+   *
+   * @param obj the object to define this property on. This may be a prototype.
+   * @param keyName the name of the property
+   * @param desc an instance of `Descriptor` (typically a computed property) or an
+   *   ES5 descriptor. You must provide this or `data` but not both.
+   * @param meta Normally this method takes only three parameters. However if you
+   *   pass an instance of Descriptor as the third param then you can pass an
+   *   optional value as the fourth parameter. This is often more efficient than
+   *   creating new descriptor hashes for each property.
+   */
+  export function defineProperty(
+    obj: object,
+    keyName: string,
+    desc: PropertyDescriptor | ComputedProperty,
+    meta?: unknown
+  ): void;
 
-/**
- * NOTE: This is a low-level method used by other parts of the API. You almost
- * never want to call this method directly. Instead you should use mixin() to
- * define new properties.
- *
- * @param obj the object to define this property on. This may be a prototype.
- * @param keyName the name of the property
- * @param desc an instance of `Descriptor` (typically a computed property) or an
- *   ES5 descriptor. You must provide this or `data` but not both.
- * @param data something other than a descriptor, that will become the explicit
- *   value of this property.
- */
-export function defineProperty(obj: object, keyName: string, desc: undefined, data: unknown): void;
+  /**
+   * NOTE: This is a low-level method used by other parts of the API. You almost
+   * never want to call this method directly. Instead you should use mixin() to
+   * define new properties.
+   *
+   * @param obj the object to define this property on. This may be a prototype.
+   * @param keyName the name of the property
+   * @param desc an instance of `Descriptor` (typically a computed property) or an
+   *   ES5 descriptor. You must provide this or `data` but not both.
+   * @param data something other than a descriptor, that will become the explicit
+   *   value of this property.
+   */
+  export function defineProperty(
+    obj: object,
+    keyName: string,
+    desc: undefined,
+    data: unknown
+  ): void;
 
-export function notifyPropertyChange(obj: object, keyName: string): void;
+  export function notifyPropertyChange(obj: object, keyName: string): void;
 
-export const action: MethodDecorator;
+  export const action: MethodDecorator;
+}
 
 declare module '@ember/utils/-private/types' {
+  import EmberObject from '@ember/object';
+
   interface TypeLookup {
     class: typeof EmberObject;
     instance: EmberObject;
diff --git a/types/preview/@ember/object/internals.d.ts b/types/preview/@ember/object/internals.d.ts
index bb9ccc5be99..9d9ea53784b 100644
--- a/types/preview/@ember/object/internals.d.ts
+++ b/types/preview/@ember/object/internals.d.ts
@@ -1,15 +1,17 @@
-/**
- * Returns the cached value for a property, if one exists.
- * This can be useful for peeking at the value of a computed
- * property that is generated lazily, without accidentally causing
- * it to be created.
- */
-export function cacheFor<T, K extends keyof T>(obj: T, key: K): T[K] | undefined;
+declare module '@ember/object/internals' {
+  /**
+   * Returns the cached value for a property, if one exists.
+   * This can be useful for peeking at the value of a computed
+   * property that is generated lazily, without accidentally causing
+   * it to be created.
+   */
+  export function cacheFor<T, K extends keyof T>(obj: T, key: K): T[K] | undefined;
 
-/**
- * Returns a unique id for the object. If the object does not yet have a guid,
- * one will be assigned to it. You can call this on any object,
- * `Ember.Object`-based or not, but be aware that it will add a `_guid`
- * property.
- */
-export function guidFor(obj: unknown): string;
+  /**
+   * Returns a unique id for the object. If the object does not yet have a guid,
+   * one will be assigned to it. You can call this on any object,
+   * `Ember.Object`-based or not, but be aware that it will add a `_guid`
+   * property.
+   */
+  export function guidFor(obj: unknown): string;
+}
diff --git a/types/preview/@ember/object/mixin.d.ts b/types/preview/@ember/object/mixin.d.ts
index 4ddb16700f7..af3475c7bfc 100644
--- a/types/preview/@ember/object/mixin.d.ts
+++ b/types/preview/@ember/object/mixin.d.ts
@@ -1,17 +1,19 @@
-declare const __ember_mixin__: unique symbol;
+declare module '@ember/object/mixin' {
+  const __ember_mixin__: unique symbol;
 
-/**
- * The `Ember.Mixin` class allows you to create mixins, whose properties can be
- * added to other classes.
- */
-export default class Mixin {
   /**
-   * Mixin needs to have *something* on its prototype, otherwise it's treated
-   * like an empty interface. It cannot be private, sadly. We can use this to
-   * carry around the types of the mixin so they don't get lost, though, so
-   * that's... something?
+   * The `Ember.Mixin` class allows you to create mixins, whose properties can be
+   * added to other classes.
    */
-  [__ember_mixin__]: never;
+  export default class Mixin {
+    /**
+     * Mixin needs to have *something* on its prototype, otherwise it's treated
+     * like an empty interface. It cannot be private, sadly. We can use this to
+     * carry around the types of the mixin so they don't get lost, though, so
+     * that's... something?
+     */
+    [__ember_mixin__]: never;
 
-  static create(...args: Array<Record<string, unknown> | Mixin>): Mixin;
+    static create(...args: Array<Record<string, unknown> | Mixin>): Mixin;
+  }
 }
diff --git a/types/preview/@ember/object/observable.d.ts b/types/preview/@ember/object/observable.d.ts
index 74ed10570dd..e64774959c7 100644
--- a/types/preview/@ember/object/observable.d.ts
+++ b/types/preview/@ember/object/observable.d.ts
@@ -1,83 +1,89 @@
-import { ObserverMethod } from './-private/types';
-import Mixin from './mixin';
-import CoreObject from './core';
+declare module '@ember/object/observable' {
+  import { ObserverMethod } from '@ember/object/-private/types';
+  import Mixin from '@ember/object/mixin';
+  import CoreObject from '@ember/object/core';
 
-/**
- * This mixin provides properties and property observing functionality, core features of the Ember object model.
- */
-interface Observable extends CoreObject {
   /**
-   * Retrieves the value of a property from the object.
+   * This mixin provides properties and property observing functionality, core features of the Ember object model.
    */
-  get<K extends keyof this>(key: K): this[K];
-  get(key: string): unknown;
-  /**
-   * To get the values of multiple properties at once, call `getProperties`
-   * with a list of strings or an array:
-   */
-  getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
-  getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
-  getProperties(list: string[]): Record<string, unknown>;
-  getProperties(...list: string[]): Record<string, unknown>;
-  /**
-   * Sets the provided key or path to the value.
-   */
-  set<K extends keyof this>(key: K, value: this[K]): this[K];
-  set<T>(key: keyof this, value: T): T;
-  set<T>(key: string, value: T): T;
-  /**
-   * Sets a list of properties at once. These properties are set inside
-   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
-   * observers will be buffered.
-   */
-  setProperties<K extends keyof this>(hash: Pick<this, K>): Pick<this, K>;
-  setProperties<K extends keyof this>(hash: Record<K, unknown>): Pick<this, K>;
-  setProperties<R extends Record<string, unknown>>(hash: R): R;
-  /**
-   * Notify the observer system that a property has just changed.
-   *
-   * Sometimes you need to change a value directly or indirectly without
-   * actually calling `get()` or `set()` on it. In this case, you can use this
-   * method instead. Calling this method will notify all observers that the
-   * property has potentially changed value.
-   */
-  notifyPropertyChange(keyName: string): this;
-  /**
-   * Adds an observer on a property.
-   */
-  addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
-  addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  /**
-   * Remove an observer you have previously registered on this object. Pass
-   * the same key, target, and method you passed to `addObserver()` and your
-   * target will no longer receive notifications.
-   */
-  removeObserver<Target>(
-    key: keyof this,
-    target: Target,
-    method: ObserverMethod<Target, this>
-  ): this;
-  removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
-  /**
-   * Set the value of a property to the current value plus some amount.
-   */
-  incrementProperty(keyName: keyof this, increment?: number): number;
-  /**
-   * Set the value of a property to the current value minus some amount.
-   */
-  decrementProperty(keyName: keyof this, decrement?: number): number;
-  /**
-   * Set the value of a boolean property to the opposite of its
-   * current value.
-   */
-  toggleProperty(keyName: keyof this): boolean;
-  /**
-   * Returns the cached value of a computed property, if it exists.
-   * This allows you to inspect the value of a computed property
-   * without accidentally invoking it if it is intended to be
-   * generated lazily.
-   */
-  cacheFor<K extends keyof this>(key: K): this[K] | undefined;
+  interface Observable extends CoreObject {
+    /**
+     * Retrieves the value of a property from the object.
+     */
+    get<K extends keyof this>(key: K): this[K];
+    get(key: string): unknown;
+    /**
+     * To get the values of multiple properties at once, call `getProperties`
+     * with a list of strings or an array:
+     */
+    getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
+    getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
+    getProperties(list: string[]): Record<string, unknown>;
+    getProperties(...list: string[]): Record<string, unknown>;
+    /**
+     * Sets the provided key or path to the value.
+     */
+    set<K extends keyof this>(key: K, value: this[K]): this[K];
+    set<T>(key: keyof this, value: T): T;
+    set<T>(key: string, value: T): T;
+    /**
+     * Sets a list of properties at once. These properties are set inside
+     * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+     * observers will be buffered.
+     */
+    setProperties<K extends keyof this>(hash: Pick<this, K>): Pick<this, K>;
+    setProperties<K extends keyof this>(hash: Record<K, unknown>): Pick<this, K>;
+    setProperties<R extends Record<string, unknown>>(hash: R): R;
+    /**
+     * Notify the observer system that a property has just changed.
+     *
+     * Sometimes you need to change a value directly or indirectly without
+     * actually calling `get()` or `set()` on it. In this case, you can use this
+     * method instead. Calling this method will notify all observers that the
+     * property has potentially changed value.
+     */
+    notifyPropertyChange(keyName: string): this;
+    /**
+     * Adds an observer on a property.
+     */
+    addObserver<Target>(
+      key: keyof this,
+      target: Target,
+      method: ObserverMethod<Target, this>
+    ): this;
+    addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+    /**
+     * Remove an observer you have previously registered on this object. Pass
+     * the same key, target, and method you passed to `addObserver()` and your
+     * target will no longer receive notifications.
+     */
+    removeObserver<Target>(
+      key: keyof this,
+      target: Target,
+      method: ObserverMethod<Target, this>
+    ): this;
+    removeObserver(key: keyof this, method: ObserverMethod<this, this>): this;
+    /**
+     * Set the value of a property to the current value plus some amount.
+     */
+    incrementProperty(keyName: keyof this, increment?: number): number;
+    /**
+     * Set the value of a property to the current value minus some amount.
+     */
+    decrementProperty(keyName: keyof this, decrement?: number): number;
+    /**
+     * Set the value of a boolean property to the opposite of its
+     * current value.
+     */
+    toggleProperty(keyName: keyof this): boolean;
+    /**
+     * Returns the cached value of a computed property, if it exists.
+     * This allows you to inspect the value of a computed property
+     * without accidentally invoking it if it is intended to be
+     * generated lazily.
+     */
+    cacheFor<K extends keyof this>(key: K): this[K] | undefined;
+  }
+  const Observable: Mixin;
+  export default Observable;
 }
-declare const Observable: Mixin;
-export default Observable;
diff --git a/types/preview/@ember/object/observers.d.ts b/types/preview/@ember/object/observers.d.ts
index bbf57e4b3fa..36fb7de3325 100644
--- a/types/preview/@ember/object/observers.d.ts
+++ b/types/preview/@ember/object/observers.d.ts
@@ -1,32 +1,34 @@
-import { ObserverMethod } from '@ember/object/-private/types';
+declare module '@ember/object/observers' {
+  import { ObserverMethod } from '@ember/object/-private/types';
 
-/**
- * Adds an observer on a property.
- */
-export function addObserver<Context, Target>(
-  obj: Context,
-  key: keyof Context,
-  target: Target,
-  method: ObserverMethod<Target, Context>
-): void;
-export function addObserver<Context>(
-  obj: Context,
-  key: keyof Context,
-  method: ObserverMethod<Context, Context>
-): void;
-/**
- * Remove an observer you have previously registered on this object. Pass
- * the same key, target, and method you passed to `addObserver()` and your
- * target will no longer receive notifications.
- */
-export function removeObserver<Context, Target>(
-  obj: Context,
-  key: keyof Context,
-  target: Target,
-  method: ObserverMethod<Target, Context>
-): any;
-export function removeObserver<Context>(
-  obj: Context,
-  key: keyof Context,
-  method: ObserverMethod<Context, Context>
-): any;
+  /**
+   * Adds an observer on a property.
+   */
+  export function addObserver<Context, Target>(
+    obj: Context,
+    key: keyof Context,
+    target: Target,
+    method: ObserverMethod<Target, Context>
+  ): void;
+  export function addObserver<Context>(
+    obj: Context,
+    key: keyof Context,
+    method: ObserverMethod<Context, Context>
+  ): void;
+  /**
+   * Remove an observer you have previously registered on this object. Pass
+   * the same key, target, and method you passed to `addObserver()` and your
+   * target will no longer receive notifications.
+   */
+  export function removeObserver<Context, Target>(
+    obj: Context,
+    key: keyof Context,
+    target: Target,
+    method: ObserverMethod<Target, Context>
+  ): any;
+  export function removeObserver<Context>(
+    obj: Context,
+    key: keyof Context,
+    method: ObserverMethod<Context, Context>
+  ): any;
+}
diff --git a/types/preview/@ember/object/promise-proxy-mixin.d.ts b/types/preview/@ember/object/promise-proxy-mixin.d.ts
index 2ccc0ca5694..a834447639f 100644
--- a/types/preview/@ember/object/promise-proxy-mixin.d.ts
+++ b/types/preview/@ember/object/promise-proxy-mixin.d.ts
@@ -1,35 +1,37 @@
-import Mixin from '@ember/object/mixin';
-import RSVP from 'rsvp';
+declare module '@ember/object/promise-proxy-mixin' {
+  import Mixin from '@ember/object/mixin';
+  import RSVP from 'rsvp';
 
-/**
- * A low level mixin making ObjectProxy promise-aware.
- */
-interface PromiseProxyMixin<T> extends RSVP.Promise<T> {
   /**
-   * If the proxied promise is rejected this will contain the reason
-   * provided.
+   * A low level mixin making ObjectProxy promise-aware.
    */
-  reason: unknown;
-  /**
-   * Once the proxied promise has settled this will become `false`.
-   */
-  isPending: boolean;
-  /**
-   * Once the proxied promise has settled this will become `true`.
-   */
-  isSettled: boolean;
-  /**
-   * Will become `true` if the proxied promise is rejected.
-   */
-  isRejected: boolean;
-  /**
-   * Will become `true` if the proxied promise is fulfilled.
-   */
-  isFulfilled: boolean;
-  /**
-   * The promise whose fulfillment value is being proxied by this object.
-   */
-  promise: RSVP.Promise<T>;
+  interface PromiseProxyMixin<T> extends RSVP.Promise<T> {
+    /**
+     * If the proxied promise is rejected this will contain the reason
+     * provided.
+     */
+    reason: unknown;
+    /**
+     * Once the proxied promise has settled this will become `false`.
+     */
+    isPending: boolean;
+    /**
+     * Once the proxied promise has settled this will become `true`.
+     */
+    isSettled: boolean;
+    /**
+     * Will become `true` if the proxied promise is rejected.
+     */
+    isRejected: boolean;
+    /**
+     * Will become `true` if the proxied promise is fulfilled.
+     */
+    isFulfilled: boolean;
+    /**
+     * The promise whose fulfillment value is being proxied by this object.
+     */
+    promise: RSVP.Promise<T>;
+  }
+  const PromiseProxyMixin: Mixin;
+  export default PromiseProxyMixin;
 }
-declare const PromiseProxyMixin: Mixin;
-export default PromiseProxyMixin;
diff --git a/types/preview/@ember/object/proxy.d.ts b/types/preview/@ember/object/proxy.d.ts
index 266b34d3c81..a28ec6ebbda 100644
--- a/types/preview/@ember/object/proxy.d.ts
+++ b/types/preview/@ember/object/proxy.d.ts
@@ -1,25 +1,27 @@
-import EmberObject from './index';
+declare module '@ember/object/proxy' {
+  import EmberObject from '@ember/object';
 
-/**
- * `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
- * to a proxied `content` object.
- */
-export default class ObjectProxy<T extends object = object> extends EmberObject {
   /**
-   * The object whose properties will be forwarded.
+   * `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
+   * to a proxied `content` object.
    */
-  content: T | undefined;
+  export default class ObjectProxy<T extends object = object> extends EmberObject {
+    /**
+     * The object whose properties will be forwarded.
+     */
+    content: T | undefined;
 
-  get<K extends keyof this>(key: K): this[K];
-  get<K extends keyof T>(key: K): T[K] | undefined;
+    get<K extends keyof this>(key: K): this[K];
+    get<K extends keyof T>(key: K): T[K] | undefined;
 
-  getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
-  getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
-  getProperties<K extends keyof T>(list: K[]): Pick<Partial<T>, K>;
-  getProperties<K extends keyof T>(...list: K[]): Pick<Partial<T>, K>;
+    getProperties<K extends keyof this>(list: K[]): Pick<this, K>;
+    getProperties<K extends keyof this>(...list: K[]): Pick<this, K>;
+    getProperties<K extends keyof T>(list: K[]): Pick<Partial<T>, K>;
+    getProperties<K extends keyof T>(...list: K[]): Pick<Partial<T>, K>;
 
-  set<K extends keyof this>(key: K, value: this[K]): this[K];
-  set<K extends keyof T>(key: K, value: T[K]): T[K];
+    set<K extends keyof this>(key: K, value: this[K]): this[K];
+    set<K extends keyof T>(key: K, value: T[K]): T[K];
 
-  setProperties<K extends keyof this | keyof T>(hash: Pick<this & T, K>): Pick<this & T, K>;
+    setProperties<K extends keyof this | keyof T>(hash: Pick<this & T, K>): Pick<this & T, K>;
+  }
 }
diff --git a/types/preview/@ember/object/test/access-modifier.ts b/types/preview/@ember/object/test/access-modifier.ts
deleted file mode 100644
index 04e6dc510b5..00000000000
--- a/types/preview/@ember/object/test/access-modifier.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { assertType } from './lib/assert';
-import EmberObject from '@ember/object';
-
-class Foo extends EmberObject {
-  hello() {
-    return 'world';
-  }
-  protected bar() {
-    return 'bar';
-  }
-  private baz() {
-    return 'baz';
-  }
-}
-const f = new Foo();
-assertType<string>(f.hello());
-// @ts-expect-error
-assertType<string>(f.bar());
-// @ts-expect-error
-assertType<string>(f.baz());
-
-// TODO: enable after TS 3.0 https://github.com/typed-ember/ember-cli-typescript/issues/291
-// class Foo2 extends EmberObject.extend({
-//     bar: ''
-// }) {
-//     hello() { return 'world'; }
-//     protected bar() { return 'bar'; } // @ts-expect-error
-//     private baz() { return 'baz'; }
-// }
diff --git a/types/preview/@ember/object/test/get-set.ts b/types/preview/@ember/object/test/get-set.ts
deleted file mode 100644
index 86c801e7b63..00000000000
--- a/types/preview/@ember/object/test/get-set.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get, set } from '@ember/object';
-
-const basicPojo = { greeting: 'hello' };
-
-get(basicPojo, 'greeting'); // $ExpectType string
-get(basicPojo, 'salutation'); // $ExpectType unknown
-set(basicPojo, 'greeting', 'ahoy'); // $ExpectType string
-// @ts-expect-error
-set(basicPojo, 'salutation', 'heyo');
-
-declare let whoKnows: unknown;
-get(whoKnows, 'any-string'); // $ExpectType unknown
-// @ts-expect-error
-set(whoKnows, 'any-string', 123);
diff --git a/types/preview/@ember/object/test/internals.ts b/types/preview/@ember/object/test/internals.ts
deleted file mode 100644
index fcfb55c2bcb..00000000000
--- a/types/preview/@ember/object/test/internals.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { guidFor } from '@ember/object/internals';
-
-// $ExpectType string
-const strGuid = guidFor('a string');
-// $ExpectType string
-const numGuid = guidFor(123);
-// $ExpectType string
-const objGuid = guidFor({ hello: 'world' });
-// $ExpectType string
-const arrGuid = guidFor([1, 2, 3]);
diff --git a/types/preview/@ember/object/test/lib/assert.ts b/types/preview/@ember/object/test/lib/assert.ts
deleted file mode 100644
index dad227ab5e9..00000000000
--- a/types/preview/@ember/object/test/lib/assert.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Static assertion that `value` has type `T` */
-export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
index 414de7abe1c..31ca3476d4c 100644
--- a/types/preview/@ember/owner/index.d.ts
+++ b/types/preview/@ember/owner/index.d.ts
@@ -1,96 +1,102 @@
-/**
- * The name for a factory consists of a namespace and the name of a specific
- * type within that namespace, like `'service:session'`.
- */
-export type FullName = `${string}:${string}`;
-
-// TODO: when migrating into Ember proper, evaluate whether we should introduce
-// a registry which users can provide to resolve known types, so e.g.
-// `owner.lookup('service:session')` can return the right thing.
-/**
- * Framework objects in an Ember application (components, services, routes,
- * etc.) are created via a factory and dependency injection system. Each of
- * these objects is the responsibility of an "owner", which handled its
- * instantiation and manages its lifetime.
- */
-export default interface Owner {
+declare module '@ember/owner' {
   /**
-   * Given a {@linkcode FullName} return a corresponding instance.
+   * The name for a factory consists of a namespace and the name of a specific
+   * type within that namespace, like `'service:session'`.
    */
-  lookup(fullName: FullName): unknown;
+  export type FullName = `${string}:${string}`;
 
+  // TODO: when migrating into Ember proper, evaluate whether we should introduce
+  // a registry which users can provide to resolve known types, so e.g.
+  // `owner.lookup('service:session')` can return the right thing.
   /**
-   * Registers a factory or value that can be used for dependency injection
-   * (with `inject`) or for service lookup. Each factory is registered with a
-   * full name including two parts: `'type:name'`.
-   *
-   * - To override the default of instantiating the class on the `Factory`,
-   *   pass the `{ instantiate: false }` option. This is useful when you have
-   *   already instantiated the class to use with this factory.
-   * - To override the default singleton behavior and instead create multiple
-   *   instances, pass the `{ singleton: false }` option.
+   * Framework objects in an Ember application (components, services, routes,
+   * etc.) are created via a factory and dependency injection system. Each of
+   * these objects is the responsibility of an "owner", which handled its
+   * instantiation and manages its lifetime.
    */
-  // Dear future maintainer: yes, I know that `Factory<unknown> | object` is
-  // an exceedingly weird type here. This is how we type it internally in
-  // Ember itself. We actually allow more or less *anything* to be passed
-  // here. In the future, we may possibly be able to update this to actually
-  // take advantage of the `FullName` here to require that the registered
-  // factory and corresponding options do the right thing (passing an *actual*
-  // factory, not needing `create` if `options.instantiate` is `false`, etc.)
-  // but doing so will require rationalizing Ember's own internals and may
-  // need a full Ember RFC.
-  register(fullName: FullName, factory: Factory<unknown> | object, options?: RegisterOptions): void;
+  export default interface Owner {
+    /**
+     * Given a {@linkcode FullName} return a corresponding instance.
+     */
+    lookup(fullName: FullName): unknown;
+
+    /**
+     * Registers a factory or value that can be used for dependency injection
+     * (with `inject`) or for service lookup. Each factory is registered with a
+     * full name including two parts: `'type:name'`.
+     *
+     * - To override the default of instantiating the class on the `Factory`,
+     *   pass the `{ instantiate: false }` option. This is useful when you have
+     *   already instantiated the class to use with this factory.
+     * - To override the default singleton behavior and instead create multiple
+     *   instances, pass the `{ singleton: false }` option.
+     */
+    // Dear future maintainer: yes, I know that `Factory<unknown> | object` is
+    // an exceedingly weird type here. This is how we type it internally in
+    // Ember itself. We actually allow more or less *anything* to be passed
+    // here. In the future, we may possibly be able to update this to actually
+    // take advantage of the `FullName` here to require that the registered
+    // factory and corresponding options do the right thing (passing an *actual*
+    // factory, not needing `create` if `options.instantiate` is `false`, etc.)
+    // but doing so will require rationalizing Ember's own internals and may
+    // need a full Ember RFC.
+    register(
+      fullName: FullName,
+      factory: Factory<unknown> | object,
+      options?: RegisterOptions
+    ): void;
+
+    /**
+     * Given a fullName of the form `'type:name'`, like `'route:application'`,
+     * return a corresponding factory manager.
+     *
+     * Any instances created via the factory's `.create()` method must be
+     * destroyed manually by the caller of `.create()`. Typically, this is done
+     * during the creating objects own `destroy` or `willDestroy` methods.
+     */
+    factoryFor(fullName: FullName): FactoryManager<unknown> | undefined;
+  }
+
+  export interface RegisterOptions {
+    instantiate?: boolean | undefined;
+    singleton?: boolean | undefined;
+  }
 
   /**
-   * Given a fullName of the form `'type:name'`, like `'route:application'`,
-   * return a corresponding factory manager.
+   * Registered factories are instantiated by having create called on them.
+   * Additionally they are singletons by default, so each time they are looked up
+   * they return the same instance.
    *
-   * Any instances created via the factory's `.create()` method must be
-   * destroyed manually by the caller of `.create()`. Typically, this is done
-   * during the creating objects own `destroy` or `willDestroy` methods.
+   * However, that behavior can be modified with the `instantiate` and `singleton`
+   * options to the {@linkcode Owner.register} method.
    */
-  factoryFor(fullName: FullName): FactoryManager<unknown> | undefined;
-}
+  export interface Factory<T> {
+    /**
+     * A function that will create an instance of the class with any
+     * dependencies injected.
+     *
+     * @param initialValues Any values to set on an instance of the class
+     */
+    create(initialValues?: Partial<T>): T;
+  }
 
-export interface RegisterOptions {
-  instantiate?: boolean | undefined;
-  singleton?: boolean | undefined;
-}
-
-/**
- * Registered factories are instantiated by having create called on them.
- * Additionally they are singletons by default, so each time they are looked up
- * they return the same instance.
- *
- * However, that behavior can be modified with the `instantiate` and `singleton`
- * options to the {@linkcode Owner.register} method.
- */
-export interface Factory<T> {
   /**
-   * A function that will create an instance of the class with any
-   * dependencies injected.
+   * A manager which can be used for introspection of the factory's class or for
+   * the creation of factory instances with initial properties. The manager is an
+   * object with the following properties:
+   *
+   * - `class` - The registered or resolved class.
+   * - `create` - A function that will create an instance of the class with any
+   *   dependencies injected.
    *
-   * @param initialValues Any values to set on an instance of the class
+   * @note `FactoryManager` is *not* user-constructible; the only legal way to get
+   *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
    */
-  create(initialValues?: Partial<T>): T;
-}
+  export interface FactoryManager<T> extends Factory<T> {
+    /** The registered or resolved class. */
+    readonly class: Factory<T>;
+  }
 
-/**
- * A manager which can be used for introspection of the factory's class or for
- * the creation of factory instances with initial properties. The manager is an
- * object with the following properties:
- *
- * - `class` - The registered or resolved class.
- * - `create` - A function that will create an instance of the class with any
- *   dependencies injected.
- *
- * @note `FactoryManager` is *not* user-constructible; the only legal way to get
- *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
- */
-export interface FactoryManager<T> extends Factory<T> {
-  /** The registered or resolved class. */
-  readonly class: Factory<T>;
+  // Don't export things unless we *intend* to.
+  export {};
 }
-
-// Don't export things unless we *intend* to.
-export {};
diff --git a/types/preview/@ember/polyfills/ember__polyfills-tests.ts b/types/preview/@ember/polyfills/ember__polyfills-tests.ts
deleted file mode 100644
index 06f1261b6e6..00000000000
--- a/types/preview/@ember/polyfills/ember__polyfills-tests.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { assign } from '@ember/polyfills';
-
-(() => {
-  /* assign */
-  assign({}, { a: 'b' });
-  assign({}, { a: 'b' }).a; // $ExpectType string
-  assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
-  assign({ a: 6 }, {}).a; // $ExpectType number
-  // @ts-expect-error
-  assign({ b: 6 }, {}).a;
-  assign({}, { b: 6 }, {}).b; // $ExpectType number
-  assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
-  assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
-  // @ts-expect-error
-  assign({ a: 'hello' }, '', { a: true }).a;
-  assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
-  // @ts-expect-error
-  assign({}, { a: 0 }, { b: 1 }, { c: 2 }, { d: 3 }).a;
-
-  // matches Object.assign
-  assign({}, null); // $ExpectType never
-  assign({}, undefined); // $ExpectType never
-})();
diff --git a/types/preview/@ember/polyfills/index.d.ts b/types/preview/@ember/polyfills/index.d.ts
index 8bc9e03dd30..4fbe04bcaa9 100644
--- a/types/preview/@ember/polyfills/index.d.ts
+++ b/types/preview/@ember/polyfills/index.d.ts
@@ -1,21 +1,23 @@
-import type { Mix, Mix3, Mix4 } from './types';
+declare module '@ember/polyfills' {
+  import type { Mix, Mix3, Mix4 } from '@ember/polyfills/types';
 
-/**
- * Copy properties from a source object to a target object.
- * @deprecated until v5.0. You should replace any calls to `Ember.assign` with
- *   `Object.assign` or use the object spread operator.
- */
-export function assign<T extends object, U extends object>(target: T, source: U): Mix<T, U>;
-export function assign<T extends object, U extends object, V extends object>(
-  target: T,
-  source1: U,
-  source2: V
-): Mix3<T, U, V>;
-export function assign<T extends object, U extends object, V extends object, W extends object>(
-  target: T,
-  source1: U,
-  source2: V,
-  source3: W
-): Mix4<T, U, V, W>;
-export function assign(target: object, ...sources: object[]): unknown;
-export function assign(target: object, final: undefined | null): never;
+  /**
+   * Copy properties from a source object to a target object.
+   * @deprecated until v5.0. You should replace any calls to `Ember.assign` with
+   *   `Object.assign` or use the object spread operator.
+   */
+  export function assign<T extends object, U extends object>(target: T, source: U): Mix<T, U>;
+  export function assign<T extends object, U extends object, V extends object>(
+    target: T,
+    source1: U,
+    source2: V
+  ): Mix3<T, U, V>;
+  export function assign<T extends object, U extends object, V extends object, W extends object>(
+    target: T,
+    source1: U,
+    source2: V,
+    source3: W
+  ): Mix4<T, U, V, W>;
+  export function assign(target: object, ...sources: object[]): unknown;
+  export function assign(target: object, final: undefined | null): never;
+}
diff --git a/types/preview/@ember/polyfills/types.d.ts b/types/preview/@ember/polyfills/types.d.ts
index d1c8cf23063..be2a75c4ccc 100644
--- a/types/preview/@ember/polyfills/types.d.ts
+++ b/types/preview/@ember/polyfills/types.d.ts
@@ -1,4 +1,6 @@
-export type Mix<A, B> = B & Pick<A, Exclude<keyof A, keyof B>>;
-export type Mix3<A, B, C> = Mix<Mix<A, B>, C>;
-export type Mix4<A, B, C, D> = Mix3<Mix<A, B>, C, D>;
-export default Mix;
+declare module '@ember/polyfills/types' {
+  export type Mix<A, B> = B & Pick<A, Exclude<keyof A, keyof B>>;
+  export type Mix3<A, B, C> = Mix<Mix<A, B>, C>;
+  export type Mix4<A, B, C, D> = Mix3<Mix<A, B>, C, D>;
+  export default Mix;
+}
diff --git a/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts b/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
index 4977630e2ef..eccb9e34b6b 100644
--- a/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
+++ b/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
@@ -1 +1,3 @@
-export { RouteInfoWithAttributes as default } from '../route-info';
+declare module '@ember/routing/-private/route-info-with-attributes' {
+  export { RouteInfoWithAttributes as default } from '@ember/routing/route-info';
+}
diff --git a/types/preview/@ember/routing/-private/route-info.d.ts b/types/preview/@ember/routing/-private/route-info.d.ts
index 8c186376518..6174f5896a8 100644
--- a/types/preview/@ember/routing/-private/route-info.d.ts
+++ b/types/preview/@ember/routing/-private/route-info.d.ts
@@ -1 +1,3 @@
-export { default as default } from '../route-info';
+declare module '@ember/routing/-private/route-info' {
+  export { default as default } from '@ember/routing/route-info';
+}
diff --git a/types/preview/@ember/routing/-private/router-dsl.d.ts b/types/preview/@ember/routing/-private/router-dsl.d.ts
index 00c91f826df..8499aec45c8 100644
--- a/types/preview/@ember/routing/-private/router-dsl.d.ts
+++ b/types/preview/@ember/routing/-private/router-dsl.d.ts
@@ -1,18 +1,20 @@
-export default class RouterDSL {
-  constructor(name: string | null, options: object);
-  route(name: string, callback: (this: RouterDSL) => void): void;
-  route(
-    name: string,
-    options?: { path?: string | undefined; resetNamespace?: boolean | undefined },
-    callback?: (this: RouterDSL) => void
-  ): void;
-  mount(
-    name: string,
-    options?: {
-      as?: string | undefined;
-      path?: string | undefined;
-      resetNamespace?: boolean | undefined;
-      engineInfo?: unknown;
-    }
-  ): void;
+declare module '@ember/routing/-private/router-dsl' {
+  export default class RouterDSL {
+    constructor(name: string | null, options: object);
+    route(name: string, callback: (this: RouterDSL) => void): void;
+    route(
+      name: string,
+      options?: { path?: string | undefined; resetNamespace?: boolean | undefined },
+      callback?: (this: RouterDSL) => void
+    ): void;
+    mount(
+      name: string,
+      options?: {
+        as?: string | undefined;
+        path?: string | undefined;
+        resetNamespace?: boolean | undefined;
+        engineInfo?: unknown;
+      }
+    ): void;
+  }
 }
diff --git a/types/preview/@ember/routing/-private/transition.d.ts b/types/preview/@ember/routing/-private/transition.d.ts
index b825aaed5a7..bfaa3add03f 100644
--- a/types/preview/@ember/routing/-private/transition.d.ts
+++ b/types/preview/@ember/routing/-private/transition.d.ts
@@ -1 +1,3 @@
-export { default as default } from '../transition';
+declare module '@ember/routing/-private/transition' {
+  export { default as default } from '@ember/routing/transition';
+}
diff --git a/types/preview/@ember/routing/auto-location.d.ts b/types/preview/@ember/routing/auto-location.d.ts
index eb17614eb76..ef226556850 100644
--- a/types/preview/@ember/routing/auto-location.d.ts
+++ b/types/preview/@ember/routing/auto-location.d.ts
@@ -1,6 +1,8 @@
-import EmberObject from '@ember/object';
+declare module '@ember/routing/auto-location' {
+  import EmberObject from '@ember/object';
 
-/**
- * AutoLocation will select the best location option based off browser support with the priority order: history, hash, none.
- */
-export default class AutoLocation extends EmberObject {}
+  /**
+   * AutoLocation will select the best location option based off browser support with the priority order: history, hash, none.
+   */
+  export default class AutoLocation extends EmberObject {}
+}
diff --git a/types/preview/@ember/routing/hash-location.d.ts b/types/preview/@ember/routing/hash-location.d.ts
index 55b92d265ee..ce78e1d4ada 100644
--- a/types/preview/@ember/routing/hash-location.d.ts
+++ b/types/preview/@ember/routing/hash-location.d.ts
@@ -1,8 +1,10 @@
-import EmberObject from '@ember/object';
+declare module '@ember/routing/hash-location' {
+  import EmberObject from '@ember/object';
 
-/**
- * `Ember.HashLocation` implements the location API using the browser's
- * hash. At present, it relies on a `hashchange` event existing in the
- * browser.
- */
-export default class HashLocation extends EmberObject {}
+  /**
+   * `Ember.HashLocation` implements the location API using the browser's
+   * hash. At present, it relies on a `hashchange` event existing in the
+   * browser.
+   */
+  export default class HashLocation extends EmberObject {}
+}
diff --git a/types/preview/@ember/routing/history-location.d.ts b/types/preview/@ember/routing/history-location.d.ts
index 67d4399f038..71b2c015298 100644
--- a/types/preview/@ember/routing/history-location.d.ts
+++ b/types/preview/@ember/routing/history-location.d.ts
@@ -1,7 +1,9 @@
-import EmberObject from '@ember/object';
+declare module '@ember/routing/history-location' {
+  import EmberObject from '@ember/object';
 
-/**
- * Ember.HistoryLocation implements the location API using the browser's
- * history.pushState API.
- */
-export default class HistoryLocation extends EmberObject {}
+  /**
+   * Ember.HistoryLocation implements the location API using the browser's
+   * history.pushState API.
+   */
+  export default class HistoryLocation extends EmberObject {}
+}
diff --git a/types/preview/@ember/routing/index.d.ts b/types/preview/@ember/routing/index.d.ts
index bc33c70dae5..1fc19e3d27b 100644
--- a/types/preview/@ember/routing/index.d.ts
+++ b/types/preview/@ember/routing/index.d.ts
@@ -1,18 +1,20 @@
-export { default as Route } from '@ember/routing/route';
-export { default as Router } from '@ember/routing/router';
+declare module '@ember/routing' {
+  export { default as Route } from '@ember/routing/route';
+  export { default as Router } from '@ember/routing/router';
 
-import { Opaque } from 'ember/-private/type-utils';
+  import { Opaque } from 'ember/-private/type-utils';
 
-// In normal TypeScript, this component is essentially an opaque token
-// that just needs to be importable. Declaring it with a unique interface
-// like this, however, gives tools like Glint (that DO have a richer
-// notion of what it is) a place to install more detailed type information.
-export interface LinkTo extends Opaque<'component:link-to'> {}
+  // In normal TypeScript, this component is essentially an opaque token
+  // that just needs to be importable. Declaring it with a unique interface
+  // like this, however, gives tools like Glint (that DO have a richer
+  // notion of what it is) a place to install more detailed type information.
+  export interface LinkTo extends Opaque<'component:link-to'> {}
 
-/**
- * The `LinkTo` component renders a link to the supplied `route` passing
- * an optionally supplied model to the route as its `model` context of the route.
- *
- * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/LinkTo?anchor=LinkTo
- */
-export const LinkTo: LinkTo;
+  /**
+   * The `LinkTo` component renders a link to the supplied `route` passing
+   * an optionally supplied model to the route as its `model` context of the route.
+   *
+   * @see https://api.emberjs.com/ember/4.1/classes/Ember.Templates.components/methods/LinkTo?anchor=LinkTo
+   */
+  export const LinkTo: LinkTo;
+}
diff --git a/types/preview/@ember/routing/none-location.d.ts b/types/preview/@ember/routing/none-location.d.ts
index 286860db69f..8fface47a39 100644
--- a/types/preview/@ember/routing/none-location.d.ts
+++ b/types/preview/@ember/routing/none-location.d.ts
@@ -1,9 +1,11 @@
-import EmberObject from '@ember/object';
+declare module '@ember/routing/none-location' {
+  import EmberObject from '@ember/object';
 
-/**
- * Ember.NoneLocation does not interact with the browser. It is useful for
- * testing, or when you need to manage state with your Router, but temporarily
- * don't want it to muck with the URL (for example when you embed your
- * application in a larger page).
- */
-export default class NoneLocation extends EmberObject {}
+  /**
+   * Ember.NoneLocation does not interact with the browser. It is useful for
+   * testing, or when you need to manage state with your Router, but temporarily
+   * don't want it to muck with the URL (for example when you embed your
+   * application in a larger page).
+   */
+  export default class NoneLocation extends EmberObject {}
+}
diff --git a/types/preview/@ember/routing/route-info.d.ts b/types/preview/@ember/routing/route-info.d.ts
index acc8095ed2e..ead7d39900b 100644
--- a/types/preview/@ember/routing/route-info.d.ts
+++ b/types/preview/@ember/routing/route-info.d.ts
@@ -1,72 +1,74 @@
-// https://api.emberjs.com/ember/4.0/classes/RouteInfo
-/**
- * A `RouteInfo` is an object that contains metadata about a specific route within a `Transition`.
- * It is read-only and internally immutable.
- * It is also not observable, because a `Transition` instance is never changed after creation.
- */
-export default interface RouteInfo {
+declare module '@ember/routing/route-info' {
+  // https://api.emberjs.com/ember/4.0/classes/RouteInfo
   /**
-   * A reference to the childe route's `RouteInfo`.
-   * This can be used to traverse downward to the leafmost `RouteInfo`.
+   * A `RouteInfo` is an object that contains metadata about a specific route within a `Transition`.
+   * It is read-only and internally immutable.
+   * It is also not observable, because a `Transition` instance is never changed after creation.
    */
-  readonly child: RouteInfo | null;
-  /**
-   * The final segment of the fully-qualified name of the route, like "index".
-   */
-  readonly localName: string;
-  /**
-   * The dot-separated, fully-qualified name of the route, like "people.index".
-   */
-  readonly name: string;
-  /**
-   * The ordered list of the names of the params required for this route.
-   * It will contain the same strings as `Object.keys(params)`, but here the order is significant.
-   * This allows users to correctly pass params into routes programmatically.
-   */
-  readonly paramNames: string[];
-  /**
-   * The values of the route's parameters.
-   * These are the same params that are received as arguments to the route's `model` hook.
-   * Contains only the parameters valid for this route, if any (params for parent or child routes are not merged).
-   */
-  readonly params: { [key: string]: string | undefined };
-  /**
-   * A reference to the parent route's `RouteInfo`.
-   * This can be used to traverse upward to the topmost `RouteInfo`.
-   */
-  readonly parent: RouteInfo | null;
-  /**
-   * The values of any query params on this route.
-   */
-  readonly queryParams: { [key: string]: string | undefined };
-  /**
-   * Will contain the result `Route#buildRouteInfoMetadata`
-   * for the corresponding Route.
-   */
-  readonly metadata: unknown;
-  /**
-   * Allows you to traverse through the linked list of `RouteInfo`s from the topmost to leafmost.
-   * Returns the first `RouteInfo` in the linked list for which the callback returns true.
-   *
-   * @param callback the callback to execute.
-   */
-  find(callback: (item: RouteInfo) => boolean): RouteInfo | undefined;
-}
+  export default interface RouteInfo {
+    /**
+     * A reference to the childe route's `RouteInfo`.
+     * This can be used to traverse downward to the leafmost `RouteInfo`.
+     */
+    readonly child: RouteInfo | null;
+    /**
+     * The final segment of the fully-qualified name of the route, like "index".
+     */
+    readonly localName: string;
+    /**
+     * The dot-separated, fully-qualified name of the route, like "people.index".
+     */
+    readonly name: string;
+    /**
+     * The ordered list of the names of the params required for this route.
+     * It will contain the same strings as `Object.keys(params)`, but here the order is significant.
+     * This allows users to correctly pass params into routes programmatically.
+     */
+    readonly paramNames: string[];
+    /**
+     * The values of the route's parameters.
+     * These are the same params that are received as arguments to the route's `model` hook.
+     * Contains only the parameters valid for this route, if any (params for parent or child routes are not merged).
+     */
+    readonly params: { [key: string]: string | undefined };
+    /**
+     * A reference to the parent route's `RouteInfo`.
+     * This can be used to traverse upward to the topmost `RouteInfo`.
+     */
+    readonly parent: RouteInfo | null;
+    /**
+     * The values of any query params on this route.
+     */
+    readonly queryParams: { [key: string]: string | undefined };
+    /**
+     * Will contain the result `Route#buildRouteInfoMetadata`
+     * for the corresponding Route.
+     */
+    readonly metadata: unknown;
+    /**
+     * Allows you to traverse through the linked list of `RouteInfo`s from the topmost to leafmost.
+     * Returns the first `RouteInfo` in the linked list for which the callback returns true.
+     *
+     * @param callback the callback to execute.
+     */
+    find(callback: (item: RouteInfo) => boolean): RouteInfo | undefined;
+  }
 
-// https://api.emberjs.com/ember/4.0/classes/RouteInfoWithAttributes
-/**
- * A `RouteInfoWithAttributes` is an object that contains
- * metadata, including the resolved value from the routes
- * `model` hook. Like `RouteInfo`, a `RouteInfoWithAttributes`
- * represents a specific route within a Transition.
- * It is read-only and internally immutable. It is also not
- * observable, because a Transition instance is never
- * changed after creation.
- */
-export interface RouteInfoWithAttributes extends RouteInfo {
+  // https://api.emberjs.com/ember/4.0/classes/RouteInfoWithAttributes
   /**
-   * This is the resolved return value from the
-   * route's model hook.
+   * A `RouteInfoWithAttributes` is an object that contains
+   * metadata, including the resolved value from the routes
+   * `model` hook. Like `RouteInfo`, a `RouteInfoWithAttributes`
+   * represents a specific route within a Transition.
+   * It is read-only and internally immutable. It is also not
+   * observable, because a Transition instance is never
+   * changed after creation.
    */
-  readonly attributes: unknown;
+  export interface RouteInfoWithAttributes extends RouteInfo {
+    /**
+     * This is the resolved return value from the
+     * route's model hook.
+     */
+    readonly attributes: unknown;
+  }
 }
diff --git a/types/preview/@ember/routing/route.d.ts b/types/preview/@ember/routing/route.d.ts
index 7735a954299..93ff84ea54e 100644
--- a/types/preview/@ember/routing/route.d.ts
+++ b/types/preview/@ember/routing/route.d.ts
@@ -1,532 +1,534 @@
-import EmberObject from '@ember/object';
-import ActionHandler from '@ember/object/-private/action-handler';
-import Transition from '@ember/routing/transition';
-import Evented from '@ember/object/evented';
-import { RenderOptions, RouteQueryParam } from '@ember/routing/types';
-import Controller from '@ember/controller';
+declare module '@ember/routing/route' {
+  import EmberObject from '@ember/object';
+  import ActionHandler from '@ember/object/-private/action-handler';
+  import Transition from '@ember/routing/transition';
+  import Evented from '@ember/object/evented';
+  import { RouteQueryParam } from '@ember/routing/types';
+  import Controller from '@ember/controller';
 
-// tslint:disable-next-line:strict-export-declare-modifiers
-type RouteModel = object | string | number;
+  // tslint:disable-next-line:strict-export-declare-modifiers
+  type RouteModel = object | string | number;
 
-/**
- * The `Ember.Route` class is used to define individual routes. Refer to
- * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
- */
-export default class Route<
-  Model = unknown,
-  Params extends object = object
-> extends EmberObject.extend(ActionHandler, Evented) {
-  // methods
   /**
-   * This hook is called after this route's model has resolved. It follows
-   * identical async/promise semantics to `beforeModel` but is provided the
-   * route's resolved model in addition to the `transition`, and is therefore
-   * suited to performing logic that can only take place after the model has
-   * already resolved.
-   *
-   * @returns if the value returned from this hook is a promise, the
-   *   transition will pause until the transition resolves. Otherwise,
-   *   non-promise return values are not utilized in any way.
+   * The `Ember.Route` class is used to define individual routes. Refer to
+   * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
    */
-  afterModel(resolvedModel: Model, transition: Transition): Promise<unknown> | void;
+  export default class Route<
+    Model = unknown,
+    Params extends object = object
+  > extends EmberObject.extend(ActionHandler, Evented) {
+    // methods
+    /**
+     * This hook is called after this route's model has resolved. It follows
+     * identical async/promise semantics to `beforeModel` but is provided the
+     * route's resolved model in addition to the `transition`, and is therefore
+     * suited to performing logic that can only take place after the model has
+     * already resolved.
+     *
+     * @returns if the value returned from this hook is a promise, the
+     *   transition will pause until the transition resolves. Otherwise,
+     *   non-promise return values are not utilized in any way.
+     */
+    afterModel(resolvedModel: Model, transition: Transition): Promise<unknown> | void;
 
-  /**
-   * This hook is the first of the route entry validation hooks called when an
-   * attempt is made to transition into a route or one of its children. It is
-   * called before `model` and `afterModel`, and is appropriate for cases
-   * when:
-   *
-   * 1. A decision can be made to redirect elsewhere without needing to
-   *     resolve the model first.
-   * 2. Any async operations need to occur first before the model is attempted
-   *     to be resolved.
-   *
-   * This hook is provided the current `transition` attempt as a parameter,
-   * which can be used to `.abort()` the transition, save it for a later
-   * `.retry()`, or retrieve values set on it from a previous hook. You can
-   * also just call `this.transitionTo` to another route to implicitly abort
-   * the `transition`. You can return a promise from this hook to pause the
-   * transition until the promise resolves (or rejects). This could be useful,
-   * for instance, for retrieving async code from the server that is required
-   * to enter a route.
-   *
-   * @returns if the value returned from this hook is a promise, the
-   *   transition will pause until the transition resolves. Otherwise,
-   *   non-promise return values are not utilized in any way.
-   */
-  beforeModel(transition: Transition): Promise<unknown> | void;
+    /**
+     * This hook is the first of the route entry validation hooks called when an
+     * attempt is made to transition into a route or one of its children. It is
+     * called before `model` and `afterModel`, and is appropriate for cases
+     * when:
+     *
+     * 1. A decision can be made to redirect elsewhere without needing to
+     *     resolve the model first.
+     * 2. Any async operations need to occur first before the model is attempted
+     *     to be resolved.
+     *
+     * This hook is provided the current `transition` attempt as a parameter,
+     * which can be used to `.abort()` the transition, save it for a later
+     * `.retry()`, or retrieve values set on it from a previous hook. You can
+     * also just call `this.transitionTo` to another route to implicitly abort
+     * the `transition`. You can return a promise from this hook to pause the
+     * transition until the promise resolves (or rejects). This could be useful,
+     * for instance, for retrieving async code from the server that is required
+     * to enter a route.
+     *
+     * @returns if the value returned from this hook is a promise, the
+     *   transition will pause until the transition resolves. Otherwise,
+     *   non-promise return values are not utilized in any way.
+     */
+    beforeModel(transition: Transition): Promise<unknown> | void;
 
-  /**
-   * Returns the controller of the current route, or a parent (or any
-   * ancestor) route in a route hierarchy.
-   *
-   * The controller instance must already have been created, either through
-   * entering the associated route or using `generateController`.
-   *
-   * @param name the name of the route or controller
-   */
-  controllerFor(name: string): Controller;
+    /**
+     * Returns the controller of the current route, or a parent (or any
+     * ancestor) route in a route hierarchy.
+     *
+     * The controller instance must already have been created, either through
+     * entering the associated route or using `generateController`.
+     *
+     * @param name the name of the route or controller
+     */
+    controllerFor(name: string): Controller;
 
-  /**
-   * A hook you can implement to convert the URL into the model for
-   * this route.
-   */
-  model(params: Params, transition: Transition): Model | PromiseLike<Model>;
+    /**
+     * A hook you can implement to convert the URL into the model for
+     * this route.
+     */
+    model(params: Params, transition: Transition): Model | PromiseLike<Model>;
 
-  /**
-   * Returns the model of a parent (or any ancestor) route
-   * in a route hierarchy.  During a transition, all routes
-   * must resolve a model object, and if a route
-   * needs access to a parent route's model in order to
-   * resolve a model (or just reuse the model from a parent),
-   * it can call `this.modelFor(theNameOfParentRoute)` to
-   * retrieve it.
-   */
-  modelFor(name: string): unknown;
+    /**
+     * Returns the model of a parent (or any ancestor) route
+     * in a route hierarchy.  During a transition, all routes
+     * must resolve a model object, and if a route
+     * needs access to a parent route's model in order to
+     * resolve a model (or just reuse the model from a parent),
+     * it can call `this.modelFor(theNameOfParentRoute)` to
+     * retrieve it.
+     */
+    modelFor(name: string): unknown;
 
-  /**
-   * Retrieves parameters, for current route using the state.params
-   * variable and getQueryParamsFor, using the supplied routeName.
-   */
-  paramsFor(name: string): object;
+    /**
+     * Retrieves parameters, for current route using the state.params
+     * variable and getQueryParamsFor, using the supplied routeName.
+     */
+    paramsFor(name: string): object;
 
-  /**
-   * A hook you can implement to optionally redirect to another route.
-   *
-   * If you call `this.transitionTo` from inside of this hook, this route
-   * will not be entered in favor of the other hook.
-   *
-   * `redirect` and `afterModel` behave very similarly and are
-   * called almost at the same time, but they have an important
-   * distinction in the case that, from one of these hooks, a
-   * redirect into a child route of this route occurs: redirects
-   * from `afterModel` essentially invalidate the current attempt
-   * to enter this route, and will result in this route's `beforeModel`,
-   * `model`, and `afterModel` hooks being fired again within
-   * the new, redirecting transition. Redirects that occur within
-   * the `redirect` hook, on the other hand, will _not_ cause
-   * these hooks to be fired again the second time around; in
-   * other words, by the time the `redirect` hook has been called,
-   * both the resolved model and attempted entry into this route
-   * are considered to be fully validated.
-   */
-  redirect(model: Model, transition: Transition): void;
+    /**
+     * A hook you can implement to optionally redirect to another route.
+     *
+     * If you call `this.transitionTo` from inside of this hook, this route
+     * will not be entered in favor of the other hook.
+     *
+     * `redirect` and `afterModel` behave very similarly and are
+     * called almost at the same time, but they have an important
+     * distinction in the case that, from one of these hooks, a
+     * redirect into a child route of this route occurs: redirects
+     * from `afterModel` essentially invalidate the current attempt
+     * to enter this route, and will result in this route's `beforeModel`,
+     * `model`, and `afterModel` hooks being fired again within
+     * the new, redirecting transition. Redirects that occur within
+     * the `redirect` hook, on the other hand, will _not_ cause
+     * these hooks to be fired again the second time around; in
+     * other words, by the time the `redirect` hook has been called,
+     * both the resolved model and attempted entry into this route
+     * are considered to be fully validated.
+     */
+    redirect(model: Model, transition: Transition): void;
 
-  /**
-   * Refresh the model on this route and any child routes, firing the
-   * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
-   * to how routes are entered when transitioning in from other route.
-   * The current route params (e.g. `article_id`) will be passed in
-   * to the respective model hooks, and if a different model is returned,
-   * `setupController` and associated route hooks will re-fire as well.
-   * An example usage of this method is re-querying the server for the
-   * latest information using the same parameters as when the route
-   * was first entered.
-   * Note that this will cause `model` hooks to fire even on routes
-   * that were provided a model object when the route was initially
-   * entered.
-   */
-  refresh(): Transition;
+    /**
+     * Refresh the model on this route and any child routes, firing the
+     * `beforeModel`, `model`, and `afterModel` hooks in a similar fashion
+     * to how routes are entered when transitioning in from other route.
+     * The current route params (e.g. `article_id`) will be passed in
+     * to the respective model hooks, and if a different model is returned,
+     * `setupController` and associated route hooks will re-fire as well.
+     * An example usage of this method is re-querying the server for the
+     * latest information using the same parameters as when the route
+     * was first entered.
+     * Note that this will cause `model` hooks to fire even on routes
+     * that were provided a model object when the route was initially
+     * entered.
+     */
+    refresh(): Transition;
 
-  /**
-   * Transition into another route while replacing the current URL, if possible.
-   * This will replace the current history entry instead of adding a new one.
-   * Beside that, it is identical to `transitionTo` in all other respects. See
-   * 'transitionTo' for additional information regarding multiple models.
-   *
-   * @param name    the name of the route or a URL
-   * @param models  the model(s) or identifier(s) to be used while
-   *                transitioning to the route.
-   * @param options optional hash with a queryParams property
-   *                containing a mapping of query parameters. May be supplied
-   *                as the only parameter to trigger a query-parameter-only
-   *                transition.
-   * @returns       the Transition object associated with this attempted
-   *                transition
-   * @deprecated    until 5.0. Inject the router service and use its methods.
-   */
-  replaceWith(name: string, ...args: unknown[]): Transition;
+    /**
+     * Transition into another route while replacing the current URL, if possible.
+     * This will replace the current history entry instead of adding a new one.
+     * Beside that, it is identical to `transitionTo` in all other respects. See
+     * 'transitionTo' for additional information regarding multiple models.
+     *
+     * @param name    the name of the route or a URL
+     * @param models  the model(s) or identifier(s) to be used while
+     *                transitioning to the route.
+     * @param options optional hash with a queryParams property
+     *                containing a mapping of query parameters. May be supplied
+     *                as the only parameter to trigger a query-parameter-only
+     *                transition.
+     * @returns       the Transition object associated with this attempted
+     *                transition
+     * @deprecated    until 5.0. Inject the router service and use its methods.
+     */
+    replaceWith(name: string, ...args: unknown[]): Transition;
 
-  /**
-   * A hook you can use to reset controller values either when the model
-   * changes or the route is exiting.
-   */
-  resetController(controller: Controller, isExiting: boolean, transition: Transition): void;
+    /**
+     * A hook you can use to reset controller values either when the model
+     * changes or the route is exiting.
+     */
+    resetController(controller: Controller, isExiting: boolean, transition: Transition): void;
 
-  /**
-   * Sends an action to the router, which will delegate it to the currently active
-   * route hierarchy per the bubbling rules explained under actions.
-   */
-  send(name: string, ...args: unknown[]): void;
+    /**
+     * Sends an action to the router, which will delegate it to the currently active
+     * route hierarchy per the bubbling rules explained under actions.
+     */
+    send(name: string, ...args: unknown[]): void;
 
-  /**
-   * A hook you can implement to convert the route's model into parameters
-   * for the URL.
-   *
-   * The default `serialize` method will insert the model's `id` into the
-   * route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
-   * If the route has multiple dynamic segments or does not contain '_id', `serialize`
-   * will return `Ember.getProperties(model, params)`
-   * This method is called when `transitionTo` is called with a context
-   * in order to populate the URL.
-   */
-  serialize(model: Model, params: string[]): string | object;
+    /**
+     * A hook you can implement to convert the route's model into parameters
+     * for the URL.
+     *
+     * The default `serialize` method will insert the model's `id` into the
+     * route's dynamic segment (in this case, `:post_id`) if the segment contains '_id'.
+     * If the route has multiple dynamic segments or does not contain '_id', `serialize`
+     * will return `Ember.getProperties(model, params)`
+     * This method is called when `transitionTo` is called with a context
+     * in order to populate the URL.
+     */
+    serialize(model: Model, params: string[]): string | object;
 
-  /**
-   * A hook you can use to setup the controller for the current route.
-   * This method is called with the controller for the current route and the
-   * model supplied by the `model` hook.
-   * By default, the `setupController` hook sets the `model` property of
-   * the controller to the `model`.
-   * If you implement the `setupController` hook in your Route, it will
-   * prevent this default behavior. If you want to preserve that behavior
-   * when implementing your `setupController` function, make sure to call
-   * `_super`
-   */
-  setupController(controller: Controller, model: Model, transition: Transition): void;
+    /**
+     * A hook you can use to setup the controller for the current route.
+     * This method is called with the controller for the current route and the
+     * model supplied by the `model` hook.
+     * By default, the `setupController` hook sets the `model` property of
+     * the controller to the `model`.
+     * If you implement the `setupController` hook in your Route, it will
+     * prevent this default behavior. If you want to preserve that behavior
+     * when implementing your `setupController` function, make sure to call
+     * `_super`
+     */
+    setupController(controller: Controller, model: Model, transition: Transition): void;
 
-  /**
-   * Transition the application into another route. The route may
-   * be either a single route or route path:
-   *
-   * ```javascript
-   * this.transitionTo('blogPosts');
-   * this.transitionTo('blogPosts.recentEntries');
-   * ```
-   *
-   * Optionally supply a model for the route in question. The model
-   * will be serialized into the URL using the `serialize` hook of
-   * the route:
-   *
-   * ```javascript
-   * this.transitionTo('blogPost', aPost);
-   * ```
-   *
-   * If a literal is passed (such as a number or a string), it will
-   * be treated as an identifier instead. In this case, the `model`
-   * hook of the route will be triggered:
-   *
-   * ```javascript
-   * this.transitionTo('blogPost', 1);
-   * ```
-   *
-   * Multiple models will be applied last to first recursively up the
-   * route tree.
-   *
-   * ```app/routes.js
-   * // ...
-   *
-   * Router.map(function() {
-   *   this.route('blogPost', { path:':blogPostId' }, function() {
-   *     this.route('blogComment', { path: ':blogCommentId' });
-   *   });
-   * });
-   *
-   * export default Router;
-   * ```
-   *
-   * ```javascript
-   * this.transitionTo('blogComment', aPost, aComment);
-   * this.transitionTo('blogComment', 1, 13);
-   * ```
-   *
-   * It is also possible to pass a URL (a string that starts with a
-   * `/`).
-   *
-   * ```javascript
-   * this.transitionTo('/');
-   * this.transitionTo('/blog/post/1/comment/13');
-   * this.transitionTo('/blog/posts?sort=title');
-   * ```
-   *
-   * An options hash with a `queryParams` property may be provided as
-   * the final argument to add query parameters to the destination URL.
-   *
-   * ```javascript
-   * this.transitionTo('blogPost', 1, {
-   *   queryParams: { showComments: 'true' }
-   * });
-   *
-   * // if you just want to transition the query parameters without changing the route
-   * this.transitionTo({ queryParams: { sort: 'date' } });
-   * ```
-   *
-   * See also [replaceWith](#method_replaceWith).
-   *
-   * Simple Transition Example
-   *
-   * ```app/routes.js
-   * // ...
-   *
-   * Router.map(function() {
-   *   this.route('index');
-   *   this.route('secret');
-   *   this.route('fourOhFour', { path: '*:' });
-   * });
-   *
-   * export default Router;
-   * ```
-   *
-   * ```app/routes/index.js
-   * import Route from '@ember/routing/route';
-   * import { action } from '@ember/object';
-   *
-   * export default class IndexRoute extends Route {
-   *   @action
-   *   moveToSecret(context) {
-   *     if (authorized()) {
-   *       this.transitionTo('secret', context);
-   *     } else {
-   *       this.transitionTo('fourOhFour');
-   *     }
-   *   }
-   * }
-   * ```
-   *
-   * Transition to a nested route
-   *
-   * ```app/router.js
-   * // ...
-   *
-   * Router.map(function() {
-   *   this.route('articles', { path: '/articles' }, function() {
-   *     this.route('new');
-   *   });
-   * });
-   *
-   * export default Router;
-   * ```
-   *
-   * ```app/routes/index.js
-   * import Route from '@ember/routing/route';
-   * import { action } from '@ember/object';
-   *
-   * export default class IndexRoute extends Route {
-   *   @action
-   *   transitionToNewArticle() {
-   *     this.transitionTo('articles.new');
-   *   }
-   * }
-   * ```
-   *
-   * Multiple Models Example
-   *
-   * ```app/router.js
-   * // ...
-   *
-   * Router.map(function() {
-   *   this.route('index');
-   *
-   *   this.route('breakfast', { path: ':breakfastId' }, function() {
-   *     this.route('cereal', { path: ':cerealId' });
-   *   });
-   * });
-   *
-   * export default Router;
-   * ```
-   *
-   * ```app/routes/index.js
-   * import Route from '@ember/routing/route';
-   * import { action } from '@ember/object';
-   *
-   * export default class IndexRoute extends Route {
-   *   @action
-   *   moveToChocolateCereal() {
-   *     let cereal = { cerealId: 'ChocolateYumminess' };
-   *     let breakfast = { breakfastId: 'CerealAndMilk' };
-   *
-   *     this.transitionTo('breakfast.cereal', breakfast, cereal);
-   *   }
-   * }
-   * ```
-   *
-   * Nested Route with Query String Example
-   *
-   * ```app/routes.js
-   * // ...
-   *
-   * Router.map(function() {
-   *   this.route('fruits', function() {
-   *     this.route('apples');
-   *   });
-   * });
-   *
-   * export default Router;
-   * ```
-   *
-   * ```app/routes/index.js
-   * import Route from '@ember/routing/route';
-   *
-   * export default class IndexRoute extends Route {
-   *   @action
-   *   transitionToApples() {
-   *     this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
-   *   }
-   * }
-   * ```
-   *
-   * @param name    the name of the route or a URL.
-   * @param models  the model(s) or identifier(s) to be used while
-   *                transitioning to the route.
-   * @param options optional hash with a queryParams property
-   *                containing a mapping of query parameters. May be supplied
-   *                as the only parameter to trigger a query-parameter-only
-   *                transition.
-   * @returns       the Transition object associated with this attempted
-   *                transition
-   * @deprecated    until 5.0. Inject the router service and use its methods.
-   */
-  transitionTo(name: string, options?: { queryParams: object }): Transition;
-  transitionTo(name: string, modelsA: RouteModel, options?: { queryParams: object }): Transition;
-  transitionTo(
-    name: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(
-    name: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(
-    name: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    modelsD: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(options: { queryParams: object }): Transition;
+    /**
+     * Transition the application into another route. The route may
+     * be either a single route or route path:
+     *
+     * ```javascript
+     * this.transitionTo('blogPosts');
+     * this.transitionTo('blogPosts.recentEntries');
+     * ```
+     *
+     * Optionally supply a model for the route in question. The model
+     * will be serialized into the URL using the `serialize` hook of
+     * the route:
+     *
+     * ```javascript
+     * this.transitionTo('blogPost', aPost);
+     * ```
+     *
+     * If a literal is passed (such as a number or a string), it will
+     * be treated as an identifier instead. In this case, the `model`
+     * hook of the route will be triggered:
+     *
+     * ```javascript
+     * this.transitionTo('blogPost', 1);
+     * ```
+     *
+     * Multiple models will be applied last to first recursively up the
+     * route tree.
+     *
+     * ```app/routes.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('blogPost', { path:':blogPostId' }, function() {
+     *     this.route('blogComment', { path: ':blogCommentId' });
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```javascript
+     * this.transitionTo('blogComment', aPost, aComment);
+     * this.transitionTo('blogComment', 1, 13);
+     * ```
+     *
+     * It is also possible to pass a URL (a string that starts with a
+     * `/`).
+     *
+     * ```javascript
+     * this.transitionTo('/');
+     * this.transitionTo('/blog/post/1/comment/13');
+     * this.transitionTo('/blog/posts?sort=title');
+     * ```
+     *
+     * An options hash with a `queryParams` property may be provided as
+     * the final argument to add query parameters to the destination URL.
+     *
+     * ```javascript
+     * this.transitionTo('blogPost', 1, {
+     *   queryParams: { showComments: 'true' }
+     * });
+     *
+     * // if you just want to transition the query parameters without changing the route
+     * this.transitionTo({ queryParams: { sort: 'date' } });
+     * ```
+     *
+     * See also [replaceWith](#method_replaceWith).
+     *
+     * Simple Transition Example
+     *
+     * ```app/routes.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('index');
+     *   this.route('secret');
+     *   this.route('fourOhFour', { path: '*:' });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     * import { action } from '@ember/object';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   moveToSecret(context) {
+     *     if (authorized()) {
+     *       this.transitionTo('secret', context);
+     *     } else {
+     *       this.transitionTo('fourOhFour');
+     *     }
+     *   }
+     * }
+     * ```
+     *
+     * Transition to a nested route
+     *
+     * ```app/router.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('articles', { path: '/articles' }, function() {
+     *     this.route('new');
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     * import { action } from '@ember/object';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   transitionToNewArticle() {
+     *     this.transitionTo('articles.new');
+     *   }
+     * }
+     * ```
+     *
+     * Multiple Models Example
+     *
+     * ```app/router.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('index');
+     *
+     *   this.route('breakfast', { path: ':breakfastId' }, function() {
+     *     this.route('cereal', { path: ':cerealId' });
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     * import { action } from '@ember/object';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   moveToChocolateCereal() {
+     *     let cereal = { cerealId: 'ChocolateYumminess' };
+     *     let breakfast = { breakfastId: 'CerealAndMilk' };
+     *
+     *     this.transitionTo('breakfast.cereal', breakfast, cereal);
+     *   }
+     * }
+     * ```
+     *
+     * Nested Route with Query String Example
+     *
+     * ```app/routes.js
+     * // ...
+     *
+     * Router.map(function() {
+     *   this.route('fruits', function() {
+     *     this.route('apples');
+     *   });
+     * });
+     *
+     * export default Router;
+     * ```
+     *
+     * ```app/routes/index.js
+     * import Route from '@ember/routing/route';
+     *
+     * export default class IndexRoute extends Route {
+     *   @action
+     *   transitionToApples() {
+     *     this.transitionTo('fruits.apples', { queryParams: { color: 'red' } });
+     *   }
+     * }
+     * ```
+     *
+     * @param name    the name of the route or a URL.
+     * @param models  the model(s) or identifier(s) to be used while
+     *                transitioning to the route.
+     * @param options optional hash with a queryParams property
+     *                containing a mapping of query parameters. May be supplied
+     *                as the only parameter to trigger a query-parameter-only
+     *                transition.
+     * @returns       the Transition object associated with this attempted
+     *                transition
+     * @deprecated    until 5.0. Inject the router service and use its methods.
+     */
+    transitionTo(name: string, options?: { queryParams: object }): Transition;
+    transitionTo(name: string, modelsA: RouteModel, options?: { queryParams: object }): Transition;
+    transitionTo(
+      name: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+      name: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+      name: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      modelsD: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(options: { queryParams: object }): Transition;
 
-  // https://emberjs.com/api/ember/release/classes/Route/methods/intermediateTransitionTo?anchor=intermediateTransitionTo
-  /**
-   * Perform a synchronous transition into another route without attempting to resolve promises,
-   * update the URL, or abort any currently active asynchronous transitions
-   * (i.e. regular transitions caused by transitionTo or URL changes).
-   *
-   * @param name           the name of the route or a URL
-   * @param models         the model(s) or identifier(s) to be used while
-   *                       transitioning to the route.
-   * @returns              the Transition object associated with this attempted transition
-   */
-  intermediateTransitionTo(name: string, ...models: unknown[]): Transition;
+    // https://emberjs.com/api/ember/release/classes/Route/methods/intermediateTransitionTo?anchor=intermediateTransitionTo
+    /**
+     * Perform a synchronous transition into another route without attempting to resolve promises,
+     * update the URL, or abort any currently active asynchronous transitions
+     * (i.e. regular transitions caused by transitionTo or URL changes).
+     *
+     * @param name           the name of the route or a URL
+     * @param models         the model(s) or identifier(s) to be used while
+     *                       transitioning to the route.
+     * @returns              the Transition object associated with this attempted transition
+     */
+    intermediateTransitionTo(name: string, ...models: unknown[]): Transition;
 
-  // properties
-  /**
-   * The controller associated with this route.
-   */
-  controller: Controller;
+    // properties
+    /**
+     * The controller associated with this route.
+     */
+    controller: Controller;
 
-  /**
-   * The name of the controller to associate with this route.
-   * By default, Ember will lookup a route's controller that matches the name
-   * of the route (i.e. `App.PostController` for `App.PostRoute`). However,
-   * if you would like to define a specific controller to use, you can do so
-   * using this property.
-   * This is useful in many ways, as the controller specified will be:
-   * * p assed to the `setupController` method.
-   * * used as the controller for the view being rendered by the route.
-   * * returned from a call to `controllerFor` for the route.
-   */
-  controllerName: string;
+    /**
+     * The name of the controller to associate with this route.
+     * By default, Ember will lookup a route's controller that matches the name
+     * of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+     * if you would like to define a specific controller to use, you can do so
+     * using this property.
+     * This is useful in many ways, as the controller specified will be:
+     * * p assed to the `setupController` method.
+     * * used as the controller for the view being rendered by the route.
+     * * returned from a call to `controllerFor` for the route.
+     */
+    controllerName: string;
 
-  /**
-   * The name of the route, dot-delimited, including the engine prefix if applicable.
-   */
-  fullRouteName: string;
+    /**
+     * The name of the route, dot-delimited, including the engine prefix if applicable.
+     */
+    fullRouteName: string;
 
-  /**
-   * Configuration hash for this route's queryParams.
-   */
-  queryParams: { [key: string]: RouteQueryParam };
+    /**
+     * Configuration hash for this route's queryParams.
+     */
+    queryParams: { [key: string]: RouteQueryParam };
 
-  /**
-   * The name of the route, dot-delimited
-   */
-  routeName: string;
+    /**
+     * The name of the route, dot-delimited
+     */
+    routeName: string;
 
-  /**
-   * The name of the template to use by default when rendering this routes
-   * template.
-   * This is similar with `viewName`, but is useful when you just want a custom
-   * template without a view.
-   */
-  templateName: string;
+    /**
+     * The name of the template to use by default when rendering this routes
+     * template.
+     * This is similar with `viewName`, but is useful when you just want a custom
+     * template without a view.
+     */
+    templateName: string;
 
-  // events
-  /**
-   * This hook is executed when the router enters the route. It is not executed
-   * when the model for the route changes.
-   */
-  activate(transition: Transition): void;
+    // events
+    /**
+     * This hook is executed when the router enters the route. It is not executed
+     * when the model for the route changes.
+     */
+    activate(transition: Transition): void;
 
-  /**
-   * This hook is executed when the router completely exits this route. It is
-   * not executed when the model for the route changes.
-   */
-  deactivate(transition: Transition): void;
+    /**
+     * This hook is executed when the router completely exits this route. It is
+     * not executed when the model for the route changes.
+     */
+    deactivate(transition: Transition): void;
 
-  /**
-   * The didTransition action is fired after a transition has successfully been
-   * completed. This occurs after the normal model hooks (beforeModel, model,
-   * afterModel, setupController) have resolved. The didTransition action has
-   * no arguments, however, it can be useful for tracking page views or resetting
-   * state on the controller.
-   */
-  didTransition(): void;
+    /**
+     * The didTransition action is fired after a transition has successfully been
+     * completed. This occurs after the normal model hooks (beforeModel, model,
+     * afterModel, setupController) have resolved. The didTransition action has
+     * no arguments, however, it can be useful for tracking page views or resetting
+     * state on the controller.
+     */
+    didTransition(): void;
 
-  /**
-   * When attempting to transition into a route, any of the hooks may return a promise
-   * that rejects, at which point an error action will be fired on the partially-entered
-   * routes, allowing for per-route error handling logic, or shared error handling logic
-   * defined on a parent route.
-   */
-  error(error: unknown, transition: Transition): void;
+    /**
+     * When attempting to transition into a route, any of the hooks may return a promise
+     * that rejects, at which point an error action will be fired on the partially-entered
+     * routes, allowing for per-route error handling logic, or shared error handling logic
+     * defined on a parent route.
+     */
+    error(error: unknown, transition: Transition): void;
 
-  /**
-   * The loading action is fired on the route when a route's model hook returns a
-   * promise that is not already resolved. The current Transition object is the first
-   * parameter and the route that triggered the loading event is the second parameter.
-   */
-  loading(transition: Transition, route: Route): void;
+    /**
+     * The loading action is fired on the route when a route's model hook returns a
+     * promise that is not already resolved. The current Transition object is the first
+     * parameter and the route that triggered the loading event is the second parameter.
+     */
+    loading(transition: Transition, route: Route): void;
 
-  /**
-   * The willTransition action is fired at the beginning of any attempted transition
-   * with a Transition object as the sole argument. This action can be used for aborting,
-   * redirecting, or decorating the transition from the currently active routes.
-   */
-  willTransition(transition: Transition): void;
+    /**
+     * The willTransition action is fired at the beginning of any attempted transition
+     * with a Transition object as the sole argument. This action can be used for aborting,
+     * redirecting, or decorating the transition from the currently active routes.
+     */
+    willTransition(transition: Transition): void;
 
-  /**
-   * Allows you to produce custom metadata for the route.
-   * The return value of this method will be attached to
-   * its corresponding RouteInfoWithAttributes object.
-   * Example
-   * ```app/routes/posts/index.js
-   * import Route from '@ember/routing/route';
-   * export default class PostsIndexRoute extends Route {
-   *   buildRouteInfoMetadata() {
-   *     return { title: 'Posts Page' }
-   *   }
-   * }
-   * ```
-   * ```app/routes/application.js
-   * import Route from '@ember/routing/route';
-   * import { inject as service } from '@ember/service';
-   * export default class ApplicationRoute extends Route {
-   *   @service router
-   *   constructor() {
-   *     super(...arguments);
-   *     this.router.on('routeDidChange', transition => {
-   *       document.title = transition.to.metadata.title;
-   *       // would update document's title to "Posts Page"
-   *     });
-   *   }
-   * }
-   * ```
-   */
-  buildRouteInfoMetadata(): unknown;
+    /**
+     * Allows you to produce custom metadata for the route.
+     * The return value of this method will be attached to
+     * its corresponding RouteInfoWithAttributes object.
+     * Example
+     * ```app/routes/posts/index.js
+     * import Route from '@ember/routing/route';
+     * export default class PostsIndexRoute extends Route {
+     *   buildRouteInfoMetadata() {
+     *     return { title: 'Posts Page' }
+     *   }
+     * }
+     * ```
+     * ```app/routes/application.js
+     * import Route from '@ember/routing/route';
+     * import { inject as service } from '@ember/service';
+     * export default class ApplicationRoute extends Route {
+     *   @service router
+     *   constructor() {
+     *     super(...arguments);
+     *     this.router.on('routeDidChange', transition => {
+     *       document.title = transition.to.metadata.title;
+     *       // would update document's title to "Posts Page"
+     *     });
+     *   }
+     * }
+     * ```
+     */
+    buildRouteInfoMetadata(): unknown;
+  }
 }
diff --git a/types/preview/@ember/routing/router-service.d.ts b/types/preview/@ember/routing/router-service.d.ts
index 2d8ff069df9..1aceaf2a0b4 100644
--- a/types/preview/@ember/routing/router-service.d.ts
+++ b/types/preview/@ember/routing/router-service.d.ts
@@ -1,350 +1,352 @@
-import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
-import Transition from '@ember/routing/transition';
-import Service from '@ember/service';
+declare module '@ember/routing/router-service' {
+  import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
+  import Transition from '@ember/routing/transition';
+  import Service from '@ember/service';
 
-// tslint:disable-next-line:strict-export-declare-modifiers
-type RouteModel = object | string | number;
+  // tslint:disable-next-line:strict-export-declare-modifiers
+  type RouteModel = object | string | number;
 
-// https://emberjs.com/api/ember/release/classes/RouterService
-/**
- * The Router service is the public API that provides component/view layer access to the router.
- */
-export default class RouterService extends Service {
-  //
+  // https://emberjs.com/api/ember/release/classes/RouterService
   /**
-   * A `RouteInfo` that represents the current leaf route.
-   * It is guaranteed to change whenever a route transition happens
-   * (even when that transition only changes parameters and doesn't change the active route)
+   * The Router service is the public API that provides component/view layer access to the router.
    */
-  readonly currentRoute: RouteInfo;
-  /**
-   * Name of the current route.
-   * This property represent the logical name of the route,
-   * which is comma separated.
-   * For the following router:
-   * ```app/router.js
-   * Router.map(function() {
-   * this.route('about');
-   * this.route('blog', function () {
-   *     this.route('post', { path: ':post_id' });
-   * });
-   * });
-   * ```
-   * It will return:
-   * * `index` when you visit `/`
-   * * `about` when you visit `/about`
-   * * `blog.index` when you visit `/blog`
-   * * `blog.post` when you visit `/blog/some-post-id`
-   */
-  readonly currentRouteName: string;
-  //
-  /**
-   * Current URL for the application.
-   * This property represent the URL path for this route.
-   * For the following router:
-   * ```app/router.js
-   * Router.map(function() {
-   * this.route('about');
-   * this.route('blog', function () {
-   *     this.route('post', { path: ':post_id' });
-   * });
-   * });
-   * ```
-   * It will return:
-   * * `/` when you visit `/`
-   * * `/about` when you visit `/about`
-   * * `/blog` when you visit `/blog`
-   * * `/blog/some-post-id` when you visit `/blog/some-post-id`
-   */
-  readonly currentURL: string;
+  export default class RouterService extends Service {
+    //
+    /**
+     * A `RouteInfo` that represents the current leaf route.
+     * It is guaranteed to change whenever a route transition happens
+     * (even when that transition only changes parameters and doesn't change the active route)
+     */
+    readonly currentRoute: RouteInfo;
+    /**
+     * Name of the current route.
+     * This property represent the logical name of the route,
+     * which is comma separated.
+     * For the following router:
+     * ```app/router.js
+     * Router.map(function() {
+     * this.route('about');
+     * this.route('blog', function () {
+     *     this.route('post', { path: ':post_id' });
+     * });
+     * });
+     * ```
+     * It will return:
+     * * `index` when you visit `/`
+     * * `about` when you visit `/about`
+     * * `blog.index` when you visit `/blog`
+     * * `blog.post` when you visit `/blog/some-post-id`
+     */
+    readonly currentRouteName: string;
+    //
+    /**
+     * Current URL for the application.
+     * This property represent the URL path for this route.
+     * For the following router:
+     * ```app/router.js
+     * Router.map(function() {
+     * this.route('about');
+     * this.route('blog', function () {
+     *     this.route('post', { path: ':post_id' });
+     * });
+     * });
+     * ```
+     * It will return:
+     * * `/` when you visit `/`
+     * * `/about` when you visit `/about`
+     * * `/blog` when you visit `/blog`
+     * * `/blog/some-post-id` when you visit `/blog/some-post-id`
+     */
+    readonly currentURL: string;
 
-  /**
-   * The `rootURL` property represents the URL of the root of
-   * the application, '/' by default.
-   * This prefix is assumed on all routes defined on this app.
-   * If you change the `rootURL` in your environment configuration
-   * like so:
-   * ```config/environment.js
-   * 'use strict';
-   * module.exports = function(environment) {
-   *   let ENV = {
-   *     modulePrefix: 'router-service',
-   *     environment,
-   *     rootURL: '/my-root',
-   *   …
-   *   }
-   * ]
-   * ```
-   * This property will return `/my-root`.
-   */
-  readonly rootURL: string;
+    /**
+     * The `rootURL` property represents the URL of the root of
+     * the application, '/' by default.
+     * This prefix is assumed on all routes defined on this app.
+     * If you change the `rootURL` in your environment configuration
+     * like so:
+     * ```config/environment.js
+     * 'use strict';
+     * module.exports = function(environment) {
+     *   let ENV = {
+     *     modulePrefix: 'router-service',
+     *     environment,
+     *     rootURL: '/my-root',
+     *   …
+     *   }
+     * ]
+     * ```
+     * This property will return `/my-root`.
+     */
+    readonly rootURL: string;
 
-  /**
-   * Determines whether a route is active.
-   *
-   * @param routeName the name of the route
-   * @param models    the model(s) or identifier(s) to be used while
-   *                  transitioning to the route
-   * @param options   optional hash with a queryParams property containing a
-   *                  mapping of query parameters
-   */
-  isActive(routeName: string, options?: { queryParams: object }): boolean;
-  isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
-  isActive(
-    routeName: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    options?: { queryParams: object }
-  ): boolean;
-  isActive(
-    routeName: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    options?: { queryParams: object }
-  ): boolean;
-  isActive(
-    routeName: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    modelsD: RouteModel,
-    options?: { queryParams: object }
-  ): boolean;
+    /**
+     * Determines whether a route is active.
+     *
+     * @param routeName the name of the route
+     * @param models    the model(s) or identifier(s) to be used while
+     *                  transitioning to the route
+     * @param options   optional hash with a queryParams property containing a
+     *                  mapping of query parameters
+     */
+    isActive(routeName: string, options?: { queryParams: object }): boolean;
+    isActive(routeName: string, models: RouteModel, options?: { queryParams: object }): boolean;
+    isActive(
+      routeName: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      options?: { queryParams: object }
+    ): boolean;
+    isActive(
+      routeName: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      options?: { queryParams: object }
+    ): boolean;
+    isActive(
+      routeName: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      modelsD: RouteModel,
+      options?: { queryParams: object }
+    ): boolean;
 
-  // https://emberjs.com/api/ember/4.0/classes/RouterService/methods/isActive?anchor=replaceWith
-  /**
-   * Transition into another route while replacing the current URL, if
-   * possible. The route may be either a single route or route path.
-   *
-   * @param routeNameOrUrl the name of the route or a URL
-   * @param models         the model(s) or identifier(s) to be used while
-   *                       transitioning to the route.
-   * @param options        optional hash with a queryParams property
-   *                       containing a mapping of query parameters
-   * @returns              the Transition object associated with this attempted transition
-   */
-  replaceWith(routeNameOrUrl: string, options?: { queryParams: object }): Transition;
-  replaceWith(
-    routeNameOrUrl: string,
-    models: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  replaceWith(
-    routeNameOrUrl: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  replaceWith(
-    routeNameOrUrl: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  replaceWith(
-    routeNameOrUrl: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    modelsD: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
+    // https://emberjs.com/api/ember/4.0/classes/RouterService/methods/isActive?anchor=replaceWith
+    /**
+     * Transition into another route while replacing the current URL, if
+     * possible. The route may be either a single route or route path.
+     *
+     * @param routeNameOrUrl the name of the route or a URL
+     * @param models         the model(s) or identifier(s) to be used while
+     *                       transitioning to the route.
+     * @param options        optional hash with a queryParams property
+     *                       containing a mapping of query parameters
+     * @returns              the Transition object associated with this attempted transition
+     */
+    replaceWith(routeNameOrUrl: string, options?: { queryParams: object }): Transition;
+    replaceWith(
+      routeNameOrUrl: string,
+      models: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+      routeNameOrUrl: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+      routeNameOrUrl: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    replaceWith(
+      routeNameOrUrl: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      modelsD: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
 
-  // https://emberjs.com/api/ember/release/classes/RouterService/methods/isActive?anchor=transitionTo
-  /**
-   * Transition the application into another route. The route may
-   * be either a single route or route path:
-   *
-   * See [transitionTo](https://api.emberjs.com/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
-   *
-   * Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
-   * This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
-   * See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
-   *
-   * In the following example we use the Router service to navigate to a route with a
-   * specific model from a Component.
-   *
-   * ```app/components/example.js
-   * import Component from '@glimmer/component';
-   * import { action } from '@ember/object';
-   * import { inject as service } from '@ember/service';
-   *
-   * export default class extends Component {
-   *   @service router;
-   *
-   *   @action
-   *   goToComments(post) {
-   *     this.router.transitionTo('comments', post);
-   *   }
-   * }
-   * ```
-   *
-   * @param routeNameOrUrl the name of the route or a URL
-   * @param models         the model(s) or identifier(s) to be used while
-   *                       transitioning to the route.
-   * @param options        optional hash with a queryParams property
-   *                       containing a mapping of query parameters. May be
-   *                       supplied as the only parameter to trigger a
-   *                       query-parameter-only transition.
-   * @returns              the Transition object associated with this attempted transition
-   */
-  transitionTo(routeNameOrUrl: string, options?: { queryParams: object }): Transition;
-  transitionTo(
-    routeNameOrUrl: string,
-    models: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(
-    routeNameOrUrl: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(
-    routeNameOrUrl: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(
-    routeNameOrUrl: string,
-    modelsA: RouteModel,
-    modelsB: RouteModel,
-    modelsC: RouteModel,
-    modelsD: RouteModel,
-    options?: { queryParams: object }
-  ): Transition;
-  transitionTo(options: { queryParams: object }): Transition;
+    // https://emberjs.com/api/ember/release/classes/RouterService/methods/isActive?anchor=transitionTo
+    /**
+     * Transition the application into another route. The route may
+     * be either a single route or route path:
+     *
+     * See [transitionTo](https://api.emberjs.com/ember/release/classes/Route/methods/transitionTo?anchor=transitionTo) for more info.
+     *
+     * Calling `transitionTo` from the Router service will cause default query parameter values to be included in the URL.
+     * This behavior is different from calling `transitionTo` on a route or `transitionToRoute` on a controller.
+     * See the [Router Service RFC](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md#query-parameter-semantics) for more info.
+     *
+     * In the following example we use the Router service to navigate to a route with a
+     * specific model from a Component.
+     *
+     * ```app/components/example.js
+     * import Component from '@glimmer/component';
+     * import { action } from '@ember/object';
+     * import { inject as service } from '@ember/service';
+     *
+     * export default class extends Component {
+     *   @service router;
+     *
+     *   @action
+     *   goToComments(post) {
+     *     this.router.transitionTo('comments', post);
+     *   }
+     * }
+     * ```
+     *
+     * @param routeNameOrUrl the name of the route or a URL
+     * @param models         the model(s) or identifier(s) to be used while
+     *                       transitioning to the route.
+     * @param options        optional hash with a queryParams property
+     *                       containing a mapping of query parameters. May be
+     *                       supplied as the only parameter to trigger a
+     *                       query-parameter-only transition.
+     * @returns              the Transition object associated with this attempted transition
+     */
+    transitionTo(routeNameOrUrl: string, options?: { queryParams: object }): Transition;
+    transitionTo(
+      routeNameOrUrl: string,
+      models: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+      routeNameOrUrl: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+      routeNameOrUrl: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(
+      routeNameOrUrl: string,
+      modelsA: RouteModel,
+      modelsB: RouteModel,
+      modelsC: RouteModel,
+      modelsD: RouteModel,
+      options?: { queryParams: object }
+    ): Transition;
+    transitionTo(options: { queryParams: object }): Transition;
 
-  // https://emberjs.com/api/ember/4.3.0/classes/RouterService/methods/isActive?anchor=urlFor
-  /**
-   * Generate a URL based on the supplied route name.
-   *
-   * @param routeName the name of the route or a URL
-   * @param models    the model(s) or identifier(s) to be used while
-   *                  transitioning to the route.
-   * @param options   optional hash with a queryParams property containing
-   *                  a mapping of query parameters
-   * @returns         the string representing the generated URL
-   */
-  urlFor(
-    routeName: string,
-    ...args: RouteModel[] | [...RouteModel[], { queryParams: object }]
-  ): string;
+    // https://emberjs.com/api/ember/4.3.0/classes/RouterService/methods/isActive?anchor=urlFor
+    /**
+     * Generate a URL based on the supplied route name.
+     *
+     * @param routeName the name of the route or a URL
+     * @param models    the model(s) or identifier(s) to be used while
+     *                  transitioning to the route.
+     * @param options   optional hash with a queryParams property containing
+     *                  a mapping of query parameters
+     * @returns         the string representing the generated URL
+     */
+    urlFor(
+      routeName: string,
+      ...args: RouteModel[] | [...RouteModel[], { queryParams: object }]
+    ): string;
 
-  // https://api.emberjs.com/ember/3.6/classes/RouterService/events/routeDidChange?anchor=routeDidChange
-  /**
-   * Register a callback for an event.
-   *
-   * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
-   * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
-   *
-   * The `routeDidChange` event only fires once a transition has settled.
-   * This includes aborts and error substates.
-   * Like the `routeWillChange` event it recieves a `Transition` as the sole argument.
-   *
-   * @param name     the name of the event
-   * @param callback the callback to execute
-   */
-  on(
-    name: 'routeDidChange' | 'routeWillChange',
-    callback: (transition: Transition) => void
-  ): RouterService;
+    // https://api.emberjs.com/ember/3.6/classes/RouterService/events/routeDidChange?anchor=routeDidChange
+    /**
+     * Register a callback for an event.
+     *
+     * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
+     * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
+     *
+     * The `routeDidChange` event only fires once a transition has settled.
+     * This includes aborts and error substates.
+     * Like the `routeWillChange` event it recieves a `Transition` as the sole argument.
+     *
+     * @param name     the name of the event
+     * @param callback the callback to execute
+     */
+    on(
+      name: 'routeDidChange' | 'routeWillChange',
+      callback: (transition: Transition) => void
+    ): RouterService;
 
-  // https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=off
-  /**
-   * Removes a callback for an event.
-   *
-   * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
-   * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
-   *
-   * The `routeDidChange` event only fires once a transition has settled.
-   * This includes aborts and error substates.
-   *
-   * @param name     the name of the event 'routeWillChange' | 'routeDidChange'
-   * @param callback the callback to remove
-   */
-  off(
-    name: 'routeDidChange' | 'routeWillChange',
-    callback: (transition: Transition) => void
-  ): RouterService;
+    // https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=off
+    /**
+     * Removes a callback for an event.
+     *
+     * The `routeWillChange` event is fired at the beginning of any attempted transition with a `Transition` object as the sole argument.
+     * This action can be used for aborting, redirecting, or decorating the transition from the currently active routes.
+     *
+     * The `routeDidChange` event only fires once a transition has settled.
+     * This includes aborts and error substates.
+     *
+     * @param name     the name of the event 'routeWillChange' | 'routeDidChange'
+     * @param callback the callback to remove
+     */
+    off(
+      name: 'routeDidChange' | 'routeWillChange',
+      callback: (transition: Transition) => void
+    ): RouterService;
 
-  /**
-   * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=has
-   *
-   * Checks to see if object has any subscriptions for named event.
-   *
-   * @param name
-   */
-  has(name: string): boolean;
+    /**
+     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=has
+     *
+     * Checks to see if object has any subscriptions for named event.
+     *
+     * @param name
+     */
+    has(name: string): boolean;
 
-  /**
-   * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=one
-   *
-   * Subscribes a function to a named event and then cancels the subscription after the first time the
-   * event is triggered. It is good to use one when you only care about the first time an event has taken place.
-   *
-   * @param name     the name of the event
-   * @param callback the callback to execute
-   */
-  one(
-    name: 'routeDidChange' | 'routeWillChange',
-    callback: (transition: Transition) => void
-  ): RouterService;
+    /**
+     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=one
+     *
+     * Subscribes a function to a named event and then cancels the subscription after the first time the
+     * event is triggered. It is good to use one when you only care about the first time an event has taken place.
+     *
+     * @param name     the name of the event
+     * @param callback the callback to execute
+     */
+    one(
+      name: 'routeDidChange' | 'routeWillChange',
+      callback: (transition: Transition) => void
+    ): RouterService;
 
-  /**
-   * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=trigger
-   *
-   * Triggers a named event for the object.
-   * Any additional arguments will be passed as parameters to the functions that are subscribed to the event.
-   *
-   * @param name the name of the event
-   * @param args arguments to pass to the event
-   */
-  trigger(name: string, args: any): void;
+    /**
+     * https://api.emberjs.com/ember/3.28/classes/Evented/methods/off?anchor=trigger
+     *
+     * Triggers a named event for the object.
+     * Any additional arguments will be passed as parameters to the functions that are subscribed to the event.
+     *
+     * @param name the name of the event
+     * @param args arguments to pass to the event
+     */
+    trigger(name: string, args: any): void;
 
-  /**
-   * Takes a string URL and returns a `RouteInfo` for the leafmost route represented
-   * by the URL. Returns `null` if the URL is not recognized. This method expects to
-   * receive the actual URL as seen by the browser including the app's `rootURL`.
-   * See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
-   * In the following example `recognize` is used to verify if a path belongs to our
-   * application before transitioning to it.
-   * ```
-   * import Component from '@ember/component';
-   * import { inject as service } from '@ember/service';
-   * export default class extends Component {
-   *   @service router;
-   *   path = '/';
-   *   click() {
-   *     if (this.router.recognize(this.path)) {
-   *       this.router.transitionTo(this.path);
-   *     }
-   *   }
-   * }
-   * ```
-   */
-  recognize(url: string): RouteInfo;
+    /**
+     * Takes a string URL and returns a `RouteInfo` for the leafmost route represented
+     * by the URL. Returns `null` if the URL is not recognized. This method expects to
+     * receive the actual URL as seen by the browser including the app's `rootURL`.
+     * See [RouteInfo](/ember/release/classes/RouteInfo) for more info.
+     * In the following example `recognize` is used to verify if a path belongs to our
+     * application before transitioning to it.
+     * ```
+     * import Component from '@ember/component';
+     * import { inject as service } from '@ember/service';
+     * export default class extends Component {
+     *   @service router;
+     *   path = '/';
+     *   click() {
+     *     if (this.router.recognize(this.path)) {
+     *       this.router.transitionTo(this.path);
+     *     }
+     *   }
+     * }
+     * ```
+     */
+    recognize(url: string): RouteInfo;
 
-  /**
-   * Takes a string URL and returns a promise that resolves to a
-   * `RouteInfoWithAttributes` for the leafmost route represented by the URL.
-   * The promise rejects if the URL is not recognized or an unhandled exception
-   * is encountered. This method expects to receive the actual URL as seen by
-   * the browser including the app's `rootURL`.
-   */
-  recognizeAndLoad(url: string): RouteInfoWithAttributes;
+    /**
+     * Takes a string URL and returns a promise that resolves to a
+     * `RouteInfoWithAttributes` for the leafmost route represented by the URL.
+     * The promise rejects if the URL is not recognized or an unhandled exception
+     * is encountered. This method expects to receive the actual URL as seen by
+     * the browser including the app's `rootURL`.
+     */
+    recognizeAndLoad(url: string): RouteInfoWithAttributes;
 
-  /**
-   * Refreshes all currently active routes, doing a full transition.
-   * If a route name is provided and refers to a currently active route,
-   * it will refresh only that route and its descendents.
-   * Returns a promise that will be resolved once the refresh is complete.
-   * All resetController, beforeModel, model, afterModel, redirect, and setupController
-   * hooks will be called again. You will get new data from the model hook.
-   */
-  refresh(pivotRouteName?: string): Transition;
+    /**
+     * Refreshes all currently active routes, doing a full transition.
+     * If a route name is provided and refers to a currently active route,
+     * it will refresh only that route and its descendents.
+     * Returns a promise that will be resolved once the refresh is complete.
+     * All resetController, beforeModel, model, afterModel, redirect, and setupController
+     * hooks will be called again. You will get new data from the model hook.
+     */
+    refresh(pivotRouteName?: string): Transition;
+  }
 }
diff --git a/types/preview/@ember/routing/router.d.ts b/types/preview/@ember/routing/router.d.ts
index 348c410a0b6..299dc3f43df 100644
--- a/types/preview/@ember/routing/router.d.ts
+++ b/types/preview/@ember/routing/router.d.ts
@@ -1,42 +1,48 @@
-import EmberObject from '@ember/object';
-import Evented from '@ember/object/evented';
-import RouterDSL from '@ember/routing/-private/router-dsl';
-import Transition from '@ember/routing/transition';
-import RouterService from '@ember/routing/router-service';
+declare module '@ember/routing/router' {
+  import EmberObject from '@ember/object';
+  import Evented from '@ember/object/evented';
+  import RouterDSL from '@ember/routing/-private/router-dsl';
+  import Transition from '@ember/routing/transition';
 
-/**
- * The `Ember.Router` class manages the application state and URLs. Refer to
- * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
- */
-export default class Router extends EmberObject.extend(Evented) {
   /**
-   * The `Router.map` function allows you to define mappings from URLs to routes
-   * in your application. These mappings are defined within the
-   * supplied callback function using `this.route`.
+   * The `Ember.Router` class manages the application state and URLs. Refer to
+   * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
    */
-  static map(callback: (this: RouterDSL) => void): void;
-  /**
-   * The `location` property determines the type of URL's that your
-   * application will use.
-   *
-   * @note the `'auto'` location is [deprecated](https://deprecations.emberjs.com/v4.x/#toc_deprecate-auto-location).
-   */
-  location: 'history' | 'hash' | 'none' | 'auto';
-  /**
-   * Represents the URL of the root of the application, often '/'. This prefix is
-   * assumed on all routes defined on this router.
-   */
-  rootURL: string;
-  /**
-   * Transition the application into another route. The route may
-   * be either a single route or route path:
-   */
-  transitionTo(name: string, options?: {}): Transition;
-  transitionTo(name: string, ...models: any[]): Transition;
-  transitionTo(name: string, options: {}): Transition;
+  export default class Router extends EmberObject {
+    /**
+     * The `Router.map` function allows you to define mappings from URLs to routes
+     * in your application. These mappings are defined within the
+     * supplied callback function using `this.route`.
+     */
+    static map(callback: (this: RouterDSL) => void): void;
+    /**
+     * The `location` property determines the type of URL's that your
+     * application will use.
+     *
+     * @note the `'auto'` location is [deprecated](https://deprecations.emberjs.com/v4.x/#toc_deprecate-auto-location).
+     */
+    location: 'history' | 'hash' | 'none' | 'auto';
+    /**
+     * Represents the URL of the root of the application, often '/'. This prefix is
+     * assumed on all routes defined on this router.
+     */
+    rootURL: string;
+    /**
+     * Transition the application into another route. The route may
+     * be either a single route or route path:
+     */
+    transitionTo(name: string, options?: {}): Transition;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    transitionTo(name: string, ...models: any[]): Transition;
+    transitionTo(name: string, options: {}): Transition;
+  }
+
+  export default interface RouterService extends Evented {}
 }
 
 declare module '@ember/service' {
+  import RouterService from '@ember/routing/router-service';
+
   interface Registry {
     router: RouterService;
   }
diff --git a/types/preview/@ember/routing/test/built-ins.ts b/types/preview/@ember/routing/test/built-ins.ts
deleted file mode 100644
index 40db98e07cf..00000000000
--- a/types/preview/@ember/routing/test/built-ins.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { LinkTo } from '@ember/routing';
-
-LinkTo; // $ExpectType LinkTo
diff --git a/types/preview/@ember/routing/test/lib/assert.ts b/types/preview/@ember/routing/test/lib/assert.ts
deleted file mode 100755
index dad227ab5e9..00000000000
--- a/types/preview/@ember/routing/test/lib/assert.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Static assertion that `value` has type `T` */
-export declare function assertType<T>(value: T): T;
diff --git a/types/preview/@ember/routing/test/router-service.ts b/types/preview/@ember/routing/test/router-service.ts
deleted file mode 100644
index 5abf1b622e6..00000000000
--- a/types/preview/@ember/routing/test/router-service.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import RouterService from '@ember/routing/router-service';
-
-declare let router: RouterService;
-
-router.transitionTo('someRoute');
-router.transitionTo('someRoute', { withModel: true });
-router.transitionTo('someRoute', { withModel: true }, { queryParams: {} });
-router.transitionTo(
-  'someRoute',
-  { withModel: true },
-  { withMultipleModels: 'still checks correctly' },
-  { queryParams: {} }
-);
-
-const routeWillChangeHandler = () => {};
-
-// $ExpectType RouterService
-router.on('routeWillChange', routeWillChangeHandler);
-
-// $ExpectType boolean
-router.has('routeWillChange');
-
-// $ExpectType RouterService
-router.off('routeWillChange', routeWillChangeHandler);
-
-// $ExpectType RouterService
-router.one('routeWillChange', routeWillChangeHandler);
-
-// $ExpectType void
-router.trigger('routeWillChange', 'boo');
-
-const transition = router.transitionTo('someRoute');
-
-// $ExpectType Transition<unknown>
-transition.abort();
-
-// $ExpectType Promise<unknown>
-transition.catch();
-transition.catch((err) => console.log(err), 'label');
-
-// $ExpectType Promise<unknown>
-transition.finally();
-transition.finally(() => console.log('finally!'));
-transition.finally(() => console.log('finally!'), 'label');
-
-// $ExpectType Promise<unknown>
-transition.followRedirects();
-
-// $ExpectType Transition<unknown>
-transition.method();
-transition.method('replace');
-
-// $ExpectType Transition<unknown>
-transition.retry();
-
-// $ExpectType Promise<unknown>
-transition.then();
-transition.then(
-  (result) => console.log(result),
-  (err) => console.log(err),
-  'label'
-);
-
-// $ExpectType void
-transition.trigger(false, 'error');
-
-// $ExpectType void
-transition.send(false, 'error');
-
-transition.data = { some: 'data' };
-
-// $ExpectType RouteInfoWithAttributes | null
-transition.from;
-// @ts-expect-error
-transition.from = 'from';
-
-// $ExpectType Promise<unknown>
-transition.promise;
-// @ts-expect-error
-transition.promise = 'promise';
-
-// $ExpectType RouteInfo | RouteInfoWithAttributes
-transition.to;
-// @ts-expect-error
-transition.to = 'to';
-
-// $ExpectType unknown
-transition.to.metadata;
-// @ts-expect-error
-transition.to.metadata = 'foo';
-
-// NOTE: we cannot check the validity of invocations with just route name and
-// query params beyond that the second argument is an object of some sort,
-// because TS will always resolve it to the `models` variant if the
-// `queryParams` variant fails.
-// $ExpectType Transition<unknown>
-router.transitionTo('someRoute', { queryParams: { shouldWork: true } });
-// $ExpectType Transition<unknown>
-router.transitionTo({ queryParams: { areSupported: true } });
-// @ts-expect-error
-router.transitionTo({ queryParams: 'potato' });
-// $ExpectType Transition<unknown>
-router.transitionTo('someRoute', 1);
-// $ExpectType Transition<unknown>
-router.transitionTo('someRoute', 1, { queryParams: { areSupported: true } });
-// $ExpectType Transition<unknown>
-router.transitionTo('someRoute', 1, '13');
-// $ExpectType Transition<unknown>
-router.transitionTo('someRoute', 1, '13', { queryParams: { areSupported: true } });
-
-router.recognize('foo/bar'); // $ExpectType RouteInfo
-
-router.recognizeAndLoad('foo/bar'); // $ExpectType RouteInfoWithAttributes
-
-router.rootURL; // $ExpectType string
-// @ts-expect-error
-router.rootURL = 'foo';
-
-router.refresh(); // $ExpectType Transition<unknown>
-router.refresh('my-route'); // $ExpectType Transition<unknown>
diff --git a/types/preview/@ember/routing/transition.d.ts b/types/preview/@ember/routing/transition.d.ts
index f575b9da974..0d36e8437d8 100644
--- a/types/preview/@ember/routing/transition.d.ts
+++ b/types/preview/@ember/routing/transition.d.ts
@@ -1,124 +1,126 @@
-import RouteInfo, { RouteInfoWithAttributes } from './route-info';
+declare module '@ember/routing/transition' {
+  import RouteInfo, { RouteInfoWithAttributes } from '@ember/routing/route-info';
 
-/**
- * A Transition is a thennable (a promise-like object) that represents an
- * attempt to transition to another route. It can be aborted, either explicitly
- * via `abort` or by attempting another transition while a previous one is still
- * underway. An aborted transition can also be `retry()`d later.
- *
- * @note This is a non-user-constructible type. The only legal way to get a
- *   transition is using one of the public API methods on routes, controllers,
- *   the router service, etc.
- */
-export default interface Transition<T = unknown> extends Partial<Promise<T>> {
   /**
-   * Custom state can be stored on a Transition's `data` object.
-   * This can be useful for decorating a Transition within an earlier hook and shared with a later hook.
-   * Properties set on `data` will be copied to new transitions generated by calling `retry` on this transition.
-   */
-  data: Record<string, unknown>;
-  /**
-   * This property is a `RouteInfo` object that represents where transition originated from.
-   * It's important to note that a `RouteInfo` is a linked list and this property is simply the head node of the list.
-   * In the case of an initial render, `from` will be set to `null`.
-   */
-  readonly from: RouteInfoWithAttributes | null;
-  /**
-   * The Transition's internal promise.
-   * Calling `.then` on this property is that same as calling `.then` on the Transition object itself,
-   * but this property is exposed for when you want to pass around a Transition's promise,
-   * but not the Transition object itself, since Transition object can be externally `abort`ed,
-   * while the promise cannot.
-   */
-  readonly promise: Promise<T>;
-  /**
-   * This property is a `RouteInfo` object that represents where the router is transitioning to.
-   * It's important to note that a `RouteInfo` is a linked list and this property is simply the leafmost route.
-   */
-  readonly to: RouteInfo | RouteInfoWithAttributes;
-  /**
-   * Aborts the Transition. Note you can also implicitly abort a transition
-   * by initiating another transition while a previous one is underway.
-   */
-  abort(): Transition<T>;
-  /**
-   * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
-   * but not the Transition itself.
-   *
-   * @param onRejection
-   * @param label optional string for labeling the promise. Useful for tooling.
-   */
-  catch<TResult = never>(
-    onRejected?: (reason: unknown) => TResult | PromiseLike<TResult>,
-    label?: string
-  ): Promise<TResult | T>;
-  /**
-   * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
-   * but not the Transition itself.
-   *
-   * @param onFinally
-   * @param label optional string for labeling the promise. Useful for tooling.
-   */
-  finally(onFinally?: () => void, label?: string): Promise<T>;
-  /**
-   * Transitions are aborted and their promises rejected when redirects occur;
-   * this method returns a promise that will follow any redirects that occur and
-   * fulfill with the value fulfilled by any redirecting transitions that occur.
-   *
-   * @return a promise that fulfills with the same value that the final redirecting transition fulfills with
-   */
-  followRedirects(): Promise<T>;
-  /**
-   * Sets the URL-changing method to be employed at the end of a successful transition.
-   * By default, a new Transition will just use `updateURL`,
-   * but passing 'replace' to this method will cause the URL to update using 'replaceWith' instead.
-   * Omitting a parameter will disable the URL change,
-   * allowing for transitions that don't update the URL at completion
-   * (this is also used for handleURL, since the URL has already changed before the transition took place).
-   *
-   * @param  method the type of URL-changing method to use at the end of a transition. Accepted values are 'replace',
-   *                falsy values, or any other non-falsy value (which is interpreted as an updateURL transition).
-   * @return        This transition
-   */
-  method(method?: string): Transition<T>;
-  /**
-   * Retries a previously-aborted transition (making sure to abort the
-   * transition if it's still active). Returns a new transition that
-   * represents the new attempt to transition.
-   */
-  retry(): Transition<T>;
-  /**
-   * A standard promise hook that resolves if the transition succeeds and rejects if it fails/redirects/aborts.
-   *
-   * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
-   * but not the Transition itself.
-   *
-   * @param  onFulfilled
-   * @param  onRejected
-   * @param  label label optional string for labeling the promise. Useful for tooling.
-   */
-  then<TResult1 = T, TResult2 = never>(
-    onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>,
-    onrejected?: (reason: unknown) => TResult2 | PromiseLike<TResult2>,
-    label?: string
-  ): Promise<TResult1 | TResult2>;
-  /**
-   * Fires an event on the current list of resolved/resolving handlers within this transition.
-   * Useful for firing events on route hierarchies that haven't fully been entered yet.
-   *
-   * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
-   * @param  name          the name of the event to fire
-   */
-  send(ignoreFailure: boolean, name: string): void;
-  /**
-   * Fires an event on the current list of resolved/resolving handlers within this transition.
-   * Useful for firing events on route hierarchies that haven't fully been entered yet.
-   * Note: This method is also aliased as `send`
-   *
-   * @alias send
+   * A Transition is a thennable (a promise-like object) that represents an
+   * attempt to transition to another route. It can be aborted, either explicitly
+   * via `abort` or by attempting another transition while a previous one is still
+   * underway. An aborted transition can also be `retry()`d later.
    *
-   * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
-   * @param  name          the name of the event to fire
+   * @note This is a non-user-constructible type. The only legal way to get a
+   *   transition is using one of the public API methods on routes, controllers,
+   *   the router service, etc.
    */
-  trigger(ignoreFailure: boolean, name: string): void;
+  export default interface Transition<T = unknown> extends Partial<Promise<T>> {
+    /**
+     * Custom state can be stored on a Transition's `data` object.
+     * This can be useful for decorating a Transition within an earlier hook and shared with a later hook.
+     * Properties set on `data` will be copied to new transitions generated by calling `retry` on this transition.
+     */
+    data: Record<string, unknown>;
+    /**
+     * This property is a `RouteInfo` object that represents where transition originated from.
+     * It's important to note that a `RouteInfo` is a linked list and this property is simply the head node of the list.
+     * In the case of an initial render, `from` will be set to `null`.
+     */
+    readonly from: RouteInfoWithAttributes | null;
+    /**
+     * The Transition's internal promise.
+     * Calling `.then` on this property is that same as calling `.then` on the Transition object itself,
+     * but this property is exposed for when you want to pass around a Transition's promise,
+     * but not the Transition object itself, since Transition object can be externally `abort`ed,
+     * while the promise cannot.
+     */
+    readonly promise: Promise<T>;
+    /**
+     * This property is a `RouteInfo` object that represents where the router is transitioning to.
+     * It's important to note that a `RouteInfo` is a linked list and this property is simply the leafmost route.
+     */
+    readonly to: RouteInfo | RouteInfoWithAttributes;
+    /**
+     * Aborts the Transition. Note you can also implicitly abort a transition
+     * by initiating another transition while a previous one is underway.
+     */
+    abort(): Transition<T>;
+    /**
+     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+     * but not the Transition itself.
+     *
+     * @param onRejection
+     * @param label optional string for labeling the promise. Useful for tooling.
+     */
+    catch<TResult = never>(
+      onRejected?: (reason: unknown) => TResult | PromiseLike<TResult>,
+      label?: string
+    ): Promise<TResult | T>;
+    /**
+     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+     * but not the Transition itself.
+     *
+     * @param onFinally
+     * @param label optional string for labeling the promise. Useful for tooling.
+     */
+    finally(onFinally?: () => void, label?: string): Promise<T>;
+    /**
+     * Transitions are aborted and their promises rejected when redirects occur;
+     * this method returns a promise that will follow any redirects that occur and
+     * fulfill with the value fulfilled by any redirecting transitions that occur.
+     *
+     * @return a promise that fulfills with the same value that the final redirecting transition fulfills with
+     */
+    followRedirects(): Promise<T>;
+    /**
+     * Sets the URL-changing method to be employed at the end of a successful transition.
+     * By default, a new Transition will just use `updateURL`,
+     * but passing 'replace' to this method will cause the URL to update using 'replaceWith' instead.
+     * Omitting a parameter will disable the URL change,
+     * allowing for transitions that don't update the URL at completion
+     * (this is also used for handleURL, since the URL has already changed before the transition took place).
+     *
+     * @param  method the type of URL-changing method to use at the end of a transition. Accepted values are 'replace',
+     *                falsy values, or any other non-falsy value (which is interpreted as an updateURL transition).
+     * @return        This transition
+     */
+    method(method?: string): Transition<T>;
+    /**
+     * Retries a previously-aborted transition (making sure to abort the
+     * transition if it's still active). Returns a new transition that
+     * represents the new attempt to transition.
+     */
+    retry(): Transition<T>;
+    /**
+     * A standard promise hook that resolves if the transition succeeds and rejects if it fails/redirects/aborts.
+     *
+     * Forwards to the internal `promise` property which you can use in situations where you want to pass around a thennable,
+     * but not the Transition itself.
+     *
+     * @param  onFulfilled
+     * @param  onRejected
+     * @param  label label optional string for labeling the promise. Useful for tooling.
+     */
+    then<TResult1 = T, TResult2 = never>(
+      onfulfilled?: (value: T) => TResult1 | PromiseLike<TResult1>,
+      onrejected?: (reason: unknown) => TResult2 | PromiseLike<TResult2>,
+      label?: string
+    ): Promise<TResult1 | TResult2>;
+    /**
+     * Fires an event on the current list of resolved/resolving handlers within this transition.
+     * Useful for firing events on route hierarchies that haven't fully been entered yet.
+     *
+     * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
+     * @param  name          the name of the event to fire
+     */
+    send(ignoreFailure: boolean, name: string): void;
+    /**
+     * Fires an event on the current list of resolved/resolving handlers within this transition.
+     * Useful for firing events on route hierarchies that haven't fully been entered yet.
+     * Note: This method is also aliased as `send`
+     *
+     * @alias send
+     *
+     * @param  ignoreFailure a boolean specifying whether unhandled events throw an error
+     * @param  name          the name of the event to fire
+     */
+    trigger(ignoreFailure: boolean, name: string): void;
+  }
 }
diff --git a/types/preview/@ember/routing/types.d.ts b/types/preview/@ember/routing/types.d.ts
index 0895070ec9a..c8483e79e47 100644
--- a/types/preview/@ember/routing/types.d.ts
+++ b/types/preview/@ember/routing/types.d.ts
@@ -1,13 +1,15 @@
-export interface RenderOptions {
-  into?: string | undefined;
-  controller?: string | undefined;
-  model?: unknown;
-  outlet?: string | undefined;
-  view?: string | undefined;
-}
+declare module '@ember/routing/types' {
+  export interface RenderOptions {
+    into?: string | undefined;
+    controller?: string | undefined;
+    model?: unknown;
+    outlet?: string | undefined;
+    view?: string | undefined;
+  }
 
-export interface RouteQueryParam {
-  refreshModel?: boolean | undefined;
-  replace?: boolean | undefined;
-  as?: string | undefined;
+  export interface RouteQueryParam {
+    refreshModel?: boolean | undefined;
+    replace?: boolean | undefined;
+    as?: string | undefined;
+  }
 }
diff --git a/types/preview/@ember/runloop/-private/backburner.d.ts b/types/preview/@ember/runloop/-private/backburner.d.ts
index 146cdcb611c..20fc9cff668 100644
--- a/types/preview/@ember/runloop/-private/backburner.d.ts
+++ b/types/preview/@ember/runloop/-private/backburner.d.ts
@@ -1,41 +1,43 @@
-import { EmberMethod, EmberMethodParams } from 'ember/-private/type-utils';
+declare module '@ember/runloop/-private/backburner' {
+  import { EmberMethod, EmberMethodParams } from 'ember/-private/type-utils';
 
-export interface QueueItem {
-  method: string;
-  target: object;
-  args: object[];
-  stack: string | undefined;
-}
+  export interface QueueItem {
+    method: string;
+    target: object;
+    args: object[];
+    stack: string | undefined;
+  }
 
-export interface DeferredActionQueues {
-  [index: string]: unknown;
-  queues: object;
-  schedule<T, M extends EmberMethod<T>>(
-    ...args: [
-      queueName: string,
-      target: T,
-      method: M,
-      ...methodArgs: EmberMethodParams<T, M>,
-      onceFlag: boolean,
-      stack: unknown
-    ]
-  ): any;
-  flush(fromAutorun: boolean): any;
-}
+  export interface DeferredActionQueues {
+    [index: string]: unknown;
+    queues: object;
+    schedule<T, M extends EmberMethod<T>>(
+      ...args: [
+        queueName: string,
+        target: T,
+        method: M,
+        ...methodArgs: EmberMethodParams<T, M>,
+        onceFlag: boolean,
+        stack: unknown
+      ]
+    ): any;
+    flush(fromAutorun: boolean): any;
+  }
 
-export interface DebugInfo {
-  autorun: Error | undefined | null;
-  counters: object;
-  timers: QueueItem[];
-  instanceStack: DeferredActionQueues[];
-}
+  export interface DebugInfo {
+    autorun: Error | undefined | null;
+    counters: object;
+    timers: QueueItem[];
+    instanceStack: DeferredActionQueues[];
+  }
 
-export interface Backburner {
-  join(...args: any[]): void;
-  on(...args: any[]): void;
-  scheduleOnce(...args: any[]): void;
-  schedule(queueName: string, target: object | null, method: () => void | string): void;
-  ensureInstance(): void;
-  DEBUG: boolean;
-  getDebugInfo(): DebugInfo;
+  export interface Backburner {
+    join(...args: any[]): void;
+    on(...args: any[]): void;
+    scheduleOnce(...args: any[]): void;
+    schedule(queueName: string, target: object | null, method: () => void | string): void;
+    ensureInstance(): void;
+    DEBUG: boolean;
+    getDebugInfo(): DebugInfo;
+  }
 }
diff --git a/types/preview/@ember/runloop/-private/types.d.ts b/types/preview/@ember/runloop/-private/types.d.ts
index 5bdf61ef241..8fa9ccf9bf2 100644
--- a/types/preview/@ember/runloop/-private/types.d.ts
+++ b/types/preview/@ember/runloop/-private/types.d.ts
@@ -1,7 +1,9 @@
-export type EmberRunQueues =
-  | 'sync'
-  | 'actions'
-  | 'routerTransitions'
-  | 'render'
-  | 'afterRender'
-  | 'destroy';
+declare module '@ember/runloop/-private/types' {
+  export type EmberRunQueues =
+    | 'sync'
+    | 'actions'
+    | 'routerTransitions'
+    | 'render'
+    | 'afterRender'
+    | 'destroy';
+}
diff --git a/types/preview/@ember/runloop/index.d.ts b/types/preview/@ember/runloop/index.d.ts
index 372df3a5fa4..160276e858c 100644
--- a/types/preview/@ember/runloop/index.d.ts
+++ b/types/preview/@ember/runloop/index.d.ts
@@ -1,171 +1,175 @@
-import {
-  EmberMethod,
-  EmberMethodParams,
-  AnyFn,
-  EmberMethodReturn,
-  AnyMethod,
-} from 'ember/-private/type-utils';
-import { EmberRunQueues } from './-private/types';
-import { EmberRunTimer } from '@ember/runloop/types';
-import '@ember/runloop/-private/backburner';
+declare module '@ember/runloop' {
+  import {
+    EmberMethod,
+    EmberMethodParams,
+    AnyFn,
+    EmberMethodReturn,
+  } from 'ember/-private/type-utils';
+  import { EmberRunQueues } from '@ember/runloop/-private/types';
+  import { EmberRunTimer } from '@ember/runloop/types';
+  import '@ember/runloop/-private/backburner';
 
-/**
- * Runs the passed target and method inside of a RunLoop, ensuring any
- * deferred actions including bindings and views updates are flushed at the
- * end.
- */
-export function run<M extends AnyFn>(method: M): ReturnType<M>;
-export function run<T, M extends EmberMethod<T>>(
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberMethodReturn<T, M>;
-
-/**
- * If no run-loop is present, it creates a new one. If a run loop is
- * present it will queue itself to run on the existing run-loops action
- * queue.
- */
-export function join<M extends AnyFn>(method: M, ...args: Parameters<M>): ReturnType<M> | undefined;
-export function join<T, M extends EmberMethod<T>>(
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberMethodReturn<T, M> | undefined;
-
-/**
- * Allows you to specify which context to call the specified function in while
- * adding the execution of that function to the Ember run loop. This ability
- * makes this method a great way to asynchronously integrate third-party libraries
- * into your Ember application.
- */
-// NOTE: it would be nice to make this curry arguments, which is how it actually
-// works, but that is a *lot* of type shenanigans, and also diverges from the
-// `Function.prototype.bind` implementation. We should track the latter, despite
-// the loss of safety, because it makes interop cleaner.
-export function bind<T, M extends EmberMethod<T>>(
-  target: T,
-  method: M,
-  ...args: any[]
-): (...args: any[]) => EmberMethodReturn<T, M>;
-
-/**
- * Begins a new RunLoop. Any deferred actions invoked after the begin will
- * be buffered until you invoke a matching call to `run.end()`. This is
- * a lower-level way to use a RunLoop instead of using `run()`.
- */
-export function begin(): void;
+  /**
+   * Runs the passed target and method inside of a RunLoop, ensuring any
+   * deferred actions including bindings and views updates are flushed at the
+   * end.
+   */
+  export function run<M extends AnyFn>(method: M): ReturnType<M>;
+  export function run<T, M extends EmberMethod<T>>(
+    target: T,
+    method: M,
+    ...args: EmberMethodParams<T, M>
+  ): EmberMethodReturn<T, M>;
 
-/**
- * Ends a RunLoop. This must be called sometime after you call
- * `run.begin()` to flush any deferred actions. This is a lower-level way
- * to use a RunLoop instead of using `run()`.
- */
-export function end(): void;
+  /**
+   * If no run-loop is present, it creates a new one. If a run loop is
+   * present it will queue itself to run on the existing run-loops action
+   * queue.
+   */
+  export function join<M extends AnyFn>(
+    method: M,
+    ...args: Parameters<M>
+  ): ReturnType<M> | undefined;
+  export function join<T, M extends EmberMethod<T>>(
+    target: T,
+    method: M,
+    ...args: EmberMethodParams<T, M>
+  ): EmberMethodReturn<T, M> | undefined;
 
-/**
- * Adds the passed target/method and any optional arguments to the named
- * queue to be executed at the end of the RunLoop. If you have not already
- * started a RunLoop when calling this method one will be started for you
- * automatically.
- */
-export function schedule<T, M extends EmberMethod<T>>(
-  queue: EmberRunQueues,
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberRunTimer;
-export function schedule<M extends AnyFn>(
-  queue: EmberRunQueues,
-  method: M,
-  ...args: Parameters<M>
-): EmberRunTimer;
+  /**
+   * Allows you to specify which context to call the specified function in while
+   * adding the execution of that function to the Ember run loop. This ability
+   * makes this method a great way to asynchronously integrate third-party libraries
+   * into your Ember application.
+   */
+  // NOTE: it would be nice to make this curry arguments, which is how it actually
+  // works, but that is a *lot* of type shenanigans, and also diverges from the
+  // `Function.prototype.bind` implementation. We should track the latter, despite
+  // the loss of safety, because it makes interop cleaner.
+  export function bind<T, M extends EmberMethod<T>>(
+    target: T,
+    method: M,
+    ...args: any[]
+  ): (...args: any[]) => EmberMethodReturn<T, M>;
 
-/**
- * Invokes the passed target/method and optional arguments after a specified
- * period of time. The last parameter of this method must always be a number
- * of milliseconds.
- */
-export function later(method: AnyFn, wait: number): EmberRunTimer;
-export function later<T, M extends EmberMethod<T>>(
-  ...args: [target: T, method: M, ...args: EmberMethodParams<T, M>, wait: number]
-): EmberRunTimer;
+  /**
+   * Begins a new RunLoop. Any deferred actions invoked after the begin will
+   * be buffered until you invoke a matching call to `run.end()`. This is
+   * a lower-level way to use a RunLoop instead of using `run()`.
+   */
+  export function begin(): void;
 
-/**
- * Schedule a function to run one time during the current RunLoop. This is equivalent
- * to calling `scheduleOnce` with the "actions" queue.
- */
-export function once<T, M extends EmberMethod<T>>(
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberRunTimer;
+  /**
+   * Ends a RunLoop. This must be called sometime after you call
+   * `run.begin()` to flush any deferred actions. This is a lower-level way
+   * to use a RunLoop instead of using `run()`.
+   */
+  export function end(): void;
 
-export function once<T, M extends keyof T>(
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberRunTimer;
+  /**
+   * Adds the passed target/method and any optional arguments to the named
+   * queue to be executed at the end of the RunLoop. If you have not already
+   * started a RunLoop when calling this method one will be started for you
+   * automatically.
+   */
+  export function schedule<T, M extends EmberMethod<T>>(
+    queue: EmberRunQueues,
+    target: T,
+    method: M,
+    ...args: EmberMethodParams<T, M>
+  ): EmberRunTimer;
+  export function schedule<M extends AnyFn>(
+    queue: EmberRunQueues,
+    method: M,
+    ...args: Parameters<M>
+  ): EmberRunTimer;
 
-/**
- * Schedules a function to run one time in a given queue of the current RunLoop.
- * Calling this method with the same queue/target/method combination will have
- * no effect (past the initial call).
- */
-export function scheduleOnce<T, M extends EmberMethod<T>>(
-  queue: EmberRunQueues,
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberRunTimer;
+  /**
+   * Invokes the passed target/method and optional arguments after a specified
+   * period of time. The last parameter of this method must always be a number
+   * of milliseconds.
+   */
+  export function later(method: AnyFn, wait: number): EmberRunTimer;
+  export function later<T, M extends EmberMethod<T>>(
+    ...args: [target: T, method: M, ...args: EmberMethodParams<T, M>, wait: number]
+  ): EmberRunTimer;
 
-/**
- * Schedules an item to run from within a separate run loop, after
- * control has been returned to the system. This is equivalent to calling
- * `run.later` with a wait time of 1ms.
- */
-export function next<T, M extends EmberMethod<T>>(
-  target: T,
-  method: M,
-  ...args: EmberMethodParams<T, M>
-): EmberRunTimer;
-export function next<M extends AnyFn>(method: M, ...args: Parameters<M>): EmberRunTimer;
+  /**
+   * Schedule a function to run one time during the current RunLoop. This is equivalent
+   * to calling `scheduleOnce` with the "actions" queue.
+   */
+  export function once<T, M extends EmberMethod<T>>(
+    target: T,
+    method: M,
+    ...args: EmberMethodParams<T, M>
+  ): EmberRunTimer;
 
-/**
- * Cancels a scheduled item. Must be a value returned by `run.later()`,
- * `run.once()`, `run.scheduleOnce()`, `run.next()`, `run.debounce()`, or
- * `run.throttle()`.
- */
-export function cancel(timer?: EmberRunTimer): boolean;
+  export function once<T, M extends keyof T>(
+    target: T,
+    method: M,
+    ...args: EmberMethodParams<T, M>
+  ): EmberRunTimer;
 
-/**
- * Delay calling the target method until the debounce period has elapsed
- * with no additional debounce calls. If `debounce` is called again before
- * the specified time has elapsed, the timer is reset and the entire period
- * must pass again before the target method is called.
- */
-export function debounce(method: AnyFn, wait: number, immediate?: boolean): EmberRunTimer;
-export function debounce<Target, M extends EmberMethod<Target>>(
-  ...args: [
-    target: Target,
+  /**
+   * Schedules a function to run one time in a given queue of the current RunLoop.
+   * Calling this method with the same queue/target/method combination will have
+   * no effect (past the initial call).
+   */
+  export function scheduleOnce<T, M extends EmberMethod<T>>(
+    queue: EmberRunQueues,
+    target: T,
     method: M,
-    ...args: EmberMethodParams<Target, M>,
-    wait: number,
-    immediate?: boolean
-  ]
-): EmberRunTimer;
+    ...args: EmberMethodParams<T, M>
+  ): EmberRunTimer;
 
-/**
- * Ensure that the target method is never called more frequently than
- * the specified spacing period. The target method is called immediately.
- */
-export function throttle(method: AnyFn, spacing: number, immediate?: boolean): EmberRunTimer;
-export function throttle<T, M extends EmberMethod<T>>(
-  ...args: [
+  /**
+   * Schedules an item to run from within a separate run loop, after
+   * control has been returned to the system. This is equivalent to calling
+   * `run.later` with a wait time of 1ms.
+   */
+  export function next<T, M extends EmberMethod<T>>(
     target: T,
     method: M,
-    ...methodArgs: EmberMethodParams<T, M>,
-    spacing: number,
-    immediate?: boolean
-  ]
-): EmberRunTimer;
+    ...args: EmberMethodParams<T, M>
+  ): EmberRunTimer;
+  export function next<M extends AnyFn>(method: M, ...args: Parameters<M>): EmberRunTimer;
+
+  /**
+   * Cancels a scheduled item. Must be a value returned by `run.later()`,
+   * `run.once()`, `run.scheduleOnce()`, `run.next()`, `run.debounce()`, or
+   * `run.throttle()`.
+   */
+  export function cancel(timer?: EmberRunTimer): boolean;
+
+  /**
+   * Delay calling the target method until the debounce period has elapsed
+   * with no additional debounce calls. If `debounce` is called again before
+   * the specified time has elapsed, the timer is reset and the entire period
+   * must pass again before the target method is called.
+   */
+  export function debounce(method: AnyFn, wait: number, immediate?: boolean): EmberRunTimer;
+  export function debounce<Target, M extends EmberMethod<Target>>(
+    ...args: [
+      target: Target,
+      method: M,
+      ...args: EmberMethodParams<Target, M>,
+      wait: number,
+      immediate?: boolean
+    ]
+  ): EmberRunTimer;
+
+  /**
+   * Ensure that the target method is never called more frequently than
+   * the specified spacing period. The target method is called immediately.
+   */
+  export function throttle(method: AnyFn, spacing: number, immediate?: boolean): EmberRunTimer;
+  export function throttle<T, M extends EmberMethod<T>>(
+    ...args: [
+      target: T,
+      method: M,
+      ...methodArgs: EmberMethodParams<T, M>,
+      spacing: number,
+      immediate?: boolean
+    ]
+  ): EmberRunTimer;
+}
diff --git a/types/preview/@ember/runloop/types.d.ts b/types/preview/@ember/runloop/types.d.ts
index 0ba5585ad72..f1c79f14c6c 100644
--- a/types/preview/@ember/runloop/types.d.ts
+++ b/types/preview/@ember/runloop/types.d.ts
@@ -1,3 +1,5 @@
-export interface EmberRunTimer {
-  __ember_run_timer_brand__: boolean;
+declare module '@ember/runloop/types' {
+  export interface EmberRunTimer {
+    __ember_run_timer_brand__: boolean;
+  }
 }
diff --git a/types/preview/@ember/service/index.d.ts b/types/preview/@ember/service/index.d.ts
index a9fe6f68536..8a3828ed837 100644
--- a/types/preview/@ember/service/index.d.ts
+++ b/types/preview/@ember/service/index.d.ts
@@ -1,24 +1,26 @@
-import EmberObject from '@ember/object';
-import type { BasicComputedProperty } from '@ember/object/computed';
+declare module '@ember/service' {
+  import EmberObject from '@ember/object';
+  import type { BasicComputedProperty } from '@ember/object/computed';
 
-export default class Service extends EmberObject {}
-/**
- * Creates a property that lazily looks up a service in the container. There
- * are no restrictions as to what objects a service can be injected into.
- */
-export function inject(): Service; // @inject() foo, foo: inject()
-export function inject(target: object, propertyKey: string | symbol): void; // @inject foo
-export function inject<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty; // @inject('store') foo      @inject() foo
+  export default class Service extends EmberObject {}
+  /**
+   * Creates a property that lazily looks up a service in the container. There
+   * are no restrictions as to what objects a service can be injected into.
+   */
+  export function inject(): Service; // @inject() foo, foo: inject()
+  export function inject(target: object, propertyKey: string | symbol): void; // @inject foo
+  export function inject<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty; // @inject('store') foo      @inject() foo
 
-/**
- * Creates a property that lazily looks up a service in the container. There
- * are no restrictions as to what objects a service can be injected into.
- */
-export function service(): Service; // @service() foo, foo: service()
-export function service(target: object, propertyKey: string | symbol): void; // @service foo
-export function service<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty; // @service('store') foo      @service() foo
+  /**
+   * Creates a property that lazily looks up a service in the container. There
+   * are no restrictions as to what objects a service can be injected into.
+   */
+  export function service(): Service; // @service() foo, foo: service()
+  export function service(target: object, propertyKey: string | symbol): void; // @service foo
+  export function service<K extends keyof Registry>(name: K): Registry[K] & BasicComputedProperty; // @service('store') foo      @service() foo
 
-// A type registry for Ember `Service`s. Meant to be declaration-merged so
-// string lookups resolve to the correct type.
-// tslint:disable-next-line no-empty-interface strict-export-declare-modifiers
-interface Registry {}
+  // A type registry for Ember `Service`s. Meant to be declaration-merged so
+  // string lookups resolve to the correct type.
+  // tslint:disable-next-line no-empty-interface strict-export-declare-modifiers
+  interface Registry {}
+}
diff --git a/types/preview/@ember/string/index.d.ts b/types/preview/@ember/string/index.d.ts
index 6a6f95b8ed5..965bfd7b842 100644
--- a/types/preview/@ember/string/index.d.ts
+++ b/types/preview/@ember/string/index.d.ts
@@ -1,7 +1,9 @@
-export function camelize(str: string): string;
-export function capitalize(str: string): string;
-export function classify(str: string): string;
-export function dasherize(str: string): string;
-export function decamelize(str: string): string;
-export function underscore(str: string): string;
-export function w(str: string): string[];
+declare module '@ember/string' {
+  export function camelize(str: string): string;
+  export function capitalize(str: string): string;
+  export function classify(str: string): string;
+  export function dasherize(str: string): string;
+  export function decamelize(str: string): string;
+  export function underscore(str: string): string;
+  export function w(str: string): string[];
+}
diff --git a/types/preview/@ember/template/-private/handlebars.d.ts b/types/preview/@ember/template/-private/handlebars.d.ts
index ac9a7eb6fb3..6b4d0985f92 100644
--- a/types/preview/@ember/template/-private/handlebars.d.ts
+++ b/types/preview/@ember/template/-private/handlebars.d.ts
@@ -1,5 +1,7 @@
-export class SafeString {
-  constructor(str: string);
-  toString(): string;
-  toHTML(): string;
+declare module '@ember/template/-private/handlebars' {
+  export class SafeString {
+    constructor(str: string);
+    toString(): string;
+    toHTML(): string;
+  }
 }
diff --git a/types/preview/@ember/template/index.d.ts b/types/preview/@ember/template/index.d.ts
index 9079f7a96f4..32b7d70da6f 100644
--- a/types/preview/@ember/template/index.d.ts
+++ b/types/preview/@ember/template/index.d.ts
@@ -1,3 +1,5 @@
-import { SafeString } from './-private/handlebars';
-export function htmlSafe(str: string): SafeString;
-export function isHTMLSafe(str: unknown): str is SafeString;
+declare module '@ember/template' {
+  import { SafeString } from '@ember/template/-private/handlebars';
+  export function htmlSafe(str: string): SafeString;
+  export function isHTMLSafe(str: unknown): str is SafeString;
+}
diff --git a/types/preview/@ember/test/adapter.d.ts b/types/preview/@ember/test/adapter.d.ts
index a1573f0d416..ac38cd059ba 100644
--- a/types/preview/@ember/test/adapter.d.ts
+++ b/types/preview/@ember/test/adapter.d.ts
@@ -1,20 +1,22 @@
-/**
- * The primary purpose of this class is to create hooks that can be implemented
- * by an adapter for various test frameworks.
- */
-export default class Adapter {
+declare module '@ember/test/adapter' {
   /**
-   * This callback will be called whenever an async operation is about to start.
+   * The primary purpose of this class is to create hooks that can be implemented
+   * by an adapter for various test frameworks.
    */
-  asyncStart(): unknown;
-  /**
-   * This callback will be called whenever an async operation has completed.
-   */
-  asyncEnd(): unknown;
-  /**
-   * Override this method with your testing framework's false assertion.
-   * This function is called whenever an exception occurs causing the testing
-   * promise to fail.
-   */
-  exception(error: string): unknown;
+  export default class Adapter {
+    /**
+     * This callback will be called whenever an async operation is about to start.
+     */
+    asyncStart(): unknown;
+    /**
+     * This callback will be called whenever an async operation has completed.
+     */
+    asyncEnd(): unknown;
+    /**
+     * Override this method with your testing framework's false assertion.
+     * This function is called whenever an exception occurs causing the testing
+     * promise to fail.
+     */
+    exception(error: string): unknown;
+  }
 }
diff --git a/types/preview/@ember/test/index.d.ts b/types/preview/@ember/test/index.d.ts
index 7e78f264120..8d754a27286 100644
--- a/types/preview/@ember/test/index.d.ts
+++ b/types/preview/@ember/test/index.d.ts
@@ -1,47 +1,49 @@
-import Application from '@ember/application';
+declare module '@ember/test' {
+  import Application from '@ember/application';
 
-/**
- * `registerHelper` is used to register a test helper that will be injected
- * when `App.injectTestHelpers` is called.
- */
-export function registerHelper(
-  name: string,
-  helperMethod: (app: Application, ...args: any[]) => unknown,
-  options?: object
-): unknown;
-/**
- * `registerAsyncHelper` is used to register an async test helper that will be injected
- * when `App.injectTestHelpers` is called.
- */
-export function registerAsyncHelper(
-  name: string,
-  helperMethod: (app: Application, ...args: any[]) => unknown
-): void;
+  /**
+   * `registerHelper` is used to register a test helper that will be injected
+   * when `App.injectTestHelpers` is called.
+   */
+  export function registerHelper(
+    name: string,
+    helperMethod: (app: Application, ...args: any[]) => unknown,
+    options?: object
+  ): unknown;
+  /**
+   * `registerAsyncHelper` is used to register an async test helper that will be injected
+   * when `App.injectTestHelpers` is called.
+   */
+  export function registerAsyncHelper(
+    name: string,
+    helperMethod: (app: Application, ...args: any[]) => unknown
+  ): void;
 
-/**
- * Remove a previously added helper method.
- */
-export function unregisterHelper(name: string): void;
+  /**
+   * Remove a previously added helper method.
+   */
+  export function unregisterHelper(name: string): void;
 
-/**
- * This allows ember-testing to play nicely with other asynchronous
- * events, such as an application that is waiting for a CSS3
- * transition or an IndexDB transaction. The waiter runs periodically
- * after each async helper (i.e. `click`, `andThen`, `visit`, etc) has executed,
- * until the returning result is truthy. After the waiters finish, the next async helper
- * is executed and the process repeats.
- */
-export function registerWaiter(callback: () => boolean): unknown;
-export function registerWaiter<Context>(
-  context: Context,
-  callback: (this: Context) => boolean
-): unknown;
-/**
- * `unregisterWaiter` is used to unregister a callback that was
- * registered with `registerWaiter`.
- */
-export function unregisterWaiter(callback: () => boolean): unknown;
-export function unregisterWaiter<Context>(
-  context: Context,
-  callback: (this: Context) => boolean
-): unknown;
+  /**
+   * This allows ember-testing to play nicely with other asynchronous
+   * events, such as an application that is waiting for a CSS3
+   * transition or an IndexDB transaction. The waiter runs periodically
+   * after each async helper (i.e. `click`, `andThen`, `visit`, etc) has executed,
+   * until the returning result is truthy. After the waiters finish, the next async helper
+   * is executed and the process repeats.
+   */
+  export function registerWaiter(callback: () => boolean): unknown;
+  export function registerWaiter<Context>(
+    context: Context,
+    callback: (this: Context) => boolean
+  ): unknown;
+  /**
+   * `unregisterWaiter` is used to unregister a callback that was
+   * registered with `registerWaiter`.
+   */
+  export function unregisterWaiter(callback: () => boolean): unknown;
+  export function unregisterWaiter<Context>(
+    context: Context,
+    callback: (this: Context) => boolean
+  ): unknown;
+}
diff --git a/types/preview/@ember/utils/-private/types.d.ts b/types/preview/@ember/utils/-private/types.d.ts
index a09307c2c40..de5bf83173a 100644
--- a/types/preview/@ember/utils/-private/types.d.ts
+++ b/types/preview/@ember/utils/-private/types.d.ts
@@ -1,7 +1,9 @@
-import type { AnyFn } from 'ember/-private/type-utils';
+declare module '@ember/utils/-private/types' {
+  import type { AnyFn } from 'ember/-private/type-utils';
+  import NativeArray from '@ember/array/-private/native-array';
 
-// prettier-ignore
-type _KeysOfType<Key extends keyof TypeLookup, Type> =
+  // prettier-ignore
+  type _KeysOfType<Key extends keyof TypeLookup, Type> =
     // Checks non-`const` versions, and correctly resolves those types
     // constructed via e.g. the `Number` constructor.
     TypeLookup[Key] extends Type ? Key :
@@ -9,28 +11,29 @@ type _KeysOfType<Key extends keyof TypeLookup, Type> =
     // using a const-valued function like `const x = () => 4 as const`.
     Type extends TypeLookup[Key] ? Key : never;
 
-// prettier-ignore
-type KeysOfType<Type> =
+  // prettier-ignore
+  type KeysOfType<Type> =
     { [Key in keyof TypeLookup]: _KeysOfType<Key, Type> }[keyof TypeLookup];
 
-// Since `TypeLookup` resolves all *other* types, including `null` and
-// `undefined`, we can assume that if the type does *not* resolve from
-// `KeysOfType`, it is safe to treat it as 'object'.
-export type TypeOf<T> = KeysOfType<T> extends never ? 'object' : KeysOfType<T>;
+  // Since `TypeLookup` resolves all *other* types, including `null` and
+  // `undefined`, we can assume that if the type does *not* resolve from
+  // `KeysOfType`, it is safe to treat it as 'object'.
+  export type TypeOf<T> = KeysOfType<T> extends never ? 'object' : KeysOfType<T>;
 
-export interface TypeLookup {
-  string: string;
-  number: number;
-  boolean: boolean;
-  regexp: RegExp;
-  function: AnyFn;
-  array: unknown[];
-  error: Error;
-  filelist: FileList;
-  date: Date;
-  null: null;
-  undefined: undefined;
-}
+  export interface TypeLookup {
+    string: string;
+    number: number;
+    boolean: boolean;
+    regexp: RegExp;
+    function: AnyFn;
+    array: Array<unknown> | NativeArray<unknown>;
+    error: Error;
+    filelist: FileList;
+    date: Date;
+    null: null;
+    undefined: undefined;
+  }
 
-// Don't export anything but the required type util
-export {};
+  // Don't export anything but the required type util
+  export {};
+}
diff --git a/types/preview/@ember/utils/index.d.ts b/types/preview/@ember/utils/index.d.ts
index d28098e176b..be432898ad4 100644
--- a/types/preview/@ember/utils/index.d.ts
+++ b/types/preview/@ember/utils/index.d.ts
@@ -1,41 +1,42 @@
-import type { TypeOf } from './-private/types';
+declare module '@ember/utils' {
+  import { TypeOf } from '@ember/utils/-private/types';
 
-/**
- * Compares two javascript values and returns:
- */
-export function compare(v: unknown, w: unknown): number;
+  /**
+   * Compares two javascript values and returns:
+   */
+  export function compare(v: unknown, w: unknown): number;
 
-/**
- * A value is blank if it is empty or a whitespace string.
- */
-export function isBlank(obj?: unknown): boolean;
+  /**
+   * A value is blank if it is empty or a whitespace string.
+   */
+  export function isBlank(obj?: unknown): boolean;
 
-/**
- * Verifies that a value is `null` or an empty string, empty array,
- * or empty function.
- */
-export function isEmpty(obj?: unknown): boolean;
+  /**
+   * Verifies that a value is `null` or an empty string, empty array,
+   * or empty function.
+   */
+  export function isEmpty(obj?: unknown): boolean;
 
-/**
- * Compares two objects, returning true if they are equal.
- */
-export function isEqual(a: unknown, b: unknown): boolean;
+  /**
+   * Compares two objects, returning true if they are equal.
+   */
+  export function isEqual(a: unknown, b: unknown): boolean;
 
-/**
- * Returns true if the passed value is null or undefined. This avoids errors
- * from JSLint complaining about use of ==, which can be technically
- * confusing.
- */
-export function isNone(obj?: unknown): obj is null | undefined;
+  /**
+   * Returns true if the passed value is null or undefined. This avoids errors
+   * from JSLint complaining about use of ==, which can be technically
+   * confusing.
+   */
+  export function isNone(obj?: unknown): obj is null | undefined;
 
-/**
- * A value is present if it not `isBlank`.
- */
-export function isPresent(obj?: unknown): boolean;
+  /**
+   * A value is present if it not `isBlank`.
+   */
+  export function isPresent(obj?: unknown): boolean;
 
-/**
- * Returns a consistent type for the passed object.
- */
-export function typeOf<T>(value: T): TypeOf<T>;
-export function typeOf(): 'undefined';
-export function typeOf(item: unknown): string;
+  /**
+   * Returns a consistent type for the passed object.
+   */
+  export function typeOf<T>(value: T): TypeOf<T>;
+  export function typeOf(): 'undefined';
+}
diff --git a/types/preview/ember/-private/type-utils.d.ts b/types/preview/ember/-private/type-utils.d.ts
index a40275e657b..f0dca1fab68 100644
--- a/types/preview/ember/-private/type-utils.d.ts
+++ b/types/preview/ember/-private/type-utils.d.ts
@@ -1,52 +1,54 @@
-// These are utility types used throughout the Ember type definitions. They
-// should *never* be used in end user code.
+declare module 'ember/-private/type-utils' {
+  // These are utility types used throughout the Ember type definitions. They
+  // should *never* be used in end user code.
 
-/** A safe-ish type representing any function. */
-export type AnyFn = (...args: any[]) => unknown;
+  /** A safe-ish type representing any function. */
+  export type AnyFn = (...args: any[]) => unknown;
 
-export type AnyMethod<Target> = (this: Target, ...args: any[]) => unknown;
+  export type AnyMethod<Target> = (this: Target, ...args: any[]) => unknown;
 
-export type MethodsOf<O> = {
-  [K in keyof O]: O[K] extends AnyFn ? O[K] : never;
-};
+  export type MethodsOf<O> = {
+    [K in keyof O]: O[K] extends AnyFn ? O[K] : never;
+  };
 
-// Not just `keyof MethodsOf<O>` because that doesn't correctly exclude all the
-// `never` fields.
-export type MethodNamesOf<O> = {
-  [K in keyof O]: O[K] extends AnyFn ? K : never;
-}[keyof O];
+  // Not just `keyof MethodsOf<O>` because that doesn't correctly exclude all the
+  // `never` fields.
+  export type MethodNamesOf<O> = {
+    [K in keyof O]: O[K] extends AnyFn ? K : never;
+  }[keyof O];
 
-export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
+  export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
 
-export type MethodReturns<T, M extends MethodNamesOf<T>> = ReturnType<MethodsOf<T>[M]>;
+  export type MethodReturns<T, M extends MethodNamesOf<T>> = ReturnType<MethodsOf<T>[M]>;
 
-// prettier-ignore
-/** Get the return value of a method string name or a function. */
-export type EmberMethodParams<T, M extends EmberMethod<T>> =
+  // prettier-ignore
+  /** Get the return value of a method string name or a function. */
+  export type EmberMethodParams<T, M extends EmberMethod<T>> =
   M extends AnyMethod<T> ? Parameters<M> :
   M extends keyof T ? T[M] extends AnyMethod<T> ? Parameters<MethodsOf<T>[M]> : never :
   never;
 
-// prettier-ignore
-/** Get the return value of a method string name or a function. */
-export type EmberMethodReturn<T, M extends EmberMethod<T>> =
+  // prettier-ignore
+  /** Get the return value of a method string name or a function. */
+  export type EmberMethodReturn<T, M extends EmberMethod<T>> =
   M extends AnyMethod<T> ? ReturnType<M> :
   M extends keyof T ? T[M] extends AnyMethod<T> ? ReturnType<MethodsOf<T>[M]> : never :
   never;
 
-/**
- * A type utility for Ember's common name-of-object-on-target-or-function
- * pattern for e.g. event handlers.
- */
-export type EmberMethod<Target> = AnyMethod<Target> | keyof Target;
-
-// A way of representing non-user-constructible types. You can conveniently use
-// this by doing `interface Type extends Data<'some-type-name'> { ... }` for
-// simple types, and/or you can type-parameterize it as makes sense for your use
-// case (see e.g. `@ember/component/helper`'s use with functional helpers).
-declare const Data: unique symbol;
-export class Opaque<Data> {
-  private declare [Data]: Data;
+  /**
+   * A type utility for Ember's common name-of-object-on-target-or-function
+   * pattern for e.g. event handlers.
+   */
+  export type EmberMethod<Target> = AnyMethod<Target> | keyof Target;
+
+  // A way of representing non-user-constructible types. You can conveniently use
+  // this by doing `interface Type extends Data<'some-type-name'> { ... }` for
+  // simple types, and/or you can type-parameterize it as makes sense for your use
+  // case (see e.g. `@ember/component/helper`'s use with functional helpers).
+  const Data: unique symbol;
+  export class Opaque<Data> {
+    private declare [Data]: Data;
+  }
+
+  export {};
 }
-
-export {};
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index 81f76ca76f1..285250f392a 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -1,382 +1,382 @@
-// Capitalization is intentional: this makes it much easier to re-export RSVP on
-// the Ember namespace.
-import Rsvp from 'rsvp';
+declare module 'ember' {
+  // Capitalization is intentional: this makes it much easier to re-export RSVP on
+  // the Ember namespace.
+  import Rsvp from 'rsvp';
 
-import type { Registry as ControllerRegistry } from '@ember/controller';
-import type * as EmberStringNs from '@ember/string';
-import type * as EmberTemplateNs from '@ember/template';
-import * as EmberTemplateHandlebarsNs from '@ember/template/-private/handlebars';
-// tslint:disable-next-line:no-duplicate-imports
-import type * as EmberServiceNs from '@ember/service';
-import type * as EmberPolyfillsNs from '@ember/polyfills';
-import type * as EmberUtilsNs from '@ember/utils';
-import type * as EmberRunloopNs from '@ember/runloop';
-import * as EmberObjectNs from '@ember/object';
-import type * as EmberObjectObserversNs from '@ember/object/observers';
-import * as EmberObjectProxyNs from '@ember/object/proxy';
-import type * as EmberObjectPromiseProxyNs from '@ember/object/promise-proxy-mixin';
-import type * as EmberObjectInternalsNs from '@ember/object/internals';
-import * as EmberObjectComputedNs from '@ember/object/computed';
-import type * as EmberObjectEventedNs from '@ember/object/evented';
-import type * as EmberObjectEventsNs from '@ember/object/events';
-// @ember/debug
-import type * as EmberDebugNs from '@ember/debug';
-import _ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
-import EmberDataAdapter from '@ember/debug/data-adapter';
-// @ember/engine
-import * as EmberEngineNs from '@ember/engine';
-import * as EmberEngineInstanceNs from '@ember/engine/instance';
-import EmberCoreObject from '@ember/object/core';
-import * as EmberApplicationNs from '@ember/application';
-import * as EmberApplicationInstanceNs from '@ember/application/instance';
-import type * as EmberApplicationDeprecateNs from '@ember/application/deprecations';
-import type * as EmberTestNs from '@ember/test';
-// tslint:disable-next-line:no-duplicate-imports
-import * as EmberControllerNs from '@ember/controller';
-// tslint:disable-next-line:no-duplicate-imports
-import EmberMixin from '@ember/object/mixin';
-import type EmberObservable from '@ember/object/observable';
-// @ember/array
-import type * as EmberArrayNs from '@ember/array';
-import type EmberMutableArray from '@ember/array/mutable';
-import type EmberNativeArray from '@ember/array/-private/native-array';
-import EmberArrayProxy from '@ember/array/proxy';
-import type EmberEnumerable from '@ember/array/-private/enumerable';
-import type EmberMutableEnumerable from '@ember/array/-private/mutable-enumerable';
-import type EmberArrayProtoExtensions from '@ember/array/types/prototype-extensions';
-// @ember/error
-import type EmberError from '@ember/error';
+  import type { Registry as ControllerRegistry } from '@ember/controller';
+  import type * as EmberStringNs from '@ember/string';
+  import type * as EmberTemplateNs from '@ember/template';
+  import * as EmberTemplateHandlebarsNs from '@ember/template/-private/handlebars';
+  // tslint:disable-next-line:no-duplicate-imports
+  import type * as EmberServiceNs from '@ember/service';
+  import type * as EmberPolyfillsNs from '@ember/polyfills';
+  import type * as EmberUtilsNs from '@ember/utils';
+  import type * as EmberRunloopNs from '@ember/runloop';
+  import * as EmberObjectNs from '@ember/object';
+  import type * as EmberObjectObserversNs from '@ember/object/observers';
+  import * as EmberObjectProxyNs from '@ember/object/proxy';
+  import type * as EmberObjectPromiseProxyNs from '@ember/object/promise-proxy-mixin';
+  import type * as EmberObjectInternalsNs from '@ember/object/internals';
+  import * as EmberObjectComputedNs from '@ember/object/computed';
+  import type * as EmberObjectEventedNs from '@ember/object/evented';
+  import type * as EmberObjectEventsNs from '@ember/object/events';
+  // @ember/debug
+  import type * as EmberDebugNs from '@ember/debug';
+  import _ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+  import EmberDataAdapter from '@ember/debug/data-adapter';
+  // @ember/engine
+  import * as EmberEngineNs from '@ember/engine';
+  import * as EmberEngineInstanceNs from '@ember/engine/instance';
+  import EmberCoreObject from '@ember/object/core';
+  import * as EmberApplicationNs from '@ember/application';
+  import * as EmberApplicationInstanceNs from '@ember/application/instance';
+  import type * as EmberApplicationDeprecateNs from '@ember/application/deprecations';
+  import type * as EmberTestNs from '@ember/test';
+  // tslint:disable-next-line:no-duplicate-imports
+  import * as EmberControllerNs from '@ember/controller';
+  // tslint:disable-next-line:no-duplicate-imports
+  import EmberMixin from '@ember/object/mixin';
+  import type EmberObservable from '@ember/object/observable';
+  // @ember/array
+  import type * as EmberArrayNs from '@ember/array';
+  import type EmberMutableArray from '@ember/array/mutable';
+  import type EmberNativeArray from '@ember/array/-private/native-array';
+  import EmberArrayProxy from '@ember/array/proxy';
+  import type EmberEnumerable from '@ember/array/-private/enumerable';
+  import type EmberMutableEnumerable from '@ember/array/-private/mutable-enumerable';
+  import type EmberArrayProtoExtensions from '@ember/array/types/prototype-extensions';
+  // @ember/error
+  import type EmberError from '@ember/error';
 
-type EmberArray<T> = EmberArrayNs.default<T>;
-import type EmberActionHandler from '@ember/object/-private/action-handler';
-import EmberComponent from '@ember/component';
-import EmberHelper from '@ember/component/helper';
-// @ember/routing
-import EmberRoutingRouter from '@ember/routing/router';
-import EmberRoutingRoute from '@ember/routing/route';
-import EmberRoutingHashLocation from '@ember/routing/hash-location';
-import EmberRoutingHistoryLocation from '@ember/routing/history-location';
-import EmberRoutingNoneLocation from '@ember/routing/none-location';
-// @ember/application
-import EmberEventDispatcher from '@ember/application/-private/event-dispatcher';
-import EmberRegistry from '@ember/application/-private/registry';
-// @ember/test
-import EmberTestAdapter from '@ember/test/adapter';
+  type EmberArray<T> = EmberArrayNs.default<T>;
+  import type EmberActionHandler from '@ember/object/-private/action-handler';
+  import EmberComponent from '@ember/component';
+  import EmberHelper from '@ember/component/helper';
+  // @ember/routing
+  import EmberRoutingRouter from '@ember/routing/router';
+  import EmberRoutingRoute from '@ember/routing/route';
+  import EmberRoutingHashLocation from '@ember/routing/hash-location';
+  import EmberRoutingHistoryLocation from '@ember/routing/history-location';
+  import EmberRoutingNoneLocation from '@ember/routing/none-location';
+  // @ember/application
+  import EmberEventDispatcher from '@ember/application/-private/event-dispatcher';
+  import EmberRegistry from '@ember/application/-private/registry';
+  // @ember/test
+  import EmberTestAdapter from '@ember/test/adapter';
 
-export namespace Ember {
-  export const A: typeof EmberArrayNs.A;
-  export const isArray: typeof EmberArrayNs.isArray;
-  export type Enumerable<T> = EmberEnumerable<T>;
-  export const Enumerable: typeof EmberEnumerable;
-  export class ArrayProxy<T> extends EmberArrayProxy<T> {}
-  export type Array<T> = EmberArray<T>;
-  export const Array: typeof EmberArrayNs.default;
-  export type MutableArray<T> = EmberMutableArray<T>;
-  export const MutableArray: typeof EmberMutableArray;
-  export type NativeArray<T> = EmberNativeArray<T>;
-  export const NativeArray: typeof EmberNativeArray;
-  export type MutableEnumerable<T> = EmberMutableEnumerable<T>;
-  export const MutableEnumerable: typeof EmberMutableEnumerable;
-  export class Router extends EmberRoutingRouter {}
-  export class Route extends EmberRoutingRoute {}
-  export const ActionHandler: typeof EmberActionHandler;
-  export class Controller extends EmberControllerNs.default {}
-  export class Component extends EmberComponent {}
-  export class Helper extends EmberHelper {}
+  namespace Ember {
+    export const A: typeof EmberArrayNs.A;
+    export const isArray: typeof EmberArrayNs.isArray;
+    export type Enumerable = EmberEnumerable;
+    export const Enumerable: typeof EmberEnumerable;
+    export class ArrayProxy<T> extends EmberArrayProxy<T> {}
+    export type Array<T> = EmberArray<T>;
+    export const Array: typeof EmberArrayNs.default;
+    export type MutableArray<T> = EmberMutableArray<T>;
+    export const MutableArray: typeof EmberMutableArray;
+    export type NativeArray<T> = EmberNativeArray<T>;
+    export const NativeArray: typeof EmberNativeArray;
+    export type MutableEnumerable = EmberMutableEnumerable;
+    export const MutableEnumerable: typeof EmberMutableEnumerable;
+    export class Router extends EmberRoutingRouter {}
+    export class Route extends EmberRoutingRoute {}
+    export const ActionHandler: typeof EmberActionHandler;
+    export class Controller extends EmberControllerNs.default {}
+    export class Component extends EmberComponent {}
+    export class Helper extends EmberHelper {}
 
-  export class HashLocation extends EmberRoutingHashLocation {}
-  export class NoneLocation extends EmberRoutingNoneLocation {}
-  export class HistoryLocation extends EmberRoutingHistoryLocation {}
-  export const deprecateFunc: typeof EmberApplicationDeprecateNs.deprecateFunc;
-  export const deprecate: typeof EmberApplicationDeprecateNs.deprecate;
-  export const getOwner: typeof EmberApplicationNs.getOwner;
-  export const setOwner: typeof EmberApplicationNs.setOwner;
-  export class EventDispatcher extends EmberEventDispatcher {}
-  export class Registry extends EmberRegistry {}
-  export interface ArrayPrototypeExtensions<T> extends EmberArrayProtoExtensions<T> {}
+    export class HashLocation extends EmberRoutingHashLocation {}
+    export class NoneLocation extends EmberRoutingNoneLocation {}
+    export class HistoryLocation extends EmberRoutingHistoryLocation {}
+    export const deprecateFunc: typeof EmberApplicationDeprecateNs.deprecateFunc;
+    export const deprecate: typeof EmberApplicationDeprecateNs.deprecate;
+    export const getOwner: typeof EmberApplicationNs.getOwner;
+    export const setOwner: typeof EmberApplicationNs.setOwner;
+    export class EventDispatcher extends EmberEventDispatcher {}
+    export class Registry extends EmberRegistry {}
+    export interface ArrayPrototypeExtensions<T> extends EmberArrayProtoExtensions<T> {}
 
-  /**
-   * Implements some standard methods for comparing objects. Add this mixin to
-   * any class you create that can compare its instances.
-   */
-  export interface Comparable {
-    compare(a: unknown, b: unknown): number;
-  }
-  const Comparable: EmberMixin;
-  class ComputedProperty extends EmberObjectComputedNs.default {}
-  /**
-   * A container used to instantiate and cache objects.
-   */
-  class Container {
     /**
-     * Given a fullName, return the corresponding factory. The consumer of the factory
-     * is responsible for the destruction of any factory instances, as there is no
-     * way for the container to ensure instances are destroyed when it itself is
-     * destroyed.
+     * Implements some standard methods for comparing objects. Add this mixin to
+     * any class you create that can compare its instances.
      */
-    factoryFor(fullName: string, options?: {}): unknown;
-  }
-  class ContainerDebugAdapter extends _ContainerDebugAdapter {}
-
-  // TODO: replace with a proper ES6 reexport once we remove declare module 'ember' {}
-  class Object extends EmberObjectNs.default {}
-  class ObjectProxy extends EmberObjectProxyNs.default {}
-  const Observable: typeof EmberObservable;
-  const PromiseProxyMixin: typeof EmberObjectPromiseProxyNs.default;
-  interface PromiseProxyMixin<T> extends EmberObjectPromiseProxyNs.default<T> {}
-  class CoreObject extends EmberCoreObject {}
-  class DataAdapter extends EmberDataAdapter {}
-  const Debug: {
-    registerDeprecationHandler: typeof EmberDebugNs.registerDeprecationHandler;
-    registerWarnHandler: typeof EmberDebugNs.registerWarnHandler;
-  };
-  class EngineInstance extends EmberEngineInstanceNs.default {}
-  class Engine extends EmberEngineNs.default {}
-
-  /**
-   * A subclass of the JavaScript Error object for use in Ember.
-   */
-  const Error: typeof EmberError;
-
-  const Evented: typeof EmberObjectEventedNs.default;
-  interface Evented extends EmberObjectEventedNs.default {}
+    export interface Comparable {
+      compare(a: unknown, b: unknown): number;
+    }
+    const Comparable: EmberMixin;
+    class ComputedProperty extends EmberObjectComputedNs.default {}
+    /**
+     * A container used to instantiate and cache objects.
+     */
+    class Container {
+      /**
+       * Given a fullName, return the corresponding factory. The consumer of the factory
+       * is responsible for the destruction of any factory instances, as there is no
+       * way for the container to ensure instances are destroyed when it itself is
+       * destroyed.
+       */
+      factoryFor(fullName: string, options?: {}): unknown;
+    }
+    class ContainerDebugAdapter extends _ContainerDebugAdapter {}
 
-  class Mixin extends EmberMixin {}
+    class Object extends EmberObjectNs.default {}
+    class ObjectProxy extends EmberObjectProxyNs.default {}
+    const Observable: typeof EmberObservable;
+    const PromiseProxyMixin: typeof EmberObjectPromiseProxyNs.default;
+    interface PromiseProxyMixin<T> extends EmberObjectPromiseProxyNs.default<T> {}
+    class CoreObject extends EmberCoreObject {}
+    class DataAdapter extends EmberDataAdapter {}
+    const Debug: {
+      registerDeprecationHandler: typeof EmberDebugNs.registerDeprecationHandler;
+      registerWarnHandler: typeof EmberDebugNs.registerWarnHandler;
+    };
+    class EngineInstance extends EmberEngineInstanceNs.default {}
+    class Engine extends EmberEngineNs.default {}
 
-  /**
-   * A Namespace is an object usually used to contain other objects or methods
-   * such as an application or framework. Create a namespace anytime you want
-   * to define one of these new containers.
-   */
-  class Namespace extends Object {}
+    /**
+     * A subclass of the JavaScript Error object for use in Ember.
+     */
+    const Error: typeof EmberError;
 
-  class Service extends Object {}
+    const Evented: typeof EmberObjectEventedNs.default;
+    interface Evented extends EmberObjectEventedNs.default {}
 
-  interface ViewTargetActionSupport {
-    target: unknown;
-    actionContext: unknown;
-  }
-  const ViewTargetActionSupport: Mixin;
-  const ViewUtils: {
-    isSimpleClick(event: Event): boolean;
-  };
+    class Mixin extends EmberMixin {}
 
-  // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
-  const RSVP: typeof Rsvp;
-  namespace RSVP {
-    type Promise<T> = Rsvp.Promise<T>;
-  }
-  class Application extends EmberApplicationNs.default {}
-  class ApplicationInstance extends EmberApplicationInstanceNs.default {}
-  /**
-   * This is a container for an assortment of testing related functionality
-   */
-  namespace Test {
-    class Adapter extends EmberTestAdapter {}
-    const registerHelper: typeof EmberTestNs.registerHelper;
-    const unregisterHelper: typeof EmberTestNs.unregisterHelper;
-    const registerWaiter: typeof EmberTestNs.registerWaiter;
-    const unregisterWaiter: typeof EmberTestNs.unregisterWaiter;
-    const registerAsyncHelper: typeof EmberTestNs.registerAsyncHelper;
-    /**
-     * Used to register callbacks to be fired whenever `App.injectTestHelpers`
-     * is called.
-     */
-    function onInjectHelpers(callback: (app: Application) => void): void;
     /**
-     * This returns a thenable tailored for testing.  It catches failed
-     * `onSuccess` callbacks and invokes the `Ember.Test.adapter.exception`
-     * callback in the last chained then.
+     * A Namespace is an object usually used to contain other objects or methods
+     * such as an application or framework. Create a namespace anytime you want
+     * to define one of these new containers.
      */
-    function promise<T>(
-      resolver: (
-        resolve: (value?: T | PromiseLike<T>) => void,
-        reject: (reason?: unknown) => void
-      ) => void,
-      label?: string
-    ): Promise<T>;
-    /**
-     * Replacement for `Ember.RSVP.resolve`
-     * The only difference is this uses
-     * an instance of `Ember.Test.Promise`
-     */
-    function resolve<T>(value?: T | PromiseLike<T>, label?: string): Promise<T>;
+    class Namespace extends Object {}
 
-    /**
-     * Iterates through each registered test waiter, and invokes
-     * its callback. If any waiter returns false, this method will return
-     * true indicating that the waiters have not settled yet.
-     */
-    function checkWaiters(): boolean;
-    /**
-     * Used to allow ember-testing to communicate with a specific testing
-     * framework.
-     */
-    const adapter: EmberTestAdapter;
+    class Service extends Object {}
 
+    interface ViewTargetActionSupport {
+      target: unknown;
+      actionContext: unknown;
+    }
+    const ViewTargetActionSupport: Mixin;
+    const ViewUtils: {
+      isSimpleClick(event: Event): boolean;
+    };
+
+    // FYI - RSVP source comes from https://github.com/tildeio/rsvp.js/blob/master/lib/rsvp/promise.js
+    const RSVP: typeof Rsvp;
+    namespace RSVP {
+      type Promise<T> = Rsvp.Promise<T>;
+    }
+    class Application extends EmberApplicationNs.default {}
+    class ApplicationInstance extends EmberApplicationInstanceNs.default {}
     /**
-     * This class implements the methods defined by Ember.Test.Adapter for the
-     * QUnit testing framework.
+     * This is a container for an assortment of testing related functionality
      */
-    class QUnitAdapter extends EmberTestAdapter {}
-    class Promise<T> extends Rsvp.Promise<T> {
-      constructor(
-        executor: (
+    namespace Test {
+      class Adapter extends EmberTestAdapter {}
+      const registerHelper: typeof EmberTestNs.registerHelper;
+      const unregisterHelper: typeof EmberTestNs.unregisterHelper;
+      const registerWaiter: typeof EmberTestNs.registerWaiter;
+      const unregisterWaiter: typeof EmberTestNs.unregisterWaiter;
+      const registerAsyncHelper: typeof EmberTestNs.registerAsyncHelper;
+      /**
+       * Used to register callbacks to be fired whenever `App.injectTestHelpers`
+       * is called.
+       */
+      function onInjectHelpers(callback: (app: Application) => void): void;
+      /**
+       * This returns a thenable tailored for testing.  It catches failed
+       * `onSuccess` callbacks and invokes the `Ember.Test.adapter.exception`
+       * callback in the last chained then.
+       */
+      function promise<T>(
+        resolver: (
           resolve: (value?: T | PromiseLike<T>) => void,
           reject: (reason?: unknown) => void
-        ) => void
-      );
+        ) => void,
+        label?: string
+      ): Promise<T>;
+      /**
+       * Replacement for `Ember.RSVP.resolve`
+       * The only difference is this uses
+       * an instance of `Ember.Test.Promise`
+       */
+      function resolve<T>(value?: T | PromiseLike<T>, label?: string): Promise<T>;
+
+      /**
+       * Iterates through each registered test waiter, and invokes
+       * its callback. If any waiter returns false, this method will return
+       * true indicating that the waiters have not settled yet.
+       */
+      function checkWaiters(): boolean;
+      /**
+       * Used to allow ember-testing to communicate with a specific testing
+       * framework.
+       */
+      const adapter: EmberTestAdapter;
+
+      /**
+       * This class implements the methods defined by Ember.Test.Adapter for the
+       * QUnit testing framework.
+       */
+      class QUnitAdapter extends EmberTestAdapter {}
+      class Promise<T> extends Rsvp.Promise<T> {
+        constructor(
+          executor: (
+            resolve: (value?: T | PromiseLike<T>) => void,
+            reject: (reason?: unknown) => void
+          ) => void
+        );
+      }
     }
-  }
-  /**
-   * Namespace for injection helper methods.
-   */
-  namespace inject {
     /**
-     * Creates a property that lazily looks up another controller in the container.
-     * Can only be used when defining another controller.
+     * Namespace for injection helper methods.
      */
-    function controller(): Controller;
-    function controller<K extends keyof ControllerRegistry>(
-      name: K
-    ): ControllerRegistry[K] & EmberObjectComputedNs.BasicComputedProperty;
-    const service: typeof EmberServiceNs.inject;
-  }
-  namespace ENV {
-    const EXTEND_PROTOTYPES: {
-      Array: boolean;
-      Function: boolean;
-      String: boolean;
-    };
-    const LOG_BINDINGS: boolean;
-    const LOG_STACKTRACE_ON_DEPRECATION: boolean;
-    const LOG_VERSION: boolean;
-    const MODEL_FACTORY_INJECTIONS: boolean;
-    const RAISE_ON_DEPRECATION: boolean;
-  }
-  namespace Handlebars {
-    function compile(string: string): (...args: any[]) => any;
-    function compile(environment: any, options?: any, context?: any, asObject?: any): any;
-    function precompile(string: string, options: any): void;
-    class Compiler {}
-    class JavaScriptCompiler {}
-    function registerPartial(name: string, str: any): void;
-    function createFrame(objec: any): any;
-    function Exception(message: string): void;
-    class SafeString extends EmberTemplateHandlebarsNs.SafeString {}
-    function parse(string: string): any;
-    function print(ast: any): void;
-    function log(level: string, str: string): void;
-    function registerHelper(name: string, helper: any): void;
-  }
-  namespace String {
-    const camelize: typeof EmberStringNs.camelize;
-    const capitalize: typeof EmberStringNs.capitalize;
-    const classify: typeof EmberStringNs.classify;
-    const dasherize: typeof EmberStringNs.dasherize;
-    const decamelize: typeof EmberStringNs.decamelize;
-    function fmt(...args: string[]): string;
-    const htmlSafe: typeof EmberTemplateNs.htmlSafe;
-    const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
-    const underscore: typeof EmberStringNs.underscore;
-    const w: typeof EmberStringNs.w;
-  }
-  namespace Template {
-    const htmlSafe: typeof EmberTemplateNs.htmlSafe;
-    const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
-  }
-  const computed: typeof EmberObjectNs.computed & typeof EmberObjectComputedNs;
+    namespace inject {
+      /**
+       * Creates a property that lazily looks up another controller in the container.
+       * Can only be used when defining another controller.
+       */
+      function controller(): Controller;
+      function controller<K extends keyof ControllerRegistry>(
+        name: K
+      ): ControllerRegistry[K] & EmberObjectComputedNs.BasicComputedProperty;
+      const service: typeof EmberServiceNs.inject;
+    }
+    namespace ENV {
+      const EXTEND_PROTOTYPES: {
+        Array: boolean;
+        Function: boolean;
+        String: boolean;
+      };
+      const LOG_BINDINGS: boolean;
+      const LOG_STACKTRACE_ON_DEPRECATION: boolean;
+      const LOG_VERSION: boolean;
+      const MODEL_FACTORY_INJECTIONS: boolean;
+      const RAISE_ON_DEPRECATION: boolean;
+    }
+    namespace Handlebars {
+      function compile(string: string): (...args: any[]) => any;
+      function compile(environment: any, options?: any, context?: any, asObject?: any): any;
+      function precompile(string: string, options: any): void;
+      class Compiler {}
+      class JavaScriptCompiler {}
+      function registerPartial(name: string, str: any): void;
+      function createFrame(objec: any): any;
+      function Exception(message: string): void;
+      class SafeString extends EmberTemplateHandlebarsNs.SafeString {}
+      function parse(string: string): any;
+      function print(ast: any): void;
+      function log(level: string, str: string): void;
+      function registerHelper(name: string, helper: any): void;
+    }
+    namespace String {
+      const camelize: typeof EmberStringNs.camelize;
+      const capitalize: typeof EmberStringNs.capitalize;
+      const classify: typeof EmberStringNs.classify;
+      const dasherize: typeof EmberStringNs.dasherize;
+      const decamelize: typeof EmberStringNs.decamelize;
+      function fmt(...args: string[]): string;
+      const htmlSafe: typeof EmberTemplateNs.htmlSafe;
+      const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
+      const underscore: typeof EmberStringNs.underscore;
+      const w: typeof EmberStringNs.w;
+    }
+    namespace Template {
+      const htmlSafe: typeof EmberTemplateNs.htmlSafe;
+      const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
+    }
+    const computed: typeof EmberObjectNs.computed & typeof EmberObjectComputedNs;
 
-  // Shenanigans to make `run` both callable and a namespace safely, while not
-  // making the `run.bind` call resolve to `Function.prototype.bind`. (Yes,
-  // insert :upside-down-smiley: here.)
-  // 1. Get the type side of the namespace.
-  type EmberRunloop = typeof EmberRunloopNs;
-  // 2. Use it to get an interface representing the callable side of `run`.
-  type RunFn = EmberRunloop['run'];
-  // type RunFn = Pick<EmberRunloop, 'run'>['run'];
-  // 3. Merge the two together so that the public-facing type of `run` is both
-  //    the plucked-off run type *and* the namespace.
-  interface Run extends RunFn, EmberRunloop {}
-  const run: Run;
+    // Shenanigans to make `run` both callable and a namespace safely, while not
+    // making the `run.bind` call resolve to `Function.prototype.bind`. (Yes,
+    // insert :upside-down-smiley: here.)
+    // 1. Get the type side of the namespace.
+    type EmberRunloop = typeof EmberRunloopNs;
+    // 2. Use it to get an interface representing the callable side of `run`.
+    type RunFn = EmberRunloop['run'];
+    // type RunFn = Pick<EmberRunloop, 'run'>['run'];
+    // 3. Merge the two together so that the public-facing type of `run` is both
+    //    the plucked-off run type *and* the namespace.
+    interface Run extends RunFn, EmberRunloop {}
+    const run: Run;
 
-  const platform: {
-    defineProperty: boolean;
-    hasPropertyAccessors: boolean;
-  };
+    const platform: {
+      defineProperty: boolean;
+      hasPropertyAccessors: boolean;
+    };
 
-  /**
-   * `getEngineParent` retrieves an engine instance's parent instance.
-   */
-  function getEngineParent(engine: EngineInstance): EngineInstance;
+    /**
+     * `getEngineParent` retrieves an engine instance's parent instance.
+     */
+    function getEngineParent(engine: EngineInstance): EngineInstance;
 
-  const assert: typeof EmberDebugNs.assert;
-  const debug: typeof EmberDebugNs.debug;
-  const defineProperty: typeof EmberObjectNs.defineProperty;
+    const assert: typeof EmberDebugNs.assert;
+    const debug: typeof EmberDebugNs.debug;
+    const defineProperty: typeof EmberObjectNs.defineProperty;
 
-  const runInDebug: typeof EmberDebugNs.runInDebug;
-  const warn: typeof EmberDebugNs.warn;
-  const cacheFor: typeof EmberObjectInternalsNs.cacheFor;
-  const addListener: typeof EmberObjectEventsNs.addListener;
-  const removeListener: typeof EmberObjectEventsNs.removeListener;
-  const sendEvent: typeof EmberObjectEventsNs.sendEvent;
-  const on: typeof EmberObjectEventedNs.on;
+    const runInDebug: typeof EmberDebugNs.runInDebug;
+    const warn: typeof EmberDebugNs.warn;
+    const cacheFor: typeof EmberObjectInternalsNs.cacheFor;
+    const addListener: typeof EmberObjectEventsNs.addListener;
+    const removeListener: typeof EmberObjectEventsNs.removeListener;
+    const sendEvent: typeof EmberObjectEventsNs.sendEvent;
+    const on: typeof EmberObjectEventedNs.on;
 
-  const htmlSafe: typeof EmberTemplateNs.htmlSafe;
-  const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
+    const htmlSafe: typeof EmberTemplateNs.htmlSafe;
+    const isHTMLSafe: typeof EmberTemplateNs.isHTMLSafe;
 
-  const isBlank: typeof EmberUtilsNs.isBlank;
-  const isEmpty: typeof EmberUtilsNs.isEmpty;
-  const isNone: typeof EmberUtilsNs.isNone;
-  const isPresent: typeof EmberUtilsNs.isPresent;
+    const isBlank: typeof EmberUtilsNs.isBlank;
+    const isEmpty: typeof EmberUtilsNs.isEmpty;
+    const isNone: typeof EmberUtilsNs.isNone;
+    const isPresent: typeof EmberUtilsNs.isPresent;
 
-  const observer: typeof EmberObjectNs.observer;
-  const addObserver: typeof EmberObjectObserversNs.addObserver;
-  const removeObserver: typeof EmberObjectObserversNs.removeObserver;
-  const get: typeof EmberObjectNs.get;
-  const notifyPropertyChange: typeof EmberObjectNs.notifyPropertyChange;
-  const getProperties: typeof EmberObjectNs.getProperties;
-  const setProperties: typeof EmberObjectNs.setProperties;
-  const set: typeof EmberObjectNs.set;
-  const trySet: typeof EmberObjectNs.trySet;
-  const compare: typeof EmberUtilsNs.compare;
-  /**
-   * Creates a shallow copy of the passed object. A deep copy of the object is
-   * returned if the optional `deep` argument is `true`.
-   */
-  const isEqual: typeof EmberUtilsNs.isEqual;
-  const typeOf: typeof EmberUtilsNs.typeOf;
-  // TODO: replace with an es6 reexport when declare module 'ember' is removed
-  /**
-   * Copy properties from a source object to a target object.
-   * @deprecated until v5.0. You should replace any calls to `Ember.assign`
-   *   with `Object.assign` or use the object spread operator.
-   */
-  const assign: typeof EmberPolyfillsNs.assign;
-  const guidFor: typeof EmberObjectInternalsNs.guidFor;
+    const observer: typeof EmberObjectNs.observer;
+    const addObserver: typeof EmberObjectObserversNs.addObserver;
+    const removeObserver: typeof EmberObjectObserversNs.removeObserver;
+    const get: typeof EmberObjectNs.get;
+    const notifyPropertyChange: typeof EmberObjectNs.notifyPropertyChange;
+    const getProperties: typeof EmberObjectNs.getProperties;
+    const setProperties: typeof EmberObjectNs.setProperties;
+    const set: typeof EmberObjectNs.set;
+    const trySet: typeof EmberObjectNs.trySet;
+    const compare: typeof EmberUtilsNs.compare;
+    /**
+     * Creates a shallow copy of the passed object. A deep copy of the object is
+     * returned if the optional `deep` argument is `true`.
+     */
+    const isEqual: typeof EmberUtilsNs.isEqual;
+    const typeOf: typeof EmberUtilsNs.typeOf;
+    /**
+     * Copy properties from a source object to a target object.
+     * @deprecated until v5.0. You should replace any calls to `Ember.assign`
+     *   with `Object.assign` or use the object spread operator.
+     */
+    const assign: typeof EmberPolyfillsNs.assign;
+    const guidFor: typeof EmberObjectInternalsNs.guidFor;
 
-  /**
-   * A function may be assigned to `Ember.onerror` to be called when Ember
-   * internals encounter an error. This is useful for specialized error handling
-   * and reporting code.
-   */
-  let onerror: ((error: Error) => void) | undefined;
+    /**
+     * A function may be assigned to `Ember.onerror` to be called when Ember
+     * internals encounter an error. This is useful for specialized error handling
+     * and reporting code.
+     */
+    let onerror: ((error: Error) => void) | undefined;
 
-  /**
-   * The semantic version
-   */
-  const VERSION: string;
-  /**
-   * This property indicates whether or not this application is currently in
-   * testing mode. This is set when `setupForTesting` is called on the current
-   * application.
-   */
-  const testing: boolean;
+    /**
+     * The semantic version
+     */
+    const VERSION: string;
+    /**
+     * This property indicates whether or not this application is currently in
+     * testing mode. This is set when `setupForTesting` is called on the current
+     * application.
+     */
+    const testing: boolean;
 
-  const expandProperties: typeof EmberObjectComputedNs.expandProperties;
-}
+    const expandProperties: typeof EmberObjectComputedNs.expandProperties;
+  }
 
-export default Ember;
+  export default Ember;
+}
 
 declare module 'htmlbars-inline-precompile' {
   interface TemplateFactory {
diff --git a/types/preview/ember/test/array-ext.ts b/types/preview/ember/test/array-ext.ts
deleted file mode 100755
index 0b87d139900..00000000000
--- a/types/preview/ember/test/array-ext.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import Ember from 'ember';
-import { assertType } from './lib/assert';
-
-declare global {
-  interface Array<T> extends Ember.ArrayPrototypeExtensions<T> {}
-}
-
-class Person extends Ember.Object {
-  declare name: string;
-}
-
-const person = Person.create({ name: 'Joe' });
-const array = [person];
-
-assertType<number>(array.get('length'));
-assertType<Person | undefined>(array.get('firstObject'));
-assertType<string[]>(array.mapBy('name'));
-assertType<string[]>(array.map((p) => p.get('name')));
-assertType<Person[]>(array.sortBy('name'));
-assertType<Person[]>(array.uniq());
-assertType<Person[]>(array.uniqBy('name'));
diff --git a/types/preview/ember/test/data-adapter.ts b/types/preview/ember/test/data-adapter.ts
deleted file mode 100644
index e7a42b6a5cd..00000000000
--- a/types/preview/ember/test/data-adapter.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import Ember from 'ember';
-import { expectTypeOf } from 'expect-type';
-
-const da = Ember.DataAdapter.create();
-
-const filters = da.getFilters();
-expectTypeOf(filters.includes({ name: 'foo', desc: 'bar' })).toBeBoolean();
-// @ts-expect-error
-filters.includes({});
-
-expectTypeOf(filters[0]?.name).toEqualTypeOf<string | undefined>();
-expectTypeOf(filters[0]?.desc).toEqualTypeOf<string | undefined>();
-
-// $ExpectType () => void
-da.watchModelTypes(
-  function added(wrappedTypes) {
-    wrappedTypes;
-    expectTypeOf(wrappedTypes[0]?.release).toEqualTypeOf<(() => void) | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.desc).toEqualTypeOf<string | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.name).toEqualTypeOf<string | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.count).toEqualTypeOf<number | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.name).toEqualTypeOf<string | undefined>();
-  },
-  function updated(wrappedTypes) {
-    wrappedTypes;
-    expectTypeOf(wrappedTypes[0]?.release).toEqualTypeOf<(() => void) | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.desc).toEqualTypeOf<string | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.columns[0]?.name).toEqualTypeOf<string | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.count).toEqualTypeOf<number | undefined>();
-    expectTypeOf(wrappedTypes[0]?.type.name).toEqualTypeOf<string | undefined>();
-  }
-);
-// @ts-expect-error
-da.watchModelTypes(() => {});
-
-// $ExpectType () => void
-da.watchRecords(
-  'house',
-  function added(records) {
-    expectTypeOf(records[0]?.object).toEqualTypeOf<object | undefined>();
-    expectTypeOf(records[0]?.columnValues).toEqualTypeOf<object | undefined>();
-  },
-  function updated(records) {
-    expectTypeOf(records[0]?.object).toEqualTypeOf<object | undefined>();
-    expectTypeOf(records[0]?.columnValues).toEqualTypeOf<object | undefined>();
-  },
-  function removed(idx, count) {
-    idx; // $ExpectType number
-    count; // $ExpectType number
-  }
-);
-// @ts-expect-error
-da.watchRecords(() => {});
-
-da.acceptsModelName; // $ExpectType boolean
-da.containerDebugAdapter; // $ExpectType ContainerDebugAdapter
-
-const ca: Ember.ContainerDebugAdapter = da.containerDebugAdapter;
-ca.canCatalogEntriesByType('controller'); // $ExpectType boolean
-ca.catalogEntriesByType('controller'); // $ExpectType string[]
diff --git a/types/preview/ember/test/debug.ts b/types/preview/ember/test/debug.ts
deleted file mode 100644
index 69396503e07..00000000000
--- a/types/preview/ember/test/debug.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import Ember from 'ember';
-
-const {
-  runInDebug,
-  warn,
-  debug,
-  Debug: { registerDeprecationHandler, registerWarnHandler },
-} = Ember;
-
-// Workaround for https://github.com/microsoft/TypeScript/issues/36931.
-const assert: typeof Ember.assert = Ember.assert;
-
-/**
- * @ember/debug tests
- */
-// @ts-expect-error
-runInDebug();
-runInDebug(() => console.log('Should not show up in prod')); // $ExpectType void
-
-// Log a warning if we have more than 3 tomsters
-const tomsterCount = 2;
-// @ts-expect-error
-warn('Too many tomsters!');
-warn('Too many tomsters!', { id: 'some-warning' }); // $ExpectType void
-// @ts-expect-error
-warn('Too many tomsters!', tomsterCount <= 3);
-warn('Too many tomsters!', tomsterCount <= 3, { id: 'some-warning' }); // $ExpectType void
-// $ExpectType void
-warn('Too many tomsters!', tomsterCount <= 3, {
-  id: 'ember-debug.too-many-tomsters',
-});
-
-// @ts-expect-error
-debug();
-debug('Too many tomsters!'); // $ExpectType void
-// @ts-expect-error
-debug('Too many tomsters!', 'foo');
-
-// next is not called, so no warnings get the default behavior
-// @ts-expect-error
-registerWarnHandler();
-registerWarnHandler(() => {}); // $ExpectType void
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  next; // $ExpectType (message: string, options?: { id: string; } | undefined) => void
-});
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  // @ts-expect-error
-  next();
-});
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  next(message); // $ExpectType void
-});
-registerWarnHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; } | undefined
-  next(message, options); // $ExpectType void
-});
-
-// next is not called, so no warnings get the default behavior
-// @ts-expect-error
-registerDeprecationHandler();
-registerDeprecationHandler(() => {}); // $ExpectType void
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  next; // $ExpectType (message: string, options?: { id: string; until: string; } | undefined) => void
-});
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  // @ts-expect-error
-  next();
-});
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  next(message); // $ExpectType void
-});
-registerDeprecationHandler((message, options, next) => {
-  // $ExpectType void
-  message; // $ExpectType string
-  options; // $ExpectType { id: string; until: string; } | undefined
-  next(message, options); // $ExpectType void
-});
-
-// Test for truthiness
-const str: unknown = 'hello';
-assert('Must pass a string', typeof str === 'string');
-str; // $ExpectType string
-
-// Fail unconditionally
-// This has to be last because `assert never` will raise TS's checks for
-// unreachable code.
-assert('This code path should never be run'); // $ExpectType never
diff --git a/types/preview/ember/test/error.ts b/types/preview/ember/test/error.ts
deleted file mode 100644
index 3e8de002ad9..00000000000
--- a/types/preview/ember/test/error.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { assertType } from './lib/assert';
-
-import Ember from 'ember';
-
-assertType<typeof Ember.Error>(Ember.Error);
diff --git a/types/preview/ember/test/lib/assert.ts b/types/preview/ember/test/lib/assert.ts
deleted file mode 100755
index dad227ab5e9..00000000000
--- a/types/preview/ember/test/lib/assert.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Static assertion that `value` has type `T` */
-export declare function assertType<T>(value: T): T;
diff --git a/types/preview/ember/test/private/computed-tests.ts b/types/preview/ember/test/private/computed-tests.ts
deleted file mode 100644
index a3f61025ac2..00000000000
--- a/types/preview/ember/test/private/computed-tests.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import Ember from 'ember';
-
-class Example1 extends Ember.Object {
-  firstName = '';
-  lastName = '';
-
-  @Ember.computed('fullName')
-  get allNames() {
-    return [this.fullName];
-  }
-
-  @Ember.computed('firstName', 'lastName')
-  get fullName() {
-    return `${this.firstName} ${this.lastName}`;
-  }
-}
-
-class Example2 extends Example1 {
-  foo() {
-    this.fullName; // $ExpectType ComputedProperty<string, string>
-    this.allNames; // $ExpectType ComputedProperty<string[], string[]>
-    this.firstName; // $ExpectType string
-    this.lastName; // $ExpectType string
-
-    this.get('fullName').split(','); // $ExpectType string[]
-    this.get('allNames')[0]; // $ExpectType string
-    this.get('firstName').split(','); // $ExpectType string[]
-    this.get('lastName').split(','); // $ExpectType string[]
-  }
-}
diff --git a/types/preview/ember/test/utils.ts b/types/preview/ember/test/utils.ts
deleted file mode 100755
index 91796516054..00000000000
--- a/types/preview/ember/test/utils.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import Ember from 'ember';
-import { expectTypeOf } from 'expect-type';
-import { assertType } from './lib/assert';
-
-function testTypeOf() {
-  Ember.typeOf(); // $ExpectType "undefined"
-  const str: string = Ember.typeOf({});
-}
-
-function testIsNoneType() {
-  const maybeUndefined: string | undefined = 'not actually undefined';
-  if (Ember.isNone(maybeUndefined)) {
-    return;
-  }
-
-  const anotherString = maybeUndefined + 'another string';
-  Ember.isNone(); // $ExpectType boolean
-}
-
-function testIsBlank() {
-  Ember.isBlank(); // $ExpectType boolean
-  Ember.isBlank(''); // $ExpectType boolean
-  // @ts-expect-error
-  Ember.isBlank('', '');
-}
-
-function testIsEmpty() {
-  Ember.isEmpty(); // $ExpectType boolean
-  Ember.isEmpty(''); // $ExpectType boolean
-  // @ts-expect-error
-  Ember.isEmpty('', '');
-}
-
-function testIsPresent() {
-  Ember.isPresent(); // $ExpectType boolean
-  Ember.isPresent(''); // $ExpectType boolean
-  // @ts-expect-error
-  Ember.isPresent('', '');
-}
-
-function testIsNone() {
-  Ember.isNone(); // $ExpectType boolean
-  Ember.isNone(''); // $ExpectType boolean
-  // @ts-expect-error
-  Ember.isNone('', '');
-}
-
-function testAssign() {
-  assertType<{ first: string; middle: string; last: string }>(
-    Ember.assign({ first: 'Tom' }, { middle: 'M' }, { last: 'Dale' })
-  );
-}
-
-function testOnError() {
-  Ember.onerror = (error) => {
-    fetch('/report-error', {
-      method: 'POST',
-      body: JSON.stringify({
-        stack: error.stack,
-        otherInformation: 'whatever app state you want to provide',
-      }),
-    });
-  };
-}
-
-function testDeprecateFunc() {
-  function newMethod(first: string, second: number): string {
-    return '';
-  }
-
-  const oldMethod = Ember.deprecateFunc(
-    'Please use the new method',
-    { id: 'deprecated.id', until: '6.0' },
-    newMethod
-  );
-  expectTypeOf(newMethod('first', 123)).toEqualTypeOf<string>();
-  expectTypeOf(oldMethod('first', 123)).toEqualTypeOf<string>();
-}
-
-function testDefineProperty() {
-  type Contact = { firstName?: string; lastName?: string };
-  const contact: Contact = {};
-
-  // ES5 compatible mode
-  Ember.defineProperty(contact, 'firstName', {
-    writable: true,
-    configurable: false,
-    enumerable: true,
-    value: 'Charles',
-  });
-
-  // define a simple property
-  Ember.defineProperty(contact, 'lastName', undefined, 'Jolley');
-
-  // define a computed property
-  Ember.defineProperty(
-    contact,
-    'fullName',
-    Ember.computed('firstName', 'lastName', function (this: Contact) {
-      return `${this.firstName} ${this.lastName}`;
-    })
-  );
-}
-
-// For use in IIFE below.
-declare const fileList: FileList;
-
-(() => {
-  /** typeOf */
-  Ember.typeOf(); // $ExpectType "undefined"
-  Ember.typeOf(null); // $ExpectType "null"
-  Ember.typeOf(undefined); // $ExpectType "undefined"
-  Ember.typeOf('michael'); // $ExpectType "string"
-  // tslint:disable-next-line:no-construct
-  Ember.typeOf(new String('michael')); // $ExpectType "string"
-  Ember.typeOf(101); // $ExpectType "number"
-  // tslint:disable-next-line:no-construct
-  Ember.typeOf(new Number(101)); // $ExpectType "number"
-  Ember.typeOf(true); // $ExpectType "boolean"
-  // tslint:disable-next-line:no-construct
-  Ember.typeOf(new Boolean(true)); // $ExpectType "boolean"
-  Ember.typeOf(() => 4); // $ExpectType "function"
-  Ember.typeOf([1, 2, 90]); // $ExpectType "array"
-  Ember.typeOf(/abc/); // $ExpectType "regexp"
-  Ember.typeOf(new Date()); // $ExpectType "date"
-  Ember.typeOf(fileList); // $ExpectType "filelist"
-  Ember.typeOf(Ember.Object.extend()); // $ExpectType "class"
-  Ember.typeOf(Ember.Object.create()); // $ExpectType "instance"
-  Ember.typeOf(new Error('teamocil')); // $ExpectType "error"
-  Ember.typeOf(new Date() as RegExp | Date); // "regexp" | "date"
-  Ember.typeOf({ randomObject: true }); // $ExpectType "object"
-})();
-
-(() => {
-  /* assign */
-  Ember.assign({}, { a: 'b' });
-  Ember.assign({}, { a: 'b' }).a; // $ExpectType string
-  Ember.assign({ a: 6 }, { a: 'b' }).a; // $ExpectType string
-  Ember.assign({ a: 6 }, {}).a; // $ExpectType number
-  // @ts-expect-error
-  Ember.assign({ b: 6 }, {}).a;
-  Ember.assign({}, { b: 6 }, {}).b; // $ExpectType number
-  Ember.assign({ a: 'hello' }, { b: 6 }, {}).a; // $ExpectType string
-  Ember.assign({ a: 'hello' }, { b: 6 }, { a: true }).a; // $ExpectType boolean
-  // @ts-expect-error
-  Ember.assign({ a: 'hello' }, '', { a: true }).a;
-  Ember.assign({ d: ['gobias industries'] }, { a: 'hello' }, { b: 6 }, { a: true }).d; // $ExpectType string[]
-})();
diff --git a/types/preview/ember/test/view-utils.ts b/types/preview/ember/test/view-utils.ts
deleted file mode 100644
index 7cce69bc61f..00000000000
--- a/types/preview/ember/test/view-utils.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import Ember from 'ember';
-import { assertType } from './lib/assert';
-
-const {
-  ViewUtils: { isSimpleClick },
-} = Ember;
-assertType<boolean>(isSimpleClick(new Event('wat')));
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
new file mode 100644
index 00000000000..5d15af6d833
--- /dev/null
+++ b/types/preview/index.d.ts
@@ -0,0 +1,121 @@
+/**
+  @module
+  Makes Ember's types for the packages it publishes available by importing this
+  path from `ember-source`:
+
+  ```ts
+  import 'ember-source/types/preview';
+  ```
+ */
+
+// This works because each of these modules presents `declare module` definition
+// of the module and *only* that, so importing this file in turn makes those
+// module declarations "visible" automatically throughout a consuming project.
+//
+// Somewhat annoyingly, every single module in the graph must appear here. For
+// now, while we are publishing ambient types, that means we must maintain this
+// by hand. When we start emitting types from the source, we will need to do the
+// same work, but automatically.
+
+import './ember';
+import './ember/-private/type-utils';
+
+import './@ember/-internals/resolver';
+
+import './@ember/application';
+import './@ember/application/-private/event-dispatcher';
+import './@ember/application/-private/registry';
+import './@ember/application/deprecations';
+import './@ember/application/instance';
+import './@ember/application/types';
+
+import './@ember/array';
+import './@ember/array/-private/enumerable';
+import './@ember/array/-private/mutable-enumerable';
+import './@ember/array/-private/native-array';
+import './@ember/array/mutable';
+import './@ember/array/proxy';
+import './@ember/array/types/prototype-extensions';
+
+import './@ember/component';
+import './@ember/component/-private/class-names-support';
+import './@ember/component/-private/core-view';
+import './@ember/component/-private/glimmer-interfaces';
+import './@ember/component/-private/signature-utils';
+import './@ember/component/-private/view-mixin';
+import './@ember/component/helper';
+import './@ember/component/template-only';
+
+import './@ember/controller';
+
+import './@ember/debug';
+import './@ember/debug/container-debug-adapter';
+import './@ember/debug/data-adapter';
+
+import './@ember/destroyable';
+
+import './@ember/engine';
+import './@ember/engine/-private/container-proxy-mixin';
+import './@ember/engine/-private/registry-proxy-mixin';
+import './@ember/engine/-private/types/initializer';
+import './@ember/engine/instance';
+
+import './@ember/error';
+
+import './@ember/helper';
+
+import './@ember/modifier';
+
+import './@ember/object';
+import './@ember/object/-private/action-handler';
+import './@ember/object/-private/types';
+import './@ember/object/compat';
+import './@ember/object/computed';
+import './@ember/object/core';
+import './@ember/object/evented';
+import './@ember/object/events';
+import './@ember/object/internals';
+import './@ember/object/mixin';
+import './@ember/object/observable';
+import './@ember/object/observers';
+import './@ember/object/promise-proxy-mixin';
+import './@ember/object/proxy';
+
+import './@ember/owner';
+
+import './@ember/polyfills';
+import './@ember/polyfills/types';
+
+import './@ember/routing';
+import './@ember/routing/-private/route-info'; // TODO: remove
+import './@ember/routing/-private/route-info-with-attributes'; // TODO: remove
+import './@ember/routing/-private/router-dsl';
+import './@ember/routing/-private/transition'; // TODO: remove
+import './@ember/routing/auto-location';
+import './@ember/routing/hash-location';
+import './@ember/routing/history-location';
+import './@ember/routing/none-location';
+import './@ember/routing/route';
+import './@ember/routing/route-info';
+import './@ember/routing/router';
+import './@ember/routing/router-service';
+import './@ember/routing/transition';
+import './@ember/routing/types';
+
+import './@ember/runloop';
+import './@ember/runloop/-private/backburner';
+import './@ember/runloop/-private/types';
+import './@ember/runloop/types';
+
+import './@ember/service';
+
+import './@ember/string';
+
+import './@ember/template';
+import './@ember/template/-private/handlebars';
+
+import './@ember/test';
+import './@ember/test/adapter';
+
+import './@ember/utils';
+import './@ember/utils/-private/types';

From dc1d4fda38f1083551796de9263fa7fff9848772 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 17:54:22 -0600
Subject: [PATCH 1116/1405] Add type checking for preview types to package
 scripts

---
 package.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 771014a287e..03269bb0815 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,10 @@
     "lint:docs": "qunit tests/docs/coverage-test.js",
     "lint:eslint": "eslint --report-unused-disable-directives --cache .",
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
-    "lint:tsc": "tsc --noEmit && tsc --noEmit --project types/preview",
+    "lint:tsc:stable": "tsc --noEmit",
+    "lint:tsc:preview": "tsc --noEmit --project type-tests/preview",
+    "lint:tsc:preview-array-ext": "tsc --noEmit --project type-tests/preview-prototype-extensions",
+    "lint:tsc": "npm-run-all lint:tsc:*",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
     "test:blueprints:js": "mocha node-tests/blueprints/**/*-test.js",

From 434c714506a1159db0498f93ebecd3cb69b60dc4 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 17:59:52 -0600
Subject: [PATCH 1117/1405] Add array prototype extension preview types

These *do not work*. They will be removed in the next commit, but are
added here for historical purposes.

They do not work specifically because they introduce a circularity in
the definition of `NativeArray`: `NativeArray` must extends from a
*subset* of `Array` to correctly represent its public API and behavior,
but introducing the `Array` prototype extension in turn must extend from
`NativeArray`, which results in type errors because `NativeArray`
extends from the subset rather than the full API of `Array`.

This "worked" in the DefinitelyTyped version for two reasons:

1.  All of our type tests actually just assumed the array prototype
    extensions were enabled (as discussed in the previous commit).

2.  The type definition for `NativeArray` was *wrong*: at minimum it was
    substantially out of date; possibly it has always been incorrect.
    (It may have been incorrect *intentionally*, precisely to allow the
    prototype extension to work. The details are lost to time.)

In any case, these type tests represent the "correct" APIs for the
prototype extensions, so are committed here and removed in the next
commit for historical purposes.
---
 .../preview-prototype-extensions/README.md    |  1 +
 .../array-module-ext.ts                       | 21 +++++++++++++++++++
 .../ember-namespace-array-ext.ts              | 18 ++++++++++++++++
 .../preview-prototype-extensions/index.d.ts   |  6 ++++++
 .../tsconfig.json                             |  3 +++
 5 files changed, 49 insertions(+)
 create mode 100644 type-tests/preview-prototype-extensions/README.md
 create mode 100755 type-tests/preview-prototype-extensions/array-module-ext.ts
 create mode 100755 type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts
 create mode 100644 type-tests/preview-prototype-extensions/index.d.ts
 create mode 100644 type-tests/preview-prototype-extensions/tsconfig.json

diff --git a/type-tests/preview-prototype-extensions/README.md b/type-tests/preview-prototype-extensions/README.md
new file mode 100644
index 00000000000..5a47b7822eb
--- /dev/null
+++ b/type-tests/preview-prototype-extensions/README.md
@@ -0,0 +1 @@
+This exists so we can test the *rest* of the system *without* pulling in Array prototype extensions.
diff --git a/type-tests/preview-prototype-extensions/array-module-ext.ts b/type-tests/preview-prototype-extensions/array-module-ext.ts
new file mode 100755
index 00000000000..f97cb41be1f
--- /dev/null
+++ b/type-tests/preview-prototype-extensions/array-module-ext.ts
@@ -0,0 +1,21 @@
+import EmberObject from '@ember/object';
+import { expectTypeOf } from 'expect-type';
+import type NativeArray from '@ember/array/-private/native-array';
+
+class Person extends EmberObject {
+  declare name: string;
+}
+
+const person = Person.create({ name: 'Joe' });
+const array = [person];
+
+expectTypeOf(array.get('length')).toBeNumber();
+expectTypeOf(array.get('firstObject')).toEqualTypeOf<Person | undefined>();
+expectTypeOf(array.mapBy('name')).toEqualTypeOf<NativeArray<string>>();
+expectTypeOf(array.map((p) => p.get('name'))).toEqualTypeOf<string[]>();
+// These use `toMatchTypeOf` instead of `toEqualTypeOf` because they are not
+// actually returning `Array`; they return `Ember.NativeArray`
+expectTypeOf(array.sortBy('name')).toMatchTypeOf<Person[]>();
+expectTypeOf(array.uniq()).toMatchTypeOf<Person[]>();
+expectTypeOf(array.uniqBy('name')).toMatchTypeOf<Person[]>();
+expectTypeOf(array.uniqBy((p) => p.get('name'))).toMatchTypeOf<Person[]>();
diff --git a/type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts b/type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts
new file mode 100755
index 00000000000..59a5bf256c2
--- /dev/null
+++ b/type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts
@@ -0,0 +1,18 @@
+import Ember from 'ember';
+import { expectTypeOf } from 'expect-type';
+
+class Person extends Ember.Object {
+  declare name: string;
+}
+
+const person = Person.create({ name: 'Joe' });
+const array = [person];
+
+expectTypeOf(array.get('length')).toBeNumber();
+expectTypeOf(array.get('firstObject')).toEqualTypeOf<Person | undefined>();
+expectTypeOf(array.mapBy('name')).toMatchTypeOf<string[]>();
+expectTypeOf(array.map((p) => p.get('name'))).toEqualTypeOf<string[]>();
+// These return `Ember.NativeArray` so use `toMatchTypeOf`
+expectTypeOf(array.sortBy('name')).toMatchTypeOf<Person[]>();
+expectTypeOf(array.uniq()).toMatchTypeOf<Person[]>();
+expectTypeOf(array.uniqBy('name')).toMatchTypeOf<Person[]>();
diff --git a/type-tests/preview-prototype-extensions/index.d.ts b/type-tests/preview-prototype-extensions/index.d.ts
new file mode 100644
index 00000000000..5d36bbf9924
--- /dev/null
+++ b/type-tests/preview-prototype-extensions/index.d.ts
@@ -0,0 +1,6 @@
+import '../../types/preview';
+import type ArrayPrototypeExtensions from '@ember/array/types/prototype-extensions';
+
+declare global {
+  interface Array<T> extends ArrayPrototypeExtensions<T> {}
+}
diff --git a/type-tests/preview-prototype-extensions/tsconfig.json b/type-tests/preview-prototype-extensions/tsconfig.json
new file mode 100644
index 00000000000..a205f6579ab
--- /dev/null
+++ b/type-tests/preview-prototype-extensions/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+}

From 17df5a1fed5cc42dfe511b2f6a2cd94f7ee03832 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 18:03:24 -0600
Subject: [PATCH 1118/1405] Remove types for array prototype extensions

See previous commit message for discussion of *why* these are being
removed. If we decide to re-introduce these types later, it will require
not only adding back in these tests but also taking some fairly distinct
approach to their inclusion, given the problems with the way they work.
---
 package.json                                  |  1 -
 .../preview-prototype-extensions/README.md    |  1 -
 .../array-module-ext.ts                       | 21 -------------------
 .../ember-namespace-array-ext.ts              | 18 ----------------
 .../preview-prototype-extensions/index.d.ts   |  6 ------
 .../tsconfig.json                             |  3 ---
 .../array/types/prototype-extensions.d.ts     |  6 ------
 types/preview/ember/index.d.ts                |  2 --
 types/preview/index.d.ts                      |  1 -
 9 files changed, 59 deletions(-)
 delete mode 100644 type-tests/preview-prototype-extensions/README.md
 delete mode 100755 type-tests/preview-prototype-extensions/array-module-ext.ts
 delete mode 100755 type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts
 delete mode 100644 type-tests/preview-prototype-extensions/index.d.ts
 delete mode 100644 type-tests/preview-prototype-extensions/tsconfig.json
 delete mode 100644 types/preview/@ember/array/types/prototype-extensions.d.ts

diff --git a/package.json b/package.json
index 03269bb0815..778df1e0bac 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
     "lint:tsc:stable": "tsc --noEmit",
     "lint:tsc:preview": "tsc --noEmit --project type-tests/preview",
-    "lint:tsc:preview-array-ext": "tsc --noEmit --project type-tests/preview-prototype-extensions",
     "lint:tsc": "npm-run-all lint:tsc:*",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
diff --git a/type-tests/preview-prototype-extensions/README.md b/type-tests/preview-prototype-extensions/README.md
deleted file mode 100644
index 5a47b7822eb..00000000000
--- a/type-tests/preview-prototype-extensions/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This exists so we can test the *rest* of the system *without* pulling in Array prototype extensions.
diff --git a/type-tests/preview-prototype-extensions/array-module-ext.ts b/type-tests/preview-prototype-extensions/array-module-ext.ts
deleted file mode 100755
index f97cb41be1f..00000000000
--- a/type-tests/preview-prototype-extensions/array-module-ext.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import EmberObject from '@ember/object';
-import { expectTypeOf } from 'expect-type';
-import type NativeArray from '@ember/array/-private/native-array';
-
-class Person extends EmberObject {
-  declare name: string;
-}
-
-const person = Person.create({ name: 'Joe' });
-const array = [person];
-
-expectTypeOf(array.get('length')).toBeNumber();
-expectTypeOf(array.get('firstObject')).toEqualTypeOf<Person | undefined>();
-expectTypeOf(array.mapBy('name')).toEqualTypeOf<NativeArray<string>>();
-expectTypeOf(array.map((p) => p.get('name'))).toEqualTypeOf<string[]>();
-// These use `toMatchTypeOf` instead of `toEqualTypeOf` because they are not
-// actually returning `Array`; they return `Ember.NativeArray`
-expectTypeOf(array.sortBy('name')).toMatchTypeOf<Person[]>();
-expectTypeOf(array.uniq()).toMatchTypeOf<Person[]>();
-expectTypeOf(array.uniqBy('name')).toMatchTypeOf<Person[]>();
-expectTypeOf(array.uniqBy((p) => p.get('name'))).toMatchTypeOf<Person[]>();
diff --git a/type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts b/type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts
deleted file mode 100755
index 59a5bf256c2..00000000000
--- a/type-tests/preview-prototype-extensions/ember-namespace-array-ext.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Ember from 'ember';
-import { expectTypeOf } from 'expect-type';
-
-class Person extends Ember.Object {
-  declare name: string;
-}
-
-const person = Person.create({ name: 'Joe' });
-const array = [person];
-
-expectTypeOf(array.get('length')).toBeNumber();
-expectTypeOf(array.get('firstObject')).toEqualTypeOf<Person | undefined>();
-expectTypeOf(array.mapBy('name')).toMatchTypeOf<string[]>();
-expectTypeOf(array.map((p) => p.get('name'))).toEqualTypeOf<string[]>();
-// These return `Ember.NativeArray` so use `toMatchTypeOf`
-expectTypeOf(array.sortBy('name')).toMatchTypeOf<Person[]>();
-expectTypeOf(array.uniq()).toMatchTypeOf<Person[]>();
-expectTypeOf(array.uniqBy('name')).toMatchTypeOf<Person[]>();
diff --git a/type-tests/preview-prototype-extensions/index.d.ts b/type-tests/preview-prototype-extensions/index.d.ts
deleted file mode 100644
index 5d36bbf9924..00000000000
--- a/type-tests/preview-prototype-extensions/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import '../../types/preview';
-import type ArrayPrototypeExtensions from '@ember/array/types/prototype-extensions';
-
-declare global {
-  interface Array<T> extends ArrayPrototypeExtensions<T> {}
-}
diff --git a/type-tests/preview-prototype-extensions/tsconfig.json b/type-tests/preview-prototype-extensions/tsconfig.json
deleted file mode 100644
index a205f6579ab..00000000000
--- a/type-tests/preview-prototype-extensions/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "@tsconfig/ember/tsconfig.json",
-}
diff --git a/types/preview/@ember/array/types/prototype-extensions.d.ts b/types/preview/@ember/array/types/prototype-extensions.d.ts
deleted file mode 100644
index 20db9620ebd..00000000000
--- a/types/preview/@ember/array/types/prototype-extensions.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '@ember/array/types/prototype-extensions' {
-  import Observable from '@ember/object/observable';
-  import MutableArray from '@ember/array/mutable';
-
-  export default interface ArrayPrototypeExtensions<T> extends MutableArray<T>, Observable {}
-}
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index 285250f392a..e0511e6bbf2 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -44,7 +44,6 @@ declare module 'ember' {
   import EmberArrayProxy from '@ember/array/proxy';
   import type EmberEnumerable from '@ember/array/-private/enumerable';
   import type EmberMutableEnumerable from '@ember/array/-private/mutable-enumerable';
-  import type EmberArrayProtoExtensions from '@ember/array/types/prototype-extensions';
   // @ember/error
   import type EmberError from '@ember/error';
 
@@ -94,7 +93,6 @@ declare module 'ember' {
     export const setOwner: typeof EmberApplicationNs.setOwner;
     export class EventDispatcher extends EmberEventDispatcher {}
     export class Registry extends EmberRegistry {}
-    export interface ArrayPrototypeExtensions<T> extends EmberArrayProtoExtensions<T> {}
 
     /**
      * Implements some standard methods for comparing objects. Add this mixin to
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 5d15af6d833..7ec202b1068 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -35,7 +35,6 @@ import './@ember/array/-private/mutable-enumerable';
 import './@ember/array/-private/native-array';
 import './@ember/array/mutable';
 import './@ember/array/proxy';
-import './@ember/array/types/prototype-extensions';
 
 import './@ember/component';
 import './@ember/component/-private/class-names-support';

From 121ab1c67c2eda3d85a13c8e5b627e3e4b8c272e Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 19:57:50 -0600
Subject: [PATCH 1119/1405] Types preview: prettier and remove tslint
 references

---
 types/preview/@ember/array/index.d.ts                    | 1 -
 .../@ember/component/-private/glimmer-interfaces.d.ts    | 1 -
 types/preview/@ember/component/index.d.ts                | 9 ++++-----
 types/preview/@ember/controller/index.d.ts               | 1 -
 types/preview/@ember/routing/route.d.ts                  | 1 -
 types/preview/@ember/routing/router-service.d.ts         | 1 -
 types/preview/@ember/service/index.d.ts                  | 1 -
 types/preview/ember/index.d.ts                           | 3 ---
 8 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/types/preview/@ember/array/index.d.ts b/types/preview/@ember/array/index.d.ts
index 2667e7289f1..cd149da2d1b 100644
--- a/types/preview/@ember/array/index.d.ts
+++ b/types/preview/@ember/array/index.d.ts
@@ -21,7 +21,6 @@ declare module '@ember/array' {
     /**
      * This returns the objects at the specified indexes, using `objectAt`.
      */
-    // tslint:disable-next-line:array-type
     objectsAt(indexes: number[]): Array<T | undefined>;
     /**
      * Helper method returns the first object from a collection. This is usually
diff --git a/types/preview/@ember/component/-private/glimmer-interfaces.d.ts b/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
index e77e6f1eb89..f5412750c3a 100644
--- a/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
+++ b/types/preview/@ember/component/-private/glimmer-interfaces.d.ts
@@ -7,7 +7,6 @@ declare module '@ember/component/-private/glimmer-interfaces' {
   // matches [the implementation][1], which *also* uses it as a type-only brand.
   //
   // [1]: https://github.com/glimmerjs/glimmer-vm/blob/d6d776cf3797dafa923bcdad47e1897231ef6539/packages/%40glimmer/interfaces/lib/managers/capabilities.d.ts#L1
-  // tslint:disable-next-line:strict-export-declare-modifiers
   const CAPABILITIES: unique symbol;
 
   export interface Capabilities {
diff --git a/types/preview/@ember/component/index.d.ts b/types/preview/@ember/component/index.d.ts
index c78cb25c62a..ced33f71e48 100644
--- a/types/preview/@ember/component/index.d.ts
+++ b/types/preview/@ember/component/index.d.ts
@@ -17,8 +17,7 @@ declare module '@ember/component' {
   // information supplied via this generic. While it may appear useless on this
   // class definition and extension, it is used by external tools and should not
   // be removed.
-  // tslint:disable-next-line:no-unnecessary-generics
-  export default interface Component<S = unknown> extends ViewMixin, ClassNamesSupport, Opaque<S> { }
+  export default interface Component<S = unknown> extends ViewMixin, ClassNamesSupport, Opaque<S> {}
   export default class Component<S = unknown> extends CoreView {
     // methods
     readDOMAttr(name: string): string;
@@ -111,8 +110,8 @@ declare module '@ember/component' {
   // that just need to be importable. Declaring them with unique interfaces
   // like this, however, gives tools like Glint (that DO have a richer
   // notion of what they are) a place to install more detailed type information.
-  export interface Input extends Opaque<'component:input'> { }
-  export interface Textarea extends Opaque<'component:textarea'> { }
+  export interface Input extends Opaque<'component:input'> {}
+  export interface Textarea extends Opaque<'component:textarea'> {}
 
   /**
    * The `Input` component lets you create an HTML `<input>` element.
@@ -129,5 +128,5 @@ declare module '@ember/component' {
   export const Textarea: Textarea;
 
   // Do not export anything but what we *explicitly* say to export.
-  export { };
+  export {};
 }
diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
index d270a29ecee..5d7dcbc4d2b 100644
--- a/types/preview/@ember/controller/index.d.ts
+++ b/types/preview/@ember/controller/index.d.ts
@@ -44,6 +44,5 @@ declare module '@ember/controller' {
 
   // A type registry for Ember `Controller`s. Meant to be declaration-merged
   // so string lookups resolve to the correct type.
-  // tslint:disable-next-line no-empty-interface
   export interface Registry {}
 }
diff --git a/types/preview/@ember/routing/route.d.ts b/types/preview/@ember/routing/route.d.ts
index 93ff84ea54e..c2005e66153 100644
--- a/types/preview/@ember/routing/route.d.ts
+++ b/types/preview/@ember/routing/route.d.ts
@@ -6,7 +6,6 @@ declare module '@ember/routing/route' {
   import { RouteQueryParam } from '@ember/routing/types';
   import Controller from '@ember/controller';
 
-  // tslint:disable-next-line:strict-export-declare-modifiers
   type RouteModel = object | string | number;
 
   /**
diff --git a/types/preview/@ember/routing/router-service.d.ts b/types/preview/@ember/routing/router-service.d.ts
index 1aceaf2a0b4..35b16927e85 100644
--- a/types/preview/@ember/routing/router-service.d.ts
+++ b/types/preview/@ember/routing/router-service.d.ts
@@ -3,7 +3,6 @@ declare module '@ember/routing/router-service' {
   import Transition from '@ember/routing/transition';
   import Service from '@ember/service';
 
-  // tslint:disable-next-line:strict-export-declare-modifiers
   type RouteModel = object | string | number;
 
   // https://emberjs.com/api/ember/release/classes/RouterService
diff --git a/types/preview/@ember/service/index.d.ts b/types/preview/@ember/service/index.d.ts
index 8a3828ed837..323494f3b35 100644
--- a/types/preview/@ember/service/index.d.ts
+++ b/types/preview/@ember/service/index.d.ts
@@ -21,6 +21,5 @@ declare module '@ember/service' {
 
   // A type registry for Ember `Service`s. Meant to be declaration-merged so
   // string lookups resolve to the correct type.
-  // tslint:disable-next-line no-empty-interface strict-export-declare-modifiers
   interface Registry {}
 }
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index e0511e6bbf2..59270bbcbb8 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -7,7 +7,6 @@ declare module 'ember' {
   import type * as EmberStringNs from '@ember/string';
   import type * as EmberTemplateNs from '@ember/template';
   import * as EmberTemplateHandlebarsNs from '@ember/template/-private/handlebars';
-  // tslint:disable-next-line:no-duplicate-imports
   import type * as EmberServiceNs from '@ember/service';
   import type * as EmberPolyfillsNs from '@ember/polyfills';
   import type * as EmberUtilsNs from '@ember/utils';
@@ -32,9 +31,7 @@ declare module 'ember' {
   import * as EmberApplicationInstanceNs from '@ember/application/instance';
   import type * as EmberApplicationDeprecateNs from '@ember/application/deprecations';
   import type * as EmberTestNs from '@ember/test';
-  // tslint:disable-next-line:no-duplicate-imports
   import * as EmberControllerNs from '@ember/controller';
-  // tslint:disable-next-line:no-duplicate-imports
   import EmberMixin from '@ember/object/mixin';
   import type EmberObservable from '@ember/object/observable';
   // @ember/array

From 303505ac07ccea48e43e86bc324acfcbfcab3b22 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 21:12:28 -0600
Subject: [PATCH 1120/1405] Types preview: import from 'ember-source/preview'

Use `typesVersions` to resolve `preview` to `types/preview`; we can use
`types` for stable and more `typesVersions` (or, eventually, `exports`)
for other similar schemes in the future.
---
 package.json             | 7 +++++++
 types/preview/index.d.ts | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 778df1e0bac..1139694c356 100644
--- a/package.json
+++ b/package.json
@@ -167,5 +167,12 @@
   },
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"
+  },
+  "typesVersions": {
+    "*": {
+      "preview": [
+        "./types/preview"
+      ]
+    }
   }
 }
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 7ec202b1068..858356c29db 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -4,13 +4,16 @@
   path from `ember-source`:
 
   ```ts
-  import 'ember-source/types/preview';
+  import 'ember-source/preview';
   ```
  */
 
 // This works because each of these modules presents `declare module` definition
 // of the module and *only* that, so importing this file in turn makes those
 // module declarations "visible" automatically throughout a consuming project.
+// Combined with use of `typesVersions` (or, in the future, possibly `exports`)
+// in `package.json`, this allows users to import the types without knowing the
+// exact layout details.
 //
 // Somewhat annoyingly, every single module in the graph must appear here. For
 // now, while we are publishing ambient types, that means we must maintain this

From f8a9e83492957d2dd777de0bd4fd143ae162b37b Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 31 Aug 2022 21:20:36 -0600
Subject: [PATCH 1121/1405] Types preview: remove private DT route types

We continue to maintain support for these import locations in the types
on DefinitelyTyped, but remove them here so that users trying the
preview types do not accidentally depend on them.
---
 .../preview/@ember/routing-test/route.ts      | 25 +------------------
 .../-private/route-info-with-attributes.d.ts  |  3 ---
 .../@ember/routing/-private/route-info.d.ts   |  3 ---
 .../@ember/routing/-private/transition.d.ts   |  3 ---
 4 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
 delete mode 100644 types/preview/@ember/routing/-private/route-info.d.ts
 delete mode 100644 types/preview/@ember/routing/-private/transition.d.ts

diff --git a/type-tests/preview/@ember/routing-test/route.ts b/type-tests/preview/@ember/routing-test/route.ts
index b550e7180f6..2ce642ec79d 100755
--- a/type-tests/preview/@ember/routing-test/route.ts
+++ b/type-tests/preview/@ember/routing-test/route.ts
@@ -5,8 +5,7 @@ import type Array from '@ember/array';
 import EmberObject from '@ember/object';
 import Controller from '@ember/controller';
 import type Transition from '@ember/routing/transition';
-import type { RouteInfoWithAttributes } from '@ember/routing/route-info';
-import type RouteInfo from '@ember/routing/route-info';
+import { expectTypeOf } from 'expect-type';
 
 class Post extends EmberObject {}
 
@@ -207,25 +206,3 @@ class WithImplicitParams extends Route {
 
 type ImplicitParams = WithImplicitParams extends Route<any, infer T> ? T : never;
 expectTypeOf<ImplicitParams>().toEqualTypeOf<RouteParams>();
-
-// back-compat for existing users of these
-// NOTE: we will *not* migrate the private import locations when moving to
-// publish from Ember itself.
-import type PrivateTransition from '@ember/routing/-private/transition';
-declare let publicTransition: Transition;
-declare let oldPrivateTransition: PrivateTransition;
-publicTransition = oldPrivateTransition;
-oldPrivateTransition = publicTransition;
-
-import type PrivateRouteInfo from '@ember/routing/-private/route-info';
-declare let publicRouteInfo: RouteInfo;
-declare let privateRouteInfo: PrivateRouteInfo;
-publicRouteInfo = privateRouteInfo;
-privateRouteInfo = publicRouteInfo;
-
-import type PrivateRouteInfoWithAttributes from '@ember/routing/-private/route-info-with-attributes';
-import { expectTypeOf } from 'expect-type';
-declare let publicRouteInfoWithAttributes: RouteInfoWithAttributes;
-declare let privateRouteInfoWithAttributes: PrivateRouteInfoWithAttributes;
-publicRouteInfoWithAttributes = privateRouteInfoWithAttributes;
-privateRouteInfoWithAttributes = publicRouteInfoWithAttributes;
diff --git a/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts b/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
deleted file mode 100644
index eccb9e34b6b..00000000000
--- a/types/preview/@ember/routing/-private/route-info-with-attributes.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module '@ember/routing/-private/route-info-with-attributes' {
-  export { RouteInfoWithAttributes as default } from '@ember/routing/route-info';
-}
diff --git a/types/preview/@ember/routing/-private/route-info.d.ts b/types/preview/@ember/routing/-private/route-info.d.ts
deleted file mode 100644
index 6174f5896a8..00000000000
--- a/types/preview/@ember/routing/-private/route-info.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module '@ember/routing/-private/route-info' {
-  export { default as default } from '@ember/routing/route-info';
-}
diff --git a/types/preview/@ember/routing/-private/transition.d.ts b/types/preview/@ember/routing/-private/transition.d.ts
deleted file mode 100644
index bfaa3add03f..00000000000
--- a/types/preview/@ember/routing/-private/transition.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module '@ember/routing/-private/transition' {
-  export { default as default } from '@ember/routing/transition';
-}

From 45a03dfb82665ce82af7742304ca1e642b67e434 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 1 Sep 2022 07:12:42 -0600
Subject: [PATCH 1122/1405] Types: exclude from ESLint

While having some guidance for the ambient types here would be needful
for the long term, we do not intend to *keep* these all that long; this
is intended as transitional. If we end up maintaining the ambient types
for a long time, we can of course revisit this. In any case, we will
want to run linting on any type tests we introduce for *stable* types
(at a future `type-tests/stable` location). Net, exclude everything in
`types` and the tests in `type-tests/preview`.
---
 .eslintignore |  2 ++
 .eslintrc.js  | 48 ------------------------------------------------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 96eab461a6a..7ce02292986 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -6,3 +6,5 @@ node-tests/fixtures/**/*.js
 dist/
 tmp/
 smoke-tests/
+types/
+type-tests/preview
diff --git a/.eslintrc.js b/.eslintrc.js
index a768459eaee..921dc164dd6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -65,54 +65,6 @@ module.exports = {
         'prefer-rest-params': 'off',
       },
     },
-    {
-      files: ['types/preview/**/*.ts'],
-
-      extends: ['plugin:@typescript-eslint/recommended'],
-
-      parserOptions: {
-        sourceType: 'module',
-        project: './types/preview/tsconfig.json',
-        tsconfigRootDir: __dirname,
-      },
-
-      rules: {
-        'import/export': 'off',
-        'disable-features/disable-async-await': 'off',
-        '@typescript-eslint/ban-ts-comment': 'off',
-        '@typescript-eslint/ban-types': 'off',
-        '@typescript-eslint/no-empty-interface': 'off',
-        'import/no-unresolved': 'off',
-        '@typescript-eslint/no-this-alias': 'off',
-        '@typescript-eslint/consistent-type-imports': 'off',
-        '@typescript-eslint/no-empty-function': 'off',
-        'no-console': 'off',
-      },
-    },
-    {
-      files: ['type-tests/preview/**/*.ts'],
-      parserOptions: {
-        sourceType: 'module',
-        project: './type-tests/preview/tsconfig.json',
-        tsconfigRootDir: __dirname,
-      },
-      rules: {
-        'no-console': 'off',
-        '@typescript-eslint/no-empty-interface': 'off',
-      },
-    },
-    {
-      files: ['type-tests/preview-prototype-extensions/**/*.ts'],
-      parserOptions: {
-        sourceType: 'module',
-        project: './type-tests/preview-prototype-extensions/tsconfig.json',
-        tsconfigRootDir: __dirname,
-      },
-      rules: {
-        'no-console': 'off',
-        '@typescript-eslint/no-empty-interface': 'off',
-      },
-    },
     {
       // TODO: files: ['packages/**/*.[jt]s'],
       files: ['packages/**/*.js'],

From 3fcc6d61d00e50ef0ca9f33e28fb8fc6fa4931e9 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Sep 2022 09:28:17 -0700
Subject: [PATCH 1123/1405] Fix import circularity

---
 packages/@ember/controller/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 91f19feb48b..eec66f8a35e 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -1,4 +1,4 @@
-import { getOwner } from '@ember/application';
+import { getOwner } from '@ember/-internals/owner'; // This is imported from -internals to avoid circularity
 import { computed, get } from '@ember/object';
 import { FrameworkObject } from '@ember/object/-internals';
 import { inject as metalInject } from '@ember/-internals/metal';

From 119b42cf214ff9c2bb5855787df68629b32afb16 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 6 Sep 2022 14:10:15 -0600
Subject: [PATCH 1124/1405] Types preview: remove dead imports

The corresponding module declarations were removed earlier; this simply
drops the 'side-effect' imports from `types/preview/index.d.ts`.
---
 types/preview/index.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 858356c29db..e887be9736a 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -89,10 +89,7 @@ import './@ember/polyfills';
 import './@ember/polyfills/types';
 
 import './@ember/routing';
-import './@ember/routing/-private/route-info'; // TODO: remove
-import './@ember/routing/-private/route-info-with-attributes'; // TODO: remove
 import './@ember/routing/-private/router-dsl';
-import './@ember/routing/-private/transition'; // TODO: remove
 import './@ember/routing/auto-location';
 import './@ember/routing/hash-location';
 import './@ember/routing/history-location';

From bf16bd3c4b5c209cd68d7704e5c367b488210634 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 6 Sep 2022 16:15:37 -0400
Subject: [PATCH 1125/1405] Add v4.7.0 to CHANGELOG

(cherry picked from commit 0c59b21bb380daa491d9d9fcb1dc27fd5e56cd5d)
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6829ad65afb..b6c9a9c3694 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Ember Changelog
 
-### v4.7.0-beta.1 (July 25, 2022)
+### v4.7.0 (September 6, 2022)
 
-- [#20126](https://github.com/emberjs/ember.js/pull/20126) [BUGFIX] Replacing Firefox detection that used a deprecated browser API
+- [#20126](https://github.com/emberjs/ember.js/pull/20126) [BUGFIX] Replace Firefox detection that used a deprecated browser API
 
 ### v4.6.0 (July 25, 2022)
 

From f48affedde8e19f617c973b4c01df33dfc475fee Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 6 Sep 2022 16:22:47 -0400
Subject: [PATCH 1126/1405] Add v4.8.0-beta.1 to CHANGELOG

(cherry picked from commit 72f117864bd5054fd3c0098221ca9770aa0e1137)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6c9a9c3694..856c4c7dd55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.8.0-beta.1 (September 6, 2022)
+
+- [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Upgrade router_js to fix Linked list of RouteInfos contains undefined object
+
 ### v4.7.0 (September 6, 2022)
 
 - [#20126](https://github.com/emberjs/ember.js/pull/20126) [BUGFIX] Replace Firefox detection that used a deprecated browser API

From 38adfe2c6ec0a45828f27c2443d2fcac3ec70e40 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 6 Sep 2022 16:33:02 -0400
Subject: [PATCH 1127/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1139694c356..3d6ad1b55ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.8.0-alpha.1",
+  "version": "4.9.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 0171f81836a7b1e44b944a653cf21d3b7dacee80 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Sep 2022 22:01:03 +0000
Subject: [PATCH 1128/1405] Bump terser from 5.10.0 to 5.14.2

Bumps [terser](https://github.com/terser/terser) from 5.10.0 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 52 ++++++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9d217f1714b..2713bf32471 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1432,7 +1432,7 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@jridgewell/gen-mapping@^0.3.2":
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
   integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
@@ -1442,19 +1442,27 @@
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
-  integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
 "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz#baf57b4e2a690d4f38560171f91783656b7f8186"
-  integrity sha512-Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg==
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.0":
   version "0.3.4"
@@ -1885,10 +1893,10 @@ acorn@^5.0.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
 
-acorn@^8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+acorn@^8.5.0, acorn@^8.7.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 agent-base@5:
   version "5.1.1"
@@ -3144,9 +3152,9 @@ buffer-crc32@~0.2.3:
   integrity "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="
 
 buffer-from@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
-  integrity "sha1-TLiDLSNhJYmwQG6eKVbBfwb99TE= sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA=="
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer@4.9.2:
   version "4.9.2"
@@ -3571,7 +3579,7 @@ commander@7.2.0:
 commander@^2.20.0, commander@^2.6.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity "sha1-/UhehMA+tIgcIHIrpIA16FMa6zM= sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^4.1.1:
   version "4.1.1"
@@ -9560,11 +9568,6 @@ source-map@~0.1.x:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
@@ -9934,12 +9937,13 @@ temp@0.9.4:
     rimraf "~2.6.2"
 
 terser@^5.3.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.0.tgz#e16967894eeba6e1091509ec83f0c60e179f2425"
+  integrity sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 testdouble@^3.2.6:

From f3468f93cac197aff2b23624de8e9bada13d57c9 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Wed, 7 Sep 2022 15:16:26 +0200
Subject: [PATCH 1129/1405] Fix `@ember/runloop` type tests folder name

---
 .../runloop/{type-tests.ts => type-tests}/begin-end.test.ts       | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/bind.test.ts     | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/cancel.test.ts   | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/debounce.test.ts | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/join.test.ts     | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/later.test.ts    | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/next.test.ts     | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/once.test.ts     | 0
 packages/@ember/runloop/{type-tests.ts => type-tests}/run.test.ts | 0
 .../runloop/{type-tests.ts => type-tests}/schedule-once.test.ts   | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/schedule.test.ts | 0
 .../@ember/runloop/{type-tests.ts => type-tests}/throttle.test.ts | 0
 12 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/begin-end.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/bind.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/cancel.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/debounce.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/join.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/later.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/next.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/once.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/run.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/schedule-once.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/schedule.test.ts (100%)
 rename packages/@ember/runloop/{type-tests.ts => type-tests}/throttle.test.ts (100%)

diff --git a/packages/@ember/runloop/type-tests.ts/begin-end.test.ts b/packages/@ember/runloop/type-tests/begin-end.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/begin-end.test.ts
rename to packages/@ember/runloop/type-tests/begin-end.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/bind.test.ts b/packages/@ember/runloop/type-tests/bind.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/bind.test.ts
rename to packages/@ember/runloop/type-tests/bind.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/cancel.test.ts b/packages/@ember/runloop/type-tests/cancel.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/cancel.test.ts
rename to packages/@ember/runloop/type-tests/cancel.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/debounce.test.ts b/packages/@ember/runloop/type-tests/debounce.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/debounce.test.ts
rename to packages/@ember/runloop/type-tests/debounce.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/join.test.ts b/packages/@ember/runloop/type-tests/join.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/join.test.ts
rename to packages/@ember/runloop/type-tests/join.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/later.test.ts b/packages/@ember/runloop/type-tests/later.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/later.test.ts
rename to packages/@ember/runloop/type-tests/later.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/next.test.ts b/packages/@ember/runloop/type-tests/next.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/next.test.ts
rename to packages/@ember/runloop/type-tests/next.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/once.test.ts b/packages/@ember/runloop/type-tests/once.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/once.test.ts
rename to packages/@ember/runloop/type-tests/once.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/run.test.ts b/packages/@ember/runloop/type-tests/run.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/run.test.ts
rename to packages/@ember/runloop/type-tests/run.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/schedule-once.test.ts b/packages/@ember/runloop/type-tests/schedule-once.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/schedule-once.test.ts
rename to packages/@ember/runloop/type-tests/schedule-once.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/schedule.test.ts b/packages/@ember/runloop/type-tests/schedule.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/schedule.test.ts
rename to packages/@ember/runloop/type-tests/schedule.test.ts
diff --git a/packages/@ember/runloop/type-tests.ts/throttle.test.ts b/packages/@ember/runloop/type-tests/throttle.test.ts
similarity index 100%
rename from packages/@ember/runloop/type-tests.ts/throttle.test.ts
rename to packages/@ember/runloop/type-tests/throttle.test.ts

From eac8bdfaf95a0e04e34f93465c948bfae275b577 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 8 Sep 2022 16:48:18 -0400
Subject: [PATCH 1130/1405] Use service registry in owner.lookup

---
 type-tests/preview/@ember/owner-tests.ts | 7 +++++++
 types/preview/@ember/owner/index.d.ts    | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/type-tests/preview/@ember/owner-tests.ts b/type-tests/preview/@ember/owner-tests.ts
index 4effdfb996b..f3425ab31a2 100644
--- a/type-tests/preview/@ember/owner-tests.ts
+++ b/type-tests/preview/@ember/owner-tests.ts
@@ -64,6 +64,13 @@ expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
 owner.lookup('non-namespace-string');
 expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
 
+declare module '@ember/service' {
+  interface Registry {
+    'my-type-test-service': ConstructThis;
+  }
+}
+expectTypeOf(owner.lookup('service:my-type-test-service')).toEqualTypeOf<ConstructThis>();
+
 expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
 expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
 expectTypeOf(owner.register('type:name', aFactory, { instantiate: true })).toEqualTypeOf<void>();
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
index 31ca3476d4c..e10939c1b78 100644
--- a/types/preview/@ember/owner/index.d.ts
+++ b/types/preview/@ember/owner/index.d.ts
@@ -1,13 +1,12 @@
 declare module '@ember/owner' {
+  import type { Registry } from '@ember/service';
+
   /**
    * The name for a factory consists of a namespace and the name of a specific
    * type within that namespace, like `'service:session'`.
    */
   export type FullName = `${string}:${string}`;
 
-  // TODO: when migrating into Ember proper, evaluate whether we should introduce
-  // a registry which users can provide to resolve known types, so e.g.
-  // `owner.lookup('service:session')` can return the right thing.
   /**
    * Framework objects in an Ember application (components, services, routes,
    * etc.) are created via a factory and dependency injection system. Each of
@@ -18,6 +17,7 @@ declare module '@ember/owner' {
     /**
      * Given a {@linkcode FullName} return a corresponding instance.
      */
+    lookup<Name extends keyof Registry>(fullName: `service:${Name}`): Registry[Name];
     lookup(fullName: FullName): unknown;
 
     /**

From daa911511cc65b89dddea0852b86b8770195c43f Mon Sep 17 00:00:00 2001
From: Pablo Najera <pnajera@linkedin.com>
Date: Thu, 8 Sep 2022 17:24:36 -0400
Subject: [PATCH 1131/1405] moving docs to interface methods

---
 packages/@ember/object/evented.ts | 51 +++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/object/evented.ts b/packages/@ember/object/evented.ts
index 775870071de..de222a579e6 100644
--- a/packages/@ember/object/evented.ts
+++ b/packages/@ember/object/evented.ts
@@ -49,8 +49,19 @@ export { on } from '@ember/-internals/metal';
  */
 interface Evented {
   /**
-   * Subscribes to a named event with given function.
-   */
+    Subscribes to a named event with given function.
+
+    ```javascript
+    person.on('didLoad', function() {
+      // fired once the person has loaded
+    });
+    ```
+
+    An optional target can be passed in as the 2nd argument that will
+    be set as the "this" for the callback. This is a good way to give your
+    function access to the object triggering the event. When the target
+    parameter is used the callback method becomes the third argument.
+  */
   on<Target>(
     name: string,
     target: Target,
@@ -58,10 +69,14 @@ interface Evented {
   ): this;
   on(name: string, method: ((...args: any[]) => void) | string): this;
   /**
-   * Subscribes a function to a named event and then cancels the subscription
-   * after the first time the event is triggered. It is good to use ``one`` when
-   * you only care about the first time an event has taken place.
-   */
+    Subscribes a function to a named event and then cancels the subscription
+    after the first time the event is triggered. It is good to use ``one`` when
+    you only care about the first time an event has taken place.
+
+    This function takes an optional 2nd argument that will become the "this"
+    value for the callback. When the target parameter is used the callback method
+    becomes the third argument.
+  */
   one<Target>(
     name: string,
     target: Target,
@@ -69,14 +84,24 @@ interface Evented {
   ): this;
   one(name: string, method: string | ((...args: any[]) => void)): this;
   /**
-   * Triggers a named event for the object. Any additional arguments
-   * will be passed as parameters to the functions that are subscribed to the
-   * event.
-   */
+    Triggers a named event for the object. Any additional arguments
+    will be passed as parameters to the functions that are subscribed to the
+    event.
+
+    ```javascript
+    person.on('didEat', function(food) {
+      console.log('person ate some ' + food);
+    });
+
+    person.trigger('didEat', 'broccoli');
+
+    // outputs: person ate some broccoli
+    ```
+  */
   trigger(name: string, ...args: any[]): any;
   /**
-   * Cancels subscription for given name, target, and method.
-   */
+    Cancels subscription for given name, target, and method.
+  */
   off<Target>(
     name: string,
     target: Target,
@@ -84,7 +109,7 @@ interface Evented {
   ): this;
   off(name: string, method: string | ((...args: any[]) => void)): this;
   /**
-   * Checks to see if object has any subscriptions for named event.
+    Checks to see if object has any subscriptions for named event.
    */
   has(name: string): boolean;
 }

From 3577c74054456c2fedcd4919f15b45dca87c029a Mon Sep 17 00:00:00 2001
From: layang <layang@linkedin.com>
Date: Fri, 9 Sep 2022 15:04:29 -0400
Subject: [PATCH 1132/1405]  moving docs to interface method

---
 packages/@ember/object/observable.ts | 210 ++++++++++++++++++++++++---
 1 file changed, 190 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index 94cdafe1fe4..4b8d5872c5d 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -91,29 +91,113 @@ export type ObserverMethod<Target, Sender> =
 */
 interface Observable {
   /**
-   * Retrieves the value of a property from the object.
-   */
+    Retrieves the value of a property from the object.
+
+    This method is usually similar to using `object[keyName]` or `object.keyName`,
+    however it supports both computed properties and the unknownProperty
+    handler.
+
+    Because `get` unifies the syntax for accessing all these kinds
+    of properties, it can make many refactorings easier, such as replacing a
+    simple property with a computed property, or vice versa.
+
+    ### Computed Properties
+
+    Computed properties are methods defined with the `property` modifier
+    declared at the end, such as:
+
+    ```javascript
+    import { computed } from '@ember/object';
+
+    fullName: computed('firstName', 'lastName', function() {
+      return this.get('firstName') + ' ' + this.get('lastName');
+    })
+    ```
+
+    When you call `get` on a computed property, the function will be
+    called and the return value will be returned instead of the function
+    itself.
+
+    ### Unknown Properties
+
+    Likewise, if you try to call `get` on a property whose value is
+    `undefined`, the `unknownProperty()` method will be called on the object.
+    If this method returns any value other than `undefined`, it will be returned
+    instead. This allows you to implement "virtual" properties that are
+    not defined upfront.
+  */
   get(key: string): unknown;
 
   /**
-   * To get the values of multiple properties at once, call `getProperties`
-   * with a list of strings or an array:
-   */
+    To get the values of multiple properties at once, call `getProperties`
+    with a list of strings or an array:
+
+    ```javascript
+    record.getProperties('firstName', 'lastName', 'zipCode');
+    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+    ```
+
+    is equivalent to:
+
+    ```javascript
+    record.getProperties(['firstName', 'lastName', 'zipCode']);
+    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+    ```
+  */
   getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
   getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
 
   // NOT TYPE SAFE!
   /**
-   * Sets the provided key or path to the value.
-   */
+    Sets the provided key or path to the value.
+
+    ```javascript
+    record.set("key", value);
+    ```
+
+    This method is generally very similar to calling `object["key"] = value` or
+    `object.key = value`, except that it provides support for computed
+    properties, the `setUnknownProperty()` method and property observers.
+
+    ### Computed Properties
+
+    If you try to set a value on a key that has a computed property handler
+    defined (see the `get()` method for an example), then `set()` will call
+    that method, passing both the value and key instead of simply changing
+    the value itself. This is useful for those times when you need to
+    implement a property that is composed of one or more member
+    properties.
+
+    ### Unknown Properties
+
+    If you try to set a value on a key that is undefined in the target
+    object, then the `setUnknownProperty()` handler will be called instead. This
+    gives you an opportunity to implement complex "virtual" properties that
+    are not predefined on the object. If `setUnknownProperty()` returns
+    undefined, then `set()` will simply set the value on the object.
+
+    ### Property Observers
+
+    In addition to changing the property, `set()` will also register a property
+    change with the object. Unless you have placed this call inside of a
+    `beginPropertyChanges()` and `endPropertyChanges(),` any "local" observers
+    (i.e. observer methods declared on the same object), will be called
+    immediately. Any "remote" observers (i.e. observer methods declared on
+    another object) will be placed in a queue and called at a later time in a
+    coalesced manner.
+  */
   set<T>(key: string, value: T): T;
 
   // NOT TYPE SAFE!
   /**
-   * Sets a list of properties at once. These properties are set inside
-   * a single `beginPropertyChanges` and `endPropertyChanges` batch, so
-   * observers will be buffered.
-   */
+    Sets a list of properties at once. These properties are set inside
+    a single `beginPropertyChanges` and `endPropertyChanges` batch, so
+    observers will be buffered.
+
+    ```javascript
+    record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
+    ```
+  */
   setProperties<T extends Record<string, any>>(hash: T): T;
 
   /**
@@ -123,8 +207,80 @@ interface Observable {
   notifyPropertyChange(keyName: string): this;
 
   /**
-   * Adds an observer on a property.
-   */
+    Adds an observer on a property.
+
+    This is the core method used to register an observer for a property.
+
+    Once you call this method, any time the key's value is set, your observer
+    will be notified. Note that the observers are triggered any time the
+    value is set, regardless of whether it has actually changed. Your
+    observer should be prepared to handle that.
+
+    There are two common invocation patterns for `.addObserver()`:
+
+    - Passing two arguments:
+      - the name of the property to observe (as a string)
+      - the function to invoke (an actual function)
+    - Passing three arguments:
+      - the name of the property to observe (as a string)
+      - the target object (will be used to look up and invoke a
+        function on)
+      - the name of the function to invoke on the target object
+        (as a string).
+
+    ```app/components/my-component.js
+    import Component from '@ember/component';
+
+    export default Component.extend({
+      init() {
+        this._super(...arguments);
+
+        // the following are equivalent:
+
+        // using three arguments
+        this.addObserver('foo', this, 'fooDidChange');
+
+        // using two arguments
+        this.addObserver('foo', (...args) => {
+          this.fooDidChange(...args);
+        });
+      },
+
+      fooDidChange() {
+        // your custom logic code
+      }
+    });
+    ```
+
+    ### Observer Methods
+
+    Observer methods have the following signature:
+
+    ```app/components/my-component.js
+    import Component from '@ember/component';
+
+    export default Component.extend({
+      init() {
+        this._super(...arguments);
+        this.addObserver('foo', this, 'fooDidChange');
+      },
+
+      fooDidChange(sender, key, value, rev) {
+        // your code
+      }
+    });
+    ```
+
+    The `sender` is the object that changed. The `key` is the property that
+    changes. The `value` property is currently reserved and unused. The `rev`
+    is the last property revision of the object when it changed, which you can
+    use to detect if the key value has really changed or not.
+
+    Usually you will not need the value or revision parameters at
+    the end. In this case, it is common to write observer methods that take
+    only a sender and key value as parameters or, if you aren't interested in
+    any of these values, to write an observer that has no parameters at all.
+  */
   addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
   addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
 
@@ -142,21 +298,35 @@ interface Observable {
 
   // NOT TYPE SAFE!
   /**
-   * Set the value of a property to the current value plus some amount.
-   */
+    Set the value of a property to the current value plus some amount.
+
+    ```javascript
+    person.incrementProperty('age');
+    team.incrementProperty('score', 2);
+    ```
+  */
   incrementProperty(keyName: keyof this, increment?: number): number;
 
   // NOT TYPE SAFE!
   /**
-   * Set the value of a property to the current value minus some amount.
-   */
+    Set the value of a property to the current value minus some amount.
+
+    ```javascript
+    player.decrementProperty('lives');
+    orc.decrementProperty('health', 5);
+    ```
+  */
   decrementProperty(keyName: keyof this, decrement?: number): number;
 
   // NOT TYPE SAFE!
   /**
-   * Set the value of a boolean property to the opposite of its
-   * current value.
-   */
+    Set the value of a boolean property to the opposite of its
+    current value.
+
+    ```javascript
+    starship.toggleProperty('warpDriveEngaged');
+    ```
+  */
   toggleProperty(keyName: keyof this): boolean;
 
   /**

From d50fc51b5fc9ed057bcadd119f2f9c1eded6a9a5 Mon Sep 17 00:00:00 2001
From: qwan <qiansan@gmail.com>
Date: Sun, 11 Sep 2022 16:18:30 -0400
Subject: [PATCH 1133/1405] proxy mixin interface ts

---
 packages/@ember/object/promise-proxy-mixin.ts | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index d053a20a98f..d5f84443632 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -110,16 +110,60 @@ function tap<T>(proxy: PromiseProxyMixin<T>, promise: RSVP.Promise<T>) {
 interface PromiseProxyMixin<T> {
   reason: unknown;
 
+  /**
+    Once the proxied promise has settled this will become `false`.
+  */
   readonly isPending: boolean;
+  /**
+    Once the proxied promise has settled this will become `true`.
+  */
   readonly isSettled: boolean;
 
+  /**
+    Will become `true` if the proxied promise is rejected.
+  */
   isRejected: boolean;
+  /**
+    Will become `true` if the proxied promise is fulfilled.
+  */
   isFulfilled: boolean;
 
+  /**
+    The promise whose fulfillment value is being proxied by this object.
+
+    This property must be specified upon creation, and should not be
+    changed once created.
+
+    Example:
+
+    ```javascript
+    import ObjectProxy from '@ember/object/proxy';
+    import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
+
+    ObjectProxy.extend(PromiseProxyMixin).create({
+      promise: <thenable>
+    });
+    ```
+  */
   promise: Promise<T>;
 
+  /**
+    An alias to the proxied promise's `then`.
+
+    See RSVP.Promise.then.
+  */
   then: this['promise']['then'];
+  /**
+    An alias to the proxied promise's `catch`.
+
+    See RSVP.Promise.catch.
+  */
   catch: this['promise']['catch'];
+  /**
+    An alias to the proxied promise's `finally`.
+
+    See RSVP.Promise.finally.
+  */
   finally: this['promise']['finally'];
 }
 const PromiseProxyMixin = Mixin.create({

From d3b97886e346551362af13a5ec6f84369ef06a1a Mon Sep 17 00:00:00 2001
From: qwan <qiansan@gmail.com>
Date: Mon, 12 Sep 2022 14:51:06 -0400
Subject: [PATCH 1134/1405] move

---
 packages/@ember/object/promise-proxy-mixin.ts | 92 +------------------
 1 file changed, 4 insertions(+), 88 deletions(-)

diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index d5f84443632..f652875a30c 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -108,6 +108,10 @@ function tap<T>(proxy: PromiseProxyMixin<T>, promise: RSVP.Promise<T>) {
   @public
 */
 interface PromiseProxyMixin<T> {
+  /**
+    If the proxied promise is rejected this will contain the reason
+    provided.
+  */
   reason: unknown;
 
   /**
@@ -167,76 +171,20 @@ interface PromiseProxyMixin<T> {
   finally: this['promise']['finally'];
 }
 const PromiseProxyMixin = Mixin.create({
-  /**
-    If the proxied promise is rejected this will contain the reason
-    provided.
-
-    @property reason
-    @default null
-    @public
-  */
   reason: null,
 
-  /**
-    Once the proxied promise has settled this will become `false`.
-
-    @property isPending
-    @default true
-    @public
-  */
   isPending: computed('isSettled', function () {
     return !get(this, 'isSettled');
   }).readOnly(),
 
-  /**
-    Once the proxied promise has settled this will become `true`.
-
-    @property isSettled
-    @default false
-    @public
-  */
   isSettled: computed('isRejected', 'isFulfilled', function () {
     return get(this, 'isRejected') || get(this, 'isFulfilled');
   }).readOnly(),
 
-  /**
-    Will become `true` if the proxied promise is rejected.
-
-    @property isRejected
-    @default false
-    @public
-  */
   isRejected: false,
 
-  /**
-    Will become `true` if the proxied promise is fulfilled.
-
-    @property isFulfilled
-    @default false
-    @public
-  */
   isFulfilled: false,
 
-  /**
-    The promise whose fulfillment value is being proxied by this object.
-
-    This property must be specified upon creation, and should not be
-    changed once created.
-
-    Example:
-
-    ```javascript
-    import ObjectProxy from '@ember/object/proxy';
-    import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
-
-    ObjectProxy.extend(PromiseProxyMixin).create({
-      promise: <thenable>
-    });
-    ```
-
-    @property promise
-    @public
-  */
   promise: computed({
     get() {
       throw new EmberError("PromiseProxy's promise must be set");
@@ -246,42 +194,10 @@ const PromiseProxyMixin = Mixin.create({
     },
   }),
 
-  /**
-    An alias to the proxied promise's `then`.
-
-    See RSVP.Promise.then.
-
-    @method then
-    @param {Function} callback
-    @return {RSVP.Promise}
-    @public
-  */
   then: promiseAlias('then'),
 
-  /**
-    An alias to the proxied promise's `catch`.
-
-    See RSVP.Promise.catch.
-
-    @method catch
-    @param {Function} callback
-    @return {RSVP.Promise}
-    @since 1.3.0
-    @public
-  */
   catch: promiseAlias('catch'),
 
-  /**
-    An alias to the proxied promise's `finally`.
-
-    See RSVP.Promise.finally.
-
-    @method finally
-    @param {Function} callback
-    @return {RSVP.Promise}
-    @since 1.3.0
-    @public
-  */
   finally: promiseAlias('finally'),
 });
 

From ae6b7d21a44854a1cc9a12da3e144994952ba9ee Mon Sep 17 00:00:00 2001
From: Pablo Najera <pnajera@linkedin.com>
Date: Tue, 13 Sep 2022 11:14:39 -0400
Subject: [PATCH 1135/1405] removing docs from mixin functions

---
 packages/@ember/object/evented.ts | 74 -------------------------------
 1 file changed, 74 deletions(-)

diff --git a/packages/@ember/object/evented.ts b/packages/@ember/object/evented.ts
index de222a579e6..9123d3a2680 100644
--- a/packages/@ember/object/evented.ts
+++ b/packages/@ember/object/evented.ts
@@ -114,99 +114,25 @@ interface Evented {
   has(name: string): boolean;
 }
 const Evented = Mixin.create({
-  /**
-    Subscribes to a named event with given function.
-
-    ```javascript
-    person.on('didLoad', function() {
-      // fired once the person has loaded
-    });
-    ```
-
-    An optional target can be passed in as the 2nd argument that will
-    be set as the "this" for the callback. This is a good way to give your
-    function access to the object triggering the event. When the target
-    parameter is used the callback method becomes the third argument.
-
-    @method on
-    @param {String} name The name of the event
-    @param {Object} [target] The "this" binding for the callback
-    @param {Function|String} method A function or the name of a function to be called on `target`
-    @return this
-    @public
-  */
   on(name: string, target: object, method?: string | Function) {
     addListener(this, name, target, method);
     return this;
   },
 
-  /**
-    Subscribes a function to a named event and then cancels the subscription
-    after the first time the event is triggered. It is good to use ``one`` when
-    you only care about the first time an event has taken place.
-
-    This function takes an optional 2nd argument that will become the "this"
-    value for the callback. When the target parameter is used the callback method
-    becomes the third argument.
-
-    @method one
-    @param {String} name The name of the event
-    @param {Object} [target] The "this" binding for the callback
-    @param {Function|String} method A function or the name of a function to be called on `target`
-    @return this
-    @public
-  */
   one(name: string, target: object, method?: string | Function) {
     addListener(this, name, target, method, true);
     return this;
   },
 
-  /**
-    Triggers a named event for the object. Any additional arguments
-    will be passed as parameters to the functions that are subscribed to the
-    event.
-
-    ```javascript
-    person.on('didEat', function(food) {
-      console.log('person ate some ' + food);
-    });
-
-    person.trigger('didEat', 'broccoli');
-
-    // outputs: person ate some broccoli
-    ```
-    @method trigger
-    @param {String} name The name of the event
-    @param {Object...} args Optional arguments to pass on
-    @public
-  */
   trigger(name: string, ...args: any[]) {
     sendEvent(this, name, args);
   },
 
-  /**
-    Cancels subscription for given name, target, and method.
-
-    @method off
-    @param {String} name The name of the event
-    @param {Object} target The target of the subscription
-    @param {Function|String} method The function or the name of a function of the subscription
-    @return this
-    @public
-  */
   off(name: string, target: object, method?: string | Function) {
     removeListener(this, name, target, method);
     return this;
   },
 
-  /**
-    Checks to see if object has any subscriptions for named event.
-
-    @method has
-    @param {String} name The name of the event
-    @return {Boolean} does the object have a subscription for event
-    @public
-   */
   has(name: string) {
     return hasListeners(this, name);
   },

From 82d28a2507c3de747b1b3e6a2d537d8296d506e7 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 13 Sep 2022 13:12:43 -0400
Subject: [PATCH 1136/1405] Add v4.8.0-beta.2 to CHANGELOG

(cherry picked from commit 1886db6493947f140d930321d612e4b7091eab19)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 856c4c7dd55..0159f94406b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.8.0-beta.2 (September 13, 2022)
+
+- [#20186](https://github.com/emberjs/ember.js/pull/20186) [BUGFIX] Fix `@ember/runloop` type tests folder name so that the tests are properly excluded from the build
+- [#20180](https://github.com/emberjs/ember.js/pull/20180) [FEATURE] Publish an opt-in preview of public types for Ember
+
 ### v4.8.0-beta.1 (September 6, 2022)
 
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Upgrade router_js to fix Linked list of RouteInfos contains undefined object

From 4588ee19a79d635e13ffa15aeaa485b74171e904 Mon Sep 17 00:00:00 2001
From: layang <layang@linkedin.com>
Date: Tue, 13 Sep 2022 14:13:47 -0400
Subject: [PATCH 1137/1405] remove the duplicate doc

---
 packages/@ember/object/observable.ts | 268 ---------------------------
 1 file changed, 268 deletions(-)

diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index 4b8d5872c5d..364746ca02a 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -338,138 +338,18 @@ interface Observable {
   cacheFor<K extends keyof this>(key: K): unknown;
 }
 const Observable = Mixin.create({
-  /**
-    Retrieves the value of a property from the object.
-
-    This method is usually similar to using `object[keyName]` or `object.keyName`,
-    however it supports both computed properties and the unknownProperty
-    handler.
-
-    Because `get` unifies the syntax for accessing all these kinds
-    of properties, it can make many refactorings easier, such as replacing a
-    simple property with a computed property, or vice versa.
-
-    ### Computed Properties
-
-    Computed properties are methods defined with the `property` modifier
-    declared at the end, such as:
-
-    ```javascript
-    import { computed } from '@ember/object';
-
-    fullName: computed('firstName', 'lastName', function() {
-      return this.get('firstName') + ' ' + this.get('lastName');
-    })
-    ```
-
-    When you call `get` on a computed property, the function will be
-    called and the return value will be returned instead of the function
-    itself.
-
-    ### Unknown Properties
-
-    Likewise, if you try to call `get` on a property whose value is
-    `undefined`, the `unknownProperty()` method will be called on the object.
-    If this method returns any value other than `undefined`, it will be returned
-    instead. This allows you to implement "virtual" properties that are
-    not defined upfront.
-
-    @method get
-    @param {String} keyName The property to retrieve
-    @return {Object} The property value or undefined.
-    @public
-  */
   get(keyName: string) {
     return get(this, keyName);
   },
 
-  /**
-    To get the values of multiple properties at once, call `getProperties`
-    with a list of strings or an array:
-
-    ```javascript
-    record.getProperties('firstName', 'lastName', 'zipCode');
-    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
-    ```
-
-    is equivalent to:
-
-    ```javascript
-    record.getProperties(['firstName', 'lastName', 'zipCode']);
-    // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
-    ```
-
-    @method getProperties
-    @param {String...|Array} list of keys to get
-    @return {Object}
-    @public
-  */
   getProperties(...args: string[]) {
     return getProperties(this, ...args);
   },
 
-  /**
-    Sets the provided key or path to the value.
-
-    ```javascript
-    record.set("key", value);
-    ```
-
-    This method is generally very similar to calling `object["key"] = value` or
-    `object.key = value`, except that it provides support for computed
-    properties, the `setUnknownProperty()` method and property observers.
-
-    ### Computed Properties
-
-    If you try to set a value on a key that has a computed property handler
-    defined (see the `get()` method for an example), then `set()` will call
-    that method, passing both the value and key instead of simply changing
-    the value itself. This is useful for those times when you need to
-    implement a property that is composed of one or more member
-    properties.
-
-    ### Unknown Properties
-
-    If you try to set a value on a key that is undefined in the target
-    object, then the `setUnknownProperty()` handler will be called instead. This
-    gives you an opportunity to implement complex "virtual" properties that
-    are not predefined on the object. If `setUnknownProperty()` returns
-    undefined, then `set()` will simply set the value on the object.
-
-    ### Property Observers
-
-    In addition to changing the property, `set()` will also register a property
-    change with the object. Unless you have placed this call inside of a
-    `beginPropertyChanges()` and `endPropertyChanges(),` any "local" observers
-    (i.e. observer methods declared on the same object), will be called
-    immediately. Any "remote" observers (i.e. observer methods declared on
-    another object) will be placed in a queue and called at a later time in a
-    coalesced manner.
-
-    @method set
-    @param {String} keyName The property to set
-    @param {Object} value The value to set or `null`.
-    @return {Object} The passed value
-    @public
-  */
   set(keyName: string, value: unknown) {
     return set(this, keyName, value);
   },
 
-  /**
-    Sets a list of properties at once. These properties are set inside
-    a single `beginPropertyChanges` and `endPropertyChanges` batch, so
-    observers will be buffered.
-
-    ```javascript
-    record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
-    ```
-
-    @method setProperties
-    @param {Object} hash the hash of keys and values to set
-    @return {Object} The passed in hash
-    @public
-  */
   setProperties(hash: object) {
     return setProperties(this, hash);
   },
@@ -531,89 +411,6 @@ const Observable = Mixin.create({
     return this;
   },
 
-  /**
-    Adds an observer on a property.
-
-    This is the core method used to register an observer for a property.
-
-    Once you call this method, any time the key's value is set, your observer
-    will be notified. Note that the observers are triggered any time the
-    value is set, regardless of whether it has actually changed. Your
-    observer should be prepared to handle that.
-
-    There are two common invocation patterns for `.addObserver()`:
-
-    - Passing two arguments:
-      - the name of the property to observe (as a string)
-      - the function to invoke (an actual function)
-    - Passing three arguments:
-      - the name of the property to observe (as a string)
-      - the target object (will be used to look up and invoke a
-        function on)
-      - the name of the function to invoke on the target object
-        (as a string).
-
-    ```app/components/my-component.js
-    import Component from '@ember/component';
-
-    export default Component.extend({
-      init() {
-        this._super(...arguments);
-
-        // the following are equivalent:
-
-        // using three arguments
-        this.addObserver('foo', this, 'fooDidChange');
-
-        // using two arguments
-        this.addObserver('foo', (...args) => {
-          this.fooDidChange(...args);
-        });
-      },
-
-      fooDidChange() {
-        // your custom logic code
-      }
-    });
-    ```
-
-    ### Observer Methods
-
-    Observer methods have the following signature:
-
-    ```app/components/my-component.js
-    import Component from '@ember/component';
-
-    export default Component.extend({
-      init() {
-        this._super(...arguments);
-        this.addObserver('foo', this, 'fooDidChange');
-      },
-
-      fooDidChange(sender, key, value, rev) {
-        // your code
-      }
-    });
-    ```
-
-    The `sender` is the object that changed. The `key` is the property that
-    changes. The `value` property is currently reserved and unused. The `rev`
-    is the last property revision of the object when it changed, which you can
-    use to detect if the key value has really changed or not.
-
-    Usually you will not need the value or revision parameters at
-    the end. In this case, it is common to write observer methods that take
-    only a sender and key value as parameters or, if you aren't interested in
-    any of these values, to write an observer that has no parameters at all.
-
-    @method addObserver
-    @param {String} key The key to observe
-    @param {Object} target The target object to invoke
-    @param {String|Function} method The method to invoke
-    @param {Boolean} sync Whether the observer is sync or not
-    @return {Observable}
-    @public
-  */
   addObserver(
     key: string,
     target: object | Function | null,
@@ -624,19 +421,6 @@ const Observable = Mixin.create({
     return this;
   },
 
-  /**
-    Remove an observer you have previously registered on this object. Pass
-    the same key, target, and method you passed to `addObserver()` and your
-    target will no longer receive notifications.
-
-    @method removeObserver
-    @param {String} key The key to observe
-    @param {Object} target The target object to invoke
-    @param {String|Function} method The method to invoke
-    @param {Boolean} sync Whether the observer is async or not
-    @return {Observable}
-    @public
-  */
   removeObserver(
     key: string,
     target: object | Function | null,
@@ -662,20 +446,6 @@ const Observable = Mixin.create({
     return hasListeners(this, `${key}:change`);
   },
 
-  /**
-    Set the value of a property to the current value plus some amount.
-
-    ```javascript
-    person.incrementProperty('age');
-    team.incrementProperty('score', 2);
-    ```
-
-    @method incrementProperty
-    @param {String} keyName The name of the property to increment
-    @param {Number} increment The amount to increment by. Defaults to 1
-    @return {Number} The new property value
-    @public
-  */
   incrementProperty(keyName: string, increment = 1) {
     assert(
       'Must pass a numeric value to incrementProperty',
@@ -684,20 +454,6 @@ const Observable = Mixin.create({
     return set(this, keyName, (parseFloat(get(this, keyName)) || 0) + increment);
   },
 
-  /**
-    Set the value of a property to the current value minus some amount.
-
-    ```javascript
-    player.decrementProperty('lives');
-    orc.decrementProperty('health', 5);
-    ```
-
-    @method decrementProperty
-    @param {String} keyName The name of the property to decrement
-    @param {Number} decrement The amount to decrement by. Defaults to 1
-    @return {Number} The new property value
-    @public
-  */
   decrementProperty(keyName: string, decrement = 1) {
     assert(
       'Must pass a numeric value to decrementProperty',
@@ -706,34 +462,10 @@ const Observable = Mixin.create({
     return set(this, keyName, (get(this, keyName) || 0) - decrement);
   },
 
-  /**
-    Set the value of a boolean property to the opposite of its
-    current value.
-
-    ```javascript
-    starship.toggleProperty('warpDriveEngaged');
-    ```
-
-    @method toggleProperty
-    @param {String} keyName The name of the property to toggle
-    @return {Boolean} The new property value
-    @public
-  */
   toggleProperty(keyName: string) {
     return set(this, keyName, !get(this, keyName));
   },
 
-  /**
-    Returns the cached value of a computed property, if it exists.
-    This allows you to inspect the value of a computed property
-    without accidentally invoking it if it is intended to be
-    generated lazily.
-
-    @method cacheFor
-    @param {String} keyName
-    @return {Object} The cached value of the computed property, if any
-    @public
-  */
   cacheFor(keyName: string) {
     let meta = peekMeta(this);
 

From c845dbe05ee86d1b5944cb7600394c22387e5ec7 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 15 Sep 2022 06:54:49 -0600
Subject: [PATCH 1138/1405] [BUGFIX beta] Provide a `.d.ts` file at
 types/stable

This file currently does nothing, but in the months ahead will look more
and more like the `/types/preview/index.d.ts` while that one empties.
This is just here so that someone who writes the import we recommend--

```ts
import 'ember-source';
import 'ember-source/preview';
```

--will not get warnings from TypeScript while we wait on putting actual
things here!
---
 types/stable/index.d.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 types/stable/index.d.ts

diff --git a/types/stable/index.d.ts b/types/stable/index.d.ts
new file mode 100644
index 00000000000..3fd1f5f4728
--- /dev/null
+++ b/types/stable/index.d.ts
@@ -0,0 +1,12 @@
+// Future home of stable Ember types! This file currently does nothing, but in
+// the months ahead will look more and more like the `/types/preview/index.d.ts`
+// while that one empties. This is just here so that someone who writes the
+// import we recommend--
+//
+// ```ts
+// import 'ember-source';
+// import 'ember-source/preview';
+// ```
+//
+// --will not get warnings from TypeScript while we wait on putting actual
+// things here!

From 40c1c8df3a10896db1f2e66e768b6985a53f208b Mon Sep 17 00:00:00 2001
From: Richard Glazerman <rglazerman@squareup.com>
Date: Thu, 15 Sep 2022 15:41:57 -0400
Subject: [PATCH 1139/1405] Use quickfix to fix two typescript errors

---
 packages/@ember/-internals/container/lib/container.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index af6e4a5df6f..7ee69122767 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -225,13 +225,15 @@ if (DEBUG) {
  * Wrap a factory manager in a proxy which will not permit properties to be
  * set on the manager.
  */
-function wrapManagerInDeprecationProxy<T extends object, C>(
+function wrapManagerInDeprecationProxy<T extends object, C extends object | FactoryClass>(
   manager: FactoryManager<T, C>
 ): FactoryManager<T, C> {
   let validator = {
     set(_obj: T, prop: keyof T) {
       throw new Error(
-        `You attempted to set "${prop}" on a factory manager created by container#factoryFor. A factory manager is a read-only construct.`
+        `You attempted to set "${String(
+          prop
+        )}" on a factory manager created by container#factoryFor. A factory manager is a read-only construct.`
       );
     },
   };

From bf3ac2794086c91758a5077f9ef8a131979bc3a0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 15 Sep 2022 17:54:42 -0600
Subject: [PATCH 1140/1405] [BUGFIX beta] types imports are at
 'ember-source/types'

This avoids the weird case of being able to just import
`'ember-source'`, which is quite unclear as to *what* is being
imported. Since these imports will only ever be typed at most once per
app or addon (and will mostly be *generated for people*!) this is a big
win in clarity for a small-to-zero cost for users.

Notably, these imports *already worked correctly*; this change mostly
makes sure that the *other* import does *not* work.
---
 package.json            | 5 ++++-
 types/stable/index.d.ts | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 3d6ad1b55ae..77f0e11f918 100644
--- a/package.json
+++ b/package.json
@@ -169,7 +169,10 @@
     "after": "ember-cli-legacy-blueprints"
   },
   "typesVersions": {
-    "*": {
+    "types/*": {
+      "stable": [
+        "./types/stable"
+      ],
       "preview": [
         "./types/preview"
       ]
diff --git a/types/stable/index.d.ts b/types/stable/index.d.ts
index 3fd1f5f4728..b55ef1447a1 100644
--- a/types/stable/index.d.ts
+++ b/types/stable/index.d.ts
@@ -4,8 +4,8 @@
 // import we recommend--
 //
 // ```ts
-// import 'ember-source';
-// import 'ember-source/preview';
+// import 'ember-source/types';
+// import 'ember-source/types/preview';
 // ```
 //
 // --will not get warnings from TypeScript while we wait on putting actual

From 133b0c15baa74805a71f51b4e006e603ab02cf47 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Mon, 19 Sep 2022 16:32:50 +0530
Subject: [PATCH 1141/1405] Updated docs in array/index.ts

---
 packages/@ember/array/index.ts | 633 ++++++++++++++++-----------------
 1 file changed, 315 insertions(+), 318 deletions(-)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 3de3d1605e8..6b9c0268a96 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -250,76 +250,6 @@ function mapBy<T>(this: EmberArray<T>, key: string) {
   @public
 */
 interface EmberArray<T> extends Enumerable {
-  length: number;
-  objectAt(idx: number): T | undefined;
-  objectsAt(indexes: number[]): Array<T | undefined>;
-  firstObject: T | undefined;
-  lastObject: T | undefined;
-  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
-  indexOf(object: T, startAt?: number): number;
-  lastIndexOf(object: T, startAt?: number): number;
-  forEach<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => void,
-    target?: Target
-  ): this;
-  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
-  setEach<K extends string>(key: K, value: Value<T, K>): this;
-  map<U, Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => U,
-    target?: Target
-  ): NativeArray<U>;
-  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
-  filter<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): NativeArray<T>;
-  reject<Target>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): NativeArray<T>;
-  filterBy(key: string, value?: unknown): NativeArray<T>;
-  rejectBy(key: string, value?: unknown): NativeArray<T>;
-  find<S extends T, Target = void>(
-    predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
-    thisArg?: Target
-  ): S | undefined;
-  find<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): T | undefined;
-  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
-  every<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): boolean;
-  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
-  any<Target = void>(
-    callback: (this: Target, item: T, index: number, arr: this) => unknown,
-    target?: Target
-  ): boolean;
-  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
-  reduce<V>(
-    callback: (summation: V, current: T, index: number, arr: this) => V,
-    initialValue?: V
-  ): V;
-  invoke<K extends string>(
-    methodName: K,
-    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
-  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
-  toArray(): T[];
-  compact(): NativeArray<Exclude<T, null>>;
-  includes(object: T, startAt?: number): boolean;
-  sortBy(key: string): T[];
-  uniq(): NativeArray<T>;
-  uniqBy(key: string): NativeArray<T>;
-  without(value: T): NativeArray<T>;
-}
-const EmberArray = Mixin.create(Enumerable, {
-  init() {
-    this._super(...arguments);
-    setEmberArray(this);
-  },
-
   /**
     __Required.__ You must implement this method to apply this mixin.
 
@@ -329,7 +259,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @property {Number} length
     @public
   */
-
+  length: number;
   /**
     Returns the object at the given `index`. If the given `index` is negative
     or is greater or equal than the array length, returns `undefined`.
@@ -354,7 +284,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {*} item at index or undefined
     @public
   */
-
+  objectAt(idx: number): T | undefined;
   /**
     This returns the objects at the specified indexes, using `objectAt`.
 
@@ -370,10 +300,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array}
     @public
    */
-  objectsAt(indexes: number[]) {
-    return indexes.map((idx) => objectAt(this, idx));
-  },
-
+  objectsAt(indexes: number[]): Array<T | undefined>;
   /**
     This is the handler for the special array content property. If you get
     this property, it will return this. If you set this property to a new
@@ -392,16 +319,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return this
     @public
   */
-  '[]': nonEnumerableComputed({
-    get() {
-      return this;
-    },
-    set(_key, value) {
-      this.replace(0, this.length, value);
-      return this;
-    },
-  }),
-
+  '[]': this;
   /**
     The first object in the array, or `undefined` if the array is empty.
 
@@ -423,10 +341,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object | undefined} The first object in the array
     @public
   */
-  firstObject: nonEnumerableComputed(function () {
-    return objectAt(this, 0);
-  }).readOnly(),
-
+  firstObject: T | undefined;
   /**
     The last object in the array, or `undefined` if the array is empty.
 
@@ -434,11 +349,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object | undefined} The last object in the array
     @public
   */
-  lastObject: nonEnumerableComputed(function () {
-    return objectAt(this, this.length - 1);
-  }).readOnly(),
-
-  // Add any extra methods to EmberArray that are native to the built-in Array.
+  lastObject: T | undefined;
   /**
     Returns a new array that is a slice of the receiver. This implementation
     uses the observable array methods to retrieve the objects for the new
@@ -458,30 +369,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} New array with specified slice
     @public
   */
-  slice(beginIndex = 0, endIndex?: number) {
-    let ret = A();
-    let length = this.length;
-
-    if (beginIndex < 0) {
-      beginIndex = length + beginIndex;
-    }
-
-    let validatedEndIndex: number;
-    if (endIndex === undefined || endIndex > length) {
-      validatedEndIndex = length;
-    } else if (endIndex < 0) {
-      validatedEndIndex = length + endIndex;
-    } else {
-      validatedEndIndex = endIndex;
-    }
-
-    while (beginIndex < validatedEndIndex) {
-      ret[ret.length] = objectAt(this, beginIndex++);
-    }
-
-    return ret;
-  },
-
+  slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
   /**
     Used to determine the passed object's first occurrence in the array.
     Returns the index if found, -1 if no match is found.
@@ -519,11 +407,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Number} index or -1 if not found
     @public
   */
-
-  indexOf<T>(object: T, startAt?: number) {
-    return indexOf(this, object, startAt, false);
-  },
-
+  indexOf(object: T, startAt?: number): number;
   /**
     Returns the index of the given `object`'s last occurrence.
 
@@ -558,26 +442,7 @@ const EmberArray = Mixin.create(Enumerable, {
     if not found
     @public
   */
-  lastIndexOf<T>(object: T, startAt?: number) {
-    let len = this.length;
-
-    if (startAt === undefined || startAt >= len) {
-      startAt = len - 1;
-    }
-
-    if (startAt < 0) {
-      startAt += len;
-    }
-
-    for (let idx = startAt; idx >= 0; idx--) {
-      if (objectAt(this, idx) === object) {
-        return idx;
-      }
-    }
-
-    return -1;
-  },
-
+  lastIndexOf(object: T, startAt?: number): number;
   /**
     Iterates through the array, calling the passed function on each
     item. This method corresponds to the `forEach()` method defined in
@@ -625,19 +490,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object} receiver
     @public
   */
-  forEach(callback: <T>(item: T, index: number, arr: EmberArray<T>) => void, target = null) {
-    assert('`forEach` expects a function as first argument.', typeof callback === 'function');
-
-    let length = this.length;
-
-    for (let index = 0; index < length; index++) {
-      let item = this.objectAt(index);
-      callback.call(target, item, index, this);
-    }
-
-    return this;
-  },
-
+  forEach<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => void,
+    target?: Target
+  ): this;
   /**
     Alias for `mapBy`.
 
@@ -659,8 +515,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} The mapped array.
     @public
   */
-  getEach: mapBy,
-
+  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
   /**
     Sets the value on the named property for each member. This is more
     ergonomic than using other methods defined on this helper. If the object
@@ -680,10 +535,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object} receiver
     @public
   */
-  setEach(key: string, value: unknown) {
-    return this.forEach((item: object) => set(item, key, value));
-  },
-
+  setEach<K extends string>(key: K, value: Value<T, K>): this;
   /**
     Maps all of the items in the enumeration to another value, returning
     a new array. This method corresponds to `map()` defined in JavaScript 1.6.
@@ -718,20 +570,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} The mapped array.
     @public
   */
-  map<T>(
-    this: EmberArray<T>,
-    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
-    target = null
-  ) {
-    assert('`map` expects a function as first argument.', typeof callback === 'function');
-
-    let ret = A();
-
-    this.forEach((x, idx, i) => (ret[idx] = callback.call(target, x, idx, i)));
-
-    return ret;
-  },
-
+  map<U, Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => U,
+    target?: Target
+  ): NativeArray<U>;
   /**
     Similar to map, this specialized function returns the value of the named
     property on all items in the enumeration.
@@ -751,8 +593,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} The mapped array.
     @public
   */
-  mapBy,
-
+  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
   /**
     Returns a new array with all of the items in the enumeration that the provided
     callback function returns true for. This method corresponds to [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
@@ -812,24 +653,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} A filtered array.
     @public
   */
-  filter<T>(
-    this: EmberArray<T>,
-    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
-    target = null
-  ) {
-    assert('`filter` expects a function as first argument.', typeof callback === 'function');
-
-    let ret = A();
-
-    this.forEach((x, idx, i) => {
-      if (callback.call(target, x, idx, i)) {
-        ret.push(x);
-      }
-    });
-
-    return ret;
-  },
-
+  filter<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): NativeArray<T>;
   /**
     Returns an array with all of the items in the enumeration where the passed
     function returns false. This method is the inverse of filter().
@@ -870,18 +697,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} A rejected array.
     @public
   */
-  reject<T>(
-    this: EmberArray<T>,
-    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
-    target = null
-  ) {
-    assert('`reject` expects a function as first argument.', typeof callback === 'function');
-    return this.filter(function () {
-      // @ts-expect-error TS doesn't like us using arguments like this
-      return !callback.apply(target, arguments);
-    });
-  },
-
+  reject<Target>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): NativeArray<T>;
   /**
     Filters the array by the property and an optional value. If a value is given, it returns
     the items that have said value for the property. If not, it returns all the items that
@@ -902,11 +721,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} filtered array
     @public
   */
-  filterBy() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    return this.filter(iter(...arguments));
-  },
-
+  filterBy(key: string, value?: unknown): NativeArray<T>;
   /**
     Returns an array with the items that do not have truthy values for the provided key.
     You can pass an optional second argument with a target value to reject for the key.
@@ -930,11 +745,11 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} rejected array
     @public
   */
-  rejectBy() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    return this.reject(iter(...arguments));
-  },
-
+  rejectBy(key: string, value?: unknown): NativeArray<T>;
+  find<S extends T, Target = void>(
+    predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
+    thisArg?: Target
+  ): S | undefined;
   /**
     Returns the first item in the array for which the callback returns true.
     This method is similar to the `find()` method defined in ECMAScript 2015.
@@ -977,11 +792,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object} Found item or `undefined`.
     @public
   */
-  find(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
-    assert('`find` expects a function as first argument.', typeof callback === 'function');
-    return find(this, callback, target);
-  },
-
+  find<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): T | undefined;
   /**
     Returns the first item with a property matching the passed value. You
     can pass an optional second argument with the target value. Otherwise
@@ -1010,12 +824,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object} found item or `undefined`
     @public
   */
-  findBy() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    let callback = iter(...arguments);
-    return find(this, callback);
-  },
-
+  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
   /**
     Returns `true` if the passed function returns true for every item in the
     enumeration. This corresponds with the `Array.prototype.every()` method defined in ES5.
@@ -1053,11 +862,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Boolean}
     @public
   */
-  every(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
-    assert('`every` expects a function as first argument.', typeof callback === 'function');
-    return every(this, callback, target);
-  },
-
+  every<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): boolean;
   /**
     Returns `true` if the passed property resolves to the value of the second
     argument for all items in the array. This method is often simpler/faster
@@ -1096,12 +904,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @since 1.3.0
     @public
   */
-  isEvery() {
-    // @ts-expect-error TS doesn't like the ...arguments spread here.
-    let callback = iter(...arguments);
-    return every(this, callback);
-  },
-
+  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
   /**
     The any() method executes the callback function once for each element
     present in the array until it finds the one where callback returns a truthy
@@ -1141,11 +944,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Boolean} `true` if the passed function returns `true` for any item
     @public
   */
-  any(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
-    assert('`any` expects a function as first argument.', typeof callback === 'function');
-    return any(this, callback, target);
-  },
-
+  any<Target = void>(
+    callback: (this: Target, item: T, index: number, arr: this) => unknown,
+    target?: Target
+  ): boolean;
   /**
     Returns `true` if the passed property resolves to the value of the second
     argument for any item in the array. This method is often simpler/faster
@@ -1170,12 +972,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @since 1.3.0
     @public
   */
-  isAny() {
-    // @ts-expect-error TS doesn't like us using arguments like this
-    let callback = iter(...arguments);
-    return any(this, callback);
-  },
-
+  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
   /**
     This will combine the values of the array into a single value. It
     is a useful way to collect a summary value from an array. This
@@ -1230,23 +1027,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Object} The reduced value.
     @public
   */
-  // FIXME: When called without initialValue, behavior does not match native behavior
-  reduce<T, V>(
-    this: EmberArray<T>,
-    callback: (summation: V, current: T, index: number, arr: EmberArray<T>) => V,
-    initialValue: V
-  ) {
-    assert('`reduce` expects a function as first argument.', typeof callback === 'function');
-
-    let ret = initialValue;
-
-    this.forEach(function (item, i) {
-      ret = callback(ret, item, i, this);
-    }, this);
-
-    return ret;
-  },
-
+  reduce<V>(
+    callback: (summation: V, current: T, index: number, arr: this) => V,
+    initialValue?: V
+  ): V;
   /**
     Invokes the named method on every object in the receiver that
     implements it. This method corresponds to the implementation in
@@ -1277,15 +1061,10 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} return values from calling invoke.
     @public
   */
-  invoke<T>(this: EmberArray<T>, methodName: string, ...args: unknown[]) {
-    let ret = A();
-
-    // SAFETY: This is not entirely safe and the code will not work with Ember proxies
-    this.forEach((item: T) => ret.push((item as any)[methodName]?.(...args)));
-
-    return ret;
-  },
-
+  invoke<K extends string>(
+    methodName: K,
+    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
+  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
   /**
     Simply converts the object into a genuine array. The order is not
     guaranteed. Corresponds to the method implemented by Prototype.
@@ -1294,10 +1073,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} the object as an array.
     @public
   */
-  toArray<T>(this: EmberArray<T>) {
-    return this.map((item: T) => item);
-  },
-
+  toArray(): T[];
   /**
     Returns a copy of the array with all `null` and `undefined` elements removed.
 
@@ -1310,10 +1086,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Array} the array without null and undefined elements.
     @public
   */
-  compact<T>(this: EmberArray<T>) {
-    return this.filter((value: T) => value != null);
-  },
-
+  compact(): NativeArray<Exclude<T, null>>;
   /**
     Used to determine if the array contains the passed object.
     Returns `true` if found, `false` otherwise.
@@ -1343,10 +1116,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {Boolean} `true` if object is found in the array.
     @public
   */
-  includes<T>(this: EmberArray<T>, object: T, startAt?: number) {
-    return indexOf(this, object, startAt, true) !== -1;
-  },
-
+  includes(object: T, startAt?: number): boolean;
   /**
     Sorts the array by the keys specified in the argument.
 
@@ -1372,25 +1142,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @since 1.2.0
     @public
   */
-  sortBy<T>(this: EmberArray<T>) {
-    let sortKeys = arguments;
-
-    return this.toArray().sort((a: T, b: T) => {
-      for (let i = 0; i < sortKeys.length; i++) {
-        let key = sortKeys[i];
-        let propA = get(a, key);
-        let propB = get(b, key);
-        // return 1 or -1 else continue to the next sortKey
-        let compareValue = compare(propA, propB);
-
-        if (compareValue) {
-          return compareValue;
-        }
-      }
-      return 0;
-    });
-  },
-
+  sortBy(key: string): T[];
   /**
     Returns a new array that contains only unique values. The default
     implementation returns an array regardless of the receiver type.
@@ -1406,10 +1158,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {EmberArray}
     @public
   */
-  uniq() {
-    return uniqBy(this);
-  },
-
+  uniq(): NativeArray<T>;
   /**
     Returns a new array that contains only items containing a unique property value.
     The default implementation returns an array regardless of the receiver type.
@@ -1427,11 +1176,7 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {EmberArray}
     @public
   */
-
-  uniqBy(key: string) {
-    return uniqBy(this, key);
-  },
-
+  uniqBy(key: string): NativeArray<T>;
   /**
     Returns a new array that excludes the passed value. The default
     implementation returns an array regardless of the receiver type.
@@ -1447,6 +1192,258 @@ const EmberArray = Mixin.create(Enumerable, {
     @return {EmberArray}
     @public
   */
+  without(value: T): NativeArray<T>;
+}
+const EmberArray = Mixin.create(Enumerable, {
+  init() {
+    this._super(...arguments);
+    setEmberArray(this);
+  },
+
+  objectsAt(indexes: number[]) {
+    return indexes.map((idx) => objectAt(this, idx));
+  },
+
+  '[]': nonEnumerableComputed({
+    get() {
+      return this;
+    },
+    set(_key, value) {
+      this.replace(0, this.length, value);
+      return this;
+    },
+  }),
+
+  firstObject: nonEnumerableComputed(function () {
+    return objectAt(this, 0);
+  }).readOnly(),
+
+  lastObject: nonEnumerableComputed(function () {
+    return objectAt(this, this.length - 1);
+  }).readOnly(),
+
+  // Add any extra methods to EmberArray that are native to the built-in Array.
+  slice(beginIndex = 0, endIndex?: number) {
+    let ret = A();
+    let length = this.length;
+
+    if (beginIndex < 0) {
+      beginIndex = length + beginIndex;
+    }
+
+    let validatedEndIndex: number;
+    if (endIndex === undefined || endIndex > length) {
+      validatedEndIndex = length;
+    } else if (endIndex < 0) {
+      validatedEndIndex = length + endIndex;
+    } else {
+      validatedEndIndex = endIndex;
+    }
+
+    while (beginIndex < validatedEndIndex) {
+      ret[ret.length] = objectAt(this, beginIndex++);
+    }
+
+    return ret;
+  },
+
+  indexOf<T>(object: T, startAt?: number) {
+    return indexOf(this, object, startAt, false);
+  },
+
+  lastIndexOf<T>(object: T, startAt?: number) {
+    let len = this.length;
+
+    if (startAt === undefined || startAt >= len) {
+      startAt = len - 1;
+    }
+
+    if (startAt < 0) {
+      startAt += len;
+    }
+
+    for (let idx = startAt; idx >= 0; idx--) {
+      if (objectAt(this, idx) === object) {
+        return idx;
+      }
+    }
+
+    return -1;
+  },
+
+  forEach(callback: <T>(item: T, index: number, arr: EmberArray<T>) => void, target = null) {
+    assert('`forEach` expects a function as first argument.', typeof callback === 'function');
+
+    let length = this.length;
+
+    for (let index = 0; index < length; index++) {
+      let item = this.objectAt(index);
+      callback.call(target, item, index, this);
+    }
+
+    return this;
+  },
+
+  getEach: mapBy,
+
+  setEach(key: string, value: unknown) {
+    return this.forEach((item: object) => set(item, key, value));
+  },
+
+  map<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
+    assert('`map` expects a function as first argument.', typeof callback === 'function');
+
+    let ret = A();
+
+    this.forEach((x, idx, i) => (ret[idx] = callback.call(target, x, idx, i)));
+
+    return ret;
+  },
+
+  mapBy,
+
+  filter<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
+    assert('`filter` expects a function as first argument.', typeof callback === 'function');
+
+    let ret = A();
+
+    this.forEach((x, idx, i) => {
+      if (callback.call(target, x, idx, i)) {
+        ret.push(x);
+      }
+    });
+
+    return ret;
+  },
+
+  reject<T>(
+    this: EmberArray<T>,
+    callback: (item: T, index: number, arr: EmberArray<T>) => unknown,
+    target = null
+  ) {
+    assert('`reject` expects a function as first argument.', typeof callback === 'function');
+    return this.filter(function () {
+      // @ts-expect-error TS doesn't like us using arguments like this
+      return !callback.apply(target, arguments);
+    });
+  },
+
+  filterBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    return this.filter(iter(...arguments));
+  },
+
+  rejectBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    return this.reject(iter(...arguments));
+  },
+
+  find(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
+    assert('`find` expects a function as first argument.', typeof callback === 'function');
+    return find(this, callback, target);
+  },
+
+  findBy() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    let callback = iter(...arguments);
+    return find(this, callback);
+  },
+
+  every(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
+    assert('`every` expects a function as first argument.', typeof callback === 'function');
+    return every(this, callback, target);
+  },
+
+  isEvery() {
+    // @ts-expect-error TS doesn't like the ...arguments spread here.
+    let callback = iter(...arguments);
+    return every(this, callback);
+  },
+
+  any(callback: <T>(item: T, index: number, arr: EmberArray<T>) => unknown, target = null) {
+    assert('`any` expects a function as first argument.', typeof callback === 'function');
+    return any(this, callback, target);
+  },
+
+  isAny() {
+    // @ts-expect-error TS doesn't like us using arguments like this
+    let callback = iter(...arguments);
+    return any(this, callback);
+  },
+
+  // FIXME: When called without initialValue, behavior does not match native behavior
+  reduce<T, V>(
+    this: EmberArray<T>,
+    callback: (summation: V, current: T, index: number, arr: EmberArray<T>) => V,
+    initialValue: V
+  ) {
+    assert('`reduce` expects a function as first argument.', typeof callback === 'function');
+
+    let ret = initialValue;
+
+    this.forEach(function (item, i) {
+      ret = callback(ret, item, i, this);
+    }, this);
+
+    return ret;
+  },
+
+  invoke<T>(this: EmberArray<T>, methodName: string, ...args: unknown[]) {
+    let ret = A();
+
+    // SAFETY: This is not entirely safe and the code will not work with Ember proxies
+    this.forEach((item: T) => ret.push((item as any)[methodName]?.(...args)));
+
+    return ret;
+  },
+
+  toArray<T>(this: EmberArray<T>) {
+    return this.map((item: T) => item);
+  },
+
+  compact<T>(this: EmberArray<T>) {
+    return this.filter((value: T) => value != null);
+  },
+
+  includes<T>(this: EmberArray<T>, object: T, startAt?: number) {
+    return indexOf(this, object, startAt, true) !== -1;
+  },
+
+  sortBy<T>(this: EmberArray<T>) {
+    let sortKeys = arguments;
+
+    return this.toArray().sort((a: T, b: T) => {
+      for (let i = 0; i < sortKeys.length; i++) {
+        let key = sortKeys[i];
+        let propA = get(a, key);
+        let propB = get(b, key);
+        // return 1 or -1 else continue to the next sortKey
+        let compareValue = compare(propA, propB);
+
+        if (compareValue) {
+          return compareValue;
+        }
+      }
+      return 0;
+    });
+  },
+
+  uniq() {
+    return uniqBy(this);
+  },
+
+  uniqBy(key: string) {
+    return uniqBy(this, key);
+  },
+
   without<T>(this: EmberArray<T>, value: T) {
     if (!this.includes(value)) {
       return this; // nothing to do

From 23cc70a05c157365fbaa669e17f460c10de69ad6 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Mon, 19 Sep 2022 16:40:21 +0530
Subject: [PATCH 1142/1405] Ignore `@` tags

---
 packages/@ember/array/index.ts | 181 ---------------------------------
 1 file changed, 181 deletions(-)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 6b9c0268a96..f11f54819e8 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -255,9 +255,6 @@ interface EmberArray<T> extends Enumerable {
 
     Your array must support the `length` property. Your replace methods should
     set this property whenever it changes.
-
-    @property {Number} length
-    @public
   */
   length: number;
   /**
@@ -278,11 +275,6 @@ interface EmberArray<T> extends Enumerable {
     arr.objectAt(4);   // undefined
     arr.objectAt(5);   // undefined
     ```
-
-    @method objectAt
-    @param {Number} idx The index of the item to return.
-    @return {*} item at index or undefined
-    @public
   */
   objectAt(idx: number): T | undefined;
   /**
@@ -294,11 +286,6 @@ interface EmberArray<T> extends Enumerable {
     arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
     arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
     ```
-
-    @method objectsAt
-    @param {Array} indexes An array of indexes of items to return.
-    @return {Array}
-    @public
    */
   objectsAt(indexes: number[]): Array<T | undefined>;
   /**
@@ -314,10 +301,6 @@ interface EmberArray<T> extends Enumerable {
     peopleToMoon.set('[]', ['Collins']); // ['Collins']
     peopleToMoon.get('[]'); // ['Collins']
     ```
-
-    @property []
-    @return this
-    @public
   */
   '[]': this;
   /**
@@ -336,18 +319,10 @@ interface EmberArray<T> extends Enumerable {
     vowels.clear();
     vowels.firstObject; // undefined
     ```
-
-    @property firstObject
-    @return {Object | undefined} The first object in the array
-    @public
   */
   firstObject: T | undefined;
   /**
     The last object in the array, or `undefined` if the array is empty.
-
-    @property lastObject
-    @return {Object | undefined} The last object in the array
-    @public
   */
   lastObject: T | undefined;
   /**
@@ -362,12 +337,6 @@ interface EmberArray<T> extends Enumerable {
     arr.slice(0, 2);    // ['red', 'green']
     arr.slice(1, 100);  // ['green', 'blue']
     ```
-
-    @method slice
-    @param {Number} beginIndex (Optional) index to begin slicing from.
-    @param {Number} endIndex (Optional) index to end the slice at (but not included).
-    @return {Array} New array with specified slice
-    @public
   */
   slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
   /**
@@ -400,12 +369,6 @@ interface EmberArray<T> extends Enumerable {
     people.indexOf(newPerson, -4); //  0
     people.indexOf(newPerson, 10); // -1
     ```
-
-    @method indexOf
-    @param {Object} object the item to search for
-    @param {Number} startAt optional starting location to search, default 0
-    @return {Number} index or -1 if not found
-    @public
   */
   indexOf(object: T, startAt?: number): number;
   /**
@@ -433,14 +396,6 @@ interface EmberArray<T> extends Enumerable {
     arr.lastIndexOf('b', 3);    //  1
     arr.lastIndexOf('a', 100);  //  4
     ```
-
-    @method lastIndexOf
-    @param {Object} object the item to search for
-    @param {Number} startAt optional starting location to search from
-    backwards, defaults to `(array.length - 1)`
-    @return {Number} The last index of the `object` in the array or -1
-    if not found
-    @public
   */
   lastIndexOf(object: T, startAt?: number): number;
   /**
@@ -483,12 +438,6 @@ interface EmberArray<T> extends Enumerable {
     // 2/3 banana
     // 3/3 carrot
     ```
-
-    @method forEach
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Object} receiver
-    @public
   */
   forEach<Target>(
     callback: (this: Target, item: T, index: number, arr: this) => void,
@@ -509,11 +458,6 @@ interface EmberArray<T> extends Enumerable {
     people.getEach('nonexistentProperty');
     // [undefined, undefined];
     ```
-
-    @method getEach
-    @param {String} key name of the property
-    @return {Array} The mapped array.
-    @public
   */
   getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
   /**
@@ -528,12 +472,6 @@ interface EmberArray<T> extends Enumerable {
     people.setEach('zipCode', '10011');
     // [{name: 'Joe', zipCode: '10011'}, {name: 'Matt', zipCode: '10011'}];
     ```
-
-    @method setEach
-    @param {String} key The key to set
-    @param {Object} value The object to set
-    @return {Object} receiver
-    @public
   */
   setEach<K extends string>(key: K, value: Value<T, K>): this;
   /**
@@ -563,12 +501,6 @@ interface EmberArray<T> extends Enumerable {
     Note that in addition to a callback, you can also pass an optional target
     object that will be set as `this` on the context. This is a good way
     to give your iterator function access to the current object.
-
-    @method map
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Array} The mapped array.
-    @public
   */
   map<U, Target>(
     callback: (this: Target, item: T, index: number, arr: this) => U,
@@ -587,11 +519,6 @@ interface EmberArray<T> extends Enumerable {
     people.mapBy('unknownProperty');
     // [undefined, undefined];
     ```
-
-    @method mapBy
-    @param {String} key name of the property
-    @return {Array} The mapped array.
-    @public
   */
   mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
   /**
@@ -646,12 +573,6 @@ interface EmberArray<T> extends Enumerable {
     let collection = new AdultsCollection({ engineering: true });
     collection.people.filter(isAdultAndEngineer, { target: collection });
     ```
-
-    @method filter
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Array} A filtered array.
-    @public
   */
   filter<Target>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -690,12 +611,6 @@ interface EmberArray<T> extends Enumerable {
       return thing.isFruit;
     }); // [{food: 'bread', isFruit: false}]
     ```
-
-    @method reject
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Array} A rejected array.
-    @public
   */
   reject<Target>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -714,12 +629,6 @@ interface EmberArray<T> extends Enumerable {
     things.filterBy('food', 'beans'); // [{ food: 'beans', isFruit: false }]
     things.filterBy('isFruit'); // [{ food: 'apple', isFruit: true }]
     ```
-
-    @method filterBy
-    @param {String} key the property to test
-    @param {*} [value] optional value to test against.
-    @return {Array} filtered array
-    @public
   */
   filterBy(key: string, value?: unknown): NativeArray<T>;
   /**
@@ -738,12 +647,6 @@ interface EmberArray<T> extends Enumerable {
       food.rejectBy('isFruit'); // [{ name: "carrot", isFruit: false }, { name: "bread", isFruit: false }]
       food.rejectBy('name', 'carrot'); // [{ name: "apple", isFruit: true }}, { name: "bread", isFruit: false }]
     ```
-
-    @method rejectBy
-    @param {String} key the property to test
-    @param {*} [value] optional value to test against.
-    @return {Array} rejected array
-    @public
   */
   rejectBy(key: string, value?: unknown): NativeArray<T>;
   find<S extends T, Target = void>(
@@ -785,12 +688,6 @@ interface EmberArray<T> extends Enumerable {
     users.find((user) => user.name == 'Tom'); // [{ id: 2, name: 'Tom' }]
     users.find(({ id }) => id == 3); // [{ id: 3, name: 'Melanie' }]
     ```
-
-    @method find
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Object} Found item or `undefined`.
-    @public
   */
   find<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -817,12 +714,6 @@ interface EmberArray<T> extends Enumerable {
     users.findBy('name', 'Melanie'); // { id: 3, name: 'Melanie', isTom: false }
     users.findBy('isTom'); // { id: 2, name: 'Tom', isTom: true }
     ```
-
-    @method findBy
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against.
-    @return {Object} found item or `undefined`
-    @public
   */
   findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
   /**
@@ -855,12 +746,6 @@ interface EmberArray<T> extends Enumerable {
     const people = Ember.A([{ name: 'John', age: 24 }, { name: 'Joan', age: 45 }]);
     const areAllAdults = people.every(isAdult);
     ```
-
-    @method every
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Boolean}
-    @public
   */
   every<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -896,13 +781,6 @@ interface EmberArray<T> extends Enumerable {
     compiledLanguages.isEvery('programmingLanguage'); // true
     languagesKnownByMe.isEvery('programmingLanguage'); // false
     ```
-
-    @method isEvery
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against. Defaults to `true`
-    @return {Boolean}
-    @since 1.3.0
-    @public
   */
   isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
   /**
@@ -937,12 +815,6 @@ interface EmberArray<T> extends Enumerable {
       Paychecks.addBiggerBonus();
     }
     ```
-
-    @method any
-    @param {Function} callback The callback to execute
-    @param {Object} [target] The target object to use
-    @return {Boolean} `true` if the passed function returns `true` for any item
-    @public
   */
   any<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -964,13 +836,6 @@ interface EmberArray<T> extends Enumerable {
 
     food.isAny('isFruit'); // true
     ```
-
-    @method isAny
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against. Defaults to `true`
-    @return {Boolean}
-    @since 1.3.0
-    @public
   */
   isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
   /**
@@ -1020,12 +885,6 @@ interface EmberArray<T> extends Enumerable {
         return truthValue && current;
       }); // false (true && false && false)
     ```
-
-    @method reduce
-    @param {Function} callback The callback to execute
-    @param {Object} initialValue Initial value for the reduce
-    @return {Object} The reduced value.
-    @public
   */
   reduce<V>(
     callback: (summation: V, current: T, index: number, arr: this) => V,
@@ -1054,12 +913,6 @@ interface EmberArray<T> extends Enumerable {
     people.invoke('greet'); // ['Hello Joe', 'Hello Matt']
     people.invoke('greet', 'Bonjour'); // ['Bonjour Joe', 'Bonjour Matt']
     ```
-
-    @method invoke
-    @param {String} methodName the name of the method
-    @param {Object...} args optional arguments to pass as well.
-    @return {Array} return values from calling invoke.
-    @public
   */
   invoke<K extends string>(
     methodName: K,
@@ -1068,10 +921,6 @@ interface EmberArray<T> extends Enumerable {
   /**
     Simply converts the object into a genuine array. The order is not
     guaranteed. Corresponds to the method implemented by Prototype.
-
-    @method toArray
-    @return {Array} the object as an array.
-    @public
   */
   toArray(): T[];
   /**
@@ -1081,10 +930,6 @@ interface EmberArray<T> extends Enumerable {
     let arr = ['a', null, 'c', undefined];
     arr.compact();  // ['a', 'c']
     ```
-
-    @method compact
-    @return {Array} the array without null and undefined elements.
-    @public
   */
   compact(): NativeArray<Exclude<T, null>>;
   /**
@@ -1109,12 +954,6 @@ interface EmberArray<T> extends Enumerable {
     [1, 2, 3].includes(1, -4); // true
     [1, 2, NaN].includes(NaN); // true
     ```
-
-    @method includes
-    @param {Object} object The object to search for.
-    @param {Number} startAt optional starting location to search, default 0
-    @return {Boolean} `true` if object is found in the array.
-    @public
   */
   includes(object: T, startAt?: number): boolean;
   /**
@@ -1135,12 +974,6 @@ interface EmberArray<T> extends Enumerable {
    colors.sortBy('weight', 'name');
    // [{name: 'blue', weight: 500}, {name: 'red', weight: 500}, {name: 'green', weight: 600}]
    ```
-
-    @method sortBy
-    @param {String} property name(s) to sort on
-    @return {Array} The sorted array.
-    @since 1.2.0
-    @public
   */
   sortBy(key: string): T[];
   /**
@@ -1153,10 +986,6 @@ interface EmberArray<T> extends Enumerable {
     ```
 
     This only works on primitive data types, e.g. Strings, Numbers, etc.
-
-    @method uniq
-    @return {EmberArray}
-    @public
   */
   uniq(): NativeArray<T>;
   /**
@@ -1170,11 +999,6 @@ interface EmberArray<T> extends Enumerable {
     let arr = [2.2, 2.1, 3.2, 3.3];
     arr.uniqBy(Math.floor);  // [2.2, 3.2];
     ```
-
-    @method uniqBy
-    @param {String,Function} key
-    @return {EmberArray}
-    @public
   */
   uniqBy(key: string): NativeArray<T>;
   /**
@@ -1186,11 +1010,6 @@ interface EmberArray<T> extends Enumerable {
     let arr = ['a', 'b', 'a', 'c'];
     arr.without('a');  // ['b', 'c']
     ```
-
-    @method without
-    @param {Object} value
-    @return {EmberArray}
-    @public
   */
   without(value: T): NativeArray<T>;
 }

From c250606b72cbaeb4342f88638953b27a1b5f12f3 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Mon, 19 Sep 2022 17:06:31 +0530
Subject: [PATCH 1143/1405] Updated MutableArray interface

---
 packages/@ember/array/index.ts | 310 ++++++++++++---------------------
 1 file changed, 113 insertions(+), 197 deletions(-)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index f11f54819e8..9e5cf4758ec 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -1295,24 +1295,6 @@ const EmberArray = Mixin.create(Enumerable, {
   @public
 */
 interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
-  replace(idx: number, amt: number, objects?: readonly T[]): void;
-  clear(): this;
-  insertAt(idx: number, object: T): this;
-  removeAt(start: number, len?: number): this;
-  pushObject(obj: T): this;
-  pushObjects(objects: T[]): this;
-  popObject(): T | undefined;
-  shiftObject(): T | null | undefined;
-  unshiftObject(object: T): this;
-  unshiftObjects(objects: T[]): this;
-  reverseObjects(): this;
-  setObjects(object: T[]): this;
-  removeObject(object: T): this;
-  removeObjects(objects: T[]): this;
-  addObject(obj: T): this;
-  addObjects(objects: T[]): this;
-}
-const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
   /**
     __Required.__ You must implement this method to apply this mixin.
 
@@ -1321,17 +1303,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     passed array.
 
     Note that this method is expected to validate the type(s) of objects that it expects.
-
-    @method replace
-    @param {Number} idx Starting index in the array to replace. If
-      idx >= length, then append to the end of the array.
-    @param {Number} amt Number of elements that should be removed from
-      the array, starting at *idx*.
-    @param {EmberArray} [objects] An optional array of zero or more objects that should be
-      inserted into the array at *idx*
-    @public
   */
-
+  replace(idx: number, amt: number, objects?: readonly T[]): void;
   /**
     Remove all elements from the array. This is useful if you
     want to reuse an existing array without having to recreate it.
@@ -1343,21 +1316,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.clear(); // []
     colors.length;  // 0
     ```
-
-    @method clear
-    @return {Array} An empty Array.
-    @public
   */
-  clear() {
-    let len = this.length;
-    if (len === 0) {
-      return this;
-    }
-
-    this.replace(0, len, EMPTY_ARRAY);
-    return this;
-  },
-
+  clear(): this;
   /**
     This will use the primitive `replace()` method to insert an object at the
     specified index.
@@ -1368,18 +1328,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.insertAt(2, 'yellow');  // ['red', 'green', 'yellow', 'blue']
     colors.insertAt(5, 'orange');  // Error: Index out of range
     ```
-
-    @method insertAt
-    @param {Number} idx index of insert the object at.
-    @param {Object} object object to insert
-    @return {EmberArray} receiver
-    @public
   */
-  insertAt(idx: number, object: unknown) {
-    insertAt(this, idx, object);
-    return this;
-  },
-
+  insertAt(idx: number, object: T): this;
   /**
     Remove an object at the specified index using the `replace()` primitive
     method. You can pass either a single index, or a start and a length.
@@ -1394,17 +1344,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.removeAt(2, 2);  // ['green', 'blue']
     colors.removeAt(4, 2);  // Error: Index out of range
     ```
-
-    @method removeAt
-    @param {Number} start index, start of range
-    @param {Number} len length of passing range
-    @return {EmberArray} receiver
-    @public
   */
-  removeAt(start: number, len?: number) {
-    return removeAt(this, start, len);
-  },
-
+  removeAt(start: number, len?: number): this;
   /**
     Push the object onto the end of the array. Works just like `push()` but it
     is KVO-compliant.
@@ -1415,16 +1356,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.pushObject('black');     // ['red', 'green', 'black']
     colors.pushObject(['yellow']);  // ['red', 'green', ['yellow']]
     ```
-
-    @method pushObject
-    @param {*} obj object to push
-    @return object same object passed as a param
-    @public
   */
-  pushObject<T>(this: MutableArray<T>, obj: T) {
-    return insertAt(this, this.length, obj);
-  },
-
+  pushObject(obj: T): this;
   /**
     Add the objects in the passed array to the end of the array. Defers
     notifying observers of the change until all objects are added.
@@ -1434,17 +1367,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
 
     colors.pushObjects(['yellow', 'orange']);  // ['red', 'yellow', 'orange']
     ```
-
-    @method pushObjects
-    @param {Array} objects the objects to add
-    @return {MutableArray} receiver
-    @public
   */
-  pushObjects<T>(this: MutableArray<T>, objects: T[]) {
-    this.replace(this.length, 0, objects);
-    return this;
-  },
-
+  pushObjects(objects: T[]): this;
   /**
     Pop object from array or nil if none are left. Works just like `pop()` but
     it is KVO-compliant.
@@ -1455,22 +1379,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.popObject();   // 'blue'
     console.log(colors);  // ['red', 'green']
     ```
-
-    @method popObject
-    @return object
-    @public
   */
-  popObject() {
-    let len = this.length;
-    if (len === 0) {
-      return null;
-    }
-
-    let ret = objectAt(this, len - 1);
-    this.removeAt(len - 1, 1);
-    return ret;
-  },
-
+  popObject(): T | undefined;
   /**
     Shift an object from start of array or nil if none are left. Works just
     like `shift()` but it is KVO-compliant.
@@ -1481,21 +1391,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.shiftObject();  // 'red'
     console.log(colors);   // ['green', 'blue']
     ```
-
-    @method shiftObject
-    @return object
-    @public
   */
-  shiftObject() {
-    if (this.length === 0) {
-      return null;
-    }
-
-    let ret = objectAt(this, 0);
-    this.removeAt(0);
-    return ret;
-  },
-
+  shiftObject(): T | null | undefined;
   /**
     Unshift an object to start of array. Works just like `unshift()` but it is
     KVO-compliant.
@@ -1506,16 +1403,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.unshiftObject('yellow');    // ['yellow', 'red']
     colors.unshiftObject(['black']);   // [['black'], 'yellow', 'red']
     ```
-
-    @method unshiftObject
-    @param {*} obj object to unshift
-    @return object same object passed as a param
-    @public
   */
-  unshiftObject<T>(this: MutableArray<T>, obj: T) {
-    return insertAt(this, 0, obj);
-  },
-
+  unshiftObject(object: T): this;
   /**
     Adds the named objects to the beginning of the array. Defers notifying
     observers until all objects have been added.
@@ -1526,36 +1415,13 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.unshiftObjects(['black', 'white']);   // ['black', 'white', 'red']
     colors.unshiftObjects('yellow'); // Type Error: 'undefined' is not a function
     ```
-
-    @method unshiftObjects
-    @param {Enumerable} objects the objects to add
-    @return {EmberArray} receiver
-    @public
   */
-  unshiftObjects<T>(this: MutableArray<T>, objects: T[]) {
-    this.replace(0, 0, objects);
-    return this;
-  },
-
+  unshiftObjects(objects: T[]): this;
   /**
     Reverse objects in the array. Works just like `reverse()` but it is
     KVO-compliant.
-
-    @method reverseObjects
-    @return {EmberArray} receiver
-     @public
   */
-  reverseObjects() {
-    let len = this.length;
-    if (len === 0) {
-      return this;
-    }
-
-    let objects = this.toArray().reverse();
-    this.replace(0, len, objects);
-    return this;
-  },
-
+  reverseObjects(): this;
   /**
     Replace all the receiver's content with content of the argument.
     If argument is an empty array receiver will be cleared.
@@ -1566,23 +1432,8 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     colors.setObjects(['black', 'white']);  // ['black', 'white']
     colors.setObjects([]);                  // []
     ```
-
-    @method setObjects
-    @param {EmberArray} objects array whose content will be used for replacing
-        the content of the receiver
-    @return {EmberArray} receiver with the new content
-    @public
   */
-  setObjects<T>(this: MutableArray<T>, objects: T[]) {
-    if (objects.length === 0) {
-      return this.clear();
-    }
-
-    let len = this.length;
-    this.replace(0, len, objects);
-    return this;
-  },
-
+  setObjects(object: T[]): this;
   /**
     Remove all occurrences of an object in the array.
 
@@ -1593,12 +1444,109 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     cities.removeObject('Lima');     // ['Berlin']
     cities.removeObject('Tokyo')     // ['Berlin']
     ```
+  */
+  removeObject(object: T): this;
+  /**
+    Removes each object in the passed array from the receiver.
+  */
+  removeObjects(objects: T[]): this;
+  /**
+    Push the object onto the end of the array if it is not already
+    present in the array.
+
+    ```javascript
+    let cities = ['Chicago', 'Berlin'];
 
-    @method removeObject
-    @param {*} obj object to remove
-    @return {EmberArray} receiver
-    @public
+    cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
+    cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
+    ```
   */
+  addObject(obj: T): this;
+  /**
+    Adds each object in the passed array to the receiver.
+  */
+  addObjects(objects: T[]): this;
+}
+const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
+  clear() {
+    let len = this.length;
+    if (len === 0) {
+      return this;
+    }
+
+    this.replace(0, len, EMPTY_ARRAY);
+    return this;
+  },
+
+  insertAt(idx: number, object: unknown) {
+    insertAt(this, idx, object);
+    return this;
+  },
+
+  removeAt(start: number, len?: number) {
+    return removeAt(this, start, len);
+  },
+
+  pushObject<T>(this: MutableArray<T>, obj: T) {
+    return insertAt(this, this.length, obj);
+  },
+
+  pushObjects<T>(this: MutableArray<T>, objects: T[]) {
+    this.replace(this.length, 0, objects);
+    return this;
+  },
+
+  popObject() {
+    let len = this.length;
+    if (len === 0) {
+      return null;
+    }
+
+    let ret = objectAt(this, len - 1);
+    this.removeAt(len - 1, 1);
+    return ret;
+  },
+
+  shiftObject() {
+    if (this.length === 0) {
+      return null;
+    }
+
+    let ret = objectAt(this, 0);
+    this.removeAt(0);
+    return ret;
+  },
+
+  unshiftObject<T>(this: MutableArray<T>, obj: T) {
+    return insertAt(this, 0, obj);
+  },
+
+  unshiftObjects<T>(this: MutableArray<T>, objects: T[]) {
+    this.replace(0, 0, objects);
+    return this;
+  },
+
+  reverseObjects() {
+    let len = this.length;
+    if (len === 0) {
+      return this;
+    }
+
+    let objects = this.toArray().reverse();
+    this.replace(0, len, objects);
+    return this;
+  },
+
+  setObjects<T>(this: MutableArray<T>, objects: T[]) {
+    if (objects.length === 0) {
+      return this.clear();
+    }
+
+    let len = this.length;
+    this.replace(0, len, objects);
+    return this;
+  },
+
   removeObject<T>(this: MutableArray<T>, obj: T) {
     let loc = this.length || 0;
     while (--loc >= 0) {
@@ -1611,14 +1559,6 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     return this;
   },
 
-  /**
-    Removes each object in the passed array from the receiver.
-
-    @method removeObjects
-    @param {EmberArray} objects the objects to remove
-    @return {EmberArray} receiver
-    @public
-  */
   removeObjects<T>(this: MutableArray<T>, objects: T[]) {
     beginPropertyChanges();
     for (let i = objects.length - 1; i >= 0; i--) {
@@ -1629,22 +1569,6 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     return this;
   },
 
-  /**
-    Push the object onto the end of the array if it is not already
-    present in the array.
-
-    ```javascript
-    let cities = ['Chicago', 'Berlin'];
-
-    cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
-    cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
-    ```
-
-    @method addObject
-    @param {*} obj object to add, if not already present
-    @return {EmberArray} receiver
-    @public
-  */
   addObject<T>(this: MutableArray<T>, obj: T) {
     let included = this.includes(obj);
 
@@ -1655,14 +1579,6 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
     return this;
   },
 
-  /**
-    Adds each object in the passed array to the receiver.
-
-    @method addObjects
-    @param {EmberArray} objects the objects to add.
-    @return {EmberArray} receiver
-    @public
-  */
   addObjects<T>(this: MutableArray<T>, objects: T[]) {
     beginPropertyChanges();
     objects.forEach((obj) => this.addObject(obj));

From 668d80210ebfad034a0f9b27c12c2ee4ae389ab6 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Mon, 19 Sep 2022 17:19:02 +0530
Subject: [PATCH 1144/1405] Update proxy.ts

---
 packages/@ember/array/proxy.ts | 73 ++++++++++++++--------------------
 1 file changed, 29 insertions(+), 44 deletions(-)

diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts
index 5f1fe145e99..3d658563462 100644
--- a/packages/@ember/array/proxy.ts
+++ b/packages/@ember/array/proxy.ts
@@ -116,8 +116,35 @@ function customTagForArrayProxy(proxy: object, key: string) {
   @uses MutableArray
   @public
 */
-// eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars
-interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArray<T> {}
+interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArray<T> {
+  /**
+    The content array. Must be an object that implements `Array` and/or
+    `MutableArray.`
+  */
+  content: C | null;
+  /**
+    The array that the proxy pretends to be. In the default `ArrayProxy`
+    implementation, this and `content` are the same. Subclasses of `ArrayProxy`
+    can override this property to provide things like sorting and filtering.
+  */
+  arrangedContent: C | null;
+  /**
+    Should actually retrieve the object at the specified index from the
+    content. You can override this method in subclasses to transform the
+    content item to something new.
+
+    This method will only be called if content is non-`null`.
+  */
+  objectAtContent(idx: number): T | undefined;
+  /**
+    Should actually replace the specified objects on the content array.
+    You can override this method in subclasses to transform the content item
+    into something new.
+
+    This method will only be called if content is non-`null`.
+  */
+  replaceContent(idx: number, amt: number, objects?: T[]): void;
+}
 class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
   extends EmberObject
   implements PropertyDidChange
@@ -169,30 +196,10 @@ class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
     this._removeArrangedContentArrayObserver();
   }
 
-  /**
-    The content array. Must be an object that implements `Array` and/or
-    `MutableArray.`
-
-    @property content
-    @type EmberArray
-    @public
-  */
   declare content: C | null;
 
   declare arrangedContent: C | null;
 
-  /**
-    Should actually retrieve the object at the specified index from the
-    content. You can override this method in subclasses to transform the
-    content item to something new.
-
-    This method will only be called if content is non-`null`.
-
-    @method objectAtContent
-    @param {Number} idx The index to retrieve.
-    @return {Object} the value or undefined if none found
-    @public
-  */
   objectAtContent(idx: number) {
     let arrangedContent = get(this, 'arrangedContent');
     assert('[BUG] Called objectAtContent without content', arrangedContent);
@@ -209,20 +216,6 @@ class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
     this.replaceContent(idx, amt, objects);
   }
 
-  /**
-    Should actually replace the specified objects on the content array.
-    You can override this method in subclasses to transform the content item
-    into something new.
-
-    This method will only be called if content is non-`null`.
-
-    @method replaceContent
-    @param {Number} idx The starting index
-    @param {Number} amt The number of items to remove from the content.
-    @param {Array} objects Optional array of objects to insert.
-    @return {void}
-    @public
-  */
   replaceContent(idx: number, amt: number, objects?: T[]) {
     let content = get(this, 'content');
     assert('[BUG] Called replaceContent without content', content);
@@ -398,14 +391,6 @@ class ArrayProxy<T, C extends EmberArray<T> | T[] = T[]>
 }
 
 ArrayProxy.reopen(MutableArray, {
-  /**
-    The array that the proxy pretends to be. In the default `ArrayProxy`
-    implementation, this and `content` are the same. Subclasses of `ArrayProxy`
-    can override this property to provide things like sorting and filtering.
-
-    @property arrangedContent
-    @public
-  */
   arrangedContent: alias('content'),
 });
 

From 2290078615a70a22013bc4780b4239bb92e1b534 Mon Sep 17 00:00:00 2001
From: Ivan Antonov <76484889+antonovkrez@users.noreply.github.com>
Date: Mon, 19 Sep 2022 16:16:56 +0300
Subject: [PATCH 1145/1405] fix license year

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index fc022d3a10c..fa4f9dae675 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020 Yehuda Katz, Tom Dale and Ember.js contributors
+Copyright (c) 2022 Yehuda Katz, Tom Dale and Ember.js contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

From 2513dd14afc0472d3e129a0b78d676bec9584a1d Mon Sep 17 00:00:00 2001
From: Ivan Antonov <76484889+antonovkrez@users.noreply.github.com>
Date: Mon, 19 Sep 2022 16:33:43 +0300
Subject: [PATCH 1146/1405] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index fa4f9dae675..cb6742de74f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2022 Yehuda Katz, Tom Dale and Ember.js contributors
+Copyright (c) 2011-2022 Yehuda Katz, Tom Dale and Ember.js contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

From 98e7aaf12362914f7ad2e57d299db399ef118fc4 Mon Sep 17 00:00:00 2001
From: Ivan Antonov <76484889+antonovkrez@users.noreply.github.com>
Date: Mon, 19 Sep 2022 21:20:40 +0300
Subject: [PATCH 1147/1405] Update license.js

---
 generators/license.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/license.js b/generators/license.js
index d19e9983d6d..a958b29ed23 100644
--- a/generators/license.js
+++ b/generators/license.js
@@ -1,6 +1,6 @@
 /*!
  * @overview  Ember - JavaScript Application Framework
- * @copyright Copyright 2011-2021 Tilde Inc. and contributors
+ * @copyright Copyright 2011-2022 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license

From 46774eba9a2e8956dd7227cdbd08aad96fe74b26 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 19 Sep 2022 15:19:55 -0400
Subject: [PATCH 1148/1405] Add v4.8.0-beta.3 to CHANGELOG

(cherry picked from commit 975b69e3de1bc8f8f6ad2c5096438c35c712f8ff)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0159f94406b..6bb087db593 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.8.0-beta.3 (September 19, 2022)
+
+- [#20194](https://github.com/emberjs/ember.js/pull/20194) [BUGFIX] Provide a `.d.ts` file at types/stable
+- [#20196](https://github.com/emberjs/ember.js/pull/20196) [BUGFIX] types imports are at 'ember-source/types'
+
 ### v4.8.0-beta.2 (September 13, 2022)
 
 - [#20186](https://github.com/emberjs/ember.js/pull/20186) [BUGFIX] Fix `@ember/runloop` type tests folder name so that the tests are properly excluded from the build

From 369b0ed950b80a1302973efad60591da7b6ef71a Mon Sep 17 00:00:00 2001
From: Qian Wan <qiawan@qiawan-mn1.linkedin.biz>
Date: Tue, 20 Sep 2022 08:43:42 +0200
Subject: [PATCH 1149/1405] modify docs

---
 packages/@ember/object/promise-proxy-mixin.ts | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index f652875a30c..8d2e71df7c6 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -171,18 +171,38 @@ interface PromiseProxyMixin<T> {
   finally: this['promise']['finally'];
 }
 const PromiseProxyMixin = Mixin.create({
+  /**
+    @property reason
+    @public
+  */
   reason: null,
 
+  /**
+    @property isPending
+    @public
+  */
   isPending: computed('isSettled', function () {
     return !get(this, 'isSettled');
   }).readOnly(),
 
+  /**
+    @property isSettled
+    @public
+  */
   isSettled: computed('isRejected', 'isFulfilled', function () {
     return get(this, 'isRejected') || get(this, 'isFulfilled');
   }).readOnly(),
 
+  /**
+    @property isRejected
+    @public
+  */
   isRejected: false,
 
+  /**
+    @property isFulfilled
+    @public
+  */
   isFulfilled: false,
 
   promise: computed({

From 5f8e4211fb5eb558e8d00024bc4d72f8413b8b07 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 20 Sep 2022 18:06:14 -0600
Subject: [PATCH 1150/1405] [BUGFIX beta]: fix type definition for `Route`

This was the only remaining use of `.extend()` to apply the associated
mixin, and the types were longer working correctly since `.extend()` no
longer creates new types.
---
 type-tests/preview/ember/route.ts       | 18 ++++++++++++++++++
 types/preview/@ember/routing/route.d.ts |  7 +++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/type-tests/preview/ember/route.ts b/type-tests/preview/ember/route.ts
index e532cfbbc05..ec17310c153 100755
--- a/type-tests/preview/ember/route.ts
+++ b/type-tests/preview/ember/route.ts
@@ -2,6 +2,8 @@ import Route from '@ember/routing/route';
 import Array from '@ember/array';
 import Ember from 'ember'; // currently needed for Transition
 import Transition from '@ember/routing/transition';
+import { expectTypeOf } from 'expect-type';
+import { AnyFn } from 'ember/-private/type-utils';
 
 // Ensure that Ember.Transition is private
 // @ts-expect-error
@@ -84,3 +86,19 @@ class WithBadReturningBeforeAndModelHooks extends Route {
     return "returning anything else is nonsensical (if 'legal')";
   }
 }
+
+class HasEvented extends Route {
+  methodUsingEvented() {
+    this.on('some-event', this, 'aMethod');
+  }
+
+  aMethod() {}
+}
+
+class HasActionHandler extends Route {
+  methodUsingActionHandler() {
+    expectTypeOf(this.actions).toEqualTypeOf<{
+      [index: string]: AnyFn;
+    }>();
+  }
+}
diff --git a/types/preview/@ember/routing/route.d.ts b/types/preview/@ember/routing/route.d.ts
index c2005e66153..f6c472d7920 100644
--- a/types/preview/@ember/routing/route.d.ts
+++ b/types/preview/@ember/routing/route.d.ts
@@ -8,14 +8,13 @@ declare module '@ember/routing/route' {
 
   type RouteModel = object | string | number;
 
+  export default interface Route<Model, Params extends object> extends ActionHandler, Evented {}
+
   /**
    * The `Ember.Route` class is used to define individual routes. Refer to
    * the [routing guide](http://emberjs.com/guides/routing/) for documentation.
    */
-  export default class Route<
-    Model = unknown,
-    Params extends object = object
-  > extends EmberObject.extend(ActionHandler, Evented) {
+  export default class Route<Model = unknown, Params extends object = object> extends EmberObject {
     // methods
     /**
      * This hook is called after this route's model has resolved. It follows

From a6d6831e242eb410a2d924735746119ccd25c95c Mon Sep 17 00:00:00 2001
From: patricklx <patricklx@users.noreply.github.com>
Date: Wed, 21 Sep 2022 10:35:40 +0200
Subject: [PATCH 1151/1405] fix TypeWatcher invoking itself during onChange

---
 packages/@ember/debug/data-adapter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 49f1243d92d..bc3e4c8a7a1 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -1,6 +1,6 @@
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import { _backburner } from '@ember/runloop';
+import { _backburner, next } from '@ember/runloop';
 import { get } from '@ember/object';
 import { dasherize } from '@ember/string';
 import Namespace from '@ember/application/namespace';
@@ -141,7 +141,7 @@ class TypeWatcher {
       consumeTag(tagFor(records, '[]'));
 
       if (hasBeenAccessed === true) {
-        onChange();
+        next(onChange);
       } else {
         hasBeenAccessed = true;
       }

From 0d3399046e01635a07eb9c1dd6091750fca5765b Mon Sep 17 00:00:00 2001
From: Josh Alexakos <64025205+jalexakos@users.noreply.github.com>
Date: Wed, 21 Sep 2022 13:15:52 -0700
Subject: [PATCH 1152/1405] [DOC] Reformat API docs for Typescript -
 @ember/controller

## Summary
Addressing Issue: [20172](https://github.com/emberjs/ember.js/issues/20172)

## Details
- Moved documentation for public APIs from `Mixin.create()` to the `ControllerMixin` interface
- Removed all unnecessary JSDocs tags (comments with `@` preceding them)
- Left private methods and properties documentation untouched
---
 packages/@ember/controller/index.ts | 216 ++++++++++++----------------
 1 file changed, 91 insertions(+), 125 deletions(-)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index eec66f8a35e..fd6ece1f672 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -32,20 +32,6 @@ interface ControllerMixin<T> extends ActionHandler {
   _qpDelegate: unknown | null;
 
   isController: true;
-  target: unknown | null;
-  model: T;
-
-  queryParams: Array<ControllerQueryParam>;
-
-  transitionToRoute(...args: RouteArgs<Route>): Transition;
-
-  replaceRoute(...args: RouteArgs<Route>): Transition;
-}
-const ControllerMixin = Mixin.create(ActionHandler, {
-  /* ducktype as a controller */
-  isController: true,
-
-  concatenatedProperties: ['queryParams'],
 
   /**
     The object to which actions from the view should be sent.
@@ -58,40 +44,14 @@ const ControllerMixin = Mixin.create(ActionHandler, {
     as part of the application's initialization process. In most cases the
     `target` property will automatically be set to the logical consumer of
     actions for the controller.
-
-    @property target
-    @default null
-    @public
   */
-  target: null,
-
-  store: null,
-
-  init() {
-    this._super(...arguments);
-    let owner = getOwner(this);
-    if (owner) {
-      this.namespace = owner.lookup('application:main');
-      this.target = owner.lookup('router:main');
-    }
-  },
+  target: unknown | null;
 
   /**
     The controller's current model. When retrieving or modifying a controller's
     model, this property should be used instead of the `content` property.
-
-    @property model
-    @public
   */
-  model: computed({
-    get() {
-      return this[MODEL];
-    },
-
-    set(_key, value) {
-      return (this[MODEL] = value);
-    },
-  }),
+  model: T;
 
   /**
     Defines which query parameters the controller accepts.
@@ -114,54 +74,8 @@ const ControllerMixin = Mixin.create(ActionHandler, {
     ```
     Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
     If query param type is not specified, it will default to `'string'`.
-
-    @for Ember.ControllerMixin
-    @property queryParams
-    @public
   */
-  queryParams: null,
-
-  /**
-   This property is updated to various different callback functions depending on
-   the current "state" of the backing route. It is used by
-   `Controller.prototype._qpChanged`.
-
-   The methods backing each state can be found in the `Route.prototype._qp` computed
-   property return value (the `.states` property). The current values are listed here for
-   the sanity of future travelers:
-
-   * `inactive` - This state is used when this controller instance is not part of the active
-     route hierarchy. Set in `Route.prototype._reset` (a `router.js` microlib hook) and
-     `Route.prototype.actions.finalizeQueryParamChange`.
-   * `active` - This state is used when this controller instance is part of the active
-     route hierarchy. Set in `Route.prototype.actions.finalizeQueryParamChange`.
-   * `allowOverrides` - This state is used in `Route.prototype.setup` (`route.js` microlib hook).
-
-    @method _qpDelegate
-    @private
-  */
-  _qpDelegate: null, // set by route
-
-  /**
-   During `Route#setup` observers are created to invoke this method
-   when any of the query params declared in `Controller#queryParams` property
-   are changed.
-
-   When invoked this method uses the currently active query param update delegate
-   (see `Controller.prototype._qpDelegate` for details) and invokes it with
-   the QP key/value being changed.
-
-    @method _qpChanged
-    @private
-  */
-  _qpChanged(controller: any, _prop: string) {
-    let dotIndex = _prop.indexOf('.[]');
-    let prop = dotIndex === -1 ? _prop : _prop.slice(0, dotIndex);
-
-    let delegate = controller._qpDelegate;
-    let value = get(controller, prop);
-    delegate(prop, value);
-  },
+  queryParams: Array<ControllerQueryParam>;
 
   /**
     Transition the application into another route. The route may
@@ -226,32 +140,8 @@ const ControllerMixin = Mixin.create(ActionHandler, {
     ```
 
     See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
-
-    @for Ember.ControllerMixin
-    @method transitionToRoute
-    @deprecated Use transitionTo from the Router service instead.
-    @param {String} [name] the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used
-      while transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-      containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @public
   */
-  transitionToRoute<R extends Route>(...args: RouteArgs<R>): Transition {
-    deprecateTransitionMethods('controller', 'transitionToRoute');
-
-    // target may be either another controller or a router
-    let target = get(this, 'target');
-
-    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
-    // mock out an object that only has the single method. Since this is deprecated, I think it's
-    // ok to be a little less than proper here.
-    let method = (target as Controller).transitionToRoute ?? (target as Router<R>).transitionTo;
-
-    return method.apply(target, prefixRouteNameArg(this, args));
-  },
+  transitionToRoute(...args: RouteArgs<Route>): Transition;
 
   /**
     Transition into another route while replacing the current URL, if possible.
@@ -302,19 +192,95 @@ const ControllerMixin = Mixin.create(ActionHandler, {
     aController.replaceRoute('/');
     aController.replaceRoute('/blog/post/1/comment/13');
     ```
+  */
+  replaceRoute(...args: RouteArgs<Route>): Transition;
+}
+const ControllerMixin = Mixin.create(ActionHandler, {
+  /* ducktype as a controller */
+  isController: true,
 
-    @for Ember.ControllerMixin
-    @method replaceRoute
-    @deprecated Use replaceWith from the Router service instead.
-    @param {String} [name] the name of the route or a URL
-    @param {...Object} models the model(s) or identifier(s) to be used
-    while transitioning to the route.
-    @param {Object} [options] optional hash with a queryParams property
-    containing a mapping of query parameters
-    @return {Transition} the transition object associated with this
-      attempted transition
-    @public
+  concatenatedProperties: ['queryParams'],
+
+  target: null,
+
+  store: null,
+
+  init() {
+    this._super(...arguments);
+    let owner = getOwner(this);
+    if (owner) {
+      this.namespace = owner.lookup('application:main');
+      this.target = owner.lookup('router:main');
+    }
+  },
+
+  model: computed({
+    get() {
+      return this[MODEL];
+    },
+
+    set(_key, value) {
+      return (this[MODEL] = value);
+    },
+  }),
+
+  queryParams: null,
+
+  /**
+   This property is updated to various different callback functions depending on
+   the current "state" of the backing route. It is used by
+   `Controller.prototype._qpChanged`.
+
+   The methods backing each state can be found in the `Route.prototype._qp` computed
+   property return value (the `.states` property). The current values are listed here for
+   the sanity of future travelers:
+
+   * `inactive` - This state is used when this controller instance is not part of the active
+     route hierarchy. Set in `Route.prototype._reset` (a `router.js` microlib hook) and
+     `Route.prototype.actions.finalizeQueryParamChange`.
+   * `active` - This state is used when this controller instance is part of the active
+     route hierarchy. Set in `Route.prototype.actions.finalizeQueryParamChange`.
+   * `allowOverrides` - This state is used in `Route.prototype.setup` (`route.js` microlib hook).
+
+    @method _qpDelegate
+    @private
+  */
+  _qpDelegate: null, // set by route
+
+  /**
+   During `Route#setup` observers are created to invoke this method
+   when any of the query params declared in `Controller#queryParams` property
+   are changed.
+
+   When invoked this method uses the currently active query param update delegate
+   (see `Controller.prototype._qpDelegate` for details) and invokes it with
+   the QP key/value being changed.
+
+    @method _qpChanged
+    @private
   */
+  _qpChanged(controller: any, _prop: string) {
+    let dotIndex = _prop.indexOf('.[]');
+    let prop = dotIndex === -1 ? _prop : _prop.slice(0, dotIndex);
+
+    let delegate = controller._qpDelegate;
+    let value = get(controller, prop);
+    delegate(prop, value);
+  },
+
+  transitionToRoute<R extends Route>(...args: RouteArgs<R>): Transition {
+    deprecateTransitionMethods('controller', 'transitionToRoute');
+
+    // target may be either another controller or a router
+    let target = get(this, 'target');
+
+    // SAFETY: We can't actually assert that this is a full Controller or Router since some tests
+    // mock out an object that only has the single method. Since this is deprecated, I think it's
+    // ok to be a little less than proper here.
+    let method = (target as Controller).transitionToRoute ?? (target as Router<R>).transitionTo;
+
+    return method.apply(target, prefixRouteNameArg(this, args));
+  },
 
   replaceRoute<R extends Route>(...args: RouteArgs<R>): Transition {
     deprecateTransitionMethods('controller', 'replaceRoute');

From 55d01f50dd012f819541151f16537c6eaa28dc2d Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 21 Sep 2022 17:47:37 -0600
Subject: [PATCH 1153/1405] [INTERNAL] fix TS linting issues

- Update to latest `typescript-eslint` parser and plugin.
- Fix a couple newly-identified lint issues.

I also have *some* hopes that this will fix the issues with linting we
have seen on CI (which I suspect are just a bad cache).
---
 package.json                                  |   4 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |   2 +-
 .../type-tests/unregister-destructor.test.ts  |   4 +-
 .../type-tests/set-helper-manager.test.ts     |   2 +-
 yarn.lock                                     | 187 ++++++++----------
 5 files changed, 88 insertions(+), 111 deletions(-)

diff --git a/package.json b/package.json
index 77f0e11f918..38881d1d5c4 100644
--- a/package.json
+++ b/package.json
@@ -100,8 +100,8 @@
     "@tsconfig/ember": "^1.0.1",
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.22.0",
-    "@typescript-eslint/parser": "^5.15.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/parser": "^5.38.0",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1166.0",
     "babel-template": "^6.26.0",
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 9f720559e17..5655ed8c4ee 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -230,7 +230,7 @@ export const CLASSIC_HELPER_MANAGER = getInternalHelperManager(Helper);
 class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
   implements HelperFactory<SimpleHelper<T, P, N>>
 {
-  isHelperFactory: true = true;
+  readonly isHelperFactory = true;
 
   constructor(public compute: HelperFunction<T, P, N>) {}
 
diff --git a/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts b/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts
index 99bdfa8e665..915f9d3ae17 100644
--- a/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts
+++ b/packages/@ember/destroyable/type-tests/unregister-destructor.test.ts
@@ -2,7 +2,7 @@ import { registerDestructor, unregisterDestructor } from '@ember/destroyable';
 import { expectTypeOf } from 'expect-type';
 
 class Foo {
-  type: 'foo' = 'foo';
+  readonly type = 'foo';
 }
 let obj = new Foo();
 
@@ -22,7 +22,7 @@ unregisterDestructor(obj);
 unregisterDestructor(destructor);
 
 class Bar {
-  type: 'blah' = 'blah';
+  readonly type = 'blah';
 }
 let obj2 = new Bar();
 
diff --git a/packages/@ember/helper/type-tests/set-helper-manager.test.ts b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
index d6138bad37f..f76d49e6ace 100644
--- a/packages/@ember/helper/type-tests/set-helper-manager.test.ts
+++ b/packages/@ember/helper/type-tests/set-helper-manager.test.ts
@@ -11,7 +11,7 @@ import { expectTypeOf } from 'expect-type';
 class Wrapper<T = unknown, P extends unknown[] = unknown[], N extends Dict<unknown> = Dict<unknown>>
   implements HelperFactory<SimpleHelper<T, P, N>>
 {
-  isHelperFactory: true = true;
+  readonly isHelperFactory = true;
 
   constructor(public compute: HelperFunction<T, P, N>) {}
 
diff --git a/yarn.lock b/yarn.lock
index 9d217f1714b..d374b1240e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1731,119 +1731,85 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.22.0.tgz#7b52a0de2e664044f28b36419210aea4ab619e2a"
-  integrity sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.22.0"
-    "@typescript-eslint/type-utils" "5.22.0"
-    "@typescript-eslint/utils" "5.22.0"
-    debug "^4.3.2"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
+"@typescript-eslint/eslint-plugin@^5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz#ac919a199548861012e8c1fb2ec4899ac2bc22ae"
+  integrity sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.38.0"
+    "@typescript-eslint/type-utils" "5.38.0"
+    "@typescript-eslint/utils" "5.38.0"
+    debug "^4.3.4"
+    ignore "^5.2.0"
     regexpp "^3.2.0"
-    semver "^7.3.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.15.0.tgz#95f603f8fe6eca7952a99bfeef9b85992972e728"
-  integrity sha512-NGAYP/+RDM2sVfmKiKOCgJYPstAO40vPAgACoWPO/+yoYKSgAXIFaBKsV8P0Cc7fwKgvj27SjRNX4L7f4/jCKQ==
+"@typescript-eslint/parser@^5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.0.tgz#5a59a1ff41a7b43aacd1bb2db54f6bf1c02b2ff8"
+  integrity sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.15.0"
-    "@typescript-eslint/types" "5.15.0"
-    "@typescript-eslint/typescript-estree" "5.15.0"
-    debug "^4.3.2"
-
-"@typescript-eslint/scope-manager@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.15.0.tgz#d97afab5e0abf4018d1289bd711be21676cdd0ee"
-  integrity sha512-EFiZcSKrHh4kWk0pZaa+YNJosvKE50EnmN4IfgjkA3bTHElPtYcd2U37QQkNTqwMCS7LXeDeZzEqnsOH8chjSg==
-  dependencies:
-    "@typescript-eslint/types" "5.15.0"
-    "@typescript-eslint/visitor-keys" "5.15.0"
+    "@typescript-eslint/scope-manager" "5.38.0"
+    "@typescript-eslint/types" "5.38.0"
+    "@typescript-eslint/typescript-estree" "5.38.0"
+    debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.22.0.tgz#590865f244ebe6e46dc3e9cab7976fc2afa8af24"
-  integrity sha512-yA9G5NJgV5esANJCO0oF15MkBO20mIskbZ8ijfmlKIvQKg0ynVKfHZ15/nhAJN5m8Jn3X5qkwriQCiUntC9AbA==
+"@typescript-eslint/scope-manager@5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz#8f0927024b6b24e28671352c93b393a810ab4553"
+  integrity sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==
   dependencies:
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/visitor-keys" "5.22.0"
+    "@typescript-eslint/types" "5.38.0"
+    "@typescript-eslint/visitor-keys" "5.38.0"
 
-"@typescript-eslint/type-utils@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.22.0.tgz#0c0e93b34210e334fbe1bcb7250c470f4a537c19"
-  integrity sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==
+"@typescript-eslint/type-utils@5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz#c8b7f681da825fcfc66ff2b63d70693880496876"
+  integrity sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==
   dependencies:
-    "@typescript-eslint/utils" "5.22.0"
-    debug "^4.3.2"
+    "@typescript-eslint/typescript-estree" "5.38.0"
+    "@typescript-eslint/utils" "5.38.0"
+    debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501"
-  integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA==
-
-"@typescript-eslint/types@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.22.0.tgz#50a4266e457a5d4c4b87ac31903b28b06b2c3ed0"
-  integrity sha512-T7owcXW4l0v7NTijmjGWwWf/1JqdlWiBzPqzAWhobxft0SiEvMJB56QXmeCQjrPuM8zEfGUKyPQr/L8+cFUBLw==
-
-"@typescript-eslint/typescript-estree@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.15.0.tgz#81513a742a9c657587ad1ddbca88e76c6efb0aac"
-  integrity sha512-Hb0e3dGc35b75xLzixM3cSbG1sSbrTBQDfIScqdyvrfJZVEi4XWAT+UL/HMxEdrJNB8Yk28SKxPLtAhfCbBInA==
-  dependencies:
-    "@typescript-eslint/types" "5.15.0"
-    "@typescript-eslint/visitor-keys" "5.15.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
-    is-glob "^4.0.3"
-    semver "^7.3.5"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.0.tgz#8cd15825e4874354e31800dcac321d07548b8a5f"
+  integrity sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==
 
-"@typescript-eslint/typescript-estree@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.22.0.tgz#e2116fd644c3e2fda7f4395158cddd38c0c6df97"
-  integrity sha512-EyBEQxvNjg80yinGE2xdhpDYm41so/1kOItl0qrjIiJ1kX/L/L8WWGmJg8ni6eG3DwqmOzDqOhe6763bF92nOw==
+"@typescript-eslint/typescript-estree@5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz#89f86b2279815c6fb7f57d68cf9b813f0dc25d98"
+  integrity sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==
   dependencies:
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/visitor-keys" "5.22.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@typescript-eslint/types" "5.38.0"
+    "@typescript-eslint/visitor-keys" "5.38.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.22.0.tgz#1f2c4897e2cf7e44443c848a13c60407861babd8"
-  integrity sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==
+"@typescript-eslint/utils@5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.38.0.tgz#5b31f4896471818153790700eb02ac869a1543f4"
+  integrity sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.22.0"
-    "@typescript-eslint/types" "5.22.0"
-    "@typescript-eslint/typescript-estree" "5.22.0"
+    "@typescript-eslint/scope-manager" "5.38.0"
+    "@typescript-eslint/types" "5.38.0"
+    "@typescript-eslint/typescript-estree" "5.38.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.15.0.tgz#5669739fbf516df060f978be6a6dce75855a8027"
-  integrity sha512-+vX5FKtgvyHbmIJdxMJ2jKm9z2BIlXJiuewI8dsDYMp5LzPUcuTT78Ya5iwvQg3VqSVdmxyM8Anj1Jeq7733ZQ==
-  dependencies:
-    "@typescript-eslint/types" "5.15.0"
-    eslint-visitor-keys "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.22.0":
-  version "5.22.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.22.0.tgz#f49c0ce406944ffa331a1cfabeed451ea4d0909c"
-  integrity sha512-DbgTqn2Dv5RFWluG88tn0pP6Ex0ROF+dpDO1TNNZdRtLjUr6bdznjA6f/qNqJLjd2PgguAES2Zgxh/JzwzETDg==
+"@typescript-eslint/visitor-keys@5.38.0":
+  version "5.38.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz#60591ca3bf78aa12b25002c0993d067c00887e34"
+  integrity sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==
   dependencies:
-    "@typescript-eslint/types" "5.22.0"
-    eslint-visitor-keys "^3.0.0"
+    "@typescript-eslint/types" "5.38.0"
+    eslint-visitor-keys "^3.3.0"
 
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
@@ -3845,7 +3811,7 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0:
+debug@^4.0.0, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4747,7 +4713,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity "sha1-If3I+82ceVzAMh8FY3AglXUVEag= sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
@@ -5091,7 +5057,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
 
-fast-glob@^3.0.3, fast-glob@^3.1.1:
+fast-glob@^3.0.3:
   version "3.2.10"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"
   integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==
@@ -5102,6 +5068,17 @@ fast-glob@^3.0.3, fast-glob@^3.1.1:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -5778,16 +5755,16 @@ globby@10.0.0:
     merge2 "^1.2.3"
     slash "^3.0.0"
 
-globby@^11.0.4:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
-  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
+globby@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
-    fast-glob "^3.1.1"
-    ignore "^5.1.4"
-    merge2 "^1.3.0"
+    fast-glob "^3.2.9"
+    ignore "^5.2.0"
+    merge2 "^1.4.1"
     slash "^3.0.0"
 
 globrex@^0.1.2:
@@ -6148,7 +6125,7 @@ ieee754@1.1.13, ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
   integrity "sha1-7BaFWOlaoYH9h9N/VcMrvLZwi4Q= sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
+ignore@^5.1.1, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -7520,10 +7497,10 @@ merge-trees@^2.0.0:
     fs-updater "^1.0.4"
     heimdalljs "^0.2.5"
 
-merge2@^1.2.3, merge2@^1.3.0:
+merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity "sha1-Q2iJL4hekHRVpv19xVwMnUBJkK4= sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 methods@~1.1.2:
   version "1.1.2"

From ef3926a60ffb14690e79902f26d984c49ffab709 Mon Sep 17 00:00:00 2001
From: Josh Alexakos <64025205+jalexakos@users.noreply.github.com>
Date: Wed, 21 Sep 2022 17:00:33 -0700
Subject: [PATCH 1154/1405] Fix missing tags lint error

---
 packages/@ember/controller/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index fd6ece1f672..79399ff9e03 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -44,12 +44,14 @@ interface ControllerMixin<T> extends ActionHandler {
     as part of the application's initialization process. In most cases the
     `target` property will automatically be set to the logical consumer of
     actions for the controller.
+    @public
   */
   target: unknown | null;
 
   /**
     The controller's current model. When retrieving or modifying a controller's
     model, this property should be used instead of the `content` property.
+    @public
   */
   model: T;
 
@@ -74,6 +76,7 @@ interface ControllerMixin<T> extends ActionHandler {
     ```
     Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
     If query param type is not specified, it will default to `'string'`.
+    @public
   */
   queryParams: Array<ControllerQueryParam>;
 
@@ -140,6 +143,7 @@ interface ControllerMixin<T> extends ActionHandler {
     ```
 
     See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
+    @public
   */
   transitionToRoute(...args: RouteArgs<Route>): Transition;
 
@@ -192,6 +196,7 @@ interface ControllerMixin<T> extends ActionHandler {
     aController.replaceRoute('/');
     aController.replaceRoute('/blog/post/1/comment/13');
     ```
+    @public
   */
   replaceRoute(...args: RouteArgs<Route>): Transition;
 }

From 0b4f5340975084133494623bb1b8a6506ddf6dde Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 21 Sep 2022 16:38:16 -0600
Subject: [PATCH 1155/1405] [FEATURE] Add support for Ember 4.8

We were previously using 4.6. We'll aim to keep this up to date going
forward. Here, update the dependency and then address two safety issues
it caught on either 4.7 or 4.8 but did not back on 4.6.
---
 package.json                                      | 2 +-
 packages/@ember/-internals/glimmer/lib/helper.ts  | 5 ++++-
 packages/@ember/-internals/metal/lib/libraries.ts | 2 +-
 yarn.lock                                         | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 38881d1d5c4..9bbfd57496f 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.8.0",
     "testem-failure-only-reporter": "^1.0.0",
-    "typescript": "~4.6.4"
+    "typescript": "~4.8.3"
   },
   "peerDependencies": {
     "@glimmer/component": "^1.1.2"
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 5655ed8c4ee..3d34d2c6ea3 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -105,7 +105,10 @@ class Helper extends FrameworkObject {
   static isHelperFactory = true;
   static [IS_CLASSIC_HELPER] = true;
 
-  [RECOMPUTE_TAG]: DirtyableTag;
+  // SAFETY: this is initialized in `init`, rather than `constructor`. It is
+  // safe to `declare` like this *if and only if* nothing uses the constructor
+  // directly in this class, since nothing else can run before `init`.
+  declare [RECOMPUTE_TAG]: DirtyableTag;
 
   init(properties: object | undefined) {
     super.init(properties);
diff --git a/packages/@ember/-internals/metal/lib/libraries.ts b/packages/@ember/-internals/metal/lib/libraries.ts
index d96ca2adf89..3b19532fc5b 100644
--- a/packages/@ember/-internals/metal/lib/libraries.ts
+++ b/packages/@ember/-internals/metal/lib/libraries.ts
@@ -86,7 +86,7 @@ if (DEBUG) {
     let nameLengths = libs.map((item) => get(item, 'name.length'));
     assert(
       'nameLengths is number array',
-      nameLengths instanceof Array && nameLengths.every((n) => typeof n === 'number')
+      nameLengths instanceof Array && nameLengths.every((n): n is number => typeof n === 'number')
     );
     let maxNameLength = Math.max.apply(null, nameLengths);
 
diff --git a/yarn.lock b/yarn.lock
index d374b1240e1..15f87efc989 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10239,10 +10239,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
-typescript@~4.6.4:
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
-  integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
+typescript@~4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
+  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From 2271945de3f27b8bc63982e1e3724be3b182e44b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 00:16:10 +0000
Subject: [PATCH 1156/1405] Bump mout from 1.2.3 to 1.2.4

Bumps [mout](https://github.com/mout/mout) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/mout/mout/releases)
- [Changelog](https://github.com/mout/mout/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mout/mout/compare/v1.2.3...v1.2.4)

---
updated-dependencies:
- dependency-name: mout
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d374b1240e1..9f159a59056 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7708,9 +7708,9 @@ morgan@^1.10.0:
     on-headers "~1.0.2"
 
 mout@^1.0.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.3.tgz#bd1477d8c7f2db5fcf43c91de30b6cc746b78e10"
-  integrity sha512-vtE+eZcSj/sBkIp6gxB87MznryWP+gHIp0XX9SKrzA5TAkvz6y7VTuNruBjYdJozd8NY5i9XVIsn8cn3SwNjzg==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.4.tgz#9ffd261c4d6509e7ebcbf6b641a89b36ecdf8155"
+  integrity sha512-mZb9uOruMWgn/fw28DG4/yE3Kehfk1zKCLhuDU2O3vlKdnBBr4XaOCqVTflJ5aODavGUPqFHZgrFX3NJVuxGhQ==
 
 ms@2.0.0:
   version "2.0.0"

From 4ac8f4b9f4f57c2ecb36c359cda8605355c24e29 Mon Sep 17 00:00:00 2001
From: layang <layang@linkedin.com>
Date: Thu, 22 Sep 2022 10:42:41 -0400
Subject: [PATCH 1157/1405] Update observable.ts

---
 packages/@ember/object/observable.ts | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index 364746ca02a..9390da0bb2a 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -201,9 +201,16 @@ interface Observable {
   setProperties<T extends Record<string, any>>(hash: T): T;
 
   /**
-   * Convenience method to call `propertyWillChange` and `propertyDidChange` in
-   * succession.
-   */
+    Convenience method to call `propertyWillChange` and `propertyDidChange` in
+    succession.
+
+    Notify the observer system that a property has just changed.
+
+    Sometimes you need to change a value directly or indirectly without
+    actually calling `get()` or `set()` on it. In this case, you can use this
+    method instead. Calling this method will notify all observers that the
+    property has potentially changed value.
+  */
   notifyPropertyChange(keyName: string): this;
 
   /**
@@ -393,19 +400,6 @@ const Observable = Mixin.create({
     return this;
   },
 
-  /**
-    Notify the observer system that a property has just changed.
-
-    Sometimes you need to change a value directly or indirectly without
-    actually calling `get()` or `set()` on it. In this case, you can use this
-    method instead. Calling this method will notify all observers that the
-    property has potentially changed value.
-
-    @method notifyPropertyChange
-    @param {String} keyName The property key to be notified about.
-    @return {Observable}
-    @public
-  */
   notifyPropertyChange(keyName: string) {
     notifyPropertyChange(this, keyName);
     return this;

From 4a113ef1f56e4dc579bc5ae2b940025f40490e2b Mon Sep 17 00:00:00 2001
From: Qian Wan <qiawan@qiawan-mn1.linkedin.biz>
Date: Thu, 22 Sep 2022 19:02:08 +0200
Subject: [PATCH 1158/1405] address comments

---
 packages/@ember/object/promise-proxy-mixin.ts | 60 ++++++++++++-------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index 8d2e71df7c6..c4d6c0b68e9 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -111,24 +111,44 @@ interface PromiseProxyMixin<T> {
   /**
     If the proxied promise is rejected this will contain the reason
     provided.
+
+    @property reason
+    @default null
+    @public
   */
   reason: unknown;
 
   /**
     Once the proxied promise has settled this will become `false`.
+
+    @property isPending
+    @default true
+    @public
   */
   readonly isPending: boolean;
   /**
     Once the proxied promise has settled this will become `true`.
+
+    @property isSettled
+    @default false
+    @public
   */
   readonly isSettled: boolean;
 
   /**
     Will become `true` if the proxied promise is rejected.
+
+    @property isRejected
+    @default false
+    @public
   */
   isRejected: boolean;
   /**
     Will become `true` if the proxied promise is fulfilled.
+
+    @property isFulfilled
+    @default false
+    @public
   */
   isFulfilled: boolean;
 
@@ -148,6 +168,9 @@ interface PromiseProxyMixin<T> {
       promise: <thenable>
     });
     ```
+
+    @property promise
+    @public
   */
   promise: Promise<T>;
 
@@ -155,54 +178,51 @@ interface PromiseProxyMixin<T> {
     An alias to the proxied promise's `then`.
 
     See RSVP.Promise.then.
+
+    @method then
+    @param {Function} callback
+    @return {RSVP.Promise}
+    @public
   */
   then: this['promise']['then'];
   /**
     An alias to the proxied promise's `catch`.
 
     See RSVP.Promise.catch.
+
+    @method catch
+    @param {Function} callback
+    @return {RSVP.Promise}
+    @since 1.3.0
+    @public
   */
   catch: this['promise']['catch'];
   /**
     An alias to the proxied promise's `finally`.
 
     See RSVP.Promise.finally.
+
+    @method finally
+    @param {Function} callback
+    @return {RSVP.Promise}
+    @since 1.3.0
+    @public
   */
   finally: this['promise']['finally'];
 }
 const PromiseProxyMixin = Mixin.create({
-  /**
-    @property reason
-    @public
-  */
   reason: null,
 
-  /**
-    @property isPending
-    @public
-  */
   isPending: computed('isSettled', function () {
     return !get(this, 'isSettled');
   }).readOnly(),
 
-  /**
-    @property isSettled
-    @public
-  */
   isSettled: computed('isRejected', 'isFulfilled', function () {
     return get(this, 'isRejected') || get(this, 'isFulfilled');
   }).readOnly(),
 
-  /**
-    @property isRejected
-    @public
-  */
   isRejected: false,
 
-  /**
-    @property isFulfilled
-    @public
-  */
   isFulfilled: false,
 
   promise: computed({

From 73016e3798fa089512089e28b97b45d4d67a19e1 Mon Sep 17 00:00:00 2001
From: layang <layang@linkedin.com>
Date: Thu, 22 Sep 2022 15:37:29 -0400
Subject: [PATCH 1159/1405] add annotations to comment

---
 packages/@ember/object/observable.ts | 80 +++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 8 deletions(-)

diff --git a/packages/@ember/object/observable.ts b/packages/@ember/object/observable.ts
index 9390da0bb2a..8288ef39790 100644
--- a/packages/@ember/object/observable.ts
+++ b/packages/@ember/object/observable.ts
@@ -125,6 +125,11 @@ interface Observable {
     If this method returns any value other than `undefined`, it will be returned
     instead. This allows you to implement "virtual" properties that are
     not defined upfront.
+
+    @method get
+    @param {String} keyName The property to retrieve
+    @return {Object} The property value or undefined.
+    @public
   */
   get(key: string): unknown;
 
@@ -143,6 +148,11 @@ interface Observable {
     record.getProperties(['firstName', 'lastName', 'zipCode']);
     // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
     ```
+
+    @method getProperties
+    @param {String...|Array} list of keys to get
+    @return {Object}
+    @public
   */
   getProperties<L extends string[]>(list: L): { [Key in L[number]]: unknown };
   getProperties<L extends string[]>(...list: L): { [Key in L[number]]: unknown };
@@ -185,6 +195,12 @@ interface Observable {
     immediately. Any "remote" observers (i.e. observer methods declared on
     another object) will be placed in a queue and called at a later time in a
     coalesced manner.
+
+    @method set
+    @param {String} keyName The property to set
+    @param {Object} value The value to set or `null`.
+    @return {Object} The passed value
+    @public
   */
   set<T>(key: string, value: T): T;
 
@@ -197,6 +213,11 @@ interface Observable {
     ```javascript
     record.setProperties({ firstName: 'Charles', lastName: 'Jolley' });
     ```
+
+    @method setProperties
+    @param {Object} hash the hash of keys and values to set
+    @return {Object} The passed in hash
+    @public
   */
   setProperties<T extends Record<string, any>>(hash: T): T;
 
@@ -210,6 +231,11 @@ interface Observable {
     actually calling `get()` or `set()` on it. In this case, you can use this
     method instead. Calling this method will notify all observers that the
     property has potentially changed value.
+
+    @method notifyPropertyChange
+    @param {String} keyName The property key to be notified about.
+    @return {Observable}
+    @public
   */
   notifyPropertyChange(keyName: string): this;
 
@@ -287,14 +313,30 @@ interface Observable {
     the end. In this case, it is common to write observer methods that take
     only a sender and key value as parameters or, if you aren't interested in
     any of these values, to write an observer that has no parameters at all.
+
+    @method addObserver
+    @param {String} key The key to observe
+    @param {Object} target The target object to invoke
+    @param {String|Function} method The method to invoke
+    @param {Boolean} sync Whether the observer is sync or not
+    @return {Observable}
+    @public
   */
   addObserver<Target>(key: keyof this, target: Target, method: ObserverMethod<Target, this>): this;
   addObserver(key: keyof this, method: ObserverMethod<this, this>): this;
 
   /**
-   * Remove an observer you have previously registered on this object. Pass
-   * the same key, target, and method you passed to `addObserver()` and your
-   * target will no longer receive notifications.
+    Remove an observer you have previously registered on this object. Pass
+    the same key, target, and method you passed to `addObserver()` and your
+    target will no longer receive notifications.
+    
+    @method removeObserver
+    @param {String} key The key to observe
+    @param {Object} target The target object to invoke
+    @param {String|Function} method The method to invoke
+    @param {Boolean} sync Whether the observer is async or not
+    @return {Observable}
+    @public
    */
   removeObserver<Target>(
     key: keyof this,
@@ -311,6 +353,12 @@ interface Observable {
     person.incrementProperty('age');
     team.incrementProperty('score', 2);
     ```
+
+    @method incrementProperty
+    @param {String} keyName The name of the property to increment
+    @param {Number} increment The amount to increment by. Defaults to 1
+    @return {Number} The new property value
+    @public
   */
   incrementProperty(keyName: keyof this, increment?: number): number;
 
@@ -322,6 +370,12 @@ interface Observable {
     player.decrementProperty('lives');
     orc.decrementProperty('health', 5);
     ```
+
+    @method decrementProperty
+    @param {String} keyName The name of the property to decrement
+    @param {Number} decrement The amount to decrement by. Defaults to 1
+    @return {Number} The new property value
+    @public
   */
   decrementProperty(keyName: keyof this, decrement?: number): number;
 
@@ -333,15 +387,25 @@ interface Observable {
     ```javascript
     starship.toggleProperty('warpDriveEngaged');
     ```
+
+    @method toggleProperty
+    @param {String} keyName The name of the property to toggle
+    @return {Boolean} The new property value
+    @public
   */
   toggleProperty(keyName: keyof this): boolean;
 
   /**
-   * Returns the cached value of a computed property, if it exists.
-   * This allows you to inspect the value of a computed property
-   * without accidentally invoking it if it is intended to be
-   * generated lazily.
-   */
+    Returns the cached value of a computed property, if it exists.
+    This allows you to inspect the value of a computed property
+    without accidentally invoking it if it is intended to be
+    generated lazily.
+    
+    @method cacheFor
+    @param {String} keyName
+    @return {Object} The cached value of the computed property, if any
+    @public
+  */
   cacheFor<K extends keyof this>(key: K): unknown;
 }
 const Observable = Mixin.create({

From a7951deedb0b46cf4670ca241a021eb4670fec05 Mon Sep 17 00:00:00 2001
From: Josh Alexakos <64025205+jalexakos@users.noreply.github.com>
Date: Thu, 22 Sep 2022 16:18:41 -0700
Subject: [PATCH 1160/1405] Re-add tags

---
 packages/@ember/controller/index.ts | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 79399ff9e03..2fdf0928ad0 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -44,6 +44,9 @@ interface ControllerMixin<T> extends ActionHandler {
     as part of the application's initialization process. In most cases the
     `target` property will automatically be set to the logical consumer of
     actions for the controller.
+    
+    @property target
+    @default null
     @public
   */
   target: unknown | null;
@@ -51,6 +54,8 @@ interface ControllerMixin<T> extends ActionHandler {
   /**
     The controller's current model. When retrieving or modifying a controller's
     model, this property should be used instead of the `content` property.
+    
+    @property model
     @public
   */
   model: T;
@@ -76,6 +81,9 @@ interface ControllerMixin<T> extends ActionHandler {
     ```
     Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
     If query param type is not specified, it will default to `'string'`.
+    
+    @for Ember.ControllerMixin
+    @property queryParams
     @public
   */
   queryParams: Array<ControllerQueryParam>;
@@ -143,6 +151,17 @@ interface ControllerMixin<T> extends ActionHandler {
     ```
 
     See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
+    
+    @for Ember.ControllerMixin
+    @method transitionToRoute
+    @deprecated Use transitionTo from the Router service instead.
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used
+      while transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+      containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
     @public
   */
   transitionToRoute(...args: RouteArgs<Route>): Transition;
@@ -196,6 +215,17 @@ interface ControllerMixin<T> extends ActionHandler {
     aController.replaceRoute('/');
     aController.replaceRoute('/blog/post/1/comment/13');
     ```
+    
+    @for Ember.ControllerMixin
+    @method replaceRoute
+    @deprecated Use replaceWith from the Router service instead.
+    @param {String} [name] the name of the route or a URL
+    @param {...Object} models the model(s) or identifier(s) to be used
+    while transitioning to the route.
+    @param {Object} [options] optional hash with a queryParams property
+    containing a mapping of query parameters
+    @return {Transition} the transition object associated with this
+      attempted transition
     @public
   */
   replaceRoute(...args: RouteArgs<Route>): Transition;

From af7163df5db9bc56e88aad4cc7ec42e5aa96d214 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Fri, 23 Sep 2022 15:44:25 +0530
Subject: [PATCH 1161/1405] Added doc annotations

---
 packages/@ember/array/index.ts | 257 +++++++++++++++++++++++++++++++++
 1 file changed, 257 insertions(+)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 9e5cf4758ec..6ddb479cc55 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -255,6 +255,9 @@ interface EmberArray<T> extends Enumerable {
 
     Your array must support the `length` property. Your replace methods should
     set this property whenever it changes.
+
+    @property {Number} length
+    @public
   */
   length: number;
   /**
@@ -275,6 +278,11 @@ interface EmberArray<T> extends Enumerable {
     arr.objectAt(4);   // undefined
     arr.objectAt(5);   // undefined
     ```
+
+    @method objectAt
+    @param {Number} idx The index of the item to return.
+    @return {*} item at index or undefined
+    @public
   */
   objectAt(idx: number): T | undefined;
   /**
@@ -286,6 +294,11 @@ interface EmberArray<T> extends Enumerable {
     arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
     arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
     ```
+
+    @method objectsAt
+    @param {Array} indexes An array of indexes of items to return.
+    @return {Array}
+    @public
    */
   objectsAt(indexes: number[]): Array<T | undefined>;
   /**
@@ -301,6 +314,10 @@ interface EmberArray<T> extends Enumerable {
     peopleToMoon.set('[]', ['Collins']); // ['Collins']
     peopleToMoon.get('[]'); // ['Collins']
     ```
+
+    @property []
+    @return this
+    @public
   */
   '[]': this;
   /**
@@ -319,10 +336,18 @@ interface EmberArray<T> extends Enumerable {
     vowels.clear();
     vowels.firstObject; // undefined
     ```
+
+    @property firstObject
+    @return {Object | undefined} The first object in the array
+    @public
   */
   firstObject: T | undefined;
   /**
     The last object in the array, or `undefined` if the array is empty.
+
+    @property lastObject
+    @return {Object | undefined} The last object in the array
+    @public
   */
   lastObject: T | undefined;
   /**
@@ -337,6 +362,12 @@ interface EmberArray<T> extends Enumerable {
     arr.slice(0, 2);    // ['red', 'green']
     arr.slice(1, 100);  // ['green', 'blue']
     ```
+
+    @method slice
+    @param {Number} beginIndex (Optional) index to begin slicing from.
+    @param {Number} endIndex (Optional) index to end the slice at (but not included).
+    @return {Array} New array with specified slice
+    @public
   */
   slice(beginIndex?: number, endIndex?: number): NativeArray<T>;
   /**
@@ -369,6 +400,12 @@ interface EmberArray<T> extends Enumerable {
     people.indexOf(newPerson, -4); //  0
     people.indexOf(newPerson, 10); // -1
     ```
+
+    @method indexOf
+    @param {Object} object the item to search for
+    @param {Number} startAt optional starting location to search, default 0
+    @return {Number} index or -1 if not found
+    @public
   */
   indexOf(object: T, startAt?: number): number;
   /**
@@ -396,6 +433,14 @@ interface EmberArray<T> extends Enumerable {
     arr.lastIndexOf('b', 3);    //  1
     arr.lastIndexOf('a', 100);  //  4
     ```
+
+    @method lastIndexOf
+    @param {Object} object the item to search for
+    @param {Number} startAt optional starting location to search from
+    backwards, defaults to `(array.length - 1)`
+    @return {Number} The last index of the `object` in the array or -1
+    if not found
+    @public
   */
   lastIndexOf(object: T, startAt?: number): number;
   /**
@@ -438,6 +483,12 @@ interface EmberArray<T> extends Enumerable {
     // 2/3 banana
     // 3/3 carrot
     ```
+
+    @method forEach
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Object} receiver
+    @public
   */
   forEach<Target>(
     callback: (this: Target, item: T, index: number, arr: this) => void,
@@ -458,6 +509,11 @@ interface EmberArray<T> extends Enumerable {
     people.getEach('nonexistentProperty');
     // [undefined, undefined];
     ```
+
+    @method getEach
+    @param {String} key name of the property
+    @return {Array} The mapped array.
+    @public
   */
   getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
   /**
@@ -472,6 +528,12 @@ interface EmberArray<T> extends Enumerable {
     people.setEach('zipCode', '10011');
     // [{name: 'Joe', zipCode: '10011'}, {name: 'Matt', zipCode: '10011'}];
     ```
+
+    @method setEach
+    @param {String} key The key to set
+    @param {Object} value The object to set
+    @return {Object} receiver
+    @public
   */
   setEach<K extends string>(key: K, value: Value<T, K>): this;
   /**
@@ -501,6 +563,12 @@ interface EmberArray<T> extends Enumerable {
     Note that in addition to a callback, you can also pass an optional target
     object that will be set as `this` on the context. This is a good way
     to give your iterator function access to the current object.
+
+    @method map
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Array} The mapped array.
+    @public
   */
   map<U, Target>(
     callback: (this: Target, item: T, index: number, arr: this) => U,
@@ -519,6 +587,11 @@ interface EmberArray<T> extends Enumerable {
     people.mapBy('unknownProperty');
     // [undefined, undefined];
     ```
+
+    @method mapBy
+    @param {String} key name of the property
+    @return {Array} The mapped array.
+    @public
   */
   mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
   /**
@@ -573,6 +646,12 @@ interface EmberArray<T> extends Enumerable {
     let collection = new AdultsCollection({ engineering: true });
     collection.people.filter(isAdultAndEngineer, { target: collection });
     ```
+
+    @method filter
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Array} A filtered array.
+    @public
   */
   filter<Target>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -611,6 +690,12 @@ interface EmberArray<T> extends Enumerable {
       return thing.isFruit;
     }); // [{food: 'bread', isFruit: false}]
     ```
+
+    @method reject
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Array} A rejected array.
+    @public
   */
   reject<Target>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -629,6 +714,12 @@ interface EmberArray<T> extends Enumerable {
     things.filterBy('food', 'beans'); // [{ food: 'beans', isFruit: false }]
     things.filterBy('isFruit'); // [{ food: 'apple', isFruit: true }]
     ```
+
+    @method filterBy
+    @param {String} key the property to test
+    @param {*} [value] optional value to test against.
+    @return {Array} filtered array
+    @public
   */
   filterBy(key: string, value?: unknown): NativeArray<T>;
   /**
@@ -647,6 +738,12 @@ interface EmberArray<T> extends Enumerable {
       food.rejectBy('isFruit'); // [{ name: "carrot", isFruit: false }, { name: "bread", isFruit: false }]
       food.rejectBy('name', 'carrot'); // [{ name: "apple", isFruit: true }}, { name: "bread", isFruit: false }]
     ```
+
+    @method rejectBy
+    @param {String} key the property to test
+    @param {*} [value] optional value to test against.
+    @return {Array} rejected array
+    @public
   */
   rejectBy(key: string, value?: unknown): NativeArray<T>;
   find<S extends T, Target = void>(
@@ -688,6 +785,12 @@ interface EmberArray<T> extends Enumerable {
     users.find((user) => user.name == 'Tom'); // [{ id: 2, name: 'Tom' }]
     users.find(({ id }) => id == 3); // [{ id: 3, name: 'Melanie' }]
     ```
+
+    @method find
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Object} Found item or `undefined`.
+    @public
   */
   find<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -714,6 +817,12 @@ interface EmberArray<T> extends Enumerable {
     users.findBy('name', 'Melanie'); // { id: 3, name: 'Melanie', isTom: false }
     users.findBy('isTom'); // { id: 2, name: 'Tom', isTom: true }
     ```
+
+    @method findBy
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against.
+    @return {Object} found item or `undefined`
+    @public
   */
   findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
   /**
@@ -746,6 +855,12 @@ interface EmberArray<T> extends Enumerable {
     const people = Ember.A([{ name: 'John', age: 24 }, { name: 'Joan', age: 45 }]);
     const areAllAdults = people.every(isAdult);
     ```
+
+    @method every
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Boolean}
+    @public
   */
   every<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -781,6 +896,13 @@ interface EmberArray<T> extends Enumerable {
     compiledLanguages.isEvery('programmingLanguage'); // true
     languagesKnownByMe.isEvery('programmingLanguage'); // false
     ```
+
+    @method isEvery
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against. Defaults to `true`
+    @return {Boolean}
+    @since 1.3.0
+    @public
   */
   isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
   /**
@@ -815,6 +937,12 @@ interface EmberArray<T> extends Enumerable {
       Paychecks.addBiggerBonus();
     }
     ```
+
+    @method any
+    @param {Function} callback The callback to execute
+    @param {Object} [target] The target object to use
+    @return {Boolean} `true` if the passed function returns `true` for any item
+    @public
   */
   any<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
@@ -885,6 +1013,13 @@ interface EmberArray<T> extends Enumerable {
         return truthValue && current;
       }); // false (true && false && false)
     ```
+
+    @method isAny
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against. Defaults to `true`
+    @return {Boolean}
+    @since 1.3.0
+    @public
   */
   reduce<V>(
     callback: (summation: V, current: T, index: number, arr: this) => V,
@@ -913,6 +1048,12 @@ interface EmberArray<T> extends Enumerable {
     people.invoke('greet'); // ['Hello Joe', 'Hello Matt']
     people.invoke('greet', 'Bonjour'); // ['Bonjour Joe', 'Bonjour Matt']
     ```
+
+    @method invoke
+    @param {String} methodName the name of the method
+    @param {Object...} args optional arguments to pass as well.
+    @return {Array} return values from calling invoke.
+    @public
   */
   invoke<K extends string>(
     methodName: K,
@@ -921,6 +1062,10 @@ interface EmberArray<T> extends Enumerable {
   /**
     Simply converts the object into a genuine array. The order is not
     guaranteed. Corresponds to the method implemented by Prototype.
+
+    @method toArray
+    @return {Array} the object as an array.
+    @public
   */
   toArray(): T[];
   /**
@@ -930,6 +1075,10 @@ interface EmberArray<T> extends Enumerable {
     let arr = ['a', null, 'c', undefined];
     arr.compact();  // ['a', 'c']
     ```
+
+    @method compact
+    @return {Array} the array without null and undefined elements.
+    @public
   */
   compact(): NativeArray<Exclude<T, null>>;
   /**
@@ -954,6 +1103,12 @@ interface EmberArray<T> extends Enumerable {
     [1, 2, 3].includes(1, -4); // true
     [1, 2, NaN].includes(NaN); // true
     ```
+
+    @method includes
+    @param {Object} object The object to search for.
+    @param {Number} startAt optional starting location to search, default 0
+    @return {Boolean} `true` if object is found in the array.
+    @public
   */
   includes(object: T, startAt?: number): boolean;
   /**
@@ -974,6 +1129,11 @@ interface EmberArray<T> extends Enumerable {
    colors.sortBy('weight', 'name');
    // [{name: 'blue', weight: 500}, {name: 'red', weight: 500}, {name: 'green', weight: 600}]
    ```
+    @method sortBy
+    @param {String} property name(s) to sort on
+    @return {Array} The sorted array.
+    @since 1.2.0
+    @public
   */
   sortBy(key: string): T[];
   /**
@@ -986,6 +1146,10 @@ interface EmberArray<T> extends Enumerable {
     ```
 
     This only works on primitive data types, e.g. Strings, Numbers, etc.
+
+    @method uniq
+    @return {EmberArray}
+    @public
   */
   uniq(): NativeArray<T>;
   /**
@@ -999,6 +1163,11 @@ interface EmberArray<T> extends Enumerable {
     let arr = [2.2, 2.1, 3.2, 3.3];
     arr.uniqBy(Math.floor);  // [2.2, 3.2];
     ```
+
+    @method uniqBy
+    @param {String,Function} key
+    @return {EmberArray}
+    @public
   */
   uniqBy(key: string): NativeArray<T>;
   /**
@@ -1010,6 +1179,11 @@ interface EmberArray<T> extends Enumerable {
     let arr = ['a', 'b', 'a', 'c'];
     arr.without('a');  // ['b', 'c']
     ```
+
+    @method without
+    @param {Object} value
+    @return {EmberArray}
+    @public
   */
   without(value: T): NativeArray<T>;
 }
@@ -1303,6 +1477,15 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     passed array.
 
     Note that this method is expected to validate the type(s) of objects that it expects.
+
+    @method replace
+    @param {Number} idx Starting index in the array to replace. If
+      idx >= length, then append to the end of the array.
+    @param {Number} amt Number of elements that should be removed from
+      the array, starting at *idx*.
+    @param {EmberArray} [objects] An optional array of zero or more objects that should be
+      inserted into the array at *idx*
+    @public
   */
   replace(idx: number, amt: number, objects?: readonly T[]): void;
   /**
@@ -1316,6 +1499,10 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.clear(); // []
     colors.length;  // 0
     ```
+
+    @method clear
+    @return {Array} An empty Array.
+    @public
   */
   clear(): this;
   /**
@@ -1328,6 +1515,12 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.insertAt(2, 'yellow');  // ['red', 'green', 'yellow', 'blue']
     colors.insertAt(5, 'orange');  // Error: Index out of range
     ```
+
+    @method insertAt
+    @param {Number} idx index of insert the object at.
+    @param {Object} object object to insert
+    @return {EmberArray} receiver
+    @public
   */
   insertAt(idx: number, object: T): this;
   /**
@@ -1344,6 +1537,12 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.removeAt(2, 2);  // ['green', 'blue']
     colors.removeAt(4, 2);  // Error: Index out of range
     ```
+
+    @method removeAt
+    @param {Number} start index, start of range
+    @param {Number} len length of passing range
+    @return {EmberArray} receiver
+    @public
   */
   removeAt(start: number, len?: number): this;
   /**
@@ -1356,6 +1555,11 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.pushObject('black');     // ['red', 'green', 'black']
     colors.pushObject(['yellow']);  // ['red', 'green', ['yellow']]
     ```
+
+    @method pushObject
+    @param {*} obj object to push
+    @return object same object passed as a param
+    @public
   */
   pushObject(obj: T): this;
   /**
@@ -1367,6 +1571,11 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
 
     colors.pushObjects(['yellow', 'orange']);  // ['red', 'yellow', 'orange']
     ```
+
+    @method pushObjects
+    @param {Array} objects the objects to add
+    @return {MutableArray} receiver
+    @public
   */
   pushObjects(objects: T[]): this;
   /**
@@ -1379,6 +1588,10 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.popObject();   // 'blue'
     console.log(colors);  // ['red', 'green']
     ```
+
+    @method popObject
+    @return object
+    @public
   */
   popObject(): T | undefined;
   /**
@@ -1391,6 +1604,10 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.shiftObject();  // 'red'
     console.log(colors);   // ['green', 'blue']
     ```
+
+    @method shiftObject
+    @return object
+    @public
   */
   shiftObject(): T | null | undefined;
   /**
@@ -1403,6 +1620,11 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.unshiftObject('yellow');    // ['yellow', 'red']
     colors.unshiftObject(['black']);   // [['black'], 'yellow', 'red']
     ```
+
+    @method unshiftObject
+    @param {*} obj object to unshift
+    @return object same object passed as a param
+    @public
   */
   unshiftObject(object: T): this;
   /**
@@ -1415,11 +1637,20 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.unshiftObjects(['black', 'white']);   // ['black', 'white', 'red']
     colors.unshiftObjects('yellow'); // Type Error: 'undefined' is not a function
     ```
+
+    @method unshiftObjects
+    @param {Enumerable} objects the objects to add
+    @return {EmberArray} receiver
+    @public
   */
   unshiftObjects(objects: T[]): this;
   /**
     Reverse objects in the array. Works just like `reverse()` but it is
     KVO-compliant.
+
+    @method reverseObjects
+    @return {EmberArray} receiver
+    @public
   */
   reverseObjects(): this;
   /**
@@ -1432,6 +1663,12 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     colors.setObjects(['black', 'white']);  // ['black', 'white']
     colors.setObjects([]);                  // []
     ```
+
+    @method setObjects
+    @param {EmberArray} objects array whose content will be used for replacing
+        the content of the receiver
+    @return {EmberArray} receiver with the new content
+    @public
   */
   setObjects(object: T[]): this;
   /**
@@ -1444,10 +1681,20 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     cities.removeObject('Lima');     // ['Berlin']
     cities.removeObject('Tokyo')     // ['Berlin']
     ```
+
+    @method removeObject
+    @param {*} obj object to remove
+    @return {EmberArray} receiver
+    @public
   */
   removeObject(object: T): this;
   /**
     Removes each object in the passed array from the receiver.
+
+    @method removeObjects
+    @param {EmberArray} objects the objects to remove
+    @return {EmberArray} receiver
+    @public
   */
   removeObjects(objects: T[]): this;
   /**
@@ -1460,10 +1707,20 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
     cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
     ```
+
+    @method addObject
+    @param {*} obj object to add, if not already present
+    @return {EmberArray} receiver
+    @public
   */
   addObject(obj: T): this;
   /**
     Adds each object in the passed array to the receiver.
+
+    @method addObjects
+    @param {EmberArray} objects the objects to add.
+    @return {EmberArray} receiver
+    @public
   */
   addObjects(objects: T[]): this;
 }

From 0a942cdc7165f114a87b4dc23cf9034dd29f8355 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Fri, 23 Sep 2022 15:47:18 +0530
Subject: [PATCH 1162/1405] Added missing doc annotations

---
 packages/@ember/array/index.ts |  7 +++++++
 packages/@ember/array/proxy.ts | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 6ddb479cc55..5e6af351a1c 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -964,6 +964,13 @@ interface EmberArray<T> extends Enumerable {
 
     food.isAny('isFruit'); // true
     ```
+
+    @method isAny
+    @param {String} key the property to test
+    @param {String} [value] optional value to test against. Defaults to `true`
+    @return {Boolean}
+    @since 1.3.0
+    @public
   */
   isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
   /**
diff --git a/packages/@ember/array/proxy.ts b/packages/@ember/array/proxy.ts
index 3d658563462..599cb6bab69 100644
--- a/packages/@ember/array/proxy.ts
+++ b/packages/@ember/array/proxy.ts
@@ -120,12 +120,19 @@ interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArra
   /**
     The content array. Must be an object that implements `Array` and/or
     `MutableArray.`
+
+    @property content
+    @type EmberArray
+    @public
   */
   content: C | null;
   /**
     The array that the proxy pretends to be. In the default `ArrayProxy`
     implementation, this and `content` are the same. Subclasses of `ArrayProxy`
     can override this property to provide things like sorting and filtering.
+
+    @property arrangedContent
+    @public
   */
   arrangedContent: C | null;
   /**
@@ -134,6 +141,11 @@ interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArra
     content item to something new.
 
     This method will only be called if content is non-`null`.
+
+    @method objectAtContent
+    @param {Number} idx The index to retrieve.
+    @return {Object} the value or undefined if none found
+    @public
   */
   objectAtContent(idx: number): T | undefined;
   /**
@@ -142,6 +154,13 @@ interface ArrayProxy<T, C extends EmberArray<T> | T[] = T[]> extends MutableArra
     into something new.
 
     This method will only be called if content is non-`null`.
+
+    @method replaceContent
+    @param {Number} idx The starting index
+    @param {Number} amt The number of items to remove from the content.
+    @param {Array} objects Optional array of objects to insert.
+    @return {void}
+    @public
   */
   replaceContent(idx: number, amt: number, objects?: T[]): void;
 }

From 68fce234e51b3d0d6d9241a96833dfeb81303734 Mon Sep 17 00:00:00 2001
From: Ivan Antonov <76484889+antonovkrez@users.noreply.github.com>
Date: Fri, 23 Sep 2022 15:51:18 +0300
Subject: [PATCH 1163/1405] Update LICENSE

---
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index cb6742de74f..33d7a7ed739 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022 Yehuda Katz, Tom Dale and Ember.js contributors
+Copyright (c) 2011 Yehuda Katz, Tom Dale and Ember.js contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

From c63a1f61c9e31d2e67855c2d886f4eedb9d0f3c3 Mon Sep 17 00:00:00 2001
From: Ivan Antonov <76484889+antonovkrez@users.noreply.github.com>
Date: Fri, 23 Sep 2022 15:52:04 +0300
Subject: [PATCH 1164/1405] Update license.js

---
 generators/license.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generators/license.js b/generators/license.js
index a958b29ed23..c97c872c009 100644
--- a/generators/license.js
+++ b/generators/license.js
@@ -1,6 +1,6 @@
 /*!
  * @overview  Ember - JavaScript Application Framework
- * @copyright Copyright 2011-2022 Tilde Inc. and contributors
+ * @copyright Copyright 2011 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license

From 90be30986cc91dd280cd47d2e6a96e49c8d68c16 Mon Sep 17 00:00:00 2001
From: slijack <slijack@linkedin.com>
Date: Fri, 23 Sep 2022 18:24:22 +0530
Subject: [PATCH 1165/1405] Fixed bug

---
 packages/@ember/array/index.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 5e6af351a1c..53052e7dbd6 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -1021,11 +1021,10 @@ interface EmberArray<T> extends Enumerable {
       }); // false (true && false && false)
     ```
 
-    @method isAny
-    @param {String} key the property to test
-    @param {String} [value] optional value to test against. Defaults to `true`
-    @return {Boolean}
-    @since 1.3.0
+    @method reduce
+    @param {Function} callback The callback to execute
+    @param {Object} initialValue Initial value for the reduce
+    @return {Object} The reduced value.
     @public
   */
   reduce<V>(

From 3ec17789315fec24f63de0e0ab3177feb8906d83 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 26 Sep 2022 17:22:36 -0400
Subject: [PATCH 1166/1405] Add v4.8.0-beta.4 to CHANGELOG

(cherry picked from commit 4ca204d9618ad3f3603908cb6caba917f8369908)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bb087db593..768701a61ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.8.0-beta.4 (September 26, 2022)
+
+- [#20201](https://github.com/emberjs/ember.js/pull/20201) [BUGFIX] Fix type definition for `Route`
+
 ### v4.8.0-beta.3 (September 19, 2022)
 
 - [#20194](https://github.com/emberjs/ember.js/pull/20194) [BUGFIX] Provide a `.d.ts` file at types/stable

From 5bb493428c332c29a62969ffd6b55cb9567889ad Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 21 Sep 2022 16:49:52 -0600
Subject: [PATCH 1167/1405] [FEATURE] Test all supported TS versions in CI

As part of implementing RFC 0800, introduce support for testing all
supported versions of TypeScript against our types. For the moment, the
only additional supported version is the TypeScript nightly (`next`)
build. When we get to publishing stable types, the current version will
be the first version we support, and we will add new versions to the
matrix over time in line with the "rolling window" support policy.

Additionally, *remove* type checking from the `lint` scripts and create
a new set of `type-check` scripts instead. This is pragmatic, not
philosophical: we treat it differently from the "lints" here in that we
need to be able to run it repeatedly against different versions,
whereas the lints are all one-and-done.
---
 .github/workflows/ci.yml       | 88 +++++++++++++++++++++++++++++-----
 .github/workflows/night-ts.yml | 18 +++++++
 package.json                   |  8 ++--
 3 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 .github/workflows/night-ts.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c20a33eb655..67c6864ebc0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,40 @@ jobs:
       - name: linting
         run: yarn lint
 
+  types:
+    name: Type Checking (current version)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 12.x
+          cache: yarn
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: Check types
+        run: yarn type-check
+
+  types-range:
+    name: Type Checking (other supported versions)
+    runs-on: ubuntu-latest
+    needs: ['types']
+    strategy:
+      matrix:
+        ts-version: ['next']
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 12.x
+          cache: yarn
+      - name: install dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: install TS@${{matrix.ts-version}}
+        run: yarn add -D typescript@${{ matrix.ts-version }}
+      - name: Check types with TS@${{matrix.ts-version}}
+        run: yarn type-check
+
   basic-test:
     name: Debug and Prebuilt (All Tests by Package + Canary Features)
     runs-on: ubuntu-latest
@@ -61,7 +95,7 @@ jobs:
   browserstack-test:
     name: Browserstack Tests (Safari, Edge)
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -87,7 +121,7 @@ jobs:
   smoke-test:
     name: Smoke tests (Full Ember Apps)
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
@@ -110,7 +144,7 @@ jobs:
   production-test:
     name: Production (All Tests + Canary Features)
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -130,7 +164,7 @@ jobs:
   production-debug-render-test:
     name: Production (All Tests + Canary Features with Debug Render Tree)
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -151,7 +185,7 @@ jobs:
   extend-prototypes-test:
     name: Extend Prototypes
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -172,7 +206,7 @@ jobs:
   node-test:
     name: Node.js Tests
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -212,7 +246,7 @@ jobs:
   browser-test:
     name: Browser Tests (Firefox)
     runs-on: ubuntu-latest
-    needs: [basic-test, lint]
+    needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
@@ -236,7 +270,18 @@ jobs:
   deploy-tag:
     name: Deploy tags to npm
     runs-on: ubuntu-latest
-    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    needs:
+      [
+        basic-test,
+        lint,
+        browserstack-test,
+        production-test,
+        production-debug-render-test,
+        extend-prototypes-test,
+        node-test,
+        blueprint-test,
+        browser-test,
+      ]
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
       - uses: actions/checkout@v3
@@ -257,7 +302,18 @@ jobs:
   publish:
     name: Publish channel to s3
     runs-on: ubuntu-latest
-    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    needs:
+      [
+        basic-test,
+        lint,
+        browserstack-test,
+        production-test,
+        production-debug-render-test,
+        extend-prototypes-test,
+        node-test,
+        blueprint-test,
+        browser-test,
+      ]
     # Only run on pushes to branches that are not from the cron workflow
     if: github.event_name == 'push' && contains(github.ref, 'cron') != true
     steps:
@@ -280,7 +336,18 @@ jobs:
   publish-alpha:
     name: Publish alpha from default branch
     runs-on: ubuntu-latest
-    needs: [basic-test, lint, browserstack-test, production-test, production-debug-render-test, extend-prototypes-test, node-test, blueprint-test, browser-test]
+    needs:
+      [
+        basic-test,
+        lint,
+        browserstack-test,
+        production-test,
+        production-debug-render-test,
+        extend-prototypes-test,
+        node-test,
+        blueprint-test,
+        browser-test,
+      ]
     # Only run on pushes to master
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
     steps:
@@ -301,4 +368,3 @@ jobs:
           S3_BUCKET_NAME: 'builds.emberjs.com'
           S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY}}
           S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID}}
-
diff --git a/.github/workflows/night-ts.yml b/.github/workflows/night-ts.yml
new file mode 100644
index 00000000000..c3b5f3cea45
--- /dev/null
+++ b/.github/workflows/night-ts.yml
@@ -0,0 +1,18 @@
+name: Nightly TypeScript Run
+
+jobs:
+  ts-next:
+    name: typescript@next
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: volta-cli/action@v1
+      - run: yarn install --frozen-lockfile --non-interactive
+      - run: yarn add -D typescript@next
+      - run: yarn type-check
+
+# ...nightly at midnight
+on:
+  schedule:
+    - cron: 0 0 * * *
+  workflow_dispatch:
diff --git a/package.json b/package.json
index 9bbfd57496f..293b8e2d78a 100644
--- a/package.json
+++ b/package.json
@@ -41,16 +41,16 @@
     "lint:docs": "qunit tests/docs/coverage-test.js",
     "lint:eslint": "eslint --report-unused-disable-directives --cache .",
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
-    "lint:tsc:stable": "tsc --noEmit",
-    "lint:tsc:preview": "tsc --noEmit --project type-tests/preview",
-    "lint:tsc": "npm-run-all lint:tsc:*",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
     "test:blueprints:js": "mocha node-tests/blueprints/**/*-test.js",
     "test:blueprints:ts": "EMBER_TYPESCRIPT_BLUEPRINTS=true yarn test:blueprints:js",
     "test:blueprints": "yarn test:blueprints:js && yarn test:blueprints:ts",
     "test:node": "qunit tests/node/**/*-test.js",
-    "test:browserstack": "node bin/run-browserstack-tests.js"
+    "test:browserstack": "node bin/run-browserstack-tests.js",
+    "type-check:stable": "tsc --noEmit",
+    "type-check:preview": "tsc --noEmit --project type-tests/preview",
+    "type-check": "npm-run-all type-check:*"
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",

From 9921e72527239e0261094258dd69ae1d1a9ad269 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 26 Sep 2022 15:50:32 -0600
Subject: [PATCH 1168/1405] Fix internal issues caught by TS 4.9

TS 4.9 understands the `in` operator and catches two issues for us which
earlier versions did not:

1. We were checking `name in model` in `Route#serialize` without
   checking that `model` there is an object. Given that a route's model
   is *not* guaranteed to be an object, this was a runtime error waiting
   to happen. `'a' in 2` will produce `TypeError: 2 is not an Object.'

2. We were checking for `Symbol.iterator in Array` in an internal
   `iterate()` utility in the `@ember/debug/data-adapter` package. This
   check is *always* true when targeting ES6 or newer for arrays, which
   would *appear* to makie the `else` branch a no-op on all supported
   browsers. Unfortunately, at least some consumers of this API
   implement a narrower contract for iterables (presumably due to
   legacy needs to interop with IE11 in Ember < 4.x). In those cases,
   we really have an iterable, *not* an array.
---
 packages/@ember/debug/data-adapter.ts | 17 ++++++++++++++++-
 packages/@ember/routing/route.ts      |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index bc3e4c8a7a1..a7cf8ace322 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -10,6 +10,7 @@ import { A as emberA } from '@ember/array';
 import type { Cache } from '@glimmer/validator';
 import { consumeTag, createCache, getValue, tagFor, untrack } from '@glimmer/validator';
 import type ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+import { assert } from '.';
 
 /**
 @module @ember/debug/data-adapter
@@ -34,13 +35,27 @@ type WrappedRecord<T> = {
 
 type RecordCallback<T> = (records: Array<{ columnValues: object; object: T }>) => void;
 
+// Represents the base contract for iterables as understood in the GLimmer VM
+// historically. This is *not* the public API for it, because there *is* no
+// public API for it. Recent versions of Glimmer simply use `Symbol.iterator`,
+// but some older consumers still use this basic shape.
+interface GlimmerIterable<T> {
+  length: number;
+  forEach(fn: (value: T) => void): void;
+}
+
 function iterate<T>(arr: Array<T>, fn: (value: T) => void): void {
   if (Symbol.iterator in arr) {
     for (let item of arr) {
       fn(item);
     }
   } else {
-    arr.forEach(fn);
+    // SAFETY: this cast required to work this way to interop between TS 4.8
+    // and 4.9. When we drop support for 4.8, it will narrow correctly via the
+    // use of the `in` operator above. (Preferably we will solve this by just
+    // switching to require `Symbol.iterator` instead.)
+    assert('', typeof (arr as unknown as GlimmerIterable<T>).forEach === 'function');
+    (arr as unknown as GlimmerIterable<T>).forEach(fn);
   }
 }
 
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 1e22eebda1d..9e45c5dec7f 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -353,7 +353,7 @@ class Route<T = unknown>
     if (params.length === 1) {
       let [name] = params;
       assert('has name', name);
-      if (name in model) {
+      if (typeof model === 'object' && name in model) {
         object[name] = get(model, name);
       } else if (/_id$/.test(name)) {
         object[name] = get(model, 'id');

From 87417ab4cc458cecf870e45f47b10d8a06ade668 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 26 Sep 2022 20:35:31 -0600
Subject: [PATCH 1169/1405] Update to latest @types/node for TS 4.9 fixes

---
 package.json |  1 +
 yarn.lock    | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 293b8e2d78a..e33c9434d3b 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
     "@glimmer/validator": "0.84.2",
     "@simple-dom/document": "^1.4.0",
     "@tsconfig/ember": "^1.0.1",
+    "@types/node": "^18.7.23",
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
diff --git a/yarn.lock b/yarn.lock
index 69feb1907ec..fe1de64e150 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1666,6 +1666,11 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc"
   integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==
 
+"@types/node@^18.7.23":
+  version "18.7.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.23.tgz#75c580983846181ebe5f4abc40fe9dfb2d65665f"
+  integrity sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg==
+
 "@types/node@^9.6.0":
   version "9.6.0"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.0.tgz#d3480ee666df9784b1001a1872a2f6ccefb6c2d7"
@@ -7708,9 +7713,9 @@ morgan@^1.10.0:
     on-headers "~1.0.2"
 
 mout@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.4.tgz#9ffd261c4d6509e7ebcbf6b641a89b36ecdf8155"
-  integrity sha512-mZb9uOruMWgn/fw28DG4/yE3Kehfk1zKCLhuDU2O3vlKdnBBr4XaOCqVTflJ5aODavGUPqFHZgrFX3NJVuxGhQ==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/mout/-/mout-1.2.3.tgz#bd1477d8c7f2db5fcf43c91de30b6cc746b78e10"
+  integrity sha512-vtE+eZcSj/sBkIp6gxB87MznryWP+gHIp0XX9SKrzA5TAkvz6y7VTuNruBjYdJozd8NY5i9XVIsn8cn3SwNjzg==
 
 ms@2.0.0:
   version "2.0.0"

From 323dae073d00c87ee3f48c115499b7e2c15e402e Mon Sep 17 00:00:00 2001
From: Pablo Najera <pnajera@linkedin.com>
Date: Wed, 28 Sep 2022 10:24:28 -0400
Subject: [PATCH 1170/1405] adding comment annotations back

---
 packages/@ember/object/evented.ts | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/packages/@ember/object/evented.ts b/packages/@ember/object/evented.ts
index 9123d3a2680..cba3ab94a6b 100644
--- a/packages/@ember/object/evented.ts
+++ b/packages/@ember/object/evented.ts
@@ -61,6 +61,13 @@ interface Evented {
     be set as the "this" for the callback. This is a good way to give your
     function access to the object triggering the event. When the target
     parameter is used the callback method becomes the third argument.
+
+    @method on
+    @param {String} name The name of the event
+    @param {Object} [target] The "this" binding for the callback
+    @param {Function|String} method A function or the name of a function to be called on `target`
+    @return this
+    @public
   */
   on<Target>(
     name: string,
@@ -76,6 +83,13 @@ interface Evented {
     This function takes an optional 2nd argument that will become the "this"
     value for the callback. When the target parameter is used the callback method
     becomes the third argument.
+
+    @method one
+    @param {String} name The name of the event
+    @param {Object} [target] The "this" binding for the callback
+    @param {Function|String} method A function or the name of a function to be called on `target`
+    @return this
+    @public
   */
   one<Target>(
     name: string,
@@ -97,10 +111,22 @@ interface Evented {
 
     // outputs: person ate some broccoli
     ```
+
+    @method trigger
+    @param {String} name The name of the event
+    @param {Object...} args Optional arguments to pass on
+    @public
   */
   trigger(name: string, ...args: any[]): any;
   /**
     Cancels subscription for given name, target, and method.
+
+    @method off
+    @param {String} name The name of the event
+    @param {Object} target The target of the subscription
+    @param {Function|String} method The function or the name of a function of the subscription
+    @return this
+    @public
   */
   off<Target>(
     name: string,
@@ -110,6 +136,11 @@ interface Evented {
   off(name: string, method: string | ((...args: any[]) => void)): this;
   /**
     Checks to see if object has any subscriptions for named event.
+
+    @method has
+    @param {String} name The name of the event
+    @return {Boolean} does the object have a subscription for event
+    @public
    */
   has(name: string): boolean;
 }

From cf010f759fe3369dfcdf5d75a762fda7c178a9da Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 29 Sep 2022 07:35:51 -0600
Subject: [PATCH 1171/1405] [BUGFIX beta] remove wrong exports from preview
 routing types

These exports appeared in the DefinitelyTyped definitions for a very
long time, and were missed when migrating them for the preview. This
change aligns the type exports with the actual public API.
---
 types/preview/@ember/application/index.d.ts | 2 +-
 types/preview/@ember/routing/index.d.ts     | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index d4d9cd8c09b..4965e875f58 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -3,7 +3,7 @@ declare module '@ember/application' {
   import ApplicationInstance from '@ember/application/instance';
   import EventDispatcher from '@ember/application/-private/event-dispatcher';
   import { EventDispatcherEvents } from '@ember/application/types';
-  import { Router } from '@ember/routing';
+  import Router from '@ember/routing/router';
   import Registry from '@ember/application/-private/registry';
   import type { Resolver } from '@ember/-internals/resolver';
   import { AnyFn } from 'ember/-private/type-utils';
diff --git a/types/preview/@ember/routing/index.d.ts b/types/preview/@ember/routing/index.d.ts
index 1fc19e3d27b..8c29c550b6d 100644
--- a/types/preview/@ember/routing/index.d.ts
+++ b/types/preview/@ember/routing/index.d.ts
@@ -1,7 +1,4 @@
 declare module '@ember/routing' {
-  export { default as Route } from '@ember/routing/route';
-  export { default as Router } from '@ember/routing/router';
-
   import { Opaque } from 'ember/-private/type-utils';
 
   // In normal TypeScript, this component is essentially an opaque token

From 0aa5177ffc6585dc4c8872da2f5ae6fdad86c1ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 15:02:23 +0000
Subject: [PATCH 1172/1405] Bump @typescript-eslint/parser from 5.38.0 to
 5.38.1

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.38.0 to 5.38.1.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.38.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 66 +++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index e33c9434d3b..bdb1f70fb19 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@typescript-eslint/parser": "^5.38.1",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1166.0",
     "babel-template": "^6.26.0",
diff --git a/yarn.lock b/yarn.lock
index fe1de64e150..b636ec58f1b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1750,14 +1750,14 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.0.tgz#5a59a1ff41a7b43aacd1bb2db54f6bf1c02b2ff8"
-  integrity sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/typescript-estree" "5.38.0"
+"@typescript-eslint/parser@^5.38.1":
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.1.tgz#c577f429f2c32071b92dff4af4f5fbbbd2414bd0"
+  integrity sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.38.1"
+    "@typescript-eslint/types" "5.38.1"
+    "@typescript-eslint/typescript-estree" "5.38.1"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.38.0":
@@ -1768,6 +1768,14 @@
     "@typescript-eslint/types" "5.38.0"
     "@typescript-eslint/visitor-keys" "5.38.0"
 
+"@typescript-eslint/scope-manager@5.38.1":
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz#f87b289ef8819b47189351814ad183e8801d5764"
+  integrity sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==
+  dependencies:
+    "@typescript-eslint/types" "5.38.1"
+    "@typescript-eslint/visitor-keys" "5.38.1"
+
 "@typescript-eslint/type-utils@5.38.0":
   version "5.38.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz#c8b7f681da825fcfc66ff2b63d70693880496876"
@@ -1783,6 +1791,11 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.0.tgz#8cd15825e4874354e31800dcac321d07548b8a5f"
   integrity sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==
 
+"@typescript-eslint/types@5.38.1":
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.1.tgz#74f9d6dcb8dc7c58c51e9fbc6653ded39e2e225c"
+  integrity sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg==
+
 "@typescript-eslint/typescript-estree@5.38.0":
   version "5.38.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz#89f86b2279815c6fb7f57d68cf9b813f0dc25d98"
@@ -1796,6 +1809,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.38.1":
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz#657d858d5d6087f96b638ee383ee1cff52605a1e"
+  integrity sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==
+  dependencies:
+    "@typescript-eslint/types" "5.38.1"
+    "@typescript-eslint/visitor-keys" "5.38.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.38.0":
   version "5.38.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.38.0.tgz#5b31f4896471818153790700eb02ac869a1543f4"
@@ -1816,6 +1842,14 @@
     "@typescript-eslint/types" "5.38.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.38.1":
+  version "5.38.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz#508071bfc6b96d194c0afe6a65ad47029059edbc"
+  integrity sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==
+  dependencies:
+    "@typescript-eslint/types" "5.38.1"
+    eslint-visitor-keys "^3.3.0"
+
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
@@ -3802,7 +3836,14 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.3.3, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@4.3.3:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
@@ -3816,13 +3857,6 @@ debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"

From 5c65cb5bbf862419cccdc39ebab62ef7ad7d7d30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 15:02:35 +0000
Subject: [PATCH 1173/1405] Bump broccoli-babel-transpiler from 7.8.0 to 7.8.1

Bumps [broccoli-babel-transpiler](https://github.com/babel/broccoli-babel-transpiler) from 7.8.0 to 7.8.1.
- [Release notes](https://github.com/babel/broccoli-babel-transpiler/releases)
- [Changelog](https://github.com/babel/broccoli-babel-transpiler/blob/v7.8.1/CHANGELOG.md)
- [Commits](https://github.com/babel/broccoli-babel-transpiler/compare/v7.8.0...v7.8.1)

---
updated-dependencies:
- dependency-name: broccoli-babel-transpiler
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e33c9434d3b..f99433a505d 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "aws-sdk": "^2.1166.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
-    "broccoli-babel-transpiler": "^7.8.0",
+    "broccoli-babel-transpiler": "^7.8.1",
     "broccoli-persistent-filter": "^2.3.1",
     "broccoli-plugin": "^4.0.3",
     "broccoli-rollup": "^2.1.1",
diff --git a/yarn.lock b/yarn.lock
index fe1de64e150..4b0cc229575 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2626,10 +2626,10 @@ broccoli-amd-funnel@^2.0.1:
     broccoli-plugin "^1.3.0"
     symlink-or-copy "^1.2.0"
 
-broccoli-babel-transpiler@^7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
-  integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
+broccoli-babel-transpiler@^7.8.0, broccoli-babel-transpiler@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.1.tgz#a5dc04cf4f59de98124fc128683ab2b83e5d28c1"
+  integrity sha512-6IXBgfRt7HZ61g67ssBc6lBb3Smw3DPZ9dEYirgtvXWpRZ2A9M22nxy6opEwJDgDJzlu/bB7ToppW33OFkA1gA==
   dependencies:
     "@babel/core" "^7.12.0"
     "@babel/polyfill" "^7.11.5"

From 86d2a46ff0e3f7588bca8c0645d5109184e0f1ec Mon Sep 17 00:00:00 2001
From: Geordan Neukum <gneukum1@gmail.com>
Date: Tue, 31 May 2022 22:47:24 -0400
Subject: [PATCH 1174/1405] [DOC] add example usage of `deprecate`

---
 packages/@ember/debug/lib/deprecate.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 66e0e77215b..3650a69238c 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -181,6 +181,25 @@ if (DEBUG) {
     * In a production build, this method is defined as an empty function (NOP).
     Uses of this method in Ember itself are stripped from the ember.prod.js build.
 
+    ```javascript
+    import { deprecate } from '@ember/debug';
+
+    deprecate(
+      'Use of `assign` has been deprecated. Please use `Object.assign` or the spread operator instead.',
+      false,
+      {
+        id: 'ember-polyfills.deprecate-assign',
+        until: '5.0.0',
+        url: 'https://deprecations.emberjs.com/v4.x/#toc_ember-polyfills-deprecate-assign',
+        for: 'ember-source',
+        since: {
+          available: '4.0.0',
+          enabled: '4.0.0',
+        },
+      }
+    );
+    ```
+
     @method deprecate
     @for @ember/debug
     @param {String} message A description of the deprecation.

From 454a8f0005136294f4a466903b1095c702d4031a Mon Sep 17 00:00:00 2001
From: Geordan Neukum <gneukum1@gmail.com>
Date: Sun, 19 Jun 2022 11:28:33 -0400
Subject: [PATCH 1175/1405] [DOC] describe ember deprecation system

Let's add a brief description of the ember deprecation system to the
`deprecate` API docs. This should give developers a little bit more
insight into how deprecations work in the ember ecosystem.
---
 packages/@ember/debug/lib/deprecate.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 3650a69238c..cf67063fb64 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -178,6 +178,24 @@ if (DEBUG) {
     Display a deprecation warning with the provided message and a stack trace
     (Chrome and Firefox only).
 
+    Ember itself leverages [Semantic Versioning](https://semver.org) to aid
+    projects in keeping up with changes to the framework. Before any
+    functionality or API is removed, it first flows linearly through a
+    deprecation staging process. The staging process currently contains two
+    stages: available and enabled.
+
+    Deprecations are initially released into the 'available' stage.
+    Deprecations will stay in this stage until the replacement API has been
+    marked as a recommended practice via the RFC process and the addon
+    ecosystem has generally adopted the change.
+
+    Once a deprecation meets the above criteria, it will move into the
+    'enabled' stage where it will remain until the functionality or API is
+    eventually removed.
+
+    For application and addon developers, "available" deprecations are not
+    urgent and "enabled" deprecations require action.
+
     * In a production build, this method is defined as an empty function (NOP).
     Uses of this method in Ember itself are stripped from the ember.prod.js build.
 

From 81c10c76d5f074d9113a921e1117c290bda21fe9 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 Oct 2022 15:15:16 -0400
Subject: [PATCH 1176/1405] Add v4.8.0-beta.5 to CHANGELOG

(cherry picked from commit 6cd18e4f675bab791ccc0b22e68b48be34e13c2e)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 768701a61ae..9e7bb3c95c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.8.0-beta.5 (October 3, 2022)
+
+- [#20212](https://github.com/emberjs/ember.js/pull/20212) [BUGFIX] Remove incorrect exports from preview routing types
+
 ### v4.8.0-beta.4 (September 26, 2022)
 
 - [#20201](https://github.com/emberjs/ember.js/pull/20201) [BUGFIX] Fix type definition for `Route`

From 75ce611ad73bec1cb2ff33126b941550ab2e71d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Oct 2022 15:46:08 +0000
Subject: [PATCH 1177/1405] Bump volta-cli/action from 1 to 4

Bumps [volta-cli/action](https://github.com/volta-cli/action) from 1 to 4.
- [Release notes](https://github.com/volta-cli/action/releases)
- [Changelog](https://github.com/volta-cli/action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/volta-cli/action/compare/v1...v4)

---
updated-dependencies:
- dependency-name: volta-cli/action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/night-ts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/night-ts.yml b/.github/workflows/night-ts.yml
index c3b5f3cea45..0feb70f69c1 100644
--- a/.github/workflows/night-ts.yml
+++ b/.github/workflows/night-ts.yml
@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: volta-cli/action@v1
+      - uses: volta-cli/action@v4
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn add -D typescript@next
       - run: yarn type-check

From 96bb3ea1dd6edb1a148413ff4b3ae71c93f6aff5 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Mon, 3 Oct 2022 20:47:46 +0200
Subject: [PATCH 1178/1405] Remove `Function` and `String` from
 `EXTEND_PROTOTYPES` type

---
 types/preview/ember/index.d.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index 59270bbcbb8..321c0ab422b 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -238,10 +238,8 @@ declare module 'ember' {
       const service: typeof EmberServiceNs.inject;
     }
     namespace ENV {
-      const EXTEND_PROTOTYPES: {
+      const EXTEND_PROTOTYPES: boolean | {
         Array: boolean;
-        Function: boolean;
-        String: boolean;
       };
       const LOG_BINDINGS: boolean;
       const LOG_STACKTRACE_ON_DEPRECATION: boolean;

From 908329efd8d45829e960b38740cd95d6493bf732 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 12 Oct 2022 06:50:40 -0600
Subject: [PATCH 1179/1405] Add v4.7.1 to CHANGELOG

(cherry picked from commit 9113e22b1c820b8ae149293782cd1d5d5ea63a67)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7bb3c95c3..49ff465999c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.7.1 (October 12, 2022)
+
+- [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
+
 ### v4.8.0-beta.5 (October 3, 2022)
 
 - [#20212](https://github.com/emberjs/ember.js/pull/20212) [BUGFIX] Remove incorrect exports from preview routing types

From 1ea72b1cd37d80b45f97f05ef228dfeb13405370 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 12 Oct 2022 07:02:06 -0600
Subject: [PATCH 1180/1405] Add v4.4.3 to CHANGELOG

(cherry picked from commit fd0f7cbeea607084ae1b29201e1bec56db0c7d5c)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49ff465999c..e337f059c34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.4.3 (October 12, 2022)
+
+- [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
+
 ### v4.7.1 (October 12, 2022)
 
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries

From a6f73ac809cce4659f8d2d76bb0081995f53022a Mon Sep 17 00:00:00 2001
From: Roman <1848357+r-52@users.noreply.github.com>
Date: Sun, 16 Oct 2022 18:26:05 +0000
Subject: [PATCH 1181/1405] [CLEANUP] use `console.debug` directly

Right now `console.info` is called without a fallback to `console.log`.
On the other hand `console.log` had a fallback to `console.log` - it
looks like (based on caniuse) that all major browsers support the
different `console.*` methods.
This commit follows the same pattern like `console.info`.
---
 packages/@ember/debug/index.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index c458b3e4be2..53b975282ae 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -191,13 +191,7 @@ if (DEBUG) {
     @public
   */
   setDebugFunction('debug', function debug(message) {
-    /* eslint-disable no-console */
-    if (console.debug) {
-      console.debug(`DEBUG: ${message}`);
-    } else {
-      console.log(`DEBUG: ${message}`);
-    }
-    /* eslint-enable no-console */
+    console.debug(`DEBUG: ${message}`); /* eslint-disable-line no-console */
   });
 
   /**

From 449c9a5cf0264d304805c00ac9937e88bd438111 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 17 Oct 2022 14:10:12 -0400
Subject: [PATCH 1182/1405] Add v4.8.0 to CHANGELOG

(cherry picked from commit 9021de5a7c49d2556ccbe5f671c1b90a57da4cf1)
---
 CHANGELOG.md | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e337f059c34..60248780acb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.8.0 (October 17, 2022)
+
+- [#20180](https://github.com/emberjs/ember.js/pull/20180) [FEATURE] Publish an opt-in preview of public types for Ember
+- [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Upgrade router_js to fix Linked list of RouteInfos contains undefined object
+
 ### v4.4.3 (October 12, 2022)
 
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
@@ -8,28 +13,6 @@
 
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
 
-### v4.8.0-beta.5 (October 3, 2022)
-
-- [#20212](https://github.com/emberjs/ember.js/pull/20212) [BUGFIX] Remove incorrect exports from preview routing types
-
-### v4.8.0-beta.4 (September 26, 2022)
-
-- [#20201](https://github.com/emberjs/ember.js/pull/20201) [BUGFIX] Fix type definition for `Route`
-
-### v4.8.0-beta.3 (September 19, 2022)
-
-- [#20194](https://github.com/emberjs/ember.js/pull/20194) [BUGFIX] Provide a `.d.ts` file at types/stable
-- [#20196](https://github.com/emberjs/ember.js/pull/20196) [BUGFIX] types imports are at 'ember-source/types'
-
-### v4.8.0-beta.2 (September 13, 2022)
-
-- [#20186](https://github.com/emberjs/ember.js/pull/20186) [BUGFIX] Fix `@ember/runloop` type tests folder name so that the tests are properly excluded from the build
-- [#20180](https://github.com/emberjs/ember.js/pull/20180) [FEATURE] Publish an opt-in preview of public types for Ember
-
-### v4.8.0-beta.1 (September 6, 2022)
-
-- [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Upgrade router_js to fix Linked list of RouteInfos contains undefined object
-
 ### v4.7.0 (September 6, 2022)
 
 - [#20126](https://github.com/emberjs/ember.js/pull/20126) [BUGFIX] Replace Firefox detection that used a deprecated browser API

From 53affff6b3c8af459442034bcddac09e135a33fb Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 17 Oct 2022 14:48:44 -0400
Subject: [PATCH 1183/1405] Add v4.9.0-beta.1 to CHANGELOG

(cherry picked from commit 1211052b2aa89ac90009f9b626e542754c9a383a)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60248780acb..eca41486ba7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.9.0-beta.1 (October 17, 2022) 
+
+- [#20203](https://github.com/emberjs/ember.js/pull/20203) / [#20204](https://github.com/emberjs/ember.js/pull/20204) [FEATURE] Preview types: Update to Typescript 4.8
+
 ### v4.8.0 (October 17, 2022)
 
 - [#20180](https://github.com/emberjs/ember.js/pull/20180) [FEATURE] Publish an opt-in preview of public types for Ember

From c617784ac866d00c9886207e9efb3799720a7ee7 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 17 Oct 2022 14:51:09 -0400
Subject: [PATCH 1184/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e33c9434d3b..7cd5376b01c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.9.0-alpha.1",
+  "version": "4.10.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 04d3a8816c4640964165d6a1d639ad40da70cffb Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 18 Oct 2022 13:37:34 -0400
Subject: [PATCH 1185/1405] [BUGFIX release] Fix unsafe internal casts for TS
 4.9

- For casting to `NativeArray` from `T[] & EmberArray<unknown>`: we do
  not have enough information to be able to tell TypeScript that the
  cast is safe here (and likely never will). TS 4.9 seems to handle the
  intersection type more robustly, though it is not yet documented.
  Here we make the cast from `T[] & EmberArray<T>` to `NativeArray<T>`
  even *more* explicitly unsafe via an `as unknown` intermediary cast.

- For handling a proxy getter: TS' intersection of the `this` type for
  the `get()` method on a proxy receiver object used in `CoreObject`
  now flags up that the type of `this` may *not* be exactly
  `CoreObject`. Using `typeof this` in that intersection instead allows
  TS to see that the trap is safe.
---
 packages/@ember/array/index.ts | 2 +-
 packages/@ember/object/core.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 53052e7dbd6..a5a57064f72 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -1958,7 +1958,7 @@ if (ENV.EXTEND_PROTOTYPES.Array) {
 
     if (isEmberArray(arr)) {
       // SAFETY: If it's a true native array and it is also an EmberArray then it should be an Ember NativeArray
-      return arr as NativeArray<T>;
+      return arr as unknown as NativeArray<T>;
     } else {
       // SAFETY: This will return an NativeArray but TS can't infer that.
       return NativeArray.apply(arr ?? []) as NativeArray<T>;
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index f616ca0bb7b..a6f2ac8613e 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -261,7 +261,7 @@ class CoreObject {
 
       /* globals Proxy Reflect */
       self = new Proxy(this, {
-        get(target: CoreObject & HasUnknownProperty, property, receiver) {
+        get(target: typeof this & HasUnknownProperty, property, receiver) {
           if (property === PROXY_CONTENT) {
             return target;
           } else if (

From f17400e938759b1065d53ae2bc9dd124608666b0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 18 Oct 2022 16:06:24 -0400
Subject: [PATCH 1186/1405] [BUGFIX release] Remove type export for
 ControllerMixin

This type does not exist to be imported from the location it existed at
in the definitions, and so the types could auto-suggest an import which
would produce a runtime error. Remove it to prevent users from being
misled this way.

See also: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/62784
---
 types/preview/@ember/controller/index.d.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
index 5d7dcbc4d2b..d4fd2758899 100644
--- a/types/preview/@ember/controller/index.d.ts
+++ b/types/preview/@ember/controller/index.d.ts
@@ -16,7 +16,7 @@ declare module '@ember/controller' {
   /**
    * Additional methods for the Controller.
    */
-  export interface ControllerMixin extends ActionHandler {
+  interface ControllerMixin extends ActionHandler {
     /**
      * @deprecated until 5.0. Use `RouterService.replaceWith` instead.
      */
@@ -33,7 +33,6 @@ declare module '@ember/controller' {
     queryParams: Array<string | Record<string, QueryParamConfig | string | undefined>>;
     target: object;
   }
-  export const ControllerMixin: Mixin;
 
   export default class Controller extends EmberObject {}
   export default interface Controller extends ControllerMixin {}

From d9240d5f7b7ce95e4742682b936d20d07475599d Mon Sep 17 00:00:00 2001
From: Rich Vallone <rich.vallone@flatworld.com>
Date: Tue, 18 Oct 2022 19:05:08 -0500
Subject: [PATCH 1187/1405] Fix typos

---
 CHANGELOG.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eca41486ba7..bb2adf26769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -544,7 +544,7 @@
 
 ### v3.16.8 (April 24, 2020)
 
-- [#18879](https://github.com/emberjs/ember.js/pull/18879) Ensure errors thrown during component construction do not cause (unrelated) errors during application teardown (fixes a common issue when using `setupOnerror` with components asserting during `constructor`/`init`/`didInssertElement`).
+- [#18879](https://github.com/emberjs/ember.js/pull/18879) Ensure errors thrown during component construction do not cause (unrelated) errors during application teardown (fixes a common issue when using `setupOnerror` with components asserting during `constructor`/`init`/`didInsertElement`).
 
 ### v3.16.7 (April 13, 2020)
 
@@ -1137,7 +1137,7 @@ Fixes a few issues:
 - [#15849](https://github.com/emberjs/ember.js/pull/15849) [BUGFIX] Fix issue when observing a computed property that is clobbered during creation.
 - [#15797](https://github.com/emberjs/ember.js/pull/15797) [BUGFIX] Fix issues with using partials nested within other partials.
 - [#15808](https://github.com/emberjs/ember.js/pull/15808) [BUGFIX] Fix a memory leak in certain testing scenarios.
-- [#15746](https://github.com/emberjs/ember.js/pull/15746) [BUGFIX] Fix computed sort regression when array property is initally `null`.
+- [#15746](https://github.com/emberjs/ember.js/pull/15746) [BUGFIX] Fix computed sort regression when array property is initially `null`.
 - [#15777](https://github.com/emberjs/ember.js/pull/15777) [BUGFIX] Fix various issues around accessing dynamic data within a partial.
 - [#15606](https://github.com/emberjs/ember.js/pull/15606) [BUGFIX] Add fs-extra to deps
 - [#15697](https://github.com/emberjs/ember.js/pull/15697) [BUGFIX] Move accessing meta out of the loop
@@ -1163,7 +1163,7 @@ Fixes a few issues:
 ### 2.16.1 (October 29, 2017)
 
 - [#15722](https://github.com/emberjs/ember.js/pull/15722) [BUGFIX] Avoid assertion when using `(get` helper with empty paths.
-- [#15746](https://github.com/emberjs/ember.js/pull/15746) [BUGFIX] Fix computed sort regression when array property is initally `null`.
+- [#15746](https://github.com/emberjs/ember.js/pull/15746) [BUGFIX] Fix computed sort regression when array property is initially `null`.
 - [#15613](https://github.com/emberjs/ember.js/pull/15613) [BUGFIX] Prevent an error from being thrown when partial set of query params are passed to the router service.
 - [#15777](https://github.com/emberjs/ember.js/pull/15777) [BUGFIX] Fix various issues around accessing dynamic data within a partial.
 
@@ -1432,7 +1432,7 @@ Fixes a few issues:
 - [#13920](https://github.com/emberjs/ember.js/pull/13920) [BUGFIX] Add more info to the `Ember.Binding` deprecation.
 - [#13757](https://github.com/emberjs/ember.js/pull/13757) / [#13773](https://github.com/emberjs/ember.js/pull/13773) [CLEANUP] Remove legacy view layer features.
 - [#13819](https://github.com/emberjs/ember.js/pull/13819) [DOC] Add documentation for container (getOwner, etc.)
-- [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-string-ishtmlsafe] Enable by defaut.
+- [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-string-ishtmlsafe] Enable by default.
 - [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-application-engines] Enable by default.
 - [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-runtime-enumerable-includes] Enable by default.
 - [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-testing-check-waiters] Enable by default.
@@ -1686,7 +1686,7 @@ Fixes a few issues:
 - [#12163](https://github.com/emberjs/ember.js/pull/12163) [BUGFIX] Move `View#currentState` to `View#_currentState`.
 - [#12163](https://github.com/emberjs/ember.js/pull/12163) [DEPRECATION] Deprecate using the private `currentState` property on views/components.
 - [#12132](https://github.com/emberjs/ember.js/pull/12132) [BUGFIX] Fix stack overflow issue in `_super` wrapper updates.
-- [#12138](https://github.com/emberjs/ember.js/pull/12138) [BUGFIX] Do not require `this._super(...arguments)` when components implement `didRecieveAttrs`.
+- [#12138](https://github.com/emberjs/ember.js/pull/12138) [BUGFIX] Do not require `this._super(...arguments)` when components implement `didReceiveAttrs`.
 - [#12170](https://github.com/emberjs/ember.js/pull/12170) [BUGFIX release] Ensure `Ember.computed.sum` returns `0` if the array to be operated on is `null` or `undefined`.
 - [#12176](https://github.com/emberjs/ember.js/pull/12176) [BUGFIX] Enable extending `Ember.LinkComponent` for customizations.
 - [#10173](https://github.com/emberjs/ember.js/pull/10173) [BUGFIX] Ensure non-singleton injections are not cached incorrectly.
@@ -1855,7 +1855,7 @@ Fixes a few issues:
 
 ### 1.13.9 (August 22, 2015)
 
-- [#12138](https://github.com/emberjs/ember.js/pull/12138) [BUGFIX] Do not require calling `this._super(...arguments)` in views/components when implementing `didRecieveAttrs`.
+- [#12138](https://github.com/emberjs/ember.js/pull/12138) [BUGFIX] Do not require calling `this._super(...arguments)` in views/components when implementing `didReceiveAttrs`.
 - [#12164](https://github.com/emberjs/ember.js/pull/12164) [BUGFIX] Properly handle block-less usage of a component without a template or layout specified in the component definition.
 
 ### 1.13.8 (August 13, 2015)
@@ -2864,7 +2864,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [Fixes #2840] - textfield binding issue with null
 * Update Backburner.js
 * Make sure we are inside a run loop before syncing
-* Inline helper function, remove uneeded function call.
+* Inline helper function, remove unneeded function call.
 * Remove unnecessary function call from `Ember.normalizeTuple`
 * Ember.SortableMixin: new option sortFunction
 * Update docs so that `Ember.View.$` is a method, not a property.
@@ -3042,7 +3042,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 ### Ember 1.0.0-rc.3 _(April 19, 2013)_
 
 * fn.call is wasteful when the thisArg is not needed.
-* dont needlessly close-over and rebuild insertViewCollection
+* don't needlessly close-over and rebuild insertViewCollection
 * Don't apply href to LinkView that isn't using 'a' tag
 * Documents {{linkTo}}
 * Include ember-testing in full build
@@ -3085,7 +3085,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * s/nexts/these (nexts is not a word)
 * More verbose error message on failed linkTo routing attempts
 * viewName is a property
-* remove uneeded closures
+* remove unneeded closures
 * JSDoc should use {*} for mixed types instead of {anything} and {any}
 * add an "includeSelf" parameter to "invokeRecursively"
 * Fix ArrayController#length when content is not explicitly set
@@ -3108,7 +3108,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Use a string instead of an array in RenderBuffer
 * Convert a for in loop to a plain for loop
 * Improve view container lookup performance
-* remove uneeded asynchrony from Ember.Deferred tests
+* remove unneeded asynchrony from Ember.Deferred tests
 * remove unneeded asynchrony from routing tests
 * Add {{text area}}
 * Default text input action to 'enter'
@@ -3595,7 +3595,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 
 * Significant internal performance improvements
 * Improved performance of RenderBuffer
-* Avoid unneceesary ping-ponging in binding updates
+* Avoid unnecessary ping-ponging in binding updates
 * Fix infinite loop caused by jQuery.extend with array in older browsers
 * Added ENV.SHIM_ES5 option to improve compatibility with Prototype.js
 * Added Ember.Evented mixin for internal events

From 811fd074c82943b8bb33455ada15e58f034f8736 Mon Sep 17 00:00:00 2001
From: Ben Tidy <ogftpi@msn.com>
Date: Tue, 25 Oct 2022 14:01:37 +0100
Subject: [PATCH 1188/1405] Include package name in deprecation function

So this slightly changes the deprecation message to allow for package (namespace) to be included in the error message. This make it so that the message "will be removed in ember (package version)" is replaced with "will be removed in (package name) (package version)".

This was change was proposed because of this usage:
https://github.com/adopted-ember-addons/ember-metrics/blob/f604272de70e44ac731c711cfad5eae8792ee3ca/addon/metrics-adapters/google-tag-manager.js#L50

and this issue:
https://github.com/adopted-ember-addons/ember-metrics/issues/453
---
 packages/@ember/debug/lib/deprecate.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index f3d8a29357c..882bafef4b5 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -91,7 +91,8 @@ if (DEBUG) {
     }
 
     if (options?.until) {
-      message = message + ` This will be removed in Ember ${options.until}.`;
+      let namespace = options?.for ? options.for : "Ember";
+      message = message + ` This will be removed in ${namespace} ${options.until}.`;
     }
 
     if (options?.url) {

From fdbd78031fd98da373af0623fe9c448cf5709550 Mon Sep 17 00:00:00 2001
From: Ben Tidy <ogftpi@msn.com>
Date: Tue, 25 Oct 2022 15:56:53 +0100
Subject: [PATCH 1189/1405] Remove fallback to ember

---
 packages/@ember/debug/lib/deprecate.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 882bafef4b5..37d6c083e1b 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -91,8 +91,7 @@ if (DEBUG) {
     }
 
     if (options?.until) {
-      let namespace = options?.for ? options.for : "Ember";
-      message = message + ` This will be removed in ${namespace} ${options.until}.`;
+      message = message + ` This will be removed in ${options.for} ${options.until}.`;
     }
 
     if (options?.url) {

From d61d713c055be1cc2c9c916c46d83af75f9af1ab Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 25 Oct 2022 20:40:37 -0400
Subject: [PATCH 1190/1405] Add v4.9.0-beta.2 to CHANGELOG

(cherry picked from commit 5c79b3f6d2352fa3ca2ae585e7c1b9662f754d29)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eca41486ba7..29f46d54a30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.9.0-beta.2 (October 25, 2022)
+- [#20227](https://github.com/emberjs/ember.js/pull/20227) [BUGFIX] Fix unsafe internal cast for NativeArray
+- [#20228](https://github.com/emberjs/ember.js/pull/20228) [BUGFIX] Remove type export for ControllerMixin
+
 ### v4.9.0-beta.1 (October 17, 2022) 
 
 - [#20203](https://github.com/emberjs/ember.js/pull/20203) / [#20204](https://github.com/emberjs/ember.js/pull/20204) [FEATURE] Preview types: Update to Typescript 4.8

From 768983b0ddabe8e79144d3c6175eff2cc12ee466 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 27 Oct 2022 08:55:57 -0600
Subject: [PATCH 1191/1405] [BUGFIX beta] update `@types/node` for TS 4.9 issue

Note that this also bumps to TS 4.8.4 with some small bug fixes.
That particular bump is not user-facing, however.
---
 package.json |  2 +-
 yarn.lock    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 7cd5376b01c..6ddbaa75b8b 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
     "@glimmer/validator": "0.84.2",
     "@simple-dom/document": "^1.4.0",
     "@tsconfig/ember": "^1.0.1",
-    "@types/node": "^18.7.23",
+    "@types/node": "^18.11.7",
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
diff --git a/yarn.lock b/yarn.lock
index fe1de64e150..024e305f7dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1666,10 +1666,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc"
   integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==
 
-"@types/node@^18.7.23":
-  version "18.7.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.23.tgz#75c580983846181ebe5f4abc40fe9dfb2d65665f"
-  integrity sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg==
+"@types/node@^18.11.7":
+  version "18.11.7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.7.tgz#8ccef136f240770c1379d50100796a6952f01f94"
+  integrity sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ==
 
 "@types/node@^9.6.0":
   version "9.6.0"
@@ -10245,9 +10245,9 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
 typescript@~4.8.3:
-  version "4.8.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88"
-  integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From 8bddebebc2df55625b1d1fe92332de3d2885752c Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 29 Aug 2022 17:00:13 -0700
Subject: [PATCH 1192/1405] Convert packages/ember to TS

---
 .../-internals/environment/lib/context.ts     |   2 +-
 .../@ember/-internals/error-handling/index.ts |   2 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  58 +-
 .../helper/type-tests/invoke-helper.test.ts   |   2 +-
 packages/ember/index.js                       | 619 ---------------
 packages/ember/index.ts                       | 710 ++++++++++++++++++
 packages/ember/type-tests/ember.test.ts       |   7 +
 .../lib/test-cases/rendering.ts               |   3 +-
 .../lib/test-cases/router-non-application.ts  |   3 +-
 .../test-cases/test-resolver-application.ts   |   2 +-
 packages/{ember => loader/lib}/index.d.ts     |   6 -
 11 files changed, 757 insertions(+), 657 deletions(-)
 delete mode 100644 packages/ember/index.js
 create mode 100644 packages/ember/index.ts
 create mode 100644 packages/ember/type-tests/ember.test.ts
 rename packages/{ember => loader/lib}/index.d.ts (63%)

diff --git a/packages/@ember/-internals/environment/lib/context.ts b/packages/@ember/-internals/environment/lib/context.ts
index 928a543f9d4..a6e38c12103 100644
--- a/packages/@ember/-internals/environment/lib/context.ts
+++ b/packages/@ember/-internals/environment/lib/context.ts
@@ -23,7 +23,7 @@ export const context = (function (
       };
 })(global, global.Ember);
 
-export function getLookup(): object {
+export function getLookup(): Record<string, unknown> {
   return context.lookup;
 }
 
diff --git a/packages/@ember/-internals/error-handling/index.ts b/packages/@ember/-internals/error-handling/index.ts
index 405322b7b96..466254e7160 100644
--- a/packages/@ember/-internals/error-handling/index.ts
+++ b/packages/@ember/-internals/error-handling/index.ts
@@ -10,7 +10,7 @@ export function getOnerror() {
   return onerror;
 }
 // Ember.onerror setter
-export function setOnerror(handler: Function) {
+export function setOnerror(handler: Function | undefined) {
   onerror = handler;
 }
 
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 3d34d2c6ea3..a384566051d 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -44,6 +44,32 @@ export interface SimpleHelper<T, P extends unknown[], N extends Dict<unknown>> {
   compute: HelperFunction<T, P, N>;
 }
 
+/**
+  In many cases it is not necessary to use the full `Helper` class.
+  The `helper` method create pure-function helpers without instances.
+  For example:
+
+  ```app/helpers/format-currency.js
+  import { helper } from '@ember/component/helper';
+
+  export default helper(function([cents], {currency}) {
+    return `${currency}${cents * 0.01}`;
+  });
+  ```
+
+  @static
+  @param {Function} helper The helper function
+  @method helper
+  @for @ember/component/helper
+  @public
+  @since 1.13.0
+*/
+export function helper<T, P extends unknown[], N extends Dict<unknown>>(
+  helperFn: HelperFunction<T, P, N>
+): HelperFactory<SimpleHelper<T, P, N>> {
+  return new Wrapper(helperFn);
+}
+
 /**
   Ember Helpers are functions that can compute values, and are used in templates.
   For example, this code calls a helper named `format-currency`:
@@ -105,6 +131,12 @@ class Helper extends FrameworkObject {
   static isHelperFactory = true;
   static [IS_CLASSIC_HELPER] = true;
 
+  // `packages/ember/index.js` was setting `Helper.helper`. This seems like
+  // a bad idea and probably not something we want. We've moved that definition
+  // here, but it should definitely be reviewed and probably removed.
+  /** @deprecated */
+  static helper = helper;
+
   // SAFETY: this is initialized in `init`, rather than `constructor`. It is
   // safe to `declare` like this *if and only if* nothing uses the constructor
   // directly in this class, since nothing else can run before `init`.
@@ -269,30 +301,4 @@ export const SIMPLE_CLASSIC_HELPER_MANAGER = new SimpleClassicHelperManager();
 
 setHelperManager(() => SIMPLE_CLASSIC_HELPER_MANAGER, Wrapper.prototype);
 
-/**
-  In many cases it is not necessary to use the full `Helper` class.
-  The `helper` method create pure-function helpers without instances.
-  For example:
-
-  ```app/helpers/format-currency.js
-  import { helper } from '@ember/component/helper';
-
-  export default helper(function([cents], {currency}) {
-    return `${currency}${cents * 0.01}`;
-  });
-  ```
-
-  @static
-  @param {Function} helper The helper function
-  @method helper
-  @for @ember/component/helper
-  @public
-  @since 1.13.0
-*/
-export function helper<T, P extends unknown[], N extends Dict<unknown>>(
-  helperFn: HelperFunction<T, P, N>
-): HelperFactory<SimpleHelper<T, P, N>> {
-  return new Wrapper(helperFn);
-}
-
 export default Helper;
diff --git a/packages/@ember/helper/type-tests/invoke-helper.test.ts b/packages/@ember/helper/type-tests/invoke-helper.test.ts
index 9cec53e2729..ceb8ed895f4 100644
--- a/packages/@ember/helper/type-tests/invoke-helper.test.ts
+++ b/packages/@ember/helper/type-tests/invoke-helper.test.ts
@@ -1,4 +1,4 @@
-import Component from '@ember/-internals/glimmer/lib/component';
+import Component from '@ember/component';
 import { getValue } from '@ember/-internals/metal';
 import Helper from '@ember/component/helper';
 import { invokeHelper } from '@ember/helper';
diff --git a/packages/ember/index.js b/packages/ember/index.js
deleted file mode 100644
index 76febd1bef6..00000000000
--- a/packages/ember/index.js
+++ /dev/null
@@ -1,619 +0,0 @@
-import require, { has } from 'require';
-
-import { getENV, getLookup, setLookup } from '@ember/-internals/environment';
-import * as utils from '@ember/-internals/utils';
-import { Registry, Container } from '@ember/-internals/container';
-import * as instrumentation from '@ember/instrumentation';
-import { meta } from '@ember/-internals/meta';
-import * as metal from '@ember/-internals/metal';
-import { FEATURES, isEnabled } from '@ember/canary-features';
-import * as EmberDebug from '@ember/debug';
-import { assert, captureRenderTree, deprecate } from '@ember/debug';
-import Backburner from 'backburner';
-import Controller, { inject as injectController, ControllerMixin } from '@ember/controller';
-import {
-  _getStrings,
-  _setStrings,
-  dasherize,
-  camelize,
-  capitalize,
-  classify,
-  decamelize,
-  loc,
-  underscore,
-  w,
-} from '@ember/string';
-import Service, { service } from '@ember/service';
-
-import EmberObject, { action, computed, observer } from '@ember/object';
-import { dependentKeyCompat } from '@ember/object/compat';
-
-import {
-  RegistryProxyMixin,
-  ContainerProxyMixin,
-  _ProxyMixin,
-  RSVP,
-  Comparable,
-  ActionHandler,
-} from '@ember/-internals/runtime';
-import {
-  Component,
-  componentCapabilities,
-  modifierCapabilities,
-  setComponentManager,
-  escapeExpression,
-  getTemplates,
-  Helper,
-  helper,
-  htmlSafe,
-  isHTMLSafe,
-  setTemplates,
-  template,
-  Input,
-  isSerializationFirstNode,
-} from '@ember/-internals/glimmer';
-import VERSION from './version';
-import * as views from '@ember/-internals/views';
-import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
-import DataAdapter from '@ember/debug/data-adapter';
-import EmberError from '@ember/error';
-import { run } from '@ember/runloop';
-import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
-import { getOwner, setOwner } from '@ember/-internals/owner';
-import EmberArray, { A, NativeArray, isArray } from '@ember/array';
-import MutableArray from '@ember/array/mutable';
-import ArrayProxy from '@ember/array/proxy';
-import Application, { onLoad, runLoadHooks } from '@ember/application';
-import ApplicationInstance from '@ember/application/instance';
-import Namespace from '@ember/application/namespace';
-import Engine from '@ember/engine';
-import EngineInstance from '@ember/engine/instance';
-import Enumerable from '@ember/enumerable';
-import MutableEnumerable from '@ember/enumerable/mutable';
-import CoreObject from '@ember/object/core';
-import Evented from '@ember/object/evented';
-import Mixin, { mixin } from '@ember/object/mixin';
-import Observable from '@ember/object/observable';
-import ObjectProxy from '@ember/object/proxy';
-import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
-import { assign } from '@ember/polyfills';
-import AutoLocation from '@ember/routing/auto-location';
-import HashLocation from '@ember/routing/hash-location';
-import HistoryLocation from '@ember/routing/history-location';
-import NoneLocation from '@ember/routing/none-location';
-import EmberLocation from '@ember/routing/location';
-import Route from '@ember/routing/route';
-import Router from '@ember/routing/router';
-import {
-  controllerFor,
-  generateController,
-  generateControllerFactory,
-  DSL as RouterDSL,
-} from '@ember/routing/-internals';
-import { isNone, isBlank, isEmpty, isPresent, isEqual, typeOf, compare } from '@ember/utils';
-
-import {
-  templateOnlyComponent,
-  invokeHelper,
-  hash,
-  array,
-  concat,
-  get,
-  on,
-  fn,
-} from '@glimmer/runtime';
-
-import {
-  helperCapabilities,
-  setModifierManager,
-  setComponentTemplate,
-  getComponentTemplate,
-  setHelperManager,
-} from '@glimmer/manager';
-
-import {
-  assertDestroyablesDestroyed,
-  associateDestroyableChild,
-  destroy,
-  enableDestroyableTracking,
-  isDestroying,
-  isDestroyed,
-  registerDestructor,
-  unregisterDestructor,
-} from '@ember/destroyable';
-
-// ****@ember/-internals/environment****
-
-const Ember = {};
-
-Ember.isNamespace = true;
-Ember.toString = function () {
-  return 'Ember';
-};
-
-Object.defineProperty(Ember, 'ENV', {
-  get: getENV,
-  enumerable: false,
-});
-
-Object.defineProperty(Ember, 'lookup', {
-  get: getLookup,
-  set: setLookup,
-  enumerable: false,
-});
-
-// ****@ember/application****
-Ember.getOwner = getOwner;
-Ember.setOwner = setOwner;
-Ember.Application = Application;
-Ember.ApplicationInstance = ApplicationInstance;
-
-// ****@ember/engine****
-Ember.Engine = Engine;
-Ember.EngineInstance = EngineInstance;
-
-// ****@ember/polyfills****
-Ember.assign = assign;
-
-// ****@ember/-internals/utils****
-Ember.generateGuid = utils.generateGuid;
-Ember.GUID_KEY = utils.GUID_KEY;
-Ember.guidFor = utils.guidFor;
-Ember.inspect = utils.inspect;
-Ember.makeArray = utils.makeArray;
-Ember.canInvoke = utils.canInvoke;
-Ember.wrap = utils.wrap;
-Ember.uuid = utils.uuid;
-
-// ****@ember/-internals/container****
-Ember.Container = Container;
-Ember.Registry = Registry;
-
-// ****@ember/debug****
-Ember.assert = EmberDebug.assert;
-Ember.warn = EmberDebug.warn;
-Ember.debug = EmberDebug.debug;
-Ember.deprecate = EmberDebug.deprecate;
-Ember.deprecateFunc = EmberDebug.deprecateFunc;
-Ember.runInDebug = EmberDebug.runInDebug;
-
-// ****@ember/error****
-Ember.Error = EmberError;
-
-/**
-  @public
-  @class Ember.Debug
-*/
-Ember.Debug = {
-  registerDeprecationHandler: EmberDebug.registerDeprecationHandler,
-  registerWarnHandler: EmberDebug.registerWarnHandler,
-  isComputed: metal.isComputed,
-};
-
-// ****@ember/instrumentation****
-Ember.instrument = instrumentation.instrument;
-Ember.subscribe = instrumentation.subscribe;
-Ember.Instrumentation = {
-  instrument: instrumentation.instrument,
-  subscribe: instrumentation.subscribe,
-  unsubscribe: instrumentation.unsubscribe,
-  reset: instrumentation.reset,
-};
-
-// ****@ember/runloop****
-
-Ember.run = run;
-
-// ****@ember/-internals/metal****
-
-// in globals builds
-Ember.computed = computed;
-Ember._descriptor = metal.nativeDescDecorator;
-Ember._tracked = metal.tracked;
-Ember.cacheFor = metal.getCachedValueFor;
-Ember.ComputedProperty = metal.ComputedProperty;
-Ember._setClassicDecorator = metal.setClassicDecorator;
-Ember.meta = meta;
-Ember.get = metal.get;
-Ember._getPath = metal._getPath;
-Ember.set = metal.set;
-Ember.trySet = metal.trySet;
-Ember.FEATURES = Object.assign({ isEnabled }, FEATURES);
-Ember._Cache = utils.Cache;
-Ember.on = metal.on;
-Ember.addListener = metal.addListener;
-Ember.removeListener = metal.removeListener;
-Ember.sendEvent = metal.sendEvent;
-Ember.hasListeners = metal.hasListeners;
-Ember.isNone = isNone;
-Ember.isEmpty = isEmpty;
-Ember.isBlank = isBlank;
-Ember.isPresent = isPresent;
-Ember.notifyPropertyChange = metal.notifyPropertyChange;
-Ember.beginPropertyChanges = metal.beginPropertyChanges;
-Ember.endPropertyChanges = metal.endPropertyChanges;
-Ember.changeProperties = metal.changeProperties;
-Ember.platform = {
-  defineProperty: true,
-  hasPropertyAccessors: true,
-};
-Ember.defineProperty = metal.defineProperty;
-Ember.destroy = destroy;
-Ember.libraries = metal.libraries;
-Ember.getProperties = metal.getProperties;
-Ember.setProperties = metal.setProperties;
-Ember.expandProperties = metal.expandProperties;
-Ember.addObserver = metal.addObserver;
-Ember.removeObserver = metal.removeObserver;
-Ember.observer = observer;
-Ember.mixin = mixin;
-Ember.Mixin = Mixin;
-
-Ember._createCache = metal.createCache;
-Ember._cacheGetValue = metal.getValue;
-Ember._cacheIsConst = metal.isConst;
-
-Ember._registerDestructor = registerDestructor;
-Ember._unregisterDestructor = unregisterDestructor;
-Ember._associateDestroyableChild = associateDestroyableChild;
-Ember._assertDestroyablesDestroyed = assertDestroyablesDestroyed;
-Ember._enableDestroyableTracking = enableDestroyableTracking;
-Ember._isDestroying = isDestroying;
-Ember._isDestroyed = isDestroyed;
-
-/**
-  A function may be assigned to `Ember.onerror` to be called when Ember
-  internals encounter an error. This is useful for specialized error handling
-  and reporting code.
-
-  ```javascript
-
-  Ember.onerror = function(error) {
-    const payload = {
-      stack: error.stack,
-      otherInformation: 'whatever app state you want to provide'
-    };
-
-    fetch('/report-error', {
-      method: 'POST',
-      body: JSON.stringify(payload)
-    });
-  };
-  ```
-
-  Internally, `Ember.onerror` is used as Backburner's error handler.
-
-  @event onerror
-  @for Ember
-  @param {Exception} error the error object
-  @public
-*/
-Object.defineProperty(Ember, 'onerror', {
-  get: getOnerror,
-  set: setOnerror,
-  enumerable: false,
-});
-
-Object.defineProperty(Ember, 'testing', {
-  get: EmberDebug.isTesting,
-  set: EmberDebug.setTesting,
-  enumerable: false,
-});
-
-Ember._Backburner = Backburner;
-
-// ****@ember/-internals/runtime****
-Ember.A = A;
-Ember.String = {
-  loc,
-  w,
-  dasherize,
-  decamelize,
-  camelize,
-  classify,
-  underscore,
-  capitalize,
-};
-Ember.Object = EmberObject;
-Ember._RegistryProxyMixin = RegistryProxyMixin;
-Ember._ContainerProxyMixin = ContainerProxyMixin;
-Ember.compare = compare;
-Ember.isEqual = isEqual;
-
-/**
-@module ember
-*/
-
-/**
-  Namespace for injection helper methods.
-
-  @class inject
-  @namespace Ember
-  @static
-  @public
-*/
-Ember.inject = function inject() {
-  assert(
-    `Injected properties must be created through helpers, see '${Object.keys(inject)
-      .map((k) => `'inject.${k}'`)
-      .join(' or ')}'`
-  );
-};
-Ember.inject.service = service;
-Ember.inject.controller = injectController;
-
-Ember.Array = EmberArray;
-Ember.Comparable = Comparable;
-Ember.Enumerable = Enumerable;
-Ember.ArrayProxy = ArrayProxy;
-Ember.ObjectProxy = ObjectProxy;
-Ember.ActionHandler = ActionHandler;
-Ember.CoreObject = CoreObject;
-Ember.NativeArray = NativeArray;
-Ember.MutableEnumerable = MutableEnumerable;
-Ember.MutableArray = MutableArray;
-Ember.Evented = Evented;
-Ember.PromiseProxyMixin = PromiseProxyMixin;
-Ember.Observable = Observable;
-Ember.typeOf = typeOf;
-Ember.isArray = isArray;
-Ember.Object = EmberObject;
-Ember.onLoad = onLoad;
-Ember.runLoadHooks = runLoadHooks;
-Ember.Controller = Controller;
-Ember.ControllerMixin = ControllerMixin;
-Ember.Service = Service;
-Ember._ProxyMixin = _ProxyMixin;
-Ember.RSVP = RSVP;
-Ember.Namespace = Namespace;
-
-Ember._action = action;
-Ember._dependentKeyCompat = dependentKeyCompat;
-
-/**
-  Defines the hash of localized strings for the current language. Used by
-  the `String.loc` helper. To localize, add string values to this
-  hash.
-
-  @property STRINGS
-  @for Ember
-  @type Object
-  @private
-*/
-Object.defineProperty(Ember, 'STRINGS', {
-  configurable: false,
-  get: _getStrings,
-  set: _setStrings,
-});
-
-/**
-  Whether searching on the global for new Namespace instances is enabled.
-
-  This is only exported here as to not break any addons.  Given the new
-  visit API, you will have issues if you treat this as a indicator of
-  booted.
-
-  Internally this is only exposing a flag in Namespace.
-
-  @property BOOTED
-  @for Ember
-  @type Boolean
-  @private
-*/
-Object.defineProperty(Ember, 'BOOTED', {
-  configurable: false,
-  enumerable: false,
-  get: metal.isNamespaceSearchDisabled,
-  set: metal.setNamespaceSearchDisabled,
-});
-
-// ****@ember/-internals/glimmer****
-Ember.Component = Component;
-Helper.helper = helper;
-Ember.Helper = Helper;
-Ember._setComponentManager = setComponentManager;
-Ember._componentManagerCapabilities = componentCapabilities;
-Ember._setModifierManager = setModifierManager;
-Ember._modifierManagerCapabilities = modifierCapabilities;
-
-Ember._getComponentTemplate = getComponentTemplate;
-Ember._setComponentTemplate = setComponentTemplate;
-Ember._templateOnlyComponent = templateOnlyComponent;
-
-Ember._Input = Input;
-Ember._hash = hash;
-Ember._array = array;
-Ember._concat = concat;
-Ember._get = get;
-Ember._on = on;
-Ember._fn = fn;
-
-Ember._helperManagerCapabilities = helperCapabilities;
-Ember._setHelperManager = setHelperManager;
-Ember._invokeHelper = invokeHelper;
-Ember._captureRenderTree = captureRenderTree;
-
-const deprecateImportFromString = function (
-  name,
-  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
-) {
-  // Disabling this deprecation due to unintended errors in 3.25
-  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
-  deprecate(message, true, {
-    id: 'ember-string.htmlsafe-ishtmlsafe',
-    for: 'ember-source',
-    since: {
-      available: '3.25',
-      enabled: '3.25',
-    },
-    until: '4.0.0',
-    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
-  });
-};
-Object.defineProperty(Ember.String, 'htmlSafe', {
-  enumerable: true,
-  configurable: true,
-  get() {
-    deprecateImportFromString('htmlSafe');
-    return htmlSafe;
-  },
-});
-Object.defineProperty(Ember.String, 'isHTMLSafe', {
-  enumerable: true,
-  configurable: true,
-  get() {
-    deprecateImportFromString('isHTMLSafe');
-    return isHTMLSafe;
-  },
-});
-
-/**
-  Global hash of shared templates. This will automatically be populated
-  by the build tools so that you can store your Handlebars templates in
-  separate files that get loaded into JavaScript at buildtime.
-
-  @property TEMPLATES
-  @for Ember
-  @type Object
-  @private
-*/
-Object.defineProperty(Ember, 'TEMPLATES', {
-  get: getTemplates,
-  set: setTemplates,
-  configurable: false,
-  enumerable: false,
-});
-
-/**
-  The semantic version
-
-  @property VERSION
-  @type String
-  @public
-*/
-Ember.VERSION = VERSION;
-
-Ember.ViewUtils = {
-  isSimpleClick: views.isSimpleClick,
-  getElementView: views.getElementView,
-  getViewElement: views.getViewElement,
-  getViewBounds: views.getViewBounds,
-  getViewClientRects: views.getViewClientRects,
-  getViewBoundingClientRect: views.getViewBoundingClientRect,
-  getRootViews: views.getRootViews,
-  getChildViews: views.getChildViews,
-  isSerializationFirstNode: isSerializationFirstNode,
-};
-Ember.ComponentLookup = views.ComponentLookup;
-Ember.EventDispatcher = views.EventDispatcher;
-
-Ember.Location = EmberLocation;
-Ember.AutoLocation = AutoLocation;
-Ember.HashLocation = HashLocation;
-Ember.HistoryLocation = HistoryLocation;
-Ember.NoneLocation = NoneLocation;
-Ember.controllerFor = controllerFor;
-Ember.generateControllerFactory = generateControllerFactory;
-Ember.generateController = generateController;
-Ember.RouterDSL = RouterDSL;
-Ember.Router = Router;
-Ember.Route = Route;
-
-runLoadHooks('Ember.Application', Application);
-
-Ember.DataAdapter = DataAdapter;
-Ember.ContainerDebugAdapter = ContainerDebugAdapter;
-
-let EmberHandlebars = {
-  template,
-  Utils: {
-    escapeExpression,
-  },
-};
-
-let EmberHTMLBars = {
-  template,
-};
-
-function defineEmberTemplateCompilerLazyLoad(key) {
-  Object.defineProperty(Ember, key, {
-    configurable: true,
-    enumerable: true,
-    get() {
-      if (has('ember-template-compiler')) {
-        let templateCompiler = require('ember-template-compiler');
-
-        EmberHTMLBars.precompile = EmberHandlebars.precompile = templateCompiler.precompile;
-        EmberHTMLBars.compile = EmberHandlebars.compile = templateCompiler.compile;
-
-        Object.defineProperty(Ember, 'HTMLBars', {
-          configurable: true,
-          writable: true,
-          enumerable: true,
-          value: EmberHTMLBars,
-        });
-        Object.defineProperty(Ember, 'Handlebars', {
-          configurable: true,
-          writable: true,
-          enumerable: true,
-          value: EmberHandlebars,
-        });
-      }
-
-      return key === 'Handlebars' ? EmberHandlebars : EmberHTMLBars;
-    },
-  });
-}
-
-defineEmberTemplateCompilerLazyLoad('HTMLBars');
-defineEmberTemplateCompilerLazyLoad('Handlebars');
-
-// do this to ensure that Ember.Test is defined properly on the global
-// if it is present.
-function defineEmberTestingLazyLoad(key) {
-  Object.defineProperty(Ember, key, {
-    configurable: true,
-    enumerable: true,
-    get() {
-      if (has('ember-testing')) {
-        let testing = require('ember-testing');
-
-        let { Test, Adapter, QUnitAdapter, setupForTesting } = testing;
-        Test.Adapter = Adapter;
-        Test.QUnitAdapter = QUnitAdapter;
-
-        Object.defineProperty(Ember, 'Test', {
-          configurable: true,
-          writable: true,
-          enumerable: true,
-          value: Test,
-        });
-        Object.defineProperty(Ember, 'setupForTesting', {
-          configurable: true,
-          writable: true,
-          enumerable: true,
-          value: setupForTesting,
-        });
-
-        return key === 'Test' ? Test : setupForTesting;
-      }
-
-      return undefined;
-    },
-  });
-}
-
-defineEmberTestingLazyLoad('Test');
-defineEmberTestingLazyLoad('setupForTesting');
-
-runLoadHooks('Ember');
-
-Ember.__loader = {
-  require,
-  // eslint-disable-next-line no-undef
-  define,
-  // eslint-disable-next-line no-undef
-  registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries,
-};
-
-export default Ember;
diff --git a/packages/ember/index.ts b/packages/ember/index.ts
new file mode 100644
index 00000000000..8490d1ed748
--- /dev/null
+++ b/packages/ember/index.ts
@@ -0,0 +1,710 @@
+/**
+@module ember
+*/
+
+import require, { has } from 'require';
+
+import { getENV, getLookup, setLookup } from '@ember/-internals/environment';
+import * as utils from '@ember/-internals/utils';
+import { Registry, Container } from '@ember/-internals/container';
+import * as instrumentation from '@ember/instrumentation';
+import { meta } from '@ember/-internals/meta';
+import * as metal from '@ember/-internals/metal';
+import { FEATURES, isEnabled } from '@ember/canary-features';
+import * as EmberDebug from '@ember/debug';
+import { assert, captureRenderTree } from '@ember/debug';
+import Backburner from 'backburner';
+import Controller, { inject as injectController, ControllerMixin } from '@ember/controller';
+import {
+  _getStrings,
+  _setStrings,
+  dasherize,
+  camelize,
+  capitalize,
+  classify,
+  decamelize,
+  underscore,
+  w,
+} from '@ember/string';
+import Service, { service } from '@ember/service';
+
+import EmberObject, {
+  action,
+  computed,
+  defineProperty,
+  notifyPropertyChange,
+  observer,
+  get,
+  getProperties,
+  set,
+  setProperties,
+  trySet,
+} from '@ember/object';
+import { cacheFor } from '@ember/object/-internals';
+import { dependentKeyCompat } from '@ember/object/compat';
+import ComputedProperty, { expandProperties } from '@ember/object/computed';
+import { addListener, removeListener, sendEvent } from '@ember/object/events';
+
+import {
+  RegistryProxyMixin,
+  ContainerProxyMixin,
+  _ProxyMixin,
+  RSVP,
+  Comparable,
+  ActionHandler,
+} from '@ember/-internals/runtime';
+import {
+  componentCapabilities,
+  modifierCapabilities,
+  setComponentManager,
+  escapeExpression,
+  getTemplates,
+  setTemplates,
+  template,
+  isSerializationFirstNode,
+} from '@ember/-internals/glimmer';
+import VERSION from './version';
+import * as views from '@ember/-internals/views';
+import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
+import DataAdapter from '@ember/debug/data-adapter';
+import EmberError from '@ember/error';
+import { run } from '@ember/runloop';
+import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
+import EmberArray, { A, NativeArray, isArray } from '@ember/array';
+import MutableArray from '@ember/array/mutable';
+import ArrayProxy from '@ember/array/proxy';
+import Application, { getOwner, setOwner, onLoad, runLoadHooks } from '@ember/application';
+import ApplicationInstance from '@ember/application/instance';
+import Namespace from '@ember/application/namespace';
+import Component, { Input } from '@ember/component';
+import Helper from '@ember/component/helper';
+import Engine from '@ember/engine';
+import EngineInstance from '@ember/engine/instance';
+import Enumerable from '@ember/enumerable';
+import MutableEnumerable from '@ember/enumerable/mutable';
+import CoreObject from '@ember/object/core';
+import Evented, { on } from '@ember/object/evented';
+import Mixin, { mixin } from '@ember/object/mixin';
+import Observable from '@ember/object/observable';
+import { addObserver, removeObserver } from '@ember/object/observers';
+import ObjectProxy from '@ember/object/proxy';
+import PromiseProxyMixin from '@ember/object/promise-proxy-mixin';
+import { assign } from '@ember/polyfills';
+import AutoLocation from '@ember/routing/auto-location';
+import HashLocation from '@ember/routing/hash-location';
+import HistoryLocation from '@ember/routing/history-location';
+import NoneLocation from '@ember/routing/none-location';
+import EmberLocation from '@ember/routing/location';
+import Route from '@ember/routing/route';
+import Router from '@ember/routing/router';
+import {
+  controllerFor,
+  generateController,
+  generateControllerFactory,
+  DSL as RouterDSL,
+} from '@ember/routing/-internals';
+import { isNone, isBlank, isEmpty, isPresent, isEqual, typeOf, compare } from '@ember/utils';
+
+import * as glimmerRuntime from '@glimmer/runtime';
+
+import {
+  helperCapabilities,
+  setModifierManager,
+  setComponentTemplate,
+  getComponentTemplate,
+  setHelperManager,
+} from '@glimmer/manager';
+
+import {
+  assertDestroyablesDestroyed,
+  associateDestroyableChild,
+  destroy,
+  enableDestroyableTracking,
+  isDestroying,
+  isDestroyed,
+  registerDestructor,
+  unregisterDestructor,
+} from '@ember/destroyable';
+
+import type * as EmberTemplateCompiler from 'ember-template-compiler';
+import type { precompile, compile } from 'ember-template-compiler';
+import type * as EmberTesting from 'ember-testing';
+
+/**
+  Namespace for injection helper methods.
+
+  @class inject
+  @namespace Ember
+  @static
+  @public
+*/
+function inject() {
+  assert(
+    `Injected properties must be created through helpers, see '${Object.keys(inject)
+      .map((k) => `'inject.${k}'`)
+      .join(' or ')}'`
+  );
+}
+// ****@ember/controller****
+inject.controller = injectController;
+// ****@ember/service****
+inject.service = service;
+
+const PartialEmber = {
+  isNamespace: true,
+
+  toString() {
+    return 'Ember';
+  },
+
+  // ****@ember/-internals/container****
+  Container,
+  Registry,
+
+  // ****@ember/-internals/glimmer****
+  // Partially re-exported from @glimmer/manager
+  _setComponentManager: setComponentManager,
+  _componentManagerCapabilities: componentCapabilities,
+  _modifierManagerCapabilities: modifierCapabilities,
+
+  // ****@ember/-internals/meta****
+  meta,
+
+  // ****@ember/-internals/metal****
+  _createCache: metal.createCache, // Also @glimmer/validator
+  _cacheGetValue: metal.getValue, // Also @glimmer/validator
+  _cacheIsConst: metal.isConst, // Also @glimmer/validator
+  _descriptor: metal.nativeDescDecorator,
+  _getPath: metal._getPath,
+  _setClassicDecorator: metal.setClassicDecorator,
+  _tracked: metal.tracked, // Also exported from @glimmer/tracking
+  beginPropertyChanges: metal.beginPropertyChanges,
+  changeProperties: metal.changeProperties,
+  endPropertyChanges: metal.endPropertyChanges,
+  hasListeners: metal.hasListeners,
+  libraries: metal.libraries,
+
+  // ****@ember/-internals/runtime****
+  _ContainerProxyMixin: ContainerProxyMixin,
+  _ProxyMixin,
+  _RegistryProxyMixin: RegistryProxyMixin,
+  ActionHandler,
+  Comparable,
+  RSVP, // Also from 'rsvp' directly.
+
+  // ****@ember/-internals/view****
+  ComponentLookup: views.ComponentLookup,
+  EventDispatcher: views.EventDispatcher,
+
+  // ****@ember/-internals/utils****
+  _Cache: utils.Cache,
+  GUID_KEY: utils.GUID_KEY,
+  canInvoke: utils.canInvoke,
+  inspect: utils.inspect,
+  generateGuid: utils.generateGuid,
+  guidFor: utils.guidFor,
+  makeArray: utils.makeArray,
+  uuid: utils.uuid,
+  wrap: utils.wrap,
+
+  // ****@ember/application****
+  getOwner,
+  onLoad,
+  runLoadHooks,
+  setOwner,
+  Application,
+
+  // ****@ember/application/instance****
+  ApplicationInstance,
+
+  // ****@ember/application/namespace****
+  Namespace,
+
+  // ****@ember/array****
+  A,
+  Array: EmberArray,
+  NativeArray,
+  isArray,
+
+  // ****@ember/array/mutable****
+  MutableArray,
+
+  // ****@ember/array/proxy****
+  ArrayProxy,
+
+  // ****@ember/canary-features****
+  Features: { isEnabled, ...FEATURES },
+
+  // ****@ember/component****
+  _Input: Input,
+  Component,
+
+  // ****@ember/component/helper****
+  Helper,
+
+  // ****@ember/controller****
+  Controller,
+  ControllerMixin,
+
+  // ****@ember/debug****
+  _captureRenderTree: captureRenderTree,
+  assert: EmberDebug.assert,
+  warn: EmberDebug.warn,
+  debug: EmberDebug.debug,
+  deprecate: EmberDebug.deprecate,
+  deprecateFunc: EmberDebug.deprecateFunc,
+  runInDebug: EmberDebug.runInDebug,
+
+  Debug: {
+    registerDeprecationHandler: EmberDebug.registerDeprecationHandler,
+    registerWarnHandler: EmberDebug.registerWarnHandler,
+    // ****@ember/-internals/metal****
+    isComputed: metal.isComputed,
+  },
+
+  // ****@ember/debug/container-debug-adapter****
+  ContainerDebugAdapter,
+
+  // ****@ember/debug/data-adapter****
+  DataAdapter,
+
+  // ****@ember/destroyable****
+  _assertDestroyablesDestroyed: assertDestroyablesDestroyed,
+  _associateDestroyableChild: associateDestroyableChild,
+  _enableDestroyableTracking: enableDestroyableTracking,
+  _isDestroying: isDestroying,
+  _isDestroyed: isDestroyed,
+  _registerDestructor: registerDestructor,
+  _unregisterDestructor: unregisterDestructor,
+  destroy,
+
+  // ****@ember/engine****
+  Engine,
+
+  // ****@ember/engine/instance****
+  EngineInstance,
+
+  // ****@ember/enumerable****
+  Enumerable,
+
+  // ****@ember/enumerable/mutable****
+  MutableEnumerable,
+
+  // ****@ember/error****
+  Error: EmberError,
+
+  // ****@ember/instrumentation****
+  instrument: instrumentation.instrument,
+  subscribe: instrumentation.subscribe,
+
+  Instrumentation: {
+    instrument: instrumentation.instrument,
+    subscribe: instrumentation.subscribe,
+    unsubscribe: instrumentation.unsubscribe,
+    reset: instrumentation.reset,
+  },
+
+  // ****@ember/object****
+  Object: EmberObject,
+  _action: action,
+  computed,
+  defineProperty,
+  get,
+  getProperties,
+  notifyPropertyChange,
+  observer,
+  set,
+  trySet,
+  setProperties,
+
+  // ****@ember/object/-internals****
+  cacheFor,
+
+  // ****@ember/object/compat****
+  _dependentKeyCompat: dependentKeyCompat,
+
+  // ****@ember/object/computed****
+  ComputedProperty,
+  expandProperties,
+
+  // ****@ember/object/core****
+  CoreObject,
+
+  // ****@ember/object/evented****
+  Evented,
+  on,
+
+  // ****@ember/object/events****
+  addListener,
+  removeListener,
+  sendEvent,
+
+  // ****@ember/object/mixin****
+  Mixin,
+  mixin,
+
+  // ****@ember/object/observable****
+  Observable,
+
+  // ****@ember/object/observers****
+  addObserver,
+  removeObserver,
+
+  // ****@ember/object/promise-proxy-mixin****
+  PromiseProxyMixin,
+
+  // ****@ember/object/proxy****
+  ObjectProxy,
+
+  // ****@ember/polyfills****
+  assign,
+
+  // ****@ember/routing/-internals****
+  RouterDSL,
+  controllerFor,
+  generateController,
+  generateControllerFactory,
+
+  // ****@ember/routing/auto-location****
+  AutoLocation,
+
+  // ****@ember/routing/hash-location****
+  HashLocation,
+
+  // ****@ember/routing/history-location****
+  HistoryLocation,
+
+  // ****@ember/routing/location****
+  Location: EmberLocation,
+
+  // ****@ember/routing/none-location****
+  NoneLocation,
+
+  // ****@ember/routing/route****
+  Route,
+
+  // ****@ember/routing/router****
+  Router,
+
+  // ****@ember/runloop****
+  run,
+
+  // ****@ember/service****
+  Service,
+
+  // ****@ember/string****
+  String: {
+    camelize,
+    capitalize,
+    classify,
+    decamelize,
+    dasherize,
+    underscore,
+    w,
+  },
+
+  // ****@ember/utils****
+  compare,
+  isBlank,
+  isEmpty,
+  isEqual,
+  isNone,
+  isPresent,
+  typeOf,
+
+  // ****@ember/version****
+  /**
+    The semantic version
+
+    @property VERSION
+    @type String
+    @public
+  */
+  VERSION,
+
+  ViewUtils: {
+    // ****@ember/-internals/views****
+    getChildViews: views.getChildViews,
+    getElementView: views.getElementView,
+    getRootViews: views.getRootViews,
+    getViewBounds: views.getViewBounds,
+    getViewBoundingClientRect: views.getViewBoundingClientRect,
+    getViewClientRects: views.getViewClientRects,
+    getViewElement: views.getViewElement,
+    isSimpleClick: views.isSimpleClick,
+
+    // ****@ember/-internals/glimmer****
+    isSerializationFirstNode,
+  },
+
+  // ****@glimmer/manager****
+  _getComponentTemplate: getComponentTemplate,
+  _helperManagerCapabilities: helperCapabilities,
+  _setComponentTemplate: setComponentTemplate,
+  _setHelperManager: setHelperManager,
+  _setModifierManager: setModifierManager,
+
+  // ****@glimmer/runtime****
+  _templateOnlyComponent: glimmerRuntime.templateOnlyComponent,
+  _invokeHelper: glimmerRuntime.invokeHelper,
+  _hash: glimmerRuntime.hash,
+  _array: glimmerRuntime.array,
+  _concat: glimmerRuntime.concat,
+  _get: glimmerRuntime.get,
+  _on: glimmerRuntime.on,
+  _fn: glimmerRuntime.fn,
+
+  // Backburner
+  _Backburner: Backburner,
+
+  // ****@ember/controller, @ember/service****
+  inject,
+
+  // Non-imported
+  platform: {
+    defineProperty: true,
+    hasPropertyAccessors: true,
+  },
+
+  __loader: {
+    require,
+    define,
+    // @ts-expect-error These properties don't appear as being defined
+    registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries,
+  },
+
+  get ENV() {
+    return getENV();
+  },
+
+  /**
+    A function may be assigned to `Ember.onerror` to be called when Ember
+    internals encounter an error. This is useful for specialized error handling
+    and reporting code.
+
+    ```javascript
+
+    Ember.onerror = function(error) {
+      const payload = {
+        stack: error.stack,
+        otherInformation: 'whatever app state you want to provide'
+      };
+
+      fetch('/report-error', {
+        method: 'POST',
+        body: JSON.stringify(payload)
+      });
+    };
+    ```
+
+    Internally, `Ember.onerror` is used as Backburner's error handler.
+
+    @event onerror
+    @for Ember
+    @param {Exception} error the error object
+    @public
+  */
+  // ****@ember/-internals/error-handling****
+  get onerror(): Function | undefined {
+    return getOnerror();
+  },
+
+  set onerror(handler: Function | undefined) {
+    setOnerror(handler);
+  },
+
+  // ****@ember/debug****
+  get testing(): boolean {
+    return EmberDebug.isTesting();
+  },
+
+  set testing(value: boolean) {
+    EmberDebug.setTesting(value);
+  },
+
+  // ****@ember/-internals/environment****
+  get lookup() {
+    return getLookup();
+  },
+
+  set lookup(value) {
+    setLookup(value);
+  },
+
+  /**
+    Defines the hash of localized strings for the current language. Used by
+    the `String.loc` helper. To localize, add string values to this
+    hash.
+
+    @property STRINGS
+    @for Ember
+    @type Object
+    @private
+  */
+  // ****@ember/string****
+  get STRINGS() {
+    return _getStrings();
+  },
+
+  set STRINGS(value) {
+    _setStrings(value);
+  },
+
+  /**
+    Whether searching on the global for new Namespace instances is enabled.
+
+    This is only exported here as to not break any addons.  Given the new
+    visit API, you will have issues if you treat this as a indicator of
+    booted.
+
+    Internally this is only exposing a flag in Namespace.
+
+    @property BOOTED
+    @for Ember
+    @type Boolean
+    @private
+  */
+  get BOOTED() {
+    return metal.isNamespaceSearchDisabled();
+  },
+
+  set BOOTED(value) {
+    metal.setNamespaceSearchDisabled(value);
+  },
+
+  /**
+    Global hash of shared templates. This will automatically be populated
+    by the build tools so that you can store your Handlebars templates in
+    separate files that get loaded into JavaScript at buildtime.
+
+    @property TEMPLATES
+    @for Ember
+    @type Object
+    @private
+  */
+  get TEMPLATES() {
+    return getTemplates();
+  },
+
+  set TEMPLATES(value) {
+    setTemplates(value);
+  },
+} as const;
+
+interface EmberHandlebars {
+  template: typeof template;
+  Utils: {
+    escapeExpression: typeof escapeExpression;
+  };
+  compile?: typeof compile;
+  precompile?: typeof precompile;
+}
+
+interface EmberHTMLBars {
+  template: typeof template;
+  compile?: typeof compile;
+  precompile?: typeof precompile;
+}
+
+type PartialEmber = typeof PartialEmber;
+interface Ember extends PartialEmber {
+  HTMLBars: EmberHTMLBars;
+  Handlebars: EmberHandlebars;
+  Test?: typeof EmberTesting['Test'] & {
+    Adapter: typeof EmberTesting['Adapter'];
+    QUnitAdapter: typeof EmberTesting['QUnitAdapter'];
+  };
+  setupForTesting?: typeof EmberTesting['setupForTesting'];
+}
+const Ember = PartialEmber as Ember;
+
+runLoadHooks('Ember.Application', Application);
+
+let EmberHandlebars: EmberHandlebars = {
+  template,
+  Utils: {
+    escapeExpression,
+  },
+};
+
+let EmberHTMLBars: EmberHTMLBars = {
+  template,
+};
+
+function defineEmberTemplateCompilerLazyLoad(key: 'HTMLBars' | 'Handlebars') {
+  Object.defineProperty(Ember, key, {
+    configurable: true,
+    enumerable: true,
+    get() {
+      if (has('ember-template-compiler')) {
+        let templateCompiler = require('ember-template-compiler') as typeof EmberTemplateCompiler;
+
+        EmberHTMLBars.precompile = EmberHandlebars.precompile = templateCompiler.precompile;
+        EmberHTMLBars.compile = EmberHandlebars.compile = templateCompiler.compile;
+
+        Object.defineProperty(Ember, 'HTMLBars', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: EmberHTMLBars,
+        });
+        Object.defineProperty(Ember, 'Handlebars', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: EmberHandlebars,
+        });
+      }
+
+      return key === 'Handlebars' ? EmberHandlebars : EmberHTMLBars;
+    },
+  });
+}
+
+defineEmberTemplateCompilerLazyLoad('HTMLBars');
+defineEmberTemplateCompilerLazyLoad('Handlebars');
+
+// do this to ensure that Ember.Test is defined properly on the global
+// if it is present.
+function defineEmberTestingLazyLoad(key: 'Test' | 'setupForTesting') {
+  Object.defineProperty(Ember, key, {
+    configurable: true,
+    enumerable: true,
+    get() {
+      if (has('ember-testing')) {
+        let testing = require('ember-testing') as typeof EmberTesting;
+
+        let { Test, Adapter, QUnitAdapter, setupForTesting } = testing;
+        // @ts-expect-error We should not do this
+        Test.Adapter = Adapter;
+        // @ts-expect-error We should not do this
+        Test.QUnitAdapter = QUnitAdapter;
+
+        Object.defineProperty(Ember, 'Test', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: Test,
+        });
+        Object.defineProperty(Ember, 'setupForTesting', {
+          configurable: true,
+          writable: true,
+          enumerable: true,
+          value: setupForTesting,
+        });
+
+        return key === 'Test' ? Test : setupForTesting;
+      }
+
+      return undefined;
+    },
+  });
+}
+
+defineEmberTestingLazyLoad('Test');
+defineEmberTestingLazyLoad('setupForTesting');
+
+// @ts-expect-error Per types, runLoadHooks requires a second parameter. Should we loosen types?
+runLoadHooks('Ember');
+
+export default Ember;
diff --git a/packages/ember/type-tests/ember.test.ts b/packages/ember/type-tests/ember.test.ts
new file mode 100644
index 00000000000..2eb5a03ea6d
--- /dev/null
+++ b/packages/ember/type-tests/ember.test.ts
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(Ember.onerror).toEqualTypeOf<Function | undefined>();
+
+expectTypeOf(Ember.HTMLBars).toMatchTypeOf<object>();
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index d3a10c10c90..8ae48049978 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -2,7 +2,8 @@ import type { EmberPrecompileOptions } from 'ember-template-compiler';
 import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
 import type { Renderer } from '@ember/-internals/glimmer';
-import { helper, Helper, Component, _resetRenderers } from '@ember/-internals/glimmer';
+import Component from '@ember/component';
+import { helper, Helper, _resetRenderers } from '@ember/-internals/glimmer';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
index a895e9732fd..c8eaff9372d 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
@@ -2,7 +2,8 @@ import type { EmberPrecompileOptions } from 'ember-template-compiler';
 import { compile } from 'ember-template-compiler';
 import { EventDispatcher } from '@ember/-internals/views';
 import type { Renderer } from '@ember/-internals/glimmer';
-import { Component, _resetRenderers } from '@ember/-internals/glimmer';
+import Component from '@ember/component';
+import { _resetRenderers } from '@ember/-internals/glimmer';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
 
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
index a068d92ac32..2489826d32c 100644
--- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
@@ -1,7 +1,7 @@
 import AbstractApplicationTestCase from './abstract-application';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
-import { Component } from '@ember/-internals/glimmer';
+import Component from '@ember/component';
 import type { Factory } from '@ember/-internals/owner';
 
 export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
diff --git a/packages/ember/index.d.ts b/packages/loader/lib/index.d.ts
similarity index 63%
rename from packages/ember/index.d.ts
rename to packages/loader/lib/index.d.ts
index 6544926d4c2..58443c7f54c 100644
--- a/packages/ember/index.d.ts
+++ b/packages/loader/lib/index.d.ts
@@ -1,9 +1,3 @@
-declare module 'ember' {
-  const Ember: any;
-
-  export default Ember;
-}
-
 declare module 'require' {
   export function has(path: string): boolean;
   export default function require(path: string): any;

From 9cf853d619cf8072e61388713dbe498c623690cf Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 28 Oct 2022 09:15:49 -0600
Subject: [PATCH 1193/1405] Revert to defineProperty for get/set on Ember
 namespace

While we might be able to make the change over to using native getters
and setters in a future PR, we want this change to be exactly and only
a type conversion, exactly preserving the previous behavior. Switching
back to using `Object.defineProperty()` for the getters and setters
defined on the `Ember` namespace preserves the previous behavior, which
our tests correctly caught for us!
---
 packages/@ember/-internals/glimmer/index.ts   |   1 +
 .../glimmer/lib/template_registry.ts          |   2 +-
 packages/ember/index.ts                       | 203 ++++++++++++------
 3 files changed, 137 insertions(+), 69 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/index.ts b/packages/@ember/-internals/glimmer/index.ts
index 01f7e07067b..2149bb8d49b 100644
--- a/packages/@ember/-internals/glimmer/index.ts
+++ b/packages/@ember/-internals/glimmer/index.ts
@@ -459,6 +459,7 @@ export {
   hasTemplate,
   getTemplates,
   setTemplates,
+  TemplatesRegistry,
 } from './lib/template_registry';
 export { setupEngineRegistry, setupApplicationRegistry } from './lib/setup-registry';
 export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/dom';
diff --git a/packages/@ember/-internals/glimmer/lib/template_registry.ts b/packages/@ember/-internals/glimmer/lib/template_registry.ts
index ba4ffd4f88c..2ccb77d1117 100644
--- a/packages/@ember/-internals/glimmer/lib/template_registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/template_registry.ts
@@ -3,7 +3,7 @@ import type { TemplateFactory } from '@glimmer/interfaces';
 // STATE within a module is frowned upon, this exists
 // to support Ember.TEMPLATES but shield ember internals from this legacy
 // global API.
-interface TemplatesRegistry {
+export interface TemplatesRegistry {
   [name: string]: TemplateFactory;
 }
 let TEMPLATES: TemplatesRegistry = {};
diff --git a/packages/ember/index.ts b/packages/ember/index.ts
index 8490d1ed748..7050912263a 100644
--- a/packages/ember/index.ts
+++ b/packages/ember/index.ts
@@ -12,7 +12,7 @@ import { meta } from '@ember/-internals/meta';
 import * as metal from '@ember/-internals/metal';
 import { FEATURES, isEnabled } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
-import { assert, captureRenderTree } from '@ember/debug';
+import { assert, captureRenderTree, deprecate } from '@ember/debug';
 import Backburner from 'backburner';
 import Controller, { inject as injectController, ControllerMixin } from '@ember/controller';
 import {
@@ -59,9 +59,12 @@ import {
   setComponentManager,
   escapeExpression,
   getTemplates,
+  htmlSafe,
+  isHTMLSafe,
   setTemplates,
   template,
   isSerializationFirstNode,
+  type TemplatesRegistry,
 } from '@ember/-internals/glimmer';
 import VERSION from './version';
 import * as views from '@ember/-internals/views';
@@ -233,7 +236,7 @@ const PartialEmber = {
   ArrayProxy,
 
   // ****@ember/canary-features****
-  Features: { isEnabled, ...FEATURES },
+  FEATURES: { isEnabled, ...FEATURES },
 
   // ****@ember/component****
   _Input: Input,
@@ -472,10 +475,30 @@ const PartialEmber = {
     // @ts-expect-error These properties don't appear as being defined
     registry: typeof requirejs !== 'undefined' ? requirejs.entries : require.entries,
   },
+} as const;
 
-  get ENV() {
-    return getENV();
-  },
+interface EmberHandlebars {
+  template: typeof template;
+  Utils: {
+    escapeExpression: typeof escapeExpression;
+  };
+  compile?: typeof compile;
+  precompile?: typeof precompile;
+}
+
+interface EmberHTMLBars {
+  template: typeof template;
+  compile?: typeof compile;
+  precompile?: typeof precompile;
+}
+
+type PartialEmber = typeof PartialEmber;
+interface Ember extends PartialEmber {
+  get ENV(): object;
+
+  // ****@ember/-internals/environment****
+  get lookup(): Record<string, unknown>;
+  set lookup(value: Record<string, unknown>);
 
   /**
     A function may be assigned to `Ember.onerror` to be called when Ember
@@ -505,31 +528,11 @@ const PartialEmber = {
     @public
   */
   // ****@ember/-internals/error-handling****
-  get onerror(): Function | undefined {
-    return getOnerror();
-  },
+  get onerror(): Function | undefined;
+  set onerror(handler: Function | undefined);
 
-  set onerror(handler: Function | undefined) {
-    setOnerror(handler);
-  },
-
-  // ****@ember/debug****
-  get testing(): boolean {
-    return EmberDebug.isTesting();
-  },
-
-  set testing(value: boolean) {
-    EmberDebug.setTesting(value);
-  },
-
-  // ****@ember/-internals/environment****
-  get lookup() {
-    return getLookup();
-  },
-
-  set lookup(value) {
-    setLookup(value);
-  },
+  get testing(): boolean;
+  set testing(value: boolean);
 
   /**
     Defines the hash of localized strings for the current language. Used by
@@ -542,13 +545,10 @@ const PartialEmber = {
     @private
   */
   // ****@ember/string****
-  get STRINGS() {
-    return _getStrings();
-  },
-
-  set STRINGS(value) {
-    _setStrings(value);
-  },
+  get STRINGS(): {
+    [key: string]: string;
+  };
+  set STRINGS(value: { [key: string]: string });
 
   /**
     Whether searching on the global for new Namespace instances is enabled.
@@ -564,13 +564,8 @@ const PartialEmber = {
     @type Boolean
     @private
   */
-  get BOOTED() {
-    return metal.isNamespaceSearchDisabled();
-  },
-
-  set BOOTED(value) {
-    metal.setNamespaceSearchDisabled(value);
-  },
+  get BOOTED(): boolean;
+  set BOOTED(flag: boolean);
 
   /**
     Global hash of shared templates. This will automatically be populated
@@ -582,32 +577,9 @@ const PartialEmber = {
     @type Object
     @private
   */
-  get TEMPLATES() {
-    return getTemplates();
-  },
+  get TEMPLATES(): TemplatesRegistry;
+  set TEMPLATES(registry: TemplatesRegistry);
 
-  set TEMPLATES(value) {
-    setTemplates(value);
-  },
-} as const;
-
-interface EmberHandlebars {
-  template: typeof template;
-  Utils: {
-    escapeExpression: typeof escapeExpression;
-  };
-  compile?: typeof compile;
-  precompile?: typeof precompile;
-}
-
-interface EmberHTMLBars {
-  template: typeof template;
-  compile?: typeof compile;
-  precompile?: typeof precompile;
-}
-
-type PartialEmber = typeof PartialEmber;
-interface Ember extends PartialEmber {
   HTMLBars: EmberHTMLBars;
   Handlebars: EmberHandlebars;
   Test?: typeof EmberTesting['Test'] & {
@@ -618,6 +590,101 @@ interface Ember extends PartialEmber {
 }
 const Ember = PartialEmber as Ember;
 
+Object.defineProperty(Ember, 'ENV', {
+  get: getENV,
+  enumerable: false,
+});
+
+Object.defineProperty(Ember, 'lookup', {
+  get: getLookup,
+  set: setLookup,
+  enumerable: false,
+});
+
+Object.defineProperty(Ember, 'onerror', {
+  get: getOnerror,
+  set: setOnerror,
+  enumerable: false,
+});
+
+Object.defineProperty(Ember, 'testing', {
+  get: EmberDebug.isTesting,
+  set: EmberDebug.setTesting,
+  enumerable: false,
+});
+
+Object.defineProperty(Ember, 'STRINGS', {
+  configurable: false,
+  get: _getStrings,
+  set: _setStrings,
+});
+
+Object.defineProperty(Ember, 'BOOTED', {
+  configurable: false,
+  enumerable: false,
+  get: metal.isNamespaceSearchDisabled,
+  set: metal.setNamespaceSearchDisabled,
+});
+
+Object.defineProperty(Ember, 'TEMPLATES', {
+  get: getTemplates,
+  set: setTemplates,
+  configurable: false,
+  enumerable: false,
+});
+
+const deprecateImportFromString = function (
+  name: string,
+  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
+) {
+  // Disabling this deprecation due to unintended errors in 3.25
+  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
+  deprecate(message, true, {
+    id: 'ember-string.htmlsafe-ishtmlsafe',
+    for: 'ember-source',
+    since: {
+      available: '3.25',
+      enabled: '3.25',
+    },
+    until: '4.0.0',
+    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
+  });
+};
+// NOTE: these are expressly *not* in the public API, because they were
+// deprecated and removed. TODO: remove them after we land the TS conversion,
+// and after confirming doing so is safe -- the state of the `@ember/string`
+// conversion remains confused.
+Object.defineProperty(Ember.String, 'htmlSafe', {
+  enumerable: true,
+  configurable: true,
+  get() {
+    deprecateImportFromString('htmlSafe');
+    return htmlSafe;
+  },
+});
+Object.defineProperty(Ember.String, 'isHTMLSafe', {
+  enumerable: true,
+  configurable: true,
+  get() {
+    deprecateImportFromString('isHTMLSafe');
+    return isHTMLSafe;
+  },
+});
+
+Object.defineProperty(Ember, 'TEMPLATES', {
+  get: getTemplates,
+  set: setTemplates,
+  configurable: false,
+  enumerable: false,
+});
+
+// ****@ember/debug****
+Object.defineProperty(Ember, 'testing', {
+  get: EmberDebug.isTesting,
+  set: EmberDebug.setTesting,
+  enumerable: false,
+});
+
 runLoadHooks('Ember.Application', Application);
 
 let EmberHandlebars: EmberHandlebars = {

From 609b4a6600c8d3ec36bb98cea7cad8f0b53fb136 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 20:48:28 +0000
Subject: [PATCH 1194/1405] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/night-ts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/night-ts.yml b/.github/workflows/night-ts.yml
index 0feb70f69c1..d7ed8fe7252 100644
--- a/.github/workflows/night-ts.yml
+++ b/.github/workflows/night-ts.yml
@@ -5,7 +5,7 @@ jobs:
     name: typescript@next
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: volta-cli/action@v4
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn add -D typescript@next

From 66b3ec3b583e38332b3a5a77f6e484f3badccbb1 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 28 Oct 2022 15:08:23 -0600
Subject: [PATCH 1195/1405] [BUGFIX beta] Update Node.js versions to match
 support policy

Ember CLI dropped support for Node 12 in 4.6.0.
---
 .github/workflows/alpha-releases.yml    |  6 ++---
 .github/workflows/ci.yml                | 30 ++++++++++++-------------
 package.json                            |  2 +-
 smoke-tests/ember-test-app/package.json |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/alpha-releases.yml b/.github/workflows/alpha-releases.yml
index d8c8a45c14a..ec8c33043db 100644
--- a/.github/workflows/alpha-releases.yml
+++ b/.github/workflows/alpha-releases.yml
@@ -2,7 +2,7 @@ name: Alpha Releases
 
 on:
   schedule:
-    - cron:  '0 20 * * 3' # weekly (Wednesday)
+    - cron: '0 20 * * 3' # weekly (Wednesday)
 
 jobs:
   test:
@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -34,7 +34,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
           registry-url: 'https://registry.npmjs.org'
       - name: install dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67c6864ebc0..a0515ad5341 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -57,7 +57,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -73,7 +73,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -126,7 +126,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -149,7 +149,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -169,7 +169,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -190,7 +190,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -211,7 +211,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -232,7 +232,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -251,7 +251,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -287,7 +287,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
       - name: install dependencies
@@ -320,7 +320,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
@@ -354,7 +354,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 12.x
+          node-version: 14.x
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
diff --git a/package.json b/package.json
index 6ddbaa75b8b..992232f6866 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
     "@glimmer/component": "^1.1.2"
   },
   "engines": {
-    "node": ">= 12.*"
+    "node": ">= 14.*"
   },
   "ember-addon": {
     "after": "ember-cli-legacy-blueprints"
diff --git a/smoke-tests/ember-test-app/package.json b/smoke-tests/ember-test-app/package.json
index 3fe46b8a49d..1aa0f9bad4c 100644
--- a/smoke-tests/ember-test-app/package.json
+++ b/smoke-tests/ember-test-app/package.json
@@ -63,7 +63,7 @@
     "webpack": "^5.65.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

From 29131271ba229f46a919c5d36b4889aff11449a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 22:01:26 +0000
Subject: [PATCH 1196/1405] Bump ember-cli from 4.2.0 to 4.8.0

Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 4.2.0 to 4.8.0.
- [Release notes](https://github.com/ember-cli/ember-cli/releases)
- [Changelog](https://github.com/ember-cli/ember-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/ember-cli/compare/v4.2.0...v4.8.0)

---
updated-dependencies:
- dependency-name: ember-cli
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 484 ++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 342 insertions(+), 144 deletions(-)

diff --git a/package.json b/package.json
index 1673d14ea12..9c50d594fa7 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "common-tags": "^1.8.2",
     "core-js": "^2.6.5",
     "dag-map": "^2.0.2",
-    "ember-cli": "^4.2.0",
+    "ember-cli": "^4.8.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index f620aff0e85..e5be25aa5a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -28,25 +28,30 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
   integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
 
-"@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.3.4":
-  version "7.17.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
-  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
+"@babel/compat-data@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.0.tgz#9b61938c5f688212c7b9ae363a819df7d29d4093"
+  integrity sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==
+
+"@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.18.13", "@babel/core@^7.3.4":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
+  integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.2"
-    "@babel/parser" "^7.17.3"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.19.6"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helpers" "^7.19.4"
+    "@babel/parser" "^7.19.6"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.6"
+    "@babel/types" "^7.19.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
 
 "@babel/generator@^7.17.3":
@@ -67,6 +72,15 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.19.6", "@babel/generator@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.0.tgz#0bfc5379e0efb05ca6092091261fcdf7ec36249d"
+  integrity sha512-GUPcXxWibClgmYJuIwC2Bc2Lg+8b9VjaJ+HlNdACEVt+Wlr1eoU1OPZjZRm7Hzl0gaTsUZNQfeihvZJhG7oc3w==
+  dependencies:
+    "@babel/types" "^7.20.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -99,6 +113,16 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.19.3":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
+  dependencies:
+    "@babel/compat-data" "^7.20.0"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1":
   version "7.17.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
@@ -197,6 +221,14 @@
     "@babel/template" "^7.18.6"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
+
 "@babel/helper-get-function-arity@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
@@ -239,6 +271,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-module-transforms@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
@@ -253,6 +292,20 @@
     "@babel/traverse" "^7.16.7"
     "@babel/types" "^7.16.7"
 
+"@babel/helper-module-transforms@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
+  integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.19.4"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.6"
+    "@babel/types" "^7.19.4"
+
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
@@ -277,6 +330,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
   integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
 
+"@babel/helper-plugin-utils@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
+  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+
 "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
@@ -315,6 +373,13 @@
   dependencies:
     "@babel/types" "^7.16.7"
 
+"@babel/helper-simple-access@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
+  integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
+  dependencies:
+    "@babel/types" "^7.19.4"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
@@ -341,6 +406,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
   integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
 
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
@@ -351,11 +421,21 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
+"@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
 "@babel/helper-validator-option@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
   integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
 
+"@babel/helper-validator-option@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
 "@babel/helper-wrap-function@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
@@ -366,14 +446,14 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.17.2":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
-  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
+"@babel/helpers@^7.19.4":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.0.tgz#27c8ffa8cc32a2ed3762fba48886e7654dbcf77f"
+  integrity sha512-aGMjYraN0zosCEthoGLdqot1oRsmxVTQRHadsUPz5QM44Zej2PYRz7XiDE7GqnkZnNtLbOuxqoZw42vkU7+XEQ==
   dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
-    "@babel/types" "^7.17.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.0"
+    "@babel/types" "^7.20.0"
 
 "@babel/highlight@^7.16.7":
   version "7.16.7"
@@ -403,6 +483,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
   integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
 
+"@babel/parser@^7.19.6", "@babel/parser@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.0.tgz#b26133c888da4d79b0d3edcf42677bcadc783046"
+  integrity sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
@@ -784,14 +869,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7", "@babel/plugin-transform-modules-amd@^7.18.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.16.8"
@@ -1075,7 +1159,7 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/template@^7.18.6":
+"@babel/template@^7.18.10", "@babel/template@^7.18.6":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -1084,7 +1168,7 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.4.5":
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
   version "7.17.3"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
   integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
@@ -1116,6 +1200,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.19.6", "@babel/traverse@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.0.tgz#538c4c6ce6255f5666eba02252a7b59fc2d5ed98"
+  integrity sha512-5+cAXQNARgjRUK0JWu2UBwja4JLSO/rBMPJzpsKb+oBF5xlUuCfljQepS4XypBQoiigL0VQjTZy6WiONtUdScQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.0"
+    "@babel/types" "^7.20.0"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
@@ -1133,6 +1233,15 @@
     "@babel/helper-validator-identifier" "^7.18.6"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479"
+  integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -2209,13 +2318,20 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
     async "^2.4.1"
     debug "^2.6.8"
 
-async@^2.4.1, async@^2.6.2:
+async@^2.4.1:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
   dependencies:
     lodash "^4.17.14"
 
+async@^2.6.4:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
+  dependencies:
+    lodash "^4.17.14"
+
 async@~0.2.9:
   version "0.2.10"
   resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
@@ -3127,6 +3243,16 @@ browserslist@^4.17.5, browserslist@^4.19.1:
     node-releases "^2.0.1"
     picocolors "^1.0.0"
 
+browserslist@^4.21.3:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+  dependencies:
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
+
 browserstack-local@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/browserstack-local/-/browserstack-local-1.4.8.tgz#07f74a19b324cf2de69ffe65f9c2baa3a2dd9a0e"
@@ -3183,10 +3309,12 @@ builtin-modules@^3.1.0:
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
   integrity "sha1-qtl8FRMet2tltQ7yCOdYTNdqdIQ= sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw=="
 
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity "sha1-y5T662HIaWRR2zZTThQi+U8K7og= sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ=="
+builtins@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
 
 bytes@1:
   version "1.0.0"
@@ -3282,6 +3410,11 @@ caniuse-lite@^1.0.30001286:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz#d753bf6444ed401eb503cbbe17aa3e1451b5a68c"
   integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
 
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001426"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz#58da20446ccd0cb1dfebd11d2350c907ee7c2eaa"
+  integrity sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -3370,7 +3503,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3420,10 +3553,10 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs= sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
 
-ci-info@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
-  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
+ci-info@^3.3.2:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f"
+  integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==
 
 class-utils@^0.3.5:
   version "0.3.5"
@@ -3858,7 +3991,7 @@ debug@4.3.3:
   dependencies:
     ms "2.1.2"
 
-debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
+debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4010,11 +4143,16 @@ diff@1.0.8:
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.0.8.tgz#343276308ec991b7bc82267ed55bc1411f971666"
   integrity "sha1-NDJ2MI7Jkbe8giZ+1VvBQR+XFmY= sha512-1zEb73vemXFpUmfh3fsta4YHz3lwebxXvaWmPbFv9apujQBWDnkrPDLXLQs1gZo4RCWMDsT89r0Pf/z8/02TGA=="
 
-diff@5.0.0, diff@^5.0.0:
+diff@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
+diff@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+  integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -4068,6 +4206,11 @@ electron-to-chromium@^1.4.17:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
   integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
 
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+
 ember-auto-import@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.1.tgz#25e1c21d403eed116b21972ccc5336b49a7ca46b"
@@ -4302,20 +4445,20 @@ ember-cli-yuidoc@^0.9.1:
     rsvp "3.0.14"
     yuidocjs "^0.10.0"
 
-ember-cli@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.2.0.tgz#5b7fc39d7543fd23056f836f445a3a8307473d72"
-  integrity sha512-HkWw9lqgBoQTHPgHOkKdpw0toPsHnTMg2acCBd7Vneztn2TdDXJQgy4KheB4NoL1NDDFXHOu+PnL4feHUB7wCg==
+ember-cli@^4.8.0:
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.8.0.tgz#71988bdad50661b904f7121a566799027c07ba72"
+  integrity sha512-NiLCOd+/ckgJvH/DzV5aWUPfGHm3LomktonXQVsFkdbfs4YF/+RHBkqwGuEH73RcOLmTRDj6YWVMOTDjWvXT/Q==
   dependencies:
-    "@babel/core" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
+    "@babel/core" "^7.18.13"
+    "@babel/plugin-transform-modules-amd" "^7.18.6"
     amd-name-resolver "^1.3.1"
     babel-plugin-module-resolver "^4.1.0"
     bower-config "^1.4.3"
     bower-endpoint-parser "0.2.2"
     broccoli "^3.5.2"
     broccoli-amd-funnel "^2.0.1"
-    broccoli-babel-transpiler "^7.8.0"
+    broccoli-babel-transpiler "^7.8.1"
     broccoli-builder "^0.18.14"
     broccoli-concat "^4.2.5"
     broccoli-config-loader "^1.0.1"
@@ -4323,22 +4466,22 @@ ember-cli@^4.2.0:
     broccoli-debug "^0.6.5"
     broccoli-funnel "^3.0.8"
     broccoli-funnel-reducer "^1.0.0"
-    broccoli-merge-trees "^3.0.2"
+    broccoli-merge-trees "^4.2.0"
     broccoli-middleware "^2.1.1"
     broccoli-slow-trees "^3.1.0"
     broccoli-source "^3.0.1"
     broccoli-stew "^3.0.0"
     calculate-cache-key-for-tree "^2.0.0"
     capture-exit "^2.0.0"
-    chalk "^4.1.0"
-    ci-info "^3.3.0"
+    chalk "^4.1.2"
+    ci-info "^3.3.2"
     clean-base-url "^1.0.0"
     compression "^1.7.4"
     configstore "^5.0.1"
     console-ui "^3.1.2"
     core-object "^3.1.5"
     dag-map "^2.0.2"
-    diff "^5.0.0"
+    diff "^5.1.0"
     ember-cli-is-package-missing "^1.0.0"
     ember-cli-lodash-subset "^2.0.1"
     ember-cli-normalize-entity-name "^1.0.0"
@@ -4348,12 +4491,12 @@ ember-cli@^4.2.0:
     ensure-posix-path "^1.1.1"
     execa "^5.1.1"
     exit "^0.1.2"
-    express "^4.17.2"
-    filesize "^8.0.6"
+    express "^4.18.1"
+    filesize "^9.0.11"
     find-up "^5.0.0"
     find-yarn-workspace-root "^2.0.0"
     fixturify-project "^2.1.1"
-    fs-extra "^9.1.0"
+    fs-extra "^10.1.0"
     fs-tree-diff "^2.0.1"
     get-caller-file "^2.0.5"
     git-repo-info "^2.1.1"
@@ -4366,37 +4509,38 @@ ember-cli@^4.2.0:
     inflection "^1.13.1"
     is-git-url "^1.0.0"
     is-language-code "^3.1.0"
-    isbinaryfile "^4.0.8"
-    js-yaml "^3.14.0"
-    json-stable-stringify "^1.0.1"
+    isbinaryfile "^5.0.0"
+    js-yaml "^4.1.0"
     leek "0.0.24"
     lodash.template "^4.5.0"
-    markdown-it "^12.0.4"
+    markdown-it "^13.0.1"
     markdown-it-terminal "0.2.1"
-    minimatch "^3.0.4"
+    minimatch "^5.1.0"
     morgan "^1.10.0"
     nopt "^3.0.6"
-    npm-package-arg "^8.1.5"
+    npm-package-arg "^9.1.0"
     p-defer "^3.0.0"
-    portfinder "^1.0.28"
+    portfinder "^1.0.29"
     promise-map-series "^0.3.0"
-    promise.hash.helper "^1.0.7"
+    promise.hash.helper "^1.0.8"
     quick-temp "^0.1.8"
-    resolve "^1.20.0"
-    resolve-package-path "^3.1.0"
+    remove-types "^1.0.0"
+    resolve "^1.22.1"
+    resolve-package-path "^4.0.3"
+    safe-stable-stringify "^2.3.1"
     sane "^5.0.1"
-    semver "^7.3.4"
+    semver "^7.3.5"
     silent-error "^1.1.1"
-    sort-package-json "^1.49.0"
+    sort-package-json "^1.57.0"
     symlink-or-copy "^1.3.1"
     temp "0.9.4"
-    testem "^3.6.0"
+    testem "^3.8.0"
     tiny-lr "^2.0.0"
     tree-sync "^2.1.0"
     uuid "^8.3.2"
-    walk-sync "^2.2.0"
-    watch-detector "^1.0.1"
-    workerpool "^6.1.4"
+    walk-sync "^3.0.0"
+    watch-detector "^1.0.2"
+    workerpool "^6.2.1"
     yam "^1.0.0"
 
 ember-compatibility-helpers@^1.1.2:
@@ -4495,10 +4639,10 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity "sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
 
-entities@~2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
+entities@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
 
 error-ex@^1.3.1:
   version "1.3.2"
@@ -5003,7 +5147,7 @@ expect-type@^0.13.0:
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
   integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
 
-express@^4.10.7, express@^4.13.1, express@^4.17.2, express@^4.18.1:
+express@^4.10.7, express@^4.13.1, express@^4.18.1:
   version "4.18.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
   integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
@@ -5199,10 +5343,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-filesize@^8.0.6:
-  version "8.0.6"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.6.tgz#5f0c27aa1b507fa7d9f72c912a774ca6a44111b1"
-  integrity sha512-sHvRqTiwdmcuzqet7iVwsbwF6UrV3wIgDf2SHNdY1Hgl8PC45HZg/0xtdw6U2izIV4lccnrY9ftl6wZFNdjYMg==
+filesize@^9.0.11:
+  version "9.0.11"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-9.0.11.tgz#4ac3a42c084232dd9b2a1da0107f32d42fcfa5e4"
+  integrity sha512-gTAiTtI0STpKa5xesyTA9hA3LX4ga8sm2nWRcffEa1L/5vQwb4mj2MdzMkoHoGv4QzfDshQZuYscQSf8c4TKOA==
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -5465,7 +5609,7 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^10.0.0, fs-extra@^10.0.1:
+fs-extra@^10.0.0, fs-extra@^10.0.1, fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -6054,6 +6198,13 @@ hosted-git-info@^4.0.1:
   dependencies:
     lru-cache "^6.0.0"
 
+hosted-git-info@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f"
+  integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==
+  dependencies:
+    lru-cache "^7.5.1"
+
 html-differ@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/html-differ/-/html-differ-1.4.0.tgz#bb95a74d54d8f107b75ad5ada166a6924093b828"
@@ -6342,6 +6493,13 @@ is-core-module@^2.5.0, is-core-module@^2.8.1:
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -6598,10 +6756,10 @@ isarray@1.0.0, isarray@^1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
 
-isbinaryfile@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
-  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
+isbinaryfile@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.0.tgz#034b7e54989dab8986598cbcea41f66663c65234"
+  integrity sha512-UDdnyGvMajJUWCkib7Cei/dvyJrrvo4FIrsvSFWdPpXSUorzXrDJ0S+X5Q4ZlasfPjca4yqCNNsjbCeiy8FFeg==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -6656,7 +6814,7 @@ js-yaml@4.1.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.14.0, js-yaml@^3.2.5, js-yaml@^3.2.7:
+js-yaml@^3.2.5, js-yaml@^3.2.7:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -6740,6 +6898,11 @@ json5@^2.1.2:
   dependencies:
     minimist "^1.2.5"
 
+json5@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -6850,10 +7013,10 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-linkify-it@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
+linkify-it@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
+  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
   dependencies:
     uc.micro "^1.0.1"
 
@@ -7360,6 +7523,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.5.1:
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f"
+  integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ==
+
 magic-string@^0.24.0:
   version "0.24.0"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.0.tgz#1b396d26406188f1fa3730a68229562d36a1c2f2"
@@ -7426,14 +7594,14 @@ markdown-it-terminal@0.2.1:
     lodash.merge "^4.6.2"
     markdown-it "^8.3.1"
 
-markdown-it@^12.0.4:
-  version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
+markdown-it@^13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
+  integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
   dependencies:
     argparse "^2.0.1"
-    entities "~2.1.0"
-    linkify-it "^3.0.1"
+    entities "~3.0.1"
+    linkify-it "^4.0.1"
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
@@ -7649,7 +7817,7 @@ minimatch@4.2.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^5.0.1:
+minimatch@^5.0.1, minimatch@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
@@ -7708,6 +7876,13 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.5"
 
+mkdirp@^0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
 mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -7871,6 +8046,11 @@ node-releases@^2.0.1:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
   integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
+
 node-uuid@~1.4.0:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
@@ -7925,14 +8105,15 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-npm-package-arg@^8.1.5:
-  version "8.1.5"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
-  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
+npm-package-arg@^9.1.0:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.2.tgz#fc8acecb00235f42270dda446f36926ddd9ac2bc"
+  integrity sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg==
   dependencies:
-    hosted-git-info "^4.0.1"
-    semver "^7.3.4"
-    validate-npm-package-name "^3.0.0"
+    hosted-git-info "^5.0.0"
+    proc-log "^2.0.1"
+    semver "^7.3.5"
+    validate-npm-package-name "^4.0.0"
 
 npm-run-all@^4.1.5:
   version "4.1.5"
@@ -8412,14 +8593,14 @@ plur@^2.1.2:
   dependencies:
     irregular-plurals "^1.0.0"
 
-portfinder@^1.0.28:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+portfinder@^1.0.29:
+  version "1.0.32"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81"
+  integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==
   dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
+    async "^2.6.4"
+    debug "^3.2.7"
+    mkdirp "^0.5.6"
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
@@ -8516,6 +8697,11 @@ private@^0.1.8:
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
 
+proc-log@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685"
+  integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==
+
 process-relative-require@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/process-relative-require/-/process-relative-require-1.0.0.tgz#1590dfcf5b8f2983ba53e398446b68240b4cc68a"
@@ -8540,7 +8726,7 @@ promise-map-series@^0.3.0:
   resolved "https://registry.yarnpkg.com/promise-map-series/-/promise-map-series-0.3.0.tgz#41873ca3652bb7a042b387d538552da9b576f8a1"
   integrity sha512-3npG2NGhTc8BWBolLLf8l/92OxMGaRLbqvIh9wjCHhDXNvk4zsxaTaCpiCunW09qWPrN2zeNSNwRLVBrQQtutA==
 
-promise.hash.helper@^1.0.7:
+promise.hash.helper@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.8.tgz#8c5fa0570f6f96821f52364fd72292b2c5a114f7"
   integrity sha512-KYcnXctWUWyVD3W3Ye0ZDuA1N8Szrh85cVCxpG6xYrOk/0CttRtYCmU30nWsUch0NuExQQ63QXvzRE6FLimZmg==
@@ -9009,12 +9195,12 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.4.0, resolve@^1.5.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.4.0, resolve@^1.5.0:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
   dependencies:
-    is-core-module "^2.8.1"
+    is-core-module "^2.9.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -9189,6 +9375,11 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
+safe-stable-stringify@^2.3.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz#34694bd8a30575b7f94792aa51527551bd733d61"
+  integrity sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA==
+
 "safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -9262,21 +9453,16 @@ schema-utils@^4.0.0:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.0.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
-  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^5.4.1, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -9519,10 +9705,10 @@ sort-object-keys@^1.1.3:
   resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
   integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
 
-sort-package-json@^1.49.0:
-  version "1.53.1"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.53.1.tgz#8f2672b06314cf04d9a6bcefc75a5f38d600b811"
-  integrity sha512-ltLORrQuuPMpy23YkWCA8fO7zBOxM4P1j9LcGxci4K2Fk8jmSyCA/ATU6CFyy8qR2HQRx4RBYWzoi78FU/Anuw==
+sort-package-json@^1.57.0:
+  version "1.57.0"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.57.0.tgz#e95fb44af8ede0bb6147e3f39258102d4bb23fc4"
+  integrity sha512-FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q==
   dependencies:
     detect-indent "^6.0.0"
     detect-newline "3.1.0"
@@ -9984,7 +10170,7 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.6.0, testem@^3.8.0:
+testem@^3.0.0, testem@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/testem/-/testem-3.8.0.tgz#651aeddbd433ef55ecf7262f0e58b89e1dccb9ac"
   integrity sha512-WEaFOq2ZGqM3IQji+Q2uXHGdln5upKhSZ1pLYe9W4CttDELAo588frNovk8UQmB+Xg2mDI8G2zmm7qKuWsldtw==
@@ -10408,6 +10594,14 @@ untildify@^2.1.0:
   dependencies:
     os-homedir "^1.0.0"
 
+update-browserslist-db@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -10492,12 +10686,12 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity "sha1-X6kS2B630MdK/BQN5zF/DKffQ34= sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw=="
+validate-npm-package-name@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747"
+  integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q==
   dependencies:
-    builtins "^1.0.3"
+    builtins "^5.0.0"
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
@@ -10583,13 +10777,12 @@ walker@~1.0.5:
   dependencies:
     makeerror "1.0.x"
 
-watch-detector@^1.0.0, watch-detector@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.1.tgz#3106a6b489284ec2ecaef0e65cf1b8ec9117296e"
-  integrity sha512-8sJ8rvNfg2ciqCa5IxIdmdxU/vuUe9V/jw+thXbdreELSv3+Cq6k8K42cLEL86W2td1PMmfNCWZuAhrZ/sD4mw==
+watch-detector@^1.0.0, watch-detector@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/watch-detector/-/watch-detector-1.0.2.tgz#95deb9189f8c89c0a9f211739cef6d01cffcf452"
+  integrity sha512-MrJK9z7kD5Gl3jHBnnBVHvr1saVGAfmkyyrvuNzV/oe0Gr1nwZTy5VSA0Gw2j2Or0Mu8HcjUa44qlBvC2Ofnpg==
   dependencies:
     heimdalljs-logger "^0.1.10"
-    semver "^6.3.0"
     silent-error "^1.1.1"
     tmp "^0.1.0"
 
@@ -10673,7 +10866,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-workerpool@6.2.0, workerpool@^6.0.0, workerpool@^6.1.4:
+workerpool@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
   integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
@@ -10687,6 +10880,11 @@ workerpool@^3.1.1:
     object-assign "4.1.1"
     rsvp "^4.8.4"
 
+workerpool@^6.0.0, workerpool@^6.2.1:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.3.0.tgz#82f5e5e1fb01d48f0399fe52a117c8a15cd1b972"
+  integrity sha512-2rVusseHGwxEEESx/szO2SHfi982WQavL2YlWGHsZE2ynZ4gaHT7kmCXph9k9fUivKOwx7PBn6vn4nXUxxdKcw==
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"

From 269fc6c236e7ac289d7337978124dfec617597c5 Mon Sep 17 00:00:00 2001
From: Geordan Neukum <gneukum1@gmail.com>
Date: Sat, 29 Oct 2022 18:43:39 -0400
Subject: [PATCH 1197/1405] [DOC] add `in-element` example  for `insertBefore`
 usage

The documentation available for the `in-element` helper mentions that
there is an optional named argument, insertBefore, but it does not
feature a code sample that uses it. Let's add a code sample which does
use it to help developers using the API docs.

Fixes #19911.
---
 .../-internals/glimmer/lib/syntax/in-element.ts      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts b/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
index 70c36a157b6..64fc92c19fb 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
@@ -27,8 +27,16 @@
  It also supports an optional named argument:
 
  - `insertBefore` -- by default the DOM element's content is replaced when used as
- `destinationElement`. Passing `null` changes the behaviour to appended at the end
- of any existing content. Any other value than `null` is currently not supported.
+ `destinationElement`. Passing `null` to `insertBefore` changes the behaviour to
+ append the block content to the end of any existing content. Any other value than
+ `null` is currently not supported.
+
+ For example:
+ ```handlebars
+ {{#in-element this.destinationElement insertBefore=null}}
+  <div>Some content</div>
+ {{/in-element}}
+ ```
 
  @method in-element
  @for Ember.Templates.helpers

From 2a1388753392f616718642d554119dc3ab7a8841 Mon Sep 17 00:00:00 2001
From: Geordan Neukum <gneukum1@gmail.com>
Date: Sat, 29 Oct 2022 19:14:52 -0400
Subject: [PATCH 1198/1405] [DOC] clarify `filter` computed callback method
 behavior

Right now, the filter function's API docs mention a callback, but do not
clarify how the callback function filters down the array. Let's
explicitly specify that truthy values will keep the array element, and
that anything else will not. This should make the usage a little bit
more clear.

Fixes #19559.
---
 .../@ember/object/lib/computed/reduce_computed_macros.ts    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index 49edc710457..c104c1fb1a4 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -429,7 +429,8 @@ export function mapBy(dependentKey: string, propertyKey: string) {
 }
 
 /**
-  Filters the array by the callback.
+  Filters the array down to the elements that pass the test implemented by the
+  callback.
 
   The callback method you provide should have the following signature:
   - `item` is the current item in the iteration.
@@ -440,6 +441,9 @@ export function mapBy(dependentKey: string, propertyKey: string) {
   function filterCallback(item, index, array);
   ```
 
+  In the callback method, return a value that coerces to true to keep the
+  element, or to false otherwise.
+
   Example:
 
   ```javascript

From 88d43a57ae3fbfb2a94ec5b2524009f11e123091 Mon Sep 17 00:00:00 2001
From: Geordan Neukum <gneukum1@gmail.com>
Date: Sun, 30 Oct 2022 16:18:14 -0400
Subject: [PATCH 1199/1405] DOC: fix EventDispatcher extends broken link

Right now, the EventDispatcher docs attempt to link against Ember.Object
as the class being extended. This results in a broken link in the
generated docs. Let's instead reference this as `EmberObject` instead so
that the link works as expected.

Fixes #20241.
---
 packages/@ember/-internals/views/lib/system/event_dispatcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
index 00230a463db..c42446b2068 100644
--- a/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
+++ b/packages/@ember/-internals/views/lib/system/event_dispatcher.ts
@@ -25,7 +25,7 @@ const ROOT_ELEMENT_SELECTOR = `.${ROOT_ELEMENT_CLASS}`;
   @class EventDispatcher
   @namespace Ember
   @private
-  @extends Ember.Object
+  @extends EmberObject
 */
 export default class EventDispatcher extends EmberObject {
   /**

From e23e2eb6d6538f44a3768acd9ac8e6d5817f9ce7 Mon Sep 17 00:00:00 2001
From: Geordan Neukum <gneukum1@gmail.com>
Date: Sun, 30 Oct 2022 18:58:11 -0400
Subject: [PATCH 1200/1405] [DOC] remove Input references to TextField/Checkbox

Right now, the Input documentation reference that the component extends
TextField and Checkbox under the hood. This has not been true since
`Commit: 5d24ae74`. As such, let's back out this part of the
documentation as it could potentially be confusing (and it contains
broken links).

Fixes #20170.
---
 .../-internals/glimmer/lib/components/input.ts  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/components/input.ts b/packages/@ember/-internals/glimmer/lib/components/input.ts
index 4162dbf4f02..e22e6a35879 100644
--- a/packages/@ember/-internals/glimmer/lib/components/input.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/input.ts
@@ -141,14 +141,6 @@ if (hasDOM) {
     onto the element. If you wanted a one-way binding, use `<input type="checkbox">` with
     `checked` and the `input` event instead.
 
-  ### Extending `TextField`
-
-  Internally, `<Input @type="text" />` creates an instance of `TextField`, passing arguments from
-  the helper to `TextField`'s `create` method. Subclassing `TextField` is supported but not
-  recommended.
-
-  See [TextField](/ember/release/classes/TextField)
-
   ### Checkbox
 
   To create an `<input type="checkbox">`:
@@ -161,17 +153,8 @@ if (hasDOM) {
   This will bind the checked state of this checkbox to the value of `isEmberized` -- if either one
   changes, it will be reflected in the other.
 
-  ### Extending `Checkbox`
-
-  Internally, `<Input @type="checkbox" />` creates an instance of `Checkbox`. Subclassing
-  `TextField` is supported but not recommended.
-
-  See [Checkbox](/ember/release/classes/Checkbox)
-
   @method Input
   @for Ember.Templates.components
-  @see {TextField}
-  @see {Checkbox}
   @param {Hash} options
   @public
 */

From 7f7d8fdb69f7a482e21a593b033b2ba426d21a4b Mon Sep 17 00:00:00 2001
From: Chad Hietala <chietala@linkedin.com>
Date: Mon, 31 Oct 2022 10:51:56 -0400
Subject: [PATCH 1201/1405] [BUGFIX release] expose getComponentTemplate type

---
 types/preview/@ember/component/index.d.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/types/preview/@ember/component/index.d.ts b/types/preview/@ember/component/index.d.ts
index ced33f71e48..01029007bf5 100644
--- a/types/preview/@ember/component/index.d.ts
+++ b/types/preview/@ember/component/index.d.ts
@@ -106,6 +106,15 @@ declare module '@ember/component' {
     object: T
   ): T;
 
+/**
+ * Takes a component class and returns the template associated with the given component class,
+ * if any, or one of its superclasses, if any, or undefined if no template association was found.
+ *
+ * @param object the component object
+ * @return the template factory of the given component
+ */
+ export function getComponentTemplate(obj: object): TemplateFactory | undefined;
+
   // In normal TypeScript, these built-in components are essentially opaque tokens
   // that just need to be importable. Declaring them with unique interfaces
   // like this, however, gives tools like Glint (that DO have a richer

From 149e8903a4a425189ea860cc9d7f114545113373 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 31 Oct 2022 12:31:07 -0600
Subject: [PATCH 1202/1405] Markdown formatting for in-element arg example

---
 .../-internals/glimmer/lib/syntax/in-element.ts     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts b/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
index 64fc92c19fb..56741342111 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/in-element.ts
@@ -31,12 +31,13 @@
  append the block content to the end of any existing content. Any other value than
  `null` is currently not supported.
 
- For example:
- ```handlebars
- {{#in-element this.destinationElement insertBefore=null}}
-  <div>Some content</div>
- {{/in-element}}
- ```
+     For example:
+
+     ```handlebars
+     {{#in-element this.destinationElement insertBefore=null}}
+       <div>Some content</div>
+     {{/in-element}}
+     ```
 
  @method in-element
  @for Ember.Templates.helpers

From e89debcb8b329e3d9e20bcf8e3cc4f9f4db75afe Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 31 Oct 2022 12:45:04 -0600
Subject: [PATCH 1203/1405] Further clarify `filter` CP behavior

---
 .../@ember/object/lib/computed/reduce_computed_macros.ts   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/object/lib/computed/reduce_computed_macros.ts b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
index c104c1fb1a4..6bb7037e904 100644
--- a/packages/@ember/object/lib/computed/reduce_computed_macros.ts
+++ b/packages/@ember/object/lib/computed/reduce_computed_macros.ts
@@ -429,8 +429,7 @@ export function mapBy(dependentKey: string, propertyKey: string) {
 }
 
 /**
-  Filters the array down to the elements that pass the test implemented by the
-  callback.
+  Filters the array by the callback, like the `Array.prototype.filter` method.
 
   The callback method you provide should have the following signature:
   - `item` is the current item in the iteration.
@@ -441,8 +440,8 @@ export function mapBy(dependentKey: string, propertyKey: string) {
   function filterCallback(item, index, array);
   ```
 
-  In the callback method, return a value that coerces to true to keep the
-  element, or to false otherwise.
+  In the callback, return a truthy value that coerces to true to keep the
+  element, or a falsy to reject it.
 
   Example:
 

From 501e0a6f313890ad3c07940d0f3958133c8fc4b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:02:11 +0000
Subject: [PATCH 1204/1405] Bump testem from 3.8.0 to 3.9.0

Bumps [testem](https://github.com/testem/testem) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/testem/testem/releases)
- [Commits](https://github.com/testem/testem/compare/v3.8.0...v3.9.0)

---
updated-dependencies:
- dependency-name: testem
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 9c50d594fa7..4cc5ba0b7b7 100644
--- a/package.json
+++ b/package.json
@@ -156,7 +156,7 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.2",
     "simple-dom": "^1.4.0",
-    "testem": "^3.8.0",
+    "testem": "^3.9.0",
     "testem-failure-only-reporter": "^1.0.0",
     "typescript": "~4.8.3"
   },
diff --git a/yarn.lock b/yarn.lock
index e5be25aa5a3..ac8b61872d5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7869,14 +7869,7 @@ mkdirp-classic@^0.5.2:
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz#54c441ce4c96cd7790e10b41a87aa51068ecab2b"
   integrity "sha1-VMRBzkyWzXeQ4QtBqHqlEGjsqys= sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
-  dependencies:
-    minimist "^1.2.5"
-
-mkdirp@^0.5.6:
+mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@^0.5.6:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -10170,10 +10163,10 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.8.0.tgz#651aeddbd433ef55ecf7262f0e58b89e1dccb9ac"
-  integrity sha512-WEaFOq2ZGqM3IQji+Q2uXHGdln5upKhSZ1pLYe9W4CttDELAo588frNovk8UQmB+Xg2mDI8G2zmm7qKuWsldtw==
+testem@^3.0.0, testem@^3.8.0, testem@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.9.0.tgz#a82ccf01e5a248e3924244186e348c665ab90f7d"
+  integrity sha512-YTxCYKj0cc8uUSKEziJtSC5T/pw4fQnY0ZXNOyvAFgrijfsN9NxmncJZOHLhPgFOuhbRd5i+DBQxw0Cpe0SEFg==
   dependencies:
     "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"

From 26c8e9be083b3769727f96e907ee80c37ab73c27 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:02:42 +0000
Subject: [PATCH 1205/1405] Bump core-js from 2.6.5 to 3.26.0

Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 2.6.5 to 3.26.0.
- [Release notes](https://github.com/zloirock/core-js/releases)
- [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/zloirock/core-js/commits/v3.26.0/packages/core-js)

---
updated-dependencies:
- dependency-name: core-js
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9c50d594fa7..3fd935c238e 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "broccoli-typescript-compiler": "^8.0.0",
     "broccoli-uglify-sourcemap": "^4.0.0",
     "common-tags": "^1.8.2",
-    "core-js": "^2.6.5",
+    "core-js": "^3.26.0",
     "dag-map": "^2.0.2",
     "ember-cli": "^4.8.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
diff --git a/yarn.lock b/yarn.lock
index e5be25aa5a3..8fb0ca7442b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3866,6 +3866,11 @@ core-js@^2.4.0, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
+core-js@^3.26.0:
+  version "3.26.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe"
+  integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==
+
 core-object@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"

From e784f69fd4cd2a845111d228921c665cd5a10732 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Nov 2022 15:02:58 +0000
Subject: [PATCH 1206/1405] Bump eslint from 8.11.0 to 8.26.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.11.0 to 8.26.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.11.0...v8.26.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 142 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 84 insertions(+), 60 deletions(-)

diff --git a/package.json b/package.json
index 9c50d594fa7..2ecb39e53e1 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.11.0",
+    "eslint": "^8.26.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
diff --git a/yarn.lock b/yarn.lock
index e5be25aa5a3..e34dd52cf94 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1287,19 +1287,19 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@eslint/eslintrc@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
-  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.1"
-    globals "^13.9.0"
+    espree "^9.4.0"
+    globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
 "@glimmer/compiler@0.84.2":
@@ -1527,14 +1527,19 @@
   resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-2.0.0.tgz#5e8b7298f31ff8f7b260e6b7363c7e9ceed7d9c5"
   integrity sha512-EP9uEDZv/L5Qh9IWuMUGJRfwhXJ4h1dqKTT4/3+tY0eu7sPis7xh23j61SYUnNF4vqCQvvUXpDo9Bh/+q1zASA==
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.2.tgz#68be55c737023009dfc5fe245d51181bb6476914"
-  integrity sha512-UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA==
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.7"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
+  integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
@@ -1589,25 +1594,30 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@nodelib/fs.scandir@2.1.3":
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
-  integrity "sha1-Olgr21OATGum0UZXnEblITDPSjs= sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
-    "@nodelib/fs.stat" "2.0.3"
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+"@nodelib/fs.stat@2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
+
+"@nodelib/fs.stat@^2.0.2":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
   integrity "sha1-NNxfTKu8cg9OYPdadH5+zWwXW9M= sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
 
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
-  integrity "sha1-ARuSAqcKY2bkNspcBlhEUoqwSXY= sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.3"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
 "@simple-dom/document@^1.4.0":
@@ -1997,7 +2007,7 @@ acorn-dynamic-import@^3.0.0:
   dependencies:
     acorn "^5.0.0"
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -2007,11 +2017,16 @@ acorn@^5.0.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
 
-acorn@^8.5.0, acorn@^8.7.0:
+acorn@^8.5.0:
   version "8.8.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
+acorn@^8.8.0:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+
 agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
@@ -4909,13 +4924,15 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.11.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37"
-  integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==
+eslint@^8.26.0:
+  version "8.26.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d"
+  integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==
   dependencies:
-    "@eslint/eslintrc" "^1.2.1"
-    "@humanwhocodes/config-array" "^0.9.2"
+    "@eslint/eslintrc" "^1.3.3"
+    "@humanwhocodes/config-array" "^0.11.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -4925,43 +4942,45 @@ eslint@^8.11.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.1"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.6.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.15.0"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     regexpp "^3.2.0"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
 esm@^3.2.4:
   version "3.2.22"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.22.tgz#5062c2e22fee3ccfee4e8f20da768330da90d6e3"
   integrity "sha1-UGLC4i/uPM/uTo8g2naDMNqQ1uM= sha512-z8YG7U44L82j1XrdEJcqZOLUnjxco8pO453gKOlaMD1/md1n/5QrscAmYG+oKUspsmDLuBFZrpbxI6aQ67yRxA=="
 
-espree@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
-  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+espree@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a"
+  integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==
   dependencies:
-    acorn "^8.7.0"
-    acorn-jsx "^5.3.1"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0, esprima@~4.0.0:
@@ -5733,11 +5752,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
-
 gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
@@ -5849,7 +5863,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -5915,10 +5929,10 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
   integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.11.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7"
-  integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==
+globals@^13.15.0:
+  version "13.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
+  integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
   dependencies:
     type-fest "^0.20.2"
 
@@ -5990,6 +6004,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9,
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU= sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -6634,6 +6653,11 @@ is-odd@^2.0.0:
   dependencies:
     is-number "^4.0.0"
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-plain-obj@2.1.0, is-plain-obj@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
@@ -6792,6 +6816,11 @@ jmespath@0.16.0:
   resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
   integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
+js-sdsl@^4.1.4:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
+  integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
+
 js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -7803,7 +7832,7 @@ mini-css-extract-plugin@^2.5.2:
   dependencies:
     schema-utils "^4.0.0"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -10673,11 +10702,6 @@ uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-compile-cache@^2.0.3:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
-  integrity "sha1-4U3jezGm0ZT1aQ1n78Tn9vxqsw4= sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
-
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"

From 7353d90cc90076ca499b6b14c0470de9d68518ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 14:05:36 +0000
Subject: [PATCH 1207/1405] Bump aws-sdk from 2.1166.0 to 2.1245.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1166.0 to 2.1245.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1166.0...v2.1245.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 234 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 231 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index df6d523b280..17332d8b070 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@typescript-eslint/eslint-plugin": "^5.38.0",
     "@typescript-eslint/parser": "^5.38.1",
     "auto-dist-tag": "^2.1.1",
-    "aws-sdk": "^2.1166.0",
+    "aws-sdk": "^2.1245.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.1",
diff --git a/yarn.lock b/yarn.lock
index a294616d4f7..a15708b367d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2379,10 +2379,15 @@ auto-dist-tag@^2.1.1:
     pkg-up "^3.0.0"
     semver "^7.0.0"
 
-aws-sdk@^2.0.9, aws-sdk@^2.1166.0:
-  version "2.1166.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1166.0.tgz#9bc5ceb3690d2747b941a2e2b8ebacfffb412f41"
-  integrity sha512-9CJQpMtIv2sxvwYTcMCfuCGU8t5qEppnvmo0uFFOm+1Q1uEv5sPg95wQH3Gfj4Mmv4FKWFofgTLksn0u2pDxsw==
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
+aws-sdk@^2.0.9, aws-sdk@^2.1245.0:
+  version "2.1245.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1245.0.tgz#cee09dd6a83badbe7692cb512cbce5e9daa0c702"
+  integrity sha512-LXNmuT33+k4ymWijm6dhLRm0OX14ki9OOK1BYn8AUWWPuh+GMlFIuIFH+sWORVdhZqaQNsvF72cB6CeMBqaJWg==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
@@ -2391,6 +2396,7 @@ aws-sdk@^2.0.9, aws-sdk@^2.1166.0:
     querystring "0.2.0"
     sax "1.2.1"
     url "0.10.3"
+    util "^0.12.4"
     uuid "8.0.0"
     xml2js "0.4.19"
 
@@ -4086,6 +4092,14 @@ define-properties@^1.1.3:
   dependencies:
     object-keys "^1.0.12"
 
+define-properties@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
+  dependencies:
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -4700,6 +4714,36 @@ es-abstract@^1.18.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-abstract@^1.19.5, es-abstract@^1.20.0:
+  version "1.20.4"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
+  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.3"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.2"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    safe-regex-test "^1.0.0"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -5561,6 +5605,13 @@ follow-redirects@^1.0.0:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
   integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
+
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -5752,6 +5803,21 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
 gauge@^4.0.3:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
@@ -5790,6 +5856,15 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-intrinsic@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -6063,6 +6138,11 @@ has-bigints@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
   integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
 
+has-bigints@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -6073,11 +6153,23 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
 has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
 has-tostringtag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
@@ -6468,6 +6560,14 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
+is-arguments@^1.0.4:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
+  dependencies:
+    call-bind "^1.0.2"
+    has-tostringtag "^1.0.0"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6500,6 +6600,11 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-callable@^1.1.3, is-callable@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
+  integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
+
 is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
@@ -6588,6 +6693,13 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-generator-function@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
+  dependencies:
+    has-tostringtag "^1.0.0"
+
 is-git-url@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b"
@@ -6617,6 +6729,11 @@ is-negative-zero@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
   integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
 
+is-negative-zero@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+
 is-number-object@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
@@ -6710,6 +6827,13 @@ is-shared-array-buffer@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
   integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
 
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -6741,6 +6865,17 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
+is-typed-array@^1.1.3, is-typed-array@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67"
+  integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-abstract "^1.20.0"
+    for-each "^0.3.3"
+    has-tostringtag "^1.0.0"
+
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -6758,6 +6893,13 @@ is-weakref@^1.0.1:
   dependencies:
     call-bind "^1.0.0"
 
+is-weakref@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -8212,6 +8354,11 @@ object-inspect@^1.11.0, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
   integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
+object-inspect@^1.12.2:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+
 object-keys@^1.0.12, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -8234,6 +8381,16 @@ object.assign@^4.1.0, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    has-symbols "^1.0.3"
+    object-keys "^1.1.1"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -9032,6 +9189,15 @@ regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
+
 regexpp@^3.0.0, regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
@@ -9390,6 +9556,15 @@ safe-json-parse@~1.0.1:
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
   integrity "sha1-PnZyPjjf3aE8mx0poeB//uSzC1c= sha512-o0JmTu17WGUaUOHa1l0FPGXKBfijbxK6qoHzlkihsDXxzBHvJcA7zgviKR92Xs841rX9pK16unfphLq0/KqX7A=="
 
+safe-regex-test@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
+  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -9948,6 +10123,15 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+string.prototype.trimend@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -9956,6 +10140,15 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+string.prototype.trimstart@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.19.5"
+
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
@@ -10520,6 +10713,16 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+  dependencies:
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
+    which-boxed-primitive "^1.0.2"
+
 unbzip2-stream@1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
@@ -10675,6 +10878,17 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
+util@^0.12.4:
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
+  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    which-typed-array "^1.1.2"
+
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -10847,6 +11061,18 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which-typed-array@^1.1.2:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f"
+  integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    es-abstract "^1.20.0"
+    for-each "^0.3.3"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.9"
+
 which@2.0.2, which@^2.0.1, which@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"

From 11d5973e8623a24e5f4f3b6686fbef970acd771d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Nov 2022 14:05:56 +0000
Subject: [PATCH 1208/1405] Bump ember-cli-dependency-checker from 3.2.0 to
 3.3.1

Bumps [ember-cli-dependency-checker](https://github.com/quaertym/ember-cli-dependency-checker) from 3.2.0 to 3.3.1.
- [Release notes](https://github.com/quaertym/ember-cli-dependency-checker/releases)
- [Commits](https://github.com/quaertym/ember-cli-dependency-checker/compare/v3.2.0...v3.3.1)

---
updated-dependencies:
- dependency-name: ember-cli-dependency-checker
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index df6d523b280..c989048fa50 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "ember-cli": "^4.8.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^2.0.1",
-    "ember-cli-dependency-checker": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
     "eslint": "^8.26.0",
diff --git a/yarn.lock b/yarn.lock
index a294616d4f7..162e14da72c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4327,10 +4327,10 @@ ember-cli-browserstack@^2.0.1:
     rsvp "^4.8.5"
     yargs "^17.1.1"
 
-ember-cli-dependency-checker@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.2.0.tgz#9202ad9e14d6fda33cffc22a11c343c2a8885330"
-  integrity "sha1-kgKtnhTW/aM8/8IqEcNDwqiIUzA= sha512-dkSmcJ/jY/2ms/S6ph2jXSfOW5VfOpLfg5DFEbra0SaMNgYkNDFF1o0U4OdTsG37L5h/AXWNuVtnOa4TMabz9Q=="
+ember-cli-dependency-checker@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-3.3.1.tgz#16b44d7a1a1e946f59859fad97f32e616d78323a"
+  integrity sha512-Tg6OeijjXNKWkDm6057Tr0N9j9Vlz/ITewXWpn1A/+Wbt3EowBx5ZKfvoupqz05EznKgL1B/ecG0t+JN7Qm6MA==
   dependencies:
     chalk "^2.3.0"
     find-yarn-workspace-root "^1.1.0"

From 3050628e9cfe0b8426deb9928ef718fb3f2dc026 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Thu, 20 Oct 2022 13:11:34 -0400
Subject: [PATCH 1209/1405] Fix prototype pollution bug

(cherry picked from commit 0b6196a3e817b5b6793b5d9c1ba37f7d2d13d174)
---
 .../-internals/metal/lib/property_get.ts      |  6 +++-
 .../-internals/metal/lib/property_set.ts      |  2 +-
 .../metal/tests/accessors/set_path_test.js    | 28 +++++++++++++++
 .../metal/tests/set_properties_test.js        | 36 +++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index f31c597f9e0..00c588e02a3 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -141,7 +141,7 @@ export function _getProp(obj: unknown, keyName: string) {
   return value;
 }
 
-export function _getPath(obj: unknown, path: string | string[]): any {
+export function _getPath(obj: unknown, path: string | string[], forSet?: boolean): any {
   let parts = typeof path === 'string' ? path.split('.') : path;
 
   for (let part of parts) {
@@ -149,6 +149,10 @@ export function _getPath(obj: unknown, path: string | string[]): any {
       return undefined;
     }
 
+    if (forSet && (part === '__proto__' || part === 'constructor')) {
+      return;
+    }
+
     obj = _getProp(obj, part);
   }
 
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index f6a830d991e..3c6c75f82a6 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -110,7 +110,7 @@ function _setPath(root: object, path: string, value: any, tolerant?: boolean): a
 
   assert('Property set failed: You passed an empty path', keyName.trim().length > 0);
 
-  let newRoot = getPath(root, parts);
+  let newRoot = getPath(root, parts, true);
 
   if (newRoot !== null && newRoot !== undefined) {
     return set(newRoot, keyName, value);
diff --git a/packages/@ember/-internals/metal/tests/accessors/set_path_test.js b/packages/@ember/-internals/metal/tests/accessors/set_path_test.js
index 26df3c77258..69a29d23626 100644
--- a/packages/@ember/-internals/metal/tests/accessors/set_path_test.js
+++ b/packages/@ember/-internals/metal/tests/accessors/set_path_test.js
@@ -58,6 +58,34 @@ moduleFor(
       set(obj, 'foo.bar', 'BAM');
       assert.equal(get(obj, 'foo.bar'), 'BAM');
     }
+
+    ['@test ignores attempts to traverse through dangerous built-in Object properties'](assert) {
+      class Inner {}
+      class Example {
+        inner = new Inner();
+      }
+      let example = new Example();
+
+      assert.throws(() => {
+        set(example, '__proto__.ohNo', 'polluted');
+      }, /Property set failed: object in path "__proto__" could not be found./);
+      assert.equal(Example.prototype.ohNo, undefined, 'check for prototype pollution');
+
+      assert.throws(() => {
+        set(example, 'constructor.ohNo', 'polluted');
+      }, /Property set failed: object in path "constructor" could not be found./);
+      assert.equal(Example.ohNo, undefined, 'check for prototype pollution');
+
+      assert.throws(() => {
+        set(example, 'inner.__proto__.ohNo', 'polluted');
+      }, /Property set failed: object in path "inner.__proto__" could not be found./);
+      assert.equal(Inner.prototype.ohNo, undefined, 'check for prototype pollution');
+
+      assert.throws(() => {
+        set(example, 'inner.constructor.ohNo', 'polluted');
+      }, /Property set failed: object in path "inner.constructor" could not be found./);
+      assert.equal(Inner.ohNo, undefined, 'check for prototype pollution');
+    }
   }
 );
 
diff --git a/packages/@ember/-internals/metal/tests/set_properties_test.js b/packages/@ember/-internals/metal/tests/set_properties_test.js
index 41bf8e53aa2..f0f5929b22e 100644
--- a/packages/@ember/-internals/metal/tests/set_properties_test.js
+++ b/packages/@ember/-internals/metal/tests/set_properties_test.js
@@ -45,5 +45,41 @@ moduleFor(
         'Set an additional, previously unset property'
       );
     }
+
+    ['@test cannot traverse through dangerous built-in Object properties'](assert) {
+      class Inner {}
+      class Example {
+        inner = new Inner();
+      }
+      let example = new Example();
+
+      assert.throws(() => {
+        setProperties(example, {
+          '__proto__.ohNo': 'polluted',
+        });
+      }, /Property set failed: object in path "__proto__" could not be found./);
+      assert.equal(Example.prototype.ohNo, undefined, 'check for prototype pollution');
+
+      assert.throws(() => {
+        setProperties(example, {
+          'constructor.ohNo': 'polluted',
+        });
+      }, /Property set failed: object in path "constructor" could not be found./);
+      assert.equal(Example.ohNo, undefined, 'check for prototype pollution');
+
+      assert.throws(() => {
+        setProperties(example, {
+          'inner.__proto__.ohNo': 'polluted',
+        });
+      }, /Property set failed: object in path "inner.__proto__" could not be found./);
+      assert.equal(Inner.prototype.ohNo, undefined, 'check for prototype pollution');
+
+      assert.throws(() => {
+        setProperties(example, {
+          'inner.constructor.ohNo': 'polluted',
+        });
+      }, /Property set failed: object in path "inner.constructor" could not be found./);
+      assert.equal(Inner.ohNo, undefined, 'check for prototype pollution');
+    }
   }
 );

From a20bff305ae45840deb07a4a36a09de55073e916 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 2 Nov 2022 11:35:09 -0400
Subject: [PATCH 1210/1405] Add v3.24.7 to CHANGELOG

(cherry picked from commit 44e20f73ab7c49003d185bef361353412d7a6518)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd91db1a6b..ecefa82d1fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Ember Changelog
 
+### v3.24.7 (November 2, 2022)
+
+- [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
+
 ### v4.9.0-beta.2 (October 25, 2022)
+
 - [#20227](https://github.com/emberjs/ember.js/pull/20227) [BUGFIX] Fix unsafe internal cast for NativeArray
 - [#20228](https://github.com/emberjs/ember.js/pull/20228) [BUGFIX] Remove type export for ControllerMixin
 

From 701ee45b79b4ee3f860d2c380aa3d87212e3fad5 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 2 Nov 2022 11:19:37 -0400
Subject: [PATCH 1211/1405] Add v3.28.10 to CHANGELOG

(cherry picked from commit 198d7e168f3c857be4b7da539dd5b3785b2c1452)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecefa82d1fe..8867e4bba23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v3.28.10 (November 2, 2022)
+
+- [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
+
 ### v3.24.7 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`

From 7077f128fdf65149b5aad01d0a2852a3883e2aac Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 2 Nov 2022 17:03:13 -0600
Subject: [PATCH 1212/1405] [FEATURE] Add the `Resolver` type to preview types

Per the latest revision to RFC 0821, we need this public type for
resolvers to use: Ember defines the contract, others (mostly, but not
only, `ember-resolver`) implement the contract.
---
 type-tests/preview/@ember/owner-tests.ts      | 22 +++++++++++-
 types/preview/@ember/-internals/resolver.d.ts | 35 -------------------
 types/preview/@ember/application/index.d.ts   |  3 +-
 .../@ember/debug/container-debug-adapter.d.ts |  2 +-
 types/preview/@ember/engine/index.d.ts        |  2 +-
 types/preview/@ember/owner/index.d.ts         | 30 ++++++++++++++++
 types/preview/index.d.ts                      |  2 --
 7 files changed, 54 insertions(+), 42 deletions(-)
 delete mode 100644 types/preview/@ember/-internals/resolver.d.ts

diff --git a/type-tests/preview/@ember/owner-tests.ts b/type-tests/preview/@ember/owner-tests.ts
index 4effdfb996b..15ad10010d0 100644
--- a/type-tests/preview/@ember/owner-tests.ts
+++ b/type-tests/preview/@ember/owner-tests.ts
@@ -1,4 +1,11 @@
-import Owner, { Factory, FactoryManager, FullName, RegisterOptions } from '@ember/owner';
+import Owner, {
+  Factory,
+  FactoryManager,
+  FullName,
+  RegisterOptions,
+  Resolver,
+  KnownForTypeResult,
+} from '@ember/owner';
 import { expectTypeOf } from 'expect-type';
 
 // Just a class we can construct in the Factory and FactoryManager tests
@@ -53,6 +60,19 @@ expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
 // @ts-expect-error
 aFactoryManager.create(badPojo);
 
+// ----- Resolver ----- //
+declare let resolver: Resolver;
+expectTypeOf<Resolver['normalize']>().toEqualTypeOf<((fullName: FullName) => string) | undefined>();
+expectTypeOf<Resolver['lookupDescription']>().toEqualTypeOf<
+  ((fullName: FullName) => string) | undefined
+>();
+expectTypeOf(resolver.resolve('some-name')).toEqualTypeOf<object | Factory<object> | undefined>();
+const knownForFoo = resolver.knownForType?.('foo');
+expectTypeOf(knownForFoo).toEqualTypeOf<KnownForTypeResult<'foo'> | undefined>();
+expectTypeOf(knownForFoo?.['foo:bar']).toEqualTypeOf<boolean | undefined>();
+// @ts-expect-error
+knownForFoo?.['blah'];
+
 // This one is last so it can reuse the bits from above!
 // ----- Owner ----- //
 declare let owner: Owner;
diff --git a/types/preview/@ember/-internals/resolver.d.ts b/types/preview/@ember/-internals/resolver.d.ts
deleted file mode 100644
index 9bb05c01fce..00000000000
--- a/types/preview/@ember/-internals/resolver.d.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-declare module '@ember/-internals/resolver' {
-  /**
-   * @module
-   * @private This is not a public API module, and in fact ***there is no such
-   *   module at runtime***. This module exists only to provide a public API for
-   *   `Resolver`, which will get a dedicated home as part of Ember's public API
-   *   via a future RFC. As an end user, if you need access to `Resolver` for now
-   *   you should ordinarily get it via `ember-resolver`.
-   */
-
-  import EmberObject from '@ember/object';
-  import type { Factory, FullName } from '@ember/owner';
-
-  export type KnownForTypeResult<Type extends string> = {
-    [fullName in `${Type}:${string}`]: boolean | undefined;
-  };
-
-  /**
-   * A `Resolver` is the mechanism responsible for looking up code in your
-   * application and converting its naming conventions into the actual classes,
-   * functions, and templates that Ember needs to resolve its dependencies, for
-   * example, what template to render for a given route. It is a system that helps
-   * the app resolve the lookup of JavaScript modules agnostic of what kind of
-   * module system is used, which can be AMD, CommonJS or just plain globals. It
-   * is used to lookup routes, models, components, templates, or anything that is
-   * used in your Ember app.
-   */
-  export interface Resolver extends EmberObject {
-    knownForType?: <TypeName extends string>(type: TypeName) => KnownForTypeResult<TypeName>;
-    lookupDescription?: (fullName: FullName) => string;
-    makeToString?: (factory: Factory<object>, fullName: FullName) => string;
-    normalize?: (fullName: FullName) => string;
-    resolve(name: string): Factory<object> | object | undefined;
-  }
-}
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 4965e875f58..9fe576425c9 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -5,9 +5,8 @@ declare module '@ember/application' {
   import { EventDispatcherEvents } from '@ember/application/types';
   import Router from '@ember/routing/router';
   import Registry from '@ember/application/-private/registry';
-  import type { Resolver } from '@ember/-internals/resolver';
   import { AnyFn } from 'ember/-private/type-utils';
-  import Owner from '@ember/owner';
+  import Owner, { Resolver } from '@ember/owner';
   import type GlimmerComponent from '@glimmer/component';
   import EmberObject from '@ember/object';
 
diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
index edc16cc568b..94cc571f9a3 100644
--- a/types/preview/@ember/debug/container-debug-adapter.d.ts
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -1,5 +1,5 @@
 declare module '@ember/debug/container-debug-adapter' {
-  import type { Resolver } from '@ember/-internals/resolver';
+  import type { Resolver } from '@ember/owner';
 
   /**
    * The ContainerDebugAdapter helps the container and resolver interface
diff --git a/types/preview/@ember/engine/index.d.ts b/types/preview/@ember/engine/index.d.ts
index 561e251d620..be32ad3ba9b 100644
--- a/types/preview/@ember/engine/index.d.ts
+++ b/types/preview/@ember/engine/index.d.ts
@@ -3,7 +3,7 @@ declare module '@ember/engine' {
   import type RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
   import type Initializer from '@ember/engine/-private/types/initializer';
   import type EngineInstance from '@ember/engine/instance';
-  import type { Resolver } from '@ember/-internals/resolver';
+  import type { Resolver } from '@ember/owner';
 
   /**
    * The `Engine` class contains core functionality for both applications and
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
index 31ca3476d4c..09cbd8b53a3 100644
--- a/types/preview/@ember/owner/index.d.ts
+++ b/types/preview/@ember/owner/index.d.ts
@@ -97,6 +97,36 @@ declare module '@ember/owner' {
     readonly class: Factory<T>;
   }
 
+  /**
+   * A record mapping all known items of a given type: if the item is known it
+   * will be `true`; otherwise it will be `false` or `undefined`.
+   */
+  export type KnownForTypeResult<Type extends string> = {
+    [FullName in `${Type}:${string}`]: boolean | undefined;
+  };
+
+  /**
+   * A `Resolver` is the mechanism responsible for looking up code in your
+   * application and converting its naming conventions into the actual classes,
+   * functions, and templates that Ember needs to resolve its dependencies, for
+   * example, what template to render for a given route. It is a system that helps
+   * the app resolve the lookup of JavaScript modules agnostic of what kind of
+   * module system is used, which can be AMD, CommonJS or just plain globals. It
+   * is used to lookup routes, models, components, templates, or anything that is
+   * used in your Ember app.
+   *
+   * This interface represents the contract a custom resolver must implement. Most
+   * apps never need to think about this: the application's resolver is supplied by
+   * `ember-resolver` in the default blueprint.
+   */
+  export interface Resolver {
+    resolve: (name: string) => Factory<object> | object | undefined;
+    knownForType?: <Type extends string>(type: Type) => KnownForTypeResult<Type>;
+    lookupDescription?: (fullName: FullName) => string;
+    makeToString?: (factory: Factory<object>, fullName: FullName) => string;
+    normalize?: (fullName: FullName) => string;
+  }
+
   // Don't export things unless we *intend* to.
   export {};
 }
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index e887be9736a..b106926d952 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -23,8 +23,6 @@
 import './ember';
 import './ember/-private/type-utils';
 
-import './@ember/-internals/resolver';
-
 import './@ember/application';
 import './@ember/application/-private/event-dispatcher';
 import './@ember/application/-private/registry';

From 6a17b8417e7e00e15b2b6f0441703f3c74f3fd0c Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 2 Nov 2022 11:15:54 -0400
Subject: [PATCH 1213/1405] Add v4.4.4 to CHANGELOG

(cherry picked from commit 1dad13a08ae0e1165d83b7d5927e33cd8498c708)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8867e4bba23..155627e826f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.4.4 (November 2, 2022)
+
+- [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties
+
 ## v3.28.10 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`

From 53ca013f87509315200c5969a8f55417af913786 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 2 Nov 2022 11:10:20 -0400
Subject: [PATCH 1214/1405] Add v4.8.1 to CHANGELOG

(cherry picked from commit 9c226d38d41b7845e27bbd34bf463cbcc1a06cec)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 155627e826f..77c91d261a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.8.1 (November 2, 2022)
+
+- [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
+
 ### v4.4.4 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties

From cca036eb575e10676e089f0d8efa01edd474cdb1 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 2 Nov 2022 12:09:07 -0400
Subject: [PATCH 1215/1405] Add v4.9.0-beta.3 to CHANGELOG

(cherry picked from commit 0de013590e92900e5aee664e804ac0fcddf611bd)
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77c91d261a0..b388cab7f20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Ember Changelog
 
+### v4.9.0-beta.3 (November 2, 2022)
+
+- [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
+- [#20233](https://github.com/emberjs/ember.js/pull/20233) [BUGFIX] Include package name in deprecation error message
+- [#20235](https://github.com/emberjs/ember.js/pull/20235) [BUGFIX] Update `@types/node` for TS 4.9 issue
+- [#20238](https://github.com/emberjs/ember.js/pull/20238) [BUGFIX] Update Node.js versions to match support policy
+- [#20244](https://github.com/emberjs/ember.js/pull/20244) [BUGFIX] Expose getComponentTemplate type
+
 ### v4.8.1 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`

From 0580eed5c18cdfcd239ccd475e04a1b4c222963c Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 3 Nov 2022 09:05:21 -0600
Subject: [PATCH 1216/1405] Add v4.8.2 to CHANGELOG

(cherry picked from commit de4ecf64304e04f1543bc1b59cb71ff448b8543c)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b388cab7f20..dc1cf08235b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+### v4.8.2 (November 3, 2022)
+
+- [#20244](https://github.com/emberjs/ember.js/pull/20244) Add missing type for `getComponentTemplate` to preview types
+
 ### v4.9.0-beta.3 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`

From cdd04dab708955e862166ce1a00bb2a74b06f26b Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 7 Nov 2022 20:42:04 -0700
Subject: [PATCH 1217/1405] Add failing type test for `getOwner(Component<S>)`

This catches the scenario where we have a component which actually has
a signature defined:

    class Example extends Component<{ Args: { anyWillDo: true } }> {
      method() {
        getOwner(this); // should be `Owner`, not `| undefined`
      }
    }

Presently, we return `Owner | undefined` instead.
---
 type-tests/preview/@ember/owner-tests.ts | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/type-tests/preview/@ember/owner-tests.ts b/type-tests/preview/@ember/owner-tests.ts
index 15ad10010d0..83be87e1161 100644
--- a/type-tests/preview/@ember/owner-tests.ts
+++ b/type-tests/preview/@ember/owner-tests.ts
@@ -6,7 +6,11 @@ import Owner, {
   Resolver,
   KnownForTypeResult,
 } from '@ember/owner';
+import Component from '@glimmer/component';
 import { expectTypeOf } from 'expect-type';
+// TODO: once we move the runtime export to `@ember/owner`, update this import
+// as well. (That's why it's tested in this module!)
+import { getOwner } from '@ember/application';
 
 // Just a class we can construct in the Factory and FactoryManager tests
 declare class ConstructThis {
@@ -143,6 +147,30 @@ typedStrings.map((aString) => owner.lookup(aString));
 const aConstName = 'type:name';
 expectTypeOf(owner.lookup(aConstName)).toBeUnknown();
 
+// Check handling with Glimmer components carrying a Signature: they should
+// properly resolve to `Owner`, *not* `Owner | undefined`.
+interface Sig<T> {
+  Args: {
+    name: string;
+    age: number;
+    extra: T;
+  };
+  Element: HTMLParagraphElement;
+  Blocks: {
+    default: [greeting: string];
+    extra: [T];
+  };
+}
+
+class ExampleComponent<T> extends Component<Sig<T>> {
+  checkThis() {
+    expectTypeOf(getOwner(this)).toEqualTypeOf<Owner>();
+  }
+}
+
+declare let example: ExampleComponent<string>;
+expectTypeOf(getOwner(example)).toEqualTypeOf<Owner>();
+
 // ----- Minimal further coverage for POJOs ----- //
 // `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
 const Creatable = {

From fc09d4944e031ba0c7350b2249539daf365ef1f9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 7 Nov 2022 20:43:44 -0700
Subject: [PATCH 1218/1405] Fix type definition of `getOwner`, and explain it

Use `GlimmerComponent<any>` instead of plain `GlimmerComponent`, since
the latter resolves to the default `GlimmerComponent<unknown>`, which
ends up being too narrow to resolve correctly with `getOwner` when any
actual signature is applied.

As a bonus, rename `FrameworkObject` in this context to the somewhat
more verbose `KnownFrameworkObject`, which avoids a conflict with the
actual `FrameworkObject` type used internally.
---
 types/preview/@ember/application/index.d.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 9fe576425c9..6637a61ecd3 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -122,7 +122,13 @@ declare module '@ember/application' {
   // whenever we add new base classes to the framework. For example, if we
   // introduce a standalone `Service` or `Route` base class which *does not*
   // extend from `EmberObject`, it will need to be added here.
-  type FrameworkObject = EmberObject | GlimmerComponent;
+  //
+  // NOTE: we use `any` here because we need to make sure *not* to fix the
+  // actual GlimmerComponent type; using `unknown` or `{}` or `never` (the
+  // obvious alternatives here) results in a version which is too narrow, such
+  // that any subclass which applies a signature does not get resolved by the
+  // definition of `getOwner()` below.
+  type KnownFrameworkObject = EmberObject | GlimmerComponent<any>;
 
   /**
    * Framework objects in an Ember application (components, services, routes, etc.)
@@ -131,6 +137,7 @@ declare module '@ember/application' {
    * instantiation and manages its lifetime.
    */
   export function getOwner(object: FrameworkObject): Owner;
+  export function getOwner(object: KnownFrameworkObject): Owner;
   export function getOwner(object: unknown): Owner | undefined;
   /**
    * `setOwner` forces a new owner on a given object instance. This is primarily

From dff8831cdbb5583de443a1859e4f09054687119f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 7 Nov 2022 20:45:44 -0700
Subject: [PATCH 1219/1405] Explain the (un)safety of the type of `getOwner()`

The type for `getOwner()` is *technically* unsafe, but this unsafety is
one which end users will rarely hit in practice and, courtesy of Ember's
current types, is unavoidable if `getOwner(someService)` is to correctly
return `Owner` instead of `Owner | undefined`.

The Typed Ember folks have discussed this point at some length, but I
realized on looking at this to make the changes in the preceding two
commits that we didn't have it committed to the code base anywhere, so
here I am just introducing a long comment explaining it. When we switch
from preview to stable types, this comment should come along!
---
 types/preview/@ember/application/index.d.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 6637a61ecd3..0543ff53508 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -136,7 +136,14 @@ declare module '@ember/application' {
    * objects is the responsibility of an "owner", which handled its
    * instantiation and manages its lifetime.
    */
-  export function getOwner(object: FrameworkObject): Owner;
+  // SAFETY: this first overload is, strictly speaking, *unsafe*. It is possible
+  // to do `let x = EmberObject.create(); getOwner(x);` and the result will *not*
+  // be `Owner` but instead `undefined`. However, that's quite unusual at this
+  // point, and more to the point we cannot actually distinguish a `Service`
+  // subclass from `EmberObject` at this point: `Service` subclasses `EmberObject`
+  // and adds nothing to it. Accordingly, if we want to catch `Service`s with this
+  // (and `getOwner(this)` for some service will definitely be defined!), it has
+  // to be this way. :sigh:
   export function getOwner(object: KnownFrameworkObject): Owner;
   export function getOwner(object: unknown): Owner | undefined;
   /**

From 1467e6c938cb27b7890b892d3a55ab245397e1c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Nov 2022 06:37:15 +0000
Subject: [PATCH 1220/1405] Bump loader-utils from 1.4.0 to 1.4.1

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.1)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 84c8d7c6ff4..05ed6c725ee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7063,18 +7063,11 @@ json5@^0.5.1:
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4= sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
-  dependencies:
-    minimist "^1.2.5"
-
-json5@^2.2.1:
+json5@^2.1.2, json5@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
@@ -7219,9 +7212,9 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
+  integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -8014,11 +8007,16 @@ minimist@^0.2.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
   integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
 
-minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
+minimist@^1.1.1, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+minimist@^1.2.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+
 minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"

From c91a6c66b29d94f63570316a0d873791af6be7d0 Mon Sep 17 00:00:00 2001
From: Azhar Beg <99490876+azhar-beg@users.noreply.github.com>
Date: Wed, 9 Nov 2022 15:09:45 +0530
Subject: [PATCH 1221/1405] Refactor overrides.js

- Replaced `requirementFor` function to arrow function
- Replaced `ef-else` blog to `ternary`, static method `for`.
- Replaced for loop with array method reduce, `printList`.
- Fixed spellings.
---
 lib/overrides.js | 49 ++++++++++++++++++------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/lib/overrides.js b/lib/overrides.js
index 006d9cc1da6..febcbd287b7 100644
--- a/lib/overrides.js
+++ b/lib/overrides.js
@@ -13,11 +13,9 @@ function* walkAddonTree(project, pathToAddon = []) {
   }
 }
 
-function requirementFor(pkg, deps = {}) {
-  return deps[pkg];
-}
+const requirementFor = (pkg, deps = {}) => deps[pkg];
 
-const KNWON_DORMANT_ADDONS = Object.freeze([
+const KNOWN_DORMANT_ADDONS = Object.freeze([
   'ember-angle-bracket-invocation-polyfill',
   'ember-fn-helper-polyfill',
   'ember-in-element-polyfill',
@@ -26,13 +24,11 @@ const KNWON_DORMANT_ADDONS = Object.freeze([
 ]);
 module.exports = class Overrides {
   static for(project, env = process.env) {
-    if (env.EMBER_ENV === 'production') {
-      return new Overrides([]);
-    } else {
-      return new Overrides(Overrides.addonsInfoFor(project), {
-        showAllEmberGlobalDeprecations: env.EMBER_GLOBAL_DEPRECATIONS === 'all',
-      });
-    }
+    return env.EMBER_ENV === 'production'
+      ? new Overrides([])
+      : new Overrides(Overrides.addonsInfoFor(project), {
+          showAllEmberGlobalDeprecations: env.EMBER_GLOBAL_DEPRECATIONS === 'all',
+        });
   }
 
   static *addonsInfoFor(project) {
@@ -62,7 +58,7 @@ module.exports = class Overrides {
           let validRange = validSemverRange(requirement);
           let compatible = validRange ? semver.satisfies('7.26.6', requirement) : true;
           let dormant =
-            KNWON_DORMANT_ADDONS.includes(addon.parent.name) ||
+            KNOWN_DORMANT_ADDONS.includes(addon.parent.name) ||
             (addon.parent._fileSystemInfo
               ? addon.parent._fileSystemInfo().hasJSFiles === false
               : false);
@@ -88,18 +84,13 @@ module.exports = class Overrides {
   }
 
   static printList(list, indent = '') {
-    let output = '';
-
-    for (let item of list) {
-      if (Array.isArray(item)) {
-        output += `${indent}* ${item[0]}\n`;
-        output += Overrides.printList(item[1], indent + '  ');
-      } else {
-        output += `${indent}* ${item}\n`;
+    return list.reduce((listString, listItem) => {
+      if (Array.isArray(listItem)) {
+        listString += `${indent}* ${listItem[0]}\n`;
+        listString += Overrides.printList(listItem[1], indent + '  ');
       }
-    }
-
-    return output;
+      listString += `${indent}* ${listItem}\n`;
+    }, '');
   }
 
   constructor(addonsInfo, options = {}) {
@@ -268,10 +259,10 @@ module.exports = class Overrides {
         details.push(`Depends on ember-cli-babel@${info.requirement}`);
 
         for (let info of groupedByVersion[version][parent]) {
-          let adddedBy = info.path.slice(0, -1);
+          let addedBy = info.path.slice(0, -1);
 
-          if (adddedBy.length) {
-            details.push(`Added by ${adddedBy.join(' > ')}`);
+          if (addedBy.length) {
+            details.push(`Added by ${addedBy.join(' > ')}`);
           }
         }
 
@@ -310,11 +301,7 @@ module.exports = class Overrides {
   }
 
   get buildTimeWarning() {
-    if (this.hasBuildTimeWarning) {
-      return `[DEPRECATION] ${this.globalMessage}`;
-    } else {
-      return '';
-    }
+    return this.hasBuildTimeWarning ? `[DEPRECATION] ${this.globalMessage}` : '';
   }
 
   toTree() {

From 720c3021213ff8e530c809d37ec3493899448681 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 4 Nov 2022 14:26:11 -0700
Subject: [PATCH 1222/1405] Improve types for Ember Arrays

---
 .../-internals/glimmer/lib/utils/iterator.ts  |   5 +-
 .../-internals/utils/lib/ember-array.ts       |   4 +-
 packages/@ember/-internals/utils/types.ts     |   6 +
 packages/@ember/array/index.ts                | 214 ++++++++++++++++--
 packages/@ember/array/type-tests/index.ts     |  58 ++---
 packages/@ember/array/type-tests/mutable.ts   |  40 ++--
 packages/@ember/debug/data-adapter.ts         |   2 +-
 type-tests/preview/@ember/array-test/array.ts |  11 +-
 type-tests/preview/ember/array.ts             |  17 +-
 .../preview/ember/ember-module-tests.ts       |  10 +-
 type-tests/preview/ember/ember-tests.ts       |  17 +-
 .../@ember/array/-private/native-array.d.ts   | 166 +++++++++++++-
 types/preview/@ember/array/index.d.ts         |  20 +-
 types/preview/@ember/array/mutable.d.ts       |   8 +-
 types/preview/ember/-private/type-utils.d.ts  |   8 +-
 15 files changed, 461 insertions(+), 125 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 6cb3d1d5dd5..3a8c8d347ad 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -5,6 +5,7 @@ import type { Option } from '@glimmer/interfaces';
 import type { IteratorDelegate } from '@glimmer/reference';
 import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
 import { EachInWrapper } from '../helpers/each-in';
+import type { NativeArray } from '@ember/array';
 
 export default function toIterator(iterable: unknown): Option<IteratorDelegate> {
   if (iterable instanceof EachInWrapper) {
@@ -100,11 +101,11 @@ class ArrayIterator extends BoundedIterator {
 }
 
 class EmberArrayIterator extends BoundedIterator {
-  static from(iterable: EmberArray<unknown>) {
+  static from(iterable: EmberArray<unknown> | NativeArray<unknown>) {
     return iterable.length > 0 ? new this(iterable) : null;
   }
 
-  constructor(private array: EmberArray<unknown>) {
+  constructor(private array: EmberArray<unknown> | NativeArray<unknown>) {
     super(array.length);
   }
 
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/-internals/utils/lib/ember-array.ts
index aadea305ec7..3c3d2bc2deb 100644
--- a/packages/@ember/-internals/utils/lib/ember-array.ts
+++ b/packages/@ember/-internals/utils/lib/ember-array.ts
@@ -1,4 +1,4 @@
-import type EmberArray from '@ember/array';
+import type { EmberArrayLike } from '@ember/array';
 import { _WeakSet } from '@glimmer/util';
 
 const EMBER_ARRAYS = new _WeakSet();
@@ -7,6 +7,6 @@ export function setEmberArray(obj: object) {
   EMBER_ARRAYS.add(obj);
 }
 
-export function isEmberArray(obj: unknown): obj is EmberArray<unknown> {
+export function isEmberArray(obj: unknown): obj is EmberArrayLike<unknown> {
   return EMBER_ARRAYS.has(obj as object);
 }
diff --git a/packages/@ember/-internals/utils/types.ts b/packages/@ember/-internals/utils/types.ts
index 461c513d5dc..fd72f5ebd52 100644
--- a/packages/@ember/-internals/utils/types.ts
+++ b/packages/@ember/-internals/utils/types.ts
@@ -4,4 +4,10 @@ export type MethodNamesOf<T> = {
   [K in keyof T]: T[K] extends AnyFn ? K : never;
 }[keyof T];
 
+export type MethodsOf<O> = Pick<O, MethodNamesOf<O>>;
+
+export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
+
+export type MethodReturns<T, M extends MethodNamesOf<T>> = ReturnType<MethodsOf<T>[M]>;
+
 export type OmitFirst<F> = F extends [any, ...infer R] ? R : [];
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index a5a57064f72..638b2cc0170 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -20,12 +20,12 @@ import MutableEnumerable from '@ember/enumerable/mutable';
 import { compare, typeOf } from '@ember/utils';
 import { ENV } from '@ember/-internals/environment';
 import Observable from '@ember/object/observable';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { MethodNamesOf, MethodParams, MethodReturns } from '@ember/-internals/utils/types';
 import type { ComputedPropertyCallback } from '@ember/-internals/metal';
 
 export { makeArray } from '@ember/-internals/utils';
 
-type Value<T, K extends string> = K extends keyof T ? T[K] : unknown;
+export type EmberArrayLike<T> = EmberArray<T> | NativeArray<T>;
 
 const EMPTY_ARRAY = Object.freeze([] as const);
 
@@ -319,7 +319,8 @@ interface EmberArray<T> extends Enumerable {
     @return this
     @public
   */
-  '[]': this;
+  get '[]'(): this;
+  set '[]'(newValue: T[] | EmberArray<T>);
   /**
     The first object in the array, or `undefined` if the array is empty.
 
@@ -515,7 +516,7 @@ interface EmberArray<T> extends Enumerable {
     @return {Array} The mapped array.
     @public
   */
-  getEach<K extends string>(key: K): NativeArray<Value<T, K>>;
+  getEach<K extends keyof T>(key: K): NativeArray<T[K]>;
   /**
     Sets the value on the named property for each member. This is more
     ergonomic than using other methods defined on this helper. If the object
@@ -535,7 +536,7 @@ interface EmberArray<T> extends Enumerable {
     @return {Object} receiver
     @public
   */
-  setEach<K extends string>(key: K, value: Value<T, K>): this;
+  setEach<K extends keyof T>(key: K, value: T[K]): this;
   /**
     Maps all of the items in the enumeration to another value, returning
     a new array. This method corresponds to `map()` defined in JavaScript 1.6.
@@ -593,7 +594,8 @@ interface EmberArray<T> extends Enumerable {
     @return {Array} The mapped array.
     @public
   */
-  mapBy<K extends string>(key: K): NativeArray<Value<T, K>>;
+  mapBy<K extends keyof T>(key: K): NativeArray<T[K]>;
+  mapBy(key: string): NativeArray<unknown>;
   /**
     Returns a new array with all of the items in the enumeration that the provided
     callback function returns true for. This method corresponds to [Array.prototype.filter()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter).
@@ -746,10 +748,6 @@ interface EmberArray<T> extends Enumerable {
     @public
   */
   rejectBy(key: string, value?: unknown): NativeArray<T>;
-  find<S extends T, Target = void>(
-    predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
-    thisArg?: Target
-  ): S | undefined;
   /**
     Returns the first item in the array for which the callback returns true.
     This method is similar to the `find()` method defined in ECMAScript 2015.
@@ -792,6 +790,10 @@ interface EmberArray<T> extends Enumerable {
     @return {Object} Found item or `undefined`.
     @public
   */
+  find<S extends T, Target = void>(
+    predicate: (this: void, value: T, index: number, obj: T[]) => value is S,
+    thisArg?: Target
+  ): S | undefined;
   find<Target = void>(
     callback: (this: Target, item: T, index: number, arr: this) => unknown,
     target?: Target
@@ -824,7 +826,8 @@ interface EmberArray<T> extends Enumerable {
     @return {Object} found item or `undefined`
     @public
   */
-  findBy<K extends string>(key: K, value?: Value<T, K>): T | undefined;
+  findBy<K extends keyof T>(key: K, value?: T[K]): T | undefined;
+  findBy(key: string, value?: unknown): T | undefined;
   /**
     Returns `true` if the passed function returns true for every item in the
     enumeration. This corresponds with the `Array.prototype.every()` method defined in ES5.
@@ -904,7 +907,8 @@ interface EmberArray<T> extends Enumerable {
     @since 1.3.0
     @public
   */
-  isEvery<K extends string>(key: K, value?: Value<T, K>): boolean;
+  isEvery<K extends keyof T>(key: K, value?: T[K]): boolean;
+  isEvery(key: string, value?: unknown): boolean;
   /**
     The any() method executes the callback function once for each element
     present in the array until it finds the one where callback returns a truthy
@@ -972,7 +976,8 @@ interface EmberArray<T> extends Enumerable {
     @since 1.3.0
     @public
   */
-  isAny<K extends string>(key: K, value?: Value<T, K>): boolean;
+  isAny<K extends keyof T>(key: K, value?: T[K]): boolean;
+  isAny(key: string, value?: unknown): boolean;
   /**
     This will combine the values of the array into a single value. It
     is a useful way to collect a summary value from an array. This
@@ -1061,10 +1066,10 @@ interface EmberArray<T> extends Enumerable {
     @return {Array} return values from calling invoke.
     @public
   */
-  invoke<K extends string>(
-    methodName: K,
-    ...args: Value<T, K> extends AnyFn ? Parameters<Value<T, K>> : unknown[]
-  ): NativeArray<Value<T, K> extends AnyFn ? ReturnType<Value<T, K>> : unknown>;
+  invoke<M extends MethodNamesOf<T>>(
+    methodName: M,
+    ...args: MethodParams<T, M>
+  ): NativeArray<MethodReturns<T, M>>;
   /**
     Simply converts the object into a genuine array. The order is not
     guaranteed. Corresponds to the method implemented by Prototype.
@@ -1086,7 +1091,7 @@ interface EmberArray<T> extends Enumerable {
     @return {Array} the array without null and undefined elements.
     @public
   */
-  compact(): NativeArray<Exclude<T, null>>;
+  compact(): NativeArray<NonNullable<T>>;
   /**
     Used to determine if the array contains the passed object.
     Returns `true` if found, `false` otherwise.
@@ -1176,6 +1181,7 @@ interface EmberArray<T> extends Enumerable {
     @public
   */
   uniqBy(key: string): NativeArray<T>;
+  uniqBy(callback: (value: T) => unknown): NativeArray<T>;
   /**
     Returns a new array that excludes the passed value. The default
     implementation returns an array regardless of the receiver type.
@@ -1567,7 +1573,7 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     @return object same object passed as a param
     @public
   */
-  pushObject(obj: T): this;
+  pushObject(obj: T): T;
   /**
     Add the objects in the passed array to the end of the array. Defers
     notifying observers of the change until all objects are added.
@@ -1599,7 +1605,7 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     @return object
     @public
   */
-  popObject(): T | undefined;
+  popObject(): T | null | undefined;
   /**
     Shift an object from start of array or nil if none are left. Works just
     like `shift()` but it is KVO-compliant.
@@ -1632,7 +1638,7 @@ interface MutableArray<T> extends EmberArray<T>, MutableEnumerable {
     @return object same object passed as a param
     @public
   */
-  unshiftObject(object: T): this;
+  unshiftObject(object: T): T;
   /**
     Adds the named objects to the beginning of the array. Defers notifying
     observers until all objects have been added.
@@ -1892,6 +1898,167 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
 /**
 @module ember
 */
+
+type AnyArray<T> = EmberArray<T> | Array<T>;
+
+/**
+ * The final definition of NativeArray removes all native methods. This is the list of removed methods
+ * when run in Chrome 106.
+ */
+type IGNORED_MUTABLE_ARRAY_METHODS =
+  | 'length'
+  | 'slice'
+  | 'indexOf'
+  | 'lastIndexOf'
+  | 'forEach'
+  | 'map'
+  | 'filter'
+  | 'find'
+  | 'every'
+  | 'reduce'
+  | 'includes';
+
+/**
+ * These additional items must be redefined since `Omit` causes methods that return `this` to return the
+ * type at the time of the Omit.
+ */
+type RETURN_SELF_ARRAY_METHODS =
+  | '[]'
+  | 'clear'
+  | 'insertAt'
+  | 'removeAt'
+  | 'pushObjects'
+  | 'unshiftObjects'
+  | 'reverseObjects'
+  | 'setObjects'
+  | 'removeObject'
+  | 'removeObjects'
+  | 'addObject'
+  | 'addObjects'
+  | 'setEach';
+
+// This is the same as MutableArray, but removes the actual native methods that exist on Array.prototype.
+interface MutableArrayWithoutNative<T>
+  extends Omit<MutableArray<T>, IGNORED_MUTABLE_ARRAY_METHODS | RETURN_SELF_ARRAY_METHODS> {
+  /**
+   * Remove all elements from the array. This is useful if you
+   * want to reuse an existing array without having to recreate it.
+   */
+  clear(): this;
+  /**
+   * This will use the primitive `replace()` method to insert an object at the
+   * specified index.
+   */
+  insertAt(idx: number, object: T): this;
+  /**
+   * Remove an object at the specified index using the `replace()` primitive
+   * method. You can pass either a single index, or a start and a length.
+   */
+  removeAt(start: number, len?: number): this;
+  /**
+   * Add the objects in the passed numerable to the end of the array. Defers
+   * notifying observers of the change until all objects are added.
+   */
+  pushObjects(objects: AnyArray<T>): this;
+  /**
+   * Adds the named objects to the beginning of the array. Defers notifying
+   * observers until all objects have been added.
+   */
+  unshiftObjects(objects: AnyArray<T>): this;
+  /**
+   * Reverse objects in the array. Works just like `reverse()` but it is
+   * KVO-compliant.
+   */
+  reverseObjects(): this;
+  /**
+   * Replace all the receiver's content with content of the argument.
+   * If argument is an empty array receiver will be cleared.
+   */
+  setObjects(objects: AnyArray<T>): this;
+  /**
+    Remove all occurrences of an object in the array.
+
+    ```javascript
+    let cities = ['Chicago', 'Berlin', 'Lima', 'Chicago'];
+
+    cities.removeObject('Chicago');  // ['Berlin', 'Lima']
+    cities.removeObject('Lima');     // ['Berlin']
+    cities.removeObject('Tokyo')     // ['Berlin']
+    ```
+
+    @method removeObject
+    @param {*} obj object to remove
+    @return {EmberArray} receiver
+    @public
+  */
+  removeObject(object: T): this;
+  /**
+   * Removes each object in the passed array from the receiver.
+   */
+  removeObjects(objects: AnyArray<T>): this;
+  /**
+    Push the object onto the end of the array if it is not already
+    present in the array.
+
+    ```javascript
+    let cities = ['Chicago', 'Berlin'];
+
+    cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
+    cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
+    ```
+
+    @method addObject
+    @param {*} obj object to add, if not already present
+    @return {EmberArray} receiver
+    @public
+  */
+  addObject(obj: T): this;
+  /**
+   * Adds each object in the passed enumerable to the receiver.
+   */
+  addObjects(objects: AnyArray<T>): this;
+  /**
+    Sets the value on the named property for each member. This is more
+    ergonomic than using other methods defined on this helper. If the object
+    implements Observable, the value will be changed to `set(),` otherwise
+    it will be set directly. `null` objects are skipped.
+
+    ```javascript
+    let people = [{name: 'Joe'}, {name: 'Matt'}];
+
+    people.setEach('zipCode', '10011');
+    // [{name: 'Joe', zipCode: '10011'}, {name: 'Matt', zipCode: '10011'}];
+    ```
+
+    @method setEach
+    @param {String} key The key to set
+    @param {Object} value The object to set
+    @return {Object} receiver
+    @public
+  */
+  setEach<K extends keyof T>(key: K, value: T[K]): this;
+  /**
+    This is the handler for the special array content property. If you get
+    this property, it will return this. If you set this property to a new
+    array, it will replace the current content.
+
+    ```javascript
+    let peopleToMoon = ['Armstrong', 'Aldrin'];
+
+    peopleToMoon.get('[]'); // ['Armstrong', 'Aldrin']
+
+    peopleToMoon.set('[]', ['Collins']); // ['Collins']
+    peopleToMoon.get('[]'); // ['Collins']
+    ```
+
+    @property []
+    @return this
+    @public
+  */
+  get '[]'(): this;
+  set '[]'(newValue: T[] | this);
+}
+
 /**
   The NativeArray mixin contains the properties needed to make the native
   Array support MutableArray and all of its dependent APIs. Unless you
@@ -1904,10 +2071,7 @@ const MutableArray = Mixin.create(EmberArray, MutableEnumerable, {
   @uses Observable
   @public
 */
-interface NativeArray<T>
-  extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
-    MutableArray<T>,
-    Observable {}
+interface NativeArray<T> extends Array<T>, Observable, MutableArrayWithoutNative<T> {}
 
 let NativeArray = Mixin.create(MutableArray, Observable, {
   objectAt(idx: number) {
diff --git a/packages/@ember/array/type-tests/index.ts b/packages/@ember/array/type-tests/index.ts
index a15c8c150ef..7e890a44587 100644
--- a/packages/@ember/array/type-tests/index.ts
+++ b/packages/@ember/array/type-tests/index.ts
@@ -25,8 +25,11 @@ class Target {
 
 let target = new Target();
 
-expectTypeOf(arr).toMatchTypeOf<EmberArray<Foo>>();
-expectTypeOf(arr).toMatchTypeOf<MutableArray<Foo>>();
+// NativeArray does not exactly extend the interface of EmberArray and MutableArray,
+// since native methods are not overwritten.
+expectTypeOf(arr).not.toMatchTypeOf<EmberArray<Foo>>();
+expectTypeOf(arr).not.toMatchTypeOf<MutableArray<Foo>>();
+
 expectTypeOf(arr).toEqualTypeOf<NativeArray<Foo>>();
 
 expectTypeOf(arr.length).toEqualTypeOf<number>();
@@ -37,9 +40,9 @@ expectTypeOf(arr.firstObject).toEqualTypeOf<Foo | undefined>();
 
 expectTypeOf(arr.lastObject).toEqualTypeOf<Foo | undefined>();
 
-expectTypeOf(arr.slice()).toEqualTypeOf<NativeArray<Foo>>();
-expectTypeOf(arr.slice(1)).toEqualTypeOf<NativeArray<Foo>>();
-expectTypeOf(arr.slice(1, 2)).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(arr.slice()).toEqualTypeOf<Foo[]>();
+expectTypeOf(arr.slice(1)).toEqualTypeOf<Foo[]>();
+expectTypeOf(arr.slice(1, 2)).toEqualTypeOf<Foo[]>();
 
 expectTypeOf(arr.indexOf(new Foo())).toEqualTypeOf<number>();
 // @ts-expect-error checks param type
@@ -49,7 +52,7 @@ expectTypeOf(arr.lastIndexOf(new Foo())).toEqualTypeOf<number>();
 // @ts-expect-error checks param type
 arr.lastIndexOf('invalid');
 
-expectTypeOf(arr.forEach((item: Foo) => String(item))).toEqualTypeOf(arr);
+expectTypeOf(arr.forEach((item: Foo) => String(item))).toEqualTypeOf<void>();
 
 arr.forEach((item, index, arr) => {
   expectTypeOf(this).toEqualTypeOf<undefined>();
@@ -58,18 +61,19 @@ arr.forEach((item, index, arr) => {
   expectTypeOf(arr).toEqualTypeOf(arr);
 });
 arr.forEach(function (_item) {
-  expectTypeOf(this).toEqualTypeOf(target);
+  // No-op
 }, target);
 
 expectTypeOf(arr.getEach('bar')).toEqualTypeOf<NativeArray<number>>();
-expectTypeOf(arr.getEach('missing')).toEqualTypeOf<NativeArray<unknown>>();
+// @ts-expect-error Unknown property
+arr.getEach('missing');
 
 expectTypeOf(arr.setEach('bar', 2)).toEqualTypeOf(arr);
-// @ts-expect-error string is not assignable to bar
+// @ts-expect-error Invalid value
 arr.setEach('bar', 'string');
 
-// Can set unknown property
-expectTypeOf(arr.setEach('missing', 'anything')).toEqualTypeOf(arr);
+// @ts-expect-error Unknown property
+arr.setEach('missing', 'anything');
 
 let mapped = arr.map((item, index, arr) => {
   expectTypeOf(item).toEqualTypeOf<Foo>();
@@ -77,10 +81,10 @@ let mapped = arr.map((item, index, arr) => {
   expectTypeOf(arr).toEqualTypeOf(arr);
   return 1;
 });
-expectTypeOf(mapped).toEqualTypeOf<NativeArray<number>>();
+expectTypeOf(mapped).toEqualTypeOf<number[]>();
 
 arr.map(function (_item) {
-  expectTypeOf(this).toEqualTypeOf(target);
+  return true;
 }, target);
 
 expectTypeOf(arr.mapBy('bar')).toEqualTypeOf<NativeArray<number>>();
@@ -92,9 +96,8 @@ let filtered = arr.filter((item, index, arr) => {
   expectTypeOf(arr).toEqualTypeOf(arr);
   return true;
 });
-expectTypeOf(filtered).toEqualTypeOf<NativeArray<Foo>>();
+expectTypeOf(filtered).toEqualTypeOf<Foo[]>();
 arr.filter(function (_item) {
-  expectTypeOf(this).toEqualTypeOf(target);
   return true;
 }, target);
 
@@ -118,9 +121,11 @@ expectTypeOf(arr.rejectBy('missing')).toEqualTypeOf<NativeArray<Foo>>();
 
 expectTypeOf(arr.findBy('bar')).toEqualTypeOf<Foo | undefined>();
 arr.findBy('bar', 1);
-// @ts-expect-error value has incorrect type
+// TODO: Ideally we'd mark the value as being invalid
 arr.findBy('bar', 'invalid');
-arr.findBy('missing', 'whatever');
+// Allows any value to be passed to an unkown property
+expectTypeOf(arr.findBy('missing', 'whatever')).toEqualTypeOf<Foo | undefined>();
+expectTypeOf(arr.findBy('bar')).toEqualTypeOf<Foo | undefined>();
 
 let isEvery = arr.every((item, index, arr) => {
   expectTypeOf(item).toEqualTypeOf<Foo>();
@@ -130,15 +135,15 @@ let isEvery = arr.every((item, index, arr) => {
 });
 expectTypeOf(isEvery).toEqualTypeOf<boolean>();
 arr.every(function (_item) {
-  expectTypeOf(this).toEqualTypeOf(target);
   return true;
 }, target);
 
 expectTypeOf(arr.isEvery('bar')).toEqualTypeOf<boolean>();
 arr.isEvery('bar', 1);
-// @ts-expect-error value has incorrect type
+// TODO: Ideally we'd mark the value as being invalid
 arr.isEvery('bar', 'invalid');
-arr.isEvery('missing', 'whatever');
+// Allows any value to be passed to an unknown property
+expectTypeOf(arr.isEvery('missing', 'whatever')).toEqualTypeOf<boolean>();
 
 let isAny = arr.any((item, index, arr) => {
   expectTypeOf(item).toEqualTypeOf<Foo>();
@@ -154,9 +159,10 @@ arr.any(function (_item) {
 
 expectTypeOf(arr.isAny('bar')).toEqualTypeOf<boolean>();
 arr.isAny('bar', 1);
-// @ts-expect-error value has incorrect type
+// TODO: Ideally we'd mark the value as being invalid
 arr.isAny('bar', 'invalid');
-arr.isAny('missing', 'whatever');
+// Allows any value to be passed to an unknown property
+expectTypeOf(arr.isAny('missing', 'whatever')).toEqualTypeOf<boolean>();
 
 let reduced = arr.reduce((summation, item, index, arr) => {
   expectTypeOf(summation).toEqualTypeOf<number>();
@@ -166,16 +172,14 @@ let reduced = arr.reduce((summation, item, index, arr) => {
   return 1;
 }, 1);
 expectTypeOf(reduced).toEqualTypeOf<number>();
-// NOTE: This doesn't match native behavior and is a bit weird
-expectTypeOf(arr.reduce((summation, _item) => summation)).toEqualTypeOf<unknown>();
+expectTypeOf(arr.reduce((summation, _item) => summation)).toEqualTypeOf<Foo>();
 
 expectTypeOf(arr.invoke('hi')).toEqualTypeOf<NativeArray<string>>();
 expectTypeOf(arr.invoke('withArgs', 1, 'two')).toEqualTypeOf<NativeArray<string>>();
 // @ts-expect-error Doesn't allow calling with invalid args
 arr.invoke('withArgs', 'invalid');
-expectTypeOf(arr.invoke('missing')).toEqualTypeOf<NativeArray<unknown>>();
-// Currently, args passed to unrecognized methods are ignored
-arr.invoke('missing', 'invalid');
+// @ts-expect-error Doesn't allow calling with invalid method
+arr.invoke('missing');
 
 expectTypeOf(arr.toArray()).toEqualTypeOf<Foo[]>();
 
diff --git a/packages/@ember/array/type-tests/mutable.ts b/packages/@ember/array/type-tests/mutable.ts
index 4672c0be375..db1a55e73a3 100644
--- a/packages/@ember/array/type-tests/mutable.ts
+++ b/packages/@ember/array/type-tests/mutable.ts
@@ -1,63 +1,67 @@
-import type MutableArray from '@ember/array/mutable';
-import { A } from '@ember/array';
+import MutableArray from '@ember/array/mutable';
 
 import { expectTypeOf } from 'expect-type';
 
-class Foo {}
+class Foo {
+  constructor(public name: string) {}
+}
 
-let foo = new Foo();
+let foo = new Foo('test');
 
-let arr = A([foo]);
+let originalArr = [foo];
+// This is not really the ideal way to set things up.
+MutableArray.apply(originalArr);
+let arr = originalArr as unknown as MutableArray<Foo>;
 
 expectTypeOf(arr).toMatchTypeOf<MutableArray<Foo>>();
 
 expectTypeOf(arr.replace(1, 1, [foo])).toEqualTypeOf<void>();
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.replace(1, 1, ['invalid']);
 
 expectTypeOf(arr.clear()).toEqualTypeOf(arr);
 
 expectTypeOf(arr.insertAt(1, foo)).toEqualTypeOf(arr);
 
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.insertAt(1, 'invalid');
 
 expectTypeOf(arr.removeAt(1, 1)).toEqualTypeOf(arr);
 
-expectTypeOf(arr.pushObject(foo)).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+expectTypeOf(arr.pushObject(foo)).toEqualTypeOf(foo);
+// @ts-expect-error invalid item
 arr.pushObject('invalid');
 
 expectTypeOf(arr.pushObjects([foo])).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.pushObjects(['invalid']);
 
-expectTypeOf(arr.popObject()).toEqualTypeOf<Foo | undefined>();
+expectTypeOf(arr.popObject()).toEqualTypeOf<Foo | null | undefined>();
 
 expectTypeOf(arr.shiftObject()).toEqualTypeOf<Foo | null | undefined>();
 
-expectTypeOf(arr.unshiftObject(foo)).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+expectTypeOf(arr.unshiftObject(foo)).toEqualTypeOf(foo);
+// @ts-expect-error invalid item
 arr.unshiftObject('invalid');
 
 expectTypeOf(arr.unshiftObjects([foo])).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.unshiftObjects(['invalid']);
 
 expectTypeOf(arr.reverseObjects()).toEqualTypeOf(arr);
 
 expectTypeOf(arr.setObjects([foo])).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.setObjects(['invalid']);
 
 expectTypeOf(arr.removeObject(foo)).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.removeObject('invalid');
 
 expectTypeOf(arr.addObject(foo)).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.addObject('invalid');
 
 expectTypeOf(arr.addObjects([foo])).toEqualTypeOf(arr);
-// TODO: Why doesn't this fail?
+// @ts-expect-error invalid item
 arr.addObjects(['invalid']);
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index a7cf8ace322..5b3cbcce6c3 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -544,7 +544,7 @@ export default class DataAdapter<T> extends EmberObject {
     @method getModelTypes
     @return {Array} Array of model types.
   */
-  getModelTypes(): NativeArray<{ klass: unknown; name: string }> {
+  getModelTypes(): Array<{ klass: unknown; name: string }> {
     let containerDebugAdapter = this.containerDebugAdapter;
 
     let stringTypes = containerDebugAdapter.canCatalogEntriesByType('model')
diff --git a/type-tests/preview/@ember/array-test/array.ts b/type-tests/preview/@ember/array-test/array.ts
index 8f7df294f56..e9ad363e0f7 100755
--- a/type-tests/preview/@ember/array-test/array.ts
+++ b/type-tests/preview/@ember/array-test/array.ts
@@ -3,6 +3,7 @@ import type Array from '@ember/array';
 import { A } from '@ember/array';
 import type MutableArray from '@ember/array/mutable';
 import { expectTypeOf } from 'expect-type';
+import NativeArray from '@ember/array/-private/native-array';
 
 class Person extends EmberObject {
   name = '';
@@ -19,20 +20,18 @@ expectTypeOf(people.get('lastObject')).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.get('firstObject')).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.isAny('isHappy')).toBeBoolean();
 expectTypeOf(people.isAny('isHappy', false)).toBeBoolean();
-// @ts-expect-error -- string != boolean
+// TODO: Ideally we'd mark the value as being invalid
 people.isAny('isHappy', 'false');
 
 expectTypeOf(people.objectAt(0)).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.objectsAt([1, 2, 3])).toEqualTypeOf<Array<Person | undefined>>();
 
 expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Person[]>();
-expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<MutableArray<Person>>();
+expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<NativeArray<Person>>();
 expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Person[]>();
-expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<MutableArray<Person>>();
+expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<NativeArray<Person>>();
+expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<Person[]>();
 expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<Person[]>();
-expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<
-  MutableArray<Person>
->();
 
 expectTypeOf(people.get('[]')).toEqualTypeOf<typeof people>();
 expectTypeOf(people.get('[]').get('firstObject')).toEqualTypeOf<Person | undefined>();
diff --git a/type-tests/preview/ember/array.ts b/type-tests/preview/ember/array.ts
index b5db931246a..bfb575e38b4 100755
--- a/type-tests/preview/ember/array.ts
+++ b/type-tests/preview/ember/array.ts
@@ -16,20 +16,18 @@ expectTypeOf(people.get('lastObject')).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.get('firstObject')).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.isAny('isHappy')).toBeBoolean();
 expectTypeOf(people.isAny('isHappy', false)).toBeBoolean();
-// @ts-expect-error
+// TODO: Ideally we'd mark the value as being invalid
 people.isAny('isHappy', 'false');
 
 expectTypeOf(people.objectAt(0)).toEqualTypeOf<Person | undefined>();
 expectTypeOf(people.objectsAt([1, 2, 3])).toEqualTypeOf<Ember.Array<Person | undefined>>();
 
 expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Person[]>();
-expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Ember.MutableArray<Person>>();
+expectTypeOf(people.filterBy('isHappy')).toMatchTypeOf<Ember.NativeArray<Person>>();
 expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Person[]>();
-expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Ember.MutableArray<Person>>();
+expectTypeOf(people.rejectBy('isHappy')).toMatchTypeOf<Ember.NativeArray<Person>>();
+expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<Person[]>();
 expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<Person[]>();
-expectTypeOf(people.filter((person) => person.get('name') === 'Yehuda')).toMatchTypeOf<
-  Ember.MutableArray<Person>
->();
 
 expectTypeOf(people.get('[]')).toEqualTypeOf<typeof people>();
 expectTypeOf(people.get('[]').get('firstObject')).toEqualTypeOf<Person | undefined>();
@@ -48,15 +46,14 @@ if (first) {
   expectTypeOf(first.get('isHappy')).toBeBoolean();
 }
 
-const letters: Ember.Array<string> = Ember.A(['a', 'b', 'c']);
+const letters: Ember.NativeArray<string> = Ember.A(['a', 'b', 'c']);
 const codes = letters.map((item, index, array) => {
   expectTypeOf(item).toBeString();
   expectTypeOf(index).toBeNumber();
-  expectTypeOf(array).toEqualTypeOf<Ember.Array<string>>();
+  expectTypeOf(array).toEqualTypeOf<string[]>();
   return item.charCodeAt(0);
 });
-expectTypeOf(codes).toMatchTypeOf<number[]>();
-expectTypeOf(codes).toEqualTypeOf<Ember.NativeArray<number>>();
+expectTypeOf(codes).toEqualTypeOf<number[]>();
 
 const value = '1,2,3';
 const filters = Ember.A(value.split(','));
diff --git a/type-tests/preview/ember/ember-module-tests.ts b/type-tests/preview/ember/ember-module-tests.ts
index fd01363e59a..98d074222d3 100644
--- a/type-tests/preview/ember/ember-module-tests.ts
+++ b/type-tests/preview/ember/ember-module-tests.ts
@@ -153,7 +153,7 @@ expectTypeOf(Ember.Application.create()).toEqualTypeOf<Ember.Application>();
 expectTypeOf(new Ember.ApplicationInstance()).toEqualTypeOf<Ember.ApplicationInstance>();
 expectTypeOf(Ember.ApplicationInstance.create()).toEqualTypeOf<Ember.ApplicationInstance>();
 // Ember.Array
-const a1: Ember.Array<string> = Ember.A([]);
+const a1: Ember.NativeArray<string> = Ember.A([]);
 // @ts-expect-error
 const a2: Ember.Array<string> = {};
 // Ember.ArrayProxy
@@ -232,13 +232,13 @@ class UsesMixin extends Ember.Object {
   }
 }
 // Ember.MutableArray
-const ma1: Ember.MutableArray<string> = Ember.A(['money', 'in', 'the', 'bananna', 'stand']);
-expectTypeOf(ma1.addObject('!')).toBeString();
-// @ts-expect-error
+const ma1: Ember.NativeArray<string> = Ember.A(['money', 'in', 'the', 'bananna', 'stand']);
+expectTypeOf(ma1.addObject('!')).toMatchTypeOf(ma1);
+// TODO: Ideally we'd mark the value as being invalid
 ma1.filterBy('');
 expectTypeOf(ma1.firstObject).toEqualTypeOf<string | undefined>();
 expectTypeOf(ma1.lastObject).toEqualTypeOf<string | undefined>();
-const ma2: Ember.MutableArray<{ name: string }> = Ember.A([
+const ma2: Ember.NativeArray<{ name: string }> = Ember.A([
   { name: 'chris' },
   { name: 'dan' },
   { name: 'james' },
diff --git a/type-tests/preview/ember/ember-tests.ts b/type-tests/preview/ember/ember-tests.ts
index 18bfa6cccc7..e9c2e013897 100755
--- a/type-tests/preview/ember/ember-tests.ts
+++ b/type-tests/preview/ember/ember-tests.ts
@@ -112,14 +112,13 @@ people.invoke('sayHello');
 // @ts-expect-error
 people.invoke('name');
 
-type Arr = Ember.NativeArray<
-  Ember.Object & {
-    name?: string;
-  }
->;
-const arr: Arr = Ember.A([Ember.Object.create(), Ember.Object.create()]);
-expectTypeOf(arr.setEach('name', 'unknown')).toEqualTypeOf<void>();
-expectTypeOf(arr.setEach('name', undefined)).toEqualTypeOf<void>();
+class Obj extends Ember.Object {
+  name?: string;
+}
+
+const arr: Ember.NativeArray<Obj> = Ember.A([Ember.Object.create(), Ember.Object.create()]);
+expectTypeOf(arr.setEach('name', 'unknown')).toEqualTypeOf(arr);
+expectTypeOf(arr.setEach('name', undefined)).toEqualTypeOf(arr);
 expectTypeOf(arr.getEach('name')).toEqualTypeOf<Ember.NativeArray<string | undefined>>();
 // @ts-expect-error
 arr.setEach('age', 123);
@@ -141,7 +140,7 @@ people2.every(isHappy);
 people2.any(isHappy);
 people2.isEvery('isHappy');
 people2.isEvery('isHappy', true);
-// @ts-expect-error
+// TODO: Ideally we'd mark the value as being invalid
 people2.isAny('isHappy', 'true');
 people2.isAny('isHappy', true);
 people2.isAny('isHappy');
diff --git a/types/preview/@ember/array/-private/native-array.d.ts b/types/preview/@ember/array/-private/native-array.d.ts
index 814eb825abd..50781a30d77 100644
--- a/types/preview/@ember/array/-private/native-array.d.ts
+++ b/types/preview/@ember/array/-private/native-array.d.ts
@@ -1,11 +1,172 @@
 declare module '@ember/array/-private/native-array' {
   import Observable from '@ember/object/observable';
+  import EmberArray from '@ember/array';
   import MutableArray from '@ember/array/mutable';
   import Mixin from '@ember/object/mixin';
 
   // Get an alias to the global Array type to use in inner scope below.
   type Array<T> = T[];
 
+  type AnyArray<T> = EmberArray<T> | Array<T>;
+
+  /**
+   * The final definition of NativeArray removes all native methods. This is the list of removed methods
+   * when run in Chrome 106.
+   */
+  type IGNORED_MUTABLE_ARRAY_METHODS =
+    | 'length'
+    | 'slice'
+    | 'indexOf'
+    | 'lastIndexOf'
+    | 'forEach'
+    | 'map'
+    | 'filter'
+    | 'find'
+    | 'every'
+    | 'reduce'
+    | 'includes';
+
+  /**
+   * These additional items must be redefined since `Omit` causes methods that return `this` to return the
+   * type at the time of the Omit.
+   */
+  type RETURN_SELF_ARRAY_METHODS =
+    | '[]'
+    | 'clear'
+    | 'insertAt'
+    | 'removeAt'
+    | 'pushObjects'
+    | 'unshiftObjects'
+    | 'reverseObjects'
+    | 'setObjects'
+    | 'removeObject'
+    | 'removeObjects'
+    | 'addObject'
+    | 'addObjects'
+    | 'setEach';
+
+  // This is the same as MutableArray, but removes the actual native methods that exist on Array.prototype.
+  interface MutableArrayWithoutNative<T>
+    extends Omit<MutableArray<T>, IGNORED_MUTABLE_ARRAY_METHODS | RETURN_SELF_ARRAY_METHODS> {
+    /**
+     * Remove all elements from the array. This is useful if you
+     * want to reuse an existing array without having to recreate it.
+     */
+    clear(): this;
+    /**
+     * This will use the primitive `replace()` method to insert an object at the
+     * specified index.
+     */
+    insertAt(idx: number, object: T): this;
+    /**
+     * Remove an object at the specified index using the `replace()` primitive
+     * method. You can pass either a single index, or a start and a length.
+     */
+    removeAt(start: number, len?: number): this;
+    /**
+     * Add the objects in the passed numerable to the end of the array. Defers
+     * notifying observers of the change until all objects are added.
+     */
+    pushObjects(objects: AnyArray<T>): this;
+    /**
+     * Adds the named objects to the beginning of the array. Defers notifying
+     * observers until all objects have been added.
+     */
+    unshiftObjects(objects: AnyArray<T>): this;
+    /**
+     * Reverse objects in the array. Works just like `reverse()` but it is
+     * KVO-compliant.
+     */
+    reverseObjects(): this;
+    /**
+     * Replace all the receiver's content with content of the argument.
+     * If argument is an empty array receiver will be cleared.
+     */
+    setObjects(objects: AnyArray<T>): this;
+    /**
+    Remove all occurrences of an object in the array.
+
+    ```javascript
+    let cities = ['Chicago', 'Berlin', 'Lima', 'Chicago'];
+
+    cities.removeObject('Chicago');  // ['Berlin', 'Lima']
+    cities.removeObject('Lima');     // ['Berlin']
+    cities.removeObject('Tokyo')     // ['Berlin']
+    ```
+
+    @method removeObject
+    @param {*} obj object to remove
+    @return {EmberArray} receiver
+    @public
+  */
+    removeObject(object: T): this;
+    /**
+     * Removes each object in the passed array from the receiver.
+     */
+    removeObjects(objects: AnyArray<T>): this;
+    /**
+      Push the object onto the end of the array if it is not already
+      present in the array.
+
+      ```javascript
+      let cities = ['Chicago', 'Berlin'];
+
+      cities.addObject('Lima');    // ['Chicago', 'Berlin', 'Lima']
+      cities.addObject('Berlin');  // ['Chicago', 'Berlin', 'Lima']
+      ```
+
+      @method addObject
+      @param {*} obj object to add, if not already present
+      @return {EmberArray} receiver
+      @public
+    */
+    addObject(obj: T): this;
+    /**
+     * Adds each object in the passed enumerable to the receiver.
+     */
+    addObjects(objects: AnyArray<T>): this;
+    /**
+      Sets the value on the named property for each member. This is more
+      ergonomic than using other methods defined on this helper. If the object
+      implements Observable, the value will be changed to `set(),` otherwise
+      it will be set directly. `null` objects are skipped.
+
+      ```javascript
+      let people = [{name: 'Joe'}, {name: 'Matt'}];
+
+      people.setEach('zipCode', '10011');
+      // [{name: 'Joe', zipCode: '10011'}, {name: 'Matt', zipCode: '10011'}];
+      ```
+
+      @method setEach
+      @param {String} key The key to set
+      @param {Object} value The object to set
+      @return {Object} receiver
+      @public
+    */
+    setEach<K extends keyof T>(key: K, value: T[K]): this;
+    /**
+      This is the handler for the special array content property. If you get
+      this property, it will return this. If you set this property to a new
+      array, it will replace the current content.
+
+      ```javascript
+      let peopleToMoon = ['Armstrong', 'Aldrin'];
+
+      peopleToMoon.get('[]'); // ['Armstrong', 'Aldrin']
+
+      peopleToMoon.set('[]', ['Collins']); // ['Collins']
+      peopleToMoon.get('[]'); // ['Collins']
+      ```
+
+      @property []
+      @return this
+      @public
+    */
+    get '[]'(): this;
+    set '[]'(newValue: T[] | this);
+  }
+
   /**
    * The NativeArray mixin contains the properties needed to make the native
    * Array support Ember.MutableArray and all of its dependent APIs. Unless you
@@ -13,10 +174,7 @@ declare module '@ember/array/-private/native-array' {
    * false, this will be applied automatically. Otherwise you can apply the mixin
    * at anytime by calling `Ember.NativeArray.apply(Array.prototype)`.
    */
-  interface NativeArray<T>
-    extends Omit<Array<T>, 'every' | 'filter' | 'find' | 'forEach' | 'map' | 'reduce' | 'slice'>,
-      Observable,
-      MutableArray<T> {}
+  interface NativeArray<T> extends Array<T>, Observable, MutableArrayWithoutNative<T> {}
 
   const NativeArray: Mixin;
   export default NativeArray;
diff --git a/types/preview/@ember/array/index.d.ts b/types/preview/@ember/array/index.d.ts
index cd149da2d1b..5a7aa94dc45 100644
--- a/types/preview/@ember/array/index.d.ts
+++ b/types/preview/@ember/array/index.d.ts
@@ -73,7 +73,7 @@ declare module '@ember/array' {
      * implements Ember.Observable, the value will be changed to `set(),` otherwise
      * it will be set directly. `null` objects are skipped.
      */
-    setEach<K extends keyof T>(key: K, value: T[K]): void;
+    setEach<K extends keyof T>(key: K, value: T[K]): this;
     /**
      * Maps all of the items in the enumeration to another value, returning
      * a new array. This method corresponds to `map()` defined in JavaScript 1.6.
@@ -111,12 +111,14 @@ declare module '@ember/array' {
      * this will match any property that evaluates to `true`.
      */
     filterBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
+    filterBy(key: string, value?: unknown): NativeArray<T>;
     /**
      * Returns an array with the items that do not have truthy values for
      * key.  You can pass an optional second argument with the target value.  Otherwise
      * this will match any property that evaluates to false.
      */
     rejectBy<K extends keyof T>(key: K, value?: T[K]): NativeArray<T>;
+    rejectBy(key: string, value?: unknown): NativeArray<T>;
     /**
      * Returns the first item in the array for which the callback returns true.
      * This method works similar to the `filter()` method defined in JavaScript 1.6
@@ -136,6 +138,7 @@ declare module '@ember/array' {
      * this will match any property that evaluates to `true`.
      */
     findBy<K extends keyof T>(key: K, value?: T[K]): T | undefined;
+    findBy(key: string, value?: unknown): T | undefined;
     /**
      * Returns `true` if the passed function returns true for every item in the
      * enumeration. This corresponds with the `every()` method in JavaScript 1.6.
@@ -150,6 +153,7 @@ declare module '@ember/array' {
      * than using a callback.
      */
     isEvery<K extends keyof T>(key: K, value?: T[K]): boolean;
+    isEvery(key: string, value?: unknown): boolean;
     /**
      * Returns `true` if the passed function returns true for any item in the
      * enumeration.
@@ -164,12 +168,16 @@ declare module '@ember/array' {
      * than using a callback.
      */
     isAny<K extends keyof T>(key: K, value?: T[K]): boolean;
+    isAny(key: string, value?: unknown): boolean;
     /**
      * This will combine the values of the enumerator into a single value. It
      * is a useful way to collect a summary value from an enumeration. This
      * corresponds to the `reduce()` method defined in JavaScript 1.8.
      */
-    reduce: T[]['reduce'];
+    reduce<V>(
+      callback: (summation: V, current: T, index: number, arr: this) => V,
+      initialValue?: V
+    ): V;
     /**
      * Invokes the named method on every object in the receiver that
      * implements it. This method corresponds to the implementation in
@@ -178,7 +186,7 @@ declare module '@ember/array' {
     invoke<M extends MethodNamesOf<T>>(
       methodName: M,
       ...args: MethodParams<T, M>
-    ): Array<MethodReturns<T, M>>;
+    ): NativeArray<MethodReturns<T, M>>;
     /**
      * Simply converts the enumerable into a genuine array. The order is not
      * guaranteed. Corresponds to the method implemented by Prototype.
@@ -196,7 +204,7 @@ declare module '@ember/array' {
      * Converts the enumerable into an array and sorts by the keys
      * specified in the argument.
      */
-    sortBy(...properties: string[]): NativeArray<T>;
+    sortBy(...properties: string[]): T[];
     /**
      * Returns a new enumerable that excludes the passed value. The default
      * implementation returns an array regardless of the receiver type.
@@ -219,8 +227,8 @@ declare module '@ember/array' {
      * this property, it will return this. If you set this property to a new
      * array, it will replace the current content.
      */
-    get '[]'(): NativeArray<T>;
-    set '[]'(newValue: NativeArray<T>);
+    get '[]'(): this;
+    set '[]'(newValue: T[] | Array<T>);
   }
   // Ember.Array rather than Array because the `array-type` lint rule doesn't realize the global is shadowed
   const Array: Mixin;
diff --git a/types/preview/@ember/array/mutable.d.ts b/types/preview/@ember/array/mutable.d.ts
index 30c365bb953..3890fe05da6 100644
--- a/types/preview/@ember/array/mutable.d.ts
+++ b/types/preview/@ember/array/mutable.d.ts
@@ -15,7 +15,7 @@ declare module '@ember/array/mutable' {
     /**
      * __Required.__ You must implement this method to apply this mixin.
      */
-    replace(idx: number, amt: number, objects: T[]): this;
+    replace(idx: number, amt: number, objects: T[]): void;
     /**
      * Remove all elements from the array. This is useful if you
      * want to reuse an existing array without having to recreate it.
@@ -45,12 +45,12 @@ declare module '@ember/array/mutable' {
      * Pop object from array or nil if none are left. Works just like `pop()` but
      * it is KVO-compliant.
      */
-    popObject(): T;
+    popObject(): T | null | undefined;
     /**
      * Shift an object from start of array or nil if none are left. Works just
      * like `shift()` but it is KVO-compliant.
      */
-    shiftObject(): T;
+    shiftObject(): T | null | undefined;
     /**
      * Unshift an object to start of array. Works just like `unshift()` but it is
      * KVO-compliant.
@@ -82,7 +82,7 @@ declare module '@ember/array/mutable' {
     /**
      * __Required.__ You must implement this method to apply this mixin.
      */
-    addObject(object: T): T;
+    addObject(object: T): this;
     /**
      * Adds each object in the passed enumerable to the receiver.
      */
diff --git a/types/preview/ember/-private/type-utils.d.ts b/types/preview/ember/-private/type-utils.d.ts
index f0dca1fab68..08d63c48450 100644
--- a/types/preview/ember/-private/type-utils.d.ts
+++ b/types/preview/ember/-private/type-utils.d.ts
@@ -7,16 +7,12 @@ declare module 'ember/-private/type-utils' {
 
   export type AnyMethod<Target> = (this: Target, ...args: any[]) => unknown;
 
-  export type MethodsOf<O> = {
-    [K in keyof O]: O[K] extends AnyFn ? O[K] : never;
-  };
-
-  // Not just `keyof MethodsOf<O>` because that doesn't correctly exclude all the
-  // `never` fields.
   export type MethodNamesOf<O> = {
     [K in keyof O]: O[K] extends AnyFn ? K : never;
   }[keyof O];
 
+  export type MethodsOf<O> = Pick<O, MethodNamesOf<O>>;
+
   export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
 
   export type MethodReturns<T, M extends MethodNamesOf<T>> = ReturnType<MethodsOf<T>[M]>;

From 072830abb6a9a683f7a95dc8b6e2535bf39d3686 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 9 Nov 2022 12:41:04 -0700
Subject: [PATCH 1223/1405] Rework `MethodsOf` type utilities for robustness

1. Using the keyof constraint feature introduced in 4.1, avoid ever
   introducing types with properties whose type is `never` for the
   non-method fields.

2. Handle recursively applying this constraint to nested methods for
   the `EmberMethodsOf` type, which has additional complexity to handle
   Ember's string-based dispatch. Combined with (1), this actually
   *simplifies* the types, eliminating one layer of conditional types.
---
 packages/@ember/-internals/utils/types.ts    | 16 +++++++++---
 types/preview/ember/-private/type-utils.d.ts | 27 ++++++++++++--------
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/packages/@ember/-internals/utils/types.ts b/packages/@ember/-internals/utils/types.ts
index fd72f5ebd52..0c759a1e037 100644
--- a/packages/@ember/-internals/utils/types.ts
+++ b/packages/@ember/-internals/utils/types.ts
@@ -1,10 +1,18 @@
 export type AnyFn = (...args: any[]) => any;
 
-export type MethodNamesOf<T> = {
-  [K in keyof T]: T[K] extends AnyFn ? K : never;
-}[keyof T];
+// The formatting here is designed to help make this type actually be
+// comprehensible to mortals, including the mortals who came up with it.
+// prettier-ignore
+export type MethodsOf<T> = {
+  // This `keyof` check is the thing which gives us *only* these keys, and no
+  // `foo: never` appears in the final type.
+  [K in keyof T as T[K] extends AnyFn ? K : never]:
+    // While this makes sure the resolved type only has `AnyFn` in it, so that
+    // the resulting type is known to be only function types.
+    T[K] extends AnyFn ? T[K] : never;
+};
 
-export type MethodsOf<O> = Pick<O, MethodNamesOf<O>>;
+export type MethodNamesOf<T> = keyof MethodsOf<T>;
 
 export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
 
diff --git a/types/preview/ember/-private/type-utils.d.ts b/types/preview/ember/-private/type-utils.d.ts
index 08d63c48450..f47c00631f4 100644
--- a/types/preview/ember/-private/type-utils.d.ts
+++ b/types/preview/ember/-private/type-utils.d.ts
@@ -7,11 +7,19 @@ declare module 'ember/-private/type-utils' {
 
   export type AnyMethod<Target> = (this: Target, ...args: any[]) => unknown;
 
-  export type MethodNamesOf<O> = {
-    [K in keyof O]: O[K] extends AnyFn ? K : never;
-  }[keyof O];
+  // The formatting here is designed to help make this type actually be
+  // comprehensible to mortals, including the mortals who came up with it.
+  // prettier-ignore
+  export type MethodsOf<T> = {
+    // This `keyof` check is the thing which gives us *only* these keys, and no
+    // `foo: never` appears in the final type.
+    [K in keyof T as T[K] extends AnyFn ? K : never]:
+      // While this makes sure the resolved type only has `AnyFn` in it, so that
+      // the resulting type is known to be only function types.
+      T[K] extends AnyFn ? T[K] : never;
+  };
 
-  export type MethodsOf<O> = Pick<O, MethodNamesOf<O>>;
+  export type MethodNamesOf<T> = keyof MethodsOf<T>;
 
   export type MethodParams<T, M extends MethodNamesOf<T>> = Parameters<MethodsOf<T>[M]>;
 
@@ -20,16 +28,15 @@ declare module 'ember/-private/type-utils' {
   // prettier-ignore
   /** Get the return value of a method string name or a function. */
   export type EmberMethodParams<T, M extends EmberMethod<T>> =
-  M extends AnyMethod<T> ? Parameters<M> :
-  M extends keyof T ? T[M] extends AnyMethod<T> ? Parameters<MethodsOf<T>[M]> : never :
-  never;
+    // For a basic method, we can just use the direct accessor.
+    M extends AnyMethod<T> ? Parameters<M> :
+    M extends MethodNamesOf<T> ? Parameters<MethodsOf<T>[M]> : never;
 
   // prettier-ignore
   /** Get the return value of a method string name or a function. */
   export type EmberMethodReturn<T, M extends EmberMethod<T>> =
-  M extends AnyMethod<T> ? ReturnType<M> :
-  M extends keyof T ? T[M] extends AnyMethod<T> ? ReturnType<MethodsOf<T>[M]> : never :
-  never;
+    M extends AnyMethod<T> ? ReturnType<M> :
+    M extends MethodNamesOf<T> ? ReturnType<MethodsOf<T>[M]> : never;
 
   /**
    * A type utility for Ember's common name-of-object-on-target-or-function

From 05fc0bbd4112b1151b768a77c3024dc18d294edc Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 7 Nov 2022 11:40:55 -0800
Subject: [PATCH 1224/1405] Remove some unnecessary uses of Ember.A

---
 packages/@ember/debug/container-debug-adapter.ts | 8 +++-----
 packages/@ember/debug/data-adapter.ts            | 8 ++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 5a49aa5ec12..2d20273de6e 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1,7 +1,5 @@
 import { classify, dasherize } from '@ember/string';
-import type { NativeArray } from '@ember/array';
 import EmberObject from '@ember/object';
-import { A as emberA } from '@ember/array';
 import { typeOf } from '@ember/utils';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
@@ -88,9 +86,9 @@ export default class ContainerDebugAdapter extends EmberObject {
     @return {Array} An array of strings.
     @public
   */
-  catalogEntriesByType(type: string): NativeArray<string> {
-    let namespaces = emberA(Namespace.NAMESPACES);
-    let types = emberA<string>();
+  catalogEntriesByType(type: string): string[] {
+    let namespaces = Namespace.NAMESPACES;
+    let types: string[] = [];
     let typeSuffixRegex = new RegExp(`${classify(type)}$`);
 
     namespaces.forEach((namespace) => {
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 5b3cbcce6c3..f041358c8f3 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -552,14 +552,14 @@ export default class DataAdapter<T> extends EmberObject {
       : this._getObjectsOnNamespaces();
 
     // New adapters return strings instead of classes.
-    let klassTypes = emberA(stringTypes).map((name) => {
+    let klassTypes = stringTypes.map((name) => {
       return {
         klass: this._nameToClass(name),
         name,
       };
     });
 
-    return emberA(klassTypes).filter((type) => this.detect(type.klass));
+    return klassTypes.filter((type) => this.detect(type.klass));
   }
 
   /**
@@ -571,8 +571,8 @@ export default class DataAdapter<T> extends EmberObject {
     @return {Array} Array of model type strings.
   */
   _getObjectsOnNamespaces() {
-    let namespaces = emberA(Namespace.NAMESPACES);
-    let types = emberA<string>();
+    let namespaces = Namespace.NAMESPACES;
+    let types: string[] = [];
 
     namespaces.forEach((namespace) => {
       for (let key in namespace) {

From 52da642703ad7c1ca728f51251e48ac1209ddb4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Nov 2022 22:02:20 +0000
Subject: [PATCH 1225/1405] Bump socket.io-parser from 4.0.4 to 4.0.5

Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/socketio/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 05ed6c725ee..7210034fad9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1696,9 +1696,9 @@
   integrity sha512-/ceqdqeRraGolFTcfoXNiqjyQhZzbINDngeoAq9GoHa8PPK1yNzTaxWjA6BFWp5Ua9JpXEMSS4s5i9tS0hOJtw==
 
 "@types/component-emitter@^1.2.10":
-  version "1.2.10"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.10.tgz#ef5b1589b9f16544642e473db5ea5639107ef3ea"
-  integrity sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==
+  version "1.2.11"
+  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
+  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
 
 "@types/connect@*":
   version "3.4.35"
@@ -9877,9 +9877,9 @@ socket.io-adapter@~2.3.2:
   integrity sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg==
 
 socket.io-parser@~4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
-  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
+  integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
   dependencies:
     "@types/component-emitter" "^1.2.10"
     component-emitter "~1.3.0"

From df8960d95c6ecdacf8ebcc9fd6cd2dd0d6ef404c Mon Sep 17 00:00:00 2001
From: Azhar Beg <99490876+azhar-beg@users.noreply.github.com>
Date: Thu, 10 Nov 2022 16:03:23 +0530
Subject: [PATCH 1226/1405] Revert behavioral changes

---
 lib/overrides.js | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/lib/overrides.js b/lib/overrides.js
index febcbd287b7..79480649d1d 100644
--- a/lib/overrides.js
+++ b/lib/overrides.js
@@ -13,7 +13,9 @@ function* walkAddonTree(project, pathToAddon = []) {
   }
 }
 
-const requirementFor = (pkg, deps = {}) => deps[pkg];
+function requirementFor(pkg, deps = {}) {
+  return deps[pkg];
+}
 
 const KNOWN_DORMANT_ADDONS = Object.freeze([
   'ember-angle-bracket-invocation-polyfill',
@@ -24,11 +26,13 @@ const KNOWN_DORMANT_ADDONS = Object.freeze([
 ]);
 module.exports = class Overrides {
   static for(project, env = process.env) {
-    return env.EMBER_ENV === 'production'
-      ? new Overrides([])
-      : new Overrides(Overrides.addonsInfoFor(project), {
-          showAllEmberGlobalDeprecations: env.EMBER_GLOBAL_DEPRECATIONS === 'all',
-        });
+    if (env.EMBER_ENV === 'production') {
+      return new Overrides([]);
+    } else {
+      return new Overrides(Overrides.addonsInfoFor(project), {
+        showAllEmberGlobalDeprecations: env.EMBER_GLOBAL_DEPRECATIONS === 'all',
+      });
+    }
   }
 
   static *addonsInfoFor(project) {
@@ -84,13 +88,18 @@ module.exports = class Overrides {
   }
 
   static printList(list, indent = '') {
-    return list.reduce((listString, listItem) => {
-      if (Array.isArray(listItem)) {
-        listString += `${indent}* ${listItem[0]}\n`;
-        listString += Overrides.printList(listItem[1], indent + '  ');
+    let output = '';
+
+    for (let item of list) {
+      if (Array.isArray(item)) {
+        output += `${indent}* ${item[0]}\n`;
+        output += Overrides.printList(item[1], indent + '  ');
+      } else {
+        output += `${indent}* ${item}\n`;
       }
-      listString += `${indent}* ${listItem}\n`;
-    }, '');
+    }
+
+    return output;
   }
 
   constructor(addonsInfo, options = {}) {
@@ -301,7 +310,11 @@ module.exports = class Overrides {
   }
 
   get buildTimeWarning() {
-    return this.hasBuildTimeWarning ? `[DEPRECATION] ${this.globalMessage}` : '';
+    if (this.hasBuildTimeWarning) {
+      return `[DEPRECATION] ${this.globalMessage}`;
+    } else {
+      return '';
+    }
   }
 
   toTree() {

From 792ca6cc82e28214228a27419d1f9caf370e352b Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Tue, 15 Nov 2022 16:16:59 -0500
Subject: [PATCH 1227/1405] Add v4.9.0-beta.4 to CHANGELOG

(cherry picked from commit 84e32c9234242ea45203409a1ea50e4e4beccc68)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc1cf08235b..4f55f9e4a3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.9.0-beta.4 (November 15, 2022)
+
+- [#20256](https://github.com/emberjs/ember.js/pull/20256) [BUGFIX] Correct types for Ember Arrays
+- [#20257](https://github.com/emberjs/ember.js/pull/20257) [BUGFIX] Fix types for `getOwner` and GlimmerComponent
+
 ### v4.8.2 (November 3, 2022)
 
 - [#20244](https://github.com/emberjs/ember.js/pull/20244) Add missing type for `getComponentTemplate` to preview types

From 3076f8cffcfdb280da483457a5e8a397906af37f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:03:56 -0700
Subject: [PATCH 1228/1405] Make intern utility type safe

Experimenting with removing/improving some *other* types while
implementing RFC 0821. revealed that this function needed to preserve
its input type when that type was narrower than just `string`, so
introduce a type parameter to keep that information around. Then,
switch to using `Object.create(null)` so it can be used in the `Record`
type safely.

Pulling this out into its own commit makes it easier to land, and it
also allows us to guarantee that we are making changes *only* to the
types and module layout for the PR implementing RFC 0821.
---
 packages/@ember/-internals/utils/lib/intern.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/utils/lib/intern.ts b/packages/@ember/-internals/utils/lib/intern.ts
index 422ba91e926..9d433ab1c7d 100644
--- a/packages/@ember/-internals/utils/lib/intern.ts
+++ b/packages/@ember/-internals/utils/lib/intern.ts
@@ -37,8 +37,8 @@
   @private
   @return {String} interned version of the provided string
 */
-export default function intern(str: string): string {
-  let obj: Record<string, number> = {};
+export default function intern<S extends string>(str: S): S {
+  let obj: Record<S, number> = Object.create(null);
   obj[str] = 1;
   for (let key in obj) {
     if (key === str) {

From 45dff403b03806652242367ab5f8b053cc92803b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Nov 2022 05:57:19 +0000
Subject: [PATCH 1229/1405] Bump loader-utils from 1.4.1 to 1.4.2

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 7210034fad9..9632a9b374f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7212,9 +7212,9 @@ load-json-file@^4.0.0:
     strip-bom "^3.0.0"
 
 loader-utils@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.1.tgz#278ad7006660bccc4d2c0c1578e17c5c78d5c0e0"
-  integrity sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"

From 6383470ec689a976330ec8ffc84ca0820e90eeb2 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 8 Nov 2022 17:29:04 -0700
Subject: [PATCH 1230/1405] Introduce new `@ember/routing` sub-modules

Add the `@ember/routing/transition` and `@ember/routing/route-info`,
per RFC 0821. These match the existing public preview types.
---
 packages/@ember/routing/route-info.ts        | 8 ++++++++
 packages/@ember/routing/transition.ts        | 8 ++++++++
 types/preview/@ember/routing/route-info.d.ts | 1 -
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 packages/@ember/routing/route-info.ts
 create mode 100644 packages/@ember/routing/transition.ts

diff --git a/packages/@ember/routing/route-info.ts b/packages/@ember/routing/route-info.ts
new file mode 100644
index 00000000000..cd31e47ceda
--- /dev/null
+++ b/packages/@ember/routing/route-info.ts
@@ -0,0 +1,8 @@
+/**
+ * Provides the `RouteInfo` and `RouteInfoWithMetadata` types which appear as
+ * the target and source routes for `Transition`s.
+ *
+ * @module @ember/routing/route-info
+ */
+
+export type { RouteInfo as default, RouteInfoWithAttributes } from './lib/route-info';
diff --git a/packages/@ember/routing/transition.ts b/packages/@ember/routing/transition.ts
new file mode 100644
index 00000000000..62138e1964a
--- /dev/null
+++ b/packages/@ember/routing/transition.ts
@@ -0,0 +1,8 @@
+/**
+ * Provides the `Transition` type which are used in Ember's routing transitions,
+ * e.g. `RouterService.on('routeDidChange', (transition) => { ... })`.
+ *
+ * @module @ember/routing/transition
+ */
+
+export type { Transition as default } from 'router_js';
diff --git a/types/preview/@ember/routing/route-info.d.ts b/types/preview/@ember/routing/route-info.d.ts
index ead7d39900b..42e6bc98801 100644
--- a/types/preview/@ember/routing/route-info.d.ts
+++ b/types/preview/@ember/routing/route-info.d.ts
@@ -1,5 +1,4 @@
 declare module '@ember/routing/route-info' {
-  // https://api.emberjs.com/ember/4.0/classes/RouteInfo
   /**
    * A `RouteInfo` is an object that contains metadata about a specific route within a `Transition`.
    * It is read-only and internally immutable.

From a4de4f02cb71a94e68ba895f54776b2349bdc1d4 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:07:48 -0700
Subject: [PATCH 1231/1405] Introduce `@ember/owner` package with re-exports

Per [RFC 0821][rfc], this new package is the home of the `Owner` type
and a number of supporting types, including the `Resolver` definition.
Here, introduce the package on disk with a file which simply re-exports
the existing definitions from `@ember/-internals/owner`. These
definitions are *not* the final definitions: we also need to refactor
the definitions within `@ember/-internals/owner` so that this package
can supply *only* the public API defined in the RFC.

[rfc]: https://rfcs.emberjs.com/id/0821-public-types/
---
 packages/@ember/-internals/owner/index.ts |  2 +-
 packages/@ember/owner/index.ts            | 44 +++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 packages/@ember/owner/index.ts

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 82a39200501..74e5c1e0828 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -4,7 +4,7 @@ import type { IContainer } from '../runtime/lib/mixins/container_proxy';
 import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
 
 /**
-@module @ember/application
+  @module @ember/owner
 */
 
 export { TypeOptions };
diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
new file mode 100644
index 00000000000..9b9e3270c69
--- /dev/null
+++ b/packages/@ember/owner/index.ts
@@ -0,0 +1,44 @@
+/**
+  @module @ember/owner
+
+  An `Owner` is the main object responsible for managing Ember's dependency
+  injection system. In normal app code, you will encounter `Owner`s via an
+  `ApplicationInstance` or its superclass, `EngineInstance`, which are the two
+  major implementers of the `Owner` type.
+
+  Along with the `Owner` itself, this module provides a number of supporting
+  types related to Ember's DI system:
+
+  - `Factory`, Ember's primary interface for something which can create class
+    instances registered with the DI system.
+
+  - `FactoryManager`, an interface for inspecting a `Factory`'s class.
+
+  - `Resolver`, an interface defining the contract for the object responsible
+    for mapping string names to the corresponding classes. For example, when
+    you write `@service('session')`, a resolver is responsible to map that back
+    to the `Session` service class in your codebase. Normally
+
+  For more details on each, see their per-item docs!
+*/
+
+// We need to provide a narrower public interface to `getOwner` so that we only
+// expose the `Owner` type, *not* our richer `InternalOwner` type and its
+// various bits of private API.
+import Owner, { getOwner as internalGetOwner } from '../-internals/owner';
+
+interface GetOwner {
+  (object: object): Owner | undefined;
+}
+
+const getOwner = internalGetOwner as GetOwner;
+export { getOwner };
+
+// Everything else, we can directly re-export.
+export default Owner;
+
+export {
+  setOwner,
+  Factory,
+  FactoryManager,
+} from '../-internals/owner';

From cd27b2937803a4ea1073ac7908c910068ae16d6f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:08:12 -0700
Subject: [PATCH 1232/1405] Move `Resolver` to `@ember/-internals/owner`

This enables it to be re-exported correctly from `@ember/owner` with
reference *only* to `@ember/-internals/owner`, while still providing
it to the other `-internals` packages, which should never depend on
the public packages like `@ember/owner`.

In support of this (and many other changes), introduce a type helper
for `FullName` types.
---
 packages/@ember/-internals/container/index.ts |  2 +-
 .../-internals/container/lib/registry.ts      | 10 +------
 packages/@ember/-internals/owner/index.ts     | 29 +++++++++++++++++++
 .../@ember/debug/container-debug-adapter.ts   |  2 +-
 packages/@ember/owner/index.ts                |  2 ++
 .../lib/test-resolver.ts                      |  3 +-
 6 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/container/index.ts b/packages/@ember/-internals/container/index.ts
index 94526572718..21bdd054ef2 100644
--- a/packages/@ember/-internals/container/index.ts
+++ b/packages/@ember/-internals/container/index.ts
@@ -5,5 +5,5 @@ The public API, specified on the application namespace should be considered the
   @private
 */
 
-export { default as Registry, Resolver, ResolverClass, privatize } from './lib/registry';
+export { default as Registry, ResolverClass, privatize } from './lib/registry';
 export { default as Container, getFactoryFor, setFactoryFor, INIT_FACTORY } from './lib/container';
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 86ecc34ed3a..0d6f1d517f7 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,4 +1,4 @@
-import type { Factory } from '@ember/-internals/owner';
+import type { Factory, Resolver } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import type { set } from '@ember/object';
@@ -38,14 +38,6 @@ export interface ResolverClass {
   create(...args: unknown[]): Resolver;
 }
 
-export interface Resolver {
-  knownForType?: (type: string) => KnownForTypeResult;
-  lookupDescription?: (fullName: string) => string;
-  makeToString?: (factory: Factory<object>, fullName: string) => string;
-  normalize?: (fullName: string) => string;
-  resolve(name: string): Factory<object> | object | undefined;
-}
-
 export interface RegistryOptions {
   fallback?: IRegistry;
   registrations?: { [key: string]: object };
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 74e5c1e0828..461d911a440 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -7,7 +7,36 @@ import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
   @module @ember/owner
 */
 
+/**
+ * The name for a factory consists of a namespace and the name of a specific
+ * type within that namespace, like `'service:session'`.
+ *
+ * @for @ember/owner
+ */
+export type FullName = `${string}:${string}`;
+
 export { TypeOptions };
+/**
+ * A `Resolver` is the mechanism responsible for looking up code in your
+ * application and converting its naming conventions into the actual classes,
+ * functions, and templates that Ember needs to resolve its dependencies, for
+ * example, what template to render for a given route. It is a system that helps
+ * the app resolve the lookup of JavaScript modules agnostic of what kind of
+ * module system is used, which can be AMD, CommonJS or just plain globals. It
+ * is used to lookup routes, models, components, templates, or anything that is
+ * used in your Ember app.
+ *
+ * This interface represents the contract a custom resolver must implement. Most
+ * apps never need to think about this: the application's resolver is supplied by
+ * `ember-resolver` in the default blueprint.
+ */
+export interface Resolver {
+  resolve: (name: FullName) => Factory<object> | object | undefined;
+  knownForType?: <T extends string>(type: T) => KnownForTypeResult<T>;
+  lookupDescription?: (fullName: FullName) => string;
+  makeToString?: (factory: Factory<object>, fullName: FullName) => string;
+  normalize?: (fullName: FullName) => FullName;
+}
 
 export interface FactoryClass {
   positionalParams?: string | string[] | undefined | null;
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 2d20273de6e..751e527ab5d 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -3,7 +3,7 @@ import EmberObject from '@ember/object';
 import { typeOf } from '@ember/utils';
 import type { Owner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
-import type { Resolver } from '@ember/-internals/container';
+import type { Resolver } from '@ember/owner';
 import Namespace from '@ember/application/namespace';
 
 /**
diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index 9b9e3270c69..997d8bde356 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -39,6 +39,8 @@ export default Owner;
 
 export {
   setOwner,
+  FullName,
   Factory,
   FactoryManager,
+  Resolver,
 } from '../-internals/owner';
diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts
index df332029560..1f4c16cca4c 100644
--- a/packages/internal-test-helpers/lib/test-resolver.ts
+++ b/packages/internal-test-helpers/lib/test-resolver.ts
@@ -1,7 +1,6 @@
 import { compile } from 'ember-template-compiler';
 
-import type { Resolver as IResolver } from '@ember/-internals/container';
-import type { Factory } from '@ember/-internals/owner';
+import type { Factory, Resolver as IResolver } from '@ember/-internals/owner';
 
 const DELIMITER = '%';
 

From bbacfdbcbda6a38de66fd753ed7acad79e060fce Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:08:22 -0700
Subject: [PATCH 1233/1405] Move `TypeOptions` to `@ember/-internals/owner` as
 `RegisterOptions`

As with moving the `Resolver` definition, this aligns us with RFC 0821
and provides an easy way for `@ember/owner` to rexport the definition.
---
 .../-internals/container/lib/container.ts     | 20 ++++----
 .../-internals/container/lib/registry.ts      | 49 +++++++++++--------
 .../@ember/-internals/glimmer/lib/resolver.ts |  7 ++-
 packages/@ember/-internals/owner/index.ts     |  7 ++-
 .../runtime/lib/mixins/container_proxy.ts     |  5 +-
 .../runtime/lib/mixins/registry_proxy.ts      | 17 +++----
 .../-internals/views/lib/component_lookup.ts  |  4 +-
 .../@ember/engine/type-tests/index.test.ts    | 11 +++--
 packages/@ember/owner/index.ts                |  1 +
 packages/@ember/routing/lib/controller_for.ts |  4 +-
 10 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 7ee69122767..655c8a4fb32 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,9 +1,9 @@
-import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
+import type { Factory, FactoryClass, Owner, RegisterOptions } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { dictionary } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
-import type { DebugRegistry, TypeOptions } from './registry';
+import type { DebugRegistry } from './registry';
 import type Registry from './registry';
 
 interface LeakTracking {
@@ -137,10 +137,10 @@ export default class Container {
     @private
    @method lookup
    @param {String} fullName
-   @param {TypeOptions} [options]
+   @param {RegisterOptions} [options]
    @return {any}
    */
-  lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined {
+  lookup(fullName: string, options?: RegisterOptions): Factory<object> | object | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
     }
@@ -263,8 +263,8 @@ function isInstantiatable(container: Container, fullName: string) {
 function lookup(
   container: Container,
   fullName: string,
-  options: TypeOptions = {}
 ): Factory<object> | object | undefined {
+  options: RegisterOptions = {}
   let normalizedName = fullName;
 
   if (
@@ -314,7 +314,7 @@ function factoryFor(
 function isSingletonClass(
   container: Container,
   fullName: string,
-  { instantiate, singleton }: TypeOptions
+  { instantiate, singleton }: RegisterOptions
 ) {
   return (
     singleton !== false &&
@@ -327,7 +327,7 @@ function isSingletonClass(
 function isSingletonInstance(
   container: Container,
   fullName: string,
-  { instantiate, singleton }: TypeOptions
+  { instantiate, singleton }: RegisterOptions
 ) {
   return (
     singleton !== false &&
@@ -340,7 +340,7 @@ function isSingletonInstance(
 function isFactoryClass(
   container: Container,
   fullname: string,
-  { instantiate, singleton }: TypeOptions
+  { instantiate, singleton }: RegisterOptions
 ) {
   return (
     instantiate === false &&
@@ -352,7 +352,7 @@ function isFactoryClass(
 function isFactoryInstance(
   container: Container,
   fullName: string,
-  { instantiate, singleton }: TypeOptions
+  { instantiate, singleton }: RegisterOptions
 ) {
   return (
     instantiate !== false &&
@@ -365,8 +365,8 @@ function instantiateFactory(
   container: Container,
   normalizedName: string,
   fullName: string,
-  options: TypeOptions
 ): Factory<object> | object | undefined {
+  options: RegisterOptions
   let factoryManager = factoryFor(container, normalizedName, fullName);
 
   if (factoryManager === undefined) {
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index 0d6f1d517f7..db07d333cda 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,4 +1,4 @@
-import type { Factory, Resolver } from '@ember/-internals/owner';
+import type { Factory, Resolver, RegisterOptions } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import type { set } from '@ember/object';
@@ -11,23 +11,18 @@ export interface Injection {
   specifier: string;
 }
 
-export interface TypeOptions {
-  instantiate?: boolean;
-  singleton?: boolean;
-}
-
 export interface KnownForTypeResult {
   [fullName: string]: boolean;
 }
 
 export interface IRegistry {
   describe(fullName: string): string;
-  getOption<K extends keyof TypeOptions>(
+  getOption<K extends keyof RegisterOptions>(
     fullName: string,
     optionName: K
-  ): TypeOptions[K] | undefined;
-  getOptions(fullName: string): TypeOptions | undefined;
-  getOptionsForType(type: string): TypeOptions | undefined;
+  ): RegisterOptions[K] | undefined;
+  getOptions(fullName: string): RegisterOptions | undefined;
+  getOptionsForType(type: string): RegisterOptions | undefined;
   knownForType(type: string): KnownForTypeResult;
   makeToString(factory: Factory<object>, fullName: string): string;
   normalizeFullName(fullName: string): string;
@@ -65,9 +60,9 @@ export default class Registry implements IRegistry {
   readonly fallback: IRegistry | null;
   readonly registrations: Record<string, Factory<object> | object>;
   readonly _normalizeCache: Record<string, string>;
-  readonly _options: Record<string, TypeOptions>;
   readonly _resolveCache: Record<string, Factory<object> | object>;
-  readonly _typeOptions: Record<string, TypeOptions>;
+  readonly _options: Record<string, RegisterOptions>;
+  readonly _typeOptions: Record<string, RegisterOptions>;
 
   set?: typeof set;
 
@@ -166,9 +161,21 @@ export default class Registry implements IRegistry {
    @param {Function} factory
    @param {Object} options
    */
-  register(fullName: string, factory: object, options: TypeOptions & { instantiate: false }): void;
-  register(fullName: string, factory: Factory<object>, options?: TypeOptions): void;
-  register(fullName: string, factory: object | Factory<object>, options: TypeOptions = {}): void {
+  register(
+    fullName: string,
+    factory: object,
+    options: RegisterOptions & { instantiate: false }
+  ): void;
+  register<T extends object, C extends FactoryClass | object>(
+    fullName: string,
+    factory: Factory<T, C>,
+    options?: RegisterOptions
+  ): void;
+  register(
+    fullName: string,
+    factory: object | Factory<object>,
+    options: RegisterOptions = {}
+  ): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
     assert(`Attempting to register an unknown factory: '${fullName}'`, factory !== undefined);
 
@@ -375,11 +382,11 @@ export default class Registry implements IRegistry {
    @param {String} type
    @param {Object} options
    */
-  optionsForType(type: string, options: TypeOptions): void {
+  optionsForType(type: string, options: RegisterOptions): void {
     this._typeOptions[type] = options;
   }
 
-  getOptionsForType(type: string): TypeOptions | undefined {
+  getOptionsForType(type: string): RegisterOptions | undefined {
     let optionsForType = this._typeOptions[type];
     if (optionsForType === undefined && this.fallback !== null) {
       optionsForType = this.fallback.getOptionsForType(type);
@@ -393,12 +400,12 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @param {Object} options
    */
-  options(fullName: string, options: TypeOptions): void {
+  options(fullName: string, options: RegisterOptions): void {
     let normalizedName = this.normalize(fullName);
     this._options[normalizedName] = options;
   }
 
-  getOptions(fullName: string): TypeOptions | undefined {
+  getOptions(fullName: string): RegisterOptions | undefined {
     let normalizedName = this.normalize(fullName);
     let options = this._options[normalizedName];
 
@@ -408,10 +415,10 @@ export default class Registry implements IRegistry {
     return options;
   }
 
-  getOption<K extends keyof TypeOptions>(
     fullName: string,
+  getOption<K extends keyof RegisterOptions>(
     optionName: K
-  ): TypeOptions[K] | undefined {
+  ): RegisterOptions[K] | undefined {
     let options = this._options[fullName];
 
     if (options !== undefined && options[optionName] !== undefined) {
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index d374a7e2727..f5fb7f34124 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,7 +1,6 @@
 import { privatize as P } from '@ember/-internals/container';
-import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 import { ENV } from '@ember/-internals/environment';
-import type { Factory, Owner } from '@ember/-internals/owner';
+import type { Factory, Owner, RegisterOptions } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';
 import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
@@ -60,8 +59,8 @@ function componentFor(name: string, owner: Owner): Option<Factory<object> | obje
   return owner.factoryFor(fullName) || null;
 }
 
-function layoutFor(name: string, owner: Owner, options?: TypeOptions): Option<Template> {
   let templateFullName = `template:components/${name}`;
+function layoutFor(name: string, owner: Owner, options?: RegisterOptions): Option<Template> {
 
   return (owner.lookup(templateFullName, options) as Template) || null;
 }
@@ -83,7 +82,7 @@ type LookupResult =
 function lookupComponentPair(
   owner: Owner,
   name: string,
-  options?: TypeOptions
+  options?: RegisterOptions
 ): Option<LookupResult> {
   let component = componentFor(name, owner);
 
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 461d911a440..c29ba9b5d6c 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,5 +1,4 @@
 import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner';
-import { TypeOptions } from '../container/lib/registry';
 import type { IContainer } from '../runtime/lib/mixins/container_proxy';
 import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
 
@@ -15,7 +14,11 @@ import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
  */
 export type FullName = `${string}:${string}`;
 
-export { TypeOptions };
+export interface RegisterOptions {
+  instantiate?: boolean | undefined;
+  singleton?: boolean | undefined;
+}
+
 /**
  * A `Resolver` is the mechanism responsible for looking up code in your
  * application and converting its naming conventions into the actual classes,
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 517fcb876bd..627c6865023 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -4,15 +4,14 @@ import { schedule, join } from '@ember/runloop';
 */
 import type { FactoryManager } from '@ember/-internals/container/lib/container';
 import type Container from '@ember/-internals/container/lib/container';
-import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 import Mixin from '@ember/object/mixin';
-import type { Factory } from '@ember/-internals/owner';
+import type { Factory, RegisterOptions } from '@ember/-internals/owner';
 
 // This is defined as a separate interface so that it can be used in the definition of
 // `Owner` without also including the `__container__` property.
 export interface IContainer {
   ownerInjection(): void;
-  lookup(fullName: string, options?: TypeOptions): Factory<object> | object | undefined;
+  lookup(fullName: string, options?: RegisterOptions): Factory<object> | object | undefined;
   factoryFor(fullName: string): FactoryManager<object> | undefined;
 }
 
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index 2c7ccfdea70..cb06a7281eb 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -3,9 +3,8 @@
 */
 
 import type { Registry } from '@ember/-internals/container';
-import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 import Mixin from '@ember/object/mixin';
-import type { Factory } from '@ember/-internals/owner';
+import type { Factory, RegisterOptions } from '@ember/-internals/owner';
 import type { AnyFn } from '@ember/-internals/utils/types';
 import { assert } from '@ember/debug';
 
@@ -22,24 +21,24 @@ export interface IRegistry {
    */
   resolveRegistration(fullName: string): Factory<object> | object | undefined;
 
-  register(fullName: string, factory: Factory<object> | object, options?: TypeOptions): void;
+  register(fullName: string, factory: Factory<object> | object, options?: RegisterOptions): void;
 
   unregister(fullName: string): void;
 
   hasRegistration(fullName: string): boolean;
 
-  registeredOption<K extends keyof TypeOptions>(
+  registeredOption<K extends keyof RegisterOptions>(
     fullName: string,
     optionName: K
-  ): TypeOptions[K] | undefined;
+  ): RegisterOptions[K] | undefined;
 
-  registerOptions(fullName: string, options: TypeOptions): void;
+  registerOptions(fullName: string, options: RegisterOptions): void;
 
-  registeredOptions(fullName: string): TypeOptions | undefined;
+  registeredOptions(fullName: string): RegisterOptions | undefined;
 
-  registerOptionsForType(type: string, options: TypeOptions): void;
+  registerOptionsForType(type: string, options: RegisterOptions): void;
 
-  registeredOptionsForType(type: string): TypeOptions | undefined;
+  registeredOptionsForType(type: string): RegisterOptions | undefined;
 }
 
 /**
diff --git a/packages/@ember/-internals/views/lib/component_lookup.ts b/packages/@ember/-internals/views/lib/component_lookup.ts
index 542f6375608..2b393584652 100644
--- a/packages/@ember/-internals/views/lib/component_lookup.ts
+++ b/packages/@ember/-internals/views/lib/component_lookup.ts
@@ -1,4 +1,4 @@
-import type { Owner, TypeOptions } from '@ember/-internals/owner';
+import type { InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import EmberObject from '@ember/object';
 
 export default EmberObject.extend({
@@ -7,8 +7,8 @@ export default EmberObject.extend({
     return owner.factoryFor(fullName);
   },
 
-  layoutFor(name: string, owner: Owner, options: TypeOptions) {
     let templateFullName = `template:components/${name}`;
+  layoutFor(name: string, owner: Owner, options: RegisterOptions) {
     return owner.lookup(templateFullName, options);
   },
 });
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index 6002b05edde..7fa8c7c4718 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -1,5 +1,4 @@
-import type { ResolverClass, TypeOptions } from '@ember/-internals/container/lib/registry';
-import type { Factory, Owner } from '@ember/-internals/owner';
+import type { Factory, Owner, RegisterOptions } from '@ember/-internals/owner';
 import type Namespace from '@ember/application/namespace';
 import type { Initializer } from '@ember/engine';
 import Engine from '@ember/engine';
@@ -78,7 +77,9 @@ engine.registerOptions('fruit:favorite', 1);
 // @ts-expect-error requires valid options
 engine.registerOptions('fruit:favorite', { singleton: 1 });
 
-expectTypeOf(engine.registeredOptions('fruit:favorite')).toEqualTypeOf<TypeOptions | undefined>();
+expectTypeOf(engine.registeredOptions('fruit:favorite')).toEqualTypeOf<
+  RegisterOptions | undefined
+>();
 // @ts-expect-error requires string name
 engine.registeredOption(1);
 
@@ -92,6 +93,8 @@ engine.registerOptionsForType('fruit:favorite', 1);
 // @ts-expect-error requires valid options
 engine.registerOptionsForType('fruit:favorite', { singleton: 1 });
 
-expectTypeOf(engine.registeredOptionsForType('my-type')).toEqualTypeOf<TypeOptions | undefined>();
+expectTypeOf(engine.registeredOptionsForType('my-type')).toEqualTypeOf<
+  RegisterOptions | undefined
+>();
 // @ts-expect-error requires type
 engine.registeredOptionsForType();
diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index 997d8bde356..e08ddc38bda 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -40,6 +40,7 @@ export default Owner;
 export {
   setOwner,
   FullName,
+  RegisterOptions,
   Factory,
   FactoryManager,
   Resolver,
diff --git a/packages/@ember/routing/lib/controller_for.ts b/packages/@ember/routing/lib/controller_for.ts
index 1f638a75d29..eb8130a5901 100644
--- a/packages/@ember/routing/lib/controller_for.ts
+++ b/packages/@ember/routing/lib/controller_for.ts
@@ -1,5 +1,5 @@
 import type { Container } from '@ember/-internals/container';
-import type { TypeOptions } from '@ember/-internals/container/lib/registry';
+import type { RegisterOptions } from '@ember/owner';
 /**
 @module ember
 */
@@ -14,7 +14,7 @@ import type { TypeOptions } from '@ember/-internals/container/lib/registry';
 export default function controllerFor(
   container: Container,
   controllerName: string,
-  lookupOptions: TypeOptions
+  lookupOptions: RegisterOptions
 ) {
   return container.lookup(`controller:${controllerName}`, lookupOptions);
 }

From 337118e9afef9f2bb497cbcaf037daaf455c7aec Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:08:34 -0700
Subject: [PATCH 1234/1405] squash w/whatever adds KnownForTypeResult

---
 packages/@ember/owner/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index e08ddc38bda..29f3bc68846 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -43,5 +43,6 @@ export {
   RegisterOptions,
   Factory,
   FactoryManager,
+  KnownForTypeResult,
   Resolver,
 } from '../-internals/owner';

From 3b01283c81892959fb4f31dd05b9ff079a1af8eb Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:01:04 -0700
Subject: [PATCH 1235/1405] Fix some incorrect `@module` comments

---
 packages/@ember/routing/lib/controller_for.ts      | 3 ++-
 packages/@ember/routing/lib/generate_controller.ts | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/routing/lib/controller_for.ts b/packages/@ember/routing/lib/controller_for.ts
index eb8130a5901..a4c7ada89da 100644
--- a/packages/@ember/routing/lib/controller_for.ts
+++ b/packages/@ember/routing/lib/controller_for.ts
@@ -1,7 +1,8 @@
 import type { Container } from '@ember/-internals/container';
 import type { RegisterOptions } from '@ember/owner';
+
 /**
-@module ember
+  @module ember/routing
 */
 
 /**
diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
index c96969714d6..e9d302ce726 100644
--- a/packages/@ember/routing/lib/generate_controller.ts
+++ b/packages/@ember/routing/lib/generate_controller.ts
@@ -3,8 +3,9 @@ import type { Factory, Owner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import { assert, info } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
+
 /**
-@module ember
+ @module ember/routing
 */
 
 /**

From edc1cf11bc60be4286788f2c8a3ca41dcec3e9b7 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:32:09 -0700
Subject: [PATCH 1236/1405] Rename `Owner` to `InternalOwner` in `-internals`

As described in an earlier commit, our public type for `Owner`, as
specified by RFC 0821, is substantially narrower than the existing type
we use as `Owner` internally: our *internal* notion of `Owner` is
the union of `RegistryProxyMixin` and `ContainerProxyMixin`. The new
`InternalOwner` type represents that union.

(We intend, eventually, to carve away the additional parts of
`InternalOwner` until it *is* just the specified public API for
`Owner`, since that is sufficient for everything we actually do now.)

In cases where the consumer does not need `InternalOwner`, switch to
using this new `Owner` default export.

As a knock-on, remove an `any` and actually specify a type which *also*
uses `InternalOwner` internally, which involves an otherwise unrelated
update to type imports and declarations.
---
 .../-internals/container/lib/container.ts     | 13 +++--
 .../glimmer/lib/component-managers/curly.ts   |  2 +-
 .../glimmer/lib/component-managers/mount.ts   |  9 +++-
 .../glimmer/lib/component-managers/outlet.ts  |  4 +-
 .../glimmer/lib/components/internal.ts        |  8 +--
 .../-internals/glimmer/lib/environment.ts     |  4 +-
 .../@ember/-internals/glimmer/lib/helper.ts   |  6 +--
 .../glimmer/lib/helpers/-resolve.ts           | 51 ++++++++++---------
 .../glimmer/lib/helpers/internal-helper.ts    |  4 +-
 .../glimmer/lib/modifiers/action.ts           |  8 +--
 .../glimmer/lib/modifiers/internal.ts         |  6 +--
 .../@ember/-internals/glimmer/lib/renderer.ts |  8 +--
 .../@ember/-internals/glimmer/lib/resolver.ts | 22 +++++---
 .../-internals/glimmer/lib/syntax/mount.ts    |  4 +-
 .../-internals/glimmer/lib/syntax/outlet.ts   |  4 +-
 .../-internals/glimmer/lib/utils/managers.ts  |  4 +-
 .../-internals/glimmer/lib/utils/outlet.ts    |  4 +-
 .../-internals/glimmer/lib/views/outlet.ts    | 17 +++++--
 .../application/debug-render-tree-test.ts     |  6 +--
 packages/@ember/-internals/owner/index.ts     | 25 +++++++--
 .../-internals/views/lib/component_lookup.ts  |  4 +-
 .../-internals/views/lib/system/utils.ts      |  4 +-
 .../application/type-tests/index.test.ts      |  8 +--
 .../component/type-tests/helper/index.test.ts |  4 +-
 .../type-tests/set-component-manager.test.ts  |  4 +-
 .../controller/type-tests/index.test.ts       |  4 +-
 .../@ember/debug/container-debug-adapter.ts   |  4 +-
 packages/@ember/debug/data-adapter.ts         |  4 +-
 .../@ember/debug/lib/capture-render-tree.ts   |  4 +-
 .../@ember/engine/type-tests/instance.test.ts |  6 +--
 packages/@ember/object/core.ts                |  3 +-
 .../object/type-tests/core/index.test.ts      |  4 +-
 .../object/type-tests/ember-object.test.ts    |  6 +--
 .../object/type-tests/events/index.test.ts    |  4 +-
 .../@ember/routing/lib/generate_controller.ts |  2 +-
 packages/@ember/routing/route.ts              |  6 +--
 packages/@ember/routing/router.ts             | 16 ++++--
 .../routing/type-tests/auto-location.test.ts  |  4 +-
 .../routing/type-tests/hash-location.test.ts  |  4 +-
 .../type-tests/history-location.test.ts       |  4 +-
 .../routing/type-tests/none-location.test.ts  |  4 +-
 .../routing/type-tests/route/index.test.ts    |  4 +-
 .../type-tests/route/overrides.test.ts        |  4 +-
 .../type-tests/route/query-params.test.ts     |  4 +-
 .../routing/type-tests/route/send.test.ts     |  4 +-
 .../routing/type-tests/router-service.test.ts |  4 +-
 .../routing/type-tests/router/index.test.ts   |  4 +-
 .../@ember/service/type-tests/index.test.ts   |  4 +-
 .../lib/registry-check.ts                     |  8 ++-
 49 files changed, 201 insertions(+), 147 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 655c8a4fb32..438859bc52e 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,4 +1,9 @@
-import type { Factory, FactoryClass, Owner, RegisterOptions } from '@ember/-internals/owner';
+import type {
+  Factory,
+  FactoryClass,
+  InternalOwner,
+  RegisterOptions,
+} from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { dictionary } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
@@ -44,7 +49,7 @@ if (DEBUG) {
 }
 
 export interface ContainerOptions {
-  owner?: Owner;
+  owner?: InternalOwner;
   cache?: { [key: string]: object };
   factoryManagerCache?: { [key: string]: FactoryManager<any, any> };
   validationCache?: { [key: string]: boolean };
@@ -66,7 +71,7 @@ export interface ContainerOptions {
 export default class Container {
   static _leakTracking: LeakTracking;
 
-  readonly owner: Owner | null;
+  readonly owner: InternalOwner | null;
   readonly registry: Registry & DebugRegistry;
   cache: { [key: string]: object };
   factoryManagerCache!: { [key: string]: FactoryManager<object> };
@@ -463,9 +468,9 @@ export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void
 
 export class FactoryManager<T extends object, C extends FactoryClass | object = FactoryClass> {
   readonly container: Container;
-  readonly owner: Owner | null;
   readonly class: Factory<T, C> & DebugFactory<T, C>;
   readonly fullName: string;
+  readonly owner: InternalOwner | null;
   readonly normalizedName: string;
   private madeToString: string | undefined;
   injections: { [key: string]: unknown } | undefined;
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index 180e2b70293..c9ef1717268 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,5 +1,5 @@
-import type { Factory, Owner } from '@ember/-internals/owner';
 import { getOwner, setOwner } from '@ember/-internals/owner';
+import type { Factory, default as Owner } from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
index c16e9660589..8fad1b2f9d7 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/mount.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { generateControllerFactory } from '@ember/routing/-internals';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
@@ -71,7 +71,12 @@ class MountManager
     return state.engine;
   }
 
-  create(owner: Owner, { name }: EngineDefinitionState, args: VMArguments, env: Environment) {
+  create(
+    owner: InternalOwner,
+    { name }: EngineDefinitionState,
+    args: VMArguments,
+    env: Environment
+  ) {
     // TODO
     // mount is a runtime helper, this shouldn't use dynamic layout
     // we should resolve the engine app template in the helper
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
index df836e6f5ce..4cc01253c4a 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/outlet.ts
@@ -1,5 +1,5 @@
 import { ENV } from '@ember/-internals/environment';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
@@ -74,7 +74,7 @@ class OutletComponentManager
     WithCustomDebugRenderTree<OutletInstanceState, OutletDefinitionState>
 {
   create(
-    _owner: Owner,
+    _owner: InternalOwner,
     definition: OutletDefinitionState,
     _args: VMArguments,
     env: Environment,
diff --git a/packages/@ember/-internals/glimmer/lib/components/internal.ts b/packages/@ember/-internals/glimmer/lib/components/internal.ts
index 8d2c66af8ca..06ba968177d 100644
--- a/packages/@ember/-internals/glimmer/lib/components/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/components/internal.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
@@ -29,7 +29,7 @@ export default class InternalComponent {
   }
 
   constructor(
-    protected owner: Owner,
+    protected owner: InternalOwner,
     protected readonly args: CapturedArguments,
     protected readonly caller: unknown
   ) {
@@ -105,7 +105,7 @@ export default class InternalComponent {
 }
 
 export interface InternalComponentConstructor<T extends InternalComponent = InternalComponent> {
-  new (owner: Owner, args: CapturedArguments, caller: unknown): T;
+  new (owner: InternalOwner, args: CapturedArguments, caller: unknown): T;
   prototype: T;
   toString(): string;
 }
@@ -183,7 +183,7 @@ class InternalManager
   }
 
   create(
-    owner: Owner,
+    owner: InternalOwner,
     definition: OpaqueInternalComponentConstructor,
     args: VMArguments,
     _env: Environment,
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 4265a73f819..5f5af23785c 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -1,6 +1,6 @@
 import { ENV } from '@ember/-internals/environment';
 import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
@@ -132,7 +132,7 @@ const VM_ASSERTION_OVERRIDES: { id: string; message: string }[] = [];
 export class EmberEnvironmentDelegate implements EnvironmentDelegate {
   public enableDebugTooling: boolean = ENV._DEBUG_RENDER_TREE;
 
-  constructor(public owner: Owner, public isInteractive: boolean) {}
+  constructor(public owner: InternalOwner, public isInteractive: boolean) {}
 
   onTransactionCommit(): void {}
 }
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index a384566051d..82254766ac2 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -3,7 +3,7 @@
 */
 
 import type { FactoryManager } from '@ember/-internals/container/lib/container';
-import type { Factory, Owner } from '@ember/-internals/owner';
+import type { Factory, InternalOwner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/object/-internals';
 import { getDebugName } from '@ember/-internals/utils';
@@ -200,7 +200,7 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
 
   private ownerInjection: object;
 
-  constructor(owner: Owner | undefined) {
+  constructor(owner: InternalOwner | undefined) {
     let ownerInjection = {};
     setOwner(ownerInjection, owner!);
     this.ownerInjection = ownerInjection;
@@ -254,7 +254,7 @@ function isFactoryManager(obj: unknown): obj is FactoryManager<object> {
   return obj != null && 'class' in (obj as FactoryManager<object>);
 }
 
-setHelperManager((owner: Owner | undefined): ClassicHelperManager => {
+setHelperManager((owner: InternalOwner | undefined): ClassicHelperManager => {
   return new ClassicHelperManager(owner);
 }, Helper);
 
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
index 91e49504ddd..71bd9f3ff43 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-resolve.ts
@@ -1,39 +1,44 @@
 /**
-@module ember
+  @module ember
 */
-import type { Owner } from '@ember/-internals/owner';
+import type { FullName, InternalOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import type { CapturedArguments } from '@glimmer/interfaces';
 import { createConstRef, isConstRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
 
-export default internalHelper(({ positional }: CapturedArguments, owner: Owner | undefined) => {
-  // why is this allowed to be undefined in the first place?
-  assert('[BUG] missing owner', owner);
+export default internalHelper(
+  ({ positional }: CapturedArguments, owner: InternalOwner | undefined) => {
+    // why is this allowed to be undefined in the first place?
+    assert('[BUG] missing owner', owner);
 
-  assert(
-    `[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`,
-    positional.length === 1
-  );
-
-  let fullNameRef = positional[0];
-
-  assert('[BUG] expecting a string literal as argument', fullNameRef && isConstRef(fullNameRef));
+    assert(
+      `[BUG] wrong number of positional arguments, expecting 1, got ${positional.length}`,
+      positional.length === 1
+    );
 
-  let fullName = valueForRef(fullNameRef);
+    let fullNameRef = positional[0];
 
-  assert('[BUG] expecting a string literal as argument', typeof fullName === 'string');
-  assert('[BUG] expecting a valid full name', fullName.split(':').length === 2);
+    assert('[BUG] expecting a string literal as argument', fullNameRef && isConstRef(fullNameRef));
 
-  if (DEBUG) {
-    let [type, name] = fullName.split(':');
+    let fullName = valueForRef(fullNameRef);
 
+    assert('[BUG] expecting a string literal as argument', typeof fullName === 'string');
     assert(
-      `Attempted to invoke \`(-resolve "${fullName}")\`, but ${name} was not a valid ${type} name.`,
-      owner.hasRegistration(fullName)
+      '[BUG] expecting a valid full name',
+      ((s: string): s is FullName => s.split(':').length === 2)(fullName)
     );
-  }
 
-  return createConstRef(owner.factoryFor(fullName)?.class, `(-resolve "${fullName}")`);
-});
+    if (DEBUG) {
+      let [type, name] = fullName.split(':');
+
+      assert(
+        `Attempted to invoke \`(-resolve "${fullName}")\`, but ${name} was not a valid ${type} name.`,
+        owner.hasRegistration(fullName)
+      );
+    }
+
+    return createConstRef(owner.factoryFor(fullName)?.class, `(-resolve "${fullName}")`);
+  }
+);
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
index 979156e0629..f474a052e6e 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/internal-helper.ts
@@ -1,7 +1,7 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { Helper, HelperDefinitionState } from '@glimmer/interfaces';
 import { setInternalHelperManager } from '@glimmer/manager';
 
-export function internalHelper(helper: Helper<Owner>): HelperDefinitionState {
+export function internalHelper(helper: Helper<InternalOwner>): HelperDefinitionState {
   return setInternalHelperManager(helper, {});
 }
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
index 0512a08942d..249eaeb9436 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/action.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { uuid } from '@ember/-internals/utils';
 import { ActionManager, EventDispatcher, isSimpleClick } from '@ember/-internals/views';
 import { assert } from '@ember/debug';
@@ -65,7 +65,7 @@ export let ActionHelper = {
 
 export class ActionState {
   public element: SimpleElement;
-  public owner: Owner;
+  public owner: InternalOwner;
   public actionId: number;
   public actionName: any;
   public actionArgs: any;
@@ -77,7 +77,7 @@ export class ActionState {
 
   constructor(
     element: SimpleElement,
-    owner: Owner,
+    owner: InternalOwner,
     actionId: number,
     actionArgs: any[],
     namedArgs: CapturedNamedArguments,
@@ -182,7 +182,7 @@ export class ActionState {
 
 class ActionModifierManager implements InternalModifierManager<ActionState, object> {
   create(
-    owner: Owner,
+    owner: InternalOwner,
     element: SimpleElement,
     _state: object,
     { named, positional }: CapturedArguments
diff --git a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
index 84a9078dd01..838a955f387 100644
--- a/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
+++ b/packages/@ember/-internals/glimmer/lib/modifiers/internal.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
@@ -18,7 +18,7 @@ export default class InternalModifier {
   }
 
   constructor(
-    protected owner: Owner,
+    protected owner: InternalOwner,
     protected readonly element: Element,
     protected readonly args: CapturedArguments
   ) {
@@ -58,7 +58,7 @@ export class InternalModifierManager
   constructor(private ModifierClass: typeof InternalModifier, private name: string) {}
 
   create(
-    owner: Owner,
+    owner: InternalOwner,
     element: SimpleElement,
     _definition: unknown,
     args: CapturedArguments
diff --git a/packages/@ember/-internals/glimmer/lib/renderer.ts b/packages/@ember/-internals/glimmer/lib/renderer.ts
index 9e7625728f5..b51175b242c 100644
--- a/packages/@ember/-internals/glimmer/lib/renderer.ts
+++ b/packages/@ember/-internals/glimmer/lib/renderer.ts
@@ -1,6 +1,6 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { getViewElement, getViewId } from '@ember/-internals/views';
@@ -129,7 +129,7 @@ class RootState {
     public root: Component | OutletView,
     public runtime: RuntimeContext,
     context: CompileTimeCompilationContext,
-    owner: Owner,
+    owner: InternalOwner,
     template: Template,
     self: Reference<unknown>,
     parentElement: SimpleElement,
@@ -288,7 +288,7 @@ export class Renderer {
   private _builder: IBuilder;
   private _inRenderTransaction = false;
 
-  private _owner: Owner;
+  private _owner: InternalOwner;
   private _context: CompileTimeCompilationContext;
   private _runtime: RuntimeContext;
 
@@ -315,7 +315,7 @@ export class Renderer {
   }
 
   constructor(
-    owner: Owner,
+    owner: InternalOwner,
     document: SimpleDocument,
     env: { isInteractive: boolean; hasDOM: boolean },
     rootTemplate: TemplateFactory,
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index f5fb7f34124..3671c787b90 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,6 +1,6 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import type { Factory, Owner, RegisterOptions } from '@ember/-internals/owner';
+import type { Factory, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';
 import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
@@ -54,13 +54,17 @@ function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
 }
 
-function componentFor(name: string, owner: Owner): Option<Factory<object> | object> {
   let fullName = `component:${name}`;
+function componentFor(name: string, owner: InternalOwner): Option<Factory<object> | object> {
   return owner.factoryFor(fullName) || null;
 }
 
   let templateFullName = `template:components/${name}`;
-function layoutFor(name: string, owner: Owner, options?: RegisterOptions): Option<Template> {
+function layoutFor(
+  name: string,
+  owner: InternalOwner,
+  options?: RegisterOptions
+): Option<Template> {
 
   return (owner.lookup(templateFullName, options) as Template) || null;
 }
@@ -80,7 +84,7 @@ type LookupResult =
     };
 
 function lookupComponentPair(
-  owner: Owner,
+  owner: InternalOwner,
   name: string,
   options?: RegisterOptions
 ): Option<LookupResult> {
@@ -156,14 +160,16 @@ const BUILTIN_MODIFIERS: Record<string, object> = {
 
 const CLASSIC_HELPER_MANAGER_ASSOCIATED = new _WeakSet();
 
-export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTimeResolver<Owner> {
+export default class ResolverImpl
+  implements RuntimeResolver<InternalOwner>, CompileTimeResolver<InternalOwner>
+{
   private componentDefinitionCache: Map<object, ResolvedComponentDefinition | null> = new Map();
 
   lookupPartial(): null {
     return null;
   }
 
-  lookupHelper(name: string, owner: Owner): Option<HelperDefinitionState> {
+  lookupHelper(name: string, owner: InternalOwner): Option<HelperDefinitionState> {
     assert(
       `You attempted to overwrite the built-in helper "${name}" which is not allowed. Please rename the helper.`,
       !(BUILTIN_HELPERS[name] && owner.hasRegistration(`helper:${name}`))
@@ -212,7 +218,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     return BUILTIN_KEYWORD_HELPERS[name] ?? null;
   }
 
-  lookupModifier(name: string, owner: Owner): Option<ModifierDefinitionState> {
+  lookupModifier(name: string, owner: InternalOwner): Option<ModifierDefinitionState> {
     let builtin = BUILTIN_MODIFIERS[name];
 
     if (builtin !== undefined) {
@@ -236,7 +242,7 @@ export default class ResolverImpl implements RuntimeResolver<Owner>, CompileTime
     return BUILTIN_KEYWORD_MODIFIERS[name] ?? null;
   }
 
-  lookupComponent(name: string, owner: Owner): ResolvedComponentDefinition | null {
+  lookupComponent(name: string, owner: InternalOwner): ResolvedComponentDefinition | null {
     let pair = lookupComponentPair(owner, name);
 
     if (pair === null) {
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
index 8769597b306..5a1c9f3c19a 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/mount.ts
@@ -1,7 +1,7 @@
 /**
 @module ember
 */
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import type { CapturedArguments, Option } from '@glimmer/interfaces';
@@ -54,7 +54,7 @@ import { internalHelper } from '../helpers/internal-helper';
   @public
 */
 export const mountHelper = internalHelper(
-  (args: CapturedArguments, owner?: Owner): Reference<CurriedValue | null> => {
+  (args: CapturedArguments, owner?: InternalOwner): Reference<CurriedValue | null> => {
     assert('{{mount}} must be used within a component that has an owner', owner);
     let nameRef = args.positional[0] as Reference<Option<string>>;
     let captured: CapturedArguments | null;
diff --git a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
index f7e2b290504..682fac47a01 100644
--- a/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/syntax/outlet.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import type { CapturedArguments, DynamicScope } from '@glimmer/interfaces';
@@ -44,7 +44,7 @@ import type { OutletState } from '../utils/outlet';
   @public
 */
 export const outletHelper = internalHelper(
-  (_args: CapturedArguments, owner?: Owner, scope?: DynamicScope) => {
+  (_args: CapturedArguments, owner?: InternalOwner, scope?: DynamicScope) => {
     assert('Expected owner to be present, {{outlet}} requires an owner', owner);
     assert(
       'Expected dynamic scope to be present. You may have attempted to use the {{outlet}} keyword dynamically. This keyword cannot be used dynamically.',
diff --git a/packages/@ember/-internals/glimmer/lib/utils/managers.ts b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
index 5c2876b9ac4..2f2f47e5286 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/managers.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/managers.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { ComponentManager } from '@glimmer/interfaces';
 import {
   componentCapabilities as glimmerComponentCapabilities,
@@ -18,7 +18,7 @@ import {
    @public
   */
 export function setComponentManager<T extends object>(
-  manager: (owner: Owner) => ComponentManager<unknown>,
+  manager: (owner: InternalOwner) => ComponentManager<unknown>,
   obj: T
 ): T {
   return glimmerSetComponentManager(manager, obj);
diff --git a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
index 94d17850c01..f6f331e3eea 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/outlet.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { Template, TemplateFactory } from '@glimmer/interfaces';
 
 export interface RenderState {
@@ -7,7 +7,7 @@ export interface RenderState {
    *
    * Maybe this is for the render helper?
    */
-  owner: Owner;
+  owner: InternalOwner;
 
   /**
    * The name of the parent outlet state.
diff --git a/packages/@ember/-internals/glimmer/lib/views/outlet.ts b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
index 8e2153f88cd..c3bfd7be757 100644
--- a/packages/@ember/-internals/glimmer/lib/views/outlet.ts
+++ b/packages/@ember/-internals/glimmer/lib/views/outlet.ts
@@ -1,9 +1,12 @@
-import type { Owner } from '@ember/-internals/owner';
-import { getOwner } from '@ember/-internals/owner';
+// We use the `InternalOwner` notion here because we actually need all of its
+// API for using with renderers (normally, it will be `EngineInstance`).
+// We use `getOwner` from our internal home for it rather than the narrower
+// public API for the same reason.
+import { type InternalOwner, getOwner } from '@ember/-internals/owner';
 import type { BootOptions } from '@ember/engine/instance';
 import { assert } from '@ember/debug';
 import { schedule } from '@ember/runloop';
-import type { Template } from '@glimmer/interfaces';
+import type { Template, TemplateFactory } from '@glimmer/interfaces';
 import type { Reference } from '@glimmer/reference';
 import { createComputeRef, updateRef } from '@glimmer/reference';
 import { consumeTag, createTag, dirtyTag } from '@glimmer/validator';
@@ -39,7 +42,11 @@ export default class OutletView {
     Object.assign(this, injections);
   }
 
-  static create(options: any): OutletView {
+  static create(options: {
+    environment: BootEnvironment;
+    application: InternalOwner;
+    template: TemplateFactory;
+  }): OutletView {
     let { environment: _environment, application: namespace, template: templateFactory } = options;
     let owner = getOwner(options);
     assert('OutletView is unexpectedly missing an owner', owner);
@@ -52,7 +59,7 @@ export default class OutletView {
 
   constructor(
     private _environment: BootEnvironment,
-    public owner: Owner,
+    public owner: InternalOwner,
     public template: Template,
     public namespace: any
   ) {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
index b0513a5fe9e..260a61c4574 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
+++ b/packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts
@@ -7,7 +7,7 @@ import {
 
 import { ENV } from '@ember/-internals/environment';
 import { Component, setComponentManager } from '@ember/-internals/glimmer';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
 import { assert, captureRenderTree } from '@ember/debug';
@@ -1352,7 +1352,7 @@ if (ENV._DEBUG_RENDER_TREE) {
         ]);
       }
 
-      get owner(): Owner {
+      get owner(): InternalOwner {
         return this.applicationInstance!;
       }
 
@@ -1516,7 +1516,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         this.addComponent('hello-world', {
           ComponentClass: class extends Component {
-            constructor(owner: Owner) {
+            constructor(owner: InternalOwner) {
               super(owner);
               throw new Error('oops!');
             }
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index c29ba9b5d6c..e77f498c4ec 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -14,6 +14,24 @@ import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
  */
 export type FullName = `${string}:${string}`;
 
+/**
+ * Framework objects in an Ember application (components, services, routes,
+ * etc.) are created via a factory and dependency injection system. Each of
+ * these objects is the responsibility of an "owner", which handles its
+ * instantiation and manages its lifetime.
+ *
+ * An `Owner` is not a class you construct; it is one the framework constructs
+ * for you. The normal way to get access to the relevant `Owner` is using the
+ * `getOwner` function.
+ *
+ * @for @ember/owner
+ * @since 4.10.0
+ * @public
+ */
+export default interface Owner {
+  // TODO: expand this to the public API
+}
+
 export interface RegisterOptions {
   instantiate?: boolean | undefined;
   singleton?: boolean | undefined;
@@ -57,9 +75,6 @@ export function isFactory(obj: unknown): obj is Factory<object> {
   return obj != null && typeof (obj as Factory<object>).create === 'function';
 }
 
-// A combination of the public methods on ContainerProxyMixin and RegistryProxyMixin
-export interface Owner extends IRegistry, IContainer {}
-
 /**
   Framework objects in an Ember application (components, services, routes, etc.)
   are created via a factory and dependency injection system. Each of these
@@ -104,7 +119,7 @@ export interface Owner extends IRegistry, IContainer {}
   @since 2.3.0
   @public
 */
-export function getOwner(object: any): Owner | undefined {
+export function getOwner(object: object): InternalOwner | undefined {
   return glimmerGetOwner(object);
 }
 
@@ -123,3 +138,5 @@ export function getOwner(object: any): Owner | undefined {
 export function setOwner(object: any, owner: Owner): void {
   glimmerSetOwner(object, owner);
 }
+
+export interface InternalOwner extends IRegistry, IContainer {}
diff --git a/packages/@ember/-internals/views/lib/component_lookup.ts b/packages/@ember/-internals/views/lib/component_lookup.ts
index 2b393584652..6a70b24e6ef 100644
--- a/packages/@ember/-internals/views/lib/component_lookup.ts
+++ b/packages/@ember/-internals/views/lib/component_lookup.ts
@@ -2,13 +2,13 @@ import type { InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import EmberObject from '@ember/object';
 
 export default EmberObject.extend({
-  componentFor(name: string, owner: Owner) {
     let fullName = `component:${name}`;
+  componentFor(name: string, owner: InternalOwner) {
     return owner.factoryFor(fullName);
   },
 
     let templateFullName = `template:components/${name}`;
-  layoutFor(name: string, owner: Owner, options: RegisterOptions) {
+  layoutFor(name: string, owner: InternalOwner, options: RegisterOptions) {
     return owner.lookup(templateFullName, options);
   },
 });
diff --git a/packages/@ember/-internals/views/lib/system/utils.ts b/packages/@ember/-internals/views/lib/system/utils.ts
index cbcfc94833b..e6c3378b9ef 100644
--- a/packages/@ember/-internals/views/lib/system/utils.ts
+++ b/packages/@ember/-internals/views/lib/system/utils.ts
@@ -1,5 +1,5 @@
 import type { View } from '@ember/-internals/glimmer/lib/renderer';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { guidFor } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
@@ -38,7 +38,7 @@ export function constructStyleDeprecationMessage(affectedStyle: string): string
   @method getRootViews
   @param {Object} owner
 */
-export function getRootViews(owner: Owner): View[] {
+export function getRootViews(owner: InternalOwner): View[] {
   let registry = owner.lookup('-view-registry:main') as Dict<View>;
 
   let rootViews: View[] = [];
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index 34cf4dc36d9..c648d08bbf5 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -1,11 +1,11 @@
 import type { EventDispatcher } from '@ember/-internals/views';
 import Application, { getOwner, setOwner } from '@ember/application';
 import type ApplicationInstance from '@ember/application/instance';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 
 import { expectTypeOf } from 'expect-type';
 
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 class App extends Application {
   rootElement = '#ember-application';
@@ -61,6 +61,6 @@ class App2 extends Application {
 
 new App2(owner);
 
-expectTypeOf(getOwner('foo')).toEqualTypeOf<Owner | undefined>();
+expectTypeOf(getOwner({})).toEqualTypeOf<InternalOwner | undefined>();
 
-expectTypeOf(setOwner('foo', {} as Owner)).toEqualTypeOf<void>();
+expectTypeOf(setOwner({}, {} as InternalOwner)).toEqualTypeOf<void>();
diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts
index d1e121d367f..c8dbfa20a13 100644
--- a/packages/@ember/component/type-tests/helper/index.test.ts
+++ b/packages/@ember/component/type-tests/helper/index.test.ts
@@ -1,10 +1,10 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { FrameworkObject } from '@ember/object/-internals';
 import Helper from '@ember/component/helper';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 // NOTE: The types for `compute` are not actually safe. Glint helps with this.
 
diff --git a/packages/@ember/component/type-tests/set-component-manager.test.ts b/packages/@ember/component/type-tests/set-component-manager.test.ts
index ee2b87c4d50..d7d7da5d815 100644
--- a/packages/@ember/component/type-tests/set-component-manager.test.ts
+++ b/packages/@ember/component/type-tests/set-component-manager.test.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { setComponentManager } from '@ember/component';
 import type { ComponentManager } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
@@ -9,7 +9,7 @@ let manager = {} as ComponentManager<unknown>;
 class Foo {}
 let foo = new Foo();
 
-expectTypeOf(setComponentManager((_owner: Owner) => manager, foo)).toEqualTypeOf<Foo>();
+expectTypeOf(setComponentManager((_owner: InternalOwner) => manager, foo)).toEqualTypeOf<Foo>();
 
 // @ts-expect-error invalid callback
 setComponentManager(() => {
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
index 70874c0f95d..37fc6eb3972 100644
--- a/packages/@ember/controller/type-tests/index.test.ts
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -1,10 +1,10 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import Controller, { inject } from '@ember/controller';
 
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 class Foo {}
 
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 751e527ab5d..43e490de888 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1,7 +1,7 @@
 import { classify, dasherize } from '@ember/string';
 import EmberObject from '@ember/object';
 import { typeOf } from '@ember/utils';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import type { Resolver } from '@ember/owner';
 import Namespace from '@ember/application/namespace';
@@ -45,7 +45,7 @@ import Namespace from '@ember/application/namespace';
   @public
 */
 export default class ContainerDebugAdapter extends EmberObject {
-  constructor(owner: Owner) {
+  constructor(owner: InternalOwner) {
     super(owner);
 
     this.resolver = getOwner(this)!.lookup('resolver-for-debugging:main') as Resolver;
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index f041358c8f3..bc02dc4b5c9 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { _backburner, next } from '@ember/runloop';
 import { get } from '@ember/object';
@@ -219,7 +219,7 @@ export default class DataAdapter<T> extends EmberObject {
   // TODO: Revisit this
   declare containerDebugAdapter: ContainerDebugAdapter;
 
-  constructor(owner: Owner) {
+  constructor(owner: InternalOwner) {
     super(owner);
     this.containerDebugAdapter = getOwner(this)!.lookup(
       'container-debug-adapter:main'
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 564d4b23cb2..2992e172424 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -1,5 +1,5 @@
 import type { Renderer } from '@ember/-internals/glimmer';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { CapturedRenderNode } from '@glimmer/interfaces';
 import { expect } from '@glimmer/util';
 
@@ -19,7 +19,7 @@ import { expect } from '@glimmer/util';
   @param app {ApplicationInstance} An `ApplicationInstance`.
   @since 3.14.0
 */
-export default function captureRenderTree(app: Owner): CapturedRenderNode[] {
+export default function captureRenderTree(app: InternalOwner): CapturedRenderNode[] {
   // SAFETY: Ideally we'd assert here but that causes awkward circular requires since this is also in @ember/debug.
   // This is only for debug stuff so not very risky.
   let renderer = expect(app.lookup('renderer:-dom') as Renderer, `BUG: owner is missing renderer`);
diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts
index b5e28dda8e5..8addb071500 100644
--- a/packages/@ember/engine/type-tests/instance.test.ts
+++ b/packages/@ember/engine/type-tests/instance.test.ts
@@ -1,13 +1,13 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import EngineInstance from '@ember/engine/instance';
 import type EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
 expectTypeOf<EngineInstance>().toMatchTypeOf<EmberObject>();
-expectTypeOf<EngineInstance>().toMatchTypeOf<Owner>();
+expectTypeOf<EngineInstance>().toMatchTypeOf<InternalOwner>();
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 let instance = new EngineInstance(owner);
 
 expectTypeOf(instance.boot()).resolves.toEqualTypeOf<EngineInstance>();
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index a6f2ac8613e..5a4a3fe6167 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -3,8 +3,7 @@
 */
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
-import { getOwner } from '@ember/-internals/owner';
-import type { Owner } from '@ember/-internals/owner';
+import { type default as Owner, getOwner } from '@ember/-internals/owner';
 import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
 import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal';
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index a8efec698f2..79654847ceb 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -1,9 +1,9 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import CoreObject from '@ember/object/core';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
 
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index dbe809bdc70..adbcfd555c1 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -1,10 +1,10 @@
 import { expectTypeOf } from 'expect-type';
 
 import EmberObject from '@ember/object';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 expectTypeOf(EmberObject.create()).toEqualTypeOf<EmberObject>();
 
@@ -106,7 +106,7 @@ Person.reopenClass({ fullName: 6 });
 class MyComponent extends EmberObject {
   foo = 'bar';
 
-  constructor(owner: Owner) {
+  constructor(owner: InternalOwner) {
     super(owner);
 
     this.addObserver('foo', this, 'fooDidChange');
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
index f4c4f5bda8d..3b524dacd4d 100644
--- a/packages/@ember/object/type-tests/events/index.test.ts
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -2,7 +2,7 @@ import { addListener, removeListener, sendEvent } from '@ember/object/events';
 
 import EmberObject from '@ember/object';
 import { on } from '@ember/object/evented';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 
 class Job extends EmberObject {
   logStartOrUpdate = on('started', 'updated', () => {
@@ -23,7 +23,7 @@ sendEvent(job, 'updated'); // Logs 'Job updated!'
 sendEvent(job, 'completed'); // Logs 'Job completed!'
 
 class MyClass extends EmberObject {
-  constructor(owner: Owner) {
+  constructor(owner: InternalOwner) {
     super(owner);
     addListener(this, 'willDestroy', this, 'willDestroyListener');
     addListener(this, 'willDestroy', this, 'willDestroyListener', true);
diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
index e9d302ce726..f6c1a92472d 100644
--- a/packages/@ember/routing/lib/generate_controller.ts
+++ b/packages/@ember/routing/lib/generate_controller.ts
@@ -1,5 +1,5 @@
 import { get } from '@ember/-internals/metal';
-import type { Factory, Owner } from '@ember/-internals/owner';
+import type { Factory, default as Owner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import { assert, info } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 9e45c5dec7f..f3fbb7dad4f 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -5,7 +5,7 @@ import {
   descriptorForProperty,
   flushAsyncObservers,
 } from '@ember/-internals/metal';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/routing/-internals';
 import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object';
@@ -273,7 +273,7 @@ class Route<T = unknown>
   declare _topLevelViewTemplate: any;
   declare _environment: any;
 
-  constructor(owner: Owner) {
+  constructor(owner: InternalOwner) {
     super(owner);
 
     if (owner) {
@@ -2195,7 +2195,7 @@ function buildRenderOptions(
 }
 
 export interface RenderOptions {
-  owner: Owner;
+  owner: InternalOwner;
   into?: string;
   outlet: string;
   name: string;
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 73947ae2c30..7cd81388c90 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -1,8 +1,8 @@
 import { privatize as P } from '@ember/-internals/container';
 import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
 import { computed, get, set } from '@ember/object';
-import type { Factory, FactoryClass, Owner } from '@ember/-internals/owner';
-import { getOwner } from '@ember/-internals/owner';
+import type { Factory, FactoryClass, default as Owner } from '@ember/-internals/owner';
+import { getOwner, type InternalOwner } from '@ember/-internals/owner';
 import { BucketCache, DSL, RouterState } from '@ember/routing/-internals';
 import type { DSLCallback, EngineRouteInfo } from '@ember/routing/-internals';
 import {
@@ -1694,16 +1694,22 @@ function findRouteStateName(route: Route, state: string) {
   is in the Router's map and the owner has a registration for that route.
 
   @private
-  @param {Owner} owner
+  @param {InternalOwner} owner
   @param {Router} router
   @param {String} localName
   @param {String} fullName
   @return {Boolean}
 */
-function routeHasBeenDefined(owner: Owner, router: any, localName: string, fullName: string) {
+function routeHasBeenDefined(
+  owner: InternalOwner,
+  router: any,
+  localName: string,
+  fullName: string
+) {
   let routerHasRoute = router.hasRoute(fullName);
   let ownerHasRoute =
-    owner.hasRegistration(`template:${localName}`) || owner.hasRegistration(`route:${localName}`);
+    owner.hasRegistration(`template:${localName}` as const) ||
+    owner.hasRegistration(`route:${localName}` as const);
   return routerHasRoute && ownerHasRoute;
 }
 
diff --git a/packages/@ember/routing/type-tests/auto-location.test.ts b/packages/@ember/routing/type-tests/auto-location.test.ts
index ef04fdde681..c493b0b923a 100644
--- a/packages/@ember/routing/type-tests/auto-location.test.ts
+++ b/packages/@ember/routing/type-tests/auto-location.test.ts
@@ -1,11 +1,11 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type EmberObject from '@ember/object';
 import AutoLocation from '@ember/routing/auto-location';
 import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/hash-location.test.ts b/packages/@ember/routing/type-tests/hash-location.test.ts
index 3fd50fe8d7a..a7cf73649b0 100644
--- a/packages/@ember/routing/type-tests/hash-location.test.ts
+++ b/packages/@ember/routing/type-tests/hash-location.test.ts
@@ -2,10 +2,10 @@ import type { ILocation } from '@ember/routing/location';
 import type EmberObject from '@ember/object';
 import HashLocation from '@ember/routing/hash-location';
 import { expectTypeOf } from 'expect-type';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/history-location.test.ts b/packages/@ember/routing/type-tests/history-location.test.ts
index c3fe61e6eeb..74f99cdc303 100644
--- a/packages/@ember/routing/type-tests/history-location.test.ts
+++ b/packages/@ember/routing/type-tests/history-location.test.ts
@@ -1,11 +1,11 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type EmberObject from '@ember/object';
 import HistoryLocation from '@ember/routing/history-location';
 import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/none-location.test.ts b/packages/@ember/routing/type-tests/none-location.test.ts
index 63fe6cbeca3..2388974ce80 100644
--- a/packages/@ember/routing/type-tests/none-location.test.ts
+++ b/packages/@ember/routing/type-tests/none-location.test.ts
@@ -2,10 +2,10 @@ import type EmberObject from '@ember/object';
 import NoneLocation from '@ember/routing/none-location';
 import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/route/index.test.ts b/packages/@ember/routing/type-tests/route/index.test.ts
index 72d4c8dced5..8e441847e95 100644
--- a/packages/@ember/routing/type-tests/route/index.test.ts
+++ b/packages/@ember/routing/type-tests/route/index.test.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type Controller from '@ember/controller';
 import type EmberObject from '@ember/object';
 import Route from '@ember/routing/route';
@@ -6,7 +6,7 @@ import { expectTypeOf } from 'expect-type';
 import type { Transition } from 'router_js';
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 let route = new Route(owner);
 
 expectTypeOf(route).toMatchTypeOf<EmberObject>();
diff --git a/packages/@ember/routing/type-tests/route/overrides.test.ts b/packages/@ember/routing/type-tests/route/overrides.test.ts
index cdc718ac1f4..dd9096aaa6f 100644
--- a/packages/@ember/routing/type-tests/route/overrides.test.ts
+++ b/packages/@ember/routing/type-tests/route/overrides.test.ts
@@ -1,11 +1,11 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type Controller from '@ember/controller';
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 import type { Transition } from 'router_js';
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 class Foo {}
 
 class MyRoute extends Route<Foo> {
diff --git a/packages/@ember/routing/type-tests/route/query-params.test.ts b/packages/@ember/routing/type-tests/route/query-params.test.ts
index ccb5dd61645..9683a6e2b40 100644
--- a/packages/@ember/routing/type-tests/route/query-params.test.ts
+++ b/packages/@ember/routing/type-tests/route/query-params.test.ts
@@ -1,8 +1,8 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import Route from '@ember/routing/route';
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 class MyRoute extends Route {
   queryParams = {
diff --git a/packages/@ember/routing/type-tests/route/send.test.ts b/packages/@ember/routing/type-tests/route/send.test.ts
index 2ab8c12b9fc..4af75023eb7 100644
--- a/packages/@ember/routing/type-tests/route/send.test.ts
+++ b/packages/@ember/routing/type-tests/route/send.test.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 
@@ -12,7 +12,7 @@ class MyRoute extends Route {
 }
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 let route = new MyRoute(owner);
 
 route.send('topLevel', 1);
diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts
index af38e67e211..35b096a41aa 100644
--- a/packages/@ember/routing/type-tests/router-service.test.ts
+++ b/packages/@ember/routing/type-tests/router-service.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-self-assign */
 
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { ILocation as EmberLocation } from '@ember/routing/location';
 import type Route from '@ember/routing/route';
 import type { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
@@ -10,7 +10,7 @@ import { expectTypeOf } from 'expect-type';
 import type { Transition } from 'router_js';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 class Post {}
 class Comment {}
diff --git a/packages/@ember/routing/type-tests/router/index.test.ts b/packages/@ember/routing/type-tests/router/index.test.ts
index bc1f3ab7690..56bda0e0cc8 100644
--- a/packages/@ember/routing/type-tests/router/index.test.ts
+++ b/packages/@ember/routing/type-tests/router/index.test.ts
@@ -1,4 +1,4 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type EmberObject from '@ember/object';
 import type Evented from '@ember/object/evented';
 import type { ILocation } from '@ember/routing/location';
@@ -10,7 +10,7 @@ expectTypeOf<Router>().toMatchTypeOf<EmberObject>();
 expectTypeOf<Router>().toMatchTypeOf<Evented>();
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 let router = new Router(owner);
 
 expectTypeOf(router.rootURL).toEqualTypeOf<string>();
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
index 9a40d164ffc..b5aefd67a63 100644
--- a/packages/@ember/service/type-tests/index.test.ts
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -1,11 +1,11 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
 import type { FrameworkObject } from '@ember/object/-internals';
 import EmberObject from '@ember/object';
 import Service, { inject, service } from '@ember/service';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as Owner;
+let owner = {} as InternalOwner;
 
 class MainService extends Service {}
 class FooService extends Service {}
diff --git a/packages/internal-test-helpers/lib/registry-check.ts b/packages/internal-test-helpers/lib/registry-check.ts
index b6b1f65a7b2..b023c30c91b 100644
--- a/packages/internal-test-helpers/lib/registry-check.ts
+++ b/packages/internal-test-helpers/lib/registry-check.ts
@@ -1,5 +1,9 @@
-import type { Owner } from '@ember/-internals/owner';
+import type { FullName, InternalOwner } from '@ember/-internals/owner';
 
-export function verifyRegistration(assert: QUnit['assert'], owner: Owner, fullName: string) {
+export function verifyRegistration(
+  assert: QUnit['assert'],
+  owner: InternalOwner,
+  fullName: FullName
+) {
   assert.ok(owner.resolveRegistration(fullName), `has registration: ${fullName}`);
 }

From 50e6aac43df62bede934147157803b086d42a5d6 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:42:50 -0700
Subject: [PATCH 1237/1405] Debug-fail on type-unsafety with `assert`s

In a number of places, fixing up the types caught issues with type
safety which came down to optionality/nullability. Since the existing
code *assumes* that is always valid, make that assumption visible to TS
in the form of debug assertions.
---
 .../glimmer/lib/component-managers/root.ts    |  5 ++-
 .../@ember/-internals/glimmer/lib/resolver.ts |  5 +--
 packages/@ember/object/core.ts                |  6 ++-
 .../@ember/routing/lib/generate_controller.ts | 12 +++++-
 packages/@ember/routing/router.ts             | 41 +++++++++++++++----
 5 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
index 7dc608f6ada..96039c6ef3f 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/root.ts
@@ -1,4 +1,5 @@
 import { getFactoryFor } from '@ember/-internals/container';
+import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
 import type {
@@ -105,6 +106,8 @@ export class RootComponentDefinition implements ComponentDefinition {
 
   constructor(component: Component) {
     this.manager = new RootComponentManager(component);
-    this.state = getFactoryFor(component);
+    let factory = getFactoryFor(component);
+    assert('missing factory for component', factory !== undefined);
+    this.state = factory;
   }
 }
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 3671c787b90..55e2ede3768 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -293,10 +293,9 @@ export default class ResolverImpl
         };
       }
     } else {
-      assert(`missing component class ${name}`, pair.component.class !== undefined);
-
       let factory = pair.component;
-      let ComponentClass = factory.class!;
+      assert(`missing component class ${name}`, factory.class !== undefined);
+      let ComponentClass = factory.class;
       let manager = getInternalComponentManager(ComponentClass);
 
       definition = {
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index 5a4a3fe6167..c3b081bf3b9 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -260,7 +260,7 @@ class CoreObject {
 
       /* globals Proxy Reflect */
       self = new Proxy(this, {
-        get(target: typeof this & HasUnknownProperty, property, receiver) {
+        get(target: CoreObject & HasUnknownProperty, property, receiver) {
           if (property === PROXY_CONTENT) {
             return target;
           } else if (
@@ -768,7 +768,9 @@ class CoreObject {
 
     if (props !== undefined) {
       instance = new this(getOwner(props));
-      setFactoryFor(instance, getFactoryFor(props));
+      let factory = getFactoryFor(props);
+      assert(`missing factory when creating object ${instance}`, factory !== undefined);
+      setFactoryFor(instance, factory);
     } else {
       instance = new this();
     }
diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
index f6c1a92472d..81f919e9fef 100644
--- a/packages/@ember/routing/lib/generate_controller.ts
+++ b/packages/@ember/routing/lib/generate_controller.ts
@@ -17,7 +17,17 @@ import { DEBUG } from '@glimmer/env';
 */
 
 export function generateControllerFactory(owner: Owner, controllerName: string): Factory<{}> {
-  let Factory = (owner.factoryFor('controller:basic') as Factory<any, any>).class;
+  let factoryManager = owner.factoryFor('controller:basic');
+  assert(
+    '[BUG] unexpectedly missing a factoryManager for `controller:basic`',
+    factoryManager !== undefined
+  );
+
+  let Factory = factoryManager.class;
+  assert(
+    '[BUG] factory for `controller:main` is unexpectedly not a Controller',
+    ((factory): factory is typeof Controller => factory === Controller)(Factory)
+  );
 
   Factory = Factory.extend({
     toString() {
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 7cd81388c90..03bd04f52cd 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -1,7 +1,11 @@
 import { privatize as P } from '@ember/-internals/container';
-import type { OutletState as GlimmerOutletState, OutletView } from '@ember/-internals/glimmer';
+import type {
+  BootEnvironment,
+  OutletState as GlimmerOutletState,
+  OutletView,
+} from '@ember/-internals/glimmer';
 import { computed, get, set } from '@ember/object';
-import type { Factory, FactoryClass, default as Owner } from '@ember/-internals/owner';
+import type { default as Owner, FactoryManager } from '@ember/owner';
 import { getOwner, type InternalOwner } from '@ember/-internals/owner';
 import { BucketCache, DSL, RouterState } from '@ember/routing/-internals';
 import type { DSLCallback, EngineRouteInfo } from '@ember/routing/-internals';
@@ -44,6 +48,8 @@ import type { Timer } from 'backburner';
 import EngineInstance from '@ember/engine/instance';
 import type { QueryParams } from 'route-recognizer';
 import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
+import type { Template } from '@glimmer/interfaces';
+import type ApplicationInstance from '@ember/application/instance';
 
 /**
 @module @ember/routing/router
@@ -645,15 +651,34 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
     if (!this._toplevelView) {
       let owner = getOwner(this);
       assert('Router is unexpectedly missing an owner', owner);
-      let OutletView = owner.factoryFor('view:-outlet') as Factory<OutletView, FactoryClass>;
-      let application = owner.lookup('application:main');
-      let environment = owner.lookup('-environment:main');
-      let template = owner.lookup('template:-outlet');
+
+      // SAFETY: we don't presently have any type registries internally to make
+      // this safe, so in each of these cases we assume that nothing *else* is
+      // registered at this `FullName`, and simply check to make sure that
+      // *something* is.
+      let OutletView = owner.factoryFor('view:-outlet') as FactoryManager<OutletView> | undefined;
+      assert('[BUG] unexpectedly missing `view:-outlet`', OutletView !== undefined);
+
+      let application = owner.lookup('application:main') as Owner | undefined;
+      assert('[BUG] unexpectedly missing `application:-main`', application !== undefined);
+
+      let environment = owner.lookup('-environment:main') as BootEnvironment | undefined;
+      assert('[BUG] unexpectedly missing `-environment:main`', environment !== undefined);
+
+      let template = owner.lookup('template:-outlet') as Template | undefined;
+      assert('[BUG] unexpectedly missing `template:-outlet`', template !== undefined);
+
       this._toplevelView = OutletView.create({ environment, template, application });
       this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
-      let instance: any = owner.lookup('-application-instance:main');
+
+      let instance = owner.lookup('-application-instance:main') as ApplicationInstance | undefined;
+      assert('[BUG] unexpectedly missing `-application-instance:main`', instance !== undefined);
+
       if (instance) {
-        instance.didCreateRootView(this._toplevelView);
+        // SAFETY: LOL. This is calling a deprecated API with a type that we
+        // cannot actually confirm at a type level *is* a `ViewMixin`. Seems:
+        // not great on multiple fronts!
+        instance.didCreateRootView(this._toplevelView as any);
       }
     } else {
       this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);

From 18be345ea7cf90f389769f15a0ac4d20ea033aad Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 18:08:42 -0700
Subject: [PATCH 1238/1405] Distinguish `Factory` and `InternalFactory`

Like with our distinction between `Owner` and `InternalOwner`, the
notion of a `Factory` as we use it internally is somewhat richer than
what we provide as a public interface. Thus, add an `InternalFactory`
type which extends the public `Factory` interface, and update the
internals which previously referred to `Factory` to refer to the new
type instead.

In a future cleanup pass, we can likely remove many of these uses of
`InternalFactory` in favor of using *only* the public API for `Factory`
from instead, and that will help smooth the path to removing many of
these unnecessary extra details.
---
 .../-internals/container/lib/container.ts     | 15 ++++----
 .../-internals/container/lib/registry.ts      | 18 +++++-----
 .../glimmer/lib/component-managers/curly.ts   |  4 +--
 .../@ember/-internals/glimmer/lib/helper.ts   |  6 ++--
 .../@ember/-internals/glimmer/lib/resolver.ts | 11 +++---
 packages/@ember/-internals/owner/index.ts     | 36 ++++++++++++++++---
 packages/@ember/routing/lib/dsl.ts            |  4 +--
 .../@ember/routing/lib/generate_controller.ts |  9 +++--
 .../lib/test-cases/rendering.ts               | 12 +++----
 .../lib/test-cases/router-non-application.ts  |  4 +--
 .../test-cases/test-resolver-application.ts   |  4 +--
 .../lib/test-resolver.ts                      |  8 ++---
 12 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 438859bc52e..0e8977259c1 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -1,5 +1,5 @@
 import type {
-  Factory,
+  InternalFactory,
   FactoryClass,
   InternalOwner,
   RegisterOptions,
@@ -145,7 +145,10 @@ export default class Container {
    @param {RegisterOptions} [options]
    @return {any}
    */
-  lookup(fullName: string, options?: RegisterOptions): Factory<object> | object | undefined {
+  lookup(
+    fullName: string,
+    options?: RegisterOptions
+  ): InternalFactory<object> | object | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
     }
@@ -268,8 +271,8 @@ function isInstantiatable(container: Container, fullName: string) {
 function lookup(
   container: Container,
   fullName: string,
-): Factory<object> | object | undefined {
   options: RegisterOptions = {}
+): InternalFactory<object> | object | undefined {
   let normalizedName = fullName;
 
   if (
@@ -370,8 +373,8 @@ function instantiateFactory(
   container: Container,
   normalizedName: string,
   fullName: string,
-): Factory<object> | object | undefined {
   options: RegisterOptions
+): InternalFactory<object> | object | undefined {
   let factoryManager = factoryFor(container, normalizedName, fullName);
 
   if (factoryManager === undefined) {
@@ -450,7 +453,7 @@ export interface LazyInjection {
 }
 
 declare interface DebugFactory<T extends object, C extends FactoryClass | object = FactoryClass>
-  extends Factory<T, C> {
+  extends InternalFactory<T, C> {
   _onLookup?: (fullName: string) => void;
   _initFactory?: (factoryManager: FactoryManager<T, C>) => void;
   _lazyInjections(): { [key: string]: LazyInjection };
@@ -477,7 +480,7 @@ export class FactoryManager<T extends object, C extends FactoryClass | object =
 
   constructor(
     container: Container,
-    factory: Factory<T, C>,
+    factory: InternalFactory<T, C>,
     fullName: string,
     normalizedName: string
   ) {
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index db07d333cda..e8ae27c06eb 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,4 +1,4 @@
-import type { Factory, Resolver, RegisterOptions } from '@ember/-internals/owner';
+import type { InternalFactory, Resolver, RegisterOptions } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import type { set } from '@ember/object';
@@ -58,10 +58,10 @@ export default class Registry implements IRegistry {
   readonly _failSet: Set<string>;
   resolver: Resolver | null;
   readonly fallback: IRegistry | null;
-  readonly registrations: Record<string, Factory<object> | object>;
   readonly _normalizeCache: Record<string, string>;
-  readonly _resolveCache: Record<string, Factory<object> | object>;
+  readonly registrations: Record<string, InternalFactory<object> | object>;
   readonly _options: Record<string, RegisterOptions>;
+  readonly _resolveCache: Record<string, InternalFactory<object> | object>;
   readonly _typeOptions: Record<string, RegisterOptions>;
 
   set?: typeof set;
@@ -168,12 +168,12 @@ export default class Registry implements IRegistry {
   ): void;
   register<T extends object, C extends FactoryClass | object>(
     fullName: string,
-    factory: Factory<T, C>,
+    factory: InternalFactory<T, C>,
     options?: RegisterOptions
   ): void;
   register(
     fullName: string,
-    factory: object | Factory<object>,
+    factory: object | InternalFactory<object>,
     options: RegisterOptions = {}
   ): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
@@ -252,7 +252,7 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @return {Function} fullName's factory
    */
-  resolve(fullName: string): Factory<object> | object | undefined {
+  resolve(fullName: string): InternalFactory<object> | object | undefined {
     let factory = resolve(this, this.normalize(fullName));
     if (factory === undefined && this.fallback !== null) {
       factory = this.fallback.resolve(fullName);
@@ -324,7 +324,7 @@ export default class Registry implements IRegistry {
    @param {string} fullName
    @return {function} toString function
    */
-  makeToString(factory: Factory<object>, fullName: string): string {
+  makeToString(factory: InternalFactory<object>, fullName: string): string {
     if (this.resolver !== null && this.resolver.makeToString) {
       return this.resolver.makeToString(factory, fullName);
     } else if (this.fallback !== null) {
@@ -545,7 +545,7 @@ if (DEBUG) {
 function resolve(
   registry: Registry,
   _normalizedName: string
-): Factory<object> | object | undefined {
+): InternalFactory<object> | object | undefined {
   let normalizedName = _normalizedName;
 
   let cached = registry._resolveCache[normalizedName];
@@ -556,7 +556,7 @@ function resolve(
     return;
   }
 
-  let resolved: Factory<object> | object | undefined;
+  let resolved: InternalFactory<object> | object | undefined;
 
   if (registry.resolver) {
     resolved = registry.resolver.resolve(normalizedName);
diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index c9ef1717268..dd7fdeac0a1 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,5 +1,5 @@
 import { getOwner, setOwner } from '@ember/-internals/owner';
-import type { Factory, default as Owner } from '@ember/-internals/owner';
+import type { InternalFactory, default as Owner } from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
@@ -104,7 +104,7 @@ const EMPTY_POSITIONAL_ARGS: Reference[] = [];
 
 debugFreeze(EMPTY_POSITIONAL_ARGS);
 
-type ComponentFactory = Factory<
+type ComponentFactory = InternalFactory<
   Component,
   {
     create(props?: any): Component;
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index 82254766ac2..e65a3792b43 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -3,7 +3,7 @@
 */
 
 import type { FactoryManager } from '@ember/-internals/container/lib/container';
-import type { Factory, InternalOwner } from '@ember/-internals/owner';
+import type { InternalFactory, InternalOwner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/object/-internals';
 import { getDebugName } from '@ember/-internals/utils';
@@ -21,11 +21,11 @@ export type HelperFunction<T, P extends unknown[], N extends Dict<unknown>> = (
   named: N
 ) => T;
 
-export type SimpleHelperFactory<T, P extends unknown[], N extends Dict<unknown>> = Factory<
+export type SimpleHelperFactory<T, P extends unknown[], N extends Dict<unknown>> = InternalFactory<
   SimpleHelper<T, P, N>,
   HelperFactory<SimpleHelper<T, P, N>>
 >;
-export type ClassHelperFactory = Factory<HelperInstance, HelperFactory<HelperInstance>>;
+export type ClassHelperFactory = InternalFactory<HelperInstance, HelperFactory<HelperInstance>>;
 
 export interface HelperFactory<T> {
   isHelperFactory: true;
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 55e2ede3768..ec9c6427fc6 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -1,6 +1,6 @@
 import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
-import type { Factory, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
+import type { InternalFactory, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';
 import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
@@ -55,7 +55,10 @@ function instrumentationPayload(name: string) {
 }
 
   let fullName = `component:${name}`;
-function componentFor(name: string, owner: InternalOwner): Option<Factory<object> | object> {
+function componentFor(
+  name: string,
+  owner: InternalOwner
+): Option<InternalFactory<object> | object> {
   return owner.factoryFor(fullName) || null;
 }
 
@@ -71,11 +74,11 @@ function layoutFor(
 
 type LookupResult =
   | {
-      component: Factory<object>;
+      component: InternalFactory<object>;
       layout: TemplateFactory;
     }
   | {
-      component: Factory<object>;
+      component: InternalFactory<object>;
       layout: null;
     }
   | {
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index e77f498c4ec..862ee46c7bb 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -37,6 +37,32 @@ export interface RegisterOptions {
   singleton?: boolean | undefined;
 }
 
+/**
+ * Registered factories are instantiated by having create called on them.
+ * Additionally they are singletons by default, so each time they are looked up
+ * they return the same instance.
+ *
+ * However, that behavior can be modified with the `instantiate` and `singleton`
+ * options to the {@linkcode Owner.register} method.
+ */
+export interface Factory<T extends object> {
+  // NOTE: this does not check against the types of the target object in any
+  // way, unfortunately. However, we actually *cannot* constrain it further than
+  // this without going down a *very* deep rabbit hole (see the historic types
+  // for `.create()` on DefinitelyTyped if you're curious), because we need (for
+  // historical reasons) to support classes which implement this contract to be
+  // able to provide a *narrower* interface than "exactly the public fields on
+  // the class" while still falling back to the "exactly the public fields on
+  // the class" for the general case. :sigh:
+  /**
+   * A function that will create an instance of the class with any
+   * dependencies injected.
+   *
+   * @param initialValues Any values to set on an instance of the class
+   */
+  create(initialValues?: object): T;
+}
+
 /**
  * A `Resolver` is the mechanism responsible for looking up code in your
  * application and converting its naming conventions into the actual classes,
@@ -63,16 +89,16 @@ export interface FactoryClass {
   positionalParams?: string | string[] | undefined | null;
 }
 
-export interface Factory<T extends object, C extends FactoryClass | object = FactoryClass> {
+export interface InternalFactory<T extends object, C extends FactoryClass | object = FactoryClass>
+  extends Factory<T> {
   class?: C;
   name?: string;
-  fullName?: string;
+  fullName?: FullName;
   normalizedName?: string;
-  create(props?: { [prop: string]: any }): T;
 }
 
-export function isFactory(obj: unknown): obj is Factory<object> {
-  return obj != null && typeof (obj as Factory<object>).create === 'function';
+export function isFactory(obj: unknown): obj is InternalFactory<object> {
+  return obj != null && typeof (obj as InternalFactory<object>).create === 'function';
 }
 
 /**
diff --git a/packages/@ember/routing/lib/dsl.ts b/packages/@ember/routing/lib/dsl.ts
index bad99044a3d..f401e6cf811 100644
--- a/packages/@ember/routing/lib/dsl.ts
+++ b/packages/@ember/routing/lib/dsl.ts
@@ -1,4 +1,4 @@
-import type { Factory } from '@ember/-internals/owner';
+import type { InternalFactory } from '@ember/-internals/owner';
 import { assert } from '@ember/debug';
 import type { Option } from '@glimmer/interfaces';
 import type { MatchCallback } from 'route-recognizer';
@@ -44,7 +44,7 @@ export interface DSLImplOptions {
   enableLoadingSubstates: boolean;
   engineInfo?: EngineInfo;
   addRouteForEngine(name: string, routeOptions: EngineRouteInfo): void;
-  resolveRouteMap(name: string): Factory<any, any>;
+  resolveRouteMap(name: string): InternalFactory<any, any>;
 }
 
 export default class DSLImpl implements DSL {
diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
index 81f919e9fef..b1877254490 100644
--- a/packages/@ember/routing/lib/generate_controller.ts
+++ b/packages/@ember/routing/lib/generate_controller.ts
@@ -1,5 +1,5 @@
 import { get } from '@ember/-internals/metal';
-import type { Factory, default as Owner } from '@ember/-internals/owner';
+import type { InternalFactory, default as Owner } from '@ember/-internals/owner';
 import Controller from '@ember/controller';
 import { assert, info } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
@@ -16,7 +16,10 @@ import { DEBUG } from '@glimmer/env';
   @private
 */
 
-export function generateControllerFactory(owner: Owner, controllerName: string): Factory<{}> {
+export function generateControllerFactory(
+  owner: Owner,
+  controllerName: string
+): InternalFactory<{}> {
   let factoryManager = owner.factoryFor('controller:basic');
   assert(
     '[BUG] unexpectedly missing a factoryManager for `controller:basic`',
@@ -39,7 +42,7 @@ export function generateControllerFactory(owner: Owner, controllerName: string):
 
   owner.register(fullName, Factory);
 
-  return owner.factoryFor(fullName) as Factory<{}>;
+  return owner.factoryFor(fullName) as InternalFactory<{}>;
 }
 
 /**
diff --git a/packages/internal-test-helpers/lib/test-cases/rendering.ts b/packages/internal-test-helpers/lib/test-cases/rendering.ts
index 8ae48049978..b73a952824d 100644
--- a/packages/internal-test-helpers/lib/test-cases/rendering.ts
+++ b/packages/internal-test-helpers/lib/test-cases/rendering.ts
@@ -10,7 +10,7 @@ import { ModuleBasedResolver } from '../test-resolver';
 import AbstractTestCase from './abstract';
 import buildOwner from '../build-owner';
 import { runAppend, runDestroy, runTask } from '../run';
-import type { Factory } from '@ember/-internals/owner';
+import type { InternalFactory } from '@ember/-internals/owner';
 import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance';
 import type EngineInstance from '@ember/engine/instance';
 import type { HelperFunction } from '@ember/-internals/glimmer/lib/helper';
@@ -75,7 +75,7 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     return new ModuleBasedResolver();
   }
 
-  add(specifier: string, factory: Factory<object> | object) {
+  add(specifier: string, factory: InternalFactory<object> | object) {
     this.resolver.add(specifier, factory);
   }
 
@@ -173,7 +173,7 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerCustomHelper(name: string, definition: Factory<object>) {
+  registerCustomHelper(name: string, definition: InternalFactory<object>) {
     this.owner.register(`helper:${name}`, definition);
   }
 
@@ -194,13 +194,13 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerModifier(name: string, ModifierClass: Factory<object>) {
+  registerModifier(name: string, ModifierClass: InternalFactory<object>) {
     let { owner } = this;
 
     owner.register(`modifier:${name}`, ModifierClass);
   }
 
-  registerComponentManager(name: string, manager: Factory<object>) {
+  registerComponentManager(name: string, manager: InternalFactory<object>) {
     let owner = this.owner;
     owner.register(`component-manager:${name}`, manager);
   }
@@ -219,7 +219,7 @@ export default abstract class RenderingTestCase extends AbstractTestCase {
     }
   }
 
-  registerService(name: string, klass: Factory<object>) {
+  registerService(name: string, klass: InternalFactory<object>) {
     this.owner.register(`service:${name}`, klass);
   }
 
diff --git a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
index c8eaff9372d..03803cc22f1 100644
--- a/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/router-non-application.ts
@@ -12,7 +12,7 @@ import buildOwner from '../build-owner';
 import { runAppend, runDestroy } from '../run';
 import type { BootOptions, EngineInstanceOptions } from '@ember/engine/instance';
 import type EngineInstance from '@ember/engine/instance';
-import type { Factory } from '@ember/-internals/owner';
+import type { InternalFactory } from '@ember/-internals/owner';
 
 export default class RouterNonApplicationTestCase extends AbstractTestCase {
   owner: EngineInstance;
@@ -59,7 +59,7 @@ export default class RouterNonApplicationTestCase extends AbstractTestCase {
     return new ModuleBasedResolver();
   }
 
-  add(specifier: string, factory: Factory<object> | object) {
+  add(specifier: string, factory: InternalFactory<object> | object) {
     this.resolver.add(specifier, factory);
   }
 
diff --git a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
index 2489826d32c..e292fecc4ef 100644
--- a/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
+++ b/packages/internal-test-helpers/lib/test-cases/test-resolver-application.ts
@@ -2,7 +2,7 @@ import AbstractApplicationTestCase from './abstract-application';
 import type Resolver from '../test-resolver';
 import { ModuleBasedResolver } from '../test-resolver';
 import Component from '@ember/component';
-import type { Factory } from '@ember/-internals/owner';
+import type { InternalFactory } from '@ember/-internals/owner';
 
 export default abstract class TestResolverApplicationTestCase extends AbstractApplicationTestCase {
   abstract resolver?: Resolver;
@@ -13,7 +13,7 @@ export default abstract class TestResolverApplicationTestCase extends AbstractAp
     });
   }
 
-  add(specifier: string, factory: Factory<object> | object) {
+  add(specifier: string, factory: InternalFactory<object> | object) {
     this.resolver!.add(specifier, factory);
   }
 
diff --git a/packages/internal-test-helpers/lib/test-resolver.ts b/packages/internal-test-helpers/lib/test-resolver.ts
index 1f4c16cca4c..2372832089c 100644
--- a/packages/internal-test-helpers/lib/test-resolver.ts
+++ b/packages/internal-test-helpers/lib/test-resolver.ts
@@ -1,6 +1,6 @@
 import { compile } from 'ember-template-compiler';
 
-import type { Factory, Resolver as IResolver } from '@ember/-internals/owner';
+import type { InternalFactory, Resolver as IResolver } from '@ember/-internals/owner';
 
 const DELIMITER = '%';
 
@@ -14,17 +14,17 @@ function serializeKey(specifier: string, source?: unknown, namespace?: unknown)
 }
 
 class Resolver implements IResolver {
-  _registered: Record<string, Factory<object> | object>;
+  _registered: Record<string, InternalFactory<object> | object>;
 
   constructor() {
     this._registered = {};
   }
-  resolve(specifier: string): Factory<object> | object | undefined {
+  resolve(specifier: string): InternalFactory<object> | object | undefined {
     return this._registered[specifier] || this._registered[serializeKey(specifier)];
   }
   add(
     lookup: string | { specifier: string; source: unknown; namespace: unknown },
-    factory: Factory<object> | object
+    factory: InternalFactory<object> | object
   ) {
     let key;
     switch (typeof lookup) {

From 6ddeeec3d6cc15d28247c9d7da57e4a9c88be74f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 08:38:06 -0700
Subject: [PATCH 1239/1405] Combine some imports for clarity

---
 .../-internals/glimmer/lib/component-managers/curly.ts    | 8 ++++++--
 packages/@ember/engine/type-tests/index.test.ts           | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
index dd7fdeac0a1..3845e5f526a 100644
--- a/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
+++ b/packages/@ember/-internals/glimmer/lib/component-managers/curly.ts
@@ -1,5 +1,9 @@
-import { getOwner, setOwner } from '@ember/-internals/owner';
-import type { InternalFactory, default as Owner } from '@ember/-internals/owner';
+import {
+  type default as Owner,
+  type InternalFactory,
+  getOwner,
+  setOwner,
+} from '@ember/-internals/owner';
 import { enumerableSymbol, guidFor } from '@ember/-internals/utils';
 import { addChildView, setElementView, setViewElement } from '@ember/-internals/views';
 import { assert, debugFreeze } from '@ember/debug';
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index 7fa8c7c4718..fb473ad9a29 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -1,4 +1,5 @@
-import type { Factory, Owner, RegisterOptions } from '@ember/-internals/owner';
+import type { ResolverClass } from '@ember/-internals/container/lib/registry';
+import type { default as Owner, RegisterOptions, Factory } from '@ember/owner';
 import type Namespace from '@ember/application/namespace';
 import type { Initializer } from '@ember/engine';
 import Engine from '@ember/engine';
@@ -6,8 +7,7 @@ import type EngineInstance from '@ember/engine/instance';
 import EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
-// Good enough for tests
-let owner = {} as Owner;
+declare let owner: Owner;
 
 class Foo extends EmberObject {}
 class Bar {}

From 414aa6cc9b22e839d2c6605e420175741901ce04 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 09:18:59 -0700
Subject: [PATCH 1240/1405] Propagate `FullName` type throughout the owner
 system

The use of this type allows us to provide much more type safety for
both internal and external callers, by requiring that relevant strings
be (dynamically) validated to have the correct shape.
---
 .../-internals/container/lib/container.ts     | 31 ++++++------
 .../-internals/container/lib/registry.ts      | 47 +++++++++----------
 .../@ember/-internals/glimmer/lib/resolver.ts |  4 +-
 .../-internals/views/lib/component_lookup.ts  |  4 +-
 packages/@ember/engine/instance.ts            | 10 ++--
 .../@ember/engine/type-tests/index.test.ts    |  2 +-
 .../@ember/routing/lib/generate_controller.ts |  4 +-
 packages/@ember/routing/router.ts             |  2 +-
 8 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 0e8977259c1..4042b6bf27f 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -3,6 +3,7 @@ import type {
   FactoryClass,
   InternalOwner,
   RegisterOptions,
+  FullName,
 } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { dictionary } from '@ember/-internals/utils';
@@ -180,7 +181,7 @@ export default class Container {
    @method reset
    @param {String} fullName optional key to reset; if missing, resets everything
   */
-  reset(fullName: string) {
+  reset(fullName: FullName) {
     if (this.isDestroyed) return;
     if (fullName === undefined) {
       destroyDestroyables(this);
@@ -213,7 +214,7 @@ export default class Container {
    @param {String} fullName
    @return {any}
    */
-  factoryFor(fullName: string): FactoryManager<object> | undefined {
+  factoryFor(fullName: FullName): FactoryManager<object> | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
     }
@@ -260,17 +261,17 @@ function wrapManagerInDeprecationProxy<T extends object, C extends object | Fact
   return new Proxy(proxiedManager, validator as any) as any;
 }
 
-function isSingleton(container: Container, fullName: string) {
+function isSingleton(container: Container, fullName: FullName) {
   return container.registry.getOption(fullName, 'singleton') !== false;
 }
 
-function isInstantiatable(container: Container, fullName: string) {
+function isInstantiatable(container: Container, fullName: FullName) {
   return container.registry.getOption(fullName, 'instantiate') !== false;
 }
 
 function lookup(
   container: Container,
-  fullName: string,
+  fullName: FullName,
   options: RegisterOptions = {}
 ): InternalFactory<object> | object | undefined {
   let normalizedName = fullName;
@@ -290,9 +291,9 @@ function lookup(
 
 function factoryFor(
   container: Container,
-  normalizedName: string,
-  fullName: string
 ): FactoryManager<object> | undefined {
+  normalizedName: FullName,
+  fullName: FullName
   let cached = container.factoryManagerCache[normalizedName];
 
   if (cached !== undefined) {
@@ -321,7 +322,7 @@ function factoryFor(
 
 function isSingletonClass(
   container: Container,
-  fullName: string,
+  fullName: FullName,
   { instantiate, singleton }: RegisterOptions
 ) {
   return (
@@ -334,7 +335,7 @@ function isSingletonClass(
 
 function isSingletonInstance(
   container: Container,
-  fullName: string,
+  fullName: FullName,
   { instantiate, singleton }: RegisterOptions
 ) {
   return (
@@ -347,7 +348,7 @@ function isSingletonInstance(
 
 function isFactoryClass(
   container: Container,
-  fullname: string,
+  fullname: FullName,
   { instantiate, singleton }: RegisterOptions
 ) {
   return (
@@ -359,7 +360,7 @@ function isFactoryClass(
 
 function isFactoryInstance(
   container: Container,
-  fullName: string,
+  fullName: FullName,
   { instantiate, singleton }: RegisterOptions
 ) {
   return (
@@ -371,8 +372,8 @@ function isFactoryInstance(
 
 function instantiateFactory(
   container: Container,
-  normalizedName: string,
-  fullName: string,
+  normalizedName: FullName,
+  fullName: FullName,
   options: RegisterOptions
 ): InternalFactory<object> | object | undefined {
   let factoryManager = factoryFor(container, normalizedName, fullName);
@@ -472,8 +473,8 @@ export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void
 export class FactoryManager<T extends object, C extends FactoryClass | object = FactoryClass> {
   readonly container: Container;
   readonly class: Factory<T, C> & DebugFactory<T, C>;
-  readonly fullName: string;
   readonly owner: InternalOwner | null;
+  readonly fullName: FullName;
   readonly normalizedName: string;
   private madeToString: string | undefined;
   injections: { [key: string]: unknown } | undefined;
@@ -481,7 +482,7 @@ export class FactoryManager<T extends object, C extends FactoryClass | object =
   constructor(
     container: Container,
     factory: InternalFactory<T, C>,
-    fullName: string,
+    fullName: FullName,
     normalizedName: string
   ) {
     this.container = container;
diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index e8ae27c06eb..b7ae5edf285 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,4 +1,4 @@
-import type { InternalFactory, Resolver, RegisterOptions } from '@ember/-internals/owner';
+import type { FullName, InternalFactory, Resolver, RegisterOptions } from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import type { set } from '@ember/object';
@@ -8,7 +8,6 @@ import Container from './container';
 
 export interface Injection {
   property: string;
-  specifier: string;
 }
 
 export interface KnownForTypeResult {
@@ -27,6 +26,7 @@ export interface IRegistry {
   makeToString(factory: Factory<object>, fullName: string): string;
   normalizeFullName(fullName: string): string;
   resolve(fullName: string): Factory<object> | object | undefined;
+  specifier: FullName;
 }
 
 export interface ResolverClass {
@@ -58,8 +58,8 @@ export default class Registry implements IRegistry {
   readonly _failSet: Set<string>;
   resolver: Resolver | null;
   readonly fallback: IRegistry | null;
-  readonly _normalizeCache: Record<string, string>;
   readonly registrations: Record<string, InternalFactory<object> | object>;
+  readonly _normalizeCache: Record<FullName, FullName>;
   readonly _options: Record<string, RegisterOptions>;
   readonly _resolveCache: Record<string, InternalFactory<object> | object>;
   readonly _typeOptions: Record<string, RegisterOptions>;
@@ -162,17 +162,17 @@ export default class Registry implements IRegistry {
    @param {Object} options
    */
   register(
-    fullName: string,
+    fullName: FullName,
     factory: object,
     options: RegisterOptions & { instantiate: false }
   ): void;
   register<T extends object, C extends FactoryClass | object>(
-    fullName: string,
+    fullName: FullName,
     factory: InternalFactory<T, C>,
     options?: RegisterOptions
   ): void;
   register(
-    fullName: string,
+    fullName: FullName,
     factory: object | InternalFactory<object>,
     options: RegisterOptions = {}
   ): void {
@@ -208,7 +208,7 @@ export default class Registry implements IRegistry {
    @method unregister
    @param {String} fullName
    */
-  unregister(fullName: string): void {
+  unregister(fullName: FullName): void {
     assert('fullName must be a proper full name', this.isValidFullName(fullName));
 
     let normalizedName = this.normalize(fullName);
@@ -252,7 +252,7 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @return {Function} fullName's factory
    */
-  resolve(fullName: string): InternalFactory<object> | object | undefined {
+  resolve(fullName: FullName): InternalFactory<object> | object | undefined {
     let factory = resolve(this, this.normalize(fullName));
     if (factory === undefined && this.fallback !== null) {
       factory = this.fallback.resolve(fullName);
@@ -273,7 +273,7 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @return {string} described fullName
    */
-  describe(fullName: string): string {
+  describe(fullName: FullName): string {
     if (this.resolver !== null && this.resolver.lookupDescription) {
       return this.resolver.lookupDescription(fullName);
     } else if (this.fallback !== null) {
@@ -291,7 +291,7 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @return {string} normalized fullName
    */
-  normalizeFullName(fullName: string): string {
+  normalizeFullName(fullName: FullName): FullName {
     if (this.resolver !== null && this.resolver.normalize) {
       return this.resolver.normalize(fullName);
     } else if (this.fallback !== null) {
@@ -309,7 +309,7 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @return {string} normalized fullName
    */
-  normalize(fullName: string): string {
+  normalize(fullName: FullName): FullName {
     return (
       this._normalizeCache[fullName] ||
       (this._normalizeCache[fullName] = this.normalizeFullName(fullName))
@@ -324,7 +324,7 @@ export default class Registry implements IRegistry {
    @param {string} fullName
    @return {function} toString function
    */
-  makeToString(factory: InternalFactory<object>, fullName: string): string {
+  makeToString(factory: InternalFactory<object>, fullName: FullName): string {
     if (this.resolver !== null && this.resolver.makeToString) {
       return this.resolver.makeToString(factory, fullName);
     } else if (this.fallback !== null) {
@@ -345,7 +345,7 @@ export default class Registry implements IRegistry {
    @param {String} [options.source] the fullname of the request source (used for local lookups)
    @return {Boolean}
    */
-  has(fullName: string): boolean {
+  has(fullName: FullName): boolean {
     if (!this.isValidFullName(fullName)) {
       return false;
     }
@@ -400,12 +400,12 @@ export default class Registry implements IRegistry {
    @param {String} fullName
    @param {Object} options
    */
-  options(fullName: string, options: RegisterOptions): void {
+  options(fullName: FullName, options: RegisterOptions): void {
     let normalizedName = this.normalize(fullName);
     this._options[normalizedName] = options;
   }
 
-  getOptions(fullName: string): RegisterOptions | undefined {
+  getOptions(fullName: FullName): RegisterOptions | undefined {
     let normalizedName = this.normalize(fullName);
     let options = this._options[normalizedName];
 
@@ -415,8 +415,8 @@ export default class Registry implements IRegistry {
     return options;
   }
 
-    fullName: string,
   getOption<K extends keyof RegisterOptions>(
+    fullName: FullName,
     optionName: K
   ): RegisterOptions[K] | undefined {
     let options = this._options[fullName];
@@ -445,12 +445,11 @@ export default class Registry implements IRegistry {
 
    @private
    @method injection
-   @param {String} factoryName
+   @param {String} fullName
    @param {String} property
-   @param {String} injectionName
    @deprecated
    */
-  injection(fullName: string, property: string): void {
+  injection(fullName: FullName, property: string): void {
     deprecate(
       `As of Ember 4.0.0, owner.inject no longer injects values into resolved instances, and calling the method has been deprecated. Since this method no longer does anything, it is fully safe to remove this injection. As an alternative to this API, you can refactor to explicitly inject \`${property}\` on \`${fullName}\`, or look it up directly using the \`getOwner\` API.`,
       false,
@@ -495,7 +494,7 @@ export default class Registry implements IRegistry {
     return Object.assign({}, fallbackKnown, localKnown, resolverKnown);
   }
 
-  isValidFullName(fullName: string): boolean {
+  isValidFullName(fullName: string): fullName is FullName {
     return VALID_FULL_NAME_REGEXP.test(fullName);
   }
 }
@@ -544,7 +543,7 @@ if (DEBUG) {
 
 function resolve(
   registry: Registry,
-  _normalizedName: string
+  _normalizedName: FullName
 ): InternalFactory<object> | object | undefined {
   let normalizedName = _normalizedName;
 
@@ -575,14 +574,14 @@ function resolve(
   return resolved;
 }
 
-function has(registry: Registry, fullName: string) {
+function has(registry: Registry, fullName: FullName): boolean {
   return registry.resolve(fullName) !== undefined;
 }
 
-const privateNames: { [key: string]: string } = dictionary(null);
+const privateNames: Record<string, FullName> = dictionary(null);
 const privateSuffix = `${Math.random()}${Date.now()}`.replace('.', '');
 
-export function privatize([fullName]: TemplateStringsArray): string {
+export function privatize([fullName]: TemplateStringsArray): FullName {
   assert('has a single string argument', arguments.length === 1 && fullName);
 
   let name = privateNames[fullName];
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index ec9c6427fc6..71050cdfe90 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -54,20 +54,20 @@ function instrumentationPayload(name: string) {
   return { object: `component:${name}` };
 }
 
-  let fullName = `component:${name}`;
 function componentFor(
   name: string,
   owner: InternalOwner
 ): Option<InternalFactory<object> | object> {
+  let fullName = `component:${name}` as const;
   return owner.factoryFor(fullName) || null;
 }
 
-  let templateFullName = `template:components/${name}`;
 function layoutFor(
   name: string,
   owner: InternalOwner,
   options?: RegisterOptions
 ): Option<Template> {
+  let templateFullName = `template:components/${name}` as const;
 
   return (owner.lookup(templateFullName, options) as Template) || null;
 }
diff --git a/packages/@ember/-internals/views/lib/component_lookup.ts b/packages/@ember/-internals/views/lib/component_lookup.ts
index 6a70b24e6ef..09fd65cda70 100644
--- a/packages/@ember/-internals/views/lib/component_lookup.ts
+++ b/packages/@ember/-internals/views/lib/component_lookup.ts
@@ -2,13 +2,13 @@ import type { InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import EmberObject from '@ember/object';
 
 export default EmberObject.extend({
-    let fullName = `component:${name}`;
   componentFor(name: string, owner: InternalOwner) {
+    let fullName = `component:${name}` as const;
     return owner.factoryFor(fullName);
   },
 
-    let templateFullName = `template:components/${name}`;
   layoutFor(name: string, owner: InternalOwner, options: RegisterOptions) {
+    let templateFullName = `template:components/${name}` as const;
     return owner.lookup(templateFullName, options);
   },
 });
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index f49594c0a78..386934a04aa 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -10,7 +10,7 @@ import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
 import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
-import { isFactory } from '@ember/-internals/owner';
+import { type FullName, isFactory } from '@ember/-internals/owner';
 import Engine from '@ember/engine';
 import type Application from '@ember/application';
 import type { BootEnvironment } from '@ember/-internals/glimmer';
@@ -170,7 +170,7 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
    @method unregister
    @param {String} fullName
    */
-  unregister(fullName: string) {
+  unregister(fullName: FullName) {
     this.__container__.reset(fullName);
 
     // We overwrote this method from RegistryProxyMixin.
@@ -218,7 +218,7 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
 
     assert('expected parent', parent);
 
-    let registrations = ['route:basic', 'service:-routing'];
+    let registrations = ['route:basic', 'service:-routing'] as const;
 
     registrations.forEach((key) => {
       let registration = parent.resolveRegistration(key);
@@ -229,7 +229,9 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
     let env = parent.lookup('-environment:main') as Record<string, unknown>;
     this.register('-environment:main', env, { instantiate: false });
 
-    let singletons = [
+    // The type annotation forces TS to (a) validate that these match and (b)
+    // *notice* that they match, e.g. below on the `singletons.push()`.
+    let singletons: FullName[] = [
       'router:main',
       P`-bucket-cache:main`,
       '-view-registry:main',
diff --git a/packages/@ember/engine/type-tests/index.test.ts b/packages/@ember/engine/type-tests/index.test.ts
index fb473ad9a29..4e63038279a 100644
--- a/packages/@ember/engine/type-tests/index.test.ts
+++ b/packages/@ember/engine/type-tests/index.test.ts
@@ -36,7 +36,7 @@ expectTypeOf(engine.Resolver).toEqualTypeOf<ResolverClass>();
 
 // RegistryProxy
 
-expectTypeOf(engine.resolveRegistration('foo')).toEqualTypeOf<
+expectTypeOf(engine.resolveRegistration('foo:bar')).toEqualTypeOf<
   Factory<object> | object | undefined
 >();
 // @ts-expect-error Requires name
diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
index b1877254490..4dff90abfde 100644
--- a/packages/@ember/routing/lib/generate_controller.ts
+++ b/packages/@ember/routing/lib/generate_controller.ts
@@ -38,7 +38,7 @@ export function generateControllerFactory(
     },
   });
 
-  let fullName = `controller:${controllerName}`;
+  let fullName = `controller:${controllerName}` as const;
 
   owner.register(fullName, Factory);
 
@@ -57,7 +57,7 @@ export function generateControllerFactory(
 export default function generateController(owner: Owner, controllerName: string): Controller {
   generateControllerFactory(owner, controllerName);
 
-  let fullName = `controller:${controllerName}`;
+  let fullName = `controller:${controllerName}` as const;
   let instance = owner.lookup(fullName);
   assert('Expected an instance of controller', instance instanceof Controller);
 
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 03bd04f52cd..42aa57debe7 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -348,7 +348,7 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
           routeName = engineInfo.localFullName;
         }
 
-        let fullRouteName = `route:${routeName}`;
+        let fullRouteName = `route:${routeName}` as const;
 
         assert('Route is unexpectedly missing an owner', routeOwner);
 

From c29244a828f4aaf3a3dc4090c8325da029f3538a Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 09:34:56 -0700
Subject: [PATCH 1241/1405] @ember/engine/instance: fix a lint, add some
 comments

While working on `Owner` refactors, take the opportunity to clarify the
semantics of both types and actual behaviors in the package, and add an
explicit return type to a method which was missing it.
---
 packages/@ember/engine/instance.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 386934a04aa..05e1e1de6db 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -45,6 +45,10 @@ export interface EngineInstanceOptions {
   @uses ContainerProxyMixin
 */
 
+// Note on types: since `EngineInstance` uses `RegistryProxyMixin` and
+// `ContainerProxyMixin`, which respectively implement the same `RegistryMixin`
+// and `ContainerMixin` types used to define `InternalOwner`, this is the same
+// type as `InternalOwner` from TS's POV.
 interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
 class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin) {
   /**
@@ -53,6 +57,10 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
    @param {Registry} registry
    @param {BootOptions} options
    */
+  // This is effectively an "abstract" method: it defines the contract a
+  // subclass (e.g. `ApplicationInstance`) must follow to implement this
+  // behavior, but an `EngineInstance` has no behavior of its own here.
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   static setupRegistry(_registry: Registry, _options?: BootOptions) {}
 
   /**
@@ -189,7 +197,7 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
     @param options {Object} options provided to the engine instance.
     @return {EngineInstance,Error}
   */
-  buildChildEngineInstance(name: string, options: EngineInstanceOptions = {}) {
+  buildChildEngineInstance(name: string, options: EngineInstanceOptions = {}): EngineInstance {
     let Engine = this.lookup(`engine:${name}`);
 
     if (!Engine) {

From 18313f9cef2daa0396709fd7afe8900ba3b1f5ce Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 14:52:24 -0700
Subject: [PATCH 1242/1405] Distinguish `FactoryManager` and
 `InternalFactoryManager`

This is the exact same kind of change previously made for `Owner` and
`Factory`: providing a richer internal type for `FactoryManager` than
is supported in our public API. Here, as with both of those earlier
changes, there may be an opportunity to come back and switch *back* to
using `FactoryManager` directly as part of a cleanup pass.
---
 .../-internals/container/lib/container.ts     | 46 +++++++++++++------
 .../@ember/-internals/glimmer/lib/helper.ts   |  8 ++--
 packages/@ember/-internals/owner/index.ts     | 17 +++++++
 3 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 4042b6bf27f..cd1cabe771a 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -3,6 +3,7 @@ import type {
   FactoryClass,
   InternalOwner,
   RegisterOptions,
+  FactoryManager,
   FullName,
 } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
@@ -52,7 +53,7 @@ if (DEBUG) {
 export interface ContainerOptions {
   owner?: InternalOwner;
   cache?: { [key: string]: object };
-  factoryManagerCache?: { [key: string]: FactoryManager<any, any> };
+  factoryManagerCache?: { [key: string]: InternalFactoryManager<any, any> };
   validationCache?: { [key: string]: boolean };
 }
 
@@ -75,7 +76,7 @@ export default class Container {
   readonly owner: InternalOwner | null;
   readonly registry: Registry & DebugRegistry;
   cache: { [key: string]: object };
-  factoryManagerCache!: { [key: string]: FactoryManager<object> };
+  factoryManagerCache!: { [key: string]: InternalFactoryManager<object> };
   readonly validationCache!: { [key: string]: boolean };
   isDestroyed: boolean;
   isDestroying: boolean;
@@ -214,7 +215,7 @@ export default class Container {
    @param {String} fullName
    @return {any}
    */
-  factoryFor(fullName: FullName): FactoryManager<object> | undefined {
+  factoryFor(fullName: FullName): InternalFactoryManager<object> | undefined {
     if (this.isDestroyed) {
       throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
     }
@@ -235,8 +236,8 @@ if (DEBUG) {
  * set on the manager.
  */
 function wrapManagerInDeprecationProxy<T extends object, C extends object | FactoryClass>(
-  manager: FactoryManager<T, C>
-): FactoryManager<T, C> {
+  manager: InternalFactoryManager<T, C>
+): InternalFactoryManager<T, C> {
   let validator = {
     set(_obj: T, prop: keyof T) {
       throw new Error(
@@ -291,9 +292,9 @@ function lookup(
 
 function factoryFor(
   container: Container,
-): FactoryManager<object> | undefined {
   normalizedName: FullName,
   fullName: FullName
+): InternalFactoryManager<object> | undefined {
   let cached = container.factoryManagerCache[normalizedName];
 
   if (cached !== undefined) {
@@ -310,7 +311,7 @@ function factoryFor(
     factory._onLookup(fullName);
   }
 
-  let manager = new FactoryManager(container, factory, fullName, normalizedName);
+  let manager = new InternalFactoryManager(container, factory, fullName, normalizedName);
 
   if (DEBUG) {
     manager = wrapManagerInDeprecationProxy(manager);
@@ -456,21 +457,40 @@ export interface LazyInjection {
 declare interface DebugFactory<T extends object, C extends FactoryClass | object = FactoryClass>
   extends InternalFactory<T, C> {
   _onLookup?: (fullName: string) => void;
-  _initFactory?: (factoryManager: FactoryManager<T, C>) => void;
   _lazyInjections(): { [key: string]: LazyInjection };
+  _initFactory?: (factoryManager: InternalFactoryManager<T, C>) => void;
 }
 
 export const INIT_FACTORY = Symbol('INIT_FACTORY');
 
-export function getFactoryFor(obj: any): FactoryManager<any, any> {
-  return obj[INIT_FACTORY];
+interface MaybeHasInitFactory {
+  [INIT_FACTORY]?: InternalFactoryManager<object, FactoryClass | object>;
 }
 
-export function setFactoryFor(obj: any, factory: FactoryManager<any, any>): void {
-  obj[INIT_FACTORY] = factory;
+export function getFactoryFor(
+  obj: object
+): InternalFactoryManager<object, FactoryClass | object> | undefined {
+  // SAFETY: since we know `obj` is an `object`, we also know we can safely ask
+  // whether a key is set on it.
+  return (obj as MaybeHasInitFactory)[INIT_FACTORY];
 }
 
-export class FactoryManager<T extends object, C extends FactoryClass | object = FactoryClass> {
+export function setFactoryFor<T extends object, C extends FactoryClass | object>(
+  obj: object,
+  factory: InternalFactoryManager<T, C>
+): void {
+  // SAFETY: since we know `obj` is an `object`, we also know we can safely set
+  // a key it safely at this location. (The only way this could be blocked is if
+  // someone has gone out of their way to use `Object.defineProperty()` with our
+  // internal-only symbol and made it `writable: false`.)
+  (obj as MaybeHasInitFactory)[INIT_FACTORY] = factory;
+}
+
+export class InternalFactoryManager<
+  T extends object,
+  C extends FactoryClass | object = FactoryClass
+> implements FactoryManager<T>
+{
   readonly container: Container;
   readonly class: Factory<T, C> & DebugFactory<T, C>;
   readonly owner: InternalOwner | null;
diff --git a/packages/@ember/-internals/glimmer/lib/helper.ts b/packages/@ember/-internals/glimmer/lib/helper.ts
index e65a3792b43..148d81c49c8 100644
--- a/packages/@ember/-internals/glimmer/lib/helper.ts
+++ b/packages/@ember/-internals/glimmer/lib/helper.ts
@@ -2,7 +2,7 @@
 @module @ember/component
 */
 
-import type { FactoryManager } from '@ember/-internals/container/lib/container';
+import type { InternalFactoryManager } from '@ember/-internals/container/lib/container';
 import type { InternalFactory, InternalOwner } from '@ember/-internals/owner';
 import { setOwner } from '@ember/-internals/owner';
 import { FrameworkObject } from '@ember/object/-internals';
@@ -207,7 +207,7 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 
   createHelper(
-    definition: typeof Helper | FactoryManager<object>,
+    definition: typeof Helper | InternalFactoryManager<object>,
     args: Arguments
   ): ClassicHelperStateBucket {
     let instance = isFactoryManager(definition)
@@ -250,8 +250,8 @@ class ClassicHelperManager implements HelperManager<ClassicHelperStateBucket> {
   }
 }
 
-function isFactoryManager(obj: unknown): obj is FactoryManager<object> {
-  return obj != null && 'class' in (obj as FactoryManager<object>);
+function isFactoryManager(obj: unknown): obj is InternalFactoryManager<object> {
+  return obj != null && 'class' in (obj as InternalFactoryManager<object>);
 }
 
 setHelperManager((owner: InternalOwner | undefined): ClassicHelperManager => {
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 862ee46c7bb..a0062ffe898 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -63,6 +63,23 @@ export interface Factory<T extends object> {
   create(initialValues?: object): T;
 }
 
+/**
+ * A manager which can be used for introspection of the factory's class or for
+ * the creation of factory instances with initial properties. The manager is an
+ * object with the following properties:
+ *
+ * - `class` - The registered or resolved class.
+ * - `create` - A function that will create an instance of the class with any
+ *   dependencies injected.
+ *
+ * @note `FactoryManager` is *not* user-constructible; the only legal way to get
+ *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
+ */
+export interface FactoryManager<T extends object> extends Factory<T> {
+  /** The registered or resolved class. */
+  readonly class: Factory<T>;
+}
+
 /**
  * A `Resolver` is the mechanism responsible for looking up code in your
  * application and converting its naming conventions into the actual classes,

From f85530327875bcb457752ab30f1c226af4959bf0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 15:21:00 -0700
Subject: [PATCH 1243/1405] Improve type safety for `.create()`

This attempts to make `.create()` type safe by constraining its
argument to be `Partial<T>`.
---
 packages/@ember/-internals/container/lib/container.ts    | 4 ++--
 packages/@ember/-internals/glimmer/lib/setup-registry.ts | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index cd1cabe771a..8538c0f3541 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -254,7 +254,7 @@ function wrapManagerInDeprecationProxy<T extends object, C extends object | Fact
   let m = manager;
   let proxiedManager = {
     class: m.class,
-    create(props?: { [prop: string]: any }) {
+    create(props?: Partial<T>) {
       return m.create(props);
     },
   };
@@ -522,7 +522,7 @@ export class InternalFactoryManager<
     return this.madeToString;
   }
 
-  create(options?: { [prop: string]: any }) {
+  create(options?: Partial<T>) {
     let { container } = this;
 
     if (container.isDestroyed) {
diff --git a/packages/@ember/-internals/glimmer/lib/setup-registry.ts b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
index f30fcf3b4b1..19d6053ac96 100644
--- a/packages/@ember/-internals/glimmer/lib/setup-registry.ts
+++ b/packages/@ember/-internals/glimmer/lib/setup-registry.ts
@@ -18,7 +18,9 @@ export function setupApplicationRegistry(registry: Registry): void {
   // we need to use bind() to copy the function so factory for
   // association won't leak
   registry.register('service:-dom-builder', {
-    create(props) {
+    // Additionally, we *must* constrain this to require `props` on create, else
+    // we *know* it cannot have an owner.
+    create(props: object) {
       let owner = getOwner(props);
       assert('DomBuilderService is unexpectedly missing an owner', owner);
       let env = owner.lookup('-environment:main') as { _renderMode: string };

From 95ba2a555971bf63acb0355d85549291fe8c4818 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 15:20:39 -0700
Subject: [PATCH 1244/1405] Unify `Factory` and `DebugFactory` types in
 container

If `DebugFactory` simply extends `Factory` with additional types, all
optional, and we explicitly check and set them (as the implementation
already does) then we don't need this intersection.
---
 packages/@ember/-internals/container/lib/container.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 8538c0f3541..9e3323dd1ac 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -457,7 +457,7 @@ export interface LazyInjection {
 declare interface DebugFactory<T extends object, C extends FactoryClass | object = FactoryClass>
   extends InternalFactory<T, C> {
   _onLookup?: (fullName: string) => void;
-  _lazyInjections(): { [key: string]: LazyInjection };
+  _lazyInjections?: () => { [key: string]: LazyInjection };
   _initFactory?: (factoryManager: InternalFactoryManager<T, C>) => void;
 }
 
@@ -492,8 +492,8 @@ export class InternalFactoryManager<
 > implements FactoryManager<T>
 {
   readonly container: Container;
-  readonly class: Factory<T, C> & DebugFactory<T, C>;
   readonly owner: InternalOwner | null;
+  readonly class: DebugFactory<T, C>;
   readonly fullName: FullName;
   readonly normalizedName: string;
   private madeToString: string | undefined;
@@ -507,7 +507,7 @@ export class InternalFactoryManager<
   ) {
     this.container = container;
     this.owner = container.owner;
-    this.class = factory as Factory<T, C> & DebugFactory<T, C>;
+    this.class = factory;
     this.fullName = fullName;
     this.normalizedName = normalizedName;
     this.madeToString = undefined;

From d68baae140bed2df426e7c75cd7cf170c66fad73 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 16:47:24 -0700
Subject: [PATCH 1245/1405] Move `KnownForTypeResult` to `@ember/owner`

This has two nice effects:

1. The `KnownForTypeResult` type (janky though it is) lives where it
   should per RFC 0821, maintaining `@ember/-internals/owner` as the
   source of truth and avoiding circularity.

2. The type for `Registry` is just the class itself, with no separate
   interface, because there is no expectation of a difference between
   that concrete class type and what it expects of its own `fallback`.

This commit also catches a missed import of `FactoryClass`, needed to
making the `Registry` type check.
---
 .../-internals/container/lib/registry.ts      | 35 +++++++------------
 packages/@ember/-internals/owner/index.ts     |  8 +++++
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/registry.ts b/packages/@ember/-internals/container/lib/registry.ts
index b7ae5edf285..30888240abf 100644
--- a/packages/@ember/-internals/container/lib/registry.ts
+++ b/packages/@ember/-internals/container/lib/registry.ts
@@ -1,4 +1,11 @@
-import type { FullName, InternalFactory, Resolver, RegisterOptions } from '@ember/-internals/owner';
+import type {
+  FactoryClass,
+  FullName,
+  InternalFactory,
+  KnownForTypeResult,
+  RegisterOptions,
+  Resolver,
+} from '@ember/-internals/owner';
 import { dictionary, intern } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
 import type { set } from '@ember/object';
@@ -8,24 +15,6 @@ import Container from './container';
 
 export interface Injection {
   property: string;
-}
-
-export interface KnownForTypeResult {
-  [fullName: string]: boolean;
-}
-
-export interface IRegistry {
-  describe(fullName: string): string;
-  getOption<K extends keyof RegisterOptions>(
-    fullName: string,
-    optionName: K
-  ): RegisterOptions[K] | undefined;
-  getOptions(fullName: string): RegisterOptions | undefined;
-  getOptionsForType(type: string): RegisterOptions | undefined;
-  knownForType(type: string): KnownForTypeResult;
-  makeToString(factory: Factory<object>, fullName: string): string;
-  normalizeFullName(fullName: string): string;
-  resolve(fullName: string): Factory<object> | object | undefined;
   specifier: FullName;
 }
 
@@ -34,7 +23,7 @@ export interface ResolverClass {
 }
 
 export interface RegistryOptions {
-  fallback?: IRegistry;
+  fallback?: Registry;
   registrations?: { [key: string]: object };
   resolver?: Resolver;
 }
@@ -54,10 +43,10 @@ const VALID_FULL_NAME_REGEXP = /^[^:]+:[^:]+$/;
  @class Registry
  @since 1.11.0
 */
-export default class Registry implements IRegistry {
+export default class Registry {
   readonly _failSet: Set<string>;
   resolver: Resolver | null;
-  readonly fallback: IRegistry | null;
+  readonly fallback: Registry | null;
   readonly registrations: Record<string, InternalFactory<object> | object>;
   readonly _normalizeCache: Record<FullName, FullName>;
   readonly _options: Record<string, RegisterOptions>;
@@ -471,7 +460,7 @@ export default class Registry implements IRegistry {
    @method knownForType
    @param {String} type the type to iterate over
   */
-  knownForType(type: string): KnownForTypeResult {
+  knownForType<T extends string>(type: T): KnownForTypeResult<T> {
     let localKnown = dictionary(null);
     let registeredNames = Object.keys(this.registrations);
     for (let fullName of registeredNames) {
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index a0062ffe898..d5fdce64a3c 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -80,6 +80,14 @@ export interface FactoryManager<T extends object> extends Factory<T> {
   readonly class: Factory<T>;
 }
 
+/**
+ * A record mapping all known items of a given type: if the item is known it
+ * will be `true`; otherwise it will be `false` or `undefined`.
+ */
+export type KnownForTypeResult<Type extends string> = {
+  [FullName in `${Type}:${string}`]: boolean | undefined;
+};
+
 /**
  * A `Resolver` is the mechanism responsible for looking up code in your
  * application and converting its naming conventions into the actual classes,

From 3a0bf77b7059a8c112d878cd01aaa3891c62da08 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 16:55:13 -0700
Subject: [PATCH 1246/1405] Move `ContainerProxy` and `RegistryProxy` to
 `@ember/-internals/owner`

These two types are fundamental to the full public notion of an "owner"
in Ember: an owner *in practice* is the combination of these two types,
as when defining `EngineInstance` by applying the two mixins which they
correspond to. Accordingly, the definition of `InternalOwner` *must*
use them... but these internal packages must also use types from the
`@ember/-internals/owner` package to define their own contract; and
moreover those types are *also* part of the `Owner` API contract.

Accordingly, move the types to be internal to `@ember/-internals/owner`
and define the mixins as simply *implementing* these interfaces. (Note:
because these are mixins, the type for "implementing" the interface is
defining a new interface which `extends` the interface, as usual with
our mixin system.)

Here, we define them in terms of extensions of`Owner`, and then define
`InternalOwner` in terms of these two APIs. This needs further tweaks,
as made clear by the need to use `Pick` in one of the definitions and
the fact that both APIs `extends Owner` even though that isn't actually
quite right; a future commit will re-align them to the correct API.
---
 packages/@ember/-internals/owner/index.ts     | 81 +++++++++++++++++--
 .../runtime/lib/mixins/container_proxy.ts     | 10 +--
 .../runtime/lib/mixins/registry_proxy.ts      | 40 +--------
 3 files changed, 79 insertions(+), 52 deletions(-)

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index d5fdce64a3c..db04b9632db 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -1,6 +1,4 @@
 import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimmer/owner';
-import type { IContainer } from '../runtime/lib/mixins/container_proxy';
-import type { IRegistry } from '../runtime/lib/mixins/registry_proxy';
 
 /**
   @module @ember/owner
@@ -29,7 +27,41 @@ export type FullName = `${string}:${string}`;
  * @public
  */
 export default interface Owner {
-  // TODO: expand this to the public API
+  /**
+   * Given a {@linkcode FullName} return a corresponding instance.
+   */
+  lookup(fullName: FullName, options?: RegisterOptions): unknown;
+
+  /**
+   * Registers a factory or value that can be used for dependency injection
+   * (with `inject`) or for service lookup. Each factory is registered with a
+   * full name including two parts: `'type:name'`.
+   *
+   * - To override the default of instantiating the class on the `Factory`,
+   *   pass the `{ instantiate: false }` option. This is useful when you have
+   *   already instantiated the class to use with this factory.
+   * - To override the default singleton behavior and instead create multiple
+   *   instances, pass the `{ singleton: false }` option.
+   */
+  // Dear future maintainer: yes, `Factory<object> | object` is an exceedingly
+  // weird type here. We actually allow more or less *anything* to be passed
+  // here. In the future, we may possibly be able to update this to actually
+  // take advantage of the `FullName` here to require that the registered
+  // factory and corresponding options do the right thing (passing an *actual*
+  // factory, not needing `create` if `options.instantiate` is `false`, etc.)
+  // but doing so will require rationalizing Ember's own internals and may need
+  // a full Ember RFC.
+  register(fullName: FullName, factory: Factory<object> | object, options?: RegisterOptions): void;
+
+  /**
+   * Given a fullName of the form `'type:name'`, like `'route:application'`,
+   * return a corresponding factory manager.
+   *
+   * Any instances created via the factory's `.create()` method must be
+   * destroyed manually by the caller of `.create()`. Typically, this is done
+   * during the creating objects own `destroy` or `willDestroy` methods.
+   */
+  factoryFor(fullName: FullName): FactoryManager<object> | undefined;
 }
 
 export interface RegisterOptions {
@@ -164,7 +196,7 @@ export function isFactory(obj: unknown): obj is InternalFactory<object> {
 
   @method getOwner
   @static
-  @for @ember/application
+  @for @ember/owner
   @param {Object} object An object with an owner.
   @return {Object} An owner object.
   @since 2.3.0
@@ -180,14 +212,47 @@ export function getOwner(object: object): InternalOwner | undefined {
 
   @method setOwner
   @static
-  @for @ember/application
+  @for @ember/owner
   @param {Object} object An object instance.
-  @param {Object} object The new owner object of the object instance.
+  @param {Owner} object The new owner object of the object instance.
   @since 2.3.0
   @public
 */
-export function setOwner(object: any, owner: Owner): void {
+export function setOwner(object: object, owner: Owner): void {
   glimmerSetOwner(object, owner);
 }
 
-export interface InternalOwner extends IRegistry, IContainer {}
+export interface ContainerMixin extends Owner {
+  ownerInjection(): void;
+}
+
+export interface RegistryMixin extends Pick<Owner, 'register'> {
+  /**
+   Given a fullName return the corresponding factory.
+
+   @public
+   @method resolveRegistration
+   @param {String} fullName
+   @return {Function} fullName's factory
+   */
+  resolveRegistration(fullName: FullName): Factory<object> | object | undefined;
+
+  unregister(fullName: FullName): void;
+
+  hasRegistration(fullName: FullName): boolean;
+
+  registeredOption<K extends keyof RegisterOptions>(
+    fullName: FullName,
+    optionName: K
+  ): RegisterOptions[K] | undefined;
+
+  registerOptions(fullName: FullName, options: RegisterOptions): void;
+
+  registeredOptions(fullName: FullName): RegisterOptions | undefined;
+
+  registerOptionsForType(type: string, options: RegisterOptions): void;
+
+  registeredOptionsForType(type: string): RegisterOptions | undefined;
+}
+
+export interface InternalOwner extends RegistryMixin, ContainerMixin {}
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 627c6865023..7a7918c4c86 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -2,18 +2,12 @@ import { schedule, join } from '@ember/runloop';
 /**
 @module ember
 */
-import type { FactoryManager } from '@ember/-internals/container/lib/container';
 import type Container from '@ember/-internals/container/lib/container';
 import Mixin from '@ember/object/mixin';
-import type { Factory, RegisterOptions } from '@ember/-internals/owner';
+import type { ContainerMixin } from '@ember/-internals/owner';
 
 // This is defined as a separate interface so that it can be used in the definition of
 // `Owner` without also including the `__container__` property.
-export interface IContainer {
-  ownerInjection(): void;
-  lookup(fullName: string, options?: RegisterOptions): Factory<object> | object | undefined;
-  factoryFor(fullName: string): FactoryManager<object> | undefined;
-}
 
 /**
   ContainerProxyMixin is used to provide public access to specific
@@ -22,7 +16,7 @@ export interface IContainer {
   @class ContainerProxyMixin
   @private
 */
-interface ContainerProxyMixin extends IContainer {
+interface ContainerProxyMixin extends ContainerMixin {
   /** @internal */
   __container__: Container;
 }
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index cb06a7281eb..ef7e12d6f80 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -3,43 +3,11 @@
 */
 
 import type { Registry } from '@ember/-internals/container';
-import Mixin from '@ember/object/mixin';
-import type { Factory, RegisterOptions } from '@ember/-internals/owner';
+import type { RegistryMixin } from '@ember/-internals/owner';
 import type { AnyFn } from '@ember/-internals/utils/types';
-import { assert } from '@ember/debug';
-
-// This is defined as a separate interface so that it can be used in the definition of
-// `Owner` without also including the `__registry__` property.
-export interface IRegistry {
-  /**
-   Given a fullName return the corresponding factory.
-
-   @public
-   @method resolveRegistration
-   @param {String} fullName
-   @return {Function} fullName's factory
-   */
-  resolveRegistration(fullName: string): Factory<object> | object | undefined;
-
-  register(fullName: string, factory: Factory<object> | object, options?: RegisterOptions): void;
 
-  unregister(fullName: string): void;
-
-  hasRegistration(fullName: string): boolean;
-
-  registeredOption<K extends keyof RegisterOptions>(
-    fullName: string,
-    optionName: K
-  ): RegisterOptions[K] | undefined;
-
-  registerOptions(fullName: string, options: RegisterOptions): void;
-
-  registeredOptions(fullName: string): RegisterOptions | undefined;
-
-  registerOptionsForType(type: string, options: RegisterOptions): void;
-
-  registeredOptionsForType(type: string): RegisterOptions | undefined;
-}
+import { assert } from '@ember/debug';
+import Mixin from '@ember/object/mixin';
 
 /**
   RegistryProxyMixin is used to provide public access to specific
@@ -48,7 +16,7 @@ export interface IRegistry {
   @class RegistryProxyMixin
   @private
 */
-interface RegistryProxyMixin extends IRegistry {
+interface RegistryProxyMixin extends RegistryMixin {
   /** @internal */
   __registry__: Registry;
 }

From 03bdc4cbdf9d9c7c53850f4a5b2fc14549558991 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 08:27:53 -0700
Subject: [PATCH 1247/1405] Deprecate `getOwner` and `setOwner` from
 `@ember/application`

1. This does *not* deprecate the `getOwner` and `setOwner` APIs, *only*
   the export from `@ember/application`.
2. This is purely an in-editor signal, *not* one which will start
   generating runtime deprecation notices. Per Ember's usual deprecation
   cycle policy, we will not introduce the runtime deprecation of this
   API until there has been an LTS release which includes the API which
   replaces it (in this case, `@ember/owner`). Accordingly, this API
   will continue to exist throughout Ember v5, since v4.12 is the next
   LTS release.
---
 packages/@ember/application/index.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/application/index.ts b/packages/@ember/application/index.ts
index 40818eadccd..3594bc551e9 100644
--- a/packages/@ember/application/index.ts
+++ b/packages/@ember/application/index.ts
@@ -2,7 +2,7 @@
 @module @ember/application
 */
 
-export { getOwner, setOwner } from '@ember/-internals/owner';
+import { getOwner as actualGetOwner, setOwner as actualSetOwner } from '@ember/owner';
 import { dictionary } from '@ember/-internals/utils';
 import { ENV } from '@ember/-internals/environment';
 import { hasDOM } from '@ember/-internals/browser-environment';
@@ -30,6 +30,16 @@ import RouterService from '@ember/routing/router-service';
 import type { EngineInstanceOptions } from '@ember/engine/instance';
 import type { SimpleDocument, SimpleElement } from '@simple-dom/interface';
 
+/**
+ * @deprecated Use `import { getOwner } from '@ember/owner';` instead.
+ */
+export const getOwner = actualGetOwner;
+
+/**
+ * @deprecated Use `import { setOwner } from '@ember/owner';` instead.
+ */
+export const setOwner = actualSetOwner;
+
 /**
   An instance of `Application` is the starting point for every Ember
   application. It instantiates, initializes and coordinates the

From 52b7330344263db48e01f841a9e45211a1994702 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 09:03:11 -0700
Subject: [PATCH 1248/1405] Move docs for `getOwner` to `@ember/owner`

This is a TSDoc-friendly/future-proofing change: most of the items which
`@ember/owner` re-exports from `@ember/-internals/owner` can be
documented at the definition site, because they are plain re-exports.
`getOwner` is a bit different, because (as discussed in an earlier
commit) the public `Owner` type it returns has much less detail than our
`InternalOwner` type. We do this via a reassignment of the item, so the
docs need to move to that reassignment to be visible for TS consumers
and, in the future, for TSDoc extraction of docs.

The existing YUIDoc infrastructure will be unaffected by this move.
---
 packages/@ember/owner/index.ts | 52 +++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index 29f3bc68846..bb223aaabdc 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -31,7 +31,57 @@ interface GetOwner {
   (object: object): Owner | undefined;
 }
 
-const getOwner = internalGetOwner as GetOwner;
+// SAFETY: this is *only* safe for public API, because we are promising more
+// than we can actually *totally* guarantee we uphold otherwise. Specifically,
+// users *can* do things (including abusing the `ReliablyHasOwner` type or
+// corresponding interface) to get types which violate this contract. However,
+// doing so is only possible if they break the public API contract! Notably, for
+// our internals, we should *not* provide this.
+/**
+  Framework objects in an Ember application (components, services, routes, etc.)
+  are created via a factory and dependency injection system. Each of these
+  objects is the responsibility of an "owner", which handled its
+  instantiation and manages its lifetime.
+
+  `getOwner` fetches the owner object responsible for an instance. This can
+  be used to lookup or resolve other class instances, or register new factories
+  into the owner.
+
+  For example, this component dynamically looks up a service based on the
+  `audioType` passed as an argument:
+
+  ```app/components/play-audio.js
+  import Component from '@glimmer/component';
+  import { action } from '@ember/object';
+  import { getOwner } from '@ember/application';
+
+  // Usage:
+  //
+  //   <PlayAudio @audioType={{@model.audioType}} @audioFile={{@model.file}}/>
+  //
+  export default class extends Component {
+    get audioService() {
+      let owner = getOwner(this);
+      return owner.lookup(`service:${this.args.audioType}`);
+    }
+
+    @action
+    onPlay() {
+      let player = this.audioService;
+      player.play(this.args.audioFile);
+    }
+  }
+  ```
+
+  @method getOwner
+  @static
+  @for @ember/owner
+  @param {Object} object An object with an owner.
+  @return {Object} An owner object.
+  @since 2.3.0
+  @public
+*/
+const getOwner: GetOwner = internalGetOwner;
 export { getOwner };
 
 // Everything else, we can directly re-export.

From 94276b5744fba1e9a14acbaccbe8d630532c646e Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 13:13:10 -0700
Subject: [PATCH 1249/1405] Define a coherent `Owner` type hierarchy

An earlier commit moved the definitions for the `ContainerProxy` and
`RegistryProxy` types to `@ember/-internals/owner`, noting that further
refactors were needed. Introduce those further refactors:

- Define `ContainerProxy` and `RegistryProxy` as core parts of `Owner`.

- Introduce `BasicRegistry` type as the root on which both `Owner` and
  `RegistryProxy` build, so they can have a shared definition without
  either (incorrectly!) extending the other.

- Define the `ContainerProxyMixin` and `RegistryProxyMixin` types in
  terms of `ContainerProxy` and `RegistryProxy` respectively.
  Previously, these were named in terms of mixins, but the interfaces
  can (and hopefully at some point *will*) be implemented by non-mixin
  types (or else removed entirely).

- Migrate the documentation from the mixin definitions to the types.
  Expand on some of the documentation, especially with examples, since
  there was a great deal missing for making sense of these types and
  their relationships.
---
 packages/@ember/-internals/owner/index.ts     | 372 ++++++++++++++----
 .../runtime/lib/mixins/container_proxy.ts     |  26 +-
 .../runtime/lib/mixins/registry_proxy.ts      | 172 +-------
 packages/@ember/owner/index.ts                |  28 +-
 4 files changed, 306 insertions(+), 292 deletions(-)

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index db04b9632db..e2538eaa43b 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -10,38 +10,129 @@ import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimm
  *
  * @for @ember/owner
  */
-export type FullName = `${string}:${string}`;
+export type FullName<
+  Type extends string = string,
+  Name extends string = string
+> = `${Type}:${Name}`;
 
 /**
- * Framework objects in an Ember application (components, services, routes,
- * etc.) are created via a factory and dependency injection system. Each of
- * these objects is the responsibility of an "owner", which handles its
- * instantiation and manages its lifetime.
+ * A type registry for the DI system, which other participants in the DI system
+ * can register themselves into with declaration merging. The contract for this
+ * type is that its keys are the `Type` from a `FullName`, and each value for a
+ * `Type` is another registry whose keys are the `Name` from a `FullName`. The
+ * mechanic for providing a registry is [declaration merging][handbook].
  *
- * An `Owner` is not a class you construct; it is one the framework constructs
- * for you. The normal way to get access to the relevant `Owner` is using the
- * `getOwner` function.
+ * [handbook]: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
  *
- * @for @ember/owner
- * @since 4.10.0
- * @public
+ * For example, a (non-existent!) "singleton" type might do this in :
+ *
+ * ```ts
+ * abstract class Singleton {
+ *   abstract requiredHook();
+ * }
+ *
+ * // For concrete singleton classes to be merged into.
+ * interface Registry extends Record<string, Singleton> {}
+ *
+ * declare module '@ember/owner' {
+ *   singleton: Registry;
+ * }
+ * ```
+ *
+ * Then users of the `Owner` API will be able to reliably do things like this,
+ * assuming a `some-class` registration exists:
+ *
+ * ```ts
+ * getOwner(this)?.lookup('singleton:some-class').requiredHook();
+ * ```
  */
-export default interface Owner {
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface DIRegistry extends Record<string, Record<string, unknown>> {}
+
+// Convenience utilities for pulling a specific factory manager off `DIRegistry`
+// if one exists, or falling back to the default definition otherwise.
+type ResolveFactoryManager<
+  Type extends string,
+  Name extends string
+> = DIRegistry[Type][Name] extends object
+  ? FactoryManager<DIRegistry[Type][Name]>
+  : FactoryManager<object> | undefined;
+
+type ResolveFactory<
+  Type extends string,
+  Name extends string
+> = DIRegistry[Type][Name] extends object
+  ? Factory<DIRegistry[Type][Name]>
+  : Factory<object> | object | undefined;
+
+interface BasicRegistry {
   /**
-   * Given a {@linkcode FullName} return a corresponding instance.
-   */
-  lookup(fullName: FullName, options?: RegisterOptions): unknown;
+    Registers a factory that can be used for dependency injection (with
+    `inject`) or for service lookup. Each factory is registered with
+    a full name including two parts: `type:name`.
 
-  /**
-   * Registers a factory or value that can be used for dependency injection
-   * (with `inject`) or for service lookup. Each factory is registered with a
-   * full name including two parts: `'type:name'`.
-   *
-   * - To override the default of instantiating the class on the `Factory`,
-   *   pass the `{ instantiate: false }` option. This is useful when you have
-   *   already instantiated the class to use with this factory.
-   * - To override the default singleton behavior and instead create multiple
-   *   instances, pass the `{ singleton: false }` option.
+    A simple example:
+
+    ```javascript
+    import Application from '@ember/application';
+    import EmberObject from '@ember/object';
+
+    let App = Application.create();
+
+    App.Orange = EmberObject.extend();
+    App.register('fruit:favorite', App.Orange);
+    ```
+
+    Ember will resolve factories from the `App` namespace automatically.
+    For example `App.CarsController` will be discovered and returned if
+    an application requests `controller:cars`.
+
+    An example of registering a controller with a non-standard name:
+
+    ```javascript
+    import Application from '@ember/application';
+    import Controller from '@ember/controller';
+
+    let App = Application.create();
+    let Session = Controller.extend();
+
+    App.register('controller:session', Session);
+
+    // The Session controller can now be treated like a normal controller,
+    // despite its non-standard name.
+    App.ApplicationController = Controller.extend({
+      needs: ['session']
+    });
+    ```
+
+    Registered factories are **instantiated** by having `create`
+    called on them. Additionally they are **singletons**, each time
+    they are looked up they return the same instance.
+
+    Some examples modifying that default behavior:
+
+    ```javascript
+    import Application from '@ember/application';
+    import EmberObject from '@ember/object';
+
+    let App = Application.create();
+
+    App.Person = EmberObject.extend();
+    App.Orange = EmberObject.extend();
+    App.Email = EmberObject.extend();
+    App.session = EmberObject.create();
+
+    App.register('model:user', App.Person, { singleton: false });
+    App.register('fruit:favorite', App.Orange);
+    App.register('communication:main', App.Email, { singleton: false });
+    App.register('session', App.session, { instantiate: false });
+    ```
+
+    @method register
+    @param  fullName {String} type:name (e.g., 'model:user')
+    @param  factory {any} (e.g., App.Person)
+    @param  options {Object} (optional) disable instantiation or singleton usage
+    @public
    */
   // Dear future maintainer: yes, `Factory<object> | object` is an exceedingly
   // weird type here. We actually allow more or less *anything* to be passed
@@ -52,6 +143,19 @@ export default interface Owner {
   // but doing so will require rationalizing Ember's own internals and may need
   // a full Ember RFC.
   register(fullName: FullName, factory: Factory<object> | object, options?: RegisterOptions): void;
+}
+
+type ValidType = keyof DIRegistry & string;
+type ValidName<Type extends ValidType> = keyof DIRegistry[Type] & string;
+
+interface BasicContainer {
+  /**
+   * Given a {@linkcode FullName} return a corresponding instance.
+   */
+  lookup<Type extends ValidType, Name extends ValidName<Type>>(
+    fullName: FullName<Type, Name>,
+    options?: RegisterOptions
+  ): DIRegistry[Type][Name];
 
   /**
    * Given a fullName of the form `'type:name'`, like `'route:application'`,
@@ -61,9 +165,27 @@ export default interface Owner {
    * destroyed manually by the caller of `.create()`. Typically, this is done
    * during the creating objects own `destroy` or `willDestroy` methods.
    */
-  factoryFor(fullName: FullName): FactoryManager<object> | undefined;
+  factoryFor<Type extends ValidType, Name extends ValidName<Type>>(
+    fullName: FullName<Type, Name>
+  ): ResolveFactoryManager<Type, Name>;
 }
 
+/**
+ * Framework objects in an Ember application (components, services, routes,
+ * etc.) are created via a factory and dependency injection system. Each of
+ * these objects is the responsibility of an "owner", which handles its
+ * instantiation and manages its lifetime.
+ *
+ * An `Owner` is not a class you construct; it is one the framework constructs
+ * for you. The normal way to get access to the relevant `Owner` is using the
+ * `getOwner` function.
+ *
+ * @for @ember/owner
+ * @since 4.10.0
+ * @public
+ */
+export default interface Owner extends BasicRegistry, BasicContainer {}
+
 export interface RegisterOptions {
   instantiate?: boolean | undefined;
   singleton?: boolean | undefined;
@@ -117,7 +239,7 @@ export interface FactoryManager<T extends object> extends Factory<T> {
  * will be `true`; otherwise it will be `false` or `undefined`.
  */
 export type KnownForTypeResult<Type extends string> = {
-  [FullName in `${Type}:${string}`]: boolean | undefined;
+  [Key in FullName<Type, string>]: boolean | undefined;
 };
 
 /**
@@ -135,8 +257,10 @@ export type KnownForTypeResult<Type extends string> = {
  * `ember-resolver` in the default blueprint.
  */
 export interface Resolver {
-  resolve: (name: FullName) => Factory<object> | object | undefined;
-  knownForType?: <T extends string>(type: T) => KnownForTypeResult<T>;
+  resolve: <Type extends string, Name extends string>(
+    name: FullName<Type, Name>
+  ) => ResolveFactory<Type, Name>;
+  knownForType?: <Type extends string>(type: Type) => KnownForTypeResult<Type>;
   lookupDescription?: (fullName: FullName) => string;
   makeToString?: (factory: Factory<object>, fullName: FullName) => string;
   normalize?: (fullName: FullName) => FullName;
@@ -158,50 +282,9 @@ export function isFactory(obj: unknown): obj is InternalFactory<object> {
   return obj != null && typeof (obj as InternalFactory<object>).create === 'function';
 }
 
-/**
-  Framework objects in an Ember application (components, services, routes, etc.)
-  are created via a factory and dependency injection system. Each of these
-  objects is the responsibility of an "owner", which handled its
-  instantiation and manages its lifetime.
-
-  `getOwner` fetches the owner object responsible for an instance. This can
-  be used to lookup or resolve other class instances, or register new factories
-  into the owner.
-
-  For example, this component dynamically looks up a service based on the
-  `audioType` passed as an argument:
-
-  ```app/components/play-audio.js
-  import Component from '@glimmer/component';
-  import { action } from '@ember/object';
-  import { getOwner } from '@ember/application';
-
-  // Usage:
-  //
-  //   <PlayAudio @audioType={{@model.audioType}} @audioFile={{@model.file}}/>
-  //
-  export default class extends Component {
-    get audioService() {
-      let owner = getOwner(this);
-      return owner.lookup(`service:${this.args.audioType}`);
-    }
-
-    @action
-    onPlay() {
-      let player = this.audioService;
-      player.play(this.args.audioFile);
-    }
-  }
-  ```
-
-  @method getOwner
-  @static
-  @for @ember/owner
-  @param {Object} object An object with an owner.
-  @return {Object} An owner object.
-  @since 2.3.0
-  @public
-*/
+// NOTE: For docs, see the definition at the public API site in `@ember/owner`;
+// we document it there for the sake of public API docs and for TS consumption,
+// while having the richer `InternalOwner` representation for Ember itself.
 export function getOwner(object: object): InternalOwner | undefined {
   return glimmerGetOwner(object);
 }
@@ -222,37 +305,162 @@ export function setOwner(object: object, owner: Owner): void {
   glimmerSetOwner(object, owner);
 }
 
-export interface ContainerMixin extends Owner {
-  ownerInjection(): void;
+// Defines the type for the ContainerProxyMixin. When we rationalize our Owner
+// *not* to work via mixins, we will be able to delete this entirely: this
+// overload for `lookup()` and all of `ownerInjection()` will go away.
+export interface ContainerProxy extends BasicContainer {
+  /**
+   Returns an object that can be used to provide an owner to a
+   manually created instance.
+
+   Example:
+
+   ```
+   import { getOwner } from '@ember/application';
+
+   let owner = getOwner(this);
+
+   User.create(
+     owner.ownerInjection(),
+     { username: 'rwjblue' }
+   )
+   ```
+
+   @public
+   @method ownerInjection
+   @since 2.3.0
+   @return {Object}
+  */
+  ownerInjection(): object;
 }
 
-export interface RegistryMixin extends Pick<Owner, 'register'> {
+export interface RegistryProxy extends BasicRegistry {
   /**
-   Given a fullName return the corresponding factory.
+    Given a fullName return the corresponding factory.
 
-   @public
-   @method resolveRegistration
-   @param {String} fullName
-   @return {Function} fullName's factory
+    @public
+    @method resolveRegistration
+    @param {String} fullName
+    @return {Function} fullName's factory
    */
   resolveRegistration(fullName: FullName): Factory<object> | object | undefined;
 
+  /**
+    Unregister a factory.
+
+    ```javascript
+    import Application from '@ember/application';
+    import EmberObject from '@ember/object';
+
+    let App = Application.create();
+    let User = EmberObject.extend();
+    App.register('model:user', User);
+
+    App.resolveRegistration('model:user').create() instanceof User //=> true
+
+    App.unregister('model:user')
+    App.resolveRegistration('model:user') === undefined //=> true
+    ```
+
+    @public
+    @method unregister
+    @param {String} fullName
+   */
   unregister(fullName: FullName): void;
 
+  /**
+    Check if a factory is registered.
+
+    @public
+    @method hasRegistration
+    @param {String} fullName
+    @return {Boolean}
+   */
   hasRegistration(fullName: FullName): boolean;
 
+  /**
+    Return a specific registered option for a particular factory.
+
+    @public
+    @method registeredOption
+    @param  {String} fullName
+    @param  {String} optionName
+    @return {Object} options
+   */
   registeredOption<K extends keyof RegisterOptions>(
     fullName: FullName,
     optionName: K
   ): RegisterOptions[K] | undefined;
 
+  /**
+    Register options for a particular factory.
+
+    @public
+    @method registerOptions
+    @param {String} fullName
+    @param {Object} options
+   */
   registerOptions(fullName: FullName, options: RegisterOptions): void;
 
+  /**
+    Return registered options for a particular factory.
+
+    @public
+    @method registeredOptions
+    @param  {String} fullName
+    @return {Object} options
+   */
   registeredOptions(fullName: FullName): RegisterOptions | undefined;
 
+  /**
+    Allow registering options for all factories of a type.
+
+    ```javascript
+    import Application from '@ember/application';
+
+    let App = Application.create();
+    let appInstance = App.buildInstance();
+
+    // if all of type `connection` must not be singletons
+    appInstance.registerOptionsForType('connection', { singleton: false });
+
+    appInstance.register('connection:twitter', TwitterConnection);
+    appInstance.register('connection:facebook', FacebookConnection);
+
+    let twitter = appInstance.lookup('connection:twitter');
+    let twitter2 = appInstance.lookup('connection:twitter');
+
+    twitter === twitter2; // => false
+
+    let facebook = appInstance.lookup('connection:facebook');
+    let facebook2 = appInstance.lookup('connection:facebook');
+
+    facebook === facebook2; // => false
+    ```
+
+    @public
+    @method registerOptionsForType
+    @param {String} type
+    @param {Object} options
+   */
   registerOptionsForType(type: string, options: RegisterOptions): void;
 
+  /**
+    Return the registered options for all factories of a type.
+
+    @public
+    @method registeredOptionsForType
+    @param {String} type
+    @return {Object} options
+   */
   registeredOptionsForType(type: string): RegisterOptions | undefined;
 }
 
-export interface InternalOwner extends RegistryMixin, ContainerMixin {}
+/**
+ * @internal This is the same basic interface which is implemented (via the
+ *   mixins) by `EngineInstance` and therefore `ApplicationInstance`, which are
+ *   the normal interfaces to an `Owner` for end user applications now. However,
+ *   going forward, we expect to progressively deprecate and remove the "extra"
+ *   APIs which are not exposed on `Owner` itself.
+ */
+export interface InternalOwner extends RegistryProxy, ContainerProxy {}
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 7a7918c4c86..01fdec8fccd 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -4,7 +4,7 @@ import { schedule, join } from '@ember/runloop';
 */
 import type Container from '@ember/-internals/container/lib/container';
 import Mixin from '@ember/object/mixin';
-import type { ContainerMixin } from '@ember/-internals/owner';
+import type { ContainerProxy } from '@ember/-internals/owner';
 
 // This is defined as a separate interface so that it can be used in the definition of
 // `Owner` without also including the `__container__` property.
@@ -16,7 +16,7 @@ import type { ContainerMixin } from '@ember/-internals/owner';
   @class ContainerProxyMixin
   @private
 */
-interface ContainerProxyMixin extends ContainerMixin {
+interface ContainerProxyMixin extends ContainerProxy {
   /** @internal */
   __container__: Container;
 }
@@ -29,28 +29,6 @@ const ContainerProxyMixin = Mixin.create({
    */
   __container__: null,
 
-  /**
-   Returns an object that can be used to provide an owner to a
-   manually created instance.
-
-   Example:
-
-   ```
-   import { getOwner } from '@ember/application';
-
-   let owner = getOwner(this);
-
-   User.create(
-     owner.ownerInjection(),
-     { username: 'rwjblue' }
-   )
-   ```
-
-   @public
-   @method ownerInjection
-   @since 2.3.0
-   @return {Object}
-  */
   ownerInjection() {
     return this.__container__.ownerInjection();
   },
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index ef7e12d6f80..bf70f7e16f0 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -3,7 +3,7 @@
 */
 
 import type { Registry } from '@ember/-internals/container';
-import type { RegistryMixin } from '@ember/-internals/owner';
+import type { RegistryProxy } from '@ember/-internals/owner';
 import type { AnyFn } from '@ember/-internals/utils/types';
 
 import { assert } from '@ember/debug';
@@ -16,7 +16,7 @@ import Mixin from '@ember/object/mixin';
   @class RegistryProxyMixin
   @private
 */
-interface RegistryProxyMixin extends RegistryMixin {
+interface RegistryProxyMixin extends RegistryProxy {
   /** @internal */
   __registry__: Registry;
 }
@@ -28,181 +28,13 @@ const RegistryProxyMixin = Mixin.create({
     return this.__registry__.resolve(fullName);
   },
 
-  /**
-    Registers a factory that can be used for dependency injection (with
-    `inject`) or for service lookup. Each factory is registered with
-    a full name including two parts: `type:name`.
-
-    A simple example:
-
-    ```javascript
-    import Application from '@ember/application';
-    import EmberObject from '@ember/object';
-
-    let App = Application.create();
-
-    App.Orange = EmberObject.extend();
-    App.register('fruit:favorite', App.Orange);
-    ```
-
-    Ember will resolve factories from the `App` namespace automatically.
-    For example `App.CarsController` will be discovered and returned if
-    an application requests `controller:cars`.
-
-    An example of registering a controller with a non-standard name:
-
-    ```javascript
-    import Application from '@ember/application';
-    import Controller from '@ember/controller';
-
-    let App = Application.create();
-    let Session = Controller.extend();
-
-    App.register('controller:session', Session);
-
-    // The Session controller can now be treated like a normal controller,
-    // despite its non-standard name.
-    App.ApplicationController = Controller.extend({
-      needs: ['session']
-    });
-    ```
-
-    Registered factories are **instantiated** by having `create`
-    called on them. Additionally they are **singletons**, each time
-    they are looked up they return the same instance.
-
-    Some examples modifying that default behavior:
-
-    ```javascript
-    import Application from '@ember/application';
-    import EmberObject from '@ember/object';
-
-    let App = Application.create();
-
-    App.Person = EmberObject.extend();
-    App.Orange = EmberObject.extend();
-    App.Email = EmberObject.extend();
-    App.session = EmberObject.create();
-
-    App.register('model:user', App.Person, { singleton: false });
-    App.register('fruit:favorite', App.Orange);
-    App.register('communication:main', App.Email, { singleton: false });
-    App.register('session', App.session, { instantiate: false });
-    ```
-
-    @method register
-    @param  fullName {String} type:name (e.g., 'model:user')
-    @param  factory {any} (e.g., App.Person)
-    @param  options {Object} (optional) disable instantiation or singleton usage
-    @public
-   */
   register: registryAlias('register'),
-
-  /**
-   Unregister a factory.
-
-   ```javascript
-   import Application from '@ember/application';
-   import EmberObject from '@ember/object';
-
-   let App = Application.create();
-   let User = EmberObject.extend();
-   App.register('model:user', User);
-
-   App.resolveRegistration('model:user').create() instanceof User //=> true
-
-   App.unregister('model:user')
-   App.resolveRegistration('model:user') === undefined //=> true
-   ```
-
-   @public
-   @method unregister
-   @param {String} fullName
-   */
   unregister: registryAlias('unregister'),
-
-  /**
-   Check if a factory is registered.
-
-   @public
-   @method hasRegistration
-   @param {String} fullName
-   @return {Boolean}
-   */
   hasRegistration: registryAlias('has'),
-
-  /**
-   Return a specific registered option for a particular factory.
-
-   @public
-   @method registeredOption
-   @param  {String} fullName
-   @param  {String} optionName
-   @return {Object} options
-   */
   registeredOption: registryAlias('getOption'),
-
-  /**
-   Register options for a particular factory.
-
-   @public
-   @method registerOptions
-   @param {String} fullName
-   @param {Object} options
-   */
   registerOptions: registryAlias('options'),
-
-  /**
-   Return registered options for a particular factory.
-
-   @public
-   @method registeredOptions
-   @param  {String} fullName
-   @return {Object} options
-   */
   registeredOptions: registryAlias('getOptions'),
-
-  /**
-   Allow registering options for all factories of a type.
-
-   ```javascript
-   import Application from '@ember/application';
-
-   let App = Application.create();
-   let appInstance = App.buildInstance();
-
-   // if all of type `connection` must not be singletons
-   appInstance.registerOptionsForType('connection', { singleton: false });
-
-   appInstance.register('connection:twitter', TwitterConnection);
-   appInstance.register('connection:facebook', FacebookConnection);
-
-   let twitter = appInstance.lookup('connection:twitter');
-   let twitter2 = appInstance.lookup('connection:twitter');
-
-   twitter === twitter2; // => false
-
-   let facebook = appInstance.lookup('connection:facebook');
-   let facebook2 = appInstance.lookup('connection:facebook');
-
-   facebook === facebook2; // => false
-   ```
-
-   @public
-   @method registerOptionsForType
-   @param {String} type
-   @param {Object} options
-   */
   registerOptionsForType: registryAlias('optionsForType'),
-
-  /**
-   Return the registered options for all factories of a type.
-
-   @public
-   @method registeredOptionsForType
-   @param {String} type
-   @return {Object} options
-   */
   registeredOptionsForType: registryAlias('getOptionsForType'),
 
   /**
diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index bb223aaabdc..d1fa2818070 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -27,16 +27,9 @@
 // various bits of private API.
 import Owner, { getOwner as internalGetOwner } from '../-internals/owner';
 
-interface GetOwner {
-  (object: object): Owner | undefined;
-}
-
-// SAFETY: this is *only* safe for public API, because we are promising more
-// than we can actually *totally* guarantee we uphold otherwise. Specifically,
-// users *can* do things (including abusing the `ReliablyHasOwner` type or
-// corresponding interface) to get types which violate this contract. However,
-// doing so is only possible if they break the public API contract! Notably, for
-// our internals, we should *not* provide this.
+// NOTE: this documentation appears here instead of at the definition site so
+// it can appear correctly in both API docs and for TS, while providing a richer
+// internal representation for Ember's own usage.
 /**
   Framework objects in an Ember application (components, services, routes, etc.)
   are created via a factory and dependency injection system. Each of these
@@ -61,14 +54,12 @@ interface GetOwner {
   //
   export default class extends Component {
     get audioService() {
-      let owner = getOwner(this);
-      return owner.lookup(`service:${this.args.audioType}`);
+      return getOwner(this)?.lookup(`service:${this.args.audioType}`);
     }
 
     @action
     onPlay() {
-      let player = this.audioService;
-      player.play(this.args.audioFile);
+      this.audioService?.play(this.args.audioFile);
     }
   }
   ```
@@ -81,10 +72,14 @@ interface GetOwner {
   @since 2.3.0
   @public
 */
-const getOwner: GetOwner = internalGetOwner;
+// SAFETY: the cast here is necessary, instead of using an assignment, because
+// TS (not incorrectly! Nothing expressly relates them) does not see that the
+// `InternalOwner` and `Owner` do actually have identical constraints on their
+// relations to the `DIRegistry`.
+const getOwner = internalGetOwner as (object: object) => Owner | undefined;
 export { getOwner };
 
-// Everything else, we can directly re-export.
+// Everything else which is part of the public API, we can directly re-export.
 export default Owner;
 
 export {
@@ -95,4 +90,5 @@ export {
   FactoryManager,
   KnownForTypeResult,
   Resolver,
+  DIRegistry,
 } from '../-internals/owner';

From d01a89cec1fe81aeddc9d7dec8a7d2df523235cd Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 16:54:40 -0700
Subject: [PATCH 1250/1405] Update `@ember/application` type tests for new
 `@ember/owner` types

---
 packages/@ember/application/type-tests/instance.test.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 469740690df..08c0ae1d656 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -1,9 +1,9 @@
-import type { Factory, Owner } from '@ember/-internals/owner';
 import type EngineInstance from '@ember/engine/instance';
 import type { BootOptions } from '@ember/engine/instance';
 import Application from '@ember/application';
 import type ApplicationInstance from '@ember/application/instance';
 import EmberObject from '@ember/object';
+import Owner from '@ember/owner';
 
 import { expectTypeOf } from 'expect-type';
 
@@ -24,12 +24,10 @@ expectTypeOf(
   instance.register('service:store-singleton', Store, { singleton: true, instantiate: true })
 ).toEqualTypeOf<void>();
 
-expectTypeOf(instance.lookup('service:store')).toEqualTypeOf<
-  Factory<object> | object | undefined
->();
+expectTypeOf(instance.lookup('service:store')).toBeUnknown();
 expectTypeOf(
   instance.lookup('service:store', { singleton: true, instantiate: true })
-).toEqualTypeOf<object | Factory<object> | undefined>();
+).toBeUnknown();
 
 expectTypeOf(instance.hasRegistration('service:store')).toEqualTypeOf<boolean>();
 // @ts-expect-error requires name

From ecd3db7ea2fb4973913eb8c757c6ae7eea262c22 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 08:28:05 -0700
Subject: [PATCH 1251/1405] Introduce/update type tests for `Owner` internals

For the moment, these aim to match the type tests for the public
preview types for `@ember/owner` as much as possible, but with special
cases covered for the bits which are actually internal. This makes for
a stronger guarantee that we will not have a breaking change for end
users in the future. However, the tests for `@ember/-internals/owner`
*over*-reproduce those, since they also exist for `@ember/owner`
itself. A future commit will therefore remove all of the bits which are
*not* specifically internal for that type test package.
---
 packages/@ember/-internals/owner/index.ts     | 104 ++++----
 .../-internals/owner/type-tests/owner.test.ts | 224 +++++++++++++++++
 .../application/type-tests/index.test.ts      |  12 +-
 .../application/type-tests/instance.test.ts   |   2 +-
 .../@ember/owner/type-tests/owner.test.ts     | 225 ++++++++++++++++++
 5 files changed, 517 insertions(+), 50 deletions(-)
 create mode 100644 packages/@ember/-internals/owner/type-tests/owner.test.ts
 create mode 100644 packages/@ember/owner/type-tests/owner.test.ts

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index e2538eaa43b..3630ab33d54 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -5,10 +5,10 @@ import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimm
 */
 
 /**
- * The name for a factory consists of a namespace and the name of a specific
- * type within that namespace, like `'service:session'`.
- *
- * @for @ember/owner
+  The name for a factory consists of a namespace and the name of a specific
+  type within that namespace, like `'service:session'`.
+
+  @for @ember/owner
  */
 export type FullName<
   Type extends string = string,
@@ -16,41 +16,58 @@ export type FullName<
 > = `${Type}:${Name}`;
 
 /**
- * A type registry for the DI system, which other participants in the DI system
- * can register themselves into with declaration merging. The contract for this
- * type is that its keys are the `Type` from a `FullName`, and each value for a
- * `Type` is another registry whose keys are the `Name` from a `FullName`. The
- * mechanic for providing a registry is [declaration merging][handbook].
- *
- * [handbook]: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
- *
- * For example, a (non-existent!) "singleton" type might do this in :
- *
- * ```ts
- * abstract class Singleton {
- *   abstract requiredHook();
- * }
- *
- * // For concrete singleton classes to be merged into.
- * interface Registry extends Record<string, Singleton> {}
- *
- * declare module '@ember/owner' {
- *   singleton: Registry;
- * }
- * ```
- *
- * Then users of the `Owner` API will be able to reliably do things like this,
- * assuming a `some-class` registration exists:
- *
- * ```ts
- * getOwner(this)?.lookup('singleton:some-class').requiredHook();
- * ```
+  A type registry for the DI system, which other participants in the DI system
+  can register themselves into with declaration merging. The contract for this
+  type is that its keys are the `Type` from a `FullName`, and each value for a
+  `Type` is another registry whose keys are the `Name` from a `FullName`. The
+  mechanic for providing a registry is [declaration merging][handbook].
+
+  [handbook]: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
+
+  For example, Ember's `@ember/service` module includes this set of definitions:
+
+  ```ts
+  export default class Service extends EmberObject {}
+
+  // For concrete singleton classes to be merged into.
+  interface Registry extends Record<string, Service> {}
+
+  declare module '@ember/owner' {
+    service: Registry;
+  }
+  ```
+
+  Declarations of services can then include the registry:
+
+  ```ts
+  import Service from '@ember/service';
+
+  export default class Session extends Service {
+    login(username: string, password: string) {
+      // ...
+    }
+  }
+
+  declare module '@ember/service' {
+    interface Registry {
+      session: Session;
+    }
+  }
+  ```
+
+  Then users of the `Owner` API will be able to do things like this with strong
+  type safety guarantees:
+
+  ```ts
+  getOwner(this)?.lookup('service:session').login("hello", "1234abcd");
+  ```
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface DIRegistry extends Record<string, Record<string, unknown>> {}
 
-// Convenience utilities for pulling a specific factory manager off `DIRegistry`
+// Convenience utility for pulling a specific factory manager off `DIRegistry`
 // if one exists, or falling back to the default definition otherwise.
+/** @internal */
 type ResolveFactoryManager<
   Type extends string,
   Name extends string
@@ -58,13 +75,6 @@ type ResolveFactoryManager<
   ? FactoryManager<DIRegistry[Type][Name]>
   : FactoryManager<object> | undefined;
 
-type ResolveFactory<
-  Type extends string,
-  Name extends string
-> = DIRegistry[Type][Name] extends object
-  ? Factory<DIRegistry[Type][Name]>
-  : Factory<object> | object | undefined;
-
 interface BasicRegistry {
   /**
     Registers a factory that can be used for dependency injection (with
@@ -197,7 +207,7 @@ export interface RegisterOptions {
  * they return the same instance.
  *
  * However, that behavior can be modified with the `instantiate` and `singleton`
- * options to the {@linkcode Owner.register} method.
+ * options to the {@linkcode BasicRegistry.register Owner.register} method.
  */
 export interface Factory<T extends object> {
   // NOTE: this does not check against the types of the target object in any
@@ -208,12 +218,18 @@ export interface Factory<T extends object> {
   // able to provide a *narrower* interface than "exactly the public fields on
   // the class" while still falling back to the "exactly the public fields on
   // the class" for the general case. :sigh:
+  //
+  // We stills upply both signatures because even though the second one means
+  // literally anything will *type check*, the first one means that the normal
+  // case of calling `.create()` for most implementors of the contract will at
+  // least get useful autocomplete.
   /**
    * A function that will create an instance of the class with any
    * dependencies injected.
    *
    * @param initialValues Any values to set on an instance of the class
    */
+  create(initialValues?: Partial<T>): T;
   create(initialValues?: object): T;
 }
 
@@ -257,9 +273,7 @@ export type KnownForTypeResult<Type extends string> = {
  * `ember-resolver` in the default blueprint.
  */
 export interface Resolver {
-  resolve: <Type extends string, Name extends string>(
-    name: FullName<Type, Name>
-  ) => ResolveFactory<Type, Name>;
+  resolve: (name: string) => Factory<object> | object | undefined;
   knownForType?: <Type extends string>(type: Type) => KnownForTypeResult<Type>;
   lookupDescription?: (fullName: FullName) => string;
   makeToString?: (factory: Factory<object>, fullName: FullName) => string;
diff --git a/packages/@ember/-internals/owner/type-tests/owner.test.ts b/packages/@ember/-internals/owner/type-tests/owner.test.ts
new file mode 100644
index 00000000000..9bf17d7c487
--- /dev/null
+++ b/packages/@ember/-internals/owner/type-tests/owner.test.ts
@@ -0,0 +1,224 @@
+import type {
+  Factory,
+  FactoryManager,
+  FullName,
+  RegisterOptions,
+  Resolver,
+  KnownForTypeResult,
+  InternalOwner,
+} from '@ember/-internals/owner';
+import type Owner from '@ember/-internals/owner';
+import { getOwner, setOwner } from '@ember/-internals/owner';
+import Component from '@glimmer/component';
+import { expectTypeOf } from 'expect-type';
+import {
+  getOwner as getOwnerApplication,
+  setOwner as setOwnerApplication,
+} from '@ember/application';
+
+expectTypeOf(getOwner).toMatchTypeOf(getOwnerApplication);
+expectTypeOf(setOwnerApplication).toEqualTypeOf(setOwner);
+
+// Just a class we can construct in the Factory and FactoryManager tests
+declare class ConstructThis {
+  hasProps: boolean;
+}
+
+// ----- RegisterOptions ----- //
+declare let regOptionsA: RegisterOptions;
+expectTypeOf(regOptionsA.instantiate).toEqualTypeOf<boolean | undefined>();
+expectTypeOf(regOptionsA.singleton).toEqualTypeOf<boolean | undefined>();
+
+// ----- Factory ----- //
+// This gives us coverage for the cases where you are *casting*.
+declare let aFactory: Factory<ConstructThis>;
+
+aFactory.create();
+aFactory.create({});
+aFactory.create({
+  hasProps: true,
+});
+aFactory.create({
+  hasProps: false,
+});
+
+// NOTE: it would be nice if these could be rejected by way of EPC, but alas: it
+// cannot, because the public contract for `create` allows implementors to
+// define their `create` config object basically however they like. :-/
+aFactory.create({ unrelatedNonsense: 'yep yep yep' });
+aFactory.create({ hasProps: true, unrelatedNonsense: 'yep yep yep' });
+
+// But this should be legal.
+const goodPojo = { hasProps: true, unrelatedNonsense: 'also true' };
+aFactory.create(goodPojo);
+
+// This should also be rejected, though for *type error* reasons, not EPC; alas,
+// it cannot, for the same reason.
+const badPojo = { hasProps: 'huzzah', unrelatedNonsense: 'also true' };
+aFactory.create(badPojo);
+
+// ----- FactoryManager ----- //
+declare let aFactoryManager: FactoryManager<ConstructThis>;
+expectTypeOf(aFactoryManager.class).toEqualTypeOf<Factory<ConstructThis>>();
+expectTypeOf(aFactoryManager.create({})).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: true })).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: false })).toEqualTypeOf<ConstructThis>();
+
+// Likewise with these.
+aFactoryManager.create({ otherStuff: 'nope' });
+aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
+expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
+aFactoryManager.create(badPojo);
+
+// ----- Resolver ----- //
+declare let resolver: Resolver;
+expectTypeOf<Resolver['normalize']>().toEqualTypeOf<
+  ((fullName: FullName) => FullName) | undefined
+>();
+expectTypeOf<Resolver['lookupDescription']>().toEqualTypeOf<
+  ((fullName: FullName) => string) | undefined
+>();
+expectTypeOf(resolver.resolve('random:some-name')).toEqualTypeOf<
+  object | Factory<object> | undefined
+>();
+const knownForFoo = resolver.knownForType?.('foo');
+expectTypeOf(knownForFoo).toEqualTypeOf<KnownForTypeResult<'foo'> | undefined>();
+expectTypeOf(knownForFoo?.['foo:bar']).toEqualTypeOf<boolean | undefined>();
+// @ts-expect-error -- there is no `blah` on `knownForFoo`, *only* `foo`.
+knownForFoo?.blah;
+
+// This one is last so it can reuse the bits from above!
+// ----- Owner ----- //
+declare let owner: Owner;
+
+// @ts-expect-error
+owner.lookup();
+expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
+// @ts-expect-error
+owner.lookup('non-namespace-string');
+expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
+
+// Arbitrary registration patterns work, as here.
+declare module '@ember/-internals/owner' {
+  export interface DIRegistry {
+    etc: {
+      'my-type-test': ConstructThis;
+    };
+  }
+}
+
+expectTypeOf(owner.lookup('etc:my-type-test')).toEqualTypeOf<ConstructThis>();
+
+expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: false })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: false })).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: false })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: false })
+).toEqualTypeOf<void>();
+// @ts-expect-error
+owner.register('non-namespace-string', aFactory);
+expectTypeOf(owner.register('namespace@type:name', aFactory)).toEqualTypeOf<void>();
+
+expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({ anythingGoes: true })).toEqualTypeOf<
+  object | undefined
+>();
+// @ts-expect-error
+owner.factoryFor('non-namespace-string');
+expectTypeOf(owner.factoryFor('namespace@type:name')).toEqualTypeOf<
+  FactoryManager<object> | undefined
+>();
+
+// Tests deal with the fact that string literals are a special case! `let`
+// bindings will accordingly not "just work" as a result. The separate
+// assignments both satisfy the linter and show why it matters.
+let aName;
+aName = 'type:name';
+// @ts-expect-error
+owner.lookup(aName);
+
+let aTypedName: FullName;
+aTypedName = 'type:name';
+expectTypeOf(owner.lookup(aTypedName)).toBeUnknown();
+
+// Nor will callbacks work "out of the box". But they can work if they have the
+// correct type.
+declare const justStrings: string[];
+// @ts-expect-error
+justStrings.map((aString) => owner.lookup(aString));
+declare let typedStrings: FullName[];
+typedStrings.map((aString) => owner.lookup(aString));
+
+// Also make sure it keeps working with const bindings
+const aConstName = 'type:name';
+expectTypeOf(owner.lookup(aConstName)).toBeUnknown();
+
+// Check handling with Glimmer components carrying a Signature: they should
+// properly resolve to `Owner`, *not* `Owner | undefined`.
+interface Sig<T> {
+  Args: {
+    name: string;
+    age: number;
+    extra: T;
+  };
+  Element: HTMLParagraphElement;
+  Blocks: {
+    default: [greeting: string];
+    extra: [T];
+  };
+}
+
+class ExampleComponent<T> extends Component<Sig<T>> {
+  checkThis() {
+    expectTypeOf(getOwner(this)).toEqualTypeOf<InternalOwner | undefined>();
+  }
+}
+
+declare let example: ExampleComponent<string>;
+expectTypeOf(getOwner(example)).toEqualTypeOf<InternalOwner | undefined>();
+
+// ----- Minimal further coverage for POJOs ----- //
+// `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
+const Creatable = {
+  hasProps: true,
+};
+
+const pojoFactory: Factory<typeof Creatable> = {
+  // If you want *real* safety here, alas: you cannot have it. The public
+  // contract for `create` allows implementors to define their `create` config
+  // object basically however they like. As a result, this is the safest version
+  // possible: Making it be `Partial<Thing>` is *compatible* with `object`, and
+  // requires full checking *inside* the function body. It does not, alas, give
+  // any safety *outside* the class. A future rationalization of this would be
+  // very welcome.
+  create(initialValues?: Partial<typeof Creatable>) {
+    const instance = Creatable;
+    if (initialValues) {
+      if (initialValues.hasProps) {
+        Object.defineProperty(instance, 'hasProps', {
+          value: initialValues.hasProps,
+          enumerable: true,
+          writable: true,
+        });
+      }
+    }
+    return instance;
+  },
+};
+
+expectTypeOf(pojoFactory.create()).toEqualTypeOf<{ hasProps: boolean }>();
diff --git a/packages/@ember/application/type-tests/index.test.ts b/packages/@ember/application/type-tests/index.test.ts
index c648d08bbf5..ac786852da8 100644
--- a/packages/@ember/application/type-tests/index.test.ts
+++ b/packages/@ember/application/type-tests/index.test.ts
@@ -1,11 +1,11 @@
 import type { EventDispatcher } from '@ember/-internals/views';
+import type Owner from '@ember/owner';
 import Application, { getOwner, setOwner } from '@ember/application';
 import type ApplicationInstance from '@ember/application/instance';
-import type { InternalOwner } from '@ember/-internals/owner';
 
 import { expectTypeOf } from 'expect-type';
 
-let owner = {} as InternalOwner;
+declare let owner: Owner;
 
 class App extends Application {
   rootElement = '#ember-application';
@@ -61,6 +61,10 @@ class App2 extends Application {
 
 new App2(owner);
 
-expectTypeOf(getOwner({})).toEqualTypeOf<InternalOwner | undefined>();
+// getOwner and setOwner should work with explicit `owner` when imported here.
+expectTypeOf(getOwner({})).toEqualTypeOf<Owner | undefined>();
+expectTypeOf(setOwner({}, owner)).toEqualTypeOf<void>();
 
-expectTypeOf(setOwner({}, {} as InternalOwner)).toEqualTypeOf<void>();
+// `setOwner` should also work with `ApplicationInstance`s.
+declare let appInstance: ApplicationInstance;
+expectTypeOf(setOwner({}, appInstance)).toEqualTypeOf<void>();
diff --git a/packages/@ember/application/type-tests/instance.test.ts b/packages/@ember/application/type-tests/instance.test.ts
index 08c0ae1d656..49a750e1057 100644
--- a/packages/@ember/application/type-tests/instance.test.ts
+++ b/packages/@ember/application/type-tests/instance.test.ts
@@ -3,7 +3,7 @@ import type { BootOptions } from '@ember/engine/instance';
 import Application from '@ember/application';
 import type ApplicationInstance from '@ember/application/instance';
 import EmberObject from '@ember/object';
-import Owner from '@ember/owner';
+import type Owner from '@ember/owner';
 
 import { expectTypeOf } from 'expect-type';
 
diff --git a/packages/@ember/owner/type-tests/owner.test.ts b/packages/@ember/owner/type-tests/owner.test.ts
new file mode 100644
index 00000000000..9b550da2991
--- /dev/null
+++ b/packages/@ember/owner/type-tests/owner.test.ts
@@ -0,0 +1,225 @@
+import {
+  getOwner,
+  setOwner,
+  type default as Owner,
+  type Factory,
+  type FactoryManager,
+  type FullName,
+  type RegisterOptions,
+  type Resolver,
+  type KnownForTypeResult,
+} from '@ember/owner';
+import Component from '@glimmer/component';
+import {
+  getOwner as getOwnerApplication,
+  setOwner as setOwnerApplication,
+} from '@ember/application';
+
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(getOwnerApplication).toEqualTypeOf(getOwner);
+expectTypeOf(setOwnerApplication).toEqualTypeOf(setOwner);
+
+// Just a class we can construct in the Factory and FactoryManager tests
+declare class ConstructThis {
+  hasProps: boolean;
+}
+
+// ----- RegisterOptions ----- //
+declare let regOptionsA: RegisterOptions;
+expectTypeOf(regOptionsA.instantiate).toEqualTypeOf<boolean | undefined>();
+expectTypeOf(regOptionsA.singleton).toEqualTypeOf<boolean | undefined>();
+
+// ----- Factory ----- //
+// This gives us coverage for the cases where you are *casting*.
+declare let aFactory: Factory<ConstructThis>;
+
+aFactory.create();
+aFactory.create({});
+aFactory.create({
+  hasProps: true,
+});
+aFactory.create({
+  hasProps: false,
+});
+
+// NOTE: it would be nice if these could be rejected by way of EPC, but alas: it
+// cannot, because the public contract for `create` allows implementors to
+// define their `create` config object basically however they like. :-/
+aFactory.create({ unrelatedNonsense: 'yep yep yep' });
+aFactory.create({ hasProps: true, unrelatedNonsense: 'yep yep yep' });
+
+// But this should be legal.
+const goodPojo = { hasProps: true, unrelatedNonsense: 'also true' };
+aFactory.create(goodPojo);
+
+// This should also be rejected, though for *type error* reasons, not EPC; alas,
+// it cannot, for the same reason.
+const badPojo = { hasProps: 'huzzah', unrelatedNonsense: 'also true' };
+aFactory.create(badPojo);
+
+// ----- FactoryManager ----- //
+declare let aFactoryManager: FactoryManager<ConstructThis>;
+expectTypeOf(aFactoryManager.class).toEqualTypeOf<Factory<ConstructThis>>();
+expectTypeOf(aFactoryManager.create({})).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: true })).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: false })).toEqualTypeOf<ConstructThis>();
+
+// Likewise with these.
+aFactoryManager.create({ otherStuff: 'nope' });
+aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
+expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
+aFactoryManager.create(badPojo);
+
+// ----- Resolver ----- //
+declare let resolver: Resolver;
+expectTypeOf<Resolver['normalize']>().toEqualTypeOf<
+  ((fullName: FullName) => FullName) | undefined
+>();
+expectTypeOf<Resolver['lookupDescription']>().toEqualTypeOf<
+  ((fullName: FullName) => string) | undefined
+>();
+expectTypeOf(resolver.resolve('random:some-name')).toEqualTypeOf<
+  object | Factory<object> | undefined
+>();
+const knownForFoo = resolver.knownForType?.('foo');
+expectTypeOf(knownForFoo).toEqualTypeOf<KnownForTypeResult<'foo'> | undefined>();
+expectTypeOf(knownForFoo?.['foo:bar']).toEqualTypeOf<boolean | undefined>();
+// @ts-expect-error -- there is no `blah` on `knownForFoo`, *only* `foo`.
+knownForFoo?.blah;
+
+// This one is last so it can reuse the bits from above!
+// ----- Owner ----- //
+declare let owner: Owner;
+
+// @ts-expect-error
+owner.lookup();
+expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
+// @ts-expect-error
+owner.lookup('non-namespace-string');
+expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
+
+// Arbitrary registration patterns work, as here.
+declare module '@ember/owner' {
+  export interface DIRegistry {
+    etc: {
+      'my-type-test': ConstructThis;
+    };
+  }
+}
+
+expectTypeOf(owner.lookup('etc:my-type-test')).toEqualTypeOf<ConstructThis>();
+
+expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: false })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: false })).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: false })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: false })
+).toEqualTypeOf<void>();
+// @ts-expect-error
+owner.register('non-namespace-string', aFactory);
+expectTypeOf(owner.register('namespace@type:name', aFactory)).toEqualTypeOf<void>();
+
+expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({ anythingGoes: true })).toEqualTypeOf<
+  object | undefined
+>();
+// @ts-expect-error
+owner.factoryFor('non-namespace-string');
+expectTypeOf(owner.factoryFor('namespace@type:name')).toEqualTypeOf<
+  FactoryManager<object> | undefined
+>();
+
+// Tests deal with the fact that string literals are a special case! `let`
+// bindings will accordingly not "just work" as a result. The separate
+// assignments both satisfy the linter and show why it matters.
+let aName;
+aName = 'type:name';
+// @ts-expect-error
+owner.lookup(aName);
+
+let aTypedName: FullName;
+aTypedName = 'type:name';
+expectTypeOf(owner.lookup(aTypedName)).toBeUnknown();
+
+// Nor will callbacks work "out of the box". But they can work if they have the
+// correct type.
+declare const justStrings: string[];
+// @ts-expect-error
+justStrings.map((aString) => owner.lookup(aString));
+declare let typedStrings: FullName[];
+typedStrings.map((aString) => owner.lookup(aString));
+
+// Also make sure it keeps working with const bindings
+const aConstName = 'type:name';
+expectTypeOf(owner.lookup(aConstName)).toBeUnknown();
+
+// Check handling with Glimmer components carrying a Signature: they should
+// properly resolve to `Owner`, *not* `Owner | undefined`.
+interface Sig<T> {
+  Args: {
+    name: string;
+    age: number;
+    extra: T;
+  };
+  Element: HTMLParagraphElement;
+  Blocks: {
+    default: [greeting: string];
+    extra: [T];
+  };
+}
+
+class ExampleComponent<T> extends Component<Sig<T>> {
+  checkThis() {
+    expectTypeOf(getOwner(this)).toEqualTypeOf<Owner | undefined>();
+  }
+}
+
+declare let example: ExampleComponent<string>;
+expectTypeOf(getOwner(example)).toEqualTypeOf<Owner | undefined>();
+
+// ----- Minimal further coverage for POJOs ----- //
+// `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
+const Creatable = {
+  hasProps: true,
+};
+
+const pojoFactory: Factory<typeof Creatable> = {
+  // If you want *real* safety here, alas: you cannot have it. The public
+  // contract for `create` allows implementors to define their `create` config
+  // object basically however they like. As a result, this is the safest version
+  // possible: Making it be `Partial<Thing>` is *compatible* with `object`, and
+  // requires full checking *inside* the function body. It does not, alas, give
+  // any safety *outside* the class. A future rationalization of this would be
+  // very welcome.
+  create(initialValues?: Partial<typeof Creatable>) {
+    const instance = Creatable;
+    if (initialValues) {
+      if (initialValues.hasProps) {
+        Object.defineProperty(instance, 'hasProps', {
+          value: initialValues.hasProps,
+          enumerable: true,
+          writable: true,
+        });
+      }
+    }
+    return instance;
+  },
+};
+
+expectTypeOf(pojoFactory.create()).toEqualTypeOf<{ hasProps: boolean }>();

From 5658b13a400011d1b946b580565d79df91d65424 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 15 Nov 2022 17:52:32 -0700
Subject: [PATCH 1252/1405] Update preview types to match the implementation

Updates the preview types to include the `@ember/owner` types
introduced in an earlier commit. Besides updating the other existing
related exports to match the refactored types from the implementation,
the refactoring involved in landing correct types internally result in
a couple of key changes:

1.  `getOwner()` always returns `Owner | undefined`. The previous
    attempt to make it return `Owner` when working with a "known
    object" of some sort runs into significant issues:

    -   Ember's public API allows the direct construction of many types
        which are *normally* managed by the framework. It is legal, if
        odd and *not recommended*, to instantiate any given `Factory`
        with its `.create()` method:

            import Component from '@glimmer/component';
            import Session from '../services'

            export default class Example extends Component {
              session = Session.create();
            }

        In this example, the `session` property on `Example` will *not*
        have an `Owner`, so it is not safe for `session` itself to rely
        on that. This is annoying, but type safe, and straightforward
        to work around. For example, a helper designed to look up services in templates might do something like this:

            import Helper from '@ember/component/helper';
            import { getOwner } from '@ember/owner';
            import { assert } from '@ember/debug';

            class GetService extends Helper {
              compute([serviceName]) {
                let owner = getOwner(this);
                assert('unexpected missing an owner!', !!owner);

                return owner.lookup(`service:${name}`);
              }
            }

            Then if someone did `GetService.create()` instead of using
            a helper in a template *or* with `invokeHelper()`, they
            would get a useful error message.

    -   For the same reasons we cannot guarantee that contract from a
        types perspective, it is actually impossible to *implement* it
        in a type safe manner.

2.  The service registry now *requires* that its fields be `Service`
    subclasses. We added this constraint as part of generalizing the DI
    registry system to work well with the `Owner` APIs while avoiding
    introducing any circularity into the module graph. This should also
    be future-compatible with alternative future designs. This should
    not be breaking in practice, because items in the service registry
    were always expected to be service classes.

(Note that this cannot be backported to the release because the modules
it represents do not exist until this whole PR lands.)
---
 .../preview/@ember/application-test/index.ts  |   2 +-
 type-tests/preview/@ember/owner-tests.ts      |  80 ++--
 .../preview/ember/ember-module-tests.ts       |   2 +-
 types/preview/@ember/application/index.d.ts   |  32 +-
 .../-private/container-proxy-mixin.d.ts       |  10 +-
 .../engine/-private/registry-proxy-mixin.d.ts |  46 +--
 types/preview/@ember/engine/instance.d.ts     |   3 +-
 types/preview/@ember/owner/index.d.ts         | 361 ++++++++++++++++--
 types/preview/@ember/service/index.d.ts       |   9 +-
 9 files changed, 402 insertions(+), 143 deletions(-)

diff --git a/type-tests/preview/@ember/application-test/index.ts b/type-tests/preview/@ember/application-test/index.ts
index aa0d14e762d..04973e7f309 100644
--- a/type-tests/preview/@ember/application-test/index.ts
+++ b/type-tests/preview/@ember/application-test/index.ts
@@ -12,7 +12,7 @@ declare class MyService extends Service {
   withStuff: true;
 }
 declare let myService: MyService;
-expectTypeOf(getOwner(myService)).toEqualTypeOf<Owner>();
+expectTypeOf(getOwner(myService)).toEqualTypeOf<Owner | undefined>();
 
 // @ts-expect-error
 getOwner();
diff --git a/type-tests/preview/@ember/owner-tests.ts b/type-tests/preview/@ember/owner-tests.ts
index 9bb455e0a37..532a1455bf4 100644
--- a/type-tests/preview/@ember/owner-tests.ts
+++ b/type-tests/preview/@ember/owner-tests.ts
@@ -5,12 +5,18 @@ import Owner, {
   RegisterOptions,
   Resolver,
   KnownForTypeResult,
+  getOwner,
+  setOwner,
 } from '@ember/owner';
 import Component from '@glimmer/component';
 import { expectTypeOf } from 'expect-type';
-// TODO: once we move the runtime export to `@ember/owner`, update this import
-// as well. (That's why it's tested in this module!)
-import { getOwner } from '@ember/application';
+import {
+  getOwner as getOwnerApplication,
+  setOwner as setOwnerApplication,
+} from '@ember/application';
+
+expectTypeOf(getOwnerApplication).toEqualTypeOf(getOwner);
+expectTypeOf(setOwnerApplication).toEqualTypeOf(setOwner);
 
 // Just a class we can construct in the Factory and FactoryManager tests
 declare class ConstructThis {
@@ -35,19 +41,19 @@ aFactory.create({
   hasProps: false,
 });
 
-// These should be rejected by way of EPC
-// @ts-expect-error
+// NOTE: it would be nice if these could be rejected by way of EPC, but alas: it
+// cannot, because the public contract for `create` allows implementors to
+// define their `create` config object basically however they like. :-/
 aFactory.create({ unrelatedNonsense: 'yep yep yep' });
-// @ts-expect-error
 aFactory.create({ hasProps: true, unrelatedNonsense: 'yep yep yep' });
 
 // But this should be legal.
 const goodPojo = { hasProps: true, unrelatedNonsense: 'also true' };
 aFactory.create(goodPojo);
 
-// while this should be rejected for *type error* reasons, not EPC
+// This should also be rejected, though for *type error* reasons, not EPC; alas,
+// it cannot, for the same reason.
 const badPojo = { hasProps: 'huzzah', unrelatedNonsense: 'also true' };
-// @ts-expect-error
 aFactory.create(badPojo);
 
 // ----- FactoryManager ----- //
@@ -56,26 +62,29 @@ expectTypeOf(aFactoryManager.class).toEqualTypeOf<Factory<ConstructThis>>();
 expectTypeOf(aFactoryManager.create({})).toEqualTypeOf<ConstructThis>();
 expectTypeOf(aFactoryManager.create({ hasProps: true })).toEqualTypeOf<ConstructThis>();
 expectTypeOf(aFactoryManager.create({ hasProps: false })).toEqualTypeOf<ConstructThis>();
-// @ts-expect-error
+
+// Likewise with these.
 aFactoryManager.create({ otherStuff: 'nope' });
-// @ts-expect-error
 aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
 expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
-// @ts-expect-error
 aFactoryManager.create(badPojo);
 
 // ----- Resolver ----- //
 declare let resolver: Resolver;
-expectTypeOf<Resolver['normalize']>().toEqualTypeOf<((fullName: FullName) => string) | undefined>();
+expectTypeOf<Resolver['normalize']>().toEqualTypeOf<
+  ((fullName: FullName) => FullName) | undefined
+>();
 expectTypeOf<Resolver['lookupDescription']>().toEqualTypeOf<
   ((fullName: FullName) => string) | undefined
 >();
-expectTypeOf(resolver.resolve('some-name')).toEqualTypeOf<object | Factory<object> | undefined>();
+expectTypeOf(resolver.resolve('random:some-name')).toEqualTypeOf<
+  object | Factory<object> | undefined
+>();
 const knownForFoo = resolver.knownForType?.('foo');
 expectTypeOf(knownForFoo).toEqualTypeOf<KnownForTypeResult<'foo'> | undefined>();
 expectTypeOf(knownForFoo?.['foo:bar']).toEqualTypeOf<boolean | undefined>();
-// @ts-expect-error
-knownForFoo?.['blah'];
+// @ts-expect-error -- there is no `blah` on `knownForFoo`, *only* `foo`.
+knownForFoo?.blah;
 
 // This one is last so it can reuse the bits from above!
 // ----- Owner ----- //
@@ -88,12 +97,16 @@ expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
 owner.lookup('non-namespace-string');
 expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
 
-declare module '@ember/service' {
-  interface Registry {
-    'my-type-test-service': ConstructThis;
+// Arbitrary registration patterns work, as here.
+declare module '@ember/owner' {
+  export interface DIRegistry {
+    etc: {
+      'my-type-test': ConstructThis;
+    };
   }
 }
-expectTypeOf(owner.lookup('service:my-type-test-service')).toEqualTypeOf<ConstructThis>();
+
+expectTypeOf(owner.lookup('etc:my-type-test')).toEqualTypeOf<ConstructThis>();
 
 expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
 expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
@@ -117,17 +130,17 @@ expectTypeOf(
 owner.register('non-namespace-string', aFactory);
 expectTypeOf(owner.register('namespace@type:name', aFactory)).toEqualTypeOf<void>();
 
-expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<unknown> | undefined>();
-expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<unknown> | undefined>();
-expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<unknown>();
-expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<unknown>();
-expectTypeOf(
-  owner.factoryFor('type:name')?.create({ anythingGoes: true })
-).toEqualTypeOf<unknown>();
+expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({ anythingGoes: true })).toEqualTypeOf<
+  object | undefined
+>();
 // @ts-expect-error
 owner.factoryFor('non-namespace-string');
 expectTypeOf(owner.factoryFor('namespace@type:name')).toEqualTypeOf<
-  FactoryManager<unknown> | undefined
+  FactoryManager<object> | undefined
 >();
 
 // Tests deal with the fact that string literals are a special case! `let`
@@ -171,12 +184,12 @@ interface Sig<T> {
 
 class ExampleComponent<T> extends Component<Sig<T>> {
   checkThis() {
-    expectTypeOf(getOwner(this)).toEqualTypeOf<Owner>();
+    expectTypeOf(getOwner(this)).toEqualTypeOf<Owner | undefined>();
   }
 }
 
 declare let example: ExampleComponent<string>;
-expectTypeOf(getOwner(example)).toEqualTypeOf<Owner>();
+expectTypeOf(getOwner(example)).toEqualTypeOf<Owner | undefined>();
 
 // ----- Minimal further coverage for POJOs ----- //
 // `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
@@ -185,7 +198,14 @@ const Creatable = {
 };
 
 const pojoFactory: Factory<typeof Creatable> = {
-  create(initialValues?) {
+  // If you want *real* safety here, alas: you cannot have it. The public
+  // contract for `create` allows implementors to define their `create` config
+  // object basically however they like. As a result, this is the safest version
+  // possible: Making it be `Partial<Thing>` is *compatible* with `object`, and
+  // requires full checking *inside* the function body. It does not, alas, give
+  // any safety *outside* the class. A future rationalization of this would be
+  // very welcome.
+  create(initialValues?: Partial<typeof Creatable>) {
     const instance = Creatable;
     if (initialValues) {
       if (initialValues.hasProps) {
diff --git a/type-tests/preview/ember/ember-module-tests.ts b/type-tests/preview/ember/ember-module-tests.ts
index 98d074222d3..ab5fe935815 100644
--- a/type-tests/preview/ember/ember-module-tests.ts
+++ b/type-tests/preview/ember/ember-module-tests.ts
@@ -48,7 +48,7 @@ expectTypeOf(
   Ember.getEngineParent(new Ember.EngineInstance())
 ).toEqualTypeOf<Ember.EngineInstance>();
 // getOwner
-expectTypeOf(Ember.getOwner(new Ember.Component())).toEqualTypeOf<Owner>();
+expectTypeOf(Ember.getOwner(new Ember.Component())).toEqualTypeOf<Owner | undefined>();
 // getProperties
 expectTypeOf(Ember.getProperties({ z: 23 }, 'z').z).toEqualTypeOf<number>();
 expectTypeOf(Ember.getProperties({ z: 23 }, 'z', 'z').z).toEqualTypeOf<number>();
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 0543ff53508..d6aed4ade62 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -116,41 +116,23 @@ declare module '@ember/application' {
     buildInstance(options?: object): ApplicationInstance;
   }
 
-  // Known framework objects, so that `getOwner` can always, accurately, return
-  // `Owner` when working with one of these classes, which the framework *does*
-  // guarantee will always have an `Owner`. NOTE: this must be kept up to date
-  // whenever we add new base classes to the framework. For example, if we
-  // introduce a standalone `Service` or `Route` base class which *does not*
-  // extend from `EmberObject`, it will need to be added here.
-  //
-  // NOTE: we use `any` here because we need to make sure *not* to fix the
-  // actual GlimmerComponent type; using `unknown` or `{}` or `never` (the
-  // obvious alternatives here) results in a version which is too narrow, such
-  // that any subclass which applies a signature does not get resolved by the
-  // definition of `getOwner()` below.
-  type KnownFrameworkObject = EmberObject | GlimmerComponent<any>;
-
   /**
    * Framework objects in an Ember application (components, services, routes, etc.)
    * are created via a factory and dependency injection system. Each of these
    * objects is the responsibility of an "owner", which handled its
    * instantiation and manages its lifetime.
+   *
+   * @deprecated Use `import { getOwner } from '@ember/owner';` instead.
    */
-  // SAFETY: this first overload is, strictly speaking, *unsafe*. It is possible
-  // to do `let x = EmberObject.create(); getOwner(x);` and the result will *not*
-  // be `Owner` but instead `undefined`. However, that's quite unusual at this
-  // point, and more to the point we cannot actually distinguish a `Service`
-  // subclass from `EmberObject` at this point: `Service` subclasses `EmberObject`
-  // and adds nothing to it. Accordingly, if we want to catch `Service`s with this
-  // (and `getOwner(this)` for some service will definitely be defined!), it has
-  // to be this way. :sigh:
-  export function getOwner(object: KnownFrameworkObject): Owner;
-  export function getOwner(object: unknown): Owner | undefined;
+  export function getOwner(object: object): Owner | undefined;
+
   /**
    * `setOwner` forces a new owner on a given object instance. This is primarily
    * useful in some testing cases.
+   *
+   * @deprecated Use `import { setOwner } from '@ember/owner';` instead.
    */
-  export function setOwner(object: unknown, owner: Owner): void;
+  export function setOwner(object: object, owner: Owner): void;
 
   /**
    * Detects when a specific package of Ember (e.g. 'Ember.Application')
diff --git a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
index fbedd3127a9..4831c174436 100644
--- a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
@@ -1,17 +1,11 @@
 declare module '@ember/engine/-private/container-proxy-mixin' {
-  import Owner from '@ember/owner';
+  import { ContainerProxy } from '@ember/owner';
   import Mixin from '@ember/object/mixin';
 
   /**
    * Given a fullName return a factory manager.
    */
-  interface ContainerProxyMixin extends Owner {
-    /**
-     * Returns an object that can be used to provide an owner to a
-     * manually created instance.
-     */
-    ownerInjection(): {};
-  }
+  interface ContainerProxyMixin extends ContainerProxy {}
   const ContainerProxyMixin: Mixin;
   export default ContainerProxyMixin;
 }
diff --git a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
index a9f9599f8f3..65b69f755cb 100644
--- a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
@@ -1,54 +1,12 @@
 declare module '@ember/engine/-private/registry-proxy-mixin' {
-  import Owner from '@ember/owner';
+  import { RegistryProxy } from '@ember/owner';
   import Mixin from '@ember/object/mixin';
 
   /**
    * RegistryProxyMixin is used to provide public access to specific
    * registry functionality.
    */
-  interface RegistryProxyMixin extends Owner {
-    /**
-     * Given a fullName return the corresponding factory.
-     */
-    resolveRegistration(fullName: string): unknown;
-    /**
-     * Unregister a factory.
-     */
-    unregister(fullName: string): unknown;
-    /**
-     * Check if a factory is registered.
-     */
-    hasRegistration(fullName: string): boolean;
-    /**
-     * Register an option for a particular factory.
-     */
-    registerOption(fullName: string, optionName: string, options: {}): unknown;
-    /**
-     * Return a specific registered option for a particular factory.
-     */
-    registeredOption(fullName: string, optionName: string): {};
-    /**
-     * Register options for a particular factory.
-     */
-    registerOptions(fullName: string, options: {}): unknown;
-    /**
-     * Return registered options for a particular factory.
-     */
-    registeredOptions(fullName: string): {};
-    /**
-     * Allow registering options for all factories of a type.
-     */
-    registerOptionsForType(type: string, options: {}): unknown;
-    /**
-     * Return the registered options for all factories of a type.
-     */
-    registeredOptionsForType(type: string): {};
-    /**
-     * Define a dependency injection onto a specific factory or all factories
-     * of a type.
-     */
-    inject(factoryNameOrType: string, property: string, injectionName: string): unknown;
-  }
+  interface RegistryProxyMixin extends RegistryProxy {}
   const RegistryProxyMixin: Mixin;
   export default RegistryProxyMixin;
 }
diff --git a/types/preview/@ember/engine/instance.d.ts b/types/preview/@ember/engine/instance.d.ts
index 2f8c03015da..ea52c05e5ec 100644
--- a/types/preview/@ember/engine/instance.d.ts
+++ b/types/preview/@ember/engine/instance.d.ts
@@ -1,4 +1,5 @@
 declare module '@ember/engine/instance' {
+  import { FullName } from '@ember/owner';
   import ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
   import RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
   import EmberObject from '@ember/object';
@@ -11,7 +12,7 @@ declare module '@ember/engine/instance' {
     /**
      * Unregister a factory.
      */
-    unregister(fullName: string): unknown;
+    unregister(fullName: FullName): unknown;
 
     /**
      *  Initialize the `EngineInstance` and return a promise that resolves
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
index f798f356436..ffbb52e2117 100644
--- a/types/preview/@ember/owner/index.d.ts
+++ b/types/preview/@ember/owner/index.d.ts
@@ -1,50 +1,173 @@
 declare module '@ember/owner' {
-  import type { Registry } from '@ember/service';
-
   /**
    * The name for a factory consists of a namespace and the name of a specific
    * type within that namespace, like `'service:session'`.
    */
-  export type FullName = `${string}:${string}`;
+  export type FullName<
+    Type extends string = string,
+    Name extends string = string
+  > = `${Type}:${Name}`;
 
   /**
-   * Framework objects in an Ember application (components, services, routes,
-   * etc.) are created via a factory and dependency injection system. Each of
-   * these objects is the responsibility of an "owner", which handled its
-   * instantiation and manages its lifetime.
+   * A type registry for the DI system, which other participants in the DI system
+   * can register themselves into with declaration merging. The contract for this
+   * type is that its keys are the `Type` from a `FullName`, and each value for a
+   * `Type` is another registry whose keys are the `Name` from a `FullName`. The
+   * mechanic for providing a registry is [declaration merging][handbook].
+   *
+   * [handbook]: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
+   *
+   * For example, Ember's `Service` class uses this :
+   *
+   * ```ts
+   * export default class Service extends EmberObject {}
+   *
+   * // For concrete singleton classes to be merged into.
+   * interface Registry extends Record<string, Service> {}
+   *
+   * declare module '@ember/owner' {
+   *   service: Registry;
+   * }
+   * ```
+   *
+   * Declarations of services can then include the registry:
+   *
+   * ```ts
+   * import Service from '@ember/service';
+   *
+   * export default class Session extends Service {
+   *   login(username: string, password: string) {
+   *     // ...
+   *   }
+   * }
+   *
+   * declare module '@ember/service' {
+   *   interface Registry {
+   *     session: Session;
+   *   }
+   * }
+   * ```
+   *
+   * Then users of the `Owner` API will be able to reliably do things like this:
+   *
+   * ```ts
+   * getOwner(this)?.lookup('service:session').login("hello", "1234abcd");
+   * ```
    */
-  export default interface Owner {
-    /**
-     * Given a {@linkcode FullName} return a corresponding instance.
-     */
-    lookup<Name extends keyof Registry>(fullName: `service:${Name}`): Registry[Name];
-    lookup(fullName: FullName): unknown;
+  export interface DIRegistry extends Record<string, Record<string, unknown>> {}
 
+  // Convenience utilities for pulling a specific factory manager off `DIRegistry`
+  // if one exists, or falling back to the default definition otherwise.
+  type ResolveFactoryManager<
+    Type extends ValidType,
+    Name extends ValidName<Type>
+  > = DIRegistry[Type][Name] extends object
+    ? FactoryManager<DIRegistry[Type][Name]>
+    : FactoryManager<object> | undefined;
+
+  type ResolveFactory<
+    Type extends ValidType,
+    Name extends ValidName<Type>
+  > = DIRegistry[Type][Name] extends object
+    ? Factory<DIRegistry[Type][Name]>
+    : Factory<object> | object | undefined;
+
+  // This type is shared between `Owner` and `RegistryProxy
+  interface BasicRegistry {
     /**
-     * Registers a factory or value that can be used for dependency injection
-     * (with `inject`) or for service lookup. Each factory is registered with a
-     * full name including two parts: `'type:name'`.
-     *
-     * - To override the default of instantiating the class on the `Factory`,
-     *   pass the `{ instantiate: false }` option. This is useful when you have
-     *   already instantiated the class to use with this factory.
-     * - To override the default singleton behavior and instead create multiple
-     *   instances, pass the `{ singleton: false }` option.
-     */
-    // Dear future maintainer: yes, I know that `Factory<unknown> | object` is
-    // an exceedingly weird type here. This is how we type it internally in
-    // Ember itself. We actually allow more or less *anything* to be passed
+      Registers a factory that can be used for dependency injection (with
+      `inject`) or for service lookup. Each factory is registered with
+      a full name including two parts: `type:name`.
+
+      A simple example:
+
+      ```javascript
+      import Application from '@ember/application';
+      import EmberObject from '@ember/object';
+
+      let App = Application.create();
+
+      App.Orange = EmberObject.extend();
+      App.register('fruit:favorite', App.Orange);
+      ```
+
+      Ember will resolve factories from the `App` namespace automatically.
+      For example `App.CarsController` will be discovered and returned if
+      an application requests `controller:cars`.
+
+      An example of registering a controller with a non-standard name:
+
+      ```javascript
+      import Application from '@ember/application';
+      import Controller from '@ember/controller';
+
+      let App = Application.create();
+      let Session = Controller.extend();
+
+      App.register('controller:session', Session);
+
+      // The Session controller can now be treated like a normal controller,
+      // despite its non-standard name.
+      App.ApplicationController = Controller.extend({
+        needs: ['session']
+      });
+      ```
+
+      Registered factories are **instantiated** by having `create`
+      called on them. Additionally they are **singletons**, each time
+      they are looked up they return the same instance.
+
+      Some examples modifying that default behavior:
+
+      ```javascript
+      import Application from '@ember/application';
+      import EmberObject from '@ember/object';
+
+      let App = Application.create();
+
+      App.Person = EmberObject.extend();
+      App.Orange = EmberObject.extend();
+      App.Email = EmberObject.extend();
+      App.session = EmberObject.create();
+
+      App.register('model:user', App.Person, { singleton: false });
+      App.register('fruit:favorite', App.Orange);
+      App.register('communication:main', App.Email, { singleton: false });
+      App.register('session', App.session, { instantiate: false });
+      ```
+
+      @method register
+      @param  fullName {String} type:name (e.g., 'model:user')
+      @param  factory {any} (e.g., App.Person)
+      @param  options {Object} (optional) disable instantiation or singleton usage
+      @public
+      */
+    // Dear future maintainer: yes, `Factory<object> | object` is an exceedingly
+    // weird type here. We actually allow more or less *anything* to be passed
     // here. In the future, we may possibly be able to update this to actually
     // take advantage of the `FullName` here to require that the registered
     // factory and corresponding options do the right thing (passing an *actual*
     // factory, not needing `create` if `options.instantiate` is `false`, etc.)
-    // but doing so will require rationalizing Ember's own internals and may
-    // need a full Ember RFC.
+    // but doing so will require rationalizing Ember's own internals and may need
+    // a full Ember RFC.
     register(
       fullName: FullName,
-      factory: Factory<unknown> | object,
+      factory: Factory<object> | object,
       options?: RegisterOptions
     ): void;
+  }
+
+  type ValidType = keyof DIRegistry & string;
+  type ValidName<Type extends ValidType> = keyof DIRegistry[Type] & string;
+
+  interface BasicContainer {
+    /**
+     * Given a {@linkcode FullName} return a corresponding instance.
+     */
+    lookup<Type extends ValidType, Name extends ValidName<Type>>(
+      fullName: FullName<Type, Name>,
+      options?: RegisterOptions
+    ): DIRegistry[Type][Name];
 
     /**
      * Given a fullName of the form `'type:name'`, like `'route:application'`,
@@ -54,9 +177,19 @@ declare module '@ember/owner' {
      * destroyed manually by the caller of `.create()`. Typically, this is done
      * during the creating objects own `destroy` or `willDestroy` methods.
      */
-    factoryFor(fullName: FullName): FactoryManager<unknown> | undefined;
+    factoryFor<Type extends ValidType, Name extends ValidName<Type>>(
+      fullName: FullName<Type, Name>
+    ): ResolveFactoryManager<Type, Name>;
   }
 
+  /**
+   * Framework objects in an Ember application (components, services, routes,
+   * etc.) are created via a factory and dependency injection system. Each of
+   * these objects is the responsibility of an "owner", which handles its
+   * instantiation and manages its lifetime.
+   */
+  export default interface Owner extends BasicRegistry, BasicContainer {}
+
   export interface RegisterOptions {
     instantiate?: boolean | undefined;
     singleton?: boolean | undefined;
@@ -71,6 +204,19 @@ declare module '@ember/owner' {
    * options to the {@linkcode Owner.register} method.
    */
   export interface Factory<T> {
+    // NOTE: this does not check against the types of the target object in any
+    // way, unfortunately. However, we actually *cannot* constrain it further than
+    // this without going down a *very* deep rabbit hole (see the historic types
+    // for `.create()` on DefinitelyTyped if you're curious), because we need (for
+    // historical reasons) to support classes which implement this contract to be
+    // able to provide a *narrower* interface than "exactly the public fields on
+    // the class" while still falling back to the "exactly the public fields on
+    // the class" for the general case. :sigh:
+    //
+    // We stills upply both signatures because even though the second one means
+    // literally anything will *type check*, the first one means that the normal
+    // case of calling `.create()` for most implementors of the contract will at
+    // least get useful autocomplete.
     /**
      * A function that will create an instance of the class with any
      * dependencies injected.
@@ -78,6 +224,7 @@ declare module '@ember/owner' {
      * @param initialValues Any values to set on an instance of the class
      */
     create(initialValues?: Partial<T>): T;
+    create(initialValues?: object): T;
   }
 
   /**
@@ -120,11 +267,161 @@ declare module '@ember/owner' {
    * `ember-resolver` in the default blueprint.
    */
   export interface Resolver {
-    resolve: (name: string) => Factory<object> | object | undefined;
+    resolve: <Type extends ValidType, Name extends ValidName<Type>>(
+      name: FullName<Type, Name>
+    ) => ResolveFactory<Type, Name>;
     knownForType?: <Type extends string>(type: Type) => KnownForTypeResult<Type>;
     lookupDescription?: (fullName: FullName) => string;
     makeToString?: (factory: Factory<object>, fullName: FullName) => string;
-    normalize?: (fullName: FullName) => string;
+    normalize?: (fullName: FullName) => FullName;
+  }
+
+  /**
+   * Framework objects in an Ember application (components, services, routes, etc.)
+   * are created via a factory and dependency injection system. Each of these
+   * objects is the responsibility of an "owner", which handled its
+   * instantiation and manages its lifetime.
+   *
+   * `getOwner` fetches the owner object responsible for an instance. This can
+   * be used to lookup or resolve other class instances, or register new factories
+   * into the owner.
+   *
+   * For example, this component dynamically looks up a service based on the
+   * `audioType` passed as an argument:
+   *
+   * ```app/components/play-audio.js
+   * import Component from '@glimmer/component';
+   * import { action } from '@ember/object';
+   * import { getOwner } from '@ember/application';
+   *
+   * // Usage:
+   * //
+   * //   <PlayAudio @audioType={{@model.audioType}} @audioFile={{@model.file}}/>
+   * //
+   * export default class PlayAudio extends Component {
+   *   get audioService() {
+   *     return getOwner(this)?.lookup(`service:${this.args.audioType}`);
+   *   }
+   *
+   *   @action
+   *   onPlay() {
+   *     this.audioService?.play(this.args.audioFile);
+   *   }
+   * }
+   * ```
+   */
+  export function getOwner(object: object): Owner | undefined;
+
+  /**
+   * `setOwner` forces a new owner on a given object instance. This is primarily
+   * useful in some testing cases.
+   *
+   * @param object An object instance.
+   * @param owner The new owner object of the object instance.
+   */
+  export function setOwner(object: object, owner: Owner): void;
+
+  export interface ContainerProxy extends BasicContainer {
+    /**
+     * Returns an object that can be used to provide an owner to a
+     * manually created instance.
+     *
+     * Example:
+     *
+     * ```
+     * import { getOwner } from '@ember/application';
+     *
+     * let owner = getOwner(this);
+     *
+     * User.create(
+     *   owner.ownerInjection(),
+     *   { username: 'rwjblue' }
+     * )
+     * ```
+     */
+    ownerInjection(): object;
+  }
+
+  export interface RegistryProxy extends BasicRegistry {
+    /**
+     * Given a fullName return the corresponding factory.
+     */
+    resolveRegistration(fullName: FullName): Factory<object> | object | undefined;
+
+    /**
+     * Unregister a factory.
+     *
+     *
+     * ```javascript
+     * import Application from '@ember/application';
+     * import EmberObject from '@ember/object';
+     * let App = Application.create();
+     * let User = EmberObject.extend();
+     * App.register('model:user', User);
+     *
+     * App.resolveRegistration('model:user').create() instanceof User //=> true
+     *
+     * App.unregister('model:user')
+     * App.resolveRegistration('model:user') === undefined //=> true
+     * ```
+     */
+    unregister(fullName: FullName): void;
+
+    /**
+     * Check if a factory is registered.
+     */
+    hasRegistration(fullName: FullName): boolean;
+
+    /**
+     * Return a specific registered option for a particular factory.
+     */
+    registeredOption<K extends keyof RegisterOptions>(
+      fullName: FullName,
+      optionName: K
+    ): RegisterOptions[K] | undefined;
+
+    /**
+     * Register options for a particular factory.
+     */
+    registerOptions(fullName: FullName, options: RegisterOptions): void;
+
+    /**
+     * Return registered options for a particular factory.
+     */
+    registeredOptions(fullName: FullName): RegisterOptions | undefined;
+
+    /**
+     * Allow registering options for all factories of a type.
+     *
+     * ```javascript
+     * import Application from '@ember/application';
+     *
+     * let App = Application.create();
+     * let appInstance = App.buildInstance();
+     *
+     * // if all of type `connection` must not be singletons
+     * appInstance.registerOptionsForType('connection', { singleton: false });
+     *
+     * appInstance.register('connection:twitter', TwitterConnection);
+     * appInstance.register('connection:facebook', FacebookConnection);
+     *
+     * let twitter = appInstance.lookup('connection:twitter');
+     * let twitter2 = appInstance.lookup('connection:twitter');
+     *
+     * twitter === twitter2; // => false
+     *
+     * let facebook = appInstance.lookup('connection:facebook');
+     * let facebook2 = appInstance.lookup('connection:facebook');
+     *
+     * facebook === facebook2; // => false
+     * ```
+     */
+    registerOptionsForType(type: string, options: RegisterOptions): void;
+
+    /**
+     * Return the registered options for all factories of a type.
+     */
+    registeredOptionsForType(type: string): RegisterOptions | undefined;
   }
 
   // Don't export things unless we *intend* to.
diff --git a/types/preview/@ember/service/index.d.ts b/types/preview/@ember/service/index.d.ts
index 323494f3b35..93c85048fe7 100644
--- a/types/preview/@ember/service/index.d.ts
+++ b/types/preview/@ember/service/index.d.ts
@@ -21,5 +21,12 @@ declare module '@ember/service' {
 
   // A type registry for Ember `Service`s. Meant to be declaration-merged so
   // string lookups resolve to the correct type.
-  interface Registry {}
+  export interface Registry extends Record<string, Service> {}
+}
+
+declare module '@ember/owner' {
+  import { Registry } from '@ember/service';
+  export interface DIRegistry {
+    service: Registry;
+  }
 }

From 63fb7cf65753b9da192d290948a6b16b9125f2bd Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 09:43:59 -0700
Subject: [PATCH 1253/1405] Fix white space in comments in `@ember/controller`

Prettier!
---
 packages/@ember/controller/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 2fdf0928ad0..91e54ffd656 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -44,7 +44,7 @@ interface ControllerMixin<T> extends ActionHandler {
     as part of the application's initialization process. In most cases the
     `target` property will automatically be set to the logical consumer of
     actions for the controller.
-    
+
     @property target
     @default null
     @public
@@ -54,7 +54,7 @@ interface ControllerMixin<T> extends ActionHandler {
   /**
     The controller's current model. When retrieving or modifying a controller's
     model, this property should be used instead of the `content` property.
-    
+
     @property model
     @public
   */
@@ -81,7 +81,7 @@ interface ControllerMixin<T> extends ActionHandler {
     ```
     Available values for the `type` parameter are `'boolean'`, `'number'`, `'array'`, and `'string'`.
     If query param type is not specified, it will default to `'string'`.
-    
+
     @for Ember.ControllerMixin
     @property queryParams
     @public
@@ -151,7 +151,7 @@ interface ControllerMixin<T> extends ActionHandler {
     ```
 
     See also [replaceRoute](/ember/release/classes/Ember.ControllerMixin/methods/replaceRoute?anchor=replaceRoute).
-    
+
     @for Ember.ControllerMixin
     @method transitionToRoute
     @deprecated Use transitionTo from the Router service instead.
@@ -215,7 +215,7 @@ interface ControllerMixin<T> extends ActionHandler {
     aController.replaceRoute('/');
     aController.replaceRoute('/blog/post/1/comment/13');
     ```
-    
+
     @for Ember.ControllerMixin
     @method replaceRoute
     @deprecated Use replaceWith from the Router service instead.

From 3af52bca2baef5e402b2f02785eeb9c0f57408ee Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 18:04:53 -0700
Subject: [PATCH 1254/1405] `EngineInstance` explicitly implements `Owner`

---
 packages/@ember/engine/instance.ts        | 4 ++--
 types/preview/@ember/engine/instance.d.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 05e1e1de6db..13699007c60 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -10,7 +10,7 @@ import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
 import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
-import { type FullName, isFactory } from '@ember/-internals/owner';
+import Owner, { type FullName, isFactory, InternalOwner } from '@ember/-internals/owner';
 import Engine from '@ember/engine';
 import type Application from '@ember/application';
 import type { BootEnvironment } from '@ember/-internals/glimmer';
@@ -49,7 +49,7 @@ export interface EngineInstanceOptions {
 // `ContainerProxyMixin`, which respectively implement the same `RegistryMixin`
 // and `ContainerMixin` types used to define `InternalOwner`, this is the same
 // type as `InternalOwner` from TS's POV.
-interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
+interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, InternalOwner, Owner {}
 class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin) {
   /**
    @private
diff --git a/types/preview/@ember/engine/instance.d.ts b/types/preview/@ember/engine/instance.d.ts
index ea52c05e5ec..b6594700ff1 100644
--- a/types/preview/@ember/engine/instance.d.ts
+++ b/types/preview/@ember/engine/instance.d.ts
@@ -1,5 +1,5 @@
 declare module '@ember/engine/instance' {
-  import { FullName } from '@ember/owner';
+  import Owner, { FullName } from '@ember/owner';
   import ContainerProxyMixin from '@ember/engine/-private/container-proxy-mixin';
   import RegistryProxyMixin from '@ember/engine/-private/registry-proxy-mixin';
   import EmberObject from '@ember/object';
@@ -21,5 +21,5 @@ declare module '@ember/engine/instance' {
     boot(): Promise<EngineInstance>;
   }
 
-  export default interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin {}
+  export default interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, Owner {}
 }

From c339f5f1704327ea4d169e6e42f86db1a7be6690 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 18:10:02 -0700
Subject: [PATCH 1255/1405] `Factory.create()` cannot be type safe

This means our `.create()` type does not check against the types of the
target object in any way, unfortunately. However, we actually *cannot*
constrain it further than this without going down a *very* deep rabbit
hole (see the historic types for `.create()` on DefinitelyTyped if
you're curious), because we need (for historical reasons) to support
classes which implement this contract to be able to provide a
*narrower* interface than "exactly the public fields on the class"
while still falling back to the "exactly the public fields on the
class" for the general case. Unfortunately, Ember internally relies on
the ability for items which implement `Factory` to be able to customize
the arguments to the `.create()` call in just that way.
---
 packages/@ember/-internals/owner/index.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 3630ab33d54..040df1ff7e5 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -229,7 +229,6 @@ export interface Factory<T extends object> {
    *
    * @param initialValues Any values to set on an instance of the class
    */
-  create(initialValues?: Partial<T>): T;
   create(initialValues?: object): T;
 }
 

From 7e49f29aab064ec5949e4c7afcdb353899a62152 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 18:24:00 -0700
Subject: [PATCH 1256/1405] Fix lint errors in Owner packages

---
 packages/@ember/-internals/owner/index.ts | 5 -----
 types/preview/@ember/owner/index.d.ts     | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 040df1ff7e5..04264a515b7 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -218,11 +218,6 @@ export interface Factory<T extends object> {
   // able to provide a *narrower* interface than "exactly the public fields on
   // the class" while still falling back to the "exactly the public fields on
   // the class" for the general case. :sigh:
-  //
-  // We stills upply both signatures because even though the second one means
-  // literally anything will *type check*, the first one means that the normal
-  // case of calling `.create()` for most implementors of the contract will at
-  // least get useful autocomplete.
   /**
    * A function that will create an instance of the class with any
    * dependencies injected.
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
index ffbb52e2117..559a31301b2 100644
--- a/types/preview/@ember/owner/index.d.ts
+++ b/types/preview/@ember/owner/index.d.ts
@@ -212,18 +212,12 @@ declare module '@ember/owner' {
     // able to provide a *narrower* interface than "exactly the public fields on
     // the class" while still falling back to the "exactly the public fields on
     // the class" for the general case. :sigh:
-    //
-    // We stills upply both signatures because even though the second one means
-    // literally anything will *type check*, the first one means that the normal
-    // case of calling `.create()` for most implementors of the contract will at
-    // least get useful autocomplete.
     /**
      * A function that will create an instance of the class with any
      * dependencies injected.
      *
      * @param initialValues Any values to set on an instance of the class
      */
-    create(initialValues?: Partial<T>): T;
     create(initialValues?: object): T;
   }
 

From b2ce803496e1a0943acda75a927c736cc5b21425 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 21:23:17 -0700
Subject: [PATCH 1257/1405] Fix a type error in CoreObject on TS@next

---
 packages/@ember/object/core.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index c3b081bf3b9..a367d6fb697 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -260,7 +260,7 @@ class CoreObject {
 
       /* globals Proxy Reflect */
       self = new Proxy(this, {
-        get(target: CoreObject & HasUnknownProperty, property, receiver) {
+        get(target: typeof this & HasUnknownProperty, property, receiver) {
           if (property === PROXY_CONTENT) {
             return target;
           } else if (

From 2340d2d99ee7722c38cf888c04b7d3b02e4f3bab Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 16 Nov 2022 21:27:07 -0700
Subject: [PATCH 1258/1405] Fix another linting issue in `@ember/engine`

This is a bit annoying: the fixer actually makes the declaration *worse*
by some interpretations. But :shrug:
---
 packages/@ember/engine/instance.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 13699007c60..5516dccf24a 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -10,7 +10,9 @@ import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
 import { ContainerProxyMixin, RegistryProxyMixin } from '@ember/-internals/runtime';
-import Owner, { type FullName, isFactory, InternalOwner } from '@ember/-internals/owner';
+import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/-internals/owner';
+import { type FullName, isFactory } from '@ember/-internals/owner';
 import Engine from '@ember/engine';
 import type Application from '@ember/application';
 import type { BootEnvironment } from '@ember/-internals/glimmer';

From 9cc6a8d149462c143761a808c4348d994641d4df Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 17 Nov 2022 07:05:58 -0700
Subject: [PATCH 1259/1405] Disable a type safety/correctness assertion

In `CoreObject.create()`, we currently have an unsafe cast when
constructing an instance with props, because the code assumes one of
two things. Either: the `factory` is always set, *or* it is safe to
call `setFactoryFor` with `undefined`. A number of acceptance tests are
(incorrectly? Unclear!) relying on the ability to run through this path
with `factory` being `undefined`. It's *possible* that actually means
that the type for `setFactoryFor` should allow `undefined`, but we
typed it the other way for good reason! Accordingly, this *casts*
`factory`, and the commented-out `assert()` is here in the hope that we
can enable it after addressing tests in the future.
---
 packages/@ember/object/core.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index a367d6fb697..773c07ca770 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -768,9 +768,17 @@ class CoreObject {
 
     if (props !== undefined) {
       instance = new this(getOwner(props));
+      // TODO(SAFETY): at present, we cannot actually rely on this being set,
+      // because a number of acceptance tests are (incorrectly? Unclear!)
+      // relying on the ability to run through this path with `factory` being
+      // `undefined`. It's *possible* that actually means that the type for
+      // `setFactoryFor()` should allow `undefined`, but we typed it the other
+      // way for good reason! Accordingly, this *casts* `factory`, and the
+      // commented-out `assert()` is here in the hope that we can enable it
+      // after addressing tests *or* updating the call signature here.
       let factory = getFactoryFor(props);
-      assert(`missing factory when creating object ${instance}`, factory !== undefined);
-      setFactoryFor(instance, factory);
+      // assert(`missing factory when creating object ${instance}`, factory !== undefined);
+      setFactoryFor(instance, factory as NonNullable<typeof factory>);
     } else {
       instance = new this();
     }

From 7785b6f6f413bb619771af496a7cf564a81c12c9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 17 Nov 2022 07:46:11 -0700
Subject: [PATCH 1260/1405] Disable another type safety/correctness assertion

The `generateControllerFactory()` function *should* require that the
class associated with the `FactoryManager` for a given controller name
be a `Controller` subclass, but the tests today do *not* keep this
contract. We should fix that, but *separately* from this types-focused
change, which aims to change *only* the types and module graph.
---
 packages/@ember/routing/lib/generate_controller.ts | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/routing/lib/generate_controller.ts b/packages/@ember/routing/lib/generate_controller.ts
index 4dff90abfde..c42e810d4cf 100644
--- a/packages/@ember/routing/lib/generate_controller.ts
+++ b/packages/@ember/routing/lib/generate_controller.ts
@@ -26,11 +26,15 @@ export function generateControllerFactory(
     factoryManager !== undefined
   );
 
-  let Factory = factoryManager.class;
-  assert(
-    '[BUG] factory for `controller:main` is unexpectedly not a Controller',
-    ((factory): factory is typeof Controller => factory === Controller)(Factory)
-  );
+  // SAFETY: This is *not* safe, and the cast should be removed in favor of the
+  // `assert()` below after altering *tests*. It is left in this state for the
+  // moment in the interest of keeping type-only changes separate from changes
+  // to the runtime behavior of the system, even for tests.
+  let Factory = factoryManager.class as typeof Controller<unknown>;
+  // assert(
+  //   '[BUG] factory for `controller:main` is unexpectedly not a Controller',
+  //   ((factory): factory is typeof Controller => factory === Controller)(Factory)
+  // );
 
   Factory = Factory.extend({
     toString() {

From 9763c717853dc7f374a915219c8c4ec2cb295c87 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 17 Nov 2022 08:21:18 -0700
Subject: [PATCH 1261/1405] Disable one more type safety/correctness assertion

The private `Router._setOutlets()` method *should* require that there
be an actual `-application-instance:main` available, since otherwise it
literally won't work at runtime. However, at least one test runs without it set correctly:

    Router Service - non application test:
        RouterService#transitionTo with basic route

We should fix that, but *separately* from this types-focused change,
which aims to change *only* the types and module graph.
---
 packages/@ember/routing/router.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 42aa57debe7..5fbb3f6316f 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -671,8 +671,12 @@ class EmberRouter<R extends Route = Route> extends EmberObject.extend(Evented) i
       this._toplevelView = OutletView.create({ environment, template, application });
       this._toplevelView.setOutletState(liveRoutes as GlimmerOutletState);
 
-      let instance = owner.lookup('-application-instance:main') as ApplicationInstance | undefined;
-      assert('[BUG] unexpectedly missing `-application-instance:main`', instance !== undefined);
+      // TODO(SAFETY): At least one test runs without this set correctly. At a
+      // later time, update the test to configure this correctly. The test ID:
+      // `Router Service - non application test:  RouterService#transitionTo with basic route`
+      let instance = owner.lookup('-application-instance:main') as ApplicationInstance;
+      // let instance = owner.lookup('-application-instance:main') as ApplicationInstance | undefined;
+      // assert('[BUG] unexpectedly missing `-application-instance:main`', instance !== undefined);
 
       if (instance) {
         // SAFETY: LOL. This is calling a deprecated API with a type that we

From b08757b58c5b3c86ddf2d92dc6436a2f0a440ba3 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 17 Nov 2022 09:14:31 -0700
Subject: [PATCH 1262/1405] Fix explanatory comments in
 `@ember/-internals/owner`

---
 packages/@ember/-internals/owner/index.ts | 4 ++--
 packages/@ember/owner/index.ts            | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 04264a515b7..ea3932e2f53 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -314,8 +314,8 @@ export function setOwner(object: object, owner: Owner): void {
 }
 
 // Defines the type for the ContainerProxyMixin. When we rationalize our Owner
-// *not* to work via mixins, we will be able to delete this entirely: this
-// overload for `lookup()` and all of `ownerInjection()` will go away.
+// *not* to work via mixins, we will be able to delete this entirely, in favor
+// of just using the Owner class itself.
 export interface ContainerProxy extends BasicContainer {
   /**
    Returns an object that can be used to provide an owner to a
diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index d1fa2818070..aa44448ff39 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -17,7 +17,9 @@
   - `Resolver`, an interface defining the contract for the object responsible
     for mapping string names to the corresponding classes. For example, when
     you write `@service('session')`, a resolver is responsible to map that back
-    to the `Session` service class in your codebase. Normally
+    to the `Session` service class in your codebase. Normally, this is handled
+    for you automatically with `ember-resolver`, which is the main implementor
+    of this interface.
 
   For more details on each, see their per-item docs!
 */

From 827a58433f7e94b793e4a01cc288cda6d9ac6676 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 18 Nov 2022 09:43:40 -0700
Subject: [PATCH 1263/1405] [DOC] Add documentation for RFC 0821 items

- Introduce or relocate documentation for all the `@ember/owner` types.
- Make sure all documented owner and routing types correctly express
  their type hierarchies in the docs so linking and inheritance flags
  both work correctly.
- Move the documentation for `RouteInfo` and `Transition` to their new
  modules. Additionally, eliminate the now-empty `lib` module for the
  `Transition` type since it *only* existed to provide documentation.
- Update coverage expectation to include the new items.
---
 packages/@ember/-internals/owner/index.ts     | 361 +++++++++++++++---
 .../runtime/lib/mixins/container_proxy.ts     |  88 +----
 .../runtime/lib/mixins/registry_proxy.ts      |   1 +
 packages/@ember/owner/index.ts                |  32 +-
 packages/@ember/routing/lib/route-info.ts     | 232 +----------
 packages/@ember/routing/lib/transition.ts     | 198 ----------
 packages/@ember/routing/route-info.ts         | 147 ++++++-
 packages/@ember/routing/transition.ts         | 195 +++++++++-
 tests/docs/expected.js                        |   7 +
 9 files changed, 671 insertions(+), 590 deletions(-)
 delete mode 100644 packages/@ember/routing/lib/transition.ts

diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index ea3932e2f53..2e6fb2cb633 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -2,13 +2,19 @@ import { getOwner as glimmerGetOwner, setOwner as glimmerSetOwner } from '@glimm
 
 /**
   @module @ember/owner
-*/
+ */
 
 /**
-  The name for a factory consists of a namespace and the name of a specific
-  type within that namespace, like `'service:session'`.
+  The name for a factory consists of a namespace and the name of a specific type
+  within that namespace, like `'service:session'`.
+
+  **Note:** `FullName` is *not* a class, just a contract for strings used in the
+  DI system. It is currently documented as a class only due to limits in our
+  documentation infrastructure.
 
   @for @ember/owner
+  @class FullName
+  @public
  */
 export type FullName<
   Type extends string = string,
@@ -61,13 +67,18 @@ export type FullName<
   ```ts
   getOwner(this)?.lookup('service:session').login("hello", "1234abcd");
   ```
+
+  @for @ember/owner
+  @private
  */
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface DIRegistry extends Record<string, Record<string, unknown>> {}
 
 // Convenience utility for pulling a specific factory manager off `DIRegistry`
 // if one exists, or falling back to the default definition otherwise.
-/** @internal */
+/**
+  @private
+ */
 type ResolveFactoryManager<
   Type extends string,
   Name extends string
@@ -75,6 +86,14 @@ type ResolveFactoryManager<
   ? FactoryManager<DIRegistry[Type][Name]>
   : FactoryManager<object> | undefined;
 
+/**
+  The common interface for the ability to `register()` an item, shared by the
+  `Owner` and `RegistryProxy` interfaces.
+
+  @for @ember/owner
+  @class BasicRegistry
+  @private
+ */
 interface BasicRegistry {
   /**
     Registers a factory that can be used for dependency injection (with
@@ -140,7 +159,7 @@ interface BasicRegistry {
 
     @method register
     @param  fullName {String} type:name (e.g., 'model:user')
-    @param  factory {any} (e.g., App.Person)
+    @param  factory {Factory|object} (e.g., App.Person)
     @param  options {Object} (optional) disable instantiation or singleton usage
     @public
    */
@@ -158,9 +177,58 @@ interface BasicRegistry {
 type ValidType = keyof DIRegistry & string;
 type ValidName<Type extends ValidType> = keyof DIRegistry[Type] & string;
 
+/**
+  The common interface for the ability to `lookup()` or get the `factoryFor` an
+  item, shared by the `Owner` and `ContainerProxy` interfaces.
+
+  @for @ember/owner
+  @class BasicContainer
+  @private
+ */
 interface BasicContainer {
   /**
-   * Given a {@linkcode FullName} return a corresponding instance.
+   Given a fullName return a corresponding instance.
+
+   The default behavior is for lookup to return a singleton instance.
+   The singleton is scoped to the container, allowing multiple containers
+   to all have their own locally scoped singletons.
+
+   ```javascript
+   let registry = new Registry();
+   let container = registry.container();
+
+   registry.register('api:twitter', Twitter);
+
+   let twitter = container.lookup('api:twitter');
+
+   twitter instanceof Twitter; // => true
+
+   // by default the container will return singletons
+   let twitter2 = container.lookup('api:twitter');
+   twitter2 instanceof Twitter; // => true
+
+   twitter === twitter2; //=> true
+   ```
+
+   If singletons are not wanted an optional flag can be provided at lookup.
+
+   ```javascript
+   let registry = new Registry();
+   let container = registry.container();
+
+   registry.register('api:twitter', Twitter);
+
+   let twitter = container.lookup('api:twitter', { singleton: false });
+   let twitter2 = container.lookup('api:twitter', { singleton: false });
+
+   twitter === twitter2; //=> false
+   ```
+
+   @public
+   @method lookup
+   @param {string} fullName
+   @param {RegisterOptions} options
+   @return {any}
    */
   lookup<Type extends ValidType, Name extends ValidName<Type>>(
     fullName: FullName<Type, Name>,
@@ -168,46 +236,116 @@ interface BasicContainer {
   ): DIRegistry[Type][Name];
 
   /**
-   * Given a fullName of the form `'type:name'`, like `'route:application'`,
-   * return a corresponding factory manager.
-   *
-   * Any instances created via the factory's `.create()` method must be
-   * destroyed manually by the caller of `.create()`. Typically, this is done
-   * during the creating objects own `destroy` or `willDestroy` methods.
-   */
+    Given a `FullName`, of the form `"type:name"` return a `FactoryManager`.
+
+    This method returns a manager which can be used for introspection of the
+    factory's class or for the creation of factory instances with initial
+    properties. The manager is an object with the following properties:
+
+    * `class` - The registered or resolved class.
+    * `create` - A function that will create an instance of the class with
+      any dependencies injected.
+
+    For example:
+
+    ```javascript
+    import { getOwner } from '@ember/application';
+
+    let owner = getOwner(otherInstance);
+    // the owner is commonly the `applicationInstance`, and can be accessed via
+    // an instance initializer.
+
+    let factory = owner.factoryFor('service:bespoke');
+
+    factory.class;
+    // The registered or resolved class. For example when used with an Ember-CLI
+    // app, this would be the default export from `app/services/bespoke.js`.
+
+    let instance = factory.create({
+      someProperty: 'an initial property value'
+    });
+    // Create an instance with any injections and the passed options as
+    // initial properties.
+    ```
+
+    Any instances created via the factory's `.create()` method *must* be destroyed
+    manually by the caller of `.create()`. Typically, this is done during the creating
+    objects own `destroy` or `willDestroy` methods.
+
+    @public
+    @method factoryFor
+    @param {string} fullName
+    @return {FactoryManager}
+  */
   factoryFor<Type extends ValidType, Name extends ValidName<Type>>(
     fullName: FullName<Type, Name>
   ): ResolveFactoryManager<Type, Name>;
 }
 
 /**
- * Framework objects in an Ember application (components, services, routes,
- * etc.) are created via a factory and dependency injection system. Each of
- * these objects is the responsibility of an "owner", which handles its
- * instantiation and manages its lifetime.
- *
- * An `Owner` is not a class you construct; it is one the framework constructs
- * for you. The normal way to get access to the relevant `Owner` is using the
- * `getOwner` function.
+  Framework objects in an Ember application (components, services, routes,
+  etc.) are created via a factory and dependency injection system. Each of
+  these objects is the responsibility of an "owner", which handles its
+  instantiation and manages its lifetime.
+
+  An `Owner` is not a class you construct; it is one the framework constructs
+  for you. The normal way to get access to the relevant `Owner` is using the
+  `getOwner` function.
+
+  @for @ember/owner
+  @uses BasicRegistry
+  @uses BasicContainer
+  @class Owner
+  @since 4.10.0
+  @public
+ */
+export default interface Owner extends BasicRegistry, BasicContainer {}
+
+/**
+ * Interface representing the options for registering an item as a factory.
  *
  * @for @ember/owner
- * @since 4.10.0
+ * @class RegisterOptions
  * @public
  */
-export default interface Owner extends BasicRegistry, BasicContainer {}
-
 export interface RegisterOptions {
+  /**
+    Whether to instantiate the item when returning it from a lookup. Defaults
+    to `true`.
+
+    @property instantiate
+    @type Boolean
+    @optional
+    @default true
+    @public
+   */
   instantiate?: boolean | undefined;
+  /**
+    Whether the item is a singleton (like a service) and so should return the
+    same instance every time, or should generate a new instance on each call.
+    Defaults to `true`.
+
+    @property singleton
+    @type Boolean
+    @optional
+    @default true
+    @public
+   */
   singleton?: boolean | undefined;
 }
 
 /**
- * Registered factories are instantiated by having create called on them.
- * Additionally they are singletons by default, so each time they are looked up
- * they return the same instance.
- *
- * However, that behavior can be modified with the `instantiate` and `singleton`
- * options to the {@linkcode BasicRegistry.register Owner.register} method.
+  Registered factories are instantiated by having create called on them.
+  Additionally they are singletons by default, so each time they are looked up
+  they return the same instance.
+
+  However, that behavior can be modified with the `instantiate` and `singleton`
+  options to the `Owner.register()` method.
+
+  @for @ember/owner
+  @class Factory
+  @since 4.10.0
+  @public
  */
 export interface Factory<T extends object> {
   // NOTE: this does not check against the types of the target object in any
@@ -222,25 +360,39 @@ export interface Factory<T extends object> {
    * A function that will create an instance of the class with any
    * dependencies injected.
    *
-   * @param initialValues Any values to set on an instance of the class
+   * @method create
+   * @param  initialValues {Object} Any values to set on an instance of the class
+   * @return {Object} The item produced by the factory.
+   * @public
    */
   create(initialValues?: object): T;
 }
 
 /**
- * A manager which can be used for introspection of the factory's class or for
- * the creation of factory instances with initial properties. The manager is an
- * object with the following properties:
- *
- * - `class` - The registered or resolved class.
- * - `create` - A function that will create an instance of the class with any
- *   dependencies injected.
- *
- * @note `FactoryManager` is *not* user-constructible; the only legal way to get
- *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
+  The interface representing a manager which can be used for introspection of
+  the factory's class or for the creation of factory instances with initial
+  properties. The manager is an object with the following properties:
+
+  - `class` - The registered or resolved class.
+  - `create` - A function that will create an instance of the class with any
+  dependencies injected.
+
+  **Note:** `FactoryManager` is *not* user-constructible; the only legal way
+  to get a `FactoryManager` is via `Owner.factoryFor`.
+
+  @for @ember/owner
+  @class FactoryManager
+  @extends Factory
+  @public
  */
 export interface FactoryManager<T extends object> extends Factory<T> {
-  /** The registered or resolved class. */
+  /**
+    The registered or resolved class.
+
+    @property class
+    @type Factory
+    @public
+   */
   readonly class: Factory<T>;
 }
 
@@ -253,24 +405,66 @@ export type KnownForTypeResult<Type extends string> = {
 };
 
 /**
- * A `Resolver` is the mechanism responsible for looking up code in your
- * application and converting its naming conventions into the actual classes,
- * functions, and templates that Ember needs to resolve its dependencies, for
- * example, what template to render for a given route. It is a system that helps
- * the app resolve the lookup of JavaScript modules agnostic of what kind of
- * module system is used, which can be AMD, CommonJS or just plain globals. It
- * is used to lookup routes, models, components, templates, or anything that is
- * used in your Ember app.
- *
- * This interface represents the contract a custom resolver must implement. Most
- * apps never need to think about this: the application's resolver is supplied by
- * `ember-resolver` in the default blueprint.
+  A `Resolver` is the mechanism responsible for looking up code in your
+  application and converting its naming conventions into the actual classes,
+  functions, and templates that Ember needs to resolve its dependencies, for
+  example, what template to render for a given route. It is a system that helps
+  the app resolve the lookup of JavaScript modules agnostic of what kind of
+  module system is used, which can be AMD, CommonJS or just plain globals. It
+  is used to lookup routes, models, components, templates, or anything that is
+  used in your Ember app.
+
+  This interface is not a concrete class; instead, it represents the contract a
+  custom resolver must implement. Most apps never need to think about this: in
+  the default blueprint, this is supplied by the `ember-resolver` package.
+
+  @for @ember/owner
+  @class Resolver
+  @since 4.10.0
+  @public
  */
 export interface Resolver {
+  /**
+    The one required method for a `Resolver`. Given a string, resolve it to a
+    `Factory`, if one exists.
+
+    @method resolve
+    @param name {String}
+    @public
+   */
   resolve: (name: string) => Factory<object> | object | undefined;
+
+  /**
+    @method knownForType
+    @param  type {String}
+    @return {Object}
+    @public
+   */
   knownForType?: <Type extends string>(type: Type) => KnownForTypeResult<Type>;
+
+  /**
+    @method lookupDescription
+    @param  fullName {String}
+    @return {String}
+    @public
+   */
   lookupDescription?: (fullName: FullName) => string;
+
+  /**
+    @method makeToString
+    @param  factory {Factory}
+    @param  fullName {String}
+    @return {String}
+    @public
+   */
   makeToString?: (factory: Factory<object>, fullName: FullName) => string;
+
+  /**
+    @method normalize
+    @param  fullName {String}
+    @return {String}
+    @public
+  */
   normalize?: (fullName: FullName) => FullName;
 }
 
@@ -278,14 +472,55 @@ export interface FactoryClass {
   positionalParams?: string | string[] | undefined | null;
 }
 
+/**
+  The internal representation of a `Factory`, for the extra detail available for
+  private use internally than we expose to consumers.
+
+  @for @ember/owner
+  @class InternalFactory
+  @private
+ */
 export interface InternalFactory<T extends object, C extends FactoryClass | object = FactoryClass>
   extends Factory<T> {
+  /**
+    @property class
+    @optional
+    @private
+   */
   class?: C;
+
+  /**
+    @property name
+    @type String
+    @optional
+    @private
+   */
   name?: string;
+
+  /**
+    @property fullName
+    @type String
+    @optional
+    @private
+   */
   fullName?: FullName;
+
+  /**
+    @property normalizedName
+    @type String
+    @optional
+    @private
+   */
   normalizedName?: string;
 }
 
+/**
+  @private
+  @method isFactory
+  @param {Object} obj
+  @return {Boolean}
+  @static
+ */
 export function isFactory(obj: unknown): obj is InternalFactory<object> {
   return obj != null && typeof (obj as InternalFactory<object>).create === 'function';
 }
@@ -316,6 +551,16 @@ export function setOwner(object: object, owner: Owner): void {
 // Defines the type for the ContainerProxyMixin. When we rationalize our Owner
 // *not* to work via mixins, we will be able to delete this entirely, in favor
 // of just using the Owner class itself.
+/**
+ * The interface for a container proxy, which is itself a private API used
+ * by the private `ContainerProxyMixin` as part of the base definition of
+ * `EngineInstance`.
+ *
+ * @class ContainerProxy
+ * @for @ember/owner
+ * @private
+ * @extends BasicContainer
+ */
 export interface ContainerProxy extends BasicContainer {
   /**
    Returns an object that can be used to provide an owner to a
@@ -342,13 +587,19 @@ export interface ContainerProxy extends BasicContainer {
   ownerInjection(): object;
 }
 
+/**
+ * @class RegistryProxy
+ * @extends BasicRegistry
+ * @private
+ * @for @ember/owner
+ */
 export interface RegistryProxy extends BasicRegistry {
   /**
     Given a fullName return the corresponding factory.
 
     @public
     @method resolveRegistration
-    @param {String} fullName
+    @param  fullName {String}
     @return {Function} fullName's factory
    */
   resolveRegistration(fullName: FullName): Factory<object> | object | undefined;
diff --git a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
index 01fdec8fccd..9b9a870a7c9 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/container_proxy.ts
@@ -14,6 +14,7 @@ import type { ContainerProxy } from '@ember/-internals/owner';
   container functionality.
 
   @class ContainerProxyMixin
+  @extends ContainerProxy
   @private
 */
 interface ContainerProxyMixin extends ContainerProxy {
@@ -33,50 +34,6 @@ const ContainerProxyMixin = Mixin.create({
     return this.__container__.ownerInjection();
   },
 
-  /**
-   Given a fullName return a corresponding instance.
-
-   The default behavior is for lookup to return a singleton instance.
-   The singleton is scoped to the container, allowing multiple containers
-   to all have their own locally scoped singletons.
-
-   ```javascript
-   let registry = new Registry();
-   let container = registry.container();
-
-   registry.register('api:twitter', Twitter);
-
-   let twitter = container.lookup('api:twitter');
-
-   twitter instanceof Twitter; // => true
-
-   // by default the container will return singletons
-   let twitter2 = container.lookup('api:twitter');
-   twitter2 instanceof Twitter; // => true
-
-   twitter === twitter2; //=> true
-   ```
-
-   If singletons are not wanted an optional flag can be provided at lookup.
-
-   ```javascript
-   let registry = new Registry();
-   let container = registry.container();
-
-   registry.register('api:twitter', Twitter);
-
-   let twitter = container.lookup('api:twitter', { singleton: false });
-   let twitter2 = container.lookup('api:twitter', { singleton: false });
-
-   twitter === twitter2; //=> false
-   ```
-
-   @public
-   @method lookup
-   @param {String} fullName
-   @param {Object} options
-   @return {any}
-   */
   lookup(fullName: string, options: object) {
     return this.__container__.lookup(fullName, options);
   },
@@ -94,49 +51,6 @@ const ContainerProxyMixin = Mixin.create({
     this._super();
   },
 
-  /**
- Given a fullName return a factory manager.
-
-  This method returns a manager which can be used for introspection of the
-  factory's class or for the creation of factory instances with initial
-  properties. The manager is an object with the following properties:
-
-  * `class` - The registered or resolved class.
-  * `create` - A function that will create an instance of the class with
-    any dependencies injected.
-
-  For example:
-
-  ```javascript
-  import { getOwner } from '@ember/application';
-
-  let owner = getOwner(otherInstance);
-  // the owner is commonly the `applicationInstance`, and can be accessed via
-  // an instance initializer.
-
-  let factory = owner.factoryFor('service:bespoke');
-
-  factory.class;
-  // The registered or resolved class. For example when used with an Ember-CLI
-  // app, this would be the default export from `app/services/bespoke.js`.
-
-  let instance = factory.create({
-    someProperty: 'an initial property value'
-  });
-  // Create an instance with any injections and the passed options as
-  // initial properties.
-  ```
-
-  Any instances created via the factory's `.create()` method *must* be destroyed
-  manually by the caller of `.create()`. Typically, this is done during the creating
-  objects own `destroy` or `willDestroy` methods.
-
-  @public
-  @method factoryFor
-  @param {String} fullName
-  @param {Object} options
-  @return {FactoryManager}
-  */
   factoryFor(fullName: string) {
     return this.__container__.factoryFor(fullName);
   },
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index bf70f7e16f0..dff58930eee 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -14,6 +14,7 @@ import Mixin from '@ember/object/mixin';
   registry functionality.
 
   @class RegistryProxyMixin
+  @extends RegistryProxy
   @private
 */
 interface RegistryProxyMixin extends RegistryProxy {
diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index aa44448ff39..2751e105a4b 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -1,13 +1,16 @@
 /**
-  @module @ember/owner
+  Ember’s dependency injection system is built on the idea of an "owner": an
+  object responsible for managing items which can be registered and looked up
+  with the system.
 
-  An `Owner` is the main object responsible for managing Ember's dependency
-  injection system. In normal app code, you will encounter `Owner`s via an
-  `ApplicationInstance` or its superclass, `EngineInstance`, which are the two
-  major implementers of the `Owner` type.
+  This module does not provide any concrete instances of owners. Instead, it
+  defines the core type, `Owner`, which specifies the public API contract for an
+  owner. The primary concrete implementations of `Owner` are `EngineInstance`,
+  from `@ember/engine/instance`, and its `ApplicationInstance` subclass, from
+  `@ember/application/instance`.
 
-  Along with the `Owner` itself, this module provides a number of supporting
-  types related to Ember's DI system:
+  Along with `Owner` itself, this module provides a number of supporting types
+  related to Ember's DI system:
 
   - `Factory`, Ember's primary interface for something which can create class
     instances registered with the DI system.
@@ -15,13 +18,16 @@
   - `FactoryManager`, an interface for inspecting a `Factory`'s class.
 
   - `Resolver`, an interface defining the contract for the object responsible
-    for mapping string names to the corresponding classes. For example, when
-    you write `@service('session')`, a resolver is responsible to map that back
-    to the `Session` service class in your codebase. Normally, this is handled
-    for you automatically with `ember-resolver`, which is the main implementor
-    of this interface.
+    for mapping string names to the corresponding classes. For example, when you
+    write `@service('session')`, a resolver is responsible to map that back to
+    the `Session` service class in your codebase. Normally, this is handled for
+    you automatically with `ember-resolver`, which is the main implementor of
+    this interface.
+
+  For more details on each, see their per-item docs.
 
-  For more details on each, see their per-item docs!
+  @module @ember/owner
+  @public
 */
 
 // We need to provide a narrower public interface to `getOwner` so that we only
diff --git a/packages/@ember/routing/lib/route-info.ts b/packages/@ember/routing/lib/route-info.ts
index ac6141846e3..b401f2036ad 100644
--- a/packages/@ember/routing/lib/route-info.ts
+++ b/packages/@ember/routing/lib/route-info.ts
@@ -1,230 +1,4 @@
-export { RouteInfo, RouteInfoWithAttributes } from 'router_js';
-
-/**
- @module @ember/routing
-*/
-
-/**
-  A `RouteInfoWithAttributes` is an object that contains
-  metadata, including the resolved value from the routes
-  `model` hook. Like `RouteInfo`, a `RouteInfoWithAttributes`
-  represents a specific route within a Transition.
-  It is read-only and internally immutable. It is also not
-  observable, because a Transition instance is never
-  changed after creation.
-
-  @class RouteInfoWithAttributes
-  @public
-*/
-
-/**
-  The dot-separated, fully-qualified name of the
-  route, like "people.index".
-  @property {String} name
-  @public
-*/
-
-/**
-  The final segment of the fully-qualified name of
-  the route, like "index"
-  @property {String} localName
-  @public
-*/
-
-/**
-  The values of the route's parameters. These are the
-  same params that are received as arguments to the
-  route's model hook. Contains only the parameters
-  valid for this route, if any (params for parent or
-  child routes are not merged).
-  @property {Object} params
-  @public
-*/
-
-/**
-  The ordered list of the names of the params
-  required for this route. It will contain the same
-  strings as `Object.keys(params)`, but here the order
-  is significant. This allows users to correctly pass
-  params into routes programmatically.
-  @property {Array} paramNames
-  @public
-*/
-
-/**
-  The values of any queryParams on this route.
-  @property {Object} queryParams
-  @public
-*/
-
-/**
-  This is the resolved return value from the
-  route's model hook.
-  @property {Object|Array|String|undefined} attributes
-  @public
-*/
-
-/**
-  Will contain the result `Route#buildRouteInfoMetadata`
-  for the corresponding Route.
-  @property {Any} metadata
-  @public
-*/
-
-/**
-  A reference to the parent route's RouteInfo.
-  This can be used to traverse upward to the topmost
-  `RouteInfo`.
-  @property {RouteInfo|null} parent
-  @public
-*/
-
-/**
-  A reference to the child route's RouteInfo.
-  This can be used to traverse downward to the
-  leafmost `RouteInfo`.
-  @property {RouteInfo|null} child
-  @public
-*/
-
-/**
-  Allows you to traverse through the linked list
-  of `RouteInfo`s from the topmost to leafmost.
-  Returns the first `RouteInfo` in the linked list
-  for which the callback returns true.
-
-    This method is similar to the `find()` method
-    defined in ECMAScript 2015.
-
-    The callback method you provide should have the
-    following signature (all parameters are optional):
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    It should return the `true` to include the item in
-    the results, `false` otherwise.
-
-    Note that in addition to a callback, you can also
-    pass an optional target object that will be set as
-    `this` on the context.
+// Exists to provide runtime exports used in the internals. For the public,
+// type-only exports, see `packages/@ember/routing/route-info`.
 
-  @method find
-  @param {Function} callback the callback to execute
-  @param {Object} [target*] optional target to use
-  @returns {Object} Found item or undefined
-  @public
-*/
-
-/**
-  A RouteInfo is an object that contains metadata
-  about a specific route within a Transition. It is
-  read-only and internally immutable. It is also not
-  observable, because a Transition instance is never
-  changed after creation.
-
-  @class RouteInfo
-  @public
-*/
-
-/**
-  The dot-separated, fully-qualified name of the
-  route, like "people.index".
-  @property {String} name
-  @public
-*/
-
-/**
-  The final segment of the fully-qualified name of
-  the route, like "index"
-  @property {String} localName
-  @public
-*/
-
-/**
-  The values of the route's parameters. These are the
-  same params that are received as arguments to the
-  route's `model` hook. Contains only the parameters
-  valid for this route, if any (params for parent or
-  child routes are not merged).
-  @property {Object} params
-  @public
-*/
-
-/**
-  The ordered list of the names of the params
-  required for this route. It will contain the same
-  strings as Object.keys(params), but here the order
-  is significant. This allows users to correctly pass
-  params into routes programmatically.
-  @property {Array} paramNames
-  @public
-*/
-
-/**
-  The values of any queryParams on this route.
-  @property {Object} queryParams
-  @public
-*/
-
-/**
-  Will contain the result `Route#buildRouteInfoMetadata`
-  for the corresponding Route.
-  @property {Any} metadata
-  @public
-*/
-
-/**
-  A reference to the parent route's `RouteInfo`.
-  This can be used to traverse upward to the topmost
-  `RouteInfo`.
-  @property {RouteInfo|null} parent
-  @public
-*/
-
-/**
-  A reference to the child route's `RouteInfo`.
-  This can be used to traverse downward to the
-  leafmost `RouteInfo`.
-  @property {RouteInfo|null} child
-  @public
-*/
-
-/**
-  Allows you to traverse through the linked list
-  of `RouteInfo`s from the topmost to leafmost.
-  Returns the first `RouteInfo` in the linked list
-  for which the callback returns true.
-
-    This method is similar to the `find()` method
-    defined in ECMAScript 2015.
-
-    The callback method you provide should have the
-    following signature (all parameters are optional):
-
-    ```javascript
-    function(item, index, array);
-    ```
-
-    - `item` is the current item in the iteration.
-    - `index` is the current index in the iteration.
-    - `array` is the array itself.
-
-    It should return the `true` to include the item in
-    the results, `false` otherwise.
-
-    Note that in addition to a callback, you can also
-    pass an optional target object that will be set as
-    `this` on the context.
-
-  @method find
-  @param {Function} callback the callback to execute
-  @param {Object} [target*] optional target to use
-  @returns {Object} Found item or undefined
-  @public
-*/
+export { RouteInfo, RouteInfoWithAttributes } from 'router_js';
diff --git a/packages/@ember/routing/lib/transition.ts b/packages/@ember/routing/lib/transition.ts
deleted file mode 100644
index 601cd6912e1..00000000000
--- a/packages/@ember/routing/lib/transition.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- @module @ember/routing
-*/
-
-/**
-  A Transition is a thennable (a promise-like object) that represents
-  an attempt to transition to another route. It can be aborted, either
-  explicitly via `abort` or by attempting another transition while a
-  previous one is still underway. An aborted transition can also
-  be `retry()`d later.
-
-  @class Transition
-  @public
-*/
-
-/**
-  The Transition's internal promise. Calling `.then` on this property
-  is that same as calling `.then` on the Transition object itself, but
-  this property is exposed for when you want to pass around a
-  Transition's promise, but not the Transition object itself, since
-  Transition object can be externally `abort`ed, while the promise
-  cannot.
-
-  @property promise
-  @type {Object}
-  @public
-  */
-
-/**
-  Custom state can be stored on a Transition's `data` object.
-  This can be useful for decorating a Transition within an earlier
-  hook and shared with a later hook. Properties set on `data` will
-  be copied to new transitions generated by calling `retry` on this
-  transition.
-
-  @property data
-  @type {Object}
-  @public
-*/
-
-/**
-  A standard promise hook that resolves if the transition
-  succeeds and rejects if it fails/redirects/aborts.
-
-  Forwards to the internal `promise` property which you can
-  use in situations where you want to pass around a thennable,
-  but not the Transition itself.
-
-  @method then
-  @param {Function} onFulfilled
-  @param {Function} onRejected
-  @param {String} label optional string for labeling the promise.
-  Useful for tooling.
-  @return {Promise}
-  @public
-*/
-
-/**
-
-  Forwards to the internal `promise` property which you can
-  use in situations where you want to pass around a thennable,
-  but not the Transition itself.
-
-  @method catch
-  @param {Function} onRejection
-  @param {String} label optional string for labeling the promise.
-  Useful for tooling.
-  @return {Promise}
-  @public
-*/
-
-/**
-
-  Forwards to the internal `promise` property which you can
-  use in situations where you want to pass around a thennable,
-  but not the Transition itself.
-
-  @method finally
-  @param {Function} callback
-  @param {String} label optional string for labeling the promise.
-  Useful for tooling.
-  @return {Promise}
-  @public
-*/
-
-/**
-  Aborts the Transition. Note you can also implicitly abort a transition
-  by initiating another transition while a previous one is underway.
-
-  @method abort
-  @return {Transition} this transition
-  @public
-*/
-
-/**
-
-  Retries a previously-aborted transition (making sure to abort the
-  transition if it's still active). Returns a new transition that
-  represents the new attempt to transition.
-
-  @method retry
-  @return {Transition} new transition
-  @public
-  */
-
-/**
-
-  Sets the URL-changing method to be employed at the end of a
-  successful transition. By default, a new Transition will just
-  use `updateURL`, but passing 'replace' to this method will
-  cause the URL to update using 'replaceWith' instead. Omitting
-  a parameter will disable the URL change, allowing for transitions
-  that don't update the URL at completion (this is also used for
-  handleURL, since the URL has already changed before the
-  transition took place).
-
-  @method method
-  @param {String} method the type of URL-changing method to use
-    at the end of a transition. Accepted values are 'replace',
-    falsy values, or any other non-falsy value (which is
-    interpreted as an updateURL transition).
-
-  @return {Transition} this transition
-  @public
-*/
-
-/**
-
-  Fires an event on the current list of resolved/resolving
-  handlers within this transition. Useful for firing events
-  on route hierarchies that haven't fully been entered yet.
-
-  Note: This method is also aliased as `send`
-
-  @method trigger
-  @param {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled events throw an error
-  @param {String} name the name of the event to fire
-  @public
-*/
-
-/**
- * This property is a `RouteInfo` object that represents
- * where the router is transitioning to. It's important
- * to note that a `RouteInfo` is a linked list and this
- * property represents the leafmost route.
- * @property {null|RouteInfo|RouteInfoWithAttributes} to
- * @public
- */
-
-/**
- * This property is a `RouteInfo` object that represents
- * where transition originated from. It's important
- * to note that a `RouteInfo` is a linked list and this
- * property represents the head node of the list.
- * In the case of an initial render, `from` will be set to
- * `null`.
- * @property {null|RouteInfoWithAttributes} from
- * @public
- */
-
-/**
-  Transitions are aborted and their promises rejected
-  when redirects occur; this method returns a promise
-  that will follow any redirects that occur and fulfill
-  with the value fulfilled by any redirecting transitions
-  that occur.
-
-  @method followRedirects
-  @return {Promise} a promise that fulfills with the same
-    value that the final redirecting transition fulfills with
-  @public
-*/
-
-/**
-  In non-production builds, this function will return the stack that this Transition was
-  created within. In production builds, this function will not be present.
-
-  @method debugCreationStack
-  @return string
-*/
-
-/**
-  In non-production builds, this function will return the stack that this Transition was
-  aborted within (or `undefined` if the Transition has not been aborted yet). In production
-  builds, this function will not be present.
-
-  @method debugAbortStack
-  @return string
-*/
-
-/**
-  In non-production builds, this property references the Transition that _this_ Transition
-  was derived from or `undefined` if this transition did not derive from another. In
-  production builds, this property will not be present.
-
-  @property debugPreviousTransition
-  @type {Transition | undefined}
-*/
diff --git a/packages/@ember/routing/route-info.ts b/packages/@ember/routing/route-info.ts
index cd31e47ceda..217e464e48e 100644
--- a/packages/@ember/routing/route-info.ts
+++ b/packages/@ember/routing/route-info.ts
@@ -1,8 +1,147 @@
 /**
- * Provides the `RouteInfo` and `RouteInfoWithMetadata` types which appear as
- * the target and source routes for `Transition`s.
- *
- * @module @ember/routing/route-info
+  Re-exports the `RouteInfo` and `RouteInfoWithMetadata` types from [router.js].
+  `RouteInfo` and `RouteInfoWithMetadata` appear as properties on `Transition`
+  instances.
+
+  [router.js]: https://github.com/tildeio/router.js
+
+  @module @ember/routing/route-info
+ */
+
+// TODO: these docs should actually live on their own interface definitions, so
+// when we migrate to using TSDoc let's move them there and make sure the tool
+// correctly picks them up as re-exports.
+
+// NOTE: ordering matters here, since this particular way of defining the docs
+// "attaches" the methods and properties to the most-recently defined item.
+
+// ----- RouteInfo --------------------------------------------------------- //
+
+/**
+  A `RouteInfo` is an object that contains metadata about a specific route
+  within a `Transition`. It is read-only and internally immutable. It is also
+  not observable, because a `Transition` instance is never changed after
+  creation.
+
+  A `RouteInfo` is not user-constructible; the only legal way to get one is from
+  a valid `Transition`. However, you can import the type by using `import type`
+  syntax with TypeScript or `import()` in JSDoc comments.
+
+  @class RouteInfo
+  @public
+ */
+
+/**
+  The dot-separated, fully-qualified name of the route, like `"people.index"`.
+  @property {String} name
+  @public
+ */
+
+/**
+  The final segment of the fully-qualified name of the route, like `"index"`
+  @property {String} localName
+  @public
+ */
+
+/**
+  The values of the route's parameters. These are the same params that are
+  received as arguments to the route's `model` hook. Contains only the
+  parameters valid for this route, if any (params for parent or child routes are
+  not merged).
+  @property {Object} params
+  @public
+ */
+
+/**
+  The ordered list of the names of the params required for this route. It will
+  contain the same strings as Object.keys(params), but here the order is
+  significant. This allows users to correctly pass params into routes
+  programmatically.
+  @property {Array} paramNames
+  @public
+ */
+
+/**
+  The values of any queryParams on this route.
+  @property {Object} queryParams
+  @public
+ */
+
+/**
+  Will contain the result `Route#buildRouteInfoMetadata` for the corresponding
+  Route.
+  @property {Any} metadata
+  @public
+ */
+
+/**
+  A reference to the parent route's `RouteInfo`. This can be used to traverse
+  upward to the topmost `RouteInfo`.
+  @property {RouteInfo|null} parent
+  @public
+ */
+
+/**
+  A reference to the child route's `RouteInfo`. This can be used to traverse
+  downward to the leafmost `RouteInfo`.
+  @property {RouteInfo|null} child
+  @public
+ */
+
+/**
+  Allows you to traverse through the linked list of `RouteInfo`s from the
+  topmost to leafmost. Returns the first `RouteInfo` in the linked list for
+  which the callback returns true.
+
+  This method is similar to the `find()` method defined in ECMAScript 2015.
+
+  The callback method you provide should have the following signature (all
+  parameters are optional):
+
+  ```javascript
+  function(item, index, array);
+  ```
+
+  - `item` is the current item in the iteration.
+  - `index` is the current index in the iteration.
+  - `array` is the array itself.
+
+  It should return the `true` to include the item in the results, `false`
+  otherwise.
+
+  Note that in addition to a callback, you can also pass an optional target
+  object that will be set as `this` on the context.
+
+  @method find
+  @param {Function} callback the callback to execute
+  @param {Object} [target*] optional target to use
+  @returns {Object} Found item or undefined
+  @public
+ */
+
+// ----- RouteInfoWithAttributes ------------------------------------------- //
+
+/**
+  A `RouteInfoWithAttributes` is an object that contains metadata, including the
+  resolved value from the routes `model` hook. Like `RouteInfo`, a
+  `RouteInfoWithAttributes` represents a specific route within a Transition. It
+  is read-only and internally immutable. It is also not observable, because a
+  Transition instance is never changed after creation.
+
+  A `RouteInfoWithAttributes` is not user-constructible; the only legal way to
+  get one is from a valid `Transition`. However, you can import the type by
+  using `import type` syntax with TypeScript or `import()` in JSDoc comments.
+
+  @class RouteInfoWithAttributes
+  @extends RouteInfo
+  @public
+ */
+
+/**
+   This is the resolved return value from the
+   route's model hook.
+   @property {Object|Array|String|undefined} attributes
+   @public
  */
 
 export type { RouteInfo as default, RouteInfoWithAttributes } from './lib/route-info';
diff --git a/packages/@ember/routing/transition.ts b/packages/@ember/routing/transition.ts
index 62138e1964a..5428090f926 100644
--- a/packages/@ember/routing/transition.ts
+++ b/packages/@ember/routing/transition.ts
@@ -1,8 +1,195 @@
 /**
- * Provides the `Transition` type which are used in Ember's routing transitions,
- * e.g. `RouterService.on('routeDidChange', (transition) => { ... })`.
- *
- * @module @ember/routing/transition
+  Re-exports the `Transition` type from [router.js]. `Transition`s are used in
+  Ember's `Route` hooks and `RouterService` events.
+
+  [router.js]: https://github.com/tildeio/router.js
+
+  @module @ember/routing/transition
+ */
+
+/**
+  A `Transition` is a thennable (a `Promise`-like object) that represents an
+  attempt to transition to another route. It can be aborted, either explicitly
+  via `abort` or by attempting another transition while a previous one is still
+  underway. An aborted transition can also be `retry()`d later.
+
+  A `Transition` is not user-constructible; the only legal way to get one is in
+  a `Route` hook or a `RouterService.on()` callback. However, you can import the
+  type by using `import type` syntax with TypeScript or `import()` in JSDoc
+  comments.
+
+  @class Transition
+  @public
+ */
+
+/**
+  The `Transition`'s internal `Promise`. Calling `.then` on this property is
+  that same as calling `.then` on the `Transition` object itself, but this
+  property is exposed for when you want to pass around a Transition's promise,
+  but not the Transition object itself, since Transition object can be
+  externally `abort`ed, while the promise cannot.
+
+  @property promise
+  @type {Promise}
+  @public
+ */
+
+/**
+  Custom state can be stored on a `Transition`'s `data` object. This can be
+  useful for decorating a `Transition` within an earlier hook and shared with a
+  later hook. Properties set on `data` will be copied to new transitions
+  generated by calling `retry` on this transition.
+
+  @property data
+  @type {Object}
+  @public
+ */
+
+/**
+  A standard promise hook that resolves if the `Transition` succeeds and rejects
+  if it fails/redirects/aborts.
+
+  Forwards to the internal `promise` property which you can use in situations
+  where you want to pass around a thennable, but not the `Transition` itself.
+
+  @method then
+  @param {Function} onFulfilled
+  @param {Function} onRejected
+  @param {String} label optional string for labeling the promise. Useful for
+    tooling.
+  @return {Promise}
+  @public
+ */
+
+/**
+  Forwards to the internal `promise` property which you can use in situations
+  where you want to pass around a thennable, but not the `Transition` itself.
+
+  @method catch
+  @param {Function} onRejection
+  @param {String} label optional string for labeling the promise. Useful for
+    tooling.
+  @return {Promise}
+  @public
+ */
+
+/**
+  Forwards to the internal `promise` property which you can use in situations
+  where you want to pass around a thennable, but not the `Transition` itself.
+
+  @method finally
+  @param {Function} callback
+  @param {String} label optional string for labeling the promise. Useful for
+    tooling.
+  @return {Promise}
+  @public
+ */
+
+/**
+  Aborts the `Transition`. Note you can also implicitly abort a transition
+  by initiating another transition while a previous one is underway.
+
+  @method abort
+  @return {Transition} this transition
+  @public
+ */
+
+/**
+  Retries a previously-aborted transition (making sure to abort the transition
+  if it's still active). Returns a new transition that represents the new
+  attempt to transition.
+
+  @method retry
+  @return {Transition} new transition
+  @public
+ */
+
+/**
+  Sets the URL-changing method to be employed at the end of a successful
+  transition. By default, a new `Transition` will just use `updateURL`, but
+  passing 'replace' to this method will cause the URL to update using
+  'replaceWith' instead. Omitting a parameter will disable the URL change,
+  allowing for transitions that don't update the URL at completion (this is also
+  used for handleURL, since the URL has already changed before the transition
+  took place).
+
+  @method method
+  @param {String} method the type of URL-changing method to use at the end of a
+    transition. Accepted values are 'replace', falsy values, or any other
+    non-falsy value (which is interpreted as an updateURL transition).
+
+  @return {Transition} this transition
+  @public
+ */
+
+/**
+
+  Fires an event on the current list of resolved/resolving handlers within this
+  transition. Useful for firing events on route hierarchies that haven't fully
+  been entered yet.
+
+  Note: This method is also aliased as `send`
+
+  @method trigger
+  @param {Boolean} [ignoreFailure=false] a boolean specifying whether unhandled
+    events throw an error
+  @param {String} name the name of the event to fire
+  @public
+ */
+
+/**
+ * This property is a `RouteInfo` object that represents where the router is
+ * transitioning to. It's important to note that a `RouteInfo` is a linked list
+ * and this property represents the leafmost route.
+ * @property {null|RouteInfo|RouteInfoWithAttributes} to
+ * @public
+ */
+
+/**
+ * This property is a `RouteInfo` object that represents where transition
+ * originated from. It's important to note that a `RouteInfo` is a linked list
+ * and this property represents the head node of the list. In the case of an
+ * initial render, `from` will be set to `null`.
+ * @property {null|RouteInfoWithAttributes} from
+ * @public
+ */
+
+/**
+  Transitions are aborted and their promises rejected when redirects occur; this
+  method returns a promise that will follow any redirects that occur and fulfill
+  with the value fulfilled by any redirecting transitions that occur.
+
+  @method followRedirects
+  @return {Promise} a promise that fulfills with the same value that the final
+    redirecting transition fulfills with
+  @public
+ */
+
+/**
+  In non-production builds, this function will return the stack that this
+  `Transition` was created within. In production builds, this function will not
+  be present.
+
+  @method debugCreationStack
+  @return string
+ */
+
+/**
+  In non-production builds, this function will return the stack that this
+  `Transition` was aborted within (or `undefined` if the `Transition` has not
+  been aborted yet). In production builds, this function will not be present.
+
+  @method debugAbortStack
+  @return string
+ */
+
+/**
+  In non-production builds, this property references the `Transition` that
+  _this_ `Transition` was derived from or `undefined` if this transition did not
+  derive from another. In production builds, this property will not be present.
+
+  @property debugPreviousTransition
+  @type {Transition | undefined}
  */
 
 export type { Transition as default } from 'router_js';
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 67d8b1d4fbc..6c773636bf0 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -113,6 +113,7 @@ module.exports = {
     'checkWaiters',
     'child',
     'childViews',
+    'class',
     'classify',
     'classNameBindings',
     'classNames',
@@ -212,6 +213,7 @@ module.exports = {
     'forEach',
     'formatURL',
     'from',
+    'fullName',
     'fullRouteName',
     'generateController',
     'generateControllerFactory',
@@ -273,6 +275,7 @@ module.exports = {
     'insertAt',
     'inspect',
     'instanceInitializer',
+    'instantiate',
     'instrument',
     'intermediateTransitionTo',
     'intersect',
@@ -293,6 +296,7 @@ module.exports = {
     'isEnabled',
     'isEqual',
     'isEvery',
+    'isFactory',
     'isFulfilled',
     'isHTMLSafe',
     'isInteractive',
@@ -317,6 +321,7 @@ module.exports = {
     'location',
     'log',
     'lookup',
+    'lookupDescription',
     'lt',
     'lte',
     'makeArray',
@@ -345,6 +350,7 @@ module.exports = {
     'none',
     'normalize',
     'normalizeFullName',
+    'normalizedName',
     'not',
     'notEmpty',
     'notifyPropertyChange',
@@ -478,6 +484,7 @@ module.exports = {
     'setupHandlerForEmberEvent',
     'setupRegistry',
     'setURL',
+    'singleton',
     'shiftObject',
     'shouldRender',
     'slice',

From fb8fc0222624491abfcc4da6101e6d5ac14f3d0a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 21 Nov 2022 12:54:40 -0800
Subject: [PATCH 1264/1405] Correct some public types

---
 .../@ember/component-test/capabilities.ts     | 16 ++++++++
 .../component-test/set-component-template.ts  |  8 ++++
 types/preview/@ember/application/index.d.ts   | 12 ------
 types/preview/@ember/component/index.d.ts     | 39 +++++++++++++++----
 4 files changed, 55 insertions(+), 20 deletions(-)
 create mode 100644 type-tests/preview/@ember/component-test/capabilities.ts
 create mode 100644 type-tests/preview/@ember/component-test/set-component-template.ts

diff --git a/type-tests/preview/@ember/component-test/capabilities.ts b/type-tests/preview/@ember/component-test/capabilities.ts
new file mode 100644
index 00000000000..0014713e0ae
--- /dev/null
+++ b/type-tests/preview/@ember/component-test/capabilities.ts
@@ -0,0 +1,16 @@
+import { capabilities } from '@ember/component';
+import { expectTypeOf } from 'expect-type';
+
+expectTypeOf(capabilities('3.13')).toMatchTypeOf<{
+  asyncLifecycleCallbacks?: boolean | undefined;
+  destructor?: boolean | undefined;
+  updateHook?: boolean | undefined;
+}>();
+
+capabilities('3.13', { asyncLifecycleCallbacks: true });
+capabilities('3.4', { asyncLifecycleCallbacks: true });
+
+// @ts-expect-error invalid capabilities
+capabilities('3.13', { asyncLifecycleCallbacks: 1 });
+// @ts-expect-error invalid verison
+capabilities('3.12');
diff --git a/type-tests/preview/@ember/component-test/set-component-template.ts b/type-tests/preview/@ember/component-test/set-component-template.ts
new file mode 100644
index 00000000000..d416ae6e83c
--- /dev/null
+++ b/type-tests/preview/@ember/component-test/set-component-template.ts
@@ -0,0 +1,8 @@
+import { setComponentTemplate } from '@ember/component';
+import type { TemplateFactory } from 'htmlbars-inline-precompile';
+import { expectTypeOf } from 'expect-type';
+
+// Good enough for testing
+let factory = {} as TemplateFactory;
+
+expectTypeOf(setComponentTemplate(factory, {})).toEqualTypeOf<object>();
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index d6aed4ade62..1f83001eafc 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -133,16 +133,4 @@ declare module '@ember/application' {
    * @deprecated Use `import { setOwner } from '@ember/owner';` instead.
    */
   export function setOwner(object: object, owner: Owner): void;
-
-  /**
-   * Detects when a specific package of Ember (e.g. 'Ember.Application')
-   * has fully loaded and is available for extension.
-   */
-  export function onLoad(name: string, callback: AnyFn): unknown;
-
-  /**
-   * Called when an Ember.js package (e.g Ember.Application) has finished
-   * loading. Triggers any callbacks registered for this event.
-   */
-  export function runLoadHooks(name: string, object?: {}): unknown;
 }
diff --git a/types/preview/@ember/component/index.d.ts b/types/preview/@ember/component/index.d.ts
index 01029007bf5..b05b2e0ce96 100644
--- a/types/preview/@ember/component/index.d.ts
+++ b/types/preview/@ember/component/index.d.ts
@@ -106,14 +106,37 @@ declare module '@ember/component' {
     object: T
   ): T;
 
-/**
- * Takes a component class and returns the template associated with the given component class,
- * if any, or one of its superclasses, if any, or undefined if no template association was found.
- *
- * @param object the component object
- * @return the template factory of the given component
- */
- export function getComponentTemplate(obj: object): TemplateFactory | undefined;
+  /**
+   * Takes a component class and returns the template associated with the given component class,
+   * if any, or one of its superclasses, if any, or undefined if no template association was found.
+   *
+   * @param object the component object
+   * @return the template factory of the given component
+   */
+  export function getComponentTemplate(obj: object): TemplateFactory | undefined;
+
+  export function setComponentTemplate(factory: TemplateFactory, obj: object): object;
+
+  interface ComponentCapabilitiesVersions {
+    '3.4': {
+      asyncLifecycleCallbacks?: boolean;
+      destructor?: boolean;
+    };
+
+    '3.13': {
+      asyncLifecycleCallbacks?: boolean;
+      destructor?: boolean;
+      updateHook?: boolean;
+    };
+  }
+
+  interface ComponentCapabilities extends Capabilities {
+    asyncLifeCycleCallbacks: boolean;
+    destructor: boolean;
+    updateHook: boolean;
+  }
+
+  export function capabilities<Version extends keyof ComponentCapabilitiesVersions>(managerAPI: Version, options?: ComponentCapabilitiesVersions[Version]): ComponentCapabilities;
 
   // In normal TypeScript, these built-in components are essentially opaque tokens
   // that just need to be importable. Declaring them with unique interfaces

From cd0e945ef7b0d790d3bbbb0d4a2e217eb586c59f Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Mon, 21 Nov 2022 12:55:27 -0800
Subject: [PATCH 1265/1405] Correct test file names

---
 packages/@ember/array/type-tests/{index.ts => index.test.ts}     | 0
 packages/@ember/array/type-tests/{mutable.ts => mutable.test.ts} | 0
 packages/@ember/array/type-tests/{proxy.ts => proxy.test.ts}     | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename packages/@ember/array/type-tests/{index.ts => index.test.ts} (100%)
 rename packages/@ember/array/type-tests/{mutable.ts => mutable.test.ts} (100%)
 rename packages/@ember/array/type-tests/{proxy.ts => proxy.test.ts} (100%)

diff --git a/packages/@ember/array/type-tests/index.ts b/packages/@ember/array/type-tests/index.test.ts
similarity index 100%
rename from packages/@ember/array/type-tests/index.ts
rename to packages/@ember/array/type-tests/index.test.ts
diff --git a/packages/@ember/array/type-tests/mutable.ts b/packages/@ember/array/type-tests/mutable.test.ts
similarity index 100%
rename from packages/@ember/array/type-tests/mutable.ts
rename to packages/@ember/array/type-tests/mutable.test.ts
diff --git a/packages/@ember/array/type-tests/proxy.ts b/packages/@ember/array/type-tests/proxy.test.ts
similarity index 100%
rename from packages/@ember/array/type-tests/proxy.ts
rename to packages/@ember/array/type-tests/proxy.test.ts

From 9c4962bc9d249d0107fb5b7613bddc1d9f6ec5de Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 21 Nov 2022 19:19:54 -0700
Subject: [PATCH 1266/1405] Avoid exposing `OWNER` from `@glimmer/owner`

There are pre-existing runtime shenanigans in `@ember/object/internals`
to add debug-only errors to the class in dev builds. Those runtime
shenanigans produce the need for type-level shenanigans to match: TS
gets stuck here because the runtime shenanigans declare
`FrameworkObject` with a class expression (rather than the usual class
declaration form). That in turn means TS needs to be able to fully name
the type produced by the clsas expression, which includes the `OWNER`
symbol from `@glimmer/owner`.

By explicitly giving the declaration a type when assigning it the class
expression, instead of relying on inference, TS no longer needs to name
the `OWNER` property key from the super class, eliminating the private
name shenanigans.

Co-authored-by: Dan Freeman <dfreeman@salsify.com>
---
 packages/@ember/object/-internals.ts | 16 +++++++++++++++-
 packages/@ember/object/core.ts       |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/object/-internals.ts b/packages/@ember/object/-internals.ts
index d38dbca73e3..2cdc10e94fd 100644
--- a/packages/@ember/object/-internals.ts
+++ b/packages/@ember/object/-internals.ts
@@ -7,9 +7,23 @@ import { symbol } from '@ember/-internals/utils';
 import { DEBUG } from '@glimmer/env';
 import EmberObject from '.';
 
+// Here we have runtime shenanigans to add debug-only errors to the class in dev
+// builds. Those runtime shenanigans produce the need for type-level shenanigans
+// to match: if we just assign without an explicit type annotation on the `let`
+// binding below for `FrameworkObject`, TS gets stuck because this creates
+// `FrameworkObject` with a class expression (rather than the usual class
+// declaration form). That in turn means TS needs to be able to fully name the
+// type produced by the clsas expression, which includes the `OWNER` symbol from
+// `@glimmer/owner`.
+//
+// By explicitly giving the declaration a type when assigning it the class
+// expression, instead of relying on inference, TS no longer needs to name the
+// `OWNER` property key from the super class, eliminating the private name
+// shenanigans.
+
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 interface FrameworkObject extends EmberObject {}
-let FrameworkObject = class FrameworkObject extends EmberObject {};
+let FrameworkObject: typeof EmberObject = class FrameworkObject extends EmberObject {};
 
 if (DEBUG) {
   const INIT_WAS_CALLED = Symbol('INIT_WAS_CALLED');
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index 773c07ca770..7101c70a478 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -234,6 +234,7 @@ interface CoreObject {
   _super(...args: any[]): any;
 }
 class CoreObject {
+  /** @internal */
   [OWNER]?: Owner;
 
   constructor(owner?: Owner) {

From 4e62cd659f296361ad76de47ebc063e938160db0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 21 Nov 2022 19:23:02 -0700
Subject: [PATCH 1267/1405] Refactor tsconfigs to share compiler options

This lets each config specify *only* how it actually does a build (or
not!), while sharing the config explicitly.

It also fixes an existing bug in the compilation settings which was not
affecting *normal* TS compilation with `tsc`, but was generating noise
in the `broccoli-typescript-compiler` pipeline because the packages
happened to be resolved in a different order such that the `loader`
"package" definition, and its declaration of the `require` module, was
not present in the graph. Set it explicitly in `compilerOptiosn.paths`
to fix that.
---
 .gitattributes                 |  5 ++++-
 tsconfig.json                  | 34 ++-------------------------------
 tsconfig/compiler-options.json | 35 ++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 33 deletions(-)
 create mode 100644 tsconfig/compiler-options.json

diff --git a/.gitattributes b/.gitattributes
index 09bc62c1393..9e09e498870 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,5 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
\ No newline at end of file
+* text=auto
+
+# Tell GH to render all tsconfigs in the tsconfig dir correctly.
+tsconfig/*.json linguist-language=JSON-with-Comments
diff --git a/tsconfig.json b/tsconfig.json
index 7b0a17746e1..fb94bf9d432 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,39 +1,9 @@
 {
+  "extends": "./tsconfig/compiler-options.json",
   "compilerOptions": {
-    // Compilation Configuration
-    "target": "es2017",
-    "sourceMap": true,
     "outDir": "dist",
-    "baseUrl": "packages",
-    "rootDir": "packages",
-
-    // Environment Configuration
-    "experimentalDecorators": true,
-    "moduleResolution": "node",
-
-    // Enhance Strictness
-    "strict": true,
-    "noImplicitReturns": true,
-    "allowUnreachableCode": false,
-    "noPropertyAccessFromIndexSignature": true,
-    "noUnusedLocals": true,
-    "noUncheckedIndexedAccess": true,
-    "noUnusedParameters": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": false,
-
-    "newLine": "LF",
-    "noEmit": true,
-
-    "allowJs": true,
-    "checkJs": false,
-
-    "paths": {
-      "backburner": ["../node_modules/backburner.js/dist/backburner.d.ts"]
-    }
+    "noEmit": true
   },
-
   "include": ["packages/**/*.ts"],
-
   "exclude": ["dist", "node_modules", "tmp", "types"]
 }
diff --git a/tsconfig/compiler-options.json b/tsconfig/compiler-options.json
new file mode 100644
index 00000000000..8d90d764ed0
--- /dev/null
+++ b/tsconfig/compiler-options.json
@@ -0,0 +1,35 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "compilerOptions": {
+    // Compilation Configuration
+    "target": "es2019",
+    "sourceMap": true,
+    "baseUrl": "../packages",
+    "rootDir": "../packages",
+
+    // Environment Configuration
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+
+    // Enhance Strictness
+    "strict": true,
+    "noImplicitReturns": true,
+    "allowUnreachableCode": false,
+    "noPropertyAccessFromIndexSignature": true,
+    "noUnusedLocals": true,
+    "noUncheckedIndexedAccess": true,
+    "noUnusedParameters": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": false,
+
+    "newLine": "LF",
+
+    "allowJs": true,
+    "checkJs": false,
+
+    "paths": {
+      "backburner": ["../node_modules/backburner.js/dist/backburner.d.ts"],
+      "require": ["./loader/lib/index.d.ts"]
+    }
+  }
+}

From 845b60e84d06ba123064c9b451ee8614060d2c93 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 21 Nov 2022 19:30:33 -0700
Subject: [PATCH 1268/1405] Introduce a script to publish stable types

Provide a script which runs the compiler against a new tsconfig for
generating types, wraps all the generated modules in `declare module`
statements, and then creates an `index.d.ts` which uses side-effect
style imports to expose them all, just the same as the preview types
but generated from source.

Critically, this infrastructure does not expose *any* stable types in
and of itself. Instead, it introduces a list of all the types still in
preview mode which acts as a filter, and currently *all* modules are in
that filter. Stabilizing the types for a given module will mean
removing modules from that list and removing the corresponding preview
types definitions.
---
 package.json                |   2 +
 tsconfig/publish-types.json |  31 +++
 types/publish.mjs           | 443 ++++++++++++++++++++++++++++++++++++
 types/stable/index.d.ts     |  12 -
 yarn.lock                   |  12 +
 5 files changed, 488 insertions(+), 12 deletions(-)
 create mode 100644 tsconfig/publish-types.json
 create mode 100755 types/publish.mjs
 delete mode 100644 types/stable/index.d.ts

diff --git a/package.json b/package.json
index 4998f01c8eb..79526e622bb 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
   "scripts": {
     "build": "ember build --environment production",
     "docs": "ember ember-cli-yuidoc",
+    "types": "tsc --project tsconfig/publish-types.json && node types/publish.mjs",
     "link:glimmer": "node bin/yarn-link-glimmer.js",
     "start": "ember serve",
     "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"",
@@ -143,6 +144,7 @@
     "glob": "^8.0.3",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
+    "magic-string": "^0.26.7",
     "mkdirp": "^1.0.4",
     "mocha": "^9.2.2",
     "npm-run-all": "^4.1.5",
diff --git a/tsconfig/publish-types.json b/tsconfig/publish-types.json
new file mode 100644
index 00000000000..3e459bb6039
--- /dev/null
+++ b/tsconfig/publish-types.json
@@ -0,0 +1,31 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "extends": "./compiler-options.json",
+  "compilerOptions": {
+    "noEmit": false,
+    "declaration": true,
+    "emitDeclarationOnly": true,
+    // It'd be really nice to be able to supply sourcemaps, and at some point we
+    // will be able to by using e.g. rollup-plugin-ts once we solve other issues
+    // blocking that in our publishing pipeline by way of circular and repeated
+    // dependencies in the graph, but at the moment we are using `magic-string`
+    // to post-process these to add `declare module` declarations (see the
+    // `types/publish.mjs` script or details), and that doesn't support updating
+    // *existing* source maps, unfortunately.
+    "declarationMap": false,
+    "declarationDir": "../types/stable"
+  },
+  "include": [
+    // Note: these will also pull on all their transitive dependencies, so we
+    // will end up publishing the (private!) types for packages not named here
+    // until we update the actual internals to avoid referencing them!
+    "../packages/@ember/**/*",
+    "../packages/ember/**/*",
+    "../packages/@glimmer/**/*"
+  ],
+  "exclude": [
+    "../**/type-tests",
+    "../**/tests",
+    "../**/internal-test-helpers"
+  ]
+}
diff --git a/types/publish.mjs b/types/publish.mjs
new file mode 100755
index 00000000000..7bfb209bd96
--- /dev/null
+++ b/types/publish.mjs
@@ -0,0 +1,443 @@
+#!/usr/bin/env node
+// @ts-check
+
+/**
+  This script is used to publish Ember's type definitions. The basic workflow
+  is:
+
+  1. Run `tsc` against the Ember packages which make up its public API, with
+     the output being `/types/stable`.
+
+  2. Wrap each emitted module in a `declare module` statement. While doing so,
+     keep track of the full list of emitted modules.
+
+  3. Check that each module emitted is included in `types/stable/index.d.ts`,
+     if and only if it also appears in a list of stable types modules defined
+     in this script, so that they all "show up" to end users. That list will
+     eventually be the list of *all* modules, but this allows us to publish
+     iteratively as we gain confidence in the stability of the types.
+
+  This is *not* an optimal long-term publishing strategy. We would prefer to
+  generate per-package roll-ups, using a Rollup plugin or some such, but we are
+  currently blocked on a number of internal circular dependencies as well as
+  the difficulty of avoiding multiple definitions of the same types reused
+  across many rollups.
+
+  @packageDocumentation
+ */
+
+import glob from 'glob';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+import MagicString from 'magic-string';
+
+/**
+  Modules we know we are not ready to expose yet, mostly because they do not
+  have enough annotations on their internals to make the generated types clear
+  about what is public and what is private.
+
+  Notably, the modules will still be published, but they won't be visible to
+  consumers because the only way they *become* visible is by being included in
+  the set of type-only side effect imports, which excludes exactly these
+  modules.
+ */
+const PREVIEW_MODULES = [
+  './@ember/-internals/bootstrap/index.d.ts',
+  './@ember/-internals/browser-environment/index.d.ts',
+  './@ember/-internals/browser-environment/lib/has-dom.d.ts',
+  './@ember/-internals/container/index.d.ts',
+  './@ember/-internals/container/lib/container.d.ts',
+  './@ember/-internals/container/lib/registry.d.ts',
+  './@ember/-internals/environment/index.d.ts',
+  './@ember/-internals/environment/lib/context.d.ts',
+  './@ember/-internals/environment/lib/env.d.ts',
+  './@ember/-internals/environment/lib/global.d.ts',
+  './@ember/-internals/error-handling/index.d.ts',
+  './@ember/-internals/glimmer/index.d.ts',
+  './@ember/-internals/glimmer/lib/component-managers/curly.d.ts',
+  './@ember/-internals/glimmer/lib/component-managers/mount.d.ts',
+  './@ember/-internals/glimmer/lib/component-managers/outlet.d.ts',
+  './@ember/-internals/glimmer/lib/component-managers/root.d.ts',
+  './@ember/-internals/glimmer/lib/component.d.ts',
+  './@ember/-internals/glimmer/lib/components/abstract-input.d.ts',
+  './@ember/-internals/glimmer/lib/components/input.d.ts',
+  './@ember/-internals/glimmer/lib/components/internal.d.ts',
+  './@ember/-internals/glimmer/lib/components/link-to.d.ts',
+  './@ember/-internals/glimmer/lib/components/textarea.d.ts',
+  './@ember/-internals/glimmer/lib/dom.d.ts',
+  './@ember/-internals/glimmer/lib/environment.d.ts',
+  './@ember/-internals/glimmer/lib/glimmer-component-docs.d.ts',
+  './@ember/-internals/glimmer/lib/glimmer-tracking-docs.d.ts',
+  './@ember/-internals/glimmer/lib/helper.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/-in-element-null-check.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/-normalize-class.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/-resolve.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/-track-array.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/action.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/array.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/component.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/concat.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/each-in.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/fn.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/get.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/hash.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/helper.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/if-unless.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/internal-helper.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/log.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/modifier.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/mut.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/page-title.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/readonly.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/unbound.d.ts',
+  './@ember/-internals/glimmer/lib/helpers/unique-id.d.ts',
+  './@ember/-internals/glimmer/lib/modifiers/action.d.ts',
+  './@ember/-internals/glimmer/lib/modifiers/internal.d.ts',
+  './@ember/-internals/glimmer/lib/modifiers/on.d.ts',
+  './@ember/-internals/glimmer/lib/renderer.d.ts',
+  './@ember/-internals/glimmer/lib/resolver.d.ts',
+  './@ember/-internals/glimmer/lib/setup-registry.d.ts',
+  './@ember/-internals/glimmer/lib/syntax/in-element.d.ts',
+  './@ember/-internals/glimmer/lib/syntax/let.d.ts',
+  './@ember/-internals/glimmer/lib/syntax/mount.d.ts',
+  './@ember/-internals/glimmer/lib/syntax/outlet.d.ts',
+  './@ember/-internals/glimmer/lib/syntax/utils.d.ts',
+  './@ember/-internals/glimmer/lib/template_registry.d.ts',
+  './@ember/-internals/glimmer/lib/template.d.ts',
+  './@ember/-internals/glimmer/lib/utils/bindings.d.ts',
+  './@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.d.ts',
+  './@ember/-internals/glimmer/lib/utils/debug-render-message.d.ts',
+  './@ember/-internals/glimmer/lib/utils/iterator.d.ts',
+  './@ember/-internals/glimmer/lib/utils/managers.d.ts',
+  './@ember/-internals/glimmer/lib/utils/outlet.d.ts',
+  './@ember/-internals/glimmer/lib/utils/process-args.d.ts',
+  './@ember/-internals/glimmer/lib/utils/serialization-first-node-helpers.d.ts',
+  './@ember/-internals/glimmer/lib/utils/string.d.ts',
+  './@ember/-internals/glimmer/lib/utils/to-bool.d.ts',
+  './@ember/-internals/glimmer/lib/views/outlet.d.ts',
+  './@ember/-internals/meta/index.d.ts',
+  './@ember/-internals/meta/lib/meta.d.ts',
+  './@ember/-internals/metal/index.d.ts',
+  './@ember/-internals/metal/lib/alias.d.ts',
+  './@ember/-internals/metal/lib/array_events.d.ts',
+  './@ember/-internals/metal/lib/array.d.ts',
+  './@ember/-internals/metal/lib/cache.d.ts',
+  './@ember/-internals/metal/lib/cached.d.ts',
+  './@ember/-internals/metal/lib/chain-tags.d.ts',
+  './@ember/-internals/metal/lib/change_event.d.ts',
+  './@ember/-internals/metal/lib/computed_cache.d.ts',
+  './@ember/-internals/metal/lib/computed.d.ts',
+  './@ember/-internals/metal/lib/decorator.d.ts',
+  './@ember/-internals/metal/lib/dependent_keys.d.ts',
+  './@ember/-internals/metal/lib/deprecate_property.d.ts',
+  './@ember/-internals/metal/lib/each_proxy_events.d.ts',
+  './@ember/-internals/metal/lib/events.d.ts',
+  './@ember/-internals/metal/lib/expand_properties.d.ts',
+  './@ember/-internals/metal/lib/get_properties.d.ts',
+  './@ember/-internals/metal/lib/injected_property.d.ts',
+  './@ember/-internals/metal/lib/libraries.d.ts',
+  './@ember/-internals/metal/lib/namespace_search.d.ts',
+  './@ember/-internals/metal/lib/observer.d.ts',
+  './@ember/-internals/metal/lib/path_cache.d.ts',
+  './@ember/-internals/metal/lib/properties.d.ts',
+  './@ember/-internals/metal/lib/property_events.d.ts',
+  './@ember/-internals/metal/lib/property_get.d.ts',
+  './@ember/-internals/metal/lib/property_set.d.ts',
+  './@ember/-internals/metal/lib/set_properties.d.ts',
+  './@ember/-internals/metal/lib/tags.d.ts',
+  './@ember/-internals/metal/lib/tracked.d.ts',
+  './@ember/-internals/overrides/index.d.ts',
+  './@ember/-internals/owner/index.d.ts',
+  './@ember/-internals/routing/index.d.ts',
+  './@ember/-internals/runtime/index.d.ts',
+  './@ember/-internals/runtime/lib/ext/rsvp.d.ts',
+  './@ember/-internals/runtime/lib/mixins/-proxy.d.ts',
+  './@ember/-internals/runtime/lib/mixins/action_handler.d.ts',
+  './@ember/-internals/runtime/lib/mixins/comparable.d.ts',
+  './@ember/-internals/runtime/lib/mixins/container_proxy.d.ts',
+  './@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts',
+  './@ember/-internals/runtime/lib/mixins/target_action_support.d.ts',
+  './@ember/-internals/utils/index.d.ts',
+  './@ember/-internals/utils/lib/cache.d.ts',
+  './@ember/-internals/utils/lib/dictionary.d.ts',
+  './@ember/-internals/utils/lib/ember-array.d.ts',
+  './@ember/-internals/utils/lib/get-debug-name.d.ts',
+  './@ember/-internals/utils/lib/guid.d.ts',
+  './@ember/-internals/utils/lib/inspect.d.ts',
+  './@ember/-internals/utils/lib/intern.d.ts',
+  './@ember/-internals/utils/lib/invoke.d.ts',
+  './@ember/-internals/utils/lib/is_proxy.d.ts',
+  './@ember/-internals/utils/lib/lookup-descriptor.d.ts',
+  './@ember/-internals/utils/lib/make-array.d.ts',
+  './@ember/-internals/utils/lib/mandatory-setter.d.ts',
+  './@ember/-internals/utils/lib/name.d.ts',
+  './@ember/-internals/utils/lib/spec.d.ts',
+  './@ember/-internals/utils/lib/super.d.ts',
+  './@ember/-internals/utils/lib/symbol.d.ts',
+  './@ember/-internals/utils/lib/to-string.d.ts',
+  './@ember/-internals/utils/types.d.ts',
+  './@ember/-internals/views/index.d.ts',
+  './@ember/-internals/views/lib/compat/attrs.d.ts',
+  './@ember/-internals/views/lib/compat/fallback-view-registry.d.ts',
+  './@ember/-internals/views/lib/component_lookup.d.ts',
+  './@ember/-internals/views/lib/mixins/action_support.d.ts',
+  './@ember/-internals/views/lib/mixins/child_views_support.d.ts',
+  './@ember/-internals/views/lib/mixins/class_names_support.d.ts',
+  './@ember/-internals/views/lib/mixins/view_state_support.d.ts',
+  './@ember/-internals/views/lib/mixins/view_support.d.ts',
+  './@ember/-internals/views/lib/system/action_manager.d.ts',
+  './@ember/-internals/views/lib/system/event_dispatcher.d.ts',
+  './@ember/-internals/views/lib/system/utils.d.ts',
+  './@ember/-internals/views/lib/views/states.d.ts',
+  './@ember/-internals/views/lib/views/states/default.d.ts',
+  './@ember/-internals/views/lib/views/states/destroying.d.ts',
+  './@ember/-internals/views/lib/views/states/has_element.d.ts',
+  './@ember/-internals/views/lib/views/states/in_dom.d.ts',
+  './@ember/-internals/views/lib/views/states/pre_render.d.ts',
+  './@ember/application/index.d.ts',
+  './@ember/application/instance.d.ts',
+  './@ember/application/lib/lazy_load.d.ts',
+  './@ember/application/namespace.d.ts',
+  './@ember/array/index.d.ts',
+  './@ember/array/mutable.d.ts',
+  './@ember/array/proxy.d.ts',
+  './@ember/canary-features/index.d.ts',
+  './@ember/component/helper.d.ts',
+  './@ember/component/index.d.ts',
+  './@ember/component/template-only.d.ts',
+  './@ember/debug/container-debug-adapter.d.ts',
+  './@ember/debug/data-adapter.d.ts',
+  './@ember/debug/index.d.ts',
+  './@ember/debug/lib/capture-render-tree.d.ts',
+  './@ember/debug/lib/deprecate.d.ts',
+  './@ember/debug/lib/handlers.d.ts',
+  './@ember/debug/lib/testing.d.ts',
+  './@ember/debug/lib/warn.d.ts',
+  './@ember/deprecated-features/index.d.ts',
+  './@ember/destroyable/index.d.ts',
+  './@ember/engine/index.d.ts',
+  './@ember/engine/instance.d.ts',
+  './@ember/engine/lib/engine-parent.d.ts',
+  './@ember/enumerable/index.d.ts',
+  './@ember/enumerable/mutable.d.ts',
+  './@ember/error/index.d.ts',
+  './@ember/helper/index.d.ts',
+  './@ember/instrumentation/index.d.ts',
+  './@ember/modifier/index.d.ts',
+  './@ember/object/compat.d.ts',
+  './@ember/object/computed.d.ts',
+  './@ember/object/core.d.ts',
+  './@ember/object/evented.d.ts',
+  './@ember/object/events.d.ts',
+  './@ember/object/index.d.ts',
+  './@ember/object/internals.d.ts',
+  './@ember/object/lib/computed/computed_macros.d.ts',
+  './@ember/object/lib/computed/reduce_computed_macros.d.ts',
+  './@ember/object/mixin.d.ts',
+  './@ember/object/observable.d.ts',
+  './@ember/object/observers.d.ts',
+  './@ember/object/promise-proxy-mixin.d.ts',
+  './@ember/object/proxy.d.ts',
+  './@ember/owner/index.d.ts',
+  './@ember/polyfills/index.d.ts',
+  './@ember/polyfills/lib/assign.d.ts',
+  './@ember/renderer/index.d.ts',
+  './@ember/routing/-internals.d.ts',
+  './@ember/routing/auto-location.d.ts',
+  './@ember/routing/hash-location.d.ts',
+  './@ember/routing/history-location.d.ts',
+  './@ember/routing/index.d.ts',
+  './@ember/routing/lib/cache.d.ts',
+  './@ember/routing/lib/controller_for.d.ts',
+  './@ember/routing/lib/dsl.d.ts',
+  './@ember/routing/lib/engines.d.ts',
+  './@ember/routing/lib/generate_controller.d.ts',
+  './@ember/routing/lib/location-utils.d.ts',
+  './@ember/routing/lib/query_params.d.ts',
+  './@ember/routing/lib/route-info.d.ts',
+  './@ember/routing/lib/router_state.d.ts',
+  './@ember/routing/lib/routing-service.d.ts',
+  './@ember/routing/lib/transition.d.ts',
+  './@ember/routing/lib/utils.d.ts',
+  './@ember/routing/location.d.ts',
+  './@ember/routing/none-location.d.ts',
+  './@ember/routing/route-info.d.ts',
+  './@ember/routing/route.d.ts',
+  './@ember/routing/router-service.d.ts',
+  './@ember/routing/router.d.ts',
+  './@ember/routing/transition.d.ts',
+  './@ember/runloop/index.d.ts',
+  './@ember/service/index.d.ts',
+  './@ember/string/index.d.ts',
+  './@ember/string/lib/string_registry.d.ts',
+  './@ember/template-compilation/index.d.ts',
+  './@ember/template-factory/index.d.ts',
+  './@ember/template/index.d.ts',
+  './@ember/test/adapter.d.ts',
+  './@ember/test/index.d.ts',
+  './@ember/utils/index.d.ts',
+  './@ember/utils/lib/compare.d.ts',
+  './@ember/utils/lib/is_blank.d.ts',
+  './@ember/utils/lib/is_empty.d.ts',
+  './@ember/utils/lib/is_none.d.ts',
+  './@ember/utils/lib/is_present.d.ts',
+  './@ember/utils/lib/is-equal.d.ts',
+  './@ember/utils/lib/type-of.d.ts',
+  './@ember/version/index.d.ts',
+  './@glimmer/tracking/index.d.ts',
+  './@glimmer/tracking/primitives/cache.d.ts',
+  './ember-template-compiler/index.d.ts',
+  './ember-template-compiler/lib/plugins/assert-against-attrs.d.ts',
+  './ember-template-compiler/lib/plugins/assert-against-named-outlets.d.ts',
+  './ember-template-compiler/lib/plugins/assert-input-helper-without-block.d.ts',
+  './ember-template-compiler/lib/plugins/assert-reserved-named-arguments.d.ts',
+  './ember-template-compiler/lib/plugins/assert-splattribute-expression.d.ts',
+  './ember-template-compiler/lib/plugins/index.d.ts',
+  './ember-template-compiler/lib/plugins/transform-action-syntax.d.ts',
+  './ember-template-compiler/lib/plugins/transform-each-in-into-each.d.ts',
+  './ember-template-compiler/lib/plugins/transform-each-track-array.d.ts',
+  './ember-template-compiler/lib/plugins/transform-in-element.d.ts',
+  './ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.d.ts',
+  './ember-template-compiler/lib/plugins/transform-resolutions.d.ts',
+  './ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.d.ts',
+  './ember-template-compiler/lib/plugins/utils.d.ts',
+  './ember-template-compiler/lib/system/bootstrap.d.ts',
+  './ember-template-compiler/lib/system/calculate-location-display.d.ts',
+  './ember-template-compiler/lib/system/compile-options.d.ts',
+  './ember-template-compiler/lib/system/compile.d.ts',
+  './ember-template-compiler/lib/system/dasherize-component-name.d.ts',
+  './ember-template-compiler/lib/system/initializer.d.ts',
+  './ember-template-compiler/lib/system/precompile.d.ts',
+  './ember-testing/index.d.ts',
+  './ember-testing/lib/adapters/adapter.d.ts',
+  './ember-testing/lib/adapters/qunit.d.ts',
+  './ember-testing/lib/ext/application.d.ts',
+  './ember-testing/lib/ext/rsvp.d.ts',
+  './ember-testing/lib/helpers.d.ts',
+  './ember-testing/lib/helpers/and_then.d.ts',
+  './ember-testing/lib/helpers/current_path.d.ts',
+  './ember-testing/lib/helpers/current_route_name.d.ts',
+  './ember-testing/lib/helpers/current_url.d.ts',
+  './ember-testing/lib/helpers/pause_test.d.ts',
+  './ember-testing/lib/helpers/visit.d.ts',
+  './ember-testing/lib/helpers/wait.d.ts',
+  './ember-testing/lib/initializers.d.ts',
+  './ember-testing/lib/setup_for_testing.d.ts',
+  './ember-testing/lib/test.d.ts',
+  './ember-testing/lib/test/adapter.d.ts',
+  './ember-testing/lib/test/helpers.d.ts',
+  './ember-testing/lib/test/on_inject_helpers.d.ts',
+  './ember-testing/lib/test/pending_requests.d.ts',
+  './ember-testing/lib/test/promise.d.ts',
+  './ember-testing/lib/test/run.d.ts',
+  './ember-testing/lib/test/waiters.d.ts',
+  './ember/index.d.ts',
+];
+
+const MODULES_PLACEHOLDER = '~~~MODULES GO HERE~~~';
+
+const BASE_INDEX_D_TS = `\
+/**
+  Provides stable type definitions for Ember.js. It is generated automatically
+  as part of Ember's publishing process and should never be edited manually.
+
+  To use these type definitions, add this import to any TypeScript file in your
+  Ember app or addon:
+
+  \`\`\`ts
+  import 'ember-source/types';
+  import 'ember-source/types/preview';
+  \`\`\`
+
+  @module
+ */
+
+// This works because each of these modules presents \`declare module\` definition
+// of the module and *only* that, so importing this file in turn makes those
+// module declarations "visible" automatically throughout a consuming project.
+// Combined with use of \`typesVersions\` (or, in the future, possibly \`exports\`)
+// in \`package.json\`, this allows users to import the types without knowing the
+// exact layout details.
+//
+// Somewhat annoyingly, every single module in the graph must appear here. For
+// now, while we are publishing ambient types, that means we must maintain this
+// by hand. When we start emitting types from the source, we will need to do the
+// same work, but automatically.
+
+// STATUS NOTE: this does not yet include Ember's full public API, only the
+// subset of it for which we have determined
+//
+// Over time, it will come to include *all* of Ember's types, and the matching
+// \`preview\` types will become empty. This is means that someone who writes the
+// import we recommend--
+//
+// \`\`\`ts
+// import 'ember-source/types';
+// import 'ember-source/types/preview';
+// \`\`\`
+//
+// --will always get the most up-to-date mix of preview and stable types, with
+// no extra effort required.
+
+${MODULES_PLACEHOLDER}
+`;
+
+const TYPES_DIR = path.join('types', 'stable');
+
+async function main() {
+  fs.rmSync(TYPES_DIR, { recursive: true, force: true });
+  fs.mkdirSync(TYPES_DIR, { recursive: true });
+
+  spawnSync('yarn', ['tsc', '--project', 'tsconfig/publish-types.json']);
+
+  // This is rooted in the `TYPES_DIR` so that the result is just the names of
+  // the modules, as generated directly from the tsconfig above.
+  let moduleNames = glob.sync('**/*.d.ts', {
+    ignore: 'index.d.ts', // ignore the root file itself if it somehow exists
+    cwd: TYPES_DIR,
+  });
+
+  for (let moduleName of moduleNames) {
+    wrapInDeclareModule(moduleName);
+  }
+
+  let sideEffectModules = moduleNames
+    .filter((module) => !PREVIEW_MODULES.includes(module))
+    .map((moduleName) => `import './${moduleName}';`)
+    .join('\n');
+
+  let stableIndexDTsContents = BASE_INDEX_D_TS.replace(MODULES_PLACEHOLDER, sideEffectModules);
+  fs.writeFileSync(path.join(TYPES_DIR, 'index.d.ts'), stableIndexDTsContents);
+}
+
+/**
+ * @param {string} moduleName
+ */
+function wrapInDeclareModule(moduleName) {
+  let modulePath = path.join(TYPES_DIR, moduleName);
+
+  /** @type {string} */
+  let contents;
+  try {
+    contents = fs.readFileSync(modulePath, { encoding: 'utf-8' });
+  } catch (e) {
+    console.error(`Error reading ${modulePath}: ${e}`);
+    return;
+  }
+
+  let moduleNameForDeclaration = moduleName.replace('/index.d.ts', '');
+
+  let string = new MagicString(contents);
+  string.indent('  ').prepend(`declare module '${moduleNameForDeclaration}' {\n`).append('}\n');
+
+  try {
+    fs.writeFileSync(modulePath, string.toString());
+  } catch (e) {
+    console.error(`Error writing ${modulePath}: ${e}`);
+  }
+}
+
+// Run it!
+main();
diff --git a/types/stable/index.d.ts b/types/stable/index.d.ts
deleted file mode 100644
index b55ef1447a1..00000000000
--- a/types/stable/index.d.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// Future home of stable Ember types! This file currently does nothing, but in
-// the months ahead will look more and more like the `/types/preview/index.d.ts`
-// while that one empties. This is just here so that someone who writes the
-// import we recommend--
-//
-// ```ts
-// import 'ember-source/types';
-// import 'ember-source/types/preview';
-// ```
-//
-// --will not get warnings from TypeScript while we wait on putting actual
-// things here!
diff --git a/yarn.lock b/yarn.lock
index 9632a9b374f..809399201d9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7711,6 +7711,13 @@ magic-string@^0.25.2, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
+magic-string@^0.26.7:
+  version "0.26.7"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
+  integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -9980,6 +9987,11 @@ sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
   integrity "sha1-xj6pJ8Ap3WvZorf6A7P+wCrVbp8= sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="
 
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
 sourcemap-validator@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.0.tgz#00454547d1682186e1498a7208e022e8dfa8738f"

From 752f13318b35613c7c0b617a89999e0ba66c1e41 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 21 Nov 2022 19:20:10 -0700
Subject: [PATCH 1269/1405] Exclude generated stable types from Git

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index f2f07319406..0f018875cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,9 @@ npm-debug.log
 *.log
 /.vscode
 
+# These are automatically generated by our build process.
+# TODO: make that *fully* true: The root types/stable directory is *not*
+# automatically generated yet, and accordingly we have explicitly committed a
+# couple of the files. Once it is, we can switch this over to just ignoring
+# `types/stable` entirely.
+types/stable

From 63e59ca6460e5378736ab3bf36240e5fdb5e4df5 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 21 Nov 2022 19:17:39 -0700
Subject: [PATCH 1270/1405] Update module-level documentation for preview types

Align the text with the module docs for the stable types, clarifying
the updated current status.
---
 types/preview/index.d.ts | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index b106926d952..0ffda874e62 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -1,11 +1,21 @@
 /**
-  @module
-  Makes Ember's types for the packages it publishes available by importing this
-  path from `ember-source`:
+  Provides stable type definitions for Ember.js. It is maintained by hand, and
+  the types provided here are unstable and subject to change without warning,
+  though we make a best effort to keep churn to a minimum while we work to
+  stabilize Ember's types.
+
+  To use these type definitions, add these import to any TypeScript file in your
+  Ember app or addon:
 
   ```ts
-  import 'ember-source/preview';
+  import 'ember-source/types';
+  import 'ember-source/types/preview';
   ```
+
+  As Ember's types become more stable, this will automatically give you the
+  latest mix of stable and preview types, with no effort from you.
+
+  @module
  */
 
 // This works because each of these modules presents `declare module` definition

From f28818fbd134745e7229b0e887e840aeb672097a Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Tue, 22 Nov 2022 10:08:01 +0100
Subject: [PATCH 1271/1405] [DOC] Add missing closing bracket in
 `RouterService` docs

---
 packages/@ember/routing/router-service.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/routing/router-service.ts b/packages/@ember/routing/router-service.ts
index 8da73347904..139331df1d0 100644
--- a/packages/@ember/routing/router-service.ts
+++ b/packages/@ember/routing/router-service.ts
@@ -454,12 +454,12 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
     import Route from '@ember/routing';
     import { service } from '@ember/service';
 
-    export default class extends Route {
+    export default class ContactFormRoute extends Route {
       @service router;
 
-      callback = (transition) =>  {
+      callback = (transition) => {
         if (!transition.to.find(route => route.name === this.routeName)) {
-          alert("Please save or cancel your changes.");
+          alert('Please save or cancel your changes.');
           transition.abort();
         }
       };
@@ -470,6 +470,7 @@ class RouterService<R extends Route> extends Service.extend(Evented) {
 
       deactivate() {
         this.router.off('routeWillChange', this.callback);
+      }
     }
     ```
 

From 24c0e4a8a30bcc624d4d47272eae1901ad346f90 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 22 Nov 2022 07:01:31 -0700
Subject: [PATCH 1272/1405] Tweak/improve/fix type side-effect package docs

---
 types/preview/index.d.ts | 9 +++++----
 types/publish.mjs        | 6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 0ffda874e62..30e11e44d55 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -1,8 +1,9 @@
 /**
-  Provides stable type definitions for Ember.js. It is maintained by hand, and
-  the types provided here are unstable and subject to change without warning,
-  though we make a best effort to keep churn to a minimum while we work to
-  stabilize Ember's types.
+  *Provides **preview** type definitions for Ember.js.*
+
+  These types are maintained by hand and the types provided here are unstable
+  and subject to change without warning, though we make a best effort to keep
+  churn to a minimum while we work to stabilize Ember's types.
 
   To use these type definitions, add these import to any TypeScript file in your
   Ember app or addon:
diff --git a/types/publish.mjs b/types/publish.mjs
index 7bfb209bd96..e369bebac4b 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -340,8 +340,10 @@ const MODULES_PLACEHOLDER = '~~~MODULES GO HERE~~~';
 
 const BASE_INDEX_D_TS = `\
 /**
-  Provides stable type definitions for Ember.js. It is generated automatically
-  as part of Ember's publishing process and should never be edited manually.
+  *Provides **stable** type definitions for Ember.js.*
+
+  This module is generated automatically as part of Ember's publishing process and
+  should never be edited manually.
 
   To use these type definitions, add this import to any TypeScript file in your
   Ember app or addon:

From f37f561ac5a333d577749cb80c37b17ecdfef5c0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 22 Nov 2022 08:10:56 -0700
Subject: [PATCH 1273/1405] Fix incomplete sentence in stable types module doc

---
 types/publish.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/publish.mjs b/types/publish.mjs
index e369bebac4b..93d696979e6 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -369,7 +369,7 @@ const BASE_INDEX_D_TS = `\
 // same work, but automatically.
 
 // STATUS NOTE: this does not yet include Ember's full public API, only the
-// subset of it for which we have determined
+// subset of it for which we have determined the types are ready to stabilize.
 //
 // Over time, it will come to include *all* of Ember's types, and the matching
 // \`preview\` types will become empty. This is means that someone who writes the

From 7bef3141fa8ed1c82f213e5d95a661186b9324cd Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 22 Nov 2022 08:57:39 -0700
Subject: [PATCH 1274/1405] Fix typo in internal comments for @ember/object

Co-authored-by: Dan Freeman <dfreeman@salsify.com>
---
 packages/@ember/object/-internals.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/object/-internals.ts b/packages/@ember/object/-internals.ts
index 2cdc10e94fd..922c4824e4a 100644
--- a/packages/@ember/object/-internals.ts
+++ b/packages/@ember/object/-internals.ts
@@ -13,7 +13,7 @@ import EmberObject from '.';
 // binding below for `FrameworkObject`, TS gets stuck because this creates
 // `FrameworkObject` with a class expression (rather than the usual class
 // declaration form). That in turn means TS needs to be able to fully name the
-// type produced by the clsas expression, which includes the `OWNER` symbol from
+// type produced by the class expression, which includes the `OWNER` symbol from
 // `@glimmer/owner`.
 //
 // By explicitly giving the declaration a type when assigning it the class

From 26a0923a4fa589c70f5a3ce1069daa803c02a5d3 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 22 Nov 2022 09:08:37 -0700
Subject: [PATCH 1275/1405] Exit with `1` if `types/publish` script fails

---
 types/publish.mjs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/publish.mjs b/types/publish.mjs
index 93d696979e6..f4dce2f9d4a 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -401,8 +401,12 @@ async function main() {
     cwd: TYPES_DIR,
   });
 
+  let status = 'success';
   for (let moduleName of moduleNames) {
-    wrapInDeclareModule(moduleName);
+    let result = wrapInDeclareModule(moduleName);
+    if (result !== 'success') {
+      status = result;
+    }
   }
 
   let sideEffectModules = moduleNames
@@ -412,10 +416,13 @@ async function main() {
 
   let stableIndexDTsContents = BASE_INDEX_D_TS.replace(MODULES_PLACEHOLDER, sideEffectModules);
   fs.writeFileSync(path.join(TYPES_DIR, 'index.d.ts'), stableIndexDTsContents);
+
+  process.exit(status === 'success' ? 0 : 1);
 }
 
 /**
  * @param {string} moduleName
+ * @return {'success' | 'failure'}
  */
 function wrapInDeclareModule(moduleName) {
   let modulePath = path.join(TYPES_DIR, moduleName);
@@ -426,7 +433,7 @@ function wrapInDeclareModule(moduleName) {
     contents = fs.readFileSync(modulePath, { encoding: 'utf-8' });
   } catch (e) {
     console.error(`Error reading ${modulePath}: ${e}`);
-    return;
+    return 'failure';
   }
 
   let moduleNameForDeclaration = moduleName.replace('/index.d.ts', '');
@@ -438,7 +445,10 @@ function wrapInDeclareModule(moduleName) {
     fs.writeFileSync(modulePath, string.toString());
   } catch (e) {
     console.error(`Error writing ${modulePath}: ${e}`);
+    return 'failure';
   }
+
+  return 'success';
 }
 
 // Run it!

From d425480252cfa903ec4fcd591d8c467d7de47cb6 Mon Sep 17 00:00:00 2001
From: Nathaniel Bibler <git@nathanielbibler.com>
Date: Tue, 22 Nov 2022 11:18:09 -0500
Subject: [PATCH 1276/1405] [DOC] Fix typo in destroyable docs

---
 packages/@ember/destroyable/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/destroyable/index.ts b/packages/@ember/destroyable/index.ts
index 39d34cc89fe..215b98081ca 100644
--- a/packages/@ember/destroyable/index.ts
+++ b/packages/@ember/destroyable/index.ts
@@ -19,7 +19,7 @@ import {
 
   This destroyables API exposes the basic building blocks for destruction:
 
-  * registering a function to be ran when an object is destroyyed
+  * registering a function to be ran when an object is destroyed
   * checking if an object is in a destroying state
   * associate an object as a child of another so that the child object will be destroyed
     when the associated parent object is destroyed.

From 8e147578b4635bad93c1d25048d2d55fd29813b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 21:57:36 +0000
Subject: [PATCH 1277/1405] Bump mocha from 9.2.2 to 10.1.0

Bumps [mocha](https://github.com/mochajs/mocha) from 9.2.2 to 10.1.0.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v9.2.2...v10.1.0)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 71 +++++++++++++++++++++-------------------------------
 2 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/package.json b/package.json
index 79526e622bb..433e3200a7c 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "lodash.uniq": "^4.5.0",
     "magic-string": "^0.26.7",
     "mkdirp": "^1.0.4",
-    "mocha": "^9.2.2",
+    "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "puppeteer": "^13.5.1",
diff --git a/yarn.lock b/yarn.lock
index 809399201d9..3a09c176468 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1977,11 +1977,6 @@
     "@typescript-eslint/types" "5.38.1"
     eslint-visitor-keys "^3.3.0"
 
-"@ungap/promise-all-settled@1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
-  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
-
 "@xmldom/xmldom@^0.8.0":
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.2.tgz#b695ff674e8216efa632a3d36ad51ae9843380c0"
@@ -4003,7 +3998,7 @@ debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -6089,11 +6084,6 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-growl@1.10.5:
-  version "1.10.5"
-  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
-  integrity "sha1-8nNdwig2dPpnR4sQGBBZNVw2nl4= sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA=="
-
 growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
@@ -7986,12 +7976,12 @@ mini-css-extract-plugin@^2.5.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4"
-  integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==
+minimatch@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
   dependencies:
-    brace-expansion "^1.1.7"
+    brace-expansion "^2.0.1"
 
 minimatch@^5.0.1, minimatch@^5.1.0:
   version "5.1.0"
@@ -8067,32 +8057,29 @@ mktemp@~0.4.0:
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
   integrity sha1-bQUVYRyKjITkhKogABKbmOmB/ws=
 
-mocha@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.2.tgz#d70db46bdb93ca57402c809333e5a84977a88fb9"
-  integrity sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==
+mocha@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a"
+  integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==
   dependencies:
-    "@ungap/promise-all-settled" "1.1.2"
     ansi-colors "4.1.1"
     browser-stdout "1.3.1"
     chokidar "3.5.3"
-    debug "4.3.3"
+    debug "4.3.4"
     diff "5.0.0"
     escape-string-regexp "4.0.0"
     find-up "5.0.0"
     glob "7.2.0"
-    growl "1.10.5"
     he "1.2.0"
     js-yaml "4.1.0"
     log-symbols "4.1.0"
-    minimatch "4.2.1"
+    minimatch "5.0.1"
     ms "2.1.3"
-    nanoid "3.3.1"
+    nanoid "3.3.3"
     serialize-javascript "6.0.0"
     strip-json-comments "3.1.1"
     supports-color "8.1.1"
-    which "2.0.2"
-    workerpool "6.2.0"
+    workerpool "6.2.1"
     yargs "16.2.0"
     yargs-parser "20.2.4"
     yargs-unparser "2.0.0"
@@ -8143,10 +8130,10 @@ nanocolors@^0.1.5:
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
   integrity sha512-2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ==
 
-nanoid@3.3.1, nanoid@^3.1.25:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
-  integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
+nanoid@3.3.3, nanoid@^3.1.25:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
+  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
 
 nanomatch@^1.2.9:
   version "1.2.9"
@@ -11088,13 +11075,6 @@ which-typed-array@^1.1.2:
     has-tostringtag "^1.0.0"
     is-typed-array "^1.1.9"
 
-which@2.0.2, which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
-  dependencies:
-    isexe "^2.0.0"
-
 which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -11102,6 +11082,13 @@ which@^1.2.14, which@^1.2.9:
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity "sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="
+  dependencies:
+    isexe "^2.0.0"
+
 wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
@@ -11124,10 +11111,10 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
 
-workerpool@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
-  integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
+workerpool@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
+  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
 
 workerpool@^3.1.1:
   version "3.1.2"

From 374db4ed4f65617dc03c149d4186b7b924e5950a Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 23 Nov 2022 09:30:07 -0700
Subject: [PATCH 1278/1405] [BUGFIX] Fix `typesVersions` key for stable types

This does not affect existing consumers of the preview types, for whom
the existing configuration worked correctly, and we are not actually
*publishing* stable types yet, so this doesn't need to get backported,
but it *is* important that we have it in place as we start publishing
stable types.
---
 package.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 79526e622bb..33463433581 100644
--- a/package.json
+++ b/package.json
@@ -172,12 +172,12 @@
     "after": "ember-cli-legacy-blueprints"
   },
   "typesVersions": {
-    "types/*": {
-      "stable": [
-        "./types/stable"
+    "*": {
+      "types": [
+        "types/stable"
       ],
-      "preview": [
-        "./types/preview"
+      "types/preview": [
+        "types/preview"
       ]
     }
   }

From 6c071ec27f7390c1274542f1b6862887be64452d Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 23 Nov 2022 10:08:22 -0700
Subject: [PATCH 1279/1405] Don't double-run tsc for generating types

The package script here was duplicating what the script does.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 79526e622bb..1a1d97e06bc 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   "scripts": {
     "build": "ember build --environment production",
     "docs": "ember ember-cli-yuidoc",
-    "types": "tsc --project tsconfig/publish-types.json && node types/publish.mjs",
+    "types": "node types/publish.mjs",
     "link:glimmer": "node bin/yarn-link-glimmer.js",
     "start": "ember serve",
     "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"",

From 70b98dac9e0b54b498c85d68162b560580654bc9 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 28 Nov 2022 15:38:52 -0500
Subject: [PATCH 1280/1405] Add v4.9.0 to CHANGELOG

(cherry picked from commit 4d4200dfe09d79a5b836123916701daddb7f3dd2)
---
 CHANGELOG.md | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f55f9e4a3a..61ccbff70f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,21 @@
 # Ember Changelog
 
-### v4.9.0-beta.4 (November 15, 2022)
+### v4.9.0 (November 28, 2022)
 
+- [#20274](https://github.com/emberjs/ember.js/pull/20274) [BUGFIX] Add some missing types to preview types
 - [#20256](https://github.com/emberjs/ember.js/pull/20256) [BUGFIX] Correct types for Ember Arrays
 - [#20257](https://github.com/emberjs/ember.js/pull/20257) [BUGFIX] Fix types for `getOwner` and GlimmerComponent
+- [#20233](https://github.com/emberjs/ember.js/pull/20233) [BUGFIX] Include package name in deprecation error message
+- [#20235](https://github.com/emberjs/ember.js/pull/20235) [BUGFIX] Update `@types/node` for TS 4.9 issue
+- [#20238](https://github.com/emberjs/ember.js/pull/20238) [BUGFIX] Update Node.js versions to match support policy
+- [#20227](https://github.com/emberjs/ember.js/pull/20227) [BUGFIX] Fix unsafe internal cast for NativeArray
+- [#20228](https://github.com/emberjs/ember.js/pull/20228) [BUGFIX] Remove type export for ControllerMixin
+- [#20203](https://github.com/emberjs/ember.js/pull/20203) / [#20204](https://github.com/emberjs/ember.js/pull/20204) [FEATURE] Preview types: Update to Typescript 4.8
 
 ### v4.8.2 (November 3, 2022)
 
 - [#20244](https://github.com/emberjs/ember.js/pull/20244) Add missing type for `getComponentTemplate` to preview types
 
-### v4.9.0-beta.3 (November 2, 2022)
-
-- [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
-- [#20233](https://github.com/emberjs/ember.js/pull/20233) [BUGFIX] Include package name in deprecation error message
-- [#20235](https://github.com/emberjs/ember.js/pull/20235) [BUGFIX] Update `@types/node` for TS 4.9 issue
-- [#20238](https://github.com/emberjs/ember.js/pull/20238) [BUGFIX] Update Node.js versions to match support policy
-- [#20244](https://github.com/emberjs/ember.js/pull/20244) [BUGFIX] Expose getComponentTemplate type
-
 ### v4.8.1 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
@@ -33,15 +32,6 @@
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
 
-### v4.9.0-beta.2 (October 25, 2022)
-
-- [#20227](https://github.com/emberjs/ember.js/pull/20227) [BUGFIX] Fix unsafe internal cast for NativeArray
-- [#20228](https://github.com/emberjs/ember.js/pull/20228) [BUGFIX] Remove type export for ControllerMixin
-
-### v4.9.0-beta.1 (October 17, 2022) 
-
-- [#20203](https://github.com/emberjs/ember.js/pull/20203) / [#20204](https://github.com/emberjs/ember.js/pull/20204) [FEATURE] Preview types: Update to Typescript 4.8
-
 ### v4.8.0 (October 17, 2022)
 
 - [#20180](https://github.com/emberjs/ember.js/pull/20180) [FEATURE] Publish an opt-in preview of public types for Ember

From 32003505c1908c68f35e0504a8df297949db62dc Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 28 Nov 2022 16:29:58 -0500
Subject: [PATCH 1281/1405] Add 4.10.0-beta.1 to CHANGELOG

(cherry picked from commit 107e7e9fe2df133a7918c5198725601c3462e66f)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61ccbff70f6..c777a1806a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+### v4.10.0-beta.1 (November 28, 2022)
+
+- [#20253](https://github.com/emberjs/ember.js/pull/20253) [FEATURE] Add the `Resolver` type to preview types
+- [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).
+
 ### v4.9.0 (November 28, 2022)
 
 - [#20274](https://github.com/emberjs/ember.js/pull/20274) [BUGFIX] Add some missing types to preview types

From 87ca43d449bb7c3859bda0a6a83b5cf5582ed167 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 28 Nov 2022 16:33:21 -0500
Subject: [PATCH 1282/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7d7835e0ce9..f48863aea3f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.10.0-alpha.1",
+  "version": "4.11.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 0e92a4b355d7a7dddfa92a185b8ad7e5f7fff908 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 28 Nov 2022 19:14:33 -0700
Subject: [PATCH 1283/1405] [BUGFIX beta] revert `compilerOptions.target` to
 ES2017

This is one possible culprit behind #20281. We should, at minimum, only
make this change in `target` intentionally, rather than incidentally.
---
 tsconfig/compiler-options.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig/compiler-options.json b/tsconfig/compiler-options.json
index 8d90d764ed0..2b90d78588d 100644
--- a/tsconfig/compiler-options.json
+++ b/tsconfig/compiler-options.json
@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
     // Compilation Configuration
-    "target": "es2019",
+    "target": "es2017",
     "sourceMap": true,
     "baseUrl": "../packages",
     "rootDir": "../packages",

From 02a334f71996f1f9efb4f0933ce41d0123c6b82e Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 07:04:13 -0700
Subject: [PATCH 1284/1405] [BUGFIX stable] remove nonsense deprecation
 functions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These were incorrectly documented as being part of this package for a
long time, and so the types included them; but this was fixed as of
Ember 3.12 (in [this PR][1]), three and a half years ago, and our types
never got the message! 😬

[1]: https://github.com/emberjs/ember.js/pull/17926
---
 .../@ember/application-test/deprecations.ts   | 17 -------------
 .../preview/ember/ember-module-tests.ts       |  2 ++
 type-tests/preview/ember/utils.ts             | 14 -----------
 .../@ember/application/deprecations.d.ts      | 24 -------------------
 types/preview/ember/index.d.ts                | 12 +++++-----
 types/preview/index.d.ts                      |  1 -
 6 files changed, 8 insertions(+), 62 deletions(-)
 delete mode 100644 type-tests/preview/@ember/application-test/deprecations.ts
 delete mode 100644 types/preview/@ember/application/deprecations.d.ts

diff --git a/type-tests/preview/@ember/application-test/deprecations.ts b/type-tests/preview/@ember/application-test/deprecations.ts
deleted file mode 100644
index 414e38af111..00000000000
--- a/type-tests/preview/@ember/application-test/deprecations.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { deprecate, deprecateFunc } from '@ember/application/deprecations';
-
-deprecate('this is no longer advised', false, {
-  id: 'no-longer-advised',
-  until: 'v4.0',
-});
-deprecate('this is no longer advised', false, {
-  id: 'no-longer-advised',
-  until: 'v4.0',
-  url: 'https://emberjs.com',
-});
-// @ts-expect-error
-deprecate('this is no longer advised', false);
-
-// @ts-expect-error
-deprecateFunc('this is no longer advised', () => {});
-deprecateFunc('this is no longer advised', { id: 'no-longer-do-this', until: 'v4.0' }, () => {});
diff --git a/type-tests/preview/ember/ember-module-tests.ts b/type-tests/preview/ember/ember-module-tests.ts
index ab5fe935815..23e1d61b446 100644
--- a/type-tests/preview/ember/ember-module-tests.ts
+++ b/type-tests/preview/ember/ember-module-tests.ts
@@ -39,6 +39,8 @@ Ember.debug('some info for developers');
 Ember.deprecate("you shouldn't use this anymore", 3 === 3, {
   id: 'no-longer-allowed',
   until: '99.0.0',
+  for: 'Ember',
+  since: { available: '4.0.0', enabled: '4.1.1' },
 });
 // get
 expectTypeOf(Ember.get({ z: 23 }, 'z')).toEqualTypeOf<number>();
diff --git a/type-tests/preview/ember/utils.ts b/type-tests/preview/ember/utils.ts
index 5bc51392f0b..d8535aab2df 100755
--- a/type-tests/preview/ember/utils.ts
+++ b/type-tests/preview/ember/utils.ts
@@ -64,20 +64,6 @@ function testOnError() {
   };
 }
 
-function testDeprecateFunc() {
-  function newMethod(first: string, second: number): string {
-    return '';
-  }
-
-  const oldMethod = Ember.deprecateFunc(
-    'Please use the new method',
-    { id: 'deprecated.id', until: '6.0' },
-    newMethod
-  );
-  expectTypeOf(newMethod('first', 123)).toEqualTypeOf<string>();
-  expectTypeOf(oldMethod('first', 123)).toEqualTypeOf<string>();
-}
-
 function testDefineProperty() {
   type Contact = { firstName?: string; lastName?: string };
   const contact: Contact = {};
diff --git a/types/preview/@ember/application/deprecations.d.ts b/types/preview/@ember/application/deprecations.d.ts
deleted file mode 100644
index 272cdbfc726..00000000000
--- a/types/preview/@ember/application/deprecations.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-declare module '@ember/application/deprecations' {
-  import { AnyFn } from 'ember/-private/type-utils';
-
-  interface DeprecationOptions {
-    id: string;
-    until: string;
-    url?: string | undefined;
-  }
-
-  /**
-   * Display a deprecation warning with the provided message and a stack trace
-   * (Chrome and Firefox only).
-   */
-  export function deprecate(message: string, test: boolean, options: DeprecationOptions): void;
-
-  /**
-   * Alias an old, deprecated method with its new counterpart.
-   */
-  export function deprecateFunc<Func extends AnyFn>(
-    message: string,
-    options: DeprecationOptions,
-    func: Func
-  ): Func;
-}
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index 321c0ab422b..a80649d4f08 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -29,7 +29,6 @@ declare module 'ember' {
   import EmberCoreObject from '@ember/object/core';
   import * as EmberApplicationNs from '@ember/application';
   import * as EmberApplicationInstanceNs from '@ember/application/instance';
-  import type * as EmberApplicationDeprecateNs from '@ember/application/deprecations';
   import type * as EmberTestNs from '@ember/test';
   import * as EmberControllerNs from '@ember/controller';
   import EmberMixin from '@ember/object/mixin';
@@ -84,8 +83,7 @@ declare module 'ember' {
     export class HashLocation extends EmberRoutingHashLocation {}
     export class NoneLocation extends EmberRoutingNoneLocation {}
     export class HistoryLocation extends EmberRoutingHistoryLocation {}
-    export const deprecateFunc: typeof EmberApplicationDeprecateNs.deprecateFunc;
-    export const deprecate: typeof EmberApplicationDeprecateNs.deprecate;
+    export const deprecate: typeof EmberDebugNs.deprecate;
     export const getOwner: typeof EmberApplicationNs.getOwner;
     export const setOwner: typeof EmberApplicationNs.setOwner;
     export class EventDispatcher extends EmberEventDispatcher {}
@@ -238,9 +236,11 @@ declare module 'ember' {
       const service: typeof EmberServiceNs.inject;
     }
     namespace ENV {
-      const EXTEND_PROTOTYPES: boolean | {
-        Array: boolean;
-      };
+      const EXTEND_PROTOTYPES:
+        | boolean
+        | {
+            Array: boolean;
+          };
       const LOG_BINDINGS: boolean;
       const LOG_STACKTRACE_ON_DEPRECATION: boolean;
       const LOG_VERSION: boolean;
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 30e11e44d55..757259080c9 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -37,7 +37,6 @@ import './ember/-private/type-utils';
 import './@ember/application';
 import './@ember/application/-private/event-dispatcher';
 import './@ember/application/-private/registry';
-import './@ember/application/deprecations';
 import './@ember/application/instance';
 import './@ember/application/types';
 

From 1c779a49b2f775a4dd6885ae8ada515ce068c5a1 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 07:56:22 -0700
Subject: [PATCH 1285/1405] Update to TS v4.9

This lets us take advantage of much smarter `in`-based type narrowing
and the new `satisfies` operator internally. We'll need to make a
decision about what versions to support when we actually "stabilize"
the types: not merely publishing them, but opting consumers into them
by default. However, it's likely that 4.9 and 5.0 will be reasonable
targets at that point, and even if not the particular 4.9 features we
might rely on are "runtime" TS features, so we should be able to add a
CI check for 4.8 if we want to add support for it in the test matrix.
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cde76001c87..1202ccd4d89 100644
--- a/package.json
+++ b/package.json
@@ -160,7 +160,7 @@
     "simple-dom": "^1.4.0",
     "testem": "^3.9.0",
     "testem-failure-only-reporter": "^1.0.0",
-    "typescript": "~4.8.3"
+    "typescript": "4.9"
   },
   "peerDependencies": {
     "@glimmer/component": "^1.1.2"
diff --git a/yarn.lock b/yarn.lock
index 3a09c176468..0bde262906f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10690,10 +10690,10 @@ typescript-memoize@^1.0.0-alpha.3, typescript-memoize@^1.0.1:
   resolved "https://registry.yarnpkg.com/typescript-memoize/-/typescript-memoize-1.1.0.tgz#4a8f512d06fc995167c703a3592219901db8bc79"
   integrity sha512-LQPKVXK8QrBBkL/zclE6YgSWn0I8ew5m0Lf+XL00IwMhlotqRLlzHV+BRrljVQIc+NohUAuQP7mg4HQwrx5Xbg==
 
-typescript@~4.8.3:
-  version "4.8.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
-  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
+typescript@4.9:
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db"
+  integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==
 
 uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"

From 5d0b470cf9ff72a1b1db0b93d3a0695691913709 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 29 Nov 2022 13:15:43 -0800
Subject: [PATCH 1286/1405] Remove never enabled flags - Fixes #20282

---
 FEATURES.md                                   |  13 --
 .../components/link-to/routing-angle-test.js  |  95 ----------
 .../components/link-to/routing-curly-test.js  |  95 ----------
 .../integration/event-dispatcher-test.js      |  64 -------
 .../helpers/closure-action-test.js            | 175 ------------------
 .../helpers/element-action-test.js            |  58 ------
 .../@ember/-internals/metal/lib/libraries.ts  |   7 -
 .../-internals/metal/tests/libraries_test.js  |  17 --
 packages/@ember/canary-features/index.ts      |   4 -
 packages/@ember/instrumentation/index.ts      |  21 +--
 10 files changed, 6 insertions(+), 543 deletions(-)

diff --git a/FEATURES.md b/FEATURES.md
index 823f87c6202..de66ba8d43c 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -5,19 +5,6 @@ for a detailed explanation.
 
 ## Feature Flags
 
-* `ember-libraries-isregistered`
-
-  Add `isRegistered` to `Ember.libraries`. This convenience method checks whether
-  a library is registered with Ember or not.
-
-* `ember-improved-instrumentation`
-
-  Adds additional instrumentation to Ember:
-
-  - `interaction.<event-name>` for events handled by a component.
-  - `interaction.ember-action` for closure actions.
-  - `interaction.link-to` for link-to execution.
-
 * `ember-testing-resume-test`
 
   Introduces the `resumeTest` testing helper to complement the `pauseTest` helper.
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
index 606349be153..3f6e304bac4 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-angle-test.js
@@ -7,10 +7,8 @@ import {
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA } from '@ember/array';
 import { RSVP } from '@ember/-internals/runtime';
-import { subscribe, reset } from '@ember/instrumentation';
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
 import { compile } from '../../../utils/helpers';
@@ -826,99 +824,6 @@ moduleFor(
   }
 );
 
-if (EMBER_IMPROVED_INSTRUMENTATION) {
-  moduleFor(
-    'The <LinkTo /> component with EMBER_IMPROVED_INSTRUMENTATION',
-    class extends ApplicationTestCase {
-      constructor() {
-        super();
-
-        this.router.map(function () {
-          this.route('about');
-        });
-
-        this.addTemplate(
-          'index',
-          `
-          <h3 class="home">Home</h3>
-          <LinkTo id='about-link' @route='about'>About</LinkTo>
-          <LinkTo id='self-link' @route='index'>Self</LinkTo>
-          `
-        );
-        this.addTemplate(
-          'about',
-          `
-          <h3 class="about">About</h3>
-          <LinkTo id='home-link' @route='index'>Home</LinkTo>
-          <LinkTo id='self-link' @route='about'>Self</LinkTo>
-          `
-        );
-      }
-
-      beforeEach() {
-        return this.visit('/');
-      }
-
-      afterEach() {
-        reset();
-
-        return super.afterEach();
-      }
-
-      async ['@test it fires an interaction event'](assert) {
-        let before = 0;
-        let after = 0;
-
-        subscribe('interaction.link-to', {
-          before() {
-            before++;
-          },
-          after() {
-            after++;
-          },
-        });
-
-        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
-        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
-
-        await this.click('#about-link');
-
-        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
-        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
-      }
-
-      async ['@test it interaction event includes the route name and transition object'](assert) {
-        let before = 0;
-        let after = 0;
-
-        subscribe('interaction.link-to', {
-          before(name, timestamp, { routeName }) {
-            before++;
-            assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
-          },
-          after(name, timestamp, { routeName, transition }) {
-            after++;
-            assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
-            assert.equal(
-              transition.targetName,
-              'about',
-              'instrumentation subscriber was passed transition object in the after hook'
-            );
-          },
-        });
-
-        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
-        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
-
-        await this.click('#about-link');
-
-        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
-        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
-      }
-    }
-  );
-}
-
 moduleFor(
   'The <LinkTo /> component - nested routes and link-to arguments',
   class extends ApplicationTestCase {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
index 3f1c9c7bcc2..b76191f341a 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/components/link-to/routing-curly-test.js
@@ -7,10 +7,8 @@ import {
 import Controller, { inject as injectController } from '@ember/controller';
 import { A as emberA } from '@ember/array';
 import { RSVP } from '@ember/-internals/runtime';
-import { subscribe, reset } from '@ember/instrumentation';
 import Route from '@ember/routing/route';
 import NoneLocation from '@ember/routing/none-location';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import Engine from '@ember/engine';
 import { DEBUG } from '@glimmer/env';
 import { compile } from '../../../utils/helpers';
@@ -893,99 +891,6 @@ moduleFor(
   }
 );
 
-if (EMBER_IMPROVED_INSTRUMENTATION) {
-  moduleFor(
-    'The {{link-to}} component with EMBER_IMPROVED_INSTRUMENTATION',
-    class extends ApplicationTestCase {
-      constructor() {
-        super();
-
-        this.router.map(function () {
-          this.route('about');
-        });
-
-        this.addTemplate(
-          'index',
-          `
-          <h3 class="home">Home</h3>
-          <div id="about-link">{{#link-to route='about'}}About{{/link-to}}</div>
-          <div id="self-link">{{#link-to route='index'}}Self{{/link-to}}</div>
-          `
-        );
-        this.addTemplate(
-          'about',
-          `
-          <h3 class="about">About</h3>
-          <div id="home-link">{{#link-to route='index'}}Home{{/link-to}}</div>
-          <div id="self-link">{{#link-to route='about'}}Self{{/link-to}}</div>
-          `
-        );
-      }
-
-      beforeEach() {
-        return this.visit('/');
-      }
-
-      afterEach() {
-        reset();
-
-        return super.afterEach();
-      }
-
-      async ['@test it fires an interaction event'](assert) {
-        let before = 0;
-        let after = 0;
-
-        subscribe('interaction.link-to', {
-          before() {
-            before++;
-          },
-          after() {
-            after++;
-          },
-        });
-
-        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
-        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
-
-        await this.click('#about-link > a');
-
-        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
-        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
-      }
-
-      async ['@test it interaction event includes the route name and transition object'](assert) {
-        let before = 0;
-        let after = 0;
-
-        subscribe('interaction.link-to', {
-          before(name, timestamp, { routeName }) {
-            before++;
-            assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
-          },
-          after(name, timestamp, { routeName, transition }) {
-            after++;
-            assert.equal(routeName, 'about', 'instrumentation subscriber was passed route name');
-            assert.equal(
-              transition.targetName,
-              'about',
-              'instrumentation subscriber was passed transition object in the after hook'
-            );
-          },
-        });
-
-        assert.strictEqual(before, 0, 'instrumentation subscriber (before) was not called');
-        assert.strictEqual(after, 0, 'instrumentation subscriber (after) was not called');
-
-        await this.click('#about-link > a');
-
-        assert.strictEqual(before, 1, 'instrumentation subscriber (before) was called');
-        assert.strictEqual(after, 1, 'instrumentation subscriber (after) was called');
-      }
-    }
-  );
-}
-
 moduleFor(
   'The {{link-to}} component - nested routes and link-to arguments',
   class extends ApplicationTestCase {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
index aa8cb2ca634..c665be30561 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/event-dispatcher-test.js
@@ -2,11 +2,6 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { Component } from '../utils/helpers';
 import { _getCurrentRunLoop } from '@ember/runloop';
-import {
-  reset as instrumentationReset,
-  subscribe as instrumentationSubscribe,
-} from '@ember/instrumentation';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 
 let canDataTransfer = Boolean(document.createEvent('HTMLEvents').dataTransfer);
 
@@ -349,65 +344,6 @@ moduleFor(
   }
 );
 
-if (EMBER_IMPROVED_INSTRUMENTATION) {
-  moduleFor(
-    'EventDispatcher - Instrumentation',
-    class extends RenderingTestCase {
-      teardown() {
-        super.teardown();
-        instrumentationReset();
-      }
-
-      ['@test instruments triggered events'](assert) {
-        let clicked = 0;
-
-        this.registerComponent('x-foo', {
-          ComponentClass: Component.extend({
-            click() {
-              clicked++;
-            },
-          }),
-          template: `<p>hello</p>`,
-        });
-
-        this.render(`{{x-foo}}`);
-
-        this.$('div').trigger('click');
-
-        assert.equal(clicked, 1, 'precond - the click handler was invoked');
-
-        let clickInstrumented = 0;
-        instrumentationSubscribe('interaction.click', {
-          before() {
-            clickInstrumented++;
-            assert.equal(clicked, 1, 'invoked before event is handled');
-          },
-          after() {
-            clickInstrumented++;
-            assert.equal(clicked, 2, 'invoked after event is handled');
-          },
-        });
-
-        let keypressInstrumented = 0;
-        instrumentationSubscribe('interaction.keypress', {
-          before() {
-            keypressInstrumented++;
-          },
-          after() {
-            keypressInstrumented++;
-          },
-        });
-
-        this.$('div').trigger('click');
-        this.$('div').trigger('change');
-        assert.equal(clicked, 2, 'precond - The click handler was invoked');
-        assert.equal(clickInstrumented, 2, 'The click was instrumented');
-        assert.strictEqual(keypressInstrumented, 0, 'The keypress was not instrumented');
-      }
-    }
-  );
-}
-
 if (canDataTransfer) {
   moduleFor(
     'EventDispatcher - Event Properties',
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
index 1b949c0ff91..491ec966116 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/closure-action-test.js
@@ -1,185 +1,10 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import {
-  subscribe as instrumentationSubscribe,
-  unsubscribe as instrumentationUnsubscribe,
-} from '@ember/instrumentation';
 import { _getCurrentRunLoop } from '@ember/runloop';
 import { set, computed } from '@ember/object';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 
 import { Component } from '../../utils/helpers';
 
-if (EMBER_IMPROVED_INSTRUMENTATION) {
-  moduleFor(
-    'Helpers test: closure {{action}} improved instrumentation',
-    class extends RenderingTestCase {
-      subscribe(eventName, options) {
-        this.subscriber = instrumentationSubscribe(eventName, options);
-      }
-
-      teardown() {
-        if (this.subscriber) {
-          instrumentationUnsubscribe(this.subscriber);
-        }
-
-        super.teardown();
-      }
-
-      ['@test interaction event subscriber should be passed parameters']() {
-        let actionParam = 'So krispy';
-        let beforeParameters = [];
-        let afterParameters = [];
-
-        let InnerComponent = Component.extend({
-          actions: {
-            fireAction() {
-              this.attrs.submit(actionParam);
-            },
-          },
-        });
-
-        let OuterComponent = Component.extend({
-          outerSubmit() {},
-        });
-
-        this.registerComponent('inner-component', {
-          ComponentClass: InnerComponent,
-          template: '<button id="instrument-button" {{action "fireAction"}}>What it do</button>',
-        });
-
-        this.registerComponent('outer-component', {
-          ComponentClass: OuterComponent,
-          template: '{{inner-component submit=(action this.outerSubmit)}}',
-        });
-
-        this.subscribe('interaction.ember-action', {
-          before(name, timestamp, payload) {
-            beforeParameters.push(payload.args);
-          },
-          after(name, timestamp, payload) {
-            afterParameters.push(payload.args);
-          },
-        });
-
-        this.render(`{{outer-component}}`);
-
-        runTask(() => {
-          this.$('#instrument-button').trigger('click');
-        });
-
-        this.assert.deepEqual(
-          beforeParameters,
-          [[], [actionParam]],
-          'instrumentation subscriber before function was passed closure action parameters'
-        );
-        this.assert.deepEqual(
-          afterParameters,
-          [[actionParam], []],
-          'instrumentation subscriber after function was passed closure action parameters'
-        );
-      }
-
-      ['@test interaction event subscriber should be passed target']() {
-        let beforeParameters = [];
-        let afterParameters = [];
-
-        let InnerComponent = Component.extend({
-          myProperty: 'inner-thing',
-          actions: {
-            fireAction() {
-              this.attrs.submit();
-            },
-          },
-        });
-
-        let OuterComponent = Component.extend({
-          myProperty: 'outer-thing',
-          outerSubmit() {},
-        });
-
-        this.registerComponent('inner-component', {
-          ComponentClass: InnerComponent,
-          template: '<button id="instrument-button" {{action "fireAction"}}>What it do</button>',
-        });
-
-        this.registerComponent('outer-component', {
-          ComponentClass: OuterComponent,
-          template: '{{inner-component submit=(action this.outerSubmit)}}',
-        });
-
-        this.subscribe('interaction.ember-action', {
-          before(name, timestamp, payload) {
-            beforeParameters.push(payload.target.get('myProperty'));
-          },
-          after(name, timestamp, payload) {
-            afterParameters.push(payload.target.get('myProperty'));
-          },
-        });
-
-        this.render(`{{outer-component}}`);
-
-        runTask(() => {
-          this.$('#instrument-button').trigger('click');
-        });
-
-        this.assert.deepEqual(
-          beforeParameters,
-          ['inner-thing', 'outer-thing'],
-          'instrumentation subscriber before function was passed target'
-        );
-        this.assert.deepEqual(
-          afterParameters,
-          ['outer-thing', 'inner-thing'],
-          'instrumentation subscriber after function was passed target'
-        );
-      }
-
-      ['@test instrumented action should return value']() {
-        let returnedValue = 'Chris P is so krispy';
-        let actualReturnedValue;
-
-        let InnerComponent = Component.extend({
-          actions: {
-            fireAction() {
-              actualReturnedValue = this.attrs.submit();
-            },
-          },
-        });
-
-        let OuterComponent = Component.extend({
-          outerSubmit() {
-            return returnedValue;
-          },
-        });
-
-        this.registerComponent('inner-component', {
-          ComponentClass: InnerComponent,
-          template: '<button id="instrument-button" {{action "fireAction"}}>What it do</button>',
-        });
-
-        this.registerComponent('outer-component', {
-          ComponentClass: OuterComponent,
-          template: '{{inner-component submit=(action this.outerSubmit)}}',
-        });
-
-        this.subscribe('interaction.ember-action', {
-          before() {},
-          after() {},
-        });
-
-        this.render(`{{outer-component}}`);
-
-        runTask(() => {
-          this.$('#instrument-button').trigger('click');
-        });
-
-        this.assert.equal(actualReturnedValue, returnedValue, 'action can return to caller');
-      }
-    }
-  );
-}
-
 moduleFor(
   'Helpers test: closure {{action}}',
   class extends RenderingTestCase {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
index d4709e76bbf..d5b0728a0ed 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/element-action-test.js
@@ -1,10 +1,5 @@
 import { RenderingTestCase, moduleFor, strip, runTask } from 'internal-test-helpers';
 
-import {
-  subscribe as instrumentationSubscribe,
-  reset as instrumentationReset,
-} from '@ember/instrumentation';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import EmberObject, { set } from '@ember/object';
 import { A as emberA } from '@ember/array';
 import { ActionManager } from '@ember/-internals/views';
@@ -32,59 +27,6 @@ function getActionIds(element) {
   );
 }
 
-if (EMBER_IMPROVED_INSTRUMENTATION) {
-  moduleFor(
-    'Helpers test: element action instrumentation',
-    class extends RenderingTestCase {
-      teardown() {
-        super.teardown();
-        instrumentationReset();
-      }
-
-      ['@test action should fire interaction event with proper params']() {
-        let subscriberCallCount = 0;
-        let subscriberPayload = null;
-
-        let ExampleComponent = Component.extend({
-          actions: {
-            foo() {},
-          },
-        });
-
-        this.registerComponent('example-component', {
-          ComponentClass: ExampleComponent,
-          template: '<button {{action "foo" "bar"}}>Click me</button>',
-        });
-
-        instrumentationSubscribe('interaction.ember-action', {
-          before() {
-            subscriberCallCount++;
-          },
-          after(name, time, payload) {
-            subscriberPayload = payload;
-          },
-        });
-
-        this.render('{{example-component}}');
-
-        this.assert.equal(subscriberCallCount, 0, 'subscriber has not been called');
-
-        runTask(() => this.rerender());
-
-        this.assert.equal(subscriberCallCount, 0, 'subscriber has not been called');
-
-        runTask(() => {
-          this.$('button').click();
-        });
-
-        this.assert.equal(subscriberCallCount, 1, 'subscriber has been called 1 time');
-        this.assert.equal(subscriberPayload.name, 'foo', 'subscriber called with correct name');
-        this.assert.equal(subscriberPayload.args[0], 'bar', 'subscriber called with correct args');
-      }
-    }
-  );
-}
-
 moduleFor(
   'Helpers test: element action',
   class extends RenderingTestCase {
diff --git a/packages/@ember/-internals/metal/lib/libraries.ts b/packages/@ember/-internals/metal/lib/libraries.ts
index 3b19532fc5b..e03005d4980 100644
--- a/packages/@ember/-internals/metal/lib/libraries.ts
+++ b/packages/@ember/-internals/metal/lib/libraries.ts
@@ -1,4 +1,3 @@
-import { EMBER_LIBRARIES_ISREGISTERED } from '@ember/canary-features';
 import { assert, debug, warn } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import VERSION from 'ember/version';
@@ -74,12 +73,6 @@ export class Libraries {
   logVersions?: () => void;
 }
 
-if (EMBER_LIBRARIES_ISREGISTERED) {
-  Libraries.prototype.isRegistered = function (name: string): boolean {
-    return Boolean(this._getLibraryByName(name));
-  };
-}
-
 if (DEBUG) {
   Libraries.prototype.logVersions = function (): void {
     let libs = this._registry;
diff --git a/packages/@ember/-internals/metal/tests/libraries_test.js b/packages/@ember/-internals/metal/tests/libraries_test.js
index 0241ccbb42c..169c0ad3b1c 100644
--- a/packages/@ember/-internals/metal/tests/libraries_test.js
+++ b/packages/@ember/-internals/metal/tests/libraries_test.js
@@ -1,7 +1,6 @@
 import { DEBUG } from '@glimmer/env';
 import { getDebugFunction, setDebugFunction } from '@ember/debug';
 import { Libraries } from '..';
-import { EMBER_LIBRARIES_ISREGISTERED } from '@ember/canary-features';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let libs, registry;
@@ -46,22 +45,6 @@ moduleFor(
       assert.equal(registry.length, 1);
     }
 
-    ['@test isRegistered returns correct value'](assert) {
-      if (EMBER_LIBRARIES_ISREGISTERED) {
-        assert.expect(3);
-
-        assert.equal(libs.isRegistered('magic'), false);
-
-        libs.register('magic', 1.23);
-        assert.equal(libs.isRegistered('magic'), true);
-
-        libs.deRegister('magic');
-        assert.equal(libs.isRegistered('magic'), false);
-      } else {
-        assert.expect(0);
-      }
-    }
-
     ['@test attempting to register a library that is already registered warns you'](assert) {
       if (!DEBUG) {
         assert.ok(true, 'Logging does not occur in production builds');
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 9786f6004bd..2ae2599d8c5 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -12,8 +12,6 @@ import { ENV } from '@ember/-internals/environment';
 */
 
 export const DEFAULT_FEATURES = {
-  EMBER_LIBRARIES_ISREGISTERED: null,
-  EMBER_IMPROVED_INSTRUMENTATION: null,
   EMBER_UNIQUE_ID_HELPER: true,
   EMBER_DEFAULT_HELPER_MANAGER: true,
 };
@@ -64,7 +62,5 @@ function featureValue(value: null | boolean) {
   return value;
 }
 
-export const EMBER_LIBRARIES_ISREGISTERED = featureValue(FEATURES.EMBER_LIBRARIES_ISREGISTERED);
-export const EMBER_IMPROVED_INSTRUMENTATION = featureValue(FEATURES.EMBER_IMPROVED_INSTRUMENTATION);
 export const EMBER_UNIQUE_ID_HELPER = featureValue(FEATURES.EMBER_UNIQUE_ID_HELPER);
 export const EMBER_DEFAULT_HELPER_MANAGER = featureValue(FEATURES.EMBER_DEFAULT_HELPER_MANAGER);
diff --git a/packages/@ember/instrumentation/index.ts b/packages/@ember/instrumentation/index.ts
index a2dca835f29..3d34e94af45 100644
--- a/packages/@ember/instrumentation/index.ts
+++ b/packages/@ember/instrumentation/index.ts
@@ -2,7 +2,6 @@
 /* global console */
 
 import { ENV } from '@ember/-internals/environment';
-import { EMBER_IMPROVED_INSTRUMENTATION } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 
 export interface Listener<T> {
@@ -186,22 +185,14 @@ export function instrument<Binding, Result>(
   }
 }
 
-let flaggedInstrument: <Result>(name: string, payload: object, callback: () => Result) => Result;
-
-if (EMBER_IMPROVED_INSTRUMENTATION) {
-  flaggedInstrument = instrument;
-} else {
-  flaggedInstrument = function instrument<Result>(
-    _name: string,
-    _payload: object,
-    callback: () => Result
-  ): Result {
-    return callback();
-  };
+export function flaggedInstrument<Result>(
+  _name: string,
+  _payload: object,
+  callback: () => Result
+): Result {
+  return callback();
 }
 
-export { flaggedInstrument };
-
 function withFinalizer<Binding, Result>(
   callback: InstrumentCallback<Binding, Result>,
   finalizer: () => void,

From 42d0a35791dfae29d7befdf1ec8141bd9ef73bb7 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Wed, 23 Nov 2022 08:17:47 -0800
Subject: [PATCH 1287/1405] Correct FEATURES.md

---
 FEATURES.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/FEATURES.md b/FEATURES.md
index de66ba8d43c..5c66163be76 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -5,6 +5,12 @@ for a detailed explanation.
 
 ## Feature Flags
 
-* `ember-testing-resume-test`
+* `EMBER_DEFAULT_HELPER_MANAGER`
 
-  Introduces the `resumeTest` testing helper to complement the `pauseTest` helper.
+  Provides a default manager for unrecognized helpers as specified in
+  [RFC-756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
+
+* `EMBER_UNIQUE_ID_HELPER`
+
+  Provides a `{{unique-id}} helper as specified in
+  [RFC-659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).

From 7d99c412e65bcd1f38d214a0d7173a99ff082980 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 15:43:20 -0700
Subject: [PATCH 1288/1405] Include types in `build` and fix `type-check`

- Rename the existing `build` command to `build:js`, introduce a
  `build:types` command, and make a new top-level `build` command that
  dispatches both of the others with `npm-run-all`.

- Update handling for type checking to include separate passes for the
  library TS code and *each* of the type test packages.
---
 package.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 1202ccd4d89..928562745f1 100644
--- a/package.json
+++ b/package.json
@@ -33,9 +33,10 @@
     "url": "git+https://github.com/emberjs/ember.js.git"
   },
   "scripts": {
-    "build": "ember build --environment production",
+    "build:js": "ember build --environment production",
+    "build:types": "node types/publish.mjs",
+    "build": "npm-run-all build:*",
     "docs": "ember ember-cli-yuidoc",
-    "types": "node types/publish.mjs",
     "link:glimmer": "node bin/yarn-link-glimmer.js",
     "start": "ember serve",
     "lint": "npm-run-all --continue-on-error --aggregate-output --parallel \"lint:!(fix)\"",
@@ -49,7 +50,8 @@
     "test:blueprints": "yarn test:blueprints:js && yarn test:blueprints:ts",
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js",
-    "type-check:stable": "tsc --noEmit",
+    "type-check:packages": "tsc --noEmit",
+    "type-check:stable": "tsc --noEmit --project type-tests/stable",
     "type-check:preview": "tsc --noEmit --project type-tests/preview",
     "type-check": "npm-run-all type-check:*"
   },

From 62bcb2a6abf759ed3ea1ff789692920cf6bdacb5 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 15:47:25 -0700
Subject: [PATCH 1289/1405] Exclude *all* of type-tests from linting

We might want *some* lints on these at some point, but for now this is
the right tradeoff here.
---
 .eslintignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintignore b/.eslintignore
index 7ce02292986..d619eb5c112 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -7,4 +7,4 @@ dist/
 tmp/
 smoke-tests/
 types/
-type-tests/preview
+type-tests/

From 86f6e52889ed5fb10070e5925c977095a1c7d837 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 15:23:28 -0700
Subject: [PATCH 1290/1405] Fix some bugs in `types/publish` script

- The modules needed to be "absolute" not "relative" for the filtering
  to work correctly.
- That in turn meant we needed to *insert* a relative lookup.
- But we also needed to make sure we treat top-level packages *as such*
  rather than linking to their `index`, else TS does not resolve them
  correctly with these side effect modules.
---
 types/publish.mjs | 610 ++++++++++++++++++++++++----------------------
 1 file changed, 316 insertions(+), 294 deletions(-)

diff --git a/types/publish.mjs b/types/publish.mjs
index f4dce2f9d4a..86fd2666f96 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -43,297 +43,300 @@ import MagicString from 'magic-string';
   modules.
  */
 const PREVIEW_MODULES = [
-  './@ember/-internals/bootstrap/index.d.ts',
-  './@ember/-internals/browser-environment/index.d.ts',
-  './@ember/-internals/browser-environment/lib/has-dom.d.ts',
-  './@ember/-internals/container/index.d.ts',
-  './@ember/-internals/container/lib/container.d.ts',
-  './@ember/-internals/container/lib/registry.d.ts',
-  './@ember/-internals/environment/index.d.ts',
-  './@ember/-internals/environment/lib/context.d.ts',
-  './@ember/-internals/environment/lib/env.d.ts',
-  './@ember/-internals/environment/lib/global.d.ts',
-  './@ember/-internals/error-handling/index.d.ts',
-  './@ember/-internals/glimmer/index.d.ts',
-  './@ember/-internals/glimmer/lib/component-managers/curly.d.ts',
-  './@ember/-internals/glimmer/lib/component-managers/mount.d.ts',
-  './@ember/-internals/glimmer/lib/component-managers/outlet.d.ts',
-  './@ember/-internals/glimmer/lib/component-managers/root.d.ts',
-  './@ember/-internals/glimmer/lib/component.d.ts',
-  './@ember/-internals/glimmer/lib/components/abstract-input.d.ts',
-  './@ember/-internals/glimmer/lib/components/input.d.ts',
-  './@ember/-internals/glimmer/lib/components/internal.d.ts',
-  './@ember/-internals/glimmer/lib/components/link-to.d.ts',
-  './@ember/-internals/glimmer/lib/components/textarea.d.ts',
-  './@ember/-internals/glimmer/lib/dom.d.ts',
-  './@ember/-internals/glimmer/lib/environment.d.ts',
-  './@ember/-internals/glimmer/lib/glimmer-component-docs.d.ts',
-  './@ember/-internals/glimmer/lib/glimmer-tracking-docs.d.ts',
-  './@ember/-internals/glimmer/lib/helper.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/-in-element-null-check.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/-normalize-class.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/-resolve.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/-track-array.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/action.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/array.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/component.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/concat.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/each-in.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/fn.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/get.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/hash.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/helper.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/if-unless.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/internal-helper.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/log.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/modifier.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/mut.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/page-title.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/readonly.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/unbound.d.ts',
-  './@ember/-internals/glimmer/lib/helpers/unique-id.d.ts',
-  './@ember/-internals/glimmer/lib/modifiers/action.d.ts',
-  './@ember/-internals/glimmer/lib/modifiers/internal.d.ts',
-  './@ember/-internals/glimmer/lib/modifiers/on.d.ts',
-  './@ember/-internals/glimmer/lib/renderer.d.ts',
-  './@ember/-internals/glimmer/lib/resolver.d.ts',
-  './@ember/-internals/glimmer/lib/setup-registry.d.ts',
-  './@ember/-internals/glimmer/lib/syntax/in-element.d.ts',
-  './@ember/-internals/glimmer/lib/syntax/let.d.ts',
-  './@ember/-internals/glimmer/lib/syntax/mount.d.ts',
-  './@ember/-internals/glimmer/lib/syntax/outlet.d.ts',
-  './@ember/-internals/glimmer/lib/syntax/utils.d.ts',
-  './@ember/-internals/glimmer/lib/template_registry.d.ts',
-  './@ember/-internals/glimmer/lib/template.d.ts',
-  './@ember/-internals/glimmer/lib/utils/bindings.d.ts',
-  './@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.d.ts',
-  './@ember/-internals/glimmer/lib/utils/debug-render-message.d.ts',
-  './@ember/-internals/glimmer/lib/utils/iterator.d.ts',
-  './@ember/-internals/glimmer/lib/utils/managers.d.ts',
-  './@ember/-internals/glimmer/lib/utils/outlet.d.ts',
-  './@ember/-internals/glimmer/lib/utils/process-args.d.ts',
-  './@ember/-internals/glimmer/lib/utils/serialization-first-node-helpers.d.ts',
-  './@ember/-internals/glimmer/lib/utils/string.d.ts',
-  './@ember/-internals/glimmer/lib/utils/to-bool.d.ts',
-  './@ember/-internals/glimmer/lib/views/outlet.d.ts',
-  './@ember/-internals/meta/index.d.ts',
-  './@ember/-internals/meta/lib/meta.d.ts',
-  './@ember/-internals/metal/index.d.ts',
-  './@ember/-internals/metal/lib/alias.d.ts',
-  './@ember/-internals/metal/lib/array_events.d.ts',
-  './@ember/-internals/metal/lib/array.d.ts',
-  './@ember/-internals/metal/lib/cache.d.ts',
-  './@ember/-internals/metal/lib/cached.d.ts',
-  './@ember/-internals/metal/lib/chain-tags.d.ts',
-  './@ember/-internals/metal/lib/change_event.d.ts',
-  './@ember/-internals/metal/lib/computed_cache.d.ts',
-  './@ember/-internals/metal/lib/computed.d.ts',
-  './@ember/-internals/metal/lib/decorator.d.ts',
-  './@ember/-internals/metal/lib/dependent_keys.d.ts',
-  './@ember/-internals/metal/lib/deprecate_property.d.ts',
-  './@ember/-internals/metal/lib/each_proxy_events.d.ts',
-  './@ember/-internals/metal/lib/events.d.ts',
-  './@ember/-internals/metal/lib/expand_properties.d.ts',
-  './@ember/-internals/metal/lib/get_properties.d.ts',
-  './@ember/-internals/metal/lib/injected_property.d.ts',
-  './@ember/-internals/metal/lib/libraries.d.ts',
-  './@ember/-internals/metal/lib/namespace_search.d.ts',
-  './@ember/-internals/metal/lib/observer.d.ts',
-  './@ember/-internals/metal/lib/path_cache.d.ts',
-  './@ember/-internals/metal/lib/properties.d.ts',
-  './@ember/-internals/metal/lib/property_events.d.ts',
-  './@ember/-internals/metal/lib/property_get.d.ts',
-  './@ember/-internals/metal/lib/property_set.d.ts',
-  './@ember/-internals/metal/lib/set_properties.d.ts',
-  './@ember/-internals/metal/lib/tags.d.ts',
-  './@ember/-internals/metal/lib/tracked.d.ts',
-  './@ember/-internals/overrides/index.d.ts',
-  './@ember/-internals/owner/index.d.ts',
-  './@ember/-internals/routing/index.d.ts',
-  './@ember/-internals/runtime/index.d.ts',
-  './@ember/-internals/runtime/lib/ext/rsvp.d.ts',
-  './@ember/-internals/runtime/lib/mixins/-proxy.d.ts',
-  './@ember/-internals/runtime/lib/mixins/action_handler.d.ts',
-  './@ember/-internals/runtime/lib/mixins/comparable.d.ts',
-  './@ember/-internals/runtime/lib/mixins/container_proxy.d.ts',
-  './@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts',
-  './@ember/-internals/runtime/lib/mixins/target_action_support.d.ts',
-  './@ember/-internals/utils/index.d.ts',
-  './@ember/-internals/utils/lib/cache.d.ts',
-  './@ember/-internals/utils/lib/dictionary.d.ts',
-  './@ember/-internals/utils/lib/ember-array.d.ts',
-  './@ember/-internals/utils/lib/get-debug-name.d.ts',
-  './@ember/-internals/utils/lib/guid.d.ts',
-  './@ember/-internals/utils/lib/inspect.d.ts',
-  './@ember/-internals/utils/lib/intern.d.ts',
-  './@ember/-internals/utils/lib/invoke.d.ts',
-  './@ember/-internals/utils/lib/is_proxy.d.ts',
-  './@ember/-internals/utils/lib/lookup-descriptor.d.ts',
-  './@ember/-internals/utils/lib/make-array.d.ts',
-  './@ember/-internals/utils/lib/mandatory-setter.d.ts',
-  './@ember/-internals/utils/lib/name.d.ts',
-  './@ember/-internals/utils/lib/spec.d.ts',
-  './@ember/-internals/utils/lib/super.d.ts',
-  './@ember/-internals/utils/lib/symbol.d.ts',
-  './@ember/-internals/utils/lib/to-string.d.ts',
-  './@ember/-internals/utils/types.d.ts',
-  './@ember/-internals/views/index.d.ts',
-  './@ember/-internals/views/lib/compat/attrs.d.ts',
-  './@ember/-internals/views/lib/compat/fallback-view-registry.d.ts',
-  './@ember/-internals/views/lib/component_lookup.d.ts',
-  './@ember/-internals/views/lib/mixins/action_support.d.ts',
-  './@ember/-internals/views/lib/mixins/child_views_support.d.ts',
-  './@ember/-internals/views/lib/mixins/class_names_support.d.ts',
-  './@ember/-internals/views/lib/mixins/view_state_support.d.ts',
-  './@ember/-internals/views/lib/mixins/view_support.d.ts',
-  './@ember/-internals/views/lib/system/action_manager.d.ts',
-  './@ember/-internals/views/lib/system/event_dispatcher.d.ts',
-  './@ember/-internals/views/lib/system/utils.d.ts',
-  './@ember/-internals/views/lib/views/states.d.ts',
-  './@ember/-internals/views/lib/views/states/default.d.ts',
-  './@ember/-internals/views/lib/views/states/destroying.d.ts',
-  './@ember/-internals/views/lib/views/states/has_element.d.ts',
-  './@ember/-internals/views/lib/views/states/in_dom.d.ts',
-  './@ember/-internals/views/lib/views/states/pre_render.d.ts',
-  './@ember/application/index.d.ts',
-  './@ember/application/instance.d.ts',
-  './@ember/application/lib/lazy_load.d.ts',
-  './@ember/application/namespace.d.ts',
-  './@ember/array/index.d.ts',
-  './@ember/array/mutable.d.ts',
-  './@ember/array/proxy.d.ts',
-  './@ember/canary-features/index.d.ts',
-  './@ember/component/helper.d.ts',
-  './@ember/component/index.d.ts',
-  './@ember/component/template-only.d.ts',
-  './@ember/debug/container-debug-adapter.d.ts',
-  './@ember/debug/data-adapter.d.ts',
-  './@ember/debug/index.d.ts',
-  './@ember/debug/lib/capture-render-tree.d.ts',
-  './@ember/debug/lib/deprecate.d.ts',
-  './@ember/debug/lib/handlers.d.ts',
-  './@ember/debug/lib/testing.d.ts',
-  './@ember/debug/lib/warn.d.ts',
-  './@ember/deprecated-features/index.d.ts',
-  './@ember/destroyable/index.d.ts',
-  './@ember/engine/index.d.ts',
-  './@ember/engine/instance.d.ts',
-  './@ember/engine/lib/engine-parent.d.ts',
-  './@ember/enumerable/index.d.ts',
-  './@ember/enumerable/mutable.d.ts',
-  './@ember/error/index.d.ts',
-  './@ember/helper/index.d.ts',
-  './@ember/instrumentation/index.d.ts',
-  './@ember/modifier/index.d.ts',
-  './@ember/object/compat.d.ts',
-  './@ember/object/computed.d.ts',
-  './@ember/object/core.d.ts',
-  './@ember/object/evented.d.ts',
-  './@ember/object/events.d.ts',
-  './@ember/object/index.d.ts',
-  './@ember/object/internals.d.ts',
-  './@ember/object/lib/computed/computed_macros.d.ts',
-  './@ember/object/lib/computed/reduce_computed_macros.d.ts',
-  './@ember/object/mixin.d.ts',
-  './@ember/object/observable.d.ts',
-  './@ember/object/observers.d.ts',
-  './@ember/object/promise-proxy-mixin.d.ts',
-  './@ember/object/proxy.d.ts',
-  './@ember/owner/index.d.ts',
-  './@ember/polyfills/index.d.ts',
-  './@ember/polyfills/lib/assign.d.ts',
-  './@ember/renderer/index.d.ts',
-  './@ember/routing/-internals.d.ts',
-  './@ember/routing/auto-location.d.ts',
-  './@ember/routing/hash-location.d.ts',
-  './@ember/routing/history-location.d.ts',
-  './@ember/routing/index.d.ts',
-  './@ember/routing/lib/cache.d.ts',
-  './@ember/routing/lib/controller_for.d.ts',
-  './@ember/routing/lib/dsl.d.ts',
-  './@ember/routing/lib/engines.d.ts',
-  './@ember/routing/lib/generate_controller.d.ts',
-  './@ember/routing/lib/location-utils.d.ts',
-  './@ember/routing/lib/query_params.d.ts',
-  './@ember/routing/lib/route-info.d.ts',
-  './@ember/routing/lib/router_state.d.ts',
-  './@ember/routing/lib/routing-service.d.ts',
-  './@ember/routing/lib/transition.d.ts',
-  './@ember/routing/lib/utils.d.ts',
-  './@ember/routing/location.d.ts',
-  './@ember/routing/none-location.d.ts',
-  './@ember/routing/route-info.d.ts',
-  './@ember/routing/route.d.ts',
-  './@ember/routing/router-service.d.ts',
-  './@ember/routing/router.d.ts',
-  './@ember/routing/transition.d.ts',
-  './@ember/runloop/index.d.ts',
-  './@ember/service/index.d.ts',
-  './@ember/string/index.d.ts',
-  './@ember/string/lib/string_registry.d.ts',
-  './@ember/template-compilation/index.d.ts',
-  './@ember/template-factory/index.d.ts',
-  './@ember/template/index.d.ts',
-  './@ember/test/adapter.d.ts',
-  './@ember/test/index.d.ts',
-  './@ember/utils/index.d.ts',
-  './@ember/utils/lib/compare.d.ts',
-  './@ember/utils/lib/is_blank.d.ts',
-  './@ember/utils/lib/is_empty.d.ts',
-  './@ember/utils/lib/is_none.d.ts',
-  './@ember/utils/lib/is_present.d.ts',
-  './@ember/utils/lib/is-equal.d.ts',
-  './@ember/utils/lib/type-of.d.ts',
-  './@ember/version/index.d.ts',
-  './@glimmer/tracking/index.d.ts',
-  './@glimmer/tracking/primitives/cache.d.ts',
-  './ember-template-compiler/index.d.ts',
-  './ember-template-compiler/lib/plugins/assert-against-attrs.d.ts',
-  './ember-template-compiler/lib/plugins/assert-against-named-outlets.d.ts',
-  './ember-template-compiler/lib/plugins/assert-input-helper-without-block.d.ts',
-  './ember-template-compiler/lib/plugins/assert-reserved-named-arguments.d.ts',
-  './ember-template-compiler/lib/plugins/assert-splattribute-expression.d.ts',
-  './ember-template-compiler/lib/plugins/index.d.ts',
-  './ember-template-compiler/lib/plugins/transform-action-syntax.d.ts',
-  './ember-template-compiler/lib/plugins/transform-each-in-into-each.d.ts',
-  './ember-template-compiler/lib/plugins/transform-each-track-array.d.ts',
-  './ember-template-compiler/lib/plugins/transform-in-element.d.ts',
-  './ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.d.ts',
-  './ember-template-compiler/lib/plugins/transform-resolutions.d.ts',
-  './ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.d.ts',
-  './ember-template-compiler/lib/plugins/utils.d.ts',
-  './ember-template-compiler/lib/system/bootstrap.d.ts',
-  './ember-template-compiler/lib/system/calculate-location-display.d.ts',
-  './ember-template-compiler/lib/system/compile-options.d.ts',
-  './ember-template-compiler/lib/system/compile.d.ts',
-  './ember-template-compiler/lib/system/dasherize-component-name.d.ts',
-  './ember-template-compiler/lib/system/initializer.d.ts',
-  './ember-template-compiler/lib/system/precompile.d.ts',
-  './ember-testing/index.d.ts',
-  './ember-testing/lib/adapters/adapter.d.ts',
-  './ember-testing/lib/adapters/qunit.d.ts',
-  './ember-testing/lib/ext/application.d.ts',
-  './ember-testing/lib/ext/rsvp.d.ts',
-  './ember-testing/lib/helpers.d.ts',
-  './ember-testing/lib/helpers/and_then.d.ts',
-  './ember-testing/lib/helpers/current_path.d.ts',
-  './ember-testing/lib/helpers/current_route_name.d.ts',
-  './ember-testing/lib/helpers/current_url.d.ts',
-  './ember-testing/lib/helpers/pause_test.d.ts',
-  './ember-testing/lib/helpers/visit.d.ts',
-  './ember-testing/lib/helpers/wait.d.ts',
-  './ember-testing/lib/initializers.d.ts',
-  './ember-testing/lib/setup_for_testing.d.ts',
-  './ember-testing/lib/test.d.ts',
-  './ember-testing/lib/test/adapter.d.ts',
-  './ember-testing/lib/test/helpers.d.ts',
-  './ember-testing/lib/test/on_inject_helpers.d.ts',
-  './ember-testing/lib/test/pending_requests.d.ts',
-  './ember-testing/lib/test/promise.d.ts',
-  './ember-testing/lib/test/run.d.ts',
-  './ember-testing/lib/test/waiters.d.ts',
-  './ember/index.d.ts',
+  '@ember/-internals/bootstrap/index.d.ts',
+  '@ember/-internals/browser-environment/index.d.ts',
+  '@ember/-internals/browser-environment/lib/has-dom.d.ts',
+  '@ember/-internals/container/index.d.ts',
+  '@ember/-internals/container/lib/container.d.ts',
+  '@ember/-internals/container/lib/registry.d.ts',
+  '@ember/-internals/environment/index.d.ts',
+  '@ember/-internals/environment/lib/context.d.ts',
+  '@ember/-internals/environment/lib/env.d.ts',
+  '@ember/-internals/environment/lib/global.d.ts',
+  '@ember/-internals/error-handling/index.d.ts',
+  '@ember/-internals/glimmer/index.d.ts',
+  '@ember/-internals/glimmer/lib/component-managers/curly.d.ts',
+  '@ember/-internals/glimmer/lib/component-managers/mount.d.ts',
+  '@ember/-internals/glimmer/lib/component-managers/outlet.d.ts',
+  '@ember/-internals/glimmer/lib/component-managers/root.d.ts',
+  '@ember/-internals/glimmer/lib/component.d.ts',
+  '@ember/-internals/glimmer/lib/components/abstract-input.d.ts',
+  '@ember/-internals/glimmer/lib/components/input.d.ts',
+  '@ember/-internals/glimmer/lib/components/internal.d.ts',
+  '@ember/-internals/glimmer/lib/components/link-to.d.ts',
+  '@ember/-internals/glimmer/lib/components/textarea.d.ts',
+  '@ember/-internals/glimmer/lib/dom.d.ts',
+  '@ember/-internals/glimmer/lib/environment.d.ts',
+  '@ember/-internals/glimmer/lib/glimmer-component-docs.d.ts',
+  '@ember/-internals/glimmer/lib/glimmer-tracking-docs.d.ts',
+  '@ember/-internals/glimmer/lib/helper.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/-disallow-dynamic-resolution.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/-in-element-null-check.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/-normalize-class.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/-resolve.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/-track-array.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/action.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/array.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/component.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/concat.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/each-in.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/fn.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/get.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/hash.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/helper.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/if-unless.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/internal-helper.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/log.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/modifier.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/mut.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/page-title.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/readonly.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/unbound.d.ts',
+  '@ember/-internals/glimmer/lib/helpers/unique-id.d.ts',
+  '@ember/-internals/glimmer/lib/modifiers/action.d.ts',
+  '@ember/-internals/glimmer/lib/modifiers/internal.d.ts',
+  '@ember/-internals/glimmer/lib/modifiers/on.d.ts',
+  '@ember/-internals/glimmer/lib/renderer.d.ts',
+  '@ember/-internals/glimmer/lib/resolver.d.ts',
+  '@ember/-internals/glimmer/lib/setup-registry.d.ts',
+  '@ember/-internals/glimmer/lib/syntax/in-element.d.ts',
+  '@ember/-internals/glimmer/lib/syntax/let.d.ts',
+  '@ember/-internals/glimmer/lib/syntax/mount.d.ts',
+  '@ember/-internals/glimmer/lib/syntax/outlet.d.ts',
+  '@ember/-internals/glimmer/lib/syntax/utils.d.ts',
+  '@ember/-internals/glimmer/lib/template_registry.d.ts',
+  '@ember/-internals/glimmer/lib/template.d.ts',
+  '@ember/-internals/glimmer/lib/utils/bindings.d.ts',
+  '@ember/-internals/glimmer/lib/utils/curly-component-state-bucket.d.ts',
+  '@ember/-internals/glimmer/lib/utils/debug-render-message.d.ts',
+  '@ember/-internals/glimmer/lib/utils/iterator.d.ts',
+  '@ember/-internals/glimmer/lib/utils/managers.d.ts',
+  '@ember/-internals/glimmer/lib/utils/outlet.d.ts',
+  '@ember/-internals/glimmer/lib/utils/process-args.d.ts',
+  '@ember/-internals/glimmer/lib/utils/serialization-first-node-helpers.d.ts',
+  '@ember/-internals/glimmer/lib/utils/string.d.ts',
+  '@ember/-internals/glimmer/lib/utils/to-bool.d.ts',
+  '@ember/-internals/glimmer/lib/views/outlet.d.ts',
+  '@ember/-internals/meta/index.d.ts',
+  '@ember/-internals/meta/lib/meta.d.ts',
+  '@ember/-internals/metal/index.d.ts',
+  '@ember/-internals/metal/lib/alias.d.ts',
+  '@ember/-internals/metal/lib/array_events.d.ts',
+  '@ember/-internals/metal/lib/array.d.ts',
+  '@ember/-internals/metal/lib/cache.d.ts',
+  '@ember/-internals/metal/lib/cached.d.ts',
+  '@ember/-internals/metal/lib/chain-tags.d.ts',
+  '@ember/-internals/metal/lib/change_event.d.ts',
+  '@ember/-internals/metal/lib/computed_cache.d.ts',
+  '@ember/-internals/metal/lib/computed.d.ts',
+  '@ember/-internals/metal/lib/decorator.d.ts',
+  '@ember/-internals/metal/lib/dependent_keys.d.ts',
+  '@ember/-internals/metal/lib/deprecate_property.d.ts',
+  '@ember/-internals/metal/lib/each_proxy_events.d.ts',
+  '@ember/-internals/metal/lib/events.d.ts',
+  '@ember/-internals/metal/lib/expand_properties.d.ts',
+  '@ember/-internals/metal/lib/get_properties.d.ts',
+  '@ember/-internals/metal/lib/injected_property.d.ts',
+  '@ember/-internals/metal/lib/libraries.d.ts',
+  '@ember/-internals/metal/lib/namespace_search.d.ts',
+  '@ember/-internals/metal/lib/observer.d.ts',
+  '@ember/-internals/metal/lib/path_cache.d.ts',
+  '@ember/-internals/metal/lib/properties.d.ts',
+  '@ember/-internals/metal/lib/property_events.d.ts',
+  '@ember/-internals/metal/lib/property_get.d.ts',
+  '@ember/-internals/metal/lib/property_set.d.ts',
+  '@ember/-internals/metal/lib/set_properties.d.ts',
+  '@ember/-internals/metal/lib/tags.d.ts',
+  '@ember/-internals/metal/lib/tracked.d.ts',
+  '@ember/-internals/overrides/index.d.ts',
+  '@ember/-internals/owner/index.d.ts',
+  '@ember/-internals/routing/index.d.ts',
+  '@ember/-internals/runtime/index.d.ts',
+  '@ember/-internals/runtime/lib/ext/rsvp.d.ts',
+  '@ember/-internals/runtime/lib/mixins/-proxy.d.ts',
+  '@ember/-internals/runtime/lib/mixins/action_handler.d.ts',
+  '@ember/-internals/runtime/lib/mixins/comparable.d.ts',
+  '@ember/-internals/runtime/lib/mixins/container_proxy.d.ts',
+  '@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts',
+  '@ember/-internals/runtime/lib/mixins/target_action_support.d.ts',
+  '@ember/-internals/utils/index.d.ts',
+  '@ember/-internals/utils/lib/cache.d.ts',
+  '@ember/-internals/utils/lib/dictionary.d.ts',
+  '@ember/-internals/utils/lib/ember-array.d.ts',
+  '@ember/-internals/utils/lib/get-debug-name.d.ts',
+  '@ember/-internals/utils/lib/guid.d.ts',
+  '@ember/-internals/utils/lib/inspect.d.ts',
+  '@ember/-internals/utils/lib/intern.d.ts',
+  '@ember/-internals/utils/lib/invoke.d.ts',
+  '@ember/-internals/utils/lib/is_proxy.d.ts',
+  '@ember/-internals/utils/lib/lookup-descriptor.d.ts',
+  '@ember/-internals/utils/lib/make-array.d.ts',
+  '@ember/-internals/utils/lib/mandatory-setter.d.ts',
+  '@ember/-internals/utils/lib/name.d.ts',
+  '@ember/-internals/utils/lib/spec.d.ts',
+  '@ember/-internals/utils/lib/super.d.ts',
+  '@ember/-internals/utils/lib/symbol.d.ts',
+  '@ember/-internals/utils/lib/to-string.d.ts',
+  '@ember/-internals/utils/types.d.ts',
+  '@ember/-internals/views/index.d.ts',
+  '@ember/-internals/views/lib/compat/attrs.d.ts',
+  '@ember/-internals/views/lib/compat/fallback-view-registry.d.ts',
+  '@ember/-internals/views/lib/component_lookup.d.ts',
+  '@ember/-internals/views/lib/mixins/action_support.d.ts',
+  '@ember/-internals/views/lib/mixins/child_views_support.d.ts',
+  '@ember/-internals/views/lib/mixins/class_names_support.d.ts',
+  '@ember/-internals/views/lib/mixins/view_state_support.d.ts',
+  '@ember/-internals/views/lib/mixins/view_support.d.ts',
+  '@ember/-internals/views/lib/system/action_manager.d.ts',
+  '@ember/-internals/views/lib/system/event_dispatcher.d.ts',
+  '@ember/-internals/views/lib/system/utils.d.ts',
+  '@ember/-internals/views/lib/views/core_view.d.ts',
+  '@ember/-internals/views/lib/views/states.d.ts',
+  '@ember/-internals/views/lib/views/states/default.d.ts',
+  '@ember/-internals/views/lib/views/states/destroying.d.ts',
+  '@ember/-internals/views/lib/views/states/has_element.d.ts',
+  '@ember/-internals/views/lib/views/states/in_dom.d.ts',
+  '@ember/-internals/views/lib/views/states/pre_render.d.ts',
+  '@ember/application/index.d.ts',
+  '@ember/application/instance.d.ts',
+  '@ember/application/lib/lazy_load.d.ts',
+  '@ember/application/namespace.d.ts',
+  '@ember/array/index.d.ts',
+  '@ember/array/mutable.d.ts',
+  '@ember/array/proxy.d.ts',
+  '@ember/canary-features/index.d.ts',
+  '@ember/component/helper.d.ts',
+  '@ember/component/index.d.ts',
+  '@ember/component/template-only.d.ts',
+  '@ember/controller/index.d.ts',
+  '@ember/debug/container-debug-adapter.d.ts',
+  '@ember/debug/data-adapter.d.ts',
+  '@ember/debug/index.d.ts',
+  '@ember/debug/lib/capture-render-tree.d.ts',
+  '@ember/debug/lib/deprecate.d.ts',
+  '@ember/debug/lib/handlers.d.ts',
+  '@ember/debug/lib/testing.d.ts',
+  '@ember/debug/lib/warn.d.ts',
+  '@ember/deprecated-features/index.d.ts',
+  '@ember/destroyable/index.d.ts',
+  '@ember/engine/index.d.ts',
+  '@ember/engine/instance.d.ts',
+  '@ember/engine/lib/engine-parent.d.ts',
+  '@ember/enumerable/index.d.ts',
+  '@ember/enumerable/mutable.d.ts',
+  '@ember/error/index.d.ts',
+  '@ember/helper/index.d.ts',
+  '@ember/instrumentation/index.d.ts',
+  '@ember/modifier/index.d.ts',
+  '@ember/object/-internals.d.ts',
+  '@ember/object/compat.d.ts',
+  '@ember/object/computed.d.ts',
+  '@ember/object/core.d.ts',
+  '@ember/object/evented.d.ts',
+  '@ember/object/events.d.ts',
+  '@ember/object/index.d.ts',
+  '@ember/object/internals.d.ts',
+  '@ember/object/lib/computed/computed_macros.d.ts',
+  '@ember/object/lib/computed/reduce_computed_macros.d.ts',
+  '@ember/object/mixin.d.ts',
+  '@ember/object/observable.d.ts',
+  '@ember/object/observers.d.ts',
+  '@ember/object/promise-proxy-mixin.d.ts',
+  '@ember/object/proxy.d.ts',
+  '@ember/owner/index.d.ts',
+  '@ember/polyfills/index.d.ts',
+  '@ember/polyfills/lib/assign.d.ts',
+  '@ember/renderer/index.d.ts',
+  '@ember/routing/-internals.d.ts',
+  '@ember/routing/auto-location.d.ts',
+  '@ember/routing/hash-location.d.ts',
+  '@ember/routing/history-location.d.ts',
+  '@ember/routing/index.d.ts',
+  '@ember/routing/lib/cache.d.ts',
+  '@ember/routing/lib/controller_for.d.ts',
+  '@ember/routing/lib/dsl.d.ts',
+  '@ember/routing/lib/engines.d.ts',
+  '@ember/routing/lib/generate_controller.d.ts',
+  '@ember/routing/lib/location-utils.d.ts',
+  '@ember/routing/lib/query_params.d.ts',
+  '@ember/routing/lib/route-info.d.ts',
+  '@ember/routing/lib/router_state.d.ts',
+  '@ember/routing/lib/routing-service.d.ts',
+  '@ember/routing/lib/transition.d.ts',
+  '@ember/routing/lib/utils.d.ts',
+  '@ember/routing/location.d.ts',
+  '@ember/routing/none-location.d.ts',
+  '@ember/routing/route-info.d.ts',
+  '@ember/routing/route.d.ts',
+  '@ember/routing/router-service.d.ts',
+  '@ember/routing/router.d.ts',
+  '@ember/routing/transition.d.ts',
+  '@ember/runloop/index.d.ts',
+  '@ember/service/index.d.ts',
+  '@ember/string/index.d.ts',
+  '@ember/string/lib/string_registry.d.ts',
+  '@ember/template-compilation/index.d.ts',
+  '@ember/template-factory/index.d.ts',
+  '@ember/template/index.d.ts',
+  '@ember/test/adapter.d.ts',
+  '@ember/test/index.d.ts',
+  '@ember/utils/index.d.ts',
+  '@ember/utils/lib/compare.d.ts',
+  '@ember/utils/lib/is_blank.d.ts',
+  '@ember/utils/lib/is_empty.d.ts',
+  '@ember/utils/lib/is_none.d.ts',
+  '@ember/utils/lib/is_present.d.ts',
+  '@ember/utils/lib/is-equal.d.ts',
+  '@ember/utils/lib/type-of.d.ts',
+  '@ember/version/index.d.ts',
+  '@glimmer/tracking/index.d.ts',
+  '@glimmer/tracking/primitives/cache.d.ts',
+  'ember-template-compiler/index.d.ts',
+  'ember-template-compiler/lib/plugins/assert-against-attrs.d.ts',
+  'ember-template-compiler/lib/plugins/assert-against-named-outlets.d.ts',
+  'ember-template-compiler/lib/plugins/assert-input-helper-without-block.d.ts',
+  'ember-template-compiler/lib/plugins/assert-reserved-named-arguments.d.ts',
+  'ember-template-compiler/lib/plugins/assert-splattribute-expression.d.ts',
+  'ember-template-compiler/lib/plugins/index.d.ts',
+  'ember-template-compiler/lib/plugins/transform-action-syntax.d.ts',
+  'ember-template-compiler/lib/plugins/transform-each-in-into-each.d.ts',
+  'ember-template-compiler/lib/plugins/transform-each-track-array.d.ts',
+  'ember-template-compiler/lib/plugins/transform-in-element.d.ts',
+  'ember-template-compiler/lib/plugins/transform-quoted-bindings-into-just-bindings.d.ts',
+  'ember-template-compiler/lib/plugins/transform-resolutions.d.ts',
+  'ember-template-compiler/lib/plugins/transform-wrap-mount-and-outlet.d.ts',
+  'ember-template-compiler/lib/plugins/utils.d.ts',
+  'ember-template-compiler/lib/system/bootstrap.d.ts',
+  'ember-template-compiler/lib/system/calculate-location-display.d.ts',
+  'ember-template-compiler/lib/system/compile-options.d.ts',
+  'ember-template-compiler/lib/system/compile.d.ts',
+  'ember-template-compiler/lib/system/dasherize-component-name.d.ts',
+  'ember-template-compiler/lib/system/initializer.d.ts',
+  'ember-template-compiler/lib/system/precompile.d.ts',
+  'ember-testing/index.d.ts',
+  'ember-testing/lib/adapters/adapter.d.ts',
+  'ember-testing/lib/adapters/qunit.d.ts',
+  'ember-testing/lib/ext/application.d.ts',
+  'ember-testing/lib/ext/rsvp.d.ts',
+  'ember-testing/lib/helpers.d.ts',
+  'ember-testing/lib/helpers/and_then.d.ts',
+  'ember-testing/lib/helpers/current_path.d.ts',
+  'ember-testing/lib/helpers/current_route_name.d.ts',
+  'ember-testing/lib/helpers/current_url.d.ts',
+  'ember-testing/lib/helpers/pause_test.d.ts',
+  'ember-testing/lib/helpers/visit.d.ts',
+  'ember-testing/lib/helpers/wait.d.ts',
+  'ember-testing/lib/initializers.d.ts',
+  'ember-testing/lib/setup_for_testing.d.ts',
+  'ember-testing/lib/test.d.ts',
+  'ember-testing/lib/test/adapter.d.ts',
+  'ember-testing/lib/test/helpers.d.ts',
+  'ember-testing/lib/test/on_inject_helpers.d.ts',
+  'ember-testing/lib/test/pending_requests.d.ts',
+  'ember-testing/lib/test/promise.d.ts',
+  'ember-testing/lib/test/run.d.ts',
+  'ember-testing/lib/test/waiters.d.ts',
+  'ember/index.d.ts',
 ];
 
 const MODULES_PLACEHOLDER = '~~~MODULES GO HERE~~~';
@@ -410,8 +413,19 @@ async function main() {
   }
 
   let sideEffectModules = moduleNames
-    .filter((module) => !PREVIEW_MODULES.includes(module))
-    .map((moduleName) => `import './${moduleName}';`)
+    .filter((moduleName) => !PREVIEW_MODULES.includes(moduleName))
+    .map((moduleName) => {
+      // We need to import "package root" types as such, *not* via the actual
+      // module which provides them, or TS does not see them correctly via the
+      // side effect imports, so transform them accordingly:
+      // `@ember/owner/index.d.ts` -> `@ember/owner`
+      let moduleOrPackagePath = moduleName.replace(/\/index.d.ts$/, '');
+
+      // Then create a relative path *to* the path on disk so that the
+      // side-effect import is e.g. `import './@ember/owner';`, which makes it
+      // resolve the actual local file, *not* go looking for some other package.
+      return `import './${moduleOrPackagePath}';`;
+    })
     .join('\n');
 
   let stableIndexDTsContents = BASE_INDEX_D_TS.replace(MODULES_PLACEHOLDER, sideEffectModules);
@@ -438,8 +452,16 @@ function wrapInDeclareModule(moduleName) {
 
   let moduleNameForDeclaration = moduleName.replace('/index.d.ts', '');
 
+  // This is a horrible nightmare of a hack; in a later PR I'm going to just
+  // replace all of this by going ahead and using recast or such. As annoying as
+  // that will be, it will be *way* more reliable.
   let string = new MagicString(contents);
-  string.indent('  ').prepend(`declare module '${moduleNameForDeclaration}' {\n`).append('}\n');
+  string
+    .replaceAll(/^export declare /gm, 'export ') // g for global, m for multiline
+    .replaceAll(/^declare /gm, '') // g for global, m for multiline
+    .indent('  ')
+    .prepend(`declare module '${moduleNameForDeclaration}' {\n`)
+    .append('}\n');
 
   try {
     fs.writeFileSync(modulePath, string.toString());

From 3ca98347b0a6e6ff154144106c4b47f232ec2366 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 15:47:49 -0700
Subject: [PATCH 1291/1405] Introduce stable types for `@ember/owner`

- Remove `@ember/-internals/owner` and `@ember/owner` from the list of
  excluded preview types in the types publishing script, so they now
  get emitted correctly into `types/stable`.

- Remove `@ember/owner` from the preview types and put it in the stable
  types instead, so users don't get conflicting type dependencies.

- Internally in `@ember/owner`, use absolute package paths, not
  relative. For referencing other (even internal) packages, it's
  important that we *not* use relative paths, so that (a) the published
  types work when wrapped in `declare module` statements but also (b)
  we have clearer boundaries for them, which will unlock further
  improvements to this infrastructure in the future.
---
 packages/@ember/owner/index.ts           |   4 +-
 type-tests/stable/@ember/owner-tests.ts  | 223 ++++++++++++
 type-tests/stable/index.d.ts             |   2 +
 type-tests/stable/tsconfig.json          |   3 +
 types/preview/@ember/owner/index.d.ts    | 423 -----------------------
 types/preview/@ember/owner/tsconfig.json |   3 -
 types/preview/index.d.ts                 |   2 -
 types/publish.mjs                        |   6 +-
 8 files changed, 232 insertions(+), 434 deletions(-)
 create mode 100644 type-tests/stable/@ember/owner-tests.ts
 create mode 100644 type-tests/stable/index.d.ts
 create mode 100644 type-tests/stable/tsconfig.json
 delete mode 100644 types/preview/@ember/owner/index.d.ts
 delete mode 100644 types/preview/@ember/owner/tsconfig.json

diff --git a/packages/@ember/owner/index.ts b/packages/@ember/owner/index.ts
index 2751e105a4b..25f6d58efbc 100644
--- a/packages/@ember/owner/index.ts
+++ b/packages/@ember/owner/index.ts
@@ -33,7 +33,7 @@
 // We need to provide a narrower public interface to `getOwner` so that we only
 // expose the `Owner` type, *not* our richer `InternalOwner` type and its
 // various bits of private API.
-import Owner, { getOwner as internalGetOwner } from '../-internals/owner';
+import Owner, { getOwner as internalGetOwner } from '@ember/-internals/owner';
 
 // NOTE: this documentation appears here instead of at the definition site so
 // it can appear correctly in both API docs and for TS, while providing a richer
@@ -99,4 +99,4 @@ export {
   KnownForTypeResult,
   Resolver,
   DIRegistry,
-} from '../-internals/owner';
+} from '@ember/-internals/owner';
diff --git a/type-tests/stable/@ember/owner-tests.ts b/type-tests/stable/@ember/owner-tests.ts
new file mode 100644
index 00000000000..532a1455bf4
--- /dev/null
+++ b/type-tests/stable/@ember/owner-tests.ts
@@ -0,0 +1,223 @@
+import Owner, {
+  Factory,
+  FactoryManager,
+  FullName,
+  RegisterOptions,
+  Resolver,
+  KnownForTypeResult,
+  getOwner,
+  setOwner,
+} from '@ember/owner';
+import Component from '@glimmer/component';
+import { expectTypeOf } from 'expect-type';
+import {
+  getOwner as getOwnerApplication,
+  setOwner as setOwnerApplication,
+} from '@ember/application';
+
+expectTypeOf(getOwnerApplication).toEqualTypeOf(getOwner);
+expectTypeOf(setOwnerApplication).toEqualTypeOf(setOwner);
+
+// Just a class we can construct in the Factory and FactoryManager tests
+declare class ConstructThis {
+  hasProps: boolean;
+}
+
+// ----- RegisterOptions ----- //
+declare let regOptionsA: RegisterOptions;
+expectTypeOf(regOptionsA.instantiate).toEqualTypeOf<boolean | undefined>();
+expectTypeOf(regOptionsA.singleton).toEqualTypeOf<boolean | undefined>();
+
+// ----- Factory ----- //
+// This gives us coverage for the cases where you are *casting*.
+declare let aFactory: Factory<ConstructThis>;
+
+aFactory.create();
+aFactory.create({});
+aFactory.create({
+  hasProps: true,
+});
+aFactory.create({
+  hasProps: false,
+});
+
+// NOTE: it would be nice if these could be rejected by way of EPC, but alas: it
+// cannot, because the public contract for `create` allows implementors to
+// define their `create` config object basically however they like. :-/
+aFactory.create({ unrelatedNonsense: 'yep yep yep' });
+aFactory.create({ hasProps: true, unrelatedNonsense: 'yep yep yep' });
+
+// But this should be legal.
+const goodPojo = { hasProps: true, unrelatedNonsense: 'also true' };
+aFactory.create(goodPojo);
+
+// This should also be rejected, though for *type error* reasons, not EPC; alas,
+// it cannot, for the same reason.
+const badPojo = { hasProps: 'huzzah', unrelatedNonsense: 'also true' };
+aFactory.create(badPojo);
+
+// ----- FactoryManager ----- //
+declare let aFactoryManager: FactoryManager<ConstructThis>;
+expectTypeOf(aFactoryManager.class).toEqualTypeOf<Factory<ConstructThis>>();
+expectTypeOf(aFactoryManager.create({})).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: true })).toEqualTypeOf<ConstructThis>();
+expectTypeOf(aFactoryManager.create({ hasProps: false })).toEqualTypeOf<ConstructThis>();
+
+// Likewise with these.
+aFactoryManager.create({ otherStuff: 'nope' });
+aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
+expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
+aFactoryManager.create(badPojo);
+
+// ----- Resolver ----- //
+declare let resolver: Resolver;
+expectTypeOf<Resolver['normalize']>().toEqualTypeOf<
+  ((fullName: FullName) => FullName) | undefined
+>();
+expectTypeOf<Resolver['lookupDescription']>().toEqualTypeOf<
+  ((fullName: FullName) => string) | undefined
+>();
+expectTypeOf(resolver.resolve('random:some-name')).toEqualTypeOf<
+  object | Factory<object> | undefined
+>();
+const knownForFoo = resolver.knownForType?.('foo');
+expectTypeOf(knownForFoo).toEqualTypeOf<KnownForTypeResult<'foo'> | undefined>();
+expectTypeOf(knownForFoo?.['foo:bar']).toEqualTypeOf<boolean | undefined>();
+// @ts-expect-error -- there is no `blah` on `knownForFoo`, *only* `foo`.
+knownForFoo?.blah;
+
+// This one is last so it can reuse the bits from above!
+// ----- Owner ----- //
+declare let owner: Owner;
+
+// @ts-expect-error
+owner.lookup();
+expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
+// @ts-expect-error
+owner.lookup('non-namespace-string');
+expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
+
+// Arbitrary registration patterns work, as here.
+declare module '@ember/owner' {
+  export interface DIRegistry {
+    etc: {
+      'my-type-test': ConstructThis;
+    };
+  }
+}
+
+expectTypeOf(owner.lookup('etc:my-type-test')).toEqualTypeOf<ConstructThis>();
+
+expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { instantiate: false })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: true })).toEqualTypeOf<void>();
+expectTypeOf(owner.register('type:name', aFactory, { singleton: false })).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: true, singleton: false })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: true })
+).toEqualTypeOf<void>();
+expectTypeOf(
+  owner.register('type:name', aFactory, { instantiate: false, singleton: false })
+).toEqualTypeOf<void>();
+// @ts-expect-error
+owner.register('non-namespace-string', aFactory);
+expectTypeOf(owner.register('namespace@type:name', aFactory)).toEqualTypeOf<void>();
+
+expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<object> | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<object | undefined>();
+expectTypeOf(owner.factoryFor('type:name')?.create({ anythingGoes: true })).toEqualTypeOf<
+  object | undefined
+>();
+// @ts-expect-error
+owner.factoryFor('non-namespace-string');
+expectTypeOf(owner.factoryFor('namespace@type:name')).toEqualTypeOf<
+  FactoryManager<object> | undefined
+>();
+
+// Tests deal with the fact that string literals are a special case! `let`
+// bindings will accordingly not "just work" as a result. The separate
+// assignments both satisfy the linter and show why it matters.
+let aName;
+aName = 'type:name';
+// @ts-expect-error
+owner.lookup(aName);
+
+let aTypedName: FullName;
+aTypedName = 'type:name';
+expectTypeOf(owner.lookup(aTypedName)).toBeUnknown();
+
+// Nor will callbacks work "out of the box". But they can work if they have the
+// correct type.
+declare const justStrings: string[];
+// @ts-expect-error
+justStrings.map((aString) => owner.lookup(aString));
+declare let typedStrings: FullName[];
+typedStrings.map((aString) => owner.lookup(aString));
+
+// Also make sure it keeps working with const bindings
+const aConstName = 'type:name';
+expectTypeOf(owner.lookup(aConstName)).toBeUnknown();
+
+// Check handling with Glimmer components carrying a Signature: they should
+// properly resolve to `Owner`, *not* `Owner | undefined`.
+interface Sig<T> {
+  Args: {
+    name: string;
+    age: number;
+    extra: T;
+  };
+  Element: HTMLParagraphElement;
+  Blocks: {
+    default: [greeting: string];
+    extra: [T];
+  };
+}
+
+class ExampleComponent<T> extends Component<Sig<T>> {
+  checkThis() {
+    expectTypeOf(getOwner(this)).toEqualTypeOf<Owner | undefined>();
+  }
+}
+
+declare let example: ExampleComponent<string>;
+expectTypeOf(getOwner(example)).toEqualTypeOf<Owner | undefined>();
+
+// ----- Minimal further coverage for POJOs ----- //
+// `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
+const Creatable = {
+  hasProps: true,
+};
+
+const pojoFactory: Factory<typeof Creatable> = {
+  // If you want *real* safety here, alas: you cannot have it. The public
+  // contract for `create` allows implementors to define their `create` config
+  // object basically however they like. As a result, this is the safest version
+  // possible: Making it be `Partial<Thing>` is *compatible* with `object`, and
+  // requires full checking *inside* the function body. It does not, alas, give
+  // any safety *outside* the class. A future rationalization of this would be
+  // very welcome.
+  create(initialValues?: Partial<typeof Creatable>) {
+    const instance = Creatable;
+    if (initialValues) {
+      if (initialValues.hasProps) {
+        Object.defineProperty(instance, 'hasProps', {
+          value: initialValues.hasProps,
+          enumerable: true,
+          writable: true,
+        });
+      }
+    }
+    return instance;
+  },
+};
+
+expectTypeOf(pojoFactory.create()).toEqualTypeOf<{ hasProps: boolean }>();
diff --git a/type-tests/stable/index.d.ts b/type-tests/stable/index.d.ts
new file mode 100644
index 00000000000..470164f7ef1
--- /dev/null
+++ b/type-tests/stable/index.d.ts
@@ -0,0 +1,2 @@
+// This is equivalent to do `import 'ember-source/types';`.
+import '../../types/stable';
diff --git a/type-tests/stable/tsconfig.json b/type-tests/stable/tsconfig.json
new file mode 100644
index 00000000000..a205f6579ab
--- /dev/null
+++ b/type-tests/stable/tsconfig.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@tsconfig/ember/tsconfig.json",
+}
diff --git a/types/preview/@ember/owner/index.d.ts b/types/preview/@ember/owner/index.d.ts
deleted file mode 100644
index 559a31301b2..00000000000
--- a/types/preview/@ember/owner/index.d.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-declare module '@ember/owner' {
-  /**
-   * The name for a factory consists of a namespace and the name of a specific
-   * type within that namespace, like `'service:session'`.
-   */
-  export type FullName<
-    Type extends string = string,
-    Name extends string = string
-  > = `${Type}:${Name}`;
-
-  /**
-   * A type registry for the DI system, which other participants in the DI system
-   * can register themselves into with declaration merging. The contract for this
-   * type is that its keys are the `Type` from a `FullName`, and each value for a
-   * `Type` is another registry whose keys are the `Name` from a `FullName`. The
-   * mechanic for providing a registry is [declaration merging][handbook].
-   *
-   * [handbook]: https://www.typescriptlang.org/docs/handbook/declaration-merging.html
-   *
-   * For example, Ember's `Service` class uses this :
-   *
-   * ```ts
-   * export default class Service extends EmberObject {}
-   *
-   * // For concrete singleton classes to be merged into.
-   * interface Registry extends Record<string, Service> {}
-   *
-   * declare module '@ember/owner' {
-   *   service: Registry;
-   * }
-   * ```
-   *
-   * Declarations of services can then include the registry:
-   *
-   * ```ts
-   * import Service from '@ember/service';
-   *
-   * export default class Session extends Service {
-   *   login(username: string, password: string) {
-   *     // ...
-   *   }
-   * }
-   *
-   * declare module '@ember/service' {
-   *   interface Registry {
-   *     session: Session;
-   *   }
-   * }
-   * ```
-   *
-   * Then users of the `Owner` API will be able to reliably do things like this:
-   *
-   * ```ts
-   * getOwner(this)?.lookup('service:session').login("hello", "1234abcd");
-   * ```
-   */
-  export interface DIRegistry extends Record<string, Record<string, unknown>> {}
-
-  // Convenience utilities for pulling a specific factory manager off `DIRegistry`
-  // if one exists, or falling back to the default definition otherwise.
-  type ResolveFactoryManager<
-    Type extends ValidType,
-    Name extends ValidName<Type>
-  > = DIRegistry[Type][Name] extends object
-    ? FactoryManager<DIRegistry[Type][Name]>
-    : FactoryManager<object> | undefined;
-
-  type ResolveFactory<
-    Type extends ValidType,
-    Name extends ValidName<Type>
-  > = DIRegistry[Type][Name] extends object
-    ? Factory<DIRegistry[Type][Name]>
-    : Factory<object> | object | undefined;
-
-  // This type is shared between `Owner` and `RegistryProxy
-  interface BasicRegistry {
-    /**
-      Registers a factory that can be used for dependency injection (with
-      `inject`) or for service lookup. Each factory is registered with
-      a full name including two parts: `type:name`.
-
-      A simple example:
-
-      ```javascript
-      import Application from '@ember/application';
-      import EmberObject from '@ember/object';
-
-      let App = Application.create();
-
-      App.Orange = EmberObject.extend();
-      App.register('fruit:favorite', App.Orange);
-      ```
-
-      Ember will resolve factories from the `App` namespace automatically.
-      For example `App.CarsController` will be discovered and returned if
-      an application requests `controller:cars`.
-
-      An example of registering a controller with a non-standard name:
-
-      ```javascript
-      import Application from '@ember/application';
-      import Controller from '@ember/controller';
-
-      let App = Application.create();
-      let Session = Controller.extend();
-
-      App.register('controller:session', Session);
-
-      // The Session controller can now be treated like a normal controller,
-      // despite its non-standard name.
-      App.ApplicationController = Controller.extend({
-        needs: ['session']
-      });
-      ```
-
-      Registered factories are **instantiated** by having `create`
-      called on them. Additionally they are **singletons**, each time
-      they are looked up they return the same instance.
-
-      Some examples modifying that default behavior:
-
-      ```javascript
-      import Application from '@ember/application';
-      import EmberObject from '@ember/object';
-
-      let App = Application.create();
-
-      App.Person = EmberObject.extend();
-      App.Orange = EmberObject.extend();
-      App.Email = EmberObject.extend();
-      App.session = EmberObject.create();
-
-      App.register('model:user', App.Person, { singleton: false });
-      App.register('fruit:favorite', App.Orange);
-      App.register('communication:main', App.Email, { singleton: false });
-      App.register('session', App.session, { instantiate: false });
-      ```
-
-      @method register
-      @param  fullName {String} type:name (e.g., 'model:user')
-      @param  factory {any} (e.g., App.Person)
-      @param  options {Object} (optional) disable instantiation or singleton usage
-      @public
-      */
-    // Dear future maintainer: yes, `Factory<object> | object` is an exceedingly
-    // weird type here. We actually allow more or less *anything* to be passed
-    // here. In the future, we may possibly be able to update this to actually
-    // take advantage of the `FullName` here to require that the registered
-    // factory and corresponding options do the right thing (passing an *actual*
-    // factory, not needing `create` if `options.instantiate` is `false`, etc.)
-    // but doing so will require rationalizing Ember's own internals and may need
-    // a full Ember RFC.
-    register(
-      fullName: FullName,
-      factory: Factory<object> | object,
-      options?: RegisterOptions
-    ): void;
-  }
-
-  type ValidType = keyof DIRegistry & string;
-  type ValidName<Type extends ValidType> = keyof DIRegistry[Type] & string;
-
-  interface BasicContainer {
-    /**
-     * Given a {@linkcode FullName} return a corresponding instance.
-     */
-    lookup<Type extends ValidType, Name extends ValidName<Type>>(
-      fullName: FullName<Type, Name>,
-      options?: RegisterOptions
-    ): DIRegistry[Type][Name];
-
-    /**
-     * Given a fullName of the form `'type:name'`, like `'route:application'`,
-     * return a corresponding factory manager.
-     *
-     * Any instances created via the factory's `.create()` method must be
-     * destroyed manually by the caller of `.create()`. Typically, this is done
-     * during the creating objects own `destroy` or `willDestroy` methods.
-     */
-    factoryFor<Type extends ValidType, Name extends ValidName<Type>>(
-      fullName: FullName<Type, Name>
-    ): ResolveFactoryManager<Type, Name>;
-  }
-
-  /**
-   * Framework objects in an Ember application (components, services, routes,
-   * etc.) are created via a factory and dependency injection system. Each of
-   * these objects is the responsibility of an "owner", which handles its
-   * instantiation and manages its lifetime.
-   */
-  export default interface Owner extends BasicRegistry, BasicContainer {}
-
-  export interface RegisterOptions {
-    instantiate?: boolean | undefined;
-    singleton?: boolean | undefined;
-  }
-
-  /**
-   * Registered factories are instantiated by having create called on them.
-   * Additionally they are singletons by default, so each time they are looked up
-   * they return the same instance.
-   *
-   * However, that behavior can be modified with the `instantiate` and `singleton`
-   * options to the {@linkcode Owner.register} method.
-   */
-  export interface Factory<T> {
-    // NOTE: this does not check against the types of the target object in any
-    // way, unfortunately. However, we actually *cannot* constrain it further than
-    // this without going down a *very* deep rabbit hole (see the historic types
-    // for `.create()` on DefinitelyTyped if you're curious), because we need (for
-    // historical reasons) to support classes which implement this contract to be
-    // able to provide a *narrower* interface than "exactly the public fields on
-    // the class" while still falling back to the "exactly the public fields on
-    // the class" for the general case. :sigh:
-    /**
-     * A function that will create an instance of the class with any
-     * dependencies injected.
-     *
-     * @param initialValues Any values to set on an instance of the class
-     */
-    create(initialValues?: object): T;
-  }
-
-  /**
-   * A manager which can be used for introspection of the factory's class or for
-   * the creation of factory instances with initial properties. The manager is an
-   * object with the following properties:
-   *
-   * - `class` - The registered or resolved class.
-   * - `create` - A function that will create an instance of the class with any
-   *   dependencies injected.
-   *
-   * @note `FactoryManager` is *not* user-constructible; the only legal way to get
-   *   a `FactoryManager` is via {@linkcode Owner.factoryFor}.
-   */
-  export interface FactoryManager<T> extends Factory<T> {
-    /** The registered or resolved class. */
-    readonly class: Factory<T>;
-  }
-
-  /**
-   * A record mapping all known items of a given type: if the item is known it
-   * will be `true`; otherwise it will be `false` or `undefined`.
-   */
-  export type KnownForTypeResult<Type extends string> = {
-    [FullName in `${Type}:${string}`]: boolean | undefined;
-  };
-
-  /**
-   * A `Resolver` is the mechanism responsible for looking up code in your
-   * application and converting its naming conventions into the actual classes,
-   * functions, and templates that Ember needs to resolve its dependencies, for
-   * example, what template to render for a given route. It is a system that helps
-   * the app resolve the lookup of JavaScript modules agnostic of what kind of
-   * module system is used, which can be AMD, CommonJS or just plain globals. It
-   * is used to lookup routes, models, components, templates, or anything that is
-   * used in your Ember app.
-   *
-   * This interface represents the contract a custom resolver must implement. Most
-   * apps never need to think about this: the application's resolver is supplied by
-   * `ember-resolver` in the default blueprint.
-   */
-  export interface Resolver {
-    resolve: <Type extends ValidType, Name extends ValidName<Type>>(
-      name: FullName<Type, Name>
-    ) => ResolveFactory<Type, Name>;
-    knownForType?: <Type extends string>(type: Type) => KnownForTypeResult<Type>;
-    lookupDescription?: (fullName: FullName) => string;
-    makeToString?: (factory: Factory<object>, fullName: FullName) => string;
-    normalize?: (fullName: FullName) => FullName;
-  }
-
-  /**
-   * Framework objects in an Ember application (components, services, routes, etc.)
-   * are created via a factory and dependency injection system. Each of these
-   * objects is the responsibility of an "owner", which handled its
-   * instantiation and manages its lifetime.
-   *
-   * `getOwner` fetches the owner object responsible for an instance. This can
-   * be used to lookup or resolve other class instances, or register new factories
-   * into the owner.
-   *
-   * For example, this component dynamically looks up a service based on the
-   * `audioType` passed as an argument:
-   *
-   * ```app/components/play-audio.js
-   * import Component from '@glimmer/component';
-   * import { action } from '@ember/object';
-   * import { getOwner } from '@ember/application';
-   *
-   * // Usage:
-   * //
-   * //   <PlayAudio @audioType={{@model.audioType}} @audioFile={{@model.file}}/>
-   * //
-   * export default class PlayAudio extends Component {
-   *   get audioService() {
-   *     return getOwner(this)?.lookup(`service:${this.args.audioType}`);
-   *   }
-   *
-   *   @action
-   *   onPlay() {
-   *     this.audioService?.play(this.args.audioFile);
-   *   }
-   * }
-   * ```
-   */
-  export function getOwner(object: object): Owner | undefined;
-
-  /**
-   * `setOwner` forces a new owner on a given object instance. This is primarily
-   * useful in some testing cases.
-   *
-   * @param object An object instance.
-   * @param owner The new owner object of the object instance.
-   */
-  export function setOwner(object: object, owner: Owner): void;
-
-  export interface ContainerProxy extends BasicContainer {
-    /**
-     * Returns an object that can be used to provide an owner to a
-     * manually created instance.
-     *
-     * Example:
-     *
-     * ```
-     * import { getOwner } from '@ember/application';
-     *
-     * let owner = getOwner(this);
-     *
-     * User.create(
-     *   owner.ownerInjection(),
-     *   { username: 'rwjblue' }
-     * )
-     * ```
-     */
-    ownerInjection(): object;
-  }
-
-  export interface RegistryProxy extends BasicRegistry {
-    /**
-     * Given a fullName return the corresponding factory.
-     */
-    resolveRegistration(fullName: FullName): Factory<object> | object | undefined;
-
-    /**
-     * Unregister a factory.
-     *
-     *
-     * ```javascript
-     * import Application from '@ember/application';
-     * import EmberObject from '@ember/object';
-     * let App = Application.create();
-     * let User = EmberObject.extend();
-     * App.register('model:user', User);
-     *
-     * App.resolveRegistration('model:user').create() instanceof User //=> true
-     *
-     * App.unregister('model:user')
-     * App.resolveRegistration('model:user') === undefined //=> true
-     * ```
-     */
-    unregister(fullName: FullName): void;
-
-    /**
-     * Check if a factory is registered.
-     */
-    hasRegistration(fullName: FullName): boolean;
-
-    /**
-     * Return a specific registered option for a particular factory.
-     */
-    registeredOption<K extends keyof RegisterOptions>(
-      fullName: FullName,
-      optionName: K
-    ): RegisterOptions[K] | undefined;
-
-    /**
-     * Register options for a particular factory.
-     */
-    registerOptions(fullName: FullName, options: RegisterOptions): void;
-
-    /**
-     * Return registered options for a particular factory.
-     */
-    registeredOptions(fullName: FullName): RegisterOptions | undefined;
-
-    /**
-     * Allow registering options for all factories of a type.
-     *
-     * ```javascript
-     * import Application from '@ember/application';
-     *
-     * let App = Application.create();
-     * let appInstance = App.buildInstance();
-     *
-     * // if all of type `connection` must not be singletons
-     * appInstance.registerOptionsForType('connection', { singleton: false });
-     *
-     * appInstance.register('connection:twitter', TwitterConnection);
-     * appInstance.register('connection:facebook', FacebookConnection);
-     *
-     * let twitter = appInstance.lookup('connection:twitter');
-     * let twitter2 = appInstance.lookup('connection:twitter');
-     *
-     * twitter === twitter2; // => false
-     *
-     * let facebook = appInstance.lookup('connection:facebook');
-     * let facebook2 = appInstance.lookup('connection:facebook');
-     *
-     * facebook === facebook2; // => false
-     * ```
-     */
-    registerOptionsForType(type: string, options: RegisterOptions): void;
-
-    /**
-     * Return the registered options for all factories of a type.
-     */
-    registeredOptionsForType(type: string): RegisterOptions | undefined;
-  }
-
-  // Don't export things unless we *intend* to.
-  export {};
-}
diff --git a/types/preview/@ember/owner/tsconfig.json b/types/preview/@ember/owner/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/owner/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 757259080c9..bf1fb1411b1 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -91,8 +91,6 @@ import './@ember/object/observers';
 import './@ember/object/promise-proxy-mixin';
 import './@ember/object/proxy';
 
-import './@ember/owner';
-
 import './@ember/polyfills';
 import './@ember/polyfills/types';
 
diff --git a/types/publish.mjs b/types/publish.mjs
index 86fd2666f96..25478f82cc3 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -149,7 +149,6 @@ const PREVIEW_MODULES = [
   '@ember/-internals/metal/lib/tags.d.ts',
   '@ember/-internals/metal/lib/tracked.d.ts',
   '@ember/-internals/overrides/index.d.ts',
-  '@ember/-internals/owner/index.d.ts',
   '@ember/-internals/routing/index.d.ts',
   '@ember/-internals/runtime/index.d.ts',
   '@ember/-internals/runtime/lib/ext/rsvp.d.ts',
@@ -243,7 +242,6 @@ const PREVIEW_MODULES = [
   '@ember/object/observers.d.ts',
   '@ember/object/promise-proxy-mixin.d.ts',
   '@ember/object/proxy.d.ts',
-  '@ember/owner/index.d.ts',
   '@ember/polyfills/index.d.ts',
   '@ember/polyfills/lib/assign.d.ts',
   '@ember/renderer/index.d.ts',
@@ -457,8 +455,8 @@ function wrapInDeclareModule(moduleName) {
   // that will be, it will be *way* more reliable.
   let string = new MagicString(contents);
   string
-    .replaceAll(/^export declare /gm, 'export ') // g for global, m for multiline
-    .replaceAll(/^declare /gm, '') // g for global, m for multiline
+    .replace(/^export declare /gm, 'export ') // g for global, m for multiline
+    .replace(/^declare /gm, '') // g for global, m for multiline
     .indent('  ')
     .prepend(`declare module '${moduleNameForDeclaration}' {\n`)
     .append('}\n');

From ed4a6e97d853df921c01f96d6b5a2e57641f7e02 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 14:14:00 -0700
Subject: [PATCH 1292/1405] Move type tests for deprecated `(get|set)Owner`

These really belong in the `@ember/application` re-export, not in the
tests for `@ember/owner` itself, which should have no knowledge of the
existence of `@ember/application` (but vice versa is fine).
---
 type-tests/preview/@ember/application-test/index.ts | 4 ++++
 type-tests/preview/@ember/owner-tests.ts            | 7 -------
 type-tests/stable/@ember/owner-tests.ts             | 7 -------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/type-tests/preview/@ember/application-test/index.ts b/type-tests/preview/@ember/application-test/index.ts
index 04973e7f309..78ea2bf2c8d 100644
--- a/type-tests/preview/@ember/application-test/index.ts
+++ b/type-tests/preview/@ember/application-test/index.ts
@@ -4,6 +4,10 @@ import Owner from '@ember/owner';
 import ApplicationInstance from '@ember/application/instance';
 import Service from '@ember/service';
 import { expectTypeOf } from 'expect-type';
+import { getOwner as getOwnerProper, setOwner as setOwnerProper } from '@ember/owner';
+
+expectTypeOf(getOwner).toEqualTypeOf(getOwnerProper);
+expectTypeOf(setOwner).toEqualTypeOf(setOwnerProper);
 
 expectTypeOf(getOwner({})).toEqualTypeOf<Owner | undefined>();
 
diff --git a/type-tests/preview/@ember/owner-tests.ts b/type-tests/preview/@ember/owner-tests.ts
index 532a1455bf4..e210bfde9ce 100644
--- a/type-tests/preview/@ember/owner-tests.ts
+++ b/type-tests/preview/@ember/owner-tests.ts
@@ -10,13 +10,6 @@ import Owner, {
 } from '@ember/owner';
 import Component from '@glimmer/component';
 import { expectTypeOf } from 'expect-type';
-import {
-  getOwner as getOwnerApplication,
-  setOwner as setOwnerApplication,
-} from '@ember/application';
-
-expectTypeOf(getOwnerApplication).toEqualTypeOf(getOwner);
-expectTypeOf(setOwnerApplication).toEqualTypeOf(setOwner);
 
 // Just a class we can construct in the Factory and FactoryManager tests
 declare class ConstructThis {
diff --git a/type-tests/stable/@ember/owner-tests.ts b/type-tests/stable/@ember/owner-tests.ts
index 532a1455bf4..e210bfde9ce 100644
--- a/type-tests/stable/@ember/owner-tests.ts
+++ b/type-tests/stable/@ember/owner-tests.ts
@@ -10,13 +10,6 @@ import Owner, {
 } from '@ember/owner';
 import Component from '@glimmer/component';
 import { expectTypeOf } from 'expect-type';
-import {
-  getOwner as getOwnerApplication,
-  setOwner as setOwnerApplication,
-} from '@ember/application';
-
-expectTypeOf(getOwnerApplication).toEqualTypeOf(getOwner);
-expectTypeOf(setOwnerApplication).toEqualTypeOf(setOwner);
 
 // Just a class we can construct in the Factory and FactoryManager tests
 declare class ConstructThis {

From 74c289509e15da577773d4ddc1674d5512f91d25 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 17:25:13 -0700
Subject: [PATCH 1293/1405] Use shared type tests for preview and stable types

This guarantees that we will be testing exactly what our consumers use,
with the only difference being the specific import paths used to expose
the side effect modules. It also keeps the type tests from diverging
between the two sets of types.

Previously, following the DefinitelyTyped approach, all the preview
type modules had their own `tsconfig.json`, but this actually made them
fail to interoperate with stable types, and this approach *only* works
if they work together. Removing those means they operate as a single
coherent set of type definitions with the stable types, distinguished
*only* by the way they are authored.
---
 package.json                                  |   5 +-
 .../application-test/application-instance.ts  |   0
 .../@ember/application-test/application.ts    |   0
 .../@ember/application-test/index.ts          |   0
 .../@ember/array-test/array-proxy.ts          |   0
 .../{preview => }/@ember/array-test/array.ts  |   0
 .../@ember/component-test/built-ins.ts        |   0
 .../@ember/component-test/capabilities.ts     |   0
 .../@ember/component-test/component.ts        |   0
 .../@ember/component-test/helper.ts           |   0
 .../component-test/set-component-template.ts  |   0
 .../@ember/component-test/template-only.ts    |   0
 .../@ember/controller-test/main.ts            |   0
 .../@ember/controller-test/octane.ts          |   0
 .../{preview => }/@ember/debug-tests.ts       |   0
 .../{preview => }/@ember/destroyable-test.ts  |   0
 .../@ember/engine-test/engine-instance.ts     |   0
 .../@ember/engine-test/engine.ts              |   0
 .../{preview => }/@ember/error-tests.ts       |   0
 .../{preview => }/@ember/helper-tests.ts      |   0
 .../{preview => }/@ember/modifier-tests.ts    |   0
 .../@ember/object-test/compat.ts              |   0
 .../@ember/object-test/computed.ts            |   0
 .../{preview => }/@ember/object-test/core.ts  |   0
 .../@ember/object-test/create-negative.ts     |   0
 .../@ember/object-test/create.ts              |   0
 .../{preview => }/@ember/object-test/event.ts |   0
 .../@ember/object-test/extend.ts              |   0
 .../@ember/object-test/get-set.ts             |   0
 .../@ember/object-test/internals.ts           |   0
 .../@ember/object-test/object.ts              |   0
 .../@ember/object-test/observable.ts          |   0
 .../{preview => }/@ember/object-test/proxy.ts |   0
 .../@ember/object-test/reopen.ts              |   0
 .../{preview => }/@ember/owner-tests.ts       |   0
 .../{preview => }/@ember/polyfills-tests.ts   |   0
 .../@ember/routing-test/built-ins.ts          |   0
 .../@ember/routing-test/route.ts              |   0
 .../@ember/routing-test/router-service.ts     |   0
 .../@ember/routing-test/router.ts             |   0
 .../{preview => }/@ember/runloop-tests.ts     |   0
 .../{preview => }/@ember/service-test.ts      |   0
 .../{preview => }/@ember/string-tests.ts      |   0
 .../{preview => }/@ember/template-tests.ts    |   0
 type-tests/{preview => }/@ember/test-tests.ts |   0
 .../{preview => }/@ember/utils-tests.ts       |   0
 .../ember/application-instance.ts             |   0
 type-tests/{preview => }/ember/application.ts |   0
 type-tests/{preview => }/ember/array-proxy.ts |   0
 type-tests/{preview => }/ember/array.ts       |   0
 type-tests/{preview => }/ember/component.ts   |   0
 type-tests/{preview => }/ember/computed.ts    |   0
 type-tests/{preview => }/ember/controller.ts  |   0
 type-tests/{preview => }/ember/core-object.ts |   0
 .../{preview => }/ember/create-negative.ts    |   0
 type-tests/{preview => }/ember/create.ts      |   0
 .../{preview => }/ember/data-adapter.ts       |   0
 type-tests/{preview => }/ember/debug.ts       |   0
 .../{preview => }/ember/ember-module-tests.ts |   0
 type-tests/{preview => }/ember/ember-tests.ts |   0
 .../{preview => }/ember/engine-instance.ts    |   0
 type-tests/{preview => }/ember/engine.ts      |   0
 type-tests/{preview => }/ember/error.ts       |   0
 type-tests/{preview => }/ember/event.ts       |   0
 type-tests/{preview => }/ember/extend.ts      |   0
 type-tests/{preview => }/ember/helper.ts      |   0
 type-tests/{preview => }/ember/inject.ts      |   0
 type-tests/{preview => }/ember/mixin.ts       |   0
 type-tests/{preview => }/ember/object.ts      |   0
 type-tests/{preview => }/ember/observable.ts  |   0
 .../ember/private/computed-tests.ts           |   0
 .../ember/private/observable-tests.ts         |   0
 type-tests/{preview => }/ember/reopen.ts      |   0
 type-tests/{preview => }/ember/route.ts       |   0
 type-tests/{preview => }/ember/router.ts      |   0
 type-tests/{preview => }/ember/run.ts         |   0
 type-tests/{preview => }/ember/string.ts      |   0
 .../ember/techniques/properties-from-this.ts  |   0
 type-tests/{preview => }/ember/test.ts        |   0
 type-tests/{preview => }/ember/transition.ts  |   0
 type-tests/{preview => }/ember/utils.ts       |   0
 type-tests/{preview => }/ember/view-utils.ts  |   0
 type-tests/index.d.ts                         |   3 +
 type-tests/preview/index.d.ts                 |   1 -
 type-tests/stable/@ember/owner-tests.ts       | 216 ------------------
 type-tests/stable/index.d.ts                  |   2 -
 type-tests/stable/tsconfig.json               |   3 -
 type-tests/{preview => }/tsconfig.json        |   0
 .../preview/@ember/application/tsconfig.json  |   3 -
 types/preview/@ember/array/tsconfig.json      |   3 -
 types/preview/@ember/component/tsconfig.json  |   3 -
 types/preview/@ember/controller/tsconfig.json |   3 -
 types/preview/@ember/debug/tsconfig.json      |   3 -
 .../preview/@ember/destroyable/tsconfig.json  |   3 -
 .../-private/container-proxy-mixin.d.ts       |   2 +-
 .../engine/-private/registry-proxy-mixin.d.ts |   2 +-
 types/preview/@ember/engine/tsconfig.json     |   3 -
 types/preview/@ember/error/tsconfig.json      |   3 -
 types/preview/@ember/helper/tsconfig.json     |   3 -
 types/preview/@ember/modifier/tsconfig.json   |   3 -
 types/preview/@ember/object/tsconfig.json     |   3 -
 types/preview/@ember/polyfills/tsconfig.json  |   3 -
 types/preview/@ember/routing/tsconfig.json    |   3 -
 types/preview/@ember/runloop/tsconfig.json    |   3 -
 types/preview/@ember/service/tsconfig.json    |   3 -
 types/preview/@ember/string/tsconfig.json     |   3 -
 types/preview/@ember/template/tsconfig.json   |   3 -
 types/preview/@ember/test/tsconfig.json       |   3 -
 types/preview/@ember/utils/tsconfig.json      |   3 -
 types/preview/ember/tsconfig.json             |   3 -
 types/preview/tsconfig.json                   |   6 -
 111 files changed, 7 insertions(+), 293 deletions(-)
 rename type-tests/{preview => }/@ember/application-test/application-instance.ts (100%)
 rename type-tests/{preview => }/@ember/application-test/application.ts (100%)
 rename type-tests/{preview => }/@ember/application-test/index.ts (100%)
 rename type-tests/{preview => }/@ember/array-test/array-proxy.ts (100%)
 rename type-tests/{preview => }/@ember/array-test/array.ts (100%)
 rename type-tests/{preview => }/@ember/component-test/built-ins.ts (100%)
 rename type-tests/{preview => }/@ember/component-test/capabilities.ts (100%)
 rename type-tests/{preview => }/@ember/component-test/component.ts (100%)
 rename type-tests/{preview => }/@ember/component-test/helper.ts (100%)
 rename type-tests/{preview => }/@ember/component-test/set-component-template.ts (100%)
 rename type-tests/{preview => }/@ember/component-test/template-only.ts (100%)
 rename type-tests/{preview => }/@ember/controller-test/main.ts (100%)
 rename type-tests/{preview => }/@ember/controller-test/octane.ts (100%)
 rename type-tests/{preview => }/@ember/debug-tests.ts (100%)
 rename type-tests/{preview => }/@ember/destroyable-test.ts (100%)
 rename type-tests/{preview => }/@ember/engine-test/engine-instance.ts (100%)
 rename type-tests/{preview => }/@ember/engine-test/engine.ts (100%)
 rename type-tests/{preview => }/@ember/error-tests.ts (100%)
 rename type-tests/{preview => }/@ember/helper-tests.ts (100%)
 rename type-tests/{preview => }/@ember/modifier-tests.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/compat.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/computed.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/core.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/create-negative.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/create.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/event.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/extend.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/get-set.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/internals.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/object.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/observable.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/proxy.ts (100%)
 rename type-tests/{preview => }/@ember/object-test/reopen.ts (100%)
 rename type-tests/{preview => }/@ember/owner-tests.ts (100%)
 rename type-tests/{preview => }/@ember/polyfills-tests.ts (100%)
 rename type-tests/{preview => }/@ember/routing-test/built-ins.ts (100%)
 rename type-tests/{preview => }/@ember/routing-test/route.ts (100%)
 rename type-tests/{preview => }/@ember/routing-test/router-service.ts (100%)
 rename type-tests/{preview => }/@ember/routing-test/router.ts (100%)
 rename type-tests/{preview => }/@ember/runloop-tests.ts (100%)
 rename type-tests/{preview => }/@ember/service-test.ts (100%)
 rename type-tests/{preview => }/@ember/string-tests.ts (100%)
 rename type-tests/{preview => }/@ember/template-tests.ts (100%)
 rename type-tests/{preview => }/@ember/test-tests.ts (100%)
 rename type-tests/{preview => }/@ember/utils-tests.ts (100%)
 rename type-tests/{preview => }/ember/application-instance.ts (100%)
 rename type-tests/{preview => }/ember/application.ts (100%)
 rename type-tests/{preview => }/ember/array-proxy.ts (100%)
 rename type-tests/{preview => }/ember/array.ts (100%)
 rename type-tests/{preview => }/ember/component.ts (100%)
 rename type-tests/{preview => }/ember/computed.ts (100%)
 rename type-tests/{preview => }/ember/controller.ts (100%)
 rename type-tests/{preview => }/ember/core-object.ts (100%)
 rename type-tests/{preview => }/ember/create-negative.ts (100%)
 rename type-tests/{preview => }/ember/create.ts (100%)
 rename type-tests/{preview => }/ember/data-adapter.ts (100%)
 rename type-tests/{preview => }/ember/debug.ts (100%)
 rename type-tests/{preview => }/ember/ember-module-tests.ts (100%)
 rename type-tests/{preview => }/ember/ember-tests.ts (100%)
 rename type-tests/{preview => }/ember/engine-instance.ts (100%)
 rename type-tests/{preview => }/ember/engine.ts (100%)
 rename type-tests/{preview => }/ember/error.ts (100%)
 rename type-tests/{preview => }/ember/event.ts (100%)
 rename type-tests/{preview => }/ember/extend.ts (100%)
 rename type-tests/{preview => }/ember/helper.ts (100%)
 rename type-tests/{preview => }/ember/inject.ts (100%)
 rename type-tests/{preview => }/ember/mixin.ts (100%)
 rename type-tests/{preview => }/ember/object.ts (100%)
 rename type-tests/{preview => }/ember/observable.ts (100%)
 rename type-tests/{preview => }/ember/private/computed-tests.ts (100%)
 rename type-tests/{preview => }/ember/private/observable-tests.ts (100%)
 rename type-tests/{preview => }/ember/reopen.ts (100%)
 rename type-tests/{preview => }/ember/route.ts (100%)
 rename type-tests/{preview => }/ember/router.ts (100%)
 rename type-tests/{preview => }/ember/run.ts (100%)
 rename type-tests/{preview => }/ember/string.ts (100%)
 rename type-tests/{preview => }/ember/techniques/properties-from-this.ts (100%)
 rename type-tests/{preview => }/ember/test.ts (100%)
 rename type-tests/{preview => }/ember/transition.ts (100%)
 rename type-tests/{preview => }/ember/utils.ts (100%)
 rename type-tests/{preview => }/ember/view-utils.ts (100%)
 create mode 100644 type-tests/index.d.ts
 delete mode 100644 type-tests/preview/index.d.ts
 delete mode 100644 type-tests/stable/@ember/owner-tests.ts
 delete mode 100644 type-tests/stable/index.d.ts
 delete mode 100644 type-tests/stable/tsconfig.json
 rename type-tests/{preview => }/tsconfig.json (100%)
 delete mode 100644 types/preview/@ember/application/tsconfig.json
 delete mode 100644 types/preview/@ember/array/tsconfig.json
 delete mode 100644 types/preview/@ember/component/tsconfig.json
 delete mode 100644 types/preview/@ember/controller/tsconfig.json
 delete mode 100644 types/preview/@ember/debug/tsconfig.json
 delete mode 100644 types/preview/@ember/destroyable/tsconfig.json
 delete mode 100644 types/preview/@ember/engine/tsconfig.json
 delete mode 100644 types/preview/@ember/error/tsconfig.json
 delete mode 100644 types/preview/@ember/helper/tsconfig.json
 delete mode 100644 types/preview/@ember/modifier/tsconfig.json
 delete mode 100644 types/preview/@ember/object/tsconfig.json
 delete mode 100644 types/preview/@ember/polyfills/tsconfig.json
 delete mode 100644 types/preview/@ember/routing/tsconfig.json
 delete mode 100644 types/preview/@ember/runloop/tsconfig.json
 delete mode 100644 types/preview/@ember/service/tsconfig.json
 delete mode 100644 types/preview/@ember/string/tsconfig.json
 delete mode 100644 types/preview/@ember/template/tsconfig.json
 delete mode 100644 types/preview/@ember/test/tsconfig.json
 delete mode 100644 types/preview/@ember/utils/tsconfig.json
 delete mode 100755 types/preview/ember/tsconfig.json
 delete mode 100644 types/preview/tsconfig.json

diff --git a/package.json b/package.json
index 928562745f1..d0ff8f275ab 100644
--- a/package.json
+++ b/package.json
@@ -50,9 +50,8 @@
     "test:blueprints": "yarn test:blueprints:js && yarn test:blueprints:ts",
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js",
-    "type-check:packages": "tsc --noEmit",
-    "type-check:stable": "tsc --noEmit --project type-tests/stable",
-    "type-check:preview": "tsc --noEmit --project type-tests/preview",
+    "type-check:internals": "tsc --noEmit",
+    "type-check:types": "tsc --noEmit --project type-tests",
     "type-check": "npm-run-all type-check:*"
   },
   "dependencies": {
diff --git a/type-tests/preview/@ember/application-test/application-instance.ts b/type-tests/@ember/application-test/application-instance.ts
similarity index 100%
rename from type-tests/preview/@ember/application-test/application-instance.ts
rename to type-tests/@ember/application-test/application-instance.ts
diff --git a/type-tests/preview/@ember/application-test/application.ts b/type-tests/@ember/application-test/application.ts
similarity index 100%
rename from type-tests/preview/@ember/application-test/application.ts
rename to type-tests/@ember/application-test/application.ts
diff --git a/type-tests/preview/@ember/application-test/index.ts b/type-tests/@ember/application-test/index.ts
similarity index 100%
rename from type-tests/preview/@ember/application-test/index.ts
rename to type-tests/@ember/application-test/index.ts
diff --git a/type-tests/preview/@ember/array-test/array-proxy.ts b/type-tests/@ember/array-test/array-proxy.ts
similarity index 100%
rename from type-tests/preview/@ember/array-test/array-proxy.ts
rename to type-tests/@ember/array-test/array-proxy.ts
diff --git a/type-tests/preview/@ember/array-test/array.ts b/type-tests/@ember/array-test/array.ts
similarity index 100%
rename from type-tests/preview/@ember/array-test/array.ts
rename to type-tests/@ember/array-test/array.ts
diff --git a/type-tests/preview/@ember/component-test/built-ins.ts b/type-tests/@ember/component-test/built-ins.ts
similarity index 100%
rename from type-tests/preview/@ember/component-test/built-ins.ts
rename to type-tests/@ember/component-test/built-ins.ts
diff --git a/type-tests/preview/@ember/component-test/capabilities.ts b/type-tests/@ember/component-test/capabilities.ts
similarity index 100%
rename from type-tests/preview/@ember/component-test/capabilities.ts
rename to type-tests/@ember/component-test/capabilities.ts
diff --git a/type-tests/preview/@ember/component-test/component.ts b/type-tests/@ember/component-test/component.ts
similarity index 100%
rename from type-tests/preview/@ember/component-test/component.ts
rename to type-tests/@ember/component-test/component.ts
diff --git a/type-tests/preview/@ember/component-test/helper.ts b/type-tests/@ember/component-test/helper.ts
similarity index 100%
rename from type-tests/preview/@ember/component-test/helper.ts
rename to type-tests/@ember/component-test/helper.ts
diff --git a/type-tests/preview/@ember/component-test/set-component-template.ts b/type-tests/@ember/component-test/set-component-template.ts
similarity index 100%
rename from type-tests/preview/@ember/component-test/set-component-template.ts
rename to type-tests/@ember/component-test/set-component-template.ts
diff --git a/type-tests/preview/@ember/component-test/template-only.ts b/type-tests/@ember/component-test/template-only.ts
similarity index 100%
rename from type-tests/preview/@ember/component-test/template-only.ts
rename to type-tests/@ember/component-test/template-only.ts
diff --git a/type-tests/preview/@ember/controller-test/main.ts b/type-tests/@ember/controller-test/main.ts
similarity index 100%
rename from type-tests/preview/@ember/controller-test/main.ts
rename to type-tests/@ember/controller-test/main.ts
diff --git a/type-tests/preview/@ember/controller-test/octane.ts b/type-tests/@ember/controller-test/octane.ts
similarity index 100%
rename from type-tests/preview/@ember/controller-test/octane.ts
rename to type-tests/@ember/controller-test/octane.ts
diff --git a/type-tests/preview/@ember/debug-tests.ts b/type-tests/@ember/debug-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/debug-tests.ts
rename to type-tests/@ember/debug-tests.ts
diff --git a/type-tests/preview/@ember/destroyable-test.ts b/type-tests/@ember/destroyable-test.ts
similarity index 100%
rename from type-tests/preview/@ember/destroyable-test.ts
rename to type-tests/@ember/destroyable-test.ts
diff --git a/type-tests/preview/@ember/engine-test/engine-instance.ts b/type-tests/@ember/engine-test/engine-instance.ts
similarity index 100%
rename from type-tests/preview/@ember/engine-test/engine-instance.ts
rename to type-tests/@ember/engine-test/engine-instance.ts
diff --git a/type-tests/preview/@ember/engine-test/engine.ts b/type-tests/@ember/engine-test/engine.ts
similarity index 100%
rename from type-tests/preview/@ember/engine-test/engine.ts
rename to type-tests/@ember/engine-test/engine.ts
diff --git a/type-tests/preview/@ember/error-tests.ts b/type-tests/@ember/error-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/error-tests.ts
rename to type-tests/@ember/error-tests.ts
diff --git a/type-tests/preview/@ember/helper-tests.ts b/type-tests/@ember/helper-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/helper-tests.ts
rename to type-tests/@ember/helper-tests.ts
diff --git a/type-tests/preview/@ember/modifier-tests.ts b/type-tests/@ember/modifier-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/modifier-tests.ts
rename to type-tests/@ember/modifier-tests.ts
diff --git a/type-tests/preview/@ember/object-test/compat.ts b/type-tests/@ember/object-test/compat.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/compat.ts
rename to type-tests/@ember/object-test/compat.ts
diff --git a/type-tests/preview/@ember/object-test/computed.ts b/type-tests/@ember/object-test/computed.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/computed.ts
rename to type-tests/@ember/object-test/computed.ts
diff --git a/type-tests/preview/@ember/object-test/core.ts b/type-tests/@ember/object-test/core.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/core.ts
rename to type-tests/@ember/object-test/core.ts
diff --git a/type-tests/preview/@ember/object-test/create-negative.ts b/type-tests/@ember/object-test/create-negative.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/create-negative.ts
rename to type-tests/@ember/object-test/create-negative.ts
diff --git a/type-tests/preview/@ember/object-test/create.ts b/type-tests/@ember/object-test/create.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/create.ts
rename to type-tests/@ember/object-test/create.ts
diff --git a/type-tests/preview/@ember/object-test/event.ts b/type-tests/@ember/object-test/event.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/event.ts
rename to type-tests/@ember/object-test/event.ts
diff --git a/type-tests/preview/@ember/object-test/extend.ts b/type-tests/@ember/object-test/extend.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/extend.ts
rename to type-tests/@ember/object-test/extend.ts
diff --git a/type-tests/preview/@ember/object-test/get-set.ts b/type-tests/@ember/object-test/get-set.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/get-set.ts
rename to type-tests/@ember/object-test/get-set.ts
diff --git a/type-tests/preview/@ember/object-test/internals.ts b/type-tests/@ember/object-test/internals.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/internals.ts
rename to type-tests/@ember/object-test/internals.ts
diff --git a/type-tests/preview/@ember/object-test/object.ts b/type-tests/@ember/object-test/object.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/object.ts
rename to type-tests/@ember/object-test/object.ts
diff --git a/type-tests/preview/@ember/object-test/observable.ts b/type-tests/@ember/object-test/observable.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/observable.ts
rename to type-tests/@ember/object-test/observable.ts
diff --git a/type-tests/preview/@ember/object-test/proxy.ts b/type-tests/@ember/object-test/proxy.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/proxy.ts
rename to type-tests/@ember/object-test/proxy.ts
diff --git a/type-tests/preview/@ember/object-test/reopen.ts b/type-tests/@ember/object-test/reopen.ts
similarity index 100%
rename from type-tests/preview/@ember/object-test/reopen.ts
rename to type-tests/@ember/object-test/reopen.ts
diff --git a/type-tests/preview/@ember/owner-tests.ts b/type-tests/@ember/owner-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/owner-tests.ts
rename to type-tests/@ember/owner-tests.ts
diff --git a/type-tests/preview/@ember/polyfills-tests.ts b/type-tests/@ember/polyfills-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/polyfills-tests.ts
rename to type-tests/@ember/polyfills-tests.ts
diff --git a/type-tests/preview/@ember/routing-test/built-ins.ts b/type-tests/@ember/routing-test/built-ins.ts
similarity index 100%
rename from type-tests/preview/@ember/routing-test/built-ins.ts
rename to type-tests/@ember/routing-test/built-ins.ts
diff --git a/type-tests/preview/@ember/routing-test/route.ts b/type-tests/@ember/routing-test/route.ts
similarity index 100%
rename from type-tests/preview/@ember/routing-test/route.ts
rename to type-tests/@ember/routing-test/route.ts
diff --git a/type-tests/preview/@ember/routing-test/router-service.ts b/type-tests/@ember/routing-test/router-service.ts
similarity index 100%
rename from type-tests/preview/@ember/routing-test/router-service.ts
rename to type-tests/@ember/routing-test/router-service.ts
diff --git a/type-tests/preview/@ember/routing-test/router.ts b/type-tests/@ember/routing-test/router.ts
similarity index 100%
rename from type-tests/preview/@ember/routing-test/router.ts
rename to type-tests/@ember/routing-test/router.ts
diff --git a/type-tests/preview/@ember/runloop-tests.ts b/type-tests/@ember/runloop-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/runloop-tests.ts
rename to type-tests/@ember/runloop-tests.ts
diff --git a/type-tests/preview/@ember/service-test.ts b/type-tests/@ember/service-test.ts
similarity index 100%
rename from type-tests/preview/@ember/service-test.ts
rename to type-tests/@ember/service-test.ts
diff --git a/type-tests/preview/@ember/string-tests.ts b/type-tests/@ember/string-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/string-tests.ts
rename to type-tests/@ember/string-tests.ts
diff --git a/type-tests/preview/@ember/template-tests.ts b/type-tests/@ember/template-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/template-tests.ts
rename to type-tests/@ember/template-tests.ts
diff --git a/type-tests/preview/@ember/test-tests.ts b/type-tests/@ember/test-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/test-tests.ts
rename to type-tests/@ember/test-tests.ts
diff --git a/type-tests/preview/@ember/utils-tests.ts b/type-tests/@ember/utils-tests.ts
similarity index 100%
rename from type-tests/preview/@ember/utils-tests.ts
rename to type-tests/@ember/utils-tests.ts
diff --git a/type-tests/preview/ember/application-instance.ts b/type-tests/ember/application-instance.ts
similarity index 100%
rename from type-tests/preview/ember/application-instance.ts
rename to type-tests/ember/application-instance.ts
diff --git a/type-tests/preview/ember/application.ts b/type-tests/ember/application.ts
similarity index 100%
rename from type-tests/preview/ember/application.ts
rename to type-tests/ember/application.ts
diff --git a/type-tests/preview/ember/array-proxy.ts b/type-tests/ember/array-proxy.ts
similarity index 100%
rename from type-tests/preview/ember/array-proxy.ts
rename to type-tests/ember/array-proxy.ts
diff --git a/type-tests/preview/ember/array.ts b/type-tests/ember/array.ts
similarity index 100%
rename from type-tests/preview/ember/array.ts
rename to type-tests/ember/array.ts
diff --git a/type-tests/preview/ember/component.ts b/type-tests/ember/component.ts
similarity index 100%
rename from type-tests/preview/ember/component.ts
rename to type-tests/ember/component.ts
diff --git a/type-tests/preview/ember/computed.ts b/type-tests/ember/computed.ts
similarity index 100%
rename from type-tests/preview/ember/computed.ts
rename to type-tests/ember/computed.ts
diff --git a/type-tests/preview/ember/controller.ts b/type-tests/ember/controller.ts
similarity index 100%
rename from type-tests/preview/ember/controller.ts
rename to type-tests/ember/controller.ts
diff --git a/type-tests/preview/ember/core-object.ts b/type-tests/ember/core-object.ts
similarity index 100%
rename from type-tests/preview/ember/core-object.ts
rename to type-tests/ember/core-object.ts
diff --git a/type-tests/preview/ember/create-negative.ts b/type-tests/ember/create-negative.ts
similarity index 100%
rename from type-tests/preview/ember/create-negative.ts
rename to type-tests/ember/create-negative.ts
diff --git a/type-tests/preview/ember/create.ts b/type-tests/ember/create.ts
similarity index 100%
rename from type-tests/preview/ember/create.ts
rename to type-tests/ember/create.ts
diff --git a/type-tests/preview/ember/data-adapter.ts b/type-tests/ember/data-adapter.ts
similarity index 100%
rename from type-tests/preview/ember/data-adapter.ts
rename to type-tests/ember/data-adapter.ts
diff --git a/type-tests/preview/ember/debug.ts b/type-tests/ember/debug.ts
similarity index 100%
rename from type-tests/preview/ember/debug.ts
rename to type-tests/ember/debug.ts
diff --git a/type-tests/preview/ember/ember-module-tests.ts b/type-tests/ember/ember-module-tests.ts
similarity index 100%
rename from type-tests/preview/ember/ember-module-tests.ts
rename to type-tests/ember/ember-module-tests.ts
diff --git a/type-tests/preview/ember/ember-tests.ts b/type-tests/ember/ember-tests.ts
similarity index 100%
rename from type-tests/preview/ember/ember-tests.ts
rename to type-tests/ember/ember-tests.ts
diff --git a/type-tests/preview/ember/engine-instance.ts b/type-tests/ember/engine-instance.ts
similarity index 100%
rename from type-tests/preview/ember/engine-instance.ts
rename to type-tests/ember/engine-instance.ts
diff --git a/type-tests/preview/ember/engine.ts b/type-tests/ember/engine.ts
similarity index 100%
rename from type-tests/preview/ember/engine.ts
rename to type-tests/ember/engine.ts
diff --git a/type-tests/preview/ember/error.ts b/type-tests/ember/error.ts
similarity index 100%
rename from type-tests/preview/ember/error.ts
rename to type-tests/ember/error.ts
diff --git a/type-tests/preview/ember/event.ts b/type-tests/ember/event.ts
similarity index 100%
rename from type-tests/preview/ember/event.ts
rename to type-tests/ember/event.ts
diff --git a/type-tests/preview/ember/extend.ts b/type-tests/ember/extend.ts
similarity index 100%
rename from type-tests/preview/ember/extend.ts
rename to type-tests/ember/extend.ts
diff --git a/type-tests/preview/ember/helper.ts b/type-tests/ember/helper.ts
similarity index 100%
rename from type-tests/preview/ember/helper.ts
rename to type-tests/ember/helper.ts
diff --git a/type-tests/preview/ember/inject.ts b/type-tests/ember/inject.ts
similarity index 100%
rename from type-tests/preview/ember/inject.ts
rename to type-tests/ember/inject.ts
diff --git a/type-tests/preview/ember/mixin.ts b/type-tests/ember/mixin.ts
similarity index 100%
rename from type-tests/preview/ember/mixin.ts
rename to type-tests/ember/mixin.ts
diff --git a/type-tests/preview/ember/object.ts b/type-tests/ember/object.ts
similarity index 100%
rename from type-tests/preview/ember/object.ts
rename to type-tests/ember/object.ts
diff --git a/type-tests/preview/ember/observable.ts b/type-tests/ember/observable.ts
similarity index 100%
rename from type-tests/preview/ember/observable.ts
rename to type-tests/ember/observable.ts
diff --git a/type-tests/preview/ember/private/computed-tests.ts b/type-tests/ember/private/computed-tests.ts
similarity index 100%
rename from type-tests/preview/ember/private/computed-tests.ts
rename to type-tests/ember/private/computed-tests.ts
diff --git a/type-tests/preview/ember/private/observable-tests.ts b/type-tests/ember/private/observable-tests.ts
similarity index 100%
rename from type-tests/preview/ember/private/observable-tests.ts
rename to type-tests/ember/private/observable-tests.ts
diff --git a/type-tests/preview/ember/reopen.ts b/type-tests/ember/reopen.ts
similarity index 100%
rename from type-tests/preview/ember/reopen.ts
rename to type-tests/ember/reopen.ts
diff --git a/type-tests/preview/ember/route.ts b/type-tests/ember/route.ts
similarity index 100%
rename from type-tests/preview/ember/route.ts
rename to type-tests/ember/route.ts
diff --git a/type-tests/preview/ember/router.ts b/type-tests/ember/router.ts
similarity index 100%
rename from type-tests/preview/ember/router.ts
rename to type-tests/ember/router.ts
diff --git a/type-tests/preview/ember/run.ts b/type-tests/ember/run.ts
similarity index 100%
rename from type-tests/preview/ember/run.ts
rename to type-tests/ember/run.ts
diff --git a/type-tests/preview/ember/string.ts b/type-tests/ember/string.ts
similarity index 100%
rename from type-tests/preview/ember/string.ts
rename to type-tests/ember/string.ts
diff --git a/type-tests/preview/ember/techniques/properties-from-this.ts b/type-tests/ember/techniques/properties-from-this.ts
similarity index 100%
rename from type-tests/preview/ember/techniques/properties-from-this.ts
rename to type-tests/ember/techniques/properties-from-this.ts
diff --git a/type-tests/preview/ember/test.ts b/type-tests/ember/test.ts
similarity index 100%
rename from type-tests/preview/ember/test.ts
rename to type-tests/ember/test.ts
diff --git a/type-tests/preview/ember/transition.ts b/type-tests/ember/transition.ts
similarity index 100%
rename from type-tests/preview/ember/transition.ts
rename to type-tests/ember/transition.ts
diff --git a/type-tests/preview/ember/utils.ts b/type-tests/ember/utils.ts
similarity index 100%
rename from type-tests/preview/ember/utils.ts
rename to type-tests/ember/utils.ts
diff --git a/type-tests/preview/ember/view-utils.ts b/type-tests/ember/view-utils.ts
similarity index 100%
rename from type-tests/preview/ember/view-utils.ts
rename to type-tests/ember/view-utils.ts
diff --git a/type-tests/index.d.ts b/type-tests/index.d.ts
new file mode 100644
index 00000000000..32676789226
--- /dev/null
+++ b/type-tests/index.d.ts
@@ -0,0 +1,3 @@
+// This is equivalent to the import we have end users write.
+import '../types/stable';
+import '../types/preview';
diff --git a/type-tests/preview/index.d.ts b/type-tests/preview/index.d.ts
deleted file mode 100644
index 6b492f831fb..00000000000
--- a/type-tests/preview/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-import '../../types/preview';
diff --git a/type-tests/stable/@ember/owner-tests.ts b/type-tests/stable/@ember/owner-tests.ts
deleted file mode 100644
index e210bfde9ce..00000000000
--- a/type-tests/stable/@ember/owner-tests.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import Owner, {
-  Factory,
-  FactoryManager,
-  FullName,
-  RegisterOptions,
-  Resolver,
-  KnownForTypeResult,
-  getOwner,
-  setOwner,
-} from '@ember/owner';
-import Component from '@glimmer/component';
-import { expectTypeOf } from 'expect-type';
-
-// Just a class we can construct in the Factory and FactoryManager tests
-declare class ConstructThis {
-  hasProps: boolean;
-}
-
-// ----- RegisterOptions ----- //
-declare let regOptionsA: RegisterOptions;
-expectTypeOf(regOptionsA.instantiate).toEqualTypeOf<boolean | undefined>();
-expectTypeOf(regOptionsA.singleton).toEqualTypeOf<boolean | undefined>();
-
-// ----- Factory ----- //
-// This gives us coverage for the cases where you are *casting*.
-declare let aFactory: Factory<ConstructThis>;
-
-aFactory.create();
-aFactory.create({});
-aFactory.create({
-  hasProps: true,
-});
-aFactory.create({
-  hasProps: false,
-});
-
-// NOTE: it would be nice if these could be rejected by way of EPC, but alas: it
-// cannot, because the public contract for `create` allows implementors to
-// define their `create` config object basically however they like. :-/
-aFactory.create({ unrelatedNonsense: 'yep yep yep' });
-aFactory.create({ hasProps: true, unrelatedNonsense: 'yep yep yep' });
-
-// But this should be legal.
-const goodPojo = { hasProps: true, unrelatedNonsense: 'also true' };
-aFactory.create(goodPojo);
-
-// This should also be rejected, though for *type error* reasons, not EPC; alas,
-// it cannot, for the same reason.
-const badPojo = { hasProps: 'huzzah', unrelatedNonsense: 'also true' };
-aFactory.create(badPojo);
-
-// ----- FactoryManager ----- //
-declare let aFactoryManager: FactoryManager<ConstructThis>;
-expectTypeOf(aFactoryManager.class).toEqualTypeOf<Factory<ConstructThis>>();
-expectTypeOf(aFactoryManager.create({})).toEqualTypeOf<ConstructThis>();
-expectTypeOf(aFactoryManager.create({ hasProps: true })).toEqualTypeOf<ConstructThis>();
-expectTypeOf(aFactoryManager.create({ hasProps: false })).toEqualTypeOf<ConstructThis>();
-
-// Likewise with these.
-aFactoryManager.create({ otherStuff: 'nope' });
-aFactoryManager.create({ hasProps: true, otherStuff: 'nope' });
-expectTypeOf(aFactoryManager.create(goodPojo)).toEqualTypeOf<ConstructThis>();
-aFactoryManager.create(badPojo);
-
-// ----- Resolver ----- //
-declare let resolver: Resolver;
-expectTypeOf<Resolver['normalize']>().toEqualTypeOf<
-  ((fullName: FullName) => FullName) | undefined
->();
-expectTypeOf<Resolver['lookupDescription']>().toEqualTypeOf<
-  ((fullName: FullName) => string) | undefined
->();
-expectTypeOf(resolver.resolve('random:some-name')).toEqualTypeOf<
-  object | Factory<object> | undefined
->();
-const knownForFoo = resolver.knownForType?.('foo');
-expectTypeOf(knownForFoo).toEqualTypeOf<KnownForTypeResult<'foo'> | undefined>();
-expectTypeOf(knownForFoo?.['foo:bar']).toEqualTypeOf<boolean | undefined>();
-// @ts-expect-error -- there is no `blah` on `knownForFoo`, *only* `foo`.
-knownForFoo?.blah;
-
-// This one is last so it can reuse the bits from above!
-// ----- Owner ----- //
-declare let owner: Owner;
-
-// @ts-expect-error
-owner.lookup();
-expectTypeOf(owner.lookup('type:name')).toEqualTypeOf<unknown>();
-// @ts-expect-error
-owner.lookup('non-namespace-string');
-expectTypeOf(owner.lookup('namespace@type:name')).toEqualTypeOf<unknown>();
-
-// Arbitrary registration patterns work, as here.
-declare module '@ember/owner' {
-  export interface DIRegistry {
-    etc: {
-      'my-type-test': ConstructThis;
-    };
-  }
-}
-
-expectTypeOf(owner.lookup('etc:my-type-test')).toEqualTypeOf<ConstructThis>();
-
-expectTypeOf(owner.register('type:name', aFactory)).toEqualTypeOf<void>();
-expectTypeOf(owner.register('type:name', aFactory, {})).toEqualTypeOf<void>();
-expectTypeOf(owner.register('type:name', aFactory, { instantiate: true })).toEqualTypeOf<void>();
-expectTypeOf(owner.register('type:name', aFactory, { instantiate: false })).toEqualTypeOf<void>();
-expectTypeOf(owner.register('type:name', aFactory, { singleton: true })).toEqualTypeOf<void>();
-expectTypeOf(owner.register('type:name', aFactory, { singleton: false })).toEqualTypeOf<void>();
-expectTypeOf(
-  owner.register('type:name', aFactory, { instantiate: true, singleton: true })
-).toEqualTypeOf<void>();
-expectTypeOf(
-  owner.register('type:name', aFactory, { instantiate: true, singleton: false })
-).toEqualTypeOf<void>();
-expectTypeOf(
-  owner.register('type:name', aFactory, { instantiate: false, singleton: true })
-).toEqualTypeOf<void>();
-expectTypeOf(
-  owner.register('type:name', aFactory, { instantiate: false, singleton: false })
-).toEqualTypeOf<void>();
-// @ts-expect-error
-owner.register('non-namespace-string', aFactory);
-expectTypeOf(owner.register('namespace@type:name', aFactory)).toEqualTypeOf<void>();
-
-expectTypeOf(owner.factoryFor('type:name')).toEqualTypeOf<FactoryManager<object> | undefined>();
-expectTypeOf(owner.factoryFor('type:name')?.class).toEqualTypeOf<Factory<object> | undefined>();
-expectTypeOf(owner.factoryFor('type:name')?.create()).toEqualTypeOf<object | undefined>();
-expectTypeOf(owner.factoryFor('type:name')?.create({})).toEqualTypeOf<object | undefined>();
-expectTypeOf(owner.factoryFor('type:name')?.create({ anythingGoes: true })).toEqualTypeOf<
-  object | undefined
->();
-// @ts-expect-error
-owner.factoryFor('non-namespace-string');
-expectTypeOf(owner.factoryFor('namespace@type:name')).toEqualTypeOf<
-  FactoryManager<object> | undefined
->();
-
-// Tests deal with the fact that string literals are a special case! `let`
-// bindings will accordingly not "just work" as a result. The separate
-// assignments both satisfy the linter and show why it matters.
-let aName;
-aName = 'type:name';
-// @ts-expect-error
-owner.lookup(aName);
-
-let aTypedName: FullName;
-aTypedName = 'type:name';
-expectTypeOf(owner.lookup(aTypedName)).toBeUnknown();
-
-// Nor will callbacks work "out of the box". But they can work if they have the
-// correct type.
-declare const justStrings: string[];
-// @ts-expect-error
-justStrings.map((aString) => owner.lookup(aString));
-declare let typedStrings: FullName[];
-typedStrings.map((aString) => owner.lookup(aString));
-
-// Also make sure it keeps working with const bindings
-const aConstName = 'type:name';
-expectTypeOf(owner.lookup(aConstName)).toBeUnknown();
-
-// Check handling with Glimmer components carrying a Signature: they should
-// properly resolve to `Owner`, *not* `Owner | undefined`.
-interface Sig<T> {
-  Args: {
-    name: string;
-    age: number;
-    extra: T;
-  };
-  Element: HTMLParagraphElement;
-  Blocks: {
-    default: [greeting: string];
-    extra: [T];
-  };
-}
-
-class ExampleComponent<T> extends Component<Sig<T>> {
-  checkThis() {
-    expectTypeOf(getOwner(this)).toEqualTypeOf<Owner | undefined>();
-  }
-}
-
-declare let example: ExampleComponent<string>;
-expectTypeOf(getOwner(example)).toEqualTypeOf<Owner | undefined>();
-
-// ----- Minimal further coverage for POJOs ----- //
-// `Factory` and `FactoryManager` don't have to deal in actual classes. :sigh:
-const Creatable = {
-  hasProps: true,
-};
-
-const pojoFactory: Factory<typeof Creatable> = {
-  // If you want *real* safety here, alas: you cannot have it. The public
-  // contract for `create` allows implementors to define their `create` config
-  // object basically however they like. As a result, this is the safest version
-  // possible: Making it be `Partial<Thing>` is *compatible* with `object`, and
-  // requires full checking *inside* the function body. It does not, alas, give
-  // any safety *outside* the class. A future rationalization of this would be
-  // very welcome.
-  create(initialValues?: Partial<typeof Creatable>) {
-    const instance = Creatable;
-    if (initialValues) {
-      if (initialValues.hasProps) {
-        Object.defineProperty(instance, 'hasProps', {
-          value: initialValues.hasProps,
-          enumerable: true,
-          writable: true,
-        });
-      }
-    }
-    return instance;
-  },
-};
-
-expectTypeOf(pojoFactory.create()).toEqualTypeOf<{ hasProps: boolean }>();
diff --git a/type-tests/stable/index.d.ts b/type-tests/stable/index.d.ts
deleted file mode 100644
index 470164f7ef1..00000000000
--- a/type-tests/stable/index.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// This is equivalent to do `import 'ember-source/types';`.
-import '../../types/stable';
diff --git a/type-tests/stable/tsconfig.json b/type-tests/stable/tsconfig.json
deleted file mode 100644
index a205f6579ab..00000000000
--- a/type-tests/stable/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "@tsconfig/ember/tsconfig.json",
-}
diff --git a/type-tests/preview/tsconfig.json b/type-tests/tsconfig.json
similarity index 100%
rename from type-tests/preview/tsconfig.json
rename to type-tests/tsconfig.json
diff --git a/types/preview/@ember/application/tsconfig.json b/types/preview/@ember/application/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/application/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/array/tsconfig.json b/types/preview/@ember/array/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/array/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/component/tsconfig.json b/types/preview/@ember/component/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/component/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/controller/tsconfig.json b/types/preview/@ember/controller/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/controller/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/debug/tsconfig.json b/types/preview/@ember/debug/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/debug/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/destroyable/tsconfig.json b/types/preview/@ember/destroyable/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/destroyable/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
index 4831c174436..7c25fedea9d 100644
--- a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
@@ -1,5 +1,5 @@
 declare module '@ember/engine/-private/container-proxy-mixin' {
-  import { ContainerProxy } from '@ember/owner';
+  import { ContainerProxy } from '@ember/-internals/owner';
   import Mixin from '@ember/object/mixin';
 
   /**
diff --git a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
index 65b69f755cb..d3ed9552f88 100644
--- a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
@@ -1,5 +1,5 @@
 declare module '@ember/engine/-private/registry-proxy-mixin' {
-  import { RegistryProxy } from '@ember/owner';
+  import { RegistryProxy } from '@ember/-internals/owner';
   import Mixin from '@ember/object/mixin';
 
   /**
diff --git a/types/preview/@ember/engine/tsconfig.json b/types/preview/@ember/engine/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/engine/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/error/tsconfig.json b/types/preview/@ember/error/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/error/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/helper/tsconfig.json b/types/preview/@ember/helper/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/helper/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/modifier/tsconfig.json b/types/preview/@ember/modifier/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/modifier/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/object/tsconfig.json b/types/preview/@ember/object/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/object/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/polyfills/tsconfig.json b/types/preview/@ember/polyfills/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/polyfills/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/routing/tsconfig.json b/types/preview/@ember/routing/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/routing/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/runloop/tsconfig.json b/types/preview/@ember/runloop/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/runloop/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/service/tsconfig.json b/types/preview/@ember/service/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/service/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/string/tsconfig.json b/types/preview/@ember/string/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/string/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/template/tsconfig.json b/types/preview/@ember/template/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/template/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/test/tsconfig.json b/types/preview/@ember/test/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/test/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/@ember/utils/tsconfig.json b/types/preview/@ember/utils/tsconfig.json
deleted file mode 100644
index 4082f16a5d9..00000000000
--- a/types/preview/@ember/utils/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/types/preview/ember/tsconfig.json b/types/preview/ember/tsconfig.json
deleted file mode 100755
index 3c43903cfdd..00000000000
--- a/types/preview/ember/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../tsconfig.json"
-}
diff --git a/types/preview/tsconfig.json b/types/preview/tsconfig.json
deleted file mode 100644
index 8fa576671fd..00000000000
--- a/types/preview/tsconfig.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "extends": "@tsconfig/ember/tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": "."
-  }
-}

From d5800374c93729c218281bc39a653061876c3d10 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 29 Nov 2022 17:33:14 -0700
Subject: [PATCH 1294/1405] Update CI config for new type checking flow

---
 .github/workflows/ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0515ad5341..d240cd0300e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,8 +43,10 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - name: Check types
-        run: yarn type-check
+      - name: build stable type definitions
+        run: yarn build:types
+      - name: Check published types
+        run: yarn type-check:types
 
   types-range:
     name: Type Checking (other supported versions)
@@ -61,10 +63,12 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
+      - name: build stable type definitions
+        run: yarn build:types
       - name: install TS@${{matrix.ts-version}}
         run: yarn add -D typescript@${{ matrix.ts-version }}
-      - name: Check types with TS@${{matrix.ts-version}}
-        run: yarn type-check
+      - name: Check published types with TS@${{matrix.ts-version}}
+        run: yarn type-check:types
 
   basic-test:
     name: Debug and Prebuilt (All Tests by Package + Canary Features)

From 38363419e2e673afa1ebec3e541fb9d8f399239f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 30 Nov 2022 07:33:56 -0700
Subject: [PATCH 1295/1405] Add v3.28.11 to CHANGELOG

(cherry picked from commit fd694aab7fb87bf281b5b601a80fdd69ae4de9a7)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c777a1806a9..b97adc1159c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v3.28.11 (November 30, 2022)
+
+- [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX LTS] Allow class-based helpers in strict-mode
+
 ### v4.10.0-beta.1 (November 28, 2022)
 
 - [#20253](https://github.com/emberjs/ember.js/pull/20253) [FEATURE] Add the `Resolver` type to preview types

From dc3a304b74a62b94eab528c27c691d66275ed7f7 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 30 Nov 2022 07:48:35 -0700
Subject: [PATCH 1296/1405] Make the CHANGELOG use consistent headings

---
 CHANGELOG.md | 494 +++++++++++++++++++++++++--------------------------
 1 file changed, 247 insertions(+), 247 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b97adc1159c..6b344893006 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,12 +4,12 @@
 
 - [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX LTS] Allow class-based helpers in strict-mode
 
-### v4.10.0-beta.1 (November 28, 2022)
+## v4.10.0-beta.1 (November 28, 2022)
 
 - [#20253](https://github.com/emberjs/ember.js/pull/20253) [FEATURE] Add the `Resolver` type to preview types
 - [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).
 
-### v4.9.0 (November 28, 2022)
+## v4.9.0 (November 28, 2022)
 
 - [#20274](https://github.com/emberjs/ember.js/pull/20274) [BUGFIX] Add some missing types to preview types
 - [#20256](https://github.com/emberjs/ember.js/pull/20256) [BUGFIX] Correct types for Ember Arrays
@@ -21,15 +21,15 @@
 - [#20228](https://github.com/emberjs/ember.js/pull/20228) [BUGFIX] Remove type export for ControllerMixin
 - [#20203](https://github.com/emberjs/ember.js/pull/20203) / [#20204](https://github.com/emberjs/ember.js/pull/20204) [FEATURE] Preview types: Update to Typescript 4.8
 
-### v4.8.2 (November 3, 2022)
+## v4.8.2 (November 3, 2022)
 
 - [#20244](https://github.com/emberjs/ember.js/pull/20244) Add missing type for `getComponentTemplate` to preview types
 
-### v4.8.1 (November 2, 2022)
+## v4.8.1 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
 
-### v4.4.4 (November 2, 2022)
+## v4.4.4 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties
 
@@ -37,49 +37,49 @@
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
 
-### v3.24.7 (November 2, 2022)
+## v3.24.7 (November 2, 2022)
 
 - [CVE pending](https://emberjs.com/blog/ember-4-8-1-released) Fix a prototype pollution vulnerability in `set` and `setProperties`
 
-### v4.8.0 (October 17, 2022)
+## v4.8.0 (October 17, 2022)
 
 - [#20180](https://github.com/emberjs/ember.js/pull/20180) [FEATURE] Publish an opt-in preview of public types for Ember
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Upgrade router_js to fix Linked list of RouteInfos contains undefined object
 
-### v4.4.3 (October 12, 2022)
+## v4.4.3 (October 12, 2022)
 
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
 
-### v4.7.1 (October 12, 2022)
+## v4.7.1 (October 12, 2022)
 
 - [#20166](https://github.com/emberjs/ember.js/pull/20166) [BUGFIX] Fix missing `RouteInfo` entries
 
-### v4.7.0 (September 6, 2022)
+## v4.7.0 (September 6, 2022)
 
 - [#20126](https://github.com/emberjs/ember.js/pull/20126) [BUGFIX] Replace Firefox detection that used a deprecated browser API
 
-### v4.6.0 (July 25, 2022)
+## v4.6.0 (July 25, 2022)
 
 - [#20125](https://github.com/emberjs/ember.js/pull/20125) [BUGFIX] Replace deprecated substr() method with substring() method.
 
-### v4.5.1 (July 25, 2022)
+## v4.5.1 (July 25, 2022)
 
 - [#20120](https://github.com/emberjs/ember.js/pull/20120) [BUGFIX] Adjust uniqueId() implementation to only generate valid selectors.
 
-### v4.5.0 (June 13, 2022)
+## v4.5.0 (June 13, 2022)
 
 - [#20052](https://github.com/emberjs/ember.js/pull/20052) / [#20055](https://github.com/emberjs/ember.js/pull/20055) [FEATURE] Add the default helper manager to implement [RFC #0756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
 - [#20053](https://github.com/emberjs/ember.js/pull/20053) [FEATURE] Expose `renderSettled` from `@ember/renderer` to enable implementation of [RFC #0785](https://github.com/emberjs/rfcs/blob/master/text/0785-remove-set-get-in-tests.md).
 
-### v4.4.2 (June 13, 2022)
+## v4.4.2 (June 13, 2022)
 
 - [#20114](https://github.com/emberjs/ember.js/pull/20114) [BUGFIX] Fix generated import paths for test setup functions in addons
 
-### v4.4.1 (May 31, 2022)
+## v4.4.1 (May 31, 2022)
 
 - [#20082](https://github.com/emberjs/ember.js/pull/20082) [BUGFIX] Fix blueprints publication
 
-### v4.4.0 (May 2, 2022)
+## v4.4.0 (May 2, 2022)
 
 - [#19882](https://github.com/emberjs/ember.js/pull/19882) / [#20005](https://github.com/emberjs/ember.js/pull/20005) [FEATURE] Implement the `unique-id` helper per [RFC #0659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).
 - [#19981](https://github.com/emberjs/ember.js/pull/19981) [FEATURE] Facilitate custom test setups per [RFC #0637](https://github.com/emberjs/rfcs/blob/master/text/0637-customizable-test-setups.md).
@@ -87,21 +87,21 @@
 - [#17978](https://github.com/emberjs/ember.js/pull/17978) Make hasListeners public
 - [#20014](https://github.com/emberjs/ember.js/pull/20014) Log `until` for deprecations
 
-### v3.28.9 (April 19, 2022)
+## v3.28.9 (April 19, 2022)
 
 - [#20028](https://github.com/emberjs/ember.js/pull/20028) Fix a memory leak in the Router Service class
 
-### v4.3.0 (March 21, 2022)
+## v4.3.0 (March 21, 2022)
 
 - [#20025](https://github.com/emberjs/ember.js/pull/20025) [BUGFIX] Fix a memory leak in the Router Service class
 - [#19971](https://github.com/emberjs/ember.js/pull/19971) [BUGFIX] Don't serialize default Query Params on RouterService
 - [#20024](https://github.com/emberjs/ember.js/pull/20024) [BUGFIX] Correctly associate props with factory and owner in FactoryManager
 
-### v4.2.0 (February 7, 2022)
+## v4.2.0 (February 7, 2022)
 
 - [#19878](https://github.com/emberjs/ember.js/pull/19878) [BUGFIX] Allow class-based helpers to work in strict-mode.
 
-### v4.1.0 (December 28, 2021)
+## v4.1.0 (December 28, 2021)
 
 - [#19772](https://github.com/emberjs/ember.js/pull/19772) / [#19826](https://github.com/emberjs/ember.js/pull/19826) [FEATURE] Add a `@cached` decorator per [RFC #0566](https://github.com/emberjs/rfcs/blob/af64915b5ecde010fce09309a47ee6d2447588d0/text/0566-memo-decorator.md).
 - [#19471](https://github.com/emberjs/ember.js/pull/19471) / [#19834](https://github.com/emberjs/ember.js/pull/19834) [FEATURE] Add `refresh` method to the Router Service per [RFC #0631](https://github.com/emberjs/rfcs/blob/master/text/0631-refresh-method-for-router-service.md).
@@ -110,12 +110,12 @@
 - [#17570](https://github.com/emberjs/ember.js/pull/17570) [BUGFIX] Passing ObjectProxy with a property size to `isEmpty` would throw assertion
 - [#18269](https://github.com/emberjs/ember.js/pull/18269) [BUGFIX] Fix for when query params are using a nested value
 
-### v4.0.1 (December 1, 2021)
+## v4.0.1 (December 1, 2021)
 
 - [#19858](https://github.com/emberjs/ember.js/pull/19858) [BUGFIX] Improve assert message in default store for when routes have dynamic segments but no model hook
 - [#19860](https://github.com/emberjs/ember.js/pull/19860) [BUGFIX] Add model hook in route blueprint for routes with dynamic segments
 
-### v4.0.0 (November 15, 2021)
+## v4.0.0 (November 15, 2021)
 
 - [#19761](https://github.com/emberjs/ember.js/pull/19761) [BREAKING] Require ember-auto-import >= 2 or higher to enable ember-source to become a v2 addon in the 4.x cycle
 - [#19706](https://github.com/emberjs/ember.js/pull/19706) [BREAKING] Explicitly drop Node 10 support to match support policy.
@@ -217,7 +217,7 @@
 
 - [glimmerjs/glimmer-vm#1351](https://github.com/glimmerjs/glimmer-vm/pull/1351) Support lexical scope in loose mode
 
-### v3.24.6 (October 18, 2021)
+## v3.24.6 (October 18, 2021)
 
 - [glimmerjs/glimmer-vm#1347](https://github.com/glimmerjs/glimmer-vm/pull/1347) Avoid using a nested WeakMap for manager instances for a given owner (makes memory leak debugging easier)
 
@@ -225,7 +225,7 @@
 
 - [#19733](https://github.com/emberjs/ember.js/pull/19733) [BUGFIX] Ensure that using `routerService.urlFor(...)` and `routerService.recognize(...)` does not error if the router is not fully initialized
 
-### v3.28.0 (August 9, 2021)
+## v3.28.0 (August 9, 2021)
 
 - [#19697](https://github.com/emberjs/ember.js/pull/19697) [BUGFIX] Ensure `deserializeQueryParam` is called for lazy routes
 - [#19681](https://github.com/emberjs/ember.js/pull/19681) [BUGFIX] Restore previous hash behavior
@@ -235,27 +235,27 @@
 - [#19491](https://github.com/emberjs/ember.js/pull/19491) [BUGFIX] Fix `owner.lookup` `owner.register` behavior with `singleton: true` option
 - [#19472](https://github.com/emberjs/ember.js/pull/19472) [BUGFIX] Prevent transformation of block params called `attrs`
 
-### v3.24.5 (August 9, 2021)
+## v3.24.5 (August 9, 2021)
 
 - [#19685](https://github.com/emberjs/ember.js/pull/19685) Fix memory leak with `RouterService` under Chrome
 - [#19683](https://github.com/emberjs/ember.js/pull/19683) Ensure `super.willDestroy` is called correctly in `Router`'s `willDestroy`
 
-### v3.27.5 (June 10, 2021)
+## v3.27.5 (June 10, 2021)
 
 - [#19597](https://github.com/emberjs/ember.js/pull/19597) [BIGFIX] Fix `<LinkTo>` with nested children
 
-### v3.27.4 (June 9, 2021)
+## v3.27.4 (June 9, 2021)
 
 - [#19594](https://github.com/emberjs/ember.js/pull/19594) [BUGFIX] Revert lazy hash changes
 - [#19596](https://github.com/emberjs/ember.js/pull/19596) [DOC] Fix "Dormant" addon warning typo
 
-### v3.27.3 (June 3, 2021)
+## v3.27.3 (June 3, 2021)
 
 - [#19565](https://github.com/emberjs/ember.js/pull/19565) [BUGFIX] Ensures that `computed` can depend on dynamic `(hash` keys
 - [#19571](https://github.com/emberjs/ember.js/pull/19571) [BUGFIX] Extend `Route.prototype.transitionTo` deprecation until 5.0.0
 - [#19586](https://github.com/emberjs/ember.js/pull/19586) [BUGFIX] Fix Embroider compatibility
 
-### v3.27.2 (May 27, 2021)
+## v3.27.2 (May 27, 2021)
 
 - [#19511](https://github.com/emberjs/ember.js/pull/19511) / [#19548](https://github.com/emberjs/ember.js/pull/19548) [BUGFIX] Makes the (hash) helper lazy
 - [#19530](https://github.com/emberjs/ember.js/pull/19530) [DOC] fix passing params to named blocks examples
@@ -265,14 +265,14 @@
 - [#19557](https://github.com/emberjs/ember.js/pull/19557) [BUGFIX] Refine Ember Global deprecation message
 - [#19564](https://github.com/emberjs/ember.js/pull/19564) [BUGFIX] Improve computed.* and run.* deprecation message (IE11)
 
-### v3.27.1 (May 13, 2021)
+## v3.27.1 (May 13, 2021)
 
 - [#19540](https://github.com/emberjs/ember.js/pull/19540) [BUGFIX] Ensure ember-testing is loaded lazily
 - [#19541](https://github.com/emberjs/ember.js/pull/19541) [BUGFIX] Add missing metadata for some deprecations enabled in 3.27.0
 - [#19541](https://github.com/emberjs/ember.js/pull/19541) [BUGFIX] Ensure passing `@href` to `<LinkTo>` throws an error
 - [#19541](https://github.com/emberjs/ember.js/pull/19541) [CLEANUP] Consistently use https://deprecations.emberjs.com/ in deprecation URLs
 
-### v3.27.0 (May 3, 2021)
+## v3.27.0 (May 3, 2021)
 
 - [#19309](https://github.com/emberjs/ember.js/pull/19309) / [#19487](https://github.com/emberjs/ember.js/pull/19487) / [#19474](https://github.com/emberjs/ember.js/pull/19474) [FEATURE] Enable `(helper` and `(modifier` helpers per [RFC #432](https://github.com/emberjs/rfcs/blob/master/text/0432-contextual-helpers.md).
 - [#19382](https://github.com/emberjs/ember.js/pull/19382) / [#19430](https://github.com/emberjs/ember.js/pull/19430) [FEATURE] Remaining implementation work per [RFC #671](https://github.com/emberjs/rfcs/blob/master/text/0671-modernize-built-in-components-1.md).
@@ -293,19 +293,19 @@
 - [#19441](https://github.com/emberjs/ember.js/pull/19441) Add automated publishing of weekly alpha releases to NPM
 - [#19462](https://github.com/emberjs/ember.js/pull/19462) Use `positional` and `named` as the argument names in `ember g helper` blueprint
 
-### v3.24.4 (May 3, 2021)
+## v3.24.4 (May 3, 2021)
 
 - [#19477](https://github.com/emberjs/ember.js/pull/19477) Allow `<LinkToExternal />` to override internal assertion
 
-### v3.26.2 (October 4, 2021)
+## v3.26.2 (October 4, 2021)
 
 - [#19683](https://github.com/emberjs/ember.js/pull/19683) [BUGFIX] Use `super.willDestroy` in native classes (instead of `this._super`)
 
-### v3.26.1 (March 24, 2021)
+## v3.26.1 (March 24, 2021)
 
 - [#19473](https://github.com/emberjs/ember.js/pull/19473) Update Glimmer VM to latest.
 
-### v3.26.0 (March 22, 2021)
+## v3.26.0 (March 22, 2021)
 
 - [#19255](https://github.com/emberjs/ember.js/pull/19255) [DEPRECATION] Deprecate transition methods of controller and route per [RFC #674](https://github.com/emberjs/rfcs/blob/master/text/0674-deprecate-transition-methods-of-controller-and-route.md).
 - [#19345](https://github.com/emberjs/ember.js/pull/19345) [DEPRECATION] Deprecate `<LinkTo>` positional arguments per [RFC #698](https://github.com/emberjs/rfcs/blob/master/text/0698-deprecate-link-to-positional-arguments.md).
@@ -325,17 +325,17 @@
 - [#19405](https://github.com/emberjs/ember.js/pull/19405) [BUGFIX] Avoid instantiation errors when `app/router.js` injects the router service.
 - [#19436](https://github.com/emberjs/ember.js/pull/19436) [BUGFIX] Support observer keys with colons
 
-### v3.25.4 (March 24, 2021)
+## v3.25.4 (March 24, 2021)
 
 - [#19473](https://github.com/emberjs/ember.js/pull/19473) Update Glimmer VM to latest.
 
-### v3.25.3 (March 7, 2021)
+## v3.25.3 (March 7, 2021)
 
 - [#19448](https://github.com/emberjs/ember.js/pull/19448) Ensure query params are preserved through an intermediate loading state transition
 - [#19450](https://github.com/emberjs/ember.js/pull/19450) Ensure `routerService.currentRoute.name` and `routerService.currentRouteName` match during loading states
 
 
-### v3.25.2 (March 7, 2021)
+## v3.25.2 (March 7, 2021)
 
 - [#19389](https://github.com/emberjs/ember.js/pull/19389) Removes template ids
 - [#19395](https://github.com/emberjs/ember.js/pull/19395) [BUGFIX] Ensure `<LinkTo>` can return a valid `href` most of the time
@@ -345,11 +345,11 @@
 - [#19412](https://github.com/emberjs/ember.js/pull/19412) / [#19416](https://github.com/emberjs/ember.js/pull/19416) [BUGFIX] Update Glimmer VM to 0.77 (fix dynamic helpers/modifiers)
 
 
-### v3.25.1 (February 10, 2021)
+## v3.25.1 (February 10, 2021)
 
 - [#19326](https://github.com/emberjs/ember.js/pull/19326) / [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] Fix usage of `<LinkTo />` prior to routing (e.g. component rendering tests)
 
-### v3.25.0 (February 08, 2021)
+## v3.25.0 (February 08, 2021)
 
 - [#19302](https://github.com/emberjs/ember.js/pull/19302) / [#19306](https://github.com/emberjs/ember.js/pull/19306) / [#19319](https://github.com/emberjs/ember.js/pull/19319) [FEATURE] Implement the [Handlebars Strict Mode RFC](https://github.com/emberjs/rfcs/blob/master/text/0496-handlebars-strict-mode.md).
 - [#19318](https://github.com/emberjs/ember.js/pull/19318) [FEATURE] Implement the [Named Blocks RFC](https://github.com/emberjs/rfcs/blob/master/text/0460-yieldable-named-blocks.md).
@@ -363,7 +363,7 @@
 - [#19338](https://github.com/emberjs/ember.js/pull/19338) [BUGFIX] Add missing `deprecate` options (`for` + `since`)
 - [#19342](https://github.com/emberjs/ember.js/pull/19342) [BUGFIX] Fix misleading LinkTo error message
 
-### v3.24.3 (March 7, 2021)
+## v3.24.3 (March 7, 2021)
 
 - [#19448](https://github.com/emberjs/ember.js/pull/19448) Ensure query params are preserved through an intermediate loading state transition
 - [#19450](https://github.com/emberjs/ember.js/pull/19450) Ensure `routerService.currentRoute.name` and `routerService.currentRouteName` match during loading states
@@ -371,15 +371,15 @@
 - [#19397](https://github.com/emberjs/ember.js/pull/19397) [BUGFIX] Force building Ember bundles when `targets.node` is defined
 
 
-### v3.24.2 (February 10, 2021)
+## v3.24.2 (February 10, 2021)
 
 - [#19326](https://github.com/emberjs/ember.js/pull/19326) / [#19387](https://github.com/emberjs/ember.js/pull/19387) [BUGFIX] Fix usage of `<LinkTo />` prior to routing (e.g. component rendering tests)
 
-### v3.24.1 (January 14, 2021)
+## v3.24.1 (January 14, 2021)
 
 - [#19337](https://github.com/emberjs/ember.js/pull/19337) [BUGFIX] Ensure query param only `<LinkTo />` are properly scoped in engines
 
-### v3.24.0 (December 28, 2020)
+## v3.24.0 (December 28, 2020)
 
 - [#19224](https://github.com/emberjs/ember.js/pull/19224) [FEATURE] Add `{{page-title}}` helper to route template blueprints to implement [RFC #0654](https://github.com/emberjs/rfcs/blob/master/text/0645-add-ember-page-title-addon.md).
 - [#19133](https://github.com/emberjs/ember.js/pull/19133) [FEATURE / DEPRECATION] Add new options to `deprecate()` for `for` and `since` and deprecate using `deprecate()` without those options per the [Deprecation Staging RFC](https://github.com/emberjs/rfcs/blob/master/text/0649-deprecation-staging.md).
@@ -397,11 +397,11 @@
 - [#19238](https://github.com/emberjs/ember.js/pull/19238) [CLEANUP] Removes the `expandLocalLookup` API
 - [#19258](https://github.com/emberjs/ember.js/pull/19258) / [#19261](https://github.com/emberjs/ember.js/pull/19261) / [#19267](https://github.com/emberjs/ember.js/pull/19267) Update rendering engine to 0.65.0
 
-### v3.23.1 (November 23, 2020)
+## v3.23.1 (November 23, 2020)
 
 - [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
 
-### v3.23.0 (November 16, 2020)
+## v3.23.0 (November 16, 2020)
 
 - [#19160](https://github.com/emberjs/ember.js/pull/19160) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements the helper manager feature specified in the [Helper Managers RFC](https://github.com/emberjs/rfcs/blob/master/text/0625-helper-managers.md).
 - [#19171](https://github.com/emberjs/ember.js/pull/19171) / [#19182](https://github.com/emberjs/ember.js/pull/19182) [FEATURE] Implements `invokeHelper` from the [JavaScript Helper Invocation API RFC](https://github.com/emberjs/rfcs/blob/master/text/0626-invoke-helper.md).
@@ -417,19 +417,19 @@
 - [#19221](https://github.com/emberjs/ember.js/pull/19221) [BUGFIX] Ensure fn and (mut) work with falsy values
 - [#19213](https://github.com/emberjs/ember.js/pull/19213) [BUGFIX] Update rendering engine to improve error ergonomics.
 
-### v3.22.2 (November 25, 2020)
+## v3.22.2 (November 25, 2020)
 
 - [#19282](https://github.com/emberjs/ember.js/pull/19282) [BUGFIX] Issue deprecations (instead of assertions) for tracked mutation in constructor during rendering
 - [#19263](https://github.com/emberjs/ember.js/pull/19263) [BUGFIX] Remove `@dependentKeyCompat` assertion
 
-### v3.22.1 (November 10, 2020)
+## v3.22.1 (November 10, 2020)
 
 - [#19193](https://github.com/emberjs/ember.js/pull/19193) [BUGFIX] Ensure `@ember/component` user lifecycle hooks are untracked
 - [#19197](https://github.com/emberjs/ember.js/pull/19197) [BUGFIX] Restore the shadowed property set behavior
 - [#19199](https://github.com/emberjs/ember.js/pull/19199) [BUGFIX] Cleans up the DebugRenderTree more thoroughly on errors
 - [#19249](https://github.com/emberjs/ember.js/pull/19249) [BUGFIX] Fix issues with query params during intermediate transitions
 
-### v3.22.0 (October 5, 2020)
+## v3.22.0 (October 5, 2020)
 
 - [#19062](https://github.com/emberjs/ember.js/pull/19062) / [#19068](https://github.com/emberjs/ember.js/pull/19068) [FEATURE] Add @ember/destroyable feature from the [Destroyables RFC](https://github.com/emberjs/rfcs/blob/master/text/0580-destroyables.md).
 - [#18984](https://github.com/emberjs/ember.js/pull/18984) / [#19067](https://github.com/emberjs/ember.js/pull/19067) [FEATURE] Add low-level Cache API per [Autotracking Memoization RFC](https://github.com/emberjs/rfcs/blob/master/text/0615-autotracking-memoization.md)
@@ -439,27 +439,27 @@
 - [#19170](https://github.com/emberjs/ember.js/pull/19170) [BUGFIX] Make modifier manager 3.22 accept the resolved value directly.
 - [#19124](https://github.com/emberjs/ember.js/pull/19124) [BUGFIX] Fix rendering engine usage within a `fastboot` sandbox
 
-### v3.21.3 (September 30, 2020)
+## v3.21.3 (September 30, 2020)
 
 - [#19172](https://github.com/emberjs/ember.js/pull/19172) [BUGFIX] Ensures that tracked properties initialize property
 
-### v3.21.2 (September 30, 2020)
+## v3.21.2 (September 30, 2020)
 
 - [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters
 - [#19164](https://github.com/emberjs/ember.js/pull/19164) [BUGFIX] Entangles custom EmberArray implementations when accessed with `Ember.get`
 
-### v3.21.1 (August 28, 2020)
+## v3.21.1 (August 28, 2020)
 
 - [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.
 - [#19111](https://github.com/emberjs/ember.js/pull/19111) [BUGFIX] Fixes `ArrayProxy` length reactivity.
 
-### v3.21.0 (August 24, 2020)
+## v3.21.0 (August 24, 2020)
 
 - [#18993](https://github.com/emberjs/ember.js/pull/18993) [DEPRECATION] Deprecate `getWithDefault` per [RFC #554](https://github.com/emberjs/rfcs/blob/master/text/0554-deprecate-getwithdefault.md).
 - [#19087](https://github.com/emberjs/ember.js/pull/19087) [BUGFIX] Generated initializer tests no longer causes a deprecation warning
 - [#17571](https://github.com/emberjs/ember.js/pull/17571) [BUGFIX] Avoid tampering `queryParam` argument in RouterService#isActive
 
-### v3.20.6 (November 11, 2020)
+## v3.20.6 (November 11, 2020)
 
 - [#19138](https://github.com/emberjs/ember.js/pull/19138) [BUGFIX] Fix tag cycles in query parameters
 - [#19158](https://github.com/emberjs/ember.js/pull/19158) [BUGFIX] `RouterService#isActive()` now consumes `currentURL` to 3.20
@@ -467,12 +467,12 @@
 - [#19172](https://github.com/emberjs/ember.js/pull/19172) / [#19197](https://github.com/emberjs/ember.js/pull/19197) [BUGFIX] Ensures that tracked properties initialize property
 - [#19178](https://github.com/emberjs/ember.js/pull/19178) [BUGFIX] Allow computeds to have cycles in their deps
 
-### v3.20.5 (August 28, 2020)
+## v3.20.5 (August 28, 2020)
 
 - [#19106](https://github.com/emberjs/ember.js/pull/19106) [BUGFIX] Ensure `destroy` methods on `CoreObject` are invoked.
 - [#19111](https://github.com/emberjs/ember.js/pull/19111) [BUGFIX] Fixes `ArrayProxy` length reactivity.
 
-### v3.20.4 (August 11, 2020)
+## v3.20.4 (August 11, 2020)
 
 - [#19047](https://github.com/emberjs/ember.js/pull/19047) Ensure `inject-babel-helpers` plugin can be parallelized
 - [#19089](https://github.com/emberjs/ember.js/pull/19089) Update rendering engine to improve immediate encoding performance
@@ -483,22 +483,22 @@
 - [#19065](https://github.com/emberjs/ember.js/pull/19065) / [#19072](https://github.com/emberjs/ember.js/pull/19072) - Updates GlimmerVM to improve internal destroyable system and improve tag / revision computation.
 - [#19081](https://github.com/emberjs/ember.js/pull/19081) Reduces template compilation size in production builds.
 
-### v3.20.3 (July 30, 2020)
+## v3.20.3 (July 30, 2020)
 
 - [#19048](https://github.com/emberjs/ember.js/pull/19048) [BUGFIX] Update `router.js` to ensure `transition.abort` works for query param only transitions
 - [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in `HistoryLocation`
 - [#19060](https://github.com/emberjs/ember.js/pull/19060) [BUGFIX] Update rendering engine to `@glimmer/*` 0.55.1
 - [#19063](https://github.com/emberjs/ember.js/pull/19063) [DOC] Fix missing docs for `{{#in-element}}`
 
-### v3.20.2 (July 26, 2020)
+## v3.20.2 (July 26, 2020)
 
 - [#19056](https://github.com/emberjs/ember.js/pull/19056) Update Glimmer rendering engine to 0.54.2. Fixes an issue with (private for now) destroyables work to enable the destroyables polyfill to work more appropriately.
 
-### v3.20.1 (July 13, 2020)
+## v3.20.1 (July 13, 2020)
 
 - [#19040](https://github.com/emberjs/ember.js/pull/19040) [BUGFIX] Fix a memory leak that occurred when changing the array passed to `{{each}}`
 
-### v3.20.0 (July 13, 2020)
+## v3.20.0 (July 13, 2020)
 
 - [#18867](https://github.com/emberjs/ember.js/pull/18867) / [#18927](https://github.com/emberjs/ember.js/pull/18927) / [#18928](https://github.com/emberjs/ember.js/pull/18928) [FEATURE] [Promote `{{in-element}}` to public API](https://github.com/emberjs/rfcs/blob/master/text/0287-promote-in-element-to-public-api.md) RFC.
 - [#19025](https://github.com/emberjs/ember.js/pull/19025) [BUGFIX] Updates Glimmer VM to 0.54.0
@@ -508,7 +508,7 @@
 - [#18859](https://github.com/emberjs/ember.js/pull/18859) [BUGFIX] Fix transitionTo with scoped aliased queryParam.
 - [#18961](https://github.com/emberjs/ember.js/pull/18961) [BUGFIX] Remove assertions for updating auto-tracked state without Ember.set / this.set
 
-### v3.19.0 (May 26, 2020)
+## v3.19.0 (May 26, 2020)
 
 - [#18982](https://github.com/emberjs/ember.js/pull/18982) / [#18913](https://github.com/emberjs/ember.js/pull/18913) [BUGFIX] Update rendering engine to latest version.
   - Add a compile time error when passing arguments to regular HTML elements (e.g. `<a @foo=`)
@@ -523,35 +523,35 @@
 - [#18832](https://github.com/emberjs/ember.js/pull/18832) [CLEANUP] Remove deprecated private`implicit-modifier-manager-capabilities`
 - [#18839](https://github.com/emberjs/ember.js/pull/18839) [CLEANUP] Updates the VM and autotracking APIs
 
-### v3.18.1 (May 4, 2020)
+## v3.18.1 (May 4, 2020)
 
 - [#18941](https://github.com/emberjs/ember.js/pull/18941) [BUGFIX] Update rendering engine to latest version.
   - Reduce template size growth to near 3.16 levels (still ~ 3% higher than 3.16)
   - Ensures destroyable items added to an `{{#each` after initial render are invoked properly
   - Fixes an issue with key collisions in `{{#each`
 
-### v3.18.0 (April 14, 2020)
+## v3.18.0 (April 14, 2020)
 
 - [#18869](https://github.com/emberjs/ember.js/pull/18869) / [#18861](https://github.com/emberjs/ember.js/pull/18861) / [#18811](https://github.com/emberjs/ember.js/pull/18811) [BUGFIX] Update to glimmer-vm 0.50.2.
 - [#18807](https://github.com/emberjs/ember.js/pull/18807) [BUGFIX] Do not error (RE: `elementId` changing) if `elementId` is not changed
 - [#18774](https://github.com/emberjs/ember.js/pull/18774) [BUGFIX] Suspend observer deactivation during property changes
 - [#18785](https://github.com/emberjs/ember.js/pull/18785) Drop Node 8 support.
 
-### v3.17.3 (April 2, 2020)
+## v3.17.3 (April 2, 2020)
 
 - [#18857](https://github.com/emberjs/ember.js/pull/18857) Pass value through to `PROPERTY_DID_CHANGE` to avoid calling `get` when setting values for computed props
 
-### v3.17.2 (March 26, 2020)
+## v3.17.2 (March 26, 2020)
 
 - [#18837](https://github.com/emberjs/ember.js/pull/18837) [BUGFIX] Fix `willDestroy` on class based helpers.
 - [#18838](https://github.com/emberjs/ember.js/pull/18838) [BUGFIX] Ensure destructors (e.g. `will-destroy` modifier, `@ember/component`s with `willDestroyElement`, etc) fire when used within an `{{#each}}` block.
 
-### v3.17.1 (March 22, 2020)
+## v3.17.1 (March 22, 2020)
 
 - [#18809](https://github.com/emberjs/ember.js/pull/18809) [BUGFIX] Do not error (RE: `elementId` changing) if `elementId` is not changed
 - [#18831](https://github.com/emberjs/ember.js/pull/18831) [BUGFIX] Fix transpilation issues (e.g. `_createSuper` is not a function) when used with Babel 7.9.0+.
 
-### v3.17.0 (March 4, 2020)
+## v3.17.0 (March 4, 2020)
 
 - [#18688](https://github.com/emberjs/ember.js/pull/18688) / [#18621](https://github.com/emberjs/ember.js/pull/18621) / [#18714](https://github.com/emberjs/ember.js/pull/18714) / [#18743](https://github.com/emberjs/ember.js/pull/18743) / [#18762](https://github.com/emberjs/ember.js/pull/18762) Upgrades Glimmer VM to 0.47.9, fixes ignored `checked` attribute on `input`, fixes using `array` and `hash` helper together
 - [#18741](https://github.com/emberjs/ember.js/pull/18741) [BUGFIX] Don't setup mandatory setters on array indexes
@@ -567,11 +567,11 @@
 - [#18694](https://github.com/emberjs/ember.js/pull/18694) [BUGFIX] Ensure tag updates are buffered, remove error message
 - [#18709](https://github.com/emberjs/ember.js/pull/18709) [BUGFIX] Fix `this` in `@tracked` initializer
 
-### v3.16.10 (August 5, 2020)
+## v3.16.10 (August 5, 2020)
 
 - [#19028](https://github.com/emberjs/ember.js/pull/19028) [BUGFIX] Ensure setter CP's with dependent keys on curly components can be two way bound
 
-### v3.16.9 (July 29, 2020)
+## v3.16.9 (July 29, 2020)
 
 - [#19001](https://github.com/emberjs/ember.js/pull/19001) [BUGFIX] Invoke methods correctly in `TextSupport` `sendAction`
 - [#19023](https://github.com/emberjs/ember.js/pull/19023) [BUGFIX] Avoid over eager property access during `init`
@@ -579,23 +579,23 @@
 - [#19057](https://github.com/emberjs/ember.js/pull/19057) [BUGFIX] Parallelize `inject-babel-helpers` plugin
 - [#19059](https://github.com/emberjs/ember.js/pull/19059) [BUGFIX] Prevent `<base target="_parent">` from erroring in HistoryLocation
 
-### v3.16.8 (April 24, 2020)
+## v3.16.8 (April 24, 2020)
 
 - [#18879](https://github.com/emberjs/ember.js/pull/18879) Ensure errors thrown during component construction do not cause (unrelated) errors during application teardown (fixes a common issue when using `setupOnerror` with components asserting during `constructor`/`init`/`didInsertElement`).
 
-### v3.16.7 (April 13, 2020)
+## v3.16.7 (April 13, 2020)
 
 - [#18854](https://github.com/emberjs/ember.js/pull/18854) Pass value through to `PROPERTY_DID_CHANGE` to avoid calling `get` when setting values for computed props
 
-### v3.16.6 (March 24, 2020)
+## v3.16.6 (March 24, 2020)
 
 - [#18835](https://github.com/emberjs/ember.js/pull/18835) [BUGFIX] Make `ArrayProxy` Lazy.
 
-### v3.16.5 (March 23, 2020)
+## v3.16.5 (March 23, 2020)
 
 - [#18831](https://github.com/emberjs/ember.js/pull/18831) [BUGFIX] Fix transpilation issues (e.g. `_createSuper` is not a function) when used with Babel 7.9.0+.
 
-### v3.16.4 (March 22, 2020)
+## v3.16.4 (March 22, 2020)
 
 - [#18741](https://github.com/emberjs/ember.js/pull/18741) [BUGFIX] Don't setup mandatory setters on array indexes
 - [#18742](https://github.com/emberjs/ember.js/pull/18742) [BUGFIX] Fix `setDiff` computed macro used within glimmer component
@@ -603,16 +603,16 @@
 - [#18780](https://github.com/emberjs/ember.js/pull/18780) [BUGFIX] Fix `owner.ownerInjection()` when used to create services directly
 - [#18810](https://github.com/emberjs/ember.js/pull/18810) [BUGFIX] Do not error (RE: elementId changing) if elementId is not changed
 
-### v3.16.3 (February 18, 2020)
+## v3.16.3 (February 18, 2020)
 
 - [#18730](https://github.com/emberjs/ember.js/pull/18730) Workaround for the Glimmer VM bug which encodes/decodes integer literals correctly.
 
-### v3.16.2 (February 10, 2020)
+## v3.16.2 (February 10, 2020)
 
 - [#18721](https://github.com/emberjs/ember.js/pull/18721) [BUGFIX] Backport autotracking bugfixes
 - [#18729](https://github.com/emberjs/ember.js/pull/18729) [BUGFIX] Remove deprecation for instantiation of new singleton instances (e.g. a service) during teardown (originally added in 3.16.1 by [#18717](https://github.com/emberjs/ember.js/pull/18717)).
 
-### v3.16.1 (January 31, 2020)
+## v3.16.1 (January 31, 2020)
 
 - [#18691](https://github.com/emberjs/ember.js/pull/18691) [BUGFIX] Updated `component` and `helper` blueprints to use `import { hbs } from 'ember-cli-htmlbars'`.
 - [#18698](https://github.com/emberjs/ember.js/pull/18698) [BUGFIX] Ensure tag updates are buffered
@@ -620,13 +620,13 @@
 - [#18717](https://github.com/emberjs/ember.js/pull/18717) [BUGFIX] Ensure instantiation cannot happen after destruction.
 - [#18720](https://github.com/emberjs/ember.js/pull/18720) [BUGFIX] Ensure correct `@ember/edition-utils` is used (1.2.0).
 
-### v3.16.0 (January 20, 2020)
+## v3.16.0 (January 20, 2020)
 
 - [#18436](https://github.com/emberjs/ember.js/pull/18436) [DEPRECATION] Deprecate globals resolver per [RFC #331](https://github.com/emberjs/rfcs/blob/master/text/0331-deprecate-globals-resolver.md).
 - [#18668](https://github.com/emberjs/ember.js/pull/18668) [BUGFIX] Fix some scenarios where the "backtracking assertion" would be thrown by consuming tags after fully getting values
 - [#18651](https://github.com/emberjs/ember.js/pull/18651) [BUGFIX] Async functions were incorrectly treated as falsey in template conditionals
 
-### v3.15.0 (December 9, 2019)
+## v3.15.0 (December 9, 2019)
 
 - [#17948](https://github.com/emberjs/ember.js/pull/17948) [DEPRECATION] Deprecate `Component#isVisible` per [RFC #324](https://github.com/emberjs/rfcs/blob/master/text/0324-deprecate-component-isvisible.md).
 - [#18491](https://github.com/emberjs/ember.js/pull/18491) [DEPRECATION] Deprecate `{{partial}}` per [RFC #449](https://github.com/emberjs/rfcs/blob/master/text/0449-deprecate-partials.md).
@@ -634,20 +634,20 @@
 - [#18554](https://github.com/emberjs/ember.js/pull/18554) [BREAKING BUGFIX] Adds autotracking transaction
 - [#17834](https://github.com/emberjs/ember.js/pull/17834) [BUGFIX] Prevents autotracking ArrayProxy creation
 
-### v3.14.3 (December 3, 2019)
+## v3.14.3 (December 3, 2019)
 
 - [#18582](https://github.com/emberjs/ember.js/pull/18582) [BUGFIX] Ensure `loader.js` is transpiled to the applications specified targets (from `config/targets.js`).
 
-### v3.14.2 (November 20, 2019)
+## v3.14.2 (November 20, 2019)
 
 - [#18539](https://github.com/emberjs/ember.js/pull/18539) / [#18548](https://github.com/emberjs/ember.js/pull/18548) [BUGFIX] Fix issues with the new APIs to be used by ember-inspector for building the "component's tree" including `@glimmer/component`.
 - [#18549](https://github.com/emberjs/ember.js/pull/18549) [BUGFIX] Add component reference to the mouse event handler deprecation warnings.
 
-### v3.14.1 (October 30, 2019)
+## v3.14.1 (October 30, 2019)
 
 - [#18244](https://github.com/emberjs/ember.js/pull/18244) [BUGFIX] Fix query param assertion when using the router services `transitionTo` to redirect _during_ an existing transition.
 
-### v3.14.0 (October 29, 2019)
+## v3.14.0 (October 29, 2019)
 
 - [#18345](https://github.com/emberjs/ember.js/pull/18345) / [#18363](https://github.com/emberjs/ember.js/pull/18363) [FEATURE] Implement the [Provide @model named argument to route templates](https://github.com/emberjs/rfcs/blob/master/text/0523-model-argument-for-route-templates.md) RFC.
 - [#18458](https://github.com/emberjs/ember.js/pull/18458) [BUGFIX] Using query params helper outside of link-to
@@ -657,26 +657,26 @@
 - [#18381](https://github.com/emberjs/ember.js/pull/18381) Drop Node 6 and 11 support.
 - [#18410](https://github.com/emberjs/ember.js/pull/18410) Use ember-cli-htmlbars for inline precompilation if possible.
 
-### v3.13.4 (October 29,2019)
+## v3.13.4 (October 29,2019)
 
 - [#18476](https://github.com/emberjs/ember.js/pull/18476) [BUGFIX] Ensure model can be observed by sync observers.
 - [#18477](https://github.com/emberjs/ember.js/pull/18477) [BUGFIX] Allows @each to work with arrays that contain falsy values.
 - [#18500](https://github.com/emberjs/ember.js/pull/18500) [BUGFIX] Remove requirement for disabling jquery-integration in Octane.
 
-### v3.13.3 (October 8, 2019)
+## v3.13.3 (October 8, 2019)
 
 - [#18462](https://github.com/emberjs/ember.js/pull/18462) [BUGFIX] Prevents observer re-entry.
 
-### v3.13.2 (September 25, 2019)
+## v3.13.2 (September 25, 2019)
 
 - [#18429](https://github.com/emberjs/ember.js/pull/18429) [BUGFIX] Fix incorrect error message when opting into using Octane, and missing optional features.
 
-### v3.13.1 (September 23, 2019)
+## v3.13.1 (September 23, 2019)
 
 - [#18273](https://github.com/emberjs/ember.js/pull/18273) [BUGFIX] Fix issues with SSR rehydration of <title>.
 - [#18418](https://github.com/emberjs/ember.js/pull/18418) / [#18419](https://github.com/emberjs/ember.js/pull/18419) [BUGFIX] Require Octane features when using Octane preview.
 
-### v3.13.0 (September 19, 2019)
+## v3.13.0 (September 19, 2019)
 
 - [#16366](https://github.com/emberjs/ember.js/pull/16366) / [#16903](https://github.com/emberjs/ember.js/pull/16903) / [#17572](https://github.com/emberjs/ember.js/pull/17572) / [#17682](https://github.com/emberjs/ember.js/pull/17682) / [#17765](https://github.com/emberjs/ember.js/pull/17765) / [#17751](https://github.com/emberjs/ember.js/pull/17751) / [#17835](https://github.com/emberjs/ember.js/pull/17835) / [#18059](https://github.com/emberjs/ember.js/pull/18059) / [#17951](https://github.com/emberjs/ember.js/pull/17951) / [#18069](https://github.com/emberjs/ember.js/pull/18069) / [#18074](https://github.com/emberjs/ember.js/pull/18074) / [#18073](https://github.com/emberjs/ember.js/pull/18073) / [#18091](https://github.com/emberjs/ember.js/pull/18091) / [#18186](https://github.com/emberjs/ember.js/pull/18186) / [#18223](https://github.com/emberjs/ember.js/pull/18223) / [#18358](https://github.com/emberjs/ember.js/pull/18358) / [#18266](https://github.com/emberjs/ember.js/pull/18266) [FEATURE] Implement the [Tracked Properties](https://github.com/emberjs/rfcs/blob/master/text/0410-tracked-properties.md) and [Tracked Property Updates](https://github.com/emberjs/rfcs/blob/master/text/0478-tracked-properties-updates.md) RFCs.
 - [#18158](https://github.com/emberjs/ember.js/pull/18158) / [#18203](https://github.com/emberjs/ember.js/pull/18203) / [#18198](https://github.com/emberjs/ember.js/pull/18198) / [#18190](https://github.com/emberjs/ember.js/pull/18190) / [#18394](https://github.com/emberjs/ember.js/pull/18394) [FEATURE] Implement the [Component Templates Co-location](https://github.com/emberjs/rfcs/blob/master/text/0481-component-templates-co-location.md) RFC, including the setComponentTemplate(), getComponentTemplate() and templateOnlyComponent() APIs. Note that while these low-level APIs are enabled, the co-location feature is only enabled in Octane apps as of this release. This restriction will be removed in a future version.
@@ -702,25 +702,25 @@
 - [#18217](https://github.com/emberjs/ember.js/pull/18217) [BUGFIX] Adds ability for computed props to depend on args
 - [#18222](https://github.com/emberjs/ember.js/pull/18222) [BUGFIX] Matches assertion behavior for CPs computing after destroy
 
-### v3.12.4 (May 21, 2020)
+## v3.12.4 (May 21, 2020)
 
 - [#18879](https://github.com/emberjs/ember.js/pull/18879) Ensure errors thrown during component construction do not cause (unrelated) errors during application teardown (fixes a common issue when using `setupOnerror` with components asserting during `constructor`/`init`/`didInssertElement`).
 - [#18273](https://github.com/emberjs/ember.js/pull/18273) [BUGFIX] Fix issues with SSR rehydration of <title>.
 
-### v3.12.3 (March 12, 2020)
+## v3.12.3 (March 12, 2020)
 
 - [#18809](https://github.com/emberjs/ember.js/pull/18809) [BUGFIX] Do not error (RE: `elementId` changing) if `elementId` is not changed
 
-### v3.12.2 (December 4, 2019)
+## v3.12.2 (December 4, 2019)
 
 - [#18576](https://github.com/emberjs/ember.js/pull/18576) [BUGFIX] Fix leftover `const` expressions in legacy builds
 
-### v3.12.1 (November 20, 2019)
+## v3.12.1 (November 20, 2019)
 
 - [#18244](https://github.com/emberjs/ember.js/pull/18244) Fix query param assertion when using the router services `transitionTo` to redirect _during_ an existing transition.
 - [#18458](https://github.com/emberjs/ember.js/pull/18458) / [#18555](https://github.com/emberjs/ember.js/pull/18555) Ensure `(query-params)` helper can be used outside of direct `{{link-to}}` / `<LinkTo />` invocation.
 
-### v3.12.0 (August 5, 2019)
+## v3.12.0 (August 5, 2019)
 
 - [#18159](https://github.com/emberjs/ember.js/pull/18159) [BUGFIX] Update router.js to ensure buildRouteInfoMetadata does not eagerly cache routes in lazy Engines
 - [#18226](https://github.com/emberjs/ember.js/pull/18226) [BUGFIX] Fix routing path with double slash (#18226)
@@ -728,12 +728,12 @@
 - [#18150](https://github.com/emberjs/ember.js/pull/18150) [BUGFIX] Fix a memory retention issue with string-based event listeners
 - [#18124](https://github.com/emberjs/ember.js/pull/18124) [CLEANUP] Remove deprecated `NAME_KEY`
 
-### v3.11.1 (June 27, 2019)
+## v3.11.1 (June 27, 2019)
 
 - [#18159](https://github.com/emberjs/ember.js/pull/18159) Ensure `RouteInfo` object's do not eagerly cache routes in lazy Engines
 - [#18150](https://github.com/emberjs/ember.js/pull/18150) Ensure string based event listeners that are removed are not retained
 
-### v3.11.0 (June 24, 2019)
+## v3.11.0 (June 24, 2019)
 
 - [#17842](https://github.com/emberjs/ember.js/pull/17842) / [#17901](https://github.com/emberjs/ember.js/pull/17901) [FEATURE] Implement the [Forwarding Element Modifiers with "Splattributes" RFC](https://github.com/emberjs/rfcs/blob/master/text/0435-modifier-splattributes.md).
 - [#17941](https://github.com/emberjs/ember.js/pull/17941) / [#17961](https://github.com/emberjs/ember.js/pull/17961) [FEATURE] Implement the [{{fn}} rfc](https://github.com/emberjs/rfcs/blob/master/text/0470-fn-helper.md).
@@ -745,17 +745,17 @@
 - [#17940](https://github.com/emberjs/ember.js/pull/17940) [CLEANUP] Remove `sync` queue from @ember/runloop.
 - [#18110](https://github.com/emberjs/ember.js/pull/18110) [BUGFIX] Ensure calling `recompute` on a class-based helper causes it to recompute
 
-### v3.10.2 (June 18, 2019)
+## v3.10.2 (June 18, 2019)
 
 - [#17971](https://github.com/emberjs/ember.js/pull/17971) [BUGFIX] Ensure query param only link-to's work in error states.
 - [#18080](https://github.com/emberjs/ember.js/pull/18080) [BUGFIX] Ensure that `ember-template-compiler` can be used during FastBoot runtime.
 
-### v3.10.1 (June 4, 2019)
+## v3.10.1 (June 4, 2019)
 
 - [#18071](https://github.com/emberjs/ember.js/pull/18071) [BUGFIX] Ensure modifiers do not run in FastBoot modes. (#18071)
 - [#18064](https://github.com/emberjs/ember.js/pull/18064) [BUGFIX] Fix 'hasAttribute is not a function' when jQuery is disabled (#18064)
 
-### v3.10.0 (May 13, 2019)
+## v3.10.0 (May 13, 2019)
 
 - [#17836](https://github.com/emberjs/ember.js/pull/17836) [BREAKING] Explicitly drop support for Node 6
 - [#17719](https://github.com/emberjs/ember.js/pull/17719) / [#17745](https://github.com/emberjs/ember.js/pull/17745) [FEATURE] Support for nested components in angle bracket invocation syntax (see [emberjs/rfcs#0457](https://github.com/emberjs/rfcs/blob/master/text/0457-nested-lookups.md)).
@@ -782,31 +782,31 @@
 - [#17411](https://github.com/emberjs/ember.js/pull/17411) / [#17732](https://github.com/emberjs/ember.js/pull/17732) / [#17412](https://github.com/emberjs/ember.js/pull/17412) Update initializer blueprints for ember-mocha 0.14
 - [#17702](https://github.com/emberjs/ember.js/pull/17702) Extend from glimmer component for octane blueprint
 
-### v3.9.1 (April 09, 2019)
+## v3.9.1 (April 09, 2019)
 
 - [#17870](https://github.com/emberjs/ember.js/pull/17870) / [#17871](https://github.com/emberjs/ember.js/pull/17871) [BUGFIX] Fix issue where `...attributes` may incorrectly overwrite attributes, depending on its position.
 - [#17874](https://github.com/emberjs/ember.js/pull/17874) [BUGFIX] Fix issue with `event.stopPropagation()` in component event handlers when jQuery is disabled.
 - [#17876](https://github.com/emberjs/ember.js/pull/17876) [BUGFIX] Fix issue with multiple `{{action}}` modifiers on the same element when jQuery is disabled.
 
-### v3.8.3 (June 28, 2019)
+## v3.8.3 (June 28, 2019)
 
 - [#18159](https://github.com/emberjs/ember.js/pull/18159) [BUGFIX] Ensure `RouteInfo` object's do not eagerly cache routes in lazy Engines
 - [#18150](https://github.com/emberjs/ember.js/pull/18150) [BUGFIX] Ensure string based event listeners that are removed are not retained
 - [#18080](https://github.com/emberjs/ember.js/pull/18080) [BUGFIX] Fix `ember-template-compiler` compatibility with Fastboot.
 
-### v3.8.2 (June, 4, 2019)
+## v3.8.2 (June, 4, 2019)
 
 - [#18071](https://github.com/emberjs/ember.js/pull/18071) [BUGFIX] Ensure modifiers do not run in FastBoot modes. (#18071)
 - [#18064](https://github.com/emberjs/ember.js/pull/18064) [BUGFIX] Fix 'hasAttribute is not a function' when jQuery is disabled (#18064)
 - [#17974](https://github.com/emberjs/ember.js/pull/17974) [BUGFIX] Ensure inheritable observers on object proxies are string based
 - [#17859](https://github.com/emberjs/ember.js/pull/17859) [BUGFIX] Fixes a regression in the legacy build
 
-### v3.8.1 (April 02, 2019)
+## v3.8.1 (April 02, 2019)
 
 - [#17684](https://github.com/emberjs/ember.js/pull/17684) [BUGFIX] Enable maximum rerendering limit to be customized.
 - [#17823](https://github.com/emberjs/ember.js/pull/17823) Update router_js to 6.2.4
 
-### v3.9.0 (April 01, 2019)
+## v3.9.0 (April 01, 2019)
 
 - [#17470](https://github.com/emberjs/ember.js/pull/17470) [DEPRECATION] Implements the Computed Property Modifier deprecation RFCs
   * Deprecates `.property()` (see [emberjs/rfcs#0375](https://github.com/emberjs/rfcs/blob/master/text/0375-deprecate-computed-property-modifier.md)
@@ -824,7 +824,7 @@
 - [#17649](https://github.com/emberjs/ember.js/pull/17649) [BUGFIX] Revert decorator refactors
 - [#17487](https://github.com/emberjs/ember.js/pull/17487) [BUGFIX] Fix scenario where aliased properties did not update in production mode
 
-### v3.8.0 (February 18, 2019)
+## v3.8.0 (February 18, 2019)
 
 - [#17143](https://github.com/emberjs/ember.js/pull/17143) / [#17375](https://github.com/emberjs/ember.js/pull/17375) [FEATURE] Implement Element Modifier Manager RFC (see [emberjs/rfcs#0373](https://github.com/emberjs/rfcs/blob/master/text/0373-Element-Modifier-Managers.md)).
 - [#17054](https://github.com/emberjs/ember.js/pull/17054) / [#17376](https://github.com/emberjs/ember.js/pull/17376) [FEATURE] Implement `array` helper RFC (see [emberjs/rfcs#0318](https://github.com/emberjs/rfcs/blob/master/text/0318-array-helper.md))
@@ -845,23 +845,23 @@ Fixes a few issues:
 - [#17340](https://github.com/emberjs/ember.js/pull/17340) Remove unused `hooks` variable from qunit-rfc-232 util-test blueprint
 - [#17357](https://github.com/emberjs/ember.js/pull/17357) Allow notifyPropertyChange to be imported from @ember/object
 
-### v3.7.3 (February 6, 2019)
+## v3.7.3 (February 6, 2019)
 
 - [#17563](https://github.com/emberjs/ember.js/pull/17563) [BUGFIX] Transition.send/trigger call signature
 - [#17552](https://github.com/emberjs/ember.js/pull/17552) [BUGFIX] Support numbers in component names for Angle Brackets
 
-### v3.7.2 (January 22, 2019)
+## v3.7.2 (January 22, 2019)
 
 * Upgrade @glimmer/* packages to 0.36.6. Fixes a few issues:
   * Usage of positional arguments with custom components.
   * Forwarding attributes via `...attributes` to a dynamic component.
   * Prevent errors when rendering many template blocks (`Error: Operand over 16-bits. Got 65536`).
 
-### v3.7.1 (January 21, 2019)
+## v3.7.1 (January 21, 2019)
 
 - [#17461](https://github.com/emberjs/ember.js/pull/17461) [BUGFIX] Fix substate interactions with aborts
 
-### v3.7.0 (January 7, 2019)
+## v3.7.0 (January 7, 2019)
 
 - [#17254](https://github.com/emberjs/ember.js/pull/17254) [BREAKING] Explicitly drop support for Node 4
 - [#17426](https://github.com/emberjs/ember.js/pull/17426) [BUGFIX] Fix 'strict mode does not allow function declarations'
@@ -875,12 +875,12 @@ Fixes a few issues:
 - [#17133](https://github.com/emberjs/ember.js/pull/17133) [CLEANUP] Remove deprecated 'property{Did,Will}Change'
 - [#16898](https://github.com/emberjs/ember.js/pull/16898) Add RFC 232 style util test blueprint for Mocha
 
-### v3.6.1 (December 18, 2018)
+## v3.6.1 (December 18, 2018)
 
 - [#17328](https://github.com/emberjs/ember.js/pull/17328) [BUGFIX] Ensure that delayed transition retrys work
 - [#17374](https://github.com/emberjs/ember.js/pull/17374) [BUGFIX] Fix cyclic references on Array.prototype
 
-### v3.6.0 (December 6, 2018)
+## v3.6.0 (December 6, 2018)
 
 - [#17025](https://github.com/emberjs/ember.js/pull/17025) / [#17034](https://github.com/emberjs/ember.js/pull/17034) / [#17036](https://github.com/emberjs/ember.js/pull/17036) / [#17038](https://github.com/emberjs/ember.js/pull/17038) / [#17040](https://github.com/emberjs/ember.js/pull/17040) / [#17041](https://github.com/emberjs/ember.js/pull/17041) / [#17061](https://github.com/emberjs/ember.js/pull/17061) [FEATURE] Final stage of the router service RFC (see [emberjs/rfcs#95](https://github.com/emberjs/rfcs/blob/master/text/0095-router-service.md)
 - [#16795](https://github.com/emberjs/ember.js/pull/16795) [FEATURE] Native Class Constructor Update (see [emberjs/rfcs#337](https://github.com/emberjs/rfcs/blob/master/text/0337-native-class-constructor-update.md)
@@ -903,57 +903,57 @@ Fixes a few issues:
 - [#16865](https://github.com/emberjs/ember.js/pull/16865) / [#16899](https://github.com/emberjs/ember.js/pull/16899) / [#16914](https://github.com/emberjs/ember.js/pull/16914) / [#16897](https://github.com/emberjs/ember.js/pull/16897) / [#16913](https://github.com/emberjs/ember.js/pull/16913) / [#16894](https://github.com/emberjs/ember.js/pull/16894) / [#16896](https://github.com/emberjs/ember.js/pull/16896) [BUGFIX] Support RFC 232 and RFC 268 style tests with Mocha blueprints
 - [#17051](https://github.com/emberjs/ember.js/pull/17051) Update glimmer-vm packages to 0.36.4
 
-### v3.5.1 (October 29, 2018)
+## v3.5.1 (October 29, 2018)
 
 - [#17028](https://github.com/emberjs/ember.js/pull/17028) Mark `defineProperty` as public (yet low level) API.
 - [#17115](https://github.com/emberjs/ember.js/pull/17115) [BUGFIX] Pass the event parameter to sendAction
 - [#17128](https://github.com/emberjs/ember.js/pull/17128) [BUGFIX] Fix sourcemaping issues due to multiple sourcemap directives.
 - [#17130](https://github.com/emberjs/ember.js/pull/17130) [BUGFIX] Ensure that timers scheduled after a system sleep are fired properly.
 
-### v3.5.0 (October 8, 2018)
+## v3.5.0 (October 8, 2018)
 
 - [#16978](https://github.com/emberjs/ember.js/pull/16978) [BUGFIX] Properly teardown alias
 - [#16877](https://github.com/emberjs/ember.js/pull/16877) [CLEANUP] Allow routes to be named "array" and "object"
 
-### v3.4.8 (January 22, 2019)
+## v3.4.8 (January 22, 2019)
 
 * Upgrade @glimmer/* packages to 0.35.10. Fixes a few issues:
   * Usage of positional arguments with custom components.
   * Forwarding attributes via `...attributes` to a dynamic component.
   * Prevent errors when rendering many template blocks (`Error: Operand over 16-bits. Got 65536`).
 
-### v3.4.7 (December 7, 2018)
+## v3.4.7 (December 7, 2018)
 
 - [#17271](https://github.com/emberjs/ember.js/pull/17271) [BUGFIX] Update `backburner.js` to 2.4.2.
 
-### v3.4.6 (October 29, 2018)
+## v3.4.6 (October 29, 2018)
 
 - [#17115](https://github.com/emberjs/ember.js/pull/17115) [BUGFIX] Ensure `{{input` continues to pass the event to the actions that it fires.
 - [#17128](https://github.com/emberjs/ember.js/pull/17128) [BUGFIX] Fix invalid sourcemap declarations.
 - [#17130](https://github.com/emberjs/ember.js/pull/17130) [BUGFIX] Ensure that timers scheduled after a system sleep are fired properly.
 
-### v3.4.5 (October 4, 2018)
+## v3.4.5 (October 4, 2018)
 
 - [#17029](https://github.com/emberjs/ember.js/pull/17029) [BUGFIX] Update backburner.js to 2.4.0.
 
-### v3.4.4 (September 27, 2018)
+## v3.4.4 (September 27, 2018)
 
 - [#17013](https://github.com/emberjs/ember.js/pull/17013) [BUGFIX] Fix rendering of empty content with `{{{...}}}` or `{{...}}` with `htmlSafe('')` in IE11
 
-### v3.4.3 (September 25, 2018)
+## v3.4.3 (September 25, 2018)
 
 - [#17003](https://github.com/emberjs/ember.js/pull/17003) [BUGFIX] Fix rendering of empty content with `{{{...}}}` or `{{...}}` with `htmlSafe('')`
 
-### v3.4.2 (September 24, 2018)
+## v3.4.2 (September 24, 2018)
 
 - [#16860](https://github.com/emberjs/ember.js/pull/16860) [BUGFIX] Clear chains in ProxyMixin when destroyed
 - [#16999](https://github.com/emberjs/ember.js/pull/16999) [BUGFIX] Fix mouseEnter/Leave event delegation without jQuery
 
-### v3.4.1 (September 10, 2018)
+## v3.4.1 (September 10, 2018)
 
 - [#16933](https://github.com/emberjs/ember.js/pull/16933) [BUGFIX] Update glimmer-vm packages to 0.35.8
 
-### v3.4.0 (August 27, 2018)
+## v3.4.0 (August 27, 2018)
 
 - [#16603](https://github.com/emberjs/ember.js/pull/16603) [BUGFIX] Support mouseEnter/Leave events w/o jQuery
 - [#16857](https://github.com/emberjs/ember.js/pull/16857) [BUGFIX] Prevents the recursive redefinition of root chains
@@ -968,16 +968,16 @@ Fixes a few issues:
 - [#16794](https://github.com/emberjs/ember.js/pull/16794) [BUGFIX] Fix instance-initializer-test blueprint for new QUnit testing API ([emberjs/rfcs#232](https://github.com/emberjs/rfcs/pull/232))
 - [#16797](https://github.com/emberjs/ember.js/pull/16797) [BUGFIX] Drop autorun assertion
 
-### v3.3.2 (August 20, 2018)
+## v3.3.2 (August 20, 2018)
 
 - [#16853](https://github.com/emberjs/ember.js/pull/16853) [BUGFIX] Allow ArrayProxy#pushObjects to accept ArrayProxy again
 - [#16870](https://github.com/emberjs/ember.js/pull/16870) [BUGFIX] Enable @ember/object#get to be called with an empty string
 
-### v3.3.1 (July 23, 2018)
+## v3.3.1 (July 23, 2018)
 
 - [#16836](https://github.com/emberjs/ember.js/pull/16836/commits) [DOC] Fix Broken 3.3 API Documentation
 
-### v3.3.0 (July 16, 2018)
+## v3.3.0 (July 16, 2018)
 
 - [#16687](https://github.com/emberjs/ember.js/pull/16687) [FEATURE] Implement optional jQuery integration (see [emberjs/rfcs#294](https://github.com/emberjs/rfcs/blob/master/text/0294-optional-jquery.md) for more details).
 - [#16690](https://github.com/emberjs/ember.js/pull/16690) [DEPRECATION] [emberjs/rfcs#294](emberjs/rfcs#294) Deprecate accessing `jQuery.Event#originalEvent`.
@@ -992,15 +992,15 @@ Fixes a few issues:
 - [#16619](https://github.com/emberjs/ember.js/pull/16619) [BUGFIX] Update router_js to ensure `(hash` works in query params.
 - [#16632](https://github.com/emberjs/ember.js/pull/16632) [BUGFIX] computed.sort array should update if sort properties array is empty/
 
-### v3.2.2 (June 21, 2018)
+## v3.2.2 (June 21, 2018)
 
 - [#16754](https://github.com/emberjs/ember.js/pull/16754) [BUGFIX] Fix container destroy timing
 
-### v3.2.1 (June 19, 2018)
+## v3.2.1 (June 19, 2018)
 
 - [#16750](https://github.com/emberjs/ember.js/pull/16750) [BUGFIX] Bring back isObject guard for ember-utils/is_proxy
 
-### v3.2.0 (May 31, 2018)
+## v3.2.0 (May 31, 2018)
 
 - [#16613](https://github.com/emberjs/ember.js/pull/16613) [BUGFIX] Prevent errors in ember-engines + 3.1 + proxies.
 - [#16597](https://github.com/emberjs/ember.js/pull/16597) [BUGFIX] Ensure `Ember.run.cancelTimers` is present.
@@ -1033,21 +1033,21 @@ Fixes a few issues:
 - [#16462](https://github.com/emberjs/ember.js/pull/16462) [CLEANUP] Remove deprecated `MODEL_FACTORY_INJECTIONS`.
 - [emberjs/rfcs#286](https://github.com/emberjs/rfcs/blob/master/text/0286-block-let-template-helper.md) [FEATURE] Enabled block `let` handlebars helper by default.
 
-### v3.1.4 (August 07, 2018)
+## v3.1.4 (August 07, 2018)
 
 - [#16565](https://github.com/emberjs/ember.js/pull/16565) Fix template / component caching during rendering.
 - [#16853](https://github.com/emberjs/ember.js/pull/16853) [BUGFIX] Allow ArrayProxy#pushObjects to accept ArrayProxy again
 
-### v3.1.3 (June 21, 2018)
+## v3.1.3 (June 21, 2018)
 - [#16754](https://github.com/emberjs/ember.js/pull/16754) [BUGFIX] Fix container destroy timing
 
-### v3.1.2 (May 7, 2018)
+## v3.1.2 (May 7, 2018)
 - [#16600](https://github.com/emberjs/ember.js/pull/16600) [BUGFIX] Fix SimpleHelper memory leak
 - [#16605](https://github.com/emberjs/ember.js/pull/16605) [BUGFIX] Use resetCache on container destroy.
 - [182fc3](https://github.com/emberjs/ember.js/commit/182fc315664e8b4847f03133cc01e38767cad41e) [BUGFIX] Update glimmer-vm to ensure arguments are properly garbage collected.
 - [#16281](https://github.com/emberjs/ember.js/pull/16281) [BUGFIX] Ensure warning from `{{#link-to` RE: loading state does not throw an assertion.
 
-### v3.1.1 (April 23, 2018)
+## v3.1.1 (April 23, 2018)
 - [#16559](https://github.com/emberjs/ember.js/pull/16559) [BUGFIX] Fix property normalization, Update glimmer-vm to 0.34.0
 - [#16493](https://github.com/emberjs/ember.js/pull/16493) [BUGFIX] Ensure proxies have access to `getOwner(this)`.
 - [#16496](https://github.com/emberjs/ember.js/pull/16496) [BUGFIX] Add exception for `didRemoveListener` so evented proxy objects can function
@@ -1058,7 +1058,7 @@ Fixes a few issues:
 - [#16564](https://github.com/emberjs/ember.js/pull/16564) [BUGFIX] Ensure Ember.isArray does not trigger proxy assertion.
 - [#16572](https://github.com/emberjs/ember.js/pull/16572) [BUGFIX] Fix curly component class reference setup
 
-### v3.1.0 (April 10, 2018)
+## v3.1.0 (April 10, 2018)
 - [#16293](https://github.com/emberjs/ember.js/pull/16293) [BUGFIX] Ignore --pod for -addon blueprints: helper, initializer, and instance-initializer
 - [#16312](https://github.com/emberjs/ember.js/pull/16312) [DEPRECATION] Deprecate `Route.prototype.router` in favor of `Route.prototype._router`
 - [#16326](https://github.com/emberjs/ember.js/pull/16326) [BUGFIX] Expanded syntax error for if handlebars helper to include source of error
@@ -1074,7 +1074,7 @@ Fixes a few issues:
 - [emberjs/rfcs#281](https://github.com/emberjs/rfcs/blob/master/text/0281-es5-getters.md) [FEATURE native-es5-getters] Enabled by default.
 - [#15828](https://github.com/emberjs/ember.js/pull/15828) Upgrade glimmer-vm to latest version.
 
-### v3.0.0 (February 13, 2018)
+## v3.0.0 (February 13, 2018)
 
 - [#16218](https://github.com/emberjs/ember.js/pull/16218) [BUGFIX beta] Prevent errors when using const `(get arr 1)`.
 - [#16241](https://github.com/emberjs/ember.js/pull/16241) [BUGFIX lts] Avoid excessively calling Glimmer AST transforms.
@@ -1135,16 +1135,16 @@ Fixes a few issues:
 - [#16036](https://github.com/emberjs/ember.js/pull/16036) [CLEANUP] Convert ember-metal accessors tests to new style
 - [#16023](https://github.com/emberjs/ember.js/pull/16023) Make event dispatcher work without jQuery
 
-### 2.18.2 (February 14, 2018)
+## 2.18.2 (February 14, 2018)
 
 - [#16245](https://github.com/emberjs/ember.js/pull/16245) [BUGFIX] Ensure errors in deferred component hooks can be recovered.
 
-### 2.18.1 (February 13, 2018)
+## 2.18.1 (February 13, 2018)
 
 - [#16174](https://github.com/emberjs/ember.js/pull/16174) [BUGFIX] Enable _some_ recovery of errors thrown during render.
 - [#16241](https://github.com/emberjs/ember.js/pull/16241) [BUGFIX] Avoid excessively calling Glimmer AST transforms.
 
-### 2.18.0 (January 1, 2018)
+## 2.18.0 (January 1, 2018)
 
 - [95b449](https://github.com/emberjs/ember.js/commit/95b4499b3667712a202bef834268e23867fc8842) [BUGFIX] Ensure `Ember.run.cancel` while the run loop is flushing works properly.
 - [#15952](https://github.com/emberjs/ember.js/pull/15952) [BUGFIX] fix regression of clicking link-to with disabled=true
@@ -1158,12 +1158,12 @@ Fixes a few issues:
 - [#14590](https://github.com/emberjs/ember.js/pull/14590) [DEPRECATION] Deprecate using `targetObject`.
 - [#15754](https://github.com/emberjs/ember.js/pull/15754) [CLEANUP] Remove `router.router` deprecation.
 
-### 2.17.1 (February 13, 2018)
+## 2.17.1 (February 13, 2018)
 
 - [#16174](https://github.com/emberjs/ember.js/pull/16174) [BUGFIX] Enable _some_ recovery of errors thrown during render.
 - [#16241](https://github.com/emberjs/ember.js/pull/16241) [BUGFIX] Avoid excessively calling Glimmer AST transforms.
 
-### 2.17.0 (November 29, 2017)
+## 2.17.0 (November 29, 2017)
 
 - [#15855](https://github.com/emberjs/ember.js/pull/15855) [BUGFIX] fix regression with computed `filter/map/sort`
 - [#15871](https://github.com/emberjs/ember.js/pull/15871) [BUGFIX lts] Refactor / fix error handling scenarios.
@@ -1186,25 +1186,25 @@ Fixes a few issues:
 - [#15265](https://github.com/emberjs/ember.js/pull/15265) [BUGFIX] fixed issue when passing `false` to `activeClass` for `{{link-to}}`
 - [#15672](https://github.com/emberjs/ember.js/pull/15672) Update router_js to 2.0.0.
 
-### 2.16.3 (February 13, 2018)
+## 2.16.3 (February 13, 2018)
 
 - [#15927](https://github.com/emberjs/ember.js/pull/15927) blueprints: Extend test framework detection to `ember-qunit` and `ember-mocha`
 - [#15935](https://github.com/emberjs/ember.js/pull/15935) [BUGFIX] blueprints: fix framework detection to work with prerelease versions of ember-cli-mocha
 - [#16174](https://github.com/emberjs/ember.js/pull/16174) [BUGFIX] Enable _some_ recovery of errors thrown during render.
 - [#16241](https://github.com/emberjs/ember.js/pull/16241) [BUGFIX] Avoid excessively calling Glimmer AST transforms.
 
-### 2.16.2 (November 1, 2017)
+## 2.16.2 (November 1, 2017)
 
 - [#15797](https://github.com/emberjs/ember.js/pull/15797) [BUGFIX] Fix issues with using partials nested within other partials.
 
-### 2.16.1 (October 29, 2017)
+## 2.16.1 (October 29, 2017)
 
 - [#15722](https://github.com/emberjs/ember.js/pull/15722) [BUGFIX] Avoid assertion when using `(get` helper with empty paths.
 - [#15746](https://github.com/emberjs/ember.js/pull/15746) [BUGFIX] Fix computed sort regression when array property is initially `null`.
 - [#15613](https://github.com/emberjs/ember.js/pull/15613) [BUGFIX] Prevent an error from being thrown when partial set of query params are passed to the router service.
 - [#15777](https://github.com/emberjs/ember.js/pull/15777) [BUGFIX] Fix various issues around accessing dynamic data within a partial.
 
-### 2.16.0 (October 9, 2017)
+## 2.16.0 (October 9, 2017)
 
 - [#15604](https://github.com/emberjs/ember.js/pull/15604) Data Adapter: Only trigger model type update if the record live array count actually changed
 - [#15610](https://github.com/emberjs/ember.js/pull/15610) [BUGFIX] add inflection to dependencies
@@ -1223,21 +1223,21 @@ Fixes a few issues:
 - [#15528](https://github.com/emberjs/ember.js/pull/15528) [DEPRECATION] Deprecate `Controller#content` alias.
 - [#15552](https://github.com/emberjs/ember.js/pull/15552) [FEATURE] Update blueprints and tests to RFC #176.
 
-### 2.15.3 (October 9, 2017)
+## 2.15.3 (October 9, 2017)
 
 - [#15718](https://github.com/emberjs/ember.js/pull/15718) [BUGFIX] bump backburner (fixes clock + autorun interop)
 
-### 2.15.2 (October 4, 2017)
+## 2.15.2 (October 4, 2017)
 
 - [#15604](https://github.com/emberjs/ember.js/pull/15604) [BUGFIX] Ember Inspector Data Adapter: Only trigger model type update if the record live array count actually changed.
 - [#15695](https://github.com/emberjs/ember.js/pull/15695) [BUGFIX] Avoid creating event dispatcher in FastBoot with Engines.
 
-### 2.15.1 (October 2, 2017)
+## 2.15.1 (October 2, 2017)
 
 - [#15600](https://github.com/emberjs/ember.js/pull/15600) [BUGFIX] ensure “pause on exception” pauses in the right place.
 - [#15689](https://github.com/emberjs/ember.js/pull/15689) [BUGFIX] Mark error as handled before transition for error routes and substates.
 
-### 2.15.0 (August 31, 2017)
+## 2.15.0 (August 31, 2017)
 
 - [#15577](https://github.com/emberjs/ember.js/pull/15577) [BUGFIX] Include missing sourcemaps in vendorTree.
 - [#14848](https://github.com/emberjs/ember.js/pull/14848) [BUGFIX] Allow boolean values for current-when
@@ -1257,7 +1257,7 @@ Fixes a few issues:
 - [#14805](https://github.com/emberjs/ember.js/pull/14805) / [#14861](https://github.com/emberjs/ember.js/pull/14861) / [#14979](https://github.com/emberjs/ember.js/pull/14979) / [#15414](https://github.com/emberjs/ember.js/pull/15414) / [#15415](https://github.com/emberjs/ember.js/pull/15415) [FEATURE ember-routing-router-service] Enable by default.
 - [#15193](https://github.com/emberjs/ember.js/pull/15193) [CLEANUP] Remove `owner._lookupFactory` support.
 
-### 2.14.0 (July 5, 2017)
+## 2.14.0 (July 5, 2017)
 
 - [#15312](https://github.com/emberjs/ember.js/pull/15312) [BUGFIX] Avoid re-freezing already frozen objects.
 - [#15315](https://github.com/emberjs/ember.js/pull/15315) [FEATURE] Add minlength to TextSupport
@@ -1281,20 +1281,20 @@ Fixes a few issues:
 - [#15178](https://github.com/emberjs/ember.js/pull/15178) Refactor route to lookup controller for QPs.
 - [#15129](https://github.com/emberjs/ember.js/pull/15129) Fix access to service:-document in ember-engines
 
-### 2.13.4 (July 5, 2017)
+## 2.13.4 (July 5, 2017)
 
 - [#15321](https://github.com/emberjs/ember.js/pull/15321) [BUGFIX] Improve fastboot debugger/repl experience.
 
-### 2.13.3 (May 31, 2017)
+## 2.13.3 (May 31, 2017)
 
 - [#15284](https://github.com/emberjs/ember.js/pull/15284) [BUGFIX] remove nested transaction assertion from glimmer.
 - [glimmerjs/glimmer-vm#529](https://github.com/glimmerjs/glimmer-vm/pull/529) [BUGFIX] Fix issues identified with custom element support.
 
-### 2.13.2 (May 18, 2017)
+## 2.13.2 (May 18, 2017)
 
 - Revert over eager dependency upgrades in 2.13.1.
 
-### 2.13.1 (May 17, 2017)
+## 2.13.1 (May 17, 2017)
 
 - [#15129](https://github.com/emberjs/ember.js/pull/15129) Fix access to document service in `ember-engines`.
 - [#15138](https://github.com/emberjs/ember.js/pull/15138) [BUGFIX] Fix mocha blueprint service test filename
@@ -1303,7 +1303,7 @@ Fixes a few issues:
 - [#15242](https://github.com/emberjs/ember.js/pull/15242) [BUGFIX] Fix `EmberError` import in system/router.
 - [#15247](https://github.com/emberjs/ember.js/pull/15247) [BUGFIX] Ensure nested custom elements render properly.
 
-### 2.13.0 (April 27, 2017)
+## 2.13.0 (April 27, 2017)
 
 - [#15111](https://github.com/emberjs/ember.js/pull/15111) / [#15029](https://github.com/emberjs/ember.js/pull/15029) [PERF] `factoryFor` should cache when possible.
 - [#14961](https://github.com/emberjs/ember.js/pull/14961) [BUGIX] [Fixes #14925] remove duplicate `/` in pathname
@@ -1320,7 +1320,7 @@ Fixes a few issues:
 - [#14970](https://github.com/emberjs/ember.js/pull/14970) [BUGFIX] Generate integration tests for template helpers by default.
 - [#14976](https://github.com/emberjs/ember.js/pull/14976) [BUGFIX] Remove "no use strict" workaround for old versions of iOS 8.
 
-### 2.12.2 (April 27, 2017)
+## 2.12.2 (April 27, 2017)
 
 - [#15160](https://github.com/emberjs/ember.js/pull/15160) [BUGFIX] Ensure `Ember.Test` global is setup when including `ember-testing.js`.
 - [#15142](https://github.com/emberjs/ember.js/pull/15142) / [#15163](https://github.com/emberjs/ember.js/pull/15163) [BUGFIX] Don’t leak deprecated `container`.
@@ -1328,13 +1328,13 @@ Fixes a few issues:
 - [#15180](https://github.com/emberjs/ember.js/pull/15180) [BUGFIX] Correct `until` values for `this.container` deprecations.
 
 
-### 2.12.1 (April 7, 2017)
+## 2.12.1 (April 7, 2017)
 
 - [#14961](https://github.com/emberjs/ember.js/pull/14961) [BUGIX] Remove duplicate trailing `/` in pathname.
 - [#15029](https://github.com/emberjs/ember.js/pull/15029) [PERF] [BUGFIX] cache `factoryFor` injections when possible
 - [#15089](https://github.com/emberjs/ember.js/pull/15089) [BUGFIX] Fixing IE and Edge issue causing action handlers to be fired twice.
 
-### 2.12.0 (March 14, 2017)
+## 2.12.0 (March 14, 2017)
 
 - [#15000](https://github.com/emberjs/ember.js/pull/15000) / [#15002](https://github.com/emberjs/ember.js/pull/15002) / [#15006](https://github.com/emberjs/ember.js/pull/15006) / [#15008](https://github.com/emberjs/ember.js/pull/15008) / [#15009](https://github.com/emberjs/ember.js/pull/15009) / [#15011](https://github.com/emberjs/ember.js/pull/15011) [PERF] Assorted performance improvements for modern browsers.
 - [#14872](https://github.com/emberjs/ember.js/pull/14872) / [#14871](https://github.com/emberjs/ember.js/pull/14871) / [#14883](https://github.com/emberjs/ember.js/pull/14883) [PERF] Simplify action event handler.
@@ -1347,7 +1347,7 @@ Fixes a few issues:
 - [#14852](https://github.com/emberjs/ember.js/pull/14852) [PERF] only `LOG_TRANSITIONS` and `LOG_TRANSITIONS_INTERNAL` in debug
 - [#14854](https://github.com/emberjs/ember.js/pull/14854) [PERF] only `LOG_ACTIVE_GENERATION` and `LOG_RESOLVER` in debug
 
-### 2.11.3 (March 8, 2017)
+## 2.11.3 (March 8, 2017)
 
 - [#14987](https://github.com/emberjs/ember.js/pull/14987) [BUGFIX] Fix a memory leak when components are destroyed.
 - [#14986](https://github.com/emberjs/ember.js/pull/14986) [BUGFIX] Fix a memory leak in RSVP.js.
@@ -1355,11 +1355,11 @@ Fixes a few issues:
 - [#14898](https://github.com/emberjs/ember.js/pull/14898) [BUGFIX] Fix an issue where errors in tests sometimes do not cause a failure.
 - [#14707](https://github.com/emberjs/ember.js/pull/14707) [BUGFIX] Improve deprecation message for unsafe `style` attribute bindings.
 
-### 2.11.2 (February 19, 2017)
+## 2.11.2 (February 19, 2017)
 
 - [#14937](https://github.com/emberjs/ember.js/pull/14937) [BUGFIX] Fix issue preventing `ember generate *` from creating test files as appropriate.
 
-### 2.11.1 (February 16, 2017)
+## 2.11.1 (February 16, 2017)
 
 - [#14762](https://github.com/emberjs/ember.js/pull/14762) [BUGFIX] Make ember-template-compiler handle {{input}} helpers with sub-expression "type"
 - [#14791](https://github.com/emberjs/ember.js/pull/14791) [BUGFIX] exempt routes that share a controller from duplicate assertion
@@ -1369,7 +1369,7 @@ Fixes a few issues:
 - [e94799c](https://github.com/emberjs/ember.js/commit/e94799c54cd464f5ba3642dec83f0000a52eb3b6) [BUGFIX] Update to `route-recognizer@0.2.9` to prevent errors for duplicate route name definitions in `Router.map`.
 
 
-### 2.11.0 (January 23, 2017)
+## 2.11.0 (January 23, 2017)
 
 - [#14762](https://github.com/emberjs/ember.js/pull/14762) [BUGFIX] Ensure subexpressions can be used for `{{input}}`'s `type`.
 - [#14723](https://github.com/emberjs/ember.js/pull/14723) [BUGFIX] Improved backtracking re-render assertion message.
@@ -1385,18 +1385,18 @@ Fixes a few issues:
 - [#14441](https://github.com/emberjs/ember.js/pull/14441) [DEPRECATION] Deprecate remaining usage of the `{{render}}` helper.
 - [#14482](https://github.com/emberjs/ember.js/pull/14482) [DEPRECATION] Deprecate `Component#renderToElement`.
 
-### 2.10.2 (December 19, 2016)
+## 2.10.2 (December 19, 2016)
 
 - [#14685](https://github.com/emberjs/ember.js/pull/14685) [BUGFIX] Fix `this.$()` returning `undefined` in `willDestroyElement`.
 - [#14717](https://github.com/emberjs/ember.js/pull/14717) [BUGFIX] Fix an issue with block params named `attrs`.
 
-### 2.10.1 (December 13, 2016)
+## 2.10.1 (December 13, 2016)
 
 - [#14671](https://github.com/emberjs/ember.js/pull/14671) [BUGFIX] Fix an issue with the list attribute in <input> elements.
 - [#14681](https://github.com/emberjs/ember.js/pull/14681) [BUGFIX] Fix an issue with computed properties when using aliases as dependent keys.
 - [#14682](https://github.com/emberjs/ember.js/pull/14682) [BUGFIX] Ensure closure actions do not trigger unnecessary re-renders.
 
-### 2.10.0 (November 28, 2016)
+## 2.10.0 (November 28, 2016)
 
 - [#14293](https://github.com/emberjs/ember.js/pull/14293) [BUGFIX] Remove style warning when the binding is quoted.
 - [#12708](https://github.com/emberjs/ember.js/pull/12708) [BUGFIX] Improve compatibility between `Ember.isArray` and the native `Array.isArray` for `FileList`.
@@ -1410,29 +1410,29 @@ Fixes a few issues:
 - [#14520](https://github.com/emberjs/ember.js/pull/14520) [BUGFIX] Ensure local variables (block params) have higher precedence over helpers.
 - [#14156](https://github.com/emberjs/ember.js/pull/14156) [FEATURE ember-glimmer] Enable by default.
 
-### 2.9.1 (November 1, 2016)
+## 2.9.1 (November 1, 2016)
 
 - [#14528](https://github.com/emberjs/ember.js/pull/14528) [BUGFIX] Fix memory leak (leaking component instances in the component registry).
 - [#14509](https://github.com/emberjs/ember.js/pull/14509) [BUGFIX] Fix overwriting rest positional parameters when passed as named parameters. Allows `link-to` to be used as a contextual component.
 - [#14550](https://github.com/emberjs/ember.js/pull/14550) [BUGFIX] Allow canceling items queued by `run.schedule`.
 
-### 2.9.0 (October 17, 2016)
+## 2.9.0 (October 17, 2016)
 
 - No changes from 2.8.2.
 
-### 2.8.3 (November 1, 2016)
+## 2.8.3 (November 1, 2016)
 
 - [#14528](https://github.com/emberjs/ember.js/pull/14528) [BUGFIX] Fix memory leak (leaking component instances in the component registry).
 - [#14509](https://github.com/emberjs/ember.js/pull/14509) [BUGFIX] Fix overwriting rest positional parameters when passed as named parameters. Allows `link-to` to be used as a contextual component.
 - [#14550](https://github.com/emberjs/ember.js/pull/14550) [BUGFIX] Allow canceling items queued by `run.schedule`.
 
-### 2.8.2 (October 6, 2016)
+## 2.8.2 (October 6, 2016)
 
 - [#14365](https://github.com/emberjs/ember.js/pull/14365) [BUGFIX] Fix an issue with URLs with encoded characters and a trailing slash.
 - [#14382](https://github.com/emberjs/ember.js/pull/14382) [BUGFIX] Allow bound `id` on tagless components.
 - [#14421](https://github.com/emberjs/ember.js/pull/14421) [BUGFIX] Fix an issue with local components lookup.
 
-### 2.8.1 (September 14, 2016)
+## 2.8.1 (September 14, 2016)
 
 - [#14184](https://github.com/emberjs/ember.js/pull/14184) [BUGFIX] Ensure that promises that reject with non Errors (i.e. something without a `.stack`) do not trigger an error during Ember's internal error processing.
 - [#14237](https://github.com/emberjs/ember.js/pull/14237) [BUGFIX] Ensure Engine Routes are deactivated before destruction.
@@ -1442,7 +1442,7 @@ Fixes a few issues:
 - [#14281](https://github.com/emberjs/ember.js/pull/14281) [BUGFIX] Prevent errors from scheduling a rerender (by setting a property in `willDestroyElement`) after a component is destroyed.
 - [#14291](https://github.com/emberjs/ember.js/pull/14291) [BUGFIX] Fix component action bubbling semantics. Actions should not bubble out of a component when returning `true`.
 
-### 2.8.0 (September 8, 2016)
+## 2.8.0 (September 8, 2016)
 
 - [#14229](https://github.com/emberjs/ember.js/pull/14229) [BUGFIX] Fix boot errors with `location: 'auto'` when using IE9.
 - [#14219](https://github.com/emberjs/ember.js/pull/14219) [BUGFIX] Fix issue with template meta (i.e. compiled template `moduleName`) was being mutated during the rendering process.
@@ -1474,22 +1474,22 @@ Fixes a few issues:
 - [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-runtime-enumerable-includes] Enable by default.
 - [#13855](https://github.com/emberjs/ember.js/pull/13855) [FEATURE ember-testing-check-waiters] Enable by default.
 
-### 2.7.3 (September 6, 2016)
+## 2.7.3 (September 6, 2016)
 
 - [#14219](https://github.com/emberjs/ember.js/pull/14219) [BUGFIX] Fix issue with mutating template's metadata.
 
-### 2.7.2 (August 30, 2016)
+## 2.7.2 (August 30, 2016)
 
 - [#13895](https://github.com/emberjs/ember.js/pull/13895) [BUGFIX] Fix template meta lookup with tagless and blockless components.
 - [#14075](https://github.com/emberjs/ember.js/pull/14075) [BUGFIX] In which we revert route-recognizer to the version used in Ember 2.6. 😢
 
-### 2.7.1 (August 15, 2016)
+## 2.7.1 (August 15, 2016)
 
 - [#13920](https://github.com/emberjs/ember.js/pull/13920) [BUGFIX] Add more info to the `Ember.Binding` deprecation.
 - [#14058](https://github.com/emberjs/ember.js/pull/14058) [BUGFIX] Fix issues related to `Ember.Router.map` changes in 2.7.0.
 - [#14068](https://github.com/emberjs/ember.js/pull/14068) [BUGFIX] Prevent errors when clicking a `{{link-to}}` during an existing transition.
 
-### 2.7.0 (July 25, 2016)
+## 2.7.0 (July 25, 2016)
 
 - [#13764](https://github.com/emberjs/ember.js/pull/13764) [BUGFIX] Keep rest positional parameters when nesting contextual components if needed.
 - [#13781](https://github.com/emberjs/ember.js/pull/13781) [BUGFIX] Fix NoneLocation#getURL
@@ -1504,18 +1504,18 @@ Fixes a few issues:
 - [#13424](https://github.com/emberjs/ember.js/pull/13424) [DEPRECATE] Deprecate Ember.Binding. See [the deprecation guide](https://emberjs.com/deprecations/v2.x/#toc_ember-binding) for more details.
 - [#13599](https://github.com/emberjs/ember.js/pull/13599) [FEATURE] Enable `ember-runtime-computed-uniq-by` feature.
 
-### 2.6.2 (July 11, 2016)
+## 2.6.2 (July 11, 2016)
 
 - [#13781](https://github.com/emberjs/ember.js/pull/13781) [BUGFIX] Fix NoneLocation#getURL
 - [#13797](https://github.com/emberjs/ember.js/pull/13797) [BUGFIX] Ensure didInitAttrs deprecation is stripped in prod.
 
-### 2.6.1 (June 27, 2016)
+## 2.6.1 (June 27, 2016)
 
 - [#13634](https://github.com/emberjs/ember.js/pull/13634) [BUGFIX] Fix issues with rerendering blockless and tagless components.
 - [#13655](https://github.com/emberjs/ember.js/pull/13655) [BUGFIX] Make debugging `this._super` much easier (remove manual `.call` / `.apply` optimizations).
 - [#13672](https://github.com/emberjs/ember.js/pull/13672) [BUGFIX] Fix issue with `this.render` and `this.disconnectOutlet` in routes.
 
-### 2.6.0 (June 8, 2016)
+## 2.6.0 (June 8, 2016)
 
 - [#13520](https://github.com/emberjs/ember.js/pull/13520) [BUGFIX] Fixes issues with `baseURL` and `rootURL` in `Ember.HistoryLocation` and ensures that `Ember.NoneLocation` properly handles `rootURL`.
 - [#13590](https://github.com/emberjs/ember.js/pull/13590) [BUGFIX] Avoid `_lazyInjections` in production builds.
@@ -1549,7 +1549,7 @@ Fixes a few issues:
 - [#13285](https://github.com/emberjs/ember.js/pull/13285) [BUGFIX] Make `Enumerable#firstObject` read only.
 - [#13289](https://github.com/emberjs/ember.js/pull/13289) [BUGFIX] Make `Enumerable#lastObject` read only.
 
-### 2.5.1 (April 21, 2016)
+## 2.5.1 (April 21, 2016)
 
 - [#13310](https://github.com/emberjs/ember.js/pull/13310) [BUGFIX] Fix `mouseenter` typo in ember-testing helpers.
 - [#13333](https://github.com/emberjs/ember.js/pull/13333) [BUGFIX] Prevent the `toString` property from being added to the objects own
@@ -1558,7 +1558,7 @@ Fixes a few issues:
   with usage of objects created by older addons that are attempting to use `Ember.inject.service()`.
 - [#13344](https://github.com/emberjs/ember.js/pull/13344) [BUGFIX] Revert `Ember.merge` deprecation.
 
-### 2.5.0 (April 11, 2016)
+## 2.5.0 (April 11, 2016)
 
 - [#13239](https://github.com/emberjs/ember.js/pull/13239) [BUGFIX] Prevent warnings for unknown feature flags
 - [#13287](https://github.com/emberjs/ember.js/pull/13287) [BUGFIX] Fix a recent regression with `Ember.A(null)`
@@ -1573,12 +1573,12 @@ Fixes a few issues:
 - [#13024](https://github.com/emberjs/ember.js/pull/13024) [BUGFIX] Change internal async acceptance test helpers to be somewhat more efficient in determining router transition status.
 - [FEATURE] Add helper method named `Ember.assign` to roughly emulate `Object.assign`.
 
-### 2.4.5 (April 11, 2016)
+## 2.4.5 (April 11, 2016)
 
 - [#13239](https://github.com/emberjs/ember.js/pull/13239) [BUGFIX] Prevent warnings for unknown feature flags.
 - [#13294](https://github.com/emberjs/ember.js/pull/13294) [DEPRECATE] Deprecate usage of `{{render}}` with a block.
 
-### 2.4.4 (April 3, 2016)
+## 2.4.4 (April 3, 2016)
 
 - [#13177](https://github.com/emberjs/ember.js/pull/13177) [BUGFIX] Allow contextual component attributes are mutable (allowing for two way binding).
 - [#13185](https://github.com/emberjs/ember.js/pull/13185) [BUGFIX] Ensure `{{render}}` sets up target properly (fixes issues with `{{render}}`'ed templates using actions).
@@ -1586,20 +1586,20 @@ Fixes a few issues:
 - [#13218](https://github.com/emberjs/ember.js/pull/13218) [BUGFIX] Do not refresh routes on initial transition.
 - [#13228](https://github.com/emberjs/ember.js/pull/13228) [BUGFIX] re-enable link-to when disabledWhen changes values.
 
-### 2.4.3 (March 17, 2016)
+## 2.4.3 (March 17, 2016)
 
 - [#13118](https://github.com/emberjs/ember.js/pull/13118) [BUGFIX] Work around Chrome 49/50 optimization bug affecting helper usage.
 
-### 2.4.2 (March 8, 2016)
+## 2.4.2 (March 8, 2016)
 
 - [#13031](https://github.com/emberjs/ember.js/pull/13031) [BUGFIX] Fix mergedProperties at create time modifying proto
 - [#13049](https://github.com/emberjs/ember.js/pull/13049) [BUGFIX] Fixes `{{#with proxy as |foo|}}`
 
-### 2.4.1 (February 29, 2016)
+## 2.4.1 (February 29, 2016)
 
 - [#13030](https://github.com/emberjs/ember.js/pull/13030) [BUGFIX] Fix legacy addon deprecations
 
-### 2.4.0 (February 29, 2016)
+## 2.4.0 (February 29, 2016)
 
 - [#12996](https://github.com/emberjs/ember.js/pull/12996) [BUGFIX] Fixes 12995 #with array yields true
 - [#13013](https://github.com/emberjs/ember.js/pull/13013) [BUGFIX] Do not set model on `{{render}}` rerender when only a single argument was provided.
@@ -1627,11 +1627,11 @@ Fixes a few issues:
 - [#12664](https://github.com/emberjs/ember.js/pull/12664) Include NaN as a falsey value in the `with` helper's docstring
 - [#12698](https://github.com/emberjs/ember.js/pull/12698) convert all this._super.apply(this, arguments) to this._super(...arguments)
 
-### v2.3.2 (March 17, 2016)
+## v2.3.2 (March 17, 2016)
 
 - [#13118](https://github.com/emberjs/ember.js/pull/13118) [BUGFIX] Work around Chrome 49/50 optimization bug affecting helper usage.
 
-### v2.3.1 (February 4, 2016)
+## v2.3.1 (February 4, 2016)
 
 - [#12829](https://github.com/emberjs/ember.js/pull/12829) [BUGFIX] Support tagless components in fastboot.
 - [#12848](https://github.com/emberjs/ember.js/pull/12848) Make dependencies that end in `@each` expand to `[]`.
@@ -1639,7 +1639,7 @@ Fixes a few issues:
 - [#12908](https://github.com/emberjs/ember.js/pull/12908) [BUGFIX] Fix issue that prevented recomputation of `ArrayProxy` values under certain circumstances.
 
 
-### 2.3.0 (January 17, 2016)
+## 2.3.0 (January 17, 2016)
 
 - [#12712](https://github.com/emberjs/ember.js/pull/12712) [BUGFIX] Create a new hash parameter when creating a component cell
 - [#12746](https://github.com/emberjs/ember.js/pull/12746) [BUGFIX] Update htmlbars to 0.14.11 to fix [CVE-2015-7565](https://emberjs.com/blog/2016/01/14/security-releases-ember-1-11-4-1-12-2-1-13-12-2-0-3-2-1-2-2-2-1.html).
@@ -1671,7 +1671,7 @@ Fixes a few issues:
 - [#12485](https://github.com/emberjs/ember.js/pull/12485) [BUGFIX] Access property only once during `Ember.get`.
 - [#12503](https://github.com/emberjs/ember.js/pull/12503) Add helpful assertion when a tagless component includes event handler methods.
 
-### v2.2.0 (November 16, 2015)
+## v2.2.0 (November 16, 2015)
 
 - [#12600](https://github.com/emberjs/ember.js/pull/12600) [BUGFIX beta] Guard against `null` `attrs` in `getRoot` hook.
 - [#12445](https://github.com/emberjs/ember.js/pull/12445) [BUGFIX] Ensure rest arg positionalParams can be supplied as hash arguments.
@@ -1690,14 +1690,14 @@ Fixes a few issues:
 - [#12370](https://github.com/emberjs/ember.js/pull/12370) [DEPRECATION] Deprecate passing function as test argument to `Ember.deprecate` / `Ember.warn` / `Ember.assert`.
 - [#12416](https://github.com/emberjs/ember.js/pull/12416) [BUGFIX] Ensure components actions function without controller addon.
 
-### v2.1.1 (November 16, 2015)
+## v2.1.1 (November 16, 2015)
 
 - [#12445](https://github.com/emberjs/ember.js/pull/12445) [BUGFIX] Ensure rest arg style positionalParams can be omitted.
 - [#12456](https://github.com/emberjs/ember.js/pull/12456) [BUGFIX]Allow usage of bound properties in `{{link-to}}` for `bubbles`, `preventDefault`, `target`, `replace`, and `disabledWhen`.
 - [#12463](https://github.com/emberjs/ember.js/pull/12463) [BUGFIX] Fix uglification introduced bug with super wrapping.
 - [#12464](https://github.com/emberjs/ember.js/pull/12464) [BUGFIX] `Ember.String.htmlSafe()` should return a instance of SafeString for `null` / `undefined`.
 
-### v2.1.0 (October 5, 2015)
+## v2.1.0 (October 5, 2015)
 
 - [#12396](https://github.com/emberjs/ember.js/pull/12396) [BUGFIX] Ensure that `this._super` is called when extending from `Ember.Component`.
 - [#12383](https://github.com/emberjs/ember.js/pull/12383) [BUGFIX] Fix `Ember.String.classify` to underscore items with a leading dash/underscore.
@@ -1737,7 +1737,7 @@ Fixes a few issues:
 - [#11440](https://github.com/emberjs/ember.js/pull/11440) [DEPRECATION] Deprecate using `instance.container.lookup` on first argument to `instanceInitializers`. Use `instance.lookup` instead.
 - [#11440](https://github.com/emberjs/ember.js/pull/11440) [DEPRECATION] Deprecate passing two arguments to an initializers `initialize` function.
 
-### 2.0.0 (August 13, 2015)
+## 2.0.0 (August 13, 2015)
 
 - [#11213](https://github.com/emberjs/ember.js/pull/11213) [BREAKING] Remove chaining in Observable.set
 - [#12036](https://github.com/emberjs/ember.js/pull/12036) Cleanup CP Set and  Volatile
@@ -1865,17 +1865,17 @@ Fixes a few issues:
 - [#11383](https://github.com/emberjs/ember.js/pull/11383) Update {{each-in}} to use ember-metal/should-display.
 - [#11396](https://github.com/emberjs/ember.js/pull/11396) Make Ember.Checkbox extend from Ember.Component.
 
-### 1.13.13 (January 17, 2016)
+## 1.13.13 (January 17, 2016)
 
 - [12793](https://github.com/emberjs/ember.js/pull/12793) [BUGFIX] Remove jQuery version assertion/error.
 - [#12414](https://github.com/emberjs/ember.js/pull/12414) [BUGFIX] Fix multiplicative observation of controllers in views
 - [#12784](https://github.com/emberjs/ember.js/pull/12784) [BUGFIX] Prevent `classNames` from being duplicated.
 
-### 1.13.12 (January 14, 2016)
+## 1.13.12 (January 14, 2016)
 
 - [CVE-2015-7565](https://emberjs.com/blog/2016/01/14/security-releases-ember-1-11-4-1-12-2-1-13-12-2-0-3-2-1-2-2-2-1.html)
 
-### 1.13.11 (November 16, 2015)
+## 1.13.11 (November 16, 2015)
 
 - [#12334](https://github.com/emberjs/ember.js/pull/12334) [BUGFIX] Fix for Array.prototype.filter polyfill on IE8.
 - [#12344](https://github.com/emberjs/ember.js/pull/12344) [BUGFIX] Allow `{{link-to}}`'s `current-when` param be specified as a bound value.
@@ -1884,18 +1884,18 @@ Fixes a few issues:
 - [#12481](https://github.com/emberjs/ember.js/pull/12481) [BUGFIX] Add deprecation options to some 1.13 deprecations (to make handling with ember-cli-deprecation-workflow easier).
 - [#12596](https://github.com/emberjs/ember.js/pull/12596) [BUGFIX] Fix `{{input}}` helper on IE8.
 
-### 1.13.10 (September 6, 2015)
+## 1.13.10 (September 6, 2015)
 
 - [#12104](https://github.com/emberjs/ember.js/pull/12104) [BUGFIX] Ensure `concatenatedProperties` are not stomped.
 - [#12256](https://github.com/emberjs/ember.js/pull/12256) [BUGFIX] Ensure concat streams unsubscribe properly. Fixes memory leak with attributes specified within quotes in the template (i.e. `<div data-foo="{{something}}"></div>`).
 - [#12272](https://github.com/emberjs/ember.js/pull/12272) [BUGFIX] Update HTMLBars to fix memory leak when an `{{each}}` is inside an `{{if}}`.
 
-### 1.13.9 (August 22, 2015)
+## 1.13.9 (August 22, 2015)
 
 - [#12138](https://github.com/emberjs/ember.js/pull/12138) [BUGFIX] Do not require calling `this._super(...arguments)` in views/components when implementing `didReceiveAttrs`.
 - [#12164](https://github.com/emberjs/ember.js/pull/12164) [BUGFIX] Properly handle block-less usage of a component without a template or layout specified in the component definition.
 
-### 1.13.8 (August 13, 2015)
+## 1.13.8 (August 13, 2015)
 
 - [#12056](https://github.com/emberjs/ember.js/pull/12056) [BUGFIX] Ensure initializers can augment `customEvents`.
 - [#12037](https://github.com/emberjs/ember.js/pull/12037) [BUGFIX] Fix error in some query params scenarios.
@@ -1905,7 +1905,7 @@ Fixes a few issues:
 - [#12071](https://github.com/emberjs/ember.js/pull/12071) [BUGFIX] Fix issue with accessing component attributes before initial render.
 - [#12073](https://github.com/emberjs/ember.js/pull/12073) [BUGFIX] Fix issue with events when invoking a component and specifying `classNames=`.
 
-### 1.13.7 (August 9, 2015)
+## 1.13.7 (August 9, 2015)
 
 - [#12000](https://github.com/emberjs/ember.js/pull/12000) [DEPRECATION] Deprecate using `controller` for {{with}}
 - [#11946](https://github.com/emberjs/ember.js/pull/11946) [PERF] Speed up `AttrProxy` implementation.
@@ -1919,7 +1919,7 @@ Fixes a few issues:
 - [#11994](https://github.com/emberjs/ember.js/pull/11994) [DEPRECATION] Deprecate using `@each` as a leaf node in a dependent key. Refactor from `Ember.computed('foo.@each', function() {});` to `Ember.computed('foo.[]', function() { });`.
 - [#12026](https://github.com/emberjs/ember.js/pull/12026) [BUGFIX] Remove wasted dependent keys for `template` and `layout` properties of `Ember.View`/`Ember.Component`.
 
-### 1.13.6 (July 31, 2015)
+## 1.13.6 (July 31, 2015)
 
 - [#11900](https://github.com/emberjs/ember.js/pull/11900) [DEPRECATION] Deprecate `Ember.Handlebars.makeViewHelper`.
 - [#11900](https://github.com/emberjs/ember.js/pull/11900) [DEPRECATION] Deprecate `Ember.HTMLBars.makeViewHelper`.
@@ -1941,7 +1941,7 @@ Fixes a few issues:
 - [#11934](https://github.com/emberjs/ember.js/pull/11934) [DEPRECATION] Deprecate specifying `positionalParams` at extend time in favor of using static factory properties.
 - [#11935](https://github.com/emberjs/ember.js/pull/11935) [BUGFIX] Avoid unnecessary change events during initial render.
 
-### 1.13.5 (July 19, 2015)
+## 1.13.5 (July 19, 2015)
 
 - [#11767](https://github.com/emberjs/ember.js/pull/11767) [DEPRECATION] Deprecate Controller#needs
 - [#11468](https://github.com/emberjs/ember.js/pull/11468) [DEPRECATION] Deprecate `Ember.Freezable` and `frozenCopy`.
@@ -1953,7 +1953,7 @@ Fixes a few issues:
 - [#11798](https://github.com/emberjs/ember.js/pull/11798) [DEPRECATION] Deprecate `Function#observesBefore`.
 - [#11812](https://github.com/emberjs/ember.js/pull/11812) [DEPRECATION] Add deprecation messages when using `Ember.get` / `Ember.set` in a certain ways.
 
-### 1.13.4 (July 13, 2015)
+## 1.13.4 (July 13, 2015)
 
 - [#11651](https://github.com/emberjs/ember.js/pull/11651) [BUGFIX] Ensure child views of non-dirty components get the correct parentView when rerendered.
 - [#11662](https://github.com/emberjs/ember.js/pull/11662) [BUGFIX] Prevent ArrayController deprecation on generated controllers.
@@ -1961,7 +1961,7 @@ Fixes a few issues:
 - [#11664](https://github.com/emberjs/ember.js/pull/11664) [BUGFIX] Ensure Route actions can be unit tested.
 - [#11667](https://github.com/emberjs/ember.js/pull/11667) [BUGFIX] Fix memory leak in rendering engine.
 
-### 1.13.3 (July 5, 2015)
+## 1.13.3 (July 5, 2015)
 
 - [#11510](https://github.com/emberjs/ember.js/pull/11510) [DEPRECATION] Deprecate `Ember.Object.createWithMixins`.
 - [#11512](https://github.com/emberjs/ember.js/pull/11512) [DEPRECATION] Deprecate `Ember.oneWay` in favor of `Ember.computed.oneWay`.
@@ -1980,12 +1980,12 @@ Fixes a few issues:
   * for `form.action` always escape
   * always assign handlers to props, even if the case appears strange
 
-### 1.13.2 (June 17, 2015)
+## 1.13.2 (June 17, 2015)
 
 - [#11461](https://github.com/emberjs/ember.js/pull/11461) Remove `{{each}}` without `key=` warning. Deprecates `@guid` and `@item` in favor of the new default `@identity`.
 - [#11495](https://github.com/emberjs/ember.js/pull/11495) [PERFORMANCE] Remove debug statements from production builds.
 
-### 1.13.1 (June 16, 2015)
+## 1.13.1 (June 16, 2015)
 
 - [#11445](https://github.com/emberjs/ember.js/pull/11445) [BUGFIX] Allow recomputation for `Ember.Helper` with arguments.
 - [#11317](https://github.com/emberjs/ember.js/pull/11317) [BUGFIX] Ensure handleURL called after setURL in visit helper.
@@ -1993,7 +1993,7 @@ Fixes a few issues:
 - [#11476](https://github.com/emberjs/ember.js/pull/11476) [DEPRECATION] Deprecate `Ember.ArrayController`.
 - [#11478](https://github.com/emberjs/ember.js/pull/11478) [DEPRECATION] Deprecate `Ember.RenderBuffer`.
 
-### 1.13.0 (June 12, 2015)
+## 1.13.0 (June 12, 2015)
 
 - [#11270](https://github.com/emberjs/ember.js/pull/11270) [BUGFIX] Ensure view registry is propagated to components.
 - [#11273](https://github.com/emberjs/ember.js/pull/11273) [BUGFIX] Downgrade Ember.Service without proper inheritance to a deprecation (instead of an assertion).
@@ -2053,7 +2053,7 @@ Fixes a few issues:
 - [#11084](https://github.com/emberjs/ember.js/pull/11084) Enable {{yield to="inverse"}} in components.
 - [#11141](https://github.com/emberjs/ember.js/pull/11141) Implement angle-bracket components.
 
-### 1.12.0 (May 13, 2015)
+## 1.12.0 (May 13, 2015)
 
 - [#10874](https://github.com/emberjs/ember.js/pull/10874) Include all files in jspm package.
 - [#10876](https://github.com/emberjs/ember.js/pull/10876) [BUGFIX] Make the `{{component}}` helper deal with dynamically set falsey values.
@@ -2081,7 +2081,7 @@ Fixes a few issues:
 - [#10731](https://github.com/emberjs/ember.js/pull/10731) [FEATURE] Enable `ember-application-instance-initializers` feature.
 - [#10731](https://github.com/emberjs/ember.js/pull/10731) [FEATURE] Enable `ember-application-initializer-context` feature.
 
-### 1.11.0 (March 28, 2015)
+## 1.11.0 (March 28, 2015)
 
 - [#10736](https://github.com/emberjs/ember.js/pull/10736) [BUGFIX] Fix issue with Query Params when using `Ember.ObjectController` (regression from `ObjectController` deprecation).
 - [#10726](https://github.com/emberjs/ember.js/pull/10726) / [router.js#ed45bc](https://github.com/tildeio/router.js/commit/ed45bc5c5e055af0ab875ef2c52feda792ee23e4) [BUGFIX] Fix issue with nested `{{link-to}}` active and transition classes getting out of sync.
@@ -2141,7 +2141,7 @@ Fixes a few issues:
 - [#10353](https://github.com/emberjs/ember.js/pull/10353) Avoid creating context bindings for collection views [@mmun](https://github.com/mmun)
 - [#10093](https://github.com/emberjs/ember.js/pull/10093) [FEATURE] Implement {{component}} helper [@lukemelia](https://github.com/lukemelia)
 
-### 1.10.0 (February 7, 2015)
+## 1.10.0 (February 7, 2015)
 
 * [BUGFIX] Ensure that property case is normalized.
 * [BUGFIX] Prevent an error from being thrown if the errorThrown property is a string when catching unhandled promise rejections.
@@ -2213,12 +2213,12 @@ Fixes a few issues:
 * [FEATURE] ember-htmlbars - Enable the HTMLBars rendering engine.
 * [FEATURE] ember-htmlbars-block-params - Enable block params feature for HTMLBars.
 
-### 1.9.1 (December 23, 2014)
+## 1.9.1 (December 23, 2014)
 
 * Allow `{{view}}` helper to properly handle view instances.
 * Escape `href`, `src`, and `background` attributes for `a`, `link`, `img`, and `iframe` elements.
 
-### 1.9.0 (December 8, 2014)
+## 1.9.0 (December 8, 2014)
 
 * Add deprecation for quoteless outlet names (`{{outlet main}}` should be `{{outlet 'main'}}`).
 * [BUGFIX] Update the `Ember.Map#forEach` callback to include the map being iterated over.
@@ -2261,7 +2261,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [FEATURE] ember-testing-pause-test.
 
 
-### Ember 1.8.1 (November, 4, 2014)
+## Ember 1.8.1 (November, 4, 2014)
 
 * [BUGFIX] Make sure that `{{view}}` can accept a Ember.View instance.
 * [BUGFIX] Throw an assertion if `classNameBindings` are specified on a tag-less view.
@@ -2270,7 +2270,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [BUGFIX] Add support for null prototype object to mandatory setter code. Prevents errors when operating on Ember Data `meta` objects.
 * [BUGFIX] Fix an issue with select/each that causes the last item rendered to be selected.
 
-### Ember 1.8.0 (October, 28, 2014)
+## Ember 1.8.0 (October, 28, 2014)
 
 * [BUGFIX] Ensure published builds do not use `define` or `require` internally.
 * [BUGFIX] Remove strict mode for Object.create usage to work around an [iOS bug](https://bugs.webkit.org/show_bug.cgi?id=138038).
@@ -2341,7 +2341,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [BREAKING] Ember.View didInsertElement is now called on child views before their parents. Before
   1.8.0-beta.1 it would be called top-down.
 
-### Ember 1.7.0 (August 19, 2014)
+## Ember 1.7.0 (August 19, 2014)
 
 * Update `Ember.computed.notEmpty` to properly respect arrays.
 * Bind `tabindex` property on LinkView.
@@ -2391,12 +2391,12 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
   caveats with model/content, and also sets a simple ground rule: Never set a controllers content,
   rather always set it's model and ember will do the right thing.
 
-### Ember 1.6.1 (July, 15, 2014)
+## Ember 1.6.1 (July, 15, 2014)
 
 * Fix error routes/templates. Changes in router promise logging caused errors to be
   thrown mid-transition into the `error` route. See [#5166](https://github.com/emberjs/ember.js/pull/5166) for further details.
 
-### Ember 1.6.0 (July, 7, 2014)
+## Ember 1.6.0 (July, 7, 2014)
 
 * [BREAKING BUGFIX] An empty array is treated as falsy value in `bind-attr` to be in consistent
   with `if` helper. Breaking for apps that relies on the previous behavior which treats an empty
@@ -2443,7 +2443,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [FEATURE ember-runtime-test-friendly-promises]
 * [FEATURE ember-metal-computed-empty-array]
 
-### Ember 1.5.0 (March 29, 2014)
+## Ember 1.5.0 (March 29, 2014)
 
 * [BUGFIX beta] Move reduceComputed instanceMetas into object's meta.
 * [BUGFIX beta] Total invalidation of arrayComputed by non-array dependencies should be synchronous.
@@ -2475,7 +2475,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [BREAKING CHANGE] `Ember.run.throttle` now supports leading edge execution. To follow industry standard leading edge is the default.
 * [BUGFIX] Fixed how parentController property of an itemController when nested. Breaking for apps that rely on previous broken behavior of an itemController's `parentController` property skipping its ArrayController when nested.
 
-### Ember 1.4.0 (February 13, 2014)
+## Ember 1.4.0 (February 13, 2014)
 
 * [SECURITY] Ensure link-to non-block escapes title.
 * Deprecate quoteless action names.
@@ -2505,12 +2505,12 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * [FEATURE propertyBraceExpansion] Add support for brace-expansion in dependent keys, observer and watch properties.
 * [FEATURE ember-metal-run-bind] Enables `Ember.run.bind` which is ember run-loop aware variation of jQuery.proxy.
 
-### Ember 1.3.1 (January 14, 2014)
+## Ember 1.3.1 (January 14, 2014)
 
 * [SECURITY] Ensure primitive value contexts are escaped.
 * [SECURITY] Ensure {{group}} helper escapes properly.
 
-### Ember 1.3.0 (January 6, 2014)
+## Ember 1.3.0 (January 6, 2014)
 
 * Many documentation updates.
 * Update to RSVP 3.0.3.
@@ -2559,12 +2559,12 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Components are lazily looked up.
 * Renaming everyBy and anyBy to isEvery and isAny.
 
-### Ember 1.2.1 _(January 14, 2014)_
+## Ember 1.2.1 _(January 14, 2014)_
 
 * [SECURITY] Ensure primitive value contexts are escaped.
 * [SECURITY] Ensure {{group}} helper escapes properly.
 
-### Ember 1.2.0 _(November 22, 2013)_
+## Ember 1.2.0 _(November 22, 2013)_
 
 * [BUGFIX] Publish ember-handlebars-compiler along with builds.
 * [BUGFIX] Use RegExp.test() for Ember.computed.match.
@@ -2619,20 +2619,20 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Allow apps with custom jquery builds to exclude the event-alias module
 * Removes long-deprecated getPath/setPath
 
-### Ember 1.1.3 _(January 13, 2014)_
+## Ember 1.1.3 _(January 13, 2014)_
 
 * [SECURITY] Ensure primitive value contexts are escaped.
 * [SECURITY] Ensure {{group}} helper escapes properly.
 
-### Ember 1.1.2 _(October 25, 2013)_
+## Ember 1.1.2 _(October 25, 2013)_
 
 * [BUGFIX] Fix failures in component rendering. - Fixes #3637
 
-### Ember 1.1.1 _(October 23, 2013)_
+## Ember 1.1.1 _(October 23, 2013)_
 
 * [BUGFIX] Allow Ember.Object.create to accept an Ember.Object.
 
-### Ember 1.1.0 _(October 21, 2013)_
+## Ember 1.1.0 _(October 21, 2013)_
 
 * Make Ember.run.later more flexible with arguments - Fixes #3072
 * Add assertion upon too many ajaxStop's.
@@ -2676,7 +2676,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Incorrect error message in router.js
 * Install default error handler on ApplicationRoute#actions, not #events
 
-### Ember 1.0.0 _(August 31, 2013)_
+## Ember 1.0.0 _(August 31, 2013)_
 
 * Fix nested `{{yield}}`
 * `ReduceComputed` groups changed properties.
@@ -2703,7 +2703,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Allow a template explicitly set on a view to be used when rendering a route.
 
 
-### Ember 1.0.0-rc.8 _(August 28, 2013)_
+## Ember 1.0.0-rc.8 _(August 28, 2013)_
 
 * View, controller & route action handlers are now expected to be defined on an `actions` object.
 * registerBoundHelper won't treat quoted strings / numbers as paths
@@ -2732,7 +2732,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Improved `Route#controllerFor` to support `controllerName` and non-route lookups
 
 
-### Ember 1.0.0-rc.7 _(August 14, 2013)_
+## Ember 1.0.0-rc.7 _(August 14, 2013)_
 
 * correctly preserve a views container
 * Reference to RSVP repo for documentation
@@ -2875,7 +2875,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * document  ember-testing helpers
 
 
-### Ember 1.0.0-rc.6 _(June 23, 2013)_
+## Ember 1.0.0-rc.6 _(June 23, 2013)_
 
 * Refactored `Ember.Route`s teardown mechanism for rendered views. This fixes #2857, previously multiple outlets were not tore down.
 * Rename Control to Component. This avoids conflicts with the existing (behind-a-flag) control and is clearer about intent.
@@ -2934,7 +2934,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Adds assertion for misnamed controller name provided to render helper. [Fixes #2385]
 
 
-### Ember 1.0.0-rc.5 _(June 01, 2013)_
+## Ember 1.0.0-rc.5 _(June 01, 2013)_
 
 * Added assertion for incorrect container lookup names
 * adding docs for Ember.beforeObserver
@@ -2949,7 +2949,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * remove starter_kit upload task (we just use the github tarballs)
 
 
-### Ember 1.0.0-rc.4 _(May 27, 2013)_
+## Ember 1.0.0-rc.4 _(May 27, 2013)_
 
 * Loader: improve missing module error message
 * Fix click test helper selector context
@@ -3076,7 +3076,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Added length property to Ember.Map
 
 
-### Ember 1.0.0-rc.3 _(April 19, 2013)_
+## Ember 1.0.0-rc.3 _(April 19, 2013)_
 
 * fn.call is wasteful when the thisArg is not needed.
 * don't needlessly close-over and rebuild insertViewCollection
@@ -3172,7 +3172,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Insert adjacent child views in batches rather than individually.
 
 
-### Ember 1.0.0-rc.2 _(March 29, 2013)_
+## Ember 1.0.0-rc.2 _(March 29, 2013)_
 
 * Improved the App initialization process and deprecated Ember.Application#initialize. If you were using this, use deferReadiness and advanceReadiness instead.
 * Added support for Ember.Application#then which fires similarly to the isReady hook
@@ -3211,7 +3211,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Other miscellaneous bug fixes and documentation improvements
 
 
-### Ember 1.0.0-rc.1 _(February 15, 2013)_
+## Ember 1.0.0-rc.1 _(February 15, 2013)_
 
 * Upgrade to Handlebars 1.0.0-rc.3
 * Update RSVP.js
@@ -3249,7 +3249,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Empty object proxies are no longer truthy in {{#if}}
 
 
-### Ember 1.0.0-pre.4 _(January 17, 2013)_
+## Ember 1.0.0-pre.4 _(January 17, 2013)_
 
 * Add {{partial}}
 * Fix regressions in router.js
@@ -3257,7 +3257,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Use the controller with the same name as the template passed to render, if it exists
 
 
-### Ember 1.0.0-pre.3 _(January 17, 2013)_
+## Ember 1.0.0-pre.3 _(January 17, 2013)_
 
 * BREAKING CHANGE: New Router API
 * BREAKING CHANGE: `Ember.Object.create` behaves like `setProperties`. Use `createWithMixins` for the old behavior.
@@ -3293,7 +3293,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * General cleanup
 
 
-### Ember 1.0.0-pre.2 _(October 25, 2012)_
+## Ember 1.0.0-pre.2 _(October 25, 2012)_
 
 * Ember.SortableMixin: don't remove and reinsert items when their sort order doesn't change.  Fixes #1486.
 * Fix edge cases with adding/removing observers
@@ -3377,7 +3377,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Performance improvements
 
 
-### Ember 1.0.pre _(August 03, 2012)_
+## Ember 1.0.pre _(August 03, 2012)_
 
 * Return undefined instead of empty jQuery object for Ember.View#$ when not in DOM
 * Adds didDefineProperty hook
@@ -3546,7 +3546,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Add support for modelType in the router
 
 
-### Ember 0.9.8.1 _(May 22, 2012)_
+## Ember 0.9.8.1 _(May 22, 2012)_
 
 * Fix bindAttr with global paths
 * Fix initialization with non routable stateManager
@@ -3554,7 +3554,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Documentation fixes
 
 
-### Ember 0.9.8 _(May 21, 2012)_
+## Ember 0.9.8 _(May 21, 2012)_
 
 * Better docs
 * Preliminary routing support
@@ -3602,13 +3602,13 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Support making Computed Properties cacheable by default
 
 
-### Ember 0.9.7.1 _(April 19, 2012)_
+## Ember 0.9.7.1 _(April 19, 2012)_
 
 * Better escaping method for RenderBuffer
 * More rigorous XSS escaping from bindAttr
 
 
-### Ember 0.9.7 _(April 18, 2012)_
+## Ember 0.9.7 _(April 18, 2012)_
 
 * RenderBuffer now properly escapes attribute values. Fixes XSS vulnerability documented in #699.
 * Make options an optional argument to Ember.Handlebars.getPath
@@ -3628,7 +3628,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Ember.ArrayUtils.objectsAt returns correct objects.
 
 
-### Ember 0.9.6 _(March 30, 2012)_
+## Ember 0.9.6 _(March 30, 2012)_
 
 * Significant internal performance improvements
 * Improved performance of RenderBuffer
@@ -3677,7 +3677,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Added benchmarking harness for internals
 
 
-### Ember 0.9.5 _(February 17, 2012)_
+## Ember 0.9.5 _(February 17, 2012)_
 
 * Add Handlebars helper for {{yield}}
 * Add a .jshintrc
@@ -3709,7 +3709,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Better framework warnings and deprecations
 
 
-### Ember 0.9.4 _(January 23, 2012)_
+## Ember 0.9.4 _(January 23, 2012)_
 
 * Add Ember.Select control
 * Added Ember.Handlebars action helper to easily add event handling to DOM elements without requiring a new view
@@ -3743,7 +3743,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Inline documentation improvements
 
 
-### Ember 0.9.3 _(December 19, 2011)_
+## Ember 0.9.3 _(December 19, 2011)_
 
 * Make sure willInsertElement actually gets called on all child views. Element is still not guaranteed to work.
 * Implement tab views and controller
@@ -3751,7 +3751,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * allow use of multiple {{bindAttr}}s per element
 
 
-### Ember 0.9.2 _(December 16, 2011)_
+## Ember 0.9.2 _(December 16, 2011)_
 
 * add replaceIn to replace an entire node's content with something new
 * Use prepend() and after() methods of Metamorph
@@ -3762,7 +3762,7 @@ Clearly, `component-a` has subscribed to `some-other-component`'s `action`. Prev
 * Remove parentView deprecation warning
 
 
-### Ember 0.9.1 _(December 14, 2011)_
+## Ember 0.9.1 _(December 14, 2011)_
 
 * Fix jslint warnings related to missing semicolons and variables defined twice
 * Alias amber_assert to sc_assert for backwards compat

From 9747f080fea1e4c2c0cc02d73453dbf85f1c3948 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 30 Nov 2022 08:12:48 -0700
Subject: [PATCH 1297/1405] Add v4.10.0-beta.2 to CHANGELOG

(cherry picked from commit 326b6b83f66e743bea6298a2a1334f3432d30888)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b344893006..cabd34e09f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+## v4.10.0-beta.2
+
+- [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017
+- [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
+
 ## v3.28.11 (November 30, 2022)
 
 - [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX LTS] Allow class-based helpers in strict-mode

From 8dd9622e7f70c4e70096987389908f44661edba5 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 30 Nov 2022 08:23:07 -0700
Subject: [PATCH 1298/1405] Add v4.9.1 to CHANGELOG

(cherry picked from commit cf8671d626e177ae70fabd594ff51895405443db)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cabd34e09f5..8338a606299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v4.9.1 (November 30, 2022)
+
+- [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
+
 ## v4.10.0-beta.2
 
 - [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017

From c5d614ad7c1a7b62b797d55b8e5ea2d089dae9e7 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 30 Nov 2022 09:51:21 -0700
Subject: [PATCH 1299/1405] Add missing date to 4.10.0-beta.2 in CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8338a606299..0298e2fd4a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 - [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
 
-## v4.10.0-beta.2
+## v4.10.0-beta.2 (November 30, 2022)
 
 - [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017
 - [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions

From 05c832cb97d868b0e2550e94865bb7badaf1c42b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:01:25 +0000
Subject: [PATCH 1300/1405] Bump eslint from 8.26.0 to 8.28.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.26.0 to 8.28.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.26.0...v8.28.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d0ff8f275ab..a9dc23aa9b6 100644
--- a/package.json
+++ b/package.json
@@ -126,7 +126,7 @@
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.26.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
diff --git a/yarn.lock b/yarn.lock
index 0bde262906f..fbacd35bfb2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4968,10 +4968,10 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.26.0:
-  version "8.26.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d"
-  integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==
+eslint@^8.28.0:
+  version "8.28.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e"
+  integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==
   dependencies:
     "@eslint/eslintrc" "^1.3.3"
     "@humanwhocodes/config-array" "^0.11.6"

From 0c6d262647109ca7d77f807e9989e9730b81a94c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:01:55 +0000
Subject: [PATCH 1301/1405] Bump testem from 3.9.0 to 3.10.0

Bumps [testem](https://github.com/testem/testem) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/testem/testem/releases)
- [Commits](https://github.com/testem/testem/compare/v3.9.0...v3.10.0)

---
updated-dependencies:
- dependency-name: testem
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index d0ff8f275ab..57a97296d20 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.2",
     "simple-dom": "^1.4.0",
-    "testem": "^3.9.0",
+    "testem": "^3.10.0",
     "testem-failure-only-reporter": "^1.0.0",
     "typescript": "4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 0bde262906f..ffdefc2324d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10387,10 +10387,10 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.8.0, testem@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.9.0.tgz#a82ccf01e5a248e3924244186e348c665ab90f7d"
-  integrity sha512-YTxCYKj0cc8uUSKEziJtSC5T/pw4fQnY0ZXNOyvAFgrijfsN9NxmncJZOHLhPgFOuhbRd5i+DBQxw0Cpe0SEFg==
+testem@^3.0.0, testem@^3.10.0, testem@^3.8.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.0.tgz#df3f43839892c17f35f4c5994c50c99aa8242bb0"
+  integrity sha512-2BMbPkAJT5xNojNxQGKT8CU9ix4EYDmHjjKFpUeeSW6tBVfFVgOi2vfrpJ5Hwdq4HsfnOALNAWN8/yjuFTgQfA==
   dependencies:
     "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"

From bc6f39b0bb941047e54737ae87ee582f6c4a3847 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:02:30 +0000
Subject: [PATCH 1302/1405] Bump @babel/plugin-transform-block-scoping from
 7.16.7 to 7.20.5

Bumps [@babel/plugin-transform-block-scoping](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-block-scoping) from 7.16.7 to 7.20.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.20.5/packages/babel-plugin-transform-block-scoping)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-block-scoping"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 28 +++++++++-------------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index d0ff8f275ab..0f3c4bf0f67 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "@babel/helper-module-imports": "^7.16.7",
-    "@babel/plugin-transform-block-scoping": "^7.16.0",
+    "@babel/plugin-transform-block-scoping": "^7.20.5",
     "@ember/edition-utils": "^1.2.0",
     "@glimmer/vm-babel-plugins": "0.84.2",
     "babel-plugin-debug-macros": "^0.3.4",
diff --git a/yarn.lock b/yarn.lock
index 0bde262906f..0baecac51c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -320,20 +320,10 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
-
-"@babel/helper-plugin-utils@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
-  integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
-
-"@babel/helper-plugin-utils@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf"
-  integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
 "@babel/helper-remap-async-to-generator@^7.16.8":
   version "7.16.8"
@@ -781,12 +771,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-block-scoping@^7.16.0", "@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-block-scoping@^7.16.7", "@babel/plugin-transform-block-scoping@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz#401215f9dc13dc5262940e2e527c9536b3d7f237"
+  integrity sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-classes@^7.16.7":
   version "7.16.7"

From 02fe6ed7cd1e11aec0f5eac44face6aa8c39ab11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 15:02:44 +0000
Subject: [PATCH 1303/1405] Bump fs-extra from 10.1.0 to 11.1.0

Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 10.1.0 to 11.1.0.
- [Release notes](https://github.com/jprichardson/node-fs-extra/releases)
- [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jprichardson/node-fs-extra/compare/10.1.0...11.1.0)

---
updated-dependencies:
- dependency-name: fs-extra
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d0ff8f275ab..838a30b18ba 100644
--- a/package.json
+++ b/package.json
@@ -139,7 +139,7 @@
     "expect-type": "^0.13.0",
     "express": "^4.18.1",
     "finalhandler": "^1.1.2",
-    "fs-extra": "^10.0.1",
+    "fs-extra": "^11.1.0",
     "git-repo-info": "^2.1.1",
     "github": "^0.2.3",
     "glob": "^8.0.3",
diff --git a/yarn.lock b/yarn.lock
index 0bde262906f..9ca3a10afe9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5679,7 +5679,7 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-extra@^10.0.0, fs-extra@^10.0.1, fs-extra@^10.1.0:
+fs-extra@^10.0.0, fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
@@ -5688,6 +5688,15 @@ fs-extra@^10.0.0, fs-extra@^10.0.1, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+fs-extra@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
+  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^4.0.2, fs-extra@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"

From a15ae0f17c8aac1a8820718a65bbfb64dbc08a45 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 1 Dec 2022 13:28:08 -0800
Subject: [PATCH 1304/1405] Controller queryParams are readonly

---
 packages/@ember/controller/index.ts                 | 2 +-
 packages/@ember/controller/type-tests/index.test.ts | 2 +-
 packages/@ember/routing/lib/utils.ts                | 2 +-
 types/preview/@ember/controller/index.d.ts          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index 91e54ffd656..ff99ba1f18c 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -86,7 +86,7 @@ interface ControllerMixin<T> extends ActionHandler {
     @property queryParams
     @public
   */
-  queryParams: Array<ControllerQueryParam>;
+  queryParams: Readonly<Array<ControllerQueryParam>>;
 
   /**
     Transition the application into another route. The route may
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
index 37fc6eb3972..23c6f669fb9 100644
--- a/packages/@ember/controller/type-tests/index.test.ts
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -26,7 +26,7 @@ expectTypeOf(controller.model).toEqualTypeOf<Foo>();
 expectTypeOf(controller.concatenatedProperties).toEqualTypeOf<string[] | string | undefined>();
 
 expectTypeOf(controller.queryParams).toEqualTypeOf<
-  Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>
+  Readonly<Array<string | Record<string, { type: 'boolean' | 'number' | 'array' | 'string' }>>>
 >();
 
 controller.transitionToRoute('blogPosts');
diff --git a/packages/@ember/routing/lib/utils.ts b/packages/@ember/routing/lib/utils.ts
index a02ac49c0c2..7df1126ea13 100644
--- a/packages/@ember/routing/lib/utils.ts
+++ b/packages/@ember/routing/lib/utils.ts
@@ -193,7 +193,7 @@ export function calculateCacheKey(prefix: string, parts: string[] = [], values:
   This helper normalizes all three possible styles into the
   'Array of fully defined objects' style.
 */
-export function normalizeControllerQueryParams(queryParams: ControllerQueryParam[]) {
+export function normalizeControllerQueryParams(queryParams: Readonly<ControllerQueryParam[]>) {
   let qpMap: Record<string, ExpandedControllerQueryParam> = {};
 
   for (let queryParam of queryParams) {
diff --git a/types/preview/@ember/controller/index.d.ts b/types/preview/@ember/controller/index.d.ts
index d4fd2758899..07e73ac7f2c 100644
--- a/types/preview/@ember/controller/index.d.ts
+++ b/types/preview/@ember/controller/index.d.ts
@@ -30,7 +30,7 @@ declare module '@ember/controller' {
      */
     transitionToRoute(...args: any[]): void;
     model: unknown;
-    queryParams: Array<string | Record<string, QueryParamConfig | string | undefined>>;
+    queryParams: Readonly<Array<string | Record<string, QueryParamConfig | string | undefined>>>;
     target: object;
   }
 

From 3a3b19abd792c7f4c9160e546964ce5f4b63a0a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Dec 2022 23:29:49 +0000
Subject: [PATCH 1305/1405] Bump decode-uri-component from 0.2.0 to 0.2.2

Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 0bde262906f..3c9ad4d0e06 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4038,9 +4038,9 @@ decamelize@^4.0.0:
   integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 decompress-response@^3.3.0:
   version "3.3.0"

From 09e08052119a9b9b3e59e2ac99a3b6e73392b3a6 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 09:02:03 -0800
Subject: [PATCH 1306/1405] Stop using the @ember/error package internally and
 improve types

---
 packages/@ember/-internals/metal/lib/alias.ts                | 3 +--
 packages/@ember/-internals/metal/lib/computed.ts             | 3 +--
 packages/@ember/-internals/metal/lib/property_set.ts         | 5 +----
 packages/@ember/-internals/views/lib/views/states/default.ts | 3 +--
 .../@ember/-internals/views/lib/views/states/destroying.ts   | 5 ++---
 packages/@ember/-internals/views/lib/views/states/in_dom.ts  | 3 +--
 packages/@ember/debug/index.ts                               | 3 +--
 packages/@ember/engine/instance.ts                           | 3 +--
 packages/@ember/error/tests/index_test.js                    | 3 +--
 packages/@ember/object/promise-proxy-mixin.ts                | 3 +--
 packages/@ember/routing/lib/utils.ts                         | 3 +--
 packages/@ember/routing/router.ts                            | 5 ++---
 type-tests/@ember/error-tests.ts                             | 4 ++--
 types/preview/@ember/error/index.d.ts                        | 4 ++--
 types/preview/ember/index.d.ts                               | 2 +-
 15 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index f769ef276db..803dd3b1efa 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -2,7 +2,6 @@ import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor } from '@ember/-internals/meta';
 import { inspect } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import EmberError from '@ember/error';
 import type { UpdatableTag } from '@glimmer/validator';
 import {
   consumeTag,
@@ -115,7 +114,7 @@ export class AliasedProperty extends ComputedDescriptor {
 }
 
 function AliasedProperty_readOnlySet(obj: object, keyName: string): never {
-  throw new EmberError(`Cannot set read-only property '${keyName}' on object: ${inspect(obj)}`);
+  throw new Error(`Cannot set read-only property '${keyName}' on object: ${inspect(obj)}`);
 }
 
 function AliasedProperty_oneWaySet(obj: object, keyName: string, value: any): any {
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 64aec6efd21..7ccb2a7764a 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -2,7 +2,6 @@ import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor } from '@ember/-internals/meta';
 import { inspect, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import EmberError from '@ember/error';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import type { UpdatableTag } from '@glimmer/validator';
@@ -513,7 +512,7 @@ export class ComputedProperty extends ComputedDescriptor {
   }
 
   _throwReadOnlyError(obj: object, keyName: string): never {
-    throw new EmberError(`Cannot set read-only property "${keyName}" on object: ${inspect(obj)}`);
+    throw new Error(`Cannot set read-only property "${keyName}" on object: ${inspect(obj)}`);
   }
 
   _set(obj: object, keyName: string, value: unknown, meta: Meta): unknown {
diff --git a/packages/@ember/-internals/metal/lib/property_set.ts b/packages/@ember/-internals/metal/lib/property_set.ts
index 3c6c75f82a6..65b78f9c1ed 100644
--- a/packages/@ember/-internals/metal/lib/property_set.ts
+++ b/packages/@ember/-internals/metal/lib/property_set.ts
@@ -1,6 +1,5 @@
 import { lookupDescriptor, setWithMandatorySetter, toString } from '@ember/-internals/utils';
 import { assert } from '@ember/debug';
-import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
 import { COMPUTED_SETTERS } from './decorator';
 import { isPath } from './path_cache';
@@ -115,9 +114,7 @@ function _setPath(root: object, path: string, value: any, tolerant?: boolean): a
   if (newRoot !== null && newRoot !== undefined) {
     return set(newRoot, keyName, value);
   } else if (!tolerant) {
-    throw new EmberError(
-      `Property set failed: object in path "${parts.join('.')}" could not be found.`
-    );
+    throw new Error(`Property set failed: object in path "${parts.join('.')}" could not be found.`);
   }
 }
 
diff --git a/packages/@ember/-internals/views/lib/views/states/default.ts b/packages/@ember/-internals/views/lib/views/states/default.ts
index 0bd4a1b17a3..0017c55da8c 100644
--- a/packages/@ember/-internals/views/lib/views/states/default.ts
+++ b/packages/@ember/-internals/views/lib/views/states/default.ts
@@ -1,10 +1,9 @@
-import EmberError from '@ember/error';
 import type { ViewState } from '../states';
 
 const _default: ViewState = {
   // appendChild is only legal while rendering the buffer.
   appendChild() {
-    throw new EmberError("You can't use appendChild outside of the rendering process");
+    throw new Error("You can't use appendChild outside of the rendering process");
   },
 
   // Handle events from `Ember.EventDispatcher`
diff --git a/packages/@ember/-internals/views/lib/views/states/destroying.ts b/packages/@ember/-internals/views/lib/views/states/destroying.ts
index 11f3a685b41..5ac876bc5b8 100644
--- a/packages/@ember/-internals/views/lib/views/states/destroying.ts
+++ b/packages/@ember/-internals/views/lib/views/states/destroying.ts
@@ -1,4 +1,3 @@
-import EmberError from '@ember/error';
 import type { ViewState } from '../states';
 import _default from './default';
 
@@ -6,11 +5,11 @@ const destroying: ViewState = {
   ..._default,
 
   appendChild() {
-    throw new EmberError("You can't call appendChild on a view being destroyed");
+    throw new Error("You can't call appendChild on a view being destroyed");
   },
 
   rerender() {
-    throw new EmberError("You can't call rerender on a view being destroyed");
+    throw new Error("You can't call rerender on a view being destroyed");
   },
 };
 
diff --git a/packages/@ember/-internals/views/lib/views/states/in_dom.ts b/packages/@ember/-internals/views/lib/views/states/in_dom.ts
index 6a1a6a71897..ce540378522 100644
--- a/packages/@ember/-internals/views/lib/views/states/in_dom.ts
+++ b/packages/@ember/-internals/views/lib/views/states/in_dom.ts
@@ -1,7 +1,6 @@
 import { teardownMandatorySetter } from '@ember/-internals/utils';
 import type Component from '@ember/component';
 import { assert } from '@ember/debug';
-import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
 import type { ViewState } from '../states';
 import hasElement from './has_element';
@@ -32,7 +31,7 @@ const inDOM: ViewState = {
         },
         set(value) {
           if (value !== elementId) {
-            throw new EmberError("Changing a view's elementId after creation is not allowed");
+            throw new Error("Changing a view's elementId after creation is not allowed");
           }
         },
       });
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 53b975282ae..6c9d656b667 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -1,6 +1,5 @@
 import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
 import type { AnyFn } from '@ember/-internals/utils/types';
-import EmberError from '@ember/error';
 import { DEBUG } from '@glimmer/env';
 import type { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
 import _deprecate from './lib/deprecate';
@@ -169,7 +168,7 @@ if (DEBUG) {
   */
   setDebugFunction('assert', function assert(desc, test) {
     if (!test) {
-      throw new EmberError(`Assertion Failed: ${desc}`);
+      throw new Error(`Assertion Failed: ${desc}`);
     }
   });
 
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 5516dccf24a..05a1458c127 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -5,7 +5,6 @@
 import EmberObject from '@ember/object';
 import { RSVP } from '@ember/-internals/runtime';
 import { assert } from '@ember/debug';
-import EmberError from '@ember/error';
 import { Registry, privatize as P } from '@ember/-internals/container';
 import { guidFor } from '@ember/-internals/utils';
 import { ENGINE_PARENT, getEngineParent, setEngineParent } from './lib/engine-parent';
@@ -203,7 +202,7 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
     let Engine = this.lookup(`engine:${name}`);
 
     if (!Engine) {
-      throw new EmberError(
+      throw new Error(
         `You attempted to mount the engine '${name}', but it is not registered with its parent.`
       );
     }
diff --git a/packages/@ember/error/tests/index_test.js b/packages/@ember/error/tests/index_test.js
index f6ecf5815cf..6af1a84329a 100644
--- a/packages/@ember/error/tests/index_test.js
+++ b/packages/@ember/error/tests/index_test.js
@@ -1,4 +1,3 @@
-import EmberError from '@ember/error';
 import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -7,7 +6,7 @@ moduleFor(
     ['@test new EmberError displays provided message'](assert) {
       assert.throws(
         () => {
-          throw new EmberError('A Message');
+          throw new Error('A Message');
         },
         function (e) {
           return e.message === 'A Message';
diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index c4d6c0b68e9..5dfb01434bd 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -1,7 +1,6 @@
 import { get, setProperties, computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
 import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
-import EmberError from '@ember/error';
 import type RSVP from 'rsvp';
 import type CoreObject from '@ember/object/core';
 
@@ -227,7 +226,7 @@ const PromiseProxyMixin = Mixin.create({
 
   promise: computed({
     get() {
-      throw new EmberError("PromiseProxy's promise must be set");
+      throw new Error("PromiseProxy's promise must be set");
     },
     set(_key, promise: RSVP.Promise<unknown>) {
       return tap(this, promise);
diff --git a/packages/@ember/routing/lib/utils.ts b/packages/@ember/routing/lib/utils.ts
index 7df1126ea13..159d398ba41 100644
--- a/packages/@ember/routing/lib/utils.ts
+++ b/packages/@ember/routing/lib/utils.ts
@@ -3,7 +3,6 @@ import { getOwner } from '@ember/-internals/owner';
 import type { ControllerQueryParam, ControllerQueryParamType } from '@ember/controller';
 import { assert, deprecate } from '@ember/debug';
 import EngineInstance from '@ember/engine/instance';
-import EmberError from '@ember/error';
 import type { InternalRouteInfo, ModelFor } from 'router_js';
 import type Router from 'router_js';
 import { STATE_SYMBOL } from 'router_js';
@@ -252,7 +251,7 @@ export function prefixRouteNameArg<T extends NamedRouteArgs<Route> | UnnamedRout
   if (owner.routable && typeof args[0] === 'string') {
     routeName = args[0];
     if (resemblesURL(routeName)) {
-      throw new EmberError(
+      throw new Error(
         'Programmatic transitions by URL cannot be used within an Engine. Please use the route name instead.'
       );
     } else {
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 5fbb3f6316f..45f43282152 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -23,7 +23,6 @@ import { A as emberA } from '@ember/array';
 import { typeOf } from '@ember/utils';
 import Evented from '@ember/object/evented';
 import { assert, deprecate, info } from '@ember/debug';
-import EmberError from '@ember/error';
 import { cancel, once, run, scheduleOnce } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import type { QueryParamMeta, RenderOptions } from '@ember/routing/route';
@@ -1757,7 +1756,7 @@ export function triggerEvent<
       return;
     }
     // TODO: update?
-    throw new EmberError(
+    throw new Error(
       `Can't trigger action '${name}' because your app hasn't finished transitioning into its first route. To trigger an action on destination routes during a transition, you can call \`.send()\` on the \`Transition\` object passed to the \`model/beforeModel/afterModel\` hooks.`
     );
   }
@@ -1791,7 +1790,7 @@ export function triggerEvent<
   }
 
   if (!eventWasHandled && !ignoreFailure) {
-    throw new EmberError(
+    throw new Error(
       `Nothing handled the action '${name}'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble.`
     );
   }
diff --git a/type-tests/@ember/error-tests.ts b/type-tests/@ember/error-tests.ts
index 3ffd32c5af9..ce279389dd0 100644
--- a/type-tests/@ember/error-tests.ts
+++ b/type-tests/@ember/error-tests.ts
@@ -1,7 +1,7 @@
-import Error from '@ember/error';
+import EmberError from '@ember/error';
 import { expectTypeOf } from 'expect-type';
 
-expectTypeOf(new Error('Fuuuuuuuu')).toEqualTypeOf<Error>();
+expectTypeOf(new EmberError('Fuuuuuuuu')).toEqualTypeOf<Error>();
 
 // allows to extend from EmberError
 class AjaxError extends Error {}
diff --git a/types/preview/@ember/error/index.d.ts b/types/preview/@ember/error/index.d.ts
index 6a8636372b6..20d4ad9d7d4 100644
--- a/types/preview/@ember/error/index.d.ts
+++ b/types/preview/@ember/error/index.d.ts
@@ -1,6 +1,6 @@
 declare module '@ember/error' {
   /**
-   * A subclass of the JavaScript Error object for use in Ember.
+   * The native JavaScript Error class.
    */
-  export default class EmberError extends Error {}
+  export default Error;
 }
diff --git a/types/preview/ember/index.d.ts b/types/preview/ember/index.d.ts
index a80649d4f08..16e22326ce0 100755
--- a/types/preview/ember/index.d.ts
+++ b/types/preview/ember/index.d.ts
@@ -129,7 +129,7 @@ declare module 'ember' {
     /**
      * A subclass of the JavaScript Error object for use in Ember.
      */
-    const Error: typeof EmberError;
+    const Error: ErrorConstructor;
 
     const Evented: typeof EmberObjectEventedNs.default;
     interface Evented extends EmberObjectEventedNs.default {}

From c6edaa3982510527b6f435641b3c9ef8d50ece1a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 09:22:47 -0800
Subject: [PATCH 1307/1405] Build types when checking

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 16ad88481ce..f9d7ba444cf 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js",
     "type-check:internals": "tsc --noEmit",
-    "type-check:types": "tsc --noEmit --project type-tests",
+    "type-check:types": "yarn build:types && tsc --noEmit --project type-tests",
     "type-check": "npm-run-all type-check:*"
   },
   "dependencies": {

From 7073f8ca47ad7690a835d4ca3602c46726601a54 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 09:53:35 -0800
Subject: [PATCH 1308/1405] Remove unnecessary step from CI

---
 .github/workflows/ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d240cd0300e..6ddf4e2907e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,8 +43,6 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - name: build stable type definitions
-        run: yarn build:types
       - name: Check published types
         run: yarn type-check:types
 

From 08f4a9194037b4534a8dd615a5c49a396311a190 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 10:36:38 -0800
Subject: [PATCH 1309/1405] Move inspect to @ember/debug

---
 packages/@ember/-internals/metal/lib/alias.ts                | 3 +--
 packages/@ember/-internals/metal/lib/computed.ts             | 4 ++--
 packages/@ember/-internals/utils/index.ts                    | 1 -
 .../@ember/-internals/views/lib/mixins/action_support.ts     | 3 +--
 packages/@ember/debug/index.ts                               | 5 ++---
 packages/@ember/{-internals/utils => debug}/lib/inspect.ts   | 0
 .../@ember/{-internals/utils => debug}/tests/inspect_test.js | 0
 packages/ember-testing/lib/adapters/qunit.ts                 | 2 +-
 packages/ember/index.ts                                      | 2 +-
 types/publish.mjs                                            | 2 +-
 10 files changed, 9 insertions(+), 13 deletions(-)
 rename packages/@ember/{-internals/utils => debug}/lib/inspect.ts (100%)
 rename packages/@ember/{-internals/utils => debug}/tests/inspect_test.js (100%)

diff --git a/packages/@ember/-internals/metal/lib/alias.ts b/packages/@ember/-internals/metal/lib/alias.ts
index 803dd3b1efa..af955f3cb12 100644
--- a/packages/@ember/-internals/metal/lib/alias.ts
+++ b/packages/@ember/-internals/metal/lib/alias.ts
@@ -1,7 +1,6 @@
 import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor } from '@ember/-internals/meta';
-import { inspect } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
+import { assert, inspect } from '@ember/debug';
 import type { UpdatableTag } from '@glimmer/validator';
 import {
   consumeTag,
diff --git a/packages/@ember/-internals/metal/lib/computed.ts b/packages/@ember/-internals/metal/lib/computed.ts
index 7ccb2a7764a..2aa2ee2fcd9 100644
--- a/packages/@ember/-internals/metal/lib/computed.ts
+++ b/packages/@ember/-internals/metal/lib/computed.ts
@@ -1,7 +1,7 @@
 import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor } from '@ember/-internals/meta';
-import { inspect, toString } from '@ember/-internals/utils';
-import { assert } from '@ember/debug';
+import { toString } from '@ember/-internals/utils';
+import { assert, inspect } from '@ember/debug';
 import { isDestroyed } from '@glimmer/destroyable';
 import { DEBUG } from '@glimmer/env';
 import type { UpdatableTag } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index af55ecd97f5..ddfd01674b2 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -21,7 +21,6 @@ export {
   setObservers,
   setListeners,
 } from './lib/super';
-export { default as inspect } from './lib/inspect';
 export { default as lookupDescriptor } from './lib/lookup-descriptor';
 export { canInvoke } from './lib/invoke';
 export { default as makeArray } from './lib/make-array';
diff --git a/packages/@ember/-internals/views/lib/mixins/action_support.ts b/packages/@ember/-internals/views/lib/mixins/action_support.ts
index 6c72300e8cb..f7d79862587 100644
--- a/packages/@ember/-internals/views/lib/mixins/action_support.ts
+++ b/packages/@ember/-internals/views/lib/mixins/action_support.ts
@@ -1,10 +1,9 @@
 /**
  @module ember
 */
-import { inspect } from '@ember/-internals/utils';
 import { get } from '@ember/-internals/metal';
 import Mixin from '@ember/object/mixin';
-import { assert } from '@ember/debug';
+import { assert, inspect } from '@ember/debug';
 
 /**
  @class ActionSupport
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 6c9d656b667..68443a5863c 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -7,12 +7,11 @@ import { isTesting } from './lib/testing';
 import type { WarnFunc } from './lib/warn';
 import _warn from './lib/warn';
 
-export { inspect } from '@ember/-internals/utils';
 export { registerHandler as registerWarnHandler } from './lib/warn';
-export { registerHandler as registerDeprecationHandler } from './lib/deprecate';
+export { registerHandler as registerDeprecationHandler, DeprecationOptions } from './lib/deprecate';
+export { default as inspect } from './lib/inspect';
 export { isTesting, setTesting } from './lib/testing';
 export { default as captureRenderTree } from './lib/capture-render-tree';
-export { DeprecationOptions } from './lib/deprecate';
 
 export type DebugFunctionType =
   | 'assert'
diff --git a/packages/@ember/-internals/utils/lib/inspect.ts b/packages/@ember/debug/lib/inspect.ts
similarity index 100%
rename from packages/@ember/-internals/utils/lib/inspect.ts
rename to packages/@ember/debug/lib/inspect.ts
diff --git a/packages/@ember/-internals/utils/tests/inspect_test.js b/packages/@ember/debug/tests/inspect_test.js
similarity index 100%
rename from packages/@ember/-internals/utils/tests/inspect_test.js
rename to packages/@ember/debug/tests/inspect_test.js
diff --git a/packages/ember-testing/lib/adapters/qunit.ts b/packages/ember-testing/lib/adapters/qunit.ts
index 36b61f99da1..9c550ee2e37 100644
--- a/packages/ember-testing/lib/adapters/qunit.ts
+++ b/packages/ember-testing/lib/adapters/qunit.ts
@@ -1,6 +1,6 @@
 /* globals QUnit */
 
-import { inspect } from '@ember/-internals/utils';
+import { inspect } from '@ember/debug';
 import Adapter from './adapter';
 
 interface VeryOldQunit {
diff --git a/packages/ember/index.ts b/packages/ember/index.ts
index 7050912263a..dc17540a416 100644
--- a/packages/ember/index.ts
+++ b/packages/ember/index.ts
@@ -203,7 +203,6 @@ const PartialEmber = {
   _Cache: utils.Cache,
   GUID_KEY: utils.GUID_KEY,
   canInvoke: utils.canInvoke,
-  inspect: utils.inspect,
   generateGuid: utils.generateGuid,
   guidFor: utils.guidFor,
   makeArray: utils.makeArray,
@@ -257,6 +256,7 @@ const PartialEmber = {
   deprecate: EmberDebug.deprecate,
   deprecateFunc: EmberDebug.deprecateFunc,
   runInDebug: EmberDebug.runInDebug,
+  inspect: EmberDebug.inspect,
 
   Debug: {
     registerDeprecationHandler: EmberDebug.registerDeprecationHandler,
diff --git a/types/publish.mjs b/types/publish.mjs
index 25478f82cc3..8fd0e3c069a 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -164,7 +164,6 @@ const PREVIEW_MODULES = [
   '@ember/-internals/utils/lib/ember-array.d.ts',
   '@ember/-internals/utils/lib/get-debug-name.d.ts',
   '@ember/-internals/utils/lib/guid.d.ts',
-  '@ember/-internals/utils/lib/inspect.d.ts',
   '@ember/-internals/utils/lib/intern.d.ts',
   '@ember/-internals/utils/lib/invoke.d.ts',
   '@ember/-internals/utils/lib/is_proxy.d.ts',
@@ -214,6 +213,7 @@ const PREVIEW_MODULES = [
   '@ember/debug/lib/capture-render-tree.d.ts',
   '@ember/debug/lib/deprecate.d.ts',
   '@ember/debug/lib/handlers.d.ts',
+  '@ember/debug/lib/inspect.d.ts',
   '@ember/debug/lib/testing.d.ts',
   '@ember/debug/lib/warn.d.ts',
   '@ember/deprecated-features/index.d.ts',

From e5a35b653655026489491530c38ebe6d19a5a3b3 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 11:05:37 -0800
Subject: [PATCH 1310/1405] Remove test polyfills

---
 .github/dependabot.yml                  |  4 ----
 bin/build-for-publishing.js             |  2 +-
 broccoli/test-polyfills.js              | 27 -------------------------
 ember-cli-build.js                      |  3 +--
 package.json                            |  1 -
 smoke-tests/ember-test-app/package.json |  1 -
 tests/index.html                        |  1 -
 yarn.lock                               |  5 -----
 8 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100644 broccoli/test-polyfills.js

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d3a05e83fe9..4aa0ece9968 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -13,10 +13,6 @@ updates:
   - dependency-name: ember-cli
     versions:
     - 3.25.0
-  - dependency-name: core-js
-    versions:
-    - 3.8.1
-    - 3.8.3
   - dependency-name: broccoli-rollup
     versions:
     - 4.1.1
diff --git a/bin/build-for-publishing.js b/bin/build-for-publishing.js
index f39fc95919a..bc5ca24e70b 100755
--- a/bin/build-for-publishing.js
+++ b/bin/build-for-publishing.js
@@ -1,5 +1,5 @@
 'use strict';
-/* eslint-env node, es6 */
+/* eslint-env node */
 
 const fs = require('fs');
 const path = require('path');
diff --git a/broccoli/test-polyfills.js b/broccoli/test-polyfills.js
deleted file mode 100644
index 1acff85794e..00000000000
--- a/broccoli/test-polyfills.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const Rollup = require('broccoli-rollup');
-const writeFile = require('broccoli-file-creator');
-const resolve = require('rollup-plugin-node-resolve');
-const commonjs = require('rollup-plugin-commonjs');
-
-module.exports = function polyfills() {
-  let polyfillEntry = writeFile(
-    'polyfill-entry.js',
-    `
-      require('core-js/modules/es6.promise');
-      require('core-js/modules/es6.symbol');
-      require('regenerator-runtime/runtime');
-    `
-  );
-
-  return new Rollup(polyfillEntry, {
-    rollup: {
-      input: 'polyfill-entry.js',
-      output: {
-        file: 'polyfill.js',
-        name: 'polyfill',
-        format: 'iife',
-      },
-      plugins: [resolve(), commonjs()],
-    },
-  });
-};
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 759cb39c434..76932bd8232 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -5,7 +5,6 @@ const Funnel = require('broccoli-funnel');
 const babelHelpers = require('./broccoli/babel-helpers');
 const concatBundle = require('./lib/concat-bundle');
 const testIndexHTML = require('./broccoli/test-index-html');
-const testPolyfills = require('./broccoli/test-polyfills');
 const rollupPackage = require('./broccoli/rollup-package');
 const minify = require('./broccoli/minify');
 const debugTree = require('broccoli-debug').buildDebugCallback('ember-source:ember-cli-build');
@@ -250,7 +249,7 @@ function templateCompilerBundle(emberPackages, transpileTree) {
 }
 
 function testHarness() {
-  return new MergeTrees([emptyTestem(), testPolyfills(), testIndexHTML(), loader(), qunit()]);
+  return new MergeTrees([emptyTestem(), testIndexHTML(), loader(), qunit()]);
 }
 
 function emptyTestem() {
diff --git a/package.json b/package.json
index f9d7ba444cf..e6ad88af8ac 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,6 @@
     "broccoli-typescript-compiler": "^8.0.0",
     "broccoli-uglify-sourcemap": "^4.0.0",
     "common-tags": "^1.8.2",
-    "core-js": "^3.26.0",
     "dag-map": "^2.0.2",
     "ember-cli": "^4.8.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
diff --git a/smoke-tests/ember-test-app/package.json b/smoke-tests/ember-test-app/package.json
index 1aa0f9bad4c..3ec9877133e 100644
--- a/smoke-tests/ember-test-app/package.json
+++ b/smoke-tests/ember-test-app/package.json
@@ -42,7 +42,6 @@
     "ember-export-application-global": "^2.0.1",
     "ember-fetch": "^8.1.1",
     "ember-load-initializers": "^2.1.2",
-    "ember-maybe-import-regenerator": "^0.1.6",
     "ember-page-title": "^6.2.2",
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.2",
diff --git a/tests/index.html b/tests/index.html
index d83ba2b8493..0b3f29fe8c1 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -9,7 +9,6 @@
         display: none;
       }
     </style>
-    <script src="./polyfill.js"></script>
     <script src="./loader.js"></script>
     <script src="./qunit/qunit.js"></script>
     <script src="/testem.js"></script>
diff --git a/yarn.lock b/yarn.lock
index c47b1ce9fd9..a1f8a86e3b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3872,11 +3872,6 @@ core-js@^2.4.0, core-js@^2.6.5:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.5.tgz#44bc8d249e7fb2ff5d00e0341a7ffb94fbf67895"
   integrity sha512-klh/kDpwX8hryYL14M9w/xei6vrv6sE8gTHDG7/T/+SEovB/G4ejwcfE/CBzO6Edsu+OETZMZ3wcX/EjUkrl5A==
 
-core-js@^3.26.0:
-  version "3.26.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe"
-  integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==
-
 core-object@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9"

From 24e6d125d681cb008df21ebb916d00f40e20c810 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 10:12:21 -0800
Subject: [PATCH 1311/1405] Relocate ember-array internals

---
 packages/@ember/-internals/glimmer/lib/utils/iterator.ts       | 3 ++-
 packages/@ember/-internals/metal/lib/property_get.ts           | 3 ++-
 packages/@ember/-internals/metal/lib/tracked.ts                | 2 +-
 packages/@ember/-internals/utils/index.ts                      | 1 -
 .../utils/lib/ember-array.ts => array/-internals.ts}           | 0
 packages/@ember/array/index.ts                                 | 2 +-
 .../tests/is-ember-array-test.js}                              | 2 +-
 types/publish.mjs                                              | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)
 rename packages/@ember/{-internals/utils/lib/ember-array.ts => array/-internals.ts} (100%)
 rename packages/@ember/{-internals/utils/tests/trackable-object-test.js => array/tests/is-ember-array-test.js} (84%)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
index 3a8c8d347ad..7b5c4657f8b 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/iterator.ts
@@ -1,6 +1,7 @@
 import { objectAt } from '@ember/-internals/metal';
 import type EmberArray from '@ember/array';
-import { isEmberArray, isObject } from '@ember/-internals/utils';
+import { isEmberArray } from '@ember/array/-internals';
+import { isObject } from '@ember/-internals/utils';
 import type { Option } from '@glimmer/interfaces';
 import type { IteratorDelegate } from '@glimmer/reference';
 import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/metal/lib/property_get.ts b/packages/@ember/-internals/metal/lib/property_get.ts
index 00c588e02a3..8f2e28a82d0 100644
--- a/packages/@ember/-internals/metal/lib/property_get.ts
+++ b/packages/@ember/-internals/metal/lib/property_get.ts
@@ -2,7 +2,8 @@
 @module @ember/object
 */
 import type ProxyMixin from '@ember/-internals/runtime/lib/mixins/-proxy';
-import { isEmberArray, setProxy, symbol } from '@ember/-internals/utils';
+import { setProxy, symbol } from '@ember/-internals/utils';
+import { isEmberArray } from '@ember/array/-internals';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, isTracking, tagFor, track } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/metal/lib/tracked.ts b/packages/@ember/-internals/metal/lib/tracked.ts
index 143bf6379c6..f5f696997f5 100644
--- a/packages/@ember/-internals/metal/lib/tracked.ts
+++ b/packages/@ember/-internals/metal/lib/tracked.ts
@@ -1,5 +1,5 @@
 import { meta as metaFor } from '@ember/-internals/meta';
-import { isEmberArray } from '@ember/-internals/utils';
+import { isEmberArray } from '@ember/array/-internals';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { consumeTag, dirtyTagFor, tagFor, trackedData } from '@glimmer/validator';
diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index af55ecd97f5..f1ec1061dc7 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -30,7 +30,6 @@ export { default as toString } from './lib/to-string';
 export { isObject } from './lib/spec';
 export { isProxy, setProxy } from './lib/is_proxy';
 export { default as Cache } from './lib/cache';
-export { setEmberArray, isEmberArray } from './lib/ember-array';
 export {
   setupMandatorySetter,
   teardownMandatorySetter,
diff --git a/packages/@ember/-internals/utils/lib/ember-array.ts b/packages/@ember/array/-internals.ts
similarity index 100%
rename from packages/@ember/-internals/utils/lib/ember-array.ts
rename to packages/@ember/array/-internals.ts
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 638b2cc0170..00de2c69290 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -3,7 +3,6 @@
 */
 import { DEBUG } from '@glimmer/env';
 import { PROXY_CONTENT } from '@ember/-internals/metal';
-import { isEmberArray, setEmberArray } from '@ember/-internals/utils';
 import {
   objectAt,
   replaceInNativeArray,
@@ -22,6 +21,7 @@ import { ENV } from '@ember/-internals/environment';
 import Observable from '@ember/object/observable';
 import type { MethodNamesOf, MethodParams, MethodReturns } from '@ember/-internals/utils/types';
 import type { ComputedPropertyCallback } from '@ember/-internals/metal';
+import { isEmberArray, setEmberArray } from '@ember/array/-internals';
 
 export { makeArray } from '@ember/-internals/utils';
 
diff --git a/packages/@ember/-internals/utils/tests/trackable-object-test.js b/packages/@ember/array/tests/is-ember-array-test.js
similarity index 84%
rename from packages/@ember/-internals/utils/tests/trackable-object-test.js
rename to packages/@ember/array/tests/is-ember-array-test.js
index 7355dfad3d7..15d724d8992 100644
--- a/packages/@ember/-internals/utils/tests/trackable-object-test.js
+++ b/packages/@ember/array/tests/is-ember-array-test.js
@@ -1,4 +1,4 @@
-import { setEmberArray, isEmberArray } from '..';
+import { setEmberArray, isEmberArray } from '@ember/array/-internals';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
diff --git a/types/publish.mjs b/types/publish.mjs
index 25478f82cc3..6215929349f 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -161,7 +161,6 @@ const PREVIEW_MODULES = [
   '@ember/-internals/utils/index.d.ts',
   '@ember/-internals/utils/lib/cache.d.ts',
   '@ember/-internals/utils/lib/dictionary.d.ts',
-  '@ember/-internals/utils/lib/ember-array.d.ts',
   '@ember/-internals/utils/lib/get-debug-name.d.ts',
   '@ember/-internals/utils/lib/guid.d.ts',
   '@ember/-internals/utils/lib/inspect.d.ts',
@@ -203,6 +202,7 @@ const PREVIEW_MODULES = [
   '@ember/array/index.d.ts',
   '@ember/array/mutable.d.ts',
   '@ember/array/proxy.d.ts',
+  '@ember/array/-internals.d.ts',
   '@ember/canary-features/index.d.ts',
   '@ember/component/helper.d.ts',
   '@ember/component/index.d.ts',

From cbbef25d901ae534ecf5e5ba429fefce488dc44a Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 10:21:41 -0800
Subject: [PATCH 1312/1405] Move make-array to @ember/array

---
 packages/@ember/-internals/utils/index.ts                     | 1 -
 packages/@ember/array/index.ts                                | 2 +-
 packages/@ember/{-internals/utils => array}/lib/make-array.ts | 0
 .../{-internals/utils => array}/tests/make_array_test.js      | 0
 packages/@ember/object/core.ts                                | 3 ++-
 packages/@ember/object/mixin.ts                               | 3 ++-
 packages/ember/index.ts                                       | 4 ++--
 types/publish.mjs                                             | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)
 rename packages/@ember/{-internals/utils => array}/lib/make-array.ts (100%)
 rename packages/@ember/{-internals/utils => array}/tests/make_array_test.js (100%)

diff --git a/packages/@ember/-internals/utils/index.ts b/packages/@ember/-internals/utils/index.ts
index f1ec1061dc7..0444233cab2 100644
--- a/packages/@ember/-internals/utils/index.ts
+++ b/packages/@ember/-internals/utils/index.ts
@@ -24,7 +24,6 @@ export {
 export { default as inspect } from './lib/inspect';
 export { default as lookupDescriptor } from './lib/lookup-descriptor';
 export { canInvoke } from './lib/invoke';
-export { default as makeArray } from './lib/make-array';
 export { getName, setName } from './lib/name';
 export { default as toString } from './lib/to-string';
 export { isObject } from './lib/spec';
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 00de2c69290..82fc9af9b54 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -23,7 +23,7 @@ import type { MethodNamesOf, MethodParams, MethodReturns } from '@ember/-interna
 import type { ComputedPropertyCallback } from '@ember/-internals/metal';
 import { isEmberArray, setEmberArray } from '@ember/array/-internals';
 
-export { makeArray } from '@ember/-internals/utils';
+export { default as makeArray } from './lib/make-array';
 
 export type EmberArrayLike<T> = EmberArray<T> | NativeArray<T>;
 
diff --git a/packages/@ember/-internals/utils/lib/make-array.ts b/packages/@ember/array/lib/make-array.ts
similarity index 100%
rename from packages/@ember/-internals/utils/lib/make-array.ts
rename to packages/@ember/array/lib/make-array.ts
diff --git a/packages/@ember/-internals/utils/tests/make_array_test.js b/packages/@ember/array/tests/make_array_test.js
similarity index 100%
rename from packages/@ember/-internals/utils/tests/make_array_test.js
rename to packages/@ember/array/tests/make_array_test.js
diff --git a/packages/@ember/object/core.ts b/packages/@ember/object/core.ts
index 7101c70a478..797b1b8dad2 100644
--- a/packages/@ember/object/core.ts
+++ b/packages/@ember/object/core.ts
@@ -4,7 +4,7 @@
 
 import { getFactoryFor, setFactoryFor } from '@ember/-internals/container';
 import { type default as Owner, getOwner } from '@ember/-internals/owner';
-import { guidFor, makeArray, isInternalSymbol } from '@ember/-internals/utils';
+import { guidFor, isInternalSymbol } from '@ember/-internals/utils';
 import { meta } from '@ember/-internals/meta';
 import type { ComputedProperty, HasUnknownProperty } from '@ember/-internals/metal';
 import {
@@ -19,6 +19,7 @@ import {
 } from '@ember/-internals/metal';
 import Mixin, { applyMixin } from '@ember/object/mixin';
 import { ActionHandler } from '@ember/-internals/runtime';
+import { makeArray } from '@ember/array';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet as WeakSet } from '@glimmer/util';
diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index d874914a250..7b6e8f4037c 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -4,7 +4,8 @@
 import { INIT_FACTORY } from '@ember/-internals/container';
 import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
-import { guidFor, makeArray, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/utils';
+import { guidFor, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/utils';
+import { makeArray } from '@ember/array';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
diff --git a/packages/ember/index.ts b/packages/ember/index.ts
index 7050912263a..f97a7146fbd 100644
--- a/packages/ember/index.ts
+++ b/packages/ember/index.ts
@@ -73,7 +73,7 @@ import DataAdapter from '@ember/debug/data-adapter';
 import EmberError from '@ember/error';
 import { run } from '@ember/runloop';
 import { getOnerror, setOnerror } from '@ember/-internals/error-handling';
-import EmberArray, { A, NativeArray, isArray } from '@ember/array';
+import EmberArray, { A, NativeArray, isArray, makeArray } from '@ember/array';
 import MutableArray from '@ember/array/mutable';
 import ArrayProxy from '@ember/array/proxy';
 import Application, { getOwner, setOwner, onLoad, runLoadHooks } from '@ember/application';
@@ -206,7 +206,6 @@ const PartialEmber = {
   inspect: utils.inspect,
   generateGuid: utils.generateGuid,
   guidFor: utils.guidFor,
-  makeArray: utils.makeArray,
   uuid: utils.uuid,
   wrap: utils.wrap,
 
@@ -228,6 +227,7 @@ const PartialEmber = {
   Array: EmberArray,
   NativeArray,
   isArray,
+  makeArray,
 
   // ****@ember/array/mutable****
   MutableArray,
diff --git a/types/publish.mjs b/types/publish.mjs
index 6215929349f..f71b341d78b 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -168,7 +168,6 @@ const PREVIEW_MODULES = [
   '@ember/-internals/utils/lib/invoke.d.ts',
   '@ember/-internals/utils/lib/is_proxy.d.ts',
   '@ember/-internals/utils/lib/lookup-descriptor.d.ts',
-  '@ember/-internals/utils/lib/make-array.d.ts',
   '@ember/-internals/utils/lib/mandatory-setter.d.ts',
   '@ember/-internals/utils/lib/name.d.ts',
   '@ember/-internals/utils/lib/spec.d.ts',
@@ -203,6 +202,7 @@ const PREVIEW_MODULES = [
   '@ember/array/mutable.d.ts',
   '@ember/array/proxy.d.ts',
   '@ember/array/-internals.d.ts',
+  '@ember/array/lib/make-array.d.ts',
   '@ember/canary-features/index.d.ts',
   '@ember/component/helper.d.ts',
   '@ember/component/index.d.ts',

From 71a3f3a9e9e1132ebe7c5e022bc84bf63ab6aec4 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 11:15:39 -0800
Subject: [PATCH 1313/1405] Remove circularity

---
 packages/@ember/object/mixin.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index 7b6e8f4037c..180707e29bb 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -5,7 +5,6 @@ import { INIT_FACTORY } from '@ember/-internals/container';
 import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { guidFor, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/utils';
-import { makeArray } from '@ember/array';
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
@@ -160,9 +159,19 @@ function giveMethodSuper(
   return method;
 }
 
+function simpleMakeArray(value: unknown) {
+  if (!value) {
+    return [];
+  } else if (!Array.isArray(value)) {
+    return [value];
+  } else {
+    return value;
+  }
+}
+
 function applyConcatenatedProperties(key: string, value: any, values: { [key: string]: any }) {
   let baseValue = values[key];
-  let ret = makeArray(baseValue).concat(makeArray(value));
+  let ret = simpleMakeArray(baseValue).concat(simpleMakeArray(value));
 
   if (DEBUG) {
     // it is possible to use concatenatedProperties with strings (which cannot be frozen)

From eae8b97a14fb78fac48a700db017bee8d0d0d38f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:20:49 +0000
Subject: [PATCH 1314/1405] Bump @types/node from 18.11.7 to 18.11.11

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 18.11.7 to 18.11.11.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index e6ad88af8ac..3921cbcb7e4 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
     "@glimmer/validator": "0.84.2",
     "@simple-dom/document": "^1.4.0",
     "@tsconfig/ember": "^1.0.1",
-    "@types/node": "^18.11.7",
+    "@types/node": "^18.11.11",
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
diff --git a/yarn.lock b/yarn.lock
index a1f8a86e3b1..2579e4ead8d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1778,15 +1778,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
-"@types/node@*", "@types/node@>=10.0.0":
-  version "16.7.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.7.10.tgz#7aa732cc47341c12a16b7d562f519c2383b6d4fc"
-  integrity sha512-S63Dlv4zIPb8x6MMTgDq5WWRJQe56iBEY0O3SOFA9JrRienkOVDXSXBjjJw6HTNQYSE2JI6GMCR6LVbIMHJVvA==
-
-"@types/node@^18.11.7":
-  version "18.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.7.tgz#8ccef136f240770c1379d50100796a6952f01f94"
-  integrity sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ==
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@^18.11.11":
+  version "18.11.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.11.tgz#1d455ac0211549a8409d3cdb371cd55cc971e8dc"
+  integrity sha512-KJ021B1nlQUBLopzZmPBVuGU9un7WJd/W4ya7Ih02B4Uwky5Nja0yGYav2EfYIk0RR2Q9oVhf60S2XR1BCWJ2g==
 
 "@types/node@^9.6.0":
   version "9.6.0"

From 6de1f3df3f0e3de74da3e36b52c4defb0ed025ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:21:14 +0000
Subject: [PATCH 1315/1405] Bump ember-auto-import from 2.4.1 to 2.5.0

Bumps [ember-auto-import](https://github.com/ef4/ember-auto-import/tree/HEAD/packages/ember-auto-import) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/ef4/ember-auto-import/releases)
- [Changelog](https://github.com/ef4/ember-auto-import/blob/main/packages/ember-auto-import/CHANGELOG.md)
- [Commits](https://github.com/ef4/ember-auto-import/commits/v2.5.0/packages/ember-auto-import)

---
updated-dependencies:
- dependency-name: ember-auto-import
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e6ad88af8ac..970ae0ef47b 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "chalk": "^4.0.0",
-    "ember-auto-import": "^2.4.1",
+    "ember-auto-import": "^2.5.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-get-component-path-option": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
index a1f8a86e3b1..1bf1527b891 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1264,7 +1264,7 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
-"@embroider/shared-internals@1.2.0", "@embroider/shared-internals@^1.0.0":
+"@embroider/shared-internals@1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.2.0.tgz#edb3ca7e8528be713dab01818e8caad2dc937fba"
   integrity sha512-11RfGuXxT+m2xPcpny/ENHjw53CuKPcrx7222LFQ53+I09hLxsvPCsH8be5E99LePDA46YGX41vxOxxfowD4OQ==
@@ -1277,6 +1277,20 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
+"@embroider/shared-internals@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.0.0.tgz#d8205ec6944362aeecfbb51143db352430ced316"
+  integrity sha512-qZ2/xky9mWm5YC6noOa6AiAwgISEQ78YTZNv4SNu2PFgEK/H+Ha/3ddngzGSsnXkVnIHZyxIBzhxETonQYHY9g==
+  dependencies:
+    babel-import-util "^1.1.0"
+    ember-rfc176-data "^0.3.17"
+    fs-extra "^9.1.0"
+    js-string-escape "^1.0.1"
+    lodash "^4.17.21"
+    resolve-package-path "^4.0.1"
+    semver "^7.3.5"
+    typescript-memoize "^1.0.1"
+
 "@eslint/eslintrc@^1.3.3":
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
@@ -4225,17 +4239,17 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-ember-auto-import@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.4.1.tgz#25e1c21d403eed116b21972ccc5336b49a7ca46b"
-  integrity sha512-lyCl2hzIb6Dlcmfm3gI3lAtaOk/nzR2kM4GDJRRu19YJhhSkpiIMSDVjw8ShxmnYiI005R1eOcP3C/GgRRW5mA==
+ember-auto-import@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.5.0.tgz#627607648e87d154f75cd3f70c435355ef7cced9"
+  integrity sha512-fKERUmpZLn4RJiCwTjS7D5zJxgnbF4E6GiSp1GYh53K96S+5UBs06r7ScDI52rq34z0+qdSrA6qiDJ3i/lWqKg==
   dependencies:
     "@babel/core" "^7.16.7"
     "@babel/plugin-proposal-class-properties" "^7.16.7"
     "@babel/plugin-proposal-decorators" "^7.16.7"
     "@babel/preset-env" "^7.16.7"
     "@embroider/macros" "^1.0.0"
-    "@embroider/shared-internals" "^1.0.0"
+    "@embroider/shared-internals" "^2.0.0"
     babel-loader "^8.0.6"
     babel-plugin-ember-modules-api-polyfill "^3.5.0"
     babel-plugin-htmlbars-inline-precompile "^5.2.1"

From 367708df5131622d11c3af3e524c3ac5be9a4d47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:21:24 +0000
Subject: [PATCH 1316/1405] Bump expect-type from 0.13.0 to 0.15.0

Bumps [expect-type](https://github.com/mmkal/expect-type) from 0.13.0 to 0.15.0.
- [Release notes](https://github.com/mmkal/expect-type/releases)
- [Commits](https://github.com/mmkal/expect-type/commits/v0.15.0)

---
updated-dependencies:
- dependency-name: expect-type
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index e6ad88af8ac..008221e1edc 100644
--- a/package.json
+++ b/package.json
@@ -135,7 +135,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.2.0",
     "execa": "^5.1.1",
-    "expect-type": "^0.13.0",
+    "expect-type": "^0.15.0",
     "express": "^4.18.1",
     "finalhandler": "^1.1.2",
     "fs-extra": "^11.1.0",
diff --git a/yarn.lock b/yarn.lock
index a1f8a86e3b1..720158daa83 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5190,10 +5190,10 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect-type@^0.13.0:
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.13.0.tgz#916646a7a73f3ee77039a634ee9035efe1876eb2"
-  integrity sha512-CclevazQfrqo8EvbLPmP7osnb1SZXkw47XPPvUUpeMz4HuGzDltE7CaIt3RLyT9UQrwVK/LDn+KVcC0hcgjgDg==
+expect-type@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.15.0.tgz#89f75e22c88554844ea2b2faf4ef5fc2e579d3b5"
+  integrity sha512-yWnriYB4e8G54M5/fAFj7rCIBiKs1HAACaY13kCz6Ku0dezjS9aMcfcdVK2X8Tv2tEV1BPz/wKfQ7WA4S/d8aA==
 
 express@^4.10.7, express@^4.13.1, express@^4.18.1:
   version "4.18.1"

From 8f50b1cc12edf9c37bdd116d7d9aaca6f3bec4f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 19:40:08 +0000
Subject: [PATCH 1317/1405] Bump express from 4.18.1 to 4.18.2

Bumps [express](https://github.com/expressjs/express) from 4.18.1 to 4.18.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.1...4.18.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 1204700e0e5..53b17f42f18 100644
--- a/package.json
+++ b/package.json
@@ -136,7 +136,7 @@
     "eslint-plugin-qunit": "^7.2.0",
     "execa": "^5.1.1",
     "expect-type": "^0.15.0",
-    "express": "^4.18.1",
+    "express": "^4.18.2",
     "finalhandler": "^1.1.2",
     "fs-extra": "^11.1.0",
     "git-repo-info": "^2.1.1",
diff --git a/yarn.lock b/yarn.lock
index f2a9b6fb9b0..30131996060 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2699,10 +2699,10 @@ blueimp-md5@^2.10.0:
   resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.18.0.tgz#1152be1335f0c6b3911ed9e36db54f3e6ac52935"
   integrity "sha1-EVK+EzXwxrORHtnjbbVPPmrFKTU= sha512-vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="
 
-body-parser@1.20.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
-  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.4"
@@ -2712,7 +2712,7 @@ body-parser@1.20.0:
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
-    qs "6.10.3"
+    qs "6.11.0"
     raw-body "2.5.1"
     type-is "~1.6.18"
     unpipe "1.0.0"
@@ -5204,14 +5204,14 @@ expect-type@^0.15.0:
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-0.15.0.tgz#89f75e22c88554844ea2b2faf4ef5fc2e579d3b5"
   integrity sha512-yWnriYB4e8G54M5/fAFj7rCIBiKs1HAACaY13kCz6Ku0dezjS9aMcfcdVK2X8Tv2tEV1BPz/wKfQ7WA4S/d8aA==
 
-express@^4.10.7, express@^4.13.1, express@^4.18.1:
-  version "4.18.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
-  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
+express@^4.10.7, express@^4.13.1, express@^4.18.1, express@^4.18.2:
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.0"
+    body-parser "1.20.1"
     content-disposition "0.5.4"
     content-type "~1.0.4"
     cookie "0.5.0"
@@ -5230,7 +5230,7 @@ express@^4.10.7, express@^4.13.1, express@^4.18.1:
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.10.3"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.18.0"
@@ -8976,10 +8976,10 @@ q@~0.9.6:
   resolved "https://registry.yarnpkg.com/q/-/q-0.9.7.tgz#4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"
   integrity "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U= sha512-ijt0LhxWClXBtc1RCt8H0WhlZLAdVX26nWbpsJy+Hblmp81d2F/pFsvlrJhJDDruFHM+ECtxP0H0HzGSrARkwg=="
 
-qs@6.10.3, qs@^6.4.0:
-  version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
-  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+qs@6.11.0, qs@^6.4.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
   dependencies:
     side-channel "^1.0.4"
 

From 92ed1dc52e81ba3fadfc6aa1808a85662ed72259 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 6 Dec 2022 12:58:59 -0700
Subject: [PATCH 1318/1405] Replace most `InternalOwner` uses with `Owner`

We only *need* the public API in most places, since most things which
depend on the internal/private API are actually using `EngineInstance`
or `ApplicationInstance`, and there aren't many of them! There are a
couple remaining spots we have `InternalOwner`:

- When defining the type of `EngineInstance` itself, we use the type to
  guarantee we implement what we *say* we implement.

- We use `hasRegistration` or `resolveRegistration` in a couple places;
  both can be replaced with `Owner#factoryFor`, but I am keeping those
  separate so that this can be a clean types-only change.

(This is part of the work for #20303.)
---
 packages/@ember/component/type-tests/helper/index.test.ts   | 4 ++--
 .../component/type-tests/set-component-manager.test.ts      | 4 ++--
 packages/@ember/controller/type-tests/index.test.ts         | 4 ++--
 packages/@ember/debug/container-debug-adapter.ts            | 4 ++--
 packages/@ember/debug/data-adapter.ts                       | 4 ++--
 packages/@ember/debug/lib/capture-render-tree.ts            | 4 ++--
 packages/@ember/engine/instance.ts                          | 5 ++++-
 packages/@ember/engine/type-tests/instance.test.ts          | 5 +++--
 packages/@ember/object/type-tests/core/index.test.ts        | 4 ++--
 packages/@ember/object/type-tests/ember-object.test.ts      | 6 +++---
 packages/@ember/object/type-tests/events/index.test.ts      | 4 ++--
 packages/@ember/routing/route.ts                            | 6 +++---
 packages/@ember/routing/router.ts                           | 4 ++--
 packages/@ember/routing/type-tests/auto-location.test.ts    | 4 ++--
 packages/@ember/routing/type-tests/hash-location.test.ts    | 4 ++--
 packages/@ember/routing/type-tests/history-location.test.ts | 4 ++--
 packages/@ember/routing/type-tests/none-location.test.ts    | 4 ++--
 packages/@ember/routing/type-tests/route/index.test.ts      | 4 ++--
 packages/@ember/routing/type-tests/route/overrides.test.ts  | 4 ++--
 .../@ember/routing/type-tests/route/query-params.test.ts    | 4 ++--
 packages/@ember/routing/type-tests/route/send.test.ts       | 4 ++--
 packages/@ember/routing/type-tests/router-service.test.ts   | 4 ++--
 packages/@ember/routing/type-tests/router/index.test.ts     | 4 ++--
 packages/@ember/service/type-tests/index.test.ts            | 4 ++--
 24 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/packages/@ember/component/type-tests/helper/index.test.ts b/packages/@ember/component/type-tests/helper/index.test.ts
index c8dbfa20a13..6099ab4821e 100644
--- a/packages/@ember/component/type-tests/helper/index.test.ts
+++ b/packages/@ember/component/type-tests/helper/index.test.ts
@@ -1,10 +1,10 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type { FrameworkObject } from '@ember/object/-internals';
 import Helper from '@ember/component/helper';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 // NOTE: The types for `compute` are not actually safe. Glint helps with this.
 
diff --git a/packages/@ember/component/type-tests/set-component-manager.test.ts b/packages/@ember/component/type-tests/set-component-manager.test.ts
index d7d7da5d815..11331b8808d 100644
--- a/packages/@ember/component/type-tests/set-component-manager.test.ts
+++ b/packages/@ember/component/type-tests/set-component-manager.test.ts
@@ -1,4 +1,4 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import { setComponentManager } from '@ember/component';
 import type { ComponentManager } from '@glimmer/interfaces';
 import { expectTypeOf } from 'expect-type';
@@ -9,7 +9,7 @@ let manager = {} as ComponentManager<unknown>;
 class Foo {}
 let foo = new Foo();
 
-expectTypeOf(setComponentManager((_owner: InternalOwner) => manager, foo)).toEqualTypeOf<Foo>();
+expectTypeOf(setComponentManager((_owner: Owner) => manager, foo)).toEqualTypeOf<Foo>();
 
 // @ts-expect-error invalid callback
 setComponentManager(() => {
diff --git a/packages/@ember/controller/type-tests/index.test.ts b/packages/@ember/controller/type-tests/index.test.ts
index 23c6f669fb9..539170513ea 100644
--- a/packages/@ember/controller/type-tests/index.test.ts
+++ b/packages/@ember/controller/type-tests/index.test.ts
@@ -1,10 +1,10 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import Controller, { inject } from '@ember/controller';
 
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 class Foo {}
 
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 43e490de888..88e0b08c819 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1,7 +1,7 @@
 import { classify, dasherize } from '@ember/string';
 import EmberObject from '@ember/object';
 import { typeOf } from '@ember/utils';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import { getOwner } from '@ember/-internals/owner';
 import type { Resolver } from '@ember/owner';
 import Namespace from '@ember/application/namespace';
@@ -45,7 +45,7 @@ import Namespace from '@ember/application/namespace';
   @public
 */
 export default class ContainerDebugAdapter extends EmberObject {
-  constructor(owner: InternalOwner) {
+  constructor(owner: Owner) {
     super(owner);
 
     this.resolver = getOwner(this)!.lookup('resolver-for-debugging:main') as Resolver;
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index bc02dc4b5c9..48a48d5d3a8 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -1,4 +1,4 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { _backburner, next } from '@ember/runloop';
 import { get } from '@ember/object';
@@ -219,7 +219,7 @@ export default class DataAdapter<T> extends EmberObject {
   // TODO: Revisit this
   declare containerDebugAdapter: ContainerDebugAdapter;
 
-  constructor(owner: InternalOwner) {
+  constructor(owner: Owner) {
     super(owner);
     this.containerDebugAdapter = getOwner(this)!.lookup(
       'container-debug-adapter:main'
diff --git a/packages/@ember/debug/lib/capture-render-tree.ts b/packages/@ember/debug/lib/capture-render-tree.ts
index 2992e172424..af2d3831b72 100644
--- a/packages/@ember/debug/lib/capture-render-tree.ts
+++ b/packages/@ember/debug/lib/capture-render-tree.ts
@@ -1,5 +1,5 @@
 import type { Renderer } from '@ember/-internals/glimmer';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type { CapturedRenderNode } from '@glimmer/interfaces';
 import { expect } from '@glimmer/util';
 
@@ -19,7 +19,7 @@ import { expect } from '@glimmer/util';
   @param app {ApplicationInstance} An `ApplicationInstance`.
   @since 3.14.0
 */
-export default function captureRenderTree(app: InternalOwner): CapturedRenderNode[] {
+export default function captureRenderTree(app: Owner): CapturedRenderNode[] {
   // SAFETY: Ideally we'd assert here but that causes awkward circular requires since this is also in @ember/debug.
   // This is only for debug stuff so not very risky.
   let renderer = expect(app.lookup('renderer:-dom') as Renderer, `BUG: owner is missing renderer`);
diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 05a1458c127..533308d3534 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -49,7 +49,10 @@ export interface EngineInstanceOptions {
 // Note on types: since `EngineInstance` uses `RegistryProxyMixin` and
 // `ContainerProxyMixin`, which respectively implement the same `RegistryMixin`
 // and `ContainerMixin` types used to define `InternalOwner`, this is the same
-// type as `InternalOwner` from TS's POV.
+// type as `InternalOwner` from TS's POV. The point of the explicit `extends`
+// clauses for `InternalOwner` and `Owner` is to keep us honest: if this stops
+// type checking, we have broken part of our public API contract. Medium-term,
+// the goal here is to `EngineInstance` simple be `Owner`.
 interface EngineInstance extends RegistryProxyMixin, ContainerProxyMixin, InternalOwner, Owner {}
 class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerProxyMixin) {
   /**
diff --git a/packages/@ember/engine/type-tests/instance.test.ts b/packages/@ember/engine/type-tests/instance.test.ts
index 8addb071500..7a8356ba7fb 100644
--- a/packages/@ember/engine/type-tests/instance.test.ts
+++ b/packages/@ember/engine/type-tests/instance.test.ts
@@ -1,13 +1,14 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type { default as Owner, InternalOwner } from '@ember/-internals/owner';
 import EngineInstance from '@ember/engine/instance';
 import type EmberObject from '@ember/object';
 import { expectTypeOf } from 'expect-type';
 
 expectTypeOf<EngineInstance>().toMatchTypeOf<EmberObject>();
 expectTypeOf<EngineInstance>().toMatchTypeOf<InternalOwner>();
+expectTypeOf<EngineInstance>().toMatchTypeOf<Owner>();
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 let instance = new EngineInstance(owner);
 
 expectTypeOf(instance.boot()).resolves.toEqualTypeOf<EngineInstance>();
diff --git a/packages/@ember/object/type-tests/core/index.test.ts b/packages/@ember/object/type-tests/core/index.test.ts
index 79654847ceb..36a4e388ca7 100644
--- a/packages/@ember/object/type-tests/core/index.test.ts
+++ b/packages/@ember/object/type-tests/core/index.test.ts
@@ -1,9 +1,9 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import CoreObject from '@ember/object/core';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 expectTypeOf(CoreObject.create()).toEqualTypeOf<CoreObject>();
 
diff --git a/packages/@ember/object/type-tests/ember-object.test.ts b/packages/@ember/object/type-tests/ember-object.test.ts
index adbcfd555c1..db9845eaa04 100644
--- a/packages/@ember/object/type-tests/ember-object.test.ts
+++ b/packages/@ember/object/type-tests/ember-object.test.ts
@@ -1,10 +1,10 @@
 import { expectTypeOf } from 'expect-type';
 
 import EmberObject from '@ember/object';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 expectTypeOf(EmberObject.create()).toEqualTypeOf<EmberObject>();
 
@@ -106,7 +106,7 @@ Person.reopenClass({ fullName: 6 });
 class MyComponent extends EmberObject {
   foo = 'bar';
 
-  constructor(owner: InternalOwner) {
+  constructor(owner: Owner) {
     super(owner);
 
     this.addObserver('foo', this, 'fooDidChange');
diff --git a/packages/@ember/object/type-tests/events/index.test.ts b/packages/@ember/object/type-tests/events/index.test.ts
index 3b524dacd4d..ba1b3e8ffd2 100644
--- a/packages/@ember/object/type-tests/events/index.test.ts
+++ b/packages/@ember/object/type-tests/events/index.test.ts
@@ -2,7 +2,7 @@ import { addListener, removeListener, sendEvent } from '@ember/object/events';
 
 import EmberObject from '@ember/object';
 import { on } from '@ember/object/evented';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 
 class Job extends EmberObject {
   logStartOrUpdate = on('started', 'updated', () => {
@@ -23,7 +23,7 @@ sendEvent(job, 'updated'); // Logs 'Job updated!'
 sendEvent(job, 'completed'); // Logs 'Job completed!'
 
 class MyClass extends EmberObject {
-  constructor(owner: InternalOwner) {
+  constructor(owner: Owner) {
     super(owner);
     addListener(this, 'willDestroy', this, 'willDestroyListener');
     addListener(this, 'willDestroy', this, 'willDestroyListener', true);
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index f3fbb7dad4f..c5e6234ecf1 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -5,7 +5,7 @@ import {
   descriptorForProperty,
   flushAsyncObservers,
 } from '@ember/-internals/metal';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { BucketCache } from '@ember/routing/-internals';
 import EmberObject, { computed, get, set, getProperties, setProperties } from '@ember/object';
@@ -273,7 +273,7 @@ class Route<T = unknown>
   declare _topLevelViewTemplate: any;
   declare _environment: any;
 
-  constructor(owner: InternalOwner) {
+  constructor(owner: Owner) {
     super(owner);
 
     if (owner) {
@@ -2195,7 +2195,7 @@ function buildRenderOptions(
 }
 
 export interface RenderOptions {
-  owner: InternalOwner;
+  owner: Owner;
   into?: string;
   outlet: string;
   name: string;
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 45f43282152..0f0fb39b876 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -1717,6 +1717,7 @@ function findRouteStateName(route: Route, state: string) {
   return routeHasBeenDefined(owner, router, stateName, stateNameFull) ? stateNameFull : '';
 }
 
+// TODO: rewrite `InternalOwner` to `Owner` by switching to `factoryFor`.
 /**
   Determines whether or not a route has been defined by checking that the route
   is in the Router's map and the owner has a registration for that route.
@@ -1736,8 +1737,7 @@ function routeHasBeenDefined(
 ) {
   let routerHasRoute = router.hasRoute(fullName);
   let ownerHasRoute =
-    owner.hasRegistration(`template:${localName}` as const) ||
-    owner.hasRegistration(`route:${localName}` as const);
+    owner.hasRegistration(`template:${localName}`) || owner.hasRegistration(`route:${localName}`);
   return routerHasRoute && ownerHasRoute;
 }
 
diff --git a/packages/@ember/routing/type-tests/auto-location.test.ts b/packages/@ember/routing/type-tests/auto-location.test.ts
index c493b0b923a..808fa6eeba5 100644
--- a/packages/@ember/routing/type-tests/auto-location.test.ts
+++ b/packages/@ember/routing/type-tests/auto-location.test.ts
@@ -1,11 +1,11 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type EmberObject from '@ember/object';
 import AutoLocation from '@ember/routing/auto-location';
 import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/hash-location.test.ts b/packages/@ember/routing/type-tests/hash-location.test.ts
index a7cf73649b0..03ded832375 100644
--- a/packages/@ember/routing/type-tests/hash-location.test.ts
+++ b/packages/@ember/routing/type-tests/hash-location.test.ts
@@ -2,10 +2,10 @@ import type { ILocation } from '@ember/routing/location';
 import type EmberObject from '@ember/object';
 import HashLocation from '@ember/routing/hash-location';
 import { expectTypeOf } from 'expect-type';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/history-location.test.ts b/packages/@ember/routing/type-tests/history-location.test.ts
index 74f99cdc303..dd6d1ef2c42 100644
--- a/packages/@ember/routing/type-tests/history-location.test.ts
+++ b/packages/@ember/routing/type-tests/history-location.test.ts
@@ -1,11 +1,11 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type EmberObject from '@ember/object';
 import HistoryLocation from '@ember/routing/history-location';
 import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/none-location.test.ts b/packages/@ember/routing/type-tests/none-location.test.ts
index 2388974ce80..5ef9fe920c0 100644
--- a/packages/@ember/routing/type-tests/none-location.test.ts
+++ b/packages/@ember/routing/type-tests/none-location.test.ts
@@ -2,10 +2,10 @@ import type EmberObject from '@ember/object';
 import NoneLocation from '@ember/routing/none-location';
 import type { ILocation } from '@ember/routing/location';
 import { expectTypeOf } from 'expect-type';
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 // This doesn't have any public API
 
diff --git a/packages/@ember/routing/type-tests/route/index.test.ts b/packages/@ember/routing/type-tests/route/index.test.ts
index 8e441847e95..f476daa2c25 100644
--- a/packages/@ember/routing/type-tests/route/index.test.ts
+++ b/packages/@ember/routing/type-tests/route/index.test.ts
@@ -1,4 +1,4 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type Controller from '@ember/controller';
 import type EmberObject from '@ember/object';
 import Route from '@ember/routing/route';
@@ -6,7 +6,7 @@ import { expectTypeOf } from 'expect-type';
 import type { Transition } from 'router_js';
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 let route = new Route(owner);
 
 expectTypeOf(route).toMatchTypeOf<EmberObject>();
diff --git a/packages/@ember/routing/type-tests/route/overrides.test.ts b/packages/@ember/routing/type-tests/route/overrides.test.ts
index dd9096aaa6f..f2a152ca3a8 100644
--- a/packages/@ember/routing/type-tests/route/overrides.test.ts
+++ b/packages/@ember/routing/type-tests/route/overrides.test.ts
@@ -1,11 +1,11 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type Controller from '@ember/controller';
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 import type { Transition } from 'router_js';
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 class Foo {}
 
 class MyRoute extends Route<Foo> {
diff --git a/packages/@ember/routing/type-tests/route/query-params.test.ts b/packages/@ember/routing/type-tests/route/query-params.test.ts
index 9683a6e2b40..a5ca9763eea 100644
--- a/packages/@ember/routing/type-tests/route/query-params.test.ts
+++ b/packages/@ember/routing/type-tests/route/query-params.test.ts
@@ -1,8 +1,8 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import Route from '@ember/routing/route';
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 class MyRoute extends Route {
   queryParams = {
diff --git a/packages/@ember/routing/type-tests/route/send.test.ts b/packages/@ember/routing/type-tests/route/send.test.ts
index 4af75023eb7..cf6d74ee3bf 100644
--- a/packages/@ember/routing/type-tests/route/send.test.ts
+++ b/packages/@ember/routing/type-tests/route/send.test.ts
@@ -1,4 +1,4 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import { action } from '@ember/object';
 import Route from '@ember/routing/route';
 
@@ -12,7 +12,7 @@ class MyRoute extends Route {
 }
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 let route = new MyRoute(owner);
 
 route.send('topLevel', 1);
diff --git a/packages/@ember/routing/type-tests/router-service.test.ts b/packages/@ember/routing/type-tests/router-service.test.ts
index 35b096a41aa..2208d46992c 100644
--- a/packages/@ember/routing/type-tests/router-service.test.ts
+++ b/packages/@ember/routing/type-tests/router-service.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-self-assign */
 
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type { ILocation as EmberLocation } from '@ember/routing/location';
 import type Route from '@ember/routing/route';
 import type { RouteInfo, RouteInfoWithAttributes } from '@ember/routing/router-service';
@@ -10,7 +10,7 @@ import { expectTypeOf } from 'expect-type';
 import type { Transition } from 'router_js';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 class Post {}
 class Comment {}
diff --git a/packages/@ember/routing/type-tests/router/index.test.ts b/packages/@ember/routing/type-tests/router/index.test.ts
index 56bda0e0cc8..3d2dcd9cae8 100644
--- a/packages/@ember/routing/type-tests/router/index.test.ts
+++ b/packages/@ember/routing/type-tests/router/index.test.ts
@@ -1,4 +1,4 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type EmberObject from '@ember/object';
 import type Evented from '@ember/object/evented';
 import type { ILocation } from '@ember/routing/location';
@@ -10,7 +10,7 @@ expectTypeOf<Router>().toMatchTypeOf<EmberObject>();
 expectTypeOf<Router>().toMatchTypeOf<Evented>();
 
 // NOTE: This is invalid, but acceptable for type tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 let router = new Router(owner);
 
 expectTypeOf(router.rootURL).toEqualTypeOf<string>();
diff --git a/packages/@ember/service/type-tests/index.test.ts b/packages/@ember/service/type-tests/index.test.ts
index b5aefd67a63..0109e51177e 100644
--- a/packages/@ember/service/type-tests/index.test.ts
+++ b/packages/@ember/service/type-tests/index.test.ts
@@ -1,11 +1,11 @@
-import type { InternalOwner } from '@ember/-internals/owner';
+import type Owner from '@ember/owner';
 import type { FrameworkObject } from '@ember/object/-internals';
 import EmberObject from '@ember/object';
 import Service, { inject, service } from '@ember/service';
 import { expectTypeOf } from 'expect-type';
 
 // Good enough for tests
-let owner = {} as InternalOwner;
+let owner = {} as Owner;
 
 class MainService extends Service {}
 class FooService extends Service {}

From f4728d534c1835b585a9130fc47ec01dab8ef0b0 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 11:50:08 -0800
Subject: [PATCH 1319/1405] Move @ember/-internals/utils/types to
 @ember/-internals/utility-types

---
 packages/@ember/-internals/glimmer/lib/helpers/action.ts        | 2 +-
 packages/@ember/-internals/metal/lib/events.ts                  | 2 +-
 packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts | 2 +-
 .../-internals/{utils/types.ts => utility-types/index.ts}       | 0
 packages/@ember/array/index.ts                                  | 2 +-
 packages/@ember/debug/index.ts                                  | 2 +-
 packages/@ember/object/index.ts                                 | 2 +-
 packages/@ember/object/promise-proxy-mixin.ts                   | 2 +-
 packages/@ember/routing/auto-location.ts                        | 2 +-
 packages/@ember/routing/route.ts                                | 2 +-
 packages/@ember/routing/router.ts                               | 2 +-
 packages/@ember/runloop/index.ts                                | 2 +-
 packages/ember-testing/lib/ext/application.ts                   | 2 +-
 packages/ember-testing/lib/test/helpers.ts                      | 2 +-
 types/publish.mjs                                               | 2 +-
 15 files changed, 14 insertions(+), 14 deletions(-)
 rename packages/@ember/-internals/{utils/types.ts => utility-types/index.ts} (100%)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/action.ts b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
index 0cc23151449..d803e5c98f2 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/action.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/action.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 import { get } from '@ember/-internals/metal';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import { assert } from '@ember/debug';
 import { flaggedInstrument } from '@ember/instrumentation';
 import { join } from '@ember/runloop';
diff --git a/packages/@ember/-internals/metal/lib/events.ts b/packages/@ember/-internals/metal/lib/events.ts
index efb69e00b5b..ab77fb52c86 100644
--- a/packages/@ember/-internals/metal/lib/events.ts
+++ b/packages/@ember/-internals/metal/lib/events.ts
@@ -4,7 +4,7 @@
 import type { Meta } from '@ember/-internals/meta';
 import { meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { setListeners } from '@ember/-internals/utils';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import { assert } from '@ember/debug';
 
 /*
diff --git a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
index dff58930eee..4df5bf06ddd 100644
--- a/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
+++ b/packages/@ember/-internals/runtime/lib/mixins/registry_proxy.ts
@@ -4,7 +4,7 @@
 
 import type { Registry } from '@ember/-internals/container';
 import type { RegistryProxy } from '@ember/-internals/owner';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 
 import { assert } from '@ember/debug';
 import Mixin from '@ember/object/mixin';
diff --git a/packages/@ember/-internals/utils/types.ts b/packages/@ember/-internals/utility-types/index.ts
similarity index 100%
rename from packages/@ember/-internals/utils/types.ts
rename to packages/@ember/-internals/utility-types/index.ts
diff --git a/packages/@ember/array/index.ts b/packages/@ember/array/index.ts
index 82fc9af9b54..53495e9d11a 100644
--- a/packages/@ember/array/index.ts
+++ b/packages/@ember/array/index.ts
@@ -19,7 +19,7 @@ import MutableEnumerable from '@ember/enumerable/mutable';
 import { compare, typeOf } from '@ember/utils';
 import { ENV } from '@ember/-internals/environment';
 import Observable from '@ember/object/observable';
-import type { MethodNamesOf, MethodParams, MethodReturns } from '@ember/-internals/utils/types';
+import type { MethodNamesOf, MethodParams, MethodReturns } from '@ember/-internals/utility-types';
 import type { ComputedPropertyCallback } from '@ember/-internals/metal';
 import { isEmberArray, setEmberArray } from '@ember/array/-internals';
 
diff --git a/packages/@ember/debug/index.ts b/packages/@ember/debug/index.ts
index 68443a5863c..81e23ab2276 100644
--- a/packages/@ember/debug/index.ts
+++ b/packages/@ember/debug/index.ts
@@ -1,5 +1,5 @@
 import { isChrome, isFirefox } from '@ember/-internals/browser-environment';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import { DEBUG } from '@glimmer/env';
 import type { DeprecateFunc, DeprecationOptions } from './lib/deprecate';
 import _deprecate from './lib/deprecate';
diff --git a/packages/@ember/object/index.ts b/packages/@ember/object/index.ts
index 99978ce96e9..230471a71e0 100644
--- a/packages/@ember/object/index.ts
+++ b/packages/@ember/object/index.ts
@@ -8,7 +8,7 @@ import {
 } from '@ember/-internals/metal';
 import { getFactoryFor } from '@ember/-internals/container';
 import { setObservers } from '@ember/-internals/utils';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import CoreObject from '@ember/object/core';
 import Observable from '@ember/object/observable';
 
diff --git a/packages/@ember/object/promise-proxy-mixin.ts b/packages/@ember/object/promise-proxy-mixin.ts
index 5dfb01434bd..eafe2a9522d 100644
--- a/packages/@ember/object/promise-proxy-mixin.ts
+++ b/packages/@ember/object/promise-proxy-mixin.ts
@@ -1,6 +1,6 @@
 import { get, setProperties, computed } from '@ember/object';
 import Mixin from '@ember/object/mixin';
-import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
+import type { AnyFn, MethodNamesOf } from '@ember/-internals/utility-types';
 import type RSVP from 'rsvp';
 import type CoreObject from '@ember/object/core';
 
diff --git a/packages/@ember/routing/auto-location.ts b/packages/@ember/routing/auto-location.ts
index fa0aaaf4323..0deb19bacf9 100644
--- a/packages/@ember/routing/auto-location.ts
+++ b/packages/@ember/routing/auto-location.ts
@@ -1,7 +1,7 @@
 import { history, location, userAgent, window } from '@ember/-internals/browser-environment';
 import { getOwner } from '@ember/-internals/owner';
 import EmberObject, { set } from '@ember/object';
-import type { AnyFn, MethodNamesOf } from '@ember/-internals/utils/types';
+import type { AnyFn, MethodNamesOf } from '@ember/-internals/utility-types';
 import { assert } from '@ember/debug';
 import type { ILocation as EmberLocation, UpdateCallback } from '@ember/routing/location';
 import {
diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index f3fbb7dad4f..d006c04a629 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -14,7 +14,7 @@ import { A as emberA } from '@ember/array';
 import { ActionHandler } from '@ember/-internals/runtime';
 import { isEmpty, typeOf } from '@ember/utils';
 import { isProxy, lookupDescriptor } from '@ember/-internals/utils';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import Controller from '@ember/controller';
 import type { ControllerQueryParamType } from '@ember/controller';
 import { assert, info, isTesting } from '@ember/debug';
diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 45f43282152..1ff7b86f12b 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -46,7 +46,7 @@ import Router, { logAbort, STATE_SYMBOL } from 'router_js';
 import type { Timer } from 'backburner';
 import EngineInstance from '@ember/engine/instance';
 import type { QueryParams } from 'route-recognizer';
-import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utils/types';
+import type { AnyFn, MethodNamesOf, OmitFirst } from '@ember/-internals/utility-types';
 import type { Template } from '@glimmer/interfaces';
 import type ApplicationInstance from '@ember/application/instance';
 
diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts
index 40426afd53e..8e572a52ca0 100644
--- a/packages/@ember/runloop/index.ts
+++ b/packages/@ember/runloop/index.ts
@@ -3,7 +3,7 @@ import { onErrorTarget } from '@ember/-internals/error-handling';
 import { flushAsyncObservers } from '@ember/-internals/metal';
 import type { DeferredActionQueues } from 'backburner';
 import Backburner, { Timer } from 'backburner';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 
 export { Timer };
 
diff --git a/packages/ember-testing/lib/ext/application.ts b/packages/ember-testing/lib/ext/application.ts
index 11e497ea548..b99f66e8c0e 100644
--- a/packages/ember-testing/lib/ext/application.ts
+++ b/packages/ember-testing/lib/ext/application.ts
@@ -6,7 +6,7 @@ import run from '../test/run';
 import { invokeInjectHelpersCallbacks } from '../test/on_inject_helpers';
 import { asyncStart, asyncEnd } from '../test/adapter';
 import type Application from '@ember/application';
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import { assert } from '@ember/debug';
 
 export interface TestableApp extends Application {
diff --git a/packages/ember-testing/lib/test/helpers.ts b/packages/ember-testing/lib/test/helpers.ts
index 4d278fd0a0e..884e7352609 100644
--- a/packages/ember-testing/lib/test/helpers.ts
+++ b/packages/ember-testing/lib/test/helpers.ts
@@ -1,4 +1,4 @@
-import type { AnyFn } from '@ember/-internals/utils/types';
+import type { AnyFn } from '@ember/-internals/utility-types';
 import TestPromise from './promise';
 
 export const helpers: Record<
diff --git a/types/publish.mjs b/types/publish.mjs
index e26ebdc6b15..baca63c22e1 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -173,7 +173,7 @@ const PREVIEW_MODULES = [
   '@ember/-internals/utils/lib/super.d.ts',
   '@ember/-internals/utils/lib/symbol.d.ts',
   '@ember/-internals/utils/lib/to-string.d.ts',
-  '@ember/-internals/utils/types.d.ts',
+  '@ember/-internals/utility-types.d.ts',
   '@ember/-internals/views/index.d.ts',
   '@ember/-internals/views/lib/compat/attrs.d.ts',
   '@ember/-internals/views/lib/compat/fallback-view-registry.d.ts',

From 8c008fdb98f9c89b4d34d756c6dbefe0e7987101 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 6 Dec 2022 12:11:55 -0800
Subject: [PATCH 1320/1405] Fix debug imports

---
 packages/@ember/-internals/glimmer/lib/environment.ts      | 2 +-
 packages/@ember/-internals/metal/lib/deprecate_property.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index 5f5af23785c..d1831d16ec6 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -5,7 +5,7 @@ import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
 import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import { assert, deprecate, warn } from '@ember/debug';
-import type { DeprecationOptions } from '@ember/debug/lib/deprecate';
+import type { DeprecationOptions } from '@ember/debug';
 import { schedule, _backburner } from '@ember/runloop';
 import { DEBUG } from '@glimmer/env';
 import setGlobalContext from '@glimmer/global-context';
diff --git a/packages/@ember/-internals/metal/lib/deprecate_property.ts b/packages/@ember/-internals/metal/lib/deprecate_property.ts
index 8c2c49dbd59..04f8313dd7d 100644
--- a/packages/@ember/-internals/metal/lib/deprecate_property.ts
+++ b/packages/@ember/-internals/metal/lib/deprecate_property.ts
@@ -3,7 +3,7 @@
 */
 
 import { deprecate } from '@ember/debug';
-import type { DeprecationOptions } from '@ember/debug/lib/deprecate';
+import type { DeprecationOptions } from '@ember/debug';
 import { get } from './property_get';
 import { set } from './property_set';
 

From 8a30266b02bf66a5635fc5ea97a7d2589f07c486 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 6 Dec 2022 13:16:27 -0700
Subject: [PATCH 1321/1405] Remove runtime dependence on `InternalOwner`

As a follow-on to #20310, this removes all remaining direct uses of the
`InternalOwner` type; the only place we use it now is in the defintion
of `EngineInstance`. This frees us to start chipping away further at
this type: we can deprecate *nearly all of it*, and we know that our
internal code does not depend on any of it except where it explicitly
uses `EngineInstance`.

Part of #20303.
---
 packages/@ember/routing/router.ts                  | 14 ++++----------
 .../internal-test-helpers/lib/registry-check.ts    | 10 +++-------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/@ember/routing/router.ts b/packages/@ember/routing/router.ts
index 0f0fb39b876..67994d94388 100644
--- a/packages/@ember/routing/router.ts
+++ b/packages/@ember/routing/router.ts
@@ -6,7 +6,7 @@ import type {
 } from '@ember/-internals/glimmer';
 import { computed, get, set } from '@ember/object';
 import type { default as Owner, FactoryManager } from '@ember/owner';
-import { getOwner, type InternalOwner } from '@ember/-internals/owner';
+import { getOwner } from '@ember/owner';
 import { BucketCache, DSL, RouterState } from '@ember/routing/-internals';
 import type { DSLCallback, EngineRouteInfo } from '@ember/routing/-internals';
 import {
@@ -1717,27 +1717,21 @@ function findRouteStateName(route: Route, state: string) {
   return routeHasBeenDefined(owner, router, stateName, stateNameFull) ? stateNameFull : '';
 }
 
-// TODO: rewrite `InternalOwner` to `Owner` by switching to `factoryFor`.
 /**
   Determines whether or not a route has been defined by checking that the route
   is in the Router's map and the owner has a registration for that route.
 
   @private
-  @param {InternalOwner} owner
+  @param {Owner} owner
   @param {Router} router
   @param {String} localName
   @param {String} fullName
   @return {Boolean}
 */
-function routeHasBeenDefined(
-  owner: InternalOwner,
-  router: any,
-  localName: string,
-  fullName: string
-) {
+function routeHasBeenDefined(owner: Owner, router: any, localName: string, fullName: string) {
   let routerHasRoute = router.hasRoute(fullName);
   let ownerHasRoute =
-    owner.hasRegistration(`template:${localName}`) || owner.hasRegistration(`route:${localName}`);
+    owner.factoryFor(`template:${localName}`) || owner.factoryFor(`route:${localName}`);
   return routerHasRoute && ownerHasRoute;
 }
 
diff --git a/packages/internal-test-helpers/lib/registry-check.ts b/packages/internal-test-helpers/lib/registry-check.ts
index b023c30c91b..d8c5a062cc0 100644
--- a/packages/internal-test-helpers/lib/registry-check.ts
+++ b/packages/internal-test-helpers/lib/registry-check.ts
@@ -1,9 +1,5 @@
-import type { FullName, InternalOwner } from '@ember/-internals/owner';
+import type { FullName, default as Owner } from '@ember/-internals/owner';
 
-export function verifyRegistration(
-  assert: QUnit['assert'],
-  owner: InternalOwner,
-  fullName: FullName
-) {
-  assert.ok(owner.resolveRegistration(fullName), `has registration: ${fullName}`);
+export function verifyRegistration(assert: QUnit['assert'], owner: Owner, fullName: FullName) {
+  assert.ok(owner.factoryFor(fullName), `has registration: ${fullName}`);
 }

From 5a299d471512804d3f14c36fbc8b54894f1d274f Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 6 Dec 2022 14:35:25 -0700
Subject: [PATCH 1322/1405] Use `Engine` API in `verifyRegistration`

This is a dumb set of tests, which are verifying internal mechanics of
*how* we make this work, rather than verify *that* it works for each of
these issues. However, for the moment the key is to unblock decoupling
work, so I'm creating [a separate issue][1] to make sure we cover this
in other ways and then delete the tests which cause this coupling.

[1]: https://github.com/emberjs/ember.js/issues/20315
---
 packages/internal-test-helpers/lib/registry-check.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/internal-test-helpers/lib/registry-check.ts b/packages/internal-test-helpers/lib/registry-check.ts
index d8c5a062cc0..45fcb41647f 100644
--- a/packages/internal-test-helpers/lib/registry-check.ts
+++ b/packages/internal-test-helpers/lib/registry-check.ts
@@ -1,5 +1,6 @@
-import type { FullName, default as Owner } from '@ember/-internals/owner';
+import type { FullName } from '@ember/-internals/owner';
+import type Engine from '@ember/engine';
 
-export function verifyRegistration(assert: QUnit['assert'], owner: Owner, fullName: FullName) {
-  assert.ok(owner.factoryFor(fullName), `has registration: ${fullName}`);
+export function verifyRegistration(assert: QUnit['assert'], owner: Engine, fullName: FullName) {
+  assert.ok(owner.resolveRegistration(fullName), `has registration: ${fullName}`);
 }

From 15f7f48397ec9561792a48998c39a0b6397b1a16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 21:55:09 +0000
Subject: [PATCH 1323/1405] Bump prettier from 2.7.1 to 2.8.0

Bumps [prettier](https://github.com/prettier/prettier) from 2.7.1 to 2.8.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.7.1...2.8.0)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 53b17f42f18..78f1bf4ca2b 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "mkdirp": "^1.0.4",
     "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.0",
     "puppeteer": "^13.5.1",
     "qunit": "^2.19.1",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 30131996060..15787da4d54 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8853,10 +8853,10 @@ prettier-linter-helpers@^1.0.0:
   dependencies:
     fast-diff "^1.1.2"
 
-prettier@^2.5.1, prettier@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
-  integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
+prettier@^2.5.1, prettier@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
+  integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==
 
 pretty-ms@^3.1.0:
   version "3.1.0"

From d324fc9be0823613795f81bb703190204ef3fda2 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 6 Dec 2022 15:52:23 -0700
Subject: [PATCH 1324/1405] Fix Prettier 2.8 issues

---
 tests/node/app-boot-test.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/node/app-boot-test.js b/tests/node/app-boot-test.js
index e341f787169..0f9aee5519a 100644
--- a/tests/node/app-boot-test.js
+++ b/tests/node/app-boot-test.js
@@ -26,9 +26,12 @@ QUnit.module('App Boot', function (hooks) {
       hasExistence: true,
     });
 
-    this.template('components/foo-bar', '\
+    this.template(
+      'components/foo-bar',
+      '\
       <p>The files are *inside* the computer?!</p>\
-    ');
+    '
+    );
 
     return this.renderToHTML('/').then(function (html) {
       assert.htmlMatches(

From 9adcd15b2ac411e088856cca8be268e3a2f009e4 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 8 Dec 2022 11:38:47 -0700
Subject: [PATCH 1325/1405] Reimplement publish-types script with recast

This is far more robust against all the kinds of things our modules do:

- It supports having `declare module` and similar in the input source.
- It does not do dumb string replacement to remove `declare`, which can
  easily remove things from comments or the like.
- It correctly handles relative imports (`./` and chains of `../`).

For this to work correctly, we needed to have more recent versions of
the Babel parser, so this freshens the lock file for all `@babel/*` dependencies. It also adds `recast` and drops `magic-string`.

This has been tested by enabling more than 50% of the unpublished
modules; the resulting output is correct from the point of view of this
script but exposes a number of fixes we will need to make for our types
as we enable more and more of those.
---
 package.json                              |    3 +-
 packages/@ember/-internals/owner/index.ts |    4 +-
 types/publish.mjs                         |  248 ++-
 yarn.lock                                 | 1690 ++++++++-------------
 4 files changed, 821 insertions(+), 1124 deletions(-)

diff --git a/package.json b/package.json
index 1204700e0e5..3dc898c14db 100644
--- a/package.json
+++ b/package.json
@@ -105,6 +105,7 @@
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
     "@typescript-eslint/parser": "^5.38.1",
+    "ast-types": "^0.14.2",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1245.0",
     "babel-template": "^6.26.0",
@@ -144,13 +145,13 @@
     "glob": "^8.0.3",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
-    "magic-string": "^0.26.7",
     "mkdirp": "^1.0.4",
     "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "puppeteer": "^13.5.1",
     "qunit": "^2.19.1",
+    "recast": "^0.21.5",
     "rollup-plugin-commonjs": "^9.3.4",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
diff --git a/packages/@ember/-internals/owner/index.ts b/packages/@ember/-internals/owner/index.ts
index 2e6fb2cb633..5afaa31edb1 100644
--- a/packages/@ember/-internals/owner/index.ts
+++ b/packages/@ember/-internals/owner/index.ts
@@ -82,8 +82,8 @@ export interface DIRegistry extends Record<string, Record<string, unknown>> {}
 type ResolveFactoryManager<
   Type extends string,
   Name extends string
-> = DIRegistry[Type][Name] extends object
-  ? FactoryManager<DIRegistry[Type][Name]>
+> = DIRegistry[Type][Name] extends infer RegistryEntry extends object
+  ? FactoryManager<RegistryEntry>
   : FactoryManager<object> | undefined;
 
 /**
diff --git a/types/publish.mjs b/types/publish.mjs
index baca63c22e1..c72edb25641 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -5,23 +5,27 @@
   This script is used to publish Ember's type definitions. The basic workflow
   is:
 
-  1. Run `tsc` against the Ember packages which make up its public API, with
-     the output being `/types/stable`.
+  1. Run `tsc` against the Ember packages which make up its public API, with the
+     output being `/types/stable`.
 
-  2. Wrap each emitted module in a `declare module` statement. While doing so,
-     keep track of the full list of emitted modules.
+  2. Wrap each emitted module in a `declare module` statement. This requires
+     replacing all relative imports with absolute imports and removing all
+     `declare` statements from the body of the module.
 
-  3. Check that each module emitted is included in `types/stable/index.d.ts`,
-     if and only if it also appears in a list of stable types modules defined
-     in this script, so that they all "show up" to end users. That list will
+     While doing so, keep track of the full list of emitted modules for the sake
+     of step (3).
+
+  3. Check that each module emitted is included in `types/stable/index.d.ts`, if
+     and only if it also appears in a list of stable types modules defined in
+     this script, so that they all "show up" to end users. That list will
      eventually be the list of *all* modules, but this allows us to publish
      iteratively as we gain confidence in the stability of the types.
 
   This is *not* an optimal long-term publishing strategy. We would prefer to
   generate per-package roll-ups, using a Rollup plugin or some such, but we are
-  currently blocked on a number of internal circular dependencies as well as
-  the difficulty of avoiding multiple definitions of the same types reused
-  across many rollups.
+  currently blocked on a number of internal circular dependencies as well as the
+  difficulty of avoiding multiple definitions of the same types reused across
+  many rollups.
 
   @packageDocumentation
  */
@@ -30,7 +34,15 @@ import glob from 'glob';
 import { spawnSync } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
-import MagicString from 'magic-string';
+import * as parser from 'recast/parsers/babel-ts.js';
+import {
+  isClassDeclaration,
+  isStringLiteral,
+  isVariableDeclaration,
+  isTSDeclareFunction,
+} from '@babel/types';
+import { builders as b, visit } from 'ast-types';
+import { parse, print } from 'recast';
 
 /**
   Modules we know we are not ready to expose yet, mostly because they do not
@@ -404,7 +416,7 @@ async function main() {
 
   let status = 'success';
   for (let moduleName of moduleNames) {
-    let result = wrapInDeclareModule(moduleName);
+    let result = processModule(moduleName);
     if (result !== 'success') {
       status = result;
     }
@@ -416,8 +428,16 @@ async function main() {
       // We need to import "package root" types as such, *not* via the actual
       // module which provides them, or TS does not see them correctly via the
       // side effect imports, so transform them accordingly:
-      // `@ember/owner/index.d.ts` -> `@ember/owner`
-      let moduleOrPackagePath = moduleName.replace(/\/index.d.ts$/, '');
+      //
+      //     `@ember/owner/index.d.ts` -> `@ember/owner`
+      //
+      // We also need to replace `.d.ts` entirely:
+      //
+      //     `@ember/utils/lib/compare.d.ts` -> `@ember/utils/lib/compare`
+      //
+      // Otherwise, the modules won't be resolved correctly via the side-effect
+      // imports.
+      let moduleOrPackagePath = moduleName.replace(/\/index.d.ts$/, '').replace('.d.ts', '');
 
       // Then create a relative path *to* the path on disk so that the
       // side-effect import is e.g. `import './@ember/owner';`, which makes it
@@ -429,14 +449,19 @@ async function main() {
   let stableIndexDTsContents = BASE_INDEX_D_TS.replace(MODULES_PLACEHOLDER, sideEffectModules);
   fs.writeFileSync(path.join(TYPES_DIR, 'index.d.ts'), stableIndexDTsContents);
 
+  // Make the generated types easier to read!
+  spawnSync('prettier', ['--write', 'types/stable/**/*.ts']);
+
   process.exit(status === 'success' ? 0 : 1);
 }
 
 /**
- * @param {string} moduleName
- * @return {'success' | 'failure'}
+  Load the module, rewrite it, and write it back to disk.
+
+  @param {string} moduleName
+  @return {'success' | 'failure'}
  */
-function wrapInDeclareModule(moduleName) {
+function processModule(moduleName) {
   let modulePath = path.join(TYPES_DIR, moduleName);
 
   /** @type {string} */
@@ -450,19 +475,16 @@ function wrapInDeclareModule(moduleName) {
 
   let moduleNameForDeclaration = moduleName.replace('/index.d.ts', '');
 
-  // This is a horrible nightmare of a hack; in a later PR I'm going to just
-  // replace all of this by going ahead and using recast or such. As annoying as
-  // that will be, it will be *way* more reliable.
-  let string = new MagicString(contents);
-  string
-    .replace(/^export declare /gm, 'export ') // g for global, m for multiline
-    .replace(/^declare /gm, '') // g for global, m for multiline
-    .indent('  ')
-    .prepend(`declare module '${moduleNameForDeclaration}' {\n`)
-    .append('}\n');
+  let rewrittenModule;
+  try {
+    rewrittenModule = rewriteModule(contents, moduleNameForDeclaration);
+  } catch (e) {
+    console.error(`Error rewriting ${moduleName}`, e);
+    return 'failure';
+  }
 
   try {
-    fs.writeFileSync(modulePath, string.toString());
+    fs.writeFileSync(modulePath, rewrittenModule);
   } catch (e) {
     console.error(`Error writing ${modulePath}: ${e}`);
     return 'failure';
@@ -471,5 +493,175 @@ function wrapInDeclareModule(moduleName) {
   return 'success';
 }
 
+/**
+  Rewrite a given module declaration:
+
+  - Tranform the main body of the module into a new top-level `declare module`
+    statement.
+      - Remove all `declare` modifiers from items in the module itself.
+      - Update all `import` specifiers to be absolute in terms of the package
+        name (which means )
+  - Preserve existing `declare module` statements, so that anything using e.g.
+    declaration merging continues to work correctly.
+
+  @param {string} code The initial code to rewrite.
+  @param {string} moduleName The name of the module to use.
+  @returns {string}
+ */
+export function rewriteModule(code, moduleName) {
+  let ast = parse(code, { parser });
+
+  /** @type {Array<import("ast-types/gen/namedTypes").namedTypes.TSModuleDeclaration>} */
+  let otherModuleDeclarations = [];
+
+  visit(ast, {
+    // We need to preserve existing `declare module { ... }` blocks so that
+    // things which rely on declaration merging can work, but they need to be
+    // emitted *outside* the `declare module` we are introducing.
+    visitTSModuleDeclaration(path) {
+      otherModuleDeclarations.push(path.node);
+      path.prune(path.node);
+      this.traverse(path);
+    },
+
+    // Remove `declare` from `declare (let|const|var)` in the top-level module.
+    visitVariableDeclaration(path) {
+      if (isVariableDeclaration(path.node) && !hasParentModuleDeclarationBlock(path)) {
+        path.node.declare = false;
+      }
+      this.traverse(path);
+    },
+
+    // Remove `declare` from `declare class` in the top-level module.
+    visitClassDeclaration(path) {
+      if (isClassDeclaration(path.node) && !hasParentModuleDeclarationBlock(path)) {
+        path.node.declare = false;
+      }
+      this.traverse(path);
+    },
+
+    // Remove `declare` from `declare function` in the top-level module.
+    visitTSDeclareFunction(path) {
+      if (isTSDeclareFunction(path.node) && !hasParentModuleDeclarationBlock(path)) {
+        path.node.declare = false;
+      }
+      this.traverse(path);
+    },
+
+    // For any relative imports like `import { something } from './somewhere';`,
+    // rewrite as `import { something } from '@ember/some-package/somewhere';`
+    // since relative imports are not allowed in `declare module { }` blocks.
+    visitImportDeclaration(path) {
+      let source = path.node.source;
+      if (isStringLiteral(source)) {
+        source.value = normalizeSpecifier(moduleName, source.value);
+      }
+      this.traverse(path);
+    },
+
+    // Do the same for `export ... from './relative-path'`.
+    visitExportNamedDeclaration(path) {
+      let source = path.node.source;
+      if (isStringLiteral(source)) {
+        if (source.value.startsWith('./') || source.value.startsWith('../')) {
+          source.value = normalizeSpecifier(moduleName, source.value);
+        }
+      }
+      this.traverse(path);
+    },
+  });
+
+  let newAST = b.file(
+    b.program([
+      b.declareModule(
+        b.identifier(`'${moduleName.replace('.d.ts', '')}'`),
+        b.blockStatement(ast.program.body)
+      ),
+      ...otherModuleDeclarations,
+    ])
+  );
+
+  return print(newAST).code;
+}
+
+/**
+  Is this declaration in a `declare module { }` block?
+
+  @param {import('ast-types/lib/node-path').NodePath} path
+  @return boolean
+ */
+function hasParentModuleDeclarationBlock(path) {
+  /** @type {import('ast-types/lib/node-path').NodePath} */
+  let parentPath = path;
+  while ((parentPath = parentPath.parent)) {
+    if (parentPath.node.type === 'ModuleDeclaration') {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+const TERMINAL_MODULE_RE = /\/[\w-_]+\.d\.ts$/;
+const NEIGHBOR_PATH_RE = /^(\.)\//;
+
+/**
+  Given a relative path, `./` or `(../)+`, rewrite it as an absolute path.
+
+  @param {string} moduleName The name of the host module we are declaring.
+  @param {string} specifier The name of the module it is importing.
+  @return {string}
+ */
+function normalizeSpecifier(moduleName, specifier) {
+  if (specifier.startsWith('./')) {
+    let parentModuleName = moduleName.replace(TERMINAL_MODULE_RE, '');
+    let sansLeadingDot = specifier.replace(NEIGHBOR_PATH_RE, '');
+    let newImportName = `${parentModuleName}/${sansLeadingDot}`;
+    return newImportName;
+  } else if (specifier.startsWith('../')) {
+    // Reverse it so we can just `pop` from `parentPathChunks` as we go: walking
+    // backward through the specifier means as soon as we hit the `..` we can
+    // start using the chunks from the end of the hosting module.
+    let reversedSpecifierChunks = specifier.split('/').reverse();
+    let parentPathChunks = moduleName.split('/');
+
+    // To make that logic work, though, we need to drop the last item from the
+    // chunks comprising host module, because we need to *not* treat the current
+    // module itself as a parent. If we're not in a "root" module, we need to
+    // do it an extra time to get rid of the terminal `foo.d.ts` as well.
+    let terminal = parentPathChunks.pop();
+    if (terminal?.endsWith('.d.ts')) {
+      parentPathChunks.pop();
+    }
+
+    // Walk back from the end of the specifier, replacing `..` with chunks from
+    // the parent paths.
+    /** @type {string[]} */
+    let merged = [];
+    for (let chunk of reversedSpecifierChunks) {
+      if (chunk === '..') {
+        let parent = parentPathChunks.pop();
+        if (!parent) {
+          throw new Error(
+            `Could not generate a valid path for relative path specifier ${specifier} in ${moduleName}`
+          );
+        }
+        merged.push(parent);
+      } else {
+        merged.push(chunk);
+      }
+    }
+
+    // Reverse them again so we have the correct ordering.
+    merged.reverse();
+    // Then incorporate the rest of the parent path chunks.
+    merged.unshift(...parentPathChunks);
+
+    return merged.join('/');
+  } else {
+    return specifier;
+  }
+}
+
 // Run it!
 main();
diff --git a/yarn.lock b/yarn.lock
index f2a9b6fb9b0..70340da1978 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,85 +9,48 @@
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
-  integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
-
-"@babel/compat-data@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.0.tgz#9b61938c5f688212c7b9ae363a819df7d29d4093"
-  integrity sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
+  integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
 "@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.18.13", "@babel/core@^7.3.4":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f"
-  integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.6"
-    "@babel/helper-compilation-targets" "^7.19.3"
-    "@babel/helper-module-transforms" "^7.19.6"
-    "@babel/helpers" "^7.19.4"
-    "@babel/parser" "^7.19.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.6"
-    "@babel/types" "^7.19.4"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
-  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
-  dependencies:
-    "@babel/types" "^7.17.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.18.13":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
-  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
-  dependencies:
-    "@babel/types" "^7.18.13"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.19.6", "@babel/generator@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.0.tgz#0bfc5379e0efb05ca6092091261fcdf7ec36249d"
-  integrity sha512-GUPcXxWibClgmYJuIwC2Bc2Lg+8b9VjaJ+HlNdACEVt+Wlr1eoU1OPZjZRm7Hzl0gaTsUZNQfeihvZJhG7oc3w==
+"@babel/generator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
   dependencies:
-    "@babel/types" "^7.20.0"
+    "@babel/types" "^7.20.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -95,25 +58,15 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
-  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
-    semver "^6.3.0"
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.19.3":
+"@babel/helper-compilation-targets@^7.12.0", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
   integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
@@ -123,105 +76,52 @@
     browserslist "^4.21.3"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
-  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-
-"@babel/helper-create-class-features-plugin@^7.5.5":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.13.tgz#63e771187bd06d234f95fdf8bd5f8b6429de6298"
-  integrity sha512-hDvXp+QYxSRL+23mpAlSGxHMDyIGChm0/AwTfTAAK5Ufe40nCsyNdaYCGuK91phn/fVu9kqayImRDkvNAgdrsA==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.2", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.5.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz#327154eedfb12e977baa4ecc72e5806720a85a06"
+  integrity sha512-3RCdA/EmEaikrhayahwToF0fpweU/8o2p8vhc1c/1kftHOdTKuC65kik/TLc+qfbS8JKw4qqJbne4ovICDhmww==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-member-expression-to-functions" "^7.18.9"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-replace-supers" "^7.19.1"
     "@babel/helper-split-export-declaration" "^7.18.6"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz#0cb82b9bac358eb73bfbd73985a776bfa6b14d48"
-  integrity sha512-fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^4.7.1"
-
-"@babel/helper-define-polyfill-provider@^0.2.2":
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
-  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
+  integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
-    debug "^4.1.1"
-    lodash.debounce "^4.0.8"
-    resolve "^1.14.2"
-    semver "^6.1.2"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.2.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
-  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-function-name@^7.19.0":
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
   version "7.19.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
   integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
@@ -229,20 +129,6 @@
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.19.0"
 
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -250,13 +136,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
-  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-member-expression-to-functions@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
@@ -264,54 +143,26 @@
   dependencies:
     "@babel/types" "^7.18.9"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-imports@^7.18.6":
+"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
-  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-module-transforms@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f"
-  integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.19.4"
+    "@babel/helper-simple-access" "^7.20.2"
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/helper-validator-identifier" "^7.19.1"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.19.6"
-    "@babel/types" "^7.19.4"
-
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
-  dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
 
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
@@ -320,69 +171,45 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
   integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-replace-supers@^7.18.9":
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6"
-  integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.18.9"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-simple-access@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
-  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-simple-access@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7"
-  integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
-    "@babel/types" "^7.19.4"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
+  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.20.0"
 
 "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
@@ -391,68 +218,39 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
-
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-identifier@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/helper-validator-identifier@^7.19.1":
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
-  dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helpers@^7.19.4":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.0.tgz#27c8ffa8cc32a2ed3762fba48886e7654dbcf77f"
-  integrity sha512-aGMjYraN0zosCEthoGLdqot1oRsmxVTQRHadsUPz5QM44Zej2PYRz7XiDE7GqnkZnNtLbOuxqoZw42vkU7+XEQ==
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
+  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
   dependencies:
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.0"
-    "@babel/types" "^7.20.0"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
-"@babel/highlight@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.7.tgz#81a01d7d675046f0d96f82450d9d9578bdfd6b0b"
-  integrity sha512-aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw==
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -463,171 +261,166 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.4.5":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
-  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
-
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.13":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
-  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
-
-"@babel/parser@^7.19.6", "@babel/parser@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.0.tgz#b26133c888da4d79b0d3edcf42677bcadc783046"
-  integrity sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==
+"@babel/parser@^7.18.10", "@babel/parser@^7.20.5", "@babel/parser@^7.4.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
+  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.8.tgz#61c243a3875f7d0b0962b0543a33ece6ff2f1f17"
-  integrity sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==
+"@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
+  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+"@babel/plugin-proposal-class-properties@^7.16.5", "@babel/plugin-proposal-class-properties@^7.16.7", "@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
-  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
 "@babel/plugin-proposal-decorators@^7.13.5", "@babel/plugin-proposal-decorators@^7.16.7":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493"
-  integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.5.tgz#28ba1a0e5044664a512967a19407d7fc26925394"
+  integrity sha512-Lac7PpRJXcC3s9cKsBfl+uc+DYXU5FD06BrTFunQO6QIQT+DwyzDPURAowI3bcvD1dZF/ank1Z5rstUJn3Hn4Q==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.1"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/plugin-syntax-decorators" "^7.17.0"
-    charcodes "^0.2.0"
+    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/plugin-syntax-decorators" "^7.19.0"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
+  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
-  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
+  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.20.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11", "@babel/plugin-proposal-private-methods@^7.16.5":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+"@babel/plugin-proposal-private-methods@^7.16.5", "@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+"@babel/plugin-proposal-private-property-in-object@^7.16.5", "@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135"
+  integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -650,12 +443,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.16.7", "@babel/plugin-syntax-decorators@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.0.tgz#a2be3b2c9fe7d78bd4994e790896bc411e2f166d"
-  integrity sha512-qWe85yCXsvDEluNP0OyeQjH63DlhAR3W7K9BxxU1MvbDb48tgBG+Ao6IJJ6smPDrrVzSQZrbF6donpkFBMcs3A==
+"@babel/plugin-syntax-decorators@^7.16.7", "@babel/plugin-syntax-decorators@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz#5f13d1d8fce96951bea01a10424463c9a5b3a599"
+  integrity sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -671,6 +464,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -734,132 +534,126 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.7.tgz#39c9b55ee153151990fb038651d58d3fd03f98f8"
-  integrity sha512-YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A==
+"@babel/plugin-syntax-typescript@^7.2.0", "@babel/plugin-syntax-typescript@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.20.0.tgz#4e9a0cfc769c85689b77a2e642d24e9f697fc8c7"
+  integrity sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-syntax-typescript@^7.2.0":
+"@babel/plugin-transform-arrow-functions@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
-  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-
-"@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.16.7", "@babel/plugin-transform-block-scoping@^7.20.5":
+"@babel/plugin-transform-block-scoping@^7.20.2", "@babel/plugin-transform-block-scoping@^7.20.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz#401215f9dc13dc5262940e2e527c9536b3d7f237"
   integrity sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
+  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
-  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
+  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-for-of@^7.18.8":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7", "@babel/plugin-transform-modules-amd@^7.18.6":
+"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.18.6", "@babel/plugin-transform-modules-amd@^7.19.6":
   version "7.19.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
   integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
@@ -867,141 +661,141 @@
     "@babel/helper-module-transforms" "^7.19.6"
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
-  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
-  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-parameters@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz#f8f9186c681d10c3de7620c916156d893c8a019e"
+  integrity sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
-  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+"@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
+  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@^7.13.9":
-  version "7.15.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3"
-  integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw==
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
+  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
   dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-plugin-utils" "^7.14.5"
-    babel-plugin-polyfill-corejs2 "^0.2.2"
-    babel-plugin-polyfill-corejs3 "^0.2.2"
-    babel-plugin-polyfill-regenerator "^0.2.2"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-typescript@^7.13.0", "@babel/plugin-transform-typescript@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz#591ce9b6b83504903fa9dd3652c357c2ba7a1ee0"
-  integrity sha512-bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ==
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.2.tgz#91515527b376fc122ba83b13d70b01af8fe98f3f"
+  integrity sha512-jvS+ngBfrnTUBfOQq8NfGnSbF9BrqlR6hjJ2yVxMkmO5nL/cdifNbI30EfjRlN4g5wYWNnMPyj5Sa6R1pbLeag==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/plugin-syntax-typescript" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-typescript" "^7.20.0"
 
 "@babel/plugin-transform-typescript@~7.5.0":
   version "7.5.5"
@@ -1012,20 +806,20 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-typescript" "^7.2.0"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/polyfill@^7.11.5":
   version "7.12.1"
@@ -1036,36 +830,37 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/preset-env@^7.16.11", "@babel/preset-env@^7.16.5", "@babel/preset-env@^7.16.7":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
-  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
   dependencies:
-    "@babel/compat-data" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.16.7"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -1075,44 +870,44 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.16.7"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
-    "@babel/plugin-transform-new-target" "^7.16.7"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.16.7"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
+    "@babel/plugin-transform-computed-properties" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.8"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.20.1"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.19.0"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.8"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.20.2"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -1134,22 +929,13 @@
     regenerator-runtime "^0.13.4"
 
 "@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
-  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
+  integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    regenerator-runtime "^0.13.11"
 
-"@babel/template@^7.18.10", "@babel/template@^7.18.6":
+"@babel/template@^7.18.10":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -1158,75 +944,26 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.4.5":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
-  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.3"
-    "@babel/types" "^7.17.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.18.9":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
-  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.13"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.13"
-    "@babel/types" "^7.18.13"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.19.6", "@babel/traverse@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.0.tgz#538c4c6ce6255f5666eba02252a7b59fc2d5ed98"
-  integrity sha512-5+cAXQNARgjRUK0JWu2UBwja4JLSO/rBMPJzpsKb+oBF5xlUuCfljQepS4XypBQoiigL0VQjTZy6WiONtUdScQ==
+"@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.4.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.0"
+    "@babel/generator" "^7.20.5"
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.0"
-    "@babel/types" "^7.20.0"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
-  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.19.0", "@babel/types@^7.19.4", "@babel/types@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479"
-  integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
@@ -1582,15 +1319,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
-  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
-"@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.0", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.15"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz#aba35c48a38d3fd84b37e66c9c0423f9744f9774"
   integrity sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==
@@ -1606,16 +1335,11 @@
     "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.5":
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.stat@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
-  integrity "sha1-NNxfTKu8cg9OYPdadH5+zWwXW9M= sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
-
 "@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
@@ -2011,12 +1735,7 @@ acorn@^5.0.0, acorn@^5.5.3:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity "sha1-Po2KmUfQWZoXltECJddDL0pKz14= sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
 
-acorn@^8.5.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
-
-acorn@^8.8.0:
+acorn@^8.5.0, acorn@^8.8.0:
   version "8.8.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
   integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
@@ -2306,6 +2025,20 @@ ast-types@0.13.2:
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
   integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
 
+ast-types@0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.15.2.tgz#39ae4809393c4b16df751ee563411423e85fb49d"
+  integrity sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==
+  dependencies:
+    tslib "^2.0.1"
+
+ast-types@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.2.tgz#600b882df8583e3cd4f2df5fa20fa83759d4bdfd"
+  integrity sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==
+  dependencies:
+    tslib "^2.0.1"
+
 async-disk-cache@^1.2.1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/async-disk-cache/-/async-disk-cache-1.3.3.tgz#6040486660b370e4051cd9fa9fee275e1fae3728"
@@ -2327,14 +2060,7 @@ async-promise-queue@^1.0.3, async-promise-queue@^1.0.5:
     async "^2.4.1"
     debug "^2.6.8"
 
-async@^2.4.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
-  dependencies:
-    lodash "^4.17.14"
-
-async@^2.6.4:
+async@^2.4.1, async@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
   integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
@@ -2444,13 +2170,6 @@ babel-plugin-debug-macros@^0.3.4:
   dependencies:
     semver "^5.3.0"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
 babel-plugin-ember-data-packages-polyfill@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-ember-data-packages-polyfill/-/babel-plugin-ember-data-packages-polyfill-0.1.2.tgz#21154c095ddc703722b1fb8bb06c126c0b6d77dc"
@@ -2506,53 +2225,29 @@ babel-plugin-module-resolver@^4.1.0:
     reselect "^4.0.0"
     resolve "^1.13.1"
 
-babel-plugin-polyfill-corejs2@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
-  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
-  dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
-    semver "^6.1.1"
-
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
-  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.2.2:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz#2779846a16a1652244ae268b1e906ada107faf92"
-  integrity sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
-    core-js-compat "^3.16.2"
-
-babel-plugin-polyfill-corejs3@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz#d66183bf10976ea677f4149a7fcc4d8df43d4060"
-  integrity sha512-TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A==
-  dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-    core-js-compat "^3.20.0"
-
-babel-plugin-polyfill-regenerator@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
-  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
-  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-plugin-syntax-dynamic-import@^6.18.0:
   version "6.18.0"
@@ -3247,18 +2942,7 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity "sha1-uqVZ7hTO1zRSIputcyZGfGH6vWA= sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="
 
-browserslist@^4.17.5, browserslist@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
-  dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
-    escalade "^3.1.1"
-    node-releases "^2.0.1"
-    picocolors "^1.0.0"
-
-browserslist@^4.21.3:
+browserslist@^4.21.3, browserslist@^4.21.4:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
   integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
@@ -3420,11 +3104,6 @@ can-symlink@^1.0.0:
   dependencies:
     tmp "0.0.28"
 
-caniuse-lite@^1.0.30001286:
-  version "1.0.30001299"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz#d753bf6444ed401eb503cbbe17aa3e1451b5a68c"
-  integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
-
 caniuse-lite@^1.0.30001400:
   version "1.0.30001426"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz#58da20446ccd0cb1dfebd11d2350c907ee7c2eaa"
@@ -3526,11 +3205,6 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-charcodes@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/charcodes/-/charcodes-0.2.0.tgz#5208d327e6cc05f99eb80ffc814707572d1f14e4"
-  integrity sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -3868,13 +3542,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="
 
-core-js-compat@^3.16.2, core-js-compat@^3.20.0, core-js-compat@^3.20.2:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885"
-  integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==
+core-js-compat@^3.25.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
+  integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==
   dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-js@^2.4.0, core-js@^2.6.5:
   version "2.6.5"
@@ -4079,14 +3752,7 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-properties@^1.1.4:
+define-properties@^1.1.3, define-properties@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
   integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
@@ -4224,11 +3890,6 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 
-electron-to-chromium@^1.4.17:
-  version "1.4.44"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.44.tgz#8a41923afdd6ef5ddabe001626036ba5d1d64ae6"
-  integrity sha512-tHGWiUUmY7GABK8+DNcr474cnZDTzD8x1736SlDosVH8+/vRJeqfaIBAEHFtMjddz/0T4rKKYsxEc8BwQRdBpw==
-
 electron-to-chromium@^1.4.251:
   version "1.4.284"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
@@ -4682,33 +4343,7 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.18.2, es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
-  dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
-    is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
-
-es-abstract@^1.19.5, es-abstract@^1.20.0:
+es-abstract@^1.18.2, es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5, es-abstract@^1.20.0:
   version "1.20.4"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
   integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
@@ -5305,18 +4940,7 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity "sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="
 
-fast-glob@^3.0.3:
-  version "3.2.10"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.10.tgz#2734f83baa7f43b7fd41e13bc34438f4ffe284ee"
-  integrity sha512-s9nFhFnvR63wls6/kM88kQqDhMu0AfdjqouE2l5GVQPbqLgyFjjU5ry/r2yKsJxpb9Py1EYNqieFrmMaX4v++A==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-glob@^3.2.9:
+fast-glob@^3.0.3, fast-glob@^3.2.9:
   version "3.2.12"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
   integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
@@ -5850,16 +5474,7 @@ get-func-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
   integrity "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-intrinsic@^1.1.3:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
   integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
@@ -6131,12 +5746,7 @@ has-ansi@^3.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-bigints@^1.0.2:
+has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
@@ -6158,12 +5768,7 @@ has-property-descriptors@^1.0.0:
   dependencies:
     get-intrinsic "^1.1.1"
 
-has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-symbols@^1.0.3:
+has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
@@ -6598,24 +6203,12 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.3, is-callable@^1.2.7:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
-is-core-module@^2.5.0, is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.9.0:
+is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
@@ -6722,11 +6315,6 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="
 
-is-negative-zero@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
-  integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==
-
 is-negative-zero@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
@@ -6820,11 +6408,6 @@ is-running@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-running/-/is-running-2.1.0.tgz#30a73ff5cc3854e4fc25490809e9f5abf8de09e0"
   integrity sha1-MKc/9cw4VOT8JUkICen1q/jeCeA=
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -6884,13 +6467,6 @@ is-unicode-supported@^0.1.0:
   resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-weakref@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.1.tgz#842dba4ec17fa9ac9850df2d6efbc1737274f2a2"
-  integrity sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==
-  dependencies:
-    call-bind "^1.0.0"
-
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -7704,13 +7280,6 @@ magic-string@^0.25.2, magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.4"
 
-magic-string@^0.26.7:
-  version "0.26.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
-  integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
-  dependencies:
-    sourcemap-codec "^1.4.8"
-
 make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
@@ -8007,21 +7576,11 @@ minimist@^0.2.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.1.tgz#827ba4e7593464e7c221e8c5bed930904ee2c455"
   integrity sha512-GY8fANSrTMfBVfInqJAY41QkOM+upUTytK1jZ0c8+3HdHrJxBJ3rF5i9moClXTE8uUSnUo8cAsCoxDXvSY4DHg==
 
-minimist@^1.1.1, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
 minipass@^2.2.0:
   version "2.3.5"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
@@ -8205,11 +7764,6 @@ node-notifier@^10.0.0:
     uuid "^8.3.2"
     which "^2.0.2"
 
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
-
 node-releases@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
@@ -8349,17 +7903,12 @@ object-hash@^1.3.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
-  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
-
-object-inspect@^1.12.2:
+object-inspect@^1.12.2, object-inspect@^1.9.0:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity "sha1-HEfyct8nfzsdrwYWd9nILiMixg4= sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
@@ -8371,16 +7920,6 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
 object.assign@^4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
@@ -9128,6 +8667,16 @@ recast@^0.18.1:
     private "^0.1.8"
     source-map "~0.6.1"
 
+recast@^0.21.5:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.21.5.tgz#e8cd22bb51bcd6130e54f87955d33a2b2e57b495"
+  integrity sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==
+  dependencies:
+    ast-types "0.15.2"
+    esprima "~4.0.0"
+    source-map "~0.6.1"
+    tslib "^2.0.1"
+
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -9143,10 +8692,10 @@ redeyed@~1.0.0:
   dependencies:
     esprima "~3.0.0"
 
-regenerate-unicode-properties@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326"
-  integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
@@ -9160,18 +8709,17 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk= sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
 
-regenerator-runtime@^0.13.4:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
-  integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.14.2:
-  version "0.14.4"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz#5266857896518d1616a78a0479337a30ea974cc7"
-  integrity sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -9181,15 +8729,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
-  integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
-regexp.prototype.flags@^1.4.3:
+regexp.prototype.flags@^1.3.1, regexp.prototype.flags@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
   integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
@@ -9203,17 +8743,17 @@ regexpp@^3.0.0, regexpp@^3.2.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^4.7.1:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0"
-  integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==
+regexpu-core@^5.2.1:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc"
+  integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^9.0.0"
-    regjsgen "^0.5.2"
-    regjsparser "^0.7.0"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
 
 registry-auth-token@^4.0.0:
   version "4.2.1"
@@ -9229,15 +8769,15 @@ registry-url@^5.0.0:
   dependencies:
     rc "^1.2.8"
 
-regjsgen@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
 
-regjsparser@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968"
-  integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -9655,11 +9195,6 @@ schema-utils@^4.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -9793,12 +9328,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
-  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
-
-signal-exit@^3.0.7:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -9955,7 +9485,7 @@ source-map@0.4.x, source-map@^0.4.2:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.6:
+source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
@@ -9973,11 +9503,6 @@ source-map@~0.1.x:
     amdefine ">=0.0.4"
 
 sourcemap-codec@^1.4.1, sourcemap-codec@^1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f"
-  integrity "sha1-xj6pJ8Ap3WvZorf6A7P+wCrVbp8= sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg=="
-
-sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -10120,14 +9645,6 @@ string.prototype.padend@^3.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 string.prototype.trimend@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
@@ -10137,14 +9654,6 @@ string.prototype.trimend@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
-  dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-
 string.prototype.trimstart@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
@@ -10614,6 +10123,11 @@ tslib@^1.8.1, tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY= sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
 
+tslib@^2.0.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
+  integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -10708,16 +10222,6 @@ uglify-js@^3.1.4:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
   integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
-  dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
-    which-boxed-primitive "^1.0.2"
-
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
@@ -10762,10 +10266,10 @@ unicode-match-property-ecmascript@^2.0.0:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
-  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.0.0"

From aa030fc94f54eb6e035da7103a881a7a66047a84 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 8 Dec 2022 12:12:51 -0700
Subject: [PATCH 1326/1405] Fix typo in doc comment in types/publish.mjs

---
 types/publish.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/publish.mjs b/types/publish.mjs
index c72edb25641..4d67798b8e6 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -500,7 +500,7 @@ function processModule(moduleName) {
     statement.
       - Remove all `declare` modifiers from items in the module itself.
       - Update all `import` specifiers to be absolute in terms of the package
-        name (which means )
+        name, which means handling both `./` and `../` correctly.
   - Preserve existing `declare module` statements, so that anything using e.g.
     declaration merging continues to work correctly.
 

From 50705087e9def750879b05187ac992bf3eb5d235 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 8 Dec 2022 11:38:47 -0700
Subject: [PATCH 1327/1405] Types: resolve services with `Owner.lookup`

Integrate the service registry into the `DIRegistry` introduced as part
of rationalizing the `Owner` types in PR #20271 (94276b5). This allows
`Owner.lookup('service:foo')` to resolve a `FooService` if one is set
up in the `@ember/service` module's `Registry` interface. The preview
types already used this mechanic (as of 5658b13), so this just means
that when we ship the stable (i.e. built from source) version of
`@ember/service`, it will *continue* working.

Meta: Shipping this implementation for the lookup was blocked on being
able to publish type modules with `declare module`, which was
implemented in PR #20316 (9adcd15). We will likely need to rework other
parts of the type hierarchy to support publishing from source.
---
 packages/@ember/service/index.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/@ember/service/index.ts b/packages/@ember/service/index.ts
index 36f1e9009b4..199b0765cd6 100644
--- a/packages/@ember/service/index.ts
+++ b/packages/@ember/service/index.ts
@@ -93,3 +93,16 @@ export function service(
 export default class Service extends FrameworkObject {
   static isServiceFactory = true;
 }
+
+/**
+  A type registry for Ember `Service`s. Meant to be declaration-merged so string
+  lookups resolve to the correct type.
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface Registry extends Record<string, Service> {}
+
+declare module '@ember/owner' {
+  export interface DIRegistry {
+    service: Registry;
+  }
+}

From 1748d37781b40ee562f35e9b6a059810f9b759bc Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 12 Dec 2022 09:15:32 -0700
Subject: [PATCH 1328/1405] Add v4.8.3 to CHANGELOG

(cherry picked from commit d817c0084e26ef8a6d7b5f9188fd93596b032617)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0298e2fd4a4..42007f369da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+## v4.8.3 (December 12, 2022)
+
+- [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
+- [#20318](https://github.com/emberjs/ember.js/pull/20318) Backport `Resolver` to preview types
+
 ## v4.9.1 (November 30, 2022)
 
 - [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions

From 6635c775c945597993b6c8a118caffec72201ac4 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 12 Dec 2022 17:55:23 -0500
Subject: [PATCH 1329/1405] Add v4.10.0-beta.3 to CHANGELOG

(cherry picked from commit d2cd073751e829404b0d63969a27c871399605fc)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42007f369da..2d3f1bbe941 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+## v4.10.0-beta.3 (December 12, 2022)
+
+- [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
+- [#20319](https://github.com/emberjs/ember.js/pull/20319) Types: resolve services with `Owner.lookup`
+
 ## v4.8.3 (December 12, 2022)
 
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays

From eeaca69dcacc7ade0e1fe40d216a2f86d35ff8bb Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 12 Dec 2022 17:21:16 -0700
Subject: [PATCH 1330/1405] Add v4.9.2 to CHANGELOG

(cherry picked from commit 6cd5147c96f926129777a6c1c876d629e2da0d00)
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d3f1bbe941..9dfd3bfd1cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+## v4.9.2 (December 12, 2022)
+
+- [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
+- [#20318](https://github.com/emberjs/ember.js/pull/20318) Backport `Resolver` to preview types
+
 ## v4.10.0-beta.3 (December 12, 2022)
 
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays

From dfcd806ce8d87446cbdf7576d202856b8e2fd2df Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 13 Dec 2022 15:23:02 -0700
Subject: [PATCH 1331/1405] [BUGFIX LTS] ContainerDebugAdapter extends
 EmberObject

The preview types had `extends Object` instead, which... uh, yeah, most
things in JavaScript do that. Whoops.
---
 types/preview/@ember/debug/container-debug-adapter.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/types/preview/@ember/debug/container-debug-adapter.d.ts b/types/preview/@ember/debug/container-debug-adapter.d.ts
index 94cc571f9a3..1f53af7855e 100644
--- a/types/preview/@ember/debug/container-debug-adapter.d.ts
+++ b/types/preview/@ember/debug/container-debug-adapter.d.ts
@@ -1,11 +1,12 @@
 declare module '@ember/debug/container-debug-adapter' {
+  import EmberObject from '@ember/object';
   import type { Resolver } from '@ember/owner';
 
   /**
    * The ContainerDebugAdapter helps the container and resolver interface
    * with tools that debug Ember such as the Ember Inspector for Chrome and Firefox.
    */
-  export default class ContainerDebugAdapter extends Object {
+  export default class ContainerDebugAdapter extends EmberObject {
     resolver: Resolver;
     canCatalogEntriesByType(type: string): boolean;
     catalogEntriesByType(type: string): string[];

From 414514afe9875d0c363f3cb90d57fdec75e14833 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 14 Dec 2022 15:29:32 -0700
Subject: [PATCH 1332/1405] [FEATURE] Introduce stable types for `@ember/error`

---
 types/preview/@ember/error/index.d.ts | 6 ------
 types/preview/index.d.ts              | 2 --
 types/publish.mjs                     | 1 -
 3 files changed, 9 deletions(-)
 delete mode 100644 types/preview/@ember/error/index.d.ts

diff --git a/types/preview/@ember/error/index.d.ts b/types/preview/@ember/error/index.d.ts
deleted file mode 100644
index 20d4ad9d7d4..00000000000
--- a/types/preview/@ember/error/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '@ember/error' {
-  /**
-   * The native JavaScript Error class.
-   */
-  export default Error;
-}
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index bf1fb1411b1..4da1c30bef0 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -70,8 +70,6 @@ import './@ember/engine/-private/registry-proxy-mixin';
 import './@ember/engine/-private/types/initializer';
 import './@ember/engine/instance';
 
-import './@ember/error';
-
 import './@ember/helper';
 
 import './@ember/modifier';
diff --git a/types/publish.mjs b/types/publish.mjs
index 4d67798b8e6..6b22c9156cc 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -235,7 +235,6 @@ const PREVIEW_MODULES = [
   '@ember/engine/lib/engine-parent.d.ts',
   '@ember/enumerable/index.d.ts',
   '@ember/enumerable/mutable.d.ts',
-  '@ember/error/index.d.ts',
   '@ember/helper/index.d.ts',
   '@ember/instrumentation/index.d.ts',
   '@ember/modifier/index.d.ts',

From 285a7195a351ecb9d90b2d573a2be5b6a77db190 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 15 Dec 2022 10:08:21 -0700
Subject: [PATCH 1333/1405] Fix more bugs in type publishing infra

- Properly handle `import SomeItem, { anotherItem } from '.'` relative
  declarations, i.e. imports from the root/`index` of a directory.

- Handle `const item: import('<some path>').Type` declarations TS emits
  for cases like `export default opaquify(InternalClass)`.

  One particularly degenerate case is `import()` type annotations which
  TS generates as relative paths, e.g. `'../../@ember/object'`, since
  we cannot yet use project references and therefore also cannot use
  dependencies properly and therefore also cannot get TS to understand
  that it should be writing that as an absolute specifier.

- Remove `declare enum` as with as all other `declare <item>` cases.

- Noticing that we actually *cannot* handle `declare global { ... }`
  declarations, update the handful of places we do that internally.
  This has an added benefit of not adding those to the actual global
  type scope for the whole rest of the program!
---
 packages/@ember/debug/lib/deprecate.ts        | 12 ++---
 .../lib/ember-dev/assertion.ts                | 17 +++----
 .../lib/ember-dev/deprecation.ts              | 30 +++++++------
 .../lib/ember-dev/warning.ts                  | 22 ++++-----
 types/publish.mjs                             | 45 ++++++++++++++++---
 5 files changed, 82 insertions(+), 44 deletions(-)

diff --git a/packages/@ember/debug/lib/deprecate.ts b/packages/@ember/debug/lib/deprecate.ts
index 37d6c083e1b..a1715c71bb5 100644
--- a/packages/@ember/debug/lib/deprecate.ts
+++ b/packages/@ember/debug/lib/deprecate.ts
@@ -5,11 +5,13 @@ import { assert } from '../index';
 import type { HandlerCallback } from './handlers';
 import { invoke, registerHandler as genericRegisterHandler } from './handlers';
 
-declare global {
-  const __fail__: {
-    fail(): void;
-  };
-}
+// This is a "global", but instead of declaring it as `declare global`, which
+// will expose it to all other modules, declare it *locally* (and don't export
+// it) so that it has the desired "private global" semantics -- however odd that
+// particular notion is.
+declare const __fail__: {
+  fail(): void;
+};
 
 interface Available {
   available: string;
diff --git a/packages/internal-test-helpers/lib/ember-dev/assertion.ts b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
index be9d015543a..928d038e048 100644
--- a/packages/internal-test-helpers/lib/ember-dev/assertion.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/assertion.ts
@@ -5,12 +5,11 @@ import { callWithStub, checkTest } from './utils';
 type ExpectAssertionFunc = (func: () => void, expectedMessage: Message) => void;
 type IgnoreAssertionFunc = (func: () => void) => void;
 
-declare global {
-  interface Window {
+type ExtendedWindow = Window &
+  typeof globalThis & {
     expectAssertion: ExpectAssertionFunc | null;
     ignoreAssertion: IgnoreAssertionFunc | null;
-  }
-}
+  };
 
 const BREAK = {};
 
@@ -68,8 +67,9 @@ export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv): void {
       callWithStub(env, 'assert', func);
     };
 
-    window.expectAssertion = expectAssertion;
-    window.ignoreAssertion = ignoreAssertion;
+    let w = window as ExtendedWindow;
+    w.expectAssertion = expectAssertion;
+    w.ignoreAssertion = ignoreAssertion;
   });
 
   hooks.afterEach(function () {
@@ -77,8 +77,9 @@ export function setupAssertionHelpers(hooks: NestedHooks, env: DebugEnv): void {
     // sure we restore the original assert function
     env.setDebugFunction('assert', originalAssertFunc);
 
-    window.expectAssertion = null;
-    window.ignoreAssertion = null;
+    let w = window as ExtendedWindow;
+    w.expectAssertion = null;
+    w.ignoreAssertion = null;
   });
 }
 
diff --git a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
index b139b2736b6..6f84d9df3fb 100644
--- a/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/deprecation.ts
@@ -2,15 +2,15 @@ import { assert } from '@ember/debug';
 import DebugAssert from './debug';
 import type { DebugEnv, Message } from './utils';
 import { callWithStub } from './utils';
-declare global {
-  interface Window {
+
+type ExtendedWindow = Window &
+  typeof globalThis & {
     expectNoDeprecation: DeprecationAssert['expectNoDeprecation'] | undefined;
     expectNoDeprecationAsync: DeprecationAssert['expectNoDeprecationAsync'] | undefined;
     expectDeprecation: DeprecationAssert['expectDeprecation'] | undefined;
     expectDeprecationAsync: DeprecationAssert['expectDeprecationAsync'] | undefined;
     ignoreDeprecation: DeprecationAssert['ignoreDeprecation'] | undefined;
-  }
-}
+  };
 
 export function setupDeprecationHelpers(hooks: NestedHooks, env: DebugEnv): void {
   let assertion = new DeprecationAssert(env);
@@ -62,22 +62,24 @@ class DeprecationAssert extends DebugAssert {
   }
 
   inject(): void {
-    window.expectNoDeprecation = expectNoDeprecation = this.expectNoDeprecation.bind(this);
-    window.expectNoDeprecationAsync = expectNoDeprecationAsync =
+    let w = window as ExtendedWindow;
+    w.expectNoDeprecation = expectNoDeprecation = this.expectNoDeprecation.bind(this);
+    w.expectNoDeprecationAsync = expectNoDeprecationAsync =
       this.expectNoDeprecationAsync.bind(this);
-    window.expectDeprecation = expectDeprecation = this.expectDeprecation.bind(this);
-    window.expectDeprecationAsync = expectDeprecationAsync = this.expectDeprecationAsync.bind(this);
-    window.ignoreDeprecation = ignoreDeprecation = this.ignoreDeprecation.bind(this);
+    w.expectDeprecation = expectDeprecation = this.expectDeprecation.bind(this);
+    w.expectDeprecationAsync = expectDeprecationAsync = this.expectDeprecationAsync.bind(this);
+    w.ignoreDeprecation = ignoreDeprecation = this.ignoreDeprecation.bind(this);
     super.inject();
   }
 
   restore(): void {
     super.restore();
-    window.expectNoDeprecation = undefined;
-    window.expectNoDeprecationAsync = undefined;
-    window.expectDeprecation = undefined;
-    window.expectDeprecationAsync = undefined;
-    window.ignoreDeprecation = undefined;
+    let w = window as ExtendedWindow;
+    w.expectNoDeprecation = undefined;
+    w.expectNoDeprecationAsync = undefined;
+    w.expectDeprecation = undefined;
+    w.expectDeprecationAsync = undefined;
+    w.ignoreDeprecation = undefined;
   }
 
   // Expects no deprecation to happen within a function, or if no function is
diff --git a/packages/internal-test-helpers/lib/ember-dev/warning.ts b/packages/internal-test-helpers/lib/ember-dev/warning.ts
index 31d53e5bd5f..aa669ab26c0 100644
--- a/packages/internal-test-helpers/lib/ember-dev/warning.ts
+++ b/packages/internal-test-helpers/lib/ember-dev/warning.ts
@@ -9,13 +9,12 @@ type ExpectWarningFunc = (
 ) => void;
 type IgnoreWarningFunc = (func: () => void) => void;
 
-declare global {
-  interface Window {
+type ExtendedWindow = Window &
+  typeof globalThis & {
     expectNoWarning: ExpectNoWarningFunc | null;
     expectWarning: ExpectWarningFunc | null;
     ignoreWarning: IgnoreWarningFunc | null;
-  }
-}
+  };
 
 export function setupWarningHelpers(hooks: NestedHooks, env: DebugEnv) {
   let assertion = new WarningAssert(env);
@@ -95,16 +94,19 @@ class WarningAssert extends DebugAssert {
       callWithStub(this.env, 'warn', func);
     };
 
-    window.expectNoWarning = expectNoWarning;
-    window.expectWarning = expectWarning;
-    window.ignoreWarning = ignoreWarning;
+    let w = window as ExtendedWindow;
+
+    w.expectNoWarning = expectNoWarning;
+    w.expectWarning = expectWarning;
+    w.ignoreWarning = ignoreWarning;
   }
 
   restore() {
     super.restore();
-    window.expectWarning = null;
-    window.expectNoWarning = null;
-    window.ignoreWarning = null;
+    let w = window as ExtendedWindow;
+    w.expectWarning = null;
+    w.expectNoWarning = null;
+    w.ignoreWarning = null;
   }
 }
 
diff --git a/types/publish.mjs b/types/publish.mjs
index 4d67798b8e6..cf46bb14dd6 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -40,6 +40,7 @@ import {
   isStringLiteral,
   isVariableDeclaration,
   isTSDeclareFunction,
+  isTSEnumDeclaration,
 } from '@babel/types';
 import { builders as b, visit } from 'ast-types';
 import { parse, print } from 'recast';
@@ -548,6 +549,14 @@ export function rewriteModule(code, moduleName) {
       this.traverse(path);
     },
 
+    // Remove `declare` from `declare enum` in the top-level module.
+    visitTSEnumDeclaration(path) {
+      if (isTSEnumDeclaration(path.node) && !hasParentModuleDeclarationBlock(path)) {
+        path.node.declare = false;
+      }
+      this.traverse(path);
+    },
+
     // For any relative imports like `import { something } from './somewhere';`,
     // rewrite as `import { something } from '@ember/some-package/somewhere';`
     // since relative imports are not allowed in `declare module { }` blocks.
@@ -561,14 +570,20 @@ export function rewriteModule(code, moduleName) {
 
     // Do the same for `export ... from './relative-path'`.
     visitExportNamedDeclaration(path) {
-      let source = path.node.source;
-      if (isStringLiteral(source)) {
-        if (source.value.startsWith('./') || source.value.startsWith('../')) {
-          source.value = normalizeSpecifier(moduleName, source.value);
-        }
+      let specifier = path.node.source;
+      if (isStringLiteral(specifier)) {
+        specifier.value = normalizeSpecifier(moduleName, specifier.value);
       }
       this.traverse(path);
     },
+
+    // We need to rewrite annotations like `export const: import('./foo').foo`
+    // to use relative paths, as well.
+    visitTSImportType(path) {
+      let specifier = path.node.argument.value;
+      path.node.argument.value = normalizeSpecifier(moduleName, specifier);
+      this.traverse(path);
+    },
   });
 
   let newAST = b.file(
@@ -604,16 +619,32 @@ function hasParentModuleDeclarationBlock(path) {
 
 const TERMINAL_MODULE_RE = /\/[\w-_]+\.d\.ts$/;
 const NEIGHBOR_PATH_RE = /^(\.)\//;
+const SHOULD_BE_ABSOLUTE = /(\.\.\/)+(@.*)/;
 
 /**
-  Given a relative path, `./` or `(../)+`, rewrite it as an absolute path.
+  Given a relative path, `'.'`, `./`, or `(../)+`, rewrite it as an absolute path.
 
   @param {string} moduleName The name of the host module we are declaring.
   @param {string} specifier The name of the module it is importing.
   @return {string}
  */
 function normalizeSpecifier(moduleName, specifier) {
-  if (specifier.startsWith('./')) {
+  // One particularly degenerate case is `import()` type annotations which TS
+  // generates as relative paths, e.g. `'../../@ember/object'`, since we cannot
+  // yet use project references and therefore also cannot use dependencies
+  // properly and therefore also cannot get TS to understand that it should be
+  // writing that as an absolute specifier.
+  let nonsensicalRelativePath = specifier.match(SHOULD_BE_ABSOLUTE);
+  // First match is the whole string, second match is the (last) leading `../`,
+  // third match is the package we care about.
+  if (nonsensicalRelativePath && nonsensicalRelativePath[2]) {
+    return nonsensicalRelativePath[2];
+  }
+
+  // The other cases are more normal: we replace
+  if (specifier === '.') {
+    return moduleName.replace(TERMINAL_MODULE_RE, '');
+  } else if (specifier.startsWith('./')) {
     let parentModuleName = moduleName.replace(TERMINAL_MODULE_RE, '');
     let sansLeadingDot = specifier.replace(NEIGHBOR_PATH_RE, '');
     let newImportName = `${parentModuleName}/${sansLeadingDot}`;

From 412c1728095a6a58d64c638d22698e7aaaa9d363 Mon Sep 17 00:00:00 2001
From: Bryan Mishkin <698306+bmish@users.noreply.github.com>
Date: Tue, 13 Dec 2022 22:57:23 -0500
Subject: [PATCH 1334/1405] chore: update lint dependencies

---
 .eslintrc.js |  5 +++--
 package.json |  6 +++---
 yarn.lock    | 26 +++++++++++++-------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 921dc164dd6..a30b8021976 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -153,13 +153,14 @@ module.exports = {
       },
 
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
+      extends: ['plugin:node/recommended'],
+      rules: {
         // add your custom rules and overrides for node files here
         'no-process-exit': 'off',
         'no-throw-literal': 'error',
         'disable-features/disable-async-await': 'off',
         'disable-features/disable-generator-functions': 'off',
-      }),
+      },
     },
     {
       files: ['node-tests/**/*.js'],
diff --git a/package.json b/package.json
index 3a0cc9022ea..c7c6ddadd59 100644
--- a/package.json
+++ b/package.json
@@ -126,15 +126,15 @@
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-yuidoc": "^0.9.1",
     "ember-publisher": "0.0.7",
-    "eslint": "^8.28.0",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-node": "^0.3.6",
     "eslint-plugin-disable-features": "^0.1.3",
-    "eslint-plugin-ember-internal": "^2.0.0",
+    "eslint-plugin-ember-internal": "^3.0.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-qunit": "^7.2.0",
+    "eslint-plugin-qunit": "^7.3.4",
     "execa": "^5.1.1",
     "expect-type": "^0.15.0",
     "express": "^4.18.2",
diff --git a/yarn.lock b/yarn.lock
index f66124d6bbd..5edd031fed5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4490,13 +4490,13 @@ eslint-plugin-disable-features@^0.1.3:
   dependencies:
     requireindex "~1.1.0"
 
-eslint-plugin-ember-internal@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-ember-internal/-/eslint-plugin-ember-internal-2.0.0.tgz#bebfb829c7bbc47d71ef853adf93ff37e02282b6"
-  integrity sha512-dzPY1Ka3xIMb/ZzTJHMQncKADVCmFsi2EtSuUI3FU6L3jeVg1XOuLVx3Ud5UCxUBIA37DRPhHf7DDKU4E69X2g==
+eslint-plugin-ember-internal@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-ember-internal/-/eslint-plugin-ember-internal-3.0.0.tgz#8332b97d4b9cd16122a3a10f0a14c32d4138465d"
+  integrity sha512-m34Te+wCzH4c32Bwduj365ClwtvB9BVKcyIBYSsykyEDuLqufQPcr+/8p+yCSPdmH5hTc+6OAJjbge7FN+31wQ==
   dependencies:
     line-column "^1.0.2"
-    requireindex "~1.1.0"
+    requireindex "^1.2.0"
 
 eslint-plugin-es@^3.0.0:
   version "3.0.0"
@@ -4544,10 +4544,10 @@ eslint-plugin-prettier@^4.2.1:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-qunit@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.2.0.tgz#ad00e0007dc0bbd1d59309cc6388238b6a8784a3"
-  integrity sha512-ebT6aOpmMj4vchG0hVw9Ukbutk/lgywrc8gc9w9hH2/4WjKqwMlyM7iVwqB7OAXv6gtQMJZuziT0wNjjymAuWA==
+eslint-plugin-qunit@^7.3.4:
+  version "7.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-qunit/-/eslint-plugin-qunit-7.3.4.tgz#2465b6f29ff56fbe9b741bde2740dec109ee9bec"
+  integrity sha512-EbDM0zJerH9zVdUswMJpcFF7wrrpvsGuYfNexUpa5hZkkdFhaFcX+yD+RSK4Nrauw4psMGlcqeWUMhaVo+Manw==
   dependencies:
     eslint-utils "^3.0.0"
     requireindex "^1.2.0"
@@ -4597,10 +4597,10 @@ eslint-visitor-keys@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint@^8.28.0:
-  version "8.28.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e"
-  integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==
+eslint@^8.29.0:
+  version "8.29.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87"
+  integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==
   dependencies:
     "@eslint/eslintrc" "^1.3.3"
     "@humanwhocodes/config-array" "^0.11.6"

From 5ee2c9b95a3c4b96fa66d811cb24d63fdcba4ada Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 13 Dec 2022 16:22:47 -0700
Subject: [PATCH 1335/1405] Add 4.10.0-beta.4 to CHANGELOG

(cherry picked from commit 220650a333cb8c8aa345a061a492d66869ea950b)
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dfd3bfd1cb..4cc28a75840 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v4.10.0-beta.4 (December 13, 2022)
+
+- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX LTS] types: `ContainerDebugAdapter` extends `EmberObject`, not `Object`
+
 ## v4.9.2 (December 12, 2022)
 
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays

From 9b1d90c3c588ce527032ab9544f5342accfaea85 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 20 Dec 2022 16:32:25 -0700
Subject: [PATCH 1336/1405] Types: simplify internal views/states modules

Rewrite `packages/@ember/-internals/views/lib/views/states.ts` to just
define all its states in the same module. This results in two wins:

1. TypeScript no longer emits `item: import(<path>)` type annotations
   for the per-state default exports, as it previously had to do because
   the default exports were the result of `Object.freeze` expressions.
   We could have just done the `Object.freeze()` at the definition site
   for the (default) exported object being frozen, but:

2. This also gets rid of five modules at runtime. Modules aren't that
   expensive... but they also aren't *free*, and these modules were not
   remotely pulling their weight. There are (appropriately!) no other
   references to these modules anywhere, and the objects they exported
   can simply be inlined into the `states` module.
---
 .../-internals/views/lib/views/states.ts      | 106 ++++++++++++++++--
 .../views/lib/views/states/default.ts         |  19 ----
 .../views/lib/views/states/destroying.ts      |  16 ---
 .../views/lib/views/states/has_element.ts     |  32 ------
 .../views/lib/views/states/in_dom.ts          |  42 -------
 .../views/lib/views/states/pre_render.ts      |   5 -
 6 files changed, 98 insertions(+), 122 deletions(-)
 delete mode 100644 packages/@ember/-internals/views/lib/views/states/default.ts
 delete mode 100644 packages/@ember/-internals/views/lib/views/states/destroying.ts
 delete mode 100644 packages/@ember/-internals/views/lib/views/states/has_element.ts
 delete mode 100644 packages/@ember/-internals/views/lib/views/states/in_dom.ts
 delete mode 100644 packages/@ember/-internals/views/lib/views/states/pre_render.ts

diff --git a/packages/@ember/-internals/views/lib/views/states.ts b/packages/@ember/-internals/views/lib/views/states.ts
index 631dce0fc5b..c9480ffbdf4 100644
--- a/packages/@ember/-internals/views/lib/views/states.ts
+++ b/packages/@ember/-internals/views/lib/views/states.ts
@@ -1,8 +1,9 @@
-import preRender from './states/pre_render';
-import hasElement from './states/has_element';
-import inDOM from './states/in_dom';
-import destroying from './states/destroying';
+import { teardownMandatorySetter } from '@ember/-internals/utils';
 import type Component from '@ember/component';
+import { assert } from '@ember/debug';
+import { flaggedInstrument } from '@ember/instrumentation';
+import { join } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
 
 export interface ViewState {
   enter?(view: Component): void;
@@ -13,6 +14,95 @@ export interface ViewState {
   destroy(view: Component): void;
 }
 
+const DEFAULT: Readonly<ViewState> = Object.freeze({
+  // appendChild is only legal while rendering the buffer.
+  appendChild() {
+    throw new Error("You can't use appendChild outside of the rendering process");
+  },
+
+  // Handle events from `Ember.EventDispatcher`
+  handleEvent() {
+    return true; // continue event propagation
+  },
+
+  rerender() {},
+
+  destroy() {},
+});
+
+const PRE_RENDER: Readonly<ViewState> = Object.freeze({ ...DEFAULT });
+
+const HAS_ELEMENT: Readonly<ViewState> = Object.freeze({
+  ...DEFAULT,
+
+  rerender(view: Component) {
+    view.renderer.rerender();
+  },
+
+  destroy(view: Component) {
+    view.renderer.remove(view);
+  },
+
+  // Handle events from `Ember.EventDispatcher`
+  handleEvent(view: Component, eventName: string, event: Event) {
+    if (view.has(eventName)) {
+      // Handler should be able to re-dispatch events, so we don't
+      // preventDefault or stopPropagation.
+      return flaggedInstrument(`interaction.${eventName}`, { event, view }, () => {
+        return join(view, view.trigger, eventName, event);
+      });
+    } else {
+      return true; // continue event propagation
+    }
+  },
+});
+
+const IN_DOM: Readonly<ViewState> = Object.freeze({
+  ...HAS_ELEMENT,
+
+  enter(view: Component) {
+    // Register the view for event handling. This hash is used by
+    // Ember.EventDispatcher to dispatch incoming events.
+    view.renderer.register(view);
+
+    if (DEBUG) {
+      let elementId = view.elementId;
+
+      assert(
+        '[BUG] Expected teardownMandatorySetter to be set in DEBUG mode',
+        teardownMandatorySetter
+      );
+      teardownMandatorySetter(view, 'elementId');
+
+      Object.defineProperty(view, 'elementId', {
+        configurable: true,
+        enumerable: true,
+
+        get() {
+          return elementId;
+        },
+        set(value) {
+          if (value !== elementId) {
+            throw new Error("Changing a view's elementId after creation is not allowed");
+          }
+        },
+      });
+    }
+  },
+});
+
+const DESTROYING: Readonly<ViewState> = Object.freeze({
+  ...DEFAULT,
+
+  appendChild() {
+    throw new Error("You can't call appendChild on a view being destroyed");
+  },
+
+  rerender() {
+    throw new Error("You can't call rerender on a view being destroyed");
+  },
+});
+
 /*
   Describe how the specified actions should behave in the various
   states that a view can exist in. Possible states:
@@ -29,10 +119,10 @@ export interface ViewState {
     on a destroyed view.
 */
 const states = Object.freeze({
-  preRender,
-  inDOM,
-  hasElement,
-  destroying,
+  preRender: PRE_RENDER,
+  inDOM: IN_DOM,
+  hasElement: HAS_ELEMENT,
+  destroying: DESTROYING,
 });
 
 export default states;
diff --git a/packages/@ember/-internals/views/lib/views/states/default.ts b/packages/@ember/-internals/views/lib/views/states/default.ts
deleted file mode 100644
index 0017c55da8c..00000000000
--- a/packages/@ember/-internals/views/lib/views/states/default.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { ViewState } from '../states';
-
-const _default: ViewState = {
-  // appendChild is only legal while rendering the buffer.
-  appendChild() {
-    throw new Error("You can't use appendChild outside of the rendering process");
-  },
-
-  // Handle events from `Ember.EventDispatcher`
-  handleEvent() {
-    return true; // continue event propagation
-  },
-
-  rerender() {},
-
-  destroy() {},
-};
-
-export default Object.freeze(_default);
diff --git a/packages/@ember/-internals/views/lib/views/states/destroying.ts b/packages/@ember/-internals/views/lib/views/states/destroying.ts
deleted file mode 100644
index 5ac876bc5b8..00000000000
--- a/packages/@ember/-internals/views/lib/views/states/destroying.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { ViewState } from '../states';
-import _default from './default';
-
-const destroying: ViewState = {
-  ..._default,
-
-  appendChild() {
-    throw new Error("You can't call appendChild on a view being destroyed");
-  },
-
-  rerender() {
-    throw new Error("You can't call rerender on a view being destroyed");
-  },
-};
-
-export default Object.freeze(destroying);
diff --git a/packages/@ember/-internals/views/lib/views/states/has_element.ts b/packages/@ember/-internals/views/lib/views/states/has_element.ts
deleted file mode 100644
index 8e4a8d151af..00000000000
--- a/packages/@ember/-internals/views/lib/views/states/has_element.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import _default from './default';
-import { join } from '@ember/runloop';
-import { flaggedInstrument } from '@ember/instrumentation';
-import type Component from '@ember/component';
-import type { ViewState } from '../states';
-
-const hasElement: ViewState = {
-  ..._default,
-
-  rerender(view: Component) {
-    view.renderer.rerender();
-  },
-
-  destroy(view: Component) {
-    view.renderer.remove(view);
-  },
-
-  // Handle events from `Ember.EventDispatcher`
-  handleEvent(view: Component, eventName: string, event: Event) {
-    if (view.has(eventName)) {
-      // Handler should be able to re-dispatch events, so we don't
-      // preventDefault or stopPropagation.
-      return flaggedInstrument(`interaction.${eventName}`, { event, view }, () => {
-        return join(view, view.trigger, eventName, event);
-      });
-    } else {
-      return true; // continue event propagation
-    }
-  },
-};
-
-export default Object.freeze(hasElement);
diff --git a/packages/@ember/-internals/views/lib/views/states/in_dom.ts b/packages/@ember/-internals/views/lib/views/states/in_dom.ts
deleted file mode 100644
index ce540378522..00000000000
--- a/packages/@ember/-internals/views/lib/views/states/in_dom.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { teardownMandatorySetter } from '@ember/-internals/utils';
-import type Component from '@ember/component';
-import { assert } from '@ember/debug';
-import { DEBUG } from '@glimmer/env';
-import type { ViewState } from '../states';
-import hasElement from './has_element';
-
-const inDOM: ViewState = {
-  ...hasElement,
-
-  enter(view: Component) {
-    // Register the view for event handling. This hash is used by
-    // Ember.EventDispatcher to dispatch incoming events.
-    view.renderer.register(view);
-
-    if (DEBUG) {
-      let elementId = view.elementId;
-
-      assert(
-        '[BUG] Expected teardownMandatorySetter to be set in DEBUG mode',
-        teardownMandatorySetter
-      );
-      teardownMandatorySetter(view, 'elementId');
-
-      Object.defineProperty(view, 'elementId', {
-        configurable: true,
-        enumerable: true,
-
-        get() {
-          return elementId;
-        },
-        set(value) {
-          if (value !== elementId) {
-            throw new Error("Changing a view's elementId after creation is not allowed");
-          }
-        },
-      });
-    }
-  },
-};
-
-export default Object.freeze(inDOM);
diff --git a/packages/@ember/-internals/views/lib/views/states/pre_render.ts b/packages/@ember/-internals/views/lib/views/states/pre_render.ts
deleted file mode 100644
index 50eafd9edc1..00000000000
--- a/packages/@ember/-internals/views/lib/views/states/pre_render.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import _default from './default';
-
-const preRender = { ..._default };
-
-export default Object.freeze(preRender);

From 3ff9fb91fb3296f811b14ec2f9d7827b749f98d5 Mon Sep 17 00:00:00 2001
From: Boris Petrov <boris_petrov@live.com>
Date: Wed, 21 Dec 2022 14:29:20 +0200
Subject: [PATCH 1337/1405] Allow passing readonly arrays to the
 mutation-methods of `NativeArray`

---
 types/preview/@ember/array/-private/native-array.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/preview/@ember/array/-private/native-array.d.ts b/types/preview/@ember/array/-private/native-array.d.ts
index 50781a30d77..d7be1f52cd3 100644
--- a/types/preview/@ember/array/-private/native-array.d.ts
+++ b/types/preview/@ember/array/-private/native-array.d.ts
@@ -7,7 +7,7 @@ declare module '@ember/array/-private/native-array' {
   // Get an alias to the global Array type to use in inner scope below.
   type Array<T> = T[];
 
-  type AnyArray<T> = EmberArray<T> | Array<T>;
+  type AnyArray<T> = EmberArray<T> | Array<T> | ReadonlyArray<T>;
 
   /**
    * The final definition of NativeArray removes all native methods. This is the list of removed methods

From f934d8877801f3d460760cb5c48a3f532a5a07be Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 22 Dec 2022 10:52:03 -0700
Subject: [PATCH 1338/1405] types: work around backburner runtime paths
 shenanigans

The legal runtime import for the `backburner.js` package is apparently
`backburner`, but I have not yet been able to identify where that
rename occurs. We should ultimately align that to use the package name
instead of a custom import specifier, but for now, unblock publishing
types from source by rewriting all imports in the emitted types from
`'backburner'` to `'backburner.js'`.
---
 types/publish.mjs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/types/publish.mjs b/types/publish.mjs
index dab8aba371f..556e8f5501a 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -563,6 +563,14 @@ export function rewriteModule(code, moduleName) {
       let source = path.node.source;
       if (isStringLiteral(source)) {
         source.value = normalizeSpecifier(moduleName, source.value);
+
+        // This makes it so that the types we publish point to the types defined
+        // by `backburner.js`, basically doing the type-time equivalent of the
+        // no good, very bad runtime shenanigans Ember does... *somewhere*... in
+        // the build to make `import Backburner from 'backburner'` work.
+        if (source.value === 'backburner') {
+          source.value = 'backburner.js';
+        }
       }
       this.traverse(path);
     },

From 42487628ce8fd14da32dd3d058cdefd96f067e40 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Mon, 19 Dec 2022 17:23:35 -0700
Subject: [PATCH 1339/1405] Bugfix: more cases in types publishing infra

- Remove a needless runtime type check in one of the visitors.
- Remove `declare` from interface declarations.
---
 types/publish.mjs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/types/publish.mjs b/types/publish.mjs
index 556e8f5501a..05da0476fb5 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -542,12 +542,19 @@ export function rewriteModule(code, moduleName) {
 
     // Remove `declare` from `declare function` in the top-level module.
     visitTSDeclareFunction(path) {
-      if (isTSDeclareFunction(path.node) && !hasParentModuleDeclarationBlock(path)) {
+      if (!hasParentModuleDeclarationBlock(path)) {
         path.node.declare = false;
       }
       this.traverse(path);
     },
 
+    visitTSInterfaceDeclaration(path) {
+      if (!hasParentModuleDeclarationBlock(path)) {
+        path.node.declare = false;
+      }
+      this.traverse(false);
+    },
+
     // Remove `declare` from `declare enum` in the top-level module.
     visitTSEnumDeclaration(path) {
       if (isTSEnumDeclaration(path.node) && !hasParentModuleDeclarationBlock(path)) {
@@ -584,6 +591,14 @@ export function rewriteModule(code, moduleName) {
       this.traverse(path);
     },
 
+    visitExportAllDeclaration(path) {
+      let specifier = path.node.source;
+      if (isStringLiteral(specifier)) {
+        specifier.value = normalizeSpecifier(moduleName, specifier.value);
+      }
+      this.traverse(path);
+    },
+
     // We need to rewrite annotations like `export const: import('./foo').foo`
     // to use relative paths, as well.
     visitTSImportType(path) {

From e533514c5a893c56b7d382bb4880fef7a200a22b Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 22 Dec 2022 14:49:05 -0700
Subject: [PATCH 1340/1405] Types publishing: always `this.traverse(path)` in
 visitors

---
 types/publish.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/publish.mjs b/types/publish.mjs
index 05da0476fb5..17e01cc4722 100755
--- a/types/publish.mjs
+++ b/types/publish.mjs
@@ -552,7 +552,7 @@ export function rewriteModule(code, moduleName) {
       if (!hasParentModuleDeclarationBlock(path)) {
         path.node.declare = false;
       }
-      this.traverse(false);
+      this.traverse(path);
     },
 
     // Remove `declare` from `declare enum` in the top-level module.

From 78b3590bf074cc1f7e3cb4422aeed9b2bfe57e5d Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 28 Dec 2022 16:19:05 -0500
Subject: [PATCH 1341/1405] Add v4.10.0-beta.5 to CHANGELOG

(cherry picked from commit b3f9de3c9b2d3ee98724bc39f672bdfee56cb62b)
---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cc28a75840..6271925e425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,20 @@
 # Ember Changelog
 
+## v4.10.0-beta.5 (December 28, 2022)
+
+- [#20327](https://github.com/emberjs/ember.js/pull/20327) [BUGFIX] Fix the types for the mutation-methods of `NativeArray`
+
 ## v4.10.0-beta.4 (December 13, 2022)
 
-- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX LTS] types: `ContainerDebugAdapter` extends `EmberObject`, not `Object`
+- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX] types: `ContainerDebugAdapter` extends `EmberObject`, not `Object`
+
+## v4.9.3 (December 13, 2022)
+
+- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX] ContainerDebugAdapter extends EmberObject
+
+## v4.8.4 (December 13, 2022)
+
+- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX] ContainerDebugAdapter extends EmberObject
 
 ## v4.9.2 (December 12, 2022)
 
@@ -30,7 +42,7 @@
 
 ## v3.28.11 (November 30, 2022)
 
-- [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX LTS] Allow class-based helpers in strict-mode
+- [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX] Allow class-based helpers in strict-mode
 
 ## v4.10.0-beta.1 (November 28, 2022)
 

From f1b0570887463ec2d2470d341f9d2b42e2d7d71b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 15:02:47 +0000
Subject: [PATCH 1342/1405] Bump aws-sdk from 2.1245.0 to 2.1286.0

Bumps [aws-sdk](https://github.com/aws/aws-sdk-js) from 2.1245.0 to 2.1286.0.
- [Release notes](https://github.com/aws/aws-sdk-js/releases)
- [Changelog](https://github.com/aws/aws-sdk-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-js/compare/v2.1245.0...v2.1286.0)

---
updated-dependencies:
- dependency-name: aws-sdk
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c7c6ddadd59..4d4ad091d32 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "@typescript-eslint/parser": "^5.38.1",
     "ast-types": "^0.14.2",
     "auto-dist-tag": "^2.1.1",
-    "aws-sdk": "^2.1245.0",
+    "aws-sdk": "^2.1286.0",
     "babel-template": "^6.26.0",
     "backburner.js": "^2.7.0",
     "broccoli-babel-transpiler": "^7.8.1",
diff --git a/yarn.lock b/yarn.lock
index 5edd031fed5..27246679d67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2104,10 +2104,10 @@ available-typed-arrays@^1.0.5:
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
-aws-sdk@^2.0.9, aws-sdk@^2.1245.0:
-  version "2.1245.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1245.0.tgz#cee09dd6a83badbe7692cb512cbce5e9daa0c702"
-  integrity sha512-LXNmuT33+k4ymWijm6dhLRm0OX14ki9OOK1BYn8AUWWPuh+GMlFIuIFH+sWORVdhZqaQNsvF72cB6CeMBqaJWg==
+aws-sdk@^2.0.9, aws-sdk@^2.1286.0:
+  version "2.1286.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1286.0.tgz#700d6081222a400c753aff640d679714a7ab3e87"
+  integrity sha512-CvkCD1+NSk2MPOutD2hEPhXDET/79w/gd9a359QWb9Ja0Fd4vVFXPkhlm1DTGzuwqFKGinpCMxDP4md7QPsVvw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"

From 6ed8a5e8b72dcbb572b2a7c92b640bb890834d4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 15:03:07 +0000
Subject: [PATCH 1343/1405] Bump testem from 3.10.0 to 3.10.1

Bumps [testem](https://github.com/testem/testem) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/testem/testem/releases)
- [Commits](https://github.com/testem/testem/compare/v3.10.0...v3.10.1)

---
updated-dependencies:
- dependency-name: testem
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c7c6ddadd59..2198bcc36a2 100644
--- a/package.json
+++ b/package.json
@@ -159,7 +159,7 @@
     "rsvp": "^4.8.5",
     "serve-static": "^1.14.2",
     "simple-dom": "^1.4.0",
-    "testem": "^3.10.0",
+    "testem": "^3.10.1",
     "testem-failure-only-reporter": "^1.0.0",
     "typescript": "4.9"
   },
diff --git a/yarn.lock b/yarn.lock
index 5edd031fed5..7973cc451bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9899,10 +9899,10 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.10.0, testem@^3.8.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.0.tgz#df3f43839892c17f35f4c5994c50c99aa8242bb0"
-  integrity sha512-2BMbPkAJT5xNojNxQGKT8CU9ix4EYDmHjjKFpUeeSW6tBVfFVgOi2vfrpJ5Hwdq4HsfnOALNAWN8/yjuFTgQfA==
+testem@^3.0.0, testem@^3.10.1, testem@^3.8.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.1.tgz#bab8a83bec11e975f7d1e47e924eed6135957e5b"
+  integrity sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ==
   dependencies:
     "@xmldom/xmldom" "^0.8.0"
     backbone "^1.1.2"

From 3fc01b8d332e1388a4e415d4afe8b9eb8319f3c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 15:03:27 +0000
Subject: [PATCH 1344/1405] Bump semver from 7.3.7 to 7.3.8

Bumps [semver](https://github.com/npm/node-semver) from 7.3.7 to 7.3.8.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.7...v7.3.8)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c7c6ddadd59..fd6d4303ea3 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "ember-router-generator": "^2.0.0",
     "inflection": "^1.13.2",
     "resolve": "^1.22.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "silent-error": "^1.1.1"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 5edd031fed5..01cee32dd69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9200,10 +9200,10 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 

From 0da7ae741e5c07ab94f2d9824caf1018101814e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Jan 2023 15:03:50 +0000
Subject: [PATCH 1345/1405] Bump puppeteer from 13.5.1 to 19.4.1

Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 13.5.1 to 19.4.1.
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/release-please-config.json)
- [Commits](https://github.com/puppeteer/puppeteer/compare/v13.5.1...puppeteer-v19.4.1)

---
updated-dependencies:
- dependency-name: puppeteer
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 72 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/package.json b/package.json
index c7c6ddadd59..640fba89cb5 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.0",
-    "puppeteer": "^13.5.1",
+    "puppeteer": "^19.4.1",
     "qunit": "^2.19.1",
     "recast": "^0.21.5",
     "rollup-plugin-commonjs": "^9.3.4",
diff --git a/yarn.lock b/yarn.lock
index 5edd031fed5..620e07642ef 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3574,6 +3574,16 @@ cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
+cosmiconfig@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97"
+  integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==
+  dependencies:
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+
 cross-fetch@3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f"
@@ -3672,13 +3682,6 @@ debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, de
   dependencies:
     ms "2.1.2"
 
-debug@4.3.3:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
-  dependencies:
-    ms "2.1.2"
-
 debug@^3.0.1, debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
@@ -3822,10 +3825,10 @@ detect-newline@3.1.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-devtools-protocol@0.0.969999:
-  version "0.0.969999"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.969999.tgz#3d6be0a126b3607bb399ae2719b471dda71f3478"
-  integrity sha512-6GfzuDWU0OFAuOvBokXpXPLxjOJ5DZ157Ue3sGQQM3LgAamb8m0R0ruSfN0DDu+XG5XJgT50i6zZ/0o8RglreQ==
+devtools-protocol@0.0.1068969:
+  version "0.0.1068969"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz#8b9a4bc48aed1453bed08d62b07481f9abf4d6d8"
+  integrity sha512-ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ==
 
 diff@1.0.8:
   version "1.0.8"
@@ -5981,10 +5984,10 @@ http-signature@~0.10.0:
     assert-plus "^0.1.5"
     ctype "0.5.3"
 
-https-proxy-agent@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+https-proxy-agent@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
     debug "4"
@@ -8283,7 +8286,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity "sha1-clVrgM+g1IqXToDnckjoDtT3+HA= sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="
 
-pkg-dir@4.2.0, pkg-dir@^4.1.0:
+pkg-dir@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -8492,23 +8495,32 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity "sha1-tYsBCsQMIsVldhbI0sLALHv0eew= sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 
-puppeteer@^13.5.1:
-  version "13.5.1"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-13.5.1.tgz#d0f751bf36120efc2ebf74c7562a204a84e500e9"
-  integrity sha512-wWxO//vMiqxlvuzHMAJ0pRJeDHvDtM7DQpW1GKdStz2nZo2G42kOXBDgkmQ+zqjwMCFofKGesBeeKxIkX9BO+w==
+puppeteer-core@19.4.1:
+  version "19.4.1"
+  resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.4.1.tgz#f4875943841ebdb6fc2ad7a475add958692b0237"
+  integrity sha512-JHIuqtqrUAx4jGOTxXu4ilapV2jabxtVMA/e4wwFUMvtSsqK4nVBSI+Z1SKDoz7gRy/JUIc8WzmfocCa6SIZ1w==
   dependencies:
     cross-fetch "3.1.5"
-    debug "4.3.3"
-    devtools-protocol "0.0.969999"
+    debug "4.3.4"
+    devtools-protocol "0.0.1068969"
     extract-zip "2.0.1"
-    https-proxy-agent "5.0.0"
-    pkg-dir "4.2.0"
-    progress "2.0.3"
+    https-proxy-agent "5.0.1"
     proxy-from-env "1.1.0"
     rimraf "3.0.2"
     tar-fs "2.1.1"
     unbzip2-stream "1.4.3"
-    ws "8.5.0"
+    ws "8.11.0"
+
+puppeteer@^19.4.1:
+  version "19.4.1"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.4.1.tgz#cac7d3f0084badebb8ebacbe6f4d7262e7f21818"
+  integrity sha512-PCnrR13B8A+VSEDXRmrNXRZbrkF1tfsI1hKSC7vs13eNS6CUD3Y4FA8SF8/VZy+Pm1kg5AggJT2Nu3HLAtGkFg==
+  dependencies:
+    cosmiconfig "8.0.0"
+    https-proxy-agent "5.0.1"
+    progress "2.0.3"
+    proxy-from-env "1.1.0"
+    puppeteer-core "19.4.1"
 
 q@~0.9.6:
   version "0.9.7"
@@ -10661,10 +10673,10 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-ws@8.5.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+ws@8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 ws@~7.4.2:
   version "7.4.6"

From 3aeace4ce07cdc4f12b9936ac66628dc477c4458 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 2 Jan 2023 14:56:36 -0500
Subject: [PATCH 1346/1405] Re-enable deprecations of `htmlSafe` and
 `isHTMLSafe` from `@ember/string`. They have moved to `@ember/template`.

---
 packages/@ember/string/index.ts        | 10 ++++------
 packages/ember/index.ts                | 10 ++++------
 packages/ember/tests/reexports_test.js | 12 +++++-------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 980b299f16d..d96d1604eae 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -240,16 +240,14 @@ function deprecateImportFromString(
   name: string,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
 ) {
-  // Disabling this deprecation due to unintended errors in 3.25
-  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
-  deprecate(message, true, {
+  deprecate(message, false, {
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {
-      available: '3.25',
-      enabled: '3.25',
+      available: '4.10',
+      enabled: '4.10',
     },
-    until: '4.0.0',
+    until: '5.0.0',
     url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
   });
 }
diff --git a/packages/ember/index.ts b/packages/ember/index.ts
index 479c22d4993..6403995abb5 100644
--- a/packages/ember/index.ts
+++ b/packages/ember/index.ts
@@ -637,16 +637,14 @@ const deprecateImportFromString = function (
   name: string,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
 ) {
-  // Disabling this deprecation due to unintended errors in 3.25
-  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
-  deprecate(message, true, {
+  deprecate(message, false, {
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {
-      available: '3.25',
-      enabled: '3.25',
+      available: '4.10',
+      enabled: '4.10',
     },
-    until: '4.0.0',
+    until: '5.0.0',
     url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
   });
 };
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index e60b94bca7e..a7a98b15896 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -1,8 +1,8 @@
 import Ember from '../index';
-import require from 'require';
 import { FEATURES } from '@ember/canary-features';
 import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
 import { DEBUG } from '@glimmer/env';
+import require from 'require';
 
 moduleFor(
   'ember reexports',
@@ -20,7 +20,7 @@ moduleFor(
       });
     }
 
-    ['@skip Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
+    ['@test Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
       let glimmer = require('@ember/-internals/glimmer');
       expectDeprecation(() => {
         assert.equal(
@@ -32,7 +32,7 @@ moduleFor(
       assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
     }
 
-    ['@skip Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
+    ['@test Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
       let glimmer = require('@ember/-internals/glimmer');
       expectDeprecation(() => {
         assert.equal(
@@ -260,15 +260,13 @@ let allExports = [
   ['String.classify', '@ember/string', 'classify'],
   ['String.dasherize', '@ember/string', 'dasherize'],
   ['String.decamelize', '@ember/string', 'decamelize'],
-  ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
-  ['String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe'],
   ['String.underscore', '@ember/string', 'underscore'],
   ['String.w', '@ember/string', 'w'],
   ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],
 
   // @ember/template
-  ['String.htmlSafe', '@ember/template', 'htmlSafe'],
-  ['String.isHTMLSafe', '@ember/template', 'isHTMLSafe'],
+  [null, '@ember/template', 'htmlSafe'],
+  [null, '@ember/template', 'isHTMLSafe'],
 
   // @ember/template-compilation
   ['HTMLBars.compile', '@ember/template-compilation', 'compileTemplate'],

From 045f46fb9130c87c83740a6e502a28bf628b31a8 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 3 Jan 2023 12:33:00 -0800
Subject: [PATCH 1347/1405] Deprecate @ember/error per RFC 889

---
 packages/@ember/error/index.ts                | 41 ++++++++++++++++++-
 packages/@ember/error/tests/index_test.js     | 34 ++++++++++++++-
 .../@ember/error/type-tests/index.test.ts     |  3 +-
 packages/@ember/runloop/tests/unwind_test.js  |  7 ++--
 4 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/packages/@ember/error/index.ts b/packages/@ember/error/index.ts
index 17154b1b671..cee6dede8e3 100644
--- a/packages/@ember/error/index.ts
+++ b/packages/@ember/error/index.ts
@@ -1,7 +1,17 @@
+import { deprecate } from '@ember/debug';
+import { DEBUG } from '@glimmer/env';
+
 /**
  @module @ember/error
 */
 
+/** ErrorConstructor without node extensions */
+interface BrowserErrorConstructor {
+  new (message?: string): Error;
+  (message?: string): Error;
+  readonly prototype: Error;
+}
+
 /**
   The JavaScript Error object used by Ember.assert.
 
@@ -10,5 +20,34 @@
   @extends Error
   @constructor
   @public
+  @deprecated
 */
-export default Error;
+let EmberError: BrowserErrorConstructor;
+if (DEBUG) {
+  // eslint-disable-next-line no-inner-declarations
+  function EmberDebugConstructor(message?: string) {
+    deprecate(
+      'The @ember/error package merely re-exported the native Error and is deprecated. Please use a native Error directly instead.',
+      false,
+      {
+        id: 'deprecate-ember-error',
+        until: '5.0.0',
+        url: 'https://deprecations.emberjs.com/v4.x/#toc_deprecate-ember-error',
+        for: 'ember-source',
+        since: {
+          available: '4.10.0',
+          enabled: '4.10.0',
+        },
+      }
+    );
+    return new Error(message);
+  }
+  EmberDebugConstructor.prototype = Error.prototype;
+
+  // SAFETY: We need this cast since our EmberDebugConstructor doesn't define a type for `new` even though it will work with `new`.
+  EmberError = EmberDebugConstructor as BrowserErrorConstructor;
+} else {
+  EmberError = Error;
+}
+
+export default EmberError;
diff --git a/packages/@ember/error/tests/index_test.js b/packages/@ember/error/tests/index_test.js
index 6af1a84329a..f2b37f069fe 100644
--- a/packages/@ember/error/tests/index_test.js
+++ b/packages/@ember/error/tests/index_test.js
@@ -1,4 +1,5 @@
 import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
+import EmberError from '@ember/error';
 
 moduleFor(
   'Ember Error Throwing',
@@ -6,7 +7,9 @@ moduleFor(
     ['@test new EmberError displays provided message'](assert) {
       assert.throws(
         () => {
-          throw new Error('A Message');
+          expectDeprecation(() => {
+            throw new EmberError('A Message');
+          }, 'The @ember/error package merely re-exported the native Error and is deprecated. Please use a native Error directly instead.');
         },
         function (e) {
           return e.message === 'A Message';
@@ -14,5 +17,34 @@ moduleFor(
         'the assigned message was displayed'
       );
     }
+    ['@test new EmberError is instanceof EmberError'](assert) {
+      expectDeprecation(() => {
+        assert.ok(
+          new EmberError('A Message') instanceof EmberError,
+          'new EmberError is instanceof EmberError'
+        );
+      }, 'The @ember/error package merely re-exported the native Error and is deprecated. Please use a native Error directly instead.');
+    }
+    ['@test EmberError(...) displays provided message'](assert) {
+      assert.throws(
+        () => {
+          expectDeprecation(() => {
+            throw EmberError('A Message');
+          }, 'The @ember/error package merely re-exported the native Error and is deprecated. Please use a native Error directly instead.');
+        },
+        function (e) {
+          return e.message === 'A Message';
+        },
+        'the assigned message was displayed'
+      );
+    }
+    ['@test EmberError(...) is instanceof EmberError'](assert) {
+      expectDeprecation(() => {
+        assert.ok(
+          EmberError('A Message') instanceof EmberError,
+          'new EmberError is instanceof EmberError'
+        );
+      }, 'The @ember/error package merely re-exported the native Error and is deprecated. Please use a native Error directly instead.');
+    }
   }
 );
diff --git a/packages/@ember/error/type-tests/index.test.ts b/packages/@ember/error/type-tests/index.test.ts
index a0120bdacc5..b13ea57ca98 100644
--- a/packages/@ember/error/type-tests/index.test.ts
+++ b/packages/@ember/error/type-tests/index.test.ts
@@ -1,4 +1,5 @@
 import EmberError from '@ember/error';
 import { expectTypeOf } from 'expect-type';
 
-expectTypeOf(EmberError).toEqualTypeOf<ErrorConstructor>();
+expectTypeOf(EmberError("Blah")).toEqualTypeOf<Error>();
+expectTypeOf(new EmberError("Blah")).toEqualTypeOf<Error>();
diff --git a/packages/@ember/runloop/tests/unwind_test.js b/packages/@ember/runloop/tests/unwind_test.js
index 06a7f87da42..8a01ce128d9 100644
--- a/packages/@ember/runloop/tests/unwind_test.js
+++ b/packages/@ember/runloop/tests/unwind_test.js
@@ -1,5 +1,4 @@
 import { run, schedule, _getCurrentRunLoop } from '..';
-import EmberError from '@ember/error';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
@@ -12,7 +11,7 @@ moduleFor(
         () => {
           run(() => {
             schedule('actions', function () {
-              throw new EmberError('boom!');
+              throw new Error('boom!');
             });
           });
         },
@@ -37,10 +36,10 @@ moduleFor(
       assert.throws(
         () => {
           run(function () {
-            throw new EmberError('boom!');
+            throw new Error('boom!');
           });
         },
-        EmberError,
+        Error,
         'boom!'
       );
 

From d7c1d600f7cd60268204873dc89943bbc55a2ccf Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Tue, 3 Jan 2023 15:18:46 -0800
Subject: [PATCH 1348/1405] Fix NativeArray export

---
 packages/@ember/-internals/runtime/index.ts | 1 -
 packages/ember/tests/reexports_test.js      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/@ember/-internals/runtime/index.ts b/packages/@ember/-internals/runtime/index.ts
index cab34b691ae..ec028a7a2da 100644
--- a/packages/@ember/-internals/runtime/index.ts
+++ b/packages/@ember/-internals/runtime/index.ts
@@ -1,7 +1,6 @@
 export { default as RegistryProxyMixin } from './lib/mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './lib/mixins/container_proxy';
 export { default as Comparable } from './lib/mixins/comparable';
-export { NativeArray } from '@ember/array';
 export { default as ActionHandler } from './lib/mixins/action_handler';
 export { default as _ProxyMixin, contentFor as _contentFor } from './lib/mixins/-proxy';
 export { default as MutableEnumerable } from '@ember/enumerable/mutable';
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index e60b94bca7e..f60dce0ebbd 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -73,6 +73,7 @@ let allExports = [
   // @ember/array
   ['Array', '@ember/array', 'default'],
   ['A', '@ember/array', 'A'],
+  ['NativeArray', '@ember/array', 'NativeArray'],
   ['isArray', '@ember/array', 'isArray'],
   ['makeArray', '@ember/array', 'makeArray'],
 
@@ -367,7 +368,6 @@ let allExports = [
   ['_ContainerProxyMixin', '@ember/-internals/runtime', 'ContainerProxyMixin'],
   ['Comparable', '@ember/-internals/runtime'],
   ['ActionHandler', '@ember/-internals/runtime'],
-  ['NativeArray', '@ember/-internals/runtime'],
   ['MutableEnumerable', '@ember/-internals/runtime'],
   ['_ProxyMixin', '@ember/-internals/runtime'],
 

From b341648d255b62adfe5fb31c7569f2cccfa0968e Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 4 Jan 2023 17:46:59 -0500
Subject: [PATCH 1349/1405] Deprecate @ember/string when used from
 ember-source; point users to add the `@ember/string` addon

- Duplicate a portion of @ember/string in @ember/-internals/string for
internal use by ember-source without triggering deprecations
---
 .../glimmer/lib/helpers/-normalize-class.ts   |   2 +-
 .../-internals/glimmer/lib/utils/bindings.ts  |   2 +-
 packages/@ember/-internals/string/index.ts    | 105 ++++++++++++++++++
 .../-internals/string/tests/classify_test.js  |  65 +++++++++++
 .../-internals/string/tests/dasherize_test.js |  43 +++++++
 .../@ember/debug/container-debug-adapter.ts   |   2 +-
 packages/@ember/debug/data-adapter.ts         |   2 +-
 .../@ember/object/tests/observable_test.js    |   9 +-
 packages/@ember/string/index.ts               |  32 ++++++
 packages/@ember/string/tests/camelize_test.js |   4 +-
 .../@ember/string/tests/capitalize_test.js    |   4 +-
 packages/@ember/string/tests/classify_test.js |   4 +-
 .../@ember/string/tests/dasherize_test.js     |   4 +-
 .../@ember/string/tests/decamelize_test.js    |   4 +-
 .../@ember/string/tests/underscore_test.js    |   4 +-
 packages/@ember/string/tests/w_test.js        |   4 +-
 .../ember/tests/routing/query_params_test.js  |   2 +-
 .../router_service_test/urlFor_test.js        |   5 +-
 18 files changed, 277 insertions(+), 20 deletions(-)
 create mode 100644 packages/@ember/-internals/string/index.ts
 create mode 100644 packages/@ember/-internals/string/tests/classify_test.js
 create mode 100644 packages/@ember/-internals/string/tests/dasherize_test.js

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
index 52b2989294b..5603e12c135 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/-normalize-class.ts
@@ -1,5 +1,5 @@
 import { assert } from '@ember/debug';
-import { dasherize } from '@ember/string';
+import { dasherize } from '@ember/-internals/string';
 import type { CapturedArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
 import { internalHelper } from './internal-helper';
diff --git a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
index 26069564072..aa04023b570 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/bindings.ts
@@ -1,6 +1,6 @@
 import { get } from '@ember/-internals/metal';
 import { assert } from '@ember/debug';
-import { dasherize } from '@ember/string';
+import { dasherize } from '@ember/-internals/string';
 import type { ElementOperations } from '@glimmer/interfaces';
 import type { Reference } from '@glimmer/reference';
 import {
diff --git a/packages/@ember/-internals/string/index.ts b/packages/@ember/-internals/string/index.ts
new file mode 100644
index 00000000000..e2e2591b6b4
--- /dev/null
+++ b/packages/@ember/-internals/string/index.ts
@@ -0,0 +1,105 @@
+/*
+  This module exists to separate the @ember/string methods used
+  internally in ember-source, from those public methods that are
+  now deprecated and to be removed.
+*/
+
+import { Cache } from '@ember/-internals/utils';
+
+const STRING_DASHERIZE_REGEXP = /[ _]/g;
+
+const STRING_DASHERIZE_CACHE = new Cache<string, string>(1000, (key) =>
+  decamelize(key).replace(STRING_DASHERIZE_REGEXP, '-')
+);
+
+const STRING_CLASSIFY_REGEXP_1 = /^(-|_)+(.)?/;
+const STRING_CLASSIFY_REGEXP_2 = /(.)(-|_|\.|\s)+(.)?/g;
+const STRING_CLASSIFY_REGEXP_3 = /(^|\/|\.)([a-z])/g;
+
+const CLASSIFY_CACHE = new Cache<string, string>(1000, (str) => {
+  let replace1 = (_match: string, _separator: string, chr: string) =>
+    chr ? `_${chr.toUpperCase()}` : '';
+  let replace2 = (_match: string, initialChar: string, _separator: string, chr: string) =>
+    initialChar + (chr ? chr.toUpperCase() : '');
+  let parts = str.split('/');
+  for (let i = 0; i < parts.length; i++) {
+    parts[i] = parts[i]!.replace(STRING_CLASSIFY_REGEXP_1, replace1).replace(
+      STRING_CLASSIFY_REGEXP_2,
+      replace2
+    );
+  }
+  return parts
+    .join('/')
+    .replace(STRING_CLASSIFY_REGEXP_3, (match /*, separator, chr */) => match.toUpperCase());
+});
+
+const STRING_DECAMELIZE_REGEXP = /([a-z\d])([A-Z])/g;
+
+const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
+  str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase()
+);
+
+/**
+ Defines string helper methods used internally in ember-source.
+
+ @class String
+ @private
+ */
+
+/**
+ Replaces underscores, spaces, or camelCase with dashes.
+
+ ```javascript
+ import { dasherize } from '@ember/-internals/string';
+
+ dasherize('innerHTML');                // 'inner-html'
+ dasherize('action_name');              // 'action-name'
+ dasherize('css-class-name');           // 'css-class-name'
+ dasherize('my favorite items');        // 'my-favorite-items'
+ dasherize('privateDocs/ownerInvoice';  // 'private-docs/owner-invoice'
+ ```
+
+ @method dasherize
+ @param {String} str The string to dasherize.
+ @return {String} the dasherized string.
+ @private
+ */
+export function dasherize(str: string): string {
+  return STRING_DASHERIZE_CACHE.get(str);
+}
+
+/**
+ Returns the UpperCamelCase form of a string.
+
+ ```javascript
+ import { classify } from '@ember/string';
+
+ classify('innerHTML');                   // 'InnerHTML'
+ classify('action_name');                 // 'ActionName'
+ classify('css-class-name');              // 'CssClassName'
+ classify('my favorite items');           // 'MyFavoriteItems'
+ classify('private-docs/owner-invoice');  // 'PrivateDocs/OwnerInvoice'
+ ```
+
+ @method classify
+ @param {String} str the string to classify
+ @return {String} the classified string
+ @private
+ */
+export function classify(str: string): string {
+  return CLASSIFY_CACHE.get(str);
+}
+
+/**
+ Converts a camelized string into all lower case separated by underscores.
+
+ ```javascript
+ decamelize('innerHTML');          // 'inner_html'
+ decamelize('action_name');        // 'action_name'
+ decamelize('css-class-name');     // 'css-class-name'
+ decamelize('my favorite items');  // 'my favorite items'
+ ```
+ */
+function decamelize(str: string): string {
+  return DECAMELIZE_CACHE.get(str);
+}
diff --git a/packages/@ember/-internals/string/tests/classify_test.js b/packages/@ember/-internals/string/tests/classify_test.js
new file mode 100644
index 00000000000..a167dbfcbcb
--- /dev/null
+++ b/packages/@ember/-internals/string/tests/classify_test.js
@@ -0,0 +1,65 @@
+/* eslint-disable qunit/no-test-expect-argument */
+import { classify } from '@ember/-internals/string';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+function test(assert, given, expected, description) {
+  assert.deepEqual(classify(given), expected, description);
+}
+
+moduleFor(
+  'EmberInternalsString.classify',
+  class extends AbstractTestCase {
+    ['@test String classify tests'](assert) {
+      test(assert, 'my favorite items', 'MyFavoriteItems', 'classify normal string');
+      test(assert, 'css-class-name', 'CssClassName', 'classify dasherized string');
+      test(assert, 'action_name', 'ActionName', 'classify underscored string');
+      test(
+        assert,
+        'privateDocs/ownerInvoice',
+        'PrivateDocs/OwnerInvoice',
+        'classify namespaced camelized string'
+      );
+      test(
+        assert,
+        'private_docs/owner_invoice',
+        'PrivateDocs/OwnerInvoice',
+        'classify namespaced underscored string'
+      );
+      test(
+        assert,
+        'private-docs/owner-invoice',
+        'PrivateDocs/OwnerInvoice',
+        'classify namespaced dasherized string'
+      );
+      test(assert, '-view-registry', '_ViewRegistry', 'classify prefixed dasherized string');
+      test(
+        assert,
+        'components/-text-field',
+        'Components/_TextField',
+        'classify namespaced prefixed dasherized string'
+      );
+      test(assert, '_Foo_Bar', '_FooBar', 'classify underscore-prefixed underscored string');
+      test(assert, '_Foo-Bar', '_FooBar', 'classify underscore-prefixed dasherized string');
+      test(
+        assert,
+        '_foo/_bar',
+        '_Foo/_Bar',
+        'classify underscore-prefixed-namespaced underscore-prefixed string'
+      );
+      test(
+        assert,
+        '-foo/_bar',
+        '_Foo/_Bar',
+        'classify dash-prefixed-namespaced underscore-prefixed string'
+      );
+      test(
+        assert,
+        '-foo/-bar',
+        '_Foo/_Bar',
+        'classify dash-prefixed-namespaced dash-prefixed string'
+      );
+      test(assert, 'InnerHTML', 'InnerHTML', 'does nothing with classified string');
+      test(assert, '_FooBar', '_FooBar', 'does nothing with classified prefixed string');
+    }
+  }
+);
diff --git a/packages/@ember/-internals/string/tests/dasherize_test.js b/packages/@ember/-internals/string/tests/dasherize_test.js
new file mode 100644
index 00000000000..090cb1b429d
--- /dev/null
+++ b/packages/@ember/-internals/string/tests/dasherize_test.js
@@ -0,0 +1,43 @@
+/* eslint-disable qunit/no-test-expect-argument */
+import { dasherize } from '@ember/-internals/string';
+import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
+
+function test(assert, given, expected, description) {
+  assert.deepEqual(dasherize(given), expected, description);
+}
+
+moduleFor(
+  'EmberInternalsString.dasherize',
+  class extends AbstractTestCase {
+    ['@test String dasherize tests'](assert) {
+      test(assert, 'my favorite items', 'my-favorite-items', 'dasherize normal string');
+      test(assert, 'css-class-name', 'css-class-name', 'does nothing with dasherized string');
+      test(assert, 'action_name', 'action-name', 'dasherize underscored string');
+      test(assert, 'innerHTML', 'inner-html', 'dasherize camelcased string');
+      test(
+        assert,
+        'toString',
+        'to-string',
+        'dasherize string that is the property name of Object.prototype'
+      );
+      test(
+        assert,
+        'PrivateDocs/OwnerInvoice',
+        'private-docs/owner-invoice',
+        'dasherize namespaced classified string'
+      );
+      test(
+        assert,
+        'privateDocs/ownerInvoice',
+        'private-docs/owner-invoice',
+        'dasherize namespaced camelized string'
+      );
+      test(
+        assert,
+        'private_docs/owner_invoice',
+        'private-docs/owner-invoice',
+        'dasherize namespaced underscored string'
+      );
+    }
+  }
+);
diff --git a/packages/@ember/debug/container-debug-adapter.ts b/packages/@ember/debug/container-debug-adapter.ts
index 88e0b08c819..e62fcb0ed7b 100644
--- a/packages/@ember/debug/container-debug-adapter.ts
+++ b/packages/@ember/debug/container-debug-adapter.ts
@@ -1,4 +1,4 @@
-import { classify, dasherize } from '@ember/string';
+import { classify, dasherize } from '@ember/-internals/string';
 import EmberObject from '@ember/object';
 import { typeOf } from '@ember/utils';
 import type Owner from '@ember/owner';
diff --git a/packages/@ember/debug/data-adapter.ts b/packages/@ember/debug/data-adapter.ts
index 48a48d5d3a8..c8d4af0a1f9 100644
--- a/packages/@ember/debug/data-adapter.ts
+++ b/packages/@ember/debug/data-adapter.ts
@@ -2,7 +2,7 @@ import type Owner from '@ember/owner';
 import { getOwner } from '@ember/-internals/owner';
 import { _backburner, next } from '@ember/runloop';
 import { get } from '@ember/object';
-import { dasherize } from '@ember/string';
+import { dasherize } from '@ember/-internals/string';
 import Namespace from '@ember/application/namespace';
 import type { NativeArray } from '@ember/array';
 import EmberObject from '@ember/object';
diff --git a/packages/@ember/object/tests/observable_test.js b/packages/@ember/object/tests/observable_test.js
index a000ec06e9e..c23f55dd650 100644
--- a/packages/@ember/object/tests/observable_test.js
+++ b/packages/@ember/object/tests/observable_test.js
@@ -1,7 +1,6 @@
 import { context } from '@ember/-internals/environment';
 import { run } from '@ember/runloop';
 import { get, computed } from '@ember/object';
-import { w } from '@ember/string';
 import EmberObject, { observer } from '@ember/object';
 import Observable from '@ember/object/observable';
 import { A as emberA } from '@ember/array';
@@ -359,7 +358,7 @@ moduleFor(
 
     ['@test getting values should call function return value'](assert) {
       // get each property twice. Verify return.
-      let keys = w('computed dependent');
+      let keys = ['computed', 'dependent'];
 
       keys.forEach(function (key) {
         assert.equal(object.get(key), key, `Try #1: object.get(${key}) should run function`);
@@ -367,15 +366,15 @@ moduleFor(
       });
 
       // verify each call count. cached should only be called once
-      w('computedCalls dependentCalls').forEach((key) => {
+      ['computedCalls', 'dependentCalls'].forEach((key) => {
         assert.equal(object[key].length, 1, `non-cached property ${key} should be called 1x`);
       });
     }
 
     ['@test setting values should call function return value'](assert) {
       // get each property twice. Verify return.
-      let keys = w('computed dependent');
-      let values = w('value1 value2');
+      let keys = ['computed', 'dependent'];
+      let values = ['value1', 'value2'];
 
       keys.forEach((key) => {
         assert.equal(
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index d96d1604eae..7f845c66a95 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -76,6 +76,7 @@ const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
 
   @class String
   @public
+  @deprecated Add the package `@ember/string` to your project to use in place of this module.
 */
 
 /**
@@ -98,8 +99,10 @@ const DECAMELIZE_CACHE = new Cache<string, string>(1000, (str) =>
   @param {String} str The string to split
   @return {Array} array containing the split strings
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function w(str: string): string[] {
+  deprecateImportFromInternalString();
   return str.split(/\s+/);
 }
 
@@ -119,8 +122,10 @@ export function w(str: string): string[] {
   @param {String} str The string to decamelize.
   @return {String} the decamelized string.
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function decamelize(str: string): string {
+  deprecateImportFromInternalString();
   return DECAMELIZE_CACHE.get(str);
 }
 
@@ -141,8 +146,10 @@ export function decamelize(str: string): string {
   @param {String} str The string to dasherize.
   @return {String} the dasherized string.
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function dasherize(str: string): string {
+  deprecateImportFromInternalString();
   return STRING_DASHERIZE_CACHE.get(str);
 }
 
@@ -164,8 +171,10 @@ export function dasherize(str: string): string {
   @param {String} str The string to camelize.
   @return {String} the camelized string.
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function camelize(str: string): string {
+  deprecateImportFromInternalString();
   return CAMELIZE_CACHE.get(str);
 }
 
@@ -186,8 +195,10 @@ export function camelize(str: string): string {
   @param {String} str the string to classify
   @return {String} the classified string
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function classify(str: string): string {
+  deprecateImportFromInternalString();
   return CLASSIFY_CACHE.get(str);
 }
 
@@ -209,8 +220,10 @@ export function classify(str: string): string {
   @param {String} str The string to underscore.
   @return {String} the underscored string.
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function underscore(str: string): string {
+  deprecateImportFromInternalString();
   return UNDERSCORE_CACHE.get(str);
 }
 
@@ -231,11 +244,30 @@ export function underscore(str: string): string {
   @param {String} str The string to capitalize.
   @return {String} The capitalized string.
   @public
+  @deprecated Add `@ember/string` to your package.json
 */
 export function capitalize(str: string): string {
+  deprecateImportFromInternalString();
   return CAPITALIZE_CACHE.get(str);
 }
 
+function deprecateImportFromInternalString() {
+  deprecate(
+    'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json',
+    false,
+    {
+      id: 'ember-string.add-package',
+      for: 'ember-source',
+      since: {
+        available: '4.10',
+        enabled: '4.10',
+      },
+      until: '5.0.0',
+      url: 'https://deprecations.emberjs.com/v4.x/#toc_ember-string-add-package',
+    }
+  );
+}
+
 function deprecateImportFromString(
   name: string,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
diff --git a/packages/@ember/string/tests/camelize_test.js b/packages/@ember/string/tests/camelize_test.js
index 1cb053fa798..c579be15ead 100644
--- a/packages/@ember/string/tests/camelize_test.js
+++ b/packages/@ember/string/tests/camelize_test.js
@@ -3,7 +3,9 @@ import { camelize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(camelize(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(camelize(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/@ember/string/tests/capitalize_test.js b/packages/@ember/string/tests/capitalize_test.js
index 7b11679722a..4fc1e757bc4 100644
--- a/packages/@ember/string/tests/capitalize_test.js
+++ b/packages/@ember/string/tests/capitalize_test.js
@@ -3,7 +3,9 @@ import { capitalize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(capitalize(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(capitalize(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/@ember/string/tests/classify_test.js b/packages/@ember/string/tests/classify_test.js
index 5232ccbf8c5..13dca64b245 100644
--- a/packages/@ember/string/tests/classify_test.js
+++ b/packages/@ember/string/tests/classify_test.js
@@ -3,7 +3,9 @@ import { classify } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(classify(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(classify(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/@ember/string/tests/dasherize_test.js b/packages/@ember/string/tests/dasherize_test.js
index 9f41db6957b..98fb5a5dcf1 100644
--- a/packages/@ember/string/tests/dasherize_test.js
+++ b/packages/@ember/string/tests/dasherize_test.js
@@ -3,7 +3,9 @@ import { dasherize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(dasherize(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(dasherize(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/@ember/string/tests/decamelize_test.js b/packages/@ember/string/tests/decamelize_test.js
index f37af0c66a2..d5620398cd1 100644
--- a/packages/@ember/string/tests/decamelize_test.js
+++ b/packages/@ember/string/tests/decamelize_test.js
@@ -3,7 +3,9 @@ import { decamelize } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(decamelize(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(decamelize(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/@ember/string/tests/underscore_test.js b/packages/@ember/string/tests/underscore_test.js
index 69a1b83b33b..11ea62ab652 100644
--- a/packages/@ember/string/tests/underscore_test.js
+++ b/packages/@ember/string/tests/underscore_test.js
@@ -3,7 +3,9 @@ import { underscore } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(underscore(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(underscore(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/@ember/string/tests/w_test.js b/packages/@ember/string/tests/w_test.js
index e9fada90f2a..ae5dc9912bd 100644
--- a/packages/@ember/string/tests/w_test.js
+++ b/packages/@ember/string/tests/w_test.js
@@ -3,7 +3,9 @@ import { w } from '@ember/string';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function test(assert, given, expected, description) {
-  assert.deepEqual(w(given), expected, description);
+  expectDeprecation(() => {
+    assert.deepEqual(w(given), expected, description);
+  }, 'Importing from `@ember/string` without having the `@ember/string` package in your project is deprecated. Please add `@ember/string` to your `package.json');
 }
 
 moduleFor(
diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
index 618e4a4b6e4..3d213fcac5e 100644
--- a/packages/ember/tests/routing/query_params_test.js
+++ b/packages/ember/tests/routing/query_params_test.js
@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import { dasherize } from '@ember/string';
+import { dasherize } from '@ember/-internals/string';
 import EmberObject, { get, computed } from '@ember/object';
 import { RSVP } from '@ember/-internals/runtime';
 import { A as emberA } from '@ember/array';
diff --git a/packages/ember/tests/routing/router_service_test/urlFor_test.js b/packages/ember/tests/routing/router_service_test/urlFor_test.js
index 8b091812e58..486709c2c5b 100644
--- a/packages/ember/tests/routing/router_service_test/urlFor_test.js
+++ b/packages/ember/tests/routing/router_service_test/urlFor_test.js
@@ -1,11 +1,10 @@
 import Controller from '@ember/controller';
-import { capitalize } from '@ember/string';
 import Route from '@ember/routing/route';
 import { get } from '@ember/object';
 import { RouterTestCase, moduleFor } from 'internal-test-helpers';
 
 function setupController(app, name) {
-  let controllerName = `${capitalize(name)}Controller`;
+  let controllerName = `${name}Controller`;
 
   Object.defineProperty(app, controllerName, {
     get() {
@@ -30,7 +29,7 @@ moduleFor(
     ['@test RouterService#urlFor returns URL for simple route with dynamic segments'](assert) {
       assert.expect(1);
 
-      setupController(this.application, 'dynamic');
+      setupController(this.application, 'Dynamic');
 
       let dynamicModel = { id: 1, contents: 'much dynamicism' };
 

From 0175865af03fdc48298816469914f26ac0641c9a Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 5 Jan 2023 14:05:32 -0500
Subject: [PATCH 1350/1405] Deprecate accessing @ember/string methods off of
 the Ember module

---
 packages/ember/index.ts                | 61 +++++++++++++-------------
 packages/ember/tests/reexports_test.js | 34 ++++++++++----
 2 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/packages/ember/index.ts b/packages/ember/index.ts
index 6403995abb5..16f9e3aeb1e 100644
--- a/packages/ember/index.ts
+++ b/packages/ember/index.ts
@@ -633,39 +633,40 @@ Object.defineProperty(Ember, 'TEMPLATES', {
   enumerable: false,
 });
 
-const deprecateImportFromString = function (
-  name: string,
-  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
-) {
-  deprecate(message, false, {
-    id: 'ember-string.htmlsafe-ishtmlsafe',
-    for: 'ember-source',
-    since: {
-      available: '4.10',
-      enabled: '4.10',
-    },
-    until: '5.0.0',
-    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
-  });
-};
-// NOTE: these are expressly *not* in the public API, because they were
-// deprecated and removed. TODO: remove them after we land the TS conversion,
-// and after confirming doing so is safe -- the state of the `@ember/string`
-// conversion remains confused.
-Object.defineProperty(Ember.String, 'htmlSafe', {
-  enumerable: true,
-  configurable: true,
-  get() {
-    deprecateImportFromString('htmlSafe');
-    return htmlSafe;
-  },
-});
-Object.defineProperty(Ember.String, 'isHTMLSafe', {
+function deprecateStringUseOnEmberModule() {
+  deprecate(
+    'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.',
+    false,
+    {
+      id: 'ember-string.from-ember-module',
+      for: 'ember-source',
+      since: {
+        available: '4.10',
+        enabled: '4.10.',
+      },
+      until: '5.0.0',
+      url: 'https://deprecations.emberjs.com/v4.x/#toc_ember-string-from-ember-module',
+    }
+  );
+}
+
+Object.defineProperty(Ember, 'String', {
   enumerable: true,
   configurable: true,
   get() {
-    deprecateImportFromString('isHTMLSafe');
-    return isHTMLSafe;
+    deprecateStringUseOnEmberModule();
+
+    return {
+      camelize,
+      capitalize,
+      classify,
+      dasherize,
+      decamelize,
+      underscore,
+      w,
+      htmlSafe,
+      isHTMLSafe,
+    };
   },
 });
 
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index a7a98b15896..f9ebbb92a51 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -28,7 +28,7 @@ moduleFor(
           glimmer.htmlSafe,
           'Ember.String.htmlSafe is exported correctly'
         );
-      }, /Importing htmlSafe from '@ember\/string' is deprecated/);
+      }, 'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.');
       assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
     }
 
@@ -40,10 +40,33 @@ moduleFor(
           glimmer.isHTMLSafe,
           'Ember.String.isHTMLSafe is exported correctly'
         );
-      }, /Importing isHTMLSafe from '@ember\/string' is deprecated/);
+      }, 'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.');
       assert.notEqual(glimmer.isHTMLSafe, undefined, 'Ember.String.isHTMLSafe is not `undefined`');
     }
 
+    ['@test Ember.String methods export correctly (but deprecated)'](assert) {
+      let string = require('@ember/string');
+      let methods = [
+        'camelize',
+        'capitalize',
+        'classify',
+        'dasherize',
+        'decamelize',
+        'underscore',
+        'w',
+      ];
+      methods.forEach((method) => {
+        expectDeprecation(() => {
+          assert.equal(
+            Ember.String[method],
+            string[method],
+            `Ember.String.${method} is exported correctly`
+          );
+        }, 'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.');
+        assert.notEqual(string[method], undefined, `Ember.String.${method} is not \`undefined\``);
+      });
+    }
+
     '@test Ember.FEATURES is exported'(assert) {
       for (let feature in FEATURES) {
         assert.equal(
@@ -255,13 +278,6 @@ let allExports = [
   ['inject.service', '@ember/service', 'service'],
 
   // @ember/string
-  ['String.camelize', '@ember/string', 'camelize'],
-  ['String.capitalize', '@ember/string', 'capitalize'],
-  ['String.classify', '@ember/string', 'classify'],
-  ['String.dasherize', '@ember/string', 'dasherize'],
-  ['String.decamelize', '@ember/string', 'decamelize'],
-  ['String.underscore', '@ember/string', 'underscore'],
-  ['String.w', '@ember/string', 'w'],
   ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],
 
   // @ember/template

From e6a9f628d1396e92549dbdd13fb69d41c950d7d4 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 5 Jan 2023 14:41:06 -0500
Subject: [PATCH 1351/1405] Deprecate Ember.STRINGS

- Remove `getString` from string_registry, it was unused internally and
  not exposed publicly.
---
 packages/@ember/string/lib/string_registry.ts | 16 ++++++++++++++--
 packages/ember/tests/reexports_test.js        | 10 ++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/@ember/string/lib/string_registry.ts b/packages/@ember/string/lib/string_registry.ts
index 344d32f6224..114226a49ab 100644
--- a/packages/@ember/string/lib/string_registry.ts
+++ b/packages/@ember/string/lib/string_registry.ts
@@ -1,16 +1,28 @@
+import { deprecate } from '@ember/debug';
+
 // STATE within a module is frowned upon, this exists
 // to support Ember.STRINGS but shield ember internals from this legacy global
 // API.
 let STRINGS: { [key: string]: string } = {};
 
 export function setStrings(strings: { [key: string]: string }) {
+  deprecateEmberStrings();
   STRINGS = strings;
 }
 
 export function getStrings(): { [key: string]: string } {
+  deprecateEmberStrings();
   return STRINGS;
 }
 
-export function getString(name: string): string | undefined {
-  return STRINGS[name];
+function deprecateEmberStrings() {
+  deprecate('Ember.STRINGS is deprecated. It is no longer used by Ember.', false, {
+    id: 'ember-strings',
+    for: 'ember-source',
+    since: {
+      available: '4.10',
+      enabled: '4.10.',
+    },
+    until: '5.0.0',
+  });
 }
diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index f9ebbb92a51..95a844c6a9d 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -67,6 +67,16 @@ moduleFor(
       });
     }
 
+    ['@test Ember.STRINGS is deprecated'](assert) {
+      expectDeprecation(() => {
+        assert.ok(Ember.STRINGS);
+      }, 'Ember.STRINGS is deprecated. It is no longer used by Ember.');
+
+      expectDeprecation(() => {
+        Ember.STRINGS = {};
+      }, 'Ember.STRINGS is deprecated. It is no longer used by Ember.');
+    }
+
     '@test Ember.FEATURES is exported'(assert) {
       for (let feature in FEATURES) {
         assert.equal(

From 6ed9a27da42b5f5f348dfd73ff7d21cd17940509 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 6 Jan 2023 12:14:39 -0800
Subject: [PATCH 1352/1405] Remove EMBER_UNIQUE_ID_HELPER flag

---
 FEATURES.md                                   |   5 -
 .../@ember/-internals/glimmer/lib/resolver.ts |   6 +-
 .../integration/helpers/unique-id-test.js     | 259 +++++++++---------
 packages/@ember/canary-features/index.ts      |   2 -
 4 files changed, 129 insertions(+), 143 deletions(-)

diff --git a/FEATURES.md b/FEATURES.md
index 5c66163be76..3d727440528 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -9,8 +9,3 @@ for a detailed explanation.
 
   Provides a default manager for unrecognized helpers as specified in
   [RFC-756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
-
-* `EMBER_UNIQUE_ID_HELPER`
-
-  Provides a `{{unique-id}} helper as specified in
-  [RFC-659](https://github.com/emberjs/rfcs/blob/master/text/0659-unique-id-helper.md).
diff --git a/packages/@ember/-internals/glimmer/lib/resolver.ts b/packages/@ember/-internals/glimmer/lib/resolver.ts
index 71050cdfe90..4f0cb7c8b7f 100644
--- a/packages/@ember/-internals/glimmer/lib/resolver.ts
+++ b/packages/@ember/-internals/glimmer/lib/resolver.ts
@@ -2,7 +2,6 @@ import { privatize as P } from '@ember/-internals/container';
 import { ENV } from '@ember/-internals/environment';
 import type { InternalFactory, InternalOwner, RegisterOptions } from '@ember/-internals/owner';
 import { isFactory } from '@ember/-internals/owner';
-import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
 import { assert } from '@ember/debug';
 import { _instrumentStart } from '@ember/instrumentation';
 import { DEBUG } from '@glimmer/env';
@@ -132,6 +131,7 @@ const BUILTIN_HELPERS: Record<string, object> = {
   fn,
   get,
   hash,
+  'unique-id': uniqueId,
 };
 
 if (DEBUG) {
@@ -148,10 +148,6 @@ if (DEBUG) {
   BUILTIN_HELPERS['-disallow-dynamic-resolution'] = disallowDynamicResolution;
 }
 
-if (EMBER_UNIQUE_ID_HELPER) {
-  BUILTIN_HELPERS['unique-id'] = uniqueId;
-}
-
 const BUILTIN_KEYWORD_MODIFIERS: Record<string, ModifierDefinitionState> = {
   action: actionModifier,
 };
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
index 65fe72f9347..bd456593157 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/unique-id-test.js
@@ -1,13 +1,35 @@
 import { RenderingTestCase, strip, moduleFor, runTask } from 'internal-test-helpers';
 import { setProperties } from '@ember/object';
-import { EMBER_UNIQUE_ID_HELPER } from '@ember/canary-features';
-
-if (EMBER_UNIQUE_ID_HELPER) {
-  moduleFor(
-    'Helpers test: {{unique-id}}',
-    class extends RenderingTestCase {
-      ['@test it generates a unique id (string) each time']() {
-        let { first, second } = this.render(`<p>{{unique-id}}</p><p>{{unique-id}}</p>`, () => {
+
+moduleFor(
+  'Helpers test: {{unique-id}}',
+  class extends RenderingTestCase {
+    ['@test it generates a unique id (string) each time']() {
+      let { first, second } = this.render(`<p>{{unique-id}}</p><p>{{unique-id}}</p>`, () => {
+        let first = this.asElement(this.firstChild);
+        let second = this.asElement(this.nthChild(1));
+
+        return {
+          first: this.asTextContent(first.firstChild),
+          second: this.asTextContent(second.firstChild),
+        };
+      });
+
+      this.assert.notStrictEqual(
+        first,
+        second,
+        `different invocations of {{unique-id}} should produce different values`
+      );
+    }
+
+    [`@test when unique-id is used with #let, it remains stable when it's used`]() {
+      let { first, second } = this.render(
+        strip`
+        {{#let (unique-id) as |id|}}
+          <p>{{id}}</p><p>{{id}}</p>
+        {{/let}}
+      `,
+        () => {
           let first = this.asElement(this.firstChild);
           let second = this.asElement(this.nthChild(1));
 
@@ -15,151 +37,126 @@ if (EMBER_UNIQUE_ID_HELPER) {
             first: this.asTextContent(first.firstChild),
             second: this.asTextContent(second.firstChild),
           };
-        });
-
-        this.assert.notStrictEqual(
-          first,
-          second,
-          `different invocations of {{unique-id}} should produce different values`
-        );
-      }
-
-      [`@test when unique-id is used with #let, it remains stable when it's used`]() {
-        let { first, second } = this.render(
-          strip`
-          {{#let (unique-id) as |id|}}
-            <p>{{id}}</p><p>{{id}}</p>
-          {{/let}}
-        `,
-          () => {
-            let first = this.asElement(this.firstChild);
-            let second = this.asElement(this.nthChild(1));
-
-            return {
-              first: this.asTextContent(first.firstChild),
-              second: this.asTextContent(second.firstChild),
-            };
-          }
-        );
+        }
+      );
 
-        this.assert.strictEqual(
-          first,
-          second,
-          `when unique-id is used as a variable, it remains the same`
-        );
-      }
+      this.assert.strictEqual(
+        first,
+        second,
+        `when unique-id is used as a variable, it remains the same`
+      );
+    }
 
-      [`@test unique-id doesn't change if it's concatenated with a value that does change`]() {
-        class Elements {
-          constructor(label, input, assert) {
-            this.label = label;
-            this.input = input;
-            this.assert = assert;
-          }
+    [`@test unique-id doesn't change if it's concatenated with a value that does change`]() {
+      class Elements {
+        constructor(label, input, assert) {
+          this.label = label;
+          this.input = input;
+          this.assert = assert;
+        }
 
-          id(regex) {
-            let forAttr = this.label.getAttribute('for');
+        id(regex) {
+          let forAttr = this.label.getAttribute('for');
 
-            this.assert.strictEqual(
-              forAttr,
-              this.input.getAttribute('id'),
-              `the label's 'for' attribute should be the same as the input's 'id' attribute`
-            );
+          this.assert.strictEqual(
+            forAttr,
+            this.input.getAttribute('id'),
+            `the label's 'for' attribute should be the same as the input's 'id' attribute`
+          );
 
-            let match = forAttr.match(regex);
+          let match = forAttr.match(regex);
 
-            this.assert.ok(match, 'the id starts with the prefix');
+          this.assert.ok(match, 'the id starts with the prefix');
 
-            return match[1];
-          }
+          return match[1];
         }
+      }
 
-        let { elements, id } = this.render(
-          strip`
-            {{#let (unique-id) as |id|}}
-              <label for="{{this.prefix}}-{{id}}">Enable Feature</label>
-              <input id="{{this.prefix}}-{{id}}" type="checkbox">
-            {{/let}}`,
-          { prefix: 'app' },
-          () => {
-            let label = this.asElement(this.firstChild, 'label');
-            let input = this.asElement(this.nthChild(1), 'input');
-
-            let elements = new Elements(label, input, this.assert);
-
-            return { elements, id: elements.id(/^app-(.*)$/) };
-          }
-        );
+      let { elements, id } = this.render(
+        strip`
+          {{#let (unique-id) as |id|}}
+            <label for="{{this.prefix}}-{{id}}">Enable Feature</label>
+            <input id="{{this.prefix}}-{{id}}" type="checkbox">
+          {{/let}}`,
+        { prefix: 'app' },
+        () => {
+          let label = this.asElement(this.firstChild, 'label');
+          let input = this.asElement(this.nthChild(1), 'input');
 
-        this.update({ prefix: 'melanie' }, () => {
-          let newId = elements.id(/^melanie-(.*)$/);
+          let elements = new Elements(label, input, this.assert);
 
-          this.assert.strictEqual(
-            id,
-            newId,
-            `the unique-id part of a concatenated attribute shouldn't change just because a dynamic part of it changed`
-          );
-        });
-      }
+          return { elements, id: elements.id(/^app-(.*)$/) };
+        }
+      );
 
-      ['@test it only generates valid selectors']() {
-        let iterations = 1000;
-        let reNumericStart = /^\d/;
+      this.update({ prefix: 'melanie' }, () => {
+        let newId = elements.id(/^melanie-(.*)$/);
 
-        let template = '<p>{{unique-id}}</p>'.repeat(iterations);
-        super.render(template);
+        this.assert.strictEqual(
+          id,
+          newId,
+          `the unique-id part of a concatenated attribute shouldn't change just because a dynamic part of it changed`
+        );
+      });
+    }
 
-        for (let i = 0; i < iterations; i++) {
-          let textNode = this.nthChild(i).firstChild;
-          let text = textNode.data;
+    ['@test it only generates valid selectors']() {
+      let iterations = 1000;
+      let reNumericStart = /^\d/;
 
-          this.assert.false(
-            reNumericStart.test(text),
-            `{{unique-id}} should produce valid selectors` + text
-          );
-        }
-      }
+      let template = '<p>{{unique-id}}</p>'.repeat(iterations);
+      super.render(template);
 
-      render(template, ...rest) {
-        // If there are three parameters to `render`, the second parameter is the
-        // template's arguments.
-        let args = rest.length === 2 ? rest[0] : {};
-        // If there are two parameters to `render`, the second parameter is the
-        // postcondition. Otherwise, the third parameter is the postcondition.
-        let postcondition = rest.length === 2 ? rest[1] : rest[0];
-
-        super.render(template, args);
-        let result = postcondition();
-        this.assertStableRerender();
-        return result;
-      }
+      for (let i = 0; i < iterations; i++) {
+        let textNode = this.nthChild(i).firstChild;
+        let text = textNode.data;
 
-      update(args, postcondition) {
-        runTask(() => setProperties(this.context, args));
-        postcondition();
-        this.assertStableRerender();
+        this.assert.false(
+          reNumericStart.test(text),
+          `{{unique-id}} should produce valid selectors` + text
+        );
       }
+    }
 
-      asElement(node, tag) {
-        this.assert.ok(node !== null && node.nodeType === 1);
+    render(template, ...rest) {
+      // If there are three parameters to `render`, the second parameter is the
+      // template's arguments.
+      let args = rest.length === 2 ? rest[0] : {};
+      // If there are two parameters to `render`, the second parameter is the
+      // postcondition. Otherwise, the third parameter is the postcondition.
+      let postcondition = rest.length === 2 ? rest[1] : rest[0];
+
+      super.render(template, args);
+      let result = postcondition();
+      this.assertStableRerender();
+      return result;
+    }
 
-        if (tag) {
-          this.assert.strictEqual(node.tagName.toLowerCase(), tag, `Element is <${tag}>`);
-        }
+    update(args, postcondition) {
+      runTask(() => setProperties(this.context, args));
+      postcondition();
+      this.assertStableRerender();
+    }
 
-        return node;
-      }
+    asElement(node, tag) {
+      this.assert.ok(node !== null && node.nodeType === 1);
 
-      asTextNode(node) {
-        this.assert.ok(node !== null && node.nodeType === 3);
-        return node;
+      if (tag) {
+        this.assert.strictEqual(node.tagName.toLowerCase(), tag, `Element is <${tag}>`);
       }
 
-      asTextContent(node) {
-        let data = this.asTextNode(node).data;
-        this.assert.ok(data.trim().length > 0, `The text node has content`);
-        return data;
-      }
+      return node;
+    }
+
+    asTextNode(node) {
+      this.assert.ok(node !== null && node.nodeType === 3);
+      return node;
+    }
+
+    asTextContent(node) {
+      let data = this.asTextNode(node).data;
+      this.assert.ok(data.trim().length > 0, `The text node has content`);
+      return data;
     }
-  );
-}
+  }
+);
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 2ae2599d8c5..f5cde50ff17 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -12,7 +12,6 @@ import { ENV } from '@ember/-internals/environment';
 */
 
 export const DEFAULT_FEATURES = {
-  EMBER_UNIQUE_ID_HELPER: true,
   EMBER_DEFAULT_HELPER_MANAGER: true,
 };
 
@@ -62,5 +61,4 @@ function featureValue(value: null | boolean) {
   return value;
 }
 
-export const EMBER_UNIQUE_ID_HELPER = featureValue(FEATURES.EMBER_UNIQUE_ID_HELPER);
 export const EMBER_DEFAULT_HELPER_MANAGER = featureValue(FEATURES.EMBER_DEFAULT_HELPER_MANAGER);

From 5bcc5f99699917a8b89d0a34f601c886029768e6 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 6 Jan 2023 12:18:46 -0800
Subject: [PATCH 1353/1405] Remove EMBER_DEFAULT_HELPER_MANAGER flag

---
 FEATURES.md                                   |  7 +++---
 .../-internals/glimmer/lib/environment.ts     |  3 +--
 .../helpers/default-helper-manager-test.js    | 22 ++++++++-----------
 .../integration/helpers/invoke-helper-test.js | 12 ----------
 packages/@ember/canary-features/index.ts      |  4 ++--
 5 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/FEATURES.md b/FEATURES.md
index 3d727440528..625ea6e2872 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -5,7 +5,8 @@ for a detailed explanation.
 
 ## Feature Flags
 
-* `EMBER_DEFAULT_HELPER_MANAGER`
+<!--
+* `FLAG_NAME_HERE`
 
-  Provides a default manager for unrecognized helpers as specified in
-  [RFC-756](https://github.com/emberjs/rfcs/blob/master/text/0756-helper-default-manager.md).
+  Flag description here.
+-->
diff --git a/packages/@ember/-internals/glimmer/lib/environment.ts b/packages/@ember/-internals/glimmer/lib/environment.ts
index d1831d16ec6..90c2f27ca88 100644
--- a/packages/@ember/-internals/glimmer/lib/environment.ts
+++ b/packages/@ember/-internals/glimmer/lib/environment.ts
@@ -3,7 +3,6 @@ import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
 import type { InternalOwner } from '@ember/-internals/owner';
 import { getDebugName } from '@ember/-internals/utils';
 import { constructStyleDeprecationMessage } from '@ember/-internals/views';
-import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import { assert, deprecate, warn } from '@ember/debug';
 import type { DeprecationOptions } from '@ember/debug';
 import { schedule, _backburner } from '@ember/runloop';
@@ -21,7 +20,7 @@ import toBool from './utils/to-bool';
 
 setGlobalContext({
   FEATURES: {
-    DEFAULT_HELPER_MANAGER: Boolean(EMBER_DEFAULT_HELPER_MANAGER),
+    DEFAULT_HELPER_MANAGER: true,
   },
 
   scheduleRevalidate() {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
index 86df21957ea..4a0023f65e7 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/default-helper-manager-test.js
@@ -6,7 +6,7 @@ import { action } from '@ember/object';
 moduleFor(
   'Helpers test: default helper manager',
   class extends RenderingTestCase {
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) plain functions can be used as helpers'() {
+    '@test plain functions can be used as helpers'() {
       function hello() {
         return 'hello';
       }
@@ -20,9 +20,7 @@ moduleFor(
       this.assertText('hello');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) positional arguments are passed as function arguments'(
-      assert
-    ) {
+    '@test positional arguments are passed as function arguments'(assert) {
       function hello(...args) {
         assert.deepEqual(args, [1, 2, 3]);
         return args.length;
@@ -34,7 +32,7 @@ moduleFor(
       this.assertText('3');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) tracks changes to positional arguments'(assert) {
+    '@test tracks changes to positional arguments'(assert) {
       let count = 0;
 
       function hello(firstArgument) {
@@ -60,9 +58,7 @@ moduleFor(
       this.assertText('456');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) named arguments are passed as the last function argument'(
-      assert
-    ) {
+    '@test named arguments are passed as the last function argument'(assert) {
       function hello(positional, named) {
         assert.strictEqual(positional, 'foo');
 
@@ -75,7 +71,7 @@ moduleFor(
       this.assertText('bar');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) tracks changes to named arguments'(assert) {
+    '@test tracks changes to named arguments'(assert) {
       let count = 0;
 
       function hello(named) {
@@ -101,7 +97,7 @@ moduleFor(
       this.assertText('456');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) plain functions passed as component arguments can be used as helpers'() {
+    '@test plain functions passed as component arguments can be used as helpers'() {
       function hello() {
         return 'hello';
       }
@@ -114,7 +110,7 @@ moduleFor(
       this.assertText('hello');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) plain functions stored as class properties can be used as helpers'() {
+    '@test plain functions stored as class properties can be used as helpers'() {
       this.registerComponent('foo-bar', {
         template: '{{(this.hello)}}',
         ComponentClass: class extends Component {
@@ -128,7 +124,7 @@ moduleFor(
       this.assertText('hello');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) class methods can be used as helpers'() {
+    '@test class methods can be used as helpers'() {
       this.registerComponent('foo-bar', {
         template: '{{(this.hello)}}',
         ComponentClass: class extends Component {
@@ -142,7 +138,7 @@ moduleFor(
       this.assertText('hello');
     }
 
-    '@feature(EMBER_DEFAULT_HELPER_MANAGER) actions can be used as helpers'() {
+    '@test actions can be used as helpers'() {
       this.registerComponent('foo-bar', {
         template: '{{(this.hello)}}',
         ComponentClass: class extends Component {
diff --git a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
index 68e09f62931..9c37e87b36e 100644
--- a/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
+++ b/packages/@ember/-internals/glimmer/tests/integration/helpers/invoke-helper-test.js
@@ -4,7 +4,6 @@ import { Helper, helper, Component as EmberComponent } from '@ember/-internals/g
 import { tracked } from '@ember/-internals/metal';
 import { set } from '@ember/object';
 import { getOwner } from '@ember/-internals/owner';
-import { EMBER_DEFAULT_HELPER_MANAGER } from '@ember/canary-features';
 import Service, { service } from '@ember/service';
 import { DEBUG } from '@glimmer/env';
 import { getValue } from '@glimmer/validator';
@@ -444,17 +443,6 @@ moduleFor(
         invokeHelper(undefined, class extends Helper {});
       }, /Expected a context object to be passed as the first parameter to invokeHelper, got undefined/);
     }
-
-    '@test asserts if no manager exists for the helper definition'(assert) {
-      if (!DEBUG || EMBER_DEFAULT_HELPER_MANAGER) {
-        assert.expect(0);
-        return;
-      }
-
-      assert.throws(() => {
-        invokeHelper({}, class {});
-      }, /Attempted to load a helper, but there wasn't a helper manager associated with the definition. The definition was:/);
-    }
   }
 );
 
diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index f5cde50ff17..22c417d9672 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -12,7 +12,7 @@ import { ENV } from '@ember/-internals/environment';
 */
 
 export const DEFAULT_FEATURES = {
-  EMBER_DEFAULT_HELPER_MANAGER: true,
+  // FLAG_NAME: true/false
 };
 
 /**
@@ -61,4 +61,4 @@ function featureValue(value: null | boolean) {
   return value;
 }
 
-export const EMBER_DEFAULT_HELPER_MANAGER = featureValue(FEATURES.EMBER_DEFAULT_HELPER_MANAGER);
+// export const FLAG_NAME = featureValue(FEATURES.FLAG_NAME);

From 30e0d76ec806d1cf3bbb37f9c43cf43ee9a0d674 Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 6 Jan 2023 15:01:26 -0800
Subject: [PATCH 1354/1405] Allow for FEATURES test to pass with no features

---
 packages/ember/tests/reexports_test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
index a7a98b15896..17136710c1f 100644
--- a/packages/ember/tests/reexports_test.js
+++ b/packages/ember/tests/reexports_test.js
@@ -45,6 +45,10 @@ moduleFor(
     }
 
     '@test Ember.FEATURES is exported'(assert) {
+      if (Object.keys(FEATURES).length === 0) {
+        assert.expect(0);
+      }
+
       for (let feature in FEATURES) {
         assert.equal(
           Ember.FEATURES[feature],

From f0ea31025cfc9ff1b7f16d81b870a40f48cfa487 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Sat, 7 Jan 2023 09:52:51 +0100
Subject: [PATCH 1355/1405] [DOC] Fix `@ember/controller` module in API docs

---
 packages/@ember/controller/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/controller/index.ts b/packages/@ember/controller/index.ts
index ff99ba1f18c..b20a1134733 100644
--- a/packages/@ember/controller/index.ts
+++ b/packages/@ember/controller/index.ts
@@ -18,7 +18,7 @@ export type ControllerQueryParam = string | Record<string, { type: ControllerQue
 const MODEL = symbol('MODEL');
 
 /**
-@module ember/controller
+@module @ember/controller
 */
 
 /**

From 302798b2ea1299e04fd0a1740c28fd93e1ae61cc Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Thu, 12 Jan 2023 08:46:21 -0800
Subject: [PATCH 1356/1405] Comment out unused method

---
 packages/@ember/canary-features/index.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/canary-features/index.ts b/packages/@ember/canary-features/index.ts
index 22c417d9672..89132270986 100644
--- a/packages/@ember/canary-features/index.ts
+++ b/packages/@ember/canary-features/index.ts
@@ -53,12 +53,14 @@ export function isEnabled(feature: string): boolean {
   }
 }
 
-function featureValue(value: null | boolean) {
-  if (ENV.ENABLE_OPTIONAL_FEATURES && value === null) {
-    return true;
-  }
+// Uncomment the below when features are present:
 
-  return value;
-}
+// function featureValue(value: null | boolean) {
+//   if (ENV.ENABLE_OPTIONAL_FEATURES && value === null) {
+//     return true;
+//   }
+
+//   return value;
+// }
 
 // export const FLAG_NAME = featureValue(FEATURES.FLAG_NAME);

From 3dfb5ac91f683b786c353657ae76f9f33f112dd3 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Wed, 11 Jan 2023 19:38:58 -0500
Subject: [PATCH 1357/1405] Add v4.10.0 to CHANGELOG

(cherry picked from commit 15a01e4ace0aaeb42584cf337defebb381bd89b5)
---
 CHANGELOG.md | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6271925e425..25d71bb295e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,15 @@
 # Ember Changelog
 
-## v4.10.0-beta.5 (December 28, 2022)
+## v4.10.0 (January 11, 2023)
 
+- [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).
+- [#20341](https://github.com/emberjs/ember.js/pull/20341) [DEPRECATION] Deprecations for importing `htmlSafe` and `isHTMLSafe` from `@ember/string`. They have moved to `@ember/template`. From [RFC #236](https://rfcs.emberjs.com/id/0236-deprecation-ember-string).
+- [#20344](https://github.com/emberjs/ember.js/pull/20344) [DEPRECATION] Deprecate @ember/string when used from ember-source; point users to add the `@ember/string` addon per [RFC #236](https://rfcs.emberjs.com/id/0236-deprecation-ember-string).
+- [#20342](https://github.com/emberjs/ember.js/pull/20342) [DEPRECATION] Deprecate @ember/error per [RFC #889](https://rfcs.emberjs.com/id/0889-deprecate-ember-error).
 - [#20327](https://github.com/emberjs/ember.js/pull/20327) [BUGFIX] Fix the types for the mutation-methods of `NativeArray`
-
-## v4.10.0-beta.4 (December 13, 2022)
-
-- [#20321](https://github.com/emberjs/ember.js/pull/20321) [BUGFIX] types: `ContainerDebugAdapter` extends `EmberObject`, not `Object`
+- [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017
+- [#20253](https://github.com/emberjs/ember.js/pull/20253) Types: Add the `Resolver` type to preview types
+- [#20319](https://github.com/emberjs/ember.js/pull/20319) Types: resolve services with `Owner.lookup`
 
 ## v4.9.3 (December 13, 2022)
 
@@ -21,11 +24,6 @@
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
 - [#20318](https://github.com/emberjs/ember.js/pull/20318) Backport `Resolver` to preview types
 
-## v4.10.0-beta.3 (December 12, 2022)
-
-- [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
-- [#20319](https://github.com/emberjs/ember.js/pull/20319) Types: resolve services with `Owner.lookup`
-
 ## v4.8.3 (December 12, 2022)
 
 - [#20296](https://github.com/emberjs/ember.js/pull/20296) Controller `queryParams` should support `readonly` arrays
@@ -35,20 +33,10 @@
 
 - [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
 
-## v4.10.0-beta.2 (November 30, 2022)
-
-- [#20283](https://github.com/emberjs/ember.js/pull/20283) [BUGFIX] revert TS `compilerOptions.target` to ES2017
-- [#20284](https://github.com/emberjs/ember.js/pull/20284) [BUGFIX] remove incorrect types for deprecation functions
-
 ## v3.28.11 (November 30, 2022)
 
 - [#20286](https://github.com/emberjs/ember.js/pull/20286) [BUGFIX] Allow class-based helpers in strict-mode
 
-## v4.10.0-beta.1 (November 28, 2022)
-
-- [#20253](https://github.com/emberjs/ember.js/pull/20253) [FEATURE] Add the `Resolver` type to preview types
-- [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).
-
 ## v4.9.0 (November 28, 2022)
 
 - [#20274](https://github.com/emberjs/ember.js/pull/20274) [BUGFIX] Add some missing types to preview types

From 4656fa40adddc7133a0f35c2567892068a33f326 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 12 Jan 2023 16:21:03 -0500
Subject: [PATCH 1358/1405] Add v4.11.0-beta.1 to CHANGELOG

(cherry picked from commit 64076b91fdeda1bf7eb3b30d1cdbc99a8904907e)
---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25d71bb295e..9189db362d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Ember Changelog
 
+## v4.11.0-beta.1 (January 12, 2023)
+
+- [#20288](https://github.com/emberjs/ember.js/pull/20288) [FEATURE] Stable types for `@ember/owner`
+- [#20323](https://github.com/emberjs/ember.js/pull/20323) [FEATURE] Introduce stable types for `@ember/error`
+- [#20345](https://github.com/emberjs/ember.js/pull/20345) [CLEANUP] Remove flags for released features
+- [#20285](https://github.com/emberjs/ember.js/pull/20285) Update to TS v4.9
+
 ## v4.10.0 (January 11, 2023)
 
 - [#20270](https://github.com/emberjs/ember.js/pull/20270) / [#20271](https://github.com/emberjs/ember.js/pull/20271) [FEATURE] Add new imports for `getOwner` and `setOwner` from `@ember/owner` and introduce new `@ember/routing` sub-modules as part of [RFC #821](https://rfcs.emberjs.com/id/0821-public-types).

From 8a98002345e51a36c5256ff063526dffadb6a3d9 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Thu, 12 Jan 2023 16:22:52 -0500
Subject: [PATCH 1359/1405] Post-release version bump

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c7c6ddadd59..97e504767ae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.11.0-alpha.1",
+  "version": "4.12.0-alpha.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From dcbfde307edc53236b635fc3e99ab1598ff8fc09 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Fri, 13 Jan 2023 21:17:24 +0100
Subject: [PATCH 1360/1405] Enable `EMBER_TYPESCRIPT_BLUEPRINTS` flag

---
 blueprints/-maybe-polyfill-typescript-blueprints.js | 4 ++--
 package.json                                        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/blueprints/-maybe-polyfill-typescript-blueprints.js b/blueprints/-maybe-polyfill-typescript-blueprints.js
index 1af065e5a01..bd1a3fdfb89 100644
--- a/blueprints/-maybe-polyfill-typescript-blueprints.js
+++ b/blueprints/-maybe-polyfill-typescript-blueprints.js
@@ -1,9 +1,9 @@
 const typescriptBlueprintPolyfill = require('ember-cli-typescript-blueprint-polyfill');
-const EMBER_TYPESCRIPT_BLUEPRINTS = false;
+const EMBER_TYPESCRIPT_BLUEPRINTS = true;
 
 function canEmitTypeScript() {
   return 'EMBER_TYPESCRIPT_BLUEPRINTS' in process.env
-    ? process.env.EMBER_TYPESCRIPT_BLUEPRINTS
+    ? process.env.EMBER_TYPESCRIPT_BLUEPRINTS === 'true'
     : EMBER_TYPESCRIPT_BLUEPRINTS;
 }
 
diff --git a/package.json b/package.json
index 97e504767ae..e476f6da8c1 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
     "lint:eslint:fix": "npm-run-all \"lint:eslint --fix\"",
     "lint:fix": "npm-run-all lint:*:fix",
     "test": "node bin/run-tests.js",
-    "test:blueprints:js": "mocha node-tests/blueprints/**/*-test.js",
-    "test:blueprints:ts": "EMBER_TYPESCRIPT_BLUEPRINTS=true yarn test:blueprints:js",
+    "test:blueprints:js": "EMBER_TYPESCRIPT_BLUEPRINTS=false yarn test:blueprints:ts",
+    "test:blueprints:ts": "mocha node-tests/blueprints/**/*-test.js",
     "test:blueprints": "yarn test:blueprints:js && yarn test:blueprints:ts",
     "test:node": "qunit tests/node/**/*-test.js",
     "test:browserstack": "node bin/run-browserstack-tests.js",

From de67b5bad861d58e5db93f83cda774d00f92fb64 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Jan 2023 23:06:36 +0000
Subject: [PATCH 1361/1405] Bump @typescript-eslint/parser from 5.38.1 to
 5.48.2

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.38.1 to 5.48.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.48.2/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 58 ++++++++++++++++++++++++++--------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/package.json b/package.json
index 321500b1eb7..1916110bcaf 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.1",
+    "@typescript-eslint/parser": "^5.48.2",
     "ast-types": "^0.14.2",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1286.0",
diff --git a/yarn.lock b/yarn.lock
index e507faa29a2..045dd1a2bf1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1600,14 +1600,14 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.38.1":
-  version "5.38.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.38.1.tgz#c577f429f2c32071b92dff4af4f5fbbbd2414bd0"
-  integrity sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.38.1"
-    "@typescript-eslint/types" "5.38.1"
-    "@typescript-eslint/typescript-estree" "5.38.1"
+"@typescript-eslint/parser@^5.48.2":
+  version "5.48.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.48.2.tgz#c9edef2a0922d26a37dba03be20c5fff378313b3"
+  integrity sha512-38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.48.2"
+    "@typescript-eslint/types" "5.48.2"
+    "@typescript-eslint/typescript-estree" "5.48.2"
     debug "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.38.0":
@@ -1618,13 +1618,13 @@
     "@typescript-eslint/types" "5.38.0"
     "@typescript-eslint/visitor-keys" "5.38.0"
 
-"@typescript-eslint/scope-manager@5.38.1":
-  version "5.38.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz#f87b289ef8819b47189351814ad183e8801d5764"
-  integrity sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==
+"@typescript-eslint/scope-manager@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz#bb7676cb78f1e94921eaab637a4b5d596f838abc"
+  integrity sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==
   dependencies:
-    "@typescript-eslint/types" "5.38.1"
-    "@typescript-eslint/visitor-keys" "5.38.1"
+    "@typescript-eslint/types" "5.48.2"
+    "@typescript-eslint/visitor-keys" "5.48.2"
 
 "@typescript-eslint/type-utils@5.38.0":
   version "5.38.0"
@@ -1641,10 +1641,10 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.0.tgz#8cd15825e4874354e31800dcac321d07548b8a5f"
   integrity sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==
 
-"@typescript-eslint/types@5.38.1":
-  version "5.38.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.1.tgz#74f9d6dcb8dc7c58c51e9fbc6653ded39e2e225c"
-  integrity sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg==
+"@typescript-eslint/types@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.2.tgz#635706abb1ec164137f92148f06f794438c97b8e"
+  integrity sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==
 
 "@typescript-eslint/typescript-estree@5.38.0":
   version "5.38.0"
@@ -1659,13 +1659,13 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.38.1":
-  version "5.38.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz#657d858d5d6087f96b638ee383ee1cff52605a1e"
-  integrity sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==
+"@typescript-eslint/typescript-estree@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz#6e206b462942b32383582a6c9251c05021cc21b0"
+  integrity sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==
   dependencies:
-    "@typescript-eslint/types" "5.38.1"
-    "@typescript-eslint/visitor-keys" "5.38.1"
+    "@typescript-eslint/types" "5.48.2"
+    "@typescript-eslint/visitor-keys" "5.48.2"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
@@ -1692,12 +1692,12 @@
     "@typescript-eslint/types" "5.38.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@5.38.1":
-  version "5.38.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz#508071bfc6b96d194c0afe6a65ad47029059edbc"
-  integrity sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==
+"@typescript-eslint/visitor-keys@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz#c247582a0bcce467461d7b696513bf9455000060"
+  integrity sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==
   dependencies:
-    "@typescript-eslint/types" "5.38.1"
+    "@typescript-eslint/types" "5.48.2"
     eslint-visitor-keys "^3.3.0"
 
 "@xmldom/xmldom@^0.8.0":

From cc58ddc807b96b44457382a45e340ecdd3c48475 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 19 Jan 2023 09:41:49 -0700
Subject: [PATCH 1362/1405] [FEATURE] generate type registry entry in service
 blueprint

We have support for this capability in the types, so the blueprints
should make sure that there is a registry entry for each service. We
originally left this out because we were unsure of the future of the
service registry, but we made `Owner.lookup()` smart enough to resolve
it, and the `@service` decorator continues to expect it.
---
 blueprints/service/files/__root__/__path__/__name__.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/blueprints/service/files/__root__/__path__/__name__.ts b/blueprints/service/files/__root__/__path__/__name__.ts
index 6f7a5e9baa4..d1685868023 100644
--- a/blueprints/service/files/__root__/__path__/__name__.ts
+++ b/blueprints/service/files/__root__/__path__/__name__.ts
@@ -1,3 +1,13 @@
 import Service from '@ember/service';
 
 export default class <%= classifiedModuleName %>Service extends Service {}
+
+// Don't remove this declaration: this is what enables TypeScript to resolve
+// this service using `Owner.lookup('service:<%= dasherizedModuleName %>')`, as well
+// as to check when you pass the service name as an argument to the decorator,
+// like `@service('<%= dasherizedModuleName %>') declare altName: <%= classifiedModuleName %>Service;`.
+declare module '@ember/service' {
+  interface Registry {
+    '<%= dasherizedModuleName %>': <%= classifiedModuleName %>Service;
+  }
+}

From 8f9528e145240180449400d6b925f7c00554b780 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 19 Jan 2023 15:32:54 -0700
Subject: [PATCH 1363/1405] [FEATURE] generate signature in component
 blueprints

Since [RFC 0748][0748], Glimmer components support a `Signature` type
which specifies any arguments they accept, any blocks they yield, and
the element types to which `...attributes` are applied. Incorporate the
signature when generating TS blueprints for Glimmer components,
including template-only components. Do *not* generate them for Ember
(classic) components, since there are severe limitations in using
classic components that way, and since we only support the Octane
programming model in our TypeScript support per [RFC 0800][0800].

[0748]: https://rfcs.emberjs.com/id/https://rfcs.emberjs.com/id/0748-glimmer-component-signature/
[0800]: https://rfcs.emberjs.com/id/https://rfcs.emberjs.com/id/0800-ts-adoption-plan/
---
 .../files/__root__/__path__/__name__.ts       |  1 +
 blueprints/component/index.js                 | 46 +++++++++++++++----
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/blueprints/component/files/__root__/__path__/__name__.ts b/blueprints/component/files/__root__/__path__/__name__.ts
index 777e6155290..3ddc45ea7ba 100644
--- a/blueprints/component/files/__root__/__path__/__name__.ts
+++ b/blueprints/component/files/__root__/__path__/__name__.ts
@@ -1,3 +1,4 @@
 <%= importComponent %>
 <%= importTemplate %>
+<%= componentSignature %>
 export default <%= defaultExport %>
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index 57f31654455..3f0fbc93afa 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -227,15 +227,8 @@ module.exports = {
   },
 
   locals(options) {
-    let sanitizedModuleName = options.entity.name.replace(/\//g, '-');
-    let classifiedModuleName = stringUtil.classify(sanitizedModuleName);
-
-    let templatePath = '';
-    let importComponent = '';
-    let importTemplate = '';
-    let defaultExport = '';
-
     // if we're in an addon, build import statement
+    let templatePath = '';
     if (options.project.isEmberCLIAddon() || (options.inRepoAddon && !options.inDummy)) {
       if (options.pod) {
         templatePath = './template';
@@ -251,6 +244,14 @@ module.exports = {
       ? options.componentClass
       : '@ember/component';
 
+    let sanitizedModuleName = options.entity.name.replace(/\//g, '-');
+    let classifiedModuleName = stringUtil.classify(sanitizedModuleName);
+
+    let importComponent = '';
+    let importTemplate = '';
+    let defaultExport = '';
+    let componentSignature = '';
+
     switch (componentClass) {
       case '@ember/component':
         importComponent = `import Component from '@ember/component';`;
@@ -263,20 +264,45 @@ module.exports = {
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;
-        defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
+        componentSignature = signatureFor(classifiedModuleName);
+        defaultExport = `class ${classifiedModuleName}Component extends Component<${classifiedModuleName}Signature> {}`;
         break;
       case '@ember/component/template-only':
         importComponent = `import templateOnly from '@ember/component/template-only';`;
-        defaultExport = `templateOnly();`;
+        componentSignature = signatureFor(classifiedModuleName);
+        defaultExport = `templateOnly<${classifiedModuleName}Signature>();`;
         break;
     }
 
     return {
       importTemplate,
       importComponent,
+      componentSignature,
       defaultExport,
       path: getPathOption(options),
       componentClass: options.componentClass,
     };
   },
 };
+
+function signatureFor(classifiedModuleName) {
+  let args = `  // The arguments accepted by the component${EOL}  Args: {};`;
+
+  let blocks =
+    `  // Any blocks yielded by the component${EOL}` +
+    `  Blocks: {${EOL}` +
+    `    default: []${EOL}` +
+    `  };`;
+
+  let element =
+    `  // The element to which \`...attributes\` is applied in the component template${EOL}` +
+    `  Element: null;`;
+
+  return (
+    `interface ${classifiedModuleName}Signature {${EOL}` +
+    `${args}${EOL}` +
+    `${blocks}${EOL}` +
+    `${element}${EOL}` +
+    `}${EOL}`
+  );
+}

From eebfa281fb7289af6f83035f1a5ba930dd3226c0 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 19 Jan 2023 19:13:41 -0700
Subject: [PATCH 1364/1405] Do not include types in JS blueprints

For the fallback case, where Ember's blueprints are being executed by a
version of Ember CLI earlier than 4.3.0, the emitted blueprints *must
not* include any TypeScript types, since the CLI will not be able to
remove the types. Accordingly:

1.  Return a boolean flag from the `maybePolyfillTypeScriptBlueprints`
    helper, indicating whether the blueprint is in a mode where it can
    reliably *emit* types.

2.  Use that new helper in the component blueprint so that it can avoid
    emitting a signature type, and specifically can avoid emitting it
    as a type parameter on the class or function default export.
---
 .../-maybe-polyfill-typescript-blueprints.js  |  4 ++-
 blueprints/component/index.js                 | 26 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/blueprints/-maybe-polyfill-typescript-blueprints.js b/blueprints/-maybe-polyfill-typescript-blueprints.js
index 1af065e5a01..82d981beefe 100644
--- a/blueprints/-maybe-polyfill-typescript-blueprints.js
+++ b/blueprints/-maybe-polyfill-typescript-blueprints.js
@@ -8,10 +8,12 @@ function canEmitTypeScript() {
 }
 
 module.exports = function (context) {
-  if (canEmitTypeScript()) {
+  let canUseTypeScript = canEmitTypeScript();
+  if (canUseTypeScript) {
     typescriptBlueprintPolyfill(context);
   } else {
     // Use the plain old JS templates from before
     context.path = context.path.replace('blueprints', 'blueprints-js');
   }
+  return canUseTypeScript;
 };
diff --git a/blueprints/component/index.js b/blueprints/component/index.js
index 3f0fbc93afa..fe81e2e7653 100644
--- a/blueprints/component/index.js
+++ b/blueprints/component/index.js
@@ -53,9 +53,17 @@ module.exports = {
     },
   ],
 
+  /**
+    Flag to let us correctly handle the case where we are running against a
+    version of Ember CLI which does not support TS-based emit, and where we
+    therefore *must* not emit a `defaultExport` local which includes a type
+    parameter in the exported function call or class definition.
+   */
+  _isUsingTS: false,
+
   init() {
     this._super && this._super.init.apply(this, arguments);
-    maybePolyfillTypeScriptBlueprints(this);
+    this._isUsingTS = maybePolyfillTypeScriptBlueprints(this);
     let isOctane = has('octane');
 
     this.availableOptions.forEach((option) => {
@@ -264,13 +272,21 @@ module.exports = {
         break;
       case '@glimmer/component':
         importComponent = `import Component from '@glimmer/component';`;
-        componentSignature = signatureFor(classifiedModuleName);
-        defaultExport = `class ${classifiedModuleName}Component extends Component<${classifiedModuleName}Signature> {}`;
+        if (this._isUsingTS) {
+          componentSignature = signatureFor(classifiedModuleName);
+          defaultExport = `class ${classifiedModuleName}Component extends Component<${classifiedModuleName}Signature> {}`;
+        } else {
+          defaultExport = `class ${classifiedModuleName}Component extends Component {}`;
+        }
         break;
       case '@ember/component/template-only':
         importComponent = `import templateOnly from '@ember/component/template-only';`;
-        componentSignature = signatureFor(classifiedModuleName);
-        defaultExport = `templateOnly<${classifiedModuleName}Signature>();`;
+        if (this._isUsingTS) {
+          componentSignature = signatureFor(classifiedModuleName);
+          defaultExport = `templateOnly<${classifiedModuleName}Signature>();`;
+        } else {
+          defaultExport = `templateOnly();`;
+        }
         break;
     }
 

From 809a9ebdbb5fa30135cebe7ab2ef3546bd5e6770 Mon Sep 17 00:00:00 2001
From: Hubert Olender <olender.hub@gmail.com>
Date: Mon, 23 Jan 2023 15:35:18 +0100
Subject: [PATCH 1365/1405] [DOC] Improve didTransition in routing

---
 packages/@ember/routing/route.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/routing/route.ts b/packages/@ember/routing/route.ts
index 6077c41ceb8..02c140d2786 100644
--- a/packages/@ember/routing/route.ts
+++ b/packages/@ember/routing/route.ts
@@ -145,7 +145,7 @@ interface Route<T = unknown> extends IRoute<T> {
     export default class LoginRoute extends Route {
       @action
       didTransition() {
-        this.controller.get('errors.base').clear();
+        // your code there
         return true; // Bubble the didTransition event
       }
     }

From 90b1101615ff8d2dd97d5e25a7b2cb6f8321aec1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:01:56 +0000
Subject: [PATCH 1366/1405] Bump mkdirp from 1.0.4 to 2.1.3

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 1.0.4 to 2.1.3.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/main/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/compare/v1.0.4...v2.1.3)

---
updated-dependencies:
- dependency-name: mkdirp
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7395ab8ec20..57f2a067b76 100644
--- a/package.json
+++ b/package.json
@@ -145,7 +145,7 @@
     "glob": "^8.0.3",
     "html-differ": "^1.4.0",
     "lodash.uniq": "^4.5.0",
-    "mkdirp": "^1.0.4",
+    "mkdirp": "^2.1.3",
     "mocha": "^10.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.0",
diff --git a/yarn.lock b/yarn.lock
index 72b88ca1312..b02a8218880 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7617,6 +7617,11 @@ mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity "sha1-PrXtYmInVteaXw4qIh3+utdcL34= sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
 
+mkdirp@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.3.tgz#b083ff37be046fd3d6552468c1f0ff44c1545d1f"
+  integrity sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==
+
 mktemp@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"

From 807a5d712b4bd2e04c7845e611198223184bf825 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:02:19 +0000
Subject: [PATCH 1367/1405] Bump rollup-plugin-commonjs from 9.3.4 to 10.1.0

Bumps [rollup-plugin-commonjs](https://github.com/rollup/rollup-plugin-commonjs) from 9.3.4 to 10.1.0.
- [Release notes](https://github.com/rollup/rollup-plugin-commonjs/releases)
- [Changelog](https://github.com/rollup/rollup-plugin-commonjs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup-plugin-commonjs/compare/v9.3.4...v10.1.0)

---
updated-dependencies:
- dependency-name: rollup-plugin-commonjs
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/package.json b/package.json
index 7395ab8ec20..39e3a481cb0 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "puppeteer": "^19.4.1",
     "qunit": "^2.19.1",
     "recast": "^0.21.5",
-    "rollup-plugin-commonjs": "^9.3.4",
+    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^4.2.4",
     "route-recognizer": "^0.3.4",
     "router_js": "^8.0.3",
diff --git a/yarn.lock b/yarn.lock
index 72b88ca1312..4a0a97188d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1445,7 +1445,7 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
-"@types/estree@*", "@types/estree@0.0.38":
+"@types/estree@*":
   version "0.0.38"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2"
   integrity "sha1-wb5AqpM3I8YIggqZo3OhbSFaHKI= sha512-F/v7t1LwS4vnXuPooJQGBRKRGIoxWUTmA4VHfqjOccFsNDThD5bfUNpITive6s352O7o384wcpEaDV8rHCehDA=="
@@ -4693,10 +4693,10 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity "sha1-MH30JUfmzHMk088DwVXVzbjFOIA= sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
 
-estree-walker@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
-  integrity "sha1-XYZTJ8RKYY3eVpn3Y4ka4x8lfa4= sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw=="
+estree-walker@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
 
 esutils@^2.0.2:
   version "2.0.2"
@@ -6386,12 +6386,12 @@ is-promise@^2.1.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= sha512-NECAi6wp6CgMesHuVUEK8JwjCvm/tvnn5pCbB42JOHp3mgUizN0nagXu4HEqQZBkieGEQ+jVcMKWqoVd6CDbLQ=="
 
-is-reference@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.0.tgz#50e6ef3f64c361e2c53c0416cdc9420037f2685b"
-  integrity "sha1-UObvP2TDYeLFPAQWzclCADfyaFs= sha512-h37O/IX4efe56o9k41II1ECMqKwtqHa7/12dLDEzJIFux2x15an4WCDb0/eKdmUgRpLJ3bR0DrzDc7vOrVgRDw=="
+is-reference@^1.1.0, is-reference@^1.1.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
+  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
   dependencies:
-    "@types/estree" "0.0.38"
+    "@types/estree" "*"
 
 is-regex@^1.1.4:
   version "1.1.4"
@@ -7463,7 +7463,7 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
 
-micromatch@^3.1.10, micromatch@^3.1.4:
+micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity "sha1-cIWbyVyYQJUvNZoGij/En57PrCM= sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="
@@ -8935,7 +8935,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="
 
-resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.4.0, resolve@^1.5.0:
+resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.4.0, resolve@^1.5.0:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -8997,15 +8997,16 @@ rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
-rollup-plugin-commonjs@^9.3.4:
-  version "9.3.4"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.3.4.tgz#2b3dddbbbded83d45c36ff101cdd29e924fd23bc"
-  integrity "sha1-Kz3du73tg9RcNv8QHN0p6ST9I7w= sha512-DTZOvRoiVIHHLFBCL4pFxOaJt8pagxsVldEXBOn6wl3/V21wVaj17HFfyzTsQUuou3sZL3lEJZVWKPFblJfI6w=="
+rollup-plugin-commonjs@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
+  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
   dependencies:
-    estree-walker "^0.6.0"
+    estree-walker "^0.6.1"
+    is-reference "^1.1.2"
     magic-string "^0.25.2"
-    resolve "^1.10.0"
-    rollup-pluginutils "^2.6.0"
+    resolve "^1.11.0"
+    rollup-pluginutils "^2.8.1"
 
 rollup-plugin-node-resolve@^4.2.4:
   version "4.2.4"
@@ -9017,13 +9018,12 @@ rollup-plugin-node-resolve@^4.2.4:
     is-module "^1.0.0"
     resolve "^1.10.0"
 
-rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.6.0.tgz#203706edd43dfafeaebc355d7351119402fc83ad"
-  integrity "sha1-IDcG7dQ9+v6uvDVdc1ERlAL8g60= sha512-aGQwspEF8oPKvg37u3p7h0cYNwmJR1sCBMZGZ5b9qy8HGtETknqjzcxrDRrcAnJNXN18lBH4Q9vZYth/p4n8jQ=="
+rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
-    estree-walker "^0.6.0"
-    micromatch "^3.1.10"
+    estree-walker "^0.6.1"
 
 rollup@^0.57.1:
   version "0.57.1"

From ba96968e4fbeb3829f82fdd31cfdb093b49e159c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:03:43 +0000
Subject: [PATCH 1368/1405] Bump ember-cli from 4.8.0 to 4.10.0

Bumps [ember-cli](https://github.com/ember-cli/ember-cli) from 4.8.0 to 4.10.0.
- [Release notes](https://github.com/ember-cli/ember-cli/releases)
- [Changelog](https://github.com/ember-cli/ember-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ember-cli/ember-cli/compare/v4.8.0...v4.10.0)

---
updated-dependencies:
- dependency-name: ember-cli
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 357 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 305 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 7395ab8ec20..15d6fd0ed00 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,7 @@
     "broccoli-uglify-sourcemap": "^4.0.0",
     "common-tags": "^1.8.2",
     "dag-map": "^2.0.2",
-    "ember-cli": "^4.8.0",
+    "ember-cli": "^4.10.0",
     "ember-cli-blueprint-test-helpers": "^0.19.2",
     "ember-cli-browserstack": "^2.0.1",
     "ember-cli-dependency-checker": "^3.3.1",
diff --git a/yarn.lock b/yarn.lock
index 72b88ca1312..08c5d9fbbe9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -21,25 +21,30 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.18.13", "@babel/core@^7.3.4":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
-  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
+"@babel/compat-data@^7.20.5":
+  version "7.20.14"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8"
+  integrity sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==
+
+"@babel/core@^7.12.0", "@babel/core@^7.16.10", "@babel/core@^7.16.7", "@babel/core@^7.19.6", "@babel/core@^7.3.4":
+  version "7.20.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
+  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.0"
-    "@babel/helper-module-transforms" "^7.20.2"
-    "@babel/helpers" "^7.20.5"
-    "@babel/parser" "^7.20.5"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helpers" "^7.20.7"
+    "@babel/parser" "^7.20.7"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.12"
+    "@babel/types" "^7.20.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
 "@babel/generator@^7.20.5":
@@ -51,6 +56,15 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.20.7":
+  version "7.20.14"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.14.tgz#9fa772c9f86a46c6ac9b321039400712b96f64ce"
+  integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==
+  dependencies:
+    "@babel/types" "^7.20.7"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -76,6 +90,17 @@
     browserslist "^4.21.3"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
+  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
+  dependencies:
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.2", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.5.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz#327154eedfb12e977baa4ecc72e5806720a85a06"
@@ -150,7 +175,7 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
   integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
@@ -164,6 +189,20 @@
     "@babel/traverse" "^7.20.1"
     "@babel/types" "^7.20.2"
 
+"@babel/helper-module-transforms@^7.20.11":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
+  integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.10"
+    "@babel/types" "^7.20.7"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -243,14 +282,14 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
-"@babel/helpers@^7.20.5":
-  version "7.20.6"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
-  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+"@babel/helpers@^7.20.7":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2"
+  integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==
   dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.13"
+    "@babel/types" "^7.20.7"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -266,6 +305,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
   integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
+"@babel/parser@^7.20.13", "@babel/parser@^7.20.7":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.13.tgz#ddf1eb5a813588d2fb1692b70c6fce75b945c088"
+  integrity sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -944,6 +988,15 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
+"@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
+
 "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.4.5":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
@@ -960,6 +1013,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13":
+  version "7.20.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473"
+  integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.13"
+    "@babel/types" "^7.20.7"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.4", "@babel/types@^7.7.2":
   version "7.20.5"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
@@ -969,6 +1038,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
+  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@cnakazawa/watch@^1.0.3":
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
@@ -1821,6 +1899,13 @@ ansi-escapes@^3.2.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity "sha1-h4C5j/nb9WOBUtHx/lwde0RCl2s= sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
 
+ansi-escapes@^4.2.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
+  dependencies:
+    type-fest "^0.21.3"
+
 ansi-html@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -2370,7 +2455,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.0.0.tgz#e597d1a7a6a3558a2d1c7241a16c99965e6aa40f"
   integrity sha1-5ZfRp6ajVYotHHJBoWyZll5qpA8=
 
-bl@^4.0.3:
+bl@^4.0.3, bl@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -3197,7 +3282,7 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3242,10 +3327,10 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity "sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs= sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
 
-ci-info@^3.3.2:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f"
-  integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==
+ci-info@^3.5.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f"
+  integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==
 
 class-utils@^0.3.5:
   version "0.3.5"
@@ -3297,11 +3382,23 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-spinners@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.1.0.tgz#22c34b4d51f573240885b201efda4e4ec9fff3c7"
   integrity "sha1-IsNLTVH1cyQIhbIB79pOTsn/88c= sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA=="
 
+cli-spinners@^2.5.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a"
+  integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==
+
 cli-table@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
@@ -3314,6 +3411,11 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= sha512-EJLbKSuvHTrVRynOXCYFTbQKZOFXWNe3/6DN1yrEH3TuuZT1x4dMQnCHnfCrBUUiGjO63enEIfaB17VaRl2d4A=="
 
+cli-width@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
+
 cliui@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
@@ -4132,12 +4234,12 @@ ember-cli-yuidoc@^0.9.1:
     rsvp "3.0.14"
     yuidocjs "^0.10.0"
 
-ember-cli@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.8.0.tgz#71988bdad50661b904f7121a566799027c07ba72"
-  integrity sha512-NiLCOd+/ckgJvH/DzV5aWUPfGHm3LomktonXQVsFkdbfs4YF/+RHBkqwGuEH73RcOLmTRDj6YWVMOTDjWvXT/Q==
+ember-cli@^4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-4.10.0.tgz#d0aaaa4434913def074cc1837074003b2bb567f7"
+  integrity sha512-gex/GdqzR5NLPVHvqLml7YgJR3KDzq2MGtrB2EHSpk//bY26mWi0milYABBfiDK5Yw/onztwPitxNaZpBjjqng==
   dependencies:
-    "@babel/core" "^7.18.13"
+    "@babel/core" "^7.19.6"
     "@babel/plugin-transform-modules-amd" "^7.18.6"
     amd-name-resolver "^1.3.1"
     babel-plugin-module-resolver "^4.1.0"
@@ -4161,7 +4263,7 @@ ember-cli@^4.8.0:
     calculate-cache-key-for-tree "^2.0.0"
     capture-exit "^2.0.0"
     chalk "^4.1.2"
-    ci-info "^3.3.2"
+    ci-info "^3.5.0"
     clean-base-url "^1.0.0"
     compression "^1.7.4"
     configstore "^5.0.1"
@@ -4179,7 +4281,7 @@ ember-cli@^4.8.0:
     execa "^5.1.1"
     exit "^0.1.2"
     express "^4.18.1"
-    filesize "^9.0.11"
+    filesize "^10.0.5"
     find-up "^5.0.0"
     find-yarn-workspace-root "^2.0.0"
     fixturify-project "^2.1.1"
@@ -4187,13 +4289,14 @@ ember-cli@^4.8.0:
     fs-tree-diff "^2.0.1"
     get-caller-file "^2.0.5"
     git-repo-info "^2.1.1"
-    glob "^7.2.0"
+    glob "^8.0.3"
     heimdalljs "^0.2.6"
     heimdalljs-fs-monitor "^1.1.1"
     heimdalljs-graph "^1.0.0"
     heimdalljs-logger "^0.1.10"
     http-proxy "^1.18.1"
-    inflection "^1.13.1"
+    inflection "^1.13.4"
+    inquirer "^8.2.1"
     is-git-url "^1.0.0"
     is-language-code "^3.1.0"
     isbinaryfile "^5.0.0"
@@ -4205,9 +4308,10 @@ ember-cli@^4.8.0:
     minimatch "^5.1.0"
     morgan "^1.10.0"
     nopt "^3.0.6"
-    npm-package-arg "^9.1.0"
+    npm-package-arg "^9.1.2"
+    os-locale "^5.0.0"
     p-defer "^3.0.0"
-    portfinder "^1.0.29"
+    portfinder "^1.0.32"
     promise-map-series "^0.3.0"
     promise.hash.helper "^1.0.8"
     quick-temp "^0.1.8"
@@ -4221,7 +4325,7 @@ ember-cli@^4.8.0:
     sort-package-json "^1.57.0"
     symlink-or-copy "^1.3.1"
     temp "0.9.4"
-    testem "^3.8.0"
+    testem "^3.9.0"
     tiny-lr "^2.0.0"
     tree-sync "^2.1.0"
     uuid "^8.3.2"
@@ -5020,6 +5124,13 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -5027,10 +5138,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-filesize@^9.0.11:
-  version "9.0.11"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-9.0.11.tgz#4ac3a42c084232dd9b2a1da0107f32d42fcfa5e4"
-  integrity sha512-gTAiTtI0STpKa5xesyTA9hA3LX4ga8sm2nWRcffEa1L/5vQwb4mj2MdzMkoHoGv4QzfDshQZuYscQSf8c4TKOA==
+filesize@^10.0.5:
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.0.6.tgz#5f4cd2721664cd925db3a7a5a87bbfd6ab5ebb1a"
+  integrity sha512-rzpOZ4C9vMFDqOa6dNpog92CoLYjD79dnjLk2TYDDtImRIyLTOzqojCb05Opd1WuiWjs+fshhCgTd8cl7y5t+g==
 
 fill-range@^4.0.0:
   version "4.0.0"
@@ -5566,7 +5677,7 @@ glob-parent@^6.0.2:
   dependencies:
     is-glob "^4.0.3"
 
-glob@7.2.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6, glob@^7.2.0:
+glob@7.2.0, glob@^7.0.4, glob@^7.0.5, glob@^7.1.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
@@ -6063,10 +6174,10 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-inflection@^1.13.1, inflection@^1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.2.tgz#15e8c797c6c3dadf31aa658f8df8a4ea024798b0"
-  integrity sha512-cmZlljCRTBFouT8UzMzrGcVEvkv6D/wBdcdKG7J1QH5cXjtU75Dm+P27v9EKu/Y43UYyCJd1WC4zLebRrC8NBw==
+inflection@^1.13.2, inflection@^1.13.4:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.13.4.tgz#65aa696c4e2da6225b148d7a154c449366633a32"
+  integrity sha512-6I/HUDeYFfuNCVS3td055BaXBwKYuzw7K3ExVMStBowKo9oOAMJIXIHvdyR3iboTCp1b+1i5DSkIZTcwIktuDw==
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -6121,6 +6232,27 @@ inquirer@^6:
     strip-ansi "^5.0.0"
     through "^2.3.6"
 
+inquirer@^8.2.1:
+  version "8.2.5"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8"
+  integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^4.1.1"
+    cli-cursor "^3.1.0"
+    cli-width "^3.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.21"
+    mute-stream "0.0.8"
+    ora "^5.4.1"
+    run-async "^2.4.0"
+    rxjs "^7.5.5"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+    through "^2.3.6"
+    wrap-ansi "^7.0.0"
+
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -6137,6 +6269,11 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
+invert-kv@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-3.0.1.tgz#a93c7a3d4386a1dc8325b97da9bb1620c0282523"
+  integrity sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==
+
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -6306,6 +6443,11 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
+is-interactive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
+
 is-language-code@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-language-code/-/is-language-code-3.1.0.tgz#b2386b49227e7010636f16d0c2c681ca40136ab5"
@@ -6639,11 +6781,16 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.1:
+json5@^2.1.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
+json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -6717,6 +6864,13 @@ lazy-cache@^2.0.2:
   dependencies:
     set-getter "^0.1.0"
 
+lcid@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-3.1.1.tgz#9030ec479a058fc36b5e8243ebaac8b6ac582fd0"
+  integrity sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==
+  dependencies:
+    invert-kv "^3.0.0"
+
 leek@0.0.24:
   version "0.0.24"
   resolved "https://registry.yarnpkg.com/leek/-/leek-0.0.24.tgz#e400e57f0e60d8ef2bd4d068dc428a54345dbcda"
@@ -7225,7 +7379,7 @@ lodash@^4.0.0, lodash@^4.16.1, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@4.1.0:
+log-symbols@4.1.0, log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -7257,6 +7411,13 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -7297,6 +7458,13 @@ makeerror@1.0.x:
   dependencies:
     tmpl "1.0.x"
 
+map-age-cleaner@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7405,6 +7573,15 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
 
+mem@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-5.1.1.tgz#7059b67bf9ac2c924c9f1cff7155a064394adfb3"
+  integrity sha512-qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw==
+  dependencies:
+    map-age-cleaner "^0.1.3"
+    mimic-fn "^2.1.0"
+    p-is-promise "^2.1.0"
+
 memory-streams@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb"
@@ -7690,6 +7867,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nanocolors@^0.1.5:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/nanocolors/-/nanocolors-0.1.12.tgz#8577482c58cbd7b5bb1681db4cf48f11a87fd5f6"
@@ -7826,7 +8008,7 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-npm-package-arg@^9.1.0:
+npm-package-arg@^9.1.2:
   version "9.1.2"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.2.tgz#fc8acecb00235f42270dda446f36926ddd9ac2bc"
   integrity sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg==
@@ -8013,11 +8195,35 @@ ora@^3.4.0:
     strip-ansi "^5.2.0"
     wcwidth "^1.0.1"
 
+ora@^5.4.1:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
+  dependencies:
+    bl "^4.1.0"
+    chalk "^4.1.0"
+    cli-cursor "^3.1.0"
+    cli-spinners "^2.5.0"
+    is-interactive "^1.0.0"
+    is-unicode-supported "^0.1.0"
+    log-symbols "^4.1.0"
+    strip-ansi "^6.0.0"
+    wcwidth "^1.0.1"
+
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity "sha1-/7xJiDNuDoM94MFox+8VISGqf7M= sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="
 
+os-locale@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0"
+  integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==
+  dependencies:
+    execa "^4.0.0"
+    lcid "^3.0.0"
+    mem "^5.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -8036,6 +8242,11 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
+
 p-defer@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-3.0.0.tgz#d1dceb4ee9b2b604b1d94ffec83760175d4e6f83"
@@ -8051,6 +8262,11 @@ p-finally@^2.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561"
   integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==
 
+p-is-promise@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
+
 p-limit@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
@@ -8314,7 +8530,7 @@ plur@^2.1.2:
   dependencies:
     irregular-plurals "^1.0.0"
 
-portfinder@^1.0.29:
+portfinder@^1.0.32:
   version "1.0.32"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81"
   integrity sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==
@@ -8959,6 +9175,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9081,6 +9305,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
 run-parallel@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -9093,6 +9322,13 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^7.5.5:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
+  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
+  dependencies:
+    tslib "^2.1.0"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9911,7 +10147,7 @@ testem-failure-only-reporter@^1.0.0:
   dependencies:
     testem "^3.0.0"
 
-testem@^3.0.0, testem@^3.10.1, testem@^3.8.0:
+testem@^3.0.0, testem@^3.10.1, testem@^3.9.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/testem/-/testem-3.10.1.tgz#bab8a83bec11e975f7d1e47e924eed6135957e5b"
   integrity sha512-42c4e7qlAelwMd8O3ogtVGRbgbr6fJnX6H51ACOIG1V1IjsKPlcQtxPyOwaL4iikH22Dfh+EyIuJnMG4yxieBQ==
@@ -10140,6 +10376,11 @@ tslib@^2.0.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
+tslib@^2.1.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
@@ -10189,6 +10430,11 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -10716,6 +10962,11 @@ yallist@^3.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek= sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"

From 40081c92bf91ec3e3ed5c0d062c2cd782504e5bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Feb 2023 15:07:13 +0000
Subject: [PATCH 1369/1405] Bump @typescript-eslint/eslint-plugin from 5.38.0
 to 5.50.0

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 5.38.0 to 5.50.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.50.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 120 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index 7395ab8ec20..607abb44c6c 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "@types/node": "^18.11.11",
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.48.2",
     "ast-types": "^0.14.2",
     "auto-dist-tag": "^2.1.1",
diff --git a/yarn.lock b/yarn.lock
index 72b88ca1312..7db132c33c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1566,6 +1566,11 @@
   resolved "https://registry.yarnpkg.com/@types/rsvp/-/rsvp-4.0.4.tgz#55e93e7054027f1ad4b4ebc1e60e59eb091e2d32"
   integrity sha512-J3Ol++HCC7/hwZhanDvggFYU/GtxHxE/e7cGRWxR04BF7Tt3TqJZ84BkzQgDxmX0uu8IagiyfmfoUlBACh2Ilg==
 
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+
 "@types/serve-static@*":
   version "1.13.10"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
@@ -1586,16 +1591,18 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz#ac919a199548861012e8c1fb2ec4899ac2bc22ae"
-  integrity sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==
+"@typescript-eslint/eslint-plugin@^5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.50.0.tgz#fb48c31cadc853ffc1dc35373f56b5e2a8908fe9"
+  integrity sha512-vwksQWSFZiUhgq3Kv7o1Jcj0DUNylwnIlGvKvLLYsq8pAWha6/WCnXUeaSoNNha/K7QSf2+jvmkxggC1u3pIwQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/type-utils" "5.38.0"
-    "@typescript-eslint/utils" "5.38.0"
+    "@typescript-eslint/scope-manager" "5.50.0"
+    "@typescript-eslint/type-utils" "5.50.0"
+    "@typescript-eslint/utils" "5.50.0"
     debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
     regexpp "^3.2.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
@@ -1610,14 +1617,6 @@
     "@typescript-eslint/typescript-estree" "5.48.2"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz#8f0927024b6b24e28671352c93b393a810ab4553"
-  integrity sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==
-  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/visitor-keys" "5.38.0"
-
 "@typescript-eslint/scope-manager@5.48.2":
   version "5.48.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz#bb7676cb78f1e94921eaab637a4b5d596f838abc"
@@ -1626,38 +1625,33 @@
     "@typescript-eslint/types" "5.48.2"
     "@typescript-eslint/visitor-keys" "5.48.2"
 
-"@typescript-eslint/type-utils@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz#c8b7f681da825fcfc66ff2b63d70693880496876"
-  integrity sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==
+"@typescript-eslint/scope-manager@5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz#90b8a3b337ad2c52bbfe4eac38f9164614e40584"
+  integrity sha512-rt03kaX+iZrhssaT974BCmoUikYtZI24Vp/kwTSy841XhiYShlqoshRFDvN1FKKvU2S3gK+kcBW1EA7kNUrogg==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.38.0"
-    "@typescript-eslint/utils" "5.38.0"
+    "@typescript-eslint/types" "5.50.0"
+    "@typescript-eslint/visitor-keys" "5.50.0"
+
+"@typescript-eslint/type-utils@5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz#509d5cc9728d520008f7157b116a42c5460e7341"
+  integrity sha512-dcnXfZ6OGrNCO7E5UY/i0ktHb7Yx1fV6fnQGGrlnfDhilcs6n19eIRcvLBqx6OQkrPaFlDPk3OJ0WlzQfrV0bQ==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.50.0"
+    "@typescript-eslint/utils" "5.50.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.38.0.tgz#8cd15825e4874354e31800dcac321d07548b8a5f"
-  integrity sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==
-
 "@typescript-eslint/types@5.48.2":
   version "5.48.2"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.2.tgz#635706abb1ec164137f92148f06f794438c97b8e"
   integrity sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==
 
-"@typescript-eslint/typescript-estree@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz#89f86b2279815c6fb7f57d68cf9b813f0dc25d98"
-  integrity sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==
-  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/visitor-keys" "5.38.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.50.0.tgz#c461d3671a6bec6c2f41f38ed60bd87aa8a30093"
+  integrity sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==
 
 "@typescript-eslint/typescript-estree@5.48.2":
   version "5.48.2"
@@ -1672,25 +1666,32 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.38.0.tgz#5b31f4896471818153790700eb02ac869a1543f4"
-  integrity sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==
+"@typescript-eslint/typescript-estree@5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.50.0.tgz#0b9b82975bdfa40db9a81fdabc7f93396867ea97"
+  integrity sha512-Gq4zapso+OtIZlv8YNAStFtT6d05zyVCK7Fx3h5inlLBx2hWuc/0465C2mg/EQDDU2LKe52+/jN4f0g9bd+kow==
+  dependencies:
+    "@typescript-eslint/types" "5.50.0"
+    "@typescript-eslint/visitor-keys" "5.50.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.50.0.tgz#807105f5ffb860644d30d201eefad7017b020816"
+  integrity sha512-v/AnUFImmh8G4PH0NDkf6wA8hujNNcrwtecqW4vtQ1UOSNBaZl49zP1SHoZ/06e+UiwzHpgb5zP5+hwlYYWYAw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.38.0"
-    "@typescript-eslint/types" "5.38.0"
-    "@typescript-eslint/typescript-estree" "5.38.0"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.50.0"
+    "@typescript-eslint/types" "5.50.0"
+    "@typescript-eslint/typescript-estree" "5.50.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.38.0":
-  version "5.38.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz#60591ca3bf78aa12b25002c0993d067c00887e34"
-  integrity sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==
-  dependencies:
-    "@typescript-eslint/types" "5.38.0"
-    eslint-visitor-keys "^3.3.0"
+    semver "^7.3.7"
 
 "@typescript-eslint/visitor-keys@5.48.2":
   version "5.48.2"
@@ -1700,6 +1701,14 @@
     "@typescript-eslint/types" "5.48.2"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.50.0":
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz#b752ffc143841f3d7bc57d6dd01ac5c40f8c4903"
+  integrity sha512-cdMeD9HGu6EXIeGOh2yVW6oGf9wq8asBgZx7nsR/D36gTfQ0odE5kcRYe5M81vjEFAcPeugXrHg78Imu55F6gg==
+  dependencies:
+    "@typescript-eslint/types" "5.50.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@xmldom/xmldom@^0.8.0":
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.2.tgz#b695ff674e8216efa632a3d36ad51ae9843380c0"
@@ -7718,6 +7727,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"

From 6cba4816fc3ea40f73c5c9399db850b65292ab2e Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 2 Feb 2023 17:15:53 +0100
Subject: [PATCH 1370/1405] [DOC] Add code example for `renderSettled` from
 `@ember/renderer`

---
 packages/@ember/renderer/index.ts | 53 +++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/packages/@ember/renderer/index.ts b/packages/@ember/renderer/index.ts
index f7a77a88e8a..c229d09c315 100644
--- a/packages/@ember/renderer/index.ts
+++ b/packages/@ember/renderer/index.ts
@@ -12,15 +12,50 @@
   Returns a promise which will resolve when rendering has completed. In
   this context, rendering is completed when all auto-tracked state that is
   consumed in the template (including any tracked state in models, services,
-    etc.  that are then used in a template) has been updated in the DOM.
-
-    For example, in a test you might want to update some tracked state and
-    then run some assertions after rendering has completed. You _could_ use
-    `await settled()` in that location, but in some contexts you don't want to
-    wait for full settledness (which includes test waiters, pending AJAX/fetch,
-    run loops, etc) but instead only want to know when that updated value has
-    been rendered in the DOM. **THAT** is what `await renderSettled()` is _perfect_
-    for.
+  etc. that are then used in a template) has been updated in the DOM.
+
+  For example, in a test you might want to update some tracked state and
+  then run some assertions after rendering has completed. You _could_ use
+  `await settled()` in that location, but in some contexts you don't want to
+  wait for full settledness (which includes test waiters, pending AJAX/fetch,
+  run loops, etc) but instead only want to know when that updated value has
+  been rendered in the DOM. **THAT** is what `await renderSettled()` is
+  _perfect_ for.
+
+  ```js
+  import { renderSettled } from '@ember/renderer';
+  import { render } from '@ember/test-helpers';
+  import { tracked } from '@glimmer/tracking';
+  import { hbs } from 'ember-cli-htmlbars';
+  import { setupRenderingTest } from 'my-app/tests/helpers';
+  import { module, test } from 'qunit';
+
+  module('Integration | Component | profile-card', function (hooks) {
+    setupRenderingTest(hooks);
+
+    test("it renders the person's name", async function (assert) {
+      class Person {
+        @tracked name = '';
+      }
+
+      this.person = new Person();
+      this.person.name = 'John';
+
+      await render(hbs`
+        <ProfileCard @name={{this.person.name}} />
+      `);
+
+      assert.dom(this.element).hasText('John');
+
+      this.person.name = 'Jane';
+
+      await renderSettled(); // Wait until rendering has completed.
+
+      assert.dom(this.element).hasText('Jane');
+    });
+  });
+  ```
+
   @method renderSettled
   @returns {Promise<void>} a promise which fulfills when rendering has completed
   @public

From 4997c53840095f781a68b4a73bdc3b18257b130d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 4 Feb 2023 06:02:02 +0000
Subject: [PATCH 1371/1405] Bump http-cache-semantics from 4.1.0 to 4.1.1

Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
- [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: http-cache-semantics
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 72b88ca1312..79291a2d40d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5936,9 +5936,9 @@ html-differ@^1.4.0:
     vow-fs "0.3.6"
 
 http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-errors@2.0.0:
   version "2.0.0"

From f4c252034cf001a85b8724948f4b2dbcd48dbff8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Feb 2023 14:12:29 +0000
Subject: [PATCH 1372/1405] Bump @typescript-eslint/parser from 5.48.2 to
 5.51.0

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.48.2 to 5.51.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.51.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 82 ++++++++++++++++++++++++++--------------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/package.json b/package.json
index 2d734a976df..9b38f618874 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "@types/qunit": "^2.19.2",
     "@types/rsvp": "^4.0.4",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
-    "@typescript-eslint/parser": "^5.48.2",
+    "@typescript-eslint/parser": "^5.51.0",
     "ast-types": "^0.14.2",
     "auto-dist-tag": "^2.1.1",
     "aws-sdk": "^2.1286.0",
diff --git a/yarn.lock b/yarn.lock
index 2cb598e996b..a5a68b76fce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1685,24 +1685,16 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.48.2":
-  version "5.48.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.48.2.tgz#c9edef2a0922d26a37dba03be20c5fff378313b3"
-  integrity sha512-38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.48.2"
-    "@typescript-eslint/types" "5.48.2"
-    "@typescript-eslint/typescript-estree" "5.48.2"
+"@typescript-eslint/parser@^5.51.0":
+  version "5.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz#2d74626652096d966ef107f44b9479f02f51f271"
+  integrity sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.51.0"
+    "@typescript-eslint/types" "5.51.0"
+    "@typescript-eslint/typescript-estree" "5.51.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.48.2":
-  version "5.48.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz#bb7676cb78f1e94921eaab637a4b5d596f838abc"
-  integrity sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==
-  dependencies:
-    "@typescript-eslint/types" "5.48.2"
-    "@typescript-eslint/visitor-keys" "5.48.2"
-
 "@typescript-eslint/scope-manager@5.50.0":
   version "5.50.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.50.0.tgz#90b8a3b337ad2c52bbfe4eac38f9164614e40584"
@@ -1711,6 +1703,14 @@
     "@typescript-eslint/types" "5.50.0"
     "@typescript-eslint/visitor-keys" "5.50.0"
 
+"@typescript-eslint/scope-manager@5.51.0":
+  version "5.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz#ad3e3c2ecf762d9a4196c0fbfe19b142ac498990"
+  integrity sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ==
+  dependencies:
+    "@typescript-eslint/types" "5.51.0"
+    "@typescript-eslint/visitor-keys" "5.51.0"
+
 "@typescript-eslint/type-utils@5.50.0":
   version "5.50.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.50.0.tgz#509d5cc9728d520008f7157b116a42c5460e7341"
@@ -1721,28 +1721,15 @@
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.48.2":
-  version "5.48.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.2.tgz#635706abb1ec164137f92148f06f794438c97b8e"
-  integrity sha512-hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA==
-
 "@typescript-eslint/types@5.50.0":
   version "5.50.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.50.0.tgz#c461d3671a6bec6c2f41f38ed60bd87aa8a30093"
   integrity sha512-atruOuJpir4OtyNdKahiHZobPKFvZnBnfDiyEaBf6d9vy9visE7gDjlmhl+y29uxZ2ZDgvXijcungGFjGGex7w==
 
-"@typescript-eslint/typescript-estree@5.48.2":
-  version "5.48.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz#6e206b462942b32383582a6c9251c05021cc21b0"
-  integrity sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==
-  dependencies:
-    "@typescript-eslint/types" "5.48.2"
-    "@typescript-eslint/visitor-keys" "5.48.2"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+"@typescript-eslint/types@5.51.0":
+  version "5.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz#e7c1622f46c7eea7e12bbf1edfb496d4dec37c90"
+  integrity sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw==
 
 "@typescript-eslint/typescript-estree@5.50.0":
   version "5.50.0"
@@ -1757,6 +1744,19 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
+"@typescript-eslint/typescript-estree@5.51.0":
+  version "5.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz#0ec8170d7247a892c2b21845b06c11eb0718f8de"
+  integrity sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA==
+  dependencies:
+    "@typescript-eslint/types" "5.51.0"
+    "@typescript-eslint/visitor-keys" "5.51.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
 "@typescript-eslint/utils@5.50.0":
   version "5.50.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.50.0.tgz#807105f5ffb860644d30d201eefad7017b020816"
@@ -1771,14 +1771,6 @@
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.48.2":
-  version "5.48.2"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz#c247582a0bcce467461d7b696513bf9455000060"
-  integrity sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==
-  dependencies:
-    "@typescript-eslint/types" "5.48.2"
-    eslint-visitor-keys "^3.3.0"
-
 "@typescript-eslint/visitor-keys@5.50.0":
   version "5.50.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.50.0.tgz#b752ffc143841f3d7bc57d6dd01ac5c40f8c4903"
@@ -1787,6 +1779,14 @@
     "@typescript-eslint/types" "5.50.0"
     eslint-visitor-keys "^3.3.0"
 
+"@typescript-eslint/visitor-keys@5.51.0":
+  version "5.51.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz#c0147dd9a36c0de758aaebd5b48cae1ec59eba87"
+  integrity sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ==
+  dependencies:
+    "@typescript-eslint/types" "5.51.0"
+    eslint-visitor-keys "^3.3.0"
+
 "@xmldom/xmldom@^0.8.0":
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.2.tgz#b695ff674e8216efa632a3d36ad51ae9843380c0"

From 35467775ea17e028d3eb5bdff993fdec2ef62de8 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 10 Feb 2023 16:35:14 -0500
Subject: [PATCH 1373/1405] Bump setup-node on the smoke-tests section

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ddf4e2907e..b7465507927 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -126,7 +126,7 @@ jobs:
     needs: [basic-test, lint, types]
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: 14.x
           cache: yarn

From 0808e61f2ce6161c571c7b0c42cf1e1464ffdfd6 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 10 Feb 2023 16:52:12 -0500
Subject: [PATCH 1374/1405] Blueprints test shouldn't need dist; this should
 fix flaky failure

---
 .github/workflows/ci.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7465507927..7389856fb6d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -238,10 +238,6 @@ jobs:
           cache: yarn
       - name: install dependencies
         run: yarn install --frozen-lockfile --non-interactive
-      - uses: actions/download-artifact@v3
-        with:
-          name: dist
-          path: dist
       - name: test
         run: yarn test:blueprints
 

From 02a6832b4f3357fb9caf9c7472e21b3dfd4ac586 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Fri, 10 Feb 2023 17:13:49 -0500
Subject: [PATCH 1375/1405] Notify on failure

---
 .github/workflows/ci.yml       | 26 ++++++++++++++++++++++++++
 .github/workflows/cron.yml     |  1 +
 .github/workflows/night-ts.yml | 14 ++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7389856fb6d..5d8468db559 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -366,3 +366,29 @@ jobs:
           S3_BUCKET_NAME: 'builds.emberjs.com'
           S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY}}
           S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID}}
+
+  notify:
+    name: Notify Discord
+    runs-on: ubuntu-latest
+    needs:
+      [
+        basic-test,
+        lint,
+        browserstack-test,
+        production-test,
+        production-debug-render-test,
+        extend-prototypes-test,
+        node-test,
+        blueprint-test,
+        browser-test,
+      ]
+    if: failure() && contains(github.ref, 'cron') == true
+    steps:
+      - uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.FRAMEWORK_WEBHOOK }}
+          status: "Failure"
+          title: "Ember.js Nightly CI"
+          color: 0xcc0000
+          url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          username: GitHub Actions
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 62bd699eb23..a6cd7eb04a3 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -3,6 +3,7 @@ name: Cron
 on:
   schedule:
     - cron:  '0 7 * * *' # daily, 7am
+  workflow_dispatch:
 
 jobs:
   trigger-ci:
diff --git a/.github/workflows/night-ts.yml b/.github/workflows/night-ts.yml
index d7ed8fe7252..3dfecdca87c 100644
--- a/.github/workflows/night-ts.yml
+++ b/.github/workflows/night-ts.yml
@@ -10,6 +10,20 @@ jobs:
       - run: yarn install --frozen-lockfile --non-interactive
       - run: yarn add -D typescript@next
       - run: yarn type-check
+  notify:
+    name: Notify Discord
+    runs-on: ubuntu-latest
+    needs: [ ts-next ]
+    if: failure()
+    steps:
+      - uses: sarisia/actions-status-discord@v1
+        with:
+          webhook: ${{ secrets.TYPESCRIPT_WEBHOOK }}
+          status: "Failure"
+          title: "Ember.js Nightly TypeScript Run"
+          color: 0xcc0000
+          url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          username: GitHub Actions
 
 # ...nightly at midnight
 on:

From 7742bfae50223ca1d58181afd09061ba779c4450 Mon Sep 17 00:00:00 2001
From: Bert De Block <bert.deblock@bagaar.be>
Date: Thu, 26 Jan 2023 20:58:27 +0100
Subject: [PATCH 1376/1405] Support a `router.ts` file when generating routes

---
 blueprints/route/index.js           | 34 +++++++++++++++----
 node-tests/blueprints/route-test.js | 52 +++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index a36743f9289..6385b295762 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -5,6 +5,7 @@ const path = require('path');
 const chalk = require('chalk');
 const stringUtil = require('ember-cli-string-utils');
 const EmberRouterGenerator = require('ember-router-generator');
+const SilentError = require('silent-error');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
 
@@ -148,21 +149,42 @@ function updateRouter(action, options) {
   }
 }
 
-function findRouter(options) {
+function findRouterPath(options) {
   let routerPathParts = [options.project.root];
-  let root = 'app';
 
   if (options.dummy && options.project.isEmberCLIAddon()) {
-    routerPathParts = routerPathParts.concat(['tests', 'dummy', root, 'router.js']);
+    routerPathParts.push('tests', 'dummy', 'app');
   } else {
-    routerPathParts = routerPathParts.concat([root, 'router.js']);
+    routerPathParts.push('app');
   }
 
-  return routerPathParts;
+  let jsRouterPath = path.join(...routerPathParts, 'router.js');
+  let tsRouterPath = path.join(...routerPathParts, 'router.ts');
+
+  let jsRouterPathExists = fs.existsSync(jsRouterPath);
+  let tsRouterPathExists = fs.existsSync(tsRouterPath);
+
+  if (jsRouterPathExists && tsRouterPathExists) {
+    throw new SilentError(
+      'Found both a `router.js` and `router.ts` file. Please make sure your project only has one or the other.'
+    );
+  }
+
+  if (jsRouterPathExists) {
+    return jsRouterPath;
+  }
+
+  if (tsRouterPathExists) {
+    return tsRouterPath;
+  }
+
+  throw new SilentError(
+    'Could not find a router file. Please make sure your project has a `router.js` or `router.ts` file.'
+  );
 }
 
 function writeRoute(action, name, options) {
-  let routerPath = path.join.apply(null, findRouter(options));
+  let routerPath = findRouterPath(options);
   let source = fs.readFileSync(routerPath, 'utf-8');
 
   let routes = new EmberRouterGenerator(source);
diff --git a/node-tests/blueprints/route-test.js b/node-tests/blueprints/route-test.js
index d03f3504701..40cf0121364 100644
--- a/node-tests/blueprints/route-test.js
+++ b/node-tests/blueprints/route-test.js
@@ -301,6 +301,32 @@ describe('Blueprint: route', function () {
         });
       });
     });
+
+    it('using a `router.ts` file', async function () {
+      fs.moveSync('app/router.js', 'app/router.ts');
+
+      await emberGenerate(['route', 'foo']);
+      expect(file('app/router.ts')).to.contain("this.route('foo')");
+
+      await emberDestroy(['route', 'foo']);
+      expect(file('app/router.ts')).to.not.contain("this.route('foo')");
+    });
+
+    it('throws a helpful error if a router file could not be found', async function () {
+      fs.removeSync('app/router.js');
+
+      await expect(emberGenerate(['route', 'foo'])).to.be.rejectedWith(
+        'Could not find a router file. Please make sure your project has a `router.js` or `router.ts` file.'
+      );
+    });
+
+    it('throws a helpful error if both a `router.ts` and `router.js` file are found', async function () {
+      fs.copySync('app/router.js', 'app/router.ts');
+
+      await expect(emberGenerate(['route', 'foo'])).to.be.rejectedWith(
+        'Found both a `router.js` and `router.ts` file. Please make sure your project only has one or the other.'
+      );
+    });
   });
 
   describe('in addon - octane', function () {
@@ -514,6 +540,32 @@ describe('Blueprint: route', function () {
         });
       });
     });
+
+    it('using a `router.ts` file', async function () {
+      fs.moveSync('tests/dummy/app/router.js', 'tests/dummy/app/router.ts');
+
+      await emberGenerate(['route', 'foo', '--dummy']);
+      expect(file('tests/dummy/app/router.ts')).to.contain("this.route('foo')");
+
+      await emberDestroy(['route', 'foo', '--dummy']);
+      expect(file('tests/dummy/app/router.ts')).to.not.contain("this.route('foo')");
+    });
+
+    it('throws a helpful error if a router file could not be found', async function () {
+      fs.removeSync('tests/dummy/app/router.js');
+
+      await expect(emberGenerate(['route', 'foo', '--dummy'])).to.be.rejectedWith(
+        'Could not find a router file. Please make sure your project has a `router.js` or `router.ts` file.'
+      );
+    });
+
+    it('throws a helpful error if both a `router.ts` and `router.js` file are found', async function () {
+      fs.copySync('tests/dummy/app/router.js', 'tests/dummy/app/router.ts');
+
+      await expect(emberGenerate(['route', 'foo', '--dummy'])).to.be.rejectedWith(
+        'Found both a `router.js` and `router.ts` file. Please make sure your project only has one or the other.'
+      );
+    });
   });
 
   describe('in in-repo-addon', function () {

From 00c69d2ac2b11bcaa8f1c793a381c61013f13038 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 14 Feb 2023 16:02:59 -0700
Subject: [PATCH 1377/1405] Make the type for `SafeString` public

This type has been effectively "intimate" for many years, and fits in
the same bucket as e.g. `Transition`: it is not user-constructible, but
will be constructed by the framework and users need to be able to name
it. For example, `ember-intl` needs to be able to see that a string has
been marked as trusted to do the right thing to emit it.

Internally, clean up a few long-standing TS issues (`any` etc.), make
`SafeString` explicitly implement the contract from Glimmer so that if
that contract changes, we will know at the definition site, and make
the implementation details of how `SafeString` handles the string it
wraps `private`. (This does not use a `#`-private field because private
class fields have some non-trivial overhead in transpiled contexts, and
`SafeString` can appear in fairly hot rendering paths.)
---
 .../-internals/glimmer/lib/utils/string.ts    | 40 +++++++++++++------
 packages/@ember/template/index.ts             |  4 +-
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/string.ts b/packages/@ember/-internals/glimmer/lib/utils/string.ts
index 96e10828a52..9359687cebc 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/string.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/string.ts
@@ -2,15 +2,17 @@
 @module @ember/template
 */
 
-export class SafeString {
-  public string: string;
+import type { SafeString as GlimmerSafeString } from '@glimmer/runtime';
+
+export class SafeString implements GlimmerSafeString {
+  private __string: string;
 
   constructor(string: string) {
-    this.string = string;
+    this.__string = string;
   }
 
   toString(): string {
-    return `${this.string}`;
+    return `${this.__string}`;
   }
 
   toHTML(): string {
@@ -35,10 +37,11 @@ function escapeChar(chr: keyof typeof escape) {
   return escape[chr];
 }
 
-export function escapeExpression(string: any): string {
+export function escapeExpression(string: unknown): string {
+  let s: string;
   if (typeof string !== 'string') {
     // don't escape SafeStrings, since they're already safe
-    if (string && string.toHTML) {
+    if (isHTMLSafe(string)) {
       return string.toHTML();
     } else if (string === null || string === undefined) {
       return '';
@@ -49,13 +52,23 @@ export function escapeExpression(string: any): string {
     // Force a string conversion as this will be done by the append regardless and
     // the regex test will do this transparently behind the scenes, causing issues if
     // an object's to string has escaped characters in it.
-    string = String(string);
+    s = String(string);
+  } else {
+    s = string;
   }
 
-  if (!possible.test(string)) {
-    return string;
+  if (!possible.test(s)) {
+    return s;
   }
-  return string.replace(badChars, escapeChar);
+
+  // SAFETY: this is technically a lie, but it's a true lie as long as the
+  // invariant it depends on is upheld: `escapeChar` will always return a string
+  // as long as its input is one of the characters in `escape`, and it will only
+  // be called if it matches one of the characters in the `badChar` regex, which
+  // is hand-maintained to match the set escaped. (It would be nice if TS could
+  // "see" into the regex to see how this works, but that'd be quite a lot of
+  // extra fanciness.)
+  return s.replace(badChars, escapeChar as (s: string) => string);
 }
 
 /**
@@ -82,6 +95,7 @@ export function escapeExpression(string: any): string {
 
   @method htmlSafe
   @for @ember/template
+  @param str {String} The string to treat as trusted.
   @static
   @return {SafeString} A string that will not be HTML escaped by Handlebars.
   @public
@@ -114,6 +128,8 @@ export function htmlSafe(str: string): SafeString {
   @return {Boolean} `true` if the string was decorated with `htmlSafe`, `false` otherwise.
   @public
 */
-export function isHTMLSafe(str: any | null | undefined): str is SafeString {
-  return str !== null && typeof str === 'object' && typeof str.toHTML === 'function';
+export function isHTMLSafe(str: unknown): str is SafeString {
+  return (
+    str !== null && typeof str === 'object' && 'toHTML' in str && typeof str.toHTML === 'function'
+  );
 }
diff --git a/packages/@ember/template/index.ts b/packages/@ember/template/index.ts
index 052d24c9789..b78b73e7786 100644
--- a/packages/@ember/template/index.ts
+++ b/packages/@ember/template/index.ts
@@ -1 +1,3 @@
-export { htmlSafe, isHTMLSafe } from '@ember/-internals/glimmer';
+// NOTE: this intentionally *only* exports the *type* `SafeString`, not its
+// value, since it should not be constructed by users.
+export { htmlSafe, isHTMLSafe, type SafeString } from '@ember/-internals/glimmer';

From 73c00397f0f464f6f2821a7a89db5fe74a8028b2 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 14 Feb 2023 16:39:30 -0700
Subject: [PATCH 1378/1405] Improve SafeString type tests, include in preview
 types

Building on the previous, beta-only PR, update the type tests to check
for the constructibility of the type, and make sure it is included in
the types users can actually consume. (This is the part we will end up
backporting to LTS!)
---
 type-tests/@ember/template-tests.ts      | 25 ++++++++++++------------
 types/preview/@ember/template/index.d.ts |  1 +
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/type-tests/@ember/template-tests.ts b/type-tests/@ember/template-tests.ts
index 7c38e72387e..01f1b419cc4 100644
--- a/type-tests/@ember/template-tests.ts
+++ b/type-tests/@ember/template-tests.ts
@@ -1,18 +1,17 @@
-import { SafeString } from '@ember/template/-private/handlebars';
-import { htmlSafe, isHTMLSafe } from '@ember/template';
+import { htmlSafe, isHTMLSafe, SafeString } from '@ember/template';
 import { expectTypeOf } from 'expect-type';
 
-const handlebarsSafeString: SafeString = htmlSafe('lorem ipsum...');
-expectTypeOf(htmlSafe('lorem ipsum...')).toEqualTypeOf<SafeString>();
-// @ts-expect-error
-const regularString: string = htmlSafe('lorem ipsum...');
-
+let trusted = htmlSafe('lorem ipsum...');
+expectTypeOf(trusted).toEqualTypeOf<SafeString>();
+expectTypeOf(trusted).not.toBeString();
 expectTypeOf(isHTMLSafe).guards.toEqualTypeOf<SafeString>();
+expectTypeOf(trusted.toHTML()).toBeString();
+expectTypeOf(trusted.toString()).toBeString();
 
-function isSafeTest(a: string | SafeString) {
-  if (isHTMLSafe(a)) {
-    a = a.toString();
-  }
+expectTypeOf<SafeString>().toMatchTypeOf<{
+  toString(): string;
+  toHTML(): string;
+}>();
 
-  a.toLowerCase();
-}
+// @ts-expect-error -- we do not allow construction by exporting only the type.
+new SafeString('whatever');
diff --git a/types/preview/@ember/template/index.d.ts b/types/preview/@ember/template/index.d.ts
index 32b7d70da6f..be2c034b66e 100644
--- a/types/preview/@ember/template/index.d.ts
+++ b/types/preview/@ember/template/index.d.ts
@@ -1,5 +1,6 @@
 declare module '@ember/template' {
   import { SafeString } from '@ember/template/-private/handlebars';
+  export type { SafeString };
   export function htmlSafe(str: string): SafeString;
   export function isHTMLSafe(str: unknown): str is SafeString;
 }

From 730ae355062cf3fe123b46fe0aa6f95a4d7e8c10 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 14 Feb 2023 17:10:48 -0700
Subject: [PATCH 1379/1405] [DOCS BETA] Document the `SafeString` type

Also use `unknown` instead of `any` in one spot.
---
 .../-internals/glimmer/lib/utils/string.ts    | 50 ++++++++++++++++++-
 packages/@ember/string/index.ts               |  2 +-
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/string.ts b/packages/@ember/-internals/glimmer/lib/utils/string.ts
index 9359687cebc..6f970d8d11b 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/string.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/string.ts
@@ -4,6 +4,38 @@
 
 import type { SafeString as GlimmerSafeString } from '@glimmer/runtime';
 
+/**
+  A wrapper around a string that has been marked as safe ("trusted"). **When
+  rendered in HTML, Ember will not perform any escaping.**
+
+  Note:
+
+  1. This does not *make* the string safe; it means that some code in your
+     application has *marked* it as safe using the `htmlSafe()` function.
+
+  2. The only public API for getting a `SafeString` is calling `htmlSafe()`. It
+     is *not* user-constructible.
+
+  If a string contains user inputs or other untrusted data, you must sanitize
+  the string before using the `htmlSafe` method. Otherwise your code is
+  vulnerable to [Cross-Site Scripting][xss]. There are many open source
+  sanitization libraries to choose from, both for front end and server-side
+  sanitization.
+
+  [xss]: https://owasp.org/www-community/attacks/DOM_Based_XSS
+
+  ```javascript
+  import { htmlSafe } from '@ember/template';
+
+  let someTrustedOrSanitizedString = "<div>Hello!</div>"
+
+  htmlSafe(someTrustedorSanitizedString);
+  ```
+
+  @public
+  @since 4.12.0
+  @class SafeString
+ */
 export class SafeString implements GlimmerSafeString {
   private __string: string;
 
@@ -11,10 +43,24 @@ export class SafeString implements GlimmerSafeString {
     this.__string = string;
   }
 
+  /**
+    Get the string back to use as a string.
+
+    @public
+    @method toString
+    @returns The string marked as trusted
+   */
   toString(): string {
     return `${this.__string}`;
   }
 
+  /**
+    Get the wrapped string as HTML to use without escaping.
+
+    @public
+    @method toHTML
+    @returns string
+   */
   toHTML(): string {
     return this.toString();
   }
@@ -115,8 +161,8 @@ export function htmlSafe(str: string): SafeString {
   ```javascript
   import { htmlSafe, isHTMLSafe } from '@ember/template';
 
-  var plainString = 'plain string',
-      safeString = htmlSafe('<div>someValue</div>');
+  let plainString = 'plain string';
+  let safeString = htmlSafe('<div>someValue</div>');
 
   isHTMLSafe(plainString); // false
   isHTMLSafe(safeString);  // true
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index 7f845c66a95..ec975da09c9 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -290,7 +290,7 @@ export function htmlSafe(str: string): SafeString {
   return internalHtmlSafe(str);
 }
 
-export function isHTMLSafe(str: any | null | undefined): str is SafeString {
+export function isHTMLSafe(str: unknown): str is SafeString {
   deprecateImportFromString('isHTMLSafe');
 
   return internalIsHtmlSafe(str);

From 5378cfea9e21a8f89e47488c38bf6b274be14a0c Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Thu, 16 Feb 2023 10:33:06 -0700
Subject: [PATCH 1380/1405] Make `SafeString` show up correctly in docs

---
 packages/@ember/-internals/glimmer/lib/utils/string.ts | 9 +++++----
 tests/docs/expected.js                                 | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/utils/string.ts b/packages/@ember/-internals/glimmer/lib/utils/string.ts
index 6f970d8d11b..63c35cffb28 100644
--- a/packages/@ember/-internals/glimmer/lib/utils/string.ts
+++ b/packages/@ember/-internals/glimmer/lib/utils/string.ts
@@ -32,9 +32,10 @@ import type { SafeString as GlimmerSafeString } from '@glimmer/runtime';
   htmlSafe(someTrustedorSanitizedString);
   ```
 
-  @public
-  @since 4.12.0
+  @for @ember/template
   @class SafeString
+  @since 4.12.0
+  @public
  */
 export class SafeString implements GlimmerSafeString {
   private __string: string;
@@ -48,7 +49,7 @@ export class SafeString implements GlimmerSafeString {
 
     @public
     @method toString
-    @returns The string marked as trusted
+    @returns {String} The string marked as trusted
    */
   toString(): string {
     return `${this.__string}`;
@@ -59,7 +60,7 @@ export class SafeString implements GlimmerSafeString {
 
     @public
     @method toHTML
-    @returns string
+    @returns {String} the trusted string, without any escaping applied
    */
   toHTML(): string {
     return this.toString();
diff --git a/tests/docs/expected.js b/tests/docs/expected.js
index 6c773636bf0..8049c62aa3a 100644
--- a/tests/docs/expected.js
+++ b/tests/docs/expected.js
@@ -509,6 +509,7 @@ module.exports = {
     'toArray',
     'toggleProperty',
     'toString',
+    'toHTML',
     'tracked',
     'transitionTo',
     'transitionToRoute',

From 4f4230c2386ca7395b4fd6c6652e89c244606ca5 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 20 Feb 2023 15:05:12 -0500
Subject: [PATCH 1381/1405] Add v4.11.0 to CHANGELOG

(cherry picked from commit 0f7aa6be5f7fba5f15ca72c9c009090b314282ab)
---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9189db362d4..e750c0530ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Ember Changelog
 
-## v4.11.0-beta.1 (January 12, 2023)
+## v4.11.0 (February 20, 2023)
 
 - [#20288](https://github.com/emberjs/ember.js/pull/20288) [FEATURE] Stable types for `@ember/owner`
 - [#20323](https://github.com/emberjs/ember.js/pull/20323) [FEATURE] Introduce stable types for `@ember/error`
+- [#20361](https://github.com/emberjs/ember.js/pull/20361) [BUGFIX] Support a `router.ts` file when generating routes
+- [#20373](https://github.com/emberjs/ember.js/pull/20373) / [#20374](https://github.com/emberjs/ember.js/pull/20374) [BUGFIX] Make the type for `SafeString` public
 - [#20345](https://github.com/emberjs/ember.js/pull/20345) [CLEANUP] Remove flags for released features
 - [#20285](https://github.com/emberjs/ember.js/pull/20285) Update to TS v4.9
 

From 41b3bf20aef7903dbd7e2224e13635ad2d920aea Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 20 Feb 2023 15:20:17 -0500
Subject: [PATCH 1382/1405] Add v4.12.0-beta.1 to CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e750c0530ea..7cccfaa44ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Ember Changelog
 
+## v4.12.0-beta.1 (February 20, 2023)
+
+- [#20352](https://github.com/emberjs/ember.js/pull/20352) [FEATURE] Enable generating Typescript blueprints when `isTypeScriptProject` is true without additional environment variables per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).
+- [#20355](https://github.com/emberjs/ember.js/pull/20355) [FEATURE] Enhance the Typescript blueprint for generated services per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).
+- [#20356](https://github.com/emberjs/ember.js/pull/20356) [FEATURE] Generate signature in Typescript component blueprints per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).
+
 ## v4.11.0 (February 20, 2023)
 
 - [#20288](https://github.com/emberjs/ember.js/pull/20288) [FEATURE] Stable types for `@ember/owner`

From ad9e97c7f88d6bc6afa15ccb3bff7b09ddd0ba8c Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 20 Feb 2023 15:21:01 -0500
Subject: [PATCH 1383/1405] Release v4.12.0-beta.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9b38f618874..36c7a792902 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.0-alpha.1",
+  "version": "4.12.0-beta.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From a9943b2429d456ce224cd375b7d82611d19794e9 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Tue, 21 Feb 2023 14:12:28 -0700
Subject: [PATCH 1384/1405] [BUGFIX LTS] Improve error for owner methods called
 after destroy

The previous error handling gives you a stack trace and a notice, but
does not tell you what was being asked for with the lookup. This makes
the traces much less helpful, especially for minified/prod builds.

(cherry picked from commit 3786a7e54b6188f24093a164fe8562fcb8ebc8b3)
---
 packages/@ember/-internals/container/lib/container.ts       | 6 ++++--
 .../@ember/-internals/container/tests/container_test.js     | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/@ember/-internals/container/lib/container.ts b/packages/@ember/-internals/container/lib/container.ts
index 9e3323dd1ac..3647776e505 100644
--- a/packages/@ember/-internals/container/lib/container.ts
+++ b/packages/@ember/-internals/container/lib/container.ts
@@ -152,7 +152,7 @@ export default class Container {
     options?: RegisterOptions
   ): InternalFactory<object> | object | undefined {
     if (this.isDestroyed) {
-      throw new Error(`Cannot call \`.lookup\` after the owner has been destroyed`);
+      throw new Error(`Cannot call \`.lookup('${fullName}')\` after the owner has been destroyed`);
     }
     assert('fullName must be a proper full name', this.registry.isValidFullName(fullName));
     return lookup(this, this.registry.normalize(fullName), options);
@@ -217,7 +217,9 @@ export default class Container {
    */
   factoryFor(fullName: FullName): InternalFactoryManager<object> | undefined {
     if (this.isDestroyed) {
-      throw new Error(`Cannot call \`.factoryFor\` after the owner has been destroyed`);
+      throw new Error(
+        `Cannot call \`.factoryFor('${fullName}')\` after the owner has been destroyed`
+      );
     }
     let normalizedName = this.registry.normalize(fullName);
 
diff --git a/packages/@ember/-internals/container/tests/container_test.js b/packages/@ember/-internals/container/tests/container_test.js
index e3dd6663a20..3417252bab5 100644
--- a/packages/@ember/-internals/container/tests/container_test.js
+++ b/packages/@ember/-internals/container/tests/container_test.js
@@ -608,7 +608,7 @@ moduleFor(
 
       assert.throws(() => {
         container.lookup('service:foo');
-      }, /Cannot call `.lookup` after the owner has been destroyed/);
+      }, "Cannot call `.lookup('service:foo')` after the owner has been destroyed");
     }
 
     [`@test assert when calling factoryFor after destroy on a container`](assert) {
@@ -626,7 +626,7 @@ moduleFor(
 
       assert.throws(() => {
         container.factoryFor('service:foo');
-      }, /Cannot call `.factoryFor` after the owner has been destroyed/);
+      }, "Cannot call `.factoryFor('service:foo')` after the owner has been destroyed");
     }
 
     // this is skipped until templates and the glimmer environment do not require `OWNER` to be

From 0f6a5d20ca7f530111350422eb57092c0c2ffcb3 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 27 Feb 2023 14:32:38 -0500
Subject: [PATCH 1385/1405] Add v4.12.0-beta.2 to CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cccfaa44ab..5dbb513e908 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v4.12.0-beta.2 (February 27, 2023)
+
+- [#20385](https://github.com/emberjs/ember.js/pull/20385) [BUGFIX] Improve error for owner methods called after destroy
+
 ## v4.12.0-beta.1 (February 20, 2023)
 
 - [#20352](https://github.com/emberjs/ember.js/pull/20352) [FEATURE] Enable generating Typescript blueprints when `isTypeScriptProject` is true without additional environment variables per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).

From f2642a4029f73d4642feb6b79a2be79e27c45d04 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 27 Feb 2023 14:33:46 -0500
Subject: [PATCH 1386/1405] Release 4.12.0-beta.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 36c7a792902..1ec9f9a545c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.0-beta.1",
+  "version": "4.12.0-beta.2",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 674bd7f8678453aff1b9e37e2963246adadf388b Mon Sep 17 00:00:00 2001
From: Peter Wagenet <peter.wagenet@gmail.com>
Date: Fri, 3 Mar 2023 11:24:38 -0800
Subject: [PATCH 1387/1405] Add deprecation docs for deprecated modules

(cherry picked from commit 15d17b5bb66aec1d84c4a8d495ff8e7667b1f1d6)
---
 packages/@ember/error/index.ts  | 6 +++++-
 packages/@ember/string/index.ts | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/@ember/error/index.ts b/packages/@ember/error/index.ts
index cee6dede8e3..4138449b191 100644
--- a/packages/@ember/error/index.ts
+++ b/packages/@ember/error/index.ts
@@ -2,7 +2,11 @@ import { deprecate } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 
 /**
- @module @ember/error
+This module is deprecated and should not be used.
+See [the deprecations guide](https://deprecations.emberjs.com/v4.x#toc_deprecate-ember-error)
+for more details.
+
+@module @ember/error
 */
 
 /** ErrorConstructor without node extensions */
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
index ec975da09c9..948945abd3b 100644
--- a/packages/@ember/string/index.ts
+++ b/packages/@ember/string/index.ts
@@ -1,4 +1,8 @@
 /**
+This module is deprecated and should not be used.
+See [the deprecations guide](https://deprecations.emberjs.com/v4.x#toc_ember-string-from-ember-module)
+for more details.
+
 @module @ember/string
 */
 

From 7c843059754ba8fdcacb370e7dc15f069c17d98d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Sat, 4 Mar 2023 09:14:25 +0100
Subject: [PATCH 1388/1405] Fixed a fallback branch in `PartialParams` type

(cherry picked from commit 2508749706cc1b6fbb483b622228752ef9880e87)
---
 packages/@ember/runloop/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@ember/runloop/index.ts b/packages/@ember/runloop/index.ts
index 8e572a52ca0..187834fe8f5 100644
--- a/packages/@ember/runloop/index.ts
+++ b/packages/@ember/runloop/index.ts
@@ -14,7 +14,7 @@ type PartialParams<P extends any[]> = P extends [infer First, ...infer Rest]
   : // This is necessary to handle optional tuple values
   Required<P> extends [infer First, ...infer Rest]
   ? [] | [First | undefined] | [First | undefined, ...PartialParams<Partial<Rest>>]
-  : never;
+  : [];
 
 type RemainingParams<PartialParams extends any[], All extends any[]> = PartialParams extends [
   infer First,

From aa5e4ed57991d344bdefcae2d342df7beb620ac1 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Tue, 28 Feb 2023 16:32:00 -0800
Subject: [PATCH 1389/1405] [BUGFIX LTS] Don't run getters while applying
 mixins

This change ensures that getters are never evaluated while applying
mixins.

It relies on the fact that all getters (including undecorated ones) get
converted into classic decorators when the mixin is originally created.

(cherry picked from commit 87394c4b751bce19b2d4c2756d30fd955d22af6f)
---
 .../runtime/tests/mixins/accessor_test.js     | 56 +++++++++++++++++++
 packages/@ember/object/mixin.ts               | 33 ++++++-----
 tsconfig.json                                 |  2 +-
 3 files changed, 77 insertions(+), 14 deletions(-)
 create mode 100644 packages/@ember/-internals/runtime/tests/mixins/accessor_test.js

diff --git a/packages/@ember/-internals/runtime/tests/mixins/accessor_test.js b/packages/@ember/-internals/runtime/tests/mixins/accessor_test.js
new file mode 100644
index 00000000000..e7d3e04cdd3
--- /dev/null
+++ b/packages/@ember/-internals/runtime/tests/mixins/accessor_test.js
@@ -0,0 +1,56 @@
+import EmberObject from '@ember/object';
+import { moduleFor, RenderingTestCase } from 'internal-test-helpers';
+
+moduleFor(
+  'runtime: Mixin Accessors',
+  class extends RenderingTestCase {
+    ['@test works with getters'](assert) {
+      let value = 'building';
+
+      let Base = EmberObject.extend({
+        get foo() {
+          if (value === 'building') {
+            throw Error('base should not be called yet');
+          }
+
+          return "base's foo";
+        },
+      });
+
+      // force Base to be finalized so its properties will contain `foo`
+      Base.proto();
+
+      class Child extends Base {
+        get foo() {
+          if (value === 'building') {
+            throw Error('child should not be called yet');
+          }
+
+          return "child's foo";
+        }
+      }
+
+      Child.proto();
+
+      let Grandchild = Child.extend({
+        get foo() {
+          if (value === 'building') {
+            throw Error('grandchild should not be called yet');
+          }
+
+          return value;
+        },
+      });
+
+      let instance = Grandchild.create();
+
+      value = 'done building';
+
+      assert.equal(instance.foo, 'done building', 'getter defined correctly');
+
+      value = 'changed value';
+
+      assert.equal(instance.foo, 'changed value', 'the value is a real getter, not a snapshot');
+    }
+  }
+);
diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index 180707e29bb..25affc808f8 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -8,12 +8,14 @@ import { guidFor, observerListenerMetaFor, ROOT, wrap } from '@ember/-internals/
 import { assert } from '@ember/debug';
 import { DEBUG } from '@glimmer/env';
 import { _WeakSet } from '@glimmer/util';
-import type {
-  ComputedDecorator,
-  ComputedPropertyGetter,
-  ComputedPropertyObj,
-  ComputedPropertySetter,
-  ComputedDescriptor,
+import {
+  type ComputedDecorator,
+  type ComputedPropertyGetter,
+  type ComputedPropertyObj,
+  type ComputedPropertySetter,
+  type ComputedDescriptor,
+  isAccessor,
+  isClassicDecorator,
 } from '@ember/-internals/metal';
 import {
   ComputedProperty,
@@ -235,7 +237,7 @@ function mergeMixins(
   keys: string[],
   keysWithSuper: string[]
 ): void {
-  let currentMixin;
+  let currentMixin: MixinLike | undefined;
 
   for (let i = 0; i < mixins.length; i++) {
     currentMixin = mixins[i];
@@ -309,12 +311,17 @@ function mergeProps(
       let desc = meta.peekDescriptors(key);
 
       if (desc === undefined) {
-        // The superclass did not have a CP, which means it may have
-        // observers or listeners on that property.
-        let prev = (values[key] = base[key]);
-
-        if (typeof prev === 'function') {
-          updateObserversAndListeners(base, key, prev, false);
+        // If the value is a classic decorator, we don't want to actually
+        // access it, because that will execute the decorator while we're
+        // building the class.
+        if (!isClassicDecorator(value)) {
+          // The superclass did not have a CP, which means it may have
+          // observers or listeners on that property.
+          let prev = (values[key] = base[key]);
+
+          if (typeof prev === 'function') {
+            updateObserversAndListeners(base, key, prev, false);
+          }
         }
       } else {
         descs[key] = desc;
diff --git a/tsconfig.json b/tsconfig.json
index fb94bf9d432..7e30b8b1278 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,6 @@
     "outDir": "dist",
     "noEmit": true
   },
-  "include": ["packages/**/*.ts"],
+  "include": ["packages/**/*.ts", "packages/**/*.js"],
   "exclude": ["dist", "node_modules", "tmp", "types"]
 }

From 241bf59991556d2a4b2d8455774f836f28529664 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Mon, 6 Mar 2023 10:56:53 -0800
Subject: [PATCH 1390/1405] Update packages/@ember/object/mixin.ts

Co-authored-by: Chris Krycho <hello@chriskrycho.com>
(cherry picked from commit 4cd639441317ce1f41607b0de86299c9127dcf1c)
---
 packages/@ember/object/mixin.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/@ember/object/mixin.ts b/packages/@ember/object/mixin.ts
index 25affc808f8..681cb37bcc9 100644
--- a/packages/@ember/object/mixin.ts
+++ b/packages/@ember/object/mixin.ts
@@ -14,7 +14,6 @@ import {
   type ComputedPropertyObj,
   type ComputedPropertySetter,
   type ComputedDescriptor,
-  isAccessor,
   isClassicDecorator,
 } from '@ember/-internals/metal';
 import {

From 2bf04d212a056b78f47f5adcc994c44b4ec00710 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats+admin@gmail.com>
Date: Mon, 6 Mar 2023 11:10:28 -0800
Subject: [PATCH 1391/1405] Separate tsconfig change

(cherry picked from commit a037ae80e67eb66c948bfa7966c86e8f9889eabb)
---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 7e30b8b1278..fb94bf9d432 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,6 +4,6 @@
     "outDir": "dist",
     "noEmit": true
   },
-  "include": ["packages/**/*.ts", "packages/**/*.js"],
+  "include": ["packages/**/*.ts"],
   "exclude": ["dist", "node_modules", "tmp", "types"]
 }

From 4fd0a0085366abd0f5440983f6696c2d5abcea6e Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Mar 2023 15:04:32 -0400
Subject: [PATCH 1392/1405] Add v4.12.0-beta.3 to CHANGELOG

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dbb513e908..b750f2e556f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Ember Changelog
 
+## v4.12.0-beta.3 (March 13, 2023)
+
+- [#20388](https://github.com/emberjs/ember.js/pull/20388) [BUGFIX] Don't run getters while applying mixins
+- [#20398](https://github.com/emberjs/ember.js/pull/20398) [BUGFIX] Fix runloop types on TS 5.0+
+
 ## v4.12.0-beta.2 (February 27, 2023)
 
 - [#20385](https://github.com/emberjs/ember.js/pull/20385) [BUGFIX] Improve error for owner methods called after destroy

From 42bfdac18273a7f554844f061a17e5e8284cf22c Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 13 Mar 2023 15:19:25 -0400
Subject: [PATCH 1393/1405] Release 4.12.0-beta.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1ec9f9a545c..4a21dd48341 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.0-beta.2",
+  "version": "4.12.0-beta.3",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 7a49a334ee7414255afcb35f022b11900f2c80d2 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 Apr 2023 14:15:45 -0400
Subject: [PATCH 1394/1405] Add v4.12.0 to CHANGELOG

---
 CHANGELOG.md | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b750f2e556f..48f31b2e46b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,13 @@
 # Ember Changelog
 
-## v4.12.0-beta.3 (March 13, 2023)
-
-- [#20388](https://github.com/emberjs/ember.js/pull/20388) [BUGFIX] Don't run getters while applying mixins
-- [#20398](https://github.com/emberjs/ember.js/pull/20398) [BUGFIX] Fix runloop types on TS 5.0+
-
-## v4.12.0-beta.2 (February 27, 2023)
-
-- [#20385](https://github.com/emberjs/ember.js/pull/20385) [BUGFIX] Improve error for owner methods called after destroy
-
-## v4.12.0-beta.1 (February 20, 2023)
+## v4.12.0 (April 3, 2023)
 
 - [#20352](https://github.com/emberjs/ember.js/pull/20352) [FEATURE] Enable generating Typescript blueprints when `isTypeScriptProject` is true without additional environment variables per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).
 - [#20355](https://github.com/emberjs/ember.js/pull/20355) [FEATURE] Enhance the Typescript blueprint for generated services per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).
 - [#20356](https://github.com/emberjs/ember.js/pull/20356) [FEATURE] Generate signature in Typescript component blueprints per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).
+- [#20388](https://github.com/emberjs/ember.js/pull/20388) [BUGFIX] Don't run getters while applying mixins
+- [#20398](https://github.com/emberjs/ember.js/pull/20398) [BUGFIX] Fix runloop types on TS 5.0+
+- [#20385](https://github.com/emberjs/ember.js/pull/20385) [BUGFIX] Improve error for owner methods called after destroy
 
 ## v4.11.0 (February 20, 2023)
 

From 06735dbba898457afc9acbc551ae389d06b02306 Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 3 Apr 2023 14:16:10 -0400
Subject: [PATCH 1395/1405] Release v4.12.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4a21dd48341..d6beb09a8a5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.0-beta.3",
+  "version": "4.12.0",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From b40f7f36ba68a47cde29b1d6aefd7718e3bc27b2 Mon Sep 17 00:00:00 2001
From: Edward Faulkner <edward@eaf4.com>
Date: Tue, 16 May 2023 16:28:30 -0400
Subject: [PATCH 1396/1405] [BUGFIX LTS] Fix cyclic module crash

`@ember/engine/index` and `@ember/engine/instance` have circular dependencies on each other.

This would be OK, except that `instance.ts` is eagerly copying a class off `index.ts`, at a point in time where it might not actually be available.

Whether this bug hits you depends on which side of the pair gets evaluated first. I only happened hit it when testing an app with engines and fastboot on Ember 5.

This fix is to not eagerly pull the class off the module.

(cherry picked from commit 7c31adae643dbc209713cb998e77f541f50b57db)
---
 packages/@ember/engine/instance.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/@ember/engine/instance.ts b/packages/@ember/engine/instance.ts
index 533308d3534..c5088e0e722 100644
--- a/packages/@ember/engine/instance.ts
+++ b/packages/@ember/engine/instance.ts
@@ -17,8 +17,6 @@ import type Application from '@ember/application';
 import type { BootEnvironment } from '@ember/-internals/glimmer';
 import type { SimpleElement } from '@simple-dom/interface';
 
-const CEngine = Engine;
-
 export interface BootOptions {
   isBrowser?: boolean;
   shouldRender?: boolean;
@@ -202,17 +200,17 @@ class EngineInstance extends EmberObject.extend(RegistryProxyMixin, ContainerPro
     @return {EngineInstance,Error}
   */
   buildChildEngineInstance(name: string, options: EngineInstanceOptions = {}): EngineInstance {
-    let Engine = this.lookup(`engine:${name}`);
+    let ChildEngine = this.lookup(`engine:${name}`);
 
-    if (!Engine) {
+    if (!ChildEngine) {
       throw new Error(
         `You attempted to mount the engine '${name}', but it is not registered with its parent.`
       );
     }
 
-    assert('expected an Engine', Engine instanceof CEngine);
+    assert('expected an Engine', ChildEngine instanceof Engine);
 
-    let engineInstance = Engine.buildInstance(options);
+    let engineInstance = ChildEngine.buildInstance(options);
 
     setEngineParent(engineInstance, this);
 

From e77879f6e7f5641b1ab90b3eba2dbb5af639d176 Mon Sep 17 00:00:00 2001
From: Ryan Muzzey <rpmuzz@gmail.com>
Date: Tue, 14 Mar 2023 15:26:43 -0700
Subject: [PATCH 1397/1405] [DOC] Moving array, concat, fn, get, and hash from
 Ember.Templates.helpers to @ember/helper.

(cherry picked from commit e9d7ba4bcae4b856ef9f56cd8686441b9aa7aeac)
---
 packages/@ember/-internals/glimmer/lib/helpers/array.ts  | 2 +-
 packages/@ember/-internals/glimmer/lib/helpers/concat.ts | 2 +-
 packages/@ember/-internals/glimmer/lib/helpers/fn.ts     | 2 +-
 packages/@ember/-internals/glimmer/lib/helpers/get.ts    | 2 +-
 packages/@ember/-internals/glimmer/lib/helpers/hash.ts   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/@ember/-internals/glimmer/lib/helpers/array.ts b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
index 6d8816ddc15..91ddfa8a566 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/array.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/array.ts
@@ -31,7 +31,7 @@
    Where the 3rd item in the array is bound to updates of the `myOtherPerson` property.
 
    @method array
-   @for Ember.Templates.helpers
+   @for @ember/helper
    @param {Array} options
    @return {Array} Array
    @since 3.8.0
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
index bcf81909712..8767bcae462 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/concat.ts
@@ -21,6 +21,6 @@
 
   @public
   @method concat
-  @for Ember.Templates.helpers
+  @for @ember/helper
   @since 1.13.0
 */
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
index 8723cfa91c3..9be8165ace5 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/fn.ts
@@ -65,7 +65,7 @@
   See also [partial application](https://en.wikipedia.org/wiki/Partial_application).
 
   @method fn
-  @for Ember.Templates.helpers
+  @for @ember/helper
   @public
   @since 3.11.0
 */
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/get.ts b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
index d1902a4ca20..f57a863df11 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/get.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/get.ts
@@ -93,6 +93,6 @@
 
   @public
   @method get
-  @for Ember.Templates.helpers
+  @for @ember/helper
   @since 2.1.0
  */
diff --git a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
index b4872d84f49..22a9523aefd 100644
--- a/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
+++ b/packages/@ember/-internals/glimmer/lib/helpers/hash.ts
@@ -34,7 +34,7 @@
    ```
 
    @method hash
-   @for Ember.Templates.helpers
+   @for @ember/helper
    @param {Object} options
    @return {Object} Hash
    @since 2.3.0

From b862183f386029759914ae8418ffb912fb47bdca Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 12 Jun 2023 14:59:45 -0400
Subject: [PATCH 1398/1405] Add v4.12.1 to CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48f31b2e46b..fcbb164b3b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v4.12.1 (June 12, 2023)
+
+- [#20461](https://github.com/emberjs/ember.js/pull/20461) [BUGFIX] Fix cyclic module crash with engines and fastboot.
+
 ## v4.12.0 (April 3, 2023)
 
 - [#20352](https://github.com/emberjs/ember.js/pull/20352) [FEATURE] Enable generating Typescript blueprints when `isTypeScriptProject` is true without additional environment variables per [RFC #800](https://rfcs.emberjs.com/id/0800-ts-adoption-plan).

From 1171312e5d78d852bbbbd6167aa52f6f406f3edc Mon Sep 17 00:00:00 2001
From: Katie Gengler <katie@kmg.io>
Date: Mon, 12 Jun 2023 15:00:02 -0400
Subject: [PATCH 1399/1405] Release v4.12.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6beb09a8a5..57574d296ce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 5e94c9225429823a726157a57c6c6a68f508cc46 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 28 Jun 2023 15:08:26 -0600
Subject: [PATCH 1400/1405] [BUGFIX LTS] Backport some stable type import
 locations

The `ContainerProxyMixin` and `RegistryProxyMixin` private types are
used as "intimate API" by `@ember/test-helpers`, which aims to support
both the preview and stable type definitions. Provide both these types
in both their legacy locations (where they were published from until
4.10) and their correct locations. *Only* provide the types, however,
since the runtime location has moved.
---
 .../runtime/lib/mixins/container_proxy.d.ts          | 11 +++++++++++
 .../runtime/lib/mixins/registry_proxy.d.ts           | 12 ++++++++++++
 .../engine/-private/container-proxy-mixin.d.ts       | 10 +---------
 .../@ember/engine/-private/registry-proxy-mixin.d.ts | 11 +----------
 types/preview/index.d.ts                             |  3 +++
 5 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 types/preview/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
 create mode 100644 types/preview/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts

diff --git a/types/preview/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts b/types/preview/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
new file mode 100644
index 00000000000..ac1c2e8a63b
--- /dev/null
+++ b/types/preview/@ember/-internals/runtime/lib/mixins/container_proxy.d.ts
@@ -0,0 +1,11 @@
+declare module '@ember/-internals/runtime/lib/mixins/container_proxy' {
+  import { ContainerProxy } from '@ember/-internals/owner';
+  import Mixin from '@ember/object/mixin';
+
+  /**
+   * Given a fullName return a factory manager.
+   */
+  interface ContainerProxyMixin extends ContainerProxy {}
+  const ContainerProxyMixin: Mixin;
+  export default ContainerProxyMixin;
+}
diff --git a/types/preview/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts b/types/preview/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
new file mode 100644
index 00000000000..99e33a9c8b2
--- /dev/null
+++ b/types/preview/@ember/-internals/runtime/lib/mixins/registry_proxy.d.ts
@@ -0,0 +1,12 @@
+declare module '@ember/-internals/runtime/lib/mixins/registry_proxy' {
+  import { RegistryProxy } from '@ember/-internals/owner';
+  import Mixin from '@ember/object/mixin';
+
+  /**
+   * RegistryProxyMixin is used to provide public access to specific
+   * registry functionality.
+   */
+  interface RegistryProxyMixin extends RegistryProxy {}
+  const RegistryProxyMixin: Mixin;
+  export default RegistryProxyMixin;
+}
diff --git a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
index 7c25fedea9d..aa83b61528b 100644
--- a/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/container-proxy-mixin.d.ts
@@ -1,11 +1,3 @@
 declare module '@ember/engine/-private/container-proxy-mixin' {
-  import { ContainerProxy } from '@ember/-internals/owner';
-  import Mixin from '@ember/object/mixin';
-
-  /**
-   * Given a fullName return a factory manager.
-   */
-  interface ContainerProxyMixin extends ContainerProxy {}
-  const ContainerProxyMixin: Mixin;
-  export default ContainerProxyMixin;
+  export type { default } from '@ember/-internals/runtime/lib/mixins/container_proxy';
 }
diff --git a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
index d3ed9552f88..a6ec5f6da13 100644
--- a/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
+++ b/types/preview/@ember/engine/-private/registry-proxy-mixin.d.ts
@@ -1,12 +1,3 @@
 declare module '@ember/engine/-private/registry-proxy-mixin' {
-  import { RegistryProxy } from '@ember/-internals/owner';
-  import Mixin from '@ember/object/mixin';
-
-  /**
-   * RegistryProxyMixin is used to provide public access to specific
-   * registry functionality.
-   */
-  interface RegistryProxyMixin extends RegistryProxy {}
-  const RegistryProxyMixin: Mixin;
-  export default RegistryProxyMixin;
+  export type { default } from '@ember/-internals/runtime/lib/mixins/registry_proxy';
 }
diff --git a/types/preview/index.d.ts b/types/preview/index.d.ts
index 4da1c30bef0..3dcf3368928 100644
--- a/types/preview/index.d.ts
+++ b/types/preview/index.d.ts
@@ -34,6 +34,9 @@
 import './ember';
 import './ember/-private/type-utils';
 
+import './@ember/-internals/runtime/lib/mixins/container_proxy';
+import './@ember/-internals/runtime/lib/mixins/registry_proxy';
+
 import './@ember/application';
 import './@ember/application/-private/event-dispatcher';
 import './@ember/application/-private/registry';

From 28ce5219aaf85dd23644d95a6d61806e7bbac681 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 28 Jun 2023 16:37:03 -0600
Subject: [PATCH 1401/1405] Add v4.12.2 to CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcbb164b3b0..c403b426c3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v4.12.2 (June 28, 2023)
+
+- [#20481](https://github.com/emberjs/ember.js/pull/20481) [BUGFIX LTS] Backport some stable type import locations
+
 ## v4.12.1 (June 12, 2023)
 
 - [#20461](https://github.com/emberjs/ember.js/pull/20461) [BUGFIX] Fix cyclic module crash with engines and fastboot.

From 57f10fc220ec6dd20b4f3a8f99d3f7c0f3950a01 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Wed, 28 Jun 2023 16:37:40 -0600
Subject: [PATCH 1402/1405] Release v4.12.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 57574d296ce..6dfebdb4ea1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.1",
+  "version": "4.12.2",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"

From 027527eec2f780b44ba5bffcf678c6b40da72dbe Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 30 Jun 2023 13:43:22 -0600
Subject: [PATCH 1403/1405] [BUGFIX LTS] Backport more types fixes

- Missing `visit` API (used by `@ember/test-helpers`)
- Missing dependency on `@simple-dom/interface` for `SimpleElement`
---
 package.json                                   |  1 +
 types/preview/@ember/application/index.d.ts    | 12 ++++--------
 types/preview/@ember/application/instance.d.ts | 12 ++++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 6dfebdb4ea1..a23978c668b 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "@babel/helper-module-imports": "^7.16.7",
     "@babel/plugin-transform-block-scoping": "^7.20.5",
     "@ember/edition-utils": "^1.2.0",
+    "@simple-dom/interface": "^1.4.0",
     "@glimmer/vm-babel-plugins": "0.84.2",
     "babel-plugin-debug-macros": "^0.3.4",
     "babel-plugin-filter-imports": "^4.0.0",
diff --git a/types/preview/@ember/application/index.d.ts b/types/preview/@ember/application/index.d.ts
index 1f83001eafc..69d18d0a94d 100644
--- a/types/preview/@ember/application/index.d.ts
+++ b/types/preview/@ember/application/index.d.ts
@@ -1,14 +1,12 @@
 declare module '@ember/application' {
   import Engine from '@ember/engine';
-  import ApplicationInstance from '@ember/application/instance';
+  import ApplicationInstance, { BootOptions } from '@ember/application/instance';
   import EventDispatcher from '@ember/application/-private/event-dispatcher';
   import { EventDispatcherEvents } from '@ember/application/types';
   import Router from '@ember/routing/router';
   import Registry from '@ember/application/-private/registry';
   import { AnyFn } from 'ember/-private/type-utils';
-  import Owner, { Resolver } from '@ember/owner';
-  import type GlimmerComponent from '@glimmer/component';
-  import EmberObject from '@ember/object';
+  import Owner from '@ember/owner';
 
   // Shut off default exporting; we don't want anything but the *intended*
   // public API present.
@@ -82,10 +80,6 @@ declare module '@ember/application' {
      * The Ember.EventDispatcher responsible for delegating events to this application's views.
      */
     eventDispatcher: EventDispatcher;
-    /**
-     * Set this to provide an alternate class to `DefaultResolver`
-     */
-    resolver: Resolver | null;
     /**
      * The root DOM element of the Application. This can be specified as an
      * element or a jQuery-compatible selector string.
@@ -114,6 +108,8 @@ declare module '@ember/application' {
      * Create an ApplicationInstance for this Application.
      */
     buildInstance(options?: object): ApplicationInstance;
+
+    visit(url: string, options: BootOptions): Promise<ApplicationInstance>;
   }
 
   /**
diff --git a/types/preview/@ember/application/instance.d.ts b/types/preview/@ember/application/instance.d.ts
index 37b60353c6f..01972239453 100644
--- a/types/preview/@ember/application/instance.d.ts
+++ b/types/preview/@ember/application/instance.d.ts
@@ -1,5 +1,17 @@
 declare module '@ember/application/instance' {
   import EngineInstance from '@ember/engine/instance';
+  import { SimpleElement } from '@simple-dom/interface';
+
+  export interface BootOptions {
+    isBrowser?: boolean;
+    shouldRender?: boolean;
+    document?: Document | null;
+    rootElement?: string | Element | SimpleElement | null;
+    location?: string | null;
+    // Private?
+    isInteractive?: boolean;
+    _renderMode?: string;
+  }
 
   /**
    * The `ApplicationInstance` encapsulates all of the stateful aspects of a

From c458b5cb06676578c3827118b7faa20cc5a2a902 Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 30 Jun 2023 14:09:05 -0600
Subject: [PATCH 1404/1405] Add v4.12.3 to CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c403b426c3d..509ef7759ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Ember Changelog
 
+## v4.12.3 (June 30, 2023)
+
+- [#20493](https://github.com/emberjs/ember.js/pull/20493) [BUGFIX LTS] Backport more types fixes
+
 ## v4.12.2 (June 28, 2023)
 
 - [#20481](https://github.com/emberjs/ember.js/pull/20481) [BUGFIX LTS] Backport some stable type import locations

From 6b598477c3e72ede102aef538b56a0db7a05d86a Mon Sep 17 00:00:00 2001
From: Chris Krycho <hello@chriskrycho.com>
Date: Fri, 30 Jun 2023 14:09:31 -0600
Subject: [PATCH 1405/1405] Release v4.12.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a23978c668b..894f1bc5241 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-source",
-  "version": "4.12.2",
+  "version": "4.12.3",
   "description": "A JavaScript framework for creating ambitious web applications",
   "keywords": [
     "ember-addon"